diff --git a/.claude/commands/edit-workflow.md b/.claude/commands/edit-workflow.md
index f576b8572fb..9c906e5ebfa 100644
--- a/.claude/commands/edit-workflow.md
+++ b/.claude/commands/edit-workflow.md
@@ -15,4 +15,4 @@ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
 ## Validation
 
-Run `uvx tox -e static` before committing — this runs `actionlint` to validate YAML syntax and structure.
+Run `just lint-actions` before committing to validate YAML syntax and structure.
diff --git a/.claude/commands/lint.md b/.claude/commands/lint.md
index 9d6f54ddac0..bc5f3b12f84 100644
--- a/.claude/commands/lint.md
+++ b/.claude/commands/lint.md
@@ -5,18 +5,17 @@ Run the full static analysis suite and fix issues. This matches the CI check on
 ## Step 1: Run the Full Check
 
 ```bash
-uvx tox -e static
+just static
 ```
 
 This runs ruff, mypy, codespell, ethereum-spec-lint, and actionlint in one pass. If everything passes, you're done.
 
 ## Step 2: Auto-Fix Formatting and Lint Issues
 
-If tox reports ruff errors, run these first — they resolve most issues automatically:
+If static checks report ruff errors, run the fix recipe first — it resolves most issues automatically:
 
 ```bash
-uv run ruff format
-uv run ruff check --fix
+just fix
 ```
 
 ## Step 3: Resolve Remaining Issues Manually
@@ -24,12 +23,12 @@ uv run ruff check --fix
 After auto-fix, re-run to see what's left:
 
 ```bash
-uvx tox -e static
+just static
 ```
 
 - **Remaining ruff issues**: fix manually (auto-fix can't handle all rules)
 - **mypy errors**: fix type annotations, add missing types, correct signatures
-- **codespell errors**: fix typos, or add intentional words to `whitelist.txt`
+- **codespell errors**: fix typos, or add intentional words via `just whitelist <word>`
 - **ethereum-spec-lint errors**: fix import isolation violations (see `/implement-eip` for import rules)
 - **actionlint errors**: fix workflow YAML issues (see `/edit-workflow`)
 
@@ -38,5 +37,5 @@ uvx tox -e static
 Re-run until clean:
 
 ```bash
-uvx tox -e static
+just static
 ```
diff --git a/.claude/commands/pytester.md b/.claude/commands/pytester.md
new file mode 100644
index 00000000000..a1d23d78303
--- /dev/null
+++ b/.claude/commands/pytester.md
@@ -0,0 +1,36 @@
+# Pytester
+
+Guide for pytester-based plugin/CLI tests. Run before writing or modifying these tests.
+
+## Which execution mode to use
+
+- **`runpytest()`** — default. In-process, fast, full `RunResult` API (`assert_outcomes()`, `fnmatch_lines()`).
+- **`runpytest_subprocess()`** — use only when in-process causes state leakage (Pydantic cache pollution, global mutation in `pytest_configure`). Same `RunResult` API.
+- **Raw `subprocess.run()`** — never use alongside pytester. Use `runpytest_subprocess()` instead.
+
+Subprocess isolation masks bugs rather than fixing them. Prefer fixing the root cause and use subprocess as defense-in-depth.
+
+## Expected inner failures
+
+`runpytest_subprocess()` replays inner output to outer stdout (by design). Suppress with `capsys.readouterr()`:
+
+```python
+def test_expected_failure(pytester: Any, capsys: Any, pytestconfig: Any) -> None:
+    result = pytester.runpytest_subprocess(...)
+    capsys.readouterr()  # suppress inner failure bleed
+    assert result.ret != 0
+    output = "\n".join(result.outlines + result.errlines)
+    # conditional print for -s debugging
+    if pytestconfig.getoption("capture") == "no":
+        with capsys.disabled():
+            print(output)
+```
+
+## RunResult API
+
+Prefer `assert_outcomes()` and `fnmatch_lines()` over manual `any(... in line ...)` — better failure messages.
+
+- `result.ret` — exit code
+- `result.outlines` / `result.errlines` — line lists
+- `result.assert_outcomes(passed=N, failed=N)`
+- `result.stdout.fnmatch_lines(["*pattern*"])`
diff --git a/.claude/commands/write-docstring.md b/.claude/commands/write-docstring.md
new file mode 100644
index 00000000000..2492cb0b6ff
--- /dev/null
+++ b/.claude/commands/write-docstring.md
@@ -0,0 +1,290 @@
+# Write Docstring
+
+Conventions for writing docstrings in `src/ethereum/`. Docstrings are the primary prose of the specification — they read as a narrative explaining how Ethereum works, not as traditional Python API documentation. They are rendered into HTML by docc, which parses them as **Markdown** (via mistletoe). Run this skill before writing or modifying docstrings.
+
+## General Rules
+
+- **Markdown only** — no reStructuredText (`.. directives::`, `:param:`, RST section underlines)
+- 79-character line limit (same as code)
+- Imperative mood for summaries ("Obtain" not "Obtains", "Return" not "Returns")
+- Summary on the line after opening `"""`
+- Blank line after the summary for multi-line docstrings
+- For multi-line docstrings, the closing `"""` should be on its own line
+- No `__init__` docstrings (D107 is disabled), only the class itself is documented
+- Reference link definitions go at the end of the docstring, after a blank line
+- Do not include constants/numeric values in the docstring (values in docstrings can easily desync with the code, and no tool will detect it)
+- Avoid restating what the code is doing (the code should speak for itself)
+- Avoid mentioning the current fork unnecessarily (creates noisy diffs between forks)
+- Docstrings should be reserved for meaningful specification, while comments (`# ...`) can be used to explain particulars of the Python reference implementation
+
+## Module Docstrings
+
+Module docstrings introduce the concepts in the module. They should read as narrative prose — imagine a textbook chapter opening.
+
+Start with a one-line summary, then expand with paragraphs that explain what the module contains and why. Use cross-references to link to the key types and functions defined in the module.
+
+```python
+"""
+Ethash is a proof-of-work algorithm designed to be [ASIC] resistant through
+[memory hardness][mem-hard].
+
+To achieve memory hardness, computing Ethash requires access to subsets of a
+large structure. The particular subsets chosen are based on the nonce and block
+header, while the set itself is changed every [`epoch`].
+
+At a high level, the Ethash algorithm is as follows:
+
+1. Create a **seed** value, generated with [`generate_seed`] and based on the
+   preceding block numbers.
+1. From the seed, compute a pseudorandom **cache** with [`generate_cache`].
+1. From the cache, generate a **dataset** with [`generate_dataset`]. The
+   dataset grows over time based on [`DATASET_EPOCH_GROWTH_SIZE`].
+1. Miners hash slices of the dataset together, which is where the memory
+   hardness is introduced. Verification of the proof-of-work only requires the
+   cache to be able to recompute a much smaller subset of the full dataset.
+
+[`DATASET_EPOCH_GROWTH_SIZE`]: ref:ethereum.ethash.DATASET_EPOCH_GROWTH_SIZE
+[`generate_dataset`]: ref:ethereum.ethash.generate_dataset
+[`generate_cache`]: ref:ethereum.ethash.generate_cache
+[`generate_seed`]: ref:ethereum.ethash.generate_seed
+[`epoch`]: ref:ethereum.ethash.epoch
+[ASIC]: https://en.wikipedia.org/wiki/Application-specific_integrated_circuit
+[mem-hard]: https://en.wikipedia.org/wiki/Memory-hard_function
+"""
+```
+
+Short modules that need no narrative can use a single-line summary:
+
+```python
+"""
+Utility functions used in this specification.
+"""
+```
+
+## Function Docstrings
+
+Function docstrings describe what the function does and why, as part of the specification narrative. Reference parameters inline with backticks — do **not** use formal `Parameters`, `Returns`, or `Raises` sections.
+
+### Short (summary only)
+
+```python
+def convert(balance: str) -> U256:
+    """
+    Convert a string in either hexadecimal or base-10 to a `U256`.
+    """
+```
+
+### Multi-paragraph (with context)
+
+```python
+def add_genesis_block(
+    hardfork: GenesisFork, chain: Any, genesis: GenesisConfiguration
+) -> None:
+    """
+    Add the genesis block to an empty blockchain.
+
+    The genesis block is an entirely sui generis block (unique) that is not
+    governed by the general rules applying to all other Ethereum blocks.
+    Instead, the only consensus requirement is that it must be identical to
+    the block added by this function.
+
+    The initial state is populated with balances based on the Ethereum presale
+    that happened on the Bitcoin blockchain. Additional ether worth 1.98% of
+    the presale was given to the foundation.
+
+    The `nonce` field is `0x42` referencing Douglas Adams' "HitchHiker's Guide
+    to the Galaxy".
+
+    On testnets the genesis configuration usually allocates 1 wei to addresses
+    `0x00` to `0xFF` to avoid edge cases around precompiles being created or
+    cleared (by [EIP-161]).
+
+    [EIP-161]: https://eips.ethereum.org/EIPS/eip-161
+    """
+```
+
+### With cross-references
+
+```python
+def cache_size(block_number: Uint) -> Uint:
+    """
+    Obtain the cache size (in bytes) of the epoch to which `block_number`
+    belongs.
+
+    See [`INITIAL_CACHE_SIZE`] and [`CACHE_EPOCH_GROWTH_SIZE`] for the initial
+    size and linear growth rate, respectively. The cache is generated in
+    [`generate_cache`].
+
+    The actual cache size is smaller than simply multiplying
+    `CACHE_EPOCH_GROWTH_SIZE` by the epoch number to minimize the risk of
+    unintended cyclic behavior. It is defined as the highest prime number below
+    what linear growth would calculate.
+
+    [`INITIAL_CACHE_SIZE`]: ref:ethereum.ethash.INITIAL_CACHE_SIZE
+    [`CACHE_EPOCH_GROWTH_SIZE`]: ref:ethereum.ethash.CACHE_EPOCH_GROWTH_SIZE
+    [`generate_cache`]: ref:ethereum.ethash.generate_cache
+    """
+```
+
+## Class Docstrings
+
+Brief summary of what the class represents, with optional narrative and cross-references.
+
+```python
+class GenesisConfiguration:
+    """
+    Configuration for the first block of an Ethereum chain.
+
+    Specifies the allocation of ether set out in the pre-sale, and some of
+    the fields of the genesis block.
+    """
+```
+
+```python
+class EvmTracer(Protocol):
+    """
+    [`Protocol`] that describes tracer functions.
+
+    See [`ethereum.trace`] for details about tracing in general, and
+    [`__call__`] for more on how to implement a tracer.
+
+    [`Protocol`]: https://docs.python.org/3/library/typing.html#typing.Protocol
+    [`ethereum.trace`]: ref:ethereum.trace
+    [`__call__`]: ref:ethereum.trace.EvmTracer.__call__
+    """
+```
+
+## Attribute Docstrings
+
+docc documents any assignment that is followed by a bare string literal. This is non-standard Python — normally only modules, classes, and functions can have docstrings. Place a triple-quoted string immediately after the assignment.
+
+This works for **constants**, **class fields**, **module-level variables**, and **type aliases**.
+
+### Constants
+
+```python
+EPOCH_SIZE = Uint(30000)
+"""
+Number of blocks before a dataset needs to be regenerated (known as an
+"epoch".) See [`epoch`].
+
+[`epoch`]: ref:ethereum.ethash.epoch
+"""
+```
+
+### Class fields
+
+```python
+class Example:
+    chain_id: U64
+    """
+    Discriminant between diverged blockchains; `1` for Ethereum's main network.
+    """
+```
+
+### Module-level variables
+
+```python
+_evm_trace: EvmTracer = discard_evm_trace
+"""
+Active [`EvmTracer`] that is used for generating traces.
+
+[`EvmTracer`]: ref:ethereum.trace.EvmTracer
+"""
+```
+
+### Type aliases
+
+```python
+TraceEvent = (
+    TransactionStart
+    | TransactionEnd
+    | PrecompileStart
+    | PrecompileEnd
+    | OpStart
+    | OpEnd
+    | OpException
+    | EvmStop
+    | GasAndRefund
+)
+"""
+All possible types of events that an [`EvmTracer`] is expected to handle.
+
+[`EvmTracer`]: ref:ethereum.trace.EvmTracer
+"""
+```
+
+## Cross-References
+
+docc resolves Markdown reference links with the `ref:` scheme into hyperlinks in the generated documentation.
+
+### Internal (to other Python objects)
+
+Use backtick-wrapped names as the link text, with `ref:` pointing to the fully-qualified path:
+
+```
+[`ForkCriteria`]: ref:ethereum.fork_criteria.ForkCriteria
+[`generate_cache`]: ref:ethereum.ethash.generate_cache
+```
+
+Short aliases work when the full name is unwieldy:
+
+```
+[ds]: ref:ethereum.ethash.DATASET_EPOCH_GROWTH_SIZE
+```
+
+### External URLs
+
+Standard Markdown reference links:
+
+```
+[ASIC]: https://en.wikipedia.org/wiki/Application-specific_integrated_circuit
+[EIP-3155]: https://eips.ethereum.org/EIPS/eip-3155
+```
+
+Bare URLs in angle brackets for inline use:
+
+```
+Available at <https://github.com/ethereum/genesis_block_generator>.
+```
+
+If a URL is too long to include because of the line length limit, you can add `# noqa: E501` after the trailing `"""` to squelch the warning (but this should be a last resort).
+
+### Usage in text
+
+Reference links are used inline with brackets:
+
+```
+For these intentional forks to succeed, all participants need to agree on
+exactly when to switch rules. The agreed upon criteria are represented by
+subclasses of [`ForkCriteria`], like [`ByBlockNumber`] and [`ByTimestamp`].
+```
+
+## Markdown Formatting
+
+- `_italic_` to introduce domain terms: `_Genesis_ is the term for...`
+- `**bold**` to highlight key concepts: `Create a **seed** value`
+- Backticks for code references: `` `block_number` ``, `` `0x42` ``
+- Numbered lists (`1.`) for sequential steps
+- Bullet lists (`-`) for unordered items
+- Markdown headings are rarely needed inside docstrings; use paragraphs instead
+
+## Anti-Patterns
+
+- **No RST directives**: `.. contents::`, `.. note::`, `:param:`, `:returns:` — these are outdated
+- **No NumPy/Google sections**: no `Parameters\n----------` or `Args:` blocks
+- **No RST section underlines**: `Introduction\n------------` is RST, not Markdown
+- **No type repetition in docstrings**: types come from annotations, not prose
+- **No empty boilerplate**: don't write `"""Ethereum Specification."""` with a `.. contents::` block — write real narrative or a concise summary
+- **Don't skip attribute docstrings**: constants and fields deserve explanations
+
+## Reference Files
+
+For examples of well-written docstrings, see:
+
+- `src/ethereum/ethash.py` — narrative module + function docstrings
+- `src/ethereum/genesis.py` — class, attribute, and multi-paragraph function docstrings
+- `src/ethereum/trace.py` — class, attribute, and protocol docstrings
+- `src/ethereum/fork_criteria.py` — narrative module docstring with Markdown formatting
+
+If these files no longer exist or are no longer good examples, abort with an appropriate error message.
diff --git a/.claude/commands/write-test.md b/.claude/commands/write-test.md
index 5fc15c6c31d..c3b654cdc7e 100644
--- a/.claude/commands/write-test.md
+++ b/.claude/commands/write-test.md
@@ -61,6 +61,10 @@ Conventions and patterns for writing consensus tests. Run this skill before writ
 - `@pytest.mark.parametrize("name", [pytest.param(val, id="label"), ...])` with descriptive `id=` strings
 - Stack parametrize decorators for multiple dimensions
 
+## Unit Tests (execution_testing package)
+
+Plain pytest. Tests are co-located with each module under `packages/testing/src/execution_testing/` in a sibling `tests/` directory. When adding a guardrail or validation, verify the tests fail without the change and pass with it.
+
 ## After Writing Tests
 
 After writing or modifying tests, ask the user: "Would you like me to load the `/fill-tests` skill to verify the new tests fill correctly? (This loads an additional skill into context.)" If they agree, run `/fill-tests`, fill the new tests, then inspect the generated fixture JSON to verify the fixture contents match what the test intends.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 0d5b8b038dc..d0e5e1a21b7 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,9 +9,9 @@ N/A.
 ## ✅ Checklist
 <!-- Please check off all required items. For those that don't apply remove them accordingly. -->
 
-- [ ] All: Ran fast `tox` checks to avoid unnecessary CI fails, see also [Code Standards](https://eest.ethereum.org/main/getting_started/code_standards/) and [Enabling Pre-commit Checks](https://eest.ethereum.org/main/dev/precommit/):
+- [ ] All: Ran fast static checks to avoid unnecessary CI fails, see also [Code Standards](https://eest.ethereum.org/main/getting_started/code_standards/) and [Enabling Pre-commit Checks](https://eest.ethereum.org/main/dev/precommit/):
     ```console
-    uvx tox -e static
+    just static
     ```
 - [ ] All: PR title adheres to the [repo standard](https://eest.ethereum.org/main/getting_started/contributing/?h=contri#commit-messages-issue-and-pr-titles) - it will be used as the squash commit message and should start `type(scope):`.
 - [ ] All: Considered updating the online docs in the [./docs/](/ethereum/execution-specs/blob/HEAD/docs/) directory.
diff --git a/.github/actions/build-fixtures/action.yaml b/.github/actions/build-fixtures/action.yaml
index 683c6cebace..71800e90667 100644
--- a/.github/actions/build-fixtures/action.yaml
+++ b/.github/actions/build-fixtures/action.yaml
@@ -4,6 +4,15 @@ inputs:
   release_name:
     description: "Name of the fixture release"
     required: true
+  from_fork:
+    description: "Fill from this fork (inclusive). Empty for unsplit builds."
+    default: ""
+  until_fork:
+    description: "Fill until this fork (inclusive). Empty for unsplit builds."
+    default: ""
+  split_label:
+    description: "Label for this fork-range split. Empty for unsplit builds."
+    default: ""
 runs:
   using: "composite"
   steps:
@@ -25,17 +34,41 @@ runs:
       with:
         type: ${{ steps.properties.outputs.evm-type }}
     - name: Install pigz for parallel tarball compression
+      if: inputs.split_label == ''
       shell: bash
       run: sudo apt-get install -y pigz
     - name: Generate fixtures using fill
       shell: bash
       run: |
+        IS_SPLIT="${{ inputs.split_label }}"
+
+        if [ -n "$IS_SPLIT" ]; then
+          OUTPUT_ARG="--output=fixtures_${{ inputs.release_name }}"
+          FORK_ARGS="--from=${{ inputs.from_fork }} --until=${{ inputs.until_fork }}"
+        else
+          OUTPUT_ARG="--output=fixtures_${{ inputs.release_name }}.tar.gz"
+          FORK_ARGS=""
+        fi
+
+        # Allow exit code 5 (NO_TESTS_COLLECTED) for fork ranges with no tests.
+        EXIT_CODE=0
         if [ "${{ steps.evm-builder.outputs.impl }}" = "eels" ]; then
-          uv run fill -n ${{ steps.evm-builder.outputs.x-dist }} ${{ steps.properties.outputs.fill-params }} --output=fixtures_${{ inputs.release_name }}.tar.gz --build-name ${{ inputs.release_name }} --no-html --durations=100 --log-level=DEBUG
+          uv run fill -n ${{ steps.evm-builder.outputs.x-dist }} ${{ steps.properties.outputs.fill-params }} $FORK_ARGS $OUTPUT_ARG --build-name ${{ inputs.release_name }} --no-html --durations=100 --log-level=DEBUG || EXIT_CODE=$?
         else
-          uv run fill -n ${{ steps.evm-builder.outputs.x-dist }} --evm-bin=${{ steps.evm-builder.outputs.evm-bin }} ${{ steps.properties.outputs.fill-params }} --output=fixtures_${{ inputs.release_name }}.tar.gz --build-name ${{ inputs.release_name }} --no-html --durations=100 --log-level=DEBUG
+          uv run fill -n ${{ steps.evm-builder.outputs.x-dist }} --evm-bin=${{ steps.evm-builder.outputs.evm-bin }} ${{ steps.properties.outputs.fill-params }} $FORK_ARGS $OUTPUT_ARG --build-name ${{ inputs.release_name }} --no-html --durations=100 --log-level=DEBUG || EXIT_CODE=$?
+        fi
+        if [ "$EXIT_CODE" -ne 0 ] && [ "$EXIT_CODE" -ne 5 ]; then
+          exit "$EXIT_CODE"
         fi
     - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
       with:
         name: fixtures_${{ inputs.release_name }}
         path: fixtures_${{ inputs.release_name }}.tar.gz
+    - name: Upload fixture directory (split)
+      if: inputs.split_label != ''
+      uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+      with:
+        name: fixtures__${{ inputs.split_label }}
+        include-hidden-files: true
+        path: fixtures_${{ inputs.release_name }}/
+        if-no-files-found: ignore
diff --git a/.github/actions/setup-uv/action.yaml b/.github/actions/setup-uv/action.yaml
index 578d7fde3b0..cf251242a69 100644
--- a/.github/actions/setup-uv/action.yaml
+++ b/.github/actions/setup-uv/action.yaml
@@ -1,5 +1,5 @@
-name: Setup uv and tox
-description: Install uv, Python, and tox for CI jobs
+name: Setup uv and just
+description: Install uv, Python, and just for CI jobs
 inputs:
   python-version:
     description: Python version to install (e.g. "3.14", "pypy3.11")
@@ -14,7 +14,7 @@ runs:
   using: "composite"
   steps:
     - name: Install uv and python ${{ inputs.python-version }}
-      uses: astral-sh/setup-uv@e06108dd0aef18192324c70427afc47652e63a82  # v7.5.0
+      uses: astral-sh/setup-uv@e06108dd0aef18192324c70427afc47652e63a82 # v7.5.0
       with:
         enable-cache: ${{ inputs.enable-cache }}
         cache-dependency-glob: ${{ inputs.cache-dependency-glob }}
@@ -23,6 +23,7 @@ runs:
     - name: Prefer uv-managed Python over system Python
       shell: bash
       run: echo "UV_PYTHON_PREFERENCE=only-managed" >> "$GITHUB_ENV"
-    - name: Install tox
-      shell: bash
-      run: uv tool install tox
+    - name: Install just
+      uses: taiki-e/install-action@e24b8b7a939c6a537188f34a4163cb153dd85cf6 # v2.69.1
+      with:
+        tool: just@1.46
diff --git a/.github/configs/evm.yaml b/.github/configs/evm.yaml
index d8ec22827a5..66df506394a 100644
--- a/.github/configs/evm.yaml
+++ b/.github/configs/evm.yaml
@@ -1,8 +1,4 @@
-stable:
-  impl: eels
-  repo: null
-  ref: null
-develop:
+eels:
   impl: eels
   repo: null
   ref: null
diff --git a/.github/configs/feature.yaml b/.github/configs/feature.yaml
index 4fd98921c2c..4e4822c1579 100644
--- a/.github/configs/feature.yaml
+++ b/.github/configs/feature.yaml
@@ -1,11 +1,7 @@
 # Unless filling for special features, all features should fill for previous forks (starting from Frontier) too
-stable:
-  evm-type: stable
-  fill-params: --until=Prague --fill-static-tests --ignore=tests/static/state_tests/stQuadraticComplexityTest
-
-develop:
-  evm-type: develop
-  fill-params: --until=BPO4 --fill-static-tests --ignore=tests/static/state_tests/stQuadraticComplexityTest
+mainnet:
+  evm-type: eels
+  fill-params: --until=BPO2 --generate-all-formats
 
 monad:
   evm-type: develop
diff --git a/.github/configs/fork-ranges.yaml b/.github/configs/fork-ranges.yaml
new file mode 100644
index 00000000000..feb5ed48e38
--- /dev/null
+++ b/.github/configs/fork-ranges.yaml
@@ -0,0 +1,21 @@
+# Shared fork ranges for splitting multi-fork releases across parallel runners.
+# Features using --until are automatically split using applicable ranges.
+# Features using --fork (single fork) are never split.
+- label: pre-cancun
+  from: Frontier
+  until: Shanghai
+- label: cancun
+  from: Cancun
+  until: Cancun
+- label: prague
+  from: Prague
+  until: Prague
+- label: osaka
+  from: Osaka
+  until: Osaka
+- label: bpo
+  from: BPO1
+  until: BPO2
+- label: amsterdam
+  from: Amsterdam
+  until: Amsterdam
diff --git a/.github/scripts/create_release_tarball.py b/.github/scripts/create_release_tarball.py
new file mode 100644
index 00000000000..1f4e7d47a2f
--- /dev/null
+++ b/.github/scripts/create_release_tarball.py
@@ -0,0 +1,84 @@
+#!/usr/bin/env -S uv run --script
+#
+# /// script
+# requires-python = ">=3.12"
+# dependencies = []
+# ///
+"""
+Create a release tarball from a merged fixture directory.
+
+Archive all ``.json`` and ``.ini`` files under a ``fixtures/`` prefix,
+matching the structure produced by
+``execution_testing.cli.pytest_commands.plugins.shared.fixture_output``.
+
+Use ``pigz`` for parallel compression when available, otherwise fall
+back to Python's built-in gzip.
+"""
+
+import shutil
+import subprocess
+import sys
+import tarfile
+import warnings
+from pathlib import Path
+
+
+def create_tarball_with_pigz(source_dir: Path, output_path: Path) -> None:
+    """Create tarball using Python tarfile + pigz for parallel compression."""
+    temp_tar = output_path.with_suffix("")  # strip .gz
+
+    with tarfile.open(temp_tar, "w") as tar:
+        for file in sorted(source_dir.rglob("*")):
+            if file.is_file() and file.suffix in {".json", ".ini"}:
+                arcname = Path("fixtures") / file.relative_to(source_dir)
+                tar.add(file, arcname=str(arcname))
+
+    subprocess.run(
+        ["pigz", "-f", str(temp_tar)],
+        check=True,
+        capture_output=True,
+    )
+
+
+def create_tarball_standard(source_dir: Path, output_path: Path) -> None:
+    """Create tarball using Python's tarfile module (single-threaded)."""
+    with tarfile.open(output_path, "w:gz") as tar:
+        for file in sorted(source_dir.rglob("*")):
+            if file.is_file() and file.suffix in {".json", ".ini"}:
+                arcname = Path("fixtures") / file.relative_to(source_dir)
+                tar.add(file, arcname=str(arcname))
+
+
+def main() -> None:
+    """Entry point."""
+    if len(sys.argv) != 3:
+        print(
+            "Usage: create_release_tarball.py <source_dir> <output.tar.gz>",
+            file=sys.stderr,
+        )
+        sys.exit(1)
+
+    source_dir = Path(sys.argv[1])
+    output_path = Path(sys.argv[2])
+
+    if not source_dir.is_dir():
+        print(f"Error: '{source_dir}' is not a directory.", file=sys.stderr)
+        sys.exit(1)
+
+    if shutil.which("pigz"):
+        try:
+            create_tarball_with_pigz(source_dir, output_path)
+        except (subprocess.CalledProcessError, OSError) as e:
+            warnings.warn(
+                f"pigz failed ({type(e).__name__}: {e}), falling back to gzip",
+                stacklevel=2,
+            )
+            create_tarball_standard(source_dir, output_path)
+    else:
+        create_tarball_standard(source_dir, output_path)
+
+    print(f"Created {output_path}")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/.github/scripts/generate_build_matrix.py b/.github/scripts/generate_build_matrix.py
new file mode 100644
index 00000000000..de8b3b5144a
--- /dev/null
+++ b/.github/scripts/generate_build_matrix.py
@@ -0,0 +1,160 @@
+#!/usr/bin/env -S uv run --script
+#
+# /// script
+# requires-python = ">=3.12"
+# dependencies = [
+#     "pyyaml",
+# ]
+# ///
+"""
+Generate the build matrix for release fixture workflows.
+
+Read `.github/configs/feature.yaml` and emit a flat JSON build matrix
+suitable for ``strategy.matrix`` in GitHub Actions.
+
+Features whose ``fill-params`` contain ``--until`` are split across the
+shared fork ranges defined in `.github/configs/fork-ranges.yaml`.
+Features using ``--fork`` (single fork) produce a single unsplit entry.
+"""
+
+import json
+import re
+import sys
+from pathlib import Path
+
+import yaml
+
+FEATURE_CONFIG = Path(".github/configs/feature.yaml")
+FORK_RANGES_CONFIG = Path(".github/configs/fork-ranges.yaml")
+
+# Canonical fork ordering used to filter fork ranges per feature.
+FORK_ORDER = [
+    "Frontier",
+    "Homestead",
+    "DAOFork",
+    "TangerineWhistle",
+    "SpuriousDragon",
+    "Byzantium",
+    "Constantinople",
+    "Istanbul",
+    "MuirGlacier",
+    "Berlin",
+    "London",
+    "ArrowGlacier",
+    "GrayGlacier",
+    "Paris",
+    "Shanghai",
+    "Cancun",
+    "Prague",
+    "Osaka",
+    "BPO1",
+    "BPO2",
+    "Amsterdam",
+]
+
+FORK_INDEX = {name: i for i, name in enumerate(FORK_ORDER)}
+
+
+def load_config(path: Path) -> dict:
+    """Load and return the feature configuration."""
+    with open(path) as f:
+        return yaml.safe_load(f)
+
+
+def parse_until_fork(fill_params: str) -> str | None:
+    """
+    Extract the ``--until`` value from fill-params.
+
+    Return ``None`` when ``--fork`` is used instead (single-fork
+    feature that should not be split).
+    """
+    if re.search(r"--fork\b", fill_params):
+        return None
+    m = re.search(r"--until[=\s]+(\S+)", fill_params)
+    return m.group(1) if m else None
+
+
+def applicable_ranges(fork_ranges: list[dict], until_fork: str) -> list[dict]:
+    """
+    Return fork ranges whose ``from`` is at or before *until_fork*.
+
+    Clamp the last applicable range's ``until`` to *until_fork* so we
+    never fill beyond the feature's declared boundary.
+    """
+    limit = FORK_INDEX[until_fork]
+    result = []
+    for r in fork_ranges:
+        if FORK_INDEX[r["from"]] <= limit:
+            entry = dict(r)
+            if FORK_INDEX[r["until"]] > limit:
+                entry["until"] = until_fork
+            result.append(entry)
+    return result
+
+
+def build_matrix(
+    feature: dict, name: str, fork_ranges: list[dict]
+) -> tuple[list[dict], str]:
+    """
+    Build the matrix for a single feature.
+
+    Return (build_entries, combine_labels).  Split features produce
+    one entry per fork range and a space-separated label string for
+    the combine step.  Unsplit features produce a single entry with
+    empty labels.
+    """
+    until = parse_until_fork(feature["fill-params"])
+    if until and fork_ranges:
+        ranges = applicable_ranges(fork_ranges, until)
+        if len(ranges) > 1:
+            build = [
+                {
+                    "feature": name,
+                    "label": r["label"],
+                    "from_fork": r["from"],
+                    "until_fork": r["until"],
+                }
+                for r in ranges
+            ]
+            labels = " ".join(r["label"] for r in ranges)
+            return build, labels
+
+    return [
+        {
+            "feature": name,
+            "label": "",
+            "from_fork": "",
+            "until_fork": "",
+        }
+    ], ""
+
+
+def main() -> None:
+    """Entry point."""
+    if len(sys.argv) != 2:
+        print(
+            "Usage: generate_build_matrix.py <feature>",
+            file=sys.stderr,
+        )
+        sys.exit(1)
+
+    config = load_config(FEATURE_CONFIG)
+    fork_ranges = load_config(FORK_RANGES_CONFIG) or []
+    name = sys.argv[1]
+
+    if name not in config or not isinstance(config[name], dict):
+        print(
+            f"Error: feature '{name}' not found in {FEATURE_CONFIG}.",
+            file=sys.stderr,
+        )
+        sys.exit(1)
+
+    build, labels = build_matrix(config[name], name, fork_ranges)
+
+    print(f"build_matrix={json.dumps(build)}")
+    print(f"feature_name={name}")
+    print(f"combine_labels={labels}")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/.github/scripts/merge_index_files.py b/.github/scripts/merge_index_files.py
new file mode 100644
index 00000000000..ea41b299a10
--- /dev/null
+++ b/.github/scripts/merge_index_files.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+"""
+Merge multiple .meta/index.json files from split fixture builds.
+
+Accept fixture directories as arguments, load each directory's
+``.meta/index.json``, merge them via ``IndexFile.merge()``, and write
+the result to the specified output path.
+"""
+
+import sys
+from pathlib import Path
+
+from execution_testing.fixtures.consume import IndexFile
+
+
+def main() -> None:
+    """Entry point."""
+    if len(sys.argv) < 3:
+        print(
+            "Usage: merge_index_files.py <output.json>"
+            " <fixture_dir> [<fixture_dir> ...]",
+            file=sys.stderr,
+        )
+        sys.exit(1)
+
+    output_path = Path(sys.argv[1])
+    fixture_dirs = [Path(d) for d in sys.argv[2:]]
+
+    indexes: list[IndexFile] = []
+    for d in fixture_dirs:
+        index_path = d / ".meta" / "index.json"
+        if not index_path.exists():
+            print(f"Skipping {d} (no .meta/index.json)")
+            continue
+        indexes.append(IndexFile.model_validate_json(index_path.read_text()))
+
+    if not indexes:
+        print("No index files found, nothing to merge.")
+        sys.exit(0)
+
+    merged = IndexFile.merge(indexes)
+    output_path.parent.mkdir(parents=True, exist_ok=True)
+    output_path.write_text(merged.model_dump_json(indent=2))
+    print(f"Merged {len(indexes)} index files ({merged.test_count} tests)")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/.github/workflows/release_fixture_feature.yaml b/.github/workflows/release_fixture_feature.yaml
index 72688ea26dd..dc959731263 100644
--- a/.github/workflows/release_fixture_feature.yaml
+++ b/.github/workflows/release_fixture_feature.yaml
@@ -1,4 +1,4 @@
-name: Create Fixture Feature Release
+name: Create Fixture Release
 
 on:
   push:
@@ -7,32 +7,35 @@ on:
   workflow_dispatch:
 
 jobs:
-  feature-names:
+  setup:
     runs-on: ubuntu-24.04
     outputs:
-      names: ${{ steps.feature-name.outputs.names }}
+      build_matrix: ${{ steps.matrix.outputs.build_matrix }}
+      feature_name: ${{ steps.matrix.outputs.feature_name }}
+      combine_labels: ${{ steps.matrix.outputs.combine_labels }}
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           submodules: false
+      - uses: ./.github/actions/setup-uv
 
-      - name: Get feature names
-        id: feature-name
+      - name: Generate build matrix
+        id: matrix
         shell: bash
         run: |
           FEATURE_PREFIX="${GITHUB_REF_NAME//@*/}"
           FEATURE_NAME="${FEATURE_PREFIX#tests-}"
-          names=$(grep -Po "^${FEATURE_NAME}(?=:)" .github/configs/feature.yaml | jq  --raw-input .  | jq -c --slurp .)
-          echo "names=${names}"
-          echo "names=${names}" >> "$GITHUB_OUTPUT"
+          uv run -q .github/scripts/generate_build_matrix.py "$FEATURE_NAME" >> "$GITHUB_OUTPUT"
 
   build:
-    needs: feature-names
+    name: fill (${{ matrix.label || matrix.feature }})
+    needs: setup
     runs-on: ubuntu-24.04
     timeout-minutes: 1440
     strategy:
+      fail-fast: true
       matrix:
-        feature: ${{ fromJSON(needs.feature-names.outputs.names) }}
+        include: ${{ fromJson(needs.setup.outputs.build_matrix) }}
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
@@ -41,19 +44,80 @@ jobs:
       - uses: ./.github/actions/build-fixtures
         with:
           release_name: ${{ matrix.feature }}
+          from_fork: ${{ matrix.from_fork }}
+          until_fork: ${{ matrix.until_fork }}
+          split_label: ${{ matrix.label }}
+
+  combine:
+    name: combine (${{ needs.setup.outputs.feature_name }})
+    needs: [setup, build]
+    if: needs.setup.outputs.combine_labels != ''
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          submodules: false
+      - uses: ./.github/actions/setup-uv
+      - name: Install pigz
+        run: sudo apt-get install -y pigz
+      - name: Download and merge split artifacts
+        shell: bash
+        run: |
+          mkdir -p combined
+          for label in ${{ needs.setup.outputs.combine_labels }}; do
+            echo "Downloading: fixtures__${label}"
+            if gh run download ${{ github.run_id }} -n "fixtures__${label}" --dir "split_artifacts/fixtures__${label}"; then
+              cp -r "split_artifacts/fixtures__${label}"/* combined/
+            else
+              echo "No artifact for ${label} (no tests collected, skipping)"
+            fi
+          done
+          echo "Combined directory contents:"
+          find combined -maxdepth 3 -type d | head -30 || true
+        env:
+          GH_TOKEN: ${{ github.token }}
+      - name: Merge split index files
+        shell: bash
+        run: |
+          SPLIT_DIRS=()
+          for label in ${{ needs.setup.outputs.combine_labels }}; do
+            dir="split_artifacts/fixtures__${label}"
+            if [ -d "$dir" ]; then
+              SPLIT_DIRS+=("$dir")
+            fi
+          done
+          if [ ${#SPLIT_DIRS[@]} -gt 0 ]; then
+            uv run python .github/scripts/merge_index_files.py combined/.meta/index.json "${SPLIT_DIRS[@]}"
+          fi
+      - name: Free disk space
+        run: rm -rf split_artifacts/
+      - name: Create release tarball
+        shell: bash
+        run: |
+          uv run -q .github/scripts/create_release_tarball.py combined fixtures_${{ needs.setup.outputs.feature_name }}.tar.gz
+      - name: Upload combined fixture tarball
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        with:
+          name: fixtures_${{ needs.setup.outputs.feature_name }}
+          path: fixtures_${{ needs.setup.outputs.feature_name }}.tar.gz
 
   release:
     runs-on: ubuntu-24.04
-    needs: build
-    if: startsWith(github.ref, 'refs/tags/tests-')
+    needs: [setup, build, combine]
+    if: always() && needs.build.result == 'success' && (needs.combine.result == 'success' || needs.combine.result == 'skipped') && startsWith(github.ref, 'refs/tags/tests-')
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           submodules: false
+          fetch-depth: 0
 
-      - name: Download all artifacts
+      - name: Download release artifacts
+        shell: bash
         run: |
-          gh run download ${{ github.run_id }} --dir ./artifacts
+          gh run download ${{ github.run_id }} -p "fixtures_*" --dir ./artifacts
+          rm -rf ./artifacts/fixtures__*/
         env:
           GH_TOKEN: ${{ github.token }}
 
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
deleted file mode 100644
index c59d637e499..00000000000
--- a/.github/workflows/stale.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Manage stale issues and PRs
-on:
-  schedule:
-    - cron: '0 0 * * *'  # runs daily
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f  # v10.2.0
-        with:
-          # --- Stale settings ---
-          days-before-stale: 60
-
-          # raise this from the default 30
-          operations-per-run: 200
-
-          # process oldest first
-          ascending: true
-
-          # --- PR settings ---
-          days-before-pr-close: -1      # Never auto-close PRs
-          stale-pr-label: 'stale'
-          stale-pr-message: 'This PR has had no recent activity and has been marked as stale.'
-          close-pr-message: 'Closing this PR due to inactivity.'
-
-          # --- Issue settings ---
-          days-before-issue-close: -1   # Never auto-close issues
-          stale-issue-label: 'stale'
-          stale-issue-message: 'This issue has had no recent activity and has been marked as stale.'
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index a0b07af8ea9..613a4f8000d 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -12,7 +12,7 @@ on:
       - ".gitignore"
       - ".vscode/**"
       - "whitelist.txt"
-      - "docs/**"                                                                                                                     
+      - "docs/**"
       - "mkdocs.yml"
   workflow_dispatch:
   pull_request:
@@ -22,7 +22,7 @@ on:
       - ".gitignore"
       - ".vscode/**"
       - "whitelist.txt"
-      - "docs/**"                                                                                                                     
+      - "docs/**"
       - "mkdocs.yml"
 
 concurrency:
@@ -42,8 +42,26 @@ jobs:
       - name: Install build dependencies
         shell: bash
         run: sudo DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes build-essential pkg-config
+      - name: Detect Python version
+        id: python
+        shell: bash
+        run: echo "version=$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')" >> "$GITHUB_OUTPUT"
+      - name: Restore mypy cache
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        with:
+          path: .mypy_cache
+          key: mypy-${{ runner.os }}-py${{ steps.python.outputs.version }}-${{ hashFiles('uv.lock') }}-${{ github.sha }}
+          restore-keys: |
+            mypy-${{ runner.os }}-py${{ steps.python.outputs.version }}-${{ hashFiles('uv.lock') }}-
+            mypy-${{ runner.os }}-py${{ steps.python.outputs.version }}-
       - name: Run static checks
-        run: tox -e static
+        run: just static
+      - name: Save mypy cache
+        if: always()
+        uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        with:
+          path: .mypy_cache
+          key: mypy-${{ runner.os }}-py${{ steps.python.outputs.version }}-${{ hashFiles('uv.lock') }}-${{ github.sha }}
       - name: Validate workflow config variables
         run: |
           cat >> .github/actionlint.yaml << 'EOF'
diff --git a/.gitignore b/.gitignore
index 827d04d6a69..12f73d03081 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,9 @@
 
 # AI
 .claude/settings.local.json
+CLAUDE.local.md
+.mb/
+mb/
 .devcontainer
 
 # Benchmark fixed opcode counts
@@ -19,6 +22,7 @@
 # Cache
 cached_downloads/
 .cache
+.mypy_cache
 .mypy_cache/
 .ruff_cache/
 __pycache__/
@@ -47,6 +51,8 @@ MANIFEST
 # Python virtual environment
 .venv/
 venv/
+# User config; not imposed
+.python-version
 
 # pycharm
 .idea/
@@ -65,6 +71,8 @@ pip-log.txt
 pip-delete-this-directory.txt
 
 .tox/
+.just/
+tests/json_loader/bench_gas_fixtures
 
 /doc/_autosummary
 
@@ -89,3 +97,6 @@ logs/
 env.yaml
 
 site/
+
+# Temporary data; used for generated checklists
+tmp/
diff --git a/CLAUDE.md b/CLAUDE.md
index eb3a2e04fd0..c2aeb8fb7df 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -4,7 +4,7 @@ Ethereum Execution Layer Specification written in Python. This is a **specificat
 
 ## Tooling
 
-- **uv** is the package manager. **tox** orchestrates test environments (`uvx tox -al`).
+- **uv** is the package manager. **just** is the command runner (`just --list`).
 - The `execution_testing` package under `packages/testing/` is a UV workspace member.
 
 ## Linting
@@ -42,17 +42,20 @@ When reviewing PRs that implement or test EIPs:
 ## When to Use Skills
 
 - Writing or modifying tests → run `/write-test` first
+- Writing or modifying pytester-based plugin tests → run `/pytester` first
 - Filling test fixtures → run `/fill-tests` first
 - Implementing an EIP or modifying fork code in `src/` → run `/implement-eip` first
 - Modifying GitHub Actions workflows → run `/edit-workflow` first
 - Assessing EIP complexity or scope → run `/assess-eip`
 - Working on EIP test coverage or checklists → run `/eip-checklist` first
 - Checking if config/skills are stale → run `/audit-config`
+- Writing or modifying docstrings in `src/ethereum/` → run `/write-docstring` first
 - Done with changes and ready to lint → run `/lint`
 
 ## Available Skills
 
 - `/write-test` — test writing patterns, fixtures, markers, bytecode helpers
+- `/pytester` — pytester execution modes, isolation, output handling for plugin tests
 - `/fill-tests` — `fill` CLI reference, flags, debugging, benchmark tests
 - `/implement-eip` — fork structure, import rules, adding opcodes/precompiles/tx types
 - `/edit-workflow` — GitHub Actions conventions and version pinning
@@ -60,4 +63,5 @@ When reviewing PRs that implement or test EIPs:
 - `/eip-checklist` — EIP testing checklist system for tracking coverage
 - `/lint` — full static analysis suite with auto-fix workflow
 - `/audit-config` — verify CLAUDE.md and skills are still accurate
+- `/write-docstring` — narrative Markdown docstring conventions for the spec
 - `/grammar-check` — audit grammar in documentation and code comments
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bff6f1bd808..13dd3058c30 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,274 +1,46 @@
 # Contribution Guidelines
 
-Help is always welcome and there are plenty of options to contribute to the Ethereum Execution Layer Specifications (EELS).
+Help is always welcome. The Ethereum Execution Layer Specifications (EELS) are a community effort and we appreciate support in the following areas:
 
-In particular, we appreciate support in the following areas:
-
-- Reporting issues
-- Fixing and responding to [issues](https://github.com/ethereum/execution-specs/issues), especially those tagged as [E-easy](https://github.com/ethereum/execution-specs/labels/E-easy) which are meant as introductory issues for external contributors.
+- Reporting issues.
+- Fixing and responding to [issues](https://github.com/ethereum/execution-specs/issues), especially those tagged [E-easy](https://github.com/ethereum/execution-specs/labels/E-easy), which are intended as introductory issues for external contributors.
 - Improving the documentation.
 
 > [!IMPORTANT]
-> Generally, we do not assign issues to external contributors. If you want to work on an issue, you are very welcome to go ahead and make a pull request. We would, however, be happy to answer questions you may have before you start implementing.
-
-For details about EELS usage and building, please refer to the [README](https://github.com/ethereum/execution-specs/blob/master/README.md#usage)
-
-## Contribution Guidelines
-
-This specification aims to be:
-
-1. **Correct** - Describe the _intended_ behavior of the Ethereum blockchain, and any deviation from that is a bug.
-2. **Complete** - Capture the entirety of _consensus critical_ parts of Ethereum.
-3. **Accessible** - Prioritize readability, clarity, and plain language over performance and brevity.
-
-### Style
-
-#### Spelling and Naming
-
-- Attempt to use descriptive English words (or _very common_ abbreviations) in documentation and identifiers.
-- Avoid using EIP numbers in identifiers, and prefer descriptive text instead (eg. `FeeMarketTransaction` instead of `Eip1559Transaction`).
-- If necessary, there is a custom dictionary `whitelist.txt`.
-- Avoid uninformative prefixes in identifiers (like `get_` or `compute_`). They don't add useful meaning and take up valuable real estate.
-
-#### Comments
-
-- Don't repeat what is obvious from the code.
-- <details>
-    <summary><em>(expand)</em> Consider how future changes will interleave with yours, especially when creating semantic blocks.</summary>
-
-    <br>Consider:
-    <table valign="top">
-
-    <tr valign="top">
-    <th>Fork T</th>
-    <th>Fork T+1</th>
-    </tr>
-
-    <tr valign="top">
-
-    <td>
-
-    <!--
-        Note that the trailing whitespace is necessary to move the copy button
-        in the github UI over so it doesn't obscure the text.
-    -->
-
-    ```python
-    # EIP-1234: The dingus is the rate of fleep      
-    dingus = a + b
-    dingus += c ^ d
-    dingus /= fleep(e)
-    ```
-
-    </td>
-
-    <td>
-
-    ```python
-    # EIP-1234: The dingus is the rate of fleep      
-    dingus = a + b
-
-    # EIP-4567: Frobulate the dingus
-    dingus = frobulate(dingus)
-
-    dingus += c ^ d        # <-
-    dingus /= fleep(e)     # <-
-    ```
-
-    </td>
-
-    </tr>
-
-    </table>
-
-    The marked lines (`<-`) are now incorrectly attributed to EIP-4567 in Fork+1. Instead, omit the EIP identifier in the comments, and describe the changes introduced by the EIP in the function's docstrings. The rendered diffs will make it pretty obvious what's changed.
-  </details>
-
-#### Docstrings
-
-- Write in complete sentences, providing necessary background and context for the associated code.
-- Function and method docstrings must use the imperative mood in the summary line.
-    - **Good:** Build the house using the provided lumber.
-    - **Bad:** Builds the house using the provided lumber.
-- Always start with a single-line summary. When more detail is needed, use a multi-line docstring with a blank line after the summary line.
-    - **One-line summary:**
-
-      ```python
-      """Return the pathname of the KOS root directory."""
-      ```
-
-    - **Multi-line:**
-
-      ```python
-      """
-      Add a bloom entry to the bloom filter.
-
-      The number of hash functions used is 3. They are calculated by
-      taking the least significant 11 bits from the first 3 16-bit
-      words of the `keccak_256()` hash of `bloom_entry`.
-      """
-      ```
-
-- Format using markdown.
-- Links to relevant standards and EIPs may be specified using reference-style links.
-
-  ```python
-  """
-  Minimum gas cost per byte of calldata as per [EIP-7976].
-
-  [EIP-7976]: https://eips.ethereum.org/EIPS/eip-7976
-  """
-  ```
-
-- Avoid beginning docstrings with an article ("the"/"a") or a pronoun ("it", "they", etc.).
-- Don't include the function's signature.
-
-##### Constants
-
-- Do not include constant values in docstrings, neither as literals nor as expressions. It's too easy to change a constant's value and forget to update its docstring.
-- Construct the constant's value from other constants or meaningful expressions in order to provide meaningful context.
-    - **Great:** `TARGET_BLOB_GAS_PER_BLOCK = GAS_PER_BLOB * BLOB_SCHEDULE_TARGET`
-        - Composed from named constants; the reader immediately understands what the value represents.
-    - **Acceptable:** `TX_MAX_GAS = Uint(2 ** 24)`
-        - More readable than a raw number, but still a literal expression that doesn't convey _why_ this value was chosen.
-    - **Bad:** `TX_MAX_GAS = Uint(16_777_216)`
-        - A magic number with no context.
-
-### Changes across various Forks
-
-Many contributions require changes across multiple forks, organized under `src/ethereum/forks/*`. When making such changes, please ensure that differences between the forks are minimal and consist only of necessary differences. This will help with getting cleaner [diff outputs](https://ethereum.github.io/execution-specs/diffs/index.html).
-
-When creating pull requests affecting multiple forks, we recommended submitting your PR in two steps:
-
-1. Apply the changes on a single fork, open a _draft_ pull request, and get feedback; then
-2. Apply the changes across the other forks, push them, and mark the pull request as ready for review.
-
-This saves you having to apply code review feedback repeatedly for each fork.
-
-### Development
-
-Running the tests necessary to merge into the repository requires:
-
-- [`uv`](https://docs.astral.sh/uv/) package manager,
-- Python 3.11.x,
-- [PyPy](https://www.pypy.org/) [7.3.19](https://downloads.python.org/pypy/) or later.
-- `geth` installed and present in `$PATH`.
-
-`execution-specs` depends on a submodule that contains common tests that are run across all clients, so we need to clone the repo with the --recursive flag. Example:
-
-```bash
-git clone --recursive https://github.com/ethereum/execution-specs.git
-```
-
-Or, if you've already cloned the repository, you can fetch the submodules with:
-
-```bash
-git submodule update --init --recursive
-```
-
-The tests can be run with:
-
-```bash
-tox
-```
-
-The development tools can also be run outside of `tox`, and can automatically reformat the code:
-
-```bash
-uv run ruff check        # Detects code issues and produces a report to STDOUT.
-uv run ruff check --fix  # Fixes minor code issues (like unsorted imports).
-uv run ruff format       # Formats code.
-uv run mypy              # Verifies type annotations.
-```
-
-It is recommended to use a [virtual environment](https://packaging.python.org/guides/installing-using-pip-and-virtual-environments/#creating-a-virtual-environment) to keep your system Python installation clean.
-
-A trace of the EVM execution for any test case can be obtained by providing the `--evm-trace` argument to pytest.
-Note: Make sure to run the EVM trace on a small number of tests at a time. The log might otherwise get very big.
-Below is an example.
-
-```bash
-uv run pytest \
-    'tests/json_loader/test_state_tests.py::test_state_tests_frontier[stAttackTest - ContractCreationSpam - 0]' \
-    --evm_trace
-```
-
-## CLI Utilities `ethereum_spec_tools`
-
-The EELS repository has various CLI utilities that can help in the development process.
-
-### New Fork Tool
-
-This tool can be used to create the base code for a new fork by using the existing code from a given fork.
-
-The command takes 4 arguments, 2 of which are optional
-
-- from_fork: The fork name from which the code is to be duplicated. Eg. - "Tangerine Whistle"
-- to_fork: The fork name of the new fork Eg - "Spurious Dragon"
-- from_test (Optional): Name of the from fork within the test fixtures in case it is different from fork name. Eg. - "EIP150"
-- to_test (Optional): Name of the to fork within the test fixtures in case it is different from fork name Eg - "EIP158"
-
-As an example, if one wants to create baseline code for the `Spurious Dragon` fork from the `Tangerine Whistle` one
-
-```bash
-ethereum-spec-new-fork --from_fork="Tangerine Whistle" --to_fork="Spurious Dragon" --from_test=EIP150 --to_test=EIP158
-```
-
-The following will have to however, be updated manually
-
-1. The fork number and `MAINNET_FORK_BLOCK` in `__init__.py`. If you are proposing a new EIP, please set `MAINNET_FORK_BLOCK` to `None`.
-2. Any absolute package imports from other forks eg. in `trie.py`
-3. Package names under `setup.cfg`
-4. Add the new fork to the `monkey_patch()` function in `src/ethereum_optimized/__init__.py`
-5. Adjust the underline in `fork/__init__.py`
+> Generally, we do not assign issues to external contributors. If you want to work on an issue, you are welcome to go ahead and make a pull request. We are happy to answer questions before you start implementing.
 
-### Sync Tool
+## Contributions we don't accept
 
-The sync tool allows one to use an RPC provider to fetch and validate blocks against EELS.
-The state can also be stored in a local DB after validation. Since syncing directly with the specs can be
-very slow, one can also leverage the optimized module. This contains alternative implementations of routines
-in EELS that have been optimized for speed rather than clarity/readability.
+Pull requests should have reasonable substance and context. In particular, we do not accept:
 
-The tool can be called using the `ethereum-spec-sync` command which takes the following arguments
+- Contributions that only fix spelling or grammatical errors in documentation, code, or elsewhere.
+- Drive-by or vibe-coded contributions without proper engagement or context.
 
-- rpc-url: Endpoint providing the Ethereum RPC API. Defaults to `http://localhost:8545/`
-- unoptimized: Don't use the optimized state/ethash (this can be extremely slow)
-- persist: Store the state in a db in this file
-- geth: Use geth specific RPC endpoints while fetching blocks
-- reset: Delete the db and start from scratch
-- gas-per-commit: Commit to db each time this much gas is consumed. Defaults to 1_000_000_000
-- initial-state: Start from the state in this db, rather than genesis
-- stop-at: After syncing this block, exit successfully
+## Code of Conduct
 
-- The following options are not supported WITH `--unoptimized` -> `--persist`, `--initial-state`, `--reset`
-- The following options are not supported WITHOUT `--persist` -> `--initial_state`, `--reset`
+All contributors are expected to be excellent to each other; other behavior is not tolerated. To report a concern, contact one of the [STEEL team members](https://steel.ethereum.foundation/team/).
 
-### Patch Tool
+## Principles
 
-This tool can be used to apply the unstaged changes in `SOURCE_FORK` to each of the `TARGET_FORKS`. If some
-of the change didn't apply, '.rej' files listing the unapplied changes will be left in the `TARGET_FORK`.
+The specification aims to be:
 
-The tool takes the following command line arguments
+1. **Correct.** Describe the *intended* behavior of the Ethereum blockchain. Any deviation from that is a bug.
+2. **Complete.** Capture the entirety of *consensus-critical* parts of Ethereum.
+3. **Accessible.** Prioritize readability, clarity, and plain language over performance and brevity.
 
-- The fork name where the changes have been made. Eg:- `frontier` (only a single fork name)
-- The fork names where the changes have to be applied. Eg:- `homestead` (multiple values can be provided separated by space)
-- optimized: Patch the optimized code instead
-- tests: Patch the tests instead
+## Getting set up
 
-As an example, if one wants to apply changes made in `Frontier` fork to `Homestead` and `Tangerine Whistle`
+Environment setup (cloning the repository, installing `uv` and `just`, Python requirements) is documented in the [Installation guide](docs/getting_started/installation.md).
 
-```bash
-python src/ethereum_spec_tools/patch_tool.py frontier homestead tangerine_whistle
-```
+Before opening a PR, run the checks relevant to your change; see [Verifying Changes](docs/getting_started/verifying_changes.md).
 
-### Lint Tool
+## Changes that affect multiple forks
 
-This tool checks for style and formatting issues specific to EELS and emits diagnostics
-when issues are found
+When creating pull requests that touch several forks under `src/ethereum/forks/`, we recommend a two-step workflow:
 
-The tool currently performs the following checks
+1. Apply the changes on a single fork, open a *draft* PR, and get feedback.
+2. Apply the changes across the other forks, push them, and mark the PR as ready for review.
 
-- The order of the identifiers between each hardfork is consistent.
-- Import statements follow the relevant import rules in modules.
+This saves you from applying code review feedback repeatedly for each fork.
 
-The command to run the tool is `ethereum-spec-lint`
+See [Writing Specs](docs/specs/writing_specs.md) for the technical style rules (naming, comments, docstrings, constants, cross-fork discipline) and for the `ethereum_spec_tools` CLI utilities that help with these workflows.
diff --git a/EIP_AUTHORS_MANUAL.md b/EIP_AUTHORS_MANUAL.md
deleted file mode 100644
index 2d549e23cfb..00000000000
--- a/EIP_AUTHORS_MANUAL.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# EIP Author's Manual
-
-## Introduction
-
-This document outlines the process of specifying and testing EIPs for the Ethereum execution layer. It is intended for EIP authors, researchers and implementers. An EIP will typically go through the following stages:
-
-| Stage              | Activities  | Outputs |
-| ------------------ | ----------- | ------- |
-| _Pre‑Draft_        | Prospective EIP author conceives of an idea for an improvement to Ethereum, and discusses with the community. | <ul><li>Vague Consensus on [Ethereum Magicians][0]</li></ul> |
-| **Draft**          | <p>EIP author writes a technical human-language document describing the improvement, initially in broad strokes and becoming more specific over time.</p><p>Concurrently, they develop a Python reference implementation to make the EIP executable and identify any immediate/obvious implementation issues. For example, the EIP may not be compatible with some detail of the current Ethereum Virtual Machine.</p><p>Finally for this stage, the author begins to write test schemes for the EIP. Having the reference implementation should help identify the various logical flows to test and thus feed into more robust testing. Once the test schemes are written, the reference implementation can then be used to fill the tests and generate the test vectors.</p> | <ul><li>Complete (but not final) document in [EIPs Repository][1]</li><li>Reference Implementation in [EELS][2]</li><li>Initial Tests in [EEST][3]</li></ul> |
-| **Review**         | <p>The broader Ethereum community discusses and provides input on the proposal.</p><p>Although the feedback from the community can be sought at all lifecycle stages, having a reference implementation and tests act as a good bridge between research and client implementation. It also helps core developers (who have limited time and resources) to understand the EIP better and provide more informed feedback.</p> | <ul><li>Complete &amp; final document in the [EIPs Repository][1]</li><li>Comprehensive tests in [EEST][3]</li></ul> |
-| **Last&nbsp;Call** | Usually after being nominated for inclusion in a fork, the EIP author signals that the proposal is effectively done and begins the last period for comments/discussion. | <ul><li>Complete reference implementation in [EELS][2]</li><li>Complete tests in [EEST][3]</li><li>Immutable proposal in [EIPs Repository][1]</li></ul> |
-| **Final**          | The proposal is now immutable (cannot be changed) and exists for reference. | <ul><li>Mainnet client implementations</li></ul> |
-
-[0]: https://ethereum-magicians.org/
-[1]: https://github.com/ethereum/EIPs/
-[2]: https://github.com/ethereum/execution-specs
-[3]: https://github.com/ethereum/execution-spec-tests
-
-This document will focus on stages 3 and 4 of the above lifecycle.
-
-## Executable Specifications
-
-This repository contains the executable specifications for the Ethereum execution layer.
-
-### Folder Structure
-
-#### Forks live on mainnet
-
-The folder `src/ethereum` contains the specifications for the different execution layer forks. Each fork has its own folder. For example, the folder `src/ethereum/frontier` contains the specifications for the Frontier hardfork. The `state_transition` function which is available in the `src/ethereum/<FORK NAME>/fork.py` is the transition function for each fork.
-
-#### Fork under development
-
-At any given time, there is a single fork under development. Any new EIP has to be implemented in the folder that is meant for that fork (`src/ethereum/<FORK_NAME>` folder).
-
-For example, at the time of writing, the Prague Fork is still under development and the previous fork is Cancun, which is live on Mainnet. So the prague folder under `src/ethereum` is essentially just the Cancun fork with the values of variables updated to reflect Prague and its under-development status. This folder (`src/ethereum/prague`) serves as the baseline for further development and all new EIPs are to be implemented in this folder.
-
-### Branch Structure
-
-#### Forks live on mainnet
-
-The final stable specification for all forks that are currently live on mainnet are in the `mainnet` branch.
-
-#### Fork under development
-
-At any given time, there can only be one fork under active development. The branch structure for the fork under development is as follows:
-
-- `forks/<FORK_NAME>`: The main branch for the fork under development. For example, `forks/prague` is the branch for the Prague fork. This branch will  be merged into `mainnet` after the fork has gone live on mainnet.
-- `eips/<FORK_NAME>/<EIP_NUMBER>`: Branches for each EIP within the fork under development. For example, `eips/prague/eip-7702` is the branch for EIP-7702 for the Prague fork. This branch will be merged into `forks/prague` after the EIP has been confirmed for release in the fork.
-
-## Writing New EIPS
-
-Implementing a new EIP in the `execution-specs` repository involves the following steps:
-
-1. **Create a new branch**: Create a new branch for the EIP under the appropriate fork. For example, if you are implementing an EIP for the Prague fork, create a new branch under `eips/<FORK_NAME>/eip-<EIP_NUMBER>`.
-2. **Implement the EIP**: Implement the EIP in the `src/ethereum/<FORK_NAME>` folder.
-3. **Basic sanity checks**: Run `tox -e static` to run basic formatting and linting checks.
-4. **Raise a PR**: Raise a PR against the appropriate branch. For example, if you are implementing an EIP for the Prague fork, raise a PR against the `forks/prague` branch.
-
-An EIP can only be CFI'd (Considered For Inclusion) if it has a reference `execution-specs` implementation. The EIP author is responsible for maintaining their EIP up-to-date with the latest changes. For example, if an author had written their EIP for Cancun under `eips/cancun/eip-x`, but for some reason it didn't make it into Cancun, they would need to rebase their EIP to reflect the changes in Prague under `eips/prague/eip-x`.
-
-Please refer the following tutorial for writing new EIP. It takes you through a sample EIP for adding a new opcode to the specs.
-[Tutorial](https://www.youtube.com/watch?v=QIcw_DGSy3s&t)
-
-## Writing Tests with `execution-spec-tests`
-
-In addition to having a reference implementation, it is also very useful for the community and core development if the EIP author concieves and writes test vectors for the EIP. There is a very user friendly framework for writing ethereum tests in the `execution-spec-tests` repository. Please refer to the following guide for writing tests to your EIP.
-
-[Writing Tests with `execution-spec-tests`](https://eest.ethereum.org/v2.0.0/getting_started/quick_start/)
diff --git a/Justfile b/Justfile
new file mode 100644
index 00000000000..350ba08ab61
--- /dev/null
+++ b/Justfile
@@ -0,0 +1,370 @@
+set positional-arguments := true
+
+alias help := list
+
+# List available recipes (default)
+[default, private]
+list:
+    @just --list
+
+root := justfile_directory()
+output_dir := root / ".just"
+xdist_workers := env("PYTEST_XDIST_AUTO_NUM_WORKERS", "6")
+evm_bin := env("EVM_BIN", "evm")
+latest_fork := "Amsterdam"
+
+# --- Static Analysis ---
+
+# Auto-fix formatting and lint issues
+[group('static analysis')]
+fix:
+    uv run ruff format
+    uv run ruff check --fix
+
+# Run all static checks (spellcheck, lint, format, mypy, ...)
+[group('static analysis'), parallel]
+static: typecheck lint-spec spellcheck deadcode lint-actions lock-check format-check lint
+
+# Check spelling
+[group('static analysis')]
+spellcheck:
+    #!/usr/bin/env bash
+    if ! uv run codespell; then
+        echo ""
+        echo "If false positive, add to whitelist:"
+        echo "  just whitelist <word>"
+        echo ""
+        echo "To auto-fix interactively:"
+        echo "  uv run codespell -i 3"
+        exit 1
+    else
+        echo "uv run codespell  # passed!"
+    fi
+
+# Add a word to the spellcheck whitelist
+[group('static analysis')]
+whitelist *words:
+    uv run whitelist "$@"
+
+# Lint with ruff
+[group('static analysis')]
+lint *args:
+    uv run ruff check "$@"
+
+# Check for dead code with vulture
+[group('static analysis')]
+deadcode:
+    uv run vulture src/ vulture_whitelist.py
+
+# Check formatting with ruff
+[group('static analysis')]
+format-check *args:
+    uv run ruff format --check "$@"
+
+# Run type checking with mypy
+[group('static analysis')]
+typecheck *args:
+    uv run mypy "$@"
+
+# Check EELS import isolation
+[group('static analysis')]
+lint-spec:
+    uv run ethereum-spec-lint
+
+# Verify uv.lock is up to date
+[group('static analysis')]
+lock-check:
+    #!/usr/bin/env bash
+    if ! uv lock --check; then
+        echo ""
+        echo "To sync the lock file:"
+        echo "  uv lock"
+        echo ""
+        echo "Then commit the updated uv.lock."
+        exit 1
+    fi
+
+# Lint GitHub Actions workflows
+[group('static analysis')]
+lint-actions:
+    uv run actionlint -pyflakes pyflakes -shellcheck "shellcheck -S warning"
+
+# --- Consensus Tests ---
+
+# Generate HTML coverage report from last just fill run
+[group('consensus tests')]
+coverage:
+    uv run coverage html -d "{{ output_dir }}/fill/coverage-html"
+
+# Generate EIP test checklists from eip_checklist markers                                                                         
+[group('consensus tests')] 
+checklist *args:
+    uv run checklist --output tmp/checklist "$@"
+
+# Fill the consensus tests using EELS (with Python)
+[group('consensus tests')]
+fill *args:
+    @mkdir -p "{{ output_dir }}/fill/tmp" "{{ output_dir }}/fill/logs"
+    uv run fill \
+        -m "not slow" \
+        -n {{ xdist_workers }} --dist=loadgroup \
+        --skip-index \
+        --output="{{ output_dir }}/fill/fixtures" \
+        --cov-config=pyproject.toml \
+        --cov=ethereum \
+        --cov-report=term \
+        --cov-report "xml:{{ output_dir }}/fill/coverage.xml" \
+        --no-cov-on-fail \
+        --cov-branch \
+        --basetemp="{{ output_dir }}/fill/tmp" \
+        --log-to "{{ output_dir }}/fill/logs" \
+        --clean \
+        --until "{{ latest_fork }}" \
+        --durations=50 \
+        "$@" \
+        tests
+
+# --- Integration Tests ---
+
+# Fill the base coverage consensus tests using EELS with PyPy
+[group('integration tests')]
+fill-pypy *args:
+    @mkdir -p "{{ output_dir }}/fill-pypy/tmp" "{{ output_dir }}/fill-pypy/logs"
+    uv run --python pypy3.11 fill \
+        --skip-index \
+        --output="{{ output_dir }}/fill-pypy/fixtures" \
+        --no-html \
+        --tb=long \
+        -ra \
+        --show-capture=no \
+        --disable-warnings \
+        -m "eels_base_coverage and not derived_test" \
+        -n auto --maxprocesses 7 \
+        --dist=loadgroup \
+        --basetemp="{{ output_dir }}/fill-pypy/tmp" \
+        --log-to "{{ output_dir }}/fill-pypy/logs" \
+        --clean \
+        --until "{{ latest_fork }}" \
+        --ignore=tests/ported_static \
+        "$@" \
+        tests
+
+# Fill the base coverage consensus tests and run EELS against the fixtures
+[group('integration tests')]
+json-loader *args:
+    @mkdir -p "{{ output_dir }}/json-loader/tmp"
+    uv run fill \
+        -m "eels_base_coverage and not derived_test" \
+        --until "{{ latest_fork }}" \
+        -n {{ xdist_workers }} --dist=loadgroup \
+        --skip-index \
+        --clean \
+        --ignore=tests/ported_static \
+        --output="tests/json_loader/fixtures" \
+        --cov-config=pyproject.toml \
+        --cov=ethereum \
+        --cov-fail-under=85
+    uv run pytest \
+        -m "not slow" \
+        -n auto --maxprocesses 6 --dist=loadfile \
+        --basetemp="{{ output_dir }}/json-loader/tmp" \
+        "$@" \
+        tests/json_loader
+
+# --- Unit Tests ---
+
+# Run the testing package unit tests (with Python)
+[group('unit tests')]
+test-tests *args:
+    @mkdir -p "{{ output_dir }}/test-tests/tmp"
+    cd packages/testing && uv run pytest \
+        -n {{ xdist_workers }} \
+        --basetemp="{{ output_dir }}/test-tests/tmp" \
+        --ignore=src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_benchmarking.py \
+        "$@" \
+        src
+
+# Run the testing package unit tests (with PyPy)
+[group('unit tests')]
+test-tests-pypy *args:
+    @mkdir -p "{{ output_dir }}/test-tests-pypy/tmp"
+    cd packages/testing && uv run --python pypy3.11 pytest \
+        -n auto --maxprocesses 6 \
+        --basetemp="{{ output_dir }}/test-tests-pypy/tmp" \
+        --ignore=src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_benchmarking.py \
+        "$@" \
+        src
+
+# Run benchmark framework unit tests (with Python)
+[group('unit tests')]
+[group('benchmark tests')]
+test-tests-bench *args:
+    @mkdir -p "{{ output_dir }}/test-tests-bench/tmp"
+    uv run pytest \
+        --basetemp="{{ output_dir }}/test-tests-bench/tmp" \
+        "$@" \
+        packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_benchmarking.py
+
+# Run CI release script integration tests
+[group('unit tests')]
+test-ci-scripts *args:
+    uv run pytest "$@" .github/scripts/tests/
+
+# --- Benchmarks ---
+
+# Fill benchmark tests with --gas-benchmark-values, then verify with EELS
+[group('benchmark tests')]
+bench-gas *args:
+    @mkdir -p "{{ output_dir }}/bench-gas/tmp" "{{ output_dir }}/bench-gas/logs"
+    @echo "==> Step 1/2: Filling benchmark fixtures with configured EVM (EVM_BIN={{ evm_bin }})"
+    uv run fill \
+        --evm-bin="{{ evm_bin }}" \
+        --gas-benchmark-values 1 \
+        --generate-all-formats \
+        --fork Osaka \
+        -m "not slow" \
+        -n auto --maxprocesses 10 --dist=loadgroup \
+        --output="{{ output_dir }}/bench-gas/fixtures" \
+        --basetemp="{{ output_dir }}/bench-gas/tmp" \
+        --log-to "{{ output_dir }}/bench-gas/logs" \
+        --clean \
+        "$@" \
+        tests/benchmark/compute
+    @echo "==> Step 2/2: Running filled fixtures against EELS via json_loader"
+    @rm -rf tests/json_loader/bench_gas_fixtures
+    ln -sfn "{{ output_dir }}/bench-gas/fixtures" tests/json_loader/bench_gas_fixtures
+    cd tests/json_loader && uv run --python pypy3.11 pytest \
+        --fork Osaka \
+        --allow-post-state-hash \
+        -n auto --maxprocesses 10 --dist=loadfile \
+        --basetemp="{{ output_dir }}/bench-gas/json-loader-tmp" \
+        bench_gas_fixtures
+
+# Fill benchmark tests with --fixed-opcode-count 1
+[group('benchmark tests')]
+bench-opcode *args:
+    @mkdir -p "{{ output_dir }}/bench-opcode/tmp" "{{ output_dir }}/bench-opcode/logs"
+    uv run fill \
+        --evm-bin="{{ evm_bin }}" \
+        --fixed-opcode-count 1 \
+        --fork Osaka \
+        -m repricing \
+        -n auto --maxprocesses 10 --dist=loadgroup \
+        -k "not test_alt_bn128 and not test_bls12_381 and not test_modexp and not uncachable" \
+        --output="{{ output_dir }}/bench-opcode/fixtures" \
+        --basetemp="{{ output_dir }}/bench-opcode/tmp" \
+        --log-to "{{ output_dir }}/bench-opcode/logs" \
+        --clean \
+        "$@" \
+        tests/benchmark/compute
+
+# Run benchmark_parser, then fill benchmark tests using its config
+[group('benchmark tests')]
+bench-opcode-config *args:
+    @mkdir -p "{{ output_dir }}/bench-opcode-config/tmp" "{{ output_dir }}/bench-opcode-config/logs"
+    uv run benchmark_parser
+    uv run fill \
+        --evm-bin="{{ evm_bin }}" \
+        --fixed-opcode-count \
+        --fork Osaka \
+        -m repricing \
+        -n auto --maxprocesses 10 --dist=loadgroup \
+        -k "not test_alt_bn128 and not test_bls12_381 and not test_modexp and not test_point_evaluation_uncachable" \
+        --output="{{ output_dir }}/bench-opcode-config/fixtures" \
+        --basetemp="{{ output_dir }}/bench-opcode-config/tmp" \
+        --log-to "{{ output_dir }}/bench-opcode-config/logs" \
+        --clean \
+        "$@" \
+        tests/benchmark/compute
+
+# --- Docs ---
+
+export GEN_TEST_DOC_VERSION := "local"
+export DYLD_FALLBACK_LIBRARY_PATH := if os() == "macos" { "/opt/homebrew/lib" } else { "" }
+
+# Generate documentation for EELS using docc
+[group('docs')]
+docs-spec $DOCC_SKIP_DIFFS="":
+    uv run docc --output "{{ output_dir }}/docs-spec"
+    uv run python -c 'import pathlib; print("documentation available under file://{0}".format(pathlib.Path(r"{{ output_dir }}") / "docs-spec" / "index.html"))'
+
+# Generate documentation for EELS using docc, skipping the slow per-fork diff render
+[group('docs')]
+docs-spec-fast: (docs-spec "1")
+
+# Build HTML site documentation with mkdocs
+[group('docs')]
+docs *args:
+    uv run mkdocs build --strict -d "{{ output_dir }}/docs/site" "$@"
+
+# Build HTML site documentation with mkdocs (skip test case reference)
+[group('docs')]
+docs-fast *args:
+    FAST_DOCS=True uv run mkdocs build --strict -d "{{ output_dir }}/docs/site" "$@"
+
+# Serve site documentation locally with mkdocs (live reload)
+[group('docs')]
+docs-serve *args:
+    uv run mkdocs serve "$@"
+
+# Serve site documentation locally with mkdocs (skip test case reference)
+[group('docs')]
+docs-serve-fast *args:
+    FAST_DOCS=True uv run mkdocs serve "$@"
+
+# Lint markdown files (markdownlint)
+[group('docs')]
+lint-md:
+    uv run markdownlintcli2_soft_fail
+
+[private]
+crops:
+    @uvx pycowsay==0.0.0.2 "ethereum is good"
+
+# --- Housekeeping ---
+
+# Remove caches and build artifacts (.pytest_cache, .mypy_cache, __pycache__, ...)
+[group('housekeeping')]
+clean *args:
+    uv run eest clean "$@"
+
+# Remove caches, build artifacts, .just, and .venv
+[group('housekeeping')]
+clean-all *args:
+    uv run eest clean --all "$@"
+
+# Print the command to install shell completions for just recipes
+[group('housekeeping')]
+shell-completions:
+    #!/usr/bin/env bash
+    case "$(basename "$SHELL")" in
+        bash)
+            echo "Run the following commands to install just completions for bash:"
+            echo ""
+            echo "  mkdir -p ~/.local/share/bash-completion/completions"
+            echo "  just --completions bash > ~/.local/share/bash-completion/completions/just"
+            ;;
+        zsh)
+            echo "Run the following commands to install just completions for zsh:"
+            echo ""
+            echo "  mkdir -p ~/.zsh/completions"
+            echo "  just --completions zsh > ~/.zsh/completions/_just"
+            echo ""
+            echo "Then add to your .zshrc:"
+            echo ""
+            echo "  fpath=(~/.zsh/completions \$fpath)"
+            echo "  autoload -U compinit"
+            echo "  compinit"
+            ;;
+        fish)
+            echo "Run the following commands to install just completions for fish:"
+            echo ""
+            echo "  mkdir -p ~/.config/fish/completions"
+            echo "  just --completions fish > ~/.config/fish/completions/just.fish"
+            ;;
+        *)
+            echo "See the link below for instructions for your shell."
+            ;;
+    esac
+    echo ""
+    echo "For more details, see https://just.systems/man/en/shell-completion-scripts.html"
diff --git a/README.md b/README.md
index c6f7c548993..8cb484326f2 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,14 @@
-# Ethereum Execution Client Specifications
+# Ethereum Execution Layer Specifications
 
-[![GitPOAP Badge](https://public-api.gitpoap.io/v1/repo/ethereum/execution-specs/badge)](https://www.gitpoap.io/gh/ethereum/execution-specs)
-[![codecov](https://codecov.io/gh/ethereum/execution-specs/graph/badge.svg?token=0LQZO56RTM)](https://codecov.io/gh/ethereum/execution-specs)
+[![latest version](https://img.shields.io/github/v/release/ethereum/execution-specs)](https://github.com/ethereum/execution-specs/releases/latest)
+[![PyPI version](https://img.shields.io/pypi/v/ethereum-execution)](https://pypi.org/project/ethereum-execution/)
+[![License](https://img.shields.io/github/license/ethereum/execution-specs)](https://github.com/ethereum/execution-specs/blob/main/LICENSE)
 [![Python Specification](https://github.com/ethereum/execution-specs/actions/workflows/test.yaml/badge.svg)](https://github.com/ethereum/execution-specs/actions/workflows/test.yaml)
+[![codecov](https://codecov.io/gh/ethereum/execution-specs/graph/badge.svg?token=0LQZO56RTM)](https://codecov.io/gh/ethereum/execution-specs)
+![Python Versions](https://img.shields.io/badge/python-3.11%20%7C%203.12%20%7C%203.13%20%7C%203.14-blue)
+[![ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+[![uv](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json)](https://github.com/astral-sh/uv)
+[![GitPOAP Badge](https://public-api.gitpoap.io/v1/repo/ethereum/execution-specs/badge)](https://www.gitpoap.io/gh/ethereum/execution-specs)
 
 ## Monadized `execution-specs` and spec tests
 
@@ -19,18 +25,19 @@ It mainly serves as an alternative implementation of https://github.com/category
 1. Install `uv`: `curl -LsSf https://astral.sh/uv/install.sh | sh`
 2. Clone and setup:
 
-```bash
-git clone --depth 1 https://github.com/monad-developers/execution-specs
-cd execution-specs
-uv python install 3.12
-uv python pin 3.12
-uv sync --all-extras
-```
+    ```bash
+    git clone --depth 1 https://github.com/monad-developers/execution-specs
+    cd execution-specs
+    uv python install 3.12
+    uv python pin 3.12
+    uv sync --all-extras
+    ```
+
 3. Fill all monadized spec tests as of writing this (see below for explanation of flags):
 
-```bash
-uv run fill --clean -m "blockchain_test or transaction_test" --from MONAD_EIGHT --until MONAD_NINE --chain-id 143 -n auto tests
-```
+    ```bash
+    uv run fill --clean -m "blockchain_test or transaction_test" --from MONAD_EIGHT --until MONAD_NINE --chain-id 143 -n auto tests
+    ```
 
 4. The test fixtures to be found in `fixtures/` directory under repo root.
 
@@ -43,14 +50,14 @@ Filling tests is the process of running Python generators of spec tests [like on
 #### `uv run fill` flags
 
 - **`-m blockchain_test or transaction_test`**: causes these two flavors of fixtures to be generated
-  - `blockchain_test` is the currently supported by `monad` flavor of a spec test checking correctness of the state transition. Note this includes `blockchain_test_from_state_test`, meaning that all `state_test(...)` fillers are included
-  - `transaction_test` is also supported, tests only correctness of static transaction checks
+    - `blockchain_test` is the currently supported by `monad` flavor of a spec test checking correctness of the state transition. Note this includes `blockchain_test_from_state_test`, meaning that all `state_test(...)` fillers are included
+    - `transaction_test` is also supported, tests only correctness of static transaction checks
 - **`--from MONAD_EIGHT --until MONAD_NINE`**: hardforks for which to generate fixtures. Must match with those defined in `monad`, inclusive
 - **`--chain-id 143`**: must be specified for signatures and EIP-7702 to work correctly
 - **`-n auto`**: from `pytest`, parallel execution of tests
 - **`tests`**: root directory to traverse to discover tests
-  - inside the tests are organized by EIP/MIP and the hardfork when they **became relevant**. For Monad these are `monad_eight` and `monad_nine` as of writing this. Here hardfork is informative only, doesn't need to match with `monad`.
-  - note that tests relevant for previous hardforks, e.g. `tests/prague/eip7702_set_code_tx`, are filled for hardforks requested with `--from`, `--until` flags, respecting any constraints the test itself might define. In other words, in the invocation above, EIP-7702 tests **will be filled**
+    - inside the tests are organized by EIP/MIP and the hardfork when they **became relevant**. For Monad these are `monad_eight` and `monad_nine` as of writing this. Here hardfork is informative only, doesn't need to match with `monad`.
+    - note that tests relevant for previous hardforks, e.g. `tests/prague/eip7702_set_code_tx`, are filled for hardforks requested with `--from`, `--until` flags, respecting any constraints the test itself might define. In other words, in the invocation above, EIP-7702 tests **will be filled**
 
 `pytest` flags are in general supported, while `--traces` will give you detailed EVM step traces. Refer to https://eest.ethereum.org/main/filling_tests/ for more details.
 
@@ -64,101 +71,68 @@ Filling tests is the process of running Python generators of spec tests [like on
 
 ## Description
 
-This repository contains the specifications related to the Ethereum execution client, specifically the [pyspec](/src/ethereum/__init__.py) and specifications for [network upgrades](/src/ethereum/__init__.py). The [JSON-RPC API specification](https://github.com/ethereum/execution-apis) can be found in a separate repository.
-
-### Ethereum Protocol Releases
-
-| Version and Code Name | Block No. | Released | Incl EIPs | Fork Specifications | Blog |
-|-----------------------|-----------|----------|-----------|-------|-------|
-| Osaka | 23935694 | 2025-12-03 | [EIP-7594] <br> [EIP-7642] <br> [EIP-7823] <br> [EIP-7825] <br> [EIP-7883] <br> [EIP-7892] <br> [EIP-7910] <br> [EIP-7917] <br> [EIP-7918] <br> [EIP-7934] <br> [EIP-7935] <br> [EIP-7939] <br> [EIP-7951] | [Hardfork Meta EIP-7607](https://eips.ethereum.org/EIPS/eip-7607) <br/> [Fork Manifest](/src/ethereum/forks/osaka/__init__.py) | [Blog](https://blog.ethereum.org/2025/11/06/fusaka-mainnet-announcement) |
-| Prague | 22431084 | 2025-05-07 | [EIP-2537] <br> [EIP-2935] <br> [EIP-6110] <br> [EIP-7002] <br> [EIP-7251] <br> [EIP-7549] <br> [EIP-7623] <br> [EIP-7685] <br> [EIP-7691] <br> [EIP-7702] | [Hardfork Meta EIP-7600](https://eips.ethereum.org/EIPS/eip-7600) <br/> [Fork Manifest](/src/ethereum/forks/prague/__init__.py)| [Blog](https://blog.ethereum.org/2025/04/23/pectra-mainnet) |
-| Cancun | 19426587 | 2024-03-13<br />(1710338135) | [EIP-1153](https://eips.ethereum.org/EIPS/eip-1153) </br> [EIP-4788](https://eips.ethereum.org/EIPS/eip-4788)</br> [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844)</br> [EIP-5656](https://eips.ethereum.org/EIPS/eip-5656)</br> [EIP-6780](https://eips.ethereum.org/EIPS/eip-6780) </br> [EIP-7044](https://eips.ethereum.org/EIPS/eip-7044) </br> [EIP-7045](https://eips.ethereum.org/EIPS/eip-7045) </br> [EIP-7514](https://eips.ethereum.org/EIPS/eip-7514) </br> [EIP-7516](https://eips.ethereum.org/EIPS/eip-7516)| [Hardfork Meta EIP-7569](https://eips.ethereum.org/EIPS/eip-7569) <br/> [Fork Manifest](/src/ethereum/forks/cancun/__init__.py) | [Blog](https://blog.ethereum.org/2024/02/27/dencun-mainnet-announcement) |
-| Shanghai | 17034870 | 2023-04-12<br/>(1681338455) | [EIP-3651](https://eips.ethereum.org/EIPS/eip-3651) <br/> [EIP-3855](https://eips.ethereum.org/EIPS/eip-3855) <br/> [EIP-3860](https://eips.ethereum.org/EIPS/eip-3860) <br/> [EIP-4895](https://eips.ethereum.org/EIPS/eip-4895) | [(Backfill) Meta EIP-7568](https://eips.ethereum.org/EIPS/eip-7568) <br/> [Fork Manifest](/src/ethereum/forks/shanghai/__init__.py) | [Blog](https://blog.ethereum.org/2023/03/28/shapella-mainnet-announcement) |
-| Paris | 15537394 | 2022-09-15 | [EIP-3675](https://eips.ethereum.org/EIPS/eip-3675) <br/> [EIP-4399](https://eips.ethereum.org/EIPS/eip-4399) | [(Backfill) Meta EIP-7568](https://eips.ethereum.org/EIPS/eip-7568) <br/> [Fork Manifest](/src/ethereum/forks/paris/__init__.py) | [Blog](https://blog.ethereum.org/2022/08/24/mainnet-merge-announcement) |
-| Gray Glacier | 15050000 | 2022-06-30 | [EIP-5133](https://eips.ethereum.org/EIPS/eip-5133) | [(Backfill) Meta EIP-7568](https://eips.ethereum.org/EIPS/eip-7568) <br/> [Fork Manifest](/src/ethereum/forks/gray_glacier/__init__.py) | [Blog](https://blog.ethereum.org/2022/06/16/gray-glacier-announcement/) |
-| Arrow Glacier | 13773000 | 2021-12-09 | [EIP-4345](https://eips.ethereum.org/EIPS/eip-4345) | [(Backfill) Meta EIP-7568](https://eips.ethereum.org/EIPS/eip-7568) <br/> [Fork Manifest](/src/ethereum/forks/arrow_glacier/__init__.py) | [Blog](https://blog.ethereum.org/2021/11/10/arrow-glacier-announcement/) |
-| London | 12965000 |  2021-08-05 | [EIP-1559](https://eips.ethereum.org/EIPS/eip-1559) <br> [EIP-3198](https://eips.ethereum.org/EIPS/eip-3198) <br/> [EIP-3529](https://eips.ethereum.org/EIPS/eip-3529) <br/> [EIP-3541](https://eips.ethereum.org/EIPS/eip-3541) <br> [EIP-3554](https://eips.ethereum.org/EIPS/eip-3554)| [(Backfill) Meta EIP-7568](https://eips.ethereum.org/EIPS/eip-7568) <br/> [Fork Manifest](/src/ethereum/forks/london/__init__.py) | [Blog](https://blog.ethereum.org/2021/07/15/london-mainnet-announcement/) |
-| Berlin | 12244000 | 2021-04-15 | [EIP-2565](https://eips.ethereum.org/EIPS/eip-2565) <br/> [EIP-2929](https://eips.ethereum.org/EIPS/eip-2929) <br/> [EIP-2718](https://eips.ethereum.org/EIPS/eip-2718) <br/> [EIP-2930](https://eips.ethereum.org/EIPS/eip-2930) | ~[Hardfork Meta EIP-2070](https://eips.ethereum.org/EIPS/eip-2070)~ <br/> [(Backfill) Meta EIP-7568](https://eips.ethereum.org/EIPS/eip-7568) <br/> [Fork Manifest](/src/ethereum/forks/berlin/__init__.py) | [Blog](https://blog.ethereum.org/2021/03/08/ethereum-berlin-upgrade-announcement/) |
-| Muir Glacier | 9200000 | 2020-01-02 | [EIP-2384](https://eips.ethereum.org/EIPS/eip-2384) | [Hardfork Meta EIP-2387](https://eips.ethereum.org/EIPS/eip-2387) <br/> [Fork Manifest](/src/ethereum/forks/muir_glacier/__init__.py) | [Blog](https://blog.ethereum.org/2019/12/23/ethereum-muir-glacier-upgrade-announcement/) |
-| Istanbul | 9069000 | 2019-12-07 | [EIP-152](https://eips.ethereum.org/EIPS/eip-152) <br/> [EIP-1108](https://eips.ethereum.org/EIPS/eip-1108) <br/> [EIP-1344](https://eips.ethereum.org/EIPS/eip-1344) <br/> [EIP-1884](https://eips.ethereum.org/EIPS/eip-1884) <br/> [EIP-2028](https://eips.ethereum.org/EIPS/eip-2028) <br/> [EIP-2200](https://eips.ethereum.org/EIPS/eip-2200) | [Hardfork Meta EIP-1679](https://eips.ethereum.org/EIPS/eip-1679) <br/> [Fork Manifest](/src/ethereum/forks/istanbul/__init__.py) | [Blog](https://blog.ethereum.org/2019/11/20/ethereum-istanbul-upgrade-announcement/) |
-| Petersburg | 7280000 | 2019-02-28 | [EIP-145](https://eips.ethereum.org/EIPS/eip-145) <br/> [EIP-1014](https://eips.ethereum.org/EIPS/eip-1014) <br/> [EIP-1052](https://eips.ethereum.org/EIPS/eip-1052) <br/> [EIP-1234](https://eips.ethereum.org/EIPS/eip-1234) | [Hardfork Meta EIP-1716](https://eips.ethereum.org/EIPS/eip-1716) | [Blog](https://blog.ethereum.org/2019/02/22/ethereum-constantinople-st-petersburg-upgrade-announcement/) |
-| Constantinople | 7280000 | 2019-02-28 | [EIP-145](https://eips.ethereum.org/EIPS/eip-145) <br/> [EIP-1014](https://eips.ethereum.org/EIPS/eip-1014) <br/> [EIP-1052](https://eips.ethereum.org/EIPS/eip-1052) <br/> [EIP-1234](https://eips.ethereum.org/EIPS/eip-1234) <br/> [EIP-1283](https://eips.ethereum.org/EIPS/eip-1283) | [Hardfork Meta EIP-1013](https://eips.ethereum.org/EIPS/eip-1013) <br/> [Fork Manifest](/src/ethereum/forks/constantinople/__init__.py) | [Blog](https://blog.ethereum.org/2019/02/22/ethereum-constantinople-st-petersburg-upgrade-announcement/) |
-| Byzantium | 4370000 | 2017-10-16 | [EIP-100](https://eips.ethereum.org/EIPS/eip-100) <br/> [EIP-140](https://eips.ethereum.org/EIPS/eip-140) <br/> [EIP-196](https://eips.ethereum.org/EIPS/eip-196) <br/> [EIP-197](https://eips.ethereum.org/EIPS/eip-197) <br/> [EIP-198](https://eips.ethereum.org/EIPS/eip-198) <br/> [EIP-211](https://eips.ethereum.org/EIPS/eip-211) <br/> [EIP-214](https://eips.ethereum.org/EIPS/eip-214) <br/> [EIP-649](https://eips.ethereum.org/EIPS/eip-649) <br/> [EIP-658](https://eips.ethereum.org/EIPS/eip-658) | [Hardfork Meta EIP-609](https://eips.ethereum.org/EIPS/eip-609) <br/> [Fork Manifest](/src/ethereum/forks/byzantium/__init__.py) | [Blog](https://blog.ethereum.org/2017/10/12/byzantium-hf-announcement/) |
-| Spurious Dragon | 2675000 | 2016-11-22 | [EIP-155](https://eips.ethereum.org/EIPS/eip-155) <br/> [EIP-160](https://eips.ethereum.org/EIPS/eip-160) <br/> [EIP-161](https://eips.ethereum.org/EIPS/eip-161) <br/> [EIP-170](https://eips.ethereum.org/EIPS/eip-170) | [Hardfork Meta EIP-607](https://eips.ethereum.org/EIPS/eip-607) <br/> [Fork Manifest](/src/ethereum/forks/spurious_dragon/__init__.py) | [Blog](https://blog.ethereum.org/2016/11/18/hard-fork-no-4-spurious-dragon/) |
-| Tangerine Whistle | 2463000 | 2016-10-18 | [EIP-150](https://eips.ethereum.org/EIPS/eip-150) | [Hardfork Meta EIP-608](https://eips.ethereum.org/EIPS/eip-608) <br/> [Fork Manifest](/src/ethereum/forks/tangerine_whistle/__init__.py) | [Blog](https://blog.ethereum.org/2016/10/13/announcement-imminent-hard-fork-eip150-gas-cost-changes/) |
-| DAO Fork | 1920000 | 2016-07-20 |  | [Hardfork Meta EIP-779](https://eips.ethereum.org/EIPS/eip-779) <br/> [Fork Manifest](/src/ethereum/forks/dao_fork/__init__.py) | [Blog](https://blog.ethereum.org/2016/07/15/to-fork-or-not-to-fork/) |
-| DAO Wars | aborted | aborted |  |  | [Blog](https://blog.ethereum.org/2016/06/24/dao-wars-youre-voice-soft-fork-dilemma/) |
-| Homestead | 1150000 | 2016-03-14 | [EIP-2](https://eips.ethereum.org/EIPS/eip-2) <br/> [EIP-7](https://eips.ethereum.org/EIPS/eip-7) <br/> [EIP-8](https://eips.ethereum.org/EIPS/eip-8) | [Hardfork Meta EIP-606](https://eips.ethereum.org/EIPS/eip-606) <br/> [Fork Manifest](/src/ethereum/forks/homestead/__init__.py) | [Blog](https://blog.ethereum.org/2016/02/29/homestead-release/) |
-| Frontier Thawing | 200000 | 2015-09-07 | | | [Blog](https://blog.ethereum.org/2015/08/04/the-thawing-frontier/) |
-| Frontier | 1 | 2015-07-30 | | [Fork Manifest](/src/ethereum/forks/frontier/__init__.py) | [Blog](https://blog.ethereum.org/2015/07/22/frontier-is-coming-what-to-expect-and-how-to-prepare/) |
-
-*Note:* Starting with Paris, updates are no longer rolled out based on block numbers. Paris was enabled once proof-of-work Total Difficulty reached 58750000000000000000000. As of Shanghai (at 1681338455), upgrade activation is based on timestamps.
-
-[EIP-2537]: https://eips.ethereum.org/EIPS/eip-2537
-[EIP-2935]: https://eips.ethereum.org/EIPS/eip-2935
-[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
-[EIP-7002]: https://eips.ethereum.org/EIPS/eip-7002
-[EIP-7251]: https://eips.ethereum.org/EIPS/eip-7251
-[EIP-7549]: https://eips.ethereum.org/EIPS/eip-7549
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-[EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
-[EIP-7691]: https://eips.ethereum.org/EIPS/eip-7691
-[EIP-7702]: https://eips.ethereum.org/EIPS/eip-7702
-[EIP-7594]: https://eips.ethereum.org/EIPS/eip-7594
-[EIP-7642]: https://eips.ethereum.org/EIPS/eip-7642
-[EIP-7823]: https://eips.ethereum.org/EIPS/eip-7823
-[EIP-7825]: https://eips.ethereum.org/EIPS/eip-7825
-[EIP-7883]: https://eips.ethereum.org/EIPS/eip-7883
-[EIP-7892]: https://eips.ethereum.org/EIPS/eip-7892
-[EIP-7910]: https://eips.ethereum.org/EIPS/eip-7910
-[EIP-7917]: https://eips.ethereum.org/EIPS/eip-7917
-[EIP-7918]: https://eips.ethereum.org/EIPS/eip-7918
-[EIP-7934]: https://eips.ethereum.org/EIPS/eip-7934
-[EIP-7935]: https://eips.ethereum.org/EIPS/eip-7935
-[EIP-7939]: https://eips.ethereum.org/EIPS/eip-7939
-[EIP-7951]: https://eips.ethereum.org/EIPS/eip-7951
-
-Some clarifications were enabled without protocol releases:
-
-| EIP | Block No. |
-|-----|-----------|
-| [EIP-2681](https://eips.ethereum.org/EIPS/eip-2681) | 0 |
-| [EIP-3607](https://eips.ethereum.org/EIPS/eip-3607) | 0 |
-| [EIP-7523](https://eips.ethereum.org/EIPS/eip-7523) | 15537394 |
-| [EIP-7610](https://eips.ethereum.org/EIPS/eip-7610) | 0 |
-
-## Execution Specification (work-in-progress)
-
-The execution specification is a python implementation of Ethereum that prioritizes readability and simplicity. It will be accompanied by both narrative and API level documentation of the various components written in markdown and rendered using docc...
-
-* [Rendered specification](https://ethereum.github.io/execution-specs/)
-
-## Usage
-
-The Ethereum specification is maintained as a Python library, for better integration with tooling and testing.
-
-Requires Python 3.11+
-
-### Building Specification Documentation
-
-Building the spec documentation is most easily done through [`tox`](https://tox.readthedocs.io/en/latest/):
-
-```bash
-uvx --with=tox-uv tox -e spec-docs
-```
+The Ethereum Execution Layer Specifications (EELS) are an executable Python reference implementation of Ethereum's execution layer, along with the test cases that verify it. It provides a shared, runnable description of consensus-critical behaviour, and the accompanying tests generate fixtures that can be used to validate execution client implementations.
 
-The path to the generated HTML will be printed to the console.
+## Quick Start
 
-### Browsing Updated Documentation
+execution-specs uses [`uv`](https://docs.astral.sh/uv/) to manage the Python environment and dependencies, and [`just`](https://just.systems/) as a task runner for common commands (linting, building docs, generating fixtures). The commands below install both and set up the repo from scratch.
 
-To view the updated local documentation, run:
+Requires a Unix-like shell. All platforms:
 
-```bash
-uv run mkdocs serve
+```console
+git clone https://github.com/ethereum/execution-specs
+cd execution-specs
+curl -LsSf https://astral.sh/uv/install.sh | sh
+uv python install 3.12
+uv python pin 3.12
+uv sync
+uv tool install --exclude-newer "10 days" rust-just
+just shell-completions
 ```
 
-then connect to `localhost:8000` in a browser
+Python 3.11–3.14 are supported; 3.12 tends to be the smoothest for local setup (pre-built wheels are available across the dependency set). For alternative `just` installation paths, macOS-specific installation notes, and troubleshooting, see [Installation](docs/getting_started/installation.md).
+
+## Documentation
+
+- **Repo documentation (default branch/fork)**: <https://steel.ethereum.foundation/docs/execution-specs/>
+- **Protocol history**: [docs/specs/protocol_history.md](docs/specs/protocol_history.md)
+- **Versioning scheme**: [docs/specs/spec_releases.md](docs/specs/spec_releases.md) (PEP 440 compatible; hardfork encoded in the minor version, `rcN` marks devnets).
+
+## Contributing
+
+Earnest contributions are welcome; drive-by contributions are not. See [CONTRIBUTING.md](CONTRIBUTING.md) for how to raise issues and pull requests. Further reading:
+
+- [Code Standards](docs/getting_started/code_standards.md): Python coding preferences enforced in CI.
+- [Verifying Changes](docs/getting_started/verifying_changes.md): Which local checks to run before opening a PR.
+- [Writing Specs](docs/specs/writing_specs.md): Style rules and `ethereum_spec_tools` utilities for changes under `src/ethereum/`.
+- [Writing Tests](docs/writing_tests/index.md): For guidance on adding consensus tests under `./tests/`.
+
+This repository is maintained by the [STEEL Team](https://steel.ethereum.foundation/) at the Ethereum Foundation.
+
+## Community and Support
+
+Discussion around the initial specification of protocol changes happens on [Ethereum Magicians](https://ethereum-magicians.org/), in pull requests on [ethereum/EIPs](https://github.com/ethereum/EIPs), on the [Ethereum R&D Discord](https://discord.com/invite/qGpsxSA) (one of the channels in the *Execution R&D* category; for testing use `#el-testing`), and in the AllCoreDevs calls.
+
+For tracking the status of upcoming Ethereum upgrades, see [Forkcast](https://forkcast.org/): EIP inclusion, client implementation progress, and ACD call summaries.
+
+For other help, see the [Documentation](#documentation) section above, or reach out to one of the [STEEL team members](https://steel.ethereum.foundation/team/) in the Ethereum R&D Discord.
+
+### Related projects
+
+- [ethereum/EIPs](https://github.com/ethereum/EIPs): The prose EIP documents that EELS implements.
+- [ethereum/execution-apis](https://github.com/ethereum/execution-apis): The JSON-RPC API specification, which lives in a separate repository.
+- [ethereum/consensus-specs](https://github.com/ethereum/consensus-specs): The consensus-layer counterpart to this repository.
+
+Production execution clients that implement the spec include [besu](https://github.com/besu-eth/besu), [erigon](https://github.com/erigontech/erigon), [ethrex](https://github.com/lambdaclass/ethrex), [geth](https://github.com/ethereum/go-ethereum), [nethermind](https://github.com/NethermindEth/nethermind), and [reth](https://github.com/paradigmxyz/reth).
+
+## Responsible Disclosure of Vulnerabilities
+
+> [!CAUTION]
+> Care is required when filing issues or PRs for functionality that is live on Ethereum mainnet. Please report vulnerabilities and verify bounty eligibility via the [bug bounty program](https://bounty.ethereum.org); see [SECURITY.md](SECURITY.md) for details.
+>
+> - **Please do not create a PR with a vulnerability visible.**
+> - **Please do not file a public ticket mentioning the vulnerability.**
 
 ## License
 
-The Ethereum Execution Layer Specification code is licensed under the [Creative Commons Zero v1.0 Universal](LICENSE.md).
+The Ethereum Execution Layer Specification is licensed under the [Creative Commons Zero v1.0 Universal](LICENSE.md).
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
deleted file mode 100644
index 4286cf29063..00000000000
--- a/docs/CHANGELOG.md
+++ /dev/null
@@ -1,1130 +0,0 @@
-# Changelog
-
-Test fixtures for use by clients are available for each release on the [Github releases page](https://github.com/ethereum/execution-spec-tests/releases).
-
-**Key:** ✨ = New, 🐞 = Fixed, 🔀 = Changed. 💥 = Breaking
-
-## 🔜 [Unreleased]
-
-### 💥 Breaking Change
-
-### 🛠️ Framework
-
-- 🐞 Remove `Op.CLZ` from `UndefinedOpcodes` list ([#1970](https://github.com/ethereum/execution-specs/pull/1970)).
-- 🐞 Make `TransactionTraces` `CamelModel` less lestrictive ([#2081](https://github.com/ethereum/execution-specs/pull/2081)).
-
-#### `fill`
-
-- ✨ Allow command to customize `--chain-id` used for filling ([#2016](https://github.com/ethereum/execution-specs/pull/2016)).
-
-#### `consume`
-
-- ✨ Add Besu `evmtool` support for `consume direct` via `state-test` and `block-test` subcommands ([#2219](https://github.com/ethereum/execution-specs/pull/2219)).
-
-#### `execute`
-
-- ✨ Add transaction batching to avoid RPC overload when executing tests with many transactions. Transactions are now sent in configurable batches (default: 750) with progress logging. Use `--max-tx-per-batch` to configure the batch size ([#1907](https://github.com/ethereum/execution-specs/pull/1907)).
-- ✨ `execute hive` and `execute remote` now defer funding of accounts until the minimum amount required to send the test transactions is calculated, in order to optimize the amount of Eth used to execute the tests ([#1822](https://github.com/ethereum/execution-specs/pull/1822)).
-- ✨ Dynamically fetch gas prices from the network and update all transactions to use 1.5x the current values ([#1822](https://github.com/ethereum/execution-specs/pull/1822)).
-- ✨ New `--dry-run` flag to calculate the amount of Eth that will be spent executing a test given the current network gas prices ([#1822](https://github.com/ethereum/execution-specs/pull/1822)).
-- 🔀 Load balancing mode of `execute` for xdist was updated from `loadscope` to `load` ([#1822](https://github.com/ethereum/execution-specs/pull/1822)).
-- 💥 `--eoa-fund-amount-default` has been deprecated since the command now automatically calculates the funding amount ([#1822](https://github.com/ethereum/execution-specs/pull/1822)).
-- 💥 `--sender-key-initial-balance` flag of `execute hive` has been renamed to `--seed-key-initial-balance` ([#1822](https://github.com/ethereum/execution-specs/pull/1822)).
-- 🔀 Flags --default-gas-price, --default-max-fee-per-gas and --default-max-priority-fee-per-gas now default to None and ideally should be omitted because, when unset, the command now defaults to fetch the value from the network, which is a more reliable behavior ([#1822](https://github.com/ethereum/execution-specs/pull/1822)).
-
-### 📋 Misc
-
-- ✨ Implement EIP-7928 Block-Level Access Lists ([#1719](https://github.com/ethereum/execution-specs/pull/1719)).
-
-### 🧪 Test Cases
-
-- ✨ Add missing fuzzy-compute benchmark configurations for `KECCAK256`, `CODECOPY`, `CALLDATACOPY`, `RETURNDATACOPY`, `MLOAD`, `MSTORE`, `MSTORE8`, `MCOPY`, `LOG*`, `CALLDATASIZE`, `CALLDATALOAD`, and `RETURNDATASIZE` opcodes ([#1956](https://github.com/ethereum/execution-specs/pull/1956)).
-- ✨ Add precompile benchmark configurations for `ecPairing`, `blake2f`, `BLS12_G1_MSM`, `BLS12_G2_MSM` and `BLS12_PAIRING` to unblock repricing analysis ([#2003](https://github.com/ethereum/execution-specs/pull/2003)).
-- 🔀 Relabel `@pytest.mark.repricing` markers in benchmark tests to reflect configurations requested for gas repricing analysis ([#1971](https://github.com/ethereum/execution-specs/pull/1971)).
-- ✨ New EIP-7702 test cases added ([#1974](https://github.com/ethereum/execution-specs/pull/1974)).
-- ✨ Add missing benchmark configurations / opcode to benchmark tests for repricing analysis([#2006](https://github.com/ethereum/execution-specs/pull/2006)).
-- ✨ Port STATICCALL to CALL tests with zero and non-zero value transfer from `tests/static`, extending coverage with `pytest.mark.with_all_precompiles` ([#1960](https://github.com/ethereum/execution-specs/pull/1960)).
-- ✨ Add BAL tests that dequeue EIP-7251 consolidation requests. ([#2076](https://github.com/ethereum/execution-specs/pull/2076)).
-- ✨ Add BAL tests for handling 7702 delegation reset and delegated create. ([#2097](https://github.com/ethereum/execution-specs/pull/2097)).
-- ✨ Add benchmark scenarios for ether transfers to precompiles, warm access list transfers, and max-size contract creation transactions ([#2171](https://github.com/ethereum/execution-specs/pull/2171)).
-
-## [v5.4.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v5.4.0) - 2025-12-07
-
-### 🛠️ Framework
-
-#### General
-
-- 🔀 Updated default block gas limit from 45M to 60M to align with [EIP-7935](https://eips.ethereum.org/EIPS/eip-7935) for the Osaka fork.
-
-#### `fill`
-
-- 🐞 Allow `evmone` to fill Prague and Osaka blockchain tests (mainly modified deposit contract tests) ([#1689](https://github.com/ethereum/execution-specs/pull/1689)).
-- 🐞 Turn off Block-Level Access List related checks when filling tests for Amsterdam ([#1737](https://github.com/ethereum/execution-specs/pull/1737)).
-
-#### `consume`
-
-- 🐞 Fix a bug with `consume sync` tests where some clients don't have JSON-RPC immediately available after syncing and can't yet serve the synced block ([#1670](https://github.com/ethereum/execution-specs/pull/1670)).
-
-### 📋 Misc
-
-- 🐞 WELDed the EEST tox environments relevant to producing documentation into EELS, and added a tool to cleanly add codespell whitelist entries. ([#1695](https://github.com/ethereum/execution-specs/pull/1659)).
-- 🐞 Fix duplicate storage write issues for block access lists EIP-7928 implementation ([#1743](https://github.com/ethereum/execution-specs/pull/1743)).
-
-### 🧪 Test Cases
-
-- 🐞 Fix BALs opcode OOG test vectors by updating the Amsterdam commit hash in specs and validating appropriately on the testing side ([#2293](https://github.com/ethereum/execution-spec-tests/pull/2293)).
-- ✨ Fix test vector for BALs SSTORE with OOG by pointing to updated specs; add new boundary conditions cases for SSTORE w/ OOG ([#2297](https://github.com/ethereum/execution-spec-tests/pull/2297)).
-- ✨ Expand EIP-6110 modified contract tests, where the extra event log has no topics at all ([#1693](https://github.com/ethereum/execution-specs/pull/1693)).
-- ✨ Add a CREATE/2 test cases for when it runs OOG on code deposit ([#1705](https://github.com/ethereum/execution-specs/pull/1705)).
-- ✨ Expand cases to test *CALL opcodes causing OOG ([#1703](https://github.com/ethereum/execution-specs/pull/1703)).
-- ✨ Add a test case for base fee in block check after London ([#1702](https://github.com/ethereum/execution-specs/pull/1702)).
-- ✨ Add tests for `modexp` and `ripemd` precompiled contracts ([#1691](https://github.com/ethereum/execution-specs/pull/1691), [#1781](https://github.com/ethereum/execution-specs/pull/1781)).
-- ✨ Add `ecrecover` precompile tests originating form `evmone` unittests ([#1685](https://github.com/ethereum/execution-specs/pull/1685)).
-- ✨ Add test to validate withdarawls root ([#1746](https://github.com/ethereum/execution-specs/pull/1746)).
-- ✨ Add test for old behavior of zero gasprice txs ([#1736](https://github.com/ethereum/execution-specs/pull/1736)).
-- ✨ Add stack overflow tests and expand `BLOCKHASH` tests ([#1728](https://github.com/ethereum/execution-specs/pull/1728)).
-- ✨ Ported tests for `ripemd` precompile going OOG for all forks ([#1732](https://github.com/ethereum/execution-specs/pull/1732)).
-- ✨ Add tests for ecadd/ecmul/ecpairing constant gas repricing ([#1738](https://github.com/ethereum/execution-specs/pull/1738)).
-- ✨ Add tests that EIP-1559 and EIP-2930 typed txs are invalid and void before their fork ([#1754](https://github.com/ethereum/execution-specs/pull/1754)).
-- ✨ Add tests for an old validation rule for gas limit above 5000 ([#1731](https://github.com/ethereum/execution-specs/pull/1731)).
-- ✨ Add tests for OOG in EXP, LOG and others ([#1686](https://github.com/ethereum/execution-specs/pull/1686)).
-- ✨ Make EIP-7934 tests more dynamic and able to handle new header fields added in future forks ([#2022](https://github.com/ethereum/execution-specs/pull/2022)).
-
-## [v5.3.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v5.3.0) - 2025-10-09
-
-## 🇯🇵 Summary
-
-EEST v5.3.0 is a follow-up from our main v5.0.0 [release](https://github.com/ethereum/execution-spec-tests/releases/tag/v5.0.0), with updated BPO1 and BPO2 values aligning with the testnet parameters.
-
-This release additionally includes fixes for tests in hive, as well as new test cases for EIP-7883, EIP-7934 and critical cases for EIP-7951 (added to EEST by @chfast following a coverage review of the test suite).
-
-## 🔑  Key Changes
-
-### 🛠️ Framework
-
-- ✨ Add benchmark-specific test wrapper (`benchmark_test`) that supports **EIP-7825** and create a benchmark code generator for common test pattern ([#1945](https://github.com/ethereum/execution-spec-tests/pull/1945)).
-
-#### `fill`
-
-- ✨ Added `--optimize-gas`, `--optimize-gas-output` and `--optimize-gas-post-processing` flags that allow to binary search the minimum gas limit value for a transaction in a test that still yields the same test result ([#1979](https://github.com/ethereum/execution-spec-tests/pull/1979)).
-- ✨ Added `--watch` flag that monitors test files for changes and automatically re-runs the fill command when developing tests ([#2173](https://github.com/ethereum/execution-spec-tests/pull/2173)).
-- 🔀 Upgraded ckzg version to 2.1.3 or newer for correct handling of points at infinity ([#2171](https://github.com/ethereum/execution-spec-tests/pull/2171)).
-- 🔀 Move pytest marker registration for `fill` and `execute-*` from their respective ini files to the shared `pytest_plugins.shared.execute_fill` pytest plugin ([#2110](https://github.com/ethereum/execution-spec-tests/pull/2110)).
-- ✨ Added an `--input.blobParams` CLI argument to the transition tool (`t8n`) invocation ([#2264](https://github.com/ethereum/execution-spec-tests/pull/2264)).
-
-#### `consume`
-
-- ✨ Add retry logic to RPC requests to fix flaky connection issues in Hive ([#2205](https://github.com/ethereum/execution-spec-tests/pull/2205)).
-- 🛠️ Mark `consume sync` tests as `flaky` with 3 retires due to client sync inconsistencies ([#2252](https://github.com/ethereum/execution-spec-tests/pull/2252)).
-- ✨ Add `consume direct` using `evmone-statetest` and `evmone-blockchaintest` ([#2243](https://github.com/ethereum/execution-spec-tests/pull/2243)).
-
-### 📋 Misc
-
-- ✨ Add tighter validation for EIP-7928 model coming from t8n when filling ([#2138](https://github.com/ethereum/execution-spec-tests/pull/2138)).
-- ✨ Add flexible API for absence checks for EIP-7928 (BAL) tests ([#2124](https://github.com/ethereum/execution-spec-tests/pull/2124)).
-- 🐞 Use `engine_newPayloadV5` for `>=Amsterdam` forks in `consume engine` ([#2170](https://github.com/ethereum/execution-spec-tests/pull/2170)).
-- 🔀 Refactor EIP-7928 (BAL) absence checks into a friendlier class-based DevEx ([#2175](https://github.com/ethereum/execution-spec-tests/pull/2175)).
-- 🐞 Tighten up validation for empty lists on Block-Level Access List tests ([#2118](https://github.com/ethereum/execution-spec-tests/pull/2118)).
-- ✨ Added the `MemoryVariable` EVM abstraction to generate more readable bytecode when there's heavy use of variables that are stored in memory ([#1609](https://github.com/ethereum/execution-spec-tests/pull/1609)).
-- 🐞 Fix an issue with `test_bal_block_rewards` where the block base fee was wrongfully overridden ([#2262](https://github.com/ethereum/execution-spec-tests/pull/2262)).
-- ✨ Complete EIP checklist for EIP-7934 and update the checklist template to include block-level constraint checks ([#2282](https://github.com/ethereum/execution-spec-tests/pull/2282)).
-
-### 🧪 Test Cases
-
-- ✨ Add safe EIP-6110 workaround to allow Geth/Reth to pass invalid deposit request tests even thought they are out of spec ([#2177](https://github.com/ethereum/execution-spec-tests/pull/2177), [#2233](https://github.com/ethereum/execution-spec-tests/pull/2233)).
-- ✨ Add an EIP-7928 test case targeting the `SELFDESTRUCT` opcode. ([#2159](https://github.com/ethereum/execution-spec-tests/pull/2159)).
-- ✨ Add essential tests for coverage gaps in EIP-7951 (`p256verify` precompile) ([#2179](https://github.com/ethereum/execution-spec-tests/pull/2159), [#2203](https://github.com/ethereum/execution-spec-tests/pull/2203), [#2215](https://github.com/ethereum/execution-spec-tests/pull/2215), [#2216](https://github.com/ethereum/execution-spec-tests/pull/2216), [#2217](https://github.com/ethereum/execution-spec-tests/pull/2217), [#2218](https://github.com/ethereum/execution-spec-tests/pull/2218), [#2221](https://github.com/ethereum/execution-spec-tests/pull/2221), [#2229](https://github.com/ethereum/execution-spec-tests/pull/2229), [#2230](https://github.com/ethereum/execution-spec-tests/pull/2230), [#2237](https://github.com/ethereum/execution-spec-tests/pull/2237), [#2238](https://github.com/ethereum/execution-spec-tests/pull/2238)).
-- ✨ Add EIP-7928 successful and OOG single-opcode tests ([#2118](https://github.com/ethereum/execution-spec-tests/pull/2118)).
-- ✨ Add EIP-7928 tests for EIP-2930 interactions ([#2167](https://github.com/ethereum/execution-spec-tests/pull/2167)).
-- ✨ Add EIP-7928 tests for NOOP operations ([#2178](https://github.com/ethereum/execution-spec-tests/pull/2178)).
-- ✨ Add EIP-7928 tests for net-zero balance transfers ([#2280](https://github.com/ethereum/execution-spec-tests/pull/2280)).
-- ✨ Add fork transition test cases for EIP-7934 ([#2282](https://github.com/ethereum/execution-spec-tests/pull/2282)).
-
-## [v5.0.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v5.0.0) - 2025-09-05
-
-## 🇯🇵 Summary
-
-EEST Fujisan is our first full release for Osaka, the first full release since Pectra!
-
-In addition to the latest Osaka specific test cases, it includes re-filled `GeneralStateTests` from `ethereum/tests` (now fully maintained within EEST under `tests/static`) for Osaka adhering to the transaction gas limit cap from [EIP-7825](https://eips.ethereum.org/EIPS/eip-7825). Further framework changes include new simulators, test formats and test types.
-
-## ⚔️ Future Weld with EELS
-
-EEST will merge with [EELS](https://github.com/ethereum/execution-specs) during **Q4 2025**, after which EEST becomes read-only for external contributors.
-
-**What this means?**
-
-- All EEST code moves to the EELS repository.
-- New EEST framework location: `execution-specs/src/ethereum_spec_tests/`.
-- New EEST tests location: `execution-specs/tests/eest/`.
-- Future PRs go to EELS instead of EEST.
-
-**Important Notes:**
-
-- All PRs for tests and framework changes should still be directed at EEST until further notice.
-- There will be a brief freeze on EEST contributions during Q4 "The Switch", after which contributors can continue as before, but in EELS.
-- Test releases will continue from EEST as normal before, during, and after this transition.
-
-More information will be communicated accordingly through the normal communication channels.
-
-## ❗Current Status Quo
-
-### Test Fixtures Overview
-
-- `fixtures_static.tar.gz` has been deprecated.
-- `fixtures_stable.tar.gz` & `fixtures_develop.tar.gz` now both contain re-filled static tests, `GeneralStateTests` from `ethereum/tests`, filled **from Cancun**.
-- `fixtures_stable.tar.gz` contains tests filled for forks until Prague.
-- `fixtures_develop.tar.gz` contains tests filled for forks until Osaka.
-- `fixtures_benchmark.tar.gz` contains benchmark tests filled for only Prague.
-
-### EL Client Test Requirements
-
-**Prague Coverage (Mainnet):**
-
-- Run all `state_test`'s & `blockchain_test`'s from `fixtures_stable.tar.gz`.
-- Run only `BlockchainTests` from the latest `ethereum/tests` [release](https://github.com/ethereum/tests/releases/tag/v17.2), filled **until Prague**.
-
-**Fusaka Coverage (Including Mainnet):**
-
-- Run all  `state_test`'s & `blockchain_test`'s from `fixtures_develop.tar.gz`.
-- Run only `BlockchainTests` from the latest `ethereum/tests` [release](https://github.com/ethereum/tests/releases/tag/v17.2), filled **until Prague**.
-
-**Note**: If you require `GeneralStateTests` from `ethereum/tests` **filled for forks before Cancun** then you must get these from the latest `ethereum/tests` [release](https://github.com/ethereum/tests/releases/tag/v17.2).
-
-### Benchmark Tests
-
-For the most up-to-date benchmark tests, use `fixtures_benchmark.tar.gz`.
-
-> **Note**: Benchmark tests for Osaka (compliant with EIP-7825 transaction gas limit cap) will be added in a future feature release.
-
-### Test Fixture Formats
-
-This release includes 2 new test formats designed primarily for [Hive](https://github.com/ethereum/hive) simulators:
-
-- [**`blockchain_tests_engine_x`**](https://eest.ethereum.org/v5.0.0/running_tests/test_formats/blockchain_test_engine_x/?h=#blockchain-engine-x-tests): An optimized version of `blockchain_tests_engine` where multiple tests share the same genesis state, allowing multiple tests to run on a single client instantiation within Hive's `consume-engine`. The standard format requires a fresh client startup for each test. Due its combined genesis state, this is additionally the primary format used by the Nethermind team for benchmarking.
-
-- [**`blockchain_tests_sync`**](https://eest.ethereum.org/main/running_tests/test_formats/blockchain_test_sync/?h=sync#blockchain-engine-sync-tests): A new format adjacent to the existing `blockchain_tests_engine` format. Used specifically for the upcoming `consume-sync` simulator, which delivers engine payloads from test fixtures to the client under test, then sync's a separate client to it. This test fixture is only marked to be filled for the [EIP-7934](https://eips.ethereum.org/EIPS/eip-7934) block RLP limit tests in Osaka.
-
-### Tooling & Simulators
-
-Improved tooling and new Hive simulators are additionally included in this release:
-
-- [**`execute remote`**](https://eest.ethereum.org/main/running_tests/execute/remote/#running-test-on-a-live-remote-network): this command now supports optional [Engine RPC endpoints](https://eest.ethereum.org/main/running_tests/execute/remote/#engine-rpc-endpoint-optional) (`--engine-endpoint`) with JWT authentication #2070.
-    - This allows manual control over block creation and transaction inclusion for more deterministic test execution on live networks. Previously, `execute remote` could only submit transactions and rely on the network's automatic block production, but now it can actively drive chain progression by creating blocks on-demand via the Engine API.
-- [**`consume sync`**](https://eest.ethereum.org/main/running_tests/running/#sync): Adjacent to `consume-engine`, designed to work with the `blockchain_tests_sync` format for testing client sync scenarios.
-- [**`execute blobs`**](https://eest.ethereum.org/main/running_tests/execute/hive/#the-eestexecute-blobs-simulator):  A new Hive specific simulator that uses the EEST execute pytest plugin. Sends blob transactions to the client under test and verifies its `engine_getBlobsVX` endpoint. Requires tests to be written with a new python test format `blob_transaction_test`. Primarily used to test PeerDAS from the EL perspective.
-- [**`execute eth config`**](https://eest.ethereum.org/main/running_tests/execute/eth_config/): A command used to test the `eth_config` endpoint from [EIP-7910](https://eips.ethereum.org/EIPS/eip-7910). Can be ran [remotely](https://github.com/ethereum/execution-spec-tests/issues/2049) or within Hive.
-
-### Filling For Stateless Clients
-
-A `witness-filler` extension is included in this release, allowing for tests to be filled that include an `executionWitness` for each fixture #2066. This essentially calls an external executable written in rust, and hence must be installed for usage within `fill` using the `--witness` flag. The current approach is below:
-
-```sh
-cargo install --git https://github.com/kevaundray/reth.git --branch jsign-witness-filler witness-filler
-uv run fill ... --output=fixtures-witness --witness --clean
-```
-
-> **Note**: The `witness-filler` executable is not maintained by EEST so we cannot help with any issues.
-
-## 💥 Breaking Changes
-
-### Important changes for EEST superusers
-
-- EEST now requires `uv>=0.7.0` ([#1904](https://github.com/ethereum/execution-spec-tests/pull/1904)). If your version of `uv` is too old.
-- When filling fixtures transition forks are included within there respective "to" fork, where `--fork Osaka` will now include `PragueToOsakaAtTime15k`. Previously transitions fork would only be included when filling with `--from Prague --until Osaka` flags.
-- Python 3.10 support was removed in this release ([#1808](https://github.com/ethereum/execution-spec-tests/pull/1808)).
-- EEST no longer allows usage of Yul code in Python tests. From now on, please make use of our opcode wrapper. Yul code is now only allowed in the "static tests" located in `./tests/static/` (these are test cases defined by JSON and YAML files instead of Python test functions that were originally maintained in [ethereum/tests](https://github.com/ethereum/tests)).
-- In order to fill the static tests (which is not the case by default), please ensure that `solc` is located in your `PATH`.
-- The output behavior of `fill` has changed ([#1608](https://github.com/ethereum/execution-spec-tests/pull/1608)):
-    - Before: `fill` wrote fixtures into the directory specified by the `--output` flag (default: `fixtures`). This could have many unintended consequences, including unexpected errors if old or invalid fixtures existed in the directory (for details see [#1030](https://github.com/ethereum/execution-spec-tests/issues/1030)).
-    - Now: `fill` will exit without filling any tests if the specified directory exists and is not-empty. This may be overridden by adding the `--clean` flag, which will first remove the specified directory.
-- Writing debugging information to the EVM "dump directory" by default has been disabled. To obtain debug output, the `--evm-dump-dir` flag must now be explicitly set. As a consequence, the now redundant `--skip-evm-dump` option was removed ([#1874](https://github.com/ethereum/execution-spec-tests/pull/1874)). This undoes functionality originally introduced in [#999](https://github.com/ethereum/execution-spec-tests/pull/999) and [#1150](https://github.com/ethereum/execution-spec-tests/pull/1150).
-
-### Feature `zkevm` updated to `benchmark`
-
-Due to the crossover between `zkevm` and `benchmark` tests, all instances of the former have been replaced with the latter nomenclature. Repository PR labels and titles are additionally updated to reflect this change.
-
-This update renames the `zkevm` feature release to `benchmark` and further expands the latter for 1M, 10M, 30M, 45M, 60M, 90M, and 120M block gas limits in `fixtures_benchmark.tar.gz`.
-
-To select a test for a given gas limit, the IDs of the tests have been expanded to contain `benchmark-gas-value_XM`, where `X` can be any of the aforementioned values.
-
-The benchmark release also now includes BlockchainEngineX format that combines most of the tests into a minimal amount of genesis files. For more info see [Blockchain Engine X Tests](https://eest.ethereum.org/main/running_tests/test_formats/blockchain_test_engine_x/) in the EEST documentation.
-
-Users can select any of the artifacts depending on their benchmarking or testing needs for their provers.
-
-## 🔑  Other Key Changes
-
-### 🛠️ Framework
-
-#### 🔀 Refactoring
-
-- 🔀 Move `TransactionType` enum from test file to proper module location in `ethereum_test_types.transaction_types` for better code organization and reusability.
-- ✨ Opcode classes now validate keyword arguments and raise `ValueError` with clear error messages.
-- 🔀 This PR removes the `solc` requirement to fill Python test cases. Regular test contributors no longer need to concern themselves with `solc` and, as such, the `solc-select` dependency has been removed. The remaining tests that used Yul have been ported to the EEST opcode wrapper mini-lang and the use of Yul in Python tests is no longer supported. Maintainers only: To fill the "static" JSON and YAML tests (`./tests/static/`) locally, `solc` (ideally v0.8.24) must be available in your PATH.
-- 🔀 Updated default block gas limit from 36M to 45M to match mainnet environment.
-- 🔀 Refactor fork logic to include transition forks within there "to" fork ([#2051](https://github.com/ethereum/execution-spec-tests/pull/2051)).
-
-#### `fill`
-
-- ✨ Add the `ported_from` test marker to track Python test cases that were converted from static fillers in [ethereum/tests](https://github.com/ethereum/tests) repository ([#1590](https://github.com/ethereum/execution-spec-tests/pull/1590)).
-- ✨ Add a new pytest plugin, `ported_tests`, that lists the static fillers and PRs from `ported_from` markers for use in the coverage Github Workflow ([#1634](https://github.com/ethereum/execution-spec-tests/pull/1634)).
-- ✨ Enable two-phase filling of fixtures with pre-allocation groups and add a `BlockchainEngineXFixture` format ([#1706](https://github.com/ethereum/execution-spec-tests/pull/1706), [#1760](https://github.com/ethereum/execution-spec-tests/pull/1760)).
-- ✨ Add `--generate-all-formats` flag to enable generation of all fixture formats including `BlockchainEngineXFixture` in a single command; enable `--generate-all-formats` automatically for tarball output, `--output=fixtures.tar.gz`, [#1855](https://github.com/ethereum/execution-spec-tests/pull/1855).
-- 🔀 Refactor: Encapsulate `fill`'s fixture output options (`--output`, `--flat-output`, `--single-fixture-per-file`) into a `FixtureOutput` class ([#1471](https://github.com/ethereum/execution-spec-tests/pull/1471),[#1612](https://github.com/ethereum/execution-spec-tests/pull/1612)).
-- ✨ Don't warn about a "high Transaction gas_limit" for `zkevm` tests ([#1598](https://github.com/ethereum/execution-spec-tests/pull/1598)).
-- 🐞 `fill` no longer writes generated fixtures into an existing, non-empty output directory; it must now be empty or `--clean` must be used to delete it first ([#1608](https://github.com/ethereum/execution-spec-tests/pull/1608)).
-- 🐞 `zkevm` marked tests have been removed from `tests-deployed` tox environment into its own separate workflow `tests-deployed-zkevm` and are filled by `evmone-t8n` ([#1617](https://github.com/ethereum/execution-spec-tests/pull/1617)).
-- ✨ Field `postStateHash` is now added to all `blockchain_test` and `blockchain_test_engine` tests that use `exclude_full_post_state_in_output` in place of `postState`. Fixes `evmone-blockchaintest` test consumption and indirectly fixes coverage runs for these tests ([#1667](https://github.com/ethereum/execution-spec-tests/pull/1667)).
-- 🔀 Changed INVALID_DEPOSIT_EVENT_LAYOUT to a BlockException instead of a TransactionException ([#1773](https://github.com/ethereum/execution-spec-tests/pull/1773)).
-- 🔀 Disabled writing debugging information to the EVM "dump directory" to improve performance. To obtain debug output, the `--evm-dump-dir` flag must now be explicitly set. As a consequence, the now redundant `--skip-evm-dump` option was removed ([#1874](https://github.com/ethereum/execution-spec-tests/pull/1874)).
-- ✨ Generate unique addresses with Python for compatible static tests, instead of using hard-coded addresses from legacy static test fillers ([#1781](https://github.com/ethereum/execution-spec-tests/pull/1781)).
-- ✨ Added support for the `--benchmark-gas-values` flag in the `fill` command, allowing a single genesis file to be used across different gas limit settings when generating fixtures. ([#1895](https://github.com/ethereum/execution-spec-tests/pull/1895)).
-- ✨ Static tests can now specify a maximum fork where they should be filled for ([#1977](https://github.com/ethereum/execution-spec-tests/pull/1977)).
-- ✨ Static tests can now be filled in every format using `--generate-all-formats` ([#2006](https://github.com/ethereum/execution-spec-tests/pull/2006)).
-- 💥 Flag `--flat-output` has been removed due to having been unneeded for an extended period of time ([#2018](https://github.com/ethereum/execution-spec-tests/pull/2018)).
-- ✨ Add support for `BlockchainEngineSyncFixture` format for tests marked with `pytest.mark.verify_sync` to enable client synchronization testing via `consume sync` command ([#2007](https://github.com/ethereum/execution-spec-tests/pull/2007)).
-- ✨ Framework is updated to include BPO ([EIP-7892](https://eips.ethereum.org/EIPS/eip-7892)) fork markers to enable the filling of BPO tests ([#2050](https://github.com/ethereum/execution-spec-tests/pull/2050)).
-- ✨ Generate and include execution witness data in blockchain fixtures if `--witness` is specified ([#2066](https://github.com/ethereum/execution-spec-tests/pull/2066)).
-
-#### `consume`
-
-- ✨ Add `--extract-to` parameter to `consume cache` command for direct fixture extraction to specified directory, replacing the need for separate download scripts. ([#1861](https://github.com/ethereum/execution-spec-tests/pull/1861)).
-- 🐞 Fix `consume cache --cache-folder` parameter being ignored, now properly caches fixtures in the specified directory instead of always using the default system cache location.
-- 🐞 Fix the `consume_direct.sh` script generated by `consume` in the `--evm-dump` dir by quoting test IDs [#1987](https://github.com/ethereum/execution-spec-tests/pull/1987).
-- 🔀 `consume` now automatically avoids GitHub API calls when using direct release URLs (better for CI environments), while release specifiers like `stable@latest` continue to use the API for version resolution ([#1788](https://github.com/ethereum/execution-spec-tests/pull/1788)).
-- 🔀 Refactor consume simulator architecture to use explicit pytest plugin structure with forward-looking architecture ([#1801](https://github.com/ethereum/execution-spec-tests/pull/1801)).
-- 🔀 Add exponential retry logic to initial fcu within consume engine ([#1815](https://github.com/ethereum/execution-spec-tests/pull/1815)).
-- ✨ Add `consume sync` command to test client synchronization capabilities by having one client sync from another via Engine API and P2P networking ([#2007](https://github.com/ethereum/execution-spec-tests/pull/2007)).
-- 💥 Removed the `consume hive` command, this was a convenience command that ran `consume rlp` and `consume engine` in one pytest session; the individual commands should now be used instead ([#2008](https://github.com/ethereum/execution-spec-tests/pull/2008)).
-- ✨ Update the hive ruleset to include BPO ([EIP-7892](https://eips.ethereum.org/EIPS/eip-7892)) forks ([#2050](https://github.com/ethereum/execution-spec-tests/pull/2050)).
-
-#### `execute`
-
-- ✨ Added new `Blob` class which can use the ckzg library to generate valid blobs at runtime ([#1614](https://github.com/ethereum/execution-spec-tests/pull/1614)).
-- ✨ Added `blob_transaction_test` execute test spec, which allows tests that send blob transactions to a running client and verifying its `engine_getBlobsVX` endpoint behavior ([#1644](https://github.com/ethereum/execution-spec-tests/pull/1644)).
-- ✨ Added `execute eth-config` command to test the `eth_config` RPC endpoint of a client, and includes configurations by default for Mainnet, Sepolia, Holesky, and Hoodi ([#1863](https://github.com/ethereum/execution-spec-tests/pull/1863)).
-- ✨ Command `execute remote` now allows specification of an Engine API endpoint to drive the chain via `--engine-endpoint` and either `--engine-jwt-secret` or `--engine-jwt-secret-file`. This mode is useful when there's no consensus client connected to the execution client so `execute` will automatically request blocks via the Engine API when it sends transactions ([#2070](https://github.com/ethereum/execution-spec-tests/pull/2070)).
-- ✨ Added `--address-stubs` flag to the `execute` command which allows to specify a JSON-formatted string, JSON file or YAML file which contains label-to-address of specific pre-deployed contracts already existing in the network where the tests are executed ([#2073](https://github.com/ethereum/execution-spec-tests/pull/2073)).
-
-### 📋 Misc
-
-- ✨ Add pypy3.11 support ([#1854](https://github.com/ethereum/execution-spec-tests/pull/1854)).
-- 🔀 Use only relative imports in `tests/` directory ([#1848](https://github.com/ethereum/execution-spec-tests/pull/1848)).
-- 🔀 Convert absolute imports to relative imports in `src/` directory for better code maintainability ([#1907](https://github.com/ethereum/execution-spec-tests/pull/1907)).
-- 🔀 Misc. doc updates, including a navigation footer ([#1846](https://github.com/ethereum/execution-spec-tests/pull/1846)).
-- 🔀 Remove Python 3.10 support ([#1808](https://github.com/ethereum/execution-spec-tests/pull/1808)).
-- 🔀 Modernize codebase with Python 3.11 language features ([#1812](https://github.com/ethereum/execution-spec-tests/pull/1812)).
-- ✨ Add changelog formatting validation to CI to ensure consistent punctuation in bullet points [#1691](https://github.com/ethereum/execution-spec-tests/pull/1691).
-- ✨ Added the [EIP checklist template](https://eest.ethereum.org/main/writing_tests/checklist_templates/eip_testing_checklist_template/) that serves as a reference to achieve better coverage when implementing tests for new EIPs ([#1327](https://github.com/ethereum/execution-spec-tests/pull/1327)).
-- ✨ Added [Post-Mortems of Missed Test Scenarios](https://eest.ethereum.org/main/writing_tests/post_mortems/) to the documentation that serves as a reference list of all cases that were missed during the test implementation phase of a new EIP, and includes the steps taken in order to prevent similar test cases to be missed in the future ([#1327](https://github.com/ethereum/execution-spec-tests/pull/1327)).
-- ✨ Add documentation "Running Tests" that explains the different methods available to run EEST tests and reference guides for running `consume` and `hive`: ([#1172](https://github.com/ethereum/execution-spec-tests/pull/1172)).
-- ✨ Added a new `eest` sub-command, `eest info`, to easily print a cloned EEST repository's version and the versions of relevant tools, e.g., `python`, `uv` ([#1621](https://github.com/ethereum/execution-spec-tests/pull/1621)).
-- ✨ Add `CONTRIBUTING.md` for execution-spec-tests and improve coding standards documentation ([#1604](https://github.com/ethereum/execution-spec-tests/pull/1604)).
-- ✨ Add `CLAUDE.md` to help working in @ethereum/execution-spec-tests with [Claude Code](https://docs.anthropic.com/en/docs/claude-code/overview) ([#1749](https://github.com/ethereum/execution-spec-tests/pull/1749)).
-- ✨ Use `codespell` instead of `pyspelling` to spell-check python and markdown sources ([#1715](https://github.com/ethereum/execution-spec-tests/pull/1715)).
-- 🔀 Updated from pytest 7 to [pytest 8](https://docs.pytest.org/en/stable/changelog.html#features-and-improvements), benefits include improved type hinting and hook typing, stricter mark handling, and clearer error messages for plugin and metadata development ([#1433](https://github.com/ethereum/execution-spec-tests/pull/1433)).
-- 🐞 Fix bug in ported-from plugin and coverage script that made PRs fail with modified tests that contained no ported tests ([#1661](https://github.com/ethereum/execution-spec-tests/pull/1661)).
-- 🔀 Refactor the `click`-based CLI interface used for pytest-based commands (`fill`, `execute`, `consume`) to make them more extensible ([#1654](https://github.com/ethereum/execution-spec-tests/pull/1654)).
-- 🔀 Split `src/ethereum_test_types/types.py` into several files to improve code organization ([#1665](https://github.com/ethereum/execution-spec-tests/pull/1665)).
-- ✨ Added `extract_config` command to extract genesis files used to launch clients in hive ([#1740](https://github.com/ethereum/execution-spec-tests/pull/1740)).
-- ✨ Added automatic checklist generation for every EIP inside of the `tests` folder. The checklist is appended to each EIP in the documentation in the "Test Case Reference" section ([#1679](https://github.com/ethereum/execution-spec-tests/pull/1679), [#1718](https://github.com/ethereum/execution-spec-tests/pull/1718)).
-- 🔀 Add macOS hive development mode workaround to the docs [#1786](https://github.com/ethereum/execution-spec-tests/pull/1786).
-- 🔀 Refactor and clean up of exceptions including EOF exceptions within client specific mappers [#1803](https://github.com/ethereum/execution-spec-tests/pull/1803).
-- 🔀 Rename `tests/zkevm/` to `tests/benchmark/` and replace the `zkevm` pytest mark with `benchmark` [#1804](https://github.com/ethereum/execution-spec-tests/pull/1804).
-- 🔀 Add fixture comparison check to optimize coverage workflow in CI ([#1833](https://github.com/ethereum/execution-spec-tests/pull/1833)).
-- 🔀 Move `TransactionType` enum from test file to proper module location in `ethereum_test_types.transaction_types` for better code organization and reusability ([#1763](https://github.com/ethereum/execution-spec-tests/pull/1673)).
-- ✨ Opcode classes now validate keyword arguments and raise `ValueError` with clear error messages ([#1739](https://github.com/ethereum/execution-spec-tests/pull/1739), [#1856](https://github.com/ethereum/execution-spec-tests/pull/1856)).
-- ✨ All commands (`fill`, `consume`, `execute`) now work without having to clone the repository, e.g. `uv run --with git+https://github.com/ethereum/execution-spec-tests.git consume` now works from any folder ([#1863](https://github.com/ethereum/execution-spec-tests/pull/1863)).
-- 🔀 Move Prague to stable and Osaka to develop ([#1573](https://github.com/ethereum/execution-spec-tests/pull/1573)).
-- ✨ Add a `pytest.mark.with_all_typed_transactions` marker that creates default typed transactions for each `tx_type` supported by the current `fork` ([#1890](https://github.com/ethereum/execution-spec-tests/pull/1890)).
-- ✨ Add basic support for ``Amsterdam`` fork in order to begin testing Glamsterdam ([#2069](https://github.com/ethereum/execution-spec-tests/pull/2069)).
-- ✨ [EIP-7928](https://eips.ethereum.org/EIPS/eip-7928): Add initial framework support for `Block Level Access Lists (BAL)` testing for Amsterdam ([#2067](https://github.com/ethereum/execution-spec-tests/pull/2067)).
-
-### 🧪 Test Cases
-
-- ✨ [BloatNet](https://bloatnet.info)/Multidimensional Metering: Add benchmarks to be used as part of the BloatNet project and also for Multidimensional Metering.
-- ✨ [EIP-7951](https://eips.ethereum.org/EIPS/eip-7951): Add additional test cases for modular comparison.
-- 🔀 Refactored `BLOBHASH` opcode context tests to use the `pre_alloc` plugin in order to avoid contract and EOA address collisions ([#1637](https://github.com/ethereum/execution-spec-tests/pull/1637)).
-- 🔀 Refactored `SELFDESTRUCT` opcode collision tests to use the `pre_alloc` plugin in order to avoid contract and EOA address collisions ([#1643](https://github.com/ethereum/execution-spec-tests/pull/1643)).
-- ✨ EIP-7594: Sanity test cases to send blob transactions and verify `engine_getBlobsVX` using the `execute` command ([#1644](https://github.com/ethereum/execution-spec-tests/pull/1644),[#1884](https://github.com/ethereum/execution-spec-tests/pull/1884)).
-- 🔀 Refactored EIP-145 static tests into python ([#1683](https://github.com/ethereum/execution-spec-tests/pull/1683)).
-- ✨ EIP-7823, EIP-7883: Add test cases for ModExp precompile gas-cost updates and input limits on Osaka ([#1579](https://github.com/ethereum/execution-spec-tests/pull/1579), [#1729](https://github.com/ethereum/execution-spec-tests/pull/1729), [#1881](https://github.com/ethereum/execution-spec-tests/pull/1881)).
-- ✨ [EIP-7825](https://eips.ethereum.org/EIPS/eip-7825): Add test cases for the transaction gas limit of 2^24 gas ([#1711](https://github.com/ethereum/execution-spec-tests/pull/1711), [#1882](https://github.com/ethereum/execution-spec-tests/pull/1882)).
-- ✨ [EIP-7951](https://eips.ethereum.org/EIPS/eip-7951): add test cases for `P256VERIFY` precompile to support secp256r1 curve [#1670](https://github.com/ethereum/execution-spec-tests/pull/1670).
-- ✨ Introduce blockchain tests for benchmark to cover the scenario of pure ether transfers [#1742](https://github.com/ethereum/execution-spec-tests/pull/1742).
-- ✨ [EIP-7934](https://eips.ethereum.org/EIPS/eip-7934): Add test cases for the block RLP max limit of 10MiB ([#1730](https://github.com/ethereum/execution-spec-tests/pull/1730)).
-- ✨ [EIP-7939](https://eips.ethereum.org/EIPS/eip-7939): Add count leading zeros (CLZ) opcode tests for Osaka ([#1733](https://github.com/ethereum/execution-spec-tests/pull/1733)).
-- ✨ [EIP-7934](https://eips.ethereum.org/EIPS/eip-7934): Add additional test cases for block RLP max limit with all typed transactions and for a log-creating transactions ([#1890](https://github.com/ethereum/execution-spec-tests/pull/1890)).
-- ✨ [EIP-7825](https://eips.ethereum.org/EIPS/eip-7825): Pre-Osaka tests have been updated to either (1) dynamically adapt to the transaction gas limit cap, or (2) reduce overall gas consumption to fit the new limit ([#1924](https://github.com/ethereum/EIPs/pull/1924), [#1928](https://github.com/ethereum/EIPs/pull/1928), [#1980](https://github.com/ethereum/EIPs/pull/1980)).
-- ✨ [EIP-7918](https://eips.ethereum.org/EIPS/eip-7918): Blob base fee bounded by execution cost test cases (initial), includes some adjustments to [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844) tests ([#1685](https://github.com/ethereum/execution-spec-tests/pull/1685)).
-- 🔀 Adds the max blob transaction limit to the tests including updates to [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844) for Osaka ([#1884](https://github.com/ethereum/execution-spec-tests/pull/1884)).
-- 🐞 Fix issues when filling block rlp size limit tests with ``--generate-pre-alloc-groups`` ([#1989](https://github.com/ethereum/execution-spec-tests/pull/1989)).
-- ✨ [EIP-7928](https://eips.ethereum.org/EIPS/eip-7928): Add test cases for `Block Level Access Lists (BAL)` to Amsterdam ([#2067](https://github.com/ethereum/execution-spec-tests/pull/2067)).
-- 🐞 Fix issues with `Block Level Access Lists (BAL)` tests for Amsterdam ([#2121](https://github.com/ethereum/execution-spec-tests/pull/2121)).
-
-## [v4.5.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v4.5.0) - 2025-05-14
-
-### 💥 Breaking Change
-
-#### EOF removed from Osaka
-
-Following ["Interop Testing Call 34"](https://github.com/ethereum/pm/issues/1499) and the procedural EIPs [PR](https://github.com/ethereum/EIPs/pull/9703) the decision to remove EOF from Osaka was made.
-
-To accommodate EOF testing for the interim within EEST, its tests have migrated to a new `tests/unscheduled` folder. This folder will now contain tests for features that are not yet CFI'd in any fork. When EOF is CFI'd for a fork in the future, all tests will be moved from unscheduled to the respective future fork folder.
-
-A new fork `EOFv1` has additionally been created to fill and consume EOF related fixtures. Client tests fillers such as `evmone` (and client consumers) will now need to use this fork name.
-
-### 🛠️ Framework
-
-- ✨ Add an empty account function for usage within fill and execute ([#1482](https://github.com/ethereum/execution-spec-tests/pull/1482)).
-- ✨ Added `TransactionException.INTRINSIC_GAS_BELOW_FLOOR_GAS_COST` exception to specifically catch the case where the intrinsic gas cost is insufficient due to the data floor gas cost ([#1582](https://github.com/ethereum/execution-spec-tests/pull/1582)).
-
-### 📋 Misc
-
-- ✨ Engine API updates for Osaka, add `get_blobs` rpc method ([#1510](https://github.com/ethereum/execution-spec-tests/pull/1510)).
-- ✨ The EIP Version checker has been moved from `fill` and `execute` to it's own command-line tool `check_eip_versions` that gets ran daily as a Github Action ([#1537](https://github.com/ethereum/execution-spec-tests/pull/1537)).
-- 🔀 Add new `tests/unscheduled` folder, move EOF from Osaka to unscheduled, add `EOFv1` fork name for EOF tests ([#1507](https://github.com/ethereum/execution-spec-tests/pull/1507)).
-- ✨ CI features now contain an optional field to skip them from EEST full releases, `benchmark` and EOF features are now feature only ([#1596](https://github.com/ethereum/execution-spec-tests/pull/1596)).
-- 🐞 Don't attempt to install `solc` via `solc-select` on ARM (official Linux ARM builds of `solc` are not available at the time of writing, cf [ethereum/solidity#11351](https://github.com/ethereum/solidity/issues/11351)) and add a version sanity check ([#1556](https://github.com/ethereum/execution-spec-tests/pull/1556)).
-
-### 🧪 Test Cases
-
-- 🔀 Automatically apply the `benchmark` marker to all tests under `./tests/benchmark/` and `./tests/prague/eip2537_bls_12_381_precompiles/` via conftest configuration ([#1534](https://github.com/ethereum/execution-spec-tests/pull/1534)).
-- ✨ Port [calldataload](https://github.com/ethereum/tests/blob/ae4791077e8fcf716136e70fe8392f1a1f1495fb/src/GeneralStateTestsFiller/VMTests/vmTests/calldatacopyFiller.yml) and [calldatasize](https://github.com/ethereum/tests/blob/81862e4848585a438d64f911a19b3825f0f4cd95/src/GeneralStateTestsFiller/VMTests/vmTests/calldatasizeFiller.yml) tests ([#1236](https://github.com/ethereum/execution-spec-tests/pull/1236)).
-
-## [v4.4.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v4.4.0) - 2025-04-29
-
-### 💥 Breaking Change
-
-#### `fixtures_static`
-
-A new fixture tarball has been included in this release: `fixtures_static.tar.gz`.
-
-This tarball contains all tests inside of [`./tests/static`](https://github.com/ethereum/execution-spec-tests/tree/main/tests/static), which at this point only contains all tests copied from [`GeneralStateTests` in `ethereum/tests@7dc757ec132e372b6178a016b91f4c639f366c02`](https://github.com/ethereum/tests/tree/7dc757ec132e372b6178a016b91f4c639f366c02/src/GeneralStateTestsFiller).
-
-The tests have been filled using the new static test filler introduced in [#1336](https://github.com/ethereum/execution-spec-tests/pull/1336), and enhanced in [#1362](https://github.com/ethereum/execution-spec-tests/pull/1362) and [#1439](https://github.com/ethereum/execution-spec-tests/pull/1439).
-
-Users can expect that all tests currently living in [ethereum/tests](https://github.com/ethereum/tests/tree/develop/src) should eventually make its way into [`./tests/static`](https://github.com/ethereum/execution-spec-tests/tree/main/tests/static) and can rely that these tests, filled for new forks even, will be included in `fixtures_static.tar.gz`.
-
-#### `fixtures_benchmark`
-
-Another new fixture tarball has been included in this release: `fixtures_benchmark.tar.gz`.
-
-Includes tests that are tailored specifically to test the execution layer proof generators.
-
-### 🛠️ Framework
-
-#### `fill`
-
-- 🐞 Fix the reported fixture source URLs for the case of auto-generated tests ([#1488](https://github.com/ethereum/execution-spec-tests/pull/1488)).
-
-#### `consume`
-
-- 🐞 Fix the Hive commands used to reproduce test executions that are displayed in test descriptions in the Hive UI ([#1494](https://github.com/ethereum/execution-spec-tests/pull/1494)).
-- 🐞 Fix consume direct fails for geth blockchain tests ([#1502](https://github.com/ethereum/execution-spec-tests/pull/1502)).
-
-### 📋 Misc
-
-### 🧪 Test Cases
-
-- ✨ [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702): Test that DELEGATECALL to a 7702 target works as intended ([#1485](https://github.com/ethereum/execution-spec-tests/pull/1485)).
-- ✨ [EIP-2573](https://eips.ethereum.org/EIPS/eip-2537): Includes a BLS12 point generator, alongside additional coverage many of the precompiles ([#1350](https://github.com/ethereum/execution-spec-tests/pull/1350)), ([#1505](https://github.com/ethereum/execution-spec-tests/pull/1505)).
-- ✨ Add all [`GeneralStateTests` from `ethereum/tests`](https://github.com/ethereum/tests/tree/7dc757ec132e372b6178a016b91f4c639f366c02/src/GeneralStateTestsFiller) to `execution-spec-tests` located now at [tests/static/state_tests](https://github.com/ethereum/execution-spec-tests/tree/main/tests/static/state_tests) ([#1442](https://github.com/ethereum/execution-spec-tests/pull/1442)).
-- ✨ [EIP-2929](https://eips.ethereum.org/EIPS/eip-2929): Test that precompile addresses are cold/warm depending on the fork they are activated ([#1495](https://github.com/ethereum/execution-spec-tests/pull/1495)).
-
-## [v4.3.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v4.3.0) - 2025-04-18
-
-### 💥 Breaking Change
-
-#### Consume engine strict exception checking
-
-`consume engine` now checks exceptions returned by the execution clients in their Engine API responses, specifically in the `validationError`field of the `engine_newPayloadVX` method.
-
-While not strictly a breaking change since tests will continue to run normally, failures are expected if a client modifies their exception messages.
-
-This feature can be disabled by using `--disable-strict-exception-matching` for specific clients or forks.
-
-### 🛠️ Framework
-
-#### `fill`
-
-- ✨ The `static_filler` plug-in now has support for static state tests (from [GeneralStateTests](https://github.com/ethereum/tests/tree/develop/src/GeneralStateTestsFiller)) ([#1362](https://github.com/ethereum/execution-spec-tests/pull/1362)).
-- ✨ Introduce `pytest.mark.exception_test` to mark tests that contain an invalid transaction or block ([#1436](https://github.com/ethereum/execution-spec-tests/pull/1436)).
-- 🐞 Fix `DeprecationWarning: Pickle, copy, and deepcopy support will be removed from itertools in Python 3.14.` by avoiding use `itertools` object in the spec `BaseTest` pydantic model ([#1414](https://github.com/ethereum/execution-spec-tests/pull/1414)).
-- ✨ An optional configuration flag to override the maximum gas limit in the environment for filling or executing tests is now available. The `--block-gas-limit` flag overrides the default block gas limit during filling. The `--transaction-gas-limit` flag overrides the maximum for transactions during execution. ([#1470](https://github.com/ethereum/execution-spec-tests/pull/1470)).
-
-#### `consume`
-
-- 🐞 Fix fixture tarball downloading with regular, non-Github release URLS and with numerical versions in regular release specs, e.g., `stable@v4.2.0` ([#1437](https://github.com/ethereum/execution-spec-tests/pull/1437)).
-- ✨ `consume engine` now has strict exception mapping enabled by default ([#1416](https://github.com/ethereum/execution-spec-tests/pull/1416)).
-
-#### Tools
-
-- 🔀 `generate_system_contract_deploy_test` test generator has been updated to handle system contracts that are not allowed to be absent when the fork happens ([#1394](https://github.com/ethereum/execution-spec-tests/pull/1394)).
-- ✨ Add `generate_system_contract_error_test` to generate tests on system contracts that invalidate a block in case of error ([#1394](https://github.com/ethereum/execution-spec-tests/pull/1394)).
-
-#### Exceptions
-
-- ✨ `BlockException.SYSTEM_CONTRACT_EMPTY`: Raised when a required system contract was not found in the state by the time it was due to execution with a system transaction call ([#1394](https://github.com/ethereum/execution-spec-tests/pull/1394)).
-- ✨ `BlockException.SYSTEM_CONTRACT_CALL_FAILED`: Raised when a system contract call made by a system transaction fails ([#1394](https://github.com/ethereum/execution-spec-tests/pull/1394)).
-- ✨ `BlockException.INVALID_BLOCK_HASH`: Raised when the calculated block hash does not match the expectation (Currently only during Engine API calls) ([#1416](https://github.com/ethereum/execution-spec-tests/pull/1416)).
-- ✨ `BlockException.INVALID_VERSIONED_HASHES`: Raised when a discrepancy is found between versioned hashes in the payload and the ones found in the transactions ([#1416](https://github.com/ethereum/execution-spec-tests/pull/1416)).
-
-### 🧪 Test Cases
-
-- ✨ [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702): Test precompile case in same transaction as delegation without extra gas in case of precompile code execution; parametrize all call opcodes in existing precompile test ([#1431](https://github.com/ethereum/execution-spec-tests/pull/1431)).
-- ✨ [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702): Add invalid nonce authorizations tests for the case of multiple signers when the sender's nonce gets increased ([#1441](https://github.com/ethereum/execution-spec-tests/pull/1441)).
-- ✨ [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702): Add a test that verifies that set code transactions are correctly rejected before Prague activation ([#1463](https://github.com/ethereum/execution-spec-tests/pull/1463)).
-- ✨ [EIP-7623](https://eips.ethereum.org/EIPS/eip-7623): Additionally parametrize transaction validity tests with the `to` set to an EOA account (previously only contracts) ([#1422](https://github.com/ethereum/execution-spec-tests/pull/1422)).
-- ✨ [EIP-7251](https://eips.ethereum.org/EIPS/eip-7251): Add EIP-7251 test cases for modified consolidations contract that allows more consolidations ([#1465](https://github.com/ethereum/execution-spec-tests/pull/1465)).
-- ✨ [EIP-6110](https://eips.ethereum.org/EIPS/eip-6110): Add extra deposit request edge cases, sending eth to the deposit contract while sending a deposit request ([#1467](https://github.com/ethereum/execution-spec-tests/pull/1467)).
-- ✨ [EIP-6110](https://eips.ethereum.org/EIPS/eip-6110): Add cases for deposit log layout and other topics (ERC-20) transfer ([#1371](https://github.com/ethereum/execution-spec-tests/pull/1371)).
-- ✨ [EIP-7251](https://eips.ethereum.org/EIPS/eip-7251): Remove pytest skips for consolidation request cases ([#1449](https://github.com/ethereum/execution-spec-tests/pull/1449)).
-- ✨ [EIP-7002](https://eips.ethereum.org/EIPS/eip-7002), [EIP-7251](https://eips.ethereum.org/EIPS/eip-7251): Add cases to verify behavior of contracts missing at fork ([#1394](https://github.com/ethereum/execution-spec-tests/pull/1394)).
-- ✨ [EIP-7002](https://eips.ethereum.org/EIPS/eip-7002), [EIP-7251](https://eips.ethereum.org/EIPS/eip-7251): Add cases to verify behavior of system contract errors invalidating a block ([#1394](https://github.com/ethereum/execution-spec-tests/pull/1394)).
-- 🔀 Remove [EIP-7698](https://eips.ethereum.org/EIPS/eip-7698): EIP has been removed and the tests related to it have also been removed, while preserving a subset of the tests to verify that functionality is removed in clients ([#1451](https://github.com/ethereum/execution-spec-tests/pull/1451)).
-
-### 📋 Misc
-
-- 🐞 Configure `markdownlint` to expect an indent of 4 with unordered lists (otherwise HTML documentation is rendered incorrectly, [#1460](https://github.com/ethereum/execution-spec-tests/pull/1460)).
-- 🔀 Update `eels_resolutions.json` to point to temporary commit `bb0eb750d643ced0ebf5dec732cdd23558d0b7f2`, which is based on `forks/prague` branch, commit `d9a7ee24db359aacecd636349b4f3ac95a4a6e71`, with PRs <https://github.com/ethereum/execution-specs/pull/1182>, <https://github.com/ethereum/execution-specs/pull/1183> and <https://github.com/ethereum/execution-specs/pull/1191> merged ([#1394](https://github.com/ethereum/execution-spec-tests/pull/1394)).
-
-## [v4.2.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v4.2.0) - 2025-04-08
-
-**Note**: Although not a breaking change, `consume` users should delete the cache directory (typically located at `~/.cache/ethereum-execution-spec-tests`) used to store downloaded fixture release tarballs. This release adds support for [ethereum/tests](https://github.com/ethereum/tests) and [ethereum/legacytests](https://github.com/ethereum/legacytests) fixture release downloads and the structure of the cache directory has been updated to accommodate this change.
-
-To try this feature:
-
-```shell
-consume direct --input=https://github.com/ethereum/tests/releases/download/v17.0/fixtures_blockchain_tests.tgz
-```
-
-To determine the cache directory location, see the `--cache-folder` entry from the command:
-
-```shell
-consume cache --help
-```
-
-### 💥 Breaking Change
-
-### 🛠️ Framework
-
-#### `consume`
-
-- ✨ Add support for [ethereum/tests](https://github.com/ethereum/tests) and [ethereum/legacytests](https://github.com/ethereum/legacytests) release tarball download via URL to the `--input` flag of `consume` commands ([#1306](https://github.com/ethereum/execution-spec-tests/pull/1306)).
-- ✨ Add support for Nethermind's `nethtest` command to `consume direct` ([#1250](https://github.com/ethereum/execution-spec-tests/pull/1250)).
-- ✨ Allow filtering of test cases by fork via pytest marks (e.g., `-m "Cancun or Prague"`) ([#1304](https://github.com/ethereum/execution-spec-tests/pull/1304), [#1318](https://github.com/ethereum/execution-spec-tests/pull/1318)).
-- ✨ Allow filtering of test cases by fixture format via pytest marks (e.g., `-m blockchain_test`) ([#1314](https://github.com/ethereum/execution-spec-tests/pull/1314)).
-- ✨ Add top-level entries `forks` and `fixture_formats` to the index file that list all the forks and fixture formats used in the indexed fixtures ([#1318](https://github.com/ethereum/execution-spec-tests/pull/1318)).
-- ✨ Enable logging from `consume` commands ([#1361](https://github.com/ethereum/execution-spec-tests/pull/1361)).
-- ✨ Propagate stdout and stderr (including logs) captured during test execution to the Hive test result ([#1361](https://github.com/ethereum/execution-spec-tests/pull/1361)).
-- 🐞 Don't parametrize tests for unsupported fixture formats; improve `consume` test collection ([#1315](https://github.com/ethereum/execution-spec-tests/pull/1315)).
-- 🐞 Fix the the hive command printed in test reports to reproduce tests in isolation by prefixing the `--sim.limit` flag value with `id:` ([#1333](https://github.com/ethereum/execution-spec-tests/pull/1333)).
-- 🐞 Improve index generation of [ethereum/tests](https://github.com/ethereum/tests) fixtures: Allow generation at any directory level and include `generatedTestHash` in the index file for the `fixture_hash` ([#1303](https://github.com/ethereum/execution-spec-tests/pull/1303)).
-- 🐞 Fix loading of [ethereum/tests](https://github.com/ethereum/tests) and [ethereum/legacytests](https://github.com/ethereum/legacytests) fixtures for the case of mixed `0x0` and `0x1` transaction types in multi-index (`data`, `gas`, `value`) state test fixtures ([#1330](https://github.com/ethereum/execution-spec-tests/pull/1330)).
-- ✨ Add Osaka to the hive ruleset, includes a small ruleset refactor ([#1355](https://github.com/ethereum/execution-spec-tests/pull/1355)).
-
-#### `fill`
-
-- 🐞 Fix `--fork/from/until` for transition forks when using `fill` [#1311](https://github.com/ethereum/execution-spec-tests/pull/1311).
-- 🐞 Fix the node id for state tests marked by transition forks ([#1313](https://github.com/ethereum/execution-spec-tests/pull/1313)).
-- ✨ Add `static_filler` plug-in which allows to fill static YAML and JSON tests (from [ethereum/tests](https://github.com/ethereum/tests)) by adding flag `--fill-static-tests` to `uv run fill` ([#1336](https://github.com/ethereum/execution-spec-tests/pull/1336)).
-
-#### `execute`
-
-- 🔀 Test IDs have changed to include the name of the test spec where the test came from (e.g. `state_test`, `blockchain_test`, etc) ([#1367](https://github.com/ethereum/execution-spec-tests/pull/1367)).
-- ✨ Markers can now be used to execute only tests from a specific test spec type (e.g. `-m state_test`, `-m blockchain_test`, etc) ([#1367](https://github.com/ethereum/execution-spec-tests/pull/1367)).
-
-### 📋 Misc
-
-- 🔀 Bump the version of `execution-specs` used by the framework to the package [`ethereum-execution==1.17.0rc6.dev1`](https://pypi.org/project/ethereum-execution/1.17.0rc6.dev1/); bump the version used for test fixture generation for forks < Prague to current `execution-specs` master, [fa847a0](https://github.com/ethereum/execution-specs/commit/fa847a0e48309debee8edc510ceddb2fd5db2f2e) ([#1310](https://github.com/ethereum/execution-spec-tests/pull/1310)).
-- 🐞 Init `TransitionTool` in `GethTransitionTool` ([#1276](https://github.com/ethereum/execution-spec-tests/pull/1276)).
-- 🔀 Refactored RLP encoding of test objects to allow automatic generation of tests ([#1359](https://github.com/ethereum/execution-spec-tests/pull/1359)).
-- ✨ Document how to manage `execution-spec-tests` package dependencies ([#1388](https://github.com/ethereum/execution-spec-tests/pull/1388)).
-
-#### Packaging
-
-- 🐞 Fix `eest make test` when `ethereum-execution-spec-tests` is installed as a package ([#1342](https://github.com/ethereum/execution-spec-tests/pull/1342)).
-- 🔀 Pin `setuptools` and `wheel` in `[build-system]`, bump `trie>=3.1` and remove `setuptools` from package dependencies ([#1345](https://github.com/ethereum/execution-spec-tests/pull/1345), [#1351](https://github.com/ethereum/execution-spec-tests/pull/1351)).
-
-### 🧪 Test Cases
-
-- ✨ Add additional test coverage for EIP-152 Blake2 precompiles ([#1244](https://github.com/ethereum/execution-spec-tests/pull/1244)). Refactor to add variables for spec constants and common fixture code. ([#1395](https://github.com/ethereum/execution-spec-tests/pull/1395)), ([#1405](https://github.com/ethereum/execution-spec-tests/pull/1405)).
-- ✨ Add EIP-7702 incorrect-rlp-encoding tests ([#1347](https://github.com/ethereum/execution-spec-tests/pull/1347)).
-- ✨ Add EIP-2935 tests for all call opcodes ([#1379](https://github.com/ethereum/execution-spec-tests/pull/1379)).
-- ✨ Add more tests for EIP-7702: max-fee-per-gas verification, delegation-designation as initcode tests ([#1372](https://github.com/ethereum/execution-spec-tests/pull/1372)).
-- ✨ Add converted Identity precompile tests ([#1344](https://github.com/ethereum/execution-spec-tests/pull/1344)).
-
-## [v4.1.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v4.1.0) - 2025-03-11
-
-### 💥 Breaking Changes
-
-The following changes may be potentially breaking (all clients were tested with these changes with the state test format, but not the blockchain test format):
-
-- 💥 Add a `yParity` field (that duplicates `v`) to transaction authorization tuples in fixture formats to have fields that conform to EIP-7702 spec, resolves [erigontech/erigon#14073](https://github.com/erigontech/erigon/issues/14073) ([#1286](https://github.com/ethereum/execution-spec-tests/pull/1286)).
-- 💥 Rename the recently introduced `_info` field `fixture_format` to `fixture-format` for consistency [#1295](https://github.com/ethereum/execution-spec-tests/pull/1295).
-
-### 🛠️ Framework
-
-- 🔀 Make `BaseFixture` able to parse any fixture format such as `BlockchainFixture` ([#1210](https://github.com/ethereum/execution-spec-tests/pull/1210)).
-- ✨ Blockchain and Blockchain-Engine tests now have a marker to specify that they were generated from a state test, which can be used with `-m blockchain_test_from_state_test` and `-m blockchain_test_engine_from_state_test` respectively ([#1220](https://github.com/ethereum/execution-spec-tests/pull/1220)).
-- ✨ Blockchain and Blockchain-Engine tests that were generated from a state test now have `blockchain_test_from_state_test` or `blockchain_test_engine_from_state_test` as part of their test IDs ([#1220](https://github.com/ethereum/execution-spec-tests/pull/1220)).
-- 🔀 Refactor `ethereum_test_fixtures` and `ethereum_clis` to create `FixtureConsumer` and `FixtureConsumerTool` classes which abstract away the consumption process used by `consume direct` ([#935](https://github.com/ethereum/execution-spec-tests/pull/935)).
-- ✨ Allow `consume direct --collect-only` without specifying a fixture consumer binary on the command-line ([#1237](https://github.com/ethereum/execution-spec-tests/pull/1237)).
-- ✨ Allow `fill --collect-only` without the need for existence of the folder `./fixtures`.
-- ✨ Report the (resolved) fixture tarball URL and local fixture cache directory when `consume`'s `--input` flag is a release spec or URL ([#1239](https://github.com/ethereum/execution-spec-tests/pull/1239)).
-- ✨ EOF Container validation tests (`eof_test`) now generate container deployment state tests, by wrapping the EOF container in an init-container and sending a deploy transaction ([#783](https://github.com/ethereum/execution-spec-tests/pull/783), [#1233](https://github.com/ethereum/execution-spec-tests/pull/1233)).
-- ✨ Use regexes for Hive's `--sim.limit` argument and don't use xdist if `--sim.parallelism==1` in the `eest/consume-rlp` and `eest/consume-rlp` simulators ([#1220](https://github.com/ethereum/execution-spec-tests/pull/1220)).
-- 🐞 Register generated test markers, e.g., `blockchain_test_from_state_test`, to prevent test session warnings ([#1238](https://github.com/ethereum/execution-spec-tests/pull/1238), [#1245](https://github.com/ethereum/execution-spec-tests/pull/1245)).
-- 🐞 Zero-pad `Environment` fields passed to `t8n` tools as required by `evmone-t8n` ([#1268](https://github.com/ethereum/execution-spec-tests/pull/1268)).
-
-### 📋 Misc
-
-- ✨ Add a guide to the docs for porting tests from `ethereum/tests` to EEST ([#1165](https://github.com/ethereum/execution-spec-tests/pull/1165)).
-- ✨ Improve the `uv run eest make test` interactive CLI to enable creation of new test modules within existing test sub-folders ([#1241](https://github.com/ethereum/execution-spec-tests/pull/1241)).
-- ✨ Update `mypy` to latest release `>=1.15.0,<1.16` ([#1209](https://github.com/ethereum/execution-spec-tests/pull/1209)).
-- 🐞 Bug fix for filling with EELS for certain Python versions due to an issue with CPython ([#1231](https://github.com/ethereum/execution-spec-tests/pull/1231)).
-- 🐞 Fix HTML site deployment due to the site's index file exceeding Github's max file size limit ([#1292](https://github.com/ethereum/execution-spec-tests/pull/1292)).
-- ✨ Update the build fixtures workflow to use multiple self-hosted runners, remove `pectra-devnet-6` feature build ([#1296](https://github.com/ethereum/execution-spec-tests/pull/1296)).
-
-### 🧪 Test Cases
-
-- ✨ Add gas cost of delegation access in CALL opcode ([#1208](https://github.com/ethereum/execution-spec-tests/pull/1208)).
-- ✨ Add EIP-7698 failed nonce and short data tests ([#1211](https://github.com/ethereum/execution-spec-tests/pull/1211)).
-- ✨ Add EIP-2537 additional pairing precompile tests cases, and then update all BLS12 test vectors ([#1275](https://github.com/ethereum/execution-spec-tests/pull/1275), [#1289](https://github.com/ethereum/execution-spec-tests/pull/1289)).
-- ✨ Add EIP-7685 and EIP-7002 test cases for additional request type combinations and modified withdrawal contract that allows more withdrawals ([#1340](https://github.com/ethereum/execution-spec-tests/pull/1340)).
-- ✨ Add test cases for EIP-152 Blake2 and Identity precompiles ([#1244](https://github.com/ethereum/execution-spec-tests/pull/1244)).
-
-## [v4.0.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v4.0.0) - 2025-02-14 - 💕
-
-### 📁 Fixture Releases
-
-- 🔀 Initially we moved old fork configured tests within stable and develop fixture releases to a separate legacy release ([#788](https://github.com/ethereum/execution-spec-tests/pull/788)).
-- 🔀 This was later reverted after some client teams preferred to keep them in all in the same releases ([#1053](https://github.com/ethereum/execution-spec-tests/pull/1053)).
-
-### 💥 Breaking Change
-
-- ✨ Use uv for package management replacing pip ([#777](https://github.com/ethereum/execution-spec-tests/pull/777)).
-- ✨ Ruff now replaces Flake8, Isort and Black resulting in significant changes to the entire code base including its usage ([#922](https://github.com/ethereum/execution-spec-tests/pull/922)).
-- 🔀 Fill test fixtures using EELS by default. EEST now uses the [`ethereum-specs-evm-resolver`](https://github.com/petertdavies/ethereum-spec-evm-resolver) with the EELS daemon ([#792](https://github.com/ethereum/execution-spec-tests/pull/792)).
-- 🔀 The EOF fixture format contained in `eof_tests` may now contain multiple exceptions in the `"exception"` field in the form of a pipe (`|`) separated string ([#759](https://github.com/ethereum/execution-spec-tests/pull/759)).
-- 🔀 `state_test`, `blockchain_test` and `blockchain_test_engine` fixtures now contain a `config` field, which contains an object that contains a `blobSchedule` field. On the `blockchain_test` and `blockchain_test_engine` fixtures, the object also contains a duplicate of the `network` root field. The root's `network` field will be eventually deprecated ([#1040](https://github.com/ethereum/execution-spec-tests/pull/1040)).
-- 🔀 `latest-stable-release` and `latest-develop-release` keywords for the `--input` flag in consume commands have been replaced with `stable@latest` and `develop@latest` respectively ([#1044](https://github.com/ethereum/execution-spec-tests/pull/1044)).
-
-### 🛠️ Framework
-
-- ✨ Execute command added to run existing tests in live networks ([#](https://github.com/ethereum/execution-spec-tests/pull/1157)).
-- 🐞 Fixed consume hive commands from spawning different hive test suites during the same test execution when using xdist ([#712](https://github.com/ethereum/execution-spec-tests/pull/712)).
-- ✨ `consume hive` command is now available to run all types of hive tests ([#712](https://github.com/ethereum/execution-spec-tests/pull/712)).
-- ✨ Generated fixtures now contain the test index `index.json` by default ([#716](https://github.com/ethereum/execution-spec-tests/pull/716)).
-- ✨ A metadata folder `.meta/` now stores all fixture metadata files by default ([#721](https://github.com/ethereum/execution-spec-tests/pull/721)).
-- 🐞 Fixed `fill` command index generation issue due to concurrency ([#725](https://github.com/ethereum/execution-spec-tests/pull/725)).
-- ✨ Added `with_all_evm_code_types`, `with_all_call_opcodes` and `with_all_create_opcodes` markers, which allow automatic parametrization of tests to EOF ([#610](https://github.com/ethereum/execution-spec-tests/pull/610), [#739](https://github.com/ethereum/execution-spec-tests/pull/739)).
-- ✨ Added `with_all_system_contracts` marker, which helps parametrize tests with all contracts that affect the chain on a system level ([#739](https://github.com/ethereum/execution-spec-tests/pull/739)).
-- ✨ Code generators `Conditional` and `Switch` now support EOF by adding parameter `evm_code_type` ([#610](https://github.com/ethereum/execution-spec-tests/pull/610)).
-- ✨ `fill` command now supports parameter `--evm-code-type` that can be (currently) set to `legacy` or `eof_v1` to force all test smart contracts to deployed in normal or in EOF containers ([#610](https://github.com/ethereum/execution-spec-tests/pull/610)).
-- 🐞 Fixed fixture index generation on EOF tests ([#728](https://github.com/ethereum/execution-spec-tests/pull/728)).
-- 🐞 Fixes consume genesis mismatch exception for hive based simulators ([#734](https://github.com/ethereum/execution-spec-tests/pull/734)).
-- ✨ Adds reproducible consume commands to hiveview ([#717](https://github.com/ethereum/execution-spec-tests/pull/717)).
-- 💥 Added multiple exceptions to the EOF fixture format ([#759](https://github.com/ethereum/execution-spec-tests/pull/759)).
-- ✨ Added optional parameter to all `with_all_*` markers to specify a lambda function that filters the parametrized values ([#739](https://github.com/ethereum/execution-spec-tests/pull/739)).
-- ✨ Added [`extend_with_defaults` utility function](https://eest.ethereum.org/main/writing_tests/writing_a_new_test/#ethereum_test_tools.utility.pytest.extend_with_defaults), which helps extend test case parameter sets with default values. `@pytest.mark.parametrize` ([#739](https://github.com/ethereum/execution-spec-tests/pull/739)).
-- ✨ Added `Container.Init` to `ethereum_test_types.EOF.V1` package, which allows generation of an EOF init container more easily ([#739](https://github.com/ethereum/execution-spec-tests/pull/739)).
-- ✨ Introduce method valid_opcodes() to the fork class ([#748](https://github.com/ethereum/execution-spec-tests/pull/748)).
-- 🐞 Fixed `consume` exit code return values, ensuring that pytest's return value is correctly propagated to the shell. This allows the shell to accurately reflect the test results (e.g., failures) based on the pytest exit code ([#765](https://github.com/ethereum/execution-spec-tests/pull/765)).
-- ✨ Added a new flag `--solc-version` to the `fill` command, which allows the user to specify the version of the Solidity compiler to use when compiling Yul source code; this version will now be automatically downloaded by `fill` via [`solc-select`](https://github.com/crytic/solc-select) ([#772](https://github.com/ethereum/execution-spec-tests/pull/772)).
-- 🐞 Fix usage of multiple `@pytest.mark.with_all*` markers which shared parameters, such as `with_all_call_opcodes` and `with_all_create_opcodes` which shared `evm_code_type`, and now only parametrize compatible values ([#762](https://github.com/ethereum/execution-spec-tests/pull/762)).
-- ✨ Added `selector` and `marks` fields to all `@pytest.mark.with_all*` markers, which allows passing lambda functions to select or mark specific parametrized values (see [documentation](https://eest.ethereum.org/main/writing_tests/test_markers/#covariant-marker-keyword-arguments) for more information) ([#762](https://github.com/ethereum/execution-spec-tests/pull/762)).
-- ✨ Improves consume input flags for develop and stable fixture releases, fixes `--help` flag for consume ([#745](https://github.com/ethereum/execution-spec-tests/pull/745)).
-- 🔀 Return exit-code from `consume` commands ([#766](https://github.com/ethereum/execution-spec-tests/pull/766)).
-- 🔀 Remove duplicate EOF container tests, automatically check for duplicates ([#800](https://github.com/ethereum/execution-spec-tests/pull/800)).
-- 🔀 Fix DATALOAD `pushed_stack_items` calculation ([#784](https://github.com/ethereum/execution-spec-tests/pull/784)).
-- ✨ Add `evm_bytes` rename and print asm ([#844](https://github.com/ethereum/execution-spec-tests/pull/844)).
-- 🔀 Use the `session_temp_folder` introduced in #824 ([#845](https://github.com/ethereum/execution-spec-tests/pull/845)).
-- 🐞 Don't treat eels resolutions as a fixture ([#878](https://github.com/ethereum/execution-spec-tests/pull/878)).
-- ✨ Emphasize that no tests were executed during a fill pytest session ([#887](https://github.com/ethereum/execution-spec-tests/pull/887)).
-- 🔀 Move generic code from TransitionTool to a new generic base class EthereumCLI ([#894](https://github.com/ethereum/execution-spec-tests/pull/894)).
-- 🐞 Fix erroneous fork mes- 🔀 Fix max stack height calculation ([#810](https://github.com/ethereum/execution-spec-tests/pull/810)).
-- ✨ Add storage key hint in Storage class ([#917](https://github.com/ethereum/execution-spec-tests/pull/917)).
-- ✨ Add system to verify exception strings ([#795](https://github.com/ethereum/execution-spec-tests/pull/795)).
-- 🔀 Fix `FixedBytes` assignment rules ([#1010](https://github.com/ethereum/execution-spec-tests/pull/1010)).
-- 🔀 Fix `Address` padding options ([#1113](https://github.com/ethereum/execution-spec-tests/pull/1113)).
-- 🔀 Add `Container.expected_bytecode` optional parameter ([#737](https://github.com/ethereum/execution-spec-tests/pull/737)).
-- ✨ Add support for `initcode_prefix` on EOF `Container.Init` ([#819](https://github.com/ethereum/execution-spec-tests/pull/819)).sage in pytest session header with development forks ([#806](https://github.com/ethereum/execution-spec-tests/pull/806)).
-- 🐞 Fix `Conditional` code generator in EOF mode ([#821](https://github.com/ethereum/execution-spec-tests/pull/821)).
-- 🔀 Ensure that `Block` objects keep track of their `fork`, for example, when the block's `rlp_modifier` is not `None` ([#854](https://github.com/ethereum/execution-spec-tests/pull/854)).
-- 🔀 `ethereum_test_rpc` library has been created with what was previously `ethereum_test_tools.rpc` ([#822](https://github.com/ethereum/execution-spec-tests/pull/822)).
-- ✨ Add `Wei` type to `ethereum_test_base_types` which allows parsing wei amounts from strings like "1 ether", "1000 wei", "10**2 gwei", etc ([#825](https://github.com/ethereum/execution-spec-tests/pull/825)).
-- ✨ Pin EELS versions in `eels_resolutions.json` and include this file in fixture releases ([#872](https://github.com/ethereum/execution-spec-tests/pull/872)).
-- 🔀 Replace `ethereum.base_types` with `ethereum-types` ([#850](https://github.com/ethereum/execution-spec-tests/pull/850)).
-- 💥 Rename the `PragueEIP7692` fork to `Osaka` ([#869](https://github.com/ethereum/execution-spec-tests/pull/869)).
-- ✨ Improve `fill` terminal output to emphasize that filling tests is not actually testing a client ([#807](https://github.com/ethereum/execution-spec-tests/pull/887)).
-- ✨ Add the `BlockchainTestEngine` test spec type that only generates a fixture in the `EngineFixture` (`blockchain_test_engine`) format ([#888](https://github.com/ethereum/execution-spec-tests/pull/888)).
-- 🔀 Move the `evm_transition_tool` package to `ethereum_clis` and derive the transition tool CL interfaces from a shared `EthereumCLI` class that can be reused for other sub-commands ([#894](https://github.com/ethereum/execution-spec-tests/pull/894)).
-- ✨ Pass `state_test` property to T8N tools that support it (Only EELS at the time of merge) ([#943](https://github.com/ethereum/execution-spec-tests/pull/943)).
-- ✨ Add the `eofwrap` cli used to wrap tests from `ethereum/tests` in an EOF container ([#896](https://github.com/ethereum/execution-spec-tests/pull/896)).
-- 🔀 Improve gentest architecture with `EthereumTestBaseModel` and `EthereumTestRootModel` ([#901](https://github.com/ethereum/execution-spec-tests/pull/901)).
-- 🔀 Migrate transaction test to `state_test` for `gentest` ([#903](https://github.com/ethereum/execution-spec-tests/pull/903)).
-- 🔀 `ethereum_test_forks` forks now contain gas-calculating functions, which return the appropriate function to calculate the gas used by a transaction or memory function for the given fork ([#779](https://github.com/ethereum/execution-spec-tests/pull/779)).
-- 🐞 Fix `Bytecode` class `__eq__` method ([#939](https://github.com/ethereum/execution-spec-tests/pull/939)).
-- 🔀 Update `pydantic` from 2.8.2 to 2.9.2 ([#960](https://github.com/ethereum/execution-spec-tests/pull/960)).
-- ✨ Add the `eest make test` command, an interactive CLI that helps users create a new test module and function ([#950](https://github.com/ethereum/execution-spec-tests/pull/950)).
-- ✨ Add the `eest clean` command that helps delete generated files and directories from the repository ([#980](https://github.com/ethereum/execution-spec-tests/pull/980)).
-- ✨ Add framework changes for EIP-7742, required for Prague devnet-5 ([#931](https://github.com/ethereum/execution-spec-tests/pull/931)).
-- ✨ Add the `eest make env` command that generates a default env file (`env.yaml`)([#996](https://github.com/ethereum/execution-spec-tests/pull/996)).
-- ✨ Generate Transaction Test type ([#933](https://github.com/ethereum/execution-spec-tests/pull/933)).
-- ✨ Add a default location for evm logs (`--evm-dump-dir`) when filling tests ([#999](https://github.com/ethereum/execution-spec-tests/pull/999)).
-- ✨ Slow tests now have greater timeout when making a request to the T8N server ([#1037](https://github.com/ethereum/execution-spec-tests/pull/1037)).
-- ✨ Introduce [`pytest.mark.parametrize_by_fork`](https://eest.ethereum.org/main/writing_tests/test_markers/#pytestmarkfork_parametrize) helper marker ([#1019](https://github.com/ethereum/execution-spec-tests/pull/1019), [#1057](https://github.com/ethereum/execution-spec-tests/pull/1057)).
-- 🐞 fix(consume): allow absolute paths with `--evm-bin` ([#1052](https://github.com/ethereum/execution-spec-tests/pull/1052)).
-- ✨ Disable EIP-7742 framework changes for Prague ([#1023](https://github.com/ethereum/execution-spec-tests/pull/1023)).
-- ✨ Allow verification of the transaction receipt on executed test transactions ([#1068](https://github.com/ethereum/execution-spec-tests/pull/1068)).
-- ✨ Modify `valid_at_transition_to` marker to add keyword arguments `subsequent_transitions` and `until` to fill a test using multiple transition forks ([#1081](https://github.com/ethereum/execution-spec-tests/pull/1081)).
-- 🐞 fix(consume): use `"HIVE_CHECK_LIVE_PORT"` to signal hive to wait for port 8551 (Engine API port) instead of the 8545 port when running `consume engine` ([#1095](https://github.com/ethereum/execution-spec-tests/pull/1095)).
-- ✨ `state_test`, `blockchain_test` and `blockchain_test_engine` fixtures now contain the `blobSchedule` from [EIP-7840](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-7840.md), only for tests filled for Cancun and Prague forks ([#1040](https://github.com/ethereum/execution-spec-tests/pull/1040)).
-- 🔀 Change `--dist` flag to the default value, `load`, for better parallelism handling during test filling ([#1118](https://github.com/ethereum/execution-spec-tests/pull/1118)).
-- 🔀 Refactor framework code to use the [`ethereum-rlp`](https://pypi.org/project/ethereum-rlp/) package instead of `ethereum.rlp`, previously available in ethereum/execution-specs ([#1180](https://github.com/ethereum/execution-spec-tests/pull/1180)).
-- 🔀 Update EELS / execution-specs EEST dependency to [99238233](https://github.com/ethereum/execution-specs/commit/9923823367b5586228e590537d47aa9cc4c6a206) for EEST framework libraries and test case generation ([#1181](https://github.com/ethereum/execution-spec-tests/pull/1181)).
-- ✨ Add the `consume cache` command to cache fixtures before running consume commands ([#1044](https://github.com/ethereum/execution-spec-tests/pull/1044)).
-- ✨ The `--input` flag of the consume commands now supports parsing of tagged release names in the format `<RELEASE_NAME>@<RELEASE_VERSION>` ([#1044](https://github.com/ethereum/execution-spec-tests/pull/1044)).
-- 🐞 Fix stdout output when using the `fill` command ([#1188](https://github.com/ethereum/execution-spec-tests/pull/1188)).
-- ✨ Add tests for blockchain intermediate state verification ([#1075](https://github.com/ethereum/execution-spec-tests/pull/1075)).
-- ✨ Add Interactive CLI input functionality ([#947](https://github.com/ethereum/execution-spec-tests/pull/947)).
-- 🔀 Rename `EOFTest.data` to `EOFTest.container` with rebase of `EOFStateTest` ([#1145](https://github.com/ethereum/execution-spec-tests/pull/1145)).
-- ✨ Turn on `--traces` for EELS + `ethereum-specs-evm-resolver` ([#1174](https://github.com/ethereum/execution-spec-tests/pull/1174)).
-
-### 📋 Misc
-
-- ✨ Feature releases can now include multiple types of fixture tarball files from different releases that start with the same prefix ([#736](https://github.com/ethereum/execution-spec-tests/pull/736)).
-- ✨ Releases for feature eip7692 now include both Cancun and Prague based tests in the same release, in files `fixtures_eip7692.tar.gz` and `fixtures_eip7692-prague.tar.gz` respectively ([#743](https://github.com/ethereum/execution-spec-tests/pull/743)).
-✨ Re-write the test case reference doc flow as a pytest plugin and add pages for test functions with a table providing an overview of their parametrized test cases ([#801](https://github.com/ethereum/execution-spec-tests/pull/801), [#842](https://github.com/ethereum/execution-spec-tests/pull/842)).
-- 🔀 Simplify Python project configuration and consolidate it into `pyproject.toml` ([#764](https://github.com/ethereum/execution-spec-tests/pull/764)).
-- ✨ Add dev docs to help using nectos/act ([#776](https://github.com/ethereum/execution-spec-tests/pull/776)).
-- 🔀 Update `uv.lock` for updated solc deps ([#782](https://github.com/ethereum/execution-spec-tests/pull/782)).
-- ✨ Enable coverage on any test change ([#790](https://github.com/ethereum/execution-spec-tests/pull/790)).
-- 🔀 Created `pytest_plugins.concurrency` plugin to sync multiple `xdist` processes without using a command flag to specify the temporary working folder ([#824](https://github.com/ethereum/execution-spec-tests/pull/824)).
-- 🔀 Move pytest plugin `pytest_plugins.filler.solc` to `pytest_plugins.solc.solc` ([#823](https://github.com/ethereum/execution-spec-tests/pull/823)).
-- 🔀 Remove `formats.py`, embed properties as class vars ([#826](https://github.com/ethereum/execution-spec-tests/pull/826)).
-- ✨ Add `build-evm-base` to docs deploy workflows ([#829](https://github.com/ethereum/execution-spec-tests/pull/829)).
-- 🔀 Add links to the online test case docs in the EOF tracker ([#838](https://github.com/ethereum/execution-spec-tests/pull/838)).
-- 🔀 Fix miscellaneous improvements to troubleshooting, navigation, styling ([#840](https://github.com/ethereum/execution-spec-tests/pull/840)).
-- ✨ Include all parameters in test parameter datatables ([#842](https://github.com/ethereum/execution-spec-tests/pull/842)).
-- ✨ Add info about ripemd160 & update running actions locally ([#847](https://github.com/ethereum/execution-spec-tests/pull/847)).
-- ✨ Add `SECURITY.md` describing how to report vulnerabilities ([#848](https://github.com/ethereum/execution-spec-tests/pull/848)).
-- 🔀 Change image from ubuntu-24.04 to ubuntu-latest in CI ([#855](https://github.com/ethereum/execution-spec-tests/pull/855)).
-- 🐞 Asserts that the deploy docs tags workflow is only triggered for full releases ([#857](https://github.com/ethereum/execution-spec-tests/pull/857)).
-- 🐞 Fix deploy docs tags workflow trigger ([#858](https://github.com/ethereum/execution-spec-tests/pull/858)).
-- ✨ A new application-wide configuration manager provides access to environment and application configurations. ([#892](https://github.com/ethereum/execution-spec-tests/pull/892)).
-- 🔀 Update the developer docs navigation ([#898](https://github.com/ethereum/execution-spec-tests/pull/898)).
-- 🔀 Use jinja2 templating in `gentest` ([#900](https://github.com/ethereum/execution-spec-tests/pull/900)).
-- ✨ Fix/add test github actions locally page ([#909](https://github.com/ethereum/execution-spec-tests/pull/909)).
-- 🐞 Fix print fill output in coverage workflow on errors ([#919](https://github.com/ethereum/execution-spec-tests/pull/919)).
-- 🐞 Use a local version of ethereum/execution-specs (EELS) when running the framework tests in CI ([#997](https://github.com/ethereum/execution-spec-tests/pull/997)).
-- ✨ Use self-hosted runners for fixture building in CI ([#1051](https://github.com/ethereum/execution-spec-tests/pull/1051)).
-- ✨ Release tarballs now contain fixtures filled for all forks, not only the fork under active development and the fork currently deployed on mainnet ([#1053](https://github.com/ethereum/execution-spec-tests/pull/1053)).
-- ✨ `StateTest` fixture format now contains `state` field in each network post result, containing the decoded post allocation that results from the transaction execution ([#1064](https://github.com/ethereum/execution-spec-tests/pull/1064)).
-- ✨ Include EELS fork resolution information in filled json test fixtures ([#1123](https://github.com/ethereum/execution-spec-tests/pull/1123)).
-- 🔀 Updates ruff from version 0.8.2 to 0.9.4 ([#1168](https://github.com/ethereum/execution-spec-tests/pull/1168)).
-- 🔀 Update `uv.lock` to be compatible with `uv>=0.5.22` ([#1178](https://github.com/ethereum/execution-spec-tests/pull/1178)).
-- 🔀 Update `mypy` from version `0.991` to `1.15` ([#1209](https://github.com/ethereum/execution-spec-tests/pull/1209)).
-
-### 🧪 Test Cases
-
-- ✨ Migrate validation tests `EIP3540/validInvalidFiller.yml` ([#598](https://github.com/ethereum/execution-spec-tests/pull/598)).
-- ✨ EIP-4844 test `tests/cancun/eip4844_blobs/test_point_evaluation_precompile.py` includes an EOF test case ([#610](https://github.com/ethereum/execution-spec-tests/pull/610)).
-- ✨ Example test `tests/frontier/opcodes/test_dup.py` now includes EOF parametrization ([#610](https://github.com/ethereum/execution-spec-tests/pull/610)).
-- ✨ Add EOFv1 function test - Call simple contract test ([#695](https://github.com/ethereum/execution-spec-tests/pull/695)).
-- ✨ Add section size validation tests ([#705](https://github.com/ethereum/execution-spec-tests/pull/705)).
-- ✨ Add deep and wide EOF subcontainers tests ([#718](https://github.com/ethereum/execution-spec-tests/pull/718)).
-- ✨ Update [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702) tests for Devnet-3 ([#733](https://github.com/ethereum/execution-spec-tests/pull/733)).
-- ✨ Migrate "valid" EOFCREATE validation ([#738](https://github.com/ethereum/execution-spec-tests/pull/738)).
-- ✨ Migrate tests for truncated sections ([#740](https://github.com/ethereum/execution-spec-tests/pull/740)).
-- ✨ Add out of order container section test ([#741](https://github.com/ethereum/execution-spec-tests/pull/741)).
-- ✨ Convert all opcodes validation test `tests/frontier/opcodes/test_all_opcodes.py` ([#748](https://github.com/ethereum/execution-spec-tests/pull/748)).
-- 🔀 Add Test types with 128 inputs ([#749](https://github.com/ethereum/execution-spec-tests/pull/749)).
-- 🔀 Use new marker to EOF-ize MCOPY test ([#754](https://github.com/ethereum/execution-spec-tests/pull/754)).
-- ✨ Add EOF Tests from Fuzzing ([#756](https://github.com/ethereum/execution-spec-tests/pull/756)).
-- ✨ Add embedded container tests ([#763](https://github.com/ethereum/execution-spec-tests/pull/763)).
-- ✨ Validate EOF only opcodes are invalid in legacy ([#768](https://github.com/ethereum/execution-spec-tests/pull/768)).
-- ✨ Update EOF tracker, add unimplemented tests ([#773](https://github.com/ethereum/execution-spec-tests/pull/773)).
-- ✨ Add EIP-7620 EOFCREATE gas tests ([#785](https://github.com/ethereum/execution-spec-tests/pull/785)).
-- ✨ Add more fuzzing discovered EOF tests ([#789](https://github.com/ethereum/execution-spec-tests/pull/789)).
-- ✨ Add EOF tests for invalid non-returning sections ([#794](https://github.com/ethereum/execution-spec-tests/pull/794)).
-- ✨ Test to ensure transient storage is cleared after transactions ([#798](https://github.com/ethereum/execution-spec-tests/pull/798)).
-- ✨ Test that transient storage stays at correct address ([#799](https://github.com/ethereum/execution-spec-tests/pull/799)).
-- ✨ Add EOFCREATE referencing the same subcontainer twice test ([#809](https://github.com/ethereum/execution-spec-tests/pull/809)).
-- ✨ Add dangling data in subcontainer test ([#812](https://github.com/ethereum/execution-spec-tests/pull/812)).
-- 🐞 Fix [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702)+EOF tests due to incorrect test expectations and faulty `Conditional` test generator in EOF mode ([#821](https://github.com/ethereum/execution-spec-tests/pull/821)).
-- 🐞 Fix TSTORE EOF variant test ([#831](https://github.com/ethereum/execution-spec-tests/pull/831)).
-- 🔀 Unify EOF return code constants ([#834](https://github.com/ethereum/execution-spec-tests/pull/834)).
-- ✨ Add RJUMP* vs CALLF tests ([#833](https://github.com/ethereum/execution-spec-tests/pull/833)).
-- ✨ Add tests to clarify "non-returning instruction" ([#837](https://github.com/ethereum/execution-spec-tests/pull/837)).
-- ✨ Add double RJUMPI stack validation tests ([#851](https://github.com/ethereum/execution-spec-tests/pull/851)).
-- ✨ Add unreachable code sections tests ([#856](https://github.com/ethereum/execution-spec-tests/pull/856)).
-- 💥 `PragueEIP7692` fork in tests has been updated to `Osaka` ([#869](https://github.com/ethereum/execution-spec-tests/pull/869)).
-- ✨ Update [EIP-6110](https://eips.ethereum.org/EIPS/eip-6110), [EIP-7002](https://eips.ethereum.org/EIPS/eip-7002), [EIP-7251](https://eips.ethereum.org/EIPS/eip-7251), [EIP-7685](https://eips.ethereum.org/EIPS/eip-7685), and [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702) tests for Devnet-4 ([#832](https://github.com/ethereum/execution-spec-tests/pull/832)).
-- ✨ Add EIP-7069 and EIP-7620 failures and context vars tests ([#836](https://github.com/ethereum/execution-spec-tests/pull/836)).
-- ✨ Add EOF EIP-4750 Stack validation in CALLF test ([#889](https://github.com/ethereum/execution-spec-tests/pull/889)).
-- ✨ Add stack overflow by rule check to JUMPF tests ([#902](https://github.com/ethereum/execution-spec-tests/pull/902)).
-- 🐞 Fix erroneous test with`CALLF` rule bug ([#907](https://github.com/ethereum/execution-spec-tests/pull/907)).
-- ✨ Add test for EXTDELEGATECALL value cost ([#911](https://github.com/ethereum/execution-spec-tests/pull/911)).
-- ✨ Add basic EOF execution tests ([#912](https://github.com/ethereum/execution-spec-tests/pull/912)).
-- ✨ Add parametrized CALLF execution tests ([#913](https://github.com/ethereum/execution-spec-tests/pull/913)).
-- ✨ Add CALLF execution tests ([#914](https://github.com/ethereum/execution-spec-tests/pull/914)).
-- ✨ Add fibonacci and factorial CALLF tests ([#915](https://github.com/ethereum/execution-spec-tests/pull/915)).
-- ✨ Add RJUMP* execution tests ([#916](https://github.com/ethereum/execution-spec-tests/pull/916)).
-- ✨ [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702) many delegations test ([#923](https://github.com/ethereum/execution-spec-tests/pull/923)).
-- ✨ Add opcode validation tests ([#932](https://github.com/ethereum/execution-spec-tests/pull/932)).
-- ✨ Add RJUMPI with JUMPF tests ([#928](https://github.com/ethereum/execution-spec-tests/pull/928)).
-- ✨ [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702) set code of non-empty-storage account test ([#948](https://github.com/ethereum/execution-spec-tests/pull/948)).
-- ✨ Add PUSH* opcode tests ([#975](https://github.com/ethereum/execution-spec-tests/pull/975)).
-- ✨ [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702) implement 7702 test ideas ([#981](https://github.com/ethereum/execution-spec-tests/pull/981)).
-- ✨ [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702) Remove delegation behavior of EXTCODE* ([#984](https://github.com/ethereum/execution-spec-tests/pull/984)).
-- ✨ Add EIP-7620 RETURNCONTRACT behavior verification test ([#1109](https://github.com/ethereum/execution-spec-tests/pull/1109)).
-- ✨ Add EIP-7069 p256verify EOF calls tests ([#1021](https://github.com/ethereum/execution-spec-tests/pull/1021)).
-- ✨ Add EIP-7480 DATACOPY edge cases tests ([#1020](https://github.com/ethereum/execution-spec-tests/pull/1020)).
-- ✨ Add EIP-7069 EXTCALL creation gas charge tests ([#1025](https://github.com/ethereum/execution-spec-tests/pull/1025)).
-- ✨ Add generic precompile-absence test ([#1036](https://github.com/ethereum/execution-spec-tests/pull/1036)).
-- ✨ Add test for [EIP-2537](https://eips.ethereum.org/EIPS/eip-2537) which uses the full discount table of G2 MSM ([#1038](https://github.com/ethereum/execution-spec-tests/pull/1038)).
-- ✨ [EIP-7691](https://eips.ethereum.org/EIPS/eip-7691) Blob throughput increase tests by parametrization of existing EIP-4844 tests ([#1023](https://github.com/ethereum/execution-spec-tests/pull/1023), [#1082](https://github.com/ethereum/execution-spec-tests/pull/1082)).
-- ✨ Port [calldatacopy test](https://github.com/ethereum/tests/blob/ae4791077e8fcf716136e70fe8392f1a1f1495fb/src/GeneralStateTestsFiller/VMTests/vmTests/calldatacopyFiller.yml) ([#1056](https://github.com/ethereum/execution-spec-tests/pull/1056)).
-- ✨ [EIP-7623](https://eips.ethereum.org/EIPS/eip-7623) Increase calldata cost ([#1004](https://github.com/ethereum/execution-spec-tests/pull/1004), [#1071](https://github.com/ethereum/execution-spec-tests/pull/1071)).
-- ✨ Add CALLF invalid section index tests ([#1111](https://github.com/ethereum/execution-spec-tests/pull/1111)).
-- ✨ Add JUMPF invalid section index tests ([#1112](https://github.com/ethereum/execution-spec-tests/pull/1112)).
-- ✨ Add CALLF truncated immediate bytes tests ([#1114](https://github.com/ethereum/execution-spec-tests/pull/1114)).
-- ✨ [EIP-152](https://eips.ethereum.org/EIPS/eip-152) Add tests for Blake2 compression function `F` precompile ([#1067](https://github.com/ethereum/execution-spec-tests/pull/1067)).
-- ✨ Add CALLF non-returning section tests ([#1126](https://github.com/ethereum/execution-spec-tests/pull/1126)).
-- ✨ Add DATALOADN truncated immediate bytes tests ([#1127](https://github.com/ethereum/execution-spec-tests/pull/1127)).
-- 🔀 Update EIP-7702 test expectations according to [spec updates](https://github.com/ethereum/EIPs/pull/9248) ([#1129](https://github.com/ethereum/execution-spec-tests/pull/1129)).
-- ✨ Add tests for CALLF and non-returning ([#1140](https://github.com/ethereum/execution-spec-tests/pull/1140)).
-- 🔀 Update EIP-7251 according to spec updates [#9127](https://github.com/ethereum/EIPs/pull/9127), [#9289](https://github.com/ethereum/EIPs/pull/9289) ([#1024](https://github.com/ethereum/execution-spec-tests/pull/1024), [#1155](https://github.com/ethereum/execution-spec-tests/pull/1155)).
-- 🔀 Update EIP-7002 according to spec updates [#9119](https://github.com/ethereum/EIPs/pull/9119), [#9288](https://github.com/ethereum/EIPs/pull/9288) ([#1024](https://github.com/ethereum/execution-spec-tests/pull/1024), [#1155](https://github.com/ethereum/execution-spec-tests/pull/1155)).
-- 🔀 Update EIP-2935 according to spec updates [#9144](https://github.com/ethereum/EIPs/pull/9144), [#9287](https://github.com/ethereum/EIPs/pull/9287) ([#1046](https://github.com/ethereum/execution-spec-tests/pull/1046), [#1155](https://github.com/ethereum/execution-spec-tests/pull/1155)).
-- ✨ Add DATALOADN validation and execution tests ([#1162](https://github.com/ethereum/execution-spec-tests/pull/1162)).
-- ✨ Add EOF prefix tests ([#1187](https://github.com/ethereum/execution-spec-tests/pull/1187)).
-- ✨ Add tests for EOF code header missing ([#1193](https://github.com/ethereum/execution-spec-tests/pull/1193)).
-- ✨ Add tests for empty EOF type section ([#1194](https://github.com/ethereum/execution-spec-tests/pull/1194)).
-- ✨ Add tests for multiple EOF type sections ([#1195](https://github.com/ethereum/execution-spec-tests/pull/1195)).
-- ✨ Add EIP-7698 legacy EOF creation prevention tests ([#1206](https://github.com/ethereum/execution-spec-tests/pull/1206)).
-
-## [v3.0.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v3.0.0) - 2024-07-22
-
-### 🧪 Test Cases
-
-- ✨ Port create2 return data test ([#497](https://github.com/ethereum/execution-spec-tests/pull/497)).
-- ✨ Add tests for eof container's section bytes position smart fuzzing ([#592](https://github.com/ethereum/execution-spec-tests/pull/592)).
-- ✨ Add `test_create_selfdestruct_same_tx_increased_nonce` which tests self-destructing a contract with a nonce > 1 ([#478](https://github.com/ethereum/execution-spec-tests/pull/478)).
-- ✨ Add `test_double_kill` and `test_recreate` which test resurrection of accounts killed with `SELFDESTRUCT` ([#488](https://github.com/ethereum/execution-spec-tests/pull/488)).
-- ✨ Add eof example valid invalid tests from ori, fetch EOF Container implementation ([#535](https://github.com/ethereum/execution-spec-tests/pull/535)).
-- ✨ Add tests for [EIP-2537: Precompile for BLS12-381 curve operations](https://eips.ethereum.org/EIPS/eip-2537) ([#499](https://github.com/ethereum/execution-spec-tests/pull/499)).
-- ✨ [EIP-663](https://eips.ethereum.org/EIPS/eip-663): Add `test_dupn.py` and `test_swapn.py` ([#502](https://github.com/ethereum/execution-spec-tests/pull/502)).
-- ✨ Add tests for [EIP-6110: Supply validator deposits on chain](https://eips.ethereum.org/EIPS/eip-6110) ([#530](https://github.com/ethereum/execution-spec-tests/pull/530)).
-- ✨ Add tests for [EIP-7002: Execution layer triggerable withdrawals](https://eips.ethereum.org/EIPS/eip-7002) ([#530](https://github.com/ethereum/execution-spec-tests/pull/530)).
-- ✨ Add tests for [EIP-7685: General purpose execution layer requests](https://eips.ethereum.org/EIPS/eip-7685) ([#530](https://github.com/ethereum/execution-spec-tests/pull/530)).
-- ✨ Add tests for [EIP-2935: Serve historical block hashes from state](https://eips.ethereum.org/EIPS/eip-2935) ([#564](https://github.com/ethereum/execution-spec-tests/pull/564), [#585](https://github.com/ethereum/execution-spec-tests/pull/585)).
-- ✨ Add tests for [EIP-4200: EOF - Static relative jumps](https://eips.ethereum.org/EIPS/eip-4200) ([#581](https://github.com/ethereum/execution-spec-tests/pull/581), [#666](https://github.com/ethereum/execution-spec-tests/pull/666)).
-- ✨ Add tests for [EIP-7069: EOF - Revamped CALL instructions](https://eips.ethereum.org/EIPS/eip-7069) ([#595](https://github.com/ethereum/execution-spec-tests/pull/595)).
-- 🐞 Fix typos in self-destruct collision test from erroneous pytest parametrization ([#608](https://github.com/ethereum/execution-spec-tests/pull/608)).
-- ✨ Add tests for [EIP-3540: EOF - EVM Object Format v1](https://eips.ethereum.org/EIPS/eip-3540) ([#634](https://github.com/ethereum/execution-spec-tests/pull/634), [#668](https://github.com/ethereum/execution-spec-tests/pull/668)).
-- 🔀 Update EIP-7002 tests to match spec changes in [ethereum/execution-apis#549](https://github.com/ethereum/execution-apis/pull/549) ([#600](https://github.com/ethereum/execution-spec-tests/pull/600)).
-- ✨ Convert a few eip1153 tests from ethereum/tests repo into .py ([#440](https://github.com/ethereum/execution-spec-tests/pull/440)).
-- ✨ Add tests for [EIP-7480: EOF - Data section access instructions](https://eips.ethereum.org/EIPS/eip-7480) ([#518](https://github.com/ethereum/execution-spec-tests/pull/518), [#664](https://github.com/ethereum/execution-spec-tests/pull/664)).
-- ✨ Add tests for subcontainer kind validation from [EIP-7620: EOF Contract Creation](https://eips.ethereum.org/EIPS/eip-7620) for the cases with deeply nested containers and non-first code sections ([#676](https://github.com/ethereum/execution-spec-tests/pull/676)).
-- ✨ Add tests for runtime stack overflow at CALLF instruction from [EIP-4750: EOF - Functions](https://eips.ethereum.org/EIPS/eip-4750) ([#678](https://github.com/ethereum/execution-spec-tests/pull/678)).
-- ✨ Add tests for runtime stack overflow at JUMPF instruction from [EIP-6206: EOF - JUMPF and non-returning functions](https://eips.ethereum.org/EIPS/eip-6206) ([#690](https://github.com/ethereum/execution-spec-tests/pull/690)).
-- ✨ Add tests for Devnet-1 version of [EIP-7702: Set EOA account code](https://eips.ethereum.org/EIPS/eip-7702) ([#621](https://github.com/ethereum/execution-spec-tests/pull/621)).
-
-### 🛠️ Framework
-
-- 🐞 Fix incorrect `!=` operator for `FixedSizeBytes` ([#477](https://github.com/ethereum/execution-spec-tests/pull/477)).
-- ✨ Add Macro enum that represents byte sequence of Op instructions ([#457](https://github.com/ethereum/execution-spec-tests/pull/457)).
-- ✨ Number of parameters used to call opcodes (to generate bytecode) is now checked ([#492](https://github.com/ethereum/execution-spec-tests/pull/492)).
-- ✨ Libraries have been refactored to use `pydantic` for type checking in most test types ([#486](https://github.com/ethereum/execution-spec-tests/pull/486), [#501](https://github.com/ethereum/execution-spec-tests/pull/501), [#508](https://github.com/ethereum/execution-spec-tests/pull/508)).
-- ✨ Opcodes are now subscriptable and it's used to define the data portion of the opcode: `Op.PUSH1(1) == Op.PUSH1[1]  == b"\x60\x01"` ([#513](https://github.com/ethereum/execution-spec-tests/pull/513)).
-- ✨ Added EOF fixture format ([#512](https://github.com/ethereum/execution-spec-tests/pull/512)).
-- ✨ Verify filled EOF fixtures using `evmone-eofparse` during `fill` execution ([#519](https://github.com/ethereum/execution-spec-tests/pull/519)).
-- ✨ Added `--traces` support when running with Hyperledger Besu ([#511](https://github.com/ethereum/execution-spec-tests/pull/511)).
-- ✨ Use pytest's "short" traceback style (`--tb=short`) for failure summaries in the test report for more compact terminal output ([#542](https://github.com/ethereum/execution-spec-tests/pull/542)).
-- ✨ The `fill` command now generates HTML test reports with links to the JSON fixtures and debug information ([#537](https://github.com/ethereum/execution-spec-tests/pull/537)).
-- ✨ Add an Ethereum RPC client class for use with consume commands ([#556](https://github.com/ethereum/execution-spec-tests/pull/556)).
-- ✨ Add a "slow" pytest marker, in order to be able to limit the filled tests until release ([#562](https://github.com/ethereum/execution-spec-tests/pull/562)).
-- ✨ Add a CLI tool that generates blockchain tests as Python from a transaction hash ([#470](https://github.com/ethereum/execution-spec-tests/pull/470), [#576](https://github.com/ethereum/execution-spec-tests/pull/576)).
-- ✨ Add more Transaction and Block exceptions from existing ethereum/tests repo ([#572](https://github.com/ethereum/execution-spec-tests/pull/572)).
-- ✨ Add "description" and "url" fields containing test case documentation and a source code permalink to fixtures during `fill` and use them in `consume`-generated Hive test reports ([#579](https://github.com/ethereum/execution-spec-tests/pull/579)).
-- ✨ Add git workflow evmone coverage script for any new lines mentioned in converted_ethereum_tests.txt ([#503](https://github.com/ethereum/execution-spec-tests/pull/503)).
-- ✨ Add a new covariant marker `with_all_contract_creating_tx_types` that allows automatic parametrization of a test with all contract-creating transaction types at the current executing fork ([#602](https://github.com/ethereum/execution-spec-tests/pull/602)).
-- ✨ Tests are now encouraged to declare a `pre: Alloc` parameter to get the pre-allocation object for the test, and use `pre.deploy_contract` and `pre.fund_eoa` to deploy contracts and fund accounts respectively, instead of declaring the `pre` as a dictionary or modifying its contents directly (see the [state test tutorial](https://eest.ethereum.org/v4.1.0/writing_tests/tutorials/state_transition/) for an updated example) ([#584](https://github.com/ethereum/execution-spec-tests/pull/584)).
-- ✨ Enable loading of [ethereum/tests/BlockchainTests](https://github.com/ethereum/tests/tree/develop/BlockchainTests) ([#596](https://github.com/ethereum/execution-spec-tests/pull/596)).
-- 🔀 Refactor `gentest` to use `ethereum_test_tools.rpc.rpc` by adding to `get_transaction_by_hash`, `debug_trace_call` to `EthRPC` ([#568](https://github.com/ethereum/execution-spec-tests/pull/568)).
-- ✨ Write a properties file to the output directory and enable direct generation of a fixture tarball from `fill` via `--output=fixtures.tgz`([#627](https://github.com/ethereum/execution-spec-tests/pull/627)).
-- 🔀 `ethereum_test_tools` library has been split into multiple libraries ([#645](https://github.com/ethereum/execution-spec-tests/pull/645)).
-- ✨ Add the consume engine simulator and refactor the consume simulator suite ([#691](https://github.com/ethereum/execution-spec-tests/pull/691)).
-- 🐞 Prevents forcing consume to use stdin as an input when running from hive ([#701](https://github.com/ethereum/execution-spec-tests/pull/701)).
-
-### 📋 Misc
-
-- 🐞 Fix CI by using Golang 1.21 in Github Actions to build geth ([#484](https://github.com/ethereum/execution-spec-tests/pull/484)).
-- 💥 "Merge" has been renamed to "Paris" in the "network" field of the Blockchain tests, and in the "post" field of the State tests ([#480](https://github.com/ethereum/execution-spec-tests/pull/480)).
-- ✨ Port entry point scripts to use [click](https://click.palletsprojects.com) and add tests ([#483](https://github.com/ethereum/execution-spec-tests/pull/483)).
-- 💥 As part of the pydantic conversion, the fixtures have the following (possibly breaking) changes ([#486](https://github.com/ethereum/execution-spec-tests/pull/486)):
-    - State test field `transaction` now uses the proper zero-padded hex number format for fields `maxPriorityFeePerGas`, `maxFeePerGas`, and `maxFeePerBlobGas`.
-    - Fixtures' hashes (in the `_info` field) are now calculated by removing the "_info" field entirely instead of it being set to an empty dict.
-- 🐞 Relax minor and patch dependency requirements to avoid conflicting package dependencies ([#510](https://github.com/ethereum/execution-spec-tests/pull/510)).
-- 🔀 Update all CI actions to use their respective Node.js 20 versions, ahead of their Node.js 16 version deprecations ([#527](https://github.com/ethereum/execution-spec-tests/pull/527)).
-- ✨ Releases now contain a `fixtures_eip7692.tar.gz` which contains all EOF fixtures ([#573](https://github.com/ethereum/execution-spec-tests/pull/573)).
-- ✨ Use `solc-select` for tox when running locally and within CI ([#604](https://github.com/ethereum/execution-spec-tests/pull/604)).
-
-### 💥 Breaking Change
-
-- Cancun is now the latest deployed fork, and the development fork is now Prague ([#489](https://github.com/ethereum/execution-spec-tests/pull/489)).
-- Stable fixtures artifact `fixtures.tar.gz` has been renamed to `fixtures_stable.tar.gz` ([#573](https://github.com/ethereum/execution-spec-tests/pull/573)).
-- The "Blockchain Test Hive" fixture format has been renamed to "Blockchain Test Engine" and updated to more closely resemble the `engine_newPayload` format in the `execution-apis` specification (<https://github.com/ethereum/execution-apis/blob/main/src/engine/prague.md#request>) and now contains a single `"params"` field instead of multiple fields for each parameter ([#687](https://github.com/ethereum/execution-spec-tests/pull/687)).
-- Output folder for fixtures has been renamed from "blockchain_tests_hive" to "blockchain_tests_engine" ([#687](https://github.com/ethereum/execution-spec-tests/pull/687)).
-
-## [v2.1.1](https://github.com/ethereum/execution-spec-tests/releases/tag/v2.1.1) - 2024-03-09
-
-### 🧪 Test Cases
-
-- 🐞 Dynamic create2 collision from different transactions same block ([#430](https://github.com/ethereum/execution-spec-tests/pull/430)).
-- 🐞 Fix beacon root contract deployment tests so the account in the pre-alloc is not empty ([#425](https://github.com/ethereum/execution-spec-tests/pull/425)).
-- 🔀 All beacon root contract tests are now contained in tests/cancun/eip4788_beacon_root/test_beacon_root_contract.py, and all state tests have been converted back to blockchain tests format ([#449](https://github.com/ethereum/execution-spec-tests/pull/449)).
-
-### 🛠️ Framework
-
-- ✨ Adds two `consume` commands [#339](https://github.com/ethereum/execution-spec-tests/pull/339):
-
-   1. `consume direct` - Execute a test fixture directly against a client using a `blocktest`-like command (currently only geth supported).
-   2. `consume rlp` - Execute a test fixture in a hive simulator against a client that imports the test's genesis config and blocks as RLP upon startup. This is a re-write of the [ethereum/consensus](https://github.com/ethereum/hive/tree/master/simulators/ethereum/consensus) Golang simulator.
-
-- ✨ Add Prague to forks ([#419](https://github.com/ethereum/execution-spec-tests/pull/419)).
-- ✨ Improve handling of the argument passed to `solc --evm-version` when compiling Yul code ([#418](https://github.com/ethereum/execution-spec-tests/pull/418)).
-- 🐞 Fix `fill -m yul_test` which failed to filter tests that are (dynamically) marked as a yul test ([#418](https://github.com/ethereum/execution-spec-tests/pull/418)).
-- 🔀 Helper methods `to_address`, `to_hash` and `to_hash_bytes` have been deprecated in favor of `Address` and `Hash`, which are automatically detected as opcode parameters and pushed to the stack in the resulting bytecode ([#422](https://github.com/ethereum/execution-spec-tests/pull/422)).
-- ✨ `Opcodes` enum now contains docstrings with each opcode description, including parameters and return values, which show up in many development environments ([#424](https://github.com/ethereum/execution-spec-tests/pull/424)) @ThreeHrSleep.
-- 🔀 Locally calculate state root for the genesis blocks in the blockchain tests instead of calling t8n ([#450](https://github.com/ethereum/execution-spec-tests/pull/450)).
-- 🐞 Fix bug that causes an exception during test collection because the fork parameter contains `None` ([#452](https://github.com/ethereum/execution-spec-tests/pull/452)).
-- ✨ The `_info` field in the test fixtures now contains a `hash` field, which is the hash of the test fixture, and a `hasher` script has been added which prints and performs calculations on top of the hashes of all fixtures (see `hasher -h`) ([#454](https://github.com/ethereum/execution-spec-tests/pull/454)).
-- ✨ Adds an optional `verify_sync` field to hive blockchain tests (EngineAPI). When set to true a second client attempts to sync to the first client that executed the tests ([#431](https://github.com/ethereum/execution-spec-tests/pull/431)).
-- 🐞 Fix manually setting the gas limit in the genesis test env for post genesis blocks in blockchain tests ([#472](https://github.com/ethereum/execution-spec-tests/pull/472)).
-
-### 📋 Misc
-
-- 🐞 Fix deprecation warnings due to outdated config in recommended VS Code project settings ([#420](https://github.com/ethereum/execution-spec-tests/pull/420)).
-- 🐞 Fix typo in the selfdestruct revert tests module ([#421](https://github.com/ethereum/execution-spec-tests/pull/421)).
-
-## [v2.1.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v2.1.0) - 2024-01-29: 🐍🏖️ Cancun
-
-Release [v2.1.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v2.1.0) primarily fixes a small bug introduced within the previous release where transition forks are used within the new `StateTest` format. This was highlighted by @chfast within #405 (<https://github.com/ethereum/execution-spec-tests/issues/405>), where the fork name `ShanghaiToCancunAtTime15k` was found within state tests.
-
-### 🧪 Test Cases
-
-- ✨ [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844): Adds `test_blob_gas_subtraction_tx()` verifying the blob gas fee is subtracted from the sender before executing the blob tx ([#407](https://github.com/ethereum/execution-spec-tests/pull/407)).
-
-### 🛠️ Framework
-
-- 🐞 State tests generated with transition forks no longer use the transition fork name in the fixture output, instead they use the actual enabled fork according to the state test's block number and timestamp ([#406](https://github.com/ethereum/execution-spec-tests/pull/406)).
-
-### 📋 Misc
-
-- ✨ Use `run-parallel` and shared wheel packages for `tox` ([#408](https://github.com/ethereum/execution-spec-tests/pull/408)).
-
-## [v2.0.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v2.0.0) - 2024-01-25: 🐍🏖️ Cancun
-
-Release [v2.0.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v2.0.0) contains many important framework changes, including introduction of the `StateTest` format, and some additional Cancun and other test coverage.
-
-Due to changes in the framework, there is a breaking change in the directory structure in the release tarball, please see the dedicated "💥 Breaking Changes" section below for more information.
-
-### 🧪 Test Cases
-
-- ✨ [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844): Add `test_sufficient_balance_blob_tx()` and `test_sufficient_balance_blob_tx_pre_fund_tx()` ([#379](https://github.com/ethereum/execution-spec-tests/pull/379)).
-- ✨ [EIP-6780](https://eips.ethereum.org/EIPS/eip-6780): Add a reentrancy suicide revert test ([#372](https://github.com/ethereum/execution-spec-tests/pull/372)).
-- ✨ [EIP-1153](https://eips.ethereum.org/EIPS/eip-1153): Add `test_run_until_out_of_gas()` for transient storage opcodes ([#401](https://github.com/ethereum/execution-spec-tests/pull/401)).
-- ✨ [EIP-198](https://eips.ethereum.org/EIPS/eip-198): Add tests for the MODEXP precompile ([#364](https://github.com/ethereum/execution-spec-tests/pull/364)).
-- ✨ Tests for nested `CALL` and `CALLCODE` gas consumption with a positive value transfer (previously lacking coverage) ([#371](https://github.com/ethereum/execution-spec-tests/pull/371)).
-- 🐞 [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844): Fixed `test_invalid_tx_max_fee_per_blob_gas()` to account for extra gas required in the case where the account is incorrectly deduced the balance as if it had the correct block blob gas fee ([#370](https://github.com/ethereum/execution-spec-tests/pull/370)).
-- 🐞 [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844): Fixed `test_insufficient_balance_blob_tx()` to correctly calculate the minimum balance required for the accounts ([#379](https://github.com/ethereum/execution-spec-tests/pull/379)).
-- 🐞 [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844): Fix and enable `test_invalid_blob_tx_contract_creation` ([#379](https://github.com/ethereum/execution-spec-tests/pull/379)).
-- 🔀 Convert all eligible `BlockchainTest`s to `StateTest`s (and additionally generate corresponding `BlockchainTest`s) ([#368](https://github.com/ethereum/execution-spec-tests/pull/368), [#370](https://github.com/ethereum/execution-spec-tests/pull/370)).
-
-### 🛠️ Framework
-
-- ✨ Add `StateTest` fixture format generation; `StateTests` now generate a `StateTest` and a corresponding `BlockchainTest` test fixture, previously only `BlockchainTest` fixtures were generated ([#368](https://github.com/ethereum/execution-spec-tests/pull/368)).
-- ✨ Add `StateTestOnly` fixture format is now available and its only difference with `StateTest` is that it does not produce a `BlockchainTest` ([#368](https://github.com/ethereum/execution-spec-tests/pull/368)).
-- ✨ Add `evm_bytes_to_python` command-line utility which converts EVM bytecode to Python Opcodes ([#357](https://github.com/ethereum/execution-spec-tests/pull/357)).
-- ✨ Fork objects used to write tests can now be compared using the `>`, `>=`, `<`, `<=` operators, to check for a fork being newer than, newer than or equal, older than, older than or equal, respectively when compared against other fork ([#367](https://github.com/ethereum/execution-spec-tests/pull/367)).
-- ✨ Add [solc 0.8.23](https://github.com/ethereum/solidity/releases/tag/v0.8.23) support ([#373](https://github.com/ethereum/execution-spec-tests/pull/373)).
-- ✨ Add framework unit tests for post state exception verification ([#350](https://github.com/ethereum/execution-spec-tests/pull/350)).
-- ✨ Add a helper class `ethereum_test_tools.TestParameterGroup` to define test parameters as dataclasses and auto-generate test IDs ([#364](https://github.com/ethereum/execution-spec-tests/pull/364)).
-- ✨ Add a `--single-fixture-per-file` flag to generate one fixture JSON file per test case ([#331](https://github.com/ethereum/execution-spec-tests/pull/331)).
-- 🐞 Storage type iterator is now fixed ([#369](https://github.com/ethereum/execution-spec-tests/pull/369)).
-- 🐞 Fix type coercion in `FixtureHeader.join()` ([#398](https://github.com/ethereum/execution-spec-tests/pull/398)).
-- 🔀 Locally calculate the transactions list's root instead of using the one returned by t8n when producing BlockchainTests ([#353](https://github.com/ethereum/execution-spec-tests/pull/353)).
-- 🔀 Change custom exception classes to dataclasses to improve testability ([#386](https://github.com/ethereum/execution-spec-tests/pull/386)).
-- 🔀 Update fork name from "Merge" to "Paris" used within the framework and tests ([#363](https://github.com/ethereum/execution-spec-tests/pull/363)).
-- 💥 Replace `=` with `_` in pytest node ids and test fixture names ([#342](https://github.com/ethereum/execution-spec-tests/pull/342)).
-- 💥 The `StateTest`, spec format used to write tests, is now limited to a single transaction per test ([#361](https://github.com/ethereum/execution-spec-tests/pull/361)).
-- 💥 Tests must now use `BlockException` and `TransactionException` to define the expected exception of a given test, which can be used to test whether the client is hitting the proper exception when processing the block or transaction ([#384](https://github.com/ethereum/execution-spec-tests/pull/384)).
-- 💥 `fill`: Remove the `--enable-hive` flag; now all test types are generated by default ([#358](https://github.com/ethereum/execution-spec-tests/pull/358)).
-- 💥 Rename test fixtures names to match the corresponding pytest node ID as generated using `fill` ([#342](https://github.com/ethereum/execution-spec-tests/pull/342)).
-
-### 📋 Misc
-
-- ✨ Docs: Add a ["Consuming Tests"](https://eest.ethereum.org/main/consuming_tests/) section to the docs, where each test fixture format is described, along with the steps to consume them, and the description of the structures used in each format ([#375](https://github.com/ethereum/execution-spec-tests/pull/375)).
-- 🔀 Docs: Update `t8n` tool branch to fill tests for development features in the [readme](https://github.com/ethereum/execution-spec-tests) ([#338](https://github.com/ethereum/execution-spec-tests/pull/338)).
-- 🔀 Filling tool: Updated the default filling tool (`t8n`) to go-ethereum@master ([#368](https://github.com/ethereum/execution-spec-tests/pull/368)).
-- 🐞 Docs: Fix error banner in online docs due to mermaid syntax error ([#398](https://github.com/ethereum/execution-spec-tests/pull/398)).
-- 🐞 Docs: Fix incorrectly formatted nested lists in online doc ([#403](https://github.com/ethereum/execution-spec-tests/pull/403)).
-- 🔀 CLI: `evm_bytes_to_python` is renamed to `evm_bytes` and now accepts flag `--assembly` to output the code in assembly format ([#844](https://github.com/ethereum/execution-spec-tests/pull/844)).
-
-### 💥 Breaking Changes
-
-A concrete example of the test name renaming and change in directory structure is provided below.
-
-1. Fixture output, including release tarballs, now contain subdirectories for different test types:
-
-   1. `blockchain_tests`: Contains `BlockchainTest` formatted tests
-   2. `blockchain_tests_hive`: Contains `BlockchainTest` with Engine API call directives for use in hive
-   3. `state_tests`: Contains `StateTest` formatted tests
-
-2. `StateTest`, spec format used to write tests, is now limited to a single transaction per test.
-3. In this release the pytest node ID is now used for fixture names (previously only the test parameters were used), this should not be breaking. However, `=` in both node IDs (and therefore fixture names) have been replaced with `_`, which may break tooling that depends on the `=` character.
-4. Produced `blockchain_tests` fixtures and their corresponding `blockchain_tests_hive` fixtures now contain the named exceptions `BlockException` and `TransactionException` as strings in the `expectException` and `validationError` fields, respectively. These exceptions can be used to test whether the client is hitting the proper exception when processing an invalid block.
-
-   Blockchain test:
-
-   ```json
-   "blocks": [
-         {
-            ...
-            "expectException": "TransactionException.INSUFFICIENT_ACCOUNT_FUNDS",
-            ...
-         }
-         ...
-   ]
-   ```
-
-   Blockchain hive test:
-
-   ```json
-   "engineNewPayloads": [
-         {
-            ...
-            "validationError": "TransactionException.INSUFFICIENT_ACCOUNT_FUNDS",
-            ...
-         }
-         ...
-   ]
-   ```
-
-#### Renaming and Release Tarball Directory Structure Change Example
-
-The fixture renaming provides a more consistent naming scheme between the pytest node ID and fixture name and allows the fixture name to be provided directly to pytest 5on the command line to execute individual tests in isolation, e.g. `pytest tests/frontier/opcodes/test_dup.py::test_dup[fork_Frontier]`.
-
-1. Pytest node ID example:
-
-   1. Previous node ID: `tests/frontier/opcodes/test_dup.py::test_dup[fork=Frontier]`.
-   2. New node ID: `tests/frontier/opcodes/test_dup.py::test_dup[fork_Frontier]`.
-
-2. Fixture name example:
-
-   1. Previous fixture name: `000-fork=Frontier`
-   2. New fixture name: `tests/frontier/opcodes/test_dup.py::test_dup[fork_Frontier]` (now the same as the pytest node ID).
-
-3. Fixture JSON file name example (within the release tarball):
-
-   1. Previous fixture file name: `fixtures/frontier/opcodes/dup/dup.json` (`BlockChainTest` format).
-   2. New fixture file names (all present within the release tarball):
-
-     - `fixtures/state_tests/frontier/opcodes/dup/dup.json` (`StateTest` format).
-     - `fixtures/blockchain_tests/frontier/opcodes/dup/dup.json` (`BlockChainTest` format).
-     - `fixtures/blockchain_tests_hive/frontier/opcodes/dup/dup.json` (a blockchain test in `HiveFixture` format).
-
-## [v1.0.6](https://github.com/ethereum/execution-spec-tests/releases/tag/v1.0.6) - 2023-10-19: 🐍🏖️ Cancun Devnet 10
-
-### 🧪 Test Cases
-
-- 🔀 [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844): Update KZG point evaluation test vectors to use data from the official KZG setup and Mainnet Trusted Setup ([#336](https://github.com/ethereum/execution-spec-tests/pull/336)).
-
-### 🛠️ Framework
-
-- 🔀 Fixtures: Add a non-RLP format field (`rlp_decoded`) to invalid blocks ([#322](https://github.com/ethereum/execution-spec-tests/pull/322)).
-- 🔀 Spec: Refactor state and blockchain spec ([#307](https://github.com/ethereum/execution-spec-tests/pull/307)).
-
-### 🔧 EVM Tools
-
-- ✨ Run geth's `evm blocktest` command to verify JSON fixtures after test case execution (`--verify-fixtures`) ([#325](https://github.com/ethereum/execution-spec-tests/pull/325)).
-- ✨ Enable tracing support for `ethereum-spec-evm` ([#289](https://github.com/ethereum/execution-spec-tests/pull/289)).
-
-### 📋 Misc
-
-- ✨ Tooling: Add Python 3.12 support ([#309](https://github.com/ethereum/execution-spec-tests/pull/309)).
-- ✨ Process: Added a Github pull request template ([#308](https://github.com/ethereum/execution-spec-tests/pull/308)).
-- ✨ Docs: Changelog updated post release ([#321](https://github.com/ethereum/execution-spec-tests/pull/321)).
-- ✨ Docs: Add [a section explaining execution-spec-tests release artifacts](https://eest.ethereum.org/v4.1.0/consuming_tests/) ([#334](https://github.com/ethereum/execution-spec-tests/pull/334)).
-- 🔀 T8N Tool: Branch used to generate the tests for Cancun is now [lightclient/go-ethereum@devnet-10](https://github.com/lightclient/go-ethereum/tree/devnet-10) ([#336](https://github.com/ethereum/execution-spec-tests/pull/336)).
-
-### 💥 Breaking Change
-
-- Fixtures now use the Mainnet Trusted Setup merged on [consensus-specs#3521](https://github.com/ethereum/consensus-specs/pull/3521) ([#336](https://github.com/ethereum/execution-spec-tests/pull/336)).
-
-## [v1.0.5](https://github.com/ethereum/execution-spec-tests/releases/tag/v1.0.5) - 2023-09-26: 🐍🏖️ Cancun Devnet 9 Release 3
-
-This release mainly serves to update the EIP-4788 beacon roots address to `0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02`, as updated in [ethereum/EIPs/pull/7672](https://github.com/ethereum/EIPs/pull/7672).
-
-### 🧪 Test Cases
-
-- 🐞 [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844): Fix invalid blob txs pre-Cancun engine response ([#306](https://github.com/ethereum/execution-spec-tests/pull/306)).
-- ✨ [EIP-4788](https://eips.ethereum.org/EIPS/eip-4788): Final update to the beacon root address ([#312](https://github.com/ethereum/execution-spec-tests/pull/312)).
-
-### 📋 Misc
-
-- ✨ Docs: Changelog added ([#305](https://github.com/ethereum/execution-spec-tests/pull/305)).
-- ✨ CI/CD: Run development fork tests in Github Actions ([#302](https://github.com/ethereum/execution-spec-tests/pull/302)).
-- ✨ CI/CD: Generate test JSON fixtures on push ([#303](https://github.com/ethereum/execution-spec-tests/pull/303)).
-
-### 💥 Breaking Change
-
-Please use development fixtures from now on when testing Cancun. These refer to changes that are currently under development within clients:
-
-- fixtures: All tests until the last stable fork (Shanghai).
-- fixtures_develop: All tests until the last development fork (Cancun).
-- fixtures_hive: All tests until the last stable fork (Shanghai) in hive format (Engine API directives instead of the usual BlockchainTest format).
-- fixtures_develop_hive: All tests until the last development fork (Cancun) in hive format.
-
-## [v1.0.4](https://github.com/ethereum/execution-spec-tests/releases/tag/v1.0.4) - 2023-09-21: 🐍 Cancun Devnet 9 Release 2
-
-This release adds additional coverage to the current set of Cancun tests, up to the [Devnet-9 Cancun specification](https://notes.ethereum.org/@ethpandaops/dencun-devnet-9).
-
-**Note:** Additional EIP-4788 updates from [ethereum/EIPs/pull/7672](https://github.com/ethereum/EIPs/pull/7672) will be included in the next release.
-
-### 🧪 Test Cases
-
-- ✨ [EIP-7516: BLOBBASEFEE opcode](https://eips.ethereum.org/EIPS/eip-7516): Add first and comprehensive tests (@marioevz in [#294](https://github.com/ethereum/execution-spec-tests/pull/294)).
-- ✨ [EIP-4788: Beacon block root in the EVM](https://eips.ethereum.org/EIPS/eip-4788): Increase coverage (@spencer-tb in [#297](https://github.com/ethereum/execution-spec-tests/pull/297)).
-- 🐞 [EIP-1153: Transient storage opcodes](https://eips.ethereum.org/EIPS/eip-1153): Remove conftest '+1153' in network field (@spencer-tb in [#299](https://github.com/ethereum/execution-spec-tests/pull/299)).
-
-### 🛠️ Framework
-
-- 🔀 [EIP-4788](https://eips.ethereum.org/EIPS/eip-4788): Beacon root contract is pre-deployed at `0xbEAC020008aFF7331c0A389CB2AAb67597567d7a` (@spencer-tb in [#297](https://github.com/ethereum/execution-spec-tests/pull/297)).
-- ✨ Deprecate empty accounts within framework (@spencer-tb in [#300](https://github.com/ethereum/execution-spec-tests/pull/300)).
-- ✨ Fixture generation split based on hive specificity (@spencer-tb in [#301](https://github.com/ethereum/execution-spec-tests/pull/301)).
-- 💥 `fill`: `--disable-hive` flag removed; replaced by `--enable-hive` (@spencer-tb in [#301](https://github.com/ethereum/execution-spec-tests/pull/301)).
-- ✨ Add engine API forkchoice updated information in fixtures (@spencer-tb in [#256](https://github.com/ethereum/execution-spec-tests/pull/256)).
-
-## [v1.0.3](https://github.com/ethereum/execution-spec-tests/releases/tag/v1.0.3) - 2023-09-14: 🐍 Cancun Devnet 9 Release
-
-See [v1.0.3](https://github.com/ethereum/execution-spec-tests/releases/tag/v1.0.3).
-
-## [v1.0.2](https://github.com/ethereum/execution-spec-tests/releases/tag/v1.0.2) - 2023-08-11: 🐍 Cancun Devnet 8 + 4788 v2 Pre-Release
-
-See [v1.0.2](https://github.com/ethereum/execution-spec-tests/releases/tag/v1.0.2).
-
-## [v1.0.1](https://github.com/ethereum/execution-spec-tests/releases/tag/v1.0.1) - 2023-08-03: 🐍 Cancun Devnet-8 Pre-Release
-
-See [v1.0.1](https://github.com/ethereum/execution-spec-tests/releases/tag/v1.0.1).
-
-## [v1.0.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v1.0.0) - 2023-06-27: 🧪 Welcome to the Pytest Era
-
-See [v1.0.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v1.0.0).
-
-Older releases can be found on [the releases page](https://github.com/ethereum/execution-spec-tests/releases).
diff --git a/docs/changelog_section_template.md b/docs/changelog_section_template.md
deleted file mode 100644
index dfa30a4ec83..00000000000
--- a/docs/changelog_section_template.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Changelog Section Template
-
-The following can be copy-pasted into the `CHANGELOG.md` file for a new release.
-
-## 🔜 [Unreleased]
-
-### 💥 Breaking Change
-
-### 🛠️ Framework
-
-#### `fill`
-
-#### `consume`
-
-#### `execute`
-
-### 📋 Misc
-
-### 🧪 Test Cases
diff --git a/docs/consensus_tests/index.md b/docs/consensus_tests/index.md
new file mode 100644
index 00000000000..0971d147a44
--- /dev/null
+++ b/docs/consensus_tests/index.md
@@ -0,0 +1,7 @@
+# Consensus Tests
+
+The consensus tests in `./tests/` verify that Ethereum execution clients implement the protocol correctly and agree on the resulting state transitions. This section covers the full workflow:
+
+- [Writing Tests](../writing_tests/index.md): Authoring new Python test cases using the execution-testing framework.
+- [Filling Tests](../filling_tests/index.md): Generating JSON test fixtures (vectors) from the Python test cases using the `fill` command.
+- [Running Tests](../running_tests/index.md): Executing the generated fixtures against clients, either directly or via Hive.
diff --git a/docs/dev/coding_style.md b/docs/dev/coding_style.md
deleted file mode 100644
index 6772746ca0b..00000000000
--- a/docs/dev/coding_style.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Coding Style
-
-!!! warning "Documentation Moved"
-    This documentation has been relocated to [Getting Started -> Code Standards](../getting_started/code_standards.md). Please use the new location for the most up-to-date information.
diff --git a/docs/dev/deps_and_packaging.md b/docs/dev/deps_and_packaging.md
index ab52eec197b..a0d6997fe9e 100644
--- a/docs/dev/deps_and_packaging.md
+++ b/docs/dev/deps_and_packaging.md
@@ -1,8 +1,17 @@
-# EEST Dependency Management and Packaging
+# Dependency Management and Packaging
 
-EEST uses [`uv`](https://docs.astral.sh/uv/) to manage and pin its dependencies.
+EELS uses [`uv`](https://docs.astral.sh/uv/) to manage and pin its dependencies, and a minimum `uv>=0.7.0` is required.
 
-A minimum version of `uv>=0.7.0` is required to ensure `uv` writes `uv.lock` files with consistent fields and formatting (see [ethereum/execution-spec-tests#1597](https://github.com/ethereum/execution-spec-tests/pull/1597)).
+## Workspace Layout
+
+The repo is a `uv` workspace with two members, each defined by its own `pyproject.toml`:
+
+| Package                      | `pyproject.toml`                                                                                                            | Contents                                                 |
+| ---------------------------- | --------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------- |
+| `ethereum-execution`         | [`pyproject.toml`](https://github.com/ethereum/execution-specs/blob/a830dab6f130151ab9023a473b7543120aa21961/pyproject.toml)                                  | The Python specs (`src/ethereum/`) and associated tools. |
+| `ethereum-execution-testing` | [`packages/testing/pyproject.toml`](https://github.com/ethereum/execution-specs/blob/a830dab6f130151ab9023a473b7543120aa21961/packages/testing/pyproject.toml) | The EEST test framework under `packages/testing/`.       |
+
+A single [`uv.lock`](https://github.com/ethereum/execution-specs/blob/a830dab6f130151ab9023a473b7543120aa21961/uv.lock) at the repo root pins dependencies for both packages.
 
 ## Managing Dependencies
 
@@ -10,120 +19,101 @@ We aim to provide specific [version specifiers](https://peps.python.org/pep-0440
 
 !!! note "Packages should be managed via `uv`"
 
-    Dependencies should be managed using `uv` on the command-line to ensure that version compatibility is ensured across all dependencies and that `uv.lock` is updated as required.
+    Dependencies should be managed using `uv` on the command-line to ensure that version compatibility is maintained across all dependencies and that `uv.lock` is updated as required.
 
     The docs below cover common operations, see the `uv` [documentation on managing dependencies](https://docs.astral.sh/uv/concepts/projects/dependencies/#multiple-sources) for more information.
 
-!!! info "Separate PRs are preferred when managing dependencies"
+!!! info "Target the right workspace member"
 
-    An upgrade of all pinned dependencies in `uv.lock` must be performed in a dedicated PR!
-    
-    For other dependency changes, they can be included in the PR that removed use of the library, for example. But if a version bump is made, without related source code changes, it should be done in a dedicated PR. This makes the change:
+    Run `uv` commands from the repo root. By default they target `ethereum-execution` (the specs package). To target the test framework, pass `--package ethereum-execution-testing` (or equivalently, `cd packages/testing/` first and run `uv` from there).
 
-    - Easier to track.
-    - Trivial to revert.
+    Either way, the single `uv.lock` at the repo root is updated and should be committed alongside the `pyproject.toml` change.
+
+!!! info "Separate PRs are preferred when managing dependencies"
 
-### Adding/modifying direct dependencies
+    An upgrade of all pinned dependencies in `uv.lock` must be performed in a dedicated PR.
 
-These are packages listed in the project's direct dependencies, i.e., in `pyproject.toml` `[project]` section:
+    For other dependency changes, they can be included in the PR that adds or removes use of the library. But if a version bump is made without related source code changes, it should be done in a dedicated PR. This makes the change:
 
-```toml
-[project]
-...
-dependencies = [
-    "click>=8.1.0,<9",
-    ...
-    "pytest-regex>=0.2.0,<0.3",
-]
-```
+    - Easier to track.
+    - Trivial to revert.
 
-or, for source package dependencies (directly installed via a `git+` specifier from Github), in the `[tool.uv.sources]` section:
+### Adding or modifying direct dependencies
 
-```toml
-[tool.uv.sources]
-ethereum-spec-evm-resolver = { git = "https://github.com/petertdavies/ethereum-spec-evm-resolver", rev = \
-...
-```
+Direct dependencies are the packages listed in each package's `[project] dependencies` table.
 
-!!! example "Example: Updating direct dependencies"
+!!! example "Adding a direct dependency to the specs package"
 
-    Example of a package dependency update:
     ```console
     uv add "requests>=2.31,<2.33"
     ```
 
-    Example of a source dependency update:
+!!! example "Adding a direct dependency to the testing package"
+
     ```console
-    uv add "ethereum-spec-evm-resolver @ git+https://github.com/petertdavies/ethereum-spec-evm-resolver@623ac4565025e72b65f45b926da2a3552041b469"
+    uv add --package ethereum-execution-testing "requests>=2.31,<2.33"
     ```
 
-### Adding/modifying development dependencies
-
-Development dependencies are managed in dependency groups: `lint`, `doc`, `test`, and `mkdocs` defined in the `pyproject.toml`:
-
-```toml
-[dependency-groups]
-test = [
-    "pytest>=8,<9",
-    "pytest-cov>=4.1.0,<5",
-    ...
-]
-lint = [
-    "ruff==0.13.2",
-    "mypy==1.17.0",
-    "types-requests>=2.31,<2.33",
-    ...
-]
-```
+### Adding or modifying development dependencies
 
-These can be modified via `uv`on the command-line or edited by hand. If editing manually, you must run `uv lock` afterwards to update the lockfile.
+Development dependencies are grouped into `[dependency-groups]`, one group per concern, plus a `dev` meta-group that includes them all.
 
-!!! example "Example: Updating a development dependency"
+Groups defined by the specs package:
+
+- `test`, `lint`, `actionlint`, `doc`, `mkdocs`.
+- `dev` includes all of the above plus the `optimized` extra.
+
+Groups defined by the testing package:
+
+- `test`, `lint`.
+- `dev` includes both.
+
+!!! example "Adding a dev dependency to the specs `lint` group"
 
-    Using uv:
     ```console
     uv add --group lint "types-requests>=2.31,<2.33"
     ```
 
-    Or edit `pyproject.toml` manually and then run:
+!!! example "Adding a dev dependency to the testing package `test` group"
+
     ```console
-    uv lock
+    uv add --package ethereum-execution-testing --group test "pytest-timeout>=2.3,<3"
     ```
 
-### Adding/modifying optional dependencies
-
-The `optimized` optional extra provides performance enhancements and is the only remaining optional dependency group:
+### Adding or modifying optional dependencies
 
-```toml
-[project.optional-dependencies]
-optimized = [
-    "rust-pyspec-glue>=0.0.9,<0.1.0",
-    "ethash>=1.1.0,<2",
-]
-```
+The specs package defines a single optional extra, `optimized`, which pulls in `rust-pyspec-glue` and `ethash` for EVM performance.
 
-!!! example "Example: Updating an optional dependency"
+!!! example "Updating an optional dependency"
 
     ```console
     uv add --optional optimized "ethash>=1.1.0,<2"
     ```
 
-    Or edit `pyproject.toml` by hand and run `uv lock`.
-
 ## Upgrading Pinned Dependencies in `uv.lock`
 
-To upgrade all pinned dependencies in `uv.lock` to the latest version permitted by EEST's `project.toml` version specifiers run:
+To upgrade all pinned dependencies in `uv.lock` to the latest versions permitted by both packages' version specifiers, run:
 
 ```console
 uv lock --upgrade
 ```
 
-Project-wide dependency upgrades must be made via a dedicated PR!
+Project-wide dependency upgrades must be made via a dedicated PR.
 
-To upgrade a single package run:
+To upgrade a single package, run:
 
 ```console
 uv lock --upgrade-package <package>
 ```
 
 See [Locking and Syncing](https://docs.astral.sh/uv/concepts/projects/sync/#upgrading-locked-package-versions) in the `uv` docs for more information.
+
+## Verifying `uv.lock`
+
+After any dependency change, verify that `uv.lock` is consistent with both `pyproject.toml` files:
+
+```console
+just lock-check
+```
+
+This recipe also runs as part of `just static` and must be clean before committing.
diff --git a/docs/dev/docs.md b/docs/dev/docs.md
index 8673217ae51..3be9a658e6b 100644
--- a/docs/dev/docs.md
+++ b/docs/dev/docs.md
@@ -1,6 +1,6 @@
 # Documentation
 
-The `execution-spec-tests` documentation is generated via [`mkdocs`](https://www.mkdocs.org/) and hosted remotely on Github Pages at [eest.ethereum.org](https://eest.ethereum.org/).
+The `execution-specs` documentation is generated via [`mkdocs`](https://www.mkdocs.org/) and hosted at [steel.ethereum.foundation/docs/execution-specs/](https://steel.ethereum.foundation/docs/execution-specs/).
 
 ## Prerequisites
 
@@ -13,21 +13,24 @@ uv sync
 One time build in strict mode:
 
 ```console
-uv run mkdocs build --strict
+just docs
 ```
 
-Perform all docs related checks via `tox` in parallel:
+Run all docs related checks:
 
 ```console
-uvx tox -e spellcheck,markdownlint,mkdocs --parallel
+just spellcheck
+just lint-md
+just docs
 ```
 
 ### Local Deployment and Test
 
-This runs continually: Deploys the site locally and re-generates the site upon modifications to `docs/**/*.md` or `tests/**/*.py`:
+Serve the site locally with live reload on changes to `docs/**/*.md` or `tests/**/*.py`:
 
 ```console
-uv run mkdocs serve
+just docs-serve        # full build
+just docs-serve-fast   # skips the Test Case Reference, faster iteration
 ```
 
 For more help (including ensuring a clean build), see the `gen_test_doc` pytest plugin's documentation:
@@ -36,96 +39,6 @@ For more help (including ensuring a clean build), see the `gen_test_doc` pytest
     options:
         members: no
 
-## Remote Deployment and Versioning
-
-The execution-specs-test docs are hosted using Github pages at [eest.ethereum.org](https://eest.ethereum.org/). Versions are updated/deployed automatically as part of Github Actions, but this can also be performed on the command-line.
-
-Our mkdocs configuration uses [mike](https://github.com/jimporter/mike) as a version provider. All deployments should be made via `mike` (whether as part of CI/CD or executed locally).
-
-The deployed versions of the docs managed via `mike` are kept in the [gh-pages](https://github.com/ethereum/execution-spec-tests/tree/gh-pages) branch. When you run `mike` it commits to this branch and optionally pushes the changes directly to remote.
-
-### Aliases
-
-We currently have two aliases (which both point to `main` as of [#998](https://github.com/ethereum/execution-spec-tests/pull/998)):
-
-- [`latest`](https://eest.ethereum.org/latest): the current state of the main branch.
-- [`development`](https://eest.ethereum.org/development): the current state of the main branch.
-
-These aliases point to specific versions, as configured below. It's possible to share links containing either of these aliases or to specific versions, i.e, the following are all valid links:
-
-- https://eest.ethereum.org/ (redirects to latest/main)
-- https://eest.ethereum.org/latest (redirects to main)
-- https://eest.ethereum.org/development (redirects main)
-- https://eest.ethereum.org/main
-- https://eest.ethereum.org/v1.0.0
-
-### CI/CD: Doc Deployment via Github Actions
-
-There are two workflows that automatically deploy updated/new versions of the docs:
-
-| Workflow `yaml` File | What | When |
-|----------------------|------|------|
-| `docs_main.yaml`     | Update "main" version of docs | Push to 'main' branch, (e.g., on PR merge) |
-| `docs_tags.yaml`     | Deploy new version of docs; tag is used as version name | Upon creating a tag matching `v*` |
-
-### Build and Deployment (without alias update)
-
-Build a new version and deploy it to remote (this version will then show up in the version selector list):
-
-```console
-uv run mike deploy -rebase --push v1.2.3
-```
-
-!!! note "Local deployment"
-    If you deploy locally, the documentation will be built with any changes made in your local repository. Check out the tag to deploy tagged versions.
-
-### Build, Deploy and Update the Alias
-
-Build, deploy and update the version an alias points to with:
-
-```console
-uv run mike deploy --rebase --push --update-aliases v1.2.3 latest
-```
-
-where `v1.2.3` indicates the version's name and `development` is the alias. This will overwrite the version if it already exists.  
-
-!!! note "Updating the 'main' version locally"
-    "main" is just a version name (intended to reflect that it is build from the main branch). However, `mike` will build the docs site from the current local repository state (including local modifications). Therefore, make sure you're on the HEAD of the main branch before executing (unless you know what you're doing :wink:)!
-
-    ```console
-    uv run mike deploy --rebase --push main
-    ```
-
-    If the alias accidentally go change:
-
-    ```console
-    uv run mike deploy --rebase --push --update-aliases main development
-    ```
-
-### Viewing and Deleting Versions
-
-List versions:
-
-```console
-uv run mike list
-```
-
-Delete a version:
-
-```console
-uv run mike delete v1.2.3a1
-```
-
-### Set Default Version
-
-Set the default version of the docs to open upon loading the page:
-
-```console
-uv run mike set-default --push latest
-```
-
-Typically, this must only be executed once for a repo.
-
 ## Implementation
 
 ### Plugins
@@ -171,7 +84,3 @@ All pages that are to be included in the documentation and the navigation bar mu
     - `navigation-post-test-case-reference.md`,
 
     and create an arbitrary ordering in the Test Case Reference doc gen script. But this is untested.
-
-## Read the Docs
-
-Originally, before June 2023, documentation was hosted at readthedocs.io. Currently, this page no longer exists (execution-spec-tests.readthedocs.io).
diff --git a/docs/dev/documenting_clis.md b/docs/dev/documenting_clis.md
index f7d3e382d71..18fe63ab7e4 100644
--- a/docs/dev/documenting_clis.md
+++ b/docs/dev/documenting_clis.md
@@ -7,4 +7,4 @@ Current limitations:
 1. `mkdocs serve` does not automatically update the CLI documentation when the source code changes. You must restart the server to see the changes.
 2. `mkdocs-click` does not automatically generate a short help string from sub-command docstrings. You must provide a short help string for each sub-command in the source code with `@click.command(short_help="...")`.
 
-See the [markdown](https://github.com/ethereum/execution-spec-tests/blob/main/docs/library/cli/evm_bytes.md) and corresponding [Python docstrings](https://github.com/ethereum/execution-spec-tests/blob/main/src/cli/evm_bytes.py) for the [`evm_bytes` CLI documentation](../library/cli/evm_bytes.md) as an example of how to document a CLI using `mkdocs-click`.
+See the [markdown](https://github.com/ethereum/execution-specs/blob/a48e0b381d5225a6c3de2d06cd9ee7ae0b6ca9bb/docs/library/cli/evm_bytes.md) and corresponding [Python docstrings](https://github.com/danceratopz/execution-specs/blob/ca2b3b18a5d4058b2e2fd517ba7db31e86919a09/packages/testing/src/execution_testing/cli/evm_bytes.py) for the [`evm_bytes` CLI documentation](../library/cli/evm_bytes.md) as an example of how to document a CLI using `mkdocs-click`.
diff --git a/docs/dev/index.md b/docs/dev/index.md
index d7fe93286d6..f347d317b10 100644
--- a/docs/dev/index.md
+++ b/docs/dev/index.md
@@ -1,16 +1,14 @@
 # Developer Documentation
 
-This documentation is aimed at `execution-spec-tests` developers:
+This documentation is aimed at `execution-specs` developers:
 
 - [Managing configurations](./configurations.md): Instructions for setting up and modifying test configurations.
 - [Interactive usage](./interactive_usage.md): Guide on interactive use of EEST packages using `ipython`.
 - [Documenting CLI commands](./documenting_clis.md): Instructions for documenting command line interfaces (CLIs).
-- [Coding style](./coding_style.md): Standards and best practices for code formatting and to maintain consistency across the repository.
 - [Logging](./logging.md): Documentation on using the custom logging system with enhanced features.
-- [Enabling pre-commit checks](./precommit.md): A guide for setting up pre-commit hooks to enforce code quality before commits.
 - [Running github actions locally](./test_actions_locally.md): Instructions for testing GitHub Actions workflows on your local machine to streamline development and debugging.
 
-These sections are primarily aimed at `execution-spec-tests` maintainers:
+These sections are primarily aimed at `execution-specs` maintainers:
 
 - [Generating documentation](./docs.md): Steps to create and build documentation and manage documentation versions.
-- [Managing dependencies and packaging](./deps_and_packaging.md): How to update EEST dependencies.
+- [Managing dependencies and packaging](./deps_and_packaging.md): How to manage the specs and testing package dependencies.
diff --git a/docs/dev/precommit.md b/docs/dev/precommit.md
deleted file mode 100644
index 3b8af55539d..00000000000
--- a/docs/dev/precommit.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Enabling Pre-Commit Checks
-
-There's a [pre-commit](https://pre-commit.com/) config file available in the repository root (`.pre-commit-config.yaml`) that can be used to enable automatic checks upon commit - the commit will not go through if the checks don't pass.
-
-To enable pre-commit, the following must be run once:
-
-```console
-uvx pre-commit install
-```
-
-!!! note "Bypassing pre-commit checks"
-    Enabling of pre-commit checks is not mandatory (it cannot be enforced) and even if it is enabled, it can always be bypassed with:
-
-    ```console
-    git commit --no-verify
-    ```
diff --git a/docs/dev/releasing.md b/docs/dev/releasing.md
new file mode 100644
index 00000000000..137cf9dc702
--- /dev/null
+++ b/docs/dev/releasing.md
@@ -0,0 +1,82 @@
+# Releasing
+
+This is the maintainer runbook for cutting an EELS release. For the
+contributor-facing explanation of the versioning scheme, see
+[Spec Releases](../specs/spec_releases.md).
+
+## Overview
+
+1. Choose a version number (see
+   [Spec Releases](../specs/spec_releases.md)).
+2. Update the version in source code.
+3. Create a pull request.
+4. Wait for it to get merged.
+5. Create a tag.
+6. Create a GitHub release.
+7. Publish to PyPI.
+
+## Updating the version in source code
+
+The version number is set in `src/ethereum/__init__.py`. Change it
+there. For example:
+
+```patch
+diff --git a/src/ethereum/__init__.py b/src/ethereum/__init__.py
+index 252f2f317..8cdd89a55 100644
+--- a/src/ethereum/__init__.py
++++ b/src/ethereum/__init__.py
+@@ -18,7 +18,7 @@ possible, to aid in defining the behavior of Ethereum clients.
+ """
+ import sys
+ 
+-__version__ = "1.15.0"
++__version__ = "1.16.0rc1"
+ 
+ #
+ #  Ensure we can reach 1024 frames of recursion
+```
+
+## Creating the pull request
+
+The usual: `git checkout -b release-vX.Y.Z`, `git commit -a`, and
+`git push`.
+
+## Creating the tag
+
+> [!WARNING]
+> Do not create the tag from the `HEAD` branch of the pull request.
+>
+> GitHub can rewrite commits when merging pull requests, and tagging the
+> original commit will make the git history messier than necessary.
+
+The tag name should be the letter `v` followed by the version number
+(e.g. `1.15.0rc5.post3` becomes `v1.15.0rc5.post3`).
+
+To create and push the tag:
+
+```bash
+git checkout master     # Replace `master` with the pull request's base branch.
+git pull
+git tag -a -s v1.15.0   # Replace `v1.15.0` with the tag name from earlier.
+git push origin v1.15.0 # Replace the tag name here too.
+```
+
+> [!IMPORTANT]
+> If `git tag` complains about a missing GPG/PGP key, follow
+> [this guide][keygen] to generate one. It's best to add the key to
+> your GitHub account as well.
+
+[keygen]: https://docs.github.com/en/authentication/managing-commit-signature-verification/generating-a-new-gpg-key
+
+## Creating the GitHub release
+
+Go to the [release page][release], choose the newly created tag, and
+generate release notes.
+
+[release]: https://github.com/ethereum/execution-specs/releases/new
+
+## Publishing to PyPI
+
+See the [Python Packaging User Guide][ppug].
+
+[ppug]: https://packaging.python.org/en/latest/tutorials/packaging-projects/#generating-distribution-archives
diff --git a/docs/dev/test_actions_locally.md b/docs/dev/test_actions_locally.md
index 4653c9b9392..6a9e890cf02 100644
--- a/docs/dev/test_actions_locally.md
+++ b/docs/dev/test_actions_locally.md
@@ -44,22 +44,18 @@ will output something similar to:
 
 ```bash
 INFO[0000] Using docker host 'unix:///var/run/docker.sock', and daemon socket 'unix:///var/run/docker.sock'
-Stage  Job ID                Job name                                                      Workflow name                             Workflow file          Events                             
-0      evmone-coverage-diff  evmone-coverage-diff                                          Evmone Coverage Report                    coverage.yaml          pull_request                       
-0      deploy                deploy                                                        Deploy Docs Main                          docs_main.yaml         push                               
-0      deploy                deploy                                                        Deploy Docs Tags                          docs_tags.yaml         push                               
-0      features              features                                                      Build and Package Fixtures                fixtures.yaml          push,workflow_dispatch             
-0      feature-names         feature-names                                                 Build and Package Fixtures for a feature  fixtures_feature.yaml  push,workflow_dispatch             
-0      lint                  Lint python sources with ruff                                 Tox                                       tox_verify.yaml        push,pull_request,workflow_dispatch
-0      typecheck             Typecheck python sources with mypy                            Tox                                       tox_verify.yaml        push,pull_request,workflow_dispatch
-0      spellcheck            Spellcheck sources with pyspelling                            Tox                                       tox_verify.yaml        push,pull_request,workflow_dispatch
-0      markdownlint          Lint markdown files with markdownlint                         Tox                                       tox_verify.yaml        push,pull_request,workflow_dispatch
-0      mkdocs                Build html documentation with mkdocs                          Tox                                       tox_verify.yaml        push,pull_request,workflow_dispatch
-0      pytest_framework      Run unit tests, ${{ matrix.os }}, ${{ matrix.python }}        Tox                                       tox_verify.yaml        push,pull_request,workflow_dispatch
-0      tests_deployed        Fill tests, deployed, ${{ matrix.os }}, ${{ matrix.python }}  Tox                                       tox_verify.yaml        push,pull_request,workflow_dispatch
-1      build                 build                                                         Build and Package Fixtures                fixtures.yaml          push,workflow_dispatch             
-1      build                 build                                                         Build and Package Fixtures for a feature  fixtures_feature.yaml  push,workflow_dispatch             
-2      release               release                                                       Build and Package Fixtures                fixtures.yaml          push,workflow_dispatch             
+Stage  Job ID                Job name                                                      Workflow name                             Workflow file          Events
+0      evmone-coverage-diff  evmone-coverage-diff                                          Evmone Coverage Report                    coverage.yaml          pull_request
+0      deploy                deploy                                                        Deploy Docs Main                          docs_main.yaml         push
+0      deploy                deploy                                                        Deploy Docs Tags                          docs_tags.yaml         push
+0      features              features                                                      Build and Package Fixtures                fixtures.yaml          push,workflow_dispatch
+0      feature-names         feature-names                                                 Build and Package Fixtures for a feature  fixtures_feature.yaml  push,workflow_dispatch
+0      static                Run static checks                                             Test                                      test.yaml              push,pull_request,workflow_dispatch
+0      py3                   Fill tests (Python)                                           Test                                      test.yaml              push,pull_request,workflow_dispatch
+0      docs                  Build html documentation with mkdocs                          Test Docs                                 test-docs.yaml         push,pull_request,workflow_dispatch
+1      build                 build                                                         Build and Package Fixtures                fixtures.yaml          push,workflow_dispatch
+1      build                 build                                                         Build and Package Fixtures for a feature  fixtures_feature.yaml  push,workflow_dispatch
+2      release               release                                                       Build and Package Fixtures                fixtures.yaml          push,workflow_dispatch
 2      release               release                                                       Build and Package Fixtures for a feature  fixtures_feature.yaml  push,workflow_dispatch
 ```
 
@@ -77,7 +73,7 @@ DEFAULT_PYTHON_VERSION=3.12
 and use the `--var-file` option to specify the file:
 
 ```bash
-gh act --workflows .github/workflows/tox_verify.yaml -s GITHUB_TOKEN=$(gh auth token) --var-file=gh_vars.txt -j lint 
+gh act --workflows .github/workflows/test.yaml -s GITHUB_TOKEN=$(gh auth token) --var-file=gh_vars.txt -j static
 ```
 
 ### Running Workflows that use a Matrix Strategy
@@ -85,7 +81,7 @@ gh act --workflows .github/workflows/tox_verify.yaml -s GITHUB_TOKEN=$(gh auth t
 This is optional, recent versions will automatically detect the matrix strategy and run supported values. To run a specific matrix value, use the `--matrix` option:
 
 ```bash
-gh act --workflows .github/workflows/tox_verify.yaml -s GITHUB_TOKEN=$(gh auth token) --matrix python:3.12 -j pytest_framework
+gh act --workflows .github/workflows/test.yaml -s GITHUB_TOKEN=$(gh auth token) --matrix python:3.12 -j test-tests
 ```
 
 ### Running Release Workflows
@@ -115,3 +111,13 @@ It's possible to specify the Docker image used by the `act` tool for a specific
 ```
 
 This can be added to any `gh act` command.
+
+## Debugging CI Failures
+
+The pytest-based CLIs (`fill`, `execute`, ...) print the resolved `pytest ...` invocation at startup whenever the `CI` environment variable is set:
+
+```text
+Executing: pytest ...
+```
+
+When run under Github Actions, the same command is also appended to the job summary (via `$GITHUB_STEP_SUMMARY`), so it can be copied directly from the "Summary" panel of the failing run without scrolling through the log.
diff --git a/docs/filling_tests/debugging_t8n_tools.md b/docs/filling_tests/debugging_t8n_tools.md
index 76960b45909..2352bec641d 100644
--- a/docs/filling_tests/debugging_t8n_tools.md
+++ b/docs/filling_tests/debugging_t8n_tools.md
@@ -1,6 +1,6 @@
 # Debugging Transition Tools
 
-There are two flags that can help debugging `t8n` tools or the execution-spec-tests framework:
+There are two flags that can help debugging `t8n` tools or the execution-testing framework:
 
 1. `--evm-dump-dir`: Write debug information from `t8n` tool calls to the specified directory.
 2. `--traces`: Collect traces of the execution from the transition tool.
diff --git a/docs/filling_tests/fill_stateful.md b/docs/filling_tests/fill_stateful.md
new file mode 100644
index 00000000000..ada7c290d13
--- /dev/null
+++ b/docs/filling_tests/fill_stateful.md
@@ -0,0 +1,246 @@
+# Filling Stateful Benchmark Fixtures
+
+The `fill-stateful` command produces `BlockchainEngineStatefulFixture` JSON for benchmark tests by driving block construction on a live EL client via `testing_buildBlockV1` against a pre-loaded network snapshot. The fixtures are replayed by [`benchmarkoor`](https://github.com/ethpandaops/benchmarkoor) against the same snapshot on any EL client. This replaces the gas-benchmarks MITMProxy approach.
+
+!!! note "When to use `fill-stateful`"
+    Use the standard `fill` for t8n-based fixture generation. Use `fill-stateful` to run benchmarks in a stateful environment (e.g., perfnet, Kurtosis, or other snapshots) to observe how state size affects performance. Any test can be run using this command, but some benchmarks – like the ones under `tests/benchmark/stateful/` – only produce meaningful results in such environments.
+
+`fill-stateful` does not manage datadirs — it expects the target client to already be running with the snapshot mounted. Snapshot management (overlayfs / ZFS / copy) is `benchmarkoor`'s responsibility on the replay side.
+
+## Prerequisites
+
+The target client must expose:
+
+- `testing` (`testing_buildBlockV1`) — block construction with explicit transaction ordering.
+- `engine` — `engine_newPayloadVX`, `engine_forkchoiceUpdatedVX`.
+- `eth`, `debug` — chain queries and `debug_setHead` for between-test rewind.
+- `web3` (optional) — `web3_clientVersion` is recorded into the fixture's `_info.filling-transition-tool` for traceability.
+
+The production-ready filler is `ethpandaops/geth:master`.
+
+## End-to-end flow
+
+### 1. Bootstrap a snapshot
+
+For local development, a kurtosis enclave produces a synthetic snapshot:
+
+```yaml
+# /tmp/fillst-kurtosis-args.yaml
+participants:
+  - el_type: geth
+    el_image: ethpandaops/geth:master
+    el_extra_params:
+      - "--http.api=admin,debug,eth,miner,net,txpool,web3,testing,engine"
+      - "--miner.gaslimit=1000000000000"
+    cl_type: lodestar
+network_params:
+  preset: minimal
+  genesis_delay: 30
+  fulu_fork_epoch: 0
+  gas_limit: 1000000000000
+ethereum_genesis_generator_params:
+  image: "ethpandaops/ethereum-genesis-generator:5.3.5"
+```
+
+```bash
+kurtosis run --enclave fillst /path/to/ethereum-package \
+    --args-file /tmp/fillst-kurtosis-args.yaml
+```
+
+Drain a few blocks, stop CL then EL cleanly, extract the datadir + genesis bundle:
+
+```bash
+docker stop -t 30 vc-1-geth-lodestar--... cl-1-lodestar-geth--...
+docker stop -t 60 el-1-geth-lodestar--...
+docker cp el-1-geth-lodestar--...:/data/geth/execution-data /tmp/multi-snap/geth/
+rm -f /tmp/multi-snap/geth/execution-data/geth/{LOCK,nodes/LOCK,chaindata/LOCK}
+kurtosis files download fillst el_cl_genesis_data /tmp/multi-snap/genesis
+kurtosis files download fillst jwt_file /tmp/fillst-out/jwt
+```
+
+For production benchmarking, use a perfnet / bloatnet snapshot instead.
+
+### 2. Start a standalone client on a copy of the snapshot
+
+Keep the original snapshot pristine so `benchmarkoor` can reuse it on the replay side:
+
+```bash
+cp -a /tmp/multi-snap/geth/execution-data /tmp/multi-snap/geth-fillcopy
+
+docker run -d --name geth-fillcopy \
+  -p 18545:8545 -p 18551:8551 \
+  -v /tmp/multi-snap/geth-fillcopy:/datadir \
+  -v /tmp/multi-snap/genesis:/genesis:ro \
+  -v /tmp/fillst-out/jwt:/jwt:ro \
+  ethpandaops/geth:master \
+  --datadir=/datadir --override.genesis=/genesis/genesis.json \
+  --http --http.addr=0.0.0.0 --http.port=8545 \
+  --http.api=admin,debug,eth,miner,net,txpool,web3,testing,engine \
+  --authrpc.port=8551 --authrpc.addr=0.0.0.0 \
+  --authrpc.jwtsecret=/jwt/jwtsecret \
+  --syncmode=full --gcmode=archive \
+  --miner.gaslimit=1000000000000 \
+  --nodiscover --maxpeers=0
+```
+
+### 3. Fill
+
+```bash
+uv run fill-stateful \
+    --clean \
+    --rpc-endpoint=http://127.0.0.1:18545 \
+    --engine-endpoint=http://127.0.0.1:18551 \
+    --engine-jwt-secret-file=/tmp/fillst-out/jwt/jwtsecret \
+    --fork=Osaka \
+    --output=/tmp/fillst-out/fixtures \
+    --snapshot-block=0x<32-byte-hash> \
+    --gas-benchmark-values=10,30 \
+    tests/benchmark/stateful/bloatnet/test_transient_storage.py
+```
+
+### 4. Replay
+
+Point `benchmarkoor`'s `datadirs.geth.source_dir` at the pristine snapshot (`/tmp/multi-snap/geth/execution-data`) — never at the fillcopy — and `tests.source.eest_fixtures.local_fixtures_dir` at the fill output. See the [benchmarkoor docs](https://github.com/ethpandaops/benchmarkoor) for the full config shape.
+
+## CLI options
+
+Required:
+
+- `--engine-jwt-secret-file PATH` — JWT secret for engine API auth.
+- `--fork NAME` — fork to fill against, e.g. `Osaka`.
+
+Optional:
+
+- `--rpc-endpoint URL` — default `http://localhost:8545`.
+- `--engine-endpoint URL` — derived from `--rpc-endpoint` with port `8551`.
+- `--chain-id INT` — auto-detected from the client.
+- `--snapshot-block HASH_OR_NUMBER` — anchor to a specific block; accepts a 32-byte hash (recommended) or an integer block number (hex `0x...` or decimal). Defaults to the client's `latest`, recorded by hash.
+- `--rpc-seed-key 0x<64hex>` — pin the seed account for reproducible fills. When omitted, a random key is generated and funded via CL withdrawal each session.
+- `--address-stubs PATH` — JSON map of label → on-chain address (and optional pkey). Required by stub-dependent tests; see [Stub-dependent tests](#stub-dependent-tests) below.
+- `--max-gas-per-test INT` — overrides the fork's `transaction_gas_limit_cap()` (EIP-7825).
+- `--gas-benchmark-values 10,30,...` — gas budgets in millions to parametrize against.
+- `--default-{gas-price,max-fee-per-gas,max-priority-fee-per-gas,max-fee-per-blob-gas}` — pin per-session fees; defaults bump live-query values by `1.5×`.
+- `--output PATH` — default `./fixtures`.
+- `--clean` — wipe the output dir before filling.
+
+## Output layout
+
+```text
+<output>/
+└── blockchain_tests_stateful_engine/
+    ├── pre_run/
+    │   └── <start_block_hash>.json # session bootstrap (factory deploy + seed funding)
+    └── for_<fork>_at_<gas>M/
+        └── <test_path>/
+            └── <test>.json         # per-test setup + execution payloads
+```
+
+Each `pre_run/<start_block_hash>.json` (a `StatefulPreRunFixture`) is replayed once per `benchmarkoor` run. Per-test fixtures (`BlockchainEngineStatefulFixture`) reference their setup file by hash: a fixture with `startBlockHash = 0xabc...` is preceded by `pre_run/0xabc....json`. Each per-test fixture carries `snapshotBlockNumber`/`Hash`, `startBlockNumber`/`Hash`, `setupEngineNewPayloads`, `engineNewPayloads`, plus a `benchmarkGasUsed` field and the EL build in `_info.filling-transition-tool`. The hash-based filename leaves room for multiple pre-run files (e.g. different setup variants off one snapshot) without coordinating names.
+
+!!! warning "Snapshot anchoring"
+    `--snapshot-block` accepts a hash on purpose. Anchoring to `latest` works against a quiescent client, but a live reorg between session start and fixture write would silently re-anchor the fixture to a different block. The hash form rejects that.
+
+!!! warning "State pollution across fills"
+    Re-running `fill-stateful` against the same datadir progresses the chain past previous fills. Always start from a fresh copy of the snapshot.
+
+!!! note "Single-worker"
+    `fill-stateful` forces `-n 0` — pytest-xdist is not used; the chain advances sequentially.
+
+## Stub-dependent tests
+
+Some stateful tests (e.g. `test_single_opcode.py`, `test_multi_opcode.py`) target on-chain accounts the snapshot already contains. They reach them two ways:
+
+- `@pytest.mark.stub_parametrize("name", "prefix_")` — parametrize values pulled from `--address-stubs` matching `prefix_`.
+- `pre.deploy_contract(stub="<label>", ...)` — direct runtime lookup.
+
+Without a matching `--address-stubs` entry, both paths fail loudly: the marker path with `FAILED ... MISSING_STUBS` carrying the missing prefix; the runtime path with `ValueError("Stub '<label>' not found...")`. Stock pytest's silent skip on empty parametrize is overridden — running a bloatnet test with no stubs is a misconfiguration, not a valid outcome.
+
+Stubs must point at addresses already on the live client; fill-stateful validates each at session start. The kurtosis devnet recipe above does **not** include them — use a bloatnet / perfnet snapshot (or a custom snapshot generator) for these tests.
+
+## Architecture
+
+`fill-stateful` reuses fill's standard spec loop and swaps the *backend*. Two
+backends now exist behind a common protocol; the rest of fill is unchanged.
+
+```text
+                 BlockchainTest.generate_block_data
+                              │
+                ┌─────────────┴──────────────┐
+                ▼                            ▼
+       TransitionTool                  ClientBackend
+       (t8n CLI / server)         (testing_buildBlockV1 on a live EL)
+            ▼                            ▼
+       make_fixture /               make_stateful_fixture
+       make_hive_fixture                  ▼
+            ▼                  BlockchainEngineStatefulFixture
+       BlockchainFixture /                + StatefulPreRunFixture
+       BlockchainEngineFixture
+```
+
+Both backends satisfy `FillerBackend` (`client_clis/filler_backend.py`). `ClientBackend.evaluate(...)` returns a `TransitionToolOutput` with an `EnginePayloadMetadata` attached (`GetPayloadResponse` + engine API versions); the spec receives it as `TestingBuildBlock(BuiltBlock)` and forwards the payload verbatim — no header rebuild, no side-channel capture.
+
+### Plugins and shared code
+
+| Module | Role |
+|---|---|
+| `cli/pytest_commands/fill_stateful.py` | CLI entry — `fill-stateful` Click command. |
+| `plugins/fill_stateful/fill_stateful.py` | Session pre-run + `t8n`/`session_t8n` overrides; CLI options. |
+| `plugins/shared/live_client_flags.py` | Live-client flags + fee fixtures factored out of `execute/execute.py`. |
+| `plugins/execute/pre_alloc.py` | Reused `Alloc`; `pending_transactions()` drains the queue without sending. |
+| `plugins/execute/rpc/chain_builder_eth_rpc.py` | `fund_via_withdrawals` + `build_block_with_transactions` — return `EnginePayloadMetadata`. |
+| `client_clis/client_backend.py` | `ClientBackend`: builds via `testing_buildBlockV1`, advances via `engine_newPayload` + `forkchoiceUpdated` (SYNCING-retry). |
+| `specs/blockchain.py` | `make_stateful_fixture`, `payload_metadata_to_fixture`, `Block.phase`, `_split_blocks_by_phase`, `TestingBuildBlock`. |
+
+### Flags introduced
+
+| Flag | Where | Purpose |
+|---|---|---|
+| `--snapshot-block` | `fill-stateful` | Anchor by 32-byte hash (reorg-safe) or block number; defaults to `latest`. |
+| `--rpc-seed-key` | `fill-stateful` | Pin the seed EOA; otherwise generated + funded via CL withdrawal. |
+| `--default-gas-price`, `--default-max-fee-per-gas`, `--default-max-priority-fee-per-gas`, `--default-max-fee-per-blob-gas` | `shared/live_client_flags` | Pin per-session fees; defaults bump a one-shot live query by `1.5x`. |
+| `--max-gas-per-test`, `--max-tx-per-batch`, `--transaction-gas-limit`, ... | `shared/live_client_flags` | Generic live-client knobs reused across commands. |
+
+### Fill flow
+
+1. **Session pre-run** (`_session_pre_run`, autouse session fixture):
+    1. Resolve `--snapshot-block` → record `(number, hash)` on the backend.
+    2. Fund the seed EOA via CL withdrawal (`ChainBuilderEthRPC.fund_via_withdrawals`).
+    3. Deploy the deterministic factory if missing (`contracts.deploy_deterministic_factory_contract`).
+    4. Capture `latest` as the `start_block` anchor on the backend.
+    5. Write `pre_run/<start_block_hash>.json` (a `StatefulPreRunFixture`).
+2. **Per-test fill** (`make_stateful_fixture`):
+    1. Materialise `pre.fund_eoa` / `pre.deploy_contract` queue into a synthetic setup block prepended to `self.blocks`.
+    2. `_split_blocks_by_phase` splits any mixed-phase blocks (e.g. EIP-7702 SETUP + benchmark TEST).
+    3. For each block, `ClientBackend.evaluate` builds + finalises it; payload partitioned by `Block.phase` into `setupEngineNewPayloads` vs `engineNewPayloads`.
+    4. Write `<test>.json` (a `BlockchainEngineStatefulFixture`).
+3. **Per-test reset** (`_reset_chain_between_tests`): `debug_setHead(start_block.number)`, re-fetch `latest`, abort if hash drifted.
+
+### Fixture types
+
+| Type | One per | Carries |
+|---|---|---|
+| `StatefulPreRunFixture` | session | `snapshot/start` anchors, `engineNewPayloads` (the withdrawal + factory deploy blocks). |
+| `BlockchainEngineStatefulFixture` | test | `snapshot/start` anchors, `setupEngineNewPayloads`, `engineNewPayloads`, `benchmarkGasUsed`, `_info.filling-transition-tool` (EL build string). |
+| `FixtureEngineNewPayload` | block | `params` (`engine_newPayloadVX` args), `newPayloadVersion`, `forkchoiceUpdatedVersion`, `phase` (`SETUP`/`EXECUTION`/`None`). |
+
+### What's captured in each payload
+
+The client's `GetPayloadResponse` is recorded **verbatim**. Rebuilding from `FixtureHeader` would diverge on client-picked fields (e.g. `gas_limit`) and break `engine_newPayload` hash validation on replay.
+
+### Replay (benchmarkoor)
+
+```text
+pristine snapshot ───copy──▶ datadir ───▶ geth ───▶ benchmarkoor
+                                                       │
+                                                       ├── replay pre_run/<startBlockHash>.json
+                                                       │   for each fixture's startBlockHash
+                                                       │   (1 client, 1 time per hash per run)
+                                                       │
+                                                       └── for each test fixture:
+                                                            ├── replay setupEngineNewPayloads
+                                                            ├── replay engineNewPayloads (timed)
+                                                            ├── debug_setHead → start_block
+                                                            └── re-fetch latest, verify hash
+```
+
+Sanity check: each fixture's `benchmarkGasUsed` (recorded at fill) should equal benchmarkoor's measured `gas_used_total` for that test.
diff --git a/docs/filling_tests/filling_tests_command_line.md b/docs/filling_tests/filling_tests_command_line.md
index 25be31804da..599c93dc1d0 100644
--- a/docs/filling_tests/filling_tests_command_line.md
+++ b/docs/filling_tests/filling_tests_command_line.md
@@ -1,8 +1,8 @@
 # Filling Tests at a Prompt
 
-The execution-spec-tests test framework uses the [pytest framework](https://docs.pytest.org/en/latest/) for test case collection and execution. The `fill` command is essentially an alias for `pytest`, which uses several [custom pytest plugins](../library/pytest_plugins/index.md) to run transition tools against test cases and generate JSON fixtures.
+The execution-testing framework uses the [pytest framework](https://docs.pytest.org/en/latest/) for test case collection and execution. The `fill` command is essentially an alias for `pytest`, which uses several [custom pytest plugins](../library/pytest_plugins/index.md) to run transition tools against test cases and generate JSON fixtures.
 
-!!! note "Options specific to execution-spec-tests"
+!!! note "Options specific to execution-testing"
     The command-line options specific to filling tests can be listed via:
 
     ```console
@@ -101,24 +101,12 @@ This flag automatically performs a two-phase execution:
 1. **Phase 1**: Generates pre-allocation groups for optimization.
 2. **Phase 2**: Generates all supported fixture formats (`StateFixture`, `BlockchainFixture`, `BlockchainEngineFixture`, `BlockchainEngineXFixture`, etc.).
 
-!!! tip "Automatic enabling with tarball output"
-    When using tarball output (`.tar.gz` files), the `--generate-all-formats` flag is automatically enabled:
+!!! note "Tarball output requires explicit opt-in"
+    Tarball output (`.tar.gz` files) does **not** imply `--generate-all-formats`. Pass the flag explicitly to include the pre-allocation group formats:
     ```console
-    # Automatically enables --generate-all-formats due to .tar.gz output
-    uv run fill --output=fixtures.tar.gz tests/shanghai/
-
-    # Equivalent to:
     uv run fill --generate-all-formats --output=fixtures.tar.gz tests/shanghai/
     ```
 
-!!! note "Alternative approach"
-    You can still use the legacy approach, but this will only generate the `BlockchainEngineXFixture` format:
-    ```console
-    # Single command that automatically does 2-phase execution
-    # but only generates BlockchainEngineXFixture
-    uv run fill --generate-pre-alloc-groups tests/shanghai/
-    ```
-
 ## Debugging the `t8n` Command
 
 The `--evm-dump-dir` flag can be used to dump the inputs and outputs of every call made to the `t8n` command for debugging purposes, see [Debugging Transition Tools](./debugging_t8n_tools.md).
diff --git a/docs/filling_tests/filling_tests_dev_fork.md b/docs/filling_tests/filling_tests_dev_fork.md
index 6217ed032a2..4bf56f7e68f 100644
--- a/docs/filling_tests/filling_tests_dev_fork.md
+++ b/docs/filling_tests/filling_tests_dev_fork.md
@@ -2,7 +2,7 @@
 
 ## Requirements
 
-By default, execution-spec-tests only generates fixtures for forks that have been deployed to mainnet. In order to generate fixtures for evm features that are actively under development:
+By default, the execution-testing framework only generates fixtures for forks that have been deployed to mainnet. In order to generate fixtures for evm features that are actively under development:
 
 1. A version of the `evm` and `solc` tools that implement the feature must be available (although, typically only a developer version of the `evm` tool is required, usually the latest stable release of `solc` is adequate), and,
 2. The development fork to test must be explicitly specified on the command-line:
@@ -42,7 +42,3 @@ By default, execution-spec-tests only generates fixtures for forks that have bee
      <figure markdown>  <!-- markdownlint-disable MD033 (MD033=no-inline-html) -->
           ![Screenshot of pytest test collection console output](./img/pytest_run_example.png){align=center}
      </figure>
-
-## VS Code Setup
-
-By default, VS Code's Testing View will only show tests for stable forks. To show tests for development forks, uncomment the relevant line in the `python.testing.pytestArgs` configuration section of included settings file (`.vscode/settings.json`) to enable the `--until=FORK` flag. See [VS Code Setup](../getting_started/setup_vs_code.md) for help finding the settings files.
diff --git a/docs/filling_tests/filling_tests_vs_code.md b/docs/filling_tests/filling_tests_vs_code.md
deleted file mode 100644
index bf04ef90d95..00000000000
--- a/docs/filling_tests/filling_tests_vs_code.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Filling Tests in VS Code
-
-Prerequisite: [VS Code Setup](../getting_started/setup_vs_code.md).
-
-## Exploring Test Cases
-
-Implemented test cases can be explored in VS Code's "Testing" View; click on the conical flask highlighted in the screenshot below.
-
-<figure markdown>  <!-- markdownlint-disable MD033 (MD033=no-inline-html) -->
- ![VS Code Testing Tab](./img/vs_code_exploring_tests.png){ width=auto align=center}
-</figure>
-
-!!! note "Testing EVM Features Under Active Development"
-     See [the VS Code section](./filling_tests_dev_fork.md#vs-code-setup) in [Filling Tests for Features under Development](./filling_tests_dev_fork.md) to explore tests targeting EVM features under development.
-
-## Filling and Debugging Test Cases
-
-<figure markdown>
- ![VS Code Testing Tab](./img/vs_code_executing_tests.png){ width=auto align=center}
-</figure>
diff --git a/docs/filling_tests/getting_started.md b/docs/filling_tests/getting_started.md
index a9e39715b15..a96187e22f7 100644
--- a/docs/filling_tests/getting_started.md
+++ b/docs/filling_tests/getting_started.md
@@ -53,5 +53,4 @@ This guide describes how to get started with `fill` and commonly-used command-li
 
 1. Learn [useful command-line flags](./filling_tests_command_line.md).
 2. [Execute tests for features under development](./filling_tests_dev_fork.md) via the `--fork` flag.
-3. _Optional:_ [Configure VS Code](../getting_started/setup_vs_code.md) to auto-format Python code and [execute tests within VS Code](./filling_tests_vs_code.md#filling-and-debugging-test-cases).
-4. Implement a new test case, see [Writing Tests](../writing_tests/index.md).
+3. Implement a new test case, see [Writing Tests](../writing_tests/index.md).
diff --git a/docs/filling_tests/index.md b/docs/filling_tests/index.md
index 213b3049d75..631c62106fc 100644
--- a/docs/filling_tests/index.md
+++ b/docs/filling_tests/index.md
@@ -28,11 +28,3 @@ The "fill-consume" method follows a differential testing approach: A reference i
     Some tests cases, particularly those without straightforward post-checks, such as certain gas calculations, may allow subtle inconsistencies to slip through during filling.
     
     **Consequently, filling the tests does not ensure the client’s correctness. Clients must consume the tests to be considered correctly tested, even if that client was used to fill the tests.**
-
-## Filling Static Tests from [ethereum/tests](https://github.com/ethereum/tests)
-
-Filling static test fillers in YAML or JSON formats from [ethereum/tests](https://github.com/ethereum/tests/tree/develop/src) is possible by adding the `--fill-static-tests` to the `fill` command.
-
-This functionality is only available for backwards compatibility and copying legacy tests from the [ethereum/tests](https://github.com/ethereum/tests) repository into this one.
-
-Adding new static test fillers is otherwise not allowed.
diff --git a/docs/filling_tests/transition_tool_support.md b/docs/filling_tests/transition_tool_support.md
index 48e26291adf..f151f05a7d6 100644
--- a/docs/filling_tests/transition_tool_support.md
+++ b/docs/filling_tests/transition_tool_support.md
@@ -5,8 +5,8 @@ The following transition tools are supported by the framework:
 | Client | `t8n` Tool | Tracing Support |
 | -------| ---------- | --------------- |
 | [ethereum/evmone](https://github.com/ethereum/evmone) | `evmone-t8n` | Yes |
-| [ethereum/execution-specs](https://github.com/ethereum/execution-specs) | [`ethereum-spec-evm-resolver`](https://github.com/petertdavies/ethereum-spec-evm-resolver) | Yes |
+| [ethereum/execution-specs](https://github.com/ethereum/execution-specs) | [`ethereum-spec-evm t8n`](https://github.com/ethereum/execution-specs/tree/a48e0b381d5225a6c3de2d06cd9ee7ae0b6ca9bb/src/ethereum_spec_tools/evm_tools/t8n) | Yes |
 | [ethereumjs](https://github.com/ethereumjs/ethereumjs-monorepo) | [`ethereumjs-t8ntool.sh`](https://github.com/ethereumjs/ethereumjs-monorepo/tree/master/packages/vm/test/t8n) | No |
 | [ethereum/go-ethereum](https://github.com/ethereum/go-ethereum) | [`evm t8n`](https://github.com/ethereum/go-ethereum/tree/master/cmd/evm) | Yes |
-| [hyperledger/besu](https://github.com/hyperledger/besu/tree/main/ethereum/evmtool) | [`evmtool t8n-server`](https://github.com/hyperledger/besu/tree/main/ethereum/evmtool) | Yes             |
+| [besu-eth/besu](https://github.com/besu-eth/besu/tree/main/ethereum/evmtool) | [`evmtool t8n-server`](https://github.com/besu-eth/besu/tree/main/ethereum/evmtool) | Yes             |
 | [status-im/nimbus-eth1](https://github.com/status-im/nimbus-eth1) | [`t8n`](https://github.com/status-im/nimbus-eth1/blob/master/tools/t8n/readme.md) | Yes |
diff --git a/docs/getting_started/code_standards.md b/docs/getting_started/code_standards.md
index f52e99d7c43..189b1809573 100644
--- a/docs/getting_started/code_standards.md
+++ b/docs/getting_started/code_standards.md
@@ -1,83 +1,23 @@
 # Code Standards
 
-This document outlines the coding standards and practices used in the @ethereum/execution-spec-tests repository.
+This page outlines the code standards used in @ethereum/execution-specs. Many of the following preferences are enforced in CI via static code checks which can be ran locally via:
 
-## Code and CI Requirements
+```console
+just static
+```
 
-Code pushed to @ethereum/execution-spec-tests must fulfill the following checks in [CI](https://github.com/ethereum/execution-spec-tests/actions/workflows/tox_verify.yaml):
-
-| Type                   | Tox Command                                     | Explanation                                                                                                 |
-| ---------------------- | ----------------------------------------------- | ----------------------------------------------------------------------------------------------------------- |
-| Lint & code formatting | `uvx tox -e lint`                 | Python lint, format and module import check via `ruff`                                                      |
-| Typecheck              | `uvx tox -e typecheck`            | Objects that provide typehints pass type-checking via `mypy`.                                               |
-| Framework unit tests   | `uvx tox -e pytest`               | All framework unit tests must execute correctly.                                                            |
-| EL Client test cases   | `uvx tox -e tests-deployed`       | All client test cases for deployed forks can be generated.                                                  |
-| Benchmark EL Test cases    | `uvx tox -e tests-deployed-benchmark` | All client test cases specific to benchmarks for deployed forks can be generated.                               |
-| HTML doc build         | `uvx tox -e mkdocs`               | Documentation generated without warnings.                                                                   |
-| Spellcheck             | `uvx tox -e spellcheck`           | Code and documentation spell-check using codespell. |
-| Markdown lint          | `uvx tox -e markdownlint`         | Markdown lint (requires [additional dependency](code_standards_details.md#additional-dependencies)).        |
-| Changelog validation   | `uvx tox -e changelog`            | Validates changelog entries format and structure in `docs/CHANGELOG.md`.                                    |
-
-!!! important "Avoid CI surprises - Use pre-commit hooks!"
-    **We strongly encourage all contributors to install and use pre-commit hooks!** This will run fast checks (lint, typecheck, spellcheck) automatically before each commit, helping you catch issues early and avoid frustrating CI failures after pushing your changes.
-
-    Install with one simple command:
-    ```console
-    uvx pre-commit install
-    ```
-    
-    This saves you time by catching formatting issues, type errors, and spelling mistakes before they reach CI.
-
-!!! tip "Running checks easily"
-
-    Add an alias:
-
-    ```console
-    alias tox="uvx tox"
-    ```
-
-    Run all checks in parallel:
-
-    ```console
-    uvx tox run-parallel
-    ```
-
-    Run sequentially:
-
-    ```console
-    uvx tox
-    ```
-
-    Run specific, faster checks:
-
-    ```console
-    uvx tox -e lint,typecheck
-    ```
-
-!!! tip "Lint & code formatting: Using `ruff` and VS Code to help autoformat and fix module imports"
-
-    On the command-line, solve fixable issues with:
-
-    ```console
-    uv run ruff check --fix
-    ```
-
-    Use VS Code, see [VS Code Setup](../getting_started/setup_vs_code.md), to autoformat code, automatically organize Python module imports and highlight typechecking and spelling issues.
-
-!!! hint "Typechecking"
-
-    Adding the correct typehints can sometimes be tricky and there are exceptions that require manually disabling typechecking on a per-line basis. Please reach out to the maintainers if you need help, either [directly](../getting_started/getting_help.md) or in a PR.
+See [Verifying Changes](verifying_changes.md) for more details on running checks locally and ensuring that your code passes CI checks.
 
 ## Python Coding Preferences
 
-- **Line Length**: 100 characters maximum.
-- **Formatting**: Enforced by `ruff` (similar to `black`).
-- **Documentation**: All public functions and classes should have docstrings
+- **Line Length**: 79 characters maximum.
+- **Formatting**: Enforced by `ruff` (similar to `black`). Run `just fix` to format code via `ruff`.
+- **Documentation**: All public functions and classes should have docstrings:
     - Docstrings should have a good one-line summary which uses the imperative ("Return" not "Returns").
     - Add a blank line after the summary for multi-line docstrings.
     - Single-line docstrings should have triple quotes on the same line.
 - **Imports**: Use explicit imports (no `from module import *`).
-- **Relative Imports**: Use relative imports within the same package
+- **Relative Imports**: Use relative imports within the same package.
 - **Error Handling**: Use explicit exception types and meaningful error messages.
 - **Type Hints**: All functions should include type annotations.
 - **Unused Function Arguments**: When  unavoidable, use `del`, e.g., `del unused_var`, at function start to avoid flagging linter errors.
@@ -88,16 +28,14 @@ Code pushed to @ethereum/execution-spec-tests must fulfill the following checks
 - **File Paths**: Strongly prefer `pathlib` over `os.path` for file system operations.
 - **Retry Logic**: Use [`tenacity`](https://github.com/jd/tenacity) library for handling flaky network connections and transient failures.
 
-## Editor Setup
+## Testing Framework Plugins with Pytester
+
+Use pytest's `pytester` fixture when writing tests for our pytest plugins and CLI commands.
 
-A correctly configured editor will automatically handle most formatting requirements. See [VS Code Setup](./setup_vs_code.md) for recommended settings.
+`runpytest()` is the default. It runs the inner session in-process, is fast, and gives access to helpers like `assert_outcomes()` and `fnmatch_lines()`.
 
-## Detailed Information
+`runpytest_subprocess()` runs the inner session in a separate process. Use it only when in-process mode causes state leakage (e.g., Pydantic `ModelMetaclass` cache pollution or global mutation in `pytest_configure`). Subprocess isolation masks these bugs rather than fixing them, so prefer fixing the root cause and use subprocess mode as defense-in-depth.
 
-See the [Detailed Code Standards](code_standards_details.md) page for more information on:
+Don't use raw `subprocess.run()` in pytester-based tests. If you need process isolation, use `runpytest_subprocess()`.
 
-- [Running tox environments](code_standards_details.md#running-tox-environments).
-    - Additional required [dependencies for markdownlint and spellchecking](code_standards_details.md#additional-dependencies).
-- [Pre-commit hooks setup](code_standards_details.md#pre-commit-hooks).
-- [Verifying test fixture changes](code_standards_details.md#verifying-fixture-changes).
-- [Ignoring bulk change commits](code_standards_details.md#ignoring-bulk-change-commits) in `git blame`.
+Both methods return a `RunResult` with `.ret`, `.outlines`, `.errlines`, `assert_outcomes()`, and `fnmatch_lines()`. When the inner test is expected to fail, use `capsys.readouterr()` after `runpytest_subprocess()` to suppress the inner failure output that pytester replays to stdout.
diff --git a/docs/getting_started/code_standards_details.md b/docs/getting_started/code_standards_details.md
deleted file mode 100644
index 50824deb145..00000000000
--- a/docs/getting_started/code_standards_details.md
+++ /dev/null
@@ -1,182 +0,0 @@
-# Detailed Code Standards
-
-This page provides in-depth information about the code standards and verification processes in @ethereum/execution-spec-tests.
-
-## Running Tox Environments
-
-### Execution Options
-
-Run all `tox` environments in parallel:
-
-```console
-uvx tox run-parallel
-```
-
-Run environments sequentially with verbose output:
-
-```console
-uvx tox -v
-```
-
-List all available environments:
-
-```console
-uvx tox -av
-```
-
-### Specific Environment Commands
-
-Run specific environments using the `-e` flag:
-
-```console
-uvx tox -e lint,typecheck,spellcheck
-```
-
-#### For Test Case Changes (`./tests/`)
-
-```console
-uvx tox -e lint,typecheck,spellcheck,tests-deployed
-```
-
-#### For Framework and Library Changes (`./src/`)
-
-```console
-uvx tox -e lint,typecheck,spellcheck,pytest
-```
-
-#### For Documentation Changes (`./docs/`)
-
-```console
-uvx tox -e spellcheck,markdownlint,mkdocs,changelog
-```
-
-!!! note "Tox Virtual Environment"
-Checks performed by `tox` are sandboxed in their own virtual environments (created automatically in the `.tox/` subdirectory). These can be used to debug errors encountered during `tox` execution.
-
-### Additional Dependencies
-
-Some checks require external (non-Python) packages:
-
-#### For `spellcheck`
-
-The spellcheck environment uses **codespell**, which is automatically installed via Python dependencies and checks for common spelling mistakes in code and documentation.
-
-To fix spelling errors found by codespell:
-
-```console
-uv run codespell *.md *.ini .github/ src/ tests/ docs/ --write-changes
-```
-
-!!! note "VS Code Integration"
-    The `whitelist.txt` file is still maintained for the VS Code cSpell extension, which provides real-time spell checking in the editor.
-
-#### For `markdownlint`
-
-```console
-sudo apt install nodejs
-sudo npm install -g markdownlint-cli2@0.17.2  # the version used in ci
-```
-
-Or use a specific node version using `nvm`.
-
-## Pre-commit Hooks
-
-Certain `tox` environments can be run automatically as git pre-commit hooks to ensure that your changes meet the project's standards before committing.
-
-### Installation
-
-```console
-uvx pre-commit install
-```
-
-For more information, see [Pre-commit Hooks Documentation](../dev/precommit.md).
-
-## Formatting and Line Length
-
-The Python code in @ethereum/execution-spec-tests is formatted with `ruff` with a line length of 100 characters.
-
-### Ignoring Bulk Change Commits
-
-The maximum line length was changed from 80 to 100 in Q2 2023. To ignore this bulk change commit in git blame output, use the `.git-blame-ignore-revs` file:
-
-```console
-git blame --ignore-revs-file .git-blame-ignore-revs docs/gen_test_case_reference.py
-```
-
-To use the revs file persistently with `git blame`:
-
-```console
-git config blame.ignoreRevsFile .git-blame-ignore-revs
-```
-
-## Building and Verifying Docs Locally
-
-To quickly build and browse the HTML documentation locally run:
-
-=== "bash"
-
-    ```console
-    export FAST_DOCS=True
-    uv run mkdocs serve
-    ```
-
-=== "fish"
-
-    ```console
-    set -x FAST_DOCS True
-    uv run mkdocs serve
-    ```
-
-Setting `FAST_DOCS` to `False` additionally builds the "[Test Case Reference](https://eest.ethereum.org/main/tests/)" Section.
-
-## Verifying Fixture Changes
-
-When writing a PR that modifies either the framework or test cases, verify that changes don't cause issues with existing test cases.
-
-All filled fixtures contain a `hash` field in the `_info` object, which is used to verify that the fixture hasn't changed.
-
-### Using the Hasher Tool
-
-The `hasher` command can be used to bulk-verify the hashes of fixtures in a directory.
-
-| Flag             | Description                                                       |
-| ---------------- | ----------------------------------------------------------------- |
-| `--files` / `-f` | Prints a combined hash per JSON fixture file.                     |
-| `--tests` / `-t` | Prints the hash of every test vector in JSON fixture files.       |
-| `--root` / `-r`  | Prints a combined hash for all JSON fixture files in a directory. |
-
-For a quick comparison between two fixture directories:
-
-```console
-hasher --root fixtures/
-hasher --root fixtures_new/
-```
-
-To identify which files are different:
-
-```console
-diff <(hasher --files fixtures/) <(hasher --files fixtures_new/)
-```
-
-For a granular comparison:
-
-```console
-diff <(hasher --tests fixtures/) <(hasher --tests fixtures_new/)
-```
-
-#### The `compare` Subcommand
-
-The `hasher compare` subcommand directly compares two fixture directories
-and shows only the differences:
-
-```console
-hasher compare fixtures/ fixtures_new/
-```
-
-| Flag                | Description                                               |
-| ------------------- | --------------------------------------------------------- |
-| `--depth N` / `-d`  | Limit to N levels (0=root, 1=folders, 2=files, 3=tests).  |
-| `--files` / `-f`    | Show differences at file level.                           |
-| `--tests` / `-t`    | Show differences at individual test level.                |
-| `--root` / `-r`     | Show only the root-level hash difference.                 |
-| `--ignore-missing`  | Hide entries that exist in only one directory.             |
diff --git a/docs/getting_started/getting_help.md b/docs/getting_started/getting_help.md
index 8e370fb6b49..78bea4c7120 100644
--- a/docs/getting_started/getting_help.md
+++ b/docs/getting_started/getting_help.md
@@ -1,12 +1,12 @@
 # Getting Help
 
-The tests in this repository are a community effort to help improve the development cycle of all Ethereum execution clients.
+The work in this repository is a community effort to help improve Ethereum's fork cadence and the development cycle of all Ethereum execution clients.
 
-We encourage contributions and recognize that Python is not everyone's  primary language - if you stumble over issues or need help, please reach out to one of the execution-spec-tests maintainers either directly or in the `#el-testing` channel in the [Ethereum R&D Discord Server](https://discord.com/invite/qGpsxSA).
+We encourage contributions and recognize that Python is not everyone's  primary language - if you stumble over issues or need help, please reach out to one of the execution-specs maintainers either directly or in the `#el-testing` channel in the [Ethereum R&D Discord Server](https://discord.com/invite/qGpsxSA).
 
-## Contact the Maintainers
+## Contact STEEL
 
-Write to:
+Feel free to contact any [STEEL team member](https://steel.ethereum.foundation/team/):
 
 - Dan on [Discord](https://discordapp.com/users/danceratopz) or [Telegram](https://t.me/danceratopz) (`danceratopz`).
 - Spencer on [Discord](https://discordapp.com/users/spencertaylorbrown) or [Telegram](https://t.me/spencertb) (`spencertaylorbrown`/`@techbro_ccoli`).
diff --git a/docs/getting_started/installation.md b/docs/getting_started/installation.md
index 95e7cb33636..b97e4e8d4d2 100644
--- a/docs/getting_started/installation.md
+++ b/docs/getting_started/installation.md
@@ -1,12 +1,40 @@
 # Installation
 
-## Prerequisites
+## Quick Start
 
-The tools provided by [execution-spec-tests](https://github.com/ethereum/execution-spec-tests) use `uv` ([docs.astral.sh/uv](https://docs.astral.sh/uv/)) to manage their dependencies and virtual environment.
+=== "All platforms"
 
-It's typically recommended to use the latest version of `uv`, currently `uv>=0.7.0` is required.
+    ```console
+    git clone https://github.com/ethereum/execution-specs
+    cd execution-specs
+    curl -LsSf https://astral.sh/uv/install.sh | sh
+    uv python install 3.12
+    uv python pin 3.12
+    uv sync
+    uv tool install --exclude-newer "10 days" rust-just
+    just shell-completions
+    ```
 
-The latest version of `uv` can be installed via `curl` (recommended; can self-update via `uv self update`) or pip (requires Python, can't self-update):
+=== "macOS"
+
+    ```console
+    git clone https://github.com/ethereum/execution-specs
+    cd execution-specs
+    curl -LsSf https://astral.sh/uv/install.sh | sh
+    uv python install 3.12
+    uv python pin 3.12
+    uv sync
+    brew install just
+    just shell-completions
+    ```
+
+Further explanation, troubleshooting, and alternative installation paths are below.
+
+## Prerequisites
+
+The tools provided by [execution-specs](https://github.com/ethereum/execution-specs) use `uv` ([docs.astral.sh/uv](https://docs.astral.sh/uv/)) to manage dependencies and the virtual environment.
+
+It's recommended to use the latest version of `uv`, which can be installed via `curl` (recommended; can self-update via `uv self update`) or pip (requires Python, can't self-update):
 
 === "curl"
 
@@ -20,24 +48,78 @@ The latest version of `uv` can be installed via `curl` (recommended; can self-up
     pip install uv
     ```
 
-If installed via `curl`, `uv` will download Python for your target platform if one of the required versions (Python 3.11 or 3.12) is not available natively.
+When installed via `curl`, `uv` can also download Python for your platform if a required version (Python 3.11–3.14) is not already installed.
+
+## Installing Python and Python Dependencies
 
-## Installation Commands
+Clone @ethereum/execution-specs and install the project dependencies. Python 3.11–3.14 are supported; Python 3.12 tends to be the smoothest for local setup because pre-built wheels are available across the dependency set.
 
-Clone [execution-spec-tests](https://github.com/ethereum/execution-spec-tests) and install its dependencies. We recommend using Python 3.12, the following uses `uv` to download and configures 3.12 to be the Python version used in execution-spec-tests:
+The following commands use `uv` to install Python 3.12 and pin it for all commands run within the execution-specs directory:
 
 === "All platforms"
 
     ```console
-    git clone --depth 1 https://github.com/ethereum/execution-spec-tests
-    cd execution-spec-tests
+    git clone https://github.com/ethereum/execution-specs
+    cd execution-specs
     uv python install 3.12
     uv python pin 3.12
     uv sync
     ```
 
-Static tests/maintainers only: To learn how to build the `solc` binary from source (optional) follow [this guide](./installation_troubleshooting.md#problem-exception-failed-to-compile-yul-source).
+### Testing Your Python Environment
+
+The following command can be used to verify that the environment is set up correctly. By targeting a single test subdirectory, it generates only a small subset of test vectors:
+
+```console
+uv run fill tests/istanbul/eip1344_chainid/
+```
+
+## Installing the `just` Task Runner
+
+The @ethereum/execution-specs repository uses [`just`](https://just.systems/man/en/introduction.html) to run common tasks locally and in CI. Tasks range from static code checks to generating test vectors from the spec.
+
+@ethereum/execution-specs requires `just` 1.43+. Note that the version currently distributed in Ubuntu 24.04 is too old; many other methods are available in the [installation docs](https://just.systems/man/en/packages.html).
+
+`just` can be installed directly with `uv` from the [`rust-just` package](https://pypi.org/project/rust-just/).
+
+=== "All platforms"
+
+    ```console
+    uv tool install --exclude-newer "10 days" rust-just    
+    ```
+
+    Using `--exclude-newer` adds a cool-down window that can help reduce exposure to supply-chain attacks.
+
+=== "macOS"
+
+    ```console
+    brew install just
+    ```
+
+### Testing Your `just` Installation
+
+To explore which tasks (recipes) are available, simply run `just` within the `execution-specs` directory:
+
+```console
+just
+```
+
+Then try running the available static code checks:
+
+```console
+just static
+```
+
+### Configuring Shell Completion
+
+`just` supports tab completion for recipes. Run the following command for help on how to enable this feature for your shell:
+
+```console
+just shell-completions
+```
+
+More background is available in the [`just` documentation](https://just.systems/man/en/shell-completion-scripts.html).
 
 ## Installation Troubleshooting
 
-If you encounter issues during installation, see the [Installation Troubleshooting](./installation_troubleshooting.md) guide.
+If you run into problems, see [Installation Troubleshooting](./installation_troubleshooting.md).
diff --git a/docs/getting_started/installation_troubleshooting.md b/docs/getting_started/installation_troubleshooting.md
index d5b701ffa01..e405b385779 100644
--- a/docs/getting_started/installation_troubleshooting.md
+++ b/docs/getting_started/installation_troubleshooting.md
@@ -1,6 +1,6 @@
 # Installation Troubleshooting
 
-This page provides guidance on how to troubleshoot common issues that may arise when installing [ethereum/execution-spec-tests](https://github.com/ethereum/execution-spec-tests).
+This page provides guidance on how to troubleshoot common issues that may arise when installing [ethereum/execution-specs](https://github.com/ethereum/execution-specs).
 
 ## Problem: `Failed building wheel for coincurve`
 
@@ -77,9 +77,9 @@ This page provides guidance on how to troubleshoot common issues that may arise
     sudo apt install build-essential libboost-all-dev z3
     cmake ..
     make
-    mv $HOME/Documents/execution-spec-tests/.venv/bin/solc $HOME/Documents/execution-spec-tests/.venv/bin/solc-x86-64
-    cp ./solc/solc $HOME/Documents/execution-spec-tests/.venv/bin/
-    chmod +x $HOME/Documents/execution-spec-tests/.venv/bin/solc
+    mv $HOME/Documents/execution-specs/.venv/bin/solc $HOME/Documents/execution-specs/.venv/bin/solc-x86-64
+    cp ./solc/solc $HOME/Documents/execution-specs/.venv/bin/
+    chmod +x $HOME/Documents/execution-specs/.venv/bin/solc
     ```
     Running `uv run solc --version` should now return the expected version.
 
@@ -120,7 +120,7 @@ This page provides guidance on how to troubleshoot common issues that may arise
 ## Problem: VS Code "Autoformat on Save" with Ruff Not Working
 
 !!! danger "Problem: 'Autoformat on Save' with Ruff not working as expected in VS Code"
-    If you are using VS Code and "autoformat on save" is not working as expected, or if it produces different formatting than the official `tox -e lint` command, you may have a version mismatch with the `ruff` formatter. This problem can be confirmed if `git diff` shows changes to an otherwise unmodified file after you have saved it.
+    If you are using VS Code and "autoformat on save" is not working as expected, or if it produces different formatting than `just lint`, you may have a version mismatch with the `ruff` formatter. This problem can be confirmed if `git diff` shows changes to an otherwise unmodified file after you have saved it.
 
     This issue often occurs when VS Code is not configured to use the project's virtual environment (`.venv`) or if the linting dependencies have not been installed. In this case, VS Code's Ruff extension falls back to a bundled version of `ruff`, which may not match the version pinned in the project's `pyproject.toml` file.
 
@@ -140,7 +140,7 @@ This page provides guidance on how to troubleshoot common issues that may arise
 
 If you're facing an issue that's not listed here, you can easily report it on GitHub for resolution.
 
-[Click here to report a documentation issue related to installation](https://github.com/ethereum/execution-spec-tests/issues/new?title=docs(bug):%20unable%20to%20install%20eest%20with%20error%20...&labels=scope:docs,type:bug&body=%3Ccopy-paste%20command%20that%20triggered%20the%20issue%20here%3E%0A%3Ccopy-paste%20output%20or%20attach%20screenshot%20here%3E)
+[Click here to report a documentation issue related to installation](https://github.com/ethereum/execution-specs/issues/new?title=Setting%20up%20execution-specs%20failed%20with%20error%20...&labels=A-doc,C-bug&body=%3Ccopy-paste%20command%20that%20triggered%20the%20issue%20here%3E%0A%3Ccopy-paste%20output%20or%20attach%20screenshot%20here%3E)
 
 Please include the following details in your report:
 
diff --git a/docs/getting_started/repository_overview.md b/docs/getting_started/repository_overview.md
index ff08e51f135..260052099a2 100644
--- a/docs/getting_started/repository_overview.md
+++ b/docs/getting_started/repository_overview.md
@@ -5,41 +5,41 @@ The most relevant folders and files in the repo are:
 
 ```text
 📁 execution-specs/
-├─╴📁 tests/                     # test cases organized by fork
+├─╴📁 src/                       # EELS - the execution layer specs
+│   ├── 📁 ethereum/
+│   │    └── 📁 forks/
+│   │         ├── 📁 amsterdam/
+|   |         ├── 📁 berlin/
+│   │         └── 📁 ...
+│   └── 📁 ethereum/forks/...
+├─╴📁 tests/                     # Test cases for EELS organized by fork
 │   ├── 📁 amsterdam/
-│   ├── 📁 osaka/
-│   ├── 📁 prague/
-│   └── 📁 ...
-├─╴📁 fixtures/                  # default fixture output dir
-│   ├── 📁 blockchain_tests/
-│   ├── 📁 blockchain_tests_engine/
-│   ├── 📁 state_tests/
+│   ├── 📁 berlin/
 │   └── 📁 ...
-├─╴📁 packages/                  # library & framework packages
+├─╴📁 packages/                  # Test generation library & framework packages
 │   └── 📁 testing/
 │       └── 📁 src/
 │           └── 📁 execution_testing/
-├─╴📁 src/                       # execution spec packages
-│   ├── 📁 ethereum/
-│   └── 📁 ...
-├─╴📁 docs/                      # markdown documentation
+├─╴📁 docs/                      # Markdown documentation
 │   ├── 📁 getting_started/
-│   ├── 📁 dev/
+│   ├── 📁 writing_tests/
 │   └── 📁 ...
-└── 📄 whitelist.txt             # spellcheck dictionary
+├── 📄 Justfile                  # Task runner config, run `just` to see tasks
+├── 📄 uv.lock                   # Defines pinned project Python dependencies
+└── 📄 whitelist.txt             # Spellcheck dictionary
 ```
 
-#### `tests/`
+#### `src/`
 
-Contains the implementation of the Ethereum consensus tests available in this repository, organized by fork.
+Contains the Ethereum Execution Layer Specs, each fork is a sub-package.
 
-#### `packages/`
+#### `tests/`
 
-Contains the `execution_testing` package which provides tools to define test cases and to interface with the `evm t8n` command. Additionally, it contains packages that enable test case execution by customizing pytest which acts as the test framework.
+Contains the implementation of the Ethereum consensus tests available in this repository, organized by the fork in which the functionality was introduced.
 
-#### `src/`
+#### `packages/execution_testing/`
 
-Contains the Ethereum execution spec packages.
+Contains the `execution_testing` package which provides tools to define test cases and to interface with `t8n` command interfaces that are required to generate tests. Additionally, it contains packages that enable test case execution by customizing pytest which acts as the test framework.
 
 #### `docs/`
 
diff --git a/docs/getting_started/setup_vs_code.md b/docs/getting_started/setup_vs_code.md
deleted file mode 100644
index 3b122fc9e6b..00000000000
--- a/docs/getting_started/setup_vs_code.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# VS Code Setup
-
-VS Code setup is optional, but does offer the following advantages:
-
-- Auto-format your Python code to conform to the repository's [code standards](../writing_tests/code_standards.md) ([ruff](https://docs.astral.sh/ruff/)).
-- Inline linting and auto-completion (thanks to Python type hints).
-- Spell-check your code and docs.
-- Graphical exploration of test cases and easy test execution/debug.
-
-## Installation
-
-Please refer to the [Visual Studio Code docs](https://code.visualstudio.com/docs/setup/setup-overview) for help with installation.
-
-## VS Code Settings file
-
-The [ethereum/execution-spec-tests](https://github.com/ethereum/execution-spec-tests) repo includes configuration files for VS Code in the `.vscode/` sub-directory:
-
-```text
-📁 execution-test-specs/
-└──📁 .vscode/
-    ├── 📄 settings.json
-    ├── 📄 extensions.json
-    └── 📄 launch.recommended.json
-```
-
-By default, the repository settings are applied via `.vscode/settings.json`.
-
-To enable the recommended launch configurations (that include some useful debugging configurations), copy the recommended launch configuration file to `.vscode/launch.json`:
-
-```console
-cp .vscode/launch.recommended.json .vscode/launch.json
-```
-
-## VS Code Extension Configuration
-
-The extensions listed in `.vscode/extensions.json` are required for a smooth developer experience.
-
-1. Open the root folder of your local `execution-spec-tests` clone in VS Code, it will prompt you to install the repository's required extensions (from `.vscode/extensions.json` - you will be required to trust the `executions-spec-tests` repository first). These extensions are used to format, lint, type check and run tests on the codebase. After all the required extensions are installed a VS Code reload will be required.
-
-2. If previously installed, ensure that the following `ms-python` extensions are disabled for the `execution-spec-tests` workspace to ensure there are no conflicts with the `ruff` formatter. In the VS Code Extensions tab, search for the each of the extensions below, and if installed and enabled, open the "Disabled" menu and select "Disable (Workspace)". This ensures that the extensions will be available with other workspaces that may need them.
-
-    - [`ms-python.isort`](https://marketplace.visualstudio.com/items?itemName=ms-python.isort)
-    - [`ms-python.flake8`](https://marketplace.visualstudio.com/items?itemName=ms-python.flake8)
-    - [`ms-python.black-formatter`](https://marketplace.visualstudio.com/items?itemName=ms-python.black-formatter)
-
-    <figure markdown>
-        ![Disabling extensions for the current workspace](./img/vscode_extension_disable_for_workspace.png){width=auto align=center}
-    </figure>
-
-## Configuration for Testing EVM Features Under Active Development
-
-An additional step is required to enable fixture generations for features from forks that are under active development and have not been deployed to mainnet, see [Filling Tests for Features under Development](../filling_tests/filling_tests_dev_fork.md#vs-code-setup).
diff --git a/docs/getting_started/verifying_changes.md b/docs/getting_started/verifying_changes.md
new file mode 100644
index 00000000000..7bbe5e7d427
--- /dev/null
+++ b/docs/getting_started/verifying_changes.md
@@ -0,0 +1,91 @@
+# Verifying Changes
+
+**TL;DR:** Run `just static` before every PR, preferably before every commit. Optionally, run the extra checks from the table below that match what you changed.
+
+## Before You Open a PR
+
+Run `just` to see all available recipes grouped by category. The checks that CI runs are defined in [`.github/workflows/test.yaml`](https://github.com/ethereum/execution-specs/blob/a830dab6f130151ab9023a473b7543120aa21961/.github/workflows/test.yaml) and [`.github/workflows/benchmark.yaml`](https://github.com/ethereum/execution-specs/blob/a830dab6f130151ab9023a473b7543120aa21961/.github/workflows/benchmark.yaml); these files are the source of truth.
+
+Some CI jobs are slow. Only run the checks relevant to your change.
+
+| Change type                                       | Run                                                                    | Comment                                                                                                |
+| ------------------------------------------------- | ---------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------ |
+| Any PR (baseline)                                 | `just static`                                                          | Lint, format, mypy, spellcheck, import isolation, workflow lint.                                       |
+| Added or modified tests                           | `just fill tests/path/to/new/tests`                                    | See [Filling Tests](../filling_tests/index.md).                                                        |
+| Framework changes (`packages/testing/`)           | `just test-tests`                                                      | Framework unit tests. Mirrors the `test-tests` CI job.                                                 |
+| Benchmark framework changes                       | `just test-tests-bench`, `just bench-gas`, `just bench-opcode`, `just bench-opcode-config` | Benchmark unit tests and sanity checks. Mirrors the benchmark CI workflow.                             |
+| Markdown touched                                  | `just lint-md`                                                         | Requires `markdownlint-cli2`; see [Linting Markdown](#linting-markdown).                               |
+| Docs touched                                      | `just docs` or `just docs-fast`                                        | `docs-fast` skips the Test Case Reference section for faster iteration.                                |
+
+## `just fix` and `just static`
+
+`just static` is the baseline check for every PR. It runs spellcheck, lint, format check, mypy, EELS import isolation, and workflow linting.
+
+`just fix` auto-applies formatting and the safe subset of `ruff` lint fixes. Run it first to clear anything mechanically fixable, then run `just static` to see what's left.
+
+```console
+just fix      # Auto-fix formatting and safe ruff lint rules.
+just static   # Run all static checks.
+```
+
+## Filling New or Changed Tests
+
+For PRs that add or modify tests, confirm the new or changed tests fill successfully:
+
+```console
+just fill tests/path/to/new/tests
+```
+
+Pass `--from <Fork>` and `--until <Fork>` to limit the fork range, mirroring the CI matrix. See [Filling Tests](../filling_tests/index.md) for the full `fill` reference.
+
+## Linting Markdown
+
+For PRs that touch markdown, run:
+
+```console
+just lint-md
+```
+
+### Additional Dependencies for `markdownlint`
+
+We use `markdownlint-cli2` to lint documentation markdown files. This is an external (non-Python) package that must be installed separately:
+
+```console
+sudo apt install nodejs
+sudo npm install -g markdownlint-cli2@0.17.2  # The version used in CI.
+```
+
+Or use a specific node version via `nvm`.
+
+## Verifying Test Fixture Changes
+
+When writing a PR that modifies either the framework or test cases, verify that changes don't cause issues with existing test cases.
+
+All filled fixtures contain a `hash` field in the `_info` object, which is used to verify that the fixture hasn't changed.
+
+### Using the Hasher Tool
+
+The `hasher` command can be used to bulk-verify the hashes of fixtures in a directory.
+
+| Flag             | Description                                                       |
+| ---------------- | ----------------------------------------------------------------- |
+| `--files` / `-f` | Prints a combined hash per JSON fixture file.                     |
+| `--tests` / `-t` | Prints the hash of every test vector in JSON fixture files.       |
+| `--root` / `-r`  | Prints a combined hash for all JSON fixture files in a directory. |
+
+#### The `compare` Subcommand
+
+The `hasher compare` subcommand directly compares two fixture directories
+and shows only the differences:
+
+```console
+uv run hasher compare fixtures/ fixtures_new/
+```
+
+| Flag                | Description                                               |
+| ------------------- | --------------------------------------------------------- |
+| `--depth N` / `-d`  | Limit to N levels (0=root, 1=folders, 2=files, 3=tests).  |
+| `--files` / `-f`    | Show differences at file level.                           |
+| `--tests` / `-t`    | Show differences at individual test level.                |
+| `--root` / `-r`     | Show only the root-level hash difference.                 |
+| `--ignore-missing`  | Hide entries that exist in only one directory.            |
diff --git a/docs/hooks/reference_new_tab.py b/docs/hooks/reference_new_tab.py
new file mode 100644
index 00000000000..97937b0be4b
--- /dev/null
+++ b/docs/hooks/reference_new_tab.py
@@ -0,0 +1,34 @@
+"""
+Add `target="_blank"` to links pointing at the `docc`-rendered reference.
+
+Without this, Material's `navigation.instant` intercepts clicks and tries to
+XHR-swap the target page into the current DOM, which fails silently because
+`docc`'s HTML does not match Material's template markers: the URL and title
+update but the body stays on the original page. `target="_blank"` makes
+instant-nav opt out and forces a full-page load, matching the home page card
+that already sets the attribute via `attr_list`.
+
+Matches every relative href form mkdocs emits for the reference page across
+page depths (e.g., `reference/`, `../reference/`, `specs/reference/`,
+`../../specs/reference/`). The trailing slash after `reference` prevents
+matching unrelated paths like `reference_specification/`.
+"""
+
+import re
+
+_A_TAG_REF = re.compile(
+    r'<a\s+([^>]*?href="(?:\.\./)*(?:specs/)?reference/(?:index\.html)?"[^>]*?)>'
+)
+
+
+def _rewrite(match: "re.Match[str]") -> str:
+    attrs = match.group(1)
+    if "target=" in attrs:
+        return match.group(0)
+    return f'<a {attrs} target="_blank" rel="noopener">'
+
+
+def on_post_page(output: str, page, config) -> str:
+    """Rewrite anchor tags pointing at the reference to open in a new tab."""
+    del page, config
+    return _A_TAG_REF.sub(_rewrite, output)
diff --git a/docs/img/annotated-coverage.jpg b/docs/img/annotated-coverage.jpg
deleted file mode 100644
index ef4a403ec34..00000000000
Binary files a/docs/img/annotated-coverage.jpg and /dev/null differ
diff --git a/docs/img/eth-diamond-orange.svg b/docs/img/eth-diamond-orange.svg
new file mode 100644
index 00000000000..38dd423c9da
--- /dev/null
+++ b/docs/img/eth-diamond-orange.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 1920 1920" viewBox="420 80.6 1079.9 1758.8" fill="#ff5722"><path d="m959.8 730.9-539.8 245.4 539.8 319.1 539.9-319.1z" opacity=".6"/><path d="m420.2 976.3 539.8 319.1v-564.5-650.3z" opacity=".45"/><path d="m960 80.6v650.3 564.5l539.8-319.1z" opacity=".8"/><path d="m420 1078.7 539.8 760.7v-441.8z" opacity=".45"/><path d="m959.8 1397.6v441.8l540.2-760.7z" opacity=".8"/></svg>
diff --git a/docs/img/eth-diamond-white.png b/docs/img/eth-diamond-white.png
new file mode 100644
index 00000000000..aad9c9deebc
Binary files /dev/null and b/docs/img/eth-diamond-white.png differ
diff --git a/docs/img/eth-diamond-white.svg b/docs/img/eth-diamond-white.svg
new file mode 100644
index 00000000000..8d82be22886
--- /dev/null
+++ b/docs/img/eth-diamond-white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 1920 1920" viewBox="420 80.6 1079.9 1758.8" fill="#ffffff"><path d="m959.8 730.9-539.8 245.4 539.8 319.1 539.9-319.1z" opacity=".6"/><path d="m420.2 976.3 539.8 319.1v-564.5-650.3z" opacity=".45"/><path d="m960 80.6v650.3 564.5l539.8-319.1z" opacity=".8"/><path d="m420 1078.7 539.8 760.7v-441.8z" opacity=".45"/><path d="m959.8 1397.6v441.8l540.2-760.7z" opacity=".8"/></svg>
diff --git a/docs/img/favicon.ico b/docs/img/favicon.ico
deleted file mode 100644
index feffde6a690..00000000000
--- a/docs/img/favicon.ico
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 29.1 50" style="enable-background:new 0 0 29.1 50;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#0DAFD2;}
-	.st1{fill:#667BBC;}
-	.st2{fill:#9E69AC;}
-	.st3{fill:#F58B77;}
-	.st4{fill:#FCEB67;}
-	.st5{fill:#54BC7A;}
-</style>
-<polygon class="st0" points="14.6,37.6 14.6,49.5 0,28.3 "/>
-<polygon class="st1" points="29.1,28.3 14.6,49.5 14.6,37.6 "/>
-<polygon class="st2" points="29.1,25.3 14.6,17 14.6,34.6 "/>
-<polygon class="st3" points="29.1,25.3 14.6,0 14.6,17 "/>
-<polygon class="st4" points="14.6,0 14.6,17 0,25.3 "/>
-<polygon class="st5" points="14.6,17 14.6,34.6 0,25.3 "/>
-</svg>
diff --git a/docs/img/original-coverage-loss.png b/docs/img/original-coverage-loss.png
deleted file mode 100644
index 5fead1bc1e2..00000000000
Binary files a/docs/img/original-coverage-loss.png and /dev/null differ
diff --git a/docs/index.md b/docs/index.md
index 4edbe01b4dc..c16b008cb7f 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,78 +1,74 @@
-# Execution Spec Tests
+# Ethereum Execution Layer Specifications
 
-<figure markdown>  <!-- markdownlint-disable MD033 (MD033=no-inline-html) -->
-  ![Execution Spec Tests Logo](img/execution_spec_tests.jpg)
-</figure>
+Welcome to the documentation for the Ethereum Execution Layer Specifications (EELS), the executable Python specification of Ethereum’s Execution Layer.
 
-@ethereum/execution-spec-tests is both a collection of test cases and a framework in Python to generate tests for Ethereum execution clients.
+EELS is implemented as a readable executable reference in Python that serves as a source of truth for developers across the Ethereum ecosystem and underpins the generation of test vectors used to ensure Execution Layer client implementations are spec-compliant.
 
-The framework collects and executes the test cases in order to generate _test fixtures_ (JSON) which can be consumed by any execution client to verify their implementation of [ethereum/execution-specs](https://github.com/ethereum/execution-specs). The fixtures, which define state transition and block tests, are generated by the framework using one of the `t8n` command-line tools that are provided by most execution clients, see below for an overview of the supported `t8n` tools.
+EELS is a collaborative effort between Ethereum Improvement Proposals (EIP) authors, protocol researchers, prototype implementers and client developers, maintained in @ethereum/execution-specs by the [STEEL Team](https://steel.ethereum.foundation/).
 
-```mermaid
----
-title: Test Fixture Generation with execution-spec-tests
----
-flowchart LR
-  style C stroke:#333,stroke-width:2px
-  style D stroke:#333,stroke-width:2px
-  style G stroke:#F9A825,stroke-width:2px
-  style H stroke:#F9A825,stroke-width:2px
-  
-  subgraph ethereum/go-ethereum
-    C[<code>evm t8n</code><br/>external executable]
-  end
+## Where to Start
 
-  subgraph ethereum/solidity
-    D[<code>solc</code><br/>external executable]
-  end
+<div class="grid cards" markdown>
 
-  subgraph ethereum/EIPs
-    E(<code>EIPS/EIP-*.md</code><br/>SHA digest via Github API)
-  end
+- :material-download-outline: **Getting Started**
 
-  subgraph "ethereum/execution-spec-tests"
-    A(<code>./tests/**/*.py</code><br/>Python Test Cases)
-    B([<code>$ fill ./tests/</code><br/>Python Framework])
-  end
+    ---
 
-  subgraph Test Fixture Consumers
-    subgraph ethereum/hive
-      G([<code>$ hive ...</code><br/>Go Test Framework])
-    end
-    H([Client executables])
-  end
+    Install the repository and run your first command.
 
-  C <-.-> B  
-  D <-.-> B
-  A --> B
-  E <-.-> |retrieve latest spec version\ncheck tested spec version| B
-  B -->|output| F(<code>./fixtures/**/*.json</code>\nJSON Test Fixtures)
-  F -->|input| G
-  F -->|input| H
-```
+    *First time user.*
 
-The generated test fixtures can be used:
+    [:octicons-arrow-right-24: Installation](getting_started/installation.md)
 
-1. Directly by client teams' test frameworks, and,
-2. In the integration tests executed in the @ethereum/hive framework.
+- :material-file-code-outline: **Writing Specs**
 
-More information on how to use and download the [released test fixtures](https://github.com/ethereum/execution-spec-tests/releases) can be found in the [running tests guide](running_tests/index.md).
+    ---
 
-## Relationship to ethereum/tests
+    Implement an EIP as an executable Python specification.
 
-This collection of tests is relatively new (test case development started Q4, 2022) and mainly targets recent and upcoming Ethereum specification changes. It does not replace, but rather complements the existing tests in [ethereum/tests](https://github.com/ethereum/tests).
+    *For EIP authors and researchers.*
 
-## Motivation
+    [:octicons-arrow-right-24: Get started](specs/writing_specs.md)
 
-The motivation to implement test cases in [ethereum/execution-spec-tests](https://github.com/ethereum/execution-spec-tests) is:
+- :material-test-tube: **Writing Tests**
 
-1. To implement test cases as code and ensure that changes, due to spec changes, for example, can be easily made. Moreover, changes are easily understandable and available in version control.
-2. To avoid the 2-step approach often used in [ethereum/tests](https://github.com/ethereum/tests):
-    1. Code (often unavailable) -> Test case (YAML).
-    2. Test case (YAML) -> Fixtures (JSON).
+    ---
 
-!!! success "Contributing"
-    Contributions via [PR](https://github.com/ethereum/execution-spec-tests/pulls) are welcome!
+    Write test cases that verify EIP implementations across clients.
+
+    *For EIP authors and test devs.*
+
+    [:octicons-arrow-right-24: Get started](writing_tests/index.md)
+
+- :material-play-circle-outline: **Running Tests**
+
+    ---
+
+    Generate JSON fixtures or run tests against an execution layer client.
+
+    *For client developers.*
+
+    [:octicons-arrow-right-24: Overview](running_tests/index.md)
+
+- :material-book-open-variant: **Read the Specs**
+
+    ---
+
+    Browse the rendered Python specifications for the current fork and EIP.
+
+    [:octicons-arrow-right-24: Reference ↗](specs/reference/index.md){target=_blank rel=noopener}
+
+- :material-format-list-checks: **Test Case Reference**
+
+    ---
+
+    Browse all test cases organized by fork and EIP.
+
+    [:octicons-arrow-right-24: Browse tests](tests/index.md)
+
+</div>
+
+## Responsible Disclosure of Vulnerabilities
 
 !!! bug "Reporting a Vulnerability"
 
diff --git a/docs/library/cli/index.md b/docs/library/cli/index.md
index 4231719a442..a3a65c5a92c 100644
--- a/docs/library/cli/index.md
+++ b/docs/library/cli/index.md
@@ -1,6 +1,6 @@
 # EEST CLI Tools
 
 - [`check_eip_versions`](../../writing_tests/reference_specification.md) - A CLI tool to check the SHA values specified in EIP tests match the latest version from ethereum/EIPs.
-- [`eest`](eest.md) - A CLI tool that helps with routine tasks in ethereum/execution-spec-tests.
+- [`eest`](eest.md) - A CLI tool that helps with routine tasks in ethereum/execution-specs.
 - [`evm_bytes`](evm_bytes.md) - Convert the given EVM bytes from a binary file or a hex string to EEST's python opcodes.
 - [`extract_config`](extract_config.md) - Extract client configuration files (chainspec/genesis.json) from Ethereum clients via Hive.
diff --git a/docs/navigation.md b/docs/navigation.md
index 002b2b94aa5..20bf2f8cd3b 100644
--- a/docs/navigation.md
+++ b/docs/navigation.md
@@ -3,86 +3,86 @@
   * [Home](index.md)
   * Getting Started
       * [Installation](getting_started/installation.md)
-      * [Installation Troubleshooting](getting_started/installation_troubleshooting.md)
       * [Contributing](getting_started/contributing.md)
-      * [Security Policy](getting_started/security.md)
       * [Code Standards](getting_started/code_standards.md)
-      * [Detailed Code Standards](getting_started/code_standards_details.md)
-      * [VS Code Setup](getting_started/setup_vs_code.md)
+      * [Verifying Changes](getting_started/verifying_changes.md)
       * [Repository Overview](getting_started/repository_overview.md)
+      * [Security Policy](getting_started/security.md)
+      * [Installation Troubleshooting](getting_started/installation_troubleshooting.md)
       * [Getting Help](getting_started/getting_help.md)
-  * [Writing Tests](writing_tests/index.md)
-      * [Adding a New Test](writing_tests/adding_a_new_test.md)
-      * [Types of Test](writing_tests/types_of_tests.md)
-      * [Writing a New Test](writing_tests/writing_a_new_test.md)
-      * [Benchmarks](writing_tests/benchmarks.md)
-      * [Test Markers](writing_tests/test_markers.md)
-      * [Verifying Changes Locally](writing_tests/verifying_changes.md)
-      * [Code Standards](writing_tests/code_standards.md)
-      * [Exception Tests](writing_tests/exception_tests.md)
-      * [Using and Extending Fork Methods](writing_tests/fork_methods.md)
-      * [Gas Optimization](writing_tests/gas_optimization.md)
-      * [Referencing an EIP Spec Version](writing_tests/reference_specification.md)
-      * [EIP Checklist Generation](writing_tests/eip_checklist.md)
-      * [Testing Checklist Templates](writing_tests/checklist_templates/index.md)
-          * [EIP Execution Layer Testing Checklist Template](writing_tests/checklist_templates/eip_testing_checklist_template.md)
-      * [Post-mortems](writing_tests/post_mortems.md)
-      * Tutorials
-          * [Adding a State Test](writing_tests/tutorials/state_transition.md)
-          * [Adding a Blockchain Test](writing_tests/tutorials/blockchain.md)
-      * [Opcode Metadata](writing_tests/opcode_metadata.md)
-      * [Porting Legacy Tests](writing_tests/porting_legacy_tests.md)
-  * [Filling Tests](filling_tests/index.md)
-      * [Getting Started](filling_tests/getting_started.md)
-      * [Filling Tests at a Prompt](filling_tests/filling_tests_command_line.md)
-      * [Fill Command-Line Options](filling_tests/filling_tests_command_line_options.md)
-      * [Filling Tests in VS Code](filling_tests/filling_tests_vs_code.md)
-      * [Filling Tests for Features Under Development](filling_tests/filling_tests_dev_fork.md)
-      * [An Explanation of Test IDs](filling_tests/test_ids.md)
-      * [Transition Tool Support](filling_tests/transition_tool_support.md)
-      * [Debugging Transition Tools](filling_tests/debugging_t8n_tools.md)
-  * [Running Tests](running_tests/index.md)
-      * [Methods of Running Tests](running_tests/running.md)
-      * [EEST Fixture Releases](running_tests/releases.md)
-      * [Fuzzer Bridge](writing_tests/fuzzer_bridge.md)
-      * [Test Fixture Specifications](running_tests/test_formats/index.md)
-          * [State Tests](running_tests/test_formats/state_test.md)
-          * [Blockchain Tests](running_tests/test_formats/blockchain_test.md)
-          * [Blockchain Engine Tests](running_tests/test_formats/blockchain_test_engine.md)
-          * [Blockchain Engine X Tests](running_tests/test_formats/blockchain_test_engine_x.md)
-          * [Transaction Tests](running_tests/test_formats/transaction_test.md)
-          * [Blockchain Sync Tests](running_tests/test_formats/blockchain_test_sync.md)
-          * [Common Types](running_tests/test_formats/common_types.md)
-          * [Exceptions](running_tests/test_formats/exceptions.md)
-      * [Hive](running_tests/hive/index.md)
-          * [Client Configuration](running_tests/hive/client_config.md)
-          * [Common Options](running_tests/hive/common_options.md)
-          * [Development Mode](running_tests/hive/dev_mode.md)
-          * [Viewing Results](running_tests/hive/hiveview.md)
-          * [CI Integration](running_tests/hive/ci_integration.md)
-      * [Consume Commands](running_tests/consume/index.md)
-          * [Consume Cache & Fixture Inputs](running_tests/consume/cache.md)
-          * [Consume Direct](running_tests/consume/direct.md)
-          * [Consume Simulators](running_tests/consume/simulators.md)
-          * [Exception Tests](running_tests/consume/exceptions.md)
-      * [Execute Commands](./running_tests/execute/index.md)
-          * [Execute Hive](./running_tests/execute/hive.md)
-          * [Execute Remote](./running_tests/execute/remote.md)
-          * [Execute Eth Config](./running_tests/execute/eth_config.md)
-          * [Transaction Metadata](./running_tests/execute/transaction_metadata.md)
-      * [Useful Pytest Options](running_tests/useful_pytest_options.md)
+  * [Specifications](specs/index.md)
+      * [Reference ↗](specs/reference/index.md)
+      * [Writing Specs](specs/writing_specs.md)
+      * [Adding a New EIP](specs/adding_a_new_eip.md)
+      * [Spec Releases](specs/spec_releases.md)
+      * [Protocol History](specs/protocol_history.md)
+  * [Consensus Tests](consensus_tests/index.md)
+      * [Writing Tests](writing_tests/index.md)
+          * [Adding a New Test](writing_tests/adding_a_new_test.md)
+          * [Types of Test](writing_tests/types_of_tests.md)
+          * [Writing a New Test](writing_tests/writing_a_new_test.md)
+          * [Benchmarks](writing_tests/benchmarks.md)
+          * [Test Markers](writing_tests/test_markers.md)
+          * [Exception Tests](writing_tests/exception_tests.md)
+          * [Using and Extending Fork Methods](writing_tests/fork_methods.md)
+          * [Gas Optimization](writing_tests/gas_optimization.md)
+          * [Referencing an EIP Spec Version](writing_tests/reference_specification.md)
+          * [EIP Checklist Generation](writing_tests/eip_checklist.md)
+          * [Testing Checklist Templates](writing_tests/checklist_templates/index.md)
+              * [EIP Execution Layer Testing Checklist Template](writing_tests/checklist_templates/eip_testing_checklist_template.md)
+          * [Post-mortems](writing_tests/post_mortems.md)
+          * Tutorials
+              * [Adding a State Test](writing_tests/tutorials/state_transition.md)
+              * [Adding a Blockchain Test](writing_tests/tutorials/blockchain.md)
+          * [Opcode Metadata](writing_tests/opcode_metadata.md)
+      * [Filling Tests](filling_tests/index.md)
+          * [Getting Started](filling_tests/getting_started.md)
+          * [Filling Tests at a Prompt](filling_tests/filling_tests_command_line.md)
+          * [Fill Command-Line Options](filling_tests/filling_tests_command_line_options.md)
+          * [Filling Tests for Features Under Development](filling_tests/filling_tests_dev_fork.md)
+          * [An Explanation of Test IDs](filling_tests/test_ids.md)
+          * [Transition Tool Support](filling_tests/transition_tool_support.md)
+          * [Debugging Transition Tools](filling_tests/debugging_t8n_tools.md)
+          * [Filling Stateful Benchmark Fixtures](filling_tests/fill_stateful.md)
+      * [Running Tests](running_tests/index.md)
+          * [Methods of Running Tests](running_tests/running.md)
+          * [EEST Fixture Releases](running_tests/releases.md)
+          * [Fuzzer Bridge](writing_tests/fuzzer_bridge.md)
+          * [Test Fixture Specifications](running_tests/test_formats/index.md)
+              * [State Tests](running_tests/test_formats/state_test.md)
+              * [Blockchain Tests](running_tests/test_formats/blockchain_test.md)
+              * [Blockchain Engine Tests](running_tests/test_formats/blockchain_test_engine.md)
+              * [Blockchain Engine X Tests](running_tests/test_formats/blockchain_test_engine_x.md)
+              * [Transaction Tests](running_tests/test_formats/transaction_test.md)
+              * [Blockchain Sync Tests](running_tests/test_formats/blockchain_test_sync.md)
+              * [Common Types](running_tests/test_formats/common_types.md)
+              * [Exceptions](running_tests/test_formats/exceptions.md)
+          * [Hive](running_tests/hive/index.md)
+              * [Client Configuration](running_tests/hive/client_config.md)
+              * [Common Options](running_tests/hive/common_options.md)
+              * [Development Mode](running_tests/hive/dev_mode.md)
+              * [Viewing Results](running_tests/hive/hiveview.md)
+              * [CI Integration](running_tests/hive/ci_integration.md)
+          * [Consume Commands](running_tests/consume/index.md)
+              * [Consume Cache & Fixture Inputs](running_tests/consume/cache.md)
+              * [Consume Direct](running_tests/consume/direct.md)
+              * [Consume Simulators](running_tests/consume/simulators.md)
+              * [Exception Tests](running_tests/consume/exceptions.md)
+          * [Execute Commands](./running_tests/execute/index.md)
+              * [Execute Hive](./running_tests/execute/hive.md)
+              * [Execute Remote](./running_tests/execute/remote.md)
+              * [Execute Eth Config](./running_tests/execute/eth_config.md)
+              * [Transaction Metadata](./running_tests/execute/transaction_metadata.md)
+          * [Useful Pytest Options](running_tests/useful_pytest_options.md)
   * [Developer Doc](dev/index.md)
       * [Managing Configurations](dev/configurations.md)
       * [Interactive Library Usage](dev/interactive_usage.md)
       * [Generating Documentation](dev/docs.md)
       * [Documenting CLI Commands](dev/documenting_clis.md)
-      * [Coding Style](dev/coding_style.md)
       * [Logging](dev/logging.md)
-      * [Enabling Precommit Checks](dev/precommit.md)
       * [Running Github Actions Locally](dev/test_actions_locally.md)
       * [Dependencies and Packaging](dev/deps_and_packaging.md)
-  * [Changelog](CHANGELOG.md)
-      * [Changelog Section Template](changelog_section_template.md)
+      * [Releasing](dev/releasing.md)
   * [Library Reference](library/index.md)
       * [EEST CLI Tools](library/cli/index.md)
           * [eest](library/cli/eest.md)
diff --git a/docs/running_tests/consume/cache.md b/docs/running_tests/consume/cache.md
index 8d47d22a573..c0a054bed7b 100644
--- a/docs/running_tests/consume/cache.md
+++ b/docs/running_tests/consume/cache.md
@@ -10,7 +10,7 @@ All `consume` subcommands have an `--input` argument, which implements the same
 
 ## Example: Two-liner to Download the Latest Fixture Release
 
-Releases can be downloaded using EEST tooling without (manually) cloning and installing the @ethereum/execution-spec-tests tools as following:
+Releases can be downloaded using EEST tooling without (manually) cloning and installing the @ethereum/execution-specs tools as following:
 
 1. Install `uv` (a fast, rust-based Python package manager):
 
@@ -21,22 +21,20 @@ Releases can be downloaded using EEST tooling without (manually) cloning and ins
 2. Run EEST's `consume cache` command via `uv` and request the latest ["stable" fixture release](../releases.md):
 
     ```console
-    uvx --from git+https://github.com/ethereum/execution-spec-tests \
+    uvx --from "git+https://github.com/ethereum/execution-specs.git#subdirectory=packages/testing" \
         consume cache --input=stable@latest
     ```
 
+    <!-- TODO: Re-capture this example output from the new repo; the command works but the transcript still shows the legacy repo identity. -->
     Expected output, as of `v4.5.0`:
 
     ```console
-    Updated https://github.com/ethereum/execution-spec-tests (8c3cbd7a4eef3967abd78db32ee45ef8f7cf8271)
-    Updated https://github.com/petertdavies/ethereum-spec-evm-resolver (623ac4565025e72b65f45b926da2a3552041b469)
-    Built ethereum-execution-spec-tests @ git+https://github.com/ethereum/execution-spec-tests@8c3cbd7a4eef3967abd78db32ee45ef8f7cf8271
-
-    Installed 69 packages in 10ms
-    Exit: Fixtures downloaded and cached.
-    Path: /home/dtopz/.cache/ethereum-execution-spec-tests/cached_downloads/ethereum/execution-spec-tests/v4.5.0/fixtures_stable/fixtures
-    Input: https://github.com/ethereum/execution-spec-tests/releases/download/v4.5.0/fixtures_stable.tar.gz
-    Release page: https://github.com/ethereum/execution-spec-tests/releases/tag/v4.5.0
+    Built ethereum-execution-testing @ git+https://github.com/ethereum/execution-specs.git@a48e0b381d5225a6c3de2d06cd9ee7ae0b6ca9bb#subdirectory=packages/testing
+    Installed 70 packages in 15ms
+
+    Path: /home/dtopz/.cache/ethereum-execution-spec-tests/cached_downloads/ethereum/execution-spec-tests/v5.4.0/fixtures_stable/fixtures
+    Input: https://github.com/ethereum/execution-spec-tests/releases/download/v5.4.0/fixtures_stable.tar.gz
+    Release page: https://github.com/ethereum/execution-spec-tests/releases/tag/v5.4.0
     ```
 
     **Note:** Use direct URLs to avoid GitHub API calls (better for CI environments). Version specifiers like `stable@latest` will always use the GitHub API to resolve versions. More details on the arguments to `--input` are provided below.
diff --git a/docs/running_tests/consume/simulators.md b/docs/running_tests/consume/simulators.md
index f8b88306785..f38fbe476c8 100644
--- a/docs/running_tests/consume/simulators.md
+++ b/docs/running_tests/consume/simulators.md
@@ -14,3 +14,7 @@ uv run consume <engine|rlp> [OPTIONS]
 - Help [setting up](../hive/index.md) and [starting Hive in dev mode](../hive/dev_mode.md).
 - For an explanation of how the `consume` simulators work, see the [Engine](../running.md#engine) and [RLP](../running.md#rlp) sections in [Running Tests](../running.md).
 - Help for relevant options can be found in [Consume Cache and Fixture Inputs](./cache.md) and [Useful Pytest Options](../useful_pytest_options.md).
+
+## Related: Block Building
+
+A separate hive simulator [`build-block`](../running.md#block-building) is also fixture-driven but tests the client's **producer-side** path via the `testing_buildBlockV1` engine-API testing-namespace endpoint, rather than the consumer-side import path that the simulators above exercise.
diff --git a/docs/running_tests/execute/eth_config.md b/docs/running_tests/execute/eth_config.md
index 737171b1f7e..db7d194b8c5 100644
--- a/docs/running_tests/execute/eth_config.md
+++ b/docs/running_tests/execute/eth_config.md
@@ -18,13 +18,13 @@ This command verifies that a client is correctly configured for a specific netwo
 
 ### Standalone, Direct Usage
 
-The `eth-config` sub-command can be ran directly, without cloning @ethereum/execution-spec-tests, by [installing uv](https://docs.astral.sh/uv/getting-started/installation/) and running:
+The `eth-config` sub-command can be ran directly, without cloning @ethereum/execution-specs, by [installing uv](https://docs.astral.sh/uv/getting-started/installation/) and running:
 
 ```bash
-uv run --with git+https://github.com/ethereum/execution-spec-tests.git execute eth-config --network Mainnet --rpc-endpoint http://<ETH_RPC_ENDPOINT>
+uv run --with "git+https://github.com/ethereum/execution-specs.git#subdirectory=packages/testing" execute eth-config --network Mainnet --rpc-endpoint http://<ETH_RPC_ENDPOINT>
 ```
 
-### From within the EEST Repository
+### From within the `execution-specs` Repository
 
 ```bash
 uv run execute eth-config --network <NETWORK_NAME> --rpc-endpoint <RPC_URL> [OPTIONS]
diff --git a/docs/running_tests/execute/index.md b/docs/running_tests/execute/index.md
index 3aba6d9f7fd..6c13b2ad389 100644
--- a/docs/running_tests/execute/index.md
+++ b/docs/running_tests/execute/index.md
@@ -1,6 +1,6 @@
 # Executing Tests on Local Networks or Hive
 
-@ethereum/execution-spec-tests is capable of running tests on local networks or on Hive with a few considerations. The `execute` command runs test cases directly from the Python source (without the use of JSON fixtures).
+@ethereum/execution-specs is capable of running tests on local networks or on Hive with a few considerations. The `execute` command runs test cases directly from the Python source (without the use of JSON fixtures).
 
 See:
 
diff --git a/docs/running_tests/releases.md b/docs/running_tests/releases.md
index 0aa18d41e04..9907c64a81c 100644
--- a/docs/running_tests/releases.md
+++ b/docs/running_tests/releases.md
@@ -2,7 +2,7 @@
 
 ## Formats and Release Layout
 
-@ethereum/execution-spec-tests releases contain JSON test fixtures in various formats. Note that transaction type tests are executed directly from Python source using the [`execute`](./execute/index.md) command.
+@ethereum/execution-specs releases contain JSON test fixtures in various formats. Note that transaction type tests are executed directly from Python source using the [`execute`](./execute/index.md) command.
 
 | Format                                                               | Consumed by the client                                                                                                                                                                                                                                                                    | Location in `.tar.gz` release                                       |
 | -------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------- |
@@ -91,7 +91,7 @@ Please see below for an explanation of the optional `<pre_release_name>` that is
 
 ### Standard Releases
 
-Releases are published on the @ethereum/execution-spec-tests [releases](https://github.com/ethereum/execution-spec-tests/releases) page. Standard releases are tagged using the format `vX.Y.Z` (they don't have a `<pre_release_name>`).
+Releases are published on the @ethereum/execution-specs [releases](https://github.com/ethereum/execution-specs/releases) page. Standard releases are tagged using the format `vX.Y.Z` (they don't have a `<pre_release_name>`).
 
 For standard releases, two tarballs are available:
 
@@ -102,20 +102,19 @@ For standard releases, two tarballs are available:
 
 I.e., `fixtures_develop` are a superset of `fixtures_stable`.
 
-!!! tip "Generating tarballs directly via `--output` includes all fixture formats"
-    When generating fixtures for release, specifying tarball output automatically enables all fixture formats:
+!!! tip "Release features opt into all fixture formats via `feature.yaml`"
+    Tarball output (`.tar.gz`) does not by itself include the pre-allocation group formats (`BlockchainEngineXFixture`, `BlockchainEngineStatefulFixture`). A release feature requests them by adding `--generate-all-formats` to its `fill-params` in `.github/configs/feature.yaml`:
     ```console
-    # Automatically enables --generate-all-formats due to .tar.gz output
-    uv run fill --output=fixtures_stable.tar.gz tests/
+    uv run fill --generate-all-formats --output=fixtures_stable.tar.gz tests/
     ```
-    This ensures that all fixture formats are included in the tarball release.
 
 ### Pre-Release and Devnet Releases
 
-Intermediate releases that target specific subsets of features or tests under active development are published at @ethereum/execution-spec-tests [releases](https://github.com/ethereum/execution-spec-tests/releases).
+Intermediate releases that target specific subsets of features or tests under active development are published at @ethereum/execution-specs [releases](https://github.com/ethereum/execution-specs/releases).
 
 These releases are tagged using the format `<pre_release_name>@vX.Y.Z`.
 
+<!-- TODO: These example tags live in the legacy @ethereum/execution-spec-tests repo; replace with current @ethereum/execution-specs examples once available. -->
 Examples:
 
 - [`fusaka-devnet-1@v1.0.0`](https://github.com/ethereum/execution-spec-tests/releases/tag/fusaka-devnet-1%40v1.0.0) - this fixture release contains tests adhering to the [Fusaka Devnet 1 spec](https://notes.ethereum.org/@ethpandaops/fusaka-devnet-1).
diff --git a/docs/running_tests/running.md b/docs/running_tests/running.md
index d09a1b3003c..d5278726ca4 100644
--- a/docs/running_tests/running.md
+++ b/docs/running_tests/running.md
@@ -17,6 +17,7 @@ Both `consume` and `execute` provide sub-commands which correspond to different
 | [`consume enginex`](#enginex)           | Client imports blocks via Engine API in Hive, optimized by client reuse            | EVM, block processing, Engine API                            | Staging, Hive | System test                       |
 | [`consume sync`](#sync)                 | Client syncs from another client using Engine API in Hive                               | EVM, block processing, Engine API, P2P sync                  | Staging, Hive | System test                       |
 | [`consume rlp`](#rlp)                   | Client imports RLP-encoded blocks upon start-up in Hive                                 | EVM, block processing, RLP import (sync\*)                   | Staging, Hive | System test                       |
+| [`build-block`](#block-building)        | Client builds blocks via `testing_buildBlockV1` in Hive, validated against fixture       | EVM, block production, Engine API (testing namespace)        | Staging, Hive | System test                       |
 | [`execute hive`](./execute/hive.md)     | Tests executed against a client via JSON RPC `eth_sendRawTransaction` in Hive           | EVM, JSON RPC, mempool                                       | Staging, Hive | System test                       |
 | [`execute remote`](./execute/remote.md) | Tests executed against a client via JSON RPC `eth_sendRawTransaction` on a live network | EVM, JSON RPC, mempool, EL-EL/EL-CL interaction (indirectly) | Production    | System Test                       |
 
@@ -144,6 +145,28 @@ The `consume sync` command:
 5. **Monitors sync progress** and validates that the sync client reaches the same state.
 6. **Verifies final state** matches between both clients.
 
+## Block Building
+
+| Nomenclature   |                          |
+| -------------- | ------------------------ |
+| Command        | `build-block`            |
+| Simulator      | `eels/build-block`       |
+| Fixture format | `blockchain_test_engine` |
+
+The block-building method tests the **producer-side** of an execution client: rather than asking the client to validate and import a pre-built block, it asks the client to build a block from inputs (parent, payload attributes, transactions) and then validates the resulting block field-by-field against the fixture's expected block. This exercises tx ordering, gas accounting, payload assembly, and (for fork ≥ Prague) `executionRequests` derivation.
+
+The endpoint used is `testing_buildBlockV1`, an engine-API testing-namespace method exposed by `ethpandaops/<client>:master` (and similar performance builds). It is not part of the standard Engine API — the testing namespace is opt-in and intended for fixture-driven block-building verification.
+
+The `build-block` command, for each valid payload in the fixture:
+
+1. **Builds the block** via `testing_buildBlockV1(parent_hash, payload_attributes, transactions, extra_data)`. The client returns its own constructed `ExecutionPayload`.
+2. **Validates execution-dependent fields** of the built payload against the fixture's expected payload (everything except `gas_limit` and `block_hash`, which depend on client-side EIP-1559 elasticity and are validated via a range check separately).
+3. **Validates `executionRequests`** for fork ≥ Prague (`engine_newPayloadV4+`).
+4. **Imports the fixture block** (not the client-built one) via `engine_newPayloadVX` so the chain advances with the fixture's expected gas limit and block hash.
+5. **Advances the chain** via `engine_forkchoiceUpdatedVX`.
+
+This complements `consume engine`: where `consume engine` tests the client's payload-validation path, `build-block` tests its payload-production path against the same fixtures.
+
 ## Engine vs RLP Simulator
 
 The RLP Simulator (`eels/consume-rlp`) and the Engine Simulator (`eels/consume-engine`) should be seen as complimentary to one another. Although they execute the same underlying EVM test cases, the block validation logic is executed via different client code paths (using different [fixture formats](./test_formats/index.md)). Therefore, ideally, **both simulators should be executed for full coverage**.
diff --git a/docs/running_tests/test_formats/blockchain_test_engine_x.md b/docs/running_tests/test_formats/blockchain_test_engine_x.md
index c9dc90a4caf..5087655e3b2 100644
--- a/docs/running_tests/test_formats/blockchain_test_engine_x.md
+++ b/docs/running_tests/test_formats/blockchain_test_engine_x.md
@@ -139,7 +139,7 @@ Engine API payload structure identical to the one defined in [Blockchain Engine
 ## Usage Notes
 
 - This format is generated when using:
-    - `--generate-pre-alloc-groups` flag (automatically triggers 2-phase execution, generates only `BlockchainEngineXFixture`)
+    - `--generate-pre-alloc-groups` followed by `--use-pre-alloc-groups` (two invocations: phase 1 populates the `pre_alloc` folder, phase 2 generates only `BlockchainEngineXFixture`)
     - `--generate-all-formats` flag (automatically triggers 2-phase execution, generates all fixture formats)
 - The `pre_alloc` folder is essential and must be distributed with the test fixtures
 - Tests are grouped by identical (fork + environment + pre-allocation) combinations
diff --git a/docs/running_tests/test_formats/state_test.md b/docs/running_tests/test_formats/state_test.md
index b4aed6a7c83..51d341d5c55 100644
--- a/docs/running_tests/test_formats/state_test.md
+++ b/docs/running_tests/test_formats/state_test.md
@@ -16,7 +16,7 @@ The JSON file path plus the test name are used as the unique test identifier.
 
 As opposed to other fixture formats, the state test fixture format could contain multiple test vectors per test object, each represented by an element in the mapping of lists of the `post` field.
 
-However tests generated by the `execution-spec-tests` repository do **not** use this feature, as every single test object contains only a single test vector.
+However tests generated by the `execution-specs` repository do **not** use this feature, as every single test object contains only a single test vector.
 
 ## Consumption
 
diff --git a/docs/running_tests/test_formats/transaction_test.md b/docs/running_tests/test_formats/transaction_test.md
index 47b7a7073c1..f395e0b9d03 100644
--- a/docs/running_tests/test_formats/transaction_test.md
+++ b/docs/running_tests/test_formats/transaction_test.md
@@ -16,7 +16,7 @@ The JSON file path plus the test name are used as the unique test identifier.
 
 The transaction test fixture format could contain multiple test vectors per test object, each represented by an element in the mapping of lists of the `result` field.
 
-However tests generated by the `execution-spec-tests` repository do **not** use this feature, as every single test object contains only a single test vector.
+However tests generated by the `execution-specs` repository do **not** use this feature, as every single test object contains only a single test vector.
 
 ## Consumption
 
diff --git a/docs/scripts/copy_repo_docs_to_mkdocs.py b/docs/scripts/copy_repo_docs_to_mkdocs.py
index 6f011490f2f..023c7253802 100644
--- a/docs/scripts/copy_repo_docs_to_mkdocs.py
+++ b/docs/scripts/copy_repo_docs_to_mkdocs.py
@@ -46,6 +46,19 @@ def copy_markdown_file(source_path, destination_path, fix_links=True):
                             line,
                         )
 
+                        # Fix repo-relative docs/ links to work from
+                        # docs/getting_started/<file>.md
+                        line = re.sub(
+                            r"\]\(docs/getting_started/",
+                            r"](",
+                            line,
+                        )
+                        line = re.sub(
+                            r"\]\(docs/([^)]+)\)",
+                            r"](../\1)",
+                            line,
+                        )
+
                     destination.write(line)
     except Exception as e:
         raise Exception(
diff --git a/docs/scripts/gen_test_case_reference.py b/docs/scripts/gen_test_case_reference.py
index 8ef064d084f..ba2a00b38f5 100644
--- a/docs/scripts/gen_test_case_reference.py
+++ b/docs/scripts/gen_test_case_reference.py
@@ -29,21 +29,20 @@
 logger = logging.getLogger("mkdocs")
 
 
-# If docs are generated while FAST_DOCS is true, then use "tests/frontier"
-# otherwise use "tests"
+# If docs are generated while FAST_DOCS is true, then use "tests/frontier";
+# otherwise use "tests". Benchmark tests are opted in via --include-benchmark
+# in full mode only.
 #
 # USAGE 1 (use fast mode):
 #       export FAST_DOCS=true && uv run mkdocs serve
 # USAGE 2 (use fast mode + hide side-effect warnings):
 #       export FAST_DOCS=true && uv run mkdocs serve 2>&1 | sed '/is not found among documentation files/d' #noqa: E501
-test_arg = "tests"
-fast_mode = getenv("FAST_DOCS")
-if fast_mode is not None:
-    if fast_mode.lower() == "true":
-        print(
-            "-" * 40, "\nWill generate docs using FAST_DOCS mode.\n" + "-" * 40
-        )
-        test_arg = "tests/frontier"
+fast_mode = (getenv("FAST_DOCS") or "").lower() == "true"
+if fast_mode:
+    print("-" * 40, "\nWill generate docs using FAST_DOCS mode.\n" + "-" * 40)
+    test_arg = "tests/frontier"
+else:
+    test_arg = "tests"
 
 args = [
     "--override-ini",
@@ -58,11 +57,14 @@
     f"--until={GENERATE_UNTIL_FORK}",
     "--checklist-doc-gen",
     "--skip-index",
+    "--ignore=tests/ported_static",
     "-m",
-    "not blockchain_test_engine and not benchmark",
+    "not blockchain_test_engine",
     "-s",
-    test_arg,
 ]
+if not fast_mode:
+    args.append("--include-benchmark")
+args.append(test_arg)
 
 runner = CliRunner()
 logger.info(
diff --git a/docs/specs/adding_a_new_eip.md b/docs/specs/adding_a_new_eip.md
new file mode 100644
index 00000000000..0ff60347416
--- /dev/null
+++ b/docs/specs/adding_a_new_eip.md
@@ -0,0 +1,62 @@
+# Adding a New EIP
+
+This page outlines the process of specifying and testing EIPs for the Ethereum execution layer. It is intended for EIP authors, researchers, and implementers.
+
+An EIP will typically go through the following stages:
+
+| Stage              | Activities  | Outputs |
+| ------------------ | ----------- | ------- |
+| *Pre-Draft*        | Prospective EIP author conceives of an idea for an improvement to Ethereum, and discusses with the community. | <ul><li>Vague Consensus on [Ethereum Magicians][0]</li></ul> |
+| **Draft**          | <p>EIP author writes a technical human-language document describing the improvement, initially in broad strokes and becoming more specific over time.</p><p>Concurrently, they develop a Python reference implementation to make the EIP executable and identify any immediate/obvious implementation issues. For example, the EIP may not be compatible with some detail of the current Ethereum Virtual Machine.</p><p>Finally for this stage, the author begins to write test schemes for the EIP. Having the reference implementation should help identify the various logical flows to test and thus feed into more robust testing. Once the test schemes are written, the reference implementation can then be used to fill the tests and generate the test vectors.</p> | <ul><li>Complete (but not final) document in [EIPs Repository][1]</li><li>Reference implementation in EELS (this repository)</li><li>Initial tests under `./tests/` (this repository)</li></ul> |
+| **Review**         | <p>The broader Ethereum community discusses and provides input on the proposal.</p><p>Although the feedback from the community can be sought at all lifecycle stages, having a reference implementation and tests act as a good bridge between research and client implementation. It also helps core developers (who have limited time and resources) to understand the EIP better and provide more informed feedback.</p> | <ul><li>Complete &amp; final document in the [EIPs Repository][1]</li><li>Comprehensive tests under `./tests/`</li></ul> |
+| **Last&nbsp;Call** | Usually after being nominated for inclusion in a fork, the EIP author signals that the proposal is effectively done and begins the last period for comments/discussion. | <ul><li>Complete reference implementation in EELS</li><li>Complete tests under `./tests/`</li><li>Immutable proposal in [EIPs Repository][1]</li></ul> |
+| **Final**          | The proposal is now immutable (cannot be changed) and exists for reference. | <ul><li>Mainnet client implementations</li></ul> |
+
+[0]: https://ethereum-magicians.org/
+[1]: https://github.com/ethereum/EIPs/
+
+The rest of this page focuses on the **Draft** and **Review** stages, where EIP authors interact most directly with EELS and the test suite.
+
+## Executable specifications
+
+This repository contains the executable specifications for the Ethereum execution layer under `src/ethereum/`.
+
+### Forks live on mainnet
+
+The folder `src/ethereum/forks/` contains the specifications for the different execution layer forks. Each fork has its own folder. For example, `src/ethereum/forks/frontier/` contains the specifications for the Frontier hardfork. The `state_transition` function in `src/ethereum/forks/<FORK_NAME>/fork.py` is the transition function for each fork.
+
+### Fork under development
+
+At any given time, there is a single fork under development. Any new EIP is implemented in the folder for that fork (`src/ethereum/forks/<FORK_NAME>/`).
+
+For example, if Amsterdam is under development and Prague is live on mainnet, the `src/ethereum/forks/amsterdam/` folder starts as a copy of Prague with values updated to reflect Amsterdam and its under-development status. This folder serves as the baseline for further development and all new EIPs are implemented in it.
+
+## Branch structure
+
+### Forks live on mainnet
+
+The final stable specification for all forks that are currently live on mainnet are on the `mainnet` branch.
+
+### Fork under development
+
+At any given time there is exactly one fork under active development. The branch structure for the fork under development is:
+
+- `forks/<FORK_NAME>`: The main branch for the fork under development. For example, `forks/amsterdam` is the branch for the Amsterdam fork. This branch will be merged into `mainnet` after the fork has gone live.
+- `eips/<FORK_NAME>/<EIP_NUMBER>`: Branches for each EIP within the fork under development. For example, `eips/amsterdam/eip-7928` is the branch for EIP-7928 for the Amsterdam fork. This branch will be merged into `forks/amsterdam` after the EIP has been confirmed for release in the fork.
+
+## Writing a new EIP
+
+Implementing a new EIP in this repository involves the following steps:
+
+1. **Create a new branch.** Create a branch for the EIP under the appropriate fork. For example, if you are implementing an EIP for the Amsterdam fork, create a branch `eips/amsterdam/eip-<EIP_NUMBER>`.
+2. **Implement the EIP.** Implement the EIP in the `src/ethereum/forks/<FORK_NAME>/` folder. See [Writing Specs](writing_specs.md) for style rules and the `ethereum_spec_tools` CLI utilities (the *New Fork Tool* in particular).
+3. **Basic sanity checks.** Run `just static` to run formatting, linting, and spec-specific lints.
+4. **Raise a PR.** Raise a PR against the appropriate fork branch. For example, if you are implementing an EIP for Amsterdam, raise a PR against `forks/amsterdam`.
+
+An EIP can only be CFI'd (Considered For Inclusion) if it has a reference EELS implementation. The EIP author is responsible for keeping their EIP up to date with the latest changes. For example, if an author had written their EIP for Prague under `eips/prague/eip-x`, but for some reason it didn't make it into Prague, they would need to rebase their EIP to reflect the changes in Amsterdam under `eips/amsterdam/eip-x`.
+
+A sample tutorial that walks through adding a new opcode to the specification is available on YouTube: [EELS tutorial](https://www.youtube.com/watch?v=QIcw_DGSy3s).
+
+## Writing tests for an EIP
+
+In addition to a reference implementation, it is very useful for the community and for core development if the EIP author conceives and writes test vectors for the EIP. Tests live in this repository under `./tests/` and use a user-friendly Python test-writing framework. See [Writing Tests](../writing_tests/index.md) for a guide.
diff --git a/docs/specs/index.md b/docs/specs/index.md
new file mode 100644
index 00000000000..a7cdb96f34e
--- /dev/null
+++ b/docs/specs/index.md
@@ -0,0 +1,60 @@
+# Specifications
+
+The Ethereum Execution Layer Specifications (EELS) are an executable Python reference implementation of Ethereum's execution layer. They serve as a source of truth for client developers, EIP authors, researchers, and anyone else trying to understand how an Ethereum execution node actually processes a block.
+
+Unlike a traditional prose specification, EELS is expressed as Python code. It can be executed, it can be imported, it can be tested, and it can be stepped through in a debugger. When the protocol changes, the change lands in EELS first and can be studied by client teams.
+
+## Client Diversity requires Coordination
+
+Ethereum runs on at least half a dozen independent execution clients (Geth, Nethermind, Besu, Erigon, Reth, ...). This diversity is a [feature, not an accident](https://ethereum.org/developers/docs/nodes-and-clients/client-diversity/): a flaw in any one client is contained, no single team holds the keys to the network, and permissionless participation is preserved. The price of that resilience is coordination: every client must agree, byte for byte, on every state transition, or the chain splits.
+
+For most of Ethereum's history the only "specification" was the Yellow Paper, a LaTeX document of dense mathematical notation, supplemented by individual EIPs and by the behavior of the reference clients themselves. Human language is ambiguous, and even mathematical notation leaves room for interpretation.
+
+Python offers a different contract. A Python function does not leave room for interpretation: either it returns the same value for the same input or it does not. By writing the specification as a program, every edge case is forced into the open, and every client team has a concrete reference to compare against.
+
+## Why Python
+
+Python is not the fastest language: EELS trades performance for readability, because the spec's job is to be understood, not to run fast. Production clients in Go, Rust, and C++ handle the performance; the spec's job is to describe what those clients are supposed to do.
+
+Python was chosen because:
+
+- It reads close to pseudocode, so readers who are not Python programmers can still follow it.
+- It has a mature testing ecosystem (`pytest`, `hypothesis`, ...), which lets the spec be validated the same way any other library is validated.
+- It is widely known among protocol researchers, making it approachable for new EIP authors.
+
+EELS is a "spiritual successor to the Yellow Paper" that trades dense notation for code a reader can step through.
+
+## Design principles
+
+EELS aims to be:
+
+1. **Correct.** The spec describes the *intended* behaviour of Ethereum. Any deviation is a bug.
+2. **Complete.** Every consensus-critical behaviour is captured. If it affects state, it belongs in EELS.
+3. **Accessible.** Readability, clarity, and plain language win over cleverness, performance, and brevity.
+
+The third principle is where EELS departs most sharply from production code. In a production client you minimise duplication (DRY, "don't repeat yourself"), because duplicated logic is expensive to maintain. In EELS you deliberately repeat yourself ("write everything twice", WET), because duplication is easier to read than a network of abstractions. A reader should be able to open a single fork's `state_transition` and follow it top to bottom without jumping files.
+
+## The fork-as-a-copy model
+
+Each hardfork under `src/ethereum/forks/` is a **complete copy** of the previous fork's code, edited in place. There is no shared base class, no feature-flag plumbing, no framework. When a reader wants to know what changed between, say, Cancun and Prague, they read the diff between `src/ethereum/forks/cancun/` and `src/ethereum/forks/prague/`.
+
+This has two concrete benefits:
+
+- Every fork is self-contained. Paris is Paris, forever; nothing a future fork does can change it.
+- Changes are reviewable as diffs. The cost of an EIP, in terms of spec surface area, is immediately visible.
+
+The trade-off is that a bug fix that applies to every fork must be applied to every fork, by hand or with the patch tool. That cost is paid deliberately.
+
+## Where to go from here
+
+- [Writing Specs](writing_specs.md): style rules, cross-fork discipline, and the `ethereum_spec_tools` CLI utilities.
+- [Adding a New EIP](adding_a_new_eip.md): the EIP lifecycle from pre-draft to final, and how to land a new EIP in EELS.
+- [Spec Releases](spec_releases.md): how EELS versions relate to Ethereum hardforks and devnets.
+- [Protocol History](protocol_history.md): the full table of mainnet hardforks, their included EIPs, and their fork manifests.
+- [Rendered specification](https://steel.ethereum.foundation/docs/execution-specs/specs/reference/): the `docc`-rendered narrative view of the Python spec, with side-by-side diffs between forks.
+
+!!! bug "Reporting a vulnerability"
+    Care is required when filing issues or PRs for functionality that is live on Ethereum mainnet. Please report vulnerabilities and verify bounty eligibility via the [bug bounty program](https://bounty.ethereum.org).
+
+    - **Please do not create a PR with a vulnerability visible.**
+    - **Please do not file a public ticket mentioning the vulnerability.**
diff --git a/docs/specs/protocol_history.md b/docs/specs/protocol_history.md
new file mode 100644
index 00000000000..f77b3a3bd98
--- /dev/null
+++ b/docs/specs/protocol_history.md
@@ -0,0 +1,67 @@
+# Protocol History
+
+The table below lists every mainnet Ethereum hardfork, its activation point, the EIPs it introduced, a link to its fork manifest in EELS, and the Ethereum Foundation announcement blog post.
+
+## Mainnet hardforks
+
+| Version and Code Name | Block No. | Released | Incl EIPs | Fork Specifications | Blog |
+|-----------------------|-----------|----------|-----------|-------|-------|
+| Osaka | 23935694 | 2025-12-03 | [EIP-7594] <br> [EIP-7642] <br> [EIP-7823] <br> [EIP-7825] <br> [EIP-7883] <br> [EIP-7892] <br> [EIP-7910] <br> [EIP-7917] <br> [EIP-7918] <br> [EIP-7934] <br> [EIP-7935] <br> [EIP-7939] <br> [EIP-7951] | [Hardfork Meta EIP-7607](https://eips.ethereum.org/EIPS/eip-7607) <br/> [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/osaka/__init__.py) | [Blog](https://blog.ethereum.org/2025/11/06/fusaka-mainnet-announcement) |
+| Prague | 22431084 | 2025-05-07 | [EIP-2537] <br> [EIP-2935] <br> [EIP-6110] <br> [EIP-7002] <br> [EIP-7251] <br> [EIP-7549] <br> [EIP-7623] <br> [EIP-7685] <br> [EIP-7691] <br> [EIP-7702] | [Hardfork Meta EIP-7600](https://eips.ethereum.org/EIPS/eip-7600) <br/> [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/prague/__init__.py) | [Blog](https://blog.ethereum.org/2025/04/23/pectra-mainnet) |
+| Cancun | 19426587 | 2024-03-13<br />(1710338135) | [EIP-1153](https://eips.ethereum.org/EIPS/eip-1153) </br> [EIP-4788](https://eips.ethereum.org/EIPS/eip-4788)</br> [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844)</br> [EIP-5656](https://eips.ethereum.org/EIPS/eip-5656)</br> [EIP-6780](https://eips.ethereum.org/EIPS/eip-6780) </br> [EIP-7044](https://eips.ethereum.org/EIPS/eip-7044) </br> [EIP-7045](https://eips.ethereum.org/EIPS/eip-7045) </br> [EIP-7514](https://eips.ethereum.org/EIPS/eip-7514) </br> [EIP-7516](https://eips.ethereum.org/EIPS/eip-7516)| [Hardfork Meta EIP-7569](https://eips.ethereum.org/EIPS/eip-7569) <br/> [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/cancun/__init__.py) | [Blog](https://blog.ethereum.org/2024/02/27/dencun-mainnet-announcement) |
+| Shanghai | 17034870 | 2023-04-12<br/>(1681338455) | [EIP-3651](https://eips.ethereum.org/EIPS/eip-3651) <br/> [EIP-3855](https://eips.ethereum.org/EIPS/eip-3855) <br/> [EIP-3860](https://eips.ethereum.org/EIPS/eip-3860) <br/> [EIP-4895](https://eips.ethereum.org/EIPS/eip-4895) | [(Backfill) Meta EIP-7568](https://eips.ethereum.org/EIPS/eip-7568) <br/> [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/shanghai/__init__.py) | [Blog](https://blog.ethereum.org/2023/03/28/shapella-mainnet-announcement) |
+| Paris | 15537394 | 2022-09-15 | [EIP-3675](https://eips.ethereum.org/EIPS/eip-3675) <br/> [EIP-4399](https://eips.ethereum.org/EIPS/eip-4399) | [(Backfill) Meta EIP-7568](https://eips.ethereum.org/EIPS/eip-7568) <br/> [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/paris/__init__.py) | [Blog](https://blog.ethereum.org/2022/08/24/mainnet-merge-announcement) |
+| Gray Glacier | 15050000 | 2022-06-30 | [EIP-5133](https://eips.ethereum.org/EIPS/eip-5133) | [(Backfill) Meta EIP-7568](https://eips.ethereum.org/EIPS/eip-7568) <br/> [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/gray_glacier/__init__.py) | [Blog](https://blog.ethereum.org/2022/06/16/gray-glacier-announcement/) |
+| Arrow Glacier | 13773000 | 2021-12-09 | [EIP-4345](https://eips.ethereum.org/EIPS/eip-4345) | [(Backfill) Meta EIP-7568](https://eips.ethereum.org/EIPS/eip-7568) <br/> [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/arrow_glacier/__init__.py) | [Blog](https://blog.ethereum.org/2021/11/10/arrow-glacier-announcement/) |
+| London | 12965000 |  2021-08-05 | [EIP-1559](https://eips.ethereum.org/EIPS/eip-1559) <br> [EIP-3198](https://eips.ethereum.org/EIPS/eip-3198) <br/> [EIP-3529](https://eips.ethereum.org/EIPS/eip-3529) <br/> [EIP-3541](https://eips.ethereum.org/EIPS/eip-3541) <br> [EIP-3554](https://eips.ethereum.org/EIPS/eip-3554)| [(Backfill) Meta EIP-7568](https://eips.ethereum.org/EIPS/eip-7568) <br/> [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/london/__init__.py) | [Blog](https://blog.ethereum.org/2021/07/15/london-mainnet-announcement/) |
+| Berlin | 12244000 | 2021-04-15 | [EIP-2565](https://eips.ethereum.org/EIPS/eip-2565) <br/> [EIP-2929](https://eips.ethereum.org/EIPS/eip-2929) <br/> [EIP-2718](https://eips.ethereum.org/EIPS/eip-2718) <br/> [EIP-2930](https://eips.ethereum.org/EIPS/eip-2930) | ~[Hardfork Meta EIP-2070](https://eips.ethereum.org/EIPS/eip-2070)~ <br/> [(Backfill) Meta EIP-7568](https://eips.ethereum.org/EIPS/eip-7568) <br/> [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/berlin/__init__.py) | [Blog](https://blog.ethereum.org/2021/03/08/ethereum-berlin-upgrade-announcement/) |
+| Muir Glacier | 9200000 | 2020-01-02 | [EIP-2384](https://eips.ethereum.org/EIPS/eip-2384) | [Hardfork Meta EIP-2387](https://eips.ethereum.org/EIPS/eip-2387) <br/> [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/muir_glacier/__init__.py) | [Blog](https://blog.ethereum.org/2019/12/23/ethereum-muir-glacier-upgrade-announcement/) |
+| Istanbul | 9069000 | 2019-12-07 | [EIP-152](https://eips.ethereum.org/EIPS/eip-152) <br/> [EIP-1108](https://eips.ethereum.org/EIPS/eip-1108) <br/> [EIP-1344](https://eips.ethereum.org/EIPS/eip-1344) <br/> [EIP-1884](https://eips.ethereum.org/EIPS/eip-1884) <br/> [EIP-2028](https://eips.ethereum.org/EIPS/eip-2028) <br/> [EIP-2200](https://eips.ethereum.org/EIPS/eip-2200) | [Hardfork Meta EIP-1679](https://eips.ethereum.org/EIPS/eip-1679) <br/> [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/istanbul/__init__.py) | [Blog](https://blog.ethereum.org/2019/11/20/ethereum-istanbul-upgrade-announcement/) |
+| Petersburg | 7280000 | 2019-02-28 | [EIP-145](https://eips.ethereum.org/EIPS/eip-145) <br/> [EIP-1014](https://eips.ethereum.org/EIPS/eip-1014) <br/> [EIP-1052](https://eips.ethereum.org/EIPS/eip-1052) <br/> [EIP-1234](https://eips.ethereum.org/EIPS/eip-1234) | [Hardfork Meta EIP-1716](https://eips.ethereum.org/EIPS/eip-1716) | [Blog](https://blog.ethereum.org/2019/02/22/ethereum-constantinople-st-petersburg-upgrade-announcement/) |
+| Constantinople | 7280000 | 2019-02-28 | [EIP-145](https://eips.ethereum.org/EIPS/eip-145) <br/> [EIP-1014](https://eips.ethereum.org/EIPS/eip-1014) <br/> [EIP-1052](https://eips.ethereum.org/EIPS/eip-1052) <br/> [EIP-1234](https://eips.ethereum.org/EIPS/eip-1234) <br/> [EIP-1283](https://eips.ethereum.org/EIPS/eip-1283) | [Hardfork Meta EIP-1013](https://eips.ethereum.org/EIPS/eip-1013) <br/> [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/constantinople/__init__.py) | [Blog](https://blog.ethereum.org/2019/02/22/ethereum-constantinople-st-petersburg-upgrade-announcement/) |
+| Byzantium | 4370000 | 2017-10-16 | [EIP-100](https://eips.ethereum.org/EIPS/eip-100) <br/> [EIP-140](https://eips.ethereum.org/EIPS/eip-140) <br/> [EIP-196](https://eips.ethereum.org/EIPS/eip-196) <br/> [EIP-197](https://eips.ethereum.org/EIPS/eip-197) <br/> [EIP-198](https://eips.ethereum.org/EIPS/eip-198) <br/> [EIP-211](https://eips.ethereum.org/EIPS/eip-211) <br/> [EIP-214](https://eips.ethereum.org/EIPS/eip-214) <br/> [EIP-649](https://eips.ethereum.org/EIPS/eip-649) <br/> [EIP-658](https://eips.ethereum.org/EIPS/eip-658) | [Hardfork Meta EIP-609](https://eips.ethereum.org/EIPS/eip-609) <br/> [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/byzantium/__init__.py) | [Blog](https://blog.ethereum.org/2017/10/12/byzantium-hf-announcement/) |
+| Spurious Dragon | 2675000 | 2016-11-22 | [EIP-155](https://eips.ethereum.org/EIPS/eip-155) <br/> [EIP-160](https://eips.ethereum.org/EIPS/eip-160) <br/> [EIP-161](https://eips.ethereum.org/EIPS/eip-161) <br/> [EIP-170](https://eips.ethereum.org/EIPS/eip-170) | [Hardfork Meta EIP-607](https://eips.ethereum.org/EIPS/eip-607) <br/> [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/spurious_dragon/__init__.py) | [Blog](https://blog.ethereum.org/2016/11/18/hard-fork-no-4-spurious-dragon/) |
+| Tangerine Whistle | 2463000 | 2016-10-18 | [EIP-150](https://eips.ethereum.org/EIPS/eip-150) | [Hardfork Meta EIP-608](https://eips.ethereum.org/EIPS/eip-608) <br/> [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/tangerine_whistle/__init__.py) | [Blog](https://blog.ethereum.org/2016/10/13/announcement-imminent-hard-fork-eip150-gas-cost-changes/) |
+| DAO Fork | 1920000 | 2016-07-20 |  | [Hardfork Meta EIP-779](https://eips.ethereum.org/EIPS/eip-779) <br/> [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/dao_fork/__init__.py) | [Blog](https://blog.ethereum.org/2016/07/15/to-fork-or-not-to-fork/) |
+| DAO Wars | aborted | aborted |  |  | [Blog](https://blog.ethereum.org/2016/06/24/dao-wars-youre-voice-soft-fork-dilemma/) |
+| Homestead | 1150000 | 2016-03-14 | [EIP-2](https://eips.ethereum.org/EIPS/eip-2) <br/> [EIP-7](https://eips.ethereum.org/EIPS/eip-7) <br/> [EIP-8](https://eips.ethereum.org/EIPS/eip-8) | [Hardfork Meta EIP-606](https://eips.ethereum.org/EIPS/eip-606) <br/> [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/homestead/__init__.py) | [Blog](https://blog.ethereum.org/2016/02/29/homestead-release/) |
+| Frontier Thawing | 200000 | 2015-09-07 | | | [Blog](https://blog.ethereum.org/2015/08/04/the-thawing-frontier/) |
+| Frontier | 1 | 2015-07-30 | | [Fork Manifest](https://github.com/ethereum/execution-specs/blob/forks/amsterdam/src/ethereum/forks/frontier/__init__.py) | [Blog](https://blog.ethereum.org/2015/07/22/frontier-is-coming-what-to-expect-and-how-to-prepare/) |
+
+!!! note "Activation mechanism"
+    Starting with Paris, updates are no longer rolled out based on block numbers. Paris was enabled once proof-of-work Total Difficulty reached `58750000000000000000000`. As of Shanghai (at `1681338455`), upgrade activation is based on timestamps.
+
+[EIP-2537]: https://eips.ethereum.org/EIPS/eip-2537
+[EIP-2935]: https://eips.ethereum.org/EIPS/eip-2935
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+[EIP-7002]: https://eips.ethereum.org/EIPS/eip-7002
+[EIP-7251]: https://eips.ethereum.org/EIPS/eip-7251
+[EIP-7549]: https://eips.ethereum.org/EIPS/eip-7549
+[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
+[EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+[EIP-7691]: https://eips.ethereum.org/EIPS/eip-7691
+[EIP-7702]: https://eips.ethereum.org/EIPS/eip-7702
+[EIP-7594]: https://eips.ethereum.org/EIPS/eip-7594
+[EIP-7642]: https://eips.ethereum.org/EIPS/eip-7642
+[EIP-7823]: https://eips.ethereum.org/EIPS/eip-7823
+[EIP-7825]: https://eips.ethereum.org/EIPS/eip-7825
+[EIP-7883]: https://eips.ethereum.org/EIPS/eip-7883
+[EIP-7892]: https://eips.ethereum.org/EIPS/eip-7892
+[EIP-7910]: https://eips.ethereum.org/EIPS/eip-7910
+[EIP-7917]: https://eips.ethereum.org/EIPS/eip-7917
+[EIP-7918]: https://eips.ethereum.org/EIPS/eip-7918
+[EIP-7934]: https://eips.ethereum.org/EIPS/eip-7934
+[EIP-7935]: https://eips.ethereum.org/EIPS/eip-7935
+[EIP-7939]: https://eips.ethereum.org/EIPS/eip-7939
+[EIP-7951]: https://eips.ethereum.org/EIPS/eip-7951
+
+## Clarifications without a protocol release
+
+Some clarifications were enabled without protocol releases:
+
+| EIP | Block No. |
+|-----|-----------|
+| [EIP-2681](https://eips.ethereum.org/EIPS/eip-2681) | 0 |
+| [EIP-3607](https://eips.ethereum.org/EIPS/eip-3607) | 0 |
+| [EIP-7523](https://eips.ethereum.org/EIPS/eip-7523) | 15537394 |
+| [EIP-7610](https://eips.ethereum.org/EIPS/eip-7610) | 0 |
diff --git a/docs/specs/reference/index.md b/docs/specs/reference/index.md
new file mode 100644
index 00000000000..73f068664f2
--- /dev/null
+++ b/docs/specs/reference/index.md
@@ -0,0 +1,11 @@
+# Reference
+
+The rendered Ethereum execution specification is generated by `docc`
+from the Python source under `src/ethereum/`.
+
+At deploy time, this placeholder is replaced by the `docc` output. To
+build the reference locally, run:
+
+```bash
+just docs-spec
+```
diff --git a/RELEASING.md b/docs/specs/spec_releases.md
similarity index 58%
rename from RELEASING.md
rename to docs/specs/spec_releases.md
index 42ed198ea2d..ce88729f4cd 100644
--- a/RELEASING.md
+++ b/docs/specs/spec_releases.md
@@ -1,17 +1,17 @@
-# Execution Specification Releases
+# Spec Releases
 
-## About Versions
+EELS is published as a versioned Python package. This page explains how the version number is structured and how it relates to Ethereum hardforks and devnets. For the maintainer runbook (tagging, publishing to PyPI), see [Releasing](../dev/releasing.md).
 
-EELS' versioning scheme is intended to be compatible with Python's
-[Version Specifiers], and is not compatible with [SemVer] (although it does
-borrow some of SemVer's concepts.)
+## About versions
+
+EELS' versioning scheme is intended to be compatible with Python's [Version Specifiers], and is *not* compatible with [SemVer] (although it borrows some of SemVer's concepts).
 
 [Version Specifiers]: https://packaging.python.org/en/latest/specifications/version-specifiers/
 [SemVer]: https://semver.org/
 
 ### Format
 
-The general format of EELS version numbers is as follows:
+The general format of EELS version numbers is:
 
 ```text
 COMPAT "." HARDFORK ( "." PATCH | ".0rc" DEVNET [ ".post" PATCH ] ) [ ".dev" DEV ]
@@ -19,7 +19,7 @@ COMPAT "." HARDFORK ( "." PATCH | ".0rc" DEVNET [ ".post" PATCH ] ) [ ".dev" DEV
 
 Where:
 
-- `COMPAT` is incremented when a release contains a backwards-incompatible change to an EELS' interface (Python API, command line tools, etc.)
+- `COMPAT` is incremented when a release contains a backwards-incompatible change to an EELS interface (Python API, command-line tools, etc.).
 - `HARDFORK` is the number of hardforks included in the release after Frontier.
 - `DEVNET`, if present, is incremented when a release targets a new devnet.
 - `DEV`, if present, indicates a pre-release preview and is incremented for each pre-release before the final release.
@@ -27,7 +27,7 @@ Where:
 
 ### Examples
 
-The following table is a hypothetical complete example of all of the releases between `1.15.0rc1.dev1` and `2.16.0`, in order from oldest at the top to the newest at the bottom.
+The following table is a hypothetical complete example of all of the releases between `1.15.0rc1.dev1` and `2.16.0`, oldest at the top:
 
 | Fork   | Description        | Version Number    |
 | ------ | ------------------ | ----------------- |
@@ -55,23 +55,9 @@ The following table is a hypothetical complete example of all of the releases be
 |        |                    |                   |
 | prague | finalize mainnet   | `2.16.0`          |
 
-## Creating a Release
-
-### Overview
-
-1. Choose a version number.
-1. Update version in source code.
-1. Create a pull request.
-1. Wait for it to get merged.
-1. Create a tag.
-1. Create GitHub release.
-1. Publish to PyPI.
+## Choosing a version number
 
-### Choosing a Version Number
-
-To choose the next version number, find the format matching the current version
-number in the table below, then choose the new version according to the reason
-for the new release.
+When proposing a new release, find the format matching the current version number in the table below, then choose the new version according to the reason for the new release:
 
 | Current Version           | Action               | New Version            |
 | ------------------------- | -------------------- | ---------------------- |
@@ -105,87 +91,7 @@ for the new release.
 |                           | Devnet Release       | `1.3.0rc5.post7`       |
 |                           | Another Preview      | `1.3.0rc5.post7.dev10` |
 
-> [!NOTE]
-> Append `.dev1` to any new version number to make it a pre-release, unless it
-> already contained a `.devN` suffix. If it did, increment `N` to make another
-> pre-release instead.
-
-### Updating Version in Source Code
-
-The version number is set in `src/ethereum/__init__.py`. Change it there. For
-example:
-
-```patch
-diff --git a/src/ethereum/__init__.py b/src/ethereum/__init__.py
-index 252f2f317..8cdd89a55 100644
---- a/src/ethereum/__init__.py
-+++ b/src/ethereum/__init__.py
-@@ -18,7 +18,7 @@ possible, to aid in defining the behavior of Ethereum clients.
- """
- import sys
- 
--__version__ = "1.15.0"
-+__version__ = "1.16.0rc1"
- 
- #
- #  Ensure we can reach 1024 frames of recursion
-```
-
-### Creating the Pull Request
-
-The usual. `git checkout -b release-vX.Y.Z`, `git commit -a`, and `git push`.
-
-### Waiting
-
-```text
-  ______________________________________
-/ Just because the message may never be  \\
-| received does not mean it is not worth |
-\\ sending.                               /
-  --------------------------------------
-         \   ^__^
-          \  (oo)\_______
-             (__)\       )\/\\
-                 ||----w |
-                 ||     ||
-```
-
-### Creating the Tag
-
-> [!WARNING]
-> Do not create the tag from the `HEAD` branch of the pull request.
->
-> GitHub can rewrite commits when merging pull requests, and tagging the
-> original commit will make the git history messier than necessary.
-
-The tag name should be the letter `v` followed by the version number (eg.
-`1.15.0rc5.post3` becomes `v1.15.0rc5.post3`.)
-
-To create and push the tag:
-
-```bash
-git checkout master     # Replace `master` with the pull request's base branch.
-git pull
-git tag -a -s v1.15.0   # Replace `v1.15.0` with the tag name from earlier.
-git push origin v1.15.0 # Replace the tag name here too.
-```
-
-> [!IMPORTANT]
-> If `git tag` complains about a missing GPG/PGP key, follow
-> [this guide][keygen] to generate one. It's best to add the key to your GitHub
-> account as well.
-
-[keygen]: https://docs.github.com/en/authentication/managing-commit-signature-verification/generating-a-new-gpg-key
-
-### Creating the GitHub Release
-
-Go to the [release page][release], choose the newly created tag, and generate some release
-notes.
-
-[release]: https://github.com/ethereum/execution-specs/releases/new
-
-### Publishing to PyPI
-
-See the [Python Packaging User Guide][ppug]
+!!! note
+    Append `.dev1` to any new version number to make it a pre-release, unless it already contained a `.devN` suffix. If it did, increment `N` to make another pre-release instead.
 
-[ppug]: https://packaging.python.org/en/latest/tutorials/packaging-projects/#generating-distribution-archives
+The version number is stored in `src/ethereum/__init__.py`.
diff --git a/docs/specs/writing_specs.md b/docs/specs/writing_specs.md
new file mode 100644
index 00000000000..03f862251c6
--- /dev/null
+++ b/docs/specs/writing_specs.md
@@ -0,0 +1,214 @@
+# Writing Specs
+
+This page collects the style rules, cross-fork discipline, and CLI utilities you need when writing or modifying code under `src/ethereum/`.
+
+The overarching goal is readability: anyone reading a fork from top to bottom should be able to follow what Ethereum does for a given block, without jumping between files or untangling abstractions. EELS deliberately prefers repeated code (WET: "write everything twice") over clever reuse (DRY), because duplication is easier to read than a network of abstractions.
+
+## Style
+
+### Spelling and naming
+
+- Prefer descriptive English words (or *very common* abbreviations) in documentation and identifiers.
+- Avoid EIP numbers in identifiers; prefer descriptive text (e.g. `FeeMarketTransaction` over `Eip1559Transaction`).
+- Avoid uninformative prefixes in identifiers (like `get_` or `compute_`). They don't add useful meaning and take up valuable real estate.
+- If a term is specific to the domain, there is a custom spell-check dictionary at `whitelist.txt`.
+
+### Comments
+
+- Don't repeat what is obvious from the code.
+- Don't attribute semantic blocks to a specific EIP in a leading comment, because future EIPs can land between your first and last lines and silently inherit the attribution. Instead, describe the change in the function's docstring.
+
+<details>
+<summary><em>(expand)</em> Why EIP-attributed comments rot.</summary>
+
+<br>Consider:
+<table valign="top">
+
+<tr valign="top">
+<th>Fork T</th>
+<th>Fork T+1</th>
+</tr>
+
+<tr valign="top">
+
+<td>
+
+<!-- Note that the trailing whitespace is necessary to move the copy button in the github UI over so it doesn't obscure the text. -->
+
+```python
+# EIP-1234: The dingus is the rate of fleep      
+dingus = a + b
+dingus += c ^ d
+dingus /= fleep(e)
+```
+
+</td>
+
+<td>
+
+```python
+# EIP-1234: The dingus is the rate of fleep      
+dingus = a + b
+
+# EIP-4567: Frobulate the dingus
+dingus = frobulate(dingus)
+
+dingus += c ^ d        # <-
+dingus /= fleep(e)     # <-
+```
+
+</td>
+
+</tr>
+
+</table>
+
+The marked lines (`<-`) are now incorrectly attributed to EIP-4567 in Fork+1. Instead, omit the EIP identifier in comments and describe changes introduced by the EIP in the function's docstring. The rendered diffs will make it pretty obvious what's changed.
+
+</details>
+
+### Docstrings
+
+- Write in complete sentences, providing necessary background and context for the associated code.
+- Function and method docstrings must use the imperative mood in the summary line.
+    - **Good:** Build the house using the provided lumber.
+    - **Bad:** Builds the house using the provided lumber.
+- Always start with a single-line summary. When more detail is needed, use a multi-line docstring with a blank line after the summary line.
+    - **One-line summary:**
+
+      ```python
+      """Return the pathname of the KOS root directory."""
+      ```
+
+    - **Multi-line:**
+
+      ```python
+      """
+      Add a bloom entry to the bloom filter.
+
+      The number of hash functions used is 3. They are calculated by
+      taking the least significant 11 bits from the first 3 16-bit
+      words of the `keccak_256()` hash of `bloom_entry`.
+      """
+      ```
+
+- Format using markdown.
+- Links to relevant standards and EIPs may be specified using reference-style links.
+
+  ```python
+  """
+  Minimum gas cost per byte of calldata as per [EIP-7976].
+
+  [EIP-7976]: https://eips.ethereum.org/EIPS/eip-7976
+  """
+  ```
+
+- Avoid beginning docstrings with an article ("the"/"a") or a pronoun ("it", "they", etc.).
+- Don't include the function's signature.
+
+### Constants
+
+- Do not include constant values in docstrings, neither as literals nor as expressions. It's too easy to change a constant's value and forget to update its docstring.
+- Construct the constant's value from other constants or meaningful expressions in order to provide meaningful context.
+    - **Great:** `TARGET_BLOB_GAS_PER_BLOCK = GAS_PER_BLOB * BLOB_SCHEDULE_TARGET`
+        - Composed from named constants; the reader immediately understands what the value represents.
+    - **Acceptable:** `TX_MAX_GAS = Uint(2 ** 24)`
+        - More readable than a raw number, but still a literal expression that doesn't convey *why* this value was chosen.
+    - **Bad:** `TX_MAX_GAS = Uint(16_777_216)`
+        - A magic number with no context.
+
+## Changes across multiple forks
+
+Many contributions require changes across multiple forks, organized under `src/ethereum/forks/`. When making such changes, ensure that differences between the forks are minimal and consist only of necessary differences. This produces cleaner [diff outputs](https://steel.ethereum.foundation/docs/execution-specs/specs/reference/diffs/index.html).
+
+When creating pull requests affecting multiple forks, we recommend submitting your PR in two steps:
+
+1. Apply the changes on a single fork, open a *draft* pull request, and get feedback.
+2. Apply the changes across the other forks, push them, and mark the pull request as ready for review.
+
+This saves you having to apply code review feedback repeatedly for each fork.
+
+## CLI utilities: `ethereum_spec_tools`
+
+The repository ships with CLI utilities that help during spec development.
+
+### New Fork Tool
+
+This tool creates the base code for a new fork by copying the existing code from a given fork.
+
+The command takes 4 arguments (2 optional):
+
+- `from_fork`: The fork name from which the code is to be duplicated. Example: `"Tangerine Whistle"`.
+- `to_fork`: The fork name of the new fork. Example: `"Spurious Dragon"`.
+- `from_test` (optional): Name of the from-fork within the test fixtures in case it is different from fork name. Example: `"EIP150"`.
+- `to_test` (optional): Name of the to-fork within the test fixtures in case it is different from the fork name. Example: `"EIP158"`.
+
+For example, to create baseline code for `Spurious Dragon` from `Tangerine Whistle`:
+
+```bash
+uv run ethereum-spec-new-fork --from_fork="Tangerine Whistle" --to_fork="Spurious Dragon" --from_test=EIP150 --to_test=EIP158
+```
+
+The following must be updated manually afterwards:
+
+1. The fork number and `MAINNET_FORK_BLOCK` in `__init__.py`. If you are proposing a new EIP, set `MAINNET_FORK_BLOCK` to `None`.
+2. Any absolute package imports from other forks, e.g. in `trie.py`.
+3. Package names under `setup.cfg`.
+4. Add the new fork to the `monkey_patch()` function in `src/ethereum_optimized/__init__.py`.
+5. Adjust the underline in `fork/__init__.py`.
+
+### Sync Tool
+
+The sync tool uses an RPC provider to fetch and validate blocks against EELS. The validated state can be stored in a local DB. Because syncing directly with the specs is very slow, the sync tool can also leverage the `ethereum_optimized` module, which contains alternative implementations of routines in EELS optimized for speed rather than clarity/readability.
+
+Invoke the tool with `ethereum-spec-sync`. Arguments:
+
+- `rpc-url`: Endpoint providing the Ethereum RPC API. Defaults to `http://localhost:8545/`.
+- `unoptimized`: Don't use the optimized state/ethash (this can be extremely slow).
+- `persist`: Store state in a database at this file path.
+- `geth`: Use geth-specific RPC endpoints while fetching blocks.
+- `reset`: Delete the database and start from scratch.
+- `gas-per-commit`: Commit to database each time this much gas has been consumed. Defaults to `1_000_000_000`.
+- `initial-state`: Start from the state in this database rather than genesis.
+- `stop-at`: After syncing this block, exit successfully.
+
+Option compatibility:
+
+- The following options are *not* supported *with* `--unoptimized`: `--persist`, `--initial-state`, `--reset`.
+- The following options are *not* supported *without* `--persist`: `--initial_state`, `--reset`.
+
+### Patch Tool
+
+This tool applies the unstaged changes in `SOURCE_FORK` to each of `TARGET_FORKS`. If some of the changes fail to apply, `.rej` files listing the unapplied hunks are left in the target fork.
+
+Positional and flag arguments:
+
+- Source fork (single value). For example: `frontier`.
+- Target forks (one or more values). For example: `homestead`.
+- `optimized`: Patch the optimized code instead.
+- `tests`: Patch the tests instead.
+
+Example: apply changes made in `Frontier` to `Homestead` and `Tangerine Whistle`:
+
+```bash
+uv run python src/ethereum_spec_tools/patch_tool.py frontier homestead tangerine_whistle
+```
+
+### Lint Tool
+
+The spec lint tool checks for style and formatting issues specific to EELS and emits diagnostics when issues are found. Currently it verifies:
+
+- The order of identifiers between each hardfork is consistent.
+- Import statements follow the relevant import rules in modules.
+
+Run it with `just lint-spec` (or `uv run ethereum-spec-lint`).
+
+## Debugging with `--evm-trace`
+
+A trace of the EVM execution for any test case can be obtained by passing the `--evm-trace` argument to pytest. Run it on a small number of tests at a time; the log can otherwise grow very large.
+
+```bash
+uv run pytest \
+    'tests/json_loader/test_state_tests.py::test_state_tests_frontier[stAttackTest - ContractCreationSpam - 0]' \
+    --evm_trace
+```
diff --git a/docs/templates/base.md.j2 b/docs/templates/base.md.j2
index a741f22382d..0316ca26f1c 100644
--- a/docs/templates/base.md.j2
+++ b/docs/templates/base.md.j2
@@ -10,9 +10,7 @@ Documentation for [`{{ pytest_node_id }}@{{ short_git_ref }}`]({{ source_code_ur
 
     ```console
 {% if is_benchmark %}
-    fill -v {{ pytest_node_id }} -m benchmark
-{% elif is_stateful %}
-    fill -v {{ pytest_node_id }} -m stateful
+    fill -v {{ pytest_node_id }} --gas-benchmark-values 1
 {% else %}
     fill -v {{ pytest_node_id }} --fork {{ target_or_valid_fork }}
 {% endif %}
diff --git a/docs/templates/function.md.j2 b/docs/templates/function.md.j2
index 3b152fa3b00..d773fc765b7 100644
--- a/docs/templates/function.md.j2
+++ b/docs/templates/function.md.j2
@@ -19,6 +19,9 @@ search:
 
 ## Parametrized Test Cases
 
+This test generates {{ test_case_count }} parametrized test case{{ "s" if test_case_count > 1 else "" }} across {{ cases | map(attribute='fork') | unique | list | length }} fork{{ "s" if cases | map(attribute='fork') | unique | list | length > 1 else "" }}.
+
+{# Parameter tables temporarily disabled - re-enable when standalone pages support dark mode
 {% if test_case_count > 1 %}
 The interactive table below is also available as a [standalone page]({{ html_static_page_target }}).
 {% elif fixture_formats | length > 1 %}
@@ -28,4 +31,5 @@ This test case is only parametrized by fork.
 {% endif %}
 
 {% include 'function_parameter_datatable.html.j2' %}
+#}
 {% endblock %}
diff --git a/docs/writing_tests/adding_a_new_test.md b/docs/writing_tests/adding_a_new_test.md
index a9c8befa9cd..c1ed762b595 100644
--- a/docs/writing_tests/adding_a_new_test.md
+++ b/docs/writing_tests/adding_a_new_test.md
@@ -3,7 +3,7 @@
 All test cases are located underneath the `tests` directory, which are then organized by fork. Each fork contains sub-directories containing test sub-categories.
 
 ```text
-📁 execution-test-specs/
+📁 execution-specs/
 ├─╴📁 tests/
 |   ├── 📄 __init__.py
 │   ├── 📁 cancun/
diff --git a/docs/writing_tests/benchmarks.md b/docs/writing_tests/benchmarks.md
index bdb5e56f477..4d81f3ba87e 100644
--- a/docs/writing_tests/benchmarks.md
+++ b/docs/writing_tests/benchmarks.md
@@ -19,19 +19,24 @@ tests/benchmark/
 
 There are multiple files under `instruction/`, users can check each file's docstring to understand which opcodes are covered in the file.
 
+Benchmark tests are not collected by `fill` and `execute remote`  by default, in order to run them, their path must explicitly be provided to these command:
+
+```bash
+fill -v tests/benchmark/
+execute remote -v tests/benchmark
+```
+
 ### Stateful Benchmarks
 
 A subset of benchmark test cases run on top of stateful environments (such as bloatnet or mainnet-like setups), in order to analyze how state size, structure, and access patterns influence performance. These tests may (1) pre-deploy contracts (2) construct initial storage state (3) Interact with pre-deployed contracts via stub addresses.
 
-Such tests are located under `./tests/benchmark/stateful`. When running these tests, users should specify the `stateful` flag as `-m stateful`, or the test would be ignored, even the path is specified correctly.
+These tests are located under `./tests/benchmark/stateful`.
 
 ### Compute Benchmarks
 
 Other benchmark tests do not require any pre-state configuration. These benchmarks could be run even without pre-deployed contracts or initialized storage.
 
-These tests are located under `./tests/benchmark/compute.` When running these cases, users should specify the `benchmark` marker like `-m benchmark`, or the test would be ignored, even the path is specified correctly.
-
-**Note:** Using `-m benchmark` under `tests/benchmark/stateful`, or `-m stateful` under `tests/benchmark/compute`, will cause the tests to be ignored. Make sure the user-provided flag matches the directory of the test being executed.
+These tests are located under `./tests/benchmark/compute`.
 
 **Note:** Benchmark tests are now only available starting from the `Prague` fork. Tests targeting earlier forks (`Cancun` or prior) are not supported in benchmark mode.
 
diff --git a/docs/writing_tests/code_standards.md b/docs/writing_tests/code_standards.md
deleted file mode 100644
index 54ca891f694..00000000000
--- a/docs/writing_tests/code_standards.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Code Standards
-
-!!! warning "Documentation Moved"
-    This documentation has been relocated to [Code Standards](../getting_started/code_standards.md). Please use the new location for the most up-to-date information.
diff --git a/docs/writing_tests/fork_methods.md b/docs/writing_tests/fork_methods.md
index 6e7beeca03a..efb4c90d4e3 100644
--- a/docs/writing_tests/fork_methods.md
+++ b/docs/writing_tests/fork_methods.md
@@ -1,10 +1,14 @@
 # Using and Extending Fork Methods
 
-This document describes the Fork class in the Ethereum execution spec tests framework, which provides a standardized way to define properties of Ethereum forks. Understanding how to use and extend these fork methods is essential for writing flexible tests that can automatically adapt to different forks.
+This document describes the Fork class in the Ethereum execution spec tests framework, which provides a standardized way
+to define properties of Ethereum forks. Understanding how to use and extend these fork methods is essential for writing
+flexible tests that can automatically adapt to different forks.
 
 ## Overview
 
-The `BaseFork` class is an abstract base class that defines the interface for all Ethereum forks. Each implemented fork (like Frontier, Homestead, etc.) extends this class and implements its abstract methods to provide fork-specific behavior.
+The `BaseFork` class is an abstract base class that defines the interface for all Ethereum forks. Each implemented
+fork (like Frontier, Homestead, etc.) extends this class and implements its abstract methods to provide fork-specific
+behavior.
 
 The fork system allows:
 
@@ -15,13 +19,14 @@ The fork system allows:
 
 ## Using Fork Methods in Tests
 
-Fork methods are powerful tools that allow your tests to adapt to different Ethereum forks automatically. Here are common patterns for using them:
+Fork methods are powerful tools that allow your tests to adapt to different Ethereum forks automatically. Here are
+common patterns for using them:
 
 ### 1. Check Fork Support for Features
 
 ```python
 def test_some_feature(fork):
-    if fork.supports_blobs(block_number=0, timestamp=0):
+    if fork.supports_blobs():
         # Test blob-related functionality
         ...
     else:
@@ -33,14 +38,14 @@ def test_some_feature(fork):
 
 ```python
 def test_transaction_gas(fork, state_test):
-    gas_cost = fork.gas_costs(block_number=0, timestamp=0).GAS_TX_BASE
-    
+    gas_cost = fork.gas_costs().GAS_TX_BASE
+
     # Create a transaction with the correct gas parameters for this fork
     tx = Transaction(
         gas_limit=gas_cost + 10000,
         # ...
     )
-    
+
     state_test(
         env=Environment(),
         pre=pre,
@@ -53,9 +58,10 @@ def test_transaction_gas(fork, state_test):
 
 ```python
 def test_transaction_types(fork, state_test):
-    for tx_type in fork.tx_types(block_number=0, timestamp=0):
+    for tx_type in fork.tx_types():
         # Test each transaction type supported by this fork
         # ...
+        pass
 ```
 
 ### 4. Determine Valid Opcodes
@@ -64,7 +70,7 @@ def test_transaction_types(fork, state_test):
 def test_opcodes(fork, state_test):
     # Create bytecode using only opcodes valid for this fork
     valid_opcodes = fork.valid_opcodes()
-    
+
     # Use these opcodes to create test bytecode
     # ...
 ```
@@ -77,7 +83,7 @@ def test_fork_transition(transition_fork, blockchain_test):
     # based on block number or timestamp
     fork_before = transition_fork.fork_at(block_number=4, timestamp=0)
     fork_after = transition_fork.fork_at(block_number=5, timestamp=0)
-    
+
     # Test behavior before and after transition
     # ...
 ```
@@ -89,13 +95,13 @@ def test_fork_transition(transition_fork, blockchain_test):
 These methods determine what fields are required in block headers for a given fork:
 
 ```python
-fork.header_base_fee_required(block_number=0, timestamp=0)  # Added in London
-fork.header_prev_randao_required(block_number=0, timestamp=0)  # Added in Paris
-fork.header_withdrawals_required(block_number=0, timestamp=0)  # Added in Shanghai
-fork.header_excess_blob_gas_required(block_number=0, timestamp=0)  # Added in Cancun
-fork.header_blob_gas_used_required(block_number=0, timestamp=0)  # Added in Cancun
-fork.header_beacon_root_required(block_number=0, timestamp=0)  # Added in Cancun
-fork.header_requests_required(block_number=0, timestamp=0)  # Added in Prague
+fork.header_base_fee_required()  # Added in London
+fork.header_prev_randao_required()  # Added in Paris
+fork.header_withdrawals_required()  # Added in Shanghai
+fork.header_excess_blob_gas_required()  # Added in Cancun
+fork.header_blob_gas_used_required()  # Added in Cancun
+fork.header_beacon_root_required()  # Added in Cancun
+fork.header_requests_required()  # Added in Prague
 ```
 
 ### Gas Parameters
@@ -103,9 +109,9 @@ fork.header_requests_required(block_number=0, timestamp=0)  # Added in Prague
 Methods for determining gas costs and calculations:
 
 ```python
-fork.gas_costs(block_number=0, timestamp=0)  # Returns a GasCosts dataclass
-fork.memory_expansion_gas_calculator(block_number=0, timestamp=0)  # Returns a callable
-fork.transaction_intrinsic_cost_calculator(block_number=0, timestamp=0)  # Returns a callable
+fork.gas_costs()  # Returns a GasCosts dataclass
+fork.memory_expansion_gas_calculator()  # Returns a callable
+fork.transaction_intrinsic_cost_calculator()  # Returns a callable
 ```
 
 ### Transaction Types
@@ -113,10 +119,10 @@ fork.transaction_intrinsic_cost_calculator(block_number=0, timestamp=0)  # Retur
 Methods for determining valid transaction types:
 
 ```python
-fork.tx_types(block_number=0, timestamp=0)  # Returns list of supported transaction types
-fork.contract_creating_tx_types(block_number=0, timestamp=0)  # Returns list of tx types that can create contracts 
-fork.precompiles(block_number=0, timestamp=0)  # Returns list of precompile addresses
-fork.system_contracts(block_number=0, timestamp=0)  # Returns list of system contract addresses
+fork.tx_types()  # Returns list of supported transaction types
+fork.contract_creating_tx_types()  # Returns list of tx types that can create contracts 
+fork.precompiles()  # Returns list of precompile addresses
+fork.system_contracts()  # Returns list of system contract addresses
 ```
 
 ### EVM Features
@@ -125,8 +131,8 @@ Methods for determining EVM features and valid opcodes:
 
 ```python
 fork.valid_opcodes()  # Returns list of valid opcodes for this fork
-fork.call_opcodes(block_number=0, timestamp=0)  # Returns list of call opcodes
-fork.create_opcodes(block_number=0, timestamp=0)  # Returns list of create opcodes
+fork.call_opcodes()  # Returns list of call opcodes
+fork.create_opcodes()  # Returns list of create opcodes
 ```
 
 ### Blob-related Methods (Cancun+)
@@ -134,13 +140,13 @@ fork.create_opcodes(block_number=0, timestamp=0)  # Returns list of create opcod
 Methods for blob transaction support:
 
 ```python
-fork.supports_blobs(block_number=0, timestamp=0)  # Returns whether blobs are supported
-fork.blob_gas_price_calculator(block_number=0, timestamp=0)  # Returns a callable
-fork.excess_blob_gas_calculator(block_number=0, timestamp=0)  # Returns a callable
-fork.min_base_fee_per_blob_gas(block_number=0, timestamp=0)  # Returns minimum base fee per blob gas
-fork.blob_gas_per_blob(block_number=0, timestamp=0)  # Returns blob gas per blob
-fork.target_blobs_per_block(block_number=0, timestamp=0)  # Returns target blobs per block
-fork.max_blobs_per_block(block_number=0, timestamp=0)  # Returns max blobs per block
+fork.supports_blobs()  # Returns whether blobs are supported
+fork.blob_gas_price_calculator()  # Returns a callable
+fork.excess_blob_gas_calculator()  # Returns a callable
+fork.min_base_fee_per_blob_gas()  # Returns minimum base fee per blob gas
+fork.blob_gas_per_blob()  # Returns blob gas per blob
+fork.target_blobs_per_block()  # Returns target blobs per block
+fork.max_blobs_per_block()  # Returns max blobs per block
 ```
 
 ### Meta Information
@@ -149,7 +155,7 @@ Methods for fork identification and comparison:
 
 ```python
 fork.name()  # Returns the name of the fork
-fork.transition_tool_name(block_number=0, timestamp=0)  # Returns name for transition tools
+fork.transition_tool_name()  # Returns name for transition tools
 fork.is_deployed()  # Returns whether the fork is deployed to mainnet
 ```
 
@@ -158,19 +164,70 @@ fork.is_deployed()  # Returns whether the fork is deployed to mainnet
 The framework supports creating transition forks that change behavior at specific block numbers or timestamps:
 
 ```python
-@transition_fork(to_fork=Shanghai, at_timestamp=15_000)
-class ParisToShanghaiAtTime15k(Paris):
+@transition_fork(to_fork=Shanghai, from_fork=Paris, at_timestamp=15_000)
+class ParisToShanghaiAtTime15k(TransitionBaseClass):
     """Paris to Shanghai transition at Timestamp 15k."""
     pass
 ```
 
+### The `TransitionFork` Type
+
+Tests that use the `valid_at_transition_to` marker must type their `fork` parameter as `TransitionFork` instead of the
+regular `Fork` type:
+
+```python
+from execution_testing.forks import TransitionFork
+
+
+@pytest.mark.valid_at_transition_to("London")
+def test_transition_behavior(
+        blockchain_test: BlockchainTestFiller,
+        fork: TransitionFork,
+        pre: Alloc,
+):
+    pass
+```
+
+The `TransitionFork` type provides the following methods:
+
+- `fork.transitions_from()` — returns the fork before the transition
+- `fork.transitions_to()` — returns the fork after the transition
+- `fork.fork_at(block_number=N, timestamp=T)` — returns the active `Fork` at the given block number and timestamp
+
+### Transition Fork Comparisons
+
+Transition forks support comparison operators. A transition fork compares based on its `transitions_to()` fork. For a
+transition `A -> B`:
+
+| Expression  | Result  | Reason                                |
+|-------------|---------|---------------------------------------|
+| `A->B >= A` | `True`  | B is newer than or equal to A         |
+| `A->B <= A` | `False` | B is newer than A, not older or equal |
+| `A->B >= B` | `True`  | B is equal to B                       |
+| `A->B <= B` | `True`  | B is equal to B                       |
+
+This logic mirrors how the test framework determines whether a transition fork is included when evaluating
+`valid_from` / `valid_until` markers:
+
+| Marker    | Comparison  | Transition Included? |
+|-----------|-------------|----------------------|
+| `From A`  | `fork >= A` | Yes                  |
+| `Until A` | `fork <= A` | No                   |
+| `From B`  | `fork >= B` | Yes                  |
+| `Until B` | `fork <= B` | Yes                  |
+
+Comparisons between two transition forks also use their respective `transitions_to()` forks, which enables correct
+sorting of transition forks.
+
+### Testing Behavior Across Transitions
+
 With transition forks, you can test how behavior changes across fork boundaries:
 
 ```python
 # Behavior changes at block 5
 fork = BerlinToLondonAt5
-assert not fork.header_base_fee_required(block_number=4)  # Berlin doesn't require base fee
-assert fork.header_base_fee_required(block_number=5)      # London requires base fee
+assert not fork.fork_at(block_number=4).header_base_fee_required()  # Berlin doesn't require base fee
+assert fork.fork_at(block_number=5).header_base_fee_required()  # London requires base fee
 ```
 
 ## Adding New Fork Methods
@@ -178,16 +235,16 @@ assert fork.header_base_fee_required(block_number=5)      # London requires base
 When adding new fork methods, follow these guidelines:
 
 1. **Abstract Method Definition**: Add the new abstract method to `BaseFork` in `base_fork.py`
-2. **Consistent Parameter Pattern**: Use `block_number` and `timestamp` parameters with default values
-3. **Method Documentation**: Add docstrings explaining the purpose and behavior
-4. **Implementation in Subsequent Forks**: Implement the method in every subsequent fork class **only** if the fork updates the value from previous forks.
+2. **Method Documentation**: Add docstrings explaining the purpose and behavior
+3. **Implementation in Subsequent Forks**: Implement the method in every subsequent fork class **only** if the fork
+   updates the value from previous forks.
 
 Example of adding a new method:
 
 ```python
 @classmethod
 @abstractmethod
-def supports_new_feature(cls, *, block_number: int = 0, timestamp: int = 0) -> bool:
+def supports_new_feature(cls) -> bool:
     """Return whether the given fork supports the new feature."""
     pass
 ```
@@ -196,7 +253,7 @@ Implementation in a fork class:
 
 ```python
 @classmethod
-def supports_new_feature(cls, *, block_number: int = 0, timestamp: int = 0) -> bool:
+def supports_new_feature(cls) -> bool:
     """Return whether the given fork supports the new feature."""
     return False  # Frontier doesn't support this feature
 ```
@@ -205,7 +262,7 @@ Implementation in a newer fork class:
 
 ```python
 @classmethod
-def supports_new_feature(cls, *, block_number: int = 0, timestamp: int = 0) -> bool:
+def supports_new_feature(cls) -> bool:
     """Return whether the given fork supports the new feature."""
     return True  # This fork does support the feature
 ```
@@ -242,16 +299,16 @@ def test_transaction_with_fork_adaptability(fork, state_test):
     # Prepare pre-state
     pre = Alloc()
     sender = pre.fund_eoa()
-    
+
     # Define transaction based on fork capabilities
     tx_params = {
         "gas_limit": 1_000_000,
         "sender": sender,
     }
-    
+
     # Add appropriate transaction type based on fork
-    tx_types = fork.tx_types(block_number=0, timestamp=0)
-    if 3 in tx_types and fork.supports_blobs(block_number=0, timestamp=0):
+    tx_types = fork.tx_types()
+    if 3 in tx_types and fork.supports_blobs():
         # EIP-4844 blob transaction (type 3)
         tx_params["blob_versioned_hashes"] = [Hash.generate_zero_hashes(1)[0]]
     elif 2 in tx_types:
@@ -261,10 +318,10 @@ def test_transaction_with_fork_adaptability(fork, state_test):
     elif 1 in tx_types:
         # EIP-2930 transaction (type 1)
         tx_params["access_list"] = []
-        
+
     # Create and run the test
     tx = Transaction(**tx_params)
-    
+
     state_test(
         env=Environment(),
         pre=pre,
@@ -277,6 +334,9 @@ def test_transaction_with_fork_adaptability(fork, state_test):
 
 ## Conclusion
 
-The Fork class is a powerful abstraction that allows tests to adapt to different Ethereum forks. By using fork methods consistently, you can write tests that automatically handle fork-specific behavior, making your tests more maintainable and future-proof.
+The Fork class is a powerful abstraction that allows tests to adapt to different Ethereum forks. By using fork methods
+consistently, you can write tests that automatically handle fork-specific behavior, making your tests more maintainable
+and future-proof.
 
-When adding new fork methods, keep them focused, well-documented, and implement them across all forks. This will ensure that all tests can benefit from the information and that transitions between forks are handled correctly.
+When adding new fork methods, keep them focused, well-documented, and implement them across all forks. This will ensure
+that all tests can benefit from the information and that transitions between forks are handled correctly.
diff --git a/docs/writing_tests/fuzzer_bridge.md b/docs/writing_tests/fuzzer_bridge.md
index 8659a044978..47dd525a81e 100644
--- a/docs/writing_tests/fuzzer_bridge.md
+++ b/docs/writing_tests/fuzzer_bridge.md
@@ -1,6 +1,6 @@
 # Fuzzer Bridge
 
-The fuzzer bridge provides a seamless integration between blocktest fuzzers and the Ethereum execution-spec-tests framework, enabling automatic generation of valid blockchain test fixtures from fuzzer output.
+The fuzzer bridge provides a seamless integration between blocktest fuzzers and the Ethereum execution-specs framework, enabling automatic generation of valid blockchain test fixtures from fuzzer output.
 
 ## Overview
 
@@ -12,7 +12,7 @@ Fuzzers are excellent at generating test inputs to discover edge cases and bugs
 - System contract interactions
 - Genesis block derivation
 
-The fuzzer bridge handles all these complexities automatically by leveraging the execution-spec-tests framework.
+The fuzzer bridge handles all these complexities automatically by leveraging the execution-specs framework.
 
 ## Architecture
 
@@ -24,7 +24,7 @@ graph LR
 
 ## Installation
 
-The fuzzer bridge is included with the execution-spec-tests framework. Follow the [installation guide](../getting_started/installation.md) to set up EEST.
+The fuzzer bridge is included with the execution-specs framework. Follow the [installation guide](../getting_started/installation.md) to set up EELS.
 
 Once installed, the `fuzzer_bridge` command will be available through `uv run`.
 
@@ -255,8 +255,3 @@ builder.env_overrides = {
 3. **Use Parallel Processing**: For large batches, use `--parallel` flag for better performance
 4. **Version Control**: Track generated fixtures in version control for regression testing
 5. **Continuous Integration**: Integrate fuzzer bridge into CI pipelines for automated testing
-
-## Further Resources
-
-- [EEST Framework Documentation](../index.md)
-- [Ethereum Test Format Specifications](./reference_specification.md)
diff --git a/docs/writing_tests/index.md b/docs/writing_tests/index.md
index 0d3ebee67b3..839903fed40 100644
--- a/docs/writing_tests/index.md
+++ b/docs/writing_tests/index.md
@@ -21,12 +21,11 @@ For help deciding which test format to select, see [Types of Tests](./types_of_t
 
 ## Key Resources
 
-- [Coding Standards](./code_standards.md) - Code style and standards for this repository
+- [Coding Standards](../getting_started/code_standards.md) - Code style and standards for this repository
 - [Adding a New Test](./adding_a_new_test.md) - Step-by-step guide to adding new tests
 - [Writing a New Test](./writing_a_new_test.md) - Detailed guide on writing different test types
 - [Using and Extending Fork Methods](./fork_methods.md) - How to use fork methods to write fork-adaptive tests
 - [Gas Optimization](./gas_optimization.md) - Optimize gas limits in your tests for efficiency and compatibility with future forks.
-- [Porting tests](./porting_legacy_tests.md): A guide to porting @ethereum/tests to EEST.
 
 ## Advanced Topics
 
diff --git a/docs/writing_tests/porting_legacy_tests.md b/docs/writing_tests/porting_legacy_tests.md
deleted file mode 100644
index 813cd0ce3ea..00000000000
--- a/docs/writing_tests/porting_legacy_tests.md
+++ /dev/null
@@ -1,128 +0,0 @@
-# A Guide to Porting Original Ethereum Tests to EEST
-
-## Background
-
-EEST is the successor to [ethereum/tests](https://github.com/ethereum/tests) (aka "original tests"), a repository that defined EVM test cases from the [Frontier](https://ethereum.org/en/history/#frontier) phase up to and including [The Merge](https://ethereum.org/en/history/#paris). These test cases are specified as YAML (and occasionally JSON) files in the [`./src/`](https://github.com/ethereum/tests/tree/develop/src) sub-directory. JSON test fixtures, which are fully-populated tests that can be executed against clients, are generated using [ethereum/retesteth](https://github.com/ethereum/retesteth). These JSON artifacts are regenerated when needed and added to the repository, typically in the [`tests/static/state_tests`](https://github.com/ethereum/execution-spec-tests/tree/main/tests/static/state_tests) sub-directory.
-
-From [Shanghai](https://ethereum.org/en/history/#shapella) onward, new test cases — especially for new features introduced in hard forks—are defined in Python within EEST. While the existing test cases remain important for client testing, porting ethereum/tests to EEST will help maintain and generate tests for newer forks. This also ensures feature parity, as client teams will only need to obtain test fixture releases from one source.
-
-While automating the conversion of the remaining YAML (or JSON) test cases to Python is possible, manually porting individual test cases offers several benefits:
-
-- Reducing the number of test cases by combining multiple YAML (or JSON) cases into a single Python test function using parametrization.
-- Potentially improving coverage by parametrizing the Python version.
-- Producing higher quality code and documentation, which are typically clearer than an automated conversion.
-- Ensuring better organization of tests within the `./tests` folder of execution-spec-tests by fork and EIP.
-
-## Porting an original test
-
-1. Select one or more test cases from `./tests/static/state_tests/` to port and create an issue in this repository AND comment on [this tracker issue.](https://github.com/ethereum/execution-spec-tests/issues/972)
-
-2. [Add a new test](../writing_tests/index.md) in the appropriate fork folder, following the guidelines for [choosing a test type.](../writing_tests/types_of_tests.md#deciding-on-a-test-type)
-
-3. Submit a PR with the ported tests:
-
-     1. Add the list of ported files using python marker to the head of your python test.
-
-        Example:
-
-        ```python
-         @pytest.mark.ported_from(
-        [
-            "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json",
-            "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json",
-        ],
-        pr=["https://github.com/ethereum/execution-spec-tests/pull/1871"],
-        # coverage_missed_reason="Converting solidity code result in following opcode not being used:",
-        ```
-
-        Replace test names with your chosen tests and PR number.
-
-        Uncomment coverage_missed_reason when all the missed coverage lines are approved, usually some opcodes end up not used after translating test logic from lllc, yul.
-
-        But sometimes missed coverage line could hint that you forgot to account important test logic.
-
-        If no coverage is missed, you are good!
-
-     2. Remove the ported files from .tests/static/state_tests in your PR
-
-> See also: 📄 [Getting started with EEST.](../getting_started/repository_overview.md)
-
-## Filling tests
-
-EEST uses pytest to run tests against [EELS (an EVM implementation for testing)](https://github.com/ethereum/execution-specs). This process is known as "filling" and verifies the assertions in your tests. You can use the fill CLI for this. For example, see how to fill the `PUSH` opcode.
-
-```shell
-uv run fill tests/frontier/opcodes/test_push.py
-```
-
-See also: 📄 [Documentation for the `fill` command.](../filling_tests/filling_tests_command_line.md)
-
-> If the tests can't currently be filled, please explain the issue (feel free to also [open a Discussion](https://github.com/ethereum/execution-spec-tests/discussions/new?category=general)).
-
-## Debugging tests
-
-By default, EVM logs are stored in the `logs` folder at the repository root. You can check the `output` folder to review transaction results. If needed, review a previous PR that ported tests (e.g., [the PR porting the `PUSH` opcode](https://github.com/ethereum/execution-spec-tests/pull/975), and [other port PRs](https://github.com/ethereum/execution-spec-tests/pulls?q=is%3Apr+label%3Aport)).
-
-## Test coverage
-
-It's crucial that ported tests maintain coverage parity with _original tests_. This ensures that no critical functions are left untested and prevents the introduction of bugs. A CI workflow automatically checks for coverage.
-
-If coverage action fails (See: 📄 [An example of a failing test coverage](https://github.com/ethereum/execution-spec-tests/actions/runs/13037332959/job/36370897481)), it's recommended to run the coverage action locally (see: 📄 [How to run GitHub actions locally](../dev/test_actions_locally.md)), which should generate a `evmtest_coverage` directory:
-
-```console
-❯ tree evmtest_coverage  -L 2
-evmtest_coverage
-└── coverage
-    ├── BASE
-    ├── BASE_TESTS
-    ├── coverage_BASE.lcov
-    ├── coverage_PATCH.lcov
-    ├── DIFF
-    ├── difflog.txt
-    ├── PATCH
-    └── PATCH_TESTS
-```
-
-Here `BASE`is _original tests_, `PATCH` is the ported test, and `DIFF` is the coverage difference on EVMONE. Open `evmtest_coverage/coverage/DIFF/index.html` in browser:
-
-![Annotated coverage](../img/annotated-coverage.jpg)
-
-| Label |                                   Description                                   |
-| ----- | :-----------------------------------------------------------------------------: |
-| `LBC` |    **Lost base coverage:** Code that was tested before, but is untested now.    |
-| `UBC` |  **Uncovered baseline code:** Code that was untested before and untested now.   |
-| `GBC` | **Gained baseline coverage:** Code that was untested before, but is tested now. |
-| `CBC` |    **Covered baseline code:** Code that was tested before and is tested now.    |
-
-Follow the hyperlinks for lost base coverage (`LBC`) to address coverage gaps. Here is an example coverage loss:
-
-![Missing original coverage](../img/original-coverage-loss.png)
-
-> Lost line coverage from a coverage report. In this case, caused by a missing invocation of `CALLDATALOAD`.
-
-!!! note "Expected coverage loss"
-
-    EEST uses [pytest](https://docs.pytest.org/en/stable/), a popular Python testing framework, to help orchestrate testing Ethereum specifications, while _original tests_ relied on large, static contracts and the EVM to handle much of the execution. This difference can lead to coverage gaps. EEST favors dynamic contract creation for each test vector, while _original tests_ preferred a single static contract with multiple test vectors determined by transaction input data.
-
-    It's important to note that coverage helps identify missing test paths. If you believe the coverage loss is due to differences in "setup" code between frameworks and doesn't impact the feature you're testing, explain this in your PR. A team member can help with the review.
-
-    For example, review the [discussion in this PR] to see an example of why and how coverage loss can occur.(https://github.com/ethereum/execution-spec-tests/pull/975#issuecomment-2528792289)
-
-## Resolving Coverage Gaps from Yul Compilation
-
-When porting tests from ethereum/tests, you may encounter coverage gaps that are false positives. This commonly occurs because:
-
-- **Original tests** often used Yul to define smart contracts, and solc compilation introduces additional opcodes that aren't specifically under test
-- **EEST ports** use the explicit EEST Opcode mini-language, which is more precise in opcode definition
-
-If coverage analysis shows missing opcodes that were only present due to Yul compilation artifacts (not the actual feature being tested), this can be resolved during PR review by adding the `coverage_missed_reason` parameter:
-
-```python
-@pytest.mark.ported_from(
-    ["path/to/original_test.json"],
-    coverage_missed_reason="Missing opcodes are Yul compilation artifacts, not part of tested feature"
-)
-```
-
-!!! note "Add coverage_missed_reason only after PR review"
-    Only add `coverage_missed_reason` after PR review determines the coverage gap is acceptable, never preemptively. This helps maintain test coverage integrity while accounting for legitimate differences between Yul-based and EEST opcode-based implementations.
diff --git a/docs/writing_tests/post_mortems.md b/docs/writing_tests/post_mortems.md
index 2b6373adf94..5c18ef41fd4 100644
--- a/docs/writing_tests/post_mortems.md
+++ b/docs/writing_tests/post_mortems.md
@@ -78,7 +78,7 @@ IDs of the tests added that now cover the missed scenario and link to the docume
 
 *Example:*
 
-- [`tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1msm.py::test_invalid\[fork_Prague-state_test---bls_g1_truncated_input-\]`](https://eest.ethereum.org/main/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1msm/test_invalid/)
+- [`tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1msm.py::test_invalid\[fork_Prague-state_test---bls_g1_truncated_input-\]`](../tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1msm/test_invalid.md)
 
 ### Framework/Documentation Changes
 
diff --git a/docs/writing_tests/reference_specification.md b/docs/writing_tests/reference_specification.md
index 347a79075bb..a3b7c458769 100644
--- a/docs/writing_tests/reference_specification.md
+++ b/docs/writing_tests/reference_specification.md
@@ -63,7 +63,7 @@ This would only check EIP versions for the EIP-3651 tests in the `shanghai/eip36
 
 ## Automated Checks via GitHub Actions
 
-The repository includes a [GitHub Actions workflow](https://github.com/ethereum/execution-spec-tests/actions/workflows/check_eip_versions.yaml) that automatically runs `check_eip_versions` on a daily schedule. If any outdated EIP references are detected, the workflow creates an issue in the repository with details about which references need to be updated.
+The repository includes a [GitHub Actions workflow](https://github.com/ethereum/execution-specs/actions/workflows/check_eip_versions.yaml) that automatically runs `check_eip_versions` on a daily schedule. If any outdated EIP references are detected, the workflow creates an issue in the repository with details about which references need to be updated.
 
 This workflow uses GitHub's built-in token for authentication, so there's no need to configure personal access tokens for the automated checks. The issue will include links to the relevant workflow run and details about which tests need updating.
 
diff --git a/docs/writing_tests/test_markers.md b/docs/writing_tests/test_markers.md
index 4569ba2a625..22c613ab498 100644
--- a/docs/writing_tests/test_markers.md
+++ b/docs/writing_tests/test_markers.md
@@ -16,12 +16,19 @@ These markers are used to specify the forks for which a test is valid.
 
 :::execution_testing.cli.pytest_commands.plugins.forks.forks.ValidUntil
 
+### `@pytest.mark.valid_before("FORK_OR_EIP")`
+
+:::execution_testing.cli.pytest_commands.plugins.forks.forks.ValidBefore
+
 ### `@pytest.mark.valid_at("FORK_NAME_1", "FORK_NAME_2", ...)`
 
 :::execution_testing.cli.pytest_commands.plugins.forks.forks.ValidAt
 
 ### `@pytest.mark.valid_at_transition_to("FORK_NAME")`
 
+!!! important
+    Tests using this marker must type their `fork` parameter as `TransitionFork` (imported from `execution_testing`) instead of the regular `Fork` type. The `TransitionFork` type provides transition-specific methods such as `fork_at()`, `transitions_to()`, and `transitions_from()`. See [Transition Fork Tests](./writing_a_new_test.md#transition-fork-tests) for details.
+
 :::execution_testing.cli.pytest_commands.plugins.forks.forks.ValidAtTransitionTo
 
 ## Fork Covariant Markers
@@ -60,7 +67,7 @@ This marker only differs from `pytest.mark.with_all_tx_types` in that it does no
 This marker is used to automatically parameterize a test with all typed transactions, including `type=0` (legacy transaction), that are valid for the fork being tested.
 This marker is an indirect marker that utilizes the `tx_type` values from the `pytest.mark.with_all_tx_types` marker to build default typed transactions for each `tx_type`.
 
-Optional: Default typed transactions used as values for `typed_transaction` exist in `src/execution_testing/cli/pytest_commands/plugins/shared/transaction_fixtures.py` and can be overridden for the scope of
+Optional: Default typed transactions used as values for `typed_transaction` exist in `packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/transaction_fixtures.py` and can be overridden for the scope of
 the test by re-defining the appropriate `pytest.fixture` for that transaction type.
 
 ```python
@@ -196,6 +203,30 @@ def test_something_with_all_system_contracts(
 
 In this example, the test will be parameterized for parameter `system_contract` with value `[0x000F3DF6D732807EF1319FB7B8BB8522D0BEAC02]` for fork Cancun.
 
+### `@pytest.mark.with_all_refund_types`
+
+This marker is used to automatically parameterize a test with all types of refunds that are valid for the fork being tested.
+
+Useful to mark tests to fail if a new refund type is introduced by a future fork and the test needs to be kept up to date and maintained.
+
+```python
+import pytest
+
+from execution_testing import Address, Alloc, RefundTypes, StateTestFiller
+
+@pytest.mark.with_all_refund_types
+@pytest.mark.valid_from("Prague")
+def test_something_with_all_refund_types(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    refund_type: RefundTypes,
+):
+    pass
+
+```
+
+In this example, the test will be parameterized for parameter `refund_type` with value `[RefundTypes.STORAGE_CLEAR, RefundTypes.AUTHORIZATION_EXISTING_AUTHORITY]` for fork Prague.
+
 ### Covariant Marker Keyword Arguments
 
 All fork covariant markers accept the following keyword arguments:
@@ -325,7 +356,7 @@ In this example, the test will be marked as expected to fail when it is being ex
 
 ### `@pytest.mark.slow`
 
-This marker is used to mark tests that are slow to run. These tests are not run during [`tox` checks](./verifying_changes.md), and are only run when a release is being prepared.
+This marker is used to mark tests that are slow to run. These tests are not run during [CI checks](../getting_started/verifying_changes.md), and are only run when a release is being prepared.
 
 ### `@pytest.mark.pre_alloc_mutable`
 
diff --git a/docs/writing_tests/tutorials/blockchain.md b/docs/writing_tests/tutorials/blockchain.md
index d6082529d5c..b9b0b068de7 100644
--- a/docs/writing_tests/tutorials/blockchain.md
+++ b/docs/writing_tests/tutorials/blockchain.md
@@ -66,7 +66,7 @@ Each integer in the `tx_per_block` array is the number of transactions in a bloc
 tx_per_block = [2, 0, 4, 8, 0, 0, 20, 1, 50]
 ```
 
-The code section that creates the blocks is a bit complex in this test. For some simpler definitions of Block creation you can browse tests within [`test_withdrawals.py`](https://github.com/ethereum/execution-spec-tests/blob/main/tests/shanghai/eip4895_withdrawals/test_withdrawals.py).
+The code section that creates the blocks is a bit complex in this test. For some simpler definitions of Block creation you can browse tests within [`test_withdrawals.py`](https://github.com/ethereum/execution-specs/blob/a830dab6f130151ab9023a473b7543120aa21961/tests/shanghai/eip4895_withdrawals/test_withdrawals.py).
 
 ```python
 blocks = map(
diff --git a/docs/writing_tests/tutorials/state_transition.md b/docs/writing_tests/tutorials/state_transition.md
index 8c9e37deb7b..08d279c98bd 100644
--- a/docs/writing_tests/tutorials/state_transition.md
+++ b/docs/writing_tests/tutorials/state_transition.md
@@ -69,7 +69,7 @@ This is the format of a [Python function](https://docs.python.org/3/tutorial/con
 It starts with `def <function name>(<parameters>):`, and then has indented code for the function.
 The function definition ends when there is a line that is no longer indented. As with files, by convention functions start with a string that explains what the function does.
 
-The function parameters (`state_test` and `pre`) are [pytest fixtures](https://docs.pytest.org/en/latest/explanation/fixtures.html) provided by the execution-spec-tests framework. Pytest fixtures are a powerful dependency injection mechanism that automatically provide objects to your test functions.
+The function parameters (`state_test` and `pre`) are [pytest fixtures](https://docs.pytest.org/en/latest/explanation/fixtures.html) provided by the execution-specs framework. Pytest fixtures are a powerful dependency injection mechanism that automatically provide objects to your test functions.
 
 **The `state_test` fixture** is a callable that you *must* include in *state test* function arguments. When called at the end of your test function with the environment, pre-state, transaction, and expected post-state, it generates the actual test fixtures. This callable is a wrapper around the `StateTest` class.
 
@@ -79,7 +79,7 @@ The function parameters (`state_test` and `pre`) are [pytest fixtures](https://d
     env = Environment(number=1)
 ```
 
-This line specifies that `env` is an [`Environment`][execution_testing.test_types.Environment] object. In this example, we only override the block `number` to 1, leaving all other values at their defaults. It's recommended to use default values whenever possible and only specify custom values when required for your specific test scenario. (For all available fields, see the pydantic model fields in the source code of [`Environment`][execution_testing.test_types.Environment] and [`EnvironmentGeneric`](https://github.com/ethereum/execution-spec-tests/blob/b4d7826bec631574a6fb95d0c58d2c8c4d6e02ca/packages/testing/src/execution_testing/test_types/block_types.py#L76) from which `Environment` inherits.)
+This line specifies that `env` is an [`Environment`][execution_testing.test_types.Environment] object. In this example, we only override the block `number` to 1, leaving all other values at their defaults. It's recommended to use default values whenever possible and only specify custom values when required for your specific test scenario. (For all available fields, see the pydantic model fields in the source code of [`Environment`][execution_testing.test_types.Environment] and [`EnvironmentGeneric`](https://github.com/ethereum/execution-specs/blob/b4d7826bec631574a6fb95d0c58d2c8c4d6e02ca/packages/testing/src/execution_testing/test_types/block_types.py#L76) from which `Environment` inherits.)
 
 #### Pre State
 
@@ -132,7 +132,7 @@ The returned object, which includes a private key, an address, and a nonce, is s
     )
 ```
 
-With the pre-state built, we can now create the transaction that will call our contract. Let's examine the key components of this [`Transaction`][execution_testing.test_types.Transaction] (for all available fields, see the source code of [`Transaction`][execution_testing.test_types.Transaction] and [`TransactionGeneric`](https://github.com/ethereum/execution-spec-tests/blob/b4d7826bec631574a6fb95d0c58d2c8c4d6e02ca/packages/testing/src/execution_testing/test_types/transaction_types.py#L163) from which `Transaction` inherits).
+With the pre-state built, we can now create the transaction that will call our contract. Let's examine the key components of this [`Transaction`][execution_testing.test_types.Transaction] (for all available fields, see the source code of [`Transaction`][execution_testing.test_types.Transaction] and [`TransactionGeneric`](https://github.com/ethereum/execution-specs/blob/b4d7826bec631574a6fb95d0c58d2c8c4d6e02ca/packages/testing/src/execution_testing/test_types/transaction_types.py#L163) from which `Transaction` inherits).
 
 - **`sender=sender`**: We use the EOA we created earlier, which already has the necessary information to sign the transaction and contains the correct `nonce`. The `nonce` is a protection mechanism to prevent replay attacks - it must equal the number of transactions sent from the sender's address, starting from zero. The framework automatically manages nonce incrementing for us.
 
diff --git a/docs/writing_tests/types_of_tests.md b/docs/writing_tests/types_of_tests.md
index 97c3914f53f..ae5ff062c05 100644
--- a/docs/writing_tests/types_of_tests.md
+++ b/docs/writing_tests/types_of_tests.md
@@ -37,12 +37,15 @@ Blockchain tests span multiple blocks which may or may not contain transactions
 
 ### Fork Transition Tests
 
-There is a special type of blockchain test that is used to test a fork transition. It's not executed for all possible forks, rather it targets exactly the blocks at the point of transition from one evm implementation to the next. This type of test must be marked with the `valid_at_transition_to` marker, for example:
+There is a special type of blockchain test that is used to test a fork transition. It's not executed for all possible forks, rather it targets exactly the blocks at the point of transition from one evm implementation to the next. This type of test must be marked with the `valid_at_transition_to` marker and use the `TransitionFork` type for the `fork` parameter instead of the regular `Fork` type, for example:
 
 ```python
+from execution_testing.forks import TransitionFork
+
 @pytest.mark.valid_at_transition_to("Cancun")
 def test_blob_type_tx_pre_fork(
     blockchain_test: BlockchainTestFiller,
+    fork: TransitionFork,
     pre: Dict,
     env: Environment,
     blocks: List[Block],
@@ -52,6 +55,9 @@ def test_blob_type_tx_pre_fork(
     """
 ```
 
+!!! note
+    The `fork` parameter must be typed as `TransitionFork` (not `Fork`) when using the `valid_at_transition_to` marker. The `TransitionFork` type provides transition-specific methods such as `fork_at()`, `transitions_to()`, and `transitions_from()` that are needed to query behavior at different points during the transition. See [Fork Transitions](./fork_methods.md#fork-transitions) for more details.
+
 ## Transaction Tests
 
 ### Purpose
@@ -73,6 +79,6 @@ Test correct transaction rejection/acceptance of a serialized transaction (curre
 
 Whenever possible, use `state_test` to examine individual transactions. This method is more straightforward and less prone to external influences that can occur during block building.
 
-This provides more targeted testing since it does not invoke the client's block-building machinery. This reduces the risk of encountering false positives, particularly in exception scenarios (e.g., see issue [#343: "Zero max_fee_per_blob_gas test is ineffective"](https://github.com/ethereum/execution-spec-tests/issues/343)).
+This provides more targeted testing since it does not invoke the client's block-building machinery. This reduces the risk of encountering false positives, particularly in exception scenarios (e.g., see issue [#343: "Zero max_fee_per_blob_gas test is ineffective"](https://github.com/ethereum/execution-specs/issues/343)).
 
 Moreover, the `fill` command automatically additionally generates a `blockchain_test` for every `state_test` by wrapping the `state_test`'s transaction in a block.
diff --git a/docs/writing_tests/verifying_changes.md b/docs/writing_tests/verifying_changes.md
deleted file mode 100644
index d36f784270e..00000000000
--- a/docs/writing_tests/verifying_changes.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Verifying Changes
-
-!!! warning "Documentation Moved"
-    This documentation has been relocated to [Detailed Code Standards](../getting_started/code_standards_details.md). Please use the new location for the most up-to-date information.
diff --git a/docs/writing_tests/writing_a_new_test.md b/docs/writing_tests/writing_a_new_test.md
index 936b0b9d369..d8e0de0d7fa 100644
--- a/docs/writing_tests/writing_a_new_test.md
+++ b/docs/writing_tests/writing_a_new_test.md
@@ -19,7 +19,7 @@ Test cases can (and it most cases should) be decorated with one or more "validit
 
 or
 
-- `pytest.mark.valid_at_transition_to(FORK)`
+- `pytest.mark.valid_at_transition_to(FORK)` (requires the `fork` parameter to use the `TransitionFork` type instead of `Fork`, see [Transition Fork Tests](#transition-fork-tests))
 
 markers on either the test function, test class or test module level:
 
@@ -56,6 +56,38 @@ The [`execution_testing.forks`](../library/execution_testing_forks.md) package d
 - [forks_from](../library/execution_testing_forks.md#execution_testing.forks.forks_from)
 - [forks_from_until](../library/execution_testing_forks.md#execution_testing.forks.forks_from_until)
 
+### Transition Fork Tests
+
+When writing tests that use the `valid_at_transition_to` marker, the `fork` parameter must be typed as `TransitionFork` instead of `Fork`:
+
+```python
+import pytest
+
+from execution_testing.forks import TransitionFork
+from execution_testing.tools import Alloc, BlockchainTestFiller
+
+@pytest.mark.valid_at_transition_to("London")
+def test_something_at_transition(
+    blockchain_test: BlockchainTestFiller,
+    fork: TransitionFork,
+    pre: Alloc,
+):
+    pass
+```
+
+The `TransitionFork` type represents a fork that transitions from one fork to another at a specific block number or timestamp. It provides methods not available on regular `Fork`:
+
+- `fork.transitions_from()` — returns the fork before the transition (e.g. `Berlin`)
+- `fork.transitions_to()` — returns the fork after the transition (e.g. `London`)
+- `fork.fork_at(block_number=N, timestamp=T)` — returns the active fork at the given block/timestamp
+
+Transition forks support comparison operators that compare based on the `transitions_to()` fork. For example, given a transition `Berlin -> London`:
+
+- `BerlinToLondonAt5 >= Berlin` is `True` (the transition encompasses Berlin)
+- `BerlinToLondonAt5 <= Berlin` is `False` (the transition goes beyond Berlin)
+- `BerlinToLondonAt5 >= London` is `True`
+- `BerlinToLondonAt5 <= London` is `True`
+
 ### The `state_test` and `blockchain_test` Test Function Arguments
 
 The test function's signature _must_ contain exactly one of either a `state_test` or `blockchain_test` argument.
@@ -146,7 +178,7 @@ which allows checking for an exact `gas_used` value.
 
 ## Writing code for the accounts in the test
 
-Account bytecode can be "deployed" in a test's pre-state using the `pre` pytest fixture. The @ethereum/execution-spec-tests Python [`Opcodes`][execution_testing.vm.Opcodes] minilang can be used to help write the bytecode in a readable form.
+Account bytecode can be "deployed" in a test's pre-state using the `pre` pytest fixture. The @ethereum/execution-specs Python [`Opcodes`][execution_testing.vm.Opcodes] minilang can be used to help write the bytecode in a readable form.
 
 ### Using the Python Opcode Minilang
 
@@ -205,7 +237,7 @@ uv run evm_bytes hex-string 0x604260005260206000F3
 
 #### Restrictions: No Yul in Python Test Cases
 
-As of [PR #1779](https://github.com/ethereum/execution-spec-tests/pull/1779), the use of Yul source in Python test cases is forbidden. All new tests must use the Python opcode minilang as shown above.
+As of [PR #1779](https://github.com/ethereum/execution-specs/pull/1779), the use of Yul source in Python test cases is forbidden. All new tests must use the Python opcode minilang as shown above.
 
 ## Verifying the Accounts' Post States
 
@@ -235,7 +267,7 @@ Within the `post` dictionary object, an account address can be:
 The `Account` object is used to specify the properties of an account to be
 verified in the post state.
 
-The python representation can be found in [packages/testing/src/execution_testing/test_types/account_types.py](https://github.com/ethereum/execution-spec-tests/blob/main/packages/testing/src/execution_testing/test_types/account_types.py).
+The python representation can be found in [packages/testing/src/execution_testing/test_types/account_types.py](https://github.com/ethereum/execution-specs/blob/a830dab6f130151ab9023a473b7543120aa21961/packages/testing/src/execution_testing/test_types/account_types.py).
 
 It can verify the following properties of an account:
 
diff --git a/mkdocs.yml b/mkdocs.yml
index bd382776217..f5f9fa55257 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,10 +1,9 @@
 site_name: Ethereum Execution Specs
-site_description: The Ethereum Execution Layer Python Specifications and Tests
-site_url: https://eest.ethereum.org/
+site_description: The Ethereum Execution Layer Specifications and Tests
+site_url: !ENV [SITE_URL, "https://steel.ethereum.foundation/docs/execution-specs/"]
 repo_url: https://github.com/ethereum/execution-specs
 repo_name: execution-specs
-edit_uri: edit/main/docs/
-copyright: "Copyright: 2025, Ethereum Community"
+copyright: "Copyright: 2026, Ethereum Community"
 
 plugins:
   - git-authors:
@@ -32,6 +31,9 @@ plugins:
   - literate-nav:
       nav_file: navigation.md
 
+hooks:
+  - docs/hooks/reference_new_tab.py
+
 watch:
   - CONTRIBUTING.md
   - SECURITY.md
@@ -40,8 +42,8 @@ watch:
 
 theme:
   name: material
-  logo: img/Ethereum-logo-600px.png
-  favicon: img/ETH-logo-icon.svg
+  logo: img/eth-diamond-white.png
+  favicon: img/eth-diamond-orange.svg
   language: en
   features:
     - content.code.copy
@@ -52,25 +54,21 @@ theme:
     - navigation.instant
     - navigation.tabs
     - navigation.footer
-  # disabled due to https://github.com/ethereum/execution-specs/issues/1491
-  # palette:
-  #   # Palette toggle for automatic mode
-  #   - media: "(prefers-color-scheme)"
-  #     toggle:
-  #       icon: material/brightness-auto
-  #       name: Switch to light mode
-  #   Palette toggle for light mode
-  #   - media: "(prefers-color-scheme: light)"
-  #    scheme: default
-  #    toggle:
-  #      icon: material/brightness-7
-  #      name: Switch to dark mode
-  #   # Palette toggle for dark mode
-  #   - media: "(prefers-color-scheme: dark)"
-  #     scheme: slate
-  #     toggle:
-  #       icon: material/brightness-4
-  #       name: Switch to system preference
+  palette:
+    - media: "(prefers-color-scheme: light)"
+      scheme: default
+      primary: deep-orange
+      accent: deep-orange
+      toggle:
+        icon: material/brightness-7
+        name: Switch to dark mode
+    - media: "(prefers-color-scheme: dark)"
+      scheme: slate
+      primary: deep-orange
+      accent: deep-orange
+      toggle:
+        icon: material/brightness-4
+        name: Switch to light mode
 
 markdown_extensions:
   - abbr
diff --git a/packages/testing/pyproject.toml b/packages/testing/pyproject.toml
index ee5c2c7ddf4..6aacab447a7 100644
--- a/packages/testing/pyproject.toml
+++ b/packages/testing/pyproject.toml
@@ -12,7 +12,7 @@ description = "Ethereum execution layer client test generation and runner framew
 readme = "README.md"
 requires-python = ">=3.11"
 license = "MIT"
-license-files = [ "LICENSE" ]
+license-files = ["LICENSE"]
 keywords = ["ethereum", "testing", "blockchain"]
 classifiers = [
     "Programming Language :: Python :: 3.11",
@@ -20,7 +20,7 @@ classifiers = [
 ]
 dependencies = [
     "click>=8.1.0,<9",
-    "ethereum-hive>=0.1.0a1,<1.0.0",
+    "ethereum-hive>=0.1.0a5,<1.0.0",
     "ethereum-execution",
     "gitpython>=3.1.31,<4",
     "PyJWT>=2.3.0,<3",
@@ -39,19 +39,20 @@ dependencies = [
     "pydantic>=2.12.3,<3",
     "rich>=13.7.0,<15",
     "filelock>=3.15.1,<4",
-    "ethereum-types>=0.3.0,<0.4",
+    "ethereum-types>=0.4.1,<0.5",
     "pyyaml>=6.0.2,<7",
     "types-pyyaml>=6.0.12.20240917,<7",
     "pytest-json-report>=1.5.0,<2",
     "typing-extensions>=4.12.2,<5",
     "questionary>=2.1.0,<3",
-    "ethereum-rlp>=0.1.5,<0.2",
+    "ethereum-rlp>=0.1.6,<0.2",
     "pytest-regex>=0.2.0,<0.3",
     "eth-abi>=5.2.0",
     "joblib>=1.4.2",
     "ckzg>=2.1.3,<3",
     "tenacity>=9.0.0,<10",
     "Jinja2>=3,<4",
+    "ijson>=3.3,<4",
 ]
 
 [project.urls]
@@ -59,7 +60,6 @@ Homepage = "https://github.com/ethereum/execution-specs"
 Documentation = "https://eest.ethereum.org"
 Repository = "https://github.com/ethereum/execution-specs"
 Issues = "https://github.com/ethereum/execution-specs/issues"
-Changelog = "https://eest.ethereum.org/main/CHANGELOG/"
 
 [dependency-groups]
 test = [
@@ -67,12 +67,12 @@ test = [
 ]
 lint = [
     "ruff==0.13.2",
-    "mypy==1.17.0",
+    "mypy==1.20.0",
     "types-requests>=2.31,<2.33",
 ]
 dev = [
-    {include-group = "test"},
-    {include-group = "lint"},
+    { include-group = "test" },
+    { include-group = "lint" },
 ]
 
 [project.scripts]
@@ -84,12 +84,13 @@ checkfixtures = "execution_testing.cli.check_fixtures:check_fixtures"
 check_eip_versions = "execution_testing.cli.pytest_commands.check_eip_versions:check_eip_versions"
 consume = "execution_testing.cli.pytest_commands.consume:consume"
 protec = "execution_testing.cli.pytest_commands.consume:consume"
+build-block = "execution_testing.cli.pytest_commands.build_block:build_block"
+fill-stateful = "execution_testing.cli.pytest_commands.fill_stateful:fill_stateful"
 checklist = "execution_testing.cli.pytest_commands.checklist:checklist"
 generate_checklist_stubs = "execution_testing.cli.generate_checklist_stubs:generate_checklist_stubs"
 genindex = "execution_testing.cli.gen_index:generate_fixtures_index_cli"
 gentest = "execution_testing.cli.gentest:generate"
-pyspelling_soft_fail = "execution_testing.cli.tox_helpers:pyspelling"
-markdownlintcli2_soft_fail = "execution_testing.cli.tox_helpers:markdownlint"
+markdownlintcli2_soft_fail = "execution_testing.cli.ci_helpers:markdownlint"
 order_fixtures = "execution_testing.cli.order_fixtures:order_fixtures"
 evm_bytes = "execution_testing.cli.evm_bytes:evm_bytes"
 hasher = "execution_testing.cli.hasher:main"
@@ -99,7 +100,6 @@ groupstats = "execution_testing.cli.show_pre_alloc_group_stats:main"
 extract_config = "execution_testing.cli.extract_config:extract_config"
 compare_fixtures = "execution_testing.cli.compare_fixtures:main"
 modify_static_test_gas_limits = "execution_testing.cli.modify_static_test_gas_limits:main"
-validate_changelog = "execution_testing.cli.tox_helpers:validate_changelog"
 benchmark_parser = "execution_testing.cli.benchmark_parser:main"
 
 [tool.setuptools.packages.find]
@@ -107,7 +107,7 @@ where = ["src"]
 exclude = ["*tests*"]
 
 [tool.setuptools.package-data]
-"execution_testing.forks" = ["forks/contracts/*.bin"]
+"execution_testing.forks" = ["forks/eips/**/*.bin"]
 "execution_testing.cli.pytest_commands.plugins.execute" = ["eth_config/networks.yml"]
 "execution_testing.cli.eest.make" = ["templates/*.j2"]
 "execution_testing.cli.pytest_commands" = ["pytest_ini_files/*.ini"]
diff --git a/packages/testing/src/execution_testing/__init__.py b/packages/testing/src/execution_testing/__init__.py
index c5647839ffc..e8a5b2e3211 100644
--- a/packages/testing/src/execution_testing/__init__.py
+++ b/packages/testing/src/execution_testing/__init__.py
@@ -30,7 +30,7 @@
     TransactionException,
 )
 from .fixtures import BaseFixture, FixtureCollector
-from .forks import Fork, GasCosts
+from .forks import Fork, GasCosts, RefundTypes, TransitionFork
 from .specs import (
     BaseTest,
     BenchmarkTest,
@@ -41,6 +41,7 @@
     BlockchainTest,
     BlockchainTestFiller,
     Header,
+    OpcodeTarget,
     StateTest,
     StateTestFiller,
     TransactionTest,
@@ -51,6 +52,7 @@
     EOA,
     Alloc,
     AuthorizationTuple,
+    BalAccountAbsentValues,
     BalAccountChange,
     BalAccountExpectation,
     BalBalanceChange,
@@ -99,6 +101,7 @@
     Switch,
     TransactionWithCost,
     While,
+    WhileGas,
     extend_with_defaults,
     gas_test,
     generate_system_contract_deploy_test,
@@ -123,6 +126,7 @@
     "Address",
     "Alloc",
     "AuthorizationTuple",
+    "BalAccountAbsentValues",
     "BalAccountChange",
     "BalAccountExpectation",
     "BalBalanceChange",
@@ -173,6 +177,7 @@
     "Macros",
     "MemoryVariable",
     "NetworkWrappedTransaction",
+    "OpcodeTarget",
     "Op",
     "Opcode",
     "OpcodeCallArg",
@@ -180,6 +185,7 @@
     "ParameterSet",
     "ReferenceSpec",
     "ReferenceSpecTypes",
+    "RefundTypes",
     "Removable",
     "Requests",
     "SequentialAddressLayout",
@@ -201,7 +207,9 @@
     "TransactionTestFiller",
     "TransactionType",
     "TransactionWithCost",
+    "TransitionFork",
     "While",
+    "WhileGas",
     "CoerceBytes",
     "Withdrawal",
     "WithdrawalRequest",
diff --git a/packages/testing/src/execution_testing/base_types/base_types.py b/packages/testing/src/execution_testing/base_types/base_types.py
index 0bb63e69eca..b42fb315485 100644
--- a/packages/testing/src/execution_testing/base_types/base_types.py
+++ b/packages/testing/src/execution_testing/base_types/base_types.py
@@ -13,7 +13,7 @@
     TypeVar,
 )
 
-from Crypto.Hash import keccak
+from ethereum.crypto.hash import keccak256 as _keccak256
 from pydantic import GetCoreSchemaHandler, StringConstraints
 from pydantic_core.core_schema import (
     PlainValidatorFunctionSchema,
@@ -201,8 +201,7 @@ def hex(self, *args: Any, **kwargs: Any) -> str:
 
     def keccak256(self) -> "Hash":
         """Return the keccak256 hash of the opcode byte representation."""
-        k = keccak.new(digest_bits=256)
-        return Hash(k.update(bytes(self)).digest())
+        return Hash(_keccak256(self))
 
     def sha256(self) -> "Hash":
         """Return the sha256 hash of the opcode byte representation."""
diff --git a/packages/testing/src/execution_testing/base_types/tests/test_base_types.py b/packages/testing/src/execution_testing/base_types/tests/test_base_types.py
index 49ce901868b..aebbff67427 100644
--- a/packages/testing/src/execution_testing/base_types/tests/test_base_types.py
+++ b/packages/testing/src/execution_testing/base_types/tests/test_base_types.py
@@ -280,7 +280,7 @@ def test_json_deserialization(
         self,
         can_be_deserialized: bool,
         model_instance: Any,
-        json: str | Dict[str, Any],
+        json: Dict[str, Any],
     ) -> None:
         """Test that to_json returns the expected JSON for the given object."""
         if not can_be_deserialized:
diff --git a/packages/testing/src/execution_testing/base_types/tests/test_keccak_dispatch.py b/packages/testing/src/execution_testing/base_types/tests/test_keccak_dispatch.py
new file mode 100644
index 00000000000..95bd341ba6d
--- /dev/null
+++ b/packages/testing/src/execution_testing/base_types/tests/test_keccak_dispatch.py
@@ -0,0 +1,174 @@
+"""
+Tests for the Keccak backend dispatch in `ethereum.crypto.hash`.
+
+The module decides at import time whether to use hashlib (linked OpenSSL)
+or pycryptodome, depending on whether `hashlib.new("keccak-256", ...)`
+succeeds. These tests verify:
+
+* both backends produce byte-identical output (cross-backend equivalence);
+* the fallback engages cleanly when hashlib raises, simulated via
+  monkeypatch so we can exercise the path on a Python whose OpenSSL does
+  expose Keccak;
+* on a Python where hashlib supports Keccak, the fast path is selected
+  (guards against a regression where `algorithms_available` lies and the
+  module silently forces every user onto pycryptodome).
+"""
+
+import hashlib
+import importlib
+from collections.abc import Iterator
+from typing import Any
+from unittest.mock import patch
+
+import pytest
+
+# Pre-NIST Keccak vectors. Empty-input digests are widely published; the
+# `hashme` vector was confirmed against a working hashlib build during
+# PR #2370 review.
+KECCAK256_VECTORS: list[tuple[bytes, str]] = [
+    (
+        b"",
+        "c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+    ),
+    (
+        b"abc",
+        "4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45",
+    ),
+    (
+        b"hashme",
+        "7f98885dc9cf152c0bb08eaf056668f99c47cabd8fe01b1276f9a305b1389646",
+    ),
+]
+
+KECCAK512_VECTORS: list[tuple[bytes, str]] = [
+    (
+        b"",
+        "0eab42de4c3ceb9235fc91acffe746b29c29a8c366b7c60e4e67c466f36a4304"
+        "c00fa9caf9d87976ba469bcbe06713b435f091ef2769fb160cdab33d3670680e",
+    ),
+]
+
+
+def _hashlib_has_keccak() -> bool:
+    """Return True if `hashlib.new("keccak-256", ...)` succeeds here."""
+    try:
+        hashlib.new("keccak-256")
+    except ValueError:
+        return False
+    return True
+
+
+def _clean_reimport_hash() -> Any:
+    """Drop and reimport `ethereum.crypto.hash` for a fresh dispatch run."""
+    mod = importlib.import_module("ethereum.crypto.hash")
+    return importlib.reload(mod)
+
+
+@pytest.fixture
+def restore_hash_module() -> Iterator[None]:
+    """Restore the natural-state `ethereum.crypto.hash` after each test."""
+    yield
+    _clean_reimport_hash()
+
+
+@pytest.mark.parametrize("buffer, expected_hex", KECCAK256_VECTORS)
+def test_keccak256_known_vectors(buffer: bytes, expected_hex: str) -> None:
+    """Active backend produces published Keccak-256 digests."""
+    from ethereum.crypto.hash import keccak256
+
+    assert keccak256(buffer).hex() == expected_hex
+
+
+@pytest.mark.parametrize("buffer, expected_hex", KECCAK512_VECTORS)
+def test_keccak512_known_vectors(buffer: bytes, expected_hex: str) -> None:
+    """Active backend produces published Keccak-512 digests."""
+    from ethereum.crypto.hash import keccak512
+
+    assert keccak512(buffer).hex() == expected_hex
+
+
+def test_both_backends_agree() -> None:
+    """Hashlib and pycryptodome produce byte-identical Keccak-256 output."""
+    if not _hashlib_has_keccak():
+        pytest.skip("hashlib lacks keccak-256 on this OpenSSL build")
+
+    from Crypto.Hash import keccak as pyc_keccak
+
+    inputs = [
+        b"",
+        b"x",
+        b"\x00" * 64,
+        bytes(range(256)),
+        b"a" * 4096,
+        b"\xff" * 65536,
+    ]
+    for buf in inputs:
+        hl = hashlib.new("keccak-256", buf).digest()
+        pc = pyc_keccak.new(digest_bits=256).update(buf).digest()
+        assert hl == pc, f"backends disagree on input of length {len(buf)}"
+
+
+def test_fallback_engages_when_hashlib_lacks_keccak(
+    restore_hash_module: None,
+) -> None:
+    """If hashlib raises for Keccak, the module uses pycryptodome instead."""
+    del restore_hash_module
+    real_new = hashlib.new
+
+    def mocked_new(name: str, *args: Any, **kwargs: Any) -> Any:
+        if name in ("keccak-256", "keccak-512"):
+            raise ValueError(f"unsupported hash type {name}")
+        return real_new(name, *args, **kwargs)
+
+    with patch.object(hashlib, "new", side_effect=mocked_new):
+        h = _clean_reimport_hash()
+
+        assert h._USE_HASHLIB is False, (
+            "module did not engage pycryptodome fallback"
+        )
+        for buffer, expected_hex in KECCAK256_VECTORS:
+            assert h.keccak256(buffer).hex() == expected_hex
+        for buffer, expected_hex in KECCAK512_VECTORS:
+            assert h.keccak512(buffer).hex() == expected_hex
+
+
+def test_native_path_used_when_hashlib_has_keccak(
+    restore_hash_module: None,
+) -> None:
+    """
+    Verify hashlib path is selected when keccak-256 is supported.
+
+    Guards against a regression where a bogus availability check (e.g.
+    one that relied on `hashlib.algorithms_available`) would silently
+    force every user onto the slower pycryptodome path.
+    """
+    del restore_hash_module
+    if not _hashlib_has_keccak():
+        pytest.skip("hashlib lacks keccak-256 on this OpenSSL build")
+
+    h = _clean_reimport_hash()
+    assert h._USE_HASHLIB is True, (
+        "module engaged pycryptodome fallback despite hashlib having keccak"
+    )
+
+
+def test_eest_bytes_keccak256_matches_eels() -> None:
+    """`Bytes.keccak256()` returns the same digest as EELS `keccak256`."""
+    from ethereum.crypto.hash import keccak256
+
+    from ..base_types import Bytes
+
+    for buffer in (b"", b"hashme", bytes(range(256))):
+        from_eest = bytes(Bytes(buffer).keccak256())
+        from_eels = bytes(keccak256(buffer))
+        assert from_eest == from_eels
+
+
+def test_eest_trie_keccak256_matches_eels() -> None:
+    """`trie.keccak256` and EELS `keccak256` return identical digests."""
+    from ethereum.crypto.hash import keccak256 as eels
+
+    from ...test_types.trie import keccak256 as trie
+
+    for buffer in (b"", b"hashme", bytes(range(256))):
+        assert bytes(trie(buffer)) == bytes(eels(buffer))
diff --git a/packages/testing/src/execution_testing/cli/ci_helpers.py b/packages/testing/src/execution_testing/cli/ci_helpers.py
new file mode 100644
index 00000000000..e606252b4c0
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/ci_helpers.py
@@ -0,0 +1,98 @@
+"""
+CLI helper commands for CI static checks.
+
+Contains a wrapper to markdownlint-cli2 validation which fails
+silently if external tools are not available, to avoid disruption to
+external contributors.
+"""
+
+import re
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+
+import click
+import semver
+
+
+def find_project_root() -> Path:
+    """Locate the root directory of this project."""
+    # Search upwards from file location
+    script_dir = Path(__file__).resolve().parent
+    for parent in [script_dir, *script_dir.parents]:
+        if (parent / "pyproject.toml").exists() and (parent / ".git").exists():
+            return parent
+
+    raise FileNotFoundError(
+        "Unable to locate project root! "
+        "Looking for a directory with both pyproject.toml and .git."
+    )
+
+
+@click.command(
+    context_settings={
+        "ignore_unknown_options": True,
+        "allow_extra_args": True,
+    }
+)
+@click.argument("args", nargs=-1, type=click.UNPROCESSED)
+def markdownlint(args: tuple[str, ...]) -> None:
+    """
+    Lint the markdown in ./README.md and ./docs/ using the external command
+    markdownlint-cli2.
+
+    Silently fail if markdownlint-cli2 is not installed.
+
+    Allows argument forwarding to markdownlint-cli2.
+    """
+    expected_version = "0.20.0"
+    markdownlint = shutil.which("markdownlint-cli2")
+    if not markdownlint:
+        # Note: There's an additional step in test.yaml to run markdownlint-
+        # cli2 in GitHub Actions
+        click.echo(
+            "********* Install 'markdownlint-cli2' to enable markdown linting"
+            " *********\n"
+            "```\n"
+            f"sudo npm install -g markdownlint-cli2@{expected_version}\n"
+            "```"
+        )
+        sys.exit(0)
+
+    result = subprocess.run(
+        [markdownlint, "--version"],
+        capture_output=True,
+        text=True,
+    )
+    if result.returncode == 0:
+        version_match = re.search(r"v?(\d+\.\d+\.\d+)", result.stdout)
+        installed_version = version_match.group(1) if version_match else None
+        if installed_version:
+            installed = semver.Version.parse(installed_version)
+            expected = semver.Version.parse(expected_version)
+            minor_mismatch = (installed.major, installed.minor) != (
+                expected.major,
+                expected.minor,
+            )
+        else:
+            minor_mismatch = False
+        if minor_mismatch:
+            lines = [
+                f"WARNING: markdownlint-cli2 {installed_version} "
+                f"installed, CI uses {expected_version}",
+                "",
+                "Lint results may differ from CI.",
+                f"  npm install -g markdownlint-cli2@{expected_version}",
+            ]
+            width = max(len(line) for line in lines) + 4
+            border = "*" * width
+            box = "\n".join(f"* {line:<{width - 4}} *" for line in lines)
+            click.echo(f"\n{border}\n{box}\n{border}\n")
+
+    args_list: list[str] = (
+        list(args) if len(args) > 0 else ["./docs/**/*.md", "./*.md"]
+    )
+
+    command = ["node", markdownlint] + args_list
+    sys.exit(subprocess.run(command).returncode)
diff --git a/packages/testing/src/execution_testing/cli/diff_opcode_counts.py b/packages/testing/src/execution_testing/cli/diff_opcode_counts.py
index 8922f5ff079..41f62b528ca 100644
--- a/packages/testing/src/execution_testing/cli/diff_opcode_counts.py
+++ b/packages/testing/src/execution_testing/cli/diff_opcode_counts.py
@@ -55,17 +55,16 @@ def load_fixtures_from_file(
 def extract_opcode_counts_from_fixtures(
     fixtures: Fixtures,
 ) -> Dict[str, OpcodeCount]:
-    """Extract opcode_count from info field for each fixture."""
+    """Extract opcode_count from the metadata field for each fixture."""
     opcode_counts = {}
     for fixture_name, fixture in fixtures.items():
-        if (
-            hasattr(fixture, "info")
-            and fixture.info
-            and "opcode_count" in fixture.info
-        ):
+        if not (hasattr(fixture, "info") and fixture.info):
+            continue
+        metadata = fixture.info.get("metadata")
+        if isinstance(metadata, dict) and "opcode_count" in metadata:
             try:
                 opcode_count = OpcodeCount.model_validate(
-                    fixture.info["opcode_count"]
+                    metadata["opcode_count"]
                 )
                 opcode_counts[fixture_name] = opcode_count
             except Exception as e:
diff --git a/packages/testing/src/execution_testing/cli/eest/commands/clean.py b/packages/testing/src/execution_testing/cli/eest/commands/clean.py
index 58bb90f9538..b2e1ba94fe2 100644
--- a/packages/testing/src/execution_testing/cli/eest/commands/clean.py
+++ b/packages/testing/src/execution_testing/cli/eest/commands/clean.py
@@ -12,7 +12,7 @@
     "--all",
     "all_files",
     is_flag=True,
-    help="Remove the virtual environment and .tox directory as well.",
+    help="Remove the virtual environment and .just directories as well.",
 )
 @click.option(
     "--dry-run",
@@ -24,18 +24,18 @@ def clean(all_files: bool, dry_run: bool, verbose: bool) -> None:
     """
     Remove all generated files and directories from the repository.
 
-    If `--all` is specified, the virtual environment and .tox directory will
-    also be removed.
+    If `--all` is specified, the virtual environment and .just directory
+    will also be removed.
 
     Args:
-        all_files (bool): Remove the virtual environment and .tox directory
+        all_files (bool): Remove the virtual environment and .just directory
                           as well.
 
         dry_run (bool): Simulate the cleanup without removing files.
 
         verbose (bool): Show verbose output.
 
-    Note: The virtual environment and .tox directory are not removed by
+    Note: The virtual environment and .just directory are not removed by
     default.
 
     Example: Cleaning all generated files and directories and show the deleted
@@ -46,7 +46,7 @@ def clean(all_files: bool, dry_run: bool, verbose: bool) -> None:
     Output:
 
         \b
-        🗑️  Deleted: .tox
+        🗑️  Deleted: .just
         🗑️  Deleted: .venv
         🗑️  Deleted: src/cli/et/__pycache__
         🗑️  Deleted: src/cli/et/commands/__pycache__
@@ -75,7 +75,7 @@ def clean(all_files: bool, dry_run: bool, verbose: bool) -> None:
         items_to_remove.extend(matching_files)
 
     if all_files:
-        items_to_remove.extend([".tox", ".venv"])
+        items_to_remove.extend([".just", ".venv"])
 
     # Perform dry run or actual deletion
     for item in items_to_remove:
diff --git a/packages/testing/src/execution_testing/cli/evm_bytes.py b/packages/testing/src/execution_testing/cli/evm_bytes.py
index 9790d159751..3929ad4dce8 100644
--- a/packages/testing/src/execution_testing/cli/evm_bytes.py
+++ b/packages/testing/src/execution_testing/cli/evm_bytes.py
@@ -1,6 +1,6 @@
 """Define an entry point wrapper for pytest."""
 
-from dataclasses import asdict, dataclass, field
+from dataclasses import dataclass, field
 from typing import Any, Dict, List
 
 import click
@@ -27,8 +27,10 @@ class OpcodeWithOperands:
 
     opcode: Op
     operands: List[int] = field(default_factory=list)
-    args: List["OpcodeWithOperands | HexNumber"] = field(default_factory=list)
-    kwargs: Dict[str, "OpcodeWithOperands | HexNumber"] = field(
+    args: List["OpcodeWithOperands | HexNumber | str"] = field(
+        default_factory=list
+    )
+    kwargs: Dict[str, "OpcodeWithOperands | HexNumber | str"] = field(
         default_factory=dict
     )
 
@@ -49,7 +51,9 @@ def __str__(self) -> str:
             output = f"{output}({', '.join(args)})"
         return output
 
-    def opcode_or_int(self) -> "OpcodeWithOperands | HexNumber":
+    def opcode_or_int(
+        self, int_definitions: dict[int, str] | None = None
+    ) -> "OpcodeWithOperands | HexNumber | str":
         """
         Return self or an HexNumber if the opcode is a PUSH opcode and can be
         seamlessly converted to int when used as a stack argument or keyword
@@ -69,9 +73,24 @@ def opcode_or_int(self) -> "OpcodeWithOperands | HexNumber":
             value = self.operands[0]
             min_bytes = max(1, (value.bit_length() + 7) // 8)
             if self.opcode.data_portion_length == min_bytes:
+                if int_definitions and value in int_definitions:
+                    return int_definitions[value]
                 return HexNumber(value)
         return self
 
+    def __eq__(self, other: Any) -> bool:
+        """Compare two opcodes with operands."""
+        if not isinstance(other, OpcodeWithOperands):
+            return False
+        if (
+            self.opcode == other.opcode
+            and self.operands == other.operands
+            and self.args == other.args
+            and self.kwargs == other.kwargs
+        ):
+            return True
+        return False
+
 
 @dataclass(kw_only=True)
 class OpcodeWithOperandsAssembly(OpcodeWithOperands):
@@ -90,7 +109,9 @@ def __str__(self) -> str:
 
 
 def process_evm_bytes(  # noqa: D103
-    evm_bytes: bytes, assembly: bool
+    evm_bytes: bytes,
+    assembly: bool = False,
+    int_definitions: dict[int, str] | None = None,
 ) -> List[OpcodeWithOperands]:
     evm_bytes_array = bytearray(evm_bytes)
 
@@ -130,7 +151,10 @@ def process_evm_bytes(  # noqa: D103
                 reversed(opcodes[-opcode.popped_stack_items :])
             )
             if all(arg.opcode.pushed_stack_items == 1 for arg in args):
-                args_with_int = [arg.opcode_or_int() for arg in args]
+                args_with_int = [
+                    arg.opcode_or_int(int_definitions=int_definitions)
+                    for arg in args
+                ]
                 opcodes = opcodes[: -opcode.popped_stack_items]
                 if opcode.kwargs and len(opcode.kwargs) == len(args_with_int):
                     opcode_with_operands.kwargs = dict(
@@ -144,8 +168,25 @@ def process_evm_bytes(  # noqa: D103
     return opcodes
 
 
+@dataclass(kw_only=True)
+class RepeatingOpcodeWithOperands:
+    """Opcode that can be repeated `count` times."""
+
+    opcode: OpcodeWithOperands
+    count: int = 1
+
+    def __str__(self) -> str:
+        """Format into a string."""
+        assert self.count > 0
+        if self.count == 1:
+            return f"{self.opcode}"
+        return f"{self.opcode} * {self.count}"
+
+
 def format_opcodes(  # noqa: D103
-    opcodes: List[OpcodeWithOperands], assembly: bool = False
+    opcodes: List[OpcodeWithOperands],
+    assembly: bool = False,
+    skip_simplify: bool = False,
 ) -> str:
     if assembly:
         opcodes_with_empty_lines: List[OpcodeWithOperandsAssembly | str] = []
@@ -157,7 +198,12 @@ def format_opcodes(  # noqa: D103
             ):
                 opcodes_with_empty_lines.append("")
             opcodes_with_empty_lines.append(
-                OpcodeWithOperandsAssembly(**asdict(op_with_operands))
+                OpcodeWithOperandsAssembly(
+                    opcode=op_with_operands.opcode,
+                    operands=list(op_with_operands.operands),
+                    args=list(op_with_operands.args),
+                    kwargs=dict(op_with_operands.kwargs),
+                )
             )
             if (
                 op_with_operands.opcode in OPCODES_WITH_EMPTY_LINES_AFTER
@@ -165,11 +211,25 @@ def format_opcodes(  # noqa: D103
             ):
                 opcodes_with_empty_lines.append("")
         return "\n".join(f"{op}" for op in opcodes_with_empty_lines)
-    return " + ".join(f"{op}" for op in opcodes)
+    if skip_simplify or len(opcodes) < 2:
+        return " + ".join(f"{op}" for op in opcodes)
+    previous_opcode = RepeatingOpcodeWithOperands(opcode=opcodes[0])
+    opcodes_with_multiply: List[RepeatingOpcodeWithOperands] = []
+    for op in opcodes[1:]:
+        if op == previous_opcode.opcode:
+            previous_opcode.count += 1
+        else:
+            opcodes_with_multiply.append(previous_opcode)
+            previous_opcode = RepeatingOpcodeWithOperands(opcode=op)
+    opcodes_with_multiply.append(previous_opcode)
+    return " + ".join(f"{op}" for op in opcodes_with_multiply)
 
 
 def process_evm_bytes_string(
-    evm_bytes_hex_string: str, assembly: bool = False
+    evm_bytes_hex_string: str,
+    assembly: bool = False,
+    skip_simplify: bool = False,
+    int_definitions: dict[int, str] | None = None,
 ) -> str:
     """Process the given EVM bytes hex string."""
     if evm_bytes_hex_string.startswith("0x"):
@@ -177,7 +237,13 @@ def process_evm_bytes_string(
 
     evm_bytes = bytes.fromhex(evm_bytes_hex_string)
     return format_opcodes(
-        process_evm_bytes(evm_bytes, assembly=assembly), assembly=assembly
+        process_evm_bytes(
+            evm_bytes,
+            assembly=assembly,
+            int_definitions=int_definitions,
+        ),
+        assembly=assembly,
+        skip_simplify=skip_simplify,
     )
 
 
diff --git a/packages/testing/src/execution_testing/cli/extract_config.py b/packages/testing/src/execution_testing/cli/extract_config.py
index af98b15a9d0..4f7d31d538f 100755
--- a/packages/testing/src/execution_testing/cli/extract_config.py
+++ b/packages/testing/src/execution_testing/cli/extract_config.py
@@ -182,7 +182,7 @@ def from_fixture(cls, fixture_path: Path) -> Self:
             return cls(
                 header=pre_alloc_group.genesis,
                 alloc=pre_alloc_group.pre,
-                chain_id=1,  # TODO: PreAllocGroups don't contain chain ID
+                chain_id=pre_alloc_group.chain_id,
                 fork=pre_alloc_group.fork,
             )
         except ValidationError:
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/base.py b/packages/testing/src/execution_testing/cli/pytest_commands/base.py
index b66c795bbb9..328342c3904 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/base.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/base.py
@@ -1,11 +1,12 @@
 """Base classes and utilities for pytest-based CLI commands."""
 
+import os
 import sys
 from abc import ABC, abstractmethod
 from dataclasses import dataclass, field
 from os.path import realpath
 from pathlib import Path
-from typing import Any, Callable, List, Optional
+from typing import Any, Callable, ClassVar, List, Optional
 
 import click
 import pytest
@@ -57,6 +58,15 @@ class PytestRunner:
     console: Console = field(default_factory=lambda: Console(highlight=False))
     """Console to use for output."""
 
+    error_console: Console = field(
+        default_factory=lambda: Console(stderr=True, highlight=False)
+    )
+    """Console for diagnostic output.
+
+    Written to stderr so it doesn't pollute stdout captures such as the
+    `fill --help` subprocess in `docs/scripts/generate_fill_help.py`.
+    """
+
     def run_single(self, execution: PytestExecution) -> int:
         """Run pytest once with the given configuration and arguments."""
         root_dir_arg = ["--rootdir", "."]
@@ -75,9 +85,15 @@ def run_single(self, execution: PytestExecution) -> int:
                 "execution_testing.cli."
                 "pytest_commands.plugins.fix_package_test_path",
             ]
-        if self._is_verbose(execution.args):
+        if self._is_verbose(execution.args) or "CI" in os.environ:
             pytest_cmd = f"pytest {' '.join(pytest_args)}"
-            self.console.print(f"Executing: [bold]{pytest_cmd}[/bold]")
+            self.error_console.print(f"Executing: [bold]{pytest_cmd}[/bold]")
+            summary_path = os.environ.get("GITHUB_STEP_SUMMARY")
+            if summary_path:
+                with Path(summary_path).open("a") as summary:
+                    summary.write(
+                        f"### Executing\n\n```bash\n{pytest_cmd}\n```\n\n"
+                    )
 
         return pytest.main(pytest_args)
 
@@ -137,6 +153,9 @@ class PytestCommand:
     pytest_ini_folder: Path = PYTEST_INI_FOLDER
     """Folder where the pytest configuration files are located."""
 
+    allowed_exit_codes: ClassVar[List[pytest.ExitCode]] = [pytest.ExitCode.OK]
+    """Exit codes treated as successful for executions of this command."""
+
     @property
     def config_path(self) -> Path:
         """Path to the pytest configuration file."""
@@ -173,6 +192,7 @@ def create_executions(
                 config_file=self.config_path,
                 command_logic_test_paths=self.test_args,
                 args=processed_args,
+                allowed_exit_codes=self.allowed_exit_codes,
             )
         ]
 
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/build_block.py b/packages/testing/src/execution_testing/cli/pytest_commands/build_block.py
new file mode 100644
index 00000000000..102436ffacf
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/build_block.py
@@ -0,0 +1,43 @@
+"""CLI entry point for the `build-block` pytest-based command."""
+
+from pathlib import Path
+from typing import Any, List
+
+import click
+
+from .base import PytestCommand, common_pytest_options
+from .processors import (
+    ConsumeCommandProcessor,
+    HelpFlagsProcessor,
+    HiveEnvironmentProcessor,
+)
+
+
+def create_build_block_command() -> PytestCommand:
+    """Initialize the build-block command with paths and processors."""
+    base_path = Path("cli/pytest_commands/plugins/consume")
+    command_logic_test_paths = [
+        base_path / "simulators" / "simulator_logic" / "test_via_build.py"
+    ]
+    return PytestCommand(
+        config_file="pytest-consume.ini",
+        argument_processors=[
+            HelpFlagsProcessor("consume"),
+            HiveEnvironmentProcessor(command_name="build_block"),
+            ConsumeCommandProcessor(is_hive=True),
+        ],
+        command_logic_test_paths=command_logic_test_paths,
+    )
+
+
+@click.command(
+    name="build-block",
+    context_settings={"ignore_unknown_options": True},
+)
+@common_pytest_options
+def build_block(pytest_args: List[str], **kwargs: Any) -> None:
+    """Test block building via testing_buildBlockV1."""
+    del kwargs
+
+    cmd = create_build_block_command()
+    cmd.execute(list(pytest_args))
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/checklist.py b/packages/testing/src/execution_testing/cli/pytest_commands/checklist.py
index e51f3cc593a..b758256279e 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/checklist.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/checklist.py
@@ -1,13 +1,44 @@
 """CLI entry point for the `checklist` pytest-based command."""
 
-from typing import Any
+from typing import Any, ClassVar, List
 
 import click
+import pytest
 
-from .fill import FillCommand
+from ...forks import get_development_forks
+from .base import PytestCommand
+
+
+class ChecklistCommand(PytestCommand):
+    """
+    Pytest command to generate checklist documentation.
+
+    The checklist command only collects tests to analyze markers and does
+    not run them, so ``NO_TESTS_COLLECTED`` is treated as success.
+    """
+
+    allowed_exit_codes: ClassVar[List[pytest.ExitCode]] = [
+        pytest.ExitCode.OK,
+        pytest.ExitCode.NO_TESTS_COLLECTED,
+    ]
+
+    def __init__(self, **kwargs: Any) -> None:
+        """Initialize checklist command."""
+        super().__init__(config_file="pytest-fill.ini", **kwargs)
+
+
+def _last_development_fork() -> str | None:
+    """Return the name of the last development fork, if any."""
+    dev_forks = get_development_forks()
+    return dev_forks[-1].name() if dev_forks else None
 
 
 @click.command()
+@click.argument(
+    "paths",
+    nargs=-1,
+    type=click.Path(),
+)
 @click.option(
     "--output",
     "-o",
@@ -22,22 +53,44 @@
     multiple=True,
     help="Generate checklist only for specific EIP(s)",
 )
-def checklist(output: str, eip: tuple[int, ...], **kwargs: Any) -> None:
+@click.option(
+    "--until",
+    "-u",
+    type=str,
+    default=None,
+    help="Include upcoming forks up to and including this fork",
+)
+def checklist(
+    paths: tuple[str, ...],
+    output: str,
+    eip: tuple[int, ...],
+    until: str | None,
+    **kwargs: Any,
+) -> None:
     """
     Generate EIP test checklists based on pytest.mark.eip_checklist markers.
 
     This command scans test files for eip_checklist markers and generates
     filled checklists showing which checklist items have been implemented.
 
+    By default it scans `tests` plus `tests/benchmark`; pass one or more
+    paths to limit collection to a subset.
+
+    By default, includes all development forks so that checklists for
+    upcoming EIPs are generated without needing --until.
+
     Examples:
-        # Generate checklists for all EIPs
+        # Generate checklists for all EIPs (default: tests + tests/benchmark)
         uv run checklist
 
         # Generate checklist for specific EIP
         uv run checklist --eip 7702
 
-        # Generate checklists for specific test path
-        uv run checklist tests/prague/eip7702*
+        # Generate checklists for a specific test path
+        uv run checklist tests/prague/eip7702_set_code_tx
+
+        # Generate until a specific fork
+        uv run checklist --until Prague
 
         # Specify output directory
         uv run checklist --output ./my-checklists
@@ -52,7 +105,24 @@ def checklist(output: str, eip: tuple[int, ...], **kwargs: Any) -> None:
     for eip_num in eip:
         args.extend(["--checklist-eip", str(eip_num)])
 
-    command = FillCommand(
+    # Default --until to the last development fork so checklists for
+    # upcoming EIPs are generated without requiring the flag explicitly.
+    if until is None:
+        until = _last_development_fork()
+    if until:
+        args.extend(["--until", until])
+
+    # When no paths are provided, scan `tests/` and force inclusion of
+    # `tests/benchmark/` via `--include-benchmark`. The conftest normally
+    # hides `tests/benchmark/` from a plain `tests/` collection, and
+    # passing both as positional paths triggers pytest path deduplication
+    # which drops the broader `tests/`.
+    if not paths:
+        paths = ("tests",)
+        args.append("--include-benchmark")
+    args.extend(paths)
+
+    command = ChecklistCommand(
         plugins=[
             "execution_testing.cli.pytest_commands.plugins.filler.eip_checklist"
         ],
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/fill.py b/packages/testing/src/execution_testing/cli/pytest_commands/fill.py
index 126767bad00..fbd513b823d 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/fill.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/fill.py
@@ -33,35 +33,81 @@ def create_executions(
         self, pytest_args: List[str]
     ) -> List[PytestExecution]:
         """
-        Create execution plan that supports two-phase pre-allocation group
+        Create execution plan supporting two-phase pre-allocation group
         generation.
 
-        Returns single execution for normal filling, or two-phase execution
-        when --generate-pre-alloc-groups or --generate-all-formats is
-        specified.
+        Returns:
+        - Phase-1-only execution when `--generate-pre-alloc-groups` is
+          set without `--generate-all-formats`.
+        - Single-phase execution when `--use-pre-alloc-groups` is set,
+          regardless of `--generate-all-formats` (pre-alloc groups
+          already exist on disk from a previous run).
+        - Two-phase execution when `--generate-all-formats` is set.
+        - Normal single-phase execution otherwise.
+
         """
         processed_args = self.process_arguments(pytest_args)
         processed_args = self._add_default_ignores(processed_args)
+        self._validate_flag_combinations(processed_args)
 
-        # Check if we need two-phase execution
-        if self._should_use_two_phase_execution(processed_args):
-            processed_args = self._ensure_generate_all_formats_for_tarball(
+        if "--use-pre-alloc-groups" in processed_args:
+            # Pre-alloc groups already exist: single-phase fill only.
+            return self._create_single_phase_with_pre_alloc_groups(
                 processed_args
             )
+
+        has_phase_1_flag = "--generate-pre-alloc-groups" in processed_args
+        has_phase_2_flag = "--generate-all-formats" in processed_args
+
+        if has_phase_2_flag:
+            # --generate-all-formats always regenerates pre-alloc as phase 1.
             return self._create_two_phase_executions(processed_args)
-        elif "--use-pre-alloc-groups" in processed_args:
-            # Only phase 2: using existing pre-allocation groups
-            return self._create_single_phase_with_pre_alloc_groups(
-                processed_args
+        if has_phase_1_flag:
+            # Phase 1 only: generate pre-alloc groups without filling.
+            return [self._create_phase1_only_execution(processed_args)]
+
+        # Normal single-phase execution.
+        return [
+            PytestExecution(
+                config_file=self.config_path,
+                args=processed_args,
+                allowed_exit_codes=self.allowed_exit_codes,
             )
-        else:
-            # Normal single-phase execution
-            return [
-                PytestExecution(
-                    config_file=self.config_path,
-                    args=processed_args,
-                )
-            ]
+        ]
+
+    def _validate_flag_combinations(self, args: List[str]) -> None:
+        """
+        Reject contradictory flag combinations up front so phase 2 never
+        runs against a missing pre-alloc folder.
+        """
+        if "--use-pre-alloc-groups" not in args:
+            return
+        if "--generate-pre-alloc-groups" in args:
+            raise click.UsageError(
+                "--use-pre-alloc-groups and --generate-pre-alloc-groups "
+                "are mutually exclusive: the first asserts the groups "
+                "already exist on disk, the second regenerates them."
+            )
+        if "--clean" in args:
+            raise click.UsageError(
+                "--use-pre-alloc-groups cannot be combined with --clean: "
+                "--clean wipes the output directory that holds the "
+                "pre-alloc groups."
+            )
+
+    def _create_phase1_only_execution(
+        self, args: List[str]
+    ) -> PytestExecution:
+        """Create a phase-1 execution that generates pre-allocation groups."""
+        return PytestExecution(
+            config_file=self.config_path,
+            args=self._create_phase1_args(args),
+            description="generating pre-allocation groups",
+            allowed_exit_codes=[
+                *self.allowed_exit_codes,
+                pytest.ExitCode.NO_TESTS_COLLECTED,
+            ],
+        )
 
     def _create_two_phase_executions(
         self, args: List[str]
@@ -70,25 +116,11 @@ def _create_two_phase_executions(
         Create two-phase execution: pre-allocation group generation + fixture
         filling.
         """
-        # Phase 1: Pre-allocation group generation (clean and minimal output)
-        phase1_args = self._create_phase1_args(args)
-
-        # Phase 2: Main fixture generation (full user options)
-        phase2_args = self._create_phase2_args(args)
-
         return [
+            self._create_phase1_only_execution(args),
             PytestExecution(
                 config_file=self.config_path,
-                args=phase1_args,
-                description="generating pre-allocation groups",
-                allowed_exit_codes=[
-                    pytest.ExitCode.OK,
-                    pytest.ExitCode.NO_TESTS_COLLECTED,
-                ],
-            ),
-            PytestExecution(
-                config_file=self.config_path,
-                args=phase2_args,
+                args=self._create_phase2_args(args),
                 description="filling test fixtures",
             ),
         ]
@@ -197,38 +229,6 @@ def _add_use_pre_alloc_groups_flag(self, args: List[str]) -> List[str]:
         """Add --use-pre-alloc-groups flag to argument list."""
         return args + ["--use-pre-alloc-groups"]
 
-    def _should_use_two_phase_execution(self, args: List[str]) -> bool:
-        """Determine if two-phase execution is needed."""
-        return (
-            "--generate-pre-alloc-groups" in args
-            or "--generate-all-formats" in args
-            or self._is_tarball_output(args)
-        )
-
-    def _ensure_generate_all_formats_for_tarball(
-        self, args: List[str]
-    ) -> List[str]:
-        """Auto-add --generate-all-formats for tarball output."""
-        if (
-            self._is_tarball_output(args)
-            and "--generate-all-formats" not in args
-        ):
-            return args + ["--generate-all-formats"]
-        return args
-
-    def _is_tarball_output(self, args: List[str]) -> bool:
-        """Check if output argument specifies a tarball (.tar.gz) path."""
-        from pathlib import Path
-
-        for i, arg in enumerate(args):
-            if arg.startswith("--output="):
-                output_path = Path(arg.split("=", 1)[1])
-                return str(output_path).endswith(".tar.gz")
-            elif arg == "--output" and i + 1 < len(args):
-                output_path = Path(args[i + 1])
-                return str(output_path).endswith(".tar.gz")
-        return False
-
     def _is_watch_mode(self, args: List[str]) -> bool:
         """Check if any watch flag is present in arguments."""
         return any(flag in args for flag in ["--watch", "--watcherfall"])
@@ -282,6 +282,7 @@ def create_executions(
             PytestExecution(
                 config_file=self.config_path,
                 args=emoji_args,
+                allowed_exit_codes=self.allowed_exit_codes,
             )
         ]
 
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/fill_stateful.py b/packages/testing/src/execution_testing/cli/pytest_commands/fill_stateful.py
new file mode 100644
index 00000000000..2a7c0f06158
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/fill_stateful.py
@@ -0,0 +1,32 @@
+"""CLI entry point for the `fill-stateful` pytest-based command."""
+
+from typing import Any, List
+
+import click
+
+from .base import PytestCommand, common_pytest_options
+from .processors import HelpFlagsProcessor
+
+
+def create_fill_stateful_command() -> PytestCommand:
+    """Initialize the fill-stateful command."""
+    return PytestCommand(
+        config_file="pytest-fill-stateful.ini",
+        argument_processors=[HelpFlagsProcessor("fill-stateful")],
+    )
+
+
+@click.command(
+    name="fill-stateful",
+    context_settings={
+        "help_option_names": ["-h", "--help"],
+        "ignore_unknown_options": True,
+    },
+)
+@common_pytest_options
+def fill_stateful(pytest_args: List[str], **kwargs: Any) -> None:
+    """Fill stateful fixtures via testing_buildBlockV1."""
+    del kwargs
+
+    cmd = create_fill_stateful_command()
+    cmd.execute(list(pytest_args))
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/releases.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/releases.py
index 159d7d467d1..556fa7fe2c3 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/releases.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/releases.py
@@ -20,6 +20,7 @@
 
 SUPPORTED_REPOS = [
     "ethereum/execution-spec-tests",
+    "ethereum/execution-specs",
     "ethereum/tests",
     "ethereum/legacytests",
 ]
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/base.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/base.py
index 5780353cf68..969a7a06e67 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/base.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/base.py
@@ -34,6 +34,7 @@ def check_live_port(test_suite_name: str) -> Literal[8545, 8551]:
         "eels/consume-engine",
         "eels/consume-enginex",
         "eels/consume-sync",
+        "eels/build-block",
     }:
         return 8551
     raise ValueError(
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/build_block/__init__.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/build_block/__init__.py
new file mode 100644
index 00000000000..91f13d8b15f
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/build_block/__init__.py
@@ -0,0 +1 @@
+"""Pytest configuration for the build-block simulator."""
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/build_block/conftest.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/build_block/conftest.py
new file mode 100644
index 00000000000..e23b5d03563
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/build_block/conftest.py
@@ -0,0 +1,66 @@
+"""
+Pytest fixtures for the `build-block` simulator.
+
+Configures the hive back-end & EL clients for block building correctness
+testing via the ``testing_buildBlockV1`` endpoint.
+"""
+
+import io
+from typing import Mapping
+
+import pytest
+from hive.client import Client
+
+from execution_testing.fixtures import BlockchainEngineFixture
+from execution_testing.fixtures.blockchain import FixtureHeader
+from execution_testing.rpc import TestingRPC
+
+pytest_plugins = (
+    "execution_testing.cli.pytest_commands.plugins.pytest_hive.pytest_hive",
+    "execution_testing.cli.pytest_commands.plugins.consume.simulators.base",
+    "execution_testing.cli.pytest_commands.plugins.consume.simulators.single_test_client",
+    "execution_testing.cli.pytest_commands.plugins.consume.simulators.test_case_description",
+    "execution_testing.cli.pytest_commands.plugins.consume.simulators.timing_data",
+    "execution_testing.cli.pytest_commands.plugins.consume.simulators.exceptions",
+    "execution_testing.cli.pytest_commands.plugins.consume.simulators.engine_api",
+)
+
+
+def pytest_configure(config: pytest.Config) -> None:
+    """Set the supported fixture formats for the build-block simulator."""
+    config.supported_fixture_formats = [BlockchainEngineFixture]  # type: ignore[attr-defined]
+
+
+@pytest.fixture(scope="module")
+def test_suite_name() -> str:
+    """The name of the hive test suite used in this simulator."""
+    return "eels/build-block"
+
+
+@pytest.fixture(scope="module")
+def test_suite_description() -> str:
+    """The description of the hive test suite used in this simulator."""
+    return (
+        "Test block building correctness via the "
+        "testing_buildBlockV1 endpoint."
+    )
+
+
+@pytest.fixture(scope="function")
+def client_files(
+    buffered_genesis: io.BufferedReader,
+) -> Mapping[str, io.BufferedReader]:
+    """Define the files that hive will start the client with."""
+    return {"/genesis.json": buffered_genesis}
+
+
+@pytest.fixture(scope="function")
+def genesis_header(fixture: BlockchainEngineFixture) -> FixtureHeader:
+    """Provide the genesis header from the fixture."""
+    return fixture.genesis
+
+
+@pytest.fixture(scope="function")
+def testing_rpc(client: Client) -> TestingRPC:
+    """Initialize Testing RPC client for the execution client under test."""
+    return TestingRPC(f"http://{client.ip}:8545")
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/enginex/conftest.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/enginex/conftest.py
index 80ad3405f2b..78c57a4fb7e 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/enginex/conftest.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/enginex/conftest.py
@@ -122,6 +122,26 @@ def test_suite_description() -> str:
     )
 
 
+@pytest.fixture(scope="function", autouse=True)
+def _per_test_reporting(
+    client: Client,
+    hive_test: HiveTest,
+) -> None:
+    """
+    Register a test for execution against a multi-test client.
+
+    Activate log segment capturing in the Hive backend for correct
+    client log reporting in the multi-test client case.
+
+    Parameter order matters: `client` listed before `hive_test`
+    ensures pytest sets up `client` first and tears it down last.
+    This guarantees `hive_test` teardown (`test.end()`) runs while
+    the hive node still exists, before `client` teardown calls
+    `mark_test_completed` / `client.stop()`.
+    """
+    hive_test.register_multi_test_client(client)
+
+
 @pytest.fixture(scope="function")
 def client(
     multi_test_hive_test: HiveTest,
@@ -179,6 +199,7 @@ def client(
         multi_test_client_manager.register_client(
             group_identifier, resolved_client
         )
+        resolved_client.multi_test = True
 
     try:
         yield resolved_client
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/helpers/ruleset.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/helpers/ruleset.py
index 59002e10495..10593157fee 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/helpers/ruleset.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/helpers/ruleset.py
@@ -1,531 +1,33 @@
-"""
-Fork rules for consume hive simulators.
+"""Fork rules for consume hive simulators."""
 
-TODO: Create the ruleset dynamically per fixture test case based on the fork.
-Remove this file afterwards.
-"""
-
-from typing import Dict, List
+from typing import Dict
 
 from execution_testing.forks import (
-    BPO1,
-    BPO2,
-    BPO3,
-    BPO4,
+    ALL_FORKS_WITH_TRANSITIONS,
     Amsterdam,
-    Berlin,
-    BerlinToLondonAt5,
-    BPO1ToBPO2AtTime15k,
     BPO2ToAmsterdamAtTime15k,
-    BPO2ToBPO3AtTime15k,
-    BPO3ToBPO4AtTime15k,
     Byzantium,
-    Cancun,
-    CancunToPragueAtTime15k,
-    Constantinople,
-    ConstantinopleFix,
     Fork,
-    Frontier,
-    Homestead,
-    Istanbul,
     London,
-    Osaka,
-    OsakaToBPO1AtTime15k,
-    Paris,
-    ParisToShanghaiAtTime15k,
-    Prague,
-    PragueToOsakaAtTime15k,
-    Shanghai,
-    ShanghaiToCancunAtTime15k,
+    TransitionFork,
 )
 
 
-def get_blob_schedule_entries(fork: Fork) -> Dict[str, int]:
-    """
-    Generate blob schedule entries for each fork (and respective parent forks).
-
-    Adds the following entries to the ruleset for the given fork (and parent
-    forks):
-      HIVE_{FORK}_BLOB_TARGET: target_blobs_per_block()
-      HIVE_{FORK}_BLOB_MAX: max_blobs_per_block()
-      HIVE_{FORK}_BLOB_BASE_FEE_UPDATE_FRACTION: blob_base_fee_update_
-                                                 fraction()
-    """
-    entries: Dict = {}
-    forks_with_blobs: List[Fork] = []
-    current_fork = fork
-    while current_fork.supports_blobs():
-        forks_with_blobs.append(current_fork)
-        current_fork = current_fork.parent()  # type: ignore
-
-    for fork_to_process in forks_with_blobs:
-        prefix = fork_to_process.__name__.upper()
-        entries[f"HIVE_{prefix}_BLOB_TARGET"] = (
-            fork_to_process.target_blobs_per_block()
-        )
-        entries[f"HIVE_{prefix}_BLOB_MAX"] = (
-            fork_to_process.max_blobs_per_block()
-        )
-        entries[f"HIVE_{prefix}_BLOB_BASE_FEE_UPDATE_FRACTION"] = (
-            fork_to_process.blob_base_fee_update_fraction()
-        )
+def ruleset_format(fork: Fork | TransitionFork) -> Dict[str, int]:
+    """Format the ruleset for backwards compatibility."""
+    default_values: Dict[str, int] = dict.fromkeys(
+        London.ruleset().keys(), 2000
+    )
+    if fork < Byzantium:
+        default_values["HIVE_FORK_DAO_BLOCK"] = 2000
+    if fork > London:
+        default_values["HIVE_TERMINAL_TOTAL_DIFFICULTY"] = 0
+    entries = default_values | fork.ruleset()
+    if fork in [Amsterdam, BPO2ToAmsterdamAtTime15k]:
+        entries.pop("HIVE_AMSTERDAM_BLOB_BASE_FEE_UPDATE_FRACTION")
+        entries.pop("HIVE_AMSTERDAM_BLOB_MAX")
+        entries.pop("HIVE_AMSTERDAM_BLOB_TARGET")
     return entries
 
 
-ruleset: Dict[Fork, Dict[str, int]] = {
-    Frontier: {
-        "HIVE_FORK_HOMESTEAD": 2000,
-        "HIVE_FORK_DAO_BLOCK": 2000,
-        "HIVE_FORK_TANGERINE": 2000,
-        "HIVE_FORK_SPURIOUS": 2000,
-        "HIVE_FORK_BYZANTIUM": 2000,
-        "HIVE_FORK_CONSTANTINOPLE": 2000,
-        "HIVE_FORK_PETERSBURG": 2000,
-        "HIVE_FORK_ISTANBUL": 2000,
-        "HIVE_FORK_BERLIN": 2000,
-        "HIVE_FORK_LONDON": 2000,
-    },
-    Homestead: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_DAO_BLOCK": 2000,
-        "HIVE_FORK_TANGERINE": 2000,
-        "HIVE_FORK_SPURIOUS": 2000,
-        "HIVE_FORK_BYZANTIUM": 2000,
-        "HIVE_FORK_CONSTANTINOPLE": 2000,
-        "HIVE_FORK_PETERSBURG": 2000,
-        "HIVE_FORK_ISTANBUL": 2000,
-        "HIVE_FORK_BERLIN": 2000,
-        "HIVE_FORK_LONDON": 2000,
-    },
-    Byzantium: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 2000,
-        "HIVE_FORK_PETERSBURG": 2000,
-        "HIVE_FORK_ISTANBUL": 2000,
-        "HIVE_FORK_BERLIN": 2000,
-        "HIVE_FORK_LONDON": 2000,
-    },
-    Constantinople: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 2000,
-        "HIVE_FORK_ISTANBUL": 2000,
-        "HIVE_FORK_BERLIN": 2000,
-        "HIVE_FORK_LONDON": 2000,
-    },
-    ConstantinopleFix: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 2000,
-        "HIVE_FORK_BERLIN": 2000,
-        "HIVE_FORK_LONDON": 2000,
-    },
-    Istanbul: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 2000,
-        "HIVE_FORK_LONDON": 2000,
-    },
-    Berlin: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 2000,
-    },
-    BerlinToLondonAt5: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 5,
-    },
-    London: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-    },
-    Paris: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-    },
-    Shanghai: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 0,
-    },
-    ParisToShanghaiAtTime15k: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 15000,
-    },
-    Cancun: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 0,
-        "HIVE_CANCUN_TIMESTAMP": 0,
-        **get_blob_schedule_entries(Cancun),
-    },
-    ShanghaiToCancunAtTime15k: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 0,
-        "HIVE_CANCUN_TIMESTAMP": 15000,
-        **get_blob_schedule_entries(Cancun),
-    },
-    Prague: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 0,
-        "HIVE_CANCUN_TIMESTAMP": 0,
-        "HIVE_PRAGUE_TIMESTAMP": 0,
-        **get_blob_schedule_entries(Prague),
-    },
-    CancunToPragueAtTime15k: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 0,
-        "HIVE_CANCUN_TIMESTAMP": 0,
-        "HIVE_PRAGUE_TIMESTAMP": 15000,
-        **get_blob_schedule_entries(Prague),
-    },
-    Osaka: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 0,
-        "HIVE_CANCUN_TIMESTAMP": 0,
-        "HIVE_PRAGUE_TIMESTAMP": 0,
-        "HIVE_OSAKA_TIMESTAMP": 0,
-        **get_blob_schedule_entries(Osaka),
-    },
-    PragueToOsakaAtTime15k: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 0,
-        "HIVE_CANCUN_TIMESTAMP": 0,
-        "HIVE_PRAGUE_TIMESTAMP": 0,
-        "HIVE_OSAKA_TIMESTAMP": 15000,
-        **get_blob_schedule_entries(Osaka),
-    },
-    BPO1: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 0,
-        "HIVE_CANCUN_TIMESTAMP": 0,
-        "HIVE_PRAGUE_TIMESTAMP": 0,
-        "HIVE_OSAKA_TIMESTAMP": 0,
-        "HIVE_BPO1_TIMESTAMP": 0,
-        **get_blob_schedule_entries(BPO1),
-    },
-    OsakaToBPO1AtTime15k: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 0,
-        "HIVE_CANCUN_TIMESTAMP": 0,
-        "HIVE_PRAGUE_TIMESTAMP": 0,
-        "HIVE_OSAKA_TIMESTAMP": 0,
-        "HIVE_BPO1_TIMESTAMP": 15000,
-        **get_blob_schedule_entries(BPO1),
-    },
-    BPO2: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 0,
-        "HIVE_CANCUN_TIMESTAMP": 0,
-        "HIVE_PRAGUE_TIMESTAMP": 0,
-        "HIVE_OSAKA_TIMESTAMP": 0,
-        "HIVE_BPO1_TIMESTAMP": 0,
-        "HIVE_BPO2_TIMESTAMP": 0,
-        **get_blob_schedule_entries(BPO2),
-    },
-    BPO1ToBPO2AtTime15k: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 0,
-        "HIVE_CANCUN_TIMESTAMP": 0,
-        "HIVE_PRAGUE_TIMESTAMP": 0,
-        "HIVE_OSAKA_TIMESTAMP": 0,
-        "HIVE_BPO1_TIMESTAMP": 0,
-        "HIVE_BPO2_TIMESTAMP": 15000,
-        **get_blob_schedule_entries(BPO2),
-    },
-    BPO3: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 0,
-        "HIVE_CANCUN_TIMESTAMP": 0,
-        "HIVE_PRAGUE_TIMESTAMP": 0,
-        "HIVE_OSAKA_TIMESTAMP": 0,
-        "HIVE_BPO1_TIMESTAMP": 0,
-        "HIVE_BPO2_TIMESTAMP": 0,
-        "HIVE_BPO3_TIMESTAMP": 0,
-        **get_blob_schedule_entries(BPO3),
-    },
-    BPO2ToBPO3AtTime15k: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 0,
-        "HIVE_CANCUN_TIMESTAMP": 0,
-        "HIVE_PRAGUE_TIMESTAMP": 0,
-        "HIVE_OSAKA_TIMESTAMP": 0,
-        "HIVE_BPO1_TIMESTAMP": 0,
-        "HIVE_BPO2_TIMESTAMP": 0,
-        "HIVE_BPO3_TIMESTAMP": 15000,
-        **get_blob_schedule_entries(BPO3),
-    },
-    BPO4: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 0,
-        "HIVE_CANCUN_TIMESTAMP": 0,
-        "HIVE_PRAGUE_TIMESTAMP": 0,
-        "HIVE_OSAKA_TIMESTAMP": 0,
-        "HIVE_BPO1_TIMESTAMP": 0,
-        "HIVE_BPO2_TIMESTAMP": 0,
-        "HIVE_BPO3_TIMESTAMP": 0,
-        "HIVE_BPO4_TIMESTAMP": 0,
-        **get_blob_schedule_entries(BPO4),
-    },
-    BPO3ToBPO4AtTime15k: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 0,
-        "HIVE_CANCUN_TIMESTAMP": 0,
-        "HIVE_PRAGUE_TIMESTAMP": 0,
-        "HIVE_OSAKA_TIMESTAMP": 0,
-        "HIVE_BPO1_TIMESTAMP": 0,
-        "HIVE_BPO2_TIMESTAMP": 0,
-        "HIVE_BPO3_TIMESTAMP": 0,
-        "HIVE_BPO4_TIMESTAMP": 15000,
-        **get_blob_schedule_entries(BPO4),
-    },
-    BPO2ToAmsterdamAtTime15k: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 0,
-        "HIVE_CANCUN_TIMESTAMP": 0,
-        "HIVE_PRAGUE_TIMESTAMP": 0,
-        "HIVE_OSAKA_TIMESTAMP": 0,
-        "HIVE_BPO1_TIMESTAMP": 0,
-        "HIVE_BPO2_TIMESTAMP": 0,
-        "HIVE_AMSTERDAM_TIMESTAMP": 15000,
-        **get_blob_schedule_entries(BPO2),
-    },
-    Amsterdam: {
-        "HIVE_FORK_HOMESTEAD": 0,
-        "HIVE_FORK_TANGERINE": 0,
-        "HIVE_FORK_SPURIOUS": 0,
-        "HIVE_FORK_BYZANTIUM": 0,
-        "HIVE_FORK_CONSTANTINOPLE": 0,
-        "HIVE_FORK_PETERSBURG": 0,
-        "HIVE_FORK_ISTANBUL": 0,
-        "HIVE_FORK_BERLIN": 0,
-        "HIVE_FORK_LONDON": 0,
-        "HIVE_FORK_MERGE": 0,
-        "HIVE_TERMINAL_TOTAL_DIFFICULTY": 0,
-        "HIVE_SHANGHAI_TIMESTAMP": 0,
-        "HIVE_CANCUN_TIMESTAMP": 0,
-        "HIVE_PRAGUE_TIMESTAMP": 0,
-        "HIVE_OSAKA_TIMESTAMP": 0,
-        "HIVE_BPO1_TIMESTAMP": 0,
-        "HIVE_BPO2_TIMESTAMP": 0,
-        # TODO: So far only BPOs 1 and 2 are active. This may have to be
-        #  tweaked as more BPOs get activated and the Amsterdam fork
-        #  starts inheriting these params.
-        # "HIVE_BPO3_TIMESTAMP": 0,
-        # "HIVE_BPO4_TIMESTAMP": 0,
-        "HIVE_AMSTERDAM_TIMESTAMP": 0,
-        **get_blob_schedule_entries(BPO2),
-    },
-}
+ruleset = {f: ruleset_format(f) for f in ALL_FORKS_WITH_TRANSITIONS}
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/simulator_logic/test_via_build.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/simulator_logic/test_via_build.py
new file mode 100644
index 00000000000..00350737c1a
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/simulator_logic/test_via_build.py
@@ -0,0 +1,333 @@
+"""
+A hive based simulator that tests block building correctness via the
+``testing_buildBlockV1`` endpoint.
+
+For each valid payload in a fixture, transactions and block attributes
+are sent to the block building endpoint. The resulting block is validated
+field-by-field against the fixture's expected block, then imported back
+into the client via ``engine_newPayloadVX`` and
+``engine_forkchoiceUpdatedVX`` to advance the chain.
+"""
+
+import json
+from difflib import unified_diff
+from typing import List
+
+from execution_testing.base_types import Bytes
+from execution_testing.fixtures import BlockchainEngineFixture
+from execution_testing.fixtures.blockchain import (
+    FixtureEngineNewPayload,
+    FixtureExecutionPayload,
+    FixtureHeader,
+)
+from execution_testing.logging import get_logger
+from execution_testing.rpc import (
+    EngineRPC,
+    EthRPC,
+    ForkchoiceUpdateTimeoutError,
+    TestingRPC,
+)
+from execution_testing.rpc.rpc_types import (
+    ForkchoiceState,
+    PayloadStatusEnum,
+)
+from execution_testing.test_types.block_access_list import BlockAccessList
+
+from ..helpers.exceptions import (
+    GenesisBlockMismatchExceptionError,
+    LoggedError,
+)
+from ..helpers.timing import TimingData
+
+logger = get_logger(__name__)
+
+
+def _format_block_access_list_diff(
+    expected_rlp: bytes | None,
+    built_rlp: bytes | None,
+) -> str:
+    """Return a readable diff for a BAL mismatch."""
+    if expected_rlp is None or built_rlp is None:
+        return f"expected {expected_rlp!r}, got {built_rlp!r}"
+
+    try:
+        expected_bal = BlockAccessList.from_rlp(Bytes(expected_rlp))
+        built_bal = BlockAccessList.from_rlp(Bytes(built_rlp))
+    except Exception as exc:
+        return (
+            f"expected {expected_rlp!r}, got {built_rlp!r} "
+            f"(BAL decode failed: {exc})"
+        )
+
+    expected_json = json.dumps(
+        expected_bal.model_dump(mode="json"),
+        indent=2,
+        sort_keys=True,
+    )
+    built_json = json.dumps(
+        built_bal.model_dump(mode="json"),
+        indent=2,
+        sort_keys=True,
+    )
+    diff = "\n".join(
+        unified_diff(
+            expected_json.splitlines(),
+            built_json.splitlines(),
+            fromfile="expected_bal",
+            tofile="client_built_bal",
+            lineterm="",
+        )
+    )
+    return (
+        f"expected {expected_rlp!r}, got {built_rlp!r}\n"
+        "decoded BAL diff relative to expected BAL:\n"
+        "  '-' lines are present in the expected BAL but missing from the "
+        "client-built BAL.\n"
+        "  '+' lines are extra or changed in the client-built BAL compared "
+        "to the expected BAL.\n"
+        f"{diff}"
+    )
+
+
+def _validate_gas_limit(
+    built: FixtureExecutionPayload,
+    parent_gas_limit: int,
+) -> None:
+    """Validate the built block's gas limit is within EIP-1559 range."""
+    built_gas_limit = int(built.gas_limit)
+    max_delta = parent_gas_limit // 1024
+
+    if abs(built_gas_limit - parent_gas_limit) >= max_delta:
+        raise LoggedError(
+            f"Gas limit for block {built.number} outside "
+            f"EIP-1559 range: parent={parent_gas_limit} "
+            f"(±{max_delta}), got {built.gas_limit}"
+        )
+
+
+def _validate_built_block(
+    built: FixtureExecutionPayload,
+    expected: FixtureExecutionPayload,
+    parent_gas_limit: int,
+) -> None:
+    """
+    Validate the built block against the fixture's expected block.
+
+    Check all execution-dependent fields for exact match and verify
+    the gas limit is within the valid EIP-1559 range.
+    """
+    _validate_gas_limit(built, parent_gas_limit)
+
+    mismatches: List[str] = []
+
+    # All FixtureExecutionPayload fields are validated except:
+    # - gas_limit: testing_buildBlockV1 doesn't accept it; the client
+    #   picks its own via EIP-1559 (validated separately by range check).
+    # - block_hash: depends on gas_limit, so it will differ too.
+    validated_fields = tuple(
+        name
+        for name in FixtureExecutionPayload.model_fields
+        if name not in {"gas_limit", "block_hash"}
+    )
+    for field in validated_fields:
+        built_val = getattr(built, field)
+        expected_val = getattr(expected, field)
+        if built_val != expected_val:
+            if field == "block_access_list":
+                mismatches.append(
+                    "  block_access_list:\n"
+                    + _format_block_access_list_diff(expected_val, built_val)
+                )
+                continue
+            mismatches.append(
+                f"  {field}: expected {expected_val}, got {built_val}"
+            )
+
+    if mismatches:
+        detail = "\n".join(mismatches)
+        raise LoggedError(
+            f"Block validation failed for block {expected.number}:\n{detail}"
+        )
+
+    logger.info(f"Block validated for block {expected.number}.")
+
+
+def _bootstrap_engine_at_genesis(
+    engine_rpc: EngineRPC,
+    eth_rpc: EthRPC,
+    fixture: BlockchainEngineFixture,
+    genesis_header: FixtureHeader,
+    timing_data: TimingData,
+) -> None:
+    """Send initial FCU to genesis and verify the client's genesis hash."""
+    with timing_data.time("Initial forkchoice update"):
+        logger.info("Sending initial forkchoice update to genesis block...")
+        try:
+            response = engine_rpc.forkchoice_updated_with_retry(
+                forkchoice_state=ForkchoiceState(
+                    head_block_hash=fixture.genesis.block_hash,
+                ),
+                forkchoice_version=fixture.payloads[
+                    0
+                ].forkchoice_updated_version,
+            )
+            if response.payload_status.status != PayloadStatusEnum.VALID:
+                raise LoggedError(
+                    "Unexpected status on forkchoice updated to "
+                    f"genesis: {response.payload_status.status}"
+                )
+        except ForkchoiceUpdateTimeoutError as e:
+            raise LoggedError(
+                f"Timed out waiting for forkchoice update to genesis: {e}"
+            ) from None
+
+    with timing_data.time("Get genesis block"):
+        logger.info("Calling getBlockByNumber to get genesis block...")
+        genesis_block = eth_rpc.get_block_by_number(0)
+        assert genesis_block is not None, "genesis_block is None"
+        if genesis_block["hash"] != str(genesis_header.block_hash):
+            raise GenesisBlockMismatchExceptionError(
+                expected_header=genesis_header,
+                got_genesis_block=genesis_block,
+            )
+
+
+def _build_validate_and_advance(
+    testing_rpc: TestingRPC,
+    engine_rpc: EngineRPC,
+    payload: FixtureEngineNewPayload,
+    parent_gas_limit: int,
+    block_index: int,
+    total_blocks: int,
+    total_build_timing: TimingData,
+) -> int:
+    """
+    Build, validate, import, and advance the chain for one payload.
+
+    Returns the new ``parent_gas_limit`` to use for the next block (taken
+    from the fixture's expected payload, not the client-built one, since
+    we import the fixture block to advance the chain).
+    """
+    expected_payload = payload.params[0]
+    logger.info(
+        f"Building block {block_index + 1}/{total_blocks} "
+        f"(number {expected_payload.number})..."
+    )
+    with total_build_timing.time(f"Block {block_index + 1}") as block_timing:
+        # 1. Build the block
+        with block_timing.time("testing_buildBlockV1"):
+            build_response = testing_rpc.build_block(
+                parent_block_hash=expected_payload.parent_hash,
+                payload_attributes=payload.get_payload_attributes(),
+                transactions=expected_payload.transactions,
+                extra_data=expected_payload.extra_data,
+            )
+
+        # 2. Validate fields + gas limit range
+        _validate_built_block(
+            built=build_response.execution_payload,
+            expected=expected_payload,
+            parent_gas_limit=parent_gas_limit,
+        )
+
+        # 3. Validate execution_requests (V4+)
+        if payload.new_payload_version >= 4:
+            expected_requests = (
+                payload.params[3] if len(payload.params) >= 4 else None
+            )
+            if build_response.execution_requests != expected_requests:
+                raise LoggedError(
+                    f"execution_requests mismatch for block "
+                    f"{expected_payload.number}: expected "
+                    f"{expected_requests}, got "
+                    f"{build_response.execution_requests}"
+                )
+
+        # 4. Import the fixture block (not the built block) so the chain
+        #    advances with the expected gas limit and block hash.
+        with block_timing.time(
+            f"engine_newPayloadV{payload.new_payload_version}"
+        ):
+            logger.info(
+                "Importing block via "
+                f"engine_newPayloadV{payload.new_payload_version}..."
+            )
+            import_response = engine_rpc.new_payload(
+                *payload.params,
+                version=payload.new_payload_version,
+            )
+            if import_response.status != PayloadStatusEnum.VALID:
+                raise LoggedError(
+                    "Unexpected status importing "
+                    f"block: {import_response.status}"
+                )
+
+        # 5. Advance the chain via forkchoice update
+        v = payload.forkchoice_updated_version
+        with block_timing.time(f"engine_forkchoiceUpdatedV{v}"):
+            logger.info(f"Sending engine_forkchoiceUpdatedV{v}...")
+            fcu_response = engine_rpc.forkchoice_updated(
+                forkchoice_state=ForkchoiceState(
+                    head_block_hash=expected_payload.block_hash,
+                ),
+                payload_attributes=None,
+                version=v,
+            )
+            fcu_status = fcu_response.payload_status.status
+            if fcu_status != PayloadStatusEnum.VALID:
+                raise LoggedError(
+                    "Unexpected status on forkchoice update: "
+                    f"want {PayloadStatusEnum.VALID}, got {fcu_status}"
+                )
+
+    # Use the fixture's gas limit since we import the fixture block,
+    # not the built one.
+    return int(expected_payload.gas_limit)
+
+
+def test_blockchain_via_build(
+    timing_data: TimingData,
+    eth_rpc: EthRPC,
+    engine_rpc: EngineRPC,
+    testing_rpc: TestingRPC,
+    fixture: BlockchainEngineFixture,
+    genesis_header: FixtureHeader,
+) -> None:
+    """
+    Test block building correctness against a client.
+
+    For each valid payload in the fixture:
+    1. Build a block via ``testing_buildBlockV1``
+    2. Validate execution-dependent fields + gas limit range
+    3. Validate execution_requests for fork >= Prague (V4+)
+    4. Import the fixture block via ``engine_newPayloadVX``
+    5. Advance the chain via ``engine_forkchoiceUpdatedVX``
+    """
+    _bootstrap_engine_at_genesis(
+        engine_rpc=engine_rpc,
+        eth_rpc=eth_rpc,
+        fixture=fixture,
+        genesis_header=genesis_header,
+        timing_data=timing_data,
+    )
+
+    with timing_data.time("Block building") as total_build_timing:
+        valid_payloads = [p for p in fixture.payloads if p.valid()]
+        logger.info(
+            f"Starting block building for {len(valid_payloads)} "
+            f"valid payload(s) "
+            f"(of {len(fixture.payloads)} total)..."
+        )
+        parent_gas_limit = int(genesis_header.gas_limit)
+        for i, payload in enumerate(valid_payloads):
+            parent_gas_limit = _build_validate_and_advance(
+                testing_rpc=testing_rpc,
+                engine_rpc=engine_rpc,
+                payload=payload,
+                parent_gas_limit=parent_gas_limit,
+                block_index=i,
+                total_blocks=len(valid_payloads),
+                total_build_timing=total_build_timing,
+            )
+
+        logger.info("All blocks built and verified successfully.")
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/simulator_logic/test_via_rlp.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/simulator_logic/test_via_rlp.py
index b219edf74e2..929bc64979c 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/simulator_logic/test_via_rlp.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/simulator_logic/test_via_rlp.py
@@ -7,12 +7,17 @@
 """
 
 import logging
+from typing import Any, Dict
 
+from pydantic import ValidationError
+
+from execution_testing.base_types import HexNumber
 from execution_testing.fixtures import BlockchainFixture
 from execution_testing.fixtures.blockchain import (
     FixtureBlock,
     FixtureHeader,
 )
+from execution_testing.forks import Fork, TransitionFork
 from execution_testing.rpc import EthRPC
 
 from ..helpers.exceptions import GenesisBlockMismatchExceptionError
@@ -21,6 +26,23 @@
 logger = logging.getLogger(__name__)
 
 
+def _validate_rpc_header_fields(
+    block: Dict[str, Any],
+    fixture_fork: Fork | TransitionFork,
+) -> None:
+    applicable_fork = fixture_fork.fork_at(
+        block_number=HexNumber(block["number"]),
+        timestamp=HexNumber(block["timestamp"]),
+    )
+    try:
+        FixtureHeader.model_validate({**block, "fork": applicable_fork})
+    except ValidationError as e:
+        raise AssertionError(
+            f"Invalid or missing required header field for "
+            f"block {block['number']}: {e}"
+        ) from e
+
+
 def test_via_rlp(
     timing_data: TimingData,
     eth_rpc: EthRPC,
@@ -44,6 +66,7 @@ def test_via_rlp(
         logger.info("Calling getBlockByNumber to get latest block...")
         block = eth_rpc.get_block_by_number("latest")
         assert block, "`getBlockByNumber` didn't return a block."
+        _validate_rpc_header_fields(block, fixture.fork)
         if block["hash"] != str(fixture.last_block_hash):
             try:
                 block_header = FixtureHeader.model_validate(block).model_dump()
@@ -71,6 +94,8 @@ def test_via_rlp(
                     "blockHash mismatch in last block - field mismatches:"
                     "\n" + "\n".join(mismatches)
                 )
+            except AssertionError:
+                raise
             except Exception:
                 raise AssertionError(
                     f"blockHash mismatch in last block: "
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/single_test_client.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/single_test_client.py
index 2d22fbb2e80..67984186bd2 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/single_test_client.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/single_test_client.py
@@ -34,6 +34,9 @@ def client_genesis(fixture: BlockchainFixtureCommon) -> dict:
     alloc = to_json(fixture.pre)
     # NOTE: nethermind requires account keys without '0x' prefix
     genesis["alloc"] = {k.replace("0x", ""): v for k, v in alloc.items()}
+    # NOTE: geth expects slotNumber as plain integer, not hex string
+    if "slotNumber" in genesis:
+        genesis["slotNumber"] = int(genesis["slotNumber"], 16)
     return genesis
 
 
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/tests/release_information.json b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/tests/release_information.json
index 89bf18fe6e4..8223f696ee8 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/tests/release_information.json
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/tests/release_information.json
@@ -1341,7 +1341,7 @@
     ],
     "tarball_url": "https://api.github.com/repos/ethereum/execution-spec-tests/tarball/eip7692@v1.1.1",
     "zipball_url": "https://api.github.com/repos/ethereum/execution-spec-tests/zipball/eip7692@v1.1.1",
-    "body": "Filled using Besu commit https://github.com/hyperledger/besu/commit/0d6395515890280c29ee2402c03b1ee81bde3bab\r\n\r\n## What's Changed\r\n* new(tests): EOF - EIP-7620 EOFCREATE gas testing by @pdobacz in https://github.com/ethereum/execution-spec-tests/pull/785\r\n\r\n**Full Changelog**: https://github.com/ethereum/execution-spec-tests/compare/eip7692@v1.1.0...eip7692@v1.1.1",
+    "body": "Filled using Besu commit https://github.com/besu-eth/besu/commit/0d6395515890280c29ee2402c03b1ee81bde3bab\r\n\r\n## What's Changed\r\n* new(tests): EOF - EIP-7620 EOFCREATE gas testing by @pdobacz in https://github.com/ethereum/execution-spec-tests/pull/785\r\n\r\n**Full Changelog**: https://github.com/ethereum/execution-spec-tests/compare/eip7692@v1.1.0...eip7692@v1.1.1",
     "mentions_count": 1
   },
   {
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/tests/test_consume_args.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/tests/test_consume_args.py
index a601e1353e2..8712beee834 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/tests/test_consume_args.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/tests/test_consume_args.py
@@ -13,7 +13,9 @@
 MINIMAL_TEST_CONTENTS = """
 from execution_testing import Transaction
 def test_function(state_test, pre):
-    tx = Transaction(to=0, gas_limit=21_000, sender=pre.fund_eoa())
+    tx = Transaction(
+        to=0, gas_limit=21_000, sender=pre.fund_eoa()
+    ).with_signature_and_sender()
     state_test(pre=pre, post={}, tx=tx)
 """
 
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/tests/test_releases.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/tests/test_releases.py
index f34479b1dff..0b36da6228b 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/tests/test_releases.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/tests/test_releases.py
@@ -7,8 +7,10 @@
 import pytest
 
 from ..releases import (
+    SUPPORTED_REPOS,
     ReleaseInformation,
     get_release_url_from_release_information,
+    is_release_url,
     parse_release_information_from_file,
 )
 
@@ -61,3 +63,62 @@ def test_release_parsing(
     ) == get_release_url_from_release_information(
         release_name, release_information
     )
+
+
+@pytest.mark.parametrize(
+    "url,expected",
+    [
+        # All currently supported release-hosting repos must be recognized so
+        # `FixtureDownloader.get_cache_path` versions the cache directory by
+        # release tag. A repo missing from `SUPPORTED_REPOS` falls through to
+        # the unversioned `cache_folder / "other" / archive_name` path, which
+        # silently shadows newer releases with the same archive filename.
+        (
+            "https://github.com/ethereum/execution-spec-tests/releases/download/v3.0.0/fixtures_stable.tar.gz",
+            True,
+        ),
+        (
+            "https://github.com/ethereum/execution-specs/releases/download/tests-bal%40v7.1.0/fixtures_bal.tar.gz",
+            True,
+        ),
+        (
+            "https://github.com/ethereum/tests/releases/download/v14.0/some.tar.gz",
+            True,
+        ),
+        (
+            "https://github.com/ethereum/legacytests/releases/download/v1.0/some.tar.gz",
+            True,
+        ),
+        (
+            # Not a recognized repo; must NOT match.
+            "https://github.com/some-fork/execution-spec-tests/releases/download/v1/foo.tar.gz",
+            False,
+        ),
+        (
+            # Local path, not a URL.
+            "./fixtures",
+            False,
+        ),
+    ],
+)
+def test_is_release_url_covers_supported_repos(
+    url: str, expected: bool
+) -> None:
+    """
+    All entries in `SUPPORTED_REPOS` must be matched by `is_release_url`.
+
+    Regression test for bal-devnet-7: when the BAL fixture URL moved from
+    `execution-spec-tests` to `execution-specs`, the new URL stopped being
+    recognized as a release URL, so the cache key dropped the version tag and
+    a `tests-bal@v7.0.0` download from a prior session silently shadowed
+    `tests-bal@v7.1.0`.
+    """
+    assert is_release_url(url) is expected
+
+
+def test_supported_repos_contains_execution_specs() -> None:
+    """
+    `ethereum/execution-specs` hosts the BAL fixture releases (from
+    `tests-bal@v7.1.0` onward) and must be in `SUPPORTED_REPOS`.
+    """
+    assert "ethereum/execution-specs" in SUPPORTED_REPOS
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/contracts.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/contracts.py
index 8e05289608e..4be3f8aa36c 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/contracts.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/contracts.py
@@ -1,7 +1,10 @@
 """Methods to deploy required contracts for execute command."""
 
+from typing import List, Tuple
+
 from execution_testing.base_types import Address
-from execution_testing.forks import Fork
+from execution_testing.client_clis.cli_types import EnginePayloadMetadata
+from execution_testing.forks import Fork, TransitionFork
 from execution_testing.logging import get_logger
 from execution_testing.rpc import EthRPC
 from execution_testing.test_types import (
@@ -12,17 +15,19 @@
     TransactionTestMetadata,
 )
 
+from .rpc.chain_builder_eth_rpc import ChainBuilderEthRPC
+
 logger = get_logger(__name__)
 
 
 def check_deterministic_factory_deployment(
     *,
     eth_rpc: EthRPC,
-    fork: Fork,
+    fork: Fork | TransitionFork,
 ) -> Address | None:
     """Check if the deterministic deployment contract is deployed."""
     fork_deterministic_factory_predeploy_address = (
-        fork.deterministic_factory_predeploy_address()
+        fork.transitions_from().deterministic_factory_predeploy_address()
     )
     if fork_deterministic_factory_predeploy_address is not None:
         return fork_deterministic_factory_predeploy_address
@@ -34,14 +39,40 @@ def check_deterministic_factory_deployment(
     return None
 
 
+def _send_tx_capturing(
+    eth_rpc: EthRPC,
+    tx: Transaction,
+) -> EnginePayloadMetadata | None:
+    """
+    Send a single tx, returning the built engine payload metadata when
+    routed through ``testing_buildBlockV1`` (fill-stateful path) or
+    ``None`` for the mempool path (execute).
+    """
+    if (
+        isinstance(eth_rpc, ChainBuilderEthRPC)
+        and eth_rpc.testing_rpc is not None
+    ):
+        return eth_rpc.build_block_with_transactions([tx])
+    eth_rpc.send_wait_transactions([tx])
+    return None
+
+
 def deploy_deterministic_factory_contract(
     *,
     eth_rpc: EthRPC,
     seed_key: EOA,
     gas_price: int,
     tx_index: int = 0,
-) -> int:
-    """Deploy the deterministic deployment contract."""
+) -> Tuple[int, List[EnginePayloadMetadata]]:
+    """
+    Deploy the deterministic deployment contract.
+
+    Returns ``(next_tx_index, captured_payloads)``; the captured list is
+    only populated on the fill-stateful path (``ChainBuilderEthRPC`` with
+    ``testing_rpc``) so callers can write payloads into
+    ``pre_run/<start_block_hash>.json``.
+    """
+    captured: List[EnginePayloadMetadata] = []
     deploy_tx_gas_price = 0x174876E800
     deploy_tx_gas_limit = 0x0186A0
     deploy_tx = Transaction(
@@ -89,7 +120,9 @@ def deploy_deterministic_factory_contract(
             tx_index=tx_index,
         )
         tx_index += 1
-        eth_rpc.send_wait_transactions([fund_tx])
+        fund_payload = _send_tx_capturing(eth_rpc, fund_tx)
+        if fund_payload is not None:
+            captured.append(fund_payload)
         logger.info(f"Funding transaction mined: {fund_tx.hash}")
 
     # Add deployment transaction.
@@ -102,7 +135,9 @@ def deploy_deterministic_factory_contract(
         tx_index=tx_index,
     )
     tx_index += 1
-    eth_rpc.send_wait_transactions([deploy_tx])
+    deploy_payload = _send_tx_capturing(eth_rpc, deploy_tx)
+    if deploy_payload is not None:
+        captured.append(deploy_payload)
     logger.info(f"Deployment transaction mined: {deploy_tx.hash}")
     deployment_contract_code = eth_rpc.get_code(DETERMINISTIC_FACTORY_ADDRESS)
     logger.info(f"Deployment contract code: {deployment_contract_code}")
@@ -110,4 +145,4 @@ def deploy_deterministic_factory_contract(
         f"Deployment contract code is not the expected code: "
         f"{deployment_contract_code} != {DETERMINISTIC_FACTORY_BYTECODE}"
     )
-    return tx_index
+    return tx_index, captured
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/execute.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/execute.py
index 9df38830568..be8743ac0d5 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/execute.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/execute.py
@@ -2,7 +2,6 @@
 Test execution plugin for pytest, to run Ethereum tests on live networks.
 """
 
-import os
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, Dict, Generator, List, Type
@@ -13,7 +12,7 @@
 from execution_testing.base_types import Account
 from execution_testing.base_types import Alloc as BaseAlloc
 from execution_testing.execution import BaseExecute
-from execution_testing.forks import Fork
+from execution_testing.forks import Fork, TransitionFork
 from execution_testing.logging import get_logger
 from execution_testing.rpc import EngineRPC, EthRPC
 from execution_testing.specs import BaseTest
@@ -26,6 +25,7 @@
     get_spec_format_for_item,
     is_help_or_collectonly_mode,
     labeled_format_parameter_set,
+    option_was_explicitly_set,
 )
 from ..spec_version_checker.spec_version_checker import EIPSpecTestItem
 from .pre_alloc import Alloc
@@ -42,133 +42,15 @@ def default_html_report_file_path() -> str:
 
 
 def pytest_addoption(parser: pytest.Parser) -> None:
-    """Add command-line options to pytest."""
-    execute_group = parser.getgroup(
-        "execute", "Arguments defining test execution behavior"
-    )
-    execute_group.addoption(
-        "--default-gas-price",
-        action="store",
-        dest="default_gas_price",
-        type=int,
-        default=None,
-        help=(
-            "Default gas price used for transactions, unless overridden by "
-            "the test. Default=None (1.5x current network gas price)"
-        ),
-    )
-    execute_group.addoption(
-        "--default-max-fee-per-gas",
-        action="store",
-        dest="default_max_fee_per_gas",
-        type=int,
-        default=None,
-        help=(
-            "Default max fee per gas used for transactions, unless overridden "
-            "by the test. Default=None (1.5x current network max fee per gas)"
-        ),
-    )
-    execute_group.addoption(
-        "--default-max-priority-fee-per-gas",
-        action="store",
-        dest="default_max_priority_fee_per_gas",
-        type=int,
-        default=None,
-        help=(
-            "Default max priority fee per gas used for transactions, "
-            "unless overridden by the test. "
-            "Default=None (1.5x current network max priority fee per gas)"
-        ),
-    )
-    execute_group.addoption(
-        "--default-max-fee-per-blob-gas",
-        action="store",
-        dest="default_max_fee_per_blob_gas",
-        type=int,
-        default=None,
-        help=(
-            "Default max fee per blob gas used for transactions, unless "
-            "overridden by the test. Default=None (1.5x current network max "
-            "fee per blob gas)"
-        ),
-    )
-    execute_group.addoption(
-        "--transaction-gas-limit",
-        action="store",
-        dest="transaction_gas_limit",
-        default=EnvironmentDefaults.gas_limit // 4,
-        type=int,
-        help=(
-            "Maximum gas used to execute a single transaction. Will be used "
-            "as ceiling for tests that attempt to consume the entire block "
-            f"gas limit. (Default: {EnvironmentDefaults.gas_limit // 4})"
-        ),
-    )
-    execute_group.addoption(
-        "--transactions-per-block",
-        action="store",
-        dest="transactions_per_block",
-        type=int,
-        default=None,
-        help=(
-            "Number of transactions to send before producing the next block."
-        ),
-    )
-    execute_group.addoption(
-        "--get-payload-wait-time",
-        action="store",
-        dest="get_payload_wait_time",
-        type=float,
-        default=0.3,
-        help=(
-            "Time to wait after sending a forkchoice_updated before getting "
-            "the payload."
-        ),
-    )
-    execute_group.addoption(
-        "--max-gas-per-test",
-        action="store",
-        dest="max_gas_per_test",
-        default=None,
-        type=int,
-        help=(
-            "Maximum gas limit for all transactions in a test. Default=None "
-            "(No limit)"
-        ),
-    )
-    execute_group.addoption(
-        "--dry-run",
-        action="store_true",
-        dest="dry_run",
-        default=False,
-        help=(
-            "Don't send transactions, just print the minimum balance required "
-            "per test."
-        ),
-    )
-    execute_group.addoption(
-        "--max-tx-per-batch",
-        action="store",
-        dest="max_tx_per_batch",
-        type=int,
-        default=None,
-        help=(
-            "Maximum number of transactions to send in a single batch to the "
-            "RPC. Default=750. Higher values may cause RPC instability."
-        ),
-    )
-    execute_group.addoption(
-        "--use-testing-build-block",
-        action="store_true",
-        dest="use_testing_build_block",
-        default=False,
-        help=(
-            "Use testing_buildBlockV1 to build blocks with transactions "
-            "directly, instead of the standard Engine API flow. "
-            "Only for clients that implement this endpoint."
-        ),
-    )
+    """
+    Add execute-specific command-line options.
 
+    The live-client flag set (``--default-gas-price``, ``--get-payload-
+    wait-time``, ``--dry-run``, ...) now lives in
+    :mod:`plugins.shared.live_client_flags`, which this plugin requires.
+    Both ``pytest-execute*.ini`` and ``pytest-fill-stateful.ini`` load the
+    shared plugin ahead of this one.
+    """
     report_group = parser.getgroup(
         "tests", "Arguments defining html report behavior"
     )
@@ -200,8 +82,9 @@ def pytest_configure(config: pytest.Config) -> None:
        called before the pytest-html plugin's pytest_configure to ensure that
        it uses the modified `htmlpath` option.
     """
-    # Modify the block gas limit if specified.
-    if config.getoption("transaction_gas_limit"):
+    # Keep execute-mode overrides working, but avoid rewriting the global
+    # default when this plugin is merely imported into nested pytest sessions.
+    if option_was_explicitly_set(config, "--transaction-gas-limit"):
         EnvironmentDefaults.gas_limit = config.getoption(
             "transaction_gas_limit"
         )
@@ -302,241 +185,14 @@ def pytest_html_report_title(report: Any) -> None:
     report.title = "Execute Test Report"
 
 
-@pytest.fixture(scope="session")
-def transactions_per_block(
-    request: pytest.FixtureRequest,
-) -> int:
-    """
-    Return the number of transactions to send before producing the next block.
-    """
-    if transactions_per_block := request.config.getoption(
-        "transactions_per_block"
-    ):
-        return transactions_per_block
-
-    # Get the number of workers for the test
-    worker_count_env = os.environ.get("PYTEST_XDIST_WORKER_COUNT")
-    if not worker_count_env:
-        return 1
-    return max(int(worker_count_env), 1)
-
-
-@pytest.fixture(scope="session")
-def default_gas_price(request: pytest.FixtureRequest) -> int | None:
-    """Return default gas price used for transactions."""
-    gas_price = request.config.getoption("default_gas_price")
-    if gas_price is not None:
-        assert gas_price > 0, "Gas price must be greater than 0"
-        logger.debug(
-            f"Using configured default gas price: {gas_price / 10**9:.2f} Gwei"
-        )
-    else:
-        logger.debug(
-            "No default gas price configured, will use network gas price * 1.5"
-        )
-    return gas_price
-
-
-@pytest.fixture(scope="session")
-def dry_run(request: pytest.FixtureRequest) -> bool:
-    """Return True if the test is a dry run."""
-    return request.config.getoption("dry_run")
-
-
-@pytest.fixture(scope="session")
-def max_transactions_per_batch(request: pytest.FixtureRequest) -> int | None:
-    """Return max number of transactions per batch, or None for default."""
-    return request.config.getoption("max_tx_per_batch")
-
-
-@pytest.fixture(scope="session")
-def use_testing_build_block(
-    request: pytest.FixtureRequest,
-) -> bool:
-    """Return whether to use testing_buildBlockV1 for block building."""
-    return request.config.getoption("use_testing_build_block")
-
-
-@pytest.fixture(scope="session")
-def default_max_fee_per_gas(
-    request: pytest.FixtureRequest,
-) -> int | None:
-    """Return default max fee per gas used for transactions."""
-    max_fee_per_gas = request.config.getoption("default_max_fee_per_gas")
-    if max_fee_per_gas is not None:
-        fee_gwei = max_fee_per_gas / 10**9
-        logger.debug(
-            f"Using configured default max fee per gas: {fee_gwei:.2f} Gwei"
-        )
-    else:
-        logger.debug(
-            "No default max fee per gas configured, "
-            "will use network gas price * 1.5"
-        )
-    return max_fee_per_gas
-
-
-@pytest.fixture(scope="session")
-def default_max_priority_fee_per_gas(
-    request: pytest.FixtureRequest,
-) -> int | None:
-    """Return default max priority fee per gas used for transactions."""
-    max_priority_fee_per_gas = request.config.getoption(
-        "default_max_priority_fee_per_gas"
-    )
-    if max_priority_fee_per_gas is not None:
-        prio_fee_gwei = max_priority_fee_per_gas / 10**9
-        logger.debug(
-            f"Using configured default max priority fee per gas: "
-            f"{prio_fee_gwei:.2f} Gwei"
-        )
-    else:
-        logger.debug(
-            "No default max priority fee per gas configured, "
-            "will use network max priority fee * 1.5"
-        )
-    return max_priority_fee_per_gas
-
-
-@pytest.fixture(scope="session")
-def default_max_fee_per_blob_gas(
-    request: pytest.FixtureRequest,
-) -> int | None:
-    """Return default max fee per blob gas used for transactions."""
-    max_fee_per_blob_gas = request.config.getoption(
-        "default_max_fee_per_blob_gas"
-    )
-    if max_fee_per_blob_gas is not None:
-        blob_fee_gwei = max_fee_per_blob_gas / 10**9
-        logger.debug(
-            f"Using configured default max fee per blob gas: "
-            f"{blob_fee_gwei:.2f} Gwei"
-        )
-    else:
-        logger.debug(
-            "No default max fee per blob gas configured, "
-            "will use network blob base fee * 1.5"
-        )
-    return max_fee_per_blob_gas
-
-
-@pytest.fixture(scope="function")
-def max_priority_fee_per_gas(
-    eth_rpc: EthRPC,
-    default_max_priority_fee_per_gas: int | None,
-) -> int:
-    """Return max priority fee per gas for transactions in a given test."""
-    max_priority_fee_per_gas = default_max_priority_fee_per_gas
-    if max_priority_fee_per_gas is None:
-        network_max_priority_fee = eth_rpc.max_priority_fee_per_gas()
-        max_priority_fee_per_gas = int(network_max_priority_fee * 1.5)
-        net_gwei = network_max_priority_fee / 10**9
-        calc_gwei = max_priority_fee_per_gas / 10**9
-        logger.info(
-            f"Calculated max priority fee per gas from network: "
-            f"{net_gwei:.2f} Gwei * 1.5 = {calc_gwei:.2f} Gwei"
-        )
-    else:
-        prio_gwei = max_priority_fee_per_gas / 10**9
-        logger.info(
-            f"Using default max priority fee per gas: {prio_gwei:.2f} Gwei"
-        )
-    return max_priority_fee_per_gas
-
-
-@pytest.fixture(scope="function")
-def max_fee_per_gas(
-    eth_rpc: EthRPC,
-    default_max_fee_per_gas: int | None,
-    max_priority_fee_per_gas: int,
-) -> int:
-    """Return max fee per gas used for transactions in a given test."""
-    max_fee_per_gas = default_max_fee_per_gas
-    if max_fee_per_gas is None:
-        network_gas_price = eth_rpc.gas_price()
-        max_fee_per_gas = int(network_gas_price * 1.5)
-        net_gwei = network_gas_price / 10**9
-        calc_gwei = max_fee_per_gas / 10**9
-        logger.info(
-            f"Calculated max fee per gas from network: "
-            f"{net_gwei:.2f} Gwei * 1.5 = {calc_gwei:.2f} Gwei"
-        )
-    else:
-        fee_gwei = max_fee_per_gas / 10**9
-        logger.info(f"Using default max fee per gas: {fee_gwei:.2f} Gwei")
-    if max_priority_fee_per_gas > max_fee_per_gas:
-        # Depending on the timing of the request, the priority fee may be
-        # greater than the max fee. This is a workaround to ensure that the
-        # transaction is valid.
-        prio_gwei = max_priority_fee_per_gas / 10**9
-        fee_gwei = max_fee_per_gas / 10**9
-        adj_gwei = (max_priority_fee_per_gas + 1) / 10**9
-        logger.warning(
-            f"Max priority fee per gas ({prio_gwei:.2f} Gwei) is greater "
-            f"than max fee per gas ({fee_gwei:.2f} Gwei), "
-            f"adjusting max fee per gas to {adj_gwei:.2f} Gwei"
-        )
-        max_fee_per_gas = max_priority_fee_per_gas + 1
-    final_gwei = max_fee_per_gas / 10**9
-    prio_gwei = max_priority_fee_per_gas / 10**9
-    logger.debug(
-        f"Final max fee per gas: {final_gwei:.2f} Gwei, "
-        f"max priority fee per gas: {prio_gwei:.2f} Gwei"
-    )
-    return max_fee_per_gas
-
-
-@pytest.fixture(scope="function")
-def max_fee_per_blob_gas(
-    eth_rpc: EthRPC,
-    default_max_fee_per_blob_gas: int | None,
-) -> int:
-    """Return max fee per blob gas used for transactions in a given test."""
-    max_fee_per_blob_gas = default_max_fee_per_blob_gas
-    if max_fee_per_blob_gas is None:
-        network_blob_base_fee = eth_rpc.blob_base_fee()
-        max_fee_per_blob_gas = int(network_blob_base_fee * 1.5)
-        net_gwei = network_blob_base_fee / 10**9
-        calc_gwei = max_fee_per_blob_gas / 10**9
-        logger.info(
-            f"Calculated max fee per blob gas from network: "
-            f"{net_gwei:.2f} Gwei * 1.5 = {calc_gwei:.2f} Gwei"
-        )
-    else:
-        blob_gwei = max_fee_per_blob_gas / 10**9
-        logger.info(
-            f"Using default max fee per blob gas: {blob_gwei:.2f} Gwei"
-        )
-    return max_fee_per_blob_gas
-
-
-@pytest.fixture(scope="function")
-def gas_price(max_fee_per_gas: int, max_priority_fee_per_gas: int) -> int:
-    """Return gas price used for transactions in a given test."""
-    calculated_gas_price = max_fee_per_gas + max_priority_fee_per_gas
-    fee_gwei = max_fee_per_gas / 10**9
-    prio_gwei = max_priority_fee_per_gas / 10**9
-    total_gwei = calculated_gas_price / 10**9
-    logger.debug(
-        f"Calculated gas price: {fee_gwei:.2f} Gwei (max fee) + "
-        f"{prio_gwei:.2f} Gwei (max priority fee) = {total_gwei:.2f} Gwei"
-    )
-    return calculated_gas_price
-
-
-@pytest.fixture()
-def max_gas_limit_per_test(request: pytest.FixtureRequest) -> int | None:
-    """Return the total gas limit for all transactions in a given test."""
-    max_gas_limit = request.config.getoption("max_gas_per_test")
-    if max_gas_limit is not None:
-        logger.info(
-            f"Using configured max gas limit per test: {max_gas_limit}"
-        )
-    else:
-        logger.debug(
-            "No max gas limit per test configured, no limit will be enforced"
-        )
-    return max_gas_limit
+# NOTE: ``transactions_per_block``, ``default_gas_price``, ``dry_run``,
+# ``max_transactions_per_batch``, ``use_testing_build_block``,
+# ``default_max_fee_per_gas``, ``default_max_priority_fee_per_gas``,
+# ``default_max_fee_per_blob_gas``, ``max_priority_fee_per_gas``,
+# ``max_fee_per_gas``, ``max_fee_per_blob_gas``, ``gas_price``, and
+# ``max_gas_limit_per_test`` now live in
+# :mod:`plugins.shared.live_client_flags` so fill-stateful can reuse them
+# without loading this plugin's parametrizer/hooks.
 
 
 @dataclass(kw_only=True)
@@ -632,7 +288,7 @@ def base_test_parametrizer(cls: Type[BaseTest]) -> Any:
     )
     def base_test_parametrizer_func(
         request: Any,
-        fork: Fork,
+        fork: Fork | TransitionFork,
         pre: Alloc,
         eth_rpc: EthRPC,
         engine_rpc: EngineRPC | None,
@@ -692,6 +348,10 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
                     if p not in kwargs
                 }
 
+                # TODO: get values from network
+                timestamp = 0
+                block_number = 0
+
                 request.node.config.sender_address = str(pre._sender)
 
                 super(BaseTestWrapper, self).__init__(*args, **kwargs)
@@ -703,7 +363,9 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
                     max_fee_per_gas=max_fee_per_gas,
                     max_priority_fee_per_gas=max_priority_fee_per_gas,
                     max_fee_per_blob_gas=max_fee_per_blob_gas,
-                    fork=fork,
+                    fork=fork.fork_at(
+                        block_number=block_number, timestamp=timestamp
+                    ),
                 )
 
                 pre.resolve_deferred_checks()
@@ -770,7 +432,9 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
                 )
 
                 execute_result = execute.execute(
-                    fork=fork,
+                    fork=fork.fork_at(
+                        block_number=block_number, timestamp=timestamp
+                    ),
                     eth_rpc=eth_rpc,
                     engine_rpc=engine_rpc,
                     request=request,
@@ -844,7 +508,7 @@ def pytest_collection_modifyitems(
         if "fork" not in params or params["fork"] is None:
             items_for_removal.append(i)
             continue
-        fork: Fork = params["fork"]
+        fork: Fork | TransitionFork = params["fork"]
         spec_type, execute_format = get_spec_format_for_item(params)
         assert issubclass(execute_format, BaseExecute)
         markers = list(item.iter_markers())
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/execute_deploy_required_contracts.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/execute_deploy_required_contracts.py
index b3510334f6e..0b5249a188c 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/execute_deploy_required_contracts.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/execute_deploy_required_contracts.py
@@ -3,7 +3,7 @@
 import pytest
 
 from execution_testing.base_types import Bytes
-from execution_testing.forks import Fork
+from execution_testing.forks import Fork, TransitionFork
 from execution_testing.logging import get_logger
 from execution_testing.rpc import EthRPC
 from execution_testing.test_types import (
@@ -25,7 +25,7 @@ def test_deploy_deterministic_deployment_contract(
     gas_price: int,
     eth_rpc: EthRPC,
     check_only: bool,
-    session_fork: Fork,
+    session_fork: Fork | TransitionFork,
 ) -> None:
     """Deploy the deterministic deployment contract to the network."""
     # Check if contract already deployed
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/execute_flags/execute_flags.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/execute_flags/execute_flags.py
index cb1e2a26fba..a20f22d460d 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/execute_flags/execute_flags.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/execute_flags/execute_flags.py
@@ -75,5 +75,17 @@ def pytest_configure(config: pytest.Config) -> None:
             "flags or the CHAIN_ID/RPC_CHAIN_ID environment variables."
         )
 
+    setattr(  # noqa: B010
+        config, "_original_chain_id_default", ChainConfigDefaults.chain_id
+    )
+
     # write to config
     ChainConfigDefaults.chain_id = chain_id
+
+
+def pytest_unconfigure(config: pytest.Config) -> None:
+    """Restore the previous chain-id default after the session ends."""
+    if hasattr(config, "_original_chain_id_default"):
+        ChainConfigDefaults.chain_id = getattr(  # noqa: B009
+            config, "_original_chain_id_default"
+        )
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/pre_alloc.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/pre_alloc.py
index 9dc2e91cee7..5cb131b3ba9 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/pre_alloc.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/pre_alloc.py
@@ -4,10 +4,9 @@
 from itertools import count
 from pathlib import Path
 from random import randint
-from typing import Any, Dict, Generator, Iterator, List, Literal, Self, Tuple
+from typing import Any, Dict, Generator, Iterator, List, Literal, Tuple
 
 import pytest
-import yaml
 from filelock import FileLock
 from pydantic import PrivateAttr
 
@@ -15,7 +14,6 @@
     Account,
     Address,
     Bytes,
-    EthereumTestRootModel,
     Hash,
     HexNumber,
     Number,
@@ -29,7 +27,7 @@
     BytesConvertible,
     NumberConvertible,
 )
-from execution_testing.forks import Fork
+from execution_testing.forks import Fork, TransitionFork
 from execution_testing.logging import get_logger
 from execution_testing.rpc import EthRPC
 from execution_testing.rpc.rpc_types import TransactionByHashResponse
@@ -38,6 +36,7 @@
     EOA,
     AuthorizationTuple,
     ChainConfig,
+    TestPhase,
     Transaction,
     TransactionTestMetadata,
     compute_deterministic_create2_address,
@@ -45,6 +44,8 @@
 from execution_testing.tools import Initcode
 from execution_testing.vm import Bytecode, Op
 
+from ..shared.address_stubs import AddressStubs
+from ..shared.execute_fill import stub_eoas_key
 from ..shared.pre_alloc import Alloc as SharedAlloc
 from ..shared.pre_alloc import AllocFlags
 from .contracts import (
@@ -55,52 +56,6 @@
 logger = get_logger(__name__)
 
 
-class AddressStubs(EthereumTestRootModel[Dict[str, Address]]):
-    """
-    Address stubs class.
-
-    The key represents the label that is used in the test to tag the contract,
-    and the value is the address where the contract is already located at in
-    the current network.
-    """
-
-    root: Dict[str, Address]
-
-    def __contains__(self, item: str) -> bool:
-        """Check if an item is in the address stubs."""
-        return item in self.root
-
-    def __getitem__(self, item: str) -> Address:
-        """Get an item from the address stubs."""
-        return self.root[item]
-
-    @classmethod
-    def model_validate_json_or_file(cls, json_data_or_path: str) -> Self:
-        """
-        Try to load from file if the value resembles a path that ends with
-        .json/.yml and the file exists.
-        """
-        lower_json_data_or_path = json_data_or_path.lower()
-        if (
-            lower_json_data_or_path.endswith(".json")
-            or lower_json_data_or_path.endswith(".yml")
-            or lower_json_data_or_path.endswith(".yaml")
-        ):
-            path = Path(json_data_or_path)
-            if path.is_file():
-                path_suffix = path.suffix.lower()
-                if path_suffix == ".json":
-                    return cls.model_validate_json(path.read_text())
-                elif path_suffix in [".yml", ".yaml"]:
-                    loaded_yaml = yaml.safe_load(path.read_text())
-                    if loaded_yaml is None:
-                        return cls(root={})
-                    return cls.model_validate(loaded_yaml)
-        if json_data_or_path.strip() == "":
-            return cls(root={})
-        return cls.model_validate_json(json_data_or_path)
-
-
 def pytest_addoption(parser: pytest.Parser) -> None:
     """Add command-line options to pytest."""
     pre_alloc_group = parser.getgroup(
@@ -155,6 +110,14 @@ def address_stubs(
     return address_stubs
 
 
+@pytest.fixture(scope="session")
+def stub_eoas(
+    request: pytest.FixtureRequest,
+) -> Dict[str, EOA]:
+    """Return stub EOAs pre-populated during configuration."""
+    return request.config.stash.get(stub_eoas_key, {})
+
+
 @pytest.fixture(scope="session")
 def skip_cleanup(request: pytest.FixtureRequest) -> bool:
     """Return whether to skip cleanup phase after each test."""
@@ -179,7 +142,7 @@ def eoa_iterator(request: pytest.FixtureRequest) -> Iterator[EOA]:
 
 @pytest.fixture(scope="session", autouse=True)
 def execute_required_contracts(
-    session_fork: Fork,
+    session_fork: Fork | TransitionFork,
     session_worker_key: EOA,
     eth_rpc: EthRPC,
     sender_funding_transactions_gas_price: int,
@@ -195,7 +158,6 @@ def execute_required_contracts(
         logger.info(
             "Checking if deterministic factory contract is already deployed"
         )
-        tx_index = 0
         if (
             check_deterministic_factory_deployment(
                 eth_rpc=eth_rpc, fork=session_fork
@@ -203,11 +165,10 @@ def execute_required_contracts(
             is None
         ):
             try:
-                tx_index = deploy_deterministic_factory_contract(
+                deploy_deterministic_factory_contract(
                     eth_rpc=eth_rpc,
                     seed_key=session_worker_key,
                     gas_price=sender_funding_transactions_gas_price,
-                    tx_index=tx_index,
                 )
             except Exception as e:
                 raise RuntimeError(
@@ -281,6 +242,8 @@ class Alloc(SharedAlloc):
     _deferred_fund_addresses: List[_DeferredFundAddress] = PrivateAttr(
         default_factory=list
     )
+    _block_number: int = PrivateAttr()
+    _timestamp: int = PrivateAttr()
 
     def __init__(
         self,
@@ -291,6 +254,8 @@ def __init__(
         chain_id: int,
         node_id: str = "",
         address_stubs: AddressStubs | None = None,
+        block_number: int = 0,
+        timestamp: int = 0,
         **kwargs: Any,
     ) -> None:
         """Initialize the pre-alloc with the given parameters."""
@@ -301,6 +266,8 @@ def __init__(
         self._chain_id = chain_id
         self._node_id = node_id
         self._address_stubs = address_stubs or AddressStubs(root={})
+        self._block_number = block_number
+        self._timestamp = timestamp
 
     def code_pre_processor(self, code: Bytecode) -> Bytecode:
         """Pre-processes the code before setting it."""
@@ -322,6 +289,11 @@ def _add_pending_tx(
         pending_tx = PendingTransaction(
             **kwargs,
         )
+        # Pending txs are setup by definition; override Transaction's
+        # test_phase default (sourced from TestPhaseManager) so a
+        # ``pre.fund_eoa`` call inside ``TestPhaseManager.execution()``
+        # doesn't bleed an EXECUTION phase onto a setup tx.
+        pending_tx.test_phase = TestPhase.SETUP
         pending_tx.metadata = TransactionTestMetadata(
             test_id=self._node_id,
             phase="setup",
@@ -350,13 +322,14 @@ def _deterministic_deploy_contract(
         trip.
         """
         del storage
-        gas_costs = self._fork.gas_costs()
-        memory_expansion_gas_calculator = (
-            self._fork.memory_expansion_gas_calculator()
+        fork = self._fork.fork_at(
+            block_number=self._block_number, timestamp=self._timestamp
         )
-        calldata_gas_calculator = self._fork.calldata_gas_calculator(
-            block_number=0, timestamp=0
+        gas_costs = fork.gas_costs()
+        memory_expansion_gas_calculator = (
+            fork.memory_expansion_gas_calculator()
         )
+        calldata_gas_calculator = fork.calldata_gas_calculator()
         if not isinstance(deploy_code, Bytes):
             deploy_code = Bytes(deploy_code)
         if initcode is None:
@@ -365,30 +338,28 @@ def _deterministic_deploy_contract(
             initcode = Bytes(initcode)
         salt = Hash(salt)
         contract_address = compute_deterministic_create2_address(
-            salt=salt, initcode=initcode, fork=self._fork
+            salt=salt, initcode=initcode, fork=fork
         )
 
         # Pre-compute the gas limit for the deploy transaction.
-        max_code_size = self._fork.max_code_size()
+        max_code_size = fork.max_code_size()
         if len(deploy_code) > max_code_size:
             raise ValueError(
                 f"code too large: {len(deploy_code)} > {max_code_size}"
             )
-        max_initcode_size = self._fork.max_initcode_size()
+        max_initcode_size = fork.max_initcode_size()
         if len(initcode) > max_initcode_size:
             raise ValueError(
                 f"initcode too large {len(initcode)} > {max_initcode_size}"
             )
-        deploy_gas_limit = gas_costs.GAS_TX_BASE + gas_costs.GAS_TX_CREATE
-        deploy_gas_limit += (
-            len(deploy_code) * gas_costs.GAS_CODE_DEPOSIT_PER_BYTE
-        )
+        deploy_gas_limit = gas_costs.TX_BASE + gas_costs.TX_CREATE
+        deploy_gas_limit += len(deploy_code) * gas_costs.CODE_DEPOSIT_PER_BYTE
         deploy_gas_limit += memory_expansion_gas_calculator(
             new_bytes=len(initcode)
         )
         deploy_gas_limit += calldata_gas_calculator(data=initcode)
         deploy_gas_limit = deploy_gas_limit * 2
-        tx_gas_limit_cap = self._fork.transaction_gas_limit_cap()
+        tx_gas_limit_cap = fork.transaction_gas_limit_cap()
         if tx_gas_limit_cap and deploy_gas_limit > tx_gas_limit_cap:
             raise ValueError(
                 f"deterministic deploy gas limit exceeds the transaction "
@@ -433,22 +404,23 @@ def _deploy_contract(
         if storage is None:
             storage = {}
         assert address is None, "address parameter is not supported"
-
-        gas_costs = self._fork.gas_costs()
-        memory_expansion_gas_calculator = (
-            self._fork.memory_expansion_gas_calculator()
+        fork = self._fork.fork_at(
+            block_number=self._block_number, timestamp=self._timestamp
         )
-        calldata_gas_calculator = self._fork.calldata_gas_calculator(
-            block_number=0, timestamp=0
+        gas_costs = fork.gas_costs()
+        memory_expansion_gas_calculator = (
+            fork.memory_expansion_gas_calculator()
         )
+        calldata_gas_calculator = fork.calldata_gas_calculator()
 
         if not isinstance(storage, Storage):
             storage = Storage(storage)  # type: ignore
 
-        if stub is not None and self._address_stubs is not None:
+        if stub is not None:
             if stub not in self._address_stubs:
                 raise ValueError(
-                    f"Stub name {stub} not found in address stubs"
+                    f"Stub '{stub}' not found in address stubs. "
+                    "Provide --address-stubs with a mapping file."
                 )
             contract_address = self._address_stubs[stub]
             logger.info(
@@ -475,7 +447,7 @@ def _deploy_contract(
 
         initcode_prefix = Bytecode()
 
-        deploy_gas_limit = gas_costs.GAS_TX_BASE + gas_costs.GAS_TX_CREATE
+        deploy_gas_limit = gas_costs.TX_BASE + gas_costs.TX_CREATE
 
         if len(storage.root) > 0:
             initcode_prefix += sum(
@@ -488,11 +460,11 @@ def _deploy_contract(
         )
         code = self.code_pre_processor(code)
 
-        max_code_size = self._fork.max_code_size()
+        max_code_size = fork.max_code_size()
         if len(code) > max_code_size:
             raise ValueError(f"code too large: {len(code)} > {max_code_size}")
 
-        deploy_gas_limit += len(code) * gas_costs.GAS_CODE_DEPOSIT_PER_BYTE
+        deploy_gas_limit += len(code) * gas_costs.CODE_DEPOSIT_PER_BYTE
 
         prepared_initcode = Initcode(
             deploy_code=code, initcode_prefix=initcode_prefix
@@ -501,7 +473,7 @@ def _deploy_contract(
             new_bytes=len(bytes(prepared_initcode))
         )
 
-        max_initcode_size = self._fork.max_initcode_size()
+        max_initcode_size = fork.max_initcode_size()
         initcode_len = len(prepared_initcode)
         if initcode_len > max_initcode_size:
             raise ValueError(
@@ -511,7 +483,7 @@ def _deploy_contract(
         deploy_gas_limit += calldata_gas_calculator(data=prepared_initcode)
 
         deploy_gas_limit = deploy_gas_limit * 2
-        tx_gas_limit_cap = self._fork.transaction_gas_limit_cap()
+        tx_gas_limit_cap = fork.transaction_gas_limit_cap()
         if tx_gas_limit_cap and deploy_gas_limit > tx_gas_limit_cap:
             raise ValueError(
                 f"deploy gas limit exceeds the transaction gas limit cap: "
@@ -756,6 +728,9 @@ def _resolve_deterministic_deploys(self) -> None:
         deferred = self._deferred_deterministic_deploys
         if not deferred:
             return
+        fork = self._fork.fork_at(
+            block_number=self._block_number, timestamp=self._timestamp
+        )
         self._deferred_deterministic_deploys = []
 
         addresses = [d.contract_address for d in deferred]
@@ -779,7 +754,7 @@ def _resolve_deterministic_deploys(self) -> None:
                 if not factory_checked:
                     assert (
                         check_deterministic_factory_deployment(
-                            eth_rpc=self._eth_rpc, fork=self._fork
+                            eth_rpc=self._eth_rpc, fork=fork
                         )
                         is not None
                     ), "Deployment contract code is not found"
@@ -929,6 +904,9 @@ def minimum_balance_for_pending_transactions(
         """
         minimum_balance = 0
         gas_consumption = 0
+        fork = self._fork.fork_at(
+            block_number=self._block_number, timestamp=self._timestamp
+        )
         for tx in self._pending_txs:
             if tx.value is None:
                 # WARN: This currently fails if there's an account with
@@ -957,7 +935,7 @@ def minimum_balance_for_pending_transactions(
                 max_fee_per_blob_gas=max_fee_per_blob_gas,
             )
             gas_consumption += tx.gas_limit
-            minimum_balance += tx.signer_minimum_balance(fork=self._fork)
+            minimum_balance += tx.signer_minimum_balance(fork=fork)
         return minimum_balance + gas_consumption * gas_price, gas_consumption
 
     def send_pending_transactions(self) -> List[TransactionByHashResponse]:
@@ -979,6 +957,23 @@ def send_pending_transactions(self) -> List[TransactionByHashResponse]:
             logger.debug(f"Transaction response: {response.model_dump_json()}")
         return responses
 
+    def pending_transactions(self) -> List[Transaction]:
+        """
+        Return the queued setup transactions, signed; clears the queue.
+
+        Used by fill-stateful to materialise ``pre.fund_eoa`` /
+        ``pre.deploy_contract`` calls into a synthetic setup block.
+        Unset ``value`` is coerced to ``0`` (live-send path would default
+        it before broadcast).
+        """
+        txs: List[Transaction] = []
+        for tx in self._pending_txs:
+            if tx.value is None:
+                tx.value = HexNumber(0)
+            txs.append(tx.with_signature_and_sender())
+        self._pending_txs.clear()
+        return txs
+
 
 @pytest.fixture(scope="function")
 def alloc_flags(
@@ -1006,6 +1001,7 @@ def pre(
     eth_rpc: EthRPC,
     chain_config: ChainConfig,
     address_stubs: AddressStubs | None,
+    stub_eoas: Dict[str, EOA],
     skip_cleanup: bool,
     max_fee_per_gas: int,
     max_priority_fee_per_gas: int,
@@ -1027,6 +1023,7 @@ def pre(
     pre = Alloc(
         fork=actual_fork,
         flags=alloc_flags,
+        stub_eoas=stub_eoas,
         sender=worker_key,
         eth_rpc=eth_rpc,
         eoa_iterator=eoa_iterator,
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/rpc/chain_builder_eth_rpc.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/rpc/chain_builder_eth_rpc.py
index a0df484a256..66fc5c75e80 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/rpc/chain_builder_eth_rpc.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/rpc/chain_builder_eth_rpc.py
@@ -6,7 +6,8 @@
 import time
 from contextlib import AbstractContextManager
 from pathlib import Path
-from typing import Any, List, Sequence
+from typing import Any, List, Sequence, Tuple
+from urllib.parse import urlparse
 
 from filelock import FileLock
 
@@ -16,7 +17,8 @@
     Hash,
     HexNumber,
 )
-from execution_testing.forks import Fork
+from execution_testing.client_clis.cli_types import EnginePayloadMetadata
+from execution_testing.forks import Fork, TransitionFork
 from execution_testing.rpc import EngineRPC, TestingRPC
 from execution_testing.rpc import EthRPC as BaseEthRPC
 from execution_testing.rpc.rpc_types import (
@@ -26,6 +28,7 @@
     PayloadStatusEnum,
     TransactionProtocol,
 )
+from execution_testing.test_types import Withdrawal
 
 
 class ChainBuilderEthRPC(BaseEthRPC, namespace="eth"):
@@ -35,7 +38,7 @@ class ChainBuilderEthRPC(BaseEthRPC, namespace="eth"):
     pending transactions or a block generation interval.
     """
 
-    fork: Fork
+    fork: Fork | TransitionFork
     engine_rpc: EngineRPC
     get_payload_wait_time: float
     block_building_lock: FileLock
@@ -45,7 +48,7 @@ def __init__(
         self,
         *,
         rpc_endpoint: str,
-        fork: Fork,
+        fork: Fork | TransitionFork,
         engine_rpc: EngineRPC,
         session_temp_folder: Path,
         get_payload_wait_time: float,
@@ -62,14 +65,15 @@ def __init__(
         )
         self.fork = fork
         self.engine_rpc = engine_rpc
+        parsed = urlparse(rpc_endpoint)
         self.block_building_lock = FileLock(
-            session_temp_folder / "chain_builder_fcu.lock"
+            session_temp_folder / f"chain_builder_fcu_{parsed.hostname}.lock"
         )
         self.get_payload_wait_time = get_payload_wait_time
         self.testing_rpc = testing_rpc
 
         # Send initial forkchoice updated only if we are the first worker
-        base_name = "eth_rpc_forkchoice_updated"
+        base_name = f"eth_rpc_forkchoice_updated_{parsed.hostname}"
         base_file = session_temp_folder / base_name
         base_error_file = session_temp_folder / f"{base_name}.err"
 
@@ -83,12 +87,17 @@ def __init__(
                 # Get the head block hash
                 head_block = self.get_block_by_number("latest")
                 assert head_block is not None
+                block_number = HexNumber(head_block["number"])
+                timestamp = HexNumber(head_block["timestamp"])
+                head_fork = self.fork.fork_at(
+                    block_number=block_number, timestamp=timestamp
+                )
                 # Send initial forkchoice updated
                 forkchoice_state = ForkchoiceState(
                     head_block_hash=head_block["hash"],
                 )
                 forkchoice_version = (
-                    self.fork.engine_forkchoice_updated_version()
+                    head_fork.engine_forkchoice_updated_version()
                 )
                 assert forkchoice_version is not None, (
                     "Fork does not support engine forkchoice_updated"
@@ -121,47 +130,28 @@ def transaction_polling_context(self) -> AbstractContextManager:
         """
         return self.block_building_lock
 
-    def _payload_attributes(self, head_block: dict) -> PayloadAttributes:
-        """Build payload attributes from the current head block."""
-        parent_beacon_block_root = (
-            Hash(0)
-            if self.fork.header_beacon_root_required(
-                block_number=0, timestamp=0
-            )
-            else None
-        )
-        return PayloadAttributes(
-            timestamp=HexNumber(head_block["timestamp"]) + 1,
-            prev_randao=Hash(0),
-            suggested_fee_recipient=Address(0),
-            withdrawals=[]
-            if self.fork.header_withdrawals_required()
-            else None,
-            parent_beacon_block_root=parent_beacon_block_root,
-            target_blobs_per_block=(
-                self.fork.target_blobs_per_block(block_number=0, timestamp=0)
-                if self.fork.engine_payload_attribute_target_blobs_per_block(
-                    block_number=0, timestamp=0
-                )
-                else None
-            ),
-            max_blobs_per_block=(
-                self.fork.max_blobs_per_block(block_number=0, timestamp=0)
-                if self.fork.engine_payload_attribute_max_blobs_per_block(
-                    block_number=0, timestamp=0
-                )
-                else None
-            ),
+    def _payload_attributes(
+        self,
+        *,
+        next_timestamp: int,
+        withdrawals: List[Withdrawal] | None = None,
+    ) -> PayloadAttributes:
+        """Build payload attributes for a block at ``next_timestamp``."""
+        next_fork = self.fork.fork_at(block_number=0, timestamp=next_timestamp)
+        return PayloadAttributes.for_fork(
+            next_fork,
+            timestamp=next_timestamp,
+            withdrawals=withdrawals,
         )
 
     def _finalize_payload(
         self,
         payload: GetPayloadResponse,
         parent_beacon_block_root: Hash | None,
-    ) -> None:
+    ) -> EnginePayloadMetadata:
         """
-        Execute *payload* via ``engine_newPayload`` and set it as
-        the canonical head via ``engine_forkchoiceUpdated``.
+        Execute *payload* via ``engine_newPayload`` + ``forkchoiceUpdated``;
+        return the payload + version metadata.
         """
         new_payload_args: List[Any] = [
             payload.execution_payload,
@@ -174,7 +164,11 @@ def _finalize_payload(
             new_payload_args.append(parent_beacon_block_root)
         if payload.execution_requests is not None:
             new_payload_args.append(payload.execution_requests)
-        new_payload_version = self.fork.engine_new_payload_version()
+        payload_fork = self.fork.fork_at(
+            block_number=payload.execution_payload.number,
+            timestamp=payload.execution_payload.timestamp,
+        )
+        new_payload_version = payload_fork.engine_new_payload_version()
         assert new_payload_version is not None, (
             "Fork does not support engine new_payload"
         )
@@ -185,7 +179,7 @@ def _finalize_payload(
             "Payload was invalid"
         )
 
-        fcu_version = self.fork.engine_forkchoice_updated_version()
+        fcu_version = payload_fork.engine_forkchoice_updated_version()
         assert fcu_version is not None, (
             "Fork does not support engine forkchoice_updated"
         )
@@ -200,6 +194,12 @@ def _finalize_payload(
         assert response.payload_status.status == PayloadStatusEnum.VALID, (
             "Payload was invalid"
         )
+        return EnginePayloadMetadata(
+            payload_response=payload,
+            new_payload_version=new_payload_version,
+            forkchoice_updated_version=fcu_version,
+            parent_beacon_block_root=parent_beacon_block_root,
+        )
 
     def generate_block(self: "ChainBuilderEthRPC") -> None:
         """Generate a block using the Engine API."""
@@ -209,9 +209,13 @@ def generate_block(self: "ChainBuilderEthRPC") -> None:
         forkchoice_state = ForkchoiceState(
             head_block_hash=head_block["hash"],
         )
-        payload_attributes = self._payload_attributes(head_block)
+        next_timestamp = int(HexNumber(head_block["timestamp"]) + 1)
+        next_fork = self.fork.fork_at(block_number=0, timestamp=next_timestamp)
+        payload_attributes = self._payload_attributes(
+            next_timestamp=next_timestamp
+        )
         forkchoice_updated_version = (
-            self.fork.engine_forkchoice_updated_version()
+            next_fork.engine_forkchoice_updated_version()
         )
         assert forkchoice_updated_version is not None, (
             "Fork does not support engine forkchoice_updated"
@@ -228,7 +232,7 @@ def generate_block(self: "ChainBuilderEthRPC") -> None:
             "payload_id was not returned by the client"
         )
         time.sleep(self.get_payload_wait_time)
-        get_payload_version = self.fork.engine_get_payload_version()
+        get_payload_version = next_fork.engine_get_payload_version()
         assert get_payload_version is not None, (
             "Fork does not support engine get_payload"
         )
@@ -255,32 +259,91 @@ def send_transactions(
         transactions: Sequence[TransactionProtocol],
     ) -> List[Hash]:
         """
-        Send transactions to the execution client.
-
-        When ``testing_rpc`` is configured, build and finalize a
-        block containing *transactions* via
-        ``testing_buildBlockV1`` instead of sending them to the
-        mempool with ``eth_sendRawTransaction``.
+        Send transactions; when ``testing_rpc`` is configured, route via
+        ``testing_buildBlockV1`` instead of ``eth_sendRawTransaction``.
         """
         if self.testing_rpc is None:
             return super().send_transactions(transactions)
         if not transactions:
             return []
+        # Callers needing the payload use ``build_block_with_transactions``.
+        self.build_block_with_transactions(transactions)
+        return [tx.hash for tx in transactions]
 
+    def build_block_with_transactions(
+        self,
+        transactions: Sequence[TransactionProtocol],
+    ) -> EnginePayloadMetadata:
+        """
+        Build + finalize a block via ``testing_buildBlockV1`` and return
+        the engine payload metadata (used by fill-stateful's pre-run
+        writer; ``send_transactions`` discards it).
+        """
+        assert self.testing_rpc is not None, (
+            "build_block_with_transactions requires testing_rpc"
+        )
         with self.block_building_lock:
             head_block = self.get_block_by_number("latest")
             assert head_block is not None
-
-            payload_attributes = self._payload_attributes(head_block)
+            next_timestamp = int(HexNumber(head_block["timestamp"]) + 1)
+            payload_attributes = self._payload_attributes(
+                next_timestamp=next_timestamp,
+            )
             new_payload = self.testing_rpc.build_block(
                 parent_block_hash=Hash(head_block["hash"]),
                 payload_attributes=payload_attributes,
                 transactions=transactions,
                 extra_data=Bytes(b""),  # TODO: This is marked as optional
             )
-            self._finalize_payload(
+            return self._finalize_payload(
                 new_payload,
                 payload_attributes.parent_beacon_block_root,
             )
 
-        return [tx.hash for tx in transactions]
+    def fund_via_withdrawals(
+        self,
+        funding_targets: List[Tuple[Address, int]],
+    ) -> EnginePayloadMetadata | None:
+        """
+        Fund accounts by injecting CL withdrawals into a transaction-free
+        block. Returns the built engine payload metadata, or ``None``
+        when ``funding_targets`` is empty.
+        """
+        assert self.testing_rpc is not None, (
+            "fund_via_withdrawals requires testing_rpc"
+        )
+        if not funding_targets:
+            return None
+
+        gwei = 10**9
+        withdrawals = [
+            Withdrawal(
+                index=HexNumber(i),
+                validator_index=HexNumber(1),
+                address=addr,
+                amount=HexNumber((wei_amount + gwei - 1) // gwei),
+            )
+            for i, (addr, wei_amount) in enumerate(funding_targets)
+        ]
+
+        with self.block_building_lock:
+            head_block = self.get_block_by_number("latest")
+            assert head_block is not None
+            next_timestamp = int(HexNumber(head_block["timestamp"]) + 1)
+            payload_attributes = self._payload_attributes(
+                next_timestamp=next_timestamp,
+                withdrawals=withdrawals,
+            )
+            # Explicit empty list, not ``None``: per spec, ``null`` lets
+            # the client pull from its mempool, but we want a
+            # deterministic tx-free block.
+            new_payload = self.testing_rpc.build_block(
+                parent_block_hash=Hash(head_block["hash"]),
+                payload_attributes=payload_attributes,
+                transactions=[],
+                extra_data=Bytes(b""),
+            )
+            return self._finalize_payload(
+                new_payload,
+                payload_attributes.parent_beacon_block_root,
+            )
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/rpc/hive.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/rpc/hive.py
index 4b91dd80040..6779a0eb903 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/rpc/hive.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/rpc/hive.py
@@ -21,7 +21,7 @@
     to_json,
 )
 from execution_testing.fixtures.blockchain import FixtureHeader
-from execution_testing.forks import Fork
+from execution_testing.forks import Fork, TransitionFork
 from execution_testing.rpc import EngineRPC, EthRPC
 from execution_testing.test_types import (
     DETERMINISTIC_FACTORY_ADDRESS,
@@ -118,13 +118,23 @@ def base_pre(
     )
 
 
-@pytest.fixture(scope="session")
-def base_pre_genesis(
-    session_fork: Fork,
-    base_pre: Alloc,
+def build_genesis_header(
+    session_fork: Fork | TransitionFork,
+    base_pre: Alloc | None = None,
 ) -> Tuple[Alloc, FixtureHeader]:
-    """Create a genesis block from the blockchain test definition."""
-    env = Environment().set_fork_requirements(session_fork)
+    """
+    Build a hive genesis ``(pre_alloc, FixtureHeader)`` for ``session_fork``.
+
+    ``base_pre`` is merged on top of the fork's required system contracts;
+    callers that fund accounts post-genesis (e.g. fill-stateful via CL
+    withdrawals) can pass ``None`` for an empty extra allocation.
+    """
+    block_number = 0
+    timestamp = 1
+    genesis_fork = session_fork.fork_at(
+        block_number=block_number, timestamp=timestamp
+    )
+    env = Environment().set_fork_requirements(genesis_fork)
     assert env.withdrawals is None or len(env.withdrawals) == 0, (
         "withdrawals must be empty at genesis"
     )
@@ -133,15 +143,14 @@ def base_pre_genesis(
         or env.parent_beacon_block_root == Hash(0)
     ), "parent_beacon_block_root must be empty at genesis"
 
-    pre_alloc = Alloc.merge(
-        Alloc.model_validate(session_fork.pre_allocation_blockchain()),
-        base_pre,
+    pre_alloc = Alloc.model_validate(
+        session_fork.transitions_to().pre_allocation_blockchain()
     )
+    if base_pre is not None:
+        pre_alloc = Alloc.merge(pre_alloc, base_pre)
     if empty_accounts := pre_alloc.empty_accounts():
         raise Exception(f"Empty accounts in pre state: {empty_accounts}")
     state_root = pre_alloc.state_root()
-    block_number = 0
-    timestamp = 1
     genesis = FixtureHeader(
         parent_hash=0,
         ommers_hash=EmptyOmmersRoot,
@@ -168,58 +177,88 @@ def base_pre_genesis(
         ),
         parent_beacon_block_root=env.parent_beacon_block_root,
         requests_hash=Requests()
-        if session_fork.header_requests_required(
-            block_number=block_number, timestamp=timestamp
-        )
+        if genesis_fork.header_requests_required()
         else None,
         block_access_list_hash=Hash(EmptyTrieRoot)
-        if session_fork.header_bal_hash_required(
-            block_number=block_number, timestamp=timestamp
-        )
+        if genesis_fork.header_bal_hash_required()
         else None,
     )
 
     return (pre_alloc, genesis)
 
 
-@pytest.fixture(scope="session")
-def client_genesis(base_pre_genesis: Tuple[Alloc, FixtureHeader]) -> dict:
+def build_client_genesis_dict(
+    pre_alloc: Alloc,
+    genesis_header: FixtureHeader,
+) -> dict:
     """
-    Convert the fixture's genesis block header and pre-state to a client
-    genesis state.
+    Convert ``(pre_alloc, FixtureHeader)`` into the JSON-compatible dict
+    that hive writes to ``/genesis.json``.
     """
-    genesis = to_json(
-        base_pre_genesis[1]
-    )  # NOTE: to_json() excludes None values
-    alloc = to_json(base_pre_genesis[0])
-    # NOTE: nethermind requires account keys without '0x' prefix
+    # NOTE: to_json() excludes None values.
+    genesis = to_json(genesis_header)
+    alloc = to_json(pre_alloc)
+    # NOTE: nethermind requires account keys without '0x' prefix.
     genesis["alloc"] = {k.replace("0x", ""): v for k, v in alloc.items()}
     return genesis
 
 
+def build_client_files(
+    client_genesis_dict: dict,
+) -> Mapping[str, io.BufferedReader]:
+    """Wrap ``client_genesis_dict`` in the BufferedReader hive expects."""
+    genesis_bytes = json.dumps(client_genesis_dict).encode("utf-8")
+    buffered: io.BufferedReader = io.BufferedReader(
+        cast(io.RawIOBase, io.BytesIO(genesis_bytes))
+    )
+    files: dict = {"/genesis.json": buffered}
+    return files
+
+
+def build_hive_environment(
+    session_fork: Fork | TransitionFork,
+    chain_id: int,
+) -> dict:
+    """Build the hive client environment from the fork's ruleset."""
+    assert session_fork in ruleset, (
+        f"fork '{session_fork}' missing in hive ruleset"
+    )
+    return {
+        "HIVE_CHAIN_ID": str(chain_id),
+        "HIVE_FORK_DAO_VOTE": "1",
+        "HIVE_NODETYPE": "full",
+        **{k: f"{v:d}" for k, v in ruleset[session_fork].items()},
+    }
+
+
+@pytest.fixture(scope="session")
+def base_pre_genesis(
+    session_fork: Fork | TransitionFork,
+    base_pre: Alloc,
+) -> Tuple[Alloc, FixtureHeader]:
+    """Create a genesis block from the blockchain test definition."""
+    return build_genesis_header(session_fork, base_pre)
+
+
 @pytest.fixture(scope="session")
-def buffered_genesis(client_genesis: dict) -> io.BufferedReader:
+def client_genesis(base_pre_genesis: Tuple[Alloc, FixtureHeader]) -> dict:
     """
-    Create a buffered reader for the genesis block header of the current test
-    fixture.
+    Convert the fixture's genesis block header and pre-state to a client
+    genesis state.
     """
-    genesis_json = json.dumps(client_genesis)
-    genesis_bytes = genesis_json.encode("utf-8")
-    return io.BufferedReader(cast(io.RawIOBase, io.BytesIO(genesis_bytes)))
+    return build_client_genesis_dict(*base_pre_genesis)
 
 
 @pytest.fixture(scope="session")
 def client_files(
-    buffered_genesis: io.BufferedReader,
+    client_genesis: dict,
 ) -> Mapping[str, io.BufferedReader]:
     """
     Define the files that hive will start the client with.
 
     For this type of test, only the genesis is passed
     """
-    files = {}
-    files["/genesis.json"] = buffered_genesis
-    return files
+    return build_client_files(client_genesis)
 
 
 @pytest.fixture(scope="session")
@@ -228,15 +267,7 @@ def environment(session_fork: Fork, chain_config: ChainConfig) -> dict:
     Define the environment that hive will start the client with using the fork
     rules specific for the simulator.
     """
-    assert session_fork in ruleset, (
-        f"fork '{session_fork}' missing in hive ruleset"
-    )
-    return {
-        "HIVE_CHAIN_ID": str(chain_config.chain_id),
-        "HIVE_FORK_DAO_VOTE": "1",
-        "HIVE_NODETYPE": "full",
-        **{k: f"{v:d}" for k, v in ruleset[session_fork].items()},
-    }
+    return build_hive_environment(session_fork, chain_config.chain_id)
 
 
 @pytest.fixture(scope="session")
@@ -402,7 +433,7 @@ def eth_rpc(
     request: pytest.FixtureRequest,
     client: Client,
     engine_rpc: EngineRPC,
-    session_fork: Fork,
+    session_fork: Fork | TransitionFork,
     session_temp_folder: Path,
     max_transactions_per_batch: int | None,
     use_testing_build_block: bool,
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/rpc/remote.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/rpc/remote.py
index 7b69093e4e6..fec6fe67e52 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/rpc/remote.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/rpc/remote.py
@@ -1,17 +1,16 @@
 """Pytest plugin to run the execute in remote-rpc-mode."""
 
-import os
 from pathlib import Path
 
 import pytest
 
-from execution_testing.forks import Fork
+from execution_testing.forks import Fork, TransitionFork
 from execution_testing.rpc import EngineRPC, EthRPC
 from execution_testing.test_types.chain_config_types import (
     ChainConfigDefaults,
 )
 
-from ..pre_alloc import AddressStubs
+from ...shared.helpers import get_rpc_endpoint, is_help_or_collectonly_mode
 from .chain_builder_eth_rpc import ChainBuilderEthRPC, TestingRPC
 
 
@@ -25,7 +24,8 @@ def pytest_addoption(parser: pytest.Parser) -> None:
         required=False,
         action="store",
         dest="rpc_endpoint",
-        help="RPC endpoint to an execution client",
+        default=None,
+        help="RPC endpoint to an execution client.",
     )
     remote_rpc_group.addoption(
         "--tx-wait-timeout",
@@ -38,18 +38,6 @@ def pytest_addoption(parser: pytest.Parser) -> None:
             "included in a block"
         ),
     )
-    remote_rpc_group.addoption(
-        "--address-stubs",
-        action="store",
-        dest="address_stubs",
-        default=AddressStubs(root={}),
-        type=AddressStubs.model_validate_json_or_file,
-        help=(
-            "The address stubs for contracts that have already been placed "
-            "in the chain and to use for the test. Can be a JSON formatted "
-            "string or a path to a YAML or JSON file."
-        ),
-    )
 
     engine_rpc_group = parser.getgroup(
         "engine_rpc", "Arguments defining engine RPC configuration"
@@ -92,14 +80,25 @@ def pytest_addoption(parser: pytest.Parser) -> None:
             "only the JWT secret as a hex string."
         ),
     )
+    engine_rpc_group.addoption(
+        "--session-sync-folder",
+        required=False,
+        action="store",
+        default=None,
+        dest="session_sync_folder",
+        help=(
+            "Folder used to sync multiple instances of the execute command."
+        ),
+    )
 
 
 def pytest_configure(config: pytest.Config) -> None:
     """Check if a chain ID configuration is provided."""
+    if is_help_or_collectonly_mode(config):
+        return
+
     # Verify chain ID config is consistent with the remote RPC endpoint
-    rpc_endpoint = config.getoption("rpc_endpoint") or os.environ.get(
-        "RPC_ENDPOINT"
-    )
+    rpc_endpoint = get_rpc_endpoint(config)
     if rpc_endpoint is None:
         pytest.fail(
             "RPC endpoint must be provided with the --rpc-endpoint flag or "
@@ -164,9 +163,7 @@ def rpc_endpoint(request: pytest.FixtureRequest) -> str:
     Return remote RPC endpoint to be used to make requests to the execution
     client.
     """
-    rpc_endpoint = request.config.getoption("rpc_endpoint") or os.environ.get(
-        "RPC_ENDPOINT"
-    )
+    rpc_endpoint = get_rpc_endpoint(request.config)
     assert rpc_endpoint is not None
     return rpc_endpoint
 
@@ -176,7 +173,7 @@ def eth_rpc(
     request: pytest.FixtureRequest,
     rpc_endpoint: str,
     engine_rpc: EngineRPC | None,
-    session_fork: Fork,
+    session_fork: Fork | TransitionFork,
     session_temp_folder: Path,
     max_transactions_per_batch: int | None,
     use_testing_build_block: bool,
@@ -198,11 +195,14 @@ def eth_rpc(
     testing_rpc = None
     if use_testing_build_block:
         testing_rpc = TestingRPC(rpc_endpoint)
+    session_sync_folder = request.config.getoption("session_sync_folder")
     return ChainBuilderEthRPC(
         rpc_endpoint=rpc_endpoint,
         fork=session_fork,
         engine_rpc=engine_rpc,
-        session_temp_folder=session_temp_folder,
+        session_temp_folder=Path(session_sync_folder)
+        if session_sync_folder is not None
+        else session_temp_folder,
         get_payload_wait_time=get_payload_wait_time,
         transaction_wait_timeout=tx_wait_timeout,
         max_transactions_per_batch=max_transactions_per_batch,
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/tests/test_execute.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/tests/test_execute.py
new file mode 100644
index 00000000000..2f606ad21c8
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/tests/test_execute.py
@@ -0,0 +1,57 @@
+"""Regression tests for execute plugin configuration."""
+
+from types import SimpleNamespace
+from typing import Any
+
+from execution_testing.test_types.block_types import EnvironmentDefaults
+
+from ..execute import pytest_configure
+
+
+class FakeConfig:
+    """Minimal config object for exercising execute plugin setup."""
+
+    engine_rpc_supported: bool
+
+    def __init__(self, *args: str) -> None:
+        self.invocation_params = SimpleNamespace(args=args)
+        self.option = SimpleNamespace(help=True)
+        self.pluginmanager = SimpleNamespace(has_plugin=lambda _name: False)
+
+    def getoption(self, name: str, default: Any = None) -> Any:
+        """Return configured option values used by pytest_configure."""
+        options = {
+            "transaction_gas_limit": 7,
+            "disable_html": False,
+            "htmlpath": None,
+            "markers": False,
+            "collectonly": False,
+            "show_ported_from": False,
+            "links_as_filled": False,
+            "help": True,
+        }
+        return options.get(name, default)
+
+
+def test_pytest_configure_ignores_default_transaction_gas_limit() -> None:
+    """Default execute options must not rewrite the global block gas limit."""
+    original_gas_limit = EnvironmentDefaults.gas_limit
+
+    config = FakeConfig()
+    pytest_configure(config)  # type: ignore[arg-type]
+
+    assert EnvironmentDefaults.gas_limit == original_gas_limit
+    assert config.engine_rpc_supported is False
+
+
+def test_pytest_configure_applies_explicit_transaction_gas_limit() -> None:
+    """An explicit execute gas-limit override still updates the default."""
+    original_gas_limit = EnvironmentDefaults.gas_limit
+
+    config = FakeConfig("--transaction-gas-limit=7")
+    pytest_configure(config)  # type: ignore[arg-type]
+
+    assert EnvironmentDefaults.gas_limit == 7
+    assert config.engine_rpc_supported is False
+
+    EnvironmentDefaults.gas_limit = original_gas_limit
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/tests/test_execute_remote.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/tests/test_execute_remote.py
new file mode 100644
index 00000000000..562abb90a59
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/tests/test_execute_remote.py
@@ -0,0 +1,867 @@
+"""
+End-to-end tests for the execute remote command.
+
+Each test uses pytester to run an inline test module through the
+pytest-execute.ini plugin stack, pointing at a real execution client
+spawned via hive.
+
+Requires HIVE_SIMULATOR to be set (e.g. start hive in --dev mode).
+"""
+
+import contextlib
+import hashlib
+import io
+import json
+import os
+import random
+import textwrap
+import time
+from dataclasses import asdict, dataclass
+from pathlib import Path
+from typing import Dict, Generator, List, cast
+
+import pytest
+import requests
+from filelock import FileLock, Timeout
+from hive.simulation import Simulation
+from hive.testing import HiveTest, HiveTestResult, HiveTestSuite
+
+from execution_testing.base_types import (
+    Account,
+    Address,
+    EmptyOmmersRoot,
+    EmptyTrieRoot,
+    Hash,
+    Number,
+    to_json,
+)
+from execution_testing.cli.pytest_commands.plugins.consume.simulators.helpers.ruleset import (  # noqa: E501
+    ruleset,
+)
+from execution_testing.fixtures.blockchain import FixtureHeader
+from execution_testing.forks import Osaka
+from execution_testing.rpc import EngineRPC, EthRPC
+from execution_testing.test_types import (
+    DETERMINISTIC_FACTORY_ADDRESS,
+    DETERMINISTIC_FACTORY_BYTECODE,
+    EOA,
+    Alloc,
+    ChainConfig,
+    Environment,
+    Requests,
+    Transaction,
+    Withdrawal,
+    compute_deterministic_create2_address,
+)
+from execution_testing.tools import Initcode
+from execution_testing.vm import Op
+
+from ...shared.address_stubs import StubAddress
+from ..pre_alloc import AddressStubs
+from ..rpc.chain_builder_eth_rpc import ChainBuilderEthRPC, TestingRPC
+
+# Number of seed keys to pre-fund (one per test case)
+SEED_KEY_COUNT = 100
+SEED_KEY_BALANCE = 10**26
+
+# The fork to test with
+TEST_FORK = Osaka
+
+
+pytestmark = pytest.mark.skipif(
+    os.environ.get("HIVE_SIMULATOR") is None,
+    reason="HIVE_SIMULATOR not set; start hive in --dev mode to run",
+)
+
+
+@pytest.fixture(scope="module")
+def seed_keys(testrun_uid: str) -> List[EOA]:
+    """Generate seed keys for each test case."""
+    start_index = int.from_bytes(
+        hashlib.sha256(testrun_uid.encode()).digest(), byteorder="big"
+    )
+    return [
+        EOA(key=i) for i in range(start_index, start_index + SEED_KEY_COUNT)
+    ]
+
+
+def _build_client_genesis(seed_keys: List[EOA]) -> dict:
+    """Build a valid client genesis for the Hive-backed E2E tests."""
+    alloc_dict: Dict = {
+        DETERMINISTIC_FACTORY_ADDRESS: Account(
+            nonce=1, code=DETERMINISTIC_FACTORY_BYTECODE
+        ),
+    }
+    for key in seed_keys:
+        alloc_dict[key] = Account(balance=SEED_KEY_BALANCE)
+
+    env = Environment().set_fork_requirements(TEST_FORK)
+    assert env.withdrawals is None or len(env.withdrawals) == 0, (
+        "withdrawals must be empty at genesis"
+    )
+    assert (
+        env.parent_beacon_block_root is None
+        or env.parent_beacon_block_root == Hash(0)
+    ), "parent_beacon_block_root must be empty at genesis"
+
+    genesis_alloc = Alloc.merge(
+        Alloc.model_validate(TEST_FORK.pre_allocation_blockchain()),
+        Alloc(alloc_dict),
+    )
+    if empty_accounts := genesis_alloc.empty_accounts():
+        raise Exception(f"Empty accounts in pre state: {empty_accounts}")
+
+    block_number = 0
+    timestamp = 1
+    genesis_header = FixtureHeader(
+        parent_hash=0,
+        ommers_hash=EmptyOmmersRoot,
+        fee_recipient=0,
+        state_root=genesis_alloc.state_root(),
+        transactions_trie=EmptyTrieRoot,
+        receipts_root=EmptyTrieRoot,
+        logs_bloom=0,
+        difficulty=0x20000 if env.difficulty is None else env.difficulty,
+        number=block_number,
+        gas_limit=env.gas_limit,
+        gas_used=0,
+        timestamp=timestamp,
+        extra_data=b"\x00",
+        prev_randao=0,
+        nonce=0,
+        base_fee_per_gas=env.base_fee_per_gas,
+        blob_gas_used=env.blob_gas_used,
+        excess_blob_gas=env.excess_blob_gas,
+        withdrawals_root=(
+            Withdrawal.list_root(env.withdrawals)
+            if env.withdrawals is not None
+            else None
+        ),
+        parent_beacon_block_root=env.parent_beacon_block_root,
+        requests_hash=Requests()
+        if TEST_FORK.header_requests_required()
+        else None,
+        block_access_list_hash=Hash(EmptyTrieRoot)
+        if TEST_FORK.header_bal_hash_required()
+        else None,
+    )
+
+    client_genesis = to_json(genesis_header)
+    alloc = to_json(genesis_alloc)
+    client_genesis["alloc"] = {
+        k.replace("0x", ""): v for k, v in alloc.items()
+    }
+    return client_genesis
+
+
+@pytest.fixture(scope="module")
+def hive_client_ip(
+    seed_keys: List[EOA],
+    session_temp_folder: Path,
+) -> Generator[str, None, None]:
+    """
+    Start a hive execution client for the duration of the module.
+
+    Only one process initializes the hive suite and client; the rest
+    read the client information from a shared file.  Each process
+    registers itself in a counter file, and the last process to
+    finish tears down the hive resources.
+    """
+    hive_info_name = "hive_e2e_client_info"
+    hive_info_file = session_temp_folder / hive_info_name
+    hive_info_lock = session_temp_folder / f"{hive_info_name}.lock"
+
+    hive_users_name = "hive_e2e_client_users"
+    hive_users_file = session_temp_folder / hive_users_name
+    hive_users_lock = session_temp_folder / f"{hive_users_name}.lock"
+
+    with FileLock(hive_info_lock):
+        if hive_info_file.exists():
+            with hive_info_file.open("r") as f:
+                hive_info = json.load(f)
+        else:
+            url = os.environ["HIVE_SIMULATOR"]
+            simulator = Simulation(url=url)
+            client_type = simulator.client_types()[0]
+            client_genesis = _build_client_genesis(seed_keys)
+
+            assert TEST_FORK in ruleset, (
+                f"fork '{TEST_FORK}' missing in hive ruleset"
+            )
+            hive_environment = {
+                "HIVE_CHAIN_ID": str(ChainConfig().chain_id),
+                "HIVE_FORK_DAO_VOTE": "1",
+                "HIVE_NODETYPE": "full",
+                **{k: f"{v:d}" for k, v in ruleset[TEST_FORK].items()},
+            }
+            suite: HiveTestSuite = simulator.start_suite(
+                name="eels/execute-remote-e2e",
+                description=("E2E tests for execute remote command"),
+            )
+            test: HiveTest = suite.start_test(
+                name="execute-remote-e2e",
+                description="E2E test client",
+            )
+
+            genesis_json = json.dumps(client_genesis)
+            genesis_bytes = genesis_json.encode("utf-8")
+            buffered = io.BufferedReader(
+                cast(io.RawIOBase, io.BytesIO(genesis_bytes))
+            )
+            files = {"/genesis.json": buffered}
+
+            client = test.start_client(
+                client_type=client_type,
+                environment=hive_environment,
+                files=files,
+            )
+            assert client is not None, (
+                f"Failed to start hive client ({client_type.name})"
+            )
+
+            hive_info = {
+                "client_ip": f"{client.ip}",
+                "client_url": client.url,
+                "client_id": client.id,
+                "suite": asdict(suite),
+                "test": asdict(test),
+            }
+            with hive_info_file.open("w") as f:
+                json.dump(hive_info, f)
+
+    client_ip = hive_info["client_ip"]
+
+    # Register this process as a user of the hive client.
+    with FileLock(hive_users_lock):
+        if hive_users_file.exists():
+            with hive_users_file.open("r") as f:
+                users = int(f.read())
+        else:
+            users = 0
+        users += 1
+        with hive_users_file.open("w") as f:
+            f.write(str(users))
+
+    yield client_ip
+
+    # Deregister and tear down if this is the last user.
+    with FileLock(hive_users_lock):
+        with hive_users_file.open("r") as f:
+            users = int(f.read())
+        users -= 1
+        with hive_users_file.open("w") as f:
+            f.write(str(users))
+        if users == 0:
+            with hive_info_file.open("r") as f:
+                hive_info = json.load(f)
+
+            # Stop the client.
+            stop_url = f"{hive_info['client_url']}/{hive_info['client_id']}"
+            requests.delete(stop_url).raise_for_status()
+
+            # End the test.
+            test_obj = HiveTest(**hive_info["test"])
+            test_obj.end(
+                result=HiveTestResult(
+                    test_pass=True,
+                    details="E2E test completed",
+                )
+            )
+
+            # End the suite.
+            suite_obj = HiveTestSuite(**hive_info["suite"])
+            suite_obj.end()
+
+            # Clean up coordination files.
+            hive_info_file.unlink(missing_ok=True)
+            hive_users_file.unlink(missing_ok=True)
+
+
+@pytest.fixture(scope="module")
+def rpc_endpoint(hive_client_ip: str) -> str:
+    """Return the JSON-RPC endpoint of the hive client."""
+    return f"http://{hive_client_ip}:8545"
+
+
+@pytest.fixture(scope="module")
+def engine_endpoint(hive_client_ip: str) -> str:
+    """Return the engine API endpoint of the hive client."""
+    return f"http://{hive_client_ip}:8551"
+
+
+@pytest.fixture(scope="function")
+def chain_builder_eth_rpc(
+    rpc_endpoint: str,
+    engine_endpoint: str,
+    session_temp_folder: Path,
+) -> EthRPC:
+    """
+    Return the chain builder ETH RPC to use for some tests that send
+    transactions before the actual execute test starts.
+    """
+    return ChainBuilderEthRPC(
+        rpc_endpoint=rpc_endpoint,
+        fork=TEST_FORK,
+        engine_rpc=EngineRPC(engine_endpoint),
+        session_temp_folder=session_temp_folder,
+        get_payload_wait_time=1,
+        transaction_wait_timeout=20,
+        max_transactions_per_batch=10,
+        testing_rpc=TestingRPC(rpc_endpoint),
+    )
+
+
+class KeysPool:
+    """
+    A pool of keys safe for use across multiple processes.
+
+    Each key is backed by a lock file inside `lock_dir`.  Calling `pop()`
+    returns a context manager that:
+      1. Blocks until a key is free (no other process holds it).
+      2. Yields the EOA.
+      3. Releases the lock automatically on exit.
+    """
+
+    def __init__(self, *, keys: List[EOA], session_temp_folder: Path) -> None:
+        if not keys:
+            raise ValueError("Key list must not be empty.")
+
+        self._lock_dir = session_temp_folder / "key_locks"
+        self._lock_dir.mkdir(parents=True, exist_ok=True)
+        self._pool: Dict[EOA, FileLock] = {
+            key: FileLock(self._lock_dir / f"{key}") for key in keys
+        }
+
+    @contextlib.contextmanager
+    def pop(
+        self, poll_interval: float = 0.5, timeout: float | None = None
+    ) -> Generator[EOA, None, None]:
+        """
+        Acquire an available key and yield it as a context manager.
+        """
+        deadline = None if timeout is None else time.monotonic() + timeout
+
+        while True:
+            for key, lock in self._pool.items():
+                try:
+                    lock.acquire(timeout=0)
+                except Timeout:
+                    continue
+
+                try:
+                    yield key
+                finally:
+                    lock.release()
+                return
+
+            if deadline is not None and time.monotonic() >= deadline:
+                raise Timeout(
+                    f"No EOA key became available within {timeout}s "
+                    f"(pool size: {len(self._pool)})."
+                )
+            time.sleep(poll_interval)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def keys_pool(session_temp_folder: Path, seed_keys: List[EOA]) -> KeysPool:
+    """
+    Write all starting set of keys to the session coordinator folder.
+    """
+    return KeysPool(keys=seed_keys, session_temp_folder=session_temp_folder)
+
+
+@pytest.fixture()
+def test_seed_key(
+    keys_pool: KeysPool, chain_builder_eth_rpc: EthRPC
+) -> Generator[EOA, None, None]:
+    """Return the seed key for the current test."""
+    with keys_pool.pop() as key:
+        current_nonce = chain_builder_eth_rpc.get_transaction_count(key)
+        key.nonce = Number(current_nonce)
+        yield key
+
+
+@pytest.fixture(scope="session")
+def fork_name() -> str:
+    """Return the fork name string for CLI args."""
+    return str(TEST_FORK)
+
+
+@dataclass(kw_only=True)
+class ExecuteRunner:
+    """Formatted runner of a test."""
+
+    testdir: pytest.Testdir
+    monkeypatch: pytest.MonkeyPatch
+    session_temp_folder: Path
+    rpc_endpoint: str
+    engine_endpoint: str
+    test_seed_key: EOA
+    fork_name: str
+
+    def run_assert(
+        self,
+        *,
+        test_method: str,
+        stubs: AddressStubs | None = None,
+        passed: int | None = None,
+        failed: int | None = None,
+        errors: int | None = None,
+    ) -> None:
+        """
+        Run an inline test module through the execute remote plugin stack.
+
+        Write the test module, copy the ini file, and invoke pytester.
+        """
+        tests_dir = self.testdir.mkdir("tests")
+        test_file = tests_dir.join("test_module.py")
+        test_module = (
+            "from execution_testing import "
+            + "Account, Address, Storage, Transaction, Op\n"
+            + textwrap.dedent(test_method)
+        )
+        test_file.write(textwrap.dedent(test_module))
+
+        self.testdir.copy_example(
+            name="src/execution_testing/cli/pytest_commands/"
+            "pytest_ini_files/pytest-execute.ini"
+        )
+
+        args = [
+            "-c",
+            "pytest-execute.ini",
+            "-v",
+            "--fork",
+            self.fork_name,
+            "--rpc-endpoint",
+            self.rpc_endpoint,
+            "--engine-endpoint",
+            self.engine_endpoint,
+            "--use-testing-build-block",
+            "--rpc-seed-key",
+            str(self.test_seed_key.key),
+            "--rpc-chain-id",
+            str(ChainConfig().chain_id),
+            "--session-sync-folder",
+            str(self.session_temp_folder),
+            "--engine-jwt-secret",
+            "secretsecretsecretsecretsecretse",
+            "--no-html",
+        ]
+        if stubs:
+            args.extend(["--address-stubs", stubs.model_dump_json(indent=0)])
+
+        if all(x is None for x in (passed, failed, errors)):
+            passed, failed, errors = (1, 0, 0)
+        else:
+            passed, failed, errors = (
+                passed if passed is not None else 0,
+                failed if failed is not None else 0,
+                errors if errors is not None else 0,
+            )
+        self.monkeypatch.setenv("PYTEST_XDIST_WORKER_COUNT", "1")
+        self.testdir.runpytest(*args).assert_outcomes(
+            passed=passed, failed=failed, errors=errors
+        )
+
+
+@pytest.fixture(scope="function")
+def execute_runner(
+    testdir: pytest.Testdir,
+    monkeypatch: pytest.MonkeyPatch,
+    session_temp_folder: Path,
+    rpc_endpoint: str,
+    engine_endpoint: str,
+    test_seed_key: EOA,
+    fork_name: str,
+) -> ExecuteRunner:
+    """Return the runner of the test."""
+    return ExecuteRunner(
+        testdir=testdir,
+        monkeypatch=monkeypatch,
+        session_temp_folder=session_temp_folder,
+        rpc_endpoint=rpc_endpoint,
+        engine_endpoint=engine_endpoint,
+        test_seed_key=test_seed_key,
+        fork_name=fork_name,
+    )
+
+
+@dataclass(kw_only=True)
+class ContractDeployer:
+    """Formatted runner of a test."""
+
+    chain_builder_eth_rpc: ChainBuilderEthRPC
+    test_seed_key: EOA
+    salt: int
+
+    def deploy(self, code: str) -> Address:
+        """Deploy a contract."""
+        bytecode = eval(code, {"Op": Op})
+        initcode = Initcode(deploy_code=bytecode)
+        tx = Transaction(
+            sender=self.test_seed_key,
+            to=None,
+            gas_limit=1_000_000,
+            data=initcode,
+        )
+        self.chain_builder_eth_rpc.send_wait_transactions([tx])
+        contract_address = tx.created_contract
+        chain_code = self.chain_builder_eth_rpc.get_code(contract_address)
+        assert chain_code == bytecode
+        return contract_address
+
+    def deterministic_deploy(self, code: str) -> Address:
+        """Deploy a contract to a deterministic address."""
+        bytecode = eval(code, {"Op": Op})
+        initcode = Initcode(deploy_code=bytecode)
+        deploy_address = compute_deterministic_create2_address(
+            salt=self.salt, initcode=initcode, fork=TEST_FORK
+        )
+        chain_code = self.chain_builder_eth_rpc.get_code(deploy_address)
+        if chain_code != b"":
+            raise Exception(f"Contract already deployed: {deploy_address}")
+        tx = Transaction(
+            sender=self.test_seed_key,
+            to=DETERMINISTIC_FACTORY_ADDRESS,
+            gas_limit=1_000_000,
+            data=Hash(self.salt) + bytes(initcode),
+        )
+        self.chain_builder_eth_rpc.send_wait_transactions([tx])
+        chain_code = self.chain_builder_eth_rpc.get_code(deploy_address)
+        assert chain_code == bytecode
+        return deploy_address
+
+
+@pytest.fixture(scope="function")
+def contract_deployer(
+    chain_builder_eth_rpc: ChainBuilderEthRPC,
+    test_seed_key: EOA,
+) -> ContractDeployer:
+    """
+    Contract deployer for the current test.
+
+    Takes a string bytecode to be passed to `eval` (for convenience)
+    and returns the address.
+    """
+    return ContractDeployer(
+        chain_builder_eth_rpc=chain_builder_eth_rpc,
+        test_seed_key=test_seed_key,
+        salt=random.randint(0, 2**256),
+    )
+
+
+def test_simple_state_test(execute_runner: ExecuteRunner) -> None:
+    """Execute a minimal state test against a live client."""
+    test_method = """\
+        def test_simple(state_test, pre) -> None:
+            sender = pre.fund_eoa()
+            state_test(
+                pre=pre,
+                post={{}},
+                tx=Transaction(
+                    sender=sender,
+                    to=None,
+                    gas_limit=100_000,
+                ),
+            )
+    """.format()
+
+    execute_runner.run_assert(test_method=test_method)
+
+
+def test_deploy_contract(execute_runner: ExecuteRunner) -> None:
+    """Execute a test that deploys a contract and checks storage."""
+    test_method = """\
+        def test_deploy(state_test, pre) -> None:
+            code = Op.SSTORE(0, 1) + Op.STOP
+            contract = pre.deploy_contract(code)
+            sender = pre.fund_eoa()
+            tx = Transaction(
+                sender=sender,
+                to=contract,
+                gas_limit=100_000,
+            )
+            state_test(
+                pre=pre,
+                post={{
+                    contract: Account(
+                        storage=Storage({{0: 1}}),
+                    ),
+                }},
+                tx=tx,
+            )
+    """.format()
+
+    execute_runner.run_assert(test_method=test_method)
+
+
+@pytest.mark.parametrize(
+    "already_deployed",
+    [
+        pytest.param(True, id="already_deployed"),
+        pytest.param(False, id="not_deployed"),
+    ],
+)
+def test_deterministic_deploy_contract(
+    execute_runner: ExecuteRunner,
+    contract_deployer: ContractDeployer,
+    test_seed_key: EOA,
+    already_deployed: bool,
+    chain_builder_eth_rpc: ChainBuilderEthRPC,
+) -> None:
+    """
+    Execute a test that deploys a contract to a deterministic address
+    and checks storage.
+    """
+    # We have to use a different salt because otherwise the multiple
+    # parametrization makes different tests have the same contract already
+    # deployed.
+    code = "Op.SSTORE(0, Op.ADD(Op.SLOAD(0), 1)) + Op.STOP"
+    expected_value = 1
+    if already_deployed:
+        deploy_address = contract_deployer.deterministic_deploy(code)
+        # Send tx to increase the storage
+        tx = Transaction(
+            sender=test_seed_key,
+            to=deploy_address,
+            gas_limit=100_000,
+        )
+        chain_builder_eth_rpc.send_wait_transactions([tx])
+        expected_value = 2
+    test_method = """\
+        def test_deploy(state_test, pre) -> None:
+            code = {code}
+            contract = pre.deterministic_deploy_contract(
+                deploy_code=code, salt={salt}
+            )
+            sender = pre.fund_eoa()
+            tx = Transaction(
+                sender=sender,
+                to=contract,
+                gas_limit=100_000,
+            )
+            state_test(
+                pre=pre,
+                post={{
+                    contract: Account(
+                        storage=Storage({{0: {expected_value}}}),
+                    ),
+                }},
+                tx=tx,
+            )
+    """.format(
+        code=code,
+        expected_value=expected_value,
+        salt=contract_deployer.salt,
+    )
+
+    execute_runner.run_assert(test_method=test_method)
+
+
+def test_multiple_tests_single_module(execute_runner: ExecuteRunner) -> None:
+    """Execute multiple tests in a single module."""
+    test_method = """\
+        def test_one(state_test, pre) -> None:
+            sender = pre.fund_eoa()
+            state_test(
+                pre=pre,
+                post={{}},
+                tx=Transaction(
+                    sender=sender,
+                    to=None,
+                    gas_limit=100_000,
+                ),
+            )
+
+        def test_two(state_test, pre) -> None:
+            sender = pre.fund_eoa()
+            state_test(
+                pre=pre,
+                post={{}},
+                tx=Transaction(
+                    sender=sender,
+                    to=None,
+                    gas_limit=100_000,
+                ),
+            )
+    """.format()
+
+    execute_runner.run_assert(test_method=test_method, passed=2)
+
+
+def test_fund_address(execute_runner: ExecuteRunner) -> None:
+    """Execute a test that uses fund_address for pre-existing addresses."""
+    funded_address = "0x1234567890ABCDEF1234567890ABCDEF12345678"
+    test_method = """\
+        def test_fund(state_test, pre) -> None:
+            sender = pre.fund_eoa()
+            funded_address = Address({funded_address})
+            pre.fund_address(funded_address, 10**18)
+            state_test(
+                pre=pre,
+                post={{
+                    funded_address: Account(
+                        balance=10**18,
+                    ),
+                }},
+                tx=Transaction(
+                    sender=sender,
+                    to=None,
+                    gas_limit=100_000,
+                ),
+            )
+    """.format(funded_address=funded_address)
+
+    execute_runner.run_assert(test_method=test_method)
+
+
+def test_fail_fund_address_twice(execute_runner: ExecuteRunner) -> None:
+    """
+    Execute a test that uses fund_address twice on the same account
+    for pre-existing addresses.
+    """
+    funded_address = "0x1234567890ABCDEF1234567890ABCDEF12345678"
+    test_method = """\
+        def test_fund(state_test, pre) -> None:
+            sender = pre.fund_eoa()
+            funded_address = Address({funded_address})
+            pre.fund_address(funded_address, 10**18)
+            pre.fund_address(funded_address, 10**18)
+            state_test(
+                pre=pre,
+                post={{
+                    funded_address: Account(
+                        balance=10**18,
+                    ),
+                }},
+                tx=Transaction(
+                    sender=sender,
+                    to=None,
+                    gas_limit=100_000,
+                ),
+            )
+    """.format(funded_address=funded_address)
+
+    execute_runner.run_assert(test_method=test_method, failed=1)
+
+
+@pytest.mark.parametrize(
+    "account_type",
+    [
+        "funded_eoa",
+        "deployed_contract",
+        "stubbed_contract",
+        "deterministic_contract",
+        "deterministic_contract_already_deployed",
+    ],
+)
+def test_fail_fund_account_in_alloc(
+    execute_runner: ExecuteRunner,
+    account_type: str,
+    contract_deployer: ContractDeployer,
+) -> None:
+    """Execute a test that uses fund_address on an account already in alloc."""
+    stubs: AddressStubs | None = None
+    code = "Op.SSTORE(0, 1) + Op.STOP"
+    match account_type:
+        case "funded_eoa":
+            account_in_alloc = "pre.fund_eoa(amount=1)"
+        case "deployed_contract":
+            account_in_alloc = f"pre.deploy_contract({code})"
+        case "stubbed_contract":
+            stub_name = "stubbed_contract"
+            stub_address = contract_deployer.deploy(code)
+            stubs = AddressStubs({stub_name: StubAddress(addr=stub_address)})
+            account_in_alloc = (
+                f'pre.deploy_contract({code}, stub="{stub_name}")'
+            )
+        case "deterministic_contract":
+            account_in_alloc = (
+                f"pre.deterministic_deploy_contract(deploy_code={code}, "
+                f"salt={contract_deployer.salt})"
+            )
+        case "deterministic_contract_already_deployed":
+            contract_deployer.deterministic_deploy(code)
+            account_in_alloc = (
+                f"pre.deterministic_deploy_contract(deploy_code={code}, "
+                f"salt={contract_deployer.salt})"
+            )
+        case _:
+            raise Exception(f"account type not implemented: {account_type}")
+
+    test_method = """\
+        def test_fund_pre_deploy(state_test, pre) -> None:
+            sender = pre.fund_eoa()
+            account_in_alloc = {account_in_alloc}
+            pre.fund_address(account_in_alloc, 1)
+            state_test(
+                pre=pre,
+                post={{}},
+                tx=Transaction(
+                    sender=sender,
+                    to=None,
+                    gas_limit=100_000,
+                ),
+            )
+    """.format(account_in_alloc=account_in_alloc)
+
+    execute_runner.run_assert(test_method=test_method, stubs=stubs, failed=1)
+
+
+def test_stubs(
+    execute_runner: ExecuteRunner,
+    contract_deployer: ContractDeployer,
+) -> None:
+    """Execute a test that uses stubs for pre-existing contracts."""
+    code = "Op.SSTORE(0, 1) + Op.STOP"
+    stub_address = contract_deployer.deploy(code)
+    stub_name = "stubbed_contract"
+    test_method = """\
+        def test_stubs(state_test, pre) -> None:
+            code = {code}
+            contract = pre.deploy_contract(code, stub="{stub_name}")
+            assert contract == Address("{stub_address}")
+            sender = pre.fund_eoa()
+            tx = Transaction(
+                sender=sender,
+                to=contract,
+                gas_limit=100_000,
+            )
+            state_test(
+                pre=pre,
+                post={{
+                    {stub_address}: Account(
+                        storage=Storage({{0: 1}}),
+                    ),
+                }},
+                tx=tx,
+            )
+    """.format(
+        code=code,
+        stub_name=stub_name,
+        stub_address=f"{stub_address}",
+    )
+
+    stubs = AddressStubs({stub_name: StubAddress(addr=stub_address)})
+    execute_runner.run_assert(test_method=test_method, stubs=stubs)
+
+
+def test_fail_pre_mutation(execute_runner: ExecuteRunner) -> None:
+    """Verify attempting to mutate the pre-allocation results in failure."""
+    test_method = """\
+        def test_simple(state_test, pre) -> None:
+            sender = pre.fund_eoa()
+            pre[0x1] = Account()
+            state_test(
+                pre=pre,
+                post={{}},
+                tx=Transaction(
+                    sender=sender,
+                    to=None,
+                    gas_limit=100_000,
+                ),
+            )
+    """.format()
+
+    execute_runner.run_assert(test_method=test_method, failed=1)
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/tests/test_pre_alloc.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/tests/test_pre_alloc.py
index 93200201570..7dfac06bdc6 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/tests/test_pre_alloc.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/tests/test_pre_alloc.py
@@ -4,10 +4,18 @@
 
 import pytest
 
-from execution_testing.base_types import Address
+from execution_testing.base_types import Address, Hash
 
+from ...shared.address_stubs import StubAddress, StubEOA
 from ..pre_alloc import AddressStubs
 
+ADDR_1 = Address("0x0000000000000000000000000000000000000001")
+DEPOSIT_ADDR = Address("0x00000000219ab540356cbb839cbe05303d7705fa")
+TEST_PKEY = Hash(
+    0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+)
+TEST_ADDR = Address("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+
 
 @pytest.mark.parametrize(
     "input_value,expected",
@@ -18,14 +26,8 @@
             id="empty_address_stubs_string",
         ),
         pytest.param(
-            '{"some_address": "0x0000000000000000000000000000000000000001"}',
-            AddressStubs(
-                {
-                    "some_address": Address(
-                        "0x0000000000000000000000000000000000000001"
-                    )
-                }
-            ),
+            '{"some_address": {"addr": "0x0000000000000000000000000000000000000001"}}',  # noqa: E501
+            AddressStubs({"some_address": StubAddress(addr=ADDR_1)}),
             id="address_stubs_string_with_some_address",
         ),
     ],
@@ -44,36 +46,18 @@ def test_address_stubs(input_value: Any, expected: AddressStubs) -> None:
             AddressStubs({}),
             id="empty_address_stubs_json",
         ),
-        pytest.param(
-            "empty.yaml",
-            "",
-            AddressStubs({}),
-            id="empty_address_stubs_yaml",
-        ),
         pytest.param(
             "one_address.json",
-            '{"DEPOSIT_CONTRACT_ADDRESS": "0x00000000219ab540356cbb839cbe05303d7705fa"}',  # noqa: E501
+            '{"DEPOSIT_CONTRACT_ADDRESS": {"addr": "0x00000000219ab540356cbb839cbe05303d7705fa"}}',  # noqa: E501
             AddressStubs(
                 {
-                    "DEPOSIT_CONTRACT_ADDRESS": Address(
-                        "0x00000000219ab540356cbb839cbe05303d7705fa"
+                    "DEPOSIT_CONTRACT_ADDRESS": StubAddress(
+                        addr=DEPOSIT_ADDR,
                     ),
                 }
             ),
             id="single_address_json",
         ),
-        pytest.param(
-            "one_address.yaml",
-            "DEPOSIT_CONTRACT_ADDRESS: 0x00000000219ab540356cbb839cbe05303d7705fa",  # noqa: E501
-            AddressStubs(
-                {
-                    "DEPOSIT_CONTRACT_ADDRESS": Address(
-                        "0x00000000219ab540356cbb839cbe05303d7705fa"
-                    ),
-                }
-            ),
-            id="single_address_yaml",
-        ),
     ],
 )
 def test_address_stubs_from_files(
@@ -87,3 +71,51 @@ def test_address_stubs_from_files(
     filename.write_text(file_contents)
 
     assert AddressStubs.model_validate_json_or_file(str(filename)) == expected
+
+
+def test_address_stubs_file_not_found(pytester: pytest.Pytester) -> None:
+    """Test that a missing JSON file raises FileNotFoundError."""
+    missing_test = pytester.path.joinpath("nonexistent.json")
+    with pytest.raises(FileNotFoundError):
+        AddressStubs.model_validate_json_or_file(str(missing_test))
+
+
+def test_address_stubs_getitem_returns_address() -> None:
+    """Verify __getitem__ returns the Address, not the stub entry."""
+    stubs = AddressStubs({"label": StubAddress(addr=ADDR_1)})
+    assert stubs["label"] == ADDR_1
+    assert isinstance(stubs["label"], Address)
+
+
+def test_address_stubs_contains() -> None:
+    """Verify __contains__ checks for label presence."""
+    stubs = AddressStubs({"label": StubAddress(addr=ADDR_1)})
+    assert "label" in stubs
+    assert "other" not in stubs
+
+
+def test_address_stubs_with_pkey() -> None:
+    """Parse a JSON string with a private key entry."""
+    json_str = (
+        '{"eoa": {"addr": "' + str(TEST_ADDR) + '", '
+        '"pkey": "' + str(TEST_PKEY) + '"}}'
+    )
+    stubs = AddressStubs.model_validate_json_or_file(json_str)
+    assert stubs["eoa"] == TEST_ADDR
+    assert stubs.is_eoa("eoa")
+    entry = stubs.get_entry("eoa")
+    assert isinstance(entry, StubEOA)
+    assert entry.pkey == TEST_PKEY
+
+
+def test_address_stubs_is_eoa() -> None:
+    """Verify is_eoa distinguishes entries."""
+    stubs = AddressStubs(
+        {
+            "contract": StubAddress(addr=ADDR_1),
+            "eoa": StubEOA(addr=TEST_ADDR, pkey=TEST_PKEY),
+        }
+    )
+    assert not stubs.is_eoa("contract")
+    assert stubs.is_eoa("eoa")
+    assert not stubs.is_eoa("nonexistent")
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/fill_stateful/__init__.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/fill_stateful/__init__.py
new file mode 100644
index 00000000000..575cecb8f1a
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/fill_stateful/__init__.py
@@ -0,0 +1 @@
+"""Stateful fixture filling via testing_buildBlockV1."""
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/fill_stateful/fill_stateful.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/fill_stateful/fill_stateful.py
new file mode 100644
index 00000000000..0d50c671e6a
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/fill_stateful/fill_stateful.py
@@ -0,0 +1,727 @@
+"""
+Fill-native stateful fixture filling plugin.
+
+Drives block construction via ``testing_buildBlockV1`` against a live EL
+client, using fill's standard spec loop (``BlockchainTest.generate`` →
+``make_stateful_fixture``). Emits ``BlockchainEngineStatefulFixture`` JSON.
+
+Overrides fill's ``t8n`` / ``session_t8n`` fixtures to inject a
+``ClientBackend``. Reuses execute's ``Alloc`` (via
+``execute.pre_alloc`` plugin) so test authors keep calling
+``pre.fund_eoa`` / ``pre.deploy_contract``; those enqueue setup
+transactions that ``make_stateful_fixture`` materialises as a
+setup-phase block prepended to ``self.blocks``.
+"""
+
+import os
+import secrets
+from pathlib import Path
+from typing import Any, Generator, List
+from urllib.parse import urlparse, urlunparse
+
+import pytest
+from filelock import FileLock
+
+from execution_testing.base_types import (
+    Address,
+    Hash,
+    HexNumber,
+    Number,
+)
+from execution_testing.client_clis import ClientBackend
+from execution_testing.client_clis.cli_types import EnginePayloadMetadata
+from execution_testing.fixtures import FixtureFillingPhase
+from execution_testing.fixtures.blockchain import (
+    StatefulPreRunFixture,
+)
+from execution_testing.forks import (
+    Fork,
+    ForkSetAdapter,
+    InvalidForkError,
+    TransitionFork,
+)
+from execution_testing.logging import get_logger
+from execution_testing.rpc import DebugRPC, EngineRPC, EthRPC
+from execution_testing.specs.blockchain import (
+    payload_metadata_to_fixture,
+)
+from execution_testing.test_types import EOA
+from execution_testing.test_types.chain_config_types import (
+    ChainConfigDefaults,
+)
+
+from ..execute import contracts
+from ..execute.rpc.chain_builder_eth_rpc import ChainBuilderEthRPC
+from ..execute.rpc.hive import (
+    build_client_files,
+    build_client_genesis_dict,
+    build_genesis_header,
+    build_hive_environment,
+)
+from ..shared.helpers import is_help_or_collectonly_mode
+from ..shared.live_client_flags import FEE_BUMP_MULTIPLIER
+
+# 1 billion ETH. Withdrawals are Gwei (u64-capped); much higher risks
+# overflow on some clients, this is plenty for any single fill session.
+SEED_FUNDING_WEI = 10**9 * 10**18
+
+logger = get_logger(__name__)
+
+
+# ---------------------------------------------------------------------------
+# CLI options + config
+# ---------------------------------------------------------------------------
+
+
+def pytest_addoption(parser: pytest.Parser) -> None:
+    """
+    Add fill-stateful-specific command-line options.
+
+    Live-client flags (``--default-gas-price``, ``--get-payload-wait-time``,
+    ``--max-tx-per-batch``, ``--transaction-gas-limit``, ...) live in
+    :mod:`plugins.shared.live_client_flags`, loaded by our ini.
+    """
+    group = parser.getgroup(
+        "fill_stateful", "Arguments for stateful fixture filling"
+    )
+    group.addoption(
+        "--hive-mode",
+        action="store_true",
+        dest="hive_mode",
+        default=False,
+        help=(
+            "Fill stateful tests using Hive as a backend, skipping the "
+            "requirement for Kurtosis or snapshot clients. Used mainly for "
+            "debugging tests in stateful mode."
+        ),
+    )
+    group.addoption(
+        "--hive-simulator",
+        action="store",
+        dest="hive_simulator",
+        default=os.environ.get("HIVE_SIMULATOR"),
+        help=(
+            "The Hive simulator endpoint, e.g. http://127.0.0.1:3000. By "
+            "default, the value is taken from the HIVE_SIMULATOR environment "
+            "variable."
+        ),
+    )
+    group.addoption(
+        "--rpc-seed-key",
+        action="store",
+        dest="rpc_seed_key",
+        default=None,
+        type=str,
+        help=(
+            "Private key for signing transactions. Optional — a random "
+            "key is generated and funded via CL withdrawal if omitted."
+        ),
+    )
+    group.addoption(
+        "--snapshot-block",
+        action="store",
+        dest="snapshot_block",
+        default=None,
+        type=str,
+        help=(
+            "Anchor the snapshot to a specific block. Accepts a 0x-prefixed "
+            "32-byte block hash (recommended — survives a chain reorg on "
+            "the live client) or a block number (hex or decimal). When "
+            "omitted, the client's ``latest`` block is used and recorded "
+            "by hash. The produced fixtures are anchored by hash regardless."
+        ),
+    )
+
+
+def _resolve_session_fork(
+    config: pytest.Config,
+) -> Fork | TransitionFork:
+    """
+    Resolve the single fork from ``--fork`` in hive mode.
+
+    Runs in ``pytest_configure`` before forks.py populates
+    ``selected_fork_set``, so we can't use ``session_fork`` here — the
+    hive genesis/ruleset must be built before remote.py's pytest_configure
+    pings the (not-yet-started) client.
+    """
+    fork_arg = config.getoption("single_fork", default="")
+    if not fork_arg:
+        pytest.exit(
+            "--fork is required in --hive-mode (single-fork only).",
+            returncode=pytest.ExitCode.USAGE_ERROR,
+        )
+    try:
+        fork_set = ForkSetAdapter.validate_python(fork_arg)
+    except InvalidForkError:
+        pytest.exit(
+            f"Unsupported fork provided to --fork: {fork_arg!r}",
+            returncode=pytest.ExitCode.USAGE_ERROR,
+        )
+    if len(fork_set) != 1:
+        pytest.exit(
+            f"Expected exactly one fork in --hive-mode, got {len(fork_set)} "
+            f"({sorted(f.name() for f in fork_set)}).",
+            returncode=pytest.ExitCode.USAGE_ERROR,
+        )
+    return next(iter(fork_set))
+
+
+def _hive_chain_id(config: pytest.Config) -> int:
+    """Resolve chain id from CLI/env, defaulting to ChainConfigDefaults."""
+    cli_value = config.getoption("chain_id", default=None)
+    if cli_value is not None:
+        return int(cli_value)
+    env_value = os.environ.get("CHAIN_ID")
+    if env_value is not None:
+        return int(env_value)
+    return ChainConfigDefaults.chain_id
+
+
+def _configure_hive(config: pytest.Config) -> None:
+    """
+    Start a hive simulator session and a single execution client, then
+    rewrite ``config.option`` so the rest of the plugin stack (remote.py
+    in particular) connects to the hive-managed client.
+    """
+    hive_simulator_url = config.getoption("hive_simulator")
+    if hive_simulator_url is None:
+        pytest.exit(
+            "The HIVE_SIMULATOR environment variable is not set.\n\n"
+            "If running locally, start hive in --dev mode, for example:\n"
+            "./hive --dev --client go-ethereum\n\n"
+            "and set the HIVE_SIMULATOR to the reported URL. For example, "
+            "in bash:\n"
+            "export HIVE_SIMULATOR=http://127.0.0.1:3000\n"
+            "or in fish:\n"
+            "set -x HIVE_SIMULATOR http://127.0.0.1:3000"
+        )
+    from hive.simulation import Simulation
+
+    session_fork = _resolve_session_fork(config)
+    chain_id = _hive_chain_id(config)
+
+    simulator = Simulation(url=hive_simulator_url)
+    suite = simulator.start_suite(
+        name="fill-stateful test suite",
+        description="Test suite used to drive a fill-stateful session",
+    )
+    config.hive_test_suite = suite  # type: ignore[attr-defined]
+    base_test = suite.start_test(
+        name="fill-stateful base test",
+        description=(
+            "Base test in the fill-stateful suite hosting the long-lived "
+            "execution client."
+        ),
+    )
+    config.hive_base_test = base_test  # type: ignore[attr-defined]
+
+    # base_pre=None: seed key funded via CL withdrawal and deterministic
+    # factory deployed on-chain by ``_session_pre_run``, so genesis only
+    # needs the fork's required system contracts.
+    pre_alloc, genesis_header = build_genesis_header(session_fork, None)
+    genesis_dict = build_client_genesis_dict(pre_alloc, genesis_header)
+
+    client_type = simulator.client_types()[0]
+    client = base_test.start_client(
+        client_type=client_type,
+        environment=build_hive_environment(session_fork, chain_id),
+        files=build_client_files(genesis_dict),
+    )
+    if client is None:
+        pytest.exit(
+            f"Unable to start hive client {client_type.name}. Check the "
+            "hive server logs for more information."
+        )
+    config.hive_client = client  # type: ignore[attr-defined]
+    logger.info(
+        f"Started hive client {client_type.name} at {client.ip} "
+        f"(fork={session_fork.name()}, chain_id={chain_id})"
+    )
+
+    config.option.rpc_endpoint = f"http://{client.ip}:8545"
+    config.option.engine_endpoint = f"http://{client.ip}:8551"
+    if (
+        config.getoption("engine_jwt_secret", default=None) is None
+        and config.getoption("engine_jwt_secret_file", default=None) is None
+    ):
+        config.option.engine_jwt_secret = EngineRPC.DEFAULT_JWT_SECRET
+    if config.getoption("chain_id", default=None) is None:
+        config.option.chain_id = chain_id
+
+
+@pytest.hookimpl(tryfirst=True)
+def pytest_configure(config: pytest.Config) -> None:
+    """
+    Configure the fill-stateful session.
+
+    Filler handles output-dir/--clean/FixtureCollector; we only set
+    fill-stateful flags and auto-derive endpoints + chain id.
+    """
+    config.option.use_testing_build_block = True
+    config.option.skip_cleanup = True
+    config.engine_rpc_supported = True  # type: ignore[attr-defined]
+    config.skip_transition_forks = True  # type: ignore[attr-defined]
+    config.single_fork_mode = True  # type: ignore[attr-defined]
+    # Fail loudly on stub_parametrize with no matching --address-stubs
+    # instead of pytest's default silent skip on empty parametrize.
+    config.require_stub_match = True  # type: ignore[attr-defined]
+    config.addinivalue_line(
+        "markers",
+        "missing_stubs(message): fill-stateful policy marker; "
+        "pytest_runtest_call fails the test with ``message``.",
+    )
+    config.filling_phase = FixtureFillingPhase.FILL_STATEFUL  # type: ignore[attr-defined]
+
+    # Help/collect-only never talks to a client; skip endpoint defaulting.
+    if is_help_or_collectonly_mode(config):
+        return
+
+    config.hive_test_suite = None  # type: ignore[attr-defined]
+    config.hive_base_test = None  # type: ignore[attr-defined]
+    config.hive_client = None  # type: ignore[attr-defined]
+    if config.getoption("hive_mode", default=False):
+        _configure_hive(config)
+    else:
+        if not config.getoption("rpc_endpoint", default=None):
+            config.option.rpc_endpoint = "http://localhost:8545"
+        if not config.getoption("engine_endpoint", default=None):
+            parsed = urlparse(config.getoption("rpc_endpoint"))
+            config.option.engine_endpoint = urlunparse(
+                parsed._replace(netloc=f"{parsed.hostname}:8551")
+            )
+
+        if not config.getoption("chain_id", default=None):
+            rpc = EthRPC(config.getoption("rpc_endpoint"))
+            config.option.chain_id = rpc.chain_id()
+            logger.info(f"Auto-detected chain ID: {config.option.chain_id}")
+
+
+def pytest_unconfigure(config: pytest.Config) -> None:
+    """Tear down hive resources started in ``pytest_configure``."""
+    client = getattr(config, "hive_client", None)
+    if client is not None:
+        try:
+            client.stop()
+        except Exception as e:
+            logger.warning(f"Failed to stop hive client: {e}")
+        config.hive_client = None  # type: ignore[attr-defined]
+
+    base_test = getattr(config, "hive_base_test", None)
+    if base_test is not None:
+        from hive.testing import HiveTestResult
+
+        test_pass = (
+            getattr(config, "_fill_stateful_session_failed", False) is False
+        )
+        try:
+            base_test.end(
+                result=HiveTestResult(
+                    test_pass=test_pass,
+                    details=(
+                        "fill-stateful session complete"
+                        if test_pass
+                        else "fill-stateful session had failures"
+                    ),
+                )
+            )
+        except Exception as e:
+            logger.warning(f"Failed to end hive base test: {e}")
+        config.hive_base_test = None  # type: ignore[attr-defined]
+
+    suite = getattr(config, "hive_test_suite", None)
+    if suite is not None:
+        try:
+            suite.end()
+        except Exception as e:
+            logger.warning(f"Failed to end hive test suite: {e}")
+        config.hive_test_suite = None  # type: ignore[attr-defined]
+
+
+def pytest_sessionfinish(session: pytest.Session, exitstatus: int) -> None:
+    """Record overall session pass/fail for the hive teardown report."""
+    del exitstatus
+    if session.testsfailed > 0:
+        session.config._fill_stateful_session_failed = True  # type: ignore[attr-defined]
+
+
+def pytest_runtest_call(item: pytest.Item) -> None:
+    """Fail in the call phase (→ FAILED, not ERROR) on ``missing_stubs``."""
+    for marker in item.iter_markers("missing_stubs"):
+        pytest.fail(marker.args[0], pytrace=False)
+
+
+# ---------------------------------------------------------------------------
+# Support fixtures (replacements for execute's sender/concurrency plugins)
+# ---------------------------------------------------------------------------
+
+
+@pytest.fixture(scope="session")
+def session_temp_folder(tmp_path_factory: pytest.TempPathFactory) -> Path:
+    """Session temp folder (replaces concurrency plugin)."""
+    return tmp_path_factory.mktemp("fill_stateful")
+
+
+@pytest.fixture(scope="session")
+def worker_count() -> int:
+    """Single-worker filling."""
+    return 1
+
+
+@pytest.fixture(scope="session")
+def seed_key(eth_rpc: EthRPC, request: pytest.FixtureRequest) -> EOA:
+    """Load or generate the seed key used for all session funding."""
+    key_str = request.config.getoption("rpc_seed_key")
+    if key_str:
+        try:
+            eoa = EOA(key=key_str, nonce=0)
+        except Exception:
+            pytest.fail(
+                f"--rpc-seed-key must be a 32-byte hex string, "
+                f"got: {key_str!r}"
+            )
+        account = eth_rpc.get_account(eoa, skip_code=True)
+        eoa.nonce = Number(account.nonce)
+    else:
+        eoa = EOA(key=int.from_bytes(secrets.token_bytes(32)), nonce=0)
+        logger.info("Generated random seed key (funded via withdrawal)")
+    return eoa
+
+
+@pytest.fixture(scope="session")
+def session_worker_key(seed_key: EOA) -> EOA:
+    """Alias of ``seed_key`` under the name pre_alloc's ``Alloc`` expects."""
+    return seed_key
+
+
+@pytest.fixture(scope="function")
+def worker_key(eth_rpc: EthRPC, session_worker_key: EOA) -> EOA:
+    """Sync seed key nonce before each test."""
+    account = eth_rpc.get_account(session_worker_key, skip_code=True)
+    session_worker_key.nonce = Number(account.nonce)
+    return session_worker_key
+
+
+@pytest.fixture(scope="session")
+def sender_funding_transactions_gas_price(eth_rpc: EthRPC) -> int:
+    """Pinned gas price for session-level funding transactions."""
+    return eth_rpc.gas_price()
+
+
+@pytest.fixture(scope="session")
+def sender_fund_refund_gas_limit(
+    session_fork: Fork | TransitionFork,
+) -> int:
+    """Intrinsic gas for the funding tx, derived from the fork."""
+    fork = session_fork.fork_at(block_number=0, timestamp=0)
+    return fork.transaction_intrinsic_cost_calculator()()
+
+
+@pytest.fixture()
+def max_gas_limit_per_test(
+    request: pytest.FixtureRequest,
+    session_fork: Fork | TransitionFork,
+) -> int | None:
+    """
+    Override of ``live_client_flags.max_gas_limit_per_test`` — fall back
+    to ``Fork.transaction_gas_limit_cap()`` (EIP-7825) when the CLI flag
+    is unset. Returns ``None`` on pre-Osaka forks (no cap).
+    """
+    cli_value = request.config.getoption("max_gas_per_test")
+    if cli_value is not None:
+        return cli_value
+    fork_at_genesis = session_fork.fork_at(block_number=0, timestamp=0)
+    return fork_at_genesis.transaction_gas_limit_cap()
+
+
+# Other live-client fixtures (``max_transactions_per_batch``,
+# ``default_*``, fee fields, ``dry_run``, ...) come from
+# ``shared.live_client_flags``. ``skip_cleanup`` from ``execute.pre_alloc``;
+# we force it on in ``pytest_configure``.
+
+
+# ---------------------------------------------------------------------------
+# Backend + session setup
+# ---------------------------------------------------------------------------
+
+
+@pytest.fixture(scope="session")
+def debug_rpc(eth_rpc: EthRPC) -> DebugRPC:
+    """DebugRPC on the same endpoint as eth_rpc (for debug_setHead)."""
+    return DebugRPC(eth_rpc.url)
+
+
+@pytest.fixture(scope="session")
+def client_backend(
+    eth_rpc: ChainBuilderEthRPC,
+    session_fork: Fork | TransitionFork,
+    default_gas_price: int | None,
+    default_max_fee_per_gas: int | None,
+    default_max_priority_fee_per_gas: int | None,
+    default_max_fee_per_blob_gas: int | None,
+) -> ClientBackend:
+    """
+    Create the ClientBackend; snapshot/start block populated later.
+
+    Session fees are pinned here (CLI defaults, else a one-shot live
+    query bumped 1.5x) so ``make_stateful_fixture`` can size pre-alloc
+    funding without mutating ``TransactionDefaults``.
+    """
+    assert eth_rpc.testing_rpc is not None, (
+        "fill-stateful requires a client exposing the `testing` namespace"
+    )
+    # Share TestingRPC with ChainBuilderEthRPC so both code paths drive
+    # the same client.
+    backend = ClientBackend(
+        testing_rpc=eth_rpc.testing_rpc,
+        engine_rpc=eth_rpc.engine_rpc,
+        eth_rpc=eth_rpc,
+        fork=session_fork,
+    )
+
+    priority_fee = default_max_priority_fee_per_gas
+    if priority_fee is None:
+        priority_fee = int(
+            eth_rpc.max_priority_fee_per_gas() * FEE_BUMP_MULTIPLIER
+        )
+    max_fee = default_max_fee_per_gas
+    if max_fee is None:
+        max_fee = int(eth_rpc.gas_price() * FEE_BUMP_MULTIPLIER)
+    if priority_fee > max_fee:
+        max_fee = priority_fee + 1
+    blob_fee = default_max_fee_per_blob_gas
+    if blob_fee is None:
+        blob_fee = int(eth_rpc.blob_base_fee() * FEE_BUMP_MULTIPLIER)
+    gas_price = (
+        default_gas_price
+        if default_gas_price is not None
+        else max_fee + priority_fee
+    )
+
+    backend.gas_price = gas_price
+    backend.max_fee_per_gas = max_fee
+    backend.max_priority_fee_per_gas = priority_fee
+    backend.max_fee_per_blob_gas = blob_fee
+    logger.info(
+        "ClientBackend fees pinned: "
+        f"gas_price={gas_price / 10**9:.2f} Gwei, "
+        f"max_fee={max_fee / 10**9:.2f} Gwei, "
+        f"priority={priority_fee / 10**9:.2f} Gwei, "
+        f"blob={blob_fee / 10**9:.2f} Gwei"
+    )
+    return backend
+
+
+@pytest.fixture(scope="session")
+def snapshot_block(
+    request: pytest.FixtureRequest, eth_rpc: "ChainBuilderEthRPC"
+) -> Any:
+    """
+    Resolve the snapshot anchor to a client block dict.
+
+    Accepts a 32-byte hash (preferred — survives reorgs), an integer
+    block number (hex/dec), or ``None`` for ``latest``. The returned
+    block's ``hash`` is what we record as the fixture anchor.
+    """
+    snapshot_arg = request.config.getoption("snapshot_block", default=None)
+    if not snapshot_arg:
+        block = eth_rpc.get_block_by_number("latest")
+        if block is None:
+            pytest.exit("Failed to fetch 'latest' block as snapshot anchor")
+        return block
+
+    stripped = snapshot_arg.strip()
+    block_hash: Hash | None = None
+    try:
+        block_hash = Hash(stripped)
+    except Exception:
+        pass
+    if block_hash:
+        block = eth_rpc.get_block_by_hash(block_hash)
+        if block is None:
+            pytest.exit(
+                f"--snapshot-block hash {stripped} not found on client"
+            )
+        return block
+
+    try:
+        number = int(stripped, 0)
+    except ValueError:
+        pytest.exit(
+            f"--snapshot-block must be a 0x-prefixed 32-byte hash or an "
+            f"integer block number; got {snapshot_arg!r}"
+        )
+    block = eth_rpc.get_block_by_number(number)
+    if block is None:
+        pytest.exit(f"--snapshot-block number {number} not found on client")
+    return block
+
+
+@pytest.fixture(scope="session", autouse=True)
+def _session_pre_run(
+    client_backend: ClientBackend,
+    eth_rpc: ChainBuilderEthRPC,
+    session_worker_key: EOA,
+    session_fork: Fork | TransitionFork,
+    snapshot_block: Any,
+    sender_funding_transactions_gas_price: int,
+    session_temp_folder: Path,
+    request: pytest.FixtureRequest,
+) -> None:
+    """
+    Session pre-run: capture snapshot, fund seed, deploy factory, capture
+    start block, write ``pre_run/<start_block_hash>.json``.
+
+    The file is named after the start block hash so per-test
+    ``BlockchainEngineStatefulFixture`` instances reference their setup
+    file implicitly via their own ``start_block_hash`` field — leaves
+    room for multiple pre-run files (e.g. different setup variants off
+    one snapshot) without coordinating filenames.
+
+    Pre-run helpers return their built ``EnginePayloadMetadata`` directly;
+    we collect them into ``captured`` and serialise via
+    ``payload_metadata_to_fixture``.
+    """
+    if is_help_or_collectonly_mode(request.config):
+        return
+
+    # 1. Snapshot anchor. Either way, the client-returned hash is what we
+    #    record — a later reorg can't silently re-anchor by block number.
+    client_backend.snapshot_block = snapshot_block
+    logger.info(
+        f"Snapshot block {snapshot_block['number']} "
+        f"hash={snapshot_block['hash'][:20]}..."
+    )
+
+    # 2. Fund seed key via CL withdrawal; helper returns the built payload.
+    captured: List[EnginePayloadMetadata] = []
+    fund_payload = eth_rpc.fund_via_withdrawals(
+        [(Address(session_worker_key), SEED_FUNDING_WEI)]
+    )
+    if fund_payload is not None:
+        captured.append(fund_payload)
+    logger.info(f"Funded {Address(session_worker_key)} via withdrawal")
+
+    # 3. Deploy deterministic factory if not already present.
+    lock_file = session_temp_folder / "fill_stateful_setup.lock"
+    with FileLock(lock_file):
+        if (
+            contracts.check_deterministic_factory_deployment(
+                eth_rpc=eth_rpc, fork=session_fork
+            )
+            is None
+        ):
+            _, deploy_payloads = (
+                contracts.deploy_deterministic_factory_contract(
+                    eth_rpc=eth_rpc,
+                    seed_key=session_worker_key,
+                    gas_price=sender_funding_transactions_gas_price,
+                    tx_index=0,
+                )
+            )
+            captured.extend(deploy_payloads)
+
+    # 4. Capture start block (head after global setup).
+    start_block = eth_rpc.get_block_by_number("latest")
+    assert start_block is not None, "Failed to fetch start block"
+    client_backend.start_block = start_block
+    logger.info(
+        f"Start block {start_block['number']} "
+        f"hash={start_block['hash'][:20]}..."
+    )
+
+    # 5. Persist captured payloads to pre_run/<start_block_hash>.json.
+    #    Per-test fixtures already carry start_block_hash; naming the
+    #    pre-run file after that hash makes lookup a direct path build.
+    if captured:
+        output_dir = Path(request.config.getoption("output"))
+        pre_run_dir = (
+            output_dir / "blockchain_tests_stateful_engine" / "pre_run"
+        )
+        pre_run_dir.mkdir(parents=True, exist_ok=True)
+        fork_at_genesis = session_fork.fork_at(block_number=0, timestamp=0)
+        payloads = [payload_metadata_to_fixture(p) for p in captured]
+        start_block_hash = Hash(start_block["hash"])
+        fixture = StatefulPreRunFixture(
+            network=str(fork_at_genesis),
+            snapshot_block_number=HexNumber(snapshot_block["number"]),
+            snapshot_block_hash=Hash(snapshot_block["hash"]),
+            start_block_number=HexNumber(start_block["number"]),
+            start_block_hash=start_block_hash,
+            payloads=payloads,
+        )
+        pre_run_file = pre_run_dir / f"{start_block_hash}.json"
+        pre_run_file.write_text(
+            fixture.model_dump_json(by_alias=True, indent=2, exclude_none=True)
+        )
+        logger.info(
+            f"Wrote {len(payloads)} pre-run payloads to {pre_run_file}"
+        )
+
+
+# ---------------------------------------------------------------------------
+# Override fill's t8n/session_t8n with ClientBackend (last-loaded wins).
+# ---------------------------------------------------------------------------
+
+
+@pytest.fixture(autouse=True, scope="session")
+def session_t8n(
+    client_backend: ClientBackend,
+    _session_pre_run: None,
+) -> Generator[ClientBackend, None, None]:
+    """
+    Override fill's session_t8n; ``_session_pre_run`` is a dependency-only
+    handle forcing snapshot/start capture before fill's spec loop runs.
+    """
+    del _session_pre_run
+    yield client_backend
+    client_backend.shutdown()
+
+
+@pytest.fixture(autouse=True, scope="function")
+def t8n(
+    session_t8n: ClientBackend,
+) -> Generator[ClientBackend, None, None]:
+    """Override: no per-test reset needed for ClientBackend."""
+    yield session_t8n
+
+
+# ---------------------------------------------------------------------------
+# Per-test lifecycle
+# ---------------------------------------------------------------------------
+
+
+@pytest.fixture(autouse=True, scope="function")
+def _reset_chain_between_tests(
+    client_backend: ClientBackend,
+    debug_rpc: DebugRPC,
+    eth_rpc: "ChainBuilderEthRPC",
+) -> Generator[None, None, None]:
+    """
+    Rewind to start_block after each test so the chain is identical for
+    every fill. ``debug_setHead`` only takes a number, so after the
+    rewind we re-fetch ``latest`` and fail loudly if the hash drifted
+    (e.g. live reorg of a same-numbered block).
+    """
+    yield
+    if client_backend.start_block is None:
+        return
+    start_hex = client_backend.start_block["number"]
+    expected_hash = client_backend.start_block["hash"]
+    # Skip when head already at start (geth rejects same-block setHead).
+    current_head = eth_rpc.get_block_by_number("latest")
+    if current_head is not None and current_head["hash"] == expected_hash:
+        return
+    try:
+        debug_rpc.set_head(start_hex)
+    except Exception as e:
+        pytest.exit(f"debug_setHead failed — subsequent fixtures invalid: {e}")
+    head = eth_rpc.get_block_by_number("latest")
+    if head is None or head["hash"] != expected_hash:
+        observed = head["hash"] if head is not None else "<none>"
+        pytest.exit(
+            f"debug_setHead landed on hash {observed} but expected "
+            f"{expected_hash} (start_block at number {start_hex}). The "
+            "live chain may have reorged out from under fill-stateful; "
+            "rerun against a quiescent client or use --snapshot-block "
+            "with an explicit hash."
+        )
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/eip_checklist.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/eip_checklist.py
index ade7ec83288..11129083b82 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/eip_checklist.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/eip_checklist.py
@@ -392,6 +392,21 @@ def generate_filled_checklist(self, output_dir: Path) -> Path:
         return output_dir
 
 
+def _find_eip_dir(tests_root: Path, eip_number: int) -> Path | None:
+    """
+    Return the first `eip<N>_*` directory under `tests_root`, if any.
+
+    Used as a fallback when an EIP is referenced from a test outside its
+    own `eipNNNN/` directory via the `eip=[N]` kwarg of `eip_checklist`,
+    so the checklist doc can still be attached to the EIP's canonical
+    location even when none of its primary tests were collected.
+    """
+    for match in tests_root.rglob(f"eip{eip_number}_*"):
+        if match.is_dir():
+            return match
+    return None
+
+
 class EIPChecklistCollector:
     """Collects and manages EIP checklist items from test markers."""
 
@@ -497,6 +512,14 @@ def pytest_collection_modifyitems(
                 continue
             self.collect_from_item(item, eip)
 
+        # Back-fill the canonical `eipNNNN_*` directory for any EIP added
+        # via the `eip=[N]` kwarg of `eip_checklist` whose primary tests
+        # weren't collected (e.g. because of a `-m` filter or `--until`).
+        tests_root = Path(config.rootpath) / "tests"
+        for eip in self.eips.values():
+            if eip.path is None:
+                eip.path = _find_eip_dir(tests_root, eip.number)
+
         # Check which mode we are in
         checklist_doc_gen = config.getoption("checklist_doc_gen", False)
         checklist_output = config.getoption(
@@ -512,7 +535,14 @@ def pytest_collection_modifyitems(
                 continue
 
             if checklist_doc_gen:
-                assert eip.path is not None
+                if eip.path is None:
+                    logger.warning(
+                        f"EIP-{eip.number} was referenced via the `eip` "
+                        "kwarg of `eip_checklist` but no `eip"
+                        f"{eip.number}_*` directory was found under "
+                        "tests/; skipping checklist doc generation for it."
+                    )
+                    continue
                 checklist_path = eip.path / "checklist.md"
                 checklist_props[checklist_path] = EipChecklistPageProps(
                     title=f"EIP-{eip.number} Test Checklist",
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/filler.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/filler.py
index 37e68832918..fb7fac5f239 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/filler.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/filler.py
@@ -6,6 +6,8 @@
 and writes the generated fixtures to file.
 """
 
+from __future__ import annotations
+
 import atexit
 import configparser
 import datetime
@@ -19,7 +21,7 @@
 import warnings
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Any, Dict, Generator, List, Self, Set, Type
+from typing import TYPE_CHECKING, Any, Dict, Generator, List, Self, Set, Type
 
 import pytest
 import xdist
@@ -63,13 +65,16 @@
 )
 from execution_testing.forks import (
     Fork,
-    get_transition_fork_predecessor,
+    TransitionFork,
     get_transition_forks,
 )
 from execution_testing.specs import BaseTest
 from execution_testing.specs.base import FillResult, OpMode
 from execution_testing.test_types import EnvironmentDefaults
-from execution_testing.test_types.chain_config_types import ChainConfigDefaults
+from execution_testing.test_types.chain_config_types import (
+    DEFAULT_CHAIN_ID,
+    ChainConfigDefaults,
+)
 from execution_testing.tools.utility.versioning import (
     generate_github_url,
     get_current_commit_hash_or_tag,
@@ -84,11 +89,14 @@
     get_spec_format_for_item,
     is_help_or_collectonly_mode,
     labeled_format_parameter_set,
+    option_was_explicitly_set,
 )
 from ..spec_version_checker.spec_version_checker import (
     get_ref_spec_from_module,
 )
-from .pre_alloc import Alloc
+
+if TYPE_CHECKING:
+    from .pre_alloc import Alloc
 
 # Fixture output dir for keyboard interrupt cleanup (set in pytest_configure).
 # Used by _merge_on_exit to merge partial JSONL files on Ctrl+C or SIGTERM.
@@ -133,33 +141,53 @@ def _merge_on_exit() -> None:
 
 
 @dataclass(kw_only=True)
-class PhaseManager:
+class FillingSession:
     """
-    Manages the execution phase for fixture generation.
-
-    The filler plugin supports two-phase execution for pre-allocation group
-    generation:
-    - Phase 1: Generate pre-allocation groups (pytest run with
-        --generate-pre-alloc-groups).
+    Manages all state for a single pytest fill session.
 
-    - Phase 2: Fill fixtures using pre-allocation
-        groups (pytest run with --use-pre-alloc-groups).
+    This class serves as the single source of truth for all filler state
+    management, including phase management, format selection, and
+    pre-allocation groups.
 
-    Note: These are separate pytest runs orchestrated by the CLI wrapper. Each
-    run gets a fresh PhaseManager instance (no persistence between phases).
+    Important: Each pytest run gets a fresh FillingSession instance. There is
+    no persistence between phase 1 (generate pre-alloc) and phase 2 (use
+    pre-alloc) except through file I/O.
     """
 
-    current_phase: FixtureFillingPhase
-    previous_phases: Set[FixtureFillingPhase] = field(default_factory=set)
+    fixture_output: FixtureOutput
+    filling_phase: FixtureFillingPhase
+    pre_alloc_groups: PreAllocGroups | None = None
+    pre_alloc_group_builders: PreAllocGroupBuilders | None = None
 
     @classmethod
-    def from_config(cls, config: pytest.Config) -> "Self":
+    def from_config(
+        cls,
+        config: pytest.Config,
+    ) -> "Self":
         """
-        Create a PhaseManager from pytest configuration.
+        Initialize a filling session from pytest configuration.
+
+        Args:
+            config: The pytest configuration object.
+
+        """
+        return cls(
+            fixture_output=FixtureOutput.from_config(config),
+            filling_phase=cls.filling_phase_from_config(config),
+            pre_alloc_groups=None,
+        )
+
+    @staticmethod
+    def filling_phase_from_config(
+        config: pytest.Config,
+    ) -> FixtureFillingPhase:
+        """
+        Infer current phase from the pytest configuration.
 
         Flag logic:
-        - use_pre_alloc_groups: We're in phase 2 (FILL) after phase
-                                1 (PRE_ALLOC_GENERATION).
+        - use_pre_alloc_groups: We're in phase 2,
+                                FILL_AFTER_PRE_ALLOC_GENERATION,
+                                after phase 1, PRE_ALLOC_GENERATION.
         - generate_pre_alloc_groups or generate_all_formats:
                                 We're in phase 1 (PRE_ALLOC_GENERATION). -
         Otherwise: Normal single-phase filling (FILL).
@@ -168,6 +196,11 @@ def from_config(cls, config: pytest.Config) -> "Self":
         CLI passes it to phase 1 to ensure all formats are considered for
         grouping.
         """
+        pre_configured_phase = getattr(config, "filling_phase", None)
+        if pre_configured_phase is not None:
+            # Another plugin already configured the phase.
+            return pre_configured_phase
+
         generate_pre_alloc = config.getoption(
             "generate_pre_alloc_groups", False
         )
@@ -176,175 +209,37 @@ def from_config(cls, config: pytest.Config) -> "Self":
 
         if use_pre_alloc:
             # Phase 2: Using pre-generated groups
-            return cls(
-                current_phase=FixtureFillingPhase.FILL,
-                previous_phases={FixtureFillingPhase.PRE_ALLOC_GENERATION},
-            )
+            return FixtureFillingPhase.FILL_AFTER_PRE_ALLOC_GENERATION
         elif generate_pre_alloc or generate_all:
             # Phase 1: Generating pre-allocation groups
-            return cls(current_phase=FixtureFillingPhase.PRE_ALLOC_GENERATION)
+            return FixtureFillingPhase.PRE_ALLOC_GENERATION
         else:
             # Normal single-phase filling
-            return cls(current_phase=FixtureFillingPhase.FILL)
-
-    @property
-    def is_pre_alloc_generation(self) -> bool:
-        """Check if we're in the pre-allocation generation phase."""
-        return self.current_phase == FixtureFillingPhase.PRE_ALLOC_GENERATION
-
-    @property
-    def is_fill_after_pre_alloc(self) -> bool:
-        """Check if we're filling after pre-allocation generation."""
-        return (
-            self.current_phase == FixtureFillingPhase.FILL
-            and FixtureFillingPhase.PRE_ALLOC_GENERATION
-            in self.previous_phases
-        )
-
-    @property
-    def is_single_phase_fill(self) -> bool:
-        """Check if we're in single-phase fill mode (no pre-allocation)."""
-        return (
-            self.current_phase == FixtureFillingPhase.FILL
-            and FixtureFillingPhase.PRE_ALLOC_GENERATION
-            not in self.previous_phases
-        )
-
-
-@dataclass(kw_only=True)
-class FormatSelector:
-    """
-    Handles fixture format selection based on the current phase and format
-    capabilities.
-
-    This class encapsulates the complex logic for determining which fixture
-    formats should be generated in each phase of the two-phase execution model.
-    """
-
-    phase_manager: PhaseManager
-    generate_all_formats: bool
-
-    def should_generate(
-        self, fixture_format: Type[BaseFixture] | LabeledFixtureFormat
-    ) -> bool:
-        """
-        Determine if a fixture format should be generated in the current phase.
-
-        Args:
-            fixture_format: The fixture format to check (may be wrapped in
-                LabeledFixtureFormat).
-
-        Returns:
-            True if the format should be generated in the current phase.
-
-        """
-        format_phases = fixture_format.format_phases
-
-        if self.phase_manager.is_pre_alloc_generation:
-            return self._should_generate_pre_alloc(format_phases)
-        else:  # FILL phase
-            return self._should_generate_fill(format_phases)
-
-    def _should_generate_pre_alloc(
-        self, format_phases: Set[FixtureFillingPhase]
-    ) -> bool:
-        """
-        Determine if format should be generated during pre-alloc generation
-        phase.
-        """
-        # Only generate formats that need pre-allocation groups
-        return FixtureFillingPhase.PRE_ALLOC_GENERATION in format_phases
-
-    def _should_generate_fill(
-        self, format_phases: Set[FixtureFillingPhase]
-    ) -> bool:
-        """Determine if format should be generated during fill phase."""
-        if (
-            FixtureFillingPhase.PRE_ALLOC_GENERATION
-            in self.phase_manager.previous_phases
-        ):
-            # Phase 2: After pre-alloc generation
-            if self.generate_all_formats:
-                # Generate all formats, including those that don't need pre-
-                # alloc
-                return True
-            else:
-                # Only generate formats that needed pre-alloc groups
-                return (
-                    FixtureFillingPhase.PRE_ALLOC_GENERATION in format_phases
+            return FixtureFillingPhase.FILL
+
+    def __post_init__(self) -> None:
+        """Initialize filling session based on the current phase."""
+        match self.filling_phase:
+            case FixtureFillingPhase.PRE_ALLOC_GENERATION:
+                # Phase 1: Create empty container for collecting groups
+                self.pre_alloc_group_builders = PreAllocGroupBuilders(root={})
+            case FixtureFillingPhase.FILL_AFTER_PRE_ALLOC_GENERATION:
+                # Phase 2: Load pre-alloc groups from disk
+                pre_alloc_folder = (
+                    self.fixture_output.pre_alloc_groups_folder_path
                 )
-        else:
-            # Single phase: Only generate fill-only formats
-            return format_phases == {FixtureFillingPhase.FILL}
-
-
-@dataclass(kw_only=True)
-class FillingSession:
-    """
-    Manages all state for a single pytest fill session.
-
-    This class serves as the single source of truth for all filler state
-    management, including phase management, format selection, and
-    pre-allocation groups.
-
-    Important: Each pytest run gets a fresh FillingSession instance. There is
-    no persistence between phase 1 (generate pre-alloc) and phase 2 (use
-    pre-alloc) except through file I/O.
-    """
-
-    fixture_output: FixtureOutput
-    phase_manager: PhaseManager
-    format_selector: FormatSelector
-    pre_alloc_groups: PreAllocGroups | None = None
-    pre_alloc_group_builders: PreAllocGroupBuilders | None = None
-
-    @classmethod
-    def from_config(cls, config: pytest.Config) -> "Self":
-        """
-        Initialize a filling session from pytest configuration.
-
-        Args:
-            config: The pytest configuration object.
-
-        """
-        phase_manager = PhaseManager.from_config(config)
-        instance = cls(
-            fixture_output=FixtureOutput.from_config(config),
-            phase_manager=phase_manager,
-            format_selector=FormatSelector(
-                phase_manager=phase_manager,
-                generate_all_formats=config.getoption(
-                    "generate_all_formats", False
-                ),
-            ),
-            pre_alloc_groups=None,
-        )
-
-        # Initialize pre-alloc groups based on phase
-        instance._initialize_pre_alloc_groups()
-        return instance
-
-    def _initialize_pre_alloc_groups(self) -> None:
-        """Initialize pre-allocation groups based on the current phase."""
-        if self.phase_manager.is_pre_alloc_generation:
-            # Phase 1: Create empty container for collecting groups
-            self.pre_alloc_group_builders = PreAllocGroupBuilders(root={})
-        elif self.phase_manager.is_fill_after_pre_alloc:
-            # Phase 2: Load pre-alloc groups from disk
-            self._load_pre_alloc_groups_from_folder()
-
-    def _load_pre_alloc_groups_from_folder(self) -> None:
-        """Load pre-allocation groups from the output folder."""
-        pre_alloc_folder = self.fixture_output.pre_alloc_groups_folder_path
-        if pre_alloc_folder.exists():
-            self.pre_alloc_groups = PreAllocGroups.from_folder(
-                pre_alloc_folder, lazy_load=True
-            )
-        else:
-            raise FileNotFoundError(
-                f"Pre-allocation groups folder not found: {pre_alloc_folder}. "
-                "Run phase 1 with --generate-pre-alloc-groups first."
-            )
+                if pre_alloc_folder.exists():
+                    self.pre_alloc_groups = PreAllocGroups.from_folder(
+                        pre_alloc_folder, lazy_load=True
+                    )
+                else:
+                    raise FileNotFoundError(
+                        "Pre-allocation groups folder not found: "
+                        f"{pre_alloc_folder}. "
+                        "Run phase 1 with --generate-pre-alloc-groups first."
+                    )
+            case _:
+                pass
 
     def should_generate_format(
         self, fixture_format: Type[BaseFixture] | LabeledFixtureFormat
@@ -360,7 +255,7 @@ def should_generate_format(
             True if the format should be generated.
 
         """
-        return self.format_selector.should_generate(fixture_format)
+        return self.filling_phase in fixture_format.format_phases
 
     def get_pre_alloc_group(self, hash_key: str) -> PreAllocGroup:
         """
@@ -392,30 +287,6 @@ def get_pre_alloc_group(self, hash_key: str) -> PreAllocGroup:
 
         return self.pre_alloc_groups[hash_key]
 
-    def update_pre_alloc_group_builder(
-        self, hash_key: str, group_builder: PreAllocGroupBuilder
-    ) -> None:
-        """
-        Update or add a pre-allocation group.
-
-        Args:
-            hash_key: The hash of the pre-alloc group.
-            group_builder: The pre-allocation group builder.
-
-        Raises:
-            ValueError: If not in pre-alloc generation phase.
-
-        """
-        if not self.phase_manager.is_pre_alloc_generation:
-            raise ValueError(
-                "Can only update pre-alloc groups in generation phase"
-            )
-
-        if self.pre_alloc_group_builders is None:
-            self.pre_alloc_group_builders = PreAllocGroupBuilders(root={})
-
-        self.pre_alloc_group_builders.root[hash_key] = group_builder
-
     def save_pre_alloc_groups(self) -> None:
         """Save pre-allocation groups to disk as partial files."""
         if self.pre_alloc_group_builders is None:
@@ -789,6 +660,17 @@ def pytest_addoption(parser: pytest.Parser) -> None:
             "Only creates debug output when explicitly specified."
         ),
     )
+    debug_group.addoption(
+        "--post-verifications",
+        action="store_true",
+        dest="post_verifications",
+        default=False,
+        help=(
+            "Include a postVerifications field in fixture output "
+            "that records which post-state checks were "
+            "performed during filling."
+        ),
+    )
 
 
 @pytest.hookimpl(tryfirst=True)
@@ -809,7 +691,7 @@ def pytest_configure(config: pytest.Config) -> None:
     """
     # Register custom markers
     # Modify the block gas limit if specified.
-    if config.getoption("block_gas_limit"):
+    if option_was_explicitly_set(config, "--block-gas-limit"):
         EnvironmentDefaults.gas_limit = config.getoption("block_gas_limit")
 
     # Initialize fixture output configuration
@@ -818,9 +700,7 @@ def pytest_configure(config: pytest.Config) -> None:
     )
 
     # Initialize filling session
-    config.filling_session = FillingSession.from_config(  # type: ignore[attr-defined]
-        config
-    )
+    config.filling_session = FillingSession.from_config(config)  # type: ignore[attr-defined]
 
     if is_help_or_collectonly_mode(config):
         return
@@ -853,7 +733,7 @@ def pytest_configure(config: pytest.Config) -> None:
     if (
         not config.getoption("disable_html")
         and config.getoption("htmlpath") is None
-        and config.filling_session.phase_manager.current_phase  # type: ignore[attr-defined]
+        and config.filling_session.filling_phase  # type: ignore[attr-defined]
         != FixtureFillingPhase.PRE_ALLOC_GENERATION
     ):
         config.option.htmlpath = (
@@ -939,15 +819,16 @@ def pytest_configure(config: pytest.Config) -> None:
             TransitionToolCacheStats()
         )
 
+    # Default chain id can be overwritten by user flag or env var
+    ChainConfigDefaults.chain_id = DEFAULT_CHAIN_ID
     chain_id = config.getoption("chain_id")
-
     if chain_id is None:
         env_chain_id = os.environ.get("CHAIN_ID")
         if env_chain_id is not None:
             chain_id = int(env_chain_id)
 
     if chain_id is not None:
-        ChainConfigDefaults.chain_id = chain_id
+        ChainConfigDefaults.chain_id = int(chain_id)
 
 
 @pytest.hookimpl(trylast=True)
@@ -1031,7 +912,10 @@ def pytest_terminal_summary(
     if "passed" in stats and stats["passed"]:
         # Custom message for Phase 1 (pre-allocation group generation)
         session_instance: FillingSession = config.filling_session  # type: ignore[attr-defined]
-        if session_instance.phase_manager.is_pre_alloc_generation:
+        if (
+            session_instance.filling_phase
+            == FixtureFillingPhase.PRE_ALLOC_GENERATION
+        ):
             # Generate summary stats
             # For xdist, count files and accounts without fully loading groups
             # (avoids expensive state_root computation just for summary stats)
@@ -1617,7 +1501,7 @@ def base_test_parametrizer(cls: Type[BaseTest]) -> Any:
     def base_test_parametrizer_func(
         request: pytest.FixtureRequest,
         t8n: TransitionTool,
-        fork: Fork,
+        fork: Fork | TransitionFork,
         reference_spec: ReferenceSpec,
         pre: Alloc,
         output_dir: Path,
@@ -1699,7 +1583,10 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
 
                 pre_alloc_hash: str | None = None
                 # Phase 1: Generate pre-allocation groups
-                if session.phase_manager.is_pre_alloc_generation:
+                if (
+                    session.filling_phase
+                    == FixtureFillingPhase.PRE_ALLOC_GENERATION
+                ):
                     # Use the original update_pre_alloc_groups method which
                     # returns the groups
                     assert session.pre_alloc_group_builders is not None
@@ -1714,6 +1601,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
                         pre_alloc_hash=pre_alloc_hash,
                         test_id=test_id,
                         fork=fork,
+                        chain_id=ChainConfigDefaults.chain_id,
                         environment=genesis_environment,
                         pre=pre,
                     )
@@ -1758,6 +1646,11 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
                         )
                 assert fill_result is not None
                 fixture = fill_result.fixture
+                if (
+                    request.config.getoption("post_verifications")
+                    and fill_result.post_verifications is not None
+                ):
+                    fixture.post_verifications = fill_result.post_verifications
                 # If operation mode is benchmarking, check the gas used.
                 self.validate_benchmark_gas(
                     benchmark_gas_used=fill_result.benchmark_gas_used,
@@ -1786,13 +1679,21 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
                             fixture.post_state, group.pre
                         )
 
+                fill_metadata: Dict[str, Any] = {}
+                if t8n.opcode_count is not None:
+                    fill_metadata["opcode_count"] = (
+                        t8n.opcode_count.model_dump()
+                    )
+                if fill_result.metadata:
+                    fill_metadata.update(fill_result.metadata)
+
                 fixture.fill_info(
                     t8n.version(),
                     test_case_description,
                     fixture_source_url=fixture_source_url,
-                    opcode_count=t8n.opcode_count,
                     ref_spec=reference_spec,
                     _info_metadata=t8n._info_metadata,
+                    metadata=fill_metadata,
                 )
 
                 output_subdir = resolve_fixture_subfolder(
@@ -1891,7 +1792,7 @@ def pytest_collection_modifyitems(
         if not params or "fork" not in params or params["fork"] is None:
             items_for_removal.append(i)
             continue
-        fork: Fork = params["fork"]
+        fork: Fork | TransitionFork = params["fork"]
         spec_type, fixture_format = get_spec_format_for_item(params)
         if isinstance(fixture_format, NotSetType):
             items_for_removal.append(i)
@@ -1938,7 +1839,7 @@ def pytest_collection_modifyitems(
                 marker.name == "valid_at_transition_to" for marker in markers
             )
             if has_state_test and has_valid_transition:
-                base_fork = get_transition_fork_predecessor(fork)
+                base_fork = fork.transitions_from()
                 item._nodeid = item._nodeid.replace(
                     f"fork_{fork.name()}",
                     f"fork_{base_fork.name()}",
@@ -2127,7 +2028,10 @@ def _log_timing(msg: str) -> None:
     # Save pre-allocation groups after phase 1
     fixture_output: FixtureOutput = session.config.fixture_output  # type: ignore[attr-defined]
     session_instance: FillingSession = session.config.filling_session  # type: ignore[attr-defined]
-    if session_instance.phase_manager.is_pre_alloc_generation:
+    if (
+        session_instance.filling_phase
+        == FixtureFillingPhase.PRE_ALLOC_GENERATION
+    ):
         _log_timing("Phase 1: saving pre-alloc groups (partial)...")
         t0 = time.time()
         session_instance.save_pre_alloc_groups()
@@ -2220,7 +2124,8 @@ def _log_timing(msg: str) -> None:
     # indexes exist and merge_partial_indexes should not be called.
     if (
         session.config.getoption("generate_index")
-        and not session_instance.phase_manager.is_pre_alloc_generation
+        and not session_instance.filling_phase
+        == FixtureFillingPhase.PRE_ALLOC_GENERATION
     ):
         meta_dir = fixture_output.directory / ".meta"
         if meta_dir.exists() and any(meta_dir.glob("partial_index*.jsonl")):
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/gen_test_doc/gen_test_doc.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/gen_test_doc/gen_test_doc.py
index 216bc074228..f5eab27ac65 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/gen_test_doc/gen_test_doc.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/gen_test_doc/gen_test_doc.py
@@ -42,6 +42,7 @@
 import glob
 import logging
 import os
+import re
 import sys
 import textwrap
 from collections import defaultdict
@@ -53,7 +54,7 @@
 from jinja2 import Environment, FileSystemLoader, StrictUndefined
 from pytest import Item
 
-from execution_testing.forks import get_forks
+from execution_testing.forks import ALL_TRANSITION_FORKS, get_forks
 from execution_testing.specs import BaseTest
 from execution_testing.tools.utility.versioning import (
     generate_github_url,
@@ -251,6 +252,17 @@ def __init__(self, config: pytest.Config) -> None:
         self.deployed_forks = [
             fork.name() for fork in get_forks() if fork.is_deployed()
         ]
+        # Map each transition fork's name to the base fork it ends at so that
+        # cases parametrized as a transition fork (e.g.
+        # `BPO2ToAmsterdamAtTime15k`) count toward the fork they transition
+        # into (`Amsterdam`).
+        self._transition_to_base: Dict[str, str] = {
+            fork.name(): fork.transitions_to().name()
+            for fork in ALL_TRANSITION_FORKS
+        }
+        self._fork_newness: Dict[str, int] = {
+            fork.name(): i for i, fork in enumerate(get_forks())
+        }
         self._setup_logger()
         self.jinja2_env = Environment(
             loader=FileSystemLoader("docs/templates"),
@@ -266,6 +278,10 @@ def __init__(self, config: pytest.Config) -> None:
         # the complete set of pages and their properties
         self.page_props: PagePropsLookup = {}
 
+    def _base_fork(self, fork_name: str) -> str:
+        """Return the base fork name, resolving transition forks."""
+        return self._transition_to_base.get(fork_name, fork_name)
+
     @pytest.hookimpl(hookwrapper=True, trylast=True)
     def pytest_collection_modifyitems(
         self, config: pytest.Config, items: List[pytest.Item]
@@ -461,24 +477,36 @@ def create_function_page_props(
                 # valid_from marker, separated by a comma. Take the last.
                 valid_from_fork = valid_from_marker.args[0].split(",")[-1]
 
-            target_or_valid_fork = (
-                self.target_fork
-                if valid_from_fork in self.deployed_forks
-                else valid_from_fork
+            benchmark_dir = (
+                Path(items[0].config.rootpath) / "tests" / "benchmark"
             )
+            is_benchmark = benchmark_dir in Path(items[0].fspath).parents
             test_type = get_test_function_test_type(items[0])
 
-            test_case_count = len(
-                [
-                    case
-                    for case in test_cases
-                    if case.fork == target_or_valid_fork
-                    and case.fixture_type == test_type
-                ]
-            )
-
-            is_benchmark = items[0].get_closest_marker("benchmark") is not None
-            is_stateful = items[0].get_closest_marker("stateful") is not None
+            # Pick the displayed fork from the collected cases: the latest
+            # base fork any case is parametrized for, with transition forks
+            # resolved to the fork they transition into. Fall back to
+            # `valid_from_fork` when nothing was collected.
+            base_forks = {self._base_fork(case.fork) for case in test_cases}
+            if base_forks:
+                target_or_valid_fork = max(
+                    base_forks,
+                    key=lambda f: self._fork_newness.get(f, -1),
+                )
+            else:
+                target_or_valid_fork = valid_from_fork
+
+            # Count unique parametrizations at the displayed fork.
+            # `case.params` already excludes `fork` and the fixture-type key
+            # (see `skip_params` above), so a parametrization that produces
+            # several fixture formats (e.g. benchmark -> `blockchain_test`
+            # and `blockchain_test_engine`) collapses to a single case.
+            unique_params = {
+                tuple(sorted(case.params.items()))
+                for case in test_cases
+                if self._base_fork(case.fork) == target_or_valid_fork
+            }
+            test_case_count = len(unique_params)
 
             self.function_page_props[function_id] = FunctionPageProps(
                 title=get_test_function_name(items[0]),
@@ -497,7 +525,6 @@ def create_function_page_props(
                 html_static_page_target=f"./{get_test_function_name(items[0])}.html",
                 mkdocs_function_page_target=f"./{get_test_function_name(items[0])}/",
                 is_benchmark=is_benchmark,
-                is_stateful=is_stateful,
             )
 
     def create_module_page_props(self) -> None:
@@ -514,7 +541,6 @@ def create_module_page_props(self) -> None:
                         pytest_node_id=str(module_path),
                         package_name=get_import_path(module_path),
                         is_benchmark=function_page.is_benchmark,
-                        is_stateful=function_page.is_stateful,
                         test_functions=[
                             TestFunction(
                                 name=function_page.title,
@@ -531,8 +557,6 @@ def create_module_page_props(self) -> None:
                 ]
                 if function_page.is_benchmark:
                     existing_module_page.is_benchmark = True
-                if function_page.is_stateful:
-                    existing_module_page.is_stateful = True
                 existing_module_page.test_functions.append(
                     TestFunction(
                         name=function_page.title,
@@ -556,7 +580,12 @@ def add_directory_page_props(self) -> None:
                 Path(*module_path_parts[: i + 1])
                 for i in range(len(module_path_parts))
             )
+        benchmark_root = self.source_dir / "benchmark"
         for directory in sub_paths:
+            is_benchmark = (
+                directory == benchmark_root
+                or benchmark_root in directory.parents
+            )
             directory_fork_name = (
                 directory.relative_to(self.source_dir).parts[0].capitalize()
                 if directory != self.source_dir
@@ -566,20 +595,6 @@ def add_directory_page_props(self) -> None:
                 fork = self.target_fork
             else:
                 fork = directory_fork_name
-
-            is_benchmark = any(
-                module_page.is_benchmark
-                for module_page in self.module_page_props.values()
-                if directory in module_page.path.parents
-                or module_page.path.parent == directory
-            )
-            is_stateful = any(
-                module_page.is_stateful
-                for module_page in self.module_page_props.values()
-                if directory in module_page.path.parents
-                or module_page.path.parent == directory
-            )
-
             self.page_props[str(directory)] = DirectoryPageProps(
                 title=sanitize_string_title(str(directory.name)),
                 path=directory,
@@ -593,7 +608,6 @@ def add_directory_page_props(self) -> None:
                 # init.py will be used for docstrings
                 package_name=get_import_path(directory),
                 is_benchmark=is_benchmark,
-                is_stateful=is_stateful,
             )
 
     def find_files_within_collection_scope(
@@ -660,10 +674,19 @@ def update_mkdocs_nav(self) -> None:
         Add the generated 'Test Case Reference' entries to the mkdocs
         navigation menu.
         """
+
+        # Fork directories on disk are snake_case (e.g. `tangerine_whistle`)
+        # but `fork.name()` is CamelCase (`TangerineWhistle`).
+        def _dir_name(fork_name: str) -> str:
+            s1 = re.sub(r"(.)([A-Z][a-z]+)", r"\1_\2", fork_name)
+            return re.sub(r"([a-z0-9])([A-Z])", r"\1_\2", s1).lower()
+
         fork_order = {
-            fork.name().lower(): i
+            _dir_name(fork.name()): i
             for i, fork in enumerate(reversed(get_forks()))
         }
+        # Benchmark entries sort above all fork entries.
+        fork_order["benchmark"] = -1
 
         def sort_by_fork_deployment_and_path(x: PageProps) -> Tuple[Any, ...]:
             """
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/gen_test_doc/page_props.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/gen_test_doc/page_props.py
index c286b10a032..67589f32658 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/gen_test_doc/page_props.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/gen_test_doc/page_props.py
@@ -117,7 +117,6 @@ class PagePropsBase:
     pytest_node_id: str
     package_name: str
     is_benchmark: bool = False
-    is_stateful: bool = False
 
     @property
     @abstractmethod
@@ -232,6 +231,9 @@ def write_page(
         data-table that documents the parametrized test cases.
         """
         super().write_page(file_opener, jinja2_env)
+        # Standalone HTML pages temporarily disabled - they don't
+        # inherit the Material theme (see issue #1491).
+        return
         if not self.cases:
             return
         html_template = jinja2_env.get_template("function.html.j2")
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/pre_alloc.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/pre_alloc.py
index a2b9d5d6522..c3b76bf9d90 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/pre_alloc.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/pre_alloc.py
@@ -25,7 +25,7 @@
     NumberConvertible,
 )
 from execution_testing.fixtures import LabeledFixtureFormat
-from execution_testing.forks import Fork
+from execution_testing.forks import Fork, TransitionFork
 from execution_testing.specs import BaseTest
 from execution_testing.test_types import (
     DETERMINISTIC_FACTORY_ADDRESS,
@@ -38,6 +38,7 @@
 )
 from execution_testing.tools import Initcode
 
+from ..shared.execute_fill import stub_accounts_key, stub_eoas_key
 from ..shared.pre_alloc import Alloc as SharedAlloc
 from ..shared.pre_alloc import AllocFlags
 
@@ -48,9 +49,14 @@ def pytest_addoption(parser: pytest.Parser) -> None:
         "pre_alloc",
         "Arguments defining pre-allocation behavior during test filling.",
     )
-
-    # No options for now
-    del pre_alloc_group
+    # TODO: consolidate with execute/rpc/remote.py
+    pre_alloc_group.addoption(
+        "--rpc-endpoint",
+        action="store",
+        dest="rpc_endpoint",
+        default=None,
+        help="RPC endpoint to an execution client.",
+    )
 
 
 DELEGATION_DESIGNATION = b"\xef\x01\x00"
@@ -62,12 +68,27 @@ class Alloc(SharedAlloc):
 
     _eoa_fund_amount_default: int = PrivateAttr(10**21)
     _account_salt: Dict[Hash, int] = PrivateAttr(default_factory=dict)
+    _stub_accounts: Dict[str, Account] = PrivateAttr(default_factory=dict)
 
     def __init__(
-        self, *args: Any, fork: Fork, flags: AllocFlags, **kwargs: Any
+        self,
+        *args: Any,
+        fork: Fork,
+        flags: AllocFlags,
+        stub_accounts: Dict[str, Account] | None = None,
+        stub_eoas: Dict[str, EOA] | None = None,
+        **kwargs: Any,
     ) -> None:
         """Initialize the pre-alloc."""
-        super().__init__(*args, fork=fork, flags=flags, **kwargs)
+        super().__init__(
+            *args,
+            fork=fork,
+            flags=flags,
+            stub_eoas=stub_eoas,
+            **kwargs,
+        )
+        if stub_accounts is not None:
+            self._stub_accounts = stub_accounts
 
     def get_next_account_salt(self, account_hash: Hash) -> int:
         """Retrieve the next salt for this account."""
@@ -121,7 +142,7 @@ def modified_accounts_salt(self) -> int:
     def compute_pre_alloc_group_hash(
         self,
         *,
-        fork: Fork,
+        fork: Fork | TransitionFork,
         genesis_environment: Environment,
         group_salt: str | None,
     ) -> str:
@@ -165,21 +186,23 @@ def _deterministic_deploy_contract(
         if storage is None:
             storage = {}
         salt = Hash(salt)
+        # Everything is deployed at genesis, hence `transitions_from`
+        fork = self._fork.transitions_from()
         contract_address = compute_deterministic_create2_address(
-            salt=salt, initcode=initcode, fork=self._fork
+            salt=salt, initcode=initcode, fork=fork
         )
         if contract_address in self:
             raise ValueError(
                 f"contract address already in pre-alloc: {contract_address}"
             )
-        max_code_size = self._fork.max_code_size()
+        max_code_size = fork.max_code_size()
         if len(deploy_code) > max_code_size:
             raise ValueError(
                 f"code too large: {len(deploy_code)} > {max_code_size}"
             )
 
         fork_deterministic_factory_address = (
-            self._fork.deterministic_factory_predeploy_address()
+            fork.deterministic_factory_predeploy_address()
         )
         if (
             fork_deterministic_factory_address is None
@@ -230,28 +253,32 @@ def _deploy_contract(
         label: str | None,
         stub: str | None,
     ) -> Address:
-        """
-        Filler implementation of contract deployment.
-        """
-        del stub
-
-        if storage is None:
-            storage = {}
-        code = self.code_pre_processor(code)
-        code_bytes = (
-            bytes(code) if not isinstance(code, (bytes, str)) else code
-        )
-        max_code_size = self._fork.max_code_size()
-        assert len(code_bytes) <= max_code_size, (
-            f"code too large: {len(code_bytes)} > {max_code_size}"
-        )
+        """Filler implementation of contract deployment."""
+        if stub is not None:
+            if stub not in self._stub_accounts:
+                raise ValueError(
+                    f"Stub '{stub}' not found in address stubs. "
+                    "Provide --address-stubs with a mapping file."
+                )
+            account = self._stub_accounts[stub]
+        else:
+            if storage is None:
+                storage = {}
+            code = self.code_pre_processor(code)
+            code_bytes = (
+                bytes(code) if not isinstance(code, (bytes, str)) else code
+            )
+            max_code_size = self._fork.transitions_from().max_code_size()
+            assert len(code_bytes) <= max_code_size, (
+                f"code too large: {len(code_bytes)} > {max_code_size}"
+            )
 
-        account = Account(
-            nonce=nonce,
-            balance=balance,
-            code=code,
-            storage=storage,
-        )
+            account = Account(
+                nonce=nonce,
+                balance=balance,
+                code=code,
+                storage=storage,
+            )
 
         if address is not None:
             assert address not in self, (
@@ -449,11 +476,29 @@ def eoa_by_index(i: int) -> EOA:
     return EOA(key=TestPrivateKey + i if i != 1 else TestPrivateKey2, nonce=0)
 
 
+@pytest.fixture(scope="session")
+def stub_accounts(
+    request: pytest.FixtureRequest,
+) -> Dict[str, Account]:
+    """Return stub accounts pre-populated during configuration."""
+    return request.config.stash.get(stub_accounts_key, {})
+
+
+@pytest.fixture(scope="session")
+def stub_eoas(
+    request: pytest.FixtureRequest,
+) -> Dict[str, EOA]:
+    """Return stub EOAs pre-populated during configuration."""
+    return request.config.stash.get(stub_eoas_key, {})
+
+
 @pytest.fixture(scope="function")
 def pre(
     alloc_flags: AllocFlags,
     fork: Fork | None,
     request: pytest.FixtureRequest,
+    stub_accounts: Dict[str, Account],
+    stub_eoas: Dict[str, EOA],
 ) -> Alloc:
     """Return default pre allocation for all tests (Empty alloc)."""
     # FIXME: Static tests don't have a fork so we need to get it from the node.
@@ -465,4 +510,6 @@ def pre(
     return Alloc(
         flags=alloc_flags,
         fork=actual_fork,
+        stub_accounts=stub_accounts,
+        stub_eoas=stub_eoas,
     )
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/conftest.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/conftest.py
index 4c7920f5f6c..ea3bfada648 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/conftest.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/conftest.py
@@ -5,15 +5,20 @@
 import pytest
 
 
-@pytest.fixture
+@pytest.fixture(autouse=True)
 def restore_environment_defaults() -> Generator[None, None, None]:
     """
-    Restore EnvironmentDefaults.gas_limit after tests.
+    Reset EnvironmentDefaults.gas_limit around each test.
 
-    Restore the gas limit after the test run to prevent side effects.
+    Reset the gas limit to DEFAULT_BLOCK_GAS_LIMIT before and after each test
+    run to prevent side effects from nested in-process pytest sessions leaking
+    into later tests on the same worker.
     """
-    from execution_testing.test_types.block_types import EnvironmentDefaults
+    from execution_testing.test_types.block_types import (
+        DEFAULT_BLOCK_GAS_LIMIT,
+        EnvironmentDefaults,
+    )
 
-    original_gas_limit = EnvironmentDefaults.gas_limit
+    EnvironmentDefaults.gas_limit = DEFAULT_BLOCK_GAS_LIMIT
     yield
-    EnvironmentDefaults.gas_limit = original_gas_limit
+    EnvironmentDefaults.gas_limit = DEFAULT_BLOCK_GAS_LIMIT
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_benchmarking.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_benchmarking.py
index be73aa13da9..f611ccdb4d1 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_benchmarking.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_benchmarking.py
@@ -27,7 +27,6 @@
     from execution_testing import BenchmarkTestFiller, JumpLoopGenerator, Op
 
     @pytest.mark.valid_at("Prague")
-    @pytest.mark.benchmark
     def test_dummy_benchmark_test(benchmark_test: BenchmarkTestFiller) -> None:
         benchmark_test(
             target_opcode=Op.JUMPDEST,
@@ -42,7 +41,6 @@ def test_dummy_benchmark_test(benchmark_test: BenchmarkTestFiller) -> None:
     from execution_testing import BenchmarkTestFiller, JumpLoopGenerator, Op
 
     @pytest.mark.valid_at("Prague")
-    @pytest.mark.benchmark
     def test_dummy_no_benchmark_test(benchmark_test: BenchmarkTestFiller) -> None:
         benchmark_test(
             target_opcode=Op.JUMPDEST,
@@ -57,7 +55,6 @@ def test_dummy_no_benchmark_test(benchmark_test: BenchmarkTestFiller) -> None:
     from execution_testing import BenchmarkTestFiller, JumpLoopGenerator, Op
 
     @pytest.mark.valid_at("Prague")
-    @pytest.mark.benchmark
     @pytest.mark.repricing
     def test_benchmark_with_repricing(benchmark_test: BenchmarkTestFiller) -> None:
         benchmark_test(
@@ -66,7 +63,6 @@ def test_benchmark_with_repricing(benchmark_test: BenchmarkTestFiller) -> None:
         )
 
     @pytest.mark.valid_at("Prague")
-    @pytest.mark.benchmark
     def test_benchmark_without_repricing(benchmark_test: BenchmarkTestFiller) -> None:
         benchmark_test(
             target_opcode=Op.JUMPDEST,
@@ -81,14 +77,12 @@ def test_benchmark_without_repricing(benchmark_test: BenchmarkTestFiller) -> Non
     from execution_testing import BenchmarkTestFiller, JumpLoopGenerator, Op
 
     @pytest.mark.valid_at("Prague")
-    @pytest.mark.benchmark
     def test_with_gas_benchmark_value(state_test, gas_benchmark_value: int) -> None:
         # This test intentionally uses state_test instead of benchmark_test
         # to verify that --fixed-opcode-count filters it out
         state_test(pre={}, post={}, tx=None)
 
     @pytest.mark.valid_at("Prague")
-    @pytest.mark.benchmark
     def test_with_benchmark_test(benchmark_test: BenchmarkTestFiller) -> None:
         benchmark_test(
             target_opcode=Op.JUMPDEST,
@@ -103,7 +97,6 @@ def test_with_benchmark_test(benchmark_test: BenchmarkTestFiller) -> None:
     from execution_testing import BenchmarkTestFiller, JumpLoopGenerator, Op
 
     @pytest.mark.valid_at("Prague")
-    @pytest.mark.benchmark
     @pytest.mark.repricing(opcode=Op.ADD)
     @pytest.mark.parametrize("opcode", [Op.ADD, Op.SUB, Op.MUL])
     def test_parametrized_with_repricing_kwargs(
@@ -116,7 +109,6 @@ def test_parametrized_with_repricing_kwargs(
         )
 
     @pytest.mark.valid_at("Prague")
-    @pytest.mark.benchmark
     @pytest.mark.repricing
     @pytest.mark.parametrize("opcode", [Op.ADD, Op.SUB])
     def test_parametrized_with_repricing_no_kwargs(
@@ -222,7 +214,6 @@ def test_benchmark_gas_values_split_into_subdirs(
         )
 
         @pytest.mark.valid_at("Prague")
-        @pytest.mark.benchmark
         def test_dummy_benchmark_test(
             benchmark_test: BenchmarkTestFiller,
         ) -> None:
@@ -245,7 +236,7 @@ def test_dummy_benchmark_test(
         "--gas-benchmark-values",
         "1,2",
         "-m",
-        "benchmark and blockchain_test and not derived_test",
+        "blockchain_test and not derived_test",
         "--no-html",
         "--skip-index",
         f"--output={output_dir}",
@@ -326,7 +317,7 @@ def test_fixed_opcode_count_split_into_subdirs(
         "Prague",
         "--fixed-opcode-count=1,2",
         "-m",
-        "benchmark and blockchain_test and not derived_test",
+        "blockchain_test and not derived_test",
         "--no-html",
         "--skip-index",
         f"--output={output_dir}",
@@ -966,7 +957,6 @@ def test_fixed_opcode_count_config_file_parametrized(
     from execution_testing import BenchmarkTestFiller, JumpLoopGenerator, Op
 
     @pytest.mark.valid_at("Prague")
-    @pytest.mark.benchmark
     @pytest.mark.parametrize("size", [0, 32, 256, 1024])
     def test_parametrized_benchmark(
         benchmark_test: BenchmarkTestFiller, size: int
@@ -1147,7 +1137,9 @@ def test_consensus_fixtures_split_by_fork(
 
         @pytest.mark.valid_from("Prague")
         def test_fork_split_example(state_test, pre) -> None:
-            tx = Transaction(to=0, gas_limit=21_000, sender=pre.fund_eoa())
+            tx = Transaction(
+                to=0, gas_limit=21_000, sender=pre.fund_eoa()
+            ).with_signature_and_sender()
             state_test(pre=pre, post={}, tx=tx)
         """
     )
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_error_messages.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_error_messages.py
new file mode 100644
index 00000000000..92798394af0
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_error_messages.py
@@ -0,0 +1,70 @@
+"""Regression tests for fill error messages."""
+
+import textwrap
+from typing import Any
+
+invalid_fee_payment_test_module = textwrap.dedent(
+    """\
+    from execution_testing import Transaction
+
+
+    def test_invalid_fee_payment_error(state_test, pre) -> None:
+        tx = Transaction(
+            to=0,
+            gas_limit=21_000,
+            sender=pre.fund_eoa(),
+            gas_price=1,
+            max_fee_per_gas=2,
+        )
+        state_test(pre=pre, post={}, tx=tx)
+    """
+)
+
+
+def test_fill_reports_conflicting_fee_fields(
+    pytester: Any, capsys: Any, pytestconfig: Any
+) -> None:
+    """Test that fill surfaces the conflicting fee fields in failures."""
+    tests_dir = pytester.mkdir("tests")
+    berlin_tests_dir = tests_dir / "berlin"
+    berlin_tests_dir.mkdir()
+    fee_test_dir = berlin_tests_dir / "invalid_fee_payment_module"
+    fee_test_dir.mkdir()
+    test_module = fee_test_dir / "test_invalid_fee_payment_error.py"
+    test_module.write_text(invalid_fee_payment_test_module)
+
+    pytester.copy_example(
+        name="src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-fill.ini"
+    )
+
+    result = pytester.runpytest_subprocess(
+        "-c",
+        "pytest-fill.ini",
+        "--fork",
+        "Berlin",
+        "-m",
+        "state_test",
+        "--no-html",
+        "--output=stdout",
+        str(test_module.relative_to(pytester.path)),
+    )
+    # Suppress the expected inner pytest failure output from the outer test
+    # When using subprocess directly this would not be necessary
+    capsys.readouterr()
+
+    assert result.ret != 0, "Fill command was expected to fail"
+
+    output = "\n".join(result.outlines + result.errlines)
+    expected_message = (
+        "cannot mix fee fields in a single tx: "
+        "'gas_price' (legacy/type-1), 'max_fee_per_gas' (type-2+)"
+    )
+    assert expected_message in output
+
+    error_line = next(
+        line for line in output.splitlines() if expected_message in line
+    )
+    # show print but only when -s is passed
+    if pytestconfig.getoption("capture") == "no":
+        with capsys.disabled():
+            print(error_line)
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_filler.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_filler.py
index dc9c73dc2dc..73e97d70f62 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_filler.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_filler.py
@@ -6,8 +6,12 @@
 import json
 import os
 import textwrap
+from collections.abc import Generator
 from datetime import datetime
 from pathlib import Path
+from unittest.mock import patch
+
+from typing import Any
 
 import pytest
 
@@ -18,6 +22,11 @@
 )
 from ..filler import default_output_directory
 
+# Path to the real benchmark conftest.py that we copy into testdirs.
+BENCHMARK_CONFTEST_PATH = (
+    Path(__file__).resolve().parents[9] / "tests" / "benchmark" / "conftest.py"
+)
+
 
 # flake8: noqa
 def get_all_files_in_directory(base_dir: str) -> list[Path]:  # noqa: D103
@@ -85,6 +94,69 @@ def test_shanghai_two(state_test, x) -> None:
 total_test_count = test_count_paris + test_count_shanghai
 
 
+@pytest.fixture()
+def tests_dir(testdir: pytest.Testdir) -> Any:
+    """Create the top-level tests/ directory."""
+    return testdir.mkdir("tests")
+
+
+@pytest.fixture()
+def paris_tests_dir(tests_dir: Any) -> Any:
+    """Populate tests/paris/ with test_module_paris."""
+    paris_dir = tests_dir.mkdir("paris")
+    paris_dir.join("test_module_paris.py").write(test_module_paris)
+    return paris_dir
+
+
+@pytest.fixture()
+def benchmark_dir(tests_dir: Any) -> Any:
+    """Create tests/benchmark/ with conftest and test module."""
+    bm_dir = tests_dir.mkdir("benchmark")
+    bm_dir.join("conftest.py").write(BENCHMARK_CONFTEST_PATH.read_text())
+    bm_dir.join("test_module_benchmark.py").write(test_module_benchmark)
+    return bm_dir
+
+
+@pytest.fixture()
+def all_benchmark_dirs(benchmark_dir: Any) -> Any:
+    """Extend benchmark/ with compute/ and stateful/ subdirectories."""
+    for subdir in ("compute", "stateful"):
+        d = benchmark_dir.mkdir(subdir)
+        d.join(f"test_module_{subdir}.py").write(test_module_benchmark)
+    return benchmark_dir
+
+
+@pytest.fixture()
+def fill_base_args(testdir: pytest.Testdir) -> list[str]:
+    """Copy fill ini and return base pytest args."""
+    testdir.copy_example(
+        name=(
+            "src/execution_testing/cli/pytest_commands"
+            "/pytest_ini_files/pytest-fill.ini"
+        )
+    )
+    return ["-c", "pytest-fill.ini", "--no-html"]
+
+
+@pytest.fixture()
+def execute_base_args(testdir: pytest.Testdir) -> list[str]:
+    """Copy execute ini and return base pytest args."""
+    testdir.copy_example(
+        name=(
+            "src/execution_testing/cli/pytest_commands"
+            "/pytest_ini_files/pytest-execute.ini"
+        )
+    )
+    return [
+        "-c",
+        "pytest-execute.ini",
+        "--collect-only",
+        "-q",
+        "--chain-id",
+        "1",
+    ]
+
+
 @pytest.mark.parametrize(
     "args, expected_fixture_files, expected_fixture_counts",
     [
@@ -765,7 +837,9 @@ def test_fixture_output_based_on_command_line_args(
     def test_max_gas_limit(state_test, pre, block_gas_limit) -> None:
         env = Environment()
         assert block_gas_limit == {expected_gas_limit}
-        tx = Transaction(gas_limit=block_gas_limit, sender=pre.fund_eoa())
+        tx = Transaction(
+            gas_limit=block_gas_limit, sender=pre.fund_eoa()
+        ).with_signature_and_sender()
         state_test(env=env, pre=pre, post={{}}, tx=tx)
     """
 )
@@ -798,7 +872,6 @@ def test_max_gas_limit(state_test, pre, block_gas_limit) -> None:
         ),
     ],
 )
-@pytest.mark.usefixtures("restore_environment_defaults")
 def test_fill_variables(
     testdir: pytest.Testdir,
     args: list[str],
@@ -904,3 +977,329 @@ def test_fill_variables(
         assert "build" in properties
         build_name = args[args.index("--build-name") + 1]
         assert properties["build"] == build_name
+
+
+test_module_benchmark = textwrap.dedent(
+    """\
+    from execution_testing import Account, Environment, TestAddress, Transaction
+
+    def test_benchmark_one(state_test) -> None:
+        state_test(
+            env=Environment(),
+            pre={TestAddress: Account(balance=1_000_000)},
+            post={},
+            tx=Transaction(),
+        )
+    """
+)
+"""Simple benchmark module with no explicit markers (state_test fixture)."""
+
+test_module_benchmark_repricing = textwrap.dedent(
+    """\
+    import pytest
+
+    from execution_testing import BenchmarkTestFiller, JumpLoopGenerator, Op
+
+    @pytest.mark.repricing
+    def test_repricing_one(benchmark_test: BenchmarkTestFiller) -> None:
+        benchmark_test(
+            target_opcode=Op.JUMPDEST,
+            code_generator=JumpLoopGenerator(attack_block=Op.JUMPDEST),
+        )
+
+    def test_no_repricing(benchmark_test: BenchmarkTestFiller) -> None:
+        benchmark_test(
+            target_opcode=Op.JUMPDEST,
+            code_generator=JumpLoopGenerator(attack_block=Op.JUMPDEST),
+        )
+    """
+)
+"""Benchmark module with repricing and non-repricing tests
+(benchmark_test fixture, compatible with --fixed-opcode-count)."""
+
+
+# Fill: exclusion & collection
+
+
+@pytest.mark.usefixtures("paris_tests_dir", "benchmark_dir")
+def test_benchmark_excluded_from_default_fill(
+    testdir: pytest.Testdir,
+    fill_base_args: list[str],
+) -> None:
+    """Verify normal fill excludes tests under benchmark/."""
+    result = testdir.runpytest(*fill_base_args, "-v")
+    result.assert_outcomes(
+        passed=test_count_paris * 3,
+        failed=0,
+        skipped=0,
+        errors=0,
+    )
+
+
+@pytest.mark.usefixtures("paris_tests_dir", "benchmark_dir")
+def test_benchmark_not_collected_with_negated_repricing(
+    testdir: pytest.Testdir,
+    fill_base_args: list[str],
+) -> None:
+    """Verify ``-m 'not repricing'`` excludes benchmark tests."""
+    result = testdir.runpytest(
+        *fill_base_args, "--collect-only", "-q", "-m", "not repricing"
+    )
+    result.stdout.fnmatch_lines(["*test_paris_one*"])
+    result.stdout.fnmatch_lines(["*test_paris_two*"])
+    result.stdout.no_fnmatch_line("*test_benchmark_one*")
+
+
+@pytest.mark.usefixtures("all_benchmark_dirs")
+def test_benchmark_collected_when_targeted_directly(
+    testdir: pytest.Testdir,
+    fill_base_args: list[str],
+) -> None:
+    """Verify targeting tests/benchmark/ collects all subdirectories."""
+    result = testdir.runpytest(
+        *fill_base_args, "-v", "--fork", "Prague", "tests/benchmark"
+    )
+    # 3 modules * 1 test * 1 fork (Prague) * 3 formats = 9
+    result.assert_outcomes(
+        passed=9,
+        failed=0,
+        skipped=0,
+        errors=0,
+    )
+
+
+# Fill: default mode & fixture output
+
+
+@pytest.mark.usefixtures("benchmark_dir")
+def test_benchmark_default_uses_gas_benchmark_mode(
+    testdir: pytest.Testdir,
+    fill_base_args: list[str],
+) -> None:
+    """Verify the default mode produces fixtures under for_prague/."""
+    result = testdir.runpytest(
+        *fill_base_args, "-v", "--fork", "Prague", "tests/benchmark"
+    )
+    # 1 test * 1 fork (Prague) * 3 formats = 3
+    result.assert_outcomes(
+        passed=3,
+        failed=0,
+        skipped=0,
+        errors=0,
+    )
+
+    output_dir = Path(default_output_directory()).absolute()
+    assert output_dir.exists()
+
+    expected_fixture_files = [
+        Path(
+            "fixtures/blockchain_tests/for_prague/"
+            "benchmark/module_benchmark/benchmark_one.json"
+        ),
+        Path(
+            "fixtures/blockchain_tests_engine/for_prague/"
+            "benchmark/module_benchmark/benchmark_one.json"
+        ),
+        Path(
+            "fixtures/state_tests/for_prague/"
+            "benchmark/module_benchmark/benchmark_one.json"
+        ),
+    ]
+    for fixture_file in expected_fixture_files:
+        assert fixture_file.exists(), f"{fixture_file} does not exist"
+
+
+# Fill: subdir × benchmark-option × repricing matrix
+
+
+@pytest.mark.parametrize("subdir", ["compute", "stateful"])
+@pytest.mark.parametrize(
+    "benchmark_option,benchmark_value",
+    [
+        pytest.param(
+            "--gas-benchmark-values",
+            "1",
+            id="gas-benchmark-values",
+        ),
+        pytest.param(
+            "--fixed-opcode-count",
+            "1",
+            id="fixed-opcode-count",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "use_repricing",
+    [
+        pytest.param(True, id="repricing"),
+        pytest.param(False, id="no-repricing"),
+    ],
+)
+def test_benchmark_conftest_matrix(
+    testdir: pytest.Testdir,
+    benchmark_dir: Any,
+    fill_base_args: list[str],
+    subdir: str,
+    benchmark_option: str,
+    benchmark_value: str,
+    use_repricing: bool,
+) -> None:
+    """Verify collection across subdir, benchmark option, and repricing.
+
+    Dimensions (2 x 2 x 2 = 8 combinations):
+      - subdir:           compute | stateful
+      - benchmark option: --gas-benchmark-values | --fixed-opcode-count
+      - repricing:        -m repricing | (all tests)
+    """
+    target_dir = benchmark_dir.mkdir(subdir)
+    target_dir.join("test_module.py").write(test_module_benchmark_repricing)
+
+    args = [
+        *fill_base_args,
+        "--collect-only",
+        "-q",
+        benchmark_option,
+        benchmark_value,
+    ]
+    if use_repricing:
+        args.extend(["-m", "repricing"])
+    args.append(f"tests/benchmark/{subdir}")
+
+    result = testdir.runpytest(*args)
+
+    result.stdout.fnmatch_lines(["*test_repricing_one*"])
+    if use_repricing:
+        result.stdout.no_fnmatch_line("*test_no_repricing*")
+    else:
+        result.stdout.fnmatch_lines(["*test_no_repricing*"])
+
+
+# Execute: exclusion & collection
+
+
+@pytest.fixture()
+def _mock_execute_rpc(
+    monkeypatch: pytest.MonkeyPatch,
+) -> Generator[None, None, None]:
+    """Mock EthRPC so execute-mode tests can collect without a real endpoint."""
+    monkeypatch.setenv("RPC_ENDPOINT", "http://localhost:12345")
+    with patch(
+        "execution_testing.cli.pytest_commands.plugins.execute"
+        ".rpc.remote.EthRPC"
+    ) as mock_cls:
+        mock_cls.return_value.chain_id.return_value = 1
+        yield
+
+
+@pytest.mark.usefixtures(
+    "_mock_execute_rpc", "paris_tests_dir", "benchmark_dir"
+)
+def test_execute_benchmark_excluded_from_default_collection(
+    testdir: pytest.Testdir,
+    execute_base_args: list[str],
+) -> None:
+    """Verify default execute collection excludes benchmark/."""
+    result = testdir.runpytest(*execute_base_args)
+    result.stdout.fnmatch_lines(["*test_paris_one*"])
+    result.stdout.fnmatch_lines(["*test_paris_two*"])
+    result.stdout.no_fnmatch_line("*test_benchmark_one*")
+
+
+@pytest.mark.usefixtures(
+    "_mock_execute_rpc", "paris_tests_dir", "benchmark_dir"
+)
+def test_execute_benchmark_not_collected_with_negated_repricing(
+    testdir: pytest.Testdir,
+    execute_base_args: list[str],
+) -> None:
+    """Verify ``-m 'not repricing'`` excludes benchmark tests
+    in execute mode."""
+    result = testdir.runpytest(*execute_base_args, "-m", "not repricing")
+    result.stdout.fnmatch_lines(["*test_paris_one*"])
+    result.stdout.fnmatch_lines(["*test_paris_two*"])
+    result.stdout.no_fnmatch_line("*test_benchmark_one*")
+
+
+@pytest.mark.usefixtures("_mock_execute_rpc", "all_benchmark_dirs")
+def test_execute_benchmark_collected_when_targeted_directly(
+    testdir: pytest.Testdir,
+    execute_base_args: list[str],
+) -> None:
+    """Verify targeting tests/benchmark/ collects all subdirectories
+    in execute mode."""
+    result = testdir.runpytest(*execute_base_args, "tests/benchmark")
+    result.stdout.fnmatch_lines(["*test_module_benchmark*test_benchmark_one*"])
+    result.stdout.fnmatch_lines(["*test_module_compute*test_benchmark_one*"])
+    result.stdout.fnmatch_lines(["*test_module_stateful*test_benchmark_one*"])
+
+
+@pytest.mark.usefixtures("_mock_execute_rpc", "benchmark_dir")
+def test_execute_benchmark_default_collects_without_flags(
+    testdir: pytest.Testdir,
+    execute_base_args: list[str],
+) -> None:
+    """Verify benchmark tests are collected in execute mode without
+    explicit benchmark flags."""
+    result = testdir.runpytest(*execute_base_args, "tests/benchmark")
+    result.stdout.fnmatch_lines(["*test_benchmark_one*"])
+
+
+# Execute: subdir × benchmark-option × repricing matrix
+
+
+@pytest.mark.parametrize("subdir", ["compute", "stateful"])
+@pytest.mark.parametrize(
+    "benchmark_option,benchmark_value",
+    [
+        pytest.param(
+            "--gas-benchmark-values",
+            "1",
+            id="gas-benchmark-values",
+        ),
+        pytest.param(
+            "--fixed-opcode-count",
+            "1",
+            id="fixed-opcode-count",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "use_repricing",
+    [
+        pytest.param(True, id="repricing"),
+        pytest.param(False, id="no-repricing"),
+    ],
+)
+@pytest.mark.usefixtures("_mock_execute_rpc")
+def test_execute_benchmark_conftest_matrix(
+    testdir: pytest.Testdir,
+    benchmark_dir: Any,
+    execute_base_args: list[str],
+    subdir: str,
+    benchmark_option: str,
+    benchmark_value: str,
+    use_repricing: bool,
+) -> None:
+    """Verify collection across subdir, benchmark option, and repricing
+    in execute mode.
+
+    Dimensions (2 x 2 x 2 = 8 combinations):
+      - subdir:           compute | stateful
+      - benchmark option: --gas-benchmark-values | --fixed-opcode-count
+      - repricing:        -m repricing | (all tests)
+    """
+    target_dir = benchmark_dir.mkdir(subdir)
+    target_dir.join("test_module.py").write(test_module_benchmark_repricing)
+
+    args = [*execute_base_args, benchmark_option, benchmark_value]
+    if use_repricing:
+        args.extend(["-m", "repricing"])
+    args.append(f"tests/benchmark/{subdir}")
+
+    result = testdir.runpytest(*args)
+
+    result.stdout.fnmatch_lines(["*test_repricing_one*"])
+    if use_repricing:
+        result.stdout.no_fnmatch_line("*test_no_repricing*")
+    else:
+        result.stdout.fnmatch_lines(["*test_no_repricing*"])
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_filling_session.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_filling_session.py
index f74dff6da6d..beb9777ac5a 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_filling_session.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_filling_session.py
@@ -60,7 +60,7 @@ def test_init_normal_fill(self) -> None:
         ):
             session = FillingSession.from_config(config)  # type: ignore[arg-type]
 
-        assert session.phase_manager.is_single_phase_fill
+        assert session.filling_phase == FixtureFillingPhase.FILL
         assert session.pre_alloc_group_builders is None
 
     def test_init_pre_alloc_generation(self) -> None:
@@ -73,7 +73,9 @@ def test_init_pre_alloc_generation(self) -> None:
         ):
             session = FillingSession.from_config(config)  # type: ignore[arg-type]
 
-        assert session.phase_manager.is_pre_alloc_generation
+        assert (
+            session.filling_phase == FixtureFillingPhase.PRE_ALLOC_GENERATION
+        )
         assert session.pre_alloc_group_builders is not None
         assert len(session.pre_alloc_group_builders.root) == 0
 
@@ -104,7 +106,10 @@ def test_init_use_pre_alloc(self) -> None:
                 ):
                     session = FillingSession.from_config(config)  # type: ignore[arg-type]
 
-        assert session.phase_manager.is_fill_after_pre_alloc
+        assert (
+            session.filling_phase
+            == FixtureFillingPhase.FILL_AFTER_PRE_ALLOC_GENERATION
+        )
         assert session.pre_alloc_groups is mock_groups
 
     def test_init_use_pre_alloc_missing_folder(self) -> None:
@@ -134,7 +139,10 @@ def test_should_generate_format(self) -> None:
 
         # Mock fixture format
         class MockFormat:
-            format_phases = {FixtureFillingPhase.FILL}
+            format_phases = {
+                FixtureFillingPhase.FILL,
+                FixtureFillingPhase.FILL_AFTER_PRE_ALLOC_GENERATION,
+            }
 
         assert session.should_generate_format(MockFormat())  # type: ignore[arg-type]
 
@@ -158,7 +166,10 @@ def test_should_generate_format_with_generate_all(self) -> None:
 
         # Mock fixture format that normally wouldn't generate in phase 2
         class MockFormat:
-            format_phases = {FixtureFillingPhase.FILL}
+            format_phases = {
+                FixtureFillingPhase.FILL,
+                FixtureFillingPhase.FILL_AFTER_PRE_ALLOC_GENERATION,
+            }
 
         # Should generate because generate_all=True
         assert session.should_generate_format(MockFormat())  # type: ignore[arg-type]
@@ -225,57 +236,6 @@ def test_get_pre_alloc_group_not_initialized(self) -> None:
         ):
             session.get_pre_alloc_group("any_hash")
 
-    def test_update_pre_alloc_group(self) -> None:
-        """Test updating a pre-alloc group."""
-        config = MockConfig(generate_pre_alloc_groups=True)
-
-        with patch(
-            "execution_testing.cli.pytest_commands.plugins.filler.filler.FixtureOutput",
-            MockFixtureOutput,
-        ):
-            session = FillingSession.from_config(config)  # type: ignore[arg-type]
-
-        test_group_builder = PreAllocGroupBuilder(
-            pre=Alloc().model_dump(mode="json"),
-            environment=Environment()
-            .set_fork_requirements(Prague)
-            .model_dump(mode="json", exclude={"parent_hash"}),
-            fork=Prague.name(),
-        )
-        session.update_pre_alloc_group_builder("test_hash", test_group_builder)
-
-        assert session.pre_alloc_group_builders is not None
-        assert "test_hash" in session.pre_alloc_group_builders.root
-        assert (
-            session.pre_alloc_group_builders.root["test_hash"]
-            is test_group_builder
-        )
-
-    def test_update_pre_alloc_group_wrong_phase(self) -> None:
-        """Test updating pre-alloc group in wrong phase."""
-        config = MockConfig()  # Normal fill
-
-        with patch(
-            "execution_testing.cli.pytest_commands.plugins.filler.filler.FixtureOutput",
-            MockFixtureOutput,
-        ):
-            session = FillingSession.from_config(config)  # type: ignore[arg-type]
-
-        test_group_builder = PreAllocGroupBuilder(
-            pre=Alloc().model_dump(mode="json"),
-            environment=Environment()
-            .set_fork_requirements(Prague)
-            .model_dump(mode="json", exclude={"parent_hash"}),
-            fork=Prague.name(),
-        )
-        with pytest.raises(
-            ValueError,
-            match="Can only update pre-alloc groups in generation phase",
-        ):
-            session.update_pre_alloc_group_builder(
-                "test_hash", test_group_builder
-            )
-
     def test_save_pre_alloc_groups(self) -> None:
         """Test saving pre-alloc groups to disk."""
         config = MockConfig(generate_pre_alloc_groups=True)
@@ -286,17 +246,21 @@ def test_save_pre_alloc_groups(self) -> None:
         ):
             session = FillingSession.from_config(config)  # type: ignore[arg-type]
 
-        # Add a test group
-        test_group_builder = PreAllocGroupBuilder(
-            pre=Alloc().model_dump(mode="json"),
-            environment=Environment()
-            .set_fork_requirements(Prague)
-            .model_dump(mode="json", exclude={"parent_hash"}),
-            fork=Prague.name(),
+        # Seed a single group directly — production seeds via
+        # PreAllocGroupBuilders.add_test_pre from the per-test fill hook;
+        # here we only need a non-empty mapping for save_pre_alloc_groups
+        # to exercise its mkdir/to_folder path.
+        assert session.pre_alloc_group_builders is not None
+        session.pre_alloc_group_builders.root["test_hash"] = (
+            PreAllocGroupBuilder(
+                pre=Alloc().model_dump(mode="json"),
+                environment=Environment()
+                .set_fork_requirements(Prague)
+                .model_dump(mode="json", exclude={"parent_hash"}),
+                fork=Prague.name(),
+            )
         )
-        session.update_pre_alloc_group_builder("test_hash", test_group_builder)
 
-        # Mock file operations
         with patch.object(Path, "mkdir") as mock_mkdir:
             with patch.object(
                 PreAllocGroupBuilders, "to_folder"
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_format_selector.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_format_selector.py
deleted file mode 100644
index 2a2cd54e048..00000000000
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_format_selector.py
+++ /dev/null
@@ -1,308 +0,0 @@
-"""Unit tests for the FormatSelector class."""
-
-from typing import List, Set, Tuple
-
-from execution_testing.fixtures import (
-    BaseFixture,
-    FixtureFillingPhase,
-    LabeledFixtureFormat,
-)
-
-from ..filler import FormatSelector, PhaseManager
-
-
-class TestFormatSelector:
-    """Test cases for FormatSelector class."""
-
-    def test_init(self) -> None:
-        """Test basic initialization."""
-        phase_manager = PhaseManager(current_phase=FixtureFillingPhase.FILL)
-        format_selector = FormatSelector(
-            phase_manager=phase_manager, generate_all_formats=False
-        )
-        assert format_selector.phase_manager is phase_manager
-
-    def test_should_generate_pre_alloc_phase_with_pre_alloc_format(
-        self,
-    ) -> None:
-        """Test pre-alloc phase with format that supports pre-alloc."""
-        phase_manager = PhaseManager(
-            current_phase=FixtureFillingPhase.PRE_ALLOC_GENERATION
-        )
-        format_selector = FormatSelector(
-            phase_manager=phase_manager, generate_all_formats=False
-        )
-
-        # MySub = type("MySub", (BaseClass,), {"MY_CLASSVAR": 42})
-        format_with_pre_alloc = type(
-            "MockFixtureFormat",
-            (BaseFixture,),
-            {
-                "format_phases": {
-                    FixtureFillingPhase.PRE_ALLOC_GENERATION,
-                    FixtureFillingPhase.FILL,
-                }
-            },
-        )
-
-        assert format_selector.should_generate(format_with_pre_alloc)
-
-    def test_should_generate_pre_alloc_phase_without_pre_alloc_format(
-        self,
-    ) -> None:
-        """Test pre-alloc phase with format that doesn't support pre-alloc."""
-        phase_manager = PhaseManager(
-            current_phase=FixtureFillingPhase.PRE_ALLOC_GENERATION
-        )
-        format_selector = FormatSelector(
-            phase_manager=phase_manager, generate_all_formats=False
-        )
-
-        format_without_pre_alloc = type(
-            "MockFixtureFormat",
-            (BaseFixture,),
-            {"format_phases": {FixtureFillingPhase.FILL}},
-        )
-
-        assert not format_selector.should_generate(format_without_pre_alloc)
-
-    def test_should_generate_single_phase_fill_only_format(self) -> None:
-        """Test single-phase fill with fill-only format."""
-        phase_manager = PhaseManager(current_phase=FixtureFillingPhase.FILL)
-        format_selector = FormatSelector(
-            phase_manager=phase_manager, generate_all_formats=False
-        )
-
-        fill_only_format = type(
-            "MockFixtureFormat",
-            (BaseFixture,),
-            {"format_phases": {FixtureFillingPhase.FILL}},
-        )
-
-        assert format_selector.should_generate(fill_only_format)
-
-    def test_should_generate_single_phase_pre_alloc_format(self) -> None:
-        """Test single-phase fill with format that supports pre-alloc."""
-        phase_manager = PhaseManager(current_phase=FixtureFillingPhase.FILL)
-        format_selector = FormatSelector(
-            phase_manager=phase_manager, generate_all_formats=False
-        )
-
-        format_with_pre_alloc = type(
-            "MockFixtureFormat",
-            (BaseFixture,),
-            {
-                "format_phases": {
-                    FixtureFillingPhase.PRE_ALLOC_GENERATION,
-                    FixtureFillingPhase.FILL,
-                }
-            },
-        )
-
-        # Should not generate because it needs pre-alloc but we're in single
-        # phase
-        assert not format_selector.should_generate(format_with_pre_alloc)
-
-    def test_should_generate_phase2_with_pre_alloc_format(self) -> None:
-        """
-        Test phase 2 (after pre-alloc) with format that supports pre-alloc.
-        """
-        phase_manager = PhaseManager(
-            current_phase=FixtureFillingPhase.FILL,
-            previous_phases={FixtureFillingPhase.PRE_ALLOC_GENERATION},
-        )
-        format_selector = FormatSelector(
-            phase_manager=phase_manager, generate_all_formats=False
-        )
-
-        format_with_pre_alloc = type(
-            "MockFixtureFormat",
-            (BaseFixture,),
-            {
-                "format_phases": {
-                    FixtureFillingPhase.PRE_ALLOC_GENERATION,
-                    FixtureFillingPhase.FILL,
-                }
-            },
-        )
-
-        # Should generate in phase 2
-        assert format_selector.should_generate(format_with_pre_alloc)
-
-    def test_should_generate_phase2_without_pre_alloc_format(self) -> None:
-        """Test phase 2 (after pre-alloc) with fill-only format."""
-        phase_manager = PhaseManager(
-            current_phase=FixtureFillingPhase.FILL,
-            previous_phases={FixtureFillingPhase.PRE_ALLOC_GENERATION},
-        )
-        format_selector = FormatSelector(
-            phase_manager=phase_manager, generate_all_formats=False
-        )
-
-        fill_only_format = type(
-            "MockFixtureFormat",
-            (BaseFixture,),
-            {"format_phases": {FixtureFillingPhase.FILL}},
-        )
-
-        # Should not generate because it doesn't need pre-alloc
-        assert not format_selector.should_generate(fill_only_format)
-
-    def test_should_generate_phase2_with_generate_all(self) -> None:
-        """Test phase 2 with --generate-all-formats flag."""
-        phase_manager = PhaseManager(
-            current_phase=FixtureFillingPhase.FILL,
-            previous_phases={FixtureFillingPhase.PRE_ALLOC_GENERATION},
-        )
-        format_selector = FormatSelector(
-            phase_manager=phase_manager, generate_all_formats=True
-        )
-
-        fill_only_format = type(
-            "MockFixtureFormat",
-            (BaseFixture,),
-            {"format_phases": {FixtureFillingPhase.FILL}},
-        )
-        format_with_pre_alloc = type(
-            "MockFixtureFormat",
-            (BaseFixture,),
-            {
-                "format_phases": {
-                    FixtureFillingPhase.PRE_ALLOC_GENERATION,
-                    FixtureFillingPhase.FILL,
-                }
-            },
-        )
-
-        # With generate_all=True, both formats should be generated
-        assert format_selector.should_generate(fill_only_format)
-        assert format_selector.should_generate(format_with_pre_alloc)
-
-    def test_should_generate_labeled_format(self) -> None:
-        """Test with LabeledFixtureFormat wrapper."""
-        phase_manager = PhaseManager(current_phase=FixtureFillingPhase.FILL)
-        format_selector = FormatSelector(
-            phase_manager=phase_manager, generate_all_formats=False
-        )
-
-        fill_only_format = type(
-            "MockFixtureFormat",
-            (BaseFixture,),
-            {"format_phases": {FixtureFillingPhase.FILL}},
-        )
-        labeled_format = LabeledFixtureFormat(
-            fill_only_format,
-            "mock_labeled_format",
-            "A mock labeled fixture format",
-        )
-
-        assert format_selector.should_generate(labeled_format)
-
-    def test_comprehensive_scenarios(self) -> None:
-        """
-        Test comprehensive scenarios covering all phase and format
-        combinations.
-        """
-        # Test matrix: (current_phase, previous_phases, format_phases,
-        # generate_all) -> expected
-        test_cases: List[
-            Tuple[
-                FixtureFillingPhase,
-                Set[FixtureFillingPhase],
-                Set[FixtureFillingPhase],
-                bool,
-                bool,
-            ]
-        ] = [
-            # Pre-alloc generation phase
-            (
-                FixtureFillingPhase.PRE_ALLOC_GENERATION,
-                set(),
-                {
-                    FixtureFillingPhase.PRE_ALLOC_GENERATION,
-                    FixtureFillingPhase.FILL,
-                },
-                False,
-                True,
-            ),
-            (
-                FixtureFillingPhase.PRE_ALLOC_GENERATION,
-                set(),
-                {FixtureFillingPhase.FILL},
-                False,
-                False,
-            ),
-            # Single-phase fill
-            (
-                FixtureFillingPhase.FILL,
-                set(),
-                {FixtureFillingPhase.FILL},
-                False,
-                True,
-            ),
-            (
-                FixtureFillingPhase.FILL,
-                set(),
-                {
-                    FixtureFillingPhase.PRE_ALLOC_GENERATION,
-                    FixtureFillingPhase.FILL,
-                },
-                False,
-                False,
-            ),
-            # Phase 2 without generate_all
-            (
-                FixtureFillingPhase.FILL,
-                {FixtureFillingPhase.PRE_ALLOC_GENERATION},
-                {
-                    FixtureFillingPhase.PRE_ALLOC_GENERATION,
-                    FixtureFillingPhase.FILL,
-                },
-                False,
-                True,
-            ),
-            (
-                FixtureFillingPhase.FILL,
-                {FixtureFillingPhase.PRE_ALLOC_GENERATION},
-                {FixtureFillingPhase.FILL},
-                False,
-                False,
-            ),
-            # Phase 2 with generate_all
-            (
-                FixtureFillingPhase.FILL,
-                {FixtureFillingPhase.PRE_ALLOC_GENERATION},
-                {
-                    FixtureFillingPhase.PRE_ALLOC_GENERATION,
-                    FixtureFillingPhase.FILL,
-                },
-                True,
-                True,
-            ),
-            (
-                FixtureFillingPhase.FILL,
-                {FixtureFillingPhase.PRE_ALLOC_GENERATION},
-                {FixtureFillingPhase.FILL},
-                True,
-                True,
-            ),
-        ]
-
-        for current, previous, format_phases, gen_all, expected in test_cases:
-            phase_manager = PhaseManager(
-                current_phase=current, previous_phases=previous
-            )
-            format_selector = FormatSelector(
-                phase_manager=phase_manager, generate_all_formats=gen_all
-            )
-            fixture_format = type(
-                "MockFixtureFormat",
-                (BaseFixture,),
-                {"format_phases": format_phases},
-            )
-
-            result = format_selector.should_generate(fixture_format)
-            assert result == expected, (
-                f"Failed for phase={current}, previous={previous}, "
-                f"format_phases={format_phases}, generate_all={gen_all}"
-            )
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_generate_all_formats.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_generate_all_formats.py
index 21e7b268067..ea5a4f52007 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_generate_all_formats.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_generate_all_formats.py
@@ -54,22 +54,21 @@ def getoption(self, option: str) -> Any:
     assert fixture_output.output_path.name == "test"
 
 
-def test_tarball_output_auto_enables_generate_all_formats() -> None:
+def test_tarball_output_does_not_auto_enable_generate_all_formats() -> None:
     """
-    Test that tarball output (.tar.gz) automatically enables
-    should_generate_all_formats.
+    Test that tarball output (.tar.gz) alone does not enable
+    should_generate_all_formats; the flag must be set explicitly.
     """
 
-    # Mock pytest config object with tarball output
     class MockConfig:
         def getoption(self, option: str) -> Any:
             option_values = {
-                "output": "/tmp/fixtures.tar.gz",  # Tarball output
+                "output": "/tmp/fixtures.tar.gz",
                 "single_fixture_per_file": False,
                 "clean": False,
                 "generate_pre_alloc_groups": False,
                 "use_pre_alloc_groups": False,
-                "generate_all_formats": False,  # Explicitly False
+                "generate_all_formats": False,
             }
             return option_values.get(option, False)
 
@@ -78,27 +77,25 @@ def getoption(self, option: str) -> Any:
         config  # type: ignore
     )
 
-    # Should auto-enable should_generate_all_formats due to tarball output
-    assert fixture_output.should_generate_all_formats is True
+    assert fixture_output.should_generate_all_formats is False
     assert fixture_output.is_tarball is True
 
 
 def test_regular_output_does_not_auto_enable_generate_all_formats() -> None:
     """
-    Test that regular directory output doesn't auto-enable
-    should_generate_all_formats.
+    Test that regular directory output doesn't enable
+    should_generate_all_formats without the explicit flag.
     """
 
-    # Mock pytest config object with regular output
     class MockConfig:
         def getoption(self, option: str) -> Any:
             option_values = {
-                "output": "/tmp/fixtures",  # Regular directory output
+                "output": "/tmp/fixtures",
                 "single_fixture_per_file": False,
                 "clean": False,
                 "generate_pre_alloc_groups": False,
                 "use_pre_alloc_groups": False,
-                "generate_all_formats": False,  # Explicitly False
+                "generate_all_formats": False,
             }
             return option_values.get(option, False)
 
@@ -107,27 +104,25 @@ def getoption(self, option: str) -> Any:
         config  # type: ignore
     )
 
-    # Should remain False for regular directory output
     assert fixture_output.should_generate_all_formats is False
     assert fixture_output.is_tarball is False
 
 
-def test_explicit_generate_all_formats_overrides_tarball_auto_enable() -> None:
+def test_explicit_generate_all_formats_with_tarball() -> None:
     """
     Test that explicitly setting should_generate_all_formats=True works with
     tarball output.
     """
 
-    # Mock pytest config object with tarball output and explicit flag
     class MockConfig:
         def getoption(self, option: str) -> Any:
             option_values = {
-                "output": "/tmp/fixtures.tar.gz",  # Tarball output
+                "output": "/tmp/fixtures.tar.gz",
                 "single_fixture_per_file": False,
                 "clean": False,
                 "generate_pre_alloc_groups": False,
                 "use_pre_alloc_groups": False,
-                "generate_all_formats": True,  # Explicitly True
+                "generate_all_formats": True,
             }
             return option_values.get(option, False)
 
@@ -136,6 +131,5 @@ def getoption(self, option: str) -> Any:
         config  # type: ignore
     )
 
-    # Should be True (both explicitly set and auto-enabled)
     assert fixture_output.should_generate_all_formats is True
     assert fixture_output.is_tarball is True
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_include_benchmark.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_include_benchmark.py
new file mode 100644
index 00000000000..a856eb9633e
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_include_benchmark.py
@@ -0,0 +1,113 @@
+"""Test the --include-benchmark flag gates tests/benchmark/ collection."""
+
+import textwrap
+from pathlib import Path
+
+import pytest
+
+REAL_BENCHMARK_CONFTEST = (
+    Path(__file__).resolve().parents[9] / "tests" / "benchmark" / "conftest.py"
+)
+assert REAL_BENCHMARK_CONFTEST.is_file(), (
+    f"Expected real benchmark conftest at {REAL_BENCHMARK_CONFTEST}; the "
+    "repo layout likely changed and the parent traversal above is stale."
+)
+
+BENCHMARK_TEST_MODULE = textwrap.dedent(
+    """\
+    import pytest
+
+    from execution_testing import Environment
+
+    @pytest.mark.valid_at("Prague")
+    def test_dummy_benchmark(state_test) -> None:
+        state_test(env=Environment(), pre={}, post={}, tx=None)
+    """
+)
+
+CONSENSUS_TEST_MODULE = textwrap.dedent(
+    """\
+    import pytest
+
+    from execution_testing import Environment
+
+    @pytest.mark.valid_at("Prague")
+    def test_dummy_consensus(state_test) -> None:
+        state_test(env=Environment(), pre={}, post={}, tx=None)
+    """
+)
+
+
+def _setup_benchmark_and_consensus_tests(
+    pytester: pytest.Pytester,
+) -> None:
+    """Seed `tests/benchmark/` and `tests/prague/` test modules."""
+    tests_dir = pytester.mkdir("tests")
+
+    benchmark_dir = tests_dir / "benchmark"
+    benchmark_dir.mkdir()
+    (benchmark_dir / "conftest.py").write_text(
+        REAL_BENCHMARK_CONFTEST.read_text()
+    )
+    benchmark_module = benchmark_dir / "dummy_test_module"
+    benchmark_module.mkdir()
+    (benchmark_module / "test_dummy_benchmark.py").write_text(
+        BENCHMARK_TEST_MODULE
+    )
+
+    consensus_dir = tests_dir / "prague"
+    consensus_dir.mkdir()
+    consensus_module = consensus_dir / "dummy_test_module"
+    consensus_module.mkdir()
+    (consensus_module / "test_dummy_consensus.py").write_text(
+        CONSENSUS_TEST_MODULE
+    )
+
+    pytester.copy_example(
+        name="src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-fill.ini"
+    )
+
+
+def test_default_excludes_benchmark(pytester: pytest.Pytester) -> None:
+    """A plain `tests/` collection hides `tests/benchmark/`."""
+    _setup_benchmark_and_consensus_tests(pytester)
+
+    result = pytester.runpytest(
+        "-c",
+        "pytest-fill.ini",
+        "--fork",
+        "Prague",
+        "tests/",
+        "--collect-only",
+        "-q",
+    )
+
+    assert result.ret == 0, f"Collection failed:\n{result.outlines}"
+    assert any("test_dummy_consensus" in line for line in result.outlines)
+    assert not any(
+        "test_dummy_benchmark" in line for line in result.outlines
+    ), f"Benchmark should be hidden by default:\n{result.outlines}"
+
+
+def test_include_benchmark_flag_collects_both(
+    pytester: pytest.Pytester,
+) -> None:
+    """`--include-benchmark` forces `tests/benchmark/` into collection."""
+    _setup_benchmark_and_consensus_tests(pytester)
+
+    result = pytester.runpytest(
+        "-c",
+        "pytest-fill.ini",
+        "--fork",
+        "Prague",
+        "tests/",
+        "--include-benchmark",
+        "--collect-only",
+        "-q",
+    )
+
+    assert result.ret == 0, f"Collection failed:\n{result.outlines}"
+    assert any("test_dummy_consensus" in line for line in result.outlines)
+    assert any("test_dummy_benchmark" in line for line in result.outlines), (
+        f"Benchmark should be collected with the flag:\n{result.outlines}"
+    )
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_output_directory.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_output_directory.py
index e70e621fc9e..f818460f7ec 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_output_directory.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_output_directory.py
@@ -13,7 +13,9 @@
 MINIMAL_TEST_CONTENTS = """
 from execution_testing import  Transaction
 def test_function(state_test, pre) -> None:
-    tx = Transaction(to=0, gas_limit=21_000, sender=pre.fund_eoa())
+    tx = Transaction(
+        to=0, gas_limit=21_000, sender=pre.fund_eoa()
+    ).with_signature_and_sender()
     state_test(pre=pre, post={}, tx=tx)
 """
 
@@ -256,6 +258,51 @@ def test_fill_to_tarball_directory(
     )
 
 
+def test_fill_single_fork_range(
+    pytester: pytest.Pytester,
+    minimal_test_path: Path,
+    tmp_path_factory: TempPathFactory,
+) -> None:
+    """
+    Test ``--from=FORK --until=FORK`` produces fixtures for one fork.
+
+    Verify that setting both flags to the same fork (the pattern used by
+    split release runners) works for directory and tarball output.
+    """
+    pytester.copy_example(
+        name="src/execution_testing/cli/pytest_commands/"
+        "pytest_ini_files/pytest-fill.ini"
+    )
+    common_args = [
+        "-c",
+        "pytest-fill.ini",
+        "-m",
+        "(not blockchain_test_engine) and (not eip_version_check)",
+        "--from=Cancun",
+        "--until=Cancun",
+        str(minimal_test_path),
+    ]
+
+    # Directory output
+    dir_output = tmp_path_factory.mktemp("single_fork_dir")
+    result = pytester.runpytest(*common_args, f"--output={dir_output}")
+    assert result.ret == 0, f"Fill (dir) failed:\n{result.outlines}"
+    assert any(dir_output.glob("state_tests/**/*.json")), (
+        "No state_test fixtures created (dir)"
+    )
+
+    # Tarball output
+    tarball_dir = tmp_path_factory.mktemp("single_fork_tar")
+    tarball_path = tarball_dir / "fixtures.tar.gz"
+    result = pytester.runpytest(*common_args, f"--output={tarball_path}")
+    assert result.ret == 0, f"Fill (tarball) failed:\n{result.outlines}"
+    assert tarball_path.exists(), "Tarball was not created"
+    extracted = tarball_dir / "fixtures"
+    assert any(extracted.glob("state_tests/**/*.json")), (
+        "No state_test fixtures created (tarball)"
+    )
+
+
 # New tests for the is_master functionality
 def test_create_directories_skips_when_not_master() -> None:
     """
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_phase_manager.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_phase_manager.py
deleted file mode 100644
index dfe5c6cf0c6..00000000000
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_phase_manager.py
+++ /dev/null
@@ -1,212 +0,0 @@
-"""Unit tests for the PhaseManager class."""
-
-from typing import Any
-
-import pytest
-
-from execution_testing.fixtures import FixtureFillingPhase
-
-from ..filler import PhaseManager
-
-
-class MockConfig:
-    """Mock pytest config for testing."""
-
-    def __init__(
-        self,
-        generate_pre_alloc_groups: bool = False,
-        use_pre_alloc_groups: bool = False,
-        generate_all_formats: bool = False,
-    ) -> None:
-        """Initialize with flag values."""
-        self._options = {
-            "generate_pre_alloc_groups": generate_pre_alloc_groups,
-            "use_pre_alloc_groups": use_pre_alloc_groups,
-            "generate_all_formats": generate_all_formats,
-        }
-
-    def getoption(self, name: str, default: Any = None) -> Any:
-        """Mock getoption method."""
-        return self._options.get(name, default)
-
-
-class TestPhaseManager:
-    """Test cases for PhaseManager class."""
-
-    def test_init(self) -> None:
-        """Test basic initialization."""
-        phase_manager = PhaseManager(
-            current_phase=FixtureFillingPhase.FILL,
-            previous_phases={FixtureFillingPhase.PRE_ALLOC_GENERATION},
-        )
-        assert phase_manager.current_phase == FixtureFillingPhase.FILL
-        assert phase_manager.previous_phases == {
-            FixtureFillingPhase.PRE_ALLOC_GENERATION
-        }
-
-    def test_from_config_normal_fill(self) -> None:
-        """Test normal single-phase filling (no flags set)."""
-        config = MockConfig()
-        phase_manager = PhaseManager.from_config(
-            config  # type: ignore[arg-type]
-        )
-
-        assert phase_manager.current_phase == FixtureFillingPhase.FILL
-        assert phase_manager.previous_phases == set()
-        assert phase_manager.is_single_phase_fill
-        assert not phase_manager.is_pre_alloc_generation
-        assert not phase_manager.is_fill_after_pre_alloc
-
-    def test_from_config_generate_pre_alloc(self) -> None:
-        """Test phase 1: generate pre-allocation groups."""
-        config = MockConfig(generate_pre_alloc_groups=True)
-        phase_manager = PhaseManager.from_config(
-            config  # type: ignore[arg-type]
-        )
-
-        assert (
-            phase_manager.current_phase
-            == FixtureFillingPhase.PRE_ALLOC_GENERATION
-        )
-        assert phase_manager.previous_phases == set()
-        assert phase_manager.is_pre_alloc_generation
-        assert not phase_manager.is_single_phase_fill
-        assert not phase_manager.is_fill_after_pre_alloc
-
-    def test_from_config_use_pre_alloc(self) -> None:
-        """Test phase 2: use pre-allocation groups."""
-        config = MockConfig(use_pre_alloc_groups=True)
-        phase_manager = PhaseManager.from_config(
-            config  # type: ignore[arg-type]
-        )
-
-        assert phase_manager.current_phase == FixtureFillingPhase.FILL
-        assert phase_manager.previous_phases == {
-            FixtureFillingPhase.PRE_ALLOC_GENERATION
-        }
-        assert phase_manager.is_fill_after_pre_alloc
-        assert not phase_manager.is_pre_alloc_generation
-        assert not phase_manager.is_single_phase_fill
-
-    def test_from_config_generate_all_formats(self) -> None:
-        """Generate_all_formats should trigger PRE_ALLOC_GENERATION phase."""
-        config = MockConfig(generate_all_formats=True)
-        phase_manager = PhaseManager.from_config(
-            config  # type: ignore[arg-type]
-        )
-
-        assert (
-            phase_manager.current_phase
-            == FixtureFillingPhase.PRE_ALLOC_GENERATION
-        )
-        assert phase_manager.previous_phases == set()
-        assert phase_manager.is_pre_alloc_generation
-        assert not phase_manager.is_single_phase_fill
-        assert not phase_manager.is_fill_after_pre_alloc
-
-    def test_from_config_generate_all_and_pre_alloc(self) -> None:
-        """Test both generate_all_formats and generate_pre_alloc_groups set."""
-        config = MockConfig(
-            generate_pre_alloc_groups=True, generate_all_formats=True
-        )
-        phase_manager = PhaseManager.from_config(
-            config  # type: ignore[arg-type]
-        )
-
-        assert (
-            phase_manager.current_phase
-            == FixtureFillingPhase.PRE_ALLOC_GENERATION
-        )
-        assert phase_manager.previous_phases == set()
-        assert phase_manager.is_pre_alloc_generation
-
-    def test_from_config_use_pre_alloc_with_generate_all(self) -> None:
-        """Test phase 2 with generate_all_formats (passed by CLI)."""
-        config = MockConfig(
-            use_pre_alloc_groups=True, generate_all_formats=True
-        )
-        phase_manager = PhaseManager.from_config(
-            config  # type: ignore[arg-type]
-        )
-
-        # use_pre_alloc_groups takes precedence
-        assert phase_manager.current_phase == FixtureFillingPhase.FILL
-        assert phase_manager.previous_phases == {
-            FixtureFillingPhase.PRE_ALLOC_GENERATION
-        }
-        assert phase_manager.is_fill_after_pre_alloc
-
-    def test_all_flag_combinations(self) -> None:
-        """
-        Test all 8 possible flag combinations to ensure correct phase
-        determination.
-        """
-        test_cases = [
-            # (generate_pre_alloc, use_pre_alloc, generate_all) ->
-            # (current_phase, has_previous)
-            # Normal fill
-            (False, False, False, FixtureFillingPhase.FILL, False),
-            # Generate all triggers phase 1
-            (
-                False,
-                False,
-                True,
-                FixtureFillingPhase.PRE_ALLOC_GENERATION,
-                False,
-            ),
-            (False, True, False, FixtureFillingPhase.FILL, True),  # Phase 2
-            # Phase 2 with generate all
-            (False, True, True, FixtureFillingPhase.FILL, True),
-            (
-                True,
-                False,
-                False,
-                FixtureFillingPhase.PRE_ALLOC_GENERATION,
-                False,
-            ),  # Phase 1
-            # Phase 1 with generate all
-            (
-                True,
-                False,
-                True,
-                FixtureFillingPhase.PRE_ALLOC_GENERATION,
-                False,
-            ),
-            # Invalid but use_pre_alloc wins
-            (True, True, False, FixtureFillingPhase.FILL, True),
-            # Invalid but use_pre_alloc wins
-            (True, True, True, FixtureFillingPhase.FILL, True),
-        ]
-
-        for (
-            gen_pre,
-            use_pre,
-            gen_all,
-            expected_phase,
-            has_previous,
-        ) in test_cases:
-            config = MockConfig(
-                generate_pre_alloc_groups=gen_pre,
-                use_pre_alloc_groups=use_pre,
-                generate_all_formats=gen_all,
-            )
-            phase_manager = PhaseManager.from_config(
-                config  # type: ignore[arg-type]
-            )
-
-            assert phase_manager.current_phase == expected_phase, (
-                f"Failed for flags: generate_pre_alloc={gen_pre}, "
-                f"use_pre_alloc={use_pre}, generate_all={gen_all}"
-            )
-
-            if has_previous:
-                assert (
-                    FixtureFillingPhase.PRE_ALLOC_GENERATION
-                    in phase_manager.previous_phases
-                )
-            else:
-                assert phase_manager.previous_phases == set()
-
-
-if __name__ == "__main__":
-    pytest.main([__file__, "-v"])
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_prealloc_group.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_prealloc_group.py
index 736d6633860..ce5b86832af 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_prealloc_group.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_prealloc_group.py
@@ -44,7 +44,12 @@ def generate(self, *args: Any, **kwargs: Any) -> FillResult:
 
     def get_genesis_environment(self) -> Environment:
         """Return the genesis environment."""
-        return self.genesis_environment.set_fork_requirements(self.fork)
+        return self.genesis_environment.set_fork_requirements(
+            self.fork.fork_at(
+                block_number=self.genesis_environment.number,
+                timestamp=self.genesis_environment.timestamp,
+            )
+        )
 
 
 def test_pre_alloc_group_same() -> None:
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_slow_marker_pre_alloc.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_slow_marker_pre_alloc.py
index 0d45f4e7622..2198be38112 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_slow_marker_pre_alloc.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_slow_marker_pre_alloc.py
@@ -6,8 +6,7 @@
 
 def test_slow_marker_gets_pre_alloc_group(pytester: Any) -> None:
     """
-    Test that slow tests without benchmark marker get pre_alloc_group
-    automatically.
+    Test that slow tests get pre_alloc_group automatically.
     """
     test_module = textwrap.dedent(
         """\
@@ -52,7 +51,7 @@ def test_slow_without_benchmark(state_test: StateTestFiller, pre: Alloc) -> None
 
 def test_slow_with_benchmark_no_pre_alloc(pytester: Any) -> None:
     """
-    Test that slow tests WITH benchmark marker do NOT get pre_alloc_group.
+    Test that slow tests in benchmark dir do NOT get pre_alloc_group.
     """
     test_module = textwrap.dedent(
         """\
@@ -60,7 +59,6 @@ def test_slow_with_benchmark_no_pre_alloc(pytester: Any) -> None:
         from execution_testing import  Alloc, StateTestFiller, Transaction
 
         @pytest.mark.slow
-        @pytest.mark.benchmark
         @pytest.mark.valid_from("Cancun")
         def test_slow_with_benchmark(state_test: StateTestFiller, pre: Alloc) -> None:
             sender = pre.fund_eoa()
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_verify_traces.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_verify_traces.py
new file mode 100644
index 00000000000..d9a5e4bab03
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_verify_traces.py
@@ -0,0 +1,368 @@
+"""Tests for baseline trace loading from dump directories."""
+
+import json
+from pathlib import Path
+from typing import Any
+from unittest.mock import MagicMock
+
+from execution_testing.cli.pytest_commands.plugins.filler.verify_traces import (  # noqa: E501
+    TraceVerifier,
+    _load_traces_from_dump_dir,
+    pytest_testnodedown,
+)
+from execution_testing.client_clis.cli_types import (
+    Traces,
+)
+from execution_testing.client_clis.trace_comparators import (
+    TraceComparisonResult,
+    TraceDifference,
+    TransactionCountMismatch,
+)
+
+
+def _write_trace_file(
+    path: Path,
+    trace_lines: list[dict] | None = None,
+    output: str = "0x",
+    gas_used: str = "0x5208",
+) -> None:
+    """Write a minimal .jsonl trace file."""
+    if trace_lines is None:
+        trace_lines = [
+            {
+                "pc": 0,
+                "op": 96,
+                "gas": "0x5f5e100",
+                "gasCost": "0x3",
+                "memSize": 0,
+                "stack": [],
+                "depth": 1,
+                "refund": 0,
+                "opName": "PUSH1",
+            }
+        ]
+    path.parent.mkdir(parents=True, exist_ok=True)
+    with path.open("w") as f:
+        for line in trace_lines:
+            f.write(json.dumps(line) + "\n")
+        f.write(json.dumps({"output": output, "gasUsed": gas_used}) + "\n")
+
+
+class TestLoadTracesFromDumpDir:
+    """Test _load_traces_from_dump_dir."""
+
+    def test_empty_directory(self, tmp_path: Path) -> None:
+        """Empty directory returns empty list."""
+        result = _load_traces_from_dump_dir(tmp_path)
+        assert result == []
+
+    def test_single_call_dir_two_trace_files(self, tmp_path: Path) -> None:
+        """Single call dir with two trace files returns one Traces."""
+        call_dir = tmp_path / "0"
+        call_dir.mkdir()
+        _write_trace_file(call_dir / "trace-0-0xaaa.jsonl")
+        _write_trace_file(call_dir / "trace-1-0xbbb.jsonl")
+
+        result = _load_traces_from_dump_dir(tmp_path)
+        assert len(result) == 1
+        assert isinstance(result[0], Traces)
+        assert len(result[0].root) == 2
+
+    def test_multiple_call_dirs(self, tmp_path: Path) -> None:
+        """Multiple call dirs (0, 1, 2) return correctly ordered list."""
+        for i in range(3):
+            call_dir = tmp_path / str(i)
+            call_dir.mkdir()
+            _write_trace_file(call_dir / f"trace-0-0x{i:03x}.jsonl")
+
+        result = _load_traces_from_dump_dir(tmp_path)
+        assert len(result) == 3
+        for traces in result:
+            assert isinstance(traces, Traces)
+            assert len(traces.root) == 1
+
+    def test_non_numeric_subdirs_ignored(self, tmp_path: Path) -> None:
+        """Non-numeric subdirectories are ignored."""
+        (tmp_path / "0").mkdir()
+        _write_trace_file(tmp_path / "0" / "trace-0-0xaaa.jsonl")
+        (tmp_path / "metadata").mkdir()
+        (tmp_path / "metadata" / "info.json").write_text("{}")
+
+        result = _load_traces_from_dump_dir(tmp_path)
+        assert len(result) == 1
+
+    def test_numeric_sorting_not_lexical(self, tmp_path: Path) -> None:
+        """Call dirs are sorted numerically (2 before 10)."""
+        for i in [10, 2, 0]:
+            call_dir = tmp_path / str(i)
+            call_dir.mkdir()
+            _write_trace_file(call_dir / f"trace-0-0x{i:03x}.jsonl")
+
+        result = _load_traces_from_dump_dir(tmp_path)
+        assert len(result) == 3
+        # Verify they are in order 0, 2, 10 by checking the list
+        # length — ordering is guaranteed by the implementation
+
+
+def _make_trace_verifier(
+    json_formatter: Any = None,
+) -> TraceVerifier:
+    """Construct a minimally-configured TraceVerifier for unit tests."""
+    return TraceVerifier(
+        config=MagicMock(),
+        comparators=[],
+        formatter=MagicMock(),
+        baseline_dir=Path("/tmp/baseline"),
+        filler_path=Path("/tmp/filler"),
+        json_formatter=json_formatter,
+    )
+
+
+def _make_session(workeroutput: dict | None) -> Any:
+    """
+    Build a fake pytest.Session.
+
+    ``workeroutput=None`` simulates the controller (the attribute is
+    absent); a dict simulates a worker.
+    """
+    config = MagicMock()
+    if workeroutput is None:
+        # Controller — `workeroutput` must NOT exist on config.
+        del config.workeroutput
+    else:
+        config.workeroutput = workeroutput
+    session = MagicMock()
+    session.config = config
+    return session
+
+
+class TestXdistAggregation:
+    """
+    Test xdist worker→controller aggregation.
+
+    Background: ``TraceVerifier`` keeps results in an instance dict.
+    Under ``pytest-xdist -n N`` each worker has its own subprocess and
+    its own plugin instance, so the controller's instance is empty
+    unless workers explicitly forward their results. The plugin uses
+    ``config.workeroutput`` on workers and ``pytest_testnodedown`` on
+    the controller — these tests exercise that path without spinning
+    up real xdist subprocesses.
+    """
+
+    def test_worker_writes_results_to_workeroutput(self) -> None:
+        """Worker's pytest_sessionfinish stores results in workeroutput."""
+        verifier = _make_trace_verifier()
+        verifier.test_results = {
+            "test_a": {
+                "exact": TraceComparisonResult(equivalent=True),
+            },
+            "test_b": {
+                "exact": TraceComparisonResult(
+                    equivalent=False,
+                    differences=[
+                        TraceDifference(
+                            transaction_index=0,
+                            trace_line_index=3,
+                            baseline="ADD",
+                            current="MUL",
+                        ),
+                    ],
+                ),
+            },
+        }
+        workeroutput: dict = {}
+        verifier.pytest_sessionfinish(
+            _make_session(workeroutput=workeroutput), 0
+        )
+
+        payload = workeroutput["trace_verifier_results"]
+        assert set(payload.keys()) == {"test_a", "test_b"}
+        assert payload["test_a"]["exact"]["equivalent"] is True
+        assert payload["test_b"]["exact"]["equivalent"] is False
+        assert (
+            payload["test_b"]["exact"]["differences"][0]["baseline"] == "ADD"
+        )
+
+    def test_controller_does_not_write_workeroutput(self) -> None:
+        """On the controller (no workeroutput attribute), hook is a no-op."""
+        verifier = _make_trace_verifier()
+        verifier.test_results = {
+            "test_a": {"exact": TraceComparisonResult(equivalent=True)},
+        }
+        # Should not raise even though config has no `workeroutput`.
+        verifier.pytest_sessionfinish(_make_session(workeroutput=None), 0)
+
+    def test_worker_with_empty_results_does_not_write(self) -> None:
+        """A worker that ran no comparisons should not write a payload."""
+        verifier = _make_trace_verifier()
+        workeroutput: dict = {}
+        verifier.pytest_sessionfinish(
+            _make_session(workeroutput=workeroutput), 0
+        )
+        assert "trace_verifier_results" not in workeroutput
+
+    def test_pytest_testnodedown_merges_payload(self) -> None:
+        """Controller hook merges a worker's payload into the plugin."""
+        controller_plugin = _make_trace_verifier()
+
+        # Simulate the data a worker would send back.
+        worker_payload = {
+            "test_a": {
+                "exact": TraceComparisonResult(equivalent=True).model_dump(
+                    mode="json"
+                ),
+            },
+            "test_b": {
+                "exact-no-stack": TraceComparisonResult(
+                    equivalent=False,
+                    differences=[
+                        TransactionCountMismatch(
+                            baseline_count=2, current_count=1
+                        ),
+                    ],
+                ).model_dump(mode="json"),
+            },
+        }
+        node = MagicMock()
+        node.workeroutput = {"trace_verifier_results": worker_payload}
+        node.config.pluginmanager.get_plugin.return_value = controller_plugin
+
+        pytest_testnodedown(node, error=None)
+
+        assert set(controller_plugin.test_results.keys()) == {
+            "test_a",
+            "test_b",
+        }
+        assert (
+            controller_plugin.test_results["test_a"]["exact"].equivalent
+            is True
+        )
+        diff_b = controller_plugin.test_results["test_b"][
+            "exact-no-stack"
+        ].differences[0]
+        assert isinstance(diff_b, TransactionCountMismatch)
+        assert diff_b.baseline_count == 2
+        assert diff_b.current_count == 1
+
+    def test_pytest_testnodedown_multiple_workers_aggregate(self) -> None:
+        """Two workers' payloads both land in the controller plugin."""
+        controller_plugin = _make_trace_verifier()
+
+        def _send(node_results: dict[str, TraceComparisonResult]) -> None:
+            payload = {
+                nodeid: {"exact": result.model_dump(mode="json")}
+                for nodeid, result in node_results.items()
+            }
+            node = MagicMock()
+            node.workeroutput = {"trace_verifier_results": payload}
+            node.config.pluginmanager.get_plugin.return_value = (
+                controller_plugin
+            )
+            pytest_testnodedown(node, error=None)
+
+        _send(
+            {
+                "test_w0_a": TraceComparisonResult(equivalent=True),
+                "test_w0_b": TraceComparisonResult(equivalent=True),
+            }
+        )
+        _send(
+            {
+                "test_w1_a": TraceComparisonResult(equivalent=True),
+                "test_w1_b": TraceComparisonResult(equivalent=True),
+                "test_w1_c": TraceComparisonResult(equivalent=True),
+            }
+        )
+
+        # The bug being fixed: prior to aggregation, the controller saw
+        # only one worker's slice (or none). All five nodeids must be
+        # present after merging both workers.
+        assert set(controller_plugin.test_results.keys()) == {
+            "test_w0_a",
+            "test_w0_b",
+            "test_w1_a",
+            "test_w1_b",
+            "test_w1_c",
+        }
+
+    def test_pytest_testnodedown_no_payload_is_noop(self) -> None:
+        """Worker with no payload (didn't run any tests) is a no-op."""
+        controller_plugin = _make_trace_verifier()
+        node = MagicMock()
+        node.workeroutput = {}
+        node.config.pluginmanager.get_plugin.return_value = controller_plugin
+
+        pytest_testnodedown(node, error=None)
+
+        assert controller_plugin.test_results == {}
+
+    def test_pytest_testnodedown_no_plugin_registered(self) -> None:
+        """If the trace-verifier plugin isn't registered, hook is a no-op."""
+        node = MagicMock()
+        node.workeroutput = {
+            "trace_verifier_results": {
+                "test_a": {
+                    "exact": TraceComparisonResult(equivalent=True).model_dump(
+                        mode="json"
+                    ),
+                },
+            },
+        }
+        node.config.pluginmanager.get_plugin.return_value = None
+        # Should not raise.
+        pytest_testnodedown(node, error=None)
+
+
+class TestWorkerTerminalSummarySkipped:
+    """Workers must not write the JSON / text report."""
+
+    def test_worker_skips_terminal_summary(self) -> None:
+        """`pytest_terminal_summary` is a no-op when workerinput is set."""
+        json_formatter = MagicMock()
+        json_formatter.output_path = Path("/tmp/report.json")
+        verifier = _make_trace_verifier(json_formatter=json_formatter)
+        verifier.test_results = {
+            "test_a": {"exact": TraceComparisonResult(equivalent=True)},
+        }
+
+        terminalreporter = MagicMock()
+        worker_config = MagicMock()
+        # Workers have `workerinput`; controllers don't.
+        worker_config.workerinput = {"workerid": "gw0"}
+
+        verifier.pytest_terminal_summary(
+            terminalreporter, exitstatus=0, config=worker_config
+        )
+
+        json_formatter.write.assert_not_called()
+        terminalreporter.write_sep.assert_not_called()
+
+    def test_controller_writes_terminal_summary(self) -> None:
+        """Controller (no workerinput) writes the report normally."""
+        json_formatter = MagicMock()
+        json_formatter.output_path = Path("/tmp/report.json")
+        text_formatter = MagicMock()
+        text_formatter.format_summary.return_value = "summary line"
+        verifier = TraceVerifier(
+            config=MagicMock(),
+            comparators=[],
+            formatter=text_formatter,
+            baseline_dir=Path("/tmp/baseline"),
+            filler_path=Path("/tmp/filler"),
+            json_formatter=json_formatter,
+        )
+        verifier.test_results = {
+            "test_a": {"exact": TraceComparisonResult(equivalent=True)},
+        }
+
+        terminalreporter = MagicMock()
+        controller_config = MagicMock()
+        # Controllers don't have `workerinput`.
+        del controller_config.workerinput
+
+        verifier.pytest_terminal_summary(
+            terminalreporter, exitstatus=0, config=controller_config
+        )
+
+        json_formatter.write.assert_called_once_with(verifier.test_results)
+        terminalreporter.write_sep.assert_called()
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/verify_traces.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/verify_traces.py
new file mode 100644
index 00000000000..2608182d044
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/verify_traces.py
@@ -0,0 +1,353 @@
+"""Pytest plugin for trace verification against a baseline."""
+
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Any, Generator, Protocol
+
+import pytest
+from _pytest.terminal import TerminalReporter
+
+from execution_testing.cli.pytest_commands.plugins.filler.filler import (
+    node_to_test_info,
+)
+from execution_testing.client_clis.cli_types import (
+    Traces,
+    TransactionTraces,
+)
+from execution_testing.client_clis.trace_comparators import (
+    TraceComparator,
+    TraceComparatorType,
+    TraceComparisonResult,
+    create_comparator,
+)
+from execution_testing.client_clis.trace_report_formatter import (
+    JsonTracesDiffReportFormatter,
+    TextTracesDiffReportFormatter,
+    TracesDiffReportFormatter,
+)
+
+
+class _XdistWorkerNode(Protocol):
+    """
+    Subset of ``xdist.workermanage.WorkerController`` we depend on.
+
+    Defined here as a Protocol because ``xdist`` ships without a
+    ``py.typed`` marker, so importing its concrete class would force a
+    ``# type: ignore`` on every consumer. We only need ``workeroutput``
+    (the worker→controller dict) and ``config.pluginmanager``.
+    """
+
+    workeroutput: dict[str, Any]
+    config: pytest.Config
+
+
+# ---------------------------------------------------------------------------
+# Baseline loading
+# ---------------------------------------------------------------------------
+
+
+def _load_traces_from_dump_dir(dump_dir: Path) -> list[Traces]:
+    """Load traces from numbered call subdirectories."""
+    traces_list: list[Traces] = []
+    call_dirs = sorted(
+        (d for d in dump_dir.iterdir() if d.is_dir() and d.name.isdigit()),
+        key=lambda d: int(d.name),
+    )
+    for call_dir in call_dirs:
+        traces = Traces(root=[])
+        trace_files = sorted(call_dir.glob("trace-*.jsonl"))
+        for trace_file in trace_files:
+            traces.append(TransactionTraces.from_file(trace_file))
+        traces_list.append(traces)
+    return traces_list
+
+
+# ---------------------------------------------------------------------------
+# CLI flags
+# ---------------------------------------------------------------------------
+
+
+def pytest_addoption(parser: pytest.Parser) -> None:
+    """Register --verify-traces and --verify-traces-comparator."""
+    group = parser.getgroup("verify_traces", "Trace verification options")
+    group.addoption(
+        "--verify-traces",
+        action="store",
+        dest="verify_traces_dir",
+        type=Path,
+        default=None,
+        help=(
+            "Baseline trace dump directory. "
+            "Compares current traces against baseline. "
+            "Implies --traces."
+        ),
+    )
+    all_comparators = ",".join(c.value for c in TraceComparatorType)
+    group.addoption(
+        "--verify-traces-comparator",
+        action="store",
+        dest="verify_traces_comparator",
+        type=str,
+        default=all_comparators,
+        help=(
+            "Comma-separated comparator names. "
+            f"Choices: {all_comparators}. "
+            f"Default: {all_comparators}."
+        ),
+    )
+    group.addoption(
+        "--verify-traces-json",
+        action="store",
+        dest="verify_traces_json",
+        type=Path,
+        default=None,
+        help="Write the trace verification report to a JSON file.",
+    )
+
+
+# ---------------------------------------------------------------------------
+# Plugin registration
+# ---------------------------------------------------------------------------
+
+
+@pytest.hookimpl(tryfirst=True)
+def pytest_configure(config: pytest.Config) -> None:
+    """Register the TraceVerifier plugin if --verify-traces is set."""
+    verify_traces_dir = config.getoption("verify_traces_dir", None)
+    if verify_traces_dir is None:
+        return
+
+    config.collect_traces = True  # type: ignore[attr-defined]
+    config.option.evm_collect_traces = True
+
+    comparator_names = config.getoption("verify_traces_comparator").split(",")
+    comparators = [
+        create_comparator(TraceComparatorType(name.strip()))
+        for name in comparator_names
+    ]
+
+    formatter = TextTracesDiffReportFormatter()
+
+    json_path = config.getoption("verify_traces_json", None)
+    json_formatter = (
+        JsonTracesDiffReportFormatter(Path(json_path))
+        if json_path is not None
+        else None
+    )
+
+    filler_path = Path(config.getoption("filler_path"))
+
+    config.pluginmanager.register(
+        TraceVerifier(
+            config=config,
+            comparators=comparators,
+            formatter=formatter,
+            json_formatter=json_formatter,
+            baseline_dir=Path(verify_traces_dir),
+            filler_path=filler_path,
+        ),
+        "trace-verifier",
+    )
+
+
+# ---------------------------------------------------------------------------
+# Plugin class
+# ---------------------------------------------------------------------------
+
+
+class TraceVerifier:
+    """Pytest plugin for trace verification against a baseline."""
+
+    def __init__(
+        self,
+        config: pytest.Config,
+        comparators: list[TraceComparator],
+        formatter: TracesDiffReportFormatter,
+        baseline_dir: Path,
+        filler_path: Path,
+        json_formatter: JsonTracesDiffReportFormatter | None = None,
+    ) -> None:
+        """Initialize with comparators, formatter, and baseline path."""
+        self.config = config
+        self.comparators = comparators
+        self.formatter = formatter
+        self.json_formatter = json_formatter
+        self.baseline_dir = baseline_dir
+        self.filler_path = filler_path
+        self.test_results: dict[str, dict[str, TraceComparisonResult]] = {}
+
+    @pytest.hookimpl(hookwrapper=True)
+    def pytest_runtest_makereport(
+        self, item: pytest.Item, call: pytest.CallInfo[None]
+    ) -> Generator[None, Any, None]:
+        """Collect trace diffs after each test's call phase."""
+        outcome = yield
+        report = outcome.get_result()
+
+        if call.when != "call" or report.failed:
+            return
+
+        t8n = getattr(item.config, "t8n", None)
+        if t8n is None:
+            return
+
+        current_traces_list = t8n.get_traces()
+        if current_traces_list is None:
+            return
+
+        test_info = node_to_test_info(item)
+        baseline_dump_dir = test_info.get_dump_dir_path(
+            self.baseline_dir,
+            self.filler_path,
+            level="test_parameter",
+        )
+        if baseline_dump_dir is None or not baseline_dump_dir.exists():
+            return
+
+        baseline_traces_list = _load_traces_from_dump_dir(baseline_dump_dir)
+
+        if not current_traces_list:
+            return  # No traces collected (e.g. t8n cache hit)
+
+        # Compare each pair of Traces objects (one per t8n call).
+        # Run "exact" last and skip it if any other comparator failed,
+        # since exact is strictly stricter than the others.
+        exact_comparator = None
+        other_comparators = []
+        for c in self.comparators:
+            if c.name == TraceComparatorType.EXACT:
+                exact_comparator = c
+            else:
+                other_comparators.append(c)
+
+        results: dict[str, TraceComparisonResult] = {}
+        any_failed = False
+        for comparator in other_comparators:
+            all_diffs = []
+            all_equivalent = True
+            for baseline, current in zip(
+                baseline_traces_list, current_traces_list, strict=False
+            ):
+                result = comparator.compare_traces(baseline, current)
+                all_diffs.extend(result.differences)
+                if not result.equivalent:
+                    all_equivalent = False
+            results[comparator.name] = TraceComparisonResult(
+                equivalent=all_equivalent,
+                differences=all_diffs,
+            )
+            if not all_equivalent:
+                any_failed = True
+
+        if exact_comparator is not None and not any_failed:
+            all_diffs = []
+            all_equivalent = True
+            for baseline, current in zip(
+                baseline_traces_list,
+                current_traces_list,
+                strict=False,
+            ):
+                result = exact_comparator.compare_traces(baseline, current)
+                all_diffs.extend(result.differences)
+                if not result.equivalent:
+                    all_equivalent = False
+            results[exact_comparator.name] = TraceComparisonResult(
+                equivalent=all_equivalent,
+                differences=all_diffs,
+            )
+
+        if results:
+            self.test_results[item.nodeid] = results
+
+    @pytest.hookimpl
+    def pytest_sessionfinish(
+        self,
+        session: pytest.Session,
+        exitstatus: int,  # noqa: ARG002
+    ) -> None:
+        """
+        Forward results from each xdist worker to the controller.
+
+        Each xdist worker runs in its own subprocess with its own
+        ``TraceVerifier`` instance, so ``self.test_results`` only holds
+        the tests that *this* worker ran. Without this hook the
+        controller's plugin instance would receive nothing and the
+        terminal/JSON report would only reflect a single worker's slice
+        of the data.
+
+        ``config.workeroutput`` is xdist's documented channel for
+        marshalling per-worker state back to the controller, where it is
+        consumed by the module-level ``pytest_testnodedown`` hook below.
+        Only workers have ``workeroutput``; on the controller this hook
+        is a no-op.
+        """
+        config = session.config
+        if not hasattr(config, "workeroutput"):
+            return
+        if not self.test_results:
+            return
+        config.workeroutput["trace_verifier_results"] = {
+            nodeid: {
+                comp_name: result.model_dump(mode="json")
+                for comp_name, result in comps.items()
+            }
+            for nodeid, comps in self.test_results.items()
+        }
+
+    def pytest_terminal_summary(
+        self,
+        terminalreporter: TerminalReporter,
+        exitstatus: int,  # noqa: ARG002
+        config: pytest.Config,
+    ) -> None:
+        """Print the aggregated trace verification report."""
+        # Workers run their own terminal summary, but the aggregated
+        # view only exists on the controller. Skip on workers so they
+        # neither print a partial summary nor race to overwrite the
+        # JSON file.
+        if hasattr(config, "workerinput"):
+            return
+
+        if not self.test_results:
+            return
+
+        output = self.formatter.format_summary(self.test_results)
+        terminalreporter.write_sep("=", "trace verification report")
+        for line in output.splitlines():
+            terminalreporter.write_line(line)
+
+        if self.json_formatter is not None:
+            self.json_formatter.write(self.test_results)
+            terminalreporter.write_line(
+                f"JSON report written to: {self.json_formatter.output_path}"
+            )
+
+
+# ---------------------------------------------------------------------------
+# xdist controller-side aggregation
+# ---------------------------------------------------------------------------
+
+
+def pytest_testnodedown(node: _XdistWorkerNode, error: object | None) -> None:
+    """
+    Merge one worker's trace verification results into the controller.
+
+    Called on the controller (master) when each xdist worker finishes.
+    The worker has serialized its ``test_results`` into
+    ``node.workeroutput`` (see ``TraceVerifier.pytest_sessionfinish``);
+    here we deserialize and merge them into the controller-side plugin
+    instance so ``pytest_terminal_summary`` sees the combined view.
+    """
+    del error
+    payload = getattr(node, "workeroutput", {}).get("trace_verifier_results")
+    if not payload:
+        return
+    plugin = node.config.pluginmanager.get_plugin("trace-verifier")
+    if plugin is None:
+        return
+    for nodeid, comps in payload.items():
+        plugin.test_results[nodeid] = {
+            comp_name: TraceComparisonResult.model_validate(result_dict)
+            for comp_name, result_dict in comps.items()
+        }
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/forks.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/forks.py
index fb9a38a289b..f11ce4c1993 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/forks.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/forks.py
@@ -29,8 +29,10 @@
     ALL_FORKS,
     ALL_FORKS_WITH_TRANSITIONS,
     Fork,
+    ForkEIPSetAdapter,
     ForkSetAdapter,
     InvalidForkError,
+    TransitionFork,
     get_deployed_forks,
     get_selected_fork_set,
     get_transition_forks,
@@ -89,14 +91,14 @@ class ForkCovariantParameter:
 class ForkParametrizer:
     """A parametrizer for a test case that is parametrized by the fork."""
 
-    fork: Fork
+    fork: Fork | TransitionFork
     fork_covariant_parameters: List[ForkCovariantParameter] = field(
         default_factory=list
     )
 
     def __init__(
         self,
-        fork: Fork,
+        fork: Fork | TransitionFork,
         marks: List[pytest.MarkDecorator | pytest.Mark] | None = None,
         fork_covariant_parameters: List[ForkCovariantParameter] | None = None,
     ):
@@ -175,7 +177,9 @@ class CovariantDescriptor:
     """
 
     argnames: List[str] = []
-    fn: Callable[[Fork], List[Any] | Iterable[Any]] | None = None
+    fn: Callable[[Fork | TransitionFork], List[Any] | Iterable[Any]] | None = (
+        None
+    )
 
     selector: Callable[..., bool] | None = None
     marks: (
@@ -188,7 +192,8 @@ class CovariantDescriptor:
     def __init__(
         self,
         argnames: List[str] | str,
-        fn: Callable[[Fork], List[Any] | Iterable[Any]] | None = None,
+        fn: Callable[[Fork | TransitionFork], List[Any] | Iterable[Any]]
+        | None = None,
         *,
         selector: Callable[..., bool] | None = None,
         marks: None
@@ -346,10 +351,10 @@ def __init__(self, metafunc: Metafunc):
                 f"Unknown arguments to {self.marker_name}: {kwargs}"
             )
 
-        def fn(fork: Fork) -> List[Any]:
-            return getattr(fork, self.fork_attribute_name)(
-                block_number=0, timestamp=0
-            )
+        def fn(fork: Fork | TransitionFork) -> List[Any]:
+            if fork.is_transition_fork:
+                raise ValueError(f"Transition forks are not supported: {fork}")
+            return getattr(fork, self.fork_attribute_name)()
 
         super().__init__(
             argnames=self.marker_parameter_names,
@@ -448,6 +453,15 @@ def covariant_decorator(
         fork_attribute_name="system_contracts",
         argnames=["system_contract"],
     ),
+    covariant_decorator(
+        marker_name="with_all_refund_types",
+        description=(
+            "marks a test to be parametrized for all refund types at "
+            "parameter named refund_type"
+        ),
+        fork_attribute_name="refund_types",
+        argnames=["refund_type"],
+    ),
 ]
 
 
@@ -473,7 +487,25 @@ def pytest_configure(config: pytest.Config) -> None:
     )
     config.addinivalue_line(
         "markers",
-        "valid_until(fork): specifies until which fork a test case is valid",
+        (
+            "valid_until(fork): specifies until which fork a test "
+            "case is valid (inclusive)"
+        ),
+    )
+    config.addinivalue_line(
+        "markers",
+        (
+            "valid_before(fork_or_eip): specifies the fork or EIP "
+            "before which a test case is valid (exclusive)"
+        ),
+    )
+    config.addinivalue_line(
+        "markers",
+        (
+            "not_valid_for(*forks, subsequent_forks=False): subtracts "
+            "the given forks (optionally and all after them) from the "
+            "test case's valid fork set"
+        ),
     )
     config.addinivalue_line(
         "markers",
@@ -487,6 +519,17 @@ def pytest_configure(config: pytest.Config) -> None:
             "function values_fn(fork)"
         ),
     )
+    config.addinivalue_line(
+        "markers",
+        (
+            "filter_combinations(predicate, *, reason): deselect "
+            "parametrized test cases whose parameter combination does not "
+            "satisfy predicate. The predicate receives parameter values as "
+            "keyword arguments and must return True to keep the "
+            "combination. *reason* is a short human-readable explanation "
+            "shown in verbose collection output."
+        ),
+    )
     for d in fork_covariant_decorators:
         config.addinivalue_line("markers", f"{d.marker_name}: {d.description}")
 
@@ -586,13 +629,14 @@ def get_fork_option(
             returncode=pytest.ExitCode.USAGE_ERROR,
         )
 
-    config.unsupported_forks: Set[Fork] = set()  # type: ignore
+    config.unsupported_forks: Set[Fork | TransitionFork] = set()  # type: ignore
     t8n: TransitionTool | None = getattr(config, "t8n", None)
     if t8n:
         config.unsupported_forks = frozenset(  # type: ignore
             fork
             for fork in selected_fork_set
-            if not t8n.is_fork_supported(fork)
+            if not t8n.is_fork_supported(fork.transitions_from())
+            or not t8n.is_fork_supported(fork.transitions_to())
         )
         logger.debug(
             f"List of unsupported forks: {list(config.unsupported_forks)}"  # type: ignore
@@ -607,15 +651,30 @@ def pytest_report_header(config: pytest.Config, start_path: Any) -> List[str]:
     bold = "\033[1m"
     warning = "\033[93m"
     reset = "\033[39;49m"
+    selected_fork_set: Set[Fork | TransitionFork] = config.selected_fork_set  # type: ignore[attr-defined]
     header = [
         (
             bold
             + "Generating fixtures for: "
-            + ", ".join([f.name() for f in sorted(config.selected_fork_set)])  # type: ignore[attr-defined]
+            + ", ".join([f.name() for f in sorted(selected_fork_set)])
             + reset
         ),
     ]
-    if all(fork.is_deployed() for fork in config.selected_fork_set):  # type: ignore[attr-defined]
+    unsupported_forks: Set[Fork | TransitionFork] = config.unsupported_forks  # type: ignore[attr-defined]
+    if unsupported_forks:
+        t8n_name = config.t8n.__class__.__name__  # type: ignore[attr-defined]
+        excluded = ", ".join(f.name() for f in sorted(unsupported_forks))
+        header += [
+            (
+                bold
+                + warning
+                + f"Unsupported forks excluded from {t8n_name}: "
+                + excluded
+                + "."
+                + reset
+            )
+        ]
+    if all(fork.is_deployed() for fork in selected_fork_set):
         header += [
             (
                 bold
@@ -635,7 +694,9 @@ def fork(request: pytest.FixtureRequest) -> None:
 
 
 @pytest.fixture(scope="session")
-def session_fork(request: pytest.FixtureRequest) -> Fork | None:
+def session_fork(
+    request: pytest.FixtureRequest,
+) -> Fork | TransitionFork | None:
     """
     Session-wide fork object used if the plugin is configured in single-fork
     mode.
@@ -679,6 +740,13 @@ class ValidityMarker(ABC):
 
     mark: Mark | None
 
+    class ValidityMarkerCombinationError(Exception):
+        """
+        Combination of two validity markers generates an empty fork range.
+        """
+
+        pass
+
     def __init_subclass__(
         cls,
         marker_name: str | None = None,
@@ -712,14 +780,25 @@ def __post_init__(self) -> None:
                 f"Missing fork argument with '{self.marker_name}' marker"
             )
 
-    def process_fork_arguments(self, *fork_args: str) -> Set[Fork]:
+    def process_fork_arguments(
+        self, *fork_args: str
+    ) -> Set[Fork | TransitionFork]:
         """Process the fork arguments."""
-        fork_set = ForkSetAdapter.validate_python(fork_args)
-        if len(fork_set) != len(fork_args):
+        fork_eips_set = ForkEIPSetAdapter.validate_python(fork_args)
+        if len(fork_eips_set) != len(fork_args):
             raise Exception(
                 f"Duplicate argument specified in '{self.marker_name}'"
             )
-        return fork_set
+        forks_set: Set[Fork | TransitionFork] = set()
+        for fork_eip in fork_eips_set:
+            if fork_eip.is_transition_fork:
+                forks_set.add(fork_eip)
+            else:
+                if not fork_eip.is_eip():
+                    forks_set.add(fork_eip)
+                else:
+                    forks_set |= fork_eip.enabling_forks()
+        return forks_set
 
     @staticmethod
     def get_all_validity_markers(
@@ -753,11 +832,12 @@ def get_all_validity_markers(
     @staticmethod
     def get_test_fork_set(
         validity_markers: List["ValidityMarker"],
-    ) -> Set[Fork]:
+    ) -> Set[Fork | TransitionFork]:
         """
         Get the set of forks where a test is valid from the validity markers
         and filters.
         """
+        test_fork_set: Set[Fork | TransitionFork] = set()
         if not len(
             [
                 validity_marker
@@ -766,11 +846,11 @@ def get_test_fork_set(
             ]
         ):
             # Limit to non-transition forks if no validity markers were applied
-            test_fork_set = set(ALL_FORKS)
+            test_fork_set |= set(ALL_FORKS)
         else:
             # Start with all forks and transitions if any validity markers were
             # applied
-            test_fork_set = set(ALL_FORKS_WITH_TRANSITIONS)
+            test_fork_set |= set(ALL_FORKS_WITH_TRANSITIONS)
 
         for v in validity_markers:
             # Apply the validity markers to the test function if applicable
@@ -781,7 +861,7 @@ def get_test_fork_set(
     @staticmethod
     def get_test_fork_set_from_markers(
         markers: Iterator[pytest.Mark],
-    ) -> Set[Fork]:
+    ) -> Set[Fork | TransitionFork]:
         """
         Get the set of forks where a test is valid using the markers applied to
         the test.
@@ -793,7 +873,7 @@ def get_test_fork_set_from_markers(
     @staticmethod
     def get_test_fork_set_from_metafunc(
         metafunc: Metafunc,
-    ) -> Set[Fork]:
+    ) -> Set[Fork | TransitionFork]:
         """
         Get the set of forks where a test is valid using its pytest
         meta-function.
@@ -807,7 +887,9 @@ def is_validity_or_filter_marker(name: str) -> bool:
         """Check if a marker is a validity or filter marker."""
         return name in ALL_VALIDITY_MARKERS
 
-    def process(self, forks: Set[Fork]) -> Set[Fork]:
+    def process(
+        self, forks: Set[Fork | TransitionFork]
+    ) -> Set[Fork | TransitionFork]:
         """Process the fork arguments."""
         if self.mark is None:
             fork_set = self._process_with_marker_args()
@@ -817,12 +899,19 @@ def process(self, forks: Set[Fork]) -> Set[Fork]:
             )
         if self.flag:
             return forks - fork_set
-        return forks & fork_set
+        if not fork_set:
+            # Test is marked for an EIP that is not yet enabled in any
+            # fork.
+            return fork_set
+        resulting_set = forks & fork_set
+        if not resulting_set:
+            raise ValidityMarker.ValidityMarkerCombinationError()
+        return resulting_set
 
     @abstractmethod
     def _process_with_marker_args(
         self, *args: Any, **kwargs: Any
-    ) -> Set[Fork]:
+    ) -> Set[Fork | TransitionFork]:
         """
         Process the fork arguments as specified for the marker.
 
@@ -857,10 +946,14 @@ def test_something_only_valid_after_london(
     after, e.g. London, Paris, Shanghai, Cancun, etc.
     """
 
-    def _process_with_marker_args(self, *fork_args: str) -> Set[Fork]:
+    def _process_with_marker_args(
+        self, *fork_args: str
+    ) -> Set[Fork | TransitionFork]:
         """Process the fork arguments."""
-        forks: Set[Fork] = self.process_fork_arguments(*fork_args)
-        resulting_set: Set[Fork] = set()
+        forks: Set[Fork | TransitionFork] = self.process_fork_arguments(
+            *fork_args
+        )
+        resulting_set: Set[Fork | TransitionFork] = set()
         for fork in forks:
             resulting_set |= {f for f in ALL_FORKS if f >= fork}
         return resulting_set
@@ -888,15 +981,120 @@ def test_something_only_valid_until_london(
     before, e.g. London, Berlin, Istanbul, etc.
     """
 
-    def _process_with_marker_args(self, *fork_args: str) -> Set[Fork]:
+    def _process_with_marker_args(
+        self, *fork_args: str
+    ) -> Set[Fork | TransitionFork]:
         """Process the fork arguments."""
-        forks: Set[Fork] = self.process_fork_arguments(*fork_args)
-        resulting_set: Set[Fork] = set()
+        forks: Set[Fork | TransitionFork] = self.process_fork_arguments(
+            *fork_args
+        )
+        resulting_set: Set[Fork | TransitionFork] = set()
         for fork in forks:
             resulting_set |= {f for f in ALL_FORKS if f <= fork}
         return resulting_set
 
 
+class NotValidFor(ValidityMarker):
+    """
+    Marker to subtract one or more forks from the test's valid set.
+
+    Unlike ``valid_from`` / ``valid_until`` (which set bounds), this
+    marker carves a hole out of the otherwise-applicable fork range.
+    Use it when an upstream-targeted test happens to lie inside the
+    fork range of an incompatible downstream fork (e.g. tests valid on
+    Cancun+ that should not run on Monad forks).
+
+    ```python
+    import pytest
+
+    @pytest.mark.not_valid_for("MONAD_EIGHT", subsequent_forks=True)
+    def test_blob_thing(...):
+        pass
+    ```
+
+    With ``subsequent_forks=True``, every fork at or after each named
+    fork (and their transitions) is excluded; otherwise only the named
+    forks themselves are excluded.
+    """
+
+    def _process_with_marker_args(
+        self,
+        *fork_args: str,
+        subsequent_forks: bool = False,
+    ) -> Set[Fork | TransitionFork]:
+        """Process the fork arguments."""
+        forks: Set[Fork | TransitionFork] = self.process_fork_arguments(
+            *fork_args
+        )
+        resulting_set: Set[Fork | TransitionFork] = set()
+        for fork in forks:
+            if subsequent_forks:
+                resulting_set |= {
+                    f for f in ALL_FORKS_WITH_TRANSITIONS if f >= fork
+                }
+            else:
+                resulting_set.add(fork)
+        return resulting_set
+
+    def process(
+        self, forks: Set[Fork | TransitionFork]
+    ) -> Set[Fork | TransitionFork]:
+        """Subtract the marker's fork set from the test's fork set."""
+        if self.mark is None:
+            fork_set = self._process_with_marker_args()
+        else:
+            fork_set = self._process_with_marker_args(
+                *self.mark.args, **self.mark.kwargs
+            )
+        resulting_set = forks - fork_set
+        if not resulting_set:
+            raise ValidityMarker.ValidityMarkerCombinationError()
+        return resulting_set
+
+
+class ValidBefore(ValidityMarker, mutually_exclusive=[ValidUntil]):
+    """
+    Marker to specify the fork or EIP before which the test is valid.
+
+    The test will be filled for all forks strictly before the specified
+    fork — the fork itself is **excluded**.
+
+    ``valid_before`` vs ``valid_until``:
+
+    - ``valid_until("Prague")`` — inclusive: runs *through* Prague.
+    - ``valid_before("EIP7825")`` — exclusive: runs up to but *not at*
+      the point where EIP-7825 activates.
+
+    ```python
+    import pytest
+
+    from execution_testing import  Alloc, StateTestFiller
+
+    @pytest.mark.valid_before("EIP7825")
+    def test_something_only_valid_before_eip7825(
+        state_test: StateTestFiller,
+        pre: Alloc
+    ):
+        pass
+    ```
+
+    In this example, the test will only be filled for forks where
+    EIP-7825 is not yet active.
+    """
+
+    def _process_with_marker_args(
+        self, *fork_args: str
+    ) -> Set[Fork | TransitionFork]:
+        """Process the fork arguments."""
+        forks: Set[Fork | TransitionFork] = self.process_fork_arguments(
+            *fork_args
+        )
+        resulting_set: Set[Fork | TransitionFork] = set()
+        for fork in forks:
+            resulting_set |= {f for f in ALL_FORKS if f < fork}
+        return resulting_set
+
+
 class ValidAt(ValidityMarker):
     """
     Marker to specify each fork individually for which the test is valid.
@@ -918,13 +1116,16 @@ def test_something_only_valid_at_london_and_cancun(
     forks.
     """
 
-    def _process_with_marker_args(self, *fork_args: str) -> Set[Fork]:
+    def _process_with_marker_args(
+        self, *fork_args: str
+    ) -> Set[Fork | TransitionFork]:
         """Process the fork arguments."""
         return self.process_fork_arguments(*fork_args)
 
 
 class ValidAtTransitionTo(
-    ValidityMarker, mutually_exclusive=[ValidAt, ValidFrom, ValidUntil]
+    ValidityMarker,
+    mutually_exclusive=[ValidAt, ValidFrom, ValidUntil, ValidBefore],
 ):
     """
     Marker to specify that a test is only meant to be filled at the transition
@@ -988,10 +1189,12 @@ def _process_with_marker_args(
         *fork_args: str,
         subsequent_forks: bool = False,
         until: str | None = None,
-    ) -> Set[Fork]:
+    ) -> Set[Fork | TransitionFork]:
         """Process the fork arguments."""
-        forks: Set[Fork] = self.process_fork_arguments(*fork_args)
-        until_forks: Set[Fork] | None = (
+        forks: Set[Fork | TransitionFork] = self.process_fork_arguments(
+            *fork_args
+        )
+        until_forks: Set[Fork | TransitionFork] | None = (
             None if until is None else self.process_fork_arguments(until)
         )
         if len(forks) == 0:
@@ -1004,7 +1207,7 @@ def _process_with_marker_args(
                 "Too many forks specified to 'valid_at_transition_to' marker."
             )
 
-        resulting_set: Set[Fork] = set()
+        resulting_set: Set[Fork | TransitionFork] = set()
         for fork in forks:
             resulting_set |= transition_fork_to(fork)
             if subsequent_forks:
@@ -1043,12 +1246,12 @@ def test_something_in_a_bpo_fork(
     ```
     """
 
-    def _process_with_marker_args(self) -> Set[Fork]:
+    def _process_with_marker_args(self) -> Set[Fork | TransitionFork]:
         """Process the fork arguments."""
         include_bpo_forks = self.mark is not None
         if include_bpo_forks:
             return set()
-        resulting_set: Set[Fork] = set()
+        resulting_set: Set[Fork | TransitionFork] = set()
         for fork in ALL_FORKS:
             if fork.bpo_fork():
                 resulting_set.add(fork)
@@ -1056,7 +1259,9 @@ def _process_with_marker_args(self) -> Set[Fork]:
         return resulting_set
 
 
-def fork_markers(*, fork: Fork) -> List[pytest.MarkDecorator | pytest.Mark]:
+def fork_markers(
+    *, fork: Fork | TransitionFork
+) -> List[pytest.MarkDecorator | pytest.Mark]:
     """Return the marks that have to be added to a test given the fork."""
     return [
         pytest.mark.fixture_subfolder(
@@ -1073,26 +1278,54 @@ def pytest_generate_tests(metafunc: pytest.Metafunc) -> None:
         test_fork_set = ValidityMarker.get_test_fork_set_from_metafunc(
             metafunc
         )
-    except Exception as e:
-        pytest.fail(f"Error generating tests for {test_name}: {e}")
-
-    if not test_fork_set:
+    except ValidityMarker.ValidityMarkerCombinationError:
+        markers = ValidityMarker.get_all_validity_markers(
+            metafunc.definition.iter_markers()
+        )
+        marker_names = [
+            f"@pytest.mark.{marker.marker_name}" for marker in markers
+        ]
         pytest.fail(
             "The test function's "
             f"'{test_name}' fork validity markers generate "
             "an empty fork range. Please check the arguments to its "
-            f"markers:  @pytest.mark.valid_from and "
-            f"@pytest.mark.valid_until."
+            f"markers: {', '.join(marker_names)}."
         )
+    except Exception as e:
+        pytest.fail(f"Error generating tests for {test_name}: {e}")
+
+    pytest_params: List[Any]
+    if not test_fork_set:
+        if metafunc.config.getoption("verbose") >= 2:
+            pytest_params = [
+                pytest.param(
+                    None,
+                    marks=[
+                        pytest.mark.skip(
+                            reason=(
+                                f"{test_name} is not enabled for any fork."
+                            )
+                        )
+                    ],
+                )
+            ]
+            metafunc.parametrize("fork", pytest_params, scope="function")
+        return
 
     # Get the intersection between the test's validity marker and the current
     # filling parameters.
-    intersection_set = test_fork_set & metafunc.config.selected_fork_set  # type: ignore
+    intersection_set: Set[Fork | TransitionFork] = (
+        test_fork_set & metafunc.config.selected_fork_set  # type: ignore
+    )
 
     if "fork" not in metafunc.fixturenames:
         return
 
-    pytest_params: List[Any]
+    unsupported_forks: Set[Fork | TransitionFork] = (
+        metafunc.config.unsupported_forks  # type: ignore
+    )
+    intersection_set -= unsupported_forks
+
     if not intersection_set:
         if metafunc.config.getoption("verbose") >= 2:
             pytest_params = [
@@ -1110,21 +1343,11 @@ def pytest_generate_tests(metafunc: pytest.Metafunc) -> None:
             ]
             metafunc.parametrize("fork", pytest_params, scope="function")
     else:
-        unsupported_forks: Set[Fork] = metafunc.config.unsupported_forks  # type: ignore
         pytest_params = []
         for fork in sorted(intersection_set):
             marks: List[pytest.MarkDecorator | pytest.Mark] = fork_markers(
                 fork=fork,
             )
-            if fork in unsupported_forks:
-                marks.append(
-                    pytest.mark.skip(
-                        reason=(
-                            f"Fork '{fork}' unsupported by "
-                            f"{metafunc.config.t8n.__class__.__name__}."  # type: ignore
-                        )
-                    )
-                )
             pytest_params.append(ForkParametrizer(fork=fork, marks=marks))
         add_fork_covariant_parameters(metafunc, pytest_params)
         parametrize_fork(metafunc, pytest_params)
@@ -1297,7 +1520,7 @@ def parametrize_fork(
     )
 
 
-def blob_params_changed_at_transition(fork: Fork) -> bool:
+def blob_params_changed_at_transition(fork: Fork | TransitionFork) -> bool:
     """
     Check if BPO-relevant blob parameters change at a fork transition.
 
@@ -1313,9 +1536,7 @@ def blob_params_changed_at_transition(fork: Fork) -> bool:
     For non-transition forks, returns True (no filtering needed).
     """
     # Check if this is a transition fork
-    if not hasattr(fork, "transitions_from") or not hasattr(
-        fork, "transitions_to"
-    ):
+    if not fork.is_transition_fork:
         return True
 
     from_fork = fork.transitions_from()
@@ -1339,39 +1560,97 @@ def blob_params_changed_at_transition(fork: Fork) -> bool:
     return False
 
 
+def _get_item_params(
+    item: pytest.Item,
+) -> Dict[str, Any] | None:
+    """Return the callspec params for a collected test item, if any."""
+    if hasattr(item, "callspec"):
+        return item.callspec.params
+    if hasattr(item, "params"):
+        return item.params
+    return None
+
+
+def _combination_filter_reason(
+    item: pytest.Item,
+    params: Dict[str, Any],
+) -> str | None:
+    """
+    Return the rejection reason if any ``filter_combinations`` marker
+    rejects *params*, otherwise ``None``.
+    """
+    for marker in item.iter_markers("filter_combinations"):
+        if not marker.args:
+            continue
+        predicate = marker.args[0]
+        if not callable(predicate):
+            pytest.exit(
+                f"filter_combinations predicate for "
+                f"'{item.nodeid}' is not callable: "
+                f"{predicate!r}",
+                returncode=pytest.ExitCode.USAGE_ERROR,
+            )
+        if not predicate(**params):
+            return marker.kwargs.get(
+                "reason", "rejected by filter_combinations"
+            )
+    return None
+
+
 def pytest_collection_modifyitems(
     config: pytest.Config, items: List[pytest.Item]
 ) -> None:
     """
-    Filter tests based on param-level validity markers.
+    Filter tests after parametrization.
+
+    Two kinds of filtering are applied:
 
-    The pytest_generate_tests hook only considers function-level validity
-    markers. This hook runs after parametrization and can access all markers
-    including param-level ones, allowing us to properly filter tests based on
-    param-level valid_from/valid_until markers.
+    1. **Validity markers** — param-level ``valid_from`` / ``valid_until`` /
+       ``valid_before`` markers that the ``pytest_generate_tests`` hook
+       cannot see.
+    2. **Combination filters** — the ``filter_combinations`` marker lets
+       test authors reject specific cross-parameter tuples at collection
+       time instead of calling ``pytest.skip()`` at runtime.
     """
-    del config
     items_to_remove = []
+    deselected: List[pytest.Item] = []
+    # function name -> (reason, total, deselected_count)
+    filter_stats: Dict[str, Tuple[str, int, int]] = {}
 
     for i, item in enumerate(items):
-        # Get fork from params if available
-        params = None
-        if hasattr(item, "callspec"):
-            params = item.callspec.params
-        elif hasattr(item, "params"):
-            params = item.params
-
-        if not params or "fork" not in params or params["fork"] is None:
+        params = _get_item_params(item)
+        if not params:
             continue
 
-        fork: Fork = params["fork"]
+        # --- combination filter ---
+        marker = next(item.iter_markers("filter_combinations"), None)
+        if marker is not None:
+            fn_name = item.nodeid.split("[")[0]
+            if fn_name not in filter_stats:
+                reason = marker.kwargs.get(
+                    "reason", "rejected by filter_combinations"
+                )
+                filter_stats[fn_name] = (reason, 0, 0)
+            r, total, dc = filter_stats[fn_name]
+            total += 1
+
+            filter_reason = _combination_filter_reason(item, params)
+            if filter_reason is not None:
+                items_to_remove.append(i)
+                deselected.append(item)
+                dc += 1
+
+            filter_stats[fn_name] = (r, total, dc)
+            if filter_reason is not None:
+                continue
+
+        # --- validity markers ---
+        fork = params.get("fork")
+        if fork is None:
+            continue
 
-        # Get all markers including param-level ones
         markers = item.iter_markers()
 
-        # Calculate valid fork set from all markers
-        # If this raises (e.g., duplicate markers from combining function-level
-        # and param-level), exit immediately with error
         try:
             valid_fork_set = ValidityMarker.get_test_fork_set_from_markers(
                 markers
@@ -1382,10 +1661,37 @@ def pytest_collection_modifyitems(
                 returncode=pytest.ExitCode.USAGE_ERROR,
             )
 
-        # If the fork is not in the valid set, mark for removal
         if fork not in valid_fork_set:
             items_to_remove.append(i)
 
+    # Fail if a filter_combinations predicate eliminated every case
+    # for a test function — the predicate is almost certainly wrong.
+    for fn_name, (reason, total, dc) in filter_stats.items():
+        if total > 0 and dc == total:
+            pytest.exit(
+                f"filter_combinations deselected all {total} "
+                f"parametrizations of {fn_name} "
+                f"(reason: {reason}). "
+                f"Check the predicate logic.",
+                returncode=pytest.ExitCode.USAGE_ERROR,
+            )
+
     # Remove items in reverse order to maintain indices
     for i in reversed(items_to_remove):
         del items[i]
+
+    if deselected:
+        config.hook.pytest_deselected(items=deselected)
+        if config.option.verbose >= 0:
+            writer = config.get_terminal_writer()
+            writer.line("")
+            writer.sep(
+                "-",
+                f"{len(deselected)} deselected by filter_combinations",
+            )
+            for fn_name, (reason, _, dc) in sorted(filter_stats.items()):
+                if dc:
+                    writer.line(f"  {fn_name}: {dc} deselected ({reason})")
+            if config.option.verbose >= 2:
+                for item in deselected:
+                    writer.line(f"    {item.nodeid}")
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/tests/test_covariant_markers.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/tests/test_covariant_markers.py
index ff2cf4f3167..3aa22dd1674 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/tests/test_covariant_markers.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/tests/test_covariant_markers.py
@@ -126,6 +126,20 @@ def test_case(request, state_test, tx_type):
             None,
             id="with_all_tx_types_with_marks_lambda_multiple_marks",
         ),
+        pytest.param(
+            """
+            import pytest
+            @pytest.mark.with_all_tx_types()
+            @pytest.mark.valid_from("Paris")
+            @pytest.mark.valid_before("Shanghai")
+            @pytest.mark.state_test_only
+            def test_case(state_test, tx_type):
+                pass
+            """,
+            {"passed": 3, "failed": 0, "skipped": 0, "errors": 0},
+            None,
+            id="with_all_tx_types_valid_before",
+        ),
         pytest.param(
             """
             import pytest
@@ -482,6 +496,148 @@ def test_fork_covariant_markers(
     )
     result = pytester.runpytest("-c", "pytest-fill.ini")
     result.assert_outcomes(**outcomes)
-    if outcomes["errors"]:
+    if outcomes.get("errors"):
         assert error_string is not None
         assert error_string in "\n".join(result.stdout.lines)
+
+
+# -- filter_combinations marker tests --
+
+
+@pytest.mark.parametrize(
+    "test_function,expected_outcomes,error_string",
+    [
+        pytest.param(
+            """
+            import pytest
+            from execution_testing import Op
+
+            @pytest.mark.with_all_call_opcodes()
+            @pytest.mark.parametrize("value", [0, 1])
+            @pytest.mark.filter_combinations(
+                lambda call_opcode, value, **_: (
+                    "value" in call_opcode.kwargs or value == 0
+                ),
+                reason="opcode does not support value argument",
+            )
+            @pytest.mark.valid_from("Cancun")
+            @pytest.mark.valid_until("Cancun")
+            @pytest.mark.state_test_only
+            def test_case(state_test, call_opcode, value):
+                pass
+            """,
+            # 4 opcodes × 2 values = 8; STATICCALL and DELEGATECALL
+            # lack "value" kwarg → 2 deselected (value=1 for each).
+            {"passed": 6, "failed": 0, "deselected": 2},
+            None,
+            id="filter_combinations_covariant_cross_parametrize",
+        ),
+        pytest.param(
+            """
+            import pytest
+
+            @pytest.mark.parametrize("a", [1, 2, 3])
+            @pytest.mark.parametrize("b", [10, 20])
+            @pytest.mark.filter_combinations(
+                lambda a, b, **_: a + b != 12,
+                reason="a + b must not equal 12",
+            )
+            @pytest.mark.valid_from("Cancun")
+            @pytest.mark.valid_until("Cancun")
+            @pytest.mark.state_test_only
+            def test_case(state_test, a, b):
+                pass
+            """,
+            # 3 × 2 = 6; (2, 10) rejected → 5 passed, 1 deselected.
+            {"passed": 5, "failed": 0, "deselected": 1},
+            None,
+            id="filter_combinations_regular_parametrize_only",
+        ),
+        pytest.param(
+            """
+            import pytest
+
+            @pytest.mark.parametrize("a", [1, 2, 3])
+            @pytest.mark.filter_combinations(
+                lambda a, **_: True,
+                reason="keep all",
+            )
+            @pytest.mark.valid_from("Cancun")
+            @pytest.mark.valid_until("Cancun")
+            @pytest.mark.state_test_only
+            def test_case(state_test, a):
+                pass
+            """,
+            {"passed": 3, "failed": 0, "deselected": 0},
+            None,
+            id="filter_combinations_keeps_all",
+        ),
+        pytest.param(
+            """
+            import pytest
+
+            @pytest.mark.parametrize("a", [1, 2, 3])
+            @pytest.mark.parametrize("b", [10, 20])
+            @pytest.mark.filter_combinations(
+                lambda a, **_: a != 3,
+                reason="exclude a=3",
+            )
+            @pytest.mark.filter_combinations(
+                lambda b, **_: b != 20,
+                reason="exclude b=20",
+            )
+            @pytest.mark.valid_from("Cancun")
+            @pytest.mark.valid_until("Cancun")
+            @pytest.mark.state_test_only
+            def test_case(state_test, a, b):
+                pass
+            """,
+            # 3 × 2 = 6; first marker removes a=3 (2 items),
+            # second removes b=20 (2 of the remaining 4) → 2 passed.
+            {"passed": 2, "failed": 0, "deselected": 4},
+            None,
+            id="filter_combinations_stacked_and_logic",
+        ),
+        pytest.param(
+            """
+            import pytest
+
+            @pytest.mark.parametrize("a", [1, 2])
+            @pytest.mark.filter_combinations(
+                lambda a, **_: False,
+                reason="reject everything",
+            )
+            @pytest.mark.valid_from("Cancun")
+            @pytest.mark.valid_until("Cancun")
+            @pytest.mark.state_test_only
+            def test_case(state_test, a):
+                pass
+            """,
+            {},
+            "filter_combinations deselected all",
+            id="filter_combinations_empty_set_error",
+        ),
+    ],
+)
+def test_filter_combinations(
+    pytester: pytest.Pytester,
+    test_function: str,
+    expected_outcomes: dict,
+    error_string: str | None,
+) -> None:
+    """Test the ``filter_combinations`` marker in an isolated fill session."""
+    pytester.makepyfile(test_function)
+    pytester.copy_example(
+        name="src/execution_testing/cli/pytest_commands/"
+        "pytest_ini_files/pytest-fill.ini"
+    )
+    result = pytester.runpytest("-c", "pytest-fill.ini")
+    if error_string is not None:
+        assert result.ret == pytest.ExitCode.USAGE_ERROR
+        assert error_string in "\n".join(result.stdout.lines)
+        return
+    outcomes = result.parseoutcomes()
+    for key, expected in expected_outcomes.items():
+        assert outcomes.get(key, 0) == expected, (
+            f"{key}: expected {expected}, got {outcomes.get(key, 0)}"
+        )
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/tests/test_forks.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/tests/test_forks.py
index 4fe7c3d44fc..d94f2e37376 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/tests/test_forks.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/tests/test_forks.py
@@ -2,16 +2,35 @@
 
 import pytest
 
-from execution_testing.fixtures import LabeledFixtureFormat
+from execution_testing.client_clis.clis.execution_specs import (
+    ExecutionSpecsTransitionTool,
+)
+from execution_testing.fixtures import (
+    FixtureFillingPhase,
+    LabeledFixtureFormat,
+)
 from execution_testing.forks import (
+    BPO1,
+    BPO2,
+    Amsterdam,
     ArrowGlacier,
     Fork,
     forks_from_until,
     get_deployed_forks,
     get_forks,
 )
+from execution_testing.forks.forks.transition import (
+    BPO2ToAmsterdamAtTime15k,
+    OsakaToBPO1AtTime15k,
+)
 from execution_testing.specs import StateTest
 
+STATE_TEST_FILL_FORMATS = [
+    f
+    for f in StateTest.supported_fixture_formats
+    if FixtureFillingPhase.FILL in f.format_phases
+]
+
 
 @pytest.fixture
 def fork_map() -> dict[str, Fork]:
@@ -38,22 +57,16 @@ def test_all_forks({StateTest.pytest_parameter_name()}):
     )
     result = pytester.runpytest("-c", "pytest-fill.ini", "-v")
     all_forks = get_deployed_forks()
+    t8n = ExecutionSpecsTransitionTool()
     forks_under_test = [
         f
         for f in forks_from_until(all_forks[0], all_forks[-1])
-        if not f.ignore()
+        if not f.ignore() and t8n.is_fork_supported(f)
     ]
-    expected_skipped = 2  # eels doesn't support Constantinople
-    expected_passed = (
-        len([f for f in forks_under_test if not f.ignore()])
-        * len(StateTest.supported_fixture_formats)
-        - expected_skipped
-    )
+    expected_passed = len(forks_under_test) * len(STATE_TEST_FILL_FORMATS)
     stdout = "\n".join(result.stdout.lines)
     for test_fork in forks_under_test:
-        if test_fork.ignore():
-            continue
-        for fixture_format in StateTest.supported_fixture_formats:
+        for fixture_format in STATE_TEST_FILL_FORMATS:
             if isinstance(fixture_format, LabeledFixtureFormat):
                 fixture_format_label = fixture_format.label
                 fixture_format = fixture_format.format
@@ -77,7 +90,7 @@ def test_all_forks({StateTest.pytest_parameter_name()}):
     result.assert_outcomes(
         passed=expected_passed,
         failed=0,
-        skipped=expected_skipped,
+        skipped=0,
         errors=0,
     )
 
@@ -106,12 +119,10 @@ def test_all_forks({StateTest.pytest_parameter_name()}):
     result = pytester.runpytest("-c", "pytest-fill.ini", "-v", "--from", fork)
     all_forks = get_deployed_forks()
     forks_under_test = forks_from_until(fork_map[fork], all_forks[-1])
-    expected_passed = len(forks_under_test) * len(
-        StateTest.supported_fixture_formats
-    )
+    expected_passed = len(forks_under_test) * len(STATE_TEST_FILL_FORMATS)
     stdout = "\n".join(result.stdout.lines)
     for test_fork in forks_under_test:
-        for fixture_format in StateTest.supported_fixture_formats:
+        for fixture_format in STATE_TEST_FILL_FORMATS:
             if isinstance(fixture_format, LabeledFixtureFormat):
                 fixture_format_label = fixture_format.label
                 fixture_format = fixture_format.format
@@ -171,15 +182,13 @@ def test_all_forks({StateTest.pytest_parameter_name()}):
     forks_under_test = forks_from_until(
         fork_map["London"], fork_map["Shanghai"]
     )
-    expected_passed = len(forks_under_test) * len(
-        StateTest.supported_fixture_formats
-    )
+    expected_passed = len(forks_under_test) * len(STATE_TEST_FILL_FORMATS)
     stdout = "\n".join(result.stdout.lines)
     if ArrowGlacier in forks_under_test:
         forks_under_test.remove(ArrowGlacier)
-        expected_passed -= len(StateTest.supported_fixture_formats)
+        expected_passed -= len(STATE_TEST_FILL_FORMATS)
     for test_fork in forks_under_test:
-        for fixture_format in StateTest.supported_fixture_formats:
+        for fixture_format in STATE_TEST_FILL_FORMATS:
             if isinstance(fixture_format, LabeledFixtureFormat):
                 fixture_format_label = fixture_format.label
                 fixture_format = fixture_format.format
@@ -231,14 +240,12 @@ def test_all_forks({StateTest.pytest_parameter_name()}):
         "-c", "pytest-fill.ini", "-v", "--from", "paris", "--until", "paris"
     )
     forks_under_test = forks_from_until(fork_map["Paris"], fork_map["Paris"])
-    expected_passed = len(forks_under_test) * len(
-        StateTest.supported_fixture_formats
-    )
+    expected_passed = len(forks_under_test) * len(STATE_TEST_FILL_FORMATS)
     stdout: str = "\n".join(result.stdout.lines)
     assert len(stdout) > 0, "stdout is empty string"
 
     for test_fork in forks_under_test:
-        for fixture_format in StateTest.supported_fixture_formats:
+        for fixture_format in STATE_TEST_FILL_FORMATS:
             if isinstance(fixture_format, LabeledFixtureFormat):
                 fixture_format_label = fixture_format.label
                 fixture_format = fixture_format.format
@@ -261,3 +268,53 @@ def test_all_forks({StateTest.pytest_parameter_name()}):
         skipped=0,
         errors=0,
     )
+
+
+def test_transition_fork_until_excludes_target(
+    pytester: pytest.Pytester,
+) -> None:
+    """
+    Test that `--until` with a transition fork excludes the
+    transition's target fork from the selected fork set.
+
+    The "Generating fixtures for:" header printed by
+    `pytest_report_header` reflects `config.selected_fork_set`.
+    """
+    pytester.makepyfile(
+        f"""
+        def test_fork_range({StateTest.pytest_parameter_name()}):
+            pass
+        """
+    )
+    pytester.copy_example(
+        name="src/execution_testing/cli/pytest_commands/"
+        "pytest_ini_files/pytest-fill.ini"
+    )
+    result = pytester.runpytest(
+        "-c",
+        "pytest-fill.ini",
+        "-v",
+        "--from",
+        "OsakaToBPO1AtTime15k",
+        "--until",
+        "BPO2ToAmsterdamAtTime15k",
+    )
+    stdout = "\n".join(result.stdout.lines)
+    # The header line lists the selected fork set; parse it.
+    assert "Generating fixtures for:" in stdout
+    header_line = [
+        line
+        for line in result.stdout.lines
+        if "Generating fixtures for:" in line
+    ][0]
+    fork_names = [
+        name.strip()
+        for name in header_line.split("Generating fixtures for:")[1].split(",")
+    ]
+    # Strip ANSI codes from the last element.
+    fork_names[-1] = fork_names[-1].split("\x1b")[0]
+    assert Amsterdam.name() not in fork_names
+    assert BPO1.name() in fork_names
+    assert BPO2.name() in fork_names
+    assert BPO2ToAmsterdamAtTime15k.name() in fork_names
+    assert OsakaToBPO1AtTime15k.name() in fork_names
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/tests/test_markers.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/tests/test_markers.py
index e3fd58d50b0..34e84cb1b7e 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/tests/test_markers.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/forks/tests/test_markers.py
@@ -26,7 +26,7 @@ def test_case(state_test):
                 valid_until='"Cancun"',
             ),
             [],
-            {"passed": 10, "failed": 0, "skipped": 1, "errors": 0},
+            {"passed": 10, "failed": 0, "skipped": 0, "errors": 0},
             id="valid_until",
         ),
         pytest.param(
@@ -45,6 +45,14 @@ def test_case(state_test):
             {"passed": 4, "failed": 0, "skipped": 0, "errors": 0},
             id="valid_from",
         ),
+        pytest.param(
+            generate_test(
+                valid_from='"EIP3675"',
+            ),
+            ["--until=Prague"],
+            {"passed": 4, "failed": 0, "skipped": 0, "errors": 0},
+            id="valid_from_eip",
+        ),
         pytest.param(
             generate_test(
                 valid_from='"Paris"',
@@ -54,6 +62,33 @@ def test_case(state_test):
             {"passed": 3, "failed": 0, "skipped": 0, "errors": 0},
             id="valid_from_until",
         ),
+        pytest.param(
+            generate_test(
+                valid_from='"EIP3675"',
+                valid_until='"EIP4844"',
+            ),
+            [],
+            {"passed": 3, "failed": 0, "skipped": 0, "errors": 0},
+            id="valid_from_eip_until_eip",
+        ),
+        pytest.param(
+            generate_test(
+                valid_from='"Paris"',
+                valid_until='"EIP4844"',
+            ),
+            [],
+            {"passed": 3, "failed": 0, "skipped": 0, "errors": 0},
+            id="valid_from_fork_until_eip",
+        ),
+        pytest.param(
+            generate_test(
+                valid_from='"EIP3675"',
+                valid_until='"Cancun"',
+            ),
+            [],
+            {"passed": 3, "failed": 0, "skipped": 0, "errors": 0},
+            id="valid_from_eip_until_fork",
+        ),
         pytest.param(
             generate_test(
                 valid_from='"Paris"',
@@ -122,6 +157,40 @@ def test_case(state_test):
             {"passed": 1, "failed": 0, "skipped": 0, "errors": 0},
             id="valid_at_transition_to,--fork=transition_fork_only",
         ),
+        pytest.param(
+            generate_test(
+                valid_before='"Cancun"',
+            ),
+            ["--from=Berlin", "--until=Prague"],
+            {"passed": 4, "failed": 0, "skipped": 0, "errors": 0},
+            id="valid_before",
+        ),
+        pytest.param(
+            generate_test(
+                valid_from='"Paris"',
+                valid_before='"Cancun"',
+            ),
+            ["--until=Prague"],
+            {"passed": 2, "failed": 0, "skipped": 0, "errors": 0},
+            id="valid_from_before",
+        ),
+        pytest.param(
+            generate_test(
+                valid_before='"EIP4844"',
+            ),
+            ["--from=Berlin", "--until=Prague"],
+            {"passed": 4, "failed": 0, "skipped": 0, "errors": 0},
+            id="valid_before_eip",
+        ),
+        pytest.param(
+            generate_test(
+                valid_from='"EIP3675"',
+                valid_before='"EIP4844"',
+            ),
+            ["--until=Prague"],
+            {"passed": 2, "failed": 0, "skipped": 0, "errors": 0},
+            id="valid_from_eip_before_eip",
+        ),
         pytest.param(
             generate_test(
                 valid_from='"Osaka"',
@@ -285,6 +354,32 @@ def test_param_level_valid_until(state_test, value):
 """
 
 
+def generate_param_level_valid_before_test() -> str:
+    """Generate a test with param-level valid_before markers."""
+    return """
+import pytest
+
+@pytest.mark.parametrize(
+    "value",
+    [
+        pytest.param(
+            True,
+            id="before_cancun",
+            marks=pytest.mark.valid_before("Cancun"),
+        ),
+        pytest.param(
+            False,
+            id="before_paris",
+            marks=pytest.mark.valid_before("Paris"),
+        ),
+    ],
+)
+@pytest.mark.state_test_only
+def test_param_level_valid_before(state_test, value):
+    pass
+"""
+
+
 def generate_param_level_mixed_test() -> str:
     """Generate a test with both function-level and param-level markers."""
     return """
@@ -382,6 +477,24 @@ def test_mixed_function_and_param_markers(state_test, value):
             {"passed": 4, "failed": 0, "skipped": 0, "errors": 0},
             id="mixed_markers_paris_to_shanghai",
         ),
+        pytest.param(
+            generate_param_level_valid_before_test(),
+            ["--from=Paris", "--until=Prague"],
+            # before_cancun: Paris, Shanghai = 2 forks
+            # before_paris: none (Paris is not < Paris)
+            # Total: 2 tests
+            {"passed": 2, "failed": 0, "skipped": 0, "errors": 0},
+            id="param_level_valid_before_paris_to_prague",
+        ),
+        pytest.param(
+            generate_param_level_valid_before_test(),
+            ["--from=Berlin", "--until=Prague"],
+            # before_cancun: Berlin, London, Paris, Shanghai = 4
+            # before_paris: Berlin, London = 2
+            # Total: 6 tests
+            {"passed": 6, "failed": 0, "skipped": 0, "errors": 0},
+            id="param_level_valid_before_berlin_to_prague",
+        ),
     ],
 )
 def test_param_level_validity_markers(
@@ -391,7 +504,7 @@ def test_param_level_validity_markers(
     pytest_args: List[str],
 ) -> None:
     """
-    Test param-level validity markers (valid_from, valid_until).
+    Test param-level validity markers (valid_from, valid_until, valid_before).
 
     The pytest_collection_modifyitems hook filters tests based on param-level
     markers after parametrization, allowing different parameter values to have
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/help/help.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/help/help.py
index 9d299b1bc9d..00bba7bd288 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/help/help.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/help/help.py
@@ -31,6 +31,15 @@ def pytest_addoption(parser: pytest.Parser) -> None:
         default=False,
         help="Show help options only for the fill command and exit.",
     )
+    help_group.addoption(
+        "--fill-stateful-help",
+        action="store_true",
+        dest="show_fill_stateful_help",
+        default=False,
+        help=(
+            "Show help options only for the fill-stateful command and exit."
+        ),
+    )
     help_group.addoption(
         "--consume-help",
         action="store_true",
@@ -108,6 +117,18 @@ def pytest_configure(config: pytest.Config) -> None:
                 "benchmark",
             ],
         )
+    elif config.getoption("show_fill_stateful_help"):
+        show_specific_help(
+            config,
+            "pytest-fill-stateful.ini",
+            [
+                "fill_stateful",
+                "stateful fixture",
+                "remote RPC configuration",
+                "filler location",
+                "benchmark",
+            ],
+        )
     elif config.getoption("show_consume_help"):
         show_specific_help(
             config,
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/help/tests/test_help.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/help/tests/test_help.py
index 22779526533..62e762a63b4 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/help/tests/test_help.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/help/tests/test_help.py
@@ -13,6 +13,7 @@
     "--fork",
     "--from",
     "--until",
+    "--address-stubs",
     "--help",
 )
 
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/address_stubs.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/address_stubs.py
new file mode 100644
index 00000000000..68afdce0b87
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/address_stubs.py
@@ -0,0 +1,116 @@
+"""
+Address stubs model shared by the filler and execute plugins.
+
+This model maps stub labels to on-chain addresses, optionally
+carrying a private key for EOA stubs that need signing capability.
+"""
+
+import warnings
+from pathlib import Path
+from typing import Dict, Self
+
+from pydantic import model_validator
+
+from execution_testing.base_types import (
+    Address,
+    EthereumTestBaseModel,
+    EthereumTestRootModel,
+    Hash,
+)
+from execution_testing.test_types import EOA
+
+
+class StubAddress(EthereumTestBaseModel):
+    """A single stub entry with an address."""
+
+    addr: Address
+
+
+class StubEOA(EthereumTestBaseModel):
+    """A single stub EOA entry with an address and a private key."""
+
+    addr: Address
+    pkey: Hash
+
+    @model_validator(mode="after")
+    def _validate_key_matches_address(self) -> Self:
+        """Verify the private key derives the declared address."""
+        derived = Address(EOA(key=self.pkey))
+        if derived != self.addr:
+            raise ValueError(
+                f"pkey derives address {derived}, but addr is {self.addr}"
+            )
+        return self
+
+
+class AddressStubs(EthereumTestRootModel[Dict[str, StubAddress | StubEOA]]):
+    """
+    Address stubs class.
+
+    The key represents the label that is used in the test to tag the
+    account, and the value is a StubAddress or StubEOA containing
+    the on-chain address and an optional private key.
+    """
+
+    root: Dict[str, StubAddress | StubEOA]
+
+    def __contains__(self, item: str) -> bool:
+        """Check if an item is in the address stubs."""
+        return item in self.root
+
+    def __getitem__(self, item: str) -> Address:
+        """Get the address for a stub label."""
+        return self.root[item].addr
+
+    def get_entry(self, item: str) -> StubAddress | StubEOA:
+        """Get the full stub entry for a label."""
+        return self.root[item]
+
+    def is_eoa(self, item: str) -> bool:
+        """Check if a stub entry is an EOA (has a private key)."""
+        return item in self.root and isinstance(self.root[item], StubEOA)
+
+    def extract_tokens(self, prefix: str) -> list[str]:
+        """Return stub keys matching *prefix*."""
+        return [k for k in self.root if k.startswith(prefix)]
+
+    def parametrize_args(
+        self, prefix: str, *, caller: str = ""
+    ) -> tuple[list[str], list[str]]:
+        """
+        Return ``(values, ids)`` for ``metafunc.parametrize``.
+
+        *values* are full stub keys matching *prefix*.
+        *ids* are the keys with the prefix stripped for clean test output.
+        Emit a warning when no stubs match.
+        """
+        values = self.extract_tokens(prefix)
+        ids = [v.removeprefix(prefix) for v in values]
+        if not values:
+            label = f" for {caller}" if caller else ""
+            warnings.warn(
+                f"stub_parametrize: no stubs matched prefix "
+                f"'{prefix}'{label}; test will be skipped",
+                stacklevel=2,
+            )
+        return values, ids
+
+    @classmethod
+    def model_validate_json_or_file(cls, json_data_or_path: str) -> Self:
+        """
+        Parse a JSON string or load from a JSON file.
+
+        If the value ends with ``.json`` and the file exists, the file
+        contents are loaded; otherwise the value is parsed as inline JSON.
+        """
+        if json_data_or_path.lower().endswith(".json"):
+            path = Path(json_data_or_path)
+            if path.is_file():
+                return cls.model_validate_json(path.read_text())
+            else:
+                raise FileNotFoundError(
+                    f"Address stubs file not found: {path}"
+                )
+        if json_data_or_path.strip() == "":
+            return cls(root={})
+        return cls.model_validate_json(json_data_or_path)
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/benchmarking.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/benchmarking.py
index c4bf90fe80e..2a47ed80365 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/benchmarking.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/benchmarking.py
@@ -11,6 +11,7 @@
 from execution_testing.test_types import Environment, EnvironmentDefaults
 from execution_testing.tools import ParameterSet
 
+from .address_stubs import AddressStubs
 from .execute_fill import OpMode
 from .fixture_output import (
     FORK_SUBDIR_PREFIX,
@@ -59,6 +60,30 @@ def pytest_addoption(parser: pytest.Parser) -> None:
             f"Cannot be used with {GasBenchmarkValues.flag}."
         ),
     )
+    benchmark_group.addoption(
+        "--address-stubs",
+        action="store",
+        dest="address_stubs",
+        default=None,
+        type=AddressStubs.model_validate_json_or_file,
+        help=(
+            "Address stubs mapping stub names to on-chain addresses. "
+            "Can be a JSON string or path to a JSON file."
+        ),
+    )
+    benchmark_group.addoption(
+        "--include-benchmark",
+        action="store_true",
+        dest="include_benchmark",
+        default=False,
+        help=(
+            "Include tests/benchmark/ during collection even when no "
+            "benchmark path is passed as a positional argument. Needed "
+            "when collecting both tests/ and tests/benchmark/ in a single "
+            "pytest invocation, since pytest's path deduplication drops "
+            "the broader tests/ arg."
+        ),
+    )
 
 
 @pytest.hookimpl(tryfirst=True)
@@ -68,6 +93,10 @@ def pytest_configure(config: pytest.Config) -> None:
         "markers",
         "repricing: Mark test as reference test for gas repricing analysis",
     )
+    config.addinivalue_line(
+        "markers",
+        "stub_parametrize(param, prefix): parametrize with matching stubs",
+    )
 
     # Ensure mutual exclusivity
     gas_benchmark_values = GasBenchmarkValues.from_config(config)
@@ -514,25 +543,26 @@ def fixed_opcode_count(request: pytest.FixtureRequest) -> int | None:
 
 
 BENCHMARKING_MAX_GAS = 1_000_000_000_000
+BENCHMARK_DIR = Path("tests") / "benchmark"
+
+
+def _is_benchmark_test(request: pytest.FixtureRequest) -> bool:
+    """Check if the test is under the benchmark directory."""
+    benchmark_path = Path(request.config.rootpath) / BENCHMARK_DIR
+    return benchmark_path in Path(request.node.fspath).parents
 
 
 @pytest.fixture
-def genesis_environment(request: pytest.FixtureRequest) -> Environment:  # noqa: D103
-    """
-    Return an Environment instance with appropriate gas limit based on test
-    type.
-    """
-    if request.node.get_closest_marker("benchmark") is not None:
+def genesis_environment(request: pytest.FixtureRequest) -> Environment:
+    """Return an Environment with appropriate gas limit."""
+    if _is_benchmark_test(request):
         return Environment(gas_limit=BENCHMARKING_MAX_GAS)
     return Environment()
 
 
 @pytest.fixture
-def env(request: pytest.FixtureRequest) -> Environment:  # noqa: D103
-    """
-    Return an Environment instance with appropriate gas limit based on test
-    type.
-    """
-    if request.node.get_closest_marker("benchmark") is not None:
+def env(request: pytest.FixtureRequest) -> Environment:
+    """Return an Environment with appropriate gas limit."""
+    if _is_benchmark_test(request):
         return Environment(gas_limit=BENCHMARKING_MAX_GAS)
     return Environment()
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/execute_fill.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/execute_fill.py
index 6b5051e35b0..d827d96927a 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/execute_fill.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/execute_fill.py
@@ -2,22 +2,35 @@
 Shared pytest fixtures and hooks for EEST generation modes (fill and execute).
 """
 
-from typing import List
+from pathlib import Path
+from typing import Dict, List, Tuple
 
 import pytest
+from pytest import StashKey
 
+from execution_testing.base_types import Account, Number
+from execution_testing.base_types import Alloc as BaseAlloc
 from execution_testing.execution import (
     BaseExecute,
     LabeledExecuteFormat,
 )
 from execution_testing.fixtures import BaseFixture, LabeledFixtureFormat
+from execution_testing.logging import get_logger
+from execution_testing.rpc import EthRPC
 from execution_testing.specs import BaseTest
 from execution_testing.specs.base import OpMode
 from execution_testing.test_types import EOA, Alloc, ChainConfig
 
+from ..shared.address_stubs import AddressStubs, StubEOA
+from ..shared.helpers import get_rpc_endpoint
 from ..shared.pre_alloc import AllocFlags
 from ..spec_version_checker.spec_version_checker import EIPSpecTestItem
 
+logger = get_logger(__name__)
+
+stub_accounts_key: StashKey[Dict[str, Account]] = StashKey()
+stub_eoas_key: StashKey[Dict[str, EOA]] = StashKey()
+
 ALL_FIXTURE_PARAMETERS = {
     "gas_benchmark_value",
     "fixed_opcode_count",
@@ -34,6 +47,54 @@
 """
 
 
+def _validate_and_cache_address_stubs(
+    address_stubs: AddressStubs, rpc_endpoint: str
+) -> Tuple[Dict[str, Account], Dict[str, EOA]]:
+    """
+    Validate stub addresses on-chain and return caches.
+
+    For stubs without a private key (contract stubs), validate that
+    the address has deployed code.  For stubs with a private key
+    (EOA stubs), create an ``EOA`` with the on-chain nonce.
+    Exit the session if any contract stub has no deployed code.
+
+    Return ``(accounts, eoas)`` where *accounts* maps contract stub
+    labels to their on-chain ``Account`` and *eoas* maps EOA stub
+    labels to ``EOA`` instances with on-chain nonces.
+    """
+    eth_rpc = EthRPC(rpc_endpoint)
+    labels = list(address_stubs.root.keys())
+    addresses = [address_stubs.root[k].addr for k in labels]
+    query = BaseAlloc(root={addr: Account() for addr in addresses})
+    alloc = eth_rpc.get_alloc(query)
+    empty: list[str] = []
+    accounts: Dict[str, Account] = {}
+    eoas: Dict[str, EOA] = {}
+    for label, addr in zip(labels, addresses, strict=True):
+        entry = address_stubs.get_entry(label)
+        account = alloc.root.get(addr) or Account()
+        if isinstance(entry, StubEOA):
+            eoa = EOA(key=entry.pkey)
+            eoa.nonce = Number(account.nonce)
+            eoas[label] = eoa
+            accounts[label] = account
+        elif not account.code:
+            empty.append(f"  '{label}' at {addr}")
+        else:
+            accounts[label] = account
+    if empty:
+        pytest.exit(
+            "The following address stubs have no code on-chain:\n"
+            + "\n".join(empty)
+            + "\nPlease verify the addresses in --address-stubs."
+        )
+    logger.info(
+        f"Validated {len(accounts) + len(eoas)} address stubs: "
+        f"{len(accounts)} contracts, {len(eoas)} EOAs"
+    )
+    return accounts, eoas
+
+
 @pytest.hookimpl(tryfirst=True)
 def pytest_configure(config: pytest.Config) -> None:
     """
@@ -50,6 +111,23 @@ def pytest_configure(config: pytest.Config) -> None:
        called before the pytest-html plugin's pytest_configure to ensure that
        it uses the modified `htmlpath` option.
     """
+    address_stubs = config.getoption("address_stubs", None)
+    rpc_endpoint = get_rpc_endpoint(config)
+    if address_stubs is not None and rpc_endpoint is None:
+        pytest.exit(
+            "--address-stubs requires --rpc-endpoint to fetch "
+            "contract code from the network."
+        )
+    if (
+        address_stubs is not None
+        and rpc_endpoint is not None
+        and not config.getoption("collectonly", default=False)
+    ):
+        accounts, eoas = _validate_and_cache_address_stubs(
+            address_stubs, rpc_endpoint
+        )
+        config.stash[stub_accounts_key] = accounts
+        config.stash[stub_eoas_key] = eoas
     if config.pluginmanager.has_plugin(
         "execution_testing.cli.pytest_commands.plugins.filler.filler"
     ):
@@ -110,14 +188,6 @@ def pytest_configure(config: pytest.Config) -> None:
         "markers",
         "execute: Markers to be added in execute mode only.",
     )
-    config.addinivalue_line(
-        "markers",
-        "benchmark: Tests relevant to benchmarking EVMs.",
-    )
-    config.addinivalue_line(
-        "markers",
-        "stateful: Tests for stateful benchmarking scenarios.",
-    )
     config.addinivalue_line(
         "markers",
         "exception_test: Negative tests that include an invalid block or "
@@ -199,8 +269,8 @@ def pytest_configure(config: pytest.Config) -> None:
     )
     config.addinivalue_line(
         "markers",
-        "json_loader: tests forming a minimized test set that is used by "
-        "tests/json_loader/",
+        "eels_base_coverage: Minimized subset selected to preserve high "
+        "EELS line-coverage parity.",
     )
 
 
@@ -319,10 +389,10 @@ def is_tx_gas_heavy_test(request: pytest.FixtureRequest) -> bool:
     Check, given the test node properties, whether the test is gas-heavy
     for transaction execution.
     """
-    node = request.node
-    has_slow_marker = node.get_closest_marker("slow") is not None
-    has_benchmark_marker = node.get_closest_marker("benchmark") is not None
-    return has_slow_marker or has_benchmark_marker
+    has_slow_marker = request.node.get_closest_marker("slow") is not None
+    benchmark_dir = Path(request.config.rootpath) / "tests" / "benchmark"
+    is_benchmark = benchmark_dir in Path(request.node.fspath).parents
+    return has_slow_marker or is_benchmark
 
 
 @pytest.fixture(scope="function")
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/fixture_output.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/fixture_output.py
index 166744f15fe..b55f276e76f 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/fixture_output.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/fixture_output.py
@@ -288,14 +288,6 @@ def from_config(cls, config: pytest.Config) -> "FixtureOutput":
         output_path = Path(config.getoption("output"))
         should_generate_all_formats = config.getoption("generate_all_formats")
 
-        # Auto-enable --generate-all-formats for tarball output
-        # Use same logic as is_tarball property
-        if (
-            output_path.suffix == ".gz"
-            and output_path.with_suffix("").suffix == ".tar"
-        ):
-            should_generate_all_formats = True
-
         return cls(
             output_path=output_path,
             single_fixture_per_file=config.getoption(
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/helpers.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/helpers.py
index 8b37e019096..42febb7918f 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/helpers.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/helpers.py
@@ -1,5 +1,6 @@
 """Helpers for pytest plugins."""
 
+import os
 from typing import Any, Dict, Tuple, Type
 
 import pytest
@@ -16,14 +17,43 @@
 from execution_testing.specs import BaseTest
 
 
+def option_was_explicitly_set(config: pytest.Config, option_name: str) -> bool:
+    """Return whether a long CLI option was passed explicitly."""
+    normalized_option = option_name.strip()
+    if not normalized_option.startswith("--"):
+        normalized_option = f"--{normalized_option}"
+
+    for arg in config.invocation_params.args:
+        if arg == normalized_option or arg.startswith(f"{normalized_option}="):
+            return True
+    return False
+
+
 def is_help_or_collectonly_mode(config: pytest.Config) -> bool:
     """Check if pytest is running in a help or collectonly mode."""
+    # Command-specific help flags registered by the `help` plugin; each one
+    # triggers a ``show_specific_help`` exit in that plugin's own
+    # ``pytest_configure``. If any are set, skip heavy setup here because
+    # this invocation is help-only.
+    show_help_flags = (
+        "show_fill_help",
+        "show_fill_stateful_help",
+        "show_consume_help",
+        "show_execute_help",
+        "show_execute_hive_help",
+        "show_execute_recover_help",
+        "show_execute_eth_config_help",
+        "show_check_eip_versions_help",
+    )
     return (
         config.getoption("markers", default=False)
         or config.getoption("collectonly", default=False)
         or config.getoption("show_ported_from", default=False)
         or config.getoption("links_as_filled", default=False)
         or config.getoption("help", default=False)
+        or any(
+            config.getoption(flag, default=False) for flag in show_help_flags
+        )
         or config.pluginmanager.has_plugin(
             "execution_testing.cli.pytest_commands.plugins.filler.eip_checklist"
         )
@@ -33,6 +63,13 @@ def is_help_or_collectonly_mode(config: pytest.Config) -> bool:
     )
 
 
+def get_rpc_endpoint(config: pytest.Config) -> str | None:
+    """Return the configured RPC endpoint or fall back to `RPC_ENDPOINT`."""
+    return config.getoption("rpc_endpoint", None) or os.environ.get(
+        "RPC_ENDPOINT"
+    )
+
+
 def labeled_format_parameter_set(
     format_with_or_without_label: LabeledExecuteFormat
     | LabeledFixtureFormat
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/live_client_flags.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/live_client_flags.py
new file mode 100644
index 00000000000..bd89330f736
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/live_client_flags.py
@@ -0,0 +1,321 @@
+"""
+Shared pytest plugin for live-client CLI flags and the fee-market fixture
+chain.
+
+Historically these lived in ``plugins/execute/execute.py``. That made them
+unavailable to any other pytest command that talks to a live EL client
+without also dragging in execute's parametrizer/hooks — which conflict with
+fill's filler plugin. This module is the common denominator: any command
+that hits an actual client (execute-remote, execute-hive, fill-stateful,
+...) can load it.
+
+The fixtures compute real per-session fees from ``eth_rpc`` and feed them
+into ``pre.minimum_balance_for_pending_transactions(...)``, so queued setup
+transactions get live fee values via ``Transaction.set_gas_price`` without
+mutating ``TransactionDefaults`` globally.
+"""
+
+import os
+
+import pytest
+
+from execution_testing.logging import get_logger
+from execution_testing.rpc import EthRPC
+from execution_testing.test_types import EnvironmentDefaults
+
+logger = get_logger(__name__)
+
+# Multiplier applied to a one-shot live fee-market query to absorb the gap
+# between query timing and tx submission (basefee can climb a few blocks
+# between the two; the bump keeps txs landing without per-tx requeries).
+FEE_BUMP_MULTIPLIER = 1.5
+
+
+def pytest_addoption(parser: pytest.Parser) -> None:
+    """Register live-client CLI flags."""
+    group = parser.getgroup(
+        "live_client", "Live-client fee market and execution controls"
+    )
+    group.addoption(
+        "--default-gas-price",
+        action="store",
+        dest="default_gas_price",
+        type=int,
+        default=None,
+        help=(
+            "Default gas price used for transactions, unless overridden by "
+            "the test. Default=None (1.5x current network gas price)"
+        ),
+    )
+    group.addoption(
+        "--default-max-fee-per-gas",
+        action="store",
+        dest="default_max_fee_per_gas",
+        type=int,
+        default=None,
+        help=(
+            "Default max fee per gas used for transactions, unless "
+            "overridden by the test. Default=None (1.5x current network max "
+            "fee per gas)"
+        ),
+    )
+    group.addoption(
+        "--default-max-priority-fee-per-gas",
+        action="store",
+        dest="default_max_priority_fee_per_gas",
+        type=int,
+        default=None,
+        help=(
+            "Default max priority fee per gas used for transactions, "
+            "unless overridden by the test. "
+            "Default=None (1.5x current network max priority fee per gas)"
+        ),
+    )
+    group.addoption(
+        "--default-max-fee-per-blob-gas",
+        action="store",
+        dest="default_max_fee_per_blob_gas",
+        type=int,
+        default=None,
+        help=(
+            "Default max fee per blob gas used for transactions, unless "
+            "overridden by the test. Default=None (1.5x current network max "
+            "fee per blob gas)"
+        ),
+    )
+    group.addoption(
+        "--transaction-gas-limit",
+        action="store",
+        dest="transaction_gas_limit",
+        default=EnvironmentDefaults.gas_limit // 4,
+        type=int,
+        help=(
+            "Maximum gas used to execute a single transaction. Will be used "
+            "as ceiling for tests that attempt to consume the entire block "
+            f"gas limit. (Default: {EnvironmentDefaults.gas_limit // 4})"
+        ),
+    )
+    group.addoption(
+        "--transactions-per-block",
+        action="store",
+        dest="transactions_per_block",
+        type=int,
+        default=None,
+        help=(
+            "Number of transactions to send before producing the next block."
+        ),
+    )
+    group.addoption(
+        "--get-payload-wait-time",
+        action="store",
+        dest="get_payload_wait_time",
+        type=float,
+        default=0.3,
+        help=(
+            "Time to wait after sending a forkchoice_updated before getting "
+            "the payload."
+        ),
+    )
+    group.addoption(
+        "--max-gas-per-test",
+        action="store",
+        dest="max_gas_per_test",
+        default=None,
+        type=int,
+        help=(
+            "Maximum gas limit for all transactions in a test. Default=None "
+            "(No limit)"
+        ),
+    )
+    group.addoption(
+        "--dry-run",
+        action="store_true",
+        dest="dry_run",
+        default=False,
+        help=(
+            "Don't send transactions, just print the minimum balance "
+            "required per test."
+        ),
+    )
+    group.addoption(
+        "--max-tx-per-batch",
+        action="store",
+        dest="max_tx_per_batch",
+        type=int,
+        default=None,
+        help=(
+            "Maximum number of transactions to send in a single batch to "
+            "the RPC. Default=750. Higher values may cause RPC instability."
+        ),
+    )
+    group.addoption(
+        "--use-testing-build-block",
+        action="store_true",
+        dest="use_testing_build_block",
+        default=False,
+        help=(
+            "Use testing_buildBlockV1 to build blocks with transactions "
+            "directly, instead of the standard Engine API flow. Only for "
+            "clients that implement this endpoint."
+        ),
+    )
+
+
+# ---------------------------------------------------------------------------
+# Session-scope flag readers
+# ---------------------------------------------------------------------------
+
+
+@pytest.fixture(scope="session")
+def transactions_per_block(
+    request: pytest.FixtureRequest,
+) -> int:
+    """Number of transactions per block (defaults to worker count)."""
+    if transactions_per_block := request.config.getoption(
+        "transactions_per_block"
+    ):
+        return transactions_per_block
+    worker_count_env = os.environ.get("PYTEST_XDIST_WORKER_COUNT")
+    if not worker_count_env:
+        return 1
+    return max(int(worker_count_env), 1)
+
+
+@pytest.fixture(scope="session")
+def default_gas_price(request: pytest.FixtureRequest) -> int | None:
+    """Return default gas price (from ``--default-gas-price``)."""
+    gas_price = request.config.getoption("default_gas_price")
+    if gas_price is not None:
+        assert gas_price > 0, "Gas price must be greater than 0"
+        logger.debug(
+            f"Using configured default gas price: {gas_price / 10**9:.2f} Gwei"
+        )
+    return gas_price
+
+
+@pytest.fixture(scope="session")
+def dry_run(request: pytest.FixtureRequest) -> bool:
+    """Return True if the test is a dry run."""
+    return request.config.getoption("dry_run")
+
+
+@pytest.fixture(scope="session")
+def max_transactions_per_batch(request: pytest.FixtureRequest) -> int | None:
+    """Return max transactions per batch, or None for default."""
+    return request.config.getoption("max_tx_per_batch")
+
+
+@pytest.fixture(scope="session")
+def use_testing_build_block(
+    request: pytest.FixtureRequest,
+) -> bool:
+    """Return whether to use testing_buildBlockV1 for block building."""
+    return request.config.getoption("use_testing_build_block")
+
+
+@pytest.fixture(scope="session")
+def default_max_fee_per_gas(
+    request: pytest.FixtureRequest,
+) -> int | None:
+    """Return default max fee per gas (from CLI flag, or None)."""
+    max_fee_per_gas = request.config.getoption("default_max_fee_per_gas")
+    if max_fee_per_gas is not None:
+        logger.debug(
+            f"Using configured default max fee per gas: "
+            f"{max_fee_per_gas / 10**9:.2f} Gwei"
+        )
+    return max_fee_per_gas
+
+
+@pytest.fixture(scope="session")
+def default_max_priority_fee_per_gas(
+    request: pytest.FixtureRequest,
+) -> int | None:
+    """Return default max priority fee per gas (from CLI flag, or None)."""
+    max_priority_fee_per_gas = request.config.getoption(
+        "default_max_priority_fee_per_gas"
+    )
+    if max_priority_fee_per_gas is not None:
+        logger.debug(
+            f"Using configured default max priority fee per gas: "
+            f"{max_priority_fee_per_gas / 10**9:.2f} Gwei"
+        )
+    return max_priority_fee_per_gas
+
+
+@pytest.fixture(scope="session")
+def default_max_fee_per_blob_gas(
+    request: pytest.FixtureRequest,
+) -> int | None:
+    """Return default max fee per blob gas (from CLI flag, or None)."""
+    max_fee_per_blob_gas = request.config.getoption(
+        "default_max_fee_per_blob_gas"
+    )
+    if max_fee_per_blob_gas is not None:
+        logger.debug(
+            f"Using configured default max fee per blob gas: "
+            f"{max_fee_per_blob_gas / 10**9:.2f} Gwei"
+        )
+    return max_fee_per_blob_gas
+
+
+# ---------------------------------------------------------------------------
+# Function-scope live-fee fixtures
+# ---------------------------------------------------------------------------
+
+
+@pytest.fixture(scope="function")
+def max_priority_fee_per_gas(
+    eth_rpc: EthRPC,
+    default_max_priority_fee_per_gas: int | None,
+) -> int:
+    """Max priority fee per gas for this test (live query or CLI default)."""
+    max_priority_fee_per_gas = default_max_priority_fee_per_gas
+    if max_priority_fee_per_gas is None:
+        network_max_priority_fee = eth_rpc.max_priority_fee_per_gas()
+        max_priority_fee_per_gas = int(
+            network_max_priority_fee * FEE_BUMP_MULTIPLIER
+        )
+    return max_priority_fee_per_gas
+
+
+@pytest.fixture(scope="function")
+def max_fee_per_gas(
+    eth_rpc: EthRPC,
+    default_max_fee_per_gas: int | None,
+    max_priority_fee_per_gas: int,
+) -> int:
+    """Max fee per gas for this test (live query or CLI default)."""
+    max_fee_per_gas = default_max_fee_per_gas
+    if max_fee_per_gas is None:
+        network_gas_price = eth_rpc.gas_price()
+        max_fee_per_gas = int(network_gas_price * FEE_BUMP_MULTIPLIER)
+    if max_priority_fee_per_gas > max_fee_per_gas:
+        # Priority fee can exceed max fee due to query timing; bump.
+        max_fee_per_gas = max_priority_fee_per_gas + 1
+    return max_fee_per_gas
+
+
+@pytest.fixture(scope="function")
+def max_fee_per_blob_gas(
+    eth_rpc: EthRPC,
+    default_max_fee_per_blob_gas: int | None,
+) -> int:
+    """Max fee per blob gas for this test (live query or CLI default)."""
+    max_fee_per_blob_gas = default_max_fee_per_blob_gas
+    if max_fee_per_blob_gas is None:
+        network_blob_base_fee = eth_rpc.blob_base_fee()
+        max_fee_per_blob_gas = int(network_blob_base_fee * FEE_BUMP_MULTIPLIER)
+    return max_fee_per_blob_gas
+
+
+@pytest.fixture(scope="function")
+def gas_price(max_fee_per_gas: int, max_priority_fee_per_gas: int) -> int:
+    """Gas price = max_fee_per_gas + max_priority_fee_per_gas."""
+    return max_fee_per_gas + max_priority_fee_per_gas
+
+
+@pytest.fixture()
+def max_gas_limit_per_test(request: pytest.FixtureRequest) -> int | None:
+    """Total gas limit across all transactions in a given test (or None)."""
+    return request.config.getoption("max_gas_per_test")
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/pre_alloc.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/pre_alloc.py
index 5faf52f14d0..5076bf2fa52 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/pre_alloc.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/pre_alloc.py
@@ -1,7 +1,7 @@
 """Shared pre-alloc functionality."""
 
 from enum import IntFlag, auto
-from typing import Any, Literal, Set
+from typing import Any, Dict, Literal, Set
 
 from pydantic import PrivateAttr
 
@@ -18,7 +18,7 @@
     FixedSizeBytesConvertible,
     NumberConvertible,
 )
-from execution_testing.forks import Fork
+from execution_testing.forks import Fork, TransitionFork
 from execution_testing.test_types import EOA
 from execution_testing.test_types import Alloc as BaseAlloc
 
@@ -35,7 +35,7 @@ class Alloc(BaseAlloc):
     Allocation subclass that enforces rules set by the allocation flags.
     """
 
-    _fork: Fork = PrivateAttr()
+    _fork: Fork | TransitionFork = PrivateAttr()
     _flags: AllocFlags = PrivateAttr(AllocFlags.NONE)
     _set_addresses: Set[Address] = PrivateAttr(default_factory=set)
     _deleted_addresses: Set[Address] = PrivateAttr(default_factory=set)
@@ -43,6 +43,7 @@ class Alloc(BaseAlloc):
     _hardcoded_addresses_deployed_to: Set[Address] = PrivateAttr(
         default_factory=set
     )
+    _stub_eoas: Dict[str, EOA] = PrivateAttr(default_factory=dict)
 
     def is_mutable(self) -> bool:
         """Return whether the pre-alloc is mutable."""
@@ -62,12 +63,24 @@ def __init__(
         *args: Any,
         fork: Fork,
         flags: AllocFlags,
+        stub_eoas: Dict[str, EOA] | None = None,
         **kwargs: Any,
     ) -> None:
         """Initialize allocation with the given properties."""
         super().__init__(*args, **kwargs)
         self._fork = fork
         self._flags = flags
+        if stub_eoas is not None:
+            self._stub_eoas = stub_eoas
+
+    def stub_eoa(self, label: str) -> EOA:
+        """Return the EOA for a key-bearing stub."""
+        if label not in self._stub_eoas:
+            raise ValueError(
+                f"Stub EOA '{label}' not found. "
+                "Provide --address-stubs with a pkey entry."
+            )
+        return self._stub_eoas[label].copy()
 
     def __setitem__(
         self,
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/tests/__init__.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/tests/__init__.py
new file mode 100644
index 00000000000..ea0e35892a4
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/tests/__init__.py
@@ -0,0 +1 @@
+"""Tests for shared pytest plugin utilities."""
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/tests/test_address_stubs.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/tests/test_address_stubs.py
new file mode 100644
index 00000000000..db7c90c1e82
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/tests/test_address_stubs.py
@@ -0,0 +1,113 @@
+"""Tests for AddressStubs prefix extraction and parametrization."""
+
+import pytest
+
+from execution_testing.base_types import Address, Hash
+from execution_testing.cli.pytest_commands.plugins.shared.address_stubs import (  # noqa: E501
+    AddressStubs,
+    StubAddress,
+    StubEOA,
+)
+
+ADDR = Address("0x398324972FcE0e89E048c2104f1298031d1931fc")
+# TestPrivateKey and its derived TestAddress
+TEST_PKEY = Hash(
+    0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+)
+TEST_ADDR = Address("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+
+
+def _stubs(mapping: dict[str, StubAddress | StubEOA]) -> AddressStubs:
+    """Create an AddressStubs instance from a plain dict."""
+    return AddressStubs(root=mapping)
+
+
+def _entry(addr: Address = ADDR) -> StubAddress:
+    """Create an address-only StubAddress."""
+    return StubAddress(addr=addr)
+
+
+def test_extract_tokens_returns_full_keys() -> None:
+    """Return full keys matching the prefix."""
+    stubs = _stubs(
+        {
+            "test_sload_empty_erc20_balanceof_XEN": _entry(),
+            "test_sload_empty_erc20_balanceof_USDC": _entry(),
+            "unrelated_key": _entry(),
+        }
+    )
+    result = stubs.extract_tokens("test_sload_empty_erc20_balanceof_")
+    assert result == [
+        "test_sload_empty_erc20_balanceof_XEN",
+        "test_sload_empty_erc20_balanceof_USDC",
+    ]
+
+
+def test_extract_tokens_no_match() -> None:
+    """Return empty list when no keys match the prefix."""
+    stubs = _stubs({"test_sstore_erc20_approve_XEN": _entry()})
+    assert stubs.extract_tokens("test_sload_empty_erc20_balanceof_") == []
+
+
+def test_extract_tokens_empty_stubs() -> None:
+    """Return empty list for empty stubs."""
+    stubs = _stubs({})
+    assert stubs.extract_tokens("any_prefix_") == []
+
+
+@pytest.mark.parametrize(
+    "prefix",
+    [
+        "test_sload_empty_erc20_balanceof_",
+        "test_sstore_erc20_approve_",
+        "test_sstore_erc20_mint_",
+        "test_mixed_sload_sstore_",
+        "bloatnet_factory_",
+    ],
+)
+def test_extract_tokens_various_prefixes(prefix: str) -> None:
+    """Extract matching keys for each prefix."""
+    stubs = _stubs(
+        {
+            f"{prefix}A": _entry(),
+            f"{prefix}B": _entry(),
+            "unrelated_key": _entry(),
+        }
+    )
+    assert stubs.extract_tokens(prefix) == [
+        f"{prefix}A",
+        f"{prefix}B",
+    ]
+
+
+def test_parametrize_args_values_and_ids() -> None:
+    """Return full keys as values and stripped names as ids."""
+    stubs = _stubs(
+        {
+            "test_sload_empty_erc20_balanceof_XEN": _entry(),
+            "test_sload_empty_erc20_balanceof_USDC": _entry(),
+        }
+    )
+    values, ids = stubs.parametrize_args("test_sload_empty_erc20_balanceof_")
+    assert values == [
+        "test_sload_empty_erc20_balanceof_XEN",
+        "test_sload_empty_erc20_balanceof_USDC",
+    ]
+    assert ids == ["XEN", "USDC"]
+
+
+def test_parametrize_args_empty_warns() -> None:
+    """Emit a warning when no stubs match the prefix."""
+    stubs = _stubs({})
+    with pytest.warns(UserWarning, match="no stubs matched prefix"):
+        values, ids = stubs.parametrize_args(
+            "missing_prefix_", caller="test_foo"
+        )
+    assert values == []
+    assert ids == []
+
+
+def test_stub_eoa_pkey_mismatch_raises() -> None:
+    """Raise when private key derives a different address."""
+    with pytest.raises(ValueError, match="pkey derives address"):
+        StubEOA(addr=ADDR, pkey=TEST_PKEY)
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/processors.py b/packages/testing/src/execution_testing/cli/pytest_commands/processors.py
index 7862140380e..d23174fc34e 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/processors.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/processors.py
@@ -122,32 +122,18 @@ def process_args(self, args: List[str]) -> List[str]:
         if os.getenv("HIVE_LOGLEVEL") is not None:
             warnings.warn("HIVE_LOG_LEVEL is not yet supported.", stacklevel=2)
 
-        if self.command_name == "engine":
+        simulator_commands = {
+            "engine",
+            "enginex",
+            "sync",
+            "rlp",
+            "build_block",
+        }
+        if self.command_name in simulator_commands:
             modified_args.extend(
                 [
                     "-p",
-                    "execution_testing.cli.pytest_commands.plugins.consume.simulators.engine.conftest",
-                ]
-            )
-        elif self.command_name == "enginex":
-            modified_args.extend(
-                [
-                    "-p",
-                    "execution_testing.cli.pytest_commands.plugins.consume.simulators.enginex.conftest",
-                ]
-            )
-        elif self.command_name == "sync":
-            modified_args.extend(
-                [
-                    "-p",
-                    "execution_testing.cli.pytest_commands.plugins.consume.simulators.sync.conftest",
-                ]
-            )
-        elif self.command_name == "rlp":
-            modified_args.extend(
-                [
-                    "-p",
-                    "execution_testing.cli.pytest_commands.plugins.consume.simulators.rlp.conftest",
+                    f"execution_testing.cli.pytest_commands.plugins.consume.simulators.{self.command_name}.conftest",
                 ]
             )
         else:
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute-deploy-required-contracts.ini b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute-deploy-required-contracts.ini
index 4ef1350726e..0c4b979f699 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute-deploy-required-contracts.ini
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute-deploy-required-contracts.ini
@@ -3,6 +3,7 @@ console_output_style = count
 minversion = 7.0
 python_files = *.py
 addopts =
+    -p execution_testing.cli.pytest_commands.plugins.shared.live_client_flags
     -p execution_testing.cli.pytest_commands.plugins.execute.execute_flags.execute_flags
     -p execution_testing.cli.pytest_commands.plugins.execute.deploy_required_contracts
     -p execution_testing.cli.pytest_commands.plugins.concurrency
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute-hive.ini b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute-hive.ini
index 3c0ba40f5c4..aeb53f6c86b 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute-hive.ini
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute-hive.ini
@@ -6,6 +6,7 @@ testpaths = tests/
 # Note: register new markers via src/execution_testing/cli/pytest_commands/plugins/shared/execute_fill.py
 addopts =
     -p execution_testing.cli.pytest_commands.plugins.shared.execute_fill
+    -p execution_testing.cli.pytest_commands.plugins.shared.live_client_flags
     -p execution_testing.cli.pytest_commands.plugins.execute.execute
     -p execution_testing.cli.pytest_commands.plugins.forks.forks
     -p execution_testing.cli.pytest_commands.plugins.concurrency
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute-recover.ini b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute-recover.ini
index 3f0afb5fe7d..c01d661d54f 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute-recover.ini
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute-recover.ini
@@ -3,6 +3,7 @@ console_output_style = count
 minversion = 7.0
 python_files = *.py
 addopts =
+    -p execution_testing.cli.pytest_commands.plugins.shared.live_client_flags
     -p execution_testing.cli.pytest_commands.plugins.execute.execute_flags.execute_flags
     -p execution_testing.cli.pytest_commands.plugins.execute.rpc.remote
     -p execution_testing.cli.pytest_commands.plugins.execute.recover
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute.ini b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute.ini
index d148d89792c..4646c2759c3 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute.ini
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute.ini
@@ -6,6 +6,7 @@ testpaths = tests/
 # Note: register new markers via src/execution_testing/cli/pytest_commands/plugins/shared/execute_fill.py
 addopts =
     -p execution_testing.cli.pytest_commands.plugins.shared.execute_fill
+    -p execution_testing.cli.pytest_commands.plugins.shared.live_client_flags
     -p execution_testing.cli.pytest_commands.plugins.execute.execute
     -p execution_testing.cli.pytest_commands.plugins.forks.forks
     -p execution_testing.cli.pytest_commands.plugins.execute.execute_flags.execute_flags
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-fill-stateful.ini b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-fill-stateful.ini
new file mode 100644
index 00000000000..d681315c7ff
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-fill-stateful.ini
@@ -0,0 +1,20 @@
+[pytest]
+console_output_style = count
+minversion = 7.0
+python_files = test_*.py
+testpaths = tests/benchmark
+addopts =
+    -p execution_testing.cli.pytest_commands.plugins.shared.execute_fill
+    -p execution_testing.cli.pytest_commands.plugins.shared.live_client_flags
+    -p execution_testing.cli.pytest_commands.plugins.filler.filler
+    -p execution_testing.cli.pytest_commands.plugins.forks.forks
+    -p execution_testing.cli.pytest_commands.plugins.execute.pre_alloc
+    -p execution_testing.cli.pytest_commands.plugins.execute.rpc.remote
+    -p execution_testing.cli.pytest_commands.plugins.shared.benchmarking
+    -p execution_testing.cli.pytest_commands.plugins.shared.transaction_fixtures
+    -p execution_testing.cli.pytest_commands.plugins.help.help
+    -p execution_testing.cli.pytest_commands.plugins.fill_stateful.fill_stateful
+    --tb short
+    -n 0
+report_passed_verbose = FILLED
+report_xpassed_verbose = XFILLED
diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-fill.ini b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-fill.ini
index e72c1ffea0d..179ac2082f0 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-fill.ini
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-fill.ini
@@ -7,6 +7,7 @@ testpaths = tests/
 addopts =
     -p execution_testing.cli.pytest_commands.plugins.shared.execute_fill
     -p execution_testing.cli.pytest_commands.plugins.filler.filler
+    -p execution_testing.cli.pytest_commands.plugins.filler.verify_traces
     -p execution_testing.cli.pytest_commands.plugins.forks.forks
     -p execution_testing.cli.pytest_commands.plugins.concurrency
     -p execution_testing.cli.pytest_commands.plugins.filler.pre_alloc
diff --git a/packages/testing/src/execution_testing/cli/tests/test_evm_bytes.py b/packages/testing/src/execution_testing/cli/tests/test_evm_bytes.py
index 77d206105fb..d5622cd7d86 100644
--- a/packages/testing/src/execution_testing/cli/tests/test_evm_bytes.py
+++ b/packages/testing/src/execution_testing/cli/tests/test_evm_bytes.py
@@ -13,13 +13,84 @@
     "args_size=Op.DUP1, ret_offset=Op.DUP1, ret_size=0x0))",
 ]
 complex_vector = [
-    "0x7fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebf5f527fc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedf6020527fe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff60405260786040356020355f35608a565b5f515f55602051600155604051600255005b5e56",  # noqa: E501
+    "0x7fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebf5f527fc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedf6020527fe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff60405260786040356020355f35608a565b5f515f55602051600155604051600255005b5e56",
     "Op.MSTORE(offset=Op.PUSH0, "
     "value="
     "0xa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
     ") + Op.MSTORE(offset=0x20, "
-    "value=0xc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedf) + Op.MSTORE(offset=0x40, value=0xe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff) + Op.PUSH1[0x78] + Op.CALLDATALOAD(offset=0x40) + Op.CALLDATALOAD(offset=0x20) + Op.CALLDATALOAD(offset=Op.PUSH0) + Op.JUMP(pc=0x8a) + Op.JUMPDEST + Op.SSTORE(key=Op.PUSH0, value=Op.MLOAD(offset=Op.PUSH0)) + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20)) + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x40)) + Op.STOP + Op.JUMPDEST + Op.MCOPY + Op.JUMP",  # noqa: E501
+    "value=0xc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedf)"
+    " + Op.MSTORE(offset=0x40, "
+    "value=0xe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff)"
+    " + Op.PUSH1[0x78] + Op.CALLDATALOAD(offset=0x40) + "
+    "Op.CALLDATALOAD(offset=0x20) + Op.CALLDATALOAD(offset=Op.PUSH0) + "
+    "Op.JUMP(pc=0x8a) + Op.JUMPDEST + Op.SSTORE(key=Op.PUSH0, "
+    "value=Op.MLOAD(offset=Op.PUSH0)) + Op.SSTORE(key=0x1, "
+    "value=Op.MLOAD(offset=0x20)) + Op.SSTORE(key=0x2, "
+    "value=Op.MLOAD(offset=0x40)) + Op.STOP + Op.JUMPDEST + Op.MCOPY + "
+    "Op.JUMP",
 ]
+repeating_vector = [
+    "0x600060006000600060003061c3505a03f100" + "5b" * 15000,
+    "Op.CALL(gas=Op.SUB(Op.GAS, 0xc350), address=Op.ADDRESS, value=0x0, "
+    "args_offset=0x0, args_size=0x0, ret_offset=0x0, ret_size=0x0) + Op.STOP "
+    "+ Op.JUMPDEST * 15000",
+]
+edge_case_vectors = [
+    pytest.param(
+        "0x6060",
+        "Op.PUSH1[0x60]",
+        id="push_data_matches_push1_opcode_byte",
+    ),
+    pytest.param(
+        "0x605f5f",
+        "Op.PUSH1[0x5f] + Op.PUSH0",
+        id="push_data_matches_push0_opcode_byte",
+    ),
+    pytest.param(
+        "0x616060",
+        "Op.PUSH2[0x6060]",
+        id="push2_data_contains_push1_opcode_bytes",
+    ),
+    pytest.param(
+        "0x60606060",
+        "Op.PUSH1[0x60] * 2",
+        id="repeating_push1_is_compacted",
+    ),
+    pytest.param(
+        "0x60616060",
+        "Op.PUSH1[0x61] + Op.PUSH1[0x60]",
+        id="distinct_push1_values_are_not_compacted",
+    ),
+    pytest.param(
+        "0x600035600035",
+        "Op.CALLDATALOAD(offset=0x0) * 2",
+        id="repeating_folded_expression_is_compacted",
+    ),
+    pytest.param(
+        "0x600035600135",
+        "Op.CALLDATALOAD(offset=0x0) + Op.CALLDATALOAD(offset=0x1)",
+        id="distinct_folded_expressions_are_not_compacted",
+    ),
+]
+truncated_push_vectors = [
+    pytest.param("0x60", "Op.PUSH1[0x0]", id="push1_missing_data_zero_pads"),
+    pytest.param(
+        "0x6160",
+        "Op.PUSH2[0x60]",
+        id="push2_missing_trailing_byte_zero_pads",
+    ),
+]
+malformed_hex_strings = [
+    pytest.param("0xZZ", id="non_hex_chars_with_prefix"),
+    pytest.param("ZZ", id="non_hex_chars_without_prefix"),
+    pytest.param("0x0", id="odd_length_with_prefix"),
+    pytest.param("0", id="odd_length_without_prefix"),
+]
+undefined_opcode_bytes = sorted(
+    opcode_byte
+    for opcode_byte in range(256)
+    if opcode_byte not in {op.int() for op in Op}
+)
 
 
 @pytest.mark.parametrize(
@@ -29,6 +100,9 @@
         (basic_vector[0][2:], basic_vector[1]),  # no "0x" prefix
         (complex_vector[0], complex_vector[1]),
         (complex_vector[0][2:], complex_vector[1]),  # no "0x" prefix
+        pytest.param(
+            repeating_vector[0], repeating_vector[1], id="repeating_jumpdest"
+        ),
     ],
 )
 def test_evm_bytes(evm_bytes: str, python_opcodes: str) -> None:
@@ -36,6 +110,43 @@ def test_evm_bytes(evm_bytes: str, python_opcodes: str) -> None:
     assert process_evm_bytes_string(evm_bytes) == python_opcodes
 
 
+@pytest.mark.parametrize(("evm_bytes", "python_opcodes"), edge_case_vectors)
+def test_evm_bytes_edge_cases(evm_bytes: str, python_opcodes: str) -> None:
+    """Cover decoding and simplification edge cases for evm_bytes."""
+    assert process_evm_bytes_string(evm_bytes) == python_opcodes
+
+
+@pytest.mark.parametrize(
+    ("evm_bytes", "python_opcodes"), truncated_push_vectors
+)
+def test_evm_bytes_truncated_push_zero_padding(
+    evm_bytes: str, python_opcodes: str
+) -> None:
+    """PUSH instructions right-pad missing immediate bytes with zeros."""
+    assert process_evm_bytes_string(evm_bytes) == python_opcodes
+
+
+def test_evm_bytes_assembly_output() -> None:
+    """Assembly output keeps the opcode stream and line formatting intact."""
+    assert (
+        process_evm_bytes_string("0x005b00", assembly=True)
+        == "stop\n\njumpdest\nstop"
+    )
+
+
+def test_evm_bytes_skip_simplify_output() -> None:
+    """skip_simplify preserves repeated decoded instructions."""
+    assert (
+        process_evm_bytes_string("0x60606060", skip_simplify=True)
+        == "Op.PUSH1[0x60] + Op.PUSH1[0x60]"
+    )
+
+
+def test_evm_bytes_push0_is_decoded_without_fork_context() -> None:
+    """The decoder uses the global opcode table rather than a selected fork."""
+    assert process_evm_bytes_string("0x5f") == "Op.PUSH0"
+
+
 DUPLICATES = [Op.NOOP]
 
 
@@ -57,14 +168,19 @@ def test_individual_opcodes(opcode: Op) -> None:
     assert process_evm_bytes_string("0x" + bytecode.hex()) == expected_output
 
 
-def test_invalid_opcode() -> None:
-    """Invalid hex string."""
+@pytest.mark.parametrize("evm_bytes", malformed_hex_strings)
+def test_invalid_hex_string(evm_bytes: str) -> None:
+    """Malformed hex strings are rejected before opcode decoding."""
     with pytest.raises(ValueError):
-        process_evm_bytes_string("0xZZ")
+        process_evm_bytes_string(evm_bytes)
 
 
-def test_unknown_opcode() -> None:
-    """Opcode not defined in Op."""
+@pytest.mark.parametrize(
+    "opcode_byte",
+    undefined_opcode_bytes,
+    ids=lambda opcode_byte: f"0x{opcode_byte:02x}",
+)
+def test_unknown_opcode(opcode_byte: int) -> None:
+    """All bytes not present in Op are rejected as unknown opcodes."""
     with pytest.raises(ValueError):
-        process_evm_bytes_string("0x0F")
-        process_evm_bytes_string("0x0F")
+        process_evm_bytes_string(f"0x{opcode_byte:02x}")
diff --git a/packages/testing/src/execution_testing/cli/tests/test_extract_config.py b/packages/testing/src/execution_testing/cli/tests/test_extract_config.py
new file mode 100644
index 00000000000..c150f43688c
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/tests/test_extract_config.py
@@ -0,0 +1,71 @@
+"""Tests for the extract_config CLI helpers."""
+
+from pathlib import Path
+
+import pytest
+
+from execution_testing.base_types import Alloc
+from execution_testing.cli.extract_config import GenesisState
+from execution_testing.fixtures.pre_alloc_groups import PreAllocGroupBuilder
+from execution_testing.forks import (
+    Fork,
+    Prague,
+    forks_from_until,
+    get_deployed_forks,
+)
+from execution_testing.test_types import Environment
+
+
+def forks_from_prague_onward() -> list[Fork]:
+    """Return deployed forks from Prague onward."""
+    all_forks = get_deployed_forks()
+    return list(forks_from_until(Prague, all_forks[-1]))
+
+
+@pytest.mark.parametrize("fork", forks_from_prague_onward())
+def test_genesis_state_from_pre_alloc_group_uses_stored_chain_id(
+    tmp_path: Path,
+    fork: Fork,
+) -> None:
+    """Pre-alloc group files should preserve the configured chain ID."""
+    builder = PreAllocGroupBuilder(
+        test_ids=["test_id"],
+        environment=Environment()
+        .set_fork_requirements(fork)
+        .model_dump(mode="json", exclude={"parent_hash"}),
+        fork=fork.name(),
+        chain_id=12345,
+        pre=Alloc().model_dump(mode="json"),
+    )
+    fixture_path = tmp_path / "pre_alloc.json"
+    fixture_path.write_text(
+        builder.model_dump_json(by_alias=True, exclude_none=True, indent=2)
+    )
+
+    genesis_state = GenesisState.from_fixture(fixture_path)
+
+    assert genesis_state.chain_id == 12345
+    assert genesis_state.get_client_environment()["HIVE_CHAIN_ID"] == "12345"
+
+
+@pytest.mark.parametrize("fork", forks_from_prague_onward())
+def test_genesis_state_from_legacy_pre_alloc_group_defaults_chain_id(
+    tmp_path: Path,
+    fork: Fork,
+) -> None:
+    """Legacy pre-alloc groups without chain ID should still default to 1."""
+    builder = PreAllocGroupBuilder(
+        test_ids=["test_id"],
+        environment=Environment()
+        .set_fork_requirements(fork)
+        .model_dump(mode="json", exclude={"parent_hash"}),
+        fork=fork.name(),
+        pre=Alloc().model_dump(mode="json"),
+    )
+    fixture_path = tmp_path / "legacy_pre_alloc.json"
+    fixture_path.write_text(builder.model_dump_json(exclude={"chain_id"}))
+
+    genesis_state = GenesisState.from_fixture(fixture_path)
+
+    assert genesis_state.chain_id == 1
+    assert genesis_state.get_client_environment()["HIVE_CHAIN_ID"] == "1"
diff --git a/packages/testing/src/execution_testing/cli/tests/test_generate_all_formats.py b/packages/testing/src/execution_testing/cli/tests/test_generate_all_formats.py
index e108ad63bc7..3db22720ee9 100644
--- a/packages/testing/src/execution_testing/cli/tests/test_generate_all_formats.py
+++ b/packages/testing/src/execution_testing/cli/tests/test_generate_all_formats.py
@@ -2,6 +2,9 @@
 
 from unittest.mock import patch
 
+import click
+import pytest
+
 from execution_testing.cli.pytest_commands.fill import (
     FillCommand,
 )
@@ -76,26 +79,79 @@ def test_generate_all_formats_removes_clean_from_phase2() -> None:
     assert "--clean" not in phase2_args
 
 
-def test_legacy_generate_pre_alloc_groups_still_works() -> None:
-    """Test that the legacy --generate-pre-alloc-groups flag still works."""
+def test_generate_pre_alloc_groups_alone_is_phase_1_only() -> None:
+    """
+    Test that --generate-pre-alloc-groups without --generate-all-formats
+    runs phase 1 only, so CI can populate pre-alloc groups on a
+    dedicated runner without wasting time on phase 2.
+    """
     command = FillCommand()
 
     with patch.object(command, "process_arguments", side_effect=lambda x: x):
         pytest_args = ["--generate-pre-alloc-groups", "tests/somedir/"]
         executions = command.create_executions(pytest_args)
 
-    assert len(executions) == 2
+    assert len(executions) == 1
 
-    # Phase 1: Should have --generate-pre-alloc-groups
     phase1_args = executions[0].args
     assert "--generate-pre-alloc-groups" in phase1_args
+    assert "--use-pre-alloc-groups" not in phase1_args
+    assert "--generate-all-formats" not in phase1_args
+
+
+def test_use_pre_alloc_groups_forces_single_phase() -> None:
+    """
+    Test that --use-pre-alloc-groups always runs a single phase, even
+    alongside --generate-all-formats (pre-alloc groups already exist on
+    disk from a previous run).
+    """
+    command = FillCommand()
+
+    with patch.object(command, "process_arguments", side_effect=lambda x: x):
+        pytest_args = [
+            "--use-pre-alloc-groups",
+            "--generate-all-formats",
+            "tests/somedir/",
+        ]
+        executions = command.create_executions(pytest_args)
+
+    assert len(executions) == 1
+    assert "--use-pre-alloc-groups" in executions[0].args
+    assert "--generate-all-formats" in executions[0].args
 
-    # Phase 2: Should have --use-pre-alloc-groups but NOT --generate-all-
-    # formats
-    phase2_args = executions[1].args
-    assert "--use-pre-alloc-groups" in phase2_args
-    assert "--generate-all-formats" not in phase2_args
-    assert "--generate-pre-alloc-groups" not in phase2_args
+
+def test_use_and_generate_pre_alloc_groups_together_is_rejected() -> None:
+    """
+    --use-pre-alloc-groups + --generate-pre-alloc-groups are contradictory:
+    the first asserts the groups exist, the second regenerates them.
+    """
+    command = FillCommand()
+
+    with patch.object(command, "process_arguments", side_effect=lambda x: x):
+        pytest_args = [
+            "--use-pre-alloc-groups",
+            "--generate-pre-alloc-groups",
+            "tests/somedir/",
+        ]
+        with pytest.raises(click.UsageError, match="mutually exclusive"):
+            command.create_executions(pytest_args)
+
+
+def test_use_pre_alloc_groups_with_clean_is_rejected() -> None:
+    """
+    --use-pre-alloc-groups + --clean is contradictory: --clean wipes the
+    output directory that holds the pre-alloc groups.
+    """
+    command = FillCommand()
+
+    with patch.object(command, "process_arguments", side_effect=lambda x: x):
+        pytest_args = [
+            "--use-pre-alloc-groups",
+            "--clean",
+            "tests/somedir/",
+        ]
+        with pytest.raises(click.UsageError, match="--clean"):
+            command.create_executions(pytest_args)
 
 
 def test_single_phase_without_flags() -> None:
@@ -114,9 +170,10 @@ def test_single_phase_without_flags() -> None:
     assert "--generate-all-formats" not in execution.args
 
 
-def test_tarball_output_auto_enables_generate_all_formats() -> None:
+def test_tarball_output_without_flag_stays_single_phase() -> None:
     """
-    Test that tarball output automatically enables --generate-all-formats.
+    Test that tarball output without --generate-all-formats is single-phase
+    and does not inject the flag.
     """
     command = FillCommand()
 
@@ -124,19 +181,13 @@ def test_tarball_output_auto_enables_generate_all_formats() -> None:
         pytest_args = ["--output=fixtures.tar.gz", "tests/somedir/"]
         executions = command.create_executions(pytest_args)
 
-    # Should trigger two-phase execution due to tarball output
-    assert len(executions) == 2
-
-    # Phase 1: Should have --generate-pre-alloc-groups
-    phase1_args = executions[0].args
-    assert "--generate-pre-alloc-groups" in phase1_args
+    assert len(executions) == 1
+    execution = executions[0]
 
-    # Phase 2: Should have --generate-all-formats (auto-added) and --use-pre-
-    # alloc-groups
-    phase2_args = executions[1].args
-    assert "--generate-all-formats" in phase2_args
-    assert "--use-pre-alloc-groups" in phase2_args
-    assert "--output=fixtures.tar.gz" in phase2_args
+    assert "--generate-pre-alloc-groups" not in execution.args
+    assert "--use-pre-alloc-groups" not in execution.args
+    assert "--generate-all-formats" not in execution.args
+    assert "--output=fixtures.tar.gz" in execution.args
 
 
 def test_tarball_output_with_explicit_generate_all_formats() -> None:
@@ -182,24 +233,3 @@ def test_regular_output_does_not_auto_trigger_two_phase() -> None:
     assert "--generate-pre-alloc-groups" not in execution.args
     assert "--use-pre-alloc-groups" not in execution.args
     assert "--generate-all-formats" not in execution.args
-
-
-def test_tarball_output_detection_various_formats() -> None:
-    """Test tarball output detection with various argument formats."""
-    command = FillCommand()
-
-    # Test --output=file.tar.gz format
-    args1 = ["--output=test.tar.gz", "tests/somedir/"]
-    assert command._is_tarball_output(args1) is True
-
-    # Test --output file.tar.gz format
-    args2 = ["--output", "test.tar.gz", "tests/somedir/"]
-    assert command._is_tarball_output(args2) is True
-
-    # Test regular directory
-    args3 = ["--output=test/", "tests/somedir/"]
-    assert command._is_tarball_output(args3) is False
-
-    # Test no output argument
-    args4 = ["tests/somedir/"]
-    assert command._is_tarball_output(args4) is False
diff --git a/packages/testing/src/execution_testing/cli/tests/test_hasher.py b/packages/testing/src/execution_testing/cli/tests/test_hasher.py
index bd5c9357808..1c2c2fb3319 100644
--- a/packages/testing/src/execution_testing/cli/tests/test_hasher.py
+++ b/packages/testing/src/execution_testing/cli/tests/test_hasher.py
@@ -767,3 +767,99 @@ def test_merge_raises_when_no_partial_files(self) -> None:
 
             with pytest.raises(Exception, match="No partial indexes found"):
                 merge_partial_indexes(output_dir, quiet_mode=True)
+
+
+class TestIndexFileMerge:
+    """Test IndexFile.merge() for combining split fork-range indexes."""
+
+    def test_merge_combines_test_cases_and_metadata(self) -> None:
+        """Verify merge concatenates entries and unions forks/formats."""
+        import datetime
+
+        idx_a = IndexFile(
+            root_hash=None,
+            created_at=datetime.datetime(2026, 1, 1),
+            test_count=1,
+            forks=["Cancun"],
+            fixture_formats=["state_test"],
+            test_cases=[
+                _make_entry(
+                    "test_a",
+                    "state_tests/for_cancun/t.json",
+                    HASH_1,
+                    fork="Cancun",
+                    fmt="state_test",
+                ),
+            ],
+        )
+        idx_b = IndexFile(
+            root_hash=None,
+            created_at=datetime.datetime(2026, 1, 2),
+            test_count=1,
+            forks=["Prague"],
+            fixture_formats=["blockchain_test"],
+            test_cases=[
+                _make_entry(
+                    "test_b",
+                    "blockchain_tests/for_prague/t.json",
+                    HASH_2,
+                    fork="Prague",
+                    fmt="blockchain_test",
+                ),
+            ],
+        )
+
+        merged = IndexFile.merge([idx_a, idx_b])
+
+        assert merged.test_count == 2
+        assert len(merged.test_cases) == 2
+        assert merged.forks is not None
+        assert set(f.name() for f in merged.forks) == {"Cancun", "Prague"}
+        assert merged.fixture_formats is not None
+        assert set(merged.fixture_formats) == {
+            "state_test",
+            "blockchain_test",
+        }
+        assert merged.root_hash is not None
+
+    def test_merge_root_hash_matches_from_index_entries(self) -> None:
+        """Verify merged root_hash matches independent computation."""
+        import datetime
+
+        cases = [
+            _make_entry(
+                "test_a",
+                "state_tests/for_cancun/t.json",
+                HASH_1,
+                fork="Cancun",
+                fmt="state_test",
+            ),
+            _make_entry(
+                "test_b",
+                "blockchain_tests/for_prague/t.json",
+                HASH_2,
+                fork="Prague",
+                fmt="blockchain_test",
+            ),
+        ]
+
+        idx_a = IndexFile(
+            root_hash=None,
+            created_at=datetime.datetime(2026, 1, 1),
+            test_count=1,
+            forks=["Cancun"],
+            fixture_formats=["state_test"],
+            test_cases=cases[:1],
+        )
+        idx_b = IndexFile(
+            root_hash=None,
+            created_at=datetime.datetime(2026, 1, 1),
+            test_count=1,
+            forks=["Prague"],
+            fixture_formats=["blockchain_test"],
+            test_cases=cases[1:],
+        )
+
+        merged = IndexFile.merge([idx_a, idx_b])
+        expected_hash = HashableItem.from_index_entries(cases).hash()
+        assert merged.root_hash == HexNumber(expected_hash)
diff --git a/packages/testing/src/execution_testing/cli/tests/test_pytest_checklist_command.py b/packages/testing/src/execution_testing/cli/tests/test_pytest_checklist_command.py
new file mode 100644
index 00000000000..8deb6bc19ff
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/tests/test_pytest_checklist_command.py
@@ -0,0 +1,48 @@
+"""Tests for the checklist command click CLI."""
+
+from unittest.mock import patch
+
+import pytest
+from click.testing import CliRunner
+
+from ..pytest_commands.checklist import checklist
+
+
+@pytest.fixture
+def runner() -> CliRunner:
+    """Provide a Click CliRunner for invoking command-line interfaces."""
+    return CliRunner()
+
+
+def _captured_execute_args(runner: CliRunner, *cli_args: str) -> list[str]:
+    """Invoke `checklist` and return the args passed to ChecklistCommand."""
+    with patch(
+        "execution_testing.cli.pytest_commands.checklist.ChecklistCommand"
+    ) as mock_cls:
+        result = runner.invoke(checklist, list(cli_args))
+    assert result.exit_code == 0, result.output
+    instance = mock_cls.return_value
+    instance.execute.assert_called_once()
+    (execute_args,) = instance.execute.call_args.args
+    return execute_args
+
+
+def test_checklist_default_injects_include_benchmark(
+    runner: CliRunner,
+) -> None:
+    """Default invocation passes `tests` plus `--include-benchmark`."""
+    args = _captured_execute_args(runner)
+
+    assert "--include-benchmark" in args
+    assert args[-1] == "tests"
+
+
+def test_checklist_explicit_paths_skip_include_benchmark(
+    runner: CliRunner,
+) -> None:
+    """Explicit paths scope collection and drop `--include-benchmark`."""
+    args = _captured_execute_args(runner, "tests/prague/eip7702_set_code_tx")
+
+    assert "--include-benchmark" not in args
+    assert "tests/prague/eip7702_set_code_tx" in args
+    assert "tests" not in args
diff --git a/packages/testing/src/execution_testing/cli/tests/test_pytest_execute_command.py b/packages/testing/src/execution_testing/cli/tests/test_pytest_execute_command.py
index c24b4734469..5ddb5fa4cf7 100644
--- a/packages/testing/src/execution_testing/cli/tests/test_pytest_execute_command.py
+++ b/packages/testing/src/execution_testing/cli/tests/test_pytest_execute_command.py
@@ -1,8 +1,16 @@
 """Tests for execute command click CLI."""
 
+from pathlib import Path
+from unittest.mock import patch
+
 import pytest
 from click.testing import CliRunner
 
+from ...test_types.chain_config_types import (
+    DEFAULT_CHAIN_ID,
+    ChainConfigDefaults,
+)
+from ...test_types.transaction_types import Transaction
 from ..pytest_commands.execute import execute
 
 
@@ -108,3 +116,98 @@ def test_all_execute_subcommands_help_no_conflicts(runner: CliRunner) -> None:
             f"execute {subcommand} --help has conflicting option string\n"
             f"Output: {result.output}"
         )
+
+
+def test_execute_remote_leaks_chain_id_into_later_defaults(
+    runner: CliRunner, tmp_path: Path
+) -> None:
+    """Demonstrate that an in-process execute session leaks chain ID."""
+    inner_test = tmp_path / "test_inner.py"
+    inner_test.write_text(
+        "\n".join(
+            [
+                "from execution_testing import (",
+                "    Account,",
+                "    Environment,",
+                "    TestAddress,",
+                "    Transaction,",
+                ")",
+                "",
+                "def test_noop(state_test) -> None:",
+                "    state_test(",
+                "        env=Environment(),",
+                "        pre={TestAddress: Account(balance=1_000_000)},",
+                "        post={},",
+                "        tx=Transaction(),",
+                "    )",
+            ]
+        )
+    )
+
+    ChainConfigDefaults.chain_id = DEFAULT_CHAIN_ID
+    with patch(
+        "execution_testing.cli.pytest_commands.plugins.execute.rpc.remote.EthRPC"
+    ) as mock_eth_rpc:
+        mock_eth_rpc.return_value.chain_id.return_value = 12345
+        result = runner.invoke(
+            execute,
+            [
+                "remote",
+                "--rpc-endpoint=http://localhost:12345",
+                "--chain-id=12345",
+                "--collect-only",
+                "-q",
+                str(inner_test),
+            ],
+        )
+
+    assert result.exit_code == 0, result.output
+    assert Transaction().chain_id == DEFAULT_CHAIN_ID
+
+
+def test_execute_remote_accepts_address_stubs_with_env_rpc_endpoint(
+    runner: CliRunner, tmp_path: Path
+) -> None:
+    """Verify address stubs work when `RPC_ENDPOINT` is only set in env."""
+    inner_test = tmp_path / "test_env_rpc_endpoint_stubs.py"
+    inner_test.write_text(
+        "\n".join(
+            [
+                "from execution_testing import (",
+                "    Account,",
+                "    Environment,",
+                "    Transaction,",
+                ")",
+                "",
+                "def test_noop(state_test, pre) -> None:",
+                "    contract = pre.deploy_contract(b'', stub='STUB')",
+                "    state_test(",
+                "        env=Environment(),",
+                "        pre={contract: Account(code=b'')},",
+                "        post={},",
+                "        tx=Transaction(),",
+                "    )",
+                "",
+            ]
+        )
+    )
+
+    with patch(
+        "execution_testing.cli.pytest_commands.plugins.execute.rpc.remote.EthRPC"
+    ) as mock_eth_rpc:
+        mock_eth_rpc.return_value.chain_id.return_value = 12345
+        result = runner.invoke(
+            execute,
+            [
+                "remote",
+                "--chain-id=12345",
+                "--collect-only",
+                "-q",
+                "--address-stubs",
+                '{"STUB":{"addr":"0x0000000000000000000000000000000000000001"}}',
+                str(inner_test),
+            ],
+            env={"RPC_ENDPOINT": "http://localhost:12345"},
+        )
+
+    assert result.exit_code == 0, result.output
diff --git a/packages/testing/src/execution_testing/cli/tests/test_pytest_fill_command.py b/packages/testing/src/execution_testing/cli/tests/test_pytest_fill_command.py
index c663936810b..8a94b7e18e5 100644
--- a/packages/testing/src/execution_testing/cli/tests/test_pytest_fill_command.py
+++ b/packages/testing/src/execution_testing/cli/tests/test_pytest_fill_command.py
@@ -1,5 +1,7 @@
 """Tests for pytest commands (e.g., fill) click CLI."""
 
+import json
+import shutil
 from pathlib import Path
 from typing import Callable
 
@@ -12,12 +14,11 @@
 from ..pytest_commands.fill import fill
 
 MINIMAL_TEST_FILE_NAME = "test_example.py"
-MINIMAL_TEST_CONTENTS = """
-from execution_testing import Transaction
-def test_function(state_test, pre):
-    tx = Transaction(to=0, gas_limit=21_000, sender=pre.fund_eoa())
-    state_test(pre=pre, post={}, tx=tx)
-"""
+VECTORS_DIR = Path(__file__).parent / "vectors"
+MINIMAL_TEST_SOURCE = VECTORS_DIR / "vector_pytest_fill_command_example.py"
+VALID_FROM_PRAGUE_BLOCKCHAIN_TEST_SOURCE = (
+    VECTORS_DIR / "vector_pytest_fill_command_valid_from_prague.py"
+)
 
 
 @pytest.fixture
@@ -102,7 +103,7 @@ def minimal_test_path(self, pytester: pytest.Pytester) -> Path:
         """
         tests_dir = pytester.mkdir("tests")
         test_file = tests_dir / MINIMAL_TEST_FILE_NAME
-        test_file.write_text(MINIMAL_TEST_CONTENTS)
+        shutil.copyfile(MINIMAL_TEST_SOURCE, test_file)
         return test_file
 
     @pytest.fixture
@@ -208,6 +209,65 @@ def test_fill_no_html_option(
         run_fill(*fill_args)
         assert not default_html_path.exists()
 
+    def test_fill_pytest_help_does_not_create_empty_log_file(
+        self, pytester: Pytester
+    ) -> None:
+        """Help-mode startup should not leave behind an empty log file."""
+        log_dir = pytester.path / "logs"
+        pytester.copy_example(
+            name="src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-fill.ini"
+        )
+
+        result = pytester.runpytest(
+            "-c",
+            "pytest-fill.ini",
+            "--help",
+            "--log-to",
+            str(log_dir),
+        )
+
+        assert result.ret == pytest.ExitCode.OK
+        assert not list(log_dir.glob("*.log"))
+
+    def test_generate_pre_alloc_groups_preserves_chain_id_for_valid_from(
+        self,
+        pytester: Pytester,
+        default_fixtures_output: Path,
+    ) -> None:
+        """
+        Custom chain ID should be preserved for valid_from-selected forks.
+        """
+        tests_dir = pytester.mkdir("tests")
+        prague_tests_dir = tests_dir / "prague"
+        prague_tests_dir.mkdir()
+        test_file = prague_tests_dir / "test_chain_id_pre_alloc.py"
+        shutil.copyfile(VALID_FROM_PRAGUE_BLOCKCHAIN_TEST_SOURCE, test_file)
+
+        pytester.copy_example(
+            name="src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-fill.ini"
+        )
+        result = pytester.runpytest(
+            "-c",
+            "pytest-fill.ini",
+            "--generate-pre-alloc-groups",
+            "--chain-id",
+            "12345",
+            f"--output={default_fixtures_output}",
+            str(test_file),
+            "-q",
+        )
+        assert result.ret == pytest.ExitCode.OK, "\n".join(result.outlines)
+
+        pre_alloc_dir = (
+            default_fixtures_output / "blockchain_tests_engine_x" / "pre_alloc"
+        )
+        pre_alloc_files = sorted(pre_alloc_dir.glob("*.json"))
+        assert pre_alloc_files, f"No pre-alloc files found in {pre_alloc_dir}"
+
+        for pre_alloc_file in pre_alloc_files:
+            payload = json.loads(pre_alloc_file.read_text())
+            assert payload["chainId"] == 12345, pre_alloc_file
+
     def test_fill_html_option(
         self,
         run_fill: Callable[..., RunResult],
diff --git a/packages/testing/src/execution_testing/cli/tests/vectors/vector_pytest_fill_command_example.py b/packages/testing/src/execution_testing/cli/tests/vectors/vector_pytest_fill_command_example.py
new file mode 100644
index 00000000000..86cc4b2140d
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/tests/vectors/vector_pytest_fill_command_example.py
@@ -0,0 +1,13 @@
+"""Vector file for pytest fill command example coverage."""
+
+from typing import Any
+
+from execution_testing import Transaction
+
+
+def test_function(state_test: Any, pre: Any) -> None:
+    """Generate a minimal signed state test transaction."""
+    tx = Transaction(
+        to=0, gas_limit=21_000, sender=pre.fund_eoa()
+    ).with_signature_and_sender()
+    state_test(pre=pre, post={}, tx=tx)
diff --git a/packages/testing/src/execution_testing/cli/tests/vectors/vector_pytest_fill_command_valid_from_prague.py b/packages/testing/src/execution_testing/cli/tests/vectors/vector_pytest_fill_command_valid_from_prague.py
new file mode 100644
index 00000000000..73cfd6402b2
--- /dev/null
+++ b/packages/testing/src/execution_testing/cli/tests/vectors/vector_pytest_fill_command_valid_from_prague.py
@@ -0,0 +1,19 @@
+"""Vector file for valid_from-based pre-alloc group coverage."""
+
+from typing import Any
+
+import pytest
+
+from execution_testing import Account, Block, TestAddress, Transaction
+
+TEST_ADDRESS = Account(balance=1_000_000)
+
+
+@pytest.mark.valid_from("Prague")
+def test_chain_id_pre_alloc(blockchain_test: Any) -> None:
+    """Generate a blockchain test selected by the valid_from marker."""
+    blockchain_test(
+        pre={TestAddress: TEST_ADDRESS},
+        post={},
+        blocks=[Block(txs=[Transaction()])],
+    )
diff --git a/packages/testing/src/execution_testing/cli/tox_helpers.py b/packages/testing/src/execution_testing/cli/tox_helpers.py
deleted file mode 100644
index 752a6a86c2e..00000000000
--- a/packages/testing/src/execution_testing/cli/tox_helpers.py
+++ /dev/null
@@ -1,272 +0,0 @@
-"""
-CLI commands used by tox.ini.
-
-Contains wrappers to the external commands markdownlint-cli2 and pyspelling
-(requires aspell) that fail silently if the command is not available. The aim
-is to avoid disruption to external contributors.
-"""
-
-import os
-import re
-import shutil
-import subprocess
-import sys
-from pathlib import Path
-
-import click
-from pyspelling import __main__ as pyspelling_main  # type: ignore
-from rich.console import Console
-
-
-def write_github_summary(
-    title: str, tox_env: str, error_message: str, fix_commands: list[str]
-) -> None:
-    """
-    Write a summary to GitHub Actions when a check fails.
-
-    Args:
-      title: The title of the check that failed tox_env: The tox
-             environment name (e.g., "spellcheck")
-      tox_env: The tox environment
-      error_message: Description of what went wrong
-      fix_commands: List of commands to fix the issue locally
-
-    """
-    if not os.environ.get("GITHUB_ACTIONS"):
-        return
-
-    summary_file = os.environ.get("GITHUB_STEP_SUMMARY")
-    if not summary_file:
-        return
-
-    with open(summary_file, "a") as f:
-        f.write(f"## ❌ {title}\n\n")
-        f.write(f"{error_message}\n\n")
-        f.write("### To reproduce this check locally:\n")
-        f.write("```bash\n")
-        f.write(f"uvx tox -e {tox_env}\n")
-        f.write("```\n\n")
-
-        if fix_commands:
-            f.write("### To verify and fix the issues:\n")
-            f.write("```bash\n")
-            for cmd in fix_commands:
-                f.write(f"{cmd}\n")
-            f.write("```\n")
-
-
-def find_project_root() -> Path:
-    """Locate the root directory of this project."""
-    # Search upwards from file location
-    script_dir = Path(__file__).resolve().parent
-    for parent in [script_dir, *script_dir.parents]:
-        if (parent / "pyproject.toml").exists() and (parent / ".git").exists():
-            return parent
-
-    raise FileNotFoundError(
-        "Unable to locate project root! "
-        "Looking for a directory with both pyproject.toml and .git."
-    )
-
-
-@click.command(
-    context_settings={
-        "ignore_unknown_options": True,
-        "allow_extra_args": True,
-    }
-)
-@click.argument("args", nargs=-1, type=click.UNPROCESSED)
-def markdownlint(args: tuple[str, ...]) -> None:
-    """
-    Lint the markdown in ./README.md and ./docs/ using the external command
-    markdownlint-cli2.
-
-    Silently fail if markdownlint-cli2 is not installed.
-
-    Allows argument forwarding to markdownlint-cli2.
-    """
-    markdownlint = shutil.which("markdownlint-cli2")
-    if not markdownlint:
-        # Note: There's an additional step in test.yaml to run markdownlint-
-        # cli2 in GitHub Actions
-        click.echo(
-            "********* Install 'markdownlint-cli2' to enable markdown linting\
-            *********\
-            ```\
-            sudo npm install -g markdownlint-cli2@0.20.0\
-            ```\
-            "
-        )
-        sys.exit(0)
-
-    args_list: list[str] = (
-        list(args) if len(args) > 0 else ["./docs/**/*.md", "./*.md"]
-    )
-
-    command = ["node", markdownlint] + args_list
-    sys.exit(subprocess.run(command).returncode)
-
-
-@click.command()
-def pyspelling() -> None:
-    """
-    Spellcheck the markdown in ./README.md and ./docs/ using the pyspelling
-    package.
-
-    Silently fails if aspell is not installed (required by pyspelling).
-
-    Command-line arguments are not forwarded to pyspelling.
-    """
-    if not shutil.which("aspell"):
-        click.echo("aspell not installed, skipping spellcheck.")
-        if os.environ.get("GITHUB_ACTIONS"):
-            write_github_summary(
-                title="Pyspelling Check Failed",
-                tox_env="spellcheck",
-                error_message=(
-                    "aspell is not installed. This tool is required for "
-                    "spell checking documentation."
-                ),
-                fix_commands=[
-                    "# Install aspell on Ubuntu/Debian",
-                    "sudo apt-get install aspell aspell-en",
-                    "",
-                    "# Install aspell on macOS",
-                    "brew install aspell",
-                ],
-            )
-            sys.exit(1)
-        else:
-            click.echo(
-                "*********  Install 'aspell' and 'aspell-en' to enable "
-                "spellcheck *********"
-            )
-            sys.exit(0)
-
-    result = pyspelling_main.main()
-    if result != 0:
-        write_github_summary(
-            title="Pyspelling Check Failed",
-            tox_env="spellcheck",
-            error_message=(
-                "Pyspelling found spelling errors in the documentation."
-            ),
-            fix_commands=[
-                "# Check the pyspelling configuration",
-                "cat .pyspelling.yml",
-                "",
-                "# Review and fix spelling errors manually",
-                "# Pyspelling doesn't have an auto-fix option",
-            ],
-        )
-    sys.exit(result)
-
-
-@click.command()
-def codespell() -> None:
-    """
-    Run codespell on the codebase and provide helpful error messages.
-
-    Checks spelling in .github/, src/, tests/, and docs/ directories.
-    """
-    console = Console()
-
-    # Define the paths to check
-    paths_to_check = ["*.md", "*.ini", ".github/", "src/", "tests/", "docs/"]
-    paths_str = " ".join(paths_to_check)
-
-    # Run codespell
-    result = subprocess.run(
-        ["codespell"] + paths_to_check,
-        capture_output=True,
-        text=True,
-    )
-
-    # Print the output
-    if result.stdout:
-        console.print(result.stdout)
-    if result.stderr:
-        console.print(result.stderr, style="red")
-
-    # If there were spelling errors, show a helpful message
-    if result.returncode != 0:
-        console.print("\n[bold red]❌ Spellcheck Failed[/bold red]")
-        console.print(
-            "[yellow]Please review the errors above. For single-suggestion "
-            "fixes, you can automatically apply them with:[/yellow]"
-        )
-        console.print(
-            f"[cyan]uv run codespell {paths_str} --write-changes[/cyan]\n"
-        )
-
-        # Write to GitHub Actions summary
-        write_github_summary(
-            title="Spellcheck Failed",
-            tox_env="spellcheck",
-            error_message="Codespell found spelling errors in the code.",
-            fix_commands=[
-                "# Ensure codespell is installed (part of docs extras)",
-                "uv sync",
-                "",
-                "# Check for spelling errors",
-                f"uv run codespell {paths_str}",
-                "",
-                "# Automatically fix single-suggestion errors",
-                f"uv run codespell {paths_str} --write-changes",
-            ],
-        )
-
-        sys.exit(1)
-
-    sys.exit(0)
-    sys.exit(pyspelling_main.main())
-
-
-@click.command()
-def validate_changelog() -> None:
-    """
-    Validate changelog formatting to ensure bullet points end with proper
-    punctuation.
-
-    Checks that all bullet points (including nested ones) end with either:
-    - A period (.) for regular entries
-    - A colon (:) for section headers that introduce lists
-    """
-    project_root = find_project_root()
-    changelog_path = Path(project_root / "docs/CHANGELOG.md")
-
-    if not changelog_path.exists():
-        click.echo(f"❌ Changelog file not found: {changelog_path}")
-        sys.exit(1)
-
-    try:
-        with open(changelog_path, "r", encoding="utf-8") as f:
-            content = f.read()
-    except Exception as e:
-        click.echo(f"❌ Error reading changelog: {e}.")
-        sys.exit(1)
-
-    # Find bullet points that don't end with period or colon
-    invalid_lines = []
-    for line_num, line in enumerate(content.splitlines(), 1):
-        if re.match(r"^\s*-\s+", line) and re.search(
-            r"[^\.:]$", line.rstrip()
-        ):
-            invalid_lines.append((line_num, line.strip()))
-
-    if invalid_lines:
-        click.echo(
-            f"❌ Found bullet points in {changelog_path} without proper "
-            "punctuation:"
-        )
-        click.echo()
-        for line_num, line in invalid_lines:
-            click.echo(f"Line {line_num}: {line}")
-        click.echo()
-        click.echo("💡 All bullet points should end with:")
-        click.echo("  - A period (.) for regular entries.")
-        click.echo("  - A colon (:) for paragraphs that introduce lists.")
-        sys.exit(1)
-    else:
-        click.echo("✅ All bullet points have proper punctuation!")
-        sys.exit(0)
diff --git a/packages/testing/src/execution_testing/client_clis/__init__.py b/packages/testing/src/execution_testing/client_clis/__init__.py
index e44839fe578..2a9e603a118 100644
--- a/packages/testing/src/execution_testing/client_clis/__init__.py
+++ b/packages/testing/src/execution_testing/client_clis/__init__.py
@@ -7,11 +7,22 @@
     BlockExceptionWithMessage,
     LazyAlloc,
     Result,
+    TraceFieldDiff,
     Traces,
     TransactionExceptionWithMessage,
     TransitionToolOutput,
 )
+from .client_backend import ClientBackend, ClientBackendExceptionMapper
 from .clis.besu import BesuFixtureConsumer, BesuTransitionTool
+
+# NOTE: erigon is imported before geth so it is registered (and thus probed)
+# first. Both expose an `evm` binary printing `evm version ...`; go-ethereum's
+# detection matches that banner unconditionally, so it would otherwise claim an
+# Erigon binary. ErigonEvm.detect_binary positively fingerprints Erigon (via
+# the `enginextest` subcommand) and declines anything else, so a go-ethereum
+# binary checked here falls through to GethEvm — the ordering only gives Erigon
+# first look, it does not by itself decide identity.
+from .clis.erigon import ErigonExceptionMapper, ErigonFixtureConsumer
 from .clis.ethereumjs import EthereumJSTransitionTool
 from .clis.evmone import (
     EvmOneBlockchainFixtureConsumer,
@@ -24,7 +35,18 @@
 from .clis.nethermind import Nethtest, NethtestFixtureConsumer
 from .clis.nimbus import NimbusTransitionTool
 from .ethereum_cli import CLINotFoundInPathError, UnknownCLIError
+from .filler_backend import FillerBackend
 from .fixture_consumer_tool import FixtureConsumerTool
+from .trace_comparators import (
+    FieldExclusionTraceComparator,
+    GasExhaustionTraceComparator,
+    TraceComparator,
+    TraceComparatorType,
+    TraceComparisonResult,
+    TraceDifference,
+    TransactionCountMismatch,
+    create_comparator,
+)
 from .transition_tool import TransitionTool
 
 TransitionTool.set_default_tool(ExecutionSpecsTransitionTool)
@@ -35,13 +57,20 @@
     "BesuTransitionTool",
     "BlockExceptionWithMessage",
     "CLINotFoundInPathError",
+    "ClientBackend",
+    "ClientBackendExceptionMapper",
+    "ErigonExceptionMapper",
+    "ErigonFixtureConsumer",
     "EthereumJSTransitionTool",
     "EvmoneExceptionMapper",
     "EvmOneTransitionTool",
     "EvmOneStateFixtureConsumer",
     "EvmOneBlockchainFixtureConsumer",
     "ExecutionSpecsTransitionTool",
+    "FieldExclusionTraceComparator",
+    "FillerBackend",
     "FixtureConsumerTool",
+    "GasExhaustionTraceComparator",
     "GethFixtureConsumer",
     "GethTransitionTool",
     "LazyAlloc",
@@ -49,9 +78,16 @@
     "NethtestFixtureConsumer",
     "NimbusTransitionTool",
     "Result",
+    "TraceComparator",
+    "TraceComparatorType",
+    "TraceComparisonResult",
+    "TraceDifference",
+    "TraceFieldDiff",
     "Traces",
+    "TransactionCountMismatch",
     "TransactionExceptionWithMessage",
     "TransitionTool",
     "TransitionToolOutput",
     "UnknownCLIError",
+    "create_comparator",
 )
diff --git a/packages/testing/src/execution_testing/client_clis/cli_types.py b/packages/testing/src/execution_testing/client_clis/cli_types.py
index a68a897fe01..5fdffeb6dbe 100644
--- a/packages/testing/src/execution_testing/client_clis/cli_types.py
+++ b/packages/testing/src/execution_testing/client_clis/cli_types.py
@@ -1,13 +1,27 @@
 """Types used in the transition tool interactions."""
 
 import json
-from dataclasses import dataclass
+import shutil
+import tempfile
+from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Annotated, Any, Dict, Generic, List, Self, TypeVar
+from typing import (
+    Annotated,
+    Any,
+    Dict,
+    Generic,
+    List,
+    NamedTuple,
+    Optional,
+    Self,
+    TypeVar,
+)
 
+import ijson  # type: ignore[import-untyped]
 from pydantic import Field, PlainSerializer, PlainValidator
 
 from execution_testing.base_types import (
+    Account,
     Bloom,
     Bytes,
     CamelModel,
@@ -29,9 +43,9 @@
 from execution_testing.logging import (
     get_logger,
 )
+from execution_testing.rpc.rpc_types import GetPayloadResponse
 from execution_testing.test_types import (
     Alloc,
-    BlockAccessList,
     Environment,
     Transaction,
     TransactionReceipt,
@@ -83,20 +97,60 @@ class TraceLine(CamelModel):
     error: str | None = None
     return_data: str | None = None
 
-    def are_equivalent(self, other: Self) -> bool:
-        """Return True if the only difference is the gas counter."""
-        self_dict = self.model_dump(mode="python", exclude={"gas", "gas_cost"})
-        other_dict = other.model_dump(
-            mode="python", exclude={"gas", "gas_cost"}
-        )
-        if self_dict != other_dict:
+    _DEFAULT_EXCLUDE: set[str] = {"gas", "gas_cost"}
+
+    def compare(
+        self,
+        other: Self,
+        exclude_fields: set[str] | None = None,
+    ) -> tuple[dict[str, str], dict[str, str]]:
+        """
+        Compare two trace lines field-by-field.
+
+        Return (baseline_fields, current_fields) dicts containing only
+        the fields that differ. Both dicts are empty when lines match.
+        """
+        if exclude_fields is None:
+            exclude_fields = self._DEFAULT_EXCLUDE
+        self_dict = self.model_dump(mode="json", exclude=exclude_fields)
+        other_dict = other.model_dump(mode="json", exclude=exclude_fields)
+        baseline_diff: dict[str, str] = {}
+        current_diff: dict[str, str] = {}
+        for k in self_dict:
+            if self_dict[k] != other_dict[k]:
+                baseline_diff[k] = str(self_dict[k])
+                current_diff[k] = str(other_dict[k])
+        return baseline_diff, current_diff
+
+    def are_equivalent(
+        self,
+        other: Self,
+        exclude_fields: set[str] | None = None,
+    ) -> bool:
+        """Return True if the only difference is in excluded fields."""
+        baseline_diff, _ = self.compare(other, exclude_fields)
+        if baseline_diff:
             logger.debug(
-                f"Trace lines are not equivalent: {self_dict} != {other_dict}."
+                f"Trace lines are not equivalent: "
+                f"differing fields: {list(baseline_diff.keys())}."
             )
             return False
         return True
 
 
+class TraceFieldDiff(NamedTuple):
+    """
+    A single diff entry from TransactionTraces.compare().
+
+    line_index is None for structural diffs (trace_length, output,
+    gas_used). Field dicts map field name to string value.
+    """
+
+    line_index: int | None
+    baseline_fields: dict[str, str]
+    current_fields: dict[str, str]
+
+
 class TransactionTraces(CamelModel):
     """Traces of a single transaction."""
 
@@ -134,41 +188,99 @@ def remove_gas(traces: List[TraceLine]) -> None:
                 # Remove the result of calling `Op.GAS` from the stack.
                 trace.stack[-1] = None
 
-    def are_equivalent(
-        self, other: Self, enable_post_processing: bool
-    ) -> bool:
-        """Return True if the only difference is the gas counter."""
+    def compare(
+        self,
+        other: Self,
+        exclude_fields: set[str] | None = None,
+        ignore_gas_differences: bool = False,
+    ) -> List[TraceFieldDiff]:
+        """
+        Compare traces and return per-line differing fields.
+
+        Return a list of TraceFieldDiff entries. line_index is None for
+        structural diffs (trace_length, output, gas_used). Field dicts
+        map field name to string value.
+
+        When exclude_fields is None, no fields are excluded. Pass an
+        explicit set to skip fields (e.g. {"gas", "gas_cost"}).
+
+        ``ignore_gas_differences`` toggles two gas-specific tolerances
+        that cannot be expressed through ``exclude_fields``:
+
+        - The top-level ``gas_used`` total check is skipped (it is not a
+          per-line field, so excluding ``gas`` cannot silence it).
+        - ``Op.GAS`` results are scrubbed from the stack before per-line
+          comparison, so a differing gas value pushed by ``GAS`` does
+          not leak into a stack diff.
+        """
+        line_exclude = exclude_fields or set()
+        diffs: List[TraceFieldDiff] = []
+
         if len(self.traces) != len(other.traces):
-            logger.debug(
-                f"Traces have different lengths: "
-                f"{len(self.traces)} != {len(other.traces)}."
+            diffs.append(
+                TraceFieldDiff(
+                    None,
+                    {"trace_length": str(len(self.traces))},
+                    {"trace_length": str(len(other.traces))},
+                )
             )
-            return False
+            return diffs
+
         if self.output != other.output:
-            logger.debug(
-                f"Traces have different outputs: "
-                f"{self.output} != {other.output}."
+            diffs.append(
+                TraceFieldDiff(
+                    None,
+                    {"output": str(self.output)},
+                    {"output": str(other.output)},
+                )
             )
-            return False
-        if self.gas_used != other.gas_used and not enable_post_processing:
-            logger.debug(
-                f"Traces have different gas used: "
-                f"{self.gas_used} != {other.gas_used}."
+
+        if not ignore_gas_differences and self.gas_used != other.gas_used:
+            diffs.append(
+                TraceFieldDiff(
+                    None,
+                    {"gas_used": str(self.gas_used)},
+                    {"gas_used": str(other.gas_used)},
+                )
             )
-            return False
+
         own_traces = self.traces.copy()
         other_traces = other.traces.copy()
-        if enable_post_processing:
-            logger.debug(
-                "Removing gas from traces (enable_post_processing=True)."
-            )
+        if ignore_gas_differences:
             TransactionTraces.remove_gas(own_traces)
             TransactionTraces.remove_gas(other_traces)
-        for i in range(len(self.traces)):
-            if not own_traces[i].are_equivalent(other_traces[i]):
-                logger.debug(f"Trace line {i} is not equivalent.")
-                return False
-        return True
+
+        for i, (b_line, c_line) in enumerate(
+            zip(own_traces, other_traces, strict=False)
+        ):
+            baseline_diff, current_diff = b_line.compare(c_line, line_exclude)
+            if baseline_diff:
+                diffs.append(TraceFieldDiff(i, baseline_diff, current_diff))
+
+        return diffs
+
+    def are_equivalent(
+        self, other: Self, ignore_gas_differences: bool
+    ) -> bool:
+        """Return True if the only difference is the gas counter."""
+        diffs = self.compare(
+            other,
+            exclude_fields={"gas", "gas_cost"},
+            ignore_gas_differences=ignore_gas_differences,
+        )
+        for diff in diffs:
+            if diff.line_index is None:
+                for field_name in diff.baseline_fields:
+                    logger.debug(
+                        f"Traces have different {field_name}: "
+                        f"{diff.baseline_fields[field_name]} != "
+                        f"{diff.current_fields[field_name]}."
+                    )
+            else:
+                logger.debug(
+                    f"Trace line {diff.line_index} is not equivalent."
+                )
+        return len(diffs) == 0
 
     def print(self) -> None:
         """Print the traces in a readable format."""
@@ -190,7 +302,7 @@ def append(self, item: TransactionTraces) -> None:
         self.root.append(item)
 
     def are_equivalent(
-        self, other: Self | None, enable_post_processing: bool
+        self, other: Self | None, ignore_gas_differences: bool
     ) -> bool:
         """Return True if the only difference is the gas counter."""
         if other is None:
@@ -199,7 +311,7 @@ def are_equivalent(
             return False
         for i in range(len(self.root)):
             if not self.root[i].are_equivalent(
-                other.root[i], enable_post_processing
+                other.root[i], ignore_gas_differences
             ):
                 logger.debug(f"Trace file {i} is not equivalent.")
                 return False
@@ -288,7 +400,7 @@ class Result(CamelModel):
     blob_gas_used: HexNumber | None = None
     requests_hash: Hash | None = None
     requests: List[Bytes] | None = None
-    block_access_list: BlockAccessList | None = None
+    block_access_list: Bytes | None = None
     block_access_list_hash: Hash | None = None
     block_exception: Annotated[
         BlockExceptionWithMessage | UndefinedException | None,
@@ -353,6 +465,55 @@ def validate(self) -> Alloc:
         return Alloc.model_validate_json(self.raw)
 
 
+@dataclass(kw_only=True)
+class LazyAllocFile(LazyAlloc[Path]):
+    """
+    Lazy allocation backed by a filesystem path.
+
+    Parses `{address: account_or_null}` entries from the file incrementally
+    via `ijson.kvitems` and validates each `Account` one at a time through
+    `Account.model_validate`. The full mapping of validated accounts is still
+    accumulated before `Alloc.model_validate` is called, so peak memory
+    scales with the size of the alloc — but the raw JSON string is never
+    held in Python memory, and there is no re-serialize / re-parse round
+    trip, which is where `LazyAllocStr` incurs its multi-GB peak.
+
+    The optional ``_keepalive`` field holds the producing t8n call's
+    ``TemporaryDirectory`` so the on-disk alloc.json survives until this
+    LazyAllocFile is dropped. That lets a chained next-block t8n call
+    consume the alloc directly from disk (via ``--input.alloc=<path>`` for
+    geth, or ``shutil.copyfile`` for filesystem t8ns) without round-tripping
+    through ``Alloc.get().model_dump_json()`` in Python.
+    """
+
+    _keepalive: Optional[tempfile.TemporaryDirectory] = field(default=None)
+
+    def validate(self) -> Alloc:
+        """Validate the alloc by streaming entries from the backing file."""
+        accumulated: Dict[str, Account | None] = {}
+        with open(self.raw, "rb") as f:
+            # `ijson.kvitems(f, "")` silently yields nothing for non-object
+            # top-level JSON (`null`, `[]`, scalars), which would turn a
+            # corrupted alloc.json into an empty post-state. Probe the first
+            # parse event so the streaming path matches the fail-loud
+            # behavior of `LazyAllocStr.validate` /
+            # `Alloc.model_validate_json`.
+            first = next(ijson.parse(f), None)
+            if first is None or first[1] != "start_map":
+                raise ValueError(
+                    f"Expected JSON object at top level of {self.raw}"
+                )
+            f.seek(0)
+            for address_str, account_data in ijson.kvitems(f, ""):
+                if account_data is None:
+                    accumulated[address_str] = None
+                else:
+                    accumulated[address_str] = Account.model_validate(
+                        account_data
+                    )
+        return Alloc.model_validate(accumulated)
+
+
 @dataclass
 class TransitionToolInput:
     """Transition tool input."""
@@ -369,13 +530,20 @@ def to_files(
         """
         Prepare the input in a directory path in the file system for
         consumption by the t8n tool.
+
+        For ``LazyAllocFile`` inputs whose backing file is still on disk
+        (chained-block handoff: previous t8n call's temp dir is pinned via
+        the keepalive field), the alloc is copied byte-for-byte rather than
+        round-tripped through ``Alloc.get().model_dump_json()``.
         """
-        if isinstance(self.alloc, Alloc):
-            alloc_contents = self.alloc.model_dump_json(**model_dump_config)
-        elif isinstance(self.alloc, LazyAllocStr):
-            alloc_contents = self.alloc.raw
+        alloc_path = directory_path / "alloc.json"
+        if (
+            isinstance(self.alloc, LazyAllocFile)
+            and Path(self.alloc.raw).exists()
+        ):
+            shutil.copyfile(self.alloc.raw, alloc_path)
         else:
-            raise Exception(f"Invalid alloc type: {type(self.alloc)}")
+            alloc_path.write_text(self._serialize_alloc(**model_dump_config))
 
         env_contents = self.env.model_dump_json(**model_dump_config)
         txs_contents = (
@@ -386,34 +554,45 @@ def to_files(
             + "]"
         )
         senders_authorities_contents = json.dumps(self.senders_authorities)
-        input_contents: Dict[str, str] = {
-            "alloc": alloc_contents,
-            "senders_authorities": senders_authorities_contents,
-            "env": env_contents,
-            "txs": txs_contents,
-        }
-        if self.blob_params is not None:
-            input_contents["blobParams"] = self.blob_params.model_dump_json(
-                **model_dump_config
-            )
 
-        input_paths: Dict[str, str] = {}
-        for content_type, contents in input_contents.items():
-            file_path = directory_path / f"{content_type}.json"
+        input_paths: Dict[str, str] = {"alloc": str(alloc_path)}
+        for name, contents in (
+            ("env", env_contents),
+            ("txs", txs_contents),
+            ("senders_authorities", senders_authorities_contents),
+        ):
+            file_path = directory_path / f"{name}.json"
             file_path.write_text(contents)
-            input_paths[content_type] = str(file_path)
+            input_paths[name] = str(file_path)
+        if self.blob_params is not None:
+            blob_path = directory_path / "blobParams.json"
+            blob_path.write_text(
+                self.blob_params.model_dump_json(**model_dump_config)
+            )
+            input_paths["blobParams"] = str(blob_path)
 
         return input_paths
 
-    def model_dump_json(self, **model_dump_config: Any) -> str:
-        """Dump the model in string JSON format."""
+    def _serialize_alloc(self, **model_dump_config: Any) -> str:
+        """Serialize ``self.alloc`` to a JSON string."""
         if isinstance(self.alloc, Alloc):
-            alloc_contents = self.alloc.model_dump_json(**model_dump_config)
-        elif isinstance(self.alloc, LazyAllocStr):
-            alloc_contents = self.alloc.raw
-        else:
-            raise Exception(f"Invalid alloc type: {type(self.alloc)}")
+            return self.alloc.model_dump_json(**model_dump_config)
+        if isinstance(self.alloc, LazyAllocStr):
+            return self.alloc.raw
+        if isinstance(self.alloc, LazyAllocFile):
+            return self.alloc.get().model_dump_json(**model_dump_config)
+        raise Exception(f"Invalid alloc type: {type(self.alloc)}")
+
+    def model_dump_json(
+        self, *, exclude_alloc: bool = False, **model_dump_config: Any
+    ) -> str:
+        """
+        Dump the model in string JSON format.
 
+        Pass ``exclude_alloc=True`` when the t8n is reading the alloc from a
+        file path instead of the stdin bundle, to avoid building a multi-GB
+        JSON string in Python memory for chained-block handoffs.
+        """
         env_contents = self.env.model_dump_json(**model_dump_config)
         txs_contents = (
             "["
@@ -423,19 +602,22 @@ def model_dump_json(self, **model_dump_config: Any) -> str:
             + "]"
         )
         senders_authorities_contents = json.dumps(self.senders_authorities)
-        input_contents: Dict[str, str] = {
-            "alloc": alloc_contents,
-            "senders_authorities": senders_authorities_contents,
-            "env": env_contents,
-            "txs": txs_contents,
-        }
+        input_contents: Dict[str, str] = {}
+        if not exclude_alloc:
+            input_contents["alloc"] = self._serialize_alloc(
+                **model_dump_config
+            )
+        input_contents["senders_authorities"] = senders_authorities_contents
+        input_contents["env"] = env_contents
+        input_contents["txs"] = txs_contents
         if self.blob_params is not None:
             input_contents["blobParams"] = self.blob_params.model_dump_json(
                 **model_dump_config
             )
-        contents: List[str] = []
-        for content_type, type_contents in input_contents.items():
-            contents.append(f'"{content_type}": {type_contents}')
+        contents: List[str] = [
+            f'"{content_type}": {type_contents}'
+            for content_type, type_contents in input_contents.items()
+        ]
         return "{" + ",".join(contents) + "}"
 
     def model_dump(self, mode: str, **model_dump_config: Any) -> Any:
@@ -447,6 +629,10 @@ def model_dump(self, mode: str, **model_dump_config: Any) -> Any:
             )
         elif isinstance(self.alloc, LazyAllocJson):
             alloc_contents = self.alloc.raw
+        elif isinstance(self.alloc, LazyAllocFile):
+            alloc_contents = self.alloc.get().model_dump(
+                mode=mode, **model_dump_config
+            )
         else:
             raise Exception(f"Invalid alloc type: {type(self.alloc)}")
 
@@ -472,6 +658,21 @@ def model_dump(self, mode: str, **model_dump_config: Any) -> Any:
         return input_contents
 
 
+@dataclass
+class EnginePayloadMetadata:
+    """
+    Engine API payload + versions captured from ``testing_buildBlockV1``.
+
+    Carried in :class:`TransitionToolOutput` so ``make_stateful_fixture``
+    can record what the client built without side-channel state.
+    """
+
+    payload_response: GetPayloadResponse
+    new_payload_version: int
+    forkchoice_updated_version: int
+    parent_beacon_block_root: Hash | None
+
+
 @dataclass
 class TransitionToolOutput:
     """Transition tool output."""
@@ -480,6 +681,9 @@ class TransitionToolOutput:
     senders_authorities: Dict[int, List[Address]]
     result: Result
     body: Bytes | None = None
+    # Populated by ``ClientBackend.evaluate`` (live-client path). Always
+    # ``None`` from the classical t8n path.
+    engine_payload: EnginePayloadMetadata | None = None
 
     @classmethod
     def model_validate_files(
@@ -488,8 +692,11 @@ def model_validate_files(
         """
         Validate the model from the file system where each key is a
         different JSON file.
+
+        `alloc.json` is referenced by path and parsed incrementally on
+        `.get()` via `LazyAllocFile`, so the full file is never held in
+        memory alongside the validated `Alloc`.
         """
-        alloc_data = (directory_path / "alloc.json").read_text()
         senders_authorities_data = (
             directory_path / "senders_authorities.json"
         ).read_text()
@@ -497,7 +704,10 @@ def model_validate_files(
         result = Result.model_validate_json(
             json_data=result_data, context=context
         )
-        alloc = LazyAllocStr(raw=alloc_data, _state_root=result.state_root)
+        alloc = LazyAllocFile(
+            raw=directory_path / "alloc.json",
+            _state_root=result.state_root,
+        )
         senders_authorities = json.loads(senders_authorities_data)
         output = cls(
             result=result, alloc=alloc, senders_authorities=senders_authorities
diff --git a/packages/testing/src/execution_testing/client_clis/client_backend.py b/packages/testing/src/execution_testing/client_clis/client_backend.py
new file mode 100644
index 00000000000..1f579a897e9
--- /dev/null
+++ b/packages/testing/src/execution_testing/client_clis/client_backend.py
@@ -0,0 +1,344 @@
+"""
+Live execution client backend for ``BlockchainTest``.
+
+``ClientBackend`` drives block construction via ``testing_buildBlockV1`` on a
+running EL client instead of the classical t8n CLI/server path. It satisfies
+the ``FillerBackend`` protocol so fill's spec loop
+(``BlockchainTest.generate_block_data``) can dispatch to it transparently.
+
+Used by ``fill --stateful`` to produce ``BlockchainEngineStatefulFixture`` JSON
+from the same test definitions that the compute path fills via t8n — phase
+info, block boundaries, and pre-alloc declarations flow unchanged.
+"""
+
+from pathlib import Path
+from typing import Any, ClassVar, Dict, List, Optional
+
+from execution_testing.base_types import Bytes, Hash
+from execution_testing.exceptions import ExceptionBase, ExceptionMapper
+from execution_testing.forks import Fork, TransitionFork
+from execution_testing.rpc import EngineRPC, EthRPC, TestingRPC, Web3RPC
+from execution_testing.rpc.rpc_types import (
+    ForkchoiceState,
+    GetPayloadResponse,
+    PayloadAttributes,
+    PayloadStatusEnum,
+)
+from execution_testing.test_types import Requests, Transaction, Withdrawal
+from execution_testing.test_types.block_access_list import BlockAccessList
+from execution_testing.test_types.receipt_types import TransactionReceipt
+
+from .cli_types import (
+    EnginePayloadMetadata,
+    LazyAllocJson,
+    OpcodeCount,
+    Result,
+    Traces,
+    TransitionToolOutput,
+)
+from .transition_tool import TransitionTool
+
+
+class ClientBackendExceptionMapper(ExceptionMapper):
+    """
+    Exception mapper for live-client responses.
+
+    ``reliable = False`` signals that engine API errors cannot be accurately
+    mapped to EEST transaction/block exceptions; tests that assert on a
+    specific failure mode should prefer the t8n path.
+    """
+
+    mapping_substring: ClassVar[Dict[ExceptionBase, str]] = {}
+    mapping_regex: ClassVar[Dict[ExceptionBase, str]] = {}
+    reliable: ClassVar[bool] = False
+
+
+class ClientBackend:
+    """
+    ``FillerBackend`` driven by ``testing_buildBlockV1``.
+
+    One instance wraps a live client connection. Subsequent ``evaluate`` calls
+    advance the client's canonical chain via ``engine_newPayloadVX`` +
+    ``engine_forkchoiceUpdatedVX`` so future blocks build on the previous one.
+    """
+
+    exception_mapper: ExceptionMapper
+    snapshot_block: Dict[str, Any] | None
+    """Raw datadir head, set by the fill-stateful plugin pre-session."""
+    start_block: Dict[str, Any] | None
+    """Client head after global pre-run setup; per-test chains off this."""
+
+    # t8n-compatibility stubs — fill's filler reads these on the backend.
+    opcode_count: OpcodeCount | None = None
+    output_cache: Any = None
+    debug_dump_dir: Path | None = None
+    call_counter: int = 0
+    _info_metadata: Dict[str, Any]
+
+    # Session fees pinned by the fill-stateful plugin; read by
+    # ``make_stateful_fixture`` to size pre-alloc funding.
+    gas_price: int = 0
+    max_fee_per_gas: int = 0
+    max_priority_fee_per_gas: int = 0
+    max_fee_per_blob_gas: int = 0
+
+    def __init__(
+        self,
+        *,
+        testing_rpc: TestingRPC,
+        engine_rpc: EngineRPC,
+        eth_rpc: EthRPC,
+        fork: Fork | TransitionFork,
+    ) -> None:
+        """Initialize with the RPC clients and the session fork."""
+        self.testing_rpc = testing_rpc
+        self.engine_rpc = engine_rpc
+        self.eth_rpc = eth_rpc
+        self.fork = fork
+        self.exception_mapper = ClientBackendExceptionMapper()
+        self.snapshot_block = None
+        self.start_block = None
+        self._info_metadata = {}
+        self.gas_price = 0
+        self.max_fee_per_gas = 0
+        self.max_priority_fee_per_gas = 0
+        self.max_fee_per_blob_gas = 0
+        # Captured for the fixture's ``_info.filling-transition-tool``.
+        try:
+            self._client_version: str | None = Web3RPC(
+                eth_rpc.url
+            ).client_version()
+        except Exception:  # pragma: no cover — no web3 namespace
+            self._client_version = None
+
+    def version(self) -> str:
+        """Return an identifier for this backend (used in fixture _info)."""
+        if self._client_version:
+            return f"ClientBackend[{self._client_version}; fork={self.fork}]"
+        return f"ClientBackend[fork={self.fork}]"
+
+    def shutdown(self) -> None:
+        """No-op — owned by the fill-stateful plugin."""
+        return
+
+    def reset_traces(self) -> None:
+        """No-op — traces not supported."""
+        return
+
+    def reset_opcode_count(self) -> None:
+        """No-op — opcode counting not supported."""
+        return
+
+    def set_cache(self, *, key: str) -> bool:
+        """No-op — caching not meaningful for a live client."""
+        del key
+        return False
+
+    def remove_cache(self) -> None:
+        """No-op — caching not meaningful for a live client."""
+        return
+
+    def increment_call_counter(self) -> int:
+        """Increment and return the call counter (book-keeping only)."""
+        previous = self.call_counter
+        self.call_counter += 1
+        return previous
+
+    def get_next_transition_tool_output_path(
+        self, call_id: int
+    ) -> Optional[Path]:
+        """Return ``None`` — debug dumps not supported."""
+        del call_id
+        return None
+
+    def get_traces(self) -> List[Traces] | None:
+        """Return ``None`` — traces are not available via the engine API."""
+        return None
+
+    def evaluate(
+        self,
+        *,
+        transition_tool_data: TransitionTool.TransitionToolData,
+        slow_request: bool = False,
+    ) -> TransitionToolOutput:
+        """Build a block via ``testing_buildBlockV1`` and return its result."""
+        del slow_request  # not meaningful for the engine path
+        env = transition_tool_data.env
+        txs = transition_tool_data.txs
+        block_fork = transition_tool_data.fork
+
+        payload_attributes = self._payload_attributes(env, block_fork)
+        parent_block_hash = Hash(env.parent_hash or 0)
+        get_payload_response = self.testing_rpc.build_block(
+            parent_block_hash=parent_block_hash,
+            payload_attributes=payload_attributes,
+            transactions=txs,
+            extra_data=Bytes(env.extra_data),
+        )
+        self._finalize(
+            get_payload_response,
+            parent_beacon_block_root=(
+                payload_attributes.parent_beacon_block_root
+            ),
+            block_fork=block_fork,
+        )
+        np_version = block_fork.engine_new_payload_version()
+        fcu_version = block_fork.engine_forkchoice_updated_version()
+        assert np_version is not None
+        assert fcu_version is not None
+
+        receipts = self._fetch_receipts(txs)
+        result = self._build_result(
+            built_payload=get_payload_response.execution_payload,
+            execution_requests=get_payload_response.execution_requests,
+            receipts=receipts,
+            withdrawals=env.withdrawals,
+            block_fork=block_fork,
+        )
+        alloc = LazyAllocJson(raw={}, _state_root=result.state_root)
+        return TransitionToolOutput(
+            alloc=alloc,
+            senders_authorities={},
+            result=result,
+            engine_payload=EnginePayloadMetadata(
+                payload_response=get_payload_response,
+                new_payload_version=np_version,
+                forkchoice_updated_version=fcu_version,
+                parent_beacon_block_root=(
+                    payload_attributes.parent_beacon_block_root
+                ),
+            ),
+        )
+
+    def _payload_attributes(
+        self,
+        env: Any,
+        block_fork: Fork,
+    ) -> PayloadAttributes:
+        """Build ``PayloadAttributes`` from the test's environment."""
+        withdrawals: List[Withdrawal] | None = None
+        if block_fork.header_withdrawals_required():
+            withdrawals = list(env.withdrawals or [])
+        parent_beacon_block_root: Hash | None = None
+        if block_fork.header_beacon_root_required():
+            parent_beacon_block_root = Hash(env.parent_beacon_block_root or 0)
+        return PayloadAttributes.for_fork(
+            block_fork,
+            timestamp=int(env.timestamp),
+            prev_randao=Hash(env.prev_randao or 0),
+            suggested_fee_recipient=env.fee_recipient,
+            withdrawals=withdrawals,
+            parent_beacon_block_root=parent_beacon_block_root,
+        )
+
+    def _finalize(
+        self,
+        payload_response: GetPayloadResponse,
+        *,
+        parent_beacon_block_root: Hash | None,
+        block_fork: Fork,
+    ) -> None:
+        """
+        Advance the chain with engine_newPayload + forkchoiceUpdated.
+
+        Both calls retry past transient ``SYNCING`` (geth returns it
+        under back-to-back chain-advance load); a stuck-SYNCING client
+        surfaces as a ``*TimeoutError``.
+        """
+        new_payload_version = block_fork.engine_new_payload_version()
+        fcu_version = block_fork.engine_forkchoice_updated_version()
+        assert new_payload_version is not None
+        assert fcu_version is not None
+
+        new_payload_args: List[Any] = [payload_response.execution_payload]
+        if payload_response.blobs_bundle is not None:
+            new_payload_args.append(
+                payload_response.blobs_bundle.blob_versioned_hashes()
+            )
+        if parent_beacon_block_root is not None:
+            new_payload_args.append(parent_beacon_block_root)
+        if payload_response.execution_requests is not None:
+            new_payload_args.append(payload_response.execution_requests)
+
+        new_payload_response = self.engine_rpc.new_payload_with_retry(
+            *new_payload_args, version=new_payload_version
+        )
+        assert new_payload_response.status == PayloadStatusEnum.VALID, (
+            f"Block was rejected by engine_newPayloadV{new_payload_version}: "
+            f"{new_payload_response.status}"
+        )
+
+        fcu_response = self.engine_rpc.forkchoice_updated_with_retry(
+            forkchoice_state=ForkchoiceState(
+                head_block_hash=payload_response.execution_payload.block_hash
+            ),
+            forkchoice_version=fcu_version,
+        )
+        assert fcu_response.payload_status.status == PayloadStatusEnum.VALID, (
+            "engine_forkchoiceUpdated rejected the built payload: "
+            f"{fcu_response.payload_status.status}"
+        )
+
+    def _fetch_receipts(
+        self, txs: List[Transaction]
+    ) -> List[TransactionReceipt]:
+        """Fetch receipts for each transaction. TODO: batch via JSON-RPC."""
+        receipts: List[TransactionReceipt] = []
+        for tx in txs:
+            receipt_data = self.eth_rpc.get_transaction_receipt(tx.hash)
+            if receipt_data is None:
+                raise RuntimeError(
+                    f"No receipt found for transaction {tx.hash}"
+                )
+            receipts.append(TransactionReceipt.model_validate(receipt_data))
+        return receipts
+
+    def _build_result(
+        self,
+        *,
+        built_payload: Any,
+        execution_requests: List[Bytes] | None,
+        receipts: List[TransactionReceipt],
+        withdrawals: List[Withdrawal] | None,
+        block_fork: Fork,
+    ) -> Result:
+        """Assemble a ``Result`` from the client-built payload + receipts."""
+        withdrawals_root: Hash | None = None
+        if block_fork.header_withdrawals_required():
+            withdrawals_root = Hash(Withdrawal.list_root(withdrawals or []))
+
+        requests: List[Bytes] | None = None
+        requests_hash: Hash | None = None
+        if block_fork.header_requests_required():
+            requests = list(execution_requests or [])
+            requests_hash = Hash(Requests(requests_lists=list(requests)))
+
+        block_access_list_hash: Hash | None = None
+        bal_rlp = getattr(built_payload, "block_access_list", None)
+        if bal_rlp is not None:
+            block_access_list_hash = Hash(
+                BlockAccessList.from_rlp(bal_rlp).rlp.keccak256()
+            )
+
+        return Result(
+            state_root=built_payload.state_root,
+            ommers_hash=None,
+            transactions_trie=Hash(0),  # overridden downstream
+            receipts_root=built_payload.receipts_root,
+            logs_hash=Hash(0),  # not surfaced downstream via FixtureHeader
+            logs_bloom=built_payload.logs_bloom,
+            receipts=receipts,
+            rejected_transactions=[],
+            gas_used=built_payload.gas_used,
+            base_fee_per_gas=built_payload.base_fee_per_gas,
+            withdrawals_root=withdrawals_root,
+            excess_blob_gas=built_payload.excess_blob_gas,
+            blob_gas_used=built_payload.blob_gas_used,
+            requests_hash=requests_hash,
+            requests=requests,
+            block_access_list=bal_rlp,
+            block_access_list_hash=block_access_list_hash,
+            block_exception=None,
+            traces=None,
+            opcode_count=None,
+        )
diff --git a/packages/testing/src/execution_testing/client_clis/clis/besu.py b/packages/testing/src/execution_testing/client_clis/clis/besu.py
index dbe965c64eb..ce0789cd399 100644
--- a/packages/testing/src/execution_testing/client_clis/clis/besu.py
+++ b/packages/testing/src/execution_testing/client_clis/clis/besu.py
@@ -424,11 +424,13 @@ class BesuExceptionMapper(ExceptionMapper):
             r"exceeds transaction sender account balance 0x[0-9a-f]+"
         ),
         TransactionException.INTRINSIC_GAS_TOO_LOW: (
-            r"transaction invalid intrinsic gas cost \d+ "
+            r"transaction invalid intrinsic gas cost \d+"
+            r"(?: \(regular \d+ \+ state \d+\))? "
             r"exceeds gas limit \d+"
         ),
         TransactionException.INTRINSIC_GAS_BELOW_FLOOR_GAS_COST: (
-            r"transaction invalid intrinsic gas cost \d+ "
+            r"transaction invalid intrinsic gas cost \d+"
+            r"(?: \(regular \d+ \+ state \d+\))? "
             r"exceeds gas limit \d+"
         ),
         TransactionException.SENDER_NOT_EOA: (
@@ -455,20 +457,11 @@ class BesuExceptionMapper(ExceptionMapper):
             r"Blob transaction has too many blobs: \d+|"
             r"Invalid Blob Count: \d+"
         ),
-        # BAL Exceptions: TODO - review once all clients completed.
-        BlockException.INVALID_BAL_EXTRA_ACCOUNT: (
-            r"Block access list hash mismatch, "
-            r"calculated:\s*(0x[a-f0-9]+)\s+header:\s*(0x[a-f0-9]+)|"
-            r"Block access list validation failed for block 0x[a-f0-9]+"
-        ),
+        # BAL Exceptions
         BlockException.INVALID_BAL_HASH: (
             r"Block access list hash mismatch, "
             r"calculated:\s*(0x[a-f0-9]+)\s+header:\s*(0x[a-f0-9]+)"
         ),
-        BlockException.INVALID_BAL_MISSING_ACCOUNT: (
-            r"Block access list hash mismatch, "
-            r"calculated:\s*(0x[a-f0-9]+)\s+header:\s*(0x[a-f0-9]+)"
-        ),
         BlockException.BLOCK_ACCESS_LIST_GAS_LIMIT_EXCEEDED: (
             r"Block access list validation failed for block 0x[a-f0-9]+"
         ),
diff --git a/packages/testing/src/execution_testing/client_clis/clis/erigon.py b/packages/testing/src/execution_testing/client_clis/clis/erigon.py
index a4331640fc0..e0a77b5f71a 100644
--- a/packages/testing/src/execution_testing/client_clis/clis/erigon.py
+++ b/packages/testing/src/execution_testing/client_clis/clis/erigon.py
@@ -1,10 +1,28 @@
 """Erigon execution client transition tool."""
 
+import json
+import re
+import shlex
+import shutil
+import subprocess
+import textwrap
+from functools import cache
+from pathlib import Path
+from typing import Any, Dict, List, Optional
+
 from execution_testing.exceptions import (
     BlockException,
     ExceptionMapper,
     TransactionException,
 )
+from execution_testing.fixtures import (
+    BlockchainFixture,
+    FixtureFormat,
+    StateFixture,
+)
+
+from ..ethereum_cli import EthereumCLI
+from ..fixture_consumer_tool import FixtureConsumerTool
 
 
 class ErigonExceptionMapper(ExceptionMapper):
@@ -94,26 +112,22 @@ class ErigonExceptionMapper(ExceptionMapper):
         BlockException.INVALID_STATE_ROOT: "invalid block: wrong trie root",
         BlockException.INVALID_RECEIPTS_ROOT: "receiptHash mismatch",
         BlockException.INVALID_LOG_BLOOM: "invalid bloom",
-        BlockException.INVALID_BAL_MISSING_ACCOUNT: (
-            "block access list mismatch"
-        ),
         BlockException.INCORRECT_BLOCK_FORMAT: "invalid block access list",
-        BlockException.INVALID_BAL_EXTRA_ACCOUNT: "invalid block access list",
         BlockException.GAS_USED_OVERFLOW: "block gas used overflow",
     }
     mapping_regex = {
-        BlockException.INVALID_BLOCK_ACCESS_LIST: (
+        BlockException.INVALID_BAL_HASH: (
             r"invalid block access list|block access list mismatch"
         ),
-        BlockException.INVALID_BAL_MISSING_ACCOUNT: (
-            r"block access list mismatch"
-        ),
-        BlockException.INVALID_BAL_EXTRA_ACCOUNT: (
-            r"invalid block access list"
+        BlockException.INVALID_BLOCK_ACCESS_LIST: (
+            r"invalid block access list|block access list mismatch"
         ),
         BlockException.INCORRECT_BLOCK_FORMAT: (r"invalid block access list"),
+        BlockException.BLOCK_ACCESS_LIST_GAS_LIMIT_EXCEEDED: (
+            r"block access list too large"
+        ),
         TransactionException.GAS_LIMIT_EXCEEDS_MAXIMUM: (
-            r"invalid block, txnIdx=\d+,.*gas limit too high"
+            r"gas limit too high"
         ),
         BlockException.INCORRECT_BLOB_GAS_USED: (
             r"blobGasUsed by execution: \d+, in header: \d+"
@@ -128,3 +142,292 @@ class ErigonExceptionMapper(ExceptionMapper):
             r"invalid gasUsed: have \d+, gasLimit \d+"
         ),
     }
+
+
+class ErigonEvm(EthereumCLI):
+    """
+    Erigon `evm` base class.
+
+    Erigon's `evm` tool shares go-ethereum's command surface (`evm version`,
+    `evm statetest`, `evm blocktest`, `evm t8n`) and prints an
+    indistinguishable ``evm version <semver>...`` banner, so the version string
+    alone cannot tell the two apart. ``detect_binary`` instead probes the
+    binary itself: Erigon's `evm` exposes an ``enginextest`` subcommand (its
+    engine-x test runner) that go-ethereum's `evm` does not, which is a stable,
+    version-independent fingerprint.
+    """
+
+    default_binary = Path("evm")
+    # Cheap pre-filter shared with go-ethereum; the binary probe in
+    # `detect_binary` is what actually confirms Erigon.
+    detect_binary_pattern = re.compile(r"^evm(\.exe)? version\b")
+    # Erigon-only subcommand, used as the disambiguating fingerprint.
+    erigon_marker = "enginextest"
+    cached_version: Optional[str] = None
+    trace: bool
+
+    def __init__(
+        self,
+        binary: Optional[Path] = None,
+        trace: bool = False,
+    ):
+        """Initialize the ErigonEvm class."""
+        self.binary = binary if binary else self.default_binary
+        self.trace = trace
+        self._info_metadata: Optional[Dict[str, Any]] = {}
+
+    @classmethod
+    def detect_binary(
+        cls, binary_output: str, binary: Optional[Path] = None
+    ) -> bool:
+        """
+        Confirm the binary is Erigon's `evm`, not go-ethereum's.
+
+        Both print ``evm version ...``; after that cheap check passes we probe
+        the binary's ``--help`` for Erigon's ``enginextest`` subcommand.
+        Without a binary to probe (or if the probe fails) we cannot positively
+        identify Erigon, so we decline and let go-ethereum's consumer claim it.
+        """
+        if not super().detect_binary(binary_output, binary):
+            return False
+        if binary is None:
+            return False
+        try:
+            help_output = subprocess.run(
+                [str(binary), "--help"],
+                stdout=subprocess.PIPE,
+                stderr=subprocess.STDOUT,
+                text=True,
+                timeout=10,
+            ).stdout
+        except Exception:
+            return False
+        return cls.erigon_marker in help_output
+
+    def _run_command(self, command: List[str]) -> subprocess.CompletedProcess:
+        try:
+            return subprocess.run(
+                command,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+            )
+        except subprocess.CalledProcessError as e:
+            raise Exception("Command failed with non-zero status.") from e
+        except Exception as e:
+            raise Exception("Unexpected exception calling evm tool.") from e
+
+    def _consume_debug_dump(
+        self,
+        command: List[str],
+        result: subprocess.CompletedProcess,
+        fixture_path: Path,
+        debug_output_path: Path,
+    ) -> None:
+        assert all(isinstance(x, str) for x in command), (
+            f"Not all elements of 'command' list are strings: {command}"
+        )
+        assert len(command) > 0
+
+        # the fixture path is always the last argument
+        debug_fixture_path = str(debug_output_path / "fixtures.json")
+        command[-1] = debug_fixture_path
+
+        consume_direct_call = " ".join(shlex.quote(arg) for arg in command)
+        consume_direct_script = textwrap.dedent(
+            f"""\
+            #!/bin/bash
+            {consume_direct_call}
+            """
+        )
+        from ..transition_tool import dump_files_to_directory
+
+        dump_files_to_directory(
+            debug_output_path,
+            {
+                "consume_direct_args.py": command,
+                "consume_direct_returncode.txt": result.returncode,
+                "consume_direct_stdout.txt": result.stdout,
+                "consume_direct_stderr.txt": result.stderr,
+                "consume_direct.sh+x": consume_direct_script,
+            },
+        )
+        shutil.copyfile(fixture_path, debug_fixture_path)
+
+    @cache  # noqa
+    def help(self, subcommand: str | None = None) -> str:
+        """Return the help string, optionally for a subcommand."""
+        help_command = [str(self.binary)]
+        if subcommand:
+            help_command.append(subcommand)
+        help_command.append("--help")
+        return self._run_command(help_command).stdout
+
+
+class ErigonFixtureConsumer(
+    ErigonEvm,
+    FixtureConsumerTool,
+    fixture_formats=[StateFixture, BlockchainFixture],
+):
+    """
+    Erigon's implementation of the fixture consumer.
+
+    Mirrors ``GethFixtureConsumer`` but passes ``--jsonout`` to ``statetest``
+    and ``blocktest``: unlike go-ethereum, Erigon defaults to human-readable
+    output and only emits the JSON result array (``[{name, pass, error, ...}]``
+    on stdout) when ``--jsonout`` is given. Without it the consumer's
+    ``json.loads`` fails on the first non-JSON line.
+    """
+
+    def consume_blockchain_test(
+        self,
+        fixture_path: Path,
+        fixture_name: Optional[str] = None,
+        debug_output_path: Optional[Path] = None,
+    ) -> None:
+        """Consume a single blockchain test."""
+        subcommand = "blocktest"
+        subcommand_options = ["--jsonout"]
+        if debug_output_path:
+            subcommand_options += ["--verbosity", "100"]
+
+        if fixture_name:
+            subcommand_options += ["--run", re.escape(fixture_name)]
+
+        command = (
+            [str(self.binary)]
+            + [subcommand]
+            + subcommand_options
+            + [str(fixture_path)]
+        )
+
+        result = self._run_command(command)
+
+        if debug_output_path:
+            self._consume_debug_dump(
+                command, result, fixture_path, debug_output_path
+            )
+
+        if result.returncode != 0:
+            raise Exception(
+                f"Unexpected exit code:\n{' '.join(command)}\n\n"
+                f"Error:\n{result.stderr}"
+            )
+
+        result_json = json.loads(result.stdout)
+        if not isinstance(result_json, list):
+            raise Exception(
+                f"Unexpected result from evm blocktest: {result_json}"
+            )
+
+        if any(not test_result["pass"] for test_result in result_json):
+            exception_text = "Blockchain test failed: \n" + "\n".join(
+                f"{test_result['name']}: " + test_result["error"]
+                for test_result in result_json
+                if not test_result["pass"]
+            )
+            raise Exception(exception_text)
+
+    @cache  # noqa
+    def consume_state_test_file(
+        self,
+        fixture_path: Path,
+        debug_output_path: Optional[Path] = None,
+    ) -> List[Dict[str, Any]]:
+        """
+        Consume an entire state test file.
+
+        `evm statetest` executes every test in the file at once, so the result
+        is cached and `consume_state_test` selects the requested test from it.
+        """
+        subcommand = "statetest"
+        subcommand_options = ["--jsonout"]
+        if debug_output_path:
+            subcommand_options += ["--json"]
+
+        command = (
+            [str(self.binary)]
+            + [subcommand]
+            + subcommand_options
+            + [str(fixture_path)]
+        )
+        result = self._run_command(command)
+
+        if debug_output_path:
+            self._consume_debug_dump(
+                command, result, fixture_path, debug_output_path
+            )
+
+        if result.returncode != 0:
+            raise Exception(
+                f"Unexpected exit code:\n{' '.join(command)}\n\n"
+                f"Error:\n{result.stderr}"
+            )
+
+        result_json = json.loads(result.stdout)
+        if not isinstance(result_json, list):
+            raise Exception(
+                f"Unexpected result from evm statetest: {result_json}"
+            )
+        return result_json
+
+    def consume_state_test(
+        self,
+        fixture_path: Path,
+        fixture_name: Optional[str] = None,
+        debug_output_path: Optional[Path] = None,
+    ) -> None:
+        """Consume a single state test from the cached file results."""
+        file_results = self.consume_state_test_file(
+            fixture_path=fixture_path,
+            debug_output_path=debug_output_path,
+        )
+        if fixture_name:
+            test_result = [
+                test_result
+                for test_result in file_results
+                if test_result["name"] == fixture_name
+            ]
+            assert len(test_result) < 2, (
+                f"Multiple test results for {fixture_name}"
+            )
+            assert len(test_result) == 1, (
+                f"Test result for {fixture_name} missing"
+            )
+            assert test_result[0]["pass"], (
+                f"State test failed: {test_result[0]['error']}"
+            )
+        else:
+            if any(not test_result["pass"] for test_result in file_results):
+                exception_text = "State test failed: \n" + "\n".join(
+                    f"{test_result['name']}: " + test_result["error"]
+                    for test_result in file_results
+                    if not test_result["pass"]
+                )
+                raise Exception(exception_text)
+
+    def consume_fixture(
+        self,
+        fixture_format: FixtureFormat,
+        fixture_path: Path,
+        fixture_name: Optional[str] = None,
+        debug_output_path: Optional[Path] = None,
+    ) -> None:
+        """Dispatch to the appropriate Erigon fixture consumer."""
+        if fixture_format == BlockchainFixture:
+            self.consume_blockchain_test(
+                fixture_path=fixture_path,
+                fixture_name=fixture_name,
+                debug_output_path=debug_output_path,
+            )
+        elif fixture_format == StateFixture:
+            self.consume_state_test(
+                fixture_path=fixture_path,
+                fixture_name=fixture_name,
+                debug_output_path=debug_output_path,
+            )
+        else:
+            raise Exception(
+                f"Fixture format {fixture_format.format_name} "
+                f"not supported by {self.binary}"
+            )
diff --git a/packages/testing/src/execution_testing/client_clis/clis/ethrex.py b/packages/testing/src/execution_testing/client_clis/clis/ethrex.py
index 8a7d03f26f8..d85a1e7ce86 100644
--- a/packages/testing/src/execution_testing/client_clis/clis/ethrex.py
+++ b/packages/testing/src/execution_testing/client_clis/clis/ethrex.py
@@ -32,7 +32,7 @@ class EthrexExceptionMapper(ExceptionMapper):
             "World State Root does not match the one in "
             "the header after executing"
         ),
-        BlockException.GAS_USED_OVERFLOW: "Block gas used overflow",
+        BlockException.GAS_USED_OVERFLOW: "Gas allowance exceeded",
         BlockException.INVALID_BLOCK_ACCESS_LIST: (
             "Block access list hash does not match the one in "
             "the header after executing"
@@ -41,14 +41,6 @@ class EthrexExceptionMapper(ExceptionMapper):
             "Block access list hash does not match the one in "
             "the header after executing"
         ),
-        BlockException.INVALID_BAL_EXTRA_ACCOUNT: (
-            "Block access list hash does not match the one in "
-            "the header after executing"
-        ),
-        BlockException.INVALID_BAL_MISSING_ACCOUNT: (
-            "Block access list hash does not match the one in "
-            "the header after executing"
-        ),
         BlockException.INCORRECT_BLOCK_FORMAT: (
             "not in strictly ascending order for"
         ),
@@ -142,7 +134,7 @@ class EthrexExceptionMapper(ExceptionMapper):
         TransactionException.GAS_ALLOWANCE_EXCEEDED: (
             r"Gas allowance exceeded.*"
         ),
-        BlockException.GAS_USED_OVERFLOW: (r"Block gas used overflow.*"),
+        BlockException.GAS_USED_OVERFLOW: (r"Gas allowance exceeded.*"),
         TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED: (
             r"Blob count exceeded.*"
         ),
@@ -175,11 +167,7 @@ class EthrexExceptionMapper(ExceptionMapper):
         BlockException.RLP_BLOCK_LIMIT_EXCEEDED: (
             r"Maximum block size exceeded.*"
         ),
-        BlockException.INVALID_BAL_EXTRA_ACCOUNT: (
-            r"Block access list accounts not in strictly ascending order.*|"
-            r"BAL validation failed: account .* was never accessed.*"
-        ),
-        BlockException.INVALID_BAL_MISSING_ACCOUNT: (r"absent from BAL"),
+        BlockException.INVALID_BAL_HASH: r"BAL validation failed",
         BlockException.INVALID_BLOCK_ACCESS_LIST: (
             r"Block access list contains index \d+ "
             r"exceeding max valid index \d+|"
@@ -187,8 +175,10 @@ class EthrexExceptionMapper(ExceptionMapper):
             r"Block access list .+ not in strictly ascending order.*|"
             r"BAL validation failed for (tx \d+|system_tx|withdrawal): .*|"
             r"BAL validation failed: .*|"
+            r"absent from BAL|"
             r"Block access list slot .+ is in both "
-            r"storage_changes and storage_reads.*"
+            r"storage_changes and storage_reads.*|"
+            r"Invalid block hash"
         ),
         BlockException.INCORRECT_BLOCK_FORMAT: (
             r"Block access list hash does not match "
diff --git a/packages/testing/src/execution_testing/client_clis/clis/geth.py b/packages/testing/src/execution_testing/client_clis/clis/geth.py
index c41aff697d2..25f0e0244e9 100644
--- a/packages/testing/src/execution_testing/client_clis/clis/geth.py
+++ b/packages/testing/src/execution_testing/client_clis/clis/geth.py
@@ -111,12 +111,6 @@ class GethExceptionMapper(ExceptionMapper):
         BlockException.RLP_BLOCK_LIMIT_EXCEEDED: (
             "block RLP-encoded size exceeds maximum"
         ),
-        BlockException.INVALID_BAL_EXTRA_ACCOUNT: (
-            "BAL change not reported in computed"
-        ),
-        BlockException.INVALID_BAL_MISSING_ACCOUNT: (
-            "additional mutations compared to BAL"
-        ),
         BlockException.INVALID_BLOCK_ACCESS_LIST: "unequal",
         BlockException.INVALID_BASEFEE_PER_GAS: "invalid baseFee",
         BlockException.INVALID_BLOCK_TIMESTAMP_OLDER_THAN_PARENT: (
@@ -157,20 +151,26 @@ class GethExceptionMapper(ExceptionMapper):
         #
         # EELS definition for `is_valid_deposit_event_data`:
         # https://github.com/ethereum/execution-specs/blob/5ddb904fa7ba27daeff423e78466744c51e8cb6a/src/ethereum/forks/prague/requests.py#L51
-        # BAL Exceptions: TODO - review once all clients completed.
-        BlockException.INVALID_BAL_EXTRA_ACCOUNT: (
-            r"invalid block access list:"
-        ),
+        # BAL Exceptions
         BlockException.INVALID_BAL_HASH: (r"invalid block access list:"),
-        BlockException.INVALID_BAL_MISSING_ACCOUNT: (
-            r"computed state diff contained mutated accounts "
-            r"which weren't reported in BAL"
-        ),
         BlockException.INVALID_BLOCK_ACCESS_LIST: (
             r"difference between computed state diff and "
-            r"BAL entry for account|invalid block access list:"
+            r"BAL entry for account|"
+            r"invalid block access list:|"
+            r"computed state diff contained mutated accounts "
+            r"which weren't reported in BAL|"
+            r"BAL change not reported in computed|"
+            r"additional mutations compared to BAL|"
+            r"[bB][aA][lL] validation fail"
         ),
         BlockException.INCORRECT_BLOCK_FORMAT: (r"invalid block access list:"),
+        BlockException.BLOCK_ACCESS_LIST_GAS_LIMIT_EXCEEDED: (
+            r"block access list exceeds gas limit"
+        ),
+        BlockException.GAS_USED_OVERFLOW: (r"gas limit reached"),
+        TransactionException.INTRINSIC_GAS_TOO_LOW: (
+            r"insufficient gas for floor data gas cost"
+        ),
     }
 
 
diff --git a/packages/testing/src/execution_testing/client_clis/clis/nethermind.py b/packages/testing/src/execution_testing/client_clis/clis/nethermind.py
index 8ef9411886c..929fc139cbb 100644
--- a/packages/testing/src/execution_testing/client_clis/clis/nethermind.py
+++ b/packages/testing/src/execution_testing/client_clis/clis/nethermind.py
@@ -347,10 +347,10 @@ class NethermindExceptionMapper(ExceptionMapper):
             "blob transaction of type create"
         ),
         TransactionException.TYPE_4_EMPTY_AUTHORIZATION_LIST: (
-            "MissingAuthorizationList: Must be set"
+            "EIP-7702 transaction with empty auth list"
         ),
         TransactionException.TYPE_4_TX_CONTRACT_CREATION: (
-            "NotAllowedCreateTransaction: To must be set"
+            "EIP-7702 transaction cannot be used to create contract"
         ),
         TransactionException.TYPE_4_TX_PRE_FORK: (
             "InvalidTxType: Transaction type in Custom is not supported"
@@ -397,12 +397,22 @@ class NethermindExceptionMapper(ExceptionMapper):
             "InvalidStateRoot: State root in header does not match"
         ),
         BlockException.GAS_USED_OVERFLOW: ("Block gas limit exceeded"),
+        BlockException.BLOCK_ACCESS_LIST_GAS_LIMIT_EXCEEDED: (
+            "BlockAccessListGasLimitExceeded:"
+        ),
     }
     mapping_regex = {
         TransactionException.INSUFFICIENT_ACCOUNT_FUNDS: (
             r"insufficient sender balance|"
             r"insufficient MaxFeePerGas for sender balance"
+            r"|insufficient funds for gas \* price \+ value"
+            r"|insufficient funds for transfer|insufficient funds for gas"
+        ),
+        TransactionException.INSUFFICIENT_MAX_FEE_PER_GAS: (
+            r"max fee per gas less than block base fee"
         ),
+        TransactionException.NONCE_MISMATCH_TOO_LOW: (r"nonce too low"),
+        TransactionException.NONCE_MISMATCH_TOO_HIGH: (r"nonce too high"),
         TransactionException.TYPE_3_TX_WITH_FULL_BLOBS: (
             r"Transaction \d+ is not valid"
         ),
@@ -415,7 +425,7 @@ class NethermindExceptionMapper(ExceptionMapper):
             r"exceeded MaxBlobGas per transaction=\d+"
         ),
         TransactionException.GAS_LIMIT_EXCEEDS_MAXIMUM: (
-            r"TxGasLimitCapExceeded: Gas limit \d+ \w+ cap of \d+\.?"
+            r"TxGasLimitCapExceeded:"
         ),
         BlockException.INCORRECT_EXCESS_BLOB_GAS: (
             r"HeaderExcessBlobGasMismatch: Excess blob gas in header "
@@ -431,21 +441,26 @@ class NethermindExceptionMapper(ExceptionMapper):
         BlockException.SYSTEM_CONTRACT_CALL_FAILED: (
             r"(Withdrawals|Consolidations)Failed: Contract execution failed\."
         ),
-        # BAL Exceptions: TODO - review once all clients completed.
-        BlockException.INVALID_BAL_EXTRA_ACCOUNT: (
-            r"could not be parsed as a block: "
-            r"Could not decode block access list."
-        ),
-        BlockException.INVALID_BAL_HASH: (r"InvalidBlockLevelAccessListRoot:"),
-        BlockException.INVALID_BAL_MISSING_ACCOUNT: (
-            r"InvalidBlockLevelAccessListRoot:"
-        ),
+        # BAL Exceptions — specific exceptions have unique patterns, but
+        # INVALID_BLOCK_ACCESS_LIST and INCORRECT_BLOCK_FORMAT intentionally
+        # overlap because the test framework requires `want in got` matching.
+        # BAL Exceptions
+        BlockException.INVALID_BAL_HASH: (r"InvalidBlockLevelAccessListHash:"),
         BlockException.INVALID_BLOCK_ACCESS_LIST: (
-            r"InvalidBlockLevelAccessListRoot:|could not be parsed as a "
-            r"block: Could not decode block access list."
+            r"InvalidBlockLevelAccessListHash:"
+            r"|InvalidBlockLevelAccessList:"
+            r"|BlockLevelAccessListIndexOutOfRange:"
+            r"|could not be parsed as a block: "
+            r"Error decoding block access list:"
+            r"|Error decoding block access list:"
         ),
         BlockException.INCORRECT_BLOCK_FORMAT: (
             r"could not be parsed as a block: "
-            r"Could not decode block access list."
+            r"Error decoding block access list:"
+            r"|Error decoding block access list:"
+        ),
+        TransactionException.GAS_ALLOWANCE_EXCEEDED: (
+            r"TxGasLimitCapExceeded:"
+            r"|BlockAccessListGasLimitExceeded:"
         ),
     }
diff --git a/packages/testing/src/execution_testing/client_clis/clis/reth.py b/packages/testing/src/execution_testing/client_clis/clis/reth.py
index 6a70ebcc5e9..c2193fcb996 100644
--- a/packages/testing/src/execution_testing/client_clis/clis/reth.py
+++ b/packages/testing/src/execution_testing/client_clis/clis/reth.py
@@ -60,7 +60,8 @@ class RethExceptionMapper(ExceptionMapper):
             r"max fee per blob gas \(\d+\)"
         ),
         TransactionException.INTRINSIC_GAS_TOO_LOW: (
-            r"call gas cost \(\d+\) exceeds the gas limit \(\d+\)"
+            r"call gas cost \(\d+\) exceeds the gas limit \(\d+\)|"
+            r"gas floor \(\d+\) exceeds the gas limit \(\d+\)"
         ),
         TransactionException.INTRINSIC_GAS_BELOW_FLOOR_GAS_COST: (
             r"gas floor \(\d+\) exceeds the gas limit \(\d+\)"
@@ -75,7 +76,8 @@ class RethExceptionMapper(ExceptionMapper):
             r"blob transactions present in pre-cancun payload|empty blobs"
         ),
         TransactionException.GAS_ALLOWANCE_EXCEEDED: (
-            r"transaction gas limit \w+ is more than blocks available gas \w+"
+            r"transaction gas limit \w+ is more than blocks available gas \w+|"
+            r"caller gas limit exceeds the block gas limit"
         ),
         TransactionException.GAS_LIMIT_EXCEEDS_MAXIMUM: (
             r"transaction gas limit.*is greater than the cap"
@@ -109,19 +111,15 @@ class RethExceptionMapper(ExceptionMapper):
         BlockException.GAS_USED_OVERFLOW: (
             r"transaction gas limit \w+ is more than blocks available gas \w+"
         ),
-        # BAL Exceptions: TODO - review once all clients completed.
-        BlockException.INVALID_BAL_EXTRA_ACCOUNT: (
-            r"block access list hash mismatch"
-        ),
+        # BAL Exceptions
         BlockException.INVALID_BAL_HASH: (r"block access list hash mismatch"),
-        BlockException.INVALID_BAL_MISSING_ACCOUNT: (
-            r"block access list hash mismatch"
-        ),
         BlockException.INVALID_BLOCK_ACCESS_LIST: (
-            r"block access list hash mismatch"
+            r"block access list hash mismatch|"
+            r"BAL rejection: FinalHashMismatch"
         ),
         BlockException.INCORRECT_BLOCK_FORMAT: (
-            r"block access list hash mismatch"
+            r"block access list hash mismatch|"
+            r"BAL rejection: FinalHashMismatch"
         ),
         # Reth does not validate the sizes or offsets of the deposit
         # contract logs. As a workaround we have set
diff --git a/packages/testing/src/execution_testing/client_clis/ethereum_cli.py b/packages/testing/src/execution_testing/client_clis/ethereum_cli.py
index 1e02634f5b8..c2ca9d11d58 100644
--- a/packages/testing/src/execution_testing/client_clis/ethereum_cli.py
+++ b/packages/testing/src/execution_testing/client_clis/ethereum_cli.py
@@ -180,7 +180,7 @@ def from_binary_path(
                 for subclass in subclasses:
                     logger.debug(f"Trying subclass {subclass}")
                     try:
-                        if subclass.detect_binary(binary_output):
+                        if subclass.detect_binary(binary_output, binary):
                             subclass_check_result = subclass(
                                 binary=binary, **kwargs
                             )
@@ -204,10 +204,19 @@ def from_binary_path(
         raise UnknownCLIError(f"Unknown CLI: {binary}")
 
     @classmethod
-    def detect_binary(cls, binary_output: str) -> bool:
+    def detect_binary(
+        cls,
+        binary_output: str,
+        binary: Optional[Path] = None,  # noqa: ARG003
+    ) -> bool:
         """
         Return True if a CLI's `binary_output` matches the
         class's expected output.
+
+        `binary` is the resolved path to the tool being probed. Subclasses may
+        use it to disambiguate tools that share a version banner by inspecting
+        the binary itself (e.g. its subcommands), instead of relying on the
+        version string alone.
         """
         logger.debug(f"Trying to detect binary for {binary_output}..")
         assert cls.detect_binary_pattern is not None
diff --git a/packages/testing/src/execution_testing/client_clis/file_utils.py b/packages/testing/src/execution_testing/client_clis/file_utils.py
index 5b2047a6e7b..47c1232dfbc 100644
--- a/packages/testing/src/execution_testing/client_clis/file_utils.py
+++ b/packages/testing/src/execution_testing/client_clis/file_utils.py
@@ -1,6 +1,7 @@
 """Methods to work with the filesystem and json."""
 
 import os
+import shutil
 import stat
 from json import dump
 from pathlib import Path
@@ -9,6 +10,7 @@
 from pydantic import BaseModel, RootModel
 
 from execution_testing.client_clis.cli_types import (
+    LazyAllocFile,
     LazyAllocJson,
     LazyAllocStr,
     TransitionToolInput,
@@ -28,27 +30,41 @@ def dump_files_to_directory(output_path: Path, files: Dict[str, Any]) -> None:
         if rel_path:
             os.makedirs(output_path / rel_path, exist_ok=True)
         file_path = output_path / file_rel_path
-        with open(file_path, "w") as f:
-            if isinstance(file_contents, (LazyAllocStr, LazyAllocJson)):
-                if isinstance(file_contents, LazyAllocJson):
-                    dump(file_contents.raw, f, ensure_ascii=True, indent=4)
-                else:
-                    f.write(file_contents.raw)
-
-            elif isinstance(
-                file_contents, (BaseModel, RootModel, TransitionToolInput)
-            ):
-                f.write(
-                    file_contents.model_dump_json(
-                        indent=4,
-                        exclude_none=True,
-                        by_alias=True,
-                    )
+        if (
+            isinstance(file_contents, LazyAllocFile)
+            and Path(file_contents.raw).exists()
+        ):
+            shutil.copyfile(file_contents.raw, file_path)
+        elif isinstance(file_contents, LazyAllocFile):
+            # Backing temp dir was cleaned up after a previous `.get()`
+            # (e.g. chained-block t8n on the next block); fall back to
+            # the cached Alloc so debug dumps still capture the input.
+            file_path.write_text(
+                file_contents.get().model_dump_json(
+                    indent=4, exclude_none=True, by_alias=True
                 )
-            elif isinstance(file_contents, str):
-                f.write(file_contents)
-            else:
-                dump(file_contents, f, ensure_ascii=True, indent=4)
+            )
+        else:
+            with open(file_path, "w") as f:
+                if isinstance(file_contents, (LazyAllocStr, LazyAllocJson)):
+                    if isinstance(file_contents, LazyAllocJson):
+                        dump(file_contents.raw, f, ensure_ascii=True, indent=4)
+                    else:
+                        f.write(file_contents.raw)
+                elif isinstance(
+                    file_contents, (BaseModel, RootModel, TransitionToolInput)
+                ):
+                    f.write(
+                        file_contents.model_dump_json(
+                            indent=4,
+                            exclude_none=True,
+                            by_alias=True,
+                        )
+                    )
+                elif isinstance(file_contents, str):
+                    f.write(file_contents)
+                else:
+                    dump(file_contents, f, ensure_ascii=True, indent=4)
         if flags:
             file_mode = os.stat(file_path).st_mode
             if "x" in flags:
diff --git a/packages/testing/src/execution_testing/client_clis/filler_backend.py b/packages/testing/src/execution_testing/client_clis/filler_backend.py
new file mode 100644
index 00000000000..4ba91323506
--- /dev/null
+++ b/packages/testing/src/execution_testing/client_clis/filler_backend.py
@@ -0,0 +1,58 @@
+"""
+Backend protocol used by ``BlockchainTest`` to fill block data.
+
+``FillerBackend`` abstracts the "thing that fills a block" so fill's spec
+loop (``BlockchainTest.generate_block_data``) can dispatch to either:
+
+- a classical ``TransitionTool`` (t8n CLI/server — deterministic compute
+  path, the historical default), or
+- a live EL client (``ClientBackend`` — drives ``testing_buildBlockV1`` to
+  produce stateful fixtures against a warm datadir snapshot).
+
+The two concrete backends cover distinct territory — t8n is a state-
+transition function, a client is a stateful chain — but both return the
+same ``TransitionToolOutput`` shape so they are interchangeable from
+fill's perspective.
+
+``TransitionTool`` itself structurally satisfies this protocol, so existing
+callers continue to work unchanged.
+"""
+
+from typing import List, Protocol, runtime_checkable
+
+from execution_testing.exceptions import ExceptionMapper
+
+from .cli_types import Traces
+from .transition_tool import TransitionTool, TransitionToolOutput
+
+
+@runtime_checkable
+class FillerBackend(Protocol):
+    """
+    Minimal interface required by ``BlockchainTest.generate_block_data``.
+
+    Implementations:
+    - ``TransitionTool`` (classical t8n path) — fill's default.
+    - ``ClientBackend`` — drives ``testing_buildBlockV1`` against a live EL
+      client to produce stateful fixtures without t8n.
+    """
+
+    exception_mapper: ExceptionMapper
+    """
+    Maps backend-specific errors to EEST transaction/block exceptions.
+    ``exception_mapper.reliable`` indicates whether the mapping is trusted
+    for test assertions (t8n: True; live-client: typically False).
+    """
+
+    def evaluate(
+        self,
+        *,
+        transition_tool_data: "TransitionTool.TransitionToolData",
+        slow_request: bool = False,
+    ) -> TransitionToolOutput:
+        """Build a block and return the result."""
+        ...
+
+    def get_traces(self) -> List[Traces] | None:
+        """Return per-transaction traces if available, ``None`` otherwise."""
+        ...
diff --git a/packages/testing/src/execution_testing/client_clis/tests/test_trace_comparators.py b/packages/testing/src/execution_testing/client_clis/tests/test_trace_comparators.py
new file mode 100644
index 00000000000..b391197bb23
--- /dev/null
+++ b/packages/testing/src/execution_testing/client_clis/tests/test_trace_comparators.py
@@ -0,0 +1,1491 @@
+"""Tests for trace comparator types and ABC."""
+
+import pytest
+
+from execution_testing.base_types import HexNumber
+from execution_testing.client_clis.cli_types import (
+    TraceLine,
+    Traces,
+    TransactionTraces,
+)
+from execution_testing.client_clis.trace_comparators import (
+    FieldExclusionTraceComparator,
+    GasExhaustionTraceComparator,
+    TraceComparator,
+    TraceComparatorType,
+    TraceComparisonResult,
+    TraceDifference,
+    TransactionCountMismatch,
+    create_comparator,
+)
+
+# ---------------------------------------------------------------------------
+# Fixtures
+# ---------------------------------------------------------------------------
+
+
+@pytest.fixture()
+def trace_line() -> TraceLine:
+    """Return a default TraceLine."""
+    return _make_trace_line()
+
+
+@pytest.fixture()
+def transaction_traces(trace_line: TraceLine) -> TransactionTraces:
+    """Return a default TransactionTraces with one trace line."""
+    return _make_transaction_traces([trace_line])
+
+
+@pytest.fixture()
+def traces(transaction_traces: TransactionTraces) -> Traces:
+    """Return a default Traces with one transaction."""
+    return _make_traces([transaction_traces])
+
+
+@pytest.fixture()
+def spy_comparator() -> "_SpyComparator":
+    """Return a spy comparator that records calls."""
+    return _SpyComparator()
+
+
+@pytest.fixture()
+def failing_comparator() -> "_FailingComparator":
+    """Return a comparator that always reports a difference."""
+    return _FailingComparator()
+
+
+# ---------------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------------
+
+
+def _make_trace_line(**overrides: object) -> TraceLine:
+    """Create a TraceLine with sensible defaults."""
+    defaults = {
+        "pc": 0,
+        "op": 0x60,
+        "gas": 0x5F5E100,
+        "gas_cost": 0x3,
+        "mem_size": 0,
+        "stack": [],
+        "depth": 1,
+        "refund": 0,
+        "op_name": "PUSH1",
+    }
+    defaults.update(overrides)
+    return TraceLine.model_validate(defaults)
+
+
+def _make_transaction_traces(
+    trace_lines: list[TraceLine] | None = None,
+    output: str | None = "0x",
+) -> TransactionTraces:
+    """Create a TransactionTraces with default trace lines."""
+    if trace_lines is None:
+        trace_lines = [_make_trace_line()]
+    return TransactionTraces.model_validate(
+        {"traces": trace_lines, "output": output}
+    )
+
+
+def _make_traces(
+    transactions: list[TransactionTraces] | None = None,
+) -> Traces:
+    """Create a Traces object."""
+    if transactions is None:
+        transactions = [_make_transaction_traces()]
+    return Traces(root=transactions)
+
+
+class _SpyComparator(TraceComparator):
+    """Concrete subclass that records calls for testing the ABC."""
+
+    @property
+    def name(self) -> str:
+        """Return the comparator's name."""
+        return "spy"
+
+    def __init__(self) -> None:
+        self.calls: list[tuple[int]] = []
+
+    def compare_transaction_traces(
+        self,
+        baseline: TransactionTraces,  # noqa: ARG002
+        current: TransactionTraces,  # noqa: ARG002
+        transaction_index: int,
+    ) -> TraceComparisonResult:
+        self.calls.append((transaction_index,))
+        return TraceComparisonResult(equivalent=True, differences=[])
+
+
+class _FailingComparator(TraceComparator):
+    """Concrete subclass that always reports a difference."""
+
+    @property
+    def name(self) -> str:
+        """Return the comparator's name."""
+        return "failing"
+
+    def compare_transaction_traces(
+        self,
+        baseline: TransactionTraces,  # noqa: ARG002
+        current: TransactionTraces,  # noqa: ARG002
+        transaction_index: int,
+    ) -> TraceComparisonResult:
+        return TraceComparisonResult(
+            equivalent=False,
+            differences=[
+                TraceDifference(
+                    transaction_index=transaction_index,
+                    trace_line_index=0,
+                    baseline="PUSH1 (pc=0)",
+                    current="PUSH1 (pc=1)",
+                )
+            ],
+        )
+
+
+# ---------------------------------------------------------------------------
+# Phase 1: Types and ABC
+# ---------------------------------------------------------------------------
+
+
+class TestTraceDifference:
+    """Test TraceDifference dataclass."""
+
+    def test_construction_and_field_access(self) -> None:
+        """Verify all fields are accessible after construction."""
+        diff = TraceDifference(
+            transaction_index=2,
+            trace_line_index=5,
+            baseline="PUSH1 (pc=0xa)",
+            current="PUSH1 (pc=0x14)",
+        )
+        assert diff.transaction_index == 2
+        assert diff.trace_line_index == 5
+        assert "PUSH1" in diff.baseline
+        assert "PUSH1" in diff.current
+
+
+class TestTransactionCountMismatch:
+    """Test TransactionCountMismatch subclass."""
+
+    def test_is_trace_difference_subclass(self) -> None:
+        """Verify it is a TraceDifference subclass."""
+        mismatch = TransactionCountMismatch(baseline_count=3, current_count=2)
+        assert isinstance(mismatch, TraceDifference)
+
+    def test_stores_counts(self) -> None:
+        """Verify baseline and current counts are stored."""
+        mismatch = TransactionCountMismatch(baseline_count=3, current_count=2)
+        assert mismatch.baseline_count == 3
+        assert mismatch.current_count == 2
+
+
+class TestTraceComparisonResult:
+    """Test TraceComparisonResult dataclass."""
+
+    def test_equivalent_when_no_differences(self) -> None:
+        """Result is equivalent when differences list is empty."""
+        result = TraceComparisonResult(equivalent=True, differences=[])
+        assert result.equivalent is True
+        assert result.differences == []
+
+    def test_not_equivalent_when_differences_exist(self) -> None:
+        """Result is not equivalent when differences list is non-empty."""
+        diff = TraceDifference(
+            transaction_index=0,
+            trace_line_index=0,
+            baseline="PUSH1",
+            current="PUSH2",
+        )
+        result = TraceComparisonResult(equivalent=False, differences=[diff])
+        assert result.equivalent is False
+        assert len(result.differences) == 1
+
+
+class TestTraceComparisonResultDictRoundTrip:
+    """
+    Test pydantic serialization round-trip used by xdist worker transfer.
+
+    ``model_dump(mode="json")`` → ``model_validate`` must preserve field
+    values AND the concrete subclass of each ``TraceDifference`` entry;
+    the ``kind`` discriminator is what lets ``model_validate`` pick the
+    right class.
+    """
+
+    def test_round_trip_equivalent_result(self) -> None:
+        """An equivalent (no-diff) result round-trips through dict."""
+        result = TraceComparisonResult(equivalent=True, differences=[])
+        restored = TraceComparisonResult.model_validate(
+            result.model_dump(mode="json")
+        )
+        assert restored == result
+
+    def test_round_trip_with_trace_difference(self) -> None:
+        """A result with a TraceDifference round-trips identically."""
+        result = TraceComparisonResult(
+            equivalent=False,
+            differences=[
+                TraceDifference(
+                    transaction_index=1,
+                    trace_line_index=4,
+                    baseline="PUSH1 (pc=0xa)",
+                    current="PUSH1 (pc=0x14)",
+                ),
+            ],
+        )
+        restored = TraceComparisonResult.model_validate(
+            result.model_dump(mode="json")
+        )
+        assert restored == result
+        assert type(restored.differences[0]) is TraceDifference
+
+    def test_round_trip_with_transaction_count_mismatch(self) -> None:
+        """A TransactionCountMismatch retains its subclass identity."""
+        result = TraceComparisonResult(
+            equivalent=False,
+            differences=[
+                TransactionCountMismatch(
+                    baseline_count=3,
+                    current_count=2,
+                ),
+            ],
+        )
+        restored = TraceComparisonResult.model_validate(
+            result.model_dump(mode="json")
+        )
+        assert restored == result
+        diff = restored.differences[0]
+        assert isinstance(diff, TransactionCountMismatch)
+        assert diff.baseline_count == 3
+        assert diff.current_count == 2
+
+    def test_round_trip_mixed_difference_types(self) -> None:
+        """A mix of TraceDifference and subclass entries round-trips."""
+        result = TraceComparisonResult(
+            equivalent=False,
+            differences=[
+                TransactionCountMismatch(baseline_count=2, current_count=1),
+                TraceDifference(
+                    transaction_index=0,
+                    trace_line_index=7,
+                    baseline="ADD",
+                    current="MUL",
+                ),
+            ],
+        )
+        restored = TraceComparisonResult.model_validate(
+            result.model_dump(mode="json")
+        )
+        assert restored == result
+        assert isinstance(restored.differences[0], TransactionCountMismatch)
+        assert type(restored.differences[1]) is TraceDifference
+
+
+class TestTraceComparatorType:
+    """Test TraceComparatorType enum."""
+
+    @pytest.mark.parametrize(
+        "member,value",
+        [
+            (TraceComparatorType.EXACT, "exact"),
+            (TraceComparatorType.EXACT_NO_GAS, "exact-no-gas"),
+            (TraceComparatorType.EXACT_NO_STACK, "exact-no-stack"),
+            (
+                TraceComparatorType.EXACT_NO_STACK_NO_GAS_NO_GAS_COST,
+                "exact-no-stack-no-gas-no-gas-cost",
+            ),
+            (TraceComparatorType.GAS_EXHAUSTION, "gas-exhaustion"),
+        ],
+    )
+    def test_enum_values(
+        self, member: TraceComparatorType, value: str
+    ) -> None:
+        """Verify enum member values."""
+        assert member == value
+
+
+class TestTraceComparatorABC:
+    """Test TraceComparator base class compare_traces logic."""
+
+    def test_identical_traces_are_equivalent(
+        self, traces: Traces, spy_comparator: _SpyComparator
+    ) -> None:
+        """Two identical Traces objects produce an equivalent result."""
+        result = spy_comparator.compare_traces(traces, traces)
+        assert result.equivalent is True
+        assert result.differences == []
+
+    def test_mismatched_transaction_count(
+        self, spy_comparator: _SpyComparator
+    ) -> None:
+        """Different transaction counts produce a TransactionCountMismatch."""
+        baseline = _make_traces(
+            [
+                _make_transaction_traces(),
+                _make_transaction_traces(),
+            ]
+        )
+        current = _make_traces([_make_transaction_traces()])
+        result = spy_comparator.compare_traces(baseline, current)
+        assert result.equivalent is False
+        assert len(result.differences) == 1
+        diff = result.differences[0]
+        assert isinstance(diff, TransactionCountMismatch)
+        assert diff.baseline_count == 2
+        assert diff.current_count == 1
+
+    def test_delegates_to_compare_transaction_traces(
+        self, spy_comparator: _SpyComparator
+    ) -> None:
+        """Base class calls compare_transaction_traces for each pair."""
+        tx1 = _make_transaction_traces()
+        tx2 = _make_transaction_traces()
+        baseline = _make_traces([tx1, tx2])
+        current = _make_traces([tx1, tx2])
+        spy_comparator.compare_traces(baseline, current)
+        assert len(spy_comparator.calls) == 2
+        assert spy_comparator.calls[0] == (0,)
+        assert spy_comparator.calls[1] == (1,)
+
+    def test_aggregates_differences_from_subclass(
+        self, failing_comparator: _FailingComparator
+    ) -> None:
+        """Base class aggregates differences returned by the subclass."""
+        baseline = _make_traces([_make_transaction_traces()])
+        current = _make_traces([_make_transaction_traces()])
+        result = failing_comparator.compare_traces(baseline, current)
+        assert result.equivalent is False
+        assert len(result.differences) == 1
+
+    def test_empty_traces_are_equivalent(
+        self, spy_comparator: _SpyComparator
+    ) -> None:
+        """Two empty Traces objects are equivalent."""
+        baseline = _make_traces([])
+        current = _make_traces([])
+        result = spy_comparator.compare_traces(baseline, current)
+        assert result.equivalent is True
+        assert spy_comparator.calls == []
+
+    def test_single_transaction_delegates_once(
+        self, spy_comparator: _SpyComparator
+    ) -> None:
+        """Single transaction pair calls compare_transaction_traces once."""
+        baseline = _make_traces([_make_transaction_traces()])
+        current = _make_traces([_make_transaction_traces()])
+        spy_comparator.compare_traces(baseline, current)
+        assert len(spy_comparator.calls) == 1
+        assert spy_comparator.calls[0] == (0,)
+
+
+class TestCreateComparator:
+    """Test the create_comparator factory function."""
+
+    @pytest.mark.parametrize(
+        "comparator_type,expected_name",
+        [
+            (TraceComparatorType.EXACT, "exact"),
+            (TraceComparatorType.EXACT_NO_GAS, "exact-no-gas"),
+            (TraceComparatorType.EXACT_NO_STACK, "exact-no-stack"),
+            (
+                TraceComparatorType.EXACT_NO_STACK_NO_GAS_NO_GAS_COST,
+                "exact-no-stack-no-gas-no-gas-cost",
+            ),
+            (TraceComparatorType.GAS_EXHAUSTION, "gas-exhaustion"),
+        ],
+    )
+    def test_create_supported_comparators(
+        self, comparator_type: TraceComparatorType, expected_name: str
+    ) -> None:
+        """Factory creates the right comparator for supported types."""
+        comparator = create_comparator(comparator_type)
+        assert comparator.name == expected_name
+
+
+# ---------------------------------------------------------------------------
+# Phase 2: TraceLine.compare(), TransactionTraces.compare(),
+#           FieldExclusionTraceComparator
+# ---------------------------------------------------------------------------
+
+
+class TestTraceLineCompare:
+    """Test TraceLine.compare() and are_equivalent()."""
+
+    def test_gas_excluded_by_default(self) -> None:
+        """Gas-only difference produces empty diffs with defaults."""
+        baseline = _make_trace_line(gas=0x100)
+        current = _make_trace_line(gas=0x200)
+        b_diff, c_diff = baseline.compare(current)
+        assert b_diff == {}
+        assert c_diff == {}
+
+    def test_custom_exclude_fields(self) -> None:
+        """Custom exclude_fields skips specified fields only."""
+        baseline = _make_trace_line(pc=0, gas=0x100)
+        current = _make_trace_line(pc=5, gas=0x200)
+        b_diff, c_diff = baseline.compare(current, exclude_fields={"pc"})
+        assert "pc" not in b_diff
+        assert "gas" in b_diff
+
+    def test_are_equivalent_with_custom_exclude(self) -> None:
+        """are_equivalent respects custom exclude_fields."""
+        baseline = _make_trace_line(pc=0, gas=0x100)
+        current = _make_trace_line(pc=0, gas=0x200)
+        # Default excludes gas → equivalent
+        assert baseline.are_equivalent(current)
+        # Exclude nothing → not equivalent
+        assert not baseline.are_equivalent(current, exclude_fields=set())
+
+
+class TestTransactionTracesCompare:
+    """Test TransactionTraces.compare() shared method."""
+
+    def test_identical_traces_empty_diffs(self) -> None:
+        """Two identical TransactionTraces produce no diffs."""
+        tx = _make_transaction_traces()
+        assert tx.compare(tx) == []
+
+    def test_different_trace_lengths(self) -> None:
+        """Different trace lengths return a structural diff."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(), _make_trace_line()]
+        )
+        current = _make_transaction_traces([_make_trace_line()])
+        diffs = baseline.compare(current)
+        assert len(diffs) == 1
+        assert diffs[0].line_index is None
+        assert "trace_length" in diffs[0].baseline_fields
+
+    def test_different_output(self) -> None:
+        """Different output returns a structural diff."""
+        baseline = _make_transaction_traces(output="0xaa")
+        current = _make_transaction_traces(output="0xbb")
+        diffs = baseline.compare(current)
+        assert any(
+            d.line_index is None and "output" in d.baseline_fields
+            for d in diffs
+        )
+
+    def test_different_gas_used_reported_by_default(self) -> None:
+        """gas_used differences are reported when not ignoring gas."""
+        baseline = _make_transaction_traces()
+        current = _make_transaction_traces()
+        baseline.gas_used = HexNumber(0x5208)
+        current.gas_used = HexNumber(0x6000)
+        diffs = baseline.compare(current, ignore_gas_differences=False)
+        assert any(
+            d.line_index is None and "gas_used" in d.baseline_fields
+            for d in diffs
+        )
+
+    def test_different_gas_used_ignored_with_ignore_gas_differences(
+        self,
+    ) -> None:
+        """gas_used differences are silenced when ignoring gas."""
+        baseline = _make_transaction_traces()
+        current = _make_transaction_traces()
+        baseline.gas_used = HexNumber(0x5208)
+        current.gas_used = HexNumber(0x6000)
+        diffs = baseline.compare(current, ignore_gas_differences=True)
+        assert not any(
+            d.line_index is None and "gas_used" in d.baseline_fields
+            for d in diffs
+        )
+
+    def test_single_field_diff_on_line(self) -> None:
+        """Single-field difference on a line returns line index and fields."""
+        baseline = _make_transaction_traces([_make_trace_line(pc=0)])
+        current = _make_transaction_traces([_make_trace_line(pc=5)])
+        diffs = baseline.compare(current)
+        assert len(diffs) == 1
+        assert diffs[0].line_index == 0
+        assert "pc" in diffs[0].baseline_fields
+        assert "pc" in diffs[0].current_fields
+
+    def test_multiple_fields_diff_on_one_line(self) -> None:
+        """Multiple field diffs on one line are grouped together."""
+        baseline = _make_transaction_traces([_make_trace_line(pc=0, op=0x60)])
+        current = _make_transaction_traces([_make_trace_line(pc=5, op=0x61)])
+        diffs = baseline.compare(current)
+        assert len(diffs) == 1
+        assert "pc" in diffs[0].baseline_fields
+        assert "op" in diffs[0].baseline_fields
+
+    def test_exclude_fields(self) -> None:
+        """Excluded fields are not reported."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(gas=0x100, pc=0)]
+        )
+        current = _make_transaction_traces([_make_trace_line(gas=0x200, pc=5)])
+        diffs = baseline.compare(current, exclude_fields={"gas", "gas_cost"})
+        assert len(diffs) == 1
+        assert "pc" in diffs[0].baseline_fields
+        assert "gas" not in diffs[0].baseline_fields
+
+    def test_exclude_fields_all_diffs_excluded(self) -> None:
+        """When all differing fields are excluded, no diffs reported."""
+        baseline = _make_transaction_traces([_make_trace_line(gas=0x100)])
+        current = _make_transaction_traces([_make_trace_line(gas=0x200)])
+        diffs = baseline.compare(current, exclude_fields={"gas", "gas_cost"})
+        assert diffs == []
+
+    def test_ignore_gas_differences_removes_gas_stack_pollution(
+        self,
+    ) -> None:
+        """``Op.GAS`` stack pollution is scrubbed when ignoring gas."""
+        # GAS opcode pushes remaining gas onto stack; next line has it
+        gas_line = _make_trace_line(
+            pc=0, op=0x5A, op_name="GAS", depth=1, stack=[]
+        )
+        # Next line: stack has gas value (differs between runs)
+        next_line_baseline = _make_trace_line(
+            pc=1,
+            op=0x60,
+            op_name="PUSH1",
+            depth=1,
+            stack=[0xAAAA],
+        )
+        next_line_current = _make_trace_line(
+            pc=1,
+            op=0x60,
+            op_name="PUSH1",
+            depth=1,
+            stack=[0xBBBB],
+        )
+        baseline = _make_transaction_traces([gas_line, next_line_baseline])
+        current = _make_transaction_traces([gas_line, next_line_current])
+        # Without gas-tolerance: the differing GAS result leaks into the
+        # stack comparison.
+        diffs_strict = baseline.compare(
+            current,
+            exclude_fields={"gas", "gas_cost"},
+            ignore_gas_differences=False,
+        )
+        assert len(diffs_strict) == 1
+        assert "stack" in diffs_strict[0].baseline_fields
+
+        # With gas-tolerance: the GAS result is nullified, equivalent.
+        diffs_tolerant = baseline.compare(
+            current,
+            exclude_fields={"gas", "gas_cost"},
+            ignore_gas_differences=True,
+        )
+        assert diffs_tolerant == []
+
+
+class TestTransactionTracesAreEquivalentRegression:
+    """Regression tests for are_equivalent() after refactoring."""
+
+    def test_identical_traces_equivalent(self) -> None:
+        """Identical traces are equivalent."""
+        tx = _make_transaction_traces()
+        assert tx.are_equivalent(tx, ignore_gas_differences=False)
+
+    def test_different_length_not_equivalent(self) -> None:
+        """Different lengths are not equivalent."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(), _make_trace_line()]
+        )
+        current = _make_transaction_traces([_make_trace_line()])
+        assert not baseline.are_equivalent(
+            current, ignore_gas_differences=False
+        )
+
+    def test_different_output_not_equivalent(self) -> None:
+        """Different output is not equivalent."""
+        baseline = _make_transaction_traces(output="0xaa")
+        current = _make_transaction_traces(output="0xbb")
+        assert not baseline.are_equivalent(
+            current, ignore_gas_differences=False
+        )
+
+    def test_gas_only_difference_is_equivalent(self) -> None:
+        """Gas-only difference is equivalent (gas excluded by default)."""
+        baseline = _make_transaction_traces([_make_trace_line(gas=0x100)])
+        current = _make_transaction_traces([_make_trace_line(gas=0x200)])
+        assert baseline.are_equivalent(current, ignore_gas_differences=False)
+
+    def test_pc_difference_not_equivalent(self) -> None:
+        """Non-gas field difference is not equivalent."""
+        baseline = _make_transaction_traces([_make_trace_line(pc=0)])
+        current = _make_transaction_traces([_make_trace_line(pc=5)])
+        assert not baseline.are_equivalent(
+            current, ignore_gas_differences=False
+        )
+
+    def test_gas_used_checked_by_default(self) -> None:
+        """gas_used difference is caught when not ignoring gas."""
+        baseline = _make_transaction_traces()
+        current = _make_transaction_traces()
+        baseline.gas_used = HexNumber(0x5208)
+        current.gas_used = HexNumber(0x6000)
+        assert not baseline.are_equivalent(
+            current, ignore_gas_differences=False
+        )
+
+    def test_gas_used_ignored_when_ignore_gas_differences(self) -> None:
+        """gas_used difference is silenced when ignoring gas."""
+        baseline = _make_transaction_traces()
+        current = _make_transaction_traces()
+        baseline.gas_used = HexNumber(0x5208)
+        current.gas_used = HexNumber(0x6000)
+        assert baseline.are_equivalent(current, ignore_gas_differences=True)
+
+
+class TestExactComparator:
+    """Test FieldExclusionTraceComparator with exact config."""
+
+    @pytest.fixture()
+    def comparator(self) -> FieldExclusionTraceComparator:
+        """Return an exact comparator."""
+        return create_comparator(TraceComparatorType.EXACT)  # type: ignore[return-value]
+
+    def test_identical_traces_are_equivalent(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Two identical TransactionTraces produce an equivalent result."""
+        tx = _make_transaction_traces()
+        result = comparator.compare_transaction_traces(tx, tx, 0)
+        assert result.equivalent is True
+        assert result.differences == []
+
+    @pytest.mark.parametrize(
+        "field,baseline_val,current_val",
+        [
+            ("pc", 0, 5),
+            ("op", 0x60, 0x61),
+            ("gas", 0x100, 0x200),
+            ("gas_cost", 0x3, 0x5),
+        ],
+        ids=["pc", "op", "gas", "gas_cost"],
+    )
+    def test_single_field_difference(
+        self,
+        comparator: FieldExclusionTraceComparator,
+        field: str,
+        baseline_val: int,
+        current_val: int,
+    ) -> None:
+        """Single-field differences are detected."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(**{field: baseline_val})]
+        )
+        current = _make_transaction_traces(
+            [_make_trace_line(**{field: current_val})]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert len(result.differences) == 1
+        assert result.differences[0].transaction_index == 0
+        assert result.differences[0].trace_line_index == 0
+
+    def test_differing_stack(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Different stack values are detected."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(stack=[0x1, 0x2])]
+        )
+        current = _make_transaction_traces(
+            [_make_trace_line(stack=[0x1, 0x3])]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert "stack" in result.differences[0].baseline
+
+    def test_different_trace_lengths(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Different trace lengths produce a trace_length diff."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(), _make_trace_line()]
+        )
+        current = _make_transaction_traces([_make_trace_line()])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        diff = result.differences[0]
+        assert "trace_length" in diff.baseline
+        assert "trace_length" in diff.current
+
+    def test_different_output(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Different output field is detected."""
+        baseline = _make_transaction_traces(output="0xaa")
+        current = _make_transaction_traces(output="0xbb")
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        diff = result.differences[0]
+        assert "0xaa" in diff.baseline
+        assert "0xbb" in diff.current
+
+    def test_multiple_differences_in_one_transaction(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Multiple field diffs on one line produce one TraceDifference."""
+        baseline = _make_transaction_traces([_make_trace_line(pc=0, op=0x60)])
+        current = _make_transaction_traces([_make_trace_line(pc=5, op=0x61)])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        # One TraceDifference per line, with all differing fields
+        assert len(result.differences) == 1
+        assert "pc" in result.differences[0].baseline
+        assert "op" in result.differences[0].baseline
+
+    def test_assembly_format_baseline_and_current(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Diff strings contain opcode name and differing field values."""
+        baseline = _make_transaction_traces([_make_trace_line(pc=0)])
+        current = _make_transaction_traces([_make_trace_line(pc=5)])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        diff = result.differences[0]
+        assert diff.baseline.startswith("PUSH1")
+        assert diff.current.startswith("PUSH1")
+        assert "pc=" in diff.baseline
+        assert "pc=" in diff.current
+
+    def test_full_compare_traces_multi_transaction(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Integration: multi-tx Traces with one differing tx."""
+        identical_tx = _make_transaction_traces([_make_trace_line(pc=0)])
+        baseline_diff_tx = _make_transaction_traces([_make_trace_line(pc=10)])
+        current_diff_tx = _make_transaction_traces([_make_trace_line(pc=20)])
+        baseline = _make_traces([identical_tx, baseline_diff_tx])
+        current = _make_traces([identical_tx, current_diff_tx])
+        result = comparator.compare_traces(baseline, current)
+        assert result.equivalent is False
+        assert all(d.transaction_index == 1 for d in result.differences)
+
+
+# ---------------------------------------------------------------------------
+# Phase 3: ExactNoGas config
+# ---------------------------------------------------------------------------
+
+
+class TestExactNoGasComparator:
+    """Test FieldExclusionTraceComparator with exact-no-gas config."""
+
+    @pytest.fixture()
+    def comparator(self) -> FieldExclusionTraceComparator:
+        """Return an exact-no-gas comparator."""
+        return create_comparator(TraceComparatorType.EXACT_NO_GAS)  # type: ignore[return-value]
+
+    def test_gas_field_difference_is_equivalent(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Traces differing only in remaining gas are equivalent."""
+        baseline = _make_transaction_traces([_make_trace_line(gas=0x100)])
+        current = _make_transaction_traces([_make_trace_line(gas=0x100)])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_gas_and_non_gas_difference(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Remaining gas diff ignored but non-gas diff (op_name) reported."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(gas=0x100, op_name="PUSH1")]
+        )
+        current = _make_transaction_traces(
+            [_make_trace_line(gas=0x200, op_name="PUSH2")]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        diff = result.differences[0]
+        assert "op_name" in diff.baseline
+        assert "gas" not in diff.baseline
+
+    def test_stack_difference_detected(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Non-gas fields like stack are still checked."""
+        baseline = _make_transaction_traces([_make_trace_line(stack=[0x1])])
+        current = _make_transaction_traces([_make_trace_line(stack=[0x2])])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert "stack" in result.differences[0].baseline
+
+    def test_length_mismatch(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Different trace lengths are detected."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(), _make_trace_line()]
+        )
+        current = _make_transaction_traces([_make_trace_line()])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert "trace_length" in result.differences[0].baseline
+
+    def test_output_mismatch(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Different output field is detected."""
+        baseline = _make_transaction_traces(output="0xaa")
+        current = _make_transaction_traces(output="0xbb")
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert "0xaa" in result.differences[0].baseline
+
+    def test_gas_used_difference_is_equivalent(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """gas_used difference is ignored (gas-tolerance enabled)."""
+        baseline = _make_transaction_traces()
+        current = _make_transaction_traces()
+        baseline.gas_used = HexNumber(0x5208)
+        current.gas_used = HexNumber(0x6000)
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+        assert result.differences == []
+
+    def test_gas_stack_pollution_is_equivalent(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """GAS opcode stack pollution is cleaned by remove_gas()."""
+        gas_line = _make_trace_line(
+            pc=0, op=0x5A, op_name="GAS", depth=1, stack=[]
+        )
+        next_baseline = _make_trace_line(
+            pc=1,
+            op=0x60,
+            op_name="PUSH1",
+            depth=1,
+            stack=[0xAAAA],
+        )
+        next_current = _make_trace_line(
+            pc=1,
+            op=0x60,
+            op_name="PUSH1",
+            depth=1,
+            stack=[0xBBBB],
+        )
+        baseline = _make_transaction_traces([gas_line, next_baseline])
+        current = _make_transaction_traces([gas_line, next_current])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+        assert result.differences == []
+
+
+# ---------------------------------------------------------------------------
+# ExactNoStack config
+# ---------------------------------------------------------------------------
+
+
+class TestExactNoStackComparator:
+    """Test FieldExclusionTraceComparator with exact-no-stack config."""
+
+    @pytest.fixture()
+    def comparator(self) -> FieldExclusionTraceComparator:
+        """Return an exact-no-stack comparator."""
+        return create_comparator(TraceComparatorType.EXACT_NO_STACK)  # type: ignore[return-value]
+
+    def test_identical_traces_are_equivalent(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Two identical TransactionTraces are equivalent."""
+        tx = _make_transaction_traces()
+        result = comparator.compare_transaction_traces(tx, tx, 0)
+        assert result.equivalent is True
+        assert result.differences == []
+
+    def test_stack_difference_is_equivalent(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Traces differing only in stack are equivalent."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(stack=[0x1, 0x2])]
+        )
+        current = _make_transaction_traces(
+            [_make_trace_line(stack=[0xA, 0xB])]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_return_data_difference_is_equivalent(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Traces differing only in return_data are equivalent."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(return_data="0xaa")]
+        )
+        current = _make_transaction_traces(
+            [_make_trace_line(return_data="0xbb")]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_gas_difference_detected(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Traces differing in gas are detected."""
+        baseline = _make_transaction_traces([_make_trace_line(gas=0x100)])
+        current = _make_transaction_traces([_make_trace_line(gas=0x200)])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert "gas" in result.differences[0].baseline
+
+    def test_gas_used_difference_detected(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """gas_used difference is detected."""
+        baseline = _make_transaction_traces()
+        current = _make_transaction_traces()
+        baseline.gas_used = HexNumber(0x5208)
+        current.gas_used = HexNumber(0x6000)
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+
+    def test_pc_difference_detected(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Non-stack, non-gas field diffs are detected."""
+        baseline = _make_transaction_traces([_make_trace_line(pc=0)])
+        current = _make_transaction_traces([_make_trace_line(pc=5)])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert len(result.differences) == 1
+        assert "pc" in result.differences[0].baseline
+
+    def test_op_name_difference_detected(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """op_name differences are detected."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(op_name="PUSH1")]
+        )
+        current = _make_transaction_traces([_make_trace_line(op_name="PUSH2")])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert "op_name" in result.differences[0].baseline
+
+    def test_depth_difference_detected(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Depth differences are detected."""
+        baseline = _make_transaction_traces([_make_trace_line(depth=1)])
+        current = _make_transaction_traces([_make_trace_line(depth=2)])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+
+    def test_length_mismatch(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Different trace lengths are detected."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(), _make_trace_line()]
+        )
+        current = _make_transaction_traces([_make_trace_line()])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert "trace_length" in result.differences[0].baseline
+
+    def test_output_mismatch(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Different output field is detected."""
+        baseline = _make_transaction_traces(output="0xaa")
+        current = _make_transaction_traces(output="0xbb")
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert "0xaa" in result.differences[0].baseline
+
+
+# ---------------------------------------------------------------------------
+# ExactNoStackNoGas config
+# ---------------------------------------------------------------------------
+
+
+class TestExactNoStackNoGasComparator:
+    """Test FieldExclusionTraceComparator with exact-no-stack-no-gas config."""
+
+    @pytest.fixture()
+    def comparator(self) -> FieldExclusionTraceComparator:
+        """Return an exact-no-stack-no-gas comparator."""
+        return create_comparator(TraceComparatorType.EXACT_NO_STACK_NO_GAS)  # type: ignore[return-value]
+
+    def test_identical_traces_are_equivalent(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Two identical TransactionTraces are equivalent."""
+        tx = _make_transaction_traces()
+        result = comparator.compare_transaction_traces(tx, tx, 0)
+        assert result.equivalent is True
+        assert result.differences == []
+
+    def test_stack_difference_is_equivalent(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Traces differing only in stack are equivalent."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(stack=[0x1, 0x2])]
+        )
+        current = _make_transaction_traces(
+            [_make_trace_line(stack=[0xA, 0xB])]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_gas_field_difference_is_equivalent(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Traces differing only in remaining gas are equivalent."""
+        baseline = _make_transaction_traces([_make_trace_line(gas=0x100)])
+        current = _make_transaction_traces([_make_trace_line(gas=0x100)])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_stack_and_gas_difference_is_equivalent(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Traces differing in stack and remaining gas are equivalent."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(stack=[0x1, 0x2], gas=0x100)]
+        )
+        current = _make_transaction_traces(
+            [_make_trace_line(stack=[0xA, 0xB], gas=0x200)]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_return_data_difference_is_equivalent(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Inherits the ``return_data`` exclusion from ``exact-no-stack``."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(return_data="0xaa")]
+        )
+        current = _make_transaction_traces(
+            [_make_trace_line(return_data="0xbb")]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_gas_used_difference_tolerated(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """
+        gas_used difference is tolerated.
+
+        Excluding per-line ``gas`` implies accepting a different total
+        gas_used: per-step gas deltas sum to gas_used, so a comparator
+        that accepts per-step differences must accept the total too.
+        """
+        baseline = _make_transaction_traces()
+        current = _make_transaction_traces()
+        baseline.gas_used = HexNumber(0x5208)
+        current.gas_used = HexNumber(0x6000)
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_pc_difference_detected(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Non-stack, non-gas field diffs are detected."""
+        baseline = _make_transaction_traces([_make_trace_line(pc=0)])
+        current = _make_transaction_traces([_make_trace_line(pc=5)])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert len(result.differences) == 1
+        assert "pc" in result.differences[0].baseline
+
+    def test_op_name_difference_detected(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """op_name differences are detected."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(op_name="PUSH1")]
+        )
+        current = _make_transaction_traces([_make_trace_line(op_name="PUSH2")])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert "op_name" in result.differences[0].baseline
+
+    def test_depth_difference_detected(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Depth differences are detected."""
+        baseline = _make_transaction_traces([_make_trace_line(depth=1)])
+        current = _make_transaction_traces([_make_trace_line(depth=2)])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+
+    def test_length_mismatch(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Different trace lengths are detected."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(), _make_trace_line()]
+        )
+        current = _make_transaction_traces([_make_trace_line()])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert "trace_length" in result.differences[0].baseline
+
+    def test_output_mismatch(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Different output field is detected."""
+        baseline = _make_transaction_traces(output="0xaa")
+        current = _make_transaction_traces(output="0xbb")
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert "0xaa" in result.differences[0].baseline
+
+
+# ---------------------------------------------------------------------------
+# ExactNoStackNoGasNoGasCost config
+# ---------------------------------------------------------------------------
+
+
+class TestExactNoStackNoGasNoGasCostComparator:
+    """Test FieldExclusionTraceComparator with the gas_cost-tolerant config."""
+
+    @pytest.fixture()
+    def comparator(self) -> FieldExclusionTraceComparator:
+        """Return an exact-no-stack-no-gas-no-gas-cost comparator."""
+        return create_comparator(
+            TraceComparatorType.EXACT_NO_STACK_NO_GAS_NO_GAS_COST
+        )  # type: ignore[return-value]
+
+    def test_identical_traces_are_equivalent(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Two identical TransactionTraces are equivalent."""
+        tx = _make_transaction_traces()
+        result = comparator.compare_transaction_traces(tx, tx, 0)
+        assert result.equivalent is True
+        assert result.differences == []
+
+    def test_gas_cost_difference_is_equivalent(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Traces differing only in gas_cost are equivalent."""
+        baseline = _make_transaction_traces([_make_trace_line(gas_cost=0x3)])
+        current = _make_transaction_traces([_make_trace_line(gas_cost=0x5)])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_stack_gas_and_gas_cost_difference_is_equivalent(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Traces differing in all three excluded fields are equivalent."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(stack=[0x1, 0x2], gas=0x100, gas_cost=0x3)]
+        )
+        current = _make_transaction_traces(
+            [_make_trace_line(stack=[0xA, 0xB], gas=0x200, gas_cost=0x5)]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_return_data_difference_is_equivalent(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Inherits the ``return_data`` exclusion from ``exact-no-stack``."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(return_data="0xaa")]
+        )
+        current = _make_transaction_traces(
+            [_make_trace_line(return_data="0xbb")]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_pc_difference_detected(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """Non-excluded field diffs are still detected."""
+        baseline = _make_transaction_traces([_make_trace_line(pc=0)])
+        current = _make_transaction_traces([_make_trace_line(pc=5)])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert "pc" in result.differences[0].baseline
+
+    def test_op_name_difference_detected(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """op_name differences are still detected."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(op_name="PUSH1")]
+        )
+        current = _make_transaction_traces([_make_trace_line(op_name="PUSH2")])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert "op_name" in result.differences[0].baseline
+
+    def test_gas_used_difference_tolerated(
+        self, comparator: FieldExclusionTraceComparator
+    ) -> None:
+        """
+        gas_used difference is tolerated.
+
+        Matches ``EXACT_NO_STACK_NO_GAS``: per-step gas deltas sum to
+        gas_used, so a comparator that accepts per-step differences
+        must accept the total too.
+        """
+        baseline = _make_transaction_traces()
+        current = _make_transaction_traces()
+        baseline.gas_used = HexNumber(0x5208)
+        current.gas_used = HexNumber(0x6000)
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+
+# ---------------------------------------------------------------------------
+# GasExhaustionTraceComparator
+# ---------------------------------------------------------------------------
+
+
+class TestGasExhaustionTraceComparator:
+    """Test GasExhaustionTraceComparator.compare_transaction_traces."""
+
+    @pytest.fixture()
+    def comparator(self) -> GasExhaustionTraceComparator:
+        """Return a GasExhaustionTraceComparator."""
+        return GasExhaustionTraceComparator()
+
+    def test_no_oog_in_either_is_equivalent(
+        self, comparator: GasExhaustionTraceComparator
+    ) -> None:
+        """Both sides without OOG are equivalent."""
+        tx = _make_transaction_traces()
+        result = comparator.compare_transaction_traces(tx, tx, 0)
+        assert result.equivalent is True
+        assert result.differences == []
+
+    def test_oog_at_same_line_is_equivalent(
+        self, comparator: GasExhaustionTraceComparator
+    ) -> None:
+        """Both sides with OOG at the same line are equivalent."""
+        oog_line = _make_trace_line(error="out of gas")
+        baseline = _make_transaction_traces([_make_trace_line(), oog_line])
+        current = _make_transaction_traces([_make_trace_line(), oog_line])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_baseline_oog_current_no_oog(
+        self, comparator: GasExhaustionTraceComparator
+    ) -> None:
+        """Baseline has out-of-gas but current does not — different."""
+        oog_line = _make_trace_line(error="out of gas")
+        baseline = _make_transaction_traces([_make_trace_line(), oog_line])
+        current = _make_transaction_traces(
+            [_make_trace_line(), _make_trace_line()]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert len(result.differences) == 1
+        diff = result.differences[0]
+        assert diff.trace_line_index == 1
+        assert "error=out of gas" in diff.baseline
+        assert diff.current == "no out-of-gas"
+
+    def test_current_oog_baseline_no_oog(
+        self, comparator: GasExhaustionTraceComparator
+    ) -> None:
+        """Current has out-of-gas but baseline does not — different."""
+        oog_line = _make_trace_line(error="out of gas")
+        baseline = _make_transaction_traces([_make_trace_line()])
+        current = _make_transaction_traces([oog_line])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        diff = result.differences[0]
+        assert diff.trace_line_index == 0
+        assert diff.baseline == "no out-of-gas"
+        assert "error=out of gas" in diff.current
+
+    def test_oog_at_different_lines(
+        self, comparator: GasExhaustionTraceComparator
+    ) -> None:
+        """OOG at different line indices — different."""
+        baseline = _make_transaction_traces(
+            [
+                _make_trace_line(),
+                _make_trace_line(error="out of gas"),
+                _make_trace_line(),
+            ]
+        )
+        current = _make_transaction_traces(
+            [
+                _make_trace_line(),
+                _make_trace_line(),
+                _make_trace_line(error="out of gas"),
+            ]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+
+    def test_case_insensitive_oog_detection(
+        self, comparator: GasExhaustionTraceComparator
+    ) -> None:
+        """OOG detection is case-insensitive."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(error="Out Of Gas")]
+        )
+        current = _make_transaction_traces(
+            [_make_trace_line(error="out of gas")]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_multiple_oog_points_same(
+        self, comparator: GasExhaustionTraceComparator
+    ) -> None:
+        """Multiple OOG points at same indices are equivalent."""
+        baseline = _make_transaction_traces(
+            [
+                _make_trace_line(error="out of gas"),
+                _make_trace_line(),
+                _make_trace_line(error="out of gas"),
+            ]
+        )
+        current = _make_transaction_traces(
+            [
+                _make_trace_line(error="out of gas"),
+                _make_trace_line(),
+                _make_trace_line(error="out of gas"),
+            ]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_multiple_oog_points_different(
+        self, comparator: GasExhaustionTraceComparator
+    ) -> None:
+        """Different out-of-gas points — each side's line shown."""
+        baseline = _make_transaction_traces(
+            [
+                _make_trace_line(error="out of gas"),
+                _make_trace_line(),
+            ]
+        )
+        current = _make_transaction_traces(
+            [
+                _make_trace_line(),
+                _make_trace_line(error="out of gas"),
+            ]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert len(result.differences) == 2
+        # Line 0: baseline out-of-gas, current not
+        assert result.differences[0].trace_line_index == 0
+        assert "error=out of gas" in result.differences[0].baseline
+        assert result.differences[0].current == "no out-of-gas"
+        # Line 1: current out-of-gas, baseline not
+        assert result.differences[1].trace_line_index == 1
+        assert result.differences[1].baseline == "no out-of-gas"
+        assert "error=out of gas" in result.differences[1].current
+
+    def test_non_oog_errors_ignored(
+        self, comparator: GasExhaustionTraceComparator
+    ) -> None:
+        """Non-OOG errors like 'stack underflow' are not OOG points."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(error="stack underflow")]
+        )
+        current = _make_transaction_traces(
+            [_make_trace_line(error="stack underflow")]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_transaction_index_in_difference(
+        self, comparator: GasExhaustionTraceComparator
+    ) -> None:
+        """Transaction index is set correctly in differences."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(error="out of gas")]
+        )
+        current = _make_transaction_traces([_make_trace_line()])
+        result = comparator.compare_transaction_traces(baseline, current, 3)
+        assert result.differences[0].transaction_index == 3
+
+    def test_multi_transaction_via_compare_traces(
+        self, comparator: GasExhaustionTraceComparator
+    ) -> None:
+        """Integration: multi-tx with OOG diff in one tx only."""
+        ok_tx = _make_transaction_traces([_make_trace_line()])
+        b_oog_tx = _make_transaction_traces(
+            [_make_trace_line(error="out of gas")]
+        )
+        c_ok_tx = _make_transaction_traces([_make_trace_line()])
+        baseline = _make_traces([ok_tx, b_oog_tx])
+        current = _make_traces([ok_tx, c_ok_tx])
+        result = comparator.compare_traces(baseline, current)
+        assert result.equivalent is False
+        assert all(d.transaction_index == 1 for d in result.differences)
+
+    @pytest.mark.parametrize(
+        "error",
+        ["out of gas", "Out Of Gas", "OutOfGasError"],
+    )
+    def test_oog_detected_for_each_convention(
+        self,
+        comparator: GasExhaustionTraceComparator,
+        error: str,
+    ) -> None:
+        """OOG detection covers both geth-style and EELS-style errors."""
+        baseline = _make_transaction_traces(
+            [_make_trace_line(), _make_trace_line(error=error)]
+        )
+        current = _make_transaction_traces(
+            [_make_trace_line(), _make_trace_line()]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert len(result.differences) == 1
+        assert result.differences[0].trace_line_index == 1
+
+    def test_mixed_geth_and_eels_oog_is_equivalent(
+        self, comparator: GasExhaustionTraceComparator
+    ) -> None:
+        """
+        Baseline (geth-style "out of gas") and current (EELS-style
+        "OutOfGasError") describe the same OOG event and are equivalent.
+        """
+        baseline = _make_transaction_traces(
+            [_make_trace_line(), _make_trace_line(error="out of gas")]
+        )
+        current = _make_transaction_traces(
+            [_make_trace_line(), _make_trace_line(error="OutOfGasError")]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_all_eels_oog_at_same_line_is_equivalent(
+        self, comparator: GasExhaustionTraceComparator
+    ) -> None:
+        """Two EELS-style traces with OOG at the same line are equivalent."""
+        oog_line = _make_trace_line(error="OutOfGasError")
+        baseline = _make_transaction_traces([_make_trace_line(), oog_line])
+        current = _make_transaction_traces([_make_trace_line(), oog_line])
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is True
+
+    def test_all_eels_oog_at_different_lines(
+        self, comparator: GasExhaustionTraceComparator
+    ) -> None:
+        """Two EELS-style traces with OOG at different lines differ."""
+        baseline = _make_transaction_traces(
+            [
+                _make_trace_line(),
+                _make_trace_line(error="OutOfGasError"),
+                _make_trace_line(),
+            ]
+        )
+        current = _make_transaction_traces(
+            [
+                _make_trace_line(),
+                _make_trace_line(),
+                _make_trace_line(error="OutOfGasError"),
+            ]
+        )
+        result = comparator.compare_transaction_traces(baseline, current, 0)
+        assert result.equivalent is False
+        assert len(result.differences) == 2
diff --git a/packages/testing/src/execution_testing/client_clis/tests/test_trace_report_formatter.py b/packages/testing/src/execution_testing/client_clis/tests/test_trace_report_formatter.py
new file mode 100644
index 00000000000..b274bd1e918
--- /dev/null
+++ b/packages/testing/src/execution_testing/client_clis/tests/test_trace_report_formatter.py
@@ -0,0 +1,215 @@
+"""Tests for trace report formatters."""
+
+import json
+
+import pytest
+
+from execution_testing.client_clis.trace_comparators import (
+    TraceComparisonResult,
+    TraceDifference,
+)
+from execution_testing.client_clis.trace_report_formatter import (
+    JsonTracesDiffReportFormatter,
+    TextTracesDiffReportFormatter,
+)
+
+# ---------------------------------------------------------------------------
+# Fixtures
+# ---------------------------------------------------------------------------
+
+
+@pytest.fixture()
+def formatter() -> TextTracesDiffReportFormatter:
+    """Return a default formatter."""
+    return TextTracesDiffReportFormatter()
+
+
+def _make_result(
+    equivalent: bool = True,
+    differences: list[TraceDifference] | None = None,
+) -> TraceComparisonResult:
+    """Create a TraceComparisonResult."""
+    return TraceComparisonResult(
+        equivalent=equivalent,
+        differences=differences or [],
+    )
+
+
+def _make_diff(
+    tx: int = 0,
+    line: int = 0,
+    baseline: str = "PUSH1 (pc=0)",
+    current: str = "PUSH1 (pc=1)",
+) -> TraceDifference:
+    """Create a TraceDifference."""
+    return TraceDifference(
+        transaction_index=tx,
+        trace_line_index=line,
+        baseline=baseline,
+        current=current,
+    )
+
+
+# ---------------------------------------------------------------------------
+# Tests
+# ---------------------------------------------------------------------------
+
+
+class TestTextFormatTestResult:
+    """Test TextTracesDiffReportFormatter.format_test_result."""
+
+    def test_single_comparator_equivalent(
+        self, formatter: TextTracesDiffReportFormatter
+    ) -> None:
+        """All equivalent returns None."""
+        output = formatter.format_test_result(
+            "test_foo", {"exact": _make_result(equivalent=True)}
+        )
+        assert output is None
+
+    def test_single_comparator_with_differences(
+        self, formatter: TextTracesDiffReportFormatter
+    ) -> None:
+        """Single comparator with diffs shows DIFFERENT and details."""
+        diffs = [
+            _make_diff(
+                tx=0,
+                line=12,
+                baseline="ADD (gas=0x4e20)",
+                current="ADD (gas=0x4e10)",
+            ),
+        ]
+        output = formatter.format_test_result(
+            "test_bar",
+            {"exact": _make_result(equivalent=False, differences=diffs)},
+        )
+        assert output is not None
+        assert "DIFFERENT" in output
+        assert "0x4e20" in output
+        assert "0x4e10" in output
+
+    def test_multiple_comparators_mixed(
+        self, formatter: TextTracesDiffReportFormatter
+    ) -> None:
+        """Only non-equivalent comparators are shown."""
+        diffs = [_make_diff()]
+        output = formatter.format_test_result(
+            "test_baz",
+            {
+                "exact": _make_result(equivalent=False, differences=diffs),
+                "exact-no-gas": _make_result(equivalent=True),
+            },
+        )
+        assert output is not None
+        assert "[exact]" in output
+        assert "DIFFERENT" in output
+        assert "exact-no-gas" not in output
+        assert "EQUIVALENT" not in output
+
+    def test_differences_capped(self) -> None:
+        """Only the first max_differences diffs are shown."""
+        fmt = TextTracesDiffReportFormatter(max_differences=3)
+        diffs = [_make_diff(line=i) for i in range(10)]
+        output = fmt.format_test_result(
+            "test_cap",
+            {"exact": _make_result(equivalent=False, differences=diffs)},
+        )
+        assert output is not None
+        assert "7 more" in output
+
+
+class TestTextFormatSummary:
+    """Test TextTracesDiffReportFormatter.format_summary."""
+
+    def test_no_results(
+        self, formatter: TextTracesDiffReportFormatter
+    ) -> None:
+        """Empty results produce minimal output."""
+        output = formatter.format_summary({})
+        assert "0 tests verified" in output
+
+    def test_multiple_tests_aggregation(
+        self, formatter: TextTracesDiffReportFormatter
+    ) -> None:
+        """Summary correctly counts tests and those with differences."""
+        all_results = {
+            "test_a": {"exact": _make_result(equivalent=True)},
+            "test_b": {
+                "exact": _make_result(
+                    equivalent=False,
+                    differences=[_make_diff()],
+                )
+            },
+        }
+        output = formatter.format_summary(all_results)
+        assert "2 tests verified" in output
+        assert "1 with differences" in output
+
+    def test_all_equivalent(
+        self, formatter: TextTracesDiffReportFormatter
+    ) -> None:
+        """When all tests pass, only summary line is shown."""
+        all_results = {
+            "test_a": {"exact": _make_result(equivalent=True)},
+            "test_b": {"exact": _make_result(equivalent=True)},
+        }
+        output = formatter.format_summary(all_results)
+        assert "2 tests verified" in output
+        assert "0 with differences" in output
+        assert "test_a" not in output
+        assert "test_b" not in output
+
+
+# ---------------------------------------------------------------------------
+# JSON formatter
+# ---------------------------------------------------------------------------
+
+
+class TestJsonTracesDiffReportFormatter:
+    """Test JsonTracesDiffReportFormatter.write."""
+
+    def test_writes_json_file(self, tmp_path: pytest.TempPathFactory) -> None:
+        """Report is written as valid JSON."""
+        out = tmp_path / "report.json"  # type: ignore[operator]
+        fmt = JsonTracesDiffReportFormatter(out)
+        fmt.write(
+            {
+                "test_a": {
+                    "exact": _make_result(
+                        equivalent=False,
+                        differences=[_make_diff(tx=0, line=3)],
+                    ),
+                },
+            }
+        )
+        data = json.loads(out.read_text())
+        assert "test_a" in data
+        assert data["test_a"]["exact"]["equivalent"] is False
+        diffs = data["test_a"]["exact"]["differences"]
+        assert len(diffs) == 1
+        assert diffs[0]["transaction_index"] == 0
+        assert diffs[0]["trace_line_index"] == 3
+
+    def test_equivalent_tests_included(
+        self, tmp_path: pytest.TempPathFactory
+    ) -> None:
+        """Equivalent tests are included in JSON (unlike text report)."""
+        out = tmp_path / "report.json"  # type: ignore[operator]
+        fmt = JsonTracesDiffReportFormatter(out)
+        fmt.write(
+            {
+                "test_a": {"exact": _make_result(equivalent=True)},
+            }
+        )
+        data = json.loads(out.read_text())
+        assert data["test_a"]["exact"]["equivalent"] is True
+        assert data["test_a"]["exact"]["differences"] == []
+
+    def test_creates_parent_directories(
+        self, tmp_path: pytest.TempPathFactory
+    ) -> None:
+        """Parent directories are created if they don't exist."""
+        out = tmp_path / "sub" / "dir" / "report.json"  # type: ignore[operator]
+        fmt = JsonTracesDiffReportFormatter(out)
+        fmt.write({"test_a": {"exact": _make_result(equivalent=True)}})
+        assert out.exists()
diff --git a/packages/testing/src/execution_testing/client_clis/tests/test_transition_tool.py b/packages/testing/src/execution_testing/client_clis/tests/test_transition_tool.py
index 5a77e809122..9c5835665dd 100644
--- a/packages/testing/src/execution_testing/client_clis/tests/test_transition_tool.py
+++ b/packages/testing/src/execution_testing/client_clis/tests/test_transition_tool.py
@@ -1,10 +1,12 @@
 """Test the transition tool and subclasses."""
 
+import json
 import shutil
 import subprocess
 from pathlib import Path
 from typing import Any, Type
 
+import ijson  # type: ignore[import-untyped]
 import pytest
 
 from execution_testing.client_clis import (
@@ -17,10 +19,14 @@
 )
 from execution_testing.client_clis.cli_types import (
     LazyAlloc,
+    LazyAllocFile,
     LazyAllocJson,
     LazyAllocStr,
+    Result,
+    TransitionToolInput,
+    TransitionToolOutput,
 )
-from execution_testing.test_types import Alloc
+from execution_testing.test_types import Alloc, Environment
 
 
 def test_default_tool() -> None:
@@ -128,3 +134,318 @@ def test_lazy_alloc(ty: Type[LazyAlloc], raw: Any) -> None:
     lazy_instance = ty(raw=raw, _state_root=TEST_ALLOC_STATE_ROOT)
     assert lazy_instance.get() == TEST_ALLOC
     assert lazy_instance.state_root() == TEST_ALLOC_STATE_ROOT
+
+
+def test_lazy_alloc_file(tmp_path: Path) -> None:
+    """LazyAllocFile streams the alloc from disk and yields the same Alloc."""
+    alloc_path = tmp_path / "alloc.json"
+    alloc_path.write_text(TEST_ALLOC.model_dump_json())
+    lazy_instance = LazyAllocFile(
+        raw=alloc_path, _state_root=TEST_ALLOC_STATE_ROOT
+    )
+    assert lazy_instance.get() == TEST_ALLOC
+    assert lazy_instance.state_root() == TEST_ALLOC_STATE_ROOT
+
+
+def test_lazy_alloc_file_handles_mixed_entries(tmp_path: Path) -> None:
+    """
+    LazyAllocFile correctly reconstructs an Alloc containing None entries,
+    non-empty storage, long code, and multiple accounts.
+    """
+    alloc = Alloc.model_validate(
+        {
+            0xA: {
+                "balance": 1,
+                "nonce": 2,
+                "code": "0x" + "ab" * 128,
+                "storage": {"0x01": "0x02", "0x03": "0x04"},
+            },
+            0xB: None,
+            0xC: {"balance": "0xff", "nonce": 0, "code": "0x"},
+        }
+    )
+    state_root = alloc.state_root()
+    alloc_path = tmp_path / "alloc.json"
+    alloc_path.write_text(alloc.model_dump_json())
+    lazy_instance = LazyAllocFile(raw=alloc_path, _state_root=state_root)
+    assert lazy_instance.get() == alloc
+    assert lazy_instance.state_root() == state_root
+
+
+def _write_minimal_result(path: Path, state_root: Any) -> None:
+    """Write a minimal valid Result JSON to `path` using `state_root`."""
+    result = Result.model_validate(
+        {
+            "stateRoot": state_root,
+            "txRoot": bytes(32),
+            "receiptsRoot": bytes(32),
+            "logsHash": bytes(32),
+            "logsBloom": bytes(256),
+            "receipts": [],
+            "gasUsed": 0,
+        }
+    )
+    path.write_text(result.model_dump_json(by_alias=True, exclude_none=True))
+
+
+def test_model_validate_files_uses_lazy_alloc_file(tmp_path: Path) -> None:
+    """
+    model_validate_files backs the alloc with the on-disk file, not a
+    multi-GB string in Python memory.
+    """
+    alloc_path = tmp_path / "alloc.json"
+    alloc_path.write_text(TEST_ALLOC.model_dump_json())
+    _write_minimal_result(tmp_path / "result.json", TEST_ALLOC_STATE_ROOT)
+
+    output = TransitionToolOutput.model_validate_files(tmp_path)
+
+    assert isinstance(output.alloc, LazyAllocFile)
+    assert output.alloc.raw == alloc_path
+    assert output.alloc.get() == TEST_ALLOC
+
+
+def test_transition_tool_input_serializes_lazy_alloc_file(
+    tmp_path: Path,
+) -> None:
+    """
+    A `TransitionToolInput` carrying a `LazyAllocFile` (as happens when
+    one t8n invocation's output is chained into the next's input) can be
+    serialized via both `to_files` and `model_dump_json` without pulling
+    the alloc file into memory at `TransitionToolInput` construction.
+    """
+    source_alloc = tmp_path / "source_alloc.json"
+    source_alloc.write_text(TEST_ALLOC.model_dump_json())
+    lazy_alloc = LazyAllocFile(
+        raw=source_alloc, _state_root=TEST_ALLOC_STATE_ROOT
+    )
+
+    input_data = TransitionToolInput(
+        alloc=lazy_alloc,
+        senders_authorities={},
+        txs=[],
+        env=Environment(),
+    )
+
+    out_dir = tmp_path / "out"
+    out_dir.mkdir()
+    paths = input_data.to_files(out_dir, by_alias=True, exclude_none=True)
+    written_alloc = Alloc.model_validate_json(Path(paths["alloc"]).read_text())
+    assert written_alloc == TEST_ALLOC
+
+    dumped = input_data.model_dump_json(by_alias=True, exclude_none=True)
+    parsed = json.loads(dumped)
+    assert Alloc.model_validate(parsed["alloc"]) == TEST_ALLOC
+
+
+def test_to_files_copies_chained_lazy_alloc_file_without_serialize(
+    tmp_path: Path,
+) -> None:
+    """
+    Chained-block handoff: `to_files` should copy the backing alloc file
+    byte-for-byte rather than round-tripping through
+    `LazyAllocFile.get().model_dump_json()`. Verified by populating the
+    file with bytes that don't match what pydantic would re-emit and
+    asserting those exact bytes survive the dump.
+    """
+    source = tmp_path / "source_alloc.json"
+    # Indented form is not what `Alloc.model_dump_json()` emits — if to_files
+    # re-serialized through pydantic, the indentation would be lost.
+    source_bytes = json.dumps(
+        TEST_ALLOC.model_dump(mode="json"), indent=4
+    ).encode()
+    source.write_bytes(source_bytes)
+
+    lazy = LazyAllocFile(raw=source, _state_root=TEST_ALLOC_STATE_ROOT)
+    input_data = TransitionToolInput(
+        alloc=lazy,
+        senders_authorities={},
+        txs=[],
+        env=Environment(),
+    )
+
+    out_dir = tmp_path / "out"
+    out_dir.mkdir()
+    paths = input_data.to_files(out_dir, by_alias=True, exclude_none=True)
+    assert Path(paths["alloc"]).read_bytes() == source_bytes
+
+
+def test_model_dump_json_exclude_alloc_omits_alloc_field(
+    tmp_path: Path,
+) -> None:
+    """
+    `model_dump_json(exclude_alloc=True)` skips the alloc — used when the
+    t8n is reading alloc from `--input.alloc=<path>` instead of the stdin
+    bundle, so Python never builds the multi-GB alloc JSON string.
+    """
+    source = tmp_path / "alloc.json"
+    source.write_text(TEST_ALLOC.model_dump_json())
+    lazy = LazyAllocFile(raw=source, _state_root=TEST_ALLOC_STATE_ROOT)
+    input_data = TransitionToolInput(
+        alloc=lazy,
+        senders_authorities={},
+        txs=[],
+        env=Environment(),
+    )
+
+    full = json.loads(
+        input_data.model_dump_json(by_alias=True, exclude_none=True)
+    )
+    assert set(full.keys()) == {"alloc", "senders_authorities", "env", "txs"}
+
+    slim = json.loads(
+        input_data.model_dump_json(
+            exclude_alloc=True, by_alias=True, exclude_none=True
+        )
+    )
+    assert "alloc" not in slim
+    assert set(slim.keys()) == {"senders_authorities", "env", "txs"}
+
+
+def test_lazy_alloc_file_keepalive_pins_temp_dir() -> None:
+    """
+    `LazyAllocFile._keepalive` holds a `TemporaryDirectory` reference so
+    the on-disk alloc.json survives past the producing t8n call's logical
+    cleanup point — the next chained block can then consume the file
+    directly. Dropping the LazyAllocFile releases the keepalive and the
+    temp dir is cleaned up.
+    """
+    import gc
+    import tempfile
+
+    keep = tempfile.TemporaryDirectory()
+    keep_path = Path(keep.name)
+    alloc_path = keep_path / "alloc.json"
+    alloc_path.write_text(TEST_ALLOC.model_dump_json())
+
+    lazy = LazyAllocFile(
+        raw=alloc_path,
+        _state_root=TEST_ALLOC_STATE_ROOT,
+        _keepalive=keep,
+    )
+    # Releasing our handle leaves the file alive via the keepalive on lazy.
+    del keep
+    assert alloc_path.exists()
+    assert lazy.get() == TEST_ALLOC
+
+    # Dropping the LazyAllocFile drops the keepalive; TemporaryDirectory's
+    # finalizer wipes the directory. PyPy doesn't refcount, so trigger GC
+    # explicitly to run the finalizer deterministically.
+    del lazy
+    gc.collect()
+    assert not keep_path.exists()
+
+
+def test_dump_files_to_directory_copies_lazy_alloc_file(
+    tmp_path: Path,
+) -> None:
+    """
+    `dump_files_to_directory` copies the backing file when given a
+    `LazyAllocFile`, preserving exact bytes without round-tripping the
+    alloc through Python memory.
+    """
+    from execution_testing.client_clis.file_utils import (
+        dump_files_to_directory,
+    )
+
+    source = tmp_path / "source_alloc.json"
+    source_text = TEST_ALLOC.model_dump_json()
+    source.write_text(source_text)
+    lazy = LazyAllocFile(raw=source, _state_root=TEST_ALLOC_STATE_ROOT)
+
+    dump_dir = tmp_path / "dump"
+    dump_files_to_directory(dump_dir, {"output/alloc.json": lazy})
+
+    assert (dump_dir / "output" / "alloc.json").read_text() == source_text
+
+
+def test_dump_files_to_directory_lazy_alloc_file_after_backing_removed(
+    tmp_path: Path,
+) -> None:
+    """
+    On chained blocks, the previous block's t8n temp dir is cleaned up after
+    its alloc is materialized via ``.get()``. The resulting ``LazyAllocFile``
+    still carries a now-stale ``.raw`` path. Debug dumps must fall back to
+    re-serializing the cached ``Alloc`` instead of attempting to copy the
+    missing backing file.
+    """
+    from execution_testing.client_clis.file_utils import (
+        dump_files_to_directory,
+    )
+
+    source = tmp_path / "source_alloc.json"
+    source.write_text(TEST_ALLOC.model_dump_json())
+    lazy = LazyAllocFile(raw=source, _state_root=TEST_ALLOC_STATE_ROOT)
+    lazy.get()
+    source.unlink()
+
+    dump_dir = tmp_path / "dump"
+    dump_files_to_directory(dump_dir, {"input/alloc.json": lazy})
+
+    written = (dump_dir / "input" / "alloc.json").read_text()
+    assert Alloc.model_validate_json(written) == TEST_ALLOC
+
+
+@pytest.mark.parametrize(
+    "contents",
+    [
+        pytest.param(b"", id="empty_file"),
+        pytest.param(b"not json at all", id="garbage"),
+        pytest.param(
+            b'{"0x01": {"balance": 1, "nonce"',
+            id="truncated_mid_entry",
+        ),
+        pytest.param(b'{"0x01": {"balance": }}', id="invalid_value"),
+    ],
+)
+def test_lazy_alloc_file_malformed_json_raises(
+    tmp_path: Path, contents: bytes
+) -> None:
+    """
+    A malformed `alloc.json` surfaces as `ijson.IncompleteJSONError` when
+    `LazyAllocFile.validate()` streams it — no partial `Alloc` is returned.
+    """
+    alloc_path = tmp_path / "alloc.json"
+    alloc_path.write_bytes(contents)
+    lazy = LazyAllocFile(raw=alloc_path, _state_root=TEST_ALLOC_STATE_ROOT)
+
+    with pytest.raises(ijson.common.IncompleteJSONError):
+        lazy.get()
+
+
+@pytest.mark.parametrize(
+    "contents",
+    [
+        pytest.param(b"null", id="null"),
+        pytest.param(b"[]", id="array"),
+        pytest.param(b"42", id="scalar"),
+    ],
+)
+def test_lazy_alloc_file_non_object_top_level_raises(
+    tmp_path: Path, contents: bytes
+) -> None:
+    """
+    Valid JSON whose top-level value is not an object must raise rather
+    than silently producing an empty `Alloc`. `ijson.kvitems` would yield
+    nothing for these inputs, so without the explicit guard a corrupted
+    `alloc.json` would silently downgrade to a zero-account post-state.
+    """
+    alloc_path = tmp_path / "alloc.json"
+    alloc_path.write_bytes(contents)
+    lazy = LazyAllocFile(raw=alloc_path, _state_root=TEST_ALLOC_STATE_ROOT)
+
+    with pytest.raises(ValueError, match="Expected JSON object"):
+        lazy.get()
+
+
+def test_lazy_alloc_file_empty_object_yields_empty_alloc(
+    tmp_path: Path,
+) -> None:
+    """
+    A legitimately empty alloc (`{}`) parses to an empty `Alloc` without
+    raising; the non-object guard must not reject this case.
+    """
+    alloc_path = tmp_path / "alloc.json"
+    alloc_path.write_bytes(b"{}")
+    lazy = LazyAllocFile(raw=alloc_path, _state_root=TEST_ALLOC_STATE_ROOT)
+
+    assert lazy.get() == Alloc.model_validate({})
diff --git a/packages/testing/src/execution_testing/client_clis/tests/test_transition_tools_support.py b/packages/testing/src/execution_testing/client_clis/tests/test_transition_tools_support.py
index 73f8cf2d4d3..1d4a9e6fb14 100644
--- a/packages/testing/src/execution_testing/client_clis/tests/test_transition_tools_support.py
+++ b/packages/testing/src/execution_testing/client_clis/tests/test_transition_tools_support.py
@@ -48,6 +48,7 @@
 fork_set.add(Prague)
 
 
+@pytest.mark.xfail(reason="Known issue: geth evm not built in CI, see #2557")
 def test_ci_multi_t8n_support(
     installed_transition_tool_instances: Dict[str, TransitionTool | Exception],
     running_in_ci: bool,
diff --git a/packages/testing/src/execution_testing/client_clis/trace_comparators.py b/packages/testing/src/execution_testing/client_clis/trace_comparators.py
new file mode 100644
index 00000000000..69f9a2bd77f
--- /dev/null
+++ b/packages/testing/src/execution_testing/client_clis/trace_comparators.py
@@ -0,0 +1,348 @@
+"""Trace comparators for verifying EVM execution traces against a baseline."""
+
+from abc import ABC, abstractmethod
+from enum import StrEnum
+from typing import Annotated, Literal, Union
+
+from pydantic import Field
+
+from execution_testing.base_types import EthereumTestBaseModel
+from execution_testing.client_clis.cli_types import (
+    TraceLine,
+    Traces,
+    TransactionTraces,
+)
+
+
+class TraceComparatorType(StrEnum):
+    """Supported trace comparator strategies."""
+
+    EXACT = "exact"
+    EXACT_NO_GAS = "exact-no-gas"
+    EXACT_NO_STACK = "exact-no-stack"
+    EXACT_NO_STACK_NO_GAS = "exact-no-stack-no-gas"
+    EXACT_NO_STACK_NO_GAS_NO_GAS_COST = "exact-no-stack-no-gas-no-gas-cost"
+    GAS_EXHAUSTION = "gas-exhaustion"
+
+
+def _format_trace_line_diff(
+    trace_line: TraceLine,
+    differing_fields: dict[str, str],
+) -> str:
+    """
+    Format a trace line as an assembly-like string with diffs.
+
+    Return the opcode name, with differing field values in brackets
+    if any non-opcode fields differ.
+    Example: "PUSH1 (pc=0x3, stack=['0x4'])"
+    """
+    if not differing_fields:
+        return trace_line.op_name
+    fields_str = ", ".join(f"{k}={v}" for k, v in differing_fields.items())
+    return f"{trace_line.op_name} ({fields_str})"
+
+
+class TraceDifference(EthereumTestBaseModel):
+    """A difference between baseline and current trace at a specific line."""
+
+    # Tag used by the discriminated union in ``TraceComparisonResult`` so
+    # that serialization (``model_dump``) and deserialization
+    # (``model_validate``) pick the correct concrete subclass when
+    # differences are round-tripped — e.g. across xdist workers.
+    kind: Literal["trace_difference"] = "trace_difference"
+    transaction_index: int
+    trace_line_index: int
+    baseline: str
+    current: str
+
+
+class TransactionCountMismatch(TraceDifference):
+    """Structural mismatch: different number of transactions."""
+
+    kind: Literal["transaction_count_mismatch"] = "transaction_count_mismatch"  # type: ignore[assignment]
+    transaction_index: int = 0
+    trace_line_index: int = -1
+    baseline: str = ""
+    current: str = ""
+    baseline_count: int = 0
+    current_count: int = 0
+
+
+AnyTraceDifference = Annotated[
+    Union[TraceDifference, TransactionCountMismatch],
+    Field(discriminator="kind"),
+]
+
+
+class TraceComparisonResult(EthereumTestBaseModel):
+    """Result of comparing two Traces objects."""
+
+    equivalent: bool
+    differences: list[AnyTraceDifference] = Field(default_factory=list)
+
+
+class TraceComparator(ABC):
+    """Abstract base class for trace comparison strategies."""
+
+    @property
+    @abstractmethod
+    def name(self) -> str:
+        """Return the comparator's name."""
+        ...
+
+    @abstractmethod
+    def compare_transaction_traces(
+        self,
+        baseline: TransactionTraces,
+        current: TransactionTraces,
+        transaction_index: int,
+    ) -> TraceComparisonResult:
+        """Compare a single transaction's traces."""
+        ...
+
+    def compare_traces(
+        self,
+        baseline: Traces,
+        current: Traces,
+    ) -> TraceComparisonResult:
+        """Compare two Traces objects by iterating transaction pairs."""
+        if len(baseline.root) != len(current.root):
+            return TraceComparisonResult(
+                equivalent=False,
+                differences=[
+                    TransactionCountMismatch(
+                        baseline_count=len(baseline.root),
+                        current_count=len(current.root),
+                    )
+                ],
+            )
+
+        all_differences: list[TraceDifference] = []
+        for i, (b_tx, c_tx) in enumerate(
+            zip(baseline.root, current.root, strict=False)
+        ):
+            result = self.compare_transaction_traces(b_tx, c_tx, i)
+            all_differences.extend(result.differences)
+
+        return TraceComparisonResult(
+            equivalent=len(all_differences) == 0,
+            differences=all_differences,
+        )
+
+
+def _build_result_from_compare(
+    baseline: TransactionTraces,
+    current: TransactionTraces,
+    transaction_index: int,
+    exclude_fields: set[str] | None = None,
+    ignore_gas_differences: bool = False,
+) -> TraceComparisonResult:
+    """
+    Build a TraceComparisonResult from TransactionTraces.compare().
+
+    Convert the raw diff tuples from compare() into TraceDifference
+    objects with assembly-like strings.
+    """
+    raw_diffs = baseline.compare(
+        current,
+        exclude_fields=exclude_fields,
+        ignore_gas_differences=ignore_gas_differences,
+    )
+    if not raw_diffs:
+        return TraceComparisonResult(equivalent=True)
+
+    # Only report the first difference: once traces diverge, subsequent
+    # lines will mostly differ too.
+    diff = raw_diffs[0]
+    if diff.line_index is None:
+        b_str = ", ".join(f"{k}={v}" for k, v in diff.baseline_fields.items())
+        c_str = ", ".join(f"{k}={v}" for k, v in diff.current_fields.items())
+        trace_diff = TraceDifference(
+            transaction_index=transaction_index,
+            trace_line_index=-1,
+            baseline=b_str,
+            current=c_str,
+        )
+    else:
+        b_line = baseline.traces[diff.line_index]
+        c_line = current.traces[diff.line_index]
+        trace_diff = TraceDifference(
+            transaction_index=transaction_index,
+            trace_line_index=diff.line_index,
+            baseline=_format_trace_line_diff(b_line, diff.baseline_fields),
+            current=_format_trace_line_diff(c_line, diff.current_fields),
+        )
+    return TraceComparisonResult(
+        equivalent=False,
+        differences=[trace_diff],
+    )
+
+
+class FieldExclusionTraceComparator(TraceComparator):
+    """Compare traces field-by-field, optionally excluding fields."""
+
+    def __init__(
+        self,
+        comparator_name: str,
+        exclude_fields: set[str] | None = None,
+        ignore_gas_differences: bool = False,
+    ) -> None:
+        self._name = comparator_name
+        self._exclude_fields = exclude_fields
+        self._ignore_gas_differences = ignore_gas_differences
+
+    @property
+    def name(self) -> str:
+        """Return the comparator's name."""
+        return self._name
+
+    def compare_transaction_traces(
+        self,
+        baseline: TransactionTraces,
+        current: TransactionTraces,
+        transaction_index: int,
+    ) -> TraceComparisonResult:
+        """Compare trace fields, excluding configured fields."""
+        return _build_result_from_compare(
+            baseline,
+            current,
+            transaction_index,
+            exclude_fields=self._exclude_fields,
+            ignore_gas_differences=self._ignore_gas_differences,
+        )
+
+
+def _is_out_of_gas_error(error: str | None) -> bool:
+    """Return True if the error string indicates an out-of-gas condition."""
+    if error is None:
+        return False
+    s = error.lower()
+    # Two trace conventions coexist: geth-style natural-language messages
+    # ("out of gas", "contract creation code storage out of gas") and the
+    # EELS EIP-3155 emitter, which writes the Python exception class name
+    # ("OutOfGasError"). The class name has no spaces, so the substring
+    # match alone misses it — match it explicitly.
+    return "out of gas" in s or s == "outofgaserror"
+
+
+def _find_gas_exhaustion_points(
+    tx: TransactionTraces,
+) -> list[int]:
+    """Return trace line indices where an out-of-gas error occurs."""
+    return [
+        i
+        for i, line in enumerate(tx.traces)
+        if _is_out_of_gas_error(line.error)
+    ]
+
+
+def _format_oog_trace_line(
+    tx: TransactionTraces,
+    line_index: int,
+) -> str:
+    """Format a trace line showing its error field for OOG reporting."""
+    if line_index >= len(tx.traces):
+        return "no trace line"
+    line = tx.traces[line_index]
+    return _format_trace_line_diff(line, {"error": str(line.error)})
+
+
+class GasExhaustionTraceComparator(TraceComparator):
+    """
+    Detect differences in gas exhaustion between traces.
+
+    Equivalent when both sides have no out-of-gas errors or when
+    both run out of gas at the same trace line(s). Different when
+    the out-of-gas points diverge.
+    """
+
+    @property
+    def name(self) -> str:
+        """Return the comparator's name."""
+        return "gas-exhaustion"
+
+    def compare_transaction_traces(
+        self,
+        baseline: TransactionTraces,
+        current: TransactionTraces,
+        transaction_index: int,
+    ) -> TraceComparisonResult:
+        """Compare gas exhaustion points between two transaction traces."""
+        b_set = set(_find_gas_exhaustion_points(baseline))
+        c_set = set(_find_gas_exhaustion_points(current))
+
+        if b_set == c_set:
+            return TraceComparisonResult(equivalent=True)
+
+        differences: list[TraceDifference] = []
+        for line_index in sorted(b_set - c_set):
+            differences.append(
+                TraceDifference(
+                    transaction_index=transaction_index,
+                    trace_line_index=line_index,
+                    baseline=_format_oog_trace_line(baseline, line_index),
+                    current="no out-of-gas",
+                )
+            )
+        for line_index in sorted(c_set - b_set):
+            differences.append(
+                TraceDifference(
+                    transaction_index=transaction_index,
+                    trace_line_index=line_index,
+                    baseline="no out-of-gas",
+                    current=_format_oog_trace_line(current, line_index),
+                )
+            )
+
+        return TraceComparisonResult(
+            equivalent=False,
+            differences=differences,
+        )
+
+
+_FIELD_EXCLUSION_CONFIGS: dict[
+    TraceComparatorType,
+    tuple[set[str] | None, bool],
+] = {
+    # The tuple is ``(exclude_fields, ignore_gas_differences)``. The
+    # flag is set for any comparator that tolerates a per-line ``gas``
+    # difference: per-step gas deltas sum into ``gas_used``, so a
+    # comparator that accepts per-step differences must also skip the
+    # ``gas_used`` total check (and scrub ``Op.GAS`` stack results) to
+    # avoid spurious diffs.
+    TraceComparatorType.EXACT: (None, False),
+    TraceComparatorType.EXACT_NO_GAS: ({"gas"}, True),
+    # ``return_data`` is bundled with ``stack`` because clients differ
+    # in when/how they populate the post-call return buffer in traces.
+    # Tests that already tolerate stack differences want to tolerate this too.
+    # The ``no-stack`` variants below inherit this exclusion so that
+    # each comparator remains strictly more permissive than the one
+    # above it in the chain.
+    TraceComparatorType.EXACT_NO_STACK: ({"stack", "return_data"}, False),
+    TraceComparatorType.EXACT_NO_STACK_NO_GAS: (
+        {"gas", "stack", "return_data"},
+        True,
+    ),
+    TraceComparatorType.EXACT_NO_STACK_NO_GAS_NO_GAS_COST: (
+        {"gas", "stack", "gas_cost", "return_data"},
+        True,
+    ),
+}
+
+
+def create_comparator(
+    comparator_type: TraceComparatorType,
+) -> TraceComparator:
+    """Create a comparator instance from the given type."""
+    if comparator_type == TraceComparatorType.GAS_EXHAUSTION:
+        return GasExhaustionTraceComparator()
+    if comparator_type in _FIELD_EXCLUSION_CONFIGS:
+        exclude_fields, ignore_gas_differences = _FIELD_EXCLUSION_CONFIGS[
+            comparator_type
+        ]
+        return FieldExclusionTraceComparator(
+            comparator_type.value,
+            exclude_fields=exclude_fields,
+            ignore_gas_differences=ignore_gas_differences,
+        )
+    raise ValueError(f"Unknown comparator type: {comparator_type}")
diff --git a/packages/testing/src/execution_testing/client_clis/trace_report_formatter.py b/packages/testing/src/execution_testing/client_clis/trace_report_formatter.py
new file mode 100644
index 00000000000..fd0d2cd9dae
--- /dev/null
+++ b/packages/testing/src/execution_testing/client_clis/trace_report_formatter.py
@@ -0,0 +1,134 @@
+"""Report formatters for trace comparison results."""
+
+import json
+from abc import ABC, abstractmethod
+from pathlib import Path
+from typing import Any
+
+from execution_testing.client_clis.trace_comparators import (
+    TraceComparisonResult,
+)
+
+
+class TracesDiffReportFormatter(ABC):
+    """Abstract base class for formatting trace comparison reports."""
+
+    @abstractmethod
+    def format_test_result(
+        self,
+        test_id: str,
+        results: dict[str, TraceComparisonResult],
+    ) -> str | None:
+        """
+        Format one test's comparison results.
+
+        Return None if there is nothing to report (e.g. all equivalent).
+        """
+        ...
+
+    @abstractmethod
+    def format_summary(
+        self,
+        all_results: dict[str, dict[str, TraceComparisonResult]],
+    ) -> str:
+        """Format the aggregated report for all tests."""
+        ...
+
+
+class TextTracesDiffReportFormatter(TracesDiffReportFormatter):
+    """Human-readable plain text formatter."""
+
+    def __init__(self, max_differences: int = 10) -> None:
+        """Initialize with a cap on displayed differences per comparator."""
+        self.max_differences = max_differences
+
+    def format_test_result(
+        self,
+        test_id: str,
+        results: dict[str, TraceComparisonResult],
+    ) -> str | None:
+        """
+        Format one test's comparison results.
+
+        Return None if all comparators are equivalent.
+        """
+        diff_lines: list[str] = []
+        for name, result in results.items():
+            if result.equivalent:
+                continue
+            count = len(result.differences)
+            diff_lines.append(f"  [{name}] DIFFERENT ({count} differences)")
+            shown = result.differences[: self.max_differences]
+            for diff in shown:
+                loc = (
+                    f"tx[{diff.transaction_index}] "
+                    f"line[{diff.trace_line_index}]"
+                )
+                diff_lines.append(f"    {loc} baseline: {diff.baseline}")
+                diff_lines.append(f"    {loc} current:  {diff.current}")
+            remaining = count - len(shown)
+            if remaining > 0:
+                diff_lines.append(f"    ... ({remaining} more)")
+        if not diff_lines:
+            return None
+        return "\n".join([f"{test_id}:"] + diff_lines)
+
+    def format_summary(
+        self,
+        all_results: dict[str, dict[str, TraceComparisonResult]],
+    ) -> str:
+        """Format the aggregated report for all tests."""
+        lines: list[str] = []
+        with_diffs = 0
+        for test_id, results in all_results.items():
+            formatted = self.format_test_result(test_id, results)
+            if formatted is not None:
+                lines.append(formatted)
+                lines.append("")
+                with_diffs += 1
+
+        total = len(all_results)
+        lines.append(
+            f"Summary: {total} tests verified, {with_diffs} with differences"
+        )
+        return "\n".join(lines)
+
+
+class JsonTracesDiffReportFormatter:
+    """Write trace comparison results to a JSON file."""
+
+    def __init__(self, output_path: Path) -> None:
+        """Initialize with the output file path."""
+        self.output_path = output_path
+
+    @staticmethod
+    def _result_to_dict(
+        result: TraceComparisonResult,
+    ) -> dict[str, Any]:
+        """Convert a TraceComparisonResult to a JSON-serializable dict."""
+        return {
+            "equivalent": result.equivalent,
+            "differences": [
+                {
+                    "transaction_index": d.transaction_index,
+                    "trace_line_index": d.trace_line_index,
+                    "baseline": d.baseline,
+                    "current": d.current,
+                }
+                for d in result.differences
+            ],
+        }
+
+    def write(
+        self,
+        all_results: dict[str, dict[str, TraceComparisonResult]],
+    ) -> None:
+        """Write the full report to the JSON file."""
+        report: dict[str, Any] = {}
+        for test_id, comparator_results in all_results.items():
+            report[test_id] = {
+                name: self._result_to_dict(result)
+                for name, result in comparator_results.items()
+            }
+        self.output_path.parent.mkdir(parents=True, exist_ok=True)
+        self.output_path.write_text(json.dumps(report, indent=2) + "\n")
diff --git a/packages/testing/src/execution_testing/client_clis/transition_tool.py b/packages/testing/src/execution_testing/client_clis/transition_tool.py
index d9a6996f06a..9cec4cb6074 100644
--- a/packages/testing/src/execution_testing/client_clis/transition_tool.py
+++ b/packages/testing/src/execution_testing/client_clis/transition_tool.py
@@ -46,6 +46,7 @@
 
 from .cli_types import (
     LazyAlloc,
+    LazyAllocFile,
     OpcodeCount,
     Traces,
     TransactionReceipt,
@@ -162,6 +163,15 @@ def get(self, subkey: int) -> TransitionToolOutput | None:
 
     def set(self, subkey: int, value: TransitionToolOutput) -> None:
         """Set a value in the cache for the current key."""
+        alloc = getattr(value, "alloc", None)
+        if isinstance(alloc, LazyAllocFile):
+            # Materialize the streamed alloc before caching so the producing
+            # `TemporaryDirectory` (pinned via `_keepalive`) can be released.
+            # Without this, every cached subcall would retain its own
+            # `output/alloc.json` on disk for the test's lifetime - O(N) for
+            # an N-block chained test.
+            alloc.get()
+            alloc._keepalive = None
         self._cache[subkey] = value
 
     def clear(self) -> None:
@@ -267,6 +277,13 @@ def collect_traces(
         for i, r in enumerate(receipts):
             trace_file_name = f"trace-{i}-{r.transaction_hash}.jsonl"
             trace_file_path = temp_dir_path / trace_file_name
+            if not trace_file_path.exists():
+                # Transaction was rejected mid-processing (e.g. EIP-3607
+                # collision): the receipt exists but the tracer's
+                # TransactionEnd event never fired, so no trace file was
+                # written. Record an empty trace for this tx.
+                traces.append(TransactionTraces(traces=[]))
+                continue
             if debug_output_path:
                 shutil.copy(
                     trace_file_path,
@@ -316,36 +333,25 @@ class TransitionToolData:
         @property
         def fork_name(self) -> str:
             """Return the fork name."""
-            return self.fork.transition_tool_name(
-                block_number=self.env.number,
-                timestamp=self.env.timestamp,
-            )
+            return self.fork.transition_tool_name()
 
         @property
         def fork_name_if_supports_blob_params(self) -> str:
             """Return the fork name."""
-            fork = self.fork.fork_at(
-                block_number=self.env.number,
-                timestamp=self.env.timestamp,
-            )
+            fork = self.fork()
 
             # For tools that support blob_params, return base fork for BPO
             # forks.
             if fork.bpo_fork():
                 return fork.non_bpo_ancestor().transition_tool_name()
             else:
-                return self.fork.transition_tool_name(
-                    block_number=self.env.number,
-                    timestamp=self.env.timestamp,
-                )
+                return self.fork.transition_tool_name()
 
         @property
         def blob_params(self) -> ForkBlobSchedule | None:
             """Return the blob parameters for the current fork."""
             if self.blob_schedule:
-                fork_name = self.fork.fork_at(
-                    block_number=self.env.number, timestamp=self.env.timestamp
-                ).name()
+                fork_name = self.fork.name()
                 # Only return blob params if this fork has them
                 if fork_name in self.blob_schedule.root:
                     return self.blob_schedule[fork_name]
@@ -399,7 +405,7 @@ def _evaluate_filesystem(
 
         output_paths = {
             output: os.path.join("output", f"{output}.json")
-            for output in ["alloc", "result"]
+            for output in ["alloc", "result", "senders_authorities"]
         }
         output_paths["body"] = os.path.join("output", "txs.rlp")
 
@@ -531,7 +537,12 @@ def _evaluate_filesystem(
                 output.result.receipts, temp_dir, debug_output_path
             )
 
-        temp_dir.cleanup()
+        # Pin temp_dir to the output alloc so the on-disk alloc.json
+        # survives until the next chained-block t8n call (or this
+        # LazyAllocFile is dropped) — lets the next call read the alloc
+        # via copyfile rather than re-serializing through Python.
+        if isinstance(output.alloc, LazyAllocFile):
+            output.alloc._keepalive = temp_dir
 
         return output
 
@@ -679,15 +690,41 @@ def _evaluate_stream(
         profiler: Profiler,
     ) -> TransitionToolOutput:
         """
-        Execute a transition tool using stdin and stdout for its inputs and
+        Execute a transition tool using stdin for inputs and files for
         outputs.
+
+        The t8n writes `alloc.json`/`result.json`/`txs.rlp` into an
+        `output/` subdirectory of a temp dir; Python then parses `result.json`
+        eagerly and references `alloc.json` via `LazyAllocFile`, which
+        streams the file on demand. Avoids holding the full alloc JSON
+        (multi-GB for large benchmarks) in the stdout buffer alongside the
+        validated `Alloc` object graph.
         """
         temp_dir = tempfile.TemporaryDirectory()
-        args = self.construct_args_stream(t8n_data, temp_dir)
+        output_dir = Path(temp_dir.name) / "output"
+        output_dir.mkdir()
+
+        # Chained-block handoff: when the input alloc is a `LazyAllocFile`
+        # whose backing file is still on disk (pinned via the producing
+        # call's keepalive), point the t8n at it directly via
+        # `--input.alloc=<path>` and omit alloc from the stdin bundle, so
+        # Python never builds a multi-GB JSON string for the next call.
+        alloc_path: Path | None = None
+        if (
+            isinstance(t8n_data.alloc, LazyAllocFile)
+            and Path(t8n_data.alloc.raw).exists()
+        ):
+            alloc_path = Path(t8n_data.alloc.raw)
+
+        args = self.construct_args_stream(
+            t8n_data, temp_dir, alloc_path=alloc_path
+        )
 
         stdin = t8n_data.to_input()
 
-        process_input = stdin.model_dump_json(**model_dump_config)
+        process_input = stdin.model_dump_json(
+            exclude_alloc=alloc_path is not None, **model_dump_config
+        )
         encoded_process_input = process_input.encode()
 
         result = subprocess.run(
@@ -707,22 +744,20 @@ def _evaluate_stream(
             raise Exception("failed to evaluate: " + result.stderr.decode())
 
         output: TransitionToolOutput = (
-            TransitionToolOutput.model_validate_json(
-                result.stdout,
+            TransitionToolOutput.model_validate_files(
+                output_dir,
                 context={"exception_mapper": self.exception_mapper},
             )
         )
 
         if debug_output_path:
             with profiler.pause():
-                dump_files_to_directory(
-                    debug_output_path,
-                    {
-                        "output/alloc.json": output.alloc.raw,
-                        "output/result.json": output.result,
-                        "output/txs.rlp": str(output.body),
-                    },
-                )
+                debug_output_dir = Path(debug_output_path) / "output"
+                debug_output_dir.mkdir(parents=True, exist_ok=True)
+                for name in ("alloc.json", "result.json", "txs.rlp"):
+                    src = output_dir / name
+                    if src.exists():
+                        shutil.copyfile(src, debug_output_dir / name)
 
         if self.supports_opcode_count:
             opcode_count_file_path = Path(temp_dir.name) / "opcodes.json"
@@ -746,7 +781,14 @@ def _evaluate_stream(
                 output.result.receipts, temp_dir, debug_output_path
             )
 
-        temp_dir.cleanup()
+        # Pin temp_dir to the output alloc so the on-disk alloc.json
+        # survives until the next chained-block t8n call (or this
+        # LazyAllocFile is dropped) — lets the next call read the alloc
+        # via copyfile / `--input.alloc=<path>` rather than re-serializing
+        # through Python.
+        if isinstance(output.alloc, LazyAllocFile):
+            output.alloc._keepalive = temp_dir
+
         return output
 
     def safe_t8n_args(
@@ -754,9 +796,16 @@ def safe_t8n_args(
         fork_name: str,
         chain_id: int,
         reward: int,
-        temp_dir: tempfile.TemporaryDirectory | None = None,
+        temp_dir: tempfile.TemporaryDirectory,
+        *,
+        alloc_path: Optional[Path] = None,
     ) -> List[str]:
-        """Safely construct t8n arguments with validated inputs."""
+        """
+        Safely construct t8n arguments with validated inputs.
+
+        When ``alloc_path`` is provided (chained-block handoff), the alloc is
+        read from that file rather than from the stdin bundle.
+        """
         # Validate fork name against actual transition tool names from all
         # available forks
         valid_forks = get_valid_transition_tool_names()
@@ -771,19 +820,32 @@ def safe_t8n_args(
         if not isinstance(reward, int) or reward < 0:
             raise ValueError(f"Invalid reward: {reward}")
 
-        # Use literal strings for command flags
-        input_alloc: LiteralString = "--input.alloc=stdin"
+        if temp_dir is None:
+            raise ValueError(
+                "safe_t8n_args requires a temp_dir for file-based outputs"
+            )
+
+        # env/txs/senders_authorities still come through stdin; alloc is
+        # either bundled on stdin (initial block) or streamed from a path
+        # (chained-block handoff). Outputs always go to files in the
+        # existing temp dir so Python can stream-read the post-state alloc
+        # rather than buffering stdout.
+        input_alloc = (
+            f"--input.alloc={alloc_path}"
+            if alloc_path is not None
+            else "--input.alloc=stdin"
+        )
         input_senders_authorities: LiteralString = (
             "--input.senders_authorities=stdin"
         )
         input_txs: LiteralString = "--input.txs=stdin"
         input_env: LiteralString = "--input.env=stdin"
-        output_result: LiteralString = "--output.result=stdout"
-        output_alloc: LiteralString = "--output.alloc=stdout"
+        output_result: LiteralString = "--output.result=output/result.json"
+        output_alloc: LiteralString = "--output.alloc=output/alloc.json"
         output_senders_authorities: LiteralString = (
-            "--output.senders_authorities=stdout"
+            "--output.senders_authorities=output/senders_authorities.json"
         )
-        output_body: LiteralString = "--output.body=stdout"
+        output_body: LiteralString = "--output.body=output/txs.rlp"
         trace_flag: LiteralString = "--trace"
 
         args = [
@@ -798,13 +860,12 @@ def safe_t8n_args(
             f"--state.fork={fork_name}",
             f"--state.chainid={chain_id}",
             f"--state.reward={reward}",
+            f"--output.basedir={temp_dir.name}",
         ]
 
-        if temp_dir and (self.trace or self.supports_opcode_count):
-            args.append(f"--output.basedir={temp_dir.name}")
         if self.trace:
             args.append(trace_flag)
-        if self.supports_opcode_count and temp_dir:
+        if self.supports_opcode_count:
             args.extend(["--opcode.count", "opcodes.json"])
 
         return args
@@ -813,6 +874,8 @@ def construct_args_stream(
         self,
         t8n_data: TransitionToolData,
         temp_dir: tempfile.TemporaryDirectory,
+        *,
+        alloc_path: Optional[Path] = None,
     ) -> List[str]:
         """Construct arguments for t8n interaction via streams."""
         command: list[str] = [str(self.binary)]
@@ -820,7 +883,11 @@ def construct_args_stream(
             command.append(self.subcommand)
 
         safe_args = self.safe_t8n_args(
-            t8n_data.fork_name, t8n_data.chain_id, t8n_data.reward, temp_dir
+            t8n_data.fork_name,
+            t8n_data.chain_id,
+            t8n_data.reward,
+            temp_dir,
+            alloc_path=alloc_path,
         )
         return command + safe_args
 
@@ -837,16 +904,14 @@ def dump_debug_stream(
         """
         t8n_call = " ".join(args)
         t8n_output_base_dir = os.path.join(debug_output_path, "t8n.sh.out")
-        if self.trace:
-            t8n_call = t8n_call.replace(temp_dir.name, t8n_output_base_dir)
+        t8n_call = t8n_call.replace(temp_dir.name, t8n_output_base_dir)
         t8n_script = textwrap.dedent(
             f"""\
             #!/bin/bash
             # hard-coded to avoid surprises
             rm -rf {debug_output_path}/t8n.sh.out
 
-            # unused if tracing is not enabled
-            mkdir {debug_output_path}/t8n.sh.out
+            mkdir -p {debug_output_path}/t8n.sh.out/output
             {t8n_call} < {debug_output_path}/stdin.txt
             """
         )
@@ -953,6 +1018,8 @@ def evaluate(
         if self.output_cache is not None:
             cached_result = self.output_cache.get(current_call_id)
             if cached_result is not None:
+                if self.trace and cached_result.result.traces is not None:
+                    self.append_traces(cached_result.result.traces)
                 return self.process_result(cached_result)
         debug_output_path = self.get_next_transition_tool_output_path(
             current_call_id
diff --git a/packages/testing/src/execution_testing/config/docs.py b/packages/testing/src/execution_testing/config/docs.py
index d52046c9579..21f21a1b5a8 100644
--- a/packages/testing/src/execution_testing/config/docs.py
+++ b/packages/testing/src/execution_testing/config/docs.py
@@ -17,8 +17,10 @@ class DocsConfig(BaseModel):
     GENERATE_UNTIL_FORK: str = "Amsterdam"
     """The fork until which documentation should be generated."""
 
-    DOCS_BASE_URL: str = "https://eest.ethereum.org"
+    DOCS_BASE_URL: str = (
+        "https://steel.ethereum.foundation/docs/execution-specs"
+    )
 
     # Documentation URLs prefixed with `DOCS_URL__` to avoid conflicts with
     # other URLs
-    DOCS_URL__WRITING_TESTS: str = f"{DOCS_BASE_URL}/main/writing_tests/"
+    DOCS_URL__WRITING_TESTS: str = f"{DOCS_BASE_URL}/writing_tests/"
diff --git a/packages/testing/src/execution_testing/exceptions/exceptions/block.py b/packages/testing/src/execution_testing/exceptions/exceptions/block.py
index eceb98b6336..bf8fec8ba7e 100644
--- a/packages/testing/src/execution_testing/exceptions/exceptions/block.py
+++ b/packages/testing/src/execution_testing/exceptions/exceptions/block.py
@@ -177,15 +177,6 @@ class BlockException(ExceptionBase):
     """Block's access list is invalid."""
     INVALID_BAL_HASH = auto()
     """Block header's BAL hash does not match the computed BAL hash."""
-    INVALID_BAL_EXTRA_ACCOUNT = auto()
-    """
-    Block BAL contains an account change that is not present in the computed
-    BAL.
-    """
-    INVALID_BAL_MISSING_ACCOUNT = auto()
-    """
-    Block BAL is missing an account change that is present in the computed BAL.
-    """
     BLOCK_ACCESS_LIST_GAS_LIMIT_EXCEEDED = auto()
     """
     Block access list exceeds the gas limit constraint (EIP-7928).
diff --git a/packages/testing/src/execution_testing/fixtures/__init__.py b/packages/testing/src/execution_testing/fixtures/__init__.py
index eb7ddf77556..f74946a8c72 100644
--- a/packages/testing/src/execution_testing/fixtures/__init__.py
+++ b/packages/testing/src/execution_testing/fixtures/__init__.py
@@ -22,6 +22,7 @@
     merge_partial_fixture_files,
 )
 from .consume import FixtureConsumer
+from .post_verifications import AccountCheck, PostVerifications
 from .pre_alloc_groups import (
     PreAllocGroup,
     PreAllocGroupBuilder,
@@ -43,11 +44,13 @@
     "FixtureCollector",
     "FixtureConsumer",
     "FixtureFillingPhase",
+    "AccountCheck",
     "FixtureFormat",
     "LabeledFixtureFormat",
     "PreAllocGroup",
     "PreAllocGroupBuilder",
     "PreAllocGroupBuilders",
+    "PostVerifications",
     "PreAllocGroups",
     "StateFixture",
     "strip_fixture_format_from_node",
diff --git a/packages/testing/src/execution_testing/fixtures/base.py b/packages/testing/src/execution_testing/fixtures/base.py
index fa2dc82111e..9b2fb475669 100644
--- a/packages/testing/src/execution_testing/fixtures/base.py
+++ b/packages/testing/src/execution_testing/fixtures/base.py
@@ -29,8 +29,8 @@
 from pydantic_core.core_schema import ValidatorFunctionWrapHandler
 
 from execution_testing.base_types import CamelModel, ReferenceSpec
-from execution_testing.client_clis.cli_types import OpcodeCount
-from execution_testing.forks import Fork
+from execution_testing.fixtures.post_verifications import PostVerifications
+from execution_testing.forks import Fork, TransitionFork
 
 
 def fixture_format_discriminator(v: Any) -> str | None:
@@ -60,8 +60,10 @@ def fixture_format_discriminator(v: Any) -> str | None:
 class FixtureFillingPhase(Enum):
     """Execution phase for fixture generation."""
 
-    PRE_ALLOC_GENERATION = auto()
     FILL = auto()
+    PRE_ALLOC_GENERATION = auto()
+    FILL_AFTER_PRE_ALLOC_GENERATION = auto()
+    FILL_STATEFUL = auto()
 
 
 class BaseFixture(CamelModel):
@@ -74,13 +76,19 @@ class BaseFixture(CamelModel):
     info: Dict[str, Dict[str, Any] | str] = Field(
         default_factory=dict, alias="_info"
     )
+    post_verifications: PostVerifications | None = Field(
+        default=None, alias="postVerifications"
+    )
 
     # Fixture format properties
     format_name: ClassVar[str] = ""
     output_file_extension: ClassVar[str] = ".json"
     description: ClassVar[str] = "Unknown fixture format; it has not been set."
     format_phases: ClassVar[Set[FixtureFillingPhase]] = {
-        FixtureFillingPhase.FILL
+        # Normal fixture types can be filled whether the pre-alloc phase was
+        # executed or not.
+        FixtureFillingPhase.FILL,
+        FixtureFillingPhase.FILL_AFTER_PRE_ALLOC_GENERATION,
     }
     transition_tool_cache_key: ClassVar[str] = ""
 
@@ -166,9 +174,9 @@ def fill_info(
         t8n_version: str,
         test_case_description: str,
         fixture_source_url: str,
-        opcode_count: OpcodeCount | None,
         ref_spec: ReferenceSpec | None,
         _info_metadata: Dict[str, Any] | None,
+        metadata: Dict[str, Any] | None = None,
     ) -> None:
         """Fill the info field for this fixture."""
         if "comment" not in self.info:
@@ -176,19 +184,19 @@ def fill_info(
         self.info["filling-transition-tool"] = t8n_version
         self.info["description"] = test_case_description
         self.info["url"] = fixture_source_url
-        if opcode_count is not None:
-            self.info["opcode_count"] = opcode_count.model_dump()
+        if metadata:
+            self.info["metadata"] = metadata
         if ref_spec is not None:
             ref_spec.write_info(self.info)
         if _info_metadata:
             self.info.update(_info_metadata)
 
-    def get_fork(self) -> Fork | None:
+    def get_fork(self) -> Fork | TransitionFork | None:
         """Return fork of the fixture as a string."""
         raise NotImplementedError
 
     @classmethod
-    def supports_fork(cls, fork: Fork) -> bool:
+    def supports_fork(cls, fork: Fork | TransitionFork) -> bool:
         """
         Return whether the fixture can be generated for the given fork.
 
@@ -200,7 +208,7 @@ def supports_fork(cls, fork: Fork) -> bool:
     @classmethod
     def discard_fixture_format_by_marks(
         cls,
-        fork: Fork,
+        fork: Fork | TransitionFork,
         markers: List[pytest.Mark],
     ) -> bool:
         """
diff --git a/packages/testing/src/execution_testing/fixtures/blockchain.py b/packages/testing/src/execution_testing/fixtures/blockchain.py
index a653e4d97e9..ff908059ba8 100644
--- a/packages/testing/src/execution_testing/fixtures/blockchain.py
+++ b/packages/testing/src/execution_testing/fixtures/blockchain.py
@@ -2,12 +2,15 @@
 
 from functools import cached_property
 from typing import (
+    TYPE_CHECKING,
     Annotated,
     Any,
     ClassVar,
+    Dict,
     List,
     Literal,
     Self,
+    Sequence,
     Set,
     Tuple,
     Type,
@@ -22,9 +25,11 @@
 from ethereum_types.numeric import Uint
 from pydantic import (
     AliasChoices,
+    ConfigDict,
     Field,
     PlainSerializer,
     computed_field,
+    model_serializer,
     model_validator,
 )
 from pydantic_core import PydanticUndefined
@@ -48,11 +53,13 @@
     EngineAPIError,
     ExceptionInstanceOrList,
 )
-from execution_testing.forks import Fork, Paris
+from execution_testing.forks import Fork, Paris, TransitionFork
 from execution_testing.test_types import (
     BlockAccessList,
     Environment,
+    Removable,
     Requests,
+    TestPhase,
     Transaction,
     Withdrawal,
 )
@@ -69,6 +76,9 @@
     FixtureTransactionReceipt,
 )
 
+if TYPE_CHECKING:
+    from execution_testing.rpc.rpc_types import PayloadAttributes
+
 
 def post_state_validator(
     alternate_field: str | None = None, mode: str = "after"
@@ -126,11 +136,9 @@ def __new__(cls, value: str) -> "HeaderForkRequirement":
         """Create a new instance of the class."""
         return super().__new__(cls, value)
 
-    def required(self, fork: Fork, block_number: int, timestamp: int) -> bool:
+    def required(self, fork: Fork) -> bool:
         """Check if the field is required for the given fork."""
-        return getattr(fork, f"header_{self}_required")(
-            block_number=block_number, timestamp=timestamp
-        )
+        return getattr(fork, f"header_{self}_required")()
 
     @classmethod
     def get_from_annotation(cls, field_hints: Any) -> Self | None:
@@ -213,6 +221,10 @@ class FixtureHeader(CamelModel):
     block_access_list_hash: (
         Annotated[Hash, HeaderForkRequirement("bal_hash")] | None
     ) = Field(None, alias="blockAccessListHash")
+    slot_number: (
+        Annotated[ZeroPaddedHexNumber, HeaderForkRequirement("slot_number")]
+        | None
+    ) = Field(None)
 
     fork: Fork | None = Field(None, exclude=True)
 
@@ -227,10 +239,6 @@ def model_post_init(self, __context: Any) -> None:
             # No validation done when we are importing the fixture from file
             return
 
-        # Get the timestamp and block number
-        block_number = self.number
-        timestamp = self.timestamp
-
         # For each field, check if any of the annotations are of type
         # HeaderForkRequirement and if so, check if the field is required for
         # the given fork.
@@ -247,9 +255,7 @@ def model_post_init(self, __context: Any) -> None:
             )
             if header_fork_requirement is not None:
                 if (
-                    header_fork_requirement.required(
-                        self.fork, block_number, timestamp
-                    )
+                    header_fork_requirement.required(self.fork)
                     and getattr(self, field) is None
                 ):
                     raise ValueError(
@@ -287,8 +293,6 @@ def get_default_from_annotation(
         fork: Fork,
         field_name: str,
         field_hint: Any,
-        block_number: int = 0,
-        timestamp: int = 0,
     ) -> Any:
         """
         Get default value for a header field based on its type hint.
@@ -303,9 +307,6 @@ def get_default_from_annotation(
             fork: Fork to check requirements against
             field_name: Name of the field
             field_hint: Type annotation of the field
-            block_number: Block number for fork requirement checking
-                (default: 0)
-            timestamp: Timestamp for fork requirement checking (default: 0)
 
         Returns:
             Default value appropriate for the field type, or None if
@@ -324,9 +325,7 @@ def get_default_from_annotation(
         )
         if header_fork_requirement is not None:
             # Only provide a default if the fork requires this field
-            if not header_fork_requirement.required(
-                fork, block_number, timestamp
-            ):
+            if not header_fork_requirement.required(fork):
                 return None
 
         # Check if the field has a default value defined in the model
@@ -364,7 +363,7 @@ def get_default_from_annotation(
     def genesis(cls, fork: Fork, env: Environment, state_root: Hash) -> Self:
         """Get the genesis header for the given fork."""
         environment_values = env.model_dump(
-            exclude_none=True, exclude={"withdrawals"}
+            exclude_none=True, exclude={"withdrawals", "slot_number"}
         )
         if env.withdrawals is not None:
             environment_values["withdrawals_root"] = Withdrawal.list_root(
@@ -374,13 +373,14 @@ def genesis(cls, fork: Fork, env: Environment, state_root: Hash) -> Self:
         extras = {
             "state_root": state_root,
             "requests_hash": Requests()
-            if fork.header_requests_required(block_number=0, timestamp=0)
+            if fork.header_requests_required()
             else None,
             "block_access_list_hash": (
                 BlockAccessList().rlp_hash
-                if fork.header_bal_hash_required(block_number=0, timestamp=0)
+                if fork.header_bal_hash_required()
                 else None
             ),
+            "slot_number": 0 if fork.header_slot_number_required() else None,
             "fork": fork,
         }
         return cls(**environment_values, **extras)
@@ -421,6 +421,7 @@ class FixtureExecutionPayload(CamelModel):
     block_access_list: Bytes | None = Field(
         None, description="RLP-serialized EIP-7928 Block Access List"
     )
+    slot_number: HexNumber | None = Field(None)
 
     @classmethod
     def from_fixture_header(
@@ -442,6 +443,49 @@ def from_fixture_header(
         )
 
 
+class FixtureExecutionPayloadModifier(CamelModel):
+    """
+    Modifier for ``FixtureExecutionPayload`` fields, used to construct
+    intentionally invalid ``engine_newPayload`` requests in negative tests.
+
+    Each field defaults to ``None`` (no override). Set a field to a concrete
+    value to override it on the payload, or to ``REMOVE_FIELD`` (sentinel) to
+    omit it from the payload entirely. This mirrors ``Header``'s mechanism
+    but targets ``FixtureExecutionPayload`` instead of ``FixtureHeader``.
+    """
+
+    model_config = ConfigDict(
+        **CamelModel.model_config,
+        arbitrary_types_allowed=True,
+    )
+
+    block_access_list: Removable | Bytes | None = None
+
+    REMOVE_FIELD: ClassVar[Removable] = Removable()
+    """Sentinel to specify that a payload field should be removed."""
+
+    @model_serializer(mode="wrap", when_used="json")
+    def _serialize_model(self, serializer: Any, info: Any) -> Dict[str, Any]:
+        """Exclude Removable fields from serialization."""
+        del info
+        data = serializer(self)
+        return {k: v for k, v in data.items() if not isinstance(v, Removable)}
+
+    def apply(
+        self, target: "FixtureExecutionPayload"
+    ) -> "FixtureExecutionPayload":
+        """Return a copy of ``target`` with this modifier's overrides."""
+        overrides: Dict[str, Any] = {}
+        for field_name in self.__class__.model_fields:
+            value = getattr(self, field_name)
+            if value is None:
+                continue
+            overrides[field_name] = (
+                None if isinstance(value, Removable) else value
+            )
+        return target.model_copy(update=overrides)
+
+
 EngineNewPayloadV1Parameters = Tuple[FixtureExecutionPayload]
 EngineNewPayloadV3Parameters = Tuple[FixtureExecutionPayload, List[Hash], Hash]
 EngineNewPayloadV4Parameters = Tuple[
@@ -482,11 +526,74 @@ class FixtureEngineNewPayload(CamelModel):
         ]
         | None
     ) = None
+    phase: TestPhase | None = Field(
+        None,
+        description=(
+            "Test phase the payload belongs to (setup / execution / "
+            "cleanup). Set at fill time from the transactions' "
+            "TestPhaseManager context; consumers use it to partition "
+            "payloads (e.g. BlockchainEngineStatefulFixture "
+            "setupEngineNewPayloads vs engineNewPayloads) without "
+            "re-inferring from tx metadata."
+        ),
+    )
 
     def valid(self) -> bool:
         """Return whether the payload is valid."""
         return self.validation_error is None
 
+    def get_payload_attributes(self) -> "PayloadAttributes":
+        """Return the ``PayloadAttributes`` corresponding to this payload."""
+        from execution_testing.rpc.rpc_types import PayloadAttributes
+
+        execution_payload = self.params[0]
+        # parent_beacon_block_root exists from V3 onwards. The length check
+        # is for mypy narrowing; the version check captures the actual rule.
+        parent_beacon_block_root = (
+            self.params[2]
+            if self.forkchoice_updated_version >= 3 and len(self.params) >= 3
+            else None
+        )
+        return PayloadAttributes(
+            timestamp=execution_payload.timestamp,
+            prev_randao=execution_payload.prev_randao,
+            suggested_fee_recipient=execution_payload.fee_recipient,
+            withdrawals=execution_payload.withdrawals,
+            parent_beacon_block_root=parent_beacon_block_root,
+        )
+
+    @staticmethod
+    def derive_phase(transactions: Sequence[Any]) -> TestPhase | None:
+        """
+        Derive block phase from transactions.
+
+        Reads ``test_phase`` (set by ``TestPhaseManager`` context managers at
+        construction time), falling back to ``metadata.phase`` (set explicitly
+        by pre_alloc helpers). A block with any ``SETUP`` transaction is
+        considered part of setup; otherwise the single shared phase is used,
+        or ``None`` if the block has no phase-tagged transactions.
+        """
+        if not transactions:
+            return None
+
+        phases: set[TestPhase] = set()
+        for tx in transactions:
+            phase = getattr(tx, "test_phase", None)
+            if phase is None:
+                meta = getattr(tx, "metadata", None)
+                if meta is not None:
+                    phase = getattr(meta, "phase", None)
+            if phase is not None:
+                phases.add(phase)
+
+        if not phases:
+            return None
+        if len(phases) == 1:
+            return next(iter(phases))
+        if TestPhase.SETUP in phases:
+            return TestPhase.SETUP
+        return None
+
     @classmethod
     def from_fixture_header(
         cls,
@@ -496,22 +603,29 @@ def from_fixture_header(
         withdrawals: List[Withdrawal] | None,
         requests: List[Bytes] | None,
         block_access_list: Bytes | None = None,
+        execution_payload_modifier: (
+            "FixtureExecutionPayloadModifier | None"
+        ) = None,
         **kwargs: Any,
     ) -> Self:
         """Create `FixtureEngineNewPayload` from a `FixtureHeader`."""
-        new_payload_version = fork.engine_new_payload_version(
-            block_number=header.number, timestamp=header.timestamp
-        )
-        forkchoice_updated_version = fork.engine_forkchoice_updated_version(
-            block_number=header.number, timestamp=header.timestamp
-        )
+        new_payload_version = fork.engine_new_payload_version()
+        forkchoice_updated_version = fork.engine_forkchoice_updated_version()
 
         assert new_payload_version is not None, (
             "Invalid header for engine_newPayload"
         )
 
-        if fork.engine_execution_payload_block_access_list(
-            block_number=header.number, timestamp=header.timestamp
+        # An ``execution_payload_modifier`` that touches ``block_access_list``
+        # (either overriding or removing it) replaces the fork's default body,
+        # so the fork-required check is skipped in that case.
+        modifier_overrides_bal = (
+            execution_payload_modifier is not None
+            and execution_payload_modifier.block_access_list is not None
+        )
+        if (
+            fork.engine_execution_payload_block_access_list()
+            and not modifier_overrides_bal
         ):
             if block_access_list is None:
                 raise ValueError(
@@ -525,19 +639,19 @@ def from_fixture_header(
             withdrawals=withdrawals,
             block_access_list=block_access_list,
         )
+        if execution_payload_modifier is not None:
+            execution_payload = execution_payload_modifier.apply(
+                execution_payload
+            )
 
         params: List[Any] = [execution_payload]
-        if fork.engine_new_payload_blob_hashes(
-            block_number=header.number, timestamp=header.timestamp
-        ):
+        if fork.engine_new_payload_blob_hashes():
             blob_hashes = Transaction.list_blob_versioned_hashes(transactions)
             if blob_hashes is None:
                 raise ValueError(f"Blob hashes are required for ${fork}.")
             params.append(blob_hashes)
 
-        if fork.engine_new_payload_beacon_root(
-            block_number=header.number, timestamp=header.timestamp
-        ):
+        if fork.engine_new_payload_beacon_root():
             parent_beacon_block_root = header.parent_beacon_block_root
             if parent_beacon_block_root is None:
                 raise ValueError(
@@ -545,9 +659,7 @@ def from_fixture_header(
                 )
             params.append(parent_beacon_block_root)
 
-        if fork.engine_new_payload_requests(
-            block_number=header.number, timestamp=header.timestamp
-        ):
+        if fork.engine_new_payload_requests():
             if requests is None:
                 raise ValueError(f"Requests are required for ${fork}.")
             params.append(requests)
@@ -556,6 +668,8 @@ def from_fixture_header(
             EngineNewPayloadParameters,
             tuple(params),
         )
+        # Auto-derive phase from transactions if the caller did not pass one.
+        kwargs.setdefault("phase", cls.derive_phase(transactions))
         new_payload = cls(
             params=payload_params,
             new_payload_version=new_payload_version,
@@ -669,7 +783,7 @@ def without_rlp(self) -> FixtureBlockBase:
 class FixtureConfig(CamelModel):
     """Chain configuration for a fixture."""
 
-    fork: Fork = Field(..., alias="network")
+    fork: Fork | TransitionFork = Field(..., alias="network")
     chain_id: ZeroPaddedHexNumber = Field(
         ZeroPaddedHexNumber(1), alias="chainid"
     )
@@ -688,7 +802,7 @@ class InvalidFixtureBlock(CamelModel):
 class BlockchainFixtureCommon(BaseFixture):
     """Base blockchain test fixture model."""
 
-    fork: Fork = Field(..., alias="network")
+    fork: Fork | TransitionFork = Field(..., alias="network")
     genesis: FixtureHeader = Field(..., alias="genesisBlockHeader")
     pre: Alloc
     post_state: Alloc | None = Field(None)
@@ -714,7 +828,7 @@ def config_defaults_for_backwards_compatibility(cls, data: Any) -> Any:
                     data["config"]["chainid"] = "0x01"
         return data
 
-    def get_fork(self) -> Fork | None:
+    def get_fork(self) -> Fork | TransitionFork | None:
         """Return fork of the fixture as a string."""
         return self.fork
 
@@ -742,24 +856,24 @@ class BlockchainEngineFixtureCommon(BaseFixture):
     duplicating large pre-allocations.
     """
 
-    fork: Fork = Field(..., alias="network")
+    fork: Fork | TransitionFork = Field(..., alias="network")
     post_state_hash: Hash | None = Field(None)
     # FIXME: lastBlockHash
     last_block_hash: Hash = Field(..., alias="lastblockhash")
     config: FixtureConfig
 
-    def get_fork(self) -> Fork | None:
+    def get_fork(self) -> Fork | TransitionFork | None:
         """Return fixture's `Fork`."""
         return self.fork
 
     @classmethod
-    def supports_fork(cls, fork: Fork) -> bool:
+    def supports_fork(cls, fork: Fork | TransitionFork) -> bool:
         """
         Return whether the fixture can be generated for the given fork.
 
         The Engine API is available only on Paris and afterwards.
         """
-        return fork >= Paris
+        return fork.fork_at(block_number=0, timestamp=0) >= Paris
 
 
 class BlockchainEngineFixture(BlockchainEngineFixtureCommon):
@@ -796,7 +910,7 @@ class BlockchainEngineXFixture(BlockchainEngineFixtureCommon):
         "Tests that generate a Blockchain Test Engine X fixture."
     )
     format_phases: ClassVar[Set[FixtureFillingPhase]] = {
-        FixtureFillingPhase.FILL,
+        FixtureFillingPhase.FILL_AFTER_PRE_ALLOC_GENERATION,
         FixtureFillingPhase.PRE_ALLOC_GENERATION,
     }
     transition_tool_cache_key: ClassVar[str] = ""
@@ -834,19 +948,64 @@ class BlockchainEngineStatefulFixture(BlockchainEngineFixtureCommon):
         "snapshot-based stateful Engine API testing."
     )
     format_phases: ClassVar[Set[FixtureFillingPhase]] = {
-        FixtureFillingPhase.FILL,
-        FixtureFillingPhase.PRE_ALLOC_GENERATION,
+        FixtureFillingPhase.FILL_STATEFUL,
     }
 
     snapshot_block_number: HexNumber
     snapshot_block_hash: Hash
+    start_block_number: HexNumber
+    start_block_hash: Hash
 
     setup_payloads: List[FixtureEngineNewPayload] = Field(
-        ..., alias="setupEngineNewPayloads"
+        default_factory=list,
+        alias="setupEngineNewPayloads",
+        description=(
+            "Per-test setup-phase payloads applied on top of "
+            "``start_block_hash`` before the test's execution payloads."
+        ),
     )
     payloads: List[FixtureEngineNewPayload] = Field(
         ..., alias="engineNewPayloads"
     )
+    benchmark_gas_used: HexNumber | None = Field(
+        None,
+        alias="benchmarkGasUsed",
+        description=(
+            "Total gas consumed by the execution payloads when this fixture "
+            "was filled, as reported by the live client. Populated for "
+            "``BENCHMARKING`` operation mode; ``None`` otherwise. Lets "
+            "consumers compare expected vs. observed gas without replay."
+        ),
+    )
+
+
+class StatefulPreRunFixture(CamelModel):
+    """
+    Pre-run payloads for stateful benchmark fixtures.
+
+    Contains session-scoped blocks (e.g. deterministic factory deploy,
+    seed funding via CL withdrawal) that must be replayed once before
+    any per-test fixtures land.
+
+    This is a deliberately smaller sibling of
+    :class:`BlockchainEngineStatefulFixture` — they share the snapshot/
+    start anchor fields and the ``engineNewPayloads`` payload list, but
+    pre-run carries no per-test fields (``last_block_hash``, ``config``,
+    ``setupEngineNewPayloads``) because there is no test execution
+    attached to it. Consumers (benchmarkoor) route by directory:
+    ``pre_run/*.json`` parse as ``StatefulPreRunFixture`` and apply
+    once per session; ``for_<fork>_at_<gas>/.../*.json`` parse as
+    ``BlockchainEngineStatefulFixture`` and apply per test.
+    """
+
+    network: str
+    snapshot_block_number: HexNumber
+    snapshot_block_hash: Hash
+    start_block_number: HexNumber | None = None
+    start_block_hash: Hash | None = None
+    payloads: List[FixtureEngineNewPayload] = Field(
+        ..., alias="engineNewPayloads"
+    )
 
 
 class BlockchainEngineSyncFixture(BlockchainEngineFixture):
@@ -870,7 +1029,7 @@ class BlockchainEngineSyncFixture(BlockchainEngineFixture):
     @classmethod
     def discard_fixture_format_by_marks(
         cls,
-        fork: Fork,
+        fork: Fork | TransitionFork,
         markers: List[pytest.Mark],
     ) -> bool:
         """Discard the fixture format based on the provided markers."""
diff --git a/packages/testing/src/execution_testing/fixtures/collector.py b/packages/testing/src/execution_testing/fixtures/collector.py
index bcb3fd49125..02a69858dce 100644
--- a/packages/testing/src/execution_testing/fixtures/collector.py
+++ b/packages/testing/src/execution_testing/fixtures/collector.py
@@ -62,8 +62,18 @@ def merge_partial_fixture_files(output_dir: Path) -> None:
 
     # Merge each group into its target file
     for target_path, partials in partials_by_target.items():
-        # Read partials sequentially into dict (one at a time)
+        # Seed from existing target file (if any) so that
+        # repeated single-test sessions accumulate into one file.
         entries: Dict[str, str] = {}
+        if target_path.exists():
+            with open(target_path) as existing:
+                try:
+                    existing_data = json.load(existing)
+                    for k, v in existing_data.items():
+                        entries[k] = json.dumps(v, indent=4)
+                except json.JSONDecodeError:
+                    pass
+
         for partial in partials:
             with open(partial) as f:
                 for line in f:
diff --git a/packages/testing/src/execution_testing/fixtures/consume.py b/packages/testing/src/execution_testing/fixtures/consume.py
index 3c03a85cd50..499be630dd7 100644
--- a/packages/testing/src/execution_testing/fixtures/consume.py
+++ b/packages/testing/src/execution_testing/fixtures/consume.py
@@ -8,7 +8,7 @@
 from pydantic import BaseModel, RootModel
 
 from execution_testing.base_types import HexNumber
-from execution_testing.forks import Fork
+from execution_testing.forks import Fork, TransitionFork
 
 from .base import BaseFixture, FixtureFormat
 from .file import Fixtures
@@ -48,7 +48,7 @@ class TestCaseBase(BaseModel):
 
     id: str
     fixture_hash: HexNumber | None = None
-    fork: Fork | None = None
+    fork: Fork | TransitionFork | None = None
     format: FixtureFormat
     pre_hash: str | None = None
     __test__ = False  # stop pytest from collecting this class as a test
@@ -91,6 +91,36 @@ class IndexFile(BaseModel):
     fixture_formats: Optional[List[str]] = []
     test_cases: List[TestCaseIndexFile]
 
+    @classmethod
+    def merge(cls, indexes: List["IndexFile"]) -> "IndexFile":
+        """
+        Merge multiple index files into one.
+
+        Concatenate test cases, union forks and fixture formats, and
+        recompute the root hash from the merged entries.
+        """
+        from execution_testing.cli.hasher import HashableItem
+
+        all_cases: List[TestCaseIndexFile] = []
+        all_forks: set[Fork] = set()
+        all_formats: set[str] = set()
+
+        for idx in indexes:
+            all_cases.extend(idx.test_cases)
+            all_forks.update(idx.forks or [])
+            all_formats.update(idx.fixture_formats or [])
+
+        root_hash = HashableItem.from_index_entries(all_cases).hash()
+
+        return cls(
+            root_hash=HexNumber(root_hash),
+            created_at=datetime.datetime.now(datetime.timezone.utc),
+            test_count=len(all_cases),
+            forks=sorted(all_forks, key=lambda f: f.name()),
+            fixture_formats=sorted(all_formats),
+            test_cases=all_cases,
+        )
+
 
 class TestCases(RootModel):
     """Root model defining a list test cases used in consume commands."""
diff --git a/packages/testing/src/execution_testing/fixtures/post_verifications.py b/packages/testing/src/execution_testing/fixtures/post_verifications.py
new file mode 100644
index 00000000000..c909ed97862
--- /dev/null
+++ b/packages/testing/src/execution_testing/fixtures/post_verifications.py
@@ -0,0 +1,78 @@
+"""Post-state verification model for tracking fill-time checks."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Dict, Mapping
+
+from execution_testing.base_types import (
+    Address,
+    Bytes,
+    CamelModel,
+    ZeroPaddedHexNumber,
+)
+
+if TYPE_CHECKING:
+    from execution_testing.base_types import Alloc
+
+
+class AccountCheck(CamelModel):
+    """
+    Capture which fields are verified for a single account.
+
+    A ``None`` value means the field is not checked (it was not
+    explicitly set by the test author).  A present value records the
+    expected value that ``check_alloc`` would assert against.
+    """
+
+    nonce: ZeroPaddedHexNumber | None = None
+    balance: ZeroPaddedHexNumber | None = None
+    code: Bytes | None = None
+    storage: Mapping[ZeroPaddedHexNumber, ZeroPaddedHexNumber] | None = None
+
+
+class PostVerifications(CamelModel):
+    """
+    Record every post-state check performed during a fill session.
+
+    Accounts mapped to ``None`` represent *should-not-exist* checks.
+    """
+
+    accounts: Dict[Address, AccountCheck | None]
+
+    @classmethod
+    def from_alloc(cls, alloc: Alloc) -> PostVerifications:
+        """
+        Derive verification checks from an expected post ``Alloc``.
+
+        Walk each address/account pair and inspect
+        ``model_fields_set`` to determine which fields will actually
+        be compared by ``Account.check_alloc``.
+        """
+        accounts: Dict[Address, AccountCheck | None] = {}
+        for address, account in alloc.root.items():
+            if account is None:
+                accounts[address] = None
+                continue
+            accounts[address] = AccountCheck(
+                nonce=(
+                    account.nonce
+                    if "nonce" in account.model_fields_set
+                    else None
+                ),
+                balance=(
+                    account.balance
+                    if "balance" in account.model_fields_set
+                    else None
+                ),
+                code=(
+                    account.code
+                    if "code" in account.model_fields_set
+                    else None
+                ),
+                storage=(
+                    dict(account.storage.root)
+                    if "storage" in account.model_fields_set
+                    else None
+                ),
+            )
+        return cls(accounts=accounts)
diff --git a/packages/testing/src/execution_testing/fixtures/pre_alloc_groups.py b/packages/testing/src/execution_testing/fixtures/pre_alloc_groups.py
index 69e69fcf21d..a34a72781ac 100644
--- a/packages/testing/src/execution_testing/fixtures/pre_alloc_groups.py
+++ b/packages/testing/src/execution_testing/fixtures/pre_alloc_groups.py
@@ -24,8 +24,9 @@
     EthereumTestRootModel,
     Hash,
 )
-from execution_testing.forks import Fork
+from execution_testing.forks import Fork, TransitionFork
 from execution_testing.test_types import Alloc, Environment
+from execution_testing.test_types.chain_config_types import DEFAULT_CHAIN_ID
 
 from .blockchain import FixtureHeader
 
@@ -37,7 +38,8 @@ class PreAllocGroupBuilder(CamelModel):
     environment: Environment = Field(
         ..., description="Grouping environment for this test group"
     )
-    fork: Fork = Field(..., alias="network")
+    fork: Fork | TransitionFork = Field(..., alias="network")
+    chain_id: int = DEFAULT_CHAIN_ID
     pre: Alloc
 
     def get_pre_account_count(self) -> int:
@@ -51,7 +53,7 @@ def get_test_count(self) -> int:
     def calculate_genesis(self) -> FixtureHeader:
         """Get the genesis header for this group."""
         return FixtureHeader.genesis(
-            self.fork,
+            self.fork.transitions_from(),
             self.environment,
             self.pre.state_root(),
         )
@@ -71,6 +73,7 @@ def build(self) -> "PreAllocGroup":
             test_ids=self.test_ids,
             environment=self.environment,
             fork=self.fork,
+            chain_id=self.chain_id,
             pre=self.pre.model_dump(),
             pre_account_count=self.get_pre_account_count(),
             test_count=self.get_test_count(),
@@ -205,7 +208,8 @@ def add_test_pre(
         *,
         pre_alloc_hash: str,
         test_id: str,
-        fork: Fork,
+        fork: Fork | TransitionFork,
+        chain_id: int,
         environment: Environment,
         pre: Alloc,
     ) -> None:
@@ -216,6 +220,9 @@ def add_test_pre(
             assert group.fork == fork, (
                 f"Incompatible fork: {group.fork}!={fork}"
             )
+            assert group.chain_id == chain_id, (
+                f"Incompatible chain id: {group.chain_id}!={chain_id}"
+            )
             group.add_test_alloc(test_id, pre)
         else:
             # Create new group - use Environment instead of expensive genesis
@@ -223,9 +230,12 @@ def add_test_pre(
             group = PreAllocGroupBuilder(
                 test_ids=[test_id],
                 fork=fork,
+                chain_id=chain_id,
                 environment=environment,
                 pre=Alloc.merge(
-                    Alloc.model_validate(fork.pre_allocation_blockchain()),
+                    Alloc.model_validate(
+                        fork.transitions_to().pre_allocation_blockchain()
+                    ),
                     pre,
                 ),
             )
diff --git a/packages/testing/src/execution_testing/fixtures/state.py b/packages/testing/src/execution_testing/fixtures/state.py
index 32891b5dc02..1dc9043bfc2 100644
--- a/packages/testing/src/execution_testing/fixtures/state.py
+++ b/packages/testing/src/execution_testing/fixtures/state.py
@@ -14,7 +14,7 @@
     ZeroPaddedHexNumber,
 )
 from execution_testing.exceptions import TransactionExceptionInstanceOrList
-from execution_testing.forks import Fork
+from execution_testing.forks import Fork, TransitionFork
 from execution_testing.test_types.block_types import EnvironmentGeneric
 from execution_testing.test_types.transaction_types import (
     Transaction,
@@ -120,10 +120,10 @@ class StateFixture(BaseFixture):
     env: FixtureEnvironment
     pre: Alloc
     transaction: FixtureTransaction
-    post: Mapping[Fork, List[FixtureForkPost]]
+    post: Mapping[Fork | TransitionFork, List[FixtureForkPost]]
     config: FixtureConfig
 
-    def get_fork(self) -> Fork | None:
+    def get_fork(self) -> Fork | TransitionFork | None:
         """Return fork of the fixture as a string."""
         forks = list(self.post.keys())
         assert len(forks) == 1, "Expected state test fixture with single fork"
diff --git a/packages/testing/src/execution_testing/fixtures/tests/test_base.py b/packages/testing/src/execution_testing/fixtures/tests/test_base.py
index 892eb5ac8b0..b14ccc7d2a2 100644
--- a/packages/testing/src/execution_testing/fixtures/tests/test_base.py
+++ b/packages/testing/src/execution_testing/fixtures/tests/test_base.py
@@ -68,6 +68,8 @@ def test_json_dict() -> None:
                 config=FixtureConfig(fork=Prague),
                 snapshot_block_number=0,
                 snapshot_block_hash=Hash(0),
+                start_block_number=0,
+                start_block_hash=Hash(0),
                 setup_payloads=[
                     FixtureEngineNewPayload.from_fixture_header(
                         fork=Prague,
@@ -149,7 +151,6 @@ def test_base_fixtures_parsing(fixture: BaseFixture) -> None:
         "t8n-version",
         "test_case_description",
         fixture_source_url="fixture_source_url",
-        opcode_count=None,
         ref_spec=None,
         _info_metadata={},
     )
diff --git a/packages/testing/src/execution_testing/fixtures/tests/test_blockchain.py b/packages/testing/src/execution_testing/fixtures/tests/test_blockchain.py
index e8c68fd7ea8..445222f0369 100644
--- a/packages/testing/src/execution_testing/fixtures/tests/test_blockchain.py
+++ b/packages/testing/src/execution_testing/fixtures/tests/test_blockchain.py
@@ -23,7 +23,7 @@
     EngineAPIError,
     TransactionException,
 )
-from execution_testing.forks import Prague
+from execution_testing.forks import Amsterdam, Prague
 from execution_testing.test_types import (
     EOA,
     AuthorizationTuple,
@@ -42,6 +42,7 @@
     FixtureConfig,
     FixtureEngineNewPayload,
     FixtureExecutionPayload,
+    FixtureExecutionPayloadModifier,
     FixtureHeader,
     FixtureTransaction,
     InvalidFixtureBlock,
@@ -996,6 +997,8 @@
                 config=FixtureConfig(fork=Prague),
                 snapshot_block_number=100,
                 snapshot_block_hash=Hash(99),
+                start_block_number=100,
+                start_block_hash=Hash(99),
                 setup_payloads=[
                     FixtureEngineNewPayload.from_fixture_header(
                         fork=Prague,
@@ -1072,6 +1075,8 @@
                 },
                 "snapshotBlockNumber": "0x64",
                 "snapshotBlockHash": Hash(99).hex(),
+                "startBlockNumber": "0x64",
+                "startBlockHash": Hash(99).hex(),
                 "setupEngineNewPayloads": [
                     to_json(
                         FixtureEngineNewPayload.from_fixture_header(
@@ -1160,7 +1165,7 @@ def test_json_deserialization(
         self,
         can_be_deserialized: bool,
         model_instance: Any,
-        json_repr: str | Dict[str, Any],
+        json_repr: Dict[str, Any],
     ) -> None:
         """Test that to_json returns the expected JSON for the given object."""
         if not can_be_deserialized:
@@ -1568,3 +1573,153 @@ def test_json_deserialization(
         if not can_be_deserialized:
             pytest.skip(reason="Model instance cannot be deserialized")
         assert adapter.validate_python(json_repr) == type_instance
+
+
+def _amsterdam_payload_header() -> FixtureHeader:
+    """Build a fully-populated header suitable for an Amsterdam V5 payload."""
+    return FixtureHeader(
+        parent_hash=Hash(0),
+        ommers_hash=Hash(1),
+        fee_recipient=Address(2),
+        state_root=Hash(3),
+        transactions_trie=Hash(4),
+        receipts_root=Hash(5),
+        logs_bloom=Bloom(6),
+        difficulty=7,
+        number=1,
+        gas_limit=9,
+        gas_used=10,
+        timestamp=11,
+        extra_data=Bytes([12]),
+        prev_randao=Hash(13),
+        nonce=HeaderNonce(14),
+        base_fee_per_gas=15,
+        withdrawals_root=Hash(16),
+        blob_gas_used=17,
+        excess_blob_gas=18,
+        parent_beacon_block_root=19,
+        requests_hash=20,
+        block_access_list_hash=Hash(21),
+        slot_number=22,
+    )
+
+
+class TestFixtureExecutionPayloadModifier:
+    """Verify the internal modifier helper used to mutate engine payloads."""
+
+    def test_apply_no_fields_is_noop(self) -> None:
+        """A modifier with no fields set must not change the payload."""
+        payload = FixtureExecutionPayload.from_fixture_header(
+            header=_amsterdam_payload_header(),
+            transactions=[],
+            withdrawals=[],
+            block_access_list=Bytes(b"\xaa\xbb"),
+        )
+        result = FixtureExecutionPayloadModifier().apply(payload)
+        assert result == payload
+
+    def test_apply_overrides_block_access_list_value(self) -> None:
+        """Setting block_access_list overrides the body on the payload."""
+        payload = FixtureExecutionPayload.from_fixture_header(
+            header=_amsterdam_payload_header(),
+            transactions=[],
+            withdrawals=[],
+            block_access_list=Bytes(b"\xaa\xbb"),
+        )
+        result = FixtureExecutionPayloadModifier(
+            block_access_list=Bytes(b"\xcc\xdd"),
+        ).apply(payload)
+        assert result.block_access_list == Bytes(b"\xcc\xdd")
+
+    def test_apply_remove_field_clears_block_access_list(self) -> None:
+        """REMOVE_FIELD removes block_access_list so it's excluded on dump."""
+        payload = FixtureExecutionPayload.from_fixture_header(
+            header=_amsterdam_payload_header(),
+            transactions=[],
+            withdrawals=[],
+            block_access_list=Bytes(b"\xaa\xbb"),
+        )
+        result = FixtureExecutionPayloadModifier(
+            block_access_list=FixtureExecutionPayloadModifier.REMOVE_FIELD,
+        ).apply(payload)
+        assert result.block_access_list is None
+        assert "blockAccessList" not in to_json(result)
+
+    def test_from_fixture_header_injects_body_on_pre_bal_fork(self) -> None:
+        """Modifier can inject a BAL body into a fork that doesn't carry it."""
+        payload = FixtureEngineNewPayload.from_fixture_header(
+            fork=Prague,
+            header=FixtureHeader(
+                parent_hash=Hash(0),
+                ommers_hash=Hash(1),
+                fee_recipient=Address(2),
+                state_root=Hash(3),
+                transactions_trie=Hash(4),
+                receipts_root=Hash(5),
+                logs_bloom=Bloom(6),
+                difficulty=7,
+                number=1,
+                gas_limit=9,
+                gas_used=10,
+                timestamp=11,
+                extra_data=Bytes([12]),
+                prev_randao=Hash(13),
+                nonce=HeaderNonce(14),
+                base_fee_per_gas=15,
+                withdrawals_root=Hash(16),
+                blob_gas_used=17,
+                excess_blob_gas=18,
+                parent_beacon_block_root=19,
+                requests_hash=20,
+            ),
+            transactions=[],
+            withdrawals=[],
+            requests=[],
+            execution_payload_modifier=FixtureExecutionPayloadModifier(
+                block_access_list=Bytes(b""),
+            ),
+        )
+        assert payload.params[0].block_access_list == Bytes(b"")
+        assert "blockAccessList" in to_json(payload.params[0])
+
+    def test_from_fixture_header_removes_body_on_post_bal_fork(self) -> None:
+        """REMOVE_FIELD bypasses the fork-required check and omits the body."""
+        payload = FixtureEngineNewPayload.from_fixture_header(
+            fork=Amsterdam,
+            header=_amsterdam_payload_header(),
+            transactions=[],
+            withdrawals=[],
+            requests=[],
+            block_access_list=None,
+            execution_payload_modifier=FixtureExecutionPayloadModifier(
+                block_access_list=(
+                    FixtureExecutionPayloadModifier.REMOVE_FIELD
+                ),
+            ),
+        )
+        assert payload.params[0].block_access_list is None
+        assert "blockAccessList" not in to_json(payload.params[0])
+
+    def test_from_fixture_header_requires_bal_on_post_bal_fork(self) -> None:
+        """Without a modifier override, Amsterdam still requires a BAL body."""
+        with pytest.raises(ValueError, match="block_access_list"):
+            FixtureEngineNewPayload.from_fixture_header(
+                fork=Amsterdam,
+                header=_amsterdam_payload_header(),
+                transactions=[],
+                withdrawals=[],
+                requests=[],
+                block_access_list=None,
+            )
+
+    def test_from_fixture_header_passthrough_without_modifier(self) -> None:
+        """No modifier leaves the payload's BAL body unchanged."""
+        payload = FixtureEngineNewPayload.from_fixture_header(
+            fork=Amsterdam,
+            header=_amsterdam_payload_header(),
+            transactions=[],
+            withdrawals=[],
+            requests=[],
+            block_access_list=Bytes(b"\xaa\xbb"),
+        )
+        assert payload.params[0].block_access_list == Bytes(b"\xaa\xbb")
diff --git a/packages/testing/src/execution_testing/fixtures/tests/test_collector.py b/packages/testing/src/execution_testing/fixtures/tests/test_collector.py
index 93b6e3794f1..4b41f1c6d4f 100644
--- a/packages/testing/src/execution_testing/fixtures/tests/test_collector.py
+++ b/packages/testing/src/execution_testing/fixtures/tests/test_collector.py
@@ -22,7 +22,6 @@ def _make_fixture(nonce: int = 0) -> TransactionFixture:
         f"test description {nonce}",
         fixture_source_url="http://example.com",
         ref_spec=None,
-        opcode_count=None,
         _info_metadata={},
     )
     return fixture
diff --git a/packages/testing/src/execution_testing/fixtures/tests/test_state.py b/packages/testing/src/execution_testing/fixtures/tests/test_state.py
index 962392100a0..7e146f027a6 100644
--- a/packages/testing/src/execution_testing/fixtures/tests/test_state.py
+++ b/packages/testing/src/execution_testing/fixtures/tests/test_state.py
@@ -112,7 +112,7 @@ def test_json_deserialization(
         self,
         can_be_deserialized: bool,
         model_instance: Any,
-        json: str | Dict[str, Any],
+        json: Dict[str, Any],
     ) -> None:
         """Test that to_json returns the expected JSON for the given object."""
         if not can_be_deserialized:
diff --git a/packages/testing/src/execution_testing/fixtures/transaction.py b/packages/testing/src/execution_testing/fixtures/transaction.py
index 33ddcd95934..0a218e8f97d 100644
--- a/packages/testing/src/execution_testing/fixtures/transaction.py
+++ b/packages/testing/src/execution_testing/fixtures/transaction.py
@@ -12,7 +12,7 @@
     ZeroPaddedHexNumber,
 )
 from execution_testing.exceptions import TransactionExceptionInstanceOrList
-from execution_testing.forks import Fork
+from execution_testing.forks import Fork, TransitionFork
 
 from .base import BaseFixture
 
@@ -34,10 +34,10 @@ class TransactionFixture(BaseFixture):
         "Tests that generate a transaction test fixture."
     )
 
-    result: Mapping[Fork, FixtureResult]
+    result: Mapping[Fork | TransitionFork, FixtureResult]
     transaction: Bytes = Field(..., alias="txbytes")
 
-    def get_fork(self) -> Fork | None:
+    def get_fork(self) -> Fork | TransitionFork | None:
         """Return the fork of the fixture as a string."""
         forks = list(self.result.keys())
         assert len(forks) == 1, (
diff --git a/packages/testing/src/execution_testing/forks/__init__.py b/packages/testing/src/execution_testing/forks/__init__.py
index 891b4c057da..6853f2e7697 100644
--- a/packages/testing/src/execution_testing/forks/__init__.py
+++ b/packages/testing/src/execution_testing/forks/__init__.py
@@ -1,6 +1,6 @@
 """Ethereum test fork definitions."""
 
-from .base_fork import ForkAttribute
+from .base_fork import RefundTypes
 from .forks.forks import (
     BPO1,
     BPO2,
@@ -50,6 +50,7 @@
     ALL_TRANSITION_FORKS,
     Fork,
     ForkAdapter,
+    ForkEIPSetAdapter,
     ForkOrNoneAdapter,
     ForkRangeDescriptor,
     ForkSet,
@@ -84,13 +85,14 @@
     "ALL_TRANSITION_FORKS",
     "Fork",
     "ForkAdapter",
+    "ForkEIPSetAdapter",
     "ForkOrNoneAdapter",
     "ForkSet",
     "ForkSetAdapter",
     "TransitionFork",
     "TransitionForkAdapter",
     "TransitionForkOrNoneAdapter",
-    "ForkAttribute",
+    "RefundTypes",
     "Amsterdam",
     "ArrowGlacier",
     "Berlin",
diff --git a/packages/testing/src/execution_testing/forks/base_decorators.py b/packages/testing/src/execution_testing/forks/base_decorators.py
deleted file mode 100644
index c8a86a039cc..00000000000
--- a/packages/testing/src/execution_testing/forks/base_decorators.py
+++ /dev/null
@@ -1,11 +0,0 @@
-"""Decorators for the fork methods."""
-
-from typing import Callable, TypeVar
-
-F = TypeVar("F", bound=Callable)
-
-
-def prefer_transition_to_method(method: F) -> F:
-    """Call the `fork_to` implementation when transitioning."""
-    method.__prefer_transition_to_method__ = True  # type: ignore
-    return method
diff --git a/packages/testing/src/execution_testing/forks/base_fork.py b/packages/testing/src/execution_testing/forks/base_fork.py
index d213a6ba3a9..f6d5edb2bf9 100644
--- a/packages/testing/src/execution_testing/forks/base_fork.py
+++ b/packages/testing/src/execution_testing/forks/base_fork.py
@@ -1,21 +1,20 @@
 """Abstract base class for Ethereum forks."""
 
+import re
 from abc import ABCMeta, abstractmethod
+from enum import Enum, auto
 from typing import (
     TYPE_CHECKING,
-    Any,
     Callable,
     ClassVar,
     Dict,
     List,
-    Literal,
     Mapping,
     Optional,
     Protocol,
     Set,
     Sized,
     Type,
-    Union,
 )
 
 if TYPE_CHECKING:
@@ -33,23 +32,9 @@
     Opcodes,
 )
 
-from .base_decorators import prefer_transition_to_method
 from .gas_costs import GasCosts
 
 
-class ForkAttribute(Protocol):
-    """
-    A protocol to get the attribute of a fork at a given block number and
-    timestamp.
-    """
-
-    def __call__(self, block_number: int = 0, timestamp: int = 0) -> Any:
-        """
-        Return value of the attribute at the given block number and timestamp.
-        """
-        pass
-
-
 class MemoryExpansionGasCalculator(Protocol):
     """
     A protocol to calculate the gas cost of memory expansion at a given fork.
@@ -76,7 +61,12 @@ class TransactionDataFloorCostCalculator(Protocol):
     Calculate the transaction floor cost due to its calldata for a given fork.
     """
 
-    def __call__(self, *, data: BytesConvertible) -> int:
+    def __call__(
+        self,
+        *,
+        data: BytesConvertible,
+        access_list: List[AccessList] | None = None,
+    ) -> int:
         """Return transaction gas cost of calldata given its contents."""
         pass
 
@@ -184,6 +174,13 @@ def __call__(
         pass
 
 
+class RefundTypes(Enum):
+    """Enum used to describe all refund types a fork can have."""
+
+    STORAGE_CLEAR = auto()
+    AUTHORIZATION_EXISTING_AUTHORITY = auto()
+
+
 class BaseForkMeta(ABCMeta):
     """Metaclass for BaseFork."""
 
@@ -252,19 +249,25 @@ class BaseFork(ForkOpcodeInterface, metaclass=BaseForkMeta):
     Must contain all the methods used by every fork.
     """
 
+    is_transition_fork: ClassVar[bool] = False
+
     _transition_tool_name: ClassVar[Optional[str]] = None
     _solc_name: ClassVar[Optional[str]] = None
     _ignore: ClassVar[bool] = False
     _bpo_fork: ClassVar[bool] = False
     _children: ClassVar[Set[Type["BaseFork"]]] = set()
-
-    # make mypy happy
-    BLOB_CONSTANTS: ClassVar[Dict[str, Union[int, Literal["big"]]]] = {}
-
-    @classmethod
-    def get_blob_constant(cls, name: str) -> int | Literal["big"]:
-        """Return value of requested blob constant."""
-        raise NotImplementedError
+    _ruleset_name: ClassVar[Optional[str]] = None
+    _fork_by_timestamp: ClassVar[bool] = False
+    _blob_constants: ClassVar[Dict[str, int]] = {}
+    _deployed: ClassVar[bool] = True
+    _enabled_eips: ClassVar[Set[int]] = set()
+    _enabling_forks: ClassVar[Set[Type["BaseFork"]]] = set()
+
+    # Method version bumps
+    _engine_new_payload_version_bump: ClassVar[bool] = False
+    _engine_forkchoice_updated_version_bump: ClassVar[bool] = False
+    _engine_get_payload_version_bump: ClassVar[bool] = False
+    _engine_get_blobs_version_bump: ClassVar[bool] = False
 
     def __init_subclass__(
         cls,
@@ -273,6 +276,14 @@ def __init_subclass__(
         solc_name: Optional[str] = None,
         ignore: bool = False,
         bpo_fork: bool = False,
+        ruleset_name: Optional[str] = None,
+        fork_by_timestamp: Optional[bool] = None,
+        deployed: Optional[bool] = None,
+        update_blob_constants: Optional[Dict[str, int]] = None,
+        engine_new_payload_version_bump: Optional[bool] = None,
+        engine_forkchoice_updated_version_bump: Optional[bool] = None,
+        engine_get_payload_version_bump: Optional[bool] = None,
+        engine_get_blobs_version_bump: Optional[bool] = None,
     ) -> None:
         """
         Initialize new fork with values that don't carry over to subclass
@@ -282,90 +293,146 @@ def __init_subclass__(
         cls._solc_name = solc_name
         cls._ignore = ignore
         cls._bpo_fork = bpo_fork
+        cls._ruleset_name = ruleset_name
         cls._children = set()
-        base_class = cls.__bases__[0]
-        assert issubclass(base_class, BaseFork)
-        if base_class != BaseFork:
-            base_class._children.add(cls)
+        if fork_by_timestamp is None:
+            parent = cls.parent()
+            cls._fork_by_timestamp = (
+                parent._fork_by_timestamp if parent is not None else False
+            )
+        else:
+            cls._fork_by_timestamp = fork_by_timestamp
+        base_fork_class = None
+        for base_class in cls.__bases__:
+            if issubclass(base_class, BaseFork) and not base_class.is_eip():
+                base_fork_class = base_class
+                break
+        assert base_fork_class is not None
+        cls._enabled_eips = set()
+        if base_fork_class != BaseFork:
+            base_fork_class._children.add(cls)
+            cls._enabled_eips |= base_fork_class._enabled_eips
+        eip_bases = [
+            base_class
+            for base_class in cls.__bases__
+            if issubclass(base_class, BaseFork) and base_class.is_eip()
+        ]
+        cls._enabling_forks = set()
+        for eip_base in eip_bases:
+            cls._enabled_eips.add(eip_base.eip())
+            eip_base._enabling_forks.add(cls)
+        # Bump the versions if any of the EIPs bump the version
+        if engine_new_payload_version_bump is not None:
+            cls._engine_new_payload_version_bump = (
+                engine_new_payload_version_bump
+            )
+        else:
+            cls._engine_new_payload_version_bump = any(
+                eip_base._engine_new_payload_version_bump
+                for eip_base in eip_bases
+            )
+
+        if engine_forkchoice_updated_version_bump is not None:
+            cls._engine_forkchoice_updated_version_bump = (
+                engine_forkchoice_updated_version_bump
+            )
+        else:
+            cls._engine_forkchoice_updated_version_bump = any(
+                eip_base._engine_forkchoice_updated_version_bump
+                for eip_base in eip_bases
+            )
+
+        if engine_get_payload_version_bump is not None:
+            cls._engine_get_payload_version_bump = (
+                engine_get_payload_version_bump
+            )
+        else:
+            cls._engine_get_payload_version_bump = any(
+                eip_base._engine_get_payload_version_bump
+                for eip_base in eip_bases
+            )
+
+        if engine_get_blobs_version_bump is not None:
+            cls._engine_get_blobs_version_bump = engine_get_blobs_version_bump
+        else:
+            cls._engine_get_blobs_version_bump = any(
+                eip_base._engine_get_blobs_version_bump
+                for eip_base in eip_bases
+            )
+
+        # Calculate blob constants
+        cls._blob_constants = base_fork_class._blob_constants.copy()
+        if update_blob_constants is not None:
+            cls._blob_constants |= update_blob_constants
+        else:
+            for eip_base in eip_bases:
+                cls._blob_constants |= eip_base._blob_constants
+
+        # Determine fork deployment status
+        if deployed is not None:
+            cls._deployed = deployed
+        else:
+            if base_fork_class is not BaseFork:
+                cls._deployed = base_fork_class._deployed
 
     # Header information abstract methods
     @classmethod
     @abstractmethod
-    def header_base_fee_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def header_base_fee_required(cls) -> bool:
         """Return true if the header must contain base fee."""
         pass
 
     @classmethod
     @abstractmethod
-    def header_prev_randao_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def header_prev_randao_required(cls) -> bool:
         """Return true if the header must contain Prev Randao value."""
         pass
 
     @classmethod
     @abstractmethod
-    def header_zero_difficulty_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def header_zero_difficulty_required(cls) -> bool:
         """Return true if the header must have difficulty zero."""
         pass
 
     @classmethod
     @abstractmethod
-    def header_withdrawals_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def header_withdrawals_required(cls) -> bool:
         """Return true if the header must contain withdrawals."""
         pass
 
     @classmethod
     @abstractmethod
-    def header_excess_blob_gas_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def header_excess_blob_gas_required(cls) -> bool:
         """Return true if the header must contain excess blob gas."""
         pass
 
     @classmethod
     @abstractmethod
-    def header_blob_gas_used_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def header_blob_gas_used_required(cls) -> bool:
         """Return true if the header must contain blob gas used."""
         pass
 
     @classmethod
     @abstractmethod
-    def header_beacon_root_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def header_beacon_root_required(cls) -> bool:
         """Return true if the header must contain parent beacon block root."""
         pass
 
     @classmethod
     @abstractmethod
-    def header_requests_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def header_requests_required(cls) -> bool:
         """Return true if the header must contain beacon chain requests."""
         pass
 
     @classmethod
     @abstractmethod
-    def header_bal_hash_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def header_bal_hash_required(cls) -> bool:
         """Return true if the header must contain block access list hash."""
         pass
 
     @classmethod
     @abstractmethod
-    def empty_block_bal_item_count(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def empty_block_bal_item_count(cls) -> int:
         """
         Return the number of BAL items produced by an empty block.
 
@@ -374,20 +441,24 @@ def empty_block_bal_item_count(
         """
         pass
 
+    @classmethod
+    @abstractmethod
+    def header_slot_number_required(cls) -> bool:
+        """Return true if the header must contain slot number (EIP-7843)."""
+        pass
+
     # Gas related abstract methods
 
     @classmethod
     @abstractmethod
-    def gas_costs(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> GasCosts:
+    def gas_costs(cls) -> GasCosts:
         """Return dataclass with the gas costs constants for the fork."""
         pass
 
     @classmethod
     @abstractmethod
     def opcode_gas_map(
-        cls, *, block_number: int = 0, timestamp: int = 0
+        cls,
     ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
         """
         Return a mapping of opcodes to either int or callable.
@@ -399,11 +470,101 @@ def opcode_gas_map(
         """
         pass
 
+    # Gas calculation helpers
     @classmethod
     @abstractmethod
-    def memory_expansion_gas_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> MemoryExpansionGasCalculator:
+    def _calculate_sstore_refund(
+        cls, opcode: OpcodeBase, gas_costs: GasCosts
+    ) -> int:
+        """Calculate SSTORE gas refund based on metadata."""
+        pass
+
+    @classmethod
+    @abstractmethod
+    def _calculate_sstore_gas(
+        cls, opcode: OpcodeBase, gas_costs: GasCosts
+    ) -> int:
+        """Calculate SSTORE gas cost based on metadata."""
+        pass
+
+    @classmethod
+    @abstractmethod
+    def _calculate_call_gas(
+        cls, opcode: OpcodeBase, gas_costs: GasCosts
+    ) -> int:
+        """
+        Calculate CALL/DELEGATECALL/STATICCALL gas cost based on metadata.
+        """
+        pass
+
+    @classmethod
+    @abstractmethod
+    def _calculate_create_gas(
+        cls, opcode: OpcodeBase, gas_costs: GasCosts
+    ) -> int:
+        """CREATE gas is constant at Frontier."""
+        pass
+
+    @classmethod
+    @abstractmethod
+    def _calculate_create2_gas(
+        cls, opcode: OpcodeBase, gas_costs: GasCosts
+    ) -> int:
+        """
+        Calculate CREATE2 gas cost including initcode cost.
+        """
+        pass
+
+    @classmethod
+    @abstractmethod
+    def _calculate_return_gas(
+        cls, opcode: OpcodeBase, gas_costs: GasCosts
+    ) -> int:
+        """Calculate RETURN gas cost based on metadata."""
+        pass
+
+    @classmethod
+    @abstractmethod
+    def _calculate_selfdestruct_gas(
+        cls, opcode: OpcodeBase, gas_costs: GasCosts
+    ) -> int:
+        """Calculate SELFDESTRUCT gas cost based on metadata."""
+        pass
+
+    @classmethod
+    @abstractmethod
+    def _with_memory_expansion(
+        cls,
+        base_gas: int | Callable[[OpcodeBase], int],
+        memory_expansion_gas_calculator: MemoryExpansionGasCalculator,
+    ) -> Callable[[OpcodeBase], int]:
+        """Wrap a gas cost calculator to include memory expansion cost."""
+        pass
+
+    @classmethod
+    @abstractmethod
+    def _with_account_access(
+        cls,
+        base_gas: int | Callable[[OpcodeBase], int],
+        gas_costs: "GasCosts",
+    ) -> Callable[[OpcodeBase], int]:
+        """Wrap a gas cost calculator to include account access cost."""
+        pass
+
+    @classmethod
+    @abstractmethod
+    def _with_data_copy(
+        cls,
+        base_gas: int | Callable[[OpcodeBase], int],
+        gas_costs: "GasCosts",
+    ) -> Callable[[OpcodeBase], int]:
+        """Wrap a gas cost calculator to include data copy cost."""
+        pass
+
+    # Gas calculators
+    @classmethod
+    @abstractmethod
+    def memory_expansion_gas_calculator(cls) -> MemoryExpansionGasCalculator:
         """
         Return a callable that calculates the gas cost of memory expansion for
         the fork.
@@ -412,9 +573,7 @@ def memory_expansion_gas_calculator(
 
     @classmethod
     @abstractmethod
-    def calldata_gas_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> CalldataGasCalculator:
+    def calldata_gas_calculator(cls) -> CalldataGasCalculator:
         """
         Return callable that calculates the transaction gas cost for its
         calldata depending on its contents.
@@ -423,9 +582,7 @@ def calldata_gas_calculator(
 
     @classmethod
     @abstractmethod
-    def base_fee_per_gas_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> BaseFeePerGasCalculator:
+    def base_fee_per_gas_calculator(cls) -> BaseFeePerGasCalculator:
         """
         Return a callable that calculates the base fee per gas at a given fork.
         """
@@ -433,43 +590,37 @@ def base_fee_per_gas_calculator(
 
     @classmethod
     @abstractmethod
-    def base_fee_change_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> BaseFeeChangeCalculator:
+    def base_fee_change_calculator(cls) -> BaseFeeChangeCalculator:
         """
         Return a callable that calculates the gas that needs to be used to
         change the base fee.
         """
         pass
 
+    # Fee helpers
     @classmethod
     @abstractmethod
-    def base_fee_max_change_denominator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def base_fee_max_change_denominator(cls) -> int:
         """Return the base fee max change denominator at a given fork."""
         pass
 
     @classmethod
     @abstractmethod
-    def base_fee_elasticity_multiplier(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def base_fee_elasticity_multiplier(cls) -> int:
         """Return the base fee elasticity multiplier at a given fork."""
         pass
 
     @classmethod
     @abstractmethod
-    def max_refund_quotient(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def max_refund_quotient(cls) -> int:
         """Return the max refund quotient at a given fork."""
         pass
 
+    # Transaction cost calculators
     @classmethod
     @abstractmethod
     def transaction_data_floor_cost_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
+        cls,
     ) -> TransactionDataFloorCostCalculator:
         """
         Return a callable that calculates the transaction floor cost due to its
@@ -480,7 +631,7 @@ def transaction_data_floor_cost_calculator(
     @classmethod
     @abstractmethod
     def transaction_intrinsic_cost_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
+        cls,
     ) -> TransactionIntrinsicCostCalculator:
         """
         Return callable that calculates the intrinsic gas cost of a transaction
@@ -490,9 +641,7 @@ def transaction_intrinsic_cost_calculator(
 
     @classmethod
     @abstractmethod
-    def blob_gas_price_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> BlobGasPriceCalculator:
+    def blob_gas_price_calculator(cls) -> BlobGasPriceCalculator:
         """
         Return a callable that calculates the blob gas price at a given fork.
         """
@@ -500,76 +649,73 @@ def blob_gas_price_calculator(
 
     @classmethod
     @abstractmethod
-    def excess_blob_gas_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> ExcessBlobGasCalculator:
+    def excess_blob_gas_calculator(cls) -> ExcessBlobGasCalculator:
         """
         Return a callable that calculates the excess blob gas for a block at a
         given fork.
         """
         pass
 
+    # Blob constants methods
     @classmethod
     @abstractmethod
-    def min_base_fee_per_blob_gas(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the minimum base fee per blob gas at a given fork."""
+    def supports_blobs(cls) -> bool:
+        """Return whether the given fork supports blobs or not."""
         pass
 
     @classmethod
-    @abstractmethod
-    def blob_gas_per_blob(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the amount of blob gas used per blob at a given fork."""
-        pass
+    def get_blob_constant(cls, name: str) -> int:
+        """Return blob constant if it exists."""
+        assert cls.supports_blobs(), (
+            "Requested a blob constant in a fork that does not support blobs"
+        )
+        retrieved_constant = cls._blob_constants.get(name)
+        assert retrieved_constant is not None, (
+            f"You tried to retrieve the blob constant {name} but it does "
+            "not exist!"
+        )
+        return retrieved_constant
 
     @classmethod
-    @abstractmethod
-    def blob_base_fee_update_fraction(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the blob base fee update fraction at a given fork."""
-        pass
+    def min_base_fee_per_blob_gas(cls) -> int:
+        """Return the minimum base fee per blob gas at a given fork."""
+        return cls.get_blob_constant("MIN_BASE_FEE_PER_BLOB_GAS")
 
     @classmethod
-    @abstractmethod
-    def supports_blobs(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """Return whether the given fork supports blobs or not."""
-        pass
+    def blob_gas_per_blob(cls) -> int:
+        """Return the amount of blob gas used per blob at a given fork."""
+        return cls.get_blob_constant("BLOB_GAS_PER_BLOB")
 
     @classmethod
-    @abstractmethod
-    def target_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def blob_base_fee_update_fraction(cls) -> int:
+        """Return the blob base fee update fraction at a given fork."""
+        return cls.get_blob_constant("BLOB_BASE_FEE_UPDATE_FRACTION")
+
+    @classmethod
+    def target_blobs_per_block(cls) -> int:
         """Return the target blobs per block at a given fork."""
-        pass
+        return cls.get_blob_constant("TARGET_BLOBS_PER_BLOCK")
 
     @classmethod
-    @abstractmethod
-    def max_blobs_per_tx(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def max_blobs_per_tx(cls) -> int:
         """Return the max blobs per transaction at a given fork."""
-        pass
+        if "MAX_BLOBS_PER_TX" in cls._blob_constants:
+            return cls._blob_constants["MAX_BLOBS_PER_TX"]
+        return cls.get_blob_constant("MAX_BLOBS_PER_BLOCK")
 
     @classmethod
-    @abstractmethod
-    def max_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def max_blobs_per_block(cls) -> int:
         """Return the max blobs per block at a given fork."""
-        pass
+        return cls.get_blob_constant("MAX_BLOBS_PER_BLOCK")
+
+    @classmethod
+    def blob_base_cost(cls) -> int:
+        """Return the base cost of a blob at a given fork."""
+        return cls.get_blob_constant("BLOB_BASE_COST")
 
     @classmethod
     @abstractmethod
-    def blob_reserve_price_active(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def blob_reserve_price_active(cls) -> bool:
         """
         Return whether the fork uses a reserve price mechanism for blobs or
         not.
@@ -578,17 +724,7 @@ def blob_reserve_price_active(
 
     @classmethod
     @abstractmethod
-    def blob_base_cost(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the base cost of a blob at a given fork."""
-        pass
-
-    @classmethod
-    @abstractmethod
-    def full_blob_tx_wrapper_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int | None:
+    def full_blob_tx_wrapper_version(cls) -> int | None:
         """
         Return the version of the full blob transaction wrapper at a given
         fork.
@@ -596,17 +732,14 @@ def full_blob_tx_wrapper_version(
         pass
 
     @classmethod
-    @prefer_transition_to_method
     @abstractmethod
-    def blob_schedule(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> BlobSchedule | None:
+    def blob_schedule(cls) -> BlobSchedule | None:
         """Return the blob schedule up until the given fork."""
         pass
 
     @classmethod
     @abstractmethod
-    def get_reward(cls, *, block_number: int = 0, timestamp: int = 0) -> int:
+    def get_reward(cls) -> int:
         """Return expected reward amount in wei of a given fork."""
         pass
 
@@ -620,17 +753,13 @@ def supports_protected_txs(cls) -> bool:
 
     @classmethod
     @abstractmethod
-    def tx_types(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[int]:
+    def tx_types(cls) -> List[int]:
         """Return list of the transaction types supported by the fork."""
         pass
 
     @classmethod
     @abstractmethod
-    def contract_creating_tx_types(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[int]:
+    def contract_creating_tx_types(cls) -> List[int]:
         """
         Return list of the transaction types supported by the fork that can
         create contracts.
@@ -639,9 +768,7 @@ def contract_creating_tx_types(
 
     @classmethod
     @abstractmethod
-    def transaction_gas_limit_cap(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int | None:
+    def transaction_gas_limit_cap(cls) -> int | None:
         """
         Return the transaction gas limit cap, or None if no limit is imposed.
         """
@@ -649,9 +776,7 @@ def transaction_gas_limit_cap(
 
     @classmethod
     @abstractmethod
-    def block_rlp_size_limit(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int | None:
+    def block_rlp_size_limit(cls) -> int | None:
         """
         Return the maximum RLP size of a block in bytes, or None if no limit is
         imposed.
@@ -660,25 +785,19 @@ def block_rlp_size_limit(
 
     @classmethod
     @abstractmethod
-    def precompiles(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Address]:
+    def precompiles(cls) -> List[Address]:
         """Return list of precompiles supported by the fork."""
         pass
 
     @classmethod
     @abstractmethod
-    def system_contracts(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Address]:
+    def system_contracts(cls) -> List[Address]:
         """Return list of system contracts supported by the fork."""
         pass
 
     @classmethod
     @abstractmethod
-    def deterministic_factory_predeploy_address(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Address | None:
+    def deterministic_factory_predeploy_address(cls) -> Address | None:
         """
         Return the address of the deterministic factory predeploy at a
         given fork. Return `None` if the fork does not support deterministic
@@ -687,11 +806,8 @@ def deterministic_factory_predeploy_address(
         pass
 
     @classmethod
-    @prefer_transition_to_method
     @abstractmethod
-    def pre_allocation(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Mapping:
+    def pre_allocation(cls) -> Mapping:
         """
         Return required pre-allocation of accounts for any kind of test.
 
@@ -702,11 +818,8 @@ def pre_allocation(
         pass
 
     @classmethod
-    @prefer_transition_to_method
     @abstractmethod
-    def pre_allocation_blockchain(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Mapping:
+    def pre_allocation_blockchain(cls) -> Mapping:
         """
         Return required pre-allocation of accounts for any blockchain tests.
 
@@ -719,20 +832,7 @@ def pre_allocation_blockchain(
     # Engine API information abstract methods
     @classmethod
     @abstractmethod
-    def engine_new_payload_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
-        """
-        Return `None` if this fork's payloads cannot be sent over the engine
-        API, or the payload version if it can.
-        """
-        pass
-
-    @classmethod
-    @abstractmethod
-    def engine_new_payload_blob_hashes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def engine_new_payload_blob_hashes(cls) -> bool:
         """
         Return true if the engine api version requires new payload calls to
         include blob hashes.
@@ -741,9 +841,7 @@ def engine_new_payload_blob_hashes(
 
     @classmethod
     @abstractmethod
-    def engine_new_payload_beacon_root(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def engine_new_payload_beacon_root(cls) -> bool:
         """
         Return true if the engine api version requires new payload calls to
         include a parent beacon block root.
@@ -752,9 +850,7 @@ def engine_new_payload_beacon_root(
 
     @classmethod
     @abstractmethod
-    def engine_new_payload_requests(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def engine_new_payload_requests(cls) -> bool:
         """
         Return true if the engine api version requires new payload calls to
         include requests.
@@ -763,9 +859,7 @@ def engine_new_payload_requests(
 
     @classmethod
     @abstractmethod
-    def engine_new_payload_target_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def engine_new_payload_target_blobs_per_block(cls) -> bool:
         """
         Return true if the engine api version requires new payload calls to
         include target blobs per block.
@@ -774,9 +868,7 @@ def engine_new_payload_target_blobs_per_block(
 
     @classmethod
     @abstractmethod
-    def engine_execution_payload_block_access_list(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def engine_execution_payload_block_access_list(cls) -> bool:
         """
         Return `True` if the engine api version requires execution payload to
         include a `block_access_list`.
@@ -785,9 +877,7 @@ def engine_execution_payload_block_access_list(
 
     @classmethod
     @abstractmethod
-    def engine_payload_attribute_target_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def engine_payload_attribute_target_blobs_per_block(cls) -> bool:
         """
         Return true if the payload attributes include the target blobs per
         block.
@@ -796,9 +886,7 @@ def engine_payload_attribute_target_blobs_per_block(
 
     @classmethod
     @abstractmethod
-    def engine_payload_attribute_max_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def engine_payload_attribute_max_blobs_per_block(cls) -> bool:
         """
         Return true if the payload attributes include the max blobs per block.
         """
@@ -806,43 +894,73 @@ def engine_payload_attribute_max_blobs_per_block(
 
     @classmethod
     @abstractmethod
-    def engine_forkchoice_updated_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
+    def engine_payload_attribute_slot_number(cls) -> bool:
+        """
+        Return true if the payload attributes include the slot number.
+        """
+        pass
+
+    # Engine API method versions
+    @classmethod
+    def engine_new_payload_version(cls) -> Optional[int]:
+        """
+        Return `None` if this fork's payloads cannot be sent over the engine
+        API, or the payload version if it can.
+        """
+        current_version = 0
+        current_cls: Type["BaseFork"] | None = cls
+        while current_cls is not None:
+            if current_cls._engine_new_payload_version_bump:
+                current_version += 1
+            current_cls = current_cls.parent()
+        return current_version if current_version > 0 else None
+
+    @classmethod
+    def engine_forkchoice_updated_version(cls) -> Optional[int]:
         """
         Return `None` if the forks canonical chain cannot be set using the
         forkchoice method.
         """
-        pass
+        current_version = 0
+        current_cls: Type["BaseFork"] | None = cls
+        while current_cls is not None:
+            if current_cls._engine_forkchoice_updated_version_bump:
+                current_version += 1
+            current_cls = current_cls.parent()
+        return current_version if current_version > 0 else None
 
     @classmethod
-    @abstractmethod
-    def engine_get_payload_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
+    def engine_get_payload_version(cls) -> Optional[int]:
         """
         Return `None` if the forks canonical chain cannot build a payload using
         the engine API.
         """
-        pass
+        current_version = 0
+        current_cls: Type["BaseFork"] | None = cls
+        while current_cls is not None:
+            if current_cls._engine_get_payload_version_bump:
+                current_version += 1
+            current_cls = current_cls.parent()
+        return current_version if current_version > 0 else None
 
     @classmethod
-    @abstractmethod
-    def engine_get_blobs_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
+    def engine_get_blobs_version(cls) -> Optional[int]:
         """
         Return `None` if the fork does not support the engine get blobs
         version.
         """
-        pass
+        current_version = 0
+        current_cls: Type["BaseFork"] | None = cls
+        while current_cls is not None:
+            if current_cls._engine_get_blobs_version_bump:
+                current_version += 1
+            current_cls = current_cls.parent()
+        return current_version if current_version > 0 else None
 
     # EVM information abstract methods
     @classmethod
     @abstractmethod
-    def max_code_size(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def max_code_size(cls) -> int:
         """
         Return the maximum code size allowed to be deployed in a contract
         creation.
@@ -851,17 +969,13 @@ def max_code_size(
 
     @classmethod
     @abstractmethod
-    def max_stack_height(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def max_stack_height(cls) -> int:
         """Return the maximum stack height allowed in the EVM stack."""
         pass
 
     @classmethod
     @abstractmethod
-    def max_initcode_size(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def max_initcode_size(cls) -> int:
         """
         Return the maximum initcode size allowed to be used in a contract
         creation.
@@ -870,36 +984,37 @@ def max_initcode_size(
 
     @classmethod
     @abstractmethod
-    def call_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
+    def call_opcodes(cls) -> List[Opcodes]:
         """Return list of call opcodes supported by the fork."""
         pass
 
     @classmethod
     @abstractmethod
-    def valid_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
+    def valid_opcodes(cls) -> List[Opcodes]:
         """Return list of Opcodes that are valid to work on this fork."""
         pass
 
     @classmethod
     @abstractmethod
-    def create_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
+    def create_opcodes(cls) -> List[Opcodes]:
         """Return list of create opcodes supported by the fork."""
         pass
 
     @classmethod
     @abstractmethod
-    def max_request_type(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def max_request_type(cls) -> int:
         """Return max request type supported by the fork."""
         pass
 
+    @classmethod
+    @abstractmethod
+    def refund_types(cls) -> List[RefundTypes]:
+        """
+        Return the list of refund types that are possible given current
+        fork logic.
+        """
+        pass
+
     # Meta information about the fork
     @classmethod
     def name(cls) -> str:
@@ -917,11 +1032,25 @@ def fork_at(
         del block_number, timestamp
         return cls
 
+    @classmethod
+    def transitions_to(cls) -> Type["BaseFork"]:
+        """
+        Return fork where the transition ends. Useful only for
+        transition forks, and it's a no-op for normal forks.
+        """
+        return cls
+
+    @classmethod
+    def transitions_from(cls) -> Type["BaseFork"]:
+        """
+        Return fork where the transition starts. Useful only for
+        transition forks, and it's a no-op for normal forks.
+        """
+        return cls
+
     @classmethod
     @abstractmethod
-    def transition_tool_name(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> str:
+    def transition_tool_name(cls) -> str:
         """
         Return fork name as it's meant to be passed to the transition tool for
         execution.
@@ -938,11 +1067,8 @@ def solc_name(cls) -> str:
     def is_deployed(cls) -> bool:
         """
         Return whether the fork has been deployed to mainnet, or not.
-
-        Must be overridden and return False for forks that are still under
-        development.
         """
-        return True
+        return cls._deployed
 
     @classmethod
     def ignore(cls) -> bool:
@@ -950,19 +1076,58 @@ def ignore(cls) -> bool:
         return cls._ignore
 
     @classmethod
-    @prefer_transition_to_method
     def bpo_fork(cls) -> bool:
         """Return whether the fork is a BPO fork."""
         return cls._bpo_fork
 
+    @classmethod
+    def is_eip(cls) -> bool:
+        """Return whether this class is an EIP."""
+        return cls.__name__.startswith("EIP") and cls.__name__[-1].isdigit()
+
+    @classmethod
+    def eip(cls) -> int:
+        """Return the number of this EIP class."""
+        if not cls.is_eip():
+            raise Exception(f"Class {cls.__name__} is not an EIP.")
+        return int(cls.__name__[3:])
+
+    @classmethod
+    def is_eip_enabled(cls, *eip_numbers: int) -> bool:
+        """Return whether this class has all specified EIPs enabled."""
+        return all(
+            eip_number in cls._enabled_eips for eip_number in eip_numbers
+        )
+
+    @classmethod
+    def enabling_forks(cls) -> Set[Type["BaseFork"]]:
+        """Return the forks that enable this EIP."""
+        if not cls.is_eip():
+            raise Exception(f"Class {cls.__name__} is not an EIP.")
+        return cls._enabling_forks
+
     @classmethod
     def parent(cls) -> Type["BaseFork"] | None:
         """Return the parent fork."""
-        base_class = cls.__bases__[0]
-        assert issubclass(base_class, BaseFork)
-        if base_class == BaseFork:
+        base_fork_class = None
+        for base_class in cls.__bases__:
+            if issubclass(base_class, BaseFork) and not base_class.is_eip():
+                base_fork_class = base_class
+                break
+        assert base_fork_class is not None
+        if base_fork_class == BaseFork:
             return None
-        return base_class
+        return base_fork_class
+
+    @classmethod
+    def parent_or_fail(cls) -> Type["BaseFork"]:
+        """Return the parent fork or raise if the class has no parent."""
+        parent = cls.parent()
+        if parent is None:
+            raise Exception(
+                f"Expected class {cls.__name__} to have a parent fork."
+            )
+        return parent
 
     @classmethod
     def non_bpo_ancestor(cls) -> Type["BaseFork"]:
@@ -989,3 +1154,52 @@ def build_default_block_header(
         Build a default block header for this fork with the given attributes.
         """
         pass
+
+    @classmethod
+    def ruleset_name(cls) -> str | None:
+        """
+        Return the hive ruleset name for this fork, or None.
+        """
+        assert cls is not BaseFork
+        if cls._ruleset_name is not None:
+            if cls._ruleset_name == "":
+                return None
+            ruleset_name = cls._ruleset_name
+        else:
+            if cls.__name__.startswith("BPO"):
+                ruleset_name = cls.__name__
+            else:
+                ruleset_name = re.sub(
+                    r"(?<!^)(?=[A-Z])", "_", cls.__name__
+                ).upper()
+        return ruleset_name
+
+    @classmethod
+    def ruleset(cls, value: int = 0) -> Dict[str, int]:
+        """
+        Return the hive ruleset for this fork.
+        """
+        assert cls is not BaseFork
+        parent = cls.parent()
+        if parent is None:
+            return {}
+        entries: Dict[str, int] = {}
+        entries |= parent.ruleset()
+        ruleset_name = cls.ruleset_name()
+        if ruleset_name:
+            if cls._fork_by_timestamp:
+                hive_ruleset_name = f"HIVE_{ruleset_name}_TIMESTAMP"
+            else:
+                hive_ruleset_name = f"HIVE_FORK_{ruleset_name}"
+            entries[hive_ruleset_name] = value
+            if cls.supports_blobs():
+                entries[f"HIVE_{ruleset_name}_BLOB_TARGET"] = (
+                    cls.target_blobs_per_block()
+                )
+                entries[f"HIVE_{ruleset_name}_BLOB_MAX"] = (
+                    cls.max_blobs_per_block()
+                )
+                entries[
+                    f"HIVE_{ruleset_name}_BLOB_BASE_FEE_UPDATE_FRACTION"
+                ] = cls.blob_base_fee_update_fraction()
+        return entries
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/__init__.py b/packages/testing/src/execution_testing/forks/forks/eips/__init__.py
new file mode 100644
index 00000000000..9c401623780
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/__init__.py
@@ -0,0 +1,35 @@
+"""Listings of all EIPs, current and upcoming."""
+
+import importlib
+import inspect
+import pkgutil
+import re
+from typing import Any
+
+__all__ = []
+
+_prefix = __name__ + "."
+
+ALL_EIPS = []
+
+for _importer, _modname, _ispkg in pkgutil.walk_packages(
+    __path__, prefix=_prefix
+):
+    if not re.search(r"\.eip_\d+$", _modname):
+        continue
+
+    _module = importlib.import_module(_modname)
+
+    for _name, _obj in inspect.getmembers(_module, inspect.isclass):
+        if re.match(r"^EIP\d+$", _name) and _obj.__module__ == _modname:
+            globals()[_name] = _obj
+            ALL_EIPS.append(_obj)
+            __all__.append(_name)
+
+
+def __getattr__(name: str) -> Any:
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+
+
+# Clean up module namespace
+del _importer, _modname, _ispkg, _module, _name, _obj, _prefix
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/__init__.py b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/__init__.py
new file mode 100644
index 00000000000..66ece88871c
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/__init__.py
@@ -0,0 +1,52 @@
+"""Listings of all EIPs for Amsterdam fork."""
+
+from __future__ import annotations
+
+import importlib
+import inspect
+import pkgutil
+import re
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from execution_testing.forks.base_fork import BaseFork
+
+__all__ = ["AmsterdamEIPs"]
+
+if TYPE_CHECKING:
+
+    class AmsterdamEIPs(BaseFork):
+        """Typing-only stand-in for Amsterdam EIP mixins."""
+
+        pass
+else:
+    _prefix = __name__ + "."
+    _amsterdam_eips = []
+
+    for _importer, _modname, _ispkg in pkgutil.iter_modules(
+        __path__, prefix=_prefix
+    ):
+        if _ispkg or not re.search(r"\.eip_\d+$", _modname):
+            continue
+
+        _module = importlib.import_module(_modname)
+
+        for _name, _obj in inspect.getmembers(_module, inspect.isclass):
+            if re.match(r"^EIP\d+$", _name) and _obj.__module__ == _modname:
+                _amsterdam_eips.append(_obj)
+
+    _amsterdam_eips.sort(key=lambda cls: int(cls.__name__[3:]))
+
+    class _AmsterdamEIPsSentinel:
+        """Expand to the currently available Amsterdam EIP mixins."""
+
+        def __mro_entries__(
+            self,
+            bases: tuple[type, ...],
+        ) -> tuple[type, ...]:
+            del bases
+            return tuple(_amsterdam_eips)
+
+    AmsterdamEIPs = _AmsterdamEIPsSentinel()  # type: ignore[misc]
+
+    del _importer, _ispkg, _modname, _module, _name, _obj, _prefix
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7708.py b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7708.py
new file mode 100644
index 00000000000..f968d1b6d60
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7708.py
@@ -0,0 +1,15 @@
+"""
+EIP-7708: ETH transfers and burns emit a log.
+
+All ETH transfers and burns emit a log.
+
+https://eips.ethereum.org/EIPS/eip-7708
+"""
+
+from ....base_fork import BaseFork
+
+
+class EIP7708(BaseFork):
+    """EIP-7708 class."""
+
+    pass
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7778.py b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7778.py
new file mode 100644
index 00000000000..e7153a7fc8a
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7778.py
@@ -0,0 +1,16 @@
+"""
+EIP-7778: Block Gas Accounting without Refunds.
+
+Prevent Block Gas Limit Circumvention by Excluding Refunds from Block Gas
+Accounting.
+
+https://eips.ethereum.org/EIPS/eip-7778
+"""
+
+from ....base_fork import BaseFork
+
+
+class EIP7778(BaseFork):
+    """EIP-7778 class."""
+
+    pass
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7843.py b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7843.py
new file mode 100644
index 00000000000..d701bef1cc5
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7843.py
@@ -0,0 +1,54 @@
+"""
+EIP-7843: SLOTNUM opcode.
+
+Opcode to get the current slot number.
+
+https://eips.ethereum.org/EIPS/eip-7843
+"""
+
+from typing import Callable, Dict, List
+
+from execution_testing.vm import (
+    OpcodeBase,
+    Opcodes,
+)
+
+from ....base_fork import BaseFork
+
+
+class EIP7843(
+    BaseFork,
+    # Engine API method version bumps
+    # New field `slotNumber` in ExecutionPayload
+    engine_new_payload_version_bump=True,
+    engine_get_payload_version_bump=True,
+    engine_forkchoice_updated_version_bump=True,
+):
+    """EIP-7843 class."""
+
+    @classmethod
+    def header_slot_number_required(cls) -> bool:
+        """Slot number in header required."""
+        return True
+
+    @classmethod
+    def engine_payload_attribute_slot_number(cls) -> bool:
+        """Payload attributes include the slot number."""
+        return True
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """Add SLOTNUM opcode gas cost."""
+        gas_costs = cls.gas_costs()
+        base_map = super(EIP7843, cls).opcode_gas_map()
+        return {
+            **base_map,
+            Opcodes.SLOTNUM: gas_costs.BASE,
+        }
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Add SLOTNUM opcode."""
+        return [Opcodes.SLOTNUM] + super(EIP7843, cls).valid_opcodes()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7928.py b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7928.py
new file mode 100644
index 00000000000..d4b1b9a6e17
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7928.py
@@ -0,0 +1,61 @@
+"""
+EIP-7928: Block-Level Access Lists.
+
+Enforced block access lists with state locations and post-transaction state
+diffs.
+
+https://eips.ethereum.org/EIPS/eip-7928
+"""
+
+from dataclasses import replace
+
+from ....base_fork import BaseFork
+from ....gas_costs import GasCosts
+
+
+class EIP7928(
+    BaseFork,
+    # Engine API method version bumps
+    # New field `blockAccessList` in ExecutionPayload
+    engine_new_payload_version_bump=True,
+    engine_get_payload_version_bump=True,
+):
+    """EIP-7928 class."""
+
+    @classmethod
+    def header_bal_hash_required(cls) -> bool:
+        """
+        Header must contain block access list hash (EIP-7928).
+        """
+        return True
+
+    @classmethod
+    def gas_costs(cls) -> GasCosts:
+        """
+        The cost per block access list item is introduced in EIP-7928.
+        """
+        return replace(
+            super(EIP7928, cls).gas_costs(),
+            BLOCK_ACCESS_LIST_ITEM=2000,
+        )
+
+    @classmethod
+    def empty_block_bal_item_count(cls) -> int:
+        """
+        Return the BAL item count for an empty EIP-7928 block.
+
+        Four system contracts produce 15 items:
+          EIP-4788 beacon roots:           1 address + 1 write + 1 read = 3
+          EIP-2935 history storage:        1 address + 1 write          = 2
+          EIP-7002 withdrawal requests:    1 address + 4 reads          = 5
+          EIP-7251 consolidation requests: 1 address + 4 reads          = 5
+        """
+        return 15
+
+    @classmethod
+    def engine_execution_payload_block_access_list(cls) -> bool:
+        """
+        From EIP-7928, engine execution payload includes `block_access_list`
+        as a parameter.
+        """
+        return True
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7954.py b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7954.py
new file mode 100644
index 00000000000..b5c23ce2752
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7954.py
@@ -0,0 +1,24 @@
+"""
+EIP-7954: Increase Maximum Contract Size.
+
+Raise the maximum contract code size from 24KiB to 32KiB and initcode size from
+48KiB to 64KiB.
+
+https://eips.ethereum.org/EIPS/eip-7954
+"""
+
+from ....base_fork import BaseFork
+
+
+class EIP7954(BaseFork):
+    """EIP-7954 class."""
+
+    @classmethod
+    def max_code_size(cls) -> int:
+        """Max contract code size is 32 KiB."""
+        return 32 * 1024
+
+    @classmethod
+    def max_initcode_size(cls) -> int:
+        """Max initcode size is 64 KiB."""
+        return 64 * 1024
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7976.py b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7976.py
new file mode 100644
index 00000000000..b126395a4c7
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7976.py
@@ -0,0 +1,47 @@
+"""
+EIP-7976: Increase Calldata Floor Cost.
+
+Increase the calldata floor cost to 64/64 gas per byte to reduce maximum block
+size.
+
+https://eips.ethereum.org/EIPS/eip-7976
+"""
+
+from dataclasses import replace
+
+from execution_testing.base_types import Bytes
+from execution_testing.base_types.conversions import BytesConvertible
+
+from ....base_fork import BaseFork, CalldataGasCalculator
+from ....gas_costs import GasCosts
+
+
+class EIP7976(BaseFork):
+    """EIP-7976 class."""
+
+    @classmethod
+    def gas_costs(cls) -> GasCosts:
+        """Transaction data floor token cost is increased from 10 to 16."""
+        return replace(
+            super(EIP7976, cls).gas_costs(),
+            TX_DATA_TOKEN_FLOOR=16,
+        )
+
+    @classmethod
+    def calldata_gas_calculator(cls) -> CalldataGasCalculator:
+        """
+        In floor mode, count four tokens per calldata byte uniformly so
+        the data floor cost becomes ``4 * bytes * TX_DATA_TOKEN_FLOOR``
+        (64/64 gas per byte). Standard mode keeps EIP-7623 semantics so
+        that composition with downstream EIPs (e.g. EIP-7981) stays
+        intact via ``super().transaction_data_floor_cost_calculator()``.
+        """
+        super_fn = super(EIP7976, cls).calldata_gas_calculator()
+        gas_costs = cls.gas_costs()
+
+        def fn(*, data: BytesConvertible, floor: bool = False) -> int:
+            if floor:
+                return len(Bytes(data)) * 4 * gas_costs.TX_DATA_TOKEN_FLOOR
+            return super_fn(data=data, floor=False)
+
+        return fn
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7981.py b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7981.py
new file mode 100644
index 00000000000..b2f927b507c
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7981.py
@@ -0,0 +1,111 @@
+"""
+EIP-7981: Increase Access List Cost.
+
+Price access lists for data to reduce maximum block size.
+
+https://eips.ethereum.org/EIPS/eip-7981
+"""
+
+from typing import List, Sized
+
+from execution_testing.base_types import AccessList
+from execution_testing.base_types.conversions import BytesConvertible
+
+from ....base_fork import (
+    BaseFork,
+    TransactionDataFloorCostCalculator,
+    TransactionIntrinsicCostCalculator,
+)
+
+
+class EIP7981(BaseFork):
+    """EIP-7981 class."""
+
+    @classmethod
+    def _access_list_floor_tokens(
+        cls, access_list: List[AccessList] | None
+    ) -> int:
+        """
+        Return ``access_list_bytes * 4`` floor tokens for the access list.
+
+        Every byte of each address (20 bytes) and storage key (32 bytes)
+        contributes four floor tokens, so zero and non-zero bytes are
+        charged equally per EIP-7981.
+        """
+        if not access_list:
+            return 0
+        total_bytes = 0
+        for access in access_list:
+            total_bytes += len(access.address)
+            for slot in access.storage_keys:
+                total_bytes += len(slot)
+        return total_bytes * 4
+
+    @classmethod
+    def transaction_data_floor_cost_calculator(
+        cls,
+    ) -> TransactionDataFloorCostCalculator:
+        """
+        Add access list floor tokens to the inherited calldata floor cost.
+        """
+        super_fn = super(EIP7981, cls).transaction_data_floor_cost_calculator()
+        gas_costs = cls.gas_costs()
+
+        def fn(
+            *,
+            data: BytesConvertible,
+            access_list: List[AccessList] | None = None,
+        ) -> int:
+            return (
+                super_fn(data=data)
+                + cls._access_list_floor_tokens(access_list)
+                * gas_costs.TX_DATA_TOKEN_FLOOR
+            )
+
+        return fn
+
+    @classmethod
+    def transaction_intrinsic_cost_calculator(
+        cls,
+    ) -> TransactionIntrinsicCostCalculator:
+        """
+        Charge access list data at the floor token cost on top of the
+        inherited intrinsic cost and enforce the combined data floor.
+        """
+        super_fn = super(EIP7981, cls).transaction_intrinsic_cost_calculator()
+        gas_costs = cls.gas_costs()
+        data_floor_cost_calculator = (
+            cls.transaction_data_floor_cost_calculator()
+        )
+
+        def fn(
+            *,
+            calldata: BytesConvertible = b"",
+            contract_creation: bool = False,
+            access_list: List[AccessList] | None = None,
+            authorization_list_or_count: Sized | int | None = None,
+            return_cost_deducted_prior_execution: bool = False,
+        ) -> int:
+            intrinsic_cost: int = super_fn(
+                calldata=calldata,
+                contract_creation=contract_creation,
+                access_list=access_list,
+                authorization_list_or_count=authorization_list_or_count,
+                return_cost_deducted_prior_execution=True,
+            )
+            intrinsic_cost += (
+                cls._access_list_floor_tokens(access_list)
+                * gas_costs.TX_DATA_TOKEN_FLOOR
+            )
+
+            if return_cost_deducted_prior_execution:
+                return intrinsic_cost
+
+            return max(
+                intrinsic_cost,
+                data_floor_cost_calculator(
+                    data=calldata, access_list=access_list
+                ),
+            )
+
+        return fn
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_8024.py b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_8024.py
new file mode 100644
index 00000000000..dadf752e8e2
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_8024.py
@@ -0,0 +1,41 @@
+"""
+EIP-8024: Backward compatible SWAPN, DUPN, EXCHANGE.
+
+Introduce additional instructions for manipulating the stack which allow
+accessing the stack at higher depths.
+
+https://eips.ethereum.org/EIPS/eip-8024
+"""
+
+from typing import Callable, Dict, List
+
+from execution_testing.vm import OpcodeBase, Opcodes
+
+from ....base_fork import BaseFork
+
+
+class EIP8024(BaseFork):
+    """EIP-8024 class."""
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Add SWAPN, DUPN, EXCHANGE."""
+        return [
+            Opcodes.SWAPN,
+            Opcodes.DUPN,
+            Opcodes.EXCHANGE,
+        ] + super(EIP8024, cls).valid_opcodes()
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """Add gas costs for SWAPN, DUPN, EXCHANGE."""
+        gas_costs = cls.gas_costs()
+        base_map = super(EIP8024, cls).opcode_gas_map()
+        return {
+            **base_map,
+            Opcodes.SWAPN: gas_costs.VERY_LOW,
+            Opcodes.DUPN: gas_costs.VERY_LOW,
+            Opcodes.EXCHANGE: gas_costs.VERY_LOW,
+        }
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/berlin/__init__.py b/packages/testing/src/execution_testing/forks/forks/eips/berlin/__init__.py
new file mode 100644
index 00000000000..2048dbaea74
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/berlin/__init__.py
@@ -0,0 +1 @@
+"""Listings of all EIPs for Berlin fork."""
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/berlin/eip_2930.py b/packages/testing/src/execution_testing/forks/forks/eips/berlin/eip_2930.py
new file mode 100644
index 00000000000..7dede0ace15
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/berlin/eip_2930.py
@@ -0,0 +1,63 @@
+"""
+EIP-2930: Optional access lists.
+
+Add a transaction type which contains an access list, a list of addresses
+and storage keys that the transaction plans to access.
+
+https://eips.ethereum.org/EIPS/eip-2930
+"""
+
+from typing import List, Sized
+
+from execution_testing.base_types import AccessList
+from execution_testing.base_types.conversions import BytesConvertible
+
+from ....base_fork import BaseFork, TransactionIntrinsicCostCalculator
+
+
+class EIP2930(BaseFork):
+    """EIP-2930 class."""
+
+    @classmethod
+    def tx_types(cls) -> List[int]:
+        """Access list transactions are introduced."""
+        return [1] + super(EIP2930, cls).tx_types()
+
+    @classmethod
+    def contract_creating_tx_types(cls) -> List[int]:
+        """Access list transactions can create contracts."""
+        return [1] + super(EIP2930, cls).contract_creating_tx_types()
+
+    @classmethod
+    def transaction_intrinsic_cost_calculator(
+        cls,
+    ) -> TransactionIntrinsicCostCalculator:
+        """
+        Transaction intrinsic cost includes access list cost.
+        """
+        super_fn = super(EIP2930, cls).transaction_intrinsic_cost_calculator()
+        gas_costs = cls.gas_costs()
+
+        def fn(
+            *,
+            calldata: BytesConvertible = b"",
+            contract_creation: bool = False,
+            access_list: List[AccessList] | None = None,
+            authorization_list_or_count: Sized | int | None = None,
+            return_cost_deducted_prior_execution: bool = False,
+        ) -> int:
+            del return_cost_deducted_prior_execution
+
+            intrinsic_cost: int = super_fn(
+                calldata=calldata,
+                contract_creation=contract_creation,
+                authorization_list_or_count=authorization_list_or_count,
+            )
+            if access_list is not None:
+                for access in access_list:
+                    intrinsic_cost += gas_costs.TX_ACCESS_LIST_ADDRESS
+                    for _ in access.storage_keys:
+                        intrinsic_cost += gas_costs.TX_ACCESS_LIST_STORAGE_KEY
+            return intrinsic_cost
+
+        return fn
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/bogota/__init__.py b/packages/testing/src/execution_testing/forks/forks/eips/bogota/__init__.py
new file mode 100644
index 00000000000..3579c6578a2
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/bogota/__init__.py
@@ -0,0 +1 @@
+"""Listings of all EIPs for Bogotá fork."""
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/byzantium/__init__.py b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/__init__.py
new file mode 100644
index 00000000000..11880dc2696
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/__init__.py
@@ -0,0 +1 @@
+"""Listings of all EIPs for Byzantium fork."""
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_140.py b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_140.py
new file mode 100644
index 00000000000..f3eab6af239
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_140.py
@@ -0,0 +1,37 @@
+"""
+EIP-140: REVERT instruction.
+
+Provide a way to stop execution and revert state changes without consuming
+all provided gas.
+
+https://eips.ethereum.org/EIPS/eip-140
+"""
+
+from typing import Callable, Dict, List
+
+from execution_testing.vm import OpcodeBase, Opcodes
+
+from ....base_fork import BaseFork
+
+
+class EIP140(BaseFork):
+    """EIP-140 class."""
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """Add REVERT opcode gas cost."""
+        memory_expansion_calculator = cls.memory_expansion_gas_calculator()
+        base_map = super(EIP140, cls).opcode_gas_map()
+        return {
+            **base_map,
+            Opcodes.REVERT: cls._with_memory_expansion(
+                0, memory_expansion_calculator
+            ),
+        }
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Add REVERT to valid opcodes."""
+        return [Opcodes.REVERT] + super(EIP140, cls).valid_opcodes()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_196.py b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_196.py
new file mode 100644
index 00000000000..343e8ba9947
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_196.py
@@ -0,0 +1,35 @@
+"""
+EIP-196: Precompiled contracts for addition and scalar multiplication on
+the elliptic curve alt_bn128.
+
+https://eips.ethereum.org/EIPS/eip-196
+"""
+
+from dataclasses import replace
+from typing import List
+
+from execution_testing.base_types import Address
+
+from ....base_fork import BaseFork
+from ....gas_costs import GasCosts
+
+
+class EIP196(BaseFork):
+    """EIP-196 class."""
+
+    @classmethod
+    def precompiles(cls) -> List[Address]:
+        """Add BN254 addition and scalar multiplication precompiles."""
+        return [
+            Address(6, label="BN254_ADD"),
+            Address(7, label="BN254_MUL"),
+        ] + super(EIP196, cls).precompiles()
+
+    @classmethod
+    def gas_costs(cls) -> GasCosts:
+        """Set gas costs for BN254 addition and multiplication."""
+        return replace(
+            super(EIP196, cls).gas_costs(),
+            PRECOMPILE_ECADD=500,
+            PRECOMPILE_ECMUL=40_000,
+        )
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_197.py b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_197.py
new file mode 100644
index 00000000000..4d18dc85b3e
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_197.py
@@ -0,0 +1,34 @@
+"""
+EIP-197: Precompiled contracts for optimal ate pairing check on the
+elliptic curve alt_bn128.
+
+https://eips.ethereum.org/EIPS/eip-197
+"""
+
+from dataclasses import replace
+from typing import List
+
+from execution_testing.base_types import Address
+
+from ....base_fork import BaseFork
+from ....gas_costs import GasCosts
+
+
+class EIP197(BaseFork):
+    """EIP-197 class."""
+
+    @classmethod
+    def precompiles(cls) -> List[Address]:
+        """Add BN254 pairing check precompile."""
+        return [
+            Address(8, label="BN254_PAIRING"),
+        ] + super(EIP197, cls).precompiles()
+
+    @classmethod
+    def gas_costs(cls) -> GasCosts:
+        """Set gas costs for BN254 pairing check."""
+        return replace(
+            super(EIP197, cls).gas_costs(),
+            PRECOMPILE_ECPAIRING_BASE=100_000,
+            PRECOMPILE_ECPAIRING_PER_POINT=80_000,
+        )
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_198.py b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_198.py
new file mode 100644
index 00000000000..30a8cb530d9
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_198.py
@@ -0,0 +1,24 @@
+"""
+EIP-198: Big integer modular exponentiation.
+
+Precompile for modular exponentiation.
+
+https://eips.ethereum.org/EIPS/eip-198
+"""
+
+from typing import List
+
+from execution_testing.base_types import Address
+
+from ....base_fork import BaseFork
+
+
+class EIP198(BaseFork):
+    """EIP-198 class."""
+
+    @classmethod
+    def precompiles(cls) -> List[Address]:
+        """Add modular exponentiation precompile."""
+        return [
+            Address(5, label="MODEXP"),
+        ] + super(EIP198, cls).precompiles()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_211.py b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_211.py
new file mode 100644
index 00000000000..d8e053c26ef
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_211.py
@@ -0,0 +1,40 @@
+"""
+EIP-211: New opcodes: RETURNDATASIZE and RETURNDATACOPY.
+
+https://eips.ethereum.org/EIPS/eip-211
+"""
+
+from typing import Callable, Dict, List
+
+from execution_testing.vm import OpcodeBase, Opcodes
+
+from ....base_fork import BaseFork
+
+
+class EIP211(BaseFork):
+    """EIP-211 class."""
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """Add RETURNDATASIZE and RETURNDATACOPY opcode gas costs."""
+        gas_costs = cls.gas_costs()
+        memory_expansion_calculator = cls.memory_expansion_gas_calculator()
+        base_map = super(EIP211, cls).opcode_gas_map()
+        return {
+            **base_map,
+            Opcodes.RETURNDATASIZE: gas_costs.BASE,
+            Opcodes.RETURNDATACOPY: cls._with_memory_expansion(
+                cls._with_data_copy(gas_costs.VERY_LOW, gas_costs),
+                memory_expansion_calculator,
+            ),
+        }
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Add RETURNDATASIZE and RETURNDATACOPY to valid opcodes."""
+        return [
+            Opcodes.RETURNDATASIZE,
+            Opcodes.RETURNDATACOPY,
+        ] + super(EIP211, cls).valid_opcodes()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_214.py b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_214.py
new file mode 100644
index 00000000000..f0db5f83a4f
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_214.py
@@ -0,0 +1,45 @@
+"""
+EIP-214: New opcode STATICCALL.
+
+https://eips.ethereum.org/EIPS/eip-214
+"""
+
+from typing import Callable, Dict, List
+
+from execution_testing.vm import OpcodeBase, Opcodes
+
+from ....base_fork import BaseFork
+
+
+class EIP214(BaseFork):
+    """EIP-214 class."""
+
+    @classmethod
+    def call_opcodes(cls) -> List[Opcodes]:
+        """Add STATICCALL opcode."""
+        return [
+            Opcodes.STATICCALL,
+        ] + super(EIP214, cls).call_opcodes()
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """Add STATICCALL opcode gas cost."""
+        gas_costs = cls.gas_costs()
+        memory_expansion_calculator = cls.memory_expansion_gas_calculator()
+        base_map = super(EIP214, cls).opcode_gas_map()
+        return {
+            **base_map,
+            Opcodes.STATICCALL: cls._with_memory_expansion(
+                lambda op: cls._calculate_call_gas(op, gas_costs),
+                memory_expansion_calculator,
+            ),
+        }
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Add STATICCALL to valid opcodes."""
+        return [
+            Opcodes.STATICCALL,
+        ] + super(EIP214, cls).valid_opcodes()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_649.py b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_649.py
new file mode 100644
index 00000000000..f9fa22e5d7d
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_649.py
@@ -0,0 +1,18 @@
+"""
+EIP-649: Metropolis difficulty bomb delay and block reward reduction.
+
+Delay the difficulty bomb and reduce the block reward to 3 ETH.
+
+https://eips.ethereum.org/EIPS/eip-649
+"""
+
+from ....base_fork import BaseFork
+
+
+class EIP649(BaseFork):
+    """EIP-649 class."""
+
+    @classmethod
+    def get_reward(cls) -> int:
+        """Block reward is reduced to 3 ETH."""
+        return 3_000_000_000_000_000_000
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/cancun/__init__.py b/packages/testing/src/execution_testing/forks/forks/eips/cancun/__init__.py
new file mode 100644
index 00000000000..c22e0072e2f
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/cancun/__init__.py
@@ -0,0 +1 @@
+"""Listings of all EIPs for Cancun fork."""
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_1153.py b/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_1153.py
new file mode 100644
index 00000000000..c98a22bc3f4
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_1153.py
@@ -0,0 +1,39 @@
+"""
+EIP-1153: Transient storage opcodes.
+
+Add opcodes for manipulating state that behaves identically to storage
+but is discarded after every transaction.
+
+https://eips.ethereum.org/EIPS/eip-1153
+"""
+
+from typing import Callable, Dict, List
+
+from execution_testing.vm import OpcodeBase, Opcodes
+
+from ....base_fork import BaseFork
+
+
+class EIP1153(BaseFork):
+    """EIP-1153 class."""
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """Add TLOAD and TSTORE opcode gas costs."""
+        gas_costs = cls.gas_costs()
+        base_map = super(EIP1153, cls).opcode_gas_map()
+        return {
+            **base_map,
+            Opcodes.TLOAD: gas_costs.WARM_SLOAD,
+            Opcodes.TSTORE: gas_costs.WARM_SLOAD,
+        }
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Add TLOAD and TSTORE to valid opcodes."""
+        return [
+            Opcodes.TLOAD,
+            Opcodes.TSTORE,
+        ] + super(EIP1153, cls).valid_opcodes()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_4788.py b/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_4788.py
new file mode 100644
index 00000000000..29db5a9b93d
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_4788.py
@@ -0,0 +1,47 @@
+"""
+EIP-4788: Beacon block root in the EVM.
+
+Expose beacon chain roots in the EVM.
+
+https://eips.ethereum.org/EIPS/eip-4788
+"""
+
+from typing import List, Mapping
+
+from execution_testing.base_types import Address
+
+from ....base_fork import BaseFork
+
+BEACON_ROOTS_ADDRESS = 0x000F3DF6D732807EF1319FB7B8BB8522D0BEAC02
+
+
+class EIP4788(BaseFork):
+    """EIP-4788 class."""
+
+    @classmethod
+    def header_beacon_root_required(cls) -> bool:
+        """Parent beacon block root is required."""
+        return True
+
+    @classmethod
+    def system_contracts(cls) -> List[Address]:
+        """Add the beacon roots system contract."""
+        return [Address(BEACON_ROOTS_ADDRESS, label="BEACON_ROOTS_ADDRESS")]
+
+    @classmethod
+    def pre_allocation_blockchain(cls) -> Mapping:
+        """Pre-allocate the beacon root contract."""
+        return {
+            BEACON_ROOTS_ADDRESS: {
+                "nonce": 1,
+                "code": "0x3373fffffffffffffffffffffffffffffffffffffffe14604d"
+                "57602036146024575f5ffd5b5f35801560495762001fff810690"
+                "815414603c575f5ffd5b62001fff01545f5260205ff35b5f5ffd"
+                "5b62001fff42064281555f359062001fff015500",
+            }
+        } | super(EIP4788, cls).pre_allocation_blockchain()  # type: ignore
+
+    @classmethod
+    def engine_new_payload_beacon_root(cls) -> bool:
+        """Payloads must have a parent beacon block root."""
+        return True
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_4844.py b/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_4844.py
new file mode 100644
index 00000000000..9774befab96
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_4844.py
@@ -0,0 +1,216 @@
+"""
+EIP-4844: Shard Blob Transactions.
+
+Shard Blob Transactions scale data-availability of Ethereum in a simple,
+forwards-compatible manner.
+
+https://eips.ethereum.org/EIPS/eip-4844
+"""
+
+from dataclasses import replace
+from typing import Callable, Dict, List
+
+from execution_testing.base_types import (
+    Address,
+    BlobSchedule,
+    ForkBlobSchedule,
+)
+from execution_testing.vm import (
+    OpcodeBase,
+    Opcodes,
+)
+
+from ....base_fork import (
+    BaseFork,
+    BlobGasPriceCalculator,
+    ExcessBlobGasCalculator,
+)
+from ....gas_costs import GasCosts
+from ...helpers import fake_exponential
+
+
+class EIP4844(
+    BaseFork,
+    update_blob_constants={
+        "FIELD_ELEMENTS_PER_BLOB": 4096,
+        "BYTES_PER_FIELD_ELEMENT": 32,
+        "CELL_LENGTH": 2048,
+        # EIP-2537: Main subgroup order = q, due to this BLS_MODULUS
+        # every blob byte (uint256) must be smaller than 116
+        "BLS_MODULUS": (
+            0x73EDA753299D7D483339D80809A1D80553BDA402FFFE5BFEFFFFFFFF00000001
+        ),
+        # https://github.com/ethereum/consensus-specs/blob/
+        # cc6996c22692d70e41b7a453d925172ee4b719ad/specs/deneb/
+        # polynomial-commitments.md?plain=1#L78
+        "BYTES_PER_PROOF": 48,
+        "BYTES_PER_COMMITMENT": 48,
+        "AMOUNT_CELL_PROOFS": 0,
+        "BLOB_GAS_PER_BLOB": 2**17,
+        "MAX_BLOBS_PER_BLOCK": 6,
+        "TARGET_BLOBS_PER_BLOCK": 3,
+        "BLOB_BASE_FEE_UPDATE_FRACTION": 3338477,
+        "MIN_BASE_FEE_PER_BLOB_GAS": 1,
+    },
+    # Engine API method version bumps
+    engine_new_payload_version_bump=True,
+    engine_forkchoice_updated_version_bump=True,
+    engine_get_payload_version_bump=True,
+    engine_get_blobs_version_bump=True,
+):
+    """EIP-4844 class."""
+
+    @classmethod
+    def header_excess_blob_gas_required(cls) -> bool:
+        """Excess blob gas is required starting from Cancun."""
+        return True
+
+    @classmethod
+    def header_blob_gas_used_required(cls) -> bool:
+        """Blob gas used is required starting from Cancun."""
+        return True
+
+    @classmethod
+    def blob_gas_price_calculator(cls) -> BlobGasPriceCalculator:
+        """Return a callable that calculates the blob gas price at Cancun."""
+        min_base_fee_per_blob_gas = cls.min_base_fee_per_blob_gas()
+        blob_base_fee_update_fraction = cls.blob_base_fee_update_fraction()
+
+        def fn(*, excess_blob_gas: int) -> int:
+            return fake_exponential(
+                min_base_fee_per_blob_gas,
+                excess_blob_gas,
+                blob_base_fee_update_fraction,
+            )
+
+        return fn
+
+    @classmethod
+    def excess_blob_gas_calculator(cls) -> ExcessBlobGasCalculator:
+        """
+        Return a callable that calculates the excess blob gas for a block at
+        Cancun.
+        """
+        target_blobs_per_block = cls.target_blobs_per_block()
+        blob_gas_per_blob = cls.blob_gas_per_blob()
+        blob_target_gas_per_block = target_blobs_per_block * blob_gas_per_blob
+
+        def fn(
+            *,
+            parent_excess_blob_gas: int | None = None,
+            parent_excess_blobs: int | None = None,
+            parent_blob_gas_used: int | None = None,
+            parent_blob_count: int | None = None,
+            # Required for Osaka as using this as base
+            parent_base_fee_per_gas: int,
+        ) -> int:
+            del parent_base_fee_per_gas
+
+            if parent_excess_blob_gas is None:
+                assert parent_excess_blobs is not None, (
+                    "Parent excess blobs are required"
+                )
+                parent_excess_blob_gas = (
+                    parent_excess_blobs * blob_gas_per_blob
+                )
+            if parent_blob_gas_used is None:
+                assert parent_blob_count is not None, (
+                    "Parent blob count is required"
+                )
+                parent_blob_gas_used = parent_blob_count * blob_gas_per_blob
+            if (
+                parent_excess_blob_gas + parent_blob_gas_used
+                < blob_target_gas_per_block
+            ):
+                return 0
+            else:
+                return (
+                    parent_excess_blob_gas
+                    + parent_blob_gas_used
+                    - blob_target_gas_per_block
+                )
+
+        return fn
+
+    @classmethod
+    def supports_blobs(cls) -> bool:
+        """At Cancun, blobs support is enabled."""
+        return True
+
+    @classmethod
+    def blob_reserve_price_active(cls) -> bool:
+        """Blob reserve price is not supported in Cancun."""
+        return False
+
+    @classmethod
+    def full_blob_tx_wrapper_version(cls) -> int | None:
+        """
+        Pre-Osaka forks don't use tx wrapper versions for full blob
+        transactions.
+        """
+        return None
+
+    @classmethod
+    def blob_schedule(cls) -> BlobSchedule | None:
+        """
+        At Cancun, the fork object runs this routine to get the updated blob
+        schedule.
+        """
+        parent_fork = cls.parent()
+        assert parent_fork is not None, "Parent fork must be defined"
+        blob_schedule = parent_fork.blob_schedule() or BlobSchedule()
+        current_blob_schedule = ForkBlobSchedule(
+            target_blobs_per_block=cls.target_blobs_per_block(),
+            max_blobs_per_block=cls.max_blobs_per_block(),
+            base_fee_update_fraction=cls.blob_base_fee_update_fraction(),
+        )
+        blob_schedule.append(fork=cls.name(), schedule=current_blob_schedule)
+        return blob_schedule
+
+    @classmethod
+    def tx_types(cls) -> List[int]:
+        """At Cancun, blob type transactions are introduced."""
+        return [3] + super(EIP4844, cls).tx_types()
+
+    @classmethod
+    def precompiles(cls) -> List[Address]:
+        """At Cancun, a precompile for kzg point evaluation is introduced."""
+        return [
+            Address(10, label="KZG_POINT_EVALUATION"),
+        ] + super(EIP4844, cls).precompiles()
+
+    @classmethod
+    def engine_new_payload_blob_hashes(cls) -> bool:
+        """From Cancun, payloads must have blob hashes."""
+        return True
+
+    @classmethod
+    def gas_costs(cls) -> GasCosts:
+        """On Cancun, the point evaluation precompile gas cost is set."""
+        return replace(
+            super(EIP4844, cls).gas_costs(),
+            PRECOMPILE_POINT_EVALUATION=50_000,
+        )
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """
+        Return a mapping of opcodes to their gas costs for Cancun.
+
+        Adds Cancun-specific opcodes: BLOBHASH, BLOBBASEFEE, TLOAD, TSTORE,
+        MCOPY.
+        """
+        gas_costs = cls.gas_costs()
+
+        # Get parent fork's opcode gas map
+        base_map = super(EIP4844, cls).opcode_gas_map()
+
+        # Add Cancun-specific opcodes
+        return {**base_map, Opcodes.BLOBHASH: gas_costs.VERY_LOW}
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Return list of Opcodes that are valid to work on this fork."""
+        return [Opcodes.BLOBHASH] + super(EIP4844, cls).valid_opcodes()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_5656.py b/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_5656.py
new file mode 100644
index 00000000000..3365f3c2296
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_5656.py
@@ -0,0 +1,40 @@
+"""
+EIP-5656: MCOPY - Memory copying instruction.
+
+An efficient EVM instruction for copying memory areas.
+
+https://eips.ethereum.org/EIPS/eip-5656
+"""
+
+from typing import Callable, Dict, List
+
+from execution_testing.vm import OpcodeBase, Opcodes
+
+from ....base_fork import BaseFork
+
+
+class EIP5656(BaseFork):
+    """EIP-5656 class."""
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """Add MCOPY opcode gas cost."""
+        gas_costs = cls.gas_costs()
+        memory_expansion_calculator = cls.memory_expansion_gas_calculator()
+        base_map = super(EIP5656, cls).opcode_gas_map()
+        return {
+            **base_map,
+            Opcodes.MCOPY: cls._with_memory_expansion(
+                cls._with_data_copy(gas_costs.VERY_LOW, gas_costs),
+                memory_expansion_calculator,
+            ),
+        }
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Add MCOPY to valid opcodes."""
+        return [
+            Opcodes.MCOPY,
+        ] + super(EIP5656, cls).valid_opcodes()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_6780.py b/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_6780.py
new file mode 100644
index 00000000000..83e159b17c6
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_6780.py
@@ -0,0 +1,16 @@
+"""
+EIP-6780: SELFDESTRUCT only in same transaction.
+
+SELFDESTRUCT will recover all funds to the target but not delete the account,
+except when called in the same transaction as creation.
+
+https://eips.ethereum.org/EIPS/eip-6780
+"""
+
+from ....base_fork import BaseFork
+
+
+class EIP6780(BaseFork):
+    """EIP-6780 class."""
+
+    pass
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_7516.py b/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_7516.py
new file mode 100644
index 00000000000..194e3e27852
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_7516.py
@@ -0,0 +1,40 @@
+"""
+EIP-7516: BLOBBASEFEE instruction.
+
+Instruction that returns the current data-blob base-fee.
+
+https://eips.ethereum.org/EIPS/eip-7516
+"""
+
+from typing import Callable, Dict, List
+
+from execution_testing.vm import OpcodeBase, Opcodes
+
+from ....base_fork import BaseFork
+
+
+class EIP7516(BaseFork):
+    """EIP-7516 class."""
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """Add BLOBBASEFEE opcode gas cost."""
+        gas_costs = cls.gas_costs()
+
+        # Get parent fork's opcode gas map
+        base_map = super(EIP7516, cls).opcode_gas_map()
+
+        # Add Cancun-specific opcodes
+        return {
+            **base_map,
+            Opcodes.BLOBBASEFEE: gas_costs.BASE,
+        }
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Add BLOBBASEFEE to valid opcodes."""
+        return [
+            Opcodes.BLOBBASEFEE,
+        ] + super(EIP7516, cls).valid_opcodes()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/constantinople/__init__.py b/packages/testing/src/execution_testing/forks/forks/eips/constantinople/__init__.py
new file mode 100644
index 00000000000..d49a1167aa1
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/constantinople/__init__.py
@@ -0,0 +1 @@
+"""Listings of all EIPs for Constantinople fork."""
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/constantinople/eip_1014.py b/packages/testing/src/execution_testing/forks/forks/eips/constantinople/eip_1014.py
new file mode 100644
index 00000000000..fdf6d5e5be4
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/constantinople/eip_1014.py
@@ -0,0 +1,61 @@
+"""
+EIP-1014: Skinny CREATE2.
+
+Add a new CREATE2 opcode that uses keccak256 for address derivation.
+
+https://eips.ethereum.org/EIPS/eip-1014
+"""
+
+from typing import Callable, Dict, List
+
+from execution_testing.vm import OpcodeBase, Opcodes
+
+from ....base_fork import BaseFork
+from ....gas_costs import GasCosts
+
+
+class EIP1014(BaseFork):
+    """EIP-1014 class."""
+
+    @classmethod
+    def _calculate_create2_gas(
+        cls, opcode: OpcodeBase, gas_costs: GasCosts
+    ) -> int:
+        """Calculate CREATE2 gas cost based on metadata."""
+        metadata = opcode.metadata
+
+        init_code_size = metadata["init_code_size"]
+        init_code_words = (init_code_size + 31) // 32
+        hash_gas = gas_costs.OPCODE_KECCAK256_PER_WORD * init_code_words
+
+        return gas_costs.OPCODE_CREATE_BASE + hash_gas
+
+    @classmethod
+    def create_opcodes(cls) -> List[Opcodes]:
+        """Add CREATE2 opcode."""
+        return [
+            Opcodes.CREATE2,
+        ] + super(EIP1014, cls).create_opcodes()
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """Add CREATE2 opcode gas cost."""
+        gas_costs = cls.gas_costs()
+        memory_expansion_calculator = cls.memory_expansion_gas_calculator()
+        base_map = super(EIP1014, cls).opcode_gas_map()
+        return {
+            **base_map,
+            Opcodes.CREATE2: cls._with_memory_expansion(
+                lambda op: cls._calculate_create2_gas(op, gas_costs),
+                memory_expansion_calculator,
+            ),
+        }
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Add CREATE2 to valid opcodes."""
+        return [
+            Opcodes.CREATE2,
+        ] + super(EIP1014, cls).valid_opcodes()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/constantinople/eip_1052.py b/packages/testing/src/execution_testing/forks/forks/eips/constantinople/eip_1052.py
new file mode 100644
index 00000000000..5845bf12c99
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/constantinople/eip_1052.py
@@ -0,0 +1,37 @@
+"""
+EIP-1052: EXTCODEHASH opcode.
+
+Provide a new opcode that returns the keccak256 hash of a contract's
+code.
+
+https://eips.ethereum.org/EIPS/eip-1052
+"""
+
+from typing import Callable, Dict, List
+
+from execution_testing.vm import OpcodeBase, Opcodes
+
+from ....base_fork import BaseFork
+
+
+class EIP1052(BaseFork):
+    """EIP-1052 class."""
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """Add EXTCODEHASH opcode gas cost."""
+        gas_costs = cls.gas_costs()
+        base_map = super(EIP1052, cls).opcode_gas_map()
+        return {
+            **base_map,
+            Opcodes.EXTCODEHASH: cls._with_account_access(0, gas_costs),
+        }
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Add EXTCODEHASH to valid opcodes."""
+        return [
+            Opcodes.EXTCODEHASH,
+        ] + super(EIP1052, cls).valid_opcodes()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/constantinople/eip_1234.py b/packages/testing/src/execution_testing/forks/forks/eips/constantinople/eip_1234.py
new file mode 100644
index 00000000000..c4473d1d9dd
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/constantinople/eip_1234.py
@@ -0,0 +1,18 @@
+"""
+EIP-1234: Constantinople difficulty bomb delay and block reward adjustment.
+
+Delay the difficulty bomb and reduce the block reward to 2 ETH.
+
+https://eips.ethereum.org/EIPS/eip-1234
+"""
+
+from ....base_fork import BaseFork
+
+
+class EIP1234(BaseFork):
+    """EIP-1234 class."""
+
+    @classmethod
+    def get_reward(cls) -> int:
+        """Block reward is reduced to 2 ETH."""
+        return 2_000_000_000_000_000_000
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/constantinople/eip_145.py b/packages/testing/src/execution_testing/forks/forks/eips/constantinople/eip_145.py
new file mode 100644
index 00000000000..6a1b1cd854a
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/constantinople/eip_145.py
@@ -0,0 +1,40 @@
+"""
+EIP-145: Bitwise shifting instructions in EVM.
+
+Add SHL, SHR, and SAR instructions to the EVM.
+
+https://eips.ethereum.org/EIPS/eip-145
+"""
+
+from typing import Callable, Dict, List
+
+from execution_testing.vm import OpcodeBase, Opcodes
+
+from ....base_fork import BaseFork
+
+
+class EIP145(BaseFork):
+    """EIP-145 class."""
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """Add SHL, SHR, and SAR opcode gas costs."""
+        gas_costs = cls.gas_costs()
+        base_map = super(EIP145, cls).opcode_gas_map()
+        return {
+            **base_map,
+            Opcodes.SHL: gas_costs.VERY_LOW,
+            Opcodes.SHR: gas_costs.VERY_LOW,
+            Opcodes.SAR: gas_costs.VERY_LOW,
+        }
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Add SHL, SHR, and SAR to valid opcodes."""
+        return [
+            Opcodes.SHL,
+            Opcodes.SHR,
+            Opcodes.SAR,
+        ] + super(EIP145, cls).valid_opcodes()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/homestead/__init__.py b/packages/testing/src/execution_testing/forks/forks/eips/homestead/__init__.py
new file mode 100644
index 00000000000..d7747aebca2
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/homestead/__init__.py
@@ -0,0 +1 @@
+"""Listings of all EIPs for Homestead fork."""
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/homestead/eip_2.py b/packages/testing/src/execution_testing/forks/forks/eips/homestead/eip_2.py
new file mode 100644
index 00000000000..811094f0a98
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/homestead/eip_2.py
@@ -0,0 +1,49 @@
+"""
+EIP-2: Homestead Hard-fork Changes.
+
+https://eips.ethereum.org/EIPS/eip-2
+"""
+
+from typing import List, Sized
+
+from execution_testing.base_types import AccessList
+from execution_testing.base_types.conversions import BytesConvertible
+
+from ....base_fork import BaseFork, TransactionIntrinsicCostCalculator
+
+
+class EIP2(BaseFork):
+    """EIP-2 class."""
+
+    @classmethod
+    def transaction_intrinsic_cost_calculator(
+        cls,
+    ) -> TransactionIntrinsicCostCalculator:
+        """
+        The transaction intrinsic cost needs to take contract creation into
+        account.
+        """
+        super_fn = super(EIP2, cls).transaction_intrinsic_cost_calculator()
+        gas_costs = cls.gas_costs()
+
+        def fn(
+            *,
+            calldata: BytesConvertible = b"",
+            contract_creation: bool = False,
+            access_list: List[AccessList] | None = None,
+            authorization_list_or_count: Sized | int | None = None,
+            return_cost_deducted_prior_execution: bool = False,
+        ) -> int:
+            del return_cost_deducted_prior_execution
+
+            intrinsic_cost: int = super_fn(
+                calldata=calldata,
+                contract_creation=contract_creation,
+                access_list=access_list,
+                authorization_list_or_count=authorization_list_or_count,
+            )
+            if contract_creation:
+                intrinsic_cost += gas_costs.TX_CREATE
+            return intrinsic_cost
+
+        return fn
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/homestead/eip_7.py b/packages/testing/src/execution_testing/forks/forks/eips/homestead/eip_7.py
new file mode 100644
index 00000000000..3008b67d419
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/homestead/eip_7.py
@@ -0,0 +1,46 @@
+"""
+EIP-7: DELEGATECALL.
+
+A new opcode that is similar to CALLCODE but propagates the sender and
+value from the parent scope.
+
+https://eips.ethereum.org/EIPS/eip-7
+"""
+
+from typing import Callable, Dict, List
+
+from execution_testing.vm import OpcodeBase, Opcodes
+
+from ....base_fork import BaseFork
+
+
+class EIP7(BaseFork):
+    """EIP-7 class."""
+
+    @classmethod
+    def call_opcodes(cls) -> List[Opcodes]:
+        """Add DELEGATECALL opcode."""
+        return [Opcodes.DELEGATECALL] + super(EIP7, cls).call_opcodes()
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """Add DELEGATECALL opcode gas cost."""
+        gas_costs = cls.gas_costs()
+        memory_expansion_calculator = cls.memory_expansion_gas_calculator()
+        base_map = super(EIP7, cls).opcode_gas_map()
+        return {
+            **base_map,
+            Opcodes.DELEGATECALL: cls._with_memory_expansion(
+                lambda op: cls._calculate_call_gas(op, gas_costs),
+                memory_expansion_calculator,
+            ),
+        }
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Add DELEGATECALL to valid opcodes."""
+        return [
+            Opcodes.DELEGATECALL,
+        ] + super(EIP7, cls).valid_opcodes()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/istanbul/__init__.py b/packages/testing/src/execution_testing/forks/forks/eips/istanbul/__init__.py
new file mode 100644
index 00000000000..d58c86d9d1b
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/istanbul/__init__.py
@@ -0,0 +1 @@
+"""Listings of all EIPs for Istanbul fork."""
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_1108.py b/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_1108.py
new file mode 100644
index 00000000000..512a2c2c44f
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_1108.py
@@ -0,0 +1,25 @@
+"""
+EIP-1108: Reduce alt_bn128 precompile gas costs.
+
+https://eips.ethereum.org/EIPS/eip-1108
+"""
+
+from dataclasses import replace
+
+from ....base_fork import BaseFork
+from ....gas_costs import GasCosts
+
+
+class EIP1108(BaseFork):
+    """EIP-1108 class."""
+
+    @classmethod
+    def gas_costs(cls) -> GasCosts:
+        """Reduce BN254 precompile gas costs."""
+        return replace(
+            super(EIP1108, cls).gas_costs(),
+            PRECOMPILE_ECADD=150,
+            PRECOMPILE_ECMUL=6000,
+            PRECOMPILE_ECPAIRING_BASE=45_000,
+            PRECOMPILE_ECPAIRING_PER_POINT=34_000,
+        )
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_1344.py b/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_1344.py
new file mode 100644
index 00000000000..207aae46994
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_1344.py
@@ -0,0 +1,32 @@
+"""
+EIP-1344: ChainID opcode.
+
+Add a new opcode that returns the current chain's EIP-155 unique
+identifier.
+
+https://eips.ethereum.org/EIPS/eip-1344
+"""
+
+from typing import Callable, Dict, List
+
+from execution_testing.vm import OpcodeBase, Opcodes
+
+from ....base_fork import BaseFork
+
+
+class EIP1344(BaseFork):
+    """EIP-1344 class."""
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """Add CHAINID opcode gas cost."""
+        gas_costs = cls.gas_costs()
+        base_map = super(EIP1344, cls).opcode_gas_map()
+        return {**base_map, Opcodes.CHAINID: gas_costs.BASE}
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Add CHAINID to valid opcodes."""
+        return [Opcodes.CHAINID] + super(EIP1344, cls).valid_opcodes()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_152.py b/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_152.py
new file mode 100644
index 00000000000..e8451f88fdf
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_152.py
@@ -0,0 +1,32 @@
+"""
+EIP-152: Add BLAKE2 compression function F precompile.
+
+https://eips.ethereum.org/EIPS/eip-152
+"""
+
+from dataclasses import replace
+from typing import List
+
+from execution_testing.base_types import Address
+
+from ....base_fork import BaseFork
+from ....gas_costs import GasCosts
+
+
+class EIP152(BaseFork):
+    """EIP-152 class."""
+
+    @classmethod
+    def precompiles(cls) -> List[Address]:
+        """Add BLAKE2 compression function precompile."""
+        return [
+            Address(9, label="BLAKE2F"),
+        ] + super(EIP152, cls).precompiles()
+
+    @classmethod
+    def gas_costs(cls) -> GasCosts:
+        """Set BLAKE2F per-round gas cost."""
+        return replace(
+            super(EIP152, cls).gas_costs(),
+            PRECOMPILE_BLAKE2F_PER_ROUND=1,
+        )
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_1884.py b/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_1884.py
new file mode 100644
index 00000000000..b79a3c1e4fa
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_1884.py
@@ -0,0 +1,33 @@
+"""
+EIP-1884: Repricing for trie-size-dependent opcodes.
+
+Introduces SELFBALANCE opcode.
+
+https://eips.ethereum.org/EIPS/eip-1884
+"""
+
+from typing import Callable, Dict, List
+
+from execution_testing.vm import OpcodeBase, Opcodes
+
+from ....base_fork import BaseFork
+
+
+class EIP1884(BaseFork):
+    """EIP-1884 class."""
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """Add SELFBALANCE opcode gas cost."""
+        gas_costs = cls.gas_costs()
+        base_map = super(EIP1884, cls).opcode_gas_map()
+        return {**base_map, Opcodes.SELFBALANCE: gas_costs.LOW}
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Add SELFBALANCE to valid opcodes."""
+        return [
+            Opcodes.SELFBALANCE,
+        ] + super(EIP1884, cls).valid_opcodes()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_2028.py b/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_2028.py
new file mode 100644
index 00000000000..ca6fed863ed
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_2028.py
@@ -0,0 +1,24 @@
+"""
+EIP-2028: Transaction data gas cost reduction.
+
+Reduce the gas cost of non-zero transaction data bytes to 16.
+
+https://eips.ethereum.org/EIPS/eip-2028
+"""
+
+from dataclasses import replace
+
+from ....base_fork import BaseFork
+from ....gas_costs import GasCosts
+
+
+class EIP2028(BaseFork):
+    """EIP-2028 class."""
+
+    @classmethod
+    def gas_costs(cls) -> GasCosts:
+        """Reduce non-zero calldata byte gas cost to 16."""
+        return replace(
+            super(EIP2028, cls).gas_costs(),
+            TX_DATA_PER_NON_ZERO=16,
+        )
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/london/__init__.py b/packages/testing/src/execution_testing/forks/forks/eips/london/__init__.py
new file mode 100644
index 00000000000..7b2d7e3e28b
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/london/__init__.py
@@ -0,0 +1 @@
+"""Listings of all EIPs for London fork."""
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/london/eip_1559.py b/packages/testing/src/execution_testing/forks/forks/eips/london/eip_1559.py
new file mode 100644
index 00000000000..4bfd4bf5809
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/london/eip_1559.py
@@ -0,0 +1,171 @@
+"""
+EIP-1559: Fee market change for ETH 1.0 chain.
+
+A transaction pricing mechanism that includes fixed-per-block network fee
+that is burned and dynamically expands/contracts block sizes to deal with
+transient congestion.
+
+https://eips.ethereum.org/EIPS/eip-1559
+"""
+
+from typing import List
+
+from ....base_fork import (
+    BaseFeeChangeCalculator,
+    BaseFeePerGasCalculator,
+    BaseFork,
+)
+
+
+class EIP1559(BaseFork):
+    """EIP-1559 class."""
+
+    @classmethod
+    def header_base_fee_required(cls) -> bool:
+        """Header must contain the base fee."""
+        return True
+
+    @classmethod
+    def tx_types(cls) -> List[int]:
+        """Dynamic fee transactions are introduced."""
+        return [2] + super(EIP1559, cls).tx_types()
+
+    @classmethod
+    def contract_creating_tx_types(cls) -> List[int]:
+        """Dynamic fee transactions can create contracts."""
+        return [2] + super(EIP1559, cls).contract_creating_tx_types()
+
+    @classmethod
+    def base_fee_max_change_denominator(cls) -> int:
+        """Return the base fee max change denominator."""
+        return 8
+
+    @classmethod
+    def base_fee_elasticity_multiplier(cls) -> int:
+        """Return the base fee elasticity multiplier."""
+        return 2
+
+    @classmethod
+    def base_fee_per_gas_calculator(cls) -> BaseFeePerGasCalculator:
+        """
+        Return a callable that calculates the base fee per gas.
+
+        EIP-1559 block validation pseudo code:
+
+        if INITIAL_FORK_BLOCK_NUMBER == block.number:
+            expected_base_fee_per_gas = INITIAL_BASE_FEE
+        elif parent_gas_used == parent_gas_target:
+            expected_base_fee_per_gas = parent_base_fee_per_gas
+        elif parent_gas_used > parent_gas_target:
+            gas_used_delta = parent_gas_used - parent_gas_target
+            base_fee_per_gas_delta = max( parent_base_fee_per_gas
+                                  * gas_used_delta // parent_gas_target //
+                                  BASE_FEE_MAX_CHANGE_DENOMINATOR, 1, )
+            expected_base_fee_per_gas = parent_base_fee_per_gas +
+                                       base_fee_per_gas_delta
+        else:
+            gas_used_delta = parent_gas_target - parent_gas_used
+            base_fee_per_gas_delta = (
+                              parent_base_fee_per_gas * gas_used_delta //
+                              parent_gas_target //
+                              BASE_FEE_MAX_CHANGE_DENOMINATOR
+                              )
+            expected_base_fee_per_gas = parent_base_fee_per_gas -
+                                        base_fee_per_gas_delta
+        """
+        base_fee_max_change_denominator = cls.base_fee_max_change_denominator()
+        elasticity_multiplier = cls.base_fee_elasticity_multiplier()
+
+        def fn(
+            *,
+            parent_base_fee_per_gas: int,
+            parent_gas_used: int,
+            parent_gas_limit: int,
+        ) -> int:
+            parent_gas_target = parent_gas_limit // elasticity_multiplier
+            if parent_gas_used == parent_gas_target:
+                return parent_base_fee_per_gas
+            elif parent_gas_used > parent_gas_target:
+                gas_used_delta = parent_gas_used - parent_gas_target
+                base_fee_per_gas_delta = max(
+                    parent_base_fee_per_gas
+                    * gas_used_delta
+                    // parent_gas_target
+                    // base_fee_max_change_denominator,
+                    1,
+                )
+                return parent_base_fee_per_gas + base_fee_per_gas_delta
+            else:
+                gas_used_delta = parent_gas_target - parent_gas_used
+                base_fee_per_gas_delta = (
+                    parent_base_fee_per_gas
+                    * gas_used_delta
+                    // parent_gas_target
+                    // base_fee_max_change_denominator
+                )
+                return parent_base_fee_per_gas - base_fee_per_gas_delta
+
+        return fn
+
+    @classmethod
+    def base_fee_change_calculator(cls) -> BaseFeeChangeCalculator:
+        """
+        Return a callable that calculates the gas that needs to be used
+        to change the base fee.
+        """
+        base_fee_max_change_denominator = cls.base_fee_max_change_denominator()
+        elasticity_multiplier = cls.base_fee_elasticity_multiplier()
+        base_fee_per_gas_calculator = cls.base_fee_per_gas_calculator()
+
+        def fn(
+            *,
+            parent_base_fee_per_gas: int,
+            parent_gas_limit: int,
+            required_base_fee_per_gas: int,
+        ) -> int:
+            parent_gas_target = parent_gas_limit // elasticity_multiplier
+
+            if parent_base_fee_per_gas == required_base_fee_per_gas:
+                return parent_gas_target
+            elif required_base_fee_per_gas > parent_base_fee_per_gas:
+                base_fee_per_gas_delta = (
+                    required_base_fee_per_gas - parent_base_fee_per_gas
+                )
+                parent_gas_used = (
+                    (
+                        base_fee_per_gas_delta
+                        * base_fee_max_change_denominator
+                        * parent_gas_target
+                    )
+                    // parent_base_fee_per_gas
+                ) + parent_gas_target
+            elif required_base_fee_per_gas < parent_base_fee_per_gas:
+                base_fee_per_gas_delta = (
+                    parent_base_fee_per_gas - required_base_fee_per_gas
+                )
+
+                parent_gas_used = (
+                    parent_gas_target
+                    - (
+                        (
+                            base_fee_per_gas_delta
+                            * base_fee_max_change_denominator
+                            * parent_gas_target
+                        )
+                        // parent_base_fee_per_gas
+                    )
+                    - 1
+                )
+
+            assert (
+                base_fee_per_gas_calculator(
+                    parent_base_fee_per_gas=parent_base_fee_per_gas,
+                    parent_gas_used=parent_gas_used,
+                    parent_gas_limit=parent_gas_limit,
+                )
+                == required_base_fee_per_gas
+            )
+
+            return parent_gas_used
+
+        return fn
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/london/eip_3198.py b/packages/testing/src/execution_testing/forks/forks/eips/london/eip_3198.py
new file mode 100644
index 00000000000..df8e3f1373d
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/london/eip_3198.py
@@ -0,0 +1,32 @@
+"""
+EIP-3198: BASEFEE opcode.
+
+Add an opcode that returns the value of the base fee of the current
+block.
+
+https://eips.ethereum.org/EIPS/eip-3198
+"""
+
+from typing import Callable, Dict, List
+
+from execution_testing.vm import OpcodeBase, Opcodes
+
+from ....base_fork import BaseFork
+
+
+class EIP3198(BaseFork):
+    """EIP-3198 class."""
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """Add BASEFEE opcode gas cost."""
+        gas_costs = cls.gas_costs()
+        base_map = super(EIP3198, cls).opcode_gas_map()
+        return {**base_map, Opcodes.BASEFEE: gas_costs.BASE}
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Add BASEFEE to valid opcodes."""
+        return [Opcodes.BASEFEE] + super(EIP3198, cls).valid_opcodes()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/london/eip_3529.py b/packages/testing/src/execution_testing/forks/forks/eips/london/eip_3529.py
new file mode 100644
index 00000000000..beb12140d94
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/london/eip_3529.py
@@ -0,0 +1,18 @@
+"""
+EIP-3529: Reduction in refunds.
+
+Remove gas refunds for SELFDESTRUCT and reduce refunds for SSTORE.
+
+https://eips.ethereum.org/EIPS/eip-3529
+"""
+
+from ....base_fork import BaseFork
+
+
+class EIP3529(BaseFork):
+    """EIP-3529 class."""
+
+    @classmethod
+    def max_refund_quotient(cls) -> int:
+        """Max refund quotient is increased to 5 (reducing refunds)."""
+        return 5
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/osaka/__init__.py b/packages/testing/src/execution_testing/forks/forks/eips/osaka/__init__.py
new file mode 100644
index 00000000000..963ef55d3f6
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/osaka/__init__.py
@@ -0,0 +1 @@
+"""Listings of all EIPs for Osaka fork."""
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7594.py b/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7594.py
new file mode 100644
index 00000000000..2c6a5e03216
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7594.py
@@ -0,0 +1,26 @@
+"""
+EIP-7594: PeerDAS - Peer Data Availability Sampling.
+
+Introducing simple DAS utilizing gossip distribution and peer requests.
+
+https://eips.ethereum.org/EIPS/eip-7594
+"""
+
+from ....base_fork import BaseFork
+
+
+class EIP7594(
+    BaseFork,
+    engine_get_payload_version_bump=True,
+    engine_get_blobs_version_bump=True,
+    update_blob_constants={
+        "AMOUNT_CELL_PROOFS": 128,
+        "MAX_BLOBS_PER_TX": 6,
+    },
+):
+    """EIP-7594 class."""
+
+    @classmethod
+    def full_blob_tx_wrapper_version(cls) -> int | None:
+        """Full blob transaction wrapper version is defined."""
+        return 1
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7825.py b/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7825.py
new file mode 100644
index 00000000000..e36ce4b459d
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7825.py
@@ -0,0 +1,19 @@
+"""
+EIP-7825: Transaction gas limit cap.
+
+Introduce a protocol-level cap on the maximum gas used by a transaction to
+16,777,216 (2^24).
+
+https://eips.ethereum.org/EIPS/eip-7825
+"""
+
+from ....base_fork import BaseFork
+
+
+class EIP7825(BaseFork):
+    """EIP-7825 class."""
+
+    @classmethod
+    def transaction_gas_limit_cap(cls) -> int | None:
+        """Transaction gas limit is capped at 16 million (2**24)."""
+        return 16_777_216
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7918.py b/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7918.py
new file mode 100644
index 00000000000..192788a881f
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7918.py
@@ -0,0 +1,87 @@
+"""
+EIP-7918: Blob base fee bounded by execution cost.
+
+Imposes that the price of GAS_PER_BLOB blob gas is greater than the price
+of BLOB_BASE_COST execution gas.
+
+https://eips.ethereum.org/EIPS/eip-7918
+"""
+
+from ....base_fork import BaseFork, ExcessBlobGasCalculator
+
+
+class EIP7918(
+    BaseFork,
+    update_blob_constants={
+        "BLOB_BASE_COST": 2**13,
+    },
+):
+    """EIP-7918 class."""
+
+    @classmethod
+    def excess_blob_gas_calculator(cls) -> ExcessBlobGasCalculator:
+        """
+        Return a callable that calculates the excess blob gas for a block.
+        """
+        target_blobs_per_block = cls.target_blobs_per_block()
+        blob_gas_per_blob = cls.blob_gas_per_blob()
+        blob_target_gas_per_block = target_blobs_per_block * blob_gas_per_blob
+        max_blobs_per_block = cls.max_blobs_per_block()
+        blob_base_cost = cls.blob_base_cost()
+
+        def fn(
+            *,
+            parent_excess_blob_gas: int | None = None,
+            parent_excess_blobs: int | None = None,
+            parent_blob_gas_used: int | None = None,
+            parent_blob_count: int | None = None,
+            parent_base_fee_per_gas: int,
+        ) -> int:
+            if parent_excess_blob_gas is None:
+                assert parent_excess_blobs is not None, (
+                    "Parent excess blobs are required"
+                )
+                parent_excess_blob_gas = (
+                    parent_excess_blobs * blob_gas_per_blob
+                )
+            if parent_blob_gas_used is None:
+                assert parent_blob_count is not None, (
+                    "Parent blob count is required"
+                )
+                parent_blob_gas_used = parent_blob_count * blob_gas_per_blob
+            if (
+                parent_excess_blob_gas + parent_blob_gas_used
+                < blob_target_gas_per_block
+            ):
+                return 0
+
+            # EIP-7918: Apply reserve price when execution costs dominate
+            # blob costs
+            current_blob_base_fee = cls.blob_gas_price_calculator()(
+                excess_blob_gas=parent_excess_blob_gas
+            )
+            reserve_price_active = (
+                blob_base_cost * parent_base_fee_per_gas
+                > blob_gas_per_blob * current_blob_base_fee
+            )
+            if reserve_price_active:
+                blob_excess_adjustment = (
+                    parent_blob_gas_used
+                    * (max_blobs_per_block - target_blobs_per_block)
+                    // max_blobs_per_block
+                )
+                return parent_excess_blob_gas + blob_excess_adjustment
+
+            # Original EIP-4844 calculation
+            return (
+                parent_excess_blob_gas
+                + parent_blob_gas_used
+                - blob_target_gas_per_block
+            )
+
+        return fn
+
+    @classmethod
+    def blob_reserve_price_active(cls) -> bool:
+        """Blob reserve price is supported."""
+        return True
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7934.py b/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7934.py
new file mode 100644
index 00000000000..ad3bbde62e3
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7934.py
@@ -0,0 +1,21 @@
+"""
+EIP-7934: RLP encoded block size limit.
+
+Introduce a protocol-level cap on the maximum RLP-encoded block size to 10 MiB,
+including a 2 MiB margin for beacon block size.
+
+https://eips.ethereum.org/EIPS/eip-7934
+"""
+
+from ....base_fork import BaseFork
+
+
+class EIP7934(BaseFork):
+    """EIP-7934 class."""
+
+    @classmethod
+    def block_rlp_size_limit(cls) -> int | None:
+        """Block RLP size is limited."""
+        max_block_size = 10_485_760
+        safety_margin = 2_097_152
+        return max_block_size - safety_margin
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7939.py b/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7939.py
new file mode 100644
index 00000000000..c53935a4d4d
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7939.py
@@ -0,0 +1,36 @@
+"""
+EIP-7939: CLZ (Count Leading Zeros) EVM opcode.
+
+Opcode to count the number of leading zero bits in a 256-bit word.
+
+https://eips.ethereum.org/EIPS/eip-7939
+"""
+
+from typing import Callable, Dict, List
+
+from execution_testing.vm import OpcodeBase, Opcodes
+
+from ....base_fork import BaseFork
+
+
+class EIP7939(BaseFork):
+    """EIP-7939 class."""
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """Add CLZ opcode gas cost."""
+        gas_costs = cls.gas_costs()
+        base_map = super(EIP7939, cls).opcode_gas_map()
+        return {
+            **base_map,
+            Opcodes.CLZ: gas_costs.LOW,
+        }
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Add CLZ to valid opcodes."""
+        return [
+            Opcodes.CLZ,
+        ] + super(EIP7939, cls).valid_opcodes()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7951.py b/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7951.py
new file mode 100644
index 00000000000..e80674d2725
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7951.py
@@ -0,0 +1,39 @@
+"""
+EIP-7951: Precompile for secp256r1 curve support.
+
+Add precompiled contract for secp256r1 ECDSA signature verification with proper
+security checks.
+
+https://eips.ethereum.org/EIPS/eip-7951
+"""
+
+from dataclasses import replace
+from typing import List
+
+from execution_testing.base_types import Address
+
+from ....base_fork import BaseFork
+from ....gas_costs import GasCosts
+
+
+class EIP7951(BaseFork):
+    """EIP-7951 class."""
+
+    @classmethod
+    def precompiles(cls) -> List[Address]:
+        """
+        Add a precompile for P256 signature verification.
+
+        P256VERIFY = 0x100
+        """
+        return [
+            Address(0x100, label="P256VERIFY"),
+        ] + super(EIP7951, cls).precompiles()
+
+    @classmethod
+    def gas_costs(cls) -> GasCosts:
+        """Set the P256VERIFY precompile gas cost."""
+        return replace(
+            super(EIP7951, cls).gas_costs(),
+            PRECOMPILE_P256VERIFY=6_900,
+        )
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/paris/__init__.py b/packages/testing/src/execution_testing/forks/forks/eips/paris/__init__.py
new file mode 100644
index 00000000000..7f3611f0d3d
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/paris/__init__.py
@@ -0,0 +1 @@
+"""Listings of all EIPs for Paris fork."""
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/paris/eip_3675.py b/packages/testing/src/execution_testing/forks/forks/eips/paris/eip_3675.py
new file mode 100644
index 00000000000..e82350170ed
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/paris/eip_3675.py
@@ -0,0 +1,34 @@
+"""
+EIP-3675: Upgrade consensus to Proof-of-Stake.
+
+Deprecate Proof-of-Work and upgrade the consensus mechanism to
+Proof-of-Stake.
+
+https://eips.ethereum.org/EIPS/eip-3675
+"""
+
+from ....base_fork import BaseFork
+
+
+class EIP3675(
+    BaseFork,
+    engine_new_payload_version_bump=True,
+    engine_forkchoice_updated_version_bump=True,
+    engine_get_payload_version_bump=True,
+):
+    """EIP-3675 class."""
+
+    @classmethod
+    def header_prev_randao_required(cls) -> bool:
+        """Prev Randao is required."""
+        return True
+
+    @classmethod
+    def header_zero_difficulty_required(cls) -> bool:
+        """Zero difficulty is required."""
+        return True
+
+    @classmethod
+    def get_reward(cls) -> int:
+        """Block reward is removed."""
+        return 0
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/prague/__init__.py b/packages/testing/src/execution_testing/forks/forks/eips/prague/__init__.py
new file mode 100644
index 00000000000..1f35d8755ce
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/prague/__init__.py
@@ -0,0 +1 @@
+"""Listings of all EIPs for Prague fork."""
diff --git a/packages/testing/src/execution_testing/forks/forks/contracts/consolidation_request.bin b/packages/testing/src/execution_testing/forks/forks/eips/prague/contracts/consolidation_request.bin
similarity index 100%
rename from packages/testing/src/execution_testing/forks/forks/contracts/consolidation_request.bin
rename to packages/testing/src/execution_testing/forks/forks/eips/prague/contracts/consolidation_request.bin
diff --git a/packages/testing/src/execution_testing/forks/forks/contracts/deposit_contract.bin b/packages/testing/src/execution_testing/forks/forks/eips/prague/contracts/deposit_contract.bin
similarity index 100%
rename from packages/testing/src/execution_testing/forks/forks/contracts/deposit_contract.bin
rename to packages/testing/src/execution_testing/forks/forks/eips/prague/contracts/deposit_contract.bin
diff --git a/packages/testing/src/execution_testing/forks/forks/contracts/history_contract.bin b/packages/testing/src/execution_testing/forks/forks/eips/prague/contracts/history_contract.bin
similarity index 100%
rename from packages/testing/src/execution_testing/forks/forks/contracts/history_contract.bin
rename to packages/testing/src/execution_testing/forks/forks/eips/prague/contracts/history_contract.bin
diff --git a/packages/testing/src/execution_testing/forks/forks/contracts/withdrawal_request.bin b/packages/testing/src/execution_testing/forks/forks/eips/prague/contracts/withdrawal_request.bin
similarity index 100%
rename from packages/testing/src/execution_testing/forks/forks/contracts/withdrawal_request.bin
rename to packages/testing/src/execution_testing/forks/forks/eips/prague/contracts/withdrawal_request.bin
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_2537.py b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_2537.py
new file mode 100644
index 00000000000..d0cb4edc70b
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_2537.py
@@ -0,0 +1,58 @@
+"""
+EIP-2537: Precompile for BLS12-381 curve operations.
+
+Adds operations on BLS12-381 curve as precompiles in a set necessary to
+efficiently perform operations such as BLS signature verification.
+
+https://eips.ethereum.org/EIPS/eip-2537
+"""
+
+from dataclasses import replace
+from typing import List
+
+from execution_testing.base_types import Address
+
+from ....base_fork import BaseFork
+from ....gas_costs import GasCosts
+
+
+class EIP2537(BaseFork):
+    """EIP-2537 class."""
+
+    @classmethod
+    def precompiles(cls) -> List[Address]:
+        """
+        Add precompiles for BLS12-381 curve operations.
+
+        BLS12_G1ADD = 0x0B
+        BLS12_G1MSM = 0x0C
+        BLS12_G2ADD = 0x0D
+        BLS12_G2MSM = 0x0E
+        BLS12_PAIRING_CHECK = 0x0F
+        BLS12_MAP_FP_TO_G1 = 0x10
+        BLS12_MAP_FP2_TO_G2 = 0x11
+        """
+        return [
+            Address(11, label="BLS12_G1ADD"),
+            Address(12, label="BLS12_G1MSM"),
+            Address(13, label="BLS12_G2ADD"),
+            Address(14, label="BLS12_G2MSM"),
+            Address(15, label="BLS12_PAIRING_CHECK"),
+            Address(16, label="BLS12_MAP_FP_TO_G1"),
+            Address(17, label="BLS12_MAP_FP2_TO_G2"),
+        ] + super(EIP2537, cls).precompiles()
+
+    @classmethod
+    def gas_costs(cls) -> GasCosts:
+        """Add gas costs for BLS12-381 precompiles."""
+        return replace(
+            super(EIP2537, cls).gas_costs(),
+            PRECOMPILE_BLS_G1ADD=375,
+            PRECOMPILE_BLS_G1MUL=12_000,
+            PRECOMPILE_BLS_G1MAP=5_500,
+            PRECOMPILE_BLS_G2ADD=600,
+            PRECOMPILE_BLS_G2MUL=22_500,
+            PRECOMPILE_BLS_G2MAP=23_800,
+            PRECOMPILE_BLS_PAIRING_BASE=37_700,
+            PRECOMPILE_BLS_PAIRING_PER_PAIR=32_600,
+        )
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_2935.py b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_2935.py
new file mode 100644
index 00000000000..e9c996fff24
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_2935.py
@@ -0,0 +1,46 @@
+"""
+EIP-2935: Serve historical block hashes from state.
+
+Store and serve last 8191 block hashes as storage slots of a system contract
+to allow for stateless execution.
+
+https://eips.ethereum.org/EIPS/eip-2935
+"""
+
+from os.path import realpath
+from pathlib import Path
+from typing import List, Mapping
+
+from execution_testing.base_types import Address
+
+from ....base_fork import BaseFork
+
+BYTECODE_FILE = (
+    Path(realpath(__file__)).parent / "contracts" / "history_contract.bin"
+)
+HISTORY_STORAGE_ADDRESS = 0x0000F90827F1C53A10CB7A02335B175320002935
+HISTORY_STORAGE_BYTECODE = BYTECODE_FILE.read_bytes()
+
+
+class EIP2935(BaseFork):
+    """EIP-2935 class."""
+
+    @classmethod
+    def system_contracts(cls) -> List[Address]:
+        """Add the history storage contract."""
+        return [
+            Address(
+                HISTORY_STORAGE_ADDRESS,
+                label="HISTORY_STORAGE_ADDRESS",
+            ),
+        ] + super(EIP2935, cls).system_contracts()
+
+    @classmethod
+    def pre_allocation_blockchain(cls) -> Mapping:
+        """Pre-allocate the history storage contract."""
+        return {
+            HISTORY_STORAGE_ADDRESS: {
+                "nonce": 1,
+                "code": HISTORY_STORAGE_BYTECODE,
+            }
+        } | super(EIP2935, cls).pre_allocation_blockchain()  # type: ignore
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_6110.py b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_6110.py
new file mode 100644
index 00000000000..e84a0ac2b1a
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_6110.py
@@ -0,0 +1,58 @@
+"""
+EIP-6110: Supply validator deposits on chain.
+
+Provides validator deposits as a list of deposit operations added to the
+Execution Layer block.
+
+https://eips.ethereum.org/EIPS/eip-6110
+"""
+
+from hashlib import sha256
+from os.path import realpath
+from pathlib import Path
+from typing import List, Mapping
+
+from execution_testing.base_types import Address
+
+from ....base_fork import BaseFork
+
+BYTECODE_FILE = (
+    Path(realpath(__file__)).parent / "contracts" / "deposit_contract.bin"
+)
+DEPOSIT_CONTRACT_ADDRESS = 0x00000000219AB540356CBB839CBE05303D7705FA
+DEPOSIT_CONTRACT_BYTECODE = BYTECODE_FILE.read_bytes()
+
+
+class EIP6110(BaseFork):
+    """EIP-6110 class."""
+
+    @classmethod
+    def system_contracts(cls) -> List[Address]:
+        """Add the beacon chain deposit contract."""
+        return [
+            Address(
+                DEPOSIT_CONTRACT_ADDRESS,
+                label="DEPOSIT_CONTRACT_ADDRESS",
+            ),
+        ] + super(EIP6110, cls).system_contracts()
+
+    @classmethod
+    def pre_allocation_blockchain(cls) -> Mapping:
+        """Pre-allocate the beacon chain deposit contract."""
+        deposit_contract_tree_depth = 32
+        storage = {}
+        next_hash = sha256(b"\x00" * 64).digest()
+        for i in range(
+            deposit_contract_tree_depth + 2,
+            deposit_contract_tree_depth * 2 + 1,
+        ):
+            storage[i] = next_hash
+            next_hash = sha256(next_hash + next_hash).digest()
+
+        return {
+            DEPOSIT_CONTRACT_ADDRESS: {
+                "nonce": 1,
+                "code": DEPOSIT_CONTRACT_BYTECODE,
+                "storage": storage,
+            }
+        } | super(EIP6110, cls).pre_allocation_blockchain()  # type: ignore
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7002.py b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7002.py
new file mode 100644
index 00000000000..92118d50a1b
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7002.py
@@ -0,0 +1,48 @@
+"""
+EIP-7002: Execution layer triggerable withdrawals.
+
+Allow validators to trigger exits and partial withdrawals via their execution
+layer (0x01) withdrawal credentials.
+
+https://eips.ethereum.org/EIPS/eip-7002
+"""
+
+from os.path import realpath
+from pathlib import Path
+from typing import List, Mapping
+
+from execution_testing.base_types import Address
+
+from ....base_fork import BaseFork
+
+BYTECODE_FILE = (
+    Path(realpath(__file__)).parent / "contracts" / "withdrawal_request.bin"
+)
+WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS = (
+    0x00000961EF480EB55E80D19AD83579A64C007002
+)
+WITHDRAWAL_REQUEST_PREDEPLOY_BYTECODE = BYTECODE_FILE.read_bytes()
+
+
+class EIP7002(BaseFork):
+    """EIP-7002 class."""
+
+    @classmethod
+    def system_contracts(cls) -> List[Address]:
+        """Add the withdrawal request predeploy contract."""
+        return [
+            Address(
+                WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS,
+                label="WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS",
+            ),
+        ] + super(EIP7002, cls).system_contracts()
+
+    @classmethod
+    def pre_allocation_blockchain(cls) -> Mapping:
+        """Pre-allocate the withdrawal request contract."""
+        return {
+            WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS: {
+                "nonce": 1,
+                "code": WITHDRAWAL_REQUEST_PREDEPLOY_BYTECODE,
+            },
+        } | super(EIP7002, cls).pre_allocation_blockchain()  # type: ignore
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7251.py b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7251.py
new file mode 100644
index 00000000000..56605c5073c
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7251.py
@@ -0,0 +1,47 @@
+"""
+EIP-7251: Increase the MAX_EFFECTIVE_BALANCE.
+
+Allow validators to consolidate via execution layer requests.
+
+https://eips.ethereum.org/EIPS/eip-7251
+"""
+
+from os.path import realpath
+from pathlib import Path
+from typing import List, Mapping
+
+from execution_testing.base_types import Address
+
+from ....base_fork import BaseFork
+
+BYTECODE_FILE = (
+    Path(realpath(__file__)).parent / "contracts" / "consolidation_request.bin"
+)
+CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS = (
+    0x0000BBDDC7CE488642FB579F8B00F3A590007251
+)
+CONSOLIDATION_REQUEST_PREDEPLOY_BYTECODE = BYTECODE_FILE.read_bytes()
+
+
+class EIP7251(BaseFork):
+    """EIP-7251 class."""
+
+    @classmethod
+    def system_contracts(cls) -> List[Address]:
+        """Add the consolidation request predeploy contract."""
+        return [
+            Address(
+                CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS,
+                label="CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS",
+            ),
+        ] + super(EIP7251, cls).system_contracts()
+
+    @classmethod
+    def pre_allocation_blockchain(cls) -> Mapping:
+        """Pre-allocate the consolidation request contract."""
+        return {
+            CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS: {
+                "nonce": 1,
+                "code": CONSOLIDATION_REQUEST_PREDEPLOY_BYTECODE,
+            },
+        } | super(EIP7251, cls).pre_allocation_blockchain()  # type: ignore
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7623.py b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7623.py
new file mode 100644
index 00000000000..d52c5601a16
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7623.py
@@ -0,0 +1,115 @@
+"""
+EIP-7623: Increase calldata cost.
+
+Increase calldata cost to reduce maximum block size.
+
+https://eips.ethereum.org/EIPS/eip-7623
+"""
+
+from dataclasses import replace
+from typing import List, Sized
+
+from execution_testing.base_types import AccessList, Bytes
+from execution_testing.base_types.conversions import BytesConvertible
+
+from ....base_fork import (
+    BaseFork,
+    CalldataGasCalculator,
+    TransactionDataFloorCostCalculator,
+    TransactionIntrinsicCostCalculator,
+)
+from ....gas_costs import GasCosts
+
+
+class EIP7623(BaseFork):
+    """EIP-7623 class."""
+
+    @classmethod
+    def gas_costs(cls) -> GasCosts:
+        """Add standard and floor token costs for calldata."""
+        return replace(
+            super(EIP7623, cls).gas_costs(),
+            TX_DATA_TOKEN_STANDARD=4,
+            TX_DATA_TOKEN_FLOOR=10,
+        )
+
+    @classmethod
+    def calldata_gas_calculator(cls) -> CalldataGasCalculator:
+        """
+        Return a callable that calculates the transaction gas cost for its
+        calldata depending on its contents.
+        """
+        gas_costs = cls.gas_costs()
+
+        def fn(*, data: BytesConvertible, floor: bool = False) -> int:
+            raw = Bytes(data)
+            num_zeros = raw.count(0)
+            num_non_zeros = len(raw) - num_zeros
+            tokens = num_zeros + num_non_zeros * 4
+            if floor:
+                return tokens * gas_costs.TX_DATA_TOKEN_FLOOR
+            return tokens * gas_costs.TX_DATA_TOKEN_STANDARD
+
+        return fn
+
+    @classmethod
+    def transaction_data_floor_cost_calculator(
+        cls,
+    ) -> TransactionDataFloorCostCalculator:
+        """
+        Transaction data floor cost is introduced.
+        """
+        calldata_gas_calculator = cls.calldata_gas_calculator()
+        gas_costs = cls.gas_costs()
+
+        def fn(
+            *,
+            data: BytesConvertible,
+            access_list: List[AccessList] | None = None,
+        ) -> int:
+            del access_list
+            return (
+                calldata_gas_calculator(data=data, floor=True)
+                + gas_costs.TX_BASE
+            )
+
+        return fn
+
+    @classmethod
+    def transaction_intrinsic_cost_calculator(
+        cls,
+    ) -> TransactionIntrinsicCostCalculator:
+        """
+        Transaction intrinsic cost wraps the parent calculator with a floor
+        cost.
+        """
+        super_fn = super(EIP7623, cls).transaction_intrinsic_cost_calculator()
+        transaction_data_floor_cost_calculator = (
+            cls.transaction_data_floor_cost_calculator()
+        )
+
+        def fn(
+            *,
+            calldata: BytesConvertible = b"",
+            contract_creation: bool = False,
+            access_list: List[AccessList] | None = None,
+            authorization_list_or_count: Sized | int | None = None,
+            return_cost_deducted_prior_execution: bool = False,
+        ) -> int:
+            intrinsic_cost: int = super_fn(
+                calldata=calldata,
+                contract_creation=contract_creation,
+                access_list=access_list,
+                authorization_list_or_count=authorization_list_or_count,
+                return_cost_deducted_prior_execution=False,
+            )
+
+            if return_cost_deducted_prior_execution:
+                return intrinsic_cost
+
+            transaction_floor_data_cost = (
+                transaction_data_floor_cost_calculator(data=calldata)
+            )
+            return max(intrinsic_cost, transaction_floor_data_cost)
+
+        return fn
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7685.py b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7685.py
new file mode 100644
index 00000000000..97c3a4e23ea
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7685.py
@@ -0,0 +1,39 @@
+"""
+EIP-7685: General purpose execution layer requests.
+
+A general purpose bus for sharing EL triggered requests with the CL.
+
+https://eips.ethereum.org/EIPS/eip-7685
+"""
+
+from ....base_fork import BaseFork
+
+
+class EIP7685(
+    BaseFork,
+    engine_new_payload_version_bump=True,
+    engine_get_payload_version_bump=True,
+):
+    """EIP-7685 class."""
+
+    @classmethod
+    def max_request_type(cls) -> int:
+        """
+        Three request types are introduced: deposits, withdrawal requests,
+        and consolidation requests.
+        """
+        return 2
+
+    @classmethod
+    def header_requests_required(cls) -> bool:
+        """
+        Header must contain the beacon chain requests hash.
+        """
+        return True
+
+    @classmethod
+    def engine_new_payload_requests(cls) -> bool:
+        """
+        New payloads include the requests hash as a parameter.
+        """
+        return True
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7691.py b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7691.py
new file mode 100644
index 00000000000..babb9eb325e
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7691.py
@@ -0,0 +1,23 @@
+"""
+EIP-7691: Blob throughput increase.
+
+Increase the number of blobs to reach a new target and max of 6 and 9
+blobs per block respectively.
+
+https://eips.ethereum.org/EIPS/eip-7691
+"""
+
+from ....base_fork import BaseFork
+
+
+class EIP7691(
+    BaseFork,
+    update_blob_constants={
+        "MAX_BLOBS_PER_BLOCK": 9,
+        "TARGET_BLOBS_PER_BLOCK": 6,
+        "BLOB_BASE_FEE_UPDATE_FRACTION": 5007716,
+    },
+):
+    """EIP-7691 class."""
+
+    pass
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7702.py b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7702.py
new file mode 100644
index 00000000000..424c4ab2dab
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7702.py
@@ -0,0 +1,107 @@
+"""
+EIP-7702: Set EOA account code.
+
+Add a new tx type that permanently sets the code for an EOA.
+
+https://eips.ethereum.org/EIPS/eip-7702
+"""
+
+from dataclasses import replace
+from typing import List, Sized
+
+from execution_testing.base_types import AccessList
+from execution_testing.base_types.conversions import BytesConvertible
+from execution_testing.vm import OpcodeBase
+
+from ....base_fork import (
+    BaseFork,
+    RefundTypes,
+    TransactionIntrinsicCostCalculator,
+)
+from ....gas_costs import GasCosts
+
+
+class EIP7702(BaseFork):
+    """EIP-7702 class."""
+
+    @classmethod
+    def tx_types(cls) -> List[int]:
+        """Set-code type transactions are introduced."""
+        return [4] + super(EIP7702, cls).tx_types()
+
+    @classmethod
+    def gas_costs(cls) -> GasCosts:
+        """Add gas costs for authorization operations."""
+        return replace(
+            super(EIP7702, cls).gas_costs(),
+            AUTH_PER_EMPTY_ACCOUNT=25_000,
+            REFUND_AUTH_PER_EXISTING_ACCOUNT=12_500,
+        )
+
+    @classmethod
+    def _calculate_call_gas(
+        cls, opcode: OpcodeBase, gas_costs: GasCosts
+    ) -> int:
+        """
+        Call gas cost needs to take the authorization into account.
+        """
+        metadata = opcode.metadata
+
+        base_cost = super(EIP7702, cls)._calculate_call_gas(opcode, gas_costs)
+
+        if metadata["delegated_address"] or metadata["delegated_address_warm"]:
+            if metadata["delegated_address_warm"]:
+                base_cost += gas_costs.WARM_ACCESS
+            else:
+                base_cost += gas_costs.COLD_ACCOUNT_ACCESS
+
+        return base_cost
+
+    @classmethod
+    def transaction_intrinsic_cost_calculator(
+        cls,
+    ) -> TransactionIntrinsicCostCalculator:
+        """
+        Transaction intrinsic cost includes authorization list cost.
+        """
+        super_fn = super(EIP7702, cls).transaction_intrinsic_cost_calculator()
+        gas_costs = cls.gas_costs()
+
+        def fn(
+            *,
+            calldata: BytesConvertible = b"",
+            contract_creation: bool = False,
+            access_list: List[AccessList] | None = None,
+            authorization_list_or_count: Sized | int | None = None,
+            return_cost_deducted_prior_execution: bool = False,
+        ) -> int:
+            intrinsic_cost: int = super_fn(
+                calldata=calldata,
+                contract_creation=contract_creation,
+                access_list=access_list,
+                return_cost_deducted_prior_execution=(
+                    return_cost_deducted_prior_execution
+                ),
+            )
+            if authorization_list_or_count is not None:
+                if isinstance(authorization_list_or_count, Sized):
+                    authorization_list_or_count = len(
+                        authorization_list_or_count
+                    )
+                intrinsic_cost += (
+                    authorization_list_or_count
+                    * gas_costs.AUTH_PER_EMPTY_ACCOUNT
+                )
+
+            return intrinsic_cost
+
+        return fn
+
+    @classmethod
+    def refund_types(cls) -> List[RefundTypes]:
+        """
+        At Prague, existing authorization refund is introduced.
+        """
+        refunds = super(EIP7702, cls).refund_types()
+        refunds.append(RefundTypes.AUTHORIZATION_EXISTING_AUTHORITY)
+        return refunds
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/shanghai/__init__.py b/packages/testing/src/execution_testing/forks/forks/eips/shanghai/__init__.py
new file mode 100644
index 00000000000..65e3b09f6c8
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/shanghai/__init__.py
@@ -0,0 +1 @@
+"""Listings of all EIPs for Shanghai fork."""
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/shanghai/eip_3855.py b/packages/testing/src/execution_testing/forks/forks/eips/shanghai/eip_3855.py
new file mode 100644
index 00000000000..fd6586dfa71
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/shanghai/eip_3855.py
@@ -0,0 +1,35 @@
+"""
+EIP-3855: PUSH0 instruction.
+
+Introduce a new instruction which pushes the constant value 0 onto the
+stack.
+
+https://eips.ethereum.org/EIPS/eip-3855
+"""
+
+from typing import Callable, Dict, List
+
+from execution_testing.vm import OpcodeBase, Opcodes
+
+from ....base_fork import BaseFork
+
+
+class EIP3855(BaseFork):
+    """EIP-3855 class."""
+
+    @classmethod
+    def opcode_gas_map(
+        cls,
+    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
+        """Add PUSH0 opcode gas cost."""
+        gas_costs = cls.gas_costs()
+        base_map = super(EIP3855, cls).opcode_gas_map()
+        return {
+            **base_map,
+            Opcodes.PUSH0: gas_costs.BASE,
+        }
+
+    @classmethod
+    def valid_opcodes(cls) -> List[Opcodes]:
+        """Add PUSH0 to valid opcodes."""
+        return [Opcodes.PUSH0] + super(EIP3855, cls).valid_opcodes()
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/shanghai/eip_3860.py b/packages/testing/src/execution_testing/forks/forks/eips/shanghai/eip_3860.py
new file mode 100644
index 00000000000..128c162cc9d
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/shanghai/eip_3860.py
@@ -0,0 +1,60 @@
+"""
+EIP-3860: Limit and meter initcode.
+
+Limit the maximum size of initcode to 49152 and apply extra gas cost of 2 for
+every 32-byte chunk of initcode.
+
+https://eips.ethereum.org/EIPS/eip-3860
+"""
+
+from execution_testing.vm import OpcodeBase
+
+from ....base_fork import BaseFork
+from ....gas_costs import GasCosts
+
+
+class EIP3860(BaseFork):
+    """EIP-3860 class."""
+
+    @classmethod
+    def max_initcode_size(cls) -> int:
+        """Initcode size is limited."""
+        return 0xC000
+
+    @classmethod
+    def _calculate_create_gas(
+        cls, opcode: OpcodeBase, gas_costs: GasCosts
+    ) -> int:
+        """
+        Calculate CREATE gas cost including initcode cost.
+        """
+        metadata = opcode.metadata
+
+        base_cost = super(EIP3860, cls)._calculate_create_gas(
+            opcode, gas_costs
+        )
+
+        init_code_size = metadata["init_code_size"]
+        init_code_words = (init_code_size + 31) // 32
+        init_code_gas = gas_costs.CODE_INIT_PER_WORD * init_code_words
+
+        return base_cost + init_code_gas
+
+    @classmethod
+    def _calculate_create2_gas(
+        cls, opcode: OpcodeBase, gas_costs: GasCosts
+    ) -> int:
+        """
+        Calculate CREATE2 gas cost including initcode cost.
+        """
+        metadata = opcode.metadata
+
+        base_cost = super(EIP3860, cls)._calculate_create2_gas(
+            opcode, gas_costs
+        )
+
+        init_code_size = metadata["init_code_size"]
+        init_code_words = (init_code_size + 31) // 32
+        init_code_gas = gas_costs.CODE_INIT_PER_WORD * init_code_words
+
+        return base_cost + init_code_gas
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/shanghai/eip_4895.py b/packages/testing/src/execution_testing/forks/forks/eips/shanghai/eip_4895.py
new file mode 100644
index 00000000000..9577621e400
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/shanghai/eip_4895.py
@@ -0,0 +1,24 @@
+"""
+EIP-4895: Beacon chain push withdrawals as operations.
+
+Support validator withdrawals from the beacon chain to the EVM via a new
+"system-level" operation type.
+
+https://eips.ethereum.org/EIPS/eip-4895
+"""
+
+from ....base_fork import BaseFork
+
+
+class EIP4895(
+    BaseFork,
+    engine_new_payload_version_bump=True,
+    engine_forkchoice_updated_version_bump=True,
+    engine_get_payload_version_bump=True,
+):
+    """EIP-4895 class."""
+
+    @classmethod
+    def header_withdrawals_required(cls) -> bool:
+        """Withdrawals are required."""
+        return True
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/spurious_dragon/__init__.py b/packages/testing/src/execution_testing/forks/forks/eips/spurious_dragon/__init__.py
new file mode 100644
index 00000000000..79d5de50890
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/spurious_dragon/__init__.py
@@ -0,0 +1 @@
+"""Listings of all EIPs for Spurious Dragon fork."""
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/spurious_dragon/eip_155.py b/packages/testing/src/execution_testing/forks/forks/eips/spurious_dragon/eip_155.py
new file mode 100644
index 00000000000..e754e7a2fa8
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/spurious_dragon/eip_155.py
@@ -0,0 +1,18 @@
+"""
+EIP-155: Simple replay attack protection.
+
+https://eips.ethereum.org/EIPS/eip-155
+"""
+
+from ....base_fork import BaseFork
+
+
+class EIP155(BaseFork):
+    """EIP-155 class."""
+
+    @classmethod
+    def supports_protected_txs(cls) -> bool:
+        """
+        Enables support for protected transactions.
+        """
+        return True
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/spurious_dragon/eip_161.py b/packages/testing/src/execution_testing/forks/forks/eips/spurious_dragon/eip_161.py
new file mode 100644
index 00000000000..2806276fb3e
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/spurious_dragon/eip_161.py
@@ -0,0 +1,35 @@
+"""
+EIP-161: State trie clearing (invariant-preserving alternative).
+
+https://eips.ethereum.org/EIPS/eip-161
+"""
+
+from execution_testing.vm import OpcodeBase
+
+from ....base_fork import BaseFork, GasCosts
+
+
+class EIP161(BaseFork):
+    """EIP-161 class."""
+
+    @classmethod
+    def _calculate_call_gas(
+        cls, opcode: OpcodeBase, gas_costs: GasCosts
+    ) -> int:
+        """
+        The call gas cost needs to take the value transfer
+        and account new into account.
+        """
+        base_cost = super(EIP161, cls)._calculate_call_gas(opcode, gas_costs)
+
+        # Additional costs for value transfer, does not apply to STATICCALL
+        metadata = opcode.metadata
+        if "value_transfer" in metadata:
+            if metadata["value_transfer"]:
+                base_cost += gas_costs.CALL_VALUE
+                if metadata["account_new"]:
+                    base_cost += gas_costs.NEW_ACCOUNT
+            elif metadata["account_new"]:
+                raise ValueError("Account new requires value transfer")
+
+        return base_cost
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/spurious_dragon/eip_170.py b/packages/testing/src/execution_testing/forks/forks/eips/spurious_dragon/eip_170.py
new file mode 100644
index 00000000000..0a0f9ff24ae
--- /dev/null
+++ b/packages/testing/src/execution_testing/forks/forks/eips/spurious_dragon/eip_170.py
@@ -0,0 +1,16 @@
+"""
+EIP-170: Contract code size limit.
+
+https://eips.ethereum.org/EIPS/eip-170
+"""
+
+from ....base_fork import BaseFork
+
+
+class EIP170(BaseFork):
+    """EIP-170 class."""
+
+    @classmethod
+    def max_code_size(cls) -> int:
+        """Upper bound is introduced for max contract code size."""
+        return 0x6000
diff --git a/packages/testing/src/execution_testing/forks/forks/forks.py b/packages/testing/src/execution_testing/forks/forks/forks.py
index 58a7ad1022e..aa8904c71a7 100644
--- a/packages/testing/src/execution_testing/forks/forks/forks.py
+++ b/packages/testing/src/execution_testing/forks/forks/forks.py
@@ -3,15 +3,11 @@
 from __future__ import annotations
 
 from dataclasses import replace
-from hashlib import sha256
-from os.path import realpath
-from pathlib import Path
 from typing import (
     TYPE_CHECKING,
     Callable,
     Dict,
     List,
-    Literal,
     Mapping,
     Optional,
     Sized,
@@ -25,7 +21,6 @@
     Address,
     BlobSchedule,
     Bytes,
-    ForkBlobSchedule,
     ZeroPaddedHexNumber,
 )
 from execution_testing.base_types.conversions import BytesConvertible
@@ -43,29 +38,29 @@
     CalldataGasCalculator,
     ExcessBlobGasCalculator,
     MemoryExpansionGasCalculator,
+    RefundTypes,
     TransactionDataFloorCostCalculator,
     TransactionIntrinsicCostCalculator,
 )
-from ..gas_costs import GasCosts
-from .helpers import ceiling_division, fake_exponential
-
-CURRENT_FILE = Path(realpath(__file__))
-CURRENT_FOLDER = CURRENT_FILE.parent
+from ..gas_costs import BASE, HIGH, LOW, MID, VERY_LOW, GasCosts
+from . import eips
+from .eips.amsterdam import AmsterdamEIPs
+from .helpers import ceiling_division
 
 
 # All forks must be listed here !!! in the order they were introduced !!!
-class Frontier(BaseFork, solc_name="homestead"):
+class Frontier(
+    BaseFork,
+    solc_name="homestead",
+):
     """Frontier fork."""
 
     @classmethod
-    def transition_tool_name(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> str:
+    def transition_tool_name(cls) -> str:
         """
         Return fork name as it's meant to be passed to the transition tool for
         execution.
         """
-        del block_number, timestamp
         if cls._transition_tool_name is not None:
             return cls._transition_tool_name
         return cls.name()
@@ -78,129 +73,153 @@ def solc_name(cls) -> str:
         return cls.name().lower()
 
     @classmethod
-    def header_base_fee_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def header_base_fee_required(cls) -> bool:
         """At genesis, header must not contain base fee."""
-        del block_number, timestamp
         return False
 
     @classmethod
-    def header_prev_randao_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def header_prev_randao_required(cls) -> bool:
         """At genesis, header must not contain Prev Randao value."""
-        del block_number, timestamp
         return False
 
     @classmethod
-    def header_zero_difficulty_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def header_zero_difficulty_required(cls) -> bool:
         """At genesis, header must not have difficulty zero."""
-        del block_number, timestamp
         return False
 
     @classmethod
-    def header_withdrawals_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def header_withdrawals_required(cls) -> bool:
         """At genesis, header must not contain withdrawals."""
-        del block_number, timestamp
         return False
 
     @classmethod
-    def header_excess_blob_gas_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def header_excess_blob_gas_required(cls) -> bool:
         """At genesis, header must not contain excess blob gas."""
-        del block_number, timestamp
         return False
 
     @classmethod
-    def header_blob_gas_used_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def header_blob_gas_used_required(cls) -> bool:
         """At genesis, header must not contain blob gas used."""
-        del block_number, timestamp
         return False
 
     @classmethod
-    def gas_costs(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> GasCosts:
+    def gas_costs(cls) -> GasCosts:
         """
         Return dataclass with the defined gas costs constants for genesis.
         """
-        del block_number, timestamp
         return GasCosts(
-            GAS_JUMPDEST=1,
-            GAS_BASE=2,
-            GAS_VERY_LOW=3,
-            GAS_LOW=5,
-            GAS_MID=8,
-            GAS_HIGH=10,
-            GAS_WARM_ACCOUNT_ACCESS=100,
-            GAS_COLD_ACCOUNT_ACCESS=2_600,
-            GAS_TX_ACCESS_LIST_ADDRESS=2_400,
-            GAS_TX_ACCESS_LIST_STORAGE_KEY=1_900,
-            GAS_WARM_SLOAD=100,
-            GAS_COLD_SLOAD=2_100,
-            GAS_STORAGE_SET=20_000,
-            GAS_STORAGE_UPDATE=5_000,
-            GAS_STORAGE_RESET=2_900,
+            # Tiers
+            BASE=BASE,
+            VERY_LOW=VERY_LOW,
+            LOW=LOW,
+            MID=MID,
+            HIGH=HIGH,
+            # Access
+            WARM_ACCESS=100,
+            COLD_ACCOUNT_ACCESS=2_600,
+            WARM_SLOAD=100,
+            COLD_STORAGE_ACCESS=2_100,
+            # Storage
+            STORAGE_SET=20_000,
+            COLD_STORAGE_WRITE=5_000,
+            STORAGE_RESET=2_900,
+            # Call
+            CALL_VALUE=9_000,
+            CALL_STIPEND=2_300,
+            NEW_ACCOUNT=25_000,
+            # Contract Creation
+            CODE_DEPOSIT_PER_BYTE=200,
+            CODE_INIT_PER_WORD=2,
+            # Authorization
+            AUTH_PER_EMPTY_ACCOUNT=0,
+            # Utility
+            MEMORY_PER_WORD=3,
+            # Transactions
+            TX_BASE=21_000,
+            TX_ACCESS_LIST_ADDRESS=2_400,
+            TX_ACCESS_LIST_STORAGE_KEY=1_900,
+            TX_DATA_PER_ZERO=4,
+            TX_DATA_PER_NON_ZERO=68,
+            TX_CREATE=32_000,
+            # Refunds
             REFUND_STORAGE_CLEAR=4_800,
-            GAS_SELF_DESTRUCT=5_000,
-            GAS_CREATE=32_000,
-            GAS_CODE_DEPOSIT_PER_BYTE=200,
-            GAS_CODE_INIT_PER_WORD=2,
-            GAS_CALL_VALUE=9_000,
-            GAS_CALL_STIPEND=2_300,
-            GAS_NEW_ACCOUNT=25_000,
-            GAS_EXPONENTIATION=10,
-            GAS_EXPONENTIATION_PER_BYTE=50,
-            GAS_MEMORY=3,
-            GAS_TX_DATA_PER_ZERO=4,
-            GAS_TX_DATA_PER_NON_ZERO=68,
-            GAS_TX_BASE=21_000,
-            GAS_TX_CREATE=32_000,
-            GAS_LOG=375,
-            GAS_LOG_DATA_PER_BYTE=8,
-            GAS_LOG_TOPIC=375,
-            GAS_KECCAK256=30,
-            GAS_KECCAK256_PER_WORD=6,
-            GAS_COPY=3,
-            GAS_BLOCK_HASH=20,
-            GAS_PRECOMPILE_ECRECOVER=3_000,
-            GAS_PRECOMPILE_SHA256_BASE=60,
-            GAS_PRECOMPILE_SHA256_PER_WORD=12,
-            GAS_PRECOMPILE_RIPEMD160_BASE=600,
-            GAS_PRECOMPILE_RIPEMD160_PER_WORD=120,
-            GAS_PRECOMPILE_IDENTITY_BASE=15,
-            GAS_PRECOMPILE_IDENTITY_PER_WORD=3,
+            REFUND_AUTH_PER_EXISTING_ACCOUNT=0,
+            # Precompiles
+            PRECOMPILE_ECRECOVER=3_000,
+            PRECOMPILE_SHA256_BASE=60,
+            PRECOMPILE_SHA256_PER_WORD=12,
+            PRECOMPILE_RIPEMD160_BASE=600,
+            PRECOMPILE_RIPEMD160_PER_WORD=120,
+            PRECOMPILE_IDENTITY_BASE=15,
+            PRECOMPILE_IDENTITY_PER_WORD=3,
+            # Static Opcodes
+            OPCODE_ADD=VERY_LOW,
+            OPCODE_SUB=VERY_LOW,
+            OPCODE_MUL=LOW,
+            OPCODE_DIV=LOW,
+            OPCODE_SDIV=LOW,
+            OPCODE_MOD=LOW,
+            OPCODE_SMOD=LOW,
+            OPCODE_ADDMOD=MID,
+            OPCODE_MULMOD=MID,
+            OPCODE_SIGNEXTEND=LOW,
+            OPCODE_LT=VERY_LOW,
+            OPCODE_GT=VERY_LOW,
+            OPCODE_SLT=VERY_LOW,
+            OPCODE_SGT=VERY_LOW,
+            OPCODE_EQ=VERY_LOW,
+            OPCODE_ISZERO=VERY_LOW,
+            OPCODE_AND=VERY_LOW,
+            OPCODE_OR=VERY_LOW,
+            OPCODE_XOR=VERY_LOW,
+            OPCODE_NOT=VERY_LOW,
+            OPCODE_BYTE=VERY_LOW,
+            OPCODE_JUMP=MID,
+            OPCODE_JUMPI=HIGH,
+            OPCODE_JUMPDEST=1,
+            OPCODE_CALLDATALOAD=VERY_LOW,
+            OPCODE_BLOCKHASH=20,
+            OPCODE_COINBASE=BASE,
+            OPCODE_PUSH=VERY_LOW,
+            OPCODE_DUP=VERY_LOW,
+            OPCODE_SWAP=VERY_LOW,
+            # Dynamic Opcode Components
+            OPCODE_CALLDATACOPY_BASE=VERY_LOW,
+            OPCODE_CODECOPY_BASE=VERY_LOW,
+            OPCODE_MLOAD_BASE=VERY_LOW,
+            OPCODE_MSTORE_BASE=VERY_LOW,
+            OPCODE_MSTORE8_BASE=VERY_LOW,
+            OPCODE_SELFDESTRUCT_BASE=5_000,
+            OPCODE_COPY_PER_WORD=3,
+            OPCODE_CREATE_BASE=32_000,
+            OPCODE_EXP_BASE=10,
+            OPCODE_EXP_PER_BYTE=50,
+            OPCODE_LOG_BASE=375,
+            OPCODE_LOG_DATA_PER_BYTE=8,
+            OPCODE_LOG_TOPIC=375,
+            OPCODE_KECCAK256_BASE=30,
+            OPCODE_KECCAK256_PER_WORD=6,
             # Zero-initialized: introduced in later forks, set via
             # replace() in the fork that activates them.
-            GAS_TX_DATA_TOKEN_STANDARD=0,
-            GAS_TX_DATA_TOKEN_FLOOR=0,
-            GAS_AUTH_PER_EMPTY_ACCOUNT=0,
-            REFUND_AUTH_PER_EXISTING_ACCOUNT=0,
-            GAS_PRECOMPILE_ECADD=0,
-            GAS_PRECOMPILE_ECMUL=0,
-            GAS_PRECOMPILE_ECPAIRING_BASE=0,
-            GAS_PRECOMPILE_ECPAIRING_PER_POINT=0,
-            GAS_PRECOMPILE_BLAKE2F_BASE=0,
-            GAS_PRECOMPILE_BLAKE2F_PER_ROUND=0,
-            GAS_PRECOMPILE_POINT_EVALUATION=0,
-            GAS_PRECOMPILE_BLS_G1ADD=0,
-            GAS_PRECOMPILE_BLS_G1MUL=0,
-            GAS_PRECOMPILE_BLS_G1MAP=0,
-            GAS_PRECOMPILE_BLS_G2ADD=0,
-            GAS_PRECOMPILE_BLS_G2MUL=0,
-            GAS_PRECOMPILE_BLS_G2MAP=0,
-            GAS_PRECOMPILE_BLS_PAIRING_BASE=0,
-            GAS_PRECOMPILE_BLS_PAIRING_PER_PAIR=0,
-            GAS_PRECOMPILE_P256VERIFY=0,
-            GAS_BLOCK_ACCESS_LIST_ITEM=0,
+            TX_DATA_TOKEN_STANDARD=0,
+            TX_DATA_TOKEN_FLOOR=0,
+            PRECOMPILE_ECADD=0,
+            PRECOMPILE_ECMUL=0,
+            PRECOMPILE_ECPAIRING_BASE=0,
+            PRECOMPILE_ECPAIRING_PER_POINT=0,
+            PRECOMPILE_BLAKE2F_BASE=0,
+            PRECOMPILE_BLAKE2F_PER_ROUND=0,
+            PRECOMPILE_POINT_EVALUATION=0,
+            PRECOMPILE_BLS_G1ADD=0,
+            PRECOMPILE_BLS_G1MUL=0,
+            PRECOMPILE_BLS_G1MAP=0,
+            PRECOMPILE_BLS_G2ADD=0,
+            PRECOMPILE_BLS_G2MUL=0,
+            PRECOMPILE_BLS_G2MAP=0,
+            PRECOMPILE_BLS_PAIRING_BASE=0,
+            PRECOMPILE_BLS_PAIRING_PER_PAIR=0,
+            PRECOMPILE_P256VERIFY=0,
+            BLOCK_ACCESS_LIST_ITEM=0,
         )
 
     @classmethod
@@ -269,9 +288,9 @@ def wrapper(opcode: OpcodeBase) -> int:
 
             # Add account access cost based on warmth
             if opcode.metadata["address_warm"]:
-                access_cost = gas_costs.GAS_WARM_ACCOUNT_ACCESS
+                access_cost = gas_costs.WARM_ACCESS
             else:
-                access_cost = gas_costs.GAS_COLD_ACCOUNT_ACCESS
+                access_cost = gas_costs.COLD_ACCOUNT_ACCESS
 
             return base_cost + access_cost
 
@@ -289,7 +308,8 @@ def _with_data_copy(
         Args:
             base_gas: Either a constant gas cost (int) or a callable that
                       calculates it
-            gas_costs: The gas costs dataclass for accessing GAS_COPY
+            gas_costs: The gas costs dataclass for accessing
+                       OPCODE_COPY_PER_WORD
 
         Returns:
             A callable that calculates base_gas + copy_cost
@@ -306,7 +326,7 @@ def wrapper(opcode: OpcodeBase) -> int:
             # Add copy cost based on data size
             data_size = opcode.metadata["data_size"]
             word_count = (data_size + 31) // 32
-            copy_cost = gas_costs.GAS_COPY * word_count
+            copy_cost = gas_costs.OPCODE_COPY_PER_WORD * word_count
 
             return base_cost + copy_cost
 
@@ -314,7 +334,7 @@ def wrapper(opcode: OpcodeBase) -> int:
 
     @classmethod
     def opcode_gas_map(
-        cls, *, block_number: int = 0, timestamp: int = 0
+        cls,
     ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
         """
         Return a mapping of opcodes to their gas costs.
@@ -324,12 +344,8 @@ def opcode_gas_map(
         - Callables: Functions that take the opcode instance with metadata and
                      return gas cost
         """
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
-        memory_expansion_calculator = cls.memory_expansion_gas_calculator(
-            block_number=block_number, timestamp=timestamp
-        )
+        gas_costs = cls.gas_costs()
+        memory_expansion_calculator = cls.memory_expansion_gas_calculator()
 
         # Define the opcode gas cost mapping
         # Each entry is either:
@@ -338,60 +354,62 @@ def opcode_gas_map(
         return {
             # Stop and arithmetic operations
             Opcodes.STOP: 0,
-            Opcodes.ADD: gas_costs.GAS_VERY_LOW,
-            Opcodes.MUL: gas_costs.GAS_LOW,
-            Opcodes.SUB: gas_costs.GAS_VERY_LOW,
-            Opcodes.DIV: gas_costs.GAS_LOW,
-            Opcodes.SDIV: gas_costs.GAS_LOW,
-            Opcodes.MOD: gas_costs.GAS_LOW,
-            Opcodes.SMOD: gas_costs.GAS_LOW,
-            Opcodes.ADDMOD: gas_costs.GAS_MID,
-            Opcodes.MULMOD: gas_costs.GAS_MID,
+            Opcodes.ADD: gas_costs.OPCODE_ADD,
+            Opcodes.MUL: gas_costs.OPCODE_MUL,
+            Opcodes.SUB: gas_costs.OPCODE_SUB,
+            Opcodes.DIV: gas_costs.OPCODE_DIV,
+            Opcodes.SDIV: gas_costs.OPCODE_SDIV,
+            Opcodes.MOD: gas_costs.OPCODE_MOD,
+            Opcodes.SMOD: gas_costs.OPCODE_SMOD,
+            Opcodes.ADDMOD: gas_costs.OPCODE_ADDMOD,
+            Opcodes.MULMOD: gas_costs.OPCODE_MULMOD,
             Opcodes.EXP: lambda op: (
-                gas_costs.GAS_EXPONENTIATION
-                + gas_costs.GAS_EXPONENTIATION_PER_BYTE
+                gas_costs.OPCODE_EXP_BASE
+                + gas_costs.OPCODE_EXP_PER_BYTE
                 * ((op.metadata["exponent"].bit_length() + 7) // 8)
             ),
-            Opcodes.SIGNEXTEND: gas_costs.GAS_LOW,
+            Opcodes.SIGNEXTEND: gas_costs.OPCODE_SIGNEXTEND,
             # Comparison & bitwise logic operations
-            Opcodes.LT: gas_costs.GAS_VERY_LOW,
-            Opcodes.GT: gas_costs.GAS_VERY_LOW,
-            Opcodes.SLT: gas_costs.GAS_VERY_LOW,
-            Opcodes.SGT: gas_costs.GAS_VERY_LOW,
-            Opcodes.EQ: gas_costs.GAS_VERY_LOW,
-            Opcodes.ISZERO: gas_costs.GAS_VERY_LOW,
-            Opcodes.AND: gas_costs.GAS_VERY_LOW,
-            Opcodes.OR: gas_costs.GAS_VERY_LOW,
-            Opcodes.XOR: gas_costs.GAS_VERY_LOW,
-            Opcodes.NOT: gas_costs.GAS_VERY_LOW,
-            Opcodes.BYTE: gas_costs.GAS_VERY_LOW,
+            Opcodes.LT: gas_costs.OPCODE_LT,
+            Opcodes.GT: gas_costs.OPCODE_GT,
+            Opcodes.SLT: gas_costs.OPCODE_SLT,
+            Opcodes.SGT: gas_costs.OPCODE_SGT,
+            Opcodes.EQ: gas_costs.OPCODE_EQ,
+            Opcodes.ISZERO: gas_costs.OPCODE_ISZERO,
+            Opcodes.AND: gas_costs.OPCODE_AND,
+            Opcodes.OR: gas_costs.OPCODE_OR,
+            Opcodes.XOR: gas_costs.OPCODE_XOR,
+            Opcodes.NOT: gas_costs.OPCODE_NOT,
+            Opcodes.BYTE: gas_costs.OPCODE_BYTE,
             # SHA3
             Opcodes.SHA3: cls._with_memory_expansion(
                 lambda op: (
-                    gas_costs.GAS_KECCAK256
-                    + gas_costs.GAS_KECCAK256_PER_WORD
+                    gas_costs.OPCODE_KECCAK256_BASE
+                    + gas_costs.OPCODE_KECCAK256_PER_WORD
                     * ((op.metadata["data_size"] + 31) // 32)
                 ),
                 memory_expansion_calculator,
             ),
             # Environmental information
-            Opcodes.ADDRESS: gas_costs.GAS_BASE,
+            Opcodes.ADDRESS: gas_costs.BASE,
             Opcodes.BALANCE: cls._with_account_access(0, gas_costs),
-            Opcodes.ORIGIN: gas_costs.GAS_BASE,
-            Opcodes.CALLER: gas_costs.GAS_BASE,
-            Opcodes.CALLVALUE: gas_costs.GAS_BASE,
-            Opcodes.CALLDATALOAD: gas_costs.GAS_VERY_LOW,
-            Opcodes.CALLDATASIZE: gas_costs.GAS_BASE,
+            Opcodes.ORIGIN: gas_costs.BASE,
+            Opcodes.CALLER: gas_costs.BASE,
+            Opcodes.CALLVALUE: gas_costs.BASE,
+            Opcodes.CALLDATALOAD: gas_costs.OPCODE_CALLDATALOAD,
+            Opcodes.CALLDATASIZE: gas_costs.BASE,
             Opcodes.CALLDATACOPY: cls._with_memory_expansion(
-                cls._with_data_copy(gas_costs.GAS_VERY_LOW, gas_costs),
+                cls._with_data_copy(
+                    gas_costs.OPCODE_CALLDATACOPY_BASE, gas_costs
+                ),
                 memory_expansion_calculator,
             ),
-            Opcodes.CODESIZE: gas_costs.GAS_BASE,
+            Opcodes.CODESIZE: gas_costs.BASE,
             Opcodes.CODECOPY: cls._with_memory_expansion(
-                cls._with_data_copy(gas_costs.GAS_VERY_LOW, gas_costs),
+                cls._with_data_copy(gas_costs.OPCODE_CODECOPY_BASE, gas_costs),
                 memory_expansion_calculator,
             ),
-            Opcodes.GASPRICE: gas_costs.GAS_BASE,
+            Opcodes.GASPRICE: gas_costs.BASE,
             Opcodes.EXTCODESIZE: cls._with_account_access(0, gas_costs),
             Opcodes.EXTCODECOPY: cls._with_memory_expansion(
                 cls._with_data_copy(
@@ -401,94 +419,97 @@ def opcode_gas_map(
                 memory_expansion_calculator,
             ),
             # Block information
-            Opcodes.BLOCKHASH: gas_costs.GAS_BLOCK_HASH,
-            Opcodes.COINBASE: gas_costs.GAS_BASE,
-            Opcodes.TIMESTAMP: gas_costs.GAS_BASE,
-            Opcodes.NUMBER: gas_costs.GAS_BASE,
-            Opcodes.PREVRANDAO: gas_costs.GAS_BASE,
-            Opcodes.GASLIMIT: gas_costs.GAS_BASE,
+            Opcodes.BLOCKHASH: gas_costs.OPCODE_BLOCKHASH,
+            Opcodes.COINBASE: gas_costs.OPCODE_COINBASE,
+            Opcodes.TIMESTAMP: gas_costs.BASE,
+            Opcodes.NUMBER: gas_costs.BASE,
+            Opcodes.PREVRANDAO: gas_costs.BASE,
+            Opcodes.GASLIMIT: gas_costs.BASE,
             # Stack, memory, storage and flow operations
-            Opcodes.POP: gas_costs.GAS_BASE,
+            Opcodes.POP: gas_costs.BASE,
             Opcodes.MLOAD: cls._with_memory_expansion(
-                gas_costs.GAS_VERY_LOW, memory_expansion_calculator
+                gas_costs.OPCODE_MLOAD_BASE,
+                memory_expansion_calculator,
             ),
             Opcodes.MSTORE: cls._with_memory_expansion(
-                gas_costs.GAS_VERY_LOW, memory_expansion_calculator
+                gas_costs.OPCODE_MSTORE_BASE,
+                memory_expansion_calculator,
             ),
             Opcodes.MSTORE8: cls._with_memory_expansion(
-                gas_costs.GAS_VERY_LOW, memory_expansion_calculator
+                gas_costs.OPCODE_MSTORE8_BASE,
+                memory_expansion_calculator,
             ),
             Opcodes.SLOAD: lambda op: (
-                gas_costs.GAS_WARM_SLOAD
+                gas_costs.WARM_SLOAD
                 if op.metadata["key_warm"]
-                else gas_costs.GAS_COLD_SLOAD
+                else gas_costs.COLD_STORAGE_ACCESS
             ),
             Opcodes.SSTORE: lambda op: cls._calculate_sstore_gas(
                 op, gas_costs
             ),
-            Opcodes.JUMP: gas_costs.GAS_MID,
-            Opcodes.JUMPI: gas_costs.GAS_HIGH,
-            Opcodes.PC: gas_costs.GAS_BASE,
-            Opcodes.MSIZE: gas_costs.GAS_BASE,
-            Opcodes.GAS: gas_costs.GAS_BASE,
-            Opcodes.JUMPDEST: gas_costs.GAS_JUMPDEST,
+            Opcodes.JUMP: gas_costs.OPCODE_JUMP,
+            Opcodes.JUMPI: gas_costs.OPCODE_JUMPI,
+            Opcodes.PC: gas_costs.BASE,
+            Opcodes.MSIZE: gas_costs.BASE,
+            Opcodes.GAS: gas_costs.BASE,
+            Opcodes.JUMPDEST: gas_costs.OPCODE_JUMPDEST,
             # Push operations (PUSH1 through PUSH32)
             **{
-                getattr(Opcodes, f"PUSH{i}"): gas_costs.GAS_VERY_LOW
+                getattr(Opcodes, f"PUSH{i}"): gas_costs.OPCODE_PUSH
                 for i in range(1, 33)
             },
             # Dup operations (DUP1 through DUP16)
             **{
-                getattr(Opcodes, f"DUP{i}"): gas_costs.GAS_VERY_LOW
+                getattr(Opcodes, f"DUP{i}"): gas_costs.OPCODE_DUP
                 for i in range(1, 17)
             },
             # Swap operations (SWAP1 through SWAP16)
             **{
-                getattr(Opcodes, f"SWAP{i}"): gas_costs.GAS_VERY_LOW
+                getattr(Opcodes, f"SWAP{i}"): gas_costs.OPCODE_SWAP
                 for i in range(1, 17)
             },
             # Logging operations
             Opcodes.LOG0: cls._with_memory_expansion(
                 lambda op: (
-                    gas_costs.GAS_LOG
-                    + gas_costs.GAS_LOG_DATA_PER_BYTE
+                    gas_costs.OPCODE_LOG_BASE
+                    + gas_costs.OPCODE_LOG_DATA_PER_BYTE
                     * op.metadata["data_size"]
                 ),
                 memory_expansion_calculator,
             ),
             Opcodes.LOG1: cls._with_memory_expansion(
                 lambda op: (
-                    gas_costs.GAS_LOG
-                    + gas_costs.GAS_LOG_DATA_PER_BYTE
+                    gas_costs.OPCODE_LOG_BASE
+                    + gas_costs.OPCODE_LOG_DATA_PER_BYTE
                     * op.metadata["data_size"]
-                    + gas_costs.GAS_LOG_TOPIC
+                    + gas_costs.OPCODE_LOG_TOPIC
                 ),
                 memory_expansion_calculator,
             ),
             Opcodes.LOG2: cls._with_memory_expansion(
                 lambda op: (
-                    gas_costs.GAS_LOG
-                    + gas_costs.GAS_LOG_DATA_PER_BYTE
+                    gas_costs.OPCODE_LOG_BASE
+                    + gas_costs.OPCODE_LOG_DATA_PER_BYTE
                     * op.metadata["data_size"]
-                    + gas_costs.GAS_LOG_TOPIC * 2
+                    + gas_costs.OPCODE_LOG_TOPIC * 2
                 ),
                 memory_expansion_calculator,
             ),
             Opcodes.LOG3: cls._with_memory_expansion(
                 lambda op: (
-                    gas_costs.GAS_LOG
-                    + gas_costs.GAS_LOG_DATA_PER_BYTE
+                    gas_costs.OPCODE_LOG_BASE
+                    + gas_costs.OPCODE_LOG_DATA_PER_BYTE
                     * op.metadata["data_size"]
-                    + gas_costs.GAS_LOG_TOPIC * 3
+                    + gas_costs.OPCODE_LOG_TOPIC * 3
                 ),
                 memory_expansion_calculator,
             ),
             Opcodes.LOG4: cls._with_memory_expansion(
                 lambda op: (
-                    gas_costs.GAS_LOG
-                    + gas_costs.GAS_LOG_DATA_PER_BYTE
+                    gas_costs.OPCODE_LOG_BASE
+                    + gas_costs.OPCODE_LOG_DATA_PER_BYTE
                     * op.metadata["data_size"]
-                    + gas_costs.GAS_LOG_TOPIC * 4
+                    + gas_costs.OPCODE_LOG_TOPIC * 4
                 ),
                 memory_expansion_calculator,
             ),
@@ -516,15 +537,11 @@ def opcode_gas_map(
         }
 
     @classmethod
-    def opcode_gas_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> OpcodeGasCalculator:
+    def opcode_gas_calculator(cls) -> OpcodeGasCalculator:
         """
         Return callable that calculates the gas cost of a single opcode.
         """
-        opcode_gas_map = cls.opcode_gas_map(
-            block_number=block_number, timestamp=timestamp
-        )
+        opcode_gas_map = cls.opcode_gas_map()
 
         def fn(opcode: OpcodeBase) -> int:
             # Get the gas cost or calculator
@@ -545,7 +562,7 @@ def fn(opcode: OpcodeBase) -> int:
 
     @classmethod
     def opcode_refund_map(
-        cls, *, block_number: int = 0, timestamp: int = 0
+        cls,
     ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
         """
         Return a mapping of opcodes to their gas refunds.
@@ -555,9 +572,7 @@ def opcode_refund_map(
         - Callables: Functions that take the opcode instance with metadata and
                      return gas refund
         """
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
+        gas_costs = cls.gas_costs()
 
         # Only SSTORE provides refunds
         return {
@@ -567,15 +582,11 @@ def opcode_refund_map(
         }
 
     @classmethod
-    def opcode_refund_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> OpcodeGasCalculator:
+    def opcode_refund_calculator(cls) -> OpcodeGasCalculator:
         """
         Return callable that calculates the gas refund of a single opcode.
         """
-        opcode_refund_map = cls.opcode_refund_map(
-            block_number=block_number, timestamp=timestamp
-        )
+        opcode_refund_map = cls.opcode_refund_map()
 
         def fn(opcode: OpcodeBase) -> int:
             # Get the gas refund or calculator
@@ -621,15 +632,13 @@ def _calculate_sstore_refund(
                 # Storage slot being restored to its original value
                 if original_value == 0:
                     # Slot was originally empty and was SET earlier
-                    refund += (
-                        gas_costs.GAS_STORAGE_SET - gas_costs.GAS_WARM_SLOAD
-                    )
+                    refund += gas_costs.STORAGE_SET - gas_costs.WARM_SLOAD
                 else:
                     # Slot was originally non-empty and was UPDATED earlier
                     refund += (
-                        gas_costs.GAS_STORAGE_UPDATE
-                        - gas_costs.GAS_COLD_SLOAD
-                        - gas_costs.GAS_WARM_SLOAD
+                        gas_costs.COLD_STORAGE_WRITE
+                        - gas_costs.COLD_STORAGE_ACCESS
+                        - gas_costs.WARM_SLOAD
                     )
 
         return refund
@@ -647,17 +656,18 @@ def _calculate_sstore_gas(
             current_value = original_value
         new_value = metadata["new_value"]
 
-        gas_cost = 0 if metadata["key_warm"] else gas_costs.GAS_COLD_SLOAD
+        gas_cost = 0 if metadata["key_warm"] else gas_costs.COLD_STORAGE_ACCESS
 
         if original_value == current_value and current_value != new_value:
             if original_value == 0:
-                gas_cost += gas_costs.GAS_STORAGE_SET
+                gas_cost += gas_costs.STORAGE_SET
             else:
                 gas_cost += (
-                    gas_costs.GAS_STORAGE_UPDATE - gas_costs.GAS_COLD_SLOAD
+                    gas_costs.COLD_STORAGE_WRITE
+                    - gas_costs.COLD_STORAGE_ACCESS
                 )
         else:
-            gas_cost += gas_costs.GAS_WARM_SLOAD
+            gas_cost += gas_costs.WARM_SLOAD
 
         return gas_cost
 
@@ -672,9 +682,12 @@ def _calculate_call_gas(
 
         # Base cost depends on address warmth
         if metadata["address_warm"]:
-            base_cost = gas_costs.GAS_WARM_ACCOUNT_ACCESS
+            base_cost = gas_costs.WARM_ACCESS
         else:
-            base_cost = gas_costs.GAS_COLD_ACCOUNT_ACCESS
+            base_cost = gas_costs.COLD_ACCOUNT_ACCESS
+
+        if metadata["inner_call_cost"]:
+            return base_cost + metadata["inner_call_cost"]
 
         return base_cost
 
@@ -684,7 +697,18 @@ def _calculate_create_gas(
     ) -> int:
         """CREATE gas is constant at Frontier."""
         del opcode
-        return gas_costs.GAS_CREATE
+        return gas_costs.OPCODE_CREATE_BASE
+
+    @classmethod
+    def _calculate_create2_gas(
+        cls, opcode: OpcodeBase, gas_costs: GasCosts
+    ) -> int:
+        """
+        Calculate CREATE2 gas cost including initcode cost.
+        """
+        raise NotImplementedError(
+            f"CREATE2 opcode is not supported in {cls.name()}"
+        )
 
     @classmethod
     def _calculate_return_gas(
@@ -695,7 +719,7 @@ def _calculate_return_gas(
 
         # Code deposit cost when returning from initcode
         code_deposit_size = metadata["code_deposit_size"]
-        return gas_costs.GAS_CODE_DEPOSIT_PER_BYTE * code_deposit_size
+        return gas_costs.CODE_DEPOSIT_PER_BYTE * code_deposit_size
 
     @classmethod
     def _calculate_selfdestruct_gas(
@@ -704,29 +728,25 @@ def _calculate_selfdestruct_gas(
         """Calculate SELFDESTRUCT gas cost based on metadata."""
         metadata = opcode.metadata
 
-        base_cost = gas_costs.GAS_SELF_DESTRUCT
+        base_cost = gas_costs.OPCODE_SELFDESTRUCT_BASE
 
         # Check if the beneficiary is cold
         if not metadata["address_warm"]:
-            base_cost += gas_costs.GAS_COLD_ACCOUNT_ACCESS
+            base_cost += gas_costs.COLD_ACCOUNT_ACCESS
 
         # Check if creating a new account
         if metadata["account_new"]:
-            base_cost += gas_costs.GAS_NEW_ACCOUNT
+            base_cost += gas_costs.NEW_ACCOUNT
 
         return base_cost
 
     @classmethod
-    def memory_expansion_gas_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> MemoryExpansionGasCalculator:
+    def memory_expansion_gas_calculator(cls) -> MemoryExpansionGasCalculator:
         """
         Return callable that calculates the gas cost of memory expansion for
         the fork.
         """
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
+        gas_costs = cls.gas_costs()
 
         def fn(*, new_bytes: int, previous_bytes: int = 0) -> int:
             if new_bytes <= previous_bytes:
@@ -735,23 +755,19 @@ def fn(*, new_bytes: int, previous_bytes: int = 0) -> int:
             previous_words = ceiling_division(previous_bytes, 32)
 
             def c(w: int) -> int:
-                return (gas_costs.GAS_MEMORY * w) + ((w * w) // 512)
+                return (gas_costs.MEMORY_PER_WORD * w) + ((w * w) // 512)
 
             return c(new_words) - c(previous_words)
 
         return fn
 
     @classmethod
-    def calldata_gas_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> CalldataGasCalculator:
+    def calldata_gas_calculator(cls) -> CalldataGasCalculator:
         """
         Return callable that calculates the transaction gas cost for its
         calldata depending on its contents.
         """
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
+        gas_costs = cls.gas_costs()
 
         def fn(*, data: BytesConvertible, floor: bool = False) -> int:
             del floor
@@ -760,16 +776,14 @@ def fn(*, data: BytesConvertible, floor: bool = False) -> int:
             num_zeros = raw.count(0)
             num_non_zeros = len(raw) - num_zeros
             return (
-                num_zeros * gas_costs.GAS_TX_DATA_PER_ZERO
-                + num_non_zeros * gas_costs.GAS_TX_DATA_PER_NON_ZERO
+                num_zeros * gas_costs.TX_DATA_PER_ZERO
+                + num_non_zeros * gas_costs.TX_DATA_PER_NON_ZERO
             )
 
         return fn
 
     @classmethod
-    def base_fee_per_gas_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> BaseFeePerGasCalculator:
+    def base_fee_per_gas_calculator(cls) -> BaseFeePerGasCalculator:
         """
         Return a callable that calculates the base fee per gas at a given fork.
         """
@@ -778,9 +792,7 @@ def base_fee_per_gas_calculator(
         )
 
     @classmethod
-    def base_fee_change_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> BaseFeeChangeCalculator:
+    def base_fee_change_calculator(cls) -> BaseFeeChangeCalculator:
         """
         Return a callable that calculates the gas that needs to be used to
         change the base fee.
@@ -790,52 +802,45 @@ def base_fee_change_calculator(
         )
 
     @classmethod
-    def base_fee_max_change_denominator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def base_fee_max_change_denominator(cls) -> int:
         """Return the base fee max change denominator at a given fork."""
-        del block_number, timestamp
         raise NotImplementedError(
             f"Base fee max change denominator is not supported in {cls.name()}"
         )
 
     @classmethod
-    def base_fee_elasticity_multiplier(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def base_fee_elasticity_multiplier(cls) -> int:
         """Return the base fee elasticity multiplier at a given fork."""
-        del block_number, timestamp
         raise NotImplementedError(
             f"Base fee elasticity multiplier is not supported in {cls.name()}"
         )
 
     @classmethod
     def transaction_data_floor_cost_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
+        cls,
     ) -> TransactionDataFloorCostCalculator:
         """At frontier, the transaction data floor cost is a constant zero."""
-        del block_number, timestamp
 
-        def fn(*, data: BytesConvertible) -> int:
-            del data
+        def fn(
+            *,
+            data: BytesConvertible,
+            access_list: List[AccessList] | None = None,
+        ) -> int:
+            del data, access_list
             return 0
 
         return fn
 
     @classmethod
     def transaction_intrinsic_cost_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
+        cls,
     ) -> TransactionIntrinsicCostCalculator:
         """
         Return callable that calculates the intrinsic gas cost of a transaction
         for the fork.
         """
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
-        calldata_gas_calculator = cls.calldata_gas_calculator(
-            block_number=block_number, timestamp=timestamp
-        )
+        gas_costs = cls.gas_costs()
+        calldata_gas_calculator = cls.calldata_gas_calculator()
 
         def fn(
             *,
@@ -854,11 +859,11 @@ def fn(
                 f"Authorizations are not supported in {cls.name()}"
             )
 
-            intrinsic_cost: int = gas_costs.GAS_TX_BASE
+            intrinsic_cost: int = gas_costs.TX_BASE
 
             if contract_creation:
                 intrinsic_cost += (
-                    gas_costs.GAS_CODE_INIT_PER_WORD
+                    gas_costs.CODE_INIT_PER_WORD
                     * ceiling_division(len(Bytes(calldata)), 32)
                 )
 
@@ -867,9 +872,7 @@ def fn(
         return fn
 
     @classmethod
-    def blob_gas_price_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> BlobGasPriceCalculator:
+    def blob_gas_price_calculator(cls) -> BlobGasPriceCalculator:
         """
         Return a callable that calculates the blob gas price at a given fork.
         """
@@ -878,9 +881,7 @@ def blob_gas_price_calculator(
         )
 
     @classmethod
-    def excess_blob_gas_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> ExcessBlobGasCalculator:
+    def excess_blob_gas_calculator(cls) -> ExcessBlobGasCalculator:
         """
         Return a callable that calculates the excess blob gas for a block at a
         given fork.
@@ -890,88 +891,22 @@ def excess_blob_gas_calculator(
         )
 
     @classmethod
-    def min_base_fee_per_blob_gas(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the amount of blob gas used per blob at a given fork."""
-        del block_number, timestamp
-        raise NotImplementedError(
-            f"Base fee per blob gas is not supported in {cls.name()}"
-        )
-
-    @classmethod
-    def blob_base_fee_update_fraction(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the blob base fee update fraction at a given fork."""
-        del block_number, timestamp
-        raise NotImplementedError(
-            f"Blob base fee update fraction is not supported in {cls.name()}"
-        )
-
-    @classmethod
-    def blob_gas_per_blob(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the amount of blob gas used per blob at a given fork."""
-        del block_number, timestamp
-        return 0
-
-    @classmethod
-    def supports_blobs(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def supports_blobs(cls) -> bool:
         """Blobs are not supported at Frontier."""
-        del block_number, timestamp
         return False
 
     @classmethod
-    def target_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the target number of blobs per block at a given fork."""
-        del block_number, timestamp
-        raise NotImplementedError(
-            f"Target blobs per block is not supported in {cls.name()}"
-        )
-
-    @classmethod
-    def max_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the max number of blobs per block at a given fork."""
-        del block_number, timestamp
-        raise NotImplementedError(
-            f"Max blobs per block is not supported in {cls.name()}"
-        )
-
-    @classmethod
-    def blob_reserve_price_active(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def blob_reserve_price_active(cls) -> bool:
         """
         Return whether the fork uses a reserve price mechanism for blobs or
         not.
         """
-        del block_number, timestamp
         raise NotImplementedError(
             f"Blob reserve price is not supported in {cls.name()}"
         )
 
     @classmethod
-    def blob_base_cost(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the base cost of a blob at a given fork."""
-        del block_number, timestamp
-        raise NotImplementedError(
-            f"Blob base cost is not supported in {cls.name()}"
-        )
-
-    @classmethod
-    def full_blob_tx_wrapper_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int | None:
+    def full_blob_tx_wrapper_version(cls) -> int | None:
         """Return the version of the full blob transaction wrapper."""
         raise NotImplementedError(
             "Full blob transaction wrapper version is not supported in "
@@ -979,162 +914,88 @@ def full_blob_tx_wrapper_version(
         )
 
     @classmethod
-    def max_blobs_per_tx(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the max number of blobs per tx at a given fork."""
-        del block_number, timestamp
-        raise NotImplementedError(
-            f"Max blobs per tx is not supported in {cls.name()}"
-        )
-
-    @classmethod
-    def blob_schedule(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> BlobSchedule | None:
+    def blob_schedule(cls) -> BlobSchedule | None:
         """At genesis, no blob schedule is used."""
-        del block_number, timestamp
         return None
 
     @classmethod
-    def header_requests_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def header_requests_required(cls) -> bool:
         """At genesis, header must not contain beacon chain requests."""
-        del block_number, timestamp
         return False
 
     @classmethod
-    def header_bal_hash_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def header_bal_hash_required(cls) -> bool:
         """At genesis, header must not contain block access list hash."""
-        del block_number, timestamp
         return False
 
     @classmethod
-    def empty_block_bal_item_count(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def empty_block_bal_item_count(cls) -> int:
         """Pre-Amsterdam forks have no block access list."""
-        del block_number, timestamp
         return 0
 
     @classmethod
-    def engine_new_payload_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
-        """At genesis, payloads cannot be sent through the engine API."""
-        del block_number, timestamp
-        return None
+    def header_beacon_root_required(cls) -> bool:
+        """At genesis, header must not contain parent beacon block root."""
+        return False
 
     @classmethod
-    def header_beacon_root_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """At genesis, header must not contain parent beacon block root."""
-        del block_number, timestamp
+    def header_slot_number_required(cls) -> bool:
+        """At genesis, header must not contain slot number (EIP-7843)."""
         return False
 
     @classmethod
-    def engine_new_payload_blob_hashes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def engine_new_payload_blob_hashes(cls) -> bool:
         """At genesis, payloads do not have blob hashes."""
-        del block_number, timestamp
         return False
 
     @classmethod
-    def engine_new_payload_beacon_root(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def engine_new_payload_beacon_root(cls) -> bool:
         """At genesis, payloads do not have a parent beacon block root."""
-        del block_number, timestamp
         return False
 
     @classmethod
-    def engine_new_payload_requests(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def engine_new_payload_requests(cls) -> bool:
         """At genesis, payloads do not have requests."""
-        del block_number, timestamp
         return False
 
     @classmethod
-    def engine_execution_payload_block_access_list(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def engine_execution_payload_block_access_list(cls) -> bool:
         """At genesis, payloads do not have block access list."""
-        del block_number, timestamp
         return False
 
     @classmethod
-    def engine_new_payload_target_blobs_per_block(
-        cls,
-        *,
-        block_number: int = 0,
-        timestamp: int = 0,
-    ) -> bool:
+    def engine_new_payload_target_blobs_per_block(cls) -> bool:
         """At genesis, payloads do not have target blobs per block."""
-        del block_number, timestamp
         return False
 
     @classmethod
-    def engine_payload_attribute_target_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def engine_payload_attribute_target_blobs_per_block(cls) -> bool:
         """
         At genesis, payload attributes do not include the target blobs per
         block.
         """
-        del block_number, timestamp
         return False
 
     @classmethod
-    def engine_payload_attribute_max_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def engine_payload_attribute_max_blobs_per_block(cls) -> bool:
         """
         At genesis, payload attributes do not include the max blobs per block.
         """
-        del block_number, timestamp
         return False
 
     @classmethod
-    def engine_forkchoice_updated_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
+    def engine_payload_attribute_slot_number(cls) -> bool:
         """
-        At genesis, forkchoice updates cannot be sent through the engine API.
+        At genesis, payload attributes do not include the slot number.
         """
-        return cls.engine_new_payload_version(
-            block_number=block_number, timestamp=timestamp
-        )
-
-    @classmethod
-    def engine_get_payload_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
-        """At genesis, payloads cannot be retrieved through the engine API."""
-        return cls.engine_new_payload_version(
-            block_number=block_number, timestamp=timestamp
-        )
-
-    @classmethod
-    def engine_get_blobs_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
-        """At genesis, blobs cannot be retrieved through the engine API."""
-        del block_number, timestamp
-        return None
+        return False
 
     @classmethod
-    def get_reward(cls, *, block_number: int = 0, timestamp: int = 0) -> int:
+    def get_reward(cls) -> int:
         """
         At Genesis the expected reward amount in wei is
         5_000_000_000_000_000_000.
         """
-        del block_number, timestamp
         return 5_000_000_000_000_000_000
 
     @classmethod
@@ -1143,108 +1004,80 @@ def supports_protected_txs(cls) -> bool:
         return False
 
     @classmethod
-    def tx_types(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[int]:
+    def tx_types(cls) -> List[int]:
         """At Genesis, only legacy transactions are allowed."""
-        del block_number, timestamp
         return [0]
 
     @classmethod
-    def contract_creating_tx_types(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[int]:
+    def contract_creating_tx_types(cls) -> List[int]:
         """At Genesis, only legacy transactions are allowed."""
-        del block_number, timestamp
         return [0]
 
     @classmethod
-    def transaction_gas_limit_cap(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int | None:
+    def transaction_gas_limit_cap(cls) -> int | None:
         """At Genesis, no transaction gas limit cap is imposed."""
-        del block_number, timestamp
         return None
 
     @classmethod
-    def block_rlp_size_limit(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int | None:
+    def block_rlp_size_limit(cls) -> int | None:
         """At Genesis, no RLP block size limit is imposed."""
-        del block_number, timestamp
         return None
 
     @classmethod
-    def precompiles(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Address]:
-        """At Genesis, no precompiles are present."""
-        del block_number, timestamp
-        return []
+    def precompiles(cls) -> List[Address]:
+        """
+        At Genesis, EC-recover, SHA256, RIPEMD160, and Identity precompiles
+        are introduced.
+        """
+        return [
+            Address(1, label="ECREC"),
+            Address(2, label="SHA256"),
+            Address(3, label="RIPEMD160"),
+            Address(4, label="ID"),
+        ]
 
     @classmethod
-    def system_contracts(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Address]:
+    def system_contracts(cls) -> List[Address]:
         """At Genesis, no system contracts are present."""
-        del block_number, timestamp
         return []
 
     @classmethod
-    def deterministic_factory_predeploy_address(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Address | None:
+    def deterministic_factory_predeploy_address(cls) -> Address | None:
         """At Genesis, no deterministic factory predeploy is present."""
-        del block_number, timestamp
         return None
 
     @classmethod
-    def max_code_size(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def max_code_size(cls) -> int:
         """
         At genesis, there is no upper bound for code size (bounded by block gas
         limit).
 
         However, the default is set to the limit of EIP-170 (Spurious Dragon)
         """
-        del block_number, timestamp
         return 0x6000
 
     @classmethod
-    def max_stack_height(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def max_stack_height(cls) -> int:
         """At genesis, the maximum stack height is 1024."""
-        del block_number, timestamp
         return 1024
 
     @classmethod
-    def max_initcode_size(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def max_initcode_size(cls) -> int:
         """
         At genesis, there is no upper bound for initcode size.
 
         However, the default is set to the limit of EIP-3860 (Shanghai).
         """
-        del block_number, timestamp
         return 0xC000
 
     @classmethod
-    def call_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
+    def call_opcodes(cls) -> List[Opcodes]:
         """Return list of call opcodes supported by the fork."""
-        del block_number, timestamp
         return [Opcodes.CALL, Opcodes.CALLCODE]
 
     @classmethod
-    def valid_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
+    def valid_opcodes(cls) -> List[Opcodes]:
         """Return list of Opcodes that are valid to work on this fork."""
-        del block_number, timestamp
         return [
             Opcodes.STOP,
             Opcodes.ADD,
@@ -1378,51 +1211,43 @@ def valid_opcodes(
         ]
 
     @classmethod
-    def create_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
+    def create_opcodes(cls) -> List[Opcodes]:
         """At Genesis, only `CREATE` opcode is supported."""
-        del block_number, timestamp
         return [Opcodes.CREATE]
 
     @classmethod
-    def max_refund_quotient(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def max_refund_quotient(cls) -> int:
         """Return the max refund quotient at Genesis."""
-        del block_number, timestamp
         return 2
 
     @classmethod
-    def max_request_type(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def max_request_type(cls) -> int:
         """At genesis, no request type is supported, signaled by -1."""
-        del block_number, timestamp
         return -1
 
     @classmethod
-    def pre_allocation(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Mapping:
+    def refund_types(cls) -> List[RefundTypes]:
+        """
+        At genesis, storage clearing refund is introduced.
+        """
+        return [RefundTypes.STORAGE_CLEAR]
+
+    @classmethod
+    def pre_allocation(cls) -> Mapping:
         """
         Return whether the fork expects pre-allocation of accounts.
 
         Frontier does not require pre-allocated accounts
         """
-        del block_number, timestamp
         return {}
 
     @classmethod
-    def pre_allocation_blockchain(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Mapping:
+    def pre_allocation_blockchain(cls) -> Mapping:
         """
         Return whether the fork expects pre-allocation of accounts.
 
         Frontier does not require pre-allocated accounts
         """
-        del block_number, timestamp
         return {}
 
     @classmethod
@@ -1467,8 +1292,6 @@ def build_default_block_header(
                 fork=cls,
                 field_name=field_name,
                 field_hint=field_info.annotation,
-                block_number=int(block_number),
-                timestamp=int(timestamp),
             )
             if default_value is not None:
                 defaults[field_name] = default_value
@@ -1476,1879 +1299,259 @@ def build_default_block_header(
         return FixtureHeader(**defaults)
 
 
-class Homestead(Frontier):
+class Homestead(
+    eips.EIP7,
+    eips.EIP2,
+    Frontier,
+):
     """Homestead fork."""
 
-    @classmethod
-    def precompiles(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Address]:
-        """
-        At Homestead, EC-recover, SHA256, RIPEMD160, and Identity precompiles
-        are introduced.
-        """
-        return [
-            Address(1, label="ECREC"),
-            Address(2, label="SHA256"),
-            Address(3, label="RIPEMD160"),
-            Address(4, label="ID"),
-        ] + super(Homestead, cls).precompiles(
-            block_number=block_number, timestamp=timestamp
-        )
+    pass
 
-    @classmethod
-    def call_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
-        """At Homestead, DELEGATECALL opcode was introduced."""
-        return [Opcodes.DELEGATECALL] + super(Homestead, cls).call_opcodes(
-            block_number=block_number, timestamp=timestamp
-        )
 
-    @classmethod
-    def opcode_gas_map(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
-        """Add DELEGATECALL opcode gas cost for Homestead."""
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
-        memory_expansion_calculator = cls.memory_expansion_gas_calculator(
-            block_number=block_number, timestamp=timestamp
-        )
-        base_map = super(Homestead, cls).opcode_gas_map(
-            block_number=block_number, timestamp=timestamp
-        )
-        return {
-            **base_map,
-            Opcodes.DELEGATECALL: cls._with_memory_expansion(
-                lambda op: cls._calculate_call_gas(op, gas_costs),
-                memory_expansion_calculator,
-            ),
-        }
+class DAOFork(
+    Homestead,
+    ignore=True,
+    ruleset_name="",
+):
+    """DAO fork."""
 
-    @classmethod
-    def valid_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
-        """Return the list of Opcodes that are valid to work on this fork."""
-        del block_number, timestamp
-        return [Opcodes.DELEGATECALL] + super(Homestead, cls).valid_opcodes()
+    pass
 
-    @classmethod
-    def transaction_intrinsic_cost_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> TransactionIntrinsicCostCalculator:
-        """
-        At Homestead, the transaction intrinsic cost needs to take contract
-        creation into account.
-        """
-        super_fn = super(Homestead, cls).transaction_intrinsic_cost_calculator(
-            block_number=block_number, timestamp=timestamp
-        )
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
 
-        def fn(
-            *,
-            calldata: BytesConvertible = b"",
-            contract_creation: bool = False,
-            access_list: List[AccessList] | None = None,
-            authorization_list_or_count: Sized | int | None = None,
-            return_cost_deducted_prior_execution: bool = False,
-        ) -> int:
-            del return_cost_deducted_prior_execution
+class TangerineWhistle(
+    DAOFork,
+    ignore=True,
+    ruleset_name="TANGERINE",
+):
+    """TangerineWhistle fork (EIP-150)."""
 
-            intrinsic_cost: int = super_fn(
-                calldata=calldata,
-                contract_creation=contract_creation,
-                access_list=access_list,
-                authorization_list_or_count=authorization_list_or_count,
-            )
-            if contract_creation:
-                intrinsic_cost += gas_costs.GAS_TX_CREATE
-            return intrinsic_cost
+    pass
 
-        return fn
+
+class SpuriousDragon(
+    eips.EIP170,
+    eips.EIP161,
+    eips.EIP155,
+    TangerineWhistle,
+    ignore=True,
+    ruleset_name="SPURIOUS",
+):
+    """SpuriousDragon fork."""
+
+    pass
 
 
-class DAOFork(Homestead, ignore=True):
-    """DAO fork."""
+class Byzantium(
+    eips.EIP649,
+    eips.EIP214,
+    eips.EIP211,
+    eips.EIP140,
+    eips.EIP198,
+    eips.EIP196,
+    eips.EIP197,
+    SpuriousDragon,
+):
+    """Byzantium fork."""
 
     pass
 
 
-class TangerineWhistle(DAOFork, ignore=True):
-    """TangerineWhistle fork (EIP-150)."""
+class Constantinople(
+    eips.EIP1234,
+    eips.EIP1052,
+    eips.EIP1014,
+    eips.EIP145,
+    Byzantium,
+):
+    """Constantinople fork."""
 
     pass
 
 
-class SpuriousDragon(TangerineWhistle, ignore=True):
-    """SpuriousDragon fork."""
+class ConstantinopleFix(
+    Constantinople,
+    solc_name="constantinople",
+    ruleset_name="PETERSBURG",
+):
+    """Constantinople Fix fork."""
 
-    @classmethod
-    def _calculate_call_gas(
-        cls, opcode: OpcodeBase, gas_costs: GasCosts
-    ) -> int:
-        """
-        At Spurious Dragon, the call gas cost needs to take the value transfer
-        and account new into account.
-        """
-        base_cost = super(SpuriousDragon, cls)._calculate_call_gas(
-            opcode, gas_costs
-        )
+    pass
 
-        # Additional costs for value transfer, does not apply to STATICCALL
-        metadata = opcode.metadata
-        if "value_transfer" in metadata:
-            if metadata["value_transfer"]:
-                base_cost += gas_costs.GAS_CALL_VALUE
-                if metadata["account_new"]:
-                    base_cost += gas_costs.GAS_NEW_ACCOUNT
-            elif metadata["account_new"]:
-                raise ValueError("Account new requires value transfer")
 
-        return base_cost
+class Istanbul(
+    eips.EIP2028,
+    eips.EIP1884,
+    eips.EIP1344,
+    eips.EIP1108,
+    eips.EIP152,
+    ConstantinopleFix,
+):
+    """Istanbul fork."""
 
-    @classmethod
-    def supports_protected_txs(cls) -> bool:
-        """
-        At Genesis, supports EIP-155 protected transactions.
-        """
-        return True
-
-
-class Byzantium(SpuriousDragon):
-    """Byzantium fork."""
-
-    @classmethod
-    def get_reward(cls, *, block_number: int = 0, timestamp: int = 0) -> int:
-        """
-        At Byzantium, the block reward is reduced to 3_000_000_000_000_000_000
-        wei.
-        """
-        del block_number, timestamp
-        return 3_000_000_000_000_000_000
-
-    @classmethod
-    def precompiles(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Address]:
-        """
-        At Byzantium, precompiles for bigint modular exponentiation, addition
-        and scalar multiplication on elliptic curve alt_bn128, and optimal ate
-        pairing check on elliptic curve alt_bn128 are introduced.
-        """
-        return [
-            Address(5, label="MODEXP"),
-            Address(6, label="BN254_ADD"),
-            Address(7, label="BN254_MUL"),
-            Address(8, label="BN254_PAIRING"),
-        ] + super(Byzantium, cls).precompiles(
-            block_number=block_number, timestamp=timestamp
-        )
-
-    @classmethod
-    def max_code_size(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        # NOTE: Move this to Spurious Dragon once this fork is introduced. See
-        # EIP-170.
-        """
-        At Spurious Dragon, an upper bound was introduced for max contract code
-        size.
-        """
-        del block_number, timestamp
-        return 0x6000
-
-    @classmethod
-    def call_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
-        """At Byzantium, STATICCALL opcode was introduced."""
-        return [Opcodes.STATICCALL] + super(Byzantium, cls).call_opcodes(
-            block_number=block_number, timestamp=timestamp
-        )
-
-    @classmethod
-    def opcode_gas_map(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
-        """Add Byzantium opcodes gas costs."""
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
-        memory_expansion_calculator = cls.memory_expansion_gas_calculator(
-            block_number=block_number, timestamp=timestamp
-        )
-        base_map = super(Byzantium, cls).opcode_gas_map(
-            block_number=block_number, timestamp=timestamp
-        )
-        return {
-            **base_map,
-            Opcodes.RETURNDATASIZE: gas_costs.GAS_BASE,
-            Opcodes.RETURNDATACOPY: cls._with_memory_expansion(
-                cls._with_data_copy(gas_costs.GAS_VERY_LOW, gas_costs),
-                memory_expansion_calculator,
-            ),
-            Opcodes.STATICCALL: cls._with_memory_expansion(
-                lambda op: cls._calculate_call_gas(op, gas_costs),
-                memory_expansion_calculator,
-            ),
-            Opcodes.REVERT: cls._with_memory_expansion(
-                0, memory_expansion_calculator
-            ),
-        }
-
-    @classmethod
-    def valid_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
-        """Return list of Opcodes that are valid to work on this fork."""
-        del block_number, timestamp
-        return [
-            Opcodes.REVERT,
-            Opcodes.RETURNDATASIZE,
-            Opcodes.RETURNDATACOPY,
-            Opcodes.STATICCALL,
-        ] + super(Byzantium, cls).valid_opcodes()
-
-    @classmethod
-    def gas_costs(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> GasCosts:
-        """
-        On Byzantium, precompiled contract gas costs are introduced.
-        """
-        return replace(
-            super(Byzantium, cls).gas_costs(
-                block_number=block_number, timestamp=timestamp
-            ),
-            GAS_PRECOMPILE_ECADD=500,
-            GAS_PRECOMPILE_ECMUL=40_000,
-            GAS_PRECOMPILE_ECPAIRING_BASE=100_000,
-            GAS_PRECOMPILE_ECPAIRING_PER_POINT=80_000,
-        )
-
-
-class Constantinople(Byzantium):
-    """Constantinople fork."""
-
-    @classmethod
-    def get_reward(cls, *, block_number: int = 0, timestamp: int = 0) -> int:
-        """
-        At Constantinople, the block reward is reduced to
-        2_000_000_000_000_000_000 wei.
-        """
-        del block_number, timestamp
-        return 2_000_000_000_000_000_000
-
-    @classmethod
-    def _calculate_create2_gas(
-        cls, opcode: OpcodeBase, gas_costs: GasCosts
-    ) -> int:
-        """Calculate CREATE2 gas cost based on metadata."""
-        metadata = opcode.metadata
-
-        # Keccak256 hashing cost
-        init_code_size = metadata["init_code_size"]
-        init_code_words = (init_code_size + 31) // 32
-        hash_gas = gas_costs.GAS_KECCAK256_PER_WORD * init_code_words
-
-        return gas_costs.GAS_CREATE + hash_gas
-
-    @classmethod
-    def create_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
-        """At Constantinople, `CREATE2` opcode is added."""
-        return [Opcodes.CREATE2] + super(Constantinople, cls).create_opcodes(
-            block_number=block_number, timestamp=timestamp
-        )
-
-    @classmethod
-    def opcode_gas_map(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
-        """Add Constantinople opcodes gas costs."""
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
-        memory_expansion_calculator = cls.memory_expansion_gas_calculator(
-            block_number=block_number, timestamp=timestamp
-        )
-        base_map = super(Constantinople, cls).opcode_gas_map(
-            block_number=block_number, timestamp=timestamp
-        )
-        return {
-            **base_map,
-            Opcodes.SHL: gas_costs.GAS_VERY_LOW,
-            Opcodes.SHR: gas_costs.GAS_VERY_LOW,
-            Opcodes.SAR: gas_costs.GAS_VERY_LOW,
-            Opcodes.EXTCODEHASH: cls._with_account_access(0, gas_costs),
-            Opcodes.CREATE2: cls._with_memory_expansion(
-                lambda op: cls._calculate_create2_gas(op, gas_costs),
-                memory_expansion_calculator,
-            ),
-        }
-
-    @classmethod
-    def valid_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
-        """Return list of Opcodes that are valid to work on this fork."""
-        del block_number, timestamp
-        return [
-            Opcodes.SHL,
-            Opcodes.SHR,
-            Opcodes.SAR,
-            Opcodes.EXTCODEHASH,
-            Opcodes.CREATE2,
-        ] + super(Constantinople, cls).valid_opcodes()
-
-
-class ConstantinopleFix(Constantinople, solc_name="constantinople"):
-    """Constantinople Fix fork."""
-
-    pass
-
-
-class Istanbul(ConstantinopleFix):
-    """Istanbul fork."""
-
-    @classmethod
-    def precompiles(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Address]:
-        """At Istanbul, a precompile for blake2 compression is introduced."""
-        return [
-            Address(9, label="BLAKE2F"),
-        ] + super(Istanbul, cls).precompiles(
-            block_number=block_number, timestamp=timestamp
-        )
-
-    @classmethod
-    def opcode_gas_map(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
-        """Add Istanbul opcodes gas costs."""
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
-        base_map = super(Istanbul, cls).opcode_gas_map(
-            block_number=block_number, timestamp=timestamp
-        )
-        return {
-            **base_map,
-            Opcodes.CHAINID: gas_costs.GAS_BASE,
-            Opcodes.SELFBALANCE: gas_costs.GAS_LOW,
-        }
-
-    @classmethod
-    def valid_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
-        """Return list of Opcodes that are valid to work on this fork."""
-        del block_number, timestamp
-        return [Opcodes.CHAINID, Opcodes.SELFBALANCE] + super(
-            Istanbul, cls
-        ).valid_opcodes()
-
-    @classmethod
-    def gas_costs(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> GasCosts:
-        """
-        On Istanbul, the non-zero transaction data byte cost is reduced to 16
-        due to EIP-2028.
-        """
-        return replace(
-            super(Istanbul, cls).gas_costs(
-                block_number=block_number, timestamp=timestamp
-            ),
-            GAS_TX_DATA_PER_NON_ZERO=16,  # https://eips.ethereum.org/EIPS/eip-2028
-            # https://eips.ethereum.org/EIPS/eip-1108
-            GAS_PRECOMPILE_ECADD=150,
-            GAS_PRECOMPILE_ECMUL=6000,
-            GAS_PRECOMPILE_ECPAIRING_BASE=45_000,
-            GAS_PRECOMPILE_ECPAIRING_PER_POINT=34_000,
-            GAS_PRECOMPILE_BLAKE2F_PER_ROUND=1,
-        )
-
-
-# Glacier forks skipped, unless explicitly specified
-class MuirGlacier(Istanbul, solc_name="istanbul", ignore=True):
-    """Muir Glacier fork."""
-
-    pass
-
-
-class Berlin(Istanbul):
-    """Berlin fork."""
-
-    @classmethod
-    def tx_types(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[int]:
-        """At Berlin, access list transactions are introduced."""
-        return [1] + super(Berlin, cls).tx_types(
-            block_number=block_number, timestamp=timestamp
-        )
-
-    @classmethod
-    def contract_creating_tx_types(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[int]:
-        """At Berlin, access list transactions are introduced."""
-        return [1] + super(Berlin, cls).contract_creating_tx_types(
-            block_number=block_number, timestamp=timestamp
-        )
-
-    @classmethod
-    def transaction_intrinsic_cost_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> TransactionIntrinsicCostCalculator:
-        """
-        At Berlin, the transaction intrinsic cost needs to take the access list
-        into account.
-        """
-        super_fn = super(Berlin, cls).transaction_intrinsic_cost_calculator(
-            block_number=block_number, timestamp=timestamp
-        )
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
-
-        def fn(
-            *,
-            calldata: BytesConvertible = b"",
-            contract_creation: bool = False,
-            access_list: List[AccessList] | None = None,
-            authorization_list_or_count: Sized | int | None = None,
-            return_cost_deducted_prior_execution: bool = False,
-        ) -> int:
-            del return_cost_deducted_prior_execution
-
-            intrinsic_cost: int = super_fn(
-                calldata=calldata,
-                contract_creation=contract_creation,
-                authorization_list_or_count=authorization_list_or_count,
-            )
-            if access_list is not None:
-                for access in access_list:
-                    intrinsic_cost += gas_costs.GAS_TX_ACCESS_LIST_ADDRESS
-                    for _ in access.storage_keys:
-                        intrinsic_cost += (
-                            gas_costs.GAS_TX_ACCESS_LIST_STORAGE_KEY
-                        )
-            return intrinsic_cost
-
-        return fn
-
-
-class London(Berlin):
-    """London fork."""
-
-    @classmethod
-    def header_base_fee_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """Header must contain the Base Fee starting from London."""
-        del block_number, timestamp
-        return True
-
-    @classmethod
-    def tx_types(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[int]:
-        """At London, dynamic fee transactions are introduced."""
-        return [2] + super(London, cls).tx_types(
-            block_number=block_number, timestamp=timestamp
-        )
-
-    @classmethod
-    def contract_creating_tx_types(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[int]:
-        """At London, dynamic fee transactions are introduced."""
-        return [2] + super(London, cls).contract_creating_tx_types(
-            block_number=block_number, timestamp=timestamp
-        )
-
-    @classmethod
-    def opcode_gas_map(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
-        """Add London opcodes gas costs."""
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
-        base_map = super(London, cls).opcode_gas_map(
-            block_number=block_number, timestamp=timestamp
-        )
-        return {
-            **base_map,
-            Opcodes.BASEFEE: gas_costs.GAS_BASE,
-        }
-
-    @classmethod
-    def valid_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
-        """Return list of Opcodes that are valid to work on this fork."""
-        del block_number, timestamp
-        return [Opcodes.BASEFEE] + super(London, cls).valid_opcodes()
-
-    @classmethod
-    def max_refund_quotient(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the max refund quotient at London."""
-        del block_number, timestamp
-        return 5
-
-    @classmethod
-    def base_fee_max_change_denominator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the base fee max change denominator at London."""
-        del block_number, timestamp
-        return 8
-
-    @classmethod
-    def base_fee_elasticity_multiplier(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the base fee elasticity multiplier at London."""
-        del block_number, timestamp
-        return 2
-
-    @classmethod
-    def base_fee_per_gas_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> BaseFeePerGasCalculator:
-        """
-        Return a callable that calculates the base fee per gas at London.
-
-        EIP-1559 block validation pseudo code:
-
-        if INITIAL_FORK_BLOCK_NUMBER == block.number:
-            expected_base_fee_per_gas = INITIAL_BASE_FEE
-        elif parent_gas_used == parent_gas_target:
-            expected_base_fee_per_gas = parent_base_fee_per_gas
-        elif parent_gas_used > parent_gas_target:
-            gas_used_delta = parent_gas_used - parent_gas_target
-            base_fee_per_gas_delta = max( parent_base_fee_per_gas
-                                  * gas_used_delta // parent_gas_target //
-                                  BASE_FEE_MAX_CHANGE_DENOMINATOR, 1, )
-            expected_base_fee_per_gas = parent_base_fee_per_gas +
-                                       base_fee_per_gas_delta
-        else:
-            gas_used_delta = parent_gas_target - parent_gas_used
-            base_fee_per_gas_delta = (
-                              parent_base_fee_per_gas * gas_used_delta //
-                              parent_gas_target //
-                              BASE_FEE_MAX_CHANGE_DENOMINATOR
-                              )
-            expected_base_fee_per_gas = parent_base_fee_per_gas -
-                                        base_fee_per_gas_delta
-        """
-        base_fee_max_change_denominator = cls.base_fee_max_change_denominator(
-            block_number=block_number, timestamp=timestamp
-        )
-        elasticity_multiplier = cls.base_fee_elasticity_multiplier(
-            block_number=block_number, timestamp=timestamp
-        )
-
-        def fn(
-            *,
-            parent_base_fee_per_gas: int,
-            parent_gas_used: int,
-            parent_gas_limit: int,
-        ) -> int:
-            parent_gas_target = parent_gas_limit // elasticity_multiplier
-            if parent_gas_used == parent_gas_target:
-                return parent_base_fee_per_gas
-            elif parent_gas_used > parent_gas_target:
-                gas_used_delta = parent_gas_used - parent_gas_target
-                base_fee_per_gas_delta = max(
-                    parent_base_fee_per_gas
-                    * gas_used_delta
-                    // parent_gas_target
-                    // base_fee_max_change_denominator,
-                    1,
-                )
-                return parent_base_fee_per_gas + base_fee_per_gas_delta
-            else:
-                gas_used_delta = parent_gas_target - parent_gas_used
-                base_fee_per_gas_delta = (
-                    parent_base_fee_per_gas
-                    * gas_used_delta
-                    // parent_gas_target
-                    // base_fee_max_change_denominator
-                )
-                return parent_base_fee_per_gas - base_fee_per_gas_delta
-
-        return fn
-
-    @classmethod
-    def base_fee_change_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> BaseFeeChangeCalculator:
-        """
-        Return a callable that calculates the gas that needs to be used to
-        change the base fee.
-        """
-        base_fee_max_change_denominator = cls.base_fee_max_change_denominator(
-            block_number=block_number, timestamp=timestamp
-        )
-        elasticity_multiplier = cls.base_fee_elasticity_multiplier(
-            block_number=block_number, timestamp=timestamp
-        )
-        base_fee_per_gas_calculator = cls.base_fee_per_gas_calculator(
-            block_number=block_number, timestamp=timestamp
-        )
-
-        def fn(
-            *,
-            parent_base_fee_per_gas: int,
-            parent_gas_limit: int,
-            required_base_fee_per_gas: int,
-        ) -> int:
-            parent_gas_target = parent_gas_limit // elasticity_multiplier
-
-            if parent_base_fee_per_gas == required_base_fee_per_gas:
-                return parent_gas_target
-            elif required_base_fee_per_gas > parent_base_fee_per_gas:
-                # Base fee needs to go up, so we need to use more than target
-                base_fee_per_gas_delta = (
-                    required_base_fee_per_gas - parent_base_fee_per_gas
-                )
-                parent_gas_used = (
-                    (
-                        base_fee_per_gas_delta
-                        * base_fee_max_change_denominator
-                        * parent_gas_target
-                    )
-                    // parent_base_fee_per_gas
-                ) + parent_gas_target
-            elif required_base_fee_per_gas < parent_base_fee_per_gas:
-                # Base fee needs to go down, so we need to use less than target
-                base_fee_per_gas_delta = (
-                    parent_base_fee_per_gas - required_base_fee_per_gas
-                )
-
-                parent_gas_used = (
-                    parent_gas_target
-                    - (
-                        (
-                            base_fee_per_gas_delta
-                            * base_fee_max_change_denominator
-                            * parent_gas_target
-                        )
-                        // parent_base_fee_per_gas
-                    )
-                    - 1
-                )
-
-            assert (
-                base_fee_per_gas_calculator(
-                    parent_base_fee_per_gas=parent_base_fee_per_gas,
-                    parent_gas_used=parent_gas_used,
-                    parent_gas_limit=parent_gas_limit,
-                )
-                == required_base_fee_per_gas
-            )
-
-            return parent_gas_used
-
-        return fn
-
-
-# Glacier forks skipped, unless explicitly specified
-class ArrowGlacier(London, solc_name="london", ignore=True):
-    """Arrow Glacier fork."""
-
-    pass
-
-
-class GrayGlacier(ArrowGlacier, solc_name="london", ignore=True):
-    """Gray Glacier fork."""
-
-    pass
-
-
-class Paris(
-    London,
-    transition_tool_name="Merge",
-):
-    """Paris (Merge) fork."""
-
-    @classmethod
-    def header_prev_randao_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """Prev Randao is required starting from Paris."""
-        del block_number, timestamp
-        return True
-
-    @classmethod
-    def header_zero_difficulty_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """Zero difficulty is required starting from Paris."""
-        del block_number, timestamp
-        return True
-
-    @classmethod
-    def get_reward(cls, *, block_number: int = 0, timestamp: int = 0) -> int:
-        """Paris updates the reward to 0."""
-        del block_number, timestamp
-        return 0
-
-    @classmethod
-    def engine_new_payload_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
-        """From Paris, payloads can be sent through the engine API."""
-        del block_number, timestamp
-        return 1
-
-
-class Shanghai(Paris):
-    """Shanghai fork."""
-
-    @classmethod
-    def header_withdrawals_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """Withdrawals are required starting from Shanghai."""
-        del block_number, timestamp
-        return True
-
-    @classmethod
-    def engine_new_payload_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
-        """From Shanghai, new payload calls must use version 2."""
-        del block_number, timestamp
-        return 2
-
-    @classmethod
-    def max_initcode_size(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """From Shanghai, the initcode size is now limited. See EIP-3860."""
-        del block_number, timestamp
-        return 0xC000
-
-    @classmethod
-    def _calculate_create_gas(
-        cls, opcode: OpcodeBase, gas_costs: GasCosts
-    ) -> int:
-        """
-        Calculate CREATE gas cost based on metadata (from Shanghai, includes
-        initcode cost).
-        """
-        metadata = opcode.metadata
-
-        # Get base cost from parent fork
-        base_cost = super(Shanghai, cls)._calculate_create_gas(
-            opcode, gas_costs
-        )
-
-        # Add initcode cost (EIP-3860)
-        init_code_size = metadata["init_code_size"]
-        init_code_words = (init_code_size + 31) // 32
-        init_code_gas = gas_costs.GAS_CODE_INIT_PER_WORD * init_code_words
-
-        return base_cost + init_code_gas
-
-    @classmethod
-    def _calculate_create2_gas(
-        cls, opcode: OpcodeBase, gas_costs: GasCosts
-    ) -> int:
-        """
-        Calculate CREATE2 gas cost based on metadata (from Shanghai,
-        includes initcode cost).
-        """
-        metadata = opcode.metadata
-
-        # Get base cost from parent fork (includes keccak hash cost)
-        base_cost = super(Shanghai, cls)._calculate_create2_gas(
-            opcode, gas_costs
-        )
-
-        # Add initcode cost (EIP-3860)
-        init_code_size = metadata["init_code_size"]
-        init_code_words = (init_code_size + 31) // 32
-        init_code_gas = gas_costs.GAS_CODE_INIT_PER_WORD * init_code_words
-
-        return base_cost + init_code_gas
-
-    @classmethod
-    def opcode_gas_map(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
-        """Add Shanghai opcodes gas costs."""
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
-        base_map = super(Shanghai, cls).opcode_gas_map(
-            block_number=block_number, timestamp=timestamp
-        )
-        return {
-            **base_map,
-            Opcodes.PUSH0: gas_costs.GAS_BASE,
-        }
-
-    @classmethod
-    def valid_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
-        """Return list of Opcodes that are valid to work on this fork."""
-        del block_number, timestamp
-        return [Opcodes.PUSH0] + super(Shanghai, cls).valid_opcodes()
-
-
-class Cancun(Shanghai):
-    """Cancun fork."""
-
-    BLOB_CONSTANTS = {  # every value is an int or a Literal
-        "FIELD_ELEMENTS_PER_BLOB": 4096,
-        "BYTES_PER_FIELD_ELEMENT": 32,
-        "CELL_LENGTH": 2048,
-        # EIP-2537: Main subgroup order = q, due to this BLS_MODULUS
-        # every blob byte (uint256) must be smaller than 116
-        "BLS_MODULUS": (
-            0x73EDA753299D7D483339D80809A1D80553BDA402FFFE5BFEFFFFFFFF00000001
-        ),
-        # https://github.com/ethereum/consensus-specs/blob/
-        # cc6996c22692d70e41b7a453d925172ee4b719ad/specs/deneb/
-        # polynomial-commitments.md?plain=1#L78
-        "BYTES_PER_PROOF": 48,
-        "BYTES_PER_COMMITMENT": 48,
-        "KZG_ENDIANNESS": "big",
-        "AMOUNT_CELL_PROOFS": 0,
-    }
-
-    @classmethod
-    def get_blob_constant(cls, name: str) -> int | Literal["big"]:
-        """Return blob constant if it exists."""
-        retrieved_constant = cls.BLOB_CONSTANTS.get(name)
-        assert retrieved_constant is not None, (
-            f"You tried to retrieve the blob constant {name} but it does "
-            "not exist!"
-        )
-        return retrieved_constant
-
-    @classmethod
-    def header_excess_blob_gas_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """Excess blob gas is required starting from Cancun."""
-        del block_number, timestamp
-        return True
-
-    @classmethod
-    def header_blob_gas_used_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """Blob gas used is required starting from Cancun."""
-        del block_number, timestamp
-        return True
-
-    @classmethod
-    def header_beacon_root_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """Parent beacon block root is required starting from Cancun."""
-        del block_number, timestamp
-        return True
-
-    @classmethod
-    def blob_gas_price_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> BlobGasPriceCalculator:
-        """Return a callable that calculates the blob gas price at Cancun."""
-        min_base_fee_per_blob_gas = cls.min_base_fee_per_blob_gas(
-            block_number=block_number, timestamp=timestamp
-        )
-        blob_base_fee_update_fraction = cls.blob_base_fee_update_fraction(
-            block_number=block_number, timestamp=timestamp
-        )
-
-        def fn(*, excess_blob_gas: int) -> int:
-            return fake_exponential(
-                min_base_fee_per_blob_gas,
-                excess_blob_gas,
-                blob_base_fee_update_fraction,
-            )
-
-        return fn
-
-    @classmethod
-    def excess_blob_gas_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> ExcessBlobGasCalculator:
-        """
-        Return a callable that calculates the excess blob gas for a block at
-        Cancun.
-        """
-        target_blobs_per_block = cls.target_blobs_per_block(
-            block_number=block_number, timestamp=timestamp
-        )
-        blob_gas_per_blob = cls.blob_gas_per_blob(
-            block_number=block_number, timestamp=timestamp
-        )
-        blob_target_gas_per_block = target_blobs_per_block * blob_gas_per_blob
-
-        def fn(
-            *,
-            parent_excess_blob_gas: int | None = None,
-            parent_excess_blobs: int | None = None,
-            parent_blob_gas_used: int | None = None,
-            parent_blob_count: int | None = None,
-            # Required for Osaka as using this as base
-            parent_base_fee_per_gas: int,
-        ) -> int:
-            del parent_base_fee_per_gas
-
-            if parent_excess_blob_gas is None:
-                assert parent_excess_blobs is not None, (
-                    "Parent excess blobs are required"
-                )
-                parent_excess_blob_gas = (
-                    parent_excess_blobs * blob_gas_per_blob
-                )
-            if parent_blob_gas_used is None:
-                assert parent_blob_count is not None, (
-                    "Parent blob count is required"
-                )
-                parent_blob_gas_used = parent_blob_count * blob_gas_per_blob
-            if (
-                parent_excess_blob_gas + parent_blob_gas_used
-                < blob_target_gas_per_block
-            ):
-                return 0
-            else:
-                return (
-                    parent_excess_blob_gas
-                    + parent_blob_gas_used
-                    - blob_target_gas_per_block
-                )
-
-        return fn
-
-    @classmethod
-    def min_base_fee_per_blob_gas(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the minimum base fee per blob gas for Cancun."""
-        del block_number, timestamp
-        return 1
-
-    @classmethod
-    def blob_base_fee_update_fraction(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the blob base fee update fraction for Cancun."""
-        del block_number, timestamp
-        return 3338477
-
-    @classmethod
-    def blob_gas_per_blob(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Blobs are enabled starting from Cancun."""
-        del block_number, timestamp
-        return 2**17
-
-    @classmethod
-    def supports_blobs(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """At Cancun, blobs support is enabled."""
-        del block_number, timestamp
-        return True
-
-    @classmethod
-    def target_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """
-        Blobs are enabled starting from Cancun, with a static target of 3 blobs
-        per block.
-        """
-        del block_number, timestamp
-        return 3
-
-    @classmethod
-    def max_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """
-        Blobs are enabled starting from Cancun, with a static max of 6 blobs
-        per block.
-        """
-        del block_number, timestamp
-        return 6
-
-    @classmethod
-    def blob_reserve_price_active(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """Blob reserve price is not supported in Cancun."""
-        del block_number, timestamp
-        return False
-
-    @classmethod
-    def full_blob_tx_wrapper_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int | None:
-        """
-        Pre-Osaka forks don't use tx wrapper versions for full blob
-        transactions.
-        """
-        del block_number, timestamp
-        return None
-
-    @classmethod
-    def max_blobs_per_tx(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """
-        Blobs are enabled starting from Cancun, with a static max equal to the
-        max per block.
-        """
-        return cls.max_blobs_per_block(
-            block_number=block_number, timestamp=timestamp
-        )
-
-    @classmethod
-    def blob_schedule(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> BlobSchedule | None:
-        """
-        At Cancun, the fork object runs this routine to get the updated blob
-        schedule.
-        """
-        parent_fork = cls.parent()
-        assert parent_fork is not None, "Parent fork must be defined"
-        blob_schedule = (
-            parent_fork.blob_schedule(
-                block_number=block_number, timestamp=timestamp
-            )
-            or BlobSchedule()
-        )
-        current_blob_schedule = ForkBlobSchedule(
-            target_blobs_per_block=cls.target_blobs_per_block(
-                block_number=block_number, timestamp=timestamp
-            ),
-            max_blobs_per_block=cls.max_blobs_per_block(
-                block_number=block_number, timestamp=timestamp
-            ),
-            base_fee_update_fraction=cls.blob_base_fee_update_fraction(
-                block_number=block_number, timestamp=timestamp
-            ),
-        )
-        blob_schedule.append(fork=cls.name(), schedule=current_blob_schedule)
-        return blob_schedule
-
-    @classmethod
-    def tx_types(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[int]:
-        """At Cancun, blob type transactions are introduced."""
-        return [3] + super(Cancun, cls).tx_types(
-            block_number=block_number, timestamp=timestamp
-        )
-
-    @classmethod
-    def precompiles(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Address]:
-        """At Cancun, a precompile for kzg point evaluation is introduced."""
-        return [
-            Address(10, label="KZG_POINT_EVALUATION"),
-        ] + super(Cancun, cls).precompiles(
-            block_number=block_number, timestamp=timestamp
-        )
-
-    @classmethod
-    def system_contracts(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Address]:
-        """Cancun introduces the system contract for EIP-4788."""
-        del block_number, timestamp
-        return [
-            Address(
-                0x000F3DF6D732807EF1319FB7B8BB8522D0BEAC02,
-                label="BEACON_ROOTS_ADDRESS",
-            )
-        ]
-
-    @classmethod
-    def pre_allocation_blockchain(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Mapping:
-        """
-        Cancun requires pre-allocation of the beacon root contract for EIP-4788
-        on blockchain type tests.
-        """
-        del block_number, timestamp
-        new_allocation = {
-            0x000F3DF6D732807EF1319FB7B8BB8522D0BEAC02: {
-                "nonce": 1,
-                "code": "0x3373fffffffffffffffffffffffffffffffffffffffe14604d"
-                "57602036146024575f5ffd5b5f35801560495762001fff810690"
-                "815414603c575f5ffd5b62001fff01545f5260205ff35b5f5ffd"
-                "5b62001fff42064281555f359062001fff015500",
-            }
-        }
-        return new_allocation | super(Cancun, cls).pre_allocation_blockchain()  # type: ignore
-
-    @classmethod
-    def engine_new_payload_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
-        """From Cancun, new payload calls must use version 3."""
-        del block_number, timestamp
-        return 3
-
-    @classmethod
-    def engine_get_blobs_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
-        """At Cancun, the engine get blobs version is 1."""
-        del block_number, timestamp
-        return 1
-
-    @classmethod
-    def engine_new_payload_blob_hashes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """From Cancun, payloads must have blob hashes."""
-        del block_number, timestamp
-        return True
-
-    @classmethod
-    def engine_new_payload_beacon_root(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """From Cancun, payloads must have a parent beacon block root."""
-        del block_number, timestamp
-        return True
-
-    @classmethod
-    def gas_costs(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> GasCosts:
-        """On Cancun, the point evaluation precompile gas cost is set."""
-        return replace(
-            super(Cancun, cls).gas_costs(
-                block_number=block_number, timestamp=timestamp
-            ),
-            GAS_PRECOMPILE_POINT_EVALUATION=50_000,
-        )
-
-    @classmethod
-    def opcode_gas_map(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
-        """
-        Return a mapping of opcodes to their gas costs for Cancun.
-
-        Adds Cancun-specific opcodes: BLOBHASH, BLOBBASEFEE, TLOAD, TSTORE,
-        MCOPY.
-        """
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
-        memory_expansion_calculator = cls.memory_expansion_gas_calculator(
-            block_number=block_number, timestamp=timestamp
-        )
-
-        # Get parent fork's opcode gas map
-        base_map = super(Cancun, cls).opcode_gas_map(
-            block_number=block_number, timestamp=timestamp
-        )
-
-        # Add Cancun-specific opcodes
-        return {
-            **base_map,
-            # EIP-4844: Shard Blob Transactions
-            Opcodes.BLOBHASH: gas_costs.GAS_VERY_LOW,
-            # EIP-7516: BLOBBASEFEE opcode
-            Opcodes.BLOBBASEFEE: gas_costs.GAS_BASE,
-            # EIP-1153: Transient storage opcodes
-            Opcodes.TLOAD: gas_costs.GAS_WARM_SLOAD,
-            Opcodes.TSTORE: gas_costs.GAS_WARM_SLOAD,
-            # EIP-5656: MCOPY - Memory copying instruction
-            Opcodes.MCOPY: cls._with_memory_expansion(
-                cls._with_data_copy(gas_costs.GAS_VERY_LOW, gas_costs),
-                memory_expansion_calculator,
-            ),
-        }
-
-    @classmethod
-    def valid_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
-        """Return list of Opcodes that are valid to work on this fork."""
-        del block_number, timestamp
-        return [
-            Opcodes.BLOBHASH,
-            Opcodes.BLOBBASEFEE,
-            Opcodes.TLOAD,
-            Opcodes.TSTORE,
-            Opcodes.MCOPY,
-        ] + super(Cancun, cls).valid_opcodes()
-
-
-class Prague(Cancun):
-    """Prague fork."""
-
-    # update some blob constants
-    BLOB_CONSTANTS = {
-        **Cancun.BLOB_CONSTANTS,  # same base constants as cancun
-        "MAX_BLOBS_PER_BLOCK": 9,  # but overwrite or add these
-        "TARGET_BLOBS_PER_BLOCK": 6,
-        "MAX_BLOB_GAS_PER_BLOCK": 1179648,
-        "BLOB_TARGET_GAS_PER_BLOCK": 786432,
-        "BLOB_BASE_FEE_UPDATE_FRACTION": 5007716,
-    }
-
-    @classmethod
-    def precompiles(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Address]:
-        """
-        At Prague, precompiles for BLS operations are added.
-
-        BLS12_G1ADD = 0x0B
-        BLS12_G1MSM = 0x0C
-        BLS12_G2ADD = 0x0D
-        BLS12_G2MSM = 0x0E
-        BLS12_PAIRING_CHECK = 0x0F
-        BLS12_MAP_FP_TO_G1 = 0x10
-        BLS12_MAP_FP2_TO_G2 = 0x11
-        """
-        return [
-            Address(11, label="BLS12_G1ADD"),
-            Address(12, label="BLS12_G1MSM"),
-            Address(13, label="BLS12_G2ADD"),
-            Address(14, label="BLS12_G2MSM"),
-            Address(15, label="BLS12_PAIRING_CHECK"),
-            Address(16, label="BLS12_MAP_FP_TO_G1"),
-            Address(17, label="BLS12_MAP_FP2_TO_G2"),
-        ] + super(Prague, cls).precompiles(
-            block_number=block_number, timestamp=timestamp
-        )
-
-    @classmethod
-    def tx_types(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[int]:
-        """At Prague, set-code type transactions are introduced."""
-        return [4] + super(Prague, cls).tx_types(
-            block_number=block_number, timestamp=timestamp
-        )
-
-    @classmethod
-    def gas_costs(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> GasCosts:
-        """
-        On Prague, the standard token cost and the floor token costs are
-        introduced due to EIP-7623.
-        """
-        return replace(
-            super(Prague, cls).gas_costs(
-                block_number=block_number, timestamp=timestamp
-            ),
-            GAS_TX_DATA_TOKEN_STANDARD=4,  # https://eips.ethereum.org/EIPS/eip-7623
-            GAS_TX_DATA_TOKEN_FLOOR=10,
-            GAS_AUTH_PER_EMPTY_ACCOUNT=25_000,
-            REFUND_AUTH_PER_EXISTING_ACCOUNT=12_500,
-            GAS_PRECOMPILE_BLS_G1ADD=375,
-            GAS_PRECOMPILE_BLS_G1MUL=12_000,
-            GAS_PRECOMPILE_BLS_G1MAP=5_500,
-            GAS_PRECOMPILE_BLS_G2ADD=600,
-            GAS_PRECOMPILE_BLS_G2MUL=22_500,
-            GAS_PRECOMPILE_BLS_G2MAP=23_800,
-            GAS_PRECOMPILE_BLS_PAIRING_BASE=37_700,
-            GAS_PRECOMPILE_BLS_PAIRING_PER_PAIR=32_600,
-        )
-
-    @classmethod
-    def system_contracts(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Address]:
-        """
-        Prague introduces the system contracts for EIP-6110, EIP-7002, EIP-7251
-        and EIP-2935.
-        """
-        return [
-            Address(
-                0x00000000219AB540356CBB839CBE05303D7705FA,
-                label="DEPOSIT_CONTRACT_ADDRESS",
-            ),
-            Address(
-                0x00000961EF480EB55E80D19AD83579A64C007002,
-                label="WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS",
-            ),
-            Address(
-                0x0000BBDDC7CE488642FB579F8B00F3A590007251,
-                label="CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS",
-            ),
-            Address(
-                0x0000F90827F1C53A10CB7A02335B175320002935,
-                label="HISTORY_STORAGE_ADDRESS",
-            ),
-        ] + super(Prague, cls).system_contracts(
-            block_number=block_number, timestamp=timestamp
-        )
-
-    @classmethod
-    def max_request_type(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """
-        At Prague, three request types are introduced, hence the max request
-        type is 2.
-        """
-        del block_number, timestamp
-        return 2
-
-    @classmethod
-    def calldata_gas_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> CalldataGasCalculator:
-        """
-        Return a callable that calculates the transaction gas cost for its
-        calldata depending on its contents.
-        """
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
-
-        def fn(*, data: BytesConvertible, floor: bool = False) -> int:
-            raw = Bytes(data)
-            num_zeros = raw.count(0)
-            num_non_zeros = len(raw) - num_zeros
-            tokens = num_zeros + num_non_zeros * 4
-            if floor:
-                return tokens * gas_costs.GAS_TX_DATA_TOKEN_FLOOR
-            return tokens * gas_costs.GAS_TX_DATA_TOKEN_STANDARD
-
-        return fn
-
-    @classmethod
-    def _calculate_call_gas(
-        cls, opcode: OpcodeBase, gas_costs: GasCosts
-    ) -> int:
-        """
-        At Prague, the call gas cost needs to take the authorization into
-        account.
-        """
-        metadata = opcode.metadata
-
-        base_cost = super(Prague, cls)._calculate_call_gas(opcode, gas_costs)
-
-        if metadata["delegated_address"] or metadata["delegated_address_warm"]:
-            if metadata["delegated_address_warm"]:
-                base_cost += gas_costs.GAS_WARM_ACCOUNT_ACCESS
-            else:
-                base_cost += gas_costs.GAS_COLD_ACCOUNT_ACCESS
-
-        return base_cost
-
-    @classmethod
-    def transaction_data_floor_cost_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> TransactionDataFloorCostCalculator:
-        """
-        On Prague, due to EIP-7623, the transaction data floor cost is
-        introduced.
-        """
-        calldata_gas_calculator = cls.calldata_gas_calculator(
-            block_number=block_number, timestamp=timestamp
-        )
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
-
-        def fn(*, data: BytesConvertible) -> int:
-            return (
-                calldata_gas_calculator(data=data, floor=True)
-                + gas_costs.GAS_TX_BASE
-            )
-
-        return fn
-
-    @classmethod
-    def transaction_intrinsic_cost_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> TransactionIntrinsicCostCalculator:
-        """
-        At Prague, the transaction intrinsic cost needs to take the
-        authorizations into account.
-        """
-        super_fn = super(Prague, cls).transaction_intrinsic_cost_calculator(
-            block_number=block_number, timestamp=timestamp
-        )
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
-        transaction_data_floor_cost_calculator = (
-            cls.transaction_data_floor_cost_calculator(
-                block_number=block_number, timestamp=timestamp
-            )
-        )
-
-        def fn(
-            *,
-            calldata: BytesConvertible = b"",
-            contract_creation: bool = False,
-            access_list: List[AccessList] | None = None,
-            authorization_list_or_count: Sized | int | None = None,
-            return_cost_deducted_prior_execution: bool = False,
-        ) -> int:
-            intrinsic_cost: int = super_fn(
-                calldata=calldata,
-                contract_creation=contract_creation,
-                access_list=access_list,
-                return_cost_deducted_prior_execution=False,
-            )
-            if authorization_list_or_count is not None:
-                if isinstance(authorization_list_or_count, Sized):
-                    authorization_list_or_count = len(
-                        authorization_list_or_count
-                    )
-                intrinsic_cost += (
-                    authorization_list_or_count
-                    * gas_costs.GAS_AUTH_PER_EMPTY_ACCOUNT
-                )
-
-            if return_cost_deducted_prior_execution:
-                return intrinsic_cost
-
-            transaction_floor_data_cost = (
-                transaction_data_floor_cost_calculator(data=calldata)
-            )
-            return max(intrinsic_cost, transaction_floor_data_cost)
-
-        return fn
-
-    @classmethod
-    def blob_base_fee_update_fraction(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the blob base fee update fraction for Prague."""
-        del block_number, timestamp
-        return 5007716
-
-    @classmethod
-    def target_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Blobs in Prague, have a static target of 6 blobs per block."""
-        del block_number, timestamp
-        return 6
-
-    @classmethod
-    def max_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Blobs in Prague, have a static max of 9 blobs per block."""
-        del block_number, timestamp
-        return 9
-
-    @classmethod
-    def pre_allocation_blockchain(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Mapping:
-        """
-        Prague requires pre-allocation of the beacon chain deposit contract for
-        EIP-6110, the exits contract for EIP-7002, and the history storage
-        contract for EIP-2935.
-        """
-        del block_number, timestamp
-        new_allocation = {}
-
-        # Add the beacon chain deposit contract
-        deposit_contract_tree_depth = 32
-        storage = {}
-        next_hash = sha256(b"\x00" * 64).digest()
-        for i in range(
-            deposit_contract_tree_depth + 2,
-            deposit_contract_tree_depth * 2 + 1,
-        ):
-            storage[i] = next_hash
-            next_hash = sha256(next_hash + next_hash).digest()
-
-        with open(
-            CURRENT_FOLDER / "contracts" / "deposit_contract.bin", mode="rb"
-        ) as f:
-            new_allocation.update(
-                {
-                    0x00000000219AB540356CBB839CBE05303D7705FA: {
-                        "nonce": 1,
-                        "code": f.read(),
-                        "storage": storage,
-                    }
-                }
-            )
+    pass
 
-        # EIP-7002: Add the withdrawal request contract
-        with open(
-            CURRENT_FOLDER / "contracts" / "withdrawal_request.bin", mode="rb"
-        ) as f:
-            new_allocation.update(
-                {
-                    0x00000961EF480EB55E80D19AD83579A64C007002: {
-                        "nonce": 1,
-                        "code": f.read(),
-                    },
-                }
-            )
 
-        # EIP-7251: Add the consolidation request contract
-        with open(
-            CURRENT_FOLDER / "contracts" / "consolidation_request.bin",
-            mode="rb",
-        ) as f:
-            new_allocation.update(
-                {
-                    0x0000BBDDC7CE488642FB579F8B00F3A590007251: {
-                        "nonce": 1,
-                        "code": f.read(),
-                    },
-                }
-            )
+# Glacier forks skipped, unless explicitly specified
+class MuirGlacier(
+    Istanbul,
+    solc_name="istanbul",
+    ignore=True,
+):
+    """Muir Glacier fork."""
 
-        # EIP-2935: Add the history storage contract
-        with open(
-            CURRENT_FOLDER / "contracts" / "history_contract.bin", mode="rb"
-        ) as f:
-            new_allocation.update(
-                {
-                    0x0000F90827F1C53A10CB7A02335B175320002935: {
-                        "nonce": 1,
-                        "code": f.read(),
-                    }
-                }
-            )
+    pass
 
-        return new_allocation | super(Prague, cls).pre_allocation_blockchain()  # type: ignore
 
-    @classmethod
-    def header_requests_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """
-        Prague requires that the execution layer header contains the beacon
-        chain requests hash.
-        """
-        del block_number, timestamp
-        return True
+class Berlin(
+    eips.EIP2930,
+    Istanbul,
+):
+    """Berlin fork."""
 
-    @classmethod
-    def engine_new_payload_requests(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """
-        From Prague, new payloads include the requests hash as a parameter.
-        """
-        del block_number, timestamp
-        return True
+    pass
 
-    @classmethod
-    def engine_new_payload_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
-        """From Prague, new payload calls must use version 4."""
-        del block_number, timestamp
-        return 4
 
-    @classmethod
-    def engine_forkchoice_updated_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
-        """
-        At Prague, version number of NewPayload and ForkchoiceUpdated diverge.
-        """
-        del block_number, timestamp
-        return 3
+class London(
+    eips.EIP3529,
+    eips.EIP3198,
+    eips.EIP1559,
+    Berlin,
+):
+    """London fork."""
 
+    pass
 
-class Osaka(Prague, solc_name="cancun"):
-    """Osaka fork."""
 
-    # update some blob constants
-    BLOB_CONSTANTS = {
-        **Prague.BLOB_CONSTANTS,  # same base constants as prague
-        "AMOUNT_CELL_PROOFS": 128,
-    }
+# Glacier forks skipped, unless explicitly specified
+class ArrowGlacier(
+    London,
+    solc_name="london",
+    ignore=True,
+):
+    """Arrow Glacier fork."""
 
-    @classmethod
-    def engine_get_payload_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
-        """From Osaka, get payload calls must use version 5."""
-        del block_number, timestamp
-        return 5
+    pass
 
-    @classmethod
-    def engine_get_blobs_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
-        """At Osaka, the engine get blobs version is 2."""
-        del block_number, timestamp
-        return 2
 
-    @classmethod
-    def full_blob_tx_wrapper_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int | None:
-        """At Osaka, the full blob transaction wrapper version is defined."""
-        del block_number, timestamp
-        return 1
+class GrayGlacier(
+    ArrowGlacier,
+    solc_name="london",
+    ignore=True,
+):
+    """Gray Glacier fork."""
 
-    @classmethod
-    def transaction_gas_limit_cap(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int | None:
-        """At Osaka, transaction gas limit is capped at 16 million (2**24)."""
-        del block_number, timestamp
-        return 16_777_216
+    pass
 
-    @classmethod
-    def block_rlp_size_limit(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int | None:
-        """From Osaka, block RLP size is limited as specified in EIP-7934."""
-        del block_number, timestamp
 
-        max_block_size = 10_485_760
-        safety_margin = 2_097_152
-        return max_block_size - safety_margin
+class Paris(
+    eips.EIP3675,
+    London,
+    transition_tool_name="Merge",
+    ruleset_name="MERGE",
+):
+    """Paris (Merge) fork."""
 
-    @classmethod
-    def opcode_gas_map(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Dict[OpcodeBase, int | Callable[[OpcodeBase], int]]:
-        """Add Osaka opcodes gas costs."""
-        gas_costs = cls.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
-        base_map = super(Osaka, cls).opcode_gas_map(
-            block_number=block_number, timestamp=timestamp
-        )
-        return {
-            **base_map,
-            Opcodes.CLZ: gas_costs.GAS_LOW,
-        }
+    pass
 
-    @classmethod
-    def valid_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
-        """Return list of Opcodes that are valid to work on this fork."""
-        del block_number, timestamp
-        return [
-            Opcodes.CLZ,
-        ] + super(Prague, cls).valid_opcodes()
 
-    @classmethod
-    def precompiles(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Address]:
-        """
-        At Osaka, a precompile for p256verify operation is added.
+class Shanghai(
+    eips.EIP3855,
+    eips.EIP3860,
+    eips.EIP4895,
+    Paris,
+    fork_by_timestamp=True,
+):
+    """Shanghai fork."""
 
-        P256VERIFY = 0x100
-        """
-        return [
-            Address(0x100, label="P256VERIFY"),
-        ] + super(Osaka, cls).precompiles(
-            block_number=block_number, timestamp=timestamp
-        )
+    pass
 
-    @classmethod
-    def gas_costs(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> GasCosts:
-        """On Osaka, the P256VERIFY precompile gas cost is set."""
-        return replace(
-            super(Osaka, cls).gas_costs(
-                block_number=block_number, timestamp=timestamp
-            ),
-            GAS_PRECOMPILE_P256VERIFY=6_900,
-        )
 
-    @classmethod
-    def excess_blob_gas_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> ExcessBlobGasCalculator:
-        """
-        Return a callable that calculates the excess blob gas for a block.
-        """
-        target_blobs_per_block = cls.target_blobs_per_block(
-            block_number=block_number, timestamp=timestamp
-        )
-        blob_gas_per_blob = cls.blob_gas_per_blob(
-            block_number=block_number, timestamp=timestamp
-        )
-        blob_target_gas_per_block = target_blobs_per_block * blob_gas_per_blob
-        max_blobs_per_block = cls.max_blobs_per_block(
-            block_number=block_number, timestamp=timestamp
-        )
-        blob_base_cost = 2**13  # EIP-7918 new parameter
+class Cancun(
+    eips.EIP5656,
+    eips.EIP1153,
+    eips.EIP4788,
+    eips.EIP4844,
+    eips.EIP7516,
+    eips.EIP6780,
+    Shanghai,
+):
+    """Cancun fork."""
 
-        def fn(
-            *,
-            parent_excess_blob_gas: int | None = None,
-            parent_excess_blobs: int | None = None,
-            parent_blob_gas_used: int | None = None,
-            parent_blob_count: int | None = None,
-            parent_base_fee_per_gas: int,  # EIP-7918 additional parameter
-        ) -> int:
-            if parent_excess_blob_gas is None:
-                assert parent_excess_blobs is not None, (
-                    "Parent excess blobs are required"
-                )
-                parent_excess_blob_gas = (
-                    parent_excess_blobs * blob_gas_per_blob
-                )
-            if parent_blob_gas_used is None:
-                assert parent_blob_count is not None, (
-                    "Parent blob count is required"
-                )
-                parent_blob_gas_used = parent_blob_count * blob_gas_per_blob
-            if (
-                parent_excess_blob_gas + parent_blob_gas_used
-                < blob_target_gas_per_block
-            ):
-                return 0
+    pass
 
-            # EIP-7918: Apply reserve price when execution costs dominate blob
-            # costs
-            current_blob_base_fee = cls.blob_gas_price_calculator()(
-                excess_blob_gas=parent_excess_blob_gas
-            )
-            reserve_price_active = (
-                blob_base_cost * parent_base_fee_per_gas
-                > blob_gas_per_blob * current_blob_base_fee
-            )
-            if reserve_price_active:
-                blob_excess_adjustment = (
-                    parent_blob_gas_used
-                    * (max_blobs_per_block - target_blobs_per_block)
-                    // max_blobs_per_block
-                )
-                return parent_excess_blob_gas + blob_excess_adjustment
 
-            # Original EIP-4844 calculation
-            return (
-                parent_excess_blob_gas
-                + parent_blob_gas_used
-                - blob_target_gas_per_block
-            )
+class Prague(
+    eips.EIP7691,
+    eips.EIP7685,
+    eips.EIP2935,
+    eips.EIP7251,
+    eips.EIP7002,
+    eips.EIP6110,
+    eips.EIP7623,
+    eips.EIP7702,
+    eips.EIP2537,
+    Cancun,
+):
+    """Prague fork."""
 
-        return fn
+    pass
 
-    @classmethod
-    def max_blobs_per_tx(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """
-        Blobs in Osaka, have a static max of 6 blobs per tx. Differs from the
-        max per block.
-        """
-        del block_number, timestamp
-        return 6
 
-    @classmethod
-    def blob_reserve_price_active(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """Blob reserve price is supported in Osaka."""
-        del block_number, timestamp
-        return True
+class Osaka(
+    eips.EIP7939,
+    eips.EIP7934,
+    eips.EIP7825,
+    eips.EIP7918,
+    eips.EIP7594,
+    eips.EIP7951,
+    Prague,
+    solc_name="cancun",
+):
+    """Osaka fork."""
 
-    @classmethod
-    def blob_base_cost(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the base cost of a blob at a given fork."""
-        del block_number, timestamp
-        return 2**13  # EIP-7918 new parameter
+    pass
 
 
 class MONAD_EIGHT(Prague, solc_name="cancun"):  # noqa: N801
     """MONAD_EIGHT fork."""
 
     @classmethod
-    def supports_blobs(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def supports_blobs(cls) -> bool:
         """MONAD_EIGHT does not support blob transactions."""
-        del block_number, timestamp
         return False
 
     @classmethod
-    def tx_types(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[int]:
+    def tx_types(cls) -> List[int]:
         """Return Prague transaction types without blob transactions."""
         return [
             tx_type
-            for tx_type in super(MONAD_EIGHT, cls).tx_types(
-                block_number=block_number, timestamp=timestamp
-            )
+            for tx_type in super(MONAD_EIGHT, cls).tx_types()
             if tx_type != 3
         ]
 
     @classmethod
-    def full_blob_tx_wrapper_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int | None:
+    def full_blob_tx_wrapper_version(cls) -> int | None:
         """MONAD_EIGHT does not wrap full blob transactions."""
-        del block_number, timestamp
         return None
 
     @classmethod
-    def blob_schedule(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> BlobSchedule | None:
+    def blob_schedule(cls) -> BlobSchedule | None:
         """MONAD_EIGHT does not advertise a blob schedule."""
-        del block_number, timestamp
         return None
 
     @classmethod
-    def engine_get_blobs_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
+    def engine_get_blobs_version(cls) -> Optional[int]:
         """MONAD_EIGHT does not expose blob retrieval over the engine API."""
-        del block_number, timestamp
         return None
 
     @classmethod
-    def engine_new_payload_blob_hashes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
+    def engine_new_payload_blob_hashes(cls) -> bool:
         """MONAD_EIGHT payloads do not include blob hashes."""
-        del block_number, timestamp
         return False
 
     @classmethod
-    def precompiles(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Address]:
+    def precompiles(cls) -> List[Address]:
         """
         At MONAD_EIGHT, a precompile for p256verify operation is added.
 
@@ -3356,72 +1559,54 @@ def precompiles(
         """
         return [
             Address(0x100, label="P256VERIFY"),
-        ] + super(MONAD_EIGHT, cls).precompiles(
-            block_number=block_number, timestamp=timestamp
-        )
+        ] + super(MONAD_EIGHT, cls).precompiles()
 
     @classmethod
-    def max_code_size(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def max_code_size(cls) -> int:
         # NOTE: Move this to Spurious Dragon once this fork is introduced. See
         # EIP-170.
         """
         MONAD_EIGHT sets its own max_code_size to a higher value.
         """
-        del block_number, timestamp
         return 128 * 1024
 
     @classmethod
-    def max_initcode_size(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def max_initcode_size(cls) -> int:
         """
         MONAD_EIGHT sets its own max_code_size, need to override default.
         """
-        return 2 * cls.max_code_size(
-            block_number=block_number, timestamp=timestamp
-        )
+        return 2 * cls.max_code_size()
 
     @classmethod
-    def gas_costs(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> GasCosts:
+    def gas_costs(cls) -> GasCosts:
         """
         Return dataclass with the defined gas costs constants for genesis.
         """
         # TODO: this is actually monad not osaka and actually apply equally
         # in monadized prague... so it's a mess need to think about
         # fork management
-        super_costs = super(MONAD_EIGHT, cls).gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
-        osaka_costs = Osaka.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
+        super_costs = super(MONAD_EIGHT, cls).gas_costs()
+        osaka_costs = Osaka.gas_costs()
         return replace(
             super_costs,
-            GAS_PRECOMPILE_BLAKE2F_PER_ROUND=super_costs.GAS_PRECOMPILE_BLAKE2F_PER_ROUND
+            PRECOMPILE_BLAKE2F_PER_ROUND=super_costs.PRECOMPILE_BLAKE2F_PER_ROUND
             * 2,
-            GAS_PRECOMPILE_ECADD=super_costs.GAS_PRECOMPILE_ECADD * 2,
-            GAS_PRECOMPILE_ECMUL=super_costs.GAS_PRECOMPILE_ECMUL * 5,
-            GAS_PRECOMPILE_ECPAIRING_BASE=super_costs.GAS_PRECOMPILE_ECPAIRING_BASE
+            PRECOMPILE_ECADD=super_costs.PRECOMPILE_ECADD * 2,
+            PRECOMPILE_ECMUL=super_costs.PRECOMPILE_ECMUL * 5,
+            PRECOMPILE_ECPAIRING_BASE=super_costs.PRECOMPILE_ECPAIRING_BASE
             * 5,
-            GAS_PRECOMPILE_ECPAIRING_PER_POINT=super_costs.GAS_PRECOMPILE_ECPAIRING_PER_POINT
+            PRECOMPILE_ECPAIRING_PER_POINT=super_costs.PRECOMPILE_ECPAIRING_PER_POINT
             * 5,
-            GAS_COLD_ACCOUNT_ACCESS=super_costs.GAS_COLD_ACCOUNT_ACCESS + 7500,
-            GAS_COLD_SLOAD=super_costs.GAS_COLD_SLOAD + 6000,
-            GAS_STORAGE_UPDATE=super_costs.GAS_STORAGE_UPDATE + 6000,
+            COLD_ACCOUNT_ACCESS=super_costs.COLD_ACCOUNT_ACCESS + 7500,
+            COLD_STORAGE_ACCESS=super_costs.COLD_STORAGE_ACCESS + 6000,
+            COLD_STORAGE_WRITE=super_costs.COLD_STORAGE_WRITE + 6000,
             # MONAD_EIGHT introduces EIP-7951 independent of Osaka.
-            GAS_PRECOMPILE_P256VERIFY=osaka_costs.GAS_PRECOMPILE_P256VERIFY,
+            PRECOMPILE_P256VERIFY=osaka_costs.PRECOMPILE_P256VERIFY,
         )
 
     @classmethod
-    def transaction_gas_limit_cap(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int | None:
+    def transaction_gas_limit_cap(cls) -> int | None:
         """At MONAD_EIGHT, transaction gas limit is capped at 30 million."""
-        del block_number, timestamp
         return 30_000_000
 
 
@@ -3429,63 +1614,42 @@ class MONAD_NINE(MONAD_EIGHT, Osaka, solc_name="cancun"):  # noqa: N801
     """MONAD_NINE fork."""
 
     @classmethod
-    def valid_opcodes(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Opcodes]:
+    def valid_opcodes(cls) -> List[Opcodes]:
         """Return spec from explicit parent."""
-        return Osaka.valid_opcodes(
-            block_number=block_number, timestamp=timestamp
-        )
+        return Osaka.valid_opcodes()
 
     @classmethod
-    def gas_costs(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> GasCosts:
+    def gas_costs(cls) -> GasCosts:
         """Return spec from explicit parent."""
-        return MONAD_EIGHT.gas_costs(
-            block_number=block_number, timestamp=timestamp
-        )
+        return MONAD_EIGHT.gas_costs()
 
     @classmethod
-    def max_code_size(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
+    def max_code_size(cls) -> int:
         """Return spec from explicit parent."""
-        return MONAD_EIGHT.max_code_size(
-            block_number=block_number, timestamp=timestamp
-        )
+        return MONAD_EIGHT.max_code_size()
 
     @classmethod
-    def precompiles(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> List[Address]:
+    def precompiles(cls) -> List[Address]:
         """
         Return spec from explicit parent plus reserve balance precompile.
         """
         return [
             Address(0x1001, label="RESERVE_BALANCE"),
-        ] + MONAD_EIGHT.precompiles(
-            block_number=block_number, timestamp=timestamp
-        )
+        ] + MONAD_EIGHT.precompiles()
 
     @classmethod
-    def transaction_gas_limit_cap(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int | None:
+    def transaction_gas_limit_cap(cls) -> int | None:
         """Return spec from explicit parent."""
-        return MONAD_EIGHT.transaction_gas_limit_cap(
-            block_number=block_number, timestamp=timestamp
-        )
+        return MONAD_EIGHT.transaction_gas_limit_cap()
 
     @classmethod
     def memory_expansion_gas_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
+        cls,
     ) -> MemoryExpansionGasCalculator:
         """
         Return callable that calculates the gas cost of memory expansion for
         the fork.
         """
-        del block_number, timestamp
         memory_words_per_gas = 2
 
         def fn(*, new_bytes: int, previous_bytes: int = 0) -> int:
@@ -3502,130 +1666,73 @@ def c(w: int) -> int:
         return fn
 
 
-class BPO1(Osaka, bpo_fork=True):
+class BPO1(
+    Osaka,
+    bpo_fork=True,
+    update_blob_constants={
+        "BLOB_BASE_FEE_UPDATE_FRACTION": 8346193,
+        "TARGET_BLOBS_PER_BLOCK": 10,
+        "MAX_BLOBS_PER_BLOCK": 15,
+    },
+):
     """Mainnet BPO1 fork - Blob Parameter Only fork 1."""
 
-    @classmethod
-    def blob_base_fee_update_fraction(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the blob base fee update fraction for BPO1."""
-        del block_number, timestamp
-        return 8346193
-
-    @classmethod
-    def target_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Blobs in BPO1 have a target of 10 blobs per block."""
-        del block_number, timestamp
-        return 10
-
-    @classmethod
-    def max_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Blobs in BPO1 have a max of 15 blobs per block."""
-        del block_number, timestamp
-        return 15
+    pass
 
 
-class BPO2(BPO1, bpo_fork=True):
+class BPO2(
+    BPO1,
+    bpo_fork=True,
+    update_blob_constants={
+        "BLOB_BASE_FEE_UPDATE_FRACTION": 11684671,
+        "TARGET_BLOBS_PER_BLOCK": 14,
+        "MAX_BLOBS_PER_BLOCK": 21,
+    },
+):
     """Mainnet BPO2 fork - Blob Parameter Only fork 2."""
 
-    @classmethod
-    def blob_base_fee_update_fraction(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the blob base fee update fraction for BPO2."""
-        del block_number, timestamp
-        return 11684671
-
-    @classmethod
-    def target_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Blobs in BPO2 have a target of 14 blobs per block."""
-        del block_number, timestamp
-        return 14
-
-    @classmethod
-    def max_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Blobs in BPO2 have a max of 21 blobs per block."""
-        del block_number, timestamp
-        return 21
+    pass
 
 
-class BPO3(BPO2, bpo_fork=True):
+class BPO3(
+    BPO2,
+    bpo_fork=True,
+    deployed=False,
+    update_blob_constants={
+        "BLOB_BASE_FEE_UPDATE_FRACTION": 20609697,
+        "TARGET_BLOBS_PER_BLOCK": 21,
+        "MAX_BLOBS_PER_BLOCK": 32,
+    },
+):
     """
     Pseudo BPO3 fork - Blob Parameter Only fork 3.
     For testing purposes only.
     """
 
-    @classmethod
-    def is_deployed(cls) -> bool:
-        """BPO3 is a pseudo fork for testing, not deployed to mainnet."""
-        return False
-
-    @classmethod
-    def blob_base_fee_update_fraction(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the blob base fee update fraction for BPO3."""
-        del block_number, timestamp
-        return 20609697
-
-    @classmethod
-    def target_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Blobs in BPO3 have a target of 21 blobs per block."""
-        del block_number, timestamp
-        return 21
-
-    @classmethod
-    def max_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Blobs in BPO3 have a max of 32 blobs per block."""
-        del block_number, timestamp
-        return 32
+    pass
 
 
-class BPO4(BPO3, bpo_fork=True):
+class BPO4(
+    BPO3,
+    bpo_fork=True,
+    update_blob_constants={
+        "BLOB_BASE_FEE_UPDATE_FRACTION": 13739630,
+        "TARGET_BLOBS_PER_BLOCK": 14,
+        "MAX_BLOBS_PER_BLOCK": 21,
+    },
+):
     """
     Pseudo BPO4 fork - Blob Parameter Only fork 4.
     For testing purposes only. Testing a decrease in values from BPO3.
     """
 
-    @classmethod
-    def blob_base_fee_update_fraction(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Return the blob base fee update fraction for BPO4."""
-        del block_number, timestamp
-        return 13739630
-
-    @classmethod
-    def target_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Blobs in BPO4 have a target of 14 blobs per block."""
-        del block_number, timestamp
-        return 14
-
-    @classmethod
-    def max_blobs_per_block(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """Blobs in BPO4 have a max of 21 blobs per block."""
-        del block_number, timestamp
-        return 21
+    pass
 
 
-class BPO5(BPO4, bpo_fork=True):
+class BPO5(
+    BPO4,
+    bpo_fork=True,
+):
     """
     Pseudo BPO5 fork - Blob Parameter Only fork 5.
     For testing purposes only. Required to parse Fusaka devnet genesis files.
@@ -3634,82 +1741,15 @@ class BPO5(BPO4, bpo_fork=True):
     pass
 
 
-class Amsterdam(BPO2):
+class Amsterdam(
+    AmsterdamEIPs,
+    BPO2,
+    deployed=False,
+):
     """Amsterdam fork."""
 
     # TODO: We may need to adjust which BPO Amsterdam inherits from as the
     #  related Amsterdam specs change over time, and before Amsterdam is
     #  live on mainnet.
 
-    @classmethod
-    def header_bal_hash_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """
-        From Amsterdam, header must contain block access list hash (EIP-7928).
-        """
-        del block_number, timestamp
-        return True
-
-    @classmethod
-    def gas_costs(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> GasCosts:
-        """
-        On Amsterdam, the cost per block access list item is introduced
-        in EIP-7928.
-        """
-        return replace(
-            super(Amsterdam, cls).gas_costs(
-                block_number=block_number, timestamp=timestamp
-            ),
-            GAS_BLOCK_ACCESS_LIST_ITEM=2000,
-        )
-
-    @classmethod
-    def empty_block_bal_item_count(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int:
-        """
-        Return the BAL item count for an empty Amsterdam block.
-
-        Four system contracts produce 15 items:
-          EIP-4788 beacon roots:           1 address + 1 write + 1 read = 3
-          EIP-2935 history storage:        1 address + 1 write          = 2
-          EIP-7002 withdrawal requests:    1 address + 4 reads          = 5
-          EIP-7251 consolidation requests: 1 address + 4 reads          = 5
-        """
-        del block_number, timestamp
-        return 15
-
-    @classmethod
-    def is_deployed(cls) -> bool:
-        """Return True if this fork is deployed."""
-        return False
-
-    @classmethod
-    def engine_new_payload_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
-        """From Amsterdam, new payload calls must use version 5."""
-        del block_number, timestamp
-        return 5
-
-    @classmethod
-    def engine_get_payload_version(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
-        """From Amsterdam, get payload calls must use version 6."""
-        del block_number, timestamp
-        return 6
-
-    @classmethod
-    def engine_execution_payload_block_access_list(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """
-        From Amsterdam, engine execution payload includes `block_access_list`
-        as a parameter.
-        """
-        del block_number, timestamp
-        return True
+    pass
diff --git a/packages/testing/src/execution_testing/forks/forks/transition.py b/packages/testing/src/execution_testing/forks/forks/transition.py
index b3667e56a42..534b2dc9f9d 100644
--- a/packages/testing/src/execution_testing/forks/forks/transition.py
+++ b/packages/testing/src/execution_testing/forks/forks/transition.py
@@ -1,6 +1,6 @@
 """List of all transition fork definitions."""
 
-from ..transition_base_fork import transition_fork
+from ..transition_base_fork import TransitionBaseClass, transition_fork
 from .forks import (
     BPO1,
     BPO2,
@@ -20,71 +20,73 @@
 
 
 # Transition Forks
-@transition_fork(to_fork=London, at_block=5)
-class BerlinToLondonAt5(Berlin):
+@transition_fork(to_fork=London, from_fork=Berlin, at_block=5)
+class BerlinToLondonAt5(TransitionBaseClass):
     """Berlin to London transition at Block 5."""
 
     pass
 
 
-@transition_fork(to_fork=Shanghai, at_timestamp=15_000)
-class ParisToShanghaiAtTime15k(Paris):
+@transition_fork(to_fork=Shanghai, from_fork=Paris, at_timestamp=15_000)
+class ParisToShanghaiAtTime15k(TransitionBaseClass):
     """Paris to Shanghai transition at Timestamp 15k."""
 
     pass
 
 
-@transition_fork(to_fork=Cancun, at_timestamp=15_000)
-class ShanghaiToCancunAtTime15k(Shanghai):
+@transition_fork(to_fork=Cancun, from_fork=Shanghai, at_timestamp=15_000)
+class ShanghaiToCancunAtTime15k(TransitionBaseClass):
     """Shanghai to Cancun transition at Timestamp 15k."""
 
     pass
 
 
-@transition_fork(to_fork=Prague, at_timestamp=15_000)
-class CancunToPragueAtTime15k(Cancun):
+@transition_fork(to_fork=Prague, from_fork=Cancun, at_timestamp=15_000)
+class CancunToPragueAtTime15k(TransitionBaseClass):
     """Cancun to Prague transition at Timestamp 15k."""
 
     pass
 
 
-@transition_fork(to_fork=Osaka, at_timestamp=15_000)
-class PragueToOsakaAtTime15k(Prague):
+@transition_fork(to_fork=Osaka, from_fork=Prague, at_timestamp=15_000)
+class PragueToOsakaAtTime15k(TransitionBaseClass):
     """Prague to Osaka transition at Timestamp 15k."""
 
     pass
 
 
-@transition_fork(to_fork=MONAD_EIGHT, at_timestamp=15_000)
-class PragueToMONAD_EIGHTAtTime15k(Prague):  # noqa: N801
+@transition_fork(to_fork=MONAD_EIGHT, from_fork=Prague, at_timestamp=15_000)
+class PragueToMONAD_EIGHTAtTime15k(TransitionBaseClass):  # noqa: N801
     """Prague to MONAD_EIGHT transition at Timestamp 15k."""
 
     pass
 
 
-@transition_fork(to_fork=MONAD_NINE, at_timestamp=15_000)
-class MONAD_EIGHTToMONAD_NINEAtTime15k(MONAD_EIGHT):  # noqa: N801
+@transition_fork(
+    to_fork=MONAD_NINE, from_fork=MONAD_EIGHT, at_timestamp=15_000
+)
+class MONAD_EIGHTToMONAD_NINEAtTime15k(TransitionBaseClass):  # noqa: N801
     """MONAD_EIGHT to MONAD_NINE transition at Timestamp 15k."""
 
     pass
 
 
-@transition_fork(to_fork=BPO1, at_timestamp=15_000)
-class OsakaToBPO1AtTime15k(Osaka):
+@transition_fork(to_fork=BPO1, from_fork=Osaka, at_timestamp=15_000)
+class OsakaToBPO1AtTime15k(TransitionBaseClass):
     """Osaka to BPO1 transition at Timestamp 15k."""
 
     pass
 
 
-@transition_fork(to_fork=BPO2, at_timestamp=15_000)
-class BPO1ToBPO2AtTime15k(BPO1):
+@transition_fork(to_fork=BPO2, from_fork=BPO1, at_timestamp=15_000)
+class BPO1ToBPO2AtTime15k(TransitionBaseClass):
     """BPO1 to BPO2 transition at Timestamp 15k."""
 
     pass
 
 
-@transition_fork(to_fork=Amsterdam, at_timestamp=15_000)
-class BPO2ToAmsterdamAtTime15k(BPO2):
+@transition_fork(to_fork=Amsterdam, from_fork=BPO2, at_timestamp=15_000)
+class BPO2ToAmsterdamAtTime15k(TransitionBaseClass):
     """BPO2 to Amsterdam transition at Timestamp 15k."""
 
     # TODO: We may need to adjust which BPO Amsterdam inherits from as the
@@ -94,15 +96,15 @@ class BPO2ToAmsterdamAtTime15k(BPO2):
     pass
 
 
-@transition_fork(to_fork=BPO3, at_timestamp=15_000)
-class BPO2ToBPO3AtTime15k(BPO2):
+@transition_fork(to_fork=BPO3, from_fork=BPO2, at_timestamp=15_000)
+class BPO2ToBPO3AtTime15k(TransitionBaseClass):
     """BPO2 to BPO3 transition at Timestamp 15k."""
 
     pass
 
 
-@transition_fork(to_fork=BPO4, at_timestamp=15_000)
-class BPO3ToBPO4AtTime15k(BPO3):
+@transition_fork(to_fork=BPO4, from_fork=BPO3, at_timestamp=15_000)
+class BPO3ToBPO4AtTime15k(TransitionBaseClass):
     """BPO3 to BPO4 transition at Timestamp 15k."""
 
     pass
diff --git a/packages/testing/src/execution_testing/forks/gas_costs.py b/packages/testing/src/execution_testing/forks/gas_costs.py
index eb632dd0888..fcb8148cca0 100644
--- a/packages/testing/src/execution_testing/forks/gas_costs.py
+++ b/packages/testing/src/execution_testing/forks/gas_costs.py
@@ -2,92 +2,147 @@
 
 from dataclasses import dataclass
 
+# Common Gas Cost Tiers
+BASE = 2
+VERY_LOW = 3
+LOW = 5
+MID = 8
+HIGH = 10
+
 
 @dataclass(kw_only=True, frozen=True)
 class GasCosts:
     """Class that contains the gas cost constants for any fork."""
 
-    GAS_JUMPDEST: int
-    GAS_BASE: int
-    GAS_VERY_LOW: int
-    GAS_LOW: int
-    GAS_MID: int
-    GAS_HIGH: int
-    GAS_WARM_ACCOUNT_ACCESS: int
-    GAS_COLD_ACCOUNT_ACCESS: int
-    GAS_TX_ACCESS_LIST_ADDRESS: int
-    GAS_TX_ACCESS_LIST_STORAGE_KEY: int
-    GAS_WARM_SLOAD: int
-    GAS_COLD_SLOAD: int
-    GAS_STORAGE_SET: int
-    GAS_STORAGE_UPDATE: int
-    GAS_STORAGE_RESET: int
-
-    GAS_SELF_DESTRUCT: int
-    GAS_CREATE: int
-
-    GAS_CODE_DEPOSIT_PER_BYTE: int
-    GAS_CODE_INIT_PER_WORD: int
-
-    GAS_CALL_VALUE: int
-    GAS_CALL_STIPEND: int
-    GAS_NEW_ACCOUNT: int
-
-    GAS_EXPONENTIATION: int
-    GAS_EXPONENTIATION_PER_BYTE: int
-
-    GAS_MEMORY: int
-    GAS_TX_BASE: int
-    GAS_TX_CREATE: int
-    GAS_TX_DATA_PER_ZERO: int
-    GAS_TX_DATA_PER_NON_ZERO: int
-    GAS_TX_DATA_TOKEN_STANDARD: int
-    GAS_TX_DATA_TOKEN_FLOOR: int
-
-    GAS_LOG: int
-    GAS_LOG_DATA_PER_BYTE: int
-    GAS_LOG_TOPIC: int
-
-    GAS_KECCAK256: int
-    GAS_KECCAK256_PER_WORD: int
-
-    GAS_COPY: int
-    GAS_BLOCK_HASH: int
-
-    GAS_AUTH_PER_EMPTY_ACCOUNT: int
-
-    # Precompiled contract gas constants
-    GAS_PRECOMPILE_ECRECOVER: int
-    GAS_PRECOMPILE_SHA256_BASE: int
-    GAS_PRECOMPILE_SHA256_PER_WORD: int
-    GAS_PRECOMPILE_RIPEMD160_BASE: int
-    GAS_PRECOMPILE_RIPEMD160_PER_WORD: int
-    GAS_PRECOMPILE_IDENTITY_BASE: int
-    GAS_PRECOMPILE_IDENTITY_PER_WORD: int
-
-    GAS_PRECOMPILE_ECADD: int
-    GAS_PRECOMPILE_ECMUL: int
-    GAS_PRECOMPILE_ECPAIRING_BASE: int
-    GAS_PRECOMPILE_ECPAIRING_PER_POINT: int
-
-    GAS_PRECOMPILE_BLAKE2F_BASE: int
-    GAS_PRECOMPILE_BLAKE2F_PER_ROUND: int
-
-    GAS_PRECOMPILE_POINT_EVALUATION: int
-
-    GAS_PRECOMPILE_BLS_G1ADD: int
-    GAS_PRECOMPILE_BLS_G1MUL: int
-    GAS_PRECOMPILE_BLS_G1MAP: int
-    GAS_PRECOMPILE_BLS_G2ADD: int
-    GAS_PRECOMPILE_BLS_G2MUL: int
-    GAS_PRECOMPILE_BLS_G2MAP: int
-    GAS_PRECOMPILE_BLS_PAIRING_BASE: int
-    GAS_PRECOMPILE_BLS_PAIRING_PER_PAIR: int
-
-    GAS_PRECOMPILE_P256VERIFY: int
-
-    # Refund constants
+    # Tiers
+    BASE: int
+    VERY_LOW: int
+    LOW: int
+    MID: int
+    HIGH: int
+
+    # Access
+    WARM_ACCESS: int
+    COLD_ACCOUNT_ACCESS: int
+    WARM_SLOAD: int
+    COLD_STORAGE_ACCESS: int
+
+    # Storage
+    STORAGE_SET: int
+    COLD_STORAGE_WRITE: int
+    STORAGE_RESET: int
+
+    # Call
+    CALL_VALUE: int
+    CALL_STIPEND: int
+    NEW_ACCOUNT: int
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: int
+    CODE_INIT_PER_WORD: int
+
+    # Authorization
+    AUTH_PER_EMPTY_ACCOUNT: int
+
+    # Utility
+    MEMORY_PER_WORD: int
+
+    # Transactions
+    TX_BASE: int
+    TX_CREATE: int
+    TX_DATA_PER_ZERO: int
+    TX_DATA_PER_NON_ZERO: int
+    TX_DATA_TOKEN_STANDARD: int
+    TX_DATA_TOKEN_FLOOR: int
+    TX_ACCESS_LIST_ADDRESS: int
+    TX_ACCESS_LIST_STORAGE_KEY: int
+
+    # Refunds
     REFUND_STORAGE_CLEAR: int
     REFUND_AUTH_PER_EXISTING_ACCOUNT: int
 
-    GAS_BLOCK_ACCESS_LIST_ITEM: int
+    # Precompiles
+    PRECOMPILE_ECRECOVER: int
+    PRECOMPILE_SHA256_BASE: int
+    PRECOMPILE_SHA256_PER_WORD: int
+    PRECOMPILE_RIPEMD160_BASE: int
+    PRECOMPILE_RIPEMD160_PER_WORD: int
+    PRECOMPILE_IDENTITY_BASE: int
+    PRECOMPILE_IDENTITY_PER_WORD: int
+    PRECOMPILE_ECADD: int
+    PRECOMPILE_ECMUL: int
+    PRECOMPILE_ECPAIRING_BASE: int
+    PRECOMPILE_ECPAIRING_PER_POINT: int
+    PRECOMPILE_BLAKE2F_BASE: int
+    PRECOMPILE_BLAKE2F_PER_ROUND: int
+    PRECOMPILE_POINT_EVALUATION: int
+    PRECOMPILE_BLS_G1ADD: int
+    PRECOMPILE_BLS_G1MUL: int
+    PRECOMPILE_BLS_G1MAP: int
+    PRECOMPILE_BLS_G2ADD: int
+    PRECOMPILE_BLS_G2MUL: int
+    PRECOMPILE_BLS_G2MAP: int
+    PRECOMPILE_BLS_PAIRING_BASE: int
+    PRECOMPILE_BLS_PAIRING_PER_PAIR: int
+    PRECOMPILE_P256VERIFY: int
+
+    # Block Access Lists
+    BLOCK_ACCESS_LIST_ITEM: int
+
+    # Opcodes
+    OPCODE_ADD: int
+    OPCODE_SUB: int
+    OPCODE_MUL: int
+    OPCODE_DIV: int
+    OPCODE_SDIV: int
+    OPCODE_MOD: int
+    OPCODE_SMOD: int
+    OPCODE_ADDMOD: int
+    OPCODE_MULMOD: int
+    OPCODE_SIGNEXTEND: int
+    OPCODE_LT: int
+    OPCODE_GT: int
+    OPCODE_SLT: int
+    OPCODE_SGT: int
+    OPCODE_EQ: int
+    OPCODE_ISZERO: int
+    OPCODE_AND: int
+    OPCODE_OR: int
+    OPCODE_XOR: int
+    OPCODE_NOT: int
+    OPCODE_BYTE: int
+    OPCODE_JUMP: int
+    OPCODE_JUMPI: int
+    OPCODE_JUMPDEST: int
+    OPCODE_CALLDATALOAD: int
+    OPCODE_BLOCKHASH: int
+    OPCODE_COINBASE: int
+    OPCODE_PUSH: int
+    OPCODE_DUP: int
+    OPCODE_SWAP: int
+
+    # Dynamic Opcode Components
+    OPCODE_CALLDATACOPY_BASE: int
+    OPCODE_CODECOPY_BASE: int
+    OPCODE_MLOAD_BASE: int
+    OPCODE_MSTORE_BASE: int
+    OPCODE_MSTORE8_BASE: int
+    OPCODE_SELFDESTRUCT_BASE: int
+    OPCODE_COPY_PER_WORD: int
+    OPCODE_CREATE_BASE: int
+    OPCODE_EXP_BASE: int
+    OPCODE_EXP_PER_BYTE: int
+    OPCODE_LOG_BASE: int
+    OPCODE_LOG_DATA_PER_BYTE: int
+    OPCODE_LOG_TOPIC: int
+    OPCODE_KECCAK256_BASE: int
+    OPCODE_KECCAK256_PER_WORD: int
+
+    # Defined post-Frontier
+    OPCODE_SHL: int = 0
+    OPCODE_SHR: int = 0
+    OPCODE_SAR: int = 0
+    OPCODE_RETURNDATACOPY_BASE: int = 0
+    OPCODE_BLOBHASH: int = 0
+    OPCODE_MCOPY_BASE: int = 0
+    OPCODE_CLZ: int = 0
diff --git a/packages/testing/src/execution_testing/forks/helpers.py b/packages/testing/src/execution_testing/forks/helpers.py
index f78d84468ed..9a08b50ea52 100644
--- a/packages/testing/src/execution_testing/forks/helpers.py
+++ b/packages/testing/src/execution_testing/forks/helpers.py
@@ -24,7 +24,7 @@
 )
 
 from .base_fork import BaseFork
-from .forks import forks, transition
+from .forks import eips, forks, transition
 from .transition_base_fork import TransitionBaseClass
 
 
@@ -44,16 +44,25 @@ def __init__(self, message: str) -> None:
     fork = forks.__dict__[fork_name]
     if not isinstance(fork, type):
         continue
-    if issubclass(fork, BaseFork) and fork is not BaseFork:
+    if (
+        issubclass(fork, BaseFork)
+        and fork is not BaseFork
+        and not fork.is_eip()
+    ):
         all_forks.append(fork)
 
-transition_forks: List[Type[BaseFork]] = []
+all_eips: List[Type[BaseFork]] = eips.ALL_EIPS
+
+transition_forks: List[Type[TransitionBaseClass]] = []
 
 for fork_name in transition.__dict__:
     fork = transition.__dict__[fork_name]
     if not isinstance(fork, type):
         continue
-    if issubclass(fork, TransitionBaseClass) and issubclass(fork, BaseFork):
+    if (
+        issubclass(fork, TransitionBaseClass)
+        and fork is not TransitionBaseClass
+    ):
         transition_forks.append(fork)
 
 ALL_FORKS = frozenset(fork for fork in all_forks if not fork.ignore())
@@ -96,14 +105,6 @@ def get_development_forks() -> List[Type[BaseFork]]:
     return [fork for fork in get_forks() if not fork.is_deployed()]
 
 
-def get_parent_fork(fork: Type[BaseFork]) -> Type[BaseFork]:
-    """Return parent fork of the specified fork."""
-    parent_fork = fork.__base__
-    if not parent_fork:
-        raise InvalidForkError(f"Parent fork of {fork} not found.")
-    return parent_fork
-
-
 def get_closest_fork(fork: Type[BaseFork]) -> Optional[Type[BaseFork]]:
     """Return None if BaseFork is passed, otherwise return the fork itself."""
     if fork is BaseFork:
@@ -111,13 +112,13 @@ def get_closest_fork(fork: Type[BaseFork]) -> Optional[Type[BaseFork]]:
     return fork
 
 
-def get_transition_forks() -> Set[Type[BaseFork]]:
+def get_transition_forks() -> Set[Type[TransitionBaseClass]]:
     """Return all the transition forks."""
     return set(ALL_TRANSITION_FORKS)
 
 
 def get_transition_fork_predecessor(
-    transition_fork: Type[BaseFork],
+    transition_fork: Type[BaseFork | TransitionBaseClass],
 ) -> Type[BaseFork]:
     """Return the fork from which the transition fork transitions."""
     if not issubclass(transition_fork, TransitionBaseClass):
@@ -200,12 +201,12 @@ def get_selected_fork_set(
     forks_from: Set[Type[BaseFork]],
     forks_until: Set[Type[BaseFork]],
     transition_forks: bool = True,
-) -> Set[Type[BaseFork]]:
+) -> Set[Type[BaseFork | TransitionBaseClass]]:
     """
     Process sets derived from `--fork`, `--until` and `--from` to return an
     unified fork set.
     """
-    selected_fork_set = set()
+    selected_fork_set: Set[Type[BaseFork]] = set()
     if single_fork:
         selected_fork_set |= single_fork
     else:
@@ -215,19 +216,34 @@ def get_selected_fork_set(
             forks_until = get_last_descendants(
                 set(get_deployed_forks()), forks_from
             )
-        selected_fork_set = get_from_until_fork_set(
+        selected_fork_set |= get_from_until_fork_set(
             ALL_FORKS, forks_from, forks_until
         )
+        # Transition fork comparison operators resolve to
+        # transitions_to(), so an --until transition fork boundary
+        # incorrectly includes its target in the normal fork set.
+        for fork_until in forks_until:
+            if issubclass(fork_until, TransitionBaseClass):
+                selected_fork_set.discard(fork_until.transitions_to())
+    selected_fork_set_with_transitions: Set[
+        Type[BaseFork | TransitionBaseClass]
+    ] = set() | selected_fork_set
     if transition_forks:
-        for fork in list(selected_fork_set):
-            transition_fork_set = transition_fork_to(fork)
-            selected_fork_set |= transition_fork_set
-    return selected_fork_set
+        for normal_fork in list(selected_fork_set):
+            transition_fork_set = transition_fork_to(normal_fork)
+            selected_fork_set_with_transitions |= transition_fork_set
+        # Explicitly add transition fork boundaries whose target fork
+        # was removed above (transition_fork_to won't find them).
+        if not single_fork:
+            for fork in forks_from | forks_until:
+                if issubclass(fork, TransitionBaseClass):
+                    selected_fork_set_with_transitions.add(fork)
+    return selected_fork_set_with_transitions
 
 
 def transition_fork_from_to(
     fork_from: Type[BaseFork], fork_to: Type[BaseFork]
-) -> Type[BaseFork] | None:
+) -> Type[TransitionBaseClass] | None:
     """
     Return transition fork that transitions to and from the specified forks.
     """
@@ -243,16 +259,20 @@ def transition_fork_from_to(
     return None
 
 
-def transition_fork_to(fork_to: Type[BaseFork]) -> Set[Type[BaseFork]]:
+def transition_fork_to(
+    fork_to: Type[BaseFork | TransitionBaseClass],
+) -> Set[Type[TransitionBaseClass]]:
     """Return transition fork that transitions to the specified fork."""
-    transition_forks: Set[Type[BaseFork]] = set()
+    selected_forks: Set[Type[TransitionBaseClass]] = set()
+    if issubclass(fork_to, TransitionBaseClass):
+        return selected_forks
     for transition_fork in get_transition_forks():
         if not issubclass(transition_fork, TransitionBaseClass):
             continue
         if transition_fork.transitions_to() == fork_to:
-            transition_forks.add(transition_fork)
+            selected_forks.add(transition_fork)
 
-    return transition_forks
+    return selected_forks
 
 
 def forks_from_until(
@@ -262,14 +282,14 @@ def forks_from_until(
     Return specified fork and all forks after it until and including the second
     specified fork.
     """
-    prev_fork = fork_until
+    prev_fork: Type[BaseFork] | None = fork_until
 
     forks: List[Type[BaseFork]] = []
 
-    while prev_fork != BaseFork and prev_fork != fork_from:
+    while prev_fork is not None and prev_fork != fork_from:
         forks.insert(0, prev_fork)
 
-        prev_fork = get_parent_fork(prev_fork)
+        prev_fork = prev_fork.parent()
 
     if prev_fork == BaseFork:
         return []
@@ -389,16 +409,19 @@ def validate_fork_range_descriptor(
 
 
 def fork_validator_generator(
-    cls_name: str, forks: List[Type[BaseFork]]
-) -> Callable[[Any], Type[BaseFork]]:
+    cls: Type[BaseFork] | Type[TransitionBaseClass],
+    forks: List[Type[BaseFork | TransitionBaseClass]],
+) -> Callable[[Any], Type[BaseFork | TransitionBaseClass]]:
     """Generate a fork validator function."""
     forks_dict = {fork.name().lower(): fork for fork in forks}
 
-    def fork_validator(obj: Any) -> Type[BaseFork]:
+    def fork_validator(obj: Any) -> Type[BaseFork | TransitionBaseClass]:
         """Get a fork by name or raise an error."""
         if obj is None:
             raise InvalidForkError("Fork cannot be None")
-        if isinstance(obj, type) and issubclass(obj, BaseFork):
+        if isinstance(obj, type) and issubclass(
+            obj, BaseFork | TransitionBaseClass
+        ):
             return obj
         if isinstance(obj, str):
             if obj.lower() in forks_dict:
@@ -406,7 +429,7 @@ def fork_validator(obj: Any) -> Type[BaseFork]:
             else:
                 raise InvalidForkError(f"Invalid fork '{obj}' specified")
         raise InvalidForkError(
-            f"Invalid {cls_name}: {obj} (type: {type(obj)})"
+            f"Invalid {cls.__name__}: {obj} (type: {type(obj)})"
         )
 
     return fork_validator
@@ -426,7 +449,7 @@ def set_before_validator(value: Any) -> Any:
     Type[BaseFork],
     PlainSerializer(str),
     PlainValidator(
-        fork_validator_generator("Fork", all_forks + transition_forks)
+        fork_validator_generator(BaseFork, all_forks + transition_forks)
     ),
 ]
 ForkAdapter: TypeAdapter = TypeAdapter(Fork)
@@ -436,11 +459,27 @@ def set_before_validator(value: Any) -> Any:
     BeforeValidator(set_before_validator),
 ]
 ForkSetAdapter: TypeAdapter = TypeAdapter(ForkSet)
-TransitionFork = Annotated[
+
+ForkEIP = Annotated[
     Type[BaseFork],
     PlainSerializer(str),
     PlainValidator(
-        fork_validator_generator("TransitionFork", transition_forks)
+        fork_validator_generator(
+            BaseFork, all_forks + all_eips + transition_forks
+        )
+    ),
+]
+ForkEIPSet = Annotated[
+    Set[ForkEIP],
+    BeforeValidator(set_before_validator),
+]
+ForkEIPSetAdapter: TypeAdapter = TypeAdapter(ForkEIPSet)
+
+TransitionFork = Annotated[
+    Type[TransitionBaseClass],
+    PlainSerializer(str),
+    PlainValidator(
+        fork_validator_generator(TransitionBaseClass, transition_forks)
     ),
 ]
 TransitionForkAdapter: TypeAdapter = TypeAdapter(TransitionFork)
diff --git a/packages/testing/src/execution_testing/forks/tests/test_forks.py b/packages/testing/src/execution_testing/forks/tests/test_forks.py
index 68d22952979..8cb01c486ce 100644
--- a/packages/testing/src/execution_testing/forks/tests/test_forks.py
+++ b/packages/testing/src/execution_testing/forks/tests/test_forks.py
@@ -1,12 +1,13 @@
 """Test fork utilities."""
 
-from typing import Dict, cast
+from typing import Dict
 
 import pytest
 from pydantic import BaseModel
 
 from execution_testing.base_types import BlobSchedule
 
+from ..forks.eips.paris.eip_3675 import EIP3675
 from ..forks.forks import (
     BPO1,
     BPO2,
@@ -28,6 +29,7 @@
 from ..forks.transition import (
     BerlinToLondonAt5,
     BPO1ToBPO2AtTime15k,
+    BPO2ToAmsterdamAtTime15k,
     BPO2ToBPO3AtTime15k,
     BPO3ToBPO4AtTime15k,
     CancunToPragueAtTime15k,
@@ -41,14 +43,16 @@
     ForkAdapter,
     ForkOrNoneAdapter,
     ForkSetAdapter,
+    TransitionFork,
     forks_from,
     forks_from_until,
     get_deployed_forks,
     get_forks,
+    get_selected_fork_set,
     transition_fork_from_to,
     transition_fork_to,
 )
-from ..transition_base_fork import transition_fork
+from ..transition_base_fork import TransitionBaseClass, transition_fork
 
 FIRST_DEPLOYED = Frontier
 LAST_DEPLOYED = Osaka
@@ -63,85 +67,90 @@ def test_transition_forks() -> None:
     assert transition_fork_to(Shanghai) == {ParisToShanghaiAtTime15k}
 
     # Test forks transitioned to and from
-    assert BerlinToLondonAt5.transitions_to() == London  # type: ignore
-    assert BerlinToLondonAt5.transitions_from() == Berlin  # type: ignore
+    assert BerlinToLondonAt5.transitions_to() == London
+    assert BerlinToLondonAt5.transitions_from() == Berlin
 
     assert (
-        BerlinToLondonAt5.transition_tool_name(block_number=4, timestamp=0)
+        BerlinToLondonAt5.fork_at(
+            block_number=4, timestamp=0
+        ).transition_tool_name()
         == "Berlin"
     )
     assert (
-        BerlinToLondonAt5.transition_tool_name(block_number=5, timestamp=0)
+        BerlinToLondonAt5.fork_at(
+            block_number=5, timestamp=0
+        ).transition_tool_name()
         == "London"
     )
-    # Default values of transition forks is the transition block
-    assert BerlinToLondonAt5.transition_tool_name() == "London"
 
     assert (
-        ParisToShanghaiAtTime15k.transition_tool_name(
+        ParisToShanghaiAtTime15k.fork_at(
             block_number=0, timestamp=14_999
-        )
+        ).transition_tool_name()
         == "Merge"
     )
     assert (
-        ParisToShanghaiAtTime15k.transition_tool_name(
+        ParisToShanghaiAtTime15k.fork_at(
             block_number=0, timestamp=15_000
-        )
+        ).transition_tool_name()
         == "Shanghai"
     )
-    assert ParisToShanghaiAtTime15k.transition_tool_name() == "Shanghai"
 
     assert (
-        BerlinToLondonAt5.header_base_fee_required(block_number=4, timestamp=0)
+        BerlinToLondonAt5.fork_at(
+            block_number=4, timestamp=0
+        ).header_base_fee_required()
         is False
     )
     assert (
-        BerlinToLondonAt5.header_base_fee_required(block_number=5, timestamp=0)
+        BerlinToLondonAt5.fork_at(
+            block_number=5, timestamp=0
+        ).header_base_fee_required()
         is True
     )
 
     assert (
-        ParisToShanghaiAtTime15k.header_withdrawals_required(
+        ParisToShanghaiAtTime15k.fork_at(
             block_number=0, timestamp=14_999
-        )
+        ).header_withdrawals_required()
         is False
     )
     assert (
-        ParisToShanghaiAtTime15k.header_withdrawals_required(
+        ParisToShanghaiAtTime15k.fork_at(
             block_number=0, timestamp=15_000
-        )
+        ).header_withdrawals_required()
         is True
     )
 
     assert (
-        ParisToShanghaiAtTime15k.engine_new_payload_version(
+        ParisToShanghaiAtTime15k.fork_at(
             block_number=0, timestamp=14_999
-        )
+        ).engine_new_payload_version()
         == 1
     )
     assert (
-        ParisToShanghaiAtTime15k.engine_new_payload_version(
+        ParisToShanghaiAtTime15k.fork_at(
             block_number=0, timestamp=15_000
-        )
+        ).engine_new_payload_version()
         == 2
     )
 
-    assert BerlinToLondonAt5.fork_at(block_number=4, timestamp=0) == Berlin
-    assert BerlinToLondonAt5.fork_at(block_number=5, timestamp=0) == London
+    assert BerlinToLondonAt5.fork_at(block_number=4, timestamp=0) is Berlin
+    assert BerlinToLondonAt5.fork_at(block_number=5, timestamp=0) is London
     assert (
         ParisToShanghaiAtTime15k.fork_at(block_number=0, timestamp=14_999)
-        == Paris
+        is Paris
     )
     assert (
         ParisToShanghaiAtTime15k.fork_at(block_number=0, timestamp=15_000)
-        == Shanghai
+        is Shanghai
     )
-    assert ParisToShanghaiAtTime15k.fork_at() == Paris
+    assert ParisToShanghaiAtTime15k.fork_at() is Paris
     assert (
         ParisToShanghaiAtTime15k.fork_at(
             block_number=10_000_000, timestamp=14_999
         )
-        == Paris
+        is Paris
     )
 
 
@@ -180,51 +189,49 @@ def test_forks() -> None:
     assert f"{ParisToShanghaiAtTime15k}" == "ParisToShanghaiAtTime15k"
 
     # Test some fork properties
-    assert (
-        Berlin.header_base_fee_required(block_number=0, timestamp=0) is False
-    )
-    assert London.header_base_fee_required(block_number=0, timestamp=0) is True
-    assert Paris.header_base_fee_required(block_number=0, timestamp=0) is True
+    assert Berlin.header_base_fee_required() is False
+    assert London.header_base_fee_required() is True
+    assert Paris.header_base_fee_required() is True
     # Default values of normal forks if the genesis block
     assert Paris.header_base_fee_required() is True
 
     # Transition forks too
     assert (
-        cast(Fork, BerlinToLondonAt5).header_base_fee_required(
+        BerlinToLondonAt5.fork_at(
             block_number=4, timestamp=0
-        )
+        ).header_base_fee_required()
         is False
     )
     assert (
-        cast(Fork, BerlinToLondonAt5).header_base_fee_required(
+        BerlinToLondonAt5.fork_at(
             block_number=5, timestamp=0
-        )
+        ).header_base_fee_required()
         is True
     )
     assert (
-        cast(Fork, ParisToShanghaiAtTime15k).header_withdrawals_required(
+        ParisToShanghaiAtTime15k.fork_at(
             block_number=0, timestamp=14_999
-        )
+        ).header_withdrawals_required()
         is False
     )
     assert (
-        cast(Fork, ParisToShanghaiAtTime15k).header_withdrawals_required(
+        ParisToShanghaiAtTime15k.fork_at(
             block_number=0, timestamp=15_000
-        )
+        ).header_withdrawals_required()
         is True
     )
     assert (
-        cast(Fork, ParisToShanghaiAtTime15k).header_withdrawals_required()
-        is True
+        ParisToShanghaiAtTime15k.fork_at().header_withdrawals_required()
+        is False
     )
 
 
 class ForkInPydanticModel(BaseModel):
     """Fork in pydantic model."""
 
-    fork_1: Fork
-    fork_2: Fork
-    fork_3: Fork | None
+    fork_1: Fork | TransitionFork
+    fork_2: Fork | TransitionFork
+    fork_3: Fork | TransitionFork | None
 
 
 def test_fork_in_pydantic_model() -> None:
@@ -244,8 +251,8 @@ def test_fork_in_pydantic_model() -> None:
         '{"fork_1": "Paris", "fork_2": "ParisToShanghaiAtTime15k", '
         '"fork_3": null}'
     )
-    assert model.fork_1 == Paris
-    assert model.fork_2 == ParisToShanghaiAtTime15k
+    assert model.fork_1 is Paris
+    assert model.fork_2 is ParisToShanghaiAtTime15k
     assert model.fork_3 is None
 
 
@@ -348,11 +355,8 @@ class PrePreAllocFork(Shanghai):
     """Dummy fork used for testing."""
 
     @classmethod
-    def pre_allocation(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Dict:
+    def pre_allocation(cls) -> Dict:
         """Return some starting point for allocation."""
-        del block_number, timestamp
         return {"test": "test"}
 
 
@@ -360,16 +364,15 @@ class PreAllocFork(PrePreAllocFork):
     """Dummy fork used for testing."""
 
     @classmethod
-    def pre_allocation(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> Dict:
+    def pre_allocation(cls) -> Dict:
         """Add allocation to the pre-existing one from previous fork."""
-        del block_number, timestamp
         return {"test2": "test2"} | super(PreAllocFork, cls).pre_allocation()
 
 
-@transition_fork(to_fork=PreAllocFork, at_timestamp=15_000)
-class PreAllocTransitionFork(PrePreAllocFork):
+@transition_fork(
+    to_fork=PreAllocFork, from_fork=PrePreAllocFork, at_timestamp=15_000
+)
+class PreAllocTransitionFork(TransitionBaseClass):
     """PrePreAllocFork to PreAllocFork transition at Timestamp 15k."""
 
     pass
@@ -378,22 +381,21 @@ class PreAllocTransitionFork(PrePreAllocFork):
 def test_pre_alloc() -> None:  # noqa: D103
     assert PrePreAllocFork.pre_allocation() == {"test": "test"}
     assert PreAllocFork.pre_allocation() == {"test": "test", "test2": "test2"}
-    assert PreAllocTransitionFork.pre_allocation() == {
+    assert PreAllocTransitionFork.transitions_to().pre_allocation() == {
         "test": "test",
         "test2": "test2",
     }
-    assert PreAllocTransitionFork.pre_allocation() == {
+    assert PreAllocTransitionFork.transitions_from().pre_allocation() == {
         "test": "test",
-        "test2": "test2",
     }
 
 
 def test_precompiles() -> None:  # noqa: D103
-    Cancun.precompiles() == list(range(11))[1:]  # noqa: B015
+    assert sorted(Cancun.precompiles()) == list(range(1, 11))
 
 
 def test_tx_types() -> None:  # noqa: D103
-    Cancun.tx_types() == list(range(4))  # noqa: B015
+    assert Cancun.tx_types() == list(reversed(range(4)))
 
 
 def test_monad_eight_disables_blob_transactions_not_headers() -> None:
@@ -582,12 +584,16 @@ class FutureFork(Osaka):
         ),
     ],
 )
-def test_blob_schedules(fork: Fork, expected_schedule: Dict | None) -> None:
+def test_blob_schedules(
+    fork: Fork | TransitionFork, expected_schedule: Dict | None
+) -> None:
     """Test blob schedules for different forks."""
     if expected_schedule is None:
-        assert fork.blob_schedule() is None
+        assert fork.transitions_to().blob_schedule() is None
     else:
-        assert fork.blob_schedule() == BlobSchedule(**expected_schedule)
+        assert fork.transitions_to().blob_schedule() == BlobSchedule(
+            **expected_schedule
+        )
 
 
 def test_bpo_fork() -> None:  # noqa: D103
@@ -596,10 +602,10 @@ def test_bpo_fork() -> None:  # noqa: D103
     assert BPO2.bpo_fork() is True
     assert BPO3.bpo_fork() is True
     assert BPO4.bpo_fork() is True
-    assert OsakaToBPO1AtTime15k.bpo_fork() is True
-    assert BPO1ToBPO2AtTime15k.bpo_fork() is True
-    assert BPO2ToBPO3AtTime15k.bpo_fork() is True
-    assert BPO3ToBPO4AtTime15k.bpo_fork() is True
+    assert OsakaToBPO1AtTime15k.fork_at().bpo_fork() is False
+    assert BPO1ToBPO2AtTime15k.fork_at().bpo_fork() is True
+    assert BPO2ToBPO3AtTime15k.fork_at().bpo_fork() is True
+    assert BPO3ToBPO4AtTime15k.fork_at().bpo_fork() is True
 
 
 def test_fork_adapters() -> None:  # noqa: D103
@@ -614,3 +620,127 @@ def test_fork_adapters() -> None:  # noqa: D103
     assert {Osaka} == ForkSetAdapter.validate_python("Osaka")
     assert {Osaka} == ForkSetAdapter.validate_python({Osaka})
     assert set() == ForkSetAdapter.validate_python("")
+
+
+class TestSelectedForkSetWithTransitionBoundaries:
+    """Test `get_selected_fork_set` with transition fork boundaries."""
+
+    @staticmethod
+    def _normal_forks(fork_set: set) -> set:
+        """Return the set of normal (non-transition) forks."""
+        return {f for f in fork_set if not issubclass(f, TransitionBaseClass)}
+
+    @staticmethod
+    def _transition_forks(fork_set: set) -> set:
+        """Return the set of transition forks."""
+        return {f for f in fork_set if issubclass(f, TransitionBaseClass)}
+
+    def test_transition_from_and_until(self) -> None:
+        """Test range with transition forks as both boundaries."""
+        result = get_selected_fork_set(
+            single_fork=set(),
+            forks_from={OsakaToBPO1AtTime15k},  # type: ignore[arg-type]
+            forks_until={BPO2ToAmsterdamAtTime15k},  # type: ignore[arg-type]
+        )
+        assert self._normal_forks(result) == {BPO1, BPO2}
+        assert self._transition_forks(result) == {
+            OsakaToBPO1AtTime15k,
+            BPO1ToBPO2AtTime15k,
+            BPO2ToAmsterdamAtTime15k,
+        }
+
+    def test_transition_until_excludes_target(self) -> None:
+        """Transition fork `--until` must not include `transitions_to()`."""
+        result = get_selected_fork_set(
+            single_fork=set(),
+            forks_from={OsakaToBPO1AtTime15k},  # type: ignore[arg-type]
+            forks_until={BPO2ToAmsterdamAtTime15k},  # type: ignore[arg-type]
+        )
+        assert Amsterdam not in result
+
+    def test_non_bpo_transition_boundaries(self) -> None:
+        """Test non-BPO transition fork boundaries."""
+        result = get_selected_fork_set(
+            single_fork=set(),
+            forks_from={CancunToPragueAtTime15k},  # type: ignore[arg-type]
+            forks_until={PragueToOsakaAtTime15k},  # type: ignore[arg-type]
+        )
+        assert self._normal_forks(result) == {Prague}
+        assert self._transition_forks(result) == {
+            CancunToPragueAtTime15k,
+            PragueToOsakaAtTime15k,
+        }
+        assert Osaka not in result
+
+    def test_normal_boundaries_unchanged(self) -> None:
+        """Normal fork boundaries still work as before."""
+        result = get_selected_fork_set(
+            single_fork=set(),
+            forks_from={Prague},
+            forks_until={Osaka},
+        )
+        assert self._normal_forks(result) == {Prague, Osaka}
+        assert CancunToPragueAtTime15k in result
+        assert PragueToOsakaAtTime15k in result
+
+    def test_transition_from_normal_until(self) -> None:
+        """Test transition `--from` with normal `--until`."""
+        result = get_selected_fork_set(
+            single_fork=set(),
+            forks_from={OsakaToBPO1AtTime15k},  # type: ignore[arg-type]
+            forks_until={BPO2},
+        )
+        assert self._normal_forks(result) == {BPO1, BPO2}
+        assert OsakaToBPO1AtTime15k in result
+        assert BPO1ToBPO2AtTime15k in result
+        assert BPO2ToAmsterdamAtTime15k not in result
+
+
+def test_blob_constants() -> None:  # noqa: D103
+    assert Osaka.get_blob_constant("AMOUNT_CELL_PROOFS") == 128
+
+
+def test_method_versions() -> None:  # noqa: D103
+    assert London.engine_get_blobs_version() is None
+    assert London.engine_get_payload_version() is None
+    assert London.engine_new_payload_version() is None
+    assert London.engine_forkchoice_updated_version() is None
+
+    assert Paris.engine_get_blobs_version() is None
+    assert Paris.engine_get_payload_version() == 1
+    assert Paris.engine_new_payload_version() == 1
+    assert Paris.engine_forkchoice_updated_version() == 1
+
+    assert Shanghai.engine_get_blobs_version() is None
+    assert Shanghai.engine_get_payload_version() == 2
+    assert Shanghai.engine_new_payload_version() == 2
+    assert Shanghai.engine_forkchoice_updated_version() == 2
+
+    assert Cancun.engine_get_blobs_version() == 1
+    assert Cancun.engine_get_payload_version() == 3
+    assert Cancun.engine_new_payload_version() == 3
+    assert Cancun.engine_forkchoice_updated_version() == 3
+
+    assert Prague.engine_get_blobs_version() == 1
+    assert Prague.engine_get_payload_version() == 4
+    assert Prague.engine_new_payload_version() == 4
+    assert Prague.engine_forkchoice_updated_version() == 3
+
+    assert Osaka.engine_get_blobs_version() == 2
+    assert Osaka.engine_get_payload_version() == 5
+    assert Osaka.engine_new_payload_version() == 4
+    assert Osaka.engine_forkchoice_updated_version() == 3
+
+    assert Amsterdam.engine_get_payload_version() == 6
+    assert Amsterdam.engine_new_payload_version() == 5
+
+
+def test_eips() -> None:  # noqa: D103
+    assert EIP3675.enabling_forks() == {Paris}
+    assert Paris.is_eip_enabled(3675)
+    assert Paris.is_eip_enabled(3675, 1559)
+    assert Shanghai.is_eip_enabled(3675)
+    assert not Paris.is_eip_enabled(3855)
+    assert not Paris.is_eip_enabled(3675, 3855)
+    assert not Paris.is_eip_enabled(3855, 3675)
+    assert Shanghai.is_eip_enabled(3855)
diff --git a/packages/testing/src/execution_testing/forks/tests/test_opcode_gas_costs.py b/packages/testing/src/execution_testing/forks/tests/test_opcode_gas_costs.py
index cbfdc21cc45..c8559088d5b 100644
--- a/packages/testing/src/execution_testing/forks/tests/test_opcode_gas_costs.py
+++ b/packages/testing/src/execution_testing/forks/tests/test_opcode_gas_costs.py
@@ -15,55 +15,55 @@
             Osaka,
             Op.MSTORE(new_memory_size=1),
             Osaka.memory_expansion_gas_calculator()(new_bytes=1)
-            + Osaka.gas_costs().GAS_VERY_LOW,
+            + Osaka.gas_costs().VERY_LOW,
             id="mstore_memory_expansion",
         ),
         pytest.param(
             Osaka,
             Op.SSTORE,
-            Osaka.gas_costs().GAS_STORAGE_SET
-            + Osaka.gas_costs().GAS_COLD_SLOAD,
+            Osaka.gas_costs().STORAGE_SET
+            + Osaka.gas_costs().COLD_STORAGE_ACCESS,
             id="sstore_defaults",
         ),
         pytest.param(
             Osaka,
             Op.SSTORE(key_warm=True),
-            Osaka.gas_costs().GAS_STORAGE_SET,
+            Osaka.gas_costs().STORAGE_SET,
             id="sstore_warm_key",
         ),
         # EXP tests
         pytest.param(
             Osaka,
             Op.EXP(exponent=0),
-            Osaka.gas_costs().GAS_EXPONENTIATION,
+            Osaka.gas_costs().OPCODE_EXP_BASE,
             id="exp_zero_exponent",
         ),
         pytest.param(
             Osaka,
             Op.EXP(exponent=0xFFFFFF),  # 3 bytes
-            Osaka.gas_costs().GAS_EXPONENTIATION
-            + Osaka.gas_costs().GAS_EXPONENTIATION_PER_BYTE * 3,
+            Osaka.gas_costs().OPCODE_EXP_BASE
+            + Osaka.gas_costs().OPCODE_EXP_PER_BYTE * 3,
             id="exp_three_bytes",
         ),
         pytest.param(
             Osaka,
             Op.EXP(exponent=0x1FFFFFF),  # 3 bytes
-            Osaka.gas_costs().GAS_EXPONENTIATION
-            + Osaka.gas_costs().GAS_EXPONENTIATION_PER_BYTE * 4,
+            Osaka.gas_costs().OPCODE_EXP_BASE
+            + Osaka.gas_costs().OPCODE_EXP_PER_BYTE * 4,
             id="exp_three_bytes_plus_one_bit",
         ),
         # SHA3 tests
         pytest.param(
             Osaka,
             Op.SHA3(data_size=0),
-            Osaka.gas_costs().GAS_KECCAK256,
+            Osaka.gas_costs().OPCODE_KECCAK256_BASE,
             id="sha3_zero_data",
         ),
         pytest.param(
             Osaka,
             Op.SHA3(data_size=64, new_memory_size=96),
-            Osaka.gas_costs().GAS_KECCAK256
-            + Osaka.gas_costs().GAS_KECCAK256_PER_WORD * 2
+            Osaka.gas_costs().OPCODE_KECCAK256_BASE
+            + Osaka.gas_costs().OPCODE_KECCAK256_PER_WORD * 2
             + Osaka.memory_expansion_gas_calculator()(new_bytes=96),
             id="sha3_with_data_and_memory",
         ),
@@ -71,21 +71,21 @@
         pytest.param(
             Osaka,
             Op.BALANCE(address_warm=False),
-            Osaka.gas_costs().GAS_COLD_ACCOUNT_ACCESS,
+            Osaka.gas_costs().COLD_ACCOUNT_ACCESS,
             id="balance_cold_address",
         ),
         pytest.param(
             Osaka,
             Op.BALANCE(address_warm=True),
-            Osaka.gas_costs().GAS_WARM_ACCOUNT_ACCESS,
+            Osaka.gas_costs().WARM_ACCESS,
             id="balance_warm_address",
         ),
         # CALLDATACOPY tests
         pytest.param(
             Osaka,
             Op.CALLDATACOPY(data_size=32, new_memory_size=32),
-            Osaka.gas_costs().GAS_VERY_LOW
-            + Osaka.gas_costs().GAS_COPY * 1
+            Osaka.gas_costs().VERY_LOW
+            + Osaka.gas_costs().OPCODE_COPY_PER_WORD * 1
             + Osaka.memory_expansion_gas_calculator()(new_bytes=32),
             id="calldatacopy_one_word",
         ),
@@ -94,8 +94,8 @@
             Op.CALLDATACOPY(
                 data_size=64, new_memory_size=64, old_memory_size=32
             ),
-            Osaka.gas_costs().GAS_VERY_LOW
-            + Osaka.gas_costs().GAS_COPY * 2
+            Osaka.gas_costs().VERY_LOW
+            + Osaka.gas_costs().OPCODE_COPY_PER_WORD * 2
             + Osaka.memory_expansion_gas_calculator()(
                 new_bytes=64, previous_bytes=32
             ),
@@ -105,8 +105,8 @@
         pytest.param(
             Osaka,
             Op.CODECOPY(data_size=96, new_memory_size=96),
-            Osaka.gas_costs().GAS_VERY_LOW
-            + Osaka.gas_costs().GAS_COPY * 3
+            Osaka.gas_costs().VERY_LOW
+            + Osaka.gas_costs().OPCODE_COPY_PER_WORD * 3
             + Osaka.memory_expansion_gas_calculator()(new_bytes=96),
             id="codecopy_three_words",
         ),
@@ -114,13 +114,13 @@
         pytest.param(
             Osaka,
             Op.EXTCODESIZE(address_warm=False),
-            Osaka.gas_costs().GAS_COLD_ACCOUNT_ACCESS,
+            Osaka.gas_costs().COLD_ACCOUNT_ACCESS,
             id="extcodesize_cold",
         ),
         pytest.param(
             Osaka,
             Op.EXTCODESIZE(address_warm=True),
-            Osaka.gas_costs().GAS_WARM_ACCOUNT_ACCESS,
+            Osaka.gas_costs().WARM_ACCESS,
             id="extcodesize_warm",
         ),
         # EXTCODECOPY tests
@@ -129,8 +129,8 @@
             Op.EXTCODECOPY(
                 address_warm=True, data_size=32, new_memory_size=32
             ),
-            Osaka.gas_costs().GAS_WARM_ACCOUNT_ACCESS
-            + Osaka.gas_costs().GAS_COPY * 1
+            Osaka.gas_costs().WARM_ACCESS
+            + Osaka.gas_costs().OPCODE_COPY_PER_WORD * 1
             + Osaka.memory_expansion_gas_calculator()(new_bytes=32),
             id="extcodecopy_warm",
         ),
@@ -139,8 +139,8 @@
             Op.EXTCODECOPY(
                 address_warm=False, data_size=64, new_memory_size=64
             ),
-            Osaka.gas_costs().GAS_COLD_ACCOUNT_ACCESS
-            + Osaka.gas_costs().GAS_COPY * 2
+            Osaka.gas_costs().COLD_ACCOUNT_ACCESS
+            + Osaka.gas_costs().OPCODE_COPY_PER_WORD * 2
             + Osaka.memory_expansion_gas_calculator()(new_bytes=64),
             id="extcodecopy_cold",
         ),
@@ -148,21 +148,21 @@
         pytest.param(
             Osaka,
             Op.EXTCODEHASH(address_warm=False),
-            Osaka.gas_costs().GAS_COLD_ACCOUNT_ACCESS,
+            Osaka.gas_costs().COLD_ACCOUNT_ACCESS,
             id="extcodehash_cold",
         ),
         pytest.param(
             Osaka,
             Op.EXTCODEHASH(address_warm=True),
-            Osaka.gas_costs().GAS_WARM_ACCOUNT_ACCESS,
+            Osaka.gas_costs().WARM_ACCESS,
             id="extcodehash_warm",
         ),
         # RETURNDATACOPY tests
         pytest.param(
             Osaka,
             Op.RETURNDATACOPY(data_size=32, new_memory_size=32),
-            Osaka.gas_costs().GAS_VERY_LOW
-            + Osaka.gas_costs().GAS_COPY * 1
+            Osaka.gas_costs().VERY_LOW
+            + Osaka.gas_costs().OPCODE_COPY_PER_WORD * 1
             + Osaka.memory_expansion_gas_calculator()(new_bytes=32),
             id="returndatacopy",
         ),
@@ -170,7 +170,7 @@
         pytest.param(
             Osaka,
             Op.MLOAD(new_memory_size=32),
-            Osaka.gas_costs().GAS_VERY_LOW
+            Osaka.gas_costs().VERY_LOW
             + Osaka.memory_expansion_gas_calculator()(new_bytes=32),
             id="mload_memory_expansion",
         ),
@@ -178,7 +178,7 @@
         pytest.param(
             Osaka,
             Op.MSTORE8(new_memory_size=1),
-            Osaka.gas_costs().GAS_VERY_LOW
+            Osaka.gas_costs().VERY_LOW
             + Osaka.memory_expansion_gas_calculator()(new_bytes=1),
             id="mstore8_memory_expansion",
         ),
@@ -186,29 +186,29 @@
         pytest.param(
             Osaka,
             Op.SLOAD(key_warm=False),
-            Osaka.gas_costs().GAS_COLD_SLOAD,
+            Osaka.gas_costs().COLD_STORAGE_ACCESS,
             id="sload_cold",
         ),
         pytest.param(
             Osaka,
             Op.SLOAD(key_warm=True),
-            Osaka.gas_costs().GAS_WARM_SLOAD,
+            Osaka.gas_costs().WARM_SLOAD,
             id="sload_warm",
         ),
         # MCOPY tests
         pytest.param(
             Osaka,
             Op.MCOPY(data_size=32, new_memory_size=32),
-            Osaka.gas_costs().GAS_VERY_LOW
-            + Osaka.gas_costs().GAS_COPY * 1
+            Osaka.gas_costs().VERY_LOW
+            + Osaka.gas_costs().OPCODE_COPY_PER_WORD * 1
             + Osaka.memory_expansion_gas_calculator()(new_bytes=32),
             id="mcopy_one_word",
         ),
         pytest.param(
             Osaka,
             Op.MCOPY(data_size=96, new_memory_size=128, old_memory_size=64),
-            Osaka.gas_costs().GAS_VERY_LOW
-            + Osaka.gas_costs().GAS_COPY * 3
+            Osaka.gas_costs().VERY_LOW
+            + Osaka.gas_costs().OPCODE_COPY_PER_WORD * 3
             + Osaka.memory_expansion_gas_calculator()(
                 new_bytes=128, previous_bytes=64
             ),
@@ -218,8 +218,8 @@
         pytest.param(
             Osaka,
             Op.LOG0(data_size=32, new_memory_size=32),
-            Osaka.gas_costs().GAS_LOG
-            + Osaka.gas_costs().GAS_LOG_DATA_PER_BYTE * 32
+            Osaka.gas_costs().OPCODE_LOG_BASE
+            + Osaka.gas_costs().OPCODE_LOG_DATA_PER_BYTE * 32
             + Osaka.memory_expansion_gas_calculator()(new_bytes=32),
             id="log0",
         ),
@@ -227,9 +227,9 @@
         pytest.param(
             Osaka,
             Op.LOG1(data_size=64, new_memory_size=64),
-            Osaka.gas_costs().GAS_LOG
-            + Osaka.gas_costs().GAS_LOG_DATA_PER_BYTE * 64
-            + Osaka.gas_costs().GAS_LOG_TOPIC
+            Osaka.gas_costs().OPCODE_LOG_BASE
+            + Osaka.gas_costs().OPCODE_LOG_DATA_PER_BYTE * 64
+            + Osaka.gas_costs().OPCODE_LOG_TOPIC
             + Osaka.memory_expansion_gas_calculator()(new_bytes=64),
             id="log1",
         ),
@@ -237,9 +237,9 @@
         pytest.param(
             Osaka,
             Op.LOG2(data_size=128, new_memory_size=128),
-            Osaka.gas_costs().GAS_LOG
-            + Osaka.gas_costs().GAS_LOG_DATA_PER_BYTE * 128
-            + Osaka.gas_costs().GAS_LOG_TOPIC * 2
+            Osaka.gas_costs().OPCODE_LOG_BASE
+            + Osaka.gas_costs().OPCODE_LOG_DATA_PER_BYTE * 128
+            + Osaka.gas_costs().OPCODE_LOG_TOPIC * 2
             + Osaka.memory_expansion_gas_calculator()(new_bytes=128),
             id="log2",
         ),
@@ -247,9 +247,9 @@
         pytest.param(
             Osaka,
             Op.LOG3(data_size=256, new_memory_size=256),
-            Osaka.gas_costs().GAS_LOG
-            + Osaka.gas_costs().GAS_LOG_DATA_PER_BYTE * 256
-            + Osaka.gas_costs().GAS_LOG_TOPIC * 3
+            Osaka.gas_costs().OPCODE_LOG_BASE
+            + Osaka.gas_costs().OPCODE_LOG_DATA_PER_BYTE * 256
+            + Osaka.gas_costs().OPCODE_LOG_TOPIC * 3
             + Osaka.memory_expansion_gas_calculator()(new_bytes=256),
             id="log3",
         ),
@@ -257,9 +257,9 @@
         pytest.param(
             Osaka,
             Op.LOG4(data_size=512, new_memory_size=512),
-            Osaka.gas_costs().GAS_LOG
-            + Osaka.gas_costs().GAS_LOG_DATA_PER_BYTE * 512
-            + Osaka.gas_costs().GAS_LOG_TOPIC * 4
+            Osaka.gas_costs().OPCODE_LOG_BASE
+            + Osaka.gas_costs().OPCODE_LOG_DATA_PER_BYTE * 512
+            + Osaka.gas_costs().OPCODE_LOG_TOPIC * 4
             + Osaka.memory_expansion_gas_calculator()(new_bytes=512),
             id="log4",
         ),
@@ -267,9 +267,9 @@
         pytest.param(
             Osaka,
             Op.CREATE(init_code_size=100, new_memory_size=100),
-            Osaka.gas_costs().GAS_CREATE
+            Osaka.gas_costs().OPCODE_CREATE_BASE
             # (100 + 31) // 32 = 4
-            + Osaka.gas_costs().GAS_CODE_INIT_PER_WORD * 4
+            + Osaka.gas_costs().CODE_INIT_PER_WORD * 4
             + Osaka.memory_expansion_gas_calculator()(new_bytes=100),
             id="create_with_initcode",
         ),
@@ -277,9 +277,9 @@
         pytest.param(
             Osaka,
             Op.CREATE2(init_code_size=64, new_memory_size=64),
-            Osaka.gas_costs().GAS_CREATE
-            + Osaka.gas_costs().GAS_CODE_INIT_PER_WORD * 2
-            + Osaka.gas_costs().GAS_KECCAK256_PER_WORD * 2
+            Osaka.gas_costs().OPCODE_CREATE_BASE
+            + Osaka.gas_costs().CODE_INIT_PER_WORD * 2
+            + Osaka.gas_costs().OPCODE_KECCAK256_PER_WORD * 2
             + Osaka.memory_expansion_gas_calculator()(new_bytes=64),
             id="create2_with_initcode_and_hash",
         ),
@@ -289,15 +289,15 @@
             Op.CALL(
                 address_warm=True, value_transfer=False, new_memory_size=64
             ),
-            Osaka.gas_costs().GAS_WARM_ACCOUNT_ACCESS
+            Osaka.gas_costs().WARM_ACCESS
             + Osaka.memory_expansion_gas_calculator()(new_bytes=64),
             id="call_warm_no_value",
         ),
         pytest.param(
             Osaka,
             Op.CALL(address_warm=False, delegated_address=True),
-            Osaka.gas_costs().GAS_COLD_ACCOUNT_ACCESS
-            + Osaka.gas_costs().GAS_COLD_ACCOUNT_ACCESS,
+            Osaka.gas_costs().COLD_ACCOUNT_ACCESS
+            + Osaka.gas_costs().COLD_ACCOUNT_ACCESS,
             id="call_cold_delegated_address",
         ),
         pytest.param(
@@ -307,22 +307,22 @@
                 delegated_address=True,
                 delegated_address_warm=True,
             ),
-            Osaka.gas_costs().GAS_COLD_ACCOUNT_ACCESS
-            + Osaka.gas_costs().GAS_WARM_ACCOUNT_ACCESS,
+            Osaka.gas_costs().COLD_ACCOUNT_ACCESS
+            + Osaka.gas_costs().WARM_ACCESS,
             id="call_warm_delegated_address",
         ),
         pytest.param(
             Osaka,
             Op.CALL(address_warm=False, value_transfer=True, account_new=True),
-            Osaka.gas_costs().GAS_COLD_ACCOUNT_ACCESS
-            + Osaka.gas_costs().GAS_CALL_VALUE
-            + Osaka.gas_costs().GAS_NEW_ACCOUNT,
+            Osaka.gas_costs().COLD_ACCOUNT_ACCESS
+            + Osaka.gas_costs().CALL_VALUE
+            + Osaka.gas_costs().NEW_ACCOUNT,
             id="call_cold_account_new",
         ),
         pytest.param(
             Homestead,
             Op.CALL(address_warm=False, value_transfer=True, account_new=True),
-            Homestead.gas_costs().GAS_COLD_ACCOUNT_ACCESS,
+            Homestead.gas_costs().COLD_ACCOUNT_ACCESS,
             id="call_cold_account_new_homestead",
         ),
         pytest.param(
@@ -333,8 +333,8 @@
                 account_new=False,
                 new_memory_size=32,
             ),
-            Osaka.gas_costs().GAS_COLD_ACCOUNT_ACCESS
-            + Osaka.gas_costs().GAS_CALL_VALUE
+            Osaka.gas_costs().COLD_ACCOUNT_ACCESS
+            + Osaka.gas_costs().CALL_VALUE
             + Osaka.memory_expansion_gas_calculator()(new_bytes=32),
             id="call_cold_with_value",
         ),
@@ -346,9 +346,9 @@
                 account_new=True,
                 new_memory_size=32,
             ),
-            Osaka.gas_costs().GAS_COLD_ACCOUNT_ACCESS
-            + Osaka.gas_costs().GAS_CALL_VALUE
-            + Osaka.gas_costs().GAS_NEW_ACCOUNT
+            Osaka.gas_costs().COLD_ACCOUNT_ACCESS
+            + Osaka.gas_costs().CALL_VALUE
+            + Osaka.gas_costs().NEW_ACCOUNT
             + Osaka.memory_expansion_gas_calculator()(new_bytes=32),
             id="call_cold_new_account",
         ),
@@ -358,7 +358,7 @@
             Op.CALLCODE(
                 address_warm=True, value_transfer=False, new_memory_size=32
             ),
-            Osaka.gas_costs().GAS_WARM_ACCOUNT_ACCESS
+            Osaka.gas_costs().WARM_ACCESS
             + Osaka.memory_expansion_gas_calculator()(new_bytes=32),
             id="callcode_warm",
         ),
@@ -366,14 +366,14 @@
         pytest.param(
             Osaka,
             Op.DELEGATECALL(address_warm=True, new_memory_size=32),
-            Osaka.gas_costs().GAS_WARM_ACCOUNT_ACCESS
+            Osaka.gas_costs().WARM_ACCESS
             + Osaka.memory_expansion_gas_calculator()(new_bytes=32),
             id="delegatecall_warm",
         ),
         pytest.param(
             Osaka,
             Op.DELEGATECALL(address_warm=False, new_memory_size=64),
-            Osaka.gas_costs().GAS_COLD_ACCOUNT_ACCESS
+            Osaka.gas_costs().COLD_ACCOUNT_ACCESS
             + Osaka.memory_expansion_gas_calculator()(new_bytes=64),
             id="delegatecall_cold",
         ),
@@ -381,14 +381,14 @@
         pytest.param(
             Osaka,
             Op.STATICCALL(address_warm=True, new_memory_size=32),
-            Osaka.gas_costs().GAS_WARM_ACCOUNT_ACCESS
+            Osaka.gas_costs().WARM_ACCESS
             + Osaka.memory_expansion_gas_calculator()(new_bytes=32),
             id="staticcall_warm",
         ),
         pytest.param(
             Osaka,
             Op.STATICCALL(address_warm=False, new_memory_size=0),
-            Osaka.gas_costs().GAS_COLD_ACCOUNT_ACCESS,
+            Osaka.gas_costs().COLD_ACCOUNT_ACCESS,
             id="staticcall_cold_no_memory",
         ),
         # RETURN tests
@@ -401,7 +401,7 @@
         pytest.param(
             Osaka,
             Op.RETURN(code_deposit_size=100, new_memory_size=32),
-            Osaka.gas_costs().GAS_CODE_DEPOSIT_PER_BYTE * 100
+            Osaka.gas_costs().CODE_DEPOSIT_PER_BYTE * 100
             + Osaka.memory_expansion_gas_calculator()(new_bytes=32),
             id="return_with_code_deposit",
         ),
@@ -416,7 +416,7 @@
         pytest.param(
             Osaka,
             Op.CLZ,
-            Osaka.gas_costs().GAS_LOW,
+            Osaka.gas_costs().LOW,
             id="clz_osaka",
         ),
     ],
@@ -432,20 +432,19 @@ def test_opcode_gas_costs(fork: Fork, opcode: Op, expected_cost: int) -> None:
         pytest.param(
             Osaka,
             Op.ADD + Op.SUB,
-            Osaka.gas_costs().GAS_VERY_LOW * 2,
+            Osaka.gas_costs().VERY_LOW * 2,
             id="sum_of_opcodes",
         ),
         pytest.param(
             Osaka,
             Op.ADD(1, 1),
-            Osaka.gas_costs().GAS_VERY_LOW * 3,
+            Osaka.gas_costs().VERY_LOW * 3,
             id="opcode_with_args",
         ),
         pytest.param(
             Osaka,
             Op.SSTORE(1, 2, key_warm=True),
-            Osaka.gas_costs().GAS_STORAGE_SET
-            + Osaka.gas_costs().GAS_VERY_LOW * 2,
+            Osaka.gas_costs().STORAGE_SET + Osaka.gas_costs().VERY_LOW * 2,
             id="opcode_with_metadata",
         ),
     ],
@@ -540,69 +539,69 @@ def test_bytecode_refunds(  # noqa: D103
         pytest.param(
             Osaka,
             Op.SSTORE(key_warm=True, original_value=0, new_value=0),
-            Osaka.gas_costs().GAS_WARM_SLOAD,
+            Osaka.gas_costs().WARM_SLOAD,
             id="sstore_noop_zero_warm",  # 0 → 0
         ),
         pytest.param(
             Osaka,
             Op.SSTORE(key_warm=False, original_value=0, new_value=0),
-            Osaka.gas_costs().GAS_COLD_SLOAD
-            + Osaka.gas_costs().GAS_WARM_SLOAD,
+            Osaka.gas_costs().COLD_STORAGE_ACCESS
+            + Osaka.gas_costs().WARM_SLOAD,
             id="sstore_noop_zero_cold",  # 0 → 0
         ),
         pytest.param(
             Osaka,
             Op.SSTORE(key_warm=True, original_value=5, new_value=5),
-            Osaka.gas_costs().GAS_WARM_SLOAD,
+            Osaka.gas_costs().WARM_SLOAD,
             id="sstore_noop_nonzero_warm",  # 5 → 5
         ),
         pytest.param(
             Osaka,
             Op.SSTORE(key_warm=False, original_value=5, new_value=5),
-            Osaka.gas_costs().GAS_COLD_SLOAD
-            + Osaka.gas_costs().GAS_WARM_SLOAD,
+            Osaka.gas_costs().COLD_STORAGE_ACCESS
+            + Osaka.gas_costs().WARM_SLOAD,
             id="sstore_noop_nonzero_cold",  # 5 → 5
         ),
         # Create storage: 0 → X (original == 0)
         pytest.param(
             Osaka,
             Op.SSTORE(key_warm=True, new_value=5),
-            Osaka.gas_costs().GAS_STORAGE_SET,
+            Osaka.gas_costs().STORAGE_SET,
             id="sstore_create_warm",  # 0 → 5
         ),
         pytest.param(
             Osaka,
             Op.SSTORE(key_warm=False, new_value=5),
-            Osaka.gas_costs().GAS_COLD_SLOAD
-            + Osaka.gas_costs().GAS_STORAGE_SET,
+            Osaka.gas_costs().COLD_STORAGE_ACCESS
+            + Osaka.gas_costs().STORAGE_SET,
             id="sstore_create_cold",  # 0 → 5
         ),
         # Modify storage: X → Y (original != 0, new != 0, new != original)
         pytest.param(
             Osaka,
             Op.SSTORE(key_warm=True, original_value=5, new_value=7),
-            Osaka.gas_costs().GAS_STORAGE_RESET,
+            Osaka.gas_costs().STORAGE_RESET,
             id="sstore_modify_warm",  # 5 → 7
         ),
         pytest.param(
             Osaka,
             Op.SSTORE(key_warm=False, original_value=5, new_value=7),
-            Osaka.gas_costs().GAS_COLD_SLOAD
-            + Osaka.gas_costs().GAS_STORAGE_RESET,
+            Osaka.gas_costs().COLD_STORAGE_ACCESS
+            + Osaka.gas_costs().STORAGE_RESET,
             id="sstore_modify_cold",  # 5 → 7
         ),
         # Clear storage: X → 0 (original != 0, new == 0)
         pytest.param(
             Osaka,
             Op.SSTORE(key_warm=True, original_value=5, new_value=0),
-            Osaka.gas_costs().GAS_STORAGE_RESET,
+            Osaka.gas_costs().STORAGE_RESET,
             id="sstore_clear_warm",  # 5 → 0
         ),
         pytest.param(
             Osaka,
             Op.SSTORE(key_warm=False, original_value=5, new_value=0),
-            Osaka.gas_costs().GAS_COLD_SLOAD
-            + Osaka.gas_costs().GAS_STORAGE_RESET,
+            Osaka.gas_costs().COLD_STORAGE_ACCESS
+            + Osaka.gas_costs().STORAGE_RESET,
             id="sstore_clear_cold",  # 5 → 0
         ),
     ],
diff --git a/packages/testing/src/execution_testing/forks/transition_base_fork.py b/packages/testing/src/execution_testing/forks/transition_base_fork.py
index e4cab1e1b16..3dca0cb1d31 100644
--- a/packages/testing/src/execution_testing/forks/transition_base_fork.py
+++ b/packages/testing/src/execution_testing/forks/transition_base_fork.py
@@ -1,53 +1,139 @@
 """Base objects used to define transition forks."""
 
-from inspect import signature
-from typing import Any, Callable, List, Type
+from typing import Any, Callable, ClassVar, Dict, Type
 
 from .base_fork import BaseFork
 
-ALWAYS_TRANSITIONED_BLOCK_NUMBER = 10_000
-ALWAYS_TRANSITIONED_BLOCK_TIMESTAMP = 10_000_000
 
+class TransitionBaseMetaClass(type):
+    """Metaclass for TransitionBaseClass."""
 
-class TransitionBaseClass:
-    """Base class for transition forks."""
+    def name(cls) -> str:
+        """
+        Return the name of the transition fork (e.g., Berlin), must be
+        implemented by subclasses.
+        """
+        raise Exception("Not implemented")
 
-    @classmethod
     def transitions_to(cls) -> Type[BaseFork]:
-        """Return fork where the transition ends."""
+        """
+        Return fork where the transition ends.
+
+        If the fork transitions multiple times, this function always returns
+        the last fork.
+        """
         raise Exception("Not implemented")
 
-    @classmethod
     def transitions_from(cls) -> Type[BaseFork]:
-        """Return fork where the transition starts."""
+        """
+        Return fork where the transition starts.
+
+        If the fork transitions multiple times, this function always returns
+        the first fork.
+        """
         raise Exception("Not implemented")
 
+    def __repr__(cls) -> str:
+        """Print the name of the fork, instead of the class."""
+        return cls.name()
+
+    def _other_fork(
+        cls, other: "TransitionBaseMetaClass | Type[BaseFork]"
+    ) -> Type[BaseFork]:
+        """Return the fork to compare against for the other operand."""
+        if isinstance(other, TransitionBaseMetaClass):
+            return other.transitions_to()
+        return other
+
+    def __gt__(cls, other: "TransitionBaseMetaClass | Type[BaseFork]") -> bool:
+        """Compare if a fork is newer than some other fork (cls > other)."""
+        return cls.transitions_to() > cls._other_fork(other)
+
+    def __ge__(cls, other: "TransitionBaseMetaClass | Type[BaseFork]") -> bool:
+        """
+        Compare if a fork is newer than or equal to some other fork (cls >=
+        other).
+        """
+        return cls.transitions_to() >= cls._other_fork(other)
+
+    def __lt__(cls, other: "TransitionBaseMetaClass | Type[BaseFork]") -> bool:
+        """Compare if a fork is older than some other fork (cls < other)."""
+        return cls.transitions_to() < cls._other_fork(other)
+
+    def __le__(cls, other: "TransitionBaseMetaClass | Type[BaseFork]") -> bool:
+        """
+        Compare if a fork is older than or equal to some other fork (cls <=
+        other).
+        """
+        return cls.transitions_to() <= cls._other_fork(other)
+
+
+class TransitionBaseClass(metaclass=TransitionBaseMetaClass):
+    """Base class for transition forks."""
+
+    is_transition_fork: ClassVar[bool] = True
+    at_block: ClassVar[int] = 0
+    at_timestamp: ClassVar[int] = 0
+    _ignore: ClassVar[bool] = False
+
+    @classmethod
+    def fork_at(
+        cls, *, block_number: int = 0, timestamp: int = 0
+    ) -> Type[BaseFork]:
+        """
+        Return fork at the given block number and timestamp.
+        """
+        del block_number, timestamp
+        raise Exception("Not implemented")
+
+    @classmethod
+    def ignore(cls) -> bool:
+        """Return whether the fork should be ignored during test generation."""
+        return cls._ignore
+
+    @classmethod
+    def is_deployed(cls) -> bool:
+        """
+        Return whether the transitions-to fork has been deployed to mainnet,
+        or not.
+        """
+        return cls.transitions_to().is_deployed()
 
-def base_fork_abstract_methods() -> List[str]:
-    """
-    Return list of all abstract methods that must be implemented by a fork.
-    """
-    return list(BaseFork.__abstractmethods__)
+    @classmethod
+    def ruleset(cls) -> Dict[str, int]:
+        """
+        Return the ruleset used for fork configuration.
+        """
+        raise Exception("Not implemented")
 
 
 def transition_fork(
-    to_fork: Type[BaseFork], at_block: int = 0, at_timestamp: int = 0
-) -> Callable[[Type[BaseFork]], Type[TransitionBaseClass]]:
+    to_fork: Type[BaseFork],
+    from_fork: Type[BaseFork],
+    at_block: int = 0,
+    at_timestamp: int = 0,
+    ignore: bool = False,
+) -> Callable[[Type], Type[TransitionBaseClass]]:
     """Mark a class as a transition fork."""
 
     def decorator(cls: Type[Any]) -> Type[TransitionBaseClass]:
         transition_name = cls.__name__
-        from_fork = cls.__bases__[0]
-        assert issubclass(from_fork, BaseFork)
+
+        if to_fork._fork_by_timestamp:
+            assert at_block == 0, f"Invalid block for {transition_name}"
+            assert at_timestamp > 0, f"Invalid timestamp for {transition_name}"
+        else:
+            assert at_block > 0, f"Invalid block for {transition_name}"
+            assert at_timestamp == 0, (
+                f"Invalid timestamp for {transition_name}"
+            )
 
         class NewTransitionClass(
             cls,
             TransitionBaseClass,
-            BaseFork,
-            transition_tool_name=cls._transition_tool_name,
-            solc_name=cls._solc_name,
-            ignore=cls._ignore,
         ):
+            _ignore = ignore
+
             @classmethod
             def transitions_to(cls) -> Type[BaseFork]:
                 return to_fork
@@ -56,58 +142,35 @@ def transitions_to(cls) -> Type[BaseFork]:
             def transitions_from(cls) -> Type[BaseFork]:
                 return from_fork
 
-        NewTransitionClass.name = lambda: transition_name  # type: ignore
-
-        def make_transition_method(
-            base_method: Callable[..., Any],
-            from_fork_method: Callable[..., Any],
-            to_fork_method: Callable[..., Any],
-        ) -> classmethod:
-            base_method_parameters = signature(base_method).parameters
-
-            def transition_method(
-                cls: Type[Any],
-                block_number: int = ALWAYS_TRANSITIONED_BLOCK_NUMBER,
-                timestamp: int = ALWAYS_TRANSITIONED_BLOCK_TIMESTAMP,
-            ) -> Any:
-                del cls
-
-                kwargs = {}
-                if "block_number" in base_method_parameters:
-                    kwargs["block_number"] = block_number
-                if "timestamp" in base_method_parameters:
-                    kwargs["timestamp"] = timestamp
-
-                if getattr(
-                    base_method, "__prefer_transition_to_method__", False
-                ):
-                    return to_fork_method(**kwargs)
+            @classmethod
+            def fork_at(
+                cls, *, block_number: int = 0, timestamp: int = 0
+            ) -> Type[BaseFork]:
                 return (
-                    to_fork_method(**kwargs)
+                    to_fork
                     if block_number >= at_block and timestamp >= at_timestamp
-                    else from_fork_method(**kwargs)
+                    else from_fork
                 )
 
-            return classmethod(transition_method)
-
-        for method_name in base_fork_abstract_methods() + ["bpo_fork"]:
-            setattr(
-                NewTransitionClass,
-                method_name,
-                make_transition_method(
-                    getattr(BaseFork, method_name),
-                    getattr(from_fork, method_name),
-                    getattr(to_fork, method_name),
-                ),
-            )
+            @classmethod
+            def name(cls) -> str:
+                """Return name of the transition fork."""
+                return transition_name
+
+            @classmethod
+            def ruleset(cls) -> Dict[str, int]:
+                """
+                Return the ruleset used for fork configuration.
+                """
+                return to_fork.ruleset(
+                    value=at_timestamp
+                    if to_fork._fork_by_timestamp
+                    else at_block
+                )
 
-        NewTransitionClass.transitions_to = lambda: to_fork  # type: ignore
-        NewTransitionClass.transitions_from = lambda: from_fork  # type: ignore
-        NewTransitionClass.fork_at = lambda block_number=0, timestamp=0: (  # type: ignore
-            to_fork
-            if block_number >= at_block and timestamp >= at_timestamp
-            else from_fork
-        )
+        NewTransitionClass.__name__ = transition_name
+        NewTransitionClass.at_block = at_block
+        NewTransitionClass.at_timestamp = at_timestamp
 
         return NewTransitionClass
 
diff --git a/packages/testing/src/execution_testing/logging/logger.py b/packages/testing/src/execution_testing/logging/logger.py
index 546cd709220..61e745b166d 100644
--- a/packages/testing/src/execution_testing/logging/logger.py
+++ b/packages/testing/src/execution_testing/logging/logger.py
@@ -215,7 +215,9 @@ def configure_logging(
         log_path = Path(log_file)
         log_path.parent.mkdir(exist_ok=True, parents=True)
 
-        file_handler_instance = logging.FileHandler(log_path, mode="w")
+        file_handler_instance = logging.FileHandler(
+            log_path, mode="w", delay=True
+        )
         file_handler_instance.setFormatter(UTCFormatter(fmt=log_format))
         root_logger.addHandler(file_handler_instance)
 
diff --git a/packages/testing/src/execution_testing/logging/tests/test_logging.py b/packages/testing/src/execution_testing/logging/tests/test_logging.py
index 6a1261dc249..eb5d479e51e 100644
--- a/packages/testing/src/execution_testing/logging/tests/test_logging.py
+++ b/packages/testing/src/execution_testing/logging/tests/test_logging.py
@@ -169,13 +169,14 @@ def test_configure_logging_with_file(self) -> None:
                 # Should return a file handler
                 assert isinstance(handler, logging.FileHandler)
 
-                # Should create the log file
-                assert log_file.exists()
+                # Delay file creation until the first record is emitted.
+                assert not log_file.exists()
 
                 # Log a message and check it appears in the file
                 logger = get_logger("test_config")
                 logger.info("Test log message")
 
+                assert log_file.exists()
                 with open(log_file, "r") as f:
                     log_content = f.read()
                     assert "Test log message" in log_content
@@ -258,12 +259,15 @@ def getoption(self, name: str) -> Any:
                 # Find the log file handler's file
                 log_file = Path(file_handlers[0].baseFilename)
 
-                # Check that the log file was created
-                assert log_file.exists()
-
                 # Verify the file is in the logs directory
                 assert log_file.parent.resolve() == log_dir.resolve()
 
+                # Delay file creation until the first record is emitted.
+                assert not log_file.exists()
+
+                get_logger("test_pytest_configure").info("Test log message")
+                assert log_file.exists()
+
                 # Clean up the test log file
                 log_file.unlink()
 
diff --git a/packages/testing/src/execution_testing/rpc/__init__.py b/packages/testing/src/execution_testing/rpc/__init__.py
index 87c62607f1a..4fe14aa2aa0 100644
--- a/packages/testing/src/execution_testing/rpc/__init__.py
+++ b/packages/testing/src/execution_testing/rpc/__init__.py
@@ -11,9 +11,11 @@
     EthRPC,
     ForkchoiceUpdateTimeoutError,
     NetRPC,
+    NewPayloadTimeoutError,
     PeerConnectionTimeoutError,
     SendTransactionExceptionError,
     TestingRPC,
+    Web3RPC,
 )
 from .rpc_types import (
     BlobAndProofV1,
@@ -43,9 +45,11 @@
     "JSONRPCRequest",
     "JSONRPCResponse",
     "NetRPC",
+    "NewPayloadTimeoutError",
     "RPCCall",
     "PeerConnectionTimeoutError",
     "SendTransactionExceptionError",
     "TestingRPC",
     "TransactionProtocol",
+    "Web3RPC",
 ]
diff --git a/packages/testing/src/execution_testing/rpc/rpc.py b/packages/testing/src/execution_testing/rpc/rpc.py
index e7f75aabe7f..2c8cdcb50b5 100644
--- a/packages/testing/src/execution_testing/rpc/rpc.py
+++ b/packages/testing/src/execution_testing/rpc/rpc.py
@@ -141,6 +141,29 @@ def __init__(
         super().__init__(msg)
 
 
+class NewPayloadTimeoutError(Exception):
+    """Raised when ``engine_newPayload`` stays SYNCING past the retry limit."""
+
+    def __init__(
+        self,
+        attempts: int,
+        elapsed: float,
+        interval: float,
+        final_status: PayloadStatusEnum,
+    ):
+        """Initialize with retry statistics and final status."""
+        self.attempts = attempts
+        self.elapsed = elapsed
+        self.interval = interval
+        self.final_status = final_status
+        msg = (
+            f"new_payload stayed SYNCING after {attempts} attempts over "
+            f"{elapsed:.1f}s (interval: {interval}s), final status: "
+            f"{final_status}"
+        )
+        super().__init__(msg)
+
+
 class PeerConnectionTimeoutError(Exception):
     """Raised when peer connection is not established within retry limits."""
 
@@ -1167,6 +1190,12 @@ def trace_call(self, tr: dict[str, str], block_number: str) -> Any | None:
             request=RPCCall(method="traceCall", params=params)
         ).result_or_raise()
 
+    def set_head(self, block_number: str) -> None:
+        """`debug_setHead`: Reset chain head to the given block."""
+        self.post_request(
+            request=RPCCall(method="setHead", params=[block_number])
+        ).result_or_raise()
+
 
 class EngineRPC(BaseJwtRPC):
     """
@@ -1189,6 +1218,53 @@ def new_payload(self, *params: Any, version: int) -> PayloadStatus:
             context=self.response_validation_context,
         )
 
+    def new_payload_with_retry(
+        self,
+        *params: Any,
+        version: int,
+        max_attempts: int = 10,
+        wait_fixed: float = 1.0,
+    ) -> PayloadStatus:
+        """
+        Send ``engine_newPayloadVX``, retrying while SYNCING.
+
+        Mirrors :meth:`forkchoice_updated_with_retry`: returns immediately on
+        any terminal status (VALID / INVALID / ACCEPTED / INVALID_BLOCK_HASH);
+        only loops while the client returns SYNCING. Raises
+        :class:`NewPayloadTimeoutError` if the budget runs out.
+        """
+        attempts = 0
+        start_time = time.time()
+        last_status: PayloadStatusEnum | None = None
+
+        def _on_retry(retry_state: RetryCallState) -> None:
+            logger.debug(
+                f"newPayload attempt {retry_state.attempt_number}: "
+                f"status={last_status}, retrying in {wait_fixed}s..."
+            )
+
+        @retry(
+            stop=stop_after_attempt(max_attempts),
+            wait=wait_fixed_tenacity(wait_fixed),
+            before_sleep=_on_retry,
+            reraise=True,
+        )
+        def _do() -> PayloadStatus:
+            nonlocal attempts, last_status
+            attempts += 1
+            response = self.new_payload(*params, version=version)
+            last_status = response.status
+            if response.status == PayloadStatusEnum.SYNCING:
+                raise NewPayloadTimeoutError(
+                    attempts=attempts,
+                    elapsed=time.time() - start_time,
+                    interval=wait_fixed,
+                    final_status=response.status,
+                )
+            return response
+
+        return _do()
+
     def forkchoice_updated(
         self,
         forkchoice_state: ForkchoiceState,
@@ -1418,7 +1494,7 @@ def build_block(
         self,
         parent_block_hash: Hash,
         payload_attributes: PayloadAttributes,
-        transactions: Sequence[TransactionProtocol] | None,
+        transactions: Sequence[TransactionProtocol | Bytes] | None,
         extra_data: Bytes | None = None,
         *,
         version: int = 1,
@@ -1428,6 +1504,9 @@ def build_block(
         provided *payload_attributes* and *transactions*.
 
         Calls ``testing_buildBlockVX``.
+
+        Transactions can be either ``TransactionProtocol`` objects (with
+        an ``rlp()`` method) or raw ``Bytes`` (already RLP-encoded).
         """
         method = f"buildBlockV{version}"
         params: List[Any] = [
@@ -1435,7 +1514,12 @@ def build_block(
             to_json(payload_attributes),
         ]
         if transactions is not None:
-            params.append([tx.rlp().hex() for tx in transactions])
+            params.append(
+                [
+                    tx.hex() if isinstance(tx, bytes) else tx.rlp().hex()
+                    for tx in transactions
+                ]
+            )
         else:
             params.append(None)
         if extra_data is not None:
@@ -1457,3 +1541,13 @@ def add_peer(self, enode: str) -> bool:
         return self.post_request(
             request=RPCCall(method="addPeer", params=[enode])
         ).result_or_raise()
+
+
+class Web3RPC(BaseRPC, namespace="web3"):
+    """Represents the web3 namespace RPC class."""
+
+    def client_version(self) -> str:
+        """`web3_clientVersion`: Return the client's version identifier."""
+        return self.post_request(
+            request=RPCCall(method="clientVersion", params=[])
+        ).result_or_raise()
diff --git a/packages/testing/src/execution_testing/rpc/rpc_types.py b/packages/testing/src/execution_testing/rpc/rpc_types.py
index b0668583f0d..c9a9fc7d959 100644
--- a/packages/testing/src/execution_testing/rpc/rpc_types.py
+++ b/packages/testing/src/execution_testing/rpc/rpc_types.py
@@ -28,6 +28,7 @@
 from execution_testing.fixtures.blockchain import (
     FixtureExecutionPayload,
 )
+from execution_testing.forks import Fork
 from execution_testing.test_types import EOA, Transaction, Withdrawal
 
 
@@ -212,6 +213,59 @@ class PayloadAttributes(CamelModel):
     parent_beacon_block_root: Hash | None = None
     target_blobs_per_block: HexNumber | None = None
     max_blobs_per_block: HexNumber | None = None
+    slot_number: HexNumber | None = None
+
+    @classmethod
+    def for_fork(
+        cls,
+        fork: Fork,
+        *,
+        timestamp: int,
+        prev_randao: Hash | None = None,
+        suggested_fee_recipient: Address | None = None,
+        withdrawals: List[Withdrawal] | None = None,
+        parent_beacon_block_root: Hash | None = None,
+    ) -> "PayloadAttributes":
+        """
+        Build PayloadAttributes with fork-aware optional fields filled in.
+
+        ``withdrawals`` and ``parent_beacon_block_root`` default to
+        fork-appropriate empty values; blob and slot fields are populated
+        when the fork's engine API requires them.
+        """
+        if withdrawals is None and fork.header_withdrawals_required():
+            withdrawals = []
+        if (
+            parent_beacon_block_root is None
+            and fork.header_beacon_root_required()
+        ):
+            parent_beacon_block_root = Hash(0)
+        return cls(
+            timestamp=HexNumber(timestamp),
+            prev_randao=prev_randao if prev_randao is not None else Hash(0),
+            suggested_fee_recipient=(
+                suggested_fee_recipient
+                if suggested_fee_recipient is not None
+                else Address(0)
+            ),
+            withdrawals=withdrawals,
+            parent_beacon_block_root=parent_beacon_block_root,
+            target_blobs_per_block=(
+                HexNumber(fork.target_blobs_per_block())
+                if fork.engine_payload_attribute_target_blobs_per_block()
+                else None
+            ),
+            max_blobs_per_block=(
+                HexNumber(fork.max_blobs_per_block())
+                if fork.engine_payload_attribute_max_blobs_per_block()
+                else None
+            ),
+            slot_number=(
+                HexNumber(0)
+                if fork.engine_payload_attribute_slot_number()
+                else None
+            ),
+        )
 
 
 class BlobsBundle(CamelModel):
diff --git a/packages/testing/src/execution_testing/specs/__init__.py b/packages/testing/src/execution_testing/specs/__init__.py
index 1194e165135..e850fe4cb23 100644
--- a/packages/testing/src/execution_testing/specs/__init__.py
+++ b/packages/testing/src/execution_testing/specs/__init__.py
@@ -2,7 +2,12 @@
 
 from .base import BaseTest, TestSpec
 from .base_static import BaseStaticTest
-from .benchmark import BenchmarkTest, BenchmarkTestFiller, BenchmarkTestSpec
+from .benchmark import (
+    BenchmarkTest,
+    BenchmarkTestFiller,
+    BenchmarkTestSpec,
+    OpcodeTarget,
+)
 from .blobs import BlobsTest, BlobsTestFiller, BlobsTestSpec
 from .blockchain import (
     Block,
@@ -35,6 +40,7 @@
     "BlockchainTestSpec",
     "Block",
     "Header",
+    "OpcodeTarget",
     "StateStaticTest",
     "StateTest",
     "StateTestFiller",
diff --git a/packages/testing/src/execution_testing/specs/base.py b/packages/testing/src/execution_testing/specs/base.py
index c37237b1b42..8aee027f097 100644
--- a/packages/testing/src/execution_testing/specs/base.py
+++ b/packages/testing/src/execution_testing/specs/base.py
@@ -17,7 +17,7 @@
 )
 
 import pytest
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, Field
 from typing_extensions import Self
 
 from execution_testing.base_types import to_hex
@@ -33,9 +33,13 @@
     FixtureFormat,
     LabeledFixtureFormat,
 )
-from execution_testing.forks import Fork
+from execution_testing.fixtures.post_verifications import PostVerifications
+from execution_testing.forks import Fork, TransitionFork
 from execution_testing.forks.base_fork import BaseFork
 from execution_testing.test_types import Environment, Withdrawal
+from execution_testing.test_types.receipt_types import (
+    TransactionReceipt,
+)
 
 
 class HashMismatchExceptionError(Exception):
@@ -91,6 +95,8 @@ class FillResult(BaseModel):
     gas_optimization: int | None
     benchmark_gas_used: int | None = None
     benchmark_opcode_count: OpcodeCount | None = None
+    post_verifications: PostVerifications | None = None
+    metadata: Dict[str, Any] = Field(default_factory=dict)
 
 
 class BaseTest(BaseModel):
@@ -100,8 +106,8 @@ class BaseTest(BaseModel):
 
     model_config = ConfigDict(extra="forbid")
 
-    fork: Fork = (
-        BaseFork  # type: ignore[type-abstract]
+    fork: Fork | TransitionFork = (
+        BaseFork
         # default to BaseFork to allow the filler to set it,
         # instead of each test having to set it
     )
@@ -109,6 +115,7 @@ class BaseTest(BaseModel):
     gas_optimization_max_gas_limit: int | None = None
     expected_benchmark_gas_used: int | None = None
     skip_gas_used_validation: bool = False
+    expected_receipt_status: int | None = None
     is_tx_gas_heavy_test: bool = False
     is_exception_test: bool = False
 
@@ -135,7 +142,7 @@ def model_post_init(self, __context: Any, /) -> None:
     def discard_fixture_format_by_marks(
         cls,
         fixture_format: FixtureFormat,
-        fork: Fork,
+        fork: Fork | TransitionFork,
         markers: List[pytest.Mark],
     ) -> bool:
         """
@@ -170,7 +177,7 @@ def from_test(
     ) -> Self:
         """Create a test in a different format from a base test."""
         for k in BaseTest.model_fields.keys():
-            if k not in kwargs:
+            if k not in kwargs and k in base_test.model_fields_set:
                 kwargs[k] = getattr(base_test, k)
         return cls(**kwargs)
 
@@ -178,7 +185,7 @@ def from_test(
     def discard_execute_format_by_marks(
         cls,
         execute_format: ExecuteFormat,
-        fork: Fork,
+        fork: Fork | TransitionFork,
         markers: List[pytest.Mark],
     ) -> bool:
         """
@@ -288,5 +295,32 @@ def validate_benchmark_gas(
             f"{gas_benchmark_value}"
         )
 
+    def validate_receipt_status(
+        self,
+        *,
+        receipts: List[TransactionReceipt],
+        block_number: int,
+    ) -> None:
+        """
+        Validate receipt status for every transaction in a block.
+
+        When expected_receipt_status is set, verify that all
+        receipts match. Catches silent OOG failures that roll
+        back state and invalidate benchmarks.
+        """
+        if "expected_receipt_status" not in self.model_fields_set:
+            return
+        for i, receipt in enumerate(receipts):
+            if receipt.status is not None and (
+                int(receipt.status) != self.expected_receipt_status
+            ):
+                raise Exception(
+                    f"Transaction {i} in block "
+                    f"{block_number} has receipt "
+                    f"status {int(receipt.status)}, "
+                    f"expected "
+                    f"{self.expected_receipt_status}."
+                )
+
 
 TestSpec = Callable[[Fork], Generator[BaseTest, None, None]]
diff --git a/packages/testing/src/execution_testing/specs/benchmark.py b/packages/testing/src/execution_testing/specs/benchmark.py
index da475d2df97..9e75c303313 100644
--- a/packages/testing/src/execution_testing/specs/benchmark.py
+++ b/packages/testing/src/execution_testing/specs/benchmark.py
@@ -32,12 +32,13 @@
 )
 from execution_testing.fixtures import (
     BlockchainEngineFixture,
+    BlockchainEngineStatefulFixture,
     BlockchainEngineXFixture,
     BlockchainFixture,
     FixtureFormat,
     LabeledFixtureFormat,
 )
-from execution_testing.forks import Fork
+from execution_testing.forks import Fork, TransitionFork
 from execution_testing.test_types import Alloc, Environment, Transaction
 from execution_testing.vm import Bytecode, Op
 
@@ -45,6 +46,24 @@
 from .blockchain import Block, BlockchainTest
 
 
+@dataclass(frozen=True)
+class OpcodeTarget:
+    """
+    Map a display name to an underlying opcode for count validation.
+
+    Use when the fixture metadata should show a descriptive label (e.g. a
+    precompile name) while opcode-count validation targets the real EVM
+    opcode that gets executed (e.g. STATICCALL).
+    """
+
+    name: str
+    opcode: Op
+
+    def __str__(self) -> str:
+        """Return the display name."""
+        return self.name
+
+
 @dataclass(kw_only=True)
 class BenchmarkCodeGenerator(ABC):
     """Abstract base class for generating benchmark bytecode."""
@@ -287,7 +306,8 @@ class BenchmarkTest(BaseTest):
         default_factory=lambda: int(Environment().gas_limit)
     )
     fixed_opcode_count: float | None = None
-    target_opcode: Op | None = None
+    expected_opcode_count: int | None = None
+    target_opcode: Op | OpcodeTarget | None = None
     code_generator: BenchmarkCodeGenerator | None = None
     # By default, benchmark tests require neither of these
     include_full_post_state_in_output: bool = False
@@ -299,6 +319,7 @@ class BenchmarkTest(BaseTest):
         BlockchainFixture,
         BlockchainEngineFixture,
         BlockchainEngineXFixture,
+        BlockchainEngineStatefulFixture,
     ]
 
     supported_execute_formats: ClassVar[Sequence[LabeledExecuteFormat]] = [
@@ -345,14 +366,9 @@ def model_post_init(self, __context: Any, /) -> None:
 
         blocks: List[Block] = self.setup_blocks
 
-        if (
-            self.fixed_opcode_count is not None
-            and self.code_generator is None
-            and self.target_opcode is None
-        ):
+        if self.fixed_opcode_count is not None and self.code_generator is None:
             pytest.skip(
-                "Cannot run fixed opcode count tests without a "
-                "code generator or a target opcode set"
+                "Cannot run fixed opcode count tests without a code generator"
             )
 
         if self.code_generator is not None:
@@ -375,7 +391,9 @@ def model_post_init(self, __context: Any, /) -> None:
 
         elif self.tx is not None:
             gas_limit = (
-                self.fork.transaction_gas_limit_cap()
+                self.fork.fork_at(
+                    block_number=0, timestamp=0
+                ).transaction_gas_limit_cap()
                 or self.gas_benchmark_value
             )
 
@@ -403,7 +421,7 @@ def pytest_parameter_name(cls) -> str:
     def discard_fixture_format_by_marks(
         cls,
         fixture_format: FixtureFormat,
-        fork: Fork,
+        fork: Fork | TransitionFork,
         markers: List[pytest.Mark],
     ) -> bool:
         """
@@ -456,9 +474,14 @@ def generate_blocks_from_code_generator(self) -> List[Block]:
         """Generate blocks using the code generator."""
         if self.code_generator is None:
             raise Exception("Code generator is not set")
-        self.code_generator.deploy_contracts(pre=self.pre, fork=self.fork)
+        self.code_generator.deploy_contracts(
+            pre=self.pre, fork=self.fork.fork_at(block_number=0, timestamp=0)
+        )
         gas_limit = (
-            self.fork.transaction_gas_limit_cap() or self.gas_benchmark_value
+            self.fork.fork_at(
+                block_number=0, timestamp=0
+            ).transaction_gas_limit_cap()
+            or self.gas_benchmark_value
         )
         benchmark_tx = self.code_generator.generate_transaction(
             pre=self.pre, gas_benchmark_value=gas_limit
@@ -474,10 +497,13 @@ def generate_fixed_opcode_count_transactions(self) -> List[Block]:
         if self.code_generator is None:
             raise Exception("Code generator is not set")
         self.code_generator.deploy_fix_count_contracts(
-            pre=self.pre, fork=self.fork
+            pre=self.pre, fork=self.fork.fork_at(block_number=0, timestamp=0)
         )
         gas_limit = (
-            self.fork.transaction_gas_limit_cap() or self.gas_benchmark_value
+            self.fork.fork_at(
+                block_number=0, timestamp=0
+            ).transaction_gas_limit_cap()
+            or self.gas_benchmark_value
         )
         benchmark_tx = self.code_generator.generate_transaction(
             pre=self.pre, gas_benchmark_value=gas_limit
@@ -497,29 +523,28 @@ def generate_blockchain_test(self) -> BlockchainTest:
             include_tx_receipts_in_output=self.include_tx_receipts_in_output,
         )
 
+    @staticmethod
     def _verify_target_opcode_count(
-        self, opcode_count: OpcodeCount | None
+        *,
+        target_opcode: Op | OpcodeTarget,
+        opcode_count: OpcodeCount,
+        expected_opcode_count: int,
+        tolerance: float = 0.05,
     ) -> None:
         """Verify target opcode was executed the expected number of times."""
-        # Skip validation if opcode count is not available
-        if opcode_count is None:
-            return
-
-        assert self.target_opcode is not None, "target_opcode is not set"
-        assert self.fixed_opcode_count is not None, (
-            "fixed_opcode_count is not set"
+        count_opcode = (
+            target_opcode.opcode
+            if isinstance(target_opcode, OpcodeTarget)
+            else target_opcode
         )
+        actual = opcode_count.root.get(count_opcode, 0)
+        max_difference = expected_opcode_count * tolerance  # 5% tolerance
 
-        # fixed_opcode_count is in thousands units
-        expected = self.fixed_opcode_count * 1000
-
-        actual = opcode_count.root.get(self.target_opcode, 0)
-        tolerance = expected * 0.05  # 5% tolerance
-
-        if abs(actual - expected) > tolerance:
+        if abs(actual - expected_opcode_count) > max_difference:
             raise ValueError(
-                f"Target opcode {self.target_opcode} count mismatch: "
-                f"expected ~{expected} (±5%), got {actual}"
+                f"Target opcode {target_opcode} count mismatch: "
+                f"expected ~{expected_opcode_count} "
+                f"(±{tolerance * 100}%), got {actual}"
             )
 
     def generate(
@@ -538,12 +563,38 @@ def generate(
 
             # Verify target opcode count if specified
             if (
-                self.target_opcode is not None
-                and self.fixed_opcode_count is not None
+                self.fixed_opcode_count is not None
+                or self.expected_opcode_count is not None
             ):
-                self._verify_target_opcode_count(
-                    fill_result.benchmark_opcode_count
-                )
+                target_opcode = self.target_opcode
+                assert target_opcode is not None, "target_opcode is not set"
+                opcode_count = fill_result.benchmark_opcode_count
+                if opcode_count is not None:
+                    if self.fixed_opcode_count is not None:
+                        self._verify_target_opcode_count(
+                            target_opcode=target_opcode,
+                            opcode_count=opcode_count,
+                            expected_opcode_count=int(
+                                # fixed_opcode_count is in thousands units
+                                self.fixed_opcode_count * 1000
+                            ),
+                        )
+                    elif self.expected_opcode_count is not None:
+                        self._verify_target_opcode_count(
+                            target_opcode=target_opcode,
+                            opcode_count=opcode_count,
+                            expected_opcode_count=self.expected_opcode_count,
+                        )
+                    else:
+                        raise Exception(
+                            "Opcode verification needs either "
+                            "`fixed_opcode_count` or `expected_opcode_count` "
+                            "to be set."
+                        )
+
+            if self.target_opcode is not None:
+                fill_result.metadata["target_opcode"] = str(self.target_opcode)
+
             return fill_result
         else:
             raise Exception(f"Unsupported fixture format: {fixture_format}")
diff --git a/packages/testing/src/execution_testing/specs/blockchain.py b/packages/testing/src/execution_testing/specs/blockchain.py
index 31f4219d53f..69d61382b30 100644
--- a/packages/testing/src/execution_testing/specs/blockchain.py
+++ b/packages/testing/src/execution_testing/specs/blockchain.py
@@ -30,14 +30,20 @@
     HeaderNonce,
     HexNumber,
     Number,
+    ZeroPaddedHexNumber,
 )
 from execution_testing.client_clis import (
     BlockExceptionWithMessage,
+    ClientBackend,
+    FillerBackend,
     LazyAlloc,
     Result,
     TransitionTool,
 )
-from execution_testing.client_clis.cli_types import OpcodeCount
+from execution_testing.client_clis.cli_types import (
+    EnginePayloadMetadata,
+    OpcodeCount,
+)
 from execution_testing.exceptions import (
     BlockException,
     EngineAPIError,
@@ -54,6 +60,7 @@
 from execution_testing.fixtures import (
     BaseFixture,
     BlockchainEngineFixture,
+    BlockchainEngineStatefulFixture,
     BlockchainEngineSyncFixture,
     BlockchainEngineXFixture,
     BlockchainFixture,
@@ -65,6 +72,7 @@
     FixtureBlockBase,
     FixtureConfig,
     FixtureEngineNewPayload,
+    FixtureExecutionPayloadModifier,
     FixtureHeader,
     FixtureTransaction,
     FixtureWithdrawal,
@@ -74,12 +82,14 @@
     FixtureBlobSchedule,
     FixtureTransactionReceipt,
 )
-from execution_testing.forks import Fork
+from execution_testing.fixtures.post_verifications import PostVerifications
+from execution_testing.forks import Fork, TransitionFork
 from execution_testing.test_types import (
     Alloc,
     Environment,
     Removable,
     Requests,
+    TestPhase,
     Transaction,
     Withdrawal,
 )
@@ -139,6 +149,39 @@ def count_blobs(txs: List[Transaction]) -> int:
     )
 
 
+def payload_metadata_to_fixture(
+    meta: EnginePayloadMetadata,
+    *,
+    phase: TestPhase | None = None,
+) -> FixtureEngineNewPayload:
+    """
+    Materialise an ``EnginePayloadMetadata`` into a fixture payload.
+
+    The client's ``execution_payload`` is forwarded verbatim — rebuilding
+    from fill's ``FixtureHeader`` would disagree on client-chosen fields
+    (``gas_limit``, etc.) and produce a mismatched ``block_hash``.
+    """
+    version = meta.new_payload_version
+    response = meta.payload_response
+    params: List[Any] = [response.execution_payload]
+    if version >= 3:
+        blob_hashes = (
+            response.blobs_bundle.blob_versioned_hashes()
+            if response.blobs_bundle is not None
+            else []
+        )
+        params.append(blob_hashes)
+        params.append(meta.parent_beacon_block_root)
+    if version >= 4 and response.execution_requests is not None:
+        params.append(response.execution_requests)
+    return FixtureEngineNewPayload(
+        params=tuple(params),
+        new_payload_version=version,
+        forkchoice_updated_version=meta.forkchoice_updated_version,
+        phase=phase,
+    )
+
+
 class Header(CamelModel):
     """Header type used to describe block header properties in test specs."""
 
@@ -163,7 +206,8 @@ class Header(CamelModel):
     excess_blob_gas: Removable | HexNumber | None = None
     parent_beacon_block_root: Removable | Hash | None = None
     requests_hash: Removable | Hash | None = None
-    bal_hash: Removable | Hash | None = None
+    block_access_list_hash: Removable | Hash | None = None
+    slot_number: Removable | HexNumber | None = None
 
     REMOVE_FIELD: ClassVar[Removable] = Removable()
     """
@@ -215,12 +259,18 @@ def apply(self, target: FixtureHeader) -> FixtureHeader:
         """
         Produce a fixture header copy with the set values from the modifier.
         """
-        return target.copy(
-            **{
-                k: (v if v is not Header.REMOVE_FIELD else None)
-                for k, v in self.model_dump(exclude_none=True).items()
-            }
-        )
+        overrides = {
+            k: (v if v is not Header.REMOVE_FIELD else None)
+            for k, v in self.model_dump(exclude_none=True).items()
+        }
+        unknown = overrides.keys() - target.__class__.model_fields.keys()
+        if unknown:
+            raise ValueError(
+                f"Header fields {unknown} do not exist on "
+                f"{target.__class__.__name__}. Check for field name "
+                f"mismatches between Header and {target.__class__.__name__}."
+            )
+        return target.copy(**overrides)
 
     def verify(self, target: FixtureHeader) -> None:
         """Verify that the header fields from self are as expected."""
@@ -296,6 +346,29 @@ class Block(Header):
     """Post state for verification after block execution in BlockchainTest"""
     block_access_list: Bytes | None = Field(None)
     """EIP-7928: Block-level access lists (serialized)."""
+    expected_gas_used: int | None = None
+    """Expected gas used for the block."""
+
+    @property
+    def phase(self) -> TestPhase | None:
+        """
+        Return the single phase shared by all txs, or ``None`` when the
+        block has no phase-tagged txs.
+
+        Mixed-phase blocks must be split via ``_split_blocks_by_phase``
+        before this property is read — they would otherwise need an
+        arbitrary tiebreaker, which is a bug, not a default.
+        """
+        phases = {_tx_phase(tx) for tx in self.txs}
+        phases.discard(None)
+        if not phases:
+            return None
+        if len(phases) == 1:
+            return next(iter(phases))
+        raise AssertionError(
+            f"Block.phase called on mixed-phase block (phases={phases}); "
+            "split via _split_blocks_by_phase first."
+        )
 
     def set_environment(self, env: Environment) -> Environment:
         """
@@ -333,13 +406,17 @@ def set_environment(self, env: Environment) -> Environment:
             not isinstance(self.requests_hash, Removable)
             and self.block_access_list is not None
         ):
-            new_env_values["bal_hash"] = self.block_access_list.keccak256()
+            new_env_values["block_access_list_hash"] = (
+                self.block_access_list.keccak256()
+            )
             new_env_values["block_access_list"] = self.block_access_list
         if (
             not isinstance(self.block_access_list, Removable)
             and self.block_access_list is not None
         ):
             new_env_values["block_access_list"] = self.block_access_list
+        if not isinstance(self.slot_number, Removable):
+            new_env_values["slot_number"] = self.slot_number
         """
         These values are required, but they depend on the previous environment,
         so they can be calculated here.
@@ -381,6 +458,7 @@ class BuiltBlock(CamelModel):
     result: Result
     expected_exception: BLOCK_EXCEPTION_TYPE = None
     engine_api_error_code: EngineAPIError | None = None
+    rlp_modifier: Header | None = None
     fork: Fork
     block_access_list: BlockAccessList | None
 
@@ -433,6 +511,40 @@ def get_block_rlp(self) -> Bytes:
         """Get the RLP of the block."""
         return self.get_fixture_block().rlp
 
+    @staticmethod
+    def derive_engine_payload_modifier(
+        rlp_modifier: Header | None,
+        block_access_list: BlockAccessList | None,
+    ) -> "FixtureExecutionPayloadModifier | None":
+        """
+        Propagate ``rlp_modifier``'s header changes to the engine payload.
+
+        The engine ``ExecutionPayload`` schema does not carry
+        ``block_access_list_hash`` directly; the equivalent payload field is
+        the ``block_access_list`` body. So a header modifier that touches the
+        BAL hash needs to drive a matching change on the payload body.
+        """
+        if rlp_modifier is None:
+            return None
+        bal_hash_override = rlp_modifier.block_access_list_hash
+        if bal_hash_override is None:
+            return None
+        if bal_hash_override is Header.REMOVE_FIELD:
+            return FixtureExecutionPayloadModifier(
+                block_access_list=(
+                    FixtureExecutionPayloadModifier.REMOVE_FIELD
+                ),
+            )
+        # The user injected a header BAL hash; mirror that on the engine
+        # payload by forcing a body to be present. Its exact value is
+        # irrelevant for negative tests — a non-``None`` value is enough to
+        # make a payload-version mismatch detectable.
+        if block_access_list is None:
+            return FixtureExecutionPayloadModifier(
+                block_access_list=Bytes(b""),
+            )
+        return None
+
     def get_fixture_engine_new_payload(self) -> FixtureEngineNewPayload:
         """Get a FixtureEngineNewPayload from the built block."""
         return FixtureEngineNewPayload.from_fixture_header(
@@ -444,6 +556,9 @@ def get_fixture_engine_new_payload(self) -> FixtureEngineNewPayload:
             block_access_list=self.block_access_list.rlp
             if self.block_access_list
             else None,
+            execution_payload_modifier=self.derive_engine_payload_modifier(
+                self.rlp_modifier, self.block_access_list
+            ),
             validation_error=self.expected_exception,
             error_code=self.engine_api_error_code,
         )
@@ -466,10 +581,7 @@ def verify_block_exception(
             self.result.block_exception
         )
         # Verify exceptions that are not caught by the transition tool.
-        fork_block_rlp_size_limit = self.fork.block_rlp_size_limit(
-            block_number=self.env.number,
-            timestamp=self.env.timestamp,
-        )
+        fork_block_rlp_size_limit = self.fork.block_rlp_size_limit()
         if fork_block_rlp_size_limit is not None:
             rlp_size = len(self.get_block_rlp())
             if rlp_size > fork_block_rlp_size_limit:
@@ -486,6 +598,17 @@ def verify_block_exception(
         )
 
 
+class TestingBuildBlock(BuiltBlock):
+    """
+    ``BuiltBlock`` from a live-client backend; carries the engine payload
+    so ``make_stateful_fixture`` can record what the client built.
+    """
+
+    model_config = CamelModel.model_config | {"arbitrary_types_allowed": True}
+
+    engine_payload: EnginePayloadMetadata
+
+
 GENESIS_ENVIRONMENT_DEFAULTS: Dict[str, Any] = {
     "fee_recipient": 0,
     "number": 0,
@@ -499,6 +622,73 @@ def verify_block_exception(
 """
 
 
+def _tx_phase(tx: Transaction) -> TestPhase | None:
+    """Read a tx's phase: ``test_phase`` first, then ``metadata.phase``."""
+    phase = getattr(tx, "test_phase", None)
+    if phase is not None:
+        return phase
+    meta = getattr(tx, "metadata", None)
+    if meta is None:
+        return None
+    return getattr(meta, "phase", None)
+
+
+def _split_blocks_by_phase(blocks: List[Block]) -> List[Block]:
+    """
+    Split each block into contiguous phase runs.
+
+    A mixed-phase block (e.g. EIP-7702 authorization tagged SETUP
+    followed by benchmark TEST txs) becomes multiple back-to-back
+    blocks, one per run; ``Block.phase`` asserts on mixed input.
+
+    Block-level fields describing final state (``expected_post_state``,
+    ``header_verify``, ...) stay on the LAST sub-block; earlier
+    sub-blocks get them cleared.
+    """
+    out: List[Block] = []
+    for block in blocks:
+        phases = [_tx_phase(tx) for tx in block.txs]
+        if len(set(phases)) <= 1:
+            out.append(block)
+            continue
+
+        runs: List[List[Transaction]] = []
+        current_run: List[Transaction] = []
+        current_phase: Any = object()  # sentinel
+        for tx, phase in zip(block.txs, phases, strict=False):
+            if not current_run or phase == current_phase:
+                current_run.append(tx)
+                current_phase = phase
+            else:
+                runs.append(current_run)
+                current_run = [tx]
+                current_phase = phase
+        if current_run:
+            runs.append(current_run)
+
+        last_idx = len(runs) - 1
+        for idx, run_txs in enumerate(runs):
+            if idx == last_idx:
+                out.append(block.model_copy(update={"txs": run_txs}))
+            else:
+                out.append(
+                    block.model_copy(
+                        update={
+                            "txs": run_txs,
+                            "header_verify": None,
+                            "rlp_modifier": None,
+                            "expected_block_access_list": None,
+                            "expected_post_state": None,
+                            "expected_gas_used": None,
+                            "exception": None,
+                            "skip_exception_verification": False,
+                            "engine_api_error_code": None,
+                        }
+                    )
+                )
+    return out
+
+
 class BlockchainTest(BaseTest):
     """Filler type that tests multiple blocks (valid or invalid) in a chain."""
 
@@ -525,8 +715,9 @@ class BlockchainTest(BaseTest):
     ] = [
         BlockchainFixture,
         BlockchainEngineFixture,
-        BlockchainEngineXFixture,
         BlockchainEngineSyncFixture,
+        BlockchainEngineXFixture,
+        BlockchainEngineStatefulFixture,
     ]
     supported_execute_formats: ClassVar[Sequence[LabeledExecuteFormat]] = [
         LabeledExecuteFormat(
@@ -547,7 +738,7 @@ class BlockchainTest(BaseTest):
     def discard_fixture_format_by_marks(
         cls,
         fixture_format: FixtureFormat,
-        fork: Fork,
+        fork: Fork | TransitionFork,
         markers: List[pytest.Mark],
     ) -> bool:
         """
@@ -573,7 +764,7 @@ def discard_fixture_format_by_marks(
     def get_genesis_environment(self) -> Environment:
         """Get the genesis environment for pre-allocation groups."""
         modified_values = self.genesis_environment.set_fork_requirements(
-            self.fork
+            self.fork.transitions_from()
         ).model_dump(exclude_unset=True)
         return Environment(**(GENESIS_ENVIRONMENT_DEFAULTS | modified_values))
 
@@ -593,13 +784,17 @@ def make_genesis(
         pre_alloc = self.pre
         if apply_pre_allocation_blockchain:
             pre_alloc = Alloc.merge(
-                Alloc.model_validate(self.fork.pre_allocation_blockchain()),
+                Alloc.model_validate(
+                    self.fork.transitions_to().pre_allocation_blockchain()
+                ),
                 pre_alloc,
             )
         if empty_accounts := pre_alloc.empty_accounts():
             raise Exception(f"Empty accounts in pre state: {empty_accounts}")
         state_root = pre_alloc.state_root()
-        genesis = FixtureHeader.genesis(self.fork, env, state_root)
+        genesis = FixtureHeader.genesis(
+            self.fork.transitions_from(), env, state_root
+        )
 
         return (
             pre_alloc,
@@ -611,7 +806,7 @@ def make_genesis(
 
     def generate_block_data(
         self,
-        t8n: TransitionTool,
+        t8n: FillerBackend,
         block: Block,
         previous_env: Environment,
         previous_alloc: Alloc | LazyAlloc,
@@ -619,9 +814,17 @@ def generate_block_data(
     ) -> BuiltBlock:
         """
         Generate common block data for both make_fixture and make_hive_fixture.
+
+        ``t8n`` is any backend satisfying ``FillerBackend``. The
+        default compute path passes a concrete ``TransitionTool``; stateful
+        filling will pass an ``ClientBackend`` that drives
+        ``testing_buildBlockV1`` against a live client.
         """
         env = block.set_environment(previous_env)
-        env = env.set_fork_requirements(self.fork)
+        fork = self.fork.fork_at(
+            block_number=env.number, timestamp=env.timestamp
+        )
+        env = env.set_fork_requirements(fork)
         txs = [tx.with_signature_and_sender() for tx in block.txs]
 
         if failing_tx_count := len([tx for tx in txs if tx.error]) > 0:
@@ -642,12 +845,10 @@ def generate_block_data(
                 senders_authorities=previous_senders_authorities,
                 txs=txs,
                 env=env,
-                fork=self.fork,
+                fork=fork,
                 chain_id=self.chain_id,
-                reward=self.fork.get_reward(
-                    block_number=env.number, timestamp=env.timestamp
-                ),
-                blob_schedule=self.fork.blob_schedule(),
+                reward=fork.get_reward(),
+                blob_schedule=fork.blob_schedule(),
             ),
             slow_request=self.is_tx_gas_heavy_test,
         )
@@ -658,12 +859,20 @@ def generate_block_data(
         # executing the block by simply counting the type-3 txs, we need to set
         # the correct value by default.
         blob_gas_used: int | None = None
-        if (
-            blob_gas_per_blob := self.fork.blob_gas_per_blob(
-                block_number=env.number, timestamp=env.timestamp
+        if fork.supports_blobs():
+            if (blob_gas_per_blob := fork.blob_gas_per_blob()) > 0:
+                blob_gas_used = blob_gas_per_blob * count_blobs(txs)
+        elif fork.header_blob_gas_used_required():
+            # Fork requires blob_gas_used header field but doesn't
+            # support blobs (e.g. Monad): fix value at zero.
+            blob_gas_used = 0
+
+        # Prepare slot_number for header initialization
+        slot_number_value: ZeroPaddedHexNumber | None = None
+        if fork.header_slot_number_required():
+            slot_number_value = ZeroPaddedHexNumber(
+                int(env.slot_number) if env.slot_number is not None else 0
             )
-        ) > 0:
-            blob_gas_used = blob_gas_per_blob * count_blobs(txs)
 
         header = FixtureHeader(
             **(
@@ -671,14 +880,18 @@ def generate_block_data(
                     exclude_none=True,
                     exclude={"blob_gas_used", "transactions_trie"},
                 )
-                | env.model_dump(exclude_none=True, exclude={"blob_gas_used"})
+                | env.model_dump(
+                    exclude_none=True,
+                    exclude={"blob_gas_used", "slot_number"},
+                )
             ),
             blob_gas_used=blob_gas_used,
             transactions_trie=Transaction.list_root(txs),
-            extra_data=block.extra_data
-            if block.extra_data is not None
-            else b"",
-            fork=self.fork,
+            extra_data=(
+                block.extra_data if block.extra_data is not None else b""
+            ),
+            slot_number=slot_number_value,
+            fork=fork,
         )
 
         if block.header_verify is not None:
@@ -690,10 +903,16 @@ def generate_block_data(
                     f"Verification of block {int(env.number)} failed"
                 ) from e
 
+        if block.expected_gas_used is not None:
+            gas_used = int(transition_tool_output.result.gas_used)
+            assert gas_used == block.expected_gas_used, (
+                f"gas_used ({gas_used}) does not match expected_gas_used "
+                f"({block.expected_gas_used})"
+                f", difference: {gas_used - block.expected_gas_used}"
+            )
+
         requests_list: List[Bytes] | None = None
-        if self.fork.header_requests_required(
-            block_number=header.number, timestamp=header.timestamp
-        ):
+        if fork.header_requests_required():
             assert transition_tool_output.result.requests is not None, (
                 "Requests are required for this block"
             )
@@ -716,35 +935,36 @@ def generate_block_data(
             )
             requests_list = block.requests
 
-        if self.fork.header_bal_hash_required(
-            block_number=header.number, timestamp=header.timestamp
-        ):
-            assert (
-                transition_tool_output.result.block_access_list is not None
-            ), (
+        # Decode BAL from RLP bytes provided by the transition tool.
+        t8n_bal_rlp = transition_tool_output.result.block_access_list
+        t8n_bal: BlockAccessList | None = None
+        if t8n_bal_rlp is not None:
+            t8n_bal = BlockAccessList.from_rlp(t8n_bal_rlp)
+
+        if fork.header_bal_hash_required():
+            assert t8n_bal is not None, (
                 "Block access list is required for this block but was not "
                 "provided by the transition tool"
             )
 
-            rlp = transition_tool_output.result.block_access_list.rlp
-            computed_bal_hash = Hash(rlp.keccak256())
-            assert computed_bal_hash == header.block_access_list_hash, (
+            computed_block_access_list_hash = Hash(t8n_bal.rlp.keccak256())
+            assert (
+                computed_block_access_list_hash
+                == header.block_access_list_hash
+            ), (
                 "Block access list hash in header does not match the "
                 f"computed hash from BAL: {header.block_access_list_hash} "
-                f"!= {computed_bal_hash}"
+                f"!= {computed_block_access_list_hash}"
             )
 
         if block.rlp_modifier is not None:
             # Modify any parameter specified in the `rlp_modifier` after
             # transition tool processing.
             header = block.rlp_modifier.apply(header)
-            header.fork = (
-                self.fork
-            )  # Deleted during `apply` because `exclude=True`
+            header.fork = fork  # Deleted during `apply` because `exclude=True`
 
         # Process block access list - apply transformer if present for invalid
         # tests
-        t8n_bal = transition_tool_output.result.block_access_list
         bal = t8n_bal
 
         # Always validate BAL structural integrity (ordering, duplicates)
@@ -763,10 +983,11 @@ def generate_block_data(
                 t8n_bal
             )
             if bal != t8n_bal:
-                # If the BAL was modified, update the header hash
+                # If the BAL was modified and the fork requires it, update the
+                # header hash
                 header.block_access_list_hash = Hash(bal.rlp.keccak256())
 
-        built_block = BuiltBlock(
+        built_block_kwargs: Dict[str, Any] = dict(
             header=header,
             alloc=transition_tool_output.alloc,
             senders_authorities=transition_tool_output.senders_authorities,
@@ -779,9 +1000,18 @@ def generate_block_data(
             result=transition_tool_output.result,
             expected_exception=block.exception,
             engine_api_error_code=block.engine_api_error_code,
-            fork=self.fork,
+            rlp_modifier=block.rlp_modifier,
+            fork=fork,
             block_access_list=bal,
         )
+        built_block: BuiltBlock
+        if transition_tool_output.engine_payload is not None:
+            built_block = TestingBuildBlock(
+                **built_block_kwargs,
+                engine_payload=transition_tool_output.engine_payload,
+            )
+        else:
+            built_block = BuiltBlock(**built_block_kwargs)
 
         try:
             rejected_txs = built_block.verify_transactions(
@@ -830,7 +1060,7 @@ def generate_block_data(
 
     def verify_post_state(
         self,
-        t8n: TransitionTool,
+        t8n: FillerBackend,
         t8n_state: Alloc,
         expected_state: Alloc | None = None,
     ) -> None:
@@ -846,7 +1076,7 @@ def verify_post_state(
 
     def make_fixture(
         self,
-        t8n: TransitionTool,
+        t8n: FillerBackend,
     ) -> FillResult:
         """Create a fixture from the blockchain test definition."""
         fixture_blocks: List[FixtureBlock | InvalidFixtureBlock] = []
@@ -861,8 +1091,7 @@ def make_fixture(
         invalid_blocks = 0
         benchmark_gas_used: int | None = None
         benchmark_opcode_count: OpcodeCount | None = None
-        for i, block in enumerate(self.blocks):
-            is_last_block = i == len(self.blocks) - 1
+        for block in self.blocks:
             # This is the most common case, the RLP needs to be constructed
             # based on the transactions to be included in the block.
             # Set the environment according to the block to execute.
@@ -873,9 +1102,16 @@ def make_fixture(
                 previous_alloc=alloc,
                 previous_senders_authorities=senders_authorities,
             )
+            block_number = int(built_block.header.number)
+            is_last_block = block is self.blocks[-1]
             if is_last_block and self.operation_mode == OpMode.BENCHMARKING:
                 benchmark_gas_used = int(built_block.result.gas_used)
                 benchmark_opcode_count = built_block.result.opcode_count
+            if built_block.result.receipts:
+                self.validate_receipt_status(
+                    receipts=built_block.result.receipts,
+                    block_number=block_number,
+                )
             include_receipts = (
                 block.include_receipts_in_output
                 if block.include_receipts_in_output is not None
@@ -927,7 +1163,7 @@ def make_fixture(
             config=FixtureConfig(
                 fork=self.fork,
                 blob_schedule=FixtureBlobSchedule.from_blob_schedule(
-                    self.fork.blob_schedule()
+                    self.fork.transitions_to().blob_schedule()
                 ),
                 chain_id=self.chain_id,
             ),
@@ -937,11 +1173,12 @@ def make_fixture(
             gas_optimization=None,
             benchmark_gas_used=benchmark_gas_used,
             benchmark_opcode_count=benchmark_opcode_count,
+            post_verifications=PostVerifications.from_alloc(self.post),
         )
 
     def make_hive_fixture(
         self,
-        t8n: TransitionTool,
+        t8n: FillerBackend,
         fixture_format: FixtureFormat = BlockchainEngineFixture,
     ) -> FillResult:
         """Create a hive fixture from the blocktest definition."""
@@ -959,8 +1196,7 @@ def make_hive_fixture(
         invalid_blocks = 0
         benchmark_gas_used: int | None = None
         benchmark_opcode_count: OpcodeCount | None = None
-        for i, block in enumerate(self.blocks):
-            is_last_block = i == len(self.blocks) - 1
+        for block in self.blocks:
             built_block = self.generate_block_data(
                 t8n=t8n,
                 block=block,
@@ -968,9 +1204,16 @@ def make_hive_fixture(
                 previous_alloc=alloc,
                 previous_senders_authorities=senders_authorities,
             )
+            block_number = int(built_block.header.number)
+            is_last_block = block is self.blocks[-1]
             if is_last_block and self.operation_mode == OpMode.BENCHMARKING:
                 benchmark_gas_used = int(built_block.result.gas_used)
                 benchmark_opcode_count = built_block.result.opcode_count
+            if built_block.result.receipts:
+                self.validate_receipt_status(
+                    receipts=built_block.result.receipts,
+                    block_number=block_number,
+                )
             fixture_payloads.append(
                 built_block.get_fixture_engine_new_payload()
             )
@@ -992,9 +1235,8 @@ def make_hive_fixture(
                     expected_state=block.expected_post_state,
                 )
         self.check_exception_test(exception=invalid_blocks > 0)
-        fcu_version = self.fork.engine_forkchoice_updated_version(
-            block_number=built_block.header.number,
-            timestamp=built_block.header.timestamp,
+        fcu_version = (
+            self.fork.transitions_from().engine_forkchoice_updated_version()
         )
         assert fcu_version is not None, (
             "A hive fixture was requested but no forkchoice update is defined."
@@ -1005,7 +1247,7 @@ def make_hive_fixture(
         self.verify_post_state(t8n, t8n_state=alloc)
 
         # Create base fixture data, common to all fixture formats
-        fixture_data = {
+        fixture_data: Dict[str, Any] = {
             "fork": self.fork,
             "genesis": genesis.header,
             "payloads": fixture_payloads,
@@ -1017,7 +1259,7 @@ def make_hive_fixture(
                 fork=self.fork,
                 chain_id=self.chain_id,
                 blob_schedule=FixtureBlobSchedule.from_blob_schedule(
-                    self.fork.blob_schedule()
+                    self.fork.transitions_to().blob_schedule()
                 ),
             ),
         }
@@ -1081,14 +1323,210 @@ def make_hive_fixture(
             gas_optimization=None,
             benchmark_gas_used=benchmark_gas_used,
             benchmark_opcode_count=benchmark_opcode_count,
+            post_verifications=PostVerifications.from_alloc(self.post),
+        )
+
+    def make_stateful_fixture(
+        self,
+        t8n: FillerBackend,
+    ) -> FillResult:
+        """
+        Create a ``BlockchainEngineStatefulFixture`` against a live client.
+
+        Differs from ``make_hive_fixture``:
+
+        - No genesis building: the client already has warm state from a
+          snapshot. The backend (typically ``ClientBackend``) owns
+          ``snapshot_block`` / ``start_block`` captured at session start.
+        - ``pre.fund_eoa`` / ``pre.deploy_contract`` calls are materialised
+          into a synthetic setup block prepended to ``self.blocks``,
+          instead of being baked into genesis alloc.
+        - Payloads are partitioned by ``FixtureEngineNewPayload.phase``
+          into ``setup_payloads`` (setup-phase txs) and ``payloads``
+          (execution-phase txs).
+        - ``verify_post_state`` is skipped: the client is the oracle.
+        """
+        if not isinstance(t8n, ClientBackend):
+            raise RuntimeError(
+                "make_stateful_fixture requires a ClientBackend; got "
+                f"{type(t8n).__name__}."
+            )
+        if t8n.snapshot_block is None or t8n.start_block is None:
+            raise RuntimeError(
+                "ClientBackend.snapshot_block / .start_block must be "
+                "captured by the fill-stateful pre-run before fill."
+            )
+        snapshot_block = t8n.snapshot_block
+        start_block = t8n.start_block
+
+        # Mirror execute.py's pre-send flow so pending-tx funding amounts
+        # materialise before we drain the queue: required-balances →
+        # resolve deferred deploys/stubs/fund_addresses → run
+        # minimum_balance_for_pending_transactions. Tests whose Alloc
+        # does not expose ``pending_transactions`` skip this entirely.
+        pending_getter = getattr(self.pre, "pending_transactions", None)
+        resolve_deferred = getattr(self.pre, "resolve_deferred_checks", None)
+        min_balance = getattr(
+            self.pre, "minimum_balance_for_pending_transactions", None
+        )
+        if (
+            callable(pending_getter)
+            and callable(resolve_deferred)
+            and callable(min_balance)
+        ):
+            execute_plan = self.execute(execute_format=TransactionPost)
+            session_fork = self.fork.fork_at(block_number=0, timestamp=0)
+            # Session fees pinned on the backend by the fill-stateful plugin.
+            gas_price = t8n.gas_price
+            max_fee_per_gas = t8n.max_fee_per_gas
+            max_priority_fee_per_gas = t8n.max_priority_fee_per_gas
+            max_fee_per_blob_gas = t8n.max_fee_per_blob_gas
+            if not all(
+                [
+                    gas_price,
+                    max_fee_per_gas,
+                    max_priority_fee_per_gas,
+                    max_fee_per_blob_gas,
+                ]
+            ):
+                raise RuntimeError(
+                    "make_stateful_fixture requires the backend to carry "
+                    f"non-zero session fees; got gas_price={gas_price}, "
+                    f"max_fee_per_gas={max_fee_per_gas}, "
+                    f"max_priority_fee_per_gas={max_priority_fee_per_gas}, "
+                    f"max_fee_per_blob_gas={max_fee_per_blob_gas}."
+                )
+            required_balances = execute_plan.get_required_sender_balances(
+                gas_price=gas_price,
+                max_fee_per_gas=max_fee_per_gas,
+                max_priority_fee_per_gas=max_priority_fee_per_gas,
+                max_fee_per_blob_gas=max_fee_per_blob_gas,
+                fork=session_fork,
+            )
+            resolve_deferred()
+            min_balance(
+                required_balances,
+                gas_price=gas_price,
+                max_fee_per_gas=max_fee_per_gas,
+                max_priority_fee_per_gas=max_priority_fee_per_gas,
+                max_fee_per_blob_gas=max_fee_per_blob_gas,
+            )
+
+        # Materialise queued pre-alloc txs into a synthetic setup block.
+        blocks_to_process: List[Block] = []
+        if callable(pending_getter):
+            setup_txs = pending_getter()
+            if setup_txs:
+                blocks_to_process.append(Block(txs=setup_txs))
+        # Each block must be single-phase (Block.phase asserts otherwise);
+        # mixed blocks (e.g. EIP-7702 authorization + benchmark exec) are
+        # split into contiguous phase runs so benchmark gas isn't
+        # swallowed into ``setupEngineNewPayloads``.
+        blocks_to_process.extend(_split_blocks_by_phase(self.blocks))
+
+        # Chain off the session start_block. We pull parent_* from a
+        # FixtureHeader-validated copy of the client's block dict, but
+        # seed block_hashes with the client's hash directly — FixtureHeader
+        # recomputes block_hash from RLP and that diverges from the
+        # client's authoritative hash unless every header byte is
+        # reproduced exactly.
+        start_block_number = int(HexNumber(start_block["number"]))
+        start_block_hash = Hash(start_block["hash"])
+        parent_header = FixtureHeader.model_validate(start_block)
+        env = Environment(
+            parent_difficulty=parent_header.difficulty,
+            parent_timestamp=parent_header.timestamp,
+            parent_base_fee_per_gas=parent_header.base_fee_per_gas,
+            parent_blob_gas_used=parent_header.blob_gas_used,
+            parent_excess_blob_gas=parent_header.excess_blob_gas,
+            parent_gas_used=parent_header.gas_used,
+            parent_gas_limit=parent_header.gas_limit,
+            parent_ommers_hash=parent_header.ommers_hash,
+            block_hashes={
+                HexNumber(start_block_number): start_block_hash,
+            },
+        )
+
+        setup_payloads: List[FixtureEngineNewPayload] = []
+        execution_payloads: List[FixtureEngineNewPayload] = []
+        head_hash = start_block_hash
+        benchmark_gas_used: int | None = None
+        benchmark_opcode_count: OpcodeCount | None = None
+        # Alloc is not authoritative in stateful mode; pass self.pre as a
+        # placeholder — ClientBackend ignores it.
+        alloc: Alloc | LazyAlloc = self.pre
+        previous_senders_authorities: Dict[int, List[Address]] = {}
+        for block in blocks_to_process:
+            built_block = self.generate_block_data(
+                t8n=t8n,
+                block=block,
+                previous_env=env,
+                previous_alloc=alloc,
+                previous_senders_authorities=previous_senders_authorities,
+            )
+            assert isinstance(built_block, TestingBuildBlock), (
+                "ClientBackend must return TestingBuildBlock; got "
+                f"{type(built_block).__name__}"
+            )
+            payload = payload_metadata_to_fixture(
+                built_block.engine_payload, phase=block.phase
+            )
+            if payload.phase == TestPhase.SETUP:
+                setup_payloads.append(payload)
+            else:
+                execution_payloads.append(payload)
+                if self.operation_mode == OpMode.BENCHMARKING:
+                    benchmark_gas_used = int(built_block.result.gas_used)
+                    benchmark_opcode_count = built_block.result.opcode_count
+            # Overwrite the block_hash apply_new_parent just recorded —
+            # it's the FixtureHeader-recomputed RLP hash, which diverges
+            # from the client's authoritative hash (client picks fields
+            # like gas_limit). The next block's parent_hash must point at
+            # what the client actually built.
+            client_hash = Hash(
+                built_block.engine_payload.payload_response.execution_payload.block_hash
+            )
+            env = apply_new_parent(built_block.env, built_block.header)
+            env = env.copy(
+                block_hashes={
+                    **env.block_hashes,
+                    HexNumber(int(env.number)): client_hash,
+                },
+            )
+            head_hash = client_hash
+
+        fixture = BlockchainEngineStatefulFixture(
+            fork=self.fork,
+            last_block_hash=head_hash,
+            config=FixtureConfig(fork=self.fork),
+            snapshot_block_number=HexNumber(snapshot_block["number"]),
+            snapshot_block_hash=Hash(snapshot_block["hash"]),
+            start_block_number=HexNumber(start_block_number),
+            start_block_hash=start_block_hash,
+            setup_payloads=setup_payloads,
+            payloads=execution_payloads,
+            benchmark_gas_used=(
+                HexNumber(benchmark_gas_used)
+                if benchmark_gas_used is not None
+                else None
+            ),
+        )
+        return FillResult(
+            fixture=fixture,
+            gas_optimization=None,
+            benchmark_gas_used=benchmark_gas_used,
+            benchmark_opcode_count=benchmark_opcode_count,
+            post_verifications=PostVerifications.from_alloc(self.post),
         )
 
     def generate(
         self,
-        t8n: TransitionTool,
+        t8n: FillerBackend,
         fixture_format: FixtureFormat,
     ) -> FillResult:
         """Generate the BlockchainTest fixture."""
+        if fixture_format == BlockchainEngineStatefulFixture:
+            return self.make_stateful_fixture(t8n)
         if fixture_format in [
             BlockchainEngineFixture,
             BlockchainEngineXFixture,
diff --git a/packages/testing/src/execution_testing/specs/state.py b/packages/testing/src/execution_testing/specs/state.py
index f86d97a953c..0fcd5e523d4 100644
--- a/packages/testing/src/execution_testing/specs/state.py
+++ b/packages/testing/src/execution_testing/specs/state.py
@@ -38,6 +38,7 @@
     StateFixture,
 )
 from execution_testing.fixtures.common import FixtureBlobSchedule
+from execution_testing.fixtures.post_verifications import PostVerifications
 from execution_testing.fixtures.state import (
     FixtureConfig,
     FixtureEnvironment,
@@ -45,7 +46,7 @@
     FixtureTransaction,
     FixtureTransactionReceipt,
 )
-from execution_testing.forks import Fork
+from execution_testing.forks import Fork, TransitionFork
 from execution_testing.logging import (
     get_logger,
 )
@@ -131,7 +132,7 @@ def verify_modified_gas_limit(
         current_gas_limit: int,
         pre_alloc: Alloc,
         env: Environment,
-        enable_post_processing: bool,
+        ignore_gas_differences: bool,
     ) -> bool:
         """Verify a new lower gas limit yields the same transaction outcome."""
         base_traces = base_tool_result.traces
@@ -161,7 +162,7 @@ def verify_modified_gas_limit(
         )
         if not base_traces.are_equivalent(
             modified_tool_output.result.traces,
-            enable_post_processing,
+            ignore_gas_differences,
         ):
             logger.debug(
                 f"Traces are not equivalent (gas_limit={current_gas_limit})"
@@ -233,7 +234,7 @@ def verify_modified_gas_limit(
     def discard_fixture_format_by_marks(
         cls,
         fixture_format: FixtureFormat,
-        fork: Fork,
+        fork: Fork | TransitionFork,
         markers: List[pytest.Mark],
     ) -> bool:
         """
@@ -267,9 +268,14 @@ def _generate_blockchain_genesis_environment(self) -> Environment:
         # - Base Fee Per Gas: Block's base fee depends on the parent's value
         # - Excess Blob Gas: Block's excess blob gas value depends on
         #                    the parent's value
+        genesis_block_number = self.env.number - 1
+        genesis_timestamp = 0
+        genesis_fork = self.fork.fork_at(
+            block_number=genesis_block_number, timestamp=genesis_timestamp
+        )
         kwargs: Dict[str, Any] = {
-            "number": self.env.number - 1,
-            "timestamp": 0,
+            "number": genesis_block_number,
+            "timestamp": genesis_timestamp,
         }
 
         if "gas_limit" in self.env.model_fields_set:
@@ -290,8 +296,8 @@ def _generate_blockchain_genesis_environment(self) -> Environment:
             # will be subtracted from the excess blob gas when the first block
             # is mined.
             kwargs["excess_blob_gas"] = self.env.excess_blob_gas + (
-                self.fork.target_blobs_per_block()
-                * self.fork.blob_gas_per_blob()
+                genesis_fork.target_blobs_per_block()
+                * genesis_fork.blob_gas_per_blob()
             )
 
         return Environment(**kwargs)
@@ -301,6 +307,9 @@ def _generate_blockchain_blocks(self) -> List[Block]:
         Generate the single block that represents this state test in a
         BlockchainTest format.
         """
+        number = self.env.number
+        timestamp = self.env.timestamp
+        fork = self.fork.fork_at(block_number=number, timestamp=timestamp)
         kwargs = {
             "number": self.env.number,
             "timestamp": self.env.timestamp,
@@ -310,13 +319,14 @@ def _generate_blockchain_blocks(self) -> List[Block]:
             "extra_data": self.env.extra_data,
             "withdrawals": self.env.withdrawals,
             "parent_beacon_block_root": self.env.parent_beacon_block_root,
+            "slot_number": self.env.slot_number,
             "txs": [self.tx],
             "ommers": [],
             "header_verify": self.blockchain_test_header_verify,
             "rlp_modifier": self.blockchain_test_rlp_modifier,
             "expected_block_access_list": self.expected_block_access_list,
         }
-        if not self.fork.header_prev_randao_required():
+        if not fork.header_prev_randao_required():
             kwargs["difficulty"] = self.env.difficulty
         if "block_exception" in self.model_fields_set:
             kwargs["exception"] = self.block_exception  # type: ignore
@@ -395,7 +405,7 @@ def make_state_test_fixture(
             self.operation_mode == OpMode.OPTIMIZE_GAS
             or self.operation_mode == OpMode.OPTIMIZE_GAS_POST_PROCESSING
         ):
-            enable_post_processing = (
+            ignore_gas_differences = (
                 self.operation_mode == OpMode.OPTIMIZE_GAS_POST_PROCESSING
             )
             base_tool_output = transition_tool_output
@@ -415,7 +425,7 @@ def make_state_test_fixture(
                 current_gas_limit=self.tx.gas_limit - 1,
                 pre_alloc=pre_alloc,
                 env=env,
-                enable_post_processing=enable_post_processing,
+                ignore_gas_differences=ignore_gas_differences,
             ):
                 minimum_gas_limit = 0
                 maximum_gas_limit = int(self.tx.gas_limit)
@@ -431,7 +441,7 @@ def make_state_test_fixture(
                         current_gas_limit=current_gas_limit,
                         pre_alloc=pre_alloc,
                         env=env,
-                        enable_post_processing=enable_post_processing,
+                        ignore_gas_differences=ignore_gas_differences,
                     ):
                         maximum_gas_limit = current_gas_limit
                     else:
@@ -455,7 +465,7 @@ def make_state_test_fixture(
                     current_gas_limit=minimum_gas_limit,
                     pre_alloc=pre_alloc,
                     env=env,
-                    enable_post_processing=enable_post_processing,
+                    ignore_gas_differences=ignore_gas_differences,
                 )
                 gas_optimization = current_gas_limit
             else:
@@ -505,6 +515,7 @@ def make_state_test_fixture(
             gas_optimization=gas_optimization,
             benchmark_gas_used=transition_tool_output.result.gas_used,
             benchmark_opcode_count=transition_tool_output.result.opcode_count,
+            post_verifications=PostVerifications.from_alloc(self.post),
         )
 
     def get_genesis_environment(self) -> Environment:
diff --git a/packages/testing/src/execution_testing/specs/static_state/environment.py b/packages/testing/src/execution_testing/specs/static_state/environment.py
index 32cd3b4e6db..89b42cbe45b 100644
--- a/packages/testing/src/execution_testing/specs/static_state/environment.py
+++ b/packages/testing/src/execution_testing/specs/static_state/environment.py
@@ -33,6 +33,7 @@ class EnvironmentInStateTestFiller(BaseModel):
     current_excess_blob_gas: ValueInFiller | None = Field(
         None, alias="currentExcessBlobGas"
     )
+    current_slot_number: ValueInFiller | None = Field(None, alias="slotNumber")
 
     model_config = ConfigDict(extra="forbid")
 
@@ -72,4 +73,6 @@ def get_environment(self, tags: TagDict) -> Environment:
             kwargs["base_fee_per_gas"] = self.current_base_fee
         if self.current_excess_blob_gas is not None:
             kwargs["excess_blob_gas"] = self.current_excess_blob_gas
+        if self.current_slot_number is not None:
+            kwargs["slot_number"] = self.current_slot_number
         return Environment(**kwargs)
diff --git a/packages/testing/src/execution_testing/specs/static_state/expect_section.py b/packages/testing/src/execution_testing/specs/static_state/expect_section.py
index 33ca149cf25..0425b65fb0a 100644
--- a/packages/testing/src/execution_testing/specs/static_state/expect_section.py
+++ b/packages/testing/src/execution_testing/specs/static_state/expect_section.py
@@ -293,10 +293,9 @@ def resolve(self, tags: TagDict) -> Alloc:
             else:
                 resolved_address = Address(address)
 
-            if account is None:
-                continue
-
-            post[resolved_address] = account.resolve(tags)
+            post[resolved_address] = (
+                account.resolve(tags) if account is not None else account
+            )
         return post
 
     def __contains__(self, address: Address) -> bool:
@@ -392,3 +391,100 @@ def has_index(self, d: int, g: int, v: int) -> bool:
             v_match = True if self.indexes.value.count(v) else False
 
         return d_match and g_match and v_match
+
+
+def _match_index(idx: int | list, val: int) -> bool:
+    """Check if an index specification matches a value."""
+    if isinstance(idx, int):
+        return idx == -1 or idx == val
+    if isinstance(idx, list):
+        return val in idx
+    return False
+
+
+def resolve_expect_post(
+    expect_entries: list[dict],
+    d: int,
+    g: int,
+    v: int,
+    fork: Fork,
+) -> tuple[dict, TransactionExceptionInstanceOrList | None]:
+    """
+    Resolve expected post-state for given d, g, v and fork.
+
+    Used by generated Python tests at runtime. The expect_entries are
+    materialized Python dicts with resolved addresses and Account objects.
+    """
+    for entry in expect_entries:
+        indexes = entry["indexes"]
+        if not _match_index(indexes.get("data", -1), d):
+            continue
+        if not _match_index(indexes.get("gas", -1), g):
+            continue
+        if not _match_index(indexes.get("value", -1), v):
+            continue
+
+        # Match fork against network constraints
+        network = entry["network"]
+        fork_set = ForkSet.model_validate(network)
+        if fork not in fork_set:
+            continue
+
+        # Found matching entry
+        result = entry.get("result", {})
+
+        # Resolve exception
+        exception: TransactionExceptionInstanceOrList | None = None
+        expect_exc = entry.get("expect_exception")
+        if expect_exc:
+            for constraint_str, exc_value in expect_exc.items():
+                exc_fork_set = ForkSet.model_validate(
+                    constraint_str.split(",")
+                )
+                if fork in exc_fork_set:
+                    exception = exc_value
+                    break
+
+        return result, exception
+
+    raise ValueError(
+        f"No matching expect entry for d={d}, g={g}, v={v}, fork={fork}"
+    )
+
+
+def resolve_expect_post_fork(
+    expect_entries: list[dict],
+    fork: Fork,
+) -> tuple[dict, TransactionExceptionInstanceOrList | None]:
+    """
+    Resolve expected post-state for a given fork only (no d/g/v matching).
+
+    Used by single-case generated Python tests that have fork-dependent
+    post-state (multiple expect sections with different networks but only
+    one (d, g, v) combo).
+    """
+    for entry in expect_entries:
+        # Match fork against network constraints
+        network = entry["network"]
+        fork_set = ForkSet.model_validate(network)
+        if fork not in fork_set:
+            continue
+
+        # Found matching entry
+        result = entry.get("result", {})
+
+        # Resolve exception
+        exception: TransactionExceptionInstanceOrList | None = None
+        expect_exc = entry.get("expect_exception")
+        if expect_exc:
+            for constraint_str, exc_value in expect_exc.items():
+                exc_fork_set = ForkSet.model_validate(
+                    constraint_str.split(",")
+                )
+                if fork in exc_fork_set:
+                    exception = exc_value
+                    break
+
+        return result, exception
+
+    raise ValueError(f"No matching expect entry for fork={fork}")
diff --git a/packages/testing/src/execution_testing/specs/tests/test_split_blocks_by_phase.py b/packages/testing/src/execution_testing/specs/tests/test_split_blocks_by_phase.py
new file mode 100644
index 00000000000..0263cb97556
--- /dev/null
+++ b/packages/testing/src/execution_testing/specs/tests/test_split_blocks_by_phase.py
@@ -0,0 +1,157 @@
+"""Test suite for ``_split_blocks_by_phase`` in stateful filling."""
+
+import pytest
+
+from execution_testing.test_types import TestPhase, Transaction
+from execution_testing.test_types.transaction_types import (
+    TransactionTestMetadata,
+)
+
+from ..blockchain import Block, _split_blocks_by_phase, _tx_phase
+
+
+def _tx(phase: TestPhase | None) -> Transaction:
+    """Build a Transaction tagged with the given test_phase."""
+    tx = Transaction()
+    tx.test_phase = phase
+    return tx
+
+
+def _phases_of(block: Block) -> list[TestPhase | None]:
+    """Return the per-tx phase list for *block*."""
+    return [_tx_phase(tx) for tx in block.txs]
+
+
+def test_passthrough_pure_setup() -> None:
+    """Pure-SETUP block is returned unchanged (identity)."""
+    block = Block(txs=[_tx(TestPhase.SETUP), _tx(TestPhase.SETUP)])
+    out = _split_blocks_by_phase([block])
+    assert len(out) == 1
+    assert out[0] is block
+
+
+def test_passthrough_pure_execution() -> None:
+    """Pure-EXECUTION block is returned unchanged (identity)."""
+    block = Block(txs=[_tx(TestPhase.EXECUTION), _tx(TestPhase.EXECUTION)])
+    out = _split_blocks_by_phase([block])
+    assert len(out) == 1
+    assert out[0] is block
+
+
+def test_passthrough_empty() -> None:
+    """Empty-txs block is returned unchanged (identity)."""
+    block = Block(txs=[])
+    out = _split_blocks_by_phase([block])
+    assert len(out) == 1
+    assert out[0] is block
+
+
+def test_passthrough_all_untagged() -> None:
+    """Block with no phase-tagged txs is returned unchanged."""
+    block = Block(txs=[_tx(None), _tx(None)])
+    out = _split_blocks_by_phase([block])
+    assert len(out) == 1
+    assert out[0] is block
+
+
+def test_split_setup_then_execution() -> None:
+    """[S, S, E, E] splits into pure-SETUP then pure-EXECUTION blocks."""
+    block = Block(
+        txs=[
+            _tx(TestPhase.SETUP),
+            _tx(TestPhase.SETUP),
+            _tx(TestPhase.EXECUTION),
+            _tx(TestPhase.EXECUTION),
+        ]
+    )
+    out = _split_blocks_by_phase([block])
+    assert [_phases_of(b) for b in out] == [
+        [TestPhase.SETUP, TestPhase.SETUP],
+        [TestPhase.EXECUTION, TestPhase.EXECUTION],
+    ]
+
+
+def test_split_preserves_interleaved_order() -> None:
+    """[E, S, E] splits into 3 sub-blocks, original tx order preserved."""
+    block = Block(
+        txs=[
+            _tx(TestPhase.EXECUTION),
+            _tx(TestPhase.SETUP),
+            _tx(TestPhase.EXECUTION),
+        ]
+    )
+    out = _split_blocks_by_phase([block])
+    assert [_phases_of(b) for b in out] == [
+        [TestPhase.EXECUTION],
+        [TestPhase.SETUP],
+        [TestPhase.EXECUTION],
+    ]
+
+
+def test_split_clears_intermediate_block_fields() -> None:
+    """
+    Block-level "expected" fields apply only to the final post-state of
+    the original block, so they stay on the LAST sub-block; preceding
+    sub-blocks get them cleared.
+    """
+    expected_gas_used = 12345
+    block = Block(
+        txs=[_tx(TestPhase.SETUP), _tx(TestPhase.EXECUTION)],
+        expected_gas_used=expected_gas_used,
+    )
+    out = _split_blocks_by_phase([block])
+    assert len(out) == 2
+    assert out[0].expected_gas_used is None
+    assert out[1].expected_gas_used == expected_gas_used
+
+
+def test_split_mixed_with_untagged_phases() -> None:
+    """Untagged txs (phase ``None``) form their own contiguous run."""
+    block = Block(
+        txs=[_tx(TestPhase.SETUP), _tx(None), _tx(TestPhase.EXECUTION)]
+    )
+    out = _split_blocks_by_phase([block])
+    assert [_phases_of(b) for b in out] == [
+        [TestPhase.SETUP],
+        [None],
+        [TestPhase.EXECUTION],
+    ]
+
+
+def test_metadata_phase_fallback() -> None:
+    """
+    When ``tx.test_phase`` is unset, ``tx.metadata.phase`` is used as
+    fallback (matches ``FixtureEngineNewPayload.derive_phase`` rules).
+    """
+    tx_setup = Transaction()
+    tx_setup.metadata = TransactionTestMetadata(phase=TestPhase.SETUP)
+    tx_exec = Transaction()
+    tx_exec.test_phase = TestPhase.EXECUTION
+
+    block = Block(txs=[tx_setup, tx_exec])
+    out = _split_blocks_by_phase([block])
+    assert [_phases_of(b) for b in out] == [
+        [TestPhase.SETUP],
+        [TestPhase.EXECUTION],
+    ]
+
+
+@pytest.mark.parametrize(
+    "phases, expected_sizes",
+    [
+        ([TestPhase.SETUP] * 3, [3]),
+        ([TestPhase.SETUP, TestPhase.EXECUTION], [1, 1]),
+        ([TestPhase.SETUP, TestPhase.SETUP, TestPhase.EXECUTION], [2, 1]),
+        (
+            [TestPhase.EXECUTION, TestPhase.SETUP, TestPhase.EXECUTION],
+            [1, 1, 1],
+        ),
+    ],
+)
+def test_sub_block_sizes(
+    phases: list[TestPhase], expected_sizes: list[int]
+) -> None:
+    """Sub-block sizes match the per-phase contiguous-run partition."""
+    block = Block(txs=[_tx(p) for p in phases])
+    out = _split_blocks_by_phase([block])
+    assert [len(b.txs) for b in out] == expected_sizes
diff --git a/packages/testing/src/execution_testing/specs/tests/test_types.py b/packages/testing/src/execution_testing/specs/tests/test_types.py
index 4d52085b6ec..f5c43cb5fe9 100644
--- a/packages/testing/src/execution_testing/specs/tests/test_types.py
+++ b/packages/testing/src/execution_testing/specs/tests/test_types.py
@@ -9,9 +9,13 @@
     Hash,
     HeaderNonce,
 )
-from execution_testing.fixtures.blockchain import FixtureHeader
+from execution_testing.fixtures.blockchain import (
+    FixtureExecutionPayloadModifier,
+    FixtureHeader,
+)
+from execution_testing.test_types.block_access_list import BlockAccessList
 
-from ..blockchain import Header
+from ..blockchain import BuiltBlock, Header
 
 fixture_header_ones = FixtureHeader(
     parent_hash=Hash(1),
@@ -139,3 +143,70 @@ def test_fixture_header_join(
 ) -> None:
     """Test that the join method works as expected."""
     assert modifier.apply(fixture_header) == fixture_header_expected
+
+
+class TestDeriveEnginePayloadModifier:
+    """
+    Verify the auto-propagation from ``rlp_modifier``'s header-only changes
+    to the engine payload body. Test authors set ``rlp_modifier`` once on a
+    ``Block``; the framework must reflect that change on both the RLP block
+    and the ``engine_newPayload`` fixture.
+    """
+
+    def test_no_rlp_modifier_returns_none(self) -> None:
+        """No modifier → no engine payload override."""
+        assert (
+            BuiltBlock.derive_engine_payload_modifier(
+                rlp_modifier=None,
+                block_access_list=None,
+            )
+            is None
+        )
+
+    def test_rlp_modifier_unrelated_field_returns_none(self) -> None:
+        """A modifier that doesn't touch BAL hash leaves the payload alone."""
+        assert (
+            BuiltBlock.derive_engine_payload_modifier(
+                rlp_modifier=Header(state_root=Hash(100)),
+                block_access_list=None,
+            )
+            is None
+        )
+
+    def test_remove_bal_hash_removes_body_from_payload(self) -> None:
+        """Removing the header's BAL hash also removes the payload body."""
+        modifier = BuiltBlock.derive_engine_payload_modifier(
+            rlp_modifier=Header(block_access_list_hash=Header.REMOVE_FIELD),
+            block_access_list=BlockAccessList(),
+        )
+        assert isinstance(modifier, FixtureExecutionPayloadModifier)
+        assert modifier.block_access_list is (
+            FixtureExecutionPayloadModifier.REMOVE_FIELD
+        )
+
+    def test_inject_bal_hash_on_pre_fork_adds_body(self) -> None:
+        """
+        Injecting a header BAL hash on a block that has no body (pre-fork)
+        triggers a body to be added to the engine payload, so a payload-
+        version mismatch is detectable.
+        """
+        modifier = BuiltBlock.derive_engine_payload_modifier(
+            rlp_modifier=Header(block_access_list_hash=Hash(0)),
+            block_access_list=None,
+        )
+        assert isinstance(modifier, FixtureExecutionPayloadModifier)
+        assert modifier.block_access_list == Bytes(b"")
+
+    def test_inject_bal_hash_on_post_fork_leaves_body_alone(self) -> None:
+        """
+        Setting a BAL hash on a block that already has a body (post-fork)
+        does not override the body — the resulting block-hash mismatch is
+        what triggers the client rejection in that scenario.
+        """
+        assert (
+            BuiltBlock.derive_engine_payload_modifier(
+                rlp_modifier=Header(block_access_list_hash=Hash(0)),
+                block_access_list=BlockAccessList(),
+            )
+            is None
+        )
diff --git a/packages/testing/src/execution_testing/specs/transaction.py b/packages/testing/src/execution_testing/specs/transaction.py
index d66125f9fa6..f3f032151f7 100644
--- a/packages/testing/src/execution_testing/specs/transaction.py
+++ b/packages/testing/src/execution_testing/specs/transaction.py
@@ -45,6 +45,7 @@ def make_transaction_test_fixture(
         self,
     ) -> FillResult:
         """Create a fixture from the transaction test definition."""
+        fork = self.fork.transitions_from()
         if self.tx.error is not None:
             result = FixtureResult(
                 exception=self.tx.error,
@@ -54,7 +55,7 @@ def make_transaction_test_fixture(
             )
         else:
             intrinsic_gas_cost_calculator = (
-                self.fork.transaction_intrinsic_cost_calculator()
+                fork.transitions_from().transaction_intrinsic_cost_calculator()
             )
             intrinsic_gas = intrinsic_gas_cost_calculator(
                 calldata=self.tx.data,
@@ -71,7 +72,7 @@ def make_transaction_test_fixture(
 
         fixture = TransactionFixture(
             result={
-                self.fork: result,
+                fork: result,
             },
             transaction=self.tx.with_signature_and_sender().rlp(),
         )
diff --git a/packages/testing/src/execution_testing/test_types/__init__.py b/packages/testing/src/execution_testing/test_types/__init__.py
index 979a76d49ba..b9029ceb3ad 100644
--- a/packages/testing/src/execution_testing/test_types/__init__.py
+++ b/packages/testing/src/execution_testing/test_types/__init__.py
@@ -3,6 +3,7 @@
 from .account_types import EOA, Alloc
 from .blob_types import Blob
 from .block_access_list import (
+    BalAccountAbsentValues,
     BalAccountChange,
     BalAccountExpectation,
     BalBalanceChange,
@@ -54,6 +55,7 @@
     "DETERMINISTIC_FACTORY_ADDRESS",
     "Alloc",
     "AuthorizationTuple",
+    "BalAccountAbsentValues",
     "BalAccountChange",
     "BalAccountExpectation",
     "BalBalanceChange",
diff --git a/packages/testing/src/execution_testing/test_types/account_types.py b/packages/testing/src/execution_testing/test_types/account_types.py
index 5f49ff79a94..aba69bed4aa 100644
--- a/packages/testing/src/execution_testing/test_types/account_types.py
+++ b/packages/testing/src/execution_testing/test_types/account_types.py
@@ -437,6 +437,12 @@ def deploy_contract(
             "deploy_contract is not implemented in the base class"
         )
 
+    def stub_eoa(self, label: str) -> EOA:
+        """Return the EOA for a key-bearing stub."""
+        raise NotImplementedError(
+            "stub_eoa is not implemented in the base class"
+        )
+
     def fund_eoa(
         self,
         amount: NumberConvertible | None = None,
diff --git a/packages/testing/src/execution_testing/test_types/blob_types.py b/packages/testing/src/execution_testing/test_types/blob_types.py
index b4dfc58a9bb..720da7337e1 100644
--- a/packages/testing/src/execution_testing/test_types/blob_types.py
+++ b/packages/testing/src/execution_testing/test_types/blob_types.py
@@ -5,7 +5,7 @@
 from hashlib import sha256
 from os.path import realpath
 from pathlib import Path
-from typing import Any, ClassVar, List, Literal, cast
+from typing import Any, ClassVar, List
 
 import ckzg  # type: ignore
 import platformdirs
@@ -81,12 +81,12 @@ def get_filename(fork: Fork, seed: int) -> str:
         """
         Return filename this blob would have as string (with .json extension).
         """
-        amount_cell_proofs: int = cast(
-            int, fork.get_blob_constant("AMOUNT_CELL_PROOFS")
-        )
+        amount_cell_proofs = fork.get_blob_constant("AMOUNT_CELL_PROOFS")
         return (
             "blob_"
             + str(seed)
+            + "_"
+            + fork.name().lower()
             + "_cell_proofs_"
             + str(amount_cell_proofs)
             + ".json"
@@ -98,11 +98,7 @@ def get_filepath(fork: Fork, seed: int) -> Path:
         Return the Path to the blob that would be created with these
         parameters.
         """
-        # determine amount of cell proofs for this fork (0 or 128)
-        would_be_filename: str = Blob.get_filename(fork, seed)
-
-        # return path to blob
-        return CACHED_BLOBS_DIRECTORY / would_be_filename
+        return CACHED_BLOBS_DIRECTORY / Blob.get_filename(fork, seed)
 
     @staticmethod
     def from_fork(fork: Fork, seed: int = 0, timestamp: int = 0) -> "Blob":
@@ -118,23 +114,16 @@ def generate_blob_data(rng_seed: int = 0) -> Bytes:
 
             # generate blob
             ints: list[int] = [
-                rng.randrange(cast(int, fork.get_blob_constant("BLS_MODULUS")))
+                rng.randrange(fork.get_blob_constant("BLS_MODULUS"))
                 for _ in range(
-                    cast(
-                        int, fork.get_blob_constant("FIELD_ELEMENTS_PER_BLOB")
-                    )
+                    fork.get_blob_constant("FIELD_ELEMENTS_PER_BLOB")
                 )
             ]
 
             encoded: list[bytes] = [
                 i.to_bytes(
-                    cast(
-                        int, fork.get_blob_constant("BYTES_PER_FIELD_ELEMENT")
-                    ),
-                    cast(
-                        Literal["big"],
-                        fork.get_blob_constant("KZG_ENDIANNESS"),
-                    ),
+                    fork.get_blob_constant("BYTES_PER_FIELD_ELEMENT"),
+                    "big",
                 )
                 for i in ints
             ]
@@ -153,12 +142,8 @@ def get_commitment(data: Bytes) -> Bytes:
             Note: Each cell holds the exact same copy of this commitment.
             """
             # sanity check
-            field_elements: int = cast(
-                int, fork.get_blob_constant("FIELD_ELEMENTS_PER_BLOB")
-            )
-            bytes_per_field: int = cast(
-                int, fork.get_blob_constant("BYTES_PER_FIELD_ELEMENT")
-            )
+            field_elements = fork.get_blob_constant("FIELD_ELEMENTS_PER_BLOB")
+            bytes_per_field = fork.get_blob_constant("BYTES_PER_FIELD_ELEMENT")
             assert len(data) == field_elements * bytes_per_field, (
                 f"Expected blob of length "
                 f"{field_elements * bytes_per_field} but got blob of length "
@@ -190,9 +175,7 @@ def get_proof(fork: Fork, data: Bytes) -> List[Bytes] | Bytes:
                 #  7a1d5962cd3dfb5f7b3e41aab728c55/tests/core/pyspec/eth2spec/
                 #  test/utils/kzg_tests.py#L58-L66)
                 z_valid_size: bytes = z.to_bytes(
-                    cast(
-                        int, fork.get_blob_constant("BYTES_PER_FIELD_ELEMENT")
-                    ),
+                    fork.get_blob_constant("BYTES_PER_FIELD_ELEMENT"),
                     byteorder="big",
                 )
                 proof, _ = ckzg.compute_kzg_proof(
@@ -344,9 +327,7 @@ def verify_cell_kzg_proof_batch(self, cell_indices: list) -> bool:
         Check whether all cell proofs are valid and returns True only if that
         is the case.
         """
-        amount_cell_proofs: int = cast(
-            int, self.fork.get_blob_constant("AMOUNT_CELL_PROOFS")
-        )
+        amount_cell_proofs = self.fork.get_blob_constant("AMOUNT_CELL_PROOFS")
 
         assert amount_cell_proofs > 0, (
             f"verify_cell_kzg_proof_batch() is not available for your fork: "
@@ -389,9 +370,7 @@ def delete_cells_then_recover_them(
         missing cells. If no assertion is triggered the reconstruction was
         successful.
         """
-        amount_cell_proofs: int = cast(
-            int, self.fork.get_blob_constant("AMOUNT_CELL_PROOFS")
-        )
+        amount_cell_proofs = self.fork.get_blob_constant("AMOUNT_CELL_PROOFS")
 
         assert amount_cell_proofs > 0, (
             f"delete_cells_then_recover_them() is not available for fork: "
@@ -483,9 +462,7 @@ def corrupt_byte(b: bytes) -> Bytes:
             return Bytes(bytes([b[0] ^ 0xFF]))
 
         # >=osaka
-        amount_cell_proofs: int = cast(
-            int, self.fork.get_blob_constant("AMOUNT_CELL_PROOFS")
-        )
+        amount_cell_proofs = self.fork.get_blob_constant("AMOUNT_CELL_PROOFS")
         if amount_cell_proofs > 0:
             assert isinstance(self.proof, list), (
                 "proof was expected to be a list but it isn't"
diff --git a/packages/testing/src/execution_testing/test_types/block_access_list/modifiers.py b/packages/testing/src/execution_testing/test_types/block_access_list/modifiers.py
index 121ad26d13c..00903266251 100644
--- a/packages/testing/src/execution_testing/test_types/block_access_list/modifiers.py
+++ b/packages/testing/src/execution_testing/test_types/block_access_list/modifiers.py
@@ -28,10 +28,9 @@ def _remove_field_from_accounts(
 ) -> Callable[[BlockAccessList], BlockAccessList]:
     """Abstracted helper to remove a field from specified accounts."""
     len_addresses = len(addresses)
-    found_addresses = set()
 
     def transform(bal: BlockAccessList) -> BlockAccessList:
-        nonlocal found_addresses
+        found_addresses: set[Address] = set()
         new_root = []
         for account_change in bal.root:
             if account_change.address in addresses:
@@ -70,10 +69,10 @@ def _modify_field_value(
     Abstracted helper to modify a field value for a specific account and
     transaction.
     """
-    found_address = False
 
     def transform(bal: BlockAccessList) -> BlockAccessList:
-        nonlocal found_address
+        found_address = False
+        found_index = False
         new_root = []
         for account_change in bal.root:
             if account_change.address == address:
@@ -84,8 +83,10 @@ def transform(bal: BlockAccessList) -> BlockAccessList:
                 if changes:
                     if nested and slot is not None:
                         # nested structure (storage)
+                        found_slot = False
                         for storage_slot in changes:
                             if storage_slot.slot == slot:
+                                found_slot = True
                                 for j, change in enumerate(
                                     storage_slot.slot_changes
                                 ):
@@ -93,6 +94,7 @@ def transform(bal: BlockAccessList) -> BlockAccessList:
                                         change.block_access_index
                                         == block_access_index
                                     ):
+                                        found_index = True
                                         kwargs = {
                                             "block_access_index": (
                                                 block_access_index
@@ -104,10 +106,16 @@ def transform(bal: BlockAccessList) -> BlockAccessList:
                                         )
                                         break
                                 break
+                        if not found_slot:
+                            raise ValueError(
+                                f"Storage slot {slot} not found in "
+                                f"storage_changes of account {address}"
+                            )
                     else:
                         # flat structure (nonce, balance, code)
                         for i, change in enumerate(changes):
                             if change.block_access_index == block_access_index:
+                                found_index = True
                                 kwargs = {
                                     "block_access_index": block_access_index,
                                     value_field: new_value,
@@ -120,10 +128,14 @@ def transform(bal: BlockAccessList) -> BlockAccessList:
                 new_root.append(account_change)
 
         if not found_address:
-            # sanity check that we actually found the address
             raise ValueError(
                 f"Address {address} not found in BAL to modify {field_name}"
             )
+        if not found_index:
+            raise ValueError(
+                f"Block access index {block_access_index} not found in "
+                f"{field_name} of account {address}"
+            )
 
         return BlockAccessList(root=new_root)
 
@@ -247,13 +259,12 @@ def swap_bal_indices(
     idx1: int, idx2: int
 ) -> Callable[[BlockAccessList], BlockAccessList]:
     """Swap block access indices throughout the BAL, modifying ordering."""
-    nonce_indices = {idx1: False, idx2: False}
-    balance_indices = nonce_indices.copy()
-    storage_indices = nonce_indices.copy()
-    code_indices = nonce_indices.copy()
 
     def transform(bal: BlockAccessList) -> BlockAccessList:
-        nonlocal nonce_indices, balance_indices, storage_indices, code_indices
+        nonce_indices = {idx1: False, idx2: False}
+        balance_indices = nonce_indices.copy()
+        storage_indices = nonce_indices.copy()
+        code_indices = nonce_indices.copy()
         new_root = []
         for account_change in bal.root:
             new_account = account_change.model_copy(deep=True)
@@ -385,10 +396,8 @@ def append_change(
     else:
         raise TypeError(f"Unsupported change type: {type(change)}")
 
-    found_address = False
-
     def transform(bal: BlockAccessList) -> BlockAccessList:
-        nonlocal found_address
+        found_address = False
         new_root = []
         for account_change in bal.root:
             if account_change.address == account:
@@ -427,10 +436,9 @@ def append_storage(
       slot_changes
     - If change provided and slot new: creates new BalStorageSlot
     """
-    found_address = False
 
     def transform(bal: BlockAccessList) -> BlockAccessList:
-        nonlocal found_address
+        found_address = False
         new_root = []
         for account_change in bal.root:
             if account_change.address == address:
@@ -477,10 +485,9 @@ def duplicate_account(
     address: Address,
 ) -> Callable[[BlockAccessList], BlockAccessList]:
     """Duplicate an account entry in the BAL."""
-    address_present = False
 
     def transform(bal: BlockAccessList) -> BlockAccessList:
-        nonlocal address_present
+        address_present = False
         new_root = []
         for account_change in bal.root:
             new_root.append(account_change)
@@ -514,7 +521,6 @@ def _duplicate_in_field(
     When sub_field and sub_match_fn are provided, find the parent entry
     via match_fn then duplicate within sub_field using sub_match_fn.
     """
-    found = False
 
     def _copy(entry: Any) -> Any:
         if hasattr(entry, "model_copy"):
@@ -522,7 +528,7 @@ def _copy(entry: Any) -> Any:
         return ZeroPaddedHexNumber(entry)
 
     def transform(bal: BlockAccessList) -> BlockAccessList:
-        nonlocal found
+        found = False
         new_root = []
         for account_change in bal.root:
             if account_change.address == address:
@@ -663,10 +669,9 @@ def insert_storage_read(
     Useful for testing that a key must not appear in both
     storage_changes and storage_reads.
     """
-    found_address = False
 
     def transform(bal: BlockAccessList) -> BlockAccessList:
-        nonlocal found_address
+        found_address = False
         new_root = []
         for account_change in bal.root:
             if account_change.address == address:
@@ -721,8 +726,14 @@ def reorder_accounts(
     """Reorder accounts according to the provided index list."""
 
     def transform(bal: BlockAccessList) -> BlockAccessList:
-        if len(indices) != len(bal.root):
+        n = len(bal.root)
+        if len(indices) != n:
             raise ValueError("Index list length must match number of accounts")
+        if sorted(indices) != list(range(n)):
+            raise ValueError(
+                f"Indices must be a valid permutation of 0..{n - 1}, "
+                f"got {indices}"
+            )
         new_root = [bal.root[i] for i in indices]
         return BlockAccessList(root=new_root)
 
diff --git a/packages/testing/src/execution_testing/test_types/block_access_list/t8n.py b/packages/testing/src/execution_testing/test_types/block_access_list/t8n.py
index 7d1cb2bc071..20b3b1010c3 100644
--- a/packages/testing/src/execution_testing/test_types/block_access_list/t8n.py
+++ b/packages/testing/src/execution_testing/test_types/block_access_list/t8n.py
@@ -1,20 +1,82 @@
 """Block Access List (BAL) for t8n tool communication and fixtures."""
 
 from functools import cached_property
-from typing import Any, List
+from typing import Any, Callable, List, Sequence, Union
 
 import ethereum_rlp as eth_rlp
+from ethereum_rlp import Simple
 from pydantic import Field
 
-from execution_testing.base_types import Bytes, EthereumTestRootModel
+from execution_testing.base_types import (
+    Address,
+    Bytes,
+    EthereumTestRootModel,
+    ZeroPaddedHexNumber,
+)
 from execution_testing.base_types.serialization import (
     to_serializable_element,
 )
 
-from .account_changes import BalAccountChange
+from .account_changes import (
+    BalAccountChange,
+    BalBalanceChange,
+    BalCodeChange,
+    BalNonceChange,
+    BalStorageChange,
+    BalStorageSlot,
+)
 from .exceptions import BlockAccessListValidationError
 
 
+def _bytes_from_rlp(data: Simple) -> bytes:
+    """Extract bytes from an RLP-decoded Simple value."""
+    assert isinstance(data, bytes), f"expected bytes, got {type(data)}"
+    return data
+
+
+def _int_from_rlp(data: Simple) -> int:
+    """Decode an RLP Simple value to int."""
+    raw = _bytes_from_rlp(data)
+    if len(raw) == 0:
+        return 0
+    return int.from_bytes(raw, "big")
+
+
+def _seq_from_rlp(data: Simple) -> Sequence[Simple]:
+    """Extract a sequence from an RLP-decoded Simple value."""
+    assert not isinstance(data, bytes), "expected sequence, got bytes"
+    return data
+
+
+IndexedChange = Union[
+    BalBalanceChange, BalCodeChange, BalNonceChange, BalStorageChange
+]
+
+
+def _hex_from_rlp(data: Simple) -> ZeroPaddedHexNumber:
+    """Decode an RLP Simple value to ZeroPaddedHexNumber."""
+    return ZeroPaddedHexNumber(_int_from_rlp(data))
+
+
+def _decode_indexed_changes(
+    rlp_list: Simple,
+    cls: type[IndexedChange],
+    value_field: str,
+    value_fn: Callable[[Simple], Any] = _hex_from_rlp,
+) -> list[IndexedChange]:
+    """Decode a list of [block_access_index, value] RLP pairs."""
+    result: list[IndexedChange] = []
+    for item in _seq_from_rlp(rlp_list):
+        idx, val = _seq_from_rlp(item)
+        result.append(
+            cls(
+                block_access_index=_hex_from_rlp(idx),
+                **{value_field: value_fn(val)},
+            )
+        )
+    return result
+
+
 class BlockAccessList(EthereumTestRootModel[List[BalAccountChange]]):
     """
     Block Access List for t8n tool communication and fixtures.
@@ -37,6 +99,61 @@ class BlockAccessList(EthereumTestRootModel[List[BalAccountChange]]):
 
     root: List[BalAccountChange] = Field(default_factory=list)
 
+    @classmethod
+    def from_rlp(cls, data: Bytes) -> "BlockAccessList":
+        """
+        Decode an RLP-encoded block access list into a BlockAccessList.
+
+        The RLP structure per EIP-7928 is:
+        [
+          [address, storage_changes, storage_reads,
+           balance_changes, nonce_changes, code_changes],
+          ...
+        ]
+        """
+        decoded = _seq_from_rlp(eth_rlp.decode(data))
+        accounts = []
+        for account_rlp in decoded:
+            fields = _seq_from_rlp(account_rlp)
+
+            storage_changes = []
+            for slot_entry in _seq_from_rlp(fields[1]):
+                slot_fields = _seq_from_rlp(slot_entry)
+                storage_changes.append(
+                    BalStorageSlot(
+                        slot=_hex_from_rlp(slot_fields[0]),
+                        slot_changes=_decode_indexed_changes(
+                            slot_fields[1],
+                            BalStorageChange,
+                            "post_value",
+                        ),
+                    )
+                )
+
+            accounts.append(
+                BalAccountChange(
+                    address=Address(_bytes_from_rlp(fields[0])),
+                    storage_changes=storage_changes,
+                    storage_reads=[
+                        _hex_from_rlp(sr) for sr in _seq_from_rlp(fields[2])
+                    ],
+                    balance_changes=_decode_indexed_changes(
+                        fields[3], BalBalanceChange, "post_balance"
+                    ),
+                    nonce_changes=_decode_indexed_changes(
+                        fields[4], BalNonceChange, "post_nonce"
+                    ),
+                    code_changes=_decode_indexed_changes(
+                        fields[5],
+                        BalCodeChange,
+                        "new_code",
+                        value_fn=lambda v: Bytes(_bytes_from_rlp(v)),
+                    ),
+                )
+            )
+
+        return cls(root=accounts)
+
     def to_list(self) -> List[Any]:
         """Return the list for RLP encoding per EIP-7928."""
         return to_serializable_element(self.root)
diff --git a/packages/testing/src/execution_testing/test_types/block_types.py b/packages/testing/src/execution_testing/test_types/block_types.py
index 2c73a558b98..56d367e2e68 100644
--- a/packages/testing/src/execution_testing/test_types/block_types.py
+++ b/packages/testing/src/execution_testing/test_types/block_types.py
@@ -101,6 +101,7 @@ class EnvironmentGeneric(CamelModel, Generic[NumberBoundTypeVar]):
     excess_blob_gas: NumberBoundTypeVar | None = Field(
         None, alias="currentExcessBlobGas"
     )
+    slot_number: NumberBoundTypeVar | None = Field(None, alias="slotNumber")
 
     parent_difficulty: NumberBoundTypeVar | None = Field(None)
     parent_timestamp: NumberBoundTypeVar | None = Field(None)
@@ -142,7 +143,7 @@ def strip_computed_fields(cls, data: Any) -> Any:
     extra_data: Bytes = Field(Bytes(b"\x00"), exclude=True)
 
     # EIP-7928: Block-level access lists
-    bal_hash: Hash | None = Field(None)
+    block_access_list_hash: Hash | None = Field(None)
     block_access_lists: Bytes | None = Field(None)
 
     @computed_field  # type: ignore[prop-decorator]
@@ -160,69 +161,49 @@ def parent_hash(self) -> Hash | None:
 
     def set_fork_requirements(self, fork: Fork) -> "Environment":
         """Fill required fields in an environment depending on the fork."""
-        number = self.number
-        timestamp = self.timestamp
-
         updated_values: Dict[str, Any] = {}
 
-        if (
-            fork.header_prev_randao_required(
-                block_number=number, timestamp=timestamp
-            )
-            and self.prev_randao is None
-        ):
+        if fork.header_prev_randao_required() and self.prev_randao is None:
             updated_values["prev_randao"] = 0
 
-        if (
-            fork.header_withdrawals_required(
-                block_number=number, timestamp=timestamp
-            )
-            and self.withdrawals is None
-        ):
+        if fork.header_withdrawals_required() and self.withdrawals is None:
             updated_values["withdrawals"] = []
 
         if (
-            fork.header_base_fee_required(
-                block_number=number, timestamp=timestamp
-            )
+            fork.header_base_fee_required()
             and self.base_fee_per_gas is None
             and self.parent_base_fee_per_gas is None
         ):
             updated_values["base_fee_per_gas"] = DEFAULT_BASE_FEE
 
-        if fork.header_zero_difficulty_required(
-            block_number=number, timestamp=timestamp
-        ):
+        if fork.header_zero_difficulty_required():
             updated_values["difficulty"] = 0
         elif self.difficulty is None and self.parent_difficulty is None:
             updated_values["difficulty"] = 0x20000
 
         if (
-            fork.header_excess_blob_gas_required(
-                block_number=number, timestamp=timestamp
-            )
+            fork.header_excess_blob_gas_required()
             and self.excess_blob_gas is None
             and self.parent_excess_blob_gas is None
         ):
             updated_values["excess_blob_gas"] = 0
 
         if (
-            fork.header_blob_gas_used_required(
-                block_number=number, timestamp=timestamp
-            )
+            fork.header_blob_gas_used_required()
             and self.blob_gas_used is None
             and self.parent_blob_gas_used is None
         ):
             updated_values["blob_gas_used"] = 0
 
         if (
-            fork.header_beacon_root_required(
-                block_number=number, timestamp=timestamp
-            )
+            fork.header_beacon_root_required()
             and self.parent_beacon_block_root is None
         ):
             updated_values["parent_beacon_block_root"] = 0
 
+        if fork.header_slot_number_required() and self.slot_number is None:
+            updated_values["slot_number"] = 0
+
         return self.copy(**updated_values)
 
     def __hash__(self) -> int:
diff --git a/packages/testing/src/execution_testing/test_types/chain_config_types.py b/packages/testing/src/execution_testing/test_types/chain_config_types.py
index 2e52cb024d4..1f98fc8214f 100644
--- a/packages/testing/src/execution_testing/test_types/chain_config_types.py
+++ b/packages/testing/src/execution_testing/test_types/chain_config_types.py
@@ -4,6 +4,8 @@
 
 from execution_testing.base_types import CamelModel
 
+DEFAULT_CHAIN_ID = 1
+
 
 class ChainConfigDefaults:
     """
@@ -13,7 +15,7 @@ class ChainConfigDefaults:
     default values.
     """
 
-    chain_id: int = 1
+    chain_id: int = DEFAULT_CHAIN_ID
 
 
 class ChainConfig(CamelModel):
diff --git a/packages/testing/src/execution_testing/test_types/receipt_types.py b/packages/testing/src/execution_testing/test_types/receipt_types.py
index 9fe5428feff..55e94498350 100644
--- a/packages/testing/src/execution_testing/test_types/receipt_types.py
+++ b/packages/testing/src/execution_testing/test_types/receipt_types.py
@@ -43,11 +43,26 @@ class TransactionReceipt(CamelModel):
     @model_validator(mode="before")
     @classmethod
     def strip_extra_fields(cls, data: Any) -> Any:
-        """Strip extra fields from t8n tool output not part of model."""
+        """Strip extra fields from t8n tool / RPC output not part of model."""
         if isinstance(data, dict):
+            data = dict(data)
             # geth (1.16+) returns extra fields in receipts
             data.pop("type", None)
             data.pop("blockNumber", None)
+            # Fields eth_getTransactionReceipt returns that the fixture
+            # schema does not model. Fill-stateful fetches receipts live,
+            # so we tolerate these even though the t8n path never emits
+            # them.
+            data.pop("from", None)
+            data.pop("to", None)
+            root = data.get("root")
+            root_is_empty = root in (None, "", "0x", b"", bytearray())
+            if not root_is_empty:
+                # geth's t8n JSON uses `root` for pre-Byzantium receipts while
+                # also populating `status`. For fixture re-encoding, a
+                # non-empty root must take precedence over status.
+                data.setdefault("post_state", root)
+                data.pop("status", None)
         return data
 
     transaction_hash: Hash | None = None
diff --git a/packages/testing/src/execution_testing/test_types/tests/test_blob_types.py b/packages/testing/src/execution_testing/test_types/tests/test_blob_types.py
index bcc2b2d1639..d684a80aaa3 100644
--- a/packages/testing/src/execution_testing/test_types/tests/test_blob_types.py
+++ b/packages/testing/src/execution_testing/test_types/tests/test_blob_types.py
@@ -93,13 +93,7 @@ def test_blob_creation_and_writing_and_reading(
     b = Blob.from_fork(fork=fork, seed=seed, timestamp=timestamp)
     b.write_to_file()
 
-    # read from file
-    #       determine what filename would be
-    cell_proof_amount = str(fork.get_blob_constant("AMOUNT_CELL_PROOFS"))
-    file_name = (
-        "blob_" + str(seed) + "_cell_proofs_" + cell_proof_amount + ".json"
-    )
-    #       read
+    file_name = Blob.get_filename(fork, seed)
     restored = Blob.from_file(file_name)
 
     # ensure file you read equals file you wrote
diff --git a/packages/testing/src/execution_testing/test_types/tests/test_block_access_list_modifiers.py b/packages/testing/src/execution_testing/test_types/tests/test_block_access_list_modifiers.py
index 50ca7d9dc83..4ac837be51d 100644
--- a/packages/testing/src/execution_testing/test_types/tests/test_block_access_list_modifiers.py
+++ b/packages/testing/src/execution_testing/test_types/tests/test_block_access_list_modifiers.py
@@ -1,5 +1,7 @@
 """Unit tests for BAL modifier functions."""
 
+from typing import Callable
+
 import pytest
 
 from execution_testing.base_types import Address
@@ -13,6 +15,8 @@
     BlockAccessList,
 )
 from execution_testing.test_types.block_access_list.modifiers import (
+    append_change,
+    append_storage,
     duplicate_account,
     duplicate_balance_change,
     duplicate_code_change,
@@ -21,6 +25,13 @@
     duplicate_storage_read,
     duplicate_storage_slot,
     insert_storage_read,
+    modify_balance,
+    modify_code,
+    modify_nonce,
+    modify_storage,
+    remove_nonces,
+    reorder_accounts,
+    swap_bal_indices,
 )
 
 ALICE = Address(0xA)
@@ -217,3 +228,143 @@ def test_insert_storage_read_missing_address_raises() -> None:
     bal = BlockAccessList([BalAccountChange(address=ALICE, nonce_changes=[])])
     with pytest.raises(ValueError, match="not found"):
         insert_storage_read(CONTRACT, 1)(bal)
+
+
+def test_modify_nonce_missing_index_raises(
+    sample_bal: BlockAccessList,
+) -> None:
+    """Raise when the block_access_index is absent from nonce_changes."""
+    with pytest.raises(ValueError, match="not found"):
+        modify_nonce(ALICE, 99, 42)(sample_bal)
+
+
+def test_modify_balance_missing_index_raises(
+    sample_bal: BlockAccessList,
+) -> None:
+    """Raise when the block_access_index is absent from balance_changes."""
+    with pytest.raises(ValueError, match="not found"):
+        modify_balance(ALICE, 99, 9999)(sample_bal)
+
+
+def test_modify_code_missing_index_raises(sample_bal: BlockAccessList) -> None:
+    """Raise when the block_access_index is absent from code_changes."""
+    with pytest.raises(ValueError, match="not found"):
+        modify_code(ALICE, 99, b"\x00")(sample_bal)
+
+
+def test_modify_storage_missing_index_raises(
+    sample_bal: BlockAccessList,
+) -> None:
+    """Raise when block_access_index is absent within the storage slot."""
+    with pytest.raises(ValueError, match="not found"):
+        modify_storage(CONTRACT, 99, 1, 0xFF)(sample_bal)
+
+
+def test_modify_storage_missing_slot_raises(
+    sample_bal: BlockAccessList,
+) -> None:
+    """Raise when the storage slot itself is absent."""
+    with pytest.raises(ValueError, match="not found"):
+        modify_storage(CONTRACT, 1, 99, 0xFF)(sample_bal)
+
+
+def test_modify_nonce_reused_callable_missing_index_still_raises() -> None:
+    """Raise even when the same modifier callable is reused across BALs."""
+    modifier = modify_nonce(ALICE, 1, 42)
+    valid_bal = BlockAccessList(
+        [
+            BalAccountChange(
+                address=ALICE,
+                nonce_changes=[
+                    BalNonceChange(block_access_index=1, post_nonce=1),
+                ],
+            )
+        ]
+    )
+    missing_index_bal = BlockAccessList(
+        [
+            BalAccountChange(
+                address=ALICE,
+                nonce_changes=[],
+            )
+        ]
+    )
+
+    modifier(valid_bal)
+
+    with pytest.raises(ValueError, match="not found"):
+        modifier(missing_index_bal)
+
+
+def test_reorder_accounts_duplicate_index_raises(
+    sample_bal: BlockAccessList,
+) -> None:
+    """Raise when indices contain duplicates (not a valid permutation)."""
+    with pytest.raises(ValueError, match="valid permutation"):
+        reorder_accounts([0, 0])(sample_bal)
+
+
+def test_reorder_accounts_out_of_range_raises(
+    sample_bal: BlockAccessList,
+) -> None:
+    """Raise when indices are not a valid permutation (skipped index)."""
+    with pytest.raises(ValueError, match="valid permutation"):
+        reorder_accounts([0, 2])(sample_bal)
+
+
+_EMPTY_BAL = BlockAccessList([])
+_ALICE_ONLY_BAL = BlockAccessList(
+    [BalAccountChange(address=ALICE, nonce_changes=[])]
+)
+
+
+@pytest.mark.parametrize(
+    "modifier_factory, missing_bal",
+    [
+        pytest.param(
+            lambda: remove_nonces(ALICE), _EMPTY_BAL, id="remove_nonces"
+        ),
+        pytest.param(
+            lambda: swap_bal_indices(1, 1), _EMPTY_BAL, id="swap_bal_indices"
+        ),
+        pytest.param(
+            lambda: append_change(
+                ALICE, BalNonceChange(block_access_index=2, post_nonce=5)
+            ),
+            _EMPTY_BAL,
+            id="append_change",
+        ),
+        pytest.param(
+            lambda: append_storage(CONTRACT, slot=7, read=True),
+            _EMPTY_BAL,
+            id="append_storage",
+        ),
+        pytest.param(
+            lambda: duplicate_account(ALICE),
+            _EMPTY_BAL,
+            id="duplicate_account",
+        ),
+        pytest.param(
+            lambda: duplicate_nonce_change(ALICE, 1),
+            _ALICE_ONLY_BAL,
+            id="duplicate_nonce_change",
+        ),
+        pytest.param(
+            lambda: insert_storage_read(CONTRACT, 99),
+            _EMPTY_BAL,
+            id="insert_storage_read",
+        ),
+    ],
+)
+def test_reused_callable_does_not_carry_found_state(
+    sample_bal: BlockAccessList,
+    modifier_factory: Callable[
+        [], Callable[[BlockAccessList], BlockAccessList]
+    ],
+    missing_bal: BlockAccessList,
+) -> None:
+    """A modifier's found-state must not persist across calls."""
+    modifier = modifier_factory()
+    modifier(sample_bal)
+    with pytest.raises(ValueError, match="not found"):
+        modifier(missing_bal)
diff --git a/packages/testing/src/execution_testing/test_types/tests/test_types.py b/packages/testing/src/execution_testing/test_types/tests/test_types.py
index 83ba6dc3011..4770b941a61 100644
--- a/packages/testing/src/execution_testing/test_types/tests/test_types.py
+++ b/packages/testing/src/execution_testing/test_types/tests/test_types.py
@@ -21,6 +21,7 @@
     Environment,
     Withdrawal,
 )
+from ..receipt_types import TransactionReceipt
 from ..transaction_types import (
     AuthorizationTuple,
     Transaction,
@@ -93,6 +94,31 @@ def test_storage() -> None:
     }
 
 
+def test_transaction_receipt_maps_non_empty_root_to_post_state() -> None:
+    """Non-empty `root` from geth should be treated as pre-Byzantium state."""
+    receipt = TransactionReceipt.model_validate(
+        {
+            "root": "0x" + "11" * 32,
+            "status": "0x1",
+        }
+    )
+    assert str(receipt.post_state) == "0x" + "11" * 32
+    assert receipt.status is None
+
+
+def test_transaction_receipt_keeps_status_when_root_is_empty() -> None:
+    """Empty `root` should not override Byzantium-style receipt status."""
+    receipt = TransactionReceipt.model_validate(
+        {
+            "root": "0x",
+            "status": "0x1",
+        }
+    )
+    assert receipt.post_state is None
+    assert receipt.status is not None
+    assert int(receipt.status) == 1
+
+
 @pytest.mark.parametrize(
     ["account"],
     [
@@ -672,7 +698,7 @@ def test_json_deserialization(
         self,
         can_be_deserialized: bool,
         model_instance: Any,
-        json: str | Dict[str, Any],
+        json: Dict[str, Any],
     ) -> None:
         """Test that to_json returns the expected JSON for the given object."""
         if not can_be_deserialized:
@@ -690,21 +716,38 @@ def test_json_deserialization(
         pytest.param(
             {"gas_price": 1, "max_fee_per_gas": 2},
             Transaction.InvalidFeePaymentError,
-            "only one type of fee payment field can be used",
+            "'gas_price' (legacy/type-1), 'max_fee_per_gas' (type-2+)",
             id="gas-price-and-max-fee-per-gas",
         ),
         pytest.param(
             {"gas_price": 1, "max_priority_fee_per_gas": 2},
             Transaction.InvalidFeePaymentError,
-            "only one type of fee payment field can be used",
+            (
+                "'gas_price' (legacy/type-1), "
+                "'max_priority_fee_per_gas' (type-2+)"
+            ),
             id="gas-price-and-max-priority-fee-per-gas",
         ),
         pytest.param(
             {"gas_price": 1, "max_fee_per_blob_gas": 2},
             Transaction.InvalidFeePaymentError,
-            "only one type of fee payment field can be used",
+            "'gas_price' (legacy/type-1), 'max_fee_per_blob_gas' (type-3+)",
             id="gas-price-and-max-fee-per-blob-gas",
         ),
+        pytest.param(
+            {
+                "gas_price": 1,
+                "max_fee_per_gas": 2,
+                "max_priority_fee_per_gas": 3,
+            },
+            Transaction.InvalidFeePaymentError,
+            (
+                "'gas_price' (legacy/type-1), "
+                "'max_fee_per_gas' (type-2+), "
+                "'max_priority_fee_per_gas' (type-2+)"
+            ),
+            id="gas-price-and-multiple-dynamic-fee-fields",
+        ),
         pytest.param(
             {"ty": 0, "v": 1, "secret_key": 2},
             Transaction.InvalidSignaturePrivateKeyError,
@@ -727,6 +770,17 @@ def test_transaction_post_init_invalid_arg_combinations(  # noqa: D103
     assert expected_exception_substring in str(exc_info.value)
 
 
+def test_invalid_fee_payment_error_message() -> None:
+    """Test the exact error message for mixed legacy and type-2+ fee fields."""
+    with pytest.raises(Transaction.InvalidFeePaymentError) as exc_info:
+        Transaction(gas_price=1, max_fee_per_gas=2)
+
+    error_msg = f"\n\t{str(exc_info.value)}"
+    print(error_msg)
+
+    assert "cannot mix" in error_msg
+
+
 @pytest.mark.parametrize(
     ["tx_args", "expected_attributes_and_values"],
     [
diff --git a/packages/testing/src/execution_testing/test_types/transaction_types.py b/packages/testing/src/execution_testing/test_types/transaction_types.py
index 81276da8621..bc3d0794f3f 100644
--- a/packages/testing/src/execution_testing/test_types/transaction_types.py
+++ b/packages/testing/src/execution_testing/test_types/transaction_types.py
@@ -343,11 +343,26 @@ def strip_hash_from_t8n_output(cls, data: Any) -> Any:
     class InvalidFeePaymentError(Exception):
         """Transaction described more than one fee payment type."""
 
+        FEE_FIELD_LABELS = {
+            "gas_price": "legacy/type-1",
+            "max_fee_per_gas": "type-2+",
+            "max_priority_fee_per_gas": "type-2+",
+            "max_fee_per_blob_gas": "type-3+",
+        }
+
+        def __init__(self, *conflicting_fields: str) -> None:
+            """Store the conflicting fee fields used in the transaction."""
+            self.conflicting_fields = conflicting_fields
+
         def __str__(self) -> str:
             """Print exception string."""
-            return (
-                "only one type of fee payment field can be used in a single tx"
+            if not self.conflicting_fields:
+                return "cannot mix fee fields in a single tx"
+            labels = ", ".join(
+                f"'{f}' ({self.FEE_FIELD_LABELS[f]})"
+                for f in self.conflicting_fields
             )
+            return f"cannot mix fee fields in a single tx: {labels}"
 
     class InvalidSignaturePrivateKeyError(Exception):
         """
@@ -363,12 +378,18 @@ def model_post_init(self, __context: Any) -> None:
         """Ensure transaction has no conflicting properties."""
         super().model_post_init(__context)
 
-        if self.gas_price is not None and (
-            self.max_fee_per_gas is not None
-            or self.max_priority_fee_per_gas is not None
-            or self.max_fee_per_blob_gas is not None
-        ):
-            raise Transaction.InvalidFeePaymentError()
+        conflicting_fee_fields = [
+            field_name
+            for field_name in (
+                "gas_price",
+                "max_fee_per_gas",
+                "max_priority_fee_per_gas",
+                "max_fee_per_blob_gas",
+            )
+            if getattr(self, field_name) is not None
+        ]
+        if self.gas_price is not None and len(conflicting_fee_fields) > 1:
+            raise Transaction.InvalidFeePaymentError(*conflicting_fee_fields)
 
         if "ty" not in self.model_fields_set:
             # Try to deduce transaction type from included fields
@@ -407,6 +428,10 @@ def model_post_init(self, __context: Any) -> None:
         if self.ty <= 1 and self.gas_price is None:
             self.gas_price = HexNumber(TransactionDefaults.gas_price)
             self.model_fields_set.remove("gas_price")
+        if self.ty >= 2:
+            assert self.gas_price is None, (
+                f"gas_price not supported for tx type {int(self.ty)}"
+            )
         if self.ty >= 1 and self.access_list is None:
             self.access_list = []
         if self.ty < 1:
diff --git a/packages/testing/src/execution_testing/test_types/trie.py b/packages/testing/src/execution_testing/test_types/trie.py
index 4eb9d4288b2..16fd4d5709d 100644
--- a/packages/testing/src/execution_testing/test_types/trie.py
+++ b/packages/testing/src/execution_testing/test_types/trie.py
@@ -18,7 +18,7 @@
     cast,
 )
 
-from Crypto.Hash import keccak
+from ethereum.crypto.hash import keccak256
 from ethereum_rlp import Extended, rlp
 from ethereum_types.bytes import Bytes, Bytes20, Bytes32
 from ethereum_types.frozen import slotted_freezable
@@ -36,12 +36,6 @@ class FrontierAccount:
     code: Bytes
 
 
-def keccak256(buffer: Bytes) -> Bytes32:
-    """Compute the keccak256 hash of the input `buffer`."""
-    k = keccak.new(digest_bits=256)
-    return Bytes32(k.update(buffer).digest())
-
-
 def encode_account(
     raw_account_data: FrontierAccount, storage_root: Bytes
 ) -> Bytes:
diff --git a/packages/testing/src/execution_testing/tools/__init__.py b/packages/testing/src/execution_testing/tools/__init__.py
index 0bc6640f0c0..0164e2fcccf 100644
--- a/packages/testing/src/execution_testing/tools/__init__.py
+++ b/packages/testing/src/execution_testing/tools/__init__.py
@@ -17,6 +17,7 @@
     Switch,
     TransactionWithCost,
     While,
+    WhileGas,
 )
 from .utility.generators import (
     DeploymentTestType,
@@ -43,6 +44,7 @@
     "Switch",
     "TransactionWithCost",
     "While",
+    "WhileGas",
     "extend_with_defaults",
     "gas_test",
     "generate_system_contract_deploy_test",
diff --git a/packages/testing/src/execution_testing/tools/tests/test_iterating_bytecode.py b/packages/testing/src/execution_testing/tools/tests/test_iterating_bytecode.py
index 7f509a51c96..4c5309bfbbf 100644
--- a/packages/testing/src/execution_testing/tools/tests/test_iterating_bytecode.py
+++ b/packages/testing/src/execution_testing/tools/tests/test_iterating_bytecode.py
@@ -27,11 +27,8 @@ def with_tx_gas_limit_cap(cls, tx_gas_limit_cap: int | None) -> Type[Self]:
         )
 
     @classmethod
-    def transaction_gas_limit_cap(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> int | None:
+    def transaction_gas_limit_cap(cls) -> int | None:
         """Return the transaction gas limit cap."""
-        del block_number, timestamp
         return cls.tx_gas_limit_cap
 
 
diff --git a/packages/testing/src/execution_testing/tools/tools_code/__init__.py b/packages/testing/src/execution_testing/tools/tools_code/__init__.py
index 26b32976579..7782729b900 100644
--- a/packages/testing/src/execution_testing/tools/tools_code/__init__.py
+++ b/packages/testing/src/execution_testing/tools/tools_code/__init__.py
@@ -14,6 +14,7 @@
     Switch,
     TransactionWithCost,
     While,
+    WhileGas,
 )
 from .yul import Solc, Yul, YulCompiler
 
@@ -32,6 +33,7 @@
     "Switch",
     "TransactionWithCost",
     "While",
+    "WhileGas",
     "Yul",
     "YulCompiler",
 )
diff --git a/packages/testing/src/execution_testing/tools/tools_code/generators.py b/packages/testing/src/execution_testing/tools/tools_code/generators.py
index a07c0fe24b9..3e82c18bd0f 100644
--- a/packages/testing/src/execution_testing/tools/tools_code/generators.py
+++ b/packages/testing/src/execution_testing/tools/tools_code/generators.py
@@ -108,39 +108,19 @@ def __new__(
 
         return instance
 
-    def execution_gas(
-        self,
-        fork: Type[ForkOpcodeInterface],
-        *,
-        block_number: int = 0,
-        timestamp: int = 0,
-    ) -> int:
+    def execution_gas(self, fork: Type[ForkOpcodeInterface]) -> int:
         """
         Gas cost of executing the initcode, charged before the code
         deposit fee.
         """
-        return self.gas_cost(
-            fork,
-            block_number=block_number,
-            timestamp=timestamp,
-        ) - self.deployment_gas(
-            fork,
-            block_number=block_number,
-            timestamp=timestamp,
-        )
+        return self.gas_cost(fork) - self.deployment_gas(fork)
 
-    def deployment_gas(
-        self,
-        fork: Type[ForkOpcodeInterface],
-        *,
-        block_number: int = 0,
-        timestamp: int = 0,
-    ) -> int:
+    def deployment_gas(self, fork: Type[ForkOpcodeInterface]) -> int:
         """
         Gas cost of deploying the contract.
         """
         return Op.RETURN(code_deposit_size=len(self.deploy_code)).gas_cost(
-            fork, block_number=block_number, timestamp=timestamp
+            fork
         )
 
 
@@ -275,6 +255,49 @@ def __new__(
         return super().__new__(cls, bytecode)
 
 
+class WhileGas(Bytecode):
+    """
+    Helper class to generate a gas-bounded while-loop.
+
+    Similar to While but automatically generates a condition that checks
+    whether there is sufficient remaining gas for another iteration.
+    """
+
+    _iteration_cost: int
+
+    def __new__(
+        cls,
+        *,
+        body: Bytecode | Op,
+        fork: Type[ForkOpcodeInterface],
+        extra_gas: int = 0,
+    ) -> Self:
+        """
+        Assemble the loop bytecode with an automatic gas check condition.
+
+        The loop continues while the remaining gas exceeds the cost of one
+        full iteration (body + loop overhead + extra_gas).
+        """
+        # Build a temporary While with a dummy condition of the same byte
+        # length to calculate the real per-iteration gas cost.
+        dummy_condition = Op.GT(Op.GAS, Op.PUSH4[0])
+        dummy_loop = While(body=body, condition=dummy_condition)
+
+        # After GAS reads the remaining gas, the exit path still executes
+        # GT + PUSH4[offset] + PC + SUB + JUMPI. We must ensure enough gas
+        # remains for this exit path after a full iteration, otherwise the
+        # loop OOGs on exit instead of terminating cleanly.
+        exit_overhead = (
+            Op.GT + Op.PUSH4[0] + Op.PC + Op.SUB + Op.JUMPI
+        ).gas_cost(fork)
+        minimum_gas = dummy_loop.gas_cost(fork) + extra_gas + exit_overhead
+
+        # Now build the real condition with the actual cost.
+        condition = Op.GT(Op.GAS, Op.PUSH4[minimum_gas])
+        bytecode = While(body=body, condition=condition)
+        return super().__new__(cls, bytecode)
+
+
 @dataclass(kw_only=True, slots=True)
 class Case:
     """
@@ -1328,15 +1351,8 @@ def __new__(
         instance.iteration_count = iteration_count
         return instance
 
-    def gas_cost(
-        self,
-        fork: Type[ForkOpcodeInterface],
-        *,
-        block_number: int = 0,
-        timestamp: int = 0,
-    ) -> int:
+    def gas_cost(self, fork: Type[ForkOpcodeInterface]) -> int:
         """Return the cost of iterating through the bytecode N times."""
-        del block_number, timestamp
         return self.gas_cost_by_iteration_count(
             fork=fork,
             iteration_count=self.iteration_count,
diff --git a/packages/testing/src/execution_testing/tools/utility/generators.py b/packages/testing/src/execution_testing/tools/utility/generators.py
index 955020d28e6..ca28a5b9fe1 100644
--- a/packages/testing/src/execution_testing/tools/utility/generators.py
+++ b/packages/testing/src/execution_testing/tools/utility/generators.py
@@ -10,7 +10,8 @@
 
 from execution_testing.base_types import Account, Address, Hash
 from execution_testing.exceptions import BlockException
-from execution_testing.forks import Berlin, Fork
+from execution_testing.forks import Berlin, Fork, TransitionFork
+from execution_testing.forks.base_fork import BaseFork
 from execution_testing.specs import BlockchainTestFiller, StateTestFiller
 from execution_testing.specs.blockchain import Block
 from execution_testing.test_types import Alloc, Transaction
@@ -63,7 +64,7 @@ class SystemContractDeployTestFunction(Protocol):
     def __call__(
         self,
         *,
-        fork: Fork,
+        fork: TransitionFork,
         pre: Alloc,
         post: Alloc,
         test_type: DeploymentTestType,
@@ -139,6 +140,11 @@ def generate_system_contract_deploy_test(
                                                       the system contract.
 
     """
+    if not issubclass(fork, BaseFork):
+        raise TypeError(
+            "fork parameter of generate_system_contract_deploy_test must be "
+            "a subclass of Fork"
+        )
     with open(tx_json_path, mode="r") as f:
         tx_json = json.loads(f.read())
     if "gasLimit" not in tx_json and "gas" in tx_json:
@@ -186,8 +192,12 @@ def wrapper(
             has_balance: ContractAddressHasBalance,
             pre: Alloc,
             test_type: DeploymentTestType,
-            fork: Fork,
+            fork: TransitionFork,
         ) -> None:
+            assert fork.at_block == 0, (
+                "Block number based transition forks are not supported by "
+                "generate_system_contract_deploy_test"
+            )
             assert deployer_address is not None
             assert deploy_tx.created_contract == expected_deploy_address
             blocks: List[Block] = []
@@ -196,29 +206,29 @@ def wrapper(
                 blocks = [
                     Block(  # Deployment block
                         txs=[deploy_tx],
-                        timestamp=14_999,
+                        timestamp=fork.at_timestamp - 1,
                     ),
                     Block(  # Empty block on fork
                         txs=[],
-                        timestamp=15_000,
+                        timestamp=fork.at_timestamp,
                     ),
                 ]
             elif test_type == DeploymentTestType.DEPLOY_ON_FORK_BLOCK:
                 blocks = [
                     Block(  # Deployment on fork block
                         txs=[deploy_tx],
-                        timestamp=15_000,
+                        timestamp=fork.at_timestamp,
                     ),
                     Block(  # Empty block after fork
                         txs=[],
-                        timestamp=15_001,
+                        timestamp=fork.at_timestamp + 1,
                     ),
                 ]
             elif test_type == DeploymentTestType.DEPLOY_AFTER_FORK:
                 blocks = [
                     Block(  # Empty block on fork
                         txs=[],
-                        timestamp=15_000,
+                        timestamp=fork.at_timestamp,
                         exception=BlockException.SYSTEM_CONTRACT_EMPTY
                         if fail_on_empty_code
                         else None,
@@ -228,13 +238,13 @@ def wrapper(
                     blocks.append(
                         Block(  # Deployment after fork block
                             txs=[deploy_tx],
-                            timestamp=15_001,
+                            timestamp=fork.at_timestamp + 1,
                         )
                     )
                     blocks.append(
                         Block(  # Empty block after deployment
                             txs=[],
-                            timestamp=15_002,
+                            timestamp=fork.at_timestamp + 2,
                         ),
                     )
             balance = (
@@ -255,7 +265,9 @@ def wrapper(
             )
 
             post = Alloc()
-            fork_pre_allocation = fork.pre_allocation_blockchain()
+            fork_pre_allocation = (
+                fork.transitions_to().pre_allocation_blockchain()
+            )
             assert expected_deploy_address_int in fork_pre_allocation
             expected_code = fork_pre_allocation[expected_deploy_address_int][
                 "code"
@@ -346,9 +358,9 @@ def wrapper(
                 # code will only work once, so if the system contract is re-
                 # executed in a subsequent block, it will consume less gas.
                 gas_used_per_storage = (
-                    gas_costs.GAS_STORAGE_SET
-                    + gas_costs.GAS_COLD_SLOAD
-                    + (gas_costs.GAS_VERY_LOW * 2)
+                    gas_costs.STORAGE_SET
+                    + gas_costs.COLD_STORAGE_ACCESS
+                    + (gas_costs.VERY_LOW * 2)
                 )
                 modified_system_contract_code += sum(
                     Op.SSTORE(i, 1)
@@ -357,9 +369,9 @@ def wrapper(
                 # If the gas limit is not divisible by the gas used per
                 # storage, we need to add some NO-OP (JUMPDEST) to the code
                 # that each consume 1 gas.
-                assert gas_costs.GAS_JUMPDEST == 1, (
+                assert gas_costs.OPCODE_JUMPDEST == 1, (
                     "JUMPDEST gas cost should be 1, but got "
-                    f"{gas_costs.GAS_JUMPDEST}. Generator "
+                    f"{gas_costs.OPCODE_JUMPDEST}. Generator "
                     "`generate_system_contract_error_test` needs updating."
                 )
                 modified_system_contract_code += sum(
@@ -471,6 +483,10 @@ def gas_test(
     if cold_gas is None:
         cold_gas = subject_code.gas_cost(fork)
 
+    if cold_gas < 0:
+        raise ValueError(
+            f"Target gas allocations (cold_gas) must be >= 0, got {cold_gas}"
+        )
     if warm_gas is None:
         if subject_code_warm is not None:
             warm_gas = subject_code_warm.gas_cost(fork)
@@ -487,18 +503,12 @@ def gas_test(
         balance=subject_balance,
         address=subject_address,
     )
-    # 2 times GAS, POP, CALL, 6 times PUSH1 - instructions charged for at every
-    # gas run
-    gas_costs = fork.gas_costs()
-    opcode_gas_cost = gas_costs.GAS_BASE
-    opcode_pop_cost = gas_costs.GAS_BASE
-    opcode_push_cost = gas_costs.GAS_VERY_LOW
+
+    # Auxiliary instructions charged for at every gas run
     gas_single_gas_run = (
-        2 * opcode_gas_cost
-        + opcode_pop_cost
-        + gas_costs.GAS_WARM_ACCOUNT_ACCESS
-        + 6 * opcode_push_cost
-    )
+        Op.GAS + Op.CALL(gas=Op.GAS, address_warm=True) + Op.POP
+    ).gas_cost(fork=fork)
+
     address_legacy_harness = pre.deploy_contract(
         code=(
             # warm subject and baseline without executing
@@ -608,13 +618,13 @@ def gas_test(
             LEGACY_CALL_SUCCESS
         )
 
-    sstore_gas = gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD
+    gas_sstore = Op.SSTORE(1, 1).gas_cost(fork=fork)
     if tx_gas is None:
         tx_gas = (
             5 * gas_single_gas_run
             + cold_gas
             + 4 * warm_gas
-            + 5 * sstore_gas
+            + 5 * gas_sstore
             + 500_000
         )
     tx = Transaction(
diff --git a/packages/testing/src/execution_testing/vm/bases.py b/packages/testing/src/execution_testing/vm/bases.py
index d2f0e06c95e..7fb76bf5c3e 100644
--- a/packages/testing/src/execution_testing/vm/bases.py
+++ b/packages/testing/src/execution_testing/vm/bases.py
@@ -33,9 +33,7 @@ class ForkOpcodeInterface(ABC):
 
     @classmethod
     @abstractmethod
-    def opcode_gas_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> OpcodeGasCalculator:
+    def opcode_gas_calculator(cls) -> OpcodeGasCalculator:
         """
         Return callable that calculates the gas cost of a single opcode.
         """
@@ -43,9 +41,7 @@ def opcode_gas_calculator(
 
     @classmethod
     @abstractmethod
-    def opcode_refund_calculator(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> OpcodeGasCalculator:
+    def opcode_refund_calculator(cls) -> OpcodeGasCalculator:
         """
         Return callable that calculates the gas refund of a single opcode.
         """
diff --git a/packages/testing/src/execution_testing/vm/bytecode.py b/packages/testing/src/execution_testing/vm/bytecode.py
index 4ef6d05e092..74b2ede512f 100644
--- a/packages/testing/src/execution_testing/vm/bytecode.py
+++ b/packages/testing/src/execution_testing/vm/bytecode.py
@@ -36,12 +36,8 @@ class Bytecode:
     _keccak_256_: Hash | None = None
     _gas_cost_: int | None = None
     _gas_cost_fork_: Type[ForkOpcodeInterface] | None = None
-    _gas_cost_block_number_: int | None = None
-    _gas_cost_timestamp_: int | None = None
     _refund_: int | None = None
     _refund_fork_: Type[ForkOpcodeInterface] | None = None
-    _refund_block_number_: int | None = None
-    _refund_timestamp_: int | None = None
 
     popped_stack_items: int
     pushed_stack_items: int
@@ -227,7 +223,7 @@ def __add__(self, other: "Bytecode | bytes | int | None") -> "Bytecode":
         )
 
         return Bytecode(
-            bytes(self) + bytes(other),
+            self._bytes_ + other._bytes_,
             popped_stack_items=c_pop,
             pushed_stack_items=c_push,
             min_stack_height=c_min,
@@ -238,7 +234,7 @@ def __add__(self, other: "Bytecode | bytes | int | None") -> "Bytecode":
 
     def __radd__(self, other: "Bytecode | int | None") -> "Bytecode":
         """
-        Concatenate the opcode byte representation with another bytes object.
+        Repeat the bytecode a given number of times.
         """
         if other is None or (isinstance(other, int) and other == 0):
             # Edge case for sum() function
@@ -256,10 +252,32 @@ def __mul__(self, other: int) -> "Bytecode":
             raise ValueError("Cannot multiply by a negative number")
         if other == 0:
             return Bytecode()
-        output = self
-        for _ in range(other - 1):
-            output += self
-        return output
+        if other == 1:
+            return Bytecode(self)
+
+        result_bytes = self._bytes_ * other
+
+        a_pop = self.popped_stack_items
+        a_push = self.pushed_stack_items
+        a_min = self.min_stack_height
+        a_max = self.max_stack_height
+        net = a_push - a_pop
+        repeats = other - 1
+
+        c_pop = a_pop + max(0, -net) * repeats
+        c_push = a_push + max(0, net) * repeats
+        c_min = a_min + max(0, -net) * repeats
+        c_max = a_max + abs(net) * repeats
+
+        return Bytecode(
+            result_bytes,
+            popped_stack_items=c_pop,
+            pushed_stack_items=c_push,
+            min_stack_height=c_min,
+            max_stack_height=c_max,
+            terminating=self.terminating,
+            opcode_list=self.opcode_list * other,
+        )
 
     def hex(self) -> str:
         """
@@ -274,51 +292,21 @@ def keccak256(self) -> Hash:
             self._keccak_256_ = Bytes(self._bytes_).keccak256()
         return self._keccak_256_
 
-    def gas_cost(
-        self,
-        fork: Type[ForkOpcodeInterface],
-        *,
-        block_number: int = 0,
-        timestamp: int = 0,
-    ) -> int:
+    def gas_cost(self, fork: Type[ForkOpcodeInterface]) -> int:
         """Use a fork object to calculate the gas used by this bytecode."""
-        if (
-            self._gas_cost_ is None
-            or self._gas_cost_fork_ != fork
-            or self._gas_cost_block_number_ != block_number
-            or self._gas_cost_timestamp_ != timestamp
-        ):
+        if self._gas_cost_ is None or self._gas_cost_fork_ != fork:
             self._gas_cost_fork_ = fork
-            self._gas_cost_block_number_ = block_number
-            self._gas_cost_timestamp_ = timestamp
-            opcode_gas_calculator = fork.opcode_gas_calculator(
-                block_number=block_number, timestamp=timestamp
-            )
+            opcode_gas_calculator = fork.opcode_gas_calculator()
             self._gas_cost_ = 0
             for opcode in self.opcode_list:
                 self._gas_cost_ += opcode_gas_calculator(opcode)
         return self._gas_cost_
 
-    def refund(
-        self,
-        fork: Type[ForkOpcodeInterface],
-        *,
-        block_number: int = 0,
-        timestamp: int = 0,
-    ) -> int:
+    def refund(self, fork: Type[ForkOpcodeInterface]) -> int:
         """Use a fork object to calculate the gas refund from this bytecode."""
-        if (
-            self._refund_ is None
-            or self._refund_fork_ != fork
-            or self._refund_block_number_ != block_number
-            or self._refund_timestamp_ != timestamp
-        ):
+        if self._refund_ is None or self._refund_fork_ != fork:
             self._refund_fork_ = fork
-            self._refund_block_number_ = block_number
-            self._refund_timestamp_ = timestamp
-            opcode_refund_calculator = fork.opcode_refund_calculator(
-                block_number=block_number, timestamp=timestamp
-            )
+            opcode_refund_calculator = fork.opcode_refund_calculator()
             self._refund_ = 0
             for opcode in self.opcode_list:
                 self._refund_ += opcode_refund_calculator(opcode)
diff --git a/packages/testing/src/execution_testing/vm/opcodes.py b/packages/testing/src/execution_testing/vm/opcodes.py
index 79d35860dd4..49563887cb7 100644
--- a/packages/testing/src/execution_testing/vm/opcodes.py
+++ b/packages/testing/src/execution_testing/vm/opcodes.py
@@ -511,6 +511,156 @@ def __call__(self, *args_t: OpcodeCallArg, **kwargs: Any) -> Bytecode:
         return pre_opcode_bytecode + self
 
 
+def _exchange_encoder(*args: int | bytes) -> bytes:
+    """
+    Encoder for EXCHANGE opcode following encode_pair logic from EIP-8024.
+
+    Supports two modes:
+    1. bytes input: Returns verbatim (for testing invalid immediate bytes)
+    2. int input(s): Validates and encodes using encode_pair logic
+
+    Parameters
+    ----------
+    *args : int | bytes
+        Either bytes (returned verbatim) or 1-2 ints (encoded)
+
+    Returns
+    -------
+    bytes
+        The immediate byte for EXCHANGE opcode
+
+    """
+    # If bytes are provided, return them verbatim (for testing invalid ranges)
+    if len(args) == 1 and isinstance(args[0], bytes):
+        return args[0]
+
+    # If one int is provided, it's the immediate byte value directly
+    if len(args) == 1 and isinstance(args[0], int):
+        return int.to_bytes(args[0], 1, "big")
+
+    # If two ints are provided, use encode_pair logic from EIP-8024
+    if len(args) == 2:
+        n, m = args
+        if not isinstance(n, int) or not isinstance(m, int):
+            raise TypeError(
+                "EXCHANGE requires int arguments when using two parameters"
+            )
+
+        # encode_pair logic from EIP-8024
+        # n is first stack index, m is second (n < m, n + m <= 30)
+        if not (1 <= n < m and n + m <= 30):
+            raise ValueError(
+                f"EXCHANGE indices must satisfy: 1 <= n < m, "
+                f"n + m <= 30, got n={n}, m={m}"
+            )
+        if m <= 16:
+            q, r = n - 1, m - 1
+        else:
+            q, r = 29 - m, n - 1
+        k = 16 * q + r
+        imm = k ^ 143
+        return int.to_bytes(imm, 1, "big")
+
+    raise ValueError(f"EXCHANGE requires 1 or 2 arguments, got {len(args)}")
+
+
+def _dupn_swapn_encoder(*args: int | bytes) -> bytes:
+    """
+    Encoder for DUPN/SWAPN opcodes following encode_single logic from EIP-8024.
+
+    Supports two modes:
+    1. bytes input: Returns verbatim (for testing invalid immediate bytes)
+    2. int input: Validates and encodes using encode_single logic
+
+    Parameters
+    ----------
+    *args : int | bytes
+        Either bytes (returned verbatim) or a single int (encoded)
+
+    Returns
+    -------
+    bytes
+        The immediate byte for DUPN/SWAPN opcode
+
+    """
+    if len(args) != 1:
+        raise ValueError(
+            f"DUPN/SWAPN requires exactly 1 argument, got {len(args)}"
+        )
+
+    arg = args[0]
+
+    # If bytes are provided, return them verbatim (for testing invalid ranges)
+    if isinstance(arg, bytes):
+        return arg
+
+    # If int is provided, use encode_single logic from EIP-8024
+    if isinstance(arg, int):
+        # encode_single logic: n is stack index (17-235)
+        if not (17 <= arg <= 235):
+            raise ValueError(
+                f"DUPN/SWAPN index must be in range [17, 235], got {arg}"
+            )
+        imm = (arg + 111) % 256
+        return int.to_bytes(imm, 1, "big")
+
+    raise TypeError(
+        f"DUPN/SWAPN requires int or bytes argument, got {type(arg)}"
+    )
+
+
+def _swapn_stack_properties_modifier(data: bytes) -> tuple[int, int, int, int]:
+    n = int.from_bytes(data, "big")
+    if n <= 90 or n >= 128:
+        min_stack_height = (n + 145) % 256
+    else:
+        # Undefined behavior
+        min_stack_height = 0
+    return (
+        0,
+        0,
+        min_stack_height + 1,
+        min_stack_height + 1,
+    )
+
+
+def _dupn_stack_properties_modifier(data: bytes) -> tuple[int, int, int, int]:
+    n = int.from_bytes(data, "big")
+    if n <= 90 or n >= 128:
+        min_stack_height = (n + 145) % 256
+    else:
+        # Undefined behavior
+        min_stack_height = 0
+    return (
+        0,
+        1,
+        min_stack_height,
+        min_stack_height + 1,
+    )
+
+
+def _exchange_stack_properties_modifier(
+    data: bytes,
+) -> tuple[int, int, int, int]:
+    n = int.from_bytes(data, "big")
+    if n > 81 and n < 128:
+        # Undefined behavior
+        min_stack_height = 0
+    else:
+        k = n ^ 143
+        q, r = divmod(k, 16)
+        if q < r:
+            min_stack_height = max(q + 1, r + 1)
+        else:
+            min_stack_height = max(r + 1, 29 - q)
+    return (
+        0,
+        0,
+        min_stack_height + 1,
+        min_stack_height + 1,
+    )
+
+
 class Opcodes(Opcode, Enum):
     """
     Enum containing all known opcodes.
@@ -2225,6 +2375,36 @@ class Opcodes(Opcode, Enum):
     Source: [EIP-7516](https://eips.ethereum.org/EIPS/eip-7516)
     """
 
+    SLOTNUM = Opcode(0x4B, popped_stack_items=0, pushed_stack_items=1)
+    """
+    SLOTNUM() = slotNumber
+    ----
+
+    Description
+    ----
+    Returns the current slot number as provided by the consensus layer.
+    The slot number is passed from the consensus layer to the execution
+    layer through the engine API.
+
+    Inputs
+    ----
+    - None
+
+    Outputs
+    ----
+    - slotNumber: current slot number (uint64)
+
+    Fork
+    ----
+    Amsterdam
+
+    Gas
+    ----
+    2
+
+    Source: [EIP-7843](https://eips.ethereum.org/EIPS/eip-7843)
+    """
+
     POP = Opcode(0x50, popped_stack_items=1)
     """
     POP()
@@ -5080,6 +5260,118 @@ class Opcodes(Opcode, Enum):
     Source: [evm.codes/#A4](https://www.evm.codes/#A4)
     """
 
+    DUPN = Opcode(
+        0xE6,
+        pushed_stack_items=1,
+        data_portion_length=1,
+        data_portion_formatter=_dupn_swapn_encoder,
+        stack_properties_modifier=_dupn_stack_properties_modifier,
+    )
+    """
+    DUPN()
+    ----
+
+    Description
+    ----
+
+    - deduct 3 gas
+    - read uint8 operand imm
+    - n = imm + 1
+    - n'th (1-based) stack item is duplicated at the top of the stack
+    - Stack validation: stack_height >= n
+
+
+    Inputs
+    ----
+
+    Outputs
+    ----
+
+    Fork
+    ----
+    Amsterdam
+
+    Gas
+    ----
+    3
+
+    """
+
+    SWAPN = Opcode(
+        0xE7,
+        data_portion_length=1,
+        data_portion_formatter=_dupn_swapn_encoder,
+        stack_properties_modifier=_swapn_stack_properties_modifier,
+    )
+    """
+    SWAPN()
+    ----
+
+    Description
+    ----
+
+    - deduct 3 gas
+    - read uint8 operand imm
+    - n = imm + 1
+    - n + 1th stack item is swapped with the top stack item (1-based).
+    - Stack validation: stack_height >= n + 1
+
+
+    Inputs
+    ----
+
+    Outputs
+    ----
+
+    Fork
+    ----
+    Amsterdam
+
+    Gas
+    ----
+    3
+
+    """
+
+    EXCHANGE = Opcode(
+        0xE8,
+        data_portion_length=1,
+        data_portion_formatter=_exchange_encoder,
+        stack_properties_modifier=_exchange_stack_properties_modifier,
+    )
+    """
+    EXCHANGE[x, y]
+    ----
+
+    Description
+    ----
+    Exchanges two stack positions.  Two nybbles, n is high 4 bits + 1,
+    then  m is 4 low bits + 1.
+    Exchanges the n+1'th item with the n + m + 1 item.
+
+    Inputs x and y when the opcode is used as `EXCHANGE[x, y]`, are equal to:
+    - x = n + 1
+    - y = n + m + 1
+    Which each equals to 1-based stack positions swapped.
+
+    Inputs
+    ----
+    n + m + 1, or ((imm >> 4) + (imm &0x0F) + 3) from the raw immediate,
+
+    Outputs
+    ----
+    n + m + 1, or ((imm >> 4) + (imm &0x0F) + 3) from the raw immediate,
+
+    Fork
+    ----
+    Amsterdam
+
+    Gas
+    ----
+    3
+
+    """
+
     CREATE = Opcode(
         0xF0,
         popped_stack_items=3,
@@ -5158,6 +5450,7 @@ class Opcodes(Opcode, Enum):
             "old_memory_size": 0,
             "delegated_address": False,
             "delegated_address_warm": False,
+            "inner_call_cost": 0,
         },
     )
     """
@@ -5236,6 +5529,7 @@ class Opcodes(Opcode, Enum):
             "old_memory_size": 0,
             "delegated_address": False,
             "delegated_address_warm": False,
+            "inner_call_cost": 0,
         },
     )
     """
@@ -5361,6 +5655,7 @@ class Opcodes(Opcode, Enum):
             "old_memory_size": 0,
             "delegated_address": False,
             "delegated_address_warm": False,
+            "inner_call_cost": 0,
         },
     )
     """
@@ -5491,6 +5786,7 @@ class Opcodes(Opcode, Enum):
             "old_memory_size": 0,
             "delegated_address": False,
             "delegated_address_warm": False,
+            "inner_call_cost": 0,
         },
     )
     """
diff --git a/pyproject.toml b/pyproject.toml
index 52646f9de37..13acf161f5b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,8 +24,8 @@ dependencies = [
     "coincurve>=20,<21",
     "typing_extensions>=4.4",
     "py-ecc>=8.0.0b2,<9",
-    "ethereum-types>=0.3.0,<0.4",
-    "ethereum-rlp>=0.1.5,<0.2",
+    "ethereum-types>=0.4.1,<0.5",
+    "ethereum-rlp>=0.1.6,<0.2",
     "cryptography>=45.0.1,<46",
     "platformdirs>=4.2,<5",
     "libcst>=1.8,<2",
@@ -215,7 +215,7 @@ test = [
 ]
 lint = [
     "codespell==2.4.1",
-    "mypy==1.17.0",
+    "mypy==1.20.0",
     "ruff==0.13.2",
     "vulture==2.14.0",
     "types-requests>=2.31,<2.33",
@@ -226,7 +226,7 @@ actionlint = [
     "shellcheck-py>=0.10",
 ]
 doc = [
-    "docc>=0.4.0,<0.5.0",
+    "docc>=0.6.1,<0.7.0",
     "fladrif>=0.2.0,<0.3.0",
     "mistletoe>=1.5.0,<2",
 ]
@@ -272,7 +272,9 @@ ethereum-spec-evm = "ethereum_spec_tools.evm_tools:main"
 whitelist = "ethereum_spec_tools.whitelist:main"
 
 [project.entry-points."docc.plugins"]
+"ethereum_spec_tools.docc.listing" = "ethereum_spec_tools.docc:EthereumListingDiscover"
 "ethereum_spec_tools.docc.discover" = "ethereum_spec_tools.docc:EthereumDiscover"
+"ethereum_spec_tools.docc.python" = "ethereum_spec_tools.docc:EthereumPythonDiscover"
 "ethereum_spec_tools.docc.build" = "ethereum_spec_tools.docc:EthereumBuilder"
 "ethereum_spec_tools.docc.fix-indexes" = "ethereum_spec_tools.docc:FixIndexTransform"
 "ethereum_spec_tools.docc.minimize-diffs" = "ethereum_spec_tools.docc:MinimizeDiffsTransform"
@@ -290,17 +292,21 @@ markers = [
     "json_blockchain_tests: marks tests as json_blockchain_tests (deselect with '-m \"not json_blockchain_tests\"')",
     "json_state_tests: marks tests as json_state_tests (deselect with '-m \"not json_state_tests\"')",
     "vm_test: marks tests as vm_test (deselect with '-m \"not vm_test\"')",
-    "json_loader: marks tests as minimal set for json_loader coverage (select with '-m json_loader')",
+    "eels_base_coverage: Minimized subset selected to preserve high EELS line-coverage parity (select with '-m eels_base_coverage')",
+    "repricing: marks tests for gas repricing analysis",
+    "stub_parametrize: parametrize test from address stubs by prefix",
 ]
 
 [tool.coverage.run]
 omit = [
-    "*/ethereum/*_glacier/*",
-    "*/ethereum/dao_fork/*",
+    "*/ethereum/forks/*_glacier/*",
+    "*/ethereum/forks/dao_fork/*",
+    "*/ethereum/forks/bpo*/*",
 ]
 
 [tool.docc]
 context = [
+    "docc.listing.context",
     "docc.references.context",
     "docc.search.context",
     "docc.html.context",
@@ -308,9 +314,9 @@ context = [
 discovery = [
     "docc.search.discover",
     "docc.html.discover",
-    "docc.python.discover",
+    "ethereum_spec_tools.docc.python",
     "ethereum_spec_tools.docc.discover",
-    "docc.listing.discover",
+    "ethereum_spec_tools.docc.listing",
     "docc.files.discover",
 ]
 build = [
@@ -321,6 +327,7 @@ build = [
     "docc.resources.build",
 ]
 transform = [
+    "docc.listing.transform",
     "docc.python.transform",
     "docc.verbatim.transform",
     "docc.mistletoe.transform",
@@ -337,7 +344,7 @@ excluded_references = [
     "ethereum_spec_tools.lint.lints",   # This is a namespace package.
 ]
 
-[tool.docc.plugins."docc.python.discover"]
+[tool.docc.plugins."ethereum_spec_tools.docc.python"]
 paths = [
     "src",
 ]
@@ -357,7 +364,7 @@ files = [
 ]
 
 [tool.docc.output]
-path = "api_docs"
+path = ".just/docs-spec"
 extension = ".html"
 
 [tool.vulture]
@@ -421,6 +428,7 @@ ignore = [
 "tests/*" = ["ARG001"]
 "vulture_whitelist.py" = [
     "B018",  # Useless expression (intentional for Vulture whitelisting)
+    "E402",  # Module-level imports throughout file (needed for whitelisting)
     "F403",  # Star imports needed for whitelisting
     "F405",  # Undefined names from star imports
 ]
@@ -434,8 +442,12 @@ builtin = "clear,code,usage"
 # Version control & tooling, build artifacts, data files, test fixtures, temp files, lock files
 skip = [
     ".devcontainer",
+    # Local AI memory and notes files (gitignored, may exist as symlinks)
+    "CLAUDE.local.md",
+    ".mb",
+    "mb",
     ".git",
-    ".tox",
+    ".just",
     ".venv",
     ".ruff_cache",
     ".mypy_cache",
@@ -483,7 +495,7 @@ exclude = [
     "^\\.git/",
     "^\\.pytest_cache/",
     "^\\.ruff_cache/",
-    "^\\.tox/",
+    "^\\.just/",
     "^\\.venv/",
     "^\\.vscode/",
     "^fixtures/",
diff --git a/scripts/compare_fixtures.py b/scripts/compare_fixtures.py
index d59d5166033..dce70970448 100644
--- a/scripts/compare_fixtures.py
+++ b/scripts/compare_fixtures.py
@@ -1,18 +1,17 @@
 #!/usr/bin/env python3
 """
-Compare two fixture directories by post-state hashes.
+Compare two fixture directories by full JSON content.
 
-Matches fixtures across directories with different path layouts and
-naming conventions:
-  compiled:  state_tests/for_{fork}/static/state_tests/{cat}/{Name}.json
-  generated: state_tests/for_{fork}/ported_static/{cat}/{name}/{name}.json
+Match fixtures across directories with different path layouts and naming
+conventions. Fixtures are paired by (fork, normalized_name), ignoring
+category directories since the same test can live in different categories
+across static-fill and ported Python tests.
 
-Fixtures are paired by (category, normalized_name) across all fork
-directories.  Names are normalized via the same transforms as
-fixture_to_python.py so that ``addNonConst`` matches ``add_non_const``.
-Post-state hashes are compared only for forks present on both sides.
+When multiple files match the same (fork, name), all combinations are
+tried to find a content match.
 
-Unmatched fixtures (present on one side only) are treated as errors.
+The ``_info`` field is stripped before comparison (it contains source
+paths and tool metadata that legitimately differ).
 
 Usage:
     python scripts/compare_fixtures.py LEFT RIGHT
@@ -25,107 +24,65 @@
 import json
 import re
 import sys
-from collections import defaultdict
 from pathlib import Path
 
-# Key = (category, normalized_name)
-FixtureKey = tuple[str, str]
-
-# Category directories start with these prefixes (case-sensitive).
-# "st" is followed by an uppercase letter (stBugs, stCallCodes, ...)
-# "vm" and "VM" are followed by anything (vmArith, VMTests, ...)
-_CATEGORY_RE = re.compile(r"^(st[A-Z]|vm|VM)")
-
 
 def _normalize_name(name: str) -> str:
     """
     Normalize a fixture name for comparison.
 
-    Apply the same transforms as filler_name_to_test_name minus the
-    ``test_`` prefix:  camelCase -> snake_case, replace special chars,
-    collapse underscores.
+    CamelCase -> snake_case, replace special chars, collapse underscores.
     """
-    # CamelCase -> snake_case
     s = re.sub(r"([a-z0-9])([A-Z])", r"\1_\2", name)
     s = re.sub(r"([A-Z]+)([A-Z][a-z])", r"\1_\2", s)
     s = s.lower()
-    # Replace + and - with descriptive words before general cleanup
-    s = s.replace("+", "_plus_")
-    s = s.replace("-", "_minus_")
-    # Replace remaining non-alphanumeric (except _) with _
-    s = re.sub(r"[^a-z0-9_]", "_", s)
-    # Collapse multiple underscores
-    s = re.sub(r"_+", "_", s)
-    return s.strip("_")
+    s = s.replace("+", "plus").replace("-", "minus")
+    s = re.sub(r"[^a-z0-9]", "", s)
+    if s.startswith("test_"):
+        s = s[5:]
+    return s
 
 
-def _parse_entry(path: Path, root: Path) -> tuple[FixtureKey, str] | None:
-    """
-    Extract ((category, normalized_name), fork) from a fixture path.
+def _strip_info(obj: object) -> None:
+    """Recursively remove all '_info' keys."""
+    if isinstance(obj, dict):
+        obj.pop("_info", None)
+        for v in obj.values():
+            _strip_info(v)
+    elif isinstance(obj, list):
+        for v in obj:
+            _strip_info(v)
 
-    Return None if the path doesn't match a recognizable layout.
-    """
-    parts = path.relative_to(root).parts
-
-    # Find fork directory
-    fork = next((p for p in parts if p.startswith("for_")), None)
-    if fork is None:
-        return None
-
-    # Everything between fork and the filename
-    fork_pos = parts.index(fork)
-    between = parts[fork_pos + 1 : -1]
-
-    # Walk backwards to find the category dir
-    category = None
-    for part in reversed(between):
-        if _CATEGORY_RE.match(part):
-            category = part
-            break
-
-    if category is None:
-        return None
-
-    name = _normalize_name(path.stem)
-    # Strip leading test_ prefix so compiled "AddNonConst" and filled
-    # "test_add_non_const" both normalize to "add_non_const".
-    if name.startswith("test_"):
-        name = name[5:]
-    return ((category, name), fork)
-
-
-def _post_hashes(path: Path) -> set[tuple[str, str]]:
-    """Extract the set of (fork, hash) from all post entries."""
-    hashes: set[tuple[str, str]] = set()
-    for _key, test in json.loads(path.read_text()).items():
-        for fork, entries in test.get("post", {}).items():
-            for entry in entries:
-                h = entry.get("hash", "")
-                if h:
-                    hashes.add((fork, h))
-    return hashes
-
-
-def _index(
-    root: Path,
-) -> dict[FixtureKey, dict[str, Path]]:
+
+def _canonical_values(path: Path) -> list[str]:
+    """Load fixture, strip _info, return sorted canonical values."""
+    with open(path) as f:
+        data = json.load(f)
+    _strip_info(data)
+    return sorted(json.dumps(v, sort_keys=True) for v in data.values())
+
+
+def _index(root: Path) -> dict[tuple[str, str], list[Path]]:
     """
-    Index fixture JSONs by (category, normalized_name).
+    Index state_test fixtures by (fork, normalized_name).
 
-    Return {key: {fork: path, ...}} collecting all fork variants.
+    Return {(fork, name): [paths]} — multiple paths per key are
+    possible when the same test name exists in different categories.
     """
-    idx: dict[FixtureKey, dict[str, Path]] = defaultdict(dict)
+    idx: dict[tuple[str, str], list[Path]] = {}
     for p in root.rglob("*.json"):
         if ".meta" in p.parts:
             continue
-        result = _parse_entry(p, root)
-        if result is None:
+        rel = str(p.relative_to(root))
+        if not rel.startswith("state_tests/"):
+            continue
+        m = re.search(r"for_(\w+)/", rel)
+        if not m:
             continue
-        key, fork = result
-        # Keep first file per (key, fork)
-        if fork not in idx[key]:
-            idx[key][fork] = p
-    return dict(idx)
+        fork = m.group(1)
+        name = _normalize_name(p.stem)
+        idx.setdefault((fork, name), []).append(p)
+    return idx
 
 
 def compare(
@@ -134,102 +91,66 @@ def compare(
     *,
     show_missing: bool = False,
 ) -> int:
-    """Compare two fixture directories. Return number of errors."""
+    """Compare two fixture directories by full JSON content."""
     left_idx = _index(left)
     right_idx = _index(right)
 
-    common = sorted(set(left_idx) & set(right_idx))
+    common_keys = sorted(set(left_idx) & set(right_idx))
     only_left = sorted(set(left_idx) - set(right_idx))
     only_right = sorted(set(right_idx) - set(left_idx))
 
-    mismatches = 0
-    no_common_fork = 0
-
-    for key in common:
-        l_forks = left_idx[key]
-        r_forks = right_idx[key]
-        shared_forks = set(l_forks) & set(r_forks)
-
-        if not shared_forks:
-            # No common fork dirs — compare post hashes by fork name
-            # inside the JSON (the JSON contains per-fork post entries
-            # regardless of which for_X directory it sits in).
-            lh: set[tuple[str, str]] = set()
-            for p in l_forks.values():
-                lh |= _post_hashes(p)
-            rh: set[tuple[str, str]] = set()
-            for p in r_forks.values():
-                rh |= _post_hashes(p)
-
-            # Find forks present in both JSONs
-            l_fork_names = {f for f, _ in lh}
-            r_fork_names = {f for f, _ in rh}
-            common_forks = l_fork_names & r_fork_names
-
-            if not common_forks:
-                no_common_fork += 1
-                continue
-
-            lh_f = {(f, h) for f, h in lh if f in common_forks}
-            rh_f = {(f, h) for f, h in rh if f in common_forks}
-
-            if lh_f != rh_f:
-                mismatches += 1
-                print(f"MISMATCH {'/'.join(key)} (cross-fork)")
-                diff_l = lh_f - rh_f
-                diff_r = rh_f - lh_f
-                print(
-                    f"  {len(diff_l)} only in left,"
-                    f" {len(diff_r)} only in right"
-                )
+    matched = 0
+    mismatched = 0
+    mismatch_details: list[str] = []
+
+    for key in common_keys:
+        l_paths = left_idx[key]
+        r_paths = right_idx[key]
+
+        # Try all path combinations to find a content match
+        found = False
+        for lp in l_paths:
+            for rp in r_paths:
+                try:
+                    if _canonical_values(lp) == _canonical_values(rp):
+                        found = True
+                        break
+                except Exception:
+                    pass
+            if found:
+                break
+
+        if found:
+            matched += 1
         else:
-            # Compare within shared fork directories
-            for fork in sorted(shared_forks):
-                lh_s = _post_hashes(l_forks[fork])
-                rh_s = _post_hashes(r_forks[fork])
-                if lh_s != rh_s:
-                    mismatches += 1
-                    print(f"MISMATCH {'/'.join(key)} ({fork})")
-                    print(f"  left:  {l_forks[fork]}")
-                    print(f"  right: {r_forks[fork]}")
-                    diff_l = lh_s - rh_s
-                    diff_r = rh_s - lh_s
-                    print(
-                        f"  {len(diff_l)} only in left,"
-                        f" {len(diff_r)} only in right"
-                    )
-
-    total = len(common)
-    matched = total - mismatches - no_common_fork
-    # Mismatches and left-only (missing from generated) are errors.
-    # Right-only (extra generated, e.g. fork-specific fillers) are
-    # warnings — the generated side may legitimately have tests that
-    # the compiled reference lacks.
-    errors = mismatches + len(only_left)
-
-    print()
-    print(f"Paired:     {total}")
-    print(f"Matched:    {matched}/{total}")
-    if mismatches:
-        print(f"Mismatched: {mismatches}")
-    if no_common_fork:
-        print(f"No common fork to compare: {no_common_fork}")
-    if only_left:
-        print(f"Left only:  {len(only_left)}  (ERROR)")
-    if only_right:
-        print(f"Right only: {len(only_right)}")
+            mismatched += 1
+            fork, name = key
+            mismatch_details.append(f"{fork}/{name}")
+
+    # Left-only fixtures are errors (missing from right).
+    errors = mismatched + len(only_left)
+
+    print(f"Paired:     {len(common_keys)}")
+    print(f"Matched:    {matched}/{len(common_keys)}")
+    if mismatched:
+        print(f"Mismatched: {mismatched}")
+    print(f"Left only:  {len(only_left)}")
+    print(f"Right only: {len(only_right)}")
 
     if errors:
         print(f"\nERRORS: {errors}")
     else:
         print("\nOK")
 
-    if show_missing and only_left:
+    if mismatch_details:
+        print(f"\n-- Mismatched ({len(mismatch_details)}) --")
+        for d in mismatch_details:
+            print(f"  {d}")
+
+    if show_missing:
         print(f"\n-- Only in {left} ({len(only_left)}) --")
         for key in only_left:
             print(f"  {'/'.join(key)}")
-
-    if show_missing and only_right:
         print(f"\n-- Only in {right} ({len(only_right)}) --")
         for key in only_right:
             print(f"  {'/'.join(key)}")
@@ -238,16 +159,19 @@ def compare(
 
 
 def main() -> None:
-    """Compare two fixture directories by post-state hashes."""
+    """Compare two fixture directories by full JSON content."""
     parser = argparse.ArgumentParser(
-        description="Compare fixture directories by post-state hashes.",
+        description=(
+            "Compare fixture directories by full JSON content "
+            "(stripping _info, sorting keys)."
+        ),
     )
     parser.add_argument("left", type=Path)
     parser.add_argument("right", type=Path)
     parser.add_argument(
         "--show-missing",
         action="store_true",
-        help="List fixtures that exist in only one directory",
+        help="List fixtures present in only one directory",
     )
     args = parser.parse_args()
     result = compare(args.left, args.right, show_missing=args.show_missing)
diff --git a/scripts/filler_to_python/__init__.py b/scripts/filler_to_python/__init__.py
new file mode 100644
index 00000000000..359373d411c
--- /dev/null
+++ b/scripts/filler_to_python/__init__.py
@@ -0,0 +1 @@
+"""Convert static filler YAML/JSON to Python test files."""
diff --git a/scripts/filler_to_python/__main__.py b/scripts/filler_to_python/__main__.py
new file mode 100644
index 00000000000..83b13924c95
--- /dev/null
+++ b/scripts/filler_to_python/__main__.py
@@ -0,0 +1,302 @@
+"""CLI entry point: load -> analyze -> render -> format -> write."""
+
+from __future__ import annotations
+
+import argparse
+import ast
+import logging
+import os
+import re
+import subprocess
+import sys
+from pathlib import Path
+
+from .analyzer import analyze, load_filler
+from .render import render_test
+
+logger = logging.getLogger(__name__)
+
+MANUALLY_ENHANCED_TAG = "@manually-enhanced"
+
+
+def _has_manually_enhanced_tag(file_path: Path) -> bool:
+    """Check if a file has @manually-enhanced in its module docstring."""
+    try:
+        source = file_path.read_text()
+        tree = ast.parse(source)
+    except (OSError, SyntaxError):
+        return False
+    docstring = ast.get_docstring(tree)
+    if docstring is None:
+        return False
+    return MANUALLY_ENHANCED_TAG in docstring
+
+
+def post_format(source: str) -> str:
+    """Format generated Python source with ruff."""
+    # ruff format
+    try:
+        result = subprocess.run(
+            ["ruff", "format", "--stdin-filename", "test.py", "-"],
+            input=source,
+            capture_output=True,
+            text=True,
+            env={**os.environ, "RUST_MIN_STACK": "8388608"},
+        )
+        if result.returncode == 0:
+            source = result.stdout
+    except FileNotFoundError:
+        pass  # ruff not installed
+
+    # ruff check --fix (accept output even with remaining unfixable issues)
+    try:
+        result = subprocess.run(
+            [
+                "ruff",
+                "check",
+                "--fix",
+                "--stdin-filename",
+                "test.py",
+                "-",
+            ],
+            input=source,
+            capture_output=True,
+            text=True,
+            env={**os.environ, "RUST_MIN_STACK": "8388608"},
+        )
+        if result.stdout:
+            source = result.stdout
+    except FileNotFoundError:
+        pass
+
+    # Add # noqa for generated code issues that can't be auto-fixed.
+    # Track docstring boundaries to avoid adding noqa inside docstrings.
+    lines = source.split("\n")
+    fixed_lines: list[str] = []
+    in_docstring = False
+    for line in lines:
+        stripped = line.rstrip()
+        if '"""' in stripped:
+            count = stripped.count('"""')
+            if count == 1:
+                in_docstring = not in_docstring
+            # count == 2 means open+close on same line, no state change
+        if in_docstring:
+            fixed_lines.append(line)
+            continue
+        noqa_parts: list[str] = []
+        if len(stripped) > 79:
+            noqa_parts.append("E501")
+        # F841: deploy_contract assigns to variables used in expect dicts
+        if "= pre.deploy_contract(" in stripped:
+            noqa_parts.append("F841")
+        if noqa_parts and "# noqa" not in stripped:
+            codes = ", ".join(noqa_parts)
+            fixed_lines.append(f"{stripped}  # noqa: {codes}")
+        else:
+            fixed_lines.append(line)
+    source = "\n".join(fixed_lines)
+
+    return source
+
+
+def _filler_name_to_filename(stem: str) -> str:
+    """Convert filler stem to output filename."""
+    name = re.sub(r"Filler$", "", stem)
+    # camel_to_snake
+    s = re.sub(r"([a-z0-9])([A-Z])", r"\1_\2", name)
+    s = re.sub(r"([A-Z]+)([A-Z][a-z])", r"\1_\2", s)
+    result = s.lower()
+    result = result.replace("+", "_plus_")
+    result = result.replace("-", "_minus_")
+    result = re.sub(r"[^a-z0-9_]", "_", result)
+    result = re.sub(r"_+", "_", result)
+    return "test_" + result.strip("_") + ".py"
+
+
+def discover_fillers(fillers_dir: Path) -> list[Path]:
+    """Walk a directory for *Filler.yml and *Filler.json files."""
+    found: list[Path] = []
+    for root, _dirs, files in os.walk(fillers_dir):
+        for f in sorted(files):
+            if f.endswith("Filler.yml") or f.endswith("Filler.json"):
+                found.append(Path(root) / f)
+    return found
+
+
+def process_single_filler(
+    filler_path: Path,
+    fillers_base: Path,
+    output_dir: Path,
+    dry_run: bool = False,
+) -> str:
+    """
+    Process one filler file.
+
+    Return "ok", "fail", "warn", or "skip".
+    """
+    try:
+        # Relative path for the generated test's ported_from marker
+        try:
+            rel_path = filler_path.relative_to(fillers_base.parent)
+        except ValueError:
+            rel_path = filler_path
+
+        # Skip files that have been manually enhanced
+        category = rel_path.parts[-2] if len(rel_path.parts) >= 2 else ""
+        out_file = (
+            output_dir / category / _filler_name_to_filename(filler_path.stem)
+        )
+        if out_file.exists() and _has_manually_enhanced_tag(out_file):
+            logger.info(
+                "SKIP: %s (existing file has %s tag)",
+                out_file,
+                MANUALLY_ENHANCED_TAG,
+            )
+            return "skip"
+
+        # Load
+        test_name, model = load_filler(filler_path)
+
+        # Analyze
+        ir = analyze(test_name, model, rel_path)
+
+        # Render
+        source = render_test(ir)
+
+        # Verify syntax
+        try:
+            ast.parse(source)
+        except SyntaxError as e:
+            logger.error(
+                "Syntax error in generated code for %s: %s",
+                filler_path,
+                e,
+            )
+            return "fail"
+
+        # Format
+        source = post_format(source)
+
+        if dry_run:
+            print(f"[DRY-RUN] {filler_path} -> {ir.test_name}")
+            return "ok"
+
+        # Write
+        out_file.parent.mkdir(parents=True, exist_ok=True)
+
+        # Write __init__.py if needed
+        init_file = out_file.parent / "__init__.py"
+        if not init_file.exists():
+            init_file.write_text(
+                f'"""Ported static tests: {category}."""  # noqa: N999\n'
+            )
+
+        out_file.write_text(source)
+        logger.info("OK: %s -> %s", filler_path.name, out_file)
+        return "ok"
+
+    except Exception as e:
+        logger.error("FAIL: %s: %s", filler_path, e)
+        if logger.isEnabledFor(logging.DEBUG):
+            logger.debug("Traceback:", exc_info=True)
+        return "fail"
+
+
+def main() -> None:
+    """Run the filler-to-python pipeline."""
+    parser = argparse.ArgumentParser(
+        description="Convert static filler YAML/JSON to Python test files."
+    )
+    parser.add_argument(
+        "--fillers",
+        type=Path,
+        required=True,
+        help="Directory containing *Filler.yml/*.json files.",
+    )
+    parser.add_argument(
+        "--output",
+        type=Path,
+        required=True,
+        help="Output directory for generated .py test files.",
+    )
+    parser.add_argument(
+        "--single",
+        type=Path,
+        default=None,
+        help="Process a single filler file instead of the whole directory.",
+    )
+    parser.add_argument(
+        "--filter",
+        type=Path,
+        default=None,
+        help="Only convert fillers listed in this file (one path per line).",
+    )
+    parser.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="Parse and analyze but don't write files.",
+    )
+    parser.add_argument(
+        "-v",
+        "--verbose",
+        action="store_true",
+        help="Enable verbose logging.",
+    )
+
+    args = parser.parse_args()
+
+    logging.basicConfig(
+        level=logging.DEBUG if args.verbose else logging.INFO,
+        format="%(levelname)s: %(message)s",
+    )
+
+    if args.single:
+        filler_paths = [args.single]
+    else:
+        if not args.fillers.is_dir():
+            logger.error("--fillers must be a directory: %s", args.fillers)
+            sys.exit(1)
+        filler_paths = discover_fillers(args.fillers)
+
+    # Apply filter
+    if args.filter:
+        allowed = set()
+        for line in args.filter.read_text().splitlines():
+            line = line.strip()
+            if line and not line.startswith("#"):
+                allowed.add(line)
+        filler_paths = [
+            p for p in filler_paths if str(p) in allowed or p.name in allowed
+        ]
+
+    if not filler_paths:
+        logger.warning("No filler files found.")
+        sys.exit(0)
+
+    logger.info("Processing %d filler(s)...", len(filler_paths))
+
+    counts = {"ok": 0, "fail": 0, "warn": 0, "skip": 0}
+    for filler_path in filler_paths:
+        status = process_single_filler(
+            filler_path,
+            args.fillers,
+            args.output,
+            dry_run=args.dry_run,
+        )
+        counts[status] += 1
+
+    # Summary
+    total = sum(counts.values())
+    skip_msg = f", {counts['skip']} skipped" if counts["skip"] else ""
+    print(
+        f"\nDone: {counts['ok']}/{total} OK, "
+        f"{counts['fail']} failed, {counts['warn']} warnings"
+        f"{skip_msg}"
+    )
+    if counts["fail"] > 0:
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/filler_to_python/analyzer.py b/scripts/filler_to_python/analyzer.py
new file mode 100644
index 00000000000..62a90fcdba1
--- /dev/null
+++ b/scripts/filler_to_python/analyzer.py
@@ -0,0 +1,1940 @@
+"""Analyze a parsed filler model and produce codegen IR."""
+
+from __future__ import annotations
+
+import json
+import logging
+import re
+import warnings
+from pathlib import Path
+from typing import Any
+
+import yaml
+from execution_testing.base_types import Address
+from execution_testing.base_types import Hash as EHash
+from execution_testing.cli.evm_bytes import process_evm_bytes_string
+from execution_testing.exceptions import TransactionException
+from execution_testing.forks import get_forks
+from execution_testing.specs import StateStaticTest
+from execution_testing.specs.static_state.common import Tag, TagDict
+from execution_testing.specs.static_state.common.tags import (
+    ContractTag,
+    SenderKeyTag,
+    SenderTag,
+)
+from execution_testing.specs.static_state.expect_section import (
+    ForkSet,
+)
+from execution_testing.specs.static_state.general_transaction import (
+    GeneralTransactionInFiller,
+)
+from execution_testing.test_types import (
+    EOA,
+    Alloc,
+    compute_create_address,
+    eoa_from_hash,
+)
+from execution_testing.vm import Op
+
+from .ir import (
+    AccessListEntryIR,
+    AccountAssertionIR,
+    AccountIR,
+    EnvironmentIR,
+    ExpectEntryIR,
+    ImportsIR,
+    IntermediateTestModel,
+    ParameterCaseIR,
+    SenderIR,
+    TransactionIR,
+)
+
+try:
+    from execution_testing.cli.pytest_commands.plugins.filler.static_filler import (  # noqa: E501
+        NoIntResolver,
+    )
+except ImportError:
+    import yaml as _yaml
+
+    class NoIntResolver(_yaml.SafeLoader):  # type: ignore[no-redef]
+        """Fallback NoIntResolver."""
+
+        pass
+
+
+logger = logging.getLogger(__name__)
+
+MAX_BYTECODE_OP_SIZE = 24576
+SLOW_CATEGORIES = {
+    "stQuadraticComplexityTest",
+    "stStaticCall",
+    "stTimeConsuming",
+}
+
+# Ported tests (relative to ``tests/ported_static/``) that must keep
+# hardcoded addresses. These do not converge under ``exact-no-stack``
+# with dynamic addresses because of patterns the analyzer's heuristics
+# cannot cover:
+#
+# - EIP-2929 warm/cold gas accounting that depends on which addresses
+#   are warm at call time (baseline-specific layout).
+# - CREATE2 collision semantics that depend on specific pre-state
+#   addresses colliding with computed CREATE2 targets.
+# - Keccak-derived storage keys (Solidity mappings) baked into the
+#   pre-state on specific sender / contract addresses.
+# - Structural transaction rejections sensitive to exact pre-state
+#   collisions (empty-but-code, init-colliding-with-non-empty).
+# - Edge cases where dynamic allocation randomly picks an address
+#   with a leading zero byte, changing PUSH size.
+# - Tag resolution mismatches (analyzer resolves <contract:0x…hint>
+#   to a fresh deterministic address, but baseline used the hint).
+#
+# Treat this list as an allowlist of "we've accepted the divergence
+# here; don't try to make it dynamic". See trace-divergences.md for
+# the per-file rationale.
+FORCE_HARDCODED_TESTS: set[str] = {
+    # GAS_ONLY (29) — EIP-2929 warm/cold access cost differences
+    "stCallCodes/test_callcode_dynamic_code.py",
+    "stCallCodes/test_callcode_dynamic_code2_self_call.py",
+    "stCallCreateCallCodeTest/test_call1024_pre_calls.py",
+    "stCallCreateCallCodeTest/test_contract_creation_make_call_that_ask_more_gas_then_transaction_provided.py",  # noqa: E501
+    "stCreate2/test_returndatacopy_following_create.py",
+    "stCreateTest/test_create_collision_to_empty2.py",
+    "stCreateTest/test_create_transaction_refund_ef.py",
+    "stDelegatecallTestHomestead/test_call1024_pre_calls.py",
+    "stDelegatecallTestHomestead/test_delegatecode_dynamic_code2_self_call.py",  # noqa: E501
+    "stEIP150singleCodeGasPrices/test_eip2929_oog.py",
+    "stEIP2930/test_manual_create.py",
+    "stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas_fail.py",
+    "stEIP3855_push0/test_push0.py",
+    "stEIP3855_push0/test_push0_gas2.py",
+    "stHomesteadSpecific/test_contract_creation_oo_gdont_leave_empty_contract_via_transaction.py",  # noqa: E501
+    "stRandom/test_random_statetest282.py",
+    "stRandom/test_random_statetest287.py",
+    "stRandom/test_random_statetest384.py",
+    "stRandom2/test_random_statetest401.py",
+    "stRandom2/test_random_statetest508.py",
+    "stRevertTest/test_cost_revert.py",
+    "stRevertTest/test_revert_opcode_in_calls_on_non_empty_return_data.py",
+    "stRevertTest/test_revert_opcode_multiple_sub_calls.py",
+    "stRevertTest/test_revert_precompiled_touch_paris.py",
+    "stStackTests/test_underflow_test.py",
+    "stSystemOperationsTest/test_suicide_caller_addres_too_big_left.py",
+    "vmBitwiseLogicOperation/test_byte.py",
+    "vmIOandFlowOperations/test_jump_to_push.py",
+    "vmIOandFlowOperations/test_jumpi.py",
+    # EXECUTION_PATH_DIVERGED — remaining 8 (Categories B, C, D, E)
+    "stCreate2/test_create2_suicide.py",
+    "stCreate2/test_create2collision_code2.py",
+    "stCreate2/test_create2collision_selfdestructed2.py",
+    "stDelegatecallTestHomestead/test_delegatecall_in_initcode_to_existing_contract_oog.py",  # noqa: E501
+    "stLogTests/test_log1_non_empty_mem.py",
+    "stSystemOperationsTest/test_double_selfdestruct_touch_paris.py",
+    "stWalletTest/test_multi_owned_change_requirement_to1.py",
+    "stWalletTest/test_multi_owned_revoke_nothing.py",
+    # EXECUTION_PATH_DIVERGED + GAS (5)
+    "stCreate2/test_create2collision_code.py",
+    "stCreate2/test_create2collision_nonce.py",
+    "stCreate2/test_create2collision_selfdestructed.py",
+    "stCreate2/test_create2collision_selfdestructed_revert.py",
+    "stSStoreTest/test_sstore_gas_left.py",
+    # OUTPUT_DIFFERS — remaining 2 (Categories F, H)
+    "stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py",
+    "stWalletTest/test_multi_owned_is_owner_true.py",
+    # Precompile-as-EOA — tests fund precompile addresses as EOAs,
+    # then check nonce after calling the precompile. Dynamic EOAs
+    # land at different addresses than the precompile targets.
+    # STRUCTURAL — CREATE collision / EIP-3607 rejection behaviour.
+    # With dynamic addresses the collision doesn't happen, so the tx
+    # runs instead of being rejected → traces appear where baseline
+    # had none.
+    "stCreateTest/test_transaction_collision_to_empty_but_code.py",
+    "stCreateTest/test_transaction_collision_to_empty_but_nonce.py",
+    "stEIP3607/test_init_colliding_with_non_empty_account.py",
+    "stEIP3607/test_transaction_colliding_with_non_empty_account_calls.py",
+    "stEIP3607/test_transaction_colliding_with_non_empty_account_calls_itself.py",
+    "stEIP3607/test_transaction_colliding_with_non_empty_account_init_paris.py",
+    "stEIP3607/test_transaction_colliding_with_non_empty_account_send_paris.py",
+    # Remaining CI assertion failures — gas measurements, keccak storage,
+    # collision semantics, address-in-code, precompile interactions, etc.
+    # that are fundamentally incompatible with dynamic addresses.
+    "stBadOpcode/test_measure_gas.py",
+    "stBadOpcode/test_operation_diff_gas.py",
+    "stCallCodes/test_callcode_in_initcode_to_existing_contract_with_value_transfer.py",
+    "stCreate2/test_create2collision_balance.py",
+    "stCreate2/test_revert_depth_create_address_collision.py",
+    "stCreate2/test_revert_depth_create_address_collision_berlin.py",
+    "stCreateTest/test_create_empty_contract_with_storage.py",
+    "stCreateTest/test_transaction_collision_to_empty2.py",
+    "stDelegatecallTestHomestead/test_delegatecall_in_initcode_to_existing_contract.py",
+    "stEIP1153_transientStorage/test_trans_storage_ok.py",
+    "stEIP158Specific/test_call_one_v_call_suicide2.py",
+    "stInitCodeTest/test_out_of_gas_prefunded_contract_creation.py",
+    "stNonZeroCallsTest/test_non_zero_value_call_to_one_storage_key_paris.py",
+    "stNonZeroCallsTest/test_non_zero_value_callcode_to_one_storage_key_paris.py",
+    "stNonZeroCallsTest/test_non_zero_value_delegatecall_to_one_storage_key_paris.py",
+    "stNonZeroCallsTest/test_non_zero_value_suicide_to_empty_paris.py",
+    "stNonZeroCallsTest/test_non_zero_value_suicide_to_non_non_zero_balance.py",
+    "stNonZeroCallsTest/test_non_zero_value_suicide_to_one_storage_key_paris.py",
+    "stNonZeroCallsTest/test_non_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris.py",
+    "stNonZeroCallsTest/test_non_zero_value_transaction_call_to_one_storage_key_paris.py",
+    "stPreCompiledContracts2/test_call_ecrecover0.py",
+    "stPreCompiledContracts2/test_call_ecrecover0_complete_return_value.py",
+    "stPreCompiledContracts2/test_call_ecrecover0_gas3000.py",
+    "stPreCompiledContracts2/test_call_ecrecover0_overlapping_input_output.py",
+    "stPreCompiledContracts2/test_call_ecrecover_check_length.py",
+    "stPreCompiledContracts2/test_call_ecrecover_v_prefixed0.py",
+    "stPreCompiledContracts2/test_callcode_ecrecover0.py",
+    "stPreCompiledContracts2/test_callcode_ecrecover0_complete_return_value.py",
+    "stPreCompiledContracts2/test_callcode_ecrecover0_gas3000.py",
+    "stPreCompiledContracts2/test_callcode_ecrecover0_overlapping_input_output.py",
+    "stPreCompiledContracts2/test_callcode_ecrecover_v_prefixed0.py",
+    "stRandom/test_random_statetest144.py",
+    "stRandom2/test_random_statetest642.py",
+    "stRandom2/test_random_statetest645.py",
+    "stRandom2/test_random_statetest646.py",
+    "stRevertTest/test_revert_depth_create_address_collision.py",
+    "stRevertTest/test_revert_in_create_in_init_paris.py",
+    "stRevertTest/test_revert_prefound.py",
+    "stRevertTest/test_revert_prefound_empty_paris.py",
+    "stSpecialTest/test_failed_create_reverts_deletion_paris.py",
+    "stSystemOperationsTest/test_create_hash_collision.py",
+    "stSystemOperationsTest/test_test_random_test.py",
+    "stWalletTest/test_day_limit_construction.py",
+    "stWalletTest/test_day_limit_construction_partial.py",
+    "stWalletTest/test_day_limit_reset_spent_today.py",
+    "stWalletTest/test_day_limit_set_daily_limit.py",
+    "stWalletTest/test_day_limit_set_daily_limit_no_data.py",
+    "stWalletTest/test_multi_owned_add_owner_add_myself.py",
+    "stWalletTest/test_multi_owned_change_owner_from_not_owner.py",
+    "stWalletTest/test_multi_owned_change_owner_no_argument.py",
+    "stWalletTest/test_multi_owned_change_owner_to_is_owner.py",
+    "stWalletTest/test_multi_owned_change_requirement_to0.py",
+    "stWalletTest/test_multi_owned_change_requirement_to2.py",
+    "stWalletTest/test_multi_owned_construction_correct.py",
+    "stWalletTest/test_multi_owned_remove_owner_by_non_owner.py",
+    "stWalletTest/test_multi_owned_remove_owner_my_self.py",
+    "stWalletTest/test_multi_owned_remove_owner_owner_is_not_owner.py",
+    "stWalletTest/test_wallet_change_requirement_remove_pending_transaction.py",
+    "stWalletTest/test_wallet_construction.py",
+    "stWalletTest/test_wallet_construction_oog.py",
+    "stWalletTest/test_wallet_construction_partial.py",
+    "stWalletTest/test_wallet_kill.py",
+    "stWalletTest/test_wallet_kill_to_wallet.py",
+    "stWalletTest/test_wallet_remove_owner_remove_pending_transaction.py",
+    "stZeroCallsRevert/test_zero_value_call_to_one_storage_key_oog_revert_paris.py",
+    "stZeroCallsRevert/test_zero_value_callcode_to_one_storage_key_oog_revert_paris.py",
+    "stZeroCallsRevert/test_zero_value_delegatecall_to_one_storage_key_oog_revert_paris.py",
+    "stZeroCallsRevert/test_zero_value_suicide_to_one_storage_key_oog_revert_paris.py",
+    "stZeroCallsTest/test_zero_value_call_to_one_storage_key_paris.py",
+    "stZeroCallsTest/test_zero_value_callcode_to_one_storage_key_paris.py",
+    "stZeroCallsTest/test_zero_value_delegatecall_to_one_storage_key_paris.py",
+    "stZeroCallsTest/test_zero_value_suicide_to_empty_paris.py",
+    "stZeroCallsTest/test_zero_value_suicide_to_non_zero_balance.py",
+    "stZeroCallsTest/test_zero_value_suicide_to_one_storage_key_paris.py",
+    "stZeroCallsTest/test_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris.py",
+    "stZeroCallsTest/test_zero_value_transaction_call_to_one_storage_key_paris.py",
+    # Slow-marked tests that fail with dynamic addresses (excluded from
+    # the main verification by -m "not slow" but exercised on full CI
+    # runs without that filter — same KV_CALL_FLIP / collision /
+    # ecrecover patterns as the non-slow allowlisted siblings).
+    "stQuadraticComplexityTest/test_return50000.py",
+    "stQuadraticComplexityTest/test_return50000_2.py",
+    "stStaticCall/test_static_call_ecrecover0.py",
+    "stStaticCall/test_static_call_ecrecover0_complete_return_value.py",
+    "stStaticCall/test_static_call_ecrecover0_gas3000.py",
+    "stStaticCall/test_static_call_ecrecover0_overlapping_input_output.py",
+    "stStaticCall/test_static_call_ecrecover_check_length.py",
+    "stStaticCall/test_static_call_ecrecover_v_prefixed0.py",
+    "stStaticCall/test_static_call_to_call_code_op_code_check.py",
+    "stStaticCall/test_static_call_to_call_op_code_check.py",
+    "stStaticCall/test_static_call_to_del_call_op_code_check.py",
+    "stStaticCall/test_static_call_to_static_op_code_check.py",
+    "stStaticCall/test_static_check_opcodes.py",
+    "stStaticCall/test_static_check_opcodes2.py",
+    "stStaticCall/test_static_check_opcodes3.py",
+    "stStaticCall/test_static_check_opcodes4.py",
+    "stStaticCall/test_static_check_opcodes5.py",
+}
+
+
+def _ported_rel_path(filler_path: Path) -> str:
+    """Return the ``<category>/test_<snake>.py`` path for a filler."""
+    category = filler_path.parent.name if filler_path.parent.name else ""
+    py_test_name = _filler_name_to_test_name(filler_path.stem)
+    return f"{category}/{py_test_name}.py"
+
+
+class _AnalyzerAlloc(Alloc):
+    """Alloc subclass that supports fund_eoa for analysis."""
+
+    _eoa_counter: int = 0
+
+    def fund_eoa(
+        self,
+        _amount: Any = None,
+        _label: Any = None,
+        **_kwargs: Any,
+    ) -> EOA:
+        """Create a deterministic EOA for analysis."""
+        self._eoa_counter += 1
+        h = EHash(self._eoa_counter.to_bytes(32, "big"))
+        return eoa_from_hash(h, 0)
+
+
+# ---------------------------------------------------------------------------
+# Public API
+# ---------------------------------------------------------------------------
+
+
+def load_filler(path: Path) -> tuple[str, StateStaticTest]:
+    """Load a filler file and return (test_name, validated model)."""
+    with open(path) as f:
+        if path.suffix == ".json":
+            data = json.load(f)
+        else:
+            data = yaml.load(f, Loader=NoIntResolver)
+
+    test_name = next(iter(data))
+    model = StateStaticTest.model_validate(data[test_name])
+    model.test_name = test_name
+    return test_name, model
+
+
+def analyze(
+    test_name: str,
+    model: StateStaticTest,
+    filler_path: Path,
+) -> IntermediateTestModel:
+    """Analyze a parsed filler model and produce codegen IR."""
+    # 1. Gather all tag dependencies
+    all_deps: dict[str, Tag] = {}
+    all_deps.update(model.transaction.tag_dependencies())
+    for expect in model.expect:
+        all_deps.update(expect.result.tag_dependencies())
+    imports = ImportsIR()
+
+    # 2. Resolve tags via pre-state setup
+    pre = _AnalyzerAlloc()
+    tags = model.pre.setup(pre, all_deps)
+
+    # 2b. Honour precompile hint addresses for tagged EOAs.
+    # The static filler resolves ``<eoa:0x...01>`` through
+    # ``eoa_from_hash`` (random placeholder address). LLL source code
+    # however references those addresses literally (e.g.
+    # ``(call gas 0x01 ...)``), so the bytecode lands at the precompile
+    # while the funded EOA lands somewhere else. Override the resolved
+    # address back to the literal hint when it falls in the precompile
+    # range (0x01-0x10) — that way ``addr_to_var`` registers 0x01 and
+    # tx-data / post-state resolutions stay consistent with bytecode.
+    #
+    # Track the override addresses so that the corresponding EOA can
+    # be pinned non-dynamic later. Without pinning, the variable in
+    # the generated test (``addr_5``) would still go through
+    # ``pre.fund_eoa()`` at runtime and land at a random address,
+    # while ``tx_data`` would carry that random address — breaking
+    # any contract that calls the literal precompile (0x01).
+    pinned_eoa_addrs: set[Address] = set()
+    for tag in model.pre.root.keys():
+        if not isinstance(tag, SenderTag):
+            continue
+        name = tag.name
+        if not (
+            isinstance(name, str) and name.startswith("0x") and len(name) == 42
+        ):
+            continue
+        try:
+            hint_int = int(name, 16)
+        except ValueError:
+            continue
+        if 1 <= hint_int <= 0x10:
+            hint_addr = Address(hint_int)
+            tags[tag.name] = hint_addr
+            pinned_eoa_addrs.add(hint_addr)
+
+    # 3. Fork range (must sort chronologically, not alphabetically)
+    all_fork_names = [str(f) for f in sorted(get_forks())]
+    valid_forks_set = set(model.get_valid_at_forks())
+    valid_forks_chrono = [f for f in all_fork_names if f in valid_forks_set]
+    valid_from = valid_forks_chrono[0] if valid_forks_chrono else "Cancun"
+
+    valid_until: str | None = None
+    if valid_forks_chrono and valid_forks_chrono[-1] != all_fork_names[-1]:
+        valid_until = valid_forks_chrono[-1]
+
+    # 4. Category from filler path
+    category = filler_path.parent.name if filler_path.parent.name else ""
+
+    # 5. Build address -> variable name mapping
+    addr_to_var = _assign_variable_names(model, tags)
+
+    # 5b. Resolve coinbase address for later use
+    coinbase_addr: Address | None = None
+    if isinstance(model.env.current_coinbase, Tag):
+        tag_name = model.env.current_coinbase.name
+        if tag_name in tags:
+            resolved = tags[tag_name]
+            if isinstance(resolved, Address):
+                coinbase_addr = resolved
+            else:
+                coinbase_addr = Address(int.from_bytes(resolved, "big"))
+    else:
+        coinbase_addr = model.env.current_coinbase
+
+    # 6. Identify sender
+    sender_ir, sender_tag_name = _build_sender_ir(model, tags)
+
+    # 7. Build TX arrays
+    probably_bytecode = model.transaction.to is None
+    tx_data, tx_gas, tx_value = _build_tx_arrays(
+        model.transaction,
+        tags,
+        addr_to_var,
+        probably_bytecode,
+        imports,
+    )
+
+    # 8. Parameter matrix
+    parameters = _build_parameters(model)
+    is_multi_case = len(parameters) > 1
+
+    # Detect fork-dependent single-case tests (multiple expect sections
+    # with different networks but only one (d, g, v) combo)
+    is_fork_dependent = not is_multi_case and len(model.expect) > 1
+
+    # 9. Build accounts
+    force_hardcoded = _ported_rel_path(filler_path) in FORCE_HARDCODED_TESTS
+    accounts = _build_accounts(
+        model,
+        tags,
+        addr_to_var,
+        sender_tag_name,
+        imports,
+        force_hardcoded=force_hardcoded,
+        coinbase_addr=coinbase_addr,
+        pinned_eoa_addrs=pinned_eoa_addrs,
+    )
+
+    # Track if sender is not in the pre-state (for fund_eoa handling).
+    # When True, the generated test uses pre.fund_eoa(amount=0) instead
+    # of EOA(key=...), matching the static fill's setup() step 7.
+    if sender_tag_name and not any(a.is_sender for a in accounts):
+        sender_ir.not_in_pre = True
+
+    # 10. Build environment
+    environment_ir = _build_environment(model, tags, addr_to_var)
+
+    # 11. Build expect entries
+    expect_entries = _build_expect_entries(
+        model, tags, addr_to_var, all_fork_names, imports
+    )
+
+    # 11b. If post-state has unresolvable addresses — either as account
+    # references (Address(0x...)) or as address-like storage values
+    # (large ints > 2^32 that weren't resolved to variable names) —
+    # disable dynamic for ALL accounts (including sender) so every
+    # address stays fixed and CREATE-derived addresses match baseline.
+    # Values above 2**32 are likely addresses, not small ints.
+    addr_like_threshold = 0x100000000
+    has_unresolved = any(
+        "Address(0x" in a.var_ref
+        for entry in expect_entries
+        for a in entry.result
+    ) or any(
+        isinstance(v, int) and v >= addr_like_threshold
+        for entry in expect_entries
+        for a in entry.result
+        if a.storage is not None
+        for v in a.storage.values()
+    )
+    if has_unresolved:
+        for acct in accounts:
+            acct.use_dynamic = False
+
+    # Sender: dynamic unless unresolvable post-state or hardcoded allowlist.
+    sender_ir.use_dynamic = not force_hardcoded and not has_unresolved
+
+    # 11c. Forced hardcoded (allowlist) also pins every EOA so coinbase
+    # rebinds and fund_eoa-generated EOAs don't leak into an otherwise
+    # hardcoded test.
+    if force_hardcoded:
+        for acct in accounts:
+            acct.use_dynamic = False
+
+    # 12. Build transaction IR
+    transaction_ir, access_list_entries = _build_transaction_ir(
+        model,
+        tags,
+        addr_to_var,
+        tx_data,
+        tx_gas,
+        tx_value,
+        is_multi_case,
+        imports,
+    )
+
+    # 13. Address constants (non-tagged, non-sender addresses)
+    address_constants = _build_address_constants(
+        model, tags, addr_to_var, sender_tag_name, accounts
+    )
+
+    # 14. Import flags
+    if access_list_entries or any(
+        model.transaction.data[d.index].access_list is not None
+        for d in model.transaction.data
+    ):
+        imports.needs_access_list = True
+
+    if (
+        imports.needs_access_list
+        or model.transaction.blob_versioned_hashes is not None
+    ):
+        imports.needs_hash = True
+
+    if any(p.has_exception for p in parameters):
+        imports.needs_tx_exception = True
+
+    # 15. Filler comment
+    filler_comment = ""
+    if model.info and model.info.comment:
+        filler_comment = model.info.comment
+
+    # 16. Test name
+    py_test_name = _filler_name_to_test_name(test_name)
+
+    # 17. Whether the test mutates the pre-allocation. The framework's
+    # ``assert_mutable()`` is triggered by:
+    #   * ``pre[var] = Account(...)``       (any non-dynamic account)
+    #   * ``EOA(key=...)``                  (non-dynamic sender)
+    #   * ``pre.deploy_contract(address=...)``  (non-dynamic contract)
+    #   * ``pre.deploy_contract(..., nonce=0)`` (default emit when the
+    #     filler's account had nonce 0 or unset)
+    #   * ``pre.fund_eoa(nonce=...)``       (dynamic sender with explicit
+    #     nonce — used for high-nonce senders)
+    # Tests not hitting any of these can run under the ``execute`` plugin.
+    # The template only emits ``pre.fund_eoa(nonce=...)`` when
+    # ``sender.nonce`` is truthy, and ``pre.deploy_contract(..., nonce=N)``
+    # always emits N (defaulting to 0 when ``account.nonce`` is None).
+    # Mirror those conditions exactly.
+    sender_emits_nonce_kwarg = bool(sender_ir.nonce)
+    contract_nonce_zero = any(
+        not a.is_eoa and (a.nonce is None or a.nonce == 0) for a in accounts
+    )
+    needs_mutable_pre = (
+        not sender_ir.use_dynamic
+        or sender_emits_nonce_kwarg
+        or any(not a.use_dynamic for a in accounts)
+        or contract_nonce_zero
+    )
+
+    return IntermediateTestModel(
+        test_name=py_test_name,
+        filler_path=str(filler_path),
+        filler_comment=filler_comment,
+        category=category,
+        valid_from=valid_from,
+        valid_until=valid_until,
+        is_slow=(
+            (model.info is not None and "slow" in model.info.pytest_marks)
+            or category in SLOW_CATEGORIES
+        ),
+        is_multi_case=is_multi_case,
+        is_fork_dependent=is_fork_dependent,
+        needs_mutable_pre=needs_mutable_pre,
+        environment=environment_ir,
+        accounts=accounts,
+        sender=sender_ir,
+        parameters=parameters,
+        transaction=transaction_ir,
+        expect_entries=expect_entries,
+        address_constants=address_constants,
+        tx_data=tx_data,
+        tx_gas=tx_gas,
+        tx_value=tx_value,
+        imports=imports,
+    )
+
+
+# ---------------------------------------------------------------------------
+# Private helpers
+# ---------------------------------------------------------------------------
+
+
+def _camel_to_snake(name: str) -> str:
+    """Convert CamelCase to snake_case."""
+    s = re.sub(r"([a-z0-9])([A-Z])", r"\1_\2", name)
+    s = re.sub(r"([A-Z]+)([A-Z][a-z])", r"\1_\2", s)
+    return s.lower()
+
+
+def _filler_name_to_test_name(filler_stem: str) -> str:
+    """Convert filler stem to Python test function name."""
+    name = re.sub(r"Filler$", "", filler_stem)
+    result = "test_" + _camel_to_snake(name)
+    result = result.replace("+", "_plus_")
+    result = result.replace("-", "_minus_")
+    result = re.sub(r"[^a-z0-9_]", "_", result)
+    result = re.sub(r"_+", "_", result)
+    return result.strip("_")
+
+
+def _classify_code_source(source: str) -> str:
+    """Classify code source and format as a comment block."""
+    if not source or source.strip() == "":
+        return ""
+
+    stripped = source.strip()
+
+    if stripped.startswith(":yul"):
+        lang = "yul"
+        body = stripped[4:].strip()
+    elif stripped.startswith("{") or stripped.startswith("(asm"):
+        lang = "lll"
+        body = stripped
+    elif stripped.startswith(":abi"):
+        lang = "abi"
+        body = stripped[4:].strip()
+    elif stripped.startswith(":raw"):
+        lang = "raw"
+        body = stripped[4:].strip()
+    elif stripped.startswith("0x"):
+        lang = "hex"
+        body = stripped
+    else:
+        lang = "unknown"
+        body = stripped
+
+    lines = body.split("\n")
+    if len(lines) > 30:
+        lines = lines[:30] + [f"... ({len(lines) - 30} more lines)"]
+
+    comment_lines = [f"    # Source: {lang}"]
+    for line in lines:
+        comment_lines.append(f"    # {line}")
+    return "\n".join(comment_lines)
+
+
+def _get_int_definitions(
+    addr_to_var: dict[Address | EOA, str] | None,
+) -> dict[int, str]:
+    """
+    Convert variable dictionary to int definitions used by the evm bytecode
+    parser.
+    """
+    result: dict[int, str] = {}
+    if not addr_to_var:
+        return result
+    for k, v in addr_to_var.items():
+        result[int.from_bytes(k, "big")] = v
+    return result
+
+
+def _bytes_to_op_expr(
+    code_bytes: bytes,
+    addr_to_var: dict[Address | EOA, str] | None = None,
+) -> str | None:
+    """Convert compiled bytecode to Op expression string."""
+    if not code_bytes or len(code_bytes) > MAX_BYTECODE_OP_SIZE:
+        return None
+
+    hex_str = code_bytes.hex()
+    if not hex_str:
+        return None
+
+    try:
+        int_definitions = _get_int_definitions(addr_to_var)
+        op_str = process_evm_bytes_string(
+            hex_str,
+            assembly=False,
+            int_definitions=int_definitions,
+        )
+        # Roundtrip check
+        compiled = eval(
+            op_str, {"Op": Op}, {v: k for k, v in int_definitions.items()}
+        )  # noqa: S307
+        if compiled.hex() != hex_str.lower():
+            return None
+        return op_str
+    except Exception:
+        return None
+
+
+def _assign_variable_names(
+    model: StateStaticTest, tags: TagDict
+) -> dict[Address | EOA, str]:
+    """Build address -> variable name mapping."""
+    addr_to_var: dict[Address | EOA, str] = {}
+    contract_counter = 0
+
+    # Coinbase
+    coinbase_addr: Address | None = None
+    if isinstance(model.env.current_coinbase, Tag):
+        tag_name = model.env.current_coinbase.name
+        if tag_name in tags:
+            coinbase_addr = tags[tag_name]
+    else:
+        coinbase_addr = model.env.current_coinbase
+
+    if coinbase_addr:
+        addr_to_var[coinbase_addr] = "coinbase"
+
+    # Sender
+    sender_addr: Address | EOA | None = None
+    if isinstance(model.transaction.secret_key, SenderKeyTag):
+        tag_name = model.transaction.secret_key.name
+        if tag_name in tags:
+            sender_addr = tags[tag_name]
+    else:
+        # Non-tagged sender: derive address from key
+        sender_addr = EOA(key=model.transaction.secret_key)
+
+    if sender_addr:
+        addr_to_var[sender_addr] = "sender"
+
+    # Tagged pre-state accounts
+    for address_or_tag, _account in model.pre.root.items():
+        if isinstance(address_or_tag, Tag):
+            tag_name = address_or_tag.name
+            if tag_name in tags:
+                addr = tags[tag_name]
+                if addr not in addr_to_var:
+                    var_name = _sanitize_var_name(
+                        tag_name, set(addr_to_var.values())
+                    )
+                    addr_to_var[addr] = var_name
+
+    # Non-tagged pre-state accounts
+    for address_or_tag, _account in model.pre.root.items():
+        if not isinstance(address_or_tag, Tag):
+            if address_or_tag not in addr_to_var:
+                var_name = f"contract_{contract_counter}"
+                contract_counter += 1
+                addr_to_var[address_or_tag] = var_name
+
+    # Transaction "to" address
+    if model.transaction.to is not None:
+        if isinstance(model.transaction.to, Tag):
+            tag_name = model.transaction.to.name
+            if tag_name in tags:
+                to_addr = tags[tag_name]
+                if to_addr not in addr_to_var:
+                    var_name = _sanitize_var_name(
+                        tag_name, set(addr_to_var.values())
+                    )
+                    addr_to_var[to_addr] = var_name
+
+    return addr_to_var
+
+
+def _sanitize_var_name(name: str, used: set[str]) -> str:
+    """Sanitize a tag name into a valid Python variable name."""
+    var = re.sub(r"[^a-zA-Z0-9_]", "_", name)
+    var = re.sub(r"_+", "_", var).strip("_").lower()
+    if re.match(r"0x[0-9a-f]{40}", var):
+        # Some tagged tests use addresses as tags, which is confusing, remove
+        var = "addr"
+    if not var or var[0].isdigit():
+        var = "addr_" + var
+    # Avoid Python keywords and builtins
+    _reserved = {
+        "type",
+        "hash",
+        "id",
+        "input",
+        "range",
+        "list",
+        "dict",
+        "return",
+        "class",
+        "def",
+        "for",
+        "if",
+        "else",
+        "elif",
+        "while",
+        "break",
+        "continue",
+        "pass",
+        "import",
+        "from",
+        "as",
+        "with",
+        "try",
+        "except",
+        "finally",
+        "raise",
+        "yield",
+        "lambda",
+        "global",
+        "nonlocal",
+        "assert",
+        "del",
+        "in",
+        "is",
+        "not",
+        "and",
+        "or",
+        "True",
+        "False",
+        "None",
+        "async",
+        "await",
+        "print",
+        "exec",
+        "eval",
+        "open",
+        "map",
+        "filter",
+        "set",
+        "bytes",
+        "int",
+        "str",
+        "float",
+        "bool",
+        "object",
+        "super",
+        "property",
+        "staticmethod",
+        "classmethod",
+        "abs",
+        "all",
+        "any",
+        "bin",
+        "hex",
+        "oct",
+        "len",
+        "max",
+        "min",
+        "pow",
+        "sum",
+        "zip",
+    }
+    if var in _reserved:
+        var = var + "_"
+    base = var
+    counter = 2
+    while var in used:
+        var = f"{base}_{counter}"
+        counter += 1
+    return var
+
+
+def _addr_hex(addr: Address | EOA) -> str:
+    """Normalize an address-like value to hex string."""
+    hex_str = str(addr)[2:].lstrip("0")
+    if hex_str == "":
+        hex_str = "0"
+    return f"0x{hex_str}"
+
+
+def _build_sender_ir(
+    model: StateStaticTest, tags: TagDict
+) -> tuple[SenderIR, str | None]:
+    """Build SenderIR and return (sender_ir, sender_tag_name)."""
+    if isinstance(model.transaction.secret_key, SenderKeyTag):
+        tag_name = model.transaction.secret_key.name
+        # Get the filler-derived key from tags (eoa_from_hash result)
+        resolved = tags.get(tag_name)
+        if isinstance(resolved, EOA):
+            key = resolved.key
+            assert key is not None
+            key_int = int.from_bytes(key, "big")
+        else:
+            key_int = 0
+        # Find sender balance and nonce from pre-state
+        balance = 0
+        nonce: int | None = None
+        for address_or_tag, account in model.pre.root.items():
+            if isinstance(address_or_tag, SenderTag):
+                if address_or_tag.name == tag_name:
+                    balance = int(account.balance) if account.balance else 0
+                    if account.nonce is not None:
+                        nonce = int(account.nonce)
+                    break
+        return (
+            SenderIR(
+                is_tagged=False, key=key_int, balance=balance, nonce=nonce
+            ),
+            tag_name,
+        )
+    else:
+        # Find sender balance and nonce from pre-state
+        eoa = EOA(key=model.transaction.secret_key)
+        sender_addr = _addr_hex(eoa)
+        balance = 0
+        nonce = None
+        for address_or_tag, account in model.pre.root.items():
+            if not isinstance(address_or_tag, Tag):
+                if _addr_hex(address_or_tag) == sender_addr:
+                    balance = int(account.balance) if account.balance else 0
+                    if account.nonce is not None:
+                        nonce = int(account.nonce)
+                    break
+        return SenderIR(
+            is_tagged=False,
+            key=int.from_bytes(eoa.key, "big"),
+            balance=balance,
+            nonce=nonce,
+        ), None
+
+
+def _build_parameters(model: StateStaticTest) -> list[ParameterCaseIR]:
+    """Build the (d, g, v) parameter matrix."""
+    parameters: list[ParameterCaseIR] = []
+    for d in model.transaction.data:
+        for g in range(len(model.transaction.gas_limit)):
+            for v in range(len(model.transaction.value)):
+                has_exc = False
+                for expect in model.expect:
+                    if (
+                        expect.has_index(d.index, g, v)
+                        and expect.expect_exception is not None
+                    ):
+                        has_exc = True
+
+                # Build ID label (same logic as fill_function)
+                id_label = ""
+                if len(model.transaction.data) > 1 or d.label is not None:
+                    if d.label is not None:
+                        id_label = f"{d}"
+                    else:
+                        id_label = f"d{d}"
+                if len(model.transaction.gas_limit) > 1:
+                    id_label += f"-g{g}"
+                if len(model.transaction.value) > 1:
+                    id_label += f"-v{v}"
+
+                marks = "pytest.mark.exception_test" if has_exc else None
+
+                parameters.append(
+                    ParameterCaseIR(
+                        d=d.index,
+                        g=g,
+                        v=v,
+                        has_exception=has_exc,
+                        label=d.label,
+                        id=id_label,
+                        marks=marks,
+                    )
+                )
+    return parameters
+
+
+def _resolve_storage_values(
+    storage: dict[int, int],
+    addr_to_var: dict[Address | EOA, str],
+    imports: ImportsIR | None = None,
+) -> dict[int, int | str]:
+    """Replace storage values matching known addresses with var names."""
+    if not storage or not addr_to_var:
+        return storage
+    # Build int -> var_name lookup from addr_to_var
+    int_to_var: dict[int, str] = {}
+    for addr, var_name in addr_to_var.items():
+        int_to_var[int.from_bytes(addr, "big")] = var_name
+    # Also build CREATE-derived address lookup
+    create_to_expr: dict[int, str] = {}
+    for addr, var_name in addr_to_var.items():
+        for nonce in range(256):
+            created = compute_create_address(address=addr, nonce=nonce)
+            created_int = int.from_bytes(created, "big")
+            if created_int not in int_to_var:
+                create_to_expr[created_int] = (
+                    f"compute_create_address(address={var_name},"
+                    f" nonce={nonce})"
+                )
+    result: dict[int, int | str] = {}
+    for k, v in storage.items():
+        if v in int_to_var:
+            result[k] = int_to_var[v]
+        elif v in create_to_expr:
+            if imports is not None:
+                imports.needs_compute_create_address = True
+            result[k] = create_to_expr[v]
+        else:
+            result[k] = v
+    return result
+
+
+def _find_address_refs_in_bytecode(
+    code_bytes: bytes,
+    known_addresses: set[Address],
+) -> dict[Address, int]:
+    """
+    Find known addresses referenced in bytecode via PUSH.
+
+    Return a mapping ``address -> minimum PUSH size observed``.
+    A push size < 20 means the baseline bytecode compiled the
+    address to fewer bytes (leading zero bytes); the referenced
+    contract must stay hardcoded so the compiler keeps emitting
+    the same short PUSH opcode and the trace stays aligned.
+    """
+    refs: dict[Address, int] = {}
+    # Pre-compute int values for fast comparison
+    known_ints = {int.from_bytes(a, "big") for a in known_addresses}
+    i = 0
+    while i < len(code_bytes):
+        opcode = code_bytes[i]
+        if 0x60 <= opcode <= 0x7F:  # PUSH1..PUSH32
+            push_size = opcode - 0x5F
+            push_data = code_bytes[i + 1 : i + 1 + push_size]
+            if len(push_data) == push_size:
+                # Addresses with leading zero bytes are compiled to
+                # a PUSH smaller than PUSH20 (down to PUSH1 for 1-byte
+                # addresses like 0x01). Match on int value against the
+                # known-address set — false positives would require a
+                # PUSHn that happens to push exactly a value already
+                # registered as a pre-state address, which is rare in
+                # practice.
+                val = int.from_bytes(push_data, "big")
+                if val in known_ints:
+                    addr = Address(val)
+                    if addr not in refs or push_size < refs[addr]:
+                        refs[addr] = push_size
+            i += 1 + push_size
+        else:
+            i += 1
+    return refs
+
+
+def _topological_sort_contracts(
+    contract_addrs: list[Address],
+    deps: dict[Address, set[Address]],
+) -> tuple[list[Address], set[Address]]:
+    """
+    Return (sorted_addresses, cycle_addresses).
+
+    If A's bytecode references B, B must be deployed before A.
+    """
+    addr_set = set(contract_addrs)
+    # forward[B] = {A} means A depends on B, so B must come first
+    forward: dict[Address, set[Address]] = {a: set() for a in addr_set}  # noqa: C420
+    in_deg: dict[Address, int] = dict.fromkeys(addr_set, 0)
+    for a, dep_set in deps.items():
+        if a not in addr_set:
+            continue
+        for b in dep_set:
+            if b in addr_set:
+                forward[b].add(a)
+                in_deg[a] += 1
+
+    # Kahn's algorithm
+    queue = [a for a in contract_addrs if in_deg[a] == 0]
+    sorted_addrs: list[Address] = []
+    while queue:
+        node = queue.pop(0)
+        sorted_addrs.append(node)
+        for neighbor in forward[node]:
+            in_deg[neighbor] -= 1
+            if in_deg[neighbor] == 0:
+                queue.append(neighbor)
+
+    cycle_addrs = addr_set - set(sorted_addrs)
+    return sorted_addrs, cycle_addrs
+
+
+def _build_accounts(
+    model: StateStaticTest,
+    tags: TagDict,
+    addr_to_var: dict[Address | EOA, str],
+    sender_tag_name: str | None,
+    imports: ImportsIR,
+    *,
+    force_hardcoded: bool = False,
+    coinbase_addr: Address | None = None,
+    pinned_eoa_addrs: set[Address] | None = None,
+) -> list[AccountIR]:
+    """Build AccountIR list with dependency-ordered contracts."""
+    if pinned_eoa_addrs is None:
+        pinned_eoa_addrs = set()
+    # ------------------------------------------------------------------
+    # Pass 1: gather account metadata and compile bytecode (no Op yet)
+    # ------------------------------------------------------------------
+    raw_accounts: list[AccountIR] = []
+    # Map address -> compiled code_bytes for contracts (for dep analysis)
+    code_bytes_map: dict[Address, bytes] = {}
+
+    for address_or_tag, account in model.pre.root.items():
+        is_tagged = isinstance(address_or_tag, Tag)
+        # SenderTag type is always EOA, ContractTag is always contract
+        is_eoa = isinstance(address_or_tag, SenderTag) if is_tagged else False
+        is_sender = False
+
+        if is_tagged:
+            tag_name = address_or_tag.name
+            if sender_tag_name and tag_name == sender_tag_name:
+                is_sender = True
+                is_eoa = True
+            resolved = tags.get(tag_name)
+            var_name = (
+                addr_to_var.get(resolved, tag_name)
+                if resolved is not None
+                else tag_name
+            )
+            address = resolved
+        else:
+            address_str = str(address_or_tag)
+            var_name = addr_to_var.get(
+                address_or_tag, f"addr_{address_str[:10]}"
+            )
+            # Check if this non-tagged address is the sender
+            if addr_to_var.get(address_or_tag) == "sender":
+                is_sender = True
+                is_eoa = True
+            address = address_or_tag
+
+        assert not var_name.startswith("0x")
+
+        # Determine if non-tagged account has code (is a contract)
+        has_code = account.code is not None and account.code.source.strip()
+        if not is_tagged and not is_eoa and not has_code:
+            # Non-tagged, no code — treat as EOA
+            is_eoa = True
+
+        # Compile code but defer Op expression conversion
+        source_comment = ""
+        code_bytes: bytes = b""
+        oversized_code = False
+        if has_code:
+            source_comment = _classify_code_source(account.code.source)
+            try:
+                code_bytes = account.code.compiled(tags)
+                if len(code_bytes) > MAX_BYTECODE_OP_SIZE:
+                    oversized_code = True
+            except Exception as e:
+                warnings.warn(
+                    f"Code compilation failed for {var_name}: {e}",
+                    stacklevel=2,
+                )
+
+        # Storage
+        storage: dict[int, int | str] = {}
+        if account.storage and account.storage.root:
+            resolved_storage = account.storage.resolve(tags)
+            for k, v in resolved_storage.items():
+                storage[int(k)] = int(v)
+            storage = _resolve_storage_values(storage, addr_to_var, imports)
+
+        # Balance and nonce
+        balance = int(account.balance) if account.balance is not None else 0
+        nonce = int(account.nonce) if account.nonce is not None else None
+
+        acct_ir = AccountIR(
+            var_name=var_name,
+            is_tagged=is_tagged,
+            is_eoa=is_eoa,
+            is_sender=is_sender,
+            balance=balance,
+            nonce=nonce,
+            address=address,
+            source_comment=source_comment,
+            code_expr="",
+            storage=storage,
+            oversized_code=oversized_code,
+            use_dynamic=True,
+        )
+
+        # Oversized contracts must keep hardcoded address
+        if oversized_code:
+            acct_ir.use_dynamic = False
+
+        # Coinbase account must keep hardcoded address so
+        # Environment(fee_recipient=coinbase) and the pre-state
+        # entry refer to the same address.
+        if (
+            coinbase_addr is not None
+            and address is not None
+            and int.from_bytes(address, "big")
+            == int.from_bytes(coinbase_addr, "big")
+        ):
+            acct_ir.use_dynamic = False
+
+        raw_accounts.append(acct_ir)
+        if code_bytes and address is not None:
+            code_bytes_map[address] = code_bytes
+
+    # ------------------------------------------------------------------
+    # Build dependency graph and topological sort for contracts
+    # ------------------------------------------------------------------
+    known_contract_addrs: set[Address] = set()
+    for acct in raw_accounts:
+        if not acct.is_eoa and acct.address is not None:
+            known_contract_addrs.add(acct.address)
+
+    # All known addresses (contracts + EOAs) for bytecode ref scanning
+    all_known_addrs: set[Address] = set()
+    for addr_or_eoa in addr_to_var:
+        if isinstance(addr_or_eoa, Address):
+            all_known_addrs.add(addr_or_eoa)
+        else:
+            all_known_addrs.add(Address(int.from_bytes(addr_or_eoa, "big")))
+
+    # Pre-state EOA addresses — used to recognise short-PUSH refs that
+    # point at funded EOAs (e.g. precompile addresses 0x01-0x10 listed
+    # as ``<eoa:0x...01>`` in the filler) instead of contracts.
+    known_eoa_addrs: set[Address] = set()
+    for acct in raw_accounts:
+        if acct.is_eoa and acct.address is not None:
+            known_eoa_addrs.add(acct.address)
+
+    deps: dict[Address, set[Address]] = {}
+    # Contract addresses referenced via PUSH<20 anywhere: baseline
+    # bytecode compiled them to a short PUSH because of leading zero
+    # bytes, so they must stay hardcoded to keep the opcode sequence
+    # aligned.
+    short_push_refs: set[Address] = set()
+    # EOA addresses referenced via PUSH<20 — pin those EOAs to their
+    # literal address so the funded account lands at the precompile
+    # (e.g. 0x01) instead of a random ``pre.fund_eoa`` address.
+    short_push_eoa_refs: set[Address] = set()
+    # True when a short-PUSH ref targets an address that is neither a
+    # pre-state contract nor a pre-state EOA (e.g. an external tag
+    # like <contract:0x...dead> only referenced from bytecode). No
+    # account can be pinned, so fall back to globally disabling
+    # dynamic addresses for the whole test.
+    short_push_unpinnable = False
+    for addr, cb in code_bytes_map.items():
+        refs = _find_address_refs_in_bytecode(cb, all_known_addrs)
+        # Track deps on other contracts. Keep self-references — they
+        # create self-loops detected as cycles, forcing hardcoded addr.
+        deps[addr] = set(refs) & known_contract_addrs
+        for ref_addr, push_size in refs.items():
+            if push_size < 20:
+                if ref_addr in known_contract_addrs:
+                    short_push_refs.add(ref_addr)
+                elif ref_addr in known_eoa_addrs:
+                    short_push_eoa_refs.add(ref_addr)
+                else:
+                    short_push_unpinnable = True
+
+    contract_addrs_ordered = [
+        acct.address
+        for acct in raw_accounts
+        if not acct.is_eoa and acct.address is not None
+    ]
+    sorted_addrs, cycle_addrs = _topological_sort_contracts(
+        contract_addrs_ordered, deps
+    )
+
+    # Mark cycle contracts as non-dynamic, then propagate: any contract
+    # referenced by a non-dynamic contract must also be non-dynamic
+    # (because the non-dynamic bytecode contains the old address).
+    non_dynamic_addrs = set(cycle_addrs)
+    for acct in raw_accounts:
+        if acct.oversized_code and acct.address is not None:
+            non_dynamic_addrs.add(acct.address)
+    # Short-PUSH refs: pin the referenced contract so its address keeps
+    # the same leading-zero profile as baseline.
+    non_dynamic_addrs.update(short_push_refs)
+
+    changed = True
+    while changed:
+        changed = False
+        for addr in list(non_dynamic_addrs):
+            for ref in deps.get(addr, set()):
+                if (
+                    ref not in non_dynamic_addrs
+                    and ref in known_contract_addrs
+                ):
+                    non_dynamic_addrs.add(ref)
+                    changed = True
+
+    for acct in raw_accounts:
+        if acct.address in non_dynamic_addrs:
+            acct.use_dynamic = False
+
+    # Pin EOAs whose addresses are referenced via short PUSH so the
+    # funded account lands at the literal address (e.g. precompile
+    # 0x01) instead of a random ``pre.fund_eoa`` address.
+    for acct in raw_accounts:
+        if acct.address in short_push_eoa_refs:
+            acct.use_dynamic = False
+
+    # Pin EOAs whose tags were hint-overridden into the precompile
+    # range. The override registered the literal address in
+    # ``addr_to_var`` so tx-data and post-state resolutions point at
+    # ``addr_X`` (a variable). The variable must hold the literal
+    # precompile address at runtime, not whatever ``pre.fund_eoa``
+    # picks.
+    for acct in raw_accounts:
+        if acct.address in pinned_eoa_addrs:
+            acct.use_dynamic = False
+
+    # ------------------------------------------------------------------
+    # Pass 2: convert bytecode to Op expressions
+    # ------------------------------------------------------------------
+    # Collect all address variable names for arithmetic detection
+    addr_var_names = set(addr_to_var.values())
+
+    for acct in raw_accounts:
+        cb = code_bytes_map.get(acct.address) if acct.address else None
+        if not cb:
+            continue
+        try:
+            if acct.use_dynamic:
+                # Try with addr_to_var for symbolic references
+                op_expr = _bytes_to_op_expr(cb, addr_to_var)
+                if op_expr is None:
+                    # Fallback: without addr_to_var (keep dynamic)
+                    op_expr = _bytes_to_op_expr(cb)
+            else:
+                op_expr = _bytes_to_op_expr(cb)
+
+            if op_expr:
+                acct.code_expr = op_expr
+                imports.needs_op = True
+            elif cb:
+                acct.code_expr = f'bytes.fromhex("{cb.hex()}")'
+        except Exception:
+            acct.code_expr = 'b""'
+
+    # ------------------------------------------------------------------
+    # Check for address variables used in arithmetic operations.
+    # Pattern: Op.ADD(contract_0, ...) means contracts are at
+    # sequential addresses and cannot be dynamically assigned.
+    # If found, disable dynamic for ALL contracts.
+    # ------------------------------------------------------------------
+    arith_ops = {"Op.ADD(", "Op.SUB(", "Op.MUL(", "Op.DIV("}
+    has_addr_arithmetic = False
+    for acct in raw_accounts:
+        if not acct.code_expr:
+            continue
+        for var_name in addr_var_names:
+            for arith_op in arith_ops:
+                if f"{arith_op}{var_name}" in acct.code_expr:
+                    has_addr_arithmetic = True
+                    break
+            if has_addr_arithmetic:
+                break
+        if has_addr_arithmetic:
+            break
+
+    # ------------------------------------------------------------------
+    # Computed call targets: CALL/STATICCALL/DELEGATECALL/CALLCODE
+    # receiving `address=` from arithmetic or memory reads. Tests that
+    # do this usually rely on specific pre-state contract addresses
+    # (dispatch-by-offset) and won't survive dynamic allocation.
+    # ------------------------------------------------------------------
+    computed_addr_patterns = (
+        "address=Op.ADD(",
+        "address=Op.SUB(",
+        "address=Op.MUL(",
+        "address=Op.DIV(",
+        "address=Op.MOD(",
+        "address=Op.MLOAD(",
+        "address=Op.SLOAD(",
+        "address=Op.CALLDATALOAD(",
+    )
+    has_computed_call_target = False
+    for acct in raw_accounts:
+        if not acct.code_expr:
+            continue
+        for pat in computed_addr_patterns:
+            if pat in acct.code_expr:
+                has_computed_call_target = True
+                break
+        if has_computed_call_target:
+            break
+
+    if (
+        has_addr_arithmetic
+        or short_push_unpinnable
+        or has_computed_call_target
+        or force_hardcoded
+    ):
+        # Disable dynamic for all contracts and re-generate Op
+        # expressions without addr_to_var. Triggers:
+        #   * address arithmetic (Op.ADD(var, ...)) assumes sequential
+        #     addresses that dynamic allocation can't preserve.
+        #   * a short-PUSH ref that points outside the pre-state has no
+        #     contract to pin, so the whole test must keep the filler's
+        #     resolved addresses.
+        #   * computed call targets (CALL with address=Op.ADD/MLOAD/
+        #     CALLDATALOAD/...) dispatch by baseline-relative offsets.
+        #   * the test is on the FORCE_HARDCODED_TESTS allowlist — we've
+        #     accepted that it can't converge under exact-no-stack with
+        #     dynamic addresses (see module docstring on that set).
+        for acct in raw_accounts:
+            if not acct.is_eoa:
+                acct.use_dynamic = False
+            cb = code_bytes_map.get(acct.address) if acct.address else None
+            if not cb:
+                continue
+            try:
+                op_expr = _bytes_to_op_expr(cb)
+                if op_expr:
+                    acct.code_expr = op_expr
+                elif cb:
+                    acct.code_expr = f'bytes.fromhex("{cb.hex()}")'
+            except Exception:
+                acct.code_expr = 'b""'
+
+    # ------------------------------------------------------------------
+    # Reorder: EOAs first (filler order), then contracts (topo order)
+    # ------------------------------------------------------------------
+    eoa_accounts = [a for a in raw_accounts if a.is_eoa]
+    contract_by_addr = {a.address: a for a in raw_accounts if not a.is_eoa}
+    # Sorted contracts first, then any cycle contracts in filler order
+    ordered_contracts: list[AccountIR] = []
+    for addr in sorted_addrs:
+        if addr in contract_by_addr:
+            ordered_contracts.append(contract_by_addr[addr])
+    # Append cycle contracts (non-dynamic) in their original filler order
+    for acct in raw_accounts:
+        if not acct.is_eoa and acct.address in cycle_addrs:
+            ordered_contracts.append(acct)
+
+    return eoa_accounts + ordered_contracts
+
+
+def _build_environment(
+    model: StateStaticTest,
+    tags: TagDict,
+    addr_to_var: dict[Address | EOA, str],
+) -> EnvironmentIR:
+    """Build EnvironmentIR."""
+    # Resolve coinbase
+    if isinstance(model.env.current_coinbase, Tag):
+        tag_name = model.env.current_coinbase.name
+        resolved = tags.get(tag_name)
+        coinbase_var = (
+            addr_to_var.get(resolved, tag_name) if resolved else tag_name
+        )
+    else:
+        coinbase_var = addr_to_var.get(model.env.current_coinbase, "coinbase")
+
+    return EnvironmentIR(
+        coinbase_var=coinbase_var,
+        number=int(model.env.current_number),
+        timestamp=int(model.env.current_timestamp),
+        difficulty=(
+            int(model.env.current_difficulty)
+            if model.env.current_difficulty is not None
+            else None
+        ),
+        prev_randao=(
+            int(model.env.current_random)
+            if model.env.current_random is not None
+            else None
+        ),
+        base_fee_per_gas=(
+            int(model.env.current_base_fee)
+            if model.env.current_base_fee is not None
+            else None
+        ),
+        excess_blob_gas=(
+            int(model.env.current_excess_blob_gas)
+            if model.env.current_excess_blob_gas is not None
+            else None
+        ),
+        gas_limit=int(model.env.current_gas_limit),
+    )
+
+
+def _fork_set_to_constraints(
+    fork_set: ForkSet, all_fork_names: list[str]
+) -> list[str]:
+    """Reconstruct constraint strings from an expanded ForkSet."""
+    set_fork_names = sorted(
+        [str(f) for f in fork_set],
+        key=lambda f: all_fork_names.index(f) if f in all_fork_names else 999,
+    )
+
+    if not set_fork_names:
+        return []
+
+    if len(set_fork_names) == 1:
+        return [set_fork_names[0]]
+
+    # Try to detect contiguous ranges
+    groups: list[list[str]] = []
+    group: list[str] = [set_fork_names[0]]
+    for i in range(1, len(set_fork_names)):
+        curr_idx = all_fork_names.index(set_fork_names[i])
+        prev_idx = all_fork_names.index(set_fork_names[i - 1])
+        if curr_idx == prev_idx + 1:
+            group.append(set_fork_names[i])
+        else:
+            groups.append(group)
+            group = [set_fork_names[i]]
+    groups.append(group)
+
+    constraints: list[str] = []
+    for g in groups:
+        if len(g) == 1:
+            constraints.append(g[0])
+        else:
+            last_idx = all_fork_names.index(g[-1])
+            if last_idx == len(all_fork_names) - 1:
+                constraints.append(f">={g[0]}")
+            else:
+                next_fork = all_fork_names[last_idx + 1]
+                constraints.append(f">={g[0]}<{next_fork}")
+    return constraints
+
+
+def _format_exception_value(
+    exc: Any,
+) -> str:
+    """Format a TransactionException value as a Python expression string."""
+    if isinstance(exc, list):
+        parts = [f"TransactionException.{e.name}" for e in exc]
+        return "[" + ", ".join(parts) + "]"
+    if isinstance(exc, TransactionException):
+        return f"TransactionException.{exc.name}"
+    return str(exc)
+
+
+def _build_expect_entries(
+    model: StateStaticTest,
+    tags: TagDict,
+    addr_to_var: dict[Address | EOA, str],
+    all_fork_names: list[str],
+    imports: ImportsIR,
+) -> list[ExpectEntryIR]:
+    """Build ExpectEntryIR list."""
+    entries: list[ExpectEntryIR] = []
+
+    for expect in model.expect:
+        # Indexes
+        indexes = {
+            "data": expect.indexes.data,
+            "gas": expect.indexes.gas,
+            "value": expect.indexes.value,
+        }
+
+        # Network constraints
+        network = _fork_set_to_constraints(expect.network, all_fork_names)
+
+        # Result: resolve and map to assertions
+        result_assertions: list[AccountAssertionIR] = []
+        for address_or_tag, account_expect in expect.result.root.items():
+            if isinstance(address_or_tag, Tag):
+                # Use resolve() for all tags — handles CreateTag's
+                # address derivation (compute_create_address etc.)
+                try:
+                    addr = address_or_tag.resolve(tags)
+                    var_ref = _resolve_address(addr, addr_to_var, imports)
+                except (KeyError, AssertionError):
+                    tag_name = address_or_tag.name
+                    addr = tags.get(tag_name, tag_name)
+                    assert not isinstance(addr, str)
+                    var_ref = _resolve_address(addr, addr_to_var, imports)
+            else:
+                var_ref = _resolve_address(
+                    address_or_tag, addr_to_var, imports
+                )
+
+            if account_expect is None:
+                # shouldnotexist
+                result_assertions.append(
+                    AccountAssertionIR(
+                        var_ref=var_ref,
+                        should_not_exist=True,
+                    )
+                )
+                continue
+
+            # Storage (including ANY keys)
+            storage: dict[int, int | str] | None = None
+            storage_any_keys: list[int] = []
+            if account_expect.storage is not None:
+                storage = {}
+                resolved_storage = account_expect.storage.resolve(tags)
+                for k, v in resolved_storage.items():
+                    storage[int(k)] = int(v)
+                storage = _resolve_storage_values(
+                    storage, addr_to_var, imports
+                )
+                # Capture ANY keys from _any_map
+                if hasattr(resolved_storage, "_any_map"):
+                    for k in resolved_storage._any_map:
+                        storage_any_keys.append(int(k))
+
+            # Code
+            code: bytes | None = None
+            if account_expect.code is not None:
+                try:
+                    code = account_expect.code.compiled(tags)
+                except Exception:
+                    pass
+
+            result_assertions.append(
+                AccountAssertionIR(
+                    var_ref=var_ref,
+                    storage=storage,
+                    storage_any_keys=storage_any_keys,
+                    code=code,
+                    balance=(
+                        int(account_expect.balance)
+                        if account_expect.balance is not None
+                        else None
+                    ),
+                    nonce=(
+                        int(account_expect.nonce)
+                        if account_expect.nonce is not None
+                        else None
+                    ),
+                )
+            )
+
+        # Exception
+        expect_exc: dict[str, str] | None = None
+        if expect.expect_exception is not None:
+            expect_exc = {}
+            for fork_set_key in expect.expect_exception:
+                constraint_strs = _fork_set_to_constraints(
+                    fork_set_key, all_fork_names
+                )
+                constraint_key = ",".join(constraint_strs)
+                exc_value = expect.expect_exception.root[fork_set_key]
+                expect_exc[constraint_key] = _format_exception_value(exc_value)
+
+        entries.append(
+            ExpectEntryIR(
+                indexes=indexes,
+                network=network,
+                result=result_assertions,
+                expect_exception=expect_exc,
+            )
+        )
+
+    return entries
+
+
+def _build_transaction_ir(
+    model: StateStaticTest,
+    tags: TagDict,
+    addr_to_var: dict[Address | EOA, str],
+    tx_data: list[str],
+    tx_gas: list[int],
+    tx_value: list[int],
+    is_multi_case: bool,
+    imports: ImportsIR,
+) -> tuple[TransactionIR, list[AccessListEntryIR]]:
+    """Build TransactionIR. Return (transaction_ir, access_list_entries)."""
+    # Resolve "to"
+    to_var: str | None = None
+    to_is_none = False
+    if model.transaction.to is None:
+        to_is_none = True
+    elif isinstance(model.transaction.to, Tag):
+        tag_name = model.transaction.to.name
+        resolved = tags.get(tag_name)
+        if resolved:
+            to_var = addr_to_var.get(resolved, tag_name)
+        else:
+            to_var = tag_name
+    else:
+        to_var = _resolve_address(model.transaction.to, addr_to_var, imports)
+
+    # Access lists — check if they vary per data entry
+    access_list_entries: list[AccessListEntryIR] = []
+    per_data_access_lists: dict[int, list[AccessListEntryIR]] | None = None
+
+    def _resolve_access_list(data_box_al):
+        entries = []
+        for al_entry in data_box_al:
+            if isinstance(al_entry.address, Tag):
+                resolved_al = al_entry.address.resolve(tags)
+                al_address = Address(resolved_al)
+            else:
+                al_address = al_entry.address
+            # Try to resolve to variable name
+            var_name = addr_to_var.get(al_address)
+            if var_name:
+                al_addr_str = var_name
+                al_dynamic = True
+            else:
+                al_addr_str = str(al_address)
+                al_dynamic = False
+            al_keys = [str(k) for k in al_entry.storage_keys]
+            entries.append(
+                AccessListEntryIR(
+                    address=al_addr_str,
+                    storage_keys=al_keys,
+                    use_dynamic=al_dynamic,
+                )
+            )
+        return entries
+
+    # Check if any data entry has access lists
+    has_any_al = any(
+        model.transaction.data[d.index].access_list is not None
+        for d in model.transaction.data
+    )
+    if has_any_al and is_multi_case:
+        # Build per-data access list map.
+        # Include entries where access_list is not None (even if empty [])
+        # because access_list=[] makes the tx type-2 (EIP-2930), while
+        # access_list=None keeps it legacy.
+        per_data_al: dict[int, list[AccessListEntryIR]] = {}
+        for d in model.transaction.data:
+            data_box = model.transaction.data[d.index]
+            if data_box.access_list is not None:
+                per_data_al[d.index] = _resolve_access_list(
+                    data_box.access_list
+                )
+        if per_data_al:
+            per_data_access_lists = per_data_al
+    elif has_any_al:
+        # Single-case: use first data entry's access list
+        first_data = model.transaction.data[0]
+        if first_data.access_list is not None:
+            access_list_entries = _resolve_access_list(first_data.access_list)
+
+    # Blob versioned hashes
+    blob_hashes: list[str] | None = None
+    if model.transaction.blob_versioned_hashes is not None:
+        blob_hashes = [str(h) for h in model.transaction.blob_versioned_hashes]
+
+    # Single-case inlines
+    data_inline: str | None = None
+    gas_limit_single: int | None = None
+    value_single: int | None = None
+    if not is_multi_case:
+        if tx_data and tx_data[0]:
+            data_inline = tx_data[0]
+        else:
+            data_inline = "b''"
+        gas_limit_single = tx_gas[0] if tx_gas else 21000
+        value_single = tx_value[0] if tx_value else 0
+
+    return (
+        TransactionIR(
+            to_var=to_var,
+            to_is_none=to_is_none,
+            gas_price=(
+                int(model.transaction.gas_price)
+                if model.transaction.gas_price is not None
+                else None
+            ),
+            max_fee_per_gas=(
+                int(model.transaction.max_fee_per_gas)
+                if model.transaction.max_fee_per_gas is not None
+                else None
+            ),
+            max_priority_fee_per_gas=(
+                int(model.transaction.max_priority_fee_per_gas)
+                if model.transaction.max_priority_fee_per_gas is not None
+                else None
+            ),
+            max_fee_per_blob_gas=(
+                int(model.transaction.max_fee_per_blob_gas)
+                if model.transaction.max_fee_per_blob_gas is not None
+                else None
+            ),
+            blob_versioned_hashes=blob_hashes,
+            nonce=(
+                int(model.transaction.nonce)
+                if model.transaction.nonce is not None
+                else None
+            ),
+            access_list=access_list_entries if has_any_al else None,
+            per_data_access_lists=per_data_access_lists,
+            data_inline=data_inline,
+            gas_limit=gas_limit_single,
+            value=value_single,
+        ),
+        access_list_entries,
+    )
+
+
+def _build_address_constants(
+    model: StateStaticTest,
+    tags: TagDict,
+    addr_to_var: dict[Address | EOA, str],
+    sender_tag_name: str | None,
+    accounts: list[AccountIR],
+) -> list[dict[str, str]]:
+    """Build list of address constants for the function body."""
+    constants: list[dict[str, str]] = []
+    seen: set[Address | EOA] = set()
+
+    # Collect addresses of dynamic EOAs — these are handled by
+    # pre.fund_eoa() in the accounts section, not as constants.
+    dynamic_eoa_addrs: set[Address | EOA] = set()
+    for acct in accounts:
+        if acct.is_eoa and acct.use_dynamic and acct.address is not None:
+            dynamic_eoa_addrs.add(acct.address)
+
+    # Coinbase (tagged or not) — always keep as hardcoded constant
+    if isinstance(model.env.current_coinbase, Tag):
+        tag_name = model.env.current_coinbase.name
+        resolved = tags.get(tag_name)
+        if resolved:
+            var_name = addr_to_var.get(resolved, "coinbase")
+            if var_name != "sender" and resolved not in seen:
+                constants.append({"var_name": var_name, "hex": f"{resolved}"})
+                seen.add(resolved)
+    else:
+        addr = model.env.current_coinbase
+        var_name = addr_to_var.get(model.env.current_coinbase)
+        if var_name and var_name != "sender" and addr not in seen:
+            constants.append({"var_name": var_name, "hex": f"{addr}"})
+            seen.add(addr)
+
+    # All non-sender, non-contract pre-state accounts (tagged or not)
+    for address_or_tag, _acct in model.pre.root.items():
+        if isinstance(address_or_tag, Tag):
+            tag_name = address_or_tag.name
+            # Skip sender
+            if sender_tag_name and tag_name == sender_tag_name:
+                continue
+            # Skip ContractTag accounts (they get address via deploy_contract)
+            # SenderTag accounts are EOAs even if they have code
+            if isinstance(address_or_tag, ContractTag):
+                continue
+            resolved = tags.get(tag_name)
+            if resolved:
+                # Skip dynamic EOAs (handled by fund_eoa)
+                if resolved in dynamic_eoa_addrs:
+                    continue
+                var_name = addr_to_var.get(resolved, tag_name)
+                if resolved not in seen and var_name != "coinbase":
+                    constants.append(
+                        {"var_name": var_name, "hex": f"{resolved}"}
+                    )
+                    seen.add(resolved)
+        else:
+            # Skip dynamic EOAs (handled by fund_eoa)
+            if address_or_tag in dynamic_eoa_addrs:
+                continue
+            var_name = addr_to_var.get(address_or_tag)
+            if (
+                var_name
+                and var_name != "sender"
+                and var_name != "coinbase"
+                and address_or_tag not in seen
+            ):
+                constants.append(
+                    {"var_name": var_name, "hex": f"{address_or_tag}"}
+                )
+                seen.add(address_or_tag)
+
+    return constants
+
+
+def _decode_tx_data_word(
+    data: bytes, addr_to_var: dict[Address | EOA, str], imports: ImportsIR
+) -> str:
+    """
+    Attempt to decode a single word of 32 or 20 bytes from the transaction
+    data into meaningful information.
+    """
+    addr_var: str | None = None
+    if len(data.lstrip(b"\x00")) <= 20:
+        maybe_addr = Address(int.from_bytes(data, "big"))
+        if maybe_addr in addr_to_var:
+            addr_var = addr_to_var[maybe_addr]
+
+    if len(data) == 32 or len(data) == 20:
+        if addr_var:
+            if len(data) == 20:
+                return addr_var
+            else:
+                imports.needs_hash = True
+                return f"Hash({addr_var}, left_padding=True)"
+        else:
+            if len(data) == 32:
+                imports.needs_hash = True
+                hex_type = "Hash"
+            else:
+                hex_type = "Address"
+            hex_string = data.hex().lstrip("0")
+            if len(hex_string) == 0:
+                hex_string = "0"
+            return f"{hex_type}(0x{hex_string})"
+    else:
+        imports.needs_bytes = True
+        hex_string = data.hex()
+        return f'Bytes("{hex_string}")'
+
+
+def _decode_tx_data(
+    data: bytes,
+    addr_to_var: dict[Address | EOA, str],
+    probably_bytecode: bool,
+    imports: ImportsIR,
+) -> str:
+    """Attempt to decode meaningful information from the transaction data."""
+    if probably_bytecode:
+        bytecode = _bytes_to_op_expr(data, addr_to_var)
+        if bytecode:
+            imports.needs_op = True
+            return bytecode
+    decoded_words: list[str] = []
+    if len(data) > 0 and len(data) % 32 in (0, 4):
+        if len(data) % 32 == 4:
+            decoded_words.append(
+                _decode_tx_data_word(data[:4], addr_to_var, imports)
+            )
+        offset = 4 if len(data) % 32 == 4 else 0
+        for i in range(offset, len(data), 32):
+            decoded_words.append(
+                _decode_tx_data_word(data[i : i + 32], addr_to_var, imports)
+            )
+    else:
+        return _decode_tx_data_word(data, addr_to_var, imports)
+    return " + ".join(decoded_words)
+
+
+def _build_tx_arrays(
+    tx: GeneralTransactionInFiller,
+    tags: TagDict,
+    addr_to_var: dict[Address | EOA, str],
+    probably_bytecode: bool,
+    imports: ImportsIR,
+) -> tuple[list[str], list[int], list[int]]:
+    """Build the list of data that goes in each transaction."""
+    tx_data: list[str] = []
+    for d_entry in tx.data:
+        data_box = tx.data[d_entry.index]
+        compiled = data_box.data.compiled(tags)
+        tx_data.append(
+            _decode_tx_data(compiled, addr_to_var, probably_bytecode, imports)
+        )
+
+    tx_gas = [int(g) for g in tx.gas_limit]
+    tx_value = [int(v) for v in tx.value]
+    return tx_data, tx_gas, tx_value
+
+
+def _resolve_address(
+    addr: Address,
+    addr_to_var: dict[Address | EOA, str],
+    imports: ImportsIR,
+) -> str:
+    """
+    Return a variable reference if the address or an address derived from it
+    is contained in the `addr_to_var` dictionary.
+
+    Fallbacks to returning f"Address({addr})".
+    """
+    for var_addr, var in addr_to_var.items():
+        if addr == var_addr:
+            return var
+    # Check if the address is the result of contract creation from a known
+    # address.  Use a larger range to cover high-nonce senders.
+    for var_addr, var in addr_to_var.items():
+        for nonce in range(10000):
+            if addr == compute_create_address(address=var_addr, nonce=nonce):
+                imports.needs_compute_create_address = True
+                return f"compute_create_address(address={var}, nonce={nonce})"
+
+    # Nested CREATE: address created by a contract that was itself created
+    # by a known address (2 levels deep, small nonce range to keep
+    # generation fast — most contracts CREATE only a few children).
+    for var_addr, var in addr_to_var.items():
+        for n1 in range(16):
+            child = compute_create_address(address=var_addr, nonce=n1)
+            for n2 in range(16):
+                if addr == compute_create_address(address=child, nonce=n2):
+                    imports.needs_compute_create_address = True
+                    return (
+                        f"compute_create_address("
+                        f"address=compute_create_address("
+                        f"address={var}, nonce={n1}), nonce={n2})"
+                    )
+
+    return f"Address({addr})"
diff --git a/scripts/filler_to_python/ir.py b/scripts/filler_to_python/ir.py
new file mode 100644
index 00000000000..18214cf9cb1
--- /dev/null
+++ b/scripts/filler_to_python/ir.py
@@ -0,0 +1,158 @@
+"""Intermediate Representation dataclasses for filler-to-python codegen."""
+
+from __future__ import annotations
+
+from dataclasses import dataclass, field
+
+from execution_testing.base_types import Address
+
+
+@dataclass
+class EnvironmentIR:
+    """IR for the test environment."""
+
+    coinbase_var: str
+    number: int
+    timestamp: int
+    difficulty: int | None = None
+    prev_randao: int | None = None
+    base_fee_per_gas: int | None = None
+    excess_blob_gas: int | None = None
+    gas_limit: int = 0
+
+
+@dataclass
+class AccountIR:
+    """IR for a pre-state account."""
+
+    var_name: str
+    is_tagged: bool
+    is_eoa: bool
+    is_sender: bool
+    balance: int = 0
+    nonce: int | None = None
+    address: Address | None = None
+    source_comment: str = ""
+    code_expr: str = ""
+    storage: dict = field(default_factory=dict)
+    oversized_code: bool = False
+    use_dynamic: bool = True
+
+
+@dataclass
+class AccountAssertionIR:
+    """IR for a post-state account assertion."""
+
+    var_ref: str
+    storage: dict | None = None
+    storage_any_keys: list = field(default_factory=list)
+    code: bytes | None = None
+    balance: int | None = None
+    nonce: int | None = None
+    should_not_exist: bool = False
+
+
+@dataclass
+class ExpectEntryIR:
+    """IR for one filler expect section."""
+
+    indexes: dict = field(default_factory=dict)
+    network: list = field(default_factory=list)
+    result: list = field(default_factory=list)
+    expect_exception: dict | None = None
+
+
+@dataclass
+class ParameterCaseIR:
+    """IR for one (d, g, v) parameter combo."""
+
+    d: int = 0
+    g: int = 0
+    v: int = 0
+    has_exception: bool = False
+    label: str | None = None
+    id: str = ""
+    marks: str | None = None
+
+
+@dataclass
+class AccessListEntryIR:
+    """IR for a single access list entry."""
+
+    address: str = ""
+    storage_keys: list = field(default_factory=list)
+    use_dynamic: bool = False
+
+
+@dataclass
+class TransactionIR:
+    """IR for the transaction."""
+
+    to_var: str | None = None
+    to_is_none: bool = False
+    gas_price: int | None = None
+    max_fee_per_gas: int | None = None
+    max_priority_fee_per_gas: int | None = None
+    max_fee_per_blob_gas: int | None = None
+    blob_versioned_hashes: list | None = None
+    nonce: int | None = None
+    access_list: list | None = None
+    per_data_access_lists: dict | None = None
+    data_inline: str | None = None
+    gas_limit: int | None = None
+    value: int | None = None
+
+
+@dataclass
+class SenderIR:
+    """IR for the transaction sender."""
+
+    is_tagged: bool = False
+    key: int | None = None
+    balance: int = 0
+    nonce: int | None = None
+    not_in_pre: bool = False
+    use_dynamic: bool = True
+
+
+@dataclass
+class ImportsIR:
+    """List of import requirements for the test."""
+
+    needs_op: bool = False
+    needs_access_list: bool = False
+    needs_bytes: bool = False
+    needs_hash: bool = False
+    needs_tx_exception: bool = False
+    needs_compute_create_address: bool = False
+
+
+@dataclass
+class IntermediateTestModel:
+    """Complete IR for one test file."""
+
+    test_name: str = ""
+    filler_path: str = ""
+    filler_comment: str = ""
+    category: str = ""
+    valid_from: str = ""
+    valid_until: str | None = None
+    is_slow: bool = False
+    is_multi_case: bool = False
+    is_fork_dependent: bool = False
+    needs_mutable_pre: bool = False
+    environment: EnvironmentIR = field(
+        default_factory=lambda: EnvironmentIR(
+            coinbase_var="coinbase", number=0, timestamp=0
+        )
+    )
+    accounts: list = field(default_factory=list)
+    sender: SenderIR = field(default_factory=SenderIR)
+    parameters: list = field(default_factory=list)
+    transaction: TransactionIR = field(default_factory=TransactionIR)
+    expect_entries: list = field(default_factory=list)
+    address_constants: list = field(default_factory=list)
+    tx_data: list = field(default_factory=list)
+    tx_gas: list = field(default_factory=list)
+    tx_value: list = field(default_factory=list)
+    imports: ImportsIR = field(default_factory=ImportsIR)
diff --git a/scripts/filler_to_python/render.py b/scripts/filler_to_python/render.py
new file mode 100644
index 00000000000..000abe511f5
--- /dev/null
+++ b/scripts/filler_to_python/render.py
@@ -0,0 +1,295 @@
+"""Jinja2 rendering for filler-to-python codegen."""
+
+from __future__ import annotations
+
+from dataclasses import asdict
+from pathlib import Path
+
+import jinja2
+
+from .ir import AccountAssertionIR, IntermediateTestModel
+
+TEMPLATE_DIR = Path(__file__).parent / "templates"
+
+
+# ---------------------------------------------------------------------------
+# Custom Jinja2 filters
+# ---------------------------------------------------------------------------
+
+
+def format_int(v: int | None) -> str:
+    """Format an integer as Python literal: hex for large values."""
+    if v is None:
+        return "0"
+    if isinstance(v, bool):
+        return str(v)
+    v = int(v)
+    if v > 0xFFFF:
+        return hex(v)
+    return str(v)
+
+
+def format_hex(v: int | str) -> str:
+    """Always format as hex."""
+    if isinstance(v, str):
+        return v
+    return hex(int(v))
+
+
+def format_storage(d: dict) -> str:
+    """Format a {slot: value} storage dict as Python literal."""
+    if not d:
+        return "{}"
+    items = []
+    for k in sorted(d.keys()):
+        v = d[k]
+        if isinstance(v, str):
+            items.append(f"{format_int(k)}: {v}")
+        else:
+            items.append(f"{format_int(k)}: {format_int(v)}")
+    single = "{" + ", ".join(items) + "}"
+    if len(single) <= 50:
+        return single
+    formatted = ",\n            ".join(items)
+    return "{\n            " + formatted + ",\n        }"
+
+
+def format_account(a: AccountAssertionIR) -> str:
+    """Format an AccountAssertionIR as Account(...) expression."""
+    if a.should_not_exist:
+        return "Account.NONEXISTENT"
+
+    parts: list[str] = []
+    if a.storage is not None:
+        if a.storage_any_keys:
+            # Need Storage object with set_expect_any calls
+            storage_str = format_storage(a.storage)
+            any_keys = a.storage_any_keys
+            parts.append(
+                f"storage=_storage_with_any({storage_str}, {any_keys})"
+            )
+        else:
+            parts.append(f"storage={format_storage(a.storage)}")
+    if a.code is not None:
+        if a.code:
+            parts.append(f'code=bytes.fromhex("{a.code.hex()}")')
+        else:
+            parts.append('code=b""')
+    if a.balance is not None:
+        parts.append(f"balance={format_int(a.balance)}")
+    if a.nonce is not None:
+        parts.append(f"nonce={a.nonce}")
+
+    if not parts:
+        return "Account()"
+    single = "Account(" + ", ".join(parts) + ")"
+    if len(single) <= 60:
+        return single
+    inner = ",\n                ".join(parts)
+    return "Account(\n                " + inner + ",\n            )"
+
+
+def format_post(result: list) -> str:
+    """Format a list of AccountAssertionIR as a post dict literal."""
+    if not result:
+        return "{}"
+
+    entries: list[str] = []
+    for a in result:
+        entries.append(f"{a.var_ref}: {format_account(a)}")
+
+    if len(entries) == 1:
+        single = "{" + entries[0] + "}"
+        if len(single) <= 70:
+            return single
+
+    inner = ",\n        ".join(entries)
+    return "{\n        " + inner + ",\n    }"
+
+
+def format_expect_exception(d: dict) -> str:
+    """Format expect_exception dict with unquoted exception values."""
+    items = []
+    for k, v in d.items():
+        items.append(f'"{k}": {v}')
+    return "{" + ", ".join(items) + "}"
+
+
+def wrap_op_chain(s: str, indent: int = 8) -> str:
+    """Split an Op chain at + boundaries to fit 79-char lines."""
+    if not s:
+        return '""'
+
+    prefix = " " * indent
+    # If it fits on one line, just return it
+    if len(prefix + s) <= 79:
+        return s
+
+    # If it's a bytes.fromhex expression, just return it (will get noqa)
+    if s.startswith("bytes.fromhex("):
+        return s
+
+    # Split at " + "
+    parts = s.split(" + ")
+    if len(parts) <= 1:
+        return s
+
+    lines: list[str] = []
+    current_line = parts[0]
+    for part in parts[1:]:
+        candidate = current_line + " + " + part
+        if len(prefix + candidate) <= 79:
+            current_line = candidate
+        else:
+            lines.append(current_line)
+            current_line = part
+
+    lines.append(current_line)
+
+    if len(lines) == 1:
+        return lines[0]
+
+    joiner = "\n" + prefix + "+ "
+    return lines[0] + joiner + joiner.join(lines[1:])
+
+
+# ---------------------------------------------------------------------------
+# Template rendering
+# ---------------------------------------------------------------------------
+
+
+def _build_template_env() -> jinja2.Environment:
+    """Create and configure the Jinja2 environment."""
+    env = jinja2.Environment(
+        loader=jinja2.FileSystemLoader(str(TEMPLATE_DIR)),
+        keep_trailing_newline=True,
+        trim_blocks=True,
+        lstrip_blocks=True,
+    )
+    env.filters["format_int"] = format_int
+    env.filters["format_hex"] = format_hex
+    env.filters["format_storage"] = format_storage
+    env.filters["format_account"] = format_account
+    env.filters["format_post"] = format_post
+    env.filters["format_expect_exception"] = format_expect_exception
+    env.filters["wrap_op_chain"] = wrap_op_chain
+    return env
+
+
+_template_env = _build_template_env()
+
+
+def render_test(ir: IntermediateTestModel) -> str:
+    """Render a Python test file from an IR model."""
+    template = _template_env.get_template("state_test.py.j2")
+
+    # Build short docstring (first sentence of filler comment)
+    short_docstring = ir.filler_comment or ir.test_name
+    if "." in short_docstring:
+        short_docstring = short_docstring[: short_docstring.index(".") + 1]
+    if len(short_docstring) > 70:
+        # Truncate at word boundary
+        truncated = short_docstring[:67]
+        last_space = truncated.rfind(" ")
+        if last_space > 40:
+            truncated = truncated[:last_space]
+        short_docstring = truncated + "..."
+    # Ensure ends with period (D400/D415)
+    if not short_docstring.endswith("."):
+        short_docstring += "."
+    # Capitalize first letter (D403), avoid "This" (D404)
+    if short_docstring and short_docstring[0].islower():
+        short_docstring = short_docstring[0].upper() + short_docstring[1:]
+    if short_docstring.startswith("This "):
+        short_docstring = "Test: t" + short_docstring[2:]
+    # Escape any quotes
+    short_docstring = short_docstring.replace('"', '\\"')
+
+    # Build docstring — ensure first line ends with period (D400/D415)
+    docstring = ir.filler_comment or ir.test_name
+    first_line = docstring.split("\n")[0]
+    if not first_line.rstrip().endswith("."):
+        docstring = (
+            first_line.rstrip() + ".\n" + "\n".join(docstring.split("\n")[1:])
+        )
+        docstring = docstring.rstrip()
+    # Capitalize first letter (D403) and avoid starting with "This" (D404)
+    if docstring and docstring[0].islower():
+        docstring = docstring[0].upper() + docstring[1:]
+    if docstring.startswith("This "):
+        docstring = "Test: " + docstring[0].lower() + docstring[1:]
+    # Ensure all docstring lines fit 79 chars.
+    # First line must end with period (D400), so truncate if needed.
+    import textwrap
+
+    doc_lines = docstring.split("\n")
+    first = doc_lines[0]
+    if len(first) > 75:
+        # Truncate at word boundary, add period
+        trunc = first[:72]
+        sp = trunc.rfind(" ")
+        if sp > 40:
+            trunc = trunc[:sp]
+        first = trunc + "..."
+        if not first.endswith("."):
+            first += "."
+    doc_lines[0] = first
+    # Ensure blank line after first line so D400 only checks line 1
+    if len(doc_lines) > 1 and doc_lines[1].strip():
+        doc_lines.insert(1, "")
+    wrapped_lines: list[str] = [doc_lines[0]]
+    for line in doc_lines[1:]:
+        if len(line) > 79:
+            wrapped_lines.extend(textwrap.wrap(line, width=79))
+        else:
+            wrapped_lines.append(line)
+    docstring = "\n".join(wrapped_lines)
+
+    # Has exceptions?
+    has_exceptions = any(p.has_exception for p in ir.parameters)
+
+    # Needs _storage_with_any helper?
+    needs_storage_any = any(
+        a.storage_any_keys for entry in ir.expect_entries for a in entry.result
+    )
+
+    # Single-case post and error
+    single_post = None
+    single_error = None
+    if ir.expect_entries and len(ir.expect_entries) == 1:
+        entry = ir.expect_entries[0]
+        if entry.result:
+            single_post = entry.result
+        if entry.expect_exception:
+            exc_values = list(entry.expect_exception.values())
+            if exc_values:
+                single_error = exc_values[0]
+
+    context = {
+        "docstring": docstring,
+        "filler_path": ir.filler_path,
+        "test_name": ir.test_name,
+        "short_docstring": short_docstring,
+        "valid_from": ir.valid_from,
+        "valid_until": ir.valid_until,
+        "is_slow": ir.is_slow,
+        "is_multi_case": ir.is_multi_case,
+        "is_fork_dependent": ir.is_fork_dependent,
+        "needs_mutable_pre": ir.needs_mutable_pre,
+        "has_exceptions": has_exceptions,
+        "env": ir.environment,
+        "accounts": ir.accounts,
+        "tx": ir.transaction,
+        "tx_data": ir.tx_data,
+        "tx_gas": ir.tx_gas,
+        "tx_value": ir.tx_value,
+        "expect_entries": ir.expect_entries,
+        "parameters": ir.parameters,
+        "sender": ir.sender,
+        "address_constants": ir.address_constants,
+        "needs_storage_any": needs_storage_any,
+        "single_post": single_post,
+        "single_error": single_error,
+    } | asdict(ir.imports)
+
+    return template.render(**context)
diff --git a/scripts/filler_to_python/templates/state_test.py.j2 b/scripts/filler_to_python/templates/state_test.py.j2
new file mode 100644
index 00000000000..5f0e7559e1d
--- /dev/null
+++ b/scripts/filler_to_python/templates/state_test.py.j2
@@ -0,0 +1,412 @@
+{#-
+    Jinja2 template for generating Python test files from static fillers.
+
+    Parametrize approach: always (d, g, v).
+    Transaction fields are looked up from module-level arrays:
+        tx_data[d], tx_gas[g], tx_value[v]
+    Post-state and exceptions are resolved at runtime:
+        resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    Context variables (from IntermediateTestModel via render.py):
+
+        docstring           str       Module docstring (from _info.comment)
+        filler_path         str       Relative path to filler file
+        test_name           str       Python function name (test_xxx)
+        short_docstring     str       One-line docstring for the function
+        valid_from          str       Fork name (e.g., "Cancun")
+        valid_until         str|None  Fork name or None
+        is_slow             bool      Mark @pytest.mark.slow
+        is_multi_case       bool      len(parameters) > 1
+        has_exceptions      bool      Any case has an exception
+
+        needs_op            bool      Import Op
+        needs_tx_exception  bool      Import TransactionException
+        needs_access_list   bool      Import AccessList
+        needs_hash          bool      Import Hash
+
+        env                 EnvironmentIR
+        accounts            list[AccountIR]
+        transaction         TransactionIR
+
+        -- Module-level arrays (from filler transaction) --
+
+        tx_data             list[str]   Compiled data hex per d index
+        tx_gas              list[int]   Gas limit per g index
+        tx_value            list[int]   Value per v index
+
+        -- Expect entries (from filler expect sections) --
+
+        expect_entries      list[ExpectEntryIR]
+                            Each has: .indexes (dict), .network (list[str]),
+                            .result (dict: var_name -> Account assertion),
+                            .expect_exception (dict | None)
+                            Resolved from expect.result.resolve(tags).
+                            Used at runtime by resolve_expect_post().
+
+        -- Parametrize (d, g, v) combos --
+
+        parameters          list[ParameterCaseIR]
+                            Each has: .d, .g, .v, .has_exception, .label
+                            Built from data x gasLimit x value matrix.
+
+        -- Single-case data (when not is_multi_case) --
+
+        single_post         str|None    Formatted post dict, or None if empty
+        single_error        str|None    Formatted error, or None
+
+        -- Sender --
+
+        sender              SenderIR    .is_tagged, .key, .balance
+        address_constants   list        Non-tagged address variables
+                                        [{var_name, hex}]
+
+    Custom filters:
+        format_int(v)           Hex vs decimal heuristic
+        format_storage(d)       Format {slot: value} dict
+        format_account(a)       Format Account(storage=..., code=...)
+        format_post(post)       Format post dict {addr: Account(...)}
+        wrap_op_chain(s, ind)   Split Op chain at + for 79-char lines
+-#}
+"""
+{{ docstring }}
+
+Ported from:
+{{ filler_path }}
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+{% if needs_bytes %}
+    Bytes,
+{% endif %}
+    Environment,
+    StateTestFiller,
+    Transaction,
+{% if needs_tx_exception %}
+    TransactionException,
+{% endif %}
+{% if needs_access_list %}
+    AccessList,
+{% endif %}
+{% if needs_hash %}
+    Hash,
+{% endif %}
+{% if needs_storage_any %}
+    Storage,
+{% endif %}
+{% if needs_compute_create_address %}
+    compute_create_address,
+{% endif %}
+)
+{% if needs_op %}
+from execution_testing.vm import Op
+{% endif %}
+{% if is_multi_case %}
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+{% elif is_fork_dependent %}
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post_fork,
+)
+{% endif %}
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+{% if needs_storage_any %}
+def _storage_with_any(base: dict, any_keys: list) -> Storage:
+    """Create Storage with set_expect_any for specified keys."""
+    s = Storage(base)
+    for k in any_keys:
+        s.set_expect_any(k)
+    return s
+
+{% endif %}
+
+@pytest.mark.ported_from(
+    ["{{ filler_path }}"],
+)
+@pytest.mark.valid_from("{{ valid_from }}")
+{% if valid_until %}
+@pytest.mark.valid_until("{{ valid_until }}")
+{% endif %}
+{% if is_slow %}
+@pytest.mark.slow
+{% endif %}
+{% if is_multi_case %}
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+{% for case in parameters %}
+        pytest.param(
+            {{ case.d }}, {{ case.g }}, {{ case.v }},
+            id="{{ case.id }}",
+{% if case.marks %}
+            marks={{ case.marks }},
+{% endif %}
+        ),
+{% endfor %}
+    ],
+)
+{% endif %}
+{% if has_exceptions and not is_multi_case %}
+@pytest.mark.exception_test
+{% endif %}
+{% if needs_mutable_pre %}
+@pytest.mark.pre_alloc_mutable
+{% endif %}
+def {{ test_name }}(
+    state_test: StateTestFiller,
+    pre: Alloc,
+{% if is_multi_case %}
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+{% elif is_fork_dependent %}
+    fork: Fork,
+{% endif %}
+) -> None:
+    """{{ short_docstring }}"""
+{% for addr in address_constants %}
+    {{ addr.var_name }} = Address({{ addr.hex }})
+{% endfor %}
+{% if sender.use_dynamic %}
+{% if sender.nonce %}
+    sender = pre.fund_eoa(amount={{ sender.balance | format_int }}, nonce={{ sender.nonce }})
+{% else %}
+    sender = pre.fund_eoa(amount={{ sender.balance | format_int }})
+{% endif %}
+{% elif sender.not_in_pre %}
+    sender = pre.fund_eoa(amount=0)
+{% else %}
+    sender = EOA(
+        key={{ sender.key | format_int }}
+    )
+{% endif %}
+
+    env = Environment(
+        fee_recipient={{ env.coinbase_var }},
+        number={{ env.number }},
+        timestamp={{ env.timestamp }},
+{% if env.prev_randao is not none %}
+        prev_randao={{ env.prev_randao | format_int }},
+{% endif %}
+{% if env.difficulty is not none and env.prev_randao is none %}
+        difficulty={{ env.difficulty | format_int }},
+{% endif %}
+{% if env.base_fee_per_gas is not none %}
+        base_fee_per_gas={{ env.base_fee_per_gas }},
+{% endif %}
+{% if env.excess_blob_gas is not none %}
+        excess_blob_gas={{ env.excess_blob_gas | format_int }},
+{% endif %}
+        gas_limit={{ env.gas_limit }},
+    )
+
+{# Pre-state account setup #}
+{% for account in accounts %}
+{% if account.is_sender and sender.use_dynamic %}
+{# Sender balance already set via pre.fund_eoa() above #}
+{% elif account.is_sender %}
+    pre[sender] = Account(balance={{ account.balance | format_int }}{{ ", nonce=%d" | format(account.nonce) if account.nonce }}{{ ", storage=%s" | format(account.storage | format_storage) if account.storage }}{{ ", code=%s" | format(account.code_expr | wrap_op_chain(indent=8)) if account.code_expr }})
+{% elif account.is_eoa and account.use_dynamic %}
+    {{ account.var_name }} = pre.fund_eoa(amount={{ account.balance | format_int }})  # noqa: F841
+{% elif account.is_eoa %}
+    pre[{{ account.var_name }}] = Account(balance={{ account.balance | format_int }}{{ ", nonce=%d" | format(account.nonce) if account.nonce }}{{ ", storage=%s" | format(account.storage | format_storage) if account.storage }}{{ ", code=%s" | format(account.code_expr | wrap_op_chain(indent=8)) if account.code_expr }})
+{% else %}
+{# Contract: source comment + deploy #}
+{{ account.source_comment }}
+{% if account.oversized_code %}
+    {{ account.var_name }} = Address({{ account.address }})  # oversized contract
+    pre[{{ account.var_name }}] = Account(
+        code={{ account.code_expr | wrap_op_chain(indent=8) }},
+{% if account.storage %}
+        storage={{ account.storage | format_storage }},
+{% endif %}
+{% if account.balance %}
+        balance={{ account.balance | format_int }},
+{% endif %}
+{% if account.nonce is not none %}
+        nonce={{ account.nonce }},
+{% endif %}
+    )
+{% else %}
+    {{ account.var_name }} = pre.deploy_contract(
+        code={{ account.code_expr | wrap_op_chain(indent=8) }},
+{% if account.storage %}
+        storage={{ account.storage | format_storage }},
+{% endif %}
+{% if account.balance %}
+        balance={{ account.balance | format_int }},
+{% endif %}
+{% if account.nonce is not none %}
+        nonce={{ account.nonce }},
+{% endif %}
+{% if not account.use_dynamic %}
+        address=Address({{ account.address }}),  # noqa: E501
+{% endif %}
+    )
+{% endif %}
+{% endif %}
+{% endfor %}
+
+{# Expect entries (used by resolve_expect_post at runtime) #}
+{% if single_post %}
+{# Post will be assigned below #}
+{% elif is_multi_case or is_fork_dependent %}
+    expect_entries_: list[dict] = [
+{% for entry in expect_entries %}
+        {
+{% if is_multi_case %}
+            "indexes": {{ entry.indexes }},
+{% endif %}
+            "network": {{ entry.network }},
+            "result": {{ entry.result | format_post }},
+{% if entry.expect_exception %}
+            "expect_exception": {{ entry.expect_exception | format_expect_exception }},
+{% endif %}
+        },
+{% endfor %}
+    ]
+
+{% if is_multi_case %}
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+{% else %}
+    post, _exc = resolve_expect_post_fork(expect_entries_, fork)
+{% endif %}
+{% endif %}
+
+{% if is_multi_case %}
+{# Case value arrays: tx fields indexed by d, g, v #}
+    tx_data = [
+    {% for d in tx_data %}
+        {{ d }},
+    {% endfor %}
+    ]
+    tx_gas = [{{ tx_gas | join(", ") }}]
+{% if tx_value != [0] %}
+    tx_value = [{{ tx_value | join(", ") }}]
+{% endif %}
+{% if tx.per_data_access_lists %}
+    tx_access_lists: dict[int, list] = {
+    {% for d_idx, al_entries in tx.per_data_access_lists.items() %}
+        {{ d_idx }}: [
+    {% for al in al_entries %}
+            AccessList(
+    {% if al.use_dynamic %}
+                address={{ al.address }},
+    {% else %}
+                address=Address({{ al.address }}),
+    {% endif %}
+                storage_keys=[
+    {% for sk in al.storage_keys %}
+                    Hash("{{ sk }}"),  # noqa: E501
+    {% endfor %}
+                ],
+            ),
+    {% endfor %}
+        ],
+    {% endfor %}
+    }
+{% endif %}
+
+{% endif %}
+
+{# Transaction #}
+    tx = Transaction(
+        sender=sender,
+{% if tx.to_var is not none %}
+        to={{ tx.to_var }},
+{% elif tx.to_is_none %}
+        to=None,
+{% endif %}
+{% if is_multi_case %}
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+{% if tx_value != [0] %}
+        value=tx_value[v],
+{% endif %}
+{% else %}
+{% if tx.data_inline and tx.data_inline != "b''" %}
+        data={{ tx.data_inline }},
+{% endif %}
+{% if tx.gas_limit is not none and tx.gas_limit != 21000 %}
+        gas_limit={{ tx.gas_limit }},
+{% endif %}
+{% if tx.value %}
+        value={{ tx.value | format_int }},
+{% endif %}
+{% endif %}
+{% if tx.max_fee_per_gas is not none %}
+        max_fee_per_gas={{ tx.max_fee_per_gas }},
+{% endif %}
+{% if tx.max_priority_fee_per_gas is not none %}
+        max_priority_fee_per_gas={{ tx.max_priority_fee_per_gas }},
+{% endif %}
+{% if tx.nonce is not none and tx.nonce != 0 %}
+        nonce={{ tx.nonce }},
+{% endif %}
+{% if tx.gas_price is not none and tx.gas_price != 10 %}
+        gas_price={{ tx.gas_price }},
+{% endif %}
+{% if tx.max_fee_per_blob_gas is not none %}
+        max_fee_per_blob_gas={{ tx.max_fee_per_blob_gas | format_int }},
+{% endif %}
+{% if tx.blob_versioned_hashes is not none %}
+        blob_versioned_hashes=[
+{% for h in tx.blob_versioned_hashes %}
+            Hash(
+                "{{ h }}"  # noqa: E501
+            ),
+{% endfor %}
+        ],
+{% endif %}
+{% if tx.per_data_access_lists and is_multi_case %}
+        access_list=tx_access_lists.get(d),
+{% elif tx.access_list is not none %}
+        access_list=[
+{% for al in tx.access_list %}
+            AccessList(
+{% if al.use_dynamic %}
+                address={{ al.address }},
+{% else %}
+                address=Address({{ al.address }}),
+{% endif %}
+                storage_keys=[
+{% for sk in al.storage_keys %}
+                    Hash(
+                        "{{ sk }}"  # noqa: E501
+                    ),
+{% endfor %}
+                ],
+            ),
+{% endfor %}
+        ],
+{% endif %}
+{% if single_error %}
+        error={{ single_error }},
+{% elif single_post %}
+    {# Single post without error #}
+{% elif is_multi_case or is_fork_dependent %}
+        error=_exc,
+{% endif %}
+    )
+
+{# Post-state #}
+{% if single_post %}
+    post = {{ single_post | format_post }}
+{% elif is_multi_case or is_fork_dependent %}
+{# Post resolved above via resolve_expect_post / resolve_expect_post_fork #}
+{% else %}
+    post: dict = {}
+{% endif %}
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/scripts/fixture_to_python.py b/scripts/fixture_to_python.py
deleted file mode 100644
index c31b9ad52ae..00000000000
--- a/scripts/fixture_to_python.py
+++ /dev/null
@@ -1,2705 +0,0 @@
-#!/usr/bin/env python3
-"""
-Convert compiled state_test fixtures to Python test files.
-
-Reads compiled fixture JSON (from --fill-static-tests) and source filler
-(for _info.comment), then generates a Python test file with:
-- Module docstring from _info.comment
-- Op-language bytecode (readable, self-documenting)
-- Proper pytest markers and structure
-- Maximum embedded context for future Amsterdam porting
-
-Usage:
-    python scripts/fixture_to_python.py \
-        --fixtures /tmp/compiled_static/ \
-        --fillers tests/static/state_tests/ \
-        --output tests/ported_static/
-"""
-
-from __future__ import annotations
-
-import argparse
-import json
-import os
-import re
-import subprocess
-import sys
-import textwrap
-from pathlib import Path
-from typing import Any
-
-# ---------------------------------------------------------------------------
-# Categories that are prohibitively slow to fill — mark with @pytest.mark.slow
-# ---------------------------------------------------------------------------
-
-SLOW_CATEGORIES = {
-    "stQuadraticComplexityTest",
-    "stStaticCall",
-    "stTimeConsuming",
-}
-
-# ---------------------------------------------------------------------------
-# Fork ordering (earliest to latest)
-# ---------------------------------------------------------------------------
-
-FORK_ORDER = [
-    "Frontier",
-    "Homestead",
-    "EIP150",
-    "EIP158",
-    "Byzantium",
-    "Constantinople",
-    "ConstantinopleFix",
-    "Istanbul",
-    "Berlin",
-    "London",
-    "Paris",
-    "Shanghai",
-    "Cancun",
-    "Prague",
-    "Osaka",
-    "Amsterdam",
-]
-FORK_RANK = {name: i for i, name in enumerate(FORK_ORDER)}
-
-
-def earliest_fork(forks: set[str]) -> str:
-    """Return the earliest fork from a set, by FORK_ORDER."""
-    known = [f for f in forks if f in FORK_RANK]
-    if not known:
-        return sorted(forks)[0]  # fallback alphabetical
-    return min(known, key=lambda f: FORK_RANK[f])
-
-
-def fork_before(fork_name: str) -> str | None:
-    """Return the fork immediately before the given fork in FORK_ORDER."""
-    if fork_name not in FORK_RANK:
-        return None
-    idx = FORK_RANK[fork_name]
-    if idx <= 0:
-        return None
-    return FORK_ORDER[idx - 1]
-
-
-def _next_fork(fork_name: str) -> str | None:
-    """Return the fork immediately after the given fork in FORK_ORDER."""
-    if fork_name not in FORK_RANK:
-        return None
-    idx = FORK_RANK[fork_name]
-    if idx + 1 >= len(FORK_ORDER):
-        return None
-    return FORK_ORDER[idx + 1]
-
-
-def detect_fork_ranges(
-    earliest_fixture: dict[str, Any],
-    other_fixtures: dict[str, dict[str, Any]],
-    earliest_fork: str,
-) -> list[tuple[str, str | None, dict[str, Any]]]:
-    """
-    Detect fork ranges where post-states are identical.
-
-    Compare post-state hashes from the earliest fork's fixture against
-    other forks' fixtures.  Return a list of
-    (valid_from, valid_until, fixture_data) tuples where valid_until
-    is the last fork in the range (None = no upper bound).
-
-    If no divergence is found, returns a single range covering all forks.
-    """
-    # Available forks in order
-    avail_forks = sorted(
-        [earliest_fork] + list(other_fixtures.keys()),
-        key=lambda f: FORK_RANK.get(f, 999),
-    )
-
-    # Build per-case post-state hashes for each fork
-    def _post_hashes(data: dict, fork: str) -> list[str]:
-        hashes = []
-        for key in sorted(data.keys()):
-            post = data[key].get("post", {})
-            entries = post.get(fork, [])
-            if isinstance(entries, list) and entries:
-                hashes.append(entries[0].get("hash", ""))
-            else:
-                hashes.append("")
-        return hashes
-
-    fork_hashes: dict[str, list[str]] = {}
-    fork_hashes[earliest_fork] = _post_hashes(earliest_fixture, earliest_fork)
-    for fork, data in other_fixtures.items():
-        fork_hashes[fork] = _post_hashes(data, fork)
-
-    # Find fork transitions where hashes change
-    # Group consecutive forks with identical hashes into ranges
-    ranges: list[tuple[str, str | None, dict[str, Any]]] = []
-    range_start = avail_forks[0]
-    range_fixture = earliest_fixture
-
-    for i in range(len(avail_forks) - 1):
-        cur = avail_forks[i]
-        nxt = avail_forks[i + 1]
-        cur_h = fork_hashes.get(cur, [])
-        nxt_h = fork_hashes.get(nxt, [])
-        if cur_h != nxt_h:
-            # Hashes differ — close current range
-            ranges.append((range_start, cur, range_fixture))
-            range_start = nxt
-            range_fixture = (
-                other_fixtures[nxt]
-                if nxt in other_fixtures
-                else earliest_fixture
-            )
-
-    # Close the final range (no upper bound)
-    ranges.append((range_start, None, range_fixture))
-    return ranges
-
-
-def parse_network_upper_bound(network_str: str) -> str | None:
-    """
-    Parse the upper fork bound from a network string.
-
-    Examples:
-        ">=Cancun"       -> None (no upper bound)
-        ">=Cancun<Osaka" -> "Osaka" (exclusive upper bound)
-        "Cancun"         -> None (exact fork)
-
-    """
-    match = re.search(r"<(\w+)$", network_str.strip())
-    if match:
-        return match.group(1)
-    return None
-
-
-def parse_network_lower_bound(network_str: str) -> str | None:
-    """
-    Parse the lower fork bound from a network string.
-
-    Examples:
-        ">=Cancun"       -> "Cancun"
-        ">=Cancun<Osaka" -> "Cancun"
-        "Cancun"         -> "Cancun" (exact fork)
-
-    """
-    match = re.match(r">=(\w+)", network_str.strip())
-    if match:
-        return match.group(1)
-    # Exact fork name
-    s = network_str.strip()
-    if s in FORK_RANK:
-        return s
-    return None
-
-
-# ---------------------------------------------------------------------------
-# Helpers
-# ---------------------------------------------------------------------------
-
-
-def camel_to_snake(name: str) -> str:
-    """Convert CamelCase to snake_case, preserving leading numbers."""
-    # Insert _ before uppercase letters preceded by lowercase or digits
-    s = re.sub(r"([a-z0-9])([A-Z])", r"\1_\2", name)
-    # Insert _ before uppercase followed by lowercase (ABCDef -> ABC_Def)
-    s = re.sub(r"([A-Z]+)([A-Z][a-z])", r"\1_\2", s)
-    return s.lower()
-
-
-def filler_name_to_test_name(filler_stem: str) -> str:
-    """
-    Convert filler stem to Python test function/file name.
-
-    e.g. 'callcode_checkPCFiller' -> 'test_callcode_check_pc'
-    e.g. 'ContractCreationSpamFiller' -> 'test_contract_creation_spam'
-    e.g. 'mem32kb+1Filler' -> 'test_mem32kb_plus_1'
-    e.g. 'mem32kb-1Filler' -> 'test_mem32kb_minus_1'
-    """
-    # Strip 'Filler' suffix
-    name = re.sub(r"Filler$", "", filler_stem)
-    result = "test_" + camel_to_snake(name)
-    # Replace + and - with descriptive words before general cleanup
-    result = result.replace("+", "_plus_")
-    result = result.replace("-", "_minus_")
-    # Replace remaining non-alphanumeric chars with underscores
-    result = re.sub(r"[^a-z0-9_]", "_", result)
-    # Collapse multiple underscores
-    result = re.sub(r"_+", "_", result)
-    return result.strip("_")
-
-
-def hex_to_int(v: str) -> int:
-    """Convert hex string to int."""
-    return int(v, 16)
-
-
-def format_int(v: int, *, force_hex: bool = False) -> str:
-    """Format an int as Python literal. Use hex for large values."""
-    if force_hex or v > 0xFFFF:
-        return hex(v)
-    return str(v)
-
-
-def format_balance(v: int) -> str:
-    """Format balance as Python literal."""
-    return format_int(v, force_hex=(v > 9999))
-
-
-def format_storage(
-    storage: dict[str, str],
-    indent: str = "                ",
-) -> str:
-    """Format storage dict as Python literal."""
-    if not storage:
-        return "{}"
-    items = []
-    for k, v in sorted(storage.items(), key=lambda x: int(x[0], 16)):
-        items.append(f"{hex(int(k, 16))}: {hex(int(v, 16))}")
-    single = "{" + ", ".join(items) + "}"
-    if len(single) <= 50:
-        return single
-    formatted: list[str] = []
-    for item in items:
-        formatted.append(item + ",")
-    inner = ("\n" + indent).join(formatted)
-    close = indent[4:] if len(indent) >= 4 else ""
-    return "{\n" + indent + inner + "\n" + close + "}"
-
-
-def _format_exception(exc_str: str) -> str:
-    """
-    Format an expectException string as Python code.
-
-    Single: 'TransactionException.FOO' -> 'TransactionException.FOO'
-    Compound: 'TransactionException.FOO|TransactionException.BAR'
-        -> '[TransactionException.FOO, TransactionException.BAR]'
-    """
-    parts = [p.strip() for p in exc_str.split("|")]
-    if len(parts) == 1:
-        return parts[0]
-    single = "[" + ", ".join(parts) + "]"
-    if len("        error=" + single + ",") <= 79:
-        return single
-    inner = ",\n            ".join(parts)
-    return "[\n            " + inner + ",\n        ]"
-
-
-def _format_access_list(
-    al: list[dict[str, Any]],
-    multiline: bool = True,
-) -> str:
-    """Format an access list as Python code."""
-    if not al:
-        return "[]"
-    items = []
-    for entry in al:
-        addr = _pad_address(entry["address"])
-        keys = entry.get("storageKeys", [])
-        if keys:
-            key_strs = ", ".join(f'Hash("{k}")' for k in keys)
-            single = (
-                f'AccessList(address=Address("{addr}"),'
-                f" storage_keys=[{key_strs}])"
-            )
-            if multiline and len("            " + single) > 79:
-                key_items = [f'Hash("{k}")' for k in keys]
-                ki = ",\n                    ".join(key_items)
-                items.append(
-                    f"AccessList(\n"
-                    f'                address=Address("{addr}"),\n'
-                    f"                storage_keys=[\n"
-                    f"                    {ki},\n"
-                    f"                ],\n"
-                    f"            )"
-                )
-            else:
-                items.append(single)
-        else:
-            items.append(
-                f'AccessList(address=Address("{addr}"), storage_keys=[])'
-            )
-    if not multiline:
-        return "[" + ", ".join(items) + "]"
-    if len(items) == 1:
-        single = f"[{items[0]}]"
-        if "\n" not in single and len("        " + single + ",") <= 79:
-            return single
-    inner = ",\n            ".join(items)
-    return f"[\n            {inner},\n        ]"
-
-
-def bytecode_to_op_string(hex_code: str) -> str | None:
-    """
-    Convert hex bytecode to Op expression string.
-
-    Returns None if bytecode is empty, conversion fails, or roundtrip
-    produces different bytecode (evm_bytes has edge cases with PUSH parsing).
-    """
-    if hex_code in ("0x", "0x00", ""):
-        return None
-
-    raw = hex_code[2:] if hex_code.startswith("0x") else hex_code
-
-    try:
-        from execution_testing import Op
-        from execution_testing.cli.evm_bytes import process_evm_bytes_string
-
-        op_str = process_evm_bytes_string(raw, assembly=False)
-        # Verify roundtrip: compile Op back to hex and compare
-        compiled = eval(op_str, {"Op": Op})  # noqa: S307
-        if compiled.hex() != raw.lower():
-            return None  # Roundtrip mismatch — fall back to bytes.fromhex
-        return op_str
-    except Exception:
-        return None
-
-
-def bytecode_to_assembly_summary(
-    hex_code: str, max_lines: int = 20
-) -> str | None:
-    """Get a short assembly summary of bytecode for docstrings."""
-    if hex_code in ("0x", "0x00", ""):
-        return None
-
-    raw = hex_code[2:] if hex_code.startswith("0x") else hex_code
-
-    try:
-        from execution_testing.cli.evm_bytes import process_evm_bytes_string
-
-        asm = process_evm_bytes_string(raw, assembly=True)
-        lines = [x for x in asm.split("\n") if x.strip()]
-        if len(lines) <= max_lines:
-            return "\n".join(lines)
-        return (
-            "\n".join(lines[:max_lines])
-            + f"\n... ({len(lines) - max_lines} more instructions)"
-        )
-    except Exception:
-        return None
-
-
-# ---------------------------------------------------------------------------
-# Filler context extraction
-# ---------------------------------------------------------------------------
-
-
-def _load_filler_data(filler_path: Path) -> dict | None:
-    """
-    Load and parse a filler file (JSON or YAML).
-
-    Return the parsed dict, or None on failure.
-    """
-    raw: str | None = None
-    suffix = filler_path.suffix
-
-    if filler_path.exists():
-        raw = filler_path.read_text()
-    else:
-        # Try relative to repo root
-        try:
-            repo_root = Path(
-                subprocess.check_output(
-                    ["git", "rev-parse", "--show-toplevel"],
-                    stderr=subprocess.DEVNULL,
-                )
-                .decode()
-                .strip()
-            )
-            resolved = repo_root / filler_path
-            if resolved.exists():
-                raw = resolved.read_text()
-        except (subprocess.CalledProcessError, OSError):
-            pass
-
-    if raw is None:
-        return None
-
-    try:
-        if suffix == ".json":
-            return json.loads(raw)
-        elif suffix in (".yml", ".yaml"):
-            try:
-                import yaml
-
-                return yaml.safe_load(raw)
-            except ImportError:
-                return None
-        return None
-    except Exception:
-        return None
-
-
-def load_filler_comment(filler_path: Path) -> str:
-    """Extract _info.comment from a filler file."""
-    data = _load_filler_data(filler_path)
-    if not data:
-        return ""
-    try:
-        for _test_name, test_data in data.items():
-            if isinstance(test_data, dict) and "_info" in test_data:
-                comment = test_data["_info"].get("comment", "")
-                if comment:
-                    return comment
-    except Exception:
-        pass
-    return ""
-
-
-def load_filler_network_upper_bound(filler_path: Path) -> str | None:
-    """
-    Extract the strictest upper fork bound from a filler's network fields.
-
-    Parses expect[].network entries like ">=Cancun<Osaka" and returns the
-    excluded fork name (e.g. "Osaka").  Returns None if no upper bound.
-    """
-    data = _load_filler_data(filler_path)
-    if not data:
-        return None
-    try:
-        upper_bounds: list[str] = []
-        all_exact_forks: list[str] = []
-        has_range = False
-        for _test_name, test_data in data.items():
-            if not isinstance(test_data, dict):
-                continue
-            expect = test_data.get("expect", [])
-            if not isinstance(expect, list):
-                continue
-            for expect_entry in expect:
-                if not isinstance(expect_entry, dict):
-                    continue
-                network = expect_entry.get("network", [])
-                if isinstance(network, list):
-                    for net_str in network:
-                        s = str(net_str).strip()
-                        bound = parse_network_upper_bound(s)
-                        if bound:
-                            upper_bounds.append(bound)
-                            has_range = True
-                        elif ">=" in s:
-                            has_range = True
-                        elif s in FORK_RANK:
-                            all_exact_forks.append(s)
-
-        # Range syntax like ">=Cancun<Osaka" — return the excluded fork
-        if upper_bounds:
-            known = [b for b in upper_bounds if b in FORK_RANK]
-            if known:
-                return min(known, key=lambda f: FORK_RANK[f])
-            return upper_bounds[0]
-
-        # Exact fork names only (e.g. ["Cancun", "Prague"]) — the fork
-        # after the latest listed fork is the excluded upper bound
-        if all_exact_forks and not has_range:
-            latest = max(all_exact_forks, key=lambda f: FORK_RANK[f])
-            latest_idx = FORK_RANK[latest]
-            if latest_idx + 1 < len(FORK_ORDER):
-                return FORK_ORDER[latest_idx + 1]
-
-        return None
-    except Exception:
-        return None
-
-
-def load_filler_network_lower_bound(filler_path: Path) -> str | None:
-    """
-    Extract the earliest fork from a filler's network fields.
-
-    Parse expect[].network entries like ">=Cancun" or ">=Shanghai"
-    and return the earliest lower bound (e.g. "Cancun").
-    For exact fork lists like ["Cancun", "Prague"], return the earliest.
-    """
-    data = _load_filler_data(filler_path)
-    if not data:
-        return None
-    try:
-        lower_bounds: list[str] = []
-        all_exact_forks: list[str] = []
-        for _test_name, test_data in data.items():
-            if not isinstance(test_data, dict):
-                continue
-            expect = test_data.get("expect", [])
-            if not isinstance(expect, list):
-                continue
-            for expect_entry in expect:
-                if not isinstance(expect_entry, dict):
-                    continue
-                network = expect_entry.get("network", [])
-                if isinstance(network, list):
-                    for net_str in network:
-                        s = str(net_str).strip()
-                        bound = parse_network_lower_bound(s)
-                        if bound and bound in FORK_RANK:
-                            lower_bounds.append(bound)
-                        elif s in FORK_RANK:
-                            all_exact_forks.append(s)
-
-        if lower_bounds:
-            return min(lower_bounds, key=lambda f: FORK_RANK[f])
-        if all_exact_forks:
-            return min(all_exact_forks, key=lambda f: FORK_RANK[f])
-        return None
-    except Exception:
-        return None
-
-
-_MAX_SOURCE_LINES = 30
-
-
-class _FillerCodeSources:
-    """Source code comments extracted from a filler file."""
-
-    def __init__(self) -> None:
-        # {normalized_address: comment} — works for plain-address fillers
-        self.by_address: dict[str, str] = {}
-        # {hex_bytecode_lower: comment} — for :raw and 0x... code
-        self.by_hex: dict[str, str] = {}
-        # Source comment for the contract with the "target" label
-        self.target_source: str = ""
-
-    def lookup(
-        self,
-        compiled_addr: str,
-        compiled_hex: str,
-        is_to_addr: bool,
-    ) -> str:
-        """Look up source comment for a compiled fixture address."""
-        norm = _normalize_address(compiled_addr)
-
-        # 1. Try direct address match (plain-address fillers)
-        if norm in self.by_address:
-            return self.by_address[norm]
-
-        # 2. Try bytecode match (:raw and hex code)
-        hex_key = compiled_hex.lower()
-        if hex_key.startswith("0x"):
-            hex_key = hex_key[2:]
-        if hex_key and hex_key in self.by_hex:
-            return self.by_hex[hex_key]
-
-        # 3. For the to_addr, use the target label source
-        if is_to_addr and self.target_source:
-            return self.target_source
-
-        return ""
-
-
-def _extract_filler_code_sources(
-    filler_data: dict | None,
-) -> _FillerCodeSources:
-    """
-    Extract original source code from filler pre-state.
-
-    Return a _FillerCodeSources object supporting lookup by address,
-    bytecode hex, and label role.
-    """
-    result = _FillerCodeSources()
-    if not filler_data:
-        return result
-
-    try:
-        for _test_name, test_data in filler_data.items():
-            if not isinstance(test_data, dict):
-                continue
-            pre = test_data.get("pre", {})
-            if not isinstance(pre, dict):
-                continue
-            for addr_key, account in pre.items():
-                if not isinstance(account, dict):
-                    continue
-                code = account.get("code")
-                if not code or not isinstance(code, str):
-                    continue
-                code = code.strip()
-                if not code:
-                    continue
-
-                comment = _classify_code_source(code)
-                if not comment:
-                    continue
-
-                addr_str = str(addr_key)
-
-                # Store by normalized address
-                norm = _normalize_address(addr_str)
-                result.by_address[norm] = comment
-
-                # Store by hex for :raw and plain-hex code
-                hex_bytes = _extract_hex_from_code(code)
-                if hex_bytes:
-                    result.by_hex[hex_bytes] = comment
-
-                # Detect target/entry role from label
-                if ":target:" in addr_str or ":entry:" in addr_str:
-                    result.target_source = comment
-    except Exception:
-        pass
-    return result
-
-
-def _extract_hex_from_code(code: str) -> str:
-    """
-    Extract raw hex bytes from a code field, if applicable.
-
-    Return lowercase hex string (no 0x prefix), or empty string.
-    """
-    stripped = code.strip()
-    if stripped.startswith(":raw"):
-        raw = stripped[4:].strip()
-        if raw.startswith("0x"):
-            return raw[2:].lower()
-        return raw.lower()
-    if stripped.startswith("0x"):
-        return stripped[2:].lower()
-    return ""
-
-
-def _classify_code_source(code: str) -> str:
-    """
-    Classify a filler code field and return a source comment string.
-
-    Return empty string if no useful comment can be generated.
-    """
-    stripped = code.strip()
-
-    # :yul <dialect> { ... }
-    if stripped.startswith(":yul"):
-        body = stripped[4:].strip()
-        # Remove optional dialect name (e.g. "berlin")
-        brace = body.find("{")
-        if brace >= 0:
-            body = body[brace:]
-        return _format_source_comment("Yul", body)
-
-    # :abi func(args) vals
-    if stripped.startswith(":abi"):
-        body = stripped[4:].strip()
-        return _format_source_comment("ABI", body)
-
-    # :raw 0x...
-    if stripped.startswith(":raw"):
-        return "# Source: raw bytecode"
-
-    # Plain hex: 0x...
-    if stripped.startswith("0x"):
-        return "# Source: raw bytecode"
-
-    # LLL: starts with { ... }
-    if stripped.startswith("{"):
-        return _format_source_comment("LLL", stripped)
-
-    # Inline assembly: (asm OP OP ...)
-    if stripped.startswith("(asm"):
-        return _format_source_comment("asm", stripped)
-
-    return ""
-
-
-def _format_source_comment(lang: str, body: str) -> str:
-    """Format a source comment with language tag and body lines."""
-    lines = body.splitlines()
-    if len(lines) > _MAX_SOURCE_LINES:
-        extra = len(lines) - _MAX_SOURCE_LINES
-        lines = lines[:_MAX_SOURCE_LINES]
-        lines.append(f"... ({extra} more lines)")
-    comment_lines = [f"# Source: {lang}"]
-    for line in lines:
-        comment_lines.append(f"# {line}" if line.strip() else "#")
-    return "\n".join(comment_lines)
-
-
-COINBASE_ADDRESS = "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-
-# Regex to strip YAML label syntax:
-#   <contract:target:0xADDR> -> 0xADDR  (3-part)
-#   <eoa:0xADDR> -> 0xADDR              (2-part)
-_LABEL_RE = re.compile(r"<[^>]*?(0x[0-9a-fA-F]+)>")
-
-
-def _strip_label(s: str) -> str:
-    """Strip YAML label syntax, returning just the address."""
-    m = _LABEL_RE.match(s.strip())
-    if m:
-        return m.group(1).lower()
-    return s.strip().lower()
-
-
-def _normalize_address(addr: str) -> str:
-    """Normalize an address to lowercase with 0x prefix."""
-    addr = _strip_label(addr)
-    if not addr.startswith("0x"):
-        addr = "0x" + addr
-    return addr.lower()
-
-
-def load_filler_expect_results(filler_path: Path) -> list[dict]:
-    """
-    Load expect entries from a filler file.
-
-    Return list of dicts with keys:
-        indexes: {"data": ..., "gas": ..., "value": ...}
-        result: {address: {field: value, ...}, ...}
-    """
-    data = _load_filler_data(filler_path)
-    if not data:
-        return []
-    try:
-        for _test_name, test_data in data.items():
-            if not isinstance(test_data, dict):
-                continue
-            expect = test_data.get("expect", [])
-            if not isinstance(expect, list):
-                continue
-
-            entries = []
-            for expect_entry in expect:
-                if not isinstance(expect_entry, dict):
-                    continue
-                raw_indexes = expect_entry.get("indexes", {})
-                raw_result = expect_entry.get("result", {})
-
-                # Strip // prefixed keys (JSON comment hack)
-                indexes = {
-                    k: v
-                    for k, v in raw_indexes.items()
-                    if not str(k).startswith("//")
-                }
-                result: dict[str, dict] = {}
-                for addr_key, fields in raw_result.items():
-                    if str(addr_key).startswith("//"):
-                        continue
-                    if not isinstance(fields, dict):
-                        continue
-                    norm_addr = _normalize_address(str(addr_key))
-                    # Strip // prefixed field keys
-                    clean_fields = {
-                        k: v
-                        for k, v in fields.items()
-                        if not str(k).startswith("//")
-                    }
-                    if clean_fields:
-                        result[norm_addr] = clean_fields
-
-                entries.append(
-                    {
-                        "indexes": indexes,
-                        "result": result,
-                    }
-                )
-            return entries
-        return []
-    except Exception:
-        return []
-
-
-def load_filler_tx_dimensions(
-    filler_path: Path,
-) -> tuple[int, int, int] | None:
-    """
-    Load transaction dimensions (data, gas, value) from a filler.
-
-    Return (num_data, num_gas, num_value) or None on failure.
-    """
-    data = _load_filler_data(filler_path)
-    if not data:
-        return None
-    try:
-        for _test_name, test_data in data.items():
-            if not isinstance(test_data, dict):
-                continue
-            tx = test_data.get("transaction", {})
-            if not isinstance(tx, dict):
-                continue
-            num_data = len(tx.get("data", [""]))
-            num_gas = len(tx.get("gasLimit", [""]))
-            num_value = len(tx.get("value", [""]))
-            return (num_data, num_gas, num_value)
-        return None
-    except Exception:
-        return None
-
-
-def _index_matches(selector: Any, case_idx: int) -> bool:
-    """
-    Check if an index selector matches a specific case index.
-
-    Selector can be:
-    - -1: matches any index
-    - int: matches that exact index
-    - list: matches if case_idx is in the list (items can be ints or ranges)
-    - str range "0-2": matches 0, 1, 2
-    - str label ":label ...": treated as matching the index position
-    """
-    if isinstance(selector, int):
-        return selector == -1 or selector == case_idx
-    if isinstance(selector, str):
-        s = selector.strip()
-        # Range like "0-2"
-        range_match = re.match(r"^(\d+)-(\d+)$", s)
-        if range_match:
-            lo, hi = int(range_match.group(1)), int(range_match.group(2))
-            return lo <= case_idx <= hi
-        # Label syntax — can't resolve without the data array, treat as match
-        if s.startswith(":label"):
-            return True
-        # Try as integer
-        try:
-            return int(s) == case_idx
-        except ValueError:
-            return True  # Unknown format, be permissive
-    if isinstance(selector, list):
-        return any(_index_matches(item, case_idx) for item in selector)
-    return True  # Unknown type, be permissive
-
-
-def resolve_expect_for_case(
-    expect_entries: list[dict],
-    data_idx: int,
-    gas_idx: int,
-    value_idx: int,
-) -> dict | None:
-    """Find the expect entry whose indexes match the given case."""
-    for entry in expect_entries:
-        indexes = entry.get("indexes", {})
-        d_sel = indexes.get("data", -1)
-        g_sel = indexes.get("gas", -1)
-        v_sel = indexes.get("value", -1)
-        if (
-            _index_matches(d_sel, data_idx)
-            and _index_matches(g_sel, gas_idx)
-            and _index_matches(v_sel, value_idx)
-        ):
-            return entry.get("result")
-    return None
-
-
-def extract_case_indices(fixture_key: str) -> tuple[int, int, int]:
-    """
-    Extract (data_idx, gas_idx, value_idx) from fixture key.
-
-    Key format: "tests/.../XFiller.json::TestName[d0g0v0-Cancun]"
-    """
-    m = re.search(r"\[d(\d+)g(\d+)v(\d+)-", fixture_key)
-    if m:
-        return int(m.group(1)), int(m.group(2)), int(m.group(3))
-    return 0, 0, 0
-
-
-# ---------------------------------------------------------------------------
-# Code generation
-# ---------------------------------------------------------------------------
-
-
-def _find_top_level_eq(s: str) -> int:
-    """Find the position of '=' that is not inside parens/brackets."""
-    depth = 0
-    for i, ch in enumerate(s):
-        if ch in ("(", "["):
-            depth += 1
-        elif ch in (")", "]"):
-            depth -= 1
-        elif ch == "=" and depth == 0:
-            return i
-    return -1
-
-
-def _wrap_long_op_call(op_call: str, indent: str) -> str:
-    """
-    Wrap a single long Op call across keyword arguments.
-
-    E.g. Op.CALL(gas=X, address=Y, ...) becomes:
-        Op.CALL(
-            gas=X,
-            address=Y,
-            ...
-        )
-    Recursively wraps nested calls that are also too long.
-    """
-    # Find the opening paren
-    if "(" not in op_call:
-        return op_call
-    paren_pos = op_call.index("(")
-    func_name = op_call[: paren_pos + 1]
-    args_str = op_call[paren_pos + 1 : -1]  # strip outer parens
-
-    # Split by ", " but respect nested parens
-    args: list[str] = []
-    depth = 0
-    current = ""
-    for ch in args_str:
-        if ch in ("(", "["):
-            depth += 1
-        elif ch in (")", "]"):
-            depth -= 1
-        if ch == "," and depth == 0:
-            args.append(current.strip())
-            current = ""
-        else:
-            current += ch
-    if current.strip():
-        args.append(current.strip())
-
-    arg_indent = indent + "    "
-    arg_lines: list[str] = []
-    for a in args:
-        line = f"{arg_indent}{a},"
-        if len(line) > 79 and "(" in a:
-            # Find top-level '=' (not inside parens)
-            eq_pos = _find_top_level_eq(a)
-            if eq_pos > 0:
-                key = a[: eq_pos + 1]
-                val = a[eq_pos + 1 :]
-                wrapped_val = _wrap_long_op_call(val, arg_indent)
-                arg_lines.append(f"{arg_indent}{key}{wrapped_val},")
-            else:
-                arg_lines.append(
-                    f"{arg_indent}{_wrap_long_op_call(a, arg_indent)},"
-                )
-        else:
-            arg_lines.append(line)
-    return func_name + "\n" + "\n".join(arg_lines) + "\n" + indent + ")"
-
-
-def _wrap_op_chain(
-    op_str: str,
-    indent: str = "        ",
-    prefix: str = "code=",
-) -> str:
-    """
-    Wrap a long Op chain string to fit within 79 chars.
-
-    Return the original string if it fits, otherwise wrap with
-    line continuations.
-    """
-    # Use 78 to leave room for trailing comma
-    if len(indent + prefix + op_str) <= 78:
-        return op_str
-    parts = op_str.split(" + ")
-
-    # Wrap individual Op calls that are too long on their own
-    max_part_len = 79 - len(indent + "+ ")
-    wrapped_parts = []
-    for part in parts:
-        if len(part) > max_part_len and "(" in part:
-            wrapped_parts.append(_wrap_long_op_call(part, indent))
-        else:
-            wrapped_parts.append(part)
-
-    lines: list[str] = []
-    current = wrapped_parts[0]
-    line_indent = indent + "+ "
-    for part in wrapped_parts[1:]:
-        has_newline = "\n" in current or "\n" in part
-        candidate = current + " + " + part
-        # First line has prefix, subsequent have "+ "
-        # Use 78 to leave room for trailing comma
-        if lines:
-            limit = 78 - len(line_indent)
-        else:
-            limit = 78 - len(indent + prefix)
-        if has_newline or len(candidate) > limit:
-            lines.append(current)
-            current = part
-        else:
-            current = candidate
-    lines.append(current)
-    joined = ("\n" + line_indent).join(lines)
-    close_indent = indent[4:] if len(indent) >= 4 else ""
-    return f"(\n{indent}{joined}\n{close_indent})"
-
-
-def generate_code_expr(
-    hex_code: str,
-    indent: str = "        ",
-    source_comment: str = "",
-) -> tuple[str, str]:
-    """
-    Generate Python code expression for bytecode.
-
-    Returns (code_expr, pre_comment) where:
-    - code_expr is the Python expression (Op chain or bytes.fromhex fallback)
-    - pre_comment is the source language comment (if provided)
-    """
-    if hex_code in ("0x", ""):
-        return 'b""', ""
-
-    raw = hex_code[2:] if hex_code.startswith("0x") else hex_code
-
-    # Indent source comment lines to match the surrounding code
-    comment = ""
-    if source_comment:
-        comment_indent = indent[4:] if len(indent) >= 4 else ""
-        comment = "\n".join(
-            f"{comment_indent}{line}" for line in source_comment.splitlines()
-        )
-
-    # Always use Op format — readable and round-trips to identical bytecode
-    op_str = bytecode_to_op_string(hex_code)
-    if op_str is not None:
-        wrapped = _wrap_op_chain(op_str, indent=indent, prefix="code=")
-        return wrapped, comment
-
-    # bytes.fromhex fallback only if Op conversion fails entirely
-    if len(raw) > 72:
-        chunks = [raw[i : i + 72] for i in range(0, len(raw), 72)]
-        if len(chunks) == 1:
-            expr = f'bytes.fromhex(\n{indent}"{chunks[0]}"\n{indent[4:]})'
-            return expr, comment
-        hex_lines = f'"\n{indent}"'.join(chunks)
-        expr = f'bytes.fromhex(\n{indent}"{hex_lines}"\n{indent[4:]})'
-        return expr, comment
-
-    return f'bytes.fromhex("{raw}")', comment
-
-
-def generate_account_setup(
-    address: str,
-    account: dict[str, Any],
-    var_name: str,
-    indent: str = "    ",
-    source_comment: str = "",
-    is_sender: bool = False,
-    var_is_used: bool = True,
-    already_defined: bool = False,
-) -> str:
-    """
-    Generate pre-state account setup code.
-
-    For EOAs and the sender, emit pre[var] = Account(...).
-    For contracts, emit var = pre.deploy_contract(...).
-    For oversized contracts (>24576 bytes), keep pre[var] = Account(...).
-
-    When already_defined is True, the variable (e.g. coinbase, sender) was
-    already emitted earlier, so deploy_contract is called without assignment
-    and uses address=var_name instead of a literal Address.
-    """
-    lines = []
-    code_hex = account.get("code", "0x")
-    balance = hex_to_int(account.get("balance", "0x00"))
-    nonce = hex_to_int(account.get("nonce", "0x00"))
-    storage = account.get("storage", {})
-
-    # Determine if this is an EOA (no code) or contract
-    is_eoa = code_hex in ("0x", "")
-
-    # Check if contract code is oversized (>24576 bytes = >49152 hex chars)
-    raw_hex = code_hex[2:] if code_hex.startswith("0x") else code_hex
-    is_oversized = len(raw_hex) > 49152
-
-    # Use deploy_contract for non-oversized contracts
-    use_deploy = not is_eoa and not is_oversized
-
-    if use_deploy:
-        # Build deploy_contract call
-        code_expr, code_comment = generate_code_expr(
-            code_hex,
-            indent=indent + "    ",
-            source_comment=source_comment,
-        )
-        if code_comment:
-            lines.append(code_comment.rstrip())
-
-        deploy_parts = []
-        deploy_parts.append(f"code={code_expr}")
-        if storage:
-            deploy_parts.append(f"storage={format_storage(storage)}")
-        # balance: omit if 0 (deploy_contract default)
-        if balance != 0:
-            deploy_parts.append(f"balance={format_balance(balance)}")
-        # nonce: omit if 1 (deploy_contract default), emit otherwise
-        if nonce != 1:
-            deploy_parts.append(f"nonce={nonce}")
-        if already_defined:
-            addr_part = f"address={var_name}"
-        else:
-            padded = _pad_address(address)
-            addr_part = f'address=Address("{padded}")'
-
-        # Always use multi-line for deploy_contract (address line needs
-        # noqa: E501 and the call is almost always long).
-        deploy_parts.append(addr_part)
-        if var_is_used and not already_defined:
-            lines.append(f"{indent}{var_name} = pre.deploy_contract(")
-        else:
-            lines.append(f"{indent}pre.deploy_contract(")
-        for i, part in enumerate(deploy_parts):
-            if i == len(deploy_parts) - 1 and part == addr_part:
-                # Last part is address — add noqa: E501
-                lines.append(f"{indent}    {part},  # noqa: E501")
-            else:
-                lines.append(f"{indent}    {part},")
-        lines.append(f"{indent})")
-    else:
-        # Standard pre[var] = Account(...) form
-        parts = []
-        parts.append(f"balance={format_balance(balance)}")
-        # Omit nonce=0 for sender (it's the default)
-        if is_sender:
-            if nonce != 0:
-                parts.append(f"nonce={nonce}")
-        else:
-            parts.append(f"nonce={nonce}")
-
-        if not is_eoa:
-            code_expr, code_comment = generate_code_expr(
-                code_hex, indent=indent + "    "
-            )
-            if code_comment:
-                lines.append(code_comment.rstrip())
-            parts.append(f"code={code_expr}")
-
-        if storage:
-            parts.append(f"storage={format_storage(storage)}")
-
-        # Format as single line or multi-line
-        single = f"{indent}pre[{var_name}] = Account({', '.join(parts)})"
-        if len(single) <= 79 and "\n" not in "".join(parts):
-            lines.append(single)
-        else:
-            lines.append(f"{indent}pre[{var_name}] = Account(")
-            for part in parts:
-                lines.append(f"{indent}    {part},")
-            lines.append(f"{indent})")
-
-    return "\n".join(lines)
-
-
-def _parse_result_int(v: Any) -> int:
-    """Parse an int from a filler result value (may be str, int, hex)."""
-    if isinstance(v, int):
-        return v
-    s = str(v).strip()
-    if not s or s in ("0x", "0X"):
-        return 0
-    # YAML label syntax: <contract:name:0xADDR> or <contract:name>
-    if s.startswith("<") and ":" in s:
-        m = re.search(r"(0x[0-9a-fA-F]+)", s)
-        if m:
-            return int(m.group(1), 16)
-        return 0
-    if s.startswith("0x") or s.startswith("0X"):
-        return int(s, 16)
-    try:
-        return int(s)
-    except ValueError:
-        return 0
-
-
-def _format_storage_flat(storage: dict) -> str:
-    """Format storage dict on a single line (for parametrize values)."""
-    if not storage:
-        return "{}"
-    items = []
-    for k, v in sorted(storage.items(), key=lambda x: _parse_result_int(x[0])):
-        key_int = _parse_result_int(k)
-        val_int = _parse_result_int(v)
-        items.append(f"{format_int(key_int)}: {format_int(val_int)}")
-    return "{" + ", ".join(items) + "}"
-
-
-def _format_storage_from_result(
-    storage: dict,
-    indent: str = "                ",
-) -> str:
-    """Format storage dict from filler result."""
-    if not storage:
-        return "{}"
-    items = []
-    for k, v in sorted(storage.items(), key=lambda x: _parse_result_int(x[0])):
-        key_int = _parse_result_int(k)
-        val_int = _parse_result_int(v)
-        item = f"{format_int(key_int)}: {format_int(val_int)}"
-        items.append(item)
-    single = "{" + ", ".join(items) + "}"
-    if len(single) <= 50:
-        return single
-    formatted: list[str] = []
-    for item in items:
-        formatted.append(item + ",")
-    inner = ("\n" + indent).join(formatted)
-    close = indent[4:] if len(indent) >= 4 else ""
-    return "{\n" + indent + inner + "\n" + close + "}"
-
-
-def generate_post_dict(
-    result: dict[str, dict],
-    addr_vars: dict[str, str],
-) -> str:
-    """
-    Generate the post = {...} dict from filler expect result.
-
-    Handle all 5 field types: storage, nonce, balance, code, shouldnotexist.
-    Skip coinbase address.
-    """
-    lines = ["    post = {"]
-    has_entries = False
-    for addr, fields in sorted(result.items()):
-        # Skip coinbase
-        if addr.lower() == COINBASE_ADDRESS:
-            continue
-        padded = _pad_address(addr)
-        var = addr_vars.get(addr.lower(), f'Address("{padded}")')
-
-        # shouldnotexist
-        if "shouldnotexist" in fields:
-            lines.append(f"        {var}: Account.NONEXISTENT,")
-            has_entries = True
-            continue
-
-        parts = []
-        if "storage" in fields:
-            parts.append(
-                f"storage={_format_storage_from_result(fields['storage'])}"
-            )
-        if "nonce" in fields:
-            parts.append(f"nonce={_parse_result_int(fields['nonce'])}")
-        if "balance" in fields:
-            val = _parse_result_int(fields["balance"])
-            parts.append(f"balance={format_balance(val)}")
-        if parts:
-            parts_str = ", ".join(parts)
-            single = f"        {var}: Account({parts_str}),"
-            if len(single) <= 79 and "\n" not in parts_str:
-                lines.append(single)
-            else:
-                lines.append(f"        {var}: Account(")
-                for p in parts:
-                    lines.append(f"            {p},")
-                lines.append("        ),")
-            has_entries = True
-    lines.append("    }")
-    if not has_entries:
-        return "    post: dict = {}"
-    return "\n".join(lines)
-
-
-def _truncate_at_word(text: str, max_len: int) -> str:
-    """Truncate text at a word boundary, appending '...'."""
-    if len(text) <= max_len:
-        return text
-    # Find last space before the limit (leaving room for "...")
-    cut = text.rfind(" ", 0, max_len - 3)
-    if cut <= 0:
-        # No space found; hard-cut
-        return text[: max_len - 3] + "..."
-    return text[:cut] + "..."
-
-
-def _pad_address(addr: str) -> str:
-    """Pad a short hex address to 40 hex chars (20 bytes)."""
-    raw = addr[2:] if addr.startswith("0x") else addr
-    if len(raw) < 40:
-        raw = raw.zfill(40)
-    return "0x" + raw
-
-
-def generate_post_value_string(result: dict | None) -> str:
-    """
-    Generate a post dict expression for use in parametrize values.
-
-    Use Address("0x...") literals (not variable names) since parametrize
-    evaluates at module import time.  Return "{}" for None/empty results.
-    """
-    if not result:
-        return "{}"
-    parts: list[str] = []
-    for addr, fields in sorted(result.items()):
-        if addr.lower() == COINBASE_ADDRESS:
-            continue
-
-        # Skip unresolved Yul/label addresses
-        if "<" in addr:
-            continue
-
-        padded = _pad_address(addr)
-
-        if "shouldnotexist" in fields:
-            parts.append(f'Address("{padded}"): Account.NONEXISTENT')
-            continue
-
-        acct_parts: list[str] = []
-        if "storage" in fields:
-            acct_parts.append(
-                f"storage={_format_storage_from_result(fields['storage'])}"
-            )
-        if "nonce" in fields:
-            acct_parts.append(f"nonce={_parse_result_int(fields['nonce'])}")
-        if "balance" in fields:
-            val = _parse_result_int(fields["balance"])
-            acct_parts.append(f"balance={format_balance(val)}")
-
-        if acct_parts:
-            acct_str = ", ".join(acct_parts)
-            parts.append(f'Address("{padded}"): Account({acct_str})')
-
-    if not parts:
-        return "{}"
-    if len(parts) == 1:
-        return "{" + parts[0] + "}"
-    inner = ", ".join(parts)
-    return "{" + inner + "}"
-
-
-def _generate_post_from_fixture_state(
-    post_state: dict[str, dict],
-    addr_vars: dict[str, str],
-) -> str:
-    """
-    Generate the post = {...} dict from compiled fixture post state.
-
-    The fixture post state format is:
-        {address: {balance: "0x...", nonce: "0x...", code: "0x...",
-                   storage: {key: value}}}
-
-    Only assert on storage and code (not balance/nonce) since those
-    depend on gas costs which vary across forks.
-    Skip coinbase and accounts with no interesting assertions.
-    """
-    lines = ["    post = {"]
-    has_entries = False
-    for addr, fields in sorted(post_state.items()):
-        addr_l = addr.lower()
-        # Skip coinbase
-        if addr_l == COINBASE_ADDRESS:
-            continue
-        padded = _pad_address(addr_l)
-        var = addr_vars.get(addr_l, f'Address("{padded}")')
-
-        parts = []
-        if "storage" in fields and fields["storage"]:
-            parts.append(
-                f"storage={_format_storage_from_result(fields['storage'])}"
-            )
-
-        if parts:
-            parts_str = ", ".join(parts)
-            single = f"        {var}: Account({parts_str}),"
-            if len(single) <= 79 and "\n" not in parts_str:
-                lines.append(single)
-            else:
-                lines.append(f"        {var}: Account(")
-                for j, p in enumerate(parts):
-                    comma = "," if j < len(parts) - 1 else ","
-                    lines.append(f"            {p}{comma}")
-                lines.append("        ),")
-            has_entries = True
-
-    lines.append("    }")
-    if not has_entries:
-        return "    post: dict = {}"
-    return "\n".join(lines)
-
-
-def _generate_post_value_from_fixture_state(
-    post_state: dict[str, dict],
-) -> str:
-    """
-    Generate a post dict expression from fixture state for parametrize.
-
-    Use Address("0x...") literals (not variable names).
-    Only assert on storage and code (not balance/nonce).
-    Return "{}" for empty state.
-    """
-    if not post_state:
-        return "{}"
-    parts: list[str] = []
-    for addr, fields in sorted(post_state.items()):
-        addr_l = addr.lower()
-        if addr_l == COINBASE_ADDRESS:
-            continue
-        padded = _pad_address(addr_l)
-
-        acct_parts: list[str] = []
-        if "storage" in fields and fields["storage"]:
-            # Flat format for parametrize (no multiline wrapping)
-            acct_parts.append(
-                f"storage={_format_storage_flat(fields['storage'])}"
-            )
-
-        if acct_parts:
-            acct_str = ", ".join(acct_parts)
-            parts.append(f'Address("{padded}"): Account({acct_str})')
-
-    if not parts:
-        return "{}"
-    # Parametrize values stay on one line (ruff format + noqa post-step)
-    if len(parts) == 1:
-        return "{" + parts[0] + "}"
-    inner = ", ".join(parts)
-    return "{" + inner + "}"
-
-
-def post_value_uses_op(post_str: str) -> bool:
-    """Check whether a post value string references Op."""
-    return "Op." in post_str
-
-
-def generate_test_file(
-    fixture_data: dict[str, Any],
-    filler_path: str,
-    filler_comment: str,
-    valid_until: str | None = None,
-    valid_from_override: str | None = None,
-    filler_full_path: Path | None = None,  # noqa: ARG001
-    code_sources: _FillerCodeSources | None = None,
-    slow: bool = False,
-    fork_for_post: str | None = None,
-    func_name_suffix: str = "",
-) -> str:
-    """
-    Generate a complete Python test file from fixture data.
-
-    Parameters
-    ----------
-    fixture_data
-        Parsed JSON fixture mapping test keys to test data.
-    filler_path
-        Relative path for the filler comment in the generated file.
-    filler_comment
-        Comment string identifying the source filler.
-    valid_until
-        Last fork name for which this test is valid (None = no bound).
-    valid_from_override
-        Override the detected valid_from fork name.
-    filler_full_path
-        Absolute path to the filler file (unused).
-    code_sources
-        Pre-resolved code source mappings for bytecode generation.
-    slow
-        Whether to mark the generated test with @pytest.mark.slow.
-    fork_for_post
-        If set, extract post-state from this fork instead of the
-        earliest fork.  Used for fork-range-specific test functions.
-    func_name_suffix
-        Appended to the test function name (e.g. "_from_prague").
-
-    """
-    # Compiled fixtures have one top-level key per (case × fork).
-    # Collect all forks, find the earliest, then collect cases for that fork.
-    all_keys = list(fixture_data.keys())
-    first_test = fixture_data[all_keys[0]]
-
-    env = first_test["env"]
-
-    # Merge pre from ALL cases — different cases may deploy different
-    # contracts (e.g. test_push has 32 cases each with a unique contract).
-    pre: dict[str, Any] = {}
-    for key in all_keys:
-        for addr, acct in fixture_data[key]["pre"].items():
-            if addr.lower() not in {a.lower() for a in pre}:
-                pre[addr] = acct
-
-    # Detect all forks present across all entries
-    all_forks: set[str] = set()
-    for key in all_keys:
-        test = fixture_data[key]
-        all_forks.update(test["post"].keys())
-    # Use filler network lower bound if available, else earliest from
-    # fixture post keys
-    fork_name = valid_from_override or earliest_fork(all_forks)
-
-    # When generating for a specific fork range, use that fork's
-    # post-state instead of the earliest fork's.
-    post_fork = fork_for_post or fork_name
-
-    # Collect all cases for this fork
-    cases_for_fork: list[dict[str, Any]] = []
-    for key in all_keys:
-        test = fixture_data[key]
-        if post_fork in test["post"]:
-            tx = test["transaction"]
-            post_entry = test["post"][post_fork][0]
-            post_state = post_entry.get("state", {})
-            expect_exception = post_entry.get("expectException")
-            # accessLists is a list of access lists (one per case index)
-            access_lists = tx.get("accessLists", [])
-            al = (
-                access_lists[0] if access_lists else None
-            )  # None = no access list
-            case_to = (tx.get("to") or "").lower()
-            cases_for_fork.append(
-                {
-                    "data": tx["data"][0] if tx["data"] else "0x",
-                    "gas_limit": hex_to_int(tx["gasLimit"][0])
-                    if tx["gasLimit"]
-                    else 100000,
-                    "value": hex_to_int(tx["value"][0]) if tx["value"] else 0,
-                    "access_list": al,
-                    "expect_exception": expect_exception,
-                    "post_state": post_state,
-                    "to": case_to,
-                }
-            )
-
-    is_multi = len(cases_for_fork) > 1
-
-    # Use first case's tx for shared fields (secret_key, to, gas_price, nonce)
-    tx = first_test["transaction"]
-
-    # Determine test name
-    filler_stem = Path(filler_path).stem  # e.g. "callcode_checkPCFiller"
-    test_func_name = filler_name_to_test_name(filler_stem) + func_name_suffix
-
-    # Identify accounts
-    sender_addr = tx.get("sender", "").lower()
-    to_addr = (tx.get("to") or "").lower()
-    coinbase_addr = env.get("currentCoinbase", "").lower()
-
-    # Build address variable mapping
-    addr_vars: dict[str, str] = {}
-    var_names: list[tuple[str, str, str]] = []  # (addr, var_name, display)
-
-    # Always add coinbase
-    if coinbase_addr:
-        addr_vars[coinbase_addr] = "coinbase"
-        var_names.append((coinbase_addr, "coinbase", coinbase_addr))
-
-    # Add sender
-    if sender_addr:
-        addr_vars[sender_addr] = "sender"
-        var_names.append((sender_addr, "sender", sender_addr))
-
-    # Reserve "contract" for the to_addr first
-    if to_addr and to_addr not in addr_vars:
-        addr_vars[to_addr] = "contract"
-        var_names.append((to_addr, "contract", to_addr))
-
-    # Add other accounts with unique names
-    contract_idx = 0
-    for addr in sorted(pre.keys()):
-        addr_l = addr.lower()
-        if addr_l in addr_vars:
-            continue
-        if contract_idx == 0 and "contract" not in addr_vars.values():
-            name = "contract"
-        else:
-            name = f"callee_{contract_idx}" if contract_idx > 0 else "callee"
-        addr_vars[addr_l] = name
-        var_names.append((addr_l, name, addr_l))
-        contract_idx += 1
-
-    # Module docstring
-    doc_lines = []
-    if filler_comment:
-        comment_lines = [line.rstrip() for line in filler_comment.splitlines()]
-        # Find first non-empty line for the summary
-        summary = ""
-        rest_start = 0
-        for i, line in enumerate(comment_lines):
-            if line.strip():
-                summary = line.strip()
-                rest_start = i + 1
-                break
-        if not summary:
-            summary = "Test ported from static filler"
-        # D404: first word should not be "This"
-        if summary.startswith("This "):
-            summary = summary[5:]
-            summary = summary[0].upper() + summary[1:]
-        # D400/D415: ensure ends with punctuation
-        if summary and summary[-1] not in ".?!":
-            summary += "."
-        # Truncate/wrap summary to 79 chars
-        if len(summary) > 79:
-            summary = _truncate_at_word(summary, 79)
-        doc_lines.append(summary)
-        # Add remaining lines with blank separator
-        remaining = comment_lines[rest_start:]
-        if remaining and any(x.strip() for x in remaining):
-            doc_lines.append("")
-            for line in remaining:
-                if len(line) <= 79:
-                    doc_lines.append(line)
-                elif line.startswith("http"):
-                    # Don't wrap URLs — add noqa
-                    doc_lines.append(line)
-                else:
-                    doc_lines.extend(textwrap.wrap(line, width=79))
-        doc_lines.append("")
-    else:
-        doc_lines.append("Test ported from static filler.")
-        doc_lines.append("")
-    doc_lines.append("Ported from:")
-    if len(filler_path) > 79:
-        # Break path at directory separator
-        parts = filler_path.split("/")
-        current = parts[0]
-        for p in parts[1:]:
-            candidate = current + "/" + p
-            if len(candidate) > 79:
-                doc_lines.append(current)
-                current = p
-            else:
-                current = candidate
-        doc_lines.append(current)
-    else:
-        doc_lines.append(filler_path)
-
-    # Add assembly summaries for contracts
-    for addr in sorted(pre.keys()):
-        addr_l = addr.lower()
-        code_hex = pre[addr].get("code", "0x")
-        if code_hex in ("0x", ""):
-            continue
-        var = addr_vars.get(addr_l, addr)
-        asm = bytecode_to_assembly_summary(code_hex)
-        if asm:
-            doc_lines.append("")
-            doc_lines.append(f"{var} code:")
-            for line in asm.split("\n"):
-                doc_lines.append(f"    {line}")
-
-    # Escape content that would break triple-quoted docstrings
-    safe_lines = [
-        line.replace("\\", "\\\\").replace('"""', '""\\"')
-        for line in doc_lines
-    ]
-    module_doc = '"""\n' + "\n".join(safe_lines) + '\n"""'
-
-    # Check if we need Op import
-    needs_op = False
-    for addr in pre:
-        code_hex = pre[addr].get("code", "0x")
-        if (
-            code_hex not in ("0x", "")
-            and bytecode_to_op_string(code_hex) is not None
-        ):
-            needs_op = True
-            break
-
-    # Check if we need AccessList import (non-empty lists only)
-    needs_access_list = any(c["access_list"] for c in cases_for_fork)
-    # Check if we need TransactionException import
-    needs_tx_exception = any(c.get("expect_exception") for c in cases_for_fork)
-
-    # Check if Hash is needed (e.g. in access_list entries or blob hashes)
-    needs_hash = False
-    blob_hashes = tx.get("blobVersionedHashes")
-    if blob_hashes:
-        needs_hash = True
-    if not needs_hash and is_multi:
-        # Check if any access list entries use Hash
-        for c in cases_for_fork:
-            al = c.get("access_list")
-            if al:
-                for entry in al:
-                    if entry.get("storageKeys"):
-                        needs_hash = True
-                        break
-            if needs_hash:
-                break
-    if not needs_hash and not is_multi:
-        al = cases_for_fork[0].get("access_list")
-        if al:
-            for entry in al:
-                if entry.get("storageKeys"):
-                    needs_hash = True
-                    break
-
-    # Build imports
-    imports = [
-        "import pytest",
-        "from execution_testing import (",
-    ]
-    if needs_access_list:
-        imports.append("    AccessList,")
-    imports.extend(
-        [
-            "    Account,",
-            "    Address,",
-            "    Alloc,",
-            "    EOA,",
-            "    Environment,",
-        ]
-    )
-    if needs_hash:
-        imports.append("    Hash,")
-    imports.extend(
-        [
-            "    StateTestFiller,",
-            "    Transaction,",
-        ]
-    )
-    if needs_tx_exception:
-        imports.append("    TransactionException,")
-    imports.append(")")
-    if needs_op:
-        imports.append("from execution_testing.vm import Op")
-
-    # Build env
-    env_parts = []
-    env_parts.append("fee_recipient=coinbase")
-
-    num = hex_to_int(env.get("currentNumber", "0x01"))
-    env_parts.append(f"number={num}")
-
-    ts = hex_to_int(env.get("currentTimestamp", "0x03e8"))
-    env_parts.append(f"timestamp={ts}")
-
-    diff = hex_to_int(env.get("currentDifficulty", "0x00"))
-    if diff > 0:
-        env_parts.append(f"difficulty={hex(diff)}")
-
-    randao = hex_to_int(env.get("currentRandom", "0x00"))
-    if randao > 0:
-        env_parts.append(f"prev_randao={hex(randao)}")
-
-    base_fee = hex_to_int(env.get("currentBaseFee", "0x0a"))
-    if base_fee > 0:
-        env_parts.append(f"base_fee_per_gas={base_fee}")
-
-    excess_blob = hex_to_int(env.get("currentExcessBlobGas", "0x00"))
-    if excess_blob > 0:
-        env_parts.append(f"excess_blob_gas={excess_blob}")
-
-    # Include gas_limit from original fixture for hasher match.
-    # Amsterdam update: remove this to get framework default 100M.
-    block_gas_limit = hex_to_int(env.get("currentGasLimit", "0x05f5e100"))
-    env_parts.append(f"gas_limit={block_gas_limit}")
-
-    # Detect which tx params vary across cases
-    if is_multi:
-        all_data = [c["data"] for c in cases_for_fork]
-        all_gas = [c["gas_limit"] for c in cases_for_fork]
-        all_val = [c["value"] for c in cases_for_fork]
-        all_to = [c["to"] for c in cases_for_fork]
-        all_al = [
-            json.dumps(c["access_list"], sort_keys=True)
-            for c in cases_for_fork
-        ]
-        all_exc = [c.get("expect_exception") or "" for c in cases_for_fork]
-        data_varies = len(set(all_data)) > 1
-        gas_varies = len(set(all_gas)) > 1
-        value_varies = len(set(all_val)) > 1
-        to_varies = len(set(all_to)) > 1
-        al_varies = len(set(all_al)) > 1
-        exc_varies = len(set(all_exc)) > 1
-
-    # Extract secret key for EOA
-    secret_key_hex = tx["secretKey"]
-    if secret_key_hex.startswith("0x"):
-        secret_key_hex = secret_key_hex[2:]
-
-    # Build tx
-    tx_parts = []
-    tx_parts.append("sender=sender")
-
-    if is_multi and to_varies:
-        tx_parts.append("to=tx_to")
-    elif to_addr:
-        q = chr(34)
-        fallback = f"Address({q}{to_addr}{q})"
-        tx_parts.append(f"to={addr_vars.get(to_addr, fallback)}")
-    else:
-        tx_parts.append("to=None")
-
-    # For single-case, use values directly
-    if not is_multi:
-        case = cases_for_fork[0]
-        data_hex = case["data"]
-        data_raw = data_hex[2:] if data_hex.startswith("0x") else data_hex
-        if data_raw:
-            if len(data_raw) > 72:
-                chunks = [
-                    data_raw[i : i + 72] for i in range(0, len(data_raw), 72)
-                ]
-                hex_joined = '"\n            "'.join(chunks)
-                fromhex = (
-                    f"data=bytes.fromhex(\n"
-                    f'            "{hex_joined}"\n'
-                    f"        )"
-                )
-                tx_parts.append(fromhex)
-            else:
-                tx_parts.append(f'data=bytes.fromhex("{data_raw}")')
-        # Omit data=b"" (default)
-        if case["gas_limit"] != 21000:
-            tx_parts.append(f"gas_limit={case['gas_limit']}")
-    else:
-        if data_varies:
-            tx_parts.append("data=tx_data")
-        else:
-            data_hex = cases_for_fork[0]["data"]
-            data_raw = data_hex[2:] if data_hex.startswith("0x") else data_hex
-            if data_raw:
-                if len(data_raw) > 55:
-                    chunks = [
-                        data_raw[i : i + 72]
-                        for i in range(0, len(data_raw), 72)
-                    ]
-                    hex_joined = '"\n            "'.join(chunks)
-                    fromhex = (
-                        f"data=bytes.fromhex(\n"
-                        f'            "{hex_joined}"\n'
-                        f"        )"
-                    )
-                    tx_parts.append(fromhex)
-                else:
-                    tx_parts.append(f'data=bytes.fromhex("{data_raw}")')
-            # Omit data=b"" (default)
-        if gas_varies:
-            tx_parts.append("gas_limit=tx_gas_limit")
-        else:
-            if cases_for_fork[0]["gas_limit"] != 21000:
-                tx_parts.append(f"gas_limit={cases_for_fork[0]['gas_limit']}")
-
-    gas_price = tx.get("gasPrice")
-    max_fee = tx.get("maxFeePerGas")
-    max_priority = tx.get("maxPriorityFeePerGas")
-    max_fee_blob = tx.get("maxFeePerBlobGas")
-    blob_hashes = tx.get("blobVersionedHashes")
-
-    if max_fee:
-        tx_parts.append(f"max_fee_per_gas={hex_to_int(max_fee)}")
-        if max_priority and hex_to_int(max_priority) != 0:
-            tx_parts.append(
-                f"max_priority_fee_per_gas={hex_to_int(max_priority)}"
-            )
-    elif gas_price and hex_to_int(gas_price) != 10:
-        tx_parts.append(f"gas_price={hex_to_int(gas_price)}")
-
-    if max_fee_blob:
-        tx_parts.append(f"max_fee_per_blob_gas={hex_to_int(max_fee_blob)}")
-    if blob_hashes is not None:
-        if blob_hashes:
-            hash_items = [f'Hash("{h}")' for h in blob_hashes]
-            single = "blob_versioned_hashes=[" + ", ".join(hash_items) + "]"
-            if len("        " + single + ",") <= 79:
-                tx_parts.append(single)
-            else:
-                inner = ",\n                ".join(hash_items)
-                tx_parts.append(
-                    "blob_versioned_hashes=[\n"
-                    "                " + inner + ",\n"
-                    "            ]"
-                )
-        else:
-            tx_parts.append("blob_versioned_hashes=[]")
-
-    tx_nonce = hex_to_int(tx.get("nonce", "0x00"))
-    if tx_nonce != 0:
-        tx_parts.append(f"nonce={tx_nonce}")
-
-    if not is_multi:
-        if cases_for_fork[0]["value"] != 0:
-            tx_parts.append(f"value={cases_for_fork[0]['value']}")
-        # Access list for single case (omit empty list, it's the default)
-        al = cases_for_fork[0]["access_list"]
-        if al:
-            tx_parts.append(f"access_list={_format_access_list(al)}")
-    elif value_varies:
-        tx_parts.append("value=tx_value")
-    else:
-        if cases_for_fork[0]["value"] != 0:
-            tx_parts.append(f"value={cases_for_fork[0]['value']}")
-
-    # Access list for multi-case (omit empty list, it's the default)
-    if is_multi:
-        if al_varies:
-            tx_parts.append("access_list=tx_access_list")
-        else:
-            al = cases_for_fork[0]["access_list"]
-            if al:
-                tx_parts.append(f"access_list={_format_access_list(al)}")
-
-    # Expected transaction error (e.g. blob tx with to=None)
-    if is_multi and exc_varies:
-        tx_parts.append("error=tx_error")
-    else:
-        expect_exception = cases_for_fork[0].get("expect_exception")
-        if expect_exception:
-            tx_parts.append(f"error={_format_exception(expect_exception)}")
-
-    # -----------------------------------------------------------------------
-    # Compute post-state assertions from compiled fixture post state
-    # -----------------------------------------------------------------------
-    post_code = "    post: dict = {}"
-    extra_param_name: str | None = None  # e.g. "expected_storage"
-    extra_param_vals: list[str] = []  # per-case values
-    extra_func_param: str | None = None  # e.g. "    expected_storage: dict,"
-
-    if not is_multi:
-        # Single-case: use compiled fixture's post state directly
-        ps = cases_for_fork[0].get("post_state", {})
-        if ps:
-            post_code = _generate_post_from_fixture_state(ps, addr_vars)
-    else:
-        # Multi-case: check if all post states are identical
-        all_post_states = [c.get("post_state", {}) for c in cases_for_fork]
-        all_same = len(all_post_states) > 0 and all(
-            ps == all_post_states[0] for ps in all_post_states
-        )
-
-        if all_same and all_post_states[0]:
-            post_code = _generate_post_from_fixture_state(
-                all_post_states[0], addr_vars
-            )
-        elif any(all_post_states):
-            extra_param_name = "expected_post"
-            extra_func_param = "    expected_post: dict,"
-            for ps in all_post_states:
-                extra_param_vals.append(
-                    _generate_post_value_from_fixture_state(ps)
-                )
-            post_code = "    post = expected_post"
-
-    # Check if post assertions use Op (needs import)
-    if "Op." in post_code:
-        needs_op = True
-    if any(post_value_uses_op(v) for v in extra_param_vals):
-        needs_op = True
-    # Add Op import if detected after initial import build
-    op_import = "from execution_testing.vm import Op"
-    if needs_op and op_import not in imports:
-        imports.append(op_import)
-
-    # -----------------------------------------------------------------------
-    # Assemble the file
-    # -----------------------------------------------------------------------
-    out = []
-    out.append(module_doc)
-    out.append("")
-    out.extend(imports)
-    out.append("")
-    out.append('REFERENCE_SPEC_GIT_PATH = "N/A"')
-    out.append('REFERENCE_SPEC_VERSION = "N/A"')
-    out.append("")
-
-    # Parametrize for multi-case
-    if is_multi:
-        # Build parameter names and values based on what varies
-        param_names = []
-        if to_varies:
-            param_names.append("tx_to")
-        if data_varies:
-            param_names.append("tx_data_hex")
-        if gas_varies:
-            param_names.append("tx_gas_limit")
-        if value_varies:
-            param_names.append("tx_value")
-        if al_varies:
-            param_names.append("tx_access_list")
-        if exc_varies:
-            param_names.append("tx_error")
-        if extra_param_name:
-            param_names.append(extra_param_name)
-
-        out.append("")
-        ported_line = f'    ["{filler_path}"],'
-        if len(ported_line) > 79:
-            out.append("@pytest.mark.ported_from(")
-            inner = f'        "{filler_path}",'
-            out.append("    [")
-            out.append(inner)
-            out.append("    ],")
-            out.append(")")
-        else:
-            out.append("@pytest.mark.ported_from(")
-            out.append(ported_line)
-            out.append(")")
-        out.append(f'@pytest.mark.valid_from("{fork_name}")')
-        if valid_until:
-            out.append(f'@pytest.mark.valid_until("{valid_until}")')
-
-        # Build parametrize values
-        param_vals = []
-        param_ids = []
-        case_has_exc = []
-        for i, case in enumerate(cases_for_fork):
-            vals = []
-            if to_varies:
-                if case["to"]:
-                    padded_to = _pad_address(case["to"])
-                    vals.append(f'Address("{padded_to}")')
-                else:
-                    vals.append("None")
-            if data_varies:
-                data_raw = (
-                    case["data"][2:]
-                    if case["data"].startswith("0x")
-                    else case["data"]
-                )
-                vals.append(f'"{data_raw}"')
-            if gas_varies:
-                vals.append(str(case["gas_limit"]))
-            if value_varies:
-                vals.append(str(case["value"]))
-            if al_varies:
-                al = case["access_list"]
-                if al is None:
-                    vals.append("None")
-                else:
-                    vals.append(_format_access_list(al, multiline=False))
-            if exc_varies:
-                exc = case.get("expect_exception") or ""
-                if exc:
-                    vals.append(_format_exception(exc))
-                    case_has_exc.append(True)
-                else:
-                    vals.append("None")
-                    case_has_exc.append(False)
-            else:
-                case_has_exc.append(False)
-            if extra_param_vals:
-                vals.append(
-                    extra_param_vals[i] if i < len(extra_param_vals) else "{}"
-                )
-            param_vals.append(vals)
-            param_ids.append(f"case{i}")
-
-        if exc_varies:
-            # Use pytest.param for entries (each needs id + marks)
-            out.append("@pytest.mark.parametrize(")
-            names_line = f'    "{", ".join(param_names)}",'
-            out.append(names_line)
-            out.append("    [")
-            for i, (vals, has_exc) in enumerate(
-                zip(param_vals, case_has_exc, strict=True)
-            ):
-                if has_exc:
-                    joined = ", ".join(vals)
-                    pid = param_ids[i]
-                    entry = (
-                        f"pytest.param({joined},"
-                        f' id="{pid}",'
-                        f" marks=pytest.mark.exception_test)"
-                    )
-                elif len(vals) == 1:
-                    entry = f'pytest.param({vals[0]}, id="{param_ids[i]}")'
-                else:
-                    entry = (
-                        f'pytest.param({", ".join(vals)}, id="{param_ids[i]}")'
-                    )
-                line = f"        {entry},"
-                out.append(line)
-            out.append("    ],")
-            out.append(")")
-        elif len(param_names) == 1:
-            out.append("@pytest.mark.parametrize(")
-            out.append(f'    "{param_names[0]}",')
-            out.append("    [")
-            for vals in param_vals:
-                line = f"        {vals[0]},"
-                out.append(line)
-            out.append("    ],")
-            ids_line = f"    ids={param_ids},"
-            out.append(ids_line)
-            out.append(")")
-        else:
-            out.append("@pytest.mark.parametrize(")
-            names_line2 = f'    "{", ".join(param_names)}",'
-            out.append(names_line2)
-            out.append("    [")
-            for vals in param_vals:
-                line = f"        ({', '.join(vals)}),"
-                out.append(line)
-            out.append("    ],")
-            ids_line = f"    ids={param_ids},"
-            out.append(ids_line)
-            out.append(")")
-    else:
-        out.append("")
-        ported_line = f'    ["{filler_path}"],'
-        if len(ported_line) > 79:
-            out.append("@pytest.mark.ported_from(")
-            inner = f'        "{filler_path}",'
-            out.append("    [")
-            out.append(inner)
-            out.append("    ],")
-            out.append(")")
-        else:
-            out.append("@pytest.mark.ported_from(")
-            out.append(ported_line)
-            out.append(")")
-        out.append(f'@pytest.mark.valid_from("{fork_name}")')
-        if valid_until:
-            out.append(f'@pytest.mark.valid_until("{valid_until}")')
-
-    # pre_alloc_mutable since generated tests assign pre[addr] = Account(...)
-    out.append("@pytest.mark.pre_alloc_mutable")
-
-    if slow:
-        out.append("@pytest.mark.slow")
-
-    # Add exception_test marker if ALL cases expect transaction failure
-    # (when exc_varies, some cases succeed so the global marker can't be used)
-    if needs_tx_exception and not (is_multi and exc_varies):
-        out.append("@pytest.mark.exception_test")
-
-    # Function signature
-    func_params = ["    state_test: StateTestFiller,", "    pre: Alloc,"]
-    if is_multi:
-        if to_varies:
-            func_params.append("    tx_to: Address,")
-        if data_varies:
-            func_params.append("    tx_data_hex: str,")
-        if gas_varies:
-            func_params.append("    tx_gas_limit: int,")
-        if value_varies:
-            func_params.append("    tx_value: int,")
-        if al_varies:
-            func_params.append("    tx_access_list: list | None,")
-        if exc_varies:
-            func_params.append("    tx_error: object,")
-        if extra_func_param:
-            func_params.append(extra_func_param)
-    def_line = f"def {test_func_name}("
-    out.append(def_line)
-    out.extend(func_params)
-    out.append(") -> None:")
-
-    # Function docstring — single-line, with punctuation (D400/D415)
-    func_doc = filler_comment.split("\n")[0].rstrip() if filler_comment else ""
-    # D404: first word should not be "This"
-    if func_doc.startswith("This "):
-        func_doc = func_doc[5:]
-    if not func_doc:
-        func_doc = "Test ported from static filler"
-    # Capitalize first letter (D403)
-    func_doc = func_doc[0].upper() + func_doc[1:]
-    if func_doc[-1] not in ".?!":
-        func_doc += "."
-    # Truncate if too long for single-line docstring (79 - 4 - 6 = 69)
-    if len(func_doc) > 69:
-        func_doc = _truncate_at_word(func_doc, 69)
-    # Escape content that would break triple-quoted docstrings
-    func_doc = func_doc.replace("\\", "\\\\")
-    func_doc = func_doc.replace('"""', '""\\"')
-    out.append(f'    """{func_doc}"""')
-
-    # Determine which accounts will use deploy_contract (so we skip
-    # emitting a separate Address variable for them — deploy_contract
-    # assigns the variable directly).
-    deploy_contract_vars: set[str] = set()
-    for addr in sorted(pre.keys()):
-        addr_l = addr.lower()
-        var = addr_vars.get(addr_l, "")
-        code_hex = pre[addr].get("code", "0x")
-        raw_hex = code_hex[2:] if code_hex.startswith("0x") else code_hex
-        is_eoa_acct = code_hex in ("0x", "")
-        is_oversized_acct = len(raw_hex) > 49152
-        is_sender_acct = var == "sender"
-        if not is_eoa_acct and not is_oversized_acct:
-            deploy_contract_vars.add(var)
-
-    # Address variables — only emit if used somewhere
-    pre_addrs = {a.lower() for a in pre.keys()}
-    all_code = post_code + " ".join(str(p) for p in tx_parts)
-    sender_emitted = False
-    for addr, var, _ in var_names:
-        # Skip vars that will be assigned by deploy_contract
-        # (but not coinbase — it must be defined before env)
-        if var in deploy_contract_vars and var != "coinbase":
-            continue
-        used = (
-            addr in pre_addrs
-            or var == "coinbase"  # fee_recipient=coinbase
-            or var == "sender"  # always used (Transaction sender=sender)
-            or bool(re.search(rf"\b{re.escape(var)}\b", all_code))
-        )
-        if used:
-            if var == "sender":
-                out.append(
-                    f"    sender = EOA(\n        key=0x{secret_key_hex}\n    )"
-                )
-                sender_emitted = True
-            else:
-                out.append(f'    {var} = Address("{_pad_address(addr)}")')
-    # Handle "no sender" tests: sender not in var_names but we still need it
-    if not sender_emitted:
-        out.append(f"    sender = EOA(\n        key=0x{secret_key_hex}\n    )")
-    out.append("")
-
-    # Environment
-    out.append("    env = Environment(")
-    for p in env_parts:
-        out.append(f"        {p},")
-    out.append("    )")
-    out.append("")
-
-    # Pre-state accounts
-    src = code_sources or _FillerCodeSources()
-    for addr in sorted(pre.keys()):
-        addr_l = addr.lower()
-        var = addr_vars.get(addr_l, f'Address("{addr}")')
-        code_hex = pre[addr].get("code", "0x")
-        src_comment = src.lookup(
-            addr_l,
-            code_hex,
-            is_to_addr=(addr_l == to_addr),
-        )
-        is_sender_acct = addr_l == sender_addr
-        is_var_used = (
-            bool(re.search(rf"\b{re.escape(var)}\b", all_code))
-            or var == "coinbase"
-        )
-        # coinbase and sender are already defined (as Address / EOA)
-        # before the pre-state section, so deploy_contract should not
-        # re-assign them.
-        is_already_defined = var in ("coinbase", "sender")
-        account_code = generate_account_setup(
-            addr_l,
-            pre[addr],
-            var,
-            indent="    ",
-            source_comment=src_comment,
-            is_sender=is_sender_acct,
-            var_is_used=is_var_used,
-            already_defined=is_already_defined,
-        )
-        out.append(account_code)
-
-    out.append("")
-
-    # Multi-case tx data conversion
-    if is_multi and data_varies:
-        out.append(
-            '    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""'
-        )
-        out.append("")
-
-    # Transaction
-    out.append("    tx = Transaction(")
-    for p in tx_parts:
-        out.append(f"        {p},")
-    out.append("    )")
-    out.append("")
-
-    # Post state assertions
-    out.append(post_code)
-
-    out.append("")
-    out.append("    state_test(env=env, pre=pre, post=post, tx=tx)")
-    out.append("")
-
-    return "\n".join(out)
-
-
-# ---------------------------------------------------------------------------
-# Main
-# ---------------------------------------------------------------------------
-
-
-# Reverse lookup: lowercase fork dir name -> canonical fork name
-_DIR_TO_FORK = {name.lower(): name for name in FORK_ORDER}
-
-
-def _extract_fork_from_path(path: Path, root: Path) -> str | None:
-    """Extract the fork name from a for_* directory in the path."""
-    for part in path.relative_to(root).parts:
-        if part.startswith("for_"):
-            name = part[4:]
-            return _DIR_TO_FORK.get(name)
-    return None
-
-
-def _group_fixture_candidates(
-    fixtures_dir: Path,
-) -> dict[str, list[tuple[str, Path]]]:
-    """
-    Group fixture JSON files by identity across for_* directories.
-
-    Return a dict mapping identity (path after for_*/) to list of
-    (fork_name, path) pairs.
-    """
-    candidates: list[Path] = []
-    for p in fixtures_dir.rglob("*.json"):
-        if ".meta" in p.parts:
-            continue
-        rel = str(p.relative_to(fixtures_dir))
-        # Must be under state_tests/for_* (not blockchain_tests)
-        if not rel.startswith("state_tests/") and "/state_tests/" not in rel:
-            continue
-        if "/for_" not in rel and not rel.startswith("for_"):
-            continue
-        if "ported_static" in rel:
-            continue
-        candidates.append(p)
-
-    groups: dict[str, list[tuple[str, Path]]] = {}
-    for p in candidates:
-        rel = str(p.relative_to(fixtures_dir))
-        idx = rel.find("/static/")
-        if idx >= 0:
-            identity = rel[idx + len("/static/") :]
-        else:
-            import re as _re
-
-            m = _re.search(r"/for_[^/]+/", rel)
-            if m:
-                identity = rel[m.end() :]
-            elif rel.startswith("for_"):
-                slash = rel.find("/")
-                identity = rel[slash + 1 :] if slash >= 0 else rel
-            else:
-                continue
-        fork = _extract_fork_from_path(p, fixtures_dir)
-        if fork is None:
-            continue
-        groups.setdefault(identity, []).append((fork, p))
-    return groups
-
-
-def find_fixture_files(fixtures_dir: Path) -> list[Path]:
-    """
-    Find state_test fixture JSON files from static fillers.
-
-    Supports two output layouts:
-      - with ``static/``:  state_tests/for_*/static/state_tests/{cat}/…
-      - without:           state_tests/for_*/{cat}/…
-
-    When the same fixture exists across multiple for_* directories
-    (e.g. for_cancun, for_prague), only the earliest fork's file is
-    kept so that valid_from is set correctly.
-    """
-    groups = _group_fixture_candidates(fixtures_dir)
-
-    # Pick the earliest fork per fixture
-    results = []
-    for _identity, fork_paths in groups.items():
-        known = [(f, p) for f, p in fork_paths if f in FORK_RANK]
-        if known:
-            known.sort(key=lambda fp: FORK_RANK[fp[0]])
-            results.append(known[0][1])
-        else:
-            results.append(fork_paths[0][1])
-
-    return sorted(results)
-
-
-def find_fixture_files_grouped(
-    fixtures_dir: Path,
-) -> list[tuple[Path, dict[str, Path]]]:
-    """
-    Find fixture files and return with all fork variants.
-
-    Return a list of (earliest_path, {fork: path}) for each unique
-    fixture identity.
-    """
-    groups = _group_fixture_candidates(fixtures_dir)
-
-    results = []
-    for _identity, fork_paths in groups.items():
-        known = [(f, p) for f, p in fork_paths if f in FORK_RANK]
-        if not known:
-            fp_dict = {fork_paths[0][0]: fork_paths[0][1]}
-            results.append((fork_paths[0][1], fp_dict))
-            continue
-        known.sort(key=lambda fp: FORK_RANK[fp[0]])
-        fp_dict = dict(known)
-        results.append((known[0][1], fp_dict))
-
-    return sorted(results, key=lambda x: x[0])
-
-
-def fixture_to_filler_path(fixture_data: dict) -> str | None:
-    """Extract the filler path from a fixture's test key."""
-    for key in fixture_data:
-        # Key: "tests/static/.../XFiller.json::TestName[...]"
-        if "::" in key:
-            return key.split("::")[0]
-    return None
-
-
-def process_single_fixture(
-    fixture_path: Path,
-    fillers_dir: Path,
-    output_dir: Path,
-    all_fork_paths: dict[str, Path] | None = None,
-) -> tuple[bool, str]:
-    """
-    Process a single fixture file. Returns (success, message).
-
-    Parameters
-    ----------
-    fixture_path
-        Path to the fixture JSON file to process.
-    fillers_dir
-        Root directory containing filler source files.
-    output_dir
-        Directory where the generated Python test file is written.
-    all_fork_paths
-        If provided, a dict mapping fork name to fixture path for all
-        forks that have this test.  Used to detect fork divergence and
-        generate fork-range-specific test functions.
-
-    """
-    with open(fixture_path) as f:
-        fixture_data = json.load(f)
-
-    filler_path = fixture_to_filler_path(fixture_data)
-    if not filler_path:
-        return False, f"Could not extract filler path from {fixture_path}"
-
-    # Load filler comment
-    filler_full_path = fillers_dir.parent.parent / filler_path
-    if not filler_full_path.exists():
-        # Try relative to repo root
-        filler_full_path = Path(filler_path)
-    filler_comment = load_filler_comment(filler_full_path)
-
-    # Extract source code comments from filler pre-state
-    filler_data = _load_filler_data(filler_full_path)
-    code_sources = _extract_filler_code_sources(filler_data)
-
-    # Detect fork bounds from filler network (e.g. ">=Cancun<Osaka")
-    upper_bound = load_filler_network_upper_bound(filler_full_path)
-    valid_until = fork_before(upper_bound) if upper_bound else None
-    filler_lower_bound = load_filler_network_lower_bound(filler_full_path)
-
-    # Determine output path
-    filler_stem = Path(filler_path).stem  # e.g. "callcode_checkPCFiller"
-    test_name = filler_name_to_test_name(filler_stem)
-
-    # Extract category from filler path
-    # e.g. tests/static/state_tests/stCallCodes/... -> stCallCodes
-    filler_parts = Path(filler_path).parts
-    # Find the part after "state_tests"
-    category = ""
-    for i, part in enumerate(filler_parts):
-        if part == "state_tests" and i + 1 < len(filler_parts):
-            # If there's a subfolder (e.g. Cancun/stEIP...), include it
-            remaining = filler_parts[i + 1 : -1]
-            category = str(Path(*remaining)) if remaining else ""
-            break
-
-    # Check if the top-level category is slow
-    top_category = Path(category).parts[0] if category else ""
-    is_slow = top_category in SLOW_CATEGORIES
-
-    # Detect fork divergence when multiple fork fixtures are available
-    fork_ranges = None
-    if all_fork_paths and len(all_fork_paths) > 1:
-        # Determine the earliest fork from the fixture
-        ef = earliest_fork(set(all_fork_paths.keys()))
-        other_fixtures: dict[str, dict[str, Any]] = {}
-        for fork, fp in all_fork_paths.items():
-            if fork != ef:
-                with open(fp) as f:
-                    other_fixtures[fork] = json.load(f)
-        fork_ranges = detect_fork_ranges(fixture_data, other_fixtures, ef)
-
-    # Single range or no divergence — generate one test function
-    if not fork_ranges or len(fork_ranges) == 1:
-        try:
-            python_code = generate_test_file(
-                fixture_data,
-                filler_path,
-                filler_comment,
-                valid_until=valid_until,
-                valid_from_override=filler_lower_bound,
-                filler_full_path=filler_full_path,
-                code_sources=code_sources,
-                slow=is_slow,
-            )
-        except Exception as e:
-            return False, f"Error generating {fixture_path}: {e}"
-    else:
-        # Multiple fork ranges — generate one test function per range.
-        # First range gets the base test file (with imports, module doc).
-        # Subsequent ranges append only the test function.
-        parts: list[str] = []
-        for range_idx, (vf, vu, range_data) in enumerate(fork_ranges):
-            suffix = "" if range_idx == 0 else f"_from_{vf.lower()}"
-            # Skip ranges that start after the filler's valid_until
-            if valid_until and FORK_RANK.get(vf, 0) > FORK_RANK.get(
-                valid_until, 999
-            ):
-                continue
-
-            # valid_until: use the range's upper bound fork, unless
-            # the filler itself has a tighter bound.
-            range_valid_until = vu
-            if valid_until:
-                filler_vu_rank = FORK_RANK.get(valid_until, 999)
-                if vu:
-                    # Use the tighter (earlier) bound
-                    if filler_vu_rank < FORK_RANK.get(vu, 999):
-                        range_valid_until = valid_until
-                else:
-                    range_valid_until = valid_until
-
-            try:
-                code = generate_test_file(
-                    range_data,
-                    filler_path,
-                    filler_comment,
-                    valid_until=range_valid_until,
-                    valid_from_override=vf,
-                    filler_full_path=filler_full_path,
-                    code_sources=code_sources,
-                    slow=is_slow,
-                    fork_for_post=vf,
-                    func_name_suffix=suffix,
-                )
-            except Exception as e:
-                return (
-                    False,
-                    f"Error generating {fixture_path} (range {vf}): {e}",
-                )
-
-            if range_idx == 0:
-                parts.append(code)
-            else:
-                # Extract only the test function (after the last
-                # REFERENCE_SPEC line) to avoid duplicate imports
-                lines = code.split("\n")
-                func_start = None
-                for li, line in enumerate(lines):
-                    if line.startswith("@pytest.mark.ported_from"):
-                        # Include the blank line before the decorator
-                        func_start = li - 1 if li > 0 else li
-                        break
-                if func_start is not None:
-                    parts.append("\n".join(lines[func_start:]))
-                else:
-                    parts.append(code)
-        python_code = "\n".join(parts)
-
-    out_dir = output_dir / category if category else output_dir
-    out_dir.mkdir(parents=True, exist_ok=True)
-
-    # Write __init__.py files with docstrings in every package dir
-    for parent in [out_dir, *out_dir.parents]:
-        if parent == output_dir.parent:
-            break
-        init_file = parent / "__init__.py"
-        if not init_file.exists() or init_file.stat().st_size == 0:
-            pkg = parent.name
-            init_file.write_text(f'"""Tests ported from {pkg}."""\n')
-
-    out_file = out_dir / f"{test_name}.py"
-    out_file.write_text(python_code)
-
-    return True, f"Generated {out_file}"
-
-
-def main() -> None:
-    """Main entry point."""
-    parser = argparse.ArgumentParser(
-        description="Convert compiled state_test fixtures to Python."
-    )
-    parser.add_argument(
-        "--fixtures",
-        type=Path,
-        required=True,
-        help="Path to compiled fixture directory (from --fill-static-tests)",
-    )
-    parser.add_argument(
-        "--fillers",
-        type=Path,
-        required=True,
-        help="Path to source filler directory (tests/static/state_tests/)",
-    )
-    parser.add_argument(
-        "--output",
-        type=Path,
-        required=True,
-        help="Output directory for generated Python tests",
-    )
-    parser.add_argument(
-        "--single",
-        type=Path,
-        default=None,
-        help="Process a single fixture file (for testing)",
-    )
-    parser.add_argument(
-        "--filter",
-        type=Path,
-        default=None,
-        help="Only convert fixtures in this file (one per line)",
-    )
-    args = parser.parse_args()
-
-    # Load filter list if provided
-    filter_set: set[str] | None = None
-    if args.filter:
-        with open(args.filter) as f:
-            filter_set = {line.strip() for line in f if line.strip()}
-
-    if args.single:
-        # Single mode: no fork grouping
-        entries: list[tuple[Path, dict[str, Path] | None]] = [
-            (args.single, None),
-        ]
-    else:
-        grouped = find_fixture_files_grouped(args.fixtures)
-        entries = [(fp, fork_paths) for fp, fork_paths in grouped]
-
-    # Filter fixtures to only those matching the filter list
-    if filter_set is not None:
-        filtered = []
-        for fp, fork_paths in entries:
-            with open(fp) as f:
-                data = json.load(f)
-            filler_path = fixture_to_filler_path(data)
-            if filler_path and filler_path in filter_set:
-                filtered.append((fp, fork_paths))
-        print(f"Filtered: {len(filtered)}/{len(entries)} fixtures match")
-        entries = filtered
-
-    if not entries:
-        print("No fixture files found.")
-        sys.exit(1)
-
-    args.output.mkdir(parents=True, exist_ok=True)
-
-    success_count = 0
-    fail_count = 0
-    for fixture_path, fork_paths in entries:
-        ok, msg = process_single_fixture(
-            fixture_path,
-            args.fillers,
-            args.output,
-            all_fork_paths=fork_paths,
-        )
-        if ok:
-            success_count += 1
-            print(f"  OK: {msg}")
-        else:
-            fail_count += 1
-            print(f"FAIL: {msg}", file=sys.stderr)
-
-    print(f"\nDone: {success_count} generated, {fail_count} failed")
-    if fail_count > 0:
-        sys.exit(1)
-
-    # Post-process: ruff format + add noqa: E501 to unsplittable lines
-    _post_format(args.output)
-
-
-def _post_format(output_dir: Path) -> None:
-    """Run ruff format on generated files, then suppress E501."""
-    # Increase Rust stack size to prevent ruff stack overflow on deeply
-    # nested generated code (which can corrupt files to 0 bytes).
-    env = {**os.environ, "RUST_MIN_STACK": "16777216"}
-    print("\nRunning ruff format...")
-    subprocess.run(
-        ["ruff", "format", str(output_dir)],
-        check=False,
-        env=env,
-    )
-    print("Running ruff check --fix (import sorting)...")
-    subprocess.run(
-        ["ruff", "check", "--fix", str(output_dir)],
-        check=False,
-        env=env,
-    )
-
-    print("Adding # noqa: E501 to long lines...")
-    count = 0
-    for py_file in output_dir.rglob("*.py"):
-        text = py_file.read_text()
-        lines = text.split("\n")
-        changed = False
-        for i, line in enumerate(lines):
-            if len(line) > 79 and "# noqa: E501" not in line:
-                lines[i] = line + "  # noqa: E501"
-                changed = True
-        if changed:
-            py_file.write_text("\n".join(lines))
-            count += 1
-    print(f"  Patched {count} files")
-
-
-if __name__ == "__main__":
-    main()
diff --git a/scripts/verify_dynamic_addresses.sh b/scripts/verify_dynamic_addresses.sh
new file mode 100755
index 00000000000..3cbd19becaa
--- /dev/null
+++ b/scripts/verify_dynamic_addresses.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+# Verify that filler_to_python with dynamic addresses produces
+# trace-equivalent tests. Assumes output/traces_baseline/ already
+# exists (generated once before any code changes).
+set -euo pipefail
+
+export TMPDIR=./.tmp
+mkdir -p "$TMPDIR" output/traces_new
+
+if [ ! -d "output/traces_baseline" ]; then
+    echo "ERROR: output/traces_baseline/ not found."
+    echo "Generate baseline first (before code changes):"
+    echo "  TMPDIR=./.tmp uv run fill tests/ported_static/ --evm-dump-dir output/traces_baseline -n 10 -m 'not slow'"
+    exit 1
+fi
+
+# Step 1: Run filler_to_python (overwrites tests/ported_static/)
+echo "=== Step 1: Running filler_to_python ==="
+uv run python -m scripts.filler_to_python \
+    --fillers tests/static/static/state_tests/ \
+    --output tests/ported_static/
+
+# Step 2: Fill new tests + verify against baseline
+echo "=== Step 2: Filling new tests and verifying traces ==="
+uv run fill \
+    tests/ported_static/ \
+    --evm-dump-dir output/traces_new \
+    --verify-traces output/traces_baseline \
+    --verify-traces-comparator exact-no-stack \
+    -n 10 \
+    -m "not slow"
+
+echo "=== Done. Check output above for trace mismatches ==="
+echo "=== Use 'git diff tests/ported_static/' to see code changes ==="
diff --git a/src/ethereum/crypto/blake2.py b/src/ethereum/crypto/blake2.py
index b50967749b0..568ad611e7c 100644
--- a/src/ethereum/crypto/blake2.py
+++ b/src/ethereum/crypto/blake2.py
@@ -2,7 +2,7 @@
 
 import struct
 from dataclasses import dataclass
-from typing import Final, List, Tuple
+from typing import Final, List, Tuple, final
 
 from ethereum_types.numeric import Uint
 
@@ -248,6 +248,7 @@ def compress(
 
 
 # Parameters specific to the Blake2b implementation
+@final
 @dataclass
 class Blake2b(Blake2):
     """
diff --git a/src/ethereum/crypto/hash.py b/src/ethereum/crypto/hash.py
index 67b9053f3a0..9439522a7ce 100644
--- a/src/ethereum/crypto/hash.py
+++ b/src/ethereum/crypto/hash.py
@@ -11,14 +11,55 @@
 Cryptographic hashing functions.
 """
 
-from Crypto.Hash import keccak
-from ethereum_types.bytes import Bytes, Bytes32, Bytes64
+import hashlib
+
+from Crypto.Hash import keccak as _pycryptodome_keccak
+from ethereum_types.bytes import Bytes32, Bytes64
 
 Hash32 = Bytes32
 Hash64 = Bytes64
 
 
-def keccak256(buffer: Bytes | bytearray) -> Hash32:
+def _hashlib_has_keccak() -> bool:
+    """Return `True` if `hashlib` can compute pre-NIST Keccak digests."""
+    try:
+        hashlib.new("keccak-256", b"")
+    except ValueError:
+        return False
+    return True
+
+
+# Decide once at import time whether to dispatch to hashlib (linked OpenSSL)
+# or to pycryptodome's bundled implementation. OpenSSL only gained
+# default-provider Keccak in 3.2.0 (Nov 2023); LTS 3.0.x and 3.1.x (still
+# shipped by Debian 12, RHEL 9, etc.) do not provide it. We probe with
+# `hashlib.new()` because `hashlib.algorithms_available` omits some
+# OpenSSL-provider digests on common builds (e.g. python-build-standalone /
+# uv-managed CPython on OpenSSL 3.5.x), yielding false negatives.
+_USE_HASHLIB = _hashlib_has_keccak()
+
+
+if _USE_HASHLIB:
+
+    def _keccak256_digest(buffer: bytes | bytearray) -> bytes:
+        return hashlib.new("keccak-256", buffer).digest()
+
+    def _keccak512_digest(buffer: bytes | bytearray) -> bytes:
+        return hashlib.new("keccak-512", buffer).digest()
+else:
+
+    def _keccak256_digest(buffer: bytes | bytearray) -> bytes:
+        return (
+            _pycryptodome_keccak.new(digest_bits=256).update(buffer).digest()
+        )
+
+    def _keccak512_digest(buffer: bytes | bytearray) -> bytes:
+        return (
+            _pycryptodome_keccak.new(digest_bits=512).update(buffer).digest()
+        )
+
+
+def keccak256(buffer: bytes | bytearray) -> Hash32:
     """
     Computes the keccak256 hash of the input `buffer`.
 
@@ -33,11 +74,10 @@ def keccak256(buffer: Bytes | bytearray) -> Hash32:
         Output of the hash function.
 
     """
-    k = keccak.new(digest_bits=256)
-    return Hash32(k.update(buffer).digest())
+    return Hash32(_keccak256_digest(buffer))
 
 
-def keccak512(buffer: Bytes | bytearray) -> Hash64:
+def keccak512(buffer: bytes | bytearray) -> Hash64:
     """
     Computes the keccak512 hash of the input `buffer`.
 
@@ -52,5 +92,4 @@ def keccak512(buffer: Bytes | bytearray) -> Hash64:
         Output of the hash function.
 
     """
-    k = keccak.new(digest_bits=512)
-    return Hash64(k.update(buffer).digest())
+    return Hash64(_keccak512_digest(buffer))
diff --git a/src/ethereum/forks/amsterdam/__init__.py b/src/ethereum/forks/amsterdam/__init__.py
index e6f3e9476a0..e47bb43c1a3 100644
--- a/src/ethereum/forks/amsterdam/__init__.py
+++ b/src/ethereum/forks/amsterdam/__init__.py
@@ -4,11 +4,13 @@
 ### Changes
 
 - [EIP-7928: Block-Level Access Lists][EIP-7928]
+- [EIP-7954: Increase Maximum Contract Size][EIP-7954]
 
 ### Releases
 
 [EIP-7773]: https://eips.ethereum.org/EIPS/eip-7773
 [EIP-7928]: https://eips.ethereum.org/EIPS/eip-7928
+[EIP-7954]: https://eips.ethereum.org/EIPS/eip-7954
 """
 
 from ethereum.fork_criteria import ForkCriteria, Unscheduled
diff --git a/src/ethereum/forks/amsterdam/block_access_lists.py b/src/ethereum/forks/amsterdam/block_access_lists.py
index c6bcf176886..55bec6463cc 100644
--- a/src/ethereum/forks/amsterdam/block_access_lists.py
+++ b/src/ethereum/forks/amsterdam/block_access_lists.py
@@ -13,59 +13,22 @@
 """
 
 from dataclasses import dataclass, field
-from typing import Dict, List, Optional, Set, Tuple, TypeAlias
+from typing import Dict, List, Optional, Set, Tuple, TypeAlias, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes32
 from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U16, U64, U256, Uint
+from ethereum_types.numeric import U64, U256, Uint, ulen
 
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.state import EMPTY_CODE_HASH, Account, Address, PreState
 
 from .exceptions import BlockAccessListGasLimitExceededError
+from .fork_types import BlockAccessIndex
 from .state_tracker import BlockState, TransactionState, get_code
 
-# TODO: Either remove or generalize these type aliases (#2260).
-
-StorageKey: TypeAlias = U256
-"""
-Slot within an [`Account`](ref:ethereum.state.Account)'s storage.
-"""
-
-StorageValue: TypeAlias = U256
-"""
-Value associated with a [`StorageKey`] within an [`Account`]'s storage.
-
-[`StorageKey`]: ref:ethereum.forks.amsterdam.block_access_lists.StorageKey
-[`Account`]: ref:ethereum.state.Account
-"""
-
-CodeData: TypeAlias = Bytes
-"""
-Bytecode associated with an [`Account`](ref:ethereum.state.Account).
-"""
-
-BlockAccessIndex: TypeAlias = U16
-"""
-Position within the set of all changes in a [`Block`].
-
-[`Block`]: ref:ethereum.forks.amsterdam.blocks.Block
-"""
-
-Balance: TypeAlias = U256
-"""
-Balance associated with an [`Account`], in wei.
-
-[`Account`]: ref:ethereum.state.Account
-"""
-
-Nonce: TypeAlias = U64
-"""
-Nonce associated with an [`Account`](ref:ethereum.state.Account).
-"""
-
 
+@final
 @slotted_freezable
 @dataclass
 class StorageChange:
@@ -84,7 +47,7 @@ class StorageChange:
     [`Block`]: ref:ethereum.forks.amsterdam.blocks.Block
     """
 
-    new_value: StorageValue
+    new_value: U256
     """
     Value of an [`Account`]'s storage slot after this change has been applied.
 
@@ -92,6 +55,7 @@ class StorageChange:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class BalanceChange:
@@ -110,7 +74,7 @@ class BalanceChange:
     [`Block`]: ref:ethereum.forks.amsterdam.blocks.Block
     """
 
-    post_balance: Balance
+    post_balance: U256
     """
     Balance of an [`Account`] after this change has been applied.
 
@@ -118,6 +82,7 @@ class BalanceChange:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class NonceChange:
@@ -136,7 +101,7 @@ class NonceChange:
     [`Block`]: ref:ethereum.forks.amsterdam.blocks.Block
     """
 
-    new_nonce: Nonce
+    new_nonce: U64
     """
     Nonce of an [`Account`] after this change has been applied.
 
@@ -144,6 +109,7 @@ class NonceChange:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class CodeChange:
@@ -162,7 +128,7 @@ class CodeChange:
     [`Block`]: ref:ethereum.forks.amsterdam.blocks.Block
     """
 
-    new_code: CodeData
+    new_code: Bytes
     """
     Code of an [`Account`] after this change has been applied.
 
@@ -170,6 +136,7 @@ class CodeChange:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class SlotChanges:
@@ -181,7 +148,7 @@ class SlotChanges:
     [`Account`]: ref:ethereum.state.Account
     """  # noqa: E501
 
-    slot: StorageKey
+    slot: U256
     """
     Location within an [`Account`]'s storage that has been modified.
 
@@ -194,6 +161,7 @@ class SlotChanges:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccountChanges:
@@ -215,7 +183,7 @@ class AccountChanges:
     [`Account`]: ref:ethereum.state.Account
     """
 
-    storage_reads: Tuple[StorageKey, ...]
+    storage_reads: Tuple[U256, ...]
     """
     Storage slots of the associated [`Account`] that have been read but not
     changed.
@@ -271,6 +239,7 @@ class AccountChanges:
 """
 
 
+@final
 @dataclass
 class AccountData:
     """
@@ -311,6 +280,7 @@ class AccountData:
     """
 
 
+@final
 @dataclass
 class BlockAccessListBuilder:
     """
@@ -744,7 +714,7 @@ def validate_block_access_list_gas_limit(
     The total number of items (addresses + unique storage keys) must not
     exceed ``block_gas_limit // GAS_BLOCK_ACCESS_LIST_ITEM``.
     """
-    from .vm.gas import GAS_BLOCK_ACCESS_LIST_ITEM
+    from .vm.gas import GasCosts
 
     bal_items = Uint(0)
     for account in block_access_list:
@@ -760,11 +730,11 @@ def validate_block_access_list_gas_limit(
             unique_slots.add(slot)
 
         # Count each unique storage key as one item
-        bal_items += Uint(len(unique_slots))
+        bal_items += ulen(unique_slots)
 
-    if bal_items > block_gas_limit // GAS_BLOCK_ACCESS_LIST_ITEM:
+    if bal_items > block_gas_limit // GasCosts.BLOCK_ACCESS_LIST_ITEM:
         raise BlockAccessListGasLimitExceededError(
             f"Block access list exceeds gas limit, {bal_items} items "
             f"exceeds limit of "
-            f"{block_gas_limit // GAS_BLOCK_ACCESS_LIST_ITEM}."
+            f"{block_gas_limit // GasCosts.BLOCK_ACCESS_LIST_ITEM}."
         )
diff --git a/src/ethereum/forks/amsterdam/blocks.py b/src/ethereum/forks/amsterdam/blocks.py
index 09a15657002..57b0e2c2874 100644
--- a/src/ethereum/forks/amsterdam/blocks.py
+++ b/src/ethereum/forks/amsterdam/blocks.py
@@ -10,7 +10,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
@@ -31,6 +31,7 @@
 )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Withdrawal:
@@ -64,6 +65,7 @@ class Withdrawal:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -112,9 +114,9 @@ class Header:
     Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [changes]: ref:ethereum.forks.amsterdam.state.State.compute_state_root_and_trie_changes
-    [Trie]: ref:ethereum.forks.amsterdam.trie.Trie
-    """  # noqa: E501
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """
 
     transactions_root: Root
     """
@@ -124,8 +126,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.amsterdam.trie.root
-    [Trie]: ref:ethereum.forks.amsterdam.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -135,8 +137,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.amsterdam.trie.root
-    [Trie]: ref:ethereum.forks.amsterdam.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -258,7 +260,16 @@ class Header:
     [cbalh]: ref:ethereum.forks.amsterdam.block_access_lists.hash_block_access_list
     """  # noqa: E501
 
+    slot_number: U64
+    """
+    The slot number of this block as provided by the consensus layer.
+    Introduced in [EIP-7843].
+
+    [EIP-7843]: https://eips.ethereum.org/EIPS/eip-7843
+    """
+
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -312,6 +323,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -344,6 +356,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
@@ -360,6 +373,7 @@ class Receipt:
     cumulative_gas_used: Uint
     """
     Total gas used in the block up to and including this transaction.
+    This is the gas used after refunds, paid by the user.
     """
 
     bloom: Bloom
diff --git a/src/ethereum/forks/amsterdam/fork.py b/src/ethereum/forks/amsterdam/fork.py
index c0bd9d5f745..d50ae63f193 100644
--- a/src/ethereum/forks/amsterdam/fork.py
+++ b/src/ethereum/forks/amsterdam/fork.py
@@ -12,12 +12,12 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Tuple
+from typing import Final, List, Optional, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
 from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U64, U256, Uint
+from ethereum_types.numeric import U64, U256, Uint, ulen
 
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.exceptions import (
@@ -29,11 +29,18 @@
     NonceMismatchError,
 )
 from ethereum.forks.bpo5.blocks import Header as PreviousHeader
-from ethereum.state import EMPTY_CODE_HASH, Address, BlockDiff, PreState
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    BlockDiff,
+    State,
+    apply_changes_to_state,
+)
+from ethereum.utils.byte import left_pad_zero_bytes
 
 from . import vm
 from .block_access_lists import (
-    BlockAccessIndex,
     BlockAccessListBuilder,
     build_block_access_list,
     hash_block_access_list,
@@ -52,7 +59,7 @@
     PriorityFeeGreaterThanMaxFeeError,
     TransactionTypeContractCreationError,
 )
-from .fork_types import Authorization, VersionedHash
+from .fork_types import Authorization, BlockAccessIndex, VersionedHash
 from .requests import (
     CONSOLIDATION_REQUEST_TYPE,
     DEPOSIT_REQUEST_TYPE,
@@ -60,14 +67,10 @@
     compute_requests_hash,
     parse_deposit_requests,
 )
-from .state import (
-    State,
-    apply_changes_to_state,
-)
 from .state_tracker import (
     BlockState,
     TransactionState,
-    account_exists_and_is_empty,
+    create_ether,
     destroy_account,
     extract_block_diff,
     get_account,
@@ -77,7 +80,6 @@
     set_account_balance,
 )
 from .transactions import (
-    AccessListTransaction,
     BlobTransaction,
     FeeMarketTransaction,
     LegacyTransaction,
@@ -86,17 +88,16 @@
     decode_transaction,
     encode_transaction,
     get_transaction_hash,
+    has_access_list,
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.hexadecimal import hex_to_address
 from .utils.message import prepare_message
 from .vm import Message
 from .vm.eoa_delegation import is_valid_delegation
 from .vm.gas import (
-    BLOB_SCHEDULE_MAX,
-    GAS_PER_BLOB,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_data_fee,
     calculate_excess_blob_gas,
@@ -106,15 +107,15 @@
 
 BASE_FEE_MAX_CHANGE_DENOMINATOR = Uint(8)
 ELASTICITY_MULTIPLIER = Uint(2)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 SYSTEM_ADDRESS = hex_to_address("0xfffffffffffffffffffffffffffffffffffffffe")
 BEACON_ROOTS_ADDRESS = hex_to_address(
     "0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02"
 )
 SYSTEM_TRANSACTION_GAS = Uint(30000000)
-MAX_BLOB_GAS_PER_BLOCK = BLOB_SCHEDULE_MAX * GAS_PER_BLOB
+MAX_BLOB_GAS_PER_BLOCK: Final[U64] = (
+    GasCosts.BLOB_SCHEDULE_MAX * GasCosts.PER_BLOB
+)
 VERSIONED_HASH_VERSION_KZG = b"\x01"
 GWEI_TO_WEI = U256(10**9)
 
@@ -133,6 +134,7 @@
 BLOB_COUNT_LIMIT = 6
 
 
+@final
 @slotted_freezable
 @dataclass
 class ChainContext:
@@ -150,6 +152,7 @@ class ChainContext:
     """Parent header used for header validation and system contracts."""
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -266,7 +269,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
 
 def execute_block(
     block: Block,
-    pre_state: PreState,
+    pre_state: State,
     chain_context: ChainContext,
 ) -> BlockDiff:
     """
@@ -313,6 +316,7 @@ def execute_block(
         excess_blob_gas=block.header.excess_blob_gas,
         parent_beacon_block_root=block.header.parent_beacon_block_root,
         block_access_list_builder=BlockAccessListBuilder(),
+        slot_number=block.header.slot_number,
     )
 
     block_output = apply_body(
@@ -653,7 +657,7 @@ def make_receipt(
         Error in the top level frame of the transaction, if any.
     cumulative_gas_used :
         The total gas used so far in the block after the transaction was
-        executed.
+        executed. This is the gas used after refunds.
     logs :
         The logs produced by the transaction.
 
@@ -697,14 +701,14 @@ def process_checked_system_transaction(
         Output of processing the system transaction.
 
     """
-    # Read through BlockState (not pre-state) so that a system contract
-    # deployed by an earlier transaction in the same block is visible.
-    # See EIP-7002 and EIP-7251 for this edge case.
-    #
-    # This read is not recorded in the state tracker.
-    # However, this is fine because `process_unchecked_system_transaction`
-    # does its own get_account on the TransactionState that we do incorporate
-    # into BlockState.
+    # Pre-check that the system contract has code. We use a throwaway
+    # TransactionState here that is *never* propagated back to BlockState
+    # (no incorporate_tx_into_block call); the same get_account / get_code
+    # lookups are performed and properly tracked by
+    # process_unchecked_system_transaction below, which this function
+    # always calls. Reading via a TransactionState (rather than directly
+    # against pre_state) lets us see system contracts deployed earlier in
+    # the same block — see EIP-7002 and EIP-7251 for this edge case.
     untracked_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
         untracked_state,
@@ -793,7 +797,6 @@ def process_unchecked_system_transaction(
         accessed_storage_keys=set(),
         disable_precompiles=False,
         parent_evm=None,
-        is_create=False,
     )
 
     system_tx_output = process_message_call(system_tx_message)
@@ -854,7 +857,7 @@ def apply_body(
 
     # EIP-7928: Post-execution operations use index N+1
     block_env.block_access_list_builder.block_access_index = BlockAccessIndex(
-        Uint(len(transactions)) + Uint(1)
+        ulen(transactions) + Uint(1)
     )
 
     process_withdrawals(block_env, block_output, withdrawals)
@@ -998,15 +1001,7 @@ def process_transaction(
     access_list_addresses = set()
     access_list_storage_keys = set()
     access_list_addresses.add(block_env.coinbase)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
             access_list_addresses.add(access.account)
             for slot in access.slots:
@@ -1047,41 +1042,53 @@ def process_transaction(
 
     # Transactions with less execution_gas_used than the floor pay at the
     # floor cost.
-    tx_gas_used_after_refund = max(
-        tx_gas_used_after_refund, calldata_floor_gas_cost
+    tx_gas_used = max(tx_gas_used_after_refund, calldata_floor_gas_cost)
+    block_gas_used_in_tx = max(
+        tx_gas_used_before_refund, calldata_floor_gas_cost
     )
 
-    tx_gas_left = tx.gas - tx_gas_used_after_refund
+    tx_gas_left = tx.gas - tx_gas_used
     gas_refund_amount = tx_gas_left * effective_gas_price
 
     # For non-1559 transactions effective_gas_price == tx.gas_price
     priority_fee_per_gas = effective_gas_price - block_env.base_fee_per_gas
-    transaction_fee = tx_gas_used_after_refund * priority_fee_per_gas
+    transaction_fee = tx_gas_used * priority_fee_per_gas
 
     # refund gas
-    sender_balance_after_refund = get_account(tx_state, sender).balance + U256(
-        gas_refund_amount
-    )
-    set_account_balance(tx_state, sender, sender_balance_after_refund)
-
-    coinbase_balance_after_mining_fee = get_account(
-        tx_state, block_env.coinbase
-    ).balance + U256(transaction_fee)
-
-    set_account_balance(
-        tx_state, block_env.coinbase, coinbase_balance_after_mining_fee
-    )
+    create_ether(tx_state, sender, U256(gas_refund_amount))
+
+    # transfer miner fees
+    create_ether(tx_state, block_env.coinbase, U256(transaction_fee))
+
+    # EIP-7708: Emit burn logs for balances held by accounts marked for
+    # deletion AFTER miner fee transfer.
+    finalization_logs: List[Log] = []
+    for address in sorted(tx_output.accounts_to_delete):
+        balance = get_account(tx_state, address).balance
+        if balance > U256(0):
+            padded_address = left_pad_zero_bytes(address, 32)
+            finalization_logs.append(
+                Log(
+                    address=vm.SYSTEM_ADDRESS,
+                    topics=(
+                        vm.BURN_TOPIC,
+                        Hash32(padded_address),
+                    ),
+                    data=balance.to_be_bytes32(),
+                )
+            )
 
-    if coinbase_balance_after_mining_fee == 0 and account_exists_and_is_empty(
-        tx_state, block_env.coinbase
-    ):
-        destroy_account(tx_state, block_env.coinbase)
+    all_logs = tx_output.logs + tuple(finalization_logs)
 
-    block_output.block_gas_used += tx_gas_used_after_refund
+    block_output.cumulative_gas_used += tx_gas_used
+    block_output.block_gas_used += block_gas_used_in_tx
     block_output.blob_gas_used += tx_blob_gas_used
 
     receipt = make_receipt(
-        tx, tx_output.error, block_output.block_gas_used, tx_output.logs
+        tx,
+        tx_output.error,
+        block_output.cumulative_gas_used,
+        all_logs,
     )
 
     receipt_key = rlp.encode(Uint(index))
@@ -1093,7 +1100,7 @@ def process_transaction(
         receipt,
     )
 
-    block_output.block_logs += tx_output.logs
+    block_output.block_logs += all_logs
 
     for address in tx_output.accounts_to_delete:
         destroy_account(tx_state, address)
@@ -1118,9 +1125,7 @@ def process_withdrawals(
             rlp.encode(wd),
         )
 
-        current_balance = get_account(wd_state, wd.address).balance
-        new_balance = current_balance + wd.amount * GWEI_TO_WEI
-        set_account_balance(wd_state, wd.address, new_balance)
+        create_ether(wd_state, wd.address, wd.amount * GWEI_TO_WEI)
 
     incorporate_tx_into_block(wd_state, block_env.block_access_list_builder)
 
@@ -1131,14 +1136,14 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
-    passed through as a parameter is greater than or equal to the *sum* of
-    the parent's gas and the adjustment delta then the limit for gas is too
-    high and fails this function's check. Similarly, if the limit is less
-    than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
-    check fails because the gas limit doesn't allow for a sufficient or
-    reasonable amount of gas to be used on a block.
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is passed
+    through as a parameter is greater than or equal to the *sum* of the
+    parent's gas and the adjustment delta then the limit for gas is too high
+    and fails this function's check. Similarly, if the limit is less than or
+    equal to the *difference* of the parent's gas and the adjustment delta *or*
+    the predefined ``LIMIT_MINIMUM`` then this function's check fails because
+    the gas limit doesn't allow for a sufficient or reasonable amount of gas to
+    be used on a block.
 
     Parameters
     ----------
@@ -1154,12 +1159,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/amsterdam/fork_types.py b/src/ethereum/forks/amsterdam/fork_types.py
index c598e9876bf..3fb1d66d057 100644
--- a/src/ethereum/forks/amsterdam/fork_types.py
+++ b/src/ethereum/forks/amsterdam/fork_types.py
@@ -12,15 +12,23 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes256
 from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U8, U64, U256
+from ethereum_types.numeric import U8, U32, U64, U256
 
 from ethereum.crypto.hash import Hash32
 from ethereum.state import Account, Address
 
+BlockAccessIndex = U32
+"""
+Position within the set of all changes in a [`Block`].
+
+[`Block`]: ref:ethereum.forks.amsterdam.blocks.Block
+"""
+
 VersionedHash = Hash32
 
 Bloom = Bytes256
@@ -43,6 +51,7 @@ def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Authorization:
diff --git a/src/ethereum/forks/amsterdam/requests.py b/src/ethereum/forks/amsterdam/requests.py
index 542c9264d37..675f8a888f9 100644
--- a/src/ethereum/forks/amsterdam/requests.py
+++ b/src/ethereum/forks/amsterdam/requests.py
@@ -1,11 +1,31 @@
 """
-Requests were introduced in EIP-7685 as a general purpose framework for
-storing contract-triggered requests. It extends the execution header and
-body with a single field each to store the request information.
-This inherently exposes the requests to the consensus layer, which can
-then process each one.
-
+[EIP-7685] generalizes how the execution layer communicates validator actions
+to the consensus layer. Rather than adding a dedicated header field for each
+new action type (as [EIP-4895] did for withdrawals), the execution header
+commits to a single [`requests_hash`][rh] that aggregates an ordered list of
+typed requests.
+
+Each request is a type byte (see [`DEPOSIT_REQUEST_TYPE`][dt],
+[`WITHDRAWAL_REQUEST_TYPE`][wt], and [`CONSOLIDATION_REQUEST_TYPE`][ct])
+followed by an opaque payload. Deposit requests are discovered by scanning
+transaction receipts for logs emitted by the deposit contract; withdrawal
+and consolidation requests are produced by the corresponding system
+contracts during block processing.
+
+See [`parse_deposit_requests`][pd] for how deposit logs become request data,
+[`compute_requests_hash`][crh] for how the list is hashed for inclusion in the
+header, and [`process_general_purpose_requests`][pgpr] for how the requests are
+processed.
+
+[EIP-4895]: https://eips.ethereum.org/EIPS/eip-4895
 [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+[rh]: ref:ethereum.forks.amsterdam.blocks.Header.requests_hash
+[dt]: ref:ethereum.forks.amsterdam.requests.DEPOSIT_REQUEST_TYPE
+[wt]: ref:ethereum.forks.amsterdam.requests.WITHDRAWAL_REQUEST_TYPE
+[ct]: ref:ethereum.forks.amsterdam.requests.CONSOLIDATION_REQUEST_TYPE
+[pd]: ref:ethereum.forks.amsterdam.requests.parse_deposit_requests
+[crh]: ref:ethereum.forks.amsterdam.requests.compute_requests_hash
+[pgpr]: ref:ethereum.forks.amsterdam.fork.process_general_purpose_requests
 """
 
 from hashlib import sha256
@@ -15,48 +35,133 @@
 from ethereum_types.numeric import Uint, ulen
 
 from ethereum.exceptions import InvalidBlock
+from ethereum.merkle_patricia_trie import trie_get
 from ethereum.utils.hexadecimal import hex_to_bytes32
 
 from .blocks import decode_receipt
-from .trie import trie_get
 from .utils.hexadecimal import hex_to_address
 from .vm import BlockOutput
 
 DEPOSIT_CONTRACT_ADDRESS = hex_to_address(
     "0x00000000219ab540356cbb839cbe05303d7705fa"
 )
+"""
+Mainnet address of the beacon chain deposit contract. Scanning block
+receipts for logs emitted by this address is how the execution layer
+discovers validator deposits, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 DEPOSIT_EVENT_SIGNATURE_HASH = hex_to_bytes32(
     "0x649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c5"
 )
+"""
+First [log topic] of the deposit contract's `DepositEvent`, equal to the
+keccak256 of its Solidity event signature. Logs whose first topic does not
+match this are ignored when collecting deposit requests.
+
+[log topic]: https://docs.soliditylang.org/en/latest/abi-spec.html#events
+"""
+
 DEPOSIT_REQUEST_TYPE = b"\x00"
+"""
+Request type byte identifying a deposit request, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 WITHDRAWAL_REQUEST_TYPE = b"\x01"
+"""
+Request type byte identifying an execution-triggered withdrawal request,
+per [EIP-7002].
+
+[EIP-7002]: https://eips.ethereum.org/EIPS/eip-7002
+"""
+
 CONSOLIDATION_REQUEST_TYPE = b"\x02"
+"""
+Request type byte identifying a consolidation request, per [EIP-7251].
+
+[EIP-7251]: https://eips.ethereum.org/EIPS/eip-7251
+"""
 
 
 DEPOSIT_EVENT_LENGTH = Uint(576)
+"""
+Total length in bytes of the ABI-encoded `DepositEvent` data payload. Every
+well-formed event has this exact length.
+"""
 
 PUBKEY_OFFSET = Uint(160)
+"""
+Position within the event payload of the validator public key's length
+prefix, as emitted by the Solidity ABI encoder.
+"""
+
 WITHDRAWAL_CREDENTIALS_OFFSET = Uint(256)
+"""
+Position within the event payload of the withdrawal credentials' length
+prefix.
+"""
+
 AMOUNT_OFFSET = Uint(320)
+"""
+Position within the event payload of the deposit amount's length prefix.
+"""
+
 SIGNATURE_OFFSET = Uint(384)
+"""
+Position within the event payload of the deposit signature's length prefix.
+"""
+
 INDEX_OFFSET = Uint(512)
+"""
+Position within the event payload of the deposit index's length prefix.
+"""
 
 PUBKEY_SIZE = Uint(48)
+"""
+Length of the BLS12-381 public key that identifies the validator receiving
+the deposit.
+"""
+
 WITHDRAWAL_CREDENTIALS_SIZE = Uint(32)
+"""
+Length of the withdrawal credentials, which determine where the staked
+ether may eventually be withdrawn.
+"""
+
 AMOUNT_SIZE = Uint(8)
+"""
+Length of the little-endian Gwei amount being deposited.
+"""
+
 SIGNATURE_SIZE = Uint(96)
+"""
+Length of the BLS12-381 signature over the deposit message.
+"""
+
 INDEX_SIZE = Uint(8)
+"""
+Length of the monotonically-increasing deposit index assigned by the
+deposit contract when it emits the event.
+"""
 
 
 def extract_deposit_data(data: Bytes) -> Bytes:
     """
-    Extracts Deposit Request from the DepositContract.DepositEvent data.
+    Strip the Solidity ABI framing from a `DepositEvent` payload and return
+    the concatenated raw fields in the order consumed by the consensus
+    layer: public key, withdrawal credentials, amount, signature, and
+    deposit index.
 
-    Raises
-    ------
-    InvalidBlock :
-        If the deposit contract did not produce a valid log.
+    Because each field has a fixed length, every well-formed event has an
+    identical byte layout. Any deviation indicates a misbehaving or
+    compromised deposit contract, so this function raises [`InvalidBlock`]
+    rather than silently accepting unexpected data.
 
+    [`InvalidBlock`]: ref:ethereum.exceptions.InvalidBlock
     """
     if ulen(data) != DEPOSIT_EVENT_LENGTH:
         raise InvalidBlock("Invalid deposit event data length")
@@ -150,7 +255,19 @@ def extract_deposit_data(data: Bytes) -> Bytes:
 
 def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
     """
-    Parse deposit requests from the block output.
+    Walk the receipts produced during block execution, concatenating the
+    raw payload of every valid deposit event into a single byte string.
+
+    A log is considered a deposit when it originates from
+    [`DEPOSIT_CONTRACT_ADDRESS`][addr] and its first topic matches
+    [`DEPOSIT_EVENT_SIGNATURE_HASH`][sig]. The returned bytes are the
+    direct concatenation of the unframed deposit fields, ready to be
+    prefixed with [`DEPOSIT_REQUEST_TYPE`][dt] before being appended to
+    the block's request list.
+
+    [addr]: ref:ethereum.forks.amsterdam.requests.DEPOSIT_CONTRACT_ADDRESS
+    [sig]: ref:ethereum.forks.amsterdam.requests.DEPOSIT_EVENT_SIGNATURE_HASH
+    [dt]: ref:ethereum.forks.amsterdam.requests.DEPOSIT_REQUEST_TYPE
     """
     deposit_requests: Bytes = b""
     for key in block_output.receipt_keys:
@@ -171,18 +288,18 @@ def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
 
 def compute_requests_hash(requests: List[Bytes]) -> Bytes:
     """
-    Get the hash of the requests using the SHA2-256 algorithm.
-
-    Parameters
-    ----------
-    requests : Bytes
-        The requests to hash.
-
-    Returns
-    -------
-    requests_hash : Bytes
-        The hash of the requests.
-
+    Compute the [SHA2-256] commitment over an ordered list of
+    type-prefixed requests, as defined by [EIP-7685].
+
+    The commitment is the SHA2-256 hash of the concatenation of the
+    SHA2-256 hashes of each individual request. This is what the
+    execution header's [`requests_hash`][rh] stores, and what the
+    consensus layer re-derives to validate that both layers observed the
+    same set of requests.
+
+    [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+    [SHA2-256]: https://en.wikipedia.org/wiki/SHA-2
+    [rh]: ref:ethereum.forks.amsterdam.blocks.Header.requests_hash
     """
     m = sha256()
     for request in requests:
diff --git a/src/ethereum/forks/amsterdam/state.py b/src/ethereum/forks/amsterdam/state.py
deleted file mode 100644
index 0c01146588e..00000000000
--- a/src/ethereum/forks/amsterdam/state.py
+++ /dev/null
@@ -1,222 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Dict, List, Optional, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.numeric import U256
-
-from ethereum.crypto.hash import Hash32, keccak256
-from ethereum.state import (
-    EMPTY_CODE_HASH,
-    Account,
-    Address,
-    BlockDiff,
-    InternalNode,
-    Root,
-)
-
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-    def get_code(self, code_hash: Hash32) -> Bytes:
-        """
-        Get the bytecode for a given code hash.
-
-        Return ``b""`` for ``EMPTY_CODE_HASH``.
-        """
-        if code_hash == EMPTY_CODE_HASH:
-            return b""
-        return self._code_store[code_hash]
-
-    def get_account_optional(self, address: Address) -> Optional[Account]:
-        """
-        Get the account at an address.
-
-        Return ``None`` if there is no account at the address.
-        """
-        return trie_get(self._main_trie, address)
-
-    def get_storage(self, address: Address, key: Bytes32) -> U256:
-        """
-        Get a storage value.
-
-        Return ``U256(0)`` if the key has not been set.
-        """
-        trie = self._storage_tries.get(address)
-        if trie is None:
-            return U256(0)
-
-        value = trie_get(trie, key)
-
-        assert isinstance(value, U256)
-        return value
-
-    def account_has_storage(self, address: Address) -> bool:
-        """
-        Check whether an account has any storage.
-
-        Only needed for EIP-7610.
-        """
-        return address in self._storage_tries
-
-    def compute_state_root_and_trie_changes(
-        self,
-        account_changes: Dict[Address, Optional[Account]],
-        storage_changes: Dict[Address, Dict[Bytes32, U256]],
-    ) -> Tuple[Root, List[InternalNode]]:
-        """
-        Compute the state root after applying changes to the pre-state.
-
-        Return the new state root together with the internal trie nodes
-        that were created or modified.
-        """
-        main_trie = copy_trie(self._main_trie)
-        storage_tries = {
-            k: copy_trie(v) for k, v in self._storage_tries.items()
-        }
-
-        for address, account in account_changes.items():
-            trie_set(main_trie, address, account)
-
-        for address, slots in storage_changes.items():
-            trie = storage_tries.get(address)
-            if trie is None:
-                trie = Trie(secured=True, default=U256(0))
-                storage_tries[address] = trie
-            for key, value in slots.items():
-                trie_set(trie, key, value)
-            if trie._data == {}:
-                del storage_tries[address]
-
-        def get_storage_root(addr: Address) -> Root:
-            if addr in storage_tries:
-                return root(storage_tries[addr])
-            return EMPTY_TRIE_ROOT
-
-        state_root_value = root(main_trie, get_storage_root=get_storage_root)
-
-        return state_root_value, []
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._code_store
-
-
-def apply_changes_to_state(state: State, diff: BlockDiff) -> None:
-    """
-    Apply block-level diff to the ``State`` for the next block.
-
-    Parameters
-    ----------
-    state :
-        The state to update.
-    diff :
-        Account, storage, and code changes to apply.
-
-    """
-    for address, account in diff.account_changes.items():
-        trie_set(state._main_trie, address, account)
-
-    for address, slots in diff.storage_changes.items():
-        trie = state._storage_tries.get(address)
-        if trie is None:
-            trie = Trie(secured=True, default=U256(0))
-            state._storage_tries[address] = trie
-        for key, value in slots.items():
-            trie_set(trie, key, value)
-        if trie._data == {}:
-            del state._storage_tries[address]
-
-    state._code_store.update(diff.code_changes)
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State``.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State,
-    address: Address,
-    account: Optional[Account],
-) -> None:
-    """
-    Set an account in a ``State``.
-
-    Setting to ``None`` deletes the account.
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def set_storage(
-    state: State,
-    address: Address,
-    key: Bytes32,
-    value: U256,
-) -> None:
-    """
-    Set a storage value in a ``State``.
-
-    Setting to ``U256(0)`` deletes the key.
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def state_root(state: State) -> Root:
-    """
-    Compute the state root of the current state.
-    """
-    root_value, _ = state.compute_state_root_and_trie_changes({}, {})
-    return root_value
diff --git a/src/ethereum/forks/amsterdam/state_tracker.py b/src/ethereum/forks/amsterdam/state_tracker.py
index 5d2c099ddc8..2e208ee764f 100644
--- a/src/ethereum/forks/amsterdam/state_tracker.py
+++ b/src/ethereum/forks/amsterdam/state_tracker.py
@@ -19,7 +19,7 @@
 """
 
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Callable, Dict, Optional, Set, Tuple
+from typing import TYPE_CHECKING, Callable, Dict, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes32
 from ethereum_types.frozen import modify
@@ -39,6 +39,7 @@
     from .block_access_lists import BlockAccessListBuilder
 
 
+@final
 @dataclass
 class BlockState:
     """
@@ -62,6 +63,7 @@ class BlockState:
     code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
 
 
+@final
 @dataclass
 class TransactionState:
     """
@@ -140,10 +142,10 @@ def get_account(tx_state: TransactionState, address: Address) -> Account:
 
     """
     account = get_account_optional(tx_state, address)
-    if isinstance(account, Account):
-        return account
-    else:
+    if account is None:
         return EMPTY_ACCOUNT
+    else:
+        return account
 
 
 def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
@@ -568,6 +570,29 @@ def increase_recipient_balance(recipient: Account) -> None:
     modify_state(tx_state, recipient_address, increase_recipient_balance)
 
 
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
 def set_account_balance(
     tx_state: TransactionState, address: Address, amount: U256
 ) -> None:
diff --git a/src/ethereum/forks/amsterdam/transactions.py b/src/ethereum/forks/amsterdam/transactions.py
index 7351227df6f..f757be7d15d 100644
--- a/src/ethereum/forks/amsterdam/transactions.py
+++ b/src/ethereum/forks/amsterdam/transactions.py
@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, TypeGuard, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -28,46 +28,26 @@
 )
 from .fork_types import Authorization, VersionedHash
 
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_TOKEN_FLOOR = Uint(10)
-"""
-Minimum gas cost per byte of calldata as per [EIP-7623]. Used to calculate
-the minimum gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_DATA_TOKEN_STANDARD = Uint(4)
-"""
-Gas cost per byte of calldata as per [EIP-7623]. Used to calculate the
-gas cost for transactions that include calldata.
+TX_MAX_GAS_LIMIT = Uint(16_777_216)
 
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
+ACCESS_LIST_ADDRESS_FLOOR_TOKENS = Uint(80)
 """
+Floor data tokens contributed by a single access list address per
+[EIP-7981].
 
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
+[EIP-7981]: https://eips.ethereum.org/EIPS/eip-7981
 """
 
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
+ACCESS_LIST_STORAGE_KEY_FLOOR_TOKENS = Uint(128)
 """
+Floor data tokens contributed by a single access list storage key per
+[EIP-7981].
 
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
+[EIP-7981]: https://eips.ethereum.org/EIPS/eip-7981
 """
 
-TX_MAX_GAS_LIMIT = Uint(16_777_216)
-
 
+@final
 @slotted_freezable
 @dataclass
 class LegacyTransaction:
@@ -130,6 +110,7 @@ class LegacyTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Access:
@@ -149,6 +130,7 @@ class Access:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccessListTransaction:
@@ -221,6 +203,7 @@ class AccessListTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class FeeMarketTransaction:
@@ -298,6 +281,7 @@ class FeeMarketTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class BlobTransaction:
@@ -386,6 +370,7 @@ class BlobTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class SetCodeTransaction:
@@ -481,6 +466,23 @@ class SetCodeTransaction:
 """
 
 
+AccessListCapableTransaction = (
+    AccessListTransaction
+    | FeeMarketTransaction
+    | BlobTransaction
+    | SetCodeTransaction
+)
+"""
+Transaction types that include an [EIP-2930]-style access list.
+
+See [`has_access_list`][hal] and [`Access`][a] for more details.
+
+[EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+[hal]: ref:ethereum.forks.amsterdam.transactions.has_access_list
+[a]: ref:ethereum.forks.amsterdam.transactions.Access
+"""
+
+
 def encode_transaction(tx: Transaction) -> LegacyTransaction | Bytes:
     """
     Encode a transaction into its RLP or typed transaction format.
@@ -564,8 +566,8 @@ def validate_transaction(tx: Transaction) -> Tuple[Uint, Uint]:
     """
     from .vm.interpreter import MAX_INIT_CODE_SIZE
 
-    intrinsic_gas, calldata_floor_gas_cost = calculate_intrinsic_cost(tx)
-    if max(intrinsic_gas, calldata_floor_gas_cost) > tx.gas:
+    intrinsic_gas, data_floor_gas_cost = calculate_intrinsic_cost(tx)
+    if max(intrinsic_gas, data_floor_gas_cost) > tx.gas:
         raise InsufficientTransactionGasError("Insufficient gas")
     if U256(tx.nonce) >= U256(U64.MAX_VALUE):
         raise NonceOverflowError("Nonce too high")
@@ -574,7 +576,7 @@ def validate_transaction(tx: Transaction) -> Tuple[Uint, Uint]:
     if tx.gas > TX_MAX_GAS_LIMIT:
         raise TransactionGasLimitExceededError("Gas limit too high")
 
-    return intrinsic_gas, calldata_floor_gas_cost
+    return intrinsic_gas, data_floor_gas_cost
 
 
 def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
@@ -591,7 +593,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
     4. Cost for access list entries (if applicable)
@@ -602,57 +604,74 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     gas cost of the transaction and the minimum gas cost used by the
     transaction based on the calldata size.
     """
-    from .vm.eoa_delegation import GAS_AUTH_PER_EMPTY_ACCOUNT
-    from .vm.gas import init_code_cost
+    from .vm.gas import GasCosts, init_code_cost
 
-    num_zeros = Uint(tx.data.count(0))
-    num_non_zeros = ulen(tx.data) - num_zeros
+    tokens_in_calldata = count_tokens_in_data(tx.data)
 
-    tokens_in_calldata = num_zeros + num_non_zeros * Uint(4)
-    # EIP-7623 floor price (note: no EVM costs)
-    calldata_floor_gas_cost = (
-        tokens_in_calldata * GAS_TX_DATA_TOKEN_FLOOR + GAS_TX_BASE
-    )
-
-    data_cost = tokens_in_calldata * GAS_TX_DATA_TOKEN_STANDARD
+    data_cost = tokens_in_calldata * GasCosts.TX_DATA_TOKEN_STANDARD
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE + init_code_cost(ulen(tx.data))
+        create_cost = GasCosts.TX_CREATE + init_code_cost(ulen(tx.data))
     else:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    tokens_in_access_list = Uint(0)
+    if has_access_list(tx):
         for access in tx.access_list:
-            access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_cost += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
+            tokens_in_access_list += ACCESS_LIST_ADDRESS_FLOOR_TOKENS
+            tokens_in_access_list += (
+                ulen(access.slots) * ACCESS_LIST_STORAGE_KEY_FLOOR_TOKENS
+            )
+
+    # Data token floor cost for access list bytes.
+    access_list_cost += tokens_in_access_list * GasCosts.TX_DATA_TOKEN_FLOOR
 
     auth_cost = Uint(0)
     if isinstance(tx, SetCodeTransaction):
-        auth_cost += Uint(GAS_AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations))
+        auth_cost += Uint(
+            GasCosts.AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations)
+        )
+
+    # EIP-7976 floor tokens: all calldata bytes count uniformly.
+    floor_tokens_in_calldata = ulen(tx.data) * GasCosts.TX_DATA_TOKEN_STANDARD
+
+    # Total floor tokens.
+    total_floor_tokens = floor_tokens_in_calldata + tokens_in_access_list
+
+    # Floor gas cost (EIP-7623: minimum gas for data-heavy transactions).
+    data_floor_gas_cost = (
+        total_floor_tokens * GasCosts.TX_DATA_TOKEN_FLOOR + GasCosts.TX_BASE
+    )
 
     return (
         Uint(
-            GAS_TX_BASE
+            GasCosts.TX_BASE
             + data_cost
             + create_cost
             + access_list_cost
             + auth_cost
         ),
-        calldata_floor_gas_cost,
+        data_floor_gas_cost,
     )
 
 
+def count_tokens_in_data(data: bytes) -> Uint:
+    """
+    Count the data tokens in arbitrary input bytes.
+
+    Zero bytes count as 1 token; non-zero bytes count as 4 tokens.
+    """
+    num_zeros = Uint(data.count(0))
+    num_non_zeros = ulen(data) - num_zeros
+
+    return num_zeros + num_non_zeros * Uint(4)
+
+
 def recover_sender(chain_id: U64, tx: Transaction) -> Address:
     """
     Extracts the sender address from a transaction.
@@ -891,3 +910,17 @@ def get_transaction_hash(tx: Bytes | LegacyTransaction) -> Hash32:
         return keccak256(rlp.encode(tx))
     else:
         return keccak256(tx)
+
+
+def has_access_list(
+    tx: Transaction,
+) -> TypeGuard[AccessListCapableTransaction]:
+    """
+    Return whether the transaction has an [EIP-2930]-style access list.
+
+    [EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+    """
+    return isinstance(
+        tx,
+        AccessListCapableTransaction,
+    )
diff --git a/src/ethereum/forks/amsterdam/trie.py b/src/ethereum/forks/amsterdam/trie.py
deleted file mode 100644
index 0f89d295832..00000000000
--- a/src/ethereum/forks/amsterdam/trie.py
+++ /dev/null
@@ -1,467 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
-from typing_extensions import assert_type
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.bpo5 import trie as previous_trie
-from ethereum.state import (
-    Account,
-    Address,
-    BranchNode,
-    BranchSubnodes,
-    ExtensionNode,
-    InternalNode,
-    LeafNode,
-    Root,
-)
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt, Withdrawal
-from .fork_types import encode_account
-from .transactions import LegacyTransaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = (
-    Account
-    | Bytes
-    | LegacyTransaction
-    | Receipt
-    | Uint
-    | U256
-    | Withdrawal
-    | None
-)
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[LegacyTransaction | Bytes],
-    Optional[Receipt | Bytes],
-    Optional[Withdrawal | Bytes],
-    Uint,
-    U256,
-)
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` object and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `Extended`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (LegacyTransaction, Receipt, Withdrawal, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/amsterdam/utils/message.py b/src/ethereum/forks/amsterdam/utils/message.py
index d8fbf4f35a4..ee29f60f942 100644
--- a/src/ethereum/forks/amsterdam/utils/message.py
+++ b/src/ethereum/forks/amsterdam/utils/message.py
@@ -90,5 +90,4 @@ def prepare_message(
         accessed_storage_keys=set(tx_env.access_list_storage_keys),
         disable_precompiles=False,
         parent_evm=None,
-        is_create=isinstance(tx.to, Bytes0),
     )
diff --git a/src/ethereum/forks/amsterdam/vm/__init__.py b/src/ethereum/forks/amsterdam/vm/__init__.py
index 5d6b2fbfb72..1370b0c1516 100644
--- a/src/ethereum/forks/amsterdam/vm/__init__.py
+++ b/src/ethereum/forks/amsterdam/vm/__init__.py
@@ -13,25 +13,33 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
-from ethereum.crypto.hash import Hash32
+from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
+from ethereum.utils.byte import left_pad_zero_bytes
 
 from ..block_access_lists import BlockAccessList, BlockAccessListBuilder
 from ..blocks import Log, Receipt, Withdrawal
 from ..fork_types import Authorization, VersionedHash
 from ..state_tracker import BlockState, TransactionState
 from ..transactions import LegacyTransaction
-from ..trie import Trie
 
 __all__ = ("Environment", "Evm", "Message")
+TRANSFER_TOPIC = keccak256(b"Transfer(address,address,uint256)")
+BURN_TOPIC = keccak256(b"Burn(address,uint256)")
+SYSTEM_ADDRESS = Address(
+    bytes.fromhex("fffffffffffffffffffffffffffffffffffffffe")
+)
+CALL_SUCCESS = U256(1)
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -50,8 +58,10 @@ class BlockEnvironment:
     excess_blob_gas: U64
     parent_beacon_block_root: Hash32
     block_access_list_builder: BlockAccessListBuilder
+    slot_number: U64
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -81,6 +91,7 @@ class BlockOutput:
     """
 
     block_gas_used: Uint = Uint(0)
+    cumulative_gas_used: Uint = Uint(0)
     transactions_trie: Trie[Bytes, Optional[Bytes | LegacyTransaction]] = (
         field(default_factory=lambda: Trie(secured=False, default=None))
     )
@@ -97,10 +108,11 @@ class BlockOutput:
     block_access_list: BlockAccessList = field(default_factory=list)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
@@ -115,6 +127,7 @@ class TransactionEnvironment:
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -138,9 +151,9 @@ class Message:
     accessed_storage_keys: Set[Tuple[Address, Bytes32]]
     disable_precompiles: bool
     parent_evm: Optional["Evm"]
-    is_create: bool
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
@@ -196,3 +209,76 @@ def incorporate_child_on_error(evm: Evm, child_evm: Evm) -> None:
 
     """
     evm.gas_left += child_evm.gas_left
+
+
+def emit_transfer_log(
+    evm: Evm,
+    sender: Address,
+    recipient: Address,
+    transfer_amount: U256,
+) -> None:
+    """
+    Emit a LOG3 for all ETH transfers satisfying EIP-7708.
+
+    Parameters
+    ----------
+    evm :
+        The state of the ethereum virtual machine
+    sender :
+        The account address sending the transfer
+    recipient :
+        The account address receiving the transfer
+    transfer_amount :
+        The amount of ETH transacted
+
+    """
+    if transfer_amount == 0:
+        return
+
+    padded_sender = left_pad_zero_bytes(sender, 32)
+    padded_recipient = left_pad_zero_bytes(recipient, 32)
+    log_entry = Log(
+        address=SYSTEM_ADDRESS,
+        topics=(
+            TRANSFER_TOPIC,
+            Hash32(padded_sender),
+            Hash32(padded_recipient),
+        ),
+        data=transfer_amount.to_be_bytes32(),
+    )
+
+    evm.logs = evm.logs + (log_entry,)
+
+
+def emit_burn_log(
+    evm: Evm,
+    account: Address,
+    amount: U256,
+) -> None:
+    """
+    Emit a LOG2 for ETH burn per EIP-7708.
+
+    Parameters
+    ----------
+    evm :
+        The state of the ethereum virtual machine
+    account :
+        The account address whose ETH is being burned
+    amount :
+        The amount of ETH being burned
+
+    """
+    if amount == 0:
+        return
+
+    padded_account = left_pad_zero_bytes(account, 32)
+    log_entry = Log(
+        address=SYSTEM_ADDRESS,
+        topics=(
+            BURN_TOPIC,
+            Hash32(padded_account),
+        ),
+        data=amount.to_be_bytes32(),
+    )
+
+    evm.logs = evm.logs + (log_entry,)
diff --git a/src/ethereum/forks/amsterdam/vm/eoa_delegation.py b/src/ethereum/forks/amsterdam/vm/eoa_delegation.py
index 602afef3c1f..6262f42a0bc 100644
--- a/src/ethereum/forks/amsterdam/vm/eoa_delegation.py
+++ b/src/ethereum/forks/amsterdam/vm/eoa_delegation.py
@@ -21,14 +21,13 @@
     set_code,
 )
 from ..utils.hexadecimal import hex_to_address
-from ..vm.gas import GAS_COLD_ACCOUNT_ACCESS, GAS_WARM_ACCESS
+from ..vm.gas import GasCosts
 from . import Evm, Message
 
 SET_CODE_TX_MAGIC = b"\x05"
 EOA_DELEGATION_MARKER = b"\xef\x01\x00"
 EOA_DELEGATION_MARKER_LENGTH = len(EOA_DELEGATION_MARKER)
 EOA_DELEGATED_CODE_LENGTH = 23
-GAS_AUTH_PER_EMPTY_ACCOUNT = 25000
 REFUND_AUTH_PER_EXISTING_ACCOUNT = 12500
 NULL_ADDRESS = hex_to_address("0x0000000000000000000000000000000000000000")
 
@@ -149,9 +148,9 @@ def calculate_delegation_cost(
     delegated_address = Address(code[EOA_DELEGATION_MARKER_LENGTH:])
 
     if delegated_address in evm.accessed_addresses:
-        delegation_gas_cost = GAS_WARM_ACCESS
+        delegation_gas_cost = GasCosts.WARM_ACCESS
     else:
-        delegation_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        delegation_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     return True, delegated_address, delegation_gas_cost
 
@@ -199,7 +198,8 @@ def set_delegation(message: Message) -> U256:
 
         if account_exists(tx_state, authority):
             refund_counter += U256(
-                GAS_AUTH_PER_EMPTY_ACCOUNT - REFUND_AUTH_PER_EXISTING_ACCOUNT
+                GasCosts.AUTH_PER_EMPTY_ACCOUNT
+                - REFUND_AUTH_PER_EXISTING_ACCOUNT
             )
 
         if auth.address == NULL_ADDRESS:
diff --git a/src/ethereum/forks/amsterdam/vm/gas.py b/src/ethereum/forks/amsterdam/vm/gas.py
index d3917935e27..8b0dbae14fc 100644
--- a/src/ethereum/forks/amsterdam/vm/gas.py
+++ b/src/ethereum/forks/amsterdam/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U64, U256, Uint
+from ethereum_types.numeric import U64, U256, Uint, ulen
 
 from ethereum.forks.bpo5.blocks import Header as PreviousHeader
 from ethereum.trace import GasAndRefund, evm_trace
@@ -25,69 +25,179 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 4800
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-GAS_ECRECOVER = Uint(3000)
-GAS_P256VERIFY = Uint(6900)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1)
-GAS_COLD_SLOAD = Uint(2100)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600)
-GAS_WARM_ACCESS = Uint(100)
-GAS_CODE_INIT_PER_WORD = Uint(2)
-GAS_BLOBHASH_OPCODE = Uint(3)
-GAS_POINT_EVALUATION = Uint(50000)
-
-GAS_PER_BLOB = U64(2**17)
-BLOB_SCHEDULE_TARGET = U64(14)
-BLOB_TARGET_GAS_PER_BLOCK = GAS_PER_BLOB * BLOB_SCHEDULE_TARGET
-BLOB_BASE_COST = Uint(2**13)
-BLOB_SCHEDULE_MAX = U64(21)
-BLOB_MIN_GASPRICE = Uint(1)
-BLOB_BASE_FEE_UPDATE_FRACTION = Uint(11684671)
-
-GAS_BLS_G1_ADD = Uint(375)
-GAS_BLS_G1_MUL = Uint(12000)
-GAS_BLS_G1_MAP = Uint(5500)
-GAS_BLS_G2_ADD = Uint(600)
-GAS_BLS_G2_MUL = Uint(22500)
-GAS_BLS_G2_MAP = Uint(23800)
-
-GAS_BLOCK_ACCESS_LIST_ITEM = Uint(2000)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    WARM_ACCESS: Final[Uint] = Uint(100)
+    COLD_ACCOUNT_ACCESS: Final[Uint] = Uint(2600)
+    COLD_STORAGE_ACCESS: Final[Uint] = Uint(2100)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+    CODE_INIT_PER_WORD: Final[Uint] = Uint(2)
+
+    # Authorization
+    AUTH_PER_EMPTY_ACCOUNT: Final[int] = 25000
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 4800
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_P256VERIFY: Final[Uint] = Uint(6900)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1)
+    PRECOMPILE_POINT_EVALUATION: Final[Uint] = Uint(50000)
+    PRECOMPILE_BLS_G1ADD: Final[Uint] = Uint(375)
+    PRECOMPILE_BLS_G1MUL: Final[Uint] = Uint(12000)
+    PRECOMPILE_BLS_G1MAP: Final[Uint] = Uint(5500)
+    PRECOMPILE_BLS_G2ADD: Final[Uint] = Uint(600)
+    PRECOMPILE_BLS_G2MUL: Final[Uint] = Uint(22500)
+    PRECOMPILE_BLS_G2MAP: Final[Uint] = Uint(23800)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000)
+
+    # Blobs
+    PER_BLOB: Final[U64] = U64(2**17)
+    BLOB_SCHEDULE_TARGET: Final[U64] = U64(14)
+    BLOB_TARGET_GAS_PER_BLOCK: Final[U64] = PER_BLOB * BLOB_SCHEDULE_TARGET
+    BLOB_BASE_COST: Final[Uint] = Uint(2**13)
+    BLOB_SCHEDULE_MAX: Final[U64] = U64(21)
+    BLOB_MIN_GASPRICE: Final[Uint] = Uint(1)
+    BLOB_BASE_FEE_UPDATE_FRACTION: Final[Uint] = Uint(11684671)
+
+    # Block Access Lists
+    BLOCK_ACCESS_LIST_ITEM: Final[Uint] = Uint(2000)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_TOKEN_STANDARD: Final[Uint] = Uint(4)
+    TX_DATA_TOKEN_FLOOR: Final[Uint] = Uint(16)
+    TX_ACCESS_LIST_ADDRESS: Final[Uint] = Uint(2400)
+    TX_ACCESS_LIST_STORAGE_KEY: Final[Uint] = Uint(1900)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_CLZ: Final[Uint] = LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_PREVRANDAO: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_BASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBBASEFEE: Final[Uint] = BASE
+    OPCODE_SLOTNUM: Final[Uint] = BASE
+    OPCODE_BLOBHASH: Final[Uint] = Uint(3)
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_PUSH0: Final[Uint] = BASE
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+    OPCODE_DUPN: Final[Uint] = VERY_LOW
+    OPCODE_SWAPN: Final[Uint] = VERY_LOW
+    OPCODE_EXCHANGE: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcode Components
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MCOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -103,11 +213,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -176,7 +287,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -206,7 +317,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -231,7 +342,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
@@ -303,7 +414,7 @@ def init_code_cost(init_code_length: Uint) -> Uint:
         The gas to be charged for the init code.
 
     """
-    return GAS_CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
+    return GasCosts.CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
 
 
 def calculate_excess_blob_gas(
@@ -336,21 +447,23 @@ def calculate_excess_blob_gas(
         base_fee_per_gas = parent_header.base_fee_per_gas
 
     parent_blob_gas = excess_blob_gas + blob_gas_used
-    if parent_blob_gas < BLOB_TARGET_GAS_PER_BLOCK:
+    if parent_blob_gas < GasCosts.BLOB_TARGET_GAS_PER_BLOCK:
         return U64(0)
 
-    target_blob_gas_price = Uint(GAS_PER_BLOB)
+    target_blob_gas_price = Uint(GasCosts.PER_BLOB)
     target_blob_gas_price *= calculate_blob_gas_price(excess_blob_gas)
 
-    base_blob_tx_price = BLOB_BASE_COST * base_fee_per_gas
+    base_blob_tx_price = GasCosts.BLOB_BASE_COST * base_fee_per_gas
     if base_blob_tx_price > target_blob_gas_price:
-        blob_schedule_delta = BLOB_SCHEDULE_MAX - BLOB_SCHEDULE_TARGET
+        blob_schedule_delta = (
+            GasCosts.BLOB_SCHEDULE_MAX - GasCosts.BLOB_SCHEDULE_TARGET
+        )
         return (
             excess_blob_gas
-            + blob_gas_used * blob_schedule_delta // BLOB_SCHEDULE_MAX
+            + blob_gas_used * blob_schedule_delta // GasCosts.BLOB_SCHEDULE_MAX
         )
 
-    return parent_blob_gas - BLOB_TARGET_GAS_PER_BLOCK
+    return parent_blob_gas - GasCosts.BLOB_TARGET_GAS_PER_BLOCK
 
 
 def calculate_total_blob_gas(tx: Transaction) -> U64:
@@ -369,7 +482,7 @@ def calculate_total_blob_gas(tx: Transaction) -> U64:
 
     """
     if isinstance(tx, BlobTransaction):
-        return GAS_PER_BLOB * U64(len(tx.blob_versioned_hashes))
+        return GasCosts.PER_BLOB * U64(len(tx.blob_versioned_hashes))
     else:
         return U64(0)
 
@@ -390,9 +503,9 @@ def calculate_blob_gas_price(excess_blob_gas: U64) -> Uint:
 
     """
     return taylor_exponential(
-        BLOB_MIN_GASPRICE,
+        GasCosts.BLOB_MIN_GASPRICE,
         Uint(excess_blob_gas),
-        BLOB_BASE_FEE_UPDATE_FRACTION,
+        GasCosts.BLOB_BASE_FEE_UPDATE_FRACTION,
     )
 
 
diff --git a/src/ethereum/forks/amsterdam/vm/instructions/__init__.py b/src/ethereum/forks/amsterdam/vm/instructions/__init__.py
index 0da72c8ea5c..06295ec86f1 100644
--- a/src/ethereum/forks/amsterdam/vm/instructions/__init__.py
+++ b/src/ethereum/forks/amsterdam/vm/instructions/__init__.py
@@ -99,6 +99,7 @@ class Ops(enum.Enum):
     BASEFEE = 0x48
     BLOBHASH = 0x49
     BLOBBASEFEE = 0x4A
+    SLOTNUM = 0x4B
 
     # Control Flow Ops
     STOP = 0x00
@@ -188,6 +189,11 @@ class Ops(enum.Enum):
     SWAP15 = 0x9E
     SWAP16 = 0x9F
 
+    # EIP-8024: Stack access instructions
+    DUPN = 0xE6
+    SWAPN = 0xE7
+    EXCHANGE = 0xE8
+
     # Memory Operations
     MLOAD = 0x51
     MSTORE = 0x52
@@ -251,6 +257,7 @@ class Ops(enum.Enum):
     Ops.PREVRANDAO: block_instructions.prev_randao,
     Ops.GASLIMIT: block_instructions.gas_limit,
     Ops.CHAINID: block_instructions.chain_id,
+    Ops.SLOTNUM: block_instructions.slot_number,
     Ops.MLOAD: memory_instructions.mload,
     Ops.MSTORE: memory_instructions.mstore,
     Ops.MSTORE8: memory_instructions.mstore8,
@@ -350,6 +357,9 @@ class Ops(enum.Enum):
     Ops.SWAP14: stack_instructions.swap14,
     Ops.SWAP15: stack_instructions.swap15,
     Ops.SWAP16: stack_instructions.swap16,
+    Ops.DUPN: stack_instructions.dupn,
+    Ops.SWAPN: stack_instructions.swapn,
+    Ops.EXCHANGE: stack_instructions.exchange,
     Ops.LOG0: log_instructions.log0,
     Ops.LOG1: log_instructions.log1,
     Ops.LOG2: log_instructions.log2,
diff --git a/src/ethereum/forks/amsterdam/vm/instructions/arithmetic.py b/src/ethereum/forks/amsterdam/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/amsterdam/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/amsterdam/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/amsterdam/vm/instructions/bitwise.py b/src/ethereum/forks/amsterdam/vm/instructions/bitwise.py
index cc6fa2fbb23..7674d3c720f 100644
--- a/src/ethereum/forks/amsterdam/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/amsterdam/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_LOW, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +172,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +202,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +232,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
@@ -262,7 +265,7 @@ def count_leading_zeros(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CLZ)
 
     # OPERATION
     bit_length = U256(x.bit_length())
diff --git a/src/ethereum/forks/amsterdam/vm/instructions/block.py b/src/ethereum/forks/amsterdam/vm/instructions/block.py
index e563a2e96e8..24c524673eb 100644
--- a/src/ethereum/forks/amsterdam/vm/instructions/block.py
+++ b/src/ethereum/forks/amsterdam/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -40,7 +40,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -89,7 +89,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -123,7 +123,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -156,7 +156,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -189,7 +189,7 @@ def prev_randao(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PREVRANDAO)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.prev_randao))
@@ -222,7 +222,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -252,10 +252,43 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
+
+
+def slot_number(evm: Evm) -> None:
+    """
+    Push the current slot number onto the stack.
+
+    The slot number is provided by the consensus layer and passed to the
+    execution layer through the engine API.
+
+    Parameters
+    ----------
+    evm :
+        The current EVM frame.
+
+    Raises
+    ------
+    :py:class:`~ethereum.forks.amsterdam.vm.exceptions.StackOverflowError`
+        If `len(stack)` is equal to `1024`.
+    :py:class:`~ethereum.forks.amsterdam.vm.exceptions.OutOfGasError`
+        If `evm.gas_left` is less than `2`.
+
+    """
+    # STACK
+    pass
+
+    # GAS
+    charge_gas(evm, GasCosts.OPCODE_SLOTNUM)
+
+    # OPERATION
+    push(evm.stack, U256(evm.message.block_env.slot_number))
+
+    # PROGRAM COUNTER
+    evm.pc += Uint(1)
diff --git a/src/ethereum/forks/amsterdam/vm/instructions/comparison.py b/src/ethereum/forks/amsterdam/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/amsterdam/vm/instructions/comparison.py
+++ b/src/ethereum/forks/amsterdam/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/amsterdam/vm/instructions/control_flow.py b/src/ethereum/forks/amsterdam/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/amsterdam/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/amsterdam/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/amsterdam/vm/instructions/environment.py b/src/ethereum/forks/amsterdam/vm/instructions/environment.py
index f5f89bdfa59..431cd3ba4c6 100644
--- a/src/ethereum/forks/amsterdam/vm/instructions/environment.py
+++ b/src/ethereum/forks/amsterdam/vm/instructions/environment.py
@@ -23,14 +23,7 @@
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BASE,
-    GAS_BLOBHASH_OPCODE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_COPY,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
-    GAS_WARM_ACCESS,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_gas_extend_memory,
     charge_gas,
@@ -52,7 +45,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -75,12 +68,11 @@ def balance(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    is_cold_access = address not in evm.accessed_addresses
-    gas_cost = GAS_COLD_ACCOUNT_ACCESS if is_cold_access else GAS_WARM_ACCESS
-    if is_cold_access:
+    if address in evm.accessed_addresses:
+        charge_gas(evm, GasCosts.WARM_ACCESS)
+    else:
         evm.accessed_addresses.add(address)
-
-    charge_gas(evm, gas_cost)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
@@ -108,7 +100,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -131,7 +123,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -154,7 +146,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -178,7 +170,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -203,7 +195,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -232,11 +224,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -261,7 +256,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -290,11 +285,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -319,7 +317,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -342,14 +340,11 @@ def extcodesize(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    is_cold_access = address not in evm.accessed_addresses
-    access_gas_cost = (
-        GAS_COLD_ACCOUNT_ACCESS if is_cold_access else GAS_WARM_ACCESS
-    )
-    if is_cold_access:
+    if address in evm.accessed_addresses:
+        charge_gas(evm, GasCosts.WARM_ACCESS)
+    else:
         evm.accessed_addresses.add(address)
-
-    charge_gas(evm, access_gas_cost)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     tx_state = evm.message.tx_env.state
@@ -381,19 +376,18 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
 
-    is_cold_access = address not in evm.accessed_addresses
-    access_gas_cost = (
-        GAS_COLD_ACCOUNT_ACCESS if is_cold_access else GAS_WARM_ACCESS
-    )
-    total_gas_cost = access_gas_cost + copy_gas_cost + extend_memory.cost
-
-    if is_cold_access:
+    if address in evm.accessed_addresses:
+        access_gas_cost = GasCosts.WARM_ACCESS
+    else:
         evm.accessed_addresses.add(address)
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
+
+    total_gas_cost = access_gas_cost + copy_gas_cost + extend_memory.cost
 
     charge_gas(evm, total_gas_cost)
 
@@ -424,7 +418,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -450,11 +444,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -482,12 +481,11 @@ def extcodehash(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    is_cold_access = address not in evm.accessed_addresses
-    access_gas_cost = (
-        GAS_COLD_ACCOUNT_ACCESS if is_cold_access else GAS_WARM_ACCESS
-    )
-    if is_cold_access:
+    if address in evm.accessed_addresses:
+        access_gas_cost = GasCosts.WARM_ACCESS
+    else:
         evm.accessed_addresses.add(address)
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
@@ -520,7 +518,7 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
@@ -548,7 +546,7 @@ def base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BASEFEE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.base_fee_per_gas))
@@ -571,7 +569,7 @@ def blob_hash(evm: Evm) -> None:
     index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BLOBHASH_OPCODE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBHASH)
 
     # OPERATION
     if int(index) < len(evm.message.tx_env.blob_versioned_hashes):
@@ -598,7 +596,7 @@ def blob_base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBBASEFEE)
 
     # OPERATION
     blob_base_fee = calculate_blob_gas_price(
diff --git a/src/ethereum/forks/amsterdam/vm/instructions/keccak.py b/src/ethereum/forks/amsterdam/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/amsterdam/vm/instructions/keccak.py
+++ b/src/ethereum/forks/amsterdam/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/amsterdam/vm/instructions/log.py b/src/ethereum/forks/amsterdam/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/amsterdam/vm/instructions/log.py
+++ b/src/ethereum/forks/amsterdam/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/amsterdam/vm/instructions/memory.py b/src/ethereum/forks/amsterdam/vm/instructions/memory.py
index 6e111051ee3..bba3ddf19d5 100644
--- a/src/ethereum/forks/amsterdam/vm/instructions/memory.py
+++ b/src/ethereum/forks/amsterdam/vm/instructions/memory.py
@@ -18,9 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_COPY,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -49,7 +47,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -80,7 +78,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -108,7 +106,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -135,7 +133,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
@@ -161,12 +159,15 @@ def mcopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(length)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
 
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(source, length), (destination, length)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_MCOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/amsterdam/vm/instructions/stack.py b/src/ethereum/forks/amsterdam/vm/instructions/stack.py
index 0007a28acd4..0e72bd01f31 100644
--- a/src/ethereum/forks/amsterdam/vm/instructions/stack.py
+++ b/src/ethereum/forks/amsterdam/vm/instructions/stack.py
@@ -12,13 +12,18 @@
 """
 
 from functools import partial
+from typing import Callable
 
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U8, U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
+from ..stack import decode_pair, decode_single
 
 
 def pop(evm: Evm) -> None:
@@ -35,7 +40,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -63,9 +68,9 @@ def push_n(evm: Evm, num_bytes: int) -> None:
 
     # GAS
     if num_bytes == 0:
-        charge_gas(evm, GAS_BASE)
+        charge_gas(evm, GasCosts.OPCODE_PUSH0)
     else:
-        charge_gas(evm, GAS_VERY_LOW)
+        charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -95,7 +100,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -127,7 +132,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -139,70 +144,174 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push0 = partial(push_n, num_bytes=0)
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push0: Callable[[Evm], None] = partial(push_n, num_bytes=0)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
+
+
+def dupn(evm: Evm) -> None:
+    """
+    Duplicate the Nth stack item (from top of the stack) to the top of stack.
+    The item number is read from the immediate byte following the opcode and
+    decoded using the EIP-8024 index shifting rules.
+
+    Parameters
+    ----------
+    evm :
+        The current EVM frame.
+
+    """
+    # STACK
+    pass
+
+    # GAS
+    charge_gas(evm, GasCosts.OPCODE_DUPN)
+
+    # OPERATION
+    immediate_data = U8(
+        buffer_read(evm.code, U256(evm.pc + Uint(1)), U256(1))[0]
+    )
+    item_number = decode_single(immediate_data)
+    if int(item_number) > len(evm.stack):
+        raise StackUnderflowError
+    data_to_duplicate = evm.stack[-item_number]
+    stack.push(evm.stack, data_to_duplicate)
+
+    # PROGRAM COUNTER
+    evm.pc += Uint(2)
+
+
+def swapn(evm: Evm) -> None:
+    """
+    Swap the top stack item with the Nth stack item.
+    The value N is read from the immediate byte following the opcode and
+    decoded using the EIP-8024 index shifting rules.
+
+    Parameters
+    ----------
+    evm :
+        The current EVM frame.
+
+    """
+    # STACK
+    pass
+
+    # GAS
+    charge_gas(evm, GasCosts.OPCODE_SWAPN)
+
+    # OPERATION
+    immediate_data = U8(
+        buffer_read(evm.code, U256(evm.pc + Uint(1)), U256(1))[0]
+    )
+    item_number = decode_single(immediate_data)
+    # SWAPN with decoded value n swaps top (position 1) with position (n+1)
+    if int(item_number) + 1 > len(evm.stack):
+        raise StackUnderflowError
+    # stack[-1] is top (position 1), stack[-(item_number+1)] is position (n+1)
+    evm.stack[-1], evm.stack[-(item_number + U8(1))] = (
+        evm.stack[-(item_number + U8(1))],
+        evm.stack[-1],
+    )
+
+    # PROGRAM COUNTER
+    evm.pc += Uint(2)
+
+
+def exchange(evm: Evm) -> None:
+    """
+    Exchange the Nth stack item with the Mth stack item.
+    The values N and M are decoded from the immediate byte using the
+    EIP-8024 index shifting rules.
+
+    Parameters
+    ----------
+    evm :
+        The current EVM frame.
+
+    """
+    # STACK
+    pass
+
+    # GAS
+    charge_gas(evm, GasCosts.OPCODE_EXCHANGE)
+
+    # OPERATION
+    immediate_data = U8(
+        buffer_read(evm.code, U256(evm.pc + Uint(1)), U256(1))[0]
+    )
+    n, m = decode_pair(immediate_data)
+    # EXCHANGE swaps position (n+1) with position (m+1)
+    depth = max(n, m) + U8(1)
+    if int(depth) > len(evm.stack):
+        raise StackUnderflowError
+    evm.stack[-(n + U8(1))], evm.stack[-(m + U8(1))] = (
+        evm.stack[-(m + U8(1))],
+        evm.stack[-(n + U8(1))],
+    )
+
+    # PROGRAM COUNTER
+    evm.pc += Uint(2)
diff --git a/src/ethereum/forks/amsterdam/vm/instructions/storage.py b/src/ethereum/forks/amsterdam/vm/instructions/storage.py
index 60056cf5750..56e1ed28d06 100644
--- a/src/ethereum/forks/amsterdam/vm/instructions/storage.py
+++ b/src/ethereum/forks/amsterdam/vm/instructions/storage.py
@@ -23,12 +23,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
     check_gas,
 )
@@ -51,10 +46,10 @@ def sload(evm: Evm) -> None:
 
     # GAS
     if (evm.message.current_target, key) in evm.accessed_storage_keys:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        charge_gas(evm, GAS_COLD_SLOAD)
+        charge_gas(evm, GasCosts.COLD_STORAGE_ACCESS)
 
     # OPERATION
     tx_state = evm.message.tx_env.state
@@ -84,7 +79,7 @@ def sstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # check we have at least the stipend gas
-    check_gas(evm, GAS_CALL_STIPEND + Uint(1))
+    check_gas(evm, GasCosts.CALL_STIPEND + Uint(1))
 
     tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
@@ -96,35 +91,41 @@ def sstore(evm: Evm) -> None:
 
     if (evm.message.current_target, key) not in evm.accessed_storage_keys:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        gas_cost += GAS_COLD_SLOAD
+        gas_cost += GasCosts.COLD_STORAGE_ACCESS
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost += GAS_STORAGE_SET
+            gas_cost += GasCosts.STORAGE_SET
         else:
-            gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_SLOAD
+            gas_cost += (
+                GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
+            )
     else:
-        gas_cost += GAS_WARM_ACCESS
+        gas_cost += GasCosts.WARM_ACCESS
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
             # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
             # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
             # Storage slot being restored to its original value
             if original_value == 0:
                 # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_WARM_ACCESS)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.WARM_ACCESS
+                )
             else:
                 # Slot was originally non-empty and was UPDATED earlier
                 evm.refund_counter += int(
-                    GAS_STORAGE_UPDATE - GAS_COLD_SLOAD - GAS_WARM_ACCESS
+                    GasCosts.COLD_STORAGE_WRITE
+                    - GasCosts.COLD_STORAGE_ACCESS
+                    - GasCosts.WARM_ACCESS
                 )
 
     charge_gas(evm, gas_cost)
@@ -149,7 +150,7 @@ def tload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
 
     # OPERATION
     value = get_transient_storage(
@@ -179,7 +180,7 @@ def tstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
     set_transient_storage(
         evm.message.tx_env.state,
         evm.message.current_target,
diff --git a/src/ethereum/forks/amsterdam/vm/instructions/system.py b/src/ethereum/forks/amsterdam/vm/instructions/system.py
index 02c5d83b68d..5e526279471 100644
--- a/src/ethereum/forks/amsterdam/vm/instructions/system.py
+++ b/src/ethereum/forks/amsterdam/vm/instructions/system.py
@@ -36,22 +36,17 @@
     calculate_delegation_cost,
 )
 from .. import (
+    CALL_SUCCESS,
     Evm,
     Message,
+    emit_burn_log,
+    emit_transfer_log,
     incorporate_child_on_error,
     incorporate_child_on_success,
 )
 from ..exceptions import OutOfGasError, Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -140,7 +135,6 @@ def generic_create(
         accessed_storage_keys=evm.accessed_storage_keys.copy(),
         disable_precompiles=False,
         parent_evm=evm,
-        is_create=True,
     )
     child_evm = process_create_message(child_message)
 
@@ -175,7 +169,9 @@ def create(evm: Evm) -> None:
     )
     init_code_gas = init_code_cost(Uint(memory_size))
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost + init_code_gas)
+    charge_gas(
+        evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost + init_code_gas
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -225,8 +221,8 @@ def create2(evm: Evm) -> None:
     init_code_gas = init_code_cost(Uint(memory_size))
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost
         + init_code_gas,
     )
@@ -270,7 +266,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -297,7 +293,6 @@ def generic_call(
     memory_input_size: U256,
     memory_output_start_position: U256,
     memory_output_size: U256,
-    code: Bytes,
     disable_precompiles: bool,
 ) -> None:
     """
@@ -312,6 +307,10 @@ def generic_call(
         push(evm.stack, U256(0))
         return
 
+    tx_state = evm.message.tx_env.state
+    code_hash = get_account(tx_state, code_address).code_hash
+    code = get_code(tx_state, code_hash)
+
     call_data = memory_read_bytes(
         evm.memory, memory_input_start_position, memory_input_size
     )
@@ -334,7 +333,6 @@ def generic_call(
         accessed_storage_keys=evm.accessed_storage_keys.copy(),
         disable_precompiles=disable_precompiles,
         parent_evm=evm,
-        is_create=False,
     )
 
     child_evm = process_message(child_message)
@@ -346,7 +344,7 @@ def generic_call(
     else:
         incorporate_child_on_success(evm, child_evm)
         evm.return_data = child_evm.output
-        push(evm.stack, U256(1))
+        push(evm.stack, CALL_SUCCESS)
 
     actual_output_size = min(memory_output_size, U256(len(child_evm.output)))
     memory_write(
@@ -389,11 +387,11 @@ def call(evm: Evm) -> None:
 
     is_cold_access = to not in evm.accessed_addresses
     if is_cold_access:
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
     else:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
 
     # check static gas before state access
     check_gas(
@@ -406,7 +404,7 @@ def call(evm: Evm) -> None:
     if is_cold_access:
         evm.accessed_addresses.add(to)
 
-    create_gas_cost = GAS_NEW_ACCOUNT
+    create_gas_cost = GasCosts.NEW_ACCOUNT
     if value == 0 or is_account_alive(tx_state, to):
         create_gas_cost = Uint(0)
 
@@ -424,9 +422,6 @@ def call(evm: Evm) -> None:
         if code_address not in evm.accessed_addresses:
             evm.accessed_addresses.add(code_address)
 
-    code_hash = get_account(tx_state, code_address).code_hash
-    code = get_code(tx_state, code_hash)
-
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -436,6 +431,7 @@ def call(evm: Evm) -> None:
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
+    # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(tx_state, evm.message.current_target).balance
     if sender_balance < value:
@@ -456,7 +452,6 @@ def call(evm: Evm) -> None:
             memory_input_size,
             memory_output_start_position,
             memory_output_size,
-            code,
             is_delegated,
         )
 
@@ -496,11 +491,11 @@ def callcode(evm: Evm) -> None:
 
     is_cold_access = code_address not in evm.accessed_addresses
     if is_cold_access:
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
     else:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
 
     # check static gas before state access
     check_gas(
@@ -527,9 +522,6 @@ def callcode(evm: Evm) -> None:
         if code_address not in evm.accessed_addresses:
             evm.accessed_addresses.add(code_address)
 
-    code_hash = get_account(tx_state, code_address).code_hash
-    code = get_code(tx_state, code_hash)
-
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -561,7 +553,6 @@ def callcode(evm: Evm) -> None:
             memory_input_size,
             memory_output_start_position,
             memory_output_size,
-            code,
             is_delegated,
         )
 
@@ -586,11 +577,11 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
 
     is_cold_access = beneficiary not in evm.accessed_addresses
     if is_cold_access:
-        gas_cost += GAS_COLD_ACCOUNT_ACCESS
+        gas_cost += GasCosts.COLD_ACCOUNT_ACCESS
 
     # check access gas cost before state access
     check_gas(evm, gas_cost)
@@ -604,7 +595,7 @@ def selfdestruct(evm: Evm) -> None:
         not is_account_alive(tx_state, beneficiary)
         and get_account(tx_state, evm.message.current_target).balance != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     charge_gas(evm, gas_cost)
 
@@ -614,11 +605,15 @@ def selfdestruct(evm: Evm) -> None:
     # Transfer balance
     move_ether(tx_state, originator, beneficiary, originator_balance)
 
-    # register account for deletion only if it was created
-    # in the same transaction
+    # Emit transfer or burn log
+    if originator in tx_state.created_accounts and beneficiary == originator:
+        emit_burn_log(evm, originator, originator_balance)
+    elif beneficiary != originator:
+        emit_transfer_log(evm, originator, beneficiary, originator_balance)
+
+    # Register account for deletion iff created in same transaction
     if originator in tx_state.created_accounts:
-        # If beneficiary is the same as originator, then
-        # the ether is burnt.
+        # If beneficiary and originator are the same then the ether is burnt.
         set_account_balance(tx_state, originator, U256(0))
         evm.accounts_to_delete.add(originator)
 
@@ -658,15 +653,14 @@ def delegatecall(evm: Evm) -> None:
 
     is_cold_access = code_address not in evm.accessed_addresses
     if is_cold_access:
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
     else:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
 
     # check static gas before state access
     check_gas(evm, access_gas_cost + extend_memory.cost)
 
     # STATE ACCESS
-    tx_state = evm.message.tx_env.state
     if is_cold_access:
         evm.accessed_addresses.add(code_address)
 
@@ -684,9 +678,6 @@ def delegatecall(evm: Evm) -> None:
         if code_address not in evm.accessed_addresses:
             evm.accessed_addresses.add(code_address)
 
-    code_hash = get_account(tx_state, code_address).code_hash
-    code = get_code(tx_state, code_hash)
-
     message_call_gas = calculate_message_call_gas(
         U256(0),
         gas,
@@ -711,7 +702,6 @@ def delegatecall(evm: Evm) -> None:
         memory_input_size,
         memory_output_start_position,
         memory_output_size,
-        code,
         is_delegated,
     )
 
@@ -748,15 +738,14 @@ def staticcall(evm: Evm) -> None:
 
     is_cold_access = to not in evm.accessed_addresses
     if is_cold_access:
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
     else:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
 
     # check static gas before state access
     check_gas(evm, access_gas_cost + extend_memory.cost)
 
     # STATE ACCESS
-    tx_state = evm.message.tx_env.state
     if is_cold_access:
         evm.accessed_addresses.add(to)
 
@@ -774,9 +763,6 @@ def staticcall(evm: Evm) -> None:
         if code_address not in evm.accessed_addresses:
             evm.accessed_addresses.add(code_address)
 
-    code_hash = get_account(tx_state, code_address).code_hash
-    code = get_code(tx_state, code_hash)
-
     message_call_gas = calculate_message_call_gas(
         U256(0),
         gas,
@@ -801,7 +787,6 @@ def staticcall(evm: Evm) -> None:
         memory_input_size,
         memory_output_start_position,
         memory_output_size,
-        code,
         is_delegated,
     )
 
diff --git a/src/ethereum/forks/amsterdam/vm/interpreter.py b/src/ethereum/forks/amsterdam/vm/interpreter.py
index c22f9eef143..78d276673da 100644
--- a/src/ethereum/forks/amsterdam/vm/interpreter.py
+++ b/src/ethereum/forks/amsterdam/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -46,9 +46,9 @@
 )
 from ..vm import Message
 from ..vm.eoa_delegation import get_delegated_code_address, set_delegation
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
-from . import Evm
+from . import Evm, emit_transfer_log
 from .exceptions import (
     AddressCollision,
     ExceptionalHalt,
@@ -62,10 +62,11 @@
 from .runtime import get_valid_jump_destinations
 
 STACK_DEPTH_LIMIT = Uint(1024)
-MAX_CODE_SIZE = 0x6000
+MAX_CODE_SIZE = 0x8000
 MAX_INIT_CODE_SIZE = 2 * MAX_CODE_SIZE
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -201,7 +202,7 @@ def process_create_message(message: Message) -> Evm:
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             if len(contract_code) > 0:
@@ -262,7 +263,6 @@ def process_message(message: Message) -> Evm:
         accessed_storage_keys=message.accessed_storage_keys,
     )
 
-    # take snapshot of state before processing the message
     snapshot = copy_tx_state(tx_state)
 
     if message.should_transfer_value and message.value != 0:
@@ -272,7 +272,12 @@ def process_message(message: Message) -> Evm:
             message.current_target,
             message.value,
         )
+        if message.caller != message.current_target:
+            emit_transfer_log(
+                evm, message.caller, message.current_target, message.value
+            )
 
+    # Execute message code and handle errors
     try:
         if evm.message.code_address in PRE_COMPILED_CONTRACTS:
             if not message.disable_precompiles:
diff --git a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/alt_bn128.py
index 214725d8da0..862506c54c3 100644
--- a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(150))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(6000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(34000 * (len(data) // 192) + 45000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/bls12_381/__init__.py b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/bls12_381/__init__.py
index c99e7573f48..7d622da39d1 100644
--- a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/bls12_381/__init__.py
+++ b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/bls12_381/__init__.py
@@ -414,7 +414,7 @@ def decode_g1_scalar_pair(
 
     """
     if len(data) != 160:
-        InvalidParameter("Input should be 160 bytes long")
+        raise InvalidParameter("Input should be 160 bytes long")
 
     point = bytes_to_g1(data[:128], subgroup_check=True)
 
@@ -614,7 +614,7 @@ def decode_g2_scalar_pair(
 
     """
     if len(data) != 288:
-        InvalidParameter("Input should be 288 bytes long")
+        raise InvalidParameter("Input should be 288 bytes long")
 
     point = bytes_to_g2(data[:256], subgroup_check=True)
     n = int.from_bytes(data[256 : 256 + 32], "big")
diff --git a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/bls12_381/bls12_381_g1.py b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
index ae8eeba0ce6..d1f63224a0c 100644
--- a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
+++ b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G1_ADD,
-    GAS_BLS_G1_MAP,
-    GAS_BLS_G1_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -60,7 +58,7 @@ def bls12_g1_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1ADD)
 
     # OPERATION
     p1 = bytes_to_g1(buffer_read(data, U256(0), U256(128)))
@@ -101,7 +99,7 @@ def bls12_g1_msm(evm: Evm) -> None:
     else:
         discount = Uint(G1_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G1_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G1MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -140,7 +138,7 @@ def bls12_map_fp_to_g1(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1MAP)
 
     # OPERATION
     fp = int.from_bytes(data, "big")
diff --git a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/bls12_381/bls12_381_g2.py b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
index 473739b78c0..2fd32313f89 100644
--- a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
+++ b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G2_ADD,
-    GAS_BLS_G2_MAP,
-    GAS_BLS_G2_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -61,7 +59,7 @@ def bls12_g2_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2ADD)
 
     # OPERATION
     p1 = bytes_to_g2(buffer_read(data, U256(0), U256(256)))
@@ -102,7 +100,7 @@ def bls12_g2_msm(evm: Evm) -> None:
     else:
         discount = Uint(G2_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G2_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G2MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -141,7 +139,7 @@ def bls12_map_fp2_to_g2(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2MAP)
 
     # OPERATION
     field_element = bytes_to_fq2(data)
diff --git a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/identity.py b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/p256verify.py b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/p256verify.py
index 106dd548a61..29c2e91e0f0 100644
--- a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/p256verify.py
+++ b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/p256verify.py
@@ -24,7 +24,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_P256VERIFY, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -41,7 +41,7 @@ def p256verify(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_P256VERIFY)
+    charge_gas(evm, GasCosts.PRECOMPILE_P256VERIFY)
 
     if len(data) != 160:
         return
diff --git a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/point_evaluation.py b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/point_evaluation.py
index ce4eed71294..d2d105ba13b 100644
--- a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/point_evaluation.py
+++ b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/point_evaluation.py
@@ -22,7 +22,7 @@
 
 from ...vm import Evm
 from ...vm.exceptions import KZGProofError
-from ...vm.gas import GAS_POINT_EVALUATION, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 FIELD_ELEMENTS_PER_BLOB = 4096
 BLS_MODULUS = 52435875175126190479447740508185965837690552500527637822603658699938581184513  # noqa: E501
@@ -51,7 +51,7 @@ def point_evaluation(evm: Evm) -> None:
     proof = Bytes48(data[144:192])
 
     # GAS
-    charge_gas(evm, GAS_POINT_EVALUATION)
+    charge_gas(evm, GasCosts.PRECOMPILE_POINT_EVALUATION)
     if kzg_commitment_to_versioned_hash(commitment) != versioned_hash:
         raise KZGProofError
 
diff --git a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/amsterdam/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/amsterdam/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/amsterdam/vm/runtime.py b/src/ethereum/forks/amsterdam/vm/runtime.py
index 0aa5ddd5e20..60fd42b52c9 100644
--- a/src/ethereum/forks/amsterdam/vm/runtime.py
+++ b/src/ethereum/forks/amsterdam/vm/runtime.py
@@ -28,6 +28,8 @@ def get_valid_jump_destinations(code: Bytes) -> Set[Uint]:
         * The jump destination should have the `JUMPDEST` opcode (0x5B).
         * The jump destination shouldn't be part of the data corresponding to
           `PUSH-N` opcodes.
+        * The jump destination shouldn't be part of the immediate byte
+          corresponding to `DUPN`, `SWAPN`, or `EXCHANGE` opcodes (EIP-8024).
 
     Note - Jump destinations are 0-indexed.
 
@@ -63,6 +65,30 @@ def get_valid_jump_destinations(code: Bytes) -> Set[Uint]:
             # opcodes.
             push_data_size = current_opcode.value - Ops.PUSH1.value + 1
             pc += Uint(push_data_size)
+        elif current_opcode in (Ops.DUPN, Ops.SWAPN):
+            # EIP-8024: DUPN/SWAPN invalid immediate range is
+            # 90 < x < 128, i.e. 0x5B (91) to 0x7F (127).
+            # Invalid immediates are not skipped so the byte
+            # remains at an instruction boundary.
+            if (
+                pc + Uint(1) < ulen(code)
+                and 0x5B <= code[pc + Uint(1)] <= 0x7F
+            ):
+                pass
+            else:
+                pc += Uint(1)
+        elif current_opcode == Ops.EXCHANGE:
+            # EIP-8024: EXCHANGE invalid immediate range is
+            # 81 < x < 128, i.e. 0x52 (82) to 0x7F (127).
+            # Invalid immediates are not skipped so the byte
+            # remains at an instruction boundary.
+            if (
+                pc + Uint(1) < ulen(code)
+                and 0x52 <= code[pc + Uint(1)] <= 0x7F
+            ):
+                pass
+            else:
+                pc += Uint(1)
 
         pc += Uint(1)
 
diff --git a/src/ethereum/forks/amsterdam/vm/stack.py b/src/ethereum/forks/amsterdam/vm/stack.py
index a87b0a47079..98ba815cb73 100644
--- a/src/ethereum/forks/amsterdam/vm/stack.py
+++ b/src/ethereum/forks/amsterdam/vm/stack.py
@@ -11,11 +11,84 @@
 Implementation of the stack operators for the EVM.
 """
 
-from typing import List
+from typing import List, Tuple
 
-from ethereum_types.numeric import U256
+from ethereum_types.numeric import U8, U256
 
-from .exceptions import StackOverflowError, StackUnderflowError
+from .exceptions import (
+    InvalidParameter,
+    StackOverflowError,
+    StackUnderflowError,
+)
+
+
+def decode_single(x: U8) -> U8:
+    """
+    Decode the immediate byte for DUPN/SWAPN to get the stack index.
+
+    Return n with 17 <= n <= 235.
+
+    Parameters
+    ----------
+    x : int
+        The immediate byte value (0-90 or 128-255).
+
+    Returns
+    -------
+    int
+        The stack index n, where 17 <= n <= 235.
+
+    Raises
+    ------
+    InvalidParameter
+        If x is in the forbidden range (90 < x < 128 or x > 255).
+
+    """
+    if not (U8(0) <= x <= U8(90) or U8(128) <= x <= U8(255)):
+        raise InvalidParameter(
+            f"DUPN/SWAPN immediate byte {x} is out of range. "
+            "Valid range: 0 <= x <= 90 or 128 <= x <= 255"
+        )
+
+    return U8((int(x) + 145) % 256)
+
+
+def decode_pair(x: U8) -> Tuple[U8, U8]:
+    """
+    Decode the immediate byte for EXCHANGE to get two stack indices.
+
+    Return (n, m) with 1 <= n <= 14 and n < m <= 30 - n.
+
+    Parameters
+    ----------
+    x : int
+        The immediate byte value (0-81 or 128-255).
+
+    Returns
+    -------
+    Tuple[int, int]
+        The two stack indices (n, m), where
+        1 <= n <= 14 and n < m <= 30 - n.
+
+    Raises
+    ------
+    InvalidParameter
+        If x is in the forbidden range (81 < x < 128 or x > 255).
+
+    """
+    if not (U8(0) <= x <= U8(81) or U8(128) <= x <= U8(255)):
+        raise InvalidParameter(
+            f"EXCHANGE immediate byte {x} is in the forbidden "
+            "range 82 <= x <= 127\n"
+            "Valid range: 0 <= x <= 81 or 128 <= x <= 255"
+        )
+
+    k = U8(int(x) ^ 143)
+    q, r = divmod(k, U8(16))
+    if q < r:
+        return q + U8(1), r + U8(1)
+    else:
+        return r + U8(1), U8(29) - q
 
 
 def pop(stack: List[U256]) -> U256:
diff --git a/src/ethereum/forks/arrow_glacier/__init__.py b/src/ethereum/forks/arrow_glacier/__init__.py
index 6e8798e713e..b8210ed2894 100644
--- a/src/ethereum/forks/arrow_glacier/__init__.py
+++ b/src/ethereum/forks/arrow_glacier/__init__.py
@@ -21,7 +21,7 @@
 - [Nethermind 1.11.7][nm]
 
 [EIP-4345]: https://eips.ethereum.org/EIPS/eip-4345
-[Besu 21.10.0]: https://github.com/hyperledger/besu/releases/tag/21.10.0
+[Besu 21.10.0]: https://github.com/besu-eth/besu/releases/tag/21.10.0
 [e]: https://github.com/ledgerwatch/erigon/releases/tag/v2021.11.01
 [js]: https://github.com/ethereumjs/ethereumjs-monorepo/releases/tag/%40ethereumjs%2Fvm%405.6.0
 [Geth 1.10.12]: https://github.com/ethereum/go-ethereum/releases/tag/v1.10.12
diff --git a/src/ethereum/forks/arrow_glacier/blocks.py b/src/ethereum/forks/arrow_glacier/blocks.py
index 497a331c0dd..6d9c41f774d 100644
--- a/src/ethereum/forks/arrow_glacier/blocks.py
+++ b/src/ethereum/forks/arrow_glacier/blocks.py
@@ -10,7 +10,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
@@ -18,8 +18,9 @@
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.crypto.hash import Hash32
+from ethereum.state import Address, Root
 
-from .fork_types import Address, Bloom, Root
+from .fork_types import Bloom
 from .transactions import (
     AccessListTransaction,
     FeeMarketTransaction,
@@ -28,6 +29,7 @@
 )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -69,13 +71,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.arrow_glacier.state.state_root
-    [Trie]: ref:ethereum.forks.arrow_glacier.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -85,8 +88,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.arrow_glacier.trie.root
-    [Trie]: ref:ethereum.forks.arrow_glacier.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -96,8 +99,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.arrow_glacier.trie.root
-    [Trie]: ref:ethereum.forks.arrow_glacier.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -181,6 +184,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -227,6 +231,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -259,6 +264,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/arrow_glacier/fork.py b/src/ethereum/forks/arrow_glacier/fork.py
index f833fe71c5f..eed78cbdfb2 100644
--- a/src/ethereum/forks/arrow_glacier/fork.py
+++ b/src/ethereum/forks/arrow_glacier/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
@@ -28,6 +28,13 @@
     InvalidSenderError,
     NonceMismatchError,
 )
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt, encode_receipt
@@ -36,17 +43,18 @@
     InsufficientMaxFeePerGasError,
     PriorityFeeGreaterThanMaxFeeError,
 )
-from .fork_types import EMPTY_CODE_HASH, Address
-from .state import (
-    State,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
     account_exists_and_is_empty,
     create_ether,
     destroy_account,
     destroy_touched_empty_accounts,
+    extract_block_diff,
     get_account,
+    incorporate_tx_into_block,
     increment_nonce,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
     AccessListTransaction,
@@ -59,21 +67,20 @@
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.message import prepare_message
+from .vm.gas import GasCosts
 from .vm.interpreter import process_message_call
 
 BLOCK_REWARD = U256(2 * 10**18)
 BASE_FEE_MAX_CHANGE_DENOMINATOR = Uint(8)
 ELASTICITY_MULTIPLIER = Uint(2)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 MINIMUM_DIFFICULTY = Uint(131072)
 MAX_OMMER_DEPTH = Uint(6)
 BOMB_DELAY_BLOCKS = 10700000
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -175,9 +182,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     validate_header(chain, block.header)
     validate_ommers(block.ommers, block.header, chain)
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -192,7 +201,12 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         ommers=block.ommers,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes,
+        block_diff.storage_changes,
+        block_diff.storage_clears,
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -210,6 +224,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block_logs_bloom != block.header.bloom:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -431,6 +446,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Tuple[Address, Uint]:
     """
     Check if the transaction is includable in the block.
@@ -443,6 +459,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -473,7 +491,7 @@ def check_transaction(
     if tx.gas > gas_available:
         raise GasUsedExceedsLimitError("gas used exceeds limit")
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     if isinstance(tx, FeeMarketTransaction):
         if tx.max_fee_per_gas < tx.max_priority_fee_per_gas:
@@ -582,7 +600,7 @@ def apply_body(
     for i, tx in enumerate(map(decode_transaction, transactions)):
         process_transaction(block_env, block_output, tx, Uint(i))
 
-    pay_rewards(block_env.state, block_env.number, block_env.coinbase, ommers)
+    pay_rewards(block_env, ommers)
 
     return block_output
 
@@ -664,9 +682,7 @@ def validate_ommers(
 
 
 def pay_rewards(
-    state: State,
-    block_number: Uint,
-    coinbase: Address,
+    block_env: vm.BlockEnvironment,
     ommers: Tuple[Header, ...],
 ) -> None:
     """
@@ -685,25 +701,24 @@ def pay_rewards(
 
     Parameters
     ----------
-    state :
-        Current account state.
-    block_number :
-        Position of the block within the chain.
-    coinbase :
-        Address of account which receives block reward and transaction fees.
+    block_env :
+        The block scoped environment.
     ommers :
         List of ommers mentioned in the current block.
 
     """
+    rewards_state = TransactionState(parent=block_env.state)
     ommer_count = U256(len(ommers))
     miner_reward = BLOCK_REWARD + (ommer_count * (BLOCK_REWARD // U256(32)))
-    create_ether(state, coinbase, miner_reward)
+    create_ether(rewards_state, block_env.coinbase, miner_reward)
 
     for ommer in ommers:
         # Ommer age with respect to the current block.
-        ommer_age = U256(block_number - ommer.number)
+        ommer_age = U256(block_env.number - ommer.number)
         ommer_miner_reward = ((U256(8) - ommer_age) * BLOCK_REWARD) // U256(8)
-        create_ether(state, ommer.coinbase, ommer_miner_reward)
+        create_ether(rewards_state, ommer.coinbase, ommer_miner_reward)
+
+    incorporate_tx_into_block(rewards_state)
 
 
 def process_transaction(
@@ -736,6 +751,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(
         block_output.transactions_trie,
         rlp.encode(index),
@@ -751,21 +768,20 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     effective_gas_fee = tx.gas * effective_gas_price
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     sender_balance_after_gas_fee = (
         Uint(sender_account.balance) - effective_gas_fee
     )
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     access_list_addresses = set()
     access_list_storage_keys = set()
@@ -781,6 +797,7 @@ def process_transaction(
         gas=gas,
         access_list_addresses=access_list_addresses,
         access_list_storage_keys=access_list_storage_keys,
+        state=tx_state,
         index_in_block=index,
         tx_hash=get_transaction_hash(encode_transaction(tx)),
     )
@@ -802,28 +819,25 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * priority_fee_per_gas
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
     coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
+        tx_state, block_env.coinbase
     ).balance + U256(transaction_fee)
     if coinbase_balance_after_mining_fee != 0:
         set_account_balance(
-            block_env.state,
+            tx_state,
             block_env.coinbase,
             coinbase_balance_after_mining_fee,
         )
-    elif account_exists_and_is_empty(block_env.state, block_env.coinbase):
-        destroy_account(block_env.state, block_env.coinbase)
+    elif account_exists_and_is_empty(tx_state, block_env.coinbase):
+        destroy_account(tx_state, block_env.coinbase)
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
-    destroy_touched_empty_accounts(block_env.state, tx_output.touched_accounts)
+    destroy_touched_empty_accounts(tx_state, tx_output.touched_accounts)
 
     block_output.block_gas_used += tx_gas_used_after_refund
 
@@ -842,6 +856,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
     """
@@ -849,12 +865,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
     passed through as a parameter is greater than or equal to the *sum* of
     the parent's gas and the adjustment delta then the limit for gas is too
     high and fails this function's check. Similarly, if the limit is less
     than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
+    delta *or* the predefined ``LIMIT_MINIMUM`` then this function's
     check fails because the gas limit doesn't allow for a sufficient or
     reasonable amount of gas to be used on a block.
 
@@ -872,12 +888,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/arrow_glacier/fork_types.py b/src/ethereum/forks/arrow_glacier/fork_types.py
index ae4525bbbdd..02907cd2a1a 100644
--- a/src/ethereum/forks/arrow_glacier/fork_types.py
+++ b/src/ethereum/forks/arrow_glacier/fork_types.py
@@ -11,41 +11,13 @@
 Types reused throughout the specification, which are specific to Ethereum.
 """
 
-from dataclasses import dataclass
-
 from ethereum_rlp import rlp
-from ethereum_types.bytes import Bytes, Bytes20, Bytes256
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
+from ethereum_types.bytes import Bytes, Bytes256
 
-Address = Bytes20
-Root = Hash32
+from ethereum.state import Account
 
 Bloom = Bytes256
 
-EMPTY_CODE_HASH = keccak256(b"")
-
-
-@slotted_freezable
-@dataclass
-class Account:
-    """
-    State associated with an address.
-    """
-
-    nonce: Uint
-    balance: U256
-    code_hash: Hash32
-
-
-EMPTY_ACCOUNT = Account(
-    nonce=Uint(0),
-    balance=U256(0),
-    code_hash=EMPTY_CODE_HASH,
-)
-
 
 def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     """
diff --git a/src/ethereum/forks/arrow_glacier/state.py b/src/ethereum/forks/arrow_glacier/state.py
deleted file mode 100644
index ce3e80c53fb..00000000000
--- a/src/ethereum/forks/arrow_glacier/state.py
+++ /dev/null
@@ -1,672 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, Iterable, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-
-from .fork_types import EMPTY_ACCOUNT, EMPTY_CODE_HASH, Account, Address, Root
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-
-
-def begin_transaction(state: State) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-
-
-def commit_transaction(state: State) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-
-def rollback_transaction(state: State) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State``.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def account_exists_and_is_empty(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists and has zero nonce, empty code and zero
-    balance.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    exists_and_is_empty : `bool`
-        True if an account exists and has zero nonce, empty code and zero
-        balance, False otherwise.
-
-    """
-    account = get_account_optional(state, address)
-    return (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def touch_account(state: State, address: Address) -> None:
-    """
-    Initializes an account to state.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        The address of the account that needs to be initialized.
-
-    """
-    if not account_exists(state, address):
-        set_account(state, address, EMPTY_ACCOUNT)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def create_ether(state: State, address: Address, amount: U256) -> None:
-    """
-    Add newly created ether to an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to which ether is added.
-    amount:
-        The amount of ether to be added to the account of interest.
-
-    """
-
-    def increase_balance(account: Account) -> None:
-        account.balance += amount
-
-    modify_state(state, address, increase_balance)
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
-
-
-def destroy_touched_empty_accounts(
-    state: State, touched_accounts: Iterable[Address]
-) -> None:
-    """
-    Destroy all touched accounts that are empty.
-
-    Parameters
-    ----------
-    state: `State`
-        The current state.
-    touched_accounts: `Iterable[Address]`
-        All the accounts that have been touched in the current transaction.
-
-    """
-    for address in touched_accounts:
-        if account_exists_and_is_empty(state, address):
-            destroy_account(state, address)
diff --git a/src/ethereum/forks/arrow_glacier/state_tracker.py b/src/ethereum/forks/arrow_glacier/state_tracker.py
new file mode 100644
index 00000000000..24362ecff98
--- /dev/null
+++ b/src/ethereum/forks/arrow_glacier/state_tracker.py
@@ -0,0 +1,805 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+
+    ``storage_clears`` records addresses whose storage was wiped by
+    a pre-EIP-6780 ``SELFDESTRUCT`` earlier in the block, so later
+    reads must not fall back to ``pre_state`` storage.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    storage_clears: Set[Address] = field(default_factory=set)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    storage_clears: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.storage_clears:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if address in tx_state.storage_clears:
+        return False
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    if address in tx_state.parent.storage_clears:
+        return False
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+    tx_state.storage_clears.add(address)
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        storage_clears=set(tx_state.storage_clears),
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.storage_clears = snapshot.storage_clears
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address in tx_state.storage_clears:
+        block.storage_clears.add(address)
+        block.storage_writes.pop(address, None)
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.storage_clears.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+        storage_clears=block_state.storage_clears,
+    )
+
+
+def destroy_touched_empty_accounts(
+    tx_state: TransactionState, touched_accounts: Set[Address]
+) -> None:
+    """
+    Destroy all touched accounts that are empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    touched_accounts :
+        All the accounts that have been touched in the current transaction.
+
+    """
+    for address in touched_accounts:
+        if account_exists_and_is_empty(tx_state, address):
+            destroy_account(tx_state, address)
+
+
+def touch_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Initialize an account to state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be initialized.
+
+    """
+    if not account_exists(tx_state, address):
+        set_account(tx_state, address, EMPTY_ACCOUNT)
diff --git a/src/ethereum/forks/arrow_glacier/transactions.py b/src/ethereum/forks/arrow_glacier/transactions.py
index ca951f085c2..902128e634c 100644
--- a/src/ethereum/forks/arrow_glacier/transactions.py
+++ b/src/ethereum/forks/arrow_glacier/transactions.py
@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -19,42 +19,12 @@
     InvalidSignatureError,
     NonceOverflowError,
 )
+from ethereum.state import Address
 
 from .exceptions import TransactionTypeError
-from .fork_types import Address
-
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_PER_NON_ZERO = Uint(16)
-"""
-Gas cost per non-zero byte in the transaction data.
-"""
-
-GAS_TX_DATA_PER_ZERO = Uint(4)
-"""
-Gas cost per zero byte in the transaction data.
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
-
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
-"""
-
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
-"""
 
 
+@final
 @slotted_freezable
 @dataclass
 class LegacyTransaction:
@@ -114,6 +84,7 @@ class LegacyTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Access:
@@ -133,6 +104,7 @@ class Access:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccessListTransaction:
@@ -205,6 +177,7 @@ class AccessListTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class FeeMarketTransaction:
@@ -370,7 +343,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
     4. Cost for access list entries (if applicable)
@@ -378,27 +351,29 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     This function takes a transaction as a parameter and returns the intrinsic
     gas cost of the transaction.
     """
+    from .vm.gas import GasCosts
+
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
     data_cost = (
-        num_zeros * GAS_TX_DATA_PER_ZERO
-        + num_non_zeros * GAS_TX_DATA_PER_NON_ZERO
+        num_zeros * GasCosts.TX_DATA_PER_ZERO
+        + num_non_zeros * GasCosts.TX_DATA_PER_NON_ZERO
     )
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE
+        create_cost = GasCosts.TX_CREATE
     else:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
     if isinstance(tx, (AccessListTransaction, FeeMarketTransaction)):
         for access in tx.access_list:
-            access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_cost += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
 
-    return GAS_TX_BASE + data_cost + create_cost + access_list_cost
+    return GasCosts.TX_BASE + data_cost + create_cost + access_list_cost
 
 
 def recover_sender(chain_id: U64, tx: Transaction) -> Address:
diff --git a/src/ethereum/forks/arrow_glacier/trie.py b/src/ethereum/forks/arrow_glacier/trie.py
deleted file mode 100644
index fce5af9482f..00000000000
--- a/src/ethereum/forks/arrow_glacier/trie.py
+++ /dev/null
@@ -1,498 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    assert_type,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.london import trie as previous_trie
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt
-from .fork_types import Account, Address, Root, encode_account
-from .transactions import LegacyTransaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = Account | Bytes | LegacyTransaction | Receipt | Uint | U256 | None
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[LegacyTransaction | Bytes],
-    Optional[Receipt | Bytes],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `rlp.RLP`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (LegacyTransaction, Receipt, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/arrow_glacier/utils/hexadecimal.py b/src/ethereum/forks/arrow_glacier/utils/hexadecimal.py
index 9ea75b7607f..2a648e930b4 100644
--- a/src/ethereum/forks/arrow_glacier/utils/hexadecimal.py
+++ b/src/ethereum/forks/arrow_glacier/utils/hexadecimal.py
@@ -14,11 +14,9 @@
 
 from ethereum_types.bytes import Bytes
 
-from ethereum.state import Address
+from ethereum.state import Address, Root
 from ethereum.utils.hexadecimal import remove_hex_prefix
 
-from ..fork_types import Root
-
 
 def hex_to_root(hex_string: str) -> Root:
     """
diff --git a/src/ethereum/forks/arrow_glacier/utils/message.py b/src/ethereum/forks/arrow_glacier/utils/message.py
index 02714198bcd..f490d33bb7e 100644
--- a/src/ethereum/forks/arrow_glacier/utils/message.py
+++ b/src/ethereum/forks/arrow_glacier/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
@@ -55,7 +55,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -63,8 +63,8 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        account = get_account(block_env.state, tx.to)
-        code = get_code(block_env.state, account.code_hash)
+        account = get_account(tx_env.state, tx.to)
+        code = get_code(tx_env.state, account.code_hash)
 
         code_address = tx.to
     else:
diff --git a/src/ethereum/forks/arrow_glacier/vm/__init__.py b/src/ethereum/forks/arrow_glacier/vm/__init__.py
index 46462ee6abc..6bc15f7325f 100644
--- a/src/ethereum/forks/arrow_glacier/vm/__init__.py
+++ b/src/ethereum/forks/arrow_glacier/vm/__init__.py
@@ -13,24 +13,29 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt
-from ..state import State, account_exists_and_is_empty
+from ..state_tracker import (
+    BlockState,
+    TransactionState,
+    account_exists_and_is_empty,
+)
 from ..transactions import LegacyTransaction
-from ..trie import Trie
 from .precompiled_contracts import RIPEMD160_ADDRESS
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +43,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -48,6 +53,7 @@ class BlockEnvironment:
     difficulty: Uint
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -79,10 +85,11 @@ class BlockOutput:
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
@@ -90,10 +97,12 @@ class TransactionEnvironment:
     gas: Uint
     access_list_addresses: Set[Address]
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
+    state: TransactionState
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -118,6 +127,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
@@ -159,7 +169,7 @@ def incorporate_child_on_success(evm: Evm, child_evm: Evm) -> None:
     evm.accounts_to_delete.update(child_evm.accounts_to_delete)
     evm.touched_accounts.update(child_evm.touched_accounts)
     if account_exists_and_is_empty(
-        evm.message.block_env.state, child_evm.message.current_target
+        evm.message.tx_env.state, child_evm.message.current_target
     ):
         evm.touched_accounts.add(child_evm.message.current_target)
     evm.accessed_addresses.update(child_evm.accessed_addresses)
@@ -189,7 +199,7 @@ def incorporate_child_on_error(evm: Evm, child_evm: Evm) -> None:
         evm.touched_accounts.add(RIPEMD160_ADDRESS)
     if child_evm.message.current_target == RIPEMD160_ADDRESS:
         if account_exists_and_is_empty(
-            evm.message.block_env.state, child_evm.message.current_target
+            evm.message.tx_env.state, child_evm.message.current_target
         ):
             evm.touched_accounts.add(RIPEMD160_ADDRESS)
     evm.gas_left += child_evm.gas_left
diff --git a/src/ethereum/forks/arrow_glacier/vm/gas.py b/src/ethereum/forks/arrow_glacier/vm/gas.py
index 1929dd5ca3b..898c7024d28 100644
--- a/src/ethereum/forks/arrow_glacier/vm/gas.py
+++ b/src/ethereum/forks/arrow_glacier/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32
@@ -22,48 +22,146 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 4800
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-GAS_ECRECOVER = Uint(3000)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1)
-GAS_COLD_SLOAD = Uint(2100)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600)
-GAS_WARM_ACCESS = Uint(100)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    WARM_ACCESS: Final[Uint] = Uint(100)
+    COLD_ACCOUNT_ACCESS: Final[Uint] = Uint(2600)
+    COLD_STORAGE_ACCESS: Final[Uint] = Uint(2100)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 4800
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_PER_ZERO: Final[Uint] = Uint(4)
+    TX_DATA_PER_NON_ZERO: Final[Uint] = Uint(16)
+    TX_ACCESS_LIST_ADDRESS: Final[Uint] = Uint(2400)
+    TX_ACCESS_LIST_STORAGE_KEY: Final[Uint] = Uint(1900)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_DIFFICULTY: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_BASEFEE: Final[Uint] = BASE
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -79,11 +177,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -135,7 +234,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -165,7 +264,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -190,7 +289,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/arithmetic.py b/src/ethereum/forks/arrow_glacier/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/arrow_glacier/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/arrow_glacier/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/bitwise.py b/src/ethereum/forks/arrow_glacier/vm/instructions/bitwise.py
index 41dabe8185b..1de6c615931 100644
--- a/src/ethereum/forks/arrow_glacier/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/arrow_glacier/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +172,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +202,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +232,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/block.py b/src/ethereum/forks/arrow_glacier/vm/instructions/block.py
index bbf01739ff2..e3400f9461a 100644
--- a/src/ethereum/forks/arrow_glacier/vm/instructions/block.py
+++ b/src/ethereum/forks/arrow_glacier/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -33,7 +33,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -75,7 +75,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -102,7 +102,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -128,7 +128,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -154,7 +154,7 @@ def difficulty(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_DIFFICULTY)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.difficulty))
@@ -180,7 +180,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -203,7 +203,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/comparison.py b/src/ethereum/forks/arrow_glacier/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/arrow_glacier/vm/instructions/comparison.py
+++ b/src/ethereum/forks/arrow_glacier/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/control_flow.py b/src/ethereum/forks/arrow_glacier/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/arrow_glacier/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/arrow_glacier/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/environment.py b/src/ethereum/forks/arrow_glacier/vm/instructions/environment.py
index fe1b70c1269..904a7b8a9d0 100644
--- a/src/ethereum/forks/arrow_glacier/vm/instructions/environment.py
+++ b/src/ethereum/forks/arrow_glacier/vm/instructions/environment.py
@@ -13,22 +13,16 @@
 
 from ethereum_types.numeric import U256, Uint, ulen
 
+from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...fork_types import EMPTY_ACCOUNT
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BASE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_COPY,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
-    GAS_WARM_ACCESS,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -49,7 +43,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -73,14 +67,15 @@ def balance(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_addresses.add(address)
-        charge_gas(evm, GAS_COLD_ACCOUNT_ACCESS)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -103,7 +98,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -126,7 +121,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -149,7 +144,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -173,7 +168,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -198,7 +193,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -227,11 +222,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -256,7 +254,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -285,11 +283,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -314,7 +315,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -338,16 +339,17 @@ def extcodesize(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -374,23 +376,24 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
 
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost + copy_gas_cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -413,7 +416,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -439,11 +442,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -472,15 +480,15 @@ def extcodehash(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -507,12 +515,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
@@ -535,7 +543,7 @@ def base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BASEFEE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.base_fee_per_gas))
diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/keccak.py b/src/ethereum/forks/arrow_glacier/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/arrow_glacier/vm/instructions/keccak.py
+++ b/src/ethereum/forks/arrow_glacier/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/log.py b/src/ethereum/forks/arrow_glacier/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/arrow_glacier/vm/instructions/log.py
+++ b/src/ethereum/forks/arrow_glacier/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/memory.py b/src/ethereum/forks/arrow_glacier/vm/instructions/memory.py
index 3a242ba2f7a..93861811559 100644
--- a/src/ethereum/forks/arrow_glacier/vm/instructions/memory.py
+++ b/src/ethereum/forks/arrow_glacier/vm/instructions/memory.py
@@ -16,8 +16,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,7 +45,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -77,7 +76,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -105,7 +104,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -132,7 +131,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/stack.py b/src/ethereum/forks/arrow_glacier/vm/instructions/stack.py
index 0fc0d3fe4b5..901bff4ed3b 100644
--- a/src/ethereum/forks/arrow_glacier/vm/instructions/stack.py
+++ b/src/ethereum/forks/arrow_glacier/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -62,7 +66,7 @@ def push_n(evm: Evm, num_bytes: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -92,7 +96,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -124,7 +128,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -136,69 +140,69 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/storage.py b/src/ethereum/forks/arrow_glacier/vm/instructions/storage.py
index 6129ed5322c..e9d86666668 100644
--- a/src/ethereum/forks/arrow_glacier/vm/instructions/storage.py
+++ b/src/ethereum/forks/arrow_glacier/vm/instructions/storage.py
@@ -13,16 +13,11 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import get_storage, get_storage_original, set_storage
+from ...state_tracker import get_storage, get_storage_original, set_storage
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,15 +39,14 @@ def sload(evm: Evm) -> None:
 
     # GAS
     if (evm.message.current_target, key) in evm.accessed_storage_keys:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        charge_gas(evm, GAS_COLD_SLOAD)
+        charge_gas(evm, GasCosts.COLD_STORAGE_ACCESS)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -73,54 +67,60 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     gas_cost = Uint(0)
 
     if (evm.message.current_target, key) not in evm.accessed_storage_keys:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        gas_cost += GAS_COLD_SLOAD
+        gas_cost += GasCosts.COLD_STORAGE_ACCESS
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost += GAS_STORAGE_SET
+            gas_cost += GasCosts.STORAGE_SET
         else:
-            gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_SLOAD
+            gas_cost += (
+                GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
+            )
     else:
-        gas_cost += GAS_WARM_ACCESS
+        gas_cost += GasCosts.WARM_ACCESS
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
             # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
             # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
             # Storage slot being restored to its original value
             if original_value == 0:
                 # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_WARM_ACCESS)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.WARM_ACCESS
+                )
             else:
                 # Slot was originally non-empty and was UPDATED earlier
                 evm.refund_counter += int(
-                    GAS_STORAGE_UPDATE - GAS_COLD_SLOAD - GAS_WARM_ACCESS
+                    GasCosts.COLD_STORAGE_WRITE
+                    - GasCosts.COLD_STORAGE_ACCESS
+                    - GasCosts.WARM_ACCESS
                 )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/system.py b/src/ethereum/forks/arrow_glacier/vm/instructions/system.py
index b48d2498ac3..cbc799007a6 100644
--- a/src/ethereum/forks/arrow_glacier/vm/instructions/system.py
+++ b/src/ethereum/forks/arrow_glacier/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
@@ -40,15 +40,7 @@
 )
 from ..exceptions import Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -83,7 +75,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -97,15 +89,13 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -157,14 +147,14 @@ def create(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -202,8 +192,8 @@ def create2(evm: Evm) -> None:
     call_data_words = ceil32(Uint(memory_size)) // Uint(32)
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost,
     )
 
@@ -242,7 +232,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -285,8 +275,8 @@ def generic_call(
     call_data = memory_read_bytes(
         evm.memory, memory_input_start_position, memory_input_size
     )
-    account = get_account(evm.message.block_env.state, code_address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    account = get_account(evm.message.tx_env.state, code_address)
+    code = get_code(evm.message.tx_env.state, account.code_hash)
     child_message = Message(
         block_env=evm.message.block_env,
         tx_env=evm.message.tx_env,
@@ -353,17 +343,17 @@ def call(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -376,7 +366,7 @@ def call(evm: Evm) -> None:
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -433,12 +423,12 @@ def callcode(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -451,7 +441,7 @@ def callcode(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -491,19 +481,19 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if beneficiary not in evm.accessed_addresses:
         evm.accessed_addresses.add(beneficiary)
-        gas_cost += GAS_COLD_ACCOUNT_ACCESS
+        gas_cost += GasCosts.COLD_ACCOUNT_ACCESS
 
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -511,28 +501,28 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     beneficiary_balance = get_account(
-        evm.message.block_env.state, beneficiary
+        evm.message.tx_env.state, beneficiary
     ).balance
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     # First Transfer to beneficiary
     set_account_balance(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         beneficiary,
         beneficiary_balance + originator_balance,
     )
     # Next, Zero the balance of the address being deleted (must come after
     # sending to beneficiary in case the contract named itself as the
     # beneficiary).
-    set_account_balance(evm.message.block_env.state, originator, U256(0))
+    set_account_balance(evm.message.tx_env.state, originator, U256(0))
 
     # register account for deletion
     evm.accounts_to_delete.add(originator)
 
     # mark beneficiary as touched
-    if account_exists_and_is_empty(evm.message.block_env.state, beneficiary):
+    if account_exists_and_is_empty(evm.message.tx_env.state, beneficiary):
         evm.touched_accounts.add(beneficiary)
 
     # HALT the execution
@@ -570,13 +560,17 @@ def delegatecall(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     message_call_gas = calculate_message_call_gas(
-        U256(0), gas, Uint(evm.gas_left), extend_memory.cost, access_gas_cost
+        U256(0),
+        gas,
+        Uint(evm.gas_left),
+        extend_memory.cost,
+        access_gas_cost,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
@@ -629,10 +623,10 @@ def staticcall(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
 
diff --git a/src/ethereum/forks/arrow_glacier/vm/interpreter.py b/src/ethereum/forks/arrow_glacier/vm/interpreter.py
index 20d8c31f1e3..282e2bdfcf4 100644
--- a/src/ethereum/forks/arrow_glacier/vm/interpreter.py
+++ b/src/ethereum/forks/arrow_glacier/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,21 +31,21 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     increment_nonce,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
     touch_account,
 )
 from ..vm import Message
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -64,6 +64,7 @@
 MAX_CODE_SIZE = 0x6000
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -103,12 +104,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -122,9 +123,7 @@ def process_message_call(message: Message) -> MessageCallOutput:
             evm = process_create_message(message)
     else:
         evm = process_message(message)
-        if account_exists_and_is_empty(
-            block_env.state, Address(message.target)
-        ):
+        if account_exists_and_is_empty(tx_state, Address(message.target)):
             evm.touched_accounts.add(Address(message.target))
 
     if evm.error:
@@ -167,19 +166,30 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state)
-
-    # The list of created accounts is used by `get_storage_original`.
-    mark_account_created(state, message.current_target)
-
-    increment_nonce(state, message.current_target)
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts.
+    mark_account_created(tx_state, message.current_target)
+
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             if len(contract_code) > 0:
@@ -189,15 +199,14 @@ def process_create_message(message: Message) -> Evm:
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -216,7 +225,7 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
@@ -243,13 +252,16 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
 
-    touch_account(state, message.current_target)
+    touch_account(tx_state, message.current_target)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -280,9 +292,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state)
-    else:
-        commit_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/alt_bn128.py
index 214725d8da0..862506c54c3 100644
--- a/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(150))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(6000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(34000 * (len(data) // 192) + 45000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/identity.py b/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/berlin/__init__.py b/src/ethereum/forks/berlin/__init__.py
index 3bc09c7878a..52bee472924 100644
--- a/src/ethereum/forks/berlin/__init__.py
+++ b/src/ethereum/forks/berlin/__init__.py
@@ -31,7 +31,7 @@
 [EIP-2929]: https://eips.ethereum.org/EIPS/eip-2929
 [EIP-2718]: https://eips.ethereum.org/EIPS/eip-2718
 [EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
-[Besu 21.1.2]: https://github.com/hyperledger/besu/releases/tag/21.1.2
+[Besu 21.1.2]: https://github.com/besu-eth/besu/releases/tag/21.1.2
 [js]: https://github.com/ethereumjs/ethereumjs-monorepo/releases/tag/%40ethereumjs%2Fvm%405.2.0
 [Geth 1.10.1]: https://github.com/ethereum/go-ethereum/releases/tag/v1.10.1
 [n]: https://github.com/NethermindEth/nethermind/releases/tag/1.10.58
diff --git a/src/ethereum/forks/berlin/blocks.py b/src/ethereum/forks/berlin/blocks.py
index a52af69baed..0bb4d2103ea 100644
--- a/src/ethereum/forks/berlin/blocks.py
+++ b/src/ethereum/forks/berlin/blocks.py
@@ -10,7 +10,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
@@ -18,11 +18,13 @@
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.crypto.hash import Hash32
+from ethereum.state import Address, Root
 
-from .fork_types import Address, Bloom, Root
+from .fork_types import Bloom
 from .transactions import AccessListTransaction, LegacyTransaction, Transaction
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -61,13 +63,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.berlin.state.state_root
-    [Trie]: ref:ethereum.forks.berlin.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -77,8 +80,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.berlin.trie.root
-    [Trie]: ref:ethereum.forks.berlin.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -88,8 +91,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.berlin.trie.root
-    [Trie]: ref:ethereum.forks.berlin.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -158,6 +161,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -203,6 +207,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -235,6 +240,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/berlin/fork.py b/src/ethereum/forks/berlin/fork.py
index 54bc85a6aa6..69a176907ec 100644
--- a/src/ethereum/forks/berlin/fork.py
+++ b/src/ethereum/forks/berlin/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
@@ -28,21 +28,29 @@
     InvalidSenderError,
     NonceMismatchError,
 )
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt, encode_receipt
 from .bloom import logs_bloom
-from .fork_types import EMPTY_CODE_HASH, Address
-from .state import (
-    State,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
     account_exists_and_is_empty,
     create_ether,
     destroy_account,
     destroy_touched_empty_accounts,
+    extract_block_diff,
     get_account,
+    incorporate_tx_into_block,
     increment_nonce,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
     AccessListTransaction,
@@ -54,19 +62,18 @@
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.message import prepare_message
+from .vm.gas import GasCosts
 from .vm.interpreter import process_message_call
 
 BLOCK_REWARD = U256(2 * 10**18)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 MINIMUM_DIFFICULTY = Uint(131072)
 MAX_OMMER_DEPTH = Uint(6)
 BOMB_DELAY_BLOCKS = 9000000
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -168,9 +175,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     validate_header(chain, block.header)
     validate_ommers(block.ommers, block.header, chain)
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -184,7 +193,12 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         ommers=block.ommers,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes,
+        block_diff.storage_changes,
+        block_diff.storage_clears,
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -202,6 +216,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block_logs_bloom != block.header.bloom:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -352,6 +367,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Address:
     """
     Check if the transaction is includable in the block.
@@ -364,6 +380,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -386,7 +404,7 @@ def check_transaction(
     if tx.gas > gas_available:
         raise GasUsedExceedsLimitError("gas used exceeds limit")
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     max_gas_fee = tx.gas * tx.gas_price
 
@@ -475,7 +493,7 @@ def apply_body(
     for i, tx in enumerate(map(decode_transaction, transactions)):
         process_transaction(block_env, block_output, tx, Uint(i))
 
-    pay_rewards(block_env.state, block_env.number, block_env.coinbase, ommers)
+    pay_rewards(block_env, ommers)
 
     return block_output
 
@@ -557,9 +575,7 @@ def validate_ommers(
 
 
 def pay_rewards(
-    state: State,
-    block_number: Uint,
-    coinbase: Address,
+    block_env: vm.BlockEnvironment,
     ommers: Tuple[Header, ...],
 ) -> None:
     """
@@ -578,25 +594,24 @@ def pay_rewards(
 
     Parameters
     ----------
-    state :
-        Current account state.
-    block_number :
-        Position of the block within the chain.
-    coinbase :
-        Address of account which receives block reward and transaction fees.
+    block_env :
+        The block scoped environment.
     ommers :
         List of ommers mentioned in the current block.
 
     """
+    rewards_state = TransactionState(parent=block_env.state)
     ommer_count = U256(len(ommers))
     miner_reward = BLOCK_REWARD + (ommer_count * (BLOCK_REWARD // U256(32)))
-    create_ether(state, coinbase, miner_reward)
+    create_ether(rewards_state, block_env.coinbase, miner_reward)
 
     for ommer in ommers:
         # Ommer age with respect to the current block.
-        ommer_age = U256(block_number - ommer.number)
+        ommer_age = U256(block_env.number - ommer.number)
         ommer_miner_reward = ((U256(8) - ommer_age) * BLOCK_REWARD) // U256(8)
-        create_ether(state, ommer.coinbase, ommer_miner_reward)
+        create_ether(rewards_state, ommer.coinbase, ommer_miner_reward)
+
+    incorporate_tx_into_block(rewards_state)
 
 
 def process_transaction(
@@ -629,6 +644,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(
         block_output.transactions_trie,
         rlp.encode(index),
@@ -641,18 +658,17 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     gas_fee = tx.gas * tx.gas_price
     sender_balance_after_gas_fee = Uint(sender_account.balance) - gas_fee
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     access_list_addresses = set()
     access_list_storage_keys = set()
@@ -668,6 +684,7 @@ def process_transaction(
         gas=gas,
         access_list_addresses=access_list_addresses,
         access_list_storage_keys=access_list_storage_keys,
+        state=tx_state,
         index_in_block=index,
         tx_hash=get_transaction_hash(encode_transaction(tx)),
     )
@@ -687,28 +704,25 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * tx.gas_price
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
     coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
+        tx_state, block_env.coinbase
     ).balance + U256(transaction_fee)
     if coinbase_balance_after_mining_fee != 0:
         set_account_balance(
-            block_env.state,
+            tx_state,
             block_env.coinbase,
             coinbase_balance_after_mining_fee,
         )
-    elif account_exists_and_is_empty(block_env.state, block_env.coinbase):
-        destroy_account(block_env.state, block_env.coinbase)
+    elif account_exists_and_is_empty(tx_state, block_env.coinbase):
+        destroy_account(tx_state, block_env.coinbase)
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
-    destroy_touched_empty_accounts(block_env.state, tx_output.touched_accounts)
+    destroy_touched_empty_accounts(tx_state, tx_output.touched_accounts)
 
     block_output.block_gas_used += tx_gas_used_after_refund
 
@@ -727,6 +741,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
     """
@@ -734,14 +750,14 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
-    passed through as a parameter is greater than or equal to the *sum* of
-    the parent's gas and the adjustment delta then the limit for gas is too
-    high and fails this function's check. Similarly, if the limit is less
-    than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
-    check fails because the gas limit doesn't allow for a sufficient or
-    reasonable amount of gas to be used on a block.
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is passed
+    through as a parameter is greater than or equal to the *sum* of the
+    parent's gas and the adjustment delta then the limit for gas is too high
+    and fails this function's check. Similarly, if the limit is less than or
+    equal to the *difference* of the parent's gas and the adjustment delta *or*
+    the predefined ``LIMIT_MINIMUM`` then this function's check fails because
+    the gas limit doesn't allow for a sufficient or reasonable amount of gas to
+    be used on a block.
 
     Parameters
     ----------
@@ -757,12 +773,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/berlin/fork_types.py b/src/ethereum/forks/berlin/fork_types.py
index ae4525bbbdd..02907cd2a1a 100644
--- a/src/ethereum/forks/berlin/fork_types.py
+++ b/src/ethereum/forks/berlin/fork_types.py
@@ -11,41 +11,13 @@
 Types reused throughout the specification, which are specific to Ethereum.
 """
 
-from dataclasses import dataclass
-
 from ethereum_rlp import rlp
-from ethereum_types.bytes import Bytes, Bytes20, Bytes256
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
+from ethereum_types.bytes import Bytes, Bytes256
 
-Address = Bytes20
-Root = Hash32
+from ethereum.state import Account
 
 Bloom = Bytes256
 
-EMPTY_CODE_HASH = keccak256(b"")
-
-
-@slotted_freezable
-@dataclass
-class Account:
-    """
-    State associated with an address.
-    """
-
-    nonce: Uint
-    balance: U256
-    code_hash: Hash32
-
-
-EMPTY_ACCOUNT = Account(
-    nonce=Uint(0),
-    balance=U256(0),
-    code_hash=EMPTY_CODE_HASH,
-)
-
 
 def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     """
diff --git a/src/ethereum/forks/berlin/state.py b/src/ethereum/forks/berlin/state.py
deleted file mode 100644
index ce3e80c53fb..00000000000
--- a/src/ethereum/forks/berlin/state.py
+++ /dev/null
@@ -1,672 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, Iterable, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-
-from .fork_types import EMPTY_ACCOUNT, EMPTY_CODE_HASH, Account, Address, Root
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-
-
-def begin_transaction(state: State) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-
-
-def commit_transaction(state: State) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-
-def rollback_transaction(state: State) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State``.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def account_exists_and_is_empty(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists and has zero nonce, empty code and zero
-    balance.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    exists_and_is_empty : `bool`
-        True if an account exists and has zero nonce, empty code and zero
-        balance, False otherwise.
-
-    """
-    account = get_account_optional(state, address)
-    return (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def touch_account(state: State, address: Address) -> None:
-    """
-    Initializes an account to state.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        The address of the account that needs to be initialized.
-
-    """
-    if not account_exists(state, address):
-        set_account(state, address, EMPTY_ACCOUNT)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def create_ether(state: State, address: Address, amount: U256) -> None:
-    """
-    Add newly created ether to an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to which ether is added.
-    amount:
-        The amount of ether to be added to the account of interest.
-
-    """
-
-    def increase_balance(account: Account) -> None:
-        account.balance += amount
-
-    modify_state(state, address, increase_balance)
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
-
-
-def destroy_touched_empty_accounts(
-    state: State, touched_accounts: Iterable[Address]
-) -> None:
-    """
-    Destroy all touched accounts that are empty.
-
-    Parameters
-    ----------
-    state: `State`
-        The current state.
-    touched_accounts: `Iterable[Address]`
-        All the accounts that have been touched in the current transaction.
-
-    """
-    for address in touched_accounts:
-        if account_exists_and_is_empty(state, address):
-            destroy_account(state, address)
diff --git a/src/ethereum/forks/berlin/state_tracker.py b/src/ethereum/forks/berlin/state_tracker.py
new file mode 100644
index 00000000000..24362ecff98
--- /dev/null
+++ b/src/ethereum/forks/berlin/state_tracker.py
@@ -0,0 +1,805 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+
+    ``storage_clears`` records addresses whose storage was wiped by
+    a pre-EIP-6780 ``SELFDESTRUCT`` earlier in the block, so later
+    reads must not fall back to ``pre_state`` storage.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    storage_clears: Set[Address] = field(default_factory=set)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    storage_clears: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.storage_clears:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if address in tx_state.storage_clears:
+        return False
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    if address in tx_state.parent.storage_clears:
+        return False
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+    tx_state.storage_clears.add(address)
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        storage_clears=set(tx_state.storage_clears),
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.storage_clears = snapshot.storage_clears
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address in tx_state.storage_clears:
+        block.storage_clears.add(address)
+        block.storage_writes.pop(address, None)
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.storage_clears.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+        storage_clears=block_state.storage_clears,
+    )
+
+
+def destroy_touched_empty_accounts(
+    tx_state: TransactionState, touched_accounts: Set[Address]
+) -> None:
+    """
+    Destroy all touched accounts that are empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    touched_accounts :
+        All the accounts that have been touched in the current transaction.
+
+    """
+    for address in touched_accounts:
+        if account_exists_and_is_empty(tx_state, address):
+            destroy_account(tx_state, address)
+
+
+def touch_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Initialize an account to state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be initialized.
+
+    """
+    if not account_exists(tx_state, address):
+        set_account(tx_state, address, EMPTY_ACCOUNT)
diff --git a/src/ethereum/forks/berlin/transactions.py b/src/ethereum/forks/berlin/transactions.py
index 10a9e22a2c0..1c4bf3ca2f0 100644
--- a/src/ethereum/forks/berlin/transactions.py
+++ b/src/ethereum/forks/berlin/transactions.py
@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -19,42 +19,12 @@
     InvalidSignatureError,
     NonceOverflowError,
 )
+from ethereum.state import Address
 
 from .exceptions import TransactionTypeError
-from .fork_types import Address
-
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_PER_NON_ZERO = Uint(16)
-"""
-Gas cost per non-zero byte in the transaction data.
-"""
-
-GAS_TX_DATA_PER_ZERO = Uint(4)
-"""
-Gas cost per zero byte in the transaction data.
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
-
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
-"""
-
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
-"""
 
 
+@final
 @slotted_freezable
 @dataclass
 class LegacyTransaction:
@@ -113,6 +83,7 @@ class LegacyTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Access:
@@ -132,6 +103,7 @@ class Access:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccessListTransaction:
@@ -287,7 +259,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
     4. Cost for access list entries (if applicable)
@@ -295,27 +267,29 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     This function takes a transaction as a parameter and returns the intrinsic
     gas cost of the transaction.
     """
+    from .vm.gas import GasCosts
+
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
     data_cost = (
-        num_zeros * GAS_TX_DATA_PER_ZERO
-        + num_non_zeros * GAS_TX_DATA_PER_NON_ZERO
+        num_zeros * GasCosts.TX_DATA_PER_ZERO
+        + num_non_zeros * GasCosts.TX_DATA_PER_NON_ZERO
     )
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE
+        create_cost = GasCosts.TX_CREATE
     else:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
     if isinstance(tx, AccessListTransaction):
         for access in tx.access_list:
-            access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_cost += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
 
-    return GAS_TX_BASE + data_cost + create_cost + access_list_cost
+    return GasCosts.TX_BASE + data_cost + create_cost + access_list_cost
 
 
 def recover_sender(chain_id: U64, tx: Transaction) -> Address:
diff --git a/src/ethereum/forks/berlin/trie.py b/src/ethereum/forks/berlin/trie.py
deleted file mode 100644
index 01e4f062098..00000000000
--- a/src/ethereum/forks/berlin/trie.py
+++ /dev/null
@@ -1,498 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    assert_type,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.muir_glacier import trie as previous_trie
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt
-from .fork_types import Account, Address, Root, encode_account
-from .transactions import LegacyTransaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = Account | Bytes | LegacyTransaction | Receipt | Uint | U256 | None
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[LegacyTransaction | Bytes],
-    Optional[Receipt | Bytes],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `rlp.RLP`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (LegacyTransaction, Receipt, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `eth1spec.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `eth1spec.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/berlin/utils/hexadecimal.py b/src/ethereum/forks/berlin/utils/hexadecimal.py
index 2b8bf4c375e..575e02874f7 100644
--- a/src/ethereum/forks/berlin/utils/hexadecimal.py
+++ b/src/ethereum/forks/berlin/utils/hexadecimal.py
@@ -14,11 +14,9 @@
 
 from ethereum_types.bytes import Bytes
 
-from ethereum.state import Address
+from ethereum.state import Address, Root
 from ethereum.utils.hexadecimal import remove_hex_prefix
 
-from ..fork_types import Root
-
 
 def hex_to_root(hex_string: str) -> Root:
     """
diff --git a/src/ethereum/forks/berlin/utils/message.py b/src/ethereum/forks/berlin/utils/message.py
index 6c11551b0a8..0a7562ca32c 100644
--- a/src/ethereum/forks/berlin/utils/message.py
+++ b/src/ethereum/forks/berlin/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
@@ -55,7 +55,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -63,8 +63,8 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        account = get_account(block_env.state, tx.to)
-        code = get_code(block_env.state, account.code_hash)
+        account = get_account(tx_env.state, tx.to)
+        code = get_code(tx_env.state, account.code_hash)
 
         code_address = tx.to
     else:
diff --git a/src/ethereum/forks/berlin/vm/__init__.py b/src/ethereum/forks/berlin/vm/__init__.py
index e6d9a36081d..f8d8b5f8e51 100644
--- a/src/ethereum/forks/berlin/vm/__init__.py
+++ b/src/ethereum/forks/berlin/vm/__init__.py
@@ -13,24 +13,29 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt
-from ..state import State, account_exists_and_is_empty
+from ..state_tracker import (
+    BlockState,
+    TransactionState,
+    account_exists_and_is_empty,
+)
 from ..transactions import LegacyTransaction
-from ..trie import Trie
 from .precompiled_contracts import RIPEMD160_ADDRESS
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +43,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -47,6 +52,7 @@ class BlockEnvironment:
     difficulty: Uint
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -78,10 +84,11 @@ class BlockOutput:
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
@@ -89,10 +96,12 @@ class TransactionEnvironment:
     gas: Uint
     access_list_addresses: Set[Address]
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
+    state: TransactionState
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -117,6 +126,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
@@ -158,7 +168,7 @@ def incorporate_child_on_success(evm: Evm, child_evm: Evm) -> None:
     evm.accounts_to_delete.update(child_evm.accounts_to_delete)
     evm.touched_accounts.update(child_evm.touched_accounts)
     if account_exists_and_is_empty(
-        evm.message.block_env.state, child_evm.message.current_target
+        evm.message.tx_env.state, child_evm.message.current_target
     ):
         evm.touched_accounts.add(child_evm.message.current_target)
     evm.accessed_addresses.update(child_evm.accessed_addresses)
@@ -188,7 +198,7 @@ def incorporate_child_on_error(evm: Evm, child_evm: Evm) -> None:
         evm.touched_accounts.add(RIPEMD160_ADDRESS)
     if child_evm.message.current_target == RIPEMD160_ADDRESS:
         if account_exists_and_is_empty(
-            evm.message.block_env.state, child_evm.message.current_target
+            evm.message.tx_env.state, child_evm.message.current_target
         ):
             evm.touched_accounts.add(RIPEMD160_ADDRESS)
     evm.gas_left += child_evm.gas_left
diff --git a/src/ethereum/forks/berlin/vm/gas.py b/src/ethereum/forks/berlin/vm/gas.py
index 477037c3298..e69df508070 100644
--- a/src/ethereum/forks/berlin/vm/gas.py
+++ b/src/ethereum/forks/berlin/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32
@@ -22,49 +22,146 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 15000
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-REFUND_SELF_DESTRUCT = 24000
-GAS_ECRECOVER = Uint(3000)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1)
-GAS_COLD_SLOAD = Uint(2100)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600)
-GAS_WARM_ACCESS = Uint(100)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    WARM_ACCESS: Final[Uint] = Uint(100)
+    COLD_ACCOUNT_ACCESS: Final[Uint] = Uint(2600)
+    COLD_STORAGE_ACCESS: Final[Uint] = Uint(2100)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 15000
+    REFUND_SELF_DESTRUCT: Final[int] = 24000
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_PER_ZERO: Final[Uint] = Uint(4)
+    TX_DATA_PER_NON_ZERO: Final[Uint] = Uint(16)
+    TX_ACCESS_LIST_ADDRESS: Final[Uint] = Uint(2400)
+    TX_ACCESS_LIST_STORAGE_KEY: Final[Uint] = Uint(1900)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_DIFFICULTY: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -80,11 +177,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -136,7 +234,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -166,7 +264,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -191,7 +289,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
diff --git a/src/ethereum/forks/berlin/vm/instructions/arithmetic.py b/src/ethereum/forks/berlin/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/berlin/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/berlin/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/berlin/vm/instructions/bitwise.py b/src/ethereum/forks/berlin/vm/instructions/bitwise.py
index 41dabe8185b..1de6c615931 100644
--- a/src/ethereum/forks/berlin/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/berlin/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +172,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +202,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +232,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
diff --git a/src/ethereum/forks/berlin/vm/instructions/block.py b/src/ethereum/forks/berlin/vm/instructions/block.py
index bbf01739ff2..e3400f9461a 100644
--- a/src/ethereum/forks/berlin/vm/instructions/block.py
+++ b/src/ethereum/forks/berlin/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -33,7 +33,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -75,7 +75,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -102,7 +102,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -128,7 +128,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -154,7 +154,7 @@ def difficulty(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_DIFFICULTY)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.difficulty))
@@ -180,7 +180,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -203,7 +203,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/berlin/vm/instructions/comparison.py b/src/ethereum/forks/berlin/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/berlin/vm/instructions/comparison.py
+++ b/src/ethereum/forks/berlin/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/berlin/vm/instructions/control_flow.py b/src/ethereum/forks/berlin/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/berlin/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/berlin/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/berlin/vm/instructions/environment.py b/src/ethereum/forks/berlin/vm/instructions/environment.py
index 63733aca3d5..ec98efa5169 100644
--- a/src/ethereum/forks/berlin/vm/instructions/environment.py
+++ b/src/ethereum/forks/berlin/vm/instructions/environment.py
@@ -13,22 +13,16 @@
 
 from ethereum_types.numeric import U256, Uint, ulen
 
+from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...fork_types import EMPTY_ACCOUNT
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BASE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_COPY,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
-    GAS_WARM_ACCESS,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -49,7 +43,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -73,14 +67,15 @@ def balance(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_addresses.add(address)
-        charge_gas(evm, GAS_COLD_ACCOUNT_ACCESS)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -103,7 +98,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -126,7 +121,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -149,7 +144,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -173,7 +168,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -198,7 +193,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -227,11 +222,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -256,7 +254,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -285,11 +283,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -314,7 +315,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -338,16 +339,17 @@ def extcodesize(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -374,23 +376,24 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
 
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost + copy_gas_cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -413,7 +416,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -439,11 +442,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -472,15 +480,15 @@ def extcodehash(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -507,12 +515,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
diff --git a/src/ethereum/forks/berlin/vm/instructions/keccak.py b/src/ethereum/forks/berlin/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/berlin/vm/instructions/keccak.py
+++ b/src/ethereum/forks/berlin/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/berlin/vm/instructions/log.py b/src/ethereum/forks/berlin/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/berlin/vm/instructions/log.py
+++ b/src/ethereum/forks/berlin/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/berlin/vm/instructions/memory.py b/src/ethereum/forks/berlin/vm/instructions/memory.py
index 3a242ba2f7a..93861811559 100644
--- a/src/ethereum/forks/berlin/vm/instructions/memory.py
+++ b/src/ethereum/forks/berlin/vm/instructions/memory.py
@@ -16,8 +16,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,7 +45,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -77,7 +76,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -105,7 +104,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -132,7 +131,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
diff --git a/src/ethereum/forks/berlin/vm/instructions/stack.py b/src/ethereum/forks/berlin/vm/instructions/stack.py
index 0fc0d3fe4b5..901bff4ed3b 100644
--- a/src/ethereum/forks/berlin/vm/instructions/stack.py
+++ b/src/ethereum/forks/berlin/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -62,7 +66,7 @@ def push_n(evm: Evm, num_bytes: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -92,7 +96,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -124,7 +128,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -136,69 +140,69 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/berlin/vm/instructions/storage.py b/src/ethereum/forks/berlin/vm/instructions/storage.py
index 6129ed5322c..e9d86666668 100644
--- a/src/ethereum/forks/berlin/vm/instructions/storage.py
+++ b/src/ethereum/forks/berlin/vm/instructions/storage.py
@@ -13,16 +13,11 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import get_storage, get_storage_original, set_storage
+from ...state_tracker import get_storage, get_storage_original, set_storage
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,15 +39,14 @@ def sload(evm: Evm) -> None:
 
     # GAS
     if (evm.message.current_target, key) in evm.accessed_storage_keys:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        charge_gas(evm, GAS_COLD_SLOAD)
+        charge_gas(evm, GasCosts.COLD_STORAGE_ACCESS)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -73,54 +67,60 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     gas_cost = Uint(0)
 
     if (evm.message.current_target, key) not in evm.accessed_storage_keys:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        gas_cost += GAS_COLD_SLOAD
+        gas_cost += GasCosts.COLD_STORAGE_ACCESS
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost += GAS_STORAGE_SET
+            gas_cost += GasCosts.STORAGE_SET
         else:
-            gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_SLOAD
+            gas_cost += (
+                GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
+            )
     else:
-        gas_cost += GAS_WARM_ACCESS
+        gas_cost += GasCosts.WARM_ACCESS
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
             # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
             # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
             # Storage slot being restored to its original value
             if original_value == 0:
                 # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_WARM_ACCESS)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.WARM_ACCESS
+                )
             else:
                 # Slot was originally non-empty and was UPDATED earlier
                 evm.refund_counter += int(
-                    GAS_STORAGE_UPDATE - GAS_COLD_SLOAD - GAS_WARM_ACCESS
+                    GasCosts.COLD_STORAGE_WRITE
+                    - GasCosts.COLD_STORAGE_ACCESS
+                    - GasCosts.WARM_ACCESS
                 )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
diff --git a/src/ethereum/forks/berlin/vm/instructions/system.py b/src/ethereum/forks/berlin/vm/instructions/system.py
index 4320315d945..e1e409cc8b8 100644
--- a/src/ethereum/forks/berlin/vm/instructions/system.py
+++ b/src/ethereum/forks/berlin/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
@@ -40,16 +40,7 @@
 )
 from ..exceptions import Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
-    REFUND_SELF_DESTRUCT,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -84,7 +75,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -98,15 +89,13 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -158,14 +147,14 @@ def create(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -203,8 +192,8 @@ def create2(evm: Evm) -> None:
     call_data_words = ceil32(Uint(memory_size)) // Uint(32)
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost,
     )
 
@@ -243,7 +232,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -286,8 +275,8 @@ def generic_call(
     call_data = memory_read_bytes(
         evm.memory, memory_input_start_position, memory_input_size
     )
-    _code_account = get_account(evm.message.block_env.state, code_address)
-    code = get_code(evm.message.block_env.state, _code_account.code_hash)
+    _code_account = get_account(evm.message.tx_env.state, code_address)
+    code = get_code(evm.message.tx_env.state, _code_account.code_hash)
     child_message = Message(
         block_env=evm.message.block_env,
         tx_env=evm.message.tx_env,
@@ -354,17 +343,17 @@ def call(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -377,7 +366,7 @@ def call(evm: Evm) -> None:
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -434,12 +423,12 @@ def callcode(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -452,7 +441,7 @@ def callcode(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -492,19 +481,19 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if beneficiary not in evm.accessed_addresses:
         evm.accessed_addresses.add(beneficiary)
-        gas_cost += GAS_COLD_ACCOUNT_ACCESS
+        gas_cost += GasCosts.COLD_ACCOUNT_ACCESS
 
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     originator = evm.message.current_target
 
@@ -515,7 +504,7 @@ def selfdestruct(evm: Evm) -> None:
         parent_evm = parent_evm.message.parent_evm
 
     if originator not in refunded_accounts:
-        evm.refund_counter += REFUND_SELF_DESTRUCT
+        evm.refund_counter += GasCosts.REFUND_SELF_DESTRUCT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -523,28 +512,28 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     beneficiary_balance = get_account(
-        evm.message.block_env.state, beneficiary
+        evm.message.tx_env.state, beneficiary
     ).balance
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     # First Transfer to beneficiary
     set_account_balance(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         beneficiary,
         beneficiary_balance + originator_balance,
     )
     # Next, Zero the balance of the address being deleted (must come after
     # sending to beneficiary in case the contract named itself as the
     # beneficiary).
-    set_account_balance(evm.message.block_env.state, originator, U256(0))
+    set_account_balance(evm.message.tx_env.state, originator, U256(0))
 
     # register account for deletion
     evm.accounts_to_delete.add(originator)
 
     # mark beneficiary as touched
-    if account_exists_and_is_empty(evm.message.block_env.state, beneficiary):
+    if account_exists_and_is_empty(evm.message.tx_env.state, beneficiary):
         evm.touched_accounts.add(beneficiary)
 
     # HALT the execution
@@ -582,10 +571,10 @@ def delegatecall(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     message_call_gas = calculate_message_call_gas(
         U256(0), gas, Uint(evm.gas_left), extend_memory.cost, access_gas_cost
@@ -641,10 +630,10 @@ def staticcall(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
 
diff --git a/src/ethereum/forks/berlin/vm/interpreter.py b/src/ethereum/forks/berlin/vm/interpreter.py
index 6edd4cae8ca..eea97094a78 100644
--- a/src/ethereum/forks/berlin/vm/interpreter.py
+++ b/src/ethereum/forks/berlin/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,21 +31,21 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     increment_nonce,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
     touch_account,
 )
 from ..vm import Message
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -63,6 +63,7 @@
 MAX_CODE_SIZE = 0x6000
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -102,12 +103,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -121,9 +122,7 @@ def process_message_call(message: Message) -> MessageCallOutput:
             evm = process_create_message(message)
     else:
         evm = process_message(message)
-        if account_exists_and_is_empty(
-            block_env.state, Address(message.target)
-        ):
+        if account_exists_and_is_empty(tx_state, Address(message.target)):
             evm.touched_accounts.add(Address(message.target))
 
     if evm.error:
@@ -166,34 +165,44 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state)
-
-    # The list of created accounts is used by `get_storage_original`.
-    mark_account_created(state, message.current_target)
-
-    increment_nonce(state, message.current_target)
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts.
+    mark_account_created(tx_state, message.current_target)
+
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             charge_gas(evm, contract_code_gas)
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -212,7 +221,7 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
@@ -239,13 +248,16 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
 
-    touch_account(state, message.current_target)
+    touch_account(tx_state, message.current_target)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -276,9 +288,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state)
-    else:
-        commit_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/berlin/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/berlin/vm/precompiled_contracts/alt_bn128.py
index 214725d8da0..862506c54c3 100644
--- a/src/ethereum/forks/berlin/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/berlin/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(150))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(6000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(34000 * (len(data) // 192) + 45000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/berlin/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/berlin/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/berlin/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/berlin/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/berlin/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/berlin/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/berlin/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/berlin/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/berlin/vm/precompiled_contracts/identity.py b/src/ethereum/forks/berlin/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/berlin/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/berlin/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/berlin/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/berlin/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/berlin/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/berlin/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/berlin/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/berlin/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/berlin/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/berlin/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/bpo1/blocks.py b/src/ethereum/forks/bpo1/blocks.py
index 81cf89f57a6..cd4b2daca34 100644
--- a/src/ethereum/forks/bpo1/blocks.py
+++ b/src/ethereum/forks/bpo1/blocks.py
@@ -10,7 +10,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
@@ -31,6 +31,7 @@
 )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Withdrawal:
@@ -64,6 +65,7 @@ class Withdrawal:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -107,13 +109,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.bpo1.state.state_root
-    [Trie]: ref:ethereum.forks.bpo1.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -123,8 +126,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.bpo1.trie.root
-    [Trie]: ref:ethereum.forks.bpo1.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -134,8 +137,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.bpo1.trie.root
-    [Trie]: ref:ethereum.forks.bpo1.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -244,6 +247,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -297,6 +301,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -329,6 +334,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/bpo1/fork.py b/src/ethereum/forks/bpo1/fork.py
index 3dfd35f98a8..fcdff89d045 100644
--- a/src/ethereum/forks/bpo1/fork.py
+++ b/src/ethereum/forks/bpo1/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Tuple
+from typing import Final, List, Optional, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
@@ -27,7 +27,13 @@
     InvalidSenderError,
     NonceMismatchError,
 )
-from ethereum.state import EMPTY_CODE_HASH, Account, Address
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt, Withdrawal, encode_receipt
@@ -51,19 +57,19 @@
     compute_requests_hash,
     parse_deposit_requests,
 )
-from .state import (
-    State,
-    TransientStorage,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
+    create_ether,
     destroy_account,
+    extract_block_diff,
     get_account,
     get_code,
+    incorporate_tx_into_block,
     increment_nonce,
-    modify_state,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
-    AccessListTransaction,
     BlobTransaction,
     FeeMarketTransaction,
     LegacyTransaction,
@@ -72,17 +78,16 @@
     decode_transaction,
     encode_transaction,
     get_transaction_hash,
+    has_access_list,
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.hexadecimal import hex_to_address
 from .utils.message import prepare_message
 from .vm import Message
 from .vm.eoa_delegation import is_valid_delegation
 from .vm.gas import (
-    BLOB_SCHEDULE_MAX,
-    GAS_PER_BLOB,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_data_fee,
     calculate_excess_blob_gas,
@@ -92,15 +97,15 @@
 
 BASE_FEE_MAX_CHANGE_DENOMINATOR = Uint(8)
 ELASTICITY_MULTIPLIER = Uint(2)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 SYSTEM_ADDRESS = hex_to_address("0xfffffffffffffffffffffffffffffffffffffffe")
 BEACON_ROOTS_ADDRESS = hex_to_address(
     "0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02"
 )
 SYSTEM_TRANSACTION_GAS = Uint(30000000)
-MAX_BLOB_GAS_PER_BLOCK = BLOB_SCHEDULE_MAX * GAS_PER_BLOB
+MAX_BLOB_GAS_PER_BLOCK: Final[U64] = (
+    GasCosts.BLOB_SCHEDULE_MAX * GasCosts.PER_BLOB
+)
 VERSIONED_HASH_VERSION_KZG = b"\x01"
 
 WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS = hex_to_address(
@@ -118,6 +123,7 @@
 BLOB_COUNT_LIMIT = 6
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -223,9 +229,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block.ommers != ():
         raise InvalidBlock
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -242,7 +250,10 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         withdrawals=block.withdrawals,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes, block_diff.storage_changes
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -268,6 +279,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if requests_hash != block.header.requests_hash:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -399,6 +411,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Tuple[Address, Uint, Tuple[VersionedHash, ...], U64]:
     """
     Check if the transaction is includable in the block.
@@ -411,6 +424,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -469,7 +484,7 @@ def check_transaction(
         raise BlobGasLimitExceededError("blob gas limit exceeded")
 
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     if isinstance(
         tx, (FeeMarketTransaction, BlobTransaction, SetCodeTransaction)
@@ -537,7 +552,7 @@ def check_transaction(
 
     if Uint(sender_account.balance) < max_gas_fee + Uint(tx.value):
         raise InsufficientBalanceError("insufficient sender balance")
-    sender_code = get_code(block_env.state, sender_account.code_hash)
+    sender_code = get_code(tx_state, sender_account.code_hash)
     if sender_account.code_hash != EMPTY_CODE_HASH and not is_valid_delegation(
         sender_code
     ):
@@ -588,74 +603,6 @@ def make_receipt(
     return encode_receipt(tx, receipt)
 
 
-def process_system_transaction(
-    block_env: vm.BlockEnvironment,
-    target_address: Address,
-    system_contract_code: Bytes,
-    data: Bytes,
-) -> MessageCallOutput:
-    """
-    Process a system transaction with the given code.
-
-    Prefer calling `process_checked_system_transaction` or
-    `process_unchecked_system_transaction` depending on whether missing code or
-    an execution error should cause the block to be rejected.
-
-    Parameters
-    ----------
-    block_env :
-        The block scoped environment.
-    target_address :
-        Address of the contract to call.
-    system_contract_code :
-        Code of the contract to call.
-    data :
-        Data to pass to the contract.
-
-    Returns
-    -------
-    system_tx_output : `MessageCallOutput`
-        Output of processing the system transaction.
-
-    """
-    tx_env = vm.TransactionEnvironment(
-        origin=SYSTEM_ADDRESS,
-        gas_price=block_env.base_fee_per_gas,
-        gas=SYSTEM_TRANSACTION_GAS,
-        access_list_addresses=set(),
-        access_list_storage_keys=set(),
-        transient_storage=TransientStorage(),
-        blob_versioned_hashes=(),
-        authorizations=(),
-        index_in_block=None,
-        tx_hash=None,
-    )
-
-    system_tx_message = Message(
-        block_env=block_env,
-        tx_env=tx_env,
-        caller=SYSTEM_ADDRESS,
-        target=target_address,
-        gas=SYSTEM_TRANSACTION_GAS,
-        value=U256(0),
-        data=data,
-        code=system_contract_code,
-        depth=Uint(0),
-        current_target=target_address,
-        code_address=target_address,
-        should_transfer_value=False,
-        is_static=False,
-        accessed_addresses=set(),
-        accessed_storage_keys=set(),
-        disable_precompiles=False,
-        parent_evm=None,
-    )
-
-    system_tx_output = process_message_call(system_tx_message)
-
-    return system_tx_output
-
-
 def process_checked_system_transaction(
     block_env: vm.BlockEnvironment,
     target_address: Address,
@@ -680,9 +627,18 @@ def process_checked_system_transaction(
         Output of processing the system transaction.
 
     """
+    # Pre-check that the system contract has code. We use a throwaway
+    # TransactionState here that is *never* propagated back to BlockState
+    # (no incorporate_tx_into_block call); the same get_account / get_code
+    # lookups are performed and properly tracked by
+    # process_unchecked_system_transaction below, which this function
+    # always calls. Reading via a TransactionState (rather than directly
+    # against pre_state) lets us see system contracts deployed earlier in
+    # the same block — see EIP-7002 and EIP-7251 for this edge case.
+    untracked_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        untracked_state,
+        get_account(untracked_state, target_address).code_hash,
     )
 
     if len(system_contract_code) == 0:
@@ -691,10 +647,9 @@ def process_checked_system_transaction(
             "contain code"
         )
 
-    system_tx_output = process_system_transaction(
+    system_tx_output = process_unchecked_system_transaction(
         block_env,
         target_address,
-        system_contract_code,
         data,
     )
 
@@ -713,8 +668,8 @@ def process_unchecked_system_transaction(
     data: Bytes,
 ) -> MessageCallOutput:
     """
-    Process a system transaction without checking if the contract contains code
-    or if the transaction fails.
+    Process a system transaction without checking if the contract contains
+    code or if the transaction fails.
 
     Parameters
     ----------
@@ -731,17 +686,51 @@ def process_unchecked_system_transaction(
         Output of processing the system transaction.
 
     """
+    system_tx_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        system_tx_state,
+        get_account(system_tx_state, target_address).code_hash,
     )
-    return process_system_transaction(
-        block_env,
-        target_address,
-        system_contract_code,
-        data,
+
+    tx_env = vm.TransactionEnvironment(
+        origin=SYSTEM_ADDRESS,
+        gas_price=block_env.base_fee_per_gas,
+        gas=SYSTEM_TRANSACTION_GAS,
+        access_list_addresses=set(),
+        access_list_storage_keys=set(),
+        state=system_tx_state,
+        blob_versioned_hashes=(),
+        authorizations=(),
+        index_in_block=None,
+        tx_hash=None,
+    )
+
+    system_tx_message = Message(
+        block_env=block_env,
+        tx_env=tx_env,
+        caller=SYSTEM_ADDRESS,
+        target=target_address,
+        gas=SYSTEM_TRANSACTION_GAS,
+        value=U256(0),
+        data=data,
+        code=system_contract_code,
+        depth=Uint(0),
+        current_target=target_address,
+        code_address=target_address,
+        should_transfer_value=False,
+        is_static=False,
+        accessed_addresses=set(),
+        accessed_storage_keys=set(),
+        disable_precompiles=False,
+        parent_evm=None,
     )
 
+    system_tx_output = process_message_call(system_tx_message)
+
+    incorporate_tx_into_block(system_tx_state)
+
+    return system_tx_output
+
 
 def apply_body(
     block_env: vm.BlockEnvironment,
@@ -875,6 +864,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(
         block_output.transactions_trie,
         rlp.encode(index),
@@ -892,9 +883,10 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     if isinstance(tx, BlobTransaction):
         blob_gas_fee = calculate_data_fee(block_env.excess_blob_gas, tx)
@@ -904,27 +896,17 @@ def process_transaction(
     effective_gas_fee = tx.gas * effective_gas_price
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     sender_balance_after_gas_fee = (
         Uint(sender_account.balance) - effective_gas_fee - blob_gas_fee
     )
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     access_list_addresses = set()
     access_list_storage_keys = set()
     access_list_addresses.add(block_env.coinbase)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
             access_list_addresses.add(access.account)
             for slot in access.slots:
@@ -940,7 +922,7 @@ def process_transaction(
         gas=gas,
         access_list_addresses=access_list_addresses,
         access_list_storage_keys=access_list_storage_keys,
-        transient_storage=TransientStorage(),
+        state=tx_state,
         blob_versioned_hashes=blob_versioned_hashes,
         authorizations=authorizations,
         index_in_block=index,
@@ -973,23 +955,13 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * priority_fee_per_gas
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
-    coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
-    ).balance + U256(transaction_fee)
-    set_account_balance(
-        block_env.state,
-        block_env.coinbase,
-        coinbase_balance_after_mining_fee,
-    )
+    create_ether(tx_state, block_env.coinbase, U256(transaction_fee))
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
     block_output.block_gas_used += tx_gas_used_after_refund
     block_output.blob_gas_used += tx_blob_gas_used
@@ -1009,6 +981,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def process_withdrawals(
     block_env: vm.BlockEnvironment,
@@ -1018,9 +992,7 @@ def process_withdrawals(
     """
     Increase the balance of the withdrawing account.
     """
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += wd.amount * U256(10**9)
+    wd_state = TransactionState(parent=block_env.state)
 
     for i, wd in enumerate(withdrawals):
         trie_set(
@@ -1029,7 +1001,9 @@ def increase_recipient_balance(recipient: Account) -> None:
             rlp.encode(wd),
         )
 
-        modify_state(block_env.state, wd.address, increase_recipient_balance)
+        create_ether(wd_state, wd.address, wd.amount * U256(10**9))
+
+    incorporate_tx_into_block(wd_state)
 
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
@@ -1038,14 +1012,14 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
-    passed through as a parameter is greater than or equal to the *sum* of
-    the parent's gas and the adjustment delta then the limit for gas is too
-    high and fails this function's check. Similarly, if the limit is less
-    than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
-    check fails because the gas limit doesn't allow for a sufficient or
-    reasonable amount of gas to be used on a block.
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is passed
+    through as a parameter is greater than or equal to the *sum* of the
+    parent's gas and the adjustment delta then the limit for gas is too high
+    and fails this function's check. Similarly, if the limit is less than or
+    equal to the *difference* of the parent's gas and the adjustment delta *or*
+    the predefined ``LIMIT_MINIMUM`` then this function's check fails because
+    the gas limit doesn't allow for a sufficient or reasonable amount of gas to
+    be used on a block.
 
     Parameters
     ----------
@@ -1061,12 +1035,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/bpo1/fork_types.py b/src/ethereum/forks/bpo1/fork_types.py
index c598e9876bf..4bec34810db 100644
--- a/src/ethereum/forks/bpo1/fork_types.py
+++ b/src/ethereum/forks/bpo1/fork_types.py
@@ -12,6 +12,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes256
@@ -43,6 +44,7 @@ def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Authorization:
diff --git a/src/ethereum/forks/bpo1/requests.py b/src/ethereum/forks/bpo1/requests.py
index 542c9264d37..f58e9753196 100644
--- a/src/ethereum/forks/bpo1/requests.py
+++ b/src/ethereum/forks/bpo1/requests.py
@@ -1,11 +1,31 @@
 """
-Requests were introduced in EIP-7685 as a general purpose framework for
-storing contract-triggered requests. It extends the execution header and
-body with a single field each to store the request information.
-This inherently exposes the requests to the consensus layer, which can
-then process each one.
-
+[EIP-7685] generalizes how the execution layer communicates validator actions
+to the consensus layer. Rather than adding a dedicated header field for each
+new action type (as [EIP-4895] did for withdrawals), the execution header
+commits to a single [`requests_hash`][rh] that aggregates an ordered list of
+typed requests.
+
+Each request is a type byte (see [`DEPOSIT_REQUEST_TYPE`][dt],
+[`WITHDRAWAL_REQUEST_TYPE`][wt], and [`CONSOLIDATION_REQUEST_TYPE`][ct])
+followed by an opaque payload. Deposit requests are discovered by scanning
+transaction receipts for logs emitted by the deposit contract; withdrawal
+and consolidation requests are produced by the corresponding system
+contracts during block processing.
+
+See [`parse_deposit_requests`][pd] for how deposit logs become request data,
+[`compute_requests_hash`][crh] for how the list is hashed for inclusion in the
+header, and [`process_general_purpose_requests`][pgpr] for how the requests are
+processed.
+
+[EIP-4895]: https://eips.ethereum.org/EIPS/eip-4895
 [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+[rh]: ref:ethereum.forks.bpo1.blocks.Header.requests_hash
+[dt]: ref:ethereum.forks.bpo1.requests.DEPOSIT_REQUEST_TYPE
+[wt]: ref:ethereum.forks.bpo1.requests.WITHDRAWAL_REQUEST_TYPE
+[ct]: ref:ethereum.forks.bpo1.requests.CONSOLIDATION_REQUEST_TYPE
+[pd]: ref:ethereum.forks.bpo1.requests.parse_deposit_requests
+[crh]: ref:ethereum.forks.bpo1.requests.compute_requests_hash
+[pgpr]: ref:ethereum.forks.bpo1.fork.process_general_purpose_requests
 """
 
 from hashlib import sha256
@@ -15,48 +35,133 @@
 from ethereum_types.numeric import Uint, ulen
 
 from ethereum.exceptions import InvalidBlock
+from ethereum.merkle_patricia_trie import trie_get
 from ethereum.utils.hexadecimal import hex_to_bytes32
 
 from .blocks import decode_receipt
-from .trie import trie_get
 from .utils.hexadecimal import hex_to_address
 from .vm import BlockOutput
 
 DEPOSIT_CONTRACT_ADDRESS = hex_to_address(
     "0x00000000219ab540356cbb839cbe05303d7705fa"
 )
+"""
+Mainnet address of the beacon chain deposit contract. Scanning block
+receipts for logs emitted by this address is how the execution layer
+discovers validator deposits, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 DEPOSIT_EVENT_SIGNATURE_HASH = hex_to_bytes32(
     "0x649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c5"
 )
+"""
+First [log topic] of the deposit contract's `DepositEvent`, equal to the
+keccak256 of its Solidity event signature. Logs whose first topic does not
+match this are ignored when collecting deposit requests.
+
+[log topic]: https://docs.soliditylang.org/en/latest/abi-spec.html#events
+"""
+
 DEPOSIT_REQUEST_TYPE = b"\x00"
+"""
+Request type byte identifying a deposit request, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 WITHDRAWAL_REQUEST_TYPE = b"\x01"
+"""
+Request type byte identifying an execution-triggered withdrawal request,
+per [EIP-7002].
+
+[EIP-7002]: https://eips.ethereum.org/EIPS/eip-7002
+"""
+
 CONSOLIDATION_REQUEST_TYPE = b"\x02"
+"""
+Request type byte identifying a consolidation request, per [EIP-7251].
+
+[EIP-7251]: https://eips.ethereum.org/EIPS/eip-7251
+"""
 
 
 DEPOSIT_EVENT_LENGTH = Uint(576)
+"""
+Total length in bytes of the ABI-encoded `DepositEvent` data payload. Every
+well-formed event has this exact length.
+"""
 
 PUBKEY_OFFSET = Uint(160)
+"""
+Position within the event payload of the validator public key's length
+prefix, as emitted by the Solidity ABI encoder.
+"""
+
 WITHDRAWAL_CREDENTIALS_OFFSET = Uint(256)
+"""
+Position within the event payload of the withdrawal credentials' length
+prefix.
+"""
+
 AMOUNT_OFFSET = Uint(320)
+"""
+Position within the event payload of the deposit amount's length prefix.
+"""
+
 SIGNATURE_OFFSET = Uint(384)
+"""
+Position within the event payload of the deposit signature's length prefix.
+"""
+
 INDEX_OFFSET = Uint(512)
+"""
+Position within the event payload of the deposit index's length prefix.
+"""
 
 PUBKEY_SIZE = Uint(48)
+"""
+Length of the BLS12-381 public key that identifies the validator receiving
+the deposit.
+"""
+
 WITHDRAWAL_CREDENTIALS_SIZE = Uint(32)
+"""
+Length of the withdrawal credentials, which determine where the staked
+ether may eventually be withdrawn.
+"""
+
 AMOUNT_SIZE = Uint(8)
+"""
+Length of the little-endian Gwei amount being deposited.
+"""
+
 SIGNATURE_SIZE = Uint(96)
+"""
+Length of the BLS12-381 signature over the deposit message.
+"""
+
 INDEX_SIZE = Uint(8)
+"""
+Length of the monotonically-increasing deposit index assigned by the
+deposit contract when it emits the event.
+"""
 
 
 def extract_deposit_data(data: Bytes) -> Bytes:
     """
-    Extracts Deposit Request from the DepositContract.DepositEvent data.
+    Strip the Solidity ABI framing from a `DepositEvent` payload and return
+    the concatenated raw fields in the order consumed by the consensus
+    layer: public key, withdrawal credentials, amount, signature, and
+    deposit index.
 
-    Raises
-    ------
-    InvalidBlock :
-        If the deposit contract did not produce a valid log.
+    Because each field has a fixed length, every well-formed event has an
+    identical byte layout. Any deviation indicates a misbehaving or
+    compromised deposit contract, so this function raises [`InvalidBlock`]
+    rather than silently accepting unexpected data.
 
+    [`InvalidBlock`]: ref:ethereum.exceptions.InvalidBlock
     """
     if ulen(data) != DEPOSIT_EVENT_LENGTH:
         raise InvalidBlock("Invalid deposit event data length")
@@ -150,7 +255,19 @@ def extract_deposit_data(data: Bytes) -> Bytes:
 
 def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
     """
-    Parse deposit requests from the block output.
+    Walk the receipts produced during block execution, concatenating the
+    raw payload of every valid deposit event into a single byte string.
+
+    A log is considered a deposit when it originates from
+    [`DEPOSIT_CONTRACT_ADDRESS`][addr] and its first topic matches
+    [`DEPOSIT_EVENT_SIGNATURE_HASH`][sig]. The returned bytes are the
+    direct concatenation of the unframed deposit fields, ready to be
+    prefixed with [`DEPOSIT_REQUEST_TYPE`][dt] before being appended to
+    the block's request list.
+
+    [addr]: ref:ethereum.forks.bpo1.requests.DEPOSIT_CONTRACT_ADDRESS
+    [sig]: ref:ethereum.forks.bpo1.requests.DEPOSIT_EVENT_SIGNATURE_HASH
+    [dt]: ref:ethereum.forks.bpo1.requests.DEPOSIT_REQUEST_TYPE
     """
     deposit_requests: Bytes = b""
     for key in block_output.receipt_keys:
@@ -171,18 +288,18 @@ def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
 
 def compute_requests_hash(requests: List[Bytes]) -> Bytes:
     """
-    Get the hash of the requests using the SHA2-256 algorithm.
-
-    Parameters
-    ----------
-    requests : Bytes
-        The requests to hash.
-
-    Returns
-    -------
-    requests_hash : Bytes
-        The hash of the requests.
-
+    Compute the [SHA2-256] commitment over an ordered list of
+    type-prefixed requests, as defined by [EIP-7685].
+
+    The commitment is the SHA2-256 hash of the concatenation of the
+    SHA2-256 hashes of each individual request. This is what the
+    execution header's [`requests_hash`][rh] stores, and what the
+    consensus layer re-derives to validate that both layers observed the
+    same set of requests.
+
+    [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+    [SHA2-256]: https://en.wikipedia.org/wiki/SHA-2
+    [rh]: ref:ethereum.forks.bpo1.blocks.Header.requests_hash
     """
     m = sha256()
     for request in requests:
diff --git a/src/ethereum/forks/bpo1/state.py b/src/ethereum/forks/bpo1/state.py
deleted file mode 100644
index 342bda1a1cd..00000000000
--- a/src/ethereum/forks/bpo1/state.py
+++ /dev/null
@@ -1,713 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-from ethereum.state import (
-    EMPTY_ACCOUNT,
-    EMPTY_CODE_HASH,
-    Account,
-    Address,
-    Root,
-)
-
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-    def get_code(self, code_hash: Hash32) -> Bytes:
-        """
-        Get the bytecode for a given code hash.
-
-        Return ``b""`` for ``EMPTY_CODE_HASH``.
-        """
-        if code_hash == EMPTY_CODE_HASH:
-            return b""
-        return self._code_store[code_hash]
-
-
-@dataclass
-class TransientStorage:
-    """
-    Contains all information that is preserved between message calls
-    within a transaction.
-    """
-
-    _tries: Dict[Address, Trie[Bytes32, U256]] = field(default_factory=dict)
-    _snapshots: List[Dict[Address, Trie[Bytes32, U256]]] = field(
-        default_factory=list
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-
-
-def begin_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-    transient_storage._snapshots.append(
-        {k: copy_trie(t) for (k, t) in transient_storage._tries.items()}
-    )
-
-
-def commit_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._snapshots.pop()
-
-
-def rollback_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._tries = transient_storage._snapshots.pop()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-
-    Return ``b""`` for ``EMPTY_CODE_HASH``.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State`` and return its hash.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase, and to respect the constraints added to SELFDESTRUCT by
-    EIP-6780.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`. If, after modification, the account
-    exists and has zero nonce, empty code, and zero balance, it is destroyed.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-    account = get_account_optional(state, address)
-    account_exists_and_is_empty = (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-    if account_exists_and_is_empty:
-        destroy_account(state, address)
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
-
-
-def get_transient_storage(
-    transient_storage: TransientStorage, address: Address, key: Bytes32
-) -> U256:
-    """
-    Get a value at a storage key on an account from transient storage.
-    Returns `U256(0)` if the storage key has not been set previously.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_transient_storage(
-    transient_storage: TransientStorage,
-    address: Address,
-    key: Bytes32,
-    value: U256,
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        transient_storage._tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del transient_storage._tries[address]
diff --git a/src/ethereum/forks/bpo1/state_tracker.py b/src/ethereum/forks/bpo1/state_tracker.py
new file mode 100644
index 00000000000..67ceaa86321
--- /dev/null
+++ b/src/ethereum/forks/bpo1/state_tracker.py
@@ -0,0 +1,749 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state. If, after modification, the
+    account exists and has zero nonce, empty code, and zero balance, it
+    is destroyed.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+    if account_exists_and_is_empty(tx_state, address):
+        destroy_account(tx_state, address)
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+    )
diff --git a/src/ethereum/forks/bpo1/transactions.py b/src/ethereum/forks/bpo1/transactions.py
index 048852529e4..18953538456 100644
--- a/src/ethereum/forks/bpo1/transactions.py
+++ b/src/ethereum/forks/bpo1/transactions.py
@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, TypeGuard, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -28,46 +28,10 @@
 )
 from .fork_types import Authorization, VersionedHash
 
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_TOKEN_FLOOR = Uint(10)
-"""
-Minimum gas cost per byte of calldata as per [EIP-7623]. Used to calculate
-the minimum gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_DATA_TOKEN_STANDARD = Uint(4)
-"""
-Gas cost per byte of calldata as per [EIP-7623]. Used to calculate the
-gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
-
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
-"""
-
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
-"""
-
 TX_MAX_GAS_LIMIT = Uint(16_777_216)
 
 
+@final
 @slotted_freezable
 @dataclass
 class LegacyTransaction:
@@ -130,6 +94,7 @@ class LegacyTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Access:
@@ -149,6 +114,7 @@ class Access:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccessListTransaction:
@@ -221,6 +187,7 @@ class AccessListTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class FeeMarketTransaction:
@@ -298,6 +265,7 @@ class FeeMarketTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class BlobTransaction:
@@ -386,6 +354,7 @@ class BlobTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class SetCodeTransaction:
@@ -481,6 +450,23 @@ class SetCodeTransaction:
 """
 
 
+AccessListCapableTransaction = (
+    AccessListTransaction
+    | FeeMarketTransaction
+    | BlobTransaction
+    | SetCodeTransaction
+)
+"""
+Transaction types that include an [EIP-2930]-style access list.
+
+See [`has_access_list`][hal] and [`Access`][a] for more details.
+
+[EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+[hal]: ref:ethereum.forks.amsterdam.transactions.has_access_list
+[a]: ref:ethereum.forks.amsterdam.transactions.Access
+"""
+
+
 def encode_transaction(tx: Transaction) -> LegacyTransaction | Bytes:
     """
     Encode a transaction into its RLP or typed transaction format.
@@ -584,7 +570,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
     4. Cost for access list entries (if applicable)
@@ -595,8 +581,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     gas cost of the transaction and the minimum gas cost used by the
     transaction based on the calldata size.
     """
-    from .vm.eoa_delegation import GAS_AUTH_PER_EMPTY_ACCOUNT
-    from .vm.gas import init_code_cost
+    from .vm.gas import GasCosts, init_code_cost
 
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
@@ -604,39 +589,33 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     tokens_in_calldata = num_zeros + num_non_zeros * Uint(4)
     # EIP-7623 floor price (note: no EVM costs)
     calldata_floor_gas_cost = (
-        tokens_in_calldata * GAS_TX_DATA_TOKEN_FLOOR + GAS_TX_BASE
+        tokens_in_calldata * GasCosts.TX_DATA_TOKEN_FLOOR + GasCosts.TX_BASE
     )
 
-    data_cost = tokens_in_calldata * GAS_TX_DATA_TOKEN_STANDARD
+    data_cost = tokens_in_calldata * GasCosts.TX_DATA_TOKEN_STANDARD
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE + init_code_cost(ulen(tx.data))
+        create_cost = GasCosts.TX_CREATE + init_code_cost(ulen(tx.data))
     else:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
-            access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_cost += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
 
     auth_cost = Uint(0)
     if isinstance(tx, SetCodeTransaction):
-        auth_cost += Uint(GAS_AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations))
+        auth_cost += Uint(
+            GasCosts.AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations)
+        )
 
     return (
         Uint(
-            GAS_TX_BASE
+            GasCosts.TX_BASE
             + data_cost
             + create_cost
             + access_list_cost
@@ -884,3 +863,17 @@ def get_transaction_hash(tx: Bytes | LegacyTransaction) -> Hash32:
         return keccak256(rlp.encode(tx))
     else:
         return keccak256(tx)
+
+
+def has_access_list(
+    tx: Transaction,
+) -> TypeGuard[AccessListCapableTransaction]:
+    """
+    Return whether the transaction has an [EIP-2930]-style access list.
+
+    [EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+    """
+    return isinstance(
+        tx,
+        AccessListCapableTransaction,
+    )
diff --git a/src/ethereum/forks/bpo1/trie.py b/src/ethereum/forks/bpo1/trie.py
deleted file mode 100644
index 535df949e18..00000000000
--- a/src/ethereum/forks/bpo1/trie.py
+++ /dev/null
@@ -1,509 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-from typing_extensions import assert_type
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.osaka import trie as previous_trie
-from ethereum.state import Account, Address, Root
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt, Withdrawal
-from .fork_types import encode_account
-from .transactions import LegacyTransaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = (
-    Account
-    | Bytes
-    | LegacyTransaction
-    | Receipt
-    | Uint
-    | U256
-    | Withdrawal
-    | None
-)
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[LegacyTransaction | Bytes],
-    Optional[Receipt | Bytes],
-    Optional[Withdrawal | Bytes],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `Extended`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (LegacyTransaction, Receipt, Withdrawal, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/bpo1/utils/message.py b/src/ethereum/forks/bpo1/utils/message.py
index a8136167cc4..5137add445e 100644
--- a/src/ethereum/forks/bpo1/utils/message.py
+++ b/src/ethereum/forks/bpo1/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
@@ -55,7 +55,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -63,8 +63,9 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        state = block_env.state
-        code = get_code(state, get_account(state, tx.to).code_hash)
+        code = get_code(
+            tx_env.state, get_account(tx_env.state, tx.to).code_hash
+        )
         code_address = tx.to
     else:
         raise AssertionError("Target must be address or empty bytes")
diff --git a/src/ethereum/forks/bpo1/vm/__init__.py b/src/ethereum/forks/bpo1/vm/__init__.py
index 37d0a327974..42229ebd849 100644
--- a/src/ethereum/forks/bpo1/vm/__init__.py
+++ b/src/ethereum/forks/bpo1/vm/__init__.py
@@ -13,24 +13,25 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt, Withdrawal
 from ..fork_types import Authorization, VersionedHash
-from ..state import State, TransientStorage
+from ..state_tracker import BlockState, TransactionState
 from ..transactions import LegacyTransaction
-from ..trie import Trie
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +39,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -50,6 +51,7 @@ class BlockEnvironment:
     parent_beacon_block_root: Hash32
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -92,10 +94,11 @@ class BlockOutput:
     requests: List[Bytes] = field(default_factory=list)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
@@ -103,13 +106,14 @@ class TransactionEnvironment:
     gas: Uint
     access_list_addresses: Set[Address]
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
-    transient_storage: TransientStorage
+    state: TransactionState
     blob_versioned_hashes: Tuple[VersionedHash, ...]
     authorizations: Tuple[Authorization, ...]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -135,6 +139,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
diff --git a/src/ethereum/forks/bpo1/vm/eoa_delegation.py b/src/ethereum/forks/bpo1/vm/eoa_delegation.py
index fce580bee4a..1ba552f8dd6 100644
--- a/src/ethereum/forks/bpo1/vm/eoa_delegation.py
+++ b/src/ethereum/forks/bpo1/vm/eoa_delegation.py
@@ -14,7 +14,7 @@
 from ethereum.state import Address
 
 from ..fork_types import Authorization
-from ..state import (
+from ..state_tracker import (
     account_exists,
     get_account,
     get_code,
@@ -22,14 +22,13 @@
     set_code,
 )
 from ..utils.hexadecimal import hex_to_address
-from ..vm.gas import GAS_COLD_ACCOUNT_ACCESS, GAS_WARM_ACCESS
+from ..vm.gas import GasCosts
 from . import Evm, Message
 
 SET_CODE_TX_MAGIC = b"\x05"
 EOA_DELEGATION_MARKER = b"\xef\x01\x00"
 EOA_DELEGATION_MARKER_LENGTH = len(EOA_DELEGATION_MARKER)
 EOA_DELEGATED_CODE_LENGTH = 23
-GAS_AUTH_PER_EMPTY_ACCOUNT = 25000
 REFUND_AUTH_PER_EXISTING_ACCOUNT = 12500
 NULL_ADDRESS = hex_to_address("0x0000000000000000000000000000000000000000")
 
@@ -140,18 +139,18 @@ def access_delegation(
         The delegation address, code, and access gas cost.
 
     """
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
     if not is_valid_delegation(code):
         return False, address, code, Uint(0)
 
     address = Address(code[EOA_DELEGATION_MARKER_LENGTH:])
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
-    code = get_code(state, get_account(state, address).code_hash)
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     return True, address, code, access_gas_cost
 
@@ -171,7 +170,7 @@ def set_delegation(message: Message) -> U256:
         Refund from authority which already exists in state.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     for auth in message.tx_env.authorizations:
         if auth.chain_id not in (message.block_env.chain_id, U256(0)):
@@ -187,8 +186,8 @@ def set_delegation(message: Message) -> U256:
 
         message.accessed_addresses.add(authority)
 
-        authority_account = get_account(state, authority)
-        authority_code = get_code(state, authority_account.code_hash)
+        authority_account = get_account(tx_state, authority)
+        authority_code = get_code(tx_state, authority_account.code_hash)
 
         if authority_code and not is_valid_delegation(authority_code):
             continue
@@ -197,24 +196,25 @@ def set_delegation(message: Message) -> U256:
         if authority_nonce != auth.nonce:
             continue
 
-        if account_exists(state, authority):
+        if account_exists(tx_state, authority):
             refund_counter += U256(
-                GAS_AUTH_PER_EMPTY_ACCOUNT - REFUND_AUTH_PER_EXISTING_ACCOUNT
+                GasCosts.AUTH_PER_EMPTY_ACCOUNT
+                - REFUND_AUTH_PER_EXISTING_ACCOUNT
             )
 
         if auth.address == NULL_ADDRESS:
             code_to_set = b""
         else:
             code_to_set = EOA_DELEGATION_MARKER + auth.address
-        set_code(state, authority, code_to_set)
+        set_code(tx_state, authority, code_to_set)
 
-        increment_nonce(state, authority)
+        increment_nonce(tx_state, authority)
 
     if message.code_address is None:
         raise InvalidBlock("Invalid type 4 transaction: no target")
 
     message.code = get_code(
-        state, get_account(state, message.code_address).code_hash
+        tx_state, get_account(tx_state, message.code_address).code_hash
     )
 
     return refund_counter
diff --git a/src/ethereum/forks/bpo1/vm/gas.py b/src/ethereum/forks/bpo1/vm/gas.py
index 8b2e13fa8b5..4d7fe3f4c32 100644
--- a/src/ethereum/forks/bpo1/vm/gas.py
+++ b/src/ethereum/forks/bpo1/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U64, U256, Uint
+from ethereum_types.numeric import U64, U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32, taylor_exponential
@@ -24,67 +24,172 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 4800
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-GAS_ECRECOVER = Uint(3000)
-GAS_P256VERIFY = Uint(6900)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1)
-GAS_COLD_SLOAD = Uint(2100)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600)
-GAS_WARM_ACCESS = Uint(100)
-GAS_CODE_INIT_PER_WORD = Uint(2)
-GAS_BLOBHASH_OPCODE = Uint(3)
-GAS_POINT_EVALUATION = Uint(50000)
-
-GAS_PER_BLOB = U64(2**17)
-BLOB_SCHEDULE_TARGET = U64(10)
-BLOB_TARGET_GAS_PER_BLOCK = GAS_PER_BLOB * BLOB_SCHEDULE_TARGET
-BLOB_BASE_COST = Uint(2**13)
-BLOB_SCHEDULE_MAX = U64(15)
-BLOB_MIN_GASPRICE = Uint(1)
-BLOB_BASE_FEE_UPDATE_FRACTION = Uint(8346193)
-
-GAS_BLS_G1_ADD = Uint(375)
-GAS_BLS_G1_MUL = Uint(12000)
-GAS_BLS_G1_MAP = Uint(5500)
-GAS_BLS_G2_ADD = Uint(600)
-GAS_BLS_G2_MUL = Uint(22500)
-GAS_BLS_G2_MAP = Uint(23800)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    WARM_ACCESS: Final[Uint] = Uint(100)
+    COLD_ACCOUNT_ACCESS: Final[Uint] = Uint(2600)
+    COLD_STORAGE_ACCESS: Final[Uint] = Uint(2100)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+    CODE_INIT_PER_WORD: Final[Uint] = Uint(2)
+
+    # Authorization
+    AUTH_PER_EMPTY_ACCOUNT: Final[int] = 25000
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 4800
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_P256VERIFY: Final[Uint] = Uint(6900)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1)
+    PRECOMPILE_POINT_EVALUATION: Final[Uint] = Uint(50000)
+    PRECOMPILE_BLS_G1ADD: Final[Uint] = Uint(375)
+    PRECOMPILE_BLS_G1MUL: Final[Uint] = Uint(12000)
+    PRECOMPILE_BLS_G1MAP: Final[Uint] = Uint(5500)
+    PRECOMPILE_BLS_G2ADD: Final[Uint] = Uint(600)
+    PRECOMPILE_BLS_G2MUL: Final[Uint] = Uint(22500)
+    PRECOMPILE_BLS_G2MAP: Final[Uint] = Uint(23800)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000)
+
+    # Blobs
+    PER_BLOB: Final[U64] = U64(2**17)
+    BLOB_SCHEDULE_TARGET: Final[U64] = U64(10)
+    BLOB_TARGET_GAS_PER_BLOCK: Final[U64] = PER_BLOB * BLOB_SCHEDULE_TARGET
+    BLOB_BASE_COST: Final[Uint] = Uint(2**13)
+    BLOB_SCHEDULE_MAX: Final[U64] = U64(15)
+    BLOB_MIN_GASPRICE: Final[Uint] = Uint(1)
+    BLOB_BASE_FEE_UPDATE_FRACTION: Final[Uint] = Uint(8346193)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_TOKEN_STANDARD: Final[Uint] = Uint(4)
+    TX_DATA_TOKEN_FLOOR: Final[Uint] = Uint(10)
+    TX_ACCESS_LIST_ADDRESS: Final[Uint] = Uint(2400)
+    TX_ACCESS_LIST_STORAGE_KEY: Final[Uint] = Uint(1900)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_CLZ: Final[Uint] = LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_PREVRANDAO: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_BASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBBASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBHASH: Final[Uint] = Uint(3)
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_PUSH0: Final[Uint] = BASE
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MCOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -100,11 +205,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -156,7 +262,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -186,7 +292,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -211,7 +317,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
@@ -283,7 +389,7 @@ def init_code_cost(init_code_length: Uint) -> Uint:
         The gas to be charged for the init code.
 
     """
-    return GAS_CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
+    return GasCosts.CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
 
 
 def calculate_excess_blob_gas(parent_header: Header) -> U64:
@@ -314,21 +420,23 @@ def calculate_excess_blob_gas(parent_header: Header) -> U64:
         base_fee_per_gas = parent_header.base_fee_per_gas
 
     parent_blob_gas = excess_blob_gas + blob_gas_used
-    if parent_blob_gas < BLOB_TARGET_GAS_PER_BLOCK:
+    if parent_blob_gas < GasCosts.BLOB_TARGET_GAS_PER_BLOCK:
         return U64(0)
 
-    target_blob_gas_price = Uint(GAS_PER_BLOB)
+    target_blob_gas_price = Uint(GasCosts.PER_BLOB)
     target_blob_gas_price *= calculate_blob_gas_price(excess_blob_gas)
 
-    base_blob_tx_price = BLOB_BASE_COST * base_fee_per_gas
+    base_blob_tx_price = GasCosts.BLOB_BASE_COST * base_fee_per_gas
     if base_blob_tx_price > target_blob_gas_price:
-        blob_schedule_delta = BLOB_SCHEDULE_MAX - BLOB_SCHEDULE_TARGET
+        blob_schedule_delta = (
+            GasCosts.BLOB_SCHEDULE_MAX - GasCosts.BLOB_SCHEDULE_TARGET
+        )
         return (
             excess_blob_gas
-            + blob_gas_used * blob_schedule_delta // BLOB_SCHEDULE_MAX
+            + blob_gas_used * blob_schedule_delta // GasCosts.BLOB_SCHEDULE_MAX
         )
 
-    return parent_blob_gas - BLOB_TARGET_GAS_PER_BLOCK
+    return parent_blob_gas - GasCosts.BLOB_TARGET_GAS_PER_BLOCK
 
 
 def calculate_total_blob_gas(tx: Transaction) -> U64:
@@ -347,7 +455,7 @@ def calculate_total_blob_gas(tx: Transaction) -> U64:
 
     """
     if isinstance(tx, BlobTransaction):
-        return GAS_PER_BLOB * U64(len(tx.blob_versioned_hashes))
+        return GasCosts.PER_BLOB * U64(len(tx.blob_versioned_hashes))
     else:
         return U64(0)
 
@@ -368,9 +476,9 @@ def calculate_blob_gas_price(excess_blob_gas: U64) -> Uint:
 
     """
     return taylor_exponential(
-        BLOB_MIN_GASPRICE,
+        GasCosts.BLOB_MIN_GASPRICE,
         Uint(excess_blob_gas),
-        BLOB_BASE_FEE_UPDATE_FRACTION,
+        GasCosts.BLOB_BASE_FEE_UPDATE_FRACTION,
     )
 
 
diff --git a/src/ethereum/forks/bpo1/vm/instructions/arithmetic.py b/src/ethereum/forks/bpo1/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/bpo1/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/bpo1/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/bpo1/vm/instructions/bitwise.py b/src/ethereum/forks/bpo1/vm/instructions/bitwise.py
index cc6fa2fbb23..7674d3c720f 100644
--- a/src/ethereum/forks/bpo1/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/bpo1/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_LOW, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +172,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +202,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +232,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
@@ -262,7 +265,7 @@ def count_leading_zeros(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CLZ)
 
     # OPERATION
     bit_length = U256(x.bit_length())
diff --git a/src/ethereum/forks/bpo1/vm/instructions/block.py b/src/ethereum/forks/bpo1/vm/instructions/block.py
index 75810aacd39..7e32893722b 100644
--- a/src/ethereum/forks/bpo1/vm/instructions/block.py
+++ b/src/ethereum/forks/bpo1/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -40,7 +40,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -89,7 +89,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -123,7 +123,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -156,7 +156,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -189,7 +189,7 @@ def prev_randao(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PREVRANDAO)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.prev_randao))
@@ -222,7 +222,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -252,7 +252,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/bpo1/vm/instructions/comparison.py b/src/ethereum/forks/bpo1/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/bpo1/vm/instructions/comparison.py
+++ b/src/ethereum/forks/bpo1/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/bpo1/vm/instructions/control_flow.py b/src/ethereum/forks/bpo1/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/bpo1/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/bpo1/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/bpo1/vm/instructions/environment.py b/src/ethereum/forks/bpo1/vm/instructions/environment.py
index 5848530a960..b6bf713df27 100644
--- a/src/ethereum/forks/bpo1/vm/instructions/environment.py
+++ b/src/ethereum/forks/bpo1/vm/instructions/environment.py
@@ -17,20 +17,13 @@
 from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BASE,
-    GAS_BLOBHASH_OPCODE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_COPY,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
-    GAS_WARM_ACCESS,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_gas_extend_memory,
     charge_gas,
@@ -52,7 +45,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -76,14 +69,15 @@ def balance(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_addresses.add(address)
-        charge_gas(evm, GAS_COLD_ACCOUNT_ACCESS)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -106,7 +100,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -129,7 +123,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -152,7 +146,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -176,7 +170,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -201,7 +195,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -230,11 +224,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -259,7 +256,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -288,11 +285,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -317,7 +317,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -341,16 +341,16 @@ def extcodesize(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -377,23 +377,23 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
 
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost + copy_gas_cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -416,7 +416,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -442,11 +442,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -475,15 +480,15 @@ def extcodehash(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -510,12 +515,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
@@ -538,7 +543,7 @@ def base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BASEFEE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.base_fee_per_gas))
@@ -561,7 +566,7 @@ def blob_hash(evm: Evm) -> None:
     index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BLOBHASH_OPCODE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBHASH)
 
     # OPERATION
     if int(index) < len(evm.message.tx_env.blob_versioned_hashes):
@@ -588,7 +593,7 @@ def blob_base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBBASEFEE)
 
     # OPERATION
     blob_base_fee = calculate_blob_gas_price(
diff --git a/src/ethereum/forks/bpo1/vm/instructions/keccak.py b/src/ethereum/forks/bpo1/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/bpo1/vm/instructions/keccak.py
+++ b/src/ethereum/forks/bpo1/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/bpo1/vm/instructions/log.py b/src/ethereum/forks/bpo1/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/bpo1/vm/instructions/log.py
+++ b/src/ethereum/forks/bpo1/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/bpo1/vm/instructions/memory.py b/src/ethereum/forks/bpo1/vm/instructions/memory.py
index 6e111051ee3..bba3ddf19d5 100644
--- a/src/ethereum/forks/bpo1/vm/instructions/memory.py
+++ b/src/ethereum/forks/bpo1/vm/instructions/memory.py
@@ -18,9 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_COPY,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -49,7 +47,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -80,7 +78,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -108,7 +106,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -135,7 +133,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
@@ -161,12 +159,15 @@ def mcopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(length)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
 
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(source, length), (destination, length)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_MCOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/bpo1/vm/instructions/stack.py b/src/ethereum/forks/bpo1/vm/instructions/stack.py
index 0007a28acd4..ce94af6ce8e 100644
--- a/src/ethereum/forks/bpo1/vm/instructions/stack.py
+++ b/src/ethereum/forks/bpo1/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -63,9 +67,9 @@ def push_n(evm: Evm, num_bytes: int) -> None:
 
     # GAS
     if num_bytes == 0:
-        charge_gas(evm, GAS_BASE)
+        charge_gas(evm, GasCosts.OPCODE_PUSH0)
     else:
-        charge_gas(evm, GAS_VERY_LOW)
+        charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -95,7 +99,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -127,7 +131,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -139,70 +143,70 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push0 = partial(push_n, num_bytes=0)
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push0: Callable[[Evm], None] = partial(push_n, num_bytes=0)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/bpo1/vm/instructions/storage.py b/src/ethereum/forks/bpo1/vm/instructions/storage.py
index 084d58cc46c..99dcce877dd 100644
--- a/src/ethereum/forks/bpo1/vm/instructions/storage.py
+++ b/src/ethereum/forks/bpo1/vm/instructions/storage.py
@@ -13,7 +13,7 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import (
+from ...state_tracker import (
     get_storage,
     get_storage_original,
     get_transient_storage,
@@ -23,12 +23,7 @@
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -50,15 +45,14 @@ def sload(evm: Evm) -> None:
 
     # GAS
     if (evm.message.current_target, key) in evm.accessed_storage_keys:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        charge_gas(evm, GAS_COLD_SLOAD)
+        charge_gas(evm, GasCosts.COLD_STORAGE_ACCESS)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -79,54 +73,60 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     gas_cost = Uint(0)
 
     if (evm.message.current_target, key) not in evm.accessed_storage_keys:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        gas_cost += GAS_COLD_SLOAD
+        gas_cost += GasCosts.COLD_STORAGE_ACCESS
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost += GAS_STORAGE_SET
+            gas_cost += GasCosts.STORAGE_SET
         else:
-            gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_SLOAD
+            gas_cost += (
+                GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
+            )
     else:
-        gas_cost += GAS_WARM_ACCESS
+        gas_cost += GasCosts.WARM_ACCESS
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
             # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
             # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
             # Storage slot being restored to its original value
             if original_value == 0:
                 # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_WARM_ACCESS)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.WARM_ACCESS
+                )
             else:
                 # Slot was originally non-empty and was UPDATED earlier
                 evm.refund_counter += int(
-                    GAS_STORAGE_UPDATE - GAS_COLD_SLOAD - GAS_WARM_ACCESS
+                    GasCosts.COLD_STORAGE_WRITE
+                    - GasCosts.COLD_STORAGE_ACCESS
+                    - GasCosts.WARM_ACCESS
                 )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
@@ -147,11 +147,11 @@ def tload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
 
     # OPERATION
     value = get_transient_storage(
-        evm.message.tx_env.transient_storage, evm.message.current_target, key
+        evm.message.tx_env.state, evm.message.current_target, key
     )
     push(evm.stack, value)
 
@@ -174,11 +174,11 @@ def tstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
     if evm.message.is_static:
         raise WriteInStaticContext
     set_transient_storage(
-        evm.message.tx_env.transient_storage,
+        evm.message.tx_env.state,
         evm.message.current_target,
         key,
         new_value,
diff --git a/src/ethereum/forks/bpo1/vm/instructions/system.py b/src/ethereum/forks/bpo1/vm/instructions/system.py
index 29c3fe9e6e2..092c6fb68c2 100644
--- a/src/ethereum/forks/bpo1/vm/instructions/system.py
+++ b/src/ethereum/forks/bpo1/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
     get_account,
@@ -40,15 +40,7 @@
 )
 from ..exceptions import OutOfGasError, Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -90,7 +82,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -104,15 +96,13 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -166,14 +156,17 @@ def create(evm: Evm) -> None:
     )
     init_code_gas = init_code_cost(Uint(memory_size))
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost + init_code_gas)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CREATE_BASE + extend_memory.cost + init_code_gas,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -216,8 +209,8 @@ def create2(evm: Evm) -> None:
     init_code_gas = init_code_cost(Uint(memory_size))
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost
         + init_code_gas,
     )
@@ -261,7 +254,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -374,10 +367,10 @@ def call(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
@@ -388,10 +381,10 @@ def call(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -404,7 +397,7 @@ def call(evm: Evm) -> None:
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -463,10 +456,10 @@ def callcode(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -476,7 +469,7 @@ def callcode(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -489,7 +482,7 @@ def callcode(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -531,19 +524,19 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if beneficiary not in evm.accessed_addresses:
         evm.accessed_addresses.add(beneficiary)
-        gas_cost += GAS_COLD_ACCOUNT_ACCESS
+        gas_cost += GasCosts.COLD_ACCOUNT_ACCESS
 
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -551,11 +544,11 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     move_ether(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         originator,
         beneficiary,
         originator_balance,
@@ -563,10 +556,10 @@ def selfdestruct(evm: Evm) -> None:
 
     # register account for deletion only if it was created
     # in the same transaction
-    if originator in evm.message.block_env.state.created_accounts:
+    if originator in evm.message.tx_env.state.created_accounts:
         # If beneficiary is the same as originator, then
         # the ether is burnt.
-        set_account_balance(evm.message.block_env.state, originator, U256(0))
+        set_account_balance(evm.message.tx_env.state, originator, U256(0))
         evm.accounts_to_delete.add(originator)
 
     # HALT the execution
@@ -604,10 +597,10 @@ def delegatecall(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -673,10 +666,10 @@ def staticcall(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
diff --git a/src/ethereum/forks/bpo1/vm/interpreter.py b/src/ethereum/forks/bpo1/vm/interpreter.py
index 9c05883b7dc..64ffe56e7b8 100644
--- a/src/ethereum/forks/bpo1/vm/interpreter.py
+++ b/src/ethereum/forks/bpo1/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,22 +31,22 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     get_account,
     get_code,
     increment_nonce,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
 )
 from ..vm import Message
 from ..vm.eoa_delegation import get_delegated_code_address, set_delegation
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -66,6 +66,7 @@
 MAX_INIT_CODE_SIZE = 2 * MAX_CODE_SIZE
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -105,12 +106,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -131,8 +132,8 @@ def process_message_call(message: Message) -> MessageCallOutput:
             message.disable_precompiles = True
             message.accessed_addresses.add(delegated_address)
             message.code = get_code(
-                block_env.state,
-                get_account(block_env.state, delegated_address).code_hash,
+                tx_state,
+                get_account(tx_state, delegated_address).code_hash,
             )
             message.code_address = delegated_address
 
@@ -176,22 +177,31 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
-    transient_storage = message.tx_env.transient_storage
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
-
-    # The list of created accounts is used by `get_storage_original`.
-    # Additionally, the list is needed to respect the constraints
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts. This tracking is also needed to respect the constraints
     # added to SELFDESTRUCT by EIP-6780.
-    mark_account_created(state, message.current_target)
+    mark_account_created(tx_state, message.current_target)
 
-    increment_nonce(state, message.current_target)
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             if len(contract_code) > 0:
@@ -201,15 +211,14 @@ def process_create_message(message: Message) -> Evm:
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state, transient_storage)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state, transient_storage)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -228,11 +237,10 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
-    transient_storage = message.tx_env.transient_storage
     code = message.code
     valid_jump_destinations = get_valid_jump_destinations(code)
     evm = Evm(
@@ -255,11 +263,14 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
+    snapshot = copy_tx_state(tx_state)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -291,9 +302,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state, transient_storage)
-    else:
-        commit_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/bpo1/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/bpo1/vm/precompiled_contracts/alt_bn128.py
index 214725d8da0..862506c54c3 100644
--- a/src/ethereum/forks/bpo1/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/bpo1/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(150))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(6000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(34000 * (len(data) // 192) + 45000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/bpo1/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/bpo1/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/bpo1/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/bpo1/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/bpo1/vm/precompiled_contracts/bls12_381/__init__.py b/src/ethereum/forks/bpo1/vm/precompiled_contracts/bls12_381/__init__.py
index c99e7573f48..7d622da39d1 100644
--- a/src/ethereum/forks/bpo1/vm/precompiled_contracts/bls12_381/__init__.py
+++ b/src/ethereum/forks/bpo1/vm/precompiled_contracts/bls12_381/__init__.py
@@ -414,7 +414,7 @@ def decode_g1_scalar_pair(
 
     """
     if len(data) != 160:
-        InvalidParameter("Input should be 160 bytes long")
+        raise InvalidParameter("Input should be 160 bytes long")
 
     point = bytes_to_g1(data[:128], subgroup_check=True)
 
@@ -614,7 +614,7 @@ def decode_g2_scalar_pair(
 
     """
     if len(data) != 288:
-        InvalidParameter("Input should be 288 bytes long")
+        raise InvalidParameter("Input should be 288 bytes long")
 
     point = bytes_to_g2(data[:256], subgroup_check=True)
     n = int.from_bytes(data[256 : 256 + 32], "big")
diff --git a/src/ethereum/forks/bpo1/vm/precompiled_contracts/bls12_381/bls12_381_g1.py b/src/ethereum/forks/bpo1/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
index ae8eeba0ce6..d1f63224a0c 100644
--- a/src/ethereum/forks/bpo1/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
+++ b/src/ethereum/forks/bpo1/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G1_ADD,
-    GAS_BLS_G1_MAP,
-    GAS_BLS_G1_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -60,7 +58,7 @@ def bls12_g1_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1ADD)
 
     # OPERATION
     p1 = bytes_to_g1(buffer_read(data, U256(0), U256(128)))
@@ -101,7 +99,7 @@ def bls12_g1_msm(evm: Evm) -> None:
     else:
         discount = Uint(G1_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G1_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G1MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -140,7 +138,7 @@ def bls12_map_fp_to_g1(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1MAP)
 
     # OPERATION
     fp = int.from_bytes(data, "big")
diff --git a/src/ethereum/forks/bpo1/vm/precompiled_contracts/bls12_381/bls12_381_g2.py b/src/ethereum/forks/bpo1/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
index 473739b78c0..2fd32313f89 100644
--- a/src/ethereum/forks/bpo1/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
+++ b/src/ethereum/forks/bpo1/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G2_ADD,
-    GAS_BLS_G2_MAP,
-    GAS_BLS_G2_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -61,7 +59,7 @@ def bls12_g2_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2ADD)
 
     # OPERATION
     p1 = bytes_to_g2(buffer_read(data, U256(0), U256(256)))
@@ -102,7 +100,7 @@ def bls12_g2_msm(evm: Evm) -> None:
     else:
         discount = Uint(G2_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G2_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G2MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -141,7 +139,7 @@ def bls12_map_fp2_to_g2(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2MAP)
 
     # OPERATION
     field_element = bytes_to_fq2(data)
diff --git a/src/ethereum/forks/bpo1/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/bpo1/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/bpo1/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/bpo1/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/bpo1/vm/precompiled_contracts/identity.py b/src/ethereum/forks/bpo1/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/bpo1/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/bpo1/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/bpo1/vm/precompiled_contracts/p256verify.py b/src/ethereum/forks/bpo1/vm/precompiled_contracts/p256verify.py
index 106dd548a61..29c2e91e0f0 100644
--- a/src/ethereum/forks/bpo1/vm/precompiled_contracts/p256verify.py
+++ b/src/ethereum/forks/bpo1/vm/precompiled_contracts/p256verify.py
@@ -24,7 +24,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_P256VERIFY, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -41,7 +41,7 @@ def p256verify(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_P256VERIFY)
+    charge_gas(evm, GasCosts.PRECOMPILE_P256VERIFY)
 
     if len(data) != 160:
         return
diff --git a/src/ethereum/forks/bpo1/vm/precompiled_contracts/point_evaluation.py b/src/ethereum/forks/bpo1/vm/precompiled_contracts/point_evaluation.py
index ce4eed71294..d2d105ba13b 100644
--- a/src/ethereum/forks/bpo1/vm/precompiled_contracts/point_evaluation.py
+++ b/src/ethereum/forks/bpo1/vm/precompiled_contracts/point_evaluation.py
@@ -22,7 +22,7 @@
 
 from ...vm import Evm
 from ...vm.exceptions import KZGProofError
-from ...vm.gas import GAS_POINT_EVALUATION, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 FIELD_ELEMENTS_PER_BLOB = 4096
 BLS_MODULUS = 52435875175126190479447740508185965837690552500527637822603658699938581184513  # noqa: E501
@@ -51,7 +51,7 @@ def point_evaluation(evm: Evm) -> None:
     proof = Bytes48(data[144:192])
 
     # GAS
-    charge_gas(evm, GAS_POINT_EVALUATION)
+    charge_gas(evm, GasCosts.PRECOMPILE_POINT_EVALUATION)
     if kzg_commitment_to_versioned_hash(commitment) != versioned_hash:
         raise KZGProofError
 
diff --git a/src/ethereum/forks/bpo1/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/bpo1/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/bpo1/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/bpo1/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/bpo1/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/bpo1/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/bpo1/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/bpo1/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/bpo2/blocks.py b/src/ethereum/forks/bpo2/blocks.py
index 5454a305af7..209862680f1 100644
--- a/src/ethereum/forks/bpo2/blocks.py
+++ b/src/ethereum/forks/bpo2/blocks.py
@@ -10,7 +10,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
@@ -31,6 +31,7 @@
 )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Withdrawal:
@@ -64,6 +65,7 @@ class Withdrawal:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -107,13 +109,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.bpo2.state.state_root
-    [Trie]: ref:ethereum.forks.bpo2.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -123,8 +126,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.bpo2.trie.root
-    [Trie]: ref:ethereum.forks.bpo2.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -134,8 +137,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.bpo2.trie.root
-    [Trie]: ref:ethereum.forks.bpo2.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -244,6 +247,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -297,6 +301,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -329,6 +334,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/bpo2/fork.py b/src/ethereum/forks/bpo2/fork.py
index 3dfd35f98a8..fcdff89d045 100644
--- a/src/ethereum/forks/bpo2/fork.py
+++ b/src/ethereum/forks/bpo2/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Tuple
+from typing import Final, List, Optional, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
@@ -27,7 +27,13 @@
     InvalidSenderError,
     NonceMismatchError,
 )
-from ethereum.state import EMPTY_CODE_HASH, Account, Address
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt, Withdrawal, encode_receipt
@@ -51,19 +57,19 @@
     compute_requests_hash,
     parse_deposit_requests,
 )
-from .state import (
-    State,
-    TransientStorage,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
+    create_ether,
     destroy_account,
+    extract_block_diff,
     get_account,
     get_code,
+    incorporate_tx_into_block,
     increment_nonce,
-    modify_state,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
-    AccessListTransaction,
     BlobTransaction,
     FeeMarketTransaction,
     LegacyTransaction,
@@ -72,17 +78,16 @@
     decode_transaction,
     encode_transaction,
     get_transaction_hash,
+    has_access_list,
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.hexadecimal import hex_to_address
 from .utils.message import prepare_message
 from .vm import Message
 from .vm.eoa_delegation import is_valid_delegation
 from .vm.gas import (
-    BLOB_SCHEDULE_MAX,
-    GAS_PER_BLOB,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_data_fee,
     calculate_excess_blob_gas,
@@ -92,15 +97,15 @@
 
 BASE_FEE_MAX_CHANGE_DENOMINATOR = Uint(8)
 ELASTICITY_MULTIPLIER = Uint(2)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 SYSTEM_ADDRESS = hex_to_address("0xfffffffffffffffffffffffffffffffffffffffe")
 BEACON_ROOTS_ADDRESS = hex_to_address(
     "0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02"
 )
 SYSTEM_TRANSACTION_GAS = Uint(30000000)
-MAX_BLOB_GAS_PER_BLOCK = BLOB_SCHEDULE_MAX * GAS_PER_BLOB
+MAX_BLOB_GAS_PER_BLOCK: Final[U64] = (
+    GasCosts.BLOB_SCHEDULE_MAX * GasCosts.PER_BLOB
+)
 VERSIONED_HASH_VERSION_KZG = b"\x01"
 
 WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS = hex_to_address(
@@ -118,6 +123,7 @@
 BLOB_COUNT_LIMIT = 6
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -223,9 +229,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block.ommers != ():
         raise InvalidBlock
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -242,7 +250,10 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         withdrawals=block.withdrawals,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes, block_diff.storage_changes
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -268,6 +279,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if requests_hash != block.header.requests_hash:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -399,6 +411,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Tuple[Address, Uint, Tuple[VersionedHash, ...], U64]:
     """
     Check if the transaction is includable in the block.
@@ -411,6 +424,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -469,7 +484,7 @@ def check_transaction(
         raise BlobGasLimitExceededError("blob gas limit exceeded")
 
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     if isinstance(
         tx, (FeeMarketTransaction, BlobTransaction, SetCodeTransaction)
@@ -537,7 +552,7 @@ def check_transaction(
 
     if Uint(sender_account.balance) < max_gas_fee + Uint(tx.value):
         raise InsufficientBalanceError("insufficient sender balance")
-    sender_code = get_code(block_env.state, sender_account.code_hash)
+    sender_code = get_code(tx_state, sender_account.code_hash)
     if sender_account.code_hash != EMPTY_CODE_HASH and not is_valid_delegation(
         sender_code
     ):
@@ -588,74 +603,6 @@ def make_receipt(
     return encode_receipt(tx, receipt)
 
 
-def process_system_transaction(
-    block_env: vm.BlockEnvironment,
-    target_address: Address,
-    system_contract_code: Bytes,
-    data: Bytes,
-) -> MessageCallOutput:
-    """
-    Process a system transaction with the given code.
-
-    Prefer calling `process_checked_system_transaction` or
-    `process_unchecked_system_transaction` depending on whether missing code or
-    an execution error should cause the block to be rejected.
-
-    Parameters
-    ----------
-    block_env :
-        The block scoped environment.
-    target_address :
-        Address of the contract to call.
-    system_contract_code :
-        Code of the contract to call.
-    data :
-        Data to pass to the contract.
-
-    Returns
-    -------
-    system_tx_output : `MessageCallOutput`
-        Output of processing the system transaction.
-
-    """
-    tx_env = vm.TransactionEnvironment(
-        origin=SYSTEM_ADDRESS,
-        gas_price=block_env.base_fee_per_gas,
-        gas=SYSTEM_TRANSACTION_GAS,
-        access_list_addresses=set(),
-        access_list_storage_keys=set(),
-        transient_storage=TransientStorage(),
-        blob_versioned_hashes=(),
-        authorizations=(),
-        index_in_block=None,
-        tx_hash=None,
-    )
-
-    system_tx_message = Message(
-        block_env=block_env,
-        tx_env=tx_env,
-        caller=SYSTEM_ADDRESS,
-        target=target_address,
-        gas=SYSTEM_TRANSACTION_GAS,
-        value=U256(0),
-        data=data,
-        code=system_contract_code,
-        depth=Uint(0),
-        current_target=target_address,
-        code_address=target_address,
-        should_transfer_value=False,
-        is_static=False,
-        accessed_addresses=set(),
-        accessed_storage_keys=set(),
-        disable_precompiles=False,
-        parent_evm=None,
-    )
-
-    system_tx_output = process_message_call(system_tx_message)
-
-    return system_tx_output
-
-
 def process_checked_system_transaction(
     block_env: vm.BlockEnvironment,
     target_address: Address,
@@ -680,9 +627,18 @@ def process_checked_system_transaction(
         Output of processing the system transaction.
 
     """
+    # Pre-check that the system contract has code. We use a throwaway
+    # TransactionState here that is *never* propagated back to BlockState
+    # (no incorporate_tx_into_block call); the same get_account / get_code
+    # lookups are performed and properly tracked by
+    # process_unchecked_system_transaction below, which this function
+    # always calls. Reading via a TransactionState (rather than directly
+    # against pre_state) lets us see system contracts deployed earlier in
+    # the same block — see EIP-7002 and EIP-7251 for this edge case.
+    untracked_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        untracked_state,
+        get_account(untracked_state, target_address).code_hash,
     )
 
     if len(system_contract_code) == 0:
@@ -691,10 +647,9 @@ def process_checked_system_transaction(
             "contain code"
         )
 
-    system_tx_output = process_system_transaction(
+    system_tx_output = process_unchecked_system_transaction(
         block_env,
         target_address,
-        system_contract_code,
         data,
     )
 
@@ -713,8 +668,8 @@ def process_unchecked_system_transaction(
     data: Bytes,
 ) -> MessageCallOutput:
     """
-    Process a system transaction without checking if the contract contains code
-    or if the transaction fails.
+    Process a system transaction without checking if the contract contains
+    code or if the transaction fails.
 
     Parameters
     ----------
@@ -731,17 +686,51 @@ def process_unchecked_system_transaction(
         Output of processing the system transaction.
 
     """
+    system_tx_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        system_tx_state,
+        get_account(system_tx_state, target_address).code_hash,
     )
-    return process_system_transaction(
-        block_env,
-        target_address,
-        system_contract_code,
-        data,
+
+    tx_env = vm.TransactionEnvironment(
+        origin=SYSTEM_ADDRESS,
+        gas_price=block_env.base_fee_per_gas,
+        gas=SYSTEM_TRANSACTION_GAS,
+        access_list_addresses=set(),
+        access_list_storage_keys=set(),
+        state=system_tx_state,
+        blob_versioned_hashes=(),
+        authorizations=(),
+        index_in_block=None,
+        tx_hash=None,
+    )
+
+    system_tx_message = Message(
+        block_env=block_env,
+        tx_env=tx_env,
+        caller=SYSTEM_ADDRESS,
+        target=target_address,
+        gas=SYSTEM_TRANSACTION_GAS,
+        value=U256(0),
+        data=data,
+        code=system_contract_code,
+        depth=Uint(0),
+        current_target=target_address,
+        code_address=target_address,
+        should_transfer_value=False,
+        is_static=False,
+        accessed_addresses=set(),
+        accessed_storage_keys=set(),
+        disable_precompiles=False,
+        parent_evm=None,
     )
 
+    system_tx_output = process_message_call(system_tx_message)
+
+    incorporate_tx_into_block(system_tx_state)
+
+    return system_tx_output
+
 
 def apply_body(
     block_env: vm.BlockEnvironment,
@@ -875,6 +864,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(
         block_output.transactions_trie,
         rlp.encode(index),
@@ -892,9 +883,10 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     if isinstance(tx, BlobTransaction):
         blob_gas_fee = calculate_data_fee(block_env.excess_blob_gas, tx)
@@ -904,27 +896,17 @@ def process_transaction(
     effective_gas_fee = tx.gas * effective_gas_price
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     sender_balance_after_gas_fee = (
         Uint(sender_account.balance) - effective_gas_fee - blob_gas_fee
     )
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     access_list_addresses = set()
     access_list_storage_keys = set()
     access_list_addresses.add(block_env.coinbase)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
             access_list_addresses.add(access.account)
             for slot in access.slots:
@@ -940,7 +922,7 @@ def process_transaction(
         gas=gas,
         access_list_addresses=access_list_addresses,
         access_list_storage_keys=access_list_storage_keys,
-        transient_storage=TransientStorage(),
+        state=tx_state,
         blob_versioned_hashes=blob_versioned_hashes,
         authorizations=authorizations,
         index_in_block=index,
@@ -973,23 +955,13 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * priority_fee_per_gas
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
-    coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
-    ).balance + U256(transaction_fee)
-    set_account_balance(
-        block_env.state,
-        block_env.coinbase,
-        coinbase_balance_after_mining_fee,
-    )
+    create_ether(tx_state, block_env.coinbase, U256(transaction_fee))
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
     block_output.block_gas_used += tx_gas_used_after_refund
     block_output.blob_gas_used += tx_blob_gas_used
@@ -1009,6 +981,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def process_withdrawals(
     block_env: vm.BlockEnvironment,
@@ -1018,9 +992,7 @@ def process_withdrawals(
     """
     Increase the balance of the withdrawing account.
     """
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += wd.amount * U256(10**9)
+    wd_state = TransactionState(parent=block_env.state)
 
     for i, wd in enumerate(withdrawals):
         trie_set(
@@ -1029,7 +1001,9 @@ def increase_recipient_balance(recipient: Account) -> None:
             rlp.encode(wd),
         )
 
-        modify_state(block_env.state, wd.address, increase_recipient_balance)
+        create_ether(wd_state, wd.address, wd.amount * U256(10**9))
+
+    incorporate_tx_into_block(wd_state)
 
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
@@ -1038,14 +1012,14 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
-    passed through as a parameter is greater than or equal to the *sum* of
-    the parent's gas and the adjustment delta then the limit for gas is too
-    high and fails this function's check. Similarly, if the limit is less
-    than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
-    check fails because the gas limit doesn't allow for a sufficient or
-    reasonable amount of gas to be used on a block.
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is passed
+    through as a parameter is greater than or equal to the *sum* of the
+    parent's gas and the adjustment delta then the limit for gas is too high
+    and fails this function's check. Similarly, if the limit is less than or
+    equal to the *difference* of the parent's gas and the adjustment delta *or*
+    the predefined ``LIMIT_MINIMUM`` then this function's check fails because
+    the gas limit doesn't allow for a sufficient or reasonable amount of gas to
+    be used on a block.
 
     Parameters
     ----------
@@ -1061,12 +1035,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/bpo2/fork_types.py b/src/ethereum/forks/bpo2/fork_types.py
index c598e9876bf..4bec34810db 100644
--- a/src/ethereum/forks/bpo2/fork_types.py
+++ b/src/ethereum/forks/bpo2/fork_types.py
@@ -12,6 +12,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes256
@@ -43,6 +44,7 @@ def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Authorization:
diff --git a/src/ethereum/forks/bpo2/requests.py b/src/ethereum/forks/bpo2/requests.py
index 542c9264d37..fbf10d11565 100644
--- a/src/ethereum/forks/bpo2/requests.py
+++ b/src/ethereum/forks/bpo2/requests.py
@@ -1,11 +1,31 @@
 """
-Requests were introduced in EIP-7685 as a general purpose framework for
-storing contract-triggered requests. It extends the execution header and
-body with a single field each to store the request information.
-This inherently exposes the requests to the consensus layer, which can
-then process each one.
-
+[EIP-7685] generalizes how the execution layer communicates validator actions
+to the consensus layer. Rather than adding a dedicated header field for each
+new action type (as [EIP-4895] did for withdrawals), the execution header
+commits to a single [`requests_hash`][rh] that aggregates an ordered list of
+typed requests.
+
+Each request is a type byte (see [`DEPOSIT_REQUEST_TYPE`][dt],
+[`WITHDRAWAL_REQUEST_TYPE`][wt], and [`CONSOLIDATION_REQUEST_TYPE`][ct])
+followed by an opaque payload. Deposit requests are discovered by scanning
+transaction receipts for logs emitted by the deposit contract; withdrawal
+and consolidation requests are produced by the corresponding system
+contracts during block processing.
+
+See [`parse_deposit_requests`][pd] for how deposit logs become request data,
+[`compute_requests_hash`][crh] for how the list is hashed for inclusion in the
+header, and [`process_general_purpose_requests`][pgpr] for how the requests are
+processed.
+
+[EIP-4895]: https://eips.ethereum.org/EIPS/eip-4895
 [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+[rh]: ref:ethereum.forks.bpo2.blocks.Header.requests_hash
+[dt]: ref:ethereum.forks.bpo2.requests.DEPOSIT_REQUEST_TYPE
+[wt]: ref:ethereum.forks.bpo2.requests.WITHDRAWAL_REQUEST_TYPE
+[ct]: ref:ethereum.forks.bpo2.requests.CONSOLIDATION_REQUEST_TYPE
+[pd]: ref:ethereum.forks.bpo2.requests.parse_deposit_requests
+[crh]: ref:ethereum.forks.bpo2.requests.compute_requests_hash
+[pgpr]: ref:ethereum.forks.bpo2.fork.process_general_purpose_requests
 """
 
 from hashlib import sha256
@@ -15,48 +35,133 @@
 from ethereum_types.numeric import Uint, ulen
 
 from ethereum.exceptions import InvalidBlock
+from ethereum.merkle_patricia_trie import trie_get
 from ethereum.utils.hexadecimal import hex_to_bytes32
 
 from .blocks import decode_receipt
-from .trie import trie_get
 from .utils.hexadecimal import hex_to_address
 from .vm import BlockOutput
 
 DEPOSIT_CONTRACT_ADDRESS = hex_to_address(
     "0x00000000219ab540356cbb839cbe05303d7705fa"
 )
+"""
+Mainnet address of the beacon chain deposit contract. Scanning block
+receipts for logs emitted by this address is how the execution layer
+discovers validator deposits, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 DEPOSIT_EVENT_SIGNATURE_HASH = hex_to_bytes32(
     "0x649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c5"
 )
+"""
+First [log topic] of the deposit contract's `DepositEvent`, equal to the
+keccak256 of its Solidity event signature. Logs whose first topic does not
+match this are ignored when collecting deposit requests.
+
+[log topic]: https://docs.soliditylang.org/en/latest/abi-spec.html#events
+"""
+
 DEPOSIT_REQUEST_TYPE = b"\x00"
+"""
+Request type byte identifying a deposit request, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 WITHDRAWAL_REQUEST_TYPE = b"\x01"
+"""
+Request type byte identifying an execution-triggered withdrawal request,
+per [EIP-7002].
+
+[EIP-7002]: https://eips.ethereum.org/EIPS/eip-7002
+"""
+
 CONSOLIDATION_REQUEST_TYPE = b"\x02"
+"""
+Request type byte identifying a consolidation request, per [EIP-7251].
+
+[EIP-7251]: https://eips.ethereum.org/EIPS/eip-7251
+"""
 
 
 DEPOSIT_EVENT_LENGTH = Uint(576)
+"""
+Total length in bytes of the ABI-encoded `DepositEvent` data payload. Every
+well-formed event has this exact length.
+"""
 
 PUBKEY_OFFSET = Uint(160)
+"""
+Position within the event payload of the validator public key's length
+prefix, as emitted by the Solidity ABI encoder.
+"""
+
 WITHDRAWAL_CREDENTIALS_OFFSET = Uint(256)
+"""
+Position within the event payload of the withdrawal credentials' length
+prefix.
+"""
+
 AMOUNT_OFFSET = Uint(320)
+"""
+Position within the event payload of the deposit amount's length prefix.
+"""
+
 SIGNATURE_OFFSET = Uint(384)
+"""
+Position within the event payload of the deposit signature's length prefix.
+"""
+
 INDEX_OFFSET = Uint(512)
+"""
+Position within the event payload of the deposit index's length prefix.
+"""
 
 PUBKEY_SIZE = Uint(48)
+"""
+Length of the BLS12-381 public key that identifies the validator receiving
+the deposit.
+"""
+
 WITHDRAWAL_CREDENTIALS_SIZE = Uint(32)
+"""
+Length of the withdrawal credentials, which determine where the staked
+ether may eventually be withdrawn.
+"""
+
 AMOUNT_SIZE = Uint(8)
+"""
+Length of the little-endian Gwei amount being deposited.
+"""
+
 SIGNATURE_SIZE = Uint(96)
+"""
+Length of the BLS12-381 signature over the deposit message.
+"""
+
 INDEX_SIZE = Uint(8)
+"""
+Length of the monotonically-increasing deposit index assigned by the
+deposit contract when it emits the event.
+"""
 
 
 def extract_deposit_data(data: Bytes) -> Bytes:
     """
-    Extracts Deposit Request from the DepositContract.DepositEvent data.
+    Strip the Solidity ABI framing from a `DepositEvent` payload and return
+    the concatenated raw fields in the order consumed by the consensus
+    layer: public key, withdrawal credentials, amount, signature, and
+    deposit index.
 
-    Raises
-    ------
-    InvalidBlock :
-        If the deposit contract did not produce a valid log.
+    Because each field has a fixed length, every well-formed event has an
+    identical byte layout. Any deviation indicates a misbehaving or
+    compromised deposit contract, so this function raises [`InvalidBlock`]
+    rather than silently accepting unexpected data.
 
+    [`InvalidBlock`]: ref:ethereum.exceptions.InvalidBlock
     """
     if ulen(data) != DEPOSIT_EVENT_LENGTH:
         raise InvalidBlock("Invalid deposit event data length")
@@ -150,7 +255,19 @@ def extract_deposit_data(data: Bytes) -> Bytes:
 
 def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
     """
-    Parse deposit requests from the block output.
+    Walk the receipts produced during block execution, concatenating the
+    raw payload of every valid deposit event into a single byte string.
+
+    A log is considered a deposit when it originates from
+    [`DEPOSIT_CONTRACT_ADDRESS`][addr] and its first topic matches
+    [`DEPOSIT_EVENT_SIGNATURE_HASH`][sig]. The returned bytes are the
+    direct concatenation of the unframed deposit fields, ready to be
+    prefixed with [`DEPOSIT_REQUEST_TYPE`][dt] before being appended to
+    the block's request list.
+
+    [addr]: ref:ethereum.forks.bpo2.requests.DEPOSIT_CONTRACT_ADDRESS
+    [sig]: ref:ethereum.forks.bpo2.requests.DEPOSIT_EVENT_SIGNATURE_HASH
+    [dt]: ref:ethereum.forks.bpo2.requests.DEPOSIT_REQUEST_TYPE
     """
     deposit_requests: Bytes = b""
     for key in block_output.receipt_keys:
@@ -171,18 +288,18 @@ def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
 
 def compute_requests_hash(requests: List[Bytes]) -> Bytes:
     """
-    Get the hash of the requests using the SHA2-256 algorithm.
-
-    Parameters
-    ----------
-    requests : Bytes
-        The requests to hash.
-
-    Returns
-    -------
-    requests_hash : Bytes
-        The hash of the requests.
-
+    Compute the [SHA2-256] commitment over an ordered list of
+    type-prefixed requests, as defined by [EIP-7685].
+
+    The commitment is the SHA2-256 hash of the concatenation of the
+    SHA2-256 hashes of each individual request. This is what the
+    execution header's [`requests_hash`][rh] stores, and what the
+    consensus layer re-derives to validate that both layers observed the
+    same set of requests.
+
+    [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+    [SHA2-256]: https://en.wikipedia.org/wiki/SHA-2
+    [rh]: ref:ethereum.forks.bpo2.blocks.Header.requests_hash
     """
     m = sha256()
     for request in requests:
diff --git a/src/ethereum/forks/bpo2/state.py b/src/ethereum/forks/bpo2/state.py
deleted file mode 100644
index 342bda1a1cd..00000000000
--- a/src/ethereum/forks/bpo2/state.py
+++ /dev/null
@@ -1,713 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-from ethereum.state import (
-    EMPTY_ACCOUNT,
-    EMPTY_CODE_HASH,
-    Account,
-    Address,
-    Root,
-)
-
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-    def get_code(self, code_hash: Hash32) -> Bytes:
-        """
-        Get the bytecode for a given code hash.
-
-        Return ``b""`` for ``EMPTY_CODE_HASH``.
-        """
-        if code_hash == EMPTY_CODE_HASH:
-            return b""
-        return self._code_store[code_hash]
-
-
-@dataclass
-class TransientStorage:
-    """
-    Contains all information that is preserved between message calls
-    within a transaction.
-    """
-
-    _tries: Dict[Address, Trie[Bytes32, U256]] = field(default_factory=dict)
-    _snapshots: List[Dict[Address, Trie[Bytes32, U256]]] = field(
-        default_factory=list
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-
-
-def begin_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-    transient_storage._snapshots.append(
-        {k: copy_trie(t) for (k, t) in transient_storage._tries.items()}
-    )
-
-
-def commit_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._snapshots.pop()
-
-
-def rollback_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._tries = transient_storage._snapshots.pop()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-
-    Return ``b""`` for ``EMPTY_CODE_HASH``.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State`` and return its hash.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase, and to respect the constraints added to SELFDESTRUCT by
-    EIP-6780.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`. If, after modification, the account
-    exists and has zero nonce, empty code, and zero balance, it is destroyed.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-    account = get_account_optional(state, address)
-    account_exists_and_is_empty = (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-    if account_exists_and_is_empty:
-        destroy_account(state, address)
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
-
-
-def get_transient_storage(
-    transient_storage: TransientStorage, address: Address, key: Bytes32
-) -> U256:
-    """
-    Get a value at a storage key on an account from transient storage.
-    Returns `U256(0)` if the storage key has not been set previously.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_transient_storage(
-    transient_storage: TransientStorage,
-    address: Address,
-    key: Bytes32,
-    value: U256,
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        transient_storage._tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del transient_storage._tries[address]
diff --git a/src/ethereum/forks/bpo2/state_tracker.py b/src/ethereum/forks/bpo2/state_tracker.py
new file mode 100644
index 00000000000..67ceaa86321
--- /dev/null
+++ b/src/ethereum/forks/bpo2/state_tracker.py
@@ -0,0 +1,749 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state. If, after modification, the
+    account exists and has zero nonce, empty code, and zero balance, it
+    is destroyed.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+    if account_exists_and_is_empty(tx_state, address):
+        destroy_account(tx_state, address)
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+    )
diff --git a/src/ethereum/forks/bpo2/transactions.py b/src/ethereum/forks/bpo2/transactions.py
index 048852529e4..18953538456 100644
--- a/src/ethereum/forks/bpo2/transactions.py
+++ b/src/ethereum/forks/bpo2/transactions.py
@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, TypeGuard, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -28,46 +28,10 @@
 )
 from .fork_types import Authorization, VersionedHash
 
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_TOKEN_FLOOR = Uint(10)
-"""
-Minimum gas cost per byte of calldata as per [EIP-7623]. Used to calculate
-the minimum gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_DATA_TOKEN_STANDARD = Uint(4)
-"""
-Gas cost per byte of calldata as per [EIP-7623]. Used to calculate the
-gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
-
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
-"""
-
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
-"""
-
 TX_MAX_GAS_LIMIT = Uint(16_777_216)
 
 
+@final
 @slotted_freezable
 @dataclass
 class LegacyTransaction:
@@ -130,6 +94,7 @@ class LegacyTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Access:
@@ -149,6 +114,7 @@ class Access:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccessListTransaction:
@@ -221,6 +187,7 @@ class AccessListTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class FeeMarketTransaction:
@@ -298,6 +265,7 @@ class FeeMarketTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class BlobTransaction:
@@ -386,6 +354,7 @@ class BlobTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class SetCodeTransaction:
@@ -481,6 +450,23 @@ class SetCodeTransaction:
 """
 
 
+AccessListCapableTransaction = (
+    AccessListTransaction
+    | FeeMarketTransaction
+    | BlobTransaction
+    | SetCodeTransaction
+)
+"""
+Transaction types that include an [EIP-2930]-style access list.
+
+See [`has_access_list`][hal] and [`Access`][a] for more details.
+
+[EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+[hal]: ref:ethereum.forks.amsterdam.transactions.has_access_list
+[a]: ref:ethereum.forks.amsterdam.transactions.Access
+"""
+
+
 def encode_transaction(tx: Transaction) -> LegacyTransaction | Bytes:
     """
     Encode a transaction into its RLP or typed transaction format.
@@ -584,7 +570,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
     4. Cost for access list entries (if applicable)
@@ -595,8 +581,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     gas cost of the transaction and the minimum gas cost used by the
     transaction based on the calldata size.
     """
-    from .vm.eoa_delegation import GAS_AUTH_PER_EMPTY_ACCOUNT
-    from .vm.gas import init_code_cost
+    from .vm.gas import GasCosts, init_code_cost
 
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
@@ -604,39 +589,33 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     tokens_in_calldata = num_zeros + num_non_zeros * Uint(4)
     # EIP-7623 floor price (note: no EVM costs)
     calldata_floor_gas_cost = (
-        tokens_in_calldata * GAS_TX_DATA_TOKEN_FLOOR + GAS_TX_BASE
+        tokens_in_calldata * GasCosts.TX_DATA_TOKEN_FLOOR + GasCosts.TX_BASE
     )
 
-    data_cost = tokens_in_calldata * GAS_TX_DATA_TOKEN_STANDARD
+    data_cost = tokens_in_calldata * GasCosts.TX_DATA_TOKEN_STANDARD
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE + init_code_cost(ulen(tx.data))
+        create_cost = GasCosts.TX_CREATE + init_code_cost(ulen(tx.data))
     else:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
-            access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_cost += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
 
     auth_cost = Uint(0)
     if isinstance(tx, SetCodeTransaction):
-        auth_cost += Uint(GAS_AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations))
+        auth_cost += Uint(
+            GasCosts.AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations)
+        )
 
     return (
         Uint(
-            GAS_TX_BASE
+            GasCosts.TX_BASE
             + data_cost
             + create_cost
             + access_list_cost
@@ -884,3 +863,17 @@ def get_transaction_hash(tx: Bytes | LegacyTransaction) -> Hash32:
         return keccak256(rlp.encode(tx))
     else:
         return keccak256(tx)
+
+
+def has_access_list(
+    tx: Transaction,
+) -> TypeGuard[AccessListCapableTransaction]:
+    """
+    Return whether the transaction has an [EIP-2930]-style access list.
+
+    [EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+    """
+    return isinstance(
+        tx,
+        AccessListCapableTransaction,
+    )
diff --git a/src/ethereum/forks/bpo2/trie.py b/src/ethereum/forks/bpo2/trie.py
deleted file mode 100644
index 8ad78603812..00000000000
--- a/src/ethereum/forks/bpo2/trie.py
+++ /dev/null
@@ -1,509 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-from typing_extensions import assert_type
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.bpo1 import trie as previous_trie
-from ethereum.state import Account, Address, Root
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt, Withdrawal
-from .fork_types import encode_account
-from .transactions import LegacyTransaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = (
-    Account
-    | Bytes
-    | LegacyTransaction
-    | Receipt
-    | Uint
-    | U256
-    | Withdrawal
-    | None
-)
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[LegacyTransaction | Bytes],
-    Optional[Receipt | Bytes],
-    Optional[Withdrawal | Bytes],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `Extended`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (LegacyTransaction, Receipt, Withdrawal, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/bpo2/utils/message.py b/src/ethereum/forks/bpo2/utils/message.py
index 1186eb612cb..c5691c7b1e0 100644
--- a/src/ethereum/forks/bpo2/utils/message.py
+++ b/src/ethereum/forks/bpo2/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
@@ -55,7 +55,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -63,8 +63,9 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        state = block_env.state
-        code = get_code(state, get_account(state, tx.to).code_hash)
+        code = get_code(
+            tx_env.state, get_account(tx_env.state, tx.to).code_hash
+        )
         code_address = tx.to
     else:
         raise AssertionError("Target must be address or empty bytes")
diff --git a/src/ethereum/forks/bpo2/vm/__init__.py b/src/ethereum/forks/bpo2/vm/__init__.py
index 37d0a327974..42229ebd849 100644
--- a/src/ethereum/forks/bpo2/vm/__init__.py
+++ b/src/ethereum/forks/bpo2/vm/__init__.py
@@ -13,24 +13,25 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt, Withdrawal
 from ..fork_types import Authorization, VersionedHash
-from ..state import State, TransientStorage
+from ..state_tracker import BlockState, TransactionState
 from ..transactions import LegacyTransaction
-from ..trie import Trie
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +39,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -50,6 +51,7 @@ class BlockEnvironment:
     parent_beacon_block_root: Hash32
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -92,10 +94,11 @@ class BlockOutput:
     requests: List[Bytes] = field(default_factory=list)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
@@ -103,13 +106,14 @@ class TransactionEnvironment:
     gas: Uint
     access_list_addresses: Set[Address]
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
-    transient_storage: TransientStorage
+    state: TransactionState
     blob_versioned_hashes: Tuple[VersionedHash, ...]
     authorizations: Tuple[Authorization, ...]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -135,6 +139,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
diff --git a/src/ethereum/forks/bpo2/vm/eoa_delegation.py b/src/ethereum/forks/bpo2/vm/eoa_delegation.py
index fce580bee4a..1ba552f8dd6 100644
--- a/src/ethereum/forks/bpo2/vm/eoa_delegation.py
+++ b/src/ethereum/forks/bpo2/vm/eoa_delegation.py
@@ -14,7 +14,7 @@
 from ethereum.state import Address
 
 from ..fork_types import Authorization
-from ..state import (
+from ..state_tracker import (
     account_exists,
     get_account,
     get_code,
@@ -22,14 +22,13 @@
     set_code,
 )
 from ..utils.hexadecimal import hex_to_address
-from ..vm.gas import GAS_COLD_ACCOUNT_ACCESS, GAS_WARM_ACCESS
+from ..vm.gas import GasCosts
 from . import Evm, Message
 
 SET_CODE_TX_MAGIC = b"\x05"
 EOA_DELEGATION_MARKER = b"\xef\x01\x00"
 EOA_DELEGATION_MARKER_LENGTH = len(EOA_DELEGATION_MARKER)
 EOA_DELEGATED_CODE_LENGTH = 23
-GAS_AUTH_PER_EMPTY_ACCOUNT = 25000
 REFUND_AUTH_PER_EXISTING_ACCOUNT = 12500
 NULL_ADDRESS = hex_to_address("0x0000000000000000000000000000000000000000")
 
@@ -140,18 +139,18 @@ def access_delegation(
         The delegation address, code, and access gas cost.
 
     """
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
     if not is_valid_delegation(code):
         return False, address, code, Uint(0)
 
     address = Address(code[EOA_DELEGATION_MARKER_LENGTH:])
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
-    code = get_code(state, get_account(state, address).code_hash)
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     return True, address, code, access_gas_cost
 
@@ -171,7 +170,7 @@ def set_delegation(message: Message) -> U256:
         Refund from authority which already exists in state.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     for auth in message.tx_env.authorizations:
         if auth.chain_id not in (message.block_env.chain_id, U256(0)):
@@ -187,8 +186,8 @@ def set_delegation(message: Message) -> U256:
 
         message.accessed_addresses.add(authority)
 
-        authority_account = get_account(state, authority)
-        authority_code = get_code(state, authority_account.code_hash)
+        authority_account = get_account(tx_state, authority)
+        authority_code = get_code(tx_state, authority_account.code_hash)
 
         if authority_code and not is_valid_delegation(authority_code):
             continue
@@ -197,24 +196,25 @@ def set_delegation(message: Message) -> U256:
         if authority_nonce != auth.nonce:
             continue
 
-        if account_exists(state, authority):
+        if account_exists(tx_state, authority):
             refund_counter += U256(
-                GAS_AUTH_PER_EMPTY_ACCOUNT - REFUND_AUTH_PER_EXISTING_ACCOUNT
+                GasCosts.AUTH_PER_EMPTY_ACCOUNT
+                - REFUND_AUTH_PER_EXISTING_ACCOUNT
             )
 
         if auth.address == NULL_ADDRESS:
             code_to_set = b""
         else:
             code_to_set = EOA_DELEGATION_MARKER + auth.address
-        set_code(state, authority, code_to_set)
+        set_code(tx_state, authority, code_to_set)
 
-        increment_nonce(state, authority)
+        increment_nonce(tx_state, authority)
 
     if message.code_address is None:
         raise InvalidBlock("Invalid type 4 transaction: no target")
 
     message.code = get_code(
-        state, get_account(state, message.code_address).code_hash
+        tx_state, get_account(tx_state, message.code_address).code_hash
     )
 
     return refund_counter
diff --git a/src/ethereum/forks/bpo2/vm/gas.py b/src/ethereum/forks/bpo2/vm/gas.py
index a2e5d1ab39a..653f6eb9ea1 100644
--- a/src/ethereum/forks/bpo2/vm/gas.py
+++ b/src/ethereum/forks/bpo2/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U64, U256, Uint
+from ethereum_types.numeric import U64, U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32, taylor_exponential
@@ -24,67 +24,172 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 4800
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-GAS_ECRECOVER = Uint(3000)
-GAS_P256VERIFY = Uint(6900)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1)
-GAS_COLD_SLOAD = Uint(2100)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600)
-GAS_WARM_ACCESS = Uint(100)
-GAS_CODE_INIT_PER_WORD = Uint(2)
-GAS_BLOBHASH_OPCODE = Uint(3)
-GAS_POINT_EVALUATION = Uint(50000)
-
-GAS_PER_BLOB = U64(2**17)
-BLOB_SCHEDULE_TARGET = U64(14)
-BLOB_TARGET_GAS_PER_BLOCK = GAS_PER_BLOB * BLOB_SCHEDULE_TARGET
-BLOB_BASE_COST = Uint(2**13)
-BLOB_SCHEDULE_MAX = U64(21)
-BLOB_MIN_GASPRICE = Uint(1)
-BLOB_BASE_FEE_UPDATE_FRACTION = Uint(11684671)
-
-GAS_BLS_G1_ADD = Uint(375)
-GAS_BLS_G1_MUL = Uint(12000)
-GAS_BLS_G1_MAP = Uint(5500)
-GAS_BLS_G2_ADD = Uint(600)
-GAS_BLS_G2_MUL = Uint(22500)
-GAS_BLS_G2_MAP = Uint(23800)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    WARM_ACCESS: Final[Uint] = Uint(100)
+    COLD_ACCOUNT_ACCESS: Final[Uint] = Uint(2600)
+    COLD_STORAGE_ACCESS: Final[Uint] = Uint(2100)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+    CODE_INIT_PER_WORD: Final[Uint] = Uint(2)
+
+    # Authorization
+    AUTH_PER_EMPTY_ACCOUNT: Final[int] = 25000
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 4800
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_P256VERIFY: Final[Uint] = Uint(6900)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1)
+    PRECOMPILE_POINT_EVALUATION: Final[Uint] = Uint(50000)
+    PRECOMPILE_BLS_G1ADD: Final[Uint] = Uint(375)
+    PRECOMPILE_BLS_G1MUL: Final[Uint] = Uint(12000)
+    PRECOMPILE_BLS_G1MAP: Final[Uint] = Uint(5500)
+    PRECOMPILE_BLS_G2ADD: Final[Uint] = Uint(600)
+    PRECOMPILE_BLS_G2MUL: Final[Uint] = Uint(22500)
+    PRECOMPILE_BLS_G2MAP: Final[Uint] = Uint(23800)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000)
+
+    # Blobs
+    PER_BLOB: Final[U64] = U64(2**17)
+    BLOB_SCHEDULE_TARGET: Final[U64] = U64(14)
+    BLOB_TARGET_GAS_PER_BLOCK: Final[U64] = PER_BLOB * BLOB_SCHEDULE_TARGET
+    BLOB_BASE_COST: Final[Uint] = Uint(2**13)
+    BLOB_SCHEDULE_MAX: Final[U64] = U64(21)
+    BLOB_MIN_GASPRICE: Final[Uint] = Uint(1)
+    BLOB_BASE_FEE_UPDATE_FRACTION: Final[Uint] = Uint(11684671)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_TOKEN_STANDARD: Final[Uint] = Uint(4)
+    TX_DATA_TOKEN_FLOOR: Final[Uint] = Uint(10)
+    TX_ACCESS_LIST_ADDRESS: Final[Uint] = Uint(2400)
+    TX_ACCESS_LIST_STORAGE_KEY: Final[Uint] = Uint(1900)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_CLZ: Final[Uint] = LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_PREVRANDAO: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_BASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBBASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBHASH: Final[Uint] = Uint(3)
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_PUSH0: Final[Uint] = BASE
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MCOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -100,11 +205,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -156,7 +262,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -186,7 +292,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -211,7 +317,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
@@ -283,7 +389,7 @@ def init_code_cost(init_code_length: Uint) -> Uint:
         The gas to be charged for the init code.
 
     """
-    return GAS_CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
+    return GasCosts.CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
 
 
 def calculate_excess_blob_gas(parent_header: Header) -> U64:
@@ -314,21 +420,23 @@ def calculate_excess_blob_gas(parent_header: Header) -> U64:
         base_fee_per_gas = parent_header.base_fee_per_gas
 
     parent_blob_gas = excess_blob_gas + blob_gas_used
-    if parent_blob_gas < BLOB_TARGET_GAS_PER_BLOCK:
+    if parent_blob_gas < GasCosts.BLOB_TARGET_GAS_PER_BLOCK:
         return U64(0)
 
-    target_blob_gas_price = Uint(GAS_PER_BLOB)
+    target_blob_gas_price = Uint(GasCosts.PER_BLOB)
     target_blob_gas_price *= calculate_blob_gas_price(excess_blob_gas)
 
-    base_blob_tx_price = BLOB_BASE_COST * base_fee_per_gas
+    base_blob_tx_price = GasCosts.BLOB_BASE_COST * base_fee_per_gas
     if base_blob_tx_price > target_blob_gas_price:
-        blob_schedule_delta = BLOB_SCHEDULE_MAX - BLOB_SCHEDULE_TARGET
+        blob_schedule_delta = (
+            GasCosts.BLOB_SCHEDULE_MAX - GasCosts.BLOB_SCHEDULE_TARGET
+        )
         return (
             excess_blob_gas
-            + blob_gas_used * blob_schedule_delta // BLOB_SCHEDULE_MAX
+            + blob_gas_used * blob_schedule_delta // GasCosts.BLOB_SCHEDULE_MAX
         )
 
-    return parent_blob_gas - BLOB_TARGET_GAS_PER_BLOCK
+    return parent_blob_gas - GasCosts.BLOB_TARGET_GAS_PER_BLOCK
 
 
 def calculate_total_blob_gas(tx: Transaction) -> U64:
@@ -347,7 +455,7 @@ def calculate_total_blob_gas(tx: Transaction) -> U64:
 
     """
     if isinstance(tx, BlobTransaction):
-        return GAS_PER_BLOB * U64(len(tx.blob_versioned_hashes))
+        return GasCosts.PER_BLOB * U64(len(tx.blob_versioned_hashes))
     else:
         return U64(0)
 
@@ -368,9 +476,9 @@ def calculate_blob_gas_price(excess_blob_gas: U64) -> Uint:
 
     """
     return taylor_exponential(
-        BLOB_MIN_GASPRICE,
+        GasCosts.BLOB_MIN_GASPRICE,
         Uint(excess_blob_gas),
-        BLOB_BASE_FEE_UPDATE_FRACTION,
+        GasCosts.BLOB_BASE_FEE_UPDATE_FRACTION,
     )
 
 
diff --git a/src/ethereum/forks/bpo2/vm/instructions/arithmetic.py b/src/ethereum/forks/bpo2/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/bpo2/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/bpo2/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/bpo2/vm/instructions/bitwise.py b/src/ethereum/forks/bpo2/vm/instructions/bitwise.py
index cc6fa2fbb23..8b41a55d2b2 100644
--- a/src/ethereum/forks/bpo2/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/bpo2/vm/instructions/bitwise.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_LOW, GAS_VERY_LOW, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -34,7 +34,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +59,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +84,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +108,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +134,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +169,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +199,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +229,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
@@ -262,7 +262,7 @@ def count_leading_zeros(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CLZ)
 
     # OPERATION
     bit_length = U256(x.bit_length())
diff --git a/src/ethereum/forks/bpo2/vm/instructions/block.py b/src/ethereum/forks/bpo2/vm/instructions/block.py
index 9923433c7b6..76ab809b06b 100644
--- a/src/ethereum/forks/bpo2/vm/instructions/block.py
+++ b/src/ethereum/forks/bpo2/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -40,7 +40,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -89,7 +89,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -123,7 +123,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -156,7 +156,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -189,7 +189,7 @@ def prev_randao(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PREVRANDAO)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.prev_randao))
@@ -222,7 +222,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -252,7 +252,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/bpo2/vm/instructions/comparison.py b/src/ethereum/forks/bpo2/vm/instructions/comparison.py
index a6a3d99bc86..ee5c881ef0d 100644
--- a/src/ethereum/forks/bpo2/vm/instructions/comparison.py
+++ b/src/ethereum/forks/bpo2/vm/instructions/comparison.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -34,7 +34,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +60,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +87,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +113,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +140,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +166,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/bpo2/vm/instructions/control_flow.py b/src/ethereum/forks/bpo2/vm/instructions/control_flow.py
index b3b1f2316a7..d74e7b90340 100644
--- a/src/ethereum/forks/bpo2/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/bpo2/vm/instructions/control_flow.py
@@ -13,7 +13,7 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +57,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +84,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +113,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +137,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +162,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/bpo2/vm/instructions/environment.py b/src/ethereum/forks/bpo2/vm/instructions/environment.py
index 5848530a960..b6bf713df27 100644
--- a/src/ethereum/forks/bpo2/vm/instructions/environment.py
+++ b/src/ethereum/forks/bpo2/vm/instructions/environment.py
@@ -17,20 +17,13 @@
 from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BASE,
-    GAS_BLOBHASH_OPCODE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_COPY,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
-    GAS_WARM_ACCESS,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_gas_extend_memory,
     charge_gas,
@@ -52,7 +45,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -76,14 +69,15 @@ def balance(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_addresses.add(address)
-        charge_gas(evm, GAS_COLD_ACCOUNT_ACCESS)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -106,7 +100,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -129,7 +123,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -152,7 +146,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -176,7 +170,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -201,7 +195,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -230,11 +224,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -259,7 +256,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -288,11 +285,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -317,7 +317,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -341,16 +341,16 @@ def extcodesize(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -377,23 +377,23 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
 
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost + copy_gas_cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -416,7 +416,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -442,11 +442,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -475,15 +480,15 @@ def extcodehash(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -510,12 +515,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
@@ -538,7 +543,7 @@ def base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BASEFEE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.base_fee_per_gas))
@@ -561,7 +566,7 @@ def blob_hash(evm: Evm) -> None:
     index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BLOBHASH_OPCODE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBHASH)
 
     # OPERATION
     if int(index) < len(evm.message.tx_env.blob_versioned_hashes):
@@ -588,7 +593,7 @@ def blob_base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBBASEFEE)
 
     # OPERATION
     blob_base_fee = calculate_blob_gas_price(
diff --git a/src/ethereum/forks/bpo2/vm/instructions/keccak.py b/src/ethereum/forks/bpo2/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/bpo2/vm/instructions/keccak.py
+++ b/src/ethereum/forks/bpo2/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/bpo2/vm/instructions/log.py b/src/ethereum/forks/bpo2/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/bpo2/vm/instructions/log.py
+++ b/src/ethereum/forks/bpo2/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/bpo2/vm/instructions/memory.py b/src/ethereum/forks/bpo2/vm/instructions/memory.py
index 6e111051ee3..bba3ddf19d5 100644
--- a/src/ethereum/forks/bpo2/vm/instructions/memory.py
+++ b/src/ethereum/forks/bpo2/vm/instructions/memory.py
@@ -18,9 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_COPY,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -49,7 +47,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -80,7 +78,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -108,7 +106,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -135,7 +133,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
@@ -161,12 +159,15 @@ def mcopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(length)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
 
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(source, length), (destination, length)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_MCOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/bpo2/vm/instructions/stack.py b/src/ethereum/forks/bpo2/vm/instructions/stack.py
index 0007a28acd4..eff50ac73c9 100644
--- a/src/ethereum/forks/bpo2/vm/instructions/stack.py
+++ b/src/ethereum/forks/bpo2/vm/instructions/stack.py
@@ -12,12 +12,13 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..memory import buffer_read
 
 
@@ -35,7 +36,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -63,9 +64,9 @@ def push_n(evm: Evm, num_bytes: int) -> None:
 
     # GAS
     if num_bytes == 0:
-        charge_gas(evm, GAS_BASE)
+        charge_gas(evm, GasCosts.OPCODE_PUSH0)
     else:
-        charge_gas(evm, GAS_VERY_LOW)
+        charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -95,7 +96,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -127,7 +128,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -139,70 +140,70 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push0 = partial(push_n, num_bytes=0)
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push0: Callable[[Evm], None] = partial(push_n, num_bytes=0)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/bpo2/vm/instructions/storage.py b/src/ethereum/forks/bpo2/vm/instructions/storage.py
index 084d58cc46c..437af01941e 100644
--- a/src/ethereum/forks/bpo2/vm/instructions/storage.py
+++ b/src/ethereum/forks/bpo2/vm/instructions/storage.py
@@ -13,7 +13,7 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import (
+from ...state_tracker import (
     get_storage,
     get_storage_original,
     get_transient_storage,
@@ -22,15 +22,7 @@
 )
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
-from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
-    charge_gas,
-)
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -50,15 +42,14 @@ def sload(evm: Evm) -> None:
 
     # GAS
     if (evm.message.current_target, key) in evm.accessed_storage_keys:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        charge_gas(evm, GAS_COLD_SLOAD)
+        charge_gas(evm, GasCosts.COLD_STORAGE_ACCESS)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -79,54 +70,60 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     gas_cost = Uint(0)
 
     if (evm.message.current_target, key) not in evm.accessed_storage_keys:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        gas_cost += GAS_COLD_SLOAD
+        gas_cost += GasCosts.COLD_STORAGE_ACCESS
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost += GAS_STORAGE_SET
+            gas_cost += GasCosts.STORAGE_SET
         else:
-            gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_SLOAD
+            gas_cost += (
+                GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
+            )
     else:
-        gas_cost += GAS_WARM_ACCESS
+        gas_cost += GasCosts.WARM_ACCESS
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
             # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
             # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
             # Storage slot being restored to its original value
             if original_value == 0:
                 # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_WARM_ACCESS)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.WARM_ACCESS
+                )
             else:
                 # Slot was originally non-empty and was UPDATED earlier
                 evm.refund_counter += int(
-                    GAS_STORAGE_UPDATE - GAS_COLD_SLOAD - GAS_WARM_ACCESS
+                    GasCosts.COLD_STORAGE_WRITE
+                    - GasCosts.COLD_STORAGE_ACCESS
+                    - GasCosts.WARM_ACCESS
                 )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
@@ -147,11 +144,11 @@ def tload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
 
     # OPERATION
     value = get_transient_storage(
-        evm.message.tx_env.transient_storage, evm.message.current_target, key
+        evm.message.tx_env.state, evm.message.current_target, key
     )
     push(evm.stack, value)
 
@@ -174,11 +171,11 @@ def tstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
     if evm.message.is_static:
         raise WriteInStaticContext
     set_transient_storage(
-        evm.message.tx_env.transient_storage,
+        evm.message.tx_env.state,
         evm.message.current_target,
         key,
         new_value,
diff --git a/src/ethereum/forks/bpo2/vm/instructions/system.py b/src/ethereum/forks/bpo2/vm/instructions/system.py
index 29c3fe9e6e2..3fdfe3e4386 100644
--- a/src/ethereum/forks/bpo2/vm/instructions/system.py
+++ b/src/ethereum/forks/bpo2/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
     get_account,
@@ -40,15 +40,7 @@
 )
 from ..exceptions import OutOfGasError, Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -90,7 +82,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -104,15 +96,13 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -166,14 +156,16 @@ def create(evm: Evm) -> None:
     )
     init_code_gas = init_code_cost(Uint(memory_size))
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost + init_code_gas)
+    charge_gas(
+        evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost + init_code_gas
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -216,8 +208,8 @@ def create2(evm: Evm) -> None:
     init_code_gas = init_code_cost(Uint(memory_size))
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost
         + init_code_gas,
     )
@@ -261,7 +253,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -374,10 +366,10 @@ def call(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
@@ -388,10 +380,10 @@ def call(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -404,7 +396,7 @@ def call(evm: Evm) -> None:
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -463,10 +455,10 @@ def callcode(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -476,7 +468,7 @@ def callcode(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -489,7 +481,7 @@ def callcode(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -531,19 +523,19 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if beneficiary not in evm.accessed_addresses:
         evm.accessed_addresses.add(beneficiary)
-        gas_cost += GAS_COLD_ACCOUNT_ACCESS
+        gas_cost += GasCosts.COLD_ACCOUNT_ACCESS
 
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -551,11 +543,11 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     move_ether(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         originator,
         beneficiary,
         originator_balance,
@@ -563,10 +555,10 @@ def selfdestruct(evm: Evm) -> None:
 
     # register account for deletion only if it was created
     # in the same transaction
-    if originator in evm.message.block_env.state.created_accounts:
+    if originator in evm.message.tx_env.state.created_accounts:
         # If beneficiary is the same as originator, then
         # the ether is burnt.
-        set_account_balance(evm.message.block_env.state, originator, U256(0))
+        set_account_balance(evm.message.tx_env.state, originator, U256(0))
         evm.accounts_to_delete.add(originator)
 
     # HALT the execution
@@ -604,10 +596,10 @@ def delegatecall(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -673,10 +665,10 @@ def staticcall(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
diff --git a/src/ethereum/forks/bpo2/vm/interpreter.py b/src/ethereum/forks/bpo2/vm/interpreter.py
index a7b27243123..5be8a929f02 100644
--- a/src/ethereum/forks/bpo2/vm/interpreter.py
+++ b/src/ethereum/forks/bpo2/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,22 +31,22 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     get_account,
     get_code,
     increment_nonce,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
 )
 from ..vm import Message
 from ..vm.eoa_delegation import get_delegated_code_address, set_delegation
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -66,6 +66,7 @@
 MAX_INIT_CODE_SIZE = 2 * MAX_CODE_SIZE
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -105,12 +106,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -131,8 +132,8 @@ def process_message_call(message: Message) -> MessageCallOutput:
             message.disable_precompiles = True
             message.accessed_addresses.add(delegated_address)
             message.code = get_code(
-                block_env.state,
-                get_account(block_env.state, delegated_address).code_hash,
+                tx_state,
+                get_account(tx_state, delegated_address).code_hash,
             )
             message.code_address = delegated_address
 
@@ -176,22 +177,31 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
-    transient_storage = message.tx_env.transient_storage
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
-
-    # The list of created accounts is used by `get_storage_original`.
-    # Additionally, the list is needed to respect the constraints
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts. This tracking is also needed to respect the constraints
     # added to SELFDESTRUCT by EIP-6780.
-    mark_account_created(state, message.current_target)
+    mark_account_created(tx_state, message.current_target)
 
-    increment_nonce(state, message.current_target)
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             if len(contract_code) > 0:
@@ -201,15 +211,14 @@ def process_create_message(message: Message) -> Evm:
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state, transient_storage)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state, transient_storage)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -228,11 +237,10 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
-    transient_storage = message.tx_env.transient_storage
     code = message.code
     valid_jump_destinations = get_valid_jump_destinations(code)
     evm = Evm(
@@ -255,11 +263,14 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
+    snapshot = copy_tx_state(tx_state)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -291,9 +302,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state, transient_storage)
-    else:
-        commit_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/bpo2/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/bpo2/vm/precompiled_contracts/alt_bn128.py
index 214725d8da0..862506c54c3 100644
--- a/src/ethereum/forks/bpo2/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/bpo2/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(150))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(6000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(34000 * (len(data) // 192) + 45000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/bpo2/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/bpo2/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/bpo2/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/bpo2/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/bpo2/vm/precompiled_contracts/bls12_381/__init__.py b/src/ethereum/forks/bpo2/vm/precompiled_contracts/bls12_381/__init__.py
index c99e7573f48..7d622da39d1 100644
--- a/src/ethereum/forks/bpo2/vm/precompiled_contracts/bls12_381/__init__.py
+++ b/src/ethereum/forks/bpo2/vm/precompiled_contracts/bls12_381/__init__.py
@@ -414,7 +414,7 @@ def decode_g1_scalar_pair(
 
     """
     if len(data) != 160:
-        InvalidParameter("Input should be 160 bytes long")
+        raise InvalidParameter("Input should be 160 bytes long")
 
     point = bytes_to_g1(data[:128], subgroup_check=True)
 
@@ -614,7 +614,7 @@ def decode_g2_scalar_pair(
 
     """
     if len(data) != 288:
-        InvalidParameter("Input should be 288 bytes long")
+        raise InvalidParameter("Input should be 288 bytes long")
 
     point = bytes_to_g2(data[:256], subgroup_check=True)
     n = int.from_bytes(data[256 : 256 + 32], "big")
diff --git a/src/ethereum/forks/bpo2/vm/precompiled_contracts/bls12_381/bls12_381_g1.py b/src/ethereum/forks/bpo2/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
index ae8eeba0ce6..d5681ee503b 100644
--- a/src/ethereum/forks/bpo2/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
+++ b/src/ethereum/forks/bpo2/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
@@ -20,12 +20,7 @@
 )
 
 from ....vm import Evm
-from ....vm.gas import (
-    GAS_BLS_G1_ADD,
-    GAS_BLS_G1_MAP,
-    GAS_BLS_G1_MUL,
-    charge_gas,
-)
+from ....vm.gas import GasCosts, charge_gas
 from ....vm.memory import buffer_read
 from ...exceptions import InvalidParameter
 from . import (
@@ -60,7 +55,7 @@ def bls12_g1_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1ADD)
 
     # OPERATION
     p1 = bytes_to_g1(buffer_read(data, U256(0), U256(128)))
@@ -101,7 +96,7 @@ def bls12_g1_msm(evm: Evm) -> None:
     else:
         discount = Uint(G1_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G1_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G1MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -140,7 +135,7 @@ def bls12_map_fp_to_g1(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1MAP)
 
     # OPERATION
     fp = int.from_bytes(data, "big")
diff --git a/src/ethereum/forks/bpo2/vm/precompiled_contracts/bls12_381/bls12_381_g2.py b/src/ethereum/forks/bpo2/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
index 473739b78c0..cc2d969dd86 100644
--- a/src/ethereum/forks/bpo2/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
+++ b/src/ethereum/forks/bpo2/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
@@ -20,12 +20,7 @@
 )
 
 from ....vm import Evm
-from ....vm.gas import (
-    GAS_BLS_G2_ADD,
-    GAS_BLS_G2_MAP,
-    GAS_BLS_G2_MUL,
-    charge_gas,
-)
+from ....vm.gas import GasCosts, charge_gas
 from ....vm.memory import buffer_read
 from ...exceptions import InvalidParameter
 from . import (
@@ -61,7 +56,7 @@ def bls12_g2_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2ADD)
 
     # OPERATION
     p1 = bytes_to_g2(buffer_read(data, U256(0), U256(256)))
@@ -102,7 +97,7 @@ def bls12_g2_msm(evm: Evm) -> None:
     else:
         discount = Uint(G2_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G2_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G2MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -141,7 +136,7 @@ def bls12_map_fp2_to_g2(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2MAP)
 
     # OPERATION
     field_element = bytes_to_fq2(data)
diff --git a/src/ethereum/forks/bpo2/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/bpo2/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/bpo2/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/bpo2/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/bpo2/vm/precompiled_contracts/identity.py b/src/ethereum/forks/bpo2/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..4b294aeefc2 100644
--- a/src/ethereum/forks/bpo2/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/bpo2/vm/precompiled_contracts/identity.py
@@ -11,12 +11,12 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +32,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/bpo2/vm/precompiled_contracts/p256verify.py b/src/ethereum/forks/bpo2/vm/precompiled_contracts/p256verify.py
index 106dd548a61..29c2e91e0f0 100644
--- a/src/ethereum/forks/bpo2/vm/precompiled_contracts/p256verify.py
+++ b/src/ethereum/forks/bpo2/vm/precompiled_contracts/p256verify.py
@@ -24,7 +24,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_P256VERIFY, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -41,7 +41,7 @@ def p256verify(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_P256VERIFY)
+    charge_gas(evm, GasCosts.PRECOMPILE_P256VERIFY)
 
     if len(data) != 160:
         return
diff --git a/src/ethereum/forks/bpo2/vm/precompiled_contracts/point_evaluation.py b/src/ethereum/forks/bpo2/vm/precompiled_contracts/point_evaluation.py
index ce4eed71294..d2d105ba13b 100644
--- a/src/ethereum/forks/bpo2/vm/precompiled_contracts/point_evaluation.py
+++ b/src/ethereum/forks/bpo2/vm/precompiled_contracts/point_evaluation.py
@@ -22,7 +22,7 @@
 
 from ...vm import Evm
 from ...vm.exceptions import KZGProofError
-from ...vm.gas import GAS_POINT_EVALUATION, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 FIELD_ELEMENTS_PER_BLOB = 4096
 BLS_MODULUS = 52435875175126190479447740508185965837690552500527637822603658699938581184513  # noqa: E501
@@ -51,7 +51,7 @@ def point_evaluation(evm: Evm) -> None:
     proof = Bytes48(data[144:192])
 
     # GAS
-    charge_gas(evm, GAS_POINT_EVALUATION)
+    charge_gas(evm, GasCosts.PRECOMPILE_POINT_EVALUATION)
     if kzg_commitment_to_versioned_hash(commitment) != versioned_hash:
         raise KZGProofError
 
diff --git a/src/ethereum/forks/bpo2/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/bpo2/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..bbdf365d0d9 100644
--- a/src/ethereum/forks/bpo2/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/bpo2/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,13 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +35,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/bpo2/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/bpo2/vm/precompiled_contracts/sha256.py
index b0d1517b40e..f0f48b54553 100644
--- a/src/ethereum/forks/bpo2/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/bpo2/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,12 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +34,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/bpo3/blocks.py b/src/ethereum/forks/bpo3/blocks.py
index 9ea170b08a7..df26affccfb 100644
--- a/src/ethereum/forks/bpo3/blocks.py
+++ b/src/ethereum/forks/bpo3/blocks.py
@@ -10,7 +10,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
@@ -31,6 +31,7 @@
 )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Withdrawal:
@@ -64,6 +65,7 @@ class Withdrawal:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -107,13 +109,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.bpo3.state.state_root
-    [Trie]: ref:ethereum.forks.bpo3.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -123,8 +126,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.bpo3.trie.root
-    [Trie]: ref:ethereum.forks.bpo3.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -134,8 +137,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.bpo3.trie.root
-    [Trie]: ref:ethereum.forks.bpo3.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -244,6 +247,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -297,6 +301,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -329,6 +334,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/bpo3/fork.py b/src/ethereum/forks/bpo3/fork.py
index 3dfd35f98a8..fcdff89d045 100644
--- a/src/ethereum/forks/bpo3/fork.py
+++ b/src/ethereum/forks/bpo3/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Tuple
+from typing import Final, List, Optional, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
@@ -27,7 +27,13 @@
     InvalidSenderError,
     NonceMismatchError,
 )
-from ethereum.state import EMPTY_CODE_HASH, Account, Address
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt, Withdrawal, encode_receipt
@@ -51,19 +57,19 @@
     compute_requests_hash,
     parse_deposit_requests,
 )
-from .state import (
-    State,
-    TransientStorage,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
+    create_ether,
     destroy_account,
+    extract_block_diff,
     get_account,
     get_code,
+    incorporate_tx_into_block,
     increment_nonce,
-    modify_state,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
-    AccessListTransaction,
     BlobTransaction,
     FeeMarketTransaction,
     LegacyTransaction,
@@ -72,17 +78,16 @@
     decode_transaction,
     encode_transaction,
     get_transaction_hash,
+    has_access_list,
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.hexadecimal import hex_to_address
 from .utils.message import prepare_message
 from .vm import Message
 from .vm.eoa_delegation import is_valid_delegation
 from .vm.gas import (
-    BLOB_SCHEDULE_MAX,
-    GAS_PER_BLOB,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_data_fee,
     calculate_excess_blob_gas,
@@ -92,15 +97,15 @@
 
 BASE_FEE_MAX_CHANGE_DENOMINATOR = Uint(8)
 ELASTICITY_MULTIPLIER = Uint(2)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 SYSTEM_ADDRESS = hex_to_address("0xfffffffffffffffffffffffffffffffffffffffe")
 BEACON_ROOTS_ADDRESS = hex_to_address(
     "0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02"
 )
 SYSTEM_TRANSACTION_GAS = Uint(30000000)
-MAX_BLOB_GAS_PER_BLOCK = BLOB_SCHEDULE_MAX * GAS_PER_BLOB
+MAX_BLOB_GAS_PER_BLOCK: Final[U64] = (
+    GasCosts.BLOB_SCHEDULE_MAX * GasCosts.PER_BLOB
+)
 VERSIONED_HASH_VERSION_KZG = b"\x01"
 
 WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS = hex_to_address(
@@ -118,6 +123,7 @@
 BLOB_COUNT_LIMIT = 6
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -223,9 +229,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block.ommers != ():
         raise InvalidBlock
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -242,7 +250,10 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         withdrawals=block.withdrawals,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes, block_diff.storage_changes
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -268,6 +279,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if requests_hash != block.header.requests_hash:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -399,6 +411,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Tuple[Address, Uint, Tuple[VersionedHash, ...], U64]:
     """
     Check if the transaction is includable in the block.
@@ -411,6 +424,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -469,7 +484,7 @@ def check_transaction(
         raise BlobGasLimitExceededError("blob gas limit exceeded")
 
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     if isinstance(
         tx, (FeeMarketTransaction, BlobTransaction, SetCodeTransaction)
@@ -537,7 +552,7 @@ def check_transaction(
 
     if Uint(sender_account.balance) < max_gas_fee + Uint(tx.value):
         raise InsufficientBalanceError("insufficient sender balance")
-    sender_code = get_code(block_env.state, sender_account.code_hash)
+    sender_code = get_code(tx_state, sender_account.code_hash)
     if sender_account.code_hash != EMPTY_CODE_HASH and not is_valid_delegation(
         sender_code
     ):
@@ -588,74 +603,6 @@ def make_receipt(
     return encode_receipt(tx, receipt)
 
 
-def process_system_transaction(
-    block_env: vm.BlockEnvironment,
-    target_address: Address,
-    system_contract_code: Bytes,
-    data: Bytes,
-) -> MessageCallOutput:
-    """
-    Process a system transaction with the given code.
-
-    Prefer calling `process_checked_system_transaction` or
-    `process_unchecked_system_transaction` depending on whether missing code or
-    an execution error should cause the block to be rejected.
-
-    Parameters
-    ----------
-    block_env :
-        The block scoped environment.
-    target_address :
-        Address of the contract to call.
-    system_contract_code :
-        Code of the contract to call.
-    data :
-        Data to pass to the contract.
-
-    Returns
-    -------
-    system_tx_output : `MessageCallOutput`
-        Output of processing the system transaction.
-
-    """
-    tx_env = vm.TransactionEnvironment(
-        origin=SYSTEM_ADDRESS,
-        gas_price=block_env.base_fee_per_gas,
-        gas=SYSTEM_TRANSACTION_GAS,
-        access_list_addresses=set(),
-        access_list_storage_keys=set(),
-        transient_storage=TransientStorage(),
-        blob_versioned_hashes=(),
-        authorizations=(),
-        index_in_block=None,
-        tx_hash=None,
-    )
-
-    system_tx_message = Message(
-        block_env=block_env,
-        tx_env=tx_env,
-        caller=SYSTEM_ADDRESS,
-        target=target_address,
-        gas=SYSTEM_TRANSACTION_GAS,
-        value=U256(0),
-        data=data,
-        code=system_contract_code,
-        depth=Uint(0),
-        current_target=target_address,
-        code_address=target_address,
-        should_transfer_value=False,
-        is_static=False,
-        accessed_addresses=set(),
-        accessed_storage_keys=set(),
-        disable_precompiles=False,
-        parent_evm=None,
-    )
-
-    system_tx_output = process_message_call(system_tx_message)
-
-    return system_tx_output
-
-
 def process_checked_system_transaction(
     block_env: vm.BlockEnvironment,
     target_address: Address,
@@ -680,9 +627,18 @@ def process_checked_system_transaction(
         Output of processing the system transaction.
 
     """
+    # Pre-check that the system contract has code. We use a throwaway
+    # TransactionState here that is *never* propagated back to BlockState
+    # (no incorporate_tx_into_block call); the same get_account / get_code
+    # lookups are performed and properly tracked by
+    # process_unchecked_system_transaction below, which this function
+    # always calls. Reading via a TransactionState (rather than directly
+    # against pre_state) lets us see system contracts deployed earlier in
+    # the same block — see EIP-7002 and EIP-7251 for this edge case.
+    untracked_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        untracked_state,
+        get_account(untracked_state, target_address).code_hash,
     )
 
     if len(system_contract_code) == 0:
@@ -691,10 +647,9 @@ def process_checked_system_transaction(
             "contain code"
         )
 
-    system_tx_output = process_system_transaction(
+    system_tx_output = process_unchecked_system_transaction(
         block_env,
         target_address,
-        system_contract_code,
         data,
     )
 
@@ -713,8 +668,8 @@ def process_unchecked_system_transaction(
     data: Bytes,
 ) -> MessageCallOutput:
     """
-    Process a system transaction without checking if the contract contains code
-    or if the transaction fails.
+    Process a system transaction without checking if the contract contains
+    code or if the transaction fails.
 
     Parameters
     ----------
@@ -731,17 +686,51 @@ def process_unchecked_system_transaction(
         Output of processing the system transaction.
 
     """
+    system_tx_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        system_tx_state,
+        get_account(system_tx_state, target_address).code_hash,
     )
-    return process_system_transaction(
-        block_env,
-        target_address,
-        system_contract_code,
-        data,
+
+    tx_env = vm.TransactionEnvironment(
+        origin=SYSTEM_ADDRESS,
+        gas_price=block_env.base_fee_per_gas,
+        gas=SYSTEM_TRANSACTION_GAS,
+        access_list_addresses=set(),
+        access_list_storage_keys=set(),
+        state=system_tx_state,
+        blob_versioned_hashes=(),
+        authorizations=(),
+        index_in_block=None,
+        tx_hash=None,
+    )
+
+    system_tx_message = Message(
+        block_env=block_env,
+        tx_env=tx_env,
+        caller=SYSTEM_ADDRESS,
+        target=target_address,
+        gas=SYSTEM_TRANSACTION_GAS,
+        value=U256(0),
+        data=data,
+        code=system_contract_code,
+        depth=Uint(0),
+        current_target=target_address,
+        code_address=target_address,
+        should_transfer_value=False,
+        is_static=False,
+        accessed_addresses=set(),
+        accessed_storage_keys=set(),
+        disable_precompiles=False,
+        parent_evm=None,
     )
 
+    system_tx_output = process_message_call(system_tx_message)
+
+    incorporate_tx_into_block(system_tx_state)
+
+    return system_tx_output
+
 
 def apply_body(
     block_env: vm.BlockEnvironment,
@@ -875,6 +864,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(
         block_output.transactions_trie,
         rlp.encode(index),
@@ -892,9 +883,10 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     if isinstance(tx, BlobTransaction):
         blob_gas_fee = calculate_data_fee(block_env.excess_blob_gas, tx)
@@ -904,27 +896,17 @@ def process_transaction(
     effective_gas_fee = tx.gas * effective_gas_price
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     sender_balance_after_gas_fee = (
         Uint(sender_account.balance) - effective_gas_fee - blob_gas_fee
     )
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     access_list_addresses = set()
     access_list_storage_keys = set()
     access_list_addresses.add(block_env.coinbase)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
             access_list_addresses.add(access.account)
             for slot in access.slots:
@@ -940,7 +922,7 @@ def process_transaction(
         gas=gas,
         access_list_addresses=access_list_addresses,
         access_list_storage_keys=access_list_storage_keys,
-        transient_storage=TransientStorage(),
+        state=tx_state,
         blob_versioned_hashes=blob_versioned_hashes,
         authorizations=authorizations,
         index_in_block=index,
@@ -973,23 +955,13 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * priority_fee_per_gas
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
-    coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
-    ).balance + U256(transaction_fee)
-    set_account_balance(
-        block_env.state,
-        block_env.coinbase,
-        coinbase_balance_after_mining_fee,
-    )
+    create_ether(tx_state, block_env.coinbase, U256(transaction_fee))
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
     block_output.block_gas_used += tx_gas_used_after_refund
     block_output.blob_gas_used += tx_blob_gas_used
@@ -1009,6 +981,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def process_withdrawals(
     block_env: vm.BlockEnvironment,
@@ -1018,9 +992,7 @@ def process_withdrawals(
     """
     Increase the balance of the withdrawing account.
     """
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += wd.amount * U256(10**9)
+    wd_state = TransactionState(parent=block_env.state)
 
     for i, wd in enumerate(withdrawals):
         trie_set(
@@ -1029,7 +1001,9 @@ def increase_recipient_balance(recipient: Account) -> None:
             rlp.encode(wd),
         )
 
-        modify_state(block_env.state, wd.address, increase_recipient_balance)
+        create_ether(wd_state, wd.address, wd.amount * U256(10**9))
+
+    incorporate_tx_into_block(wd_state)
 
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
@@ -1038,14 +1012,14 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
-    passed through as a parameter is greater than or equal to the *sum* of
-    the parent's gas and the adjustment delta then the limit for gas is too
-    high and fails this function's check. Similarly, if the limit is less
-    than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
-    check fails because the gas limit doesn't allow for a sufficient or
-    reasonable amount of gas to be used on a block.
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is passed
+    through as a parameter is greater than or equal to the *sum* of the
+    parent's gas and the adjustment delta then the limit for gas is too high
+    and fails this function's check. Similarly, if the limit is less than or
+    equal to the *difference* of the parent's gas and the adjustment delta *or*
+    the predefined ``LIMIT_MINIMUM`` then this function's check fails because
+    the gas limit doesn't allow for a sufficient or reasonable amount of gas to
+    be used on a block.
 
     Parameters
     ----------
@@ -1061,12 +1035,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/bpo3/fork_types.py b/src/ethereum/forks/bpo3/fork_types.py
index c598e9876bf..4bec34810db 100644
--- a/src/ethereum/forks/bpo3/fork_types.py
+++ b/src/ethereum/forks/bpo3/fork_types.py
@@ -12,6 +12,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes256
@@ -43,6 +44,7 @@ def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Authorization:
diff --git a/src/ethereum/forks/bpo3/requests.py b/src/ethereum/forks/bpo3/requests.py
index 542c9264d37..1bceb4efbeb 100644
--- a/src/ethereum/forks/bpo3/requests.py
+++ b/src/ethereum/forks/bpo3/requests.py
@@ -1,11 +1,31 @@
 """
-Requests were introduced in EIP-7685 as a general purpose framework for
-storing contract-triggered requests. It extends the execution header and
-body with a single field each to store the request information.
-This inherently exposes the requests to the consensus layer, which can
-then process each one.
-
+[EIP-7685] generalizes how the execution layer communicates validator actions
+to the consensus layer. Rather than adding a dedicated header field for each
+new action type (as [EIP-4895] did for withdrawals), the execution header
+commits to a single [`requests_hash`][rh] that aggregates an ordered list of
+typed requests.
+
+Each request is a type byte (see [`DEPOSIT_REQUEST_TYPE`][dt],
+[`WITHDRAWAL_REQUEST_TYPE`][wt], and [`CONSOLIDATION_REQUEST_TYPE`][ct])
+followed by an opaque payload. Deposit requests are discovered by scanning
+transaction receipts for logs emitted by the deposit contract; withdrawal
+and consolidation requests are produced by the corresponding system
+contracts during block processing.
+
+See [`parse_deposit_requests`][pd] for how deposit logs become request data,
+[`compute_requests_hash`][crh] for how the list is hashed for inclusion in the
+header, and [`process_general_purpose_requests`][pgpr] for how the requests are
+processed.
+
+[EIP-4895]: https://eips.ethereum.org/EIPS/eip-4895
 [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+[rh]: ref:ethereum.forks.bpo3.blocks.Header.requests_hash
+[dt]: ref:ethereum.forks.bpo3.requests.DEPOSIT_REQUEST_TYPE
+[wt]: ref:ethereum.forks.bpo3.requests.WITHDRAWAL_REQUEST_TYPE
+[ct]: ref:ethereum.forks.bpo3.requests.CONSOLIDATION_REQUEST_TYPE
+[pd]: ref:ethereum.forks.bpo3.requests.parse_deposit_requests
+[crh]: ref:ethereum.forks.bpo3.requests.compute_requests_hash
+[pgpr]: ref:ethereum.forks.bpo3.fork.process_general_purpose_requests
 """
 
 from hashlib import sha256
@@ -15,48 +35,133 @@
 from ethereum_types.numeric import Uint, ulen
 
 from ethereum.exceptions import InvalidBlock
+from ethereum.merkle_patricia_trie import trie_get
 from ethereum.utils.hexadecimal import hex_to_bytes32
 
 from .blocks import decode_receipt
-from .trie import trie_get
 from .utils.hexadecimal import hex_to_address
 from .vm import BlockOutput
 
 DEPOSIT_CONTRACT_ADDRESS = hex_to_address(
     "0x00000000219ab540356cbb839cbe05303d7705fa"
 )
+"""
+Mainnet address of the beacon chain deposit contract. Scanning block
+receipts for logs emitted by this address is how the execution layer
+discovers validator deposits, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 DEPOSIT_EVENT_SIGNATURE_HASH = hex_to_bytes32(
     "0x649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c5"
 )
+"""
+First [log topic] of the deposit contract's `DepositEvent`, equal to the
+keccak256 of its Solidity event signature. Logs whose first topic does not
+match this are ignored when collecting deposit requests.
+
+[log topic]: https://docs.soliditylang.org/en/latest/abi-spec.html#events
+"""
+
 DEPOSIT_REQUEST_TYPE = b"\x00"
+"""
+Request type byte identifying a deposit request, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 WITHDRAWAL_REQUEST_TYPE = b"\x01"
+"""
+Request type byte identifying an execution-triggered withdrawal request,
+per [EIP-7002].
+
+[EIP-7002]: https://eips.ethereum.org/EIPS/eip-7002
+"""
+
 CONSOLIDATION_REQUEST_TYPE = b"\x02"
+"""
+Request type byte identifying a consolidation request, per [EIP-7251].
+
+[EIP-7251]: https://eips.ethereum.org/EIPS/eip-7251
+"""
 
 
 DEPOSIT_EVENT_LENGTH = Uint(576)
+"""
+Total length in bytes of the ABI-encoded `DepositEvent` data payload. Every
+well-formed event has this exact length.
+"""
 
 PUBKEY_OFFSET = Uint(160)
+"""
+Position within the event payload of the validator public key's length
+prefix, as emitted by the Solidity ABI encoder.
+"""
+
 WITHDRAWAL_CREDENTIALS_OFFSET = Uint(256)
+"""
+Position within the event payload of the withdrawal credentials' length
+prefix.
+"""
+
 AMOUNT_OFFSET = Uint(320)
+"""
+Position within the event payload of the deposit amount's length prefix.
+"""
+
 SIGNATURE_OFFSET = Uint(384)
+"""
+Position within the event payload of the deposit signature's length prefix.
+"""
+
 INDEX_OFFSET = Uint(512)
+"""
+Position within the event payload of the deposit index's length prefix.
+"""
 
 PUBKEY_SIZE = Uint(48)
+"""
+Length of the BLS12-381 public key that identifies the validator receiving
+the deposit.
+"""
+
 WITHDRAWAL_CREDENTIALS_SIZE = Uint(32)
+"""
+Length of the withdrawal credentials, which determine where the staked
+ether may eventually be withdrawn.
+"""
+
 AMOUNT_SIZE = Uint(8)
+"""
+Length of the little-endian Gwei amount being deposited.
+"""
+
 SIGNATURE_SIZE = Uint(96)
+"""
+Length of the BLS12-381 signature over the deposit message.
+"""
+
 INDEX_SIZE = Uint(8)
+"""
+Length of the monotonically-increasing deposit index assigned by the
+deposit contract when it emits the event.
+"""
 
 
 def extract_deposit_data(data: Bytes) -> Bytes:
     """
-    Extracts Deposit Request from the DepositContract.DepositEvent data.
+    Strip the Solidity ABI framing from a `DepositEvent` payload and return
+    the concatenated raw fields in the order consumed by the consensus
+    layer: public key, withdrawal credentials, amount, signature, and
+    deposit index.
 
-    Raises
-    ------
-    InvalidBlock :
-        If the deposit contract did not produce a valid log.
+    Because each field has a fixed length, every well-formed event has an
+    identical byte layout. Any deviation indicates a misbehaving or
+    compromised deposit contract, so this function raises [`InvalidBlock`]
+    rather than silently accepting unexpected data.
 
+    [`InvalidBlock`]: ref:ethereum.exceptions.InvalidBlock
     """
     if ulen(data) != DEPOSIT_EVENT_LENGTH:
         raise InvalidBlock("Invalid deposit event data length")
@@ -150,7 +255,19 @@ def extract_deposit_data(data: Bytes) -> Bytes:
 
 def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
     """
-    Parse deposit requests from the block output.
+    Walk the receipts produced during block execution, concatenating the
+    raw payload of every valid deposit event into a single byte string.
+
+    A log is considered a deposit when it originates from
+    [`DEPOSIT_CONTRACT_ADDRESS`][addr] and its first topic matches
+    [`DEPOSIT_EVENT_SIGNATURE_HASH`][sig]. The returned bytes are the
+    direct concatenation of the unframed deposit fields, ready to be
+    prefixed with [`DEPOSIT_REQUEST_TYPE`][dt] before being appended to
+    the block's request list.
+
+    [addr]: ref:ethereum.forks.bpo3.requests.DEPOSIT_CONTRACT_ADDRESS
+    [sig]: ref:ethereum.forks.bpo3.requests.DEPOSIT_EVENT_SIGNATURE_HASH
+    [dt]: ref:ethereum.forks.bpo3.requests.DEPOSIT_REQUEST_TYPE
     """
     deposit_requests: Bytes = b""
     for key in block_output.receipt_keys:
@@ -171,18 +288,18 @@ def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
 
 def compute_requests_hash(requests: List[Bytes]) -> Bytes:
     """
-    Get the hash of the requests using the SHA2-256 algorithm.
-
-    Parameters
-    ----------
-    requests : Bytes
-        The requests to hash.
-
-    Returns
-    -------
-    requests_hash : Bytes
-        The hash of the requests.
-
+    Compute the [SHA2-256] commitment over an ordered list of
+    type-prefixed requests, as defined by [EIP-7685].
+
+    The commitment is the SHA2-256 hash of the concatenation of the
+    SHA2-256 hashes of each individual request. This is what the
+    execution header's [`requests_hash`][rh] stores, and what the
+    consensus layer re-derives to validate that both layers observed the
+    same set of requests.
+
+    [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+    [SHA2-256]: https://en.wikipedia.org/wiki/SHA-2
+    [rh]: ref:ethereum.forks.bpo3.blocks.Header.requests_hash
     """
     m = sha256()
     for request in requests:
diff --git a/src/ethereum/forks/bpo3/state.py b/src/ethereum/forks/bpo3/state.py
deleted file mode 100644
index 342bda1a1cd..00000000000
--- a/src/ethereum/forks/bpo3/state.py
+++ /dev/null
@@ -1,713 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-from ethereum.state import (
-    EMPTY_ACCOUNT,
-    EMPTY_CODE_HASH,
-    Account,
-    Address,
-    Root,
-)
-
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-    def get_code(self, code_hash: Hash32) -> Bytes:
-        """
-        Get the bytecode for a given code hash.
-
-        Return ``b""`` for ``EMPTY_CODE_HASH``.
-        """
-        if code_hash == EMPTY_CODE_HASH:
-            return b""
-        return self._code_store[code_hash]
-
-
-@dataclass
-class TransientStorage:
-    """
-    Contains all information that is preserved between message calls
-    within a transaction.
-    """
-
-    _tries: Dict[Address, Trie[Bytes32, U256]] = field(default_factory=dict)
-    _snapshots: List[Dict[Address, Trie[Bytes32, U256]]] = field(
-        default_factory=list
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-
-
-def begin_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-    transient_storage._snapshots.append(
-        {k: copy_trie(t) for (k, t) in transient_storage._tries.items()}
-    )
-
-
-def commit_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._snapshots.pop()
-
-
-def rollback_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._tries = transient_storage._snapshots.pop()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-
-    Return ``b""`` for ``EMPTY_CODE_HASH``.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State`` and return its hash.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase, and to respect the constraints added to SELFDESTRUCT by
-    EIP-6780.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`. If, after modification, the account
-    exists and has zero nonce, empty code, and zero balance, it is destroyed.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-    account = get_account_optional(state, address)
-    account_exists_and_is_empty = (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-    if account_exists_and_is_empty:
-        destroy_account(state, address)
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
-
-
-def get_transient_storage(
-    transient_storage: TransientStorage, address: Address, key: Bytes32
-) -> U256:
-    """
-    Get a value at a storage key on an account from transient storage.
-    Returns `U256(0)` if the storage key has not been set previously.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_transient_storage(
-    transient_storage: TransientStorage,
-    address: Address,
-    key: Bytes32,
-    value: U256,
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        transient_storage._tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del transient_storage._tries[address]
diff --git a/src/ethereum/forks/bpo3/state_tracker.py b/src/ethereum/forks/bpo3/state_tracker.py
new file mode 100644
index 00000000000..67ceaa86321
--- /dev/null
+++ b/src/ethereum/forks/bpo3/state_tracker.py
@@ -0,0 +1,749 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state. If, after modification, the
+    account exists and has zero nonce, empty code, and zero balance, it
+    is destroyed.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+    if account_exists_and_is_empty(tx_state, address):
+        destroy_account(tx_state, address)
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+    )
diff --git a/src/ethereum/forks/bpo3/transactions.py b/src/ethereum/forks/bpo3/transactions.py
index 048852529e4..18953538456 100644
--- a/src/ethereum/forks/bpo3/transactions.py
+++ b/src/ethereum/forks/bpo3/transactions.py
@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, TypeGuard, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -28,46 +28,10 @@
 )
 from .fork_types import Authorization, VersionedHash
 
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_TOKEN_FLOOR = Uint(10)
-"""
-Minimum gas cost per byte of calldata as per [EIP-7623]. Used to calculate
-the minimum gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_DATA_TOKEN_STANDARD = Uint(4)
-"""
-Gas cost per byte of calldata as per [EIP-7623]. Used to calculate the
-gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
-
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
-"""
-
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
-"""
-
 TX_MAX_GAS_LIMIT = Uint(16_777_216)
 
 
+@final
 @slotted_freezable
 @dataclass
 class LegacyTransaction:
@@ -130,6 +94,7 @@ class LegacyTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Access:
@@ -149,6 +114,7 @@ class Access:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccessListTransaction:
@@ -221,6 +187,7 @@ class AccessListTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class FeeMarketTransaction:
@@ -298,6 +265,7 @@ class FeeMarketTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class BlobTransaction:
@@ -386,6 +354,7 @@ class BlobTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class SetCodeTransaction:
@@ -481,6 +450,23 @@ class SetCodeTransaction:
 """
 
 
+AccessListCapableTransaction = (
+    AccessListTransaction
+    | FeeMarketTransaction
+    | BlobTransaction
+    | SetCodeTransaction
+)
+"""
+Transaction types that include an [EIP-2930]-style access list.
+
+See [`has_access_list`][hal] and [`Access`][a] for more details.
+
+[EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+[hal]: ref:ethereum.forks.amsterdam.transactions.has_access_list
+[a]: ref:ethereum.forks.amsterdam.transactions.Access
+"""
+
+
 def encode_transaction(tx: Transaction) -> LegacyTransaction | Bytes:
     """
     Encode a transaction into its RLP or typed transaction format.
@@ -584,7 +570,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
     4. Cost for access list entries (if applicable)
@@ -595,8 +581,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     gas cost of the transaction and the minimum gas cost used by the
     transaction based on the calldata size.
     """
-    from .vm.eoa_delegation import GAS_AUTH_PER_EMPTY_ACCOUNT
-    from .vm.gas import init_code_cost
+    from .vm.gas import GasCosts, init_code_cost
 
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
@@ -604,39 +589,33 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     tokens_in_calldata = num_zeros + num_non_zeros * Uint(4)
     # EIP-7623 floor price (note: no EVM costs)
     calldata_floor_gas_cost = (
-        tokens_in_calldata * GAS_TX_DATA_TOKEN_FLOOR + GAS_TX_BASE
+        tokens_in_calldata * GasCosts.TX_DATA_TOKEN_FLOOR + GasCosts.TX_BASE
     )
 
-    data_cost = tokens_in_calldata * GAS_TX_DATA_TOKEN_STANDARD
+    data_cost = tokens_in_calldata * GasCosts.TX_DATA_TOKEN_STANDARD
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE + init_code_cost(ulen(tx.data))
+        create_cost = GasCosts.TX_CREATE + init_code_cost(ulen(tx.data))
     else:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
-            access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_cost += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
 
     auth_cost = Uint(0)
     if isinstance(tx, SetCodeTransaction):
-        auth_cost += Uint(GAS_AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations))
+        auth_cost += Uint(
+            GasCosts.AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations)
+        )
 
     return (
         Uint(
-            GAS_TX_BASE
+            GasCosts.TX_BASE
             + data_cost
             + create_cost
             + access_list_cost
@@ -884,3 +863,17 @@ def get_transaction_hash(tx: Bytes | LegacyTransaction) -> Hash32:
         return keccak256(rlp.encode(tx))
     else:
         return keccak256(tx)
+
+
+def has_access_list(
+    tx: Transaction,
+) -> TypeGuard[AccessListCapableTransaction]:
+    """
+    Return whether the transaction has an [EIP-2930]-style access list.
+
+    [EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+    """
+    return isinstance(
+        tx,
+        AccessListCapableTransaction,
+    )
diff --git a/src/ethereum/forks/bpo3/trie.py b/src/ethereum/forks/bpo3/trie.py
deleted file mode 100644
index 3f422cfcebb..00000000000
--- a/src/ethereum/forks/bpo3/trie.py
+++ /dev/null
@@ -1,509 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-from typing_extensions import assert_type
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.bpo2 import trie as previous_trie
-from ethereum.state import Account, Address, Root
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt, Withdrawal
-from .fork_types import encode_account
-from .transactions import LegacyTransaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = (
-    Account
-    | Bytes
-    | LegacyTransaction
-    | Receipt
-    | Uint
-    | U256
-    | Withdrawal
-    | None
-)
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[LegacyTransaction | Bytes],
-    Optional[Receipt | Bytes],
-    Optional[Withdrawal | Bytes],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `Extended`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (LegacyTransaction, Receipt, Withdrawal, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/bpo3/utils/message.py b/src/ethereum/forks/bpo3/utils/message.py
index 5154350fd43..5e3386c543a 100644
--- a/src/ethereum/forks/bpo3/utils/message.py
+++ b/src/ethereum/forks/bpo3/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
@@ -55,7 +55,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -63,8 +63,9 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        state = block_env.state
-        code = get_code(state, get_account(state, tx.to).code_hash)
+        code = get_code(
+            tx_env.state, get_account(tx_env.state, tx.to).code_hash
+        )
         code_address = tx.to
     else:
         raise AssertionError("Target must be address or empty bytes")
diff --git a/src/ethereum/forks/bpo3/vm/__init__.py b/src/ethereum/forks/bpo3/vm/__init__.py
index 37d0a327974..42229ebd849 100644
--- a/src/ethereum/forks/bpo3/vm/__init__.py
+++ b/src/ethereum/forks/bpo3/vm/__init__.py
@@ -13,24 +13,25 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt, Withdrawal
 from ..fork_types import Authorization, VersionedHash
-from ..state import State, TransientStorage
+from ..state_tracker import BlockState, TransactionState
 from ..transactions import LegacyTransaction
-from ..trie import Trie
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +39,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -50,6 +51,7 @@ class BlockEnvironment:
     parent_beacon_block_root: Hash32
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -92,10 +94,11 @@ class BlockOutput:
     requests: List[Bytes] = field(default_factory=list)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
@@ -103,13 +106,14 @@ class TransactionEnvironment:
     gas: Uint
     access_list_addresses: Set[Address]
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
-    transient_storage: TransientStorage
+    state: TransactionState
     blob_versioned_hashes: Tuple[VersionedHash, ...]
     authorizations: Tuple[Authorization, ...]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -135,6 +139,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
diff --git a/src/ethereum/forks/bpo3/vm/eoa_delegation.py b/src/ethereum/forks/bpo3/vm/eoa_delegation.py
index fce580bee4a..1ba552f8dd6 100644
--- a/src/ethereum/forks/bpo3/vm/eoa_delegation.py
+++ b/src/ethereum/forks/bpo3/vm/eoa_delegation.py
@@ -14,7 +14,7 @@
 from ethereum.state import Address
 
 from ..fork_types import Authorization
-from ..state import (
+from ..state_tracker import (
     account_exists,
     get_account,
     get_code,
@@ -22,14 +22,13 @@
     set_code,
 )
 from ..utils.hexadecimal import hex_to_address
-from ..vm.gas import GAS_COLD_ACCOUNT_ACCESS, GAS_WARM_ACCESS
+from ..vm.gas import GasCosts
 from . import Evm, Message
 
 SET_CODE_TX_MAGIC = b"\x05"
 EOA_DELEGATION_MARKER = b"\xef\x01\x00"
 EOA_DELEGATION_MARKER_LENGTH = len(EOA_DELEGATION_MARKER)
 EOA_DELEGATED_CODE_LENGTH = 23
-GAS_AUTH_PER_EMPTY_ACCOUNT = 25000
 REFUND_AUTH_PER_EXISTING_ACCOUNT = 12500
 NULL_ADDRESS = hex_to_address("0x0000000000000000000000000000000000000000")
 
@@ -140,18 +139,18 @@ def access_delegation(
         The delegation address, code, and access gas cost.
 
     """
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
     if not is_valid_delegation(code):
         return False, address, code, Uint(0)
 
     address = Address(code[EOA_DELEGATION_MARKER_LENGTH:])
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
-    code = get_code(state, get_account(state, address).code_hash)
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     return True, address, code, access_gas_cost
 
@@ -171,7 +170,7 @@ def set_delegation(message: Message) -> U256:
         Refund from authority which already exists in state.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     for auth in message.tx_env.authorizations:
         if auth.chain_id not in (message.block_env.chain_id, U256(0)):
@@ -187,8 +186,8 @@ def set_delegation(message: Message) -> U256:
 
         message.accessed_addresses.add(authority)
 
-        authority_account = get_account(state, authority)
-        authority_code = get_code(state, authority_account.code_hash)
+        authority_account = get_account(tx_state, authority)
+        authority_code = get_code(tx_state, authority_account.code_hash)
 
         if authority_code and not is_valid_delegation(authority_code):
             continue
@@ -197,24 +196,25 @@ def set_delegation(message: Message) -> U256:
         if authority_nonce != auth.nonce:
             continue
 
-        if account_exists(state, authority):
+        if account_exists(tx_state, authority):
             refund_counter += U256(
-                GAS_AUTH_PER_EMPTY_ACCOUNT - REFUND_AUTH_PER_EXISTING_ACCOUNT
+                GasCosts.AUTH_PER_EMPTY_ACCOUNT
+                - REFUND_AUTH_PER_EXISTING_ACCOUNT
             )
 
         if auth.address == NULL_ADDRESS:
             code_to_set = b""
         else:
             code_to_set = EOA_DELEGATION_MARKER + auth.address
-        set_code(state, authority, code_to_set)
+        set_code(tx_state, authority, code_to_set)
 
-        increment_nonce(state, authority)
+        increment_nonce(tx_state, authority)
 
     if message.code_address is None:
         raise InvalidBlock("Invalid type 4 transaction: no target")
 
     message.code = get_code(
-        state, get_account(state, message.code_address).code_hash
+        tx_state, get_account(tx_state, message.code_address).code_hash
     )
 
     return refund_counter
diff --git a/src/ethereum/forks/bpo3/vm/gas.py b/src/ethereum/forks/bpo3/vm/gas.py
index a2e5d1ab39a..653f6eb9ea1 100644
--- a/src/ethereum/forks/bpo3/vm/gas.py
+++ b/src/ethereum/forks/bpo3/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U64, U256, Uint
+from ethereum_types.numeric import U64, U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32, taylor_exponential
@@ -24,67 +24,172 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 4800
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-GAS_ECRECOVER = Uint(3000)
-GAS_P256VERIFY = Uint(6900)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1)
-GAS_COLD_SLOAD = Uint(2100)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600)
-GAS_WARM_ACCESS = Uint(100)
-GAS_CODE_INIT_PER_WORD = Uint(2)
-GAS_BLOBHASH_OPCODE = Uint(3)
-GAS_POINT_EVALUATION = Uint(50000)
-
-GAS_PER_BLOB = U64(2**17)
-BLOB_SCHEDULE_TARGET = U64(14)
-BLOB_TARGET_GAS_PER_BLOCK = GAS_PER_BLOB * BLOB_SCHEDULE_TARGET
-BLOB_BASE_COST = Uint(2**13)
-BLOB_SCHEDULE_MAX = U64(21)
-BLOB_MIN_GASPRICE = Uint(1)
-BLOB_BASE_FEE_UPDATE_FRACTION = Uint(11684671)
-
-GAS_BLS_G1_ADD = Uint(375)
-GAS_BLS_G1_MUL = Uint(12000)
-GAS_BLS_G1_MAP = Uint(5500)
-GAS_BLS_G2_ADD = Uint(600)
-GAS_BLS_G2_MUL = Uint(22500)
-GAS_BLS_G2_MAP = Uint(23800)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    WARM_ACCESS: Final[Uint] = Uint(100)
+    COLD_ACCOUNT_ACCESS: Final[Uint] = Uint(2600)
+    COLD_STORAGE_ACCESS: Final[Uint] = Uint(2100)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+    CODE_INIT_PER_WORD: Final[Uint] = Uint(2)
+
+    # Authorization
+    AUTH_PER_EMPTY_ACCOUNT: Final[int] = 25000
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 4800
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_P256VERIFY: Final[Uint] = Uint(6900)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1)
+    PRECOMPILE_POINT_EVALUATION: Final[Uint] = Uint(50000)
+    PRECOMPILE_BLS_G1ADD: Final[Uint] = Uint(375)
+    PRECOMPILE_BLS_G1MUL: Final[Uint] = Uint(12000)
+    PRECOMPILE_BLS_G1MAP: Final[Uint] = Uint(5500)
+    PRECOMPILE_BLS_G2ADD: Final[Uint] = Uint(600)
+    PRECOMPILE_BLS_G2MUL: Final[Uint] = Uint(22500)
+    PRECOMPILE_BLS_G2MAP: Final[Uint] = Uint(23800)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000)
+
+    # Blobs
+    PER_BLOB: Final[U64] = U64(2**17)
+    BLOB_SCHEDULE_TARGET: Final[U64] = U64(14)
+    BLOB_TARGET_GAS_PER_BLOCK: Final[U64] = PER_BLOB * BLOB_SCHEDULE_TARGET
+    BLOB_BASE_COST: Final[Uint] = Uint(2**13)
+    BLOB_SCHEDULE_MAX: Final[U64] = U64(21)
+    BLOB_MIN_GASPRICE: Final[Uint] = Uint(1)
+    BLOB_BASE_FEE_UPDATE_FRACTION: Final[Uint] = Uint(11684671)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_TOKEN_STANDARD: Final[Uint] = Uint(4)
+    TX_DATA_TOKEN_FLOOR: Final[Uint] = Uint(10)
+    TX_ACCESS_LIST_ADDRESS: Final[Uint] = Uint(2400)
+    TX_ACCESS_LIST_STORAGE_KEY: Final[Uint] = Uint(1900)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_CLZ: Final[Uint] = LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_PREVRANDAO: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_BASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBBASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBHASH: Final[Uint] = Uint(3)
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_PUSH0: Final[Uint] = BASE
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MCOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -100,11 +205,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -156,7 +262,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -186,7 +292,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -211,7 +317,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
@@ -283,7 +389,7 @@ def init_code_cost(init_code_length: Uint) -> Uint:
         The gas to be charged for the init code.
 
     """
-    return GAS_CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
+    return GasCosts.CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
 
 
 def calculate_excess_blob_gas(parent_header: Header) -> U64:
@@ -314,21 +420,23 @@ def calculate_excess_blob_gas(parent_header: Header) -> U64:
         base_fee_per_gas = parent_header.base_fee_per_gas
 
     parent_blob_gas = excess_blob_gas + blob_gas_used
-    if parent_blob_gas < BLOB_TARGET_GAS_PER_BLOCK:
+    if parent_blob_gas < GasCosts.BLOB_TARGET_GAS_PER_BLOCK:
         return U64(0)
 
-    target_blob_gas_price = Uint(GAS_PER_BLOB)
+    target_blob_gas_price = Uint(GasCosts.PER_BLOB)
     target_blob_gas_price *= calculate_blob_gas_price(excess_blob_gas)
 
-    base_blob_tx_price = BLOB_BASE_COST * base_fee_per_gas
+    base_blob_tx_price = GasCosts.BLOB_BASE_COST * base_fee_per_gas
     if base_blob_tx_price > target_blob_gas_price:
-        blob_schedule_delta = BLOB_SCHEDULE_MAX - BLOB_SCHEDULE_TARGET
+        blob_schedule_delta = (
+            GasCosts.BLOB_SCHEDULE_MAX - GasCosts.BLOB_SCHEDULE_TARGET
+        )
         return (
             excess_blob_gas
-            + blob_gas_used * blob_schedule_delta // BLOB_SCHEDULE_MAX
+            + blob_gas_used * blob_schedule_delta // GasCosts.BLOB_SCHEDULE_MAX
         )
 
-    return parent_blob_gas - BLOB_TARGET_GAS_PER_BLOCK
+    return parent_blob_gas - GasCosts.BLOB_TARGET_GAS_PER_BLOCK
 
 
 def calculate_total_blob_gas(tx: Transaction) -> U64:
@@ -347,7 +455,7 @@ def calculate_total_blob_gas(tx: Transaction) -> U64:
 
     """
     if isinstance(tx, BlobTransaction):
-        return GAS_PER_BLOB * U64(len(tx.blob_versioned_hashes))
+        return GasCosts.PER_BLOB * U64(len(tx.blob_versioned_hashes))
     else:
         return U64(0)
 
@@ -368,9 +476,9 @@ def calculate_blob_gas_price(excess_blob_gas: U64) -> Uint:
 
     """
     return taylor_exponential(
-        BLOB_MIN_GASPRICE,
+        GasCosts.BLOB_MIN_GASPRICE,
         Uint(excess_blob_gas),
-        BLOB_BASE_FEE_UPDATE_FRACTION,
+        GasCosts.BLOB_BASE_FEE_UPDATE_FRACTION,
     )
 
 
diff --git a/src/ethereum/forks/bpo3/vm/instructions/arithmetic.py b/src/ethereum/forks/bpo3/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/bpo3/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/bpo3/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/bpo3/vm/instructions/bitwise.py b/src/ethereum/forks/bpo3/vm/instructions/bitwise.py
index cc6fa2fbb23..8b41a55d2b2 100644
--- a/src/ethereum/forks/bpo3/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/bpo3/vm/instructions/bitwise.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_LOW, GAS_VERY_LOW, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -34,7 +34,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +59,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +84,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +108,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +134,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +169,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +199,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +229,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
@@ -262,7 +262,7 @@ def count_leading_zeros(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CLZ)
 
     # OPERATION
     bit_length = U256(x.bit_length())
diff --git a/src/ethereum/forks/bpo3/vm/instructions/block.py b/src/ethereum/forks/bpo3/vm/instructions/block.py
index 10fcbdbdb57..54183f4773e 100644
--- a/src/ethereum/forks/bpo3/vm/instructions/block.py
+++ b/src/ethereum/forks/bpo3/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -40,7 +40,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -89,7 +89,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -123,7 +123,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -156,7 +156,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -189,7 +189,7 @@ def prev_randao(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PREVRANDAO)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.prev_randao))
@@ -222,7 +222,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -252,7 +252,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/bpo3/vm/instructions/comparison.py b/src/ethereum/forks/bpo3/vm/instructions/comparison.py
index a6a3d99bc86..ee5c881ef0d 100644
--- a/src/ethereum/forks/bpo3/vm/instructions/comparison.py
+++ b/src/ethereum/forks/bpo3/vm/instructions/comparison.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -34,7 +34,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +60,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +87,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +113,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +140,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +166,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/bpo3/vm/instructions/control_flow.py b/src/ethereum/forks/bpo3/vm/instructions/control_flow.py
index b3b1f2316a7..d74e7b90340 100644
--- a/src/ethereum/forks/bpo3/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/bpo3/vm/instructions/control_flow.py
@@ -13,7 +13,7 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +57,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +84,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +113,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +137,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +162,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/bpo3/vm/instructions/environment.py b/src/ethereum/forks/bpo3/vm/instructions/environment.py
index 5848530a960..b6bf713df27 100644
--- a/src/ethereum/forks/bpo3/vm/instructions/environment.py
+++ b/src/ethereum/forks/bpo3/vm/instructions/environment.py
@@ -17,20 +17,13 @@
 from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BASE,
-    GAS_BLOBHASH_OPCODE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_COPY,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
-    GAS_WARM_ACCESS,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_gas_extend_memory,
     charge_gas,
@@ -52,7 +45,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -76,14 +69,15 @@ def balance(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_addresses.add(address)
-        charge_gas(evm, GAS_COLD_ACCOUNT_ACCESS)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -106,7 +100,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -129,7 +123,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -152,7 +146,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -176,7 +170,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -201,7 +195,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -230,11 +224,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -259,7 +256,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -288,11 +285,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -317,7 +317,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -341,16 +341,16 @@ def extcodesize(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -377,23 +377,23 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
 
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost + copy_gas_cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -416,7 +416,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -442,11 +442,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -475,15 +480,15 @@ def extcodehash(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -510,12 +515,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
@@ -538,7 +543,7 @@ def base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BASEFEE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.base_fee_per_gas))
@@ -561,7 +566,7 @@ def blob_hash(evm: Evm) -> None:
     index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BLOBHASH_OPCODE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBHASH)
 
     # OPERATION
     if int(index) < len(evm.message.tx_env.blob_versioned_hashes):
@@ -588,7 +593,7 @@ def blob_base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBBASEFEE)
 
     # OPERATION
     blob_base_fee = calculate_blob_gas_price(
diff --git a/src/ethereum/forks/bpo3/vm/instructions/keccak.py b/src/ethereum/forks/bpo3/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/bpo3/vm/instructions/keccak.py
+++ b/src/ethereum/forks/bpo3/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/bpo3/vm/instructions/log.py b/src/ethereum/forks/bpo3/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/bpo3/vm/instructions/log.py
+++ b/src/ethereum/forks/bpo3/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/bpo3/vm/instructions/memory.py b/src/ethereum/forks/bpo3/vm/instructions/memory.py
index 6e111051ee3..bba3ddf19d5 100644
--- a/src/ethereum/forks/bpo3/vm/instructions/memory.py
+++ b/src/ethereum/forks/bpo3/vm/instructions/memory.py
@@ -18,9 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_COPY,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -49,7 +47,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -80,7 +78,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -108,7 +106,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -135,7 +133,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
@@ -161,12 +159,15 @@ def mcopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(length)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
 
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(source, length), (destination, length)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_MCOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/bpo3/vm/instructions/stack.py b/src/ethereum/forks/bpo3/vm/instructions/stack.py
index 0007a28acd4..eff50ac73c9 100644
--- a/src/ethereum/forks/bpo3/vm/instructions/stack.py
+++ b/src/ethereum/forks/bpo3/vm/instructions/stack.py
@@ -12,12 +12,13 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..memory import buffer_read
 
 
@@ -35,7 +36,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -63,9 +64,9 @@ def push_n(evm: Evm, num_bytes: int) -> None:
 
     # GAS
     if num_bytes == 0:
-        charge_gas(evm, GAS_BASE)
+        charge_gas(evm, GasCosts.OPCODE_PUSH0)
     else:
-        charge_gas(evm, GAS_VERY_LOW)
+        charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -95,7 +96,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -127,7 +128,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -139,70 +140,70 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push0 = partial(push_n, num_bytes=0)
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push0: Callable[[Evm], None] = partial(push_n, num_bytes=0)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/bpo3/vm/instructions/storage.py b/src/ethereum/forks/bpo3/vm/instructions/storage.py
index 084d58cc46c..437af01941e 100644
--- a/src/ethereum/forks/bpo3/vm/instructions/storage.py
+++ b/src/ethereum/forks/bpo3/vm/instructions/storage.py
@@ -13,7 +13,7 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import (
+from ...state_tracker import (
     get_storage,
     get_storage_original,
     get_transient_storage,
@@ -22,15 +22,7 @@
 )
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
-from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
-    charge_gas,
-)
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -50,15 +42,14 @@ def sload(evm: Evm) -> None:
 
     # GAS
     if (evm.message.current_target, key) in evm.accessed_storage_keys:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        charge_gas(evm, GAS_COLD_SLOAD)
+        charge_gas(evm, GasCosts.COLD_STORAGE_ACCESS)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -79,54 +70,60 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     gas_cost = Uint(0)
 
     if (evm.message.current_target, key) not in evm.accessed_storage_keys:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        gas_cost += GAS_COLD_SLOAD
+        gas_cost += GasCosts.COLD_STORAGE_ACCESS
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost += GAS_STORAGE_SET
+            gas_cost += GasCosts.STORAGE_SET
         else:
-            gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_SLOAD
+            gas_cost += (
+                GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
+            )
     else:
-        gas_cost += GAS_WARM_ACCESS
+        gas_cost += GasCosts.WARM_ACCESS
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
             # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
             # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
             # Storage slot being restored to its original value
             if original_value == 0:
                 # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_WARM_ACCESS)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.WARM_ACCESS
+                )
             else:
                 # Slot was originally non-empty and was UPDATED earlier
                 evm.refund_counter += int(
-                    GAS_STORAGE_UPDATE - GAS_COLD_SLOAD - GAS_WARM_ACCESS
+                    GasCosts.COLD_STORAGE_WRITE
+                    - GasCosts.COLD_STORAGE_ACCESS
+                    - GasCosts.WARM_ACCESS
                 )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
@@ -147,11 +144,11 @@ def tload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
 
     # OPERATION
     value = get_transient_storage(
-        evm.message.tx_env.transient_storage, evm.message.current_target, key
+        evm.message.tx_env.state, evm.message.current_target, key
     )
     push(evm.stack, value)
 
@@ -174,11 +171,11 @@ def tstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
     if evm.message.is_static:
         raise WriteInStaticContext
     set_transient_storage(
-        evm.message.tx_env.transient_storage,
+        evm.message.tx_env.state,
         evm.message.current_target,
         key,
         new_value,
diff --git a/src/ethereum/forks/bpo3/vm/instructions/system.py b/src/ethereum/forks/bpo3/vm/instructions/system.py
index 29c3fe9e6e2..3fdfe3e4386 100644
--- a/src/ethereum/forks/bpo3/vm/instructions/system.py
+++ b/src/ethereum/forks/bpo3/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
     get_account,
@@ -40,15 +40,7 @@
 )
 from ..exceptions import OutOfGasError, Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -90,7 +82,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -104,15 +96,13 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -166,14 +156,16 @@ def create(evm: Evm) -> None:
     )
     init_code_gas = init_code_cost(Uint(memory_size))
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost + init_code_gas)
+    charge_gas(
+        evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost + init_code_gas
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -216,8 +208,8 @@ def create2(evm: Evm) -> None:
     init_code_gas = init_code_cost(Uint(memory_size))
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost
         + init_code_gas,
     )
@@ -261,7 +253,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -374,10 +366,10 @@ def call(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
@@ -388,10 +380,10 @@ def call(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -404,7 +396,7 @@ def call(evm: Evm) -> None:
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -463,10 +455,10 @@ def callcode(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -476,7 +468,7 @@ def callcode(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -489,7 +481,7 @@ def callcode(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -531,19 +523,19 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if beneficiary not in evm.accessed_addresses:
         evm.accessed_addresses.add(beneficiary)
-        gas_cost += GAS_COLD_ACCOUNT_ACCESS
+        gas_cost += GasCosts.COLD_ACCOUNT_ACCESS
 
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -551,11 +543,11 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     move_ether(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         originator,
         beneficiary,
         originator_balance,
@@ -563,10 +555,10 @@ def selfdestruct(evm: Evm) -> None:
 
     # register account for deletion only if it was created
     # in the same transaction
-    if originator in evm.message.block_env.state.created_accounts:
+    if originator in evm.message.tx_env.state.created_accounts:
         # If beneficiary is the same as originator, then
         # the ether is burnt.
-        set_account_balance(evm.message.block_env.state, originator, U256(0))
+        set_account_balance(evm.message.tx_env.state, originator, U256(0))
         evm.accounts_to_delete.add(originator)
 
     # HALT the execution
@@ -604,10 +596,10 @@ def delegatecall(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -673,10 +665,10 @@ def staticcall(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
diff --git a/src/ethereum/forks/bpo3/vm/interpreter.py b/src/ethereum/forks/bpo3/vm/interpreter.py
index 4111d5b4c78..b7995f3c6fc 100644
--- a/src/ethereum/forks/bpo3/vm/interpreter.py
+++ b/src/ethereum/forks/bpo3/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,22 +31,22 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     get_account,
     get_code,
     increment_nonce,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
 )
 from ..vm import Message
 from ..vm.eoa_delegation import get_delegated_code_address, set_delegation
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -66,6 +66,7 @@
 MAX_INIT_CODE_SIZE = 2 * MAX_CODE_SIZE
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -105,12 +106,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -131,8 +132,8 @@ def process_message_call(message: Message) -> MessageCallOutput:
             message.disable_precompiles = True
             message.accessed_addresses.add(delegated_address)
             message.code = get_code(
-                block_env.state,
-                get_account(block_env.state, delegated_address).code_hash,
+                tx_state,
+                get_account(tx_state, delegated_address).code_hash,
             )
             message.code_address = delegated_address
 
@@ -176,22 +177,31 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
-    transient_storage = message.tx_env.transient_storage
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
-
-    # The list of created accounts is used by `get_storage_original`.
-    # Additionally, the list is needed to respect the constraints
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts. This tracking is also needed to respect the constraints
     # added to SELFDESTRUCT by EIP-6780.
-    mark_account_created(state, message.current_target)
+    mark_account_created(tx_state, message.current_target)
 
-    increment_nonce(state, message.current_target)
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             if len(contract_code) > 0:
@@ -201,15 +211,14 @@ def process_create_message(message: Message) -> Evm:
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state, transient_storage)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state, transient_storage)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -228,11 +237,10 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
-    transient_storage = message.tx_env.transient_storage
     code = message.code
     valid_jump_destinations = get_valid_jump_destinations(code)
     evm = Evm(
@@ -255,11 +263,14 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
+    snapshot = copy_tx_state(tx_state)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -291,9 +302,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state, transient_storage)
-    else:
-        commit_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/bpo3/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/bpo3/vm/precompiled_contracts/alt_bn128.py
index 214725d8da0..862506c54c3 100644
--- a/src/ethereum/forks/bpo3/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/bpo3/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(150))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(6000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(34000 * (len(data) // 192) + 45000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/bpo3/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/bpo3/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/bpo3/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/bpo3/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/bpo3/vm/precompiled_contracts/bls12_381/__init__.py b/src/ethereum/forks/bpo3/vm/precompiled_contracts/bls12_381/__init__.py
index c99e7573f48..7d622da39d1 100644
--- a/src/ethereum/forks/bpo3/vm/precompiled_contracts/bls12_381/__init__.py
+++ b/src/ethereum/forks/bpo3/vm/precompiled_contracts/bls12_381/__init__.py
@@ -414,7 +414,7 @@ def decode_g1_scalar_pair(
 
     """
     if len(data) != 160:
-        InvalidParameter("Input should be 160 bytes long")
+        raise InvalidParameter("Input should be 160 bytes long")
 
     point = bytes_to_g1(data[:128], subgroup_check=True)
 
@@ -614,7 +614,7 @@ def decode_g2_scalar_pair(
 
     """
     if len(data) != 288:
-        InvalidParameter("Input should be 288 bytes long")
+        raise InvalidParameter("Input should be 288 bytes long")
 
     point = bytes_to_g2(data[:256], subgroup_check=True)
     n = int.from_bytes(data[256 : 256 + 32], "big")
diff --git a/src/ethereum/forks/bpo3/vm/precompiled_contracts/bls12_381/bls12_381_g1.py b/src/ethereum/forks/bpo3/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
index ae8eeba0ce6..d1f63224a0c 100644
--- a/src/ethereum/forks/bpo3/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
+++ b/src/ethereum/forks/bpo3/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G1_ADD,
-    GAS_BLS_G1_MAP,
-    GAS_BLS_G1_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -60,7 +58,7 @@ def bls12_g1_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1ADD)
 
     # OPERATION
     p1 = bytes_to_g1(buffer_read(data, U256(0), U256(128)))
@@ -101,7 +99,7 @@ def bls12_g1_msm(evm: Evm) -> None:
     else:
         discount = Uint(G1_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G1_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G1MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -140,7 +138,7 @@ def bls12_map_fp_to_g1(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1MAP)
 
     # OPERATION
     fp = int.from_bytes(data, "big")
diff --git a/src/ethereum/forks/bpo3/vm/precompiled_contracts/bls12_381/bls12_381_g2.py b/src/ethereum/forks/bpo3/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
index 473739b78c0..2fd32313f89 100644
--- a/src/ethereum/forks/bpo3/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
+++ b/src/ethereum/forks/bpo3/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G2_ADD,
-    GAS_BLS_G2_MAP,
-    GAS_BLS_G2_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -61,7 +59,7 @@ def bls12_g2_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2ADD)
 
     # OPERATION
     p1 = bytes_to_g2(buffer_read(data, U256(0), U256(256)))
@@ -102,7 +100,7 @@ def bls12_g2_msm(evm: Evm) -> None:
     else:
         discount = Uint(G2_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G2_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G2MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -141,7 +139,7 @@ def bls12_map_fp2_to_g2(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2MAP)
 
     # OPERATION
     field_element = bytes_to_fq2(data)
diff --git a/src/ethereum/forks/bpo3/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/bpo3/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/bpo3/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/bpo3/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/bpo3/vm/precompiled_contracts/identity.py b/src/ethereum/forks/bpo3/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/bpo3/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/bpo3/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/bpo3/vm/precompiled_contracts/p256verify.py b/src/ethereum/forks/bpo3/vm/precompiled_contracts/p256verify.py
index 106dd548a61..29c2e91e0f0 100644
--- a/src/ethereum/forks/bpo3/vm/precompiled_contracts/p256verify.py
+++ b/src/ethereum/forks/bpo3/vm/precompiled_contracts/p256verify.py
@@ -24,7 +24,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_P256VERIFY, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -41,7 +41,7 @@ def p256verify(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_P256VERIFY)
+    charge_gas(evm, GasCosts.PRECOMPILE_P256VERIFY)
 
     if len(data) != 160:
         return
diff --git a/src/ethereum/forks/bpo3/vm/precompiled_contracts/point_evaluation.py b/src/ethereum/forks/bpo3/vm/precompiled_contracts/point_evaluation.py
index ce4eed71294..d2d105ba13b 100644
--- a/src/ethereum/forks/bpo3/vm/precompiled_contracts/point_evaluation.py
+++ b/src/ethereum/forks/bpo3/vm/precompiled_contracts/point_evaluation.py
@@ -22,7 +22,7 @@
 
 from ...vm import Evm
 from ...vm.exceptions import KZGProofError
-from ...vm.gas import GAS_POINT_EVALUATION, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 FIELD_ELEMENTS_PER_BLOB = 4096
 BLS_MODULUS = 52435875175126190479447740508185965837690552500527637822603658699938581184513  # noqa: E501
@@ -51,7 +51,7 @@ def point_evaluation(evm: Evm) -> None:
     proof = Bytes48(data[144:192])
 
     # GAS
-    charge_gas(evm, GAS_POINT_EVALUATION)
+    charge_gas(evm, GasCosts.PRECOMPILE_POINT_EVALUATION)
     if kzg_commitment_to_versioned_hash(commitment) != versioned_hash:
         raise KZGProofError
 
diff --git a/src/ethereum/forks/bpo3/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/bpo3/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/bpo3/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/bpo3/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/bpo3/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/bpo3/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/bpo3/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/bpo3/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/bpo4/blocks.py b/src/ethereum/forks/bpo4/blocks.py
index 6216a152188..5fcadec15d9 100644
--- a/src/ethereum/forks/bpo4/blocks.py
+++ b/src/ethereum/forks/bpo4/blocks.py
@@ -10,7 +10,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
@@ -31,6 +31,7 @@
 )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Withdrawal:
@@ -64,6 +65,7 @@ class Withdrawal:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -107,13 +109,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.bpo4.state.state_root
-    [Trie]: ref:ethereum.forks.bpo4.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -123,8 +126,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.bpo4.trie.root
-    [Trie]: ref:ethereum.forks.bpo4.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -134,8 +137,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.bpo4.trie.root
-    [Trie]: ref:ethereum.forks.bpo4.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -244,6 +247,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -297,6 +301,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -329,6 +334,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/bpo4/fork.py b/src/ethereum/forks/bpo4/fork.py
index 3dfd35f98a8..fcdff89d045 100644
--- a/src/ethereum/forks/bpo4/fork.py
+++ b/src/ethereum/forks/bpo4/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Tuple
+from typing import Final, List, Optional, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
@@ -27,7 +27,13 @@
     InvalidSenderError,
     NonceMismatchError,
 )
-from ethereum.state import EMPTY_CODE_HASH, Account, Address
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt, Withdrawal, encode_receipt
@@ -51,19 +57,19 @@
     compute_requests_hash,
     parse_deposit_requests,
 )
-from .state import (
-    State,
-    TransientStorage,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
+    create_ether,
     destroy_account,
+    extract_block_diff,
     get_account,
     get_code,
+    incorporate_tx_into_block,
     increment_nonce,
-    modify_state,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
-    AccessListTransaction,
     BlobTransaction,
     FeeMarketTransaction,
     LegacyTransaction,
@@ -72,17 +78,16 @@
     decode_transaction,
     encode_transaction,
     get_transaction_hash,
+    has_access_list,
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.hexadecimal import hex_to_address
 from .utils.message import prepare_message
 from .vm import Message
 from .vm.eoa_delegation import is_valid_delegation
 from .vm.gas import (
-    BLOB_SCHEDULE_MAX,
-    GAS_PER_BLOB,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_data_fee,
     calculate_excess_blob_gas,
@@ -92,15 +97,15 @@
 
 BASE_FEE_MAX_CHANGE_DENOMINATOR = Uint(8)
 ELASTICITY_MULTIPLIER = Uint(2)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 SYSTEM_ADDRESS = hex_to_address("0xfffffffffffffffffffffffffffffffffffffffe")
 BEACON_ROOTS_ADDRESS = hex_to_address(
     "0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02"
 )
 SYSTEM_TRANSACTION_GAS = Uint(30000000)
-MAX_BLOB_GAS_PER_BLOCK = BLOB_SCHEDULE_MAX * GAS_PER_BLOB
+MAX_BLOB_GAS_PER_BLOCK: Final[U64] = (
+    GasCosts.BLOB_SCHEDULE_MAX * GasCosts.PER_BLOB
+)
 VERSIONED_HASH_VERSION_KZG = b"\x01"
 
 WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS = hex_to_address(
@@ -118,6 +123,7 @@
 BLOB_COUNT_LIMIT = 6
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -223,9 +229,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block.ommers != ():
         raise InvalidBlock
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -242,7 +250,10 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         withdrawals=block.withdrawals,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes, block_diff.storage_changes
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -268,6 +279,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if requests_hash != block.header.requests_hash:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -399,6 +411,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Tuple[Address, Uint, Tuple[VersionedHash, ...], U64]:
     """
     Check if the transaction is includable in the block.
@@ -411,6 +424,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -469,7 +484,7 @@ def check_transaction(
         raise BlobGasLimitExceededError("blob gas limit exceeded")
 
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     if isinstance(
         tx, (FeeMarketTransaction, BlobTransaction, SetCodeTransaction)
@@ -537,7 +552,7 @@ def check_transaction(
 
     if Uint(sender_account.balance) < max_gas_fee + Uint(tx.value):
         raise InsufficientBalanceError("insufficient sender balance")
-    sender_code = get_code(block_env.state, sender_account.code_hash)
+    sender_code = get_code(tx_state, sender_account.code_hash)
     if sender_account.code_hash != EMPTY_CODE_HASH and not is_valid_delegation(
         sender_code
     ):
@@ -588,74 +603,6 @@ def make_receipt(
     return encode_receipt(tx, receipt)
 
 
-def process_system_transaction(
-    block_env: vm.BlockEnvironment,
-    target_address: Address,
-    system_contract_code: Bytes,
-    data: Bytes,
-) -> MessageCallOutput:
-    """
-    Process a system transaction with the given code.
-
-    Prefer calling `process_checked_system_transaction` or
-    `process_unchecked_system_transaction` depending on whether missing code or
-    an execution error should cause the block to be rejected.
-
-    Parameters
-    ----------
-    block_env :
-        The block scoped environment.
-    target_address :
-        Address of the contract to call.
-    system_contract_code :
-        Code of the contract to call.
-    data :
-        Data to pass to the contract.
-
-    Returns
-    -------
-    system_tx_output : `MessageCallOutput`
-        Output of processing the system transaction.
-
-    """
-    tx_env = vm.TransactionEnvironment(
-        origin=SYSTEM_ADDRESS,
-        gas_price=block_env.base_fee_per_gas,
-        gas=SYSTEM_TRANSACTION_GAS,
-        access_list_addresses=set(),
-        access_list_storage_keys=set(),
-        transient_storage=TransientStorage(),
-        blob_versioned_hashes=(),
-        authorizations=(),
-        index_in_block=None,
-        tx_hash=None,
-    )
-
-    system_tx_message = Message(
-        block_env=block_env,
-        tx_env=tx_env,
-        caller=SYSTEM_ADDRESS,
-        target=target_address,
-        gas=SYSTEM_TRANSACTION_GAS,
-        value=U256(0),
-        data=data,
-        code=system_contract_code,
-        depth=Uint(0),
-        current_target=target_address,
-        code_address=target_address,
-        should_transfer_value=False,
-        is_static=False,
-        accessed_addresses=set(),
-        accessed_storage_keys=set(),
-        disable_precompiles=False,
-        parent_evm=None,
-    )
-
-    system_tx_output = process_message_call(system_tx_message)
-
-    return system_tx_output
-
-
 def process_checked_system_transaction(
     block_env: vm.BlockEnvironment,
     target_address: Address,
@@ -680,9 +627,18 @@ def process_checked_system_transaction(
         Output of processing the system transaction.
 
     """
+    # Pre-check that the system contract has code. We use a throwaway
+    # TransactionState here that is *never* propagated back to BlockState
+    # (no incorporate_tx_into_block call); the same get_account / get_code
+    # lookups are performed and properly tracked by
+    # process_unchecked_system_transaction below, which this function
+    # always calls. Reading via a TransactionState (rather than directly
+    # against pre_state) lets us see system contracts deployed earlier in
+    # the same block — see EIP-7002 and EIP-7251 for this edge case.
+    untracked_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        untracked_state,
+        get_account(untracked_state, target_address).code_hash,
     )
 
     if len(system_contract_code) == 0:
@@ -691,10 +647,9 @@ def process_checked_system_transaction(
             "contain code"
         )
 
-    system_tx_output = process_system_transaction(
+    system_tx_output = process_unchecked_system_transaction(
         block_env,
         target_address,
-        system_contract_code,
         data,
     )
 
@@ -713,8 +668,8 @@ def process_unchecked_system_transaction(
     data: Bytes,
 ) -> MessageCallOutput:
     """
-    Process a system transaction without checking if the contract contains code
-    or if the transaction fails.
+    Process a system transaction without checking if the contract contains
+    code or if the transaction fails.
 
     Parameters
     ----------
@@ -731,17 +686,51 @@ def process_unchecked_system_transaction(
         Output of processing the system transaction.
 
     """
+    system_tx_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        system_tx_state,
+        get_account(system_tx_state, target_address).code_hash,
     )
-    return process_system_transaction(
-        block_env,
-        target_address,
-        system_contract_code,
-        data,
+
+    tx_env = vm.TransactionEnvironment(
+        origin=SYSTEM_ADDRESS,
+        gas_price=block_env.base_fee_per_gas,
+        gas=SYSTEM_TRANSACTION_GAS,
+        access_list_addresses=set(),
+        access_list_storage_keys=set(),
+        state=system_tx_state,
+        blob_versioned_hashes=(),
+        authorizations=(),
+        index_in_block=None,
+        tx_hash=None,
+    )
+
+    system_tx_message = Message(
+        block_env=block_env,
+        tx_env=tx_env,
+        caller=SYSTEM_ADDRESS,
+        target=target_address,
+        gas=SYSTEM_TRANSACTION_GAS,
+        value=U256(0),
+        data=data,
+        code=system_contract_code,
+        depth=Uint(0),
+        current_target=target_address,
+        code_address=target_address,
+        should_transfer_value=False,
+        is_static=False,
+        accessed_addresses=set(),
+        accessed_storage_keys=set(),
+        disable_precompiles=False,
+        parent_evm=None,
     )
 
+    system_tx_output = process_message_call(system_tx_message)
+
+    incorporate_tx_into_block(system_tx_state)
+
+    return system_tx_output
+
 
 def apply_body(
     block_env: vm.BlockEnvironment,
@@ -875,6 +864,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(
         block_output.transactions_trie,
         rlp.encode(index),
@@ -892,9 +883,10 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     if isinstance(tx, BlobTransaction):
         blob_gas_fee = calculate_data_fee(block_env.excess_blob_gas, tx)
@@ -904,27 +896,17 @@ def process_transaction(
     effective_gas_fee = tx.gas * effective_gas_price
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     sender_balance_after_gas_fee = (
         Uint(sender_account.balance) - effective_gas_fee - blob_gas_fee
     )
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     access_list_addresses = set()
     access_list_storage_keys = set()
     access_list_addresses.add(block_env.coinbase)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
             access_list_addresses.add(access.account)
             for slot in access.slots:
@@ -940,7 +922,7 @@ def process_transaction(
         gas=gas,
         access_list_addresses=access_list_addresses,
         access_list_storage_keys=access_list_storage_keys,
-        transient_storage=TransientStorage(),
+        state=tx_state,
         blob_versioned_hashes=blob_versioned_hashes,
         authorizations=authorizations,
         index_in_block=index,
@@ -973,23 +955,13 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * priority_fee_per_gas
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
-    coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
-    ).balance + U256(transaction_fee)
-    set_account_balance(
-        block_env.state,
-        block_env.coinbase,
-        coinbase_balance_after_mining_fee,
-    )
+    create_ether(tx_state, block_env.coinbase, U256(transaction_fee))
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
     block_output.block_gas_used += tx_gas_used_after_refund
     block_output.blob_gas_used += tx_blob_gas_used
@@ -1009,6 +981,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def process_withdrawals(
     block_env: vm.BlockEnvironment,
@@ -1018,9 +992,7 @@ def process_withdrawals(
     """
     Increase the balance of the withdrawing account.
     """
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += wd.amount * U256(10**9)
+    wd_state = TransactionState(parent=block_env.state)
 
     for i, wd in enumerate(withdrawals):
         trie_set(
@@ -1029,7 +1001,9 @@ def increase_recipient_balance(recipient: Account) -> None:
             rlp.encode(wd),
         )
 
-        modify_state(block_env.state, wd.address, increase_recipient_balance)
+        create_ether(wd_state, wd.address, wd.amount * U256(10**9))
+
+    incorporate_tx_into_block(wd_state)
 
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
@@ -1038,14 +1012,14 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
-    passed through as a parameter is greater than or equal to the *sum* of
-    the parent's gas and the adjustment delta then the limit for gas is too
-    high and fails this function's check. Similarly, if the limit is less
-    than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
-    check fails because the gas limit doesn't allow for a sufficient or
-    reasonable amount of gas to be used on a block.
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is passed
+    through as a parameter is greater than or equal to the *sum* of the
+    parent's gas and the adjustment delta then the limit for gas is too high
+    and fails this function's check. Similarly, if the limit is less than or
+    equal to the *difference* of the parent's gas and the adjustment delta *or*
+    the predefined ``LIMIT_MINIMUM`` then this function's check fails because
+    the gas limit doesn't allow for a sufficient or reasonable amount of gas to
+    be used on a block.
 
     Parameters
     ----------
@@ -1061,12 +1035,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/bpo4/fork_types.py b/src/ethereum/forks/bpo4/fork_types.py
index c598e9876bf..4bec34810db 100644
--- a/src/ethereum/forks/bpo4/fork_types.py
+++ b/src/ethereum/forks/bpo4/fork_types.py
@@ -12,6 +12,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes256
@@ -43,6 +44,7 @@ def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Authorization:
diff --git a/src/ethereum/forks/bpo4/requests.py b/src/ethereum/forks/bpo4/requests.py
index 542c9264d37..919690c427e 100644
--- a/src/ethereum/forks/bpo4/requests.py
+++ b/src/ethereum/forks/bpo4/requests.py
@@ -1,11 +1,31 @@
 """
-Requests were introduced in EIP-7685 as a general purpose framework for
-storing contract-triggered requests. It extends the execution header and
-body with a single field each to store the request information.
-This inherently exposes the requests to the consensus layer, which can
-then process each one.
-
+[EIP-7685] generalizes how the execution layer communicates validator actions
+to the consensus layer. Rather than adding a dedicated header field for each
+new action type (as [EIP-4895] did for withdrawals), the execution header
+commits to a single [`requests_hash`][rh] that aggregates an ordered list of
+typed requests.
+
+Each request is a type byte (see [`DEPOSIT_REQUEST_TYPE`][dt],
+[`WITHDRAWAL_REQUEST_TYPE`][wt], and [`CONSOLIDATION_REQUEST_TYPE`][ct])
+followed by an opaque payload. Deposit requests are discovered by scanning
+transaction receipts for logs emitted by the deposit contract; withdrawal
+and consolidation requests are produced by the corresponding system
+contracts during block processing.
+
+See [`parse_deposit_requests`][pd] for how deposit logs become request data,
+[`compute_requests_hash`][crh] for how the list is hashed for inclusion in the
+header, and [`process_general_purpose_requests`][pgpr] for how the requests are
+processed.
+
+[EIP-4895]: https://eips.ethereum.org/EIPS/eip-4895
 [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+[rh]: ref:ethereum.forks.bpo4.blocks.Header.requests_hash
+[dt]: ref:ethereum.forks.bpo4.requests.DEPOSIT_REQUEST_TYPE
+[wt]: ref:ethereum.forks.bpo4.requests.WITHDRAWAL_REQUEST_TYPE
+[ct]: ref:ethereum.forks.bpo4.requests.CONSOLIDATION_REQUEST_TYPE
+[pd]: ref:ethereum.forks.bpo4.requests.parse_deposit_requests
+[crh]: ref:ethereum.forks.bpo4.requests.compute_requests_hash
+[pgpr]: ref:ethereum.forks.bpo4.fork.process_general_purpose_requests
 """
 
 from hashlib import sha256
@@ -15,48 +35,133 @@
 from ethereum_types.numeric import Uint, ulen
 
 from ethereum.exceptions import InvalidBlock
+from ethereum.merkle_patricia_trie import trie_get
 from ethereum.utils.hexadecimal import hex_to_bytes32
 
 from .blocks import decode_receipt
-from .trie import trie_get
 from .utils.hexadecimal import hex_to_address
 from .vm import BlockOutput
 
 DEPOSIT_CONTRACT_ADDRESS = hex_to_address(
     "0x00000000219ab540356cbb839cbe05303d7705fa"
 )
+"""
+Mainnet address of the beacon chain deposit contract. Scanning block
+receipts for logs emitted by this address is how the execution layer
+discovers validator deposits, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 DEPOSIT_EVENT_SIGNATURE_HASH = hex_to_bytes32(
     "0x649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c5"
 )
+"""
+First [log topic] of the deposit contract's `DepositEvent`, equal to the
+keccak256 of its Solidity event signature. Logs whose first topic does not
+match this are ignored when collecting deposit requests.
+
+[log topic]: https://docs.soliditylang.org/en/latest/abi-spec.html#events
+"""
+
 DEPOSIT_REQUEST_TYPE = b"\x00"
+"""
+Request type byte identifying a deposit request, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 WITHDRAWAL_REQUEST_TYPE = b"\x01"
+"""
+Request type byte identifying an execution-triggered withdrawal request,
+per [EIP-7002].
+
+[EIP-7002]: https://eips.ethereum.org/EIPS/eip-7002
+"""
+
 CONSOLIDATION_REQUEST_TYPE = b"\x02"
+"""
+Request type byte identifying a consolidation request, per [EIP-7251].
+
+[EIP-7251]: https://eips.ethereum.org/EIPS/eip-7251
+"""
 
 
 DEPOSIT_EVENT_LENGTH = Uint(576)
+"""
+Total length in bytes of the ABI-encoded `DepositEvent` data payload. Every
+well-formed event has this exact length.
+"""
 
 PUBKEY_OFFSET = Uint(160)
+"""
+Position within the event payload of the validator public key's length
+prefix, as emitted by the Solidity ABI encoder.
+"""
+
 WITHDRAWAL_CREDENTIALS_OFFSET = Uint(256)
+"""
+Position within the event payload of the withdrawal credentials' length
+prefix.
+"""
+
 AMOUNT_OFFSET = Uint(320)
+"""
+Position within the event payload of the deposit amount's length prefix.
+"""
+
 SIGNATURE_OFFSET = Uint(384)
+"""
+Position within the event payload of the deposit signature's length prefix.
+"""
+
 INDEX_OFFSET = Uint(512)
+"""
+Position within the event payload of the deposit index's length prefix.
+"""
 
 PUBKEY_SIZE = Uint(48)
+"""
+Length of the BLS12-381 public key that identifies the validator receiving
+the deposit.
+"""
+
 WITHDRAWAL_CREDENTIALS_SIZE = Uint(32)
+"""
+Length of the withdrawal credentials, which determine where the staked
+ether may eventually be withdrawn.
+"""
+
 AMOUNT_SIZE = Uint(8)
+"""
+Length of the little-endian Gwei amount being deposited.
+"""
+
 SIGNATURE_SIZE = Uint(96)
+"""
+Length of the BLS12-381 signature over the deposit message.
+"""
+
 INDEX_SIZE = Uint(8)
+"""
+Length of the monotonically-increasing deposit index assigned by the
+deposit contract when it emits the event.
+"""
 
 
 def extract_deposit_data(data: Bytes) -> Bytes:
     """
-    Extracts Deposit Request from the DepositContract.DepositEvent data.
+    Strip the Solidity ABI framing from a `DepositEvent` payload and return
+    the concatenated raw fields in the order consumed by the consensus
+    layer: public key, withdrawal credentials, amount, signature, and
+    deposit index.
 
-    Raises
-    ------
-    InvalidBlock :
-        If the deposit contract did not produce a valid log.
+    Because each field has a fixed length, every well-formed event has an
+    identical byte layout. Any deviation indicates a misbehaving or
+    compromised deposit contract, so this function raises [`InvalidBlock`]
+    rather than silently accepting unexpected data.
 
+    [`InvalidBlock`]: ref:ethereum.exceptions.InvalidBlock
     """
     if ulen(data) != DEPOSIT_EVENT_LENGTH:
         raise InvalidBlock("Invalid deposit event data length")
@@ -150,7 +255,19 @@ def extract_deposit_data(data: Bytes) -> Bytes:
 
 def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
     """
-    Parse deposit requests from the block output.
+    Walk the receipts produced during block execution, concatenating the
+    raw payload of every valid deposit event into a single byte string.
+
+    A log is considered a deposit when it originates from
+    [`DEPOSIT_CONTRACT_ADDRESS`][addr] and its first topic matches
+    [`DEPOSIT_EVENT_SIGNATURE_HASH`][sig]. The returned bytes are the
+    direct concatenation of the unframed deposit fields, ready to be
+    prefixed with [`DEPOSIT_REQUEST_TYPE`][dt] before being appended to
+    the block's request list.
+
+    [addr]: ref:ethereum.forks.bpo4.requests.DEPOSIT_CONTRACT_ADDRESS
+    [sig]: ref:ethereum.forks.bpo4.requests.DEPOSIT_EVENT_SIGNATURE_HASH
+    [dt]: ref:ethereum.forks.bpo4.requests.DEPOSIT_REQUEST_TYPE
     """
     deposit_requests: Bytes = b""
     for key in block_output.receipt_keys:
@@ -171,18 +288,18 @@ def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
 
 def compute_requests_hash(requests: List[Bytes]) -> Bytes:
     """
-    Get the hash of the requests using the SHA2-256 algorithm.
-
-    Parameters
-    ----------
-    requests : Bytes
-        The requests to hash.
-
-    Returns
-    -------
-    requests_hash : Bytes
-        The hash of the requests.
-
+    Compute the [SHA2-256] commitment over an ordered list of
+    type-prefixed requests, as defined by [EIP-7685].
+
+    The commitment is the SHA2-256 hash of the concatenation of the
+    SHA2-256 hashes of each individual request. This is what the
+    execution header's [`requests_hash`][rh] stores, and what the
+    consensus layer re-derives to validate that both layers observed the
+    same set of requests.
+
+    [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+    [SHA2-256]: https://en.wikipedia.org/wiki/SHA-2
+    [rh]: ref:ethereum.forks.bpo4.blocks.Header.requests_hash
     """
     m = sha256()
     for request in requests:
diff --git a/src/ethereum/forks/bpo4/state.py b/src/ethereum/forks/bpo4/state.py
deleted file mode 100644
index 342bda1a1cd..00000000000
--- a/src/ethereum/forks/bpo4/state.py
+++ /dev/null
@@ -1,713 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-from ethereum.state import (
-    EMPTY_ACCOUNT,
-    EMPTY_CODE_HASH,
-    Account,
-    Address,
-    Root,
-)
-
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-    def get_code(self, code_hash: Hash32) -> Bytes:
-        """
-        Get the bytecode for a given code hash.
-
-        Return ``b""`` for ``EMPTY_CODE_HASH``.
-        """
-        if code_hash == EMPTY_CODE_HASH:
-            return b""
-        return self._code_store[code_hash]
-
-
-@dataclass
-class TransientStorage:
-    """
-    Contains all information that is preserved between message calls
-    within a transaction.
-    """
-
-    _tries: Dict[Address, Trie[Bytes32, U256]] = field(default_factory=dict)
-    _snapshots: List[Dict[Address, Trie[Bytes32, U256]]] = field(
-        default_factory=list
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-
-
-def begin_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-    transient_storage._snapshots.append(
-        {k: copy_trie(t) for (k, t) in transient_storage._tries.items()}
-    )
-
-
-def commit_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._snapshots.pop()
-
-
-def rollback_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._tries = transient_storage._snapshots.pop()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-
-    Return ``b""`` for ``EMPTY_CODE_HASH``.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State`` and return its hash.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase, and to respect the constraints added to SELFDESTRUCT by
-    EIP-6780.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`. If, after modification, the account
-    exists and has zero nonce, empty code, and zero balance, it is destroyed.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-    account = get_account_optional(state, address)
-    account_exists_and_is_empty = (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-    if account_exists_and_is_empty:
-        destroy_account(state, address)
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
-
-
-def get_transient_storage(
-    transient_storage: TransientStorage, address: Address, key: Bytes32
-) -> U256:
-    """
-    Get a value at a storage key on an account from transient storage.
-    Returns `U256(0)` if the storage key has not been set previously.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_transient_storage(
-    transient_storage: TransientStorage,
-    address: Address,
-    key: Bytes32,
-    value: U256,
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        transient_storage._tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del transient_storage._tries[address]
diff --git a/src/ethereum/forks/bpo4/state_tracker.py b/src/ethereum/forks/bpo4/state_tracker.py
new file mode 100644
index 00000000000..67ceaa86321
--- /dev/null
+++ b/src/ethereum/forks/bpo4/state_tracker.py
@@ -0,0 +1,749 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state. If, after modification, the
+    account exists and has zero nonce, empty code, and zero balance, it
+    is destroyed.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+    if account_exists_and_is_empty(tx_state, address):
+        destroy_account(tx_state, address)
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+    )
diff --git a/src/ethereum/forks/bpo4/transactions.py b/src/ethereum/forks/bpo4/transactions.py
index 048852529e4..18953538456 100644
--- a/src/ethereum/forks/bpo4/transactions.py
+++ b/src/ethereum/forks/bpo4/transactions.py
@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, TypeGuard, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -28,46 +28,10 @@
 )
 from .fork_types import Authorization, VersionedHash
 
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_TOKEN_FLOOR = Uint(10)
-"""
-Minimum gas cost per byte of calldata as per [EIP-7623]. Used to calculate
-the minimum gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_DATA_TOKEN_STANDARD = Uint(4)
-"""
-Gas cost per byte of calldata as per [EIP-7623]. Used to calculate the
-gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
-
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
-"""
-
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
-"""
-
 TX_MAX_GAS_LIMIT = Uint(16_777_216)
 
 
+@final
 @slotted_freezable
 @dataclass
 class LegacyTransaction:
@@ -130,6 +94,7 @@ class LegacyTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Access:
@@ -149,6 +114,7 @@ class Access:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccessListTransaction:
@@ -221,6 +187,7 @@ class AccessListTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class FeeMarketTransaction:
@@ -298,6 +265,7 @@ class FeeMarketTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class BlobTransaction:
@@ -386,6 +354,7 @@ class BlobTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class SetCodeTransaction:
@@ -481,6 +450,23 @@ class SetCodeTransaction:
 """
 
 
+AccessListCapableTransaction = (
+    AccessListTransaction
+    | FeeMarketTransaction
+    | BlobTransaction
+    | SetCodeTransaction
+)
+"""
+Transaction types that include an [EIP-2930]-style access list.
+
+See [`has_access_list`][hal] and [`Access`][a] for more details.
+
+[EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+[hal]: ref:ethereum.forks.amsterdam.transactions.has_access_list
+[a]: ref:ethereum.forks.amsterdam.transactions.Access
+"""
+
+
 def encode_transaction(tx: Transaction) -> LegacyTransaction | Bytes:
     """
     Encode a transaction into its RLP or typed transaction format.
@@ -584,7 +570,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
     4. Cost for access list entries (if applicable)
@@ -595,8 +581,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     gas cost of the transaction and the minimum gas cost used by the
     transaction based on the calldata size.
     """
-    from .vm.eoa_delegation import GAS_AUTH_PER_EMPTY_ACCOUNT
-    from .vm.gas import init_code_cost
+    from .vm.gas import GasCosts, init_code_cost
 
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
@@ -604,39 +589,33 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     tokens_in_calldata = num_zeros + num_non_zeros * Uint(4)
     # EIP-7623 floor price (note: no EVM costs)
     calldata_floor_gas_cost = (
-        tokens_in_calldata * GAS_TX_DATA_TOKEN_FLOOR + GAS_TX_BASE
+        tokens_in_calldata * GasCosts.TX_DATA_TOKEN_FLOOR + GasCosts.TX_BASE
     )
 
-    data_cost = tokens_in_calldata * GAS_TX_DATA_TOKEN_STANDARD
+    data_cost = tokens_in_calldata * GasCosts.TX_DATA_TOKEN_STANDARD
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE + init_code_cost(ulen(tx.data))
+        create_cost = GasCosts.TX_CREATE + init_code_cost(ulen(tx.data))
     else:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
-            access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_cost += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
 
     auth_cost = Uint(0)
     if isinstance(tx, SetCodeTransaction):
-        auth_cost += Uint(GAS_AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations))
+        auth_cost += Uint(
+            GasCosts.AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations)
+        )
 
     return (
         Uint(
-            GAS_TX_BASE
+            GasCosts.TX_BASE
             + data_cost
             + create_cost
             + access_list_cost
@@ -884,3 +863,17 @@ def get_transaction_hash(tx: Bytes | LegacyTransaction) -> Hash32:
         return keccak256(rlp.encode(tx))
     else:
         return keccak256(tx)
+
+
+def has_access_list(
+    tx: Transaction,
+) -> TypeGuard[AccessListCapableTransaction]:
+    """
+    Return whether the transaction has an [EIP-2930]-style access list.
+
+    [EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+    """
+    return isinstance(
+        tx,
+        AccessListCapableTransaction,
+    )
diff --git a/src/ethereum/forks/bpo4/trie.py b/src/ethereum/forks/bpo4/trie.py
deleted file mode 100644
index 9e37bed4b4b..00000000000
--- a/src/ethereum/forks/bpo4/trie.py
+++ /dev/null
@@ -1,509 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-from typing_extensions import assert_type
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.bpo3 import trie as previous_trie
-from ethereum.state import Account, Address, Root
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt, Withdrawal
-from .fork_types import encode_account
-from .transactions import LegacyTransaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = (
-    Account
-    | Bytes
-    | LegacyTransaction
-    | Receipt
-    | Uint
-    | U256
-    | Withdrawal
-    | None
-)
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[LegacyTransaction | Bytes],
-    Optional[Receipt | Bytes],
-    Optional[Withdrawal | Bytes],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `Extended`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (LegacyTransaction, Receipt, Withdrawal, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/bpo4/utils/message.py b/src/ethereum/forks/bpo4/utils/message.py
index fdcabc34088..cfcd51c6f92 100644
--- a/src/ethereum/forks/bpo4/utils/message.py
+++ b/src/ethereum/forks/bpo4/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
@@ -55,7 +55,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -63,8 +63,9 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        state = block_env.state
-        code = get_code(state, get_account(state, tx.to).code_hash)
+        code = get_code(
+            tx_env.state, get_account(tx_env.state, tx.to).code_hash
+        )
         code_address = tx.to
     else:
         raise AssertionError("Target must be address or empty bytes")
diff --git a/src/ethereum/forks/bpo4/vm/__init__.py b/src/ethereum/forks/bpo4/vm/__init__.py
index 37d0a327974..42229ebd849 100644
--- a/src/ethereum/forks/bpo4/vm/__init__.py
+++ b/src/ethereum/forks/bpo4/vm/__init__.py
@@ -13,24 +13,25 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt, Withdrawal
 from ..fork_types import Authorization, VersionedHash
-from ..state import State, TransientStorage
+from ..state_tracker import BlockState, TransactionState
 from ..transactions import LegacyTransaction
-from ..trie import Trie
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +39,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -50,6 +51,7 @@ class BlockEnvironment:
     parent_beacon_block_root: Hash32
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -92,10 +94,11 @@ class BlockOutput:
     requests: List[Bytes] = field(default_factory=list)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
@@ -103,13 +106,14 @@ class TransactionEnvironment:
     gas: Uint
     access_list_addresses: Set[Address]
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
-    transient_storage: TransientStorage
+    state: TransactionState
     blob_versioned_hashes: Tuple[VersionedHash, ...]
     authorizations: Tuple[Authorization, ...]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -135,6 +139,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
diff --git a/src/ethereum/forks/bpo4/vm/eoa_delegation.py b/src/ethereum/forks/bpo4/vm/eoa_delegation.py
index fce580bee4a..1ba552f8dd6 100644
--- a/src/ethereum/forks/bpo4/vm/eoa_delegation.py
+++ b/src/ethereum/forks/bpo4/vm/eoa_delegation.py
@@ -14,7 +14,7 @@
 from ethereum.state import Address
 
 from ..fork_types import Authorization
-from ..state import (
+from ..state_tracker import (
     account_exists,
     get_account,
     get_code,
@@ -22,14 +22,13 @@
     set_code,
 )
 from ..utils.hexadecimal import hex_to_address
-from ..vm.gas import GAS_COLD_ACCOUNT_ACCESS, GAS_WARM_ACCESS
+from ..vm.gas import GasCosts
 from . import Evm, Message
 
 SET_CODE_TX_MAGIC = b"\x05"
 EOA_DELEGATION_MARKER = b"\xef\x01\x00"
 EOA_DELEGATION_MARKER_LENGTH = len(EOA_DELEGATION_MARKER)
 EOA_DELEGATED_CODE_LENGTH = 23
-GAS_AUTH_PER_EMPTY_ACCOUNT = 25000
 REFUND_AUTH_PER_EXISTING_ACCOUNT = 12500
 NULL_ADDRESS = hex_to_address("0x0000000000000000000000000000000000000000")
 
@@ -140,18 +139,18 @@ def access_delegation(
         The delegation address, code, and access gas cost.
 
     """
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
     if not is_valid_delegation(code):
         return False, address, code, Uint(0)
 
     address = Address(code[EOA_DELEGATION_MARKER_LENGTH:])
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
-    code = get_code(state, get_account(state, address).code_hash)
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     return True, address, code, access_gas_cost
 
@@ -171,7 +170,7 @@ def set_delegation(message: Message) -> U256:
         Refund from authority which already exists in state.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     for auth in message.tx_env.authorizations:
         if auth.chain_id not in (message.block_env.chain_id, U256(0)):
@@ -187,8 +186,8 @@ def set_delegation(message: Message) -> U256:
 
         message.accessed_addresses.add(authority)
 
-        authority_account = get_account(state, authority)
-        authority_code = get_code(state, authority_account.code_hash)
+        authority_account = get_account(tx_state, authority)
+        authority_code = get_code(tx_state, authority_account.code_hash)
 
         if authority_code and not is_valid_delegation(authority_code):
             continue
@@ -197,24 +196,25 @@ def set_delegation(message: Message) -> U256:
         if authority_nonce != auth.nonce:
             continue
 
-        if account_exists(state, authority):
+        if account_exists(tx_state, authority):
             refund_counter += U256(
-                GAS_AUTH_PER_EMPTY_ACCOUNT - REFUND_AUTH_PER_EXISTING_ACCOUNT
+                GasCosts.AUTH_PER_EMPTY_ACCOUNT
+                - REFUND_AUTH_PER_EXISTING_ACCOUNT
             )
 
         if auth.address == NULL_ADDRESS:
             code_to_set = b""
         else:
             code_to_set = EOA_DELEGATION_MARKER + auth.address
-        set_code(state, authority, code_to_set)
+        set_code(tx_state, authority, code_to_set)
 
-        increment_nonce(state, authority)
+        increment_nonce(tx_state, authority)
 
     if message.code_address is None:
         raise InvalidBlock("Invalid type 4 transaction: no target")
 
     message.code = get_code(
-        state, get_account(state, message.code_address).code_hash
+        tx_state, get_account(tx_state, message.code_address).code_hash
     )
 
     return refund_counter
diff --git a/src/ethereum/forks/bpo4/vm/gas.py b/src/ethereum/forks/bpo4/vm/gas.py
index a2e5d1ab39a..653f6eb9ea1 100644
--- a/src/ethereum/forks/bpo4/vm/gas.py
+++ b/src/ethereum/forks/bpo4/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U64, U256, Uint
+from ethereum_types.numeric import U64, U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32, taylor_exponential
@@ -24,67 +24,172 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 4800
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-GAS_ECRECOVER = Uint(3000)
-GAS_P256VERIFY = Uint(6900)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1)
-GAS_COLD_SLOAD = Uint(2100)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600)
-GAS_WARM_ACCESS = Uint(100)
-GAS_CODE_INIT_PER_WORD = Uint(2)
-GAS_BLOBHASH_OPCODE = Uint(3)
-GAS_POINT_EVALUATION = Uint(50000)
-
-GAS_PER_BLOB = U64(2**17)
-BLOB_SCHEDULE_TARGET = U64(14)
-BLOB_TARGET_GAS_PER_BLOCK = GAS_PER_BLOB * BLOB_SCHEDULE_TARGET
-BLOB_BASE_COST = Uint(2**13)
-BLOB_SCHEDULE_MAX = U64(21)
-BLOB_MIN_GASPRICE = Uint(1)
-BLOB_BASE_FEE_UPDATE_FRACTION = Uint(11684671)
-
-GAS_BLS_G1_ADD = Uint(375)
-GAS_BLS_G1_MUL = Uint(12000)
-GAS_BLS_G1_MAP = Uint(5500)
-GAS_BLS_G2_ADD = Uint(600)
-GAS_BLS_G2_MUL = Uint(22500)
-GAS_BLS_G2_MAP = Uint(23800)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    WARM_ACCESS: Final[Uint] = Uint(100)
+    COLD_ACCOUNT_ACCESS: Final[Uint] = Uint(2600)
+    COLD_STORAGE_ACCESS: Final[Uint] = Uint(2100)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+    CODE_INIT_PER_WORD: Final[Uint] = Uint(2)
+
+    # Authorization
+    AUTH_PER_EMPTY_ACCOUNT: Final[int] = 25000
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 4800
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_P256VERIFY: Final[Uint] = Uint(6900)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1)
+    PRECOMPILE_POINT_EVALUATION: Final[Uint] = Uint(50000)
+    PRECOMPILE_BLS_G1ADD: Final[Uint] = Uint(375)
+    PRECOMPILE_BLS_G1MUL: Final[Uint] = Uint(12000)
+    PRECOMPILE_BLS_G1MAP: Final[Uint] = Uint(5500)
+    PRECOMPILE_BLS_G2ADD: Final[Uint] = Uint(600)
+    PRECOMPILE_BLS_G2MUL: Final[Uint] = Uint(22500)
+    PRECOMPILE_BLS_G2MAP: Final[Uint] = Uint(23800)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000)
+
+    # Blobs
+    PER_BLOB: Final[U64] = U64(2**17)
+    BLOB_SCHEDULE_TARGET: Final[U64] = U64(14)
+    BLOB_TARGET_GAS_PER_BLOCK: Final[U64] = PER_BLOB * BLOB_SCHEDULE_TARGET
+    BLOB_BASE_COST: Final[Uint] = Uint(2**13)
+    BLOB_SCHEDULE_MAX: Final[U64] = U64(21)
+    BLOB_MIN_GASPRICE: Final[Uint] = Uint(1)
+    BLOB_BASE_FEE_UPDATE_FRACTION: Final[Uint] = Uint(11684671)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_TOKEN_STANDARD: Final[Uint] = Uint(4)
+    TX_DATA_TOKEN_FLOOR: Final[Uint] = Uint(10)
+    TX_ACCESS_LIST_ADDRESS: Final[Uint] = Uint(2400)
+    TX_ACCESS_LIST_STORAGE_KEY: Final[Uint] = Uint(1900)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_CLZ: Final[Uint] = LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_PREVRANDAO: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_BASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBBASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBHASH: Final[Uint] = Uint(3)
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_PUSH0: Final[Uint] = BASE
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MCOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -100,11 +205,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -156,7 +262,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -186,7 +292,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -211,7 +317,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
@@ -283,7 +389,7 @@ def init_code_cost(init_code_length: Uint) -> Uint:
         The gas to be charged for the init code.
 
     """
-    return GAS_CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
+    return GasCosts.CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
 
 
 def calculate_excess_blob_gas(parent_header: Header) -> U64:
@@ -314,21 +420,23 @@ def calculate_excess_blob_gas(parent_header: Header) -> U64:
         base_fee_per_gas = parent_header.base_fee_per_gas
 
     parent_blob_gas = excess_blob_gas + blob_gas_used
-    if parent_blob_gas < BLOB_TARGET_GAS_PER_BLOCK:
+    if parent_blob_gas < GasCosts.BLOB_TARGET_GAS_PER_BLOCK:
         return U64(0)
 
-    target_blob_gas_price = Uint(GAS_PER_BLOB)
+    target_blob_gas_price = Uint(GasCosts.PER_BLOB)
     target_blob_gas_price *= calculate_blob_gas_price(excess_blob_gas)
 
-    base_blob_tx_price = BLOB_BASE_COST * base_fee_per_gas
+    base_blob_tx_price = GasCosts.BLOB_BASE_COST * base_fee_per_gas
     if base_blob_tx_price > target_blob_gas_price:
-        blob_schedule_delta = BLOB_SCHEDULE_MAX - BLOB_SCHEDULE_TARGET
+        blob_schedule_delta = (
+            GasCosts.BLOB_SCHEDULE_MAX - GasCosts.BLOB_SCHEDULE_TARGET
+        )
         return (
             excess_blob_gas
-            + blob_gas_used * blob_schedule_delta // BLOB_SCHEDULE_MAX
+            + blob_gas_used * blob_schedule_delta // GasCosts.BLOB_SCHEDULE_MAX
         )
 
-    return parent_blob_gas - BLOB_TARGET_GAS_PER_BLOCK
+    return parent_blob_gas - GasCosts.BLOB_TARGET_GAS_PER_BLOCK
 
 
 def calculate_total_blob_gas(tx: Transaction) -> U64:
@@ -347,7 +455,7 @@ def calculate_total_blob_gas(tx: Transaction) -> U64:
 
     """
     if isinstance(tx, BlobTransaction):
-        return GAS_PER_BLOB * U64(len(tx.blob_versioned_hashes))
+        return GasCosts.PER_BLOB * U64(len(tx.blob_versioned_hashes))
     else:
         return U64(0)
 
@@ -368,9 +476,9 @@ def calculate_blob_gas_price(excess_blob_gas: U64) -> Uint:
 
     """
     return taylor_exponential(
-        BLOB_MIN_GASPRICE,
+        GasCosts.BLOB_MIN_GASPRICE,
         Uint(excess_blob_gas),
-        BLOB_BASE_FEE_UPDATE_FRACTION,
+        GasCosts.BLOB_BASE_FEE_UPDATE_FRACTION,
     )
 
 
diff --git a/src/ethereum/forks/bpo4/vm/instructions/arithmetic.py b/src/ethereum/forks/bpo4/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/bpo4/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/bpo4/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/bpo4/vm/instructions/bitwise.py b/src/ethereum/forks/bpo4/vm/instructions/bitwise.py
index cc6fa2fbb23..7674d3c720f 100644
--- a/src/ethereum/forks/bpo4/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/bpo4/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_LOW, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +172,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +202,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +232,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
@@ -262,7 +265,7 @@ def count_leading_zeros(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CLZ)
 
     # OPERATION
     bit_length = U256(x.bit_length())
diff --git a/src/ethereum/forks/bpo4/vm/instructions/block.py b/src/ethereum/forks/bpo4/vm/instructions/block.py
index 52145aa9f82..e53d2a57a35 100644
--- a/src/ethereum/forks/bpo4/vm/instructions/block.py
+++ b/src/ethereum/forks/bpo4/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -40,7 +40,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -89,7 +89,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -123,7 +123,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -156,7 +156,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -189,7 +189,7 @@ def prev_randao(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PREVRANDAO)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.prev_randao))
@@ -222,7 +222,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -252,7 +252,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/bpo4/vm/instructions/comparison.py b/src/ethereum/forks/bpo4/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/bpo4/vm/instructions/comparison.py
+++ b/src/ethereum/forks/bpo4/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/bpo4/vm/instructions/control_flow.py b/src/ethereum/forks/bpo4/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/bpo4/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/bpo4/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/bpo4/vm/instructions/environment.py b/src/ethereum/forks/bpo4/vm/instructions/environment.py
index 5848530a960..b6bf713df27 100644
--- a/src/ethereum/forks/bpo4/vm/instructions/environment.py
+++ b/src/ethereum/forks/bpo4/vm/instructions/environment.py
@@ -17,20 +17,13 @@
 from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BASE,
-    GAS_BLOBHASH_OPCODE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_COPY,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
-    GAS_WARM_ACCESS,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_gas_extend_memory,
     charge_gas,
@@ -52,7 +45,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -76,14 +69,15 @@ def balance(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_addresses.add(address)
-        charge_gas(evm, GAS_COLD_ACCOUNT_ACCESS)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -106,7 +100,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -129,7 +123,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -152,7 +146,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -176,7 +170,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -201,7 +195,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -230,11 +224,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -259,7 +256,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -288,11 +285,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -317,7 +317,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -341,16 +341,16 @@ def extcodesize(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -377,23 +377,23 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
 
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost + copy_gas_cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -416,7 +416,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -442,11 +442,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -475,15 +480,15 @@ def extcodehash(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -510,12 +515,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
@@ -538,7 +543,7 @@ def base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BASEFEE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.base_fee_per_gas))
@@ -561,7 +566,7 @@ def blob_hash(evm: Evm) -> None:
     index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BLOBHASH_OPCODE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBHASH)
 
     # OPERATION
     if int(index) < len(evm.message.tx_env.blob_versioned_hashes):
@@ -588,7 +593,7 @@ def blob_base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBBASEFEE)
 
     # OPERATION
     blob_base_fee = calculate_blob_gas_price(
diff --git a/src/ethereum/forks/bpo4/vm/instructions/keccak.py b/src/ethereum/forks/bpo4/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/bpo4/vm/instructions/keccak.py
+++ b/src/ethereum/forks/bpo4/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/bpo4/vm/instructions/log.py b/src/ethereum/forks/bpo4/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/bpo4/vm/instructions/log.py
+++ b/src/ethereum/forks/bpo4/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/bpo4/vm/instructions/memory.py b/src/ethereum/forks/bpo4/vm/instructions/memory.py
index 6e111051ee3..bba3ddf19d5 100644
--- a/src/ethereum/forks/bpo4/vm/instructions/memory.py
+++ b/src/ethereum/forks/bpo4/vm/instructions/memory.py
@@ -18,9 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_COPY,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -49,7 +47,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -80,7 +78,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -108,7 +106,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -135,7 +133,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
@@ -161,12 +159,15 @@ def mcopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(length)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
 
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(source, length), (destination, length)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_MCOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/bpo4/vm/instructions/stack.py b/src/ethereum/forks/bpo4/vm/instructions/stack.py
index 0007a28acd4..ce94af6ce8e 100644
--- a/src/ethereum/forks/bpo4/vm/instructions/stack.py
+++ b/src/ethereum/forks/bpo4/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -63,9 +67,9 @@ def push_n(evm: Evm, num_bytes: int) -> None:
 
     # GAS
     if num_bytes == 0:
-        charge_gas(evm, GAS_BASE)
+        charge_gas(evm, GasCosts.OPCODE_PUSH0)
     else:
-        charge_gas(evm, GAS_VERY_LOW)
+        charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -95,7 +99,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -127,7 +131,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -139,70 +143,70 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push0 = partial(push_n, num_bytes=0)
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push0: Callable[[Evm], None] = partial(push_n, num_bytes=0)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/bpo4/vm/instructions/storage.py b/src/ethereum/forks/bpo4/vm/instructions/storage.py
index 084d58cc46c..99dcce877dd 100644
--- a/src/ethereum/forks/bpo4/vm/instructions/storage.py
+++ b/src/ethereum/forks/bpo4/vm/instructions/storage.py
@@ -13,7 +13,7 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import (
+from ...state_tracker import (
     get_storage,
     get_storage_original,
     get_transient_storage,
@@ -23,12 +23,7 @@
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -50,15 +45,14 @@ def sload(evm: Evm) -> None:
 
     # GAS
     if (evm.message.current_target, key) in evm.accessed_storage_keys:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        charge_gas(evm, GAS_COLD_SLOAD)
+        charge_gas(evm, GasCosts.COLD_STORAGE_ACCESS)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -79,54 +73,60 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     gas_cost = Uint(0)
 
     if (evm.message.current_target, key) not in evm.accessed_storage_keys:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        gas_cost += GAS_COLD_SLOAD
+        gas_cost += GasCosts.COLD_STORAGE_ACCESS
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost += GAS_STORAGE_SET
+            gas_cost += GasCosts.STORAGE_SET
         else:
-            gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_SLOAD
+            gas_cost += (
+                GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
+            )
     else:
-        gas_cost += GAS_WARM_ACCESS
+        gas_cost += GasCosts.WARM_ACCESS
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
             # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
             # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
             # Storage slot being restored to its original value
             if original_value == 0:
                 # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_WARM_ACCESS)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.WARM_ACCESS
+                )
             else:
                 # Slot was originally non-empty and was UPDATED earlier
                 evm.refund_counter += int(
-                    GAS_STORAGE_UPDATE - GAS_COLD_SLOAD - GAS_WARM_ACCESS
+                    GasCosts.COLD_STORAGE_WRITE
+                    - GasCosts.COLD_STORAGE_ACCESS
+                    - GasCosts.WARM_ACCESS
                 )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
@@ -147,11 +147,11 @@ def tload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
 
     # OPERATION
     value = get_transient_storage(
-        evm.message.tx_env.transient_storage, evm.message.current_target, key
+        evm.message.tx_env.state, evm.message.current_target, key
     )
     push(evm.stack, value)
 
@@ -174,11 +174,11 @@ def tstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
     if evm.message.is_static:
         raise WriteInStaticContext
     set_transient_storage(
-        evm.message.tx_env.transient_storage,
+        evm.message.tx_env.state,
         evm.message.current_target,
         key,
         new_value,
diff --git a/src/ethereum/forks/bpo4/vm/instructions/system.py b/src/ethereum/forks/bpo4/vm/instructions/system.py
index 29c3fe9e6e2..092c6fb68c2 100644
--- a/src/ethereum/forks/bpo4/vm/instructions/system.py
+++ b/src/ethereum/forks/bpo4/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
     get_account,
@@ -40,15 +40,7 @@
 )
 from ..exceptions import OutOfGasError, Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -90,7 +82,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -104,15 +96,13 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -166,14 +156,17 @@ def create(evm: Evm) -> None:
     )
     init_code_gas = init_code_cost(Uint(memory_size))
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost + init_code_gas)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CREATE_BASE + extend_memory.cost + init_code_gas,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -216,8 +209,8 @@ def create2(evm: Evm) -> None:
     init_code_gas = init_code_cost(Uint(memory_size))
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost
         + init_code_gas,
     )
@@ -261,7 +254,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -374,10 +367,10 @@ def call(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
@@ -388,10 +381,10 @@ def call(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -404,7 +397,7 @@ def call(evm: Evm) -> None:
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -463,10 +456,10 @@ def callcode(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -476,7 +469,7 @@ def callcode(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -489,7 +482,7 @@ def callcode(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -531,19 +524,19 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if beneficiary not in evm.accessed_addresses:
         evm.accessed_addresses.add(beneficiary)
-        gas_cost += GAS_COLD_ACCOUNT_ACCESS
+        gas_cost += GasCosts.COLD_ACCOUNT_ACCESS
 
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -551,11 +544,11 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     move_ether(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         originator,
         beneficiary,
         originator_balance,
@@ -563,10 +556,10 @@ def selfdestruct(evm: Evm) -> None:
 
     # register account for deletion only if it was created
     # in the same transaction
-    if originator in evm.message.block_env.state.created_accounts:
+    if originator in evm.message.tx_env.state.created_accounts:
         # If beneficiary is the same as originator, then
         # the ether is burnt.
-        set_account_balance(evm.message.block_env.state, originator, U256(0))
+        set_account_balance(evm.message.tx_env.state, originator, U256(0))
         evm.accounts_to_delete.add(originator)
 
     # HALT the execution
@@ -604,10 +597,10 @@ def delegatecall(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -673,10 +666,10 @@ def staticcall(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
diff --git a/src/ethereum/forks/bpo4/vm/interpreter.py b/src/ethereum/forks/bpo4/vm/interpreter.py
index 7e789cf4b69..a778ad9af53 100644
--- a/src/ethereum/forks/bpo4/vm/interpreter.py
+++ b/src/ethereum/forks/bpo4/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,22 +31,22 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     get_account,
     get_code,
     increment_nonce,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
 )
 from ..vm import Message
 from ..vm.eoa_delegation import get_delegated_code_address, set_delegation
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -66,6 +66,7 @@
 MAX_INIT_CODE_SIZE = 2 * MAX_CODE_SIZE
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -105,12 +106,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -131,8 +132,8 @@ def process_message_call(message: Message) -> MessageCallOutput:
             message.disable_precompiles = True
             message.accessed_addresses.add(delegated_address)
             message.code = get_code(
-                block_env.state,
-                get_account(block_env.state, delegated_address).code_hash,
+                tx_state,
+                get_account(tx_state, delegated_address).code_hash,
             )
             message.code_address = delegated_address
 
@@ -176,22 +177,31 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
-    transient_storage = message.tx_env.transient_storage
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
-
-    # The list of created accounts is used by `get_storage_original`.
-    # Additionally, the list is needed to respect the constraints
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts. This tracking is also needed to respect the constraints
     # added to SELFDESTRUCT by EIP-6780.
-    mark_account_created(state, message.current_target)
+    mark_account_created(tx_state, message.current_target)
 
-    increment_nonce(state, message.current_target)
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             if len(contract_code) > 0:
@@ -201,15 +211,14 @@ def process_create_message(message: Message) -> Evm:
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state, transient_storage)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state, transient_storage)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -228,11 +237,10 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
-    transient_storage = message.tx_env.transient_storage
     code = message.code
     valid_jump_destinations = get_valid_jump_destinations(code)
     evm = Evm(
@@ -255,11 +263,14 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
+    snapshot = copy_tx_state(tx_state)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -291,9 +302,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state, transient_storage)
-    else:
-        commit_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/bpo4/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/bpo4/vm/precompiled_contracts/alt_bn128.py
index 214725d8da0..862506c54c3 100644
--- a/src/ethereum/forks/bpo4/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/bpo4/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(150))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(6000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(34000 * (len(data) // 192) + 45000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/bpo4/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/bpo4/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/bpo4/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/bpo4/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/bpo4/vm/precompiled_contracts/bls12_381/__init__.py b/src/ethereum/forks/bpo4/vm/precompiled_contracts/bls12_381/__init__.py
index c99e7573f48..7d622da39d1 100644
--- a/src/ethereum/forks/bpo4/vm/precompiled_contracts/bls12_381/__init__.py
+++ b/src/ethereum/forks/bpo4/vm/precompiled_contracts/bls12_381/__init__.py
@@ -414,7 +414,7 @@ def decode_g1_scalar_pair(
 
     """
     if len(data) != 160:
-        InvalidParameter("Input should be 160 bytes long")
+        raise InvalidParameter("Input should be 160 bytes long")
 
     point = bytes_to_g1(data[:128], subgroup_check=True)
 
@@ -614,7 +614,7 @@ def decode_g2_scalar_pair(
 
     """
     if len(data) != 288:
-        InvalidParameter("Input should be 288 bytes long")
+        raise InvalidParameter("Input should be 288 bytes long")
 
     point = bytes_to_g2(data[:256], subgroup_check=True)
     n = int.from_bytes(data[256 : 256 + 32], "big")
diff --git a/src/ethereum/forks/bpo4/vm/precompiled_contracts/bls12_381/bls12_381_g1.py b/src/ethereum/forks/bpo4/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
index ae8eeba0ce6..d1f63224a0c 100644
--- a/src/ethereum/forks/bpo4/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
+++ b/src/ethereum/forks/bpo4/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G1_ADD,
-    GAS_BLS_G1_MAP,
-    GAS_BLS_G1_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -60,7 +58,7 @@ def bls12_g1_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1ADD)
 
     # OPERATION
     p1 = bytes_to_g1(buffer_read(data, U256(0), U256(128)))
@@ -101,7 +99,7 @@ def bls12_g1_msm(evm: Evm) -> None:
     else:
         discount = Uint(G1_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G1_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G1MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -140,7 +138,7 @@ def bls12_map_fp_to_g1(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1MAP)
 
     # OPERATION
     fp = int.from_bytes(data, "big")
diff --git a/src/ethereum/forks/bpo4/vm/precompiled_contracts/bls12_381/bls12_381_g2.py b/src/ethereum/forks/bpo4/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
index 473739b78c0..2fd32313f89 100644
--- a/src/ethereum/forks/bpo4/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
+++ b/src/ethereum/forks/bpo4/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G2_ADD,
-    GAS_BLS_G2_MAP,
-    GAS_BLS_G2_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -61,7 +59,7 @@ def bls12_g2_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2ADD)
 
     # OPERATION
     p1 = bytes_to_g2(buffer_read(data, U256(0), U256(256)))
@@ -102,7 +100,7 @@ def bls12_g2_msm(evm: Evm) -> None:
     else:
         discount = Uint(G2_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G2_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G2MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -141,7 +139,7 @@ def bls12_map_fp2_to_g2(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2MAP)
 
     # OPERATION
     field_element = bytes_to_fq2(data)
diff --git a/src/ethereum/forks/bpo4/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/bpo4/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/bpo4/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/bpo4/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/bpo4/vm/precompiled_contracts/identity.py b/src/ethereum/forks/bpo4/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/bpo4/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/bpo4/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/bpo4/vm/precompiled_contracts/p256verify.py b/src/ethereum/forks/bpo4/vm/precompiled_contracts/p256verify.py
index 106dd548a61..29c2e91e0f0 100644
--- a/src/ethereum/forks/bpo4/vm/precompiled_contracts/p256verify.py
+++ b/src/ethereum/forks/bpo4/vm/precompiled_contracts/p256verify.py
@@ -24,7 +24,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_P256VERIFY, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -41,7 +41,7 @@ def p256verify(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_P256VERIFY)
+    charge_gas(evm, GasCosts.PRECOMPILE_P256VERIFY)
 
     if len(data) != 160:
         return
diff --git a/src/ethereum/forks/bpo4/vm/precompiled_contracts/point_evaluation.py b/src/ethereum/forks/bpo4/vm/precompiled_contracts/point_evaluation.py
index ce4eed71294..d2d105ba13b 100644
--- a/src/ethereum/forks/bpo4/vm/precompiled_contracts/point_evaluation.py
+++ b/src/ethereum/forks/bpo4/vm/precompiled_contracts/point_evaluation.py
@@ -22,7 +22,7 @@
 
 from ...vm import Evm
 from ...vm.exceptions import KZGProofError
-from ...vm.gas import GAS_POINT_EVALUATION, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 FIELD_ELEMENTS_PER_BLOB = 4096
 BLS_MODULUS = 52435875175126190479447740508185965837690552500527637822603658699938581184513  # noqa: E501
@@ -51,7 +51,7 @@ def point_evaluation(evm: Evm) -> None:
     proof = Bytes48(data[144:192])
 
     # GAS
-    charge_gas(evm, GAS_POINT_EVALUATION)
+    charge_gas(evm, GasCosts.PRECOMPILE_POINT_EVALUATION)
     if kzg_commitment_to_versioned_hash(commitment) != versioned_hash:
         raise KZGProofError
 
diff --git a/src/ethereum/forks/bpo4/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/bpo4/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/bpo4/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/bpo4/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/bpo4/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/bpo4/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/bpo4/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/bpo4/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/bpo5/blocks.py b/src/ethereum/forks/bpo5/blocks.py
index ed7138e74e6..eed86b7e175 100644
--- a/src/ethereum/forks/bpo5/blocks.py
+++ b/src/ethereum/forks/bpo5/blocks.py
@@ -10,7 +10,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
@@ -31,6 +31,7 @@
 )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Withdrawal:
@@ -64,6 +65,7 @@ class Withdrawal:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -107,13 +109,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.bpo5.state.state_root
-    [Trie]: ref:ethereum.forks.bpo5.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -123,8 +126,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.bpo5.trie.root
-    [Trie]: ref:ethereum.forks.bpo5.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -134,8 +137,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.bpo5.trie.root
-    [Trie]: ref:ethereum.forks.bpo5.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -244,6 +247,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -297,6 +301,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -329,6 +334,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/bpo5/fork.py b/src/ethereum/forks/bpo5/fork.py
index 3dfd35f98a8..fcdff89d045 100644
--- a/src/ethereum/forks/bpo5/fork.py
+++ b/src/ethereum/forks/bpo5/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Tuple
+from typing import Final, List, Optional, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
@@ -27,7 +27,13 @@
     InvalidSenderError,
     NonceMismatchError,
 )
-from ethereum.state import EMPTY_CODE_HASH, Account, Address
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt, Withdrawal, encode_receipt
@@ -51,19 +57,19 @@
     compute_requests_hash,
     parse_deposit_requests,
 )
-from .state import (
-    State,
-    TransientStorage,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
+    create_ether,
     destroy_account,
+    extract_block_diff,
     get_account,
     get_code,
+    incorporate_tx_into_block,
     increment_nonce,
-    modify_state,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
-    AccessListTransaction,
     BlobTransaction,
     FeeMarketTransaction,
     LegacyTransaction,
@@ -72,17 +78,16 @@
     decode_transaction,
     encode_transaction,
     get_transaction_hash,
+    has_access_list,
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.hexadecimal import hex_to_address
 from .utils.message import prepare_message
 from .vm import Message
 from .vm.eoa_delegation import is_valid_delegation
 from .vm.gas import (
-    BLOB_SCHEDULE_MAX,
-    GAS_PER_BLOB,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_data_fee,
     calculate_excess_blob_gas,
@@ -92,15 +97,15 @@
 
 BASE_FEE_MAX_CHANGE_DENOMINATOR = Uint(8)
 ELASTICITY_MULTIPLIER = Uint(2)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 SYSTEM_ADDRESS = hex_to_address("0xfffffffffffffffffffffffffffffffffffffffe")
 BEACON_ROOTS_ADDRESS = hex_to_address(
     "0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02"
 )
 SYSTEM_TRANSACTION_GAS = Uint(30000000)
-MAX_BLOB_GAS_PER_BLOCK = BLOB_SCHEDULE_MAX * GAS_PER_BLOB
+MAX_BLOB_GAS_PER_BLOCK: Final[U64] = (
+    GasCosts.BLOB_SCHEDULE_MAX * GasCosts.PER_BLOB
+)
 VERSIONED_HASH_VERSION_KZG = b"\x01"
 
 WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS = hex_to_address(
@@ -118,6 +123,7 @@
 BLOB_COUNT_LIMIT = 6
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -223,9 +229,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block.ommers != ():
         raise InvalidBlock
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -242,7 +250,10 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         withdrawals=block.withdrawals,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes, block_diff.storage_changes
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -268,6 +279,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if requests_hash != block.header.requests_hash:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -399,6 +411,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Tuple[Address, Uint, Tuple[VersionedHash, ...], U64]:
     """
     Check if the transaction is includable in the block.
@@ -411,6 +424,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -469,7 +484,7 @@ def check_transaction(
         raise BlobGasLimitExceededError("blob gas limit exceeded")
 
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     if isinstance(
         tx, (FeeMarketTransaction, BlobTransaction, SetCodeTransaction)
@@ -537,7 +552,7 @@ def check_transaction(
 
     if Uint(sender_account.balance) < max_gas_fee + Uint(tx.value):
         raise InsufficientBalanceError("insufficient sender balance")
-    sender_code = get_code(block_env.state, sender_account.code_hash)
+    sender_code = get_code(tx_state, sender_account.code_hash)
     if sender_account.code_hash != EMPTY_CODE_HASH and not is_valid_delegation(
         sender_code
     ):
@@ -588,74 +603,6 @@ def make_receipt(
     return encode_receipt(tx, receipt)
 
 
-def process_system_transaction(
-    block_env: vm.BlockEnvironment,
-    target_address: Address,
-    system_contract_code: Bytes,
-    data: Bytes,
-) -> MessageCallOutput:
-    """
-    Process a system transaction with the given code.
-
-    Prefer calling `process_checked_system_transaction` or
-    `process_unchecked_system_transaction` depending on whether missing code or
-    an execution error should cause the block to be rejected.
-
-    Parameters
-    ----------
-    block_env :
-        The block scoped environment.
-    target_address :
-        Address of the contract to call.
-    system_contract_code :
-        Code of the contract to call.
-    data :
-        Data to pass to the contract.
-
-    Returns
-    -------
-    system_tx_output : `MessageCallOutput`
-        Output of processing the system transaction.
-
-    """
-    tx_env = vm.TransactionEnvironment(
-        origin=SYSTEM_ADDRESS,
-        gas_price=block_env.base_fee_per_gas,
-        gas=SYSTEM_TRANSACTION_GAS,
-        access_list_addresses=set(),
-        access_list_storage_keys=set(),
-        transient_storage=TransientStorage(),
-        blob_versioned_hashes=(),
-        authorizations=(),
-        index_in_block=None,
-        tx_hash=None,
-    )
-
-    system_tx_message = Message(
-        block_env=block_env,
-        tx_env=tx_env,
-        caller=SYSTEM_ADDRESS,
-        target=target_address,
-        gas=SYSTEM_TRANSACTION_GAS,
-        value=U256(0),
-        data=data,
-        code=system_contract_code,
-        depth=Uint(0),
-        current_target=target_address,
-        code_address=target_address,
-        should_transfer_value=False,
-        is_static=False,
-        accessed_addresses=set(),
-        accessed_storage_keys=set(),
-        disable_precompiles=False,
-        parent_evm=None,
-    )
-
-    system_tx_output = process_message_call(system_tx_message)
-
-    return system_tx_output
-
-
 def process_checked_system_transaction(
     block_env: vm.BlockEnvironment,
     target_address: Address,
@@ -680,9 +627,18 @@ def process_checked_system_transaction(
         Output of processing the system transaction.
 
     """
+    # Pre-check that the system contract has code. We use a throwaway
+    # TransactionState here that is *never* propagated back to BlockState
+    # (no incorporate_tx_into_block call); the same get_account / get_code
+    # lookups are performed and properly tracked by
+    # process_unchecked_system_transaction below, which this function
+    # always calls. Reading via a TransactionState (rather than directly
+    # against pre_state) lets us see system contracts deployed earlier in
+    # the same block — see EIP-7002 and EIP-7251 for this edge case.
+    untracked_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        untracked_state,
+        get_account(untracked_state, target_address).code_hash,
     )
 
     if len(system_contract_code) == 0:
@@ -691,10 +647,9 @@ def process_checked_system_transaction(
             "contain code"
         )
 
-    system_tx_output = process_system_transaction(
+    system_tx_output = process_unchecked_system_transaction(
         block_env,
         target_address,
-        system_contract_code,
         data,
     )
 
@@ -713,8 +668,8 @@ def process_unchecked_system_transaction(
     data: Bytes,
 ) -> MessageCallOutput:
     """
-    Process a system transaction without checking if the contract contains code
-    or if the transaction fails.
+    Process a system transaction without checking if the contract contains
+    code or if the transaction fails.
 
     Parameters
     ----------
@@ -731,17 +686,51 @@ def process_unchecked_system_transaction(
         Output of processing the system transaction.
 
     """
+    system_tx_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        system_tx_state,
+        get_account(system_tx_state, target_address).code_hash,
     )
-    return process_system_transaction(
-        block_env,
-        target_address,
-        system_contract_code,
-        data,
+
+    tx_env = vm.TransactionEnvironment(
+        origin=SYSTEM_ADDRESS,
+        gas_price=block_env.base_fee_per_gas,
+        gas=SYSTEM_TRANSACTION_GAS,
+        access_list_addresses=set(),
+        access_list_storage_keys=set(),
+        state=system_tx_state,
+        blob_versioned_hashes=(),
+        authorizations=(),
+        index_in_block=None,
+        tx_hash=None,
+    )
+
+    system_tx_message = Message(
+        block_env=block_env,
+        tx_env=tx_env,
+        caller=SYSTEM_ADDRESS,
+        target=target_address,
+        gas=SYSTEM_TRANSACTION_GAS,
+        value=U256(0),
+        data=data,
+        code=system_contract_code,
+        depth=Uint(0),
+        current_target=target_address,
+        code_address=target_address,
+        should_transfer_value=False,
+        is_static=False,
+        accessed_addresses=set(),
+        accessed_storage_keys=set(),
+        disable_precompiles=False,
+        parent_evm=None,
     )
 
+    system_tx_output = process_message_call(system_tx_message)
+
+    incorporate_tx_into_block(system_tx_state)
+
+    return system_tx_output
+
 
 def apply_body(
     block_env: vm.BlockEnvironment,
@@ -875,6 +864,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(
         block_output.transactions_trie,
         rlp.encode(index),
@@ -892,9 +883,10 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     if isinstance(tx, BlobTransaction):
         blob_gas_fee = calculate_data_fee(block_env.excess_blob_gas, tx)
@@ -904,27 +896,17 @@ def process_transaction(
     effective_gas_fee = tx.gas * effective_gas_price
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     sender_balance_after_gas_fee = (
         Uint(sender_account.balance) - effective_gas_fee - blob_gas_fee
     )
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     access_list_addresses = set()
     access_list_storage_keys = set()
     access_list_addresses.add(block_env.coinbase)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
             access_list_addresses.add(access.account)
             for slot in access.slots:
@@ -940,7 +922,7 @@ def process_transaction(
         gas=gas,
         access_list_addresses=access_list_addresses,
         access_list_storage_keys=access_list_storage_keys,
-        transient_storage=TransientStorage(),
+        state=tx_state,
         blob_versioned_hashes=blob_versioned_hashes,
         authorizations=authorizations,
         index_in_block=index,
@@ -973,23 +955,13 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * priority_fee_per_gas
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
-    coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
-    ).balance + U256(transaction_fee)
-    set_account_balance(
-        block_env.state,
-        block_env.coinbase,
-        coinbase_balance_after_mining_fee,
-    )
+    create_ether(tx_state, block_env.coinbase, U256(transaction_fee))
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
     block_output.block_gas_used += tx_gas_used_after_refund
     block_output.blob_gas_used += tx_blob_gas_used
@@ -1009,6 +981,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def process_withdrawals(
     block_env: vm.BlockEnvironment,
@@ -1018,9 +992,7 @@ def process_withdrawals(
     """
     Increase the balance of the withdrawing account.
     """
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += wd.amount * U256(10**9)
+    wd_state = TransactionState(parent=block_env.state)
 
     for i, wd in enumerate(withdrawals):
         trie_set(
@@ -1029,7 +1001,9 @@ def increase_recipient_balance(recipient: Account) -> None:
             rlp.encode(wd),
         )
 
-        modify_state(block_env.state, wd.address, increase_recipient_balance)
+        create_ether(wd_state, wd.address, wd.amount * U256(10**9))
+
+    incorporate_tx_into_block(wd_state)
 
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
@@ -1038,14 +1012,14 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
-    passed through as a parameter is greater than or equal to the *sum* of
-    the parent's gas and the adjustment delta then the limit for gas is too
-    high and fails this function's check. Similarly, if the limit is less
-    than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
-    check fails because the gas limit doesn't allow for a sufficient or
-    reasonable amount of gas to be used on a block.
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is passed
+    through as a parameter is greater than or equal to the *sum* of the
+    parent's gas and the adjustment delta then the limit for gas is too high
+    and fails this function's check. Similarly, if the limit is less than or
+    equal to the *difference* of the parent's gas and the adjustment delta *or*
+    the predefined ``LIMIT_MINIMUM`` then this function's check fails because
+    the gas limit doesn't allow for a sufficient or reasonable amount of gas to
+    be used on a block.
 
     Parameters
     ----------
@@ -1061,12 +1035,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/bpo5/fork_types.py b/src/ethereum/forks/bpo5/fork_types.py
index c598e9876bf..4bec34810db 100644
--- a/src/ethereum/forks/bpo5/fork_types.py
+++ b/src/ethereum/forks/bpo5/fork_types.py
@@ -12,6 +12,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes256
@@ -43,6 +44,7 @@ def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Authorization:
diff --git a/src/ethereum/forks/bpo5/requests.py b/src/ethereum/forks/bpo5/requests.py
index 542c9264d37..4bb47dfbafb 100644
--- a/src/ethereum/forks/bpo5/requests.py
+++ b/src/ethereum/forks/bpo5/requests.py
@@ -1,11 +1,31 @@
 """
-Requests were introduced in EIP-7685 as a general purpose framework for
-storing contract-triggered requests. It extends the execution header and
-body with a single field each to store the request information.
-This inherently exposes the requests to the consensus layer, which can
-then process each one.
-
+[EIP-7685] generalizes how the execution layer communicates validator actions
+to the consensus layer. Rather than adding a dedicated header field for each
+new action type (as [EIP-4895] did for withdrawals), the execution header
+commits to a single [`requests_hash`][rh] that aggregates an ordered list of
+typed requests.
+
+Each request is a type byte (see [`DEPOSIT_REQUEST_TYPE`][dt],
+[`WITHDRAWAL_REQUEST_TYPE`][wt], and [`CONSOLIDATION_REQUEST_TYPE`][ct])
+followed by an opaque payload. Deposit requests are discovered by scanning
+transaction receipts for logs emitted by the deposit contract; withdrawal
+and consolidation requests are produced by the corresponding system
+contracts during block processing.
+
+See [`parse_deposit_requests`][pd] for how deposit logs become request data,
+[`compute_requests_hash`][crh] for how the list is hashed for inclusion in the
+header, and [`process_general_purpose_requests`][pgpr] for how the requests are
+processed.
+
+[EIP-4895]: https://eips.ethereum.org/EIPS/eip-4895
 [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+[rh]: ref:ethereum.forks.bpo5.blocks.Header.requests_hash
+[dt]: ref:ethereum.forks.bpo5.requests.DEPOSIT_REQUEST_TYPE
+[wt]: ref:ethereum.forks.bpo5.requests.WITHDRAWAL_REQUEST_TYPE
+[ct]: ref:ethereum.forks.bpo5.requests.CONSOLIDATION_REQUEST_TYPE
+[pd]: ref:ethereum.forks.bpo5.requests.parse_deposit_requests
+[crh]: ref:ethereum.forks.bpo5.requests.compute_requests_hash
+[pgpr]: ref:ethereum.forks.bpo5.fork.process_general_purpose_requests
 """
 
 from hashlib import sha256
@@ -15,48 +35,133 @@
 from ethereum_types.numeric import Uint, ulen
 
 from ethereum.exceptions import InvalidBlock
+from ethereum.merkle_patricia_trie import trie_get
 from ethereum.utils.hexadecimal import hex_to_bytes32
 
 from .blocks import decode_receipt
-from .trie import trie_get
 from .utils.hexadecimal import hex_to_address
 from .vm import BlockOutput
 
 DEPOSIT_CONTRACT_ADDRESS = hex_to_address(
     "0x00000000219ab540356cbb839cbe05303d7705fa"
 )
+"""
+Mainnet address of the beacon chain deposit contract. Scanning block
+receipts for logs emitted by this address is how the execution layer
+discovers validator deposits, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 DEPOSIT_EVENT_SIGNATURE_HASH = hex_to_bytes32(
     "0x649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c5"
 )
+"""
+First [log topic] of the deposit contract's `DepositEvent`, equal to the
+keccak256 of its Solidity event signature. Logs whose first topic does not
+match this are ignored when collecting deposit requests.
+
+[log topic]: https://docs.soliditylang.org/en/latest/abi-spec.html#events
+"""
+
 DEPOSIT_REQUEST_TYPE = b"\x00"
+"""
+Request type byte identifying a deposit request, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 WITHDRAWAL_REQUEST_TYPE = b"\x01"
+"""
+Request type byte identifying an execution-triggered withdrawal request,
+per [EIP-7002].
+
+[EIP-7002]: https://eips.ethereum.org/EIPS/eip-7002
+"""
+
 CONSOLIDATION_REQUEST_TYPE = b"\x02"
+"""
+Request type byte identifying a consolidation request, per [EIP-7251].
+
+[EIP-7251]: https://eips.ethereum.org/EIPS/eip-7251
+"""
 
 
 DEPOSIT_EVENT_LENGTH = Uint(576)
+"""
+Total length in bytes of the ABI-encoded `DepositEvent` data payload. Every
+well-formed event has this exact length.
+"""
 
 PUBKEY_OFFSET = Uint(160)
+"""
+Position within the event payload of the validator public key's length
+prefix, as emitted by the Solidity ABI encoder.
+"""
+
 WITHDRAWAL_CREDENTIALS_OFFSET = Uint(256)
+"""
+Position within the event payload of the withdrawal credentials' length
+prefix.
+"""
+
 AMOUNT_OFFSET = Uint(320)
+"""
+Position within the event payload of the deposit amount's length prefix.
+"""
+
 SIGNATURE_OFFSET = Uint(384)
+"""
+Position within the event payload of the deposit signature's length prefix.
+"""
+
 INDEX_OFFSET = Uint(512)
+"""
+Position within the event payload of the deposit index's length prefix.
+"""
 
 PUBKEY_SIZE = Uint(48)
+"""
+Length of the BLS12-381 public key that identifies the validator receiving
+the deposit.
+"""
+
 WITHDRAWAL_CREDENTIALS_SIZE = Uint(32)
+"""
+Length of the withdrawal credentials, which determine where the staked
+ether may eventually be withdrawn.
+"""
+
 AMOUNT_SIZE = Uint(8)
+"""
+Length of the little-endian Gwei amount being deposited.
+"""
+
 SIGNATURE_SIZE = Uint(96)
+"""
+Length of the BLS12-381 signature over the deposit message.
+"""
+
 INDEX_SIZE = Uint(8)
+"""
+Length of the monotonically-increasing deposit index assigned by the
+deposit contract when it emits the event.
+"""
 
 
 def extract_deposit_data(data: Bytes) -> Bytes:
     """
-    Extracts Deposit Request from the DepositContract.DepositEvent data.
+    Strip the Solidity ABI framing from a `DepositEvent` payload and return
+    the concatenated raw fields in the order consumed by the consensus
+    layer: public key, withdrawal credentials, amount, signature, and
+    deposit index.
 
-    Raises
-    ------
-    InvalidBlock :
-        If the deposit contract did not produce a valid log.
+    Because each field has a fixed length, every well-formed event has an
+    identical byte layout. Any deviation indicates a misbehaving or
+    compromised deposit contract, so this function raises [`InvalidBlock`]
+    rather than silently accepting unexpected data.
 
+    [`InvalidBlock`]: ref:ethereum.exceptions.InvalidBlock
     """
     if ulen(data) != DEPOSIT_EVENT_LENGTH:
         raise InvalidBlock("Invalid deposit event data length")
@@ -150,7 +255,19 @@ def extract_deposit_data(data: Bytes) -> Bytes:
 
 def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
     """
-    Parse deposit requests from the block output.
+    Walk the receipts produced during block execution, concatenating the
+    raw payload of every valid deposit event into a single byte string.
+
+    A log is considered a deposit when it originates from
+    [`DEPOSIT_CONTRACT_ADDRESS`][addr] and its first topic matches
+    [`DEPOSIT_EVENT_SIGNATURE_HASH`][sig]. The returned bytes are the
+    direct concatenation of the unframed deposit fields, ready to be
+    prefixed with [`DEPOSIT_REQUEST_TYPE`][dt] before being appended to
+    the block's request list.
+
+    [addr]: ref:ethereum.forks.bpo5.requests.DEPOSIT_CONTRACT_ADDRESS
+    [sig]: ref:ethereum.forks.bpo5.requests.DEPOSIT_EVENT_SIGNATURE_HASH
+    [dt]: ref:ethereum.forks.bpo5.requests.DEPOSIT_REQUEST_TYPE
     """
     deposit_requests: Bytes = b""
     for key in block_output.receipt_keys:
@@ -171,18 +288,18 @@ def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
 
 def compute_requests_hash(requests: List[Bytes]) -> Bytes:
     """
-    Get the hash of the requests using the SHA2-256 algorithm.
-
-    Parameters
-    ----------
-    requests : Bytes
-        The requests to hash.
-
-    Returns
-    -------
-    requests_hash : Bytes
-        The hash of the requests.
-
+    Compute the [SHA2-256] commitment over an ordered list of
+    type-prefixed requests, as defined by [EIP-7685].
+
+    The commitment is the SHA2-256 hash of the concatenation of the
+    SHA2-256 hashes of each individual request. This is what the
+    execution header's [`requests_hash`][rh] stores, and what the
+    consensus layer re-derives to validate that both layers observed the
+    same set of requests.
+
+    [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+    [SHA2-256]: https://en.wikipedia.org/wiki/SHA-2
+    [rh]: ref:ethereum.forks.bpo5.blocks.Header.requests_hash
     """
     m = sha256()
     for request in requests:
diff --git a/src/ethereum/forks/bpo5/state.py b/src/ethereum/forks/bpo5/state.py
deleted file mode 100644
index 342bda1a1cd..00000000000
--- a/src/ethereum/forks/bpo5/state.py
+++ /dev/null
@@ -1,713 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-from ethereum.state import (
-    EMPTY_ACCOUNT,
-    EMPTY_CODE_HASH,
-    Account,
-    Address,
-    Root,
-)
-
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-    def get_code(self, code_hash: Hash32) -> Bytes:
-        """
-        Get the bytecode for a given code hash.
-
-        Return ``b""`` for ``EMPTY_CODE_HASH``.
-        """
-        if code_hash == EMPTY_CODE_HASH:
-            return b""
-        return self._code_store[code_hash]
-
-
-@dataclass
-class TransientStorage:
-    """
-    Contains all information that is preserved between message calls
-    within a transaction.
-    """
-
-    _tries: Dict[Address, Trie[Bytes32, U256]] = field(default_factory=dict)
-    _snapshots: List[Dict[Address, Trie[Bytes32, U256]]] = field(
-        default_factory=list
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-
-
-def begin_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-    transient_storage._snapshots.append(
-        {k: copy_trie(t) for (k, t) in transient_storage._tries.items()}
-    )
-
-
-def commit_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._snapshots.pop()
-
-
-def rollback_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._tries = transient_storage._snapshots.pop()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-
-    Return ``b""`` for ``EMPTY_CODE_HASH``.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State`` and return its hash.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase, and to respect the constraints added to SELFDESTRUCT by
-    EIP-6780.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`. If, after modification, the account
-    exists and has zero nonce, empty code, and zero balance, it is destroyed.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-    account = get_account_optional(state, address)
-    account_exists_and_is_empty = (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-    if account_exists_and_is_empty:
-        destroy_account(state, address)
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
-
-
-def get_transient_storage(
-    transient_storage: TransientStorage, address: Address, key: Bytes32
-) -> U256:
-    """
-    Get a value at a storage key on an account from transient storage.
-    Returns `U256(0)` if the storage key has not been set previously.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_transient_storage(
-    transient_storage: TransientStorage,
-    address: Address,
-    key: Bytes32,
-    value: U256,
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        transient_storage._tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del transient_storage._tries[address]
diff --git a/src/ethereum/forks/bpo5/state_tracker.py b/src/ethereum/forks/bpo5/state_tracker.py
new file mode 100644
index 00000000000..67ceaa86321
--- /dev/null
+++ b/src/ethereum/forks/bpo5/state_tracker.py
@@ -0,0 +1,749 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state. If, after modification, the
+    account exists and has zero nonce, empty code, and zero balance, it
+    is destroyed.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+    if account_exists_and_is_empty(tx_state, address):
+        destroy_account(tx_state, address)
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+    )
diff --git a/src/ethereum/forks/bpo5/transactions.py b/src/ethereum/forks/bpo5/transactions.py
index 048852529e4..18953538456 100644
--- a/src/ethereum/forks/bpo5/transactions.py
+++ b/src/ethereum/forks/bpo5/transactions.py
@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, TypeGuard, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -28,46 +28,10 @@
 )
 from .fork_types import Authorization, VersionedHash
 
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_TOKEN_FLOOR = Uint(10)
-"""
-Minimum gas cost per byte of calldata as per [EIP-7623]. Used to calculate
-the minimum gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_DATA_TOKEN_STANDARD = Uint(4)
-"""
-Gas cost per byte of calldata as per [EIP-7623]. Used to calculate the
-gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
-
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
-"""
-
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
-"""
-
 TX_MAX_GAS_LIMIT = Uint(16_777_216)
 
 
+@final
 @slotted_freezable
 @dataclass
 class LegacyTransaction:
@@ -130,6 +94,7 @@ class LegacyTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Access:
@@ -149,6 +114,7 @@ class Access:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccessListTransaction:
@@ -221,6 +187,7 @@ class AccessListTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class FeeMarketTransaction:
@@ -298,6 +265,7 @@ class FeeMarketTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class BlobTransaction:
@@ -386,6 +354,7 @@ class BlobTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class SetCodeTransaction:
@@ -481,6 +450,23 @@ class SetCodeTransaction:
 """
 
 
+AccessListCapableTransaction = (
+    AccessListTransaction
+    | FeeMarketTransaction
+    | BlobTransaction
+    | SetCodeTransaction
+)
+"""
+Transaction types that include an [EIP-2930]-style access list.
+
+See [`has_access_list`][hal] and [`Access`][a] for more details.
+
+[EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+[hal]: ref:ethereum.forks.amsterdam.transactions.has_access_list
+[a]: ref:ethereum.forks.amsterdam.transactions.Access
+"""
+
+
 def encode_transaction(tx: Transaction) -> LegacyTransaction | Bytes:
     """
     Encode a transaction into its RLP or typed transaction format.
@@ -584,7 +570,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
     4. Cost for access list entries (if applicable)
@@ -595,8 +581,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     gas cost of the transaction and the minimum gas cost used by the
     transaction based on the calldata size.
     """
-    from .vm.eoa_delegation import GAS_AUTH_PER_EMPTY_ACCOUNT
-    from .vm.gas import init_code_cost
+    from .vm.gas import GasCosts, init_code_cost
 
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
@@ -604,39 +589,33 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     tokens_in_calldata = num_zeros + num_non_zeros * Uint(4)
     # EIP-7623 floor price (note: no EVM costs)
     calldata_floor_gas_cost = (
-        tokens_in_calldata * GAS_TX_DATA_TOKEN_FLOOR + GAS_TX_BASE
+        tokens_in_calldata * GasCosts.TX_DATA_TOKEN_FLOOR + GasCosts.TX_BASE
     )
 
-    data_cost = tokens_in_calldata * GAS_TX_DATA_TOKEN_STANDARD
+    data_cost = tokens_in_calldata * GasCosts.TX_DATA_TOKEN_STANDARD
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE + init_code_cost(ulen(tx.data))
+        create_cost = GasCosts.TX_CREATE + init_code_cost(ulen(tx.data))
     else:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
-            access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_cost += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
 
     auth_cost = Uint(0)
     if isinstance(tx, SetCodeTransaction):
-        auth_cost += Uint(GAS_AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations))
+        auth_cost += Uint(
+            GasCosts.AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations)
+        )
 
     return (
         Uint(
-            GAS_TX_BASE
+            GasCosts.TX_BASE
             + data_cost
             + create_cost
             + access_list_cost
@@ -884,3 +863,17 @@ def get_transaction_hash(tx: Bytes | LegacyTransaction) -> Hash32:
         return keccak256(rlp.encode(tx))
     else:
         return keccak256(tx)
+
+
+def has_access_list(
+    tx: Transaction,
+) -> TypeGuard[AccessListCapableTransaction]:
+    """
+    Return whether the transaction has an [EIP-2930]-style access list.
+
+    [EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+    """
+    return isinstance(
+        tx,
+        AccessListCapableTransaction,
+    )
diff --git a/src/ethereum/forks/bpo5/trie.py b/src/ethereum/forks/bpo5/trie.py
deleted file mode 100644
index 2b0cf6bc3ed..00000000000
--- a/src/ethereum/forks/bpo5/trie.py
+++ /dev/null
@@ -1,509 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-from typing_extensions import assert_type
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.bpo4 import trie as previous_trie
-from ethereum.state import Account, Address, Root
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt, Withdrawal
-from .fork_types import encode_account
-from .transactions import LegacyTransaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = (
-    Account
-    | Bytes
-    | LegacyTransaction
-    | Receipt
-    | Uint
-    | U256
-    | Withdrawal
-    | None
-)
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[LegacyTransaction | Bytes],
-    Optional[Receipt | Bytes],
-    Optional[Withdrawal | Bytes],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `Extended`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (LegacyTransaction, Receipt, Withdrawal, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/bpo5/utils/message.py b/src/ethereum/forks/bpo5/utils/message.py
index be5c30f8e28..fdc2b6ecc7e 100644
--- a/src/ethereum/forks/bpo5/utils/message.py
+++ b/src/ethereum/forks/bpo5/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
@@ -55,7 +55,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -63,8 +63,9 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        state = block_env.state
-        code = get_code(state, get_account(state, tx.to).code_hash)
+        code = get_code(
+            tx_env.state, get_account(tx_env.state, tx.to).code_hash
+        )
         code_address = tx.to
     else:
         raise AssertionError("Target must be address or empty bytes")
diff --git a/src/ethereum/forks/bpo5/vm/__init__.py b/src/ethereum/forks/bpo5/vm/__init__.py
index 37d0a327974..42229ebd849 100644
--- a/src/ethereum/forks/bpo5/vm/__init__.py
+++ b/src/ethereum/forks/bpo5/vm/__init__.py
@@ -13,24 +13,25 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt, Withdrawal
 from ..fork_types import Authorization, VersionedHash
-from ..state import State, TransientStorage
+from ..state_tracker import BlockState, TransactionState
 from ..transactions import LegacyTransaction
-from ..trie import Trie
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +39,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -50,6 +51,7 @@ class BlockEnvironment:
     parent_beacon_block_root: Hash32
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -92,10 +94,11 @@ class BlockOutput:
     requests: List[Bytes] = field(default_factory=list)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
@@ -103,13 +106,14 @@ class TransactionEnvironment:
     gas: Uint
     access_list_addresses: Set[Address]
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
-    transient_storage: TransientStorage
+    state: TransactionState
     blob_versioned_hashes: Tuple[VersionedHash, ...]
     authorizations: Tuple[Authorization, ...]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -135,6 +139,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
diff --git a/src/ethereum/forks/bpo5/vm/eoa_delegation.py b/src/ethereum/forks/bpo5/vm/eoa_delegation.py
index fce580bee4a..1ba552f8dd6 100644
--- a/src/ethereum/forks/bpo5/vm/eoa_delegation.py
+++ b/src/ethereum/forks/bpo5/vm/eoa_delegation.py
@@ -14,7 +14,7 @@
 from ethereum.state import Address
 
 from ..fork_types import Authorization
-from ..state import (
+from ..state_tracker import (
     account_exists,
     get_account,
     get_code,
@@ -22,14 +22,13 @@
     set_code,
 )
 from ..utils.hexadecimal import hex_to_address
-from ..vm.gas import GAS_COLD_ACCOUNT_ACCESS, GAS_WARM_ACCESS
+from ..vm.gas import GasCosts
 from . import Evm, Message
 
 SET_CODE_TX_MAGIC = b"\x05"
 EOA_DELEGATION_MARKER = b"\xef\x01\x00"
 EOA_DELEGATION_MARKER_LENGTH = len(EOA_DELEGATION_MARKER)
 EOA_DELEGATED_CODE_LENGTH = 23
-GAS_AUTH_PER_EMPTY_ACCOUNT = 25000
 REFUND_AUTH_PER_EXISTING_ACCOUNT = 12500
 NULL_ADDRESS = hex_to_address("0x0000000000000000000000000000000000000000")
 
@@ -140,18 +139,18 @@ def access_delegation(
         The delegation address, code, and access gas cost.
 
     """
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
     if not is_valid_delegation(code):
         return False, address, code, Uint(0)
 
     address = Address(code[EOA_DELEGATION_MARKER_LENGTH:])
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
-    code = get_code(state, get_account(state, address).code_hash)
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     return True, address, code, access_gas_cost
 
@@ -171,7 +170,7 @@ def set_delegation(message: Message) -> U256:
         Refund from authority which already exists in state.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     for auth in message.tx_env.authorizations:
         if auth.chain_id not in (message.block_env.chain_id, U256(0)):
@@ -187,8 +186,8 @@ def set_delegation(message: Message) -> U256:
 
         message.accessed_addresses.add(authority)
 
-        authority_account = get_account(state, authority)
-        authority_code = get_code(state, authority_account.code_hash)
+        authority_account = get_account(tx_state, authority)
+        authority_code = get_code(tx_state, authority_account.code_hash)
 
         if authority_code and not is_valid_delegation(authority_code):
             continue
@@ -197,24 +196,25 @@ def set_delegation(message: Message) -> U256:
         if authority_nonce != auth.nonce:
             continue
 
-        if account_exists(state, authority):
+        if account_exists(tx_state, authority):
             refund_counter += U256(
-                GAS_AUTH_PER_EMPTY_ACCOUNT - REFUND_AUTH_PER_EXISTING_ACCOUNT
+                GasCosts.AUTH_PER_EMPTY_ACCOUNT
+                - REFUND_AUTH_PER_EXISTING_ACCOUNT
             )
 
         if auth.address == NULL_ADDRESS:
             code_to_set = b""
         else:
             code_to_set = EOA_DELEGATION_MARKER + auth.address
-        set_code(state, authority, code_to_set)
+        set_code(tx_state, authority, code_to_set)
 
-        increment_nonce(state, authority)
+        increment_nonce(tx_state, authority)
 
     if message.code_address is None:
         raise InvalidBlock("Invalid type 4 transaction: no target")
 
     message.code = get_code(
-        state, get_account(state, message.code_address).code_hash
+        tx_state, get_account(tx_state, message.code_address).code_hash
     )
 
     return refund_counter
diff --git a/src/ethereum/forks/bpo5/vm/gas.py b/src/ethereum/forks/bpo5/vm/gas.py
index a2e5d1ab39a..653f6eb9ea1 100644
--- a/src/ethereum/forks/bpo5/vm/gas.py
+++ b/src/ethereum/forks/bpo5/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U64, U256, Uint
+from ethereum_types.numeric import U64, U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32, taylor_exponential
@@ -24,67 +24,172 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 4800
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-GAS_ECRECOVER = Uint(3000)
-GAS_P256VERIFY = Uint(6900)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1)
-GAS_COLD_SLOAD = Uint(2100)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600)
-GAS_WARM_ACCESS = Uint(100)
-GAS_CODE_INIT_PER_WORD = Uint(2)
-GAS_BLOBHASH_OPCODE = Uint(3)
-GAS_POINT_EVALUATION = Uint(50000)
-
-GAS_PER_BLOB = U64(2**17)
-BLOB_SCHEDULE_TARGET = U64(14)
-BLOB_TARGET_GAS_PER_BLOCK = GAS_PER_BLOB * BLOB_SCHEDULE_TARGET
-BLOB_BASE_COST = Uint(2**13)
-BLOB_SCHEDULE_MAX = U64(21)
-BLOB_MIN_GASPRICE = Uint(1)
-BLOB_BASE_FEE_UPDATE_FRACTION = Uint(11684671)
-
-GAS_BLS_G1_ADD = Uint(375)
-GAS_BLS_G1_MUL = Uint(12000)
-GAS_BLS_G1_MAP = Uint(5500)
-GAS_BLS_G2_ADD = Uint(600)
-GAS_BLS_G2_MUL = Uint(22500)
-GAS_BLS_G2_MAP = Uint(23800)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    WARM_ACCESS: Final[Uint] = Uint(100)
+    COLD_ACCOUNT_ACCESS: Final[Uint] = Uint(2600)
+    COLD_STORAGE_ACCESS: Final[Uint] = Uint(2100)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+    CODE_INIT_PER_WORD: Final[Uint] = Uint(2)
+
+    # Authorization
+    AUTH_PER_EMPTY_ACCOUNT: Final[int] = 25000
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 4800
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_P256VERIFY: Final[Uint] = Uint(6900)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1)
+    PRECOMPILE_POINT_EVALUATION: Final[Uint] = Uint(50000)
+    PRECOMPILE_BLS_G1ADD: Final[Uint] = Uint(375)
+    PRECOMPILE_BLS_G1MUL: Final[Uint] = Uint(12000)
+    PRECOMPILE_BLS_G1MAP: Final[Uint] = Uint(5500)
+    PRECOMPILE_BLS_G2ADD: Final[Uint] = Uint(600)
+    PRECOMPILE_BLS_G2MUL: Final[Uint] = Uint(22500)
+    PRECOMPILE_BLS_G2MAP: Final[Uint] = Uint(23800)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000)
+
+    # Blobs
+    PER_BLOB: Final[U64] = U64(2**17)
+    BLOB_SCHEDULE_TARGET: Final[U64] = U64(14)
+    BLOB_TARGET_GAS_PER_BLOCK: Final[U64] = PER_BLOB * BLOB_SCHEDULE_TARGET
+    BLOB_BASE_COST: Final[Uint] = Uint(2**13)
+    BLOB_SCHEDULE_MAX: Final[U64] = U64(21)
+    BLOB_MIN_GASPRICE: Final[Uint] = Uint(1)
+    BLOB_BASE_FEE_UPDATE_FRACTION: Final[Uint] = Uint(11684671)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_TOKEN_STANDARD: Final[Uint] = Uint(4)
+    TX_DATA_TOKEN_FLOOR: Final[Uint] = Uint(10)
+    TX_ACCESS_LIST_ADDRESS: Final[Uint] = Uint(2400)
+    TX_ACCESS_LIST_STORAGE_KEY: Final[Uint] = Uint(1900)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_CLZ: Final[Uint] = LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_PREVRANDAO: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_BASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBBASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBHASH: Final[Uint] = Uint(3)
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_PUSH0: Final[Uint] = BASE
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MCOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -100,11 +205,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -156,7 +262,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -186,7 +292,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -211,7 +317,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
@@ -283,7 +389,7 @@ def init_code_cost(init_code_length: Uint) -> Uint:
         The gas to be charged for the init code.
 
     """
-    return GAS_CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
+    return GasCosts.CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
 
 
 def calculate_excess_blob_gas(parent_header: Header) -> U64:
@@ -314,21 +420,23 @@ def calculate_excess_blob_gas(parent_header: Header) -> U64:
         base_fee_per_gas = parent_header.base_fee_per_gas
 
     parent_blob_gas = excess_blob_gas + blob_gas_used
-    if parent_blob_gas < BLOB_TARGET_GAS_PER_BLOCK:
+    if parent_blob_gas < GasCosts.BLOB_TARGET_GAS_PER_BLOCK:
         return U64(0)
 
-    target_blob_gas_price = Uint(GAS_PER_BLOB)
+    target_blob_gas_price = Uint(GasCosts.PER_BLOB)
     target_blob_gas_price *= calculate_blob_gas_price(excess_blob_gas)
 
-    base_blob_tx_price = BLOB_BASE_COST * base_fee_per_gas
+    base_blob_tx_price = GasCosts.BLOB_BASE_COST * base_fee_per_gas
     if base_blob_tx_price > target_blob_gas_price:
-        blob_schedule_delta = BLOB_SCHEDULE_MAX - BLOB_SCHEDULE_TARGET
+        blob_schedule_delta = (
+            GasCosts.BLOB_SCHEDULE_MAX - GasCosts.BLOB_SCHEDULE_TARGET
+        )
         return (
             excess_blob_gas
-            + blob_gas_used * blob_schedule_delta // BLOB_SCHEDULE_MAX
+            + blob_gas_used * blob_schedule_delta // GasCosts.BLOB_SCHEDULE_MAX
         )
 
-    return parent_blob_gas - BLOB_TARGET_GAS_PER_BLOCK
+    return parent_blob_gas - GasCosts.BLOB_TARGET_GAS_PER_BLOCK
 
 
 def calculate_total_blob_gas(tx: Transaction) -> U64:
@@ -347,7 +455,7 @@ def calculate_total_blob_gas(tx: Transaction) -> U64:
 
     """
     if isinstance(tx, BlobTransaction):
-        return GAS_PER_BLOB * U64(len(tx.blob_versioned_hashes))
+        return GasCosts.PER_BLOB * U64(len(tx.blob_versioned_hashes))
     else:
         return U64(0)
 
@@ -368,9 +476,9 @@ def calculate_blob_gas_price(excess_blob_gas: U64) -> Uint:
 
     """
     return taylor_exponential(
-        BLOB_MIN_GASPRICE,
+        GasCosts.BLOB_MIN_GASPRICE,
         Uint(excess_blob_gas),
-        BLOB_BASE_FEE_UPDATE_FRACTION,
+        GasCosts.BLOB_BASE_FEE_UPDATE_FRACTION,
     )
 
 
diff --git a/src/ethereum/forks/bpo5/vm/instructions/arithmetic.py b/src/ethereum/forks/bpo5/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/bpo5/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/bpo5/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/bpo5/vm/instructions/bitwise.py b/src/ethereum/forks/bpo5/vm/instructions/bitwise.py
index cc6fa2fbb23..7674d3c720f 100644
--- a/src/ethereum/forks/bpo5/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/bpo5/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_LOW, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +172,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +202,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +232,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
@@ -262,7 +265,7 @@ def count_leading_zeros(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CLZ)
 
     # OPERATION
     bit_length = U256(x.bit_length())
diff --git a/src/ethereum/forks/bpo5/vm/instructions/block.py b/src/ethereum/forks/bpo5/vm/instructions/block.py
index 84930244d4c..faa2e0fa040 100644
--- a/src/ethereum/forks/bpo5/vm/instructions/block.py
+++ b/src/ethereum/forks/bpo5/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -40,7 +40,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -89,7 +89,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -123,7 +123,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -156,7 +156,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -189,7 +189,7 @@ def prev_randao(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PREVRANDAO)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.prev_randao))
@@ -222,7 +222,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -252,7 +252,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/bpo5/vm/instructions/comparison.py b/src/ethereum/forks/bpo5/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/bpo5/vm/instructions/comparison.py
+++ b/src/ethereum/forks/bpo5/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/bpo5/vm/instructions/control_flow.py b/src/ethereum/forks/bpo5/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/bpo5/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/bpo5/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/bpo5/vm/instructions/environment.py b/src/ethereum/forks/bpo5/vm/instructions/environment.py
index 5848530a960..b6bf713df27 100644
--- a/src/ethereum/forks/bpo5/vm/instructions/environment.py
+++ b/src/ethereum/forks/bpo5/vm/instructions/environment.py
@@ -17,20 +17,13 @@
 from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BASE,
-    GAS_BLOBHASH_OPCODE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_COPY,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
-    GAS_WARM_ACCESS,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_gas_extend_memory,
     charge_gas,
@@ -52,7 +45,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -76,14 +69,15 @@ def balance(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_addresses.add(address)
-        charge_gas(evm, GAS_COLD_ACCOUNT_ACCESS)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -106,7 +100,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -129,7 +123,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -152,7 +146,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -176,7 +170,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -201,7 +195,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -230,11 +224,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -259,7 +256,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -288,11 +285,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -317,7 +317,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -341,16 +341,16 @@ def extcodesize(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -377,23 +377,23 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
 
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost + copy_gas_cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -416,7 +416,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -442,11 +442,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -475,15 +480,15 @@ def extcodehash(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -510,12 +515,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
@@ -538,7 +543,7 @@ def base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BASEFEE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.base_fee_per_gas))
@@ -561,7 +566,7 @@ def blob_hash(evm: Evm) -> None:
     index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BLOBHASH_OPCODE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBHASH)
 
     # OPERATION
     if int(index) < len(evm.message.tx_env.blob_versioned_hashes):
@@ -588,7 +593,7 @@ def blob_base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBBASEFEE)
 
     # OPERATION
     blob_base_fee = calculate_blob_gas_price(
diff --git a/src/ethereum/forks/bpo5/vm/instructions/keccak.py b/src/ethereum/forks/bpo5/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/bpo5/vm/instructions/keccak.py
+++ b/src/ethereum/forks/bpo5/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/bpo5/vm/instructions/log.py b/src/ethereum/forks/bpo5/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/bpo5/vm/instructions/log.py
+++ b/src/ethereum/forks/bpo5/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/bpo5/vm/instructions/memory.py b/src/ethereum/forks/bpo5/vm/instructions/memory.py
index 6e111051ee3..bba3ddf19d5 100644
--- a/src/ethereum/forks/bpo5/vm/instructions/memory.py
+++ b/src/ethereum/forks/bpo5/vm/instructions/memory.py
@@ -18,9 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_COPY,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -49,7 +47,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -80,7 +78,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -108,7 +106,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -135,7 +133,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
@@ -161,12 +159,15 @@ def mcopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(length)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
 
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(source, length), (destination, length)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_MCOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/bpo5/vm/instructions/stack.py b/src/ethereum/forks/bpo5/vm/instructions/stack.py
index 0007a28acd4..ce94af6ce8e 100644
--- a/src/ethereum/forks/bpo5/vm/instructions/stack.py
+++ b/src/ethereum/forks/bpo5/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -63,9 +67,9 @@ def push_n(evm: Evm, num_bytes: int) -> None:
 
     # GAS
     if num_bytes == 0:
-        charge_gas(evm, GAS_BASE)
+        charge_gas(evm, GasCosts.OPCODE_PUSH0)
     else:
-        charge_gas(evm, GAS_VERY_LOW)
+        charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -95,7 +99,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -127,7 +131,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -139,70 +143,70 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push0 = partial(push_n, num_bytes=0)
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push0: Callable[[Evm], None] = partial(push_n, num_bytes=0)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/bpo5/vm/instructions/storage.py b/src/ethereum/forks/bpo5/vm/instructions/storage.py
index 084d58cc46c..99dcce877dd 100644
--- a/src/ethereum/forks/bpo5/vm/instructions/storage.py
+++ b/src/ethereum/forks/bpo5/vm/instructions/storage.py
@@ -13,7 +13,7 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import (
+from ...state_tracker import (
     get_storage,
     get_storage_original,
     get_transient_storage,
@@ -23,12 +23,7 @@
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -50,15 +45,14 @@ def sload(evm: Evm) -> None:
 
     # GAS
     if (evm.message.current_target, key) in evm.accessed_storage_keys:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        charge_gas(evm, GAS_COLD_SLOAD)
+        charge_gas(evm, GasCosts.COLD_STORAGE_ACCESS)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -79,54 +73,60 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     gas_cost = Uint(0)
 
     if (evm.message.current_target, key) not in evm.accessed_storage_keys:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        gas_cost += GAS_COLD_SLOAD
+        gas_cost += GasCosts.COLD_STORAGE_ACCESS
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost += GAS_STORAGE_SET
+            gas_cost += GasCosts.STORAGE_SET
         else:
-            gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_SLOAD
+            gas_cost += (
+                GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
+            )
     else:
-        gas_cost += GAS_WARM_ACCESS
+        gas_cost += GasCosts.WARM_ACCESS
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
             # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
             # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
             # Storage slot being restored to its original value
             if original_value == 0:
                 # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_WARM_ACCESS)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.WARM_ACCESS
+                )
             else:
                 # Slot was originally non-empty and was UPDATED earlier
                 evm.refund_counter += int(
-                    GAS_STORAGE_UPDATE - GAS_COLD_SLOAD - GAS_WARM_ACCESS
+                    GasCosts.COLD_STORAGE_WRITE
+                    - GasCosts.COLD_STORAGE_ACCESS
+                    - GasCosts.WARM_ACCESS
                 )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
@@ -147,11 +147,11 @@ def tload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
 
     # OPERATION
     value = get_transient_storage(
-        evm.message.tx_env.transient_storage, evm.message.current_target, key
+        evm.message.tx_env.state, evm.message.current_target, key
     )
     push(evm.stack, value)
 
@@ -174,11 +174,11 @@ def tstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
     if evm.message.is_static:
         raise WriteInStaticContext
     set_transient_storage(
-        evm.message.tx_env.transient_storage,
+        evm.message.tx_env.state,
         evm.message.current_target,
         key,
         new_value,
diff --git a/src/ethereum/forks/bpo5/vm/instructions/system.py b/src/ethereum/forks/bpo5/vm/instructions/system.py
index 29c3fe9e6e2..092c6fb68c2 100644
--- a/src/ethereum/forks/bpo5/vm/instructions/system.py
+++ b/src/ethereum/forks/bpo5/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
     get_account,
@@ -40,15 +40,7 @@
 )
 from ..exceptions import OutOfGasError, Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -90,7 +82,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -104,15 +96,13 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -166,14 +156,17 @@ def create(evm: Evm) -> None:
     )
     init_code_gas = init_code_cost(Uint(memory_size))
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost + init_code_gas)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CREATE_BASE + extend_memory.cost + init_code_gas,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -216,8 +209,8 @@ def create2(evm: Evm) -> None:
     init_code_gas = init_code_cost(Uint(memory_size))
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost
         + init_code_gas,
     )
@@ -261,7 +254,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -374,10 +367,10 @@ def call(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
@@ -388,10 +381,10 @@ def call(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -404,7 +397,7 @@ def call(evm: Evm) -> None:
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -463,10 +456,10 @@ def callcode(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -476,7 +469,7 @@ def callcode(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -489,7 +482,7 @@ def callcode(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -531,19 +524,19 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if beneficiary not in evm.accessed_addresses:
         evm.accessed_addresses.add(beneficiary)
-        gas_cost += GAS_COLD_ACCOUNT_ACCESS
+        gas_cost += GasCosts.COLD_ACCOUNT_ACCESS
 
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -551,11 +544,11 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     move_ether(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         originator,
         beneficiary,
         originator_balance,
@@ -563,10 +556,10 @@ def selfdestruct(evm: Evm) -> None:
 
     # register account for deletion only if it was created
     # in the same transaction
-    if originator in evm.message.block_env.state.created_accounts:
+    if originator in evm.message.tx_env.state.created_accounts:
         # If beneficiary is the same as originator, then
         # the ether is burnt.
-        set_account_balance(evm.message.block_env.state, originator, U256(0))
+        set_account_balance(evm.message.tx_env.state, originator, U256(0))
         evm.accounts_to_delete.add(originator)
 
     # HALT the execution
@@ -604,10 +597,10 @@ def delegatecall(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -673,10 +666,10 @@ def staticcall(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
diff --git a/src/ethereum/forks/bpo5/vm/interpreter.py b/src/ethereum/forks/bpo5/vm/interpreter.py
index d0eda4ef22d..b94bab8b33b 100644
--- a/src/ethereum/forks/bpo5/vm/interpreter.py
+++ b/src/ethereum/forks/bpo5/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,22 +31,22 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     get_account,
     get_code,
     increment_nonce,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
 )
 from ..vm import Message
 from ..vm.eoa_delegation import get_delegated_code_address, set_delegation
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -66,6 +66,7 @@
 MAX_INIT_CODE_SIZE = 2 * MAX_CODE_SIZE
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -105,12 +106,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -131,8 +132,8 @@ def process_message_call(message: Message) -> MessageCallOutput:
             message.disable_precompiles = True
             message.accessed_addresses.add(delegated_address)
             message.code = get_code(
-                block_env.state,
-                get_account(block_env.state, delegated_address).code_hash,
+                tx_state,
+                get_account(tx_state, delegated_address).code_hash,
             )
             message.code_address = delegated_address
 
@@ -176,22 +177,31 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
-    transient_storage = message.tx_env.transient_storage
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
-
-    # The list of created accounts is used by `get_storage_original`.
-    # Additionally, the list is needed to respect the constraints
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts. This tracking is also needed to respect the constraints
     # added to SELFDESTRUCT by EIP-6780.
-    mark_account_created(state, message.current_target)
+    mark_account_created(tx_state, message.current_target)
 
-    increment_nonce(state, message.current_target)
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             if len(contract_code) > 0:
@@ -201,15 +211,14 @@ def process_create_message(message: Message) -> Evm:
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state, transient_storage)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state, transient_storage)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -228,11 +237,10 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
-    transient_storage = message.tx_env.transient_storage
     code = message.code
     valid_jump_destinations = get_valid_jump_destinations(code)
     evm = Evm(
@@ -255,11 +263,14 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
+    snapshot = copy_tx_state(tx_state)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -291,9 +302,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state, transient_storage)
-    else:
-        commit_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/bpo5/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/bpo5/vm/precompiled_contracts/alt_bn128.py
index 214725d8da0..862506c54c3 100644
--- a/src/ethereum/forks/bpo5/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/bpo5/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(150))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(6000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(34000 * (len(data) // 192) + 45000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/bpo5/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/bpo5/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/bpo5/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/bpo5/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/bpo5/vm/precompiled_contracts/bls12_381/__init__.py b/src/ethereum/forks/bpo5/vm/precompiled_contracts/bls12_381/__init__.py
index c99e7573f48..7d622da39d1 100644
--- a/src/ethereum/forks/bpo5/vm/precompiled_contracts/bls12_381/__init__.py
+++ b/src/ethereum/forks/bpo5/vm/precompiled_contracts/bls12_381/__init__.py
@@ -414,7 +414,7 @@ def decode_g1_scalar_pair(
 
     """
     if len(data) != 160:
-        InvalidParameter("Input should be 160 bytes long")
+        raise InvalidParameter("Input should be 160 bytes long")
 
     point = bytes_to_g1(data[:128], subgroup_check=True)
 
@@ -614,7 +614,7 @@ def decode_g2_scalar_pair(
 
     """
     if len(data) != 288:
-        InvalidParameter("Input should be 288 bytes long")
+        raise InvalidParameter("Input should be 288 bytes long")
 
     point = bytes_to_g2(data[:256], subgroup_check=True)
     n = int.from_bytes(data[256 : 256 + 32], "big")
diff --git a/src/ethereum/forks/bpo5/vm/precompiled_contracts/bls12_381/bls12_381_g1.py b/src/ethereum/forks/bpo5/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
index ae8eeba0ce6..d1f63224a0c 100644
--- a/src/ethereum/forks/bpo5/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
+++ b/src/ethereum/forks/bpo5/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G1_ADD,
-    GAS_BLS_G1_MAP,
-    GAS_BLS_G1_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -60,7 +58,7 @@ def bls12_g1_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1ADD)
 
     # OPERATION
     p1 = bytes_to_g1(buffer_read(data, U256(0), U256(128)))
@@ -101,7 +99,7 @@ def bls12_g1_msm(evm: Evm) -> None:
     else:
         discount = Uint(G1_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G1_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G1MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -140,7 +138,7 @@ def bls12_map_fp_to_g1(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1MAP)
 
     # OPERATION
     fp = int.from_bytes(data, "big")
diff --git a/src/ethereum/forks/bpo5/vm/precompiled_contracts/bls12_381/bls12_381_g2.py b/src/ethereum/forks/bpo5/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
index 473739b78c0..2fd32313f89 100644
--- a/src/ethereum/forks/bpo5/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
+++ b/src/ethereum/forks/bpo5/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G2_ADD,
-    GAS_BLS_G2_MAP,
-    GAS_BLS_G2_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -61,7 +59,7 @@ def bls12_g2_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2ADD)
 
     # OPERATION
     p1 = bytes_to_g2(buffer_read(data, U256(0), U256(256)))
@@ -102,7 +100,7 @@ def bls12_g2_msm(evm: Evm) -> None:
     else:
         discount = Uint(G2_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G2_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G2MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -141,7 +139,7 @@ def bls12_map_fp2_to_g2(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2MAP)
 
     # OPERATION
     field_element = bytes_to_fq2(data)
diff --git a/src/ethereum/forks/bpo5/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/bpo5/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/bpo5/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/bpo5/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/bpo5/vm/precompiled_contracts/identity.py b/src/ethereum/forks/bpo5/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/bpo5/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/bpo5/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/bpo5/vm/precompiled_contracts/p256verify.py b/src/ethereum/forks/bpo5/vm/precompiled_contracts/p256verify.py
index 106dd548a61..29c2e91e0f0 100644
--- a/src/ethereum/forks/bpo5/vm/precompiled_contracts/p256verify.py
+++ b/src/ethereum/forks/bpo5/vm/precompiled_contracts/p256verify.py
@@ -24,7 +24,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_P256VERIFY, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -41,7 +41,7 @@ def p256verify(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_P256VERIFY)
+    charge_gas(evm, GasCosts.PRECOMPILE_P256VERIFY)
 
     if len(data) != 160:
         return
diff --git a/src/ethereum/forks/bpo5/vm/precompiled_contracts/point_evaluation.py b/src/ethereum/forks/bpo5/vm/precompiled_contracts/point_evaluation.py
index ce4eed71294..d2d105ba13b 100644
--- a/src/ethereum/forks/bpo5/vm/precompiled_contracts/point_evaluation.py
+++ b/src/ethereum/forks/bpo5/vm/precompiled_contracts/point_evaluation.py
@@ -22,7 +22,7 @@
 
 from ...vm import Evm
 from ...vm.exceptions import KZGProofError
-from ...vm.gas import GAS_POINT_EVALUATION, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 FIELD_ELEMENTS_PER_BLOB = 4096
 BLS_MODULUS = 52435875175126190479447740508185965837690552500527637822603658699938581184513  # noqa: E501
@@ -51,7 +51,7 @@ def point_evaluation(evm: Evm) -> None:
     proof = Bytes48(data[144:192])
 
     # GAS
-    charge_gas(evm, GAS_POINT_EVALUATION)
+    charge_gas(evm, GasCosts.PRECOMPILE_POINT_EVALUATION)
     if kzg_commitment_to_versioned_hash(commitment) != versioned_hash:
         raise KZGProofError
 
diff --git a/src/ethereum/forks/bpo5/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/bpo5/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/bpo5/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/bpo5/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/bpo5/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/bpo5/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/bpo5/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/bpo5/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/byzantium/blocks.py b/src/ethereum/forks/byzantium/blocks.py
index 2f027b04dc7..26091316a9c 100644
--- a/src/ethereum/forks/byzantium/blocks.py
+++ b/src/ethereum/forks/byzantium/blocks.py
@@ -10,18 +10,20 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.crypto.hash import Hash32
+from ethereum.state import Address, Root
 
-from .fork_types import Address, Bloom, Root
+from .fork_types import Bloom
 from .transactions import Transaction
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -60,13 +62,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.byzantium.state.state_root
-    [Trie]: ref:ethereum.forks.byzantium.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -76,8 +79,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.byzantium.trie.root
-    [Trie]: ref:ethereum.forks.byzantium.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -87,8 +90,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.byzantium.trie.root
-    [Trie]: ref:ethereum.forks.byzantium.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -157,6 +160,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -201,6 +205,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -233,6 +238,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/byzantium/fork.py b/src/ethereum/forks/byzantium/fork.py
index 3cbf03500b3..1c705256b96 100644
--- a/src/ethereum/forks/byzantium/fork.py
+++ b/src/ethereum/forks/byzantium/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.numeric import U64, U256, Uint
@@ -27,21 +27,29 @@
     InvalidSenderError,
     NonceMismatchError,
 )
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt
 from .bloom import logs_bloom
-from .fork_types import EMPTY_CODE_HASH, Address
-from .state import (
-    State,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
     account_exists_and_is_empty,
     create_ether,
     destroy_account,
     destroy_touched_empty_accounts,
+    extract_block_diff,
     get_account,
+    incorporate_tx_into_block,
     increment_nonce,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
     Transaction,
@@ -49,19 +57,18 @@
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.message import prepare_message
+from .vm.gas import GasCosts
 from .vm.interpreter import process_message_call
 
 BLOCK_REWARD = U256(3 * 10**18)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 MINIMUM_DIFFICULTY = Uint(131072)
 MAX_OMMER_DEPTH = Uint(6)
 BOMB_DELAY_BLOCKS = 3000000
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -163,9 +170,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     validate_header(chain, block.header)
     validate_ommers(block.ommers, block.header, chain)
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -179,7 +188,12 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         ommers=block.ommers,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes,
+        block_diff.storage_changes,
+        block_diff.storage_clears,
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -197,6 +211,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block_logs_bloom != block.header.bloom:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -347,6 +362,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Address:
     """
     Check if the transaction is includable in the block.
@@ -359,6 +375,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -381,7 +399,7 @@ def check_transaction(
     if tx.gas > gas_available:
         raise GasUsedExceedsLimitError("gas used exceeds limit")
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     max_gas_fee = tx.gas * tx.gas_price
 
@@ -467,7 +485,7 @@ def apply_body(
     for i, tx in enumerate(transactions):
         process_transaction(block_env, block_output, tx, Uint(i))
 
-    pay_rewards(block_env.state, block_env.number, block_env.coinbase, ommers)
+    pay_rewards(block_env, ommers)
 
     return block_output
 
@@ -549,9 +567,7 @@ def validate_ommers(
 
 
 def pay_rewards(
-    state: State,
-    block_number: Uint,
-    coinbase: Address,
+    block_env: vm.BlockEnvironment,
     ommers: Tuple[Header, ...],
 ) -> None:
     """
@@ -570,25 +586,24 @@ def pay_rewards(
 
     Parameters
     ----------
-    state :
-        Current account state.
-    block_number :
-        Position of the block within the chain.
-    coinbase :
-        Address of account which receives block reward and transaction fees.
+    block_env :
+        The block scoped environment.
     ommers :
         List of ommers mentioned in the current block.
 
     """
+    rewards_state = TransactionState(parent=block_env.state)
     ommer_count = U256(len(ommers))
     miner_reward = BLOCK_REWARD + (ommer_count * (BLOCK_REWARD // U256(32)))
-    create_ether(state, coinbase, miner_reward)
+    create_ether(rewards_state, block_env.coinbase, miner_reward)
 
     for ommer in ommers:
         # Ommer age with respect to the current block.
-        ommer_age = U256(block_number - ommer.number)
+        ommer_age = U256(block_env.number - ommer.number)
         ommer_miner_reward = ((U256(8) - ommer_age) * BLOCK_REWARD) // U256(8)
-        create_ether(state, ommer.coinbase, ommer_miner_reward)
+        create_ether(rewards_state, ommer.coinbase, ommer_miner_reward)
+
+    incorporate_tx_into_block(rewards_state)
 
 
 def process_transaction(
@@ -621,6 +636,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(block_output.transactions_trie, rlp.encode(Uint(index)), tx)
     intrinsic_gas = validate_transaction(tx)
 
@@ -628,23 +645,23 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     gas_fee = tx.gas * tx.gas_price
     sender_balance_after_gas_fee = Uint(sender_account.balance) - gas_fee
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     tx_env = vm.TransactionEnvironment(
         origin=sender,
         gas_price=tx.gas_price,
         gas=gas,
+        state=tx_state,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
     )
@@ -664,28 +681,25 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * tx.gas_price
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
     coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
+        tx_state, block_env.coinbase
     ).balance + U256(transaction_fee)
     if coinbase_balance_after_mining_fee != 0:
         set_account_balance(
-            block_env.state,
+            tx_state,
             block_env.coinbase,
             coinbase_balance_after_mining_fee,
         )
-    elif account_exists_and_is_empty(block_env.state, block_env.coinbase):
-        destroy_account(block_env.state, block_env.coinbase)
+    elif account_exists_and_is_empty(tx_state, block_env.coinbase):
+        destroy_account(tx_state, block_env.coinbase)
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
-    destroy_touched_empty_accounts(block_env.state, tx_output.touched_accounts)
+    destroy_touched_empty_accounts(tx_state, tx_output.touched_accounts)
 
     block_output.block_gas_used += tx_gas_used_after_refund
 
@@ -704,6 +718,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
     """
@@ -711,12 +727,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
     passed through as a parameter is greater than or equal to the *sum* of
     the parent's gas and the adjustment delta then the limit for gas is too
     high and fails this function's check. Similarly, if the limit is less
     than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
+    delta *or* the predefined ``LIMIT_MINIMUM`` then this function's
     check fails because the gas limit doesn't allow for a sufficient or
     reasonable amount of gas to be used on a block.
 
@@ -734,12 +750,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/byzantium/fork_types.py b/src/ethereum/forks/byzantium/fork_types.py
index d61f48f24eb..02907cd2a1a 100644
--- a/src/ethereum/forks/byzantium/fork_types.py
+++ b/src/ethereum/forks/byzantium/fork_types.py
@@ -11,40 +11,13 @@
 Types reused throughout the specification, which are specific to Ethereum.
 """
 
-from dataclasses import dataclass
-
 from ethereum_rlp import rlp
-from ethereum_types.bytes import Bytes, Bytes20, Bytes256
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.bytes import Bytes, Bytes256
 
-from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import Account
 
-Address = Bytes20
-Root = Hash32
 Bloom = Bytes256
 
-EMPTY_CODE_HASH = keccak256(b"")
-
-
-@slotted_freezable
-@dataclass
-class Account:
-    """
-    State associated with an address.
-    """
-
-    nonce: Uint
-    balance: U256
-    code_hash: Hash32
-
-
-EMPTY_ACCOUNT = Account(
-    nonce=Uint(0),
-    balance=U256(0),
-    code_hash=EMPTY_CODE_HASH,
-)
-
 
 def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     """
diff --git a/src/ethereum/forks/byzantium/state.py b/src/ethereum/forks/byzantium/state.py
deleted file mode 100644
index 10cf7e419b5..00000000000
--- a/src/ethereum/forks/byzantium/state.py
+++ /dev/null
@@ -1,611 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, Iterable, List, Optional, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-
-from .fork_types import EMPTY_ACCOUNT, EMPTY_CODE_HASH, Account, Address, Root
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state._code_store
-
-
-def begin_transaction(state: State) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-
-
-def commit_transaction(state: State) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.pop()
-
-
-def rollback_transaction(state: State) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State``.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def account_exists_and_is_empty(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists and has zero nonce, empty code and zero
-    balance.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    exists_and_is_empty : `bool`
-        True if an account exists and has zero nonce, empty code and zero
-        balance, False otherwise.
-
-    """
-    account = get_account_optional(state, address)
-    return (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def touch_account(state: State, address: Address) -> None:
-    """
-    Initializes an account to state.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        The address of the account that needs to be initialized.
-
-    """
-    if not account_exists(state, address):
-        set_account(state, address, EMPTY_ACCOUNT)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def create_ether(state: State, address: Address, amount: U256) -> None:
-    """
-    Add newly created ether to an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to which ether is added.
-    amount:
-        The amount of ether to be added to the account of interest.
-
-    """
-
-    def increase_balance(account: Account) -> None:
-        account.balance += amount
-
-    modify_state(state, address, increase_balance)
-
-
-def destroy_touched_empty_accounts(
-    state: State, touched_accounts: Iterable[Address]
-) -> None:
-    """
-    Destroy all touched accounts that are empty.
-
-    Parameters
-    ----------
-    state: `State`
-        The current state.
-    touched_accounts: `Iterable[Address]`
-        All the accounts that have been touched in the current transaction.
-
-    """
-    for address in touched_accounts:
-        if account_exists_and_is_empty(state, address):
-            destroy_account(state, address)
diff --git a/src/ethereum/forks/byzantium/state_tracker.py b/src/ethereum/forks/byzantium/state_tracker.py
new file mode 100644
index 00000000000..24362ecff98
--- /dev/null
+++ b/src/ethereum/forks/byzantium/state_tracker.py
@@ -0,0 +1,805 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+
+    ``storage_clears`` records addresses whose storage was wiped by
+    a pre-EIP-6780 ``SELFDESTRUCT`` earlier in the block, so later
+    reads must not fall back to ``pre_state`` storage.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    storage_clears: Set[Address] = field(default_factory=set)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    storage_clears: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.storage_clears:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if address in tx_state.storage_clears:
+        return False
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    if address in tx_state.parent.storage_clears:
+        return False
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+    tx_state.storage_clears.add(address)
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        storage_clears=set(tx_state.storage_clears),
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.storage_clears = snapshot.storage_clears
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address in tx_state.storage_clears:
+        block.storage_clears.add(address)
+        block.storage_writes.pop(address, None)
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.storage_clears.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+        storage_clears=block_state.storage_clears,
+    )
+
+
+def destroy_touched_empty_accounts(
+    tx_state: TransactionState, touched_accounts: Set[Address]
+) -> None:
+    """
+    Destroy all touched accounts that are empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    touched_accounts :
+        All the accounts that have been touched in the current transaction.
+
+    """
+    for address in touched_accounts:
+        if account_exists_and_is_empty(tx_state, address):
+            destroy_account(tx_state, address)
+
+
+def touch_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Initialize an account to state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be initialized.
+
+    """
+    if not account_exists(tx_state, address):
+        set_account(tx_state, address, EMPTY_ACCOUNT)
diff --git a/src/ethereum/forks/byzantium/transactions.py b/src/ethereum/forks/byzantium/transactions.py
index 278238f8d5a..8272ebea080 100644
--- a/src/ethereum/forks/byzantium/transactions.py
+++ b/src/ethereum/forks/byzantium/transactions.py
@@ -5,6 +5,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0
@@ -18,31 +19,10 @@
     InvalidSignatureError,
     NonceOverflowError,
 )
-
-from .fork_types import Address
-
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_PER_NON_ZERO = Uint(68)
-"""
-Gas cost per non-zero byte in the transaction data.
-"""
-
-GAS_TX_DATA_PER_ZERO = Uint(4)
-"""
-Gas cost per zero byte in the transaction data.
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
+from ethereum.state import Address
 
 
+@final
 @slotted_freezable
 @dataclass
 class Transaction:
@@ -143,26 +123,28 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
 
     This function takes a transaction as a parameter and returns the intrinsic
     gas cost of the transaction.
     """
+    from .vm.gas import GasCosts
+
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
     data_cost = (
-        num_zeros * GAS_TX_DATA_PER_ZERO
-        + num_non_zeros * GAS_TX_DATA_PER_NON_ZERO
+        num_zeros * GasCosts.TX_DATA_PER_ZERO
+        + num_non_zeros * GasCosts.TX_DATA_PER_NON_ZERO
     )
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE
+        create_cost = GasCosts.TX_CREATE
     else:
         create_cost = Uint(0)
 
-    return GAS_TX_BASE + data_cost + create_cost
+    return GasCosts.TX_BASE + data_cost + create_cost
 
 
 def recover_sender(chain_id: U64, tx: Transaction) -> Address:
diff --git a/src/ethereum/forks/byzantium/trie.py b/src/ethereum/forks/byzantium/trie.py
deleted file mode 100644
index 2858183a400..00000000000
--- a/src/ethereum/forks/byzantium/trie.py
+++ /dev/null
@@ -1,498 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    assert_type,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.spurious_dragon import trie as previous_trie
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt
-from .fork_types import Account, Address, Root, encode_account
-from .transactions import Transaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = Account | Bytes | Transaction | Receipt | Uint | U256 | None
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[Transaction],
-    Optional[Receipt],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `rlp.RLP`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (Transaction, Receipt, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/byzantium/utils/hexadecimal.py b/src/ethereum/forks/byzantium/utils/hexadecimal.py
index 3642c49057f..23ad6606b51 100644
--- a/src/ethereum/forks/byzantium/utils/hexadecimal.py
+++ b/src/ethereum/forks/byzantium/utils/hexadecimal.py
@@ -14,11 +14,9 @@
 
 from ethereum_types.bytes import Bytes
 
-from ethereum.state import Address
+from ethereum.state import Address, Root
 from ethereum.utils.hexadecimal import remove_hex_prefix
 
-from ..fork_types import Root
-
 
 def hex_to_root(hex_string: str) -> Root:
     """
diff --git a/src/ethereum/forks/byzantium/utils/message.py b/src/ethereum/forks/byzantium/utils/message.py
index 44026442804..7d2089019df 100644
--- a/src/ethereum/forks/byzantium/utils/message.py
+++ b/src/ethereum/forks/byzantium/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from .address import compute_contract_address
@@ -49,7 +49,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -57,8 +57,8 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        account = get_account(block_env.state, tx.to)
-        code = get_code(block_env.state, account.code_hash)
+        account = get_account(tx_env.state, tx.to)
+        code = get_code(tx_env.state, account.code_hash)
 
         code_address = tx.to
     else:
diff --git a/src/ethereum/forks/byzantium/vm/__init__.py b/src/ethereum/forks/byzantium/vm/__init__.py
index a780c363cf8..4a491e87e59 100644
--- a/src/ethereum/forks/byzantium/vm/__init__.py
+++ b/src/ethereum/forks/byzantium/vm/__init__.py
@@ -13,24 +13,29 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt
-from ..state import State, account_exists_and_is_empty
+from ..state_tracker import (
+    BlockState,
+    TransactionState,
+    account_exists_and_is_empty,
+)
 from ..transactions import Transaction
-from ..trie import Trie
 from .precompiled_contracts import RIPEMD160_ADDRESS
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +43,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -47,6 +52,7 @@ class BlockEnvironment:
     difficulty: Uint
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -78,19 +84,22 @@ class BlockOutput:
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
     gas_price: Uint
     gas: Uint
+    state: TransactionState
     index_in_block: Uint
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -113,6 +122,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
@@ -152,7 +162,7 @@ def incorporate_child_on_success(evm: Evm, child_evm: Evm) -> None:
     evm.accounts_to_delete.update(child_evm.accounts_to_delete)
     evm.touched_accounts.update(child_evm.touched_accounts)
     if account_exists_and_is_empty(
-        evm.message.block_env.state, child_evm.message.current_target
+        evm.message.tx_env.state, child_evm.message.current_target
     ):
         evm.touched_accounts.add(child_evm.message.current_target)
 
@@ -180,7 +190,7 @@ def incorporate_child_on_error(evm: Evm, child_evm: Evm) -> None:
         evm.touched_accounts.add(RIPEMD160_ADDRESS)
     if child_evm.message.current_target == RIPEMD160_ADDRESS:
         if account_exists_and_is_empty(
-            evm.message.block_env.state, child_evm.message.current_target
+            evm.message.tx_env.state, child_evm.message.current_target
         ):
             evm.touched_accounts.add(RIPEMD160_ADDRESS)
     evm.gas_left += child_evm.gas_left
diff --git a/src/ethereum/forks/byzantium/vm/gas.py b/src/ethereum/forks/byzantium/vm/gas.py
index b21cf5fd15d..e1ca31b5748 100644
--- a/src/ethereum/forks/byzantium/vm/gas.py
+++ b/src/ethereum/forks/byzantium/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32
@@ -22,48 +22,139 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_SLOAD = Uint(200)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 15000
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_EXTERNAL = Uint(700)
-GAS_BALANCE = Uint(400)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_CALL = Uint(700)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-REFUND_SELF_DESTRUCT = 24000
-GAS_ECRECOVER = Uint(3000)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    SLOAD: Final[Uint] = Uint(200)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 15000
+    REFUND_SELF_DESTRUCT: Final[int] = 24000
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(500)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(40000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(100000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(80000)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_PER_ZERO: Final[Uint] = Uint(4)
+    TX_DATA_PER_NON_ZERO: Final[Uint] = Uint(68)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_DIFFICULTY: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+    OPCODE_EXTERNAL_BASE: Final[Uint] = Uint(700)
+    OPCODE_BALANCE: Final[Uint] = Uint(400)
+    OPCODE_CALL_BASE: Final[Uint] = Uint(700)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -79,11 +170,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -135,7 +227,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -165,7 +257,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -190,7 +282,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
diff --git a/src/ethereum/forks/byzantium/vm/instructions/arithmetic.py b/src/ethereum/forks/byzantium/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/byzantium/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/byzantium/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/byzantium/vm/instructions/bitwise.py b/src/ethereum/forks/byzantium/vm/instructions/bitwise.py
index 2a506f55751..62da98041ad 100644
--- a/src/ethereum/forks/byzantium/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/byzantium/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
diff --git a/src/ethereum/forks/byzantium/vm/instructions/block.py b/src/ethereum/forks/byzantium/vm/instructions/block.py
index 0edcbf000d1..fbca7daa37c 100644
--- a/src/ethereum/forks/byzantium/vm/instructions/block.py
+++ b/src/ethereum/forks/byzantium/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -33,7 +33,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -75,7 +75,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -102,7 +102,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -128,7 +128,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -154,7 +154,7 @@ def difficulty(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_DIFFICULTY)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.difficulty))
@@ -180,7 +180,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
diff --git a/src/ethereum/forks/byzantium/vm/instructions/comparison.py b/src/ethereum/forks/byzantium/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/byzantium/vm/instructions/comparison.py
+++ b/src/ethereum/forks/byzantium/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/byzantium/vm/instructions/control_flow.py b/src/ethereum/forks/byzantium/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/byzantium/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/byzantium/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/byzantium/vm/instructions/environment.py b/src/ethereum/forks/byzantium/vm/instructions/environment.py
index 0fa98ce55a5..c58d4b02f17 100644
--- a/src/ethereum/forks/byzantium/vm/instructions/environment.py
+++ b/src/ethereum/forks/byzantium/vm/instructions/environment.py
@@ -15,18 +15,13 @@
 
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BALANCE,
-    GAS_BASE,
-    GAS_COPY,
-    GAS_EXTERNAL,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -47,7 +42,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -70,11 +65,12 @@ def balance(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BALANCE)
+    charge_gas(evm, GasCosts.OPCODE_BALANCE)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -97,7 +93,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -120,7 +116,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -143,7 +139,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -167,7 +163,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -192,7 +188,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -221,11 +217,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -250,7 +249,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -279,11 +278,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -308,7 +310,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -331,11 +333,12 @@ def extcodesize(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_EXTERNAL)
+    charge_gas(evm, GasCosts.OPCODE_EXTERNAL_BASE)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -362,16 +365,20 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_EXTERNAL + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_EXTERNAL_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -394,7 +401,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -420,11 +427,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
diff --git a/src/ethereum/forks/byzantium/vm/instructions/keccak.py b/src/ethereum/forks/byzantium/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/byzantium/vm/instructions/keccak.py
+++ b/src/ethereum/forks/byzantium/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/byzantium/vm/instructions/log.py b/src/ethereum/forks/byzantium/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/byzantium/vm/instructions/log.py
+++ b/src/ethereum/forks/byzantium/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/byzantium/vm/instructions/memory.py b/src/ethereum/forks/byzantium/vm/instructions/memory.py
index 3a242ba2f7a..93861811559 100644
--- a/src/ethereum/forks/byzantium/vm/instructions/memory.py
+++ b/src/ethereum/forks/byzantium/vm/instructions/memory.py
@@ -16,8 +16,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,7 +45,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -77,7 +76,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -105,7 +104,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -132,7 +131,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
diff --git a/src/ethereum/forks/byzantium/vm/instructions/stack.py b/src/ethereum/forks/byzantium/vm/instructions/stack.py
index 0fc0d3fe4b5..901bff4ed3b 100644
--- a/src/ethereum/forks/byzantium/vm/instructions/stack.py
+++ b/src/ethereum/forks/byzantium/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -62,7 +66,7 @@ def push_n(evm: Evm, num_bytes: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -92,7 +96,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -124,7 +128,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -136,69 +140,69 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/byzantium/vm/instructions/storage.py b/src/ethereum/forks/byzantium/vm/instructions/storage.py
index c62a67ae2d6..faf342b34ab 100644
--- a/src/ethereum/forks/byzantium/vm/instructions/storage.py
+++ b/src/ethereum/forks/byzantium/vm/instructions/storage.py
@@ -13,14 +13,11 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import get_storage, set_storage
+from ...state_tracker import get_storage, set_storage
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -41,12 +38,11 @@ def sload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_SLOAD)
+    charge_gas(evm, GasCosts.SLOAD)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -69,20 +65,20 @@ def sstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    state = evm.message.block_env.state
-    current_value = get_storage(state, evm.message.current_target, key)
+    tx_state = evm.message.tx_env.state
+    current_value = get_storage(tx_state, evm.message.current_target, key)
     if new_value != 0 and current_value == 0:
-        gas_cost = GAS_STORAGE_SET
+        gas_cost = GasCosts.STORAGE_SET
     else:
-        gas_cost = GAS_STORAGE_UPDATE
+        gas_cost = GasCosts.COLD_STORAGE_WRITE
 
     if new_value == 0 and current_value != 0:
-        evm.refund_counter += REFUND_STORAGE_CLEAR
+        evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
diff --git a/src/ethereum/forks/byzantium/vm/instructions/system.py b/src/ethereum/forks/byzantium/vm/instructions/system.py
index 9a4a7ce52ae..1f4dc02194b 100644
--- a/src/ethereum/forks/byzantium/vm/instructions/system.py
+++ b/src/ethereum/forks/byzantium/vm/instructions/system.py
@@ -16,7 +16,7 @@
 
 from ethereum.state import Address
 
-from ...state import (
+from ...state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
@@ -35,14 +35,7 @@
 )
 from ..exceptions import Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL,
-    GAS_CALL_VALUE,
-    GAS_CREATE,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_ZERO,
-    REFUND_SELF_DESTRUCT,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -76,7 +69,7 @@ def create(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost)
 
     create_message_gas = max_message_call_gas(Uint(evm.gas_left))
     evm.gas_left -= create_message_gas
@@ -86,12 +79,12 @@ def create(evm: Evm) -> None:
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -103,20 +96,16 @@ def create(evm: Evm) -> None:
         push(evm.stack, U256(0))
         evm.gas_left += create_message_gas
     elif account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
     else:
         call_data = memory_read_bytes(
             evm.memory, memory_start_position, memory_size
         )
 
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
         child_message = Message(
             block_env=evm.message.block_env,
@@ -170,7 +159,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -213,8 +202,8 @@ def generic_call(
     call_data = memory_read_bytes(
         evm.memory, memory_input_start_position, memory_input_size
     )
-    account = get_account(evm.message.block_env.state, code_address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    account = get_account(evm.message.tx_env.state, code_address)
+    code = get_code(evm.message.tx_env.state, account.code_hash)
     child_message = Message(
         block_env=evm.message.block_env,
         tx_env=evm.message.tx_env,
@@ -280,23 +269,23 @@ def call(evm: Evm) -> None:
 
     code_address = to
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
         Uint(evm.gas_left),
         extend_memory.cost,
-        GAS_CALL + create_gas_cost + transfer_gas_cost,
+        GasCosts.OPCODE_CALL_BASE + create_gas_cost + transfer_gas_cost,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
     if evm.message.is_static and value != U256(0):
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -351,20 +340,20 @@ def callcode(evm: Evm) -> None:
             (memory_output_start_position, memory_output_size),
         ],
     )
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
         Uint(evm.gas_left),
         extend_memory.cost,
-        GAS_CALL + transfer_gas_cost,
+        GasCosts.OPCODE_CALL_BASE + transfer_gas_cost,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -404,15 +393,15 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     originator = evm.message.current_target
 
@@ -423,35 +412,35 @@ def selfdestruct(evm: Evm) -> None:
         parent_evm = parent_evm.message.parent_evm
 
     if originator not in refunded_accounts:
-        evm.refund_counter += REFUND_SELF_DESTRUCT
+        evm.refund_counter += GasCosts.REFUND_SELF_DESTRUCT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
 
     beneficiary_balance = get_account(
-        evm.message.block_env.state, beneficiary
+        evm.message.tx_env.state, beneficiary
     ).balance
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     # First Transfer to beneficiary
     set_account_balance(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         beneficiary,
         beneficiary_balance + originator_balance,
     )
     # Next, Zero the balance of the address being deleted (must come after
     # sending to beneficiary in case the contract named itself as the
     # beneficiary).
-    set_account_balance(evm.message.block_env.state, originator, U256(0))
+    set_account_balance(evm.message.tx_env.state, originator, U256(0))
 
     # register account for deletion
     evm.accounts_to_delete.add(originator)
 
     # mark beneficiary as touched
-    if account_exists_and_is_empty(evm.message.block_env.state, beneficiary):
+    if account_exists_and_is_empty(evm.message.tx_env.state, beneficiary):
         evm.touched_accounts.add(beneficiary)
 
     # HALT the execution
@@ -488,7 +477,11 @@ def delegatecall(evm: Evm) -> None:
         ],
     )
     message_call_gas = calculate_message_call_gas(
-        U256(0), gas, Uint(evm.gas_left), extend_memory.cost, GAS_CALL
+        U256(0),
+        gas,
+        Uint(evm.gas_left),
+        extend_memory.cost,
+        GasCosts.OPCODE_CALL_BASE,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
@@ -547,7 +540,7 @@ def staticcall(evm: Evm) -> None:
         gas,
         Uint(evm.gas_left),
         extend_memory.cost,
-        GAS_CALL,
+        GasCosts.OPCODE_CALL_BASE,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
diff --git a/src/ethereum/forks/byzantium/vm/interpreter.py b/src/ethereum/forks/byzantium/vm/interpreter.py
index 2cb1ccc3335..5544b8a489e 100644
--- a/src/ethereum/forks/byzantium/vm/interpreter.py
+++ b/src/ethereum/forks/byzantium/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,20 +31,20 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     increment_nonce,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
     touch_account,
 )
 from ..vm import Message
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -62,6 +62,7 @@
 MAX_CODE_SIZE = 0x6000
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -101,12 +102,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -120,9 +121,7 @@ def process_message_call(message: Message) -> MessageCallOutput:
             evm = process_create_message(message)
     else:
         evm = process_message(message)
-        if account_exists_and_is_empty(
-            block_env.state, Address(message.target)
-        ):
+        if account_exists_and_is_empty(tx_state, Address(message.target)):
             evm.touched_accounts.add(Address(message.target))
 
     if evm.error:
@@ -165,31 +164,39 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state)
-
-    increment_nonce(state, message.current_target)
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             charge_gas(evm, contract_code_gas)
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -208,7 +215,7 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
@@ -233,13 +240,16 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
 
-    touch_account(state, message.current_target)
+    touch_account(tx_state, message.current_target)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -270,9 +280,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state)
-    else:
-        commit_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/byzantium/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/byzantium/vm/precompiled_contracts/alt_bn128.py
index d579abb2b8a..862506c54c3 100644
--- a/src/ethereum/forks/byzantium/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/byzantium/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(500))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(40000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(80000 * (len(data) // 192) + 100000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/byzantium/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/byzantium/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/byzantium/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/byzantium/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/byzantium/vm/precompiled_contracts/identity.py b/src/ethereum/forks/byzantium/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..4b294aeefc2 100644
--- a/src/ethereum/forks/byzantium/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/byzantium/vm/precompiled_contracts/identity.py
@@ -11,12 +11,12 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +32,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/byzantium/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/byzantium/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..bbdf365d0d9 100644
--- a/src/ethereum/forks/byzantium/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/byzantium/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,13 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +35,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/byzantium/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/byzantium/vm/precompiled_contracts/sha256.py
index b0d1517b40e..f0f48b54553 100644
--- a/src/ethereum/forks/byzantium/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/byzantium/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,12 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +34,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/cancun/__init__.py b/src/ethereum/forks/cancun/__init__.py
index fe0e897ee01..ec03abf7d41 100644
--- a/src/ethereum/forks/cancun/__init__.py
+++ b/src/ethereum/forks/cancun/__init__.py
@@ -37,7 +37,7 @@
 [EIP-5656]: https://eips.ethereum.org/EIPS/eip-5656
 [EIP-6780]: https://eips.ethereum.org/EIPS/eip-6780
 [EIP-7516]: https://eips.ethereum.org/EIPS/eip-7516
-[Besu 24.1.2]: https://github.com/hyperledger/besu/releases/tag/24.1.2
+[Besu 24.1.2]: https://github.com/besu-eth/besu/releases/tag/24.1.2
 [e]: https://github.com/ledgerwatch/erigon/releases/tag/v2.58.1
 [Geth 1.13.13]: https://github.com/ethereum/go-ethereum/releases/tag/v1.13.13
 [n]: https://github.com/NethermindEth/nethermind/releases/tag/1.25.4
diff --git a/src/ethereum/forks/cancun/blocks.py b/src/ethereum/forks/cancun/blocks.py
index 957be343495..3507f8a3284 100644
--- a/src/ethereum/forks/cancun/blocks.py
+++ b/src/ethereum/forks/cancun/blocks.py
@@ -10,7 +10,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
@@ -30,6 +30,7 @@
 )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Withdrawal:
@@ -63,6 +64,7 @@ class Withdrawal:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -106,13 +108,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.cancun.state.state_root
-    [Trie]: ref:ethereum.forks.cancun.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -122,8 +125,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.cancun.trie.root
-    [Trie]: ref:ethereum.forks.cancun.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -133,8 +136,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.cancun.trie.root
-    [Trie]: ref:ethereum.forks.cancun.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -233,6 +236,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -286,6 +290,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -318,6 +323,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/cancun/fork.py b/src/ethereum/forks/cancun/fork.py
index 1c1dbab2865..9387ba1fcc3 100644
--- a/src/ethereum/forks/cancun/fork.py
+++ b/src/ethereum/forks/cancun/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Tuple
+from typing import Final, List, Optional, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
@@ -27,7 +27,13 @@
     InvalidSenderError,
     NonceMismatchError,
 )
-from ethereum.state import EMPTY_CODE_HASH, Account, Address
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt, Withdrawal, encode_receipt
@@ -42,16 +48,17 @@
     TransactionTypeContractCreationError,
 )
 from .fork_types import VersionedHash
-from .state import (
-    State,
-    TransientStorage,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
+    create_ether,
     destroy_account,
+    extract_block_diff,
     get_account,
     get_code,
+    incorporate_tx_into_block,
     increment_nonce,
-    modify_state,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
     AccessListTransaction,
@@ -65,11 +72,11 @@
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.hexadecimal import hex_to_address
 from .utils.message import prepare_message
 from .vm import Message
 from .vm.gas import (
+    GasCosts,
     calculate_blob_gas_price,
     calculate_data_fee,
     calculate_excess_blob_gas,
@@ -79,18 +86,17 @@
 
 BASE_FEE_MAX_CHANGE_DENOMINATOR = Uint(8)
 ELASTICITY_MULTIPLIER = Uint(2)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 SYSTEM_ADDRESS = hex_to_address("0xfffffffffffffffffffffffffffffffffffffffe")
 BEACON_ROOTS_ADDRESS = hex_to_address(
     "0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02"
 )
 SYSTEM_TRANSACTION_GAS = Uint(30000000)
-MAX_BLOB_GAS_PER_BLOCK = U64(786432)
+MAX_BLOB_GAS_PER_BLOCK: Final[U64] = U64(786432)
 VERSIONED_HASH_VERSION_KZG = b"\x01"
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -193,9 +199,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block.ommers != ():
         raise InvalidBlock
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -212,7 +220,10 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         withdrawals=block.withdrawals,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes, block_diff.storage_changes
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -235,6 +246,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block_output.blob_gas_used != block.header.blob_gas_used:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -366,6 +378,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Tuple[Address, Uint, Tuple[VersionedHash, ...], U64]:
     """
     Check if the transaction is includable in the block.
@@ -378,6 +391,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -431,7 +446,7 @@ def check_transaction(
         raise BlobGasLimitExceededError("blob gas limit exceeded")
 
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     if isinstance(tx, (FeeMarketTransaction, BlobTransaction)):
         if tx.max_fee_per_gas < tx.max_priority_fee_per_gas:
@@ -532,17 +547,14 @@ def make_receipt(
     return encode_receipt(tx, receipt)
 
 
-def process_system_transaction(
+def process_unchecked_system_transaction(
     block_env: vm.BlockEnvironment,
     target_address: Address,
-    system_contract_code: Bytes,
     data: Bytes,
 ) -> MessageCallOutput:
     """
-    Process a system transaction with the given code.
-
-    Prefer calling `process_unchecked_system_transaction` unless the contract
-    code has already been read from the state.
+    Process a system transaction without checking if the contract contains
+    code or if the transaction fails.
 
     Parameters
     ----------
@@ -550,8 +562,6 @@ def process_system_transaction(
         The block scoped environment.
     target_address :
         Address of the contract to call.
-    system_contract_code :
-        Code of the contract to call.
     data :
         Data to pass to the contract.
 
@@ -561,13 +571,19 @@ def process_system_transaction(
         Output of processing the system transaction.
 
     """
+    system_tx_state = TransactionState(parent=block_env.state)
+    system_contract_code = get_code(
+        system_tx_state,
+        get_account(system_tx_state, target_address).code_hash,
+    )
+
     tx_env = vm.TransactionEnvironment(
         origin=SYSTEM_ADDRESS,
         gas_price=block_env.base_fee_per_gas,
         gas=SYSTEM_TRANSACTION_GAS,
         access_list_addresses=set(),
         access_list_storage_keys=set(),
-        transient_storage=TransientStorage(),
+        state=system_tx_state,
         blob_versioned_hashes=(),
         index_in_block=None,
         tx_hash=None,
@@ -594,43 +610,9 @@ def process_system_transaction(
 
     system_tx_output = process_message_call(system_tx_message)
 
-    return system_tx_output
-
-
-def process_unchecked_system_transaction(
-    block_env: vm.BlockEnvironment,
-    target_address: Address,
-    data: Bytes,
-) -> MessageCallOutput:
-    """
-    Process a system transaction without checking if the contract contains code
-    or if the transaction fails.
-
-    Parameters
-    ----------
-    block_env :
-        The block scoped environment.
-    target_address :
-        Address of the contract to call.
-    data :
-        Data to pass to the contract.
-
-    Returns
-    -------
-    system_tx_output : `MessageCallOutput`
-        Output of processing the system transaction.
+    incorporate_tx_into_block(system_tx_state)
 
-    """
-    system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
-    )
-    return process_system_transaction(
-        block_env,
-        target_address,
-        system_contract_code,
-        data,
-    )
+    return system_tx_output
 
 
 def apply_body(
@@ -709,6 +691,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(
         block_output.transactions_trie,
         rlp.encode(index),
@@ -726,9 +710,10 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     if isinstance(tx, BlobTransaction):
         blob_gas_fee = calculate_data_fee(block_env.excess_blob_gas, tx)
@@ -738,14 +723,12 @@ def process_transaction(
     effective_gas_fee = tx.gas * effective_gas_price
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     sender_balance_after_gas_fee = (
         Uint(sender_account.balance) - effective_gas_fee - blob_gas_fee
     )
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     access_list_addresses = set()
     access_list_storage_keys = set()
@@ -764,7 +747,7 @@ def process_transaction(
         gas=gas,
         access_list_addresses=access_list_addresses,
         access_list_storage_keys=access_list_storage_keys,
-        transient_storage=TransientStorage(),
+        state=tx_state,
         blob_versioned_hashes=blob_versioned_hashes,
         index_in_block=index,
         tx_hash=get_transaction_hash(encode_transaction(tx)),
@@ -787,23 +770,13 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * priority_fee_per_gas
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
-    coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
-    ).balance + U256(transaction_fee)
-    set_account_balance(
-        block_env.state,
-        block_env.coinbase,
-        coinbase_balance_after_mining_fee,
-    )
+    create_ether(tx_state, block_env.coinbase, U256(transaction_fee))
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
     block_output.block_gas_used += tx_gas_used_after_refund
     block_output.blob_gas_used += tx_blob_gas_used
@@ -823,6 +796,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def process_withdrawals(
     block_env: vm.BlockEnvironment,
@@ -832,9 +807,7 @@ def process_withdrawals(
     """
     Increase the balance of the withdrawing account.
     """
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += wd.amount * U256(10**9)
+    wd_state = TransactionState(parent=block_env.state)
 
     for i, wd in enumerate(withdrawals):
         trie_set(
@@ -843,7 +816,9 @@ def increase_recipient_balance(recipient: Account) -> None:
             rlp.encode(wd),
         )
 
-        modify_state(block_env.state, wd.address, increase_recipient_balance)
+        create_ether(wd_state, wd.address, wd.amount * U256(10**9))
+
+    incorporate_tx_into_block(wd_state)
 
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
@@ -852,12 +827,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
     passed through as a parameter is greater than or equal to the *sum* of
     the parent's gas and the adjustment delta then the limit for gas is too
     high and fails this function's check. Similarly, if the limit is less
     than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
+    delta *or* the predefined ``LIMIT_MINIMUM`` then this function's
     check fails because the gas limit doesn't allow for a sufficient or
     reasonable amount of gas to be used on a block.
 
@@ -875,12 +850,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/cancun/state.py b/src/ethereum/forks/cancun/state.py
deleted file mode 100644
index 342bda1a1cd..00000000000
--- a/src/ethereum/forks/cancun/state.py
+++ /dev/null
@@ -1,713 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-from ethereum.state import (
-    EMPTY_ACCOUNT,
-    EMPTY_CODE_HASH,
-    Account,
-    Address,
-    Root,
-)
-
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-    def get_code(self, code_hash: Hash32) -> Bytes:
-        """
-        Get the bytecode for a given code hash.
-
-        Return ``b""`` for ``EMPTY_CODE_HASH``.
-        """
-        if code_hash == EMPTY_CODE_HASH:
-            return b""
-        return self._code_store[code_hash]
-
-
-@dataclass
-class TransientStorage:
-    """
-    Contains all information that is preserved between message calls
-    within a transaction.
-    """
-
-    _tries: Dict[Address, Trie[Bytes32, U256]] = field(default_factory=dict)
-    _snapshots: List[Dict[Address, Trie[Bytes32, U256]]] = field(
-        default_factory=list
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-
-
-def begin_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-    transient_storage._snapshots.append(
-        {k: copy_trie(t) for (k, t) in transient_storage._tries.items()}
-    )
-
-
-def commit_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._snapshots.pop()
-
-
-def rollback_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._tries = transient_storage._snapshots.pop()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-
-    Return ``b""`` for ``EMPTY_CODE_HASH``.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State`` and return its hash.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase, and to respect the constraints added to SELFDESTRUCT by
-    EIP-6780.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`. If, after modification, the account
-    exists and has zero nonce, empty code, and zero balance, it is destroyed.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-    account = get_account_optional(state, address)
-    account_exists_and_is_empty = (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-    if account_exists_and_is_empty:
-        destroy_account(state, address)
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
-
-
-def get_transient_storage(
-    transient_storage: TransientStorage, address: Address, key: Bytes32
-) -> U256:
-    """
-    Get a value at a storage key on an account from transient storage.
-    Returns `U256(0)` if the storage key has not been set previously.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_transient_storage(
-    transient_storage: TransientStorage,
-    address: Address,
-    key: Bytes32,
-    value: U256,
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        transient_storage._tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del transient_storage._tries[address]
diff --git a/src/ethereum/forks/cancun/state_tracker.py b/src/ethereum/forks/cancun/state_tracker.py
new file mode 100644
index 00000000000..67ceaa86321
--- /dev/null
+++ b/src/ethereum/forks/cancun/state_tracker.py
@@ -0,0 +1,749 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state. If, after modification, the
+    account exists and has zero nonce, empty code, and zero balance, it
+    is destroyed.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+    if account_exists_and_is_empty(tx_state, address):
+        destroy_account(tx_state, address)
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+    )
diff --git a/src/ethereum/forks/cancun/transactions.py b/src/ethereum/forks/cancun/transactions.py
index c94f3df0647..e8b3efbfddb 100644
--- a/src/ethereum/forks/cancun/transactions.py
+++ b/src/ethereum/forks/cancun/transactions.py
@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -24,38 +24,8 @@
 from .exceptions import InitCodeTooLargeError, TransactionTypeError
 from .fork_types import VersionedHash
 
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_PER_NON_ZERO = Uint(16)
-"""
-Gas cost per non-zero byte in the transaction data.
-"""
-
-GAS_TX_DATA_PER_ZERO = Uint(4)
-"""
-Gas cost per zero byte in the transaction data.
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
-
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
-"""
-
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
-"""
-
 
+@final
 @slotted_freezable
 @dataclass
 class LegacyTransaction:
@@ -117,6 +87,7 @@ class LegacyTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Access:
@@ -136,6 +107,7 @@ class Access:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccessListTransaction:
@@ -208,6 +180,7 @@ class AccessListTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class FeeMarketTransaction:
@@ -285,6 +258,7 @@ class FeeMarketTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class BlobTransaction:
@@ -480,7 +454,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
     4. Cost for access list entries (if applicable)
@@ -488,17 +462,17 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     This function takes a transaction as a parameter and returns the intrinsic
     gas cost of the transaction.
     """
-    from .vm.gas import init_code_cost
+    from .vm.gas import GasCosts, init_code_cost
 
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
     data_cost = (
-        num_zeros * GAS_TX_DATA_PER_ZERO
-        + num_non_zeros * GAS_TX_DATA_PER_NON_ZERO
+        num_zeros * GasCosts.TX_DATA_PER_ZERO
+        + num_non_zeros * GasCosts.TX_DATA_PER_NON_ZERO
     )
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE + init_code_cost(ulen(tx.data))
+        create_cost = GasCosts.TX_CREATE + init_code_cost(ulen(tx.data))
     else:
         create_cost = Uint(0)
 
@@ -507,12 +481,12 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
         tx, (AccessListTransaction, FeeMarketTransaction, BlobTransaction)
     ):
         for access in tx.access_list:
-            access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_cost += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
 
-    return GAS_TX_BASE + data_cost + create_cost + access_list_cost
+    return GasCosts.TX_BASE + data_cost + create_cost + access_list_cost
 
 
 def recover_sender(chain_id: U64, tx: Transaction) -> Address:
diff --git a/src/ethereum/forks/cancun/trie.py b/src/ethereum/forks/cancun/trie.py
deleted file mode 100644
index bd2053ca227..00000000000
--- a/src/ethereum/forks/cancun/trie.py
+++ /dev/null
@@ -1,509 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    assert_type,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.shanghai import trie as previous_trie
-from ethereum.state import Account, Address, Root
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt, Withdrawal
-from .fork_types import encode_account
-from .transactions import LegacyTransaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = (
-    Account
-    | Bytes
-    | LegacyTransaction
-    | Receipt
-    | Uint
-    | U256
-    | Withdrawal
-    | None
-)
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[LegacyTransaction | Bytes],
-    Optional[Receipt | Bytes],
-    Optional[Withdrawal | Bytes],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `Extended`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (LegacyTransaction, Receipt, Withdrawal, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/cancun/utils/message.py b/src/ethereum/forks/cancun/utils/message.py
index 4b068489857..162f32c809f 100644
--- a/src/ethereum/forks/cancun/utils/message.py
+++ b/src/ethereum/forks/cancun/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
@@ -55,7 +55,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -63,9 +63,9 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        state = block_env.state
-        code = get_code(state, get_account(state, tx.to).code_hash)
-
+        code = get_code(
+            tx_env.state, get_account(tx_env.state, tx.to).code_hash
+        )
         code_address = tx.to
     else:
         raise AssertionError("Target must be address or empty bytes")
diff --git a/src/ethereum/forks/cancun/vm/__init__.py b/src/ethereum/forks/cancun/vm/__init__.py
index 042a64de69d..9a0f40ea6e1 100644
--- a/src/ethereum/forks/cancun/vm/__init__.py
+++ b/src/ethereum/forks/cancun/vm/__init__.py
@@ -13,24 +13,25 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt, Withdrawal
 from ..fork_types import VersionedHash
-from ..state import State, TransientStorage
+from ..state_tracker import BlockState, TransactionState
 from ..transactions import LegacyTransaction
-from ..trie import Trie
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +39,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -50,6 +51,7 @@ class BlockEnvironment:
     parent_beacon_block_root: Hash32
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -89,10 +91,11 @@ class BlockOutput:
     blob_gas_used: U64 = U64(0)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
@@ -100,12 +103,13 @@ class TransactionEnvironment:
     gas: Uint
     access_list_addresses: Set[Address]
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
-    transient_storage: TransientStorage
+    state: TransactionState
     blob_versioned_hashes: Tuple[VersionedHash, ...]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -130,6 +134,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
diff --git a/src/ethereum/forks/cancun/vm/gas.py b/src/ethereum/forks/cancun/vm/gas.py
index cddb2b59e8c..645f6b945be 100644
--- a/src/ethereum/forks/cancun/vm/gas.py
+++ b/src/ethereum/forks/cancun/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U64, U256, Uint
+from ethereum_types.numeric import U64, U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32, taylor_exponential
@@ -24,56 +24,158 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 4800
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-GAS_ECRECOVER = Uint(3000)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1)
-GAS_COLD_SLOAD = Uint(2100)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600)
-GAS_WARM_ACCESS = Uint(100)
-GAS_CODE_INIT_PER_WORD = Uint(2)
-GAS_BLOBHASH_OPCODE = Uint(3)
-GAS_POINT_EVALUATION = Uint(50000)
-
-GAS_PER_BLOB = U64(2**17)
-BLOB_TARGET_GAS_PER_BLOCK = U64(393216)
-BLOB_MIN_GASPRICE = Uint(1)
-BLOB_BASE_FEE_UPDATE_FRACTION = Uint(3338477)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    WARM_ACCESS: Final[Uint] = Uint(100)
+    COLD_ACCOUNT_ACCESS: Final[Uint] = Uint(2600)
+    COLD_STORAGE_ACCESS: Final[Uint] = Uint(2100)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+    CODE_INIT_PER_WORD: Final[Uint] = Uint(2)
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 4800
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1)
+    PRECOMPILE_POINT_EVALUATION: Final[Uint] = Uint(50000)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000)
+
+    # Blobs
+    PER_BLOB: Final[U64] = U64(2**17)
+    BLOB_TARGET_GAS_PER_BLOCK: Final[U64] = U64(393216)
+    BLOB_MIN_GASPRICE: Final[Uint] = Uint(1)
+    BLOB_BASE_FEE_UPDATE_FRACTION: Final[Uint] = Uint(3338477)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_PER_ZERO: Final[Uint] = Uint(4)
+    TX_DATA_PER_NON_ZERO: Final[Uint] = Uint(16)
+    TX_ACCESS_LIST_ADDRESS: Final[Uint] = Uint(2400)
+    TX_ACCESS_LIST_STORAGE_KEY: Final[Uint] = Uint(1900)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_PREVRANDAO: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_BASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBBASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBHASH: Final[Uint] = Uint(3)
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_PUSH0: Final[Uint] = BASE
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MCOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -89,11 +191,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -145,7 +248,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -175,7 +278,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -200,7 +303,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
@@ -272,7 +375,7 @@ def init_code_cost(init_code_length: Uint) -> Uint:
         The gas to be charged for the init code.
 
     """
-    return GAS_CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
+    return GasCosts.CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
 
 
 def calculate_excess_blob_gas(parent_header: Header) -> U64:
@@ -301,10 +404,10 @@ def calculate_excess_blob_gas(parent_header: Header) -> U64:
         blob_gas_used = parent_header.blob_gas_used
 
     parent_blob_gas = excess_blob_gas + blob_gas_used
-    if parent_blob_gas < BLOB_TARGET_GAS_PER_BLOCK:
+    if parent_blob_gas < GasCosts.BLOB_TARGET_GAS_PER_BLOCK:
         return U64(0)
 
-    return parent_blob_gas - BLOB_TARGET_GAS_PER_BLOCK
+    return parent_blob_gas - GasCosts.BLOB_TARGET_GAS_PER_BLOCK
 
 
 def calculate_total_blob_gas(tx: Transaction) -> U64:
@@ -323,7 +426,7 @@ def calculate_total_blob_gas(tx: Transaction) -> U64:
 
     """
     if isinstance(tx, BlobTransaction):
-        return GAS_PER_BLOB * U64(len(tx.blob_versioned_hashes))
+        return GasCosts.PER_BLOB * U64(len(tx.blob_versioned_hashes))
     else:
         return U64(0)
 
@@ -344,9 +447,9 @@ def calculate_blob_gas_price(excess_blob_gas: U64) -> Uint:
 
     """
     return taylor_exponential(
-        BLOB_MIN_GASPRICE,
+        GasCosts.BLOB_MIN_GASPRICE,
         Uint(excess_blob_gas),
-        BLOB_BASE_FEE_UPDATE_FRACTION,
+        GasCosts.BLOB_BASE_FEE_UPDATE_FRACTION,
     )
 
 
diff --git a/src/ethereum/forks/cancun/vm/instructions/arithmetic.py b/src/ethereum/forks/cancun/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/cancun/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/cancun/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/cancun/vm/instructions/bitwise.py b/src/ethereum/forks/cancun/vm/instructions/bitwise.py
index 41dabe8185b..1de6c615931 100644
--- a/src/ethereum/forks/cancun/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/cancun/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +172,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +202,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +232,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
diff --git a/src/ethereum/forks/cancun/vm/instructions/block.py b/src/ethereum/forks/cancun/vm/instructions/block.py
index 4f971a9dbf4..82378940859 100644
--- a/src/ethereum/forks/cancun/vm/instructions/block.py
+++ b/src/ethereum/forks/cancun/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -40,7 +40,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -89,7 +89,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -123,7 +123,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -156,7 +156,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -189,7 +189,7 @@ def prev_randao(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PREVRANDAO)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.prev_randao))
@@ -222,7 +222,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -252,7 +252,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/cancun/vm/instructions/comparison.py b/src/ethereum/forks/cancun/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/cancun/vm/instructions/comparison.py
+++ b/src/ethereum/forks/cancun/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/cancun/vm/instructions/control_flow.py b/src/ethereum/forks/cancun/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/cancun/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/cancun/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/cancun/vm/instructions/environment.py b/src/ethereum/forks/cancun/vm/instructions/environment.py
index 5848530a960..b6bf713df27 100644
--- a/src/ethereum/forks/cancun/vm/instructions/environment.py
+++ b/src/ethereum/forks/cancun/vm/instructions/environment.py
@@ -17,20 +17,13 @@
 from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BASE,
-    GAS_BLOBHASH_OPCODE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_COPY,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
-    GAS_WARM_ACCESS,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_gas_extend_memory,
     charge_gas,
@@ -52,7 +45,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -76,14 +69,15 @@ def balance(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_addresses.add(address)
-        charge_gas(evm, GAS_COLD_ACCOUNT_ACCESS)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -106,7 +100,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -129,7 +123,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -152,7 +146,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -176,7 +170,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -201,7 +195,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -230,11 +224,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -259,7 +256,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -288,11 +285,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -317,7 +317,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -341,16 +341,16 @@ def extcodesize(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -377,23 +377,23 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
 
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost + copy_gas_cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -416,7 +416,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -442,11 +442,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -475,15 +480,15 @@ def extcodehash(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -510,12 +515,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
@@ -538,7 +543,7 @@ def base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BASEFEE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.base_fee_per_gas))
@@ -561,7 +566,7 @@ def blob_hash(evm: Evm) -> None:
     index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BLOBHASH_OPCODE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBHASH)
 
     # OPERATION
     if int(index) < len(evm.message.tx_env.blob_versioned_hashes):
@@ -588,7 +593,7 @@ def blob_base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBBASEFEE)
 
     # OPERATION
     blob_base_fee = calculate_blob_gas_price(
diff --git a/src/ethereum/forks/cancun/vm/instructions/keccak.py b/src/ethereum/forks/cancun/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/cancun/vm/instructions/keccak.py
+++ b/src/ethereum/forks/cancun/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/cancun/vm/instructions/log.py b/src/ethereum/forks/cancun/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/cancun/vm/instructions/log.py
+++ b/src/ethereum/forks/cancun/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/cancun/vm/instructions/memory.py b/src/ethereum/forks/cancun/vm/instructions/memory.py
index 6e111051ee3..bba3ddf19d5 100644
--- a/src/ethereum/forks/cancun/vm/instructions/memory.py
+++ b/src/ethereum/forks/cancun/vm/instructions/memory.py
@@ -18,9 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_COPY,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -49,7 +47,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -80,7 +78,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -108,7 +106,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -135,7 +133,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
@@ -161,12 +159,15 @@ def mcopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(length)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
 
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(source, length), (destination, length)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_MCOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/cancun/vm/instructions/stack.py b/src/ethereum/forks/cancun/vm/instructions/stack.py
index 0007a28acd4..ce94af6ce8e 100644
--- a/src/ethereum/forks/cancun/vm/instructions/stack.py
+++ b/src/ethereum/forks/cancun/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -63,9 +67,9 @@ def push_n(evm: Evm, num_bytes: int) -> None:
 
     # GAS
     if num_bytes == 0:
-        charge_gas(evm, GAS_BASE)
+        charge_gas(evm, GasCosts.OPCODE_PUSH0)
     else:
-        charge_gas(evm, GAS_VERY_LOW)
+        charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -95,7 +99,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -127,7 +131,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -139,70 +143,70 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push0 = partial(push_n, num_bytes=0)
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push0: Callable[[Evm], None] = partial(push_n, num_bytes=0)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/cancun/vm/instructions/storage.py b/src/ethereum/forks/cancun/vm/instructions/storage.py
index 084d58cc46c..99dcce877dd 100644
--- a/src/ethereum/forks/cancun/vm/instructions/storage.py
+++ b/src/ethereum/forks/cancun/vm/instructions/storage.py
@@ -13,7 +13,7 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import (
+from ...state_tracker import (
     get_storage,
     get_storage_original,
     get_transient_storage,
@@ -23,12 +23,7 @@
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -50,15 +45,14 @@ def sload(evm: Evm) -> None:
 
     # GAS
     if (evm.message.current_target, key) in evm.accessed_storage_keys:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        charge_gas(evm, GAS_COLD_SLOAD)
+        charge_gas(evm, GasCosts.COLD_STORAGE_ACCESS)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -79,54 +73,60 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     gas_cost = Uint(0)
 
     if (evm.message.current_target, key) not in evm.accessed_storage_keys:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        gas_cost += GAS_COLD_SLOAD
+        gas_cost += GasCosts.COLD_STORAGE_ACCESS
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost += GAS_STORAGE_SET
+            gas_cost += GasCosts.STORAGE_SET
         else:
-            gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_SLOAD
+            gas_cost += (
+                GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
+            )
     else:
-        gas_cost += GAS_WARM_ACCESS
+        gas_cost += GasCosts.WARM_ACCESS
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
             # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
             # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
             # Storage slot being restored to its original value
             if original_value == 0:
                 # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_WARM_ACCESS)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.WARM_ACCESS
+                )
             else:
                 # Slot was originally non-empty and was UPDATED earlier
                 evm.refund_counter += int(
-                    GAS_STORAGE_UPDATE - GAS_COLD_SLOAD - GAS_WARM_ACCESS
+                    GasCosts.COLD_STORAGE_WRITE
+                    - GasCosts.COLD_STORAGE_ACCESS
+                    - GasCosts.WARM_ACCESS
                 )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
@@ -147,11 +147,11 @@ def tload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
 
     # OPERATION
     value = get_transient_storage(
-        evm.message.tx_env.transient_storage, evm.message.current_target, key
+        evm.message.tx_env.state, evm.message.current_target, key
     )
     push(evm.stack, value)
 
@@ -174,11 +174,11 @@ def tstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
     if evm.message.is_static:
         raise WriteInStaticContext
     set_transient_storage(
-        evm.message.tx_env.transient_storage,
+        evm.message.tx_env.state,
         evm.message.current_target,
         key,
         new_value,
diff --git a/src/ethereum/forks/cancun/vm/instructions/system.py b/src/ethereum/forks/cancun/vm/instructions/system.py
index db725606a08..3f7b1be3676 100644
--- a/src/ethereum/forks/cancun/vm/instructions/system.py
+++ b/src/ethereum/forks/cancun/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
     get_account,
@@ -40,15 +40,7 @@
 )
 from ..exceptions import OutOfGasError, Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -90,7 +82,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -104,15 +96,13 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -165,14 +155,16 @@ def create(evm: Evm) -> None:
     )
     init_code_gas = init_code_cost(Uint(memory_size))
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost + init_code_gas)
+    charge_gas(
+        evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost + init_code_gas
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -215,8 +207,8 @@ def create2(evm: Evm) -> None:
     init_code_gas = init_code_cost(Uint(memory_size))
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost
         + init_code_gas,
     )
@@ -260,7 +252,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -303,8 +295,8 @@ def generic_call(
     call_data = memory_read_bytes(
         evm.memory, memory_input_start_position, memory_input_size
     )
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, code_address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, code_address).code_hash)
     child_message = Message(
         block_env=evm.message.block_env,
         tx_env=evm.message.tx_env,
@@ -371,17 +363,17 @@ def call(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -394,7 +386,7 @@ def call(evm: Evm) -> None:
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -451,12 +443,12 @@ def callcode(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -469,7 +461,7 @@ def callcode(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -509,19 +501,19 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if beneficiary not in evm.accessed_addresses:
         evm.accessed_addresses.add(beneficiary)
-        gas_cost += GAS_COLD_ACCOUNT_ACCESS
+        gas_cost += GasCosts.COLD_ACCOUNT_ACCESS
 
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -529,11 +521,11 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     move_ether(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         originator,
         beneficiary,
         originator_balance,
@@ -541,10 +533,10 @@ def selfdestruct(evm: Evm) -> None:
 
     # register account for deletion only if it was created
     # in the same transaction
-    if originator in evm.message.block_env.state.created_accounts:
+    if originator in evm.message.tx_env.state.created_accounts:
         # If beneficiary is the same as originator, then
         # the ether is burnt.
-        set_account_balance(evm.message.block_env.state, originator, U256(0))
+        set_account_balance(evm.message.tx_env.state, originator, U256(0))
         evm.accounts_to_delete.add(originator)
 
     # HALT the execution
@@ -582,10 +574,10 @@ def delegatecall(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     message_call_gas = calculate_message_call_gas(
         U256(0), gas, Uint(evm.gas_left), extend_memory.cost, access_gas_cost
@@ -641,10 +633,10 @@ def staticcall(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
 
diff --git a/src/ethereum/forks/cancun/vm/interpreter.py b/src/ethereum/forks/cancun/vm/interpreter.py
index 7f4bed0129c..bb0687a666e 100644
--- a/src/ethereum/forks/cancun/vm/interpreter.py
+++ b/src/ethereum/forks/cancun/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,19 +31,19 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     increment_nonce,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
 )
 from ..vm import Message
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -63,6 +63,7 @@
 MAX_INIT_CODE_SIZE = 2 * MAX_CODE_SIZE
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -100,12 +101,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -156,22 +157,31 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
-    transient_storage = message.tx_env.transient_storage
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
-
-    # The list of created accounts is used by `get_storage_original`.
-    # Additionally, the list is needed to respect the constraints
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts. This tracking is also needed to respect the constraints
     # added to SELFDESTRUCT by EIP-6780.
-    mark_account_created(state, message.current_target)
+    mark_account_created(tx_state, message.current_target)
 
-    increment_nonce(state, message.current_target)
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             if len(contract_code) > 0:
@@ -181,15 +191,14 @@ def process_create_message(message: Message) -> Evm:
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state, transient_storage)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state, transient_storage)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -208,8 +217,7 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
-    transient_storage = message.tx_env.transient_storage
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
@@ -235,11 +243,14 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
+    snapshot = copy_tx_state(tx_state)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -270,9 +281,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state, transient_storage)
-    else:
-        commit_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/cancun/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/cancun/vm/precompiled_contracts/alt_bn128.py
index 214725d8da0..862506c54c3 100644
--- a/src/ethereum/forks/cancun/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/cancun/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(150))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(6000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(34000 * (len(data) // 192) + 45000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/cancun/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/cancun/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/cancun/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/cancun/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/cancun/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/cancun/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/cancun/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/cancun/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/cancun/vm/precompiled_contracts/identity.py b/src/ethereum/forks/cancun/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..4b294aeefc2 100644
--- a/src/ethereum/forks/cancun/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/cancun/vm/precompiled_contracts/identity.py
@@ -11,12 +11,12 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +32,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/cancun/vm/precompiled_contracts/point_evaluation.py b/src/ethereum/forks/cancun/vm/precompiled_contracts/point_evaluation.py
index ce4eed71294..d2d105ba13b 100644
--- a/src/ethereum/forks/cancun/vm/precompiled_contracts/point_evaluation.py
+++ b/src/ethereum/forks/cancun/vm/precompiled_contracts/point_evaluation.py
@@ -22,7 +22,7 @@
 
 from ...vm import Evm
 from ...vm.exceptions import KZGProofError
-from ...vm.gas import GAS_POINT_EVALUATION, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 FIELD_ELEMENTS_PER_BLOB = 4096
 BLS_MODULUS = 52435875175126190479447740508185965837690552500527637822603658699938581184513  # noqa: E501
@@ -51,7 +51,7 @@ def point_evaluation(evm: Evm) -> None:
     proof = Bytes48(data[144:192])
 
     # GAS
-    charge_gas(evm, GAS_POINT_EVALUATION)
+    charge_gas(evm, GasCosts.PRECOMPILE_POINT_EVALUATION)
     if kzg_commitment_to_versioned_hash(commitment) != versioned_hash:
         raise KZGProofError
 
diff --git a/src/ethereum/forks/cancun/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/cancun/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..bbdf365d0d9 100644
--- a/src/ethereum/forks/cancun/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/cancun/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,13 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +35,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/cancun/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/cancun/vm/precompiled_contracts/sha256.py
index b0d1517b40e..f0f48b54553 100644
--- a/src/ethereum/forks/cancun/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/cancun/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,12 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +34,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/constantinople/blocks.py b/src/ethereum/forks/constantinople/blocks.py
index e53cf2c1c65..94dd37899b8 100644
--- a/src/ethereum/forks/constantinople/blocks.py
+++ b/src/ethereum/forks/constantinople/blocks.py
@@ -10,18 +10,20 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.crypto.hash import Hash32
+from ethereum.state import Address, Root
 
-from .fork_types import Address, Bloom, Root
+from .fork_types import Bloom
 from .transactions import Transaction
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -60,13 +62,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.constantinople.state.state_root
-    [Trie]: ref:ethereum.forks.constantinople.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -76,8 +79,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.constantinople.trie.root
-    [Trie]: ref:ethereum.forks.constantinople.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -87,8 +90,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.constantinople.trie.root
-    [Trie]: ref:ethereum.forks.constantinople.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -157,6 +160,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -201,6 +205,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -233,6 +238,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/constantinople/fork.py b/src/ethereum/forks/constantinople/fork.py
index 7ed470d41e3..209fe029e46 100644
--- a/src/ethereum/forks/constantinople/fork.py
+++ b/src/ethereum/forks/constantinople/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.numeric import U64, U256, Uint
@@ -27,21 +27,29 @@
     InvalidSenderError,
     NonceMismatchError,
 )
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt
 from .bloom import logs_bloom
-from .fork_types import EMPTY_CODE_HASH, Address
-from .state import (
-    State,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
     account_exists_and_is_empty,
     create_ether,
     destroy_account,
     destroy_touched_empty_accounts,
+    extract_block_diff,
     get_account,
+    incorporate_tx_into_block,
     increment_nonce,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
     Transaction,
@@ -49,19 +57,18 @@
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.message import prepare_message
+from .vm.gas import GasCosts
 from .vm.interpreter import process_message_call
 
 BLOCK_REWARD = U256(2 * 10**18)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 MINIMUM_DIFFICULTY = Uint(131072)
 MAX_OMMER_DEPTH = Uint(6)
 BOMB_DELAY_BLOCKS = 5000000
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -163,9 +170,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     validate_header(chain, block.header)
     validate_ommers(block.ommers, block.header, chain)
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -179,7 +188,12 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         ommers=block.ommers,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes,
+        block_diff.storage_changes,
+        block_diff.storage_clears,
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -197,6 +211,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block_logs_bloom != block.header.bloom:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -347,6 +362,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Address:
     """
     Check if the transaction is includable in the block.
@@ -359,6 +375,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -381,7 +399,7 @@ def check_transaction(
     if tx.gas > gas_available:
         raise GasUsedExceedsLimitError("gas used exceeds limit")
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     max_gas_fee = tx.gas * tx.gas_price
 
@@ -467,7 +485,7 @@ def apply_body(
     for i, tx in enumerate(transactions):
         process_transaction(block_env, block_output, tx, Uint(i))
 
-    pay_rewards(block_env.state, block_env.number, block_env.coinbase, ommers)
+    pay_rewards(block_env, ommers)
 
     return block_output
 
@@ -549,9 +567,7 @@ def validate_ommers(
 
 
 def pay_rewards(
-    state: State,
-    block_number: Uint,
-    coinbase: Address,
+    block_env: vm.BlockEnvironment,
     ommers: Tuple[Header, ...],
 ) -> None:
     """
@@ -570,25 +586,24 @@ def pay_rewards(
 
     Parameters
     ----------
-    state :
-        Current account state.
-    block_number :
-        Position of the block within the chain.
-    coinbase :
-        Address of account which receives block reward and transaction fees.
+    block_env :
+        The block scoped environment.
     ommers :
         List of ommers mentioned in the current block.
 
     """
+    rewards_state = TransactionState(parent=block_env.state)
     ommer_count = U256(len(ommers))
     miner_reward = BLOCK_REWARD + (ommer_count * (BLOCK_REWARD // U256(32)))
-    create_ether(state, coinbase, miner_reward)
+    create_ether(rewards_state, block_env.coinbase, miner_reward)
 
     for ommer in ommers:
         # Ommer age with respect to the current block.
-        ommer_age = U256(block_number - ommer.number)
+        ommer_age = U256(block_env.number - ommer.number)
         ommer_miner_reward = ((U256(8) - ommer_age) * BLOCK_REWARD) // U256(8)
-        create_ether(state, ommer.coinbase, ommer_miner_reward)
+        create_ether(rewards_state, ommer.coinbase, ommer_miner_reward)
+
+    incorporate_tx_into_block(rewards_state)
 
 
 def process_transaction(
@@ -621,6 +636,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(block_output.transactions_trie, rlp.encode(Uint(index)), tx)
     intrinsic_gas = validate_transaction(tx)
 
@@ -628,23 +645,23 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     gas_fee = tx.gas * tx.gas_price
     sender_balance_after_gas_fee = Uint(sender_account.balance) - gas_fee
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     tx_env = vm.TransactionEnvironment(
         origin=sender,
         gas_price=tx.gas_price,
         gas=gas,
+        state=tx_state,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
     )
@@ -664,28 +681,25 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * tx.gas_price
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
     coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
+        tx_state, block_env.coinbase
     ).balance + U256(transaction_fee)
     if coinbase_balance_after_mining_fee != 0:
         set_account_balance(
-            block_env.state,
+            tx_state,
             block_env.coinbase,
             coinbase_balance_after_mining_fee,
         )
-    elif account_exists_and_is_empty(block_env.state, block_env.coinbase):
-        destroy_account(block_env.state, block_env.coinbase)
+    elif account_exists_and_is_empty(tx_state, block_env.coinbase):
+        destroy_account(tx_state, block_env.coinbase)
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
-    destroy_touched_empty_accounts(block_env.state, tx_output.touched_accounts)
+    destroy_touched_empty_accounts(tx_state, tx_output.touched_accounts)
 
     block_output.block_gas_used += tx_gas_used_after_refund
 
@@ -704,6 +718,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
     """
@@ -711,12 +727,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
     passed through as a parameter is greater than or equal to the *sum* of
     the parent's gas and the adjustment delta then the limit for gas is too
     high and fails this function's check. Similarly, if the limit is less
     than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
+    delta *or* the predefined ``LIMIT_MINIMUM`` then this function's
     check fails because the gas limit doesn't allow for a sufficient or
     reasonable amount of gas to be used on a block.
 
@@ -734,12 +750,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/constantinople/fork_types.py b/src/ethereum/forks/constantinople/fork_types.py
index ae4525bbbdd..02907cd2a1a 100644
--- a/src/ethereum/forks/constantinople/fork_types.py
+++ b/src/ethereum/forks/constantinople/fork_types.py
@@ -11,41 +11,13 @@
 Types reused throughout the specification, which are specific to Ethereum.
 """
 
-from dataclasses import dataclass
-
 from ethereum_rlp import rlp
-from ethereum_types.bytes import Bytes, Bytes20, Bytes256
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
+from ethereum_types.bytes import Bytes, Bytes256
 
-Address = Bytes20
-Root = Hash32
+from ethereum.state import Account
 
 Bloom = Bytes256
 
-EMPTY_CODE_HASH = keccak256(b"")
-
-
-@slotted_freezable
-@dataclass
-class Account:
-    """
-    State associated with an address.
-    """
-
-    nonce: Uint
-    balance: U256
-    code_hash: Hash32
-
-
-EMPTY_ACCOUNT = Account(
-    nonce=Uint(0),
-    balance=U256(0),
-    code_hash=EMPTY_CODE_HASH,
-)
-
 
 def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     """
diff --git a/src/ethereum/forks/constantinople/state.py b/src/ethereum/forks/constantinople/state.py
deleted file mode 100644
index 10cf7e419b5..00000000000
--- a/src/ethereum/forks/constantinople/state.py
+++ /dev/null
@@ -1,611 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, Iterable, List, Optional, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-
-from .fork_types import EMPTY_ACCOUNT, EMPTY_CODE_HASH, Account, Address, Root
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state._code_store
-
-
-def begin_transaction(state: State) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-
-
-def commit_transaction(state: State) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.pop()
-
-
-def rollback_transaction(state: State) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State``.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def account_exists_and_is_empty(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists and has zero nonce, empty code and zero
-    balance.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    exists_and_is_empty : `bool`
-        True if an account exists and has zero nonce, empty code and zero
-        balance, False otherwise.
-
-    """
-    account = get_account_optional(state, address)
-    return (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def touch_account(state: State, address: Address) -> None:
-    """
-    Initializes an account to state.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        The address of the account that needs to be initialized.
-
-    """
-    if not account_exists(state, address):
-        set_account(state, address, EMPTY_ACCOUNT)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def create_ether(state: State, address: Address, amount: U256) -> None:
-    """
-    Add newly created ether to an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to which ether is added.
-    amount:
-        The amount of ether to be added to the account of interest.
-
-    """
-
-    def increase_balance(account: Account) -> None:
-        account.balance += amount
-
-    modify_state(state, address, increase_balance)
-
-
-def destroy_touched_empty_accounts(
-    state: State, touched_accounts: Iterable[Address]
-) -> None:
-    """
-    Destroy all touched accounts that are empty.
-
-    Parameters
-    ----------
-    state: `State`
-        The current state.
-    touched_accounts: `Iterable[Address]`
-        All the accounts that have been touched in the current transaction.
-
-    """
-    for address in touched_accounts:
-        if account_exists_and_is_empty(state, address):
-            destroy_account(state, address)
diff --git a/src/ethereum/forks/constantinople/state_tracker.py b/src/ethereum/forks/constantinople/state_tracker.py
new file mode 100644
index 00000000000..24362ecff98
--- /dev/null
+++ b/src/ethereum/forks/constantinople/state_tracker.py
@@ -0,0 +1,805 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+
+    ``storage_clears`` records addresses whose storage was wiped by
+    a pre-EIP-6780 ``SELFDESTRUCT`` earlier in the block, so later
+    reads must not fall back to ``pre_state`` storage.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    storage_clears: Set[Address] = field(default_factory=set)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    storage_clears: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.storage_clears:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if address in tx_state.storage_clears:
+        return False
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    if address in tx_state.parent.storage_clears:
+        return False
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+    tx_state.storage_clears.add(address)
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        storage_clears=set(tx_state.storage_clears),
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.storage_clears = snapshot.storage_clears
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address in tx_state.storage_clears:
+        block.storage_clears.add(address)
+        block.storage_writes.pop(address, None)
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.storage_clears.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+        storage_clears=block_state.storage_clears,
+    )
+
+
+def destroy_touched_empty_accounts(
+    tx_state: TransactionState, touched_accounts: Set[Address]
+) -> None:
+    """
+    Destroy all touched accounts that are empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    touched_accounts :
+        All the accounts that have been touched in the current transaction.
+
+    """
+    for address in touched_accounts:
+        if account_exists_and_is_empty(tx_state, address):
+            destroy_account(tx_state, address)
+
+
+def touch_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Initialize an account to state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be initialized.
+
+    """
+    if not account_exists(tx_state, address):
+        set_account(tx_state, address, EMPTY_ACCOUNT)
diff --git a/src/ethereum/forks/constantinople/transactions.py b/src/ethereum/forks/constantinople/transactions.py
index 278238f8d5a..8272ebea080 100644
--- a/src/ethereum/forks/constantinople/transactions.py
+++ b/src/ethereum/forks/constantinople/transactions.py
@@ -5,6 +5,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0
@@ -18,31 +19,10 @@
     InvalidSignatureError,
     NonceOverflowError,
 )
-
-from .fork_types import Address
-
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_PER_NON_ZERO = Uint(68)
-"""
-Gas cost per non-zero byte in the transaction data.
-"""
-
-GAS_TX_DATA_PER_ZERO = Uint(4)
-"""
-Gas cost per zero byte in the transaction data.
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
+from ethereum.state import Address
 
 
+@final
 @slotted_freezable
 @dataclass
 class Transaction:
@@ -143,26 +123,28 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
 
     This function takes a transaction as a parameter and returns the intrinsic
     gas cost of the transaction.
     """
+    from .vm.gas import GasCosts
+
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
     data_cost = (
-        num_zeros * GAS_TX_DATA_PER_ZERO
-        + num_non_zeros * GAS_TX_DATA_PER_NON_ZERO
+        num_zeros * GasCosts.TX_DATA_PER_ZERO
+        + num_non_zeros * GasCosts.TX_DATA_PER_NON_ZERO
     )
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE
+        create_cost = GasCosts.TX_CREATE
     else:
         create_cost = Uint(0)
 
-    return GAS_TX_BASE + data_cost + create_cost
+    return GasCosts.TX_BASE + data_cost + create_cost
 
 
 def recover_sender(chain_id: U64, tx: Transaction) -> Address:
diff --git a/src/ethereum/forks/constantinople/trie.py b/src/ethereum/forks/constantinople/trie.py
deleted file mode 100644
index 0ff06ea4ec7..00000000000
--- a/src/ethereum/forks/constantinople/trie.py
+++ /dev/null
@@ -1,498 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    assert_type,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.byzantium import trie as previous_trie
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt
-from .fork_types import Account, Address, Root, encode_account
-from .transactions import Transaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = Account | Bytes | Transaction | Receipt | Uint | U256 | None
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[Transaction],
-    Optional[Receipt],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `rlp.RLP`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (Transaction, Receipt, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/constantinople/utils/hexadecimal.py b/src/ethereum/forks/constantinople/utils/hexadecimal.py
index b083db39398..7992f556e4f 100644
--- a/src/ethereum/forks/constantinople/utils/hexadecimal.py
+++ b/src/ethereum/forks/constantinople/utils/hexadecimal.py
@@ -14,11 +14,9 @@
 
 from ethereum_types.bytes import Bytes
 
-from ethereum.state import Address
+from ethereum.state import Address, Root
 from ethereum.utils.hexadecimal import remove_hex_prefix
 
-from ..fork_types import Root
-
 
 def hex_to_root(hex_string: str) -> Root:
     """
diff --git a/src/ethereum/forks/constantinople/utils/message.py b/src/ethereum/forks/constantinople/utils/message.py
index ecfb46224ff..c02aac36d77 100644
--- a/src/ethereum/forks/constantinople/utils/message.py
+++ b/src/ethereum/forks/constantinople/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from .address import compute_contract_address
@@ -49,7 +49,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -57,8 +57,8 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        account = get_account(block_env.state, tx.to)
-        code = get_code(block_env.state, account.code_hash)
+        account = get_account(tx_env.state, tx.to)
+        code = get_code(tx_env.state, account.code_hash)
 
         code_address = tx.to
     else:
diff --git a/src/ethereum/forks/constantinople/vm/__init__.py b/src/ethereum/forks/constantinople/vm/__init__.py
index a780c363cf8..4a491e87e59 100644
--- a/src/ethereum/forks/constantinople/vm/__init__.py
+++ b/src/ethereum/forks/constantinople/vm/__init__.py
@@ -13,24 +13,29 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt
-from ..state import State, account_exists_and_is_empty
+from ..state_tracker import (
+    BlockState,
+    TransactionState,
+    account_exists_and_is_empty,
+)
 from ..transactions import Transaction
-from ..trie import Trie
 from .precompiled_contracts import RIPEMD160_ADDRESS
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +43,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -47,6 +52,7 @@ class BlockEnvironment:
     difficulty: Uint
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -78,19 +84,22 @@ class BlockOutput:
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
     gas_price: Uint
     gas: Uint
+    state: TransactionState
     index_in_block: Uint
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -113,6 +122,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
@@ -152,7 +162,7 @@ def incorporate_child_on_success(evm: Evm, child_evm: Evm) -> None:
     evm.accounts_to_delete.update(child_evm.accounts_to_delete)
     evm.touched_accounts.update(child_evm.touched_accounts)
     if account_exists_and_is_empty(
-        evm.message.block_env.state, child_evm.message.current_target
+        evm.message.tx_env.state, child_evm.message.current_target
     ):
         evm.touched_accounts.add(child_evm.message.current_target)
 
@@ -180,7 +190,7 @@ def incorporate_child_on_error(evm: Evm, child_evm: Evm) -> None:
         evm.touched_accounts.add(RIPEMD160_ADDRESS)
     if child_evm.message.current_target == RIPEMD160_ADDRESS:
         if account_exists_and_is_empty(
-            evm.message.block_env.state, child_evm.message.current_target
+            evm.message.tx_env.state, child_evm.message.current_target
         ):
             evm.touched_accounts.add(RIPEMD160_ADDRESS)
     evm.gas_left += child_evm.gas_left
diff --git a/src/ethereum/forks/constantinople/vm/gas.py b/src/ethereum/forks/constantinople/vm/gas.py
index 839cc3e3121..cec1b0c0608 100644
--- a/src/ethereum/forks/constantinople/vm/gas.py
+++ b/src/ethereum/forks/constantinople/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32
@@ -22,49 +22,143 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_SLOAD = Uint(200)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 15000
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_EXTERNAL = Uint(700)
-GAS_BALANCE = Uint(400)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_CALL = Uint(700)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-REFUND_SELF_DESTRUCT = 24000
-GAS_ECRECOVER = Uint(3000)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_CODE_HASH = Uint(400)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    SLOAD: Final[Uint] = Uint(200)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 15000
+    REFUND_SELF_DESTRUCT: Final[int] = 24000
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(500)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(40000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(100000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(80000)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_PER_ZERO: Final[Uint] = Uint(4)
+    TX_DATA_PER_NON_ZERO: Final[Uint] = Uint(68)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_EXTCODEHASH: Final[Uint] = Uint(400)
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_DIFFICULTY: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+    OPCODE_EXTERNAL_BASE: Final[Uint] = Uint(700)
+    OPCODE_BALANCE: Final[Uint] = Uint(400)
+    OPCODE_CALL_BASE: Final[Uint] = Uint(700)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -80,11 +174,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -136,7 +231,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -166,7 +261,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -191,7 +286,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
diff --git a/src/ethereum/forks/constantinople/vm/instructions/arithmetic.py b/src/ethereum/forks/constantinople/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/constantinople/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/constantinople/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/constantinople/vm/instructions/bitwise.py b/src/ethereum/forks/constantinople/vm/instructions/bitwise.py
index 41dabe8185b..1de6c615931 100644
--- a/src/ethereum/forks/constantinople/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/constantinople/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +172,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +202,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +232,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
diff --git a/src/ethereum/forks/constantinople/vm/instructions/block.py b/src/ethereum/forks/constantinople/vm/instructions/block.py
index 0edcbf000d1..fbca7daa37c 100644
--- a/src/ethereum/forks/constantinople/vm/instructions/block.py
+++ b/src/ethereum/forks/constantinople/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -33,7 +33,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -75,7 +75,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -102,7 +102,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -128,7 +128,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -154,7 +154,7 @@ def difficulty(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_DIFFICULTY)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.difficulty))
@@ -180,7 +180,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
diff --git a/src/ethereum/forks/constantinople/vm/instructions/comparison.py b/src/ethereum/forks/constantinople/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/constantinople/vm/instructions/comparison.py
+++ b/src/ethereum/forks/constantinople/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/constantinople/vm/instructions/control_flow.py b/src/ethereum/forks/constantinople/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/constantinople/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/constantinople/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/constantinople/vm/instructions/environment.py b/src/ethereum/forks/constantinople/vm/instructions/environment.py
index d5572be1b4a..cd1a43130d8 100644
--- a/src/ethereum/forks/constantinople/vm/instructions/environment.py
+++ b/src/ethereum/forks/constantinople/vm/instructions/environment.py
@@ -13,22 +13,16 @@
 
 from ethereum_types.numeric import U256, Uint, ulen
 
+from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...fork_types import EMPTY_ACCOUNT
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BALANCE,
-    GAS_BASE,
-    GAS_CODE_HASH,
-    GAS_COPY,
-    GAS_EXTERNAL,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -49,7 +43,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -72,11 +66,12 @@ def balance(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BALANCE)
+    charge_gas(evm, GasCosts.OPCODE_BALANCE)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -99,7 +94,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -122,7 +117,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -145,7 +140,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -169,7 +164,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -194,7 +189,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -223,11 +218,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -252,7 +250,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -281,11 +279,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -310,7 +311,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -333,11 +334,12 @@ def extcodesize(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_EXTERNAL)
+    charge_gas(evm, GasCosts.OPCODE_EXTERNAL_BASE)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -364,16 +366,20 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_EXTERNAL + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_EXTERNAL_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -396,7 +402,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -422,11 +428,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -454,10 +465,10 @@ def extcodehash(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_CODE_HASH)
+    charge_gas(evm, GasCosts.OPCODE_EXTCODEHASH)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
diff --git a/src/ethereum/forks/constantinople/vm/instructions/keccak.py b/src/ethereum/forks/constantinople/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/constantinople/vm/instructions/keccak.py
+++ b/src/ethereum/forks/constantinople/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/constantinople/vm/instructions/log.py b/src/ethereum/forks/constantinople/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/constantinople/vm/instructions/log.py
+++ b/src/ethereum/forks/constantinople/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/constantinople/vm/instructions/memory.py b/src/ethereum/forks/constantinople/vm/instructions/memory.py
index 3a242ba2f7a..93861811559 100644
--- a/src/ethereum/forks/constantinople/vm/instructions/memory.py
+++ b/src/ethereum/forks/constantinople/vm/instructions/memory.py
@@ -16,8 +16,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,7 +45,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -77,7 +76,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -105,7 +104,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -132,7 +131,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
diff --git a/src/ethereum/forks/constantinople/vm/instructions/stack.py b/src/ethereum/forks/constantinople/vm/instructions/stack.py
index 0fc0d3fe4b5..901bff4ed3b 100644
--- a/src/ethereum/forks/constantinople/vm/instructions/stack.py
+++ b/src/ethereum/forks/constantinople/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -62,7 +66,7 @@ def push_n(evm: Evm, num_bytes: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -92,7 +96,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -124,7 +128,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -136,69 +140,69 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/constantinople/vm/instructions/storage.py b/src/ethereum/forks/constantinople/vm/instructions/storage.py
index c62a67ae2d6..faf342b34ab 100644
--- a/src/ethereum/forks/constantinople/vm/instructions/storage.py
+++ b/src/ethereum/forks/constantinople/vm/instructions/storage.py
@@ -13,14 +13,11 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import get_storage, set_storage
+from ...state_tracker import get_storage, set_storage
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -41,12 +38,11 @@ def sload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_SLOAD)
+    charge_gas(evm, GasCosts.SLOAD)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -69,20 +65,20 @@ def sstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    state = evm.message.block_env.state
-    current_value = get_storage(state, evm.message.current_target, key)
+    tx_state = evm.message.tx_env.state
+    current_value = get_storage(tx_state, evm.message.current_target, key)
     if new_value != 0 and current_value == 0:
-        gas_cost = GAS_STORAGE_SET
+        gas_cost = GasCosts.STORAGE_SET
     else:
-        gas_cost = GAS_STORAGE_UPDATE
+        gas_cost = GasCosts.COLD_STORAGE_WRITE
 
     if new_value == 0 and current_value != 0:
-        evm.refund_counter += REFUND_STORAGE_CLEAR
+        evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
diff --git a/src/ethereum/forks/constantinople/vm/instructions/system.py b/src/ethereum/forks/constantinople/vm/instructions/system.py
index c251e65574d..cf3f54c2c8d 100644
--- a/src/ethereum/forks/constantinople/vm/instructions/system.py
+++ b/src/ethereum/forks/constantinople/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
@@ -40,15 +40,7 @@
 )
 from ..exceptions import Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL,
-    GAS_CALL_VALUE,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_ZERO,
-    REFUND_SELF_DESTRUCT,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -83,7 +75,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -95,11 +87,9 @@ def generic_create(
         return
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
@@ -107,7 +97,7 @@ def generic_create(
         evm.memory, memory_start_position, memory_size
     )
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -157,14 +147,14 @@ def create(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -202,8 +192,8 @@ def create2(evm: Evm) -> None:
     call_data_words = ceil32(Uint(memory_size)) // Uint(32)
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost,
     )
 
@@ -242,7 +232,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -285,8 +275,8 @@ def generic_call(
     call_data = memory_read_bytes(
         evm.memory, memory_input_start_position, memory_input_size
     )
-    account = get_account(evm.message.block_env.state, code_address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    account = get_account(evm.message.tx_env.state, code_address)
+    code = get_code(evm.message.tx_env.state, account.code_hash)
     child_message = Message(
         block_env=evm.message.block_env,
         tx_env=evm.message.tx_env,
@@ -352,23 +342,23 @@ def call(evm: Evm) -> None:
 
     code_address = to
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
         Uint(evm.gas_left),
         extend_memory.cost,
-        GAS_CALL + create_gas_cost + transfer_gas_cost,
+        GasCosts.OPCODE_CALL_BASE + create_gas_cost + transfer_gas_cost,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
     if evm.message.is_static and value != U256(0):
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -423,20 +413,20 @@ def callcode(evm: Evm) -> None:
             (memory_output_start_position, memory_output_size),
         ],
     )
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
         Uint(evm.gas_left),
         extend_memory.cost,
-        GAS_CALL + transfer_gas_cost,
+        GasCosts.OPCODE_CALL_BASE + transfer_gas_cost,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -476,15 +466,15 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     originator = evm.message.current_target
 
@@ -495,7 +485,7 @@ def selfdestruct(evm: Evm) -> None:
         parent_evm = parent_evm.message.parent_evm
 
     if originator not in refunded_accounts:
-        evm.refund_counter += REFUND_SELF_DESTRUCT
+        evm.refund_counter += GasCosts.REFUND_SELF_DESTRUCT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -503,28 +493,28 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     beneficiary_balance = get_account(
-        evm.message.block_env.state, beneficiary
+        evm.message.tx_env.state, beneficiary
     ).balance
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     # First Transfer to beneficiary
     set_account_balance(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         beneficiary,
         beneficiary_balance + originator_balance,
     )
     # Next, Zero the balance of the address being deleted (must come after
     # sending to beneficiary in case the contract named itself as the
     # beneficiary).
-    set_account_balance(evm.message.block_env.state, originator, U256(0))
+    set_account_balance(evm.message.tx_env.state, originator, U256(0))
 
     # register account for deletion
     evm.accounts_to_delete.add(originator)
 
     # mark beneficiary as touched
-    if account_exists_and_is_empty(evm.message.block_env.state, beneficiary):
+    if account_exists_and_is_empty(evm.message.tx_env.state, beneficiary):
         evm.touched_accounts.add(beneficiary)
 
     # HALT the execution
@@ -561,7 +551,11 @@ def delegatecall(evm: Evm) -> None:
         ],
     )
     message_call_gas = calculate_message_call_gas(
-        U256(0), gas, Uint(evm.gas_left), extend_memory.cost, GAS_CALL
+        U256(0),
+        gas,
+        Uint(evm.gas_left),
+        extend_memory.cost,
+        GasCosts.OPCODE_CALL_BASE,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
@@ -620,7 +614,7 @@ def staticcall(evm: Evm) -> None:
         gas,
         Uint(evm.gas_left),
         extend_memory.cost,
-        GAS_CALL,
+        GasCosts.OPCODE_CALL_BASE,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
diff --git a/src/ethereum/forks/constantinople/vm/interpreter.py b/src/ethereum/forks/constantinople/vm/interpreter.py
index b26937492a9..4796f0ff997 100644
--- a/src/ethereum/forks/constantinople/vm/interpreter.py
+++ b/src/ethereum/forks/constantinople/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,20 +31,20 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     increment_nonce,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
     touch_account,
 )
 from ..vm import Message
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -62,6 +62,7 @@
 MAX_CODE_SIZE = 0x6000
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -101,12 +102,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -120,9 +121,7 @@ def process_message_call(message: Message) -> MessageCallOutput:
             evm = process_create_message(message)
     else:
         evm = process_message(message)
-        if account_exists_and_is_empty(
-            block_env.state, Address(message.target)
-        ):
+        if account_exists_and_is_empty(tx_state, Address(message.target)):
             evm.touched_accounts.add(Address(message.target))
 
     if evm.error:
@@ -165,31 +164,39 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state)
-
-    increment_nonce(state, message.current_target)
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             charge_gas(evm, contract_code_gas)
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -208,7 +215,7 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
@@ -233,13 +240,16 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
 
-    touch_account(state, message.current_target)
+    touch_account(tx_state, message.current_target)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -270,9 +280,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state)
-    else:
-        commit_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/constantinople/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/constantinople/vm/precompiled_contracts/alt_bn128.py
index d579abb2b8a..862506c54c3 100644
--- a/src/ethereum/forks/constantinople/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/constantinople/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(500))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(40000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(80000 * (len(data) // 192) + 100000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/constantinople/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/constantinople/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/constantinople/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/constantinople/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/constantinople/vm/precompiled_contracts/identity.py b/src/ethereum/forks/constantinople/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/constantinople/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/constantinople/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/constantinople/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/constantinople/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/constantinople/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/constantinople/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/constantinople/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/constantinople/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/constantinople/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/constantinople/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/dao_fork/blocks.py b/src/ethereum/forks/dao_fork/blocks.py
index f0de09559a1..7e6320bb827 100644
--- a/src/ethereum/forks/dao_fork/blocks.py
+++ b/src/ethereum/forks/dao_fork/blocks.py
@@ -10,18 +10,20 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.crypto.hash import Hash32
+from ethereum.state import Address, Root
 
-from .fork_types import Address, Bloom, Root
+from .fork_types import Bloom
 from .transactions import Transaction
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -60,13 +62,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.dao_fork.state.state_root
-    [Trie]: ref:ethereum.forks.dao_fork.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -76,8 +79,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.dao_fork.trie.root
-    [Trie]: ref:ethereum.forks.dao_fork.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -87,8 +90,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.dao_fork.trie.root
-    [Trie]: ref:ethereum.forks.dao_fork.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -157,6 +160,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -201,6 +205,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -233,6 +238,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/dao_fork/dao.py b/src/ethereum/forks/dao_fork/dao.py
index c76a24e116d..93bed096cdb 100644
--- a/src/ethereum/forks/dao_fork/dao.py
+++ b/src/ethereum/forks/dao_fork/dao.py
@@ -5,7 +5,9 @@
 The recovery contract was previously created using normal contract deployment.
 """
 
-from .state import State, get_account, move_ether
+from ethereum.state import State
+
+from .state_tracker import TransactionState, get_account, move_ether
 from .utils.hexadecimal import hex_to_address
 
 DAO_ACCOUNTS = [
@@ -352,6 +354,18 @@ def apply_dao(state: State) -> None:
     [`DAO_ACCOUNTS`]: ref:ethereum.forks.dao_fork.dao.DAO_ACCOUNTS
     [`DAO_RECOVERY`]: ref:ethereum.forks.dao_fork.dao.DAO_RECOVERY
     """
+    from ethereum.state import apply_changes_to_state
+
+    from .state_tracker import (
+        BlockState,
+        extract_block_diff,
+        incorporate_tx_into_block,
+    )
+
+    block_state = BlockState(pre_state=state)
+    tx_state = TransactionState(parent=block_state)
     for address in DAO_ACCOUNTS:
-        balance = get_account(state, address).balance
-        move_ether(state, address, DAO_RECOVERY, balance)
+        balance = get_account(tx_state, address).balance
+        move_ether(tx_state, address, DAO_RECOVERY, balance)
+    incorporate_tx_into_block(tx_state)
+    apply_changes_to_state(state, extract_block_diff(block_state))
diff --git a/src/ethereum/forks/dao_fork/fork.py b/src/ethereum/forks/dao_fork/fork.py
index 9dc372bec66..f12f29e3923 100644
--- a/src/ethereum/forks/dao_fork/fork.py
+++ b/src/ethereum/forks/dao_fork/fork.py
@@ -14,7 +14,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Set, Tuple
+from typing import List, Set, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes32
@@ -30,20 +30,28 @@
     NonceMismatchError,
 )
 from ethereum.fork_criteria import ByBlockNumber
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import FORK_CRITERIA, vm
 from .blocks import Block, Header, Log, Receipt
 from .bloom import logs_bloom
 from .dao import apply_dao
-from .fork_types import EMPTY_CODE_HASH, Address
-from .state import (
-    State,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
     create_ether,
     destroy_account,
+    extract_block_diff,
     get_account,
+    incorporate_tx_into_block,
     increment_nonce,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
     Transaction,
@@ -51,17 +59,16 @@
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.message import prepare_message
+from .vm.gas import GasCosts
 from .vm.interpreter import process_message_call
 
 BLOCK_REWARD = U256(5 * 10**18)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 MINIMUM_DIFFICULTY = Uint(131072)
 MAX_OMMER_DEPTH = Uint(6)
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -171,9 +178,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     validate_header(chain, block.header)
     validate_ommers(block.ommers, block.header, chain)
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -187,7 +196,12 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         ommers=block.ommers,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes,
+        block_diff.storage_changes,
+        block_diff.storage_clears,
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -205,6 +219,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block_logs_bloom != block.header.bloom:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -362,6 +377,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Address:
     """
     Check if the transaction is includable in the block.
@@ -374,6 +390,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -396,7 +414,7 @@ def check_transaction(
     if tx.gas > gas_available:
         raise GasUsedExceedsLimitError("gas used exceeds limit")
     sender_address = recover_sender(tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     max_gas_fee = tx.gas * tx.gas_price
 
@@ -482,7 +500,7 @@ def apply_body(
     for i, tx in enumerate(transactions):
         process_transaction(block_env, block_output, tx, Uint(i))
 
-    pay_rewards(block_env.state, block_env.number, block_env.coinbase, ommers)
+    pay_rewards(block_env, ommers)
 
     return block_output
 
@@ -564,9 +582,7 @@ def validate_ommers(
 
 
 def pay_rewards(
-    state: State,
-    block_number: Uint,
-    coinbase: Address,
+    block_env: vm.BlockEnvironment,
     ommers: Tuple[Header, ...],
 ) -> None:
     """
@@ -585,25 +601,24 @@ def pay_rewards(
 
     Parameters
     ----------
-    state :
-        Current account state.
-    block_number :
-        Position of the block within the chain.
-    coinbase :
-        Address of account which receives block reward and transaction fees.
+    block_env :
+        The block scoped environment.
     ommers :
         List of ommers mentioned in the current block.
 
     """
+    rewards_state = TransactionState(parent=block_env.state)
     ommer_count = U256(len(ommers))
     miner_reward = BLOCK_REWARD + (ommer_count * (BLOCK_REWARD // U256(32)))
-    create_ether(state, coinbase, miner_reward)
+    create_ether(rewards_state, block_env.coinbase, miner_reward)
 
     for ommer in ommers:
         # Ommer age with respect to the current block.
-        ommer_age = U256(block_number - ommer.number)
+        ommer_age = U256(block_env.number - ommer.number)
         ommer_miner_reward = ((U256(8) - ommer_age) * BLOCK_REWARD) // U256(8)
-        create_ether(state, ommer.coinbase, ommer_miner_reward)
+        create_ether(rewards_state, ommer.coinbase, ommer_miner_reward)
+
+    incorporate_tx_into_block(rewards_state)
 
 
 def process_transaction(
@@ -636,6 +651,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(block_output.transactions_trie, rlp.encode(Uint(index)), tx)
     intrinsic_gas = validate_transaction(tx)
 
@@ -643,23 +660,23 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     gas_fee = tx.gas * tx.gas_price
     sender_balance_after_gas_fee = Uint(sender_account.balance) - gas_fee
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     tx_env = vm.TransactionEnvironment(
         origin=sender,
         gas_price=tx.gas_price,
         gas=gas,
+        state=tx_state,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
     )
@@ -679,26 +696,30 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * tx.gas_price
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
-    coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
-    ).balance + U256(transaction_fee)
-    set_account_balance(
-        block_env.state, block_env.coinbase, coinbase_balance_after_mining_fee
-    )
+    create_ether(tx_state, block_env.coinbase, U256(transaction_fee))
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
     block_output.block_gas_used += tx_gas_used_after_refund
 
+    incorporate_tx_into_block(tx_state)
+
+    block_state = block_env.state
+    block_diff = extract_block_diff(block_state)
+    intermediate_state_root, _ = (
+        block_state.pre_state.compute_state_root_and_trie_changes(
+            block_diff.account_changes,
+            block_diff.storage_changes,
+            block_diff.storage_clears,
+        )
+    )
+
     receipt = make_receipt(
-        state_root(block_env.state),
+        intermediate_state_root,
         block_output.block_gas_used,
         tx_output.logs,
     )
@@ -721,12 +742,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
     passed through as a parameter is greater than or equal to the *sum* of
     the parent's gas and the adjustment delta then the limit for gas is too
     high and fails this function's check. Similarly, if the limit is less
     than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
+    delta *or* the predefined ``LIMIT_MINIMUM`` then this function's
     check fails because the gas limit doesn't allow for a sufficient or
     reasonable amount of gas to be used on a block.
 
@@ -744,12 +765,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/dao_fork/fork_types.py b/src/ethereum/forks/dao_fork/fork_types.py
index ae4525bbbdd..02907cd2a1a 100644
--- a/src/ethereum/forks/dao_fork/fork_types.py
+++ b/src/ethereum/forks/dao_fork/fork_types.py
@@ -11,41 +11,13 @@
 Types reused throughout the specification, which are specific to Ethereum.
 """
 
-from dataclasses import dataclass
-
 from ethereum_rlp import rlp
-from ethereum_types.bytes import Bytes, Bytes20, Bytes256
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
+from ethereum_types.bytes import Bytes, Bytes256
 
-Address = Bytes20
-Root = Hash32
+from ethereum.state import Account
 
 Bloom = Bytes256
 
-EMPTY_CODE_HASH = keccak256(b"")
-
-
-@slotted_freezable
-@dataclass
-class Account:
-    """
-    State associated with an address.
-    """
-
-    nonce: Uint
-    balance: U256
-    code_hash: Hash32
-
-
-EMPTY_ACCOUNT = Account(
-    nonce=Uint(0),
-    balance=U256(0),
-    code_hash=EMPTY_CODE_HASH,
-)
-
 
 def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     """
diff --git a/src/ethereum/forks/dao_fork/state.py b/src/ethereum/forks/dao_fork/state.py
deleted file mode 100644
index 69f5cca8dc0..00000000000
--- a/src/ethereum/forks/dao_fork/state.py
+++ /dev/null
@@ -1,543 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, List, Optional, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-
-from .fork_types import EMPTY_ACCOUNT, EMPTY_CODE_HASH, Account, Address, Root
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state._code_store
-
-
-def begin_transaction(state: State) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-
-
-def commit_transaction(state: State) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.pop()
-
-
-def rollback_transaction(state: State) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State``.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def touch_account(state: State, address: Address) -> None:
-    """
-    Initializes an account to state.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        The address of the account that needs to be initialized.
-
-    """
-    if not account_exists(state, address):
-        set_account(state, address, EMPTY_ACCOUNT)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def create_ether(state: State, address: Address, amount: U256) -> None:
-    """
-    Add newly created ether to an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to which ether is added.
-    amount:
-        The amount of ether to be added to the account of interest.
-
-    """
-
-    def increase_balance(account: Account) -> None:
-        account.balance += amount
-
-    modify_state(state, address, increase_balance)
diff --git a/src/ethereum/forks/dao_fork/state_tracker.py b/src/ethereum/forks/dao_fork/state_tracker.py
new file mode 100644
index 00000000000..24362ecff98
--- /dev/null
+++ b/src/ethereum/forks/dao_fork/state_tracker.py
@@ -0,0 +1,805 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+
+    ``storage_clears`` records addresses whose storage was wiped by
+    a pre-EIP-6780 ``SELFDESTRUCT`` earlier in the block, so later
+    reads must not fall back to ``pre_state`` storage.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    storage_clears: Set[Address] = field(default_factory=set)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    storage_clears: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.storage_clears:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if address in tx_state.storage_clears:
+        return False
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    if address in tx_state.parent.storage_clears:
+        return False
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+    tx_state.storage_clears.add(address)
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        storage_clears=set(tx_state.storage_clears),
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.storage_clears = snapshot.storage_clears
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address in tx_state.storage_clears:
+        block.storage_clears.add(address)
+        block.storage_writes.pop(address, None)
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.storage_clears.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+        storage_clears=block_state.storage_clears,
+    )
+
+
+def destroy_touched_empty_accounts(
+    tx_state: TransactionState, touched_accounts: Set[Address]
+) -> None:
+    """
+    Destroy all touched accounts that are empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    touched_accounts :
+        All the accounts that have been touched in the current transaction.
+
+    """
+    for address in touched_accounts:
+        if account_exists_and_is_empty(tx_state, address):
+            destroy_account(tx_state, address)
+
+
+def touch_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Initialize an account to state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be initialized.
+
+    """
+    if not account_exists(tx_state, address):
+        set_account(tx_state, address, EMPTY_ACCOUNT)
diff --git a/src/ethereum/forks/dao_fork/transactions.py b/src/ethereum/forks/dao_fork/transactions.py
index 934540874ca..f13e81f25b9 100644
--- a/src/ethereum/forks/dao_fork/transactions.py
+++ b/src/ethereum/forks/dao_fork/transactions.py
@@ -5,6 +5,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0
@@ -18,31 +19,10 @@
     InvalidSignatureError,
     NonceOverflowError,
 )
-
-from .fork_types import Address
-
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_PER_NON_ZERO = Uint(68)
-"""
-Gas cost per non-zero byte in the transaction data.
-"""
-
-GAS_TX_DATA_PER_ZERO = Uint(4)
-"""
-Gas cost per zero byte in the transaction data.
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
+from ethereum.state import Address
 
 
+@final
 @slotted_freezable
 @dataclass
 class Transaction:
@@ -143,26 +123,28 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
 
     This function takes a transaction as a parameter and returns the intrinsic
     gas cost of the transaction.
     """
+    from .vm.gas import GasCosts
+
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
     data_cost = (
-        num_zeros * GAS_TX_DATA_PER_ZERO
-        + num_non_zeros * GAS_TX_DATA_PER_NON_ZERO
+        num_zeros * GasCosts.TX_DATA_PER_ZERO
+        + num_non_zeros * GasCosts.TX_DATA_PER_NON_ZERO
     )
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE
+        create_cost = GasCosts.TX_CREATE
     else:
         create_cost = Uint(0)
 
-    return GAS_TX_BASE + data_cost + create_cost
+    return GasCosts.TX_BASE + data_cost + create_cost
 
 
 def recover_sender(tx: Transaction) -> Address:
diff --git a/src/ethereum/forks/dao_fork/trie.py b/src/ethereum/forks/dao_fork/trie.py
deleted file mode 100644
index 679922ff44d..00000000000
--- a/src/ethereum/forks/dao_fork/trie.py
+++ /dev/null
@@ -1,498 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    assert_type,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.homestead import trie as previous_trie
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt
-from .fork_types import Account, Address, Root, encode_account
-from .transactions import Transaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = Account | Bytes | Transaction | Receipt | Uint | U256 | None
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[Transaction],
-    Optional[Receipt],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `rlp.RLP`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (Transaction, Receipt, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/dao_fork/utils/hexadecimal.py b/src/ethereum/forks/dao_fork/utils/hexadecimal.py
index 5d870803263..8e7002ee631 100644
--- a/src/ethereum/forks/dao_fork/utils/hexadecimal.py
+++ b/src/ethereum/forks/dao_fork/utils/hexadecimal.py
@@ -14,11 +14,9 @@
 
 from ethereum_types.bytes import Bytes
 
-from ethereum.state import Address
+from ethereum.state import Address, Root
 from ethereum.utils.hexadecimal import remove_hex_prefix
 
-from ..fork_types import Root
-
 
 def hex_to_root(hex_string: str) -> Root:
     """
diff --git a/src/ethereum/forks/dao_fork/utils/message.py b/src/ethereum/forks/dao_fork/utils/message.py
index 5dfcf4af121..b4d0194dee7 100644
--- a/src/ethereum/forks/dao_fork/utils/message.py
+++ b/src/ethereum/forks/dao_fork/utils/message.py
@@ -16,7 +16,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from .address import compute_contract_address
@@ -48,7 +48,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -56,8 +56,8 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        account = get_account(block_env.state, tx.to)
-        code = get_code(block_env.state, account.code_hash)
+        account = get_account(tx_env.state, tx.to)
+        code = get_code(tx_env.state, account.code_hash)
 
         code_address = tx.to
     else:
diff --git a/src/ethereum/forks/dao_fork/vm/__init__.py b/src/ethereum/forks/dao_fork/vm/__init__.py
index e318eaa7482..ef0cfa87484 100644
--- a/src/ethereum/forks/dao_fork/vm/__init__.py
+++ b/src/ethereum/forks/dao_fork/vm/__init__.py
@@ -13,23 +13,24 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt
-from ..state import State
+from ..state_tracker import BlockState, TransactionState
 from ..transactions import Transaction
-from ..trie import Trie
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -37,7 +38,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -46,6 +47,7 @@ class BlockEnvironment:
     difficulty: Uint
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -77,19 +79,22 @@ class BlockOutput:
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
     gas_price: Uint
     gas: Uint
+    state: TransactionState
     index_in_block: Uint
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -111,6 +116,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
diff --git a/src/ethereum/forks/dao_fork/vm/gas.py b/src/ethereum/forks/dao_fork/vm/gas.py
index 3c60482255b..4d56fd9486b 100644
--- a/src/ethereum/forks/dao_fork/vm/gas.py
+++ b/src/ethereum/forks/dao_fork/vm/gas.py
@@ -12,57 +12,142 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 
 from ethereum.state import Address
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32
 
-from ..state import State, account_exists
+from ..state_tracker import TransactionState, account_exists
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_SLOAD = Uint(50)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 15000
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(10)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_EXTERNAL = Uint(20)
-GAS_BALANCE = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_CALL = Uint(40)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-REFUND_SELF_DESTRUCT = Uint(24000)
-GAS_ECRECOVER = Uint(3000)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    SLOAD: Final[Uint] = Uint(50)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 15000
+    REFUND_SELF_DESTRUCT: Final[Uint] = Uint(24000)
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_PER_ZERO: Final[Uint] = Uint(4)
+    TX_DATA_PER_NON_ZERO: Final[Uint] = Uint(68)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_DIFFICULTY: Final[Uint] = BASE
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(10)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_EXTERNAL_BASE: Final[Uint] = Uint(20)
+    OPCODE_BALANCE: Final[Uint] = Uint(20)
+    OPCODE_CALL_BASE: Final[Uint] = Uint(40)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -78,11 +163,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -134,7 +220,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -164,7 +250,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -184,7 +270,7 @@ def calculate_gas_extend_memory(
 
 
 def calculate_message_call_gas(
-    state: State, gas: Uint, to: Address, value: U256
+    state: TransactionState, gas: Uint, to: Address, value: U256
 ) -> MessageCallGas:
     """
     Calculates the gas amount for executing Opcodes `CALL` and `CALLCODE`.
@@ -205,8 +291,12 @@ def calculate_message_call_gas(
     message_call_gas: `MessageCallGas`
 
     """
-    create_gas_cost = Uint(0) if account_exists(state, to) else GAS_NEW_ACCOUNT
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
-    cost = GAS_CALL + gas + create_gas_cost + transfer_gas_cost
-    stipend = gas if value == 0 else GAS_CALL_STIPEND + gas
+    create_gas_cost = (
+        Uint(0) if account_exists(state, to) else GasCosts.NEW_ACCOUNT
+    )
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
+    cost = (
+        GasCosts.OPCODE_CALL_BASE + gas + create_gas_cost + transfer_gas_cost
+    )
+    stipend = gas if value == 0 else GasCosts.CALL_STIPEND + gas
     return MessageCallGas(cost, stipend)
diff --git a/src/ethereum/forks/dao_fork/vm/instructions/arithmetic.py b/src/ethereum/forks/dao_fork/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/dao_fork/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/dao_fork/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/dao_fork/vm/instructions/bitwise.py b/src/ethereum/forks/dao_fork/vm/instructions/bitwise.py
index 2a506f55751..62da98041ad 100644
--- a/src/ethereum/forks/dao_fork/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/dao_fork/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
diff --git a/src/ethereum/forks/dao_fork/vm/instructions/block.py b/src/ethereum/forks/dao_fork/vm/instructions/block.py
index 0edcbf000d1..fbca7daa37c 100644
--- a/src/ethereum/forks/dao_fork/vm/instructions/block.py
+++ b/src/ethereum/forks/dao_fork/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -33,7 +33,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -75,7 +75,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -102,7 +102,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -128,7 +128,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -154,7 +154,7 @@ def difficulty(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_DIFFICULTY)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.difficulty))
@@ -180,7 +180,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
diff --git a/src/ethereum/forks/dao_fork/vm/instructions/comparison.py b/src/ethereum/forks/dao_fork/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/dao_fork/vm/instructions/comparison.py
+++ b/src/ethereum/forks/dao_fork/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/dao_fork/vm/instructions/control_flow.py b/src/ethereum/forks/dao_fork/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/dao_fork/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/dao_fork/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/dao_fork/vm/instructions/environment.py b/src/ethereum/forks/dao_fork/vm/instructions/environment.py
index 83eb5528226..d85aaf0c97a 100644
--- a/src/ethereum/forks/dao_fork/vm/instructions/environment.py
+++ b/src/ethereum/forks/dao_fork/vm/instructions/environment.py
@@ -15,16 +15,12 @@
 
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..gas import (
-    GAS_BALANCE,
-    GAS_BASE,
-    GAS_COPY,
-    GAS_EXTERNAL,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -45,7 +41,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -68,11 +64,12 @@ def balance(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BALANCE)
+    charge_gas(evm, GasCosts.OPCODE_BALANCE)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -95,7 +92,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -118,7 +115,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -141,7 +138,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -165,7 +162,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -190,7 +187,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -219,11 +216,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -248,7 +248,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -277,11 +277,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -306,7 +309,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -329,11 +332,12 @@ def extcodesize(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_EXTERNAL)
+    charge_gas(evm, GasCosts.OPCODE_EXTERNAL_BASE)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -360,16 +364,20 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_EXTERNAL + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_EXTERNAL_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
diff --git a/src/ethereum/forks/dao_fork/vm/instructions/keccak.py b/src/ethereum/forks/dao_fork/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/dao_fork/vm/instructions/keccak.py
+++ b/src/ethereum/forks/dao_fork/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/dao_fork/vm/instructions/log.py b/src/ethereum/forks/dao_fork/vm/instructions/log.py
index 76c02e737a4..3cfb69c194c 100644
--- a/src/ethereum/forks/dao_fork/vm/instructions/log.py
+++ b/src/ethereum/forks/dao_fork/vm/instructions/log.py
@@ -12,15 +12,14 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
 from ...blocks import Log
 from .. import Evm
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -58,9 +57,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -78,8 +77,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/dao_fork/vm/instructions/memory.py b/src/ethereum/forks/dao_fork/vm/instructions/memory.py
index 3a242ba2f7a..93861811559 100644
--- a/src/ethereum/forks/dao_fork/vm/instructions/memory.py
+++ b/src/ethereum/forks/dao_fork/vm/instructions/memory.py
@@ -16,8 +16,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,7 +45,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -77,7 +76,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -105,7 +104,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -132,7 +131,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
diff --git a/src/ethereum/forks/dao_fork/vm/instructions/stack.py b/src/ethereum/forks/dao_fork/vm/instructions/stack.py
index 0fc0d3fe4b5..901bff4ed3b 100644
--- a/src/ethereum/forks/dao_fork/vm/instructions/stack.py
+++ b/src/ethereum/forks/dao_fork/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -62,7 +66,7 @@ def push_n(evm: Evm, num_bytes: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -92,7 +96,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -124,7 +128,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -136,69 +140,69 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/dao_fork/vm/instructions/storage.py b/src/ethereum/forks/dao_fork/vm/instructions/storage.py
index 8748340fc27..16921a1a7fb 100644
--- a/src/ethereum/forks/dao_fork/vm/instructions/storage.py
+++ b/src/ethereum/forks/dao_fork/vm/instructions/storage.py
@@ -13,13 +13,10 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import get_storage, set_storage
+from ...state_tracker import get_storage, set_storage
 from .. import Evm
 from ..gas import (
-    GAS_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -40,12 +37,11 @@ def sload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_SLOAD)
+    charge_gas(evm, GasCosts.SLOAD)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -68,20 +64,20 @@ def sstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    state = evm.message.block_env.state
-    current_value = get_storage(state, evm.message.current_target, key)
+    tx_state = evm.message.tx_env.state
+    current_value = get_storage(tx_state, evm.message.current_target, key)
     if new_value != 0 and current_value == 0:
-        gas_cost = GAS_STORAGE_SET
+        gas_cost = GasCosts.STORAGE_SET
     else:
-        gas_cost = GAS_STORAGE_UPDATE
+        gas_cost = GasCosts.COLD_STORAGE_WRITE
 
     if new_value == 0 and current_value != 0:
-        evm.refund_counter += REFUND_STORAGE_CLEAR
+        evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
     charge_gas(evm, gas_cost)
 
     # OPERATION
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
diff --git a/src/ethereum/forks/dao_fork/vm/instructions/system.py b/src/ethereum/forks/dao_fork/vm/instructions/system.py
index 75226650693..7fe3234231f 100644
--- a/src/ethereum/forks/dao_fork/vm/instructions/system.py
+++ b/src/ethereum/forks/dao_fork/vm/instructions/system.py
@@ -16,7 +16,7 @@
 
 from ethereum.state import Address
 
-from ...state import (
+from ...state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
     get_account,
@@ -32,10 +32,7 @@
     incorporate_child_on_success,
 )
 from ..gas import (
-    GAS_CALL,
-    GAS_CREATE,
-    GAS_ZERO,
-    REFUND_SELF_DESTRUCT,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -68,7 +65,7 @@ def create(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost)
 
     create_message_gas = evm.gas_left
     evm.gas_left = Uint(0)
@@ -76,12 +73,12 @@ def create(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -93,20 +90,16 @@ def create(evm: Evm) -> None:
         push(evm.stack, U256(0))
         evm.gas_left += create_message_gas
     elif account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
     else:
         call_data = memory_read_bytes(
             evm.memory, memory_start_position, memory_size
         )
 
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
         child_message = Message(
             block_env=evm.message.block_env,
@@ -157,7 +150,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -197,8 +190,8 @@ def generic_call(
     call_data = memory_read_bytes(
         evm.memory, memory_input_start_position, memory_input_size
     )
-    account_to_call = get_account(evm.message.block_env.state, code_address)
-    code = get_code(evm.message.block_env.state, account_to_call.code_hash)
+    account_to_call = get_account(evm.message.tx_env.state, code_address)
+    code = get_code(evm.message.tx_env.state, account_to_call.code_hash)
     child_message = Message(
         block_env=evm.message.block_env,
         tx_env=evm.message.tx_env,
@@ -262,14 +255,14 @@ def call(evm: Evm) -> None:
     code_address = to
 
     message_call_gas = calculate_message_call_gas(
-        evm.message.block_env.state, gas, to, value
+        evm.message.tx_env.state, gas, to, value
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -323,14 +316,14 @@ def callcode(evm: Evm) -> None:
         ],
     )
     message_call_gas = calculate_message_call_gas(
-        evm.message.block_env.state, gas, to, value
+        evm.message.tx_env.state, gas, to, value
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -368,7 +361,7 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_ZERO
+    gas_cost = GasCosts.ZERO
 
     originator = evm.message.current_target
 
@@ -379,28 +372,28 @@ def selfdestruct(evm: Evm) -> None:
         parent_evm = parent_evm.message.parent_evm
 
     if originator not in refunded_accounts:
-        evm.refund_counter += int(REFUND_SELF_DESTRUCT)
+        evm.refund_counter += int(GasCosts.REFUND_SELF_DESTRUCT)
 
     charge_gas(evm, gas_cost)
 
     # OPERATION
     beneficiary_balance = get_account(
-        evm.message.block_env.state, beneficiary
+        evm.message.tx_env.state, beneficiary
     ).balance
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     # First Transfer to beneficiary
     set_account_balance(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         beneficiary,
         beneficiary_balance + originator_balance,
     )
     # Next, Zero the balance of the address being deleted (must come after
     # sending to beneficiary in case the contract named itself as the
     # beneficiary).
-    set_account_balance(evm.message.block_env.state, originator, U256(0))
+    set_account_balance(evm.message.tx_env.state, originator, U256(0))
 
     # register account for deletion
     evm.accounts_to_delete.add(originator)
@@ -438,7 +431,7 @@ def delegatecall(evm: Evm) -> None:
             (memory_output_start_position, memory_output_size),
         ],
     )
-    charge_gas(evm, GAS_CALL + gas + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_CALL_BASE + gas + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/dao_fork/vm/interpreter.py b/src/ethereum/forks/dao_fork/vm/interpreter.py
index 4d26439da49..bdd65600275 100644
--- a/src/ethereum/forks/dao_fork/vm/interpreter.py
+++ b/src/ethereum/forks/dao_fork/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,18 +31,18 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
     touch_account,
 )
 from ..vm import Message
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -57,6 +57,7 @@
 STACK_DEPTH_LIMIT = Uint(1024)
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -94,12 +95,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -150,27 +151,33 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` call.
+    destroy_storage(tx_state, message.current_target)
 
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             charge_gas(evm, contract_code_gas)
         except ExceptionalHalt as error:
-            rollback_transaction(state)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -189,7 +196,7 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
@@ -212,13 +219,16 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
 
-    touch_account(state, message.current_target)
+    touch_account(tx_state, message.current_target)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -245,9 +255,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state)
-    else:
-        commit_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/dao_fork/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/dao_fork/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/dao_fork/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/dao_fork/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/dao_fork/vm/precompiled_contracts/identity.py b/src/ethereum/forks/dao_fork/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/dao_fork/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/dao_fork/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/dao_fork/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/dao_fork/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/dao_fork/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/dao_fork/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/dao_fork/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/dao_fork/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/dao_fork/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/dao_fork/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/frontier/blocks.py b/src/ethereum/forks/frontier/blocks.py
index b9fe4f377f5..b6a4db96624 100644
--- a/src/ethereum/forks/frontier/blocks.py
+++ b/src/ethereum/forks/frontier/blocks.py
@@ -10,18 +10,20 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.crypto.hash import Hash32
+from ethereum.state import Address, Root
 
-from .fork_types import Address, Bloom, Root
+from .fork_types import Bloom
 from .transactions import Transaction
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -60,13 +62,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.frontier.state.state_root
-    [Trie]: ref:ethereum.forks.frontier.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -76,8 +79,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.frontier.trie.root
-    [Trie]: ref:ethereum.forks.frontier.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -87,8 +90,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.frontier.trie.root
-    [Trie]: ref:ethereum.forks.frontier.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -157,6 +160,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -201,6 +205,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -233,6 +238,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/frontier/fork.py b/src/ethereum/forks/frontier/fork.py
index 5f062710138..820baf10184 100644
--- a/src/ethereum/forks/frontier/fork.py
+++ b/src/ethereum/forks/frontier/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Set, Tuple
+from typing import List, Set, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes32
@@ -27,19 +27,27 @@
     InvalidSenderError,
     NonceMismatchError,
 )
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt
 from .bloom import logs_bloom
-from .fork_types import EMPTY_CODE_HASH, Address
-from .state import (
-    State,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
     create_ether,
     destroy_account,
+    extract_block_diff,
     get_account,
+    incorporate_tx_into_block,
     increment_nonce,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
     Transaction,
@@ -47,17 +55,16 @@
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.message import prepare_message
+from .vm.gas import GasCosts
 from .vm.interpreter import process_message_call
 
 BLOCK_REWARD = U256(5 * 10**18)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 MINIMUM_DIFFICULTY = Uint(131072)
 MAX_OMMER_DEPTH = Uint(6)
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -159,9 +166,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     validate_header(chain, block.header)
     validate_ommers(block.ommers, block.header, chain)
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -175,7 +184,12 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         ommers=block.ommers,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes,
+        block_diff.storage_changes,
+        block_diff.storage_clears,
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -193,6 +207,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block_logs_bloom != block.header.bloom:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -341,6 +356,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Address:
     """
     Check if the transaction is includable in the block.
@@ -353,6 +369,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -375,7 +393,7 @@ def check_transaction(
     if tx.gas > gas_available:
         raise GasUsedExceedsLimitError("gas used exceeds limit")
     sender_address = recover_sender(tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     max_gas_fee = tx.gas * tx.gas_price
 
@@ -461,7 +479,7 @@ def apply_body(
     for i, tx in enumerate(transactions):
         process_transaction(block_env, block_output, tx, Uint(i))
 
-    pay_rewards(block_env.state, block_env.number, block_env.coinbase, ommers)
+    pay_rewards(block_env, ommers)
 
     return block_output
 
@@ -543,9 +561,7 @@ def validate_ommers(
 
 
 def pay_rewards(
-    state: State,
-    block_number: Uint,
-    coinbase: Address,
+    block_env: vm.BlockEnvironment,
     ommers: Tuple[Header, ...],
 ) -> None:
     """
@@ -564,25 +580,24 @@ def pay_rewards(
 
     Parameters
     ----------
-    state :
-        Current account state.
-    block_number :
-        Position of the block within the chain.
-    coinbase :
-        Address of account which receives block reward and transaction fees.
+    block_env :
+        The block scoped environment.
     ommers :
         List of ommers mentioned in the current block.
 
     """
+    rewards_state = TransactionState(parent=block_env.state)
     ommer_count = U256(len(ommers))
     miner_reward = BLOCK_REWARD + (ommer_count * (BLOCK_REWARD // U256(32)))
-    create_ether(state, coinbase, miner_reward)
+    create_ether(rewards_state, block_env.coinbase, miner_reward)
 
     for ommer in ommers:
         # Ommer age with respect to the current block.
-        ommer_age = U256(block_number - ommer.number)
+        ommer_age = U256(block_env.number - ommer.number)
         ommer_miner_reward = ((U256(8) - ommer_age) * BLOCK_REWARD) // U256(8)
-        create_ether(state, ommer.coinbase, ommer_miner_reward)
+        create_ether(rewards_state, ommer.coinbase, ommer_miner_reward)
+
+    incorporate_tx_into_block(rewards_state)
 
 
 def process_transaction(
@@ -615,6 +630,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(block_output.transactions_trie, rlp.encode(Uint(index)), tx)
     intrinsic_gas = validate_transaction(tx)
 
@@ -622,23 +639,23 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     gas_fee = tx.gas * tx.gas_price
     sender_balance_after_gas_fee = Uint(sender_account.balance) - gas_fee
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     tx_env = vm.TransactionEnvironment(
         origin=sender,
         gas_price=tx.gas_price,
         gas=gas,
+        state=tx_state,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
     )
@@ -658,26 +675,30 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * tx.gas_price
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
-    coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
-    ).balance + U256(transaction_fee)
-    set_account_balance(
-        block_env.state, block_env.coinbase, coinbase_balance_after_mining_fee
-    )
+    create_ether(tx_state, block_env.coinbase, U256(transaction_fee))
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
     block_output.block_gas_used += tx_gas_used_after_refund
 
+    incorporate_tx_into_block(tx_state)
+
+    block_state = block_env.state
+    block_diff = extract_block_diff(block_state)
+    intermediate_state_root, _ = (
+        block_state.pre_state.compute_state_root_and_trie_changes(
+            block_diff.account_changes,
+            block_diff.storage_changes,
+            block_diff.storage_clears,
+        )
+    )
+
     receipt = make_receipt(
-        state_root(block_env.state),
+        intermediate_state_root,
         block_output.block_gas_used,
         tx_output.logs,
     )
@@ -700,14 +721,14 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
-    passed through as a parameter is greater than or equal to the *sum* of
-    the parent's gas and the adjustment delta then the limit for gas is too
-    high and fails this function's check. Similarly, if the limit is less
-    than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
-    check fails because the gas limit doesn't allow for a sufficient or
-    reasonable amount of gas to be used on a block.
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is passed
+    through as a parameter is greater than or equal to the *sum* of the
+    parent's gas and the adjustment delta then the limit for gas is too high
+    and fails this function's check. Similarly, if the limit is less than or
+    equal to the *difference* of the parent's gas and the adjustment delta *or*
+    the predefined ``LIMIT_MINIMUM`` then this function's check fails because
+    the gas limit doesn't allow for a sufficient or reasonable amount of gas to
+    be used on a block.
 
     Parameters
     ----------
@@ -723,12 +744,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/frontier/fork_types.py b/src/ethereum/forks/frontier/fork_types.py
index ae4525bbbdd..02907cd2a1a 100644
--- a/src/ethereum/forks/frontier/fork_types.py
+++ b/src/ethereum/forks/frontier/fork_types.py
@@ -11,41 +11,13 @@
 Types reused throughout the specification, which are specific to Ethereum.
 """
 
-from dataclasses import dataclass
-
 from ethereum_rlp import rlp
-from ethereum_types.bytes import Bytes, Bytes20, Bytes256
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
+from ethereum_types.bytes import Bytes, Bytes256
 
-Address = Bytes20
-Root = Hash32
+from ethereum.state import Account
 
 Bloom = Bytes256
 
-EMPTY_CODE_HASH = keccak256(b"")
-
-
-@slotted_freezable
-@dataclass
-class Account:
-    """
-    State associated with an address.
-    """
-
-    nonce: Uint
-    balance: U256
-    code_hash: Hash32
-
-
-EMPTY_ACCOUNT = Account(
-    nonce=Uint(0),
-    balance=U256(0),
-    code_hash=EMPTY_CODE_HASH,
-)
-
 
 def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     """
diff --git a/src/ethereum/forks/frontier/state.py b/src/ethereum/forks/frontier/state.py
deleted file mode 100644
index 69f5cca8dc0..00000000000
--- a/src/ethereum/forks/frontier/state.py
+++ /dev/null
@@ -1,543 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, List, Optional, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-
-from .fork_types import EMPTY_ACCOUNT, EMPTY_CODE_HASH, Account, Address, Root
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state._code_store
-
-
-def begin_transaction(state: State) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-
-
-def commit_transaction(state: State) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.pop()
-
-
-def rollback_transaction(state: State) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State``.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def touch_account(state: State, address: Address) -> None:
-    """
-    Initializes an account to state.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        The address of the account that needs to be initialized.
-
-    """
-    if not account_exists(state, address):
-        set_account(state, address, EMPTY_ACCOUNT)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def create_ether(state: State, address: Address, amount: U256) -> None:
-    """
-    Add newly created ether to an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to which ether is added.
-    amount:
-        The amount of ether to be added to the account of interest.
-
-    """
-
-    def increase_balance(account: Account) -> None:
-        account.balance += amount
-
-    modify_state(state, address, increase_balance)
diff --git a/src/ethereum/forks/frontier/state_tracker.py b/src/ethereum/forks/frontier/state_tracker.py
new file mode 100644
index 00000000000..24362ecff98
--- /dev/null
+++ b/src/ethereum/forks/frontier/state_tracker.py
@@ -0,0 +1,805 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+
+    ``storage_clears`` records addresses whose storage was wiped by
+    a pre-EIP-6780 ``SELFDESTRUCT`` earlier in the block, so later
+    reads must not fall back to ``pre_state`` storage.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    storage_clears: Set[Address] = field(default_factory=set)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    storage_clears: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.storage_clears:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if address in tx_state.storage_clears:
+        return False
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    if address in tx_state.parent.storage_clears:
+        return False
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+    tx_state.storage_clears.add(address)
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        storage_clears=set(tx_state.storage_clears),
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.storage_clears = snapshot.storage_clears
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address in tx_state.storage_clears:
+        block.storage_clears.add(address)
+        block.storage_writes.pop(address, None)
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.storage_clears.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+        storage_clears=block_state.storage_clears,
+    )
+
+
+def destroy_touched_empty_accounts(
+    tx_state: TransactionState, touched_accounts: Set[Address]
+) -> None:
+    """
+    Destroy all touched accounts that are empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    touched_accounts :
+        All the accounts that have been touched in the current transaction.
+
+    """
+    for address in touched_accounts:
+        if account_exists_and_is_empty(tx_state, address):
+            destroy_account(tx_state, address)
+
+
+def touch_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Initialize an account to state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be initialized.
+
+    """
+    if not account_exists(tx_state, address):
+        set_account(tx_state, address, EMPTY_ACCOUNT)
diff --git a/src/ethereum/forks/frontier/transactions.py b/src/ethereum/forks/frontier/transactions.py
index 32be1dcdf0a..831818542dd 100644
--- a/src/ethereum/forks/frontier/transactions.py
+++ b/src/ethereum/forks/frontier/transactions.py
@@ -5,6 +5,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0
@@ -18,26 +19,10 @@
     InvalidSignatureError,
     NonceOverflowError,
 )
-
-from .fork_types import Address
-
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_PER_NON_ZERO = Uint(68)
-"""
-Gas cost per non-zero byte in the transaction data.
-"""
-
-GAS_TX_DATA_PER_ZERO = Uint(4)
-"""
-Gas cost per zero byte in the transaction data.
-"""
+from ethereum.state import Address
 
 
+@final
 @slotted_freezable
 @dataclass
 class Transaction:
@@ -138,20 +123,22 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
 
     This function takes a transaction as a parameter and returns the intrinsic
     gas cost of the transaction.
     """
+    from .vm.gas import GasCosts
+
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
     data_cost = (
-        num_zeros * GAS_TX_DATA_PER_ZERO
-        + num_non_zeros * GAS_TX_DATA_PER_NON_ZERO
+        num_zeros * GasCosts.TX_DATA_PER_ZERO
+        + num_non_zeros * GasCosts.TX_DATA_PER_NON_ZERO
     )
 
-    return GAS_TX_BASE + data_cost
+    return GasCosts.TX_BASE + data_cost
 
 
 def recover_sender(tx: Transaction) -> Address:
diff --git a/src/ethereum/forks/frontier/trie.py b/src/ethereum/forks/frontier/trie.py
deleted file mode 100644
index 55cb19a570d..00000000000
--- a/src/ethereum/forks/frontier/trie.py
+++ /dev/null
@@ -1,499 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    assert_type,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import keccak256
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt
-from .fork_types import Account, Address, Root, encode_account
-from .transactions import Transaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = Account | Bytes | Transaction | Receipt | Uint | U256 | None
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[Transaction],
-    Optional[Receipt],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `rlp.RLP`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (Transaction, Receipt, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        raise AssertionError(
-            f"encoding for {type(node)} is not currently implemented"
-        )
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/frontier/utils/hexadecimal.py b/src/ethereum/forks/frontier/utils/hexadecimal.py
index a3701b48a20..cefa7b4e893 100644
--- a/src/ethereum/forks/frontier/utils/hexadecimal.py
+++ b/src/ethereum/forks/frontier/utils/hexadecimal.py
@@ -14,11 +14,9 @@
 
 from ethereum_types.bytes import Bytes
 
-from ethereum.state import Address
+from ethereum.state import Address, Root
 from ethereum.utils.hexadecimal import remove_hex_prefix
 
-from ..fork_types import Root
-
 
 def hex_to_root(hex_string: str) -> Root:
     """
diff --git a/src/ethereum/forks/frontier/utils/message.py b/src/ethereum/forks/frontier/utils/message.py
index 9da2edea5e7..4579edd3447 100644
--- a/src/ethereum/forks/frontier/utils/message.py
+++ b/src/ethereum/forks/frontier/utils/message.py
@@ -16,7 +16,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from .address import compute_contract_address
@@ -48,7 +48,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -56,8 +56,8 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        account = get_account(block_env.state, tx.to)
-        code = get_code(block_env.state, account.code_hash)
+        account = get_account(tx_env.state, tx.to)
+        code = get_code(tx_env.state, account.code_hash)
 
         code_address = tx.to
     else:
diff --git a/src/ethereum/forks/frontier/vm/__init__.py b/src/ethereum/forks/frontier/vm/__init__.py
index e4673225bc0..f9d29c975da 100644
--- a/src/ethereum/forks/frontier/vm/__init__.py
+++ b/src/ethereum/forks/frontier/vm/__init__.py
@@ -13,23 +13,24 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt
-from ..state import State
+from ..state_tracker import BlockState, TransactionState
 from ..transactions import Transaction
-from ..trie import Trie
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -37,7 +38,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -46,6 +47,7 @@ class BlockEnvironment:
     difficulty: Uint
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -77,19 +79,22 @@ class BlockOutput:
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
     gas_price: Uint
     gas: Uint
+    state: TransactionState
     index_in_block: Uint
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -110,6 +115,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
diff --git a/src/ethereum/forks/frontier/vm/gas.py b/src/ethereum/forks/frontier/vm/gas.py
index 3c60482255b..6090e913e52 100644
--- a/src/ethereum/forks/frontier/vm/gas.py
+++ b/src/ethereum/forks/frontier/vm/gas.py
@@ -12,57 +12,140 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 
 from ethereum.state import Address
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32
 
-from ..state import State, account_exists
+from ..state_tracker import TransactionState, account_exists
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_SLOAD = Uint(50)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 15000
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(10)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_EXTERNAL = Uint(20)
-GAS_BALANCE = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_CALL = Uint(40)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-REFUND_SELF_DESTRUCT = Uint(24000)
-GAS_ECRECOVER = Uint(3000)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    SLOAD: Final[Uint] = Uint(50)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 15000
+    REFUND_SELF_DESTRUCT: Final[Uint] = Uint(24000)
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_DATA_PER_ZERO: Final[Uint] = Uint(4)
+    TX_DATA_PER_NON_ZERO: Final[Uint] = Uint(68)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_DIFFICULTY: Final[Uint] = BASE
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(10)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_EXTERNAL_BASE: Final[Uint] = Uint(20)
+    OPCODE_BALANCE: Final[Uint] = Uint(20)
+    OPCODE_CALL_BASE: Final[Uint] = Uint(40)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -78,11 +161,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -134,7 +218,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -164,7 +248,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -184,7 +268,7 @@ def calculate_gas_extend_memory(
 
 
 def calculate_message_call_gas(
-    state: State, gas: Uint, to: Address, value: U256
+    state: TransactionState, gas: Uint, to: Address, value: U256
 ) -> MessageCallGas:
     """
     Calculates the gas amount for executing Opcodes `CALL` and `CALLCODE`.
@@ -205,8 +289,12 @@ def calculate_message_call_gas(
     message_call_gas: `MessageCallGas`
 
     """
-    create_gas_cost = Uint(0) if account_exists(state, to) else GAS_NEW_ACCOUNT
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
-    cost = GAS_CALL + gas + create_gas_cost + transfer_gas_cost
-    stipend = gas if value == 0 else GAS_CALL_STIPEND + gas
+    create_gas_cost = (
+        Uint(0) if account_exists(state, to) else GasCosts.NEW_ACCOUNT
+    )
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
+    cost = (
+        GasCosts.OPCODE_CALL_BASE + gas + create_gas_cost + transfer_gas_cost
+    )
+    stipend = gas if value == 0 else GasCosts.CALL_STIPEND + gas
     return MessageCallGas(cost, stipend)
diff --git a/src/ethereum/forks/frontier/vm/instructions/arithmetic.py b/src/ethereum/forks/frontier/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/frontier/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/frontier/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/frontier/vm/instructions/bitwise.py b/src/ethereum/forks/frontier/vm/instructions/bitwise.py
index 2a506f55751..62da98041ad 100644
--- a/src/ethereum/forks/frontier/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/frontier/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
diff --git a/src/ethereum/forks/frontier/vm/instructions/block.py b/src/ethereum/forks/frontier/vm/instructions/block.py
index 0edcbf000d1..fbca7daa37c 100644
--- a/src/ethereum/forks/frontier/vm/instructions/block.py
+++ b/src/ethereum/forks/frontier/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -33,7 +33,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -75,7 +75,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -102,7 +102,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -128,7 +128,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -154,7 +154,7 @@ def difficulty(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_DIFFICULTY)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.difficulty))
@@ -180,7 +180,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
diff --git a/src/ethereum/forks/frontier/vm/instructions/comparison.py b/src/ethereum/forks/frontier/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/frontier/vm/instructions/comparison.py
+++ b/src/ethereum/forks/frontier/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/frontier/vm/instructions/control_flow.py b/src/ethereum/forks/frontier/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/frontier/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/frontier/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/frontier/vm/instructions/environment.py b/src/ethereum/forks/frontier/vm/instructions/environment.py
index 83eb5528226..d85aaf0c97a 100644
--- a/src/ethereum/forks/frontier/vm/instructions/environment.py
+++ b/src/ethereum/forks/frontier/vm/instructions/environment.py
@@ -15,16 +15,12 @@
 
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..gas import (
-    GAS_BALANCE,
-    GAS_BASE,
-    GAS_COPY,
-    GAS_EXTERNAL,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -45,7 +41,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -68,11 +64,12 @@ def balance(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BALANCE)
+    charge_gas(evm, GasCosts.OPCODE_BALANCE)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -95,7 +92,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -118,7 +115,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -141,7 +138,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -165,7 +162,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -190,7 +187,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -219,11 +216,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -248,7 +248,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -277,11 +277,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -306,7 +309,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -329,11 +332,12 @@ def extcodesize(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_EXTERNAL)
+    charge_gas(evm, GasCosts.OPCODE_EXTERNAL_BASE)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -360,16 +364,20 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_EXTERNAL + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_EXTERNAL_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
diff --git a/src/ethereum/forks/frontier/vm/instructions/keccak.py b/src/ethereum/forks/frontier/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/frontier/vm/instructions/keccak.py
+++ b/src/ethereum/forks/frontier/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/frontier/vm/instructions/log.py b/src/ethereum/forks/frontier/vm/instructions/log.py
index 76c02e737a4..3cfb69c194c 100644
--- a/src/ethereum/forks/frontier/vm/instructions/log.py
+++ b/src/ethereum/forks/frontier/vm/instructions/log.py
@@ -12,15 +12,14 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
 from ...blocks import Log
 from .. import Evm
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -58,9 +57,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -78,8 +77,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/frontier/vm/instructions/memory.py b/src/ethereum/forks/frontier/vm/instructions/memory.py
index 3a242ba2f7a..93861811559 100644
--- a/src/ethereum/forks/frontier/vm/instructions/memory.py
+++ b/src/ethereum/forks/frontier/vm/instructions/memory.py
@@ -16,8 +16,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,7 +45,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -77,7 +76,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -105,7 +104,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -132,7 +131,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
diff --git a/src/ethereum/forks/frontier/vm/instructions/stack.py b/src/ethereum/forks/frontier/vm/instructions/stack.py
index 0fc0d3fe4b5..901bff4ed3b 100644
--- a/src/ethereum/forks/frontier/vm/instructions/stack.py
+++ b/src/ethereum/forks/frontier/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -62,7 +66,7 @@ def push_n(evm: Evm, num_bytes: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -92,7 +96,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -124,7 +128,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -136,69 +140,69 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/frontier/vm/instructions/storage.py b/src/ethereum/forks/frontier/vm/instructions/storage.py
index 8748340fc27..16921a1a7fb 100644
--- a/src/ethereum/forks/frontier/vm/instructions/storage.py
+++ b/src/ethereum/forks/frontier/vm/instructions/storage.py
@@ -13,13 +13,10 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import get_storage, set_storage
+from ...state_tracker import get_storage, set_storage
 from .. import Evm
 from ..gas import (
-    GAS_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -40,12 +37,11 @@ def sload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_SLOAD)
+    charge_gas(evm, GasCosts.SLOAD)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -68,20 +64,20 @@ def sstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    state = evm.message.block_env.state
-    current_value = get_storage(state, evm.message.current_target, key)
+    tx_state = evm.message.tx_env.state
+    current_value = get_storage(tx_state, evm.message.current_target, key)
     if new_value != 0 and current_value == 0:
-        gas_cost = GAS_STORAGE_SET
+        gas_cost = GasCosts.STORAGE_SET
     else:
-        gas_cost = GAS_STORAGE_UPDATE
+        gas_cost = GasCosts.COLD_STORAGE_WRITE
 
     if new_value == 0 and current_value != 0:
-        evm.refund_counter += REFUND_STORAGE_CLEAR
+        evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
     charge_gas(evm, gas_cost)
 
     # OPERATION
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
diff --git a/src/ethereum/forks/frontier/vm/instructions/system.py b/src/ethereum/forks/frontier/vm/instructions/system.py
index 41c3b22d3e2..cf978c5a295 100644
--- a/src/ethereum/forks/frontier/vm/instructions/system.py
+++ b/src/ethereum/forks/frontier/vm/instructions/system.py
@@ -16,7 +16,7 @@
 
 from ethereum.state import Address
 
-from ...state import (
+from ...state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
     get_account,
@@ -32,9 +32,7 @@
     incorporate_child_on_success,
 )
 from ..gas import (
-    GAS_CREATE,
-    GAS_ZERO,
-    REFUND_SELF_DESTRUCT,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -67,7 +65,7 @@ def create(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost)
 
     create_message_gas = evm.gas_left
     evm.gas_left = Uint(0)
@@ -75,12 +73,12 @@ def create(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -92,20 +90,16 @@ def create(evm: Evm) -> None:
         push(evm.stack, U256(0))
         evm.gas_left += create_message_gas
     elif account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
     else:
         call_data = memory_read_bytes(
             evm.memory, memory_start_position, memory_size
         )
 
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
         child_message = Message(
             block_env=evm.message.block_env,
@@ -155,7 +149,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -194,8 +188,8 @@ def generic_call(
     call_data = memory_read_bytes(
         evm.memory, memory_input_start_position, memory_input_size
     )
-    account_to_call = get_account(evm.message.block_env.state, code_address)
-    code = get_code(evm.message.block_env.state, account_to_call.code_hash)
+    account_to_call = get_account(evm.message.tx_env.state, code_address)
+    code = get_code(evm.message.tx_env.state, account_to_call.code_hash)
     child_message = Message(
         block_env=evm.message.block_env,
         tx_env=evm.message.tx_env,
@@ -258,14 +252,14 @@ def call(evm: Evm) -> None:
     code_address = to
 
     message_call_gas = calculate_message_call_gas(
-        evm.message.block_env.state, gas, to, value
+        evm.message.tx_env.state, gas, to, value
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -318,14 +312,14 @@ def callcode(evm: Evm) -> None:
         ],
     )
     message_call_gas = calculate_message_call_gas(
-        evm.message.block_env.state, gas, to, value
+        evm.message.tx_env.state, gas, to, value
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -362,7 +356,7 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_ZERO
+    gas_cost = GasCosts.ZERO
 
     originator = evm.message.current_target
 
@@ -373,28 +367,28 @@ def selfdestruct(evm: Evm) -> None:
         parent_evm = parent_evm.message.parent_evm
 
     if originator not in refunded_accounts:
-        evm.refund_counter += int(REFUND_SELF_DESTRUCT)
+        evm.refund_counter += int(GasCosts.REFUND_SELF_DESTRUCT)
 
     charge_gas(evm, gas_cost)
 
     # OPERATION
     beneficiary_balance = get_account(
-        evm.message.block_env.state, beneficiary
+        evm.message.tx_env.state, beneficiary
     ).balance
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     # First Transfer to beneficiary
     set_account_balance(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         beneficiary,
         beneficiary_balance + originator_balance,
     )
     # Next, Zero the balance of the address being deleted (must come after
     # sending to beneficiary in case the contract named itself as the
     # beneficiary).
-    set_account_balance(evm.message.block_env.state, originator, U256(0))
+    set_account_balance(evm.message.tx_env.state, originator, U256(0))
 
     # register account for deletion
     evm.accounts_to_delete.add(originator)
diff --git a/src/ethereum/forks/frontier/vm/interpreter.py b/src/ethereum/forks/frontier/vm/interpreter.py
index 842207405fa..00a7c52c0db 100644
--- a/src/ethereum/forks/frontier/vm/interpreter.py
+++ b/src/ethereum/forks/frontier/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,18 +31,18 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
     touch_account,
 )
 from ..vm import Message
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -57,6 +57,7 @@
 STACK_DEPTH_LIMIT = Uint(1024)
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -94,12 +95,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -150,25 +151,31 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` call.
+    destroy_storage(tx_state, message.current_target)
 
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             charge_gas(evm, contract_code_gas)
         except ExceptionalHalt:
             evm.output = b""
         else:
-            set_code(state, message.current_target, contract_code)
-        commit_transaction(state)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -187,7 +194,7 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
@@ -210,13 +217,16 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
 
-    touch_account(state, message.current_target)
+    touch_account(tx_state, message.current_target)
 
     if message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -243,9 +253,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state)
-    else:
-        commit_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/frontier/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/frontier/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/frontier/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/frontier/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/frontier/vm/precompiled_contracts/identity.py b/src/ethereum/forks/frontier/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/frontier/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/frontier/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/frontier/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/frontier/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/frontier/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/frontier/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/frontier/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/frontier/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/frontier/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/frontier/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/gray_glacier/__init__.py b/src/ethereum/forks/gray_glacier/__init__.py
index c16a952fb9b..36432ca55b3 100644
--- a/src/ethereum/forks/gray_glacier/__init__.py
+++ b/src/ethereum/forks/gray_glacier/__init__.py
@@ -23,7 +23,7 @@
 
 [EIP-5133]: https://eips.ethereum.org/EIPS/eip-5133
 [Geth 1.10.19]: https://github.com/ethereum/go-ethereum/releases/tag/v1.10.19
-[Besu 22.4.3]: https://github.com/hyperledger/besu/releases/tag/22.4.3
+[Besu 22.4.3]: https://github.com/besu-eth/besu/releases/tag/22.4.3
 [e]: https://github.com/ledgerwatch/erigon/releases/tag/v2022.06.03
 [js]: https://github.com/ethereumjs/ethereumjs-monorepo/releases/tag/@ethereumjs/vm@5.9.3
 [n]: https://github.com/NethermindEth/nethermind/releases/tag/1.13.3
diff --git a/src/ethereum/forks/gray_glacier/blocks.py b/src/ethereum/forks/gray_glacier/blocks.py
index 0b0ec871bfb..e36a9a38aba 100644
--- a/src/ethereum/forks/gray_glacier/blocks.py
+++ b/src/ethereum/forks/gray_glacier/blocks.py
@@ -10,7 +10,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
@@ -29,6 +29,7 @@
 )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -70,13 +71,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.gray_glacier.state.state_root
-    [Trie]: ref:ethereum.forks.gray_glacier.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -86,8 +88,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.gray_glacier.trie.root
-    [Trie]: ref:ethereum.forks.gray_glacier.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -97,8 +99,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.gray_glacier.trie.root
-    [Trie]: ref:ethereum.forks.gray_glacier.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -182,6 +184,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -228,6 +231,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -260,6 +264,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/gray_glacier/fork.py b/src/ethereum/forks/gray_glacier/fork.py
index 301fdb2cd05..78a88531754 100644
--- a/src/ethereum/forks/gray_glacier/fork.py
+++ b/src/ethereum/forks/gray_glacier/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
@@ -28,7 +28,13 @@
     InvalidSenderError,
     NonceMismatchError,
 )
-from ethereum.state import EMPTY_CODE_HASH
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt, encode_receipt
@@ -37,17 +43,18 @@
     InsufficientMaxFeePerGasError,
     PriorityFeeGreaterThanMaxFeeError,
 )
-from .fork_types import Address
-from .state import (
-    State,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
     account_exists_and_is_empty,
     create_ether,
     destroy_account,
     destroy_touched_empty_accounts,
+    extract_block_diff,
     get_account,
+    incorporate_tx_into_block,
     increment_nonce,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
     AccessListTransaction,
@@ -60,21 +67,20 @@
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.message import prepare_message
+from .vm.gas import GasCosts
 from .vm.interpreter import process_message_call
 
 BLOCK_REWARD = U256(2 * 10**18)
 BASE_FEE_MAX_CHANGE_DENOMINATOR = Uint(8)
 ELASTICITY_MULTIPLIER = Uint(2)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 MINIMUM_DIFFICULTY = Uint(131072)
 MAX_OMMER_DEPTH = Uint(6)
 BOMB_DELAY_BLOCKS = 11400000
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -176,9 +182,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     validate_header(chain, block.header)
     validate_ommers(block.ommers, block.header, chain)
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -193,7 +201,12 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         ommers=block.ommers,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes,
+        block_diff.storage_changes,
+        block_diff.storage_clears,
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -211,6 +224,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block_logs_bloom != block.header.bloom:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -432,6 +446,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Tuple[Address, Uint]:
     """
     Check if the transaction is includable in the block.
@@ -444,6 +459,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -474,7 +491,7 @@ def check_transaction(
     if tx.gas > gas_available:
         raise GasUsedExceedsLimitError("gas used exceeds limit")
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     if isinstance(tx, FeeMarketTransaction):
         if tx.max_fee_per_gas < tx.max_priority_fee_per_gas:
@@ -583,7 +600,7 @@ def apply_body(
     for i, tx in enumerate(map(decode_transaction, transactions)):
         process_transaction(block_env, block_output, tx, Uint(i))
 
-    pay_rewards(block_env.state, block_env.number, block_env.coinbase, ommers)
+    pay_rewards(block_env, ommers)
 
     return block_output
 
@@ -665,9 +682,7 @@ def validate_ommers(
 
 
 def pay_rewards(
-    state: State,
-    block_number: Uint,
-    coinbase: Address,
+    block_env: vm.BlockEnvironment,
     ommers: Tuple[Header, ...],
 ) -> None:
     """
@@ -686,25 +701,24 @@ def pay_rewards(
 
     Parameters
     ----------
-    state :
-        Current account state.
-    block_number :
-        Position of the block within the chain.
-    coinbase :
-        Address of account which receives block reward and transaction fees.
+    block_env :
+        The block scoped environment.
     ommers :
         List of ommers mentioned in the current block.
 
     """
+    rewards_state = TransactionState(parent=block_env.state)
     ommer_count = U256(len(ommers))
     miner_reward = BLOCK_REWARD + (ommer_count * (BLOCK_REWARD // U256(32)))
-    create_ether(state, coinbase, miner_reward)
+    create_ether(rewards_state, block_env.coinbase, miner_reward)
 
     for ommer in ommers:
         # Ommer age with respect to the current block.
-        ommer_age = U256(block_number - ommer.number)
+        ommer_age = U256(block_env.number - ommer.number)
         ommer_miner_reward = ((U256(8) - ommer_age) * BLOCK_REWARD) // U256(8)
-        create_ether(state, ommer.coinbase, ommer_miner_reward)
+        create_ether(rewards_state, ommer.coinbase, ommer_miner_reward)
+
+    incorporate_tx_into_block(rewards_state)
 
 
 def process_transaction(
@@ -737,6 +751,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(
         block_output.transactions_trie,
         rlp.encode(index),
@@ -752,21 +768,20 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     effective_gas_fee = tx.gas * effective_gas_price
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     sender_balance_after_gas_fee = (
         Uint(sender_account.balance) - effective_gas_fee
     )
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     access_list_addresses = set()
     access_list_storage_keys = set()
@@ -782,6 +797,7 @@ def process_transaction(
         gas=gas,
         access_list_addresses=access_list_addresses,
         access_list_storage_keys=access_list_storage_keys,
+        state=tx_state,
         index_in_block=index,
         tx_hash=get_transaction_hash(encode_transaction(tx)),
     )
@@ -803,28 +819,25 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * priority_fee_per_gas
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
     coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
+        tx_state, block_env.coinbase
     ).balance + U256(transaction_fee)
     if coinbase_balance_after_mining_fee != 0:
         set_account_balance(
-            block_env.state,
+            tx_state,
             block_env.coinbase,
             coinbase_balance_after_mining_fee,
         )
-    elif account_exists_and_is_empty(block_env.state, block_env.coinbase):
-        destroy_account(block_env.state, block_env.coinbase)
+    elif account_exists_and_is_empty(tx_state, block_env.coinbase):
+        destroy_account(tx_state, block_env.coinbase)
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
-    destroy_touched_empty_accounts(block_env.state, tx_output.touched_accounts)
+    destroy_touched_empty_accounts(tx_state, tx_output.touched_accounts)
 
     block_output.block_gas_used += tx_gas_used_after_refund
 
@@ -843,6 +856,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
     """
@@ -850,12 +865,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
     passed through as a parameter is greater than or equal to the *sum* of
     the parent's gas and the adjustment delta then the limit for gas is too
     high and fails this function's check. Similarly, if the limit is less
     than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
+    delta *or* the predefined ``LIMIT_MINIMUM`` then this function's
     check fails because the gas limit doesn't allow for a sufficient or
     reasonable amount of gas to be used on a block.
 
@@ -873,12 +888,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/gray_glacier/fork_types.py b/src/ethereum/forks/gray_glacier/fork_types.py
index ae4525bbbdd..02907cd2a1a 100644
--- a/src/ethereum/forks/gray_glacier/fork_types.py
+++ b/src/ethereum/forks/gray_glacier/fork_types.py
@@ -11,41 +11,13 @@
 Types reused throughout the specification, which are specific to Ethereum.
 """
 
-from dataclasses import dataclass
-
 from ethereum_rlp import rlp
-from ethereum_types.bytes import Bytes, Bytes20, Bytes256
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
+from ethereum_types.bytes import Bytes, Bytes256
 
-Address = Bytes20
-Root = Hash32
+from ethereum.state import Account
 
 Bloom = Bytes256
 
-EMPTY_CODE_HASH = keccak256(b"")
-
-
-@slotted_freezable
-@dataclass
-class Account:
-    """
-    State associated with an address.
-    """
-
-    nonce: Uint
-    balance: U256
-    code_hash: Hash32
-
-
-EMPTY_ACCOUNT = Account(
-    nonce=Uint(0),
-    balance=U256(0),
-    code_hash=EMPTY_CODE_HASH,
-)
-
 
 def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     """
diff --git a/src/ethereum/forks/gray_glacier/state.py b/src/ethereum/forks/gray_glacier/state.py
deleted file mode 100644
index ce3e80c53fb..00000000000
--- a/src/ethereum/forks/gray_glacier/state.py
+++ /dev/null
@@ -1,672 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, Iterable, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-
-from .fork_types import EMPTY_ACCOUNT, EMPTY_CODE_HASH, Account, Address, Root
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-
-
-def begin_transaction(state: State) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-
-
-def commit_transaction(state: State) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-
-def rollback_transaction(state: State) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State``.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def account_exists_and_is_empty(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists and has zero nonce, empty code and zero
-    balance.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    exists_and_is_empty : `bool`
-        True if an account exists and has zero nonce, empty code and zero
-        balance, False otherwise.
-
-    """
-    account = get_account_optional(state, address)
-    return (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def touch_account(state: State, address: Address) -> None:
-    """
-    Initializes an account to state.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        The address of the account that needs to be initialized.
-
-    """
-    if not account_exists(state, address):
-        set_account(state, address, EMPTY_ACCOUNT)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def create_ether(state: State, address: Address, amount: U256) -> None:
-    """
-    Add newly created ether to an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to which ether is added.
-    amount:
-        The amount of ether to be added to the account of interest.
-
-    """
-
-    def increase_balance(account: Account) -> None:
-        account.balance += amount
-
-    modify_state(state, address, increase_balance)
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
-
-
-def destroy_touched_empty_accounts(
-    state: State, touched_accounts: Iterable[Address]
-) -> None:
-    """
-    Destroy all touched accounts that are empty.
-
-    Parameters
-    ----------
-    state: `State`
-        The current state.
-    touched_accounts: `Iterable[Address]`
-        All the accounts that have been touched in the current transaction.
-
-    """
-    for address in touched_accounts:
-        if account_exists_and_is_empty(state, address):
-            destroy_account(state, address)
diff --git a/src/ethereum/forks/gray_glacier/state_tracker.py b/src/ethereum/forks/gray_glacier/state_tracker.py
new file mode 100644
index 00000000000..24362ecff98
--- /dev/null
+++ b/src/ethereum/forks/gray_glacier/state_tracker.py
@@ -0,0 +1,805 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+
+    ``storage_clears`` records addresses whose storage was wiped by
+    a pre-EIP-6780 ``SELFDESTRUCT`` earlier in the block, so later
+    reads must not fall back to ``pre_state`` storage.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    storage_clears: Set[Address] = field(default_factory=set)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    storage_clears: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.storage_clears:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if address in tx_state.storage_clears:
+        return False
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    if address in tx_state.parent.storage_clears:
+        return False
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+    tx_state.storage_clears.add(address)
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        storage_clears=set(tx_state.storage_clears),
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.storage_clears = snapshot.storage_clears
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address in tx_state.storage_clears:
+        block.storage_clears.add(address)
+        block.storage_writes.pop(address, None)
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.storage_clears.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+        storage_clears=block_state.storage_clears,
+    )
+
+
+def destroy_touched_empty_accounts(
+    tx_state: TransactionState, touched_accounts: Set[Address]
+) -> None:
+    """
+    Destroy all touched accounts that are empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    touched_accounts :
+        All the accounts that have been touched in the current transaction.
+
+    """
+    for address in touched_accounts:
+        if account_exists_and_is_empty(tx_state, address):
+            destroy_account(tx_state, address)
+
+
+def touch_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Initialize an account to state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be initialized.
+
+    """
+    if not account_exists(tx_state, address):
+        set_account(tx_state, address, EMPTY_ACCOUNT)
diff --git a/src/ethereum/forks/gray_glacier/transactions.py b/src/ethereum/forks/gray_glacier/transactions.py
index ca951f085c2..902128e634c 100644
--- a/src/ethereum/forks/gray_glacier/transactions.py
+++ b/src/ethereum/forks/gray_glacier/transactions.py
@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -19,42 +19,12 @@
     InvalidSignatureError,
     NonceOverflowError,
 )
+from ethereum.state import Address
 
 from .exceptions import TransactionTypeError
-from .fork_types import Address
-
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_PER_NON_ZERO = Uint(16)
-"""
-Gas cost per non-zero byte in the transaction data.
-"""
-
-GAS_TX_DATA_PER_ZERO = Uint(4)
-"""
-Gas cost per zero byte in the transaction data.
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
-
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
-"""
-
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
-"""
 
 
+@final
 @slotted_freezable
 @dataclass
 class LegacyTransaction:
@@ -114,6 +84,7 @@ class LegacyTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Access:
@@ -133,6 +104,7 @@ class Access:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccessListTransaction:
@@ -205,6 +177,7 @@ class AccessListTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class FeeMarketTransaction:
@@ -370,7 +343,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
     4. Cost for access list entries (if applicable)
@@ -378,27 +351,29 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     This function takes a transaction as a parameter and returns the intrinsic
     gas cost of the transaction.
     """
+    from .vm.gas import GasCosts
+
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
     data_cost = (
-        num_zeros * GAS_TX_DATA_PER_ZERO
-        + num_non_zeros * GAS_TX_DATA_PER_NON_ZERO
+        num_zeros * GasCosts.TX_DATA_PER_ZERO
+        + num_non_zeros * GasCosts.TX_DATA_PER_NON_ZERO
     )
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE
+        create_cost = GasCosts.TX_CREATE
     else:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
     if isinstance(tx, (AccessListTransaction, FeeMarketTransaction)):
         for access in tx.access_list:
-            access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_cost += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
 
-    return GAS_TX_BASE + data_cost + create_cost + access_list_cost
+    return GasCosts.TX_BASE + data_cost + create_cost + access_list_cost
 
 
 def recover_sender(chain_id: U64, tx: Transaction) -> Address:
diff --git a/src/ethereum/forks/gray_glacier/trie.py b/src/ethereum/forks/gray_glacier/trie.py
deleted file mode 100644
index 21044c1a077..00000000000
--- a/src/ethereum/forks/gray_glacier/trie.py
+++ /dev/null
@@ -1,498 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    assert_type,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.arrow_glacier import trie as previous_trie
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt
-from .fork_types import Account, Address, Root, encode_account
-from .transactions import LegacyTransaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = Account | Bytes | LegacyTransaction | Receipt | Uint | U256 | None
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[LegacyTransaction | Bytes],
-    Optional[Receipt | Bytes],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `rlp.RLP`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (LegacyTransaction, Receipt, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/gray_glacier/utils/message.py b/src/ethereum/forks/gray_glacier/utils/message.py
index 30703e718ff..38303c5e7c6 100644
--- a/src/ethereum/forks/gray_glacier/utils/message.py
+++ b/src/ethereum/forks/gray_glacier/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
@@ -55,7 +55,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -63,8 +63,8 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        account = get_account(block_env.state, tx.to)
-        code = get_code(block_env.state, account.code_hash)
+        account = get_account(tx_env.state, tx.to)
+        code = get_code(tx_env.state, account.code_hash)
 
         code_address = tx.to
     else:
diff --git a/src/ethereum/forks/gray_glacier/vm/__init__.py b/src/ethereum/forks/gray_glacier/vm/__init__.py
index 46462ee6abc..6bc15f7325f 100644
--- a/src/ethereum/forks/gray_glacier/vm/__init__.py
+++ b/src/ethereum/forks/gray_glacier/vm/__init__.py
@@ -13,24 +13,29 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt
-from ..state import State, account_exists_and_is_empty
+from ..state_tracker import (
+    BlockState,
+    TransactionState,
+    account_exists_and_is_empty,
+)
 from ..transactions import LegacyTransaction
-from ..trie import Trie
 from .precompiled_contracts import RIPEMD160_ADDRESS
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +43,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -48,6 +53,7 @@ class BlockEnvironment:
     difficulty: Uint
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -79,10 +85,11 @@ class BlockOutput:
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
@@ -90,10 +97,12 @@ class TransactionEnvironment:
     gas: Uint
     access_list_addresses: Set[Address]
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
+    state: TransactionState
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -118,6 +127,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
@@ -159,7 +169,7 @@ def incorporate_child_on_success(evm: Evm, child_evm: Evm) -> None:
     evm.accounts_to_delete.update(child_evm.accounts_to_delete)
     evm.touched_accounts.update(child_evm.touched_accounts)
     if account_exists_and_is_empty(
-        evm.message.block_env.state, child_evm.message.current_target
+        evm.message.tx_env.state, child_evm.message.current_target
     ):
         evm.touched_accounts.add(child_evm.message.current_target)
     evm.accessed_addresses.update(child_evm.accessed_addresses)
@@ -189,7 +199,7 @@ def incorporate_child_on_error(evm: Evm, child_evm: Evm) -> None:
         evm.touched_accounts.add(RIPEMD160_ADDRESS)
     if child_evm.message.current_target == RIPEMD160_ADDRESS:
         if account_exists_and_is_empty(
-            evm.message.block_env.state, child_evm.message.current_target
+            evm.message.tx_env.state, child_evm.message.current_target
         ):
             evm.touched_accounts.add(RIPEMD160_ADDRESS)
     evm.gas_left += child_evm.gas_left
diff --git a/src/ethereum/forks/gray_glacier/vm/gas.py b/src/ethereum/forks/gray_glacier/vm/gas.py
index 1929dd5ca3b..898c7024d28 100644
--- a/src/ethereum/forks/gray_glacier/vm/gas.py
+++ b/src/ethereum/forks/gray_glacier/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32
@@ -22,48 +22,146 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 4800
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-GAS_ECRECOVER = Uint(3000)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1)
-GAS_COLD_SLOAD = Uint(2100)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600)
-GAS_WARM_ACCESS = Uint(100)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    WARM_ACCESS: Final[Uint] = Uint(100)
+    COLD_ACCOUNT_ACCESS: Final[Uint] = Uint(2600)
+    COLD_STORAGE_ACCESS: Final[Uint] = Uint(2100)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 4800
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_PER_ZERO: Final[Uint] = Uint(4)
+    TX_DATA_PER_NON_ZERO: Final[Uint] = Uint(16)
+    TX_ACCESS_LIST_ADDRESS: Final[Uint] = Uint(2400)
+    TX_ACCESS_LIST_STORAGE_KEY: Final[Uint] = Uint(1900)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_DIFFICULTY: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_BASEFEE: Final[Uint] = BASE
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -79,11 +177,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -135,7 +234,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -165,7 +264,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -190,7 +289,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/arithmetic.py b/src/ethereum/forks/gray_glacier/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/gray_glacier/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/gray_glacier/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/bitwise.py b/src/ethereum/forks/gray_glacier/vm/instructions/bitwise.py
index 41dabe8185b..1de6c615931 100644
--- a/src/ethereum/forks/gray_glacier/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/gray_glacier/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +172,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +202,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +232,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/block.py b/src/ethereum/forks/gray_glacier/vm/instructions/block.py
index bbf01739ff2..e3400f9461a 100644
--- a/src/ethereum/forks/gray_glacier/vm/instructions/block.py
+++ b/src/ethereum/forks/gray_glacier/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -33,7 +33,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -75,7 +75,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -102,7 +102,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -128,7 +128,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -154,7 +154,7 @@ def difficulty(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_DIFFICULTY)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.difficulty))
@@ -180,7 +180,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -203,7 +203,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/comparison.py b/src/ethereum/forks/gray_glacier/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/gray_glacier/vm/instructions/comparison.py
+++ b/src/ethereum/forks/gray_glacier/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/control_flow.py b/src/ethereum/forks/gray_glacier/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/gray_glacier/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/gray_glacier/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/environment.py b/src/ethereum/forks/gray_glacier/vm/instructions/environment.py
index fe1b70c1269..904a7b8a9d0 100644
--- a/src/ethereum/forks/gray_glacier/vm/instructions/environment.py
+++ b/src/ethereum/forks/gray_glacier/vm/instructions/environment.py
@@ -13,22 +13,16 @@
 
 from ethereum_types.numeric import U256, Uint, ulen
 
+from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...fork_types import EMPTY_ACCOUNT
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BASE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_COPY,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
-    GAS_WARM_ACCESS,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -49,7 +43,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -73,14 +67,15 @@ def balance(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_addresses.add(address)
-        charge_gas(evm, GAS_COLD_ACCOUNT_ACCESS)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -103,7 +98,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -126,7 +121,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -149,7 +144,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -173,7 +168,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -198,7 +193,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -227,11 +222,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -256,7 +254,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -285,11 +283,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -314,7 +315,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -338,16 +339,17 @@ def extcodesize(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -374,23 +376,24 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
 
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost + copy_gas_cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -413,7 +416,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -439,11 +442,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -472,15 +480,15 @@ def extcodehash(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -507,12 +515,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
@@ -535,7 +543,7 @@ def base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BASEFEE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.base_fee_per_gas))
diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/keccak.py b/src/ethereum/forks/gray_glacier/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/gray_glacier/vm/instructions/keccak.py
+++ b/src/ethereum/forks/gray_glacier/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/log.py b/src/ethereum/forks/gray_glacier/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/gray_glacier/vm/instructions/log.py
+++ b/src/ethereum/forks/gray_glacier/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/memory.py b/src/ethereum/forks/gray_glacier/vm/instructions/memory.py
index 3a242ba2f7a..93861811559 100644
--- a/src/ethereum/forks/gray_glacier/vm/instructions/memory.py
+++ b/src/ethereum/forks/gray_glacier/vm/instructions/memory.py
@@ -16,8 +16,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,7 +45,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -77,7 +76,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -105,7 +104,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -132,7 +131,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/stack.py b/src/ethereum/forks/gray_glacier/vm/instructions/stack.py
index 0fc0d3fe4b5..901bff4ed3b 100644
--- a/src/ethereum/forks/gray_glacier/vm/instructions/stack.py
+++ b/src/ethereum/forks/gray_glacier/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -62,7 +66,7 @@ def push_n(evm: Evm, num_bytes: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -92,7 +96,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -124,7 +128,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -136,69 +140,69 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/storage.py b/src/ethereum/forks/gray_glacier/vm/instructions/storage.py
index 6129ed5322c..e9d86666668 100644
--- a/src/ethereum/forks/gray_glacier/vm/instructions/storage.py
+++ b/src/ethereum/forks/gray_glacier/vm/instructions/storage.py
@@ -13,16 +13,11 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import get_storage, get_storage_original, set_storage
+from ...state_tracker import get_storage, get_storage_original, set_storage
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,15 +39,14 @@ def sload(evm: Evm) -> None:
 
     # GAS
     if (evm.message.current_target, key) in evm.accessed_storage_keys:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        charge_gas(evm, GAS_COLD_SLOAD)
+        charge_gas(evm, GasCosts.COLD_STORAGE_ACCESS)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -73,54 +67,60 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     gas_cost = Uint(0)
 
     if (evm.message.current_target, key) not in evm.accessed_storage_keys:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        gas_cost += GAS_COLD_SLOAD
+        gas_cost += GasCosts.COLD_STORAGE_ACCESS
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost += GAS_STORAGE_SET
+            gas_cost += GasCosts.STORAGE_SET
         else:
-            gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_SLOAD
+            gas_cost += (
+                GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
+            )
     else:
-        gas_cost += GAS_WARM_ACCESS
+        gas_cost += GasCosts.WARM_ACCESS
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
             # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
             # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
             # Storage slot being restored to its original value
             if original_value == 0:
                 # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_WARM_ACCESS)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.WARM_ACCESS
+                )
             else:
                 # Slot was originally non-empty and was UPDATED earlier
                 evm.refund_counter += int(
-                    GAS_STORAGE_UPDATE - GAS_COLD_SLOAD - GAS_WARM_ACCESS
+                    GasCosts.COLD_STORAGE_WRITE
+                    - GasCosts.COLD_STORAGE_ACCESS
+                    - GasCosts.WARM_ACCESS
                 )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/system.py b/src/ethereum/forks/gray_glacier/vm/instructions/system.py
index b48d2498ac3..89a0d310f51 100644
--- a/src/ethereum/forks/gray_glacier/vm/instructions/system.py
+++ b/src/ethereum/forks/gray_glacier/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
@@ -40,15 +40,7 @@
 )
 from ..exceptions import Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -83,7 +75,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -97,15 +89,13 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -157,14 +147,14 @@ def create(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -202,8 +192,8 @@ def create2(evm: Evm) -> None:
     call_data_words = ceil32(Uint(memory_size)) // Uint(32)
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost,
     )
 
@@ -242,7 +232,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -285,8 +275,8 @@ def generic_call(
     call_data = memory_read_bytes(
         evm.memory, memory_input_start_position, memory_input_size
     )
-    account = get_account(evm.message.block_env.state, code_address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    account = get_account(evm.message.tx_env.state, code_address)
+    code = get_code(evm.message.tx_env.state, account.code_hash)
     child_message = Message(
         block_env=evm.message.block_env,
         tx_env=evm.message.tx_env,
@@ -353,17 +343,17 @@ def call(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -376,7 +366,7 @@ def call(evm: Evm) -> None:
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -433,12 +423,12 @@ def callcode(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -451,7 +441,7 @@ def callcode(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -491,19 +481,19 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if beneficiary not in evm.accessed_addresses:
         evm.accessed_addresses.add(beneficiary)
-        gas_cost += GAS_COLD_ACCOUNT_ACCESS
+        gas_cost += GasCosts.COLD_ACCOUNT_ACCESS
 
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -511,28 +501,28 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     beneficiary_balance = get_account(
-        evm.message.block_env.state, beneficiary
+        evm.message.tx_env.state, beneficiary
     ).balance
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     # First Transfer to beneficiary
     set_account_balance(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         beneficiary,
         beneficiary_balance + originator_balance,
     )
     # Next, Zero the balance of the address being deleted (must come after
     # sending to beneficiary in case the contract named itself as the
     # beneficiary).
-    set_account_balance(evm.message.block_env.state, originator, U256(0))
+    set_account_balance(evm.message.tx_env.state, originator, U256(0))
 
     # register account for deletion
     evm.accounts_to_delete.add(originator)
 
     # mark beneficiary as touched
-    if account_exists_and_is_empty(evm.message.block_env.state, beneficiary):
+    if account_exists_and_is_empty(evm.message.tx_env.state, beneficiary):
         evm.touched_accounts.add(beneficiary)
 
     # HALT the execution
@@ -570,10 +560,10 @@ def delegatecall(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     message_call_gas = calculate_message_call_gas(
         U256(0), gas, Uint(evm.gas_left), extend_memory.cost, access_gas_cost
@@ -629,10 +619,10 @@ def staticcall(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
 
diff --git a/src/ethereum/forks/gray_glacier/vm/interpreter.py b/src/ethereum/forks/gray_glacier/vm/interpreter.py
index 1135be95939..cb5b6a39d2c 100644
--- a/src/ethereum/forks/gray_glacier/vm/interpreter.py
+++ b/src/ethereum/forks/gray_glacier/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,21 +31,21 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     increment_nonce,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
     touch_account,
 )
 from ..vm import Message
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -64,6 +64,7 @@
 MAX_CODE_SIZE = 0x6000
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -103,12 +104,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -122,9 +123,7 @@ def process_message_call(message: Message) -> MessageCallOutput:
             evm = process_create_message(message)
     else:
         evm = process_message(message)
-        if account_exists_and_is_empty(
-            block_env.state, Address(message.target)
-        ):
+        if account_exists_and_is_empty(tx_state, Address(message.target)):
             evm.touched_accounts.add(Address(message.target))
 
     if evm.error:
@@ -167,19 +166,30 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state)
-
-    # The list of created accounts is used by `get_storage_original`.
-    mark_account_created(state, message.current_target)
-
-    increment_nonce(state, message.current_target)
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts.
+    mark_account_created(tx_state, message.current_target)
+
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             if len(contract_code) > 0:
@@ -189,15 +199,14 @@ def process_create_message(message: Message) -> Evm:
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -216,7 +225,7 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
@@ -243,13 +252,16 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
 
-    touch_account(state, message.current_target)
+    touch_account(tx_state, message.current_target)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -280,9 +292,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state)
-    else:
-        commit_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/alt_bn128.py
index 214725d8da0..862506c54c3 100644
--- a/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(150))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(6000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(34000 * (len(data) // 192) + 45000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/identity.py b/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/gray_glacier/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/homestead/blocks.py b/src/ethereum/forks/homestead/blocks.py
index 2b71f1d74ce..bc21e326b4e 100644
--- a/src/ethereum/forks/homestead/blocks.py
+++ b/src/ethereum/forks/homestead/blocks.py
@@ -10,18 +10,20 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.crypto.hash import Hash32
+from ethereum.state import Address, Root
 
-from .fork_types import Address, Bloom, Root
+from .fork_types import Bloom
 from .transactions import Transaction
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -60,13 +62,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.homestead.state.state_root
-    [Trie]: ref:ethereum.forks.homestead.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -76,8 +79,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.homestead.trie.root
-    [Trie]: ref:ethereum.forks.homestead.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -87,8 +90,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.homestead.trie.root
-    [Trie]: ref:ethereum.forks.homestead.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -157,6 +160,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -201,6 +205,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -233,6 +238,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/homestead/fork.py b/src/ethereum/forks/homestead/fork.py
index 162a6bd1b7a..cf0a29d826f 100644
--- a/src/ethereum/forks/homestead/fork.py
+++ b/src/ethereum/forks/homestead/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Set, Tuple
+from typing import List, Set, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes32
@@ -27,19 +27,27 @@
     InvalidSenderError,
     NonceMismatchError,
 )
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt
 from .bloom import logs_bloom
-from .fork_types import EMPTY_CODE_HASH, Address
-from .state import (
-    State,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
     create_ether,
     destroy_account,
+    extract_block_diff,
     get_account,
+    incorporate_tx_into_block,
     increment_nonce,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
     Transaction,
@@ -47,17 +55,16 @@
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.message import prepare_message
+from .vm.gas import GasCosts
 from .vm.interpreter import process_message_call
 
 BLOCK_REWARD = U256(5 * 10**18)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 MINIMUM_DIFFICULTY = Uint(131072)
 MAX_OMMER_DEPTH = Uint(6)
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -159,9 +166,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     validate_header(chain, block.header)
     validate_ommers(block.ommers, block.header, chain)
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -175,7 +184,12 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         ommers=block.ommers,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes,
+        block_diff.storage_changes,
+        block_diff.storage_clears,
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -193,6 +207,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block_logs_bloom != block.header.bloom:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -341,6 +356,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Address:
     """
     Check if the transaction is includable in the block.
@@ -353,6 +369,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -375,7 +393,7 @@ def check_transaction(
     if tx.gas > gas_available:
         raise GasUsedExceedsLimitError("gas used exceeds limit")
     sender_address = recover_sender(tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     max_gas_fee = tx.gas * tx.gas_price
 
@@ -461,7 +479,7 @@ def apply_body(
     for i, tx in enumerate(transactions):
         process_transaction(block_env, block_output, tx, Uint(i))
 
-    pay_rewards(block_env.state, block_env.number, block_env.coinbase, ommers)
+    pay_rewards(block_env, ommers)
 
     return block_output
 
@@ -543,9 +561,7 @@ def validate_ommers(
 
 
 def pay_rewards(
-    state: State,
-    block_number: Uint,
-    coinbase: Address,
+    block_env: vm.BlockEnvironment,
     ommers: Tuple[Header, ...],
 ) -> None:
     """
@@ -564,25 +580,24 @@ def pay_rewards(
 
     Parameters
     ----------
-    state :
-        Current account state.
-    block_number :
-        Position of the block within the chain.
-    coinbase :
-        Address of account which receives block reward and transaction fees.
+    block_env :
+        The block scoped environment.
     ommers :
         List of ommers mentioned in the current block.
 
     """
+    rewards_state = TransactionState(parent=block_env.state)
     ommer_count = U256(len(ommers))
     miner_reward = BLOCK_REWARD + (ommer_count * (BLOCK_REWARD // U256(32)))
-    create_ether(state, coinbase, miner_reward)
+    create_ether(rewards_state, block_env.coinbase, miner_reward)
 
     for ommer in ommers:
         # Ommer age with respect to the current block.
-        ommer_age = U256(block_number - ommer.number)
+        ommer_age = U256(block_env.number - ommer.number)
         ommer_miner_reward = ((U256(8) - ommer_age) * BLOCK_REWARD) // U256(8)
-        create_ether(state, ommer.coinbase, ommer_miner_reward)
+        create_ether(rewards_state, ommer.coinbase, ommer_miner_reward)
+
+    incorporate_tx_into_block(rewards_state)
 
 
 def process_transaction(
@@ -615,6 +630,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(block_output.transactions_trie, rlp.encode(Uint(index)), tx)
     intrinsic_gas = validate_transaction(tx)
 
@@ -622,23 +639,23 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     gas_fee = tx.gas * tx.gas_price
     sender_balance_after_gas_fee = Uint(sender_account.balance) - gas_fee
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     tx_env = vm.TransactionEnvironment(
         origin=sender,
         gas_price=tx.gas_price,
         gas=gas,
+        state=tx_state,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
     )
@@ -658,26 +675,30 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * tx.gas_price
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
-    coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
-    ).balance + U256(transaction_fee)
-    set_account_balance(
-        block_env.state, block_env.coinbase, coinbase_balance_after_mining_fee
-    )
+    create_ether(tx_state, block_env.coinbase, U256(transaction_fee))
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
     block_output.block_gas_used += tx_gas_used_after_refund
 
+    incorporate_tx_into_block(tx_state)
+
+    block_state = block_env.state
+    block_diff = extract_block_diff(block_state)
+    intermediate_state_root, _ = (
+        block_state.pre_state.compute_state_root_and_trie_changes(
+            block_diff.account_changes,
+            block_diff.storage_changes,
+            block_diff.storage_clears,
+        )
+    )
+
     receipt = make_receipt(
-        state_root(block_env.state),
+        intermediate_state_root,
         block_output.block_gas_used,
         tx_output.logs,
     )
@@ -700,12 +721,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
     passed through as a parameter is greater than or equal to the *sum* of
     the parent's gas and the adjustment delta then the limit for gas is too
     high and fails this function's check. Similarly, if the limit is less
     than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
+    delta *or* the predefined ``LIMIT_MINIMUM`` then this function's
     check fails because the gas limit doesn't allow for a sufficient or
     reasonable amount of gas to be used on a block.
 
@@ -723,12 +744,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/homestead/fork_types.py b/src/ethereum/forks/homestead/fork_types.py
index ae4525bbbdd..02907cd2a1a 100644
--- a/src/ethereum/forks/homestead/fork_types.py
+++ b/src/ethereum/forks/homestead/fork_types.py
@@ -11,41 +11,13 @@
 Types reused throughout the specification, which are specific to Ethereum.
 """
 
-from dataclasses import dataclass
-
 from ethereum_rlp import rlp
-from ethereum_types.bytes import Bytes, Bytes20, Bytes256
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
+from ethereum_types.bytes import Bytes, Bytes256
 
-Address = Bytes20
-Root = Hash32
+from ethereum.state import Account
 
 Bloom = Bytes256
 
-EMPTY_CODE_HASH = keccak256(b"")
-
-
-@slotted_freezable
-@dataclass
-class Account:
-    """
-    State associated with an address.
-    """
-
-    nonce: Uint
-    balance: U256
-    code_hash: Hash32
-
-
-EMPTY_ACCOUNT = Account(
-    nonce=Uint(0),
-    balance=U256(0),
-    code_hash=EMPTY_CODE_HASH,
-)
-
 
 def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     """
diff --git a/src/ethereum/forks/homestead/state.py b/src/ethereum/forks/homestead/state.py
deleted file mode 100644
index 69f5cca8dc0..00000000000
--- a/src/ethereum/forks/homestead/state.py
+++ /dev/null
@@ -1,543 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, List, Optional, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-
-from .fork_types import EMPTY_ACCOUNT, EMPTY_CODE_HASH, Account, Address, Root
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state._code_store
-
-
-def begin_transaction(state: State) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-
-
-def commit_transaction(state: State) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.pop()
-
-
-def rollback_transaction(state: State) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State``.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def touch_account(state: State, address: Address) -> None:
-    """
-    Initializes an account to state.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        The address of the account that needs to be initialized.
-
-    """
-    if not account_exists(state, address):
-        set_account(state, address, EMPTY_ACCOUNT)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def create_ether(state: State, address: Address, amount: U256) -> None:
-    """
-    Add newly created ether to an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to which ether is added.
-    amount:
-        The amount of ether to be added to the account of interest.
-
-    """
-
-    def increase_balance(account: Account) -> None:
-        account.balance += amount
-
-    modify_state(state, address, increase_balance)
diff --git a/src/ethereum/forks/homestead/state_tracker.py b/src/ethereum/forks/homestead/state_tracker.py
new file mode 100644
index 00000000000..24362ecff98
--- /dev/null
+++ b/src/ethereum/forks/homestead/state_tracker.py
@@ -0,0 +1,805 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+
+    ``storage_clears`` records addresses whose storage was wiped by
+    a pre-EIP-6780 ``SELFDESTRUCT`` earlier in the block, so later
+    reads must not fall back to ``pre_state`` storage.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    storage_clears: Set[Address] = field(default_factory=set)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    storage_clears: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.storage_clears:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if address in tx_state.storage_clears:
+        return False
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    if address in tx_state.parent.storage_clears:
+        return False
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+    tx_state.storage_clears.add(address)
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        storage_clears=set(tx_state.storage_clears),
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.storage_clears = snapshot.storage_clears
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address in tx_state.storage_clears:
+        block.storage_clears.add(address)
+        block.storage_writes.pop(address, None)
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.storage_clears.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+        storage_clears=block_state.storage_clears,
+    )
+
+
+def destroy_touched_empty_accounts(
+    tx_state: TransactionState, touched_accounts: Set[Address]
+) -> None:
+    """
+    Destroy all touched accounts that are empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    touched_accounts :
+        All the accounts that have been touched in the current transaction.
+
+    """
+    for address in touched_accounts:
+        if account_exists_and_is_empty(tx_state, address):
+            destroy_account(tx_state, address)
+
+
+def touch_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Initialize an account to state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be initialized.
+
+    """
+    if not account_exists(tx_state, address):
+        set_account(tx_state, address, EMPTY_ACCOUNT)
diff --git a/src/ethereum/forks/homestead/transactions.py b/src/ethereum/forks/homestead/transactions.py
index 934540874ca..f13e81f25b9 100644
--- a/src/ethereum/forks/homestead/transactions.py
+++ b/src/ethereum/forks/homestead/transactions.py
@@ -5,6 +5,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0
@@ -18,31 +19,10 @@
     InvalidSignatureError,
     NonceOverflowError,
 )
-
-from .fork_types import Address
-
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_PER_NON_ZERO = Uint(68)
-"""
-Gas cost per non-zero byte in the transaction data.
-"""
-
-GAS_TX_DATA_PER_ZERO = Uint(4)
-"""
-Gas cost per zero byte in the transaction data.
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
+from ethereum.state import Address
 
 
+@final
 @slotted_freezable
 @dataclass
 class Transaction:
@@ -143,26 +123,28 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
 
     This function takes a transaction as a parameter and returns the intrinsic
     gas cost of the transaction.
     """
+    from .vm.gas import GasCosts
+
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
     data_cost = (
-        num_zeros * GAS_TX_DATA_PER_ZERO
-        + num_non_zeros * GAS_TX_DATA_PER_NON_ZERO
+        num_zeros * GasCosts.TX_DATA_PER_ZERO
+        + num_non_zeros * GasCosts.TX_DATA_PER_NON_ZERO
     )
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE
+        create_cost = GasCosts.TX_CREATE
     else:
         create_cost = Uint(0)
 
-    return GAS_TX_BASE + data_cost + create_cost
+    return GasCosts.TX_BASE + data_cost + create_cost
 
 
 def recover_sender(tx: Transaction) -> Address:
diff --git a/src/ethereum/forks/homestead/trie.py b/src/ethereum/forks/homestead/trie.py
deleted file mode 100644
index 331802a660b..00000000000
--- a/src/ethereum/forks/homestead/trie.py
+++ /dev/null
@@ -1,498 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    assert_type,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.frontier import trie as previous_trie
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt
-from .fork_types import Account, Address, Root, encode_account
-from .transactions import Transaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = Account | Bytes | Transaction | Receipt | Uint | U256 | None
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[Transaction],
-    Optional[Receipt],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `rlp.RLP`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (Transaction, Receipt, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/homestead/utils/hexadecimal.py b/src/ethereum/forks/homestead/utils/hexadecimal.py
index 896d015043b..47fcffe57d1 100644
--- a/src/ethereum/forks/homestead/utils/hexadecimal.py
+++ b/src/ethereum/forks/homestead/utils/hexadecimal.py
@@ -14,11 +14,9 @@
 
 from ethereum_types.bytes import Bytes
 
-from ethereum.state import Address
+from ethereum.state import Address, Root
 from ethereum.utils.hexadecimal import remove_hex_prefix
 
-from ..fork_types import Root
-
 
 def hex_to_root(hex_string: str) -> Root:
     """
diff --git a/src/ethereum/forks/homestead/utils/message.py b/src/ethereum/forks/homestead/utils/message.py
index 636846b49c9..1595631b841 100644
--- a/src/ethereum/forks/homestead/utils/message.py
+++ b/src/ethereum/forks/homestead/utils/message.py
@@ -16,7 +16,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from .address import compute_contract_address
@@ -48,7 +48,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -56,8 +56,8 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        account = get_account(block_env.state, tx.to)
-        code = get_code(block_env.state, account.code_hash)
+        account = get_account(tx_env.state, tx.to)
+        code = get_code(tx_env.state, account.code_hash)
 
         code_address = tx.to
     else:
diff --git a/src/ethereum/forks/homestead/vm/__init__.py b/src/ethereum/forks/homestead/vm/__init__.py
index e318eaa7482..ef0cfa87484 100644
--- a/src/ethereum/forks/homestead/vm/__init__.py
+++ b/src/ethereum/forks/homestead/vm/__init__.py
@@ -13,23 +13,24 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt
-from ..state import State
+from ..state_tracker import BlockState, TransactionState
 from ..transactions import Transaction
-from ..trie import Trie
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -37,7 +38,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -46,6 +47,7 @@ class BlockEnvironment:
     difficulty: Uint
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -77,19 +79,22 @@ class BlockOutput:
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
     gas_price: Uint
     gas: Uint
+    state: TransactionState
     index_in_block: Uint
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -111,6 +116,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
diff --git a/src/ethereum/forks/homestead/vm/gas.py b/src/ethereum/forks/homestead/vm/gas.py
index 3c60482255b..4d56fd9486b 100644
--- a/src/ethereum/forks/homestead/vm/gas.py
+++ b/src/ethereum/forks/homestead/vm/gas.py
@@ -12,57 +12,142 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 
 from ethereum.state import Address
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32
 
-from ..state import State, account_exists
+from ..state_tracker import TransactionState, account_exists
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_SLOAD = Uint(50)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 15000
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(10)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_EXTERNAL = Uint(20)
-GAS_BALANCE = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_CALL = Uint(40)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-REFUND_SELF_DESTRUCT = Uint(24000)
-GAS_ECRECOVER = Uint(3000)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    SLOAD: Final[Uint] = Uint(50)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 15000
+    REFUND_SELF_DESTRUCT: Final[Uint] = Uint(24000)
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_PER_ZERO: Final[Uint] = Uint(4)
+    TX_DATA_PER_NON_ZERO: Final[Uint] = Uint(68)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_DIFFICULTY: Final[Uint] = BASE
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(10)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_EXTERNAL_BASE: Final[Uint] = Uint(20)
+    OPCODE_BALANCE: Final[Uint] = Uint(20)
+    OPCODE_CALL_BASE: Final[Uint] = Uint(40)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -78,11 +163,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -134,7 +220,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -164,7 +250,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -184,7 +270,7 @@ def calculate_gas_extend_memory(
 
 
 def calculate_message_call_gas(
-    state: State, gas: Uint, to: Address, value: U256
+    state: TransactionState, gas: Uint, to: Address, value: U256
 ) -> MessageCallGas:
     """
     Calculates the gas amount for executing Opcodes `CALL` and `CALLCODE`.
@@ -205,8 +291,12 @@ def calculate_message_call_gas(
     message_call_gas: `MessageCallGas`
 
     """
-    create_gas_cost = Uint(0) if account_exists(state, to) else GAS_NEW_ACCOUNT
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
-    cost = GAS_CALL + gas + create_gas_cost + transfer_gas_cost
-    stipend = gas if value == 0 else GAS_CALL_STIPEND + gas
+    create_gas_cost = (
+        Uint(0) if account_exists(state, to) else GasCosts.NEW_ACCOUNT
+    )
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
+    cost = (
+        GasCosts.OPCODE_CALL_BASE + gas + create_gas_cost + transfer_gas_cost
+    )
+    stipend = gas if value == 0 else GasCosts.CALL_STIPEND + gas
     return MessageCallGas(cost, stipend)
diff --git a/src/ethereum/forks/homestead/vm/instructions/arithmetic.py b/src/ethereum/forks/homestead/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/homestead/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/homestead/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/homestead/vm/instructions/bitwise.py b/src/ethereum/forks/homestead/vm/instructions/bitwise.py
index 2a506f55751..62da98041ad 100644
--- a/src/ethereum/forks/homestead/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/homestead/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
diff --git a/src/ethereum/forks/homestead/vm/instructions/block.py b/src/ethereum/forks/homestead/vm/instructions/block.py
index 0edcbf000d1..fbca7daa37c 100644
--- a/src/ethereum/forks/homestead/vm/instructions/block.py
+++ b/src/ethereum/forks/homestead/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -33,7 +33,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -75,7 +75,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -102,7 +102,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -128,7 +128,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -154,7 +154,7 @@ def difficulty(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_DIFFICULTY)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.difficulty))
@@ -180,7 +180,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
diff --git a/src/ethereum/forks/homestead/vm/instructions/comparison.py b/src/ethereum/forks/homestead/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/homestead/vm/instructions/comparison.py
+++ b/src/ethereum/forks/homestead/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/homestead/vm/instructions/control_flow.py b/src/ethereum/forks/homestead/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/homestead/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/homestead/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/homestead/vm/instructions/environment.py b/src/ethereum/forks/homestead/vm/instructions/environment.py
index 83eb5528226..d85aaf0c97a 100644
--- a/src/ethereum/forks/homestead/vm/instructions/environment.py
+++ b/src/ethereum/forks/homestead/vm/instructions/environment.py
@@ -15,16 +15,12 @@
 
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..gas import (
-    GAS_BALANCE,
-    GAS_BASE,
-    GAS_COPY,
-    GAS_EXTERNAL,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -45,7 +41,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -68,11 +64,12 @@ def balance(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BALANCE)
+    charge_gas(evm, GasCosts.OPCODE_BALANCE)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -95,7 +92,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -118,7 +115,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -141,7 +138,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -165,7 +162,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -190,7 +187,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -219,11 +216,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -248,7 +248,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -277,11 +277,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -306,7 +309,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -329,11 +332,12 @@ def extcodesize(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_EXTERNAL)
+    charge_gas(evm, GasCosts.OPCODE_EXTERNAL_BASE)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -360,16 +364,20 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_EXTERNAL + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_EXTERNAL_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
diff --git a/src/ethereum/forks/homestead/vm/instructions/keccak.py b/src/ethereum/forks/homestead/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/homestead/vm/instructions/keccak.py
+++ b/src/ethereum/forks/homestead/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/homestead/vm/instructions/log.py b/src/ethereum/forks/homestead/vm/instructions/log.py
index 76c02e737a4..3cfb69c194c 100644
--- a/src/ethereum/forks/homestead/vm/instructions/log.py
+++ b/src/ethereum/forks/homestead/vm/instructions/log.py
@@ -12,15 +12,14 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
 from ...blocks import Log
 from .. import Evm
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -58,9 +57,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -78,8 +77,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/homestead/vm/instructions/memory.py b/src/ethereum/forks/homestead/vm/instructions/memory.py
index 3a242ba2f7a..93861811559 100644
--- a/src/ethereum/forks/homestead/vm/instructions/memory.py
+++ b/src/ethereum/forks/homestead/vm/instructions/memory.py
@@ -16,8 +16,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,7 +45,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -77,7 +76,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -105,7 +104,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -132,7 +131,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
diff --git a/src/ethereum/forks/homestead/vm/instructions/stack.py b/src/ethereum/forks/homestead/vm/instructions/stack.py
index 0fc0d3fe4b5..901bff4ed3b 100644
--- a/src/ethereum/forks/homestead/vm/instructions/stack.py
+++ b/src/ethereum/forks/homestead/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -62,7 +66,7 @@ def push_n(evm: Evm, num_bytes: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -92,7 +96,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -124,7 +128,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -136,69 +140,69 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/homestead/vm/instructions/storage.py b/src/ethereum/forks/homestead/vm/instructions/storage.py
index 8748340fc27..16921a1a7fb 100644
--- a/src/ethereum/forks/homestead/vm/instructions/storage.py
+++ b/src/ethereum/forks/homestead/vm/instructions/storage.py
@@ -13,13 +13,10 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import get_storage, set_storage
+from ...state_tracker import get_storage, set_storage
 from .. import Evm
 from ..gas import (
-    GAS_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -40,12 +37,11 @@ def sload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_SLOAD)
+    charge_gas(evm, GasCosts.SLOAD)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -68,20 +64,20 @@ def sstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    state = evm.message.block_env.state
-    current_value = get_storage(state, evm.message.current_target, key)
+    tx_state = evm.message.tx_env.state
+    current_value = get_storage(tx_state, evm.message.current_target, key)
     if new_value != 0 and current_value == 0:
-        gas_cost = GAS_STORAGE_SET
+        gas_cost = GasCosts.STORAGE_SET
     else:
-        gas_cost = GAS_STORAGE_UPDATE
+        gas_cost = GasCosts.COLD_STORAGE_WRITE
 
     if new_value == 0 and current_value != 0:
-        evm.refund_counter += REFUND_STORAGE_CLEAR
+        evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
     charge_gas(evm, gas_cost)
 
     # OPERATION
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
diff --git a/src/ethereum/forks/homestead/vm/instructions/system.py b/src/ethereum/forks/homestead/vm/instructions/system.py
index 75226650693..7fe3234231f 100644
--- a/src/ethereum/forks/homestead/vm/instructions/system.py
+++ b/src/ethereum/forks/homestead/vm/instructions/system.py
@@ -16,7 +16,7 @@
 
 from ethereum.state import Address
 
-from ...state import (
+from ...state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
     get_account,
@@ -32,10 +32,7 @@
     incorporate_child_on_success,
 )
 from ..gas import (
-    GAS_CALL,
-    GAS_CREATE,
-    GAS_ZERO,
-    REFUND_SELF_DESTRUCT,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -68,7 +65,7 @@ def create(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost)
 
     create_message_gas = evm.gas_left
     evm.gas_left = Uint(0)
@@ -76,12 +73,12 @@ def create(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -93,20 +90,16 @@ def create(evm: Evm) -> None:
         push(evm.stack, U256(0))
         evm.gas_left += create_message_gas
     elif account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
     else:
         call_data = memory_read_bytes(
             evm.memory, memory_start_position, memory_size
         )
 
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
         child_message = Message(
             block_env=evm.message.block_env,
@@ -157,7 +150,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -197,8 +190,8 @@ def generic_call(
     call_data = memory_read_bytes(
         evm.memory, memory_input_start_position, memory_input_size
     )
-    account_to_call = get_account(evm.message.block_env.state, code_address)
-    code = get_code(evm.message.block_env.state, account_to_call.code_hash)
+    account_to_call = get_account(evm.message.tx_env.state, code_address)
+    code = get_code(evm.message.tx_env.state, account_to_call.code_hash)
     child_message = Message(
         block_env=evm.message.block_env,
         tx_env=evm.message.tx_env,
@@ -262,14 +255,14 @@ def call(evm: Evm) -> None:
     code_address = to
 
     message_call_gas = calculate_message_call_gas(
-        evm.message.block_env.state, gas, to, value
+        evm.message.tx_env.state, gas, to, value
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -323,14 +316,14 @@ def callcode(evm: Evm) -> None:
         ],
     )
     message_call_gas = calculate_message_call_gas(
-        evm.message.block_env.state, gas, to, value
+        evm.message.tx_env.state, gas, to, value
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -368,7 +361,7 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_ZERO
+    gas_cost = GasCosts.ZERO
 
     originator = evm.message.current_target
 
@@ -379,28 +372,28 @@ def selfdestruct(evm: Evm) -> None:
         parent_evm = parent_evm.message.parent_evm
 
     if originator not in refunded_accounts:
-        evm.refund_counter += int(REFUND_SELF_DESTRUCT)
+        evm.refund_counter += int(GasCosts.REFUND_SELF_DESTRUCT)
 
     charge_gas(evm, gas_cost)
 
     # OPERATION
     beneficiary_balance = get_account(
-        evm.message.block_env.state, beneficiary
+        evm.message.tx_env.state, beneficiary
     ).balance
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     # First Transfer to beneficiary
     set_account_balance(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         beneficiary,
         beneficiary_balance + originator_balance,
     )
     # Next, Zero the balance of the address being deleted (must come after
     # sending to beneficiary in case the contract named itself as the
     # beneficiary).
-    set_account_balance(evm.message.block_env.state, originator, U256(0))
+    set_account_balance(evm.message.tx_env.state, originator, U256(0))
 
     # register account for deletion
     evm.accounts_to_delete.add(originator)
@@ -438,7 +431,7 @@ def delegatecall(evm: Evm) -> None:
             (memory_output_start_position, memory_output_size),
         ],
     )
-    charge_gas(evm, GAS_CALL + gas + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_CALL_BASE + gas + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/homestead/vm/interpreter.py b/src/ethereum/forks/homestead/vm/interpreter.py
index 47530fcf783..21445abf5c8 100644
--- a/src/ethereum/forks/homestead/vm/interpreter.py
+++ b/src/ethereum/forks/homestead/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,18 +31,18 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
     touch_account,
 )
 from ..vm import Message
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -57,6 +57,7 @@
 STACK_DEPTH_LIMIT = Uint(1024)
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -94,12 +95,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -150,27 +151,33 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` call.
+    destroy_storage(tx_state, message.current_target)
 
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             charge_gas(evm, contract_code_gas)
         except ExceptionalHalt as error:
-            rollback_transaction(state)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -189,7 +196,7 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
@@ -212,13 +219,16 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
 
-    touch_account(state, message.current_target)
+    touch_account(tx_state, message.current_target)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -245,9 +255,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state)
-    else:
-        commit_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/homestead/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/homestead/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/homestead/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/homestead/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/homestead/vm/precompiled_contracts/identity.py b/src/ethereum/forks/homestead/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/homestead/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/homestead/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/homestead/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/homestead/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/homestead/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/homestead/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/homestead/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/homestead/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/homestead/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/homestead/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/istanbul/__init__.py b/src/ethereum/forks/istanbul/__init__.py
index 1b4f3b61532..f42251a66fb 100644
--- a/src/ethereum/forks/istanbul/__init__.py
+++ b/src/ethereum/forks/istanbul/__init__.py
@@ -40,7 +40,7 @@
 [EIP-2028]: https://eips.ethereum.org/EIPS/eip-2028
 [EIP-2200]: https://eips.ethereum.org/EIPS/eip-2200
 [a]: https://github.com/ethereum/aleth/releases/tag/v1.7.1
-[Besu 1.3.6]: https://github.com/hyperledger/besu/releases/tag/1.3.6
+[Besu 1.3.6]: https://github.com/besu-eth/besu/releases/tag/1.3.6
 [js]: https://github.com/ethereumjs/ethereumjs-blockchain/releases/tag/v4.0.2
 [Geth 1.9.9]: https://github.com/ethereum/go-ethereum/releases/tag/v1.9.9
 [n]: https://github.com/NethermindEth/nethermind/releases/tag/1.2.3
diff --git a/src/ethereum/forks/istanbul/blocks.py b/src/ethereum/forks/istanbul/blocks.py
index e3f124bcd58..3cdd475a33a 100644
--- a/src/ethereum/forks/istanbul/blocks.py
+++ b/src/ethereum/forks/istanbul/blocks.py
@@ -10,18 +10,20 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.crypto.hash import Hash32
+from ethereum.state import Address, Root
 
-from .fork_types import Address, Bloom, Root
+from .fork_types import Bloom
 from .transactions import Transaction
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -60,13 +62,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.istanbul.state.state_root
-    [Trie]: ref:ethereum.forks.istanbul.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -76,8 +79,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.istanbul.trie.root
-    [Trie]: ref:ethereum.forks.istanbul.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -87,8 +90,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.istanbul.trie.root
-    [Trie]: ref:ethereum.forks.istanbul.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -157,6 +160,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -201,6 +205,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -233,6 +238,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/istanbul/fork.py b/src/ethereum/forks/istanbul/fork.py
index 7ed470d41e3..5d5dd2686d1 100644
--- a/src/ethereum/forks/istanbul/fork.py
+++ b/src/ethereum/forks/istanbul/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.numeric import U64, U256, Uint
@@ -27,21 +27,29 @@
     InvalidSenderError,
     NonceMismatchError,
 )
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt
 from .bloom import logs_bloom
-from .fork_types import EMPTY_CODE_HASH, Address
-from .state import (
-    State,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
     account_exists_and_is_empty,
     create_ether,
     destroy_account,
     destroy_touched_empty_accounts,
+    extract_block_diff,
     get_account,
+    incorporate_tx_into_block,
     increment_nonce,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
     Transaction,
@@ -49,19 +57,18 @@
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.message import prepare_message
+from .vm.gas import GasCosts
 from .vm.interpreter import process_message_call
 
 BLOCK_REWARD = U256(2 * 10**18)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 MINIMUM_DIFFICULTY = Uint(131072)
 MAX_OMMER_DEPTH = Uint(6)
 BOMB_DELAY_BLOCKS = 5000000
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -163,9 +170,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     validate_header(chain, block.header)
     validate_ommers(block.ommers, block.header, chain)
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -179,7 +188,12 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         ommers=block.ommers,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes,
+        block_diff.storage_changes,
+        block_diff.storage_clears,
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -197,6 +211,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block_logs_bloom != block.header.bloom:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -347,6 +362,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Address:
     """
     Check if the transaction is includable in the block.
@@ -359,6 +375,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -381,7 +399,7 @@ def check_transaction(
     if tx.gas > gas_available:
         raise GasUsedExceedsLimitError("gas used exceeds limit")
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     max_gas_fee = tx.gas * tx.gas_price
 
@@ -467,7 +485,7 @@ def apply_body(
     for i, tx in enumerate(transactions):
         process_transaction(block_env, block_output, tx, Uint(i))
 
-    pay_rewards(block_env.state, block_env.number, block_env.coinbase, ommers)
+    pay_rewards(block_env, ommers)
 
     return block_output
 
@@ -549,9 +567,7 @@ def validate_ommers(
 
 
 def pay_rewards(
-    state: State,
-    block_number: Uint,
-    coinbase: Address,
+    block_env: vm.BlockEnvironment,
     ommers: Tuple[Header, ...],
 ) -> None:
     """
@@ -570,25 +586,24 @@ def pay_rewards(
 
     Parameters
     ----------
-    state :
-        Current account state.
-    block_number :
-        Position of the block within the chain.
-    coinbase :
-        Address of account which receives block reward and transaction fees.
+    block_env :
+        The block scoped environment.
     ommers :
         List of ommers mentioned in the current block.
 
     """
+    rewards_state = TransactionState(parent=block_env.state)
     ommer_count = U256(len(ommers))
     miner_reward = BLOCK_REWARD + (ommer_count * (BLOCK_REWARD // U256(32)))
-    create_ether(state, coinbase, miner_reward)
+    create_ether(rewards_state, block_env.coinbase, miner_reward)
 
     for ommer in ommers:
         # Ommer age with respect to the current block.
-        ommer_age = U256(block_number - ommer.number)
+        ommer_age = U256(block_env.number - ommer.number)
         ommer_miner_reward = ((U256(8) - ommer_age) * BLOCK_REWARD) // U256(8)
-        create_ether(state, ommer.coinbase, ommer_miner_reward)
+        create_ether(rewards_state, ommer.coinbase, ommer_miner_reward)
+
+    incorporate_tx_into_block(rewards_state)
 
 
 def process_transaction(
@@ -621,6 +636,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(block_output.transactions_trie, rlp.encode(Uint(index)), tx)
     intrinsic_gas = validate_transaction(tx)
 
@@ -628,23 +645,23 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     gas_fee = tx.gas * tx.gas_price
     sender_balance_after_gas_fee = Uint(sender_account.balance) - gas_fee
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     tx_env = vm.TransactionEnvironment(
         origin=sender,
         gas_price=tx.gas_price,
         gas=gas,
+        state=tx_state,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
     )
@@ -664,28 +681,25 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * tx.gas_price
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
     coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
+        tx_state, block_env.coinbase
     ).balance + U256(transaction_fee)
     if coinbase_balance_after_mining_fee != 0:
         set_account_balance(
-            block_env.state,
+            tx_state,
             block_env.coinbase,
             coinbase_balance_after_mining_fee,
         )
-    elif account_exists_and_is_empty(block_env.state, block_env.coinbase):
-        destroy_account(block_env.state, block_env.coinbase)
+    elif account_exists_and_is_empty(tx_state, block_env.coinbase):
+        destroy_account(tx_state, block_env.coinbase)
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
-    destroy_touched_empty_accounts(block_env.state, tx_output.touched_accounts)
+    destroy_touched_empty_accounts(tx_state, tx_output.touched_accounts)
 
     block_output.block_gas_used += tx_gas_used_after_refund
 
@@ -704,6 +718,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
     """
@@ -711,14 +727,14 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
-    passed through as a parameter is greater than or equal to the *sum* of
-    the parent's gas and the adjustment delta then the limit for gas is too
-    high and fails this function's check. Similarly, if the limit is less
-    than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
-    check fails because the gas limit doesn't allow for a sufficient or
-    reasonable amount of gas to be used on a block.
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is passed
+    through as a parameter is greater than or equal to the *sum* of the
+    parent's gas and the adjustment delta then the limit for gas is too high
+    and fails this function's check. Similarly, if the limit is less than or
+    equal to the *difference* of the parent's gas and the adjustment delta *or*
+    the predefined ``LIMIT_MINIMUM`` then this function's check fails because
+    the gas limit doesn't allow for a sufficient or reasonable amount of gas to
+    be used on a block.
 
     Parameters
     ----------
@@ -734,12 +750,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/istanbul/fork_types.py b/src/ethereum/forks/istanbul/fork_types.py
index ae4525bbbdd..02907cd2a1a 100644
--- a/src/ethereum/forks/istanbul/fork_types.py
+++ b/src/ethereum/forks/istanbul/fork_types.py
@@ -11,41 +11,13 @@
 Types reused throughout the specification, which are specific to Ethereum.
 """
 
-from dataclasses import dataclass
-
 from ethereum_rlp import rlp
-from ethereum_types.bytes import Bytes, Bytes20, Bytes256
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
+from ethereum_types.bytes import Bytes, Bytes256
 
-Address = Bytes20
-Root = Hash32
+from ethereum.state import Account
 
 Bloom = Bytes256
 
-EMPTY_CODE_HASH = keccak256(b"")
-
-
-@slotted_freezable
-@dataclass
-class Account:
-    """
-    State associated with an address.
-    """
-
-    nonce: Uint
-    balance: U256
-    code_hash: Hash32
-
-
-EMPTY_ACCOUNT = Account(
-    nonce=Uint(0),
-    balance=U256(0),
-    code_hash=EMPTY_CODE_HASH,
-)
-
 
 def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     """
diff --git a/src/ethereum/forks/istanbul/state.py b/src/ethereum/forks/istanbul/state.py
deleted file mode 100644
index ce3e80c53fb..00000000000
--- a/src/ethereum/forks/istanbul/state.py
+++ /dev/null
@@ -1,672 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, Iterable, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-
-from .fork_types import EMPTY_ACCOUNT, EMPTY_CODE_HASH, Account, Address, Root
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-
-
-def begin_transaction(state: State) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-
-
-def commit_transaction(state: State) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-
-def rollback_transaction(state: State) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State``.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def account_exists_and_is_empty(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists and has zero nonce, empty code and zero
-    balance.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    exists_and_is_empty : `bool`
-        True if an account exists and has zero nonce, empty code and zero
-        balance, False otherwise.
-
-    """
-    account = get_account_optional(state, address)
-    return (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def touch_account(state: State, address: Address) -> None:
-    """
-    Initializes an account to state.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        The address of the account that needs to be initialized.
-
-    """
-    if not account_exists(state, address):
-        set_account(state, address, EMPTY_ACCOUNT)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def create_ether(state: State, address: Address, amount: U256) -> None:
-    """
-    Add newly created ether to an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to which ether is added.
-    amount:
-        The amount of ether to be added to the account of interest.
-
-    """
-
-    def increase_balance(account: Account) -> None:
-        account.balance += amount
-
-    modify_state(state, address, increase_balance)
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
-
-
-def destroy_touched_empty_accounts(
-    state: State, touched_accounts: Iterable[Address]
-) -> None:
-    """
-    Destroy all touched accounts that are empty.
-
-    Parameters
-    ----------
-    state: `State`
-        The current state.
-    touched_accounts: `Iterable[Address]`
-        All the accounts that have been touched in the current transaction.
-
-    """
-    for address in touched_accounts:
-        if account_exists_and_is_empty(state, address):
-            destroy_account(state, address)
diff --git a/src/ethereum/forks/istanbul/state_tracker.py b/src/ethereum/forks/istanbul/state_tracker.py
new file mode 100644
index 00000000000..24362ecff98
--- /dev/null
+++ b/src/ethereum/forks/istanbul/state_tracker.py
@@ -0,0 +1,805 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+
+    ``storage_clears`` records addresses whose storage was wiped by
+    a pre-EIP-6780 ``SELFDESTRUCT`` earlier in the block, so later
+    reads must not fall back to ``pre_state`` storage.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    storage_clears: Set[Address] = field(default_factory=set)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    storage_clears: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.storage_clears:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if address in tx_state.storage_clears:
+        return False
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    if address in tx_state.parent.storage_clears:
+        return False
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+    tx_state.storage_clears.add(address)
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        storage_clears=set(tx_state.storage_clears),
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.storage_clears = snapshot.storage_clears
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address in tx_state.storage_clears:
+        block.storage_clears.add(address)
+        block.storage_writes.pop(address, None)
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.storage_clears.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+        storage_clears=block_state.storage_clears,
+    )
+
+
+def destroy_touched_empty_accounts(
+    tx_state: TransactionState, touched_accounts: Set[Address]
+) -> None:
+    """
+    Destroy all touched accounts that are empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    touched_accounts :
+        All the accounts that have been touched in the current transaction.
+
+    """
+    for address in touched_accounts:
+        if account_exists_and_is_empty(tx_state, address):
+            destroy_account(tx_state, address)
+
+
+def touch_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Initialize an account to state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be initialized.
+
+    """
+    if not account_exists(tx_state, address):
+        set_account(tx_state, address, EMPTY_ACCOUNT)
diff --git a/src/ethereum/forks/istanbul/transactions.py b/src/ethereum/forks/istanbul/transactions.py
index a831530b311..8272ebea080 100644
--- a/src/ethereum/forks/istanbul/transactions.py
+++ b/src/ethereum/forks/istanbul/transactions.py
@@ -5,6 +5,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0
@@ -18,31 +19,10 @@
     InvalidSignatureError,
     NonceOverflowError,
 )
-
-from .fork_types import Address
-
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_PER_NON_ZERO = Uint(16)
-"""
-Gas cost per non-zero byte in the transaction data.
-"""
-
-GAS_TX_DATA_PER_ZERO = Uint(4)
-"""
-Gas cost per zero byte in the transaction data.
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
+from ethereum.state import Address
 
 
+@final
 @slotted_freezable
 @dataclass
 class Transaction:
@@ -143,26 +123,28 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
 
     This function takes a transaction as a parameter and returns the intrinsic
     gas cost of the transaction.
     """
+    from .vm.gas import GasCosts
+
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
     data_cost = (
-        num_zeros * GAS_TX_DATA_PER_ZERO
-        + num_non_zeros * GAS_TX_DATA_PER_NON_ZERO
+        num_zeros * GasCosts.TX_DATA_PER_ZERO
+        + num_non_zeros * GasCosts.TX_DATA_PER_NON_ZERO
     )
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE
+        create_cost = GasCosts.TX_CREATE
     else:
         create_cost = Uint(0)
 
-    return GAS_TX_BASE + data_cost + create_cost
+    return GasCosts.TX_BASE + data_cost + create_cost
 
 
 def recover_sender(chain_id: U64, tx: Transaction) -> Address:
diff --git a/src/ethereum/forks/istanbul/trie.py b/src/ethereum/forks/istanbul/trie.py
deleted file mode 100644
index a040432bd70..00000000000
--- a/src/ethereum/forks/istanbul/trie.py
+++ /dev/null
@@ -1,498 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    assert_type,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.constantinople import trie as previous_trie
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt
-from .fork_types import Account, Address, Root, encode_account
-from .transactions import Transaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = Account | Bytes | Transaction | Receipt | Uint | U256 | None
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[Transaction],
-    Optional[Receipt],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `rlp.RLP`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (Transaction, Receipt, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/istanbul/utils/hexadecimal.py b/src/ethereum/forks/istanbul/utils/hexadecimal.py
index 1fc4508bbf7..23db29aaa47 100644
--- a/src/ethereum/forks/istanbul/utils/hexadecimal.py
+++ b/src/ethereum/forks/istanbul/utils/hexadecimal.py
@@ -14,11 +14,9 @@
 
 from ethereum_types.bytes import Bytes
 
-from ethereum.state import Address
+from ethereum.state import Address, Root
 from ethereum.utils.hexadecimal import remove_hex_prefix
 
-from ..fork_types import Root
-
 
 def hex_to_root(hex_string: str) -> Root:
     """
diff --git a/src/ethereum/forks/istanbul/utils/message.py b/src/ethereum/forks/istanbul/utils/message.py
index 8f4ab635a24..8bfe3071570 100644
--- a/src/ethereum/forks/istanbul/utils/message.py
+++ b/src/ethereum/forks/istanbul/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from .address import compute_contract_address
@@ -49,7 +49,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -57,8 +57,8 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        account = get_account(block_env.state, tx.to)
-        code = get_code(block_env.state, account.code_hash)
+        account = get_account(tx_env.state, tx.to)
+        code = get_code(tx_env.state, account.code_hash)
 
         code_address = tx.to
     else:
diff --git a/src/ethereum/forks/istanbul/vm/__init__.py b/src/ethereum/forks/istanbul/vm/__init__.py
index a780c363cf8..4a491e87e59 100644
--- a/src/ethereum/forks/istanbul/vm/__init__.py
+++ b/src/ethereum/forks/istanbul/vm/__init__.py
@@ -13,24 +13,29 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt
-from ..state import State, account_exists_and_is_empty
+from ..state_tracker import (
+    BlockState,
+    TransactionState,
+    account_exists_and_is_empty,
+)
 from ..transactions import Transaction
-from ..trie import Trie
 from .precompiled_contracts import RIPEMD160_ADDRESS
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +43,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -47,6 +52,7 @@ class BlockEnvironment:
     difficulty: Uint
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -78,19 +84,22 @@ class BlockOutput:
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
     gas_price: Uint
     gas: Uint
+    state: TransactionState
     index_in_block: Uint
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -113,6 +122,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
@@ -152,7 +162,7 @@ def incorporate_child_on_success(evm: Evm, child_evm: Evm) -> None:
     evm.accounts_to_delete.update(child_evm.accounts_to_delete)
     evm.touched_accounts.update(child_evm.touched_accounts)
     if account_exists_and_is_empty(
-        evm.message.block_env.state, child_evm.message.current_target
+        evm.message.tx_env.state, child_evm.message.current_target
     ):
         evm.touched_accounts.add(child_evm.message.current_target)
 
@@ -180,7 +190,7 @@ def incorporate_child_on_error(evm: Evm, child_evm: Evm) -> None:
         evm.touched_accounts.add(RIPEMD160_ADDRESS)
     if child_evm.message.current_target == RIPEMD160_ADDRESS:
         if account_exists_and_is_empty(
-            evm.message.block_env.state, child_evm.message.current_target
+            evm.message.tx_env.state, child_evm.message.current_target
         ):
             evm.touched_accounts.add(RIPEMD160_ADDRESS)
     evm.gas_left += child_evm.gas_left
diff --git a/src/ethereum/forks/istanbul/vm/gas.py b/src/ethereum/forks/istanbul/vm/gas.py
index eb56b502d0a..f122c967dc6 100644
--- a/src/ethereum/forks/istanbul/vm/gas.py
+++ b/src/ethereum/forks/istanbul/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32
@@ -22,51 +22,146 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_SLOAD = Uint(800)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 15000
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_EXTERNAL = Uint(700)
-GAS_BALANCE = Uint(700)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_CALL = Uint(700)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-REFUND_SELF_DESTRUCT = 24000
-GAS_ECRECOVER = Uint(3000)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_CODE_HASH = Uint(700)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    SLOAD: Final[Uint] = Uint(800)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 15000
+    REFUND_SELF_DESTRUCT: Final[int] = 24000
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_PER_ZERO: Final[Uint] = Uint(4)
+    TX_DATA_PER_NON_ZERO: Final[Uint] = Uint(16)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_EXTCODEHASH: Final[Uint] = Uint(700)
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_DIFFICULTY: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+    OPCODE_EXTERNAL_BASE: Final[Uint] = Uint(700)
+    OPCODE_BALANCE: Final[Uint] = Uint(700)
+    OPCODE_CALL_BASE: Final[Uint] = Uint(700)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -82,11 +177,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -138,7 +234,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -168,7 +264,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -193,7 +289,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
diff --git a/src/ethereum/forks/istanbul/vm/instructions/arithmetic.py b/src/ethereum/forks/istanbul/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/istanbul/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/istanbul/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/istanbul/vm/instructions/bitwise.py b/src/ethereum/forks/istanbul/vm/instructions/bitwise.py
index 41dabe8185b..1de6c615931 100644
--- a/src/ethereum/forks/istanbul/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/istanbul/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +172,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +202,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +232,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
diff --git a/src/ethereum/forks/istanbul/vm/instructions/block.py b/src/ethereum/forks/istanbul/vm/instructions/block.py
index bbf01739ff2..e3400f9461a 100644
--- a/src/ethereum/forks/istanbul/vm/instructions/block.py
+++ b/src/ethereum/forks/istanbul/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -33,7 +33,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -75,7 +75,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -102,7 +102,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -128,7 +128,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -154,7 +154,7 @@ def difficulty(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_DIFFICULTY)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.difficulty))
@@ -180,7 +180,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -203,7 +203,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/istanbul/vm/instructions/comparison.py b/src/ethereum/forks/istanbul/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/istanbul/vm/instructions/comparison.py
+++ b/src/ethereum/forks/istanbul/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/istanbul/vm/instructions/control_flow.py b/src/ethereum/forks/istanbul/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/istanbul/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/istanbul/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/istanbul/vm/instructions/environment.py b/src/ethereum/forks/istanbul/vm/instructions/environment.py
index f0cc93e67d8..87860dbd693 100644
--- a/src/ethereum/forks/istanbul/vm/instructions/environment.py
+++ b/src/ethereum/forks/istanbul/vm/instructions/environment.py
@@ -13,23 +13,16 @@
 
 from ethereum_types.numeric import U256, Uint, ulen
 
+from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...fork_types import EMPTY_ACCOUNT
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BALANCE,
-    GAS_BASE,
-    GAS_CODE_HASH,
-    GAS_COPY,
-    GAS_EXTERNAL,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -50,7 +43,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -73,11 +66,12 @@ def balance(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BALANCE)
+    charge_gas(evm, GasCosts.OPCODE_BALANCE)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -100,7 +94,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -123,7 +117,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -146,7 +140,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -170,7 +164,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -195,7 +189,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -224,11 +218,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -253,7 +250,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -282,11 +279,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -311,7 +311,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -334,11 +334,12 @@ def extcodesize(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_EXTERNAL)
+    charge_gas(evm, GasCosts.OPCODE_EXTERNAL_BASE)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -365,16 +366,20 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_EXTERNAL + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_EXTERNAL_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -397,7 +402,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -423,11 +428,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -455,10 +465,10 @@ def extcodehash(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_CODE_HASH)
+    charge_gas(evm, GasCosts.OPCODE_EXTCODEHASH)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -485,12 +495,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
diff --git a/src/ethereum/forks/istanbul/vm/instructions/keccak.py b/src/ethereum/forks/istanbul/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/istanbul/vm/instructions/keccak.py
+++ b/src/ethereum/forks/istanbul/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/istanbul/vm/instructions/log.py b/src/ethereum/forks/istanbul/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/istanbul/vm/instructions/log.py
+++ b/src/ethereum/forks/istanbul/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/istanbul/vm/instructions/memory.py b/src/ethereum/forks/istanbul/vm/instructions/memory.py
index 3a242ba2f7a..93861811559 100644
--- a/src/ethereum/forks/istanbul/vm/instructions/memory.py
+++ b/src/ethereum/forks/istanbul/vm/instructions/memory.py
@@ -16,8 +16,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,7 +45,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -77,7 +76,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -105,7 +104,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -132,7 +131,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
diff --git a/src/ethereum/forks/istanbul/vm/instructions/stack.py b/src/ethereum/forks/istanbul/vm/instructions/stack.py
index 0fc0d3fe4b5..901bff4ed3b 100644
--- a/src/ethereum/forks/istanbul/vm/instructions/stack.py
+++ b/src/ethereum/forks/istanbul/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -62,7 +66,7 @@ def push_n(evm: Evm, num_bytes: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -92,7 +96,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -124,7 +128,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -136,69 +140,69 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/istanbul/vm/instructions/storage.py b/src/ethereum/forks/istanbul/vm/instructions/storage.py
index 9150b8cb578..07ba90a057c 100644
--- a/src/ethereum/forks/istanbul/vm/instructions/storage.py
+++ b/src/ethereum/forks/istanbul/vm/instructions/storage.py
@@ -13,15 +13,11 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import get_storage, get_storage_original, set_storage
+from ...state_tracker import get_storage, get_storage_original, set_storage
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -42,12 +38,11 @@ def sload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_SLOAD)
+    charge_gas(evm, GasCosts.SLOAD)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -68,46 +63,50 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost = GAS_STORAGE_SET
+            gas_cost = GasCosts.STORAGE_SET
         else:
-            gas_cost = GAS_STORAGE_UPDATE
+            gas_cost = GasCosts.COLD_STORAGE_WRITE
     else:
-        gas_cost = GAS_SLOAD
+        gas_cost = GasCosts.SLOAD
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
             # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
             # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
             # Storage slot being restored to its original value
             if original_value == 0:
                 # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_SLOAD)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.SLOAD
+                )
             else:
                 # Slot was originally non-empty and was UPDATED earlier
-                evm.refund_counter += int(GAS_STORAGE_UPDATE - GAS_SLOAD)
+                evm.refund_counter += int(
+                    GasCosts.COLD_STORAGE_WRITE - GasCosts.SLOAD
+                )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
diff --git a/src/ethereum/forks/istanbul/vm/instructions/system.py b/src/ethereum/forks/istanbul/vm/instructions/system.py
index a0b00f24d1e..8002d48698a 100644
--- a/src/ethereum/forks/istanbul/vm/instructions/system.py
+++ b/src/ethereum/forks/istanbul/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
@@ -40,15 +40,7 @@
 )
 from ..exceptions import Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL,
-    GAS_CALL_VALUE,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_ZERO,
-    REFUND_SELF_DESTRUCT,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -83,7 +75,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -95,11 +87,9 @@ def generic_create(
         return
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
@@ -107,7 +97,7 @@ def generic_create(
         evm.memory, memory_start_position, memory_size
     )
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -157,14 +147,14 @@ def create(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -202,8 +192,8 @@ def create2(evm: Evm) -> None:
     call_data_words = ceil32(Uint(memory_size)) // Uint(32)
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost,
     )
 
@@ -242,7 +232,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -285,8 +275,8 @@ def generic_call(
     call_data = memory_read_bytes(
         evm.memory, memory_input_start_position, memory_input_size
     )
-    code_account = get_account(evm.message.block_env.state, code_address)
-    code = get_code(evm.message.block_env.state, code_account.code_hash)
+    code_account = get_account(evm.message.tx_env.state, code_address)
+    code = get_code(evm.message.tx_env.state, code_account.code_hash)
     child_message = Message(
         block_env=evm.message.block_env,
         tx_env=evm.message.tx_env,
@@ -352,23 +342,23 @@ def call(evm: Evm) -> None:
 
     code_address = to
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
         Uint(evm.gas_left),
         extend_memory.cost,
-        GAS_CALL + create_gas_cost + transfer_gas_cost,
+        GasCosts.OPCODE_CALL_BASE + create_gas_cost + transfer_gas_cost,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
     if evm.message.is_static and value != U256(0):
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -423,20 +413,20 @@ def callcode(evm: Evm) -> None:
             (memory_output_start_position, memory_output_size),
         ],
     )
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
         Uint(evm.gas_left),
         extend_memory.cost,
-        GAS_CALL + transfer_gas_cost,
+        GasCosts.OPCODE_CALL_BASE + transfer_gas_cost,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -476,15 +466,15 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     originator = evm.message.current_target
 
@@ -495,7 +485,7 @@ def selfdestruct(evm: Evm) -> None:
         parent_evm = parent_evm.message.parent_evm
 
     if originator not in refunded_accounts:
-        evm.refund_counter += REFUND_SELF_DESTRUCT
+        evm.refund_counter += GasCosts.REFUND_SELF_DESTRUCT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -503,28 +493,28 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     beneficiary_balance = get_account(
-        evm.message.block_env.state, beneficiary
+        evm.message.tx_env.state, beneficiary
     ).balance
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     # First Transfer to beneficiary
     set_account_balance(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         beneficiary,
         beneficiary_balance + originator_balance,
     )
     # Next, Zero the balance of the address being deleted (must come after
     # sending to beneficiary in case the contract named itself as the
     # beneficiary).
-    set_account_balance(evm.message.block_env.state, originator, U256(0))
+    set_account_balance(evm.message.tx_env.state, originator, U256(0))
 
     # register account for deletion
     evm.accounts_to_delete.add(originator)
 
     # mark beneficiary as touched
-    if account_exists_and_is_empty(evm.message.block_env.state, beneficiary):
+    if account_exists_and_is_empty(evm.message.tx_env.state, beneficiary):
         evm.touched_accounts.add(beneficiary)
 
     # HALT the execution
@@ -561,7 +551,11 @@ def delegatecall(evm: Evm) -> None:
         ],
     )
     message_call_gas = calculate_message_call_gas(
-        U256(0), gas, Uint(evm.gas_left), extend_memory.cost, GAS_CALL
+        U256(0),
+        gas,
+        Uint(evm.gas_left),
+        extend_memory.cost,
+        GasCosts.OPCODE_CALL_BASE,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
@@ -620,7 +614,7 @@ def staticcall(evm: Evm) -> None:
         gas,
         Uint(evm.gas_left),
         extend_memory.cost,
-        GAS_CALL,
+        GasCosts.OPCODE_CALL_BASE,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
diff --git a/src/ethereum/forks/istanbul/vm/interpreter.py b/src/ethereum/forks/istanbul/vm/interpreter.py
index 7a92f7471f3..ed7b86a45d9 100644
--- a/src/ethereum/forks/istanbul/vm/interpreter.py
+++ b/src/ethereum/forks/istanbul/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,21 +31,21 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     increment_nonce,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
     touch_account,
 )
 from ..vm import Message
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -63,6 +63,7 @@
 MAX_CODE_SIZE = 0x6000
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -102,12 +103,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -121,9 +122,7 @@ def process_message_call(message: Message) -> MessageCallOutput:
             evm = process_create_message(message)
     else:
         evm = process_message(message)
-        if account_exists_and_is_empty(
-            block_env.state, Address(message.target)
-        ):
+        if account_exists_and_is_empty(tx_state, Address(message.target)):
             evm.touched_accounts.add(Address(message.target))
 
     if evm.error:
@@ -166,34 +165,44 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state)
-
-    # The list of created accounts is used by `get_storage_original`.
-    mark_account_created(state, message.current_target)
-
-    increment_nonce(state, message.current_target)
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts.
+    mark_account_created(tx_state, message.current_target)
+
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             charge_gas(evm, contract_code_gas)
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -212,7 +221,7 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
@@ -237,13 +246,16 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
 
-    touch_account(state, message.current_target)
+    touch_account(tx_state, message.current_target)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -274,9 +286,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state)
-    else:
-        commit_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/istanbul/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/istanbul/vm/precompiled_contracts/alt_bn128.py
index 214725d8da0..862506c54c3 100644
--- a/src/ethereum/forks/istanbul/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/istanbul/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(150))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(6000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(34000 * (len(data) // 192) + 45000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/istanbul/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/istanbul/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/istanbul/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/istanbul/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/istanbul/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/istanbul/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/istanbul/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/istanbul/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/istanbul/vm/precompiled_contracts/identity.py b/src/ethereum/forks/istanbul/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/istanbul/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/istanbul/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/istanbul/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/istanbul/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/istanbul/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/istanbul/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/istanbul/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/istanbul/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/istanbul/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/istanbul/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/london/__init__.py b/src/ethereum/forks/london/__init__.py
index 95caf15ed4c..c13617d1c49 100644
--- a/src/ethereum/forks/london/__init__.py
+++ b/src/ethereum/forks/london/__init__.py
@@ -35,7 +35,7 @@
 [EIP-3529]: https://eips.ethereum.org/EIPS/eip-3529
 [EIP-3541]: https://eips.ethereum.org/EIPS/eip-3541
 [EIP-3554]: https://eips.ethereum.org/EIPS/eip-3554
-[Besu 21.7.2]: https://github.com/hyperledger/besu/releases/tag/21.7.2
+[Besu 21.7.2]: https://github.com/besu-eth/besu/releases/tag/21.7.2
 [e]: https://github.com/ledgerwatch/erigon/releases/tag/v2021.07.04
 [js]: https://github.com/ethereumjs/ethereumjs-monorepo/releases/tag/%40ethereumjs%2Fvm%405.5.0
 [Geth 1.10.6]: https://github.com/ethereum/go-ethereum/releases/tag/v1.10.6
diff --git a/src/ethereum/forks/london/blocks.py b/src/ethereum/forks/london/blocks.py
index 20971a661c0..d6708cc2f68 100644
--- a/src/ethereum/forks/london/blocks.py
+++ b/src/ethereum/forks/london/blocks.py
@@ -10,7 +10,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
@@ -18,8 +18,9 @@
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.crypto.hash import Hash32
+from ethereum.state import Address, Root
 
-from .fork_types import Address, Bloom, Root
+from .fork_types import Bloom
 from .transactions import (
     AccessListTransaction,
     FeeMarketTransaction,
@@ -28,6 +29,7 @@
 )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -69,13 +71,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.london.state.state_root
-    [Trie]: ref:ethereum.forks.london.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -85,8 +88,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.london.trie.root
-    [Trie]: ref:ethereum.forks.london.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -96,8 +99,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.london.trie.root
-    [Trie]: ref:ethereum.forks.london.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -181,6 +184,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -227,6 +231,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -259,6 +264,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/london/fork.py b/src/ethereum/forks/london/fork.py
index a095e5fb6b9..d5ce75bd533 100644
--- a/src/ethereum/forks/london/fork.py
+++ b/src/ethereum/forks/london/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
@@ -29,6 +29,13 @@
     NonceMismatchError,
 )
 from ethereum.fork_criteria import ByBlockNumber
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import FORK_CRITERIA, vm
 from .blocks import Block, Header, Log, Receipt, encode_receipt
@@ -37,17 +44,18 @@
     InsufficientMaxFeePerGasError,
     PriorityFeeGreaterThanMaxFeeError,
 )
-from .fork_types import EMPTY_CODE_HASH, Address
-from .state import (
-    State,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
     account_exists_and_is_empty,
     create_ether,
     destroy_account,
     destroy_touched_empty_accounts,
+    extract_block_diff,
     get_account,
+    incorporate_tx_into_block,
     increment_nonce,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
     AccessListTransaction,
@@ -60,15 +68,13 @@
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.message import prepare_message
+from .vm.gas import GasCosts
 from .vm.interpreter import process_message_call
 
 BLOCK_REWARD = U256(2 * 10**18)
 BASE_FEE_MAX_CHANGE_DENOMINATOR = Uint(8)
 ELASTICITY_MULTIPLIER = Uint(2)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 MINIMUM_DIFFICULTY = Uint(131072)
 INITIAL_BASE_FEE = Uint(1000000000)
 MAX_OMMER_DEPTH = Uint(6)
@@ -76,6 +82,7 @@
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -177,9 +184,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     validate_header(chain, block.header)
     validate_ommers(block.ommers, block.header, chain)
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -194,7 +203,12 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         ommers=block.ommers,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes,
+        block_diff.storage_changes,
+        block_diff.storage_clears,
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -212,6 +226,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block_logs_bloom != block.header.bloom:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -440,6 +455,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Tuple[Address, Uint]:
     """
     Check if the transaction is includable in the block.
@@ -452,6 +468,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -482,7 +500,7 @@ def check_transaction(
     if tx.gas > gas_available:
         raise GasUsedExceedsLimitError("gas used exceeds limit")
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     if isinstance(tx, FeeMarketTransaction):
         if tx.max_fee_per_gas < tx.max_priority_fee_per_gas:
@@ -591,7 +609,7 @@ def apply_body(
     for i, tx in enumerate(map(decode_transaction, transactions)):
         process_transaction(block_env, block_output, tx, Uint(i))
 
-    pay_rewards(block_env.state, block_env.number, block_env.coinbase, ommers)
+    pay_rewards(block_env, ommers)
 
     return block_output
 
@@ -673,9 +691,7 @@ def validate_ommers(
 
 
 def pay_rewards(
-    state: State,
-    block_number: Uint,
-    coinbase: Address,
+    block_env: vm.BlockEnvironment,
     ommers: Tuple[Header, ...],
 ) -> None:
     """
@@ -694,25 +710,24 @@ def pay_rewards(
 
     Parameters
     ----------
-    state :
-        Current account state.
-    block_number :
-        Position of the block within the chain.
-    coinbase :
-        Address of account which receives block reward and transaction fees.
+    block_env :
+        The block scoped environment.
     ommers :
         List of ommers mentioned in the current block.
 
     """
+    rewards_state = TransactionState(parent=block_env.state)
     ommer_count = U256(len(ommers))
     miner_reward = BLOCK_REWARD + (ommer_count * (BLOCK_REWARD // U256(32)))
-    create_ether(state, coinbase, miner_reward)
+    create_ether(rewards_state, block_env.coinbase, miner_reward)
 
     for ommer in ommers:
         # Ommer age with respect to the current block.
-        ommer_age = U256(block_number - ommer.number)
+        ommer_age = U256(block_env.number - ommer.number)
         ommer_miner_reward = ((U256(8) - ommer_age) * BLOCK_REWARD) // U256(8)
-        create_ether(state, ommer.coinbase, ommer_miner_reward)
+        create_ether(rewards_state, ommer.coinbase, ommer_miner_reward)
+
+    incorporate_tx_into_block(rewards_state)
 
 
 def process_transaction(
@@ -745,6 +760,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(
         block_output.transactions_trie,
         rlp.encode(index),
@@ -760,21 +777,20 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     effective_gas_fee = tx.gas * effective_gas_price
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     sender_balance_after_gas_fee = (
         Uint(sender_account.balance) - effective_gas_fee
     )
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     access_list_addresses = set()
     access_list_storage_keys = set()
@@ -790,6 +806,7 @@ def process_transaction(
         gas=gas,
         access_list_addresses=access_list_addresses,
         access_list_storage_keys=access_list_storage_keys,
+        state=tx_state,
         index_in_block=index,
         tx_hash=get_transaction_hash(encode_transaction(tx)),
     )
@@ -811,28 +828,25 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * priority_fee_per_gas
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
     coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
+        tx_state, block_env.coinbase
     ).balance + U256(transaction_fee)
     if coinbase_balance_after_mining_fee != 0:
         set_account_balance(
-            block_env.state,
+            tx_state,
             block_env.coinbase,
             coinbase_balance_after_mining_fee,
         )
-    elif account_exists_and_is_empty(block_env.state, block_env.coinbase):
-        destroy_account(block_env.state, block_env.coinbase)
+    elif account_exists_and_is_empty(tx_state, block_env.coinbase):
+        destroy_account(tx_state, block_env.coinbase)
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
-    destroy_touched_empty_accounts(block_env.state, tx_output.touched_accounts)
+    destroy_touched_empty_accounts(tx_state, tx_output.touched_accounts)
 
     block_output.block_gas_used += tx_gas_used_after_refund
 
@@ -851,6 +865,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
     """
@@ -858,12 +874,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
     passed through as a parameter is greater than or equal to the *sum* of
     the parent's gas and the adjustment delta then the limit for gas is too
     high and fails this function's check. Similarly, if the limit is less
     than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
+    delta *or* the predefined ``LIMIT_MINIMUM`` then this function's
     check fails because the gas limit doesn't allow for a sufficient or
     reasonable amount of gas to be used on a block.
 
@@ -881,12 +897,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/london/fork_types.py b/src/ethereum/forks/london/fork_types.py
index ae4525bbbdd..02907cd2a1a 100644
--- a/src/ethereum/forks/london/fork_types.py
+++ b/src/ethereum/forks/london/fork_types.py
@@ -11,41 +11,13 @@
 Types reused throughout the specification, which are specific to Ethereum.
 """
 
-from dataclasses import dataclass
-
 from ethereum_rlp import rlp
-from ethereum_types.bytes import Bytes, Bytes20, Bytes256
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
+from ethereum_types.bytes import Bytes, Bytes256
 
-Address = Bytes20
-Root = Hash32
+from ethereum.state import Account
 
 Bloom = Bytes256
 
-EMPTY_CODE_HASH = keccak256(b"")
-
-
-@slotted_freezable
-@dataclass
-class Account:
-    """
-    State associated with an address.
-    """
-
-    nonce: Uint
-    balance: U256
-    code_hash: Hash32
-
-
-EMPTY_ACCOUNT = Account(
-    nonce=Uint(0),
-    balance=U256(0),
-    code_hash=EMPTY_CODE_HASH,
-)
-
 
 def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     """
diff --git a/src/ethereum/forks/london/state.py b/src/ethereum/forks/london/state.py
deleted file mode 100644
index ce3e80c53fb..00000000000
--- a/src/ethereum/forks/london/state.py
+++ /dev/null
@@ -1,672 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, Iterable, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-
-from .fork_types import EMPTY_ACCOUNT, EMPTY_CODE_HASH, Account, Address, Root
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-
-
-def begin_transaction(state: State) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-
-
-def commit_transaction(state: State) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-
-def rollback_transaction(state: State) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State``.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def account_exists_and_is_empty(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists and has zero nonce, empty code and zero
-    balance.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    exists_and_is_empty : `bool`
-        True if an account exists and has zero nonce, empty code and zero
-        balance, False otherwise.
-
-    """
-    account = get_account_optional(state, address)
-    return (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def touch_account(state: State, address: Address) -> None:
-    """
-    Initializes an account to state.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        The address of the account that needs to be initialized.
-
-    """
-    if not account_exists(state, address):
-        set_account(state, address, EMPTY_ACCOUNT)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def create_ether(state: State, address: Address, amount: U256) -> None:
-    """
-    Add newly created ether to an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to which ether is added.
-    amount:
-        The amount of ether to be added to the account of interest.
-
-    """
-
-    def increase_balance(account: Account) -> None:
-        account.balance += amount
-
-    modify_state(state, address, increase_balance)
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
-
-
-def destroy_touched_empty_accounts(
-    state: State, touched_accounts: Iterable[Address]
-) -> None:
-    """
-    Destroy all touched accounts that are empty.
-
-    Parameters
-    ----------
-    state: `State`
-        The current state.
-    touched_accounts: `Iterable[Address]`
-        All the accounts that have been touched in the current transaction.
-
-    """
-    for address in touched_accounts:
-        if account_exists_and_is_empty(state, address):
-            destroy_account(state, address)
diff --git a/src/ethereum/forks/london/state_tracker.py b/src/ethereum/forks/london/state_tracker.py
new file mode 100644
index 00000000000..24362ecff98
--- /dev/null
+++ b/src/ethereum/forks/london/state_tracker.py
@@ -0,0 +1,805 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+
+    ``storage_clears`` records addresses whose storage was wiped by
+    a pre-EIP-6780 ``SELFDESTRUCT`` earlier in the block, so later
+    reads must not fall back to ``pre_state`` storage.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    storage_clears: Set[Address] = field(default_factory=set)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    storage_clears: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.storage_clears:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if address in tx_state.storage_clears:
+        return False
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    if address in tx_state.parent.storage_clears:
+        return False
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+    tx_state.storage_clears.add(address)
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        storage_clears=set(tx_state.storage_clears),
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.storage_clears = snapshot.storage_clears
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address in tx_state.storage_clears:
+        block.storage_clears.add(address)
+        block.storage_writes.pop(address, None)
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.storage_clears.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+        storage_clears=block_state.storage_clears,
+    )
+
+
+def destroy_touched_empty_accounts(
+    tx_state: TransactionState, touched_accounts: Set[Address]
+) -> None:
+    """
+    Destroy all touched accounts that are empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    touched_accounts :
+        All the accounts that have been touched in the current transaction.
+
+    """
+    for address in touched_accounts:
+        if account_exists_and_is_empty(tx_state, address):
+            destroy_account(tx_state, address)
+
+
+def touch_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Initialize an account to state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be initialized.
+
+    """
+    if not account_exists(tx_state, address):
+        set_account(tx_state, address, EMPTY_ACCOUNT)
diff --git a/src/ethereum/forks/london/transactions.py b/src/ethereum/forks/london/transactions.py
index ca951f085c2..902128e634c 100644
--- a/src/ethereum/forks/london/transactions.py
+++ b/src/ethereum/forks/london/transactions.py
@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -19,42 +19,12 @@
     InvalidSignatureError,
     NonceOverflowError,
 )
+from ethereum.state import Address
 
 from .exceptions import TransactionTypeError
-from .fork_types import Address
-
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_PER_NON_ZERO = Uint(16)
-"""
-Gas cost per non-zero byte in the transaction data.
-"""
-
-GAS_TX_DATA_PER_ZERO = Uint(4)
-"""
-Gas cost per zero byte in the transaction data.
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
-
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
-"""
-
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
-"""
 
 
+@final
 @slotted_freezable
 @dataclass
 class LegacyTransaction:
@@ -114,6 +84,7 @@ class LegacyTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Access:
@@ -133,6 +104,7 @@ class Access:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccessListTransaction:
@@ -205,6 +177,7 @@ class AccessListTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class FeeMarketTransaction:
@@ -370,7 +343,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
     4. Cost for access list entries (if applicable)
@@ -378,27 +351,29 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     This function takes a transaction as a parameter and returns the intrinsic
     gas cost of the transaction.
     """
+    from .vm.gas import GasCosts
+
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
     data_cost = (
-        num_zeros * GAS_TX_DATA_PER_ZERO
-        + num_non_zeros * GAS_TX_DATA_PER_NON_ZERO
+        num_zeros * GasCosts.TX_DATA_PER_ZERO
+        + num_non_zeros * GasCosts.TX_DATA_PER_NON_ZERO
     )
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE
+        create_cost = GasCosts.TX_CREATE
     else:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
     if isinstance(tx, (AccessListTransaction, FeeMarketTransaction)):
         for access in tx.access_list:
-            access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_cost += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
 
-    return GAS_TX_BASE + data_cost + create_cost + access_list_cost
+    return GasCosts.TX_BASE + data_cost + create_cost + access_list_cost
 
 
 def recover_sender(chain_id: U64, tx: Transaction) -> Address:
diff --git a/src/ethereum/forks/london/trie.py b/src/ethereum/forks/london/trie.py
deleted file mode 100644
index 0deeb2d3c9e..00000000000
--- a/src/ethereum/forks/london/trie.py
+++ /dev/null
@@ -1,498 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    assert_type,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.berlin import trie as previous_trie
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt
-from .fork_types import Account, Address, Root, encode_account
-from .transactions import LegacyTransaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = Account | Bytes | LegacyTransaction | Receipt | Uint | U256 | None
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[LegacyTransaction | Bytes],
-    Optional[Receipt | Bytes],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `rlp.RLP`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (LegacyTransaction, Receipt, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/london/utils/hexadecimal.py b/src/ethereum/forks/london/utils/hexadecimal.py
index dacf228fb61..dff7d71434b 100644
--- a/src/ethereum/forks/london/utils/hexadecimal.py
+++ b/src/ethereum/forks/london/utils/hexadecimal.py
@@ -14,11 +14,9 @@
 
 from ethereum_types.bytes import Bytes
 
-from ethereum.state import Address
+from ethereum.state import Address, Root
 from ethereum.utils.hexadecimal import remove_hex_prefix
 
-from ..fork_types import Root
-
 
 def hex_to_root(hex_string: str) -> Root:
     """
diff --git a/src/ethereum/forks/london/utils/message.py b/src/ethereum/forks/london/utils/message.py
index 9e09d85d6ef..61028ce170c 100644
--- a/src/ethereum/forks/london/utils/message.py
+++ b/src/ethereum/forks/london/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
@@ -55,7 +55,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -63,8 +63,8 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        account = get_account(block_env.state, tx.to)
-        code = get_code(block_env.state, account.code_hash)
+        account = get_account(tx_env.state, tx.to)
+        code = get_code(tx_env.state, account.code_hash)
 
         code_address = tx.to
     else:
diff --git a/src/ethereum/forks/london/vm/__init__.py b/src/ethereum/forks/london/vm/__init__.py
index 46462ee6abc..6bc15f7325f 100644
--- a/src/ethereum/forks/london/vm/__init__.py
+++ b/src/ethereum/forks/london/vm/__init__.py
@@ -13,24 +13,29 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt
-from ..state import State, account_exists_and_is_empty
+from ..state_tracker import (
+    BlockState,
+    TransactionState,
+    account_exists_and_is_empty,
+)
 from ..transactions import LegacyTransaction
-from ..trie import Trie
 from .precompiled_contracts import RIPEMD160_ADDRESS
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +43,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -48,6 +53,7 @@ class BlockEnvironment:
     difficulty: Uint
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -79,10 +85,11 @@ class BlockOutput:
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
@@ -90,10 +97,12 @@ class TransactionEnvironment:
     gas: Uint
     access_list_addresses: Set[Address]
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
+    state: TransactionState
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -118,6 +127,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
@@ -159,7 +169,7 @@ def incorporate_child_on_success(evm: Evm, child_evm: Evm) -> None:
     evm.accounts_to_delete.update(child_evm.accounts_to_delete)
     evm.touched_accounts.update(child_evm.touched_accounts)
     if account_exists_and_is_empty(
-        evm.message.block_env.state, child_evm.message.current_target
+        evm.message.tx_env.state, child_evm.message.current_target
     ):
         evm.touched_accounts.add(child_evm.message.current_target)
     evm.accessed_addresses.update(child_evm.accessed_addresses)
@@ -189,7 +199,7 @@ def incorporate_child_on_error(evm: Evm, child_evm: Evm) -> None:
         evm.touched_accounts.add(RIPEMD160_ADDRESS)
     if child_evm.message.current_target == RIPEMD160_ADDRESS:
         if account_exists_and_is_empty(
-            evm.message.block_env.state, child_evm.message.current_target
+            evm.message.tx_env.state, child_evm.message.current_target
         ):
             evm.touched_accounts.add(RIPEMD160_ADDRESS)
     evm.gas_left += child_evm.gas_left
diff --git a/src/ethereum/forks/london/vm/gas.py b/src/ethereum/forks/london/vm/gas.py
index 1929dd5ca3b..898c7024d28 100644
--- a/src/ethereum/forks/london/vm/gas.py
+++ b/src/ethereum/forks/london/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32
@@ -22,48 +22,146 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 4800
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-GAS_ECRECOVER = Uint(3000)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1)
-GAS_COLD_SLOAD = Uint(2100)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600)
-GAS_WARM_ACCESS = Uint(100)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    WARM_ACCESS: Final[Uint] = Uint(100)
+    COLD_ACCOUNT_ACCESS: Final[Uint] = Uint(2600)
+    COLD_STORAGE_ACCESS: Final[Uint] = Uint(2100)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 4800
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_PER_ZERO: Final[Uint] = Uint(4)
+    TX_DATA_PER_NON_ZERO: Final[Uint] = Uint(16)
+    TX_ACCESS_LIST_ADDRESS: Final[Uint] = Uint(2400)
+    TX_ACCESS_LIST_STORAGE_KEY: Final[Uint] = Uint(1900)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_DIFFICULTY: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_BASEFEE: Final[Uint] = BASE
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -79,11 +177,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -135,7 +234,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -165,7 +264,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -190,7 +289,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
diff --git a/src/ethereum/forks/london/vm/instructions/arithmetic.py b/src/ethereum/forks/london/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/london/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/london/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/london/vm/instructions/bitwise.py b/src/ethereum/forks/london/vm/instructions/bitwise.py
index 41dabe8185b..1de6c615931 100644
--- a/src/ethereum/forks/london/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/london/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +172,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +202,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +232,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
diff --git a/src/ethereum/forks/london/vm/instructions/block.py b/src/ethereum/forks/london/vm/instructions/block.py
index bbf01739ff2..e3400f9461a 100644
--- a/src/ethereum/forks/london/vm/instructions/block.py
+++ b/src/ethereum/forks/london/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -33,7 +33,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -75,7 +75,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -102,7 +102,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -128,7 +128,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -154,7 +154,7 @@ def difficulty(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_DIFFICULTY)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.difficulty))
@@ -180,7 +180,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -203,7 +203,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/london/vm/instructions/comparison.py b/src/ethereum/forks/london/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/london/vm/instructions/comparison.py
+++ b/src/ethereum/forks/london/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/london/vm/instructions/control_flow.py b/src/ethereum/forks/london/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/london/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/london/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/london/vm/instructions/environment.py b/src/ethereum/forks/london/vm/instructions/environment.py
index fe1b70c1269..904a7b8a9d0 100644
--- a/src/ethereum/forks/london/vm/instructions/environment.py
+++ b/src/ethereum/forks/london/vm/instructions/environment.py
@@ -13,22 +13,16 @@
 
 from ethereum_types.numeric import U256, Uint, ulen
 
+from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...fork_types import EMPTY_ACCOUNT
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BASE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_COPY,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
-    GAS_WARM_ACCESS,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -49,7 +43,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -73,14 +67,15 @@ def balance(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_addresses.add(address)
-        charge_gas(evm, GAS_COLD_ACCOUNT_ACCESS)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -103,7 +98,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -126,7 +121,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -149,7 +144,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -173,7 +168,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -198,7 +193,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -227,11 +222,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -256,7 +254,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -285,11 +283,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -314,7 +315,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -338,16 +339,17 @@ def extcodesize(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -374,23 +376,24 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
 
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost + copy_gas_cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -413,7 +416,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -439,11 +442,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -472,15 +480,15 @@ def extcodehash(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -507,12 +515,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
@@ -535,7 +543,7 @@ def base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BASEFEE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.base_fee_per_gas))
diff --git a/src/ethereum/forks/london/vm/instructions/keccak.py b/src/ethereum/forks/london/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/london/vm/instructions/keccak.py
+++ b/src/ethereum/forks/london/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/london/vm/instructions/log.py b/src/ethereum/forks/london/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/london/vm/instructions/log.py
+++ b/src/ethereum/forks/london/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/london/vm/instructions/memory.py b/src/ethereum/forks/london/vm/instructions/memory.py
index 3a242ba2f7a..93861811559 100644
--- a/src/ethereum/forks/london/vm/instructions/memory.py
+++ b/src/ethereum/forks/london/vm/instructions/memory.py
@@ -16,8 +16,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,7 +45,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -77,7 +76,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -105,7 +104,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -132,7 +131,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
diff --git a/src/ethereum/forks/london/vm/instructions/stack.py b/src/ethereum/forks/london/vm/instructions/stack.py
index 0fc0d3fe4b5..901bff4ed3b 100644
--- a/src/ethereum/forks/london/vm/instructions/stack.py
+++ b/src/ethereum/forks/london/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -62,7 +66,7 @@ def push_n(evm: Evm, num_bytes: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -92,7 +96,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -124,7 +128,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -136,69 +140,69 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/london/vm/instructions/storage.py b/src/ethereum/forks/london/vm/instructions/storage.py
index 6129ed5322c..e9d86666668 100644
--- a/src/ethereum/forks/london/vm/instructions/storage.py
+++ b/src/ethereum/forks/london/vm/instructions/storage.py
@@ -13,16 +13,11 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import get_storage, get_storage_original, set_storage
+from ...state_tracker import get_storage, get_storage_original, set_storage
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,15 +39,14 @@ def sload(evm: Evm) -> None:
 
     # GAS
     if (evm.message.current_target, key) in evm.accessed_storage_keys:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        charge_gas(evm, GAS_COLD_SLOAD)
+        charge_gas(evm, GasCosts.COLD_STORAGE_ACCESS)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -73,54 +67,60 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     gas_cost = Uint(0)
 
     if (evm.message.current_target, key) not in evm.accessed_storage_keys:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        gas_cost += GAS_COLD_SLOAD
+        gas_cost += GasCosts.COLD_STORAGE_ACCESS
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost += GAS_STORAGE_SET
+            gas_cost += GasCosts.STORAGE_SET
         else:
-            gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_SLOAD
+            gas_cost += (
+                GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
+            )
     else:
-        gas_cost += GAS_WARM_ACCESS
+        gas_cost += GasCosts.WARM_ACCESS
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
             # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
             # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
             # Storage slot being restored to its original value
             if original_value == 0:
                 # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_WARM_ACCESS)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.WARM_ACCESS
+                )
             else:
                 # Slot was originally non-empty and was UPDATED earlier
                 evm.refund_counter += int(
-                    GAS_STORAGE_UPDATE - GAS_COLD_SLOAD - GAS_WARM_ACCESS
+                    GasCosts.COLD_STORAGE_WRITE
+                    - GasCosts.COLD_STORAGE_ACCESS
+                    - GasCosts.WARM_ACCESS
                 )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
diff --git a/src/ethereum/forks/london/vm/instructions/system.py b/src/ethereum/forks/london/vm/instructions/system.py
index b48d2498ac3..89a0d310f51 100644
--- a/src/ethereum/forks/london/vm/instructions/system.py
+++ b/src/ethereum/forks/london/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
@@ -40,15 +40,7 @@
 )
 from ..exceptions import Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -83,7 +75,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -97,15 +89,13 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -157,14 +147,14 @@ def create(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -202,8 +192,8 @@ def create2(evm: Evm) -> None:
     call_data_words = ceil32(Uint(memory_size)) // Uint(32)
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost,
     )
 
@@ -242,7 +232,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -285,8 +275,8 @@ def generic_call(
     call_data = memory_read_bytes(
         evm.memory, memory_input_start_position, memory_input_size
     )
-    account = get_account(evm.message.block_env.state, code_address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    account = get_account(evm.message.tx_env.state, code_address)
+    code = get_code(evm.message.tx_env.state, account.code_hash)
     child_message = Message(
         block_env=evm.message.block_env,
         tx_env=evm.message.tx_env,
@@ -353,17 +343,17 @@ def call(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -376,7 +366,7 @@ def call(evm: Evm) -> None:
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -433,12 +423,12 @@ def callcode(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -451,7 +441,7 @@ def callcode(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -491,19 +481,19 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if beneficiary not in evm.accessed_addresses:
         evm.accessed_addresses.add(beneficiary)
-        gas_cost += GAS_COLD_ACCOUNT_ACCESS
+        gas_cost += GasCosts.COLD_ACCOUNT_ACCESS
 
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -511,28 +501,28 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     beneficiary_balance = get_account(
-        evm.message.block_env.state, beneficiary
+        evm.message.tx_env.state, beneficiary
     ).balance
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     # First Transfer to beneficiary
     set_account_balance(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         beneficiary,
         beneficiary_balance + originator_balance,
     )
     # Next, Zero the balance of the address being deleted (must come after
     # sending to beneficiary in case the contract named itself as the
     # beneficiary).
-    set_account_balance(evm.message.block_env.state, originator, U256(0))
+    set_account_balance(evm.message.tx_env.state, originator, U256(0))
 
     # register account for deletion
     evm.accounts_to_delete.add(originator)
 
     # mark beneficiary as touched
-    if account_exists_and_is_empty(evm.message.block_env.state, beneficiary):
+    if account_exists_and_is_empty(evm.message.tx_env.state, beneficiary):
         evm.touched_accounts.add(beneficiary)
 
     # HALT the execution
@@ -570,10 +560,10 @@ def delegatecall(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     message_call_gas = calculate_message_call_gas(
         U256(0), gas, Uint(evm.gas_left), extend_memory.cost, access_gas_cost
@@ -629,10 +619,10 @@ def staticcall(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
 
diff --git a/src/ethereum/forks/london/vm/interpreter.py b/src/ethereum/forks/london/vm/interpreter.py
index b49ca7be07f..1b42b4da68a 100644
--- a/src/ethereum/forks/london/vm/interpreter.py
+++ b/src/ethereum/forks/london/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,21 +31,21 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     increment_nonce,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
     touch_account,
 )
 from ..vm import Message
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -64,6 +64,7 @@
 MAX_CODE_SIZE = 0x6000
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -103,12 +104,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -122,9 +123,7 @@ def process_message_call(message: Message) -> MessageCallOutput:
             evm = process_create_message(message)
     else:
         evm = process_message(message)
-        if account_exists_and_is_empty(
-            block_env.state, Address(message.target)
-        ):
+        if account_exists_and_is_empty(tx_state, Address(message.target)):
             evm.touched_accounts.add(Address(message.target))
 
     if evm.error:
@@ -167,19 +166,30 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state)
-
-    # The list of created accounts is used by `get_storage_original`.
-    mark_account_created(state, message.current_target)
-
-    increment_nonce(state, message.current_target)
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts.
+    mark_account_created(tx_state, message.current_target)
+
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             if len(contract_code) > 0:
@@ -189,15 +199,14 @@ def process_create_message(message: Message) -> Evm:
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -216,7 +225,7 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
@@ -243,13 +252,16 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
 
-    touch_account(state, message.current_target)
+    touch_account(tx_state, message.current_target)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -281,9 +293,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state)
-    else:
-        commit_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/london/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/london/vm/precompiled_contracts/alt_bn128.py
index 214725d8da0..862506c54c3 100644
--- a/src/ethereum/forks/london/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/london/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(150))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(6000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(34000 * (len(data) // 192) + 45000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/london/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/london/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/london/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/london/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/london/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/london/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/london/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/london/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/london/vm/precompiled_contracts/identity.py b/src/ethereum/forks/london/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/london/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/london/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/london/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/london/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/london/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/london/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/london/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/london/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/london/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/london/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/monad_eight/blocks.py b/src/ethereum/forks/monad_eight/blocks.py
index 12b87d284e1..983643f4474 100644
--- a/src/ethereum/forks/monad_eight/blocks.py
+++ b/src/ethereum/forks/monad_eight/blocks.py
@@ -10,7 +10,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
@@ -31,6 +31,7 @@
 )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Withdrawal:
@@ -64,6 +65,7 @@ class Withdrawal:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -107,13 +109,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.monad_eight.state.state_root
-    [Trie]: ref:ethereum.forks.monad_eight.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -123,8 +126,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.monad_eight.trie.root
-    [Trie]: ref:ethereum.forks.monad_eight.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -134,8 +137,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.monad_eight.trie.root
-    [Trie]: ref:ethereum.forks.monad_eight.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -246,6 +249,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -299,6 +303,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -331,6 +336,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/monad_eight/fork.py b/src/ethereum/forks/monad_eight/fork.py
index 12f1cc6e4be..2798a630baa 100644
--- a/src/ethereum/forks/monad_eight/fork.py
+++ b/src/ethereum/forks/monad_eight/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Tuple
+from typing import Final, List, Optional, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
@@ -27,7 +27,13 @@
     InvalidSenderError,
     NonceMismatchError,
 )
-from ethereum.state import EMPTY_CODE_HASH, Account, Address
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt, Withdrawal, encode_receipt
@@ -50,21 +56,21 @@
     compute_requests_hash,
     parse_deposit_requests,
 )
-from .state import (
-    State,
-    TransientStorage,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
     add_sender_authority,
+    create_ether,
     destroy_account,
+    extract_block_diff,
     forget_senders_authorities,
     get_account,
     get_code,
+    incorporate_tx_into_block,
     increment_nonce,
-    modify_state,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
-    AccessListTransaction,
     BlobTransaction,
     FeeMarketTransaction,
     LegacyTransaction,
@@ -73,15 +79,16 @@
     decode_transaction,
     encode_transaction,
     get_transaction_hash,
+    has_access_list,
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.hexadecimal import hex_to_address
 from .utils.message import prepare_message
 from .vm import Message
 from .vm.eoa_delegation import is_valid_delegation
 from .vm.gas import (
+    GasCosts,
     calculate_blob_gas_price,
     calculate_data_fee,
     calculate_excess_blob_gas,
@@ -91,15 +98,13 @@
 
 BASE_FEE_MAX_CHANGE_DENOMINATOR = Uint(8)
 ELASTICITY_MULTIPLIER = Uint(2)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 SYSTEM_ADDRESS = hex_to_address("0xfffffffffffffffffffffffffffffffffffffffe")
 BEACON_ROOTS_ADDRESS = hex_to_address(
     "0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02"
 )
 SYSTEM_TRANSACTION_GAS = Uint(30000000)
-MAX_BLOB_GAS_PER_BLOCK = U64(1179648)
+MAX_BLOB_GAS_PER_BLOCK: Final[U64] = U64(1179648)
 VERSIONED_HASH_VERSION_KZG = b"\x01"
 
 WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS = hex_to_address(
@@ -113,6 +118,7 @@
 )
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -215,9 +221,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block.ommers != ():
         raise InvalidBlock
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -234,7 +242,10 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         withdrawals=block.withdrawals,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes, block_diff.storage_changes
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -260,6 +271,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if requests_hash != block.header.requests_hash:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -391,6 +403,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Tuple[Address, Uint, Tuple[VersionedHash, ...], U64]:
     """
     Check if the transaction is includable in the block.
@@ -403,6 +416,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -459,7 +474,7 @@ def check_transaction(
         raise BlobGasLimitExceededError("blob gas limit exceeded")
 
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     if isinstance(
         tx, (FeeMarketTransaction, BlobTransaction, SetCodeTransaction)
@@ -522,7 +537,7 @@ def check_transaction(
 
     if Uint(sender_account.balance) < max_gas_fee + Uint(tx.value):
         raise InsufficientBalanceError("insufficient sender balance")
-    sender_code = get_code(block_env.state, sender_account.code_hash)
+    sender_code = get_code(tx_state, sender_account.code_hash)
     if sender_account.code_hash != EMPTY_CODE_HASH and not is_valid_delegation(
         sender_code
     ):
@@ -573,76 +588,6 @@ def make_receipt(
     return encode_receipt(tx, receipt)
 
 
-def process_system_transaction(
-    block_env: vm.BlockEnvironment,
-    target_address: Address,
-    system_contract_code: Bytes,
-    data: Bytes,
-) -> MessageCallOutput:
-    """
-    Process a system transaction with the given code.
-
-    Prefer calling `process_checked_system_transaction` or
-    `process_unchecked_system_transaction` depending on whether missing code or
-    an execution error should cause the block to be rejected.
-
-    Parameters
-    ----------
-    block_env :
-        The block scoped environment.
-    target_address :
-        Address of the contract to call.
-    system_contract_code :
-        Code of the contract to call.
-    data :
-        Data to pass to the contract.
-
-    Returns
-    -------
-    system_tx_output : `MessageCallOutput`
-        Output of processing the system transaction.
-
-    """
-    tx_env = vm.TransactionEnvironment(
-        origin=SYSTEM_ADDRESS,
-        gas_price=block_env.base_fee_per_gas,
-        gas=SYSTEM_TRANSACTION_GAS,
-        tx_gas_limit=SYSTEM_TRANSACTION_GAS,
-        access_list_addresses=set(),
-        access_list_storage_keys=set(),
-        transient_storage=TransientStorage(),
-        blob_versioned_hashes=(),
-        authorizations=(),
-        index_in_block=None,
-        tx_hash=None,
-    )
-
-    system_tx_message = Message(
-        block_env=block_env,
-        tx_env=tx_env,
-        caller=SYSTEM_ADDRESS,
-        target=target_address,
-        gas=SYSTEM_TRANSACTION_GAS,
-        value=U256(0),
-        data=data,
-        code=system_contract_code,
-        depth=Uint(0),
-        current_target=target_address,
-        code_address=target_address,
-        should_transfer_value=False,
-        is_static=False,
-        accessed_addresses=set(),
-        accessed_storage_keys=set(),
-        disable_precompiles=False,
-        parent_evm=None,
-        disable_create_opcodes=False,
-    )
-
-    system_tx_output = process_message_call(system_tx_message)
-
-    return system_tx_output
-
-
 def process_checked_system_transaction(
     block_env: vm.BlockEnvironment,
     target_address: Address,
@@ -667,9 +612,18 @@ def process_checked_system_transaction(
         Output of processing the system transaction.
 
     """
+    # Pre-check that the system contract has code. We use a throwaway
+    # TransactionState here that is *never* propagated back to BlockState
+    # (no incorporate_tx_into_block call); the same get_account / get_code
+    # lookups are performed and properly tracked by
+    # process_unchecked_system_transaction below, which this function
+    # always calls. Reading via a TransactionState (rather than directly
+    # against pre_state) lets us see system contracts deployed earlier in
+    # the same block — see EIP-7002 and EIP-7251 for this edge case.
+    untracked_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        untracked_state,
+        get_account(untracked_state, target_address).code_hash,
     )
 
     if len(system_contract_code) == 0:
@@ -678,10 +632,9 @@ def process_checked_system_transaction(
             "contain code"
         )
 
-    system_tx_output = process_system_transaction(
+    system_tx_output = process_unchecked_system_transaction(
         block_env,
         target_address,
-        system_contract_code,
         data,
     )
 
@@ -700,8 +653,8 @@ def process_unchecked_system_transaction(
     data: Bytes,
 ) -> MessageCallOutput:
     """
-    Process a system transaction without checking if the contract contains code
-    or if the transaction fails.
+    Process a system transaction without checking if the contract contains
+    code or if the transaction fails.
 
     Parameters
     ----------
@@ -718,17 +671,53 @@ def process_unchecked_system_transaction(
         Output of processing the system transaction.
 
     """
+    system_tx_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        system_tx_state,
+        get_account(system_tx_state, target_address).code_hash,
     )
-    return process_system_transaction(
-        block_env,
-        target_address,
-        system_contract_code,
-        data,
+
+    tx_env = vm.TransactionEnvironment(
+        origin=SYSTEM_ADDRESS,
+        gas_price=block_env.base_fee_per_gas,
+        gas=SYSTEM_TRANSACTION_GAS,
+        tx_gas_limit=SYSTEM_TRANSACTION_GAS,
+        access_list_addresses=set(),
+        access_list_storage_keys=set(),
+        state=system_tx_state,
+        blob_versioned_hashes=(),
+        authorizations=(),
+        index_in_block=None,
+        tx_hash=None,
     )
 
+    system_tx_message = Message(
+        block_env=block_env,
+        tx_env=tx_env,
+        caller=SYSTEM_ADDRESS,
+        target=target_address,
+        gas=SYSTEM_TRANSACTION_GAS,
+        value=U256(0),
+        data=data,
+        code=system_contract_code,
+        depth=Uint(0),
+        current_target=target_address,
+        code_address=target_address,
+        should_transfer_value=False,
+        is_static=False,
+        accessed_addresses=set(),
+        accessed_storage_keys=set(),
+        disable_precompiles=False,
+        parent_evm=None,
+        disable_create_opcodes=False,
+    )
+
+    system_tx_output = process_message_call(system_tx_message)
+
+    incorporate_tx_into_block(system_tx_state)
+
+    return system_tx_output
+
 
 def apply_body(
     block_env: vm.BlockEnvironment,
@@ -863,6 +852,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(
         block_output.transactions_trie,
         rlp.encode(index),
@@ -880,9 +871,10 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     if isinstance(tx, BlobTransaction):
         blob_gas_fee = calculate_data_fee(block_env.excess_blob_gas, tx)
@@ -892,27 +884,17 @@ def process_transaction(
     effective_gas_fee = tx.gas * effective_gas_price
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     sender_balance_after_gas_fee = (
         Uint(sender_account.balance) - effective_gas_fee - blob_gas_fee
     )
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     access_list_addresses = set()
     access_list_storage_keys = set()
     access_list_addresses.add(block_env.coinbase)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
             access_list_addresses.add(access.account)
             for slot in access.slots:
@@ -929,7 +911,7 @@ def process_transaction(
         tx_gas_limit=tx.gas,
         access_list_addresses=access_list_addresses,
         access_list_storage_keys=access_list_storage_keys,
-        transient_storage=TransientStorage(),
+        state=tx_state,
         blob_versioned_hashes=blob_versioned_hashes,
         authorizations=authorizations,
         index_in_block=index,
@@ -961,24 +943,15 @@ def process_transaction(
     priority_fee_per_gas = effective_gas_price - block_env.base_fee_per_gas
     transaction_fee = tx.gas * priority_fee_per_gas
 
-    # refund gas
-    sender_balance_after_refund = get_account(block_env.state, sender).balance
-    # + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    # Monad: gas is not refunded to the sender (note absence of
+    # create_ether(tx_state, sender, U256(gas_refund_amount)) here).
     add_sender_authority(block_env.state, block_env.number, sender)
 
     # transfer miner fees
-    coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
-    ).balance + U256(transaction_fee)
-    set_account_balance(
-        block_env.state,
-        block_env.coinbase,
-        coinbase_balance_after_mining_fee,
-    )
+    create_ether(tx_state, block_env.coinbase, U256(transaction_fee))
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
     # block_output.block_gas_used += tx_gas_used_after_refund
     block_output.block_gas_used += tx.gas
@@ -999,6 +972,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def process_withdrawals(
     block_env: vm.BlockEnvironment,
@@ -1008,9 +983,7 @@ def process_withdrawals(
     """
     Increase the balance of the withdrawing account.
     """
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += wd.amount * U256(10**9)
+    wd_state = TransactionState(parent=block_env.state)
 
     for i, wd in enumerate(withdrawals):
         trie_set(
@@ -1019,7 +992,9 @@ def increase_recipient_balance(recipient: Account) -> None:
             rlp.encode(wd),
         )
 
-        modify_state(block_env.state, wd.address, increase_recipient_balance)
+        create_ether(wd_state, wd.address, wd.amount * U256(10**9))
+
+    incorporate_tx_into_block(wd_state)
 
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
@@ -1028,14 +1003,14 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
-    passed through as a parameter is greater than or equal to the *sum* of
-    the parent's gas and the adjustment delta then the limit for gas is too
-    high and fails this function's check. Similarly, if the limit is less
-    than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
-    check fails because the gas limit doesn't allow for a sufficient or
-    reasonable amount of gas to be used on a block.
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is passed
+    through as a parameter is greater than or equal to the *sum* of the
+    parent's gas and the adjustment delta then the limit for gas is too high
+    and fails this function's check. Similarly, if the limit is less than or
+    equal to the *difference* of the parent's gas and the adjustment delta *or*
+    the predefined ``LIMIT_MINIMUM`` then this function's check fails because
+    the gas limit doesn't allow for a sufficient or reasonable amount of gas to
+    be used on a block.
 
     Parameters
     ----------
@@ -1051,12 +1026,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/monad_eight/fork_types.py b/src/ethereum/forks/monad_eight/fork_types.py
index c598e9876bf..4bec34810db 100644
--- a/src/ethereum/forks/monad_eight/fork_types.py
+++ b/src/ethereum/forks/monad_eight/fork_types.py
@@ -12,6 +12,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes256
@@ -43,6 +44,7 @@ def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Authorization:
diff --git a/src/ethereum/forks/monad_eight/requests.py b/src/ethereum/forks/monad_eight/requests.py
index 542c9264d37..0f033f6d9ad 100644
--- a/src/ethereum/forks/monad_eight/requests.py
+++ b/src/ethereum/forks/monad_eight/requests.py
@@ -1,11 +1,31 @@
 """
-Requests were introduced in EIP-7685 as a general purpose framework for
-storing contract-triggered requests. It extends the execution header and
-body with a single field each to store the request information.
-This inherently exposes the requests to the consensus layer, which can
-then process each one.
-
+[EIP-7685] generalizes how the execution layer communicates validator actions
+to the consensus layer. Rather than adding a dedicated header field for each
+new action type (as [EIP-4895] did for withdrawals), the execution header
+commits to a single [`requests_hash`][rh] that aggregates an ordered list of
+typed requests.
+
+Each request is a type byte (see [`DEPOSIT_REQUEST_TYPE`][dt],
+[`WITHDRAWAL_REQUEST_TYPE`][wt], and [`CONSOLIDATION_REQUEST_TYPE`][ct])
+followed by an opaque payload. Deposit requests are discovered by scanning
+transaction receipts for logs emitted by the deposit contract; withdrawal
+and consolidation requests are produced by the corresponding system
+contracts during block processing.
+
+See [`parse_deposit_requests`][pd] for how deposit logs become request data,
+[`compute_requests_hash`][crh] for how the list is hashed for inclusion in the
+header, and [`process_general_purpose_requests`][pgpr] for how the requests are
+processed.
+
+[EIP-4895]: https://eips.ethereum.org/EIPS/eip-4895
 [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+[rh]: ref:ethereum.forks.monad_eight.blocks.Header.requests_hash
+[dt]: ref:ethereum.forks.monad_eight.requests.DEPOSIT_REQUEST_TYPE
+[wt]: ref:ethereum.forks.monad_eight.requests.WITHDRAWAL_REQUEST_TYPE
+[ct]: ref:ethereum.forks.monad_eight.requests.CONSOLIDATION_REQUEST_TYPE
+[pd]: ref:ethereum.forks.monad_eight.requests.parse_deposit_requests
+[crh]: ref:ethereum.forks.monad_eight.requests.compute_requests_hash
+[pgpr]: ref:ethereum.forks.monad_eight.fork.process_general_purpose_requests
 """
 
 from hashlib import sha256
@@ -15,48 +35,133 @@
 from ethereum_types.numeric import Uint, ulen
 
 from ethereum.exceptions import InvalidBlock
+from ethereum.merkle_patricia_trie import trie_get
 from ethereum.utils.hexadecimal import hex_to_bytes32
 
 from .blocks import decode_receipt
-from .trie import trie_get
 from .utils.hexadecimal import hex_to_address
 from .vm import BlockOutput
 
 DEPOSIT_CONTRACT_ADDRESS = hex_to_address(
     "0x00000000219ab540356cbb839cbe05303d7705fa"
 )
+"""
+Mainnet address of the beacon chain deposit contract. Scanning block
+receipts for logs emitted by this address is how the execution layer
+discovers validator deposits, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 DEPOSIT_EVENT_SIGNATURE_HASH = hex_to_bytes32(
     "0x649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c5"
 )
+"""
+First [log topic] of the deposit contract's `DepositEvent`, equal to the
+keccak256 of its Solidity event signature. Logs whose first topic does not
+match this are ignored when collecting deposit requests.
+
+[log topic]: https://docs.soliditylang.org/en/latest/abi-spec.html#events
+"""
+
 DEPOSIT_REQUEST_TYPE = b"\x00"
+"""
+Request type byte identifying a deposit request, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 WITHDRAWAL_REQUEST_TYPE = b"\x01"
+"""
+Request type byte identifying an execution-triggered withdrawal request,
+per [EIP-7002].
+
+[EIP-7002]: https://eips.ethereum.org/EIPS/eip-7002
+"""
+
 CONSOLIDATION_REQUEST_TYPE = b"\x02"
+"""
+Request type byte identifying a consolidation request, per [EIP-7251].
+
+[EIP-7251]: https://eips.ethereum.org/EIPS/eip-7251
+"""
 
 
 DEPOSIT_EVENT_LENGTH = Uint(576)
+"""
+Total length in bytes of the ABI-encoded `DepositEvent` data payload. Every
+well-formed event has this exact length.
+"""
 
 PUBKEY_OFFSET = Uint(160)
+"""
+Position within the event payload of the validator public key's length
+prefix, as emitted by the Solidity ABI encoder.
+"""
+
 WITHDRAWAL_CREDENTIALS_OFFSET = Uint(256)
+"""
+Position within the event payload of the withdrawal credentials' length
+prefix.
+"""
+
 AMOUNT_OFFSET = Uint(320)
+"""
+Position within the event payload of the deposit amount's length prefix.
+"""
+
 SIGNATURE_OFFSET = Uint(384)
+"""
+Position within the event payload of the deposit signature's length prefix.
+"""
+
 INDEX_OFFSET = Uint(512)
+"""
+Position within the event payload of the deposit index's length prefix.
+"""
 
 PUBKEY_SIZE = Uint(48)
+"""
+Length of the BLS12-381 public key that identifies the validator receiving
+the deposit.
+"""
+
 WITHDRAWAL_CREDENTIALS_SIZE = Uint(32)
+"""
+Length of the withdrawal credentials, which determine where the staked
+ether may eventually be withdrawn.
+"""
+
 AMOUNT_SIZE = Uint(8)
+"""
+Length of the little-endian Gwei amount being deposited.
+"""
+
 SIGNATURE_SIZE = Uint(96)
+"""
+Length of the BLS12-381 signature over the deposit message.
+"""
+
 INDEX_SIZE = Uint(8)
+"""
+Length of the monotonically-increasing deposit index assigned by the
+deposit contract when it emits the event.
+"""
 
 
 def extract_deposit_data(data: Bytes) -> Bytes:
     """
-    Extracts Deposit Request from the DepositContract.DepositEvent data.
+    Strip the Solidity ABI framing from a `DepositEvent` payload and return
+    the concatenated raw fields in the order consumed by the consensus
+    layer: public key, withdrawal credentials, amount, signature, and
+    deposit index.
 
-    Raises
-    ------
-    InvalidBlock :
-        If the deposit contract did not produce a valid log.
+    Because each field has a fixed length, every well-formed event has an
+    identical byte layout. Any deviation indicates a misbehaving or
+    compromised deposit contract, so this function raises [`InvalidBlock`]
+    rather than silently accepting unexpected data.
 
+    [`InvalidBlock`]: ref:ethereum.exceptions.InvalidBlock
     """
     if ulen(data) != DEPOSIT_EVENT_LENGTH:
         raise InvalidBlock("Invalid deposit event data length")
@@ -150,7 +255,19 @@ def extract_deposit_data(data: Bytes) -> Bytes:
 
 def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
     """
-    Parse deposit requests from the block output.
+    Walk the receipts produced during block execution, concatenating the
+    raw payload of every valid deposit event into a single byte string.
+
+    A log is considered a deposit when it originates from
+    [`DEPOSIT_CONTRACT_ADDRESS`][addr] and its first topic matches
+    [`DEPOSIT_EVENT_SIGNATURE_HASH`][sig]. The returned bytes are the
+    direct concatenation of the unframed deposit fields, ready to be
+    prefixed with [`DEPOSIT_REQUEST_TYPE`][dt] before being appended to
+    the block's request list.
+
+    [addr]: ref:ethereum.forks.monad_eight.requests.DEPOSIT_CONTRACT_ADDRESS
+    [sig]: ref:ethereum.forks.monad_eight.requests.DEPOSIT_EVENT_SIGNATURE_HASH
+    [dt]: ref:ethereum.forks.monad_eight.requests.DEPOSIT_REQUEST_TYPE
     """
     deposit_requests: Bytes = b""
     for key in block_output.receipt_keys:
@@ -171,18 +288,18 @@ def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
 
 def compute_requests_hash(requests: List[Bytes]) -> Bytes:
     """
-    Get the hash of the requests using the SHA2-256 algorithm.
-
-    Parameters
-    ----------
-    requests : Bytes
-        The requests to hash.
-
-    Returns
-    -------
-    requests_hash : Bytes
-        The hash of the requests.
-
+    Compute the [SHA2-256] commitment over an ordered list of
+    type-prefixed requests, as defined by [EIP-7685].
+
+    The commitment is the SHA2-256 hash of the concatenation of the
+    SHA2-256 hashes of each individual request. This is what the
+    execution header's [`requests_hash`][rh] stores, and what the
+    consensus layer re-derives to validate that both layers observed the
+    same set of requests.
+
+    [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+    [SHA2-256]: https://en.wikipedia.org/wiki/SHA-2
+    [rh]: ref:ethereum.forks.monad_eight.blocks.Header.requests_hash
     """
     m = sha256()
     for request in requests:
diff --git a/src/ethereum/forks/monad_eight/state.py b/src/ethereum/forks/monad_eight/state.py
deleted file mode 100644
index 59c1f832620..00000000000
--- a/src/ethereum/forks/monad_eight/state.py
+++ /dev/null
@@ -1,773 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-from ethereum.state import (
-    EMPTY_ACCOUNT,
-    EMPTY_CODE_HASH,
-    Account,
-    Address,
-    Root,
-)
-
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-    _senders_authorities: Dict[Uint, Set[Address]] = field(
-        default_factory=dict
-    )
-
-
-@dataclass
-class TransientStorage:
-    """
-    Contains all information that is preserved between message calls
-    within a transaction.
-    """
-
-    _tries: Dict[Address, Trie[Bytes32, U256]] = field(default_factory=dict)
-    _snapshots: List[Dict[Address, Trie[Bytes32, U256]]] = field(
-        default_factory=list
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-    del state._senders_authorities
-
-
-def begin_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-    transient_storage._snapshots.append(
-        {k: copy_trie(t) for (k, t) in transient_storage._tries.items()}
-    )
-
-
-def commit_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._snapshots.pop()
-
-
-def rollback_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._tries = transient_storage._snapshots.pop()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-
-    Return ``b""`` for ``EMPTY_CODE_HASH``.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State`` and return its hash.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase, and to respect the constraints added to SELFDESTRUCT by
-    EIP-6780.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`. If, after modification, the account
-    exists and has zero nonce, empty code, and zero balance, it is destroyed.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-    account = get_account_optional(state, address)
-    account_exists_and_is_empty = (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-    if account_exists_and_is_empty:
-        destroy_account(state, address)
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def get_balance_original(state: State, address: Address) -> U256:
-    """
-    Get the original balance of an account i.e. the balance before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-
-    """
-    original_account_trie, _ = state._snapshots[0]
-    original_account = trie_get(original_account_trie, address)
-
-    if original_account is None:
-        original_balance = U256(0)
-    else:
-        original_balance = original_account.balance
-
-    assert isinstance(original_balance, U256)
-    return original_balance
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
-
-
-def get_transient_storage(
-    transient_storage: TransientStorage, address: Address, key: Bytes32
-) -> U256:
-    """
-    Get a value at a storage key on an account from transient storage.
-    Returns `U256(0)` if the storage key has not been set previously.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_transient_storage(
-    transient_storage: TransientStorage,
-    address: Address,
-    key: Bytes32,
-    value: U256,
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        transient_storage._tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del transient_storage._tries[address]
-
-
-def add_sender_authority(
-    state: State,
-    block_number: Uint,
-    address: Address,
-) -> None:
-    """
-    Add an address being an authority signer or sender in block.
-    """
-    state._senders_authorities.setdefault(block_number, set()).add(address)
-
-
-def is_sender_authority(
-    state: State,
-    address: Address,
-) -> bool:
-    """
-    Returns true if address is a sender or authority in saved blocks.
-    """
-    for senders_authorities_at_block in state._senders_authorities.values():
-        if address in senders_authorities_at_block:
-            return True
-    return False
-
-
-RESERVE_BALANCE_DELAY_BLOCKS = Uint(3)
-
-
-def forget_senders_authorities(
-    state: State,
-    current_block_number: Uint,
-) -> None:
-    """
-    Forgets senders and authorities before processing the block at number.
-    """
-    if current_block_number >= RESERVE_BALANCE_DELAY_BLOCKS:
-        number = current_block_number - RESERVE_BALANCE_DELAY_BLOCKS
-        state._senders_authorities.pop(number, None)
diff --git a/src/ethereum/forks/monad_eight/state_tracker.py b/src/ethereum/forks/monad_eight/state_tracker.py
new file mode 100644
index 00000000000..fb126a399a3
--- /dev/null
+++ b/src/ethereum/forks/monad_eight/state_tracker.py
@@ -0,0 +1,845 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    # Monad: per-block-number set of EOAs that sent or were authorized in
+    # that block. Carried across blocks via t8n; used by the reserve
+    # balance exception window (RESERVE_BALANCE_DELAY_BLOCKS lookback).
+    _senders_authorities: Dict[Uint, Set[Address]] = field(
+        default_factory=dict
+    )
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state. If, after modification, the
+    account exists and has zero nonce, empty code, and zero balance, it
+    is destroyed.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+    if account_exists_and_is_empty(tx_state, address):
+        destroy_account(tx_state, address)
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+    )
+
+
+# Monad-specific: reserve balance exception window.
+RESERVE_BALANCE_DELAY_BLOCKS = Uint(3)
+
+
+def add_sender_authority(
+    block_state: BlockState,
+    block_number: Uint,
+    address: Address,
+) -> None:
+    """
+    Record `address` as a sender or authority in the given block number.
+
+    Used by the reserve balance "emptying transaction" exception: an
+    undelegated EOA may go below RESERVE_BALANCE only if neither it nor
+    a delegation/undelegation touching it appeared in the previous
+    RESERVE_BALANCE_DELAY_BLOCKS blocks.
+    """
+    block_state._senders_authorities.setdefault(block_number, set()).add(
+        address
+    )
+
+
+def is_sender_authority(
+    block_state: BlockState,
+    address: Address,
+) -> bool:
+    """
+    Return True if `address` was a sender or authority in any of the
+    block numbers currently retained on `block_state` (the previous
+    RESERVE_BALANCE_DELAY_BLOCKS blocks).
+    """
+    for (
+        senders_authorities_at_block
+    ) in block_state._senders_authorities.values():
+        if address in senders_authorities_at_block:
+            return True
+    return False
+
+
+def forget_senders_authorities(
+    block_state: BlockState,
+    current_block_number: Uint,
+) -> None:
+    """
+    Prune senders/authorities older than the reserve balance delay window.
+    """
+    if current_block_number >= RESERVE_BALANCE_DELAY_BLOCKS:
+        number = current_block_number - RESERVE_BALANCE_DELAY_BLOCKS
+        block_state._senders_authorities.pop(number, None)
+
+
+def get_balance_original(snapshot: TransactionState, address: Address) -> U256:
+    """
+    Get the balance of `address` as it was at the start of the
+    top-level EVM execution (i.e. after pre-execution gas/nonce
+    deduction but before any EVM-driven writes).
+
+    Reads from a ``TransactionState`` captured at top-level EVM begin
+    (the same ``snapshot`` used for rollback in the interpreter). Read
+    chain: snapshot.account_writes -> block writes -> pre_state.
+    """
+    account = get_account_optional(snapshot, address)
+    if account is None:
+        return U256(0)
+    return account.balance
+
+
+def iter_all_addresses(tx_state: TransactionState) -> Set[Address]:
+    """
+    Return every address touched by pre-state, block, or current tx.
+
+    Union of pre-state addresses, block-level writes, and current-tx
+    writes. Reproduces the old ``state._main_trie._data.keys()`` view
+    used by Monad's end-of-tx reserve-balance sweep. Assumes the
+    concrete ``State`` from ``ethereum.state`` (t8n loads its alloc
+    into one) so ``_main_trie._data`` is enumerable.
+    """
+    pre_state = tx_state.parent.pre_state
+    pre_addrs: Set[Address]
+    if hasattr(pre_state, "_main_trie"):
+        pre_addrs = set(pre_state._main_trie._data.keys())
+    else:
+        pre_addrs = set()
+    return (
+        pre_addrs
+        | set(tx_state.parent.account_writes.keys())
+        | set(tx_state.account_writes.keys())
+    )
diff --git a/src/ethereum/forks/monad_eight/transactions.py b/src/ethereum/forks/monad_eight/transactions.py
index 25d3fca9fca..04c4b77388c 100644
--- a/src/ethereum/forks/monad_eight/transactions.py
+++ b/src/ethereum/forks/monad_eight/transactions.py
@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, TypeGuard, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -28,46 +28,10 @@
 )
 from .fork_types import Authorization, VersionedHash
 
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_TOKEN_FLOOR = Uint(10)
-"""
-Minimum gas cost per byte of calldata as per [EIP-7623]. Used to calculate
-the minimum gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_DATA_TOKEN_STANDARD = Uint(4)
-"""
-Gas cost per byte of calldata as per [EIP-7623]. Used to calculate the
-gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
-
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
-"""
-
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
-"""
-
 TX_MAX_GAS_LIMIT = Uint(30_000_000)
 
 
+@final
 @slotted_freezable
 @dataclass
 class LegacyTransaction:
@@ -130,6 +94,7 @@ class LegacyTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Access:
@@ -149,6 +114,7 @@ class Access:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccessListTransaction:
@@ -221,6 +187,7 @@ class AccessListTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class FeeMarketTransaction:
@@ -298,6 +265,7 @@ class FeeMarketTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class BlobTransaction:
@@ -386,6 +354,7 @@ class BlobTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class SetCodeTransaction:
@@ -481,6 +450,23 @@ class SetCodeTransaction:
 """
 
 
+AccessListCapableTransaction = (
+    AccessListTransaction
+    | FeeMarketTransaction
+    | BlobTransaction
+    | SetCodeTransaction
+)
+"""
+Transaction types that include an [EIP-2930]-style access list.
+
+See [`has_access_list`][hal] and [`Access`][a] for more details.
+
+[EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+[hal]: ref:ethereum.forks.amsterdam.transactions.has_access_list
+[a]: ref:ethereum.forks.amsterdam.transactions.Access
+"""
+
+
 def encode_transaction(tx: Transaction) -> LegacyTransaction | Bytes:
     """
     Encode a transaction into its RLP or typed transaction format.
@@ -584,7 +570,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
     4. Cost for access list entries (if applicable)
@@ -595,8 +581,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     gas cost of the transaction and the minimum gas cost used by the
     transaction based on the calldata size.
     """
-    from .vm.eoa_delegation import GAS_AUTH_PER_EMPTY_ACCOUNT
-    from .vm.gas import init_code_cost
+    from .vm.gas import GasCosts, init_code_cost
 
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
@@ -604,39 +589,33 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     tokens_in_calldata = num_zeros + num_non_zeros * Uint(4)
     # EIP-7623 floor price (note: no EVM costs)
     calldata_floor_gas_cost = (
-        tokens_in_calldata * GAS_TX_DATA_TOKEN_FLOOR + GAS_TX_BASE
+        tokens_in_calldata * GasCosts.TX_DATA_TOKEN_FLOOR + GasCosts.TX_BASE
     )
 
-    data_cost = tokens_in_calldata * GAS_TX_DATA_TOKEN_STANDARD
+    data_cost = tokens_in_calldata * GasCosts.TX_DATA_TOKEN_STANDARD
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE + init_code_cost(ulen(tx.data))
+        create_cost = GasCosts.TX_CREATE + init_code_cost(ulen(tx.data))
     else:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
-            access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_cost += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
 
     auth_cost = Uint(0)
     if isinstance(tx, SetCodeTransaction):
-        auth_cost += Uint(GAS_AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations))
+        auth_cost += Uint(
+            GasCosts.AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations)
+        )
 
     return (
         Uint(
-            GAS_TX_BASE
+            GasCosts.TX_BASE
             + data_cost
             + create_cost
             + access_list_cost
@@ -884,3 +863,17 @@ def get_transaction_hash(tx: Bytes | LegacyTransaction) -> Hash32:
         return keccak256(rlp.encode(tx))
     else:
         return keccak256(tx)
+
+
+def has_access_list(
+    tx: Transaction,
+) -> TypeGuard[AccessListCapableTransaction]:
+    """
+    Return whether the transaction has an [EIP-2930]-style access list.
+
+    [EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+    """
+    return isinstance(
+        tx,
+        AccessListCapableTransaction,
+    )
diff --git a/src/ethereum/forks/monad_eight/trie.py b/src/ethereum/forks/monad_eight/trie.py
deleted file mode 100644
index 7ad9a10f1c9..00000000000
--- a/src/ethereum/forks/monad_eight/trie.py
+++ /dev/null
@@ -1,509 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-from typing_extensions import assert_type
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.prague import trie as previous_trie
-from ethereum.state import Account, Address, Root
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt, Withdrawal
-from .fork_types import encode_account
-from .transactions import LegacyTransaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = (
-    Account
-    | Bytes
-    | LegacyTransaction
-    | Receipt
-    | Uint
-    | U256
-    | Withdrawal
-    | None
-)
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[LegacyTransaction | Bytes],
-    Optional[Receipt | Bytes],
-    Optional[Withdrawal | Bytes],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `Extended`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (LegacyTransaction, Receipt, Withdrawal, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/monad_eight/utils/message.py b/src/ethereum/forks/monad_eight/utils/message.py
index b9b638a5de4..7b36863a32c 100644
--- a/src/ethereum/forks/monad_eight/utils/message.py
+++ b/src/ethereum/forks/monad_eight/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
@@ -55,7 +55,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -63,8 +63,9 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        state = block_env.state
-        code = get_code(state, get_account(state, tx.to).code_hash)
+        code = get_code(
+            tx_env.state, get_account(tx_env.state, tx.to).code_hash
+        )
         code_address = tx.to
     else:
         raise AssertionError("Target must be address or empty bytes")
diff --git a/src/ethereum/forks/monad_eight/vm/__init__.py b/src/ethereum/forks/monad_eight/vm/__init__.py
index 531aabce085..8041768baa7 100644
--- a/src/ethereum/forks/monad_eight/vm/__init__.py
+++ b/src/ethereum/forks/monad_eight/vm/__init__.py
@@ -13,24 +13,25 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt, Withdrawal
 from ..fork_types import Authorization, VersionedHash
-from ..state import State, TransientStorage
+from ..state_tracker import BlockState, TransactionState
 from ..transactions import LegacyTransaction
-from ..trie import Trie
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +39,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -50,6 +51,7 @@ class BlockEnvironment:
     parent_beacon_block_root: Hash32
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -92,10 +94,11 @@ class BlockOutput:
     requests: List[Bytes] = field(default_factory=list)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
@@ -104,13 +107,14 @@ class TransactionEnvironment:
     tx_gas_limit: Uint
     access_list_addresses: Set[Address]
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
-    transient_storage: TransientStorage
+    state: TransactionState
     blob_versioned_hashes: Tuple[VersionedHash, ...]
     authorizations: Tuple[Authorization, ...]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -137,6 +141,7 @@ class Message:
     disable_create_opcodes: bool
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
diff --git a/src/ethereum/forks/monad_eight/vm/eoa_delegation.py b/src/ethereum/forks/monad_eight/vm/eoa_delegation.py
index 53a596af31a..f8a4617997b 100644
--- a/src/ethereum/forks/monad_eight/vm/eoa_delegation.py
+++ b/src/ethereum/forks/monad_eight/vm/eoa_delegation.py
@@ -14,7 +14,7 @@
 from ethereum.state import Address
 
 from ..fork_types import Authorization
-from ..state import (
+from ..state_tracker import (
     account_exists,
     add_sender_authority,
     get_account,
@@ -23,14 +23,13 @@
     set_code,
 )
 from ..utils.hexadecimal import hex_to_address
-from ..vm.gas import GAS_COLD_ACCOUNT_ACCESS, GAS_WARM_ACCESS
+from ..vm.gas import GasCosts
 from . import Evm, Message
 
 SET_CODE_TX_MAGIC = b"\x05"
 EOA_DELEGATION_MARKER = b"\xef\x01\x00"
 EOA_DELEGATION_MARKER_LENGTH = len(EOA_DELEGATION_MARKER)
 EOA_DELEGATED_CODE_LENGTH = 23
-GAS_AUTH_PER_EMPTY_ACCOUNT = 25000
 REFUND_AUTH_PER_EXISTING_ACCOUNT = 12500
 NULL_ADDRESS = hex_to_address("0x0000000000000000000000000000000000000000")
 
@@ -142,18 +141,18 @@ def access_delegation(
         access gas cost.
 
     """
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
     if not is_valid_delegation(code):
         return False, False, address, code, Uint(0)
 
     address = Address(code[EOA_DELEGATION_MARKER_LENGTH:])
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
-    code = get_code(state, get_account(state, address).code_hash)
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     return True, True, address, code, access_gas_cost
 
@@ -173,7 +172,7 @@ def set_delegation(message: Message) -> U256:
         Refund from authority which already exists in state.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     for auth in message.tx_env.authorizations:
         if auth.chain_id not in (message.block_env.chain_id, U256(0)):
@@ -189,8 +188,8 @@ def set_delegation(message: Message) -> U256:
 
         message.accessed_addresses.add(authority)
 
-        authority_account = get_account(state, authority)
-        authority_code = get_code(state, authority_account.code_hash)
+        authority_account = get_account(tx_state, authority)
+        authority_code = get_code(tx_state, authority_account.code_hash)
 
         if authority_code and not is_valid_delegation(authority_code):
             continue
@@ -199,26 +198,29 @@ def set_delegation(message: Message) -> U256:
         if authority_nonce != auth.nonce:
             continue
 
-        if account_exists(state, authority):
+        if account_exists(tx_state, authority):
             refund_counter += U256(
-                GAS_AUTH_PER_EMPTY_ACCOUNT - REFUND_AUTH_PER_EXISTING_ACCOUNT
+                GasCosts.AUTH_PER_EMPTY_ACCOUNT
+                - REFUND_AUTH_PER_EXISTING_ACCOUNT
             )
 
         if auth.address == NULL_ADDRESS:
             code_to_set = b""
         else:
             code_to_set = EOA_DELEGATION_MARKER + auth.address
-        set_code(state, authority, code_to_set)
+        set_code(tx_state, authority, code_to_set)
 
-        increment_nonce(state, authority)
+        increment_nonce(tx_state, authority)
 
-        add_sender_authority(state, message.block_env.number, authority)
+        add_sender_authority(
+            message.block_env.state, message.block_env.number, authority
+        )
 
     if message.code_address is None:
         raise InvalidBlock("Invalid type 4 transaction: no target")
 
     message.code = get_code(
-        state, get_account(state, message.code_address).code_hash
+        tx_state, get_account(tx_state, message.code_address).code_hash
     )
 
     return refund_counter
diff --git a/src/ethereum/forks/monad_eight/vm/gas.py b/src/ethereum/forks/monad_eight/vm/gas.py
index a272b960cf2..1f088ee5cba 100644
--- a/src/ethereum/forks/monad_eight/vm/gas.py
+++ b/src/ethereum/forks/monad_eight/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U64, U256, Uint
+from ethereum_types.numeric import U64, U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32, taylor_exponential
@@ -24,68 +24,169 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000 + 6000)
-REFUND_STORAGE_CLEAR = 4800
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-GAS_ECRECOVER = Uint(3000 * 2)
-GAS_P256VERIFY = Uint(6900)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1 * 2)
-GAS_COLD_SLOAD = Uint(2100 + 6000)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600 + 7500)
-GAS_WARM_ACCESS = Uint(100)
-GAS_CODE_INIT_PER_WORD = Uint(2)
-GAS_BLOBHASH_OPCODE = Uint(3)
-GAS_POINT_EVALUATION = Uint(50000 * 4)
-GAS_ALT_BN128_ADD = Uint(150 * 2)
-GAS_ALT_BN128_MUL = Uint(6000 * 5)
-GAS_ALT_BN128_PAIRING_BASE = 45000 * 5
-GAS_ALT_BN128_PAIRING_PER_POINT = 34000 * 5
-
-GAS_PER_BLOB = U64(2**17)
-BLOB_TARGET_GAS_PER_BLOCK = U64(786432)
-BLOB_MIN_GASPRICE = Uint(1)
-BLOB_BASE_FEE_UPDATE_FRACTION = Uint(5007716)
-
-GAS_BLS_G1_ADD = Uint(375)
-GAS_BLS_G1_MUL = Uint(12000)
-GAS_BLS_G1_MAP = Uint(5500)
-GAS_BLS_G2_ADD = Uint(600)
-GAS_BLS_G2_MUL = Uint(22500)
-GAS_BLS_G2_MAP = Uint(23800)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    WARM_ACCESS: Final[Uint] = Uint(100)
+    COLD_ACCOUNT_ACCESS: Final[Uint] = Uint(2600 + 7500)
+    COLD_STORAGE_ACCESS: Final[Uint] = Uint(2100 + 6000)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000 + 6000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+    CODE_INIT_PER_WORD: Final[Uint] = Uint(2)
+
+    # Authorization
+    AUTH_PER_EMPTY_ACCOUNT: Final[int] = 25000
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 4800
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000 * 2)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1 * 2)
+    PRECOMPILE_POINT_EVALUATION: Final[Uint] = Uint(50000 * 4)
+    PRECOMPILE_BLS_G1ADD: Final[Uint] = Uint(375)
+    PRECOMPILE_BLS_G1MUL: Final[Uint] = Uint(12000)
+    PRECOMPILE_BLS_G1MAP: Final[Uint] = Uint(5500)
+    PRECOMPILE_BLS_G2ADD: Final[Uint] = Uint(600)
+    PRECOMPILE_BLS_G2MUL: Final[Uint] = Uint(22500)
+    PRECOMPILE_BLS_G2MAP: Final[Uint] = Uint(23800)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150 * 2)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000 * 5)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000 * 5)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000 * 5)
+    # Monad-specific EIP-7951 P256VERIFY
+    PRECOMPILE_P256VERIFY: Final[Uint] = Uint(6900)
+
+    # Blobs
+    PER_BLOB: Final[U64] = U64(2**17)
+    BLOB_TARGET_GAS_PER_BLOCK: Final[U64] = U64(786432)
+    BLOB_MIN_GASPRICE: Final[Uint] = Uint(1)
+    BLOB_BASE_FEE_UPDATE_FRACTION: Final[Uint] = Uint(5007716)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_TOKEN_STANDARD: Final[Uint] = Uint(4)
+    TX_DATA_TOKEN_FLOOR: Final[Uint] = Uint(10)
+    TX_ACCESS_LIST_ADDRESS: Final[Uint] = Uint(2400)
+    TX_ACCESS_LIST_STORAGE_KEY: Final[Uint] = Uint(1900)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_PREVRANDAO: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_BASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBBASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBHASH: Final[Uint] = Uint(3)
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_PUSH0: Final[Uint] = BASE
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MCOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -101,11 +202,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -157,7 +259,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -187,7 +289,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -212,7 +314,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
@@ -284,7 +386,7 @@ def init_code_cost(init_code_length: Uint) -> Uint:
         The gas to be charged for the init code.
 
     """
-    return GAS_CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
+    return GasCosts.CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
 
 
 def calculate_excess_blob_gas(parent_header: Header) -> U64:
@@ -313,10 +415,10 @@ def calculate_excess_blob_gas(parent_header: Header) -> U64:
         blob_gas_used = parent_header.blob_gas_used
 
     parent_blob_gas = excess_blob_gas + blob_gas_used
-    if parent_blob_gas < BLOB_TARGET_GAS_PER_BLOCK:
+    if parent_blob_gas < GasCosts.BLOB_TARGET_GAS_PER_BLOCK:
         return U64(0)
 
-    return parent_blob_gas - BLOB_TARGET_GAS_PER_BLOCK
+    return parent_blob_gas - GasCosts.BLOB_TARGET_GAS_PER_BLOCK
 
 
 def calculate_total_blob_gas(tx: Transaction) -> U64:
@@ -335,7 +437,7 @@ def calculate_total_blob_gas(tx: Transaction) -> U64:
 
     """
     if isinstance(tx, BlobTransaction):
-        return GAS_PER_BLOB * U64(len(tx.blob_versioned_hashes))
+        return GasCosts.PER_BLOB * U64(len(tx.blob_versioned_hashes))
     else:
         return U64(0)
 
@@ -356,9 +458,9 @@ def calculate_blob_gas_price(excess_blob_gas: U64) -> Uint:
 
     """
     return taylor_exponential(
-        BLOB_MIN_GASPRICE,
+        GasCosts.BLOB_MIN_GASPRICE,
         Uint(excess_blob_gas),
-        BLOB_BASE_FEE_UPDATE_FRACTION,
+        GasCosts.BLOB_BASE_FEE_UPDATE_FRACTION,
     )
 
 
diff --git a/src/ethereum/forks/monad_eight/vm/instructions/arithmetic.py b/src/ethereum/forks/monad_eight/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/monad_eight/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/monad_eight/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/monad_eight/vm/instructions/bitwise.py b/src/ethereum/forks/monad_eight/vm/instructions/bitwise.py
index 41dabe8185b..1de6c615931 100644
--- a/src/ethereum/forks/monad_eight/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/monad_eight/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +172,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +202,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +232,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
diff --git a/src/ethereum/forks/monad_eight/vm/instructions/block.py b/src/ethereum/forks/monad_eight/vm/instructions/block.py
index b840722b4e2..9c8c7aa3b51 100644
--- a/src/ethereum/forks/monad_eight/vm/instructions/block.py
+++ b/src/ethereum/forks/monad_eight/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -40,7 +40,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -89,7 +89,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -123,7 +123,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -156,7 +156,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -189,7 +189,7 @@ def prev_randao(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PREVRANDAO)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.prev_randao))
@@ -222,7 +222,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -252,7 +252,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/monad_eight/vm/instructions/comparison.py b/src/ethereum/forks/monad_eight/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/monad_eight/vm/instructions/comparison.py
+++ b/src/ethereum/forks/monad_eight/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/monad_eight/vm/instructions/control_flow.py b/src/ethereum/forks/monad_eight/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/monad_eight/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/monad_eight/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/monad_eight/vm/instructions/environment.py b/src/ethereum/forks/monad_eight/vm/instructions/environment.py
index 5848530a960..b6bf713df27 100644
--- a/src/ethereum/forks/monad_eight/vm/instructions/environment.py
+++ b/src/ethereum/forks/monad_eight/vm/instructions/environment.py
@@ -17,20 +17,13 @@
 from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BASE,
-    GAS_BLOBHASH_OPCODE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_COPY,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
-    GAS_WARM_ACCESS,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_gas_extend_memory,
     charge_gas,
@@ -52,7 +45,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -76,14 +69,15 @@ def balance(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_addresses.add(address)
-        charge_gas(evm, GAS_COLD_ACCOUNT_ACCESS)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -106,7 +100,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -129,7 +123,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -152,7 +146,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -176,7 +170,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -201,7 +195,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -230,11 +224,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -259,7 +256,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -288,11 +285,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -317,7 +317,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -341,16 +341,16 @@ def extcodesize(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -377,23 +377,23 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
 
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost + copy_gas_cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -416,7 +416,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -442,11 +442,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -475,15 +480,15 @@ def extcodehash(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -510,12 +515,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
@@ -538,7 +543,7 @@ def base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BASEFEE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.base_fee_per_gas))
@@ -561,7 +566,7 @@ def blob_hash(evm: Evm) -> None:
     index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BLOBHASH_OPCODE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBHASH)
 
     # OPERATION
     if int(index) < len(evm.message.tx_env.blob_versioned_hashes):
@@ -588,7 +593,7 @@ def blob_base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBBASEFEE)
 
     # OPERATION
     blob_base_fee = calculate_blob_gas_price(
diff --git a/src/ethereum/forks/monad_eight/vm/instructions/keccak.py b/src/ethereum/forks/monad_eight/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/monad_eight/vm/instructions/keccak.py
+++ b/src/ethereum/forks/monad_eight/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/monad_eight/vm/instructions/log.py b/src/ethereum/forks/monad_eight/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/monad_eight/vm/instructions/log.py
+++ b/src/ethereum/forks/monad_eight/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/monad_eight/vm/instructions/memory.py b/src/ethereum/forks/monad_eight/vm/instructions/memory.py
index 6e111051ee3..bba3ddf19d5 100644
--- a/src/ethereum/forks/monad_eight/vm/instructions/memory.py
+++ b/src/ethereum/forks/monad_eight/vm/instructions/memory.py
@@ -18,9 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_COPY,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -49,7 +47,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -80,7 +78,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -108,7 +106,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -135,7 +133,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
@@ -161,12 +159,15 @@ def mcopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(length)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
 
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(source, length), (destination, length)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_MCOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/monad_eight/vm/instructions/stack.py b/src/ethereum/forks/monad_eight/vm/instructions/stack.py
index 0007a28acd4..ce94af6ce8e 100644
--- a/src/ethereum/forks/monad_eight/vm/instructions/stack.py
+++ b/src/ethereum/forks/monad_eight/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -63,9 +67,9 @@ def push_n(evm: Evm, num_bytes: int) -> None:
 
     # GAS
     if num_bytes == 0:
-        charge_gas(evm, GAS_BASE)
+        charge_gas(evm, GasCosts.OPCODE_PUSH0)
     else:
-        charge_gas(evm, GAS_VERY_LOW)
+        charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -95,7 +99,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -127,7 +131,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -139,70 +143,70 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push0 = partial(push_n, num_bytes=0)
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push0: Callable[[Evm], None] = partial(push_n, num_bytes=0)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/monad_eight/vm/instructions/storage.py b/src/ethereum/forks/monad_eight/vm/instructions/storage.py
index 084d58cc46c..99dcce877dd 100644
--- a/src/ethereum/forks/monad_eight/vm/instructions/storage.py
+++ b/src/ethereum/forks/monad_eight/vm/instructions/storage.py
@@ -13,7 +13,7 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import (
+from ...state_tracker import (
     get_storage,
     get_storage_original,
     get_transient_storage,
@@ -23,12 +23,7 @@
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -50,15 +45,14 @@ def sload(evm: Evm) -> None:
 
     # GAS
     if (evm.message.current_target, key) in evm.accessed_storage_keys:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        charge_gas(evm, GAS_COLD_SLOAD)
+        charge_gas(evm, GasCosts.COLD_STORAGE_ACCESS)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -79,54 +73,60 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     gas_cost = Uint(0)
 
     if (evm.message.current_target, key) not in evm.accessed_storage_keys:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        gas_cost += GAS_COLD_SLOAD
+        gas_cost += GasCosts.COLD_STORAGE_ACCESS
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost += GAS_STORAGE_SET
+            gas_cost += GasCosts.STORAGE_SET
         else:
-            gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_SLOAD
+            gas_cost += (
+                GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
+            )
     else:
-        gas_cost += GAS_WARM_ACCESS
+        gas_cost += GasCosts.WARM_ACCESS
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
             # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
             # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
             # Storage slot being restored to its original value
             if original_value == 0:
                 # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_WARM_ACCESS)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.WARM_ACCESS
+                )
             else:
                 # Slot was originally non-empty and was UPDATED earlier
                 evm.refund_counter += int(
-                    GAS_STORAGE_UPDATE - GAS_COLD_SLOAD - GAS_WARM_ACCESS
+                    GasCosts.COLD_STORAGE_WRITE
+                    - GasCosts.COLD_STORAGE_ACCESS
+                    - GasCosts.WARM_ACCESS
                 )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
@@ -147,11 +147,11 @@ def tload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
 
     # OPERATION
     value = get_transient_storage(
-        evm.message.tx_env.transient_storage, evm.message.current_target, key
+        evm.message.tx_env.state, evm.message.current_target, key
     )
     push(evm.stack, value)
 
@@ -174,11 +174,11 @@ def tstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
     if evm.message.is_static:
         raise WriteInStaticContext
     set_transient_storage(
-        evm.message.tx_env.transient_storage,
+        evm.message.tx_env.state,
         evm.message.current_target,
         key,
         new_value,
diff --git a/src/ethereum/forks/monad_eight/vm/instructions/system.py b/src/ethereum/forks/monad_eight/vm/instructions/system.py
index c70160114aa..109775e4a2c 100644
--- a/src/ethereum/forks/monad_eight/vm/instructions/system.py
+++ b/src/ethereum/forks/monad_eight/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
     get_account,
@@ -45,15 +45,7 @@
     WriteInStaticContext,
 )
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -97,7 +89,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -111,15 +103,13 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -174,14 +164,16 @@ def create(evm: Evm) -> None:
     )
     init_code_gas = init_code_cost(Uint(memory_size))
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost + init_code_gas)
+    charge_gas(
+        evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost + init_code_gas
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -224,8 +216,8 @@ def create2(evm: Evm) -> None:
     init_code_gas = init_code_cost(Uint(memory_size))
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost
         + init_code_gas,
     )
@@ -269,7 +261,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -384,10 +376,10 @@ def call(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
@@ -399,10 +391,10 @@ def call(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -415,7 +407,7 @@ def call(evm: Evm) -> None:
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -475,10 +467,10 @@ def callcode(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -489,7 +481,7 @@ def callcode(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -502,7 +494,7 @@ def callcode(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -545,19 +537,19 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if beneficiary not in evm.accessed_addresses:
         evm.accessed_addresses.add(beneficiary)
-        gas_cost += GAS_COLD_ACCOUNT_ACCESS
+        gas_cost += GasCosts.COLD_ACCOUNT_ACCESS
 
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -565,11 +557,11 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     move_ether(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         originator,
         beneficiary,
         originator_balance,
@@ -577,10 +569,10 @@ def selfdestruct(evm: Evm) -> None:
 
     # register account for deletion only if it was created
     # in the same transaction
-    if originator in evm.message.block_env.state.created_accounts:
+    if originator in evm.message.tx_env.state.created_accounts:
         # If beneficiary is the same as originator, then
         # the ether is burnt.
-        set_account_balance(evm.message.block_env.state, originator, U256(0))
+        set_account_balance(evm.message.tx_env.state, originator, U256(0))
         evm.accounts_to_delete.add(originator)
 
     # HALT the execution
@@ -618,10 +610,10 @@ def delegatecall(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -689,10 +681,10 @@ def staticcall(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
diff --git a/src/ethereum/forks/monad_eight/vm/interpreter.py b/src/ethereum/forks/monad_eight/vm/interpreter.py
index fc31801ecc5..99e75de1742 100644
--- a/src/ethereum/forks/monad_eight/vm/interpreter.py
+++ b/src/ethereum/forks/monad_eight/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,19 +31,20 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     get_account,
     get_balance_original,
     get_code,
     increment_nonce,
     is_sender_authority,
+    iter_all_addresses,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
 )
 from ..vm import Message
@@ -52,7 +53,7 @@
     is_valid_delegation,
     set_delegation,
 )
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts import MONAD_PRECOMPILE_ADDRESSES
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
@@ -77,6 +78,7 @@
 RESERVE_BALANCE = U256(10 * 10**18)  # 10 MON
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -116,12 +118,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -142,8 +144,8 @@ def process_message_call(message: Message) -> MessageCallOutput:
             message.disable_precompiles = True
             message.accessed_addresses.add(delegated_address)
             message.code = get_code(
-                block_env.state,
-                get_account(block_env.state, delegated_address).code_hash,
+                tx_state,
+                get_account(tx_state, delegated_address).code_hash,
             )
             message.code_address = delegated_address
             message.disable_create_opcodes = True
@@ -188,22 +190,31 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
-    transient_storage = message.tx_env.transient_storage
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
-
-    # The list of created accounts is used by `get_storage_original`.
-    # Additionally, the list is needed to respect the constraints
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts. This tracking is also needed to respect the constraints
     # added to SELFDESTRUCT by EIP-6780.
-    mark_account_created(state, message.current_target)
+    mark_account_created(tx_state, message.current_target)
 
-    increment_nonce(state, message.current_target)
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             if len(contract_code) > 0:
@@ -213,15 +224,14 @@ def process_create_message(message: Message) -> Evm:
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state, transient_storage)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state, transient_storage)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -240,11 +250,10 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
-    transient_storage = message.tx_env.transient_storage
     code = message.code
     valid_jump_destinations = get_valid_jump_destinations(code)
     evm = Evm(
@@ -267,11 +276,14 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
+    snapshot = copy_tx_state(tx_state)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -312,14 +324,12 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     else:
         # FIXME: index_in_block is a proxy for not being a system tx
         if message.depth == 0 and message.tx_env.index_in_block is not None:
-            for addr in set(state._main_trie._data.keys()):
-                acc = get_account(state, addr)
+            for addr in iter_all_addresses(tx_state):
+                acc = get_account(tx_state, addr)
                 # For creation txs, code hasn't been set yet on the new
                 # contract (set_code runs after process_message returns). Use
                 # evm.output which holds the code to be deployed.
@@ -329,13 +339,13 @@ def process_message(message: Message) -> Evm:
                 ):
                     code = evm.output
                 else:
-                    code = get_code(state, acc.code_hash)
+                    code = get_code(tx_state, acc.code_hash)
 
                 # NOTE: this also matches initcode ending with empty code
                 # deployments via `Op.STOP` or `Op.RETURN(0, 0)`, but this
                 # aligns with Monad EVM implementation.
                 if code == b"" or is_valid_delegation(code):
-                    original_balance = get_balance_original(state, addr)
+                    original_balance = get_balance_original(snapshot, addr)
                     if message.tx_env.origin == addr:
                         # gas_fees already deducted, need to re-add if sender
                         # to match with spec.
@@ -351,7 +361,7 @@ def process_message(message: Message) -> Evm:
 
                     is_exception = (
                         message.tx_env.origin == addr
-                        and not is_sender_authority(state, addr)
+                        and not is_sender_authority(tx_state.parent, addr)
                         and not is_valid_delegation(code)
                     )
 
@@ -360,10 +370,9 @@ def process_message(message: Message) -> Evm:
                         and acc.balance < threshold
                         and not is_exception
                     ):
-                        rollback_transaction(state, transient_storage)
+                        restore_tx_state(tx_state, snapshot)
                         evm.error = RevertOnReserveBalance()
                         return evm
                         # cannot do this because it fails the entire tx
                         # raise RevertOnReserveBalance
-        commit_transaction(state, transient_storage)
     return evm
diff --git a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/alt_bn128.py
index 52ab0a12be4..862506c54c3 100644
--- a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,13 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import (
-    GAS_ALT_BN128_ADD,
-    GAS_ALT_BN128_MUL,
-    GAS_ALT_BN128_PAIRING_BASE,
-    GAS_ALT_BN128_PAIRING_PER_POINT,
-    charge_gas,
-)
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -155,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ALT_BN128_ADD)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -183,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ALT_BN128_MUL)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -213,10 +207,8 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     # GAS
     charge_gas(
         evm,
-        Uint(
-            GAS_ALT_BN128_PAIRING_PER_POINT * (len(data) // 192)
-            + GAS_ALT_BN128_PAIRING_BASE
-        ),
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
     )
 
     # OPERATION
diff --git a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/bls12_381/__init__.py b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/bls12_381/__init__.py
index c99e7573f48..7d622da39d1 100644
--- a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/bls12_381/__init__.py
+++ b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/bls12_381/__init__.py
@@ -414,7 +414,7 @@ def decode_g1_scalar_pair(
 
     """
     if len(data) != 160:
-        InvalidParameter("Input should be 160 bytes long")
+        raise InvalidParameter("Input should be 160 bytes long")
 
     point = bytes_to_g1(data[:128], subgroup_check=True)
 
@@ -614,7 +614,7 @@ def decode_g2_scalar_pair(
 
     """
     if len(data) != 288:
-        InvalidParameter("Input should be 288 bytes long")
+        raise InvalidParameter("Input should be 288 bytes long")
 
     point = bytes_to_g2(data[:256], subgroup_check=True)
     n = int.from_bytes(data[256 : 256 + 32], "big")
diff --git a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/bls12_381/bls12_381_g1.py b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
index ae8eeba0ce6..d1f63224a0c 100644
--- a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
+++ b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G1_ADD,
-    GAS_BLS_G1_MAP,
-    GAS_BLS_G1_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -60,7 +58,7 @@ def bls12_g1_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1ADD)
 
     # OPERATION
     p1 = bytes_to_g1(buffer_read(data, U256(0), U256(128)))
@@ -101,7 +99,7 @@ def bls12_g1_msm(evm: Evm) -> None:
     else:
         discount = Uint(G1_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G1_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G1MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -140,7 +138,7 @@ def bls12_map_fp_to_g1(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1MAP)
 
     # OPERATION
     fp = int.from_bytes(data, "big")
diff --git a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/bls12_381/bls12_381_g2.py b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
index 473739b78c0..2fd32313f89 100644
--- a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
+++ b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G2_ADD,
-    GAS_BLS_G2_MAP,
-    GAS_BLS_G2_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -61,7 +59,7 @@ def bls12_g2_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2ADD)
 
     # OPERATION
     p1 = bytes_to_g2(buffer_read(data, U256(0), U256(256)))
@@ -102,7 +100,7 @@ def bls12_g2_msm(evm: Evm) -> None:
     else:
         discount = Uint(G2_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G2_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G2MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -141,7 +139,7 @@ def bls12_map_fp2_to_g2(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2MAP)
 
     # OPERATION
     field_element = bytes_to_fq2(data)
diff --git a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/identity.py b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/p256verify.py b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/p256verify.py
index 6f6e7ff4e9d..21767b92b61 100644
--- a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/p256verify.py
+++ b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/p256verify.py
@@ -23,7 +23,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_P256VERIFY, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -40,7 +40,7 @@ def p256verify(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_P256VERIFY)
+    charge_gas(evm, GasCosts.PRECOMPILE_P256VERIFY)
 
     if len(data) != 160:
         return
diff --git a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/point_evaluation.py b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/point_evaluation.py
index ce4eed71294..d2d105ba13b 100644
--- a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/point_evaluation.py
+++ b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/point_evaluation.py
@@ -22,7 +22,7 @@
 
 from ...vm import Evm
 from ...vm.exceptions import KZGProofError
-from ...vm.gas import GAS_POINT_EVALUATION, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 FIELD_ELEMENTS_PER_BLOB = 4096
 BLS_MODULUS = 52435875175126190479447740508185965837690552500527637822603658699938581184513  # noqa: E501
@@ -51,7 +51,7 @@ def point_evaluation(evm: Evm) -> None:
     proof = Bytes48(data[144:192])
 
     # GAS
-    charge_gas(evm, GAS_POINT_EVALUATION)
+    charge_gas(evm, GasCosts.PRECOMPILE_POINT_EVALUATION)
     if kzg_commitment_to_versioned_hash(commitment) != versioned_hash:
         raise KZGProofError
 
diff --git a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/monad_eight/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/monad_eight/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/monad_nine/blocks.py b/src/ethereum/forks/monad_nine/blocks.py
index ffc83acf785..ccbc6df8e6e 100644
--- a/src/ethereum/forks/monad_nine/blocks.py
+++ b/src/ethereum/forks/monad_nine/blocks.py
@@ -10,7 +10,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
@@ -31,6 +31,7 @@
 )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Withdrawal:
@@ -64,6 +65,7 @@ class Withdrawal:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -107,13 +109,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.monad_nine.state.state_root
-    [Trie]: ref:ethereum.forks.monad_nine.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -123,8 +126,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.monad_nine.trie.root
-    [Trie]: ref:ethereum.forks.monad_nine.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -134,8 +137,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.monad_nine.trie.root
-    [Trie]: ref:ethereum.forks.monad_nine.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -246,6 +249,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -299,6 +303,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -331,6 +336,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/monad_nine/fork.py b/src/ethereum/forks/monad_nine/fork.py
index 3407ff47921..9ef677d2d1c 100644
--- a/src/ethereum/forks/monad_nine/fork.py
+++ b/src/ethereum/forks/monad_nine/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Tuple
+from typing import Final, List, Optional, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
@@ -27,7 +27,13 @@
     InvalidSenderError,
     NonceMismatchError,
 )
-from ethereum.state import EMPTY_CODE_HASH, Account, Address
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt, Withdrawal, encode_receipt
@@ -51,21 +57,21 @@
     compute_requests_hash,
     parse_deposit_requests,
 )
-from .state import (
-    State,
-    TransientStorage,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
     add_sender_authority,
+    create_ether,
     destroy_account,
+    extract_block_diff,
     forget_senders_authorities,
     get_account,
     get_code,
+    incorporate_tx_into_block,
     increment_nonce,
-    modify_state,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
-    AccessListTransaction,
     BlobTransaction,
     FeeMarketTransaction,
     LegacyTransaction,
@@ -74,17 +80,16 @@
     decode_transaction,
     encode_transaction,
     get_transaction_hash,
+    has_access_list,
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.hexadecimal import hex_to_address
 from .utils.message import prepare_message
 from .vm import Message
 from .vm.eoa_delegation import is_valid_delegation
 from .vm.gas import (
-    BLOB_SCHEDULE_MAX,
-    GAS_PER_BLOB,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_data_fee,
     calculate_excess_blob_gas,
@@ -94,15 +99,15 @@
 
 BASE_FEE_MAX_CHANGE_DENOMINATOR = Uint(8)
 ELASTICITY_MULTIPLIER = Uint(2)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 SYSTEM_ADDRESS = hex_to_address("0xfffffffffffffffffffffffffffffffffffffffe")
 BEACON_ROOTS_ADDRESS = hex_to_address(
     "0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02"
 )
 SYSTEM_TRANSACTION_GAS = Uint(30000000)
-MAX_BLOB_GAS_PER_BLOCK = BLOB_SCHEDULE_MAX * GAS_PER_BLOB
+MAX_BLOB_GAS_PER_BLOCK: Final[U64] = (
+    GasCosts.BLOB_SCHEDULE_MAX * GasCosts.PER_BLOB
+)
 VERSIONED_HASH_VERSION_KZG = b"\x01"
 
 WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS = hex_to_address(
@@ -120,6 +125,7 @@
 BLOB_COUNT_LIMIT = 6
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -225,9 +231,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block.ommers != ():
         raise InvalidBlock
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -244,7 +252,10 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         withdrawals=block.withdrawals,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes, block_diff.storage_changes
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -270,6 +281,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if requests_hash != block.header.requests_hash:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -401,6 +413,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Tuple[Address, Uint, Tuple[VersionedHash, ...], U64]:
     """
     Check if the transaction is includable in the block.
@@ -413,6 +426,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -471,7 +486,7 @@ def check_transaction(
         raise BlobGasLimitExceededError("blob gas limit exceeded")
 
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     if isinstance(
         tx, (FeeMarketTransaction, BlobTransaction, SetCodeTransaction)
@@ -539,7 +554,7 @@ def check_transaction(
 
     if Uint(sender_account.balance) < max_gas_fee + Uint(tx.value):
         raise InsufficientBalanceError("insufficient sender balance")
-    sender_code = get_code(block_env.state, sender_account.code_hash)
+    sender_code = get_code(tx_state, sender_account.code_hash)
     if sender_account.code_hash != EMPTY_CODE_HASH and not is_valid_delegation(
         sender_code
     ):
@@ -590,76 +605,6 @@ def make_receipt(
     return encode_receipt(tx, receipt)
 
 
-def process_system_transaction(
-    block_env: vm.BlockEnvironment,
-    target_address: Address,
-    system_contract_code: Bytes,
-    data: Bytes,
-) -> MessageCallOutput:
-    """
-    Process a system transaction with the given code.
-
-    Prefer calling `process_checked_system_transaction` or
-    `process_unchecked_system_transaction` depending on whether missing code or
-    an execution error should cause the block to be rejected.
-
-    Parameters
-    ----------
-    block_env :
-        The block scoped environment.
-    target_address :
-        Address of the contract to call.
-    system_contract_code :
-        Code of the contract to call.
-    data :
-        Data to pass to the contract.
-
-    Returns
-    -------
-    system_tx_output : `MessageCallOutput`
-        Output of processing the system transaction.
-
-    """
-    tx_env = vm.TransactionEnvironment(
-        origin=SYSTEM_ADDRESS,
-        gas_price=block_env.base_fee_per_gas,
-        gas=SYSTEM_TRANSACTION_GAS,
-        tx_gas_limit=SYSTEM_TRANSACTION_GAS,
-        access_list_addresses=set(),
-        access_list_storage_keys=set(),
-        transient_storage=TransientStorage(),
-        blob_versioned_hashes=(),
-        authorizations=(),
-        index_in_block=None,
-        tx_hash=None,
-    )
-
-    system_tx_message = Message(
-        block_env=block_env,
-        tx_env=tx_env,
-        caller=SYSTEM_ADDRESS,
-        target=target_address,
-        gas=SYSTEM_TRANSACTION_GAS,
-        value=U256(0),
-        data=data,
-        code=system_contract_code,
-        depth=Uint(0),
-        current_target=target_address,
-        code_address=target_address,
-        should_transfer_value=False,
-        is_static=False,
-        accessed_addresses=set(),
-        accessed_storage_keys=set(),
-        disable_precompiles=False,
-        parent_evm=None,
-        disable_create_opcodes=False,
-    )
-
-    system_tx_output = process_message_call(system_tx_message)
-
-    return system_tx_output
-
-
 def process_checked_system_transaction(
     block_env: vm.BlockEnvironment,
     target_address: Address,
@@ -684,9 +629,18 @@ def process_checked_system_transaction(
         Output of processing the system transaction.
 
     """
+    # Pre-check that the system contract has code. We use a throwaway
+    # TransactionState here that is *never* propagated back to BlockState
+    # (no incorporate_tx_into_block call); the same get_account / get_code
+    # lookups are performed and properly tracked by
+    # process_unchecked_system_transaction below, which this function
+    # always calls. Reading via a TransactionState (rather than directly
+    # against pre_state) lets us see system contracts deployed earlier in
+    # the same block — see EIP-7002 and EIP-7251 for this edge case.
+    untracked_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        untracked_state,
+        get_account(untracked_state, target_address).code_hash,
     )
 
     if len(system_contract_code) == 0:
@@ -695,10 +649,9 @@ def process_checked_system_transaction(
             "contain code"
         )
 
-    system_tx_output = process_system_transaction(
+    system_tx_output = process_unchecked_system_transaction(
         block_env,
         target_address,
-        system_contract_code,
         data,
     )
 
@@ -717,8 +670,8 @@ def process_unchecked_system_transaction(
     data: Bytes,
 ) -> MessageCallOutput:
     """
-    Process a system transaction without checking if the contract contains code
-    or if the transaction fails.
+    Process a system transaction without checking if the contract contains
+    code or if the transaction fails.
 
     Parameters
     ----------
@@ -735,17 +688,53 @@ def process_unchecked_system_transaction(
         Output of processing the system transaction.
 
     """
+    system_tx_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        system_tx_state,
+        get_account(system_tx_state, target_address).code_hash,
     )
-    return process_system_transaction(
-        block_env,
-        target_address,
-        system_contract_code,
-        data,
+
+    tx_env = vm.TransactionEnvironment(
+        origin=SYSTEM_ADDRESS,
+        gas_price=block_env.base_fee_per_gas,
+        gas=SYSTEM_TRANSACTION_GAS,
+        tx_gas_limit=SYSTEM_TRANSACTION_GAS,
+        access_list_addresses=set(),
+        access_list_storage_keys=set(),
+        state=system_tx_state,
+        blob_versioned_hashes=(),
+        authorizations=(),
+        index_in_block=None,
+        tx_hash=None,
+    )
+
+    system_tx_message = Message(
+        block_env=block_env,
+        tx_env=tx_env,
+        caller=SYSTEM_ADDRESS,
+        target=target_address,
+        gas=SYSTEM_TRANSACTION_GAS,
+        value=U256(0),
+        data=data,
+        code=system_contract_code,
+        depth=Uint(0),
+        current_target=target_address,
+        code_address=target_address,
+        should_transfer_value=False,
+        is_static=False,
+        accessed_addresses=set(),
+        accessed_storage_keys=set(),
+        disable_precompiles=False,
+        parent_evm=None,
+        disable_create_opcodes=False,
     )
 
+    system_tx_output = process_message_call(system_tx_message)
+
+    incorporate_tx_into_block(system_tx_state)
+
+    return system_tx_output
+
 
 def apply_body(
     block_env: vm.BlockEnvironment,
@@ -880,6 +869,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(
         block_output.transactions_trie,
         rlp.encode(index),
@@ -897,9 +888,10 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     if isinstance(tx, BlobTransaction):
         blob_gas_fee = calculate_data_fee(block_env.excess_blob_gas, tx)
@@ -909,27 +901,17 @@ def process_transaction(
     effective_gas_fee = tx.gas * effective_gas_price
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     sender_balance_after_gas_fee = (
         Uint(sender_account.balance) - effective_gas_fee - blob_gas_fee
     )
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     access_list_addresses = set()
     access_list_storage_keys = set()
     access_list_addresses.add(block_env.coinbase)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
             access_list_addresses.add(access.account)
             for slot in access.slots:
@@ -946,7 +928,7 @@ def process_transaction(
         tx_gas_limit=tx.gas,
         access_list_addresses=access_list_addresses,
         access_list_storage_keys=access_list_storage_keys,
-        transient_storage=TransientStorage(),
+        state=tx_state,
         blob_versioned_hashes=blob_versioned_hashes,
         authorizations=authorizations,
         index_in_block=index,
@@ -978,24 +960,15 @@ def process_transaction(
     priority_fee_per_gas = effective_gas_price - block_env.base_fee_per_gas
     transaction_fee = tx.gas * priority_fee_per_gas
 
-    # refund gas
-    sender_balance_after_refund = get_account(block_env.state, sender).balance
-    # + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    # Monad: gas is not refunded to the sender (note absence of
+    # create_ether(tx_state, sender, U256(gas_refund_amount)) here).
     add_sender_authority(block_env.state, block_env.number, sender)
 
     # transfer miner fees
-    coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
-    ).balance + U256(transaction_fee)
-    set_account_balance(
-        block_env.state,
-        block_env.coinbase,
-        coinbase_balance_after_mining_fee,
-    )
+    create_ether(tx_state, block_env.coinbase, U256(transaction_fee))
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
     # block_output.block_gas_used += tx_gas_used_after_refund
     block_output.block_gas_used += tx.gas
@@ -1016,6 +989,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def process_withdrawals(
     block_env: vm.BlockEnvironment,
@@ -1025,9 +1000,7 @@ def process_withdrawals(
     """
     Increase the balance of the withdrawing account.
     """
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += wd.amount * U256(10**9)
+    wd_state = TransactionState(parent=block_env.state)
 
     for i, wd in enumerate(withdrawals):
         trie_set(
@@ -1036,7 +1009,9 @@ def increase_recipient_balance(recipient: Account) -> None:
             rlp.encode(wd),
         )
 
-        modify_state(block_env.state, wd.address, increase_recipient_balance)
+        create_ether(wd_state, wd.address, wd.amount * U256(10**9))
+
+    incorporate_tx_into_block(wd_state)
 
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
@@ -1045,14 +1020,14 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
-    passed through as a parameter is greater than or equal to the *sum* of
-    the parent's gas and the adjustment delta then the limit for gas is too
-    high and fails this function's check. Similarly, if the limit is less
-    than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
-    check fails because the gas limit doesn't allow for a sufficient or
-    reasonable amount of gas to be used on a block.
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is passed
+    through as a parameter is greater than or equal to the *sum* of the
+    parent's gas and the adjustment delta then the limit for gas is too high
+    and fails this function's check. Similarly, if the limit is less than or
+    equal to the *difference* of the parent's gas and the adjustment delta *or*
+    the predefined ``LIMIT_MINIMUM`` then this function's check fails because
+    the gas limit doesn't allow for a sufficient or reasonable amount of gas to
+    be used on a block.
 
     Parameters
     ----------
@@ -1068,12 +1043,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/monad_nine/fork_types.py b/src/ethereum/forks/monad_nine/fork_types.py
index c598e9876bf..4bec34810db 100644
--- a/src/ethereum/forks/monad_nine/fork_types.py
+++ b/src/ethereum/forks/monad_nine/fork_types.py
@@ -12,6 +12,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes256
@@ -43,6 +44,7 @@ def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Authorization:
diff --git a/src/ethereum/forks/monad_nine/requests.py b/src/ethereum/forks/monad_nine/requests.py
index 542c9264d37..6ee0ef1f015 100644
--- a/src/ethereum/forks/monad_nine/requests.py
+++ b/src/ethereum/forks/monad_nine/requests.py
@@ -1,11 +1,31 @@
 """
-Requests were introduced in EIP-7685 as a general purpose framework for
-storing contract-triggered requests. It extends the execution header and
-body with a single field each to store the request information.
-This inherently exposes the requests to the consensus layer, which can
-then process each one.
-
+[EIP-7685] generalizes how the execution layer communicates validator actions
+to the consensus layer. Rather than adding a dedicated header field for each
+new action type (as [EIP-4895] did for withdrawals), the execution header
+commits to a single [`requests_hash`][rh] that aggregates an ordered list of
+typed requests.
+
+Each request is a type byte (see [`DEPOSIT_REQUEST_TYPE`][dt],
+[`WITHDRAWAL_REQUEST_TYPE`][wt], and [`CONSOLIDATION_REQUEST_TYPE`][ct])
+followed by an opaque payload. Deposit requests are discovered by scanning
+transaction receipts for logs emitted by the deposit contract; withdrawal
+and consolidation requests are produced by the corresponding system
+contracts during block processing.
+
+See [`parse_deposit_requests`][pd] for how deposit logs become request data,
+[`compute_requests_hash`][crh] for how the list is hashed for inclusion in the
+header, and [`process_general_purpose_requests`][pgpr] for how the requests are
+processed.
+
+[EIP-4895]: https://eips.ethereum.org/EIPS/eip-4895
 [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+[rh]: ref:ethereum.forks.monad_nine.blocks.Header.requests_hash
+[dt]: ref:ethereum.forks.monad_nine.requests.DEPOSIT_REQUEST_TYPE
+[wt]: ref:ethereum.forks.monad_nine.requests.WITHDRAWAL_REQUEST_TYPE
+[ct]: ref:ethereum.forks.monad_nine.requests.CONSOLIDATION_REQUEST_TYPE
+[pd]: ref:ethereum.forks.monad_nine.requests.parse_deposit_requests
+[crh]: ref:ethereum.forks.monad_nine.requests.compute_requests_hash
+[pgpr]: ref:ethereum.forks.monad_nine.fork.process_general_purpose_requests
 """
 
 from hashlib import sha256
@@ -15,48 +35,133 @@
 from ethereum_types.numeric import Uint, ulen
 
 from ethereum.exceptions import InvalidBlock
+from ethereum.merkle_patricia_trie import trie_get
 from ethereum.utils.hexadecimal import hex_to_bytes32
 
 from .blocks import decode_receipt
-from .trie import trie_get
 from .utils.hexadecimal import hex_to_address
 from .vm import BlockOutput
 
 DEPOSIT_CONTRACT_ADDRESS = hex_to_address(
     "0x00000000219ab540356cbb839cbe05303d7705fa"
 )
+"""
+Mainnet address of the beacon chain deposit contract. Scanning block
+receipts for logs emitted by this address is how the execution layer
+discovers validator deposits, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 DEPOSIT_EVENT_SIGNATURE_HASH = hex_to_bytes32(
     "0x649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c5"
 )
+"""
+First [log topic] of the deposit contract's `DepositEvent`, equal to the
+keccak256 of its Solidity event signature. Logs whose first topic does not
+match this are ignored when collecting deposit requests.
+
+[log topic]: https://docs.soliditylang.org/en/latest/abi-spec.html#events
+"""
+
 DEPOSIT_REQUEST_TYPE = b"\x00"
+"""
+Request type byte identifying a deposit request, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 WITHDRAWAL_REQUEST_TYPE = b"\x01"
+"""
+Request type byte identifying an execution-triggered withdrawal request,
+per [EIP-7002].
+
+[EIP-7002]: https://eips.ethereum.org/EIPS/eip-7002
+"""
+
 CONSOLIDATION_REQUEST_TYPE = b"\x02"
+"""
+Request type byte identifying a consolidation request, per [EIP-7251].
+
+[EIP-7251]: https://eips.ethereum.org/EIPS/eip-7251
+"""
 
 
 DEPOSIT_EVENT_LENGTH = Uint(576)
+"""
+Total length in bytes of the ABI-encoded `DepositEvent` data payload. Every
+well-formed event has this exact length.
+"""
 
 PUBKEY_OFFSET = Uint(160)
+"""
+Position within the event payload of the validator public key's length
+prefix, as emitted by the Solidity ABI encoder.
+"""
+
 WITHDRAWAL_CREDENTIALS_OFFSET = Uint(256)
+"""
+Position within the event payload of the withdrawal credentials' length
+prefix.
+"""
+
 AMOUNT_OFFSET = Uint(320)
+"""
+Position within the event payload of the deposit amount's length prefix.
+"""
+
 SIGNATURE_OFFSET = Uint(384)
+"""
+Position within the event payload of the deposit signature's length prefix.
+"""
+
 INDEX_OFFSET = Uint(512)
+"""
+Position within the event payload of the deposit index's length prefix.
+"""
 
 PUBKEY_SIZE = Uint(48)
+"""
+Length of the BLS12-381 public key that identifies the validator receiving
+the deposit.
+"""
+
 WITHDRAWAL_CREDENTIALS_SIZE = Uint(32)
+"""
+Length of the withdrawal credentials, which determine where the staked
+ether may eventually be withdrawn.
+"""
+
 AMOUNT_SIZE = Uint(8)
+"""
+Length of the little-endian Gwei amount being deposited.
+"""
+
 SIGNATURE_SIZE = Uint(96)
+"""
+Length of the BLS12-381 signature over the deposit message.
+"""
+
 INDEX_SIZE = Uint(8)
+"""
+Length of the monotonically-increasing deposit index assigned by the
+deposit contract when it emits the event.
+"""
 
 
 def extract_deposit_data(data: Bytes) -> Bytes:
     """
-    Extracts Deposit Request from the DepositContract.DepositEvent data.
+    Strip the Solidity ABI framing from a `DepositEvent` payload and return
+    the concatenated raw fields in the order consumed by the consensus
+    layer: public key, withdrawal credentials, amount, signature, and
+    deposit index.
 
-    Raises
-    ------
-    InvalidBlock :
-        If the deposit contract did not produce a valid log.
+    Because each field has a fixed length, every well-formed event has an
+    identical byte layout. Any deviation indicates a misbehaving or
+    compromised deposit contract, so this function raises [`InvalidBlock`]
+    rather than silently accepting unexpected data.
 
+    [`InvalidBlock`]: ref:ethereum.exceptions.InvalidBlock
     """
     if ulen(data) != DEPOSIT_EVENT_LENGTH:
         raise InvalidBlock("Invalid deposit event data length")
@@ -150,7 +255,19 @@ def extract_deposit_data(data: Bytes) -> Bytes:
 
 def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
     """
-    Parse deposit requests from the block output.
+    Walk the receipts produced during block execution, concatenating the
+    raw payload of every valid deposit event into a single byte string.
+
+    A log is considered a deposit when it originates from
+    [`DEPOSIT_CONTRACT_ADDRESS`][addr] and its first topic matches
+    [`DEPOSIT_EVENT_SIGNATURE_HASH`][sig]. The returned bytes are the
+    direct concatenation of the unframed deposit fields, ready to be
+    prefixed with [`DEPOSIT_REQUEST_TYPE`][dt] before being appended to
+    the block's request list.
+
+    [addr]: ref:ethereum.forks.monad_nine.requests.DEPOSIT_CONTRACT_ADDRESS
+    [sig]: ref:ethereum.forks.monad_nine.requests.DEPOSIT_EVENT_SIGNATURE_HASH
+    [dt]: ref:ethereum.forks.monad_nine.requests.DEPOSIT_REQUEST_TYPE
     """
     deposit_requests: Bytes = b""
     for key in block_output.receipt_keys:
@@ -171,18 +288,18 @@ def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
 
 def compute_requests_hash(requests: List[Bytes]) -> Bytes:
     """
-    Get the hash of the requests using the SHA2-256 algorithm.
-
-    Parameters
-    ----------
-    requests : Bytes
-        The requests to hash.
-
-    Returns
-    -------
-    requests_hash : Bytes
-        The hash of the requests.
-
+    Compute the [SHA2-256] commitment over an ordered list of
+    type-prefixed requests, as defined by [EIP-7685].
+
+    The commitment is the SHA2-256 hash of the concatenation of the
+    SHA2-256 hashes of each individual request. This is what the
+    execution header's [`requests_hash`][rh] stores, and what the
+    consensus layer re-derives to validate that both layers observed the
+    same set of requests.
+
+    [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+    [SHA2-256]: https://en.wikipedia.org/wiki/SHA-2
+    [rh]: ref:ethereum.forks.monad_nine.blocks.Header.requests_hash
     """
     m = sha256()
     for request in requests:
diff --git a/src/ethereum/forks/monad_nine/state.py b/src/ethereum/forks/monad_nine/state.py
deleted file mode 100644
index 59c1f832620..00000000000
--- a/src/ethereum/forks/monad_nine/state.py
+++ /dev/null
@@ -1,773 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-from ethereum.state import (
-    EMPTY_ACCOUNT,
-    EMPTY_CODE_HASH,
-    Account,
-    Address,
-    Root,
-)
-
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-    _senders_authorities: Dict[Uint, Set[Address]] = field(
-        default_factory=dict
-    )
-
-
-@dataclass
-class TransientStorage:
-    """
-    Contains all information that is preserved between message calls
-    within a transaction.
-    """
-
-    _tries: Dict[Address, Trie[Bytes32, U256]] = field(default_factory=dict)
-    _snapshots: List[Dict[Address, Trie[Bytes32, U256]]] = field(
-        default_factory=list
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-    del state._senders_authorities
-
-
-def begin_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-    transient_storage._snapshots.append(
-        {k: copy_trie(t) for (k, t) in transient_storage._tries.items()}
-    )
-
-
-def commit_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._snapshots.pop()
-
-
-def rollback_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._tries = transient_storage._snapshots.pop()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-
-    Return ``b""`` for ``EMPTY_CODE_HASH``.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State`` and return its hash.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase, and to respect the constraints added to SELFDESTRUCT by
-    EIP-6780.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`. If, after modification, the account
-    exists and has zero nonce, empty code, and zero balance, it is destroyed.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-    account = get_account_optional(state, address)
-    account_exists_and_is_empty = (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-    if account_exists_and_is_empty:
-        destroy_account(state, address)
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def get_balance_original(state: State, address: Address) -> U256:
-    """
-    Get the original balance of an account i.e. the balance before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-
-    """
-    original_account_trie, _ = state._snapshots[0]
-    original_account = trie_get(original_account_trie, address)
-
-    if original_account is None:
-        original_balance = U256(0)
-    else:
-        original_balance = original_account.balance
-
-    assert isinstance(original_balance, U256)
-    return original_balance
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
-
-
-def get_transient_storage(
-    transient_storage: TransientStorage, address: Address, key: Bytes32
-) -> U256:
-    """
-    Get a value at a storage key on an account from transient storage.
-    Returns `U256(0)` if the storage key has not been set previously.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_transient_storage(
-    transient_storage: TransientStorage,
-    address: Address,
-    key: Bytes32,
-    value: U256,
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        transient_storage._tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del transient_storage._tries[address]
-
-
-def add_sender_authority(
-    state: State,
-    block_number: Uint,
-    address: Address,
-) -> None:
-    """
-    Add an address being an authority signer or sender in block.
-    """
-    state._senders_authorities.setdefault(block_number, set()).add(address)
-
-
-def is_sender_authority(
-    state: State,
-    address: Address,
-) -> bool:
-    """
-    Returns true if address is a sender or authority in saved blocks.
-    """
-    for senders_authorities_at_block in state._senders_authorities.values():
-        if address in senders_authorities_at_block:
-            return True
-    return False
-
-
-RESERVE_BALANCE_DELAY_BLOCKS = Uint(3)
-
-
-def forget_senders_authorities(
-    state: State,
-    current_block_number: Uint,
-) -> None:
-    """
-    Forgets senders and authorities before processing the block at number.
-    """
-    if current_block_number >= RESERVE_BALANCE_DELAY_BLOCKS:
-        number = current_block_number - RESERVE_BALANCE_DELAY_BLOCKS
-        state._senders_authorities.pop(number, None)
diff --git a/src/ethereum/forks/monad_nine/state_tracker.py b/src/ethereum/forks/monad_nine/state_tracker.py
new file mode 100644
index 00000000000..5b3d4be0bd2
--- /dev/null
+++ b/src/ethereum/forks/monad_nine/state_tracker.py
@@ -0,0 +1,841 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    # Monad: per-block-number set of EOAs that sent or were authorized in
+    # that block. Carried across blocks via t8n; used by the reserve
+    # balance exception window (RESERVE_BALANCE_DELAY_BLOCKS lookback).
+    _senders_authorities: Dict[Uint, Set[Address]] = field(
+        default_factory=dict
+    )
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state. If, after modification, the
+    account exists and has zero nonce, empty code, and zero balance, it
+    is destroyed.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+    if account_exists_and_is_empty(tx_state, address):
+        destroy_account(tx_state, address)
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+    )
+
+
+# Monad-specific: reserve balance exception window.
+RESERVE_BALANCE_DELAY_BLOCKS = Uint(3)
+
+
+def add_sender_authority(
+    block_state: BlockState,
+    block_number: Uint,
+    address: Address,
+) -> None:
+    """
+    Record `address` as a sender or authority in the given block number.
+
+    Used by the reserve balance "emptying transaction" exception.
+    """
+    block_state._senders_authorities.setdefault(block_number, set()).add(
+        address
+    )
+
+
+def is_sender_authority(
+    block_state: BlockState,
+    address: Address,
+) -> bool:
+    """
+    Return True if `address` was a sender or authority in any of the
+    block numbers currently retained on `block_state`.
+    """
+    for (
+        senders_authorities_at_block
+    ) in block_state._senders_authorities.values():
+        if address in senders_authorities_at_block:
+            return True
+    return False
+
+
+def forget_senders_authorities(
+    block_state: BlockState,
+    current_block_number: Uint,
+) -> None:
+    """
+    Prune senders/authorities older than the reserve balance delay window.
+    """
+    if current_block_number >= RESERVE_BALANCE_DELAY_BLOCKS:
+        number = current_block_number - RESERVE_BALANCE_DELAY_BLOCKS
+        block_state._senders_authorities.pop(number, None)
+
+
+def get_balance_original(snapshot: TransactionState, address: Address) -> U256:
+    """
+    Get the balance of `address` as it was at the start of the
+    top-level EVM execution (i.e. after pre-execution gas/nonce
+    deduction but before any EVM-driven writes).
+
+    Reads from a ``TransactionState`` captured at top-level EVM begin
+    (the same ``snapshot`` used for rollback in the interpreter). Read
+    chain: snapshot.account_writes -> block writes -> pre_state.
+    """
+    account = get_account_optional(snapshot, address)
+    if account is None:
+        return U256(0)
+    return account.balance
+
+
+def iter_all_addresses(tx_state: TransactionState) -> Set[Address]:
+    """
+    Return every address touched by pre-state, block, or current tx.
+
+    Union of pre-state addresses, block-level writes, and current-tx
+    writes. Reproduces the old ``state._main_trie._data.keys()`` view
+    used by Monad's end-of-tx reserve-balance sweep. Assumes the
+    concrete ``State`` from ``ethereum.state`` (t8n loads its alloc
+    into one) so ``_main_trie._data`` is enumerable.
+    """
+    pre_state = tx_state.parent.pre_state
+    pre_addrs: Set[Address]
+    if hasattr(pre_state, "_main_trie"):
+        pre_addrs = set(pre_state._main_trie._data.keys())
+    else:
+        pre_addrs = set()
+    return (
+        pre_addrs
+        | set(tx_state.parent.account_writes.keys())
+        | set(tx_state.account_writes.keys())
+    )
diff --git a/src/ethereum/forks/monad_nine/transactions.py b/src/ethereum/forks/monad_nine/transactions.py
index 25d3fca9fca..04c4b77388c 100644
--- a/src/ethereum/forks/monad_nine/transactions.py
+++ b/src/ethereum/forks/monad_nine/transactions.py
@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, TypeGuard, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -28,46 +28,10 @@
 )
 from .fork_types import Authorization, VersionedHash
 
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_TOKEN_FLOOR = Uint(10)
-"""
-Minimum gas cost per byte of calldata as per [EIP-7623]. Used to calculate
-the minimum gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_DATA_TOKEN_STANDARD = Uint(4)
-"""
-Gas cost per byte of calldata as per [EIP-7623]. Used to calculate the
-gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
-
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
-"""
-
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
-"""
-
 TX_MAX_GAS_LIMIT = Uint(30_000_000)
 
 
+@final
 @slotted_freezable
 @dataclass
 class LegacyTransaction:
@@ -130,6 +94,7 @@ class LegacyTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Access:
@@ -149,6 +114,7 @@ class Access:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccessListTransaction:
@@ -221,6 +187,7 @@ class AccessListTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class FeeMarketTransaction:
@@ -298,6 +265,7 @@ class FeeMarketTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class BlobTransaction:
@@ -386,6 +354,7 @@ class BlobTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class SetCodeTransaction:
@@ -481,6 +450,23 @@ class SetCodeTransaction:
 """
 
 
+AccessListCapableTransaction = (
+    AccessListTransaction
+    | FeeMarketTransaction
+    | BlobTransaction
+    | SetCodeTransaction
+)
+"""
+Transaction types that include an [EIP-2930]-style access list.
+
+See [`has_access_list`][hal] and [`Access`][a] for more details.
+
+[EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+[hal]: ref:ethereum.forks.amsterdam.transactions.has_access_list
+[a]: ref:ethereum.forks.amsterdam.transactions.Access
+"""
+
+
 def encode_transaction(tx: Transaction) -> LegacyTransaction | Bytes:
     """
     Encode a transaction into its RLP or typed transaction format.
@@ -584,7 +570,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
     4. Cost for access list entries (if applicable)
@@ -595,8 +581,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     gas cost of the transaction and the minimum gas cost used by the
     transaction based on the calldata size.
     """
-    from .vm.eoa_delegation import GAS_AUTH_PER_EMPTY_ACCOUNT
-    from .vm.gas import init_code_cost
+    from .vm.gas import GasCosts, init_code_cost
 
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
@@ -604,39 +589,33 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     tokens_in_calldata = num_zeros + num_non_zeros * Uint(4)
     # EIP-7623 floor price (note: no EVM costs)
     calldata_floor_gas_cost = (
-        tokens_in_calldata * GAS_TX_DATA_TOKEN_FLOOR + GAS_TX_BASE
+        tokens_in_calldata * GasCosts.TX_DATA_TOKEN_FLOOR + GasCosts.TX_BASE
     )
 
-    data_cost = tokens_in_calldata * GAS_TX_DATA_TOKEN_STANDARD
+    data_cost = tokens_in_calldata * GasCosts.TX_DATA_TOKEN_STANDARD
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE + init_code_cost(ulen(tx.data))
+        create_cost = GasCosts.TX_CREATE + init_code_cost(ulen(tx.data))
     else:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
-            access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_cost += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
 
     auth_cost = Uint(0)
     if isinstance(tx, SetCodeTransaction):
-        auth_cost += Uint(GAS_AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations))
+        auth_cost += Uint(
+            GasCosts.AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations)
+        )
 
     return (
         Uint(
-            GAS_TX_BASE
+            GasCosts.TX_BASE
             + data_cost
             + create_cost
             + access_list_cost
@@ -884,3 +863,17 @@ def get_transaction_hash(tx: Bytes | LegacyTransaction) -> Hash32:
         return keccak256(rlp.encode(tx))
     else:
         return keccak256(tx)
+
+
+def has_access_list(
+    tx: Transaction,
+) -> TypeGuard[AccessListCapableTransaction]:
+    """
+    Return whether the transaction has an [EIP-2930]-style access list.
+
+    [EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+    """
+    return isinstance(
+        tx,
+        AccessListCapableTransaction,
+    )
diff --git a/src/ethereum/forks/monad_nine/trie.py b/src/ethereum/forks/monad_nine/trie.py
deleted file mode 100644
index 85876724df5..00000000000
--- a/src/ethereum/forks/monad_nine/trie.py
+++ /dev/null
@@ -1,509 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-from typing_extensions import assert_type
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.monad_eight import trie as previous_trie
-from ethereum.state import Account, Address, Root
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt, Withdrawal
-from .fork_types import encode_account
-from .transactions import LegacyTransaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = (
-    Account
-    | Bytes
-    | LegacyTransaction
-    | Receipt
-    | Uint
-    | U256
-    | Withdrawal
-    | None
-)
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[LegacyTransaction | Bytes],
-    Optional[Receipt | Bytes],
-    Optional[Withdrawal | Bytes],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `Extended`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (LegacyTransaction, Receipt, Withdrawal, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/monad_nine/utils/message.py b/src/ethereum/forks/monad_nine/utils/message.py
index 8051f5b6959..38683a7ad14 100644
--- a/src/ethereum/forks/monad_nine/utils/message.py
+++ b/src/ethereum/forks/monad_nine/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
@@ -55,7 +55,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -63,8 +63,9 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        state = block_env.state
-        code = get_code(state, get_account(state, tx.to).code_hash)
+        code = get_code(
+            tx_env.state, get_account(tx_env.state, tx.to).code_hash
+        )
         code_address = tx.to
     else:
         raise AssertionError("Target must be address or empty bytes")
diff --git a/src/ethereum/forks/monad_nine/vm/__init__.py b/src/ethereum/forks/monad_nine/vm/__init__.py
index f41ca649690..87ea1ca9320 100644
--- a/src/ethereum/forks/monad_nine/vm/__init__.py
+++ b/src/ethereum/forks/monad_nine/vm/__init__.py
@@ -13,24 +13,25 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt, Withdrawal
 from ..fork_types import Authorization, VersionedHash
-from ..state import State, TransientStorage
+from ..state_tracker import BlockState, TransactionState
 from ..transactions import LegacyTransaction
-from ..trie import Trie
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +39,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -50,6 +51,7 @@ class BlockEnvironment:
     parent_beacon_block_root: Hash32
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -92,10 +94,11 @@ class BlockOutput:
     requests: List[Bytes] = field(default_factory=list)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
@@ -104,13 +107,19 @@ class TransactionEnvironment:
     tx_gas_limit: Uint
     access_list_addresses: Set[Address]
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
-    transient_storage: TransientStorage
+    state: TransactionState
     blob_versioned_hashes: Tuple[VersionedHash, ...]
     authorizations: Tuple[Authorization, ...]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
+    # Monad: snapshot of `state` captured at top-level EVM begin (i.e.
+    # after pre-execution gas/nonce deduction). Recreates the
+    # pre-refactor ``state._snapshots[0]`` view used by the reserve
+    # balance check (end-of-tx) and the dippedIntoReserve precompile.
+    tx_snapshot: Optional[TransactionState] = None
 
 
+@final
 @dataclass
 class Message:
     """
@@ -155,6 +164,7 @@ def hex(self) -> str:
         return self.data.hex()
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
diff --git a/src/ethereum/forks/monad_nine/vm/eoa_delegation.py b/src/ethereum/forks/monad_nine/vm/eoa_delegation.py
index 88980721ba8..3f49d12b3cd 100644
--- a/src/ethereum/forks/monad_nine/vm/eoa_delegation.py
+++ b/src/ethereum/forks/monad_nine/vm/eoa_delegation.py
@@ -14,7 +14,7 @@
 from ethereum.state import Address
 
 from ..fork_types import Authorization
-from ..state import (
+from ..state_tracker import (
     account_exists,
     add_sender_authority,
     get_account,
@@ -23,14 +23,13 @@
     set_code,
 )
 from ..utils.hexadecimal import hex_to_address
-from ..vm.gas import GAS_COLD_ACCOUNT_ACCESS, GAS_WARM_ACCESS
+from ..vm.gas import GasCosts
 from . import Evm, Message
 
 SET_CODE_TX_MAGIC = b"\x05"
 EOA_DELEGATION_MARKER = b"\xef\x01\x00"
 EOA_DELEGATION_MARKER_LENGTH = len(EOA_DELEGATION_MARKER)
 EOA_DELEGATED_CODE_LENGTH = 23
-GAS_AUTH_PER_EMPTY_ACCOUNT = 25000
 REFUND_AUTH_PER_EXISTING_ACCOUNT = 12500
 NULL_ADDRESS = hex_to_address("0x0000000000000000000000000000000000000000")
 
@@ -142,19 +141,19 @@ def access_delegation(
         access gas cost.
 
     """
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
 
-    code = get_code(state, get_account(state, address).code_hash)
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
     if not is_valid_delegation(code):
         return False, False, address, code, Uint(0)
 
     address = Address(code[EOA_DELEGATION_MARKER_LENGTH:])
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
-    code = get_code(state, get_account(state, address).code_hash)
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     return True, True, address, code, access_gas_cost
 
@@ -174,7 +173,7 @@ def set_delegation(message: Message) -> U256:
         Refund from authority which already exists in state.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     for auth in message.tx_env.authorizations:
         if auth.chain_id not in (message.block_env.chain_id, U256(0)):
@@ -190,8 +189,8 @@ def set_delegation(message: Message) -> U256:
 
         message.accessed_addresses.add(authority)
 
-        authority_account = get_account(state, authority)
-        authority_code = get_code(state, authority_account.code_hash)
+        authority_account = get_account(tx_state, authority)
+        authority_code = get_code(tx_state, authority_account.code_hash)
 
         if authority_code and not is_valid_delegation(authority_code):
             continue
@@ -200,26 +199,29 @@ def set_delegation(message: Message) -> U256:
         if authority_nonce != auth.nonce:
             continue
 
-        if account_exists(state, authority):
+        if account_exists(tx_state, authority):
             refund_counter += U256(
-                GAS_AUTH_PER_EMPTY_ACCOUNT - REFUND_AUTH_PER_EXISTING_ACCOUNT
+                GasCosts.AUTH_PER_EMPTY_ACCOUNT
+                - REFUND_AUTH_PER_EXISTING_ACCOUNT
             )
 
         if auth.address == NULL_ADDRESS:
             code_to_set = b""
         else:
             code_to_set = EOA_DELEGATION_MARKER + auth.address
-        set_code(state, authority, code_to_set)
+        set_code(tx_state, authority, code_to_set)
 
-        increment_nonce(state, authority)
+        increment_nonce(tx_state, authority)
 
-        add_sender_authority(state, message.block_env.number, authority)
+        add_sender_authority(
+            message.block_env.state, message.block_env.number, authority
+        )
 
     if message.code_address is None:
         raise InvalidBlock("Invalid type 4 transaction: no target")
 
     message.code = get_code(
-        state, get_account(state, message.code_address).code_hash
+        tx_state, get_account(tx_state, message.code_address).code_hash
     )
 
     return refund_counter
diff --git a/src/ethereum/forks/monad_nine/vm/gas.py b/src/ethereum/forks/monad_nine/vm/gas.py
index db8ea3c245e..98f2957c56c 100644
--- a/src/ethereum/forks/monad_nine/vm/gas.py
+++ b/src/ethereum/forks/monad_nine/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U64, U256, Uint
+from ethereum_types.numeric import U64, U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32, taylor_exponential
@@ -24,74 +24,176 @@
 from . import Evm, EvmMemory
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000 + 6000)
-REFUND_STORAGE_CLEAR = 4800
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-GAS_ECRECOVER = Uint(3000 * 2)
-GAS_P256VERIFY = Uint(6900)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1 * 2)
-GAS_COLD_SLOAD = Uint(2100 + 6000)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600 + 7500)
-GAS_WARM_ACCESS = Uint(100)
-GAS_CODE_INIT_PER_WORD = Uint(2)
-GAS_BLOBHASH_OPCODE = Uint(3)
-GAS_POINT_EVALUATION = Uint(50000 * 4)
-GAS_ALT_BN128_ADD = Uint(150 * 2)
-GAS_ALT_BN128_MUL = Uint(6000 * 5)
-GAS_ALT_BN128_PAIRING_BASE = 45000 * 5
-GAS_ALT_BN128_PAIRING_PER_POINT = 34000 * 5
-
-GAS_PER_BLOB = U64(2**17)
-BLOB_SCHEDULE_TARGET = U64(6)
-BLOB_TARGET_GAS_PER_BLOCK = GAS_PER_BLOB * BLOB_SCHEDULE_TARGET
-BLOB_BASE_COST = Uint(2**13)
-BLOB_SCHEDULE_MAX = U64(9)
-BLOB_MIN_GASPRICE = Uint(1)
-BLOB_BASE_FEE_UPDATE_FRACTION = Uint(5007716)
-
+# Monad MIP-3: linear memory pricing parameters.
 MAX_TX_MEMORY_USAGE = 8 * 1024 * 1024
 MEMORY_WORDS_PER_GAS = Uint(2)
 
-GAS_BLS_G1_ADD = Uint(375)
-GAS_BLS_G1_MUL = Uint(12000)
-GAS_BLS_G1_MAP = Uint(5500)
-GAS_BLS_G2_ADD = Uint(600)
-GAS_BLS_G2_MUL = Uint(22500)
-GAS_BLS_G2_MAP = Uint(23800)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    WARM_ACCESS: Final[Uint] = Uint(100)
+    COLD_ACCOUNT_ACCESS: Final[Uint] = Uint(2600 + 7500)
+    COLD_STORAGE_ACCESS: Final[Uint] = Uint(2100 + 6000)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000 + 6000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+    CODE_INIT_PER_WORD: Final[Uint] = Uint(2)
+
+    # Authorization
+    AUTH_PER_EMPTY_ACCOUNT: Final[int] = 25000
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 4800
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000 * 2)
+    PRECOMPILE_P256VERIFY: Final[Uint] = Uint(6900)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1 * 2)
+    PRECOMPILE_POINT_EVALUATION: Final[Uint] = Uint(50000 * 4)
+    PRECOMPILE_BLS_G1ADD: Final[Uint] = Uint(375)
+    PRECOMPILE_BLS_G1MUL: Final[Uint] = Uint(12000)
+    PRECOMPILE_BLS_G1MAP: Final[Uint] = Uint(5500)
+    PRECOMPILE_BLS_G2ADD: Final[Uint] = Uint(600)
+    PRECOMPILE_BLS_G2MUL: Final[Uint] = Uint(22500)
+    PRECOMPILE_BLS_G2MAP: Final[Uint] = Uint(23800)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150 * 2)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000 * 5)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000 * 5)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000 * 5)
+
+    # Blobs
+    PER_BLOB: Final[U64] = U64(2**17)
+    BLOB_SCHEDULE_TARGET: Final[U64] = U64(6)
+    BLOB_TARGET_GAS_PER_BLOCK: Final[U64] = PER_BLOB * BLOB_SCHEDULE_TARGET
+    BLOB_BASE_COST: Final[Uint] = Uint(2**13)
+    BLOB_SCHEDULE_MAX: Final[U64] = U64(9)
+    BLOB_MIN_GASPRICE: Final[Uint] = Uint(1)
+    BLOB_BASE_FEE_UPDATE_FRACTION: Final[Uint] = Uint(5007716)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_TOKEN_STANDARD: Final[Uint] = Uint(4)
+    TX_DATA_TOKEN_FLOOR: Final[Uint] = Uint(10)
+    TX_ACCESS_LIST_ADDRESS: Final[Uint] = Uint(2400)
+    TX_ACCESS_LIST_STORAGE_KEY: Final[Uint] = Uint(1900)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_CLZ: Final[Uint] = LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_PREVRANDAO: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_BASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBBASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBHASH: Final[Uint] = Uint(3)
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_PUSH0: Final[Uint] = BASE
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MCOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -107,11 +209,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -163,6 +266,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
+    # Monad MIP-3 linear memory pricing.
     total_gas_cost = size_in_words // MEMORY_WORDS_PER_GAS
     return total_gas_cost
 
@@ -188,7 +292,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory.data))
+    current_size = ulen(memory.data)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -240,7 +344,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
@@ -312,7 +416,7 @@ def init_code_cost(init_code_length: Uint) -> Uint:
         The gas to be charged for the init code.
 
     """
-    return GAS_CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
+    return GasCosts.CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
 
 
 def calculate_excess_blob_gas(parent_header: Header) -> U64:
@@ -343,21 +447,23 @@ def calculate_excess_blob_gas(parent_header: Header) -> U64:
         base_fee_per_gas = parent_header.base_fee_per_gas
 
     parent_blob_gas = excess_blob_gas + blob_gas_used
-    if parent_blob_gas < BLOB_TARGET_GAS_PER_BLOCK:
+    if parent_blob_gas < GasCosts.BLOB_TARGET_GAS_PER_BLOCK:
         return U64(0)
 
-    target_blob_gas_price = Uint(GAS_PER_BLOB)
+    target_blob_gas_price = Uint(GasCosts.PER_BLOB)
     target_blob_gas_price *= calculate_blob_gas_price(excess_blob_gas)
 
-    base_blob_tx_price = BLOB_BASE_COST * base_fee_per_gas
+    base_blob_tx_price = GasCosts.BLOB_BASE_COST * base_fee_per_gas
     if base_blob_tx_price > target_blob_gas_price:
-        blob_schedule_delta = BLOB_SCHEDULE_MAX - BLOB_SCHEDULE_TARGET
+        blob_schedule_delta = (
+            GasCosts.BLOB_SCHEDULE_MAX - GasCosts.BLOB_SCHEDULE_TARGET
+        )
         return (
             excess_blob_gas
-            + blob_gas_used * blob_schedule_delta // BLOB_SCHEDULE_MAX
+            + blob_gas_used * blob_schedule_delta // GasCosts.BLOB_SCHEDULE_MAX
         )
 
-    return parent_blob_gas - BLOB_TARGET_GAS_PER_BLOCK
+    return parent_blob_gas - GasCosts.BLOB_TARGET_GAS_PER_BLOCK
 
 
 def calculate_total_blob_gas(tx: Transaction) -> U64:
@@ -376,7 +482,7 @@ def calculate_total_blob_gas(tx: Transaction) -> U64:
 
     """
     if isinstance(tx, BlobTransaction):
-        return GAS_PER_BLOB * U64(len(tx.blob_versioned_hashes))
+        return GasCosts.PER_BLOB * U64(len(tx.blob_versioned_hashes))
     else:
         return U64(0)
 
@@ -397,9 +503,9 @@ def calculate_blob_gas_price(excess_blob_gas: U64) -> Uint:
 
     """
     return taylor_exponential(
-        BLOB_MIN_GASPRICE,
+        GasCosts.BLOB_MIN_GASPRICE,
         Uint(excess_blob_gas),
-        BLOB_BASE_FEE_UPDATE_FRACTION,
+        GasCosts.BLOB_BASE_FEE_UPDATE_FRACTION,
     )
 
 
diff --git a/src/ethereum/forks/monad_nine/vm/instructions/arithmetic.py b/src/ethereum/forks/monad_nine/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/monad_nine/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/monad_nine/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/monad_nine/vm/instructions/bitwise.py b/src/ethereum/forks/monad_nine/vm/instructions/bitwise.py
index cc6fa2fbb23..7674d3c720f 100644
--- a/src/ethereum/forks/monad_nine/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/monad_nine/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_LOW, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +172,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +202,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +232,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
@@ -262,7 +265,7 @@ def count_leading_zeros(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CLZ)
 
     # OPERATION
     bit_length = U256(x.bit_length())
diff --git a/src/ethereum/forks/monad_nine/vm/instructions/block.py b/src/ethereum/forks/monad_nine/vm/instructions/block.py
index a8d9d8fa769..9bac657c9bf 100644
--- a/src/ethereum/forks/monad_nine/vm/instructions/block.py
+++ b/src/ethereum/forks/monad_nine/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -40,7 +40,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -89,7 +89,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -123,7 +123,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -156,7 +156,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -189,7 +189,7 @@ def prev_randao(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PREVRANDAO)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.prev_randao))
@@ -222,7 +222,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -252,7 +252,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/monad_nine/vm/instructions/comparison.py b/src/ethereum/forks/monad_nine/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/monad_nine/vm/instructions/comparison.py
+++ b/src/ethereum/forks/monad_nine/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/monad_nine/vm/instructions/control_flow.py b/src/ethereum/forks/monad_nine/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/monad_nine/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/monad_nine/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/monad_nine/vm/instructions/environment.py b/src/ethereum/forks/monad_nine/vm/instructions/environment.py
index bc108db8a71..83d439bd751 100644
--- a/src/ethereum/forks/monad_nine/vm/instructions/environment.py
+++ b/src/ethereum/forks/monad_nine/vm/instructions/environment.py
@@ -17,20 +17,13 @@
 from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BASE,
-    GAS_BLOBHASH_OPCODE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_COPY,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
-    GAS_WARM_ACCESS,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_gas_extend_memory,
     charge_gas,
@@ -53,7 +46,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -77,14 +70,15 @@ def balance(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_addresses.add(address)
-        charge_gas(evm, GAS_COLD_ACCOUNT_ACCESS)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -107,7 +101,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -130,7 +124,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -153,7 +147,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -177,7 +171,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -202,7 +196,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -231,11 +225,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
     update_memory_high_watermark(evm, extend_memory)
 
     # OPERATION
@@ -261,7 +258,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -290,11 +287,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
     update_memory_high_watermark(evm, extend_memory)
 
     # OPERATION
@@ -320,7 +320,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -344,16 +344,16 @@ def extcodesize(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -380,24 +380,24 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
 
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost + copy_gas_cost + extend_memory.cost)
     update_memory_high_watermark(evm, extend_memory)
 
     # OPERATION
     evm.memory.data += b"\x00" * extend_memory.expand_by
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -420,7 +420,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -446,11 +446,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     update_memory_high_watermark(evm, extend_memory)
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
@@ -480,15 +485,15 @@ def extcodehash(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -515,12 +520,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
@@ -543,7 +548,7 @@ def base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BASEFEE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.base_fee_per_gas))
@@ -566,7 +571,7 @@ def blob_hash(evm: Evm) -> None:
     index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BLOBHASH_OPCODE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBHASH)
 
     # OPERATION
     if int(index) < len(evm.message.tx_env.blob_versioned_hashes):
@@ -593,7 +598,7 @@ def blob_base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBBASEFEE)
 
     # OPERATION
     blob_base_fee = calculate_blob_gas_price(
diff --git a/src/ethereum/forks/monad_nine/vm/instructions/keccak.py b/src/ethereum/forks/monad_nine/vm/instructions/keccak.py
index 14270b76d6c..fe827c605bd 100644
--- a/src/ethereum/forks/monad_nine/vm/instructions/keccak.py
+++ b/src/ethereum/forks/monad_nine/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
     update_memory_high_watermark,
@@ -47,11 +46,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
     update_memory_high_watermark(evm, extend_memory)
 
     # OPERATION
diff --git a/src/ethereum/forks/monad_nine/vm/instructions/log.py b/src/ethereum/forks/monad_nine/vm/instructions/log.py
index 58ef216f536..bc81b0e8a63 100644
--- a/src/ethereum/forks/monad_nine/vm/instructions/log.py
+++ b/src/ethereum/forks/monad_nine/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
     update_memory_high_watermark,
@@ -60,9 +59,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
     update_memory_high_watermark(evm, extend_memory)
@@ -83,8 +82,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/monad_nine/vm/instructions/memory.py b/src/ethereum/forks/monad_nine/vm/instructions/memory.py
index 2d3eafe0bdf..beef91e7493 100644
--- a/src/ethereum/forks/monad_nine/vm/instructions/memory.py
+++ b/src/ethereum/forks/monad_nine/vm/instructions/memory.py
@@ -18,9 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_COPY,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
     update_memory_high_watermark,
@@ -50,7 +48,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
     update_memory_high_watermark(evm, extend_memory)
 
     # OPERATION
@@ -82,7 +80,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
     update_memory_high_watermark(evm, extend_memory)
 
     # OPERATION
@@ -111,7 +109,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
     update_memory_high_watermark(evm, extend_memory)
 
     # OPERATION
@@ -139,7 +137,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory.data)))
@@ -165,12 +163,15 @@ def mcopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(length)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
 
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(source, length), (destination, length)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_MCOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
     update_memory_high_watermark(evm, extend_memory)
 
     # OPERATION
diff --git a/src/ethereum/forks/monad_nine/vm/instructions/stack.py b/src/ethereum/forks/monad_nine/vm/instructions/stack.py
index 0007a28acd4..ce94af6ce8e 100644
--- a/src/ethereum/forks/monad_nine/vm/instructions/stack.py
+++ b/src/ethereum/forks/monad_nine/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -63,9 +67,9 @@ def push_n(evm: Evm, num_bytes: int) -> None:
 
     # GAS
     if num_bytes == 0:
-        charge_gas(evm, GAS_BASE)
+        charge_gas(evm, GasCosts.OPCODE_PUSH0)
     else:
-        charge_gas(evm, GAS_VERY_LOW)
+        charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -95,7 +99,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -127,7 +131,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -139,70 +143,70 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push0 = partial(push_n, num_bytes=0)
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push0: Callable[[Evm], None] = partial(push_n, num_bytes=0)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/monad_nine/vm/instructions/storage.py b/src/ethereum/forks/monad_nine/vm/instructions/storage.py
index 084d58cc46c..63fda6bc3f3 100644
--- a/src/ethereum/forks/monad_nine/vm/instructions/storage.py
+++ b/src/ethereum/forks/monad_nine/vm/instructions/storage.py
@@ -13,7 +13,7 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import (
+from ...state_tracker import (
     get_storage,
     get_storage_original,
     get_transient_storage,
@@ -23,12 +23,7 @@
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -50,15 +45,14 @@ def sload(evm: Evm) -> None:
 
     # GAS
     if (evm.message.current_target, key) in evm.accessed_storage_keys:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        charge_gas(evm, GAS_COLD_SLOAD)
+        charge_gas(evm, GasCosts.COLD_STORAGE_ACCESS)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -79,54 +73,55 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     gas_cost = Uint(0)
 
     if (evm.message.current_target, key) not in evm.accessed_storage_keys:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        gas_cost += GAS_COLD_SLOAD
+        gas_cost += GasCosts.COLD_STORAGE_ACCESS
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost += GAS_STORAGE_SET
+            gas_cost += GasCosts.STORAGE_SET
         else:
-            gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_SLOAD
+            gas_cost += (
+                GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
+            )
     else:
-        gas_cost += GAS_WARM_ACCESS
+        gas_cost += GasCosts.WARM_ACCESS
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
-            # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
-            # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
-            # Storage slot being restored to its original value
             if original_value == 0:
-                # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_WARM_ACCESS)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.WARM_ACCESS
+                )
             else:
-                # Slot was originally non-empty and was UPDATED earlier
                 evm.refund_counter += int(
-                    GAS_STORAGE_UPDATE - GAS_COLD_SLOAD - GAS_WARM_ACCESS
+                    GasCosts.COLD_STORAGE_WRITE
+                    - GasCosts.COLD_STORAGE_ACCESS
+                    - GasCosts.WARM_ACCESS
                 )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
@@ -147,11 +142,11 @@ def tload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
 
     # OPERATION
     value = get_transient_storage(
-        evm.message.tx_env.transient_storage, evm.message.current_target, key
+        evm.message.tx_env.state, evm.message.current_target, key
     )
     push(evm.stack, value)
 
@@ -174,11 +169,11 @@ def tstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
     if evm.message.is_static:
         raise WriteInStaticContext
     set_transient_storage(
-        evm.message.tx_env.transient_storage,
+        evm.message.tx_env.state,
         evm.message.current_target,
         key,
         new_value,
diff --git a/src/ethereum/forks/monad_nine/vm/instructions/system.py b/src/ethereum/forks/monad_nine/vm/instructions/system.py
index c2f937d1128..7b8634c5d7e 100644
--- a/src/ethereum/forks/monad_nine/vm/instructions/system.py
+++ b/src/ethereum/forks/monad_nine/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
     get_account,
@@ -45,15 +45,7 @@
     WriteInStaticContext,
 )
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -98,7 +90,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -112,15 +104,13 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -175,7 +165,10 @@ def create(evm: Evm) -> None:
     )
     init_code_gas = init_code_cost(Uint(memory_size))
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost + init_code_gas)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CREATE_BASE + extend_memory.cost + init_code_gas,
+    )
     update_memory_high_watermark(evm, extend_memory)
 
     # OPERATION
@@ -183,7 +176,7 @@ def create(evm: Evm) -> None:
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -226,8 +219,8 @@ def create2(evm: Evm) -> None:
     init_code_gas = init_code_cost(Uint(memory_size))
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost
         + init_code_gas,
     )
@@ -272,7 +265,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
     update_memory_high_watermark(evm, extend_memory)
 
     # OPERATION
@@ -388,10 +381,10 @@ def call(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
@@ -403,10 +396,10 @@ def call(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -427,7 +420,7 @@ def call(evm: Evm) -> None:
         raise WriteInStaticContext
     evm.memory.data += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -487,10 +480,10 @@ def callcode(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -501,7 +494,7 @@ def callcode(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -516,7 +509,8 @@ def callcode(evm: Evm) -> None:
     # OPERATION
     evm.memory.data += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state,
+        evm.message.current_target,
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -559,19 +553,20 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if beneficiary not in evm.accessed_addresses:
         evm.accessed_addresses.add(beneficiary)
-        gas_cost += GAS_COLD_ACCOUNT_ACCESS
+        gas_cost += GasCosts.COLD_ACCOUNT_ACCESS
 
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state,
+            evm.message.current_target,
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -579,11 +574,11 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     move_ether(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         originator,
         beneficiary,
         originator_balance,
@@ -591,10 +586,10 @@ def selfdestruct(evm: Evm) -> None:
 
     # register account for deletion only if it was created
     # in the same transaction
-    if originator in evm.message.block_env.state.created_accounts:
+    if originator in evm.message.tx_env.state.created_accounts:
         # If beneficiary is the same as originator, then
         # the ether is burnt.
-        set_account_balance(evm.message.block_env.state, originator, U256(0))
+        set_account_balance(evm.message.tx_env.state, originator, U256(0))
         evm.accounts_to_delete.add(originator)
 
     # HALT the execution
@@ -632,10 +627,10 @@ def delegatecall(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -647,7 +642,11 @@ def delegatecall(evm: Evm) -> None:
     access_gas_cost += delegated_access_gas_cost
 
     message_call_gas = calculate_message_call_gas(
-        U256(0), gas, Uint(evm.gas_left), extend_memory.cost, access_gas_cost
+        U256(0),
+        gas,
+        Uint(evm.gas_left),
+        extend_memory.cost,
+        access_gas_cost,
     )
     charge_gas(evm, access_gas_cost + extend_memory.cost)
     update_memory_high_watermark(evm, extend_memory)
@@ -705,10 +704,10 @@ def staticcall(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
diff --git a/src/ethereum/forks/monad_nine/vm/interpreter.py b/src/ethereum/forks/monad_nine/vm/interpreter.py
index 5ed0f101bc9..9820e48d73e 100644
--- a/src/ethereum/forks/monad_nine/vm/interpreter.py
+++ b/src/ethereum/forks/monad_nine/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,19 +31,20 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     get_account,
     get_balance_original,
     get_code,
     increment_nonce,
     is_sender_authority,
+    iter_all_addresses,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
 )
 from ..vm import Message
@@ -52,10 +53,10 @@
     is_valid_delegation,
     set_delegation,
 )
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts import MONAD_PRECOMPILE_ADDRESSES
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
-from . import Evm
+from . import Evm, EvmMemory
 from .exceptions import (
     AddressCollision,
     ExceptionalHalt,
@@ -68,7 +69,6 @@
     StackDepthLimitError,
 )
 from .instructions import Ops, op_implementation
-from .memory import EvmMemory
 from .runtime import get_valid_jump_destinations
 
 STACK_DEPTH_LIMIT = Uint(1024)
@@ -83,10 +83,21 @@ def is_reserve_balance_violated(evm: Evm) -> bool:
     Check if any EOA has violated the reserve balance constraint.
 
     Returns True if a violation is detected, False otherwise.
+
+    Reads "balance at start of EVM execution" from
+    ``tx_env.tx_snapshot`` — captured at the top-level message begin
+    (after pre-execution gas/nonce deduction). Recreates pre-refactor
+    ``state._snapshots[0]`` semantics. Callable from anywhere inside
+    the tx (top-level end-of-tx check or the dippedIntoReserve
+    precompile).
     """
     message = evm.message
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     tx_env = message.tx_env
+    snapshot = tx_env.tx_snapshot
+    assert snapshot is not None, (
+        "tx_snapshot must be set on tx_env before reserve balance check"
+    )
 
     # Collect accounts_to_delete from all ancestor frames. accounts_to_delete
     # only propagates upward on success (incorporate_child_on_success), so a
@@ -100,12 +111,12 @@ def is_reserve_balance_violated(evm: Evm) -> bool:
         else:
             break
 
-    for addr in set(state._main_trie._data.keys()):
+    for addr in iter_all_addresses(tx_state):
         # Account SELFDESTRUCTed - skip explicitly.
         if addr in all_accounts_to_delete:
             continue
 
-        acc = get_account(state, addr)
+        acc = get_account(tx_state, addr)
         # For creation txs, code hasn't been set yet on the new contract
         # (set_code runs after process_message returns). Use evm.output which
         # holds the code to be deployed.
@@ -115,13 +126,13 @@ def is_reserve_balance_violated(evm: Evm) -> bool:
         ):
             code = evm.output
         else:
-            code = get_code(state, acc.code_hash)
+            code = get_code(tx_state, acc.code_hash)
 
         # NOTE: this also matches initcode ending with empty code deployments
         # via `Op.STOP` or `Op.RETURN(0, 0)`, AND check made during initcode
         # execution, but this aligns with Monad EVM implementation.
         if code == b"" or is_valid_delegation(code):
-            original_balance = get_balance_original(state, addr)
+            original_balance = get_balance_original(snapshot, addr)
             if tx_env.origin == addr:
                 # gas_fees already deducted, need to re-add if sender
                 # to match with spec.
@@ -134,7 +145,7 @@ def is_reserve_balance_violated(evm: Evm) -> bool:
 
             is_exception = (
                 message.tx_env.origin == addr
-                and not is_sender_authority(state, addr)
+                and not is_sender_authority(tx_state.parent, addr)
                 and not is_valid_delegation(code)
             )
 
@@ -147,6 +158,7 @@ def is_reserve_balance_violated(evm: Evm) -> bool:
     return False
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -186,12 +198,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -212,8 +224,8 @@ def process_message_call(message: Message) -> MessageCallOutput:
             message.disable_precompiles = True
             message.accessed_addresses.add(delegated_address)
             message.code = get_code(
-                block_env.state,
-                get_account(block_env.state, delegated_address).code_hash,
+                tx_state,
+                get_account(tx_state, delegated_address).code_hash,
             )
             message.code_address = delegated_address
             message.disable_create_opcodes = True
@@ -258,22 +270,31 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
-    transient_storage = message.tx_env.transient_storage
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
-
-    # The list of created accounts is used by `get_storage_original`.
-    # Additionally, the list is needed to respect the constraints
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts. This tracking is also needed to respect the constraints
     # added to SELFDESTRUCT by EIP-6780.
-    mark_account_created(state, message.current_target)
+    mark_account_created(tx_state, message.current_target)
 
-    increment_nonce(state, message.current_target)
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             if len(contract_code) > 0:
@@ -283,15 +304,14 @@ def process_create_message(message: Message) -> Evm:
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state, transient_storage)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state, transient_storage)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -310,11 +330,10 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
-    transient_storage = message.tx_env.transient_storage
     code = message.code
     valid_jump_destinations = get_valid_jump_destinations(code)
 
@@ -346,11 +365,20 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
+    snapshot = copy_tx_state(tx_state)
+    # Monad: at top-level message begin, also stash the snapshot on
+    # tx_env so the reserve-balance check and dippedIntoReserve
+    # precompile can read "balance at start of EVM execution" from
+    # any frame.
+    if message.depth == 0:
+        message.tx_env.tx_snapshot = snapshot
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -391,15 +419,12 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     else:
         # FIXME: index_in_block is a proxy for not being a system tx
         if message.depth == 0 and message.tx_env.index_in_block is not None:
             if is_reserve_balance_violated(evm):
-                rollback_transaction(state, transient_storage)
+                restore_tx_state(tx_state, snapshot)
                 evm.error = RevertOnReserveBalance()
                 return evm
-        commit_transaction(state, transient_storage)
     return evm
diff --git a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/alt_bn128.py
index 52ab0a12be4..862506c54c3 100644
--- a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,13 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import (
-    GAS_ALT_BN128_ADD,
-    GAS_ALT_BN128_MUL,
-    GAS_ALT_BN128_PAIRING_BASE,
-    GAS_ALT_BN128_PAIRING_PER_POINT,
-    charge_gas,
-)
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -155,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ALT_BN128_ADD)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -183,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ALT_BN128_MUL)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -213,10 +207,8 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     # GAS
     charge_gas(
         evm,
-        Uint(
-            GAS_ALT_BN128_PAIRING_PER_POINT * (len(data) // 192)
-            + GAS_ALT_BN128_PAIRING_BASE
-        ),
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
     )
 
     # OPERATION
diff --git a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/bls12_381/__init__.py b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/bls12_381/__init__.py
index c99e7573f48..7d622da39d1 100644
--- a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/bls12_381/__init__.py
+++ b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/bls12_381/__init__.py
@@ -414,7 +414,7 @@ def decode_g1_scalar_pair(
 
     """
     if len(data) != 160:
-        InvalidParameter("Input should be 160 bytes long")
+        raise InvalidParameter("Input should be 160 bytes long")
 
     point = bytes_to_g1(data[:128], subgroup_check=True)
 
@@ -614,7 +614,7 @@ def decode_g2_scalar_pair(
 
     """
     if len(data) != 288:
-        InvalidParameter("Input should be 288 bytes long")
+        raise InvalidParameter("Input should be 288 bytes long")
 
     point = bytes_to_g2(data[:256], subgroup_check=True)
     n = int.from_bytes(data[256 : 256 + 32], "big")
diff --git a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/bls12_381/bls12_381_g1.py b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
index ae8eeba0ce6..d1f63224a0c 100644
--- a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
+++ b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G1_ADD,
-    GAS_BLS_G1_MAP,
-    GAS_BLS_G1_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -60,7 +58,7 @@ def bls12_g1_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1ADD)
 
     # OPERATION
     p1 = bytes_to_g1(buffer_read(data, U256(0), U256(128)))
@@ -101,7 +99,7 @@ def bls12_g1_msm(evm: Evm) -> None:
     else:
         discount = Uint(G1_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G1_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G1MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -140,7 +138,7 @@ def bls12_map_fp_to_g1(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1MAP)
 
     # OPERATION
     fp = int.from_bytes(data, "big")
diff --git a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/bls12_381/bls12_381_g2.py b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
index 473739b78c0..2fd32313f89 100644
--- a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
+++ b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G2_ADD,
-    GAS_BLS_G2_MAP,
-    GAS_BLS_G2_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -61,7 +59,7 @@ def bls12_g2_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2ADD)
 
     # OPERATION
     p1 = bytes_to_g2(buffer_read(data, U256(0), U256(256)))
@@ -102,7 +100,7 @@ def bls12_g2_msm(evm: Evm) -> None:
     else:
         discount = Uint(G2_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G2_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G2MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -141,7 +139,7 @@ def bls12_map_fp2_to_g2(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2MAP)
 
     # OPERATION
     field_element = bytes_to_fq2(data)
diff --git a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/identity.py b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/p256verify.py b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/p256verify.py
index 106dd548a61..29c2e91e0f0 100644
--- a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/p256verify.py
+++ b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/p256verify.py
@@ -24,7 +24,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_P256VERIFY, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -41,7 +41,7 @@ def p256verify(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_P256VERIFY)
+    charge_gas(evm, GasCosts.PRECOMPILE_P256VERIFY)
 
     if len(data) != 160:
         return
diff --git a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/point_evaluation.py b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/point_evaluation.py
index ce4eed71294..d2d105ba13b 100644
--- a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/point_evaluation.py
+++ b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/point_evaluation.py
@@ -22,7 +22,7 @@
 
 from ...vm import Evm
 from ...vm.exceptions import KZGProofError
-from ...vm.gas import GAS_POINT_EVALUATION, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 FIELD_ELEMENTS_PER_BLOB = 4096
 BLS_MODULUS = 52435875175126190479447740508185965837690552500527637822603658699938581184513  # noqa: E501
@@ -51,7 +51,7 @@ def point_evaluation(evm: Evm) -> None:
     proof = Bytes48(data[144:192])
 
     # GAS
-    charge_gas(evm, GAS_POINT_EVALUATION)
+    charge_gas(evm, GasCosts.PRECOMPILE_POINT_EVALUATION)
     if kzg_commitment_to_versioned_hash(commitment) != versioned_hash:
         raise KZGProofError
 
diff --git a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/reserve_balance.py b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/reserve_balance.py
index 12fe2c1d050..d02fa81036d 100644
--- a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/reserve_balance.py
+++ b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/reserve_balance.py
@@ -15,7 +15,7 @@
 
 from ...vm import Evm
 from ...vm.exceptions import InvalidParameter, RevertInMonadPrecompile
-from ...vm.gas import GAS_WARM_ACCESS, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 # Function selector for dippedIntoReserve()
 # keccak256("dippedIntoReserve()")[:4].hex() == "3a61584e"
@@ -67,7 +67,7 @@ def reserve_balance(evm: Evm) -> None:
         raise InvalidParameter
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
 
     if len(data) < 4:
         evm.output = b"method not supported"
diff --git a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/monad_nine/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/monad_nine/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/muir_glacier/__init__.py b/src/ethereum/forks/muir_glacier/__init__.py
index a722576f950..5a53311245d 100644
--- a/src/ethereum/forks/muir_glacier/__init__.py
+++ b/src/ethereum/forks/muir_glacier/__init__.py
@@ -26,7 +26,7 @@
 [EIP-2384]: https://eips.ethereum.org/EIPS/eip-2384
 [Geth 1.9.9]: https://github.com/ethereum/go-ethereum/releases/tag/v1.9.9
 [p]: https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.8
-[Besu 1.3.7]: https://github.com/hyperledger/besu/releases/tag/1.3.7
+[Besu 1.3.7]: https://github.com/besu-eth/besu/releases/tag/1.3.7
 [n]: https://github.com/NethermindEth/nethermind/releases/tag/1.2.6
 [js]: https://github.com/ethereumjs/ethereumjs-vm/releases/tag/v4.1.2
 [a]: https://github.com/ethereum/aleth/releases/tag/v1.8.0
diff --git a/src/ethereum/forks/muir_glacier/blocks.py b/src/ethereum/forks/muir_glacier/blocks.py
index 05dd03d1c05..426cfdb5dde 100644
--- a/src/ethereum/forks/muir_glacier/blocks.py
+++ b/src/ethereum/forks/muir_glacier/blocks.py
@@ -10,18 +10,20 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.crypto.hash import Hash32
+from ethereum.state import Address, Root
 
-from .fork_types import Address, Bloom, Root
+from .fork_types import Bloom
 from .transactions import Transaction
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -60,13 +62,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.muir_glacier.state.state_root
-    [Trie]: ref:ethereum.forks.muir_glacier.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -76,8 +79,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.muir_glacier.trie.root
-    [Trie]: ref:ethereum.forks.muir_glacier.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -87,8 +90,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.muir_glacier.trie.root
-    [Trie]: ref:ethereum.forks.muir_glacier.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -157,6 +160,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -201,6 +205,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -233,6 +238,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/muir_glacier/fork.py b/src/ethereum/forks/muir_glacier/fork.py
index 22fbdd1d988..0b6ada29506 100644
--- a/src/ethereum/forks/muir_glacier/fork.py
+++ b/src/ethereum/forks/muir_glacier/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.numeric import U64, U256, Uint
@@ -27,21 +27,29 @@
     InvalidSenderError,
     NonceMismatchError,
 )
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt
 from .bloom import logs_bloom
-from .fork_types import EMPTY_CODE_HASH, Address
-from .state import (
-    State,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
     account_exists_and_is_empty,
     create_ether,
     destroy_account,
     destroy_touched_empty_accounts,
+    extract_block_diff,
     get_account,
+    incorporate_tx_into_block,
     increment_nonce,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
     Transaction,
@@ -49,19 +57,18 @@
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.message import prepare_message
+from .vm.gas import GasCosts
 from .vm.interpreter import process_message_call
 
 BLOCK_REWARD = U256(2 * 10**18)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 MINIMUM_DIFFICULTY = Uint(131072)
 MAX_OMMER_DEPTH = Uint(6)
 BOMB_DELAY_BLOCKS = 9000000
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -163,9 +170,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     validate_header(chain, block.header)
     validate_ommers(block.ommers, block.header, chain)
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -179,7 +188,12 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         ommers=block.ommers,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes,
+        block_diff.storage_changes,
+        block_diff.storage_clears,
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -197,6 +211,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block_logs_bloom != block.header.bloom:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -347,6 +362,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Address:
     """
     Check if the transaction is includable in the block.
@@ -359,6 +375,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -381,7 +399,7 @@ def check_transaction(
     if tx.gas > gas_available:
         raise GasUsedExceedsLimitError("gas used exceeds limit")
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     max_gas_fee = tx.gas * tx.gas_price
 
@@ -469,7 +487,7 @@ def apply_body(
     for i, tx in enumerate(transactions):
         process_transaction(block_env, block_output, tx, Uint(i))
 
-    pay_rewards(block_env.state, block_env.number, block_env.coinbase, ommers)
+    pay_rewards(block_env, ommers)
 
     return block_output
 
@@ -551,9 +569,7 @@ def validate_ommers(
 
 
 def pay_rewards(
-    state: State,
-    block_number: Uint,
-    coinbase: Address,
+    block_env: vm.BlockEnvironment,
     ommers: Tuple[Header, ...],
 ) -> None:
     """
@@ -572,25 +588,24 @@ def pay_rewards(
 
     Parameters
     ----------
-    state :
-        Current account state.
-    block_number :
-        Position of the block within the chain.
-    coinbase :
-        Address of account which receives block reward and transaction fees.
+    block_env :
+        The block scoped environment.
     ommers :
         List of ommers mentioned in the current block.
 
     """
+    rewards_state = TransactionState(parent=block_env.state)
     ommer_count = U256(len(ommers))
     miner_reward = BLOCK_REWARD + (ommer_count * (BLOCK_REWARD // U256(32)))
-    create_ether(state, coinbase, miner_reward)
+    create_ether(rewards_state, block_env.coinbase, miner_reward)
 
     for ommer in ommers:
         # Ommer age with respect to the current block.
-        ommer_age = U256(block_number - ommer.number)
+        ommer_age = U256(block_env.number - ommer.number)
         ommer_miner_reward = ((U256(8) - ommer_age) * BLOCK_REWARD) // U256(8)
-        create_ether(state, ommer.coinbase, ommer_miner_reward)
+        create_ether(rewards_state, ommer.coinbase, ommer_miner_reward)
+
+    incorporate_tx_into_block(rewards_state)
 
 
 def process_transaction(
@@ -623,6 +638,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(block_output.transactions_trie, rlp.encode(Uint(index)), tx)
     intrinsic_gas = validate_transaction(tx)
 
@@ -630,23 +647,23 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     gas_fee = tx.gas * tx.gas_price
     sender_balance_after_gas_fee = Uint(sender_account.balance) - gas_fee
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     tx_env = vm.TransactionEnvironment(
         origin=sender,
         gas_price=tx.gas_price,
         gas=gas,
+        state=tx_state,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
     )
@@ -666,28 +683,25 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * tx.gas_price
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
     coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
+        tx_state, block_env.coinbase
     ).balance + U256(transaction_fee)
     if coinbase_balance_after_mining_fee != 0:
         set_account_balance(
-            block_env.state,
+            tx_state,
             block_env.coinbase,
             coinbase_balance_after_mining_fee,
         )
-    elif account_exists_and_is_empty(block_env.state, block_env.coinbase):
-        destroy_account(block_env.state, block_env.coinbase)
+    elif account_exists_and_is_empty(tx_state, block_env.coinbase):
+        destroy_account(tx_state, block_env.coinbase)
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
-    destroy_touched_empty_accounts(block_env.state, tx_output.touched_accounts)
+    destroy_touched_empty_accounts(tx_state, tx_output.touched_accounts)
 
     block_output.block_gas_used += tx_gas_used_after_refund
 
@@ -706,6 +720,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
     """
@@ -713,14 +729,14 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
-    passed through as a parameter is greater than or equal to the *sum* of
-    the parent's gas and the adjustment delta then the limit for gas is too
-    high and fails this function's check. Similarly, if the limit is less
-    than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
-    check fails because the gas limit doesn't allow for a sufficient or
-    reasonable amount of gas to be used on a block.
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is passed
+    through as a parameter is greater than or equal to the *sum* of the
+    parent's gas and the adjustment delta then the limit for gas is too high
+    and fails this function's check. Similarly, if the limit is less than or
+    equal to the *difference* of the parent's gas and the adjustment delta *or*
+    the predefined ``LIMIT_MINIMUM`` then this function's check fails because
+    the gas limit doesn't allow for a sufficient or reasonable amount of gas to
+    be used on a block.
 
     Parameters
     ----------
@@ -736,12 +752,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/muir_glacier/fork_types.py b/src/ethereum/forks/muir_glacier/fork_types.py
index ae4525bbbdd..02907cd2a1a 100644
--- a/src/ethereum/forks/muir_glacier/fork_types.py
+++ b/src/ethereum/forks/muir_glacier/fork_types.py
@@ -11,41 +11,13 @@
 Types reused throughout the specification, which are specific to Ethereum.
 """
 
-from dataclasses import dataclass
-
 from ethereum_rlp import rlp
-from ethereum_types.bytes import Bytes, Bytes20, Bytes256
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
+from ethereum_types.bytes import Bytes, Bytes256
 
-Address = Bytes20
-Root = Hash32
+from ethereum.state import Account
 
 Bloom = Bytes256
 
-EMPTY_CODE_HASH = keccak256(b"")
-
-
-@slotted_freezable
-@dataclass
-class Account:
-    """
-    State associated with an address.
-    """
-
-    nonce: Uint
-    balance: U256
-    code_hash: Hash32
-
-
-EMPTY_ACCOUNT = Account(
-    nonce=Uint(0),
-    balance=U256(0),
-    code_hash=EMPTY_CODE_HASH,
-)
-
 
 def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     """
diff --git a/src/ethereum/forks/muir_glacier/state.py b/src/ethereum/forks/muir_glacier/state.py
deleted file mode 100644
index ce3e80c53fb..00000000000
--- a/src/ethereum/forks/muir_glacier/state.py
+++ /dev/null
@@ -1,672 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, Iterable, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-
-from .fork_types import EMPTY_ACCOUNT, EMPTY_CODE_HASH, Account, Address, Root
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-
-
-def begin_transaction(state: State) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-
-
-def commit_transaction(state: State) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-
-def rollback_transaction(state: State) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State``.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def account_exists_and_is_empty(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists and has zero nonce, empty code and zero
-    balance.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    exists_and_is_empty : `bool`
-        True if an account exists and has zero nonce, empty code and zero
-        balance, False otherwise.
-
-    """
-    account = get_account_optional(state, address)
-    return (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def touch_account(state: State, address: Address) -> None:
-    """
-    Initializes an account to state.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        The address of the account that needs to be initialized.
-
-    """
-    if not account_exists(state, address):
-        set_account(state, address, EMPTY_ACCOUNT)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def create_ether(state: State, address: Address, amount: U256) -> None:
-    """
-    Add newly created ether to an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to which ether is added.
-    amount:
-        The amount of ether to be added to the account of interest.
-
-    """
-
-    def increase_balance(account: Account) -> None:
-        account.balance += amount
-
-    modify_state(state, address, increase_balance)
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
-
-
-def destroy_touched_empty_accounts(
-    state: State, touched_accounts: Iterable[Address]
-) -> None:
-    """
-    Destroy all touched accounts that are empty.
-
-    Parameters
-    ----------
-    state: `State`
-        The current state.
-    touched_accounts: `Iterable[Address]`
-        All the accounts that have been touched in the current transaction.
-
-    """
-    for address in touched_accounts:
-        if account_exists_and_is_empty(state, address):
-            destroy_account(state, address)
diff --git a/src/ethereum/forks/muir_glacier/state_tracker.py b/src/ethereum/forks/muir_glacier/state_tracker.py
new file mode 100644
index 00000000000..24362ecff98
--- /dev/null
+++ b/src/ethereum/forks/muir_glacier/state_tracker.py
@@ -0,0 +1,805 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+
+    ``storage_clears`` records addresses whose storage was wiped by
+    a pre-EIP-6780 ``SELFDESTRUCT`` earlier in the block, so later
+    reads must not fall back to ``pre_state`` storage.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    storage_clears: Set[Address] = field(default_factory=set)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    storage_clears: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.storage_clears:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if address in tx_state.storage_clears:
+        return False
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    if address in tx_state.parent.storage_clears:
+        return False
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+    tx_state.storage_clears.add(address)
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        storage_clears=set(tx_state.storage_clears),
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.storage_clears = snapshot.storage_clears
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address in tx_state.storage_clears:
+        block.storage_clears.add(address)
+        block.storage_writes.pop(address, None)
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.storage_clears.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+        storage_clears=block_state.storage_clears,
+    )
+
+
+def destroy_touched_empty_accounts(
+    tx_state: TransactionState, touched_accounts: Set[Address]
+) -> None:
+    """
+    Destroy all touched accounts that are empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    touched_accounts :
+        All the accounts that have been touched in the current transaction.
+
+    """
+    for address in touched_accounts:
+        if account_exists_and_is_empty(tx_state, address):
+            destroy_account(tx_state, address)
+
+
+def touch_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Initialize an account to state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be initialized.
+
+    """
+    if not account_exists(tx_state, address):
+        set_account(tx_state, address, EMPTY_ACCOUNT)
diff --git a/src/ethereum/forks/muir_glacier/transactions.py b/src/ethereum/forks/muir_glacier/transactions.py
index a831530b311..8272ebea080 100644
--- a/src/ethereum/forks/muir_glacier/transactions.py
+++ b/src/ethereum/forks/muir_glacier/transactions.py
@@ -5,6 +5,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0
@@ -18,31 +19,10 @@
     InvalidSignatureError,
     NonceOverflowError,
 )
-
-from .fork_types import Address
-
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_PER_NON_ZERO = Uint(16)
-"""
-Gas cost per non-zero byte in the transaction data.
-"""
-
-GAS_TX_DATA_PER_ZERO = Uint(4)
-"""
-Gas cost per zero byte in the transaction data.
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
+from ethereum.state import Address
 
 
+@final
 @slotted_freezable
 @dataclass
 class Transaction:
@@ -143,26 +123,28 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
 
     This function takes a transaction as a parameter and returns the intrinsic
     gas cost of the transaction.
     """
+    from .vm.gas import GasCosts
+
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
     data_cost = (
-        num_zeros * GAS_TX_DATA_PER_ZERO
-        + num_non_zeros * GAS_TX_DATA_PER_NON_ZERO
+        num_zeros * GasCosts.TX_DATA_PER_ZERO
+        + num_non_zeros * GasCosts.TX_DATA_PER_NON_ZERO
     )
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE
+        create_cost = GasCosts.TX_CREATE
     else:
         create_cost = Uint(0)
 
-    return GAS_TX_BASE + data_cost + create_cost
+    return GasCosts.TX_BASE + data_cost + create_cost
 
 
 def recover_sender(chain_id: U64, tx: Transaction) -> Address:
diff --git a/src/ethereum/forks/muir_glacier/trie.py b/src/ethereum/forks/muir_glacier/trie.py
deleted file mode 100644
index 70e0ba33c2a..00000000000
--- a/src/ethereum/forks/muir_glacier/trie.py
+++ /dev/null
@@ -1,498 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    assert_type,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.istanbul import trie as previous_trie
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt
-from .fork_types import Account, Address, Root, encode_account
-from .transactions import Transaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = Account | Bytes | Transaction | Receipt | Uint | U256 | None
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[Transaction],
-    Optional[Receipt],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `rlp.RLP`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (Transaction, Receipt, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/muir_glacier/utils/hexadecimal.py b/src/ethereum/forks/muir_glacier/utils/hexadecimal.py
index b3f17b7ef73..6b16780334f 100644
--- a/src/ethereum/forks/muir_glacier/utils/hexadecimal.py
+++ b/src/ethereum/forks/muir_glacier/utils/hexadecimal.py
@@ -14,11 +14,9 @@
 
 from ethereum_types.bytes import Bytes
 
-from ethereum.state import Address
+from ethereum.state import Address, Root
 from ethereum.utils.hexadecimal import remove_hex_prefix
 
-from ..fork_types import Root
-
 
 def hex_to_root(hex_string: str) -> Root:
     """
diff --git a/src/ethereum/forks/muir_glacier/utils/message.py b/src/ethereum/forks/muir_glacier/utils/message.py
index fd119dfbb2c..425f6c5bea1 100644
--- a/src/ethereum/forks/muir_glacier/utils/message.py
+++ b/src/ethereum/forks/muir_glacier/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from .address import compute_contract_address
@@ -49,7 +49,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -57,8 +57,8 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        account = get_account(block_env.state, tx.to)
-        code = get_code(block_env.state, account.code_hash)
+        account = get_account(tx_env.state, tx.to)
+        code = get_code(tx_env.state, account.code_hash)
 
         code_address = tx.to
     else:
diff --git a/src/ethereum/forks/muir_glacier/vm/__init__.py b/src/ethereum/forks/muir_glacier/vm/__init__.py
index a780c363cf8..4a491e87e59 100644
--- a/src/ethereum/forks/muir_glacier/vm/__init__.py
+++ b/src/ethereum/forks/muir_glacier/vm/__init__.py
@@ -13,24 +13,29 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt
-from ..state import State, account_exists_and_is_empty
+from ..state_tracker import (
+    BlockState,
+    TransactionState,
+    account_exists_and_is_empty,
+)
 from ..transactions import Transaction
-from ..trie import Trie
 from .precompiled_contracts import RIPEMD160_ADDRESS
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +43,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -47,6 +52,7 @@ class BlockEnvironment:
     difficulty: Uint
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -78,19 +84,22 @@ class BlockOutput:
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
     gas_price: Uint
     gas: Uint
+    state: TransactionState
     index_in_block: Uint
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -113,6 +122,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
@@ -152,7 +162,7 @@ def incorporate_child_on_success(evm: Evm, child_evm: Evm) -> None:
     evm.accounts_to_delete.update(child_evm.accounts_to_delete)
     evm.touched_accounts.update(child_evm.touched_accounts)
     if account_exists_and_is_empty(
-        evm.message.block_env.state, child_evm.message.current_target
+        evm.message.tx_env.state, child_evm.message.current_target
     ):
         evm.touched_accounts.add(child_evm.message.current_target)
 
@@ -180,7 +190,7 @@ def incorporate_child_on_error(evm: Evm, child_evm: Evm) -> None:
         evm.touched_accounts.add(RIPEMD160_ADDRESS)
     if child_evm.message.current_target == RIPEMD160_ADDRESS:
         if account_exists_and_is_empty(
-            evm.message.block_env.state, child_evm.message.current_target
+            evm.message.tx_env.state, child_evm.message.current_target
         ):
             evm.touched_accounts.add(RIPEMD160_ADDRESS)
     evm.gas_left += child_evm.gas_left
diff --git a/src/ethereum/forks/muir_glacier/vm/gas.py b/src/ethereum/forks/muir_glacier/vm/gas.py
index eb56b502d0a..f122c967dc6 100644
--- a/src/ethereum/forks/muir_glacier/vm/gas.py
+++ b/src/ethereum/forks/muir_glacier/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32
@@ -22,51 +22,146 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_SLOAD = Uint(800)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 15000
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_EXTERNAL = Uint(700)
-GAS_BALANCE = Uint(700)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_CALL = Uint(700)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-REFUND_SELF_DESTRUCT = 24000
-GAS_ECRECOVER = Uint(3000)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_CODE_HASH = Uint(700)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    SLOAD: Final[Uint] = Uint(800)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 15000
+    REFUND_SELF_DESTRUCT: Final[int] = 24000
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_PER_ZERO: Final[Uint] = Uint(4)
+    TX_DATA_PER_NON_ZERO: Final[Uint] = Uint(16)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_EXTCODEHASH: Final[Uint] = Uint(700)
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_DIFFICULTY: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+    OPCODE_EXTERNAL_BASE: Final[Uint] = Uint(700)
+    OPCODE_BALANCE: Final[Uint] = Uint(700)
+    OPCODE_CALL_BASE: Final[Uint] = Uint(700)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -82,11 +177,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -138,7 +234,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -168,7 +264,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -193,7 +289,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/arithmetic.py b/src/ethereum/forks/muir_glacier/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/muir_glacier/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/muir_glacier/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/bitwise.py b/src/ethereum/forks/muir_glacier/vm/instructions/bitwise.py
index 41dabe8185b..1de6c615931 100644
--- a/src/ethereum/forks/muir_glacier/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/muir_glacier/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +172,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +202,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +232,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/block.py b/src/ethereum/forks/muir_glacier/vm/instructions/block.py
index bbf01739ff2..e3400f9461a 100644
--- a/src/ethereum/forks/muir_glacier/vm/instructions/block.py
+++ b/src/ethereum/forks/muir_glacier/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -33,7 +33,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -75,7 +75,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -102,7 +102,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -128,7 +128,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -154,7 +154,7 @@ def difficulty(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_DIFFICULTY)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.difficulty))
@@ -180,7 +180,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -203,7 +203,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/comparison.py b/src/ethereum/forks/muir_glacier/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/muir_glacier/vm/instructions/comparison.py
+++ b/src/ethereum/forks/muir_glacier/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/control_flow.py b/src/ethereum/forks/muir_glacier/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/muir_glacier/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/muir_glacier/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/environment.py b/src/ethereum/forks/muir_glacier/vm/instructions/environment.py
index f0cc93e67d8..87860dbd693 100644
--- a/src/ethereum/forks/muir_glacier/vm/instructions/environment.py
+++ b/src/ethereum/forks/muir_glacier/vm/instructions/environment.py
@@ -13,23 +13,16 @@
 
 from ethereum_types.numeric import U256, Uint, ulen
 
+from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...fork_types import EMPTY_ACCOUNT
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BALANCE,
-    GAS_BASE,
-    GAS_CODE_HASH,
-    GAS_COPY,
-    GAS_EXTERNAL,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -50,7 +43,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -73,11 +66,12 @@ def balance(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BALANCE)
+    charge_gas(evm, GasCosts.OPCODE_BALANCE)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -100,7 +94,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -123,7 +117,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -146,7 +140,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -170,7 +164,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -195,7 +189,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -224,11 +218,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -253,7 +250,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -282,11 +279,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -311,7 +311,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -334,11 +334,12 @@ def extcodesize(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_EXTERNAL)
+    charge_gas(evm, GasCosts.OPCODE_EXTERNAL_BASE)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -365,16 +366,20 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_EXTERNAL + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_EXTERNAL_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -397,7 +402,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -423,11 +428,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -455,10 +465,10 @@ def extcodehash(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_CODE_HASH)
+    charge_gas(evm, GasCosts.OPCODE_EXTCODEHASH)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -485,12 +495,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/keccak.py b/src/ethereum/forks/muir_glacier/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/muir_glacier/vm/instructions/keccak.py
+++ b/src/ethereum/forks/muir_glacier/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/log.py b/src/ethereum/forks/muir_glacier/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/muir_glacier/vm/instructions/log.py
+++ b/src/ethereum/forks/muir_glacier/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/memory.py b/src/ethereum/forks/muir_glacier/vm/instructions/memory.py
index 3a242ba2f7a..93861811559 100644
--- a/src/ethereum/forks/muir_glacier/vm/instructions/memory.py
+++ b/src/ethereum/forks/muir_glacier/vm/instructions/memory.py
@@ -16,8 +16,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,7 +45,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -77,7 +76,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -105,7 +104,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -132,7 +131,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/stack.py b/src/ethereum/forks/muir_glacier/vm/instructions/stack.py
index 0fc0d3fe4b5..901bff4ed3b 100644
--- a/src/ethereum/forks/muir_glacier/vm/instructions/stack.py
+++ b/src/ethereum/forks/muir_glacier/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -62,7 +66,7 @@ def push_n(evm: Evm, num_bytes: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -92,7 +96,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -124,7 +128,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -136,69 +140,69 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/storage.py b/src/ethereum/forks/muir_glacier/vm/instructions/storage.py
index 9150b8cb578..07ba90a057c 100644
--- a/src/ethereum/forks/muir_glacier/vm/instructions/storage.py
+++ b/src/ethereum/forks/muir_glacier/vm/instructions/storage.py
@@ -13,15 +13,11 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import get_storage, get_storage_original, set_storage
+from ...state_tracker import get_storage, get_storage_original, set_storage
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -42,12 +38,11 @@ def sload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_SLOAD)
+    charge_gas(evm, GasCosts.SLOAD)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -68,46 +63,50 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost = GAS_STORAGE_SET
+            gas_cost = GasCosts.STORAGE_SET
         else:
-            gas_cost = GAS_STORAGE_UPDATE
+            gas_cost = GasCosts.COLD_STORAGE_WRITE
     else:
-        gas_cost = GAS_SLOAD
+        gas_cost = GasCosts.SLOAD
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
             # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
             # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
             # Storage slot being restored to its original value
             if original_value == 0:
                 # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_SLOAD)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.SLOAD
+                )
             else:
                 # Slot was originally non-empty and was UPDATED earlier
-                evm.refund_counter += int(GAS_STORAGE_UPDATE - GAS_SLOAD)
+                evm.refund_counter += int(
+                    GasCosts.COLD_STORAGE_WRITE - GasCosts.SLOAD
+                )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/system.py b/src/ethereum/forks/muir_glacier/vm/instructions/system.py
index a0b00f24d1e..8002d48698a 100644
--- a/src/ethereum/forks/muir_glacier/vm/instructions/system.py
+++ b/src/ethereum/forks/muir_glacier/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
@@ -40,15 +40,7 @@
 )
 from ..exceptions import Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL,
-    GAS_CALL_VALUE,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_ZERO,
-    REFUND_SELF_DESTRUCT,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -83,7 +75,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -95,11 +87,9 @@ def generic_create(
         return
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
@@ -107,7 +97,7 @@ def generic_create(
         evm.memory, memory_start_position, memory_size
     )
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -157,14 +147,14 @@ def create(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -202,8 +192,8 @@ def create2(evm: Evm) -> None:
     call_data_words = ceil32(Uint(memory_size)) // Uint(32)
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost,
     )
 
@@ -242,7 +232,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -285,8 +275,8 @@ def generic_call(
     call_data = memory_read_bytes(
         evm.memory, memory_input_start_position, memory_input_size
     )
-    code_account = get_account(evm.message.block_env.state, code_address)
-    code = get_code(evm.message.block_env.state, code_account.code_hash)
+    code_account = get_account(evm.message.tx_env.state, code_address)
+    code = get_code(evm.message.tx_env.state, code_account.code_hash)
     child_message = Message(
         block_env=evm.message.block_env,
         tx_env=evm.message.tx_env,
@@ -352,23 +342,23 @@ def call(evm: Evm) -> None:
 
     code_address = to
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
         Uint(evm.gas_left),
         extend_memory.cost,
-        GAS_CALL + create_gas_cost + transfer_gas_cost,
+        GasCosts.OPCODE_CALL_BASE + create_gas_cost + transfer_gas_cost,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
     if evm.message.is_static and value != U256(0):
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -423,20 +413,20 @@ def callcode(evm: Evm) -> None:
             (memory_output_start_position, memory_output_size),
         ],
     )
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
         Uint(evm.gas_left),
         extend_memory.cost,
-        GAS_CALL + transfer_gas_cost,
+        GasCosts.OPCODE_CALL_BASE + transfer_gas_cost,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -476,15 +466,15 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     originator = evm.message.current_target
 
@@ -495,7 +485,7 @@ def selfdestruct(evm: Evm) -> None:
         parent_evm = parent_evm.message.parent_evm
 
     if originator not in refunded_accounts:
-        evm.refund_counter += REFUND_SELF_DESTRUCT
+        evm.refund_counter += GasCosts.REFUND_SELF_DESTRUCT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -503,28 +493,28 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     beneficiary_balance = get_account(
-        evm.message.block_env.state, beneficiary
+        evm.message.tx_env.state, beneficiary
     ).balance
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     # First Transfer to beneficiary
     set_account_balance(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         beneficiary,
         beneficiary_balance + originator_balance,
     )
     # Next, Zero the balance of the address being deleted (must come after
     # sending to beneficiary in case the contract named itself as the
     # beneficiary).
-    set_account_balance(evm.message.block_env.state, originator, U256(0))
+    set_account_balance(evm.message.tx_env.state, originator, U256(0))
 
     # register account for deletion
     evm.accounts_to_delete.add(originator)
 
     # mark beneficiary as touched
-    if account_exists_and_is_empty(evm.message.block_env.state, beneficiary):
+    if account_exists_and_is_empty(evm.message.tx_env.state, beneficiary):
         evm.touched_accounts.add(beneficiary)
 
     # HALT the execution
@@ -561,7 +551,11 @@ def delegatecall(evm: Evm) -> None:
         ],
     )
     message_call_gas = calculate_message_call_gas(
-        U256(0), gas, Uint(evm.gas_left), extend_memory.cost, GAS_CALL
+        U256(0),
+        gas,
+        Uint(evm.gas_left),
+        extend_memory.cost,
+        GasCosts.OPCODE_CALL_BASE,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
@@ -620,7 +614,7 @@ def staticcall(evm: Evm) -> None:
         gas,
         Uint(evm.gas_left),
         extend_memory.cost,
-        GAS_CALL,
+        GasCosts.OPCODE_CALL_BASE,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
diff --git a/src/ethereum/forks/muir_glacier/vm/interpreter.py b/src/ethereum/forks/muir_glacier/vm/interpreter.py
index e4f53153ce9..12aef672173 100644
--- a/src/ethereum/forks/muir_glacier/vm/interpreter.py
+++ b/src/ethereum/forks/muir_glacier/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,21 +31,21 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     increment_nonce,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
     touch_account,
 )
 from ..vm import Message
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -63,6 +63,7 @@
 MAX_CODE_SIZE = 0x6000
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -102,12 +103,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -121,9 +122,7 @@ def process_message_call(message: Message) -> MessageCallOutput:
             evm = process_create_message(message)
     else:
         evm = process_message(message)
-        if account_exists_and_is_empty(
-            block_env.state, Address(message.target)
-        ):
+        if account_exists_and_is_empty(tx_state, Address(message.target)):
             evm.touched_accounts.add(Address(message.target))
 
     if evm.error:
@@ -166,34 +165,44 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state)
-
-    # The list of created accounts is used by `get_storage_original`.
-    mark_account_created(state, message.current_target)
-
-    increment_nonce(state, message.current_target)
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts.
+    mark_account_created(tx_state, message.current_target)
+
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             charge_gas(evm, contract_code_gas)
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -212,7 +221,7 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
@@ -237,13 +246,16 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
 
-    touch_account(state, message.current_target)
+    touch_account(tx_state, message.current_target)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -274,9 +286,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state)
-    else:
-        commit_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/alt_bn128.py
index 214725d8da0..862506c54c3 100644
--- a/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(150))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(6000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(34000 * (len(data) // 192) + 45000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/identity.py b/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/muir_glacier/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/osaka/blocks.py b/src/ethereum/forks/osaka/blocks.py
index c0d1de37f12..f1f174f892a 100644
--- a/src/ethereum/forks/osaka/blocks.py
+++ b/src/ethereum/forks/osaka/blocks.py
@@ -10,7 +10,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
@@ -31,6 +31,7 @@
 )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Withdrawal:
@@ -64,6 +65,7 @@ class Withdrawal:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -107,13 +109,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.osaka.state.state_root
-    [Trie]: ref:ethereum.forks.osaka.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -123,8 +126,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.osaka.trie.root
-    [Trie]: ref:ethereum.forks.osaka.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -134,8 +137,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.osaka.trie.root
-    [Trie]: ref:ethereum.forks.osaka.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -246,6 +249,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -299,6 +303,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -331,6 +336,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/osaka/fork.py b/src/ethereum/forks/osaka/fork.py
index 3dfd35f98a8..fcdff89d045 100644
--- a/src/ethereum/forks/osaka/fork.py
+++ b/src/ethereum/forks/osaka/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Tuple
+from typing import Final, List, Optional, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
@@ -27,7 +27,13 @@
     InvalidSenderError,
     NonceMismatchError,
 )
-from ethereum.state import EMPTY_CODE_HASH, Account, Address
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt, Withdrawal, encode_receipt
@@ -51,19 +57,19 @@
     compute_requests_hash,
     parse_deposit_requests,
 )
-from .state import (
-    State,
-    TransientStorage,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
+    create_ether,
     destroy_account,
+    extract_block_diff,
     get_account,
     get_code,
+    incorporate_tx_into_block,
     increment_nonce,
-    modify_state,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
-    AccessListTransaction,
     BlobTransaction,
     FeeMarketTransaction,
     LegacyTransaction,
@@ -72,17 +78,16 @@
     decode_transaction,
     encode_transaction,
     get_transaction_hash,
+    has_access_list,
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.hexadecimal import hex_to_address
 from .utils.message import prepare_message
 from .vm import Message
 from .vm.eoa_delegation import is_valid_delegation
 from .vm.gas import (
-    BLOB_SCHEDULE_MAX,
-    GAS_PER_BLOB,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_data_fee,
     calculate_excess_blob_gas,
@@ -92,15 +97,15 @@
 
 BASE_FEE_MAX_CHANGE_DENOMINATOR = Uint(8)
 ELASTICITY_MULTIPLIER = Uint(2)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 SYSTEM_ADDRESS = hex_to_address("0xfffffffffffffffffffffffffffffffffffffffe")
 BEACON_ROOTS_ADDRESS = hex_to_address(
     "0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02"
 )
 SYSTEM_TRANSACTION_GAS = Uint(30000000)
-MAX_BLOB_GAS_PER_BLOCK = BLOB_SCHEDULE_MAX * GAS_PER_BLOB
+MAX_BLOB_GAS_PER_BLOCK: Final[U64] = (
+    GasCosts.BLOB_SCHEDULE_MAX * GasCosts.PER_BLOB
+)
 VERSIONED_HASH_VERSION_KZG = b"\x01"
 
 WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS = hex_to_address(
@@ -118,6 +123,7 @@
 BLOB_COUNT_LIMIT = 6
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -223,9 +229,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block.ommers != ():
         raise InvalidBlock
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -242,7 +250,10 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         withdrawals=block.withdrawals,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes, block_diff.storage_changes
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -268,6 +279,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if requests_hash != block.header.requests_hash:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -399,6 +411,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Tuple[Address, Uint, Tuple[VersionedHash, ...], U64]:
     """
     Check if the transaction is includable in the block.
@@ -411,6 +424,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -469,7 +484,7 @@ def check_transaction(
         raise BlobGasLimitExceededError("blob gas limit exceeded")
 
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     if isinstance(
         tx, (FeeMarketTransaction, BlobTransaction, SetCodeTransaction)
@@ -537,7 +552,7 @@ def check_transaction(
 
     if Uint(sender_account.balance) < max_gas_fee + Uint(tx.value):
         raise InsufficientBalanceError("insufficient sender balance")
-    sender_code = get_code(block_env.state, sender_account.code_hash)
+    sender_code = get_code(tx_state, sender_account.code_hash)
     if sender_account.code_hash != EMPTY_CODE_HASH and not is_valid_delegation(
         sender_code
     ):
@@ -588,74 +603,6 @@ def make_receipt(
     return encode_receipt(tx, receipt)
 
 
-def process_system_transaction(
-    block_env: vm.BlockEnvironment,
-    target_address: Address,
-    system_contract_code: Bytes,
-    data: Bytes,
-) -> MessageCallOutput:
-    """
-    Process a system transaction with the given code.
-
-    Prefer calling `process_checked_system_transaction` or
-    `process_unchecked_system_transaction` depending on whether missing code or
-    an execution error should cause the block to be rejected.
-
-    Parameters
-    ----------
-    block_env :
-        The block scoped environment.
-    target_address :
-        Address of the contract to call.
-    system_contract_code :
-        Code of the contract to call.
-    data :
-        Data to pass to the contract.
-
-    Returns
-    -------
-    system_tx_output : `MessageCallOutput`
-        Output of processing the system transaction.
-
-    """
-    tx_env = vm.TransactionEnvironment(
-        origin=SYSTEM_ADDRESS,
-        gas_price=block_env.base_fee_per_gas,
-        gas=SYSTEM_TRANSACTION_GAS,
-        access_list_addresses=set(),
-        access_list_storage_keys=set(),
-        transient_storage=TransientStorage(),
-        blob_versioned_hashes=(),
-        authorizations=(),
-        index_in_block=None,
-        tx_hash=None,
-    )
-
-    system_tx_message = Message(
-        block_env=block_env,
-        tx_env=tx_env,
-        caller=SYSTEM_ADDRESS,
-        target=target_address,
-        gas=SYSTEM_TRANSACTION_GAS,
-        value=U256(0),
-        data=data,
-        code=system_contract_code,
-        depth=Uint(0),
-        current_target=target_address,
-        code_address=target_address,
-        should_transfer_value=False,
-        is_static=False,
-        accessed_addresses=set(),
-        accessed_storage_keys=set(),
-        disable_precompiles=False,
-        parent_evm=None,
-    )
-
-    system_tx_output = process_message_call(system_tx_message)
-
-    return system_tx_output
-
-
 def process_checked_system_transaction(
     block_env: vm.BlockEnvironment,
     target_address: Address,
@@ -680,9 +627,18 @@ def process_checked_system_transaction(
         Output of processing the system transaction.
 
     """
+    # Pre-check that the system contract has code. We use a throwaway
+    # TransactionState here that is *never* propagated back to BlockState
+    # (no incorporate_tx_into_block call); the same get_account / get_code
+    # lookups are performed and properly tracked by
+    # process_unchecked_system_transaction below, which this function
+    # always calls. Reading via a TransactionState (rather than directly
+    # against pre_state) lets us see system contracts deployed earlier in
+    # the same block — see EIP-7002 and EIP-7251 for this edge case.
+    untracked_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        untracked_state,
+        get_account(untracked_state, target_address).code_hash,
     )
 
     if len(system_contract_code) == 0:
@@ -691,10 +647,9 @@ def process_checked_system_transaction(
             "contain code"
         )
 
-    system_tx_output = process_system_transaction(
+    system_tx_output = process_unchecked_system_transaction(
         block_env,
         target_address,
-        system_contract_code,
         data,
     )
 
@@ -713,8 +668,8 @@ def process_unchecked_system_transaction(
     data: Bytes,
 ) -> MessageCallOutput:
     """
-    Process a system transaction without checking if the contract contains code
-    or if the transaction fails.
+    Process a system transaction without checking if the contract contains
+    code or if the transaction fails.
 
     Parameters
     ----------
@@ -731,17 +686,51 @@ def process_unchecked_system_transaction(
         Output of processing the system transaction.
 
     """
+    system_tx_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        system_tx_state,
+        get_account(system_tx_state, target_address).code_hash,
     )
-    return process_system_transaction(
-        block_env,
-        target_address,
-        system_contract_code,
-        data,
+
+    tx_env = vm.TransactionEnvironment(
+        origin=SYSTEM_ADDRESS,
+        gas_price=block_env.base_fee_per_gas,
+        gas=SYSTEM_TRANSACTION_GAS,
+        access_list_addresses=set(),
+        access_list_storage_keys=set(),
+        state=system_tx_state,
+        blob_versioned_hashes=(),
+        authorizations=(),
+        index_in_block=None,
+        tx_hash=None,
+    )
+
+    system_tx_message = Message(
+        block_env=block_env,
+        tx_env=tx_env,
+        caller=SYSTEM_ADDRESS,
+        target=target_address,
+        gas=SYSTEM_TRANSACTION_GAS,
+        value=U256(0),
+        data=data,
+        code=system_contract_code,
+        depth=Uint(0),
+        current_target=target_address,
+        code_address=target_address,
+        should_transfer_value=False,
+        is_static=False,
+        accessed_addresses=set(),
+        accessed_storage_keys=set(),
+        disable_precompiles=False,
+        parent_evm=None,
     )
 
+    system_tx_output = process_message_call(system_tx_message)
+
+    incorporate_tx_into_block(system_tx_state)
+
+    return system_tx_output
+
 
 def apply_body(
     block_env: vm.BlockEnvironment,
@@ -875,6 +864,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(
         block_output.transactions_trie,
         rlp.encode(index),
@@ -892,9 +883,10 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     if isinstance(tx, BlobTransaction):
         blob_gas_fee = calculate_data_fee(block_env.excess_blob_gas, tx)
@@ -904,27 +896,17 @@ def process_transaction(
     effective_gas_fee = tx.gas * effective_gas_price
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     sender_balance_after_gas_fee = (
         Uint(sender_account.balance) - effective_gas_fee - blob_gas_fee
     )
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     access_list_addresses = set()
     access_list_storage_keys = set()
     access_list_addresses.add(block_env.coinbase)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
             access_list_addresses.add(access.account)
             for slot in access.slots:
@@ -940,7 +922,7 @@ def process_transaction(
         gas=gas,
         access_list_addresses=access_list_addresses,
         access_list_storage_keys=access_list_storage_keys,
-        transient_storage=TransientStorage(),
+        state=tx_state,
         blob_versioned_hashes=blob_versioned_hashes,
         authorizations=authorizations,
         index_in_block=index,
@@ -973,23 +955,13 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * priority_fee_per_gas
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
-    coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
-    ).balance + U256(transaction_fee)
-    set_account_balance(
-        block_env.state,
-        block_env.coinbase,
-        coinbase_balance_after_mining_fee,
-    )
+    create_ether(tx_state, block_env.coinbase, U256(transaction_fee))
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
     block_output.block_gas_used += tx_gas_used_after_refund
     block_output.blob_gas_used += tx_blob_gas_used
@@ -1009,6 +981,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def process_withdrawals(
     block_env: vm.BlockEnvironment,
@@ -1018,9 +992,7 @@ def process_withdrawals(
     """
     Increase the balance of the withdrawing account.
     """
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += wd.amount * U256(10**9)
+    wd_state = TransactionState(parent=block_env.state)
 
     for i, wd in enumerate(withdrawals):
         trie_set(
@@ -1029,7 +1001,9 @@ def increase_recipient_balance(recipient: Account) -> None:
             rlp.encode(wd),
         )
 
-        modify_state(block_env.state, wd.address, increase_recipient_balance)
+        create_ether(wd_state, wd.address, wd.amount * U256(10**9))
+
+    incorporate_tx_into_block(wd_state)
 
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
@@ -1038,14 +1012,14 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
-    passed through as a parameter is greater than or equal to the *sum* of
-    the parent's gas and the adjustment delta then the limit for gas is too
-    high and fails this function's check. Similarly, if the limit is less
-    than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
-    check fails because the gas limit doesn't allow for a sufficient or
-    reasonable amount of gas to be used on a block.
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is passed
+    through as a parameter is greater than or equal to the *sum* of the
+    parent's gas and the adjustment delta then the limit for gas is too high
+    and fails this function's check. Similarly, if the limit is less than or
+    equal to the *difference* of the parent's gas and the adjustment delta *or*
+    the predefined ``LIMIT_MINIMUM`` then this function's check fails because
+    the gas limit doesn't allow for a sufficient or reasonable amount of gas to
+    be used on a block.
 
     Parameters
     ----------
@@ -1061,12 +1035,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/osaka/fork_types.py b/src/ethereum/forks/osaka/fork_types.py
index c598e9876bf..4bec34810db 100644
--- a/src/ethereum/forks/osaka/fork_types.py
+++ b/src/ethereum/forks/osaka/fork_types.py
@@ -12,6 +12,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes256
@@ -43,6 +44,7 @@ def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Authorization:
diff --git a/src/ethereum/forks/osaka/requests.py b/src/ethereum/forks/osaka/requests.py
index 542c9264d37..ad50fc25331 100644
--- a/src/ethereum/forks/osaka/requests.py
+++ b/src/ethereum/forks/osaka/requests.py
@@ -1,11 +1,31 @@
 """
-Requests were introduced in EIP-7685 as a general purpose framework for
-storing contract-triggered requests. It extends the execution header and
-body with a single field each to store the request information.
-This inherently exposes the requests to the consensus layer, which can
-then process each one.
-
+[EIP-7685] generalizes how the execution layer communicates validator actions
+to the consensus layer. Rather than adding a dedicated header field for each
+new action type (as [EIP-4895] did for withdrawals), the execution header
+commits to a single [`requests_hash`][rh] that aggregates an ordered list of
+typed requests.
+
+Each request is a type byte (see [`DEPOSIT_REQUEST_TYPE`][dt],
+[`WITHDRAWAL_REQUEST_TYPE`][wt], and [`CONSOLIDATION_REQUEST_TYPE`][ct])
+followed by an opaque payload. Deposit requests are discovered by scanning
+transaction receipts for logs emitted by the deposit contract; withdrawal
+and consolidation requests are produced by the corresponding system
+contracts during block processing.
+
+See [`parse_deposit_requests`][pd] for how deposit logs become request data,
+[`compute_requests_hash`][crh] for how the list is hashed for inclusion in the
+header, and [`process_general_purpose_requests`][pgpr] for how the requests are
+processed.
+
+[EIP-4895]: https://eips.ethereum.org/EIPS/eip-4895
 [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+[rh]: ref:ethereum.forks.osaka.blocks.Header.requests_hash
+[dt]: ref:ethereum.forks.osaka.requests.DEPOSIT_REQUEST_TYPE
+[wt]: ref:ethereum.forks.osaka.requests.WITHDRAWAL_REQUEST_TYPE
+[ct]: ref:ethereum.forks.osaka.requests.CONSOLIDATION_REQUEST_TYPE
+[pd]: ref:ethereum.forks.osaka.requests.parse_deposit_requests
+[crh]: ref:ethereum.forks.osaka.requests.compute_requests_hash
+[pgpr]: ref:ethereum.forks.osaka.fork.process_general_purpose_requests
 """
 
 from hashlib import sha256
@@ -15,48 +35,133 @@
 from ethereum_types.numeric import Uint, ulen
 
 from ethereum.exceptions import InvalidBlock
+from ethereum.merkle_patricia_trie import trie_get
 from ethereum.utils.hexadecimal import hex_to_bytes32
 
 from .blocks import decode_receipt
-from .trie import trie_get
 from .utils.hexadecimal import hex_to_address
 from .vm import BlockOutput
 
 DEPOSIT_CONTRACT_ADDRESS = hex_to_address(
     "0x00000000219ab540356cbb839cbe05303d7705fa"
 )
+"""
+Mainnet address of the beacon chain deposit contract. Scanning block
+receipts for logs emitted by this address is how the execution layer
+discovers validator deposits, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 DEPOSIT_EVENT_SIGNATURE_HASH = hex_to_bytes32(
     "0x649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c5"
 )
+"""
+First [log topic] of the deposit contract's `DepositEvent`, equal to the
+keccak256 of its Solidity event signature. Logs whose first topic does not
+match this are ignored when collecting deposit requests.
+
+[log topic]: https://docs.soliditylang.org/en/latest/abi-spec.html#events
+"""
+
 DEPOSIT_REQUEST_TYPE = b"\x00"
+"""
+Request type byte identifying a deposit request, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 WITHDRAWAL_REQUEST_TYPE = b"\x01"
+"""
+Request type byte identifying an execution-triggered withdrawal request,
+per [EIP-7002].
+
+[EIP-7002]: https://eips.ethereum.org/EIPS/eip-7002
+"""
+
 CONSOLIDATION_REQUEST_TYPE = b"\x02"
+"""
+Request type byte identifying a consolidation request, per [EIP-7251].
+
+[EIP-7251]: https://eips.ethereum.org/EIPS/eip-7251
+"""
 
 
 DEPOSIT_EVENT_LENGTH = Uint(576)
+"""
+Total length in bytes of the ABI-encoded `DepositEvent` data payload. Every
+well-formed event has this exact length.
+"""
 
 PUBKEY_OFFSET = Uint(160)
+"""
+Position within the event payload of the validator public key's length
+prefix, as emitted by the Solidity ABI encoder.
+"""
+
 WITHDRAWAL_CREDENTIALS_OFFSET = Uint(256)
+"""
+Position within the event payload of the withdrawal credentials' length
+prefix.
+"""
+
 AMOUNT_OFFSET = Uint(320)
+"""
+Position within the event payload of the deposit amount's length prefix.
+"""
+
 SIGNATURE_OFFSET = Uint(384)
+"""
+Position within the event payload of the deposit signature's length prefix.
+"""
+
 INDEX_OFFSET = Uint(512)
+"""
+Position within the event payload of the deposit index's length prefix.
+"""
 
 PUBKEY_SIZE = Uint(48)
+"""
+Length of the BLS12-381 public key that identifies the validator receiving
+the deposit.
+"""
+
 WITHDRAWAL_CREDENTIALS_SIZE = Uint(32)
+"""
+Length of the withdrawal credentials, which determine where the staked
+ether may eventually be withdrawn.
+"""
+
 AMOUNT_SIZE = Uint(8)
+"""
+Length of the little-endian Gwei amount being deposited.
+"""
+
 SIGNATURE_SIZE = Uint(96)
+"""
+Length of the BLS12-381 signature over the deposit message.
+"""
+
 INDEX_SIZE = Uint(8)
+"""
+Length of the monotonically-increasing deposit index assigned by the
+deposit contract when it emits the event.
+"""
 
 
 def extract_deposit_data(data: Bytes) -> Bytes:
     """
-    Extracts Deposit Request from the DepositContract.DepositEvent data.
+    Strip the Solidity ABI framing from a `DepositEvent` payload and return
+    the concatenated raw fields in the order consumed by the consensus
+    layer: public key, withdrawal credentials, amount, signature, and
+    deposit index.
 
-    Raises
-    ------
-    InvalidBlock :
-        If the deposit contract did not produce a valid log.
+    Because each field has a fixed length, every well-formed event has an
+    identical byte layout. Any deviation indicates a misbehaving or
+    compromised deposit contract, so this function raises [`InvalidBlock`]
+    rather than silently accepting unexpected data.
 
+    [`InvalidBlock`]: ref:ethereum.exceptions.InvalidBlock
     """
     if ulen(data) != DEPOSIT_EVENT_LENGTH:
         raise InvalidBlock("Invalid deposit event data length")
@@ -150,7 +255,19 @@ def extract_deposit_data(data: Bytes) -> Bytes:
 
 def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
     """
-    Parse deposit requests from the block output.
+    Walk the receipts produced during block execution, concatenating the
+    raw payload of every valid deposit event into a single byte string.
+
+    A log is considered a deposit when it originates from
+    [`DEPOSIT_CONTRACT_ADDRESS`][addr] and its first topic matches
+    [`DEPOSIT_EVENT_SIGNATURE_HASH`][sig]. The returned bytes are the
+    direct concatenation of the unframed deposit fields, ready to be
+    prefixed with [`DEPOSIT_REQUEST_TYPE`][dt] before being appended to
+    the block's request list.
+
+    [addr]: ref:ethereum.forks.osaka.requests.DEPOSIT_CONTRACT_ADDRESS
+    [sig]: ref:ethereum.forks.osaka.requests.DEPOSIT_EVENT_SIGNATURE_HASH
+    [dt]: ref:ethereum.forks.osaka.requests.DEPOSIT_REQUEST_TYPE
     """
     deposit_requests: Bytes = b""
     for key in block_output.receipt_keys:
@@ -171,18 +288,18 @@ def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
 
 def compute_requests_hash(requests: List[Bytes]) -> Bytes:
     """
-    Get the hash of the requests using the SHA2-256 algorithm.
-
-    Parameters
-    ----------
-    requests : Bytes
-        The requests to hash.
-
-    Returns
-    -------
-    requests_hash : Bytes
-        The hash of the requests.
-
+    Compute the [SHA2-256] commitment over an ordered list of
+    type-prefixed requests, as defined by [EIP-7685].
+
+    The commitment is the SHA2-256 hash of the concatenation of the
+    SHA2-256 hashes of each individual request. This is what the
+    execution header's [`requests_hash`][rh] stores, and what the
+    consensus layer re-derives to validate that both layers observed the
+    same set of requests.
+
+    [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+    [SHA2-256]: https://en.wikipedia.org/wiki/SHA-2
+    [rh]: ref:ethereum.forks.osaka.blocks.Header.requests_hash
     """
     m = sha256()
     for request in requests:
diff --git a/src/ethereum/forks/osaka/state.py b/src/ethereum/forks/osaka/state.py
deleted file mode 100644
index 342bda1a1cd..00000000000
--- a/src/ethereum/forks/osaka/state.py
+++ /dev/null
@@ -1,713 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-from ethereum.state import (
-    EMPTY_ACCOUNT,
-    EMPTY_CODE_HASH,
-    Account,
-    Address,
-    Root,
-)
-
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-    def get_code(self, code_hash: Hash32) -> Bytes:
-        """
-        Get the bytecode for a given code hash.
-
-        Return ``b""`` for ``EMPTY_CODE_HASH``.
-        """
-        if code_hash == EMPTY_CODE_HASH:
-            return b""
-        return self._code_store[code_hash]
-
-
-@dataclass
-class TransientStorage:
-    """
-    Contains all information that is preserved between message calls
-    within a transaction.
-    """
-
-    _tries: Dict[Address, Trie[Bytes32, U256]] = field(default_factory=dict)
-    _snapshots: List[Dict[Address, Trie[Bytes32, U256]]] = field(
-        default_factory=list
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-
-
-def begin_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-    transient_storage._snapshots.append(
-        {k: copy_trie(t) for (k, t) in transient_storage._tries.items()}
-    )
-
-
-def commit_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._snapshots.pop()
-
-
-def rollback_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._tries = transient_storage._snapshots.pop()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-
-    Return ``b""`` for ``EMPTY_CODE_HASH``.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State`` and return its hash.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase, and to respect the constraints added to SELFDESTRUCT by
-    EIP-6780.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`. If, after modification, the account
-    exists and has zero nonce, empty code, and zero balance, it is destroyed.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-    account = get_account_optional(state, address)
-    account_exists_and_is_empty = (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-    if account_exists_and_is_empty:
-        destroy_account(state, address)
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
-
-
-def get_transient_storage(
-    transient_storage: TransientStorage, address: Address, key: Bytes32
-) -> U256:
-    """
-    Get a value at a storage key on an account from transient storage.
-    Returns `U256(0)` if the storage key has not been set previously.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_transient_storage(
-    transient_storage: TransientStorage,
-    address: Address,
-    key: Bytes32,
-    value: U256,
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        transient_storage._tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del transient_storage._tries[address]
diff --git a/src/ethereum/forks/osaka/state_tracker.py b/src/ethereum/forks/osaka/state_tracker.py
new file mode 100644
index 00000000000..67ceaa86321
--- /dev/null
+++ b/src/ethereum/forks/osaka/state_tracker.py
@@ -0,0 +1,749 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state. If, after modification, the
+    account exists and has zero nonce, empty code, and zero balance, it
+    is destroyed.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+    if account_exists_and_is_empty(tx_state, address):
+        destroy_account(tx_state, address)
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+    )
diff --git a/src/ethereum/forks/osaka/transactions.py b/src/ethereum/forks/osaka/transactions.py
index 048852529e4..18953538456 100644
--- a/src/ethereum/forks/osaka/transactions.py
+++ b/src/ethereum/forks/osaka/transactions.py
@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, TypeGuard, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -28,46 +28,10 @@
 )
 from .fork_types import Authorization, VersionedHash
 
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_TOKEN_FLOOR = Uint(10)
-"""
-Minimum gas cost per byte of calldata as per [EIP-7623]. Used to calculate
-the minimum gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_DATA_TOKEN_STANDARD = Uint(4)
-"""
-Gas cost per byte of calldata as per [EIP-7623]. Used to calculate the
-gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
-
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
-"""
-
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
-"""
-
 TX_MAX_GAS_LIMIT = Uint(16_777_216)
 
 
+@final
 @slotted_freezable
 @dataclass
 class LegacyTransaction:
@@ -130,6 +94,7 @@ class LegacyTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Access:
@@ -149,6 +114,7 @@ class Access:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccessListTransaction:
@@ -221,6 +187,7 @@ class AccessListTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class FeeMarketTransaction:
@@ -298,6 +265,7 @@ class FeeMarketTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class BlobTransaction:
@@ -386,6 +354,7 @@ class BlobTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class SetCodeTransaction:
@@ -481,6 +450,23 @@ class SetCodeTransaction:
 """
 
 
+AccessListCapableTransaction = (
+    AccessListTransaction
+    | FeeMarketTransaction
+    | BlobTransaction
+    | SetCodeTransaction
+)
+"""
+Transaction types that include an [EIP-2930]-style access list.
+
+See [`has_access_list`][hal] and [`Access`][a] for more details.
+
+[EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+[hal]: ref:ethereum.forks.amsterdam.transactions.has_access_list
+[a]: ref:ethereum.forks.amsterdam.transactions.Access
+"""
+
+
 def encode_transaction(tx: Transaction) -> LegacyTransaction | Bytes:
     """
     Encode a transaction into its RLP or typed transaction format.
@@ -584,7 +570,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
     4. Cost for access list entries (if applicable)
@@ -595,8 +581,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     gas cost of the transaction and the minimum gas cost used by the
     transaction based on the calldata size.
     """
-    from .vm.eoa_delegation import GAS_AUTH_PER_EMPTY_ACCOUNT
-    from .vm.gas import init_code_cost
+    from .vm.gas import GasCosts, init_code_cost
 
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
@@ -604,39 +589,33 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     tokens_in_calldata = num_zeros + num_non_zeros * Uint(4)
     # EIP-7623 floor price (note: no EVM costs)
     calldata_floor_gas_cost = (
-        tokens_in_calldata * GAS_TX_DATA_TOKEN_FLOOR + GAS_TX_BASE
+        tokens_in_calldata * GasCosts.TX_DATA_TOKEN_FLOOR + GasCosts.TX_BASE
     )
 
-    data_cost = tokens_in_calldata * GAS_TX_DATA_TOKEN_STANDARD
+    data_cost = tokens_in_calldata * GasCosts.TX_DATA_TOKEN_STANDARD
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE + init_code_cost(ulen(tx.data))
+        create_cost = GasCosts.TX_CREATE + init_code_cost(ulen(tx.data))
     else:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
-            access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_cost += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
 
     auth_cost = Uint(0)
     if isinstance(tx, SetCodeTransaction):
-        auth_cost += Uint(GAS_AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations))
+        auth_cost += Uint(
+            GasCosts.AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations)
+        )
 
     return (
         Uint(
-            GAS_TX_BASE
+            GasCosts.TX_BASE
             + data_cost
             + create_cost
             + access_list_cost
@@ -884,3 +863,17 @@ def get_transaction_hash(tx: Bytes | LegacyTransaction) -> Hash32:
         return keccak256(rlp.encode(tx))
     else:
         return keccak256(tx)
+
+
+def has_access_list(
+    tx: Transaction,
+) -> TypeGuard[AccessListCapableTransaction]:
+    """
+    Return whether the transaction has an [EIP-2930]-style access list.
+
+    [EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+    """
+    return isinstance(
+        tx,
+        AccessListCapableTransaction,
+    )
diff --git a/src/ethereum/forks/osaka/trie.py b/src/ethereum/forks/osaka/trie.py
deleted file mode 100644
index 7ad9a10f1c9..00000000000
--- a/src/ethereum/forks/osaka/trie.py
+++ /dev/null
@@ -1,509 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-from typing_extensions import assert_type
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.prague import trie as previous_trie
-from ethereum.state import Account, Address, Root
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt, Withdrawal
-from .fork_types import encode_account
-from .transactions import LegacyTransaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = (
-    Account
-    | Bytes
-    | LegacyTransaction
-    | Receipt
-    | Uint
-    | U256
-    | Withdrawal
-    | None
-)
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[LegacyTransaction | Bytes],
-    Optional[Receipt | Bytes],
-    Optional[Withdrawal | Bytes],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `Extended`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (LegacyTransaction, Receipt, Withdrawal, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/osaka/utils/message.py b/src/ethereum/forks/osaka/utils/message.py
index ae60e5e78da..6c8a3d5aae1 100644
--- a/src/ethereum/forks/osaka/utils/message.py
+++ b/src/ethereum/forks/osaka/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
@@ -55,7 +55,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -63,8 +63,9 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        state = block_env.state
-        code = get_code(state, get_account(state, tx.to).code_hash)
+        code = get_code(
+            tx_env.state, get_account(tx_env.state, tx.to).code_hash
+        )
         code_address = tx.to
     else:
         raise AssertionError("Target must be address or empty bytes")
diff --git a/src/ethereum/forks/osaka/vm/__init__.py b/src/ethereum/forks/osaka/vm/__init__.py
index 37d0a327974..42229ebd849 100644
--- a/src/ethereum/forks/osaka/vm/__init__.py
+++ b/src/ethereum/forks/osaka/vm/__init__.py
@@ -13,24 +13,25 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt, Withdrawal
 from ..fork_types import Authorization, VersionedHash
-from ..state import State, TransientStorage
+from ..state_tracker import BlockState, TransactionState
 from ..transactions import LegacyTransaction
-from ..trie import Trie
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +39,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -50,6 +51,7 @@ class BlockEnvironment:
     parent_beacon_block_root: Hash32
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -92,10 +94,11 @@ class BlockOutput:
     requests: List[Bytes] = field(default_factory=list)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
@@ -103,13 +106,14 @@ class TransactionEnvironment:
     gas: Uint
     access_list_addresses: Set[Address]
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
-    transient_storage: TransientStorage
+    state: TransactionState
     blob_versioned_hashes: Tuple[VersionedHash, ...]
     authorizations: Tuple[Authorization, ...]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -135,6 +139,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
diff --git a/src/ethereum/forks/osaka/vm/eoa_delegation.py b/src/ethereum/forks/osaka/vm/eoa_delegation.py
index ff4aca94087..62193fe0819 100644
--- a/src/ethereum/forks/osaka/vm/eoa_delegation.py
+++ b/src/ethereum/forks/osaka/vm/eoa_delegation.py
@@ -14,7 +14,7 @@
 from ethereum.state import Address
 
 from ..fork_types import Authorization
-from ..state import (
+from ..state_tracker import (
     account_exists,
     get_account,
     get_code,
@@ -22,14 +22,13 @@
     set_code,
 )
 from ..utils.hexadecimal import hex_to_address
-from ..vm.gas import GAS_COLD_ACCOUNT_ACCESS, GAS_WARM_ACCESS
+from ..vm.gas import GasCosts
 from . import Evm, Message
 
 SET_CODE_TX_MAGIC = b"\x05"
 EOA_DELEGATION_MARKER = b"\xef\x01\x00"
 EOA_DELEGATION_MARKER_LENGTH = len(EOA_DELEGATION_MARKER)
 EOA_DELEGATED_CODE_LENGTH = 23
-GAS_AUTH_PER_EMPTY_ACCOUNT = 25000
 REFUND_AUTH_PER_EXISTING_ACCOUNT = 12500
 NULL_ADDRESS = hex_to_address("0x0000000000000000000000000000000000000000")
 
@@ -140,19 +139,19 @@ def access_delegation(
         The delegation address, code, and access gas cost.
 
     """
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
 
-    code = get_code(state, get_account(state, address).code_hash)
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
     if not is_valid_delegation(code):
         return False, address, code, Uint(0)
 
     address = Address(code[EOA_DELEGATION_MARKER_LENGTH:])
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
-    code = get_code(state, get_account(state, address).code_hash)
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     return True, address, code, access_gas_cost
 
@@ -172,7 +171,7 @@ def set_delegation(message: Message) -> U256:
         Refund from authority which already exists in state.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     for auth in message.tx_env.authorizations:
         if auth.chain_id not in (message.block_env.chain_id, U256(0)):
@@ -188,8 +187,8 @@ def set_delegation(message: Message) -> U256:
 
         message.accessed_addresses.add(authority)
 
-        authority_account = get_account(state, authority)
-        authority_code = get_code(state, authority_account.code_hash)
+        authority_account = get_account(tx_state, authority)
+        authority_code = get_code(tx_state, authority_account.code_hash)
 
         if authority_code and not is_valid_delegation(authority_code):
             continue
@@ -198,24 +197,25 @@ def set_delegation(message: Message) -> U256:
         if authority_nonce != auth.nonce:
             continue
 
-        if account_exists(state, authority):
+        if account_exists(tx_state, authority):
             refund_counter += U256(
-                GAS_AUTH_PER_EMPTY_ACCOUNT - REFUND_AUTH_PER_EXISTING_ACCOUNT
+                GasCosts.AUTH_PER_EMPTY_ACCOUNT
+                - REFUND_AUTH_PER_EXISTING_ACCOUNT
             )
 
         if auth.address == NULL_ADDRESS:
             code_to_set = b""
         else:
             code_to_set = EOA_DELEGATION_MARKER + auth.address
-        set_code(state, authority, code_to_set)
+        set_code(tx_state, authority, code_to_set)
 
-        increment_nonce(state, authority)
+        increment_nonce(tx_state, authority)
 
     if message.code_address is None:
         raise InvalidBlock("Invalid type 4 transaction: no target")
 
     message.code = get_code(
-        state, get_account(state, message.code_address).code_hash
+        tx_state, get_account(tx_state, message.code_address).code_hash
     )
 
     return refund_counter
diff --git a/src/ethereum/forks/osaka/vm/gas.py b/src/ethereum/forks/osaka/vm/gas.py
index 5108bf63a7d..575129dfb49 100644
--- a/src/ethereum/forks/osaka/vm/gas.py
+++ b/src/ethereum/forks/osaka/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U64, U256, Uint
+from ethereum_types.numeric import U64, U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32, taylor_exponential
@@ -24,67 +24,172 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 4800
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-GAS_ECRECOVER = Uint(3000)
-GAS_P256VERIFY = Uint(6900)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1)
-GAS_COLD_SLOAD = Uint(2100)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600)
-GAS_WARM_ACCESS = Uint(100)
-GAS_CODE_INIT_PER_WORD = Uint(2)
-GAS_BLOBHASH_OPCODE = Uint(3)
-GAS_POINT_EVALUATION = Uint(50000)
-
-GAS_PER_BLOB = U64(2**17)
-BLOB_SCHEDULE_TARGET = U64(6)
-BLOB_TARGET_GAS_PER_BLOCK = GAS_PER_BLOB * BLOB_SCHEDULE_TARGET
-BLOB_BASE_COST = Uint(2**13)
-BLOB_SCHEDULE_MAX = U64(9)
-BLOB_MIN_GASPRICE = Uint(1)
-BLOB_BASE_FEE_UPDATE_FRACTION = Uint(5007716)
-
-GAS_BLS_G1_ADD = Uint(375)
-GAS_BLS_G1_MUL = Uint(12000)
-GAS_BLS_G1_MAP = Uint(5500)
-GAS_BLS_G2_ADD = Uint(600)
-GAS_BLS_G2_MUL = Uint(22500)
-GAS_BLS_G2_MAP = Uint(23800)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    WARM_ACCESS: Final[Uint] = Uint(100)
+    COLD_ACCOUNT_ACCESS: Final[Uint] = Uint(2600)
+    COLD_STORAGE_ACCESS: Final[Uint] = Uint(2100)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+    CODE_INIT_PER_WORD: Final[Uint] = Uint(2)
+
+    # Authorization
+    AUTH_PER_EMPTY_ACCOUNT: Final[int] = 25000
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 4800
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_P256VERIFY: Final[Uint] = Uint(6900)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1)
+    PRECOMPILE_POINT_EVALUATION: Final[Uint] = Uint(50000)
+    PRECOMPILE_BLS_G1ADD: Final[Uint] = Uint(375)
+    PRECOMPILE_BLS_G1MUL: Final[Uint] = Uint(12000)
+    PRECOMPILE_BLS_G1MAP: Final[Uint] = Uint(5500)
+    PRECOMPILE_BLS_G2ADD: Final[Uint] = Uint(600)
+    PRECOMPILE_BLS_G2MUL: Final[Uint] = Uint(22500)
+    PRECOMPILE_BLS_G2MAP: Final[Uint] = Uint(23800)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000)
+
+    # Blobs
+    PER_BLOB: Final[U64] = U64(2**17)
+    BLOB_SCHEDULE_TARGET: Final[U64] = U64(6)
+    BLOB_TARGET_GAS_PER_BLOCK: Final[U64] = PER_BLOB * BLOB_SCHEDULE_TARGET
+    BLOB_BASE_COST: Final[Uint] = Uint(2**13)
+    BLOB_SCHEDULE_MAX: Final[U64] = U64(9)
+    BLOB_MIN_GASPRICE: Final[Uint] = Uint(1)
+    BLOB_BASE_FEE_UPDATE_FRACTION: Final[Uint] = Uint(5007716)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_TOKEN_STANDARD: Final[Uint] = Uint(4)
+    TX_DATA_TOKEN_FLOOR: Final[Uint] = Uint(10)
+    TX_ACCESS_LIST_ADDRESS: Final[Uint] = Uint(2400)
+    TX_ACCESS_LIST_STORAGE_KEY: Final[Uint] = Uint(1900)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_CLZ: Final[Uint] = LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_PREVRANDAO: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_BASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBBASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBHASH: Final[Uint] = Uint(3)
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_PUSH0: Final[Uint] = BASE
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MCOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -100,11 +205,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -156,7 +262,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -186,7 +292,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -211,7 +317,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
@@ -283,7 +389,7 @@ def init_code_cost(init_code_length: Uint) -> Uint:
         The gas to be charged for the init code.
 
     """
-    return GAS_CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
+    return GasCosts.CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
 
 
 def calculate_excess_blob_gas(parent_header: Header) -> U64:
@@ -314,21 +420,23 @@ def calculate_excess_blob_gas(parent_header: Header) -> U64:
         base_fee_per_gas = parent_header.base_fee_per_gas
 
     parent_blob_gas = excess_blob_gas + blob_gas_used
-    if parent_blob_gas < BLOB_TARGET_GAS_PER_BLOCK:
+    if parent_blob_gas < GasCosts.BLOB_TARGET_GAS_PER_BLOCK:
         return U64(0)
 
-    target_blob_gas_price = Uint(GAS_PER_BLOB)
+    target_blob_gas_price = Uint(GasCosts.PER_BLOB)
     target_blob_gas_price *= calculate_blob_gas_price(excess_blob_gas)
 
-    base_blob_tx_price = BLOB_BASE_COST * base_fee_per_gas
+    base_blob_tx_price = GasCosts.BLOB_BASE_COST * base_fee_per_gas
     if base_blob_tx_price > target_blob_gas_price:
-        blob_schedule_delta = BLOB_SCHEDULE_MAX - BLOB_SCHEDULE_TARGET
+        blob_schedule_delta = (
+            GasCosts.BLOB_SCHEDULE_MAX - GasCosts.BLOB_SCHEDULE_TARGET
+        )
         return (
             excess_blob_gas
-            + blob_gas_used * blob_schedule_delta // BLOB_SCHEDULE_MAX
+            + blob_gas_used * blob_schedule_delta // GasCosts.BLOB_SCHEDULE_MAX
         )
 
-    return parent_blob_gas - BLOB_TARGET_GAS_PER_BLOCK
+    return parent_blob_gas - GasCosts.BLOB_TARGET_GAS_PER_BLOCK
 
 
 def calculate_total_blob_gas(tx: Transaction) -> U64:
@@ -347,7 +455,7 @@ def calculate_total_blob_gas(tx: Transaction) -> U64:
 
     """
     if isinstance(tx, BlobTransaction):
-        return GAS_PER_BLOB * U64(len(tx.blob_versioned_hashes))
+        return GasCosts.PER_BLOB * U64(len(tx.blob_versioned_hashes))
     else:
         return U64(0)
 
@@ -368,9 +476,9 @@ def calculate_blob_gas_price(excess_blob_gas: U64) -> Uint:
 
     """
     return taylor_exponential(
-        BLOB_MIN_GASPRICE,
+        GasCosts.BLOB_MIN_GASPRICE,
         Uint(excess_blob_gas),
-        BLOB_BASE_FEE_UPDATE_FRACTION,
+        GasCosts.BLOB_BASE_FEE_UPDATE_FRACTION,
     )
 
 
diff --git a/src/ethereum/forks/osaka/vm/instructions/arithmetic.py b/src/ethereum/forks/osaka/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/osaka/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/osaka/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/osaka/vm/instructions/bitwise.py b/src/ethereum/forks/osaka/vm/instructions/bitwise.py
index cc6fa2fbb23..7674d3c720f 100644
--- a/src/ethereum/forks/osaka/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/osaka/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_LOW, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +172,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +202,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +232,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
@@ -262,7 +265,7 @@ def count_leading_zeros(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CLZ)
 
     # OPERATION
     bit_length = U256(x.bit_length())
diff --git a/src/ethereum/forks/osaka/vm/instructions/block.py b/src/ethereum/forks/osaka/vm/instructions/block.py
index 43be9e58e23..d0aa17fe959 100644
--- a/src/ethereum/forks/osaka/vm/instructions/block.py
+++ b/src/ethereum/forks/osaka/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -40,7 +40,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -89,7 +89,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -123,7 +123,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -156,7 +156,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -189,7 +189,7 @@ def prev_randao(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PREVRANDAO)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.prev_randao))
@@ -222,7 +222,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -252,7 +252,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/osaka/vm/instructions/comparison.py b/src/ethereum/forks/osaka/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/osaka/vm/instructions/comparison.py
+++ b/src/ethereum/forks/osaka/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/osaka/vm/instructions/control_flow.py b/src/ethereum/forks/osaka/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/osaka/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/osaka/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/osaka/vm/instructions/environment.py b/src/ethereum/forks/osaka/vm/instructions/environment.py
index 5848530a960..b6bf713df27 100644
--- a/src/ethereum/forks/osaka/vm/instructions/environment.py
+++ b/src/ethereum/forks/osaka/vm/instructions/environment.py
@@ -17,20 +17,13 @@
 from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BASE,
-    GAS_BLOBHASH_OPCODE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_COPY,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
-    GAS_WARM_ACCESS,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_gas_extend_memory,
     charge_gas,
@@ -52,7 +45,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -76,14 +69,15 @@ def balance(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_addresses.add(address)
-        charge_gas(evm, GAS_COLD_ACCOUNT_ACCESS)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -106,7 +100,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -129,7 +123,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -152,7 +146,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -176,7 +170,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -201,7 +195,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -230,11 +224,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -259,7 +256,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -288,11 +285,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -317,7 +317,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -341,16 +341,16 @@ def extcodesize(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -377,23 +377,23 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
 
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost + copy_gas_cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -416,7 +416,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -442,11 +442,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -475,15 +480,15 @@ def extcodehash(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -510,12 +515,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
@@ -538,7 +543,7 @@ def base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BASEFEE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.base_fee_per_gas))
@@ -561,7 +566,7 @@ def blob_hash(evm: Evm) -> None:
     index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BLOBHASH_OPCODE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBHASH)
 
     # OPERATION
     if int(index) < len(evm.message.tx_env.blob_versioned_hashes):
@@ -588,7 +593,7 @@ def blob_base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBBASEFEE)
 
     # OPERATION
     blob_base_fee = calculate_blob_gas_price(
diff --git a/src/ethereum/forks/osaka/vm/instructions/keccak.py b/src/ethereum/forks/osaka/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/osaka/vm/instructions/keccak.py
+++ b/src/ethereum/forks/osaka/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/osaka/vm/instructions/log.py b/src/ethereum/forks/osaka/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/osaka/vm/instructions/log.py
+++ b/src/ethereum/forks/osaka/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/osaka/vm/instructions/memory.py b/src/ethereum/forks/osaka/vm/instructions/memory.py
index 6e111051ee3..bba3ddf19d5 100644
--- a/src/ethereum/forks/osaka/vm/instructions/memory.py
+++ b/src/ethereum/forks/osaka/vm/instructions/memory.py
@@ -18,9 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_COPY,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -49,7 +47,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -80,7 +78,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -108,7 +106,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -135,7 +133,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
@@ -161,12 +159,15 @@ def mcopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(length)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
 
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(source, length), (destination, length)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_MCOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/osaka/vm/instructions/stack.py b/src/ethereum/forks/osaka/vm/instructions/stack.py
index 0007a28acd4..ce94af6ce8e 100644
--- a/src/ethereum/forks/osaka/vm/instructions/stack.py
+++ b/src/ethereum/forks/osaka/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -63,9 +67,9 @@ def push_n(evm: Evm, num_bytes: int) -> None:
 
     # GAS
     if num_bytes == 0:
-        charge_gas(evm, GAS_BASE)
+        charge_gas(evm, GasCosts.OPCODE_PUSH0)
     else:
-        charge_gas(evm, GAS_VERY_LOW)
+        charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -95,7 +99,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -127,7 +131,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -139,70 +143,70 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push0 = partial(push_n, num_bytes=0)
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push0: Callable[[Evm], None] = partial(push_n, num_bytes=0)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/osaka/vm/instructions/storage.py b/src/ethereum/forks/osaka/vm/instructions/storage.py
index 084d58cc46c..63fda6bc3f3 100644
--- a/src/ethereum/forks/osaka/vm/instructions/storage.py
+++ b/src/ethereum/forks/osaka/vm/instructions/storage.py
@@ -13,7 +13,7 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import (
+from ...state_tracker import (
     get_storage,
     get_storage_original,
     get_transient_storage,
@@ -23,12 +23,7 @@
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -50,15 +45,14 @@ def sload(evm: Evm) -> None:
 
     # GAS
     if (evm.message.current_target, key) in evm.accessed_storage_keys:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        charge_gas(evm, GAS_COLD_SLOAD)
+        charge_gas(evm, GasCosts.COLD_STORAGE_ACCESS)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -79,54 +73,55 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     gas_cost = Uint(0)
 
     if (evm.message.current_target, key) not in evm.accessed_storage_keys:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        gas_cost += GAS_COLD_SLOAD
+        gas_cost += GasCosts.COLD_STORAGE_ACCESS
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost += GAS_STORAGE_SET
+            gas_cost += GasCosts.STORAGE_SET
         else:
-            gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_SLOAD
+            gas_cost += (
+                GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
+            )
     else:
-        gas_cost += GAS_WARM_ACCESS
+        gas_cost += GasCosts.WARM_ACCESS
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
-            # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
-            # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
-            # Storage slot being restored to its original value
             if original_value == 0:
-                # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_WARM_ACCESS)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.WARM_ACCESS
+                )
             else:
-                # Slot was originally non-empty and was UPDATED earlier
                 evm.refund_counter += int(
-                    GAS_STORAGE_UPDATE - GAS_COLD_SLOAD - GAS_WARM_ACCESS
+                    GasCosts.COLD_STORAGE_WRITE
+                    - GasCosts.COLD_STORAGE_ACCESS
+                    - GasCosts.WARM_ACCESS
                 )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
@@ -147,11 +142,11 @@ def tload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
 
     # OPERATION
     value = get_transient_storage(
-        evm.message.tx_env.transient_storage, evm.message.current_target, key
+        evm.message.tx_env.state, evm.message.current_target, key
     )
     push(evm.stack, value)
 
@@ -174,11 +169,11 @@ def tstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
     if evm.message.is_static:
         raise WriteInStaticContext
     set_transient_storage(
-        evm.message.tx_env.transient_storage,
+        evm.message.tx_env.state,
         evm.message.current_target,
         key,
         new_value,
diff --git a/src/ethereum/forks/osaka/vm/instructions/system.py b/src/ethereum/forks/osaka/vm/instructions/system.py
index 29c3fe9e6e2..cb4058774e2 100644
--- a/src/ethereum/forks/osaka/vm/instructions/system.py
+++ b/src/ethereum/forks/osaka/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
     get_account,
@@ -40,15 +40,7 @@
 )
 from ..exceptions import OutOfGasError, Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -90,7 +82,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -104,15 +96,13 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -166,14 +156,17 @@ def create(evm: Evm) -> None:
     )
     init_code_gas = init_code_cost(Uint(memory_size))
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost + init_code_gas)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CREATE_BASE + extend_memory.cost + init_code_gas,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -216,8 +209,8 @@ def create2(evm: Evm) -> None:
     init_code_gas = init_code_cost(Uint(memory_size))
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost
         + init_code_gas,
     )
@@ -261,7 +254,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -374,10 +367,10 @@ def call(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
@@ -388,10 +381,10 @@ def call(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -404,7 +397,7 @@ def call(evm: Evm) -> None:
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -463,10 +456,10 @@ def callcode(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -476,7 +469,7 @@ def callcode(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -489,7 +482,8 @@ def callcode(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state,
+        evm.message.current_target,
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -531,19 +525,20 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if beneficiary not in evm.accessed_addresses:
         evm.accessed_addresses.add(beneficiary)
-        gas_cost += GAS_COLD_ACCOUNT_ACCESS
+        gas_cost += GasCosts.COLD_ACCOUNT_ACCESS
 
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state,
+            evm.message.current_target,
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -551,11 +546,11 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     move_ether(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         originator,
         beneficiary,
         originator_balance,
@@ -563,10 +558,10 @@ def selfdestruct(evm: Evm) -> None:
 
     # register account for deletion only if it was created
     # in the same transaction
-    if originator in evm.message.block_env.state.created_accounts:
+    if originator in evm.message.tx_env.state.created_accounts:
         # If beneficiary is the same as originator, then
         # the ether is burnt.
-        set_account_balance(evm.message.block_env.state, originator, U256(0))
+        set_account_balance(evm.message.tx_env.state, originator, U256(0))
         evm.accounts_to_delete.add(originator)
 
     # HALT the execution
@@ -604,10 +599,10 @@ def delegatecall(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -618,7 +613,11 @@ def delegatecall(evm: Evm) -> None:
     access_gas_cost += delegated_access_gas_cost
 
     message_call_gas = calculate_message_call_gas(
-        U256(0), gas, Uint(evm.gas_left), extend_memory.cost, access_gas_cost
+        U256(0),
+        gas,
+        Uint(evm.gas_left),
+        extend_memory.cost,
+        access_gas_cost,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
@@ -673,10 +672,10 @@ def staticcall(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
diff --git a/src/ethereum/forks/osaka/vm/interpreter.py b/src/ethereum/forks/osaka/vm/interpreter.py
index bdbf6520cc7..a9edd1c28d2 100644
--- a/src/ethereum/forks/osaka/vm/interpreter.py
+++ b/src/ethereum/forks/osaka/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,22 +31,22 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     get_account,
     get_code,
     increment_nonce,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
 )
 from ..vm import Message
 from ..vm.eoa_delegation import get_delegated_code_address, set_delegation
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -66,6 +66,7 @@
 MAX_INIT_CODE_SIZE = 2 * MAX_CODE_SIZE
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -105,12 +106,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -131,8 +132,8 @@ def process_message_call(message: Message) -> MessageCallOutput:
             message.disable_precompiles = True
             message.accessed_addresses.add(delegated_address)
             message.code = get_code(
-                block_env.state,
-                get_account(block_env.state, delegated_address).code_hash,
+                tx_state,
+                get_account(tx_state, delegated_address).code_hash,
             )
             message.code_address = delegated_address
 
@@ -176,22 +177,31 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
-    transient_storage = message.tx_env.transient_storage
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
-
-    # The list of created accounts is used by `get_storage_original`.
-    # Additionally, the list is needed to respect the constraints
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts. This tracking is also needed to respect the constraints
     # added to SELFDESTRUCT by EIP-6780.
-    mark_account_created(state, message.current_target)
+    mark_account_created(tx_state, message.current_target)
 
-    increment_nonce(state, message.current_target)
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             if len(contract_code) > 0:
@@ -201,15 +211,14 @@ def process_create_message(message: Message) -> Evm:
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state, transient_storage)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state, transient_storage)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -228,11 +237,10 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
-    transient_storage = message.tx_env.transient_storage
     code = message.code
     valid_jump_destinations = get_valid_jump_destinations(code)
     evm = Evm(
@@ -255,11 +263,14 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
+    snapshot = copy_tx_state(tx_state)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -291,9 +302,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state, transient_storage)
-    else:
-        commit_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/osaka/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/osaka/vm/precompiled_contracts/alt_bn128.py
index 214725d8da0..862506c54c3 100644
--- a/src/ethereum/forks/osaka/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/osaka/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(150))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(6000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(34000 * (len(data) // 192) + 45000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/osaka/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/osaka/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/osaka/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/osaka/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/osaka/vm/precompiled_contracts/bls12_381/__init__.py b/src/ethereum/forks/osaka/vm/precompiled_contracts/bls12_381/__init__.py
index c99e7573f48..7d622da39d1 100644
--- a/src/ethereum/forks/osaka/vm/precompiled_contracts/bls12_381/__init__.py
+++ b/src/ethereum/forks/osaka/vm/precompiled_contracts/bls12_381/__init__.py
@@ -414,7 +414,7 @@ def decode_g1_scalar_pair(
 
     """
     if len(data) != 160:
-        InvalidParameter("Input should be 160 bytes long")
+        raise InvalidParameter("Input should be 160 bytes long")
 
     point = bytes_to_g1(data[:128], subgroup_check=True)
 
@@ -614,7 +614,7 @@ def decode_g2_scalar_pair(
 
     """
     if len(data) != 288:
-        InvalidParameter("Input should be 288 bytes long")
+        raise InvalidParameter("Input should be 288 bytes long")
 
     point = bytes_to_g2(data[:256], subgroup_check=True)
     n = int.from_bytes(data[256 : 256 + 32], "big")
diff --git a/src/ethereum/forks/osaka/vm/precompiled_contracts/bls12_381/bls12_381_g1.py b/src/ethereum/forks/osaka/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
index ae8eeba0ce6..d1f63224a0c 100644
--- a/src/ethereum/forks/osaka/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
+++ b/src/ethereum/forks/osaka/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G1_ADD,
-    GAS_BLS_G1_MAP,
-    GAS_BLS_G1_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -60,7 +58,7 @@ def bls12_g1_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1ADD)
 
     # OPERATION
     p1 = bytes_to_g1(buffer_read(data, U256(0), U256(128)))
@@ -101,7 +99,7 @@ def bls12_g1_msm(evm: Evm) -> None:
     else:
         discount = Uint(G1_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G1_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G1MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -140,7 +138,7 @@ def bls12_map_fp_to_g1(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1MAP)
 
     # OPERATION
     fp = int.from_bytes(data, "big")
diff --git a/src/ethereum/forks/osaka/vm/precompiled_contracts/bls12_381/bls12_381_g2.py b/src/ethereum/forks/osaka/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
index 473739b78c0..2fd32313f89 100644
--- a/src/ethereum/forks/osaka/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
+++ b/src/ethereum/forks/osaka/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G2_ADD,
-    GAS_BLS_G2_MAP,
-    GAS_BLS_G2_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -61,7 +59,7 @@ def bls12_g2_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2ADD)
 
     # OPERATION
     p1 = bytes_to_g2(buffer_read(data, U256(0), U256(256)))
@@ -102,7 +100,7 @@ def bls12_g2_msm(evm: Evm) -> None:
     else:
         discount = Uint(G2_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G2_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G2MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -141,7 +139,7 @@ def bls12_map_fp2_to_g2(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2MAP)
 
     # OPERATION
     field_element = bytes_to_fq2(data)
diff --git a/src/ethereum/forks/osaka/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/osaka/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/osaka/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/osaka/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/osaka/vm/precompiled_contracts/identity.py b/src/ethereum/forks/osaka/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/osaka/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/osaka/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/osaka/vm/precompiled_contracts/p256verify.py b/src/ethereum/forks/osaka/vm/precompiled_contracts/p256verify.py
index 106dd548a61..29c2e91e0f0 100644
--- a/src/ethereum/forks/osaka/vm/precompiled_contracts/p256verify.py
+++ b/src/ethereum/forks/osaka/vm/precompiled_contracts/p256verify.py
@@ -24,7 +24,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_P256VERIFY, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -41,7 +41,7 @@ def p256verify(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_P256VERIFY)
+    charge_gas(evm, GasCosts.PRECOMPILE_P256VERIFY)
 
     if len(data) != 160:
         return
diff --git a/src/ethereum/forks/osaka/vm/precompiled_contracts/point_evaluation.py b/src/ethereum/forks/osaka/vm/precompiled_contracts/point_evaluation.py
index ce4eed71294..d2d105ba13b 100644
--- a/src/ethereum/forks/osaka/vm/precompiled_contracts/point_evaluation.py
+++ b/src/ethereum/forks/osaka/vm/precompiled_contracts/point_evaluation.py
@@ -22,7 +22,7 @@
 
 from ...vm import Evm
 from ...vm.exceptions import KZGProofError
-from ...vm.gas import GAS_POINT_EVALUATION, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 FIELD_ELEMENTS_PER_BLOB = 4096
 BLS_MODULUS = 52435875175126190479447740508185965837690552500527637822603658699938581184513  # noqa: E501
@@ -51,7 +51,7 @@ def point_evaluation(evm: Evm) -> None:
     proof = Bytes48(data[144:192])
 
     # GAS
-    charge_gas(evm, GAS_POINT_EVALUATION)
+    charge_gas(evm, GasCosts.PRECOMPILE_POINT_EVALUATION)
     if kzg_commitment_to_versioned_hash(commitment) != versioned_hash:
         raise KZGProofError
 
diff --git a/src/ethereum/forks/osaka/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/osaka/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/osaka/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/osaka/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/osaka/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/osaka/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/osaka/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/osaka/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/paris/__init__.py b/src/ethereum/forks/paris/__init__.py
index 9e1f07470d7..788625171cc 100644
--- a/src/ethereum/forks/paris/__init__.py
+++ b/src/ethereum/forks/paris/__init__.py
@@ -28,7 +28,7 @@
 [consensus layer]: https://github.com/ethereum/consensus-specs
 [EIP-3675]: https://eips.ethereum.org/EIPS/eip-3675
 [EIP-4399]: https://eips.ethereum.org/EIPS/eip-4399
-[Besu 22.7.2]: https://github.com/hyperledger/besu/releases/tag/22.7.2
+[Besu 22.7.2]: https://github.com/besu-eth/besu/releases/tag/22.7.2
 [e]: https://github.com/ledgerwatch/erigon/releases/tag/v2022.09.01
 [Geth 1.10.23]: https://github.com/ethereum/go-ethereum/releases/tag/v1.10.23
 [nm]: https://github.com/NethermindEth/nethermind/releases/tag/1.14.1
diff --git a/src/ethereum/forks/paris/blocks.py b/src/ethereum/forks/paris/blocks.py
index 72a0ffd79de..15852ce82a1 100644
--- a/src/ethereum/forks/paris/blocks.py
+++ b/src/ethereum/forks/paris/blocks.py
@@ -10,7 +10,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
@@ -29,6 +29,7 @@
 )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -72,13 +73,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.paris.state.state_root
-    [Trie]: ref:ethereum.forks.paris.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -88,8 +90,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.paris.trie.root
-    [Trie]: ref:ethereum.forks.paris.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -99,8 +101,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.paris.trie.root
-    [Trie]: ref:ethereum.forks.paris.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -170,6 +172,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -214,6 +217,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -246,6 +250,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/paris/fork.py b/src/ethereum/forks/paris/fork.py
index 601f7064cfb..a5609b3353c 100644
--- a/src/ethereum/forks/paris/fork.py
+++ b/src/ethereum/forks/paris/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Tuple
+from typing import List, Optional, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
@@ -27,7 +27,13 @@
     InvalidSenderError,
     NonceMismatchError,
 )
-from ethereum.state import EMPTY_CODE_HASH, Address
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt, encode_receipt
@@ -36,13 +42,16 @@
     InsufficientMaxFeePerGasError,
     PriorityFeeGreaterThanMaxFeeError,
 )
-from .state import (
-    State,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
+    create_ether,
     destroy_account,
+    extract_block_diff,
     get_account,
+    incorporate_tx_into_block,
     increment_nonce,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
     AccessListTransaction,
@@ -55,17 +64,16 @@
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.message import prepare_message
+from .vm.gas import GasCosts
 from .vm.interpreter import process_message_call
 
 BASE_FEE_MAX_CHANGE_DENOMINATOR = Uint(8)
 ELASTICITY_MULTIPLIER = Uint(2)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -168,9 +176,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block.ommers != ():
         raise InvalidBlock
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -184,7 +194,12 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         block_env=block_env,
         transactions=block.transactions,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes,
+        block_diff.storage_changes,
+        block_diff.storage_clears,
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -202,6 +217,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block_logs_bloom != block.header.bloom:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -329,6 +345,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Tuple[Address, Uint]:
     """
     Check if the transaction is includable in the block.
@@ -341,6 +358,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -371,7 +390,7 @@ def check_transaction(
     if tx.gas > gas_available:
         raise GasUsedExceedsLimitError("gas used exceeds limit")
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     if isinstance(tx, FeeMarketTransaction):
         if tx.max_fee_per_gas < tx.max_priority_fee_per_gas:
@@ -509,6 +528,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(
         block_output.transactions_trie,
         rlp.encode(index),
@@ -524,21 +545,20 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     effective_gas_fee = tx.gas * effective_gas_price
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     sender_balance_after_gas_fee = (
         Uint(sender_account.balance) - effective_gas_fee
     )
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     access_list_addresses = set()
     access_list_storage_keys = set()
@@ -554,6 +574,7 @@ def process_transaction(
         gas=gas,
         access_list_addresses=access_list_addresses,
         access_list_storage_keys=access_list_storage_keys,
+        state=tx_state,
         index_in_block=index,
         tx_hash=get_transaction_hash(encode_transaction(tx)),
     )
@@ -575,23 +596,13 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * priority_fee_per_gas
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
-    coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
-    ).balance + U256(transaction_fee)
-    set_account_balance(
-        block_env.state,
-        block_env.coinbase,
-        coinbase_balance_after_mining_fee,
-    )
+    create_ether(tx_state, block_env.coinbase, U256(transaction_fee))
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
     block_output.block_gas_used += tx_gas_used_after_refund
 
@@ -610,6 +621,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
     """
@@ -617,12 +630,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
     passed through as a parameter is greater than or equal to the *sum* of
     the parent's gas and the adjustment delta then the limit for gas is too
     high and fails this function's check. Similarly, if the limit is less
     than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
+    delta *or* the predefined ``LIMIT_MINIMUM`` then this function's
     check fails because the gas limit doesn't allow for a sufficient or
     reasonable amount of gas to be used on a block.
 
@@ -640,12 +653,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/paris/state.py b/src/ethereum/forks/paris/state.py
deleted file mode 100644
index ab1b0d39a90..00000000000
--- a/src/ethereum/forks/paris/state.py
+++ /dev/null
@@ -1,635 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-from ethereum.state import (
-    EMPTY_ACCOUNT,
-    EMPTY_CODE_HASH,
-    Account,
-    Address,
-    Root,
-)
-
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-    def get_code(self, code_hash: Hash32) -> Bytes:
-        """
-        Return the bytecode for a given code hash.
-        """
-        if code_hash == EMPTY_CODE_HASH:
-            return b""
-        return self._code_store[code_hash]
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-
-
-def begin_transaction(state: State) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-
-
-def commit_transaction(state: State) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-
-def rollback_transaction(state: State) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Return the bytecode for a given code hash.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    code_hash:
-        The hash of the code to retrieve.
-
-    Returns
-    -------
-    code : `Bytes`
-        The bytecode for the given hash.
-
-    """
-    return state.get_code(code_hash)
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in the code store and return its hash.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    code:
-        The bytecode to store.
-
-    Returns
-    -------
-    code_hash : `Hash32`
-        The keccak256 hash of the stored bytecode.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`. If, after modification, the account
-    exists and has zero nonce, empty code, and zero balance, it is destroyed.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-    account = get_account_optional(state, address)
-    account_exists_and_is_empty = (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-    if account_exists_and_is_empty:
-        destroy_account(state, address)
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = store_code(state, code)
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
diff --git a/src/ethereum/forks/paris/state_tracker.py b/src/ethereum/forks/paris/state_tracker.py
new file mode 100644
index 00000000000..a62bed0c09f
--- /dev/null
+++ b/src/ethereum/forks/paris/state_tracker.py
@@ -0,0 +1,774 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+
+    ``storage_clears`` records addresses whose storage was wiped by
+    a pre-EIP-6780 ``SELFDESTRUCT`` earlier in the block, so later
+    reads must not fall back to ``pre_state`` storage.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    storage_clears: Set[Address] = field(default_factory=set)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    storage_clears: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.storage_clears:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if address in tx_state.storage_clears:
+        return False
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    if address in tx_state.parent.storage_clears:
+        return False
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+    tx_state.storage_clears.add(address)
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state. If, after modification, the
+    account exists and has zero nonce, empty code, and zero balance, it
+    is destroyed.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+    if account_exists_and_is_empty(tx_state, address):
+        destroy_account(tx_state, address)
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        storage_clears=set(tx_state.storage_clears),
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.storage_clears = snapshot.storage_clears
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address in tx_state.storage_clears:
+        block.storage_clears.add(address)
+        block.storage_writes.pop(address, None)
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.storage_clears.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+        storage_clears=block_state.storage_clears,
+    )
diff --git a/src/ethereum/forks/paris/transactions.py b/src/ethereum/forks/paris/transactions.py
index 3b2f8b4425f..902128e634c 100644
--- a/src/ethereum/forks/paris/transactions.py
+++ b/src/ethereum/forks/paris/transactions.py
@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -23,38 +23,8 @@
 
 from .exceptions import TransactionTypeError
 
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_PER_NON_ZERO = Uint(16)
-"""
-Gas cost per non-zero byte in the transaction data.
-"""
-
-GAS_TX_DATA_PER_ZERO = Uint(4)
-"""
-Gas cost per zero byte in the transaction data.
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
-
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
-"""
-
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
-"""
-
 
+@final
 @slotted_freezable
 @dataclass
 class LegacyTransaction:
@@ -114,6 +84,7 @@ class LegacyTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Access:
@@ -133,6 +104,7 @@ class Access:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccessListTransaction:
@@ -205,6 +177,7 @@ class AccessListTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class FeeMarketTransaction:
@@ -370,7 +343,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
     4. Cost for access list entries (if applicable)
@@ -378,27 +351,29 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     This function takes a transaction as a parameter and returns the intrinsic
     gas cost of the transaction.
     """
+    from .vm.gas import GasCosts
+
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
     data_cost = (
-        num_zeros * GAS_TX_DATA_PER_ZERO
-        + num_non_zeros * GAS_TX_DATA_PER_NON_ZERO
+        num_zeros * GasCosts.TX_DATA_PER_ZERO
+        + num_non_zeros * GasCosts.TX_DATA_PER_NON_ZERO
     )
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE
+        create_cost = GasCosts.TX_CREATE
     else:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
     if isinstance(tx, (AccessListTransaction, FeeMarketTransaction)):
         for access in tx.access_list:
-            access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_cost += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
 
-    return GAS_TX_BASE + data_cost + create_cost + access_list_cost
+    return GasCosts.TX_BASE + data_cost + create_cost + access_list_cost
 
 
 def recover_sender(chain_id: U64, tx: Transaction) -> Address:
diff --git a/src/ethereum/forks/paris/trie.py b/src/ethereum/forks/paris/trie.py
deleted file mode 100644
index ccd84fd0c1b..00000000000
--- a/src/ethereum/forks/paris/trie.py
+++ /dev/null
@@ -1,499 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    assert_type,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.gray_glacier import trie as previous_trie
-from ethereum.state import Account, Address, Root
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt
-from .fork_types import encode_account
-from .transactions import LegacyTransaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = Account | Bytes | LegacyTransaction | Receipt | Uint | U256 | None
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[LegacyTransaction | Bytes],
-    Optional[Receipt | Bytes],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `rlp.RLP`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (LegacyTransaction, Receipt, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/paris/utils/message.py b/src/ethereum/forks/paris/utils/message.py
index a8ff2e48d08..63b7e852e7f 100644
--- a/src/ethereum/forks/paris/utils/message.py
+++ b/src/ethereum/forks/paris/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
@@ -55,7 +55,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -63,9 +63,9 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        state = block_env.state
-        code = get_code(state, get_account(state, tx.to).code_hash)
-
+        code = get_code(
+            tx_env.state, get_account(tx_env.state, tx.to).code_hash
+        )
         code_address = tx.to
     else:
         raise AssertionError("Target must be address or empty bytes")
diff --git a/src/ethereum/forks/paris/vm/__init__.py b/src/ethereum/forks/paris/vm/__init__.py
index a07bfac29cd..c0e4bd18b21 100644
--- a/src/ethereum/forks/paris/vm/__init__.py
+++ b/src/ethereum/forks/paris/vm/__init__.py
@@ -13,23 +13,24 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt
-from ..state import State
+from ..state_tracker import BlockState, TransactionState
 from ..transactions import LegacyTransaction
-from ..trie import Trie
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -37,7 +38,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -47,6 +48,7 @@ class BlockEnvironment:
     prev_randao: Bytes32
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -78,10 +80,11 @@ class BlockOutput:
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
@@ -89,10 +92,12 @@ class TransactionEnvironment:
     gas: Uint
     access_list_addresses: Set[Address]
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
+    state: TransactionState
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -117,6 +122,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
diff --git a/src/ethereum/forks/paris/vm/gas.py b/src/ethereum/forks/paris/vm/gas.py
index 1929dd5ca3b..78cd45695e1 100644
--- a/src/ethereum/forks/paris/vm/gas.py
+++ b/src/ethereum/forks/paris/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32
@@ -22,48 +22,146 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 4800
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-GAS_ECRECOVER = Uint(3000)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1)
-GAS_COLD_SLOAD = Uint(2100)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600)
-GAS_WARM_ACCESS = Uint(100)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    WARM_ACCESS: Final[Uint] = Uint(100)
+    COLD_ACCOUNT_ACCESS: Final[Uint] = Uint(2600)
+    COLD_STORAGE_ACCESS: Final[Uint] = Uint(2100)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 4800
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_PER_ZERO: Final[Uint] = Uint(4)
+    TX_DATA_PER_NON_ZERO: Final[Uint] = Uint(16)
+    TX_ACCESS_LIST_ADDRESS: Final[Uint] = Uint(2400)
+    TX_ACCESS_LIST_STORAGE_KEY: Final[Uint] = Uint(1900)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_PREVRANDAO: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_BASEFEE: Final[Uint] = BASE
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -79,11 +177,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -135,7 +234,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -165,7 +264,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -190,7 +289,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
diff --git a/src/ethereum/forks/paris/vm/instructions/arithmetic.py b/src/ethereum/forks/paris/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/paris/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/paris/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/paris/vm/instructions/bitwise.py b/src/ethereum/forks/paris/vm/instructions/bitwise.py
index 41dabe8185b..1de6c615931 100644
--- a/src/ethereum/forks/paris/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/paris/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +172,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +202,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +232,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
diff --git a/src/ethereum/forks/paris/vm/instructions/block.py b/src/ethereum/forks/paris/vm/instructions/block.py
index 3aa1fb2f6b6..19216cef9d5 100644
--- a/src/ethereum/forks/paris/vm/instructions/block.py
+++ b/src/ethereum/forks/paris/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -40,7 +40,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -89,7 +89,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -123,7 +123,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -156,7 +156,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -189,7 +189,7 @@ def prev_randao(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PREVRANDAO)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.prev_randao))
@@ -222,7 +222,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -252,7 +252,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/paris/vm/instructions/comparison.py b/src/ethereum/forks/paris/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/paris/vm/instructions/comparison.py
+++ b/src/ethereum/forks/paris/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/paris/vm/instructions/control_flow.py b/src/ethereum/forks/paris/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/paris/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/paris/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/paris/vm/instructions/environment.py b/src/ethereum/forks/paris/vm/instructions/environment.py
index ba2bb42a425..ff0a4044f73 100644
--- a/src/ethereum/forks/paris/vm/instructions/environment.py
+++ b/src/ethereum/forks/paris/vm/instructions/environment.py
@@ -16,19 +16,13 @@
 from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BASE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_COPY,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
-    GAS_WARM_ACCESS,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -49,7 +43,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -73,14 +67,15 @@ def balance(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_addresses.add(address)
-        charge_gas(evm, GAS_COLD_ACCOUNT_ACCESS)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -103,7 +98,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -126,7 +121,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -149,7 +144,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -173,7 +168,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -198,7 +193,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -227,11 +222,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -256,7 +254,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -285,11 +283,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -314,7 +315,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -338,16 +339,16 @@ def extcodesize(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -374,23 +375,23 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
 
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost + copy_gas_cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -413,7 +414,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -439,11 +440,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -472,15 +478,15 @@ def extcodehash(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -507,12 +513,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
@@ -535,7 +541,7 @@ def base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BASEFEE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.base_fee_per_gas))
diff --git a/src/ethereum/forks/paris/vm/instructions/keccak.py b/src/ethereum/forks/paris/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/paris/vm/instructions/keccak.py
+++ b/src/ethereum/forks/paris/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/paris/vm/instructions/log.py b/src/ethereum/forks/paris/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/paris/vm/instructions/log.py
+++ b/src/ethereum/forks/paris/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/paris/vm/instructions/memory.py b/src/ethereum/forks/paris/vm/instructions/memory.py
index 3a242ba2f7a..93861811559 100644
--- a/src/ethereum/forks/paris/vm/instructions/memory.py
+++ b/src/ethereum/forks/paris/vm/instructions/memory.py
@@ -16,8 +16,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,7 +45,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -77,7 +76,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -105,7 +104,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -132,7 +131,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
diff --git a/src/ethereum/forks/paris/vm/instructions/stack.py b/src/ethereum/forks/paris/vm/instructions/stack.py
index 0fc0d3fe4b5..901bff4ed3b 100644
--- a/src/ethereum/forks/paris/vm/instructions/stack.py
+++ b/src/ethereum/forks/paris/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -62,7 +66,7 @@ def push_n(evm: Evm, num_bytes: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -92,7 +96,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -124,7 +128,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -136,69 +140,69 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/paris/vm/instructions/storage.py b/src/ethereum/forks/paris/vm/instructions/storage.py
index 6129ed5322c..e9d86666668 100644
--- a/src/ethereum/forks/paris/vm/instructions/storage.py
+++ b/src/ethereum/forks/paris/vm/instructions/storage.py
@@ -13,16 +13,11 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import get_storage, get_storage_original, set_storage
+from ...state_tracker import get_storage, get_storage_original, set_storage
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,15 +39,14 @@ def sload(evm: Evm) -> None:
 
     # GAS
     if (evm.message.current_target, key) in evm.accessed_storage_keys:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        charge_gas(evm, GAS_COLD_SLOAD)
+        charge_gas(evm, GasCosts.COLD_STORAGE_ACCESS)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -73,54 +67,60 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     gas_cost = Uint(0)
 
     if (evm.message.current_target, key) not in evm.accessed_storage_keys:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        gas_cost += GAS_COLD_SLOAD
+        gas_cost += GasCosts.COLD_STORAGE_ACCESS
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost += GAS_STORAGE_SET
+            gas_cost += GasCosts.STORAGE_SET
         else:
-            gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_SLOAD
+            gas_cost += (
+                GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
+            )
     else:
-        gas_cost += GAS_WARM_ACCESS
+        gas_cost += GasCosts.WARM_ACCESS
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
             # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
             # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
             # Storage slot being restored to its original value
             if original_value == 0:
                 # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_WARM_ACCESS)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.WARM_ACCESS
+                )
             else:
                 # Slot was originally non-empty and was UPDATED earlier
                 evm.refund_counter += int(
-                    GAS_STORAGE_UPDATE - GAS_COLD_SLOAD - GAS_WARM_ACCESS
+                    GasCosts.COLD_STORAGE_WRITE
+                    - GasCosts.COLD_STORAGE_ACCESS
+                    - GasCosts.WARM_ACCESS
                 )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
diff --git a/src/ethereum/forks/paris/vm/instructions/system.py b/src/ethereum/forks/paris/vm/instructions/system.py
index 2e9a8766a1e..447cf6410e2 100644
--- a/src/ethereum/forks/paris/vm/instructions/system.py
+++ b/src/ethereum/forks/paris/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
     get_account,
@@ -39,15 +39,7 @@
 )
 from ..exceptions import Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -82,7 +74,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -96,15 +88,13 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -156,14 +146,14 @@ def create(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -201,8 +191,8 @@ def create2(evm: Evm) -> None:
     call_data_words = ceil32(Uint(memory_size)) // Uint(32)
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost,
     )
 
@@ -241,7 +231,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -284,8 +274,8 @@ def generic_call(
     call_data = memory_read_bytes(
         evm.memory, memory_input_start_position, memory_input_size
     )
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, code_address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, code_address).code_hash)
     child_message = Message(
         block_env=evm.message.block_env,
         tx_env=evm.message.tx_env,
@@ -352,17 +342,17 @@ def call(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -375,7 +365,7 @@ def call(evm: Evm) -> None:
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -432,12 +422,12 @@ def callcode(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -450,7 +440,7 @@ def callcode(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -490,19 +480,19 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if beneficiary not in evm.accessed_addresses:
         evm.accessed_addresses.add(beneficiary)
-        gas_cost += GAS_COLD_ACCOUNT_ACCESS
+        gas_cost += GasCosts.COLD_ACCOUNT_ACCESS
 
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -510,22 +500,22 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     beneficiary_balance = get_account(
-        evm.message.block_env.state, beneficiary
+        evm.message.tx_env.state, beneficiary
     ).balance
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     # First Transfer to beneficiary
     set_account_balance(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         beneficiary,
         beneficiary_balance + originator_balance,
     )
     # Next, Zero the balance of the address being deleted (must come after
     # sending to beneficiary in case the contract named itself as the
     # beneficiary).
-    set_account_balance(evm.message.block_env.state, originator, U256(0))
+    set_account_balance(evm.message.tx_env.state, originator, U256(0))
 
     # register account for deletion
     evm.accounts_to_delete.add(originator)
@@ -565,10 +555,10 @@ def delegatecall(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     message_call_gas = calculate_message_call_gas(
         U256(0), gas, Uint(evm.gas_left), extend_memory.cost, access_gas_cost
@@ -624,10 +614,10 @@ def staticcall(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
 
diff --git a/src/ethereum/forks/paris/vm/interpreter.py b/src/ethereum/forks/paris/vm/interpreter.py
index 92af867690a..f7b51029535 100644
--- a/src/ethereum/forks/paris/vm/interpreter.py
+++ b/src/ethereum/forks/paris/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,19 +31,19 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     increment_nonce,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
 )
 from ..vm import Message
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -62,6 +62,7 @@
 MAX_CODE_SIZE = 0x6000
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -99,12 +100,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -155,19 +156,30 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state)
-
-    # The list of created accounts is used by `get_storage_original`.
-    mark_account_created(state, message.current_target)
-
-    increment_nonce(state, message.current_target)
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts.
+    mark_account_created(tx_state, message.current_target)
+
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             if len(contract_code) > 0:
@@ -177,15 +189,14 @@ def process_create_message(message: Message) -> Evm:
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -204,7 +215,7 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
@@ -230,11 +241,14 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -265,9 +279,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state)
-    else:
-        commit_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/paris/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/paris/vm/precompiled_contracts/alt_bn128.py
index 214725d8da0..862506c54c3 100644
--- a/src/ethereum/forks/paris/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/paris/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(150))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(6000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(34000 * (len(data) // 192) + 45000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/paris/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/paris/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/paris/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/paris/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/paris/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/paris/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/paris/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/paris/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/paris/vm/precompiled_contracts/identity.py b/src/ethereum/forks/paris/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/paris/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/paris/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/paris/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/paris/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/paris/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/paris/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/paris/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/paris/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/paris/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/paris/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/prague/blocks.py b/src/ethereum/forks/prague/blocks.py
index acc2a77c199..e34b1dc4e6f 100644
--- a/src/ethereum/forks/prague/blocks.py
+++ b/src/ethereum/forks/prague/blocks.py
@@ -10,7 +10,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
@@ -31,6 +31,7 @@
 )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Withdrawal:
@@ -64,6 +65,7 @@ class Withdrawal:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -107,13 +109,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.prague.state.state_root
-    [Trie]: ref:ethereum.forks.prague.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -123,8 +126,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.prague.trie.root
-    [Trie]: ref:ethereum.forks.prague.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -134,8 +137,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.prague.trie.root
-    [Trie]: ref:ethereum.forks.prague.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -244,6 +247,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -297,6 +301,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -329,6 +334,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/prague/fork.py b/src/ethereum/forks/prague/fork.py
index 9f934c036d4..19e8534db9f 100644
--- a/src/ethereum/forks/prague/fork.py
+++ b/src/ethereum/forks/prague/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Tuple
+from typing import Final, List, Optional, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
@@ -27,7 +27,13 @@
     InvalidSenderError,
     NonceMismatchError,
 )
-from ethereum.state import EMPTY_CODE_HASH, Account, Address
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt, Withdrawal, encode_receipt
@@ -50,19 +56,19 @@
     compute_requests_hash,
     parse_deposit_requests,
 )
-from .state import (
-    State,
-    TransientStorage,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
+    create_ether,
     destroy_account,
+    extract_block_diff,
     get_account,
     get_code,
+    incorporate_tx_into_block,
     increment_nonce,
-    modify_state,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
-    AccessListTransaction,
     BlobTransaction,
     FeeMarketTransaction,
     LegacyTransaction,
@@ -71,15 +77,16 @@
     decode_transaction,
     encode_transaction,
     get_transaction_hash,
+    has_access_list,
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.hexadecimal import hex_to_address
 from .utils.message import prepare_message
 from .vm import Message
 from .vm.eoa_delegation import is_valid_delegation
 from .vm.gas import (
+    GasCosts,
     calculate_blob_gas_price,
     calculate_data_fee,
     calculate_excess_blob_gas,
@@ -89,15 +96,13 @@
 
 BASE_FEE_MAX_CHANGE_DENOMINATOR = Uint(8)
 ELASTICITY_MULTIPLIER = Uint(2)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 SYSTEM_ADDRESS = hex_to_address("0xfffffffffffffffffffffffffffffffffffffffe")
 BEACON_ROOTS_ADDRESS = hex_to_address(
     "0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02"
 )
 SYSTEM_TRANSACTION_GAS = Uint(30000000)
-MAX_BLOB_GAS_PER_BLOCK = U64(1179648)
+MAX_BLOB_GAS_PER_BLOCK: Final[U64] = U64(1179648)
 VERSIONED_HASH_VERSION_KZG = b"\x01"
 
 WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS = hex_to_address(
@@ -111,6 +116,7 @@
 )
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -213,9 +219,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block.ommers != ():
         raise InvalidBlock
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -232,7 +240,10 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         withdrawals=block.withdrawals,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes, block_diff.storage_changes
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -258,6 +269,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if requests_hash != block.header.requests_hash:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -389,6 +401,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Tuple[Address, Uint, Tuple[VersionedHash, ...], U64]:
     """
     Check if the transaction is includable in the block.
@@ -401,6 +414,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -457,7 +472,7 @@ def check_transaction(
         raise BlobGasLimitExceededError("blob gas limit exceeded")
 
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     if isinstance(
         tx, (FeeMarketTransaction, BlobTransaction, SetCodeTransaction)
@@ -520,7 +535,7 @@ def check_transaction(
 
     if Uint(sender_account.balance) < max_gas_fee + Uint(tx.value):
         raise InsufficientBalanceError("insufficient sender balance")
-    sender_code = get_code(block_env.state, sender_account.code_hash)
+    sender_code = get_code(tx_state, sender_account.code_hash)
     if sender_account.code_hash != EMPTY_CODE_HASH and not is_valid_delegation(
         sender_code
     ):
@@ -571,74 +586,6 @@ def make_receipt(
     return encode_receipt(tx, receipt)
 
 
-def process_system_transaction(
-    block_env: vm.BlockEnvironment,
-    target_address: Address,
-    system_contract_code: Bytes,
-    data: Bytes,
-) -> MessageCallOutput:
-    """
-    Process a system transaction with the given code.
-
-    Prefer calling `process_checked_system_transaction` or
-    `process_unchecked_system_transaction` depending on whether missing code or
-    an execution error should cause the block to be rejected.
-
-    Parameters
-    ----------
-    block_env :
-        The block scoped environment.
-    target_address :
-        Address of the contract to call.
-    system_contract_code :
-        Code of the contract to call.
-    data :
-        Data to pass to the contract.
-
-    Returns
-    -------
-    system_tx_output : `MessageCallOutput`
-        Output of processing the system transaction.
-
-    """
-    tx_env = vm.TransactionEnvironment(
-        origin=SYSTEM_ADDRESS,
-        gas_price=block_env.base_fee_per_gas,
-        gas=SYSTEM_TRANSACTION_GAS,
-        access_list_addresses=set(),
-        access_list_storage_keys=set(),
-        transient_storage=TransientStorage(),
-        blob_versioned_hashes=(),
-        authorizations=(),
-        index_in_block=None,
-        tx_hash=None,
-    )
-
-    system_tx_message = Message(
-        block_env=block_env,
-        tx_env=tx_env,
-        caller=SYSTEM_ADDRESS,
-        target=target_address,
-        gas=SYSTEM_TRANSACTION_GAS,
-        value=U256(0),
-        data=data,
-        code=system_contract_code,
-        depth=Uint(0),
-        current_target=target_address,
-        code_address=target_address,
-        should_transfer_value=False,
-        is_static=False,
-        accessed_addresses=set(),
-        accessed_storage_keys=set(),
-        disable_precompiles=False,
-        parent_evm=None,
-    )
-
-    system_tx_output = process_message_call(system_tx_message)
-
-    return system_tx_output
-
-
 def process_checked_system_transaction(
     block_env: vm.BlockEnvironment,
     target_address: Address,
@@ -663,9 +610,18 @@ def process_checked_system_transaction(
         Output of processing the system transaction.
 
     """
+    # Pre-check that the system contract has code. We use a throwaway
+    # TransactionState here that is *never* propagated back to BlockState
+    # (no incorporate_tx_into_block call); the same get_account / get_code
+    # lookups are performed and properly tracked by
+    # process_unchecked_system_transaction below, which this function
+    # always calls. Reading via a TransactionState (rather than directly
+    # against pre_state) lets us see system contracts deployed earlier in
+    # the same block — see EIP-7002 and EIP-7251 for this edge case.
+    untracked_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        untracked_state,
+        get_account(untracked_state, target_address).code_hash,
     )
 
     if len(system_contract_code) == 0:
@@ -674,10 +630,9 @@ def process_checked_system_transaction(
             "contain code"
         )
 
-    system_tx_output = process_system_transaction(
+    system_tx_output = process_unchecked_system_transaction(
         block_env,
         target_address,
-        system_contract_code,
         data,
     )
 
@@ -696,8 +651,8 @@ def process_unchecked_system_transaction(
     data: Bytes,
 ) -> MessageCallOutput:
     """
-    Process a system transaction without checking if the contract contains code
-    or if the transaction fails.
+    Process a system transaction without checking if the contract contains
+    code or if the transaction fails.
 
     Parameters
     ----------
@@ -714,17 +669,51 @@ def process_unchecked_system_transaction(
         Output of processing the system transaction.
 
     """
+    system_tx_state = TransactionState(parent=block_env.state)
     system_contract_code = get_code(
-        block_env.state,
-        get_account(block_env.state, target_address).code_hash,
+        system_tx_state,
+        get_account(system_tx_state, target_address).code_hash,
     )
-    return process_system_transaction(
-        block_env,
-        target_address,
-        system_contract_code,
-        data,
+
+    tx_env = vm.TransactionEnvironment(
+        origin=SYSTEM_ADDRESS,
+        gas_price=block_env.base_fee_per_gas,
+        gas=SYSTEM_TRANSACTION_GAS,
+        access_list_addresses=set(),
+        access_list_storage_keys=set(),
+        state=system_tx_state,
+        blob_versioned_hashes=(),
+        authorizations=(),
+        index_in_block=None,
+        tx_hash=None,
     )
 
+    system_tx_message = Message(
+        block_env=block_env,
+        tx_env=tx_env,
+        caller=SYSTEM_ADDRESS,
+        target=target_address,
+        gas=SYSTEM_TRANSACTION_GAS,
+        value=U256(0),
+        data=data,
+        code=system_contract_code,
+        depth=Uint(0),
+        current_target=target_address,
+        code_address=target_address,
+        should_transfer_value=False,
+        is_static=False,
+        accessed_addresses=set(),
+        accessed_storage_keys=set(),
+        disable_precompiles=False,
+        parent_evm=None,
+    )
+
+    system_tx_output = process_message_call(system_tx_message)
+
+    incorporate_tx_into_block(system_tx_state)
+
+    return system_tx_output
+
 
 def apply_body(
     block_env: vm.BlockEnvironment,
@@ -858,6 +847,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(
         block_output.transactions_trie,
         rlp.encode(index),
@@ -875,9 +866,10 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     if isinstance(tx, BlobTransaction):
         blob_gas_fee = calculate_data_fee(block_env.excess_blob_gas, tx)
@@ -887,27 +879,17 @@ def process_transaction(
     effective_gas_fee = tx.gas * effective_gas_price
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     sender_balance_after_gas_fee = (
         Uint(sender_account.balance) - effective_gas_fee - blob_gas_fee
     )
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     access_list_addresses = set()
     access_list_storage_keys = set()
     access_list_addresses.add(block_env.coinbase)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
             access_list_addresses.add(access.account)
             for slot in access.slots:
@@ -923,7 +905,7 @@ def process_transaction(
         gas=gas,
         access_list_addresses=access_list_addresses,
         access_list_storage_keys=access_list_storage_keys,
-        transient_storage=TransientStorage(),
+        state=tx_state,
         blob_versioned_hashes=blob_versioned_hashes,
         authorizations=authorizations,
         index_in_block=index,
@@ -956,23 +938,13 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * priority_fee_per_gas
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
-    coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
-    ).balance + U256(transaction_fee)
-    set_account_balance(
-        block_env.state,
-        block_env.coinbase,
-        coinbase_balance_after_mining_fee,
-    )
+    create_ether(tx_state, block_env.coinbase, U256(transaction_fee))
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
     block_output.block_gas_used += tx_gas_used_after_refund
     block_output.blob_gas_used += tx_blob_gas_used
@@ -992,6 +964,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def process_withdrawals(
     block_env: vm.BlockEnvironment,
@@ -1001,9 +975,7 @@ def process_withdrawals(
     """
     Increase the balance of the withdrawing account.
     """
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += wd.amount * U256(10**9)
+    wd_state = TransactionState(parent=block_env.state)
 
     for i, wd in enumerate(withdrawals):
         trie_set(
@@ -1012,7 +984,9 @@ def increase_recipient_balance(recipient: Account) -> None:
             rlp.encode(wd),
         )
 
-        modify_state(block_env.state, wd.address, increase_recipient_balance)
+        create_ether(wd_state, wd.address, wd.amount * U256(10**9))
+
+    incorporate_tx_into_block(wd_state)
 
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
@@ -1021,14 +995,14 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
-    passed through as a parameter is greater than or equal to the *sum* of
-    the parent's gas and the adjustment delta then the limit for gas is too
-    high and fails this function's check. Similarly, if the limit is less
-    than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
-    check fails because the gas limit doesn't allow for a sufficient or
-    reasonable amount of gas to be used on a block.
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is passed
+    through as a parameter is greater than or equal to the *sum* of the
+    parent's gas and the adjustment delta then the limit for gas is too high
+    and fails this function's check. Similarly, if the limit is less than or
+    equal to the *difference* of the parent's gas and the adjustment delta *or*
+    the predefined ``LIMIT_MINIMUM`` then this function's check fails because
+    the gas limit doesn't allow for a sufficient or reasonable amount of gas to
+    be used on a block.
 
     Parameters
     ----------
@@ -1044,12 +1018,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/prague/fork_types.py b/src/ethereum/forks/prague/fork_types.py
index c598e9876bf..4bec34810db 100644
--- a/src/ethereum/forks/prague/fork_types.py
+++ b/src/ethereum/forks/prague/fork_types.py
@@ -12,6 +12,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes256
@@ -43,6 +44,7 @@ def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Authorization:
diff --git a/src/ethereum/forks/prague/requests.py b/src/ethereum/forks/prague/requests.py
index 542c9264d37..c0e624ae62b 100644
--- a/src/ethereum/forks/prague/requests.py
+++ b/src/ethereum/forks/prague/requests.py
@@ -1,11 +1,31 @@
 """
-Requests were introduced in EIP-7685 as a general purpose framework for
-storing contract-triggered requests. It extends the execution header and
-body with a single field each to store the request information.
-This inherently exposes the requests to the consensus layer, which can
-then process each one.
-
+[EIP-7685] generalizes how the execution layer communicates validator actions
+to the consensus layer. Rather than adding a dedicated header field for each
+new action type (as [EIP-4895] did for withdrawals), the execution header
+commits to a single [`requests_hash`][rh] that aggregates an ordered list of
+typed requests.
+
+Each request is a type byte (see [`DEPOSIT_REQUEST_TYPE`][dt],
+[`WITHDRAWAL_REQUEST_TYPE`][wt], and [`CONSOLIDATION_REQUEST_TYPE`][ct])
+followed by an opaque payload. Deposit requests are discovered by scanning
+transaction receipts for logs emitted by the deposit contract; withdrawal
+and consolidation requests are produced by the corresponding system
+contracts during block processing.
+
+See [`parse_deposit_requests`][pd] for how deposit logs become request data,
+[`compute_requests_hash`][crh] for how the list is hashed for inclusion in the
+header, and [`process_general_purpose_requests`][pgpr] for how the requests are
+processed.
+
+[EIP-4895]: https://eips.ethereum.org/EIPS/eip-4895
 [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+[rh]: ref:ethereum.forks.prague.blocks.Header.requests_hash
+[dt]: ref:ethereum.forks.prague.requests.DEPOSIT_REQUEST_TYPE
+[wt]: ref:ethereum.forks.prague.requests.WITHDRAWAL_REQUEST_TYPE
+[ct]: ref:ethereum.forks.prague.requests.CONSOLIDATION_REQUEST_TYPE
+[pd]: ref:ethereum.forks.prague.requests.parse_deposit_requests
+[crh]: ref:ethereum.forks.prague.requests.compute_requests_hash
+[pgpr]: ref:ethereum.forks.prague.fork.process_general_purpose_requests
 """
 
 from hashlib import sha256
@@ -15,48 +35,133 @@
 from ethereum_types.numeric import Uint, ulen
 
 from ethereum.exceptions import InvalidBlock
+from ethereum.merkle_patricia_trie import trie_get
 from ethereum.utils.hexadecimal import hex_to_bytes32
 
 from .blocks import decode_receipt
-from .trie import trie_get
 from .utils.hexadecimal import hex_to_address
 from .vm import BlockOutput
 
 DEPOSIT_CONTRACT_ADDRESS = hex_to_address(
     "0x00000000219ab540356cbb839cbe05303d7705fa"
 )
+"""
+Mainnet address of the beacon chain deposit contract. Scanning block
+receipts for logs emitted by this address is how the execution layer
+discovers validator deposits, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 DEPOSIT_EVENT_SIGNATURE_HASH = hex_to_bytes32(
     "0x649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c5"
 )
+"""
+First [log topic] of the deposit contract's `DepositEvent`, equal to the
+keccak256 of its Solidity event signature. Logs whose first topic does not
+match this are ignored when collecting deposit requests.
+
+[log topic]: https://docs.soliditylang.org/en/latest/abi-spec.html#events
+"""
+
 DEPOSIT_REQUEST_TYPE = b"\x00"
+"""
+Request type byte identifying a deposit request, per [EIP-6110].
+
+[EIP-6110]: https://eips.ethereum.org/EIPS/eip-6110
+"""
+
 WITHDRAWAL_REQUEST_TYPE = b"\x01"
+"""
+Request type byte identifying an execution-triggered withdrawal request,
+per [EIP-7002].
+
+[EIP-7002]: https://eips.ethereum.org/EIPS/eip-7002
+"""
+
 CONSOLIDATION_REQUEST_TYPE = b"\x02"
+"""
+Request type byte identifying a consolidation request, per [EIP-7251].
+
+[EIP-7251]: https://eips.ethereum.org/EIPS/eip-7251
+"""
 
 
 DEPOSIT_EVENT_LENGTH = Uint(576)
+"""
+Total length in bytes of the ABI-encoded `DepositEvent` data payload. Every
+well-formed event has this exact length.
+"""
 
 PUBKEY_OFFSET = Uint(160)
+"""
+Position within the event payload of the validator public key's length
+prefix, as emitted by the Solidity ABI encoder.
+"""
+
 WITHDRAWAL_CREDENTIALS_OFFSET = Uint(256)
+"""
+Position within the event payload of the withdrawal credentials' length
+prefix.
+"""
+
 AMOUNT_OFFSET = Uint(320)
+"""
+Position within the event payload of the deposit amount's length prefix.
+"""
+
 SIGNATURE_OFFSET = Uint(384)
+"""
+Position within the event payload of the deposit signature's length prefix.
+"""
+
 INDEX_OFFSET = Uint(512)
+"""
+Position within the event payload of the deposit index's length prefix.
+"""
 
 PUBKEY_SIZE = Uint(48)
+"""
+Length of the BLS12-381 public key that identifies the validator receiving
+the deposit.
+"""
+
 WITHDRAWAL_CREDENTIALS_SIZE = Uint(32)
+"""
+Length of the withdrawal credentials, which determine where the staked
+ether may eventually be withdrawn.
+"""
+
 AMOUNT_SIZE = Uint(8)
+"""
+Length of the little-endian Gwei amount being deposited.
+"""
+
 SIGNATURE_SIZE = Uint(96)
+"""
+Length of the BLS12-381 signature over the deposit message.
+"""
+
 INDEX_SIZE = Uint(8)
+"""
+Length of the monotonically-increasing deposit index assigned by the
+deposit contract when it emits the event.
+"""
 
 
 def extract_deposit_data(data: Bytes) -> Bytes:
     """
-    Extracts Deposit Request from the DepositContract.DepositEvent data.
+    Strip the Solidity ABI framing from a `DepositEvent` payload and return
+    the concatenated raw fields in the order consumed by the consensus
+    layer: public key, withdrawal credentials, amount, signature, and
+    deposit index.
 
-    Raises
-    ------
-    InvalidBlock :
-        If the deposit contract did not produce a valid log.
+    Because each field has a fixed length, every well-formed event has an
+    identical byte layout. Any deviation indicates a misbehaving or
+    compromised deposit contract, so this function raises [`InvalidBlock`]
+    rather than silently accepting unexpected data.
 
+    [`InvalidBlock`]: ref:ethereum.exceptions.InvalidBlock
     """
     if ulen(data) != DEPOSIT_EVENT_LENGTH:
         raise InvalidBlock("Invalid deposit event data length")
@@ -150,7 +255,19 @@ def extract_deposit_data(data: Bytes) -> Bytes:
 
 def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
     """
-    Parse deposit requests from the block output.
+    Walk the receipts produced during block execution, concatenating the
+    raw payload of every valid deposit event into a single byte string.
+
+    A log is considered a deposit when it originates from
+    [`DEPOSIT_CONTRACT_ADDRESS`][addr] and its first topic matches
+    [`DEPOSIT_EVENT_SIGNATURE_HASH`][sig]. The returned bytes are the
+    direct concatenation of the unframed deposit fields, ready to be
+    prefixed with [`DEPOSIT_REQUEST_TYPE`][dt] before being appended to
+    the block's request list.
+
+    [addr]: ref:ethereum.forks.prague.requests.DEPOSIT_CONTRACT_ADDRESS
+    [sig]: ref:ethereum.forks.prague.requests.DEPOSIT_EVENT_SIGNATURE_HASH
+    [dt]: ref:ethereum.forks.prague.requests.DEPOSIT_REQUEST_TYPE
     """
     deposit_requests: Bytes = b""
     for key in block_output.receipt_keys:
@@ -171,18 +288,18 @@ def parse_deposit_requests(block_output: BlockOutput) -> Bytes:
 
 def compute_requests_hash(requests: List[Bytes]) -> Bytes:
     """
-    Get the hash of the requests using the SHA2-256 algorithm.
-
-    Parameters
-    ----------
-    requests : Bytes
-        The requests to hash.
-
-    Returns
-    -------
-    requests_hash : Bytes
-        The hash of the requests.
-
+    Compute the [SHA2-256] commitment over an ordered list of
+    type-prefixed requests, as defined by [EIP-7685].
+
+    The commitment is the SHA2-256 hash of the concatenation of the
+    SHA2-256 hashes of each individual request. This is what the
+    execution header's [`requests_hash`][rh] stores, and what the
+    consensus layer re-derives to validate that both layers observed the
+    same set of requests.
+
+    [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685
+    [SHA2-256]: https://en.wikipedia.org/wiki/SHA-2
+    [rh]: ref:ethereum.forks.prague.blocks.Header.requests_hash
     """
     m = sha256()
     for request in requests:
diff --git a/src/ethereum/forks/prague/state.py b/src/ethereum/forks/prague/state.py
deleted file mode 100644
index 342bda1a1cd..00000000000
--- a/src/ethereum/forks/prague/state.py
+++ /dev/null
@@ -1,713 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-from ethereum.state import (
-    EMPTY_ACCOUNT,
-    EMPTY_CODE_HASH,
-    Account,
-    Address,
-    Root,
-)
-
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-    def get_code(self, code_hash: Hash32) -> Bytes:
-        """
-        Get the bytecode for a given code hash.
-
-        Return ``b""`` for ``EMPTY_CODE_HASH``.
-        """
-        if code_hash == EMPTY_CODE_HASH:
-            return b""
-        return self._code_store[code_hash]
-
-
-@dataclass
-class TransientStorage:
-    """
-    Contains all information that is preserved between message calls
-    within a transaction.
-    """
-
-    _tries: Dict[Address, Trie[Bytes32, U256]] = field(default_factory=dict)
-    _snapshots: List[Dict[Address, Trie[Bytes32, U256]]] = field(
-        default_factory=list
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-
-
-def begin_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-    transient_storage._snapshots.append(
-        {k: copy_trie(t) for (k, t) in transient_storage._tries.items()}
-    )
-
-
-def commit_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._snapshots.pop()
-
-
-def rollback_transaction(
-    state: State, transient_storage: TransientStorage
-) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-    transient_storage : TransientStorage
-        The transient storage of the transaction.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-    transient_storage._tries = transient_storage._snapshots.pop()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-
-    Return ``b""`` for ``EMPTY_CODE_HASH``.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State`` and return its hash.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase, and to respect the constraints added to SELFDESTRUCT by
-    EIP-6780.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`. If, after modification, the account
-    exists and has zero nonce, empty code, and zero balance, it is destroyed.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-    account = get_account_optional(state, address)
-    account_exists_and_is_empty = (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-    if account_exists_and_is_empty:
-        destroy_account(state, address)
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
-
-
-def get_transient_storage(
-    transient_storage: TransientStorage, address: Address, key: Bytes32
-) -> U256:
-    """
-    Get a value at a storage key on an account from transient storage.
-    Returns `U256(0)` if the storage key has not been set previously.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_transient_storage(
-    transient_storage: TransientStorage,
-    address: Address,
-    key: Bytes32,
-    value: U256,
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    transient_storage: `TransientStorage`
-        The transient storage
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    trie = transient_storage._tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        transient_storage._tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del transient_storage._tries[address]
diff --git a/src/ethereum/forks/prague/state_tracker.py b/src/ethereum/forks/prague/state_tracker.py
new file mode 100644
index 00000000000..67ceaa86321
--- /dev/null
+++ b/src/ethereum/forks/prague/state_tracker.py
@@ -0,0 +1,749 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state. If, after modification, the
+    account exists and has zero nonce, empty code, and zero balance, it
+    is destroyed.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+    if account_exists_and_is_empty(tx_state, address):
+        destroy_account(tx_state, address)
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+    )
diff --git a/src/ethereum/forks/prague/transactions.py b/src/ethereum/forks/prague/transactions.py
index 31a2b441616..b85dfd6536f 100644
--- a/src/ethereum/forks/prague/transactions.py
+++ b/src/ethereum/forks/prague/transactions.py
@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, TypeGuard, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -24,44 +24,8 @@
 from .exceptions import InitCodeTooLargeError, TransactionTypeError
 from .fork_types import Authorization, VersionedHash
 
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_TOKEN_FLOOR = Uint(10)
-"""
-Minimum gas cost per byte of calldata as per [EIP-7623]. Used to calculate
-the minimum gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_DATA_TOKEN_STANDARD = Uint(4)
-"""
-Gas cost per byte of calldata as per [EIP-7623]. Used to calculate the
-gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
-
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
-"""
-
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
-"""
-
 
+@final
 @slotted_freezable
 @dataclass
 class LegacyTransaction:
@@ -124,6 +88,7 @@ class LegacyTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Access:
@@ -143,6 +108,7 @@ class Access:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccessListTransaction:
@@ -215,6 +181,7 @@ class AccessListTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class FeeMarketTransaction:
@@ -292,6 +259,7 @@ class FeeMarketTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class BlobTransaction:
@@ -380,6 +348,7 @@ class BlobTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class SetCodeTransaction:
@@ -475,6 +444,23 @@ class SetCodeTransaction:
 """
 
 
+AccessListCapableTransaction = (
+    AccessListTransaction
+    | FeeMarketTransaction
+    | BlobTransaction
+    | SetCodeTransaction
+)
+"""
+Transaction types that include an [EIP-2930]-style access list.
+
+See [`has_access_list`][hal] and [`Access`][a] for more details.
+
+[EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+[hal]: ref:ethereum.forks.amsterdam.transactions.has_access_list
+[a]: ref:ethereum.forks.amsterdam.transactions.Access
+"""
+
+
 def encode_transaction(tx: Transaction) -> LegacyTransaction | Bytes:
     """
     Encode a transaction into its RLP or typed transaction format.
@@ -576,7 +562,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
     4. Cost for access list entries (if applicable)
@@ -587,8 +573,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     gas cost of the transaction and the minimum gas cost used by the
     transaction based on the calldata size.
     """
-    from .vm.eoa_delegation import GAS_AUTH_PER_EMPTY_ACCOUNT
-    from .vm.gas import init_code_cost
+    from .vm.gas import GasCosts, init_code_cost
 
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
@@ -596,39 +581,33 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
     tokens_in_calldata = num_zeros + num_non_zeros * Uint(4)
     # EIP-7623 floor price (note: no EVM costs)
     calldata_floor_gas_cost = (
-        tokens_in_calldata * GAS_TX_DATA_TOKEN_FLOOR + GAS_TX_BASE
+        tokens_in_calldata * GasCosts.TX_DATA_TOKEN_FLOOR + GasCosts.TX_BASE
     )
 
-    data_cost = tokens_in_calldata * GAS_TX_DATA_TOKEN_STANDARD
+    data_cost = tokens_in_calldata * GasCosts.TX_DATA_TOKEN_STANDARD
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE + init_code_cost(ulen(tx.data))
+        create_cost = GasCosts.TX_CREATE + init_code_cost(ulen(tx.data))
     else:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
-    if isinstance(
-        tx,
-        (
-            AccessListTransaction,
-            FeeMarketTransaction,
-            BlobTransaction,
-            SetCodeTransaction,
-        ),
-    ):
+    if has_access_list(tx):
         for access in tx.access_list:
-            access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_cost += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
 
     auth_cost = Uint(0)
     if isinstance(tx, SetCodeTransaction):
-        auth_cost += Uint(GAS_AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations))
+        auth_cost += Uint(
+            GasCosts.AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations)
+        )
 
     return (
         Uint(
-            GAS_TX_BASE
+            GasCosts.TX_BASE
             + data_cost
             + create_cost
             + access_list_cost
@@ -876,3 +855,17 @@ def get_transaction_hash(tx: Bytes | LegacyTransaction) -> Hash32:
         return keccak256(rlp.encode(tx))
     else:
         return keccak256(tx)
+
+
+def has_access_list(
+    tx: Transaction,
+) -> TypeGuard[AccessListCapableTransaction]:
+    """
+    Return whether the transaction has an [EIP-2930]-style access list.
+
+    [EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930
+    """
+    return isinstance(
+        tx,
+        AccessListCapableTransaction,
+    )
diff --git a/src/ethereum/forks/prague/trie.py b/src/ethereum/forks/prague/trie.py
deleted file mode 100644
index fd43ae154dc..00000000000
--- a/src/ethereum/forks/prague/trie.py
+++ /dev/null
@@ -1,509 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-from typing_extensions import assert_type
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.cancun import trie as previous_trie
-from ethereum.state import Account, Address, Root
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt, Withdrawal
-from .fork_types import encode_account
-from .transactions import LegacyTransaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = (
-    Account
-    | Bytes
-    | LegacyTransaction
-    | Receipt
-    | Uint
-    | U256
-    | Withdrawal
-    | None
-)
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[LegacyTransaction | Bytes],
-    Optional[Receipt | Bytes],
-    Optional[Withdrawal | Bytes],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `Extended`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (LegacyTransaction, Receipt, Withdrawal, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/prague/utils/message.py b/src/ethereum/forks/prague/utils/message.py
index bce79e84019..08e3bb77ac6 100644
--- a/src/ethereum/forks/prague/utils/message.py
+++ b/src/ethereum/forks/prague/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
@@ -55,7 +55,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -63,8 +63,9 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        state = block_env.state
-        code = get_code(state, get_account(state, tx.to).code_hash)
+        code = get_code(
+            tx_env.state, get_account(tx_env.state, tx.to).code_hash
+        )
         code_address = tx.to
     else:
         raise AssertionError("Target must be address or empty bytes")
diff --git a/src/ethereum/forks/prague/vm/__init__.py b/src/ethereum/forks/prague/vm/__init__.py
index 37d0a327974..42229ebd849 100644
--- a/src/ethereum/forks/prague/vm/__init__.py
+++ b/src/ethereum/forks/prague/vm/__init__.py
@@ -13,24 +13,25 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt, Withdrawal
 from ..fork_types import Authorization, VersionedHash
-from ..state import State, TransientStorage
+from ..state_tracker import BlockState, TransactionState
 from ..transactions import LegacyTransaction
-from ..trie import Trie
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +39,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -50,6 +51,7 @@ class BlockEnvironment:
     parent_beacon_block_root: Hash32
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -92,10 +94,11 @@ class BlockOutput:
     requests: List[Bytes] = field(default_factory=list)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
@@ -103,13 +106,14 @@ class TransactionEnvironment:
     gas: Uint
     access_list_addresses: Set[Address]
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
-    transient_storage: TransientStorage
+    state: TransactionState
     blob_versioned_hashes: Tuple[VersionedHash, ...]
     authorizations: Tuple[Authorization, ...]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -135,6 +139,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
diff --git a/src/ethereum/forks/prague/vm/eoa_delegation.py b/src/ethereum/forks/prague/vm/eoa_delegation.py
index fce580bee4a..1ba552f8dd6 100644
--- a/src/ethereum/forks/prague/vm/eoa_delegation.py
+++ b/src/ethereum/forks/prague/vm/eoa_delegation.py
@@ -14,7 +14,7 @@
 from ethereum.state import Address
 
 from ..fork_types import Authorization
-from ..state import (
+from ..state_tracker import (
     account_exists,
     get_account,
     get_code,
@@ -22,14 +22,13 @@
     set_code,
 )
 from ..utils.hexadecimal import hex_to_address
-from ..vm.gas import GAS_COLD_ACCOUNT_ACCESS, GAS_WARM_ACCESS
+from ..vm.gas import GasCosts
 from . import Evm, Message
 
 SET_CODE_TX_MAGIC = b"\x05"
 EOA_DELEGATION_MARKER = b"\xef\x01\x00"
 EOA_DELEGATION_MARKER_LENGTH = len(EOA_DELEGATION_MARKER)
 EOA_DELEGATED_CODE_LENGTH = 23
-GAS_AUTH_PER_EMPTY_ACCOUNT = 25000
 REFUND_AUTH_PER_EXISTING_ACCOUNT = 12500
 NULL_ADDRESS = hex_to_address("0x0000000000000000000000000000000000000000")
 
@@ -140,18 +139,18 @@ def access_delegation(
         The delegation address, code, and access gas cost.
 
     """
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
     if not is_valid_delegation(code):
         return False, address, code, Uint(0)
 
     address = Address(code[EOA_DELEGATION_MARKER_LENGTH:])
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
-    code = get_code(state, get_account(state, address).code_hash)
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     return True, address, code, access_gas_cost
 
@@ -171,7 +170,7 @@ def set_delegation(message: Message) -> U256:
         Refund from authority which already exists in state.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     for auth in message.tx_env.authorizations:
         if auth.chain_id not in (message.block_env.chain_id, U256(0)):
@@ -187,8 +186,8 @@ def set_delegation(message: Message) -> U256:
 
         message.accessed_addresses.add(authority)
 
-        authority_account = get_account(state, authority)
-        authority_code = get_code(state, authority_account.code_hash)
+        authority_account = get_account(tx_state, authority)
+        authority_code = get_code(tx_state, authority_account.code_hash)
 
         if authority_code and not is_valid_delegation(authority_code):
             continue
@@ -197,24 +196,25 @@ def set_delegation(message: Message) -> U256:
         if authority_nonce != auth.nonce:
             continue
 
-        if account_exists(state, authority):
+        if account_exists(tx_state, authority):
             refund_counter += U256(
-                GAS_AUTH_PER_EMPTY_ACCOUNT - REFUND_AUTH_PER_EXISTING_ACCOUNT
+                GasCosts.AUTH_PER_EMPTY_ACCOUNT
+                - REFUND_AUTH_PER_EXISTING_ACCOUNT
             )
 
         if auth.address == NULL_ADDRESS:
             code_to_set = b""
         else:
             code_to_set = EOA_DELEGATION_MARKER + auth.address
-        set_code(state, authority, code_to_set)
+        set_code(tx_state, authority, code_to_set)
 
-        increment_nonce(state, authority)
+        increment_nonce(tx_state, authority)
 
     if message.code_address is None:
         raise InvalidBlock("Invalid type 4 transaction: no target")
 
     message.code = get_code(
-        state, get_account(state, message.code_address).code_hash
+        tx_state, get_account(tx_state, message.code_address).code_hash
     )
 
     return refund_counter
diff --git a/src/ethereum/forks/prague/vm/gas.py b/src/ethereum/forks/prague/vm/gas.py
index ed1f651e23c..d1c7d94b649 100644
--- a/src/ethereum/forks/prague/vm/gas.py
+++ b/src/ethereum/forks/prague/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U64, U256, Uint
+from ethereum_types.numeric import U64, U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32, taylor_exponential
@@ -24,63 +24,167 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 4800
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-GAS_ECRECOVER = Uint(3000)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1)
-GAS_COLD_SLOAD = Uint(2100)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600)
-GAS_WARM_ACCESS = Uint(100)
-GAS_CODE_INIT_PER_WORD = Uint(2)
-GAS_BLOBHASH_OPCODE = Uint(3)
-GAS_POINT_EVALUATION = Uint(50000)
-
-GAS_PER_BLOB = U64(2**17)
-BLOB_TARGET_GAS_PER_BLOCK = U64(786432)
-BLOB_MIN_GASPRICE = Uint(1)
-BLOB_BASE_FEE_UPDATE_FRACTION = Uint(5007716)
-
-GAS_BLS_G1_ADD = Uint(375)
-GAS_BLS_G1_MUL = Uint(12000)
-GAS_BLS_G1_MAP = Uint(5500)
-GAS_BLS_G2_ADD = Uint(600)
-GAS_BLS_G2_MUL = Uint(22500)
-GAS_BLS_G2_MAP = Uint(23800)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    WARM_ACCESS: Final[Uint] = Uint(100)
+    COLD_ACCOUNT_ACCESS: Final[Uint] = Uint(2600)
+    COLD_STORAGE_ACCESS: Final[Uint] = Uint(2100)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+    CODE_INIT_PER_WORD: Final[Uint] = Uint(2)
+
+    # Authorization
+    AUTH_PER_EMPTY_ACCOUNT: Final[int] = 25000
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 4800
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1)
+    PRECOMPILE_POINT_EVALUATION: Final[Uint] = Uint(50000)
+    PRECOMPILE_BLS_G1ADD: Final[Uint] = Uint(375)
+    PRECOMPILE_BLS_G1MUL: Final[Uint] = Uint(12000)
+    PRECOMPILE_BLS_G1MAP: Final[Uint] = Uint(5500)
+    PRECOMPILE_BLS_G2ADD: Final[Uint] = Uint(600)
+    PRECOMPILE_BLS_G2MUL: Final[Uint] = Uint(22500)
+    PRECOMPILE_BLS_G2MAP: Final[Uint] = Uint(23800)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000)
+
+    # Blobs
+    PER_BLOB: Final[U64] = U64(2**17)
+    BLOB_TARGET_GAS_PER_BLOCK: Final[U64] = U64(786432)
+    BLOB_MIN_GASPRICE: Final[Uint] = Uint(1)
+    BLOB_BASE_FEE_UPDATE_FRACTION: Final[Uint] = Uint(5007716)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_TOKEN_STANDARD: Final[Uint] = Uint(4)
+    TX_DATA_TOKEN_FLOOR: Final[Uint] = Uint(10)
+    TX_ACCESS_LIST_ADDRESS: Final[Uint] = Uint(2400)
+    TX_ACCESS_LIST_STORAGE_KEY: Final[Uint] = Uint(1900)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_PREVRANDAO: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_BASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBBASEFEE: Final[Uint] = BASE
+    OPCODE_BLOBHASH: Final[Uint] = Uint(3)
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_PUSH0: Final[Uint] = BASE
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MCOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -96,11 +200,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -152,7 +257,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -182,7 +287,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -207,7 +312,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
@@ -279,7 +384,7 @@ def init_code_cost(init_code_length: Uint) -> Uint:
         The gas to be charged for the init code.
 
     """
-    return GAS_CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
+    return GasCosts.CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
 
 
 def calculate_excess_blob_gas(parent_header: Header) -> U64:
@@ -308,10 +413,10 @@ def calculate_excess_blob_gas(parent_header: Header) -> U64:
         blob_gas_used = parent_header.blob_gas_used
 
     parent_blob_gas = excess_blob_gas + blob_gas_used
-    if parent_blob_gas < BLOB_TARGET_GAS_PER_BLOCK:
+    if parent_blob_gas < GasCosts.BLOB_TARGET_GAS_PER_BLOCK:
         return U64(0)
 
-    return parent_blob_gas - BLOB_TARGET_GAS_PER_BLOCK
+    return parent_blob_gas - GasCosts.BLOB_TARGET_GAS_PER_BLOCK
 
 
 def calculate_total_blob_gas(tx: Transaction) -> U64:
@@ -330,7 +435,7 @@ def calculate_total_blob_gas(tx: Transaction) -> U64:
 
     """
     if isinstance(tx, BlobTransaction):
-        return GAS_PER_BLOB * U64(len(tx.blob_versioned_hashes))
+        return GasCosts.PER_BLOB * U64(len(tx.blob_versioned_hashes))
     else:
         return U64(0)
 
@@ -351,9 +456,9 @@ def calculate_blob_gas_price(excess_blob_gas: U64) -> Uint:
 
     """
     return taylor_exponential(
-        BLOB_MIN_GASPRICE,
+        GasCosts.BLOB_MIN_GASPRICE,
         Uint(excess_blob_gas),
-        BLOB_BASE_FEE_UPDATE_FRACTION,
+        GasCosts.BLOB_BASE_FEE_UPDATE_FRACTION,
     )
 
 
diff --git a/src/ethereum/forks/prague/vm/instructions/arithmetic.py b/src/ethereum/forks/prague/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/prague/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/prague/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/prague/vm/instructions/bitwise.py b/src/ethereum/forks/prague/vm/instructions/bitwise.py
index 41dabe8185b..1de6c615931 100644
--- a/src/ethereum/forks/prague/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/prague/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +172,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +202,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +232,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
diff --git a/src/ethereum/forks/prague/vm/instructions/block.py b/src/ethereum/forks/prague/vm/instructions/block.py
index b3bfb500a09..4c405ad5194 100644
--- a/src/ethereum/forks/prague/vm/instructions/block.py
+++ b/src/ethereum/forks/prague/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -40,7 +40,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -89,7 +89,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -123,7 +123,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -156,7 +156,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -189,7 +189,7 @@ def prev_randao(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PREVRANDAO)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.prev_randao))
@@ -222,7 +222,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -252,7 +252,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/prague/vm/instructions/comparison.py b/src/ethereum/forks/prague/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/prague/vm/instructions/comparison.py
+++ b/src/ethereum/forks/prague/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/prague/vm/instructions/control_flow.py b/src/ethereum/forks/prague/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/prague/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/prague/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/prague/vm/instructions/environment.py b/src/ethereum/forks/prague/vm/instructions/environment.py
index 5848530a960..b6bf713df27 100644
--- a/src/ethereum/forks/prague/vm/instructions/environment.py
+++ b/src/ethereum/forks/prague/vm/instructions/environment.py
@@ -17,20 +17,13 @@
 from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BASE,
-    GAS_BLOBHASH_OPCODE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_COPY,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
-    GAS_WARM_ACCESS,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_gas_extend_memory,
     charge_gas,
@@ -52,7 +45,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -76,14 +69,15 @@ def balance(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_addresses.add(address)
-        charge_gas(evm, GAS_COLD_ACCOUNT_ACCESS)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -106,7 +100,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -129,7 +123,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -152,7 +146,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -176,7 +170,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -201,7 +195,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -230,11 +224,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -259,7 +256,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -288,11 +285,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -317,7 +317,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -341,16 +341,16 @@ def extcodesize(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -377,23 +377,23 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
 
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost + copy_gas_cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -416,7 +416,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -442,11 +442,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -475,15 +480,15 @@ def extcodehash(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -510,12 +515,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
@@ -538,7 +543,7 @@ def base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BASEFEE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.base_fee_per_gas))
@@ -561,7 +566,7 @@ def blob_hash(evm: Evm) -> None:
     index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BLOBHASH_OPCODE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBHASH)
 
     # OPERATION
     if int(index) < len(evm.message.tx_env.blob_versioned_hashes):
@@ -588,7 +593,7 @@ def blob_base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BLOBBASEFEE)
 
     # OPERATION
     blob_base_fee = calculate_blob_gas_price(
diff --git a/src/ethereum/forks/prague/vm/instructions/keccak.py b/src/ethereum/forks/prague/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/prague/vm/instructions/keccak.py
+++ b/src/ethereum/forks/prague/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/prague/vm/instructions/log.py b/src/ethereum/forks/prague/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/prague/vm/instructions/log.py
+++ b/src/ethereum/forks/prague/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/prague/vm/instructions/memory.py b/src/ethereum/forks/prague/vm/instructions/memory.py
index 6e111051ee3..bba3ddf19d5 100644
--- a/src/ethereum/forks/prague/vm/instructions/memory.py
+++ b/src/ethereum/forks/prague/vm/instructions/memory.py
@@ -18,9 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_COPY,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -49,7 +47,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -80,7 +78,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -108,7 +106,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -135,7 +133,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
@@ -161,12 +159,15 @@ def mcopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(length)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
 
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(source, length), (destination, length)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_MCOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/prague/vm/instructions/stack.py b/src/ethereum/forks/prague/vm/instructions/stack.py
index 0007a28acd4..ce94af6ce8e 100644
--- a/src/ethereum/forks/prague/vm/instructions/stack.py
+++ b/src/ethereum/forks/prague/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -63,9 +67,9 @@ def push_n(evm: Evm, num_bytes: int) -> None:
 
     # GAS
     if num_bytes == 0:
-        charge_gas(evm, GAS_BASE)
+        charge_gas(evm, GasCosts.OPCODE_PUSH0)
     else:
-        charge_gas(evm, GAS_VERY_LOW)
+        charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -95,7 +99,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -127,7 +131,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -139,70 +143,70 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push0 = partial(push_n, num_bytes=0)
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push0: Callable[[Evm], None] = partial(push_n, num_bytes=0)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/prague/vm/instructions/storage.py b/src/ethereum/forks/prague/vm/instructions/storage.py
index 084d58cc46c..99dcce877dd 100644
--- a/src/ethereum/forks/prague/vm/instructions/storage.py
+++ b/src/ethereum/forks/prague/vm/instructions/storage.py
@@ -13,7 +13,7 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import (
+from ...state_tracker import (
     get_storage,
     get_storage_original,
     get_transient_storage,
@@ -23,12 +23,7 @@
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -50,15 +45,14 @@ def sload(evm: Evm) -> None:
 
     # GAS
     if (evm.message.current_target, key) in evm.accessed_storage_keys:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        charge_gas(evm, GAS_COLD_SLOAD)
+        charge_gas(evm, GasCosts.COLD_STORAGE_ACCESS)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -79,54 +73,60 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     gas_cost = Uint(0)
 
     if (evm.message.current_target, key) not in evm.accessed_storage_keys:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        gas_cost += GAS_COLD_SLOAD
+        gas_cost += GasCosts.COLD_STORAGE_ACCESS
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost += GAS_STORAGE_SET
+            gas_cost += GasCosts.STORAGE_SET
         else:
-            gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_SLOAD
+            gas_cost += (
+                GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
+            )
     else:
-        gas_cost += GAS_WARM_ACCESS
+        gas_cost += GasCosts.WARM_ACCESS
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
             # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
             # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
             # Storage slot being restored to its original value
             if original_value == 0:
                 # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_WARM_ACCESS)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.WARM_ACCESS
+                )
             else:
                 # Slot was originally non-empty and was UPDATED earlier
                 evm.refund_counter += int(
-                    GAS_STORAGE_UPDATE - GAS_COLD_SLOAD - GAS_WARM_ACCESS
+                    GasCosts.COLD_STORAGE_WRITE
+                    - GasCosts.COLD_STORAGE_ACCESS
+                    - GasCosts.WARM_ACCESS
                 )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
@@ -147,11 +147,11 @@ def tload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
 
     # OPERATION
     value = get_transient_storage(
-        evm.message.tx_env.transient_storage, evm.message.current_target, key
+        evm.message.tx_env.state, evm.message.current_target, key
     )
     push(evm.stack, value)
 
@@ -174,11 +174,11 @@ def tstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_WARM_ACCESS)
+    charge_gas(evm, GasCosts.WARM_ACCESS)
     if evm.message.is_static:
         raise WriteInStaticContext
     set_transient_storage(
-        evm.message.tx_env.transient_storage,
+        evm.message.tx_env.state,
         evm.message.current_target,
         key,
         new_value,
diff --git a/src/ethereum/forks/prague/vm/instructions/system.py b/src/ethereum/forks/prague/vm/instructions/system.py
index 29c3fe9e6e2..3fdfe3e4386 100644
--- a/src/ethereum/forks/prague/vm/instructions/system.py
+++ b/src/ethereum/forks/prague/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
     get_account,
@@ -40,15 +40,7 @@
 )
 from ..exceptions import OutOfGasError, Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -90,7 +82,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -104,15 +96,13 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -166,14 +156,16 @@ def create(evm: Evm) -> None:
     )
     init_code_gas = init_code_cost(Uint(memory_size))
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost + init_code_gas)
+    charge_gas(
+        evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost + init_code_gas
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -216,8 +208,8 @@ def create2(evm: Evm) -> None:
     init_code_gas = init_code_cost(Uint(memory_size))
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost
         + init_code_gas,
     )
@@ -261,7 +253,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -374,10 +366,10 @@ def call(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
@@ -388,10 +380,10 @@ def call(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -404,7 +396,7 @@ def call(evm: Evm) -> None:
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -463,10 +455,10 @@ def callcode(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -476,7 +468,7 @@ def callcode(evm: Evm) -> None:
     ) = access_delegation(evm, code_address)
     access_gas_cost += delegated_access_gas_cost
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -489,7 +481,7 @@ def callcode(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -531,19 +523,19 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if beneficiary not in evm.accessed_addresses:
         evm.accessed_addresses.add(beneficiary)
-        gas_cost += GAS_COLD_ACCOUNT_ACCESS
+        gas_cost += GasCosts.COLD_ACCOUNT_ACCESS
 
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -551,11 +543,11 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     move_ether(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         originator,
         beneficiary,
         originator_balance,
@@ -563,10 +555,10 @@ def selfdestruct(evm: Evm) -> None:
 
     # register account for deletion only if it was created
     # in the same transaction
-    if originator in evm.message.block_env.state.created_accounts:
+    if originator in evm.message.tx_env.state.created_accounts:
         # If beneficiary is the same as originator, then
         # the ether is burnt.
-        set_account_balance(evm.message.block_env.state, originator, U256(0))
+        set_account_balance(evm.message.tx_env.state, originator, U256(0))
         evm.accounts_to_delete.add(originator)
 
     # HALT the execution
@@ -604,10 +596,10 @@ def delegatecall(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     (
         disable_precompiles,
@@ -673,10 +665,10 @@ def staticcall(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
     (
diff --git a/src/ethereum/forks/prague/vm/interpreter.py b/src/ethereum/forks/prague/vm/interpreter.py
index 290f2831710..c52a6768ad9 100644
--- a/src/ethereum/forks/prague/vm/interpreter.py
+++ b/src/ethereum/forks/prague/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,22 +31,22 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     get_account,
     get_code,
     increment_nonce,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
 )
 from ..vm import Message
 from ..vm.eoa_delegation import get_delegated_code_address, set_delegation
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -66,6 +66,7 @@
 MAX_INIT_CODE_SIZE = 2 * MAX_CODE_SIZE
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -105,12 +106,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -131,8 +132,8 @@ def process_message_call(message: Message) -> MessageCallOutput:
             message.disable_precompiles = True
             message.accessed_addresses.add(delegated_address)
             message.code = get_code(
-                block_env.state,
-                get_account(block_env.state, delegated_address).code_hash,
+                tx_state,
+                get_account(tx_state, delegated_address).code_hash,
             )
             message.code_address = delegated_address
 
@@ -176,22 +177,31 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
-    transient_storage = message.tx_env.transient_storage
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
-
-    # The list of created accounts is used by `get_storage_original`.
-    # Additionally, the list is needed to respect the constraints
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts. This tracking is also needed to respect the constraints
     # added to SELFDESTRUCT by EIP-6780.
-    mark_account_created(state, message.current_target)
+    mark_account_created(tx_state, message.current_target)
 
-    increment_nonce(state, message.current_target)
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             if len(contract_code) > 0:
@@ -201,15 +211,14 @@ def process_create_message(message: Message) -> Evm:
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state, transient_storage)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state, transient_storage)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -228,11 +237,10 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
-    transient_storage = message.tx_env.transient_storage
     code = message.code
     valid_jump_destinations = get_valid_jump_destinations(code)
     evm = Evm(
@@ -255,11 +263,14 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state, transient_storage)
+    snapshot = copy_tx_state(tx_state)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -291,9 +302,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state, transient_storage)
-    else:
-        commit_transaction(state, transient_storage)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/prague/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/prague/vm/precompiled_contracts/alt_bn128.py
index 214725d8da0..862506c54c3 100644
--- a/src/ethereum/forks/prague/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/prague/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(150))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(6000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(34000 * (len(data) // 192) + 45000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/prague/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/prague/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/prague/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/prague/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/prague/vm/precompiled_contracts/bls12_381/__init__.py b/src/ethereum/forks/prague/vm/precompiled_contracts/bls12_381/__init__.py
index c99e7573f48..7d622da39d1 100644
--- a/src/ethereum/forks/prague/vm/precompiled_contracts/bls12_381/__init__.py
+++ b/src/ethereum/forks/prague/vm/precompiled_contracts/bls12_381/__init__.py
@@ -414,7 +414,7 @@ def decode_g1_scalar_pair(
 
     """
     if len(data) != 160:
-        InvalidParameter("Input should be 160 bytes long")
+        raise InvalidParameter("Input should be 160 bytes long")
 
     point = bytes_to_g1(data[:128], subgroup_check=True)
 
@@ -614,7 +614,7 @@ def decode_g2_scalar_pair(
 
     """
     if len(data) != 288:
-        InvalidParameter("Input should be 288 bytes long")
+        raise InvalidParameter("Input should be 288 bytes long")
 
     point = bytes_to_g2(data[:256], subgroup_check=True)
     n = int.from_bytes(data[256 : 256 + 32], "big")
diff --git a/src/ethereum/forks/prague/vm/precompiled_contracts/bls12_381/bls12_381_g1.py b/src/ethereum/forks/prague/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
index ae8eeba0ce6..d1f63224a0c 100644
--- a/src/ethereum/forks/prague/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
+++ b/src/ethereum/forks/prague/vm/precompiled_contracts/bls12_381/bls12_381_g1.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G1_ADD,
-    GAS_BLS_G1_MAP,
-    GAS_BLS_G1_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -60,7 +58,7 @@ def bls12_g1_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1ADD)
 
     # OPERATION
     p1 = bytes_to_g1(buffer_read(data, U256(0), U256(128)))
@@ -101,7 +99,7 @@ def bls12_g1_msm(evm: Evm) -> None:
     else:
         discount = Uint(G1_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G1_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G1MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -140,7 +138,7 @@ def bls12_map_fp_to_g1(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G1_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G1MAP)
 
     # OPERATION
     fp = int.from_bytes(data, "big")
diff --git a/src/ethereum/forks/prague/vm/precompiled_contracts/bls12_381/bls12_381_g2.py b/src/ethereum/forks/prague/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
index 473739b78c0..2fd32313f89 100644
--- a/src/ethereum/forks/prague/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
+++ b/src/ethereum/forks/prague/vm/precompiled_contracts/bls12_381/bls12_381_g2.py
@@ -21,9 +21,7 @@
 
 from ....vm import Evm
 from ....vm.gas import (
-    GAS_BLS_G2_ADD,
-    GAS_BLS_G2_MAP,
-    GAS_BLS_G2_MUL,
+    GasCosts,
     charge_gas,
 )
 from ....vm.memory import buffer_read
@@ -61,7 +59,7 @@ def bls12_g2_add(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_ADD))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2ADD)
 
     # OPERATION
     p1 = bytes_to_g2(buffer_read(data, U256(0), U256(256)))
@@ -102,7 +100,7 @@ def bls12_g2_msm(evm: Evm) -> None:
     else:
         discount = Uint(G2_MAX_DISCOUNT)
 
-    gas_cost = Uint(k) * GAS_BLS_G2_MUL * discount // MULTIPLIER
+    gas_cost = Uint(k) * GasCosts.PRECOMPILE_BLS_G2MUL * discount // MULTIPLIER
     charge_gas(evm, gas_cost)
 
     # OPERATION
@@ -141,7 +139,7 @@ def bls12_map_fp2_to_g2(evm: Evm) -> None:
         raise InvalidParameter("Invalid Input Length")
 
     # GAS
-    charge_gas(evm, Uint(GAS_BLS_G2_MAP))
+    charge_gas(evm, GasCosts.PRECOMPILE_BLS_G2MAP)
 
     # OPERATION
     field_element = bytes_to_fq2(data)
diff --git a/src/ethereum/forks/prague/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/prague/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/prague/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/prague/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/prague/vm/precompiled_contracts/identity.py b/src/ethereum/forks/prague/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/prague/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/prague/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/prague/vm/precompiled_contracts/point_evaluation.py b/src/ethereum/forks/prague/vm/precompiled_contracts/point_evaluation.py
index ce4eed71294..d2d105ba13b 100644
--- a/src/ethereum/forks/prague/vm/precompiled_contracts/point_evaluation.py
+++ b/src/ethereum/forks/prague/vm/precompiled_contracts/point_evaluation.py
@@ -22,7 +22,7 @@
 
 from ...vm import Evm
 from ...vm.exceptions import KZGProofError
-from ...vm.gas import GAS_POINT_EVALUATION, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 FIELD_ELEMENTS_PER_BLOB = 4096
 BLS_MODULUS = 52435875175126190479447740508185965837690552500527637822603658699938581184513  # noqa: E501
@@ -51,7 +51,7 @@ def point_evaluation(evm: Evm) -> None:
     proof = Bytes48(data[144:192])
 
     # GAS
-    charge_gas(evm, GAS_POINT_EVALUATION)
+    charge_gas(evm, GasCosts.PRECOMPILE_POINT_EVALUATION)
     if kzg_commitment_to_versioned_hash(commitment) != versioned_hash:
         raise KZGProofError
 
diff --git a/src/ethereum/forks/prague/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/prague/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/prague/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/prague/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/prague/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/prague/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/prague/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/prague/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/shanghai/__init__.py b/src/ethereum/forks/shanghai/__init__.py
index d231ca9648d..63b04b7062d 100644
--- a/src/ethereum/forks/shanghai/__init__.py
+++ b/src/ethereum/forks/shanghai/__init__.py
@@ -36,7 +36,7 @@
 [EIP-3860]: https://eips.ethereum.org/EIPS/eip-3860
 [EIP-4895]: https://eips.ethereum.org/EIPS/eip-4895
 [Geth 1.11.5]: https://github.com/ethereum/go-ethereum/releases/tag/v1.11.5
-[Besu 23.1.2]: https://github.com/hyperledger/besu/releases/tag/23.1.2
+[Besu 23.1.2]: https://github.com/besu-eth/besu/releases/tag/23.1.2
 [n]: https://github.com/NethermindEth/nethermind/releases/tag/1.17.3
 [e]: https://github.com/ledgerwatch/erigon/releases/tag/v2.41.0
 [js]: https://github.com/ethereumjs/ethereumjs-monorepo/releases/tag/%40ethereumjs%2Fvm%406.4.0
diff --git a/src/ethereum/forks/shanghai/blocks.py b/src/ethereum/forks/shanghai/blocks.py
index d1747c7c702..04990ab04ff 100644
--- a/src/ethereum/forks/shanghai/blocks.py
+++ b/src/ethereum/forks/shanghai/blocks.py
@@ -10,7 +10,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
@@ -29,6 +29,7 @@
 )
 
 
+@final
 @slotted_freezable
 @dataclass
 class Withdrawal:
@@ -62,6 +63,7 @@ class Withdrawal:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -105,13 +107,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.shanghai.state.state_root
-    [Trie]: ref:ethereum.forks.shanghai.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -121,8 +124,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.shanghai.trie.root
-    [Trie]: ref:ethereum.forks.shanghai.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -132,8 +135,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.shanghai.trie.root
-    [Trie]: ref:ethereum.forks.shanghai.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -209,6 +212,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -262,6 +266,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -294,6 +299,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/shanghai/fork.py b/src/ethereum/forks/shanghai/fork.py
index ed186933edf..73a34017d55 100644
--- a/src/ethereum/forks/shanghai/fork.py
+++ b/src/ethereum/forks/shanghai/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Optional, Tuple
+from typing import List, Optional, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
@@ -27,7 +27,13 @@
     InvalidSenderError,
     NonceMismatchError,
 )
-from ethereum.state import EMPTY_CODE_HASH, Account, Address
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt, Withdrawal, encode_receipt
@@ -36,14 +42,16 @@
     InsufficientMaxFeePerGasError,
     PriorityFeeGreaterThanMaxFeeError,
 )
-from .state import (
-    State,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
+    create_ether,
     destroy_account,
+    extract_block_diff,
     get_account,
+    incorporate_tx_into_block,
     increment_nonce,
-    modify_state,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
     AccessListTransaction,
@@ -56,17 +64,16 @@
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.message import prepare_message
+from .vm.gas import GasCosts
 from .vm.interpreter import process_message_call
 
 BASE_FEE_MAX_CHANGE_DENOMINATOR = Uint(8)
 ELASTICITY_MULTIPLIER = Uint(2)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -169,9 +176,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block.ommers != ():
         raise InvalidBlock
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -186,7 +195,12 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         withdrawals=block.withdrawals,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes,
+        block_diff.storage_changes,
+        block_diff.storage_clears,
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -207,6 +221,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if withdrawals_root != block.header.withdrawals_root:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -334,6 +349,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Tuple[Address, Uint]:
     """
     Check if the transaction is includable in the block.
@@ -346,6 +362,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -376,7 +394,7 @@ def check_transaction(
     if tx.gas > gas_available:
         raise GasUsedExceedsLimitError("gas used exceeds limit")
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     if isinstance(tx, FeeMarketTransaction):
         if tx.max_fee_per_gas < tx.max_priority_fee_per_gas:
@@ -521,6 +539,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(
         block_output.transactions_trie,
         rlp.encode(index),
@@ -536,21 +556,20 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     effective_gas_fee = tx.gas * effective_gas_price
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     sender_balance_after_gas_fee = (
         Uint(sender_account.balance) - effective_gas_fee
     )
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     access_list_addresses = set()
     access_list_storage_keys = set()
@@ -567,6 +586,7 @@ def process_transaction(
         gas=gas,
         access_list_addresses=access_list_addresses,
         access_list_storage_keys=access_list_storage_keys,
+        state=tx_state,
         index_in_block=index,
         tx_hash=get_transaction_hash(encode_transaction(tx)),
     )
@@ -588,23 +608,13 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * priority_fee_per_gas
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
-    coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
-    ).balance + U256(transaction_fee)
-    set_account_balance(
-        block_env.state,
-        block_env.coinbase,
-        coinbase_balance_after_mining_fee,
-    )
+    create_ether(tx_state, block_env.coinbase, U256(transaction_fee))
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
     block_output.block_gas_used += tx_gas_used_after_refund
 
@@ -623,6 +633,8 @@ def process_transaction(
 
     block_output.block_logs += tx_output.logs
 
+    incorporate_tx_into_block(tx_state)
+
 
 def process_withdrawals(
     block_env: vm.BlockEnvironment,
@@ -632,9 +644,7 @@ def process_withdrawals(
     """
     Increase the balance of the withdrawing account.
     """
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += wd.amount * U256(10**9)
+    wd_state = TransactionState(parent=block_env.state)
 
     for i, wd in enumerate(withdrawals):
         trie_set(
@@ -643,7 +653,9 @@ def increase_recipient_balance(recipient: Account) -> None:
             rlp.encode(wd),
         )
 
-        modify_state(block_env.state, wd.address, increase_recipient_balance)
+        create_ether(wd_state, wd.address, wd.amount * U256(10**9))
+
+    incorporate_tx_into_block(wd_state)
 
 
 def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
@@ -652,12 +664,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
     passed through as a parameter is greater than or equal to the *sum* of
     the parent's gas and the adjustment delta then the limit for gas is too
     high and fails this function's check. Similarly, if the limit is less
     than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
+    delta *or* the predefined ``LIMIT_MINIMUM`` then this function's
     check fails because the gas limit doesn't allow for a sufficient or
     reasonable amount of gas to be used on a block.
 
@@ -675,12 +687,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/shanghai/state.py b/src/ethereum/forks/shanghai/state.py
deleted file mode 100644
index d2cbd10ff8f..00000000000
--- a/src/ethereum/forks/shanghai/state.py
+++ /dev/null
@@ -1,615 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, List, Optional, Set, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-from ethereum.state import (
-    EMPTY_ACCOUNT,
-    EMPTY_CODE_HASH,
-    Account,
-    Address,
-    Root,
-)
-
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    created_accounts: Set[Address] = field(default_factory=set)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-    def get_code(self, code_hash: Hash32) -> Bytes:
-        """
-        Get the bytecode for a given code hash.
-
-        Return ``b""`` for ``EMPTY_CODE_HASH``.
-        """
-        if code_hash == EMPTY_CODE_HASH:
-            return b""
-        return self._code_store[code_hash]
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state.created_accounts
-    del state._code_store
-
-
-def begin_transaction(state: State) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-
-
-def commit_transaction(state: State) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-
-def rollback_transaction(state: State) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-    if not state._snapshots:
-        state.created_accounts.clear()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-
-    Return ``b""`` for ``EMPTY_CODE_HASH``.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State`` and return its hash.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def mark_account_created(state: State, address: Address) -> None:
-    """
-    Mark an account as having been created in the current transaction.
-    This information is used by `get_storage_original()` to handle an obscure
-    edgecase.
-
-    The marker is not removed even if the account creation reverts. Since the
-    account cannot have had code prior to its creation and can't call
-    `get_storage_original()`, this is harmless.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account that has been created.
-
-    """
-    state.created_accounts.add(address)
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`. If, after modification, the account
-    exists and has zero nonce, empty code, and zero balance, it is destroyed.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-    account = get_account_optional(state, address)
-    account_exists_and_is_empty = (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-    if account_exists_and_is_empty:
-        destroy_account(state, address)
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = store_code(state, code)
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def get_storage_original(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get the original value in a storage slot i.e. the value before the current
-    transaction began. This function reads the value from the snapshots taken
-    before executing the transaction.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to read the value from.
-    key:
-        Key of the storage slot.
-
-    """
-    # In the transaction where an account is created, its preexisting storage
-    # is ignored.
-    if address in state.created_accounts:
-        return U256(0)
-
-    _, original_trie = state._snapshots[0]
-    original_account_trie = original_trie.get(address)
-
-    if original_account_trie is None:
-        original_value = U256(0)
-    else:
-        original_value = trie_get(original_account_trie, key)
-
-    assert isinstance(original_value, U256)
-
-    return original_value
diff --git a/src/ethereum/forks/shanghai/state_tracker.py b/src/ethereum/forks/shanghai/state_tracker.py
new file mode 100644
index 00000000000..a62bed0c09f
--- /dev/null
+++ b/src/ethereum/forks/shanghai/state_tracker.py
@@ -0,0 +1,774 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+
+    ``storage_clears`` records addresses whose storage was wiped by
+    a pre-EIP-6780 ``SELFDESTRUCT`` earlier in the block, so later
+    reads must not fall back to ``pre_state`` storage.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    storage_clears: Set[Address] = field(default_factory=set)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    storage_clears: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.storage_clears:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if address in tx_state.storage_clears:
+        return False
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    if address in tx_state.parent.storage_clears:
+        return False
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+    tx_state.storage_clears.add(address)
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state. If, after modification, the
+    account exists and has zero nonce, empty code, and zero balance, it
+    is destroyed.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+    if account_exists_and_is_empty(tx_state, address):
+        destroy_account(tx_state, address)
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        storage_clears=set(tx_state.storage_clears),
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.storage_clears = snapshot.storage_clears
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address in tx_state.storage_clears:
+        block.storage_clears.add(address)
+        block.storage_writes.pop(address, None)
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.storage_clears.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+        storage_clears=block_state.storage_clears,
+    )
diff --git a/src/ethereum/forks/shanghai/transactions.py b/src/ethereum/forks/shanghai/transactions.py
index 871782b3a73..2b76014505b 100644
--- a/src/ethereum/forks/shanghai/transactions.py
+++ b/src/ethereum/forks/shanghai/transactions.py
@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
@@ -23,38 +23,8 @@
 
 from .exceptions import InitCodeTooLargeError, TransactionTypeError
 
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_PER_NON_ZERO = Uint(16)
-"""
-Gas cost per non-zero byte in the transaction data.
-"""
-
-GAS_TX_DATA_PER_ZERO = Uint(4)
-"""
-Gas cost per zero byte in the transaction data.
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
-
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
-"""
-
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
-"""
-
 
+@final
 @slotted_freezable
 @dataclass
 class LegacyTransaction:
@@ -114,6 +84,7 @@ class LegacyTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Access:
@@ -133,6 +104,7 @@ class Access:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class AccessListTransaction:
@@ -205,6 +177,7 @@ class AccessListTransaction:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class FeeMarketTransaction:
@@ -380,7 +353,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
     4. Cost for access list entries (if applicable)
@@ -388,29 +361,29 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     This function takes a transaction as a parameter and returns the intrinsic
     gas cost of the transaction.
     """
-    from .vm.gas import init_code_cost
+    from .vm.gas import GasCosts, init_code_cost
 
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
     data_cost = (
-        num_zeros * GAS_TX_DATA_PER_ZERO
-        + num_non_zeros * GAS_TX_DATA_PER_NON_ZERO
+        num_zeros * GasCosts.TX_DATA_PER_ZERO
+        + num_non_zeros * GasCosts.TX_DATA_PER_NON_ZERO
     )
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE + init_code_cost(ulen(tx.data))
+        create_cost = GasCosts.TX_CREATE + init_code_cost(ulen(tx.data))
     else:
         create_cost = Uint(0)
 
     access_list_cost = Uint(0)
     if isinstance(tx, (AccessListTransaction, FeeMarketTransaction)):
         for access in tx.access_list:
-            access_list_cost += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_cost += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_cost += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
 
-    return GAS_TX_BASE + data_cost + create_cost + access_list_cost
+    return GasCosts.TX_BASE + data_cost + create_cost + access_list_cost
 
 
 def recover_sender(chain_id: U64, tx: Transaction) -> Address:
diff --git a/src/ethereum/forks/shanghai/trie.py b/src/ethereum/forks/shanghai/trie.py
deleted file mode 100644
index 13723b29cf3..00000000000
--- a/src/ethereum/forks/shanghai/trie.py
+++ /dev/null
@@ -1,509 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    assert_type,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.paris import trie as previous_trie
-from ethereum.state import Account, Address, Root
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt, Withdrawal
-from .fork_types import encode_account
-from .transactions import LegacyTransaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = (
-    Account
-    | Bytes
-    | LegacyTransaction
-    | Receipt
-    | Uint
-    | U256
-    | Withdrawal
-    | None
-)
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[LegacyTransaction | Bytes],
-    Optional[Receipt | Bytes],
-    Optional[Withdrawal | Bytes],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `Extended`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (LegacyTransaction, Receipt, Withdrawal, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/shanghai/utils/message.py b/src/ethereum/forks/shanghai/utils/message.py
index 1df8f3cfda6..a42594161a3 100644
--- a/src/ethereum/forks/shanghai/utils/message.py
+++ b/src/ethereum/forks/shanghai/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
@@ -55,7 +55,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -63,9 +63,9 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        state = block_env.state
-        code = get_code(state, get_account(state, tx.to).code_hash)
-
+        code = get_code(
+            tx_env.state, get_account(tx_env.state, tx.to).code_hash
+        )
         code_address = tx.to
     else:
         raise AssertionError("Target must be address or empty bytes")
diff --git a/src/ethereum/forks/shanghai/vm/__init__.py b/src/ethereum/forks/shanghai/vm/__init__.py
index df7e7e63a88..c10a4ccfe9c 100644
--- a/src/ethereum/forks/shanghai/vm/__init__.py
+++ b/src/ethereum/forks/shanghai/vm/__init__.py
@@ -13,23 +13,24 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0, Bytes32
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt, Withdrawal
-from ..state import State
+from ..state_tracker import BlockState, TransactionState
 from ..transactions import LegacyTransaction
-from ..trie import Trie
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -37,7 +38,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -47,6 +48,7 @@ class BlockEnvironment:
     prev_randao: Bytes32
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -83,10 +85,11 @@ class BlockOutput:
     )
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
@@ -94,10 +97,12 @@ class TransactionEnvironment:
     gas: Uint
     access_list_addresses: Set[Address]
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
+    state: TransactionState
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -122,6 +127,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
diff --git a/src/ethereum/forks/shanghai/vm/gas.py b/src/ethereum/forks/shanghai/vm/gas.py
index bd3ea9ec341..8babf45d1d7 100644
--- a/src/ethereum/forks/shanghai/vm/gas.py
+++ b/src/ethereum/forks/shanghai/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32
@@ -22,49 +22,148 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 4800
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-GAS_ECRECOVER = Uint(3000)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_BLAKE2_PER_ROUND = Uint(1)
-GAS_COLD_SLOAD = Uint(2100)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600)
-GAS_WARM_ACCESS = Uint(100)
-GAS_CODE_INIT_PER_WORD = Uint(2)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    WARM_ACCESS: Final[Uint] = Uint(100)
+    COLD_ACCOUNT_ACCESS: Final[Uint] = Uint(2600)
+    COLD_STORAGE_ACCESS: Final[Uint] = Uint(2100)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+    CODE_INIT_PER_WORD: Final[Uint] = Uint(2)
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+    FAST_STEP: Final[Uint] = Uint(5)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 4800
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+    PRECOMPILE_BLAKE2F_PER_ROUND: Final[Uint] = Uint(1)
+    PRECOMPILE_ECADD: Final[Uint] = Uint(150)
+    PRECOMPILE_ECMUL: Final[Uint] = Uint(6000)
+    PRECOMPILE_ECPAIRING_BASE: Final[Uint] = Uint(45000)
+    PRECOMPILE_ECPAIRING_PER_POINT: Final[Uint] = Uint(34000)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_PER_ZERO: Final[Uint] = Uint(4)
+    TX_DATA_PER_NON_ZERO: Final[Uint] = Uint(16)
+    TX_ACCESS_LIST_ADDRESS: Final[Uint] = Uint(2400)
+    TX_ACCESS_LIST_STORAGE_KEY: Final[Uint] = Uint(1900)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_SHL: Final[Uint] = VERY_LOW
+    OPCODE_SHR: Final[Uint] = VERY_LOW
+    OPCODE_SAR: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_PREVRANDAO: Final[Uint] = BASE
+    OPCODE_RETURNDATASIZE: Final[Uint] = BASE
+    OPCODE_CHAINID: Final[Uint] = BASE
+    OPCODE_BASEFEE: Final[Uint] = BASE
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_PUSH0: Final[Uint] = BASE
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_RETURNDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_RETURNDATACOPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -80,11 +179,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -136,7 +236,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -166,7 +266,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -191,7 +291,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
@@ -263,4 +363,4 @@ def init_code_cost(init_code_length: Uint) -> Uint:
         The gas to be charged for the init code.
 
     """
-    return GAS_CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
+    return GasCosts.CODE_INIT_PER_WORD * ceil32(init_code_length) // Uint(32)
diff --git a/src/ethereum/forks/shanghai/vm/instructions/arithmetic.py b/src/ethereum/forks/shanghai/vm/instructions/arithmetic.py
index b7b1a370ad4..c361db7373f 100644
--- a/src/ethereum/forks/shanghai/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/shanghai/vm/instructions/arithmetic.py
@@ -17,14 +17,7 @@
 from ethereum.utils.numeric import get_sign
 
 from .. import Evm
-from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
-    charge_gas,
-)
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -44,7 +37,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +64,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +91,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +118,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +151,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +184,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +214,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +245,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +276,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +311,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +341,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/shanghai/vm/instructions/bitwise.py b/src/ethereum/forks/shanghai/vm/instructions/bitwise.py
index 41dabe8185b..99b62433076 100644
--- a/src/ethereum/forks/shanghai/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/shanghai/vm/instructions/bitwise.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -34,7 +34,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +59,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +84,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +108,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +134,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
@@ -169,7 +169,7 @@ def bitwise_shl(evm: Evm) -> None:
     value = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHL)
 
     # OPERATION
     if shift < Uint(256):
@@ -199,7 +199,7 @@ def bitwise_shr(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SHR)
 
     # OPERATION
     if shift < U256(256):
@@ -229,7 +229,7 @@ def bitwise_sar(evm: Evm) -> None:
     signed_value = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SAR)
 
     # OPERATION
     if shift < 256:
diff --git a/src/ethereum/forks/shanghai/vm/instructions/block.py b/src/ethereum/forks/shanghai/vm/instructions/block.py
index de2569869bd..cfba646567f 100644
--- a/src/ethereum/forks/shanghai/vm/instructions/block.py
+++ b/src/ethereum/forks/shanghai/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -40,7 +40,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -89,7 +89,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -123,7 +123,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -156,7 +156,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -189,7 +189,7 @@ def prev_randao(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PREVRANDAO)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.prev_randao))
@@ -222,7 +222,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
@@ -252,7 +252,7 @@ def chain_id(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CHAINID)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.chain_id))
diff --git a/src/ethereum/forks/shanghai/vm/instructions/comparison.py b/src/ethereum/forks/shanghai/vm/instructions/comparison.py
index a6a3d99bc86..ee5c881ef0d 100644
--- a/src/ethereum/forks/shanghai/vm/instructions/comparison.py
+++ b/src/ethereum/forks/shanghai/vm/instructions/comparison.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -34,7 +34,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +60,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +87,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +113,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +140,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +166,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/shanghai/vm/instructions/control_flow.py b/src/ethereum/forks/shanghai/vm/instructions/control_flow.py
index b3b1f2316a7..d74e7b90340 100644
--- a/src/ethereum/forks/shanghai/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/shanghai/vm/instructions/control_flow.py
@@ -13,7 +13,7 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +57,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +84,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +113,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +137,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +162,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/shanghai/vm/instructions/environment.py b/src/ethereum/forks/shanghai/vm/instructions/environment.py
index ba2bb42a425..ff0a4044f73 100644
--- a/src/ethereum/forks/shanghai/vm/instructions/environment.py
+++ b/src/ethereum/forks/shanghai/vm/instructions/environment.py
@@ -16,19 +16,13 @@
 from ethereum.state import EMPTY_ACCOUNT
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..exceptions import OutOfBoundsRead
 from ..gas import (
-    GAS_BASE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_COPY,
-    GAS_FAST_STEP,
-    GAS_RETURN_DATA_COPY,
-    GAS_VERY_LOW,
-    GAS_WARM_ACCESS,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -49,7 +43,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -73,14 +67,15 @@ def balance(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_addresses.add(address)
-        charge_gas(evm, GAS_COLD_ACCOUNT_ACCESS)
+        charge_gas(evm, GasCosts.COLD_ACCOUNT_ACCESS)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -103,7 +98,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -126,7 +121,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -149,7 +144,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -173,7 +168,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -198,7 +193,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -227,11 +222,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -256,7 +254,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -285,11 +283,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -314,7 +315,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -338,16 +339,16 @@ def extcodesize(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -374,23 +375,23 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
 
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost + copy_gas_cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, address).code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
@@ -413,7 +414,7 @@ def returndatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_RETURNDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.return_data)))
@@ -439,11 +440,16 @@ def returndatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_RETURN_DATA_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_RETURNDATACOPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_RETURNDATACOPY_BASE
+        + copy_gas_cost
+        + extend_memory.cost,
+    )
     if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data):
         raise OutOfBoundsRead
 
@@ -472,15 +478,15 @@ def extcodehash(evm: Evm) -> None:
 
     # GAS
     if address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     charge_gas(evm, access_gas_cost)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
+    account = get_account(evm.message.tx_env.state, address)
 
     if account == EMPTY_ACCOUNT:
         codehash = U256(0)
@@ -507,12 +513,12 @@ def self_balance(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_FAST_STEP)
+    charge_gas(evm, GasCosts.FAST_STEP)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
     balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
 
     push(evm.stack, balance)
@@ -535,7 +541,7 @@ def base_fee(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_BASEFEE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.base_fee_per_gas))
diff --git a/src/ethereum/forks/shanghai/vm/instructions/keccak.py b/src/ethereum/forks/shanghai/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/shanghai/vm/instructions/keccak.py
+++ b/src/ethereum/forks/shanghai/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/shanghai/vm/instructions/log.py b/src/ethereum/forks/shanghai/vm/instructions/log.py
index abc297df6fa..695f4de735c 100644
--- a/src/ethereum/forks/shanghai/vm/instructions/log.py
+++ b/src/ethereum/forks/shanghai/vm/instructions/log.py
@@ -12,6 +12,7 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
@@ -19,9 +20,7 @@
 from .. import Evm
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -59,9 +58,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -81,8 +80,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/shanghai/vm/instructions/memory.py b/src/ethereum/forks/shanghai/vm/instructions/memory.py
index 3a242ba2f7a..93861811559 100644
--- a/src/ethereum/forks/shanghai/vm/instructions/memory.py
+++ b/src/ethereum/forks/shanghai/vm/instructions/memory.py
@@ -16,8 +16,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,7 +45,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -77,7 +76,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -105,7 +104,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -132,7 +131,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
diff --git a/src/ethereum/forks/shanghai/vm/instructions/stack.py b/src/ethereum/forks/shanghai/vm/instructions/stack.py
index 0007a28acd4..eff50ac73c9 100644
--- a/src/ethereum/forks/shanghai/vm/instructions/stack.py
+++ b/src/ethereum/forks/shanghai/vm/instructions/stack.py
@@ -12,12 +12,13 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..memory import buffer_read
 
 
@@ -35,7 +36,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -63,9 +64,9 @@ def push_n(evm: Evm, num_bytes: int) -> None:
 
     # GAS
     if num_bytes == 0:
-        charge_gas(evm, GAS_BASE)
+        charge_gas(evm, GasCosts.OPCODE_PUSH0)
     else:
-        charge_gas(evm, GAS_VERY_LOW)
+        charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -95,7 +96,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -127,7 +128,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -139,70 +140,70 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push0 = partial(push_n, num_bytes=0)
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push0: Callable[[Evm], None] = partial(push_n, num_bytes=0)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/shanghai/vm/instructions/storage.py b/src/ethereum/forks/shanghai/vm/instructions/storage.py
index 6129ed5322c..c3fe02532ad 100644
--- a/src/ethereum/forks/shanghai/vm/instructions/storage.py
+++ b/src/ethereum/forks/shanghai/vm/instructions/storage.py
@@ -13,18 +13,10 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import get_storage, get_storage_original, set_storage
+from ...state_tracker import get_storage, get_storage_original, set_storage
 from .. import Evm
 from ..exceptions import OutOfGasError, WriteInStaticContext
-from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
-    charge_gas,
-)
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -44,15 +36,14 @@ def sload(evm: Evm) -> None:
 
     # GAS
     if (evm.message.current_target, key) in evm.accessed_storage_keys:
-        charge_gas(evm, GAS_WARM_ACCESS)
+        charge_gas(evm, GasCosts.WARM_ACCESS)
     else:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        charge_gas(evm, GAS_COLD_SLOAD)
+        charge_gas(evm, GasCosts.COLD_STORAGE_ACCESS)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -73,54 +64,60 @@ def sstore(evm: Evm) -> None:
     # STACK
     key = pop(evm.stack).to_be_bytes32()
     new_value = pop(evm.stack)
-    if evm.gas_left <= GAS_CALL_STIPEND:
+    if evm.gas_left <= GasCosts.CALL_STIPEND:
         raise OutOfGasError
 
-    state = evm.message.block_env.state
+    tx_state = evm.message.tx_env.state
     original_value = get_storage_original(
-        state, evm.message.current_target, key
+        tx_state, evm.message.current_target, key
     )
-    current_value = get_storage(state, evm.message.current_target, key)
+    current_value = get_storage(tx_state, evm.message.current_target, key)
 
     gas_cost = Uint(0)
 
     if (evm.message.current_target, key) not in evm.accessed_storage_keys:
         evm.accessed_storage_keys.add((evm.message.current_target, key))
-        gas_cost += GAS_COLD_SLOAD
+        gas_cost += GasCosts.COLD_STORAGE_ACCESS
 
     if original_value == current_value and current_value != new_value:
         if original_value == 0:
-            gas_cost += GAS_STORAGE_SET
+            gas_cost += GasCosts.STORAGE_SET
         else:
-            gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_SLOAD
+            gas_cost += (
+                GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
+            )
     else:
-        gas_cost += GAS_WARM_ACCESS
+        gas_cost += GasCosts.WARM_ACCESS
 
     # Refund Counter Calculation
     if current_value != new_value:
         if original_value != 0 and current_value != 0 and new_value == 0:
             # Storage is cleared for the first time in the transaction
-            evm.refund_counter += REFUND_STORAGE_CLEAR
+            evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value != 0 and current_value == 0:
             # Gas refund issued earlier to be reversed
-            evm.refund_counter -= REFUND_STORAGE_CLEAR
+            evm.refund_counter -= GasCosts.REFUND_STORAGE_CLEAR
 
         if original_value == new_value:
             # Storage slot being restored to its original value
             if original_value == 0:
                 # Slot was originally empty and was SET earlier
-                evm.refund_counter += int(GAS_STORAGE_SET - GAS_WARM_ACCESS)
+                evm.refund_counter += int(
+                    GasCosts.STORAGE_SET - GasCosts.WARM_ACCESS
+                )
             else:
                 # Slot was originally non-empty and was UPDATED earlier
                 evm.refund_counter += int(
-                    GAS_STORAGE_UPDATE - GAS_COLD_SLOAD - GAS_WARM_ACCESS
+                    GasCosts.COLD_STORAGE_WRITE
+                    - GasCosts.COLD_STORAGE_ACCESS
+                    - GasCosts.WARM_ACCESS
                 )
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
         raise WriteInStaticContext
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
diff --git a/src/ethereum/forks/shanghai/vm/instructions/system.py b/src/ethereum/forks/shanghai/vm/instructions/system.py
index e5abcae2236..2527f02f12c 100644
--- a/src/ethereum/forks/shanghai/vm/instructions/system.py
+++ b/src/ethereum/forks/shanghai/vm/instructions/system.py
@@ -17,7 +17,7 @@
 from ethereum.state import Address
 from ethereum.utils.numeric import ceil32
 
-from ...state import (
+from ...state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
     get_account,
@@ -39,15 +39,7 @@
 )
 from ..exceptions import OutOfGasError, Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_CREATE,
-    GAS_KECCAK256_PER_WORD,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -89,7 +81,7 @@ def generic_create(
     evm.return_data = b""
 
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     if (
         sender.balance < endowment
@@ -103,15 +95,13 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     if account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return
 
-    increment_nonce(evm.message.block_env.state, evm.message.current_target)
+    increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
     child_message = Message(
         block_env=evm.message.block_env,
@@ -164,14 +154,16 @@ def create(evm: Evm) -> None:
     )
     init_code_gas = init_code_cost(Uint(memory_size))
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost + init_code_gas)
+    charge_gas(
+        evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost + init_code_gas
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -214,8 +206,8 @@ def create2(evm: Evm) -> None:
     init_code_gas = init_code_cost(Uint(memory_size))
     charge_gas(
         evm,
-        GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        GasCosts.OPCODE_CREATE_BASE
+        + GasCosts.OPCODE_KECCAK256_PER_WORD * call_data_words
         + extend_memory.cost
         + init_code_gas,
     )
@@ -259,7 +251,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -302,8 +294,8 @@ def generic_call(
     call_data = memory_read_bytes(
         evm.memory, memory_input_start_position, memory_input_size
     )
-    state = evm.message.block_env.state
-    code = get_code(state, get_account(state, code_address).code_hash)
+    tx_state = evm.message.tx_env.state
+    code = get_code(tx_state, get_account(tx_state, code_address).code_hash)
     child_message = Message(
         block_env=evm.message.block_env,
         tx_env=evm.message.tx_env,
@@ -370,17 +362,17 @@ def call(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -393,7 +385,7 @@ def call(evm: Evm) -> None:
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -450,12 +442,12 @@ def callcode(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
@@ -468,7 +460,7 @@ def callcode(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -508,19 +500,19 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if beneficiary not in evm.accessed_addresses:
         evm.accessed_addresses.add(beneficiary)
-        gas_cost += GAS_COLD_ACCOUNT_ACCESS
+        gas_cost += GasCosts.COLD_ACCOUNT_ACCESS
 
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     charge_gas(evm, gas_cost)
     if evm.message.is_static:
@@ -528,22 +520,22 @@ def selfdestruct(evm: Evm) -> None:
 
     originator = evm.message.current_target
     beneficiary_balance = get_account(
-        evm.message.block_env.state, beneficiary
+        evm.message.tx_env.state, beneficiary
     ).balance
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     # First Transfer to beneficiary
     set_account_balance(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         beneficiary,
         beneficiary_balance + originator_balance,
     )
     # Next, Zero the balance of the address being deleted (must come after
     # sending to beneficiary in case the contract named itself as the
     # beneficiary).
-    set_account_balance(evm.message.block_env.state, originator, U256(0))
+    set_account_balance(evm.message.tx_env.state, originator, U256(0))
 
     # register account for deletion
     evm.accounts_to_delete.add(originator)
@@ -583,10 +575,10 @@ def delegatecall(evm: Evm) -> None:
     )
 
     if code_address in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(code_address)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     message_call_gas = calculate_message_call_gas(
         U256(0), gas, Uint(evm.gas_left), extend_memory.cost, access_gas_cost
@@ -642,10 +634,10 @@ def staticcall(evm: Evm) -> None:
     )
 
     if to in evm.accessed_addresses:
-        access_gas_cost = GAS_WARM_ACCESS
+        access_gas_cost = GasCosts.WARM_ACCESS
     else:
         evm.accessed_addresses.add(to)
-        access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost = GasCosts.COLD_ACCOUNT_ACCESS
 
     code_address = to
 
diff --git a/src/ethereum/forks/shanghai/vm/interpreter.py b/src/ethereum/forks/shanghai/vm/interpreter.py
index 6485ebe11f2..be7fbda75c2 100644
--- a/src/ethereum/forks/shanghai/vm/interpreter.py
+++ b/src/ethereum/forks/shanghai/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,19 +31,19 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     increment_nonce,
     mark_account_created,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
 )
 from ..vm import Message
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -63,6 +63,7 @@
 MAX_INIT_CODE_SIZE = 2 * MAX_CODE_SIZE
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -100,12 +101,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -156,19 +157,30 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state)
-
-    # The list of created accounts is used by `get_storage_original`.
-    mark_account_created(state, message.current_target)
-
-    increment_nonce(state, message.current_target)
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    # In the previously mentioned edge case the preexisting storage is ignored
+    # for gas refund purposes. In order to do this we must track created
+    # accounts.
+    mark_account_created(tx_state, message.current_target)
+
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             if len(contract_code) > 0:
@@ -178,15 +190,14 @@ def process_create_message(message: Message) -> Evm:
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.output = b""
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -205,7 +216,7 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
@@ -231,11 +242,14 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -266,9 +280,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state)
-    else:
-        commit_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/shanghai/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/shanghai/vm/precompiled_contracts/alt_bn128.py
index 214725d8da0..862506c54c3 100644
--- a/src/ethereum/forks/shanghai/vm/precompiled_contracts/alt_bn128.py
+++ b/src/ethereum/forks/shanghai/vm/precompiled_contracts/alt_bn128.py
@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -31,7 +31,7 @@
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ...vm import Evm
-from ...vm.gas import charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 from ..exceptions import InvalidParameter, OutOfGasError
 
@@ -149,7 +149,7 @@ def alt_bn128_add(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(150))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECADD)
 
     # OPERATION
     try:
@@ -177,7 +177,7 @@ def alt_bn128_mul(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(6000))
+    charge_gas(evm, GasCosts.PRECOMPILE_ECMUL)
 
     # OPERATION
     try:
@@ -205,7 +205,11 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, Uint(34000 * (len(data) // 192) + 45000))
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
+        + GasCosts.PRECOMPILE_ECPAIRING_BASE,
+    )
 
     # OPERATION
     if len(data) % 192 != 0:
diff --git a/src/ethereum/forks/shanghai/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/shanghai/vm/precompiled_contracts/blake2f.py
index 204fbcea280..ae53b1ab4b5 100644
--- a/src/ethereum/forks/shanghai/vm/precompiled_contracts/blake2f.py
+++ b/src/ethereum/forks/shanghai/vm/precompiled_contracts/blake2f.py
@@ -14,7 +14,7 @@
 from ethereum.crypto.blake2 import Blake2b
 
 from ...vm import Evm
-from ...vm.gas import GAS_BLAKE2_PER_ROUND, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ..exceptions import InvalidParameter
 
 
@@ -35,7 +35,7 @@ def blake2f(evm: Evm) -> None:
     blake2b = Blake2b()
     rounds, h, m, t_0, t_1, f = blake2b.get_blake2_parameters(data)
 
-    charge_gas(evm, GAS_BLAKE2_PER_ROUND * rounds)
+    charge_gas(evm, GasCosts.PRECOMPILE_BLAKE2F_PER_ROUND * rounds)
     if f not in [0, 1]:
         raise InvalidParameter
 
diff --git a/src/ethereum/forks/shanghai/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/shanghai/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/shanghai/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/shanghai/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/shanghai/vm/precompiled_contracts/identity.py b/src/ethereum/forks/shanghai/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..4b294aeefc2 100644
--- a/src/ethereum/forks/shanghai/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/shanghai/vm/precompiled_contracts/identity.py
@@ -11,12 +11,12 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +32,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/shanghai/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/shanghai/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..bbdf365d0d9 100644
--- a/src/ethereum/forks/shanghai/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/shanghai/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,13 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +35,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/shanghai/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/shanghai/vm/precompiled_contracts/sha256.py
index b0d1517b40e..f0f48b54553 100644
--- a/src/ethereum/forks/shanghai/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/shanghai/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,12 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +34,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/spurious_dragon/blocks.py b/src/ethereum/forks/spurious_dragon/blocks.py
index 507546a8f9b..f1f063a18b3 100644
--- a/src/ethereum/forks/spurious_dragon/blocks.py
+++ b/src/ethereum/forks/spurious_dragon/blocks.py
@@ -10,18 +10,20 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.crypto.hash import Hash32
+from ethereum.state import Address, Root
 
-from .fork_types import Address, Bloom, Root
+from .fork_types import Bloom
 from .transactions import Transaction
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -60,13 +62,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.spurious_dragon.state.state_root
-    [Trie]: ref:ethereum.forks.spurious_dragon.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -76,8 +79,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.spurious_dragon.trie.root
-    [Trie]: ref:ethereum.forks.spurious_dragon.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -87,8 +90,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.spurious_dragon.trie.root
-    [Trie]: ref:ethereum.forks.spurious_dragon.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -157,6 +160,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -201,6 +205,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -233,6 +238,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/spurious_dragon/fork.py b/src/ethereum/forks/spurious_dragon/fork.py
index a115049d968..b82b9fc12bc 100644
--- a/src/ethereum/forks/spurious_dragon/fork.py
+++ b/src/ethereum/forks/spurious_dragon/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Set, Tuple
+from typing import List, Set, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes32
@@ -27,21 +27,29 @@
     InvalidSenderError,
     NonceMismatchError,
 )
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt
 from .bloom import logs_bloom
-from .fork_types import EMPTY_CODE_HASH, Address
-from .state import (
-    State,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
     account_exists_and_is_empty,
     create_ether,
     destroy_account,
     destroy_touched_empty_accounts,
+    extract_block_diff,
     get_account,
+    incorporate_tx_into_block,
     increment_nonce,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
     Transaction,
@@ -49,17 +57,16 @@
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.message import prepare_message
+from .vm.gas import GasCosts
 from .vm.interpreter import process_message_call
 
 BLOCK_REWARD = U256(5 * 10**18)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 MINIMUM_DIFFICULTY = Uint(131072)
 MAX_OMMER_DEPTH = Uint(6)
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -161,9 +168,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     validate_header(chain, block.header)
     validate_ommers(block.ommers, block.header, chain)
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -177,7 +186,12 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         ommers=block.ommers,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes,
+        block_diff.storage_changes,
+        block_diff.storage_clears,
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -195,6 +209,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block_logs_bloom != block.header.bloom:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -343,6 +358,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Address:
     """
     Check if the transaction is includable in the block.
@@ -355,6 +371,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -377,7 +395,7 @@ def check_transaction(
     if tx.gas > gas_available:
         raise GasUsedExceedsLimitError("gas used exceeds limit")
     sender_address = recover_sender(block_env.chain_id, tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     max_gas_fee = tx.gas * tx.gas_price
 
@@ -463,7 +481,7 @@ def apply_body(
     for i, tx in enumerate(transactions):
         process_transaction(block_env, block_output, tx, Uint(i))
 
-    pay_rewards(block_env.state, block_env.number, block_env.coinbase, ommers)
+    pay_rewards(block_env, ommers)
 
     return block_output
 
@@ -545,9 +563,7 @@ def validate_ommers(
 
 
 def pay_rewards(
-    state: State,
-    block_number: Uint,
-    coinbase: Address,
+    block_env: vm.BlockEnvironment,
     ommers: Tuple[Header, ...],
 ) -> None:
     """
@@ -566,25 +582,24 @@ def pay_rewards(
 
     Parameters
     ----------
-    state :
-        Current account state.
-    block_number :
-        Position of the block within the chain.
-    coinbase :
-        Address of account which receives block reward and transaction fees.
+    block_env :
+        The block scoped environment.
     ommers :
         List of ommers mentioned in the current block.
 
     """
+    rewards_state = TransactionState(parent=block_env.state)
     ommer_count = U256(len(ommers))
     miner_reward = BLOCK_REWARD + (ommer_count * (BLOCK_REWARD // U256(32)))
-    create_ether(state, coinbase, miner_reward)
+    create_ether(rewards_state, block_env.coinbase, miner_reward)
 
     for ommer in ommers:
         # Ommer age with respect to the current block.
-        ommer_age = U256(block_number - ommer.number)
+        ommer_age = U256(block_env.number - ommer.number)
         ommer_miner_reward = ((U256(8) - ommer_age) * BLOCK_REWARD) // U256(8)
-        create_ether(state, ommer.coinbase, ommer_miner_reward)
+        create_ether(rewards_state, ommer.coinbase, ommer_miner_reward)
+
+    incorporate_tx_into_block(rewards_state)
 
 
 def process_transaction(
@@ -617,6 +632,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(block_output.transactions_trie, rlp.encode(Uint(index)), tx)
     intrinsic_gas = validate_transaction(tx)
 
@@ -624,23 +641,23 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     gas_fee = tx.gas * tx.gas_price
     sender_balance_after_gas_fee = Uint(sender_account.balance) - gas_fee
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     tx_env = vm.TransactionEnvironment(
         origin=sender,
         gas_price=tx.gas_price,
         gas=gas,
+        state=tx_state,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
     )
@@ -660,33 +677,42 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * tx.gas_price
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
     coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
+        tx_state, block_env.coinbase
     ).balance + U256(transaction_fee)
     if coinbase_balance_after_mining_fee != 0:
         set_account_balance(
-            block_env.state,
+            tx_state,
             block_env.coinbase,
             coinbase_balance_after_mining_fee,
         )
-    elif account_exists_and_is_empty(block_env.state, block_env.coinbase):
-        destroy_account(block_env.state, block_env.coinbase)
+    elif account_exists_and_is_empty(tx_state, block_env.coinbase):
+        destroy_account(tx_state, block_env.coinbase)
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
-    destroy_touched_empty_accounts(block_env.state, tx_output.touched_accounts)
+    destroy_touched_empty_accounts(tx_state, tx_output.touched_accounts)
 
     block_output.block_gas_used += tx_gas_used_after_refund
 
+    incorporate_tx_into_block(tx_state)
+
+    block_state = block_env.state
+    block_diff = extract_block_diff(block_state)
+    intermediate_state_root, _ = (
+        block_state.pre_state.compute_state_root_and_trie_changes(
+            block_diff.account_changes,
+            block_diff.storage_changes,
+            block_diff.storage_clears,
+        )
+    )
+
     receipt = make_receipt(
-        state_root(block_env.state),
+        intermediate_state_root,
         block_output.block_gas_used,
         tx_output.logs,
     )
@@ -709,12 +735,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
     passed through as a parameter is greater than or equal to the *sum* of
     the parent's gas and the adjustment delta then the limit for gas is too
     high and fails this function's check. Similarly, if the limit is less
     than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
+    delta *or* the predefined ``LIMIT_MINIMUM`` then this function's
     check fails because the gas limit doesn't allow for a sufficient or
     reasonable amount of gas to be used on a block.
 
@@ -732,12 +758,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/spurious_dragon/fork_types.py b/src/ethereum/forks/spurious_dragon/fork_types.py
index ae4525bbbdd..02907cd2a1a 100644
--- a/src/ethereum/forks/spurious_dragon/fork_types.py
+++ b/src/ethereum/forks/spurious_dragon/fork_types.py
@@ -11,41 +11,13 @@
 Types reused throughout the specification, which are specific to Ethereum.
 """
 
-from dataclasses import dataclass
-
 from ethereum_rlp import rlp
-from ethereum_types.bytes import Bytes, Bytes20, Bytes256
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
+from ethereum_types.bytes import Bytes, Bytes256
 
-Address = Bytes20
-Root = Hash32
+from ethereum.state import Account
 
 Bloom = Bytes256
 
-EMPTY_CODE_HASH = keccak256(b"")
-
-
-@slotted_freezable
-@dataclass
-class Account:
-    """
-    State associated with an address.
-    """
-
-    nonce: Uint
-    balance: U256
-    code_hash: Hash32
-
-
-EMPTY_ACCOUNT = Account(
-    nonce=Uint(0),
-    balance=U256(0),
-    code_hash=EMPTY_CODE_HASH,
-)
-
 
 def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     """
diff --git a/src/ethereum/forks/spurious_dragon/state.py b/src/ethereum/forks/spurious_dragon/state.py
deleted file mode 100644
index 10cf7e419b5..00000000000
--- a/src/ethereum/forks/spurious_dragon/state.py
+++ /dev/null
@@ -1,611 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, Iterable, List, Optional, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-
-from .fork_types import EMPTY_ACCOUNT, EMPTY_CODE_HASH, Account, Address, Root
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state._code_store
-
-
-def begin_transaction(state: State) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-
-
-def commit_transaction(state: State) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.pop()
-
-
-def rollback_transaction(state: State) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State``.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def account_exists_and_is_empty(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists and has zero nonce, empty code and zero
-    balance.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    exists_and_is_empty : `bool`
-        True if an account exists and has zero nonce, empty code and zero
-        balance, False otherwise.
-
-    """
-    account = get_account_optional(state, address)
-    return (
-        account is not None
-        and account.nonce == Uint(0)
-        and account.code_hash == EMPTY_CODE_HASH
-        and account.balance == 0
-    )
-
-
-def is_account_alive(state: State, address: Address) -> bool:
-    """
-    Check whether an account is both in the state and non-empty.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    is_alive : `bool`
-        True if the account is alive.
-
-    """
-    account = get_account_optional(state, address)
-    return account is not None and account != EMPTY_ACCOUNT
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def touch_account(state: State, address: Address) -> None:
-    """
-    Initializes an account to state.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        The address of the account that needs to be initialized.
-
-    """
-    if not account_exists(state, address):
-        set_account(state, address, EMPTY_ACCOUNT)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def create_ether(state: State, address: Address, amount: U256) -> None:
-    """
-    Add newly created ether to an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to which ether is added.
-    amount:
-        The amount of ether to be added to the account of interest.
-
-    """
-
-    def increase_balance(account: Account) -> None:
-        account.balance += amount
-
-    modify_state(state, address, increase_balance)
-
-
-def destroy_touched_empty_accounts(
-    state: State, touched_accounts: Iterable[Address]
-) -> None:
-    """
-    Destroy all touched accounts that are empty.
-
-    Parameters
-    ----------
-    state: `State`
-        The current state.
-    touched_accounts: `Iterable[Address]`
-        All the accounts that have been touched in the current transaction.
-
-    """
-    for address in touched_accounts:
-        if account_exists_and_is_empty(state, address):
-            destroy_account(state, address)
diff --git a/src/ethereum/forks/spurious_dragon/state_tracker.py b/src/ethereum/forks/spurious_dragon/state_tracker.py
new file mode 100644
index 00000000000..24362ecff98
--- /dev/null
+++ b/src/ethereum/forks/spurious_dragon/state_tracker.py
@@ -0,0 +1,805 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+
+    ``storage_clears`` records addresses whose storage was wiped by
+    a pre-EIP-6780 ``SELFDESTRUCT`` earlier in the block, so later
+    reads must not fall back to ``pre_state`` storage.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    storage_clears: Set[Address] = field(default_factory=set)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    storage_clears: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.storage_clears:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if address in tx_state.storage_clears:
+        return False
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    if address in tx_state.parent.storage_clears:
+        return False
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+    tx_state.storage_clears.add(address)
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        storage_clears=set(tx_state.storage_clears),
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.storage_clears = snapshot.storage_clears
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address in tx_state.storage_clears:
+        block.storage_clears.add(address)
+        block.storage_writes.pop(address, None)
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.storage_clears.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+        storage_clears=block_state.storage_clears,
+    )
+
+
+def destroy_touched_empty_accounts(
+    tx_state: TransactionState, touched_accounts: Set[Address]
+) -> None:
+    """
+    Destroy all touched accounts that are empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    touched_accounts :
+        All the accounts that have been touched in the current transaction.
+
+    """
+    for address in touched_accounts:
+        if account_exists_and_is_empty(tx_state, address):
+            destroy_account(tx_state, address)
+
+
+def touch_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Initialize an account to state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be initialized.
+
+    """
+    if not account_exists(tx_state, address):
+        set_account(tx_state, address, EMPTY_ACCOUNT)
diff --git a/src/ethereum/forks/spurious_dragon/transactions.py b/src/ethereum/forks/spurious_dragon/transactions.py
index 278238f8d5a..8272ebea080 100644
--- a/src/ethereum/forks/spurious_dragon/transactions.py
+++ b/src/ethereum/forks/spurious_dragon/transactions.py
@@ -5,6 +5,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0
@@ -18,31 +19,10 @@
     InvalidSignatureError,
     NonceOverflowError,
 )
-
-from .fork_types import Address
-
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_PER_NON_ZERO = Uint(68)
-"""
-Gas cost per non-zero byte in the transaction data.
-"""
-
-GAS_TX_DATA_PER_ZERO = Uint(4)
-"""
-Gas cost per zero byte in the transaction data.
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
+from ethereum.state import Address
 
 
+@final
 @slotted_freezable
 @dataclass
 class Transaction:
@@ -143,26 +123,28 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
 
     This function takes a transaction as a parameter and returns the intrinsic
     gas cost of the transaction.
     """
+    from .vm.gas import GasCosts
+
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
     data_cost = (
-        num_zeros * GAS_TX_DATA_PER_ZERO
-        + num_non_zeros * GAS_TX_DATA_PER_NON_ZERO
+        num_zeros * GasCosts.TX_DATA_PER_ZERO
+        + num_non_zeros * GasCosts.TX_DATA_PER_NON_ZERO
     )
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE
+        create_cost = GasCosts.TX_CREATE
     else:
         create_cost = Uint(0)
 
-    return GAS_TX_BASE + data_cost + create_cost
+    return GasCosts.TX_BASE + data_cost + create_cost
 
 
 def recover_sender(chain_id: U64, tx: Transaction) -> Address:
diff --git a/src/ethereum/forks/spurious_dragon/trie.py b/src/ethereum/forks/spurious_dragon/trie.py
deleted file mode 100644
index fce2ff05bfd..00000000000
--- a/src/ethereum/forks/spurious_dragon/trie.py
+++ /dev/null
@@ -1,498 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    assert_type,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.tangerine_whistle import trie as previous_trie
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt
-from .fork_types import Account, Address, Root, encode_account
-from .transactions import Transaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = Account | Bytes | Transaction | Receipt | Uint | U256 | None
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[Transaction],
-    Optional[Receipt],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `rlp.Extended`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (Transaction, Receipt, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/spurious_dragon/utils/hexadecimal.py b/src/ethereum/forks/spurious_dragon/utils/hexadecimal.py
index 303561c837e..12a1e3f4167 100644
--- a/src/ethereum/forks/spurious_dragon/utils/hexadecimal.py
+++ b/src/ethereum/forks/spurious_dragon/utils/hexadecimal.py
@@ -14,11 +14,9 @@
 
 from ethereum_types.bytes import Bytes
 
-from ethereum.state import Address
+from ethereum.state import Address, Root
 from ethereum.utils.hexadecimal import remove_hex_prefix
 
-from ..fork_types import Root
-
 
 def hex_to_root(hex_string: str) -> Root:
     """
diff --git a/src/ethereum/forks/spurious_dragon/utils/message.py b/src/ethereum/forks/spurious_dragon/utils/message.py
index f08934cc2e9..dad6858f5a7 100644
--- a/src/ethereum/forks/spurious_dragon/utils/message.py
+++ b/src/ethereum/forks/spurious_dragon/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from .address import compute_contract_address
@@ -49,7 +49,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -57,8 +57,8 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        account = get_account(block_env.state, tx.to)
-        code = get_code(block_env.state, account.code_hash)
+        account = get_account(tx_env.state, tx.to)
+        code = get_code(tx_env.state, account.code_hash)
 
         code_address = tx.to
     else:
diff --git a/src/ethereum/forks/spurious_dragon/vm/__init__.py b/src/ethereum/forks/spurious_dragon/vm/__init__.py
index c588025cee7..f59c032ee71 100644
--- a/src/ethereum/forks/spurious_dragon/vm/__init__.py
+++ b/src/ethereum/forks/spurious_dragon/vm/__init__.py
@@ -13,24 +13,29 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt
-from ..state import State, account_exists_and_is_empty
+from ..state_tracker import (
+    BlockState,
+    TransactionState,
+    account_exists_and_is_empty,
+)
 from ..transactions import Transaction
-from ..trie import Trie
 from .precompiled_contracts import RIPEMD160_ADDRESS
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -38,7 +43,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -47,6 +52,7 @@ class BlockEnvironment:
     difficulty: Uint
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -78,19 +84,22 @@ class BlockOutput:
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
     gas_price: Uint
     gas: Uint
+    state: TransactionState
     index_in_block: Uint
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -112,6 +121,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
@@ -150,7 +160,7 @@ def incorporate_child_on_success(evm: Evm, child_evm: Evm) -> None:
     evm.accounts_to_delete.update(child_evm.accounts_to_delete)
     evm.touched_accounts.update(child_evm.touched_accounts)
     if account_exists_and_is_empty(
-        evm.message.block_env.state, child_evm.message.current_target
+        evm.message.tx_env.state, child_evm.message.current_target
     ):
         evm.touched_accounts.add(child_evm.message.current_target)
 
@@ -178,7 +188,7 @@ def incorporate_child_on_error(evm: Evm, child_evm: Evm) -> None:
         evm.touched_accounts.add(RIPEMD160_ADDRESS)
     if child_evm.message.current_target == RIPEMD160_ADDRESS:
         if account_exists_and_is_empty(
-            evm.message.block_env.state, child_evm.message.current_target
+            evm.message.tx_env.state, child_evm.message.current_target
         ):
             evm.touched_accounts.add(RIPEMD160_ADDRESS)
     evm.gas_left += child_evm.gas_left
diff --git a/src/ethereum/forks/spurious_dragon/vm/gas.py b/src/ethereum/forks/spurious_dragon/vm/gas.py
index 7f9fe700db3..6c82566515f 100644
--- a/src/ethereum/forks/spurious_dragon/vm/gas.py
+++ b/src/ethereum/forks/spurious_dragon/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32
@@ -22,47 +22,132 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_SLOAD = Uint(200)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 15000
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_EXTERNAL = Uint(700)
-GAS_BALANCE = Uint(400)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_CALL = Uint(700)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-REFUND_SELF_DESTRUCT = 24000
-GAS_ECRECOVER = Uint(3000)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    SLOAD: Final[Uint] = Uint(200)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 15000
+    REFUND_SELF_DESTRUCT: Final[int] = 24000
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_PER_ZERO: Final[Uint] = Uint(4)
+    TX_DATA_PER_NON_ZERO: Final[Uint] = Uint(68)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_DIFFICULTY: Final[Uint] = BASE
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(50)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+    OPCODE_EXTERNAL_BASE: Final[Uint] = Uint(700)
+    OPCODE_BALANCE: Final[Uint] = Uint(400)
+    OPCODE_CALL_BASE: Final[Uint] = Uint(700)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -78,11 +163,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -134,7 +220,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -164,7 +250,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -189,7 +275,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/arithmetic.py b/src/ethereum/forks/spurious_dragon/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/spurious_dragon/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/spurious_dragon/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/bitwise.py b/src/ethereum/forks/spurious_dragon/vm/instructions/bitwise.py
index 2a506f55751..62da98041ad 100644
--- a/src/ethereum/forks/spurious_dragon/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/spurious_dragon/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/block.py b/src/ethereum/forks/spurious_dragon/vm/instructions/block.py
index 0edcbf000d1..fbca7daa37c 100644
--- a/src/ethereum/forks/spurious_dragon/vm/instructions/block.py
+++ b/src/ethereum/forks/spurious_dragon/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -33,7 +33,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -75,7 +75,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -102,7 +102,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -128,7 +128,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -154,7 +154,7 @@ def difficulty(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_DIFFICULTY)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.difficulty))
@@ -180,7 +180,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/comparison.py b/src/ethereum/forks/spurious_dragon/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/spurious_dragon/vm/instructions/comparison.py
+++ b/src/ethereum/forks/spurious_dragon/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/control_flow.py b/src/ethereum/forks/spurious_dragon/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/spurious_dragon/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/spurious_dragon/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/environment.py b/src/ethereum/forks/spurious_dragon/vm/instructions/environment.py
index 83eb5528226..d85aaf0c97a 100644
--- a/src/ethereum/forks/spurious_dragon/vm/instructions/environment.py
+++ b/src/ethereum/forks/spurious_dragon/vm/instructions/environment.py
@@ -15,16 +15,12 @@
 
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..gas import (
-    GAS_BALANCE,
-    GAS_BASE,
-    GAS_COPY,
-    GAS_EXTERNAL,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -45,7 +41,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -68,11 +64,12 @@ def balance(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BALANCE)
+    charge_gas(evm, GasCosts.OPCODE_BALANCE)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -95,7 +92,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -118,7 +115,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -141,7 +138,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -165,7 +162,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -190,7 +187,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -219,11 +216,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -248,7 +248,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -277,11 +277,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -306,7 +309,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -329,11 +332,12 @@ def extcodesize(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_EXTERNAL)
+    charge_gas(evm, GasCosts.OPCODE_EXTERNAL_BASE)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -360,16 +364,20 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_EXTERNAL + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_EXTERNAL_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/keccak.py b/src/ethereum/forks/spurious_dragon/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/spurious_dragon/vm/instructions/keccak.py
+++ b/src/ethereum/forks/spurious_dragon/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/log.py b/src/ethereum/forks/spurious_dragon/vm/instructions/log.py
index 76c02e737a4..3cfb69c194c 100644
--- a/src/ethereum/forks/spurious_dragon/vm/instructions/log.py
+++ b/src/ethereum/forks/spurious_dragon/vm/instructions/log.py
@@ -12,15 +12,14 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
 from ...blocks import Log
 from .. import Evm
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -58,9 +57,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -78,8 +77,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/memory.py b/src/ethereum/forks/spurious_dragon/vm/instructions/memory.py
index 3a242ba2f7a..93861811559 100644
--- a/src/ethereum/forks/spurious_dragon/vm/instructions/memory.py
+++ b/src/ethereum/forks/spurious_dragon/vm/instructions/memory.py
@@ -16,8 +16,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,7 +45,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -77,7 +76,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -105,7 +104,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -132,7 +131,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/stack.py b/src/ethereum/forks/spurious_dragon/vm/instructions/stack.py
index 0fc0d3fe4b5..901bff4ed3b 100644
--- a/src/ethereum/forks/spurious_dragon/vm/instructions/stack.py
+++ b/src/ethereum/forks/spurious_dragon/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -62,7 +66,7 @@ def push_n(evm: Evm, num_bytes: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -92,7 +96,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -124,7 +128,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -136,69 +140,69 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/storage.py b/src/ethereum/forks/spurious_dragon/vm/instructions/storage.py
index 8748340fc27..16921a1a7fb 100644
--- a/src/ethereum/forks/spurious_dragon/vm/instructions/storage.py
+++ b/src/ethereum/forks/spurious_dragon/vm/instructions/storage.py
@@ -13,13 +13,10 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import get_storage, set_storage
+from ...state_tracker import get_storage, set_storage
 from .. import Evm
 from ..gas import (
-    GAS_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -40,12 +37,11 @@ def sload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_SLOAD)
+    charge_gas(evm, GasCosts.SLOAD)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -68,20 +64,20 @@ def sstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    state = evm.message.block_env.state
-    current_value = get_storage(state, evm.message.current_target, key)
+    tx_state = evm.message.tx_env.state
+    current_value = get_storage(tx_state, evm.message.current_target, key)
     if new_value != 0 and current_value == 0:
-        gas_cost = GAS_STORAGE_SET
+        gas_cost = GasCosts.STORAGE_SET
     else:
-        gas_cost = GAS_STORAGE_UPDATE
+        gas_cost = GasCosts.COLD_STORAGE_WRITE
 
     if new_value == 0 and current_value != 0:
-        evm.refund_counter += REFUND_STORAGE_CLEAR
+        evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
     charge_gas(evm, gas_cost)
 
     # OPERATION
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/system.py b/src/ethereum/forks/spurious_dragon/vm/instructions/system.py
index e35d7a5a7c7..b5ff4bb23bc 100644
--- a/src/ethereum/forks/spurious_dragon/vm/instructions/system.py
+++ b/src/ethereum/forks/spurious_dragon/vm/instructions/system.py
@@ -16,7 +16,7 @@
 
 from ethereum.state import Address
 
-from ...state import (
+from ...state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
@@ -34,14 +34,7 @@
     incorporate_child_on_success,
 )
 from ..gas import (
-    GAS_CALL,
-    GAS_CALL_VALUE,
-    GAS_CREATE,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_ZERO,
-    REFUND_SELF_DESTRUCT,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -75,7 +68,7 @@ def create(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost)
 
     create_message_gas = max_message_call_gas(Uint(evm.gas_left))
     evm.gas_left -= create_message_gas
@@ -83,12 +76,12 @@ def create(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -100,20 +93,16 @@ def create(evm: Evm) -> None:
         push(evm.stack, U256(0))
         evm.gas_left += create_message_gas
     elif account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
     else:
         call_data = memory_read_bytes(
             evm.memory, memory_start_position, memory_size
         )
 
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
         child_message = Message(
             block_env=evm.message.block_env,
@@ -164,7 +153,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -204,8 +193,8 @@ def generic_call(
     call_data = memory_read_bytes(
         evm.memory, memory_input_start_position, memory_input_size
     )
-    account = get_account(evm.message.block_env.state, code_address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    account = get_account(evm.message.tx_env.state, code_address)
+    code = get_code(evm.message.tx_env.state, account.code_hash)
     child_message = Message(
         block_env=evm.message.block_env,
         tx_env=evm.message.tx_env,
@@ -268,23 +257,23 @@ def call(evm: Evm) -> None:
 
     code_address = to
 
-    create_gas_cost = GAS_NEW_ACCOUNT
-    if value == 0 or is_account_alive(evm.message.block_env.state, to):
+    create_gas_cost = GasCosts.NEW_ACCOUNT
+    if value == 0 or is_account_alive(evm.message.tx_env.state, to):
         create_gas_cost = Uint(0)
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
         Uint(evm.gas_left),
         extend_memory.cost,
-        GAS_CALL + create_gas_cost + transfer_gas_cost,
+        GasCosts.OPCODE_CALL_BASE + create_gas_cost + transfer_gas_cost,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -337,20 +326,20 @@ def callcode(evm: Evm) -> None:
             (memory_output_start_position, memory_output_size),
         ],
     )
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
         Uint(evm.gas_left),
         extend_memory.cost,
-        GAS_CALL + transfer_gas_cost,
+        GasCosts.OPCODE_CALL_BASE + transfer_gas_cost,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -388,15 +377,15 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
     if (
-        not is_account_alive(evm.message.block_env.state, beneficiary)
+        not is_account_alive(evm.message.tx_env.state, beneficiary)
         and get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).balance
         != 0
     ):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     originator = evm.message.current_target
 
@@ -407,33 +396,33 @@ def selfdestruct(evm: Evm) -> None:
         parent_evm = parent_evm.message.parent_evm
 
     if originator not in refunded_accounts:
-        evm.refund_counter += REFUND_SELF_DESTRUCT
+        evm.refund_counter += GasCosts.REFUND_SELF_DESTRUCT
 
     charge_gas(evm, gas_cost)
 
     beneficiary_balance = get_account(
-        evm.message.block_env.state, beneficiary
+        evm.message.tx_env.state, beneficiary
     ).balance
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     # First Transfer to beneficiary
     set_account_balance(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         beneficiary,
         beneficiary_balance + originator_balance,
     )
     # Next, Zero the balance of the address being deleted (must come after
     # sending to beneficiary in case the contract named itself as the
     # beneficiary).
-    set_account_balance(evm.message.block_env.state, originator, U256(0))
+    set_account_balance(evm.message.tx_env.state, originator, U256(0))
 
     # register account for deletion
     evm.accounts_to_delete.add(originator)
 
     # mark beneficiary as touched
-    if account_exists_and_is_empty(evm.message.block_env.state, beneficiary):
+    if account_exists_and_is_empty(evm.message.tx_env.state, beneficiary):
         evm.touched_accounts.add(beneficiary)
 
     # HALT the execution
@@ -470,7 +459,11 @@ def delegatecall(evm: Evm) -> None:
         ],
     )
     message_call_gas = calculate_message_call_gas(
-        U256(0), gas, Uint(evm.gas_left), extend_memory.cost, GAS_CALL
+        U256(0),
+        gas,
+        Uint(evm.gas_left),
+        extend_memory.cost,
+        GasCosts.OPCODE_CALL_BASE,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
diff --git a/src/ethereum/forks/spurious_dragon/vm/interpreter.py b/src/ethereum/forks/spurious_dragon/vm/interpreter.py
index e65ffc2020a..622014f0047 100644
--- a/src/ethereum/forks/spurious_dragon/vm/interpreter.py
+++ b/src/ethereum/forks/spurious_dragon/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,20 +31,20 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_exists_and_is_empty,
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     increment_nonce,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
     touch_account,
 )
 from ..vm import Message
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -61,6 +61,7 @@
 MAX_CODE_SIZE = 0x6000
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -100,12 +101,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -119,9 +120,7 @@ def process_message_call(message: Message) -> MessageCallOutput:
             evm = process_create_message(message)
     else:
         evm = process_message(message)
-        if account_exists_and_is_empty(
-            block_env.state, Address(message.target)
-        ):
+        if account_exists_and_is_empty(tx_state, Address(message.target)):
             evm.touched_accounts.add(Address(message.target))
 
     if evm.error:
@@ -164,30 +163,38 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state)
-
-    increment_nonce(state, message.current_target)
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` or `CREATE2` call.
+    # * The first `CREATE` happened before Spurious Dragon and left empty
+    #   code.
+    destroy_storage(tx_state, message.current_target)
+
+    increment_nonce(tx_state, message.current_target)
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             charge_gas(evm, contract_code_gas)
             if len(contract_code) > MAX_CODE_SIZE:
                 raise OutOfGasError
         except ExceptionalHalt as error:
-            rollback_transaction(state)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -206,7 +213,7 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
@@ -230,13 +237,16 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
 
-    touch_account(state, message.current_target)
+    touch_account(tx_state, message.current_target)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -263,9 +273,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state)
-    else:
-        commit_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/spurious_dragon/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/spurious_dragon/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/spurious_dragon/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/spurious_dragon/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/spurious_dragon/vm/precompiled_contracts/identity.py b/src/ethereum/forks/spurious_dragon/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/spurious_dragon/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/spurious_dragon/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/spurious_dragon/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/spurious_dragon/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/spurious_dragon/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/spurious_dragon/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/spurious_dragon/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/spurious_dragon/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/spurious_dragon/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/spurious_dragon/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/forks/tangerine_whistle/blocks.py b/src/ethereum/forks/tangerine_whistle/blocks.py
index 664418b9f72..ddc52041b03 100644
--- a/src/ethereum/forks/tangerine_whistle/blocks.py
+++ b/src/ethereum/forks/tangerine_whistle/blocks.py
@@ -10,18 +10,20 @@
 """
 
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.crypto.hash import Hash32
+from ethereum.state import Address, Root
 
-from .fork_types import Address, Bloom, Root
+from .fork_types import Bloom
 from .transactions import Transaction
 
 
+@final
 @slotted_freezable
 @dataclass
 class Header:
@@ -60,13 +62,14 @@ class Header:
     Root hash ([`keccak256`]) of the state trie after executing all
     transactions in this block. It represents the state of the Ethereum Virtual
     Machine (EVM) after all transactions in this block have been processed. It
-    is computed using the [`state_root()`] function, which computes the root
-    of the Merkle-Patricia [Trie] representing the Ethereum world state.
+    is computed using [`compute_state_root_and_trie_changes()`][changes],
+    which computes the root of the Merkle-Patricia [Trie] representing the
+    Ethereum world state after applying the block's state changes.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`state_root()`]: ref:ethereum.forks.tangerine_whistle.state.state_root
-    [Trie]: ref:ethereum.forks.tangerine_whistle.trie.Trie
-    """
+    [changes]: ref:ethereum.state.State.compute_state_root_and_trie_changes
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
+    """  # noqa: E501
 
     transactions_root: Root
     """
@@ -76,8 +79,8 @@ class Header:
     transactions as the parameter.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.tangerine_whistle.trie.root
-    [Trie]: ref:ethereum.forks.tangerine_whistle.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     receipt_root: Root
@@ -87,8 +90,8 @@ class Header:
     function over the Merkle-Patricia [trie] constructed from the receipts.
 
     [`keccak256`]: ref:ethereum.crypto.hash.keccak256
-    [`root()`]: ref:ethereum.forks.tangerine_whistle.trie.root
-    [Trie]: ref:ethereum.forks.tangerine_whistle.trie.Trie
+    [`root()`]: ref:ethereum.merkle_patricia_trie.root
+    [Trie]: ref:ethereum.merkle_patricia_trie.Trie
     """
 
     bloom: Bloom
@@ -157,6 +160,7 @@ class Header:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Block:
@@ -201,6 +205,7 @@ class Block:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Log:
@@ -233,6 +238,7 @@ class Log:
     """
 
 
+@final
 @slotted_freezable
 @dataclass
 class Receipt:
diff --git a/src/ethereum/forks/tangerine_whistle/fork.py b/src/ethereum/forks/tangerine_whistle/fork.py
index 162a6bd1b7a..cf0a29d826f 100644
--- a/src/ethereum/forks/tangerine_whistle/fork.py
+++ b/src/ethereum/forks/tangerine_whistle/fork.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Set, Tuple
+from typing import List, Set, Tuple, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes32
@@ -27,19 +27,27 @@
     InvalidSenderError,
     NonceMismatchError,
 )
+from ethereum.merkle_patricia_trie import root, trie_set
+from ethereum.state import (
+    EMPTY_CODE_HASH,
+    Address,
+    State,
+    apply_changes_to_state,
+)
 
 from . import vm
 from .blocks import Block, Header, Log, Receipt
 from .bloom import logs_bloom
-from .fork_types import EMPTY_CODE_HASH, Address
-from .state import (
-    State,
+from .state_tracker import (
+    BlockState,
+    TransactionState,
     create_ether,
     destroy_account,
+    extract_block_diff,
     get_account,
+    incorporate_tx_into_block,
     increment_nonce,
     set_account_balance,
-    state_root,
 )
 from .transactions import (
     Transaction,
@@ -47,17 +55,16 @@
     recover_sender,
     validate_transaction,
 )
-from .trie import root, trie_set
 from .utils.message import prepare_message
+from .vm.gas import GasCosts
 from .vm.interpreter import process_message_call
 
 BLOCK_REWARD = U256(5 * 10**18)
-GAS_LIMIT_ADJUSTMENT_FACTOR = Uint(1024)
-GAS_LIMIT_MINIMUM = Uint(5000)
 MINIMUM_DIFFICULTY = Uint(131072)
 MAX_OMMER_DEPTH = Uint(6)
 
 
+@final
 @dataclass
 class BlockChain:
     """
@@ -159,9 +166,11 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     validate_header(chain, block.header)
     validate_ommers(block.ommers, block.header, chain)
 
+    block_state = BlockState(pre_state=chain.state)
+
     block_env = vm.BlockEnvironment(
         chain_id=chain.chain_id,
-        state=chain.state,
+        state=block_state,
         block_gas_limit=block.header.gas_limit,
         block_hashes=get_last_256_block_hashes(chain),
         coinbase=block.header.coinbase,
@@ -175,7 +184,12 @@ def state_transition(chain: BlockChain, block: Block) -> None:
         transactions=block.transactions,
         ommers=block.ommers,
     )
-    block_state_root = state_root(block_env.state)
+    block_diff = extract_block_diff(block_state)
+    block_state_root, _ = chain.state.compute_state_root_and_trie_changes(
+        block_diff.account_changes,
+        block_diff.storage_changes,
+        block_diff.storage_clears,
+    )
     transactions_root = root(block_output.transactions_trie)
     receipt_root = root(block_output.receipts_trie)
     block_logs_bloom = logs_bloom(block_output.block_logs)
@@ -193,6 +207,7 @@ def state_transition(chain: BlockChain, block: Block) -> None:
     if block_logs_bloom != block.header.bloom:
         raise InvalidBlock
 
+    apply_changes_to_state(chain.state, block_diff)
     chain.blocks.append(block)
     if len(chain.blocks) > 255:
         # Real clients have to store more blocks to deal with reorgs, but the
@@ -341,6 +356,7 @@ def check_transaction(
     block_env: vm.BlockEnvironment,
     block_output: vm.BlockOutput,
     tx: Transaction,
+    tx_state: TransactionState,
 ) -> Address:
     """
     Check if the transaction is includable in the block.
@@ -353,6 +369,8 @@ def check_transaction(
         The block output for the current block.
     tx :
         The transaction.
+    tx_state :
+        The transaction state tracker.
 
     Returns
     -------
@@ -375,7 +393,7 @@ def check_transaction(
     if tx.gas > gas_available:
         raise GasUsedExceedsLimitError("gas used exceeds limit")
     sender_address = recover_sender(tx)
-    sender_account = get_account(block_env.state, sender_address)
+    sender_account = get_account(tx_state, sender_address)
 
     max_gas_fee = tx.gas * tx.gas_price
 
@@ -461,7 +479,7 @@ def apply_body(
     for i, tx in enumerate(transactions):
         process_transaction(block_env, block_output, tx, Uint(i))
 
-    pay_rewards(block_env.state, block_env.number, block_env.coinbase, ommers)
+    pay_rewards(block_env, ommers)
 
     return block_output
 
@@ -543,9 +561,7 @@ def validate_ommers(
 
 
 def pay_rewards(
-    state: State,
-    block_number: Uint,
-    coinbase: Address,
+    block_env: vm.BlockEnvironment,
     ommers: Tuple[Header, ...],
 ) -> None:
     """
@@ -564,25 +580,24 @@ def pay_rewards(
 
     Parameters
     ----------
-    state :
-        Current account state.
-    block_number :
-        Position of the block within the chain.
-    coinbase :
-        Address of account which receives block reward and transaction fees.
+    block_env :
+        The block scoped environment.
     ommers :
         List of ommers mentioned in the current block.
 
     """
+    rewards_state = TransactionState(parent=block_env.state)
     ommer_count = U256(len(ommers))
     miner_reward = BLOCK_REWARD + (ommer_count * (BLOCK_REWARD // U256(32)))
-    create_ether(state, coinbase, miner_reward)
+    create_ether(rewards_state, block_env.coinbase, miner_reward)
 
     for ommer in ommers:
         # Ommer age with respect to the current block.
-        ommer_age = U256(block_number - ommer.number)
+        ommer_age = U256(block_env.number - ommer.number)
         ommer_miner_reward = ((U256(8) - ommer_age) * BLOCK_REWARD) // U256(8)
-        create_ether(state, ommer.coinbase, ommer_miner_reward)
+        create_ether(rewards_state, ommer.coinbase, ommer_miner_reward)
+
+    incorporate_tx_into_block(rewards_state)
 
 
 def process_transaction(
@@ -615,6 +630,8 @@ def process_transaction(
         Index of the transaction in the block.
 
     """
+    tx_state = TransactionState(parent=block_env.state)
+
     trie_set(block_output.transactions_trie, rlp.encode(Uint(index)), tx)
     intrinsic_gas = validate_transaction(tx)
 
@@ -622,23 +639,23 @@ def process_transaction(
         block_env=block_env,
         block_output=block_output,
         tx=tx,
+        tx_state=tx_state,
     )
 
-    sender_account = get_account(block_env.state, sender)
+    sender_account = get_account(tx_state, sender)
 
     gas = tx.gas - intrinsic_gas
-    increment_nonce(block_env.state, sender)
+    increment_nonce(tx_state, sender)
 
     gas_fee = tx.gas * tx.gas_price
     sender_balance_after_gas_fee = Uint(sender_account.balance) - gas_fee
-    set_account_balance(
-        block_env.state, sender, U256(sender_balance_after_gas_fee)
-    )
+    set_account_balance(tx_state, sender, U256(sender_balance_after_gas_fee))
 
     tx_env = vm.TransactionEnvironment(
         origin=sender,
         gas_price=tx.gas_price,
         gas=gas,
+        state=tx_state,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
     )
@@ -658,26 +675,30 @@ def process_transaction(
     transaction_fee = tx_gas_used_after_refund * tx.gas_price
 
     # refund gas
-    sender_balance_after_refund = get_account(
-        block_env.state, sender
-    ).balance + U256(gas_refund_amount)
-    set_account_balance(block_env.state, sender, sender_balance_after_refund)
+    create_ether(tx_state, sender, U256(gas_refund_amount))
 
     # transfer miner fees
-    coinbase_balance_after_mining_fee = get_account(
-        block_env.state, block_env.coinbase
-    ).balance + U256(transaction_fee)
-    set_account_balance(
-        block_env.state, block_env.coinbase, coinbase_balance_after_mining_fee
-    )
+    create_ether(tx_state, block_env.coinbase, U256(transaction_fee))
 
     for address in tx_output.accounts_to_delete:
-        destroy_account(block_env.state, address)
+        destroy_account(tx_state, address)
 
     block_output.block_gas_used += tx_gas_used_after_refund
 
+    incorporate_tx_into_block(tx_state)
+
+    block_state = block_env.state
+    block_diff = extract_block_diff(block_state)
+    intermediate_state_root, _ = (
+        block_state.pre_state.compute_state_root_and_trie_changes(
+            block_diff.account_changes,
+            block_diff.storage_changes,
+            block_diff.storage_clears,
+        )
+    )
+
     receipt = make_receipt(
-        state_root(block_env.state),
+        intermediate_state_root,
         block_output.block_gas_used,
         tx_output.logs,
     )
@@ -700,12 +721,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
 
     The bounds of the gas limit, ``max_adjustment_delta``, is set as the
     quotient of the parent block's gas limit and the
-    ``GAS_LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
+    ``LIMIT_ADJUSTMENT_FACTOR``. Therefore, if the gas limit that is
     passed through as a parameter is greater than or equal to the *sum* of
     the parent's gas and the adjustment delta then the limit for gas is too
     high and fails this function's check. Similarly, if the limit is less
     than or equal to the *difference* of the parent's gas and the adjustment
-    delta *or* the predefined ``GAS_LIMIT_MINIMUM`` then this function's
+    delta *or* the predefined ``LIMIT_MINIMUM`` then this function's
     check fails because the gas limit doesn't allow for a sufficient or
     reasonable amount of gas to be used on a block.
 
@@ -723,12 +744,12 @@ def check_gas_limit(gas_limit: Uint, parent_gas_limit: Uint) -> bool:
         True if gas limit constraints are satisfied, False otherwise.
 
     """
-    max_adjustment_delta = parent_gas_limit // GAS_LIMIT_ADJUSTMENT_FACTOR
+    max_adjustment_delta = parent_gas_limit // GasCosts.LIMIT_ADJUSTMENT_FACTOR
     if gas_limit >= parent_gas_limit + max_adjustment_delta:
         return False
     if gas_limit <= parent_gas_limit - max_adjustment_delta:
         return False
-    if gas_limit < GAS_LIMIT_MINIMUM:
+    if gas_limit < GasCosts.LIMIT_MINIMUM:
         return False
 
     return True
diff --git a/src/ethereum/forks/tangerine_whistle/fork_types.py b/src/ethereum/forks/tangerine_whistle/fork_types.py
index ae4525bbbdd..02907cd2a1a 100644
--- a/src/ethereum/forks/tangerine_whistle/fork_types.py
+++ b/src/ethereum/forks/tangerine_whistle/fork_types.py
@@ -11,41 +11,13 @@
 Types reused throughout the specification, which are specific to Ethereum.
 """
 
-from dataclasses import dataclass
-
 from ethereum_rlp import rlp
-from ethereum_types.bytes import Bytes, Bytes20, Bytes256
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
+from ethereum_types.bytes import Bytes, Bytes256
 
-Address = Bytes20
-Root = Hash32
+from ethereum.state import Account
 
 Bloom = Bytes256
 
-EMPTY_CODE_HASH = keccak256(b"")
-
-
-@slotted_freezable
-@dataclass
-class Account:
-    """
-    State associated with an address.
-    """
-
-    nonce: Uint
-    balance: U256
-    code_hash: Hash32
-
-
-EMPTY_ACCOUNT = Account(
-    nonce=Uint(0),
-    balance=U256(0),
-    code_hash=EMPTY_CODE_HASH,
-)
-
 
 def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
     """
diff --git a/src/ethereum/forks/tangerine_whistle/state.py b/src/ethereum/forks/tangerine_whistle/state.py
deleted file mode 100644
index 69f5cca8dc0..00000000000
--- a/src/ethereum/forks/tangerine_whistle/state.py
+++ /dev/null
@@ -1,543 +0,0 @@
-"""
-State.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state contains all information that is preserved between transactions.
-
-It consists of a main account trie and storage tries for each contract.
-
-There is a distinction between an account that does not exist and
-`EMPTY_ACCOUNT`.
-"""
-
-from dataclasses import dataclass, field
-from typing import Callable, Dict, List, Optional, Tuple
-
-from ethereum_types.bytes import Bytes, Bytes32
-from ethereum_types.frozen import modify
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import Hash32, keccak256
-
-from .fork_types import EMPTY_ACCOUNT, EMPTY_CODE_HASH, Account, Address, Root
-from .trie import EMPTY_TRIE_ROOT, Trie, copy_trie, root, trie_get, trie_set
-
-
-@dataclass
-class State:
-    """
-    Contains all information that is preserved between transactions.
-    """
-
-    _main_trie: Trie[Address, Optional[Account]] = field(
-        default_factory=lambda: Trie(secured=True, default=None)
-    )
-    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
-        default_factory=dict
-    )
-    _snapshots: List[
-        Tuple[
-            Trie[Address, Optional[Account]],
-            Dict[Address, Trie[Bytes32, U256]],
-        ]
-    ] = field(default_factory=list)
-    _code_store: Dict[Hash32, Bytes] = field(
-        default_factory=dict, compare=False
-    )
-
-
-def close_state(state: State) -> None:
-    """
-    Free resources held by the state. Used by optimized implementations to
-    release file descriptors.
-    """
-    del state._main_trie
-    del state._storage_tries
-    del state._snapshots
-    del state._code_store
-
-
-def begin_transaction(state: State) -> None:
-    """
-    Start a state transaction.
-
-    Transactions are entirely implicit and can be nested. It is not possible to
-    calculate the state root during a transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.append(
-        (
-            copy_trie(state._main_trie),
-            {k: copy_trie(t) for (k, t) in state._storage_tries.items()},
-        )
-    )
-
-
-def commit_transaction(state: State) -> None:
-    """
-    Commit a state transaction.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._snapshots.pop()
-
-
-def rollback_transaction(state: State) -> None:
-    """
-    Rollback a state transaction, resetting the state to the point when the
-    corresponding `begin_transaction()` call was made.
-
-    Parameters
-    ----------
-    state : State
-        The state.
-
-    """
-    state._main_trie, state._storage_tries = state._snapshots.pop()
-
-
-def get_account(state: State, address: Address) -> Account:
-    """
-    Get the `Account` object at an address. Returns `EMPTY_ACCOUNT` if there
-    is no account at the address.
-
-    Use `get_account_optional()` if you care about the difference between a
-    non-existent account and `EMPTY_ACCOUNT`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = get_account_optional(state, address)
-    if isinstance(account, Account):
-        return account
-    else:
-        return EMPTY_ACCOUNT
-
-
-def get_account_optional(state: State, address: Address) -> Optional[Account]:
-    """
-    Get the `Account` object at an address. Returns `None` (rather than
-    `EMPTY_ACCOUNT`) if there is no account at the address.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to lookup.
-
-    Returns
-    -------
-    account : `Account`
-        Account at address.
-
-    """
-    account = trie_get(state._main_trie, address)
-    return account
-
-
-def get_code(state: State, code_hash: Hash32) -> Bytes:
-    """
-    Get the bytecode for a given code hash.
-    """
-    if code_hash == EMPTY_CODE_HASH:
-        return b""
-    return state._code_store[code_hash]
-
-
-def store_code(state: State, code: Bytes) -> Hash32:
-    """
-    Store bytecode in ``State``.
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-    return code_hash
-
-
-def set_account(
-    state: State, address: Address, account: Optional[Account]
-) -> None:
-    """
-    Set the `Account` object at an address. Setting to `None` deletes
-    the account (but not its storage, see `destroy_account()`).
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address to set.
-    account : `Account`
-        Account to set at address.
-
-    """
-    trie_set(state._main_trie, address, account)
-
-
-def destroy_account(state: State, address: Address) -> None:
-    """
-    Completely remove the account at `address` and all of its storage.
-
-    This function is made available exclusively for the `SELFDESTRUCT`
-    opcode. It is expected that `SELFDESTRUCT` will be disabled in a future
-    hardfork and this function will be removed.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account to destroy.
-
-    """
-    destroy_storage(state, address)
-    set_account(state, address, None)
-
-
-def destroy_storage(state: State, address: Address) -> None:
-    """
-    Completely remove the storage at `address`.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of account whose storage is to be deleted.
-
-    """
-    if address in state._storage_tries:
-        del state._storage_tries[address]
-
-
-def get_storage(state: State, address: Address, key: Bytes32) -> U256:
-    """
-    Get a value at a storage key on an account. Returns `U256(0)` if the
-    storage key has not been set previously.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to lookup.
-
-    Returns
-    -------
-    value : `U256`
-        Value at the key.
-
-    """
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        return U256(0)
-
-    value = trie_get(trie, key)
-
-    assert isinstance(value, U256)
-    return value
-
-
-def set_storage(
-    state: State, address: Address, key: Bytes32, value: U256
-) -> None:
-    """
-    Set a value at a storage key on an account. Setting to `U256(0)` deletes
-    the key.
-
-    Parameters
-    ----------
-    state: `State`
-        The state
-    address : `Address`
-        Address of the account.
-    key : `Bytes`
-        Key to set.
-    value : `U256`
-        Value to set at the key.
-
-    """
-    assert trie_get(state._main_trie, address) is not None
-
-    trie = state._storage_tries.get(address)
-    if trie is None:
-        trie = Trie(secured=True, default=U256(0))
-        state._storage_tries[address] = trie
-    trie_set(trie, key, value)
-    if trie._data == {}:
-        del state._storage_tries[address]
-
-
-def storage_root(state: State, address: Address) -> Root:
-    """
-    Calculate the storage root of an account.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address :
-        Address of the account.
-
-    Returns
-    -------
-    root : `Root`
-        Storage root of the account.
-
-    """
-    assert not state._snapshots
-    if address in state._storage_tries:
-        return root(state._storage_tries[address])
-    else:
-        return EMPTY_TRIE_ROOT
-
-
-def state_root(state: State) -> Root:
-    """
-    Calculate the state root.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    Returns
-    -------
-    root : `Root`
-        The state root.
-
-    """
-    assert not state._snapshots
-
-    def get_storage_root(address: Address) -> Root:
-        return storage_root(state, address)
-
-    return root(state._main_trie, get_storage_root=get_storage_root)
-
-
-def account_exists(state: State, address: Address) -> bool:
-    """
-    Checks if an account exists in the state trie.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    account_exists : `bool`
-        True if account exists in the state trie, False otherwise
-
-    """
-    return get_account_optional(state, address) is not None
-
-
-def account_has_code_or_nonce(state: State, address: Address) -> bool:
-    """
-    Checks if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : `bool`
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
-    """
-    account = get_account(state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
-
-
-def account_has_storage(state: State, address: Address) -> bool:
-    """
-    Checks if an account has storage.
-
-    Parameters
-    ----------
-    state:
-        The state
-    address:
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_storage : `bool`
-        True if the account has storage, False otherwise.
-
-    """
-    return address in state._storage_tries
-
-
-def modify_state(
-    state: State, address: Address, f: Callable[[Account], None]
-) -> None:
-    """
-    Modify an `Account` in the `State`.
-    """
-    set_account(state, address, modify(get_account(state, address), f))
-
-
-def move_ether(
-    state: State,
-    sender_address: Address,
-    recipient_address: Address,
-    amount: U256,
-) -> None:
-    """
-    Move funds between accounts.
-    """
-
-    def reduce_sender_balance(sender: Account) -> None:
-        if sender.balance < amount:
-            raise AssertionError
-        sender.balance -= amount
-
-    def increase_recipient_balance(recipient: Account) -> None:
-        recipient.balance += amount
-
-    modify_state(state, sender_address, reduce_sender_balance)
-    modify_state(state, recipient_address, increase_recipient_balance)
-
-
-def set_account_balance(state: State, address: Address, amount: U256) -> None:
-    """
-    Sets the balance of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    amount:
-        The amount that needs to be set in the balance.
-
-    """
-
-    def set_balance(account: Account) -> None:
-        account.balance = amount
-
-    modify_state(state, address, set_balance)
-
-
-def touch_account(state: State, address: Address) -> None:
-    """
-    Initializes an account to state.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        The address of the account that needs to be initialized.
-
-    """
-    if not account_exists(state, address):
-        set_account(state, address, EMPTY_ACCOUNT)
-
-
-def increment_nonce(state: State, address: Address) -> None:
-    """
-    Increments the nonce of an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose nonce needs to be incremented.
-
-    """
-
-    def increase_nonce(sender: Account) -> None:
-        sender.nonce += Uint(1)
-
-    modify_state(state, address, increase_nonce)
-
-
-def set_code(state: State, address: Address, code: Bytes) -> None:
-    """
-    Sets Account code.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-
-    address:
-        Address of the account whose code needs to be updated.
-
-    code:
-        The bytecode that needs to be set.
-
-    """
-    code_hash = keccak256(code)
-    if code_hash != EMPTY_CODE_HASH:
-        state._code_store[code_hash] = code
-
-    def write_code(sender: Account) -> None:
-        sender.code_hash = code_hash
-
-    modify_state(state, address, write_code)
-
-
-def create_ether(state: State, address: Address, amount: U256) -> None:
-    """
-    Add newly created ether to an account.
-
-    Parameters
-    ----------
-    state:
-        The current state.
-    address:
-        Address of the account to which ether is added.
-    amount:
-        The amount of ether to be added to the account of interest.
-
-    """
-
-    def increase_balance(account: Account) -> None:
-        account.balance += amount
-
-    modify_state(state, address, increase_balance)
diff --git a/src/ethereum/forks/tangerine_whistle/state_tracker.py b/src/ethereum/forks/tangerine_whistle/state_tracker.py
new file mode 100644
index 00000000000..24362ecff98
--- /dev/null
+++ b/src/ethereum/forks/tangerine_whistle/state_tracker.py
@@ -0,0 +1,805 @@
+"""
+State Tracking for Block Execution.
+
+Track state changes on top of a read-only ``PreState``.  At block end,
+accumulated diffs feed into
+``PreState.compute_state_root_and_trie_changes()``.
+
+.. contents:: Table of Contents
+    :backlinks: none
+    :local:
+
+Introduction
+------------
+
+Replace the mutable ``State`` class with lightweight state trackers that
+record diffs.  ``BlockState`` accumulates committed transaction
+changes across a block.  ``TransactionState`` tracks in-flight changes
+within a single transaction and supports copy-on-write rollback.
+"""
+
+from dataclasses import dataclass, field
+from typing import Callable, Dict, Optional, Set, Tuple, final
+
+from ethereum_types.bytes import Bytes, Bytes32
+from ethereum_types.frozen import modify
+from ethereum_types.numeric import U256, Uint
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.state import (
+    EMPTY_ACCOUNT,
+    EMPTY_CODE_HASH,
+    Account,
+    Address,
+    BlockDiff,
+    PreState,
+)
+
+
+@final
+@dataclass
+class BlockState:
+    """
+    Accumulate committed transaction-level changes across a block.
+
+    Read chain: block writes -> pre_state.
+
+    ``storage_clears`` records addresses whose storage was wiped by
+    a pre-EIP-6780 ``SELFDESTRUCT`` earlier in the block, so later
+    reads must not fall back to ``pre_state`` storage.
+    """
+
+    pre_state: PreState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    storage_clears: Set[Address] = field(default_factory=set)
+
+
+@final
+@dataclass
+class TransactionState:
+    """
+    Track in-flight state changes within a single transaction.
+
+    Read chain: tx writes -> block writes -> pre_state.
+    """
+
+    parent: BlockState
+    account_writes: Dict[Address, Optional[Account]] = field(
+        default_factory=dict
+    )
+    storage_writes: Dict[Address, Dict[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    code_writes: Dict[Hash32, Bytes] = field(default_factory=dict)
+    created_accounts: Set[Address] = field(default_factory=set)
+    storage_clears: Set[Address] = field(default_factory=set)
+    transient_storage: Dict[Tuple[Address, Bytes32], U256] = field(
+        default_factory=dict
+    )
+
+
+def get_account_optional(
+    tx_state: TransactionState, address: Address
+) -> Optional[Account]:
+    """
+    Get the ``Account`` object at an address. Return ``None`` (rather than
+    ``EMPTY_ACCOUNT``) if there is no account at the address.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Optional[Account]``
+        Account at address.
+
+    """
+    if address in tx_state.account_writes:
+        return tx_state.account_writes[address]
+    if address in tx_state.parent.account_writes:
+        return tx_state.parent.account_writes[address]
+    return tx_state.parent.pre_state.get_account_optional(address)
+
+
+def get_account(tx_state: TransactionState, address: Address) -> Account:
+    """
+    Get the ``Account`` object at an address. Return ``EMPTY_ACCOUNT``
+    if there is no account at the address.
+
+    Use ``get_account_optional()`` if you care about the difference
+    between a non-existent account and ``EMPTY_ACCOUNT``.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to look up.
+
+    Returns
+    -------
+    account : ``Account``
+        Account at address.
+
+    """
+    account = get_account_optional(tx_state, address)
+    if account is None:
+        return EMPTY_ACCOUNT
+    else:
+        return account
+
+
+def get_code(tx_state: TransactionState, code_hash: Hash32) -> Bytes:
+    """
+    Get the bytecode for a given code hash.
+
+    Read chain: tx code_writes -> block code_writes -> pre_state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    code_hash :
+        Hash of the code to look up.
+
+    Returns
+    -------
+    code : ``Bytes``
+        The bytecode.
+
+    """
+    if code_hash == EMPTY_CODE_HASH:
+        return b""
+    if code_hash in tx_state.code_writes:
+        return tx_state.code_writes[code_hash]
+    if code_hash in tx_state.parent.code_writes:
+        return tx_state.parent.code_writes[code_hash]
+    return tx_state.parent.pre_state.get_code(code_hash)
+
+
+def get_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account. Return ``U256(0)`` if
+    the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    if address in tx_state.storage_writes:
+        if key in tx_state.storage_writes[address]:
+            return tx_state.storage_writes[address][key]
+    if address in tx_state.storage_clears:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_storage_original(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get the original value in a storage slot i.e. the value before the
+    current transaction began. Read from block-level writes, then
+    pre_state. Return ``U256(0)`` for accounts created in the current
+    transaction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to read the value from.
+    key :
+        Key of the storage slot.
+
+    """
+    if address in tx_state.created_accounts:
+        return U256(0)
+    if address in tx_state.parent.storage_writes:
+        if key in tx_state.parent.storage_writes[address]:
+            return tx_state.parent.storage_writes[address][key]
+    if address in tx_state.parent.storage_clears:
+        return U256(0)
+    return tx_state.parent.pre_state.get_storage(address, key)
+
+
+def get_transient_storage(
+    tx_state: TransactionState, address: Address, key: Bytes32
+) -> U256:
+    """
+    Get a value at a storage key on an account from transient storage.
+    Return ``U256(0)`` if the storage key has not been set previously.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to look up.
+
+    Returns
+    -------
+    value : ``U256``
+        Value at the key.
+
+    """
+    return tx_state.transient_storage.get((address, key), U256(0))
+
+
+def account_exists(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account exists in the state trie.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    account_exists : ``bool``
+        True if account exists in the state trie, False otherwise.
+
+    """
+    return get_account_optional(tx_state, address) is not None
+
+
+def account_has_code_or_nonce(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account has non-zero nonce or non-empty code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_code_or_nonce : ``bool``
+        True if the account has non-zero nonce or non-empty code,
+        False otherwise.
+
+    """
+    account = get_account(tx_state, address)
+    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+
+
+def account_has_storage(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check if an account has storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    has_storage : ``bool``
+        True if the account has storage, False otherwise.
+
+    """
+    if tx_state.storage_writes.get(address):
+        return True
+    if address in tx_state.storage_clears:
+        return False
+    if tx_state.parent.storage_writes.get(address):
+        return True
+    if address in tx_state.parent.storage_clears:
+        return False
+    return tx_state.parent.pre_state.account_has_storage(address)
+
+
+def account_exists_and_is_empty(
+    tx_state: TransactionState, address: Address
+) -> bool:
+    """
+    Check if an account exists and has zero nonce, empty code and zero
+    balance.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    exists_and_is_empty : ``bool``
+        True if an account exists and has zero nonce, empty code and
+        zero balance, False otherwise.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return (
+        account is not None
+        and account.nonce == Uint(0)
+        and account.code_hash == EMPTY_CODE_HASH
+        and account.balance == 0
+    )
+
+
+def is_account_alive(tx_state: TransactionState, address: Address) -> bool:
+    """
+    Check whether an account is both in the state and non-empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be checked.
+
+    Returns
+    -------
+    is_alive : ``bool``
+        True if the account is alive.
+
+    """
+    account = get_account_optional(tx_state, address)
+    return account is not None and account != EMPTY_ACCOUNT
+
+
+def set_account(
+    tx_state: TransactionState,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set the ``Account`` object at an address. Setting to ``None``
+    deletes the account (but not its storage, see
+    ``destroy_account()``).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address to set.
+    account :
+        Account to set at address.
+
+    """
+    tx_state.account_writes[address] = account
+
+
+def set_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    assert get_account_optional(tx_state, address) is not None
+    if address not in tx_state.storage_writes:
+        tx_state.storage_writes[address] = {}
+    tx_state.storage_writes[address][key] = value
+
+
+def destroy_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the account at ``address`` and all of its storage.
+
+    This function is made available exclusively for the ``SELFDESTRUCT``
+    opcode. It is expected that ``SELFDESTRUCT`` will be disabled in a
+    future hardfork and this function will be removed. Only supports same
+    transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account to destroy.
+
+    """
+    destroy_storage(tx_state, address)
+    set_account(tx_state, address, None)
+
+
+def destroy_storage(tx_state: TransactionState, address: Address) -> None:
+    """
+    Completely remove the storage at ``address``.
+
+    Only supports same transaction destruction.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of account whose storage is to be deleted.
+
+    """
+    if address in tx_state.storage_writes:
+        del tx_state.storage_writes[address]
+    tx_state.storage_clears.add(address)
+
+
+def mark_account_created(tx_state: TransactionState, address: Address) -> None:
+    """
+    Mark an account as having been created in the current transaction.
+    This information is used by ``get_storage_original()`` to handle an
+    obscure edgecase, and to respect the constraints added to
+    SELFDESTRUCT by EIP-6780.
+
+    The marker is not removed even if the account creation reverts.
+    Since the account cannot have had code prior to its creation and
+    can't call ``get_storage_original()``, this is harmless.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that has been created.
+
+    """
+    tx_state.created_accounts.add(address)
+
+
+def set_transient_storage(
+    tx_state: TransactionState,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a value at a storage key on an account in transient storage.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account.
+    key :
+        Key to set.
+    value :
+        Value to set at the key.
+
+    """
+    if value == U256(0):
+        tx_state.transient_storage.pop((address, key), None)
+    else:
+        tx_state.transient_storage[(address, key)] = value
+
+
+def modify_state(
+    tx_state: TransactionState,
+    address: Address,
+    f: Callable[[Account], None],
+) -> None:
+    """
+    Modify an ``Account`` in the state.
+    """
+    set_account(tx_state, address, modify(get_account(tx_state, address), f))
+
+
+def move_ether(
+    tx_state: TransactionState,
+    sender_address: Address,
+    recipient_address: Address,
+    amount: U256,
+) -> None:
+    """
+    Move funds between accounts.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    sender_address :
+        Address of the sender.
+    recipient_address :
+        Address of the recipient.
+    amount :
+        The amount to transfer.
+
+    """
+
+    def reduce_sender_balance(sender: Account) -> None:
+        if sender.balance < amount:
+            raise AssertionError
+        sender.balance -= amount
+
+    def increase_recipient_balance(recipient: Account) -> None:
+        recipient.balance += amount
+
+    modify_state(tx_state, sender_address, reduce_sender_balance)
+    modify_state(tx_state, recipient_address, increase_recipient_balance)
+
+
+def create_ether(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Add newly created ether to an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account to which ether is added.
+    amount :
+        The amount of ether to be added to the account of interest.
+
+    """
+
+    def increase_balance(account: Account) -> None:
+        account.balance += amount
+
+    modify_state(tx_state, address, increase_balance)
+
+
+def set_account_balance(
+    tx_state: TransactionState, address: Address, amount: U256
+) -> None:
+    """
+    Set the balance of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose balance needs to be set.
+    amount :
+        The amount that needs to be set in the balance.
+
+    """
+
+    def set_balance(account: Account) -> None:
+        account.balance = amount
+
+    modify_state(tx_state, address, set_balance)
+
+
+def increment_nonce(tx_state: TransactionState, address: Address) -> None:
+    """
+    Increment the nonce of an account.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose nonce needs to be incremented.
+
+    """
+
+    def increase_nonce(sender: Account) -> None:
+        sender.nonce += Uint(1)
+
+    modify_state(tx_state, address, increase_nonce)
+
+
+def set_code(
+    tx_state: TransactionState, address: Address, code: Bytes
+) -> None:
+    """
+    Set Account code.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account whose code needs to be updated.
+    code :
+        The bytecode that needs to be set.
+
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        tx_state.code_writes[code_hash] = code
+
+    def write_code_hash(sender: Account) -> None:
+        sender.code_hash = code_hash
+
+    modify_state(tx_state, address, write_code_hash)
+
+
+# -- Snapshot / Rollback ---------------------------------------------------
+
+
+def copy_tx_state(tx_state: TransactionState) -> TransactionState:
+    """
+    Create a snapshot of the transaction state for rollback.
+
+    Deep-copy writes and transient storage.  The parent reference and
+    ``created_accounts`` are shared (not rolled back).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to snapshot.
+
+    Returns
+    -------
+    snapshot : ``TransactionState``
+        A copy of the transaction state.
+
+    """
+    return TransactionState(
+        parent=tx_state.parent,
+        account_writes=dict(tx_state.account_writes),
+        storage_writes={
+            addr: dict(slots)
+            for addr, slots in tx_state.storage_writes.items()
+        },
+        code_writes=dict(tx_state.code_writes),
+        created_accounts=tx_state.created_accounts,
+        storage_clears=set(tx_state.storage_clears),
+        transient_storage=dict(tx_state.transient_storage),
+    )
+
+
+def restore_tx_state(
+    tx_state: TransactionState, snapshot: TransactionState
+) -> None:
+    """
+    Restore transaction state from a snapshot (rollback on failure).
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to restore.
+    snapshot :
+        The snapshot to restore from.
+
+    """
+    tx_state.account_writes = snapshot.account_writes
+    tx_state.storage_writes = snapshot.storage_writes
+    tx_state.code_writes = snapshot.code_writes
+    tx_state.storage_clears = snapshot.storage_clears
+    tx_state.transient_storage = snapshot.transient_storage
+
+
+# -- Lifecycle --------------------------------------------------------------
+
+
+def incorporate_tx_into_block(tx_state: TransactionState) -> None:
+    """
+    Merge transaction writes into the block state and clear for reuse.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state to commit.
+
+    """
+    block = tx_state.parent
+
+    for address, account in tx_state.account_writes.items():
+        block.account_writes[address] = account
+
+    for address in tx_state.storage_clears:
+        block.storage_clears.add(address)
+        block.storage_writes.pop(address, None)
+
+    for address, slots in tx_state.storage_writes.items():
+        if address not in block.storage_writes:
+            block.storage_writes[address] = {}
+        block.storage_writes[address].update(slots)
+
+    block.code_writes.update(tx_state.code_writes)
+
+    tx_state.account_writes.clear()
+    tx_state.storage_writes.clear()
+    tx_state.code_writes.clear()
+    tx_state.created_accounts.clear()
+    tx_state.storage_clears.clear()
+    tx_state.transient_storage.clear()
+
+
+def extract_block_diff(block_state: BlockState) -> BlockDiff:
+    """
+    Extract account, storage, and code diff from the block state.
+
+    Parameters
+    ----------
+    block_state :
+        The block state.
+
+    Returns
+    -------
+    diff : `BlockDiff`
+        Account, storage, and code changes accumulated during block execution.
+
+    """
+    return BlockDiff(
+        account_changes=block_state.account_writes,
+        storage_changes=block_state.storage_writes,
+        code_changes=block_state.code_writes,
+        storage_clears=block_state.storage_clears,
+    )
+
+
+def destroy_touched_empty_accounts(
+    tx_state: TransactionState, touched_accounts: Set[Address]
+) -> None:
+    """
+    Destroy all touched accounts that are empty.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    touched_accounts :
+        All the accounts that have been touched in the current transaction.
+
+    """
+    for address in touched_accounts:
+        if account_exists_and_is_empty(tx_state, address):
+            destroy_account(tx_state, address)
+
+
+def touch_account(tx_state: TransactionState, address: Address) -> None:
+    """
+    Initialize an account to state.
+
+    Parameters
+    ----------
+    tx_state :
+        The transaction state.
+    address :
+        Address of the account that needs to be initialized.
+
+    """
+    if not account_exists(tx_state, address):
+        set_account(tx_state, address, EMPTY_ACCOUNT)
diff --git a/src/ethereum/forks/tangerine_whistle/transactions.py b/src/ethereum/forks/tangerine_whistle/transactions.py
index 934540874ca..f13e81f25b9 100644
--- a/src/ethereum/forks/tangerine_whistle/transactions.py
+++ b/src/ethereum/forks/tangerine_whistle/transactions.py
@@ -5,6 +5,7 @@
 """
 
 from dataclasses import dataclass
+from typing import final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes0
@@ -18,31 +19,10 @@
     InvalidSignatureError,
     NonceOverflowError,
 )
-
-from .fork_types import Address
-
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_PER_NON_ZERO = Uint(68)
-"""
-Gas cost per non-zero byte in the transaction data.
-"""
-
-GAS_TX_DATA_PER_ZERO = Uint(4)
-"""
-Gas cost per zero byte in the transaction data.
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
+from ethereum.state import Address
 
 
+@final
 @slotted_freezable
 @dataclass
 class Transaction:
@@ -143,26 +123,28 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     for all operations to be implemented.
 
     The intrinsic cost includes:
-    1. Base cost (`GAS_TX_BASE`)
+    1. Base cost (`TX_BASE`)
     2. Cost for data (zero and non-zero bytes)
     3. Cost for contract creation (if applicable)
 
     This function takes a transaction as a parameter and returns the intrinsic
     gas cost of the transaction.
     """
+    from .vm.gas import GasCosts
+
     num_zeros = Uint(tx.data.count(0))
     num_non_zeros = ulen(tx.data) - num_zeros
     data_cost = (
-        num_zeros * GAS_TX_DATA_PER_ZERO
-        + num_non_zeros * GAS_TX_DATA_PER_NON_ZERO
+        num_zeros * GasCosts.TX_DATA_PER_ZERO
+        + num_non_zeros * GasCosts.TX_DATA_PER_NON_ZERO
     )
 
     if tx.to == Bytes0(b""):
-        create_cost = GAS_TX_CREATE
+        create_cost = GasCosts.TX_CREATE
     else:
         create_cost = Uint(0)
 
-    return GAS_TX_BASE + data_cost + create_cost
+    return GasCosts.TX_BASE + data_cost + create_cost
 
 
 def recover_sender(tx: Transaction) -> Address:
diff --git a/src/ethereum/forks/tangerine_whistle/trie.py b/src/ethereum/forks/tangerine_whistle/trie.py
deleted file mode 100644
index a7580519410..00000000000
--- a/src/ethereum/forks/tangerine_whistle/trie.py
+++ /dev/null
@@ -1,498 +0,0 @@
-"""
-State Trie.
-
-.. contents:: Table of Contents
-    :backlinks: none
-    :local:
-
-Introduction
-------------
-
-The state trie is the structure responsible for storing
-`.fork_types.Account` objects.
-"""
-
-import copy
-from dataclasses import dataclass, field
-from typing import (
-    Callable,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-    assert_type,
-    cast,
-)
-
-from ethereum_rlp import Extended, rlp
-from ethereum_types.bytes import Bytes
-from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U256, Uint
-
-from ethereum.crypto.hash import keccak256
-from ethereum.forks.dao_fork import trie as previous_trie
-from ethereum.utils.hexadecimal import hex_to_bytes
-
-from .blocks import Receipt
-from .fork_types import Account, Address, Root, encode_account
-from .transactions import Transaction
-
-# note: an empty trie (regardless of whether it is secured) has root:
-#
-#   keccak256(RLP(b''))
-#       ==
-#   56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421 # noqa: E501
-#
-# also:
-#
-#   keccak256(RLP(()))
-#       ==
-#   1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347 # noqa: E501
-#
-# which is the sha3Uncles hash in block header with no uncles
-EMPTY_TRIE_ROOT = Root(
-    hex_to_bytes(
-        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-    )
-)
-
-Node = Account | Bytes | Transaction | Receipt | Uint | U256 | None
-K = TypeVar("K", bound=Bytes)
-V = TypeVar(
-    "V",
-    Optional[Account],
-    Optional[Bytes],
-    Bytes,
-    Optional[Transaction],
-    Optional[Receipt],
-    Uint,
-    U256,
-)
-
-
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
-def encode_internal_node(node: Optional[InternalNode]) -> Extended:
-    """
-    Encodes a Merkle Trie node into its RLP form. The RLP will then be
-    serialized into a `Bytes` and hashed unless it is less than 32 bytes
-    when serialized.
-
-    This function also accepts `None`, representing the absence of a node,
-    which is encoded to `b""`.
-
-    Parameters
-    ----------
-    node : Optional[InternalNode]
-        The node to encode.
-
-    Returns
-    -------
-    encoded : `rlp.Extended`
-        The node encoded as RLP.
-
-    """
-    unencoded: Extended
-    if node is None:
-        unencoded = b""
-    elif isinstance(node, LeafNode):
-        unencoded = (
-            nibble_list_to_compact(node.rest_of_key, True),
-            node.value,
-        )
-    elif isinstance(node, ExtensionNode):
-        unencoded = (
-            nibble_list_to_compact(node.key_segment, False),
-            node.subnode,
-        )
-    elif isinstance(node, BranchNode):
-        unencoded = list(node.subnodes) + [node.value]
-    else:
-        raise AssertionError(f"Invalid internal node type {type(node)}!")
-
-    encoded = rlp.encode(unencoded)
-    if len(encoded) < 32:
-        return unencoded
-    else:
-        return keccak256(encoded)
-
-
-def encode_node(node: Node, storage_root: Optional[Bytes] = None) -> Bytes:
-    """
-    Encode a Node for storage in the Merkle Trie.
-
-    Currently mostly an unimplemented stub.
-    """
-    if isinstance(node, Account):
-        assert storage_root is not None
-        return encode_account(node, storage_root)
-    elif isinstance(node, (Transaction, Receipt, U256)):
-        return rlp.encode(node)
-    elif isinstance(node, Bytes):
-        return node
-    else:
-        return previous_trie.encode_node(node, storage_root)
-
-
-@dataclass
-class Trie(Generic[K, V]):
-    """
-    The Merkle Trie.
-    """
-
-    secured: bool
-    default: V
-    _data: Dict[K, V] = field(default_factory=dict)
-
-
-def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
-    """
-    Create a copy of `trie`. Since only frozen objects may be stored in tries,
-    the contents are reused.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to copy.
-
-    Returns
-    -------
-    new_trie : `Trie[K, V]`
-        A copy of the trie.
-
-    """
-    return Trie(trie.secured, trie.default, copy.copy(trie._data))
-
-
-def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
-    """
-    Stores an item in a Merkle Trie.
-
-    This method deletes the key if `value == trie.default`, because the Merkle
-    Trie represents the default value by omitting it from the trie.
-
-    Parameters
-    ----------
-    trie: `Trie`
-        Trie to store in.
-    key : `Bytes`
-        Key to lookup.
-    value : `V`
-        Node to insert at `key`.
-
-    """
-    if value == trie.default:
-        if key in trie._data:
-            del trie._data[key]
-    else:
-        trie._data[key] = value
-
-
-def trie_get(trie: Trie[K, V], key: K) -> V:
-    """
-    Gets an item from the Merkle Trie.
-
-    This method returns `trie.default` if the key is missing.
-
-    Parameters
-    ----------
-    trie:
-        Trie to lookup in.
-    key :
-        Key to lookup.
-
-    Returns
-    -------
-    node : `V`
-        Node at `key` in the trie.
-
-    """
-    return trie._data.get(key, trie.default)
-
-
-def common_prefix_length(a: Sequence, b: Sequence) -> int:
-    """
-    Find the longest common prefix of two sequences.
-    """
-    for i in range(len(a)):
-        if i >= len(b) or a[i] != b[i]:
-            return i
-    return len(a)
-
-
-def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
-    """
-    Compresses nibble-list into a standard byte array with a flag.
-
-    A nibble-list is a list of byte values no greater than `15`. The flag is
-    encoded in high nibble of the highest byte. The flag nibble can be broken
-    down into two two-bit flags.
-
-    Highest nibble::
-
-        +---+---+----------+--------+
-        | _ | _ | is_leaf | parity |
-        +---+---+----------+--------+
-          3   2      1         0
-
-
-    The lowest bit of the nibble encodes the parity of the length of the
-    remaining nibbles -- `0` when even and `1` when odd. The second lowest bit
-    is used to distinguish leaf and extension nodes. The other two bits are not
-    used.
-
-    Parameters
-    ----------
-    x :
-        Array of nibbles.
-    is_leaf :
-        True if this is part of a leaf node, or false if it is an extension
-        node.
-
-    Returns
-    -------
-    compressed : `bytearray`
-        Compact byte array.
-
-    """
-    compact = bytearray()
-
-    if len(x) % 2 == 0:  # ie even length
-        compact.append(16 * (2 * is_leaf))
-        for i in range(0, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-    else:
-        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
-        for i in range(1, len(x), 2):
-            compact.append(16 * x[i] + x[i + 1])
-
-    return Bytes(compact)
-
-
-def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
-    """
-    Converts a `Bytes` into to a sequence of nibbles (bytes with value < 16).
-
-    Parameters
-    ----------
-    bytes_:
-        The `Bytes` to convert.
-
-    Returns
-    -------
-    nibble_list : `Bytes`
-        The `Bytes` in nibble-list format.
-
-    """
-    nibble_list = bytearray(2 * len(bytes_))
-    for byte_index, byte in enumerate(bytes_):
-        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
-        nibble_list[byte_index * 2 + 1] = byte & 0x0F
-    return Bytes(nibble_list)
-
-
-def _prepare_trie(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Mapping[Bytes, Bytes]:
-    """
-    Prepares the trie for root calculation. Removes values that are empty,
-    hashes the keys (if `secured == True`) and encodes all the nodes.
-
-    Parameters
-    ----------
-    trie :
-        The `Trie` to prepare.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-    Returns
-    -------
-    out : `Mapping[ethereum.base_types.Bytes, Node]`
-        Object with keys mapped to nibble-byte form.
-
-    """
-    mapped: MutableMapping[Bytes, Bytes] = {}
-
-    for preimage, value in trie._data.items():
-        if isinstance(value, Account):
-            assert get_storage_root is not None
-            address = Address(preimage)
-            encoded_value = encode_node(value, get_storage_root(address))
-        else:
-            encoded_value = encode_node(value)
-        if encoded_value == b"":
-            raise AssertionError
-        key: Bytes
-        if trie.secured:
-            # "secure" tries hash keys once before construction
-            key = keccak256(preimage)
-        else:
-            key = preimage
-        mapped[bytes_to_nibble_list(key)] = encoded_value
-
-    return mapped
-
-
-def root(
-    trie: Trie[K, V],
-    get_storage_root: Optional[Callable[[Address], Root]] = None,
-) -> Root:
-    """
-    Computes the root of a modified merkle patricia trie (MPT).
-
-    Parameters
-    ----------
-    trie :
-        `Trie` to get the root of.
-    get_storage_root :
-        Function to get the storage root of an account. Needed to encode
-        `Account` objects.
-
-
-    Returns
-    -------
-    root : `.fork_types.Root`
-        MPT root of the underlying key-value pairs.
-
-    """
-    obj = _prepare_trie(trie, get_storage_root)
-
-    root_node = encode_internal_node(patricialize(obj, Uint(0)))
-    if len(rlp.encode(root_node)) < 32:
-        return keccak256(rlp.encode(root_node))
-    else:
-        assert isinstance(root_node, Bytes)
-        return Root(root_node)
-
-
-def patricialize(
-    obj: Mapping[Bytes, Bytes], level: Uint
-) -> Optional[InternalNode]:
-    """
-    Structural composition function.
-
-    Used to recursively patricialize and merkleize a dictionary. Includes
-    memoization of the tree structure and hashes.
-
-    Parameters
-    ----------
-    obj :
-        Underlying trie key-value pairs, with keys in nibble-list format.
-    level :
-        Current trie level.
-
-    Returns
-    -------
-    node : `ethereum.base_types.Bytes`
-        Root node of `obj`.
-
-    """
-    if len(obj) == 0:
-        return None
-
-    arbitrary_key = next(iter(obj))
-
-    # if leaf node
-    if len(obj) == 1:
-        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
-        return leaf
-
-    # prepare for extension node check by finding max j such that all keys in
-    # obj have the same key[i:j]
-    substring = arbitrary_key[level:]
-    prefix_length = len(substring)
-    for key in obj:
-        prefix_length = min(
-            prefix_length, common_prefix_length(substring, key[level:])
-        )
-
-        # finished searching, found another key at the current level
-        if prefix_length == 0:
-            break
-
-    # if extension node
-    if prefix_length > 0:
-        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
-        return ExtensionNode(
-            prefix,
-            encode_internal_node(
-                patricialize(obj, level + Uint(prefix_length))
-            ),
-        )
-
-    branches: List[MutableMapping[Bytes, Bytes]] = []
-    for _ in range(16):
-        branches.append({})
-    value = b""
-    for key in obj:
-        if len(key) == level:
-            # shouldn't ever have an account or receipt in an internal node
-            if isinstance(obj[key], (Account, Receipt, Uint)):
-                raise AssertionError
-            value = obj[key]
-        else:
-            branches[key[level]][key] = obj[key]
-
-    subnodes = tuple(
-        encode_internal_node(patricialize(branches[k], level + Uint(1)))
-        for k in range(16)
-    )
-    return BranchNode(
-        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
-        value,
-    )
diff --git a/src/ethereum/forks/tangerine_whistle/utils/hexadecimal.py b/src/ethereum/forks/tangerine_whistle/utils/hexadecimal.py
index aa4663dfe39..02610396104 100644
--- a/src/ethereum/forks/tangerine_whistle/utils/hexadecimal.py
+++ b/src/ethereum/forks/tangerine_whistle/utils/hexadecimal.py
@@ -14,11 +14,9 @@
 
 from ethereum_types.bytes import Bytes
 
-from ethereum.state import Address
+from ethereum.state import Address, Root
 from ethereum.utils.hexadecimal import remove_hex_prefix
 
-from ..fork_types import Root
-
 
 def hex_to_root(hex_string: str) -> Root:
     """
diff --git a/src/ethereum/forks/tangerine_whistle/utils/message.py b/src/ethereum/forks/tangerine_whistle/utils/message.py
index 58d03b76540..e8e99160dbb 100644
--- a/src/ethereum/forks/tangerine_whistle/utils/message.py
+++ b/src/ethereum/forks/tangerine_whistle/utils/message.py
@@ -17,7 +17,7 @@
 
 from ethereum.state import Address
 
-from ..state import get_account, get_code
+from ..state_tracker import get_account, get_code
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
 from .address import compute_contract_address
@@ -49,7 +49,7 @@ def prepare_message(
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
-            get_account(block_env.state, tx_env.origin).nonce - Uint(1),
+            get_account(tx_env.state, tx_env.origin).nonce - Uint(1),
         )
         msg_data = Bytes(b"")
         code = tx.data
@@ -57,8 +57,8 @@ def prepare_message(
     elif isinstance(tx.to, Address):
         current_target = tx.to
         msg_data = tx.data
-        account = get_account(block_env.state, tx.to)
-        code = get_code(block_env.state, account.code_hash)
+        account = get_account(tx_env.state, tx.to)
+        code = get_code(tx_env.state, account.code_hash)
 
         code_address = tx.to
     else:
diff --git a/src/ethereum/forks/tangerine_whistle/vm/__init__.py b/src/ethereum/forks/tangerine_whistle/vm/__init__.py
index e318eaa7482..ef0cfa87484 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/__init__.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/__init__.py
@@ -13,23 +13,24 @@
 """
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Set, Tuple
+from typing import List, Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32
 from ethereum.exceptions import EthereumException
+from ethereum.merkle_patricia_trie import Trie
 from ethereum.state import Address
 
 from ..blocks import Log, Receipt
-from ..state import State
+from ..state_tracker import BlockState, TransactionState
 from ..transactions import Transaction
-from ..trie import Trie
 
 __all__ = ("Environment", "Evm", "Message")
 
 
+@final
 @dataclass
 class BlockEnvironment:
     """
@@ -37,7 +38,7 @@ class BlockEnvironment:
     """
 
     chain_id: U64
-    state: State
+    state: BlockState
     block_gas_limit: Uint
     block_hashes: List[Hash32]
     coinbase: Address
@@ -46,6 +47,7 @@ class BlockEnvironment:
     difficulty: Uint
 
 
+@final
 @dataclass
 class BlockOutput:
     """
@@ -77,19 +79,22 @@ class BlockOutput:
     block_logs: Tuple[Log, ...] = field(default_factory=tuple)
 
 
+@final
 @dataclass
 class TransactionEnvironment:
     """
-    Items that are used by contract creation or message call.
+    Items that are used while processing a transaction.
     """
 
     origin: Address
     gas_price: Uint
     gas: Uint
+    state: TransactionState
     index_in_block: Uint
     tx_hash: Optional[Hash32]
 
 
+@final
 @dataclass
 class Message:
     """
@@ -111,6 +116,7 @@ class Message:
     parent_evm: Optional["Evm"]
 
 
+@final
 @dataclass
 class Evm:
     """The internal state of the virtual machine."""
diff --git a/src/ethereum/forks/tangerine_whistle/vm/gas.py b/src/ethereum/forks/tangerine_whistle/vm/gas.py
index ac02500d623..94901fba3f8 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/gas.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/gas.py
@@ -12,9 +12,9 @@
 """
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Final, List, Tuple, final
 
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32
@@ -22,47 +22,132 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_SLOAD = Uint(200)
-GAS_STORAGE_SET = Uint(20000)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 15000
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(10)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_EXTERNAL = Uint(700)
-GAS_BALANCE = Uint(400)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_CREATE = Uint(32000)
-GAS_CODE_DEPOSIT_PER_BYTE = Uint(200)
-GAS_ZERO = Uint(0)
-GAS_CALL = Uint(700)
-GAS_NEW_ACCOUNT = Uint(25000)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_SELF_DESTRUCT_NEW_ACCOUNT = Uint(25000)
-REFUND_SELF_DESTRUCT = 24000
-GAS_ECRECOVER = Uint(3000)
-GAS_SHA256 = Uint(60)
-GAS_SHA256_WORD = Uint(12)
-GAS_RIPEMD160 = Uint(600)
-GAS_RIPEMD160_WORD = Uint(120)
-GAS_IDENTITY = Uint(15)
-GAS_IDENTITY_WORD = Uint(3)
 
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
 
+    # Tiers
+    BASE: Final[Uint] = Uint(2)
+    VERY_LOW: Final[Uint] = Uint(3)
+    LOW: Final[Uint] = Uint(5)
+    MID: Final[Uint] = Uint(8)
+    HIGH: Final[Uint] = Uint(10)
+
+    # Access
+    SLOAD: Final[Uint] = Uint(200)
+
+    # Storage
+    STORAGE_SET: Final[Uint] = Uint(20000)
+    COLD_STORAGE_WRITE: Final[Uint] = Uint(5000)
+
+    # Call
+    CALL_VALUE: Final[Uint] = Uint(9000)
+    CALL_STIPEND: Final[Uint] = Uint(2300)
+    NEW_ACCOUNT: Final[Uint] = Uint(25000)
+
+    # Contract Creation
+    CODE_DEPOSIT_PER_BYTE: Final[Uint] = Uint(200)
+
+    # Utility
+    ZERO: Final[Uint] = Uint(0)
+    MEMORY_PER_WORD: Final[Uint] = Uint(3)
+
+    # Refunds
+    REFUND_STORAGE_CLEAR: Final[int] = 15000
+    REFUND_SELF_DESTRUCT: Final[int] = 24000
+
+    # Precompiles
+    PRECOMPILE_ECRECOVER: Final[Uint] = Uint(3000)
+    PRECOMPILE_SHA256_BASE: Final[Uint] = Uint(60)
+    PRECOMPILE_SHA256_PER_WORD: Final[Uint] = Uint(12)
+    PRECOMPILE_RIPEMD160_BASE: Final[Uint] = Uint(600)
+    PRECOMPILE_RIPEMD160_PER_WORD: Final[Uint] = Uint(120)
+    PRECOMPILE_IDENTITY_BASE: Final[Uint] = Uint(15)
+    PRECOMPILE_IDENTITY_PER_WORD: Final[Uint] = Uint(3)
+
+    # Transactions
+    TX_BASE: Final[Uint] = Uint(21000)
+    TX_CREATE: Final[Uint] = Uint(32000)
+    TX_DATA_PER_ZERO: Final[Uint] = Uint(4)
+    TX_DATA_PER_NON_ZERO: Final[Uint] = Uint(68)
+
+    # Block
+    LIMIT_ADJUSTMENT_FACTOR: Final[Uint] = Uint(1024)
+    LIMIT_MINIMUM: Final[Uint] = Uint(5000)
+
+    # Static Opcodes
+    OPCODE_ADD: Final[Uint] = VERY_LOW
+    OPCODE_SUB: Final[Uint] = VERY_LOW
+    OPCODE_MUL: Final[Uint] = LOW
+    OPCODE_DIV: Final[Uint] = LOW
+    OPCODE_SDIV: Final[Uint] = LOW
+    OPCODE_MOD: Final[Uint] = LOW
+    OPCODE_SMOD: Final[Uint] = LOW
+    OPCODE_ADDMOD: Final[Uint] = MID
+    OPCODE_MULMOD: Final[Uint] = MID
+    OPCODE_SIGNEXTEND: Final[Uint] = LOW
+    OPCODE_LT: Final[Uint] = VERY_LOW
+    OPCODE_GT: Final[Uint] = VERY_LOW
+    OPCODE_SLT: Final[Uint] = VERY_LOW
+    OPCODE_SGT: Final[Uint] = VERY_LOW
+    OPCODE_EQ: Final[Uint] = VERY_LOW
+    OPCODE_ISZERO: Final[Uint] = VERY_LOW
+    OPCODE_AND: Final[Uint] = VERY_LOW
+    OPCODE_OR: Final[Uint] = VERY_LOW
+    OPCODE_XOR: Final[Uint] = VERY_LOW
+    OPCODE_NOT: Final[Uint] = VERY_LOW
+    OPCODE_BYTE: Final[Uint] = VERY_LOW
+    OPCODE_JUMP: Final[Uint] = MID
+    OPCODE_JUMPI: Final[Uint] = HIGH
+    OPCODE_JUMPDEST: Final[Uint] = Uint(1)
+    OPCODE_CALLDATALOAD: Final[Uint] = VERY_LOW
+    OPCODE_BLOCKHASH: Final[Uint] = Uint(20)
+    OPCODE_COINBASE: Final[Uint] = BASE
+    OPCODE_POP: Final[Uint] = BASE
+    OPCODE_MSIZE: Final[Uint] = BASE
+    OPCODE_PC: Final[Uint] = BASE
+    OPCODE_GAS: Final[Uint] = BASE
+    OPCODE_ADDRESS: Final[Uint] = BASE
+    OPCODE_ORIGIN: Final[Uint] = BASE
+    OPCODE_CALLER: Final[Uint] = BASE
+    OPCODE_CALLVALUE: Final[Uint] = BASE
+    OPCODE_CALLDATASIZE: Final[Uint] = BASE
+    OPCODE_CODESIZE: Final[Uint] = BASE
+    OPCODE_GASPRICE: Final[Uint] = BASE
+    OPCODE_TIMESTAMP: Final[Uint] = BASE
+    OPCODE_NUMBER: Final[Uint] = BASE
+    OPCODE_GASLIMIT: Final[Uint] = BASE
+    OPCODE_DIFFICULTY: Final[Uint] = BASE
+    OPCODE_PUSH: Final[Uint] = VERY_LOW
+    OPCODE_DUP: Final[Uint] = VERY_LOW
+    OPCODE_SWAP: Final[Uint] = VERY_LOW
+
+    # Dynamic Opcodes
+    OPCODE_CALLDATACOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_CODECOPY_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MLOAD_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE_BASE: Final[Uint] = VERY_LOW
+    OPCODE_MSTORE8_BASE: Final[Uint] = VERY_LOW
+    OPCODE_COPY_PER_WORD: Final[Uint] = Uint(3)
+    OPCODE_CREATE_BASE: Final[Uint] = Uint(32000)
+    OPCODE_EXP_BASE: Final[Uint] = Uint(10)
+    OPCODE_EXP_PER_BYTE: Final[Uint] = Uint(10)
+    OPCODE_KECCAK256_BASE: Final[Uint] = Uint(30)
+    OPCODE_KECCAK256_PER_WORD: Final[Uint] = Uint(6)
+    OPCODE_LOG_BASE: Final[Uint] = Uint(375)
+    OPCODE_LOG_DATA_PER_BYTE: Final[Uint] = Uint(8)
+    OPCODE_LOG_TOPIC: Final[Uint] = Uint(375)
+    OPCODE_SELFDESTRUCT_BASE: Final[Uint] = Uint(5000)
+    OPCODE_SELFDESTRUCT_NEW_ACCOUNT: Final[Uint] = Uint(25000)
+    OPCODE_EXTERNAL_BASE: Final[Uint] = Uint(700)
+    OPCODE_BALANCE: Final[Uint] = Uint(400)
+    OPCODE_CALL_BASE: Final[Uint] = Uint(700)
+
+
+@final
 @dataclass
 class ExtendMemory:
     """
@@ -78,11 +163,12 @@ class ExtendMemory:
     expand_by: Uint
 
 
+@final
 @dataclass
 class MessageCallGas:
     """
-    Define the gas cost and gas given to the sub-call for
-    executing the call opcodes.
+    Define the gas cost and gas given to the sub-call for executing the call
+    opcodes.
 
     `cost`: `ethereum.base_types.Uint`
         The gas required to execute the call opcode, excludes
@@ -134,7 +220,7 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
 
     """
     size_in_words = ceil32(size_in_bytes) // Uint(32)
-    linear_cost = size_in_words * GAS_MEMORY
+    linear_cost = size_in_words * GasCosts.MEMORY_PER_WORD
     quadratic_cost = size_in_words ** Uint(2) // Uint(512)
     total_gas_cost = linear_cost + quadratic_cost
     try:
@@ -164,7 +250,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue
@@ -189,7 +275,7 @@ def calculate_message_call_gas(
     gas_left: Uint,
     memory_cost: Uint,
     extra_gas: Uint,
-    call_stipend: Uint = GAS_CALL_STIPEND,
+    call_stipend: Uint = GasCosts.CALL_STIPEND,
 ) -> MessageCallGas:
     """
     Calculates the MessageCallGas (cost and gas made available to the sub-call)
diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/arithmetic.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/arithmetic.py
index b7b1a370ad4..4c7423cba8e 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/instructions/arithmetic.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/arithmetic.py
@@ -18,11 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_EXPONENTIATION,
-    GAS_EXPONENTIATION_PER_BYTE,
-    GAS_LOW,
-    GAS_MID,
-    GAS_VERY_LOW,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -44,7 +40,7 @@ def add(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ADD)
 
     # OPERATION
     result = x.wrapping_add(y)
@@ -71,7 +67,7 @@ def sub(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SUB)
 
     # OPERATION
     result = x.wrapping_sub(y)
@@ -98,7 +94,7 @@ def mul(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MUL)
 
     # OPERATION
     result = x.wrapping_mul(y)
@@ -125,7 +121,7 @@ def div(evm: Evm) -> None:
     divisor = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DIV)
 
     # OPERATION
     if divisor == 0:
@@ -158,7 +154,7 @@ def sdiv(evm: Evm) -> None:
     divisor = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SDIV)
 
     # OPERATION
     if divisor == 0:
@@ -191,7 +187,7 @@ def mod(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_MOD)
 
     # OPERATION
     if y == 0:
@@ -221,7 +217,7 @@ def smod(evm: Evm) -> None:
     y = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SMOD)
 
     # OPERATION
     if y == 0:
@@ -252,7 +248,7 @@ def addmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_ADDMOD)
 
     # OPERATION
     if z == 0:
@@ -283,7 +279,7 @@ def mulmod(evm: Evm) -> None:
     z = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_MULMOD)
 
     # OPERATION
     if z == 0:
@@ -318,7 +314,9 @@ def exp(evm: Evm) -> None:
     exponent_bits = exponent.bit_length()
     exponent_bytes = (exponent_bits + Uint(7)) // Uint(8)
     charge_gas(
-        evm, GAS_EXPONENTIATION + GAS_EXPONENTIATION_PER_BYTE * exponent_bytes
+        evm,
+        GasCosts.OPCODE_EXP_BASE
+        + GasCosts.OPCODE_EXP_PER_BYTE * exponent_bytes,
     )
 
     # OPERATION
@@ -346,7 +344,7 @@ def signextend(evm: Evm) -> None:
     value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SIGNEXTEND)
 
     # OPERATION
     if byte_num > U256(31):
diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/bitwise.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/bitwise.py
index 2a506f55751..62da98041ad 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/instructions/bitwise.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/bitwise.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def bitwise_and(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_AND)
 
     # OPERATION
     push(evm.stack, x & y)
@@ -59,7 +62,7 @@ def bitwise_or(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_OR)
 
     # OPERATION
     push(evm.stack, x | y)
@@ -84,7 +87,7 @@ def bitwise_xor(evm: Evm) -> None:
     y = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_XOR)
 
     # OPERATION
     push(evm.stack, x ^ y)
@@ -108,7 +111,7 @@ def bitwise_not(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_NOT)
 
     # OPERATION
     push(evm.stack, ~x)
@@ -134,7 +137,7 @@ def get_byte(evm: Evm) -> None:
     word = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_BYTE)
 
     # OPERATION
     if byte_index >= U256(32):
diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/block.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/block.py
index 0edcbf000d1..fbca7daa37c 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/instructions/block.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/block.py
@@ -14,7 +14,7 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_BASE, GAS_BLOCK_HASH, charge_gas
+from ..gas import GasCosts, charge_gas
 from ..stack import pop, push
 
 
@@ -33,7 +33,7 @@ def block_hash(evm: Evm) -> None:
     block_number = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BLOCK_HASH)
+    charge_gas(evm, GasCosts.OPCODE_BLOCKHASH)
 
     # OPERATION
     max_block_number = block_number + Uint(256)
@@ -75,7 +75,7 @@ def coinbase(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_COINBASE)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.block_env.coinbase))
@@ -102,7 +102,7 @@ def timestamp(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_TIMESTAMP)
 
     # OPERATION
     push(evm.stack, evm.message.block_env.time)
@@ -128,7 +128,7 @@ def number(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_NUMBER)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.number))
@@ -154,7 +154,7 @@ def difficulty(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_DIFFICULTY)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.difficulty))
@@ -180,7 +180,7 @@ def gas_limit(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASLIMIT)
 
     # OPERATION
     push(evm.stack, U256(evm.message.block_env.block_gas_limit))
diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/comparison.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/comparison.py
index a6a3d99bc86..22d3d8916b1 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/instructions/comparison.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/comparison.py
@@ -14,7 +14,10 @@
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm
-from ..gas import GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..stack import pop, push
 
 
@@ -34,7 +37,7 @@ def less_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_LT)
 
     # OPERATION
     result = U256(left < right)
@@ -60,7 +63,7 @@ def signed_less_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SLT)
 
     # OPERATION
     result = U256(left < right)
@@ -87,7 +90,7 @@ def greater_than(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_GT)
 
     # OPERATION
     result = U256(left > right)
@@ -113,7 +116,7 @@ def signed_greater_than(evm: Evm) -> None:
     right = pop(evm.stack).to_signed()
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SGT)
 
     # OPERATION
     result = U256(left > right)
@@ -140,7 +143,7 @@ def equal(evm: Evm) -> None:
     right = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_EQ)
 
     # OPERATION
     result = U256(left == right)
@@ -166,7 +169,7 @@ def is_zero(evm: Evm) -> None:
     x = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_ISZERO)
 
     # OPERATION
     result = U256(x == 0)
diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/control_flow.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/control_flow.py
index b3b1f2316a7..548a05d3163 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/instructions/control_flow.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/control_flow.py
@@ -13,7 +13,10 @@
 
 from ethereum_types.numeric import U256, Uint
 
-from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 from .. import Evm
 from ..exceptions import InvalidJumpDestError
 from ..stack import pop, push
@@ -57,7 +60,7 @@ def jump(evm: Evm) -> None:
     jump_dest = Uint(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_MID)
+    charge_gas(evm, GasCosts.OPCODE_JUMP)
 
     # OPERATION
     if jump_dest not in evm.valid_jump_destinations:
@@ -84,7 +87,7 @@ def jumpi(evm: Evm) -> None:
     conditional_value = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_HIGH)
+    charge_gas(evm, GasCosts.OPCODE_JUMPI)
 
     # OPERATION
     if conditional_value == 0:
@@ -113,7 +116,7 @@ def pc(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_PC)
 
     # OPERATION
     push(evm.stack, U256(evm.pc))
@@ -137,7 +140,7 @@ def gas_left(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GAS)
 
     # OPERATION
     push(evm.stack, U256(evm.gas_left))
@@ -162,7 +165,7 @@ def jumpdest(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_JUMPDEST)
+    charge_gas(evm, GasCosts.OPCODE_JUMPDEST)
 
     # OPERATION
     pass
diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/environment.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/environment.py
index 83eb5528226..d85aaf0c97a 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/instructions/environment.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/environment.py
@@ -15,16 +15,12 @@
 
 from ethereum.utils.numeric import ceil32
 
-from ...state import get_account, get_code
+from ...state_tracker import get_account, get_code
 from ...utils.address import to_address_masked
 from ...vm.memory import buffer_read, memory_write
 from .. import Evm
 from ..gas import (
-    GAS_BALANCE,
-    GAS_BASE,
-    GAS_COPY,
-    GAS_EXTERNAL,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -45,7 +41,7 @@ def address(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ADDRESS)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.current_target))
@@ -68,11 +64,12 @@ def balance(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_BALANCE)
+    charge_gas(evm, GasCosts.OPCODE_BALANCE)
 
     # OPERATION
     # Non-existent accounts default to EMPTY_ACCOUNT, which has balance 0.
-    balance = get_account(evm.message.block_env.state, address).balance
+    tx_state = evm.message.tx_env.state
+    balance = get_account(tx_state, address).balance
 
     push(evm.stack, balance)
 
@@ -95,7 +92,7 @@ def origin(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_ORIGIN)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.tx_env.origin))
@@ -118,7 +115,7 @@ def caller(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLER)
 
     # OPERATION
     push(evm.stack, U256.from_be_bytes(evm.message.caller))
@@ -141,7 +138,7 @@ def callvalue(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLVALUE)
 
     # OPERATION
     push(evm.stack, evm.message.value)
@@ -165,7 +162,7 @@ def calldataload(evm: Evm) -> None:
     start_index = pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATALOAD)
 
     # OPERATION
     value = buffer_read(evm.message.data, start_index, U256(32))
@@ -190,7 +187,7 @@ def calldatasize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CALLDATASIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.message.data)))
@@ -219,11 +216,14 @@ def calldatacopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CALLDATACOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -248,7 +248,7 @@ def codesize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_CODESIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.code)))
@@ -277,11 +277,14 @@ def codecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_CODECOPY_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -306,7 +309,7 @@ def gasprice(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_GASPRICE)
 
     # OPERATION
     push(evm.stack, U256(evm.message.tx_env.gas_price))
@@ -329,11 +332,12 @@ def extcodesize(evm: Evm) -> None:
     address = to_address_masked(pop(evm.stack))
 
     # GAS
-    charge_gas(evm, GAS_EXTERNAL)
+    charge_gas(evm, GasCosts.OPCODE_EXTERNAL_BASE)
 
     # OPERATION
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     codesize = U256(len(code))
     push(evm.stack, codesize)
@@ -360,16 +364,20 @@ def extcodecopy(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    copy_gas_cost = GAS_COPY * words
+    copy_gas_cost = GasCosts.OPCODE_COPY_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_EXTERNAL + copy_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_EXTERNAL_BASE + copy_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
-    account = get_account(evm.message.block_env.state, address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    tx_state = evm.message.tx_env.state
+    account = get_account(tx_state, address)
+    code = get_code(tx_state, account.code_hash)
 
     value = buffer_read(code, code_start_index, size)
     memory_write(evm.memory, memory_start_index, value)
diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/keccak.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/keccak.py
index 8661c5d62f5..0d3e17cf08e 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/instructions/keccak.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/keccak.py
@@ -18,8 +18,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_KECCAK256,
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,11 +45,14 @@ def keccak(evm: Evm) -> None:
 
     # GAS
     words = ceil32(Uint(size)) // Uint(32)
-    word_gas_cost = GAS_KECCAK256_PER_WORD * words
+    word_gas_cost = GasCosts.OPCODE_KECCAK256_PER_WORD * words
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(memory_start_index, size)]
     )
-    charge_gas(evm, GAS_KECCAK256 + word_gas_cost + extend_memory.cost)
+    charge_gas(
+        evm,
+        GasCosts.OPCODE_KECCAK256_BASE + word_gas_cost + extend_memory.cost,
+    )
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/log.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/log.py
index 76c02e737a4..3cfb69c194c 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/instructions/log.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/log.py
@@ -12,15 +12,14 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import Uint
 
 from ...blocks import Log
 from .. import Evm
 from ..gas import (
-    GAS_LOG,
-    GAS_LOG_DATA_PER_BYTE,
-    GAS_LOG_TOPIC,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -58,9 +57,9 @@ def log_n(evm: Evm, num_topics: int) -> None:
     )
     charge_gas(
         evm,
-        GAS_LOG
-        + GAS_LOG_DATA_PER_BYTE * Uint(size)
-        + GAS_LOG_TOPIC * Uint(num_topics)
+        GasCosts.OPCODE_LOG_BASE
+        + GasCosts.OPCODE_LOG_DATA_PER_BYTE * Uint(size)
+        + GasCosts.OPCODE_LOG_TOPIC * Uint(num_topics)
         + extend_memory.cost,
     )
 
@@ -78,8 +77,8 @@ def log_n(evm: Evm, num_topics: int) -> None:
     evm.pc += Uint(1)
 
 
-log0 = partial(log_n, num_topics=0)
-log1 = partial(log_n, num_topics=1)
-log2 = partial(log_n, num_topics=2)
-log3 = partial(log_n, num_topics=3)
-log4 = partial(log_n, num_topics=4)
+log0: Callable[[Evm], None] = partial(log_n, num_topics=0)
+log1: Callable[[Evm], None] = partial(log_n, num_topics=1)
+log2: Callable[[Evm], None] = partial(log_n, num_topics=2)
+log3: Callable[[Evm], None] = partial(log_n, num_topics=3)
+log4: Callable[[Evm], None] = partial(log_n, num_topics=4)
diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/memory.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/memory.py
index 3a242ba2f7a..93861811559 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/instructions/memory.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/memory.py
@@ -16,8 +16,7 @@
 
 from .. import Evm
 from ..gas import (
-    GAS_BASE,
-    GAS_VERY_LOW,
+    GasCosts,
     calculate_gas_extend_memory,
     charge_gas,
 )
@@ -46,7 +45,7 @@ def mstore(evm: Evm) -> None:
         evm.memory, [(start_position, U256(len(value)))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -77,7 +76,7 @@ def mstore8(evm: Evm) -> None:
         evm.memory, [(start_position, U256(1))]
     )
 
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MSTORE8_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -105,7 +104,7 @@ def mload(evm: Evm) -> None:
     extend_memory = calculate_gas_extend_memory(
         evm.memory, [(start_position, U256(32))]
     )
-    charge_gas(evm, GAS_VERY_LOW + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_MLOAD_BASE + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -132,7 +131,7 @@ def msize(evm: Evm) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_MSIZE)
 
     # OPERATION
     push(evm.stack, U256(len(evm.memory)))
diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/stack.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/stack.py
index 0fc0d3fe4b5..901bff4ed3b 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/instructions/stack.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/stack.py
@@ -12,12 +12,16 @@
 """
 
 from functools import partial
+from typing import Callable
 
 from ethereum_types.numeric import U256, Uint
 
 from .. import Evm, stack
 from ..exceptions import StackUnderflowError
-from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas
+from ..gas import (
+    GasCosts,
+    charge_gas,
+)
 from ..memory import buffer_read
 
 
@@ -35,7 +39,7 @@ def pop(evm: Evm) -> None:
     stack.pop(evm.stack)
 
     # GAS
-    charge_gas(evm, GAS_BASE)
+    charge_gas(evm, GasCosts.OPCODE_POP)
 
     # OPERATION
     pass
@@ -62,7 +66,7 @@ def push_n(evm: Evm, num_bytes: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_PUSH)
 
     # OPERATION
     data_to_push = U256.from_be_bytes(
@@ -92,7 +96,7 @@ def dup_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_DUP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number]
@@ -124,7 +128,7 @@ def swap_n(evm: Evm, item_number: int) -> None:
     pass
 
     # GAS
-    charge_gas(evm, GAS_VERY_LOW)
+    charge_gas(evm, GasCosts.OPCODE_SWAP)
     if item_number >= len(evm.stack):
         raise StackUnderflowError
     evm.stack[-1], evm.stack[-1 - item_number] = (
@@ -136,69 +140,69 @@ def swap_n(evm: Evm, item_number: int) -> None:
     evm.pc += Uint(1)
 
 
-push1 = partial(push_n, num_bytes=1)
-push2 = partial(push_n, num_bytes=2)
-push3 = partial(push_n, num_bytes=3)
-push4 = partial(push_n, num_bytes=4)
-push5 = partial(push_n, num_bytes=5)
-push6 = partial(push_n, num_bytes=6)
-push7 = partial(push_n, num_bytes=7)
-push8 = partial(push_n, num_bytes=8)
-push9 = partial(push_n, num_bytes=9)
-push10 = partial(push_n, num_bytes=10)
-push11 = partial(push_n, num_bytes=11)
-push12 = partial(push_n, num_bytes=12)
-push13 = partial(push_n, num_bytes=13)
-push14 = partial(push_n, num_bytes=14)
-push15 = partial(push_n, num_bytes=15)
-push16 = partial(push_n, num_bytes=16)
-push17 = partial(push_n, num_bytes=17)
-push18 = partial(push_n, num_bytes=18)
-push19 = partial(push_n, num_bytes=19)
-push20 = partial(push_n, num_bytes=20)
-push21 = partial(push_n, num_bytes=21)
-push22 = partial(push_n, num_bytes=22)
-push23 = partial(push_n, num_bytes=23)
-push24 = partial(push_n, num_bytes=24)
-push25 = partial(push_n, num_bytes=25)
-push26 = partial(push_n, num_bytes=26)
-push27 = partial(push_n, num_bytes=27)
-push28 = partial(push_n, num_bytes=28)
-push29 = partial(push_n, num_bytes=29)
-push30 = partial(push_n, num_bytes=30)
-push31 = partial(push_n, num_bytes=31)
-push32 = partial(push_n, num_bytes=32)
-
-dup1 = partial(dup_n, item_number=0)
-dup2 = partial(dup_n, item_number=1)
-dup3 = partial(dup_n, item_number=2)
-dup4 = partial(dup_n, item_number=3)
-dup5 = partial(dup_n, item_number=4)
-dup6 = partial(dup_n, item_number=5)
-dup7 = partial(dup_n, item_number=6)
-dup8 = partial(dup_n, item_number=7)
-dup9 = partial(dup_n, item_number=8)
-dup10 = partial(dup_n, item_number=9)
-dup11 = partial(dup_n, item_number=10)
-dup12 = partial(dup_n, item_number=11)
-dup13 = partial(dup_n, item_number=12)
-dup14 = partial(dup_n, item_number=13)
-dup15 = partial(dup_n, item_number=14)
-dup16 = partial(dup_n, item_number=15)
-
-swap1 = partial(swap_n, item_number=1)
-swap2 = partial(swap_n, item_number=2)
-swap3 = partial(swap_n, item_number=3)
-swap4 = partial(swap_n, item_number=4)
-swap5 = partial(swap_n, item_number=5)
-swap6 = partial(swap_n, item_number=6)
-swap7 = partial(swap_n, item_number=7)
-swap8 = partial(swap_n, item_number=8)
-swap9 = partial(swap_n, item_number=9)
-swap10 = partial(swap_n, item_number=10)
-swap11 = partial(swap_n, item_number=11)
-swap12 = partial(swap_n, item_number=12)
-swap13 = partial(swap_n, item_number=13)
-swap14 = partial(swap_n, item_number=14)
-swap15 = partial(swap_n, item_number=15)
-swap16 = partial(swap_n, item_number=16)
+push1: Callable[[Evm], None] = partial(push_n, num_bytes=1)
+push2: Callable[[Evm], None] = partial(push_n, num_bytes=2)
+push3: Callable[[Evm], None] = partial(push_n, num_bytes=3)
+push4: Callable[[Evm], None] = partial(push_n, num_bytes=4)
+push5: Callable[[Evm], None] = partial(push_n, num_bytes=5)
+push6: Callable[[Evm], None] = partial(push_n, num_bytes=6)
+push7: Callable[[Evm], None] = partial(push_n, num_bytes=7)
+push8: Callable[[Evm], None] = partial(push_n, num_bytes=8)
+push9: Callable[[Evm], None] = partial(push_n, num_bytes=9)
+push10: Callable[[Evm], None] = partial(push_n, num_bytes=10)
+push11: Callable[[Evm], None] = partial(push_n, num_bytes=11)
+push12: Callable[[Evm], None] = partial(push_n, num_bytes=12)
+push13: Callable[[Evm], None] = partial(push_n, num_bytes=13)
+push14: Callable[[Evm], None] = partial(push_n, num_bytes=14)
+push15: Callable[[Evm], None] = partial(push_n, num_bytes=15)
+push16: Callable[[Evm], None] = partial(push_n, num_bytes=16)
+push17: Callable[[Evm], None] = partial(push_n, num_bytes=17)
+push18: Callable[[Evm], None] = partial(push_n, num_bytes=18)
+push19: Callable[[Evm], None] = partial(push_n, num_bytes=19)
+push20: Callable[[Evm], None] = partial(push_n, num_bytes=20)
+push21: Callable[[Evm], None] = partial(push_n, num_bytes=21)
+push22: Callable[[Evm], None] = partial(push_n, num_bytes=22)
+push23: Callable[[Evm], None] = partial(push_n, num_bytes=23)
+push24: Callable[[Evm], None] = partial(push_n, num_bytes=24)
+push25: Callable[[Evm], None] = partial(push_n, num_bytes=25)
+push26: Callable[[Evm], None] = partial(push_n, num_bytes=26)
+push27: Callable[[Evm], None] = partial(push_n, num_bytes=27)
+push28: Callable[[Evm], None] = partial(push_n, num_bytes=28)
+push29: Callable[[Evm], None] = partial(push_n, num_bytes=29)
+push30: Callable[[Evm], None] = partial(push_n, num_bytes=30)
+push31: Callable[[Evm], None] = partial(push_n, num_bytes=31)
+push32: Callable[[Evm], None] = partial(push_n, num_bytes=32)
+
+dup1: Callable[[Evm], None] = partial(dup_n, item_number=0)
+dup2: Callable[[Evm], None] = partial(dup_n, item_number=1)
+dup3: Callable[[Evm], None] = partial(dup_n, item_number=2)
+dup4: Callable[[Evm], None] = partial(dup_n, item_number=3)
+dup5: Callable[[Evm], None] = partial(dup_n, item_number=4)
+dup6: Callable[[Evm], None] = partial(dup_n, item_number=5)
+dup7: Callable[[Evm], None] = partial(dup_n, item_number=6)
+dup8: Callable[[Evm], None] = partial(dup_n, item_number=7)
+dup9: Callable[[Evm], None] = partial(dup_n, item_number=8)
+dup10: Callable[[Evm], None] = partial(dup_n, item_number=9)
+dup11: Callable[[Evm], None] = partial(dup_n, item_number=10)
+dup12: Callable[[Evm], None] = partial(dup_n, item_number=11)
+dup13: Callable[[Evm], None] = partial(dup_n, item_number=12)
+dup14: Callable[[Evm], None] = partial(dup_n, item_number=13)
+dup15: Callable[[Evm], None] = partial(dup_n, item_number=14)
+dup16: Callable[[Evm], None] = partial(dup_n, item_number=15)
+
+swap1: Callable[[Evm], None] = partial(swap_n, item_number=1)
+swap2: Callable[[Evm], None] = partial(swap_n, item_number=2)
+swap3: Callable[[Evm], None] = partial(swap_n, item_number=3)
+swap4: Callable[[Evm], None] = partial(swap_n, item_number=4)
+swap5: Callable[[Evm], None] = partial(swap_n, item_number=5)
+swap6: Callable[[Evm], None] = partial(swap_n, item_number=6)
+swap7: Callable[[Evm], None] = partial(swap_n, item_number=7)
+swap8: Callable[[Evm], None] = partial(swap_n, item_number=8)
+swap9: Callable[[Evm], None] = partial(swap_n, item_number=9)
+swap10: Callable[[Evm], None] = partial(swap_n, item_number=10)
+swap11: Callable[[Evm], None] = partial(swap_n, item_number=11)
+swap12: Callable[[Evm], None] = partial(swap_n, item_number=12)
+swap13: Callable[[Evm], None] = partial(swap_n, item_number=13)
+swap14: Callable[[Evm], None] = partial(swap_n, item_number=14)
+swap15: Callable[[Evm], None] = partial(swap_n, item_number=15)
+swap16: Callable[[Evm], None] = partial(swap_n, item_number=16)
diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/storage.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/storage.py
index 8748340fc27..16921a1a7fb 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/instructions/storage.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/storage.py
@@ -13,13 +13,10 @@
 
 from ethereum_types.numeric import Uint
 
-from ...state import get_storage, set_storage
+from ...state_tracker import get_storage, set_storage
 from .. import Evm
 from ..gas import (
-    GAS_SLOAD,
-    GAS_STORAGE_SET,
-    GAS_STORAGE_UPDATE,
-    REFUND_STORAGE_CLEAR,
+    GasCosts,
     charge_gas,
 )
 from ..stack import pop, push
@@ -40,12 +37,11 @@ def sload(evm: Evm) -> None:
     key = pop(evm.stack).to_be_bytes32()
 
     # GAS
-    charge_gas(evm, GAS_SLOAD)
+    charge_gas(evm, GasCosts.SLOAD)
 
     # OPERATION
-    value = get_storage(
-        evm.message.block_env.state, evm.message.current_target, key
-    )
+    tx_state = evm.message.tx_env.state
+    value = get_storage(tx_state, evm.message.current_target, key)
 
     push(evm.stack, value)
 
@@ -68,20 +64,20 @@ def sstore(evm: Evm) -> None:
     new_value = pop(evm.stack)
 
     # GAS
-    state = evm.message.block_env.state
-    current_value = get_storage(state, evm.message.current_target, key)
+    tx_state = evm.message.tx_env.state
+    current_value = get_storage(tx_state, evm.message.current_target, key)
     if new_value != 0 and current_value == 0:
-        gas_cost = GAS_STORAGE_SET
+        gas_cost = GasCosts.STORAGE_SET
     else:
-        gas_cost = GAS_STORAGE_UPDATE
+        gas_cost = GasCosts.COLD_STORAGE_WRITE
 
     if new_value == 0 and current_value != 0:
-        evm.refund_counter += REFUND_STORAGE_CLEAR
+        evm.refund_counter += GasCosts.REFUND_STORAGE_CLEAR
 
     charge_gas(evm, gas_cost)
 
     # OPERATION
-    set_storage(state, evm.message.current_target, key, new_value)
+    set_storage(tx_state, evm.message.current_target, key, new_value)
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)
diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/system.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/system.py
index 50a359402b1..f09665e1701 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/instructions/system.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/system.py
@@ -16,7 +16,7 @@
 
 from ethereum.state import Address
 
-from ...state import (
+from ...state_tracker import (
     account_exists,
     account_has_code_or_nonce,
     account_has_storage,
@@ -33,14 +33,7 @@
     incorporate_child_on_success,
 )
 from ..gas import (
-    GAS_CALL,
-    GAS_CALL_VALUE,
-    GAS_CREATE,
-    GAS_NEW_ACCOUNT,
-    GAS_SELF_DESTRUCT,
-    GAS_SELF_DESTRUCT_NEW_ACCOUNT,
-    GAS_ZERO,
-    REFUND_SELF_DESTRUCT,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -74,7 +67,7 @@ def create(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_CREATE + extend_memory.cost)
+    charge_gas(evm, GasCosts.OPCODE_CREATE_BASE + extend_memory.cost)
 
     create_message_gas = max_message_call_gas(Uint(evm.gas_left))
     evm.gas_left -= create_message_gas
@@ -82,12 +75,12 @@ def create(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_address = evm.message.current_target
-    sender = get_account(evm.message.block_env.state, sender_address)
+    sender = get_account(evm.message.tx_env.state, sender_address)
 
     contract_address = compute_contract_address(
         evm.message.current_target,
         get_account(
-            evm.message.block_env.state, evm.message.current_target
+            evm.message.tx_env.state, evm.message.current_target
         ).nonce,
     )
 
@@ -99,20 +92,16 @@ def create(evm: Evm) -> None:
         push(evm.stack, U256(0))
         evm.gas_left += create_message_gas
     elif account_has_code_or_nonce(
-        evm.message.block_env.state, contract_address
-    ) or account_has_storage(evm.message.block_env.state, contract_address):
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        evm.message.tx_env.state, contract_address
+    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
     else:
         call_data = memory_read_bytes(
             evm.memory, memory_start_position, memory_size
         )
 
-        increment_nonce(
-            evm.message.block_env.state, evm.message.current_target
-        )
+        increment_nonce(evm.message.tx_env.state, evm.message.current_target)
 
         child_message = Message(
             block_env=evm.message.block_env,
@@ -163,7 +152,7 @@ def return_(evm: Evm) -> None:
         evm.memory, [(memory_start_position, memory_size)]
     )
 
-    charge_gas(evm, GAS_ZERO + extend_memory.cost)
+    charge_gas(evm, GasCosts.ZERO + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
@@ -203,8 +192,8 @@ def generic_call(
     call_data = memory_read_bytes(
         evm.memory, memory_input_start_position, memory_input_size
     )
-    account = get_account(evm.message.block_env.state, code_address)
-    code = get_code(evm.message.block_env.state, account.code_hash)
+    account = get_account(evm.message.tx_env.state, code_address)
+    code = get_code(evm.message.tx_env.state, account.code_hash)
     child_message = Message(
         block_env=evm.message.block_env,
         tx_env=evm.message.tx_env,
@@ -267,22 +256,22 @@ def call(evm: Evm) -> None:
 
     code_address = to
 
-    _account_exists = account_exists(evm.message.block_env.state, to)
-    create_gas_cost = Uint(0) if _account_exists else GAS_NEW_ACCOUNT
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    _account_exists = account_exists(evm.message.tx_env.state, to)
+    create_gas_cost = Uint(0) if _account_exists else GasCosts.NEW_ACCOUNT
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
         Uint(evm.gas_left),
         extend_memory.cost,
-        GAS_CALL + create_gas_cost + transfer_gas_cost,
+        GasCosts.OPCODE_CALL_BASE + create_gas_cost + transfer_gas_cost,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -335,20 +324,20 @@ def callcode(evm: Evm) -> None:
             (memory_output_start_position, memory_output_size),
         ],
     )
-    transfer_gas_cost = Uint(0) if value == 0 else GAS_CALL_VALUE
+    transfer_gas_cost = Uint(0) if value == 0 else GasCosts.CALL_VALUE
     message_call_gas = calculate_message_call_gas(
         value,
         gas,
         Uint(evm.gas_left),
         extend_memory.cost,
-        GAS_CALL + transfer_gas_cost,
+        GasCosts.OPCODE_CALL_BASE + transfer_gas_cost,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
+        evm.message.tx_env.state, evm.message.current_target
     ).balance
     if sender_balance < value:
         push(evm.stack, U256(0))
@@ -386,9 +375,9 @@ def selfdestruct(evm: Evm) -> None:
     beneficiary = to_address_masked(pop(evm.stack))
 
     # GAS
-    gas_cost = GAS_SELF_DESTRUCT
-    if not account_exists(evm.message.block_env.state, beneficiary):
-        gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT
+    gas_cost = GasCosts.OPCODE_SELFDESTRUCT_BASE
+    if not account_exists(evm.message.tx_env.state, beneficiary):
+        gas_cost += GasCosts.OPCODE_SELFDESTRUCT_NEW_ACCOUNT
 
     originator = evm.message.current_target
 
@@ -399,28 +388,28 @@ def selfdestruct(evm: Evm) -> None:
         parent_evm = parent_evm.message.parent_evm
 
     if originator not in refunded_accounts:
-        evm.refund_counter += REFUND_SELF_DESTRUCT
+        evm.refund_counter += GasCosts.REFUND_SELF_DESTRUCT
 
     charge_gas(evm, gas_cost)
 
     # OPERATION
     beneficiary_balance = get_account(
-        evm.message.block_env.state, beneficiary
+        evm.message.tx_env.state, beneficiary
     ).balance
     originator_balance = get_account(
-        evm.message.block_env.state, originator
+        evm.message.tx_env.state, originator
     ).balance
 
     # First Transfer to beneficiary
     set_account_balance(
-        evm.message.block_env.state,
+        evm.message.tx_env.state,
         beneficiary,
         beneficiary_balance + originator_balance,
     )
     # Next, Zero the balance of the address being deleted (must come after
     # sending to beneficiary in case the contract named itself as the
     # beneficiary).
-    set_account_balance(evm.message.block_env.state, originator, U256(0))
+    set_account_balance(evm.message.tx_env.state, originator, U256(0))
 
     # register account for deletion
     evm.accounts_to_delete.add(originator)
@@ -459,7 +448,11 @@ def delegatecall(evm: Evm) -> None:
         ],
     )
     message_call_gas = calculate_message_call_gas(
-        U256(0), gas, Uint(evm.gas_left), extend_memory.cost, GAS_CALL
+        U256(0),
+        gas,
+        Uint(evm.gas_left),
+        extend_memory.cost,
+        GasCosts.OPCODE_CALL_BASE,
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
diff --git a/src/ethereum/forks/tangerine_whistle/vm/interpreter.py b/src/ethereum/forks/tangerine_whistle/vm/interpreter.py
index e6e7c7729c4..476a569731c 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/interpreter.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/interpreter.py
@@ -12,7 +12,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Optional, Set, Tuple
+from typing import Optional, Set, Tuple, final
 
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint, ulen
@@ -31,18 +31,18 @@
 )
 
 from ..blocks import Log
-from ..state import (
+from ..state_tracker import (
     account_has_code_or_nonce,
     account_has_storage,
-    begin_transaction,
-    commit_transaction,
+    copy_tx_state,
+    destroy_storage,
     move_ether,
-    rollback_transaction,
+    restore_tx_state,
     set_code,
     touch_account,
 )
 from ..vm import Message
-from ..vm.gas import GAS_CODE_DEPOSIT_PER_BYTE, charge_gas
+from ..vm.gas import GasCosts, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
 from .exceptions import (
@@ -57,6 +57,7 @@
 STACK_DEPTH_LIMIT = Uint(1024)
 
 
+@final
 @dataclass
 class MessageCallOutput:
     """
@@ -94,12 +95,12 @@ def process_message_call(message: Message) -> MessageCallOutput:
         Output of the message call
 
     """
-    block_env = message.block_env
+    tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
         is_collision = account_has_code_or_nonce(
-            block_env.state, message.current_target
-        ) or account_has_storage(block_env.state, message.current_target)
+            tx_state, message.current_target
+        ) or account_has_storage(tx_state, message.current_target)
         if is_collision:
             return MessageCallOutput(
                 gas_left=Uint(0),
@@ -150,27 +151,33 @@ def process_create_message(message: Message) -> Evm:
         Items containing execution specific objects.
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
+
+    # If the address where the account is being created has storage, it is
+    # destroyed. This can only happen in the following highly unlikely
+    # circumstances:
+    # * The address created by a `CREATE` call collides with a subsequent
+    #   `CREATE` call.
+    destroy_storage(tx_state, message.current_target)
 
     evm = process_message(message)
     if not evm.error:
         contract_code = evm.output
         contract_code_gas = (
-            Uint(len(contract_code)) * GAS_CODE_DEPOSIT_PER_BYTE
+            ulen(contract_code) * GasCosts.CODE_DEPOSIT_PER_BYTE
         )
         try:
             charge_gas(evm, contract_code_gas)
         except ExceptionalHalt as error:
-            rollback_transaction(state)
+            restore_tx_state(tx_state, snapshot)
             evm.gas_left = Uint(0)
             evm.error = error
         else:
-            set_code(state, message.current_target, contract_code)
-            commit_transaction(state)
+            set_code(tx_state, message.current_target, contract_code)
     else:
-        rollback_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
 
 
@@ -189,7 +196,7 @@ def process_message(message: Message) -> Evm:
         Items containing execution specific objects
 
     """
-    state = message.block_env.state
+    tx_state = message.tx_env.state
     if message.depth > STACK_DEPTH_LIMIT:
         raise StackDepthLimitError("Stack depth limit reached")
 
@@ -212,13 +219,16 @@ def process_message(message: Message) -> Evm:
     )
 
     # take snapshot of state before processing the message
-    begin_transaction(state)
+    snapshot = copy_tx_state(tx_state)
 
-    touch_account(state, message.current_target)
+    touch_account(tx_state, message.current_target)
 
     if message.should_transfer_value and message.value != 0:
         move_ether(
-            state, message.caller, message.current_target, message.value
+            tx_state,
+            message.caller,
+            message.current_target,
+            message.value,
         )
 
     try:
@@ -245,9 +255,5 @@ def process_message(message: Message) -> Evm:
         evm.error = error
 
     if evm.error:
-        # revert state to the last saved checkpoint
-        # since the message call resulted in an error
-        rollback_transaction(state)
-    else:
-        commit_transaction(state)
+        restore_tx_state(tx_state, snapshot)
     return evm
diff --git a/src/ethereum/forks/tangerine_whistle/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/tangerine_whistle/vm/precompiled_contracts/ecrecover.py
index d8f6602e556..17a0174f6ed 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/precompiled_contracts/ecrecover.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/precompiled_contracts/ecrecover.py
@@ -19,7 +19,7 @@
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
-from ...vm.gas import GAS_ECRECOVER, charge_gas
+from ...vm.gas import GasCosts, charge_gas
 from ...vm.memory import buffer_read
 
 
@@ -37,7 +37,7 @@ def ecrecover(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    charge_gas(evm, GAS_ECRECOVER)
+    charge_gas(evm, GasCosts.PRECOMPILE_ECRECOVER)
 
     # OPERATION
     message_hash_bytes = buffer_read(data, U256(0), U256(32))
diff --git a/src/ethereum/forks/tangerine_whistle/vm/precompiled_contracts/identity.py b/src/ethereum/forks/tangerine_whistle/vm/precompiled_contracts/identity.py
index 49a79a4c4a7..b7631736074 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/precompiled_contracts/identity.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/precompiled_contracts/identity.py
@@ -11,12 +11,15 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_IDENTITY, GAS_IDENTITY_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def identity(evm: Evm) -> None:
@@ -32,8 +35,12 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_IDENTITY + GAS_IDENTITY_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_IDENTITY_BASE
+        + GasCosts.PRECOMPILE_IDENTITY_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = data
diff --git a/src/ethereum/forks/tangerine_whistle/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/tangerine_whistle/vm/precompiled_contracts/ripemd160.py
index 74cefd93afb..c82c9bd534d 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/precompiled_contracts/ripemd160.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/precompiled_contracts/ripemd160.py
@@ -13,13 +13,16 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_RIPEMD160, GAS_RIPEMD160_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def ripemd160(evm: Evm) -> None:
@@ -35,8 +38,12 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_RIPEMD160 + GAS_RIPEMD160_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_RIPEMD160_BASE
+        + GasCosts.PRECOMPILE_RIPEMD160_PER_WORD * word_count,
+    )
 
     # OPERATION
     hash_bytes = hashlib.new("ripemd160", data).digest()
diff --git a/src/ethereum/forks/tangerine_whistle/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/tangerine_whistle/vm/precompiled_contracts/sha256.py
index b0d1517b40e..9d467d7e951 100644
--- a/src/ethereum/forks/tangerine_whistle/vm/precompiled_contracts/sha256.py
+++ b/src/ethereum/forks/tangerine_whistle/vm/precompiled_contracts/sha256.py
@@ -13,12 +13,15 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
 from ...vm import Evm
-from ...vm.gas import GAS_SHA256, GAS_SHA256_WORD, charge_gas
+from ...vm.gas import (
+    GasCosts,
+    charge_gas,
+)
 
 
 def sha256(evm: Evm) -> None:
@@ -34,8 +37,12 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
-    charge_gas(evm, GAS_SHA256 + GAS_SHA256_WORD * word_count)
+    word_count = ceil32(ulen(data)) // Uint(32)
+    charge_gas(
+        evm,
+        GasCosts.PRECOMPILE_SHA256_BASE
+        + GasCosts.PRECOMPILE_SHA256_PER_WORD * word_count,
+    )
 
     # OPERATION
     evm.output = hashlib.sha256(data).digest()
diff --git a/src/ethereum/genesis.py b/src/ethereum/genesis.py
index aa15805521b..5c6adec0150 100644
--- a/src/ethereum/genesis.py
+++ b/src/ethereum/genesis.py
@@ -16,7 +16,7 @@
 import json
 import pkgutil
 from dataclasses import dataclass
-from typing import Any, Callable, Dict, Generic, Type, TypeVar
+from typing import Any, Callable, Dict, Generic, Type, TypeVar, final
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes8, Bytes32, FixedBytes
@@ -34,6 +34,7 @@
 )
 
 
+@final
 @slotted_freezable
 @dataclass
 class GenesisConfiguration:
@@ -133,6 +134,7 @@ def hex_or_base_10_str_to_u256(balance: str) -> U256:
 BlockT = TypeVar("BlockT")
 
 
+@final
 @slotted_freezable
 @dataclass
 class GenesisFork(
@@ -265,6 +267,9 @@ def add_genesis_block(
     if has_field(hardfork.Header, "block_access_list_hash"):
         fields["block_access_list_hash"] = keccak256(rlp.encode([]))
 
+    if has_field(hardfork.Header, "slot_number"):
+        fields["slot_number"] = U64(0)
+
     genesis_header = hardfork.Header(**fields)
 
     block_fields = {
diff --git a/src/ethereum/merkle_patricia_trie.py b/src/ethereum/merkle_patricia_trie.py
new file mode 100644
index 00000000000..cb088793454
--- /dev/null
+++ b/src/ethereum/merkle_patricia_trie.py
@@ -0,0 +1,566 @@
+"""
+Modified Merkle Patricia Trie (MPT), the data structure that commits to
+large amounts of state with a single hash.
+
+The MPT is a 16-ary radix trie augmented with cryptographic hashing, so each
+unique mapping of keys to values has a deterministic root hash. Block headers
+commit to the state, transactions, and receipts through these roots, allowing
+nodes to verify any individual entry against the header without storing the
+entire trie.
+
+The trie has three kinds of internal node:
+
+- A [`LeafNode`] terminates a path and stores a value.
+- An [`ExtensionNode`] compresses a sequence of nibbles shared by every key
+  passing through it, avoiding chains of single-child branches.
+- A [`BranchNode`] has up to sixteen children, one per nibble value, plus an
+  optional value for a key that terminates exactly at this node.
+
+Keys are processed as **nibbles** (half-bytes, each `0` to `15` inclusive)
+by [`bytes_to_nibble_list`][bnl], and stored within nodes in a compressed
+[hex-prefix encoding][hp] produced by [`nibble_list_to_compact`][nlc].
+
+Some tries are _secured_, meaning their keys are hashed with [`keccak256`]
+before insertion. Hashing distributes keys uniformly so adversarial choices
+cannot create a deeply unbalanced trie. The state and storage tries are
+secured; the transaction and receipt tries are not.
+
+The mapping of keys to values is exposed through [`Trie`]; the [`root`]
+function reduces a trie to its 32-byte commitment.
+
+[`LeafNode`]: ref:ethereum.merkle_patricia_trie.LeafNode
+[`ExtensionNode`]: ref:ethereum.merkle_patricia_trie.ExtensionNode
+[`BranchNode`]: ref:ethereum.merkle_patricia_trie.BranchNode
+[`Trie`]: ref:ethereum.merkle_patricia_trie.Trie
+[`root`]: ref:ethereum.merkle_patricia_trie.root
+[bnl]: ref:ethereum.merkle_patricia_trie.bytes_to_nibble_list
+[nlc]: ref:ethereum.merkle_patricia_trie.nibble_list_to_compact
+[`keccak256`]: ref:ethereum.crypto.hash.keccak256
+[hp]: https://ethereum.org/en/developers/docs/data-structures-and-encoding/patricia-merkle-trie/#optimization
+"""  # noqa: E501
+
+from __future__ import annotations
+
+import copy
+from dataclasses import dataclass, field
+from typing import (
+    TYPE_CHECKING,
+    Callable,
+    Dict,
+    Generic,
+    List,
+    Mapping,
+    MutableMapping,
+    Optional,
+    Sequence,
+    Tuple,
+    TypeVar,
+    cast,
+    final,
+)
+
+from ethereum_rlp import Extended, rlp
+from ethereum_types.bytes import Bytes
+from ethereum_types.frozen import slotted_freezable
+from ethereum_types.numeric import Uint
+from typing_extensions import assert_type
+
+from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.utils.hexadecimal import hex_to_bytes
+
+if TYPE_CHECKING:
+    from ethereum.state import Account, Address, Root
+
+# Note: `Hash32` is used here rather than `Root` because `Root` is defined in
+# `ethereum.state`, which imports from this module — referring to it at module
+# scope would create a circular import.
+EMPTY_TRIE_ROOT = Hash32(
+    hex_to_bytes(
+        "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+    )
+)
+"""
+Root hash of an empty Merkle Patricia Trie.
+
+Used in block headers (state, transactions, receipts, etc.) when the
+corresponding trie has no entries. This is the [`keccak256`] hash of the RLP
+encoding of an empty byte string, regardless of whether the trie would have
+been secured.
+
+[`keccak256`]: ref:ethereum.crypto.hash.keccak256
+"""
+
+
+@final
+@slotted_freezable
+@dataclass
+class LeafNode:
+    """
+    Terminal node in the trie, holding a value at the end of a key path.
+    """
+
+    rest_of_key: Bytes
+    """
+    Nibbles of the key not yet consumed by ancestor nodes.
+    """
+
+    value: Extended
+    """
+    Value stored at this key, in its encoded form.
+    """
+
+
+@final
+@slotted_freezable
+@dataclass
+class ExtensionNode:
+    """
+    Internal node that compresses a run of nibbles shared by every key
+    passing through it.
+
+    Without this optimization, deep tries of similar keys would otherwise
+    require long chains of single-child [`BranchNode`]s.
+
+    [`BranchNode`]: ref:ethereum.merkle_patricia_trie.BranchNode
+    """
+
+    key_segment: Bytes
+    """
+    Sequence of nibbles shared by all keys descending through this node.
+    """
+
+    subnode: Extended
+    """
+    Encoded child node reached after consuming [`key_segment`][ks].
+
+    [ks]: ref:ethereum.merkle_patricia_trie.ExtensionNode.key_segment
+    """
+
+
+BranchSubnodes = Tuple[
+    Extended,
+    Extended,
+    Extended,
+    Extended,
+    Extended,
+    Extended,
+    Extended,
+    Extended,
+    Extended,
+    Extended,
+    Extended,
+    Extended,
+    Extended,
+    Extended,
+    Extended,
+    Extended,
+]
+"""
+Children of a [`BranchNode`], one per nibble value (`0` to `15` inclusive).
+
+Each entry is the encoded form of another internal node, or `b""` if no key
+descends through that nibble.
+
+[`BranchNode`]: ref:ethereum.merkle_patricia_trie.BranchNode
+"""
+
+
+@final
+@slotted_freezable
+@dataclass
+class BranchNode:
+    """
+    Internal node with up to sixteen children, one per nibble value, plus an
+    optional value for a key that terminates exactly at this node.
+    """
+
+    subnodes: BranchSubnodes
+    """
+    Encoded children, indexed by the next nibble of the key.
+    """
+
+    value: Extended
+    """
+    Value for a key that terminates at this node, or `b""` if no such key
+    exists.
+    """
+
+
+InternalNode = LeafNode | ExtensionNode | BranchNode
+"""
+Any of the three node types making up a Merkle Patricia Trie.
+"""
+
+
+K = TypeVar("K", bound=Bytes)
+V = TypeVar("V", bound=Extended | None)
+
+
+def encode_account(raw_account_data: Account, storage_root: Bytes) -> Bytes:
+    """
+    Encode an [`Account`] for inclusion in the state trie.
+
+    The [`Account`] dataclass holds nonce, balance, and code hash, but not
+    the account's storage. The corresponding `storage_root` (the root of the
+    account's own storage trie) is therefore passed in separately.
+
+    [`Account`]: ref:ethereum.state.Account
+    """
+    return rlp.encode(
+        (
+            raw_account_data.nonce,
+            raw_account_data.balance,
+            storage_root,
+            raw_account_data.code_hash,
+        )
+    )
+
+
+def encode_internal_node(node: Optional[InternalNode]) -> Extended:
+    """
+    Encode an [`InternalNode`] into its RLP form.
+
+    When the resulting serialization is at least 32 bytes, [`keccak256`] is
+    applied so that parents store a fixed-size hash. Shorter encodings are
+    returned unhashed and embedded directly into the parent, since storing a
+    hash would only waste space.
+
+    `None` represents the absence of a node and is encoded as `b""`.
+
+    [`InternalNode`]: ref:ethereum.merkle_patricia_trie.InternalNode
+    [`keccak256`]: ref:ethereum.crypto.hash.keccak256
+    """
+    unencoded: Extended
+    if node is None:
+        unencoded = b""
+    elif isinstance(node, LeafNode):
+        unencoded = (
+            nibble_list_to_compact(node.rest_of_key, True),
+            node.value,
+        )
+    elif isinstance(node, ExtensionNode):
+        unencoded = (
+            nibble_list_to_compact(node.key_segment, False),
+            node.subnode,
+        )
+    elif isinstance(node, BranchNode):
+        unencoded = list(node.subnodes) + [node.value]
+    else:
+        raise AssertionError(f"Invalid internal node type {type(node)}!")
+
+    encoded = rlp.encode(unencoded)
+    if len(encoded) < 32:
+        return unencoded
+    else:
+        return keccak256(encoded)
+
+
+def encode_node(node: Extended, storage_root: Bytes | None = None) -> Bytes:
+    """
+    Encode a value for storage in the trie.
+
+    [`Account`] values require a `storage_root` and are encoded with
+    [`encode_account`]; raw `Bytes` are returned unchanged; everything else
+    is RLP-encoded.
+
+    [`Account`]: ref:ethereum.state.Account
+    [`encode_account`]: ref:ethereum.merkle_patricia_trie.encode_account
+    """
+    from ethereum.state import Account
+
+    if isinstance(node, Account):
+        assert storage_root is not None
+        return encode_account(node, storage_root)
+    elif isinstance(node, Bytes):
+        return node
+    else:
+        return rlp.encode(node)
+
+
+@final
+@dataclass
+class Trie(Generic[K, V]):
+    """
+    Key-value mapping with a single root hash that uniquely identifies its
+    contents.
+
+    A trie may be _secured_, meaning keys are hashed with [`keccak256`]
+    before insertion to prevent adversarial keys from producing a deeply
+    unbalanced trie. The state and storage tries are secured; the transaction
+    and receipt tries are not.
+
+    A trie has a [`default`] value representing key absence: storing
+    [`default`] at a key is equivalent to omitting the key, since the
+    underlying MPT represents missing keys by leaving them out entirely.
+
+    [`keccak256`]: ref:ethereum.crypto.hash.keccak256
+    [`default`]: ref:ethereum.merkle_patricia_trie.Trie.default
+    """
+
+    secured: bool
+    """
+    When `True`, keys are hashed with [`keccak256`] before being inserted
+    into the underlying MPT.
+
+    [`keccak256`]: ref:ethereum.crypto.hash.keccak256
+    """
+
+    default: V
+    """
+    Value treated as key absence — storing this value through [`trie_set`]
+    removes the key, and [`trie_get`] returns it for missing keys.
+
+    [`trie_set`]: ref:ethereum.merkle_patricia_trie.trie_set
+    [`trie_get`]: ref:ethereum.merkle_patricia_trie.trie_get
+    """
+
+    # Held in a plain Python dictionary; the MPT structure is built only when
+    # `root` is called. This trades performance for clarity, since storing
+    # intermediate nodes is not needed for the spec's outputs.
+    _data: Dict[K, V] = field(default_factory=dict)
+
+
+def copy_trie(trie: Trie[K, V]) -> Trie[K, V]:
+    """
+    Create a copy of `trie`.
+
+    Since only frozen objects may be stored in a trie, the contents are
+    shared between the original and the copy.
+    """
+    return Trie(trie.secured, trie.default, copy.copy(trie._data))
+
+
+def trie_set(trie: Trie[K, V], key: K, value: V) -> None:
+    """
+    Insert or update `key` in `trie` with the given `value`.
+
+    Storing the trie's [`default`] value deletes the key, since a trie
+    represents `default` by omitting the key entirely.
+
+    [`default`]: ref:ethereum.merkle_patricia_trie.Trie.default
+    """
+    if value == trie.default:
+        if key in trie._data:
+            del trie._data[key]
+    else:
+        trie._data[key] = value
+
+
+def trie_get(trie: Trie[K, V], key: K) -> V:
+    """
+    Look up `key` in `trie`, returning the trie's [`default`] value if absent.
+
+    [`default`]: ref:ethereum.merkle_patricia_trie.Trie.default
+    """
+    return trie._data.get(key, trie.default)
+
+
+def common_prefix_length(a: Sequence, b: Sequence) -> int:
+    """
+    Find the length of the longest common prefix of two sequences.
+    """
+    for i in range(len(a)):
+        if i >= len(b) or a[i] != b[i]:
+            return i
+    return len(a)
+
+
+def nibble_list_to_compact(x: Bytes, is_leaf: bool) -> Bytes:
+    """
+    Compress a list of nibbles into bytes using hex-prefix encoding.
+
+    Nibbles are packed two-per-byte, preceded by a single flag nibble at the
+    high position of the first byte:
+
+    ```
+    +---+---+---------+--------+
+    | _ | _ | is_leaf | parity |
+    +---+---+---------+--------+
+      3   2      1        0
+    ```
+
+    The lowest bit of the flag nibble encodes the parity of the nibble-list
+    length (`0` for even, `1` for odd). The next bit distinguishes leaf nodes
+    from extension nodes. The two highest bits are unused.
+
+    When the length is odd the first nibble of `x` is packed into the same
+    byte as the flag, leaving an even number of remaining nibbles to pair off.
+    """
+    compact = bytearray()
+
+    if len(x) % 2 == 0:  # ie even length
+        compact.append(16 * (2 * is_leaf))
+        for i in range(0, len(x), 2):
+            compact.append(16 * x[i] + x[i + 1])
+    else:
+        compact.append(16 * ((2 * is_leaf) + 1) + x[0])
+        for i in range(1, len(x), 2):
+            compact.append(16 * x[i] + x[i + 1])
+
+    return Bytes(compact)
+
+
+def bytes_to_nibble_list(bytes_: Bytes) -> Bytes:
+    """
+    Split each input byte into its high and low nibble, producing a sequence
+    of bytes each holding a value from `0` to `15` inclusive.
+    """
+    nibble_list = bytearray(2 * len(bytes_))
+    for byte_index, byte in enumerate(bytes_):
+        nibble_list[byte_index * 2] = (byte & 0xF0) >> 4
+        nibble_list[byte_index * 2 + 1] = byte & 0x0F
+    return Bytes(nibble_list)
+
+
+def _prepare_trie(
+    trie: Trie[K, V],
+    get_storage_root: Optional[Callable[[Address], Root]] = None,
+) -> Mapping[Bytes, Bytes]:
+    """
+    Convert a [`Trie`] into the nibble-keyed mapping consumed by
+    [`patricialize`].
+
+    Each value is encoded with [`encode_node`]; if the value is an
+    [`Account`], `get_storage_root` must be supplied to provide its storage
+    root. Keys are hashed with [`keccak256`] when the trie is secured, then
+    expanded into nibble form via [`bytes_to_nibble_list`][bnl].
+
+    [`Trie`]: ref:ethereum.merkle_patricia_trie.Trie
+    [`patricialize`]: ref:ethereum.merkle_patricia_trie.patricialize
+    [`encode_node`]: ref:ethereum.merkle_patricia_trie.encode_node
+    [`Account`]: ref:ethereum.state.Account
+    [bnl]: ref:ethereum.merkle_patricia_trie.bytes_to_nibble_list
+    [`keccak256`]: ref:ethereum.crypto.hash.keccak256
+    """
+    from ethereum.state import Account, Address
+
+    mapped: MutableMapping[Bytes, Bytes] = {}
+
+    for preimage, value in trie._data.items():
+        if isinstance(value, Account):
+            assert get_storage_root is not None
+            address = Address(preimage)
+            encoded_value = encode_node(value, get_storage_root(address))
+        elif value is None:
+            raise AssertionError("cannot encode `None`")
+        else:
+            encoded_value = encode_node(value)
+        if encoded_value == b"":
+            raise AssertionError
+        key: Bytes
+        if trie.secured:
+            # "secure" tries hash keys once before construction
+            key = keccak256(preimage)
+        else:
+            key = preimage
+        mapped[bytes_to_nibble_list(key)] = encoded_value
+
+    return mapped
+
+
+def root(
+    trie: Trie[K, V],
+    get_storage_root: Optional[Callable[[Address], Root]] = None,
+) -> Root:
+    """
+    Compute the root hash of `trie`.
+
+    The trie is patricialized into a tree of [`InternalNode`]s; the root node
+    is RLP-encoded and hashed with [`keccak256`] to produce the fixed-size
+    [`Hash32`] used in block headers.
+
+    `get_storage_root` is required when encoding [`Account`] values, so it
+    must be supplied when computing the state root.
+
+    [`InternalNode`]: ref:ethereum.merkle_patricia_trie.InternalNode
+    [`keccak256`]: ref:ethereum.crypto.hash.keccak256
+    [`Hash32`]: ref:ethereum.crypto.hash.Hash32
+    [`Account`]: ref:ethereum.state.Account
+    """
+    from ethereum.state import Root
+
+    obj = _prepare_trie(trie, get_storage_root)
+
+    root_node = encode_internal_node(patricialize(obj, Uint(0)))
+    if len(rlp.encode(root_node)) < 32:
+        return keccak256(rlp.encode(root_node))
+    else:
+        assert isinstance(root_node, Bytes)
+        return Root(root_node)
+
+
+def patricialize(
+    obj: Mapping[Bytes, Bytes], level: Uint
+) -> Optional[InternalNode]:
+    """
+    Recursively build the trie for `obj`, starting `level` nibbles into the
+    keys.
+
+    The structure of the returned subtree is determined by inspecting the
+    keys present at the current `level`:
+
+    1. With no keys, the subtree is empty and `None` is returned.
+    1. With a single key, a [`LeafNode`] holds the remaining nibbles and the
+       value.
+    1. When every key shares a non-empty prefix at this level, an
+       [`ExtensionNode`] consumes the prefix and the algorithm recurses for
+       the rest.
+    1. Otherwise the keys are partitioned by their next nibble into up to
+       sixteen groups, each recursively patricialized, and combined into a
+       [`BranchNode`].
+
+    [`LeafNode`]: ref:ethereum.merkle_patricia_trie.LeafNode
+    [`ExtensionNode`]: ref:ethereum.merkle_patricia_trie.ExtensionNode
+    [`BranchNode`]: ref:ethereum.merkle_patricia_trie.BranchNode
+    """
+    if len(obj) == 0:
+        return None
+
+    arbitrary_key = next(iter(obj))
+
+    # if leaf node
+    if len(obj) == 1:
+        leaf = LeafNode(arbitrary_key[level:], obj[arbitrary_key])
+        return leaf
+
+    # prepare for extension node check by finding max j such that all keys in
+    # obj have the same key[i:j]
+    substring = arbitrary_key[level:]
+    prefix_length = len(substring)
+    for key in obj:
+        prefix_length = min(
+            prefix_length, common_prefix_length(substring, key[level:])
+        )
+
+        # finished searching, found another key at the current level
+        if prefix_length == 0:
+            break
+
+    # if extension node
+    if prefix_length > 0:
+        prefix = arbitrary_key[int(level) : int(level) + prefix_length]
+        return ExtensionNode(
+            prefix,
+            encode_internal_node(
+                patricialize(obj, level + Uint(prefix_length))
+            ),
+        )
+
+    branches: List[MutableMapping[Bytes, Bytes]] = []
+    for _ in range(16):
+        branches.append({})
+    value = b""
+    for key in obj:
+        if len(key) == level:
+            value = obj[key]
+        else:
+            branches[key[level]][key] = obj[key]
+
+    subnodes = tuple(
+        encode_internal_node(patricialize(branches[k], level + Uint(1)))
+        for k in range(16)
+    )
+    return BranchNode(
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[Extended, ...])),
+        value,
+    )
diff --git a/src/ethereum/state.py b/src/ethereum/state.py
index 48349700f2b..5a34472390e 100644
--- a/src/ethereum/state.py
+++ b/src/ethereum/state.py
@@ -5,17 +5,40 @@
 The `PreState` protocol specifies the operations that any pre-execution state
 provider must support, allowing multiple backing implementations (in-memory
 `dict`, on-disk database, witness, etc.).
+
+The `State` class is the in-memory implementation of `PreState`. It consists
+of a main account trie and storage tries for each contract.
+
+There is a distinction between an account that does not exist and
+`EMPTY_ACCOUNT`.
 """
 
-from dataclasses import dataclass
-from typing import Dict, List, Optional, Protocol, Tuple
+from dataclasses import dataclass, field
+from typing import (
+    AbstractSet,
+    Dict,
+    List,
+    Optional,
+    Protocol,
+    Set,
+    Tuple,
+    final,
+)
 
-from ethereum_rlp import Extended
 from ethereum_types.bytes import Bytes, Bytes20, Bytes32
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.crypto.hash import Hash32, keccak256
+from ethereum.merkle_patricia_trie import (
+    EMPTY_TRIE_ROOT,
+    InternalNode,
+    Trie,
+    copy_trie,
+    root,
+    trie_get,
+    trie_set,
+)
 
 Address = Bytes20
 Root = Hash32
@@ -23,6 +46,7 @@
 EMPTY_CODE_HASH = keccak256(b"")
 
 
+@final
 @slotted_freezable
 @dataclass
 class Account:
@@ -42,56 +66,7 @@ class Account:
 )
 
 
-@slotted_freezable
-@dataclass
-class LeafNode:
-    """Leaf node in the Merkle Trie."""
-
-    rest_of_key: Bytes
-    value: Extended
-
-
-@slotted_freezable
-@dataclass
-class ExtensionNode:
-    """Extension node in the Merkle Trie."""
-
-    key_segment: Bytes
-    subnode: Extended
-
-
-BranchSubnodes = Tuple[
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-    Extended,
-]
-
-
-@slotted_freezable
-@dataclass
-class BranchNode:
-    """Branch node in the Merkle Trie."""
-
-    subnodes: BranchSubnodes
-    value: Extended
-
-
-InternalNode = LeafNode | ExtensionNode | BranchNode
-
-
+@final
 @dataclass
 class BlockDiff:
     """
@@ -107,6 +82,16 @@ class BlockDiff:
     code_changes: Dict[Hash32, Bytes]
     """New bytecodes (keyed by code hash) introduced by execution."""
 
+    storage_clears: Set[Address] = field(default_factory=set)
+    """
+    Addresses whose pre-existing storage was wiped during block
+    execution (via a pre-EIP-6780 `SELFDESTRUCT`). Their storage
+    tries are dropped before [`storage_changes`][sc] is applied, so any
+    post-wipe writes begin from empty storage.
+
+    [sc]: ref:ethereum.state.BlockDiff.storage_changes
+    """
+
 
 class PreState(Protocol):
     """
@@ -152,11 +137,214 @@ def compute_state_root_and_trie_changes(
         self,
         account_changes: Dict[Address, Optional[Account]],
         storage_changes: Dict[Address, Dict[Bytes32, U256]],
-    ) -> Tuple[Root, List[InternalNode]]:
+        storage_clears: AbstractSet[Address] = frozenset(),
+    ) -> Tuple[Root, List["InternalNode"]]:
         """
         Compute the state root after applying changes to the pre-state.
 
+        ``storage_clears`` lists addresses whose pre-existing storage
+        tries must be dropped before ``storage_changes`` is applied, so
+        any post-wipe writes begin from empty storage.
+
         Return the new state root together with the internal trie nodes
         that were created or modified.
         """
         ...
+
+
+@final
+@dataclass
+class State:
+    """
+    Contains all information that is preserved between transactions.
+    """
+
+    _main_trie: Trie[Address, Optional[Account]] = field(
+        default_factory=lambda: Trie(secured=True, default=None)
+    )
+    _storage_tries: Dict[Address, Trie[Bytes32, U256]] = field(
+        default_factory=dict
+    )
+    _code_store: Dict[Hash32, Bytes] = field(
+        default_factory=dict, compare=False
+    )
+
+    def get_code(self, code_hash: Hash32) -> Bytes:
+        """
+        Get the bytecode for a given code hash.
+
+        Return ``b""`` for ``EMPTY_CODE_HASH``.
+        """
+        if code_hash == EMPTY_CODE_HASH:
+            return b""
+        return self._code_store[code_hash]
+
+    def get_account_optional(self, address: Address) -> Optional[Account]:
+        """
+        Get the account at an address.
+
+        Return ``None`` if there is no account at the address.
+        """
+        return trie_get(self._main_trie, address)
+
+    def get_storage(self, address: Address, key: Bytes32) -> U256:
+        """
+        Get a storage value.
+
+        Return ``U256(0)`` if the key has not been set.
+        """
+        trie = self._storage_tries.get(address)
+        if trie is None:
+            return U256(0)
+
+        value = trie_get(trie, key)
+
+        assert isinstance(value, U256)
+        return value
+
+    def account_has_storage(self, address: Address) -> bool:
+        """
+        Check whether an account has any storage.
+
+        Only needed for EIP-7610.
+        """
+        return address in self._storage_tries
+
+    def compute_state_root_and_trie_changes(
+        self,
+        account_changes: Dict[Address, Optional[Account]],
+        storage_changes: Dict[Address, Dict[Bytes32, U256]],
+        storage_clears: AbstractSet[Address] = frozenset(),
+    ) -> Tuple[Root, List["InternalNode"]]:
+        """
+        Compute the state root after applying changes to the pre-state.
+
+        ``storage_clears`` lists addresses whose pre-existing storage
+        tries are dropped before ``storage_changes`` is applied, so any
+        post-wipe writes begin from empty storage.
+
+        Return the new state root together with the internal trie nodes
+        that were created or modified.
+        """
+        main_trie = copy_trie(self._main_trie)
+        storage_tries = {
+            k: copy_trie(v)
+            for k, v in self._storage_tries.items()
+            if k not in storage_clears
+        }
+
+        for address, account in account_changes.items():
+            trie_set(main_trie, address, account)
+
+        for address, slots in storage_changes.items():
+            trie = storage_tries.get(address)
+            if trie is None:
+                trie = Trie(secured=True, default=U256(0))
+                storage_tries[address] = trie
+            for key, value in slots.items():
+                trie_set(trie, key, value)
+            if trie._data == {}:
+                del storage_tries[address]
+
+        def get_storage_root(addr: Address) -> Root:
+            if addr in storage_tries:
+                return root(storage_tries[addr])
+            return EMPTY_TRIE_ROOT
+
+        state_root_value = root(main_trie, get_storage_root=get_storage_root)
+
+        return state_root_value, []
+
+
+def close_state(state: State) -> None:
+    """
+    Free resources held by the state. Used by optimized implementations to
+    release file descriptors.
+    """
+    del state._main_trie
+    del state._storage_tries
+    del state._code_store
+
+
+def apply_changes_to_state(state: State, diff: BlockDiff) -> None:
+    """
+    Apply block-level diff to the ``State`` for the next block.
+
+    Parameters
+    ----------
+    state :
+        The state to update.
+    diff :
+        Account, storage, and code changes to apply.
+
+    """
+    for address in diff.storage_clears:
+        state._storage_tries.pop(address, None)
+
+    for address, account in diff.account_changes.items():
+        trie_set(state._main_trie, address, account)
+
+    for address, slots in diff.storage_changes.items():
+        trie = state._storage_tries.get(address)
+        if trie is None:
+            trie = Trie(secured=True, default=U256(0))
+            state._storage_tries[address] = trie
+        for key, value in slots.items():
+            trie_set(trie, key, value)
+        if trie._data == {}:
+            del state._storage_tries[address]
+
+    state._code_store.update(diff.code_changes)
+
+
+def store_code(state: State, code: Bytes) -> Hash32:
+    """
+    Store bytecode in ``State``.
+    """
+    code_hash = keccak256(code)
+    if code_hash != EMPTY_CODE_HASH:
+        state._code_store[code_hash] = code
+    return code_hash
+
+
+def set_account(
+    state: State,
+    address: Address,
+    account: Optional[Account],
+) -> None:
+    """
+    Set an account in a ``State``.
+
+    Setting to ``None`` deletes the account.
+    """
+    trie_set(state._main_trie, address, account)
+
+
+def set_storage(
+    state: State,
+    address: Address,
+    key: Bytes32,
+    value: U256,
+) -> None:
+    """
+    Set a storage value in a ``State``.
+
+    Setting to ``U256(0)`` deletes the key.
+    """
+    assert trie_get(state._main_trie, address) is not None
+
+    trie = state._storage_tries.get(address)
+    if trie is None:
+        trie = Trie(secured=True, default=U256(0))
+        state._storage_tries[address] = trie
+    trie_set(trie, key, value)
+    if trie._data == {}:
+        del state._storage_tries[address]
+
+
+def state_root(state: State) -> Root:
+    """
+    Compute the state root of the current state.
+    """
+    root_value, _ = state.compute_state_root_and_trie_changes({}, {})
+    return root_value
diff --git a/src/ethereum/trace.py b/src/ethereum/trace.py
index a2766918099..f40644dcc54 100644
--- a/src/ethereum/trace.py
+++ b/src/ethereum/trace.py
@@ -18,13 +18,14 @@
 
 import enum
 from dataclasses import dataclass
-from typing import Optional, Protocol
+from typing import Optional, Protocol, final
 
 from ethereum_types.bytes import Bytes
 
 from ethereum.exceptions import EthereumException
 
 
+@final
 @dataclass
 class TransactionStart:
     """
@@ -32,6 +33,7 @@ class TransactionStart:
     """
 
 
+@final
 @dataclass
 class TransactionEnd:
     """
@@ -60,6 +62,7 @@ class TransactionEnd:
     """
 
 
+@final
 @dataclass
 class PrecompileStart:
     """
@@ -72,6 +75,7 @@ class PrecompileStart:
     """
 
 
+@final
 @dataclass
 class PrecompileEnd:
     """
@@ -79,6 +83,7 @@ class PrecompileEnd:
     """
 
 
+@final
 @dataclass
 class OpStart:
     """
@@ -96,6 +101,7 @@ class OpStart:
     """
 
 
+@final
 @dataclass
 class OpEnd:
     """
@@ -103,6 +109,7 @@ class OpEnd:
     """
 
 
+@final
 @dataclass
 class OpException:
     """
@@ -122,6 +129,7 @@ class OpException:
     """
 
 
+@final
 @dataclass
 class EvmStop:
     """
@@ -139,6 +147,7 @@ class EvmStop:
     """
 
 
+@final
 @dataclass
 class GasAndRefund:
     """
diff --git a/src/ethereum_optimized/__init__.py b/src/ethereum_optimized/__init__.py
index b1f8598188f..e51f1e4f7f9 100644
--- a/src/ethereum_optimized/__init__.py
+++ b/src/ethereum_optimized/__init__.py
@@ -15,7 +15,6 @@
 function. This must be done before those modules are imported anywhere.
 """
 
-from importlib import import_module
 from typing import Any, Optional, cast
 
 from ethereum_spec_tools.forks import Hardfork
@@ -25,7 +24,7 @@
 
 
 def monkey_patch_optimized_state_db(
-    fork_name: str, state_path: Optional[str]
+    fork: Hardfork, state_path: Optional[str]
 ) -> None:
     """
     Replace the state interface with one that supports high performance
@@ -34,12 +33,9 @@ def monkey_patch_optimized_state_db(
     This function must be called before the state interface is imported
     anywhere.
     """
-    slow_state = cast(
-        Any,
-        import_module("ethereum.forks." + fork_name + ".state"),
-    )
+    slow_state = cast(Any, fork.module("state"))
 
-    optimized_state_db_patches = get_optimized_state_patches(fork_name)
+    optimized_state_db_patches = get_optimized_state_patches(fork)
 
     for name, value in optimized_state_db_patches.items():
         setattr(slow_state, name, value)
@@ -48,7 +44,7 @@ def monkey_patch_optimized_state_db(
         slow_state.State.default_path = state_path
 
 
-def monkey_patch_optimized_spec(fork_name: str) -> None:
+def monkey_patch_optimized_spec(fork: Hardfork) -> None:
     """
     Replace the ethash implementation with one that supports higher
     performance.
@@ -56,9 +52,9 @@ def monkey_patch_optimized_spec(fork_name: str) -> None:
     This function must be called before the spec interface is imported
     anywhere.
     """
-    slow_spec = import_module("ethereum.forks." + fork_name + ".fork")
+    slow_spec = fork.module("fork")
 
-    optimized_pow_patches = get_optimized_pow_patches(fork_name)
+    optimized_pow_patches = get_optimized_pow_patches(fork)
 
     for name, value in optimized_pow_patches.items():
         setattr(slow_spec, name, value)
@@ -71,8 +67,8 @@ def monkey_patch(state_path: Optional[str]) -> None:
     forks = Hardfork.discover()
 
     for fork in forks:
-        monkey_patch_optimized_state_db(fork.short_name, state_path)
+        monkey_patch_optimized_state_db(fork, state_path)
 
         # Only patch the POW code on POW forks
         if fork.consensus.is_pow():
-            monkey_patch_optimized_spec(fork.short_name)
+            monkey_patch_optimized_spec(fork)
diff --git a/src/ethereum_optimized/fork.py b/src/ethereum_optimized/fork.py
index 21c02fc19ea..f4820a31b03 100644
--- a/src/ethereum_optimized/fork.py
+++ b/src/ethereum_optimized/fork.py
@@ -12,13 +12,13 @@
 the `fork` module of a fork.
 """
 
-from importlib import import_module
 from typing import Any, Dict, cast
 
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.ethash import epoch
 from ethereum.exceptions import InvalidBlock
+from ethereum_spec_tools.forks import Hardfork
 
 from .utils import add_item
 
@@ -34,14 +34,14 @@
 Header_ = Any
 
 
-def get_optimized_pow_patches(_fork_name: str) -> Dict[str, Any]:
+def get_optimized_pow_patches(fork: Hardfork) -> Dict[str, Any]:
     """
     Get a dictionary of patches to be patched into the fork to make it
     optimized.
     """
     patches: Dict[str, Any] = {}
 
-    mod = cast(Any, import_module("ethereum.forks." + _fork_name + ".fork"))
+    mod = cast(Any, fork.module("fork"))
 
     if not hasattr(mod, "validate_proof_of_work"):
         raise Exception(
diff --git a/src/ethereum_optimized/state_db.py b/src/ethereum_optimized/state_db.py
index aa2e3defb65..785099b7a71 100644
--- a/src/ethereum_optimized/state_db.py
+++ b/src/ethereum_optimized/state_db.py
@@ -15,7 +15,6 @@
 import logging
 from collections import defaultdict
 from dataclasses import dataclass
-from importlib import import_module
 from types import SimpleNamespace
 from typing import Any, ClassVar, Dict, List, Optional, Set, cast
 
@@ -33,6 +32,7 @@
 
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.state import EMPTY_CODE_HASH
+from ethereum_spec_tools.forks import Hardfork
 
 from .utils import add_item
 
@@ -52,17 +52,15 @@ class UnmodifiedType:
 Unmodified = UnmodifiedType()
 
 
-def get_optimized_state_patches(fork: str) -> Dict[str, Any]:
+def get_optimized_state_patches(fork: Hardfork) -> Dict[str, Any]:
     """
     Get a dictionary of functions/objects to be monkey patched into the state
     to make it optimized.
     """
     patches: Dict[str, Any] = {}
 
-    types_mod = cast(
-        Any, import_module("ethereum.forks." + fork + ".fork_types")
-    )
-    state_mod = cast(Any, import_module("ethereum.forks." + fork + ".state"))
+    types_mod = cast(Any, fork.module("fork_types"))
+    state_mod = cast(Any, fork.module("state"))
     Account = types_mod.Account  # noqa N806
 
     has_transient_storage = hasattr(state_mod, "TransientStorage")
diff --git a/src/ethereum_spec_tools/docc.py b/src/ethereum_spec_tools/docc.py
index 3cf4e47b95d..c93a943eeb1 100644
--- a/src/ethereum_spec_tools/docc.py
+++ b/src/ethereum_spec_tools/docc.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2022-2023 Ethereum Foundation
+# Copyright (C) 2022-2023,2026 Ethereum Foundation
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 import logging
 import os
 from collections import defaultdict
+from functools import total_ordering
 from itertools import tee, zip_longest
 from pathlib import PurePath
 from typing import (
@@ -45,8 +46,14 @@
 from docc.discover import Discover, T
 from docc.document import BlankNode, Document, ListNode, Node, Visit, Visitor
 from docc.plugins import html, mistletoe, python, verbatim
-from docc.plugins.listing import Listable
-from docc.plugins.python import PythonBuilder
+from docc.plugins.listing import (
+    Listable,
+    ListingDiscover,
+    ListingNode,
+    ListingSource,
+)
+from docc.plugins.python import PythonBuilder, PythonDiscover
+from docc.plugins.python.cst import PythonSource
 from docc.plugins.references import Definition, Reference
 from docc.settings import PluginSettings
 from docc.source import Source
@@ -71,6 +78,159 @@ def pairwise(iterable: Iterable[G]) -> Iterable[Tuple[G, G]]:
     return zip(a, b, strict=False)
 
 
+@total_ordering
+@dataclasses.dataclass(frozen=True)
+class _EthereumSortKey:
+    sort: int
+    path: PurePath
+
+    def __lt__(self, other: object) -> bool:
+        if isinstance(other, _EthereumSortKey):
+            return (self.sort, self.path) < (other.sort, other.path)
+        elif isinstance(other, PurePath):
+            return self.path < other
+        return NotImplemented
+
+
+class _EthereumPythonSource(PythonSource):
+    _sort: Final[int]
+
+    def __init__(
+        self,
+        root_path: PurePath,
+        relative_path: PurePath,
+        absolute_path: PurePath,
+        sort: int,
+    ) -> None:
+        super().__init__(root_path, relative_path, absolute_path)
+        self._sort = sort
+
+    @override
+    def listing_order_key(
+        self,
+    ) -> Tuple[bool, _EthereumSortKey, None]:
+        return (
+            self.index_dir is None,
+            _EthereumSortKey(self._sort, self.output_path),
+            None,
+        )
+
+
+class _EthereumListingSource(ListingSource):
+    _sort: Final[int]
+
+    def __init__(
+        self,
+        relative_path: PurePath,
+        output_path: PurePath,
+        sort: int,
+    ) -> None:
+        super().__init__(relative_path, output_path)
+        self._sort = sort
+
+    @override
+    def listing_order_key(
+        self,
+    ) -> Tuple[bool, _EthereumSortKey, None]:
+        return (
+            self.index_dir is None,
+            _EthereumSortKey(self._sort, self.output_path),
+            None,
+        )
+
+
+def _find_forks(config: PluginSettings) -> List[Hardfork]:
+    forks = config.resolve_path(PurePath("src") / "ethereum" / "forks")
+    return Hardfork.discover([str(forks)])
+
+
+def _diff_path(before: Hardfork, after: Hardfork) -> PurePath:
+    return PurePath("diffs") / before.short_name / after.short_name
+
+
+class _ForkOrder:
+    forks: List[PurePath]
+    diffs: List[PurePath]
+
+    def __init__(self, config: PluginSettings) -> None:
+        forks = _find_forks(config)
+        self.forks = [
+            config.unresolve_path(PurePath(f.path))
+            for f in forks
+            if f.path is not None
+        ]
+        self.diffs = [_diff_path(b, a).parent for b, a in pairwise(forks)]
+
+    def index(self, parent: PurePath) -> Optional[int]:
+        for idx, fork in enumerate(self.forks):
+            if parent.is_relative_to(fork):
+                return idx
+
+        for idx, diff in enumerate(self.diffs):
+            if parent.is_relative_to(diff):
+                return idx
+
+        return None
+
+
+class EthereumListingDiscover(ListingDiscover):
+    """
+    Changes the sort order of directory listings so they render in hard fork
+    chronological order.
+    """
+
+    _fork_order: _ForkOrder
+
+    def __init__(self, config: PluginSettings) -> None:
+        super().__init__(config)
+        self._fork_order = _ForkOrder(config)
+
+    @override
+    def _listing_source(
+        self, source: Source, parent: PurePath
+    ) -> ListingSource:
+        index = self._fork_order.index(parent)
+        if index is None:
+            return super()._listing_source(source, parent)
+        return _EthereumListingSource(
+            parent,
+            parent / "index",
+            -index,  # Reverse chronological order
+        )
+
+
+class EthereumPythonDiscover(PythonDiscover):
+    """
+    Changes the sort order of python files so they render in hard fork
+    chronological order.
+    """
+
+    _fork_order: _ForkOrder
+
+    def __init__(self, config: PluginSettings) -> None:
+        super().__init__(config)
+        self._fork_order = _ForkOrder(config)
+
+    @override
+    def _python_source(
+        self,
+        root_path: PurePath,
+        relative_path: PurePath,
+        absolute_path: PurePath,
+    ) -> PythonSource:
+        index = self._fork_order.index(relative_path)
+        if index is None:
+            return super()._python_source(
+                root_path, relative_path, absolute_path
+            )
+        return _EthereumPythonSource(
+            root_path,
+            relative_path,
+            absolute_path,
+            -index,  # Reverse chronological order
+        )
+
+
 class EthereumDiscover(Discover):
     """
     Creates sources that represent the diff between two other sources, one per
@@ -82,9 +242,7 @@ class EthereumDiscover(Discover):
 
     def __init__(self, config: PluginSettings) -> None:
         self.settings = config
-        base = config.resolve_path(PurePath("src") / "ethereum")
-        forks = base / "forks"
-        self.forks = Hardfork.discover([str(forks)])
+        self.forks = _find_forks(config)
 
     def discover(self, known: FrozenSet[T]) -> Iterator[Source]:
         """
@@ -137,12 +295,10 @@ def discover(self, known: FrozenSet[T]) -> Iterator[Source]:
 
                 assert before_source or after_source
 
-                output_path = (
-                    PurePath("diffs")
-                    / before.short_name
-                    / after.short_name
-                    / path
-                )
+                if path.name == "__init__.py":
+                    path = path.with_name("index")
+
+                output_path = _diff_path(before, after) / path
 
                 yield DiffSource(
                     before.name,
@@ -210,6 +366,19 @@ def output_path(self) -> PurePath:
         """
         return self._output_path
 
+    @property
+    def index_dir(self) -> Optional[PurePath]:
+        """
+        For index sources, the directory the source indexes. For other sources,
+        `None`.
+
+        For example, for an output path of `./foo/index`, this should return
+        `./foo`.
+        """
+        if self.output_path.name == "index":
+            return self.output_path.parent
+        return None
+
 
 class AfterNode(Node):
     """
@@ -667,6 +836,10 @@ def shallow_equals(self, lhs: Node, rhs: Node) -> bool:
             assert isinstance(rhs, ListNode)
             return True
 
+        elif isinstance(lhs, ListingNode):
+            assert isinstance(rhs, ListingNode)
+            return True
+
         elif isinstance(lhs, verbatim.Transcribed):
             assert isinstance(rhs, verbatim.Transcribed)
             return True
@@ -750,6 +923,9 @@ def shallow_hash(self, node: Node) -> int:
         elif isinstance(node, ListNode):
             return hash(type(ListNode))
 
+        elif isinstance(node, ListingNode):
+            return hash(type(ListingNode))
+
         elif isinstance(node, verbatim.Transcribed):
             return hash(type(verbatim.Transcribed))
 
diff --git a/src/ethereum_spec_tools/evm_tools/loaders/fixture_loader.py b/src/ethereum_spec_tools/evm_tools/loaders/fixture_loader.py
index 8caf5679c8e..3a93f850fbd 100644
--- a/src/ethereum_spec_tools/evm_tools/loaders/fixture_loader.py
+++ b/src/ethereum_spec_tools/evm_tools/loaders/fixture_loader.py
@@ -12,6 +12,7 @@
 
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.exceptions import StateWithEmptyAccount
+from ethereum.state import State, set_account, set_storage, store_code
 from ethereum.utils.hexadecimal import (
     hex_to_bytes,
     hex_to_bytes8,
@@ -55,16 +56,11 @@ def __init__(self, fork_module: str | Hardfork):
         if isinstance(fork_module, Hardfork):
             self.fork = ForkLoad(fork_module)
         else:
-            for fork in Hardfork.discover():
-                if fork.short_name == fork_module:
-                    self.fork = ForkLoad(fork)
-                    return
-            raise Exception(f"fork `{fork_module}` not found")
+            self.fork = ForkLoad(Hardfork.by_short_name(fork_module))
 
     def json_to_state(self, raw: Any) -> Any:
         """Converts json state data to a state object."""
-        state = self.fork.State()
-        set_storage = self.fork.set_storage
+        state = State()
         EMPTY_ACCOUNT = self.fork.EMPTY_ACCOUNT  # noqa N806
 
         for address_hex, account_state in raw.items():
@@ -73,7 +69,7 @@ def json_to_state(self, raw: Any) -> Any:
             balance = U256(hex_to_uint(account_state.get("balance", "0x0")))
             code = hex_to_bytes(account_state.get("code", ""))
 
-            code_hash = self.fork.store_code(state, code)
+            code_hash = store_code(state, code)
             account = self.fork.Account(
                 nonce=nonce,
                 balance=balance,
@@ -83,7 +79,7 @@ def json_to_state(self, raw: Any) -> Any:
             if self.fork.proof_of_stake and account == EMPTY_ACCOUNT:
                 raise StateWithEmptyAccount(f"Empty account at {address_hex}.")
 
-            self.fork.set_account(state, address, account)
+            set_account(state, address, account)
 
             for k, v in account_state.get("storage", {}).items():
                 set_storage(
@@ -201,4 +197,8 @@ def json_to_header(self, raw: Any) -> Any:
             bal_hash = hex_to_bytes32(raw.get("blockAccessListHash"))
             parameters.append(bal_hash)
 
+        if "slotNumber" in raw:
+            slot_number = hex_to_u64(raw.get("slotNumber"))
+            parameters.append(slot_number)
+
         return self.fork.Header(*parameters)
diff --git a/src/ethereum_spec_tools/evm_tools/loaders/fork_loader.py b/src/ethereum_spec_tools/evm_tools/loaders/fork_loader.py
index a8161307d9c..1a655eb0682 100644
--- a/src/ethereum_spec_tools/evm_tools/loaders/fork_loader.py
+++ b/src/ethereum_spec_tools/evm_tools/loaders/fork_loader.py
@@ -15,11 +15,9 @@ class ForkLoad:
     """
 
     hardfork: Final[Hardfork]
-    _forks: list[Hardfork]
 
     def __init__(self, hardfork: Hardfork):
         self.hardfork = hardfork
-        self._forks = Hardfork.discover()
 
     def _module(self, name: str) -> Any:
         """Imports a module from the fork."""
@@ -160,6 +158,23 @@ def has_hash_block_access_list(self) -> bool:
             return False
         return hasattr(module, "hash_block_access_list")
 
+    @property
+    def BlockAccessIndex(self) -> Any:
+        """BlockAccessIndex type of the fork."""
+        return self._module("block_access_lists").BlockAccessIndex
+
+    @property
+    def BlockAccessListBuilder(self) -> Any:
+        """BlockAccessListBuilder class of the fork."""
+        return self._module("block_access_lists").BlockAccessListBuilder
+
+    @property
+    def validate_block_access_list_gas_limit(self) -> Any:
+        """validate_block_access_list_gas_limit function of the fork."""
+        return self._module(
+            "block_access_lists"
+        ).validate_block_access_list_gas_limit
+
     @property
     def signing_hash_2930(self) -> Any:
         """signing_hash_2930 function of the fork."""
@@ -287,6 +302,15 @@ def has_withdrawal(self) -> bool:
         """Check if the fork has a `Withdrawal` class."""
         return hasattr(self._module("blocks"), "Withdrawal")
 
+    @property
+    def has_slot_number(self) -> bool:
+        """Check if the fork supports the SLOTNUM opcode (EIP-7843)."""
+        try:
+            block_env = self._module("vm").BlockEnvironment
+            return "slot_number" in block_env.__dataclass_fields__
+        except (ModuleNotFoundError, AttributeError):
+            return False
+
     @property
     def decode_transaction(self) -> Any:
         """decode_transaction function of the fork."""
@@ -298,73 +322,67 @@ def has_decode_transaction(self) -> bool:
         return hasattr(self._module("transactions"), "decode_transaction")
 
     @property
-    def has_block_state(self) -> bool:
-        """Check if the fork uses BlockState instead of State."""
-        try:
-            module = self._module("state_tracker")
-        except ModuleNotFoundError:
-            return False
-        return hasattr(module, "BlockState")
+    def BlockState(self) -> Any:
+        """BlockState class of the fork."""
+        return self._module("state_tracker").BlockState
 
     @property
-    def State(self) -> Any:
-        """State class of the fork."""
-        return self._module("state").State
+    def TransactionState(self) -> Any:
+        """TransactionState class of the fork."""
+        return self._module("state_tracker").TransactionState
 
     @property
     def forget_senders_authorities(self) -> Any:
         """forget_senders_authorities function of the fork."""
-        return self._module("state").forget_senders_authorities
+        # Look in `state_tracker` first (post-refactor location), then
+        # the legacy `state` module.
+        try:
+            return self._module("state_tracker").forget_senders_authorities
+        except (ModuleNotFoundError, AttributeError):
+            return self._module("state").forget_senders_authorities
 
     @property
     def has_senders_authorities(self) -> Any:
         """Fork has senders_authorities functions."""
-        return hasattr(self._module("state"), "forget_senders_authorities")
+        # `forget_senders_authorities` is a Monad extension that lived
+        # on the legacy `state` module pre-refactor, now lives on
+        # `state_tracker`. Upstream forks ship neither, so missing
+        # modules mean "fork has no senders_authorities".
+        for module_name in ("state_tracker", "state"):
+            try:
+                module = self._module(module_name)
+            except ModuleNotFoundError:
+                continue
+            if hasattr(module, "forget_senders_authorities"):
+                return True
+        return False
 
     @property
     def set_account(self) -> Any:
         """set_account function of the fork."""
-        return self._module("state").set_account
-
-    @property
-    def store_code(self) -> Any:
-        """store_code function of the fork."""
-        return getattr(self._module("state"), "store_code", None)
-
-    @property
-    def set_storage(self) -> Any:
-        """set_storage function of the fork."""
-        return self._module("state").set_storage
+        # Post-refactor upstream forks expose `set_account` from
+        # `state_tracker`; pre-refactor forks (and any Monad fork that
+        # still ships a legacy `state` module) expose it from `state`.
+        # Try the new location first, fall back to the old one.
+        try:
+            return self._module("state_tracker").set_account
+        except ModuleNotFoundError:
+            return self._module("state").set_account
 
     @property
-    def state_root(self) -> Any:
-        """state_root function of the fork."""
-        return self._module("state").state_root
+    def incorporate_tx_into_block(self) -> Any:
+        """incorporate_tx_into_block function of the fork."""
+        return self._module("state_tracker").incorporate_tx_into_block
 
     @property
-    def close_state(self) -> Any:
-        """close_state function of the fork."""
-        return self._module("state").close_state
+    def extract_block_diff(self) -> Any:
+        """extract_block_diff function of the fork."""
+        return self._module("state_tracker").extract_block_diff
 
     @property
     def create_ether(self) -> Any:
         """create_ether function of the fork."""
-        return self._module("state").create_ether
-
-    @property
-    def root(self) -> Any:
-        """Root function of the fork."""
-        return self._module("trie").root
-
-    @property
-    def copy_trie(self) -> Any:
-        """copy_trie function of the fork."""
-        return self._module("trie").copy_trie
-
-    @property
-    def trie_get(self) -> Any:
-        """trie_get function of the fork."""
-        return self._module("trie").trie_get
+        return self._module("state_tracker").create_ether
 
     @property
     def hex_to_address(self) -> Any:
diff --git a/src/ethereum_spec_tools/evm_tools/t8n/__init__.py b/src/ethereum_spec_tools/evm_tools/t8n/__init__.py
index a2c467323af..9b6539df554 100644
--- a/src/ethereum_spec_tools/evm_tools/t8n/__init__.py
+++ b/src/ethereum_spec_tools/evm_tools/t8n/__init__.py
@@ -7,7 +7,8 @@
 import json
 import os
 from contextlib import AbstractContextManager
-from typing import Any, Final, TextIO, Tuple, Type, TypeVar
+from dataclasses import astuple, dataclass
+from typing import Any, Final, TextIO, Type, TypeVar
 
 from ethereum_rlp import rlp
 from ethereum_types.numeric import U64, U256, Uint
@@ -16,14 +17,7 @@
 from ethereum import trace
 from ethereum.exceptions import EthereumException, InvalidBlock
 from ethereum.fork_criteria import ByBlockNumber, ByTimestamp, Unscheduled
-
-# TODO: Make this not amsterdam specific once the state tracker has
-# been added to older forks.
-from ethereum.forks.amsterdam.block_access_lists import (
-    BlockAccessIndex,
-    BlockAccessListBuilder,
-    validate_block_access_list_gas_limit,
-)
+from ethereum.merkle_patricia_trie import copy_trie
 from ethereum_spec_tools.forks import Hardfork, TemporaryHardfork
 
 from ..loaders.fixture_loader import Load
@@ -40,6 +34,7 @@
 from .t8n_types import Alloc, Result, SendersAuthorities, Txs
 
 T = TypeVar("T")
+ForkCriteriaArgument = ByBlockNumber | ByTimestamp | Unscheduled | None
 
 
 def t8n_arguments(subparsers: argparse._SubParsersAction) -> None:
@@ -109,12 +104,95 @@ def t8n_arguments(subparsers: argparse._SubParsersAction) -> None:
     t8n_parser.add_argument("--state-test", action="store_true")
 
 
+@dataclass(frozen=True)
+class _ForkOverrides:
+    """Store temporary hardfork override values."""
+
+    fork_criteria: ForkCriteriaArgument = None
+    blob_target_gas_per_block: U64 | None = None
+    gas_per_blob: U64 | None = None
+    blob_min_gasprice: Uint | None = None
+    blob_base_fee_update_fraction: Uint | None = None
+    max_blob_gas_per_block: U64 | None = None
+    blob_schedule_target: U64 | None = None
+    blob_schedule_max: U64 | None = None
+
+    def is_empty(self) -> bool:
+        """Return true when all override values are unset."""
+        return all(value is None for value in astuple(self))
+
+    @staticmethod
+    def _matches_field(override: object | None, on: object, name: str) -> bool:
+        if override is None:
+            return True
+
+        try:
+            default = getattr(on, name)
+        except AttributeError:
+            return False
+
+        return override == default
+
+    def matches_template(
+        self,
+        template: Hardfork,
+    ) -> bool:
+        """Return true when the requested overrides match the template."""
+        if self.is_empty():
+            return True
+
+        if (
+            self.fork_criteria is not None
+            and self.fork_criteria != template.criteria
+        ):
+            return False
+
+        fork_mod = template.module("fork")
+        gas_costs = template.module("vm.gas").GasCosts
+
+        checks = (
+            (
+                self.max_blob_gas_per_block,
+                fork_mod,
+                "MAX_BLOB_GAS_PER_BLOCK",
+            ),
+            (
+                self.blob_target_gas_per_block,
+                gas_costs,
+                "BLOB_TARGET_GAS_PER_BLOCK",
+            ),
+            (self.gas_per_blob, gas_costs, "PER_BLOB"),
+            (
+                self.blob_min_gasprice,
+                gas_costs,
+                "BLOB_MIN_GASPRICE",
+            ),
+            (
+                self.blob_base_fee_update_fraction,
+                gas_costs,
+                "BLOB_BASE_FEE_UPDATE_FRACTION",
+            ),
+            (
+                self.blob_schedule_target,
+                gas_costs,
+                "BLOB_SCHEDULE_TARGET",
+            ),
+            (
+                self.blob_schedule_max,
+                gas_costs,
+                "BLOB_SCHEDULE_MAX",
+            ),
+        )
+
+        return all(self._matches_field(*x) for x in checks)
+
+
 class ForkCache(AbstractContextManager):
     """
     Stores references to temporary hardforks and cleans them up when exited.
     """
 
-    _cache: Final[dict[Tuple[object, ...], TemporaryHardfork]]
+    _cache: Final[dict[tuple[str, _ForkOverrides], TemporaryHardfork]]
 
     def __init__(self) -> None:
         self._cache = {}
@@ -141,20 +219,20 @@ def get(
         Search the cache for a matching hardfork, or create one if it doesn't
         exist.
         """
-        cache_key = (
-            template.short_name,
-            fork_criteria,
-            blob_target_gas_per_block,
-            gas_per_blob,
-            blob_min_gasprice,
-            blob_base_fee_update_fraction,
-            max_blob_gas_per_block,
-            blob_schedule_target,
-            blob_schedule_max,
+        overrides = _ForkOverrides(
+            fork_criteria=fork_criteria,
+            blob_target_gas_per_block=blob_target_gas_per_block,
+            gas_per_blob=gas_per_blob,
+            blob_min_gasprice=blob_min_gasprice,
+            blob_base_fee_update_fraction=blob_base_fee_update_fraction,
+            max_blob_gas_per_block=max_blob_gas_per_block,
+            blob_schedule_target=blob_schedule_target,
+            blob_schedule_max=blob_schedule_max,
         )
-        if all(x is None for x in cache_key[1:]):
+        if overrides.matches_template(template):
             return template
 
+        cache_key = (template.short_name, overrides)
         try:
             return self._cache[cache_key]
         except KeyError:
@@ -162,14 +240,16 @@ def get(
 
         clone = Hardfork.clone(
             template=template,
-            fork_criteria=fork_criteria,
-            blob_target_gas_per_block=blob_target_gas_per_block,
-            gas_per_blob=gas_per_blob,
-            blob_min_gasprice=blob_min_gasprice,
-            blob_base_fee_update_fraction=blob_base_fee_update_fraction,
-            max_blob_gas_per_block=max_blob_gas_per_block,
-            blob_schedule_target=blob_schedule_target,
-            blob_schedule_max=blob_schedule_max,
+            fork_criteria=overrides.fork_criteria,
+            blob_target_gas_per_block=overrides.blob_target_gas_per_block,
+            gas_per_blob=overrides.gas_per_blob,
+            blob_min_gasprice=overrides.blob_min_gasprice,
+            blob_base_fee_update_fraction=(
+                overrides.blob_base_fee_update_fraction
+            ),
+            max_blob_gas_per_block=overrides.max_blob_gas_per_block,
+            blob_schedule_target=overrides.blob_schedule_target,
+            blob_schedule_max=overrides.blob_schedule_max,
         )
         self._cache[cache_key] = clone
         return clone
@@ -310,16 +390,9 @@ def block_environment(self) -> Any:
             "chain_id": self.chain_id,
         }
 
-        if self.fork.has_block_state:
-            from ethereum.forks.amsterdam.state_tracker import (
-                BlockState,
-            )
-
-            block_state = BlockState(pre_state=self.alloc.state)
-            kw_arguments["state"] = block_state
-            self._block_state = block_state
-        else:
-            kw_arguments["state"] = self.alloc.state
+        block_state = self.fork.BlockState(pre_state=self.alloc.state)
+        kw_arguments["state"] = block_state
+        self._block_state = block_state
 
         block_environment = self.fork.BlockEnvironment
 
@@ -339,8 +412,10 @@ def block_environment(self) -> Any:
 
         if self.fork.has_hash_block_access_list:
             kw_arguments["block_access_list_builder"] = (
-                BlockAccessListBuilder()
+                self.fork.BlockAccessListBuilder()
             )
+        if self.fork.has_slot_number:
+            kw_arguments["slot_number"] = self.env.slot_number
 
         if self.fork.has_senders_authorities:
             kw_arguments[
@@ -352,10 +427,9 @@ def block_environment(self) -> Any:
     def backup_state(self) -> None:
         """Back up the state in order to restore in case of an error."""
         state = self.alloc.state
-        main_trie = self.fork.copy_trie(state._main_trie)
+        main_trie = copy_trie(state._main_trie)
         storage_tries = {
-            k: self.fork.copy_trie(t)
-            for (k, t) in state._storage_tries.items()
+            k: copy_trie(t) for (k, t) in state._storage_tries.items()
         }
         self.alloc.state_backup = (
             main_trie,
@@ -376,9 +450,10 @@ def pay_block_rewards(self, block_reward: U256, block_env: Any) -> None:
         miner_reward = block_reward + (
             ommer_count * (block_reward // U256(32))
         )
-        self.fork.create_ether(
-            block_env.state, block_env.coinbase, miner_reward
-        )
+
+        rewards_state = self.fork.TransactionState(parent=block_env.state)
+
+        self.fork.create_ether(rewards_state, block_env.coinbase, miner_reward)
 
         for ommer in self.env.ommers:
             # Ommer age with respect to the current block.
@@ -387,9 +462,11 @@ def pay_block_rewards(self, block_reward: U256, block_env: Any) -> None:
                 (U256(8) - ommer_age) * block_reward
             ) // U256(8)
             self.fork.create_ether(
-                block_env.state, ommer.coinbase, ommer_miner_reward
+                rewards_state, ommer.coinbase, ommer_miner_reward
             )
 
+        self.fork.incorporate_tx_into_block(rewards_state)
+
     def run_state_test(self) -> Any:
         """
         Apply a single transaction on pre-state. No system operations
@@ -460,7 +537,7 @@ def _run_blockchain_test(self, block_env: Any, block_output: Any) -> None:
         num_txs = len(self.txs.transactions)
         if self.fork.has_hash_block_access_list:
             block_env.block_access_list_builder.block_access_index = (
-                BlockAccessIndex(Uint(num_txs) + Uint(1))
+                self.fork.BlockAccessIndex(Uint(num_txs) + Uint(1))
             )
 
         if not self.fork.proof_of_stake:
@@ -485,7 +562,7 @@ def _run_blockchain_test(self, block_env: Any, block_output: Any) -> None:
             )
 
             # Validate block access list gas limit constraint (EIP-7928)
-            validate_block_access_list_gas_limit(
+            self.fork.validate_block_access_list_gas_limit(
                 block_access_list=block_output.block_access_list,
                 block_gas_limit=block_env.block_gas_limit,
             )
diff --git a/src/ethereum_spec_tools/evm_tools/t8n/env.py b/src/ethereum_spec_tools/evm_tools/t8n/env.py
index f76c0caaf57..edf3763d573 100644
--- a/src/ethereum_spec_tools/evm_tools/t8n/env.py
+++ b/src/ethereum_spec_tools/evm_tools/t8n/env.py
@@ -53,6 +53,7 @@ class Env:
     parent_excess_blob_gas: Optional[U64]
     parent_blob_gas_used: Optional[U64]
     excess_blob_gas: Optional[U64]
+    slot_number: Optional[U64]
     requests: Any
 
     def __init__(self, t8n: "T8N", stdin: Optional[Dict] = None):
@@ -86,6 +87,8 @@ def __init__(self, t8n: "T8N", stdin: Optional[Dict] = None):
                 )
             self.read_excess_blob_gas(data, t8n)
 
+        self.read_slot_number(data, t8n)
+
     def read_excess_blob_gas(self, data: Any, t8n: "T8N") -> None:
         """
         Read the excess_blob_gas from the data. If the excess blob gas is
@@ -147,6 +150,8 @@ def read_excess_blob_gas(self, data: Any, t8n: "T8N") -> None:
 
         if t8n.fork.has_hash_block_access_list:
             arguments["block_access_list_hash"] = Hash32(b"\0" * 32)
+        if t8n.fork.has_slot_number:
+            arguments["slot_number"] = U64(0)
 
         parent_header = t8n.fork.Header(**arguments)
 
@@ -222,6 +227,16 @@ def read_randao(self, data: Any, t8n: "T8N") -> None:
                 left_pad_zero_bytes(hex_to_bytes(current_random), 32)
             )
 
+    def read_slot_number(self, data: Any, t8n: "T8N") -> None:
+        """
+        Read the slot number from the data.
+        The slot number is provided by the consensus layer.
+        """
+        self.slot_number = None
+        if t8n.fork.has_slot_number:
+            if "slotNumber" in data:
+                self.slot_number = parse_hex_or_int(data["slotNumber"], U64)
+
     def read_withdrawals(self, data: Any, t8n: "T8N") -> None:
         """
         Read the withdrawals from the data.
diff --git a/src/ethereum_spec_tools/evm_tools/t8n/t8n_types.py b/src/ethereum_spec_tools/evm_tools/t8n/t8n_types.py
index 82eb950016e..249ffffba17 100644
--- a/src/ethereum_spec_tools/evm_tools/t8n/t8n_types.py
+++ b/src/ethereum_spec_tools/evm_tools/t8n/t8n_types.py
@@ -4,14 +4,15 @@
 
 import json
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple
+from typing import TYPE_CHECKING, Any, Dict, List, Optional
 
 from ethereum_rlp import Simple, rlp
 from ethereum_types.bytes import Bytes
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.crypto.hash import Hash32, keccak256
-from ethereum.state import EMPTY_CODE_HASH
+from ethereum.merkle_patricia_trie import root, trie_get
+from ethereum.state import EMPTY_CODE_HASH, apply_changes_to_state
 from ethereum.utils.hexadecimal import hex_to_bytes, hex_to_u256, hex_to_uint
 
 from ..loaders.transaction_loader import TransactionLoad, UnsupportedTxError
@@ -123,7 +124,7 @@ class Txs:
     def __init__(self, t8n: "T8N", stdin: Optional[Dict] = None):
         self.t8n = t8n
         self.successfully_parsed: List[int] = []
-        self.transactions: List[Tuple[Uint, Any]] = []
+        self.transactions: List[Any] = []
         self.rejected_txs = {}
         self.rlp_input = False
         self.all_txs = []
@@ -318,8 +319,8 @@ def get_receipts_from_output(
         """
         receipts: List[Any] = []
         for key in block_output.receipt_keys:
-            tx = t8n.fork.trie_get(block_output.transactions_trie, key)
-            receipt = t8n.fork.trie_get(block_output.receipts_trie, key)
+            tx = trie_get(block_output.transactions_trie, key)
+            receipt = trie_get(block_output.receipts_trie, key)
 
             assert tx is not None
             assert receipt is not None
@@ -340,42 +341,35 @@ def update(self, t8n: "T8N", block_env: Any, block_output: Any) -> None:
         Update the result after processing the inputs.
         """
         self.gas_used = block_output.block_gas_used
-        self.tx_root = t8n.fork.root(block_output.transactions_trie)
-        self.receipt_root = t8n.fork.root(block_output.receipts_trie)
+        self.tx_root = root(block_output.transactions_trie)
+        self.receipt_root = root(block_output.receipts_trie)
         self.bloom = t8n.fork.logs_bloom(block_output.block_logs)
         self.logs_hash = keccak256(rlp.encode(block_output.block_logs))
-        if t8n.fork.has_block_state:
-            # TODO: remove this once the state tracker is ported over
-            # to the older forks
-            from ethereum.forks.amsterdam.state import apply_changes_to_state
-            from ethereum.forks.amsterdam.state_tracker import (
-                extract_block_diff,
+        block_diff = t8n.fork.extract_block_diff(t8n._block_state)
+        state_root_value, _ = (
+            t8n.alloc.state.compute_state_root_and_trie_changes(
+                block_diff.account_changes,
+                block_diff.storage_changes,
+                block_diff.storage_clears,
             )
-
-            block_diff = extract_block_diff(t8n._block_state)
-            state_root_value, _ = (
-                t8n.alloc.state.compute_state_root_and_trie_changes(
-                    block_diff.account_changes, block_diff.storage_changes
-                )
-            )
-            self.state_root = state_root_value
-            # Apply diffs to pre-state for alloc output
-            apply_changes_to_state(t8n.alloc.state, block_diff)
-        else:
-            self.state_root = t8n.fork.state_root(block_env.state)
+        )
+        self.state_root = state_root_value
+        # Apply diffs to pre-state for alloc output
+        apply_changes_to_state(t8n.alloc.state, block_diff)
         self.receipts = self.get_receipts_from_output(t8n, block_output)
 
         if hasattr(block_env, "base_fee_per_gas"):
             self.base_fee = block_env.base_fee_per_gas
 
         if hasattr(block_output, "withdrawals_trie"):
-            self.withdrawals_root = t8n.fork.root(
-                block_output.withdrawals_trie
-            )
+            self.withdrawals_root = root(block_output.withdrawals_trie)
 
         if hasattr(block_env, "excess_blob_gas"):
             self.excess_blob_gas = block_env.excess_blob_gas
 
+        if hasattr(block_output, "blob_gas_used"):
+            self.blob_gas_used = block_output.blob_gas_used
+
         if hasattr(block_output, "requests"):
             self.requests = block_output.requests
             self.requests_hash = t8n.fork.compute_requests_hash(self.requests)
@@ -386,72 +380,6 @@ def update(self, t8n: "T8N", block_env: Any, block_output: Any) -> None:
                 block_output.block_access_list
             )
 
-    @staticmethod
-    def _block_access_list_to_json(account_changes: Any) -> Any:
-        """
-        Convert BlockAccessList to JSON format matching the Pydantic models.
-        """
-        json_account_changes = []
-        for account in account_changes:
-            account_data: Dict[str, Any] = {
-                "address": "0x" + account.address.hex()
-            }
-
-            if account.storage_changes:
-                storage_changes = []
-                for slot_change in account.storage_changes:
-                    slot_data: Dict[str, Any] = {
-                        "slot": int(slot_change.slot),
-                        "slotChanges": [],
-                    }
-                    for change in slot_change.changes:
-                        slot_data["slotChanges"].append(
-                            {
-                                "blockAccessIndex": int(
-                                    change.block_access_index
-                                ),
-                                "postValue": int(change.new_value),
-                            }
-                        )
-                    storage_changes.append(slot_data)
-                account_data["storageChanges"] = storage_changes
-
-            if account.storage_reads:
-                account_data["storageReads"] = [
-                    int(slot) for slot in account.storage_reads
-                ]
-
-            if account.balance_changes:
-                account_data["balanceChanges"] = [
-                    {
-                        "blockAccessIndex": int(change.block_access_index),
-                        "postBalance": int(change.post_balance),
-                    }
-                    for change in account.balance_changes
-                ]
-
-            if account.nonce_changes:
-                account_data["nonceChanges"] = [
-                    {
-                        "blockAccessIndex": int(change.block_access_index),
-                        "postNonce": int(change.new_nonce),
-                    }
-                    for change in account.nonce_changes
-                ]
-
-            if account.code_changes:
-                account_data["codeChanges"] = [
-                    {
-                        "blockAccessIndex": int(change.block_access_index),
-                        "newCode": "0x" + change.new_code.hex(),
-                    }
-                    for change in account.code_changes
-                ]
-
-            json_account_changes.append(account_data)
-
-        return json_account_changes
-
     def json_encode_receipts(self) -> Any:
         """
         Encode receipts to JSON.
@@ -533,9 +461,10 @@ def to_json(self) -> Any:
             data["blockException"] = self.block_exception
 
         if self.block_access_list is not None:
-            # Convert BAL to JSON format
-            data["blockAccessList"] = self._block_access_list_to_json(
-                self.block_access_list
+            # Output BAL as RLP-encoded hex bytes; the testing framework
+            # handles JSON serialization.
+            data["blockAccessList"] = encode_to_hex(
+                rlp.encode(self.block_access_list)
             )
 
         if self.block_access_list_hash is not None:
diff --git a/src/ethereum_spec_tools/forks.py b/src/ethereum_spec_tools/forks.py
index 112da3ad592..cf29086b53b 100644
--- a/src/ethereum_spec_tools/forks.py
+++ b/src/ethereum_spec_tools/forks.py
@@ -141,6 +141,17 @@ def discover(
 
         return forks
 
+    @classmethod
+    def by_short_name(cls: Type[H], name: str) -> H:
+        """
+        Return the hardfork matching the given short name.
+        """
+        for fork in cls.discover():
+            if fork.short_name == name:
+                return fork
+
+        raise ValueError(f"unknown hardfork `{name}`")
+
     @classmethod
     def load(cls: Type[H], config_dict: Dict["ForkCriteria", str]) -> List[H]:
         """
diff --git a/src/ethereum_spec_tools/lint/lints/glacier_forks_hygiene.py b/src/ethereum_spec_tools/lint/lints/glacier_forks_hygiene.py
index f3d82b3943e..4a5ca383b05 100644
--- a/src/ethereum_spec_tools/lint/lints/glacier_forks_hygiene.py
+++ b/src/ethereum_spec_tools/lint/lints/glacier_forks_hygiene.py
@@ -55,6 +55,14 @@ def __init__(self) -> None:
             "gray_glacier": 11400000,
         }
 
+    @staticmethod
+    def _needs_lint(fork_name: str) -> bool:
+        return (
+            fork_name == "dao_fork"
+            or fork_name.endswith("_glacier")
+            or fork_name.startswith("bpo")
+        )
+
     def lint(
         self, forks: List[Hardfork], position: int
     ) -> Sequence[Diagnostic]:
@@ -66,13 +74,25 @@ def lint(
             # Nothing to compare against!
             return []
 
-        if fork_name != "dao_fork" and not fork_name.endswith("_glacier"):
+        if not self._needs_lint(fork_name):
             # Nothing to compare against or non-glacier fork!
             return []
 
+        # Skip over any Monad forks when picking the predecessor; Monad
+        # is a parallel branch off Prague/Osaka, so BPO/glacier forks
+        # must be compared against the last upstream fork, not the
+        # last Monad fork in the linear order.
+        previous_position = position - 1
+        while previous_position >= 0 and forks[
+            previous_position
+        ].short_name.startswith("monad_"):
+            previous_position -= 1
+        if previous_position < 0:
+            return []
+
         diagnostics: List[Diagnostic] = []
 
-        all_previous = dict(walk_sources(forks[position - 1]))
+        all_previous = dict(walk_sources(forks[previous_position]))
         all_current = dict(walk_sources(forks[position]))
 
         all_files = set(all_previous.keys()) | set(all_current.keys())
@@ -139,9 +159,13 @@ def compare(
                 )
                 continue
 
-            if item == "BOMB_DELAY_BLOCKS":
+            if fork_name.endswith("_glacier") and item == "BOMB_DELAY_BLOCKS":
                 previous_item.value.value = self.delay_blocks[fork_name]
 
+            if fork_name.startswith("bpo"):
+                if item.startswith("GasCosts.BLOB_"):
+                    continue
+
             if not compare_ast(previous_item, current_item):
                 add_diagnostic(
                     diagnostics,
@@ -237,7 +261,46 @@ def visit_ClassDef(self, klass: ast.ClassDef) -> None:
         """
         Visit a class.
         """
-        self._insert(klass.name, klass)
+        self.path.append(klass.name)
+        super().generic_visit(klass)
+        popped = self.path.pop()
+        assert popped == klass.name
+
+    def visit_Name(self, node: ast.Name) -> None:
+        """
+        Visit a name.
+        """
+        self._insert(node.id, node)
+
+    def visit_Attribute(self, node: ast.Attribute) -> None:
+        """
+        Visit an attribute.
+        """
+        self._insert(node.attr, node)
+
+    def visit_Subscript(self, node: ast.Subscript) -> None:
+        """
+        Visit a subscript.
+        """
+        self.visit(node.value)
+        self.visit(node.slice)
+
+    def visit_Pass(self, node: ast.Pass) -> None:
+        """
+        Visit a pass.
+        """
+        pass
+
+    def visit_Tuple(self, node: ast.Tuple) -> None:
+        """
+        Visit a tuple.
+        """
+        for idx, child in enumerate(node.elts):
+            name = f"[{idx}]"
+            self.path.append(name)
+            self.visit(child)
+            popped = self.path.pop()
+            assert name == popped
 
     def visit_Assign(self, assign: ast.Assign) -> None:
         """
diff --git a/src/ethereum_spec_tools/lint/lints/patch_hygiene.py b/src/ethereum_spec_tools/lint/lints/patch_hygiene.py
index 37f9008b12c..93c5d1684b4 100644
--- a/src/ethereum_spec_tools/lint/lints/patch_hygiene.py
+++ b/src/ethereum_spec_tools/lint/lints/patch_hygiene.py
@@ -26,7 +26,20 @@ def lint(
             # Nothing to compare against!
             return []
 
-        all_previous = dict(walk_sources(forks[position - 1]))
+        # Skip Monad forks when picking the predecessor; Monad is a
+        # parallel branch off Prague/Osaka, so upstream forks must be
+        # compared against the previous upstream fork.
+        current_name = forks[position].short_name
+        previous_position = position - 1
+        if not current_name.startswith("monad_"):
+            while previous_position >= 0 and forks[
+                previous_position
+            ].short_name.startswith("monad_"):
+                previous_position -= 1
+        if previous_position < 0:
+            return []
+
+        all_previous = dict(walk_sources(forks[previous_position]))
         all_current = dict(walk_sources(forks[position]))
 
         items = (
diff --git a/src/ethereum_spec_tools/lint/lints/uint_len.py b/src/ethereum_spec_tools/lint/lints/uint_len.py
new file mode 100644
index 00000000000..91d61581559
--- /dev/null
+++ b/src/ethereum_spec_tools/lint/lints/uint_len.py
@@ -0,0 +1,68 @@
+"""
+Uint(len(...)) Lint.
+
+Ensures that `Uint(len(...))` is replaced with `ulen(...)`.
+"""
+
+import ast
+from typing import List, Sequence
+
+from ethereum_spec_tools.forks import Hardfork
+from ethereum_spec_tools.lint import Diagnostic, Lint, walk_sources
+
+
+class UintLenHygiene(Lint):
+    """
+    Ensure `ulen(...)` is used instead of `Uint(len(...))`.
+    """
+
+    def lint(
+        self, forks: List[Hardfork], position: int
+    ) -> Sequence[Diagnostic]:
+        """
+        Walk the sources for each hardfork and emit Diagnostic messages.
+        """
+        fork = forks[position]
+        diagnostics: List[Diagnostic] = []
+
+        for name, source in walk_sources(fork):
+            visitor = self._parse(source, _Visitor())
+            for lineno in visitor.violations:
+                diagnostics.append(
+                    Diagnostic(
+                        message=(
+                            f"`Uint(len(...))` at line {lineno} in"
+                            f" `{name}` should be `ulen(...)`"
+                        )
+                    )
+                )
+
+        return diagnostics
+
+
+class _Visitor(ast.NodeVisitor):
+    """
+    Visit call nodes and detect `Uint(len(...))` patterns.
+    """
+
+    violations: List[int]
+
+    def __init__(self) -> None:
+        self.violations = []
+
+    def visit_Call(self, node: ast.Call) -> None:
+        """
+        Visit a Call node.
+        """
+        if (
+            isinstance(node.func, ast.Name)
+            and node.func.id == "Uint"
+            and len(node.args) == 1
+            and not node.keywords
+            and isinstance(node.args[0], ast.Call)
+            and isinstance(node.args[0].func, ast.Name)
+            and node.args[0].func.id == "len"
+        ):
+            self.violations.append(node.lineno)
+
+        self.generic_visit(node)
diff --git a/src/ethereum_spec_tools/new_fork/builder.py b/src/ethereum_spec_tools/new_fork/builder.py
index 575aff4e187..14a4899db1f 100644
--- a/src/ethereum_spec_tools/new_fork/builder.py
+++ b/src/ethereum_spec_tools/new_fork/builder.py
@@ -489,16 +489,16 @@ def modify_target_blob_gas_per_block(
         """Append a `CodemodArgs` that sets `BLOB_TARGET_GAS_PER_BLOCK`."""
         self.modifiers.append(
             SetConstant(
-                "vm.gas.BLOB_TARGET_GAS_PER_BLOCK",
+                "vm.gas.GasCosts.BLOB_TARGET_GAS_PER_BLOCK",
                 repr(blob_target_gas_per_block),
             )
         )
 
     def modify_gas_per_blob(self, gas_per_blob: U64) -> None:
-        """Append a `CodemodArgs` that sets `GAS_PER_BLOB`."""
+        """Append a `CodemodArgs` that sets `PER_BLOB`."""
         self.modifiers.append(
             SetConstant(
-                "vm.gas.GAS_PER_BLOB",
+                "vm.gas.GasCosts.PER_BLOB",
                 repr(gas_per_blob),
             )
         )
@@ -507,7 +507,7 @@ def modify_min_blob_gasprice(self, blob_min_gasprice: Uint) -> None:
         """Append a `CodemodArgs` that sets `BLOB_MIN_GASPRICE`."""
         self.modifiers.append(
             SetConstant(
-                "vm.gas.BLOB_MIN_GASPRICE",
+                "vm.gas.GasCosts.BLOB_MIN_GASPRICE",
                 repr(blob_min_gasprice),
             )
         )
@@ -518,7 +518,7 @@ def modify_blob_base_fee_update_fraction(
         """Append a `CodemodArgs` that sets `BLOB_BASE_FEE_UPDATE_FRACTION`."""
         self.modifiers.append(
             SetConstant(
-                "vm.gas.BLOB_BASE_FEE_UPDATE_FRACTION",
+                "vm.gas.GasCosts.BLOB_BASE_FEE_UPDATE_FRACTION",
                 repr(blob_base_fee_update_fraction),
             )
         )
@@ -538,7 +538,7 @@ def modify_blob_schedule_target(self, blob_schedule_target: U64) -> None:
         """Append a `CodemodArgs` that sets `BLOB_SCHEDULE_TARGET`."""
         self.modifiers.append(
             SetConstant(
-                "vm.gas.BLOB_SCHEDULE_TARGET",
+                "vm.gas.GasCosts.BLOB_SCHEDULE_TARGET",
                 repr(blob_schedule_target),
             )
         )
@@ -547,7 +547,7 @@ def modify_blob_schedule_max(self, blob_schedule_max: U64) -> None:
         """Append a `CodemodArgs` that sets `BLOB_SCHEDULE_MAX`."""
         self.modifiers.append(
             SetConstant(
-                "vm.gas.BLOB_SCHEDULE_MAX",
+                "vm.gas.GasCosts.BLOB_SCHEDULE_MAX",
                 repr(blob_schedule_max),
             )
         )
diff --git a/tests/amsterdam/eip7708_eth_transfer_logs/__init__.py b/tests/amsterdam/eip7708_eth_transfer_logs/__init__.py
new file mode 100644
index 00000000000..2f36477a667
--- /dev/null
+++ b/tests/amsterdam/eip7708_eth_transfer_logs/__init__.py
@@ -0,0 +1 @@
+"""Cross-client EIP-7708 Tests."""
diff --git a/tests/amsterdam/eip7708_eth_transfer_logs/eip_checklist_external_coverage.txt b/tests/amsterdam/eip7708_eth_transfer_logs/eip_checklist_external_coverage.txt
new file mode 100644
index 00000000000..bba1c4cfb18
--- /dev/null
+++ b/tests/amsterdam/eip7708_eth_transfer_logs/eip_checklist_external_coverage.txt
@@ -0,0 +1,3 @@
+general/code_coverage/eels = EIP-7708 specific code (emit_transfer_log in vm/__init__.py) has full coverage; check codecov for src/ethereum/forks/amsterdam/vm/__init__.py and src/ethereum/forks/amsterdam/vm/interpreter.py
+general/code_coverage/test_coverage = Run with `--cov` flag; 99% coverage on vm/__init__.py, 92% on interpreter.py
+general/code_coverage/missed_lines = Missed lines are general VM infrastructure (static context errors, gas accounting, error handling) not related to EIP-7708
diff --git a/tests/amsterdam/eip7708_eth_transfer_logs/eip_checklist_not_applicable.txt b/tests/amsterdam/eip7708_eth_transfer_logs/eip_checklist_not_applicable.txt
new file mode 100644
index 00000000000..48ce20d19f8
--- /dev/null
+++ b/tests/amsterdam/eip7708_eth_transfer_logs/eip_checklist_not_applicable.txt
@@ -0,0 +1,14 @@
+opcode = EIP does not introduce a new opcode
+precompile = EIP does not introduce a new precompile
+removed_precompile = EIP does not remove a precompile
+system_contract = EIP does not introduce a new system contract
+transaction_type = EIP does not introduce a new transaction type
+block_header_field = EIP does not add any new block header fields
+block_body_field = EIP does not add any new block body fields
+gas_cost_changes = EIP does not introduce any gas cost changes
+gas_refunds_changes = EIP does not introduce any gas refund changes
+blob_count_changes = EIP does not introduce any blob count changes
+execution_layer_request = EIP does not introduce an execution layer request
+new_transaction_validity_constraint = EIP does not introduce a new transaction validity constraint
+modified_transaction_validity_constraint = EIP does not introduce a modified transaction validity constraint
+block_level_constraint = EIP does not introduce a block-level validation constraint
diff --git a/tests/amsterdam/eip7708_eth_transfer_logs/spec.py b/tests/amsterdam/eip7708_eth_transfer_logs/spec.py
new file mode 100644
index 00000000000..f95378a6380
--- /dev/null
+++ b/tests/amsterdam/eip7708_eth_transfer_logs/spec.py
@@ -0,0 +1,61 @@
+"""Defines EIP-7708 specification constants and functions."""
+
+from dataclasses import dataclass
+
+from execution_testing import Address, Bytes, Hash, TransactionLog, keccak256
+
+
+@dataclass(frozen=True)
+class ReferenceSpec:
+    """Defines the reference spec version and git path."""
+
+    git_path: str
+    version: str
+
+
+ref_spec_7708 = ReferenceSpec(
+    "EIPS/eip-7708.md", "43a7f15cd1105f308086bed6a61e3155039271fc"
+)
+
+
+@dataclass(frozen=True)
+class Spec:
+    """
+    Parameters from the EIP-7708 specifications as defined at
+    https://eips.ethereum.org/EIPS/eip-7708.
+    """
+
+    SYSTEM_ADDRESS: Address = Address(
+        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+    )
+    TRANSFER_TOPIC: Hash = Hash(
+        keccak256(b"Transfer(address,address,uint256)")
+    )
+    BURN_TOPIC: Hash = Hash(keccak256(b"Burn(address,uint256)"))
+
+
+def transfer_log(
+    sender: Address, recipient: Address, amount: int
+) -> TransactionLog:
+    """Create an expected Transfer log for EIP-7708."""
+    return TransactionLog(
+        address=Spec.SYSTEM_ADDRESS,
+        topics=[
+            Spec.TRANSFER_TOPIC,
+            Hash(bytes(sender).rjust(32, b"\x00")),
+            Hash(bytes(recipient).rjust(32, b"\x00")),
+        ],
+        data=Bytes(amount.to_bytes(32, "big")),
+    )
+
+
+def burn_log(contract_address: Address, amount: int | None) -> TransactionLog:
+    """Create an expected Burn log for EIP-7708."""
+    return TransactionLog(
+        address=Spec.SYSTEM_ADDRESS,
+        topics=[
+            Spec.BURN_TOPIC,
+            Hash(bytes(contract_address).rjust(32, b"\x00")),
+        ],
+        data=Bytes(amount.to_bytes(32, "big")) if amount is not None else None,
+    )
diff --git a/tests/amsterdam/eip7708_eth_transfer_logs/test_burn_logs.py b/tests/amsterdam/eip7708_eth_transfer_logs/test_burn_logs.py
new file mode 100644
index 00000000000..f8f8c5eeeff
--- /dev/null
+++ b/tests/amsterdam/eip7708_eth_transfer_logs/test_burn_logs.py
@@ -0,0 +1,930 @@
+"""
+Tests for EIP-7708 Burn logs.
+
+Tests for the Burn(address,uint256) log emitted when:
+- SELFDESTRUCT to self with nonzero balance
+- Account created and destroyed in the same transaction
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Block,
+    BlockchainTestFiller,
+    Bytecode,
+    Conditional,
+    Environment,
+    Fork,
+    Header,
+    Initcode,
+    Op,
+    Opcodes,
+    StateTestFiller,
+    Transaction,
+    TransactionReceipt,
+    compute_create_address,
+)
+from execution_testing import (
+    Macros as Om,
+)
+
+from .spec import burn_log, ref_spec_7708, transfer_log
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7708.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7708.version
+
+pytestmark = pytest.mark.valid_from("EIP7708")
+
+
+def test_selfdestruct_to_self_pre_existing_no_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+) -> None:
+    """
+    Test that selfdestruct-to-self emits NO log for pre-existing contracts.
+
+    Burn log only emitted when created and destroyed in same tx.
+    """
+    contract_balance = 2000
+
+    contract_code = Op.SELFDESTRUCT(Op.ADDRESS)
+    contract = pre.deploy_contract(contract_code, balance=contract_balance)
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        value=0,
+        gas_limit=100_000,
+        expected_receipt=TransactionReceipt(logs=[]),
+    )
+
+    # Contract keeps its balance (not destroyed since not created in same tx)
+    state_test(
+        env=env,
+        pre=pre,
+        post={contract: Account(balance=contract_balance)},
+        tx=tx,
+    )
+
+
+@pytest.mark.parametrize(
+    "contract_balance",
+    [
+        pytest.param(2000, id="with_balance"),
+        pytest.param(0, id="zero_balance"),
+    ],
+)
+@pytest.mark.with_all_create_opcodes
+def test_selfdestruct_to_self_same_tx(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    contract_balance: int,
+    create_opcode: Op,
+) -> None:
+    """
+    Test selfdestruct-to-self for same-tx created contracts.
+
+    - With balance, Burn log emitted (burns ETH).
+    - No balance, no logs expected.
+    """
+    initcode = Op.SELFDESTRUCT(Op.ADDRESS)
+    initcode_bytes = bytes(initcode)
+    initcode_len = len(initcode_bytes)
+
+    factory_code = Op.MSTORE(
+        0, Op.PUSH32(initcode_bytes.rjust(32, b"\x00"))
+    ) + create_opcode(
+        value=Op.CALLVALUE, offset=32 - initcode_len, size=initcode_len
+    )
+
+    factory = pre.deploy_contract(factory_code)
+    created_address = compute_create_address(
+        address=factory,
+        nonce=1,
+        salt=0,
+        initcode=initcode_bytes,
+        opcode=create_opcode,
+    )
+
+    if contract_balance > 0:
+        expected_logs = [
+            transfer_log(sender, factory, contract_balance),
+            transfer_log(factory, created_address, contract_balance),
+            burn_log(created_address, contract_balance),
+        ]
+    else:
+        expected_logs = []
+
+    tx = Transaction(
+        sender=sender,
+        to=factory,
+        value=contract_balance,
+        gas_limit=200_000,
+        expected_receipt=TransactionReceipt(logs=expected_logs),
+    )
+
+    state_test(env=env, pre=pre, post={}, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "contract_balance",
+    [
+        pytest.param(2000, id="with_balance"),
+        pytest.param(0, id="zero_balance"),
+    ],
+)
+@pytest.mark.with_all_create_opcodes
+def test_selfdestruct_to_different_address_same_tx(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    contract_balance: int,
+    create_opcode: Op,
+) -> None:
+    """
+    Test same-tx selfdestruct to different address.
+
+    With balance: Transfer log emitted. Zero balance: no logs.
+    """
+    beneficiary = pre.deploy_contract(Op.STOP)
+
+    initcode = Op.SELFDESTRUCT(beneficiary)
+    initcode_bytes = bytes(initcode)
+    initcode_len = len(initcode_bytes)
+
+    factory_code = Op.MSTORE(
+        0, Op.PUSH32(initcode_bytes.rjust(32, b"\x00"))
+    ) + create_opcode(
+        value=Op.CALLVALUE, offset=32 - initcode_len, size=initcode_len
+    )
+
+    factory = pre.deploy_contract(factory_code)
+    created_address = compute_create_address(
+        address=factory,
+        nonce=1,
+        salt=0,
+        initcode=initcode_bytes,
+        opcode=create_opcode,
+    )
+
+    if contract_balance > 0:
+        expected_logs = [
+            transfer_log(sender, factory, contract_balance),
+            transfer_log(factory, created_address, contract_balance),
+            transfer_log(created_address, beneficiary, contract_balance),
+        ]
+        post = {beneficiary: Account(balance=contract_balance)}
+    else:
+        expected_logs = []
+        post = {}
+
+    tx = Transaction(
+        sender=sender,
+        to=factory,
+        value=contract_balance,
+        gas_limit=200_000,
+        expected_receipt=TransactionReceipt(logs=expected_logs),
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "to_self",
+    [
+        pytest.param(True, id="to_self"),
+        pytest.param(False, id="to_other"),
+    ],
+)
+@pytest.mark.parametrize(
+    "call_twice,second_call_value",
+    [
+        pytest.param(True, 1, id="call_twice_with_value"),
+        pytest.param(True, 0, id="call_twice"),
+        pytest.param(False, 0, id="call_once"),
+    ],
+)
+@pytest.mark.parametrize(
+    "transfer_during_create",
+    [
+        pytest.param(True, id="transfer_during_create"),
+        pytest.param(False, id="transfer_during_call"),
+    ],
+)
+def test_selfdestruct_same_tx_via_call(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    to_self: bool,
+    call_twice: bool,
+    second_call_value: int,
+    transfer_during_create: bool,
+) -> None:
+    """
+    Test selfdestruct via CREATE-then-CALL (not initcode selfdestruct).
+
+    Factory CREATEs contract with runtime code, then CALLs the contract that
+    was just created to trigger SELFDESTRUCT (depending on
+    `transfer_during_create`, the value of the contract is transferred during
+    the CREATE or CALL opcodes). Contract is still in created_accounts.
+
+    Depending on `call_twice`, the contract can be called twice during the
+    same call frame where it was created.
+    """
+    contract_balance = 2000
+    beneficiary = pre.deploy_contract(Op.STOP)
+
+    if to_self:
+        runtime_code = Op.SELFDESTRUCT(Op.ADDRESS)
+    else:
+        runtime_code = Op.SELFDESTRUCT(beneficiary)
+
+    initcode = Initcode(deploy_code=runtime_code)
+    initcode_len = len(initcode)
+
+    if transfer_during_create:
+        create_value = contract_balance
+        first_call_value = 0
+    else:
+        create_value = 0
+        first_call_value = contract_balance
+
+    factory_code = (
+        Om.MSTORE(initcode, 0)
+        + Op.SSTORE(
+            0, Op.CREATE(value=create_value, offset=0, size=initcode_len)
+        )
+        + Op.SSTORE(
+            1,
+            Op.CALL(gas=100_000, address=Op.SLOAD(0), value=first_call_value),
+        )
+    )
+    if call_twice:
+        factory_code += Op.SSTORE(
+            2,
+            Op.CALL(gas=100_000, address=Op.SLOAD(0), value=second_call_value),
+        )
+
+    factory = pre.deploy_contract(
+        factory_code, balance=contract_balance + second_call_value
+    )
+    created_address = compute_create_address(address=factory, nonce=1)
+
+    factory_storage = {
+        0: created_address,
+        1: 1,
+    }
+    if call_twice:
+        factory_storage[2] = 1
+
+    if to_self:
+        expected_logs = [
+            transfer_log(factory, created_address, contract_balance),
+            burn_log(created_address, contract_balance),
+        ]
+        if call_twice and second_call_value > 0:
+            expected_logs += [
+                transfer_log(factory, created_address, second_call_value),
+                burn_log(created_address, second_call_value),
+            ]
+        post = {factory: Account(storage=factory_storage)}
+    else:
+        expected_logs = [
+            transfer_log(factory, created_address, contract_balance),
+            transfer_log(created_address, beneficiary, contract_balance),
+        ]
+        if call_twice and second_call_value > 0:
+            expected_logs += [
+                transfer_log(factory, created_address, second_call_value),
+                transfer_log(created_address, beneficiary, second_call_value),
+            ]
+        post = {
+            beneficiary: Account(balance=contract_balance + second_call_value),
+            factory: Account(storage=factory_storage),
+        }
+
+    tx = Transaction(
+        sender=sender,
+        to=factory,
+        value=0,
+        gas_limit=300_000,
+        expected_receipt=TransactionReceipt(logs=expected_logs),
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "payer_code,eth_transferred",
+    [
+        pytest.param(
+            Op.SELFDESTRUCT(Op.CALLDATALOAD(0)),
+            True,
+            id="via_selfdestruct",
+        ),
+        pytest.param(
+            Op.CALL(
+                gas=50_000,
+                address=Op.CALLDATALOAD(0),
+                value=Op.BALANCE(Op.ADDRESS),
+            ),
+            True,
+            id="via_call",
+        ),
+        pytest.param(
+            Op.CALL(
+                gas=50_000,
+                address=Op.CALLDATALOAD(0),
+                value=Op.BALANCE(Op.ADDRESS),
+            )
+            + Op.REVERT(0, 0),
+            False,
+            id="via_call_revert",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "to_self",
+    [
+        pytest.param(False, id="to_beneficiary"),
+        pytest.param(True, id="to_self"),
+    ],
+)
+def test_finalization_burn_logs(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    payer_code: Bytecode,
+    eth_transferred: bool,
+    to_self: bool,
+) -> None:
+    """
+    Test Burn logs at finalization for post-selfdestruct balance.
+
+    X contracts (x1, x2, x3) selfdestruct, then receive ETH via payer contracts
+    (p1, p2, p3). At finalization, X contracts emit Burn logs for their
+    in lexicographical address order (only if they received ETH).
+
+    When to_self=True, X contracts SELFDESTRUCT to themselves (burning ETH
+    with LOG2). When to_self=False, X contracts SELFDESTRUCT to a beneficiary
+    (Transfer LOG3).
+    """
+    beneficiary = pre.deploy_contract(Op.STOP)
+
+    # Pre-compute factory address and created contract addresses
+    # so we can call them in reverse sorted order to prove finalization
+    # logs are sorted by address, not by call order
+    factory_address = compute_create_address(
+        address=sender, nonce=sender.nonce
+    )
+    x1 = compute_create_address(address=factory_address, nonce=1)
+    x2 = compute_create_address(address=factory_address, nonce=2)
+    x3 = compute_create_address(address=factory_address, nonce=3)
+
+    # sort() + call in REVERSE order to prove finalization
+    # lexicographical sorting
+    sorted_addrs = sorted([x1, x2, x3])
+    reverse_sorted = list(reversed(sorted_addrs))
+
+    # Runtime: selfdestruct on first call, STOP on subsequent calls
+    target: Address | Opcodes = Op.ADDRESS if to_self else beneficiary
+    runtime = Conditional(
+        condition=Op.ISZERO(Op.TLOAD(0)),
+        if_true=Op.TSTORE(0, 1) + Op.SELFDESTRUCT(target),
+        if_false=Op.STOP,
+    )
+    initcode = Initcode(deploy_code=runtime)
+    initcode_len = len(initcode)
+
+    # Payer contracts (p1, p2, p3) will send ETH to created contracts
+    p1 = pre.deploy_contract(payer_code, balance=100)
+    p2 = pre.deploy_contract(payer_code, balance=200)
+    p3 = pre.deploy_contract(payer_code, balance=300)
+
+    # Call p1/p2/p3 targeting addresses in REVERSE sorted order
+    # This proves finalization logs are sorted by address, not call order
+    factory_code = (
+        Om.MSTORE(initcode, 0)
+        # Create x1, x2, x3
+        + Op.TSTORE(0, Op.CREATE(value=1000, offset=0, size=initcode_len))
+        + Op.TSTORE(1, Op.CREATE(value=2000, offset=0, size=initcode_len))
+        + Op.TSTORE(2, Op.CREATE(value=3000, offset=0, size=initcode_len))
+        # Call x1, x2, x3 to trigger SELFDESTRUCT
+        + Op.CALL(gas=100_000, address=Op.TLOAD(0), value=0)
+        + Op.CALL(gas=100_000, address=Op.TLOAD(1), value=0)
+        + Op.CALL(gas=100_000, address=Op.TLOAD(2), value=0)
+        # p1/p2/p3 send ETH in REVERSE sorted address order
+        + Op.MSTORE(0, reverse_sorted[0])
+        + Op.CALL(gas=100_000, address=p1, args_offset=0, args_size=32)
+        + Op.MSTORE(0, reverse_sorted[1])
+        + Op.CALL(gas=100_000, address=p2, args_offset=0, args_size=32)
+        + Op.MSTORE(0, reverse_sorted[2])
+        + Op.CALL(gas=100_000, address=p3, args_offset=0, args_size=32)
+    )
+
+    factory_balance = 1000 + 2000 + 3000
+    pre.fund_address(factory_address, factory_balance)
+
+    # Amounts based on reverse call order:
+    # p1→reverse[0], p2→reverse[1], p3→reverse[2]
+    amounts = {
+        reverse_sorted[0]: 100,
+        reverse_sorted[1]: 200,
+        reverse_sorted[2]: 300,
+    }
+
+    # Execution logs:
+    # 1. CREATE x1, x2, x3 → LOG3 Transfer (factory → created)
+    # 2. CALL x1, x2, x3 → LOG3 or LOG2 depending on `to_self`
+    # 3. p1/p2/p3 send to reverse_sorted order
+    execution_logs = [
+        transfer_log(factory_address, x1, 1000),
+        transfer_log(factory_address, x2, 2000),
+        transfer_log(factory_address, x3, 3000),
+    ]
+
+    if to_self:
+        # SELFDESTRUCT to self burns ETH → LOG2 Burn
+        execution_logs.extend(
+            [
+                burn_log(x1, 1000),
+                burn_log(x2, 2000),
+                burn_log(x3, 3000),
+            ]
+        )
+        beneficiary_balance = 0
+    else:
+        # SELFDESTRUCT to beneficiary → LOG3 Transfer
+        execution_logs.extend(
+            [
+                transfer_log(x1, beneficiary, 1000),
+                transfer_log(x2, beneficiary, 2000),
+                transfer_log(x3, beneficiary, 3000),
+            ]
+        )
+        beneficiary_balance = factory_balance
+
+    if not eth_transferred:
+        # Reverted CALLs emit no logs, no ETH transferred, no finalization logs
+        finalization_logs = []
+        post = {
+            x1: Account.NONEXISTENT,
+            x2: Account.NONEXISTENT,
+            x3: Account.NONEXISTENT,
+            beneficiary: Account(balance=beneficiary_balance),
+            p1: Account(balance=100),
+            p2: Account(balance=200),
+            p3: Account(balance=300),
+        }
+    else:
+        # p1/p2/p3 send ETH in reverse sorted order
+        execution_logs.extend(
+            [
+                transfer_log(p1, reverse_sorted[0], 100),
+                transfer_log(p2, reverse_sorted[1], 200),
+                transfer_log(p3, reverse_sorted[2], 300),
+            ]
+        )
+        # Finalization logs emitted in SORTED address order (not call order)
+        finalization_logs = [
+            burn_log(addr, amounts[addr]) for addr in sorted_addrs
+        ]
+        post = {
+            x1: Account.NONEXISTENT,
+            x2: Account.NONEXISTENT,
+            x3: Account.NONEXISTENT,
+            beneficiary: Account(balance=beneficiary_balance),
+            p1: Account(balance=0),
+            p2: Account(balance=0),
+            p3: Account(balance=0),
+        }
+
+    tx = Transaction(
+        sender=sender,
+        to=None,
+        value=0,
+        data=factory_code,
+        gas_limit=1_000_000,
+        expected_receipt=TransactionReceipt(
+            logs=execution_logs + finalization_logs
+        ),
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "num_accounts",
+    [
+        pytest.param(2, id="two_accounts"),
+        pytest.param(5, id="five_accounts"),
+    ],
+)
+def test_finalization_burn_logs_multi_account_ordering(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    fork: Fork,
+    num_accounts: int,
+) -> None:
+    """
+    Verify finalization burn logs are sorted lexicographically by address
+    when multiple accounts are marked for deletion in the same transaction.
+
+    N accounts are created and SELFDESTRUCT'd in the same tx, then each
+    is funded by a dedicated payer contract called in REVERSE sorted
+    address order with a distinct nonzero amount. Every destroyed account
+    ends with a distinct nonzero balance at finalization, so a Burn log
+    is emitted for each. The resulting sequence of finalization burn logs
+    must appear in ascending address order regardless of call order.
+    """
+    beneficiary = pre.deploy_contract(Op.STOP)
+
+    factory_address = compute_create_address(
+        address=sender, nonce=sender.nonce
+    )
+    created_addrs = [
+        compute_create_address(address=factory_address, nonce=i + 1)
+        for i in range(num_accounts)
+    ]
+    sorted_addrs = sorted(created_addrs)
+    reverse_sorted = list(reversed(sorted_addrs))
+
+    # Each created contract is CALLed exactly once (to trigger SELFDESTRUCT);
+    # payers then forward via their own SELFDESTRUCT, so the created
+    # contracts are never re-invoked — no call-once guard is needed.
+    runtime = Op.SELFDESTRUCT(beneficiary)
+    initcode = Initcode(deploy_code=runtime)
+    initcode_len = len(initcode)
+
+    create_balances = [1000 * (i + 1) for i in range(num_accounts)]
+    factory_balance = sum(create_balances)
+    pre.fund_address(factory_address, factory_balance)
+
+    payer_code = Op.SELFDESTRUCT(Op.CALLDATALOAD(0))
+    funding_amounts = [100 * (i + 1) for i in range(num_accounts)]
+    payers = [
+        pre.deploy_contract(payer_code, balance=funding_amounts[i])
+        for i in range(num_accounts)
+    ]
+
+    factory_code: Bytecode = Om.MSTORE(initcode, 0)
+    for i in range(num_accounts):
+        factory_code += Op.TSTORE(
+            i,
+            Op.CREATE(value=create_balances[i], offset=0, size=initcode_len),
+        )
+    for i in range(num_accounts):
+        factory_code += Op.CALL(gas=Op.GAS, address=Op.TLOAD(i), value=0)
+    for i in range(num_accounts):
+        factory_code += Op.MSTORE(0, reverse_sorted[i])
+        factory_code += Op.CALL(
+            gas=Op.GAS,
+            address=payers[i],
+            args_offset=0,
+            args_size=32,
+        )
+
+    execution_logs = [
+        transfer_log(factory_address, addr, create_balances[i])
+        for i, addr in enumerate(created_addrs)
+    ]
+    execution_logs.extend(
+        transfer_log(addr, beneficiary, create_balances[i])
+        for i, addr in enumerate(created_addrs)
+    )
+    execution_logs.extend(
+        transfer_log(payers[i], reverse_sorted[i], funding_amounts[i])
+        for i in range(num_accounts)
+    )
+
+    amount_by_addr = dict(zip(reverse_sorted, funding_amounts, strict=True))
+    finalization_logs = [
+        burn_log(addr, amount_by_addr[addr]) for addr in sorted_addrs
+    ]
+
+    tx = Transaction(
+        sender=sender,
+        to=None,
+        value=0,
+        data=factory_code,
+        gas_limit=fork.transaction_gas_limit_cap(),
+        expected_receipt=TransactionReceipt(
+            logs=execution_logs + finalization_logs
+        ),
+    )
+
+    post: dict[Address, Account | None] = dict.fromkeys(
+        created_addrs, Account.NONEXISTENT
+    )
+    post[beneficiary] = Account(balance=factory_balance)
+    for payer in payers:
+        post[payer] = Account(balance=0)
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "num_transfers",
+    [
+        pytest.param(2, id="two_transfers"),
+        pytest.param(5, id="five_transfers"),
+    ],
+)
+def test_finalization_burn_log_single_account_multiple_transfers(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    fork: Fork,
+    num_transfers: int,
+) -> None:
+    """
+    Verify finalization emits a single Burn log summing multiple ETH transfers
+    to one to-be-destructed account.
+
+    A single account is created and SELFDESTRUCT'd in the same tx, then N
+    payer contracts each send a distinct nonzero amount to it. Exactly ONE
+    Burn log MUST be emitted at finalization with the combined residual
+    balance, a client emitting one log per transfer would fail.
+    """
+    beneficiary = pre.deploy_contract(Op.STOP)
+
+    factory_address = compute_create_address(
+        address=sender, nonce=sender.nonce
+    )
+    x = compute_create_address(address=factory_address, nonce=1)
+
+    # x is only CALLed once (to trigger SELFDESTRUCT); payers forward via
+    # their own SELFDESTRUCT, so no call-once guard is needed.
+    runtime = Op.SELFDESTRUCT(beneficiary)
+    initcode = Initcode(deploy_code=runtime)
+    initcode_len = len(initcode)
+
+    create_balance = 1000
+    pre.fund_address(factory_address, create_balance)
+
+    # N payer contracts, each sending a distinct nonzero amount to x
+    payer_code = Op.SELFDESTRUCT(x)
+    funding_amounts = [100 * (i + 1) for i in range(num_transfers)]
+    payers = [
+        pre.deploy_contract(payer_code, balance=funding_amounts[i])
+        for i in range(num_transfers)
+    ]
+
+    # Factory creates x, triggers its SELFDESTRUCT, then calls each payer with
+    # x as the beneficiary so each payer's balance is forwarded to x.
+    factory_code: Bytecode = (
+        Om.MSTORE(initcode, 0)
+        + Op.SSTORE(
+            0, Op.CREATE(value=create_balance, offset=0, size=initcode_len)
+        )
+        + Op.SSTORE(
+            1,
+            Op.CALL(gas=Op.GAS, address=Op.SLOAD(0), value=0),
+        )
+    )
+    for i in range(num_transfers):
+        factory_code += Op.SSTORE(
+            2 + i,
+            Op.CALL(
+                gas=Op.GAS,
+                address=payers[i],
+                args_offset=0,
+                args_size=32,
+            ),
+        )
+
+    execution_logs = [
+        transfer_log(factory_address, x, create_balance),
+        transfer_log(x, beneficiary, create_balance),
+    ]
+    execution_logs.extend(
+        transfer_log(payers[i], x, funding_amounts[i])
+        for i in range(num_transfers)
+    )
+
+    # Exactly one burn log with the SUM of transferred amounts
+    total_residual = sum(funding_amounts)
+    finalization_logs = [burn_log(x, total_residual)]
+
+    tx = Transaction(
+        sender=sender,
+        to=None,
+        value=0,
+        data=factory_code,
+        gas_limit=fork.transaction_gas_limit_cap(),
+        expected_receipt=TransactionReceipt(
+            logs=execution_logs + finalization_logs
+        ),
+    )
+
+    factory_storage = {0: x, 1: 1}
+    for i in range(num_transfers):
+        factory_storage[2 + i] = 1
+
+    post: dict[Address, Account | None] = {
+        x: Account.NONEXISTENT,
+        beneficiary: Account(balance=create_balance),
+        factory_address: Account(storage=factory_storage),
+    }
+    for payer in payers:
+        post[payer] = Account(balance=0)
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "funded_after_selfdestruct",
+    [
+        pytest.param(True, id="funded_after_selfdestruct"),
+        pytest.param(False, id="miner_fee_only"),
+    ],
+)
+def test_selfdestruct_finalization_after_priority_fee(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    funded_after_selfdestruct: bool,
+) -> None:
+    """
+    Verify finalization burn logs are emitted after priority fee payment.
+
+    Sets coinbase to a contract that self-destructs in the same tx. The
+    finalization burn log includes the priority fee, proving finalization
+    happens after fee payment per EIP-7708.
+
+    funded_after_selfdestruct:
+    - if True: payer sends ETH, finalization = funding + priority_fee
+    - if False: no payer, finalization = priority_fee only
+    """
+    genesis_base_fee = 7
+    env = Environment(base_fee_per_gas=genesis_base_fee)
+    contract_balance = 1000
+    funding_amount = 10_000 if funded_after_selfdestruct else 0
+
+    sender = pre.fund_eoa()
+
+    factory_address = compute_create_address(address=sender, nonce=0)
+    created_address = compute_create_address(address=factory_address, nonce=1)
+    coinbase = created_address  # coinbase == self-destructed contract
+
+    # inner contract: simple SELFDESTRUCT to self
+    runtime_code = (
+        Op.SELFDESTRUCT(
+            Op.ADDRESS,
+            # Gas accounting
+            address_warm=True,
+            account_new=False,
+            self_destructed_account=True,
+            self_destructed_account_code_deposit=len(
+                Op.SELFDESTRUCT(address=Op.ADDRESS)
+            ),
+        )
+        if fork.is_eip_enabled(8037)
+        else Op.SELFDESTRUCT(
+            Op.ADDRESS,
+            # Gas accounting
+            address_warm=True,
+            account_new=False,
+        )
+    )
+    initcode = Initcode(deploy_code=runtime_code)
+    initcode_len = len(initcode)
+
+    gas_costs = fork.gas_costs()
+    mem_after_mstore = ((initcode_len + 31) // 32) * 32
+
+    # The base factory code: CREATE + CALL to trigger selfdestruct
+    call_gas = 100_000
+    if fork.is_eip_enabled(8037):
+        call_gas = 500_000
+    factory_code = Om.MSTORE(
+        initcode, 0, new_memory_size=mem_after_mstore
+    ) + Op.CALL(
+        gas=call_gas,
+        address=Op.CREATE(
+            value=contract_balance,
+            offset=0,
+            size=initcode_len,
+            init_code_size=initcode_len,
+        ),
+        address_warm=True,
+    )
+
+    # optionally add payer call to fund coinbase after selfdestruct
+    payer = None
+    payer_runtime_gas = 0
+    if funded_after_selfdestruct:
+        payer_code = Op.SELFDESTRUCT(Op.CALLDATALOAD(0))
+        payer = pre.deploy_contract(payer_code, balance=funding_amount)
+        factory_code += Op.MSTORE(0, created_address)
+        factory_code += Op.CALL(
+            gas=call_gas, address=payer, args_offset=0, args_size=32
+        )
+        payer_runtime_gas = Op.SELFDESTRUCT(
+            Op.CALLDATALOAD(0), address_warm=True, account_new=False
+        ).gas_cost(fork)
+
+    pre.fund_address(factory_address, contract_balance)
+
+    # prio fee calc
+    gas_price = 10
+    base_fee = fork.base_fee_per_gas_calculator()(
+        parent_base_fee_per_gas=genesis_base_fee,
+        parent_gas_used=0,
+        parent_gas_limit=env.gas_limit,
+    )
+    priority_fee_per_gas = gas_price - base_fee
+
+    intrinsic_gas = fork.transaction_intrinsic_cost_calculator()(
+        calldata=bytes(factory_code),
+        contract_creation=True,
+    )
+    factory_gas = factory_code.gas_cost(fork)
+    initcode_exec_gas = initcode.execution_gas(fork)
+    code_deposit_gas = len(runtime_code) * gas_costs.CODE_DEPOSIT_PER_BYTE
+    inner_runtime_gas = runtime_code.gas_cost(fork)
+
+    gas_used = (
+        intrinsic_gas
+        + factory_gas
+        + initcode_exec_gas
+        + code_deposit_gas
+        + inner_runtime_gas
+        + payer_runtime_gas
+    )
+
+    inner_runtime_refund = runtime_code.refund(fork)
+    gas_refunds = inner_runtime_refund
+    discount = min(
+        gas_refunds,
+        gas_used // 5,  # max discount EIP-3529
+    )
+    priority_fee = priority_fee_per_gas * (gas_used - discount)
+
+    # Finalization burn log proves coinbase received priority fee before log
+    finalization_balance: int | None = funding_amount + priority_fee
+
+    expected_logs = [
+        transfer_log(factory_address, created_address, contract_balance),
+        burn_log(created_address, contract_balance),
+    ]
+
+    # if funded after selfdestruct, expect transfer log from payer
+    if funded_after_selfdestruct:
+        assert payer is not None
+        expected_logs.append(
+            transfer_log(payer, created_address, funding_amount)
+        )
+
+    # finalization burn log
+    if fork.is_eip_enabled(8037):
+        raise Exception(
+            "Test needs update: recompute exact gas usage with 8037"
+        )
+
+    expected_logs.append(burn_log(created_address, finalization_balance))
+    gas_limit = 500_000
+    if fork.is_eip_enabled(8037):
+        gas_limit = 2_000_000
+
+    tx = Transaction(
+        sender=sender,
+        to=None,
+        value=0,
+        data=factory_code,
+        gas_limit=gas_limit,
+        gas_price=gas_price,
+        expected_receipt=TransactionReceipt(logs=expected_logs),
+    )
+
+    post: dict[Address, Account | None] = {
+        created_address: Account.NONEXISTENT,
+    }
+    if payer is not None:
+        post[payer] = Account(balance=0)
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=[tx],
+                fee_recipient=coinbase,
+                header_verify=Header(base_fee_per_gas=base_fee),
+            )
+        ],
+        post=post,
+        genesis_environment=env,
+    )
diff --git a/tests/amsterdam/eip7708_eth_transfer_logs/test_eip_mainnet.py b/tests/amsterdam/eip7708_eth_transfer_logs/test_eip_mainnet.py
new file mode 100644
index 00000000000..73edc070e00
--- /dev/null
+++ b/tests/amsterdam/eip7708_eth_transfer_logs/test_eip_mainnet.py
@@ -0,0 +1,102 @@
+"""
+Mainnet marked execute checklist tests for
+[EIP-7708: ETH transfers emit a log](https://eips.ethereum.org/EIPS/eip-7708).
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Fork,
+    Op,
+    StateTestFiller,
+    Transaction,
+    TransactionReceipt,
+)
+
+from .spec import ref_spec_7708, transfer_log
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7708.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7708.version
+
+pytestmark = [pytest.mark.valid_at("EIP7708"), pytest.mark.mainnet]
+
+
+def test_simple_transfer_mainnet(
+    state_test: StateTestFiller,
+    pre: Alloc,
+) -> None:
+    """Test that a simple ETH transfer emits a transfer log on mainnet."""
+    sender = pre.fund_eoa()
+    recipient = pre.nonexistent_account()
+
+    tx = Transaction(
+        ty=0x02,
+        sender=sender,
+        to=recipient,
+        value=1,
+        gas_limit=21_000,
+        expected_receipt=TransactionReceipt(
+            logs=[transfer_log(sender, recipient, 1)]
+        ),
+    )
+
+    post = {recipient: Account(balance=1)}
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_call_with_value_mainnet(
+    state_test: StateTestFiller,
+    pre: Alloc,
+) -> None:
+    """Test that CALL with value emits a transfer log on mainnet."""
+    sender = pre.fund_eoa()
+    recipient = pre.deploy_contract(Op.STOP)
+
+    contract_code = Op.CALL(gas=50_000, address=recipient, value=100)
+    contract = pre.deploy_contract(contract_code, balance=100)
+
+    tx = Transaction(
+        ty=0x02,
+        sender=sender,
+        to=contract,
+        value=0,
+        gas_limit=100_000,
+        expected_receipt=TransactionReceipt(
+            logs=[transfer_log(contract, recipient, 100)]
+        ),
+    )
+
+    post = {recipient: Account(balance=100)}
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_selfdestruct_mainnet(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+) -> None:
+    """Test that SELFDESTRUCT emits a transfer log on mainnet."""
+    sender = pre.fund_eoa()
+    beneficiary = pre.nonexistent_account()
+
+    contract_code = Op.SELFDESTRUCT(beneficiary)
+    contract = pre.deploy_contract(contract_code, balance=500)
+
+    gas_limit = 100_000
+    if fork.is_eip_enabled(8037):
+        gas_limit = 500_000
+
+    tx = Transaction(
+        ty=0x02,
+        sender=sender,
+        to=contract,
+        value=0,
+        gas_limit=gas_limit,
+        expected_receipt=TransactionReceipt(
+            logs=[transfer_log(contract, beneficiary, 500)]
+        ),
+    )
+
+    post = {beneficiary: Account(balance=500)}
+    state_test(pre=pre, post=post, tx=tx)
diff --git a/tests/amsterdam/eip7708_eth_transfer_logs/test_fork_transition.py b/tests/amsterdam/eip7708_eth_transfer_logs/test_fork_transition.py
new file mode 100644
index 00000000000..4125f1a8273
--- /dev/null
+++ b/tests/amsterdam/eip7708_eth_transfer_logs/test_fork_transition.py
@@ -0,0 +1,200 @@
+"""
+Tests for EIP-7708 fork transition behavior.
+
+Tests that verify transfer logs are emitted correctly at the Amsterdam fork
+transition boundary.
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Block,
+    BlockchainTestFiller,
+    Op,
+    Transaction,
+    TransactionReceipt,
+    compute_create_address,
+)
+
+from .spec import burn_log, ref_spec_7708, transfer_log
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7708.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7708.version
+
+
+@pytest.mark.parametrize(
+    "same_tx,to_self",
+    [
+        pytest.param(True, True, id="same_tx_to_self"),
+        pytest.param(False, True, id="pre_existing_to_self"),
+        pytest.param(False, False, id="pre_existing_to_other"),
+    ],
+)
+@pytest.mark.valid_at_transition_to("EIP7708")
+def test_burn_log_at_fork_transition(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    same_tx: bool,
+    to_self: bool,
+) -> None:
+    """
+    Test burn log emission across the EIP-7708 fork transition.
+
+    same_tx_to_self: Factory CREATEs and selfdestructs to self in one tx.
+    At/after Amsterdam emits a CREATE transfer log + Burn log.
+
+    pre_existing_to_self: Pre-existing contract selfdestructs to self.
+    No logs at any fork — SELFDESTRUCT to same account emits nothing.
+
+    pre_existing_to_other: Pre-existing contract selfdestructs to a different
+    account. At/after Amsterdam emits a Transfer log.
+    """
+    sender = pre.fund_eoa()
+    contract_balance = 1000
+
+    if same_tx:
+        initcode = Op.SELFDESTRUCT(Op.ADDRESS)
+        initcode_bytes = bytes(initcode)
+        initcode_len = len(initcode_bytes)
+
+        factory_code = Op.MSTORE(
+            0, Op.PUSH32(initcode_bytes.rjust(32, b"\x00"))
+        ) + Op.CREATE(
+            value=contract_balance, offset=32 - initcode_len, size=initcode_len
+        )
+
+        factory = pre.deploy_contract(
+            factory_code, balance=contract_balance * 3
+        )
+        created = [
+            compute_create_address(address=factory, nonce=n)
+            for n in range(1, 4)
+        ]
+        targets = [factory] * 3
+
+        expected_logs = [
+            [],
+            [
+                transfer_log(factory, created[1], contract_balance),
+                burn_log(created[1], contract_balance),
+            ],
+            [
+                transfer_log(factory, created[2], contract_balance),
+                burn_log(created[2], contract_balance),
+            ],
+        ]
+        post: dict = {
+            sender: Account(nonce=3),
+            created[0]: Account.NONEXISTENT,
+            created[1]: Account.NONEXISTENT,
+            created[2]: Account.NONEXISTENT,
+        }
+    elif to_self:
+        targets = [
+            pre.deploy_contract(
+                Op.SELFDESTRUCT(Op.ADDRESS), balance=contract_balance
+            )
+            for _ in range(3)
+        ]
+        expected_logs = [[], [], []]
+        post = {sender: Account(nonce=3)}
+    else:
+        beneficiary = pre.nonexistent_account()
+        targets = [
+            pre.deploy_contract(
+                Op.SELFDESTRUCT(beneficiary), balance=contract_balance
+            )
+            for _ in range(3)
+        ]
+        expected_logs = [
+            [],
+            [transfer_log(targets[1], beneficiary, contract_balance)],
+            [transfer_log(targets[2], beneficiary, contract_balance)],
+        ]
+        post = {
+            sender: Account(nonce=3),
+            beneficiary: Account(balance=contract_balance * 3),
+        }
+
+    blocks = [
+        Block(
+            timestamp=ts,
+            txs=[
+                Transaction(
+                    to=targets[i],
+                    sender=sender,
+                    gas_limit=200_000,
+                    expected_receipt=TransactionReceipt(logs=expected_logs[i]),
+                )
+            ],
+        )
+        for i, ts in enumerate([14_999, 15_000, 15_001])
+    ]
+
+    blockchain_test(pre=pre, blocks=blocks, post=post)
+
+
+@pytest.mark.valid_at_transition_to("EIP7708")
+def test_transfer_log_fork_transition(
+    blockchain_test: BlockchainTestFiller, pre: Alloc
+) -> None:
+    """
+    Test ETH transfer log behavior at fork transition.
+
+    Before Amsterdam: ETH transfers do NOT emit logs.
+    At/after Amsterdam: ETH transfers emit Transfer logs.
+    """
+    sender = pre.fund_eoa()
+    recipient = pre.nonexistent_account()
+
+    blocks = [
+        Block(
+            timestamp=14_999,
+            txs=[
+                Transaction(
+                    to=recipient,
+                    sender=sender,
+                    value=100,
+                    gas_limit=21_000,
+                    expected_receipt=TransactionReceipt(logs=[]),
+                )
+            ],
+        ),
+        Block(
+            timestamp=15_000,
+            txs=[
+                Transaction(
+                    to=recipient,
+                    sender=sender,
+                    value=100,
+                    gas_limit=21_000,
+                    expected_receipt=TransactionReceipt(
+                        logs=[transfer_log(sender, recipient, 100)]
+                    ),
+                )
+            ],
+        ),
+        Block(
+            timestamp=15_001,
+            txs=[
+                Transaction(
+                    to=recipient,
+                    sender=sender,
+                    value=100,
+                    gas_limit=21_000,
+                    expected_receipt=TransactionReceipt(
+                        logs=[transfer_log(sender, recipient, 100)]
+                    ),
+                )
+            ],
+        ),
+    ]
+
+    blockchain_test(
+        pre=pre,
+        blocks=blocks,
+        post={
+            recipient: Account(balance=300),
+        },
+    )
diff --git a/tests/amsterdam/eip7708_eth_transfer_logs/test_transfer_logs.py b/tests/amsterdam/eip7708_eth_transfer_logs/test_transfer_logs.py
new file mode 100644
index 00000000000..61c216406f8
--- /dev/null
+++ b/tests/amsterdam/eip7708_eth_transfer_logs/test_transfer_logs.py
@@ -0,0 +1,1533 @@
+"""
+Tests for EIP-7708 Transfer logs.
+
+Tests for the Transfer(address,address,uint256) log emitted when:
+- Nonzero-value-transferring transaction
+- Nonzero-value-transferring CALL
+- Nonzero-value-transferring SELFDESTRUCT to a different account
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Block,
+    BlockchainTestFiller,
+    Bytecode,
+    Bytes,
+    Environment,
+    Fork,
+    Initcode,
+    Op,
+    StateTestFiller,
+    Storage,
+    Transaction,
+    TransactionLog,
+    TransactionReceipt,
+    compute_create2_address,
+    compute_create_address,
+)
+from execution_testing.base_types import ZeroPaddedHexNumber
+
+from .spec import Spec, ref_spec_7708, transfer_log
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7708.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7708.version
+
+pytestmark = pytest.mark.valid_from("EIP7708")
+
+
+def test_simple_transfer_emits_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+) -> None:
+    """Test that a simple ETH transfer emits a transfer log."""
+    recipient = pre.nonexistent_account()
+
+    tx = Transaction(
+        sender=sender,
+        to=recipient,
+        value=1,
+        gas_limit=21_000,
+        expected_receipt=TransactionReceipt(
+            logs=[transfer_log(sender, recipient, 1)]
+        ),
+    )
+
+    post = {recipient: Account(balance=1)}
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+def test_transfer_to_delegated_account_emits_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+) -> None:
+    """
+    Test that transfer to EIP-7702 delegated account emits correct log.
+
+    The transfer log should show the EOA address as recipient,
+    not the delegation target address.
+    """
+    delegation_target = pre.deploy_contract(code=Op.STOP)
+    recipient = pre.fund_eoa(amount=0, delegation=delegation_target)
+
+    tx = Transaction(
+        sender=sender,
+        to=recipient,
+        value=1,
+        gas_limit=100_000,
+        expected_receipt=TransactionReceipt(
+            logs=[transfer_log(sender, recipient, 1)]
+        ),
+    )
+
+    post = {recipient: Account(balance=1)}
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+def test_transfer_to_self_no_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+) -> None:
+    """Test that a transaction sending value to self emits no transfer log."""
+    tx = Transaction(
+        sender=sender,
+        to=sender,
+        value=1,
+        gas_limit=21_000,
+        expected_receipt=TransactionReceipt(logs=[]),
+    )
+
+    state_test(env=env, pre=pre, post={}, tx=tx)
+
+
+def test_zero_value_transfer_no_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+) -> None:
+    """Test that a zero-value transfer does NOT emit a transfer log."""
+    recipient = pre.nonexistent_account()
+
+    tx = Transaction(
+        sender=sender,
+        to=recipient,
+        value=0,
+        gas_limit=21_000,
+        expected_receipt=TransactionReceipt(logs=[]),
+    )
+
+    state_test(env=env, pre=pre, post={}, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "tx_value,expect_log",
+    [
+        pytest.param(1000, True, id="with_value"),
+        pytest.param(0, False, id="zero_value"),
+    ],
+)
+def test_contract_creation_tx(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    fork: Fork,
+    tx_value: int,
+    expect_log: bool,
+) -> None:
+    """Test that contract creation transactions emit logs based on value."""
+    initcode = Op.RETURN(0, 0)
+    created_address = compute_create_address(address=sender, nonce=0)
+
+    expected_logs = (
+        [transfer_log(sender, created_address, tx_value)] if expect_log else []
+    )
+    gas_limit = 100_000
+    if fork.is_eip_enabled(8037):
+        gas_limit = 500_000
+    tx = Transaction(
+        sender=sender,
+        to=None,
+        value=tx_value,
+        gas_limit=gas_limit,
+        data=bytes(initcode),
+        expected_receipt=TransactionReceipt(logs=expected_logs),
+    )
+
+    post = {created_address: Account(balance=tx_value)} if tx_value > 0 else {}
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "collision_nonce,collision_code",
+    [
+        pytest.param(0, b"\x00", id="non_empty_code"),
+        pytest.param(1, b"", id="non_empty_nonce"),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_contract_creation_tx_collision(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    collision_nonce: int,
+    collision_code: bytes,
+) -> None:
+    """
+    Test that a contract-creating transaction with an address collision
+    emits no log.
+
+    Per EIP-7610, contract creation aborts when the target address already
+    has non-empty code or nonce. The collision check happens before any
+    value transfer, so EIP-7708 emits no Transfer log.
+    """
+    sender = pre.fund_eoa()
+    tx = Transaction(
+        sender=sender,
+        to=None,
+        value=1000,
+        gas_limit=200_000,
+        data=bytes(Op.RETURN(0, 0)),
+        expected_receipt=TransactionReceipt(logs=[]),
+    )
+
+    collision_address = tx.created_contract
+    pre[collision_address] = Account(
+        nonce=collision_nonce,
+        code=collision_code,
+    )
+
+    post = {
+        collision_address: Account(
+            nonce=collision_nonce,
+            code=collision_code,
+        ),
+    }
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.with_all_call_opcodes
+def test_call_opcodes_transfer_log_behavior(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    call_opcode: Op,
+) -> None:
+    """
+    Test ETH transfer log behavior across all call opcode contexts.
+
+    - CALL with value: emits log (caller -> callee)
+    - CALLCODE with value: emits log (caller -> caller) as self-transfer
+    - DELEGATECALL: no value parameter, no transfer log
+    - STATICCALL: no value parameter, no transfer log
+    """
+    callee = pre.deploy_contract(Op.STOP)
+
+    # Build the call based on opcode type
+    if call_opcode in [Op.CALL, Op.CALLCODE]:
+        # These opcodes have a value parameter
+        call_code = call_opcode(gas=100_000, address=callee, value=1)
+    else:
+        # DELEGATECALL and STATICCALL don't have value parameter
+        call_code = call_opcode(gas=100_000, address=callee)
+
+    contract = pre.deploy_contract(call_code, balance=1)
+
+    # Determine expected logs based on opcode behavior
+    expected_logs = [transfer_log(sender, contract, 1)]
+
+    if call_opcode == Op.CALL:
+        # CALL transfers value from contract to callee
+        expected_logs.append(transfer_log(contract, callee, 1))
+        post = {callee: Account(balance=1)}
+    elif call_opcode == Op.CALLCODE:
+        # CALLCODE transfers value but stays in caller's context.
+        # This is a self-transfer (contract -> contract), so no transfer
+        # log per EIP-7708 ("CALL to a different account").
+        post = {}
+    else:
+        # DELEGATECALL and STATICCALL: no value transfer, no additional log
+        post = {}
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        value=1,
+        gas_limit=200_000,
+        expected_receipt=TransactionReceipt(logs=expected_logs),
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.with_all_call_opcodes(
+    selector=lambda call_opcode: call_opcode in (Op.CALL, Op.CALLCODE)
+)
+def test_call_opcodes_insufficient_balance_no_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    call_opcode: Op,
+) -> None:
+    """
+    Test CALL/CALLCODE with value exceeding caller balance.
+
+    The opcode returns 0 (does not revert), transfers nothing, and emits
+    no transfer log.
+
+    Note CALLCODE never emits a transfer log regardless
+    of balance — it's a self-transfer exempted by EIP-7708 — so for that
+    opcode the meaningful assertion is that the return value is 0.
+    """
+    caller_balance = 1
+    attempted_value = 100
+    callee = pre.deploy_contract(Op.STOP)
+
+    contract_code = Op.SSTORE(
+        0, call_opcode(gas=100_000, address=callee, value=attempted_value)
+    )
+    contract = pre.deploy_contract(contract_code, balance=caller_balance)
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        value=0,
+        gas_limit=200_000,
+        expected_receipt=TransactionReceipt(logs=[]),
+    )
+
+    post = {
+        contract: Account(storage={0: 0}, balance=caller_balance),
+        callee: Account(balance=0),
+    }
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+def test_delegatecall_inner_call_with_value(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+) -> None:
+    """
+    Test DELEGATECALL to code that performs CALL with value.
+
+    Scenario: A DELEGATECALLs B, B does CALL with value to C.
+    The CALL from B executes in A's context, so log shows A as sender.
+    """
+    recipient = pre.deploy_contract(Op.STOP)
+
+    # B: code that CALLs recipient with value
+    code_b = Op.CALL(gas=50_000, address=recipient, value=1)
+    contract_b = pre.deploy_contract(code_b)
+
+    # A: DELEGATECALLs to B (executes B's code in A's context)
+    code_a = Op.DELEGATECALL(gas=100_000, address=contract_b)
+    contract_a = pre.deploy_contract(code_a, balance=1)
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_a,
+        value=0,
+        gas_limit=200_000,
+        expected_receipt=TransactionReceipt(
+            logs=[
+                # CALL from B executes in A's context, so A is the sender
+                transfer_log(contract_a, recipient, 1),
+            ]
+        ),
+    )
+
+    post = {recipient: Account(balance=1)}
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "create_value",
+    [
+        pytest.param(1, id="with_value"),
+        pytest.param(0, id="zero_value"),
+    ],
+)
+@pytest.mark.with_all_create_opcodes
+def test_create_opcode_emits_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    fork: Fork,
+    create_opcode: Op,
+    create_value: int,
+) -> None:
+    """Test that CREATE/CREATE2 opcodes emit logs based on value."""
+    initcode = Op.RETURN(0, 0)
+    initcode_len = len(initcode)
+
+    contract_code = Op.MSTORE(
+        0, Op.PUSH32(bytes(initcode).rjust(32, b"\x00"))
+    ) + Op.SSTORE(
+        0,
+        create_opcode(
+            value=create_value, offset=32 - initcode_len, size=initcode_len
+        ),
+    )
+    contract = pre.deploy_contract(contract_code, balance=create_value)
+    created_address = compute_create_address(
+        address=contract,
+        nonce=1,
+        salt=0,
+        initcode=bytes(initcode),
+        opcode=create_opcode,
+    )
+
+    expected_logs = [transfer_log(sender, contract, 1)]
+    if create_value > 0:
+        expected_logs.append(
+            transfer_log(contract, created_address, create_value)
+        )
+
+    gas_limit = 200_000
+    if fork.is_eip_enabled(8037):
+        gas_limit = 1_000_000
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        value=1,
+        gas_limit=gas_limit,
+        expected_receipt=TransactionReceipt(logs=expected_logs),
+    )
+
+    post = {created_address: Account(balance=create_value)}
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.with_all_create_opcodes
+def test_initcode_calls_with_value(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    create_opcode: Op,
+) -> None:
+    """
+    Test that CALL with value during initcode emits correct log.
+
+    Initcode performs CALL with value before returning deployed code.
+    Log should show the being-created contract as sender.
+    """
+    recipient = pre.deploy_contract(Op.STOP)
+
+    # Initcode: CALL recipient with value, then RETURN empty code
+    initcode = Op.CALL(gas=50_000, address=recipient, value=1) + Op.RETURN(
+        0, 0
+    )
+    initcode_bytes = bytes(initcode)
+
+    # Use Initcode helper or direct memory setup for longer initcode
+    if create_opcode == Op.CREATE:
+        # Store initcode in memory using code copy approach
+        factory_code = (
+            Op.CODECOPY(
+                0,
+                Op.SUB(Op.CODESIZE, len(initcode_bytes)),
+                len(initcode_bytes),
+            )
+            + Op.CREATE(value=1, offset=0, size=len(initcode_bytes))
+            + Op.STOP
+        ) + initcode
+    else:
+        factory_code = (
+            Op.CODECOPY(
+                0,
+                Op.SUB(Op.CODESIZE, len(initcode_bytes)),
+                len(initcode_bytes),
+            )
+            + Op.CREATE2(value=1, offset=0, size=len(initcode_bytes), salt=0)
+            + Op.STOP
+        ) + initcode
+
+    factory = pre.deploy_contract(factory_code, balance=2)
+
+    # Compute created address
+    if create_opcode == Op.CREATE:
+        created_address = compute_create_address(address=factory, nonce=1)
+    else:
+        created_address = compute_create2_address(
+            address=factory, salt=0, initcode=initcode_bytes
+        )
+
+    tx = Transaction(
+        sender=sender,
+        to=factory,
+        value=0,
+        gas_limit=300_000,
+        expected_receipt=TransactionReceipt(
+            logs=[
+                # CREATE transfers value to new contract
+                transfer_log(factory, created_address, 1),
+                # Initcode CALLs recipient with value
+                transfer_log(created_address, recipient, 1),
+            ]
+        ),
+    )
+
+    post = {recipient: Account(balance=1)}
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+def test_create_initcode_stop_emits_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+) -> None:
+    """
+    Test that CREATE with initcode using STOP (no RETURN) emits transfer log.
+
+    When initcode runs STOP instead of RETURN, the contract is created with
+    empty code. This is a successful CREATE, so transfer log should be emitted.
+    """
+    contract_code = Op.MSTORE(
+        0, Op.PUSH32(bytes(Op.STOP).rjust(32, b"\x00"))
+    ) + Op.CREATE(value=1, offset=31, size=1)
+    contract = pre.deploy_contract(contract_code, balance=1)
+
+    created_address = compute_create_address(address=contract, nonce=1)
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        value=0,
+        gas_limit=500_000,
+        expected_receipt=TransactionReceipt(
+            logs=[transfer_log(contract, created_address, 1)]
+        ),
+    )
+
+    post = {created_address: Account(balance=1, code=b"")}
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "initcode",
+    [
+        pytest.param(Op.REVERT(0, 0), id="initcode_reverts"),
+        pytest.param(Op.INVALID, id="initcode_invalid"),
+    ],
+)
+def test_failed_create_with_value_no_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    initcode: Bytecode,
+) -> None:
+    """
+    Test that failed CREATE with value does NOT emit transfer log.
+
+    When initcode fails (REVERT, INVALID), the value transfer is reverted
+    and no log should be emitted for the CREATE.
+    """
+    initcode_len = len(initcode)
+    contract_code = Op.MSTORE(
+        0, Op.PUSH32(bytes(initcode).rjust(32, b"\x00"))
+    ) + Op.SSTORE(0, Op.CREATE(1, 32 - initcode_len, initcode_len))
+    contract = pre.deploy_contract(contract_code, balance=1)
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        value=1,
+        gas_limit=500_000,
+        expected_receipt=TransactionReceipt(
+            logs=[transfer_log(sender, contract, 1)]
+        ),
+    )
+
+    state_test(env=env, pre=pre, post={}, tx=tx)
+
+
+def test_create_insufficient_balance_no_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+) -> None:
+    """
+    Test that CREATE with insufficient balance does NOT emit transfer log.
+
+    Contract receives 1, tries to CREATE with 1000 value - CREATE fails
+    (returns 0) but doesn't halt, so tx-level log remains.
+    """
+    initcode = Op.RETURN(0, 0)
+    initcode_len = len(initcode)
+    contract_code = Op.MSTORE(
+        0, Op.PUSH32(bytes(initcode).rjust(32, b"\x00"))
+    ) + Op.SSTORE(0, Op.CREATE(1000, 32 - initcode_len, initcode_len))
+    contract = pre.deploy_contract(contract_code, balance=0)
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        value=1,
+        gas_limit=500_000,
+        expected_receipt=TransactionReceipt(
+            logs=[transfer_log(sender, contract, 1)]
+        ),
+    )
+
+    state_test(env=env, pre=pre, post={}, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "initcode",
+    [
+        pytest.param(
+            # OOG before return
+            Op.MSTORE(offset=0xFFFFFF, value=0) + Op.RETURN(0, 0),
+            id="create_out_of_gas_memory_expansion",
+        ),
+        pytest.param(
+            # Invalid opcode
+            Op.INVALID + Op.RETURN(0, 0),
+            id="invalid_opcode",
+        ),
+        pytest.param(
+            # OOG during code deposit payment (200 gas/byte for returned code)
+            # Returns 1000 bytes which costs 200,000 gas for code deposit
+            Op.RETURN(0, 1000),
+            id="create_out_of_gas_code_deposit",
+        ),
+    ],
+)
+def test_create_out_of_gas_no_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    fork: Fork,
+    initcode: Bytecode,
+) -> None:
+    """Test that CREATE running out of gas does NOT emit transfer log."""
+    tx_value = 1000
+    gas_limit = 100_000
+    if fork.is_eip_enabled(8037):
+        gas_limit = 500_000
+    create_value = 500
+    contract_code = Op.CALLDATACOPY(
+        dest_offset=0,
+        offset=0,
+        size=Op.CALLDATASIZE,
+    ) + Op.CREATE(value=create_value, offset=0, size=Op.CALLDATASIZE)
+    contract = pre.deploy_contract(contract_code)
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        data=initcode,
+        value=tx_value,
+        gas_limit=gas_limit,
+        expected_receipt=TransactionReceipt(
+            logs=[transfer_log(sender, contract, tx_value)]
+        ),
+    )
+    state_test(env=env, pre=pre, post={}, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "contract_code",
+    [
+        pytest.param(
+            # CALL stack underflow: only push 6 items instead of 7
+            Op.PUSH1(0)
+            + Op.PUSH1(0)
+            + Op.PUSH1(0)
+            + Op.PUSH1(0)
+            + Op.PUSH1(100)
+            + Op.PUSH2(0x1234)
+            + Op.CALL,
+            id="call_stack_underflow",
+        ),
+        pytest.param(
+            # CREATE stack underflow: only push 2 items instead of 3
+            Op.PUSH1(0) + Op.PUSH1(0) + Op.CREATE,
+            id="create_stack_underflow",
+        ),
+    ],
+)
+def test_stack_underflow_no_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    contract_code: Bytecode,
+) -> None:
+    """Test that stack underflow during CALL/CREATE does NOT emit log."""
+    contract = pre.deploy_contract(contract_code, balance=1000)
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        value=1000,
+        gas_limit=100_000,
+        expected_receipt=TransactionReceipt(logs=[]),  # TX fails, no logs
+    )
+
+    state_test(env=env, pre=pre, post={}, tx=tx)
+
+
+@pytest.mark.pre_alloc_mutable
+@pytest.mark.with_all_create_opcodes
+def test_create_collision_no_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    create_opcode: Op,
+) -> None:
+    """
+    Test that CREATE/CREATE2 collision does not emit transfer log.
+
+    When CREATE fails because target address already has code/nonce,
+    no value transfer occurs and no log should be emitted.
+    """
+    initcode = Op.RETURN(0, 0)
+    initcode_bytes = bytes(initcode)
+    initcode_len = len(initcode_bytes)
+
+    # Deploy factory first to compute created address
+    if create_opcode == Op.CREATE:
+        factory_code = Op.MSTORE(
+            0, Op.PUSH32(initcode_bytes.rjust(32, b"\x00"))
+        ) + Op.CREATE(value=1, offset=32 - initcode_len, size=initcode_len)
+    else:
+        factory_code = Op.MSTORE(
+            0, Op.PUSH32(initcode_bytes.rjust(32, b"\x00"))
+        ) + Op.CREATE2(
+            value=1, offset=32 - initcode_len, size=initcode_len, salt=0
+        )
+
+    factory = pre.deploy_contract(factory_code, balance=1)
+
+    # Compute and pre-populate the collision address
+    if create_opcode == Op.CREATE:
+        collision_address = compute_create_address(address=factory, nonce=1)
+    else:
+        collision_address = compute_create2_address(
+            address=factory, salt=0, initcode=initcode_bytes
+        )
+
+    # Pre-deploy contract at collision address to cause collision
+    pre.deploy_contract(Op.STOP, address=collision_address)
+
+    tx = Transaction(
+        sender=sender,
+        to=factory,
+        value=0,
+        gas_limit=200_000,
+        expected_receipt=TransactionReceipt(
+            logs=[]
+        ),  # No logs - CREATE failed
+    )
+
+    state_test(env=env, pre=pre, post={}, tx=tx)
+
+
+def test_selfdestruct_with_value_emits_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    fork: Fork,
+    sender: EOA,
+) -> None:
+    """Test that SELFDESTRUCT with value emits a transfer log."""
+    beneficiary = pre.nonexistent_account()
+    contract_balance = 2000
+
+    contract_code = Op.SELFDESTRUCT(beneficiary)
+    contract = pre.deploy_contract(contract_code, balance=contract_balance)
+
+    gas_limit = 100_000
+    if fork.is_eip_enabled(8037):
+        gas_limit = 500_000
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        value=0,
+        gas_limit=gas_limit,
+        expected_receipt=TransactionReceipt(
+            logs=[transfer_log(contract, beneficiary, contract_balance)]
+        ),
+    )
+
+    post = {beneficiary: Account(balance=contract_balance)}
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+def test_selfdestruct_to_system_address(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    fork: Fork,
+) -> None:
+    """
+    Test SELFDESTRUCT sending ETH to the EIP-7708 system address.
+
+    Edge case: beneficiary is the same address (0xff...fe) that emits logs.
+    """
+    contract_code = Op.SELFDESTRUCT(Spec.SYSTEM_ADDRESS)
+    contract = pre.deploy_contract(contract_code, balance=1)
+
+    gas_limit = 100_000
+    if fork.is_eip_enabled(8037):
+        gas_limit = 500_000
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        value=0,
+        gas_limit=gas_limit,
+        expected_receipt=TransactionReceipt(
+            logs=[transfer_log(contract, Spec.SYSTEM_ADDRESS, 1)]
+        ),
+    )
+
+    post = {Spec.SYSTEM_ADDRESS: Account(balance=1)}
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "op_type",
+    [
+        pytest.param("call", id="call"),
+        pytest.param("selfdestruct", id="selfdestruct"),
+    ],
+)
+def test_zero_value_operations_no_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    op_type: str,
+) -> None:
+    """Test that zero-value operations do NOT emit transfer logs."""
+    target = pre.nonexistent_account()
+
+    if op_type == "call":
+        contract_code = Op.CALL(gas=100_000, address=target, value=0)
+    else:
+        contract_code = Op.SELFDESTRUCT(target)
+
+    contract = pre.deploy_contract(contract_code, balance=0)
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        value=0,
+        gas_limit=100_000,
+        expected_receipt=TransactionReceipt(logs=[]),
+    )
+
+    state_test(env=env, pre=pre, post={}, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "call_opcode",
+    [
+        pytest.param(Op.CALL, id="call"),
+        pytest.param(Op.CALLCODE, id="callcode"),
+    ],
+)
+def test_call_to_self_no_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    call_opcode: Op,
+) -> None:
+    """
+    Test that CALL/CALLCODE with value to self emits no transfer log.
+
+    Uses CALLDATASIZE to detect recursion: external call has no calldata,
+    recursive call passes 1 byte of calldata to signal stop.
+    """
+    # CALLDATASIZE > 0 means recursive call, jump to end
+    # Byte offsets: CALLDATASIZE(1) + PUSH1(2) + JUMPI(1) = 4
+    # CALL with args_size=1: ~16 bytes, JUMPDEST at offset 20
+    contract_code = (
+        Op.CALLDATASIZE
+        + Op.PUSH1(20)
+        + Op.JUMPI
+        + call_opcode(gas=100_000, address=Op.ADDRESS, value=1, args_size=1)
+        + Op.JUMPDEST
+        + Op.STOP
+    )
+    contract = pre.deploy_contract(contract_code, balance=1)
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        value=0,
+        gas_limit=200_000,
+        expected_receipt=TransactionReceipt(logs=[]),
+    )
+
+    state_test(env=env, pre=pre, post={}, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "recipient_code,call_gas,call_value,recipient_balance,contract_balance",
+    [
+        pytest.param(Op.REVERT(0, 0), 50_000, 500, 0, 500, id="call_reverted"),
+        pytest.param(Op.JUMP(0), 100, 500, 0, 500, id="call_out_of_gas"),
+        pytest.param(
+            # OOG with memory expansion - tries to access large memory offset
+            Op.MSTORE(0xFFFFFF, 0) + Op.STOP,
+            1000,
+            500,
+            0,
+            500,
+            id="call_out_of_gas_memory_expansion",
+        ),
+        pytest.param(
+            Op.SELFDESTRUCT(Address(0x1234)),
+            100,
+            0,
+            2000,
+            0,
+            id="selfdestruct_out_of_gas",
+        ),
+        pytest.param(
+            Op.STOP,
+            50_000,
+            2000,
+            0,
+            0,
+            id="call_insufficient_balance",
+        ),
+    ],
+)
+def test_failed_inner_operation_no_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    recipient_code: Bytecode,
+    call_gas: int,
+    call_value: int,
+    recipient_balance: int,
+    contract_balance: int,
+) -> None:
+    """Test that failed inner operations do NOT emit transfer logs."""
+    recipient = pre.deploy_contract(recipient_code, balance=recipient_balance)
+    tx_value = 1000
+
+    contract_code = Op.CALL(
+        gas=call_gas,
+        address=recipient,
+        value=call_value,
+    )
+    contract = pre.deploy_contract(contract_code, balance=contract_balance)
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        value=tx_value,
+        gas_limit=100_000,
+        expected_receipt=TransactionReceipt(
+            logs=[transfer_log(sender, contract, tx_value)]
+        ),
+    )
+
+    state_test(env=env, pre=pre, post={}, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "inner_calls",
+    [
+        pytest.param(1, id="single_call"),
+        pytest.param(3, id="multiple_calls"),
+    ],
+)
+def test_inner_call_succeeds_outer_reverts_no_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    inner_calls: int,
+) -> None:
+    """
+    Test that logs from successful inner calls are rolled back on outer revert.
+
+    Scenario: Contract performs N CALLs with value (all succeed), then REVERTs.
+    Expected: No logs remain (all transfer logs are rolled back).
+    """
+    callee = pre.deploy_contract(Op.STOP)
+
+    # Build contract code: N CALLs with value, then REVERT
+    contract_code = Op.CALL(gas=100_000, address=callee, value=1)
+    for _ in range(inner_calls - 1):
+        contract_code += Op.POP + Op.CALL(gas=100_000, address=callee, value=1)
+    contract_code += Op.POP + Op.REVERT(0, 0)
+
+    contract = pre.deploy_contract(contract_code, balance=inner_calls)
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        value=1,
+        gas_limit=500_000,
+        expected_receipt=TransactionReceipt(logs=[]),
+    )
+
+    state_test(env=env, pre=pre, post={}, tx=tx)
+
+
+@pytest.mark.with_all_create_opcodes
+def test_inner_create_succeeds_outer_reverts_no_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    fork: Fork,
+    create_opcode: Op,
+) -> None:
+    """
+    Test that a CREATE/CREATE2 transfer log is rolled back on outer revert.
+
+    The factory CREATE/CREATE2s a child with value (the deployment succeeds
+    and a `factory -> created` log is emitted in the child frame), then the
+    factory itself REVERTs. Per EIP-7708 the rollback semantics mirror those
+    of CALL: the child log is discarded together with the rest of the
+    factory's frame, so the transaction receipt records no logs.
+    """
+    create_value = 1
+    initcode = Op.RETURN(0, 0)
+    initcode_len = len(initcode)
+
+    factory_code = (
+        Op.MSTORE(0, Op.PUSH32(bytes(initcode).rjust(32, b"\x00")))
+        + Op.MSTORE(
+            32,
+            create_opcode(
+                value=create_value,
+                offset=32 - initcode_len,
+                size=initcode_len,
+            ),
+        )
+        + Op.REVERT(32, 32)
+    )
+    factory = pre.deploy_contract(factory_code, balance=create_value)
+
+    entry_storage = Storage()
+    expected_create_address = compute_create_address(
+        address=factory,
+        nonce=1,
+        salt=0,
+        initcode=initcode,
+        opcode=create_opcode,
+    )
+    entry_code = Op.CALL(
+        address=factory, ret_offset=0, ret_size=32
+    ) + Op.SSTORE(
+        entry_storage.store_next(expected_create_address), Op.MLOAD(0)
+    )
+    entry = pre.deploy_contract(entry_code)
+
+    gas_limit = 200_000
+    if fork.is_eip_enabled(8037):
+        gas_limit = 1_000_000
+
+    tx = Transaction(
+        sender=sender,
+        to=entry,
+        value=0,
+        gas_limit=gas_limit,
+        expected_receipt=TransactionReceipt(logs=[]),
+    )
+
+    state_test(
+        env=env,
+        pre=pre,
+        post={entry: Account(storage=entry_storage)},
+        tx=tx,
+    )
+
+
+@pytest.mark.parametrize(
+    "call_depth",
+    [
+        pytest.param(2, id="depth_2"),
+        pytest.param(3, id="depth_3"),
+        pytest.param(10, id="depth_10"),
+    ],
+)
+def test_nested_calls_log_order(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    call_depth: int,
+) -> None:
+    """Test that nested CALLs emit transfer logs in chronological order."""
+    transfer_value = 100
+    tx_value = 1000
+
+    # Build the chain from innermost outward by prepending each new caller.
+    # Once finished, accounts[0] is the entry contract (the tx target) and
+    # accounts[-1] is the final recipient.
+    accounts: list[Address] = [pre.nonexistent_account()]
+    for _ in range(call_depth):
+        contract_code = Op.SSTORE(
+            0,
+            Op.CALL(gas=500_000, address=accounts[0], value=transfer_value),
+        )
+        accounts.insert(
+            0, pre.deploy_contract(contract_code, balance=transfer_value)
+        )
+
+    entry_contract = accounts[0]
+    final_recipient = accounts[-1]
+
+    expected_logs: list[TransactionLog] = [
+        transfer_log(sender, entry_contract, tx_value)
+    ]
+    for i in range(call_depth):
+        expected_logs.append(
+            transfer_log(accounts[i], accounts[i + 1], transfer_value)
+        )
+
+    tx = Transaction(
+        sender=sender,
+        to=entry_contract,
+        value=tx_value,
+        gas_limit=1_000_000,
+        expected_receipt=TransactionReceipt(logs=expected_logs),
+    )
+
+    post: dict[Address, Account] = {
+        final_recipient: Account(balance=transfer_value)
+    }
+    for chain_contract in accounts[:-1]:
+        post[chain_contract] = Account(storage={0: 1})
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+def test_contract_log_and_transfer_ordering(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+) -> None:
+    """
+    Test log ordering between contract-emitted logs and transfer logs.
+
+    Scenario: Contract emits LOG0, then CALLs with value.
+    Expected order: tx transfer log, contract LOG0, CALL transfer log.
+    """
+    callee = pre.deploy_contract(Op.STOP)
+
+    # Contract emits LOG0, then CALLs callee with value
+    contract_code = (
+        Op.MSTORE(0, 0xDEADBEEF)
+        + Op.LOG0(offset=0, size=32)  # Emit LOG0 with data
+        + Op.CALL(gas=50_000, address=callee, value=1)
+    )
+    contract = pre.deploy_contract(contract_code, balance=1)
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        value=1,
+        gas_limit=200_000,
+        expected_receipt=TransactionReceipt(
+            logs=[
+                # 1. TX-level transfer
+                transfer_log(sender, contract, 1),
+                # 2. Contract LOG0 (emitted before CALL)
+                TransactionLog(
+                    address=contract,
+                    topics=[],
+                    data=Bytes((0xDEADBEEF).to_bytes(32, "big")),
+                ),
+                # 3. CALL transfer (emitted during CALL)
+                transfer_log(contract, callee, 1),
+            ]
+        ),
+    )
+
+    post = {callee: Account(balance=1)}
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "reverting_code",
+    [
+        pytest.param(Op.REVERT(0, 0), id="revert"),
+        pytest.param(Op.INVALID, id="invalid_opcode"),
+        pytest.param(Op.ADD, id="stack_underflow"),
+        pytest.param(Op.MSTORE(2**256 - 1, 0), id="out_of_gas"),
+    ],
+)
+def test_reverted_transaction_no_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    reverting_code: Bytecode,
+) -> None:
+    """Test that a failed transaction does NOT emit a transfer log."""
+    contract = pre.deploy_contract(reverting_code)
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        value=1000,
+        gas_limit=100_000,
+        expected_receipt=TransactionReceipt(logs=[]),
+    )
+
+    state_test(env=env, pre=pre, post={}, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "address_type",
+    [
+        pytest.param("ecrecover", id="precompile_ecrecover"),
+        pytest.param("sha256", id="precompile_sha256"),
+        pytest.param("system", id="system_address"),
+        pytest.param("coinbase", id="coinbase_address"),
+    ],
+)
+def test_transfer_to_special_address(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    address_type: str,
+) -> None:
+    """Test that transfers to special addresses emit transfer logs."""
+    transfer_amount = 1000
+
+    # Resolve target address based on type
+    # Note: blake2f (0x09) excluded as it requires specific input format
+    address_map = {
+        "ecrecover": Address(0x01),
+        "sha256": Address(0x02),
+        "system": Spec.SYSTEM_ADDRESS,
+    }
+
+    if address_type == "coinbase":
+        target = env.fee_recipient
+        # Don't check exact balance - coinbase also receives gas fees
+        post = {}
+    else:
+        target = address_map[address_type]
+        post = {target: Account(balance=transfer_amount)}
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        value=transfer_amount,
+        gas_limit=100_000,
+        expected_receipt=TransactionReceipt(
+            logs=[transfer_log(sender, target, transfer_amount)]
+        ),
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.with_all_typed_transactions
+def test_transfer_with_all_tx_types(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    typed_transaction: Transaction,
+) -> None:
+    """Test that ETH transfers emit logs for all transaction types."""
+    recipient = pre.nonexistent_account()
+    transfer_amount = 1000
+
+    tx = typed_transaction.copy(
+        to=recipient,
+        value=transfer_amount,
+        expected_receipt=TransactionReceipt(
+            logs=[transfer_log(sender, recipient, transfer_amount)]
+        ),
+    )
+
+    post = {recipient: Account(balance=transfer_amount)}
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+def test_multiple_transfers_same_block(
+    blockchain_test: BlockchainTestFiller, pre: Alloc
+) -> None:
+    """
+    Test that multiple transfers in the same block have independent logs.
+
+    Each transaction should have its own transfer log in its receipt,
+    verifying logs don't bleed across transactions.
+    """
+    sender = pre.fund_eoa()
+    recipient1 = pre.nonexistent_account()
+    recipient2 = pre.nonexistent_account()
+
+    blocks = [
+        Block(
+            txs=[
+                Transaction(
+                    to=recipient1,
+                    sender=sender,
+                    nonce=0,
+                    value=100,
+                    gas_limit=21_000,
+                    expected_receipt=TransactionReceipt(
+                        logs=[transfer_log(sender, recipient1, 100)]
+                    ),
+                ),
+                Transaction(
+                    to=recipient2,
+                    sender=sender,
+                    nonce=1,
+                    value=200,
+                    gas_limit=21_000,
+                    expected_receipt=TransactionReceipt(
+                        logs=[transfer_log(sender, recipient2, 200)]
+                    ),
+                ),
+            ],
+        ),
+    ]
+
+    blockchain_test(
+        pre=pre,
+        blocks=blocks,
+        post={
+            recipient1: Account(balance=100),
+            recipient2: Account(balance=200),
+        },
+    )
+
+
+def test_selfdestruct_then_transfer_same_block(
+    blockchain_test: BlockchainTestFiller, pre: Alloc, fork: Fork
+) -> None:
+    """
+    Test transfer to address that selfdestructed earlier in the same block.
+
+    Tx1: Contract selfdestructs, sending balance to beneficiary.
+    Tx2: Transfer to the contract triggers SELFDESTRUCT again (code not deleted
+         per EIP-6780), sending the received value to beneficiary.
+
+    Expected logs:
+    - Tx1: contract -> beneficiary (500)
+    - Tx2: sender -> contract (100) + contract -> beneficiary (100)
+    """
+    sender = pre.fund_eoa()
+    beneficiary = pre.nonexistent_account()
+
+    contract_code = Op.SELFDESTRUCT(beneficiary)
+    contract = pre.deploy_contract(contract_code, balance=500)
+
+    gas_limit = 100_000
+    if fork.is_eip_enabled(8037):
+        gas_limit = 500_000
+
+    blocks = [
+        Block(
+            txs=[
+                Transaction(
+                    to=contract,
+                    sender=sender,
+                    nonce=0,
+                    value=0,
+                    gas_limit=gas_limit,
+                    expected_receipt=TransactionReceipt(
+                        logs=[transfer_log(contract, beneficiary, 500)]
+                    ),
+                ),
+                Transaction(
+                    to=contract,
+                    sender=sender,
+                    nonce=1,
+                    value=100,
+                    gas_limit=gas_limit,
+                    expected_receipt=TransactionReceipt(
+                        logs=[
+                            transfer_log(sender, contract, 100),
+                            transfer_log(contract, beneficiary, 100),
+                        ]
+                    ),
+                ),
+            ],
+        ),
+    ]
+
+    blockchain_test(
+        pre=pre,
+        blocks=blocks,
+        post={
+            beneficiary: Account(balance=600),
+            contract: Account(balance=0),
+        },
+    )
+
+
+def test_selfdestruct_to_self_cross_tx_no_log(
+    blockchain_test: BlockchainTestFiller, pre: Alloc
+) -> None:
+    """
+    Test that selfdestruct-to-self in a cross-tx context emits no log.
+
+    A contract created in Tx1 is not in created_accounts during Tx2.
+    Selfdestruct-to-self in Tx2 emits no log per EIP-7708: no Burn
+    log (not same-tx) and no Transfer log (not a different account).
+
+    Tx1: Contract creation tx (to=None) deploying SELFDESTRUCT(ADDRESS),
+         value=2000. Logs: [transfer_log(sender, created, 2000)]
+    Tx2: Call created contract directly, value=0. Logs: []
+    Post: contract keeps balance (not deleted, not in created_accounts in Tx2)
+    """
+    contract_balance = 2000
+    sender = pre.fund_eoa()
+
+    runtime_code = Op.SELFDESTRUCT(Op.ADDRESS)
+    initcode = Initcode(deploy_code=runtime_code)
+
+    # Calculate the address that will be created by the first tx
+    created_address = compute_create_address(address=sender, nonce=0)
+
+    blocks = [
+        Block(
+            txs=[
+                # Tx1: Create the contract directly via contract creation tx
+                Transaction(
+                    to=None,
+                    sender=sender,
+                    nonce=0,
+                    value=contract_balance,
+                    data=bytes(initcode),
+                    gas_limit=300_000,
+                    expected_receipt=TransactionReceipt(
+                        logs=[
+                            transfer_log(
+                                sender, created_address, contract_balance
+                            ),
+                        ]
+                    ),
+                ),
+                # Tx2: Call the created contract directly (cross-tx)
+                Transaction(
+                    to=created_address,
+                    sender=sender,
+                    nonce=1,
+                    value=0,
+                    gas_limit=100_000,
+                    expected_receipt=TransactionReceipt(logs=[]),
+                ),
+            ],
+        ),
+    ]
+
+    blockchain_test(
+        pre=pre,
+        blocks=blocks,
+        post={
+            # Contract keeps balance: not deleted since not in
+            # created_accounts during Tx2
+            created_address: Account(balance=contract_balance),
+        },
+    )
+
+
+def test_call_to_delegated_account_with_value(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+) -> None:
+    """
+    Test CALL opcode to 7702 delegated account with value.
+
+    Unlike simple tx transfer, CALL to delegated account executes the
+    delegated code. The transfer log should show the EOA as recipient.
+    """
+    delegation_target = pre.deploy_contract(code=Op.STOP)
+    delegated_eoa = pre.fund_eoa(amount=0, delegation=delegation_target)
+
+    caller_code = Op.CALL(gas=50_000, address=delegated_eoa, value=100)
+    caller = pre.deploy_contract(caller_code, balance=100)
+
+    tx = Transaction(
+        sender=sender,
+        to=caller,
+        value=0,
+        gas_limit=200_000,
+        expected_receipt=TransactionReceipt(
+            logs=[transfer_log(caller, delegated_eoa, 100)]
+        ),
+    )
+
+    post = {delegated_eoa: Account(balance=100)}
+    state_test(env=env, pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.execute(pytest.mark.skip("Requires specific base fee"))
+def test_call_with_value_to_coinbase_no_priority_fee_log(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    sender: EOA,
+    fork: Fork,
+) -> None:
+    """
+    Verify no Transfer log is emitted for the coinbase priority fee.
+
+    A contract executes CALL with nonzero value to the coinbase address,
+    and the transaction pays a nonzero priority fee to that same
+    coinbase. Only the CALL-with-value must produce a Transfer log; the
+    priority fee crediting happens outside the EVM as a protocol-level
+    balance change and must not emit a log.
+
+    An implementation that hooks all balance additions (instead of only
+    CALL / SELFDESTRUCT / tx-level value transfers) would emit an extra
+    Transfer log for the fee and fail the exact-log assertion.
+    """
+    coinbase = env.fee_recipient
+    call_value = 1
+
+    caller_code = Op.CALL(gas=Op.GAS, address=coinbase, value=call_value)
+    caller = pre.deploy_contract(caller_code, balance=call_value)
+    env.base_fee_per_gas = ZeroPaddedHexNumber(7)
+    max_fee_per_gas = int(env.base_fee_per_gas) * 2
+    tx = Transaction(
+        sender=sender,
+        to=caller,
+        value=0,
+        gas_limit=fork.transaction_gas_limit_cap(),
+        max_fee_per_gas=max_fee_per_gas,
+        max_priority_fee_per_gas=max_fee_per_gas,
+        expected_receipt=TransactionReceipt(
+            logs=[transfer_log(caller, coinbase, call_value)]
+        ),
+    )
+
+    state_test(env=env, pre=pre, post={}, tx=tx)
diff --git a/tests/amsterdam/eip7778_block_gas_accounting_without_refunds/__init__.py b/tests/amsterdam/eip7778_block_gas_accounting_without_refunds/__init__.py
new file mode 100644
index 00000000000..fcecd89390c
--- /dev/null
+++ b/tests/amsterdam/eip7778_block_gas_accounting_without_refunds/__init__.py
@@ -0,0 +1 @@
+"""Tests for [EIP-7778: Block Gas Accounting without Refunds](https://eips.ethereum.org/EIPS/eip-7778)."""
diff --git a/tests/amsterdam/eip7778_block_gas_accounting_without_refunds/eip_checklist_external_coverage.txt b/tests/amsterdam/eip7778_block_gas_accounting_without_refunds/eip_checklist_external_coverage.txt
new file mode 100644
index 00000000000..eafb5d812a7
--- /dev/null
+++ b/tests/amsterdam/eip7778_block_gas_accounting_without_refunds/eip_checklist_external_coverage.txt
@@ -0,0 +1,2 @@
+general/code_coverage/eels = Please check https://app.codecov.io/gh/ethereum/execution-specs/pull/2840 for relevant test coverage
+general/code_coverage/test_coverage = Please run the test with `--cov` flag for final coverage
diff --git a/tests/amsterdam/eip7778_block_gas_accounting_without_refunds/eip_checklist_not_applicable.txt b/tests/amsterdam/eip7778_block_gas_accounting_without_refunds/eip_checklist_not_applicable.txt
new file mode 100644
index 00000000000..54926eee1f9
--- /dev/null
+++ b/tests/amsterdam/eip7778_block_gas_accounting_without_refunds/eip_checklist_not_applicable.txt
@@ -0,0 +1,17 @@
+opcode = EIP does not introduce a new opcode
+precompile = EIP does not introduce a new precompile
+removed_precompile = EIP does not remove a precompile
+system_contract = EIP does not introduce a new system contract
+transaction_type = EIP does not introduce a new transaction type
+block_header_field = EIP does not add any new block header fields
+block_body_field = EIP does not add any new block body fields
+gas_cost_changes = EIP does not modify per-operation gas costs
+gas_refunds_changes/test/refund_calculation/over = EIP does not change refund calculation, only block-level accounting
+gas_refunds_changes/test/refund_calculation/exact = EIP does not change refund calculation, only block-level accounting
+gas_refunds_changes/test/refund_calculation/under = EIP does not change refund calculation, only block-level accounting
+gas_refunds_changes/test/exceptional_abort/revertable = EIP does not change refund behavior on revertable aborts
+gas_refunds_changes/test/exceptional_abort/non_revertable = EIP does not change refund behavior on non-revertable aborts
+blob_count_changes = EIP does not introduce any blob count changes
+execution_layer_request = EIP does not introduce an execution layer request
+new_transaction_validity_constraint = EIP does not introduce a new transaction validity constraint
+modified_transaction_validity_constraint = EIP does not introduce a modified transaction validity constraint
\ No newline at end of file
diff --git a/tests/amsterdam/eip7778_block_gas_accounting_without_refunds/spec.py b/tests/amsterdam/eip7778_block_gas_accounting_without_refunds/spec.py
new file mode 100644
index 00000000000..ed60bde819c
--- /dev/null
+++ b/tests/amsterdam/eip7778_block_gas_accounting_without_refunds/spec.py
@@ -0,0 +1,24 @@
+"""Defines EIP-7778 specification constants and functions."""
+
+from dataclasses import dataclass
+
+
+@dataclass(frozen=True)
+class ReferenceSpec:
+    """Defines the reference spec version and git path."""
+
+    git_path: str
+    version: str
+
+
+ref_spec_7778 = ReferenceSpec(
+    "EIPS/eip-7778.md", "ce17d00b8341032a946301944124c4a6013032d6"
+)
+
+
+@dataclass(frozen=True)
+class Spec:
+    """
+    Parameters from the EIP-7778 specifications as defined at
+    https://eips.ethereum.org/EIPS/eip-7778.
+    """
diff --git a/tests/amsterdam/eip7778_block_gas_accounting_without_refunds/test_gas_accounting.py b/tests/amsterdam/eip7778_block_gas_accounting_without_refunds/test_gas_accounting.py
new file mode 100644
index 00000000000..dfead7f5006
--- /dev/null
+++ b/tests/amsterdam/eip7778_block_gas_accounting_without_refunds/test_gas_accounting.py
@@ -0,0 +1,652 @@
+"""
+Test cases for
+[EIP-7778 Block Gas Accounting without Refunds](https://eips.ethereum.org/EIPS/eip-7778).
+"""
+
+from enum import Enum
+from typing import Set, Tuple
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    AuthorizationTuple,
+    Block,
+    BlockchainTestFiller,
+    BlockException,
+    Bytecode,
+    Environment,
+    Fork,
+    RefundTypes,
+    Transaction,
+    TransactionException,
+)
+from execution_testing.base_types import HashInt
+from execution_testing.vm import Op
+
+from .spec import ref_spec_7778
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7778.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7778.version
+
+
+def build_refund_tx(
+    fork: Fork,
+    pre: Alloc,
+    post: Alloc,
+    refund_types: Set[RefundTypes],
+    refunds_count: int = 1,
+    refund_tx_reverts: bool = False,
+    call_data: bytes = b"",
+    refund_tx_has_extra_gas_limit: bool = False,
+    exceed_block_gas_limit: bool = False,
+) -> Tuple[int, int, int, Transaction]:
+    """Build a transaction that has different refund types from a fork."""
+    # All essential calc functions
+    intrinsic_cost_calc = fork.transaction_intrinsic_cost_calculator()
+    max_refund_quotient = fork.max_refund_quotient()
+    gsc = fork.gas_costs()
+    data_floor_calc = fork.transaction_data_floor_cost_calculator()
+
+    # Initial account pre loading
+    initial_fund = 10**18
+    refund_tx_sender = pre.fund_eoa(initial_fund)
+
+    # Initialize other aspects of pre-alloc
+    code = Bytecode()
+    authorization_list = None
+    refund_counter = 0
+    storage_slots = list(range(HashInt(refunds_count)))
+
+    empty_storage_on_success = False
+    refund_tx_extra_gas = 1 if refund_tx_has_extra_gas_limit else 0
+
+    for refund_type in sorted(refund_types, key=lambda r: r.value):
+        match refund_type:
+            case RefundTypes.STORAGE_CLEAR:
+                for slot in storage_slots:
+                    code += Op.SSTORE(
+                        slot,
+                        Op.PUSH0,
+                        # Gas accounting
+                        original_value=1,
+                        new_value=0,
+                    )
+                empty_storage_on_success = True
+
+            case RefundTypes.AUTHORIZATION_EXISTING_AUTHORITY:
+                code += Op.PUSH0
+                delegated_contract = pre.deploy_contract(code=Bytecode())
+                authorization_list = [
+                    AuthorizationTuple(
+                        address=delegated_contract,
+                        nonce=0,
+                        signer=pre.fund_eoa(amount=1),
+                    )
+                    for _ in range(refunds_count)
+                ]
+                refund_counter += (
+                    gsc.REFUND_AUTH_PER_EXISTING_ACCOUNT * refunds_count
+                )
+            case _:
+                raise ValueError(
+                    f"Unknown refund type: {refund_type} (Test needs update)"
+                )
+
+    if refund_tx_reverts:
+        code += Op.REVERT(0, 0)
+
+    contract_address = pre.deploy_contract(
+        code=code,
+        storage=dict.fromkeys(storage_slots, 1),
+    )
+
+    gas_used_pre_refund = intrinsic_cost_calc(
+        calldata=call_data,
+        return_cost_deducted_prior_execution=True,
+        authorization_list_or_count=authorization_list,
+    ) + code.gas_cost(fork)
+
+    # Calculate refund (still applied to user's balance)
+    if not refund_tx_reverts:
+        refund_counter += code.refund(fork)
+
+    effective_refund = min(
+        refund_counter, gas_used_pre_refund // max_refund_quotient
+    )
+    gas_used_post_refund = gas_used_pre_refund - effective_refund
+    call_data_floor_cost = data_floor_calc(data=call_data)
+
+    refund_tx_block_gas_used = max(call_data_floor_cost, gas_used_pre_refund)
+    refund_tx_gas_used = max(call_data_floor_cost, gas_used_post_refund)
+
+    # Build refund transaction
+    refund_tx = Transaction(
+        to=contract_address,
+        data=call_data,
+        gas_limit=refund_tx_block_gas_used + refund_tx_extra_gas,
+        sender=refund_tx_sender,
+        authorization_list=authorization_list,
+        expected_receipt={
+            "gas_used": refund_tx_gas_used,
+        },
+    )
+    refund_tx_gas_price = (
+        refund_tx.gas_price
+        if refund_tx.gas_price
+        else refund_tx.max_fee_per_gas
+    )
+
+    if (
+        refund_tx_reverts
+        or exceed_block_gas_limit
+        or not empty_storage_on_success
+    ):
+        post[contract_address] = Account(
+            storage=dict.fromkeys(storage_slots, 1),
+        )
+    else:
+        post[contract_address] = Account(
+            storage=dict.fromkeys(storage_slots, 0),
+        )
+
+    assert refund_tx_gas_price is not None, (
+        "refund_tx_gas_price should not be None"
+    )
+    expected_balance = initial_fund - (
+        refund_tx_gas_used * refund_tx_gas_price
+    )
+
+    if not exceed_block_gas_limit:
+        post[refund_tx_sender] = Account(balance=expected_balance)
+
+    return (
+        gas_used_post_refund,
+        gas_used_pre_refund,
+        call_data_floor_cost,
+        refund_tx,
+    )
+
+
+@pytest.mark.parametrize(
+    "refund_tx_reverts",
+    [
+        pytest.param(True, id="refund_tx_reverts"),
+        pytest.param(False, id=""),
+    ],
+)
+@pytest.mark.with_all_refund_types()
+@pytest.mark.execute(pytest.mark.skip(reason="Requires specific gas price"))
+@pytest.mark.valid_from("EIP7778")
+def test_simple_gas_accounting(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    refund_type: RefundTypes,
+    refund_tx_reverts: bool,
+) -> None:
+    """Test gas accounting for all refund types available in the given fork."""
+    refunds_count = 10
+
+    post = Alloc()
+
+    (_, gas_used_pre_refund, call_data_floor_cost, refund_tx) = (
+        build_refund_tx(
+            fork=fork,
+            pre=pre,
+            post=post,
+            refund_types={refund_type},
+            refunds_count=refunds_count,
+            refund_tx_reverts=refund_tx_reverts,
+        )
+    )
+
+    refund_tx_block_gas_used = max(gas_used_pre_refund, call_data_floor_cost)
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=[refund_tx],
+                expected_gas_used=refund_tx_block_gas_used,
+            )
+        ],
+        post=post,
+    )
+
+
+@pytest.mark.parametrize(
+    "refund_tx_reverts",
+    [
+        pytest.param(True, id="refund_tx_reverts"),
+        pytest.param(False, id=""),
+    ],
+)
+@pytest.mark.parametrize(
+    "refund_tx_has_extra_gas_limit",
+    [
+        pytest.param(True, id="refund_tx_has_extra_gas"),
+        pytest.param(False, id=""),
+    ],
+)
+@pytest.mark.parametrize(
+    "extra_tx_data_floor",
+    [
+        pytest.param(True, id=""),
+        pytest.param(False, id="extra_tx_hits_data_floor"),
+    ],
+)
+@pytest.mark.parametrize(
+    "exceed_block_gas_limit",
+    [
+        pytest.param(True, marks=pytest.mark.exception_test),
+        False,
+    ],
+)
+@pytest.mark.with_all_refund_types()
+@pytest.mark.execute(pytest.mark.skip(reason="Requires specific gas price"))
+@pytest.mark.valid_from("EIP7778")
+def test_multi_transaction_gas_accounting(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    refund_type: RefundTypes,
+    refund_tx_has_extra_gas_limit: bool,
+    exceed_block_gas_limit: bool,
+    extra_tx_data_floor: bool,
+    refund_tx_reverts: bool,
+) -> None:
+    """
+    Test block gas accounting with refunds per EIP-7778.
+
+    When exceed_block_gas_limit=True, we create a scenario where:
+    - Pre-refund gas (gas_used) > block_gas_limit - intrinsic_cost
+      (no room for another tx with correct EIP-7778 accounting)
+    - Post-refund gas (gas_spent) <= block_gas_limit - intrinsic_cost
+      (appears to have room with old refund-based accounting)
+
+    This tests that clients correctly use pre-refund gas for block accounting.
+    """
+    intrinsic_cost_calc = fork.transaction_intrinsic_cost_calculator()
+
+    refunds_count = 10
+    stop_bytecode = Op.STOP
+    stop_address = pre.deterministic_deploy_contract(deploy_code=stop_bytecode)
+
+    post = Alloc()
+    (
+        gas_used_post_refund,
+        gas_used_pre_refund,
+        call_data_floor_cost,
+        refund_tx,
+    ) = build_refund_tx(
+        fork=fork,
+        pre=pre,
+        post=post,
+        refund_types={refund_type},
+        refunds_count=refunds_count,
+        refund_tx_reverts=refund_tx_reverts,
+        call_data=b"",
+        refund_tx_has_extra_gas_limit=refund_tx_has_extra_gas_limit,
+        exceed_block_gas_limit=exceed_block_gas_limit,
+    )
+    refund_tx_gas_used = max(gas_used_post_refund, call_data_floor_cost)
+    refund_tx_block_gas_used = max(gas_used_pre_refund, call_data_floor_cost)
+
+    extra_tx_sender = pre.fund_eoa()
+    extra_tx_calldata = b"\xff" if extra_tx_data_floor else b""
+    extra_tx_intrinsic_gas_cost = intrinsic_cost_calc(
+        calldata=extra_tx_calldata
+    )
+
+    extra_tx = Transaction(
+        to=stop_address,
+        data=extra_tx_calldata,
+        gas_limit=extra_tx_intrinsic_gas_cost,
+        sender=extra_tx_sender,
+        expected_receipt={
+            "gas_used": refund_tx_gas_used + extra_tx_intrinsic_gas_cost,
+        },
+        error=TransactionException.GAS_ALLOWANCE_EXCEEDED
+        if exceed_block_gas_limit
+        else None,
+    )
+
+    total_block_gas_used = (
+        refund_tx_block_gas_used + extra_tx_intrinsic_gas_cost
+    )
+    if exceed_block_gas_limit:
+        environment_gas_limit = total_block_gas_used - 1
+    else:
+        environment_gas_limit = total_block_gas_used
+
+    txs = [refund_tx, extra_tx]
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=txs,
+                exception=[
+                    BlockException.GAS_USED_OVERFLOW,
+                    TransactionException.GAS_ALLOWANCE_EXCEEDED,
+                ]
+                if exceed_block_gas_limit
+                else None,
+                expected_gas_used=total_block_gas_used
+                if not exceed_block_gas_limit
+                else None,
+                gas_limit=environment_gas_limit,
+            )
+        ],
+        post=post,
+        genesis_environment=Environment(gas_limit=environment_gas_limit),
+    )
+
+
+class CallDataTestType(Enum):
+    """Refund test type."""
+
+    DATA_FLOOR_LT_TX_GAS_AFTER_REFUND = -1
+    """
+    calldata_floor < tx_gas_after_refund.
+    """
+    DATA_FLOOR_BETWEEN_TX_GAS_BEFORE_AND_AFTER = 0
+    """
+    tx_gas_after_refund < calldata_floor < tx_gas_before_refund.
+    """
+    DATA_FLOOR_GT_TX_GAS_BEFORE_REFUND = 1
+    """calldata_floor > tx_gas_before_refund."""
+
+
+@pytest.mark.parametrize(
+    "refund_tx_reverts",
+    [
+        pytest.param(True, id="refund_tx_reverts"),
+        pytest.param(False, id=""),
+    ],
+)
+@pytest.mark.parametrize(
+    "calldata_test_type",
+    [
+        CallDataTestType.DATA_FLOOR_LT_TX_GAS_AFTER_REFUND,
+        CallDataTestType.DATA_FLOOR_BETWEEN_TX_GAS_BEFORE_AND_AFTER,
+        CallDataTestType.DATA_FLOOR_GT_TX_GAS_BEFORE_REFUND,
+    ],
+)
+@pytest.mark.with_all_refund_types()
+@pytest.mark.filter_combinations(
+    lambda refund_type, refund_tx_reverts, calldata_test_type, **_: not (
+        refund_type == RefundTypes.STORAGE_CLEAR
+        and refund_tx_reverts
+        and calldata_test_type
+        == CallDataTestType.DATA_FLOOR_BETWEEN_TX_GAS_BEFORE_AND_AFTER
+    ),
+    reason=(
+        "STORAGE_CLEAR refund is zero on revert, so the (post, pre) "
+        "interval that DATA_FLOOR_BETWEEN needs is empty"
+    ),
+)
+@pytest.mark.valid_from("EIP7778")
+def test_varying_calldata_costs(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    refund_type: RefundTypes,
+    refund_tx_reverts: bool,
+    calldata_test_type: CallDataTestType,
+) -> None:
+    """
+    Test by varying the calldata_floor_cost.
+
+    Performs tests for the following 3 scenarios.
+
+    1. calldata_floor < tx_gas_after_refund
+    2. tx_gas_after_refund < calldata_floor < tx_gas_before_refund
+    3. calldata_floor > tx_gas_before_refund
+    """
+    match refund_type:
+        case RefundTypes.STORAGE_CLEAR:
+            bytes_to_add_per_iteration = b"00" * 2
+        case RefundTypes.AUTHORIZATION_EXISTING_AUTHORITY:
+            bytes_to_add_per_iteration = b"00" * 10
+        case _:
+            raise ValueError(
+                f"Unknown refund type: {refund_type} (Test needs update)"
+            )
+
+    data = b""
+
+    # Time to start searching for appropriate call data for each scenario
+    num_iterations = 200
+    # Currently in EIP-7778, the optimal call data is found in about
+    # 30 iterations for CallDataTestType.DATA_FLOOR_GT_TX_GAS_BEFORE_REFUND.
+    # Setting this higher just to make it
+    # a bit more future proof if the gas calc logic changes
+    found_call_data = False
+    for _ in range(num_iterations):
+        post = Alloc()
+
+        (
+            gas_used_post_refund,
+            gas_used_pre_refund,
+            call_data_floor_cost,
+            refund_tx,
+        ) = build_refund_tx(
+            fork=fork,
+            pre=pre,
+            post=post,
+            refund_types={refund_type},
+            refund_tx_reverts=refund_tx_reverts,
+            call_data=data,
+        )
+
+        if (
+            calldata_test_type
+            == CallDataTestType.DATA_FLOOR_LT_TX_GAS_AFTER_REFUND
+        ):
+            if call_data_floor_cost < gas_used_post_refund:
+                found_call_data = True
+                break
+        elif (
+            calldata_test_type
+            == CallDataTestType.DATA_FLOOR_BETWEEN_TX_GAS_BEFORE_AND_AFTER
+        ):
+            if (
+                gas_used_post_refund
+                < call_data_floor_cost
+                < gas_used_pre_refund
+            ):
+                found_call_data = True
+                break
+        elif (
+            calldata_test_type
+            == CallDataTestType.DATA_FLOOR_GT_TX_GAS_BEFORE_REFUND
+        ):
+            if gas_used_pre_refund < call_data_floor_cost:
+                found_call_data = True
+                break
+        else:
+            raise ValueError("Invalid calldata test type")
+
+        data += bytes_to_add_per_iteration
+
+    if not found_call_data:
+        raise ValueError(
+            f"Could not find the call_data with {num_iterations} iterations."
+        )
+
+    refund_tx_block_gas_used = max(call_data_floor_cost, gas_used_pre_refund)
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=[refund_tx],
+                expected_gas_used=refund_tx_block_gas_used,
+            )
+        ],
+        post=post,
+    )
+
+
+@pytest.mark.parametrize(
+    "refund_tx_reverts",
+    [
+        pytest.param(True, id="refund_tx_reverts"),
+        pytest.param(False, id=""),
+    ],
+)
+@pytest.mark.execute(pytest.mark.skip(reason="Requires specific gas price"))
+@pytest.mark.valid_from("Amsterdam")
+def test_multiple_refund_types_in_one_tx(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    refund_tx_reverts: bool,
+) -> None:
+    """Test gas accounting for all refund types available in the given fork."""
+    refunds_count = 10
+
+    post = Alloc()
+    refund_types = set(fork.refund_types())
+
+    (_, gas_used_pre_refund, call_data_floor_cost, refund_tx) = (
+        build_refund_tx(
+            fork=fork,
+            pre=pre,
+            post=post,
+            refund_types=refund_types,
+            refunds_count=refunds_count,
+            refund_tx_reverts=refund_tx_reverts,
+        )
+    )
+
+    refund_tx_block_gas_used = max(gas_used_pre_refund, call_data_floor_cost)
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=[refund_tx],
+                expected_gas_used=refund_tx_block_gas_used,
+            )
+        ],
+        post=post,
+    )
+
+
+@pytest.mark.execute(pytest.mark.skip(reason="Requires specific gas price"))
+@pytest.mark.valid_from("EIP7778")
+def test_mixed_gas_regimes(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: Fork,
+) -> None:
+    """
+    Lock in `block.gas_used == sum_i max(pre_refund_i, floor_i)` across a
+    block where each tx hits a different EIP-7778 regime.
+
+    tx1: SSTORE-set fresh slot (no refund, pre_refund > floor).
+    tx2: SSTORE-clear x10 (normal refund, refund not clipped to floor).
+    tx3: 1000 zero-byte calldata to STOP (floor binds upward).
+
+    The 2-tx `test_multi_transaction_gas_accounting` covers a refund tx
+    plus a minimal extra tx but never combines a refund-bearing tx with
+    a floor-binding tx in the same block. Per-tx sender balance is also
+    asserted to lock in that the floor-binding tx pays
+    `floor * gas_price`, not `pre_refund * gas_price`.
+    """
+    intrinsic_cost_calc = fork.transaction_intrinsic_cost_calculator()
+    data_floor_calc = fork.transaction_data_floor_cost_calculator()
+    initial_fund = 10**18
+
+    post = Alloc()
+
+    # tx1: SSTORE-set to a fresh slot. No refund.
+    tx1_code = Op.SSTORE(0, 1, original_value=0, new_value=1)
+    tx1_target = pre.deploy_contract(code=tx1_code)
+    tx1_sender = pre.fund_eoa(initial_fund)
+    tx1_data = b""
+    tx1_pre_refund = intrinsic_cost_calc(
+        calldata=tx1_data,
+        return_cost_deducted_prior_execution=True,
+    ) + tx1_code.gas_cost(fork)
+    tx1_floor = data_floor_calc(data=tx1_data)
+    assert tx1_pre_refund > tx1_floor, "tx1: pre_refund must exceed floor"
+    tx1_contribution = max(tx1_pre_refund, tx1_floor)
+    tx1 = Transaction(
+        to=tx1_target,
+        gas_limit=tx1_contribution,
+        sender=tx1_sender,
+        data=tx1_data,
+        # TODO: gas_used in expected_receipt is ignored by
+        # verify_transaction_receipt; only cumulative_gas_used is
+        # checked. To be fixed by #2855.
+        expected_receipt={"gas_used": tx1_contribution},
+    )
+    tx1_gas_price = tx1.gas_price if tx1.gas_price else tx1.max_fee_per_gas
+    assert tx1_gas_price is not None
+    post[tx1_target] = Account(storage={0: 1})
+    post[tx1_sender] = Account(
+        balance=initial_fund - tx1_contribution * tx1_gas_price
+    )
+
+    # tx2: SSTORE-clear with normal refund, refund not clipped to floor.
+    (
+        tx2_post_refund,
+        tx2_pre_refund,
+        tx2_floor,
+        tx2,
+    ) = build_refund_tx(
+        fork=fork,
+        pre=pre,
+        post=post,
+        refund_types={RefundTypes.STORAGE_CLEAR},
+        refunds_count=10,
+    )
+    assert tx2_pre_refund > tx2_floor, "tx2: pre_refund must exceed floor"
+    assert tx2_post_refund > tx2_floor, (
+        "tx2: refund must not be clipped to floor"
+    )
+    tx2_contribution = max(tx2_pre_refund, tx2_floor)
+
+    # tx3: floor-binding via 1000 zero bytes of calldata to STOP.
+    tx3_target = pre.deterministic_deploy_contract(deploy_code=Op.STOP)
+    tx3_sender = pre.fund_eoa(initial_fund)
+    tx3_data = b"\x00" * 1000
+    tx3_pre_refund = intrinsic_cost_calc(
+        calldata=tx3_data,
+        return_cost_deducted_prior_execution=True,
+    )
+    tx3_floor = data_floor_calc(data=tx3_data)
+    assert tx3_floor > tx3_pre_refund, "tx3: floor must bind upward"
+    tx3_contribution = max(tx3_pre_refund, tx3_floor)
+    tx3 = Transaction(
+        to=tx3_target,
+        gas_limit=tx3_contribution,
+        sender=tx3_sender,
+        data=tx3_data,
+        # TODO: gas_used in expected_receipt is ignored by
+        # verify_transaction_receipt; only cumulative_gas_used is
+        # checked. To be fixed by #2855.
+        expected_receipt={"gas_used": tx3_contribution},
+    )
+    tx3_gas_price = tx3.gas_price if tx3.gas_price else tx3.max_fee_per_gas
+    assert tx3_gas_price is not None
+    post[tx3_sender] = Account(
+        balance=initial_fund - tx3_contribution * tx3_gas_price
+    )
+
+    total_gas_used = tx1_contribution + tx2_contribution + tx3_contribution
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=[tx1, tx2, tx3],
+                expected_gas_used=total_gas_used,
+            )
+        ],
+        post=post,
+    )
diff --git a/tests/amsterdam/eip7843_slotnum/__init__.py b/tests/amsterdam/eip7843_slotnum/__init__.py
new file mode 100644
index 00000000000..540001d5d95
--- /dev/null
+++ b/tests/amsterdam/eip7843_slotnum/__init__.py
@@ -0,0 +1 @@
+"""Tests for [EIP-7843: SLOTNUM](https://eips.ethereum.org/EIPS/eip-7843)."""
diff --git a/tests/amsterdam/eip7843_slotnum/spec.py b/tests/amsterdam/eip7843_slotnum/spec.py
new file mode 100644
index 00000000000..a96172631f4
--- /dev/null
+++ b/tests/amsterdam/eip7843_slotnum/spec.py
@@ -0,0 +1,22 @@
+"""Reference spec for [EIP-7843: SLOTNUM](https://eips.ethereum.org/EIPS/eip-7843)."""
+
+from dataclasses import dataclass
+
+
+@dataclass(frozen=True)
+class ReferenceSpec:
+    """Reference specification."""
+
+    git_path: str
+    version: str
+
+
+ref_spec_7843 = ReferenceSpec(
+    git_path="EIPS/eip-7843.md",
+    version="6bc5d6b7acbc016a79fa573f98975093b5c2ca52",
+)
+
+
+@dataclass(frozen=True)
+class Spec:
+    """Constants and parameters from EIP-7843."""
diff --git a/tests/amsterdam/eip7843_slotnum/test_eip_mainnet.py b/tests/amsterdam/eip7843_slotnum/test_eip_mainnet.py
new file mode 100644
index 00000000000..0cca8f2cd21
--- /dev/null
+++ b/tests/amsterdam/eip7843_slotnum/test_eip_mainnet.py
@@ -0,0 +1,53 @@
+"""
+Mainnet marked execute checklist tests for
+[EIP-7843: SLOTNUM](https://eips.ethereum.org/EIPS/eip-7843).
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Environment,
+    Op,
+    StateTestFiller,
+    Transaction,
+)
+
+from .spec import ref_spec_7843
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7843.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7843.version
+
+pytestmark = [pytest.mark.valid_at("EIP7843"), pytest.mark.mainnet]
+
+
+def test_slotnum_mainnet(
+    state_test: StateTestFiller,
+    pre: Alloc,
+) -> None:
+    """
+    Test that SLOTNUM is callable and returns a non-zero slot number.
+
+    Asserts on ``POP(SLOTNUM)`` rather than the slot value itself
+    so the test remains valid when ``execute``-ed against a live network,
+    where the slot number is whatever the consensus layer transmits and
+    cannot be controlled by the test.
+    """
+    contract = pre.deploy_contract(
+        code=Op.POP(Op.SLOTNUM) + Op.SSTORE(0, 1),
+        storage={"0x00": "0xdeadbeef"},
+    )
+    tx = Transaction(
+        ty=0x02,
+        to=contract,
+        sender=pre.fund_eoa(),
+        gas_limit=200_000,
+    )
+    post = {contract: Account(storage={"0x00": 1})}
+
+    state_test(
+        env=Environment(),
+        pre=pre,
+        tx=tx,
+        post=post,
+    )
diff --git a/tests/amsterdam/eip7843_slotnum/test_fork_transition.py b/tests/amsterdam/eip7843_slotnum/test_fork_transition.py
new file mode 100644
index 00000000000..210e3a5001b
--- /dev/null
+++ b/tests/amsterdam/eip7843_slotnum/test_fork_transition.py
@@ -0,0 +1,68 @@
+"""Tests for EIP-7843 fork transition behavior."""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Block,
+    BlockchainTestFiller,
+    Op,
+    Transaction,
+)
+
+from .spec import ref_spec_7843
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7843.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7843.version
+
+
+@pytest.mark.valid_at_transition_to("EIP7843")
+def test_slotnum_at_fork_transition(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+) -> None:
+    """
+    Test SLOTNUM behavior across the EIP-7843 fork transition.
+
+    Before EIP-7843, opcode 0x4B is undefined: execution halts with an
+    invalid-opcode exception and consumes all gas, so no SSTORE is observed.
+
+    From EIP-7843 onward, SLOTNUM pushes the block's slot number provided
+    by the consensus layer and the SSTORE succeeds.
+
+    The contract keys storage by block number so each block's outcome is
+    independently visible in the final post-state:
+
+    * block 1 (pre-fork): slot 1 stays 0 — execution halted before SSTORE.
+    * block 2 (transition): slot 2 == ``at_fork_slot``.
+    * block 3 (post-fork): slot 3 == ``post_fork_slot``.
+    """
+    sender = pre.fund_eoa()
+    contract = pre.deploy_contract(Op.SSTORE(Op.NUMBER, Op.SLOTNUM) + Op.STOP)
+
+    at_fork_slot = 200
+    post_fork_slot = 201
+
+    blocks = [
+        Block(
+            timestamp=ts,
+            slot_number=slot,
+            txs=[Transaction(sender=sender, to=contract, gas_limit=100_000)],
+        )
+        for ts, slot in [
+            (14_999, None),
+            (15_000, at_fork_slot),
+            (15_001, post_fork_slot),
+        ]
+    ]
+    post = {
+        contract: Account(
+            storage={
+                1: 0,
+                2: at_fork_slot,
+                3: post_fork_slot,
+            },
+        ),
+    }
+
+    blockchain_test(pre=pre, blocks=blocks, post=post)
diff --git a/tests/amsterdam/eip7843_slotnum/test_slotnum.py b/tests/amsterdam/eip7843_slotnum/test_slotnum.py
new file mode 100644
index 00000000000..c3387c957e4
--- /dev/null
+++ b/tests/amsterdam/eip7843_slotnum/test_slotnum.py
@@ -0,0 +1,150 @@
+"""Tests for EIP-7843 (SLOTNUM)."""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Block,
+    BlockchainTestFiller,
+    Environment,
+    Fork,
+    Op,
+    StateTestFiller,
+    Transaction,
+)
+
+from .spec import ref_spec_7843
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7843.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7843.version
+
+pytestmark = pytest.mark.valid_from("EIP7843")
+
+
+@pytest.mark.parametrize(
+    "slot_number",
+    [
+        pytest.param(0, id="slot_zero"),
+        pytest.param(1, id="slot_one"),
+        pytest.param(0x1000, id="slot_4096"),
+        pytest.param(2**32, id="slot_large"),
+        pytest.param(2**64 - 1, id="slot_max_u64"),
+    ],
+)
+def test_slotnum_value(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    slot_number: int,
+) -> None:
+    """
+    Test that SLOTNUM opcode returns the correct slot number.
+
+    The slot number is provided by the consensus layer and should be
+    accessible via the SLOTNUM opcode (0x4B).
+    """
+    # Store SLOTNUM result at storage key 0
+    code = Op.SSTORE(0, Op.SLOTNUM)
+    code_address = pre.deploy_contract(code)
+
+    tx = Transaction(
+        sender=pre.fund_eoa(),
+        gas_limit=100_000,
+        to=code_address,
+    )
+
+    post = {
+        code_address: Account(
+            storage={0: slot_number},
+        ),
+    }
+
+    state_test(
+        env=Environment(slot_number=slot_number),
+        pre=pre,
+        tx=tx,
+        post=post,
+    )
+
+
+@pytest.mark.parametrize(
+    "gas_delta,call_succeeds",
+    [
+        pytest.param(0, True, id="enough_gas"),
+        pytest.param(-1, False, id="out_of_gas"),
+    ],
+)
+def test_slotnum_gas_cost(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_delta: int,
+    call_succeeds: bool,
+) -> None:
+    """
+    Test that SLOTNUM opcode costs exactly 2 gas (G_BASE).
+    """
+    slotnum_gas = Op.SLOTNUM.gas_cost(fork)
+    call_gas = slotnum_gas + gas_delta
+
+    # Callee just executes SLOTNUM
+    callee_code = Op.SLOTNUM + Op.STOP
+    callee_address = pre.deterministic_deploy_contract(deploy_code=callee_code)
+
+    # Caller calls the callee with limited gas and stores result
+    caller_code = Op.SSTORE(0, Op.CALL(gas=call_gas, address=callee_address))
+    caller_address = pre.deploy_contract(caller_code)
+
+    tx = Transaction(
+        sender=pre.fund_eoa(),
+        gas_limit=100_000,
+        to=caller_address,
+    )
+
+    post = {
+        caller_address: Account(
+            storage={0: 1 if call_succeeds else 0},
+        ),
+    }
+
+    state_test(
+        env=Environment(slot_number=12345),
+        pre=pre,
+        tx=tx,
+        post=post,
+    )
+
+
+def test_slotnum_distinct_per_block(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+) -> None:
+    """
+    Test that SLOTNUM returns each block's own slot number.
+
+    Runs four consecutive blocks with deliberately non-monotonic slot
+    numbers to disprove any caching or ordering assumption in the opcode
+    implementation. Each block runs the same contract, which keys storage
+    by block ``NUMBER`` so every block's outcome is independently visible
+    in the final post-state.
+    """
+    sender = pre.fund_eoa()
+    contract = pre.deploy_contract(Op.SSTORE(Op.NUMBER, Op.SLOTNUM) + Op.STOP)
+
+    # Non-monotonic on purpose: decrease, increase, jump to large value.
+    slot_numbers = [100, 42, 7, 2**32]
+
+    blocks = [
+        Block(
+            slot_number=slot,
+            txs=[Transaction(sender=sender, to=contract, gas_limit=100_000)],
+        )
+        for slot in slot_numbers
+    ]
+
+    post = {
+        contract: Account(
+            storage={i + 1: slot for i, slot in enumerate(slot_numbers)},
+        ),
+    }
+
+    blockchain_test(pre=pre, blocks=blocks, post=post)
diff --git a/tests/amsterdam/eip7928_block_level_access_lists/eip_checklist_external_coverage.txt b/tests/amsterdam/eip7928_block_level_access_lists/eip_checklist_external_coverage.txt
new file mode 100644
index 00000000000..b0596291a7e
--- /dev/null
+++ b/tests/amsterdam/eip7928_block_level_access_lists/eip_checklist_external_coverage.txt
@@ -0,0 +1,3 @@
+general/code_coverage/eels = Run produced tests against EELS and verify line coverage of new BAL code (block_access_list/, modifiers, builder) is at the expected level
+general/code_coverage/test_coverage = Run tests with `uv run fill --cov tests/amsterdam/eip7928_block_level_access_lists` to verify test code coverage
+general/code_coverage/second_client = Cross-client coverage tracked separately via the multi-client BAL conformance effort
diff --git a/tests/amsterdam/eip7928_block_level_access_lists/eip_checklist_not_applicable.txt b/tests/amsterdam/eip7928_block_level_access_lists/eip_checklist_not_applicable.txt
new file mode 100644
index 00000000000..3b42a3a248c
--- /dev/null
+++ b/tests/amsterdam/eip7928_block_level_access_lists/eip_checklist_not_applicable.txt
@@ -0,0 +1,14 @@
+opcode = EIP-7928 does not introduce a new opcode
+precompile = EIP-7928 does not introduce a new precompile
+removed_precompile = EIP-7928 does not remove a precompile
+system_contract = EIP-7928 does not introduce a new system contract
+transaction_type = EIP-7928 does not introduce a new transaction type
+block_body_field = EIP-7928 does not introduce a new block body field (the block_access_list is transmitted via the Engine API payload, committed only via its hash in the header)
+gas_cost_changes = EIP-7928 does not modify existing gas costs (the BAL gas budget constraint is covered under block_level_constraint)
+gas_refunds_changes = EIP-7928 does not modify gas refunds
+blob_count_changes = EIP-7928 does not modify blob count parameters
+execution_layer_request = EIP-7928 does not introduce an execution layer request
+new_transaction_validity_constraint = EIP-7928 introduces a block-level constraint, not a transaction-level one
+modified_transaction_validity_constraint = EIP-7928 does not modify any existing transaction validity constraint
+block_level_constraint/test/content/logs = BAL size constraint depends only on (accounts + storage_keys) counts; transaction logs do not affect bal_items and therefore cannot change constraint behavior
+block_level_constraint/test/content/receipts = BAL is not part of the receipts trie; varying receipt sizes do not contribute to bal_items and therefore cannot change constraint behavior
diff --git a/tests/amsterdam/eip7928_block_level_access_lists/spec.py b/tests/amsterdam/eip7928_block_level_access_lists/spec.py
index e008536563e..2eac6b26b3b 100644
--- a/tests/amsterdam/eip7928_block_level_access_lists/spec.py
+++ b/tests/amsterdam/eip7928_block_level_access_lists/spec.py
@@ -13,7 +13,7 @@ class ReferenceSpec:
 
 ref_spec_7928 = ReferenceSpec(
     git_path="EIPS/eip-7928.md",
-    version="e7f0963a024b3d0dedc4488a7553bf7c70dedb3e",
+    version="aca88aa0932580c29d0233f902cb4390e88b8c41",
 )
 
 
@@ -39,6 +39,6 @@ class Spec:
     HASH_SIZE: int = 32  # Hash size in bytes
 
     # Numeric type limits
-    MAX_TX_INDEX: int = 2**16 - 1  # uint16 max value
+    MAX_TX_INDEX: int = 2**32 - 1  # uint32 max value
     MAX_BALANCE: int = 2**128 - 1  # uint128 max value
     MAX_NONCE: int = 2**64 - 1  # uint64 max value
diff --git a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists.py b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists.py
index 1c3f374db37..b276d04f74a 100644
--- a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists.py
+++ b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists.py
@@ -9,6 +9,7 @@
     Address,
     Alloc,
     AuthorizationTuple,
+    BalAccountAbsentValues,
     BalAccountExpectation,
     BalBalanceChange,
     BalCodeChange,
@@ -19,15 +20,22 @@
     BlockAccessListExpectation,
     BlockchainTestFiller,
     BlockException,
+    Conditional,
+    EIPChecklist,
     Environment,
     Fork,
     Hash,
     Header,
+    Initcode,
     Op,
+    StateTestFiller,
     Transaction,
+    TransactionException,
+    Withdrawal,
     add_kzg_version,
     compute_create_address,
 )
+from execution_testing import Macros as Om
 
 from .spec import ref_spec_7928
 
@@ -37,6 +45,7 @@
 pytestmark = pytest.mark.valid_from("Amsterdam")
 
 
+@EIPChecklist.BlockHeaderField.Test.ValueBehavior.Accept()
 def test_bal_nonce_changes(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
@@ -575,6 +584,118 @@ def test_bal_block_rewards(
     )
 
 
+@pytest.mark.parametrize(
+    "same_tx", [False, True], ids=["pre_deploy", "same_tx"]
+)
+def test_bal_selfdestruct_to_coinbase(
+    pre: Alloc,
+    state_test: StateTestFiller,
+    fork: Fork,
+    same_tx: bool,
+) -> None:
+    """
+    Ensure BAL records SELFDESTRUCT when the beneficiary is the coinbase.
+
+    Post-Cancun (EIP-6780) the contract is only actually destroyed when
+    created in the same tx; the pre-deployed path only transfers balance
+    and preserves the contract. Both shapes must appear in BAL.
+    """
+    alice = pre.fund_eoa()
+    coinbase = pre.fund_eoa(amount=0)
+    victim_balance = 100
+    victim_code = Op.SELFDESTRUCT(Op.COINBASE)
+
+    # Match gas_price to base_fee so the priority-fee tip is zero;
+    # coinbase's BAL entry then carries only the SELFDESTRUCT transfer.
+    base_fee_per_gas = 7
+    env = Environment(
+        base_fee_per_gas=base_fee_per_gas, fee_recipient=coinbase
+    )
+
+    tx_gas_limit = fork.transaction_gas_limit_cap()
+    account_expectations: dict[Address, BalAccountExpectation]
+
+    if same_tx:
+        initcode = Initcode(deploy_code=victim_code)
+        factory_code = Om.MSTORE(initcode, 0) + Op.CALL(
+            gas=Op.GAS,
+            address=Op.CREATE(
+                value=victim_balance, offset=0, size=len(initcode)
+            ),
+        )
+        factory = pre.deploy_contract(
+            code=factory_code, balance=victim_balance
+        )
+        victim = compute_create_address(address=factory, nonce=1)
+        tx_target = factory
+        post = {
+            factory: Account(balance=0),
+            victim: Account.NONEXISTENT,
+            coinbase: Account(balance=victim_balance),
+        }
+        account_expectations = {
+            factory: BalAccountExpectation(
+                nonce_changes=[
+                    BalNonceChange(block_access_index=1, post_nonce=2)
+                ],
+                balance_changes=[
+                    BalBalanceChange(block_access_index=1, post_balance=0)
+                ],
+            ),
+            # Created and destroyed in the same tx — empty changes.
+            victim: BalAccountExpectation.empty(),
+            coinbase: BalAccountExpectation(
+                balance_changes=[
+                    BalBalanceChange(
+                        block_access_index=1, post_balance=victim_balance
+                    )
+                ],
+            ),
+        }
+    else:
+        victim = pre.deploy_contract(code=victim_code, balance=victim_balance)
+        tx_target = victim
+        # Pre-deployed and not same-tx: post-Cancun preserves the contract.
+        post = {
+            victim: Account(balance=0, code=victim_code),
+            coinbase: Account(balance=victim_balance),
+        }
+        account_expectations = {
+            victim: BalAccountExpectation(
+                balance_changes=[
+                    BalBalanceChange(block_access_index=1, post_balance=0)
+                ],
+            ),
+            coinbase: BalAccountExpectation(
+                balance_changes=[
+                    BalBalanceChange(
+                        block_access_index=1, post_balance=victim_balance
+                    )
+                ],
+            ),
+        }
+
+    tx = Transaction(
+        sender=alice,
+        to=tx_target,
+        gas_limit=tx_gas_limit,
+        gas_price=base_fee_per_gas,
+    )
+
+    state_test(
+        env=env,
+        pre=pre,
+        post=post,
+        tx=tx,
+        blockchain_test_header_verify=Header(
+            base_fee_per_gas=base_fee_per_gas
+        ),
+        expected_block_access_list=BlockAccessListExpectation(
+            account_expectations=account_expectations,
+        ),
+    )
+
+
 def test_bal_2930_account_listed_but_untouched(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
@@ -1233,6 +1354,188 @@ def test_bal_aborted_account_access(
     )
 
 
+@pytest.mark.parametrize(
+    "inner_action",
+    ["sstore", "sload", "balance", "extcodesize"],
+)
+@pytest.mark.parametrize(
+    "outer_abort",
+    [
+        pytest.param(Op.REVERT(0, 0), id="outer_revert"),
+        pytest.param(Op.INVALID, id="outer_invalid"),
+    ],
+)
+def test_bal_parent_revert_state_access(
+    pre: Alloc,
+    state_test: StateTestFiller,
+    fork: Fork,
+    inner_action: str,
+    outer_abort: Op,
+) -> None:
+    """Ensure BAL captures child-frame state access when the parent reverts."""
+    alice = pre.fund_eoa()
+    extra_target = pre.deploy_contract(code=Op.STOP)
+
+    if inner_action == "sstore":
+        # Write demoted to read by parent revert; pre-set 0xDEAD so the
+        # post-state confirms the slot was unchanged.
+        inner = pre.deploy_contract(
+            code=Op.SSTORE(1, 0x42) + Op.STOP,
+            storage={1: 0xDEAD},
+        )
+    elif inner_action == "sload":
+        inner = pre.deploy_contract(
+            code=Op.POP(Op.SLOAD(1)) + Op.STOP,
+            storage={1: 0xDEAD},
+        )
+    elif inner_action == "balance":
+        inner = pre.deploy_contract(
+            code=Op.POP(Op.BALANCE(extra_target)) + Op.STOP
+        )
+    elif inner_action == "extcodesize":
+        inner = pre.deploy_contract(
+            code=Op.POP(Op.EXTCODESIZE(extra_target)) + Op.STOP
+        )
+    else:
+        raise ValueError(f"unknown inner_action: {inner_action}")
+    outer = pre.deploy_contract(
+        code=Op.CALL(gas=Op.GAS, address=inner) + outer_abort
+    )
+
+    tx = Transaction(
+        sender=alice, to=outer, gas_limit=fork.transaction_gas_limit_cap()
+    )
+
+    account_expectations: dict[Address, BalAccountExpectation]
+    if inner_action in ("sstore", "sload"):
+        account_expectations = {
+            inner: BalAccountExpectation(storage_reads=[1]),
+        }
+    elif inner_action in ("balance", "extcodesize"):
+        account_expectations = {
+            inner: BalAccountExpectation.empty(),
+            extra_target: BalAccountExpectation.empty(),
+        }
+    else:
+        raise ValueError(f"unknown inner_action: {inner_action}")
+
+    post: dict = {alice: Account(nonce=1)}
+    if inner_action in ("sstore", "sload"):
+        # Slot 1 stays at its pre-state value: SSTORE demoted to read,
+        # SLOAD never mutates.
+        post[inner] = Account(storage={1: 0xDEAD})
+
+    state_test(
+        pre=pre,
+        post=post,
+        tx=tx,
+        expected_block_access_list=BlockAccessListExpectation(
+            account_expectations=account_expectations,
+        ),
+    )
+
+
+@pytest.mark.parametrize(
+    "inner_op",
+    [pytest.param("call", id="call"), pytest.param("create", id="create")],
+)
+def test_bal_outer_revert_with_inner_insufficient_funds(
+    pre: Alloc,
+    state_test: StateTestFiller,
+    fork: Fork,
+    inner_op: str,
+) -> None:
+    """
+    Outer REVERT + inner CALL/CREATE that fails on insufficient funds.
+
+    Inner writes two slots and then attempts a value-bearing CALL or
+    CREATE that fails (balance=0 < value). The opcode's state-touching
+    costs are charged before the balance check, so the failed CALL's
+    target stays in BAL with empty changes, while CREATE fails before
+    `track_address` and the would-be address does not appear at all.
+    Inner's writes demote to reads under outer's REVERT; the post-state
+    checks confirm none of the rolled-back state leaked through.
+    """
+    alice = pre.fund_eoa()
+    slot_a, slot_b = 1, 2
+    insufficient_value = 100
+
+    if inner_op == "call":
+        target = pre.deploy_contract(code=Op.STOP)
+        inner = pre.deploy_contract(
+            code=(
+                Op.SSTORE(slot_a, 0x42)
+                + Op.SSTORE(
+                    slot_b,
+                    Op.CALL(
+                        gas=100_000,
+                        address=target,
+                        value=insufficient_value,
+                    ),
+                )
+                + Op.STOP
+            ),
+            balance=0,
+        )
+        extra_account = target
+        extra_bal: BalAccountExpectation | None = BalAccountExpectation.empty()
+        extra_post: Account | None = Account(balance=0)
+    elif inner_op == "create":
+        initcode_bytes = bytes(Initcode(deploy_code=Op.STOP))
+        inner = pre.deploy_contract(
+            code=(
+                Op.MSTORE(0, Op.PUSH32(initcode_bytes))
+                + Op.SSTORE(slot_a, 0x42)
+                + Op.SSTORE(
+                    slot_b,
+                    Op.CREATE(
+                        value=insufficient_value,
+                        offset=32 - len(initcode_bytes),
+                        size=len(initcode_bytes),
+                    ),
+                )
+                + Op.STOP
+            ),
+            balance=0,
+        )
+        extra_account = compute_create_address(address=inner, nonce=1)
+        extra_bal = None
+        extra_post = Account.NONEXISTENT
+    else:
+        raise ValueError(f"unknown inner_op: {inner_op}")
+
+    outer = pre.deploy_contract(
+        code=Op.CALL(gas=Op.GAS, address=inner) + Op.REVERT(0, 0)
+    )
+
+    tx = Transaction(
+        sender=alice, to=outer, gas_limit=fork.transaction_gas_limit_cap()
+    )
+
+    state_test(
+        pre=pre,
+        post={
+            alice: Account(nonce=1),
+            outer: Account(balance=0, storage={}),
+            inner: Account(balance=0, storage={}),
+            extra_account: extra_post,
+        },
+        tx=tx,
+        expected_block_access_list=BlockAccessListExpectation(
+            account_expectations={
+                alice: BalAccountExpectation(
+                    nonce_changes=[
+                        BalNonceChange(block_access_index=1, post_nonce=1)
+                    ],
+                ),
+                outer: BalAccountExpectation.empty(),
+                inner: BalAccountExpectation(storage_reads=[slot_a, slot_b]),
+                extra_account: extra_bal,
+            },
+        ),
+    )
+
+
 def test_bal_fully_unmutated_account(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
@@ -1501,29 +1804,26 @@ def test_bal_precompile_funded(
     )
 
 
-@pytest.mark.parametrize_by_fork(
-    "precompile",
-    lambda fork: [
-        pytest.param(addr, id=f"0x{int.from_bytes(addr, 'big'):02x}")
-        for addr in fork.precompiles(block_number=0, timestamp=0)
-    ],
-)
-def test_bal_precompile_call(
+@pytest.mark.with_all_precompiles
+@pytest.mark.with_all_call_opcodes
+def test_bal_precompile_call_opcode(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
-    precompile: Address,
+    precompile: int,
+    call_opcode: Op,
 ) -> None:
     """
-    Ensure BAL records precompile when called via contract.
+    Ensure BAL records the precompile address regardless of call opcode.
 
-    Alice calls Oracle contract which calls precompile.
-    BAL must include precompile with no balance/storage/code changes.
+    Alice calls Oracle contract which invokes the precompile via the
+    parametrized call opcode. For DELEGATECALL/CALLCODE the precompile
+    provides the code but is not the call target, so its access has to
+    be recorded explicitly rather than incidentally.
     """
     alice = pre.fund_eoa()
 
-    # Oracle contract that calls the precompile
     oracle = pre.deploy_contract(
-        code=Op.CALL(100_000, precompile, 0, 0, 0, 0, 0) + Op.STOP
+        code=call_opcode(gas=100_000, address=precompile) + Op.STOP
     )
 
     tx = Transaction(
@@ -1985,7 +2285,7 @@ def test_bal_multiple_storage_writes_same_slot(
         pytest.param([2, 3, 4], id="depth_3"),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_bal_nested_delegatecall_storage_writes_net_zero(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
@@ -2115,40 +2415,53 @@ def test_bal_create_transaction_empty_code(
     )
 
 
-def test_bal_cross_tx_storage_revert_to_zero(
+@pytest.mark.parametrize(
+    "tx2_value",
+    [
+        pytest.param(0x0, id="tx2_reverts_to_zero"),
+        pytest.param(0xABCD, id="tx2_rewrites_same_value"),
+    ],
+)
+def test_bal_cross_tx_storage_write(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
+    tx2_value: int,
 ) -> None:
     """
-    Ensure BAL captures storage changes when tx1 writes a non-zero value
-    and tx2 reverts it back to zero. This is a regression test for the
-    blobhash scenario where slot changes were being incorrectly filtered
-    as net-zero across transaction boundaries.
+    Tx1's storage_change must be preserved regardless of tx2's write.
 
-    Tx1: slot 0 = 0x0 -> 0xABCD (change at block_access_index=1)
-    Tx2: slot 0 = 0xABCD -> 0x0 (change MUST be at block_access_index=2)
+    Regression for the blobhash scenario where back-to-pre writes were
+    filtered as net-zero across tx boundaries. The same-value case
+    additionally exercises the uniqueness rule: a slot in storage_changes
+    MUST NOT also appear in storage_reads.
     """
     alice = pre.fund_eoa()
+    tx1_value = 0xABCD
 
-    # Contract that writes to slot 0 based on calldata
     contract = pre.deploy_contract(code=Op.SSTORE(0, Op.CALLDATALOAD(0)))
 
-    # Tx1: Write slot 0 = 0xABCD
     tx1 = Transaction(
         sender=alice,
         to=contract,
-        data=Hash(0xABCD),
+        data=Hash(tx1_value),
         gas_limit=100_000,
     )
 
-    # Tx2: Write slot 0 = 0x0 (revert to zero)
     tx2 = Transaction(
         sender=alice,
         to=contract,
-        data=Hash(0x0),
+        data=Hash(tx2_value),
         gas_limit=100_000,
     )
 
+    slot_changes = [
+        BalStorageChange(block_access_index=1, post_value=tx1_value),
+    ]
+    if tx2_value != tx1_value:
+        slot_changes.append(
+            BalStorageChange(block_access_index=2, post_value=tx2_value)
+        )
+
     account_expectations = {
         alice: BalAccountExpectation(
             nonce_changes=[
@@ -2157,16 +2470,191 @@ def test_bal_cross_tx_storage_revert_to_zero(
             ],
         ),
         contract: BalAccountExpectation(
+            storage_changes=[
+                BalStorageSlot(slot=0, slot_changes=slot_changes),
+            ],
+            storage_reads=[],
+        ),
+    }
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=[tx1, tx2],
+                expected_block_access_list=BlockAccessListExpectation(
+                    account_expectations=account_expectations
+                ),
+            )
+        ],
+        post={
+            alice: Account(nonce=2),
+            contract: Account(storage={0: tx2_value}),
+        },
+    )
+
+
+def test_bal_cross_tx_storage_chain(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+) -> None:
+    """
+    Verify clients apply BAL state changes from prior transactions before
+    executing later transactions in the same block.
+
+    Each Tx i seeds slots 0 and 1 with `1`, then computes a
+    Fibonacci-style sum into slot i: `slot[i] = SLOAD(i-1) + SLOAD(i-2)`.
+    Every Tx i>=2 depends on the two immediately preceding writes, so
+    any parallelization that fails to apply a prior Tx's BAL storage
+    change cascades into a wrong slot value and a different state root.
+    """
+    chain_length = 8
+    # i<2 seeds slot i with 1; i>=2 computes the Fibonacci sum.
+    contract = pre.deploy_contract(
+        code=Conditional(
+            condition=Op.LT(Op.CALLDATALOAD(0), 2),
+            if_true=Op.SSTORE(Op.CALLDATALOAD(0), 1),
+            if_false=Op.SSTORE(
+                Op.CALLDATALOAD(0),
+                Op.ADD(
+                    Op.SLOAD(Op.SUB(Op.CALLDATALOAD(0), 1)),
+                    Op.SLOAD(Op.SUB(Op.CALLDATALOAD(0), 2)),
+                ),
+            ),
+        ),
+    )
+
+    fib = [1, 1]
+    for i in range(2, chain_length):
+        fib.append(fib[i - 1] + fib[i - 2])
+
+    txs = []
+    senders = []
+    for i in range(chain_length):
+        sender = pre.fund_eoa()
+        senders.append(sender)
+        txs.append(
+            Transaction(
+                sender=sender,
+                to=contract,
+                data=Hash(i),
+                gas_limit=100_000,
+            )
+        )
+
+    account_expectations: dict = {
+        sender: BalAccountExpectation(
+            nonce_changes=[
+                BalNonceChange(block_access_index=i + 1, post_nonce=1)
+            ],
+        )
+        for i, sender in enumerate(senders)
+    }
+    account_expectations[contract] = BalAccountExpectation(
+        storage_changes=[
+            BalStorageSlot(
+                slot=i,
+                slot_changes=[
+                    BalStorageChange(
+                        block_access_index=i + 1, post_value=fib[i]
+                    ),
+                ],
+            )
+            for i in range(chain_length)
+        ],
+        nonce_changes=[],
+        balance_changes=[],
+        code_changes=[],
+        storage_reads=[],
+    )
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=txs,
+                expected_block_access_list=BlockAccessListExpectation(
+                    account_expectations=account_expectations
+                ),
+            )
+        ],
+        post={
+            contract: Account(
+                storage={i: fib[i] for i in range(chain_length)}
+            ),
+        },
+    )
+
+
+@pytest.mark.with_all_create_opcodes
+def test_bal_cross_tx_deploy_then_call(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    create_opcode: Op,
+) -> None:
+    """
+    Verify clients apply Tx1's CREATE to their state view before
+    executing Tx2's CALL in the same block. Tx1 deploys a contract at a
+    deterministic address whose runtime code writes a sentinel to slot 0.
+    Tx2 CALLs that address. A client that parallelizes Tx2 without
+    applying Tx1's `code_changes` would hit an empty account, the CALL
+    would no-op, and slot 0 would remain 0.
+    """
+    sentinel = 0x42
+    alice = pre.fund_eoa()
+    bob = pre.fund_eoa()
+
+    runtime = Op.SSTORE(0, sentinel) + Op.STOP
+    initcode = Initcode(deploy_code=runtime)
+    initcode_bytes = bytes(initcode)
+
+    salt = 0
+    is_create2 = create_opcode == Op.CREATE2
+    if is_create2:
+        deploy_op = Op.CREATE2(
+            value=0, offset=0, size=Op.CALLDATASIZE, salt=salt
+        )
+    else:
+        deploy_op = Op.CREATE(value=0, offset=0, size=Op.CALLDATASIZE)
+    factory_code = (
+        Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
+        + Op.SSTORE(0, deploy_op)
+        + Op.STOP
+    )
+    factory = pre.deploy_contract(code=factory_code)
+    target = compute_create_address(
+        address=factory,
+        nonce=1,
+        salt=salt,
+        initcode=initcode_bytes,
+        opcode=create_opcode,
+    )
+
+    tx_deploy = Transaction(
+        sender=alice,
+        to=factory,
+        data=initcode_bytes,
+        gas_limit=500_000,
+    )
+    tx_call = Transaction(
+        sender=bob,
+        to=target,
+        gas_limit=100_000,
+    )
+
+    account_expectations = {
+        target: BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=1, post_nonce=1)],
+            code_changes=[
+                BalCodeChange(block_access_index=1, new_code=bytes(runtime))
+            ],
             storage_changes=[
                 BalStorageSlot(
                     slot=0,
                     slot_changes=[
                         BalStorageChange(
-                            block_access_index=1, post_value=0xABCD
+                            block_access_index=2, post_value=sentinel
                         ),
-                        # CRITICAL: tx2's write to 0x0 MUST appear
-                        # even though it returns slot to original value
-                        BalStorageChange(block_access_index=2, post_value=0x0),
                     ],
                 ),
             ],
@@ -2177,15 +2665,507 @@ def test_bal_cross_tx_storage_revert_to_zero(
         pre=pre,
         blocks=[
             Block(
-                txs=[tx1, tx2],
+                txs=[tx_deploy, tx_call],
                 expected_block_access_list=BlockAccessListExpectation(
                     account_expectations=account_expectations
                 ),
             )
         ],
         post={
-            alice: Account(nonce=2),
-            contract: Account(storage={0: 0x0}),
+            target: Account(
+                nonce=1, code=bytes(runtime), storage={0: sentinel}
+            ),
+            factory: Account(nonce=2, storage={0: target}),
+        },
+    )
+
+
+@pytest.mark.parametrize(
+    "failure_mode",
+    [
+        pytest.param("none", id="no_failure"),
+        pytest.param("collision", id="mid_chain_collision"),
+        pytest.param("oog", id="mid_chain_oog"),
+    ],
+)
+@pytest.mark.pre_alloc_mutable()
+def test_bal_cross_tx_factory_nonce_create_chain(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    fork: Fork,
+    failure_mode: str,
+) -> None:
+    """
+    Cross-tx CREATE chain: 8 senders share a factory whose CREATE
+    address derives solely from `factory.nonce`. `collision` and `oog`
+    test opposite parallelization hazards mid-chain — collision still
+    bumps factory.nonce (later txs slide forward), OOG does not (later
+    txs slide backward, reusing the OOG'd slot).
+    """
+    chain_length = 8
+    failure_index = 3 if failure_mode in ("collision", "oog") else None
+
+    factory_code = (
+        Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
+        + Op.CREATE(0, 0, Op.CALLDATASIZE)
+        + Op.STOP
+    )
+    factory = pre.deploy_contract(code=factory_code)
+    factory_pre_nonce = 1
+
+    deploy_code = Op.STOP
+    initcode = Initcode(deploy_code=deploy_code)
+    collision_code = Op.PUSH1(0x42) + Op.STOP
+
+    targets = [
+        compute_create_address(address=factory, nonce=factory_pre_nonce + k)
+        for k in range(chain_length)
+    ]
+
+    if failure_mode == "collision":
+        assert failure_index is not None
+        pre[targets[failure_index]] = Account(code=collision_code)
+
+    sequence: list[dict] = []
+    factory_nonce = factory_pre_nonce
+    for i in range(chain_length):
+        block_idx = i + 1
+        if failure_mode == "oog" and i == failure_index:
+            sequence.append(
+                {"block_idx": block_idx, "target_idx": None, "deployed": False}
+            )
+        else:
+            target_idx = factory_nonce - factory_pre_nonce
+            factory_nonce += 1
+            deployed = not (failure_mode == "collision" and i == failure_index)
+            sequence.append(
+                {
+                    "block_idx": block_idx,
+                    "factory_post_nonce": factory_nonce,
+                    "target_idx": target_idx,
+                    "deployed": deployed,
+                }
+            )
+
+    senders = [pre.fund_eoa() for _ in range(chain_length)]
+    # OOG tx: intrinsic + 1 — valid to include but no gas to run CREATE.
+    intrinsic = fork.transaction_intrinsic_cost_calculator()(
+        calldata=bytes(initcode), contract_creation=False, access_list=[]
+    )
+    txs = [
+        Transaction(
+            sender=senders[i],
+            to=factory,
+            data=initcode,
+            gas_limit=(
+                intrinsic + 1
+                if failure_mode == "oog" and i == failure_index
+                else fork.transaction_gas_limit_cap()
+            ),
+        )
+        for i in range(chain_length)
+    ]
+
+    account_expectations: dict = {
+        senders[i]: BalAccountExpectation(
+            nonce_changes=[
+                BalNonceChange(block_access_index=i + 1, post_nonce=1)
+            ],
+        )
+        for i in range(chain_length)
+    }
+    # Factory: only txs that bumped its nonce contribute entries.
+    account_expectations[factory] = BalAccountExpectation(
+        nonce_changes=[
+            BalNonceChange(
+                block_access_index=s["block_idx"],
+                post_nonce=s["factory_post_nonce"],
+            )
+            for s in sequence
+            if s["target_idx"] is not None
+        ],
+    )
+    for s in sequence:
+        if s["target_idx"] is None:
+            continue
+        target = targets[s["target_idx"]]
+        if s["deployed"]:
+            account_expectations[target] = BalAccountExpectation(
+                nonce_changes=[
+                    BalNonceChange(
+                        block_access_index=s["block_idx"], post_nonce=1
+                    )
+                ],
+                code_changes=[
+                    BalCodeChange(
+                        block_access_index=s["block_idx"],
+                        new_code=deploy_code,
+                    )
+                ],
+            )
+        else:
+            # Collision: accessed during EIP-684 check, no state change.
+            account_expectations[target] = BalAccountExpectation.empty()
+
+    touched_target_idxs = {
+        s["target_idx"] for s in sequence if s["target_idx"] is not None
+    }
+    final_factory_nonce = factory_pre_nonce + len(touched_target_idxs)
+    post: dict = {
+        factory: Account(nonce=final_factory_nonce),
+        **{sender: Account(nonce=1) for sender in senders},
+    }
+    for s in sequence:
+        if s["target_idx"] is None:
+            continue
+        target = targets[s["target_idx"]]
+        post[target] = (
+            Account(nonce=1, code=deploy_code)
+            if s["deployed"]
+            else Account(code=collision_code)
+        )
+    for k, target in enumerate(targets):
+        if k not in touched_target_idxs:
+            post[target] = Account.NONEXISTENT
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=txs,
+                expected_block_access_list=BlockAccessListExpectation(
+                    account_expectations=account_expectations
+                ),
+            )
+        ],
+        post=post,
+    )
+
+
+@pytest.mark.parametrize(
+    "funding_method",
+    ["direct_call", "selfdestruct"],
+)
+def test_bal_cross_tx_balance_dependency(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    funding_method: str,
+) -> None:
+    """
+    Verify clients apply Tx1's balance change before executing Tx2 in
+    the same block. Tx1 routes value into a contract; Tx2 invokes the
+    contract which records its `SELFBALANCE` to storage. A client that
+    parallelizes Tx2 without applying Tx1's `balance_changes` would
+    record the pre-block balance, yielding a different state root. The
+    `selfdestruct` variant routes the funds via SELFDESTRUCT from a
+    pre-funded killer contract so the recipient's bytecode never runs
+    in Tx1 — catching any client optimization that ties balance
+    tracking to code execution.
+    """
+    transferred = 1
+    alice = pre.fund_eoa()
+    bob = pre.fund_eoa()
+
+    # Any non-empty calldata triggers the SELFBALANCE record path;
+    # empty calldata is the value-receiver path.
+    contract = pre.deploy_contract(
+        code=Conditional(
+            condition=Op.ISZERO(Op.CALLDATASIZE),
+            if_true=Op.STOP,
+            if_false=Op.SSTORE(0, Op.SELFBALANCE),
+        ),
+    )
+
+    if funding_method == "direct_call":
+        tx_send = Transaction(
+            sender=alice,
+            to=contract,
+            value=transferred,
+            gas_limit=100_000,
+        )
+        send_expectations: dict = {}
+    elif funding_method == "selfdestruct":
+        killer = pre.deploy_contract(
+            code=Op.SELFDESTRUCT(contract),
+            balance=transferred,
+        )
+        tx_send = Transaction(
+            sender=alice,
+            to=killer,
+            gas_limit=100_000,
+        )
+        send_expectations = {
+            killer: BalAccountExpectation(
+                balance_changes=[
+                    BalBalanceChange(block_access_index=1, post_balance=0),
+                ],
+            ),
+        }
+    else:
+        raise ValueError(f"unknown funding_method: {funding_method}")
+
+    tx_read = Transaction(
+        sender=bob,
+        to=contract,
+        data=b"\x01",
+        gas_limit=100_000,
+    )
+
+    account_expectations = {
+        contract: BalAccountExpectation(
+            balance_changes=[
+                BalBalanceChange(
+                    block_access_index=1, post_balance=transferred
+                ),
+            ],
+            storage_changes=[
+                BalStorageSlot(
+                    slot=0,
+                    slot_changes=[
+                        BalStorageChange(
+                            block_access_index=2, post_value=transferred
+                        ),
+                    ],
+                ),
+            ],
+        ),
+        **send_expectations,
+    }
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=[tx_send, tx_read],
+                expected_block_access_list=BlockAccessListExpectation(
+                    account_expectations=account_expectations
+                ),
+            )
+        ],
+        post={
+            contract: Account(balance=transferred, storage={0: transferred}),
+        },
+    )
+
+
+@pytest.mark.parametrize(
+    "eunice_outcome",
+    [
+        pytest.param("success", id="success"),
+        pytest.param("oog_minus_1", id="oog_minus_1"),
+        pytest.param(
+            "insufficient_funds",
+            id="insufficient_funds",
+            marks=pytest.mark.exception_test,
+        ),
+    ],
+)
+def test_bal_cross_tx_funding_chain(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    fork: Fork,
+    eunice_outcome: str,
+) -> None:
+    """
+    Funding chain: alice → bob → charlie → dan → eunice → target. Each
+    intermediate starts empty and must receive the prior tx's forwarded
+    value to afford its own upfront gas + outgoing transfer. A client
+    that parallelizes any later tx against pre-block state would see a
+    zero balance on its sender and wrongly reject the block. The
+    `oog_minus_1` variant funds eunice with exactly `gas_limit - 1`
+    worth of gas so her SSTORE OOGs at the boundary (target's BAL flips
+    from `storage_changes` to `storage_reads`). The `insufficient_funds`
+    variant has dan forward one wei short of eunice's `gas_limit *
+    gas_price`, so eunice's tx is rejected pre-execution and the entire
+    block MUST be rejected with `INSUFFICIENT_ACCOUNT_FUNDS` — a sanity
+    check on the off-by-one boundary of the upfront balance check.
+    """
+    gas_price = 0xA
+
+    target_code = Op.SSTORE(
+        0, 0xC0FFEE, key_warm=False, original_value=0, new_value=0xC0FFEE
+    )
+    target = pre.deploy_contract(code=target_code)
+
+    intrinsic_calc = fork.transaction_intrinsic_cost_calculator()
+    intrinsic_gas = intrinsic_calc()
+    eunice_exact_gas = intrinsic_gas + target_code.gas_cost(fork)
+    eunice_gas_limit = (
+        eunice_exact_gas - 1
+        if eunice_outcome == "oog_minus_1"
+        else eunice_exact_gas
+    )
+    eunice_upfront = eunice_gas_limit * gas_price
+    transfer_cost = intrinsic_gas * gas_price
+
+    # Each sender (including alice) starts with or receives exactly what
+    # the next forward + its own gas demands; everyone ends at zero in
+    # the success/oog variants. `insufficient_funds` shorts eunice by
+    # one wei via dan, leaving her unable to cover upfront gas.
+    dan_value = (
+        eunice_upfront - 1
+        if eunice_outcome == "insufficient_funds"
+        else eunice_upfront
+    )
+    charlie_value = transfer_cost + dan_value
+    bob_value = transfer_cost + charlie_value
+    alice_value = transfer_cost + bob_value
+    alice_pre_balance = transfer_cost + alice_value
+
+    alice = pre.fund_eoa(amount=alice_pre_balance)
+    bob = pre.fund_eoa(amount=0)
+    charlie = pre.fund_eoa(amount=0)
+    dan = pre.fund_eoa(amount=0)
+    eunice = pre.fund_eoa(amount=0)
+
+    eunice_error = (
+        TransactionException.INSUFFICIENT_ACCOUNT_FUNDS
+        if eunice_outcome == "insufficient_funds"
+        else None
+    )
+
+    txs = [
+        Transaction(
+            sender=alice,
+            to=bob,
+            value=alice_value,
+            gas_limit=intrinsic_gas,
+            gas_price=gas_price,
+        ),
+        Transaction(
+            sender=bob,
+            to=charlie,
+            value=bob_value,
+            gas_limit=intrinsic_gas,
+            gas_price=gas_price,
+        ),
+        Transaction(
+            sender=charlie,
+            to=dan,
+            value=charlie_value,
+            gas_limit=intrinsic_gas,
+            gas_price=gas_price,
+        ),
+        Transaction(
+            sender=dan,
+            to=eunice,
+            value=dan_value,
+            gas_limit=intrinsic_gas,
+            gas_price=gas_price,
+        ),
+        Transaction(
+            sender=eunice,
+            to=target,
+            gas_limit=eunice_gas_limit,
+            gas_price=gas_price,
+            error=eunice_error,
+        ),
+    ]
+
+    if eunice_outcome == "insufficient_funds":
+        blockchain_test(
+            pre=pre,
+            blocks=[
+                Block(
+                    txs=txs,
+                    exception=(
+                        TransactionException.INSUFFICIENT_ACCOUNT_FUNDS
+                    ),
+                )
+            ],
+            post={},
+        )
+        return
+
+    if eunice_outcome == "oog_minus_1":
+        target_bal = BalAccountExpectation(
+            storage_reads=[0],
+            nonce_changes=[],
+            balance_changes=[],
+            code_changes=[],
+            storage_changes=[],
+        )
+        target_post = Account(storage={})
+    elif eunice_outcome == "success":
+        target_bal = BalAccountExpectation(
+            storage_changes=[
+                BalStorageSlot(
+                    slot=0,
+                    slot_changes=[
+                        BalStorageChange(
+                            block_access_index=5, post_value=0xC0FFEE
+                        ),
+                    ],
+                ),
+            ],
+            nonce_changes=[],
+            balance_changes=[],
+            code_changes=[],
+            storage_reads=[],
+        )
+        target_post = Account(storage={0: 0xC0FFEE})
+    else:
+        raise ValueError(f"unknown eunice_outcome: {eunice_outcome}")
+
+    account_expectations = {
+        alice: BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=1, post_nonce=1)],
+            balance_changes=[
+                BalBalanceChange(block_access_index=1, post_balance=0),
+            ],
+        ),
+        bob: BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=2, post_nonce=1)],
+            balance_changes=[
+                BalBalanceChange(
+                    block_access_index=1, post_balance=alice_value
+                ),
+                BalBalanceChange(block_access_index=2, post_balance=0),
+            ],
+        ),
+        charlie: BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=3, post_nonce=1)],
+            balance_changes=[
+                BalBalanceChange(block_access_index=2, post_balance=bob_value),
+                BalBalanceChange(block_access_index=3, post_balance=0),
+            ],
+        ),
+        dan: BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=4, post_nonce=1)],
+            balance_changes=[
+                BalBalanceChange(
+                    block_access_index=3, post_balance=charlie_value
+                ),
+                BalBalanceChange(block_access_index=4, post_balance=0),
+            ],
+        ),
+        eunice: BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=5, post_nonce=1)],
+            balance_changes=[
+                BalBalanceChange(block_access_index=4, post_balance=dan_value),
+                BalBalanceChange(block_access_index=5, post_balance=0),
+            ],
+        ),
+        target: target_bal,
+    }
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=txs,
+                expected_block_access_list=BlockAccessListExpectation(
+                    account_expectations=account_expectations,
+                ),
+            )
+        ],
+        post={
+            alice: Account(nonce=1, balance=0),
+            bob: Account(nonce=1, balance=0),
+            charlie: Account(nonce=1, balance=0),
+            dan: Account(nonce=1, balance=0),
+            eunice: Account(nonce=1, balance=0),
+            target: target_post,
         },
     )
 
@@ -2290,6 +3270,7 @@ def test_bal_cross_block_ripemd160_state_leak(
     )
 
 
+@EIPChecklist.BlockLevelConstraint.Test.Content.TransactionTypes()
 def test_bal_all_transaction_types(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
@@ -2649,14 +3630,26 @@ def test_bal_lexicographic_address_ordering(
     )
 
 
+@EIPChecklist.BlockLevelConstraint.Test.Boundary.Under()
+@EIPChecklist.BlockLevelConstraint.Test.Boundary.Exact()
+@EIPChecklist.BlockLevelConstraint.Test.Boundary.Over()
+@pytest.mark.parametrize(
+    "with_cl_withdrawal",
+    [
+        pytest.param(False, id="no_cl_withdrawal"),
+        pytest.param(True, id="with_cl_withdrawal"),
+    ],
+)
+@pytest.mark.parametrize(
+    "with_tx",
+    [pytest.param(False, id="no_tx"), pytest.param(True, id="with_tx")],
+)
 @pytest.mark.parametrize(
     "boundary_offset",
     [
         pytest.param(0, id="at_boundary"),
         pytest.param(
-            -1,
-            marks=pytest.mark.exception_test,
-            id="below_boundary",
+            -1, marks=pytest.mark.exception_test, id="below_boundary"
         ),
     ],
 )
@@ -2665,28 +3658,94 @@ def test_bal_gas_limit_boundary(
     pre: Alloc,
     fork: Fork,
     boundary_offset: int,
+    with_tx: bool,
+    with_cl_withdrawal: bool,
 ) -> None:
     """
-    Test the BAL max items gas limit boundary for an empty block.
-
-    The consensus rule requires
-    ``bal_items <= block_gas_limit // GAS_BLOCK_ACCESS_LIST_ITEM``.
-    The boundary gas limit is derived from the fork's system-contract
-    BAL footprint.  At the boundary the check passes; one below it fails.
+    BAL max-items cap (``bal_items <= block_gas_limit //
+    BLOCK_ACCESS_LIST_ITEM``) must be enforced on the **final** BAL —
+    including pre-tx system work (beacon root, history), user txs, and
+    post-tx system work (CL withdrawals, queue processing).
+
+    Orthogonal axes:
+    - `with_tx`: alice → bob transfer adds 3 items (alice + bob +
+      coinbase warmed via EIP-3651).
+    - `with_cl_withdrawal`: EIP-4895 withdrawal to a recipient adds 1
+      item, processed between txs and the rest of the post-tx system
+      work. Together they catch clients that validate the cap before
+      `process_withdrawals` runs.
     """
-    # EIP-7928
-    # bal_items <= block_gas_limit // ITEM_COST
-    min_gas_limit = (
-        fork.empty_block_bal_item_count()
-        * fork.gas_costs().GAS_BLOCK_ACCESS_LIST_ITEM
+    # Match framework's DEFAULT_BASE_FEE so gas_price == base_fee
+    # cancels the priority fee (no coinbase balance_change to absorb
+    # into the expected counts).
+    base_fee_per_gas = 7
+
+    extra_items = 0
+    txs: list = []
+    withdrawals: list = []
+    expected_accounts: dict = {}
+    post: dict = {}
+
+    if with_tx:
+        alice = pre.fund_eoa()
+        bob = pre.fund_eoa(amount=0)
+        # alice (sender) + bob (recipient) + coinbase (EIP-3651 warm).
+        extra_items += 3
+        txs.append(
+            Transaction(
+                sender=alice,
+                to=bob,
+                value=1,
+                gas_limit=21_000,
+                gas_price=base_fee_per_gas,
+            )
+        )
+        expected_accounts[alice] = BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=1, post_nonce=1)],
+        )
+        expected_accounts[bob] = BalAccountExpectation(
+            balance_changes=[
+                BalBalanceChange(block_access_index=1, post_balance=1)
+            ],
+        )
+        post[bob] = Account(balance=1)
+
+    if with_cl_withdrawal:
+        charlie = pre.fund_eoa(amount=0)
+        withdrawal_amount_wei = 10**9  # 1 gwei
+        # CL withdrawal recipient adds 1 item; processed at
+        # block_access_index = len(txs) + 1 (post-tx).
+        extra_items += 1
+        withdrawals.append(
+            Withdrawal(index=0, validator_index=0, address=charlie, amount=1)
+        )
+        expected_accounts[charlie] = BalAccountExpectation(
+            balance_changes=[
+                BalBalanceChange(
+                    block_access_index=len(txs) + 1,
+                    post_balance=withdrawal_amount_wei,
+                )
+            ],
+        )
+        post[charlie] = Account(balance=withdrawal_amount_wei)
+
+    total_items = fork.empty_block_bal_item_count() + extra_items
+    gas_limit = (
+        total_items * fork.gas_costs().BLOCK_ACCESS_LIST_ITEM + boundary_offset
     )
-    gas_limit = min_gas_limit + boundary_offset
 
+    at_boundary = boundary_offset == 0
     block = Block(
-        txs=[],
+        txs=txs,
+        withdrawals=withdrawals,
         exception=(
-            BlockException.BLOCK_ACCESS_LIST_GAS_LIMIT_EXCEEDED
-            if boundary_offset < 0
+            None
+            if at_boundary
+            else BlockException.BLOCK_ACCESS_LIST_GAS_LIMIT_EXCEEDED
+        ),
+        expected_block_access_list=(
+            BlockAccessListExpectation(account_expectations=expected_accounts)
+            if at_boundary and expected_accounts
             else None
         ),
     )
@@ -2694,6 +3753,163 @@ def test_bal_gas_limit_boundary(
     blockchain_test(
         pre=pre,
         blocks=[block],
-        post={},
-        genesis_environment=Environment(gas_limit=gas_limit),
+        post=post if at_boundary else {},
+        genesis_environment=Environment(
+            base_fee_per_gas=base_fee_per_gas, gas_limit=gas_limit
+        ),
+    )
+
+
+@pytest.mark.parametrize(
+    "pre_value",
+    [
+        pytest.param(0x00, id="slot_starts_empty"),
+        pytest.param(0x11, id="slot_starts_nonzero"),
+        pytest.param(0xBB, id="intermediate_equals_pre"),
+    ],
+)
+def test_bal_intra_tx_multiple_sstores_same_slot(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    pre_value: int,
+) -> None:
+    """
+    Test that consecutive SSTOREs to the same slot within one tx produce a
+    single storage change with the final post-value; intermediate writes
+    (0xAA, 0xBB) must not appear in the BAL.
+    """
+    alice = pre.fund_eoa(amount=10**18)
+
+    code = (
+        Op.SSTORE(0x01, 0xAA) + Op.SSTORE(0x01, 0xBB) + Op.SSTORE(0x01, 0xCC)
+    )
+    contract = pre.deploy_contract(code=code, storage={0x01: pre_value})
+
+    tx = Transaction(
+        sender=alice,
+        to=contract,
+        gas_limit=200_000,
+    )
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=[tx],
+                expected_block_access_list=BlockAccessListExpectation(
+                    account_expectations={
+                        alice: BalAccountExpectation(
+                            nonce_changes=[
+                                BalNonceChange(
+                                    block_access_index=1, post_nonce=1
+                                ),
+                            ],
+                        ),
+                        contract: BalAccountExpectation(
+                            storage_changes=[
+                                BalStorageSlot(
+                                    slot=0x01,
+                                    slot_changes=[
+                                        BalStorageChange(
+                                            block_access_index=1,
+                                            post_value=0xCC,
+                                        ),
+                                    ],
+                                ),
+                            ],
+                            storage_reads=[],
+                            balance_changes=[],
+                            code_changes=[],
+                            absent_values=BalAccountAbsentValues(
+                                storage_changes=[
+                                    BalStorageSlot(
+                                        slot=0x01,
+                                        slot_changes=[
+                                            BalStorageChange(
+                                                block_access_index=1,
+                                                post_value=0xAA,
+                                            ),
+                                            BalStorageChange(
+                                                block_access_index=1,
+                                                post_value=0xBB,
+                                            ),
+                                        ],
+                                    ),
+                                ],
+                            ),
+                        ),
+                    }
+                ),
+            )
+        ],
+        post={
+            alice: Account(nonce=1),
+            contract: Account(storage={0x01: 0xCC}),
+        },
+    )
+
+
+@pytest.mark.parametrize(
+    "pre_value,writes",
+    [
+        pytest.param(
+            0xCC, [0xAA, 0xBB, 0xCC], id="nonzero_pre_returns_to_pre"
+        ),
+        pytest.param(
+            0x00, [0xAA, 0xBB, 0x00], id="empty_pre_ephemeral_writes"
+        ),
+    ],
+)
+def test_bal_intra_tx_sstores_same_slot_net_zero(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    pre_value: int,
+    writes: list[int],
+) -> None:
+    """
+    Test that consecutive SSTOREs to the same slot within one tx with a
+    net-zero result are filtered: the slot must appear in storage_reads
+    (it was accessed) but must not appear in storage_changes.
+    """
+    alice = pre.fund_eoa(amount=10**18)
+
+    code = Op.SSTORE(0x01, writes[0])
+    for v in writes[1:]:
+        code += Op.SSTORE(0x01, v)
+    contract = pre.deploy_contract(code=code, storage={0x01: pre_value})
+
+    tx = Transaction(
+        sender=alice,
+        to=contract,
+        gas_limit=200_000,
+    )
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=[tx],
+                expected_block_access_list=BlockAccessListExpectation(
+                    account_expectations={
+                        alice: BalAccountExpectation(
+                            nonce_changes=[
+                                BalNonceChange(
+                                    block_access_index=1, post_nonce=1
+                                ),
+                            ],
+                        ),
+                        contract: BalAccountExpectation(
+                            storage_reads=[0x01],
+                            storage_changes=[],
+                            balance_changes=[],
+                            code_changes=[],
+                        ),
+                    }
+                ),
+            )
+        ],
+        post={
+            alice: Account(nonce=1),
+            contract: Account(storage={0x01: pre_value}),
+        },
     )
diff --git a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_cross_index.py b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_cross_index.py
index 9d32fdf1231..557bd98b420 100644
--- a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_cross_index.py
+++ b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_cross_index.py
@@ -14,7 +14,10 @@
     Account,
     Address,
     Alloc,
+    BalAccountAbsentValues,
     BalAccountExpectation,
+    BalBalanceChange,
+    BalNonceChange,
     BalStorageChange,
     BalStorageSlot,
     Block,
@@ -25,6 +28,8 @@
     Transaction,
 )
 
+from ...prague.eip7002_el_triggerable_withdrawals.spec import Spec as Spec7002
+from ...prague.eip7251_consolidations.spec import Spec as Spec7251
 from .spec import ref_spec_7928
 
 REFERENCE_SPEC_GIT_PATH = ref_spec_7928.git_path
@@ -33,10 +38,10 @@
 pytestmark = pytest.mark.valid_from("Amsterdam")
 
 WITHDRAWAL_REQUEST_ADDRESS = Address(
-    0x00000961EF480EB55E80D19AD83579A64C007002
+    Spec7002.WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS
 )
 CONSOLIDATION_REQUEST_ADDRESS = Address(
-    0x0000BBDDC7CE488642FB579F8B00F3A590007251
+    Spec7251.CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS
 )
 
 
@@ -264,6 +269,97 @@ def test_bal_noop_write_filtering(
     )
 
 
+def test_bal_intra_tx_round_trip_after_prior_tx_write(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+) -> None:
+    """
+    Verify a per-tx no-op SSTORE round-trip is not recorded as a storage
+    change when an earlier tx in the same block wrote the slot.
+
+    Per EIP-7928 §Storage, a write is compared against "the storage value
+    as of immediately before the current `block_access_index` (i.e., the
+    cumulative state from all prior indices, falling back to the pre-block
+    state)", and "a no-op write MUST NOT remove `storage_changes` entries
+    from earlier indices for the same slot".
+
+    Both txs call the same contract whose runtime SSTOREs 0xff then 0x42
+    to slot 1. Tx 1 changes slot 1 from 0 to 0x42 (real change). Tx 1's
+    write becomes tx 2's baseline, so tx 2's 0x42 -> 0xff -> 0x42 nets to
+    a no-op and only tx 1 appears in `storage_changes` (with tx 1's entry
+    left intact).
+    """
+    # Runtime: write 0xff to slot 1, then write 0x42 to slot 1, STOP.
+    # The two SSTOREs hit the journal at every call, but the net effect
+    # on the slot is `pre_value -> 0x42` — a no-op when pre_value == 0x42.
+    contract_code = Bytecode(Op.SSTORE(1, 0xFF) + Op.SSTORE(1, 0x42) + Op.STOP)
+    contract = pre.deploy_contract(code=contract_code)
+
+    sender_a = pre.fund_eoa()
+    sender_b = pre.fund_eoa()
+
+    # Both txs go into the same block; tx 1 makes the real 0 -> 0x42
+    # change, tx 2 starts from 0x42 and ends at 0x42 (per-tx no-op).
+    tx_1 = Transaction(sender=sender_a, to=contract, gas_limit=200_000)
+    tx_2 = Transaction(sender=sender_b, to=contract, gas_limit=200_000)
+
+    expected_block_access_list = BlockAccessListExpectation(
+        account_expectations={
+            contract: BalAccountExpectation(
+                # Only tx 1's real change appears. Tx 2's same-value
+                # round-trip MUST be classified as a read for tx 2.
+                storage_changes=[
+                    BalStorageSlot(
+                        slot=1,
+                        slot_changes=[
+                            BalStorageChange(
+                                block_access_index=1, post_value=0x42
+                            ),
+                        ],
+                    ),
+                ],
+                # `storage_changes` is only verified as a sub-sequence
+                # at fill time, so this additional check guards against a
+                # reference regression that emits tx 2's no-op as a
+                # spurious index-2 change.
+                absent_values=BalAccountAbsentValues(
+                    storage_changes=[
+                        BalStorageSlot(
+                            slot=1,
+                            slot_changes=[
+                                BalStorageChange(
+                                    block_access_index=2, post_value=0x42
+                                ),
+                            ],
+                        ),
+                    ],
+                ),
+            ),
+            sender_a: BalAccountExpectation(
+                nonce_changes=[
+                    BalNonceChange(block_access_index=1, post_nonce=1),
+                ],
+            ),
+            sender_b: BalAccountExpectation(
+                nonce_changes=[
+                    BalNonceChange(block_access_index=2, post_nonce=1),
+                ],
+            ),
+        }
+    )
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=[tx_1, tx_2],
+                expected_block_access_list=expected_block_access_list,
+            ),
+        ],
+        post={contract: Account(storage={1: 0x42})},
+    )
+
+
 def test_bal_system_contract_noop_filtering(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
@@ -316,3 +412,116 @@ def test_bal_system_contract_noop_filtering(
             receiver: Account(balance=100),
         },
     )
+
+
+def test_bal_withdrawal_predeploy_balance_observed_cross_tx(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+) -> None:
+    """
+    Test that a subsequent transaction observes the post-state balance of the
+    withdrawal predeploy after a prior transaction in the same block paid the
+    withdrawal fee.
+
+    Within one block:
+      - tx 0: EOA sends `fee` wei to WITHDRAWAL_REQUEST_PREDEPLOY with a valid
+        withdrawal-request calldata. The predeploy retains the fee, so its
+        balance transitions 0 -> fee (BAL balance_change at index 1).
+      - tx 1: calls a reader contract that performs
+        `SSTORE(0, BALANCE(WITHDRAWAL_REQUEST_PREDEPLOY))`.
+
+    Per EIP-7928, the BAL prefix consumed by tx 1's execution must include
+    tx 0's balance change for the predeploy, so the BALANCE opcode returns
+    `fee` and slot 0 of the reader ends at `fee`. The predeploy is also
+    touched by the prepare-block system call (storage reads at slots 0-3),
+    making its address one whose pre-block snapshot would otherwise mask the
+    BAL overlay if consulted ahead of the BAL prefix.
+    """
+    fee = 1  # Spec7002.get_fee(0) is 1 when excess == 0; one request fits.
+    withdrawal_calldata = (
+        (b"\x01" + b"\x00" * 47)  # 48-byte validator pubkey
+        + (b"\x00" * 8)  # 8-byte amount
+    )
+
+    sender_0 = pre.fund_eoa()
+    sender_1 = pre.fund_eoa()
+
+    reader = pre.deploy_contract(
+        code=Bytecode(
+            Op.SSTORE(
+                0,
+                Op.BALANCE(WITHDRAWAL_REQUEST_ADDRESS),
+            )
+            + Op.STOP
+        ),
+    )
+
+    tx_pay_fee = Transaction(
+        sender=sender_0,
+        to=WITHDRAWAL_REQUEST_ADDRESS,
+        value=fee,
+        data=withdrawal_calldata,
+        gas_limit=1_000_000,
+    )
+
+    tx_read_balance = Transaction(
+        sender=sender_1,
+        to=reader,
+        gas_limit=100_000,
+    )
+
+    expected_block_access_list = BlockAccessListExpectation(
+        account_expectations={
+            # Predeploy: tx 0 records the fee as a BAL balance_change at
+            # index 1; the framework also verifies the system-call storage
+            # behaviour through its own post-execution invariants.
+            WITHDRAWAL_REQUEST_ADDRESS: BalAccountExpectation(
+                balance_changes=[
+                    BalBalanceChange(
+                        block_access_index=1,
+                        post_balance=fee,
+                    ),
+                ],
+            ),
+            # Reader: tx 1 stores the predeploy balance at slot 0.
+            # If the consumed BAL prefix did not surface tx 0's balance
+            # change to BALANCE, post_value would be 0 and the assertion
+            # below would fail.
+            reader: BalAccountExpectation(
+                storage_changes=[
+                    BalStorageSlot(
+                        slot=0,
+                        slot_changes=[
+                            BalStorageChange(
+                                block_access_index=2,
+                                post_value=fee,
+                            ),
+                        ],
+                    ),
+                ],
+            ),
+            sender_0: BalAccountExpectation(
+                nonce_changes=[
+                    BalNonceChange(block_access_index=1, post_nonce=1),
+                ],
+            ),
+            sender_1: BalAccountExpectation(
+                nonce_changes=[
+                    BalNonceChange(block_access_index=2, post_nonce=1),
+                ],
+            ),
+        }
+    )
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=[tx_pay_fee, tx_read_balance],
+                expected_block_access_list=expected_block_access_list,
+            ),
+        ],
+        post={
+            reader: Account(storage={0: fee}),
+        },
+    )
diff --git a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip2935.py b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip2935.py
index f4409671c9c..72ca12b5de7 100644
--- a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip2935.py
+++ b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip2935.py
@@ -226,11 +226,13 @@ def test_bal_2935_query(
         [block_hash_slot] if is_valid else []
     )
 
-    # Add balance changes if value is transferred and query is valid
-    if value > 0 and is_valid:
-        account_expectations[HISTORY_STORAGE_ADDRESS].balance_changes = [
-            BalBalanceChange(block_access_index=1, post_balance=value)
-        ]
+    # Balance changes for callee: credited if valid, must be empty if invalid
+    if value > 0:
+        account_expectations[HISTORY_STORAGE_ADDRESS].balance_changes = (
+            [BalBalanceChange(block_access_index=1, post_balance=value)]
+            if is_valid
+            else []
+        )
 
     account_expectations[alice] = BalAccountExpectation(
         nonce_changes=[BalNonceChange(block_access_index=1, post_nonce=1)],
@@ -426,6 +428,8 @@ def test_bal_2935_invalid_calldata_size(
     account_expectations = block_hash_system_call_expectations(1)
     # History storage contract reverts before any storage access
     account_expectations[HISTORY_STORAGE_ADDRESS].storage_reads = []
+    if value > 0:
+        account_expectations[HISTORY_STORAGE_ADDRESS].balance_changes = []
 
     account_expectations[alice] = BalAccountExpectation(
         nonce_changes=[BalNonceChange(block_access_index=1, post_nonce=1)],
diff --git a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip4788.py b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip4788.py
index 02c0c6fdd96..65e0b376dc7 100644
--- a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip4788.py
+++ b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip4788.py
@@ -321,11 +321,13 @@ def test_bal_4788_query(
         else [timestamp_slot]
     )
 
-    # Add balance changes if value is transferred
-    if value > 0 and is_valid:
-        account_expectations[BEACON_ROOTS_ADDRESS].balance_changes = [
-            BalBalanceChange(block_access_index=1, post_balance=value)
-        ]
+    # Balance changes for callee: credited if valid, must be empty if invalid
+    if value > 0:
+        account_expectations[BEACON_ROOTS_ADDRESS].balance_changes = (
+            [BalBalanceChange(block_access_index=1, post_balance=value)]
+            if is_valid
+            else []
+        )
 
     # Add transaction-specific expectations
     account_expectations[alice] = BalAccountExpectation(
@@ -386,6 +388,120 @@ def test_bal_4788_query(
     )
 
 
+@pytest.mark.parametrize(
+    "calldata_size",
+    [
+        pytest.param(0, id="empty_calldata"),
+        pytest.param(31, id="calldata_too_short"),
+        pytest.param(33, id="calldata_too_long"),
+    ],
+)
+@pytest.mark.parametrize(
+    "value",
+    [
+        pytest.param(0, id="no_value"),
+        pytest.param(100, id="with_value"),
+    ],
+)
+def test_bal_4788_invalid_calldata_size(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    fork: Fork,
+    calldata_size: int,
+    value: int,
+) -> None:
+    """
+    Ensure BAL correctly handles EIP-4788 queries with invalid calldata size.
+
+    EIP-4788 requires exactly 32 bytes of calldata (a timestamp). Any other
+    size causes immediate revert before any storage access occurs.
+
+    Test scenarios with and without value transfer:
+    1. Empty calldata (0 bytes): Reverts immediately
+    2. Too short (31 bytes): Reverts before storage access
+    3. Too long (33 bytes): Reverts before storage access
+    """
+    alice = pre.fund_eoa()
+
+    block_timestamp = 12
+    beacon_root = Hash(0xABCDEF)
+
+    # Contract that calls beacon roots contract with variable-size calldata
+    # and stores returned beacon root in slot 0
+    query_code = (
+        Op.CALLDATACOPY(0, 0, calldata_size)
+        + Op.CALL(
+            Spec.BEACON_ROOTS_CALL_GAS,
+            BEACON_ROOTS_ADDRESS,
+            Op.CALLVALUE,
+            0,
+            calldata_size,
+            32,
+            32,
+        )
+        + Op.SSTORE(0, Op.MLOAD(32))
+    )
+    query_contract = pre.deploy_contract(query_code)
+
+    # Pad calldata to requested size
+    calldata = b"\x00" * calldata_size
+
+    tx = Transaction(
+        sender=alice,
+        to=query_contract,
+        data=calldata,
+        value=value,
+        gas_limit=fork.transaction_gas_limit_cap(),
+    )
+
+    account_expectations = beacon_root_system_call_expectations(
+        block_timestamp, beacon_root
+    )
+    # Beacon roots contract reverts before any storage access
+    account_expectations[BEACON_ROOTS_ADDRESS].storage_reads = []
+    if value > 0:
+        account_expectations[BEACON_ROOTS_ADDRESS].balance_changes = []
+
+    account_expectations[alice] = BalAccountExpectation(
+        nonce_changes=[BalNonceChange(block_access_index=1, post_nonce=1)],
+    )
+
+    account_expectations[query_contract] = BalAccountExpectation(
+        # SSTORE(0, 0) is a no-op write, becomes implicit read
+        storage_reads=[0],
+        storage_changes=[],
+        # Value stays in query contract when call reverts
+        balance_changes=[
+            BalBalanceChange(block_access_index=1, post_balance=value)
+        ]
+        if value > 0
+        else [],
+    )
+
+    block = Block(
+        txs=[tx],
+        parent_beacon_block_root=beacon_root,
+        timestamp=block_timestamp,
+        expected_block_access_list=BlockAccessListExpectation(
+            account_expectations=account_expectations
+        ),
+    )
+
+    post_state: dict[Address, Account] = {
+        alice: Account(nonce=1),
+        query_contract: Account(storage={0: 0}),
+    }
+
+    if value > 0:
+        post_state[query_contract] = Account(storage={0: 0}, balance=value)
+
+    blockchain_test(
+        pre=pre,
+        blocks=[block],
+        post=post_state,
+    )
+
+
 def test_bal_4788_selfdestruct_to_beacon_root(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
diff --git a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip4895.py b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip4895.py
index 5f1781869d4..d72f262c240 100644
--- a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip4895.py
+++ b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip4895.py
@@ -15,6 +15,7 @@
     Block,
     BlockAccessListExpectation,
     BlockchainTestFiller,
+    EIPChecklist,
     Environment,
     Fork,
     Header,
@@ -80,6 +81,7 @@ def test_bal_withdrawal_empty_block(
     )
 
 
+@EIPChecklist.BlockLevelConstraint.Test.Content.Withdrawals()
 def test_bal_withdrawal_and_transaction(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
@@ -627,7 +629,7 @@ def test_bal_zero_withdrawal(
     "precompile",
     lambda fork: [
         pytest.param(addr, id=f"0x{int.from_bytes(addr, 'big'):02x}")
-        for addr in fork.precompiles(block_number=0, timestamp=0)
+        for addr in fork.precompiles()
     ],
 )
 def test_bal_withdrawal_to_precompiles(
diff --git a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip7002.py b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip7002.py
index 6a23cd6bb24..907dc6ce099 100644
--- a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip7002.py
+++ b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip7002.py
@@ -542,18 +542,18 @@ def test_bal_7002_request_from_contract(
     )
 
     # Set up pre-state using helper
-    interaction.update_pre(pre)
+    prepared = interaction.update_pre(pre)
 
-    alice = interaction.sender_account
-    relay_contract = interaction.contract_address
+    alice = prepared.sender_account
+    relay_contract = prepared.contract_address
 
     # Build queue storage slots with contract as source
     queue_writes, queue_reads = _build_queue_storage_slots(
-        [relay_contract], interaction.requests
+        [relay_contract], prepared.requests
     )
 
     block = Block(
-        txs=interaction.transactions(),
+        txs=prepared.transactions(),
         expected_block_access_list=BlockAccessListExpectation(
             account_expectations={
                 alice: BalAccountExpectation(
@@ -766,9 +766,9 @@ def test_bal_7002_request_invalid(
     - No withdrawal request is queued
     """
     # Use helper to set up pre-state and get transaction
-    interaction.update_pre(pre)
-    tx = interaction.transactions()[0]
-    alice = interaction.sender_account
+    prepared = interaction.update_pre(pre)
+    tx = prepared.transactions()[0]
+    alice = prepared.sender_account
 
     # Build account expectations
     account_expectations = {
@@ -801,8 +801,8 @@ def test_bal_7002_request_invalid(
     }
 
     # Add relay contract to post-state for contract scenarios
-    if isinstance(interaction, WithdrawalRequestContract):
-        post[interaction.contract_address] = Account()
+    if isinstance(prepared, WithdrawalRequestContract):
+        post[prepared.contract_address] = Account()
 
     blockchain_test(
         pre=pre,
diff --git a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip7251.py b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip7251.py
index c6be6cdecdd..35494f4207f 100644
--- a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip7251.py
+++ b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip7251.py
@@ -102,8 +102,8 @@ def test_bal_system_dequeue_consolidations_eip7251(
     txs = []
 
     for request in blocks_consolidation_requests:
-        request.update_pre(pre=pre)
-        txs += request.transactions()
+        prepared = request.update_pre(pre=pre)
+        txs += prepared.transactions()
 
     num = len(txs)
 
diff --git a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip7702.py b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip7702.py
index d26a26f55a9..08ab12a9e79 100644
--- a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip7702.py
+++ b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_eip7702.py
@@ -1,8 +1,12 @@
 """Tests for the effects of EIP-7702 transactions on EIP-7928."""
 
+from typing import Dict
+
 import pytest
 from execution_testing import (
+    EOA,
     Account,
+    Address,
     Alloc,
     AuthorizationTuple,
     BalAccountExpectation,
@@ -63,7 +67,6 @@ def test_bal_7702_delegation_create(
         to=bob,
         value=10,
         gas_limit=1_000_000,
-        gas_price=0xA,
         authorization_list=[
             AuthorizationTuple(
                 address=oracle,
@@ -130,72 +133,97 @@ def test_bal_7702_delegation_create(
 
 
 @pytest.mark.parametrize(
-    "self_funded",
+    "sender_pattern",
     [
-        pytest.param(False, id="sponsored"),
-        pytest.param(True, id="self_funded"),
+        pytest.param("sponsored", id="sponsored"),
+        pytest.param("self_funded", id="self_funded"),
+        pytest.param("sponsored_cross_sender", id="sponsored_cross_sender"),
     ],
 )
 def test_bal_7702_delegation_update(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
-    self_funded: bool,
+    sender_pattern: str,
 ) -> None:
-    """Ensure BAL captures update of existing EOA delegation."""
+    """
+    Ensure BAL captures update of existing EOA delegation. The
+    `sponsored_cross_sender` variant uses a distinct relayer per tx so
+    the cross-tx auth-nonce dep can't be served by sender-nonce
+    serialization alone.
+    """
     alice = pre.fund_eoa()
     bob = pre.fund_eoa(amount=0)
 
-    if not self_funded:
-        relayer = pre.fund_eoa()
-        sender = relayer
-    else:
-        sender = alice
-
     oracle1 = pre.deploy_contract(code=Op.STOP)
     oracle2 = pre.deploy_contract(code=Op.STOP)
 
-    ## Perhaps create a pre-existing delegation,
-    ## see `test_bal_7702_delegated_storage_access` since
-    ## `test_bal_7702_delegation_create` already tests creation
+    if sender_pattern == "self_funded":
+        sender_create = alice
+        sender_update = alice
+        update_tx_nonce = 2
+        create_auth_nonce = 1
+        update_auth_nonce = 3
+        alice_post_create = 2
+        alice_post_update = 4
+    elif sender_pattern == "sponsored":
+        relayer = pre.fund_eoa()
+        sender_create = relayer
+        sender_update = relayer
+        update_tx_nonce = 1
+        create_auth_nonce = 0
+        update_auth_nonce = 1
+        alice_post_create = 1
+        alice_post_update = 2
+    elif sender_pattern == "sponsored_cross_sender":
+        relayer_create = pre.fund_eoa()
+        relayer_update = pre.fund_eoa()
+        sender_create = relayer_create
+        sender_update = relayer_update
+        update_tx_nonce = 0
+        create_auth_nonce = 0
+        update_auth_nonce = 1
+        alice_post_create = 1
+        alice_post_update = 2
+    else:
+        raise ValueError(f"unknown sender_pattern: {sender_pattern}")
+
     tx_create = Transaction(
-        sender=sender,
+        sender=sender_create,
         to=bob,
         value=10,
         gas_limit=1_000_000,
-        gas_price=0xA,
         authorization_list=[
             AuthorizationTuple(
                 address=oracle1,
-                nonce=1 if self_funded else 0,
+                nonce=create_auth_nonce,
                 signer=alice,
             )
         ],
     )
 
     tx_update = Transaction(
-        nonce=2 if self_funded else 1,
-        sender=sender,
+        nonce=update_tx_nonce,
+        sender=sender_update,
         to=bob,
         value=10,
         gas_limit=1_000_000,
-        gas_price=0xA,
         authorization_list=[
             AuthorizationTuple(
                 address=oracle2,
-                nonce=3 if self_funded else 1,
+                nonce=update_auth_nonce,
                 signer=alice,
             )
         ],
     )
 
-    account_expectations = {
+    account_expectations: dict = {
         alice: BalAccountExpectation(
             nonce_changes=[
                 BalNonceChange(
-                    block_access_index=1, post_nonce=2 if self_funded else 1
+                    block_access_index=1, post_nonce=alice_post_create
                 ),
                 BalNonceChange(
-                    block_access_index=2, post_nonce=4 if self_funded else 2
+                    block_access_index=2, post_nonce=alice_post_update
                 ),
             ],
             code_changes=[
@@ -221,14 +249,24 @@ def test_bal_7702_delegation_update(
         oracle2: None,
     }
 
-    # For sponsored variant, relayer must also be included in BAL
-    if not self_funded:
+    if sender_pattern == "sponsored":
         account_expectations[relayer] = BalAccountExpectation(
             nonce_changes=[
                 BalNonceChange(block_access_index=1, post_nonce=1),
                 BalNonceChange(block_access_index=2, post_nonce=2),
             ],
         )
+    elif sender_pattern == "sponsored_cross_sender":
+        account_expectations[relayer_create] = BalAccountExpectation(
+            nonce_changes=[
+                BalNonceChange(block_access_index=1, post_nonce=1),
+            ],
+        )
+        account_expectations[relayer_update] = BalAccountExpectation(
+            nonce_changes=[
+                BalNonceChange(block_access_index=2, post_nonce=1),
+            ],
+        )
 
     block = Block(
         txs=[tx_create, tx_update],
@@ -237,19 +275,21 @@ def test_bal_7702_delegation_update(
         ),
     )
 
-    post = {
+    post: dict = {
         # Finally Alice's account should be delegated to oracle2
         alice: Account(
-            nonce=4 if self_funded else 2,
+            nonce=alice_post_update,
             code=Spec7702.delegation_designation(oracle2),
         ),
         # Bob receives 20 wei in total
         bob: Account(balance=20),
     }
 
-    # For sponsored variant, include relayer in post state
-    if not self_funded:
-        post.update({relayer: Account(nonce=2)})
+    if sender_pattern == "sponsored":
+        post[relayer] = Account(nonce=2)
+    elif sender_pattern == "sponsored_cross_sender":
+        post[relayer_create] = Account(nonce=1)
+        post[relayer_update] = Account(nonce=1)
 
     blockchain_test(
         pre=pre,
@@ -291,7 +331,6 @@ def test_bal_7702_delegation_clear(
         to=bob,
         value=10,
         gas_limit=1_000_000,
-        gas_price=0xA,
         authorization_list=[
             AuthorizationTuple(
                 address=oracle,
@@ -307,7 +346,6 @@ def test_bal_7702_delegation_clear(
         to=bob,
         value=10,
         gas_limit=1_000_000,
-        gas_price=0xA,
         authorization_list=[
             AuthorizationTuple(
                 address=abyss,
@@ -469,7 +507,6 @@ def test_bal_7702_invalid_nonce_authorization(
         to=bob,
         value=10,
         gas_limit=1_000_000,
-        gas_price=0xA,
         authorization_list=[
             AuthorizationTuple(
                 address=oracle,
@@ -515,6 +552,71 @@ def test_bal_7702_invalid_nonce_authorization(
     )
 
 
+@pytest.mark.pre_alloc_mutable()
+def test_bal_7702_invalid_authority_has_code_authorization(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+) -> None:
+    """
+    Ensure BAL handles failed authorization where the authority already has
+    non-empty, non-delegation code (EIP-7702 step-5 rejection, post-load).
+    """
+    # Pre-existing non-delegation code on the authority blocks the 7702
+    # delegation at step 5, after the authority is already loaded.
+    alice = pre.fund_eoa(amount=0, code=Op.STOP, nonce=1)
+    bob = pre.fund_eoa(amount=0)
+    relayer = pre.fund_eoa()
+    oracle = pre.deploy_contract(code=Op.STOP)
+
+    tx = Transaction(
+        sender=relayer,  # Sponsored transaction
+        to=bob,
+        value=10,
+        gas_limit=1_000_000,
+        authorization_list=[
+            AuthorizationTuple(
+                address=oracle,
+                nonce=alice.nonce,
+                signer=alice,
+            )
+        ],
+    )
+
+    block = Block(
+        txs=[tx],
+        expected_block_access_list=BlockAccessListExpectation(
+            account_expectations={
+                bob: BalAccountExpectation(
+                    balance_changes=[
+                        BalBalanceChange(block_access_index=1, post_balance=10)
+                    ]
+                ),
+                relayer: BalAccountExpectation(
+                    nonce_changes=[
+                        BalNonceChange(block_access_index=1, post_nonce=1)
+                    ],
+                ),
+                # Alice loaded at step 4 then step 5 rejects.
+                alice: BalAccountExpectation.empty(),
+                # Oracle never loaded as delegation target.
+                oracle: None,
+            }
+        ),
+    )
+
+    post = {
+        relayer: Account(nonce=1),
+        bob: Account(balance=10),
+        alice: Account(code=Op.STOP, nonce=1),
+    }
+
+    blockchain_test(
+        pre=pre,
+        blocks=[block],
+        post=post,
+    )
+
+
 def test_bal_7702_invalid_chain_id_authorization(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
@@ -530,7 +632,6 @@ def test_bal_7702_invalid_chain_id_authorization(
         to=bob,
         value=10,
         gas_limit=1_000_000,
-        gas_price=0xA,
         authorization_list=[
             AuthorizationTuple(
                 chain_id=999,  # Wrong chain id
@@ -639,6 +740,220 @@ def test_bal_7702_delegated_via_call_opcode(
     )
 
 
+@pytest.mark.parametrize(
+    "destination_is_loop",
+    [False, True],
+    ids=["chain", "loop"],
+)
+def test_bal_7702_multi_hop_delegation_chain(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    destination_is_loop: bool,
+) -> None:
+    """
+    Multi-hop EIP-7702 delegation: `chain` resolves A->B->C; `loop`
+    resolves A->B->A. In both cases the EVM follows the delegation once
+    and runs B's `0xef0100<dest>` bytecode as legacy code, which aborts
+    on the INVALID `0xef` opcode. For `chain`, C MUST NOT appear in the
+    BAL (second-hop target is never loaded as an execution target). For
+    `loop`, A is already in the BAL via the first delegation; the CALL
+    still fails.
+    """
+    alice = pre.fund_eoa()
+    auth_a = pre.fund_eoa(amount=0)
+    auth_b = pre.fund_eoa(amount=0)
+    target_c = pre.deploy_contract(code=Op.STOP)
+    second_destination = auth_a if destination_is_loop else target_c
+
+    entry_code = Op.SSTORE(0, Op.CALL(50_000, auth_a, 0, 0, 0, 0, 0)) + Op.STOP
+    entry_address = pre.deploy_contract(
+        code=entry_code,
+        storage={0: 0xDEAD},
+    )
+
+    tx = Transaction(
+        sender=alice,
+        to=entry_address,
+        gas_limit=1_000_000,
+        authorization_list=[
+            AuthorizationTuple(
+                address=auth_b,
+                nonce=0,
+                signer=auth_a,
+            ),
+            AuthorizationTuple(
+                address=second_destination,
+                nonce=0,
+                signer=auth_b,
+            ),
+        ],
+    )
+
+    account_expectations: Dict[EOA | Address, BalAccountExpectation | None] = {
+        alice: BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=1, post_nonce=1)],
+        ),
+        auth_a: BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=1, post_nonce=1)],
+            code_changes=[
+                BalCodeChange(
+                    block_access_index=1,
+                    new_code=Spec7702.delegation_designation(auth_b),
+                )
+            ],
+        ),
+        auth_b: BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=1, post_nonce=1)],
+            code_changes=[
+                BalCodeChange(
+                    block_access_index=1,
+                    new_code=Spec7702.delegation_designation(
+                        second_destination
+                    ),
+                )
+            ],
+        ),
+        # CALL returned 0; SSTORE(0, 0) overwrites the 0xDEAD witness.
+        entry_address: BalAccountExpectation(
+            storage_changes=[
+                BalStorageSlot(
+                    slot=0,
+                    slot_changes=[
+                        BalStorageChange(block_access_index=1, post_value=0)
+                    ],
+                )
+            ],
+            storage_reads=[],
+        ),
+    }
+    if not destination_is_loop:
+        account_expectations[target_c] = None
+
+    block = Block(
+        txs=[tx],
+        expected_block_access_list=BlockAccessListExpectation(
+            account_expectations=account_expectations
+        ),
+    )
+
+    post: Dict[EOA | Address, Account] = {
+        auth_a: Account(
+            nonce=1,
+            code=Spec7702.delegation_designation(auth_b),
+        ),
+        auth_b: Account(
+            nonce=1,
+            code=Spec7702.delegation_designation(second_destination),
+        ),
+        entry_address: Account(storage={0: 0}),
+    }
+    if not destination_is_loop:
+        post[target_c] = Account(code=bytes(Op.STOP), nonce=1)
+
+    blockchain_test(
+        pre=pre,
+        blocks=[block],
+        post=post,
+    )
+
+
+def test_bal_7702_cross_tx_delegation_then_call(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+) -> None:
+    """
+    Verify clients apply Tx1's EIP-7702 delegation before later txs CALL
+    the now-delegated EOA. Tx1 installs a delegation designator on `alice`
+    pointing to a contract that increments slot 0. Tx2 and Tx3 CALL alice,
+    so each later tx must observe both the installed code (Tx1) and the
+    prior increment (the immediately preceding tx) for the final slot 0
+    to read 2. A client that parallelizes any tx against pre-block state
+    would see no code or a stale counter, yielding a different state root.
+    """
+    alice = pre.fund_eoa()
+    bob = pre.fund_eoa()
+    charlie = pre.fund_eoa()
+    relayer = pre.fund_eoa()
+
+    # Delegation target: increments slot 0 each time it's invoked.
+    counter = pre.deploy_contract(
+        code=Op.SSTORE(0, Op.ADD(Op.SLOAD(0), 1)),
+    )
+
+    tx_delegate = Transaction(
+        sender=relayer,
+        to=bob,
+        value=0,
+        gas_limit=1_000_000,
+        authorization_list=[
+            AuthorizationTuple(
+                address=counter,
+                nonce=0,
+                signer=alice,
+            )
+        ],
+    )
+    tx_call_1 = Transaction(
+        sender=bob,
+        to=alice,
+        gas_limit=200_000,
+        gas_price=0xA,
+    )
+    tx_call_2 = Transaction(
+        sender=charlie,
+        to=alice,
+        gas_limit=200_000,
+        gas_price=0xA,
+    )
+
+    block = Block(
+        txs=[tx_delegate, tx_call_1, tx_call_2],
+        expected_block_access_list=BlockAccessListExpectation(
+            account_expectations={
+                alice: BalAccountExpectation(
+                    nonce_changes=[
+                        BalNonceChange(block_access_index=1, post_nonce=1),
+                    ],
+                    code_changes=[
+                        BalCodeChange(
+                            block_access_index=1,
+                            new_code=Spec7702.delegation_designation(counter),
+                        )
+                    ],
+                    storage_changes=[
+                        BalStorageSlot(
+                            slot=0,
+                            slot_changes=[
+                                BalStorageChange(
+                                    block_access_index=2, post_value=1
+                                ),
+                                BalStorageChange(
+                                    block_access_index=3, post_value=2
+                                ),
+                            ],
+                        ),
+                    ],
+                ),
+                # Delegation target: loaded as execution target on each
+                # CALL to alice, but mutations land in alice's storage.
+                counter: BalAccountExpectation.empty(),
+            },
+        ),
+    )
+
+    blockchain_test(
+        pre=pre,
+        blocks=[block],
+        post={
+            alice: Account(
+                nonce=1,
+                code=Spec7702.delegation_designation(counter),
+                storage={0: 2},
+            ),
+        },
+    )
+
+
 def test_bal_7702_null_address_delegation_no_code_change(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
@@ -736,7 +1051,6 @@ def test_bal_7702_double_auth_reset(
         to=bob,
         value=10,
         gas_limit=1_000_000,
-        gas_price=0xA,
         authorization_list=[
             AuthorizationTuple(
                 address=contract_a,
@@ -825,7 +1139,6 @@ def test_bal_7702_double_auth_swap(
         to=bob,
         value=10,
         gas_limit=1_000_000,
-        gas_price=0xA,
         authorization_list=[
             AuthorizationTuple(
                 address=contract_a,
@@ -927,7 +1240,6 @@ def test_bal_selfdestruct_to_7702_delegation(
         to=bob,
         value=10,
         gas_limit=1_000_000,
-        gas_price=0xA,
         authorization_list=[
             AuthorizationTuple(
                 address=oracle,
@@ -1060,7 +1372,6 @@ def test_bal_withdrawal_to_7702_delegation(
         to=bob,
         value=10,
         gas_limit=1_000_000,
-        gas_price=0xA,
         authorization_list=[
             AuthorizationTuple(
                 address=oracle,
diff --git a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_invalid.py b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_invalid.py
index 0b1f8e49653..52d366019d8 100644
--- a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_invalid.py
+++ b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_invalid.py
@@ -21,10 +21,16 @@
     BlockAccessListExpectation,
     BlockchainTestFiller,
     BlockException,
+    EIPChecklist,
+    Environment,
+    Fork,
+    Hash,
+    Header,
     Initcode,
     Op,
     Storage,
     Transaction,
+    Withdrawal,
     compute_create_address,
 )
 from execution_testing.test_types.block_access_list.modifiers import (
@@ -40,16 +46,25 @@
     duplicate_storage_slot,
     insert_storage_read,
     modify_balance,
+    modify_code,
     modify_nonce,
     modify_storage,
     remove_accounts,
     remove_balances,
+    remove_code,
     remove_nonces,
+    remove_storage,
+    remove_storage_reads,
     reverse_accounts,
+    sort_accounts_by_address,
     swap_bal_indices,
 )
 
 from .spec import ref_spec_7928
+from .test_block_access_lists_eip4788 import (
+    SYSTEM_ADDRESS,
+    beacon_root_system_call_expectations,
+)
 
 REFERENCE_SPEC_GIT_PATH = ref_spec_7928.git_path
 REFERENCE_SPEC_VERSION = ref_spec_7928.version
@@ -330,7 +345,7 @@ def test_bal_invalid_account(
         blocks=[
             Block(
                 txs=[tx],
-                exception=BlockException.INVALID_BAL_EXTRA_ACCOUNT,
+                exception=BlockException.INVALID_BLOCK_ACCESS_LIST,
                 expected_block_access_list=BlockAccessListExpectation(
                     account_expectations={
                         sender: BalAccountExpectation(
@@ -560,51 +575,242 @@ def test_bal_invalid_complex_corruption(
 
 @pytest.mark.valid_from("Amsterdam")
 @pytest.mark.exception_test
+@pytest.mark.parametrize(
+    "scenario",
+    ["balance_change", "access_only"],
+)
 def test_bal_invalid_missing_account(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
+    scenario: str,
 ) -> None:
     """
-    Test that clients reject blocks where BAL is missing an entire account.
+    Test that clients reject blocks where BAL omits an account that was
+    touched during block execution.
+
+    Covers both the case where the omitted account has a balance change
+    (value transfer recipient) and the access-only case (account read via
+    ``BALANCE`` with no state change).
     """
     sender = pre.fund_eoa(amount=10**18)
-    receiver = pre.fund_eoa(amount=0)
+    sender_expectation = BalAccountExpectation(
+        nonce_changes=[BalNonceChange(block_access_index=1, post_nonce=1)],
+    )
+
+    if scenario == "balance_change":
+        omitted = pre.fund_eoa(amount=0)
+        tx = Transaction(
+            sender=sender,
+            to=omitted,
+            value=10**15,
+            gas_limit=21_000,
+        )
+        post: dict = {
+            sender: Account(balance=10**18, nonce=0),
+            omitted: None,
+        }
+        account_expectations: dict = {
+            sender: sender_expectation,
+            omitted: BalAccountExpectation(
+                balance_changes=[
+                    BalBalanceChange(block_access_index=1, post_balance=10**15)
+                ],
+            ),
+        }
+    elif scenario == "access_only":
+        omitted = pre.fund_eoa(amount=1)
+        checker = pre.deploy_contract(code=Op.BALANCE(omitted))
+        tx = Transaction(
+            sender=sender,
+            to=checker,
+            gas_limit=100_000,
+        )
+        post = {
+            sender: Account(balance=10**18, nonce=0),
+            omitted: Account(balance=1),
+            checker: Account(),
+        }
+        account_expectations = {
+            sender: sender_expectation,
+            checker: BalAccountExpectation.empty(),
+            omitted: BalAccountExpectation.empty(),
+        }
+    else:
+        raise ValueError(f"Unknown scenario: {scenario}")
+
+    blockchain_test(
+        pre=pre,
+        post=post,
+        blocks=[
+            Block(
+                txs=[tx],
+                exception=BlockException.INVALID_BLOCK_ACCESS_LIST,
+                expected_block_access_list=BlockAccessListExpectation(
+                    account_expectations=account_expectations,
+                ).modify(remove_accounts(omitted)),
+            )
+        ],
+    )
+
+
+@pytest.mark.valid_from("Amsterdam")
+@pytest.mark.exception_test
+def test_bal_invalid_missing_withdrawal_account(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+) -> None:
+    """
+    Test that clients reject blocks where BAL is missing an account
+    that was modified only by a withdrawal.
+
+    Alice sends 5 wei to Bob (1 transaction).
+    Charlie receives 10 gwei withdrawal.
+    BAL is corrupted by removing Charlie's entry entirely.
+    Clients must detect that Charlie's balance was modified by the
+    withdrawal but has no corresponding BAL entry.
+    """
+    alice = pre.fund_eoa()
+    bob = pre.fund_eoa(amount=0)
+    charlie = pre.fund_eoa(amount=0)
 
     tx = Transaction(
-        sender=sender,
-        to=receiver,
-        value=10**15,
+        sender=alice,
+        to=bob,
+        value=5,
         gas_limit=21_000,
     )
 
     blockchain_test(
         pre=pre,
         post={
-            sender: Account(balance=10**18, nonce=0),
-            receiver: None,
+            alice: Account(nonce=0),
+            bob: None,
+            charlie: None,
         },
         blocks=[
             Block(
                 txs=[tx],
-                exception=BlockException.INVALID_BAL_MISSING_ACCOUNT,
+                withdrawals=[
+                    Withdrawal(
+                        index=0,
+                        validator_index=0,
+                        address=charlie,
+                        amount=10,
+                    )
+                ],
+                exception=BlockException.INVALID_BLOCK_ACCESS_LIST,
                 expected_block_access_list=BlockAccessListExpectation(
                     account_expectations={
-                        sender: BalAccountExpectation(
+                        alice: BalAccountExpectation(
                             nonce_changes=[
                                 BalNonceChange(
                                     block_access_index=1, post_nonce=1
                                 )
                             ],
                         ),
-                        receiver: BalAccountExpectation(
+                        bob: BalAccountExpectation(
                             balance_changes=[
                                 BalBalanceChange(
-                                    block_access_index=1, post_balance=10**15
+                                    block_access_index=1, post_balance=5
+                                )
+                            ],
+                        ),
+                        charlie: BalAccountExpectation(
+                            balance_changes=[
+                                BalBalanceChange(
+                                    block_access_index=2,
+                                    post_balance=10 * 10**9,
                                 )
                             ],
                         ),
                     }
-                ).modify(remove_accounts(receiver)),
+                ).modify(remove_accounts(charlie)),
+            )
+        ],
+    )
+
+
+@pytest.mark.valid_from("Amsterdam")
+@pytest.mark.exception_test
+def test_bal_invalid_missing_withdrawal_account_empty_block(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+) -> None:
+    """
+    Test that clients reject blocks where BAL is missing an account
+    that was modified only by a withdrawal, in a block with no transactions.
+
+    Charlie receives 10 gwei withdrawal in an empty block.
+    BAL is corrupted by removing Charlie's entry entirely.
+    """
+    charlie = pre.fund_eoa(amount=0)
+
+    blockchain_test(
+        pre=pre,
+        post={
+            charlie: None,
+        },
+        blocks=[
+            Block(
+                txs=[],
+                withdrawals=[
+                    Withdrawal(
+                        index=0,
+                        validator_index=0,
+                        address=charlie,
+                        amount=10,
+                    )
+                ],
+                exception=BlockException.INVALID_BLOCK_ACCESS_LIST,
+                expected_block_access_list=BlockAccessListExpectation(
+                    account_expectations={
+                        charlie: BalAccountExpectation(
+                            balance_changes=[
+                                BalBalanceChange(
+                                    block_access_index=1,
+                                    post_balance=10 * 10**9,
+                                )
+                            ],
+                        ),
+                    }
+                ).modify(remove_accounts(charlie)),
+            )
+        ],
+    )
+
+
+@pytest.mark.valid_from("Amsterdam")
+@pytest.mark.exception_test
+def test_bal_invalid_surplus_system_address_from_system_call(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+) -> None:
+    """
+    Test that clients reject a BAL that includes SYSTEM_ADDRESS solely because
+    it was the synthetic caller of a pre-execution system operation.
+    """
+    block_timestamp = 12
+    beacon_root = Hash(0xABCDEF)
+
+    blockchain_test(
+        pre=pre,
+        post={},
+        blocks=[
+            Block(
+                txs=[],
+                parent_beacon_block_root=beacon_root,
+                timestamp=block_timestamp,
+                exception=BlockException.INVALID_BLOCK_ACCESS_LIST,
+                expected_block_access_list=BlockAccessListExpectation(
+                    account_expectations=beacon_root_system_call_expectations(
+                        block_timestamp,
+                        beacon_root,
+                    )
+                ).modify(
+                    append_account(
+                        BalAccountChange(address=SYSTEM_ADDRESS),
+                    )
+                ),
             )
         ],
     )
@@ -974,3 +1180,450 @@ def test_bal_invalid_duplicate_entries(
             )
         ],
     )
+
+
+@EIPChecklist.BlockHeaderField.Test.ValueBehavior.Reject()
+@pytest.mark.valid_from("Amsterdam")
+@pytest.mark.exception_test
+def test_bal_invalid_hash_mismatch(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+) -> None:
+    """
+    Test that clients reject blocks where the BAL hash in the header
+    does not match the actual BAL content.
+
+    Unlike other invalid BAL tests which corrupt the BAL content while
+    keeping the header hash consistent with the corrupted data, this
+    test keeps the BAL valid but injects a wrong hash into the header
+    via rlp_modifier.
+    """
+    sender = pre.fund_eoa(amount=10**18)
+    receiver = pre.fund_eoa(amount=0)
+
+    tx = Transaction(
+        sender=sender,
+        to=receiver,
+        value=10**15,
+        gas_limit=21_000,
+    )
+
+    blockchain_test(
+        pre=pre,
+        post={
+            sender: Account(balance=10**18, nonce=0),
+            receiver: None,
+        },
+        blocks=[
+            Block(
+                txs=[tx],
+                rlp_modifier=Header(block_access_list_hash=Hash(1)),
+                exception=[
+                    BlockException.INVALID_BAL_HASH,
+                    BlockException.INVALID_BLOCK_HASH,
+                ],
+            )
+        ],
+    )
+
+
+@pytest.mark.valid_from("Amsterdam")
+@pytest.mark.exception_test
+@pytest.mark.parametrize(
+    "modifier",
+    [
+        pytest.param(
+            lambda oracle, **_: remove_storage(oracle),
+            id="missing_storage_change",
+        ),
+        pytest.param(
+            lambda oracle, **_: remove_storage_reads(oracle),
+            id="missing_storage_read",
+        ),
+        pytest.param(
+            lambda created, **_: remove_code(created),
+            id="missing_code_change",
+        ),
+        pytest.param(
+            lambda created, **_: modify_code(
+                created, block_access_index=1, code=b"\xde\xad"
+            ),
+            id="wrong_code_value",
+        ),
+    ],
+)
+def test_bal_invalid_field_entries(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    modifier: Callable,
+) -> None:
+    """
+    Test that clients reject blocks with missing or incorrect
+    field-level BAL entries.
+
+    Oracle writes storage slot 1, reads storage slot 2, and CREATEs a
+    small contract. A valid BAL is created containing all changes, then
+    corrupted by the parameterized modifier:
+
+    - missing_storage_change: Oracle's storage writes removed.
+    - missing_storage_read: Oracle's storage reads removed.
+    - missing_code_change: Created contract's code change removed.
+    - wrong_code_value: Created contract's deployed bytecode wrong.
+    """
+    alice = pre.fund_eoa()
+    deploy_code = b"\x13\x37"
+    initcode = Initcode(deploy_code=deploy_code)
+    initcode_word = int.from_bytes(bytes(initcode).ljust(32, b"\x00"), "big")
+    oracle = pre.deploy_contract(
+        code=(
+            Op.SSTORE(1, 0x42)
+            + Op.SLOAD(2)
+            + Op.MSTORE(0, initcode_word)
+            + Op.CREATE(0, 0, len(initcode))
+        ),
+        storage={2: 0x84},
+    )
+    created = compute_create_address(address=oracle, nonce=1)
+
+    tx = Transaction(
+        sender=alice,
+        to=oracle,
+        value=100,
+        gas_limit=2_000_000,
+    )
+
+    blockchain_test(
+        pre=pre,
+        post=pre,
+        blocks=[
+            Block(
+                txs=[tx],
+                exception=BlockException.INVALID_BLOCK_ACCESS_LIST,
+                expected_block_access_list=BlockAccessListExpectation(
+                    account_expectations={
+                        alice: BalAccountExpectation(
+                            nonce_changes=[
+                                BalNonceChange(
+                                    block_access_index=1,
+                                    post_nonce=1,
+                                ),
+                            ],
+                        ),
+                        oracle: BalAccountExpectation(
+                            balance_changes=[
+                                BalBalanceChange(
+                                    block_access_index=1,
+                                    post_balance=100,
+                                ),
+                            ],
+                            storage_changes=[
+                                BalStorageSlot(
+                                    slot=1,
+                                    slot_changes=[
+                                        BalStorageChange(
+                                            block_access_index=1,
+                                            post_value=0x42,
+                                        ),
+                                    ],
+                                ),
+                            ],
+                            storage_reads=[2],
+                        ),
+                        created: BalAccountExpectation(
+                            code_changes=[
+                                BalCodeChange(
+                                    block_access_index=1,
+                                    new_code=deploy_code,
+                                ),
+                            ],
+                        ),
+                    }
+                ).modify(
+                    modifier(
+                        oracle=oracle,
+                        created=created,
+                    )
+                ),
+            )
+        ],
+    )
+
+
+@pytest.mark.valid_from("Amsterdam")
+@pytest.mark.exception_test
+def test_bal_invalid_withdrawal_balance_value(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+) -> None:
+    """
+    Test that clients reject blocks where BAL contains an incorrect
+    balance value for an account modified only by a withdrawal.
+
+    Charlie receives a 10 gwei withdrawal in an empty block.
+    BAL is corrupted by changing Charlie's post-balance to 999 instead
+    of the correct 10_000_000_000 (10 gwei in wei).
+    """
+    charlie = pre.fund_eoa(amount=0)
+
+    blockchain_test(
+        pre=pre,
+        post={
+            charlie: None,
+        },
+        blocks=[
+            Block(
+                txs=[],
+                withdrawals=[
+                    Withdrawal(
+                        index=0,
+                        validator_index=0,
+                        address=charlie,
+                        amount=10,
+                    )
+                ],
+                exception=BlockException.INVALID_BLOCK_ACCESS_LIST,
+                expected_block_access_list=BlockAccessListExpectation(
+                    account_expectations={
+                        charlie: BalAccountExpectation(
+                            balance_changes=[
+                                BalBalanceChange(
+                                    block_access_index=1,
+                                    post_balance=10 * 10**9,
+                                )
+                            ],
+                        ),
+                    }
+                ).modify(
+                    modify_balance(charlie, block_access_index=1, balance=999)
+                ),
+            )
+        ],
+    )
+
+
+@pytest.mark.valid_from("Amsterdam")
+@pytest.mark.exception_test
+def test_bal_invalid_missing_coinbase(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: Fork,
+) -> None:
+    """
+    Test that clients reject blocks where BAL is missing the
+    coinbase/fee recipient account.
+
+    Alice sends 100 wei to Bob with gas_price > base_fee so the
+    coinbase (charlie) receives a non-zero tip. BAL is corrupted
+    by removing charlie's entry entirely.
+    """
+    alice = pre.fund_eoa(amount=10**18)
+    bob = pre.fund_eoa(amount=0)
+    charlie = pre.fund_eoa(amount=0)
+
+    intrinsic_gas = fork.transaction_intrinsic_cost_calculator()(
+        calldata=b"",
+        contract_creation=False,
+        access_list=[],
+    )
+    gas_price = 0xA
+
+    tx = Transaction(
+        sender=alice,
+        to=bob,
+        value=100,
+        gas_limit=intrinsic_gas + 1000,
+        gas_price=gas_price,
+    )
+
+    genesis_env = Environment(base_fee_per_gas=0x7)
+    base_fee_per_gas = fork.base_fee_per_gas_calculator()(
+        parent_base_fee_per_gas=int(genesis_env.base_fee_per_gas or 0),
+        parent_gas_used=0,
+        parent_gas_limit=genesis_env.gas_limit,
+    )
+    tip = (gas_price - base_fee_per_gas) * intrinsic_gas
+
+    blockchain_test(
+        pre=pre,
+        post={},
+        genesis_environment=genesis_env,
+        blocks=[
+            Block(
+                txs=[tx],
+                fee_recipient=charlie,
+                header_verify=Header(base_fee_per_gas=base_fee_per_gas),
+                exception=BlockException.INVALID_BLOCK_ACCESS_LIST,
+                expected_block_access_list=BlockAccessListExpectation(
+                    account_expectations={
+                        alice: BalAccountExpectation(
+                            nonce_changes=[
+                                BalNonceChange(
+                                    block_access_index=1, post_nonce=1
+                                )
+                            ],
+                        ),
+                        bob: BalAccountExpectation(
+                            balance_changes=[
+                                BalBalanceChange(
+                                    block_access_index=1, post_balance=100
+                                )
+                            ],
+                        ),
+                        charlie: BalAccountExpectation(
+                            balance_changes=[
+                                BalBalanceChange(
+                                    block_access_index=1, post_balance=tip
+                                )
+                            ],
+                        ),
+                    }
+                ).modify(remove_accounts(charlie)),
+            )
+        ],
+    )
+
+
+@pytest.mark.valid_from("Amsterdam")
+@pytest.mark.exception_test
+def test_bal_invalid_coinbase_balance_value(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: Fork,
+) -> None:
+    """
+    Test that clients reject blocks where BAL contains an incorrect
+    balance value for the coinbase/fee recipient.
+
+    Same setup as test_bal_invalid_missing_coinbase but the coinbase
+    entry is present with a wrong balance (999 instead of the
+    actual tip).
+    """
+    alice = pre.fund_eoa(amount=10**18)
+    bob = pre.fund_eoa(amount=0)
+    charlie = pre.fund_eoa(amount=0)
+
+    intrinsic_gas = fork.transaction_intrinsic_cost_calculator()(
+        calldata=b"",
+        contract_creation=False,
+        access_list=[],
+    )
+    gas_price = 0xA
+
+    tx = Transaction(
+        sender=alice,
+        to=bob,
+        value=100,
+        gas_limit=intrinsic_gas + 1000,
+        gas_price=gas_price,
+    )
+
+    genesis_env = Environment(base_fee_per_gas=0x7)
+    base_fee_per_gas = fork.base_fee_per_gas_calculator()(
+        parent_base_fee_per_gas=int(genesis_env.base_fee_per_gas or 0),
+        parent_gas_used=0,
+        parent_gas_limit=genesis_env.gas_limit,
+    )
+    tip = (gas_price - base_fee_per_gas) * intrinsic_gas
+
+    blockchain_test(
+        pre=pre,
+        post={},
+        genesis_environment=genesis_env,
+        blocks=[
+            Block(
+                txs=[tx],
+                fee_recipient=charlie,
+                header_verify=Header(base_fee_per_gas=base_fee_per_gas),
+                exception=BlockException.INVALID_BLOCK_ACCESS_LIST,
+                expected_block_access_list=BlockAccessListExpectation(
+                    account_expectations={
+                        alice: BalAccountExpectation(
+                            nonce_changes=[
+                                BalNonceChange(
+                                    block_access_index=1, post_nonce=1
+                                )
+                            ],
+                        ),
+                        bob: BalAccountExpectation(
+                            balance_changes=[
+                                BalBalanceChange(
+                                    block_access_index=1, post_balance=100
+                                )
+                            ],
+                        ),
+                        charlie: BalAccountExpectation(
+                            balance_changes=[
+                                BalBalanceChange(
+                                    block_access_index=1, post_balance=tip
+                                )
+                            ],
+                        ),
+                    }
+                ).modify(
+                    modify_balance(charlie, block_access_index=1, balance=999)
+                ),
+            )
+        ],
+    )
+
+
+@pytest.mark.valid_from("Amsterdam")
+@pytest.mark.exception_test
+@pytest.mark.parametrize(
+    "has_withdrawal",
+    [
+        pytest.param(False, id="empty_block"),
+        pytest.param(True, id="withdrawal_only"),
+    ],
+)
+def test_bal_invalid_extraneous_coinbase(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    has_withdrawal: bool,
+) -> None:
+    """
+    Test that clients reject blocks where BAL contains a spurious
+    coinbase entry when the coinbase received no fees.
+
+    Coinbase is only included in BAL when it receives transaction tips.
+    In blocks with no transactions, the coinbase receives nothing —
+    even if withdrawals modify other accounts' balances.
+
+    - empty_block: No txs, no withdrawals. Only system contracts.
+    - withdrawal_only: No txs, one withdrawal to a different address.
+      Withdrawals don't pay fees, so coinbase is still untouched.
+    """
+    coinbase = pre.fund_eoa(amount=0)
+
+    withdrawals = None
+    post: dict = {}
+    if has_withdrawal:
+        recipient = pre.fund_eoa(amount=0)
+        withdrawals = [
+            Withdrawal(
+                index=0,
+                validator_index=0,
+                address=recipient,
+                amount=10,
+            )
+        ]
+        post[recipient] = None
+
+    blockchain_test(
+        pre=pre,
+        post=post,
+        blocks=[
+            Block(
+                txs=[],
+                fee_recipient=coinbase,
+                withdrawals=withdrawals,
+                exception=BlockException.INVALID_BLOCK_ACCESS_LIST,
+                expected_block_access_list=BlockAccessListExpectation(
+                    account_expectations={coinbase: None}
+                ).modify(
+                    append_account(BalAccountChange(address=coinbase)),
+                    sort_accounts_by_address(),
+                ),
+            )
+        ],
+    )
diff --git a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_opcodes.py b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_opcodes.py
index 937e46ecf59..52b06e9ff7f 100644
--- a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_opcodes.py
+++ b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_opcodes.py
@@ -25,6 +25,7 @@
     Alloc,
     BalAccountExpectation,
     BalBalanceChange,
+    BalCodeChange,
     BalNonceChange,
     BalStorageChange,
     BalStorageSlot,
@@ -32,6 +33,7 @@
     BlockAccessListExpectation,
     BlockchainTestFiller,
     Bytecode,
+    Conditional,
     Fork,
     Initcode,
     Op,
@@ -40,6 +42,7 @@
 )
 
 from .spec import ref_spec_7928
+from .test_block_access_lists_eip4788 import SYSTEM_ADDRESS
 
 REFERENCE_SPEC_GIT_PATH = ref_spec_7928.git_path
 REFERENCE_SPEC_VERSION = ref_spec_7928.version
@@ -123,16 +126,16 @@ def test_bal_sstore_and_oog(
 
     intrinsic_gas_cost = fork.transaction_intrinsic_cost_calculator()()
 
-    # Full cost: PUSHes + SSTORE (GAS_COLD_SLOAD + GAS_STORAGE_SET)
+    # Full cost: PUSHes + SSTORE (COLD_STORAGE_ACCESS + STORAGE_SET)
     full_cost = storage_contract_code.gas_cost(fork)
 
     # Push cost for stipend boundary calculations
     push_code = Op.PUSH1(0x42) + Op.PUSH1(0x01)
     push_cost = push_code.gas_cost(fork)
 
-    # GAS_CALL_STIPEND is a threshold check, not a gas cost
+    # CALL_STIPEND is a threshold check, not a gas cost
     # Keep from gas_costs
-    stipend = fork.gas_costs().GAS_CALL_STIPEND
+    stipend = fork.gas_costs().CALL_STIPEND
 
     if out_of_gas_at == OutOfGasAt.EIP_2200_STIPEND:
         # 2300 after PUSHes (fails stipend check: 2300 <= 2300)
@@ -320,6 +323,118 @@ def test_bal_balance_and_oog(
     )
 
 
+@pytest.mark.parametrize(
+    "access_opcode",
+    [
+        pytest.param(lambda target: Op.BALANCE(target), id="balance"),
+        pytest.param(lambda target: Op.EXTCODESIZE(target), id="extcodesize"),
+        pytest.param(lambda target: Op.EXTCODEHASH(target), id="extcodehash"),
+        pytest.param(
+            lambda target: Op.EXTCODECOPY(target, 0, 0, 0),
+            id="extcodecopy",
+        ),
+        pytest.param(lambda target: Op.CALL(address=target), id="call"),
+        pytest.param(
+            lambda target: Op.STATICCALL(address=target),
+            id="staticcall",
+        ),
+    ],
+)
+def test_bal_account_touch_system_address(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    access_opcode: Callable[[Address], Bytecode],
+) -> None:
+    """
+    Ensure a regular transaction that explicitly touches SYSTEM_ADDRESS via
+    an account-accessing opcode includes SYSTEM_ADDRESS as an account-only
+    BAL entry.
+
+    This confirms that SYSTEM_ADDRESS is only excluded from the BAL when it
+    appears as the synthetic caller of a pre-execution system call; a real
+    EVM state access from user code MUST still land in the BAL.
+    """
+    alice = pre.fund_eoa()
+    pre.fund_address(SYSTEM_ADDRESS, amount=1)
+
+    toucher = pre.deploy_contract(code=access_opcode(SYSTEM_ADDRESS) + Op.STOP)
+
+    tx = Transaction(
+        sender=alice,
+        to=toucher,
+        gas_limit=200_000,
+    )
+
+    block = Block(
+        txs=[tx],
+        expected_block_access_list=BlockAccessListExpectation(
+            account_expectations={
+                toucher: BalAccountExpectation.empty(),
+                SYSTEM_ADDRESS: BalAccountExpectation.empty(),
+            }
+        ),
+    )
+
+    blockchain_test(
+        pre=pre,
+        blocks=[block],
+        post={
+            alice: Account(nonce=1),
+            toucher: Account(),
+            SYSTEM_ADDRESS: Account(balance=1),
+        },
+    )
+
+
+def test_bal_selfdestruct_to_system_address_zero_balance(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    fork: Fork,
+) -> None:
+    """
+    Ensure `SYSTEM_ADDRESS` is in BAL when accessed via `SELFDESTRUCT`,
+    even with zero balance transferred. Companion to
+    `test_bal_account_touch_system_address`, which covers the
+    `BALANCE`/`EXTCODE*`/`CALL`/`STATICCALL` opcodes.
+    """
+    alice = pre.fund_eoa()
+
+    init_code = Op.SELFDESTRUCT(SYSTEM_ADDRESS)
+    new_contract = compute_create_address(address=alice, nonce=0)
+
+    tx = Transaction(
+        sender=alice,
+        to=None,  # CREATE
+        value=0,  # zero contract balance at SELFDESTRUCT time
+        data=init_code,
+        gas_limit=fork.transaction_gas_limit_cap(),
+        gas_price=10,
+    )
+
+    block = Block(
+        txs=[tx],
+        expected_block_access_list=BlockAccessListExpectation(
+            account_expectations={
+                alice: BalAccountExpectation(
+                    nonce_changes=[
+                        BalNonceChange(block_access_index=1, post_nonce=1),
+                    ],
+                ),
+                SYSTEM_ADDRESS: BalAccountExpectation.empty(),
+            }
+        ),
+    )
+
+    blockchain_test(
+        pre=pre,
+        blocks=[block],
+        post={
+            alice: Account(nonce=1),
+            new_contract: Account.NONEXISTENT,
+        },
+    )
+
+
 @pytest.mark.parametrize(
     "fails_at_extcodesize",
     [True, False],
@@ -400,7 +515,13 @@ def test_bal_extcodesize_and_oog(
 )
 @pytest.mark.parametrize("value", [0, 1], ids=["no_value", "with_value"])
 @pytest.mark.parametrize(
-    "memory_expansion", [False, True], ids=["no_memory", "with_memory"]
+    "args_size,ret_size",
+    [
+        pytest.param(0, 0, id="no_memory"),
+        pytest.param(4096, 0, id="args_large"),
+        pytest.param(0, 4096, id="ret_large"),
+        pytest.param(32, 32, id="both_small"),
+    ],
 )
 def test_bal_call_no_delegation_and_oog_before_target_access(
     pre: Alloc,
@@ -410,13 +531,18 @@ def test_bal_call_no_delegation_and_oog_before_target_access(
     target_is_warm: bool,
     target_is_empty: bool,
     value: int,
-    memory_expansion: bool,
+    args_size: int,
+    ret_size: int,
 ) -> None:
     """
     CALL without 7702 delegation - test SUCCESS and OOG before target access.
 
     When target_is_warm=True, we use EIP-2930 tx access list to warm the
     target. Access list warming does NOT add to BAL - only EVM access does.
+
+    Memory expansion is parametrized independently for args (insize) and
+    ret (outsize) per #1910, surfacing client-impl asymmetry bugs in the
+    memory-cost calculator.
     """
     alice = pre.fund_eoa()
 
@@ -426,19 +552,21 @@ def test_bal_call_no_delegation_and_oog_before_target_access(
         else pre.deploy_contract(code=Op.STOP)
     )
 
-    ret_size = 32 if memory_expansion else 0
+    new_memory_size = max(args_size, ret_size)
 
     # Full gas metadata: includes create_cost when applicable
     call_code = Op.CALL(
         gas=0,
         address=target,
         value=value,
+        args_size=args_size,
+        args_offset=0,
         ret_size=ret_size,
         ret_offset=0,
         address_warm=target_is_warm,
         value_transfer=value > 0,
         account_new=value > 0 and target_is_empty,
-        new_memory_size=ret_size,
+        new_memory_size=new_memory_size,
     )
     caller = pre.deploy_contract(code=call_code, balance=value)
 
@@ -458,12 +586,14 @@ def test_bal_call_no_delegation_and_oog_before_target_access(
             gas=0,
             address=target,
             value=value,
+            args_size=args_size,
+            args_offset=0,
             ret_size=ret_size,
             ret_offset=0,
             address_warm=target_is_warm,
             value_transfer=value > 0,
             account_new=False,
-            new_memory_size=ret_size,
+            new_memory_size=new_memory_size,
         )
         gas_limit = intrinsic_cost + call_static.gas_cost(fork) - 1
     else:  # SUCCESS
@@ -536,15 +666,22 @@ def test_bal_call_no_delegation_and_oog_before_target_access(
     "target_is_warm", [False, True], ids=["cold_target", "warm_target"]
 )
 @pytest.mark.parametrize(
-    "memory_expansion", [False, True], ids=["no_memory", "with_memory"]
+    "args_size,ret_size",
+    [
+        pytest.param(0, 0, id="no_memory"),
+        pytest.param(4096, 0, id="args_large"),
+        pytest.param(0, 4096, id="ret_large"),
+        pytest.param(32, 32, id="both_small"),
+    ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_bal_call_no_delegation_oog_after_target_access(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
     fork: Fork,
     target_is_warm: bool,
-    memory_expansion: bool,
+    args_size: int,
+    ret_size: int,
 ) -> None:
     """
     CALL without 7702 delegation - OOG after state access.
@@ -560,9 +697,12 @@ def test_bal_call_no_delegation_oog_after_target_access(
         - target is always empty - required for create cost
         - value=1 (greater than 0) - required for create cost
 
-    The create_cost (GAS_NEW_ACCOUNT = 25000) is charged only for value
+    The create_cost (NEW_ACCOUNT = 25000) is charged only for value
     transfers to empty accounts, creating the gap tested here.
 
+    Memory expansion is parametrized independently for args (insize) and
+    ret (outsize) per #1910.
+
     """
     alice = pre.fund_eoa()
 
@@ -571,8 +711,7 @@ def test_bal_call_no_delegation_oog_after_target_access(
     # value > 0 required for create_cost
     value = 1
 
-    # memory expansion / no expansion
-    ret_size = 32 if memory_expansion else 0
+    new_memory_size = max(args_size, ret_size)
 
     # Static gas (before state access): no create_cost
     # Pass static check, fail at second check due to create cost
@@ -580,12 +719,14 @@ def test_bal_call_no_delegation_oog_after_target_access(
         gas=0,
         address=target,
         value=value,
+        args_size=args_size,
+        args_offset=0,
         ret_size=ret_size,
         ret_offset=0,
         address_warm=target_is_warm,
         value_transfer=True,
         account_new=False,
-        new_memory_size=ret_size,
+        new_memory_size=new_memory_size,
     )
     caller = pre.deploy_contract(code=call_code, balance=value)
 
@@ -651,7 +792,13 @@ def test_bal_call_no_delegation_oog_after_target_access(
 )
 @pytest.mark.parametrize("value", [0, 1], ids=["no_value", "with_value"])
 @pytest.mark.parametrize(
-    "memory_expansion", [False, True], ids=["no_memory", "with_memory"]
+    "args_size,ret_size",
+    [
+        pytest.param(0, 0, id="no_memory"),
+        pytest.param(4096, 0, id="args_large"),
+        pytest.param(0, 4096, id="ret_large"),
+        pytest.param(32, 32, id="both_small"),
+    ],
 )
 def test_bal_call_7702_delegation_and_oog(
     pre: Alloc,
@@ -661,33 +808,37 @@ def test_bal_call_7702_delegation_and_oog(
     target_is_warm: bool,
     delegation_is_warm: bool,
     value: int,
-    memory_expansion: bool,
+    args_size: int,
+    ret_size: int,
 ) -> None:
     """
     CALL with 7702 delegation - test all OOG boundaries.
 
     When target_is_warm or delegation_is_warm, we use EIP-2930 tx access list.
     Access list warming does NOT add targets to BAL - only EVM access does.
+
+    Memory expansion is parametrized independently for args and ret per #1910.
     """
     alice = pre.fund_eoa()
 
     delegation_target = pre.deploy_contract(code=Op.STOP)
     target = pre.fund_eoa(amount=0, delegation=delegation_target)
 
-    # memory expansion / no expansion
-    ret_size = 32 if memory_expansion else 0
+    new_memory_size = max(args_size, ret_size)
 
     # Full gas metadata: includes delegation cost
     call_code = Op.CALL(
         gas=0,
         address=target,
         value=value,
+        args_size=args_size,
+        args_offset=0,
         ret_size=ret_size,
         ret_offset=0,
         address_warm=target_is_warm,
         value_transfer=value > 0,
         account_new=False,
-        new_memory_size=ret_size,
+        new_memory_size=new_memory_size,
         delegated_address=True,
         delegated_address_warm=delegation_is_warm,
     )
@@ -711,12 +862,14 @@ def test_bal_call_7702_delegation_and_oog(
         gas=0,
         address=target,
         value=value,
+        args_size=args_size,
+        args_offset=0,
         ret_size=ret_size,
         ret_offset=0,
         address_warm=target_is_warm,
         value_transfer=value > 0,
         account_new=False,
-        new_memory_size=ret_size,
+        new_memory_size=new_memory_size,
     )
 
     if oog_boundary == OutOfGasBoundary.OOG_BEFORE_TARGET_ACCESS:
@@ -811,7 +964,13 @@ def test_bal_call_7702_delegation_and_oog(
     "target_is_warm", [False, True], ids=["cold_target", "warm_target"]
 )
 @pytest.mark.parametrize(
-    "memory_expansion", [False, True], ids=["no_memory", "with_memory"]
+    "args_size,ret_size",
+    [
+        pytest.param(0, 0, id="no_memory"),
+        pytest.param(4096, 0, id="args_large"),
+        pytest.param(0, 4096, id="ret_large"),
+        pytest.param(32, 32, id="both_small"),
+    ],
 )
 def test_bal_delegatecall_no_delegation_and_oog_before_target_access(
     pre: Alloc,
@@ -819,28 +978,32 @@ def test_bal_delegatecall_no_delegation_and_oog_before_target_access(
     fork: Fork,
     oog_boundary: OutOfGasBoundary,
     target_is_warm: bool,
-    memory_expansion: bool,
+    args_size: int,
+    ret_size: int,
 ) -> None:
     """
     DELEGATECALL without 7702 delegation - test SUCCESS and OOG boundaries.
 
     When target_is_warm=True, we use EIP-2930 tx access list to warm the
     target. Access list warming does NOT add to BAL - only EVM access does.
+
+    Memory expansion is parametrized independently for args and ret per #1910.
     """
     alice = pre.fund_eoa()
 
     target = pre.deploy_contract(code=Op.STOP)
 
-    ret_size = 32 if memory_expansion else 0
-    ret_offset = 0
+    new_memory_size = max(args_size, ret_size)
 
     delegatecall_code = Op.DELEGATECALL(
         address=target,
         gas=0,
+        args_size=args_size,
+        args_offset=0,
         ret_size=ret_size,
-        ret_offset=ret_offset,
+        ret_offset=0,
         address_warm=target_is_warm,
-        new_memory_size=ret_size,
+        new_memory_size=new_memory_size,
     )
 
     caller = pre.deploy_contract(code=delegatecall_code)
@@ -909,7 +1072,13 @@ def test_bal_delegatecall_no_delegation_and_oog_before_target_access(
     ids=["cold_delegation", "warm_delegation"],
 )
 @pytest.mark.parametrize(
-    "memory_expansion", [False, True], ids=["no_memory", "with_memory"]
+    "args_size,ret_size",
+    [
+        pytest.param(0, 0, id="no_memory"),
+        pytest.param(4096, 0, id="args_large"),
+        pytest.param(0, 4096, id="ret_large"),
+        pytest.param(32, 32, id="both_small"),
+    ],
 )
 def test_bal_delegatecall_7702_delegation_and_oog(
     pre: Alloc,
@@ -918,7 +1087,8 @@ def test_bal_delegatecall_7702_delegation_and_oog(
     oog_boundary: OutOfGasBoundary,
     target_is_warm: bool,
     delegation_is_warm: bool,
-    memory_expansion: bool,
+    args_size: int,
+    ret_size: int,
 ) -> None:
     """
     DELEGATECALL with 7702 delegation - test all OOG boundaries.
@@ -929,24 +1099,26 @@ def test_bal_delegatecall_7702_delegation_and_oog(
     For 7702 delegation, there's ALWAYS a gap between static gas and
     second check (delegation_cost) - all 3 scenarios produce distinct
     behaviors.
+
+    Memory expansion is parametrized independently for args and ret per #1910.
     """
     alice = pre.fund_eoa()
 
     delegation_target = pre.deploy_contract(code=Op.STOP)
     target = pre.fund_eoa(amount=0, delegation=delegation_target)
 
-    # memory expansion / no expansion
-    ret_size = 32 if memory_expansion else 0
-    ret_offset = 0
+    new_memory_size = max(args_size, ret_size)
 
     # Full gas metadata: includes delegation cost
     delegatecall_code = Op.DELEGATECALL(
         gas=0,
         address=target,
+        args_size=args_size,
+        args_offset=0,
         ret_size=ret_size,
-        ret_offset=ret_offset,
+        ret_offset=0,
         address_warm=target_is_warm,
-        new_memory_size=ret_size,
+        new_memory_size=new_memory_size,
         delegated_address=True,
         delegated_address_warm=delegation_is_warm,
     )
@@ -970,10 +1142,12 @@ def test_bal_delegatecall_7702_delegation_and_oog(
     delegatecall_static = Op.DELEGATECALL(
         gas=0,
         address=target,
+        args_size=args_size,
+        args_offset=0,
         ret_size=ret_size,
-        ret_offset=ret_offset,
+        ret_offset=0,
         address_warm=target_is_warm,
-        new_memory_size=ret_size,
+        new_memory_size=new_memory_size,
     )
 
     if oog_boundary == OutOfGasBoundary.OOG_BEFORE_TARGET_ACCESS:
@@ -1046,7 +1220,13 @@ def test_bal_delegatecall_7702_delegation_and_oog(
 )
 @pytest.mark.parametrize("value", [0, 1], ids=["no_value", "with_value"])
 @pytest.mark.parametrize(
-    "memory_expansion", [False, True], ids=["no_memory", "with_memory"]
+    "args_size,ret_size",
+    [
+        pytest.param(0, 0, id="no_memory"),
+        pytest.param(4096, 0, id="args_large"),
+        pytest.param(0, 4096, id="ret_large"),
+        pytest.param(32, 32, id="both_small"),
+    ],
 )
 def test_bal_callcode_no_delegation_and_oog_before_target_access(
     pre: Alloc,
@@ -1055,7 +1235,8 @@ def test_bal_callcode_no_delegation_and_oog_before_target_access(
     oog_boundary: OutOfGasBoundary,
     target_is_warm: bool,
     value: int,
-    memory_expansion: bool,
+    args_size: int,
+    ret_size: int,
 ) -> None:
     """
     CALLCODE without 7702 delegation - test SUCCESS and OOG boundaries.
@@ -1063,23 +1244,27 @@ def test_bal_callcode_no_delegation_and_oog_before_target_access(
     When target_is_warm=True, we use EIP-2930 tx access list to warm the
     target. Access list warming does NOT add to BAL - only EVM access does.
     CALLCODE has no balance transfer to target (runs in caller's context).
+
+    Memory expansion is parametrized independently for args and ret per #1910.
     """
     alice = pre.fund_eoa()
 
     target = pre.deploy_contract(code=Op.STOP)
 
-    ret_size = 32 if memory_expansion else 0
+    new_memory_size = max(args_size, ret_size)
 
     callcode_code = Op.CALLCODE(
         gas=0,
         address=target,
         value=value,
+        args_size=args_size,
+        args_offset=0,
         ret_size=ret_size,
         ret_offset=0,
         address_warm=target_is_warm,
         value_transfer=value > 0,
         account_new=False,
-        new_memory_size=ret_size,
+        new_memory_size=new_memory_size,
     )
     caller = pre.deploy_contract(code=callcode_code, balance=value)
 
@@ -1155,7 +1340,13 @@ def test_bal_callcode_no_delegation_and_oog_before_target_access(
 )
 @pytest.mark.parametrize("value", [0, 1], ids=["no_value", "with_value"])
 @pytest.mark.parametrize(
-    "memory_expansion", [False, True], ids=["no_memory", "with_memory"]
+    "args_size,ret_size",
+    [
+        pytest.param(0, 0, id="no_memory"),
+        pytest.param(4096, 0, id="args_large"),
+        pytest.param(0, 4096, id="ret_large"),
+        pytest.param(32, 32, id="both_small"),
+    ],
 )
 def test_bal_callcode_7702_delegation_and_oog(
     pre: Alloc,
@@ -1165,7 +1356,8 @@ def test_bal_callcode_7702_delegation_and_oog(
     target_is_warm: bool,
     delegation_is_warm: bool,
     value: int,
-    memory_expansion: bool,
+    args_size: int,
+    ret_size: int,
 ) -> None:
     """
     CALLCODE with 7702 delegation - test all OOG boundaries.
@@ -1176,26 +1368,29 @@ def test_bal_callcode_7702_delegation_and_oog(
     For 7702 delegation, there's ALWAYS a gap between static gas and
     second check (delegation_cost) - all 3 scenarios produce distinct
     behaviors.
+
+    Memory expansion is parametrized independently for args and ret per #1910.
     """
     alice = pre.fund_eoa()
 
     delegation_target = pre.deploy_contract(code=Op.STOP)
     target = pre.fund_eoa(amount=0, delegation=delegation_target)
 
-    # memory expansion / no expansion
-    ret_size = 32 if memory_expansion else 0
+    new_memory_size = max(args_size, ret_size)
 
     # Full gas metadata: includes delegation cost
     callcode_code = Op.CALLCODE(
         gas=0,
         address=target,
         value=value,
+        args_size=args_size,
+        args_offset=0,
         ret_size=ret_size,
         ret_offset=0,
         address_warm=target_is_warm,
         value_transfer=value > 0,
         account_new=False,
-        new_memory_size=ret_size,
+        new_memory_size=new_memory_size,
         delegated_address=True,
         delegated_address_warm=delegation_is_warm,
     )
@@ -1219,12 +1414,14 @@ def test_bal_callcode_7702_delegation_and_oog(
         gas=0,
         address=target,
         value=value,
+        args_size=args_size,
+        args_offset=0,
         ret_size=ret_size,
         ret_offset=0,
         address_warm=target_is_warm,
         value_transfer=value > 0,
         account_new=False,
-        new_memory_size=ret_size,
+        new_memory_size=new_memory_size,
     )
 
     if oog_boundary == OutOfGasBoundary.OOG_BEFORE_TARGET_ACCESS:
@@ -1296,7 +1493,13 @@ def test_bal_callcode_7702_delegation_and_oog(
     "target_is_warm", [False, True], ids=["cold_target", "warm_target"]
 )
 @pytest.mark.parametrize(
-    "memory_expansion", [False, True], ids=["no_memory", "with_memory"]
+    "args_size,ret_size",
+    [
+        pytest.param(0, 0, id="no_memory"),
+        pytest.param(4096, 0, id="args_large"),
+        pytest.param(0, 4096, id="ret_large"),
+        pytest.param(32, 32, id="both_small"),
+    ],
 )
 def test_bal_staticcall_no_delegation_and_oog_before_target_access(
     pre: Alloc,
@@ -1304,7 +1507,8 @@ def test_bal_staticcall_no_delegation_and_oog_before_target_access(
     fork: Fork,
     oog_boundary: OutOfGasBoundary,
     target_is_warm: bool,
-    memory_expansion: bool,
+    args_size: int,
+    ret_size: int,
 ) -> None:
     """
     STATICCALL without 7702 delegation - test SUCCESS and OOG boundaries.
@@ -1316,16 +1520,17 @@ def test_bal_staticcall_no_delegation_and_oog_before_target_access(
 
     target = pre.deploy_contract(code=Op.STOP)
 
-    ret_size = 32 if memory_expansion else 0
-    ret_offset = 0
+    new_memory_size = max(args_size, ret_size)
 
     staticcall_code = Op.STATICCALL(
         address=target,
         gas=0,
+        args_size=args_size,
+        args_offset=0,
         ret_size=ret_size,
-        ret_offset=ret_offset,
+        ret_offset=0,
         address_warm=target_is_warm,
-        new_memory_size=ret_size,
+        new_memory_size=new_memory_size,
     )
 
     caller = pre.deploy_contract(code=staticcall_code)
@@ -1394,7 +1599,13 @@ def test_bal_staticcall_no_delegation_and_oog_before_target_access(
     ids=["cold_delegation", "warm_delegation"],
 )
 @pytest.mark.parametrize(
-    "memory_expansion", [False, True], ids=["no_memory", "with_memory"]
+    "args_size,ret_size",
+    [
+        pytest.param(0, 0, id="no_memory"),
+        pytest.param(4096, 0, id="args_large"),
+        pytest.param(0, 4096, id="ret_large"),
+        pytest.param(32, 32, id="both_small"),
+    ],
 )
 def test_bal_staticcall_7702_delegation_and_oog(
     pre: Alloc,
@@ -1403,7 +1614,8 @@ def test_bal_staticcall_7702_delegation_and_oog(
     oog_boundary: OutOfGasBoundary,
     target_is_warm: bool,
     delegation_is_warm: bool,
-    memory_expansion: bool,
+    args_size: int,
+    ret_size: int,
 ) -> None:
     """
     STATICCALL with 7702 delegation - test all OOG boundaries.
@@ -1420,25 +1632,23 @@ def test_bal_staticcall_7702_delegation_and_oog(
     delegation_target = pre.deploy_contract(code=Op.STOP)
     target = pre.fund_eoa(amount=0, delegation=delegation_target)
 
-    # memory expansion / no expansion
-    ret_size = 32 if memory_expansion else 0
-    ret_offset = 0
+    new_memory_size = max(args_size, ret_size)
 
-    # Full gas metadata: includes delegation cost
     staticcall_code = Op.STATICCALL(
         gas=0,
         address=target,
+        args_size=args_size,
+        args_offset=0,
         ret_size=ret_size,
-        ret_offset=ret_offset,
+        ret_offset=0,
         address_warm=target_is_warm,
-        new_memory_size=ret_size,
+        new_memory_size=new_memory_size,
         delegated_address=True,
         delegated_address_warm=delegation_is_warm,
     )
 
     caller = pre.deploy_contract(code=staticcall_code)
 
-    # Build access list for warming
     access_list: list[AccessList] = []
     if target_is_warm:
         access_list.append(AccessList(address=target, storage_keys=[]))
@@ -1451,14 +1661,15 @@ def test_bal_staticcall_7702_delegation_and_oog(
         access_list=access_list
     )
 
-    # Static gas (before state access): no delegation
     staticcall_static = Op.STATICCALL(
         gas=0,
         address=target,
+        args_size=args_size,
+        args_offset=0,
         ret_size=ret_size,
-        ret_offset=ret_offset,
+        ret_offset=0,
         address_warm=target_is_warm,
-        new_memory_size=ret_size,
+        new_memory_size=new_memory_size,
     )
 
     if oog_boundary == OutOfGasBoundary.OOG_BEFORE_TARGET_ACCESS:
@@ -1888,35 +2099,32 @@ def test_bal_create_oog_code_deposit(
     )
 
 
+@pytest.mark.parametrize(
+    "original_value", [0, 0x42], ids=["zero_original", "nonzero_original"]
+)
 def test_bal_sstore_static_context(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
+    original_value: int,
 ) -> None:
     """
-    Ensure BAL does not record storage reads when SSTORE fails in static
-    context.
+    SSTORE in static context must not leak storage reads into BAL.
 
-    Contract A makes STATICCALL to Contract B. Contract B attempts SSTORE,
-    which should fail immediately without recording any storage reads.
+    Contract A STATICCALLs Contract B which attempts SSTORE. Contract B
+    IS in BAL (accessed via STATICCALL) but MUST NOT have storage_reads
+    — the static check must fire before any implicit SLOAD.
     """
     alice = pre.fund_eoa()
 
-    contract_b = pre.deploy_contract(code=Op.SSTORE(0, 5))
+    contract_b = pre.deploy_contract(
+        code=Op.SSTORE(0, 5),
+        storage={0: original_value} if original_value else {},
+    )
 
-    # Contract A makes STATICCALL to Contract B
-    # The STATICCALL will fail because B tries SSTORE in static context
-    # But contract_a continues and writes to its own storage
     contract_a = pre.deploy_contract(
-        code=Op.STATICCALL(
-            gas=1_000_000,
-            address=contract_b,
-            args_offset=0,
-            args_size=0,
-            ret_offset=0,
-            ret_size=0,
-        )
-        + Op.POP  # pop the return value (0 = failure)
-        + Op.SSTORE(0, 1)  # this should succeed (non-static context)
+        code=Op.SSTORE(0, Op.STATICCALL(gas=1_000_000, address=contract_b))
+        + Op.SSTORE(1, 1),  # proves execution continued
+        storage={0: 0xDEAD},  # non-zero so STATICCALL result (0) is detectable
     )
 
     tx = Transaction(
@@ -1943,6 +2151,16 @@ def test_bal_sstore_static_context(
                             storage_changes=[
                                 BalStorageSlot(
                                     slot=0x00,
+                                    slot_changes=[
+                                        # STATICCALL returns 0 (inner SSTORE
+                                        # failed in static context)
+                                        BalStorageChange(
+                                            block_access_index=1, post_value=0
+                                        ),
+                                    ],
+                                ),
+                                BalStorageSlot(
+                                    slot=0x01,
                                     slot_changes=[
                                         BalStorageChange(
                                             block_access_index=1, post_value=1
@@ -1951,235 +2169,490 @@ def test_bal_sstore_static_context(
                                 ),
                             ],
                         ),
+                        # Contract B is in BAL (accessed via STATICCALL)
+                        # but MUST NOT have any state touches
                         contract_b: BalAccountExpectation.empty(),
                     }
                 ),
             )
         ],
         post={
-            contract_a: Account(storage={0: 1}),
-            contract_b: Account(storage={0: 0}),  # SSTORE failed
+            contract_a: Account(storage={0: 0, 1: 1}),
+            contract_b: Account(
+                storage={0: original_value} if original_value else {}
+            ),
         },
     )
 
 
-def test_bal_call_with_value_in_static_context(
+def blockchain_test_under_static_call(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
+    *,
+    static_call_target: Address,
+    bal_expectations: Dict[Address, BalAccountExpectation | None],
+    post: Dict[Address, Account | None] | None = None,
+    tx_access_list: list[AccessList] | None = None,
 ) -> None:
     """
-    Ensure BAL does NOT include target address when CALL with value fails
-    in static context. The static context check must happen BEFORE any
-    account access or BAL tracking.
+    Run a blockchain_test that STATICCALLs static_call_target and
+    verifies BAL expectations. Stores the STATICCALL result to detect
+    silent failures.
     """
     alice = pre.fund_eoa()
 
-    target_starting_balance = 1022
-    target = pre.fund_eoa(amount=target_starting_balance)
-
-    caller_starting_balance = 10**18
-    caller = pre.deploy_contract(
-        code=Op.CALL(gas=100_000, address=target, value=1) + Op.STOP,
-        balance=caller_starting_balance,
-    )
-
-    # makes STATICCALL to caller
+    # Slot 0: STATICCALL result, pre-set to non-zero so writes are
+    # detectable regardless of return value (0 or 1).
     static_caller = pre.deploy_contract(
-        code=Op.STATICCALL(gas=500_000, address=caller)
-        + Op.SSTORE(0, 1)  # prove we continued after STATICCALL returned
+        code=Op.SSTORE(
+            0, Op.STATICCALL(gas=1_000_000, address=static_call_target)
+        )
+        + Op.SSTORE(1, 1),
+        storage={0: 0xDEAD},
     )
 
     tx = Transaction(
         sender=alice,
         to=static_caller,
-        gas_limit=1_000_000,
+        gas_limit=2_000_000,
+        access_list=tx_access_list,
     )
 
+    # Inner call fails (returns 0) when forbidden opcodes are tested
+    # (None values in bal_expectations), succeeds (returns 1) otherwise.
+    staticcall_result = (
+        0 if any(v is None for v in bal_expectations.values()) else 1
+    )
+
+    account_expectations: Dict[Address, BalAccountExpectation | None] = {
+        alice: BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=1, post_nonce=1)],
+        ),
+        static_caller: BalAccountExpectation(
+            storage_changes=[
+                BalStorageSlot(
+                    slot=0x00,
+                    slot_changes=[
+                        BalStorageChange(
+                            block_access_index=1,
+                            post_value=staticcall_result,
+                        ),
+                    ],
+                ),
+                BalStorageSlot(
+                    slot=0x01,
+                    slot_changes=[
+                        BalStorageChange(block_access_index=1, post_value=1),
+                    ],
+                ),
+            ],
+        ),
+        static_call_target: BalAccountExpectation.empty(),
+    }
+    account_expectations.update(bal_expectations)
+
+    _post: Dict[Address, Account | None] = {
+        static_caller: Account(storage={0: staticcall_result, 1: 1}),
+    }
+    if post:
+        _post.update(post)
+
     blockchain_test(
         pre=pre,
         blocks=[
             Block(
                 txs=[tx],
                 expected_block_access_list=BlockAccessListExpectation(
-                    account_expectations={
-                        alice: BalAccountExpectation(
-                            nonce_changes=[
-                                BalNonceChange(
-                                    block_access_index=1, post_nonce=1
-                                )
-                            ],
-                        ),
-                        static_caller: BalAccountExpectation(
-                            storage_changes=[
-                                BalStorageSlot(
-                                    slot=0x00,
-                                    slot_changes=[
-                                        BalStorageChange(
-                                            block_access_index=1, post_value=1
-                                        ),
-                                    ],
-                                ),
-                            ],
-                        ),
-                        caller: BalAccountExpectation.empty(),
-                        target: None,  # explicit check target is NOT in BAL
-                    }
+                    account_expectations=account_expectations
                 ),
             )
         ],
-        post={
-            # STATICCALL returned, continued
-            static_caller: Account(storage={0: 1}),
-            # no transfer occurred, balances unchanged
-            caller: Account(balance=caller_starting_balance),
-            target: Account(balance=target_starting_balance),
-        },
+        post=_post,
     )
 
 
-def test_bal_create_contract_init_revert(
-    blockchain_test: BlockchainTestFiller,
+@pytest.mark.parametrize(
+    "target_is_warm", [False, True], ids=["cold_target", "warm_target"]
+)
+@pytest.mark.parametrize(
+    "target_has_code", [False, True], ids=["eoa_target", "contract_target"]
+)
+def test_bal_call_with_value_in_static_context(
     pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    target_is_warm: bool,
+    target_has_code: bool,
 ) -> None:
     """
-    Test that BAL does not include nonce/code changes when CREATE happens
-    in a call that then REVERTs.
-    """
-    alice = pre.fund_eoa(amount=10**18)
+    CALL with nonzero value in static context: target NOT in BAL.
 
-    # Simple init code that returns STOP as deployed code
-    init_code_bytes = bytes(Op.RETURN(0, 1) + Op.STOP)
+    Static check must fire before account access (warm/cold lookup,
+    code loading).
+    """
+    target_starting_balance = 1022
+    if target_has_code:
+        target = pre.deploy_contract(
+            code=Op.STOP, balance=target_starting_balance
+        )
+    else:
+        target = pre.fund_eoa(amount=target_starting_balance)
 
-    # Factory that does CREATE then REVERTs
-    factory = pre.deploy_contract(
-        code=Op.MSTORE(0, Op.PUSH32(init_code_bytes))
-        + Op.POP(Op.CREATE(0, 32 - len(init_code_bytes), len(init_code_bytes)))
-        + Op.REVERT(0, 0)
+    caller_starting_balance = 10**18
+    caller = pre.deploy_contract(
+        code=Op.CALL(gas=100_000, address=target, value=1) + Op.STOP,
+        balance=caller_starting_balance,
     )
 
-    # A caller that CALLs factory to CREATE then REVERT
-    caller = pre.deploy_contract(code=Op.CALL(address=factory))
-
-    created_address = compute_create_address(address=factory, nonce=1)
-
-    tx = Transaction(
-        sender=alice,
-        to=caller,
-        gas_limit=500_000,
+    access_list = (
+        [AccessList(address=target, storage_keys=[])]
+        if target_is_warm
+        else None
     )
 
-    blockchain_test(
-        pre=pre,
-        blocks=[
-            Block(
-                txs=[tx],
-                expected_block_access_list=BlockAccessListExpectation(
-                    account_expectations={
-                        alice: BalAccountExpectation(
-                            nonce_changes=[
-                                BalNonceChange(
-                                    block_access_index=1, post_nonce=1
-                                )
-                            ],
-                        ),
-                        caller: BalAccountExpectation.empty(),
-                        factory: BalAccountExpectation.empty(),
-                        created_address: BalAccountExpectation.empty(),
-                    }
-                ),
-            )
-        ],
+    blockchain_test_under_static_call(
+        pre,
+        blockchain_test,
+        static_call_target=caller,
+        bal_expectations={target: None},
         post={
-            alice: Account(nonce=1),
-            caller: Account(nonce=1),
-            factory: Account(nonce=1),
-            created_address: Account.NONEXISTENT,
+            caller: Account(balance=caller_starting_balance),
+            target: Account(balance=target_starting_balance),
         },
+        tx_access_list=access_list,
     )
 
 
-def test_bal_call_revert_insufficient_funds(
+@pytest.mark.parametrize("value", [0, 1], ids=["no_value", "with_value"])
+@pytest.mark.with_all_create_opcodes
+def test_bal_create_in_static_context(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
+    create_opcode: Op,
+    value: int,
 ) -> None:
     """
-    Test BAL with CALL failure due to insufficient balance (not OOG).
-
-    Contract (balance=100): SLOAD(0x01)→CALL(target, value=1000)→SSTORE(0x02).
-    CALL fails because 1000 > 100. Target is 0xDEAD.
+    CREATE/CREATE2 in static context: created address NOT in BAL.
 
-    Expected BAL:
-    - Contract: storage_reads [0x01], storage_changes slot 0x02 (value=0)
-    - Target: appears in BAL (accessed before balance check fails)
+    Static check must fire before balance check, address computation,
+    or nonce increment.
     """
-    alice = pre.fund_eoa()
+    init_code = Initcode(deploy_code=Op.STOP)
+    init_code_bytes = bytes(init_code)
 
-    contract_balance = 100
-    transfer_amount = 1000  # More than contract has
+    caller = pre.deploy_contract(
+        code=Op.MSTORE(0, Op.PUSH32(init_code_bytes))
+        + create_opcode(
+            value=value,
+            offset=32 - len(init_code_bytes),
+            size=len(init_code_bytes),
+        )
+        + Op.STOP,
+        balance=value,
+    )
 
-    # Target address that should be warmed but not receive funds
-    # Give it a small balance so it's not considered "empty" and pruned
-    target_balance = 1
-    target_address = pre.fund_eoa(amount=target_balance)
+    would_be_address = compute_create_address(
+        address=caller,
+        nonce=1,
+        salt=0,
+        initcode=init_code_bytes,
+        opcode=create_opcode,
+    )
 
-    # Contract that:
-    # 1. SLOAD slot 0x01
-    # 2. CALL target with value=1000 (will fail - insufficient funds)
-    # 3. SSTORE slot 0x02 with CALL result (0 = failure)
-    contract_code = (
-        Op.SLOAD(0x01)  # Read from slot 0x01, push to stack
-        + Op.POP  # Discard value
-        # CALL(gas, addr, value, argsOffset, argsSize, retOffset, retSize)
-        + Op.CALL(100_000, target_address, transfer_amount, 0, 0, 0, 0)
-        # CALL result is on stack (0 = failure, 1 = success)
-        # Stack: [result]
-        + Op.PUSH1(0x02)  # Push slot number
-        # Stack: [0x02, result]
-        + Op.SSTORE  # SSTORE pops slot (0x02), then value (result)
+    blockchain_test_under_static_call(
+        pre,
+        blockchain_test,
+        static_call_target=caller,
+        bal_expectations={would_be_address: None},
+        post={
+            caller: Account(nonce=1, balance=value),
+            would_be_address: Account.NONEXISTENT,
+        },
+    )
+
+
+@pytest.mark.parametrize(
+    "beneficiary_is_warm",
+    [False, True],
+    ids=["cold_beneficiary", "warm_beneficiary"],
+)
+@pytest.mark.parametrize(
+    "caller_balance", [0, 100], ids=["no_balance", "with_balance"]
+)
+def test_bal_selfdestruct_in_static_context(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    beneficiary_is_warm: bool,
+    caller_balance: int,
+) -> None:
+    """
+    SELFDESTRUCT in static context: beneficiary NOT in BAL.
+
+    Static check must fire before beneficiary access (warm/cold lookup)
+    or balance transfer.
+    """
+    beneficiary_balance = 1
+    beneficiary = pre.fund_eoa(amount=beneficiary_balance)
+    caller = pre.deploy_contract(
+        code=Op.SELFDESTRUCT(address=beneficiary),
+        balance=caller_balance,
+    )
+
+    access_list = (
+        [AccessList(address=beneficiary, storage_keys=[])]
+        if beneficiary_is_warm
+        else None
+    )
+
+    blockchain_test_under_static_call(
+        pre,
+        blockchain_test,
+        static_call_target=caller,
+        bal_expectations={beneficiary: None},
+        post={
+            caller: Account(balance=caller_balance),
+            beneficiary: Account(balance=beneficiary_balance),
+        },
+        tx_access_list=access_list,
+    )
+
+
+@pytest.mark.with_all_call_opcodes
+def test_bal_call_opcode_succeeds_in_static_context(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    call_opcode: Op,
+) -> None:
+    """
+    All call opcodes (without value) succeed in static context.
+
+    Target IS in BAL. Ensures clients don't over-restrict call opcodes
+    beyond what EIP-214 forbids (only CALL with nonzero value).
+    """
+    target = pre.deploy_contract(code=Op.STOP)
+
+    caller = pre.deploy_contract(
+        code=call_opcode(address=target) + Op.STOP,
+    )
+
+    blockchain_test_under_static_call(
+        pre,
+        blockchain_test,
+        static_call_target=caller,
+        bal_expectations={
+            target: BalAccountExpectation.empty(),
+        },
+    )
+
+
+def test_bal_callcode_with_value_in_static_context(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+) -> None:
+    """
+    CALLCODE with nonzero value succeeds in static context.
+
+    EIP-214 explicitly excludes CALLCODE from write-protection.
+    """
+    target = pre.deploy_contract(code=Op.STOP)
+
+    caller = pre.deploy_contract(
+        code=Op.CALLCODE(gas=100_000, address=target, value=1) + Op.STOP,
+        balance=10**18,
+    )
+
+    blockchain_test_under_static_call(
+        pre,
+        blockchain_test,
+        static_call_target=caller,
+        bal_expectations={
+            target: BalAccountExpectation.empty(),
+        },
+    )
+
+
+def test_bal_create_contract_init_revert(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+) -> None:
+    """
+    Test that BAL does not include nonce/code changes when CREATE happens
+    in a call that then REVERTs.
+    """
+    alice = pre.fund_eoa(amount=10**18)
+
+    # Simple init code that returns STOP as deployed code
+    init_code_bytes = bytes(Op.RETURN(0, 1) + Op.STOP)
+
+    # Factory that does CREATE then REVERTs
+    factory = pre.deploy_contract(
+        code=Op.MSTORE(0, Op.PUSH32(init_code_bytes))
+        + Op.POP(Op.CREATE(0, 32 - len(init_code_bytes), len(init_code_bytes)))
+        + Op.REVERT(0, 0)
+    )
+
+    # A caller that CALLs factory to CREATE then REVERT
+    caller = pre.deploy_contract(code=Op.CALL(address=factory))
+
+    created_address = compute_create_address(address=factory, nonce=1)
+
+    tx = Transaction(
+        sender=alice,
+        to=caller,
+        gas_limit=500_000,
+    )
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=[tx],
+                expected_block_access_list=BlockAccessListExpectation(
+                    account_expectations={
+                        alice: BalAccountExpectation(
+                            nonce_changes=[
+                                BalNonceChange(
+                                    block_access_index=1, post_nonce=1
+                                )
+                            ],
+                        ),
+                        caller: BalAccountExpectation.empty(),
+                        factory: BalAccountExpectation.empty(),
+                        created_address: BalAccountExpectation.empty(),
+                    }
+                ),
+            )
+        ],
+        post={
+            alice: Account(nonce=1),
+            caller: Account(nonce=1),
+            factory: Account(nonce=1),
+            created_address: Account.NONEXISTENT,
+        },
+    )
+
+
+@pytest.mark.parametrize(
+    "delegated,target_is_warm,delegation_is_warm",
+    [
+        pytest.param(False, False, False, id="no_delegation-cold_target"),
+        pytest.param(False, True, False, id="no_delegation-warm_target"),
+        pytest.param(
+            True, False, False, id="delegated-cold_target-cold_delegation"
+        ),
+        pytest.param(
+            True, True, False, id="delegated-warm_target-cold_delegation"
+        ),
+        pytest.param(
+            True, False, True, id="delegated-cold_target-warm_delegation"
+        ),
+        pytest.param(
+            True, True, True, id="delegated-warm_target-warm_delegation"
+        ),
+    ],
+)
+@pytest.mark.with_all_call_opcodes(
+    selector=lambda call_opcode: call_opcode in (Op.CALL, Op.CALLCODE)
+)
+def test_bal_call_revert_insufficient_funds(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    call_opcode: Op,
+    delegated: bool,
+    target_is_warm: bool,
+    delegation_is_warm: bool,
+) -> None:
+    """
+    Test BAL with CALL/CALLCODE failure due to insufficient balance
+    (not OOG), with and without 7702 delegation.
+
+    Caller (balance=100): SLOAD(0x01) → call_opcode(target, value=1000)
+    → SSTORE(0x02, result). The call fails because 1000 > 100. The
+    failure happens after delegation resolution. However, the delegation
+    target's account has not been read yet.
+    So when the target is a 7702-delegated EOA, the target itself appears in
+    the BAL since it is already read. The delegation target however,
+    does not appear in the BAL, since it does not need to be read
+    for verifying sufficient balance.
+
+    Access-list warming does NOT add to BAL on its own — only EVM
+    access does — so the BAL is identical across warm/cold variants.
+    """
+    alice = pre.fund_eoa()
+
+    caller_balance = 100
+    transfer_amount = 1000  # > caller_balance, transfer must fail
+    target_balance = 1  # non-zero balance keeps non-delegated target non-empty
+
+    delegation_target: Address | None = None
+    if delegated:
+        delegation_target = pre.deploy_contract(code=Op.STOP)
+        target = pre.fund_eoa(
+            amount=target_balance, delegation=delegation_target
+        )
+    else:
+        target = pre.fund_eoa(amount=target_balance)
+
+    caller_code = (
+        Op.SLOAD(0x01)
+        + Op.POP
+        + call_opcode(100_000, target, transfer_amount, 0, 0, 0, 0)
+        + Op.PUSH1(0x02)
+        + Op.SSTORE
         + Op.STOP
     )
 
-    contract = pre.deploy_contract(
-        code=contract_code,
-        balance=contract_balance,
-        storage={
-            0x02: 0xDEAD
-        },  # Non-zero initial value so SSTORE(0) is a change
+    caller = pre.deploy_contract(
+        code=caller_code,
+        balance=caller_balance,
+        storage={0x02: 0xDEAD},  # non-zero so SSTORE(0) is a change
     )
 
+    access_list: list[AccessList] = []
+    if target_is_warm:
+        access_list.append(AccessList(address=target, storage_keys=[]))
+    if delegated and delegation_is_warm:
+        assert delegation_target is not None
+        access_list.append(
+            AccessList(address=delegation_target, storage_keys=[])
+        )
+
     tx = Transaction(
         sender=alice,
-        to=contract,
+        to=caller,
         gas_limit=1_000_000,
+        access_list=access_list,
     )
 
+    account_expectations: Dict[Address, BalAccountExpectation | None] = {
+        alice: BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=1, post_nonce=1)],
+        ),
+        caller: BalAccountExpectation(
+            storage_reads=[0x01],
+            storage_changes=[
+                BalStorageSlot(
+                    slot=0x02,
+                    slot_changes=[
+                        BalStorageChange(block_access_index=1, post_value=0)
+                    ],
+                )
+            ],
+        ),
+        # Target accessed before balance check fails.
+        target: BalAccountExpectation.empty(),
+    }
+
+    if delegated:
+        assert delegation_target is not None
+        # Delegation target must NOT appear in the BAL — get_account
+        # for code_address only runs inside generic_call, which is
+        # never invoked when the balance check fails.
+        account_expectations[delegation_target] = None
+
     block = Block(
         txs=[tx],
         expected_block_access_list=BlockAccessListExpectation(
-            account_expectations={
-                alice: BalAccountExpectation(
-                    nonce_changes=[
-                        BalNonceChange(block_access_index=1, post_nonce=1)
-                    ],
-                ),
-                contract: BalAccountExpectation(
-                    # Storage read for slot 0x01
-                    storage_reads=[0x01],
-                    # Storage change for slot 0x02 (CALL result = 0)
-                    storage_changes=[
-                        BalStorageSlot(
-                            slot=0x02,
-                            slot_changes=[
-                                BalStorageChange(
-                                    block_access_index=1, post_value=0
-                                )
-                            ],
-                        )
-                    ],
-                ),
-                # Target appears in BAL - accessed before balance check fails
-                target_address: BalAccountExpectation.empty(),
-            }
+            account_expectations=account_expectations
         ),
     )
 
@@ -2188,11 +2661,11 @@ def test_bal_call_revert_insufficient_funds(
         blocks=[block],
         post={
             alice: Account(nonce=1),
-            contract: Account(
-                balance=contract_balance,  # Unchanged - transfer failed
-                storage={0x02: 0},  # CALL returned 0 (failure)
+            caller: Account(
+                balance=caller_balance,  # unchanged - transfer failed
+                storage={0x02: 0},  # Failed call returned 0
             ),
-            target_address: Account(balance=target_balance),  # Unchanged
+            target: Account(balance=target_balance),  # unchanged
         },
     )
 
@@ -2357,122 +2830,190 @@ def test_bal_create_selfdestruct_to_self_with_call(
     )
 
 
+@pytest.mark.with_all_create_opcodes
+@pytest.mark.parametrize(
+    "modification",
+    ["collision_only", "then_nonce_change", "then_storage_change"],
+)
 @pytest.mark.pre_alloc_mutable()
-def test_bal_create2_collision(
+def test_bal_create_collision(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
+    fork: Fork,
+    create_opcode: Op,
+    modification: str,
 ) -> None:
     """
-    Test BAL with CREATE2 collision against pre-existing contract.
-
-    Pre-existing contract has code=STOP, nonce=1.
-    Factory (nonce=1, slot[0]=0xDEAD) executes CREATE2 targeting it.
-
-    Expected BAL:
-    - Factory: nonce_changes (1→2), storage_changes slot 0 (0xDEAD→0)
-    - Collision address: empty (accessed during collision check)
-    - Collision address MUST NOT have nonce_changes or code_changes
+    BAL with CREATE/CREATE2 collision against pre-existing contract X,
+    optionally followed by a tx that modifies X via call (closes #2914
+    nonce/storage axes). Balance axis is already covered by the suite's
+    existing collision-then-value-transfer tests. The `code_changes`
+    axis isn't reachable in forward order — see
+    `test_bal_create2_deploy_then_collision`.
     """
     alice = pre.fund_eoa()
+    bob = pre.fund_eoa()
 
-    # Init code that deploys simple STOP contract
-    init_code = Initcode(deploy_code=Op.STOP)
+    # Storage-touching init: a client that wrongly runs init on the
+    # collision leaks a slot-0 access into X's BAL.
+    init_code = Initcode(
+        deploy_code=Op.STOP,
+        initcode_prefix=Op.SSTORE(0, Op.ADD(Op.SLOAD(0), 1)),
+    )
     init_code_bytes = bytes(init_code)
 
-    # Factory code: CREATE2 and store result in slot 0
     factory_code = (
-        # Push init code to memory
         Op.MSTORE(0, Op.PUSH32(init_code_bytes))
-        # SSTORE(0, CREATE2(...)) - stores CREATE2 result in slot 0
         + Op.SSTORE(
             0x00,
-            Op.CREATE2(
+            create_opcode(
                 value=0,
                 offset=32 - len(init_code_bytes),
                 size=len(init_code_bytes),
-                salt=0,
             ),
         )
         + Op.STOP
     )
-
-    # Deploy factory - it starts with nonce=1 by default
     factory = pre.deploy_contract(
         code=factory_code,
-        storage={0x00: 0xDEAD},  # Initial value to prove SSTORE works
+        storage={0x00: 0xDEAD},
     )
 
-    # Calculate the CREATE2 target address
     collision_address = compute_create_address(
         address=factory,
         nonce=1,
         salt=0,
         initcode=init_code_bytes,
-        opcode=Op.CREATE2,
+        opcode=create_opcode,
     )
 
-    # Set up the collision by pre-populating the target address
-    # This contract has code (STOP) and nonce=1, causing collision
-    pre[collision_address] = Account(
-        code=Op.STOP,
-        nonce=1,
-    )
+    if modification == "collision_only":
+        x_code: Bytecode = Op.STOP
+    elif modification == "then_nonce_change":
+        inner_init = Initcode(deploy_code=Op.STOP)
+        x_code = (
+            Op.MSTORE(0, Op.PUSH32(bytes(inner_init)))
+            + Op.CREATE(0, 32 - len(inner_init), len(inner_init))
+            + Op.STOP
+        )
+    elif modification == "then_storage_change":
+        x_code = Op.SSTORE(0x01, 0xCAFE) + Op.STOP
+    else:
+        raise ValueError(f"unknown modification: {modification}")
 
-    tx = Transaction(
-        sender=alice,
-        to=factory,
-        gas_limit=1_000_000,
-    )
+    pre[collision_address] = Account(code=x_code, nonce=1)
 
-    block = Block(
-        txs=[tx],
-        expected_block_access_list=BlockAccessListExpectation(
-            account_expectations={
-                alice: BalAccountExpectation(
-                    nonce_changes=[
-                        BalNonceChange(block_access_index=1, post_nonce=1)
-                    ],
-                ),
-                factory: BalAccountExpectation(
-                    # Nonce incremented 1→2 even on failed CREATE2
-                    nonce_changes=[
-                        BalNonceChange(block_access_index=1, post_nonce=2)
+    tx_gas_limit = fork.transaction_gas_limit_cap()
+    txs = [Transaction(sender=alice, to=factory, gas_limit=tx_gas_limit)]
+
+    account_expectations: dict = {
+        alice: BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=1, post_nonce=1)],
+        ),
+        # Factory's nonce bumps even on failed CREATE/CREATE2; slot 0
+        # records the failure return value (0).
+        factory: BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=1, post_nonce=2)],
+            storage_changes=[
+                BalStorageSlot(
+                    slot=0x00,
+                    slot_changes=[
+                        BalStorageChange(block_access_index=1, post_value=0)
                     ],
-                    # Storage changes: slot 0 = 0xDEAD → 0 (CREATE2 returned 0)
-                    storage_changes=[
-                        BalStorageSlot(
-                            slot=0x00,
-                            slot_changes=[
-                                BalStorageChange(
-                                    block_access_index=1, post_value=0
-                                )
-                            ],
+                )
+            ],
+        ),
+    }
+
+    post: dict = {
+        alice: Account(nonce=1),
+        factory: Account(nonce=2, storage={0x00: 0}),
+    }
+
+    if modification == "collision_only":
+        account_expectations[collision_address] = BalAccountExpectation.empty()
+        post[collision_address] = Account(
+            code=x_code, nonce=1, balance=0, storage={}
+        )
+    elif modification == "then_nonce_change":
+        txs.append(
+            Transaction(
+                sender=bob, to=collision_address, gas_limit=tx_gas_limit
+            )
+        )
+        account_expectations[bob] = BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=2, post_nonce=1)],
+        )
+        # Strict: only the inner-CREATE nonce bump appears; no spurious
+        # code/storage/balance entries from the index-1 collision touch.
+        account_expectations[collision_address] = BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=2, post_nonce=2)],
+            balance_changes=[],
+            code_changes=[],
+            storage_changes=[],
+            storage_reads=[],
+        )
+        # Inner CREATE deploys at addr(X, 1).
+        inner_created = compute_create_address(
+            address=collision_address, nonce=1
+        )
+        account_expectations[inner_created] = BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=2, post_nonce=1)],
+            code_changes=[
+                BalCodeChange(block_access_index=2, new_code=bytes(Op.STOP))
+            ],
+            balance_changes=[],
+            storage_changes=[],
+            storage_reads=[],
+        )
+        post[bob] = Account(nonce=1)
+        post[collision_address] = Account(
+            code=x_code, nonce=2, balance=0, storage={}
+        )
+        post[inner_created] = Account(
+            nonce=1, code=bytes(Op.STOP), balance=0, storage={}
+        )
+    elif modification == "then_storage_change":
+        txs.append(
+            Transaction(
+                sender=bob, to=collision_address, gas_limit=tx_gas_limit
+            )
+        )
+        account_expectations[bob] = BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=2, post_nonce=1)],
+        )
+        # Strict: only the SSTORE slot appears; no spurious other entries.
+        account_expectations[collision_address] = BalAccountExpectation(
+            storage_changes=[
+                BalStorageSlot(
+                    slot=0x01,
+                    slot_changes=[
+                        BalStorageChange(
+                            block_access_index=2, post_value=0xCAFE
                         )
                     ],
-                ),
-                # Collision address: empty (accessed but no state changes)
-                # Explicitly verify ALL fields are empty
-                collision_address: BalAccountExpectation(
-                    nonce_changes=[],  # MUST NOT have nonce changes
-                    balance_changes=[],  # MUST NOT have balance changes
-                    code_changes=[],  # MUST NOT have code changes
-                    storage_changes=[],  # MUST NOT have storage changes
-                    storage_reads=[],  # MUST NOT have storage reads
-                ),
-            }
+                )
+            ],
+            nonce_changes=[],
+            balance_changes=[],
+            code_changes=[],
+            storage_reads=[],
+        )
+        post[bob] = Account(nonce=1)
+        post[collision_address] = Account(
+            code=x_code, nonce=1, balance=0, storage={0x01: 0xCAFE}
+        )
+    else:
+        raise ValueError(f"unknown modification: {modification}")
+
+    block = Block(
+        txs=txs,
+        expected_block_access_list=BlockAccessListExpectation(
+            account_expectations=account_expectations,
         ),
     )
 
-    blockchain_test(
-        pre=pre,
-        blocks=[block],
-        post={
-            alice: Account(nonce=1),
-            factory: Account(nonce=2, storage={0x00: 0}),
-            # Collision address unchanged - contract still exists
-            collision_address: Account(code=bytes(Op.STOP), nonce=1),
-        },
-    )
+    blockchain_test(pre=pre, blocks=[block], post=post)
 
 
 def test_bal_transient_storage_not_tracked(
@@ -2549,14 +3090,319 @@ def test_bal_transient_storage_not_tracked(
     )
 
 
-def test_bal_create_early_failure(
+def test_bal_create2_deploy_then_collision(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    fork: Fork,
+) -> None:
+    """
+    Reverse-order companion to `test_bal_create_collision`: tx1 deploys X
+    via CREATE2, tx2 retries the same CREATE2 → collision. Covers the
+    `code_changes` axis of #2914 (forward order would need 7702 +
+    signable EOA at a deterministic CREATE address, infeasible).
+
+    Init increments X's slot 0, so post-state slot 0 == 1 proves it ran
+    once (tx1); the tx2 collision must not re-run it (else a demoted
+    read leaks into X's `storage_reads`).
+
+    CREATE2-only: CREATE auto-increments factory.nonce between txs, so
+    the second attempt targets a different address.
+    """
+    alice = pre.fund_eoa()
+
+    init_code = Initcode(
+        deploy_code=Op.STOP,
+        initcode_prefix=Op.SSTORE(0, Op.ADD(Op.SLOAD(0), 1)),
+    )
+    init_code_bytes = bytes(init_code)
+
+    factory_code = (
+        Op.MSTORE(0, Op.PUSH32(init_code_bytes))
+        + Op.SSTORE(
+            0x00,
+            Op.CREATE2(
+                value=0,
+                offset=32 - len(init_code_bytes),
+                size=len(init_code_bytes),
+                salt=0,
+            ),
+        )
+        + Op.STOP
+    )
+    factory = pre.deploy_contract(
+        code=factory_code,
+        storage={0x00: 0xDEAD},
+    )
+
+    target = compute_create_address(
+        address=factory,
+        salt=0,
+        initcode=init_code_bytes,
+        opcode=Op.CREATE2,
+    )
+
+    tx_gas_limit = fork.transaction_gas_limit_cap()
+    tx_deploy = Transaction(sender=alice, to=factory, gas_limit=tx_gas_limit)
+    tx_collide = Transaction(sender=alice, to=factory, gas_limit=tx_gas_limit)
+
+    block = Block(
+        txs=[tx_deploy, tx_collide],
+        expected_block_access_list=BlockAccessListExpectation(
+            account_expectations={
+                alice: BalAccountExpectation(
+                    nonce_changes=[
+                        BalNonceChange(block_access_index=1, post_nonce=1),
+                        BalNonceChange(block_access_index=2, post_nonce=2),
+                    ],
+                ),
+                factory: BalAccountExpectation(
+                    nonce_changes=[
+                        BalNonceChange(block_access_index=1, post_nonce=2),
+                        BalNonceChange(block_access_index=2, post_nonce=3),
+                    ],
+                    storage_changes=[
+                        BalStorageSlot(
+                            slot=0x00,
+                            slot_changes=[
+                                BalStorageChange(
+                                    block_access_index=1, post_value=target
+                                ),
+                                BalStorageChange(
+                                    block_access_index=2, post_value=0
+                                ),
+                            ],
+                        )
+                    ],
+                ),
+                # Index-1 deployment entries must survive the
+                # index-2 collision touch. Init ran once (tx1), writing
+                # slot 0 = 1. The tx2 collision must add nothing — in
+                # particular `storage_reads` MUST stay empty (a client
+                # that runs init then reverts on collision would leak
+                # slot 0 here as a demoted read).
+                target: BalAccountExpectation(
+                    nonce_changes=[
+                        BalNonceChange(block_access_index=1, post_nonce=1),
+                    ],
+                    code_changes=[
+                        BalCodeChange(
+                            block_access_index=1, new_code=bytes(Op.STOP)
+                        ),
+                    ],
+                    storage_changes=[
+                        BalStorageSlot(
+                            slot=0x00,
+                            slot_changes=[
+                                BalStorageChange(
+                                    block_access_index=1, post_value=1
+                                )
+                            ],
+                        )
+                    ],
+                    balance_changes=[],
+                    storage_reads=[],
+                ),
+            }
+        ),
+    )
+
+    blockchain_test(
+        pre=pre,
+        blocks=[block],
+        post={
+            alice: Account(nonce=2),
+            factory: Account(nonce=3, storage={0x00: 0}),
+            # slot 0 == 1 proves init ran exactly once (tx2 collided).
+            target: Account(
+                nonce=1, code=bytes(Op.STOP), balance=0, storage={0x00: 1}
+            ),
+        },
+    )
+
+
+@pytest.mark.parametrize(
+    "oog_boundary",
+    [
+        OutOfGasBoundary.OOG_BEFORE_TARGET_ACCESS,
+        OutOfGasBoundary.OOG_AFTER_TARGET_ACCESS,
+        OutOfGasBoundary.SUCCESS,
+    ],
+    ids=lambda x: x.value,
+)
+@pytest.mark.with_all_create_opcodes
+def test_bal_create_and_oog(
     pre: Alloc,
     blockchain_test: BlockchainTestFiller,
+    fork: Fork,
+    create_opcode: Op,
+    oog_boundary: OutOfGasBoundary,
+) -> None:
+    """
+    CREATE/CREATE2 OOG boundary test at three gas levels.
+
+    OOG_BEFORE_TARGET_ACCESS and OOG_AFTER_TARGET_ACCESS differ by
+    exactly 1 gas, proving the static cost boundary: below it the
+    created address is NOT in BAL, at it the address IS in BAL.
+    """
+    alice = pre.fund_eoa()
+
+    init_code = Initcode(deploy_code=Op.STOP)
+    init_code_bytes = bytes(init_code)
+
+    factory_mstore = Op.MSTORE(
+        0, Op.PUSH32(init_code_bytes), new_memory_size=32
+    )
+    factory_create = create_opcode(
+        value=0,
+        offset=32 - len(init_code_bytes),
+        size=len(init_code_bytes),
+        init_code_size=len(init_code_bytes),
+    )
+    factory_sstore = Op.SSTORE(0x00, 1)
+    factory_code = factory_mstore + factory_create + factory_sstore
+
+    factory = pre.deploy_contract(
+        code=factory_code,
+        storage={0x00: 0xDEAD},
+    )
+
+    created_address = compute_create_address(
+        address=factory,
+        nonce=1,
+        salt=0,
+        initcode=init_code_bytes,
+        opcode=create_opcode,
+    )
+
+    intrinsic_cost = fork.transaction_intrinsic_cost_calculator()()
+    create_static_cost = factory_mstore.gas_cost(
+        fork
+    ) + factory_create.gas_cost(fork)
+
+    if oog_boundary == OutOfGasBoundary.OOG_BEFORE_TARGET_ACCESS:
+        # 1 gas short of CREATE static cost — no state access
+        gas_limit = intrinsic_cost + create_static_cost - 1
+    elif oog_boundary == OutOfGasBoundary.OOG_AFTER_TARGET_ACCESS:
+        # Exactly the CREATE static cost — address accessed, child
+        # frame gets 0 gas, CREATE fails, parent OOGs at next opcode
+        gas_limit = intrinsic_cost + create_static_cost
+    else:
+        # Full success: static cost + child frame (63/64 rule) + SSTORE
+        child_gas = init_code.gas_cost(fork)
+        remaining_needed = (child_gas * 64 + 62) // 63
+        gas_limit = (
+            intrinsic_cost
+            + create_static_cost
+            + remaining_needed
+            + factory_sstore.gas_cost(fork)
+        )
+
+    tx = Transaction(
+        sender=alice,
+        to=factory,
+        gas_limit=gas_limit,
+    )
+
+    account_expectations: Dict[Address, BalAccountExpectation | None]
+    post: Dict[Address, Account | None]
+
+    if oog_boundary == OutOfGasBoundary.OOG_BEFORE_TARGET_ACCESS:
+        # Created address NOT in BAL — static check failed before access
+        account_expectations = {
+            alice: BalAccountExpectation(
+                nonce_changes=[
+                    BalNonceChange(block_access_index=1, post_nonce=1)
+                ],
+            ),
+            factory: BalAccountExpectation.empty(),
+            created_address: None,
+        }
+        post = {
+            alice: Account(nonce=1),
+            factory: Account(nonce=1, storage={0x00: 0xDEAD}),
+            created_address: Account.NONEXISTENT,
+        }
+    elif oog_boundary == OutOfGasBoundary.OOG_AFTER_TARGET_ACCESS:
+        # Created address IS in BAL (accessed during collision check),
+        # but tx OOGs so all state changes revert — only access is
+        # recorded, no nonce/code/storage changes.
+        account_expectations = {
+            alice: BalAccountExpectation(
+                nonce_changes=[
+                    BalNonceChange(block_access_index=1, post_nonce=1)
+                ],
+            ),
+            factory: BalAccountExpectation.empty(),
+            created_address: BalAccountExpectation.empty(),
+        }
+        post = {
+            alice: Account(nonce=1),
+            factory: Account(nonce=1, storage={0x00: 0xDEAD}),
+            created_address: Account.NONEXISTENT,
+        }
+    else:
+        # SUCCESS: created address in BAL with nonce and code changes
+        account_expectations = {
+            alice: BalAccountExpectation(
+                nonce_changes=[
+                    BalNonceChange(block_access_index=1, post_nonce=1)
+                ],
+            ),
+            factory: BalAccountExpectation(
+                nonce_changes=[
+                    BalNonceChange(block_access_index=1, post_nonce=2)
+                ],
+                storage_changes=[
+                    BalStorageSlot(
+                        slot=0x00,
+                        slot_changes=[
+                            BalStorageChange(
+                                block_access_index=1, post_value=1
+                            )
+                        ],
+                    )
+                ],
+            ),
+            created_address: BalAccountExpectation(
+                nonce_changes=[
+                    BalNonceChange(block_access_index=1, post_nonce=1)
+                ],
+                code_changes=[
+                    BalCodeChange(
+                        block_access_index=1,
+                        new_code=bytes(Op.STOP),
+                    )
+                ],
+            ),
+        }
+        post = {
+            alice: Account(nonce=1),
+            factory: Account(nonce=2, storage={0x00: 1}),
+            created_address: Account(code=Op.STOP),
+        }
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=[tx],
+                expected_block_access_list=BlockAccessListExpectation(
+                    account_expectations=account_expectations
+                ),
+            )
+        ],
+        post=post,
+    )
+
+
+@pytest.mark.with_all_create_opcodes
+def test_bal_create_early_failure(
+    pre: Alloc, blockchain_test: BlockchainTestFiller, create_opcode: Op
 ) -> None:
     """
-    Test BAL with CREATE failure due to insufficient endowment.
+    Test BAL with CREATE/CREATE2 failure due to insufficient endowment.
 
-    Factory (balance=50) attempts CREATE(value=100).
+    Factory (balance=50) attempts CREATE/CREATE2(value=100).
     Fails before nonce increment (before track_address).
     Distinct from collision where address IS accessed.
 
@@ -2568,21 +3414,17 @@ def test_bal_create_early_failure(
     alice = pre.fund_eoa()
 
     factory_balance = 50
-    endowment = 100  # More than factory has
+    endowment = 100
 
-    # Simple init code that deploys STOP
     init_code = Initcode(deploy_code=Op.STOP)
     init_code_bytes = bytes(init_code)
 
-    # Factory code: CREATE(value=endowment) and store result in slot 0
     factory_code = (
-        # Push init code to memory
         Op.MSTORE(0, Op.PUSH32(init_code_bytes))
-        # SSTORE(0, CREATE(value, offset, size))
         + Op.SSTORE(
             0x00,
-            Op.CREATE(
-                value=endowment,  # 100 > 50, will fail
+            create_opcode(
+                value=endowment,
                 offset=32 - len(init_code_bytes),
                 size=len(init_code_bytes),
             ),
@@ -2590,16 +3432,18 @@ def test_bal_create_early_failure(
         + Op.STOP
     )
 
-    # Deploy factory with insufficient balance for the CREATE endowment
     factory = pre.deploy_contract(
         code=factory_code,
         balance=factory_balance,
-        storage={0x00: 0xDEAD},  # Initial value to prove SSTORE works
+        storage={0x00: 0xDEAD},
     )
 
-    # Calculate what the contract address WOULD be (but it won't be created)
     would_be_contract_address = compute_create_address(
-        address=factory, nonce=1
+        address=factory,
+        nonce=1,
+        salt=0,
+        initcode=init_code_bytes,
+        opcode=create_opcode,
     )
 
     tx = Transaction(
@@ -2618,9 +3462,7 @@ def test_bal_create_early_failure(
                     ],
                 ),
                 factory: BalAccountExpectation(
-                    # NO nonce_changes - CREATE failed before increment_nonce
                     nonce_changes=[],
-                    # Storage changes: slot 0 = 0xDEAD → 0 (CREATE returned 0)
                     storage_changes=[
                         BalStorageSlot(
                             slot=0x00,
@@ -2632,8 +3474,6 @@ def test_bal_create_early_failure(
                         )
                     ],
                 ),
-                # Contract address MUST NOT appear in BAL - never accessed
-                # (CREATE failed before track_address was called)
                 would_be_contract_address: None,
             }
         ),
@@ -2644,11 +3484,242 @@ def test_bal_create_early_failure(
         blocks=[block],
         post={
             alice: Account(nonce=1),
-            # Factory nonce unchanged (still 1), balance unchanged
             factory: Account(
                 nonce=1, balance=factory_balance, storage={0x00: 0}
             ),
-            # Contract was never created
             would_be_contract_address: Account.NONEXISTENT,
         },
     )
+
+
+@pytest.mark.with_all_create_opcodes
+@pytest.mark.parametrize(
+    "storage_op",
+    ["read", "write"],
+    ids=["sload_then_selfdestruct", "sstore_then_selfdestruct"],
+)
+def test_bal_create_storage_op_then_selfdestruct_same_tx(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    create_opcode: Op,
+    storage_op: str,
+) -> None:
+    """
+    Same-tx CREATE/CREATE2 + storage_op + SELFDESTRUCT.
+
+    The deterministic address A is pre-funded. A single tx deploys a
+    contract at A via the parametrized create opcode; init code performs
+    SLOAD or SSTORE on slot B then SELFDESTRUCTs. Because the contract
+    is destroyed in the same tx, slot B MUST appear in `storage_reads`
+    and MUST NOT appear in `storage_changes` (writes demoted to reads
+    per EIP-7928).
+    """
+    alice = pre.fund_eoa()
+    beneficiary = pre.fund_eoa(amount=0)
+    fund_amount = 100
+    slot_b = 0x07
+
+    if storage_op == "read":
+        initcode = Op.POP(Op.SLOAD(slot_b)) + Op.SELFDESTRUCT(beneficiary)
+    else:
+        initcode = Op.SSTORE(slot_b, 0xCAFE) + Op.SELFDESTRUCT(beneficiary)
+    initcode_bytes = bytes(initcode)
+
+    salt = 0
+    is_create2 = create_opcode == Op.CREATE2
+    if is_create2:
+        deploy_op = Op.CREATE2(
+            value=0, offset=0, size=Op.CALLDATASIZE, salt=salt
+        )
+    else:
+        deploy_op = Op.CREATE(value=0, offset=0, size=Op.CALLDATASIZE)
+
+    factory_code = (
+        Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
+        + Op.SSTORE(0, deploy_op)
+        + Op.STOP
+    )
+    factory = pre.deploy_contract(code=factory_code)
+    target_a = compute_create_address(
+        address=factory,
+        nonce=1,
+        salt=salt,
+        initcode=initcode_bytes,
+        opcode=create_opcode,
+    )
+    pre.fund_address(target_a, fund_amount)
+
+    tx = Transaction(
+        sender=alice,
+        to=factory,
+        data=initcode_bytes,
+        gas_limit=1_000_000,
+    )
+
+    block = Block(
+        txs=[tx],
+        expected_block_access_list=BlockAccessListExpectation(
+            account_expectations={
+                target_a: BalAccountExpectation(
+                    balance_changes=[
+                        BalBalanceChange(block_access_index=1, post_balance=0),
+                    ],
+                    storage_reads=[slot_b],
+                    storage_changes=[],
+                    code_changes=[],
+                    nonce_changes=[],
+                ),
+                beneficiary: BalAccountExpectation(
+                    balance_changes=[
+                        BalBalanceChange(
+                            block_access_index=1,
+                            post_balance=fund_amount,
+                        )
+                    ],
+                ),
+            }
+        ),
+    )
+
+    blockchain_test(
+        pre=pre,
+        blocks=[block],
+        post={
+            target_a: Account.NONEXISTENT,
+            beneficiary: Account(balance=fund_amount),
+            factory: Account(nonce=2, storage={0: target_a}),
+        },
+    )
+
+
+@pytest.mark.parametrize(
+    "pre_balance",
+    [0, 100],
+    ids=["no_balance", "with_balance"],
+)
+def test_bal_create2_selfdestruct_then_recreate_same_block(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    pre_balance: int,
+) -> None:
+    """
+    Tx1 CREATE2+SSTORE+SELFDESTRUCT, Tx2 CREATE2 resurrection at same
+    address.
+
+    Two identical txs invoke the same factory with the same initcode
+    (same hash => same CREATE2 address A). The factory branches on its
+    own storage slot 1: on the first tx, the slot is 0 so the factory
+    CREATE2's then CALLs A (runtime SSTOREs to a target slot then
+    SELFDESTRUCTs) and records the CALL's return code in slot 1; on the
+    second tx, slot 1 is non-zero so only CREATE2 runs and A persists
+    with the runtime code (its runtime is never executed).
+
+    Per EIP-7928 SELFDESTRUCT-in-tx semantics, Tx1's destructed A has no
+    `nonce_changes` or `code_changes`; only `balance_changes` if it was
+    pre-funded. The SSTORE is demoted to `storage_reads` because the
+    contract is destroyed in the same tx. Tx2's fresh A has
+    `nonce_changes` (post=1), `code_changes` (post=runtime), and empty
+    storage.
+    """
+    alice = pre.fund_eoa()
+    beneficiary = pre.fund_eoa(amount=0)
+    salt = 0
+    target_slot = 0x07
+
+    runtime = Op.SSTORE(target_slot, 0xCAFE) + Op.SELFDESTRUCT(beneficiary)
+    runtime_bytes = bytes(runtime)
+    initcode_bytes = bytes(Initcode(deploy_code=runtime))
+
+    factory_code = (
+        Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
+        + Op.SSTORE(
+            0,
+            Op.CREATE2(value=0, offset=0, size=Op.CALLDATASIZE, salt=salt),
+        )
+        + Conditional(
+            condition=Op.ISZERO(Op.SLOAD(1)),
+            if_true=Op.SSTORE(1, Op.CALL(Op.GAS, Op.SLOAD(0), 0, 0, 0, 0, 0)),
+            if_false=Op.STOP,
+        )
+        + Op.STOP
+    )
+    factory = pre.deploy_contract(code=factory_code)
+    target_a = compute_create_address(
+        address=factory,
+        salt=salt,
+        initcode=initcode_bytes,
+        opcode=Op.CREATE2,
+    )
+
+    if pre_balance > 0:
+        pre.fund_address(target_a, pre_balance)
+
+    tx1 = Transaction(
+        sender=alice,
+        to=factory,
+        data=initcode_bytes,
+        gas_limit=500_000,
+    )
+    tx2 = Transaction(
+        sender=alice,
+        to=factory,
+        data=initcode_bytes,
+        gas_limit=500_000,
+    )
+
+    target_a_balance_changes = []
+    if pre_balance > 0:
+        target_a_balance_changes = [
+            BalBalanceChange(block_access_index=1, post_balance=0),
+        ]
+        beneficiary_expectation = BalAccountExpectation(
+            balance_changes=[
+                BalBalanceChange(
+                    block_access_index=1, post_balance=pre_balance
+                )
+            ],
+        )
+    else:
+        # SELFDESTRUCT touches the beneficiary even with 0 value; no
+        # balance change is recorded.
+        beneficiary_expectation = BalAccountExpectation.empty()
+
+    block = Block(
+        txs=[tx1, tx2],
+        expected_block_access_list=BlockAccessListExpectation(
+            account_expectations={
+                target_a: BalAccountExpectation(
+                    # Tx1 destruction (EIP-7928 #165): no nonce/code changes;
+                    # the SSTORE is demoted to a storage_read because A is
+                    # destroyed same-tx. Tx2 resurrection: fresh contract
+                    # with nonce=1, runtime, and untouched storage.
+                    nonce_changes=[
+                        BalNonceChange(block_access_index=2, post_nonce=1),
+                    ],
+                    code_changes=[
+                        BalCodeChange(
+                            block_access_index=2, new_code=runtime_bytes
+                        ),
+                    ],
+                    balance_changes=target_a_balance_changes,
+                    storage_changes=[],
+                    storage_reads=[target_slot],
+                ),
+                beneficiary: beneficiary_expectation,
+            }
+        ),
+    )
+
+    blockchain_test(
+        pre=pre,
+        blocks=[block],
+        post={
+            target_a: Account(
+                nonce=1, balance=0, code=runtime_bytes, storage={}
+            ),
+            beneficiary: Account(balance=pre_balance)
+            if pre_balance > 0
+            else Account.NONEXISTENT,
+            factory: Account(nonce=3, storage={0: target_a, 1: 1}),
+        },
+    )
diff --git a/tests/amsterdam/eip7928_block_level_access_lists/test_cases.md b/tests/amsterdam/eip7928_block_level_access_lists/test_cases.md
index 6820b599805..e4802d40059 100644
--- a/tests/amsterdam/eip7928_block_level_access_lists/test_cases.md
+++ b/tests/amsterdam/eip7928_block_level_access_lists/test_cases.md
@@ -13,13 +13,14 @@
 | `test_selfdestruct_to_system_contract` (Cancun) | Ensure BAL captures SELFDESTRUCT success boundary for system contract beneficiaries | Victim executes `SELFDESTRUCT(system_contract)` at exact gas boundary. System contracts are always warm (no cold access charge) and always have code (no G_NEW_ACCOUNT charge). Gas = G_VERY_LOW + GAS_SELF_DESTRUCT. Parametrized: is_success (exact_gas/exact_gas_minus_1), all system contracts via `@pytest.mark.with_all_system_contracts`, same_tx (pre_deploy/same_tx), originator_balance (0/1). File: `tests/tangerine_whistle/eip150_operation_gas_costs/test_eip150_selfdestruct.py`. | exact_gas: System contract in BAL with `balance_changes` if originator had balance, victim destroyed (same_tx) or balance=0 (pre-existing). exact_gas_minus_1: OOG, system contract not in BAL (no state access). | ✅ Completed |
 | `test_initcode_selfdestruct_to_self` (TangerineWhistle) | Ensure BAL captures SELFDESTRUCT during initcode where beneficiary is self | Initcode executes `SELFDESTRUCT(ADDRESS)` during CREATE, before any code is deployed. Contract has nonce=1 (post-EIP-161), making it non-empty. Always warm (executing contract), no G_NEW_ACCOUNT (nonce > 0). Gas boundary testing not possible (CREATE uses all available gas). Parametrized: originator_balance (0/1). File: `tests/tangerine_whistle/eip150_operation_gas_costs/test_eip150_selfdestruct.py`. | Contract created and destroyed in same tx - victim has empty BAL changes. Caller has `nonce_changes` (incremented by CREATE) and `balance_changes` if originator had balance. Victim is NONEXISTENT in post state. | ✅ Completed |
 | `test_bal_account_access_target` | Ensure BAL captures target addresses of account access opcodes | Alice calls `Oracle` contract which uses account access opcodes (`BALANCE`, `EXTCODESIZE`, `EXTCODECOPY`, `EXTCODEHASH`, `CALL`, `CALLCODE`, `DELEGATECALL`, `STATICCALL`) on `TargetContract`. | BAL MUST include Alice, `Oracle`, and `TargetContract` with empty changes for `TargetContract` and nonce changes for Alice. | ✅ Completed |
-| `test_bal_call_no_delegation_and_oog_before_target_access` | Ensure BAL handles OOG before target access and success for non-delegated CALL | Parametrized: target warm/cold, target empty/existing, value 0/1, memory expansion, OOG boundary (before_target_access/success). | OOG: target in BAL ONLY if pre-warmed. Success: target always in BAL with balance changes when value > 0. | ✅ Completed |
-| `test_bal_call_no_delegation_oog_after_target_access` | Ensure BAL includes target but excludes value transfer when OOG after target access | Hardcoded: empty target, value=1 (required for create_cost gap). Parametrized: warm/cold, memory expansion. | Target always in BAL. No balance changes (value transfer fails after G_NEW_ACCOUNT check). | ✅ Completed |
-| `test_bal_call_7702_delegation_and_oog` | Ensure BAL handles OOG at all 4 boundaries for CALL to 7702 delegated accounts | Parametrized: target warm/cold, delegation warm/cold, value 0/1, memory expansion, OOG boundary (before_target_access/after_target_access/success_minus_1/success). | OOG before: neither in BAL. OOG after & success_minus_1: target in BAL, delegation NOT in BAL (static check optimization). Success: all in BAL. | ✅ Completed |
+| `test_bal_call_no_delegation_and_oog_before_target_access` | Ensure BAL handles OOG before target access and success for non-delegated CALL | Parametrized: target warm/cold, target empty/existing, value 0/1, `(args_size, ret_size)` pair (covers in-only and out-only expansion per [#1910](https://github.com/ethereum/execution-specs/issues/1910)), OOG boundary (before_target_access/success). | OOG: target in BAL ONLY if pre-warmed. Success: target always in BAL with balance changes when value > 0. | ✅ Completed |
+| `test_bal_call_no_delegation_oog_after_target_access` | Ensure BAL includes target but excludes value transfer when OOG after target access | Hardcoded: empty target, value=1 (required for create_cost gap). Parametrized: warm/cold, `(args_size, ret_size)` pair (covers in-only and out-only expansion per [#1910](https://github.com/ethereum/execution-specs/issues/1910)). | Target always in BAL. No balance changes (value transfer fails after G_NEW_ACCOUNT check). | ✅ Completed |
+| `test_bal_call_7702_delegation_and_oog` | Ensure BAL handles OOG at all 4 boundaries for CALL to 7702 delegated accounts | Parametrized: target warm/cold, delegation warm/cold, value 0/1, `(args_size, ret_size)` pair (covers in-only and out-only expansion per [#1910](https://github.com/ethereum/execution-specs/issues/1910)), OOG boundary (before_target_access/after_target_access/success_minus_1/success). | OOG before: neither in BAL. OOG after & success_minus_1: target in BAL, delegation NOT in BAL (static check optimization). Success: all in BAL. | ✅ Completed |
 | `test_bal_callcode_nested_value_transfer` | Ensure BAL captures balance changes from nested value transfers when CALLCODE executes target code that itself makes CALL with value | Alice calls `Oracle` contract (200 wei balance) which uses `CALLCODE` to execute `TargetContract`'s code; that code makes a nested CALL transferring 100 wei to Bob. | BAL MUST include Alice (nonce changes), `Oracle` (balance change to 100 wei), Bob (balance change to 100 wei), and `TargetContract` (empty changes). | ✅ Completed |
 | `test_bal_delegated_storage_writes` | Ensure BAL captures delegated storage writes via `DELEGATECALL` and `CALLCODE` | Alice calls `Oracle` contract which uses `DELEGATECALL`/`CALLCODE` to `TargetContract` that writes `0x42` to slot `0x01`. | BAL MUST include Alice (nonce changes), `Oracle` (storage changes for slot `0x01` = `0x42`), and `TargetContract` (empty changes). | ✅ Completed |
 | `test_bal_delegated_storage_reads` | Ensure BAL captures delegated storage reads via `DELEGATECALL` and `CALLCODE` | Alice calls `Oracle` contract (with slot `0x01` = `0x42`) which uses `DELEGATECALL`/`CALLCODE` to `TargetContract` that reads from slot `0x01`. | BAL MUST include Alice (nonce changes), `Oracle` (storage reads for slot `0x01`), and `TargetContract` (empty changes). | ✅ Completed |
 | `test_bal_block_rewards` | BAL tracks fee recipient balance changes from block rewards | Alice sends 100 wei to Bob with Charlie as fee recipient | BAL MUST include fee recipient Charlie with `balance_changes` reflecting transaction fees collected from the block. | ✅ Completed |
+| `test_bal_selfdestruct_to_coinbase` | Ensure BAL records SELFDESTRUCT when the beneficiary is the coinbase address. Parametrized over `same_tx ∈ [False, True]`. Coinbase pre-funded with amount=0 (empty per EIP-161). `gas_price = base_fee_per_gas` so the priority-fee tip is zero and coinbase's entry carries only the SELFDESTRUCT transfer. | `pre_deploy`: pre-existing victim contract (balance 100) executes `SELFDESTRUCT(Op.COINBASE)`; post-Cancun (EIP-6780) the contract is preserved with balance 0. `same_tx`: factory creates victim with `CREATE(value=100, ...)` and CALLs it; victim's runtime SELFDESTRUCT runs in the same tx so the contract is actually destroyed. | `pre_deploy`: BAL MUST include victim with `balance_changes` 100→0 and coinbase with `balance_changes` 0→100. `same_tx`: BAL MUST include factory with `nonce_changes` (CREATE bumped nonce) + `balance_changes` 100→0, victim with empty changes (created+destroyed same-tx), and coinbase with `balance_changes` 0→100. | ✅ Completed |
 | `test_bal_2930_account_listed_but_untouched` | Ensure BAL excludes listed but untouched account        | Alice sends a simple eth transfer tx to Bob with EIP-2930 access list including `Oracle` | BAL MUST NOT include any entry for `Oracle` because it wasn't accessed. | ✅ Completed |
 | `test_bal_2930_slot_listed_but_untouched` | Ensure BAL excludes listed but untouched storage slots        | Alice sends tx with EIP-2930 access list including `(PureCalculator, slot=0x01)`; PureCalculator executes pure arithmetic (adding two numbers) without touching slot `0x01` | BAL MUST NOT include any entry for PureCalculator's slot `0x01` because it doesn't access state | ✅ Completed |
 | `test_bal_2930_slot_listed_and_unlisted_writes`  | Ensure BAL includes storage writes regardless of access list presence | Alice sends tx with EIP-2930 access list including `(StorageWriter, slot=0x01)`; StorageWriter executes `SSTORE` to slots `0x01` and `0x02` | BAL MUST include `storage_changes` for StorageWriter's slots `0x01` and `0x02` | ✅ Completed |
@@ -30,43 +31,68 @@
 | `test_bal_fully_unmutated_account` | Ensure BAL captures account that has zero net mutations | Alice sends 0 wei to `Oracle` which writes same pre-existing value to storage | BAL MUST include Alice with `nonce_changes` and balance changes (gas), `Oracle` with `storage_reads` for accessed slot but empty `storage_changes`. | ✅ Completed |
 | `test_bal_net_zero_balance_transfer`             | BAL includes accounts with net-zero balance change but excludes them from balance changes | Contract receives and sends same amount to recipient using CALL or SELFDESTRUCT | BAL **MUST** include contract in `account_changes` without `balance_changes` (net zero). BAL **MUST** record non-zero `balance_changes` for recipient. | ✅ Completed |
 | `test_bal_system_dequeue_consolidations_eip7251` | BAL tracks post-exec system dequeues for consolidations                     | Pre-populate EIP-7251 consolidation requests; produce a block where dequeues occur                                             | BAL MUST include the 7251 system contract with `storage_changes` (queue slots 0–3) using `block_access_index = len(txs)`.                                                                                                                      | ✅ Completed  |
+| `test_bal_withdrawal_contract_cross_index` | Ensure withdrawal system contract shows storage changes at both tx and post-execution indices | Alice sends withdrawal request to EIP-7002 system contract. Slots 0x01 (count) and 0x03 (tail) are incremented during tx (index 1) and reset during post-execution dequeue (index 2). | BAL **MUST** include withdrawal request contract with `storage_changes` for slots 0x01 and 0x03, each with two `slot_changes`: one at `block_access_index=1` (tx) and one at `block_access_index=2` (post-exec). | ✅ Completed |
+| `test_bal_consolidation_contract_cross_index` | Ensure consolidation system contract shows storage changes at both tx and post-execution indices | Alice sends consolidation request to EIP-7251 system contract. Slots 0x01 (count) and 0x03 (tail) are incremented during tx (index 1) and reset during post-execution dequeue (index 2). | BAL **MUST** include consolidation request contract with `storage_changes` for slots 0x01 and 0x03, each with two `slot_changes`: one at `block_access_index=1` (tx) and one at `block_access_index=2` (post-exec). | ✅ Completed |
+| `test_bal_noop_write_filtering` | Ensure BAL filters NOOP storage writes (writing same value or 0 to empty slot) | Contract writes 0 to uninitialized slot 1 (noop), 42 to slot 2 (real change), 100 to slot 3 (same as pre-state, noop), 200 to slot 4 (different from pre-state 150, real change). | BAL **MUST** include `storage_changes` only for slots 2 and 4 (actual changes). Slots 1 and 3 **MUST NOT** appear in `storage_changes` (no-op writes filtered). | ✅ Completed |
+| `test_bal_system_contract_noop_filtering` | Ensure system contract post-execution calls filter net-zero storage writes | Simple transfer that doesn't interact with system contracts. Post-execution system calls read withdrawal/consolidation contract slots 0-3 but don't modify them. | Withdrawal and consolidation system contracts **MUST** have `storage_reads` for slots 0x00-0x03 but **MUST NOT** have `storage_changes` (no actual modifications occurred). | ✅ Completed |
 | `test_bal_aborted_storage_access` | Ensure BAL captures storage access in aborted transactions correctly | Alice calls contract that reads storage slot `0x01`, writes to slot `0x02`, then aborts with `REVERT`/`INVALID` | BAL MUST include storage_reads for slots `0x01` and `0x02` (aborted writes become reads), empty storage_changes. Only nonce changes for Alice. | ✅ Completed |
 | `test_bal_aborted_account_access` | Ensure BAL captures account access in aborted transactions for all account accessing opcodes | Alice calls `AbortContract` that performs account access operations (`BALANCE`, `EXTCODESIZE`, `EXTCODECOPY`, `EXTCODEHASH`, `CALL`, `CALLCODE`, `DELEGATECALL`, `STATICCALL`) on `TargetContract` and aborts via `REVERT`/`INVALID` | BAL MUST include Alice, `TargetContract`, and `AbortContract` in account_changes and nonce changes for Alice. | ✅ Completed |
+| `test_bal_parent_revert_state_access` | Ensure BAL captures child-frame state access when the parent frame reverts (write-demoted-to-read across frame boundary). Parametrized: `inner_action ∈ [sstore, sload, balance, extcodesize]`, `outer_abort ∈ [REVERT, INVALID]`. | Outer contract CALLs an inner contract that performs one state-access op (SSTORE/SLOAD against its own storage, or BALANCE/EXTCODESIZE against a separate target). Inner's slot 1 is pre-set to `0xDEAD` so the post-state confirms the demoted SSTORE didn't overwrite it. Inner returns successfully; outer then aborts. | BAL MUST include inner with `storage_reads=[1]` (SSTORE/SLOAD cases — write demoted to read), or empty changes plus the separate target in BAL with empty changes (BALANCE/EXTCODESIZE cases). Post-state: `inner.storage[1] == 0xDEAD` for SSTORE/SLOAD cases. | ✅ Completed |
+| `test_selfdestruct_balance_transfer_reverted` (Cancun) | Ensure BAL records SELFDESTRUCT touches even when the containing sub-call reverts. Multi-fork via `state_test`; BAL expectations gated on `fork.is_eip_enabled(7928)`. File: `tests/cancun/eip6780_selfdestruct/test_journal_revert.py`. | Outer → controller (CALL) → victim (CALL); victim executes `SELFDESTRUCT(beneficiary)`, controller REVERTs (rolling back the balance transfer), outer continues and observes balances. | When EIP-7928 is enabled, BAL MUST include victim and beneficiary with empty changes (touched in the reverted sub-call's SELFDESTRUCT plus outer's BALANCE reads; net balances unchanged). | ✅ Completed |
+| `test_bal_outer_revert_with_inner_insufficient_funds` | Combine outer-frame REVERT with inner-frame insufficient-funds CALL or CREATE. Parametrized `inner_op ∈ [call, create]`. | Outer → inner (CALL). Inner does `SSTORE(slot_a, 0x42)`, then attempts CALL/CREATE with `value > balance=0`. Inner returns successfully (insufficient-balance check happens after the opcode's state-touching costs are charged, not via a REVERT). Outer then REVERTs. | Inner's two SSTOREs demote to `storage_reads`. For `call`: the failed call's target appears in BAL with empty changes (cold access charged before balance check). For `create`: the would-be address is NOT in BAL (early failure precedes `track_address`). | ✅ Completed |
+| `test_create_insufficient_balance` (Berlin) | Ensure BAL records that a failed CREATE does NOT itself add the would-be address; only a subsequent BALANCE call does. Multi-fork via `state_test`; BAL gated on `fork.is_eip_enabled(7928)`. File: `tests/berlin/eip2929_gas_cost_increases/test_create.py`. | Entry → creator (CREATE with `value=1`, creator balance 0 → fails) → checker (cold BALANCE on the would-be address, measures gas). | Creator has real `storage_changes` (slot 0 = `1 → 0`). Checker has `storage_changes` (slot 1 = cold BALANCE gas cost). Would-be address appears in BAL with empty changes — accessed only via the BALANCE in the checker contract, NOT via the failed CREATE. | ✅ Completed |
 | `test_bal_pure_contract_call` | Ensure BAL captures contract access for pure computation calls | Alice calls `PureContract` that performs pure arithmetic (ADD operation) without storage or balance changes | BAL MUST include Alice and `PureContract` in `account_changes`, and `nonce_changes` for Alice. | ✅ Completed |
-| `test_bal_create2_to_A_read_then_selfdestruct`  | BAL records balance change for A and storage access (no persistent change)                          | Tx0: Alice sends ETH to address **A**. Tx1: Deployer `CREATE2` a contract **at A**; contract does `SLOAD(B)` and immediately `SELFDESTRUCT(beneficiary=X)` in the same tx.         | BAL **MUST** include **A** with `balance_changes` (funding in Tx0 and transfer on selfdestruct in Tx1). BAL **MUST** include storage key **B** as an accessed `StorageKey`, and **MUST NOT** include **B** under `storage_changes` (no persistence due to same-tx create+destruct).    | 🟡 Planned |
-| `test_bal_create2_to_A_write_then_selfdestruct` | BAL records balance change for A and storage access even if a write occurred (no persistent change) | Tx0: Alice sends ETH to **A**. Tx1: Deployer `CREATE2` contract **at A**; contract does `SSTORE(B, v)` (optionally `SLOAD(B)`), then `SELFDESTRUCT(beneficiary=Y)` in the same tx. | BAL **MUST** include **A** with `balance_changes` (Tx0 fund; Tx1 outflow to `Y`). BAL **MUST** include **B** as `StorageKey` accessed, and **MUST NOT** include **B** under `storage_changes` (ephemeral write discarded because the contract was created and destroyed in the same tx). | 🟡 Planned |
+| `test_bal_create_storage_op_then_selfdestruct_same_tx` | BAL correctly demotes ephemeral storage operations to `storage_reads` when a contract is created and destroyed in the same tx (combined coverage for `read` and `write` storage_op cases — replaces `test_bal_create2_to_A_read_then_selfdestruct` and `test_bal_create2_to_A_write_then_selfdestruct`). Parametrized: `@pytest.mark.with_all_create_opcodes` + `storage_op ∈ ["read", "write"]`. | Address A is pre-funded via `pre.fund_address`. Alice sends a single tx calling a factory that deploys a contract at A via the parametrized create opcode; init code is either `SLOAD(B)+SELFDESTRUCT` or `SSTORE(B, v)+SELFDESTRUCT` (beneficiary = separate EOA). | BAL **MUST** include **A** with `balance_changes` `[(1, 0)]` (outflow to beneficiary on destruction). Slot **B** **MUST** appear under `storage_reads`, **NOT** `storage_changes` (write demoted to read because the contract is destroyed same-tx). A **MUST NOT** have `nonce_changes` or `code_changes`. Beneficiary has `balance_changes` reflecting receipt of `fund` at index 1. | ✅ Completed |
 | `test_bal_precompile_funded` | BAL records precompile value transfer with or without balance change | Alice sends value to precompile (all precompiles) via direct transaction. Parameterized: (1) with value (1 ETH), (2) without value (0 ETH). | For with_value: BAL **MUST** include precompile with `balance_changes`. For no_value: BAL **MUST** include precompile with empty `balance_changes`. No `storage_changes` or `code_changes` in either case. | ✅ Completed |
-| `test_bal_precompile_call` | BAL records precompile when called via contract | Alice calls Oracle contract which calls precompile (all precompiles) via CALL opcode with 0 ETH | BAL **MUST** include Alice with `nonce_changes`, Oracle with empty changes, and precompile with empty changes. No `balance_changes`, `storage_changes`, or `code_changes` for precompile. | ✅ Completed |
+| `test_bal_precompile_call_opcode` | BAL records the precompile address regardless of call opcode. | Parametrized: `@pytest.mark.with_all_precompiles × @pytest.mark.with_all_call_opcodes`. Alice calls Oracle which invokes the precompile via the parametrized call opcode. For DELEGATECALL/CALLCODE the precompile provides the code but is not the call target, so its access has to be recorded explicitly rather than incidentally. | BAL **MUST** include the precompile address with empty changes for all four call opcodes. Oracle has empty changes (called but no state mutation), Alice has `nonce_changes`. | ✅ Completed |
 | `test_bal_7702_delegated_create`                 | BAL tracks EIP-7702 delegation indicator write and contract creation        | Alice sends a type-4 (7702) tx authorizing herself to delegate to `Deployer` code which executes `CREATE`                      | BAL MUST include for **Alice**: `code_changes` (delegation indicator), `nonce_changes` (increment from 7702 processing), and `balance_changes` (post-gas). For **Child**: `code_changes` (runtime bytecode) and `nonce_changes = 1`. | ✅ Completed  |
 | `test_bal_7702_delegation_create` | Ensure BAL captures creation of EOA delegation | Alice authorizes delegation to contract `Oracle`. Transaction sends 10 wei to Bob. Two variants: (1) Self-funded: Alice sends 7702 tx herself. (2) Sponsored: `Relayer` sends 7702 tx on Alice's behalf. | BAL **MUST** include Alice: `code_changes` (delegation designation `0xef0100\|\|address(Oracle)`),`nonce_changes` (increment). Bob: `balance_changes` (receives 10 wei). For sponsored variant, BAL **MUST** also include `Relayer`:`nonce_changes`.`Oracle` **MUST NOT** be present in BAL - the account is never accessed. | ✅ Completed |
-| `test_bal_7702_delegation_update` | Ensure BAL captures update of existing EOA delegation | Alice first delegates to `Oracle1`, then in second tx updates delegation to `Oracle2`. Each transaction sends 10 wei to Bob. Two variants: (1) Self-funded: Alice sends both 7702 txs herself. (2) Sponsored: `Relayer` sends both 7702 txs on Alice's behalf. | BAL **MUST** include Alice: first tx has `code_changes` (delegation designation `0xef0100\|\|address(Oracle1)`),`nonce_changes`. Second tx has`code_changes` (delegation designation `0xef0100\|\|address(Oracle2)`),`nonce_changes`. Bob:`balance_changes` (receives 10 wei on each tx). For sponsored variant, BAL **MUST** also include `Relayer`:`nonce_changes` for both transactions. `Oracle1` and `Oracle2` **MUST NOT** be present in BAL - accounts are never accessed. | ✅ Completed |
+| `test_bal_7702_delegation_update` | Ensure BAL captures update of existing EOA delegation. Three variants: (1) Self-funded: Alice sends both 7702 txs herself. (2) Sponsored: a single `Relayer` sends both txs on Alice's behalf. (3) `sponsored_cross_sender`: a distinct relayer per tx — exercises the cross-tx auth-nonce-chain dependency since sender-nonce serialization no longer trivializes the test. A client that parallel-verifies auth signatures must consult Alice's BAL `nonce_changes` to validate the second auth against her post-tx-1 nonce. | Alice first delegates to `Oracle1`, then in second tx updates delegation to `Oracle2`. Each transaction sends 10 wei to Bob. | BAL **MUST** include Alice: first tx has `code_changes` (delegation designation `0xef0100\|\|address(Oracle1)`),`nonce_changes`. Second tx has`code_changes` (delegation designation `0xef0100\|\|address(Oracle2)`),`nonce_changes`. Bob:`balance_changes` (receives 10 wei on each tx). For sponsored variant, BAL **MUST** also include `Relayer`:`nonce_changes` for both transactions; for `sponsored_cross_sender`, each relayer has one `nonce_changes` at its tx index. `Oracle1` and `Oracle2` **MUST NOT** be present in BAL - accounts are never accessed. | ✅ Completed |
 | `test_bal_7702_delegation_clear` | Ensure BAL captures clearing of EOA delegation | Alice first delegates to `Oracle`, then in second tx clears delegation by authorizing to `0x0` address. Each transaction sends 10 wei to Bob. Two variants: (1) Self-funded: Alice sends both 7702 txs herself. (2) Sponsored: `Relayer` sends both 7702 txs on Alice's behalf. | BAL **MUST** include Alice: first tx has `code_changes` (delegation designation `0xef0100\|\|address(Oracle)`), `nonce_changes`. Second tx has `code_changes` (empty code - delegation cleared), `nonce_changes`. Bob: `balance_changes` (receives 10 wei on each tx). For sponsored variant, BAL **MUST** also include `Relayer`: `nonce_changes` for both transactions. `Oracle` and `0x0` address **MUST NOT** be present in BAL - accounts are never accessed. | ✅ Completed |
 | `test_bal_7702_delegated_storage_access` | Ensure BAL captures storage operations when calling a delegated EIP-7702 account | Alice has delegated her account to `Oracle`. `Oracle` contract contains code that reads from storage slot `0x01` and writes to storage slot `0x02`. Bob sends 10 wei to Alice (the delegated account), which executes `Oracle`'s code. | BAL **MUST** include Alice: `balance_changes` (receives 10 wei), `storage_changes` for slot `0x02` (write operation performed in Alice's storage), `storage_reads` for slot `0x01` (read operation from Alice's storage). Bob: `nonce_changes` (sender), `balance_changes` (loses 10 wei plus gas costs). `Oracle` (account access). | ✅ Completed |
 | `test_bal_7702_invalid_nonce_authorization` | Ensure BAL handles failed authorization due to wrong nonce | `Relayer` sends sponsored transaction to Bob (10 wei transfer succeeds) but Alice's authorization to delegate to `Oracle` uses incorrect nonce, causing silent authorization failure | BAL **MUST** include Alice with empty changes (account access), Bob with `balance_changes` (receives 10 wei), Relayer with `nonce_changes`. **MUST NOT** include `Oracle` (authorization failed, no delegation) | ✅ Completed |
 | `test_bal_7702_invalid_chain_id_authorization` | Ensure BAL handles failed authorization due to wrong chain id | `Relayer` sends sponsored transaction to Bob (10 wei transfer succeeds) but Alice's authorization to delegate to `Oracle` uses incorrect chain id, causing authorization failure before account access | BAL **MUST** include Bob with `balance_changes` (receives 10 wei), Relayer with `nonce_changes`. **MUST NOT** include Alice (authorization fails before loading account) or `Oracle` (authorization failed, no delegation) | ✅ Completed |
+| `test_call_into_self_delegating_set_code` | Self-delegation degenerate one-hop case (companion to `test_call_into_chain_delegating_set_code`). File: `tests/prague/eip7702_set_code_tx/test_set_code_txs.py`. Parametrized over `@pytest.mark.with_all_call_opcodes`. | `auth_signer` auths itself as its own delegation target. `entry_address` issues `call_opcode(auth_signer)`. EVM resolves once: `auth_signer`'s code is the designator pointing back to `auth_signer`; the second hop is not followed, so the `0xef0100...` bytecode runs as legacy code → INVALID → returns 0. | `auth_signer` **MUST** appear with `nonce_changes` and `code_changes` (delegation designator to itself). `entry_address` **MUST** have `storage_reads=[0]` (no-op SSTORE demoted). No additional delegation-target entry is created because the target coincides with the authority. | ✅ Completed |
+| `test_bal_7702_invalid_authority_has_code_authorization` | Ensure BAL handles failed authorization where the authority already has non-empty, non-delegation code (EIP-7702 step-5 rejection, post-load). | Alice is pre-allocated with `code=Op.STOP` and `nonce=1`. `Relayer` sends sponsored tx to Bob (10 wei transfer). Authorization tuple delegates Alice to `Oracle` with matching nonce. EIP-7702 step 5 rejects because Alice's code is non-empty and not a delegation designator. | BAL **MUST** include Bob with `balance_changes` (10 wei), Relayer with `nonce_changes`, and Alice with empty changes (loaded at step 4 then rejected at step 5). **MUST NOT** include `Oracle` (delegation target never loaded). | ✅ Completed |
+| `test_signature_s_out_of_range` | Ensure BAL excludes the authority when the EIP-7702 auth signature has an out-of-range `s` value (EIP-2 low-s rule, ecrecover fails before authority is loaded). File: `tests/prague/eip7702_set_code_tx/test_set_code_txs.py`. | `auth_signer` signs a normal auth tuple delegating to `set_code_to_address`; the tuple is then mutated so `s = SECP256K1N - s` and `v` is flipped, producing a high-`s` signature. Sender (a separate EOA) sends the tx to `entry_address` which executes `SSTORE(1, 1)`. | BAL **MUST** include sender with `nonce_changes` at `block_access_index=1` and `entry_address` with `storage_changes` for slot 1 (post=1). BAL **MUST NOT** include `auth_signer` (auth fails at ecrecover, before the authority is added to `accessed_addresses`) or `set_code_to_address` (target is never loaded as an execution target). | ✅ Completed |
+| `test_nonce_validity` | Ensure BAL correctly records EIP-7702 auth-tuple nonce-field validity across pre-load (`nonce >= 2**64-1`), success, and post-load (account.nonce != auth.nonce) branches. File: `tests/prague/eip7702_set_code_tx/test_set_code_txs.py`. | Parametrized over `(account_nonce, authorization_nonce)`: (1) `(MAX, MAX)` pre-load rejection at step 2, (2) `(MAX-1, MAX-1)` successful auth, (3) `(0, 1)` post-load nonce mismatch, (4) `(1, 0)` post-load nonce mismatch. `entry_address` always does `SSTORE(success_slot, 1) + CALL(auth_signer) + SSTORE(return_slot, RETURNDATASIZE)`. | Valid auth (case 2): `auth_signer` **MUST** have `nonce_changes` (post=`account_nonce+1`) and `code_changes` (delegation designation); `set_code_to_address` **MUST** appear with empty changes (loaded as execution target via delegation dispatch); `entry_address` has `storage_changes` for both slot 1 and slot 2 (post=1). Invalid auth (cases 1, 3, 4): `auth_signer` **MUST** appear with empty changes (the subsequent CALL touches it, even though the auth processing did or did not add it); `set_code_to_address` **MUST NOT** be in BAL; `entry_address` has `storage_changes` for slot 1 and `storage_reads` for slot 2 (the `SSTORE(0, 0)` no-op is demoted per EIP-7928). Sender always has `nonce_changes`. | ✅ Completed |
+| `test_call_into_chain_delegating_set_code` | Ensure BAL respects EIP-7702 one-hop delegation resolution when `A` delegates to `B` and `B` delegates back to `A`. File: `tests/prague/eip7702_set_code_tx/test_set_code_txs.py`. Parameterized over `@pytest.mark.with_all_call_opcodes`. | Two auths: `auth_signer_1` -> `auth_signer_2`, then `auth_signer_2` -> `auth_signer_1`. `entry_address` issues `call_opcode(auth_signer_1)` and stores the return code in slot 0. The EVM resolves `A` -> `B` once, then runs `B`'s `0xef0100...` bytecode as legacy code; `0xef` is INVALID, so the call frame aborts and returns 0. | BAL **MUST** include only `auth_signer_1` and `auth_signer_2` from the delegation chain (each with `nonce_changes` and `code_changes` for its delegation designator). No third address is ever loaded because the second hop is never followed. `entry_address` **MUST** have `storage_reads` for slot 0 (the `SSTORE(slot, 0)` is a no-op write and is demoted per EIP-7928) and no `storage_changes`. Sender has `nonce_changes`. | ✅ Completed |
+| `test_bal_7702_multi_hop_delegation_chain` | Multi-hop EIP-7702 delegation: `chain` resolves A→B→C and `loop` resolves A→B→A. In both cases the EVM follows the delegation once and runs B's `0xef0100<dest>` bytecode, which aborts on the INVALID `0xef` opcode. Parametrized over `destination_is_loop ∈ [False, True]`. | `auth_a` delegates to `auth_b`; `auth_b` delegates to either `target_c` (chain) or back to `auth_a` (loop). Entry contract has `storage[0] = 0xDEAD` (witness) and issues `CALL(auth_a)` then stores the return code in slot 0. | `auth_a` and `auth_b` **MUST** appear with `nonce_changes` and `code_changes` (each successful auth). In `chain`, `target_c` **MUST NOT** appear in BAL. `entry_address` has `storage_changes` for slot 0 with `post_value=0` (0xDEAD overwritten by the failed CALL's return code 0). Sender has `nonce_changes`. | ✅ Completed |
+| `test_set_code_to_precompile` | Covers the BAL recording of a precompile address when reached via EIP-7702 delegation dispatch — across all 4 call opcodes and all precompiles. Companion to `test_bal_precompile_call_opcode` for the direct-call path. File: `tests/prague/eip7702_set_code_tx/test_set_code_txs.py`. | `@pytest.mark.with_all_call_opcodes × @pytest.mark.with_all_precompiles`. EOA `auth_signer` delegates to a precompile address. A caller contract invokes `call_opcode(auth_signer)`; EIP-7702 resolves the delegation to the precompile (whose code is treated as empty per spec). | When EIP-7928 is enabled, BAL **MUST** include `auth_signer` with `nonce_changes` and `code_changes` (delegation designator), and **MUST** include the precompile address with empty changes (loaded as execution target via delegation dispatch). | ✅ Completed |
 | `test_bal_7702_delegated_via_call_opcode` | Ensure BAL captures delegation target when a contract uses *CALL opcodes to call a delegated account | Pre-deployed contract `Alice` delegated to `Oracle`. `Caller` contract uses CALL/CALLCODE/DELEGATECALL/STATICCALL to call `Alice`. Bob sends transaction to `Caller`. | BAL **MUST** include Bob: `nonce_changes`. `Caller`: empty changes (account access). `Alice`: empty changes (account access - delegated account being called). `Oracle`: empty changes (delegation target access). | ✅ Completed |
-| `test_bal_7702_null_address_delegation` | Ensure BAL does not record spurious code changes for net-zero code operations | Alice sends transaction with authorization delegating to NULL_ADDRESS (0x0), which sets code to `b""` on an account that already has `b""` code. Transaction sends 10 wei to Bob. | BAL **MUST** include Alice with `nonce_changes` (tx nonce + auth nonce increment) but **MUST NOT** include `code_changes` (setting `b"" -> b""` is net-zero and filtered out). Bob: `balance_changes` (receives 10 wei). This ensures net-zero code change is not recorded. | ✅ Completed |
+| `test_bal_7702_null_address_delegation_no_code_change` | Ensure BAL does not record spurious code changes for net-zero code operations | Alice sends transaction with authorization delegating to NULL_ADDRESS (0x0), which sets code to `b""` on an account that already has `b""` code. Transaction sends 10 wei to Bob. | BAL **MUST** include Alice with `nonce_changes` (tx nonce + auth nonce increment) but **MUST NOT** include `code_changes` (setting `b"" -> b""` is net-zero and filtered out). Bob: `balance_changes` (receives 10 wei). This ensures net-zero code change is not recorded. | ✅ Completed |
 | `test_bal_7702_double_auth_reset` | Ensure BAL tracks multiple 7702 nonce increments but filters net-zero code change | Single transaction contains two EIP-7702 authorizations for `Alice`: (1) first auth sets delegation `0xef0100\|\|Oracle`, (2) second auth clears delegation back to empty. Transaction sends 10 wei to `Bob`. Two variants: (a) Self-funded: `Alice` is tx sender (one tx nonce bump + two auth bumps → nonce 0→3). (b) Sponsored: `Relayer` is tx sender (`Alice` only in auths → nonce 0→2 for `Alice`, plus one nonce bump for `Relayer`). | Variant (a): BAL **MUST** include `Alice` with `nonce_changes` 0→3. Variant (b): BAL **MUST** include `Alice` with `nonce_changes` 0→2 and `Relayer` with its own `nonce_changes`. For both variants, BAL **MUST NOT** include `code_changes` for `Alice` (net code is empty), **MUST** include `Bob` with `balance_changes` (receives 10 wei), and `Oracle` **MUST NOT** appear in BAL. | ✅ Completed |
 | `test_bal_7702_double_auth_swap` | Ensure BAL captures final code when double auth swaps delegation targets | `Relayer` sends transaction with two authorizations for Alice: (1) First auth sets delegation to `CONTRACT_A` at nonce=0, (2) Second auth changes delegation to `CONTRACT_B` at nonce=1. Transaction sends 10 wei to Bob. Per EIP-7702, only the last authorization takes effect. | BAL **MUST** include Alice with `nonce_changes` (both auths increment nonce to 2) and `code_changes` (final code is delegation designation for `CONTRACT_B`, not `CONTRACT_A`). Bob: `balance_changes` (receives 10 wei). Relayer: `nonce_changes`. Neither `CONTRACT_A` nor `CONTRACT_B` appear in BAL during delegation setup (never accessed). This ensures BAL shows final state, not intermediate changes. | ✅ Completed |
 | `test_bal_sstore_and_oog` | Ensure BAL handles OOG during SSTORE execution at various gas boundaries (EIP-2200 stipend and implicit SLOAD) | Alice calls contract that attempts `SSTORE` to cold slot `0x01`. Parameterized: (1) OOG at EIP-2200 stipend check (2300 gas after PUSH opcodes) - fails before implicit SLOAD, (2) OOG at stipend + 1 (2301 gas) - passes stipend check but fails after implicit SLOAD, (3) OOG at exact gas - 1, (4) Successful SSTORE with exact gas. | For case (1): BAL **MUST NOT** include slot `0x01` in `storage_reads` or `storage_changes` (fails before implicit SLOAD). For cases (2) and (3): BAL **MUST** include slot `0x01` in `storage_reads` (implicit SLOAD occurred) but **MUST NOT** include in `storage_changes` (write didn't complete). For case (4): BAL **MUST** include slot `0x01` in `storage_changes` only (successful write; read is filtered by builder). | ✅ Completed |
-| `test_bal_sstore_static_context` | Ensure BAL does not capture spurious storage access when SSTORE fails in static context | Alice calls contract with `STATICCALL` which attempts `SSTORE` to slot `0x01`. SSTORE must fail before any storage access occurs. | BAL **MUST NOT** include slot `0x01` in `storage_reads` or `storage_changes`. Static context check happens before storage access, preventing spurious reads. Alice has `nonce_changes` and `balance_changes` (gas cost). Target contract included with empty changes. | ✅ Completed |
+| `test_bal_sstore_static_context` | SSTORE in static context must not leak storage reads into BAL | Contract A STATICCALLs Contract B which attempts `SSTORE`. Parametrized: `original_value` (0, nonzero) to catch clients that perform the implicit SLOAD before the static check. | Contract B IS in BAL (accessed via STATICCALL) but **MUST NOT** have `storage_reads`. | ✅ Completed |
 | `test_bal_sload_and_oog` | Ensure BAL handles OOG during SLOAD execution correctly | Alice calls contract that attempts `SLOAD` from cold slot `0x01`. Parameterized: (1) OOG at SLOAD opcode (insufficient gas), (2) Successful SLOAD execution. | For OOG case: BAL **MUST NOT** contain slot `0x01` in `storage_reads` since storage wasn't accessed. For success case: BAL **MUST** contain slot `0x01` in `storage_reads`. | ✅ Completed |
 | `test_bal_balance_and_oog` | Ensure BAL handles OOG during BALANCE opcode execution correctly | Alice calls contract that attempts `BALANCE` opcode on cold target account. Parameterized: (1) OOG at BALANCE opcode (insufficient gas), (2) Successful BALANCE execution. | For OOG case: BAL **MUST NOT** include target account (wasn't accessed). For success case: BAL **MUST** include target account in `account_changes`. | ✅ Completed |
+| `test_bal_account_touch_system_address` | Ensure BAL includes `SYSTEM_ADDRESS` when a regular transaction touches it via any account-accessing opcode | Alice calls a contract that executes one of `BALANCE`, `EXTCODESIZE`, `EXTCODEHASH`, `EXTCODECOPY`, `CALL`, or `STATICCALL` against `SYSTEM_ADDRESS`. Parametrized over the six opcodes. | BAL **MUST** include `SYSTEM_ADDRESS` as an account-only entry for every opcode because the address experienced a real EVM state access. This is distinct from excluding the synthetic system-operation caller. | ✅ Completed |
+| `test_bal_selfdestruct_to_system_address_zero_balance` | Ensure BAL includes `SYSTEM_ADDRESS` as the SELFDESTRUCT beneficiary even when no value is transferred. Companion to `test_bal_account_touch_system_address` (which covers `BALANCE`/`EXTCODE*`/`CALL`/`STATICCALL`); SELFDESTRUCT is the missing opcode in that parametrize list. File: `tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_opcodes.py`. | CREATE transaction whose init code is `SELFDESTRUCT(SYSTEM_ADDRESS)`; the new contract carries no value, so the beneficiary receives 0 wei. Per EIP-6780 the contract is deleted (creation and destruction in the same tx). | BAL **MUST** include `SYSTEM_ADDRESS` with every change-set empty — the SELFDESTRUCT is the only access on `SYSTEM_ADDRESS` in this block. Post-state: created contract is `NONEXISTENT` (proves SELFDESTRUCT fired); Alice has `nonce=1`. | ✅ Completed |
 | `test_bal_extcodesize_and_oog` | Ensure BAL handles OOG during EXTCODESIZE opcode execution correctly | Alice calls contract that attempts `EXTCODESIZE` opcode on cold target contract. Parameterized: (1) OOG at EXTCODESIZE opcode (insufficient gas), (2) Successful EXTCODESIZE execution. | For OOG case: BAL **MUST NOT** include target contract (wasn't accessed). For success case: BAL **MUST** include target contract in `account_changes`. | ✅ Completed |
-| `test_bal_delegatecall_no_delegation_and_oog_before_target_access` | Ensure BAL handles OOG before target access and success for non-delegated DELEGATECALL | Parametrized: target warm/cold, memory expansion, OOG boundary (before_target_access/success). | OOG: target in BAL ONLY if pre-warmed. Success: target always in BAL. | ✅ Completed |
-| `test_bal_delegatecall_7702_delegation_and_oog` | Ensure BAL handles OOG at all 4 boundaries for DELEGATECALL to 7702 delegated accounts | Parametrized: target warm/cold, delegation warm/cold, memory expansion, OOG boundary (before_target_access/after_target_access/success_minus_1/success). | OOG before: neither in BAL. OOG after & success_minus_1: target in BAL, delegation NOT in BAL (static check optimization). Success: all in BAL. | ✅ Completed |
-| `test_bal_callcode_no_delegation_and_oog_before_target_access` | Ensure BAL handles OOG before target access and success for non-delegated CALLCODE | Parametrized: target warm/cold, value 0/1, memory expansion, OOG boundary (before_target_access/success). | OOG: target in BAL ONLY if pre-warmed. Success: target always in BAL. | ✅ Completed |
-| `test_bal_callcode_7702_delegation_and_oog` | Ensure BAL handles OOG at all 4 boundaries for CALLCODE to 7702 delegated accounts | Parametrized: target warm/cold, delegation warm/cold, value 0/1, memory expansion, OOG boundary (before_target_access/after_target_access/success_minus_1/success). | OOG before: neither in BAL. OOG after & success_minus_1: target in BAL, delegation NOT in BAL (static check optimization). Success: all in BAL. | ✅ Completed |
-| `test_bal_staticcall_no_delegation_and_oog_before_target_access` | Ensure BAL handles OOG before target access and success for non-delegated STATICCALL | Parametrized: target warm/cold, memory expansion, OOG boundary (before_target_access/success). | OOG: target in BAL ONLY if pre-warmed. Success: target always in BAL. | ✅ Completed |
-| `test_bal_staticcall_7702_delegation_and_oog` | Ensure BAL handles OOG at all 4 boundaries for STATICCALL to 7702 delegated accounts | Parametrized: target warm/cold, delegation warm/cold, memory expansion, OOG boundary (before_target_access/after_target_access/success_minus_1/success). | OOG before: neither in BAL. OOG after & success_minus_1: target in BAL, delegation NOT in BAL (static check optimization). Success: all in BAL. | ✅ Completed |
+| `test_bal_delegatecall_no_delegation_and_oog_before_target_access` | Ensure BAL handles OOG before target access and success for non-delegated DELEGATECALL | Parametrized: target warm/cold, `(args_size, ret_size)` pair (covers in-only and out-only expansion per [#1910](https://github.com/ethereum/execution-specs/issues/1910)), OOG boundary (before_target_access/success). | OOG: target in BAL ONLY if pre-warmed. Success: target always in BAL. | ✅ Completed |
+| `test_bal_delegatecall_7702_delegation_and_oog` | Ensure BAL handles OOG at all 4 boundaries for DELEGATECALL to 7702 delegated accounts | Parametrized: target warm/cold, delegation warm/cold, `(args_size, ret_size)` pair (covers in-only and out-only expansion per [#1910](https://github.com/ethereum/execution-specs/issues/1910)), OOG boundary (before_target_access/after_target_access/success_minus_1/success). | OOG before: neither in BAL. OOG after & success_minus_1: target in BAL, delegation NOT in BAL (static check optimization). Success: all in BAL. | ✅ Completed |
+| `test_bal_callcode_no_delegation_and_oog_before_target_access` | Ensure BAL handles OOG before target access and success for non-delegated CALLCODE | Parametrized: target warm/cold, value 0/1, `(args_size, ret_size)` pair (covers in-only and out-only expansion per [#1910](https://github.com/ethereum/execution-specs/issues/1910)), OOG boundary (before_target_access/success). | OOG: target in BAL ONLY if pre-warmed. Success: target always in BAL. | ✅ Completed |
+| `test_bal_callcode_7702_delegation_and_oog` | Ensure BAL handles OOG at all 4 boundaries for CALLCODE to 7702 delegated accounts | Parametrized: target warm/cold, delegation warm/cold, value 0/1, `(args_size, ret_size)` pair (covers in-only and out-only expansion per [#1910](https://github.com/ethereum/execution-specs/issues/1910)), OOG boundary (before_target_access/after_target_access/success_minus_1/success). | OOG before: neither in BAL. OOG after & success_minus_1: target in BAL, delegation NOT in BAL (static check optimization). Success: all in BAL. | ✅ Completed |
+| `test_bal_staticcall_no_delegation_and_oog_before_target_access` | Ensure BAL handles OOG before target access and success for non-delegated STATICCALL | Parametrized: target warm/cold, `(args_size, ret_size)` pair (covers in-only and out-only expansion per [#1910](https://github.com/ethereum/execution-specs/issues/1910)), OOG boundary (before_target_access/success). | OOG: target in BAL ONLY if pre-warmed. Success: target always in BAL. | ✅ Completed |
+| `test_bal_staticcall_7702_delegation_and_oog` | Ensure BAL handles OOG at all 4 boundaries for STATICCALL to 7702 delegated accounts | Parametrized: target warm/cold, delegation warm/cold, `(args_size, ret_size)` pair (covers in-only and out-only expansion per [#1910](https://github.com/ethereum/execution-specs/issues/1910)), OOG boundary (before_target_access/after_target_access/success_minus_1/success). | OOG before: neither in BAL. OOG after & success_minus_1: target in BAL, delegation NOT in BAL (static check optimization). Success: all in BAL. | ✅ Completed |
 | `test_bal_extcodecopy_and_oog` | Ensure BAL handles OOG during EXTCODECOPY at various failure points | Alice calls contract that attempts `EXTCODECOPY` from cold target contract. Parameterized: (1) Successful EXTCODECOPY, (2) OOG at cold access (insufficient gas for account access), (3) OOG at memory expansion with large offset (64KB offset, gas covers cold access + copy but NOT memory expansion), (4) OOG at memory expansion boundary (256 byte offset, gas is exactly 1 less than needed). | For success case: BAL **MUST** include target contract. For all OOG cases: BAL **MUST NOT** include target contract. Gas for ALL components (cold access + copy + memory expansion) must be checked BEFORE recording account access. | ✅ Completed |
 | `test_bal_multiple_balance_changes_same_account` | Ensure BAL tracks multiple balance changes to same account across transactions | Alice funds Bob (starts at 0) in tx0 with exact amount needed. Bob spends everything in tx1 to Charlie. Bob's balance: 0 → funding_amount → 0 | BAL **MUST** include Bob with two `balance_changes`: one at txIndex=1 (receives funds) and one at txIndex=2 (balance returns to 0). This tests balance tracking across two transactions. | ✅ Completed |
 | `test_bal_multiple_storage_writes_same_slot` | Ensure BAL tracks multiple writes to same storage slot across transactions | Alice calls contract 3 times in same block. Contract increments slot 1 on each call: 0 → 1 → 2 → 3 | BAL **MUST** include contract with slot 1 having three `slot_changes`: txIndex=1 (value 1), txIndex=2 (value 2), txIndex=3 (value 3). Each transaction's write must be recorded separately. | ✅ Completed |
 | `test_bal_nested_delegatecall_storage_writes_net_zero` | Ensure BAL correctly filters net-zero storage changes across nested DELEGATECALL frames | Parametrized by nesting depth (1-3). Root contract has slot 0 = 1. Each frame writes a different intermediate value via DELEGATECALL chain, deepest frame writes back to original value (1). Example depth=2: 1 → 2 → 3 → 1 | BAL **MUST** include root contract with `storage_reads` for slot 0 but **MUST NOT** include `storage_changes` (net-zero). All delegate contracts **MUST** have empty changes. Tests that frame merging correctly removes parent's intermediate writes when child reverts to pre-tx value. | ✅ Completed |
-| `test_bal_cross_tx_storage_revert_to_zero` | Ensure BAL captures storage changes when tx2 reverts slot back to original value (blobhash regression test) | Alice sends tx1 writing slot 0=0xABCD (from 0x0), then tx2 writing slot 0=0x0 (back to original) | BAL **MUST** include contract with slot 0 having two `slot_changes`: txIndex=1 (0xABCD) and txIndex=2 (0x0). Cross-transaction net-zero **MUST NOT** be filtered. | ✅ Completed |
+| `test_bal_cross_tx_storage_write`  | Ensure storage changes behave as expected across transaction boundaries | Tx1 writes a non-zero value to an empty slot; tx2 either writes zero (back to pre-block) or rewrites the same value (no-op vs post-tx1). | Tx1's change always appears at index 1. The revert case adds tx2's change at index 2 (must not be filtered as net-zero). The same-value case adds nothing and the slot **MUST NOT** appear in storage_reads (uniqueness rule). | ✅ Completed |
+| `test_bal_cross_tx_storage_chain` | Verify clients apply BAL state changes from prior transactions before executing later transactions in the same block. Each later Tx depends on the two preceding writes (Fibonacci-style), so any tx skipped or run against pre-block state cascades into a wrong slot value and a different state root. | Fixed `chain_length=8`. Single branching contract: Tx i with `i<2` seeds slot i with `1`; Tx i with `i>=2` writes `slot[i] = SLOAD(i-1) + SLOAD(i-2)`. | BAL **MUST** include the contract with `storage_changes` for each slot i (post=`fib(i)` at `block_access_index=i+1`). Post-state: slots 0-7 equal `[1, 1, 2, 3, 5, 8, 13, 21]`. | ✅ Completed |
+| `test_bal_cross_tx_deploy_then_call` | Verify clients apply Tx1's CREATE to their state view before executing Tx2's CALL in the same block. A client that parallelizes Tx2 without applying Tx1's `code_changes` would hit an empty account, the CALL would no-op, and slot 0 would remain 0. Parametrized over `@pytest.mark.with_all_create_opcodes` (CREATE and CREATE2). | Tx1 (Alice) calls a factory which CREATE/CREATE2s a contract whose runtime is `SSTORE(0, 0x42) + STOP` at a deterministic address. Tx2 (Bob) CALLs that address directly. | BAL **MUST** include the target contract with `nonce_changes` and `code_changes` at `block_access_index=1` (the deployment) and `storage_changes` for slot 0 (post=`0x42`) at `block_access_index=2` (Tx2's CALL through the deployed runtime). Post-state: target contract has runtime code and `slot[0] == 0x42`. | ✅ Completed |
+| `test_bal_cross_tx_factory_nonce_create_chain` | Verify clients propagate `factory.nonce_changes` across txs when later CREATE addresses derive from the factory's current nonce. The cross-tx dependency signal is solely `nonce_changes` — no storage or balance mutations exist anywhere. A scheduler that deprioritizes nonce_changes (or schedules CREATE-family txs by their resulting distinct addresses) would speculatively derive `addr(factory, N+1)` for every tx and produce only one successful deployment. Parametrized: `failure_mode ∈ ["none", "collision", "oog"]` — `collision` pre-populates the mid-chain target (factory.nonce still bumps; chain slides forward); `oog` gives the mid-chain tx `intrinsic+1` gas so CREATE never fires (factory.nonce does not bump; chain slides backward, reusing the slot). | 8 txs from 8 distinct senders each call a shared factory that does CREATE with identical minimal initcode (deploys `Op.STOP` as runtime). | `none`: factory has 8 sequential `nonce_changes` (post=`N+1`..`N+8`); each address has `nonce_changes`/`code_changes` at its `block_access_index`. `collision`: factory still has 8 sequential `nonce_changes`; the colliding target appears with `BalAccountExpectation.empty()` (accessed under EIP-684, no state change) and its pre-state code is preserved. `oog`: factory has only 7 `nonce_changes` (the OOG tx contributes none); subsequent post_nonce values are shifted -1; the OOG'd tx's would-be address slot is filled by the next tx; the final chain address is never touched (`NONEXISTENT`). Post-state: senders all `nonce=1`; factory `nonce=N+(7 or 8)` depending on mode. | ✅ Completed |
+| `test_bal_cross_tx_balance_dependency` | Verify clients apply Tx1's balance change before executing Tx2 in the same block. A client that parallelizes Tx2 without applying Tx1's `balance_changes` would record the pre-block balance via `SELFBALANCE`, yielding a different state root. Parametrized over `direct_call` and `selfdestruct` funding paths so a client can't tie balance tracking to recipient-code execution. | Tx1 (Alice) routes `1` wei into a branching contract (empty calldata → STOP). In `direct_call`, alice sends value directly; in `selfdestruct`, alice calls a pre-funded killer contract that `SELFDESTRUCT`s to the recipient (recipient bytecode never runs in Tx1). Tx2 (Bob) calls the contract with non-empty calldata, taking the `SSTORE(0, SELFBALANCE)` path. | BAL **MUST** include the contract with `balance_changes` at `block_access_index=1` (post=`1`) and `storage_changes` for slot 0 (post=`1`) at `block_access_index=2`. In `selfdestruct`, BAL also includes the killer with `balance_changes` (post=`0`) at index 1. Post-state: `contract.balance == contract.storage[0] == 1` proves Tx2 observed Tx1's balance change. | ✅ Completed |
+| `test_bal_7702_cross_tx_delegation_then_call` | Verify clients apply Tx1's EIP-7702 delegation before later txs CALL the now-delegated EOA. Three-tx chain forces clients to apply both the code-install and each intermediate storage increment for the final value to be correct. | Tx1 (Relayer): sponsors an EIP-7702 auth that delegates Alice to a `SSTORE(0, SLOAD(0) + 1)` counter contract. Tx2 (Bob) and Tx3 (Charlie): both CALL Alice, which dispatches to the counter and increments her slot 0. | BAL **MUST** include Alice with `code_changes` at `block_access_index=1` (delegation designator), `nonce_changes` at index 1, and two `storage_changes` for slot 0 (post=1 at index 2, post=2 at index 3). Post-state: Alice has the delegation code and `slot[0] == 2`. | ✅ Completed |
+| `test_bal_cross_tx_funding_chain` | Verify clients apply each tx's BAL `balance_changes` to the next sender's funds check. Five-tx chain across distinct senders, each intermediate starts empty and depends on the prior tx to be solvent. A parallelizing client validating any later tx against pre-block state would see zero balance on its sender and wrongly reject the block. Parametrized over `success`, `oog_minus_1` (eunice's tx OOGs at exact gas minus one), and `insufficient_funds` (dan forwards one wei short so eunice's upfront balance check fails, block rejected with `INSUFFICIENT_ACCOUNT_FUNDS`). | Tx1 alice→bob, Tx2 bob→charlie, Tx3 charlie→dan, Tx4 dan→eunice. Each forwards exactly the next sender's upfront cost. Tx5 eunice→target with runtime `SSTORE(0, 0xC0FFEE)`. | For `success`/`oog_minus_1`: BAL **MUST** include nonce/balance changes for each EOA at its tx's `block_access_index`, plus target's `storage_changes` at index 5 (`success`) or `storage_reads=[0]` (`oog_minus_1`). Post-state: all five EOAs end with `balance=0`; target has `slot[0]==0xC0FFEE` in `success` and empty storage in `oog_minus_1`. For `insufficient_funds`: block **MUST** be rejected with `TransactionException.INSUFFICIENT_ACCOUNT_FUNDS`. | ✅ Completed |
+| `test_bal_withdrawal_predeploy_balance_observed_cross_tx` | Verify Tx2 observes Tx1's balance change on the EIP-7002 withdrawal predeploy via the `BALANCE` opcode. Exercises cross-tx visibility through a system address that is also touched by the prepare-block system call, so a client snapshotting the predeploy ahead of the BAL prefix would mask the overlay. Companion to `test_bal_cross_tx_balance_dependency`, which uses `SELFBALANCE` on a regular contract. File: `tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_cross_index.py`. | Tx1 (`sender_0`) sends `1` wei (the fee at `excess=0`) to `WITHDRAWAL_REQUEST_PREDEPLOY` with a valid 56-byte withdrawal-request calldata; the predeploy retains the fee. Tx2 (`sender_1`) calls a reader contract whose runtime is `SSTORE(0, BALANCE(WITHDRAWAL_REQUEST_PREDEPLOY))`. | BAL **MUST** include `WITHDRAWAL_REQUEST_PREDEPLOY` with `balance_changes` at `block_access_index=1` (post=`1`) and the reader with `storage_changes` for slot 0 at `block_access_index=2` (post=`1`). Post-state: `reader.storage[0] == 1` proves Tx2's `BALANCE` opcode returned the post-Tx1 balance. | ✅ Completed |
+| `test_bal_intra_tx_multiple_sstores_same_slot` | Ensure BAL coalesces consecutive SSTOREs to the same slot within one tx into a single storage change with the final post-value | Contract executes `SSTORE(0x01, 0xAA) + SSTORE(0x01, 0xBB) + SSTORE(0x01, 0xCC)` in one tx. Parametrized by `pre_value`: `slot_starts_empty` (0x00), `slot_starts_nonzero` (0x11), `intermediate_equals_pre` (0xBB, where the second write transiently matches the pre-state). | BAL **MUST** include contract with slot `0x01` having exactly one `slot_changes` entry: `txIndex=1, post_value=0xCC`. Intermediate values `0xAA` and `0xBB` **MUST NOT** appear as separate entries (enforced via `absent_values`). | ✅ Completed |
+| `test_bal_intra_tx_sstores_same_slot_net_zero` | Ensure BAL filters net-zero result when multiple SSTOREs to the same slot occur within one tx | Parametrized: `nonzero_pre_returns_to_pre` (pre=0xCC, writes 0xAA→0xBB→0xCC) and `empty_pre_ephemeral_writes` (pre=0x00, writes 0xAA→0xBB→0x00). Final value equals pre-state in both cases. | BAL **MUST** include contract with slot `0x01` in `storage_reads` (slot was accessed) and **MUST NOT** include slot `0x01` in `storage_changes` (net-zero). | ✅ Completed |
 | `test_bal_create_contract_init_revert` | Ensure BAL correctly handles CREATE when parent call reverts | Caller calls factory, factory executes CREATE (succeeds), then factory REVERTs rolling back the CREATE | BAL **MUST** include Alice with `nonce_changes`. Caller and factory with no changes (reverted). Created contract address appears in BAL but **MUST NOT** have `nonce_changes` or `code_changes` (CREATE was rolled back). Contract address **MUST NOT** exist in post-state. | ✅ Completed |
 | `test_bal_create_oog_code_deposit` | Ensure BAL correctly handles CREATE OOG during code deposit | Alice calls factory contract that executes CREATE with init code returning 10,000 bytes. Transaction has insufficient gas for code deposit. Factory nonce increments, CREATE returns 0 and stores in slot 1. | BAL **MUST** include Alice with `nonce_changes`. Factory with `nonce_changes` (incremented by CREATE) and `storage_changes` (slot 1 = 0). Contract address with empty changes (read during collision check). **MUST NOT** include nonce or code changes for contract address (rolled back on OOG). Contract address **MUST NOT** exist in post-state. | ✅ Completed |
-| `test_bal_create_early_failure` | Ensure BAL correctly handles CREATE that fails before accessing contract address | Factory (balance=50) attempts CREATE(value=100). CREATE fails due to insufficient endowment (100 > 50). Factory stores CREATE result (0) in slot 0. | BAL **MUST** include Alice with `nonce_changes`. Factory with `storage_changes` (slot 0 = 0) but **MUST NOT** have `nonce_changes` (CREATE failed before nonce increment). Contract address **MUST NOT** appear in BAL (never accessed - CREATE failed before `track_address`). This is distinct from collision/OOG failures where contract address IS in BAL. | ✅ Completed |
+| `test_bal_create_early_failure` | Ensure BAL omits would-be address when CREATE/CREATE2 fails because of insufficient balance. | Factory with balance below the endowment attempts CREATE/CREATE2; the call fails before the address is accessed. | Alice: `nonce_changes`. Factory: `storage_changes` (CREATE returned 0), no `nonce_changes`. Would-be address **MUST NOT** appear in BAL. | ✅ Completed |
 | `test_bal_invalid_missing_nonce` | Verify clients reject blocks with BAL missing required nonce changes | Alice sends transaction to Bob; BAL modifier removes Alice's nonce change entry | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Clients **MUST** validate that all sender accounts have nonce changes recorded. | ✅ Completed |
 | `test_bal_invalid_nonce_value` | Verify clients reject blocks with incorrect nonce values in BAL | Alice sends transaction to Bob; BAL modifier changes Alice's nonce to incorrect value | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Clients **MUST** validate nonce values match actual state transitions. | ✅ Completed |
 | `test_bal_invalid_storage_value` | Verify clients reject blocks with incorrect storage values in BAL | Alice calls contract that writes to storage; BAL modifier changes storage value to incorrect value | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Clients **MUST** validate storage change values match actual state transitions. | ✅ Completed |
@@ -75,7 +101,7 @@
 | `test_bal_invalid_duplicate_account` | Verify clients reject blocks with duplicate account entries in BAL | Alice sends transaction; BAL modifier duplicates Alice's account entry | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Clients **MUST** ensure each account appears at most once in BAL. | ✅ Completed |
 | `test_bal_invalid_account_order` | Verify clients reject blocks with incorrect account ordering in BAL | Alice sends transaction to Bob; BAL modifier reverses account order (BAL requires sorted order) | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Clients **MUST** validate accounts are in canonical sorted order. | ✅ Completed |
 | `test_bal_invalid_complex_corruption` | Verify clients reject blocks with multiple BAL corruptions | Alice calls contract with storage writes; BAL has multiple issues: wrong account, missing nonce, wrong storage value | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Clients **MUST** detect any corruption regardless of other issues. | ✅ Completed |
-| `test_bal_invalid_missing_account` | Verify clients reject blocks with missing required account entries in BAL | Alice sends transaction to Bob; BAL modifier removes Bob's account entry (recipient should be included) | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Clients **MUST** validate all accessed accounts are present. | ✅ Completed |
+| `test_bal_invalid_missing_account` | Verify clients reject blocks whose BAL omits an account that was touched during block execution | Parameterized test: `balance_change` — Alice sends a value transfer to Bob; BAL modifier removes Bob's entry (recipient had a balance change). `access_only` — Alice calls a contract that executes `BALANCE` against a target account without changing it; BAL modifier removes the target account's entry (accessed-but-unchanged). | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Clients **MUST** validate all accessed accounts are present, including accessed-but-unchanged accounts with empty change lists. | ✅ Completed |
 | `test_bal_invalid_balance_value` | Verify clients reject blocks with incorrect balance values in BAL | Alice sends value to Bob; BAL modifier changes balance to incorrect value | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Clients **MUST** validate balance change values match actual state transitions. | ✅ Completed |
 | `test_bal_empty_block_no_coinbase` | Ensure BAL correctly handles empty blocks without including coinbase | Block with 0 transactions, no withdrawals. System contracts may perform operations (EIP-2935 parent hash, EIP-4788 beacon root if active). | BAL **MUST NOT** include the coinbase/fee recipient (receives no fees). BAL **MAY** include system contract addresses (EIP-2935 `HISTORY_STORAGE_ADDRESS`, EIP-4788 `BEACON_ROOTS_ADDRESS`) with `storage_changes` at `block_access_index=0` (pre-execution system operations). | ✅ Completed |
 | `test_bal_coinbase_zero_tip` | Ensure BAL includes coinbase even when priority fee is zero | Block with 1 transaction: Alice sends 5 wei to Bob with priority fee = 0 (base fee burned post-EIP-1559) | BAL **MUST** include Alice with `balance_changes` (gas cost) and `nonce_changes`. BAL **MUST** include Bob with `balance_changes`. BAL **MUST** include coinbase with empty changes. | ✅ Completed |
@@ -99,13 +125,15 @@
 | `test_bal_storage_write_read_same_frame` | Ensure BAL captures write precedence over read in same call frame (writes shadow reads) | Alice calls `Oracle` which writes (`SSTORE`) value `0x42` to slot `0x01`, then reads (`SLOAD`) from slot `0x01` in the same call frame | BAL **MUST** include `Oracle` with slot `0x01` in `storage_changes` showing final value `0x42`. Slot `0x01` **MUST NOT** appear in `storage_reads` (write shadows the subsequent read in same frame). | ✅ Completed |
 | `test_bal_storage_write_read_cross_frame` | Ensure BAL captures write precedence over read across call frames (writes shadow reads cross-frame) | Alice calls `Oracle`. First call reads slot `0x01` (sees initial value), writes `0x42` to slot `0x01`, then calls itself (via `CALL`, `DELEGATECALL`, or `CALLCODE`). Second call reads slot `0x01` (sees `0x42`) and exits. | BAL **MUST** include `Oracle` with slot `0x01` in `storage_changes` showing final value `0x42`. Slot `0x01` **MUST NOT** appear in `storage_reads` (write shadows both the read before it in same frame and the read in the recursive call). | ✅ Completed |
 | `test_bal_create_transaction_empty_code` | Ensure BAL does not record spurious code changes for CREATE transaction deploying empty code | Alice sends CREATE transaction with empty initcode (deploys code `b""`). Contract address gets nonce = 1 and code = `b""`. | BAL **MUST** include Alice with `nonce_changes` and created contract with `nonce_changes` but **MUST NOT** include `code_changes` for contract (setting `b"" -> b""` is net-zero). | ✅ Completed |
-| `test_bal_cross_block_precompile_state_leak` | Ensure internal EVM state for precompile handling does not leak between blocks | Block 1: Alice calls RIPEMD-160 (0x03) with zero value (RIPEMD-160 must be pre-funded). Block 2: Bob's transaction triggers an exception (stack underflow). | BAL for Block 1 **MUST** include RIPEMD-160. BAL for Block 2 **MUST NOT** include RIPEMD-160 (never accessed in Block 2). Internal state from Parity Touch Bug (EIP-161) handling must be reset between blocks. | ✅ Completed |
+| `test_bal_cross_block_ripemd160_state_leak` | Ensure internal EVM state for precompile handling does not leak between blocks | Block 1: Alice calls RIPEMD-160 (0x03) with zero value (RIPEMD-160 must be pre-funded). Block 2: Bob's transaction triggers an exception (stack underflow). | BAL for Block 1 **MUST** include RIPEMD-160. BAL for Block 2 **MUST NOT** include RIPEMD-160 (never accessed in Block 2). Internal state from Parity Touch Bug (EIP-161) handling must be reset between blocks. | ✅ Completed |
 | `test_bal_all_transaction_types` | Ensure BAL correctly captures state changes from all transaction types in a single block | Single block with 5 transactions: Type 0 (Legacy), Type 1 (EIP-2930 Access List), Type 2 (EIP-1559), Type 3 (EIP-4844 Blob), Type 4 (EIP-7702 Set Code). Each tx writes to contract storage. Note: Access list addresses are pre-warmed but NOT recorded in BAL (no state access). | BAL **MUST** include: (1) All 5 senders with `nonce_changes`. (2) Contracts 0-3 with `storage_changes`. (3) Alice (7702 target) with `nonce_changes`, `code_changes` (delegation), `storage_changes`. (4) Oracle (delegation source) with empty changes. | ✅ Completed |
-| `test_bal_create2_collision` | Ensure BAL handles CREATE2 address collision correctly | Factory contract (nonce=1, storage slot 0=0xDEAD) executes `CREATE2(salt=0, initcode)` targeting address that already has `code=STOP, nonce=1`. Pre-deploy contract at calculated CREATE2 target address before factory deployment. | BAL **MUST** include: (1) Factory with `nonce_changes` (1→2, incremented even on failed CREATE2), `storage_changes` for slot 0 (0xDEAD→0, stores failure). (2) Collision address with empty changes (accessed during collision check, no state changes). CREATE2 returns 0. Collision address **MUST NOT** have `nonce_changes` or `code_changes`. | ✅ Completed |
+| `test_bal_create_collision` | Ensure BAL handles CREATE/CREATE2 address collision correctly, with or without a subsequent tx that modifies the colliding address. Parametrized: `@pytest.mark.with_all_create_opcodes`, `modification ∈ {"collision_only", "then_nonce_change", "then_storage_change"}`. | Factory (nonce=1, slot[0]=0xDEAD) executes CREATE/CREATE2 targeting a pre-populated address X. For `collision_only`, X is `code=STOP, nonce=1`. For `then_nonce_change`, X is a contract that runs its own inner CREATE when called. For `then_storage_change`, X is a contract that SSTOREs when called. If `modification != "collision_only"`, a second tx (from Bob) calls X. | BAL **MUST** include: (1) Factory with `nonce_changes` (1→2, bumped even on failed CREATE/CREATE2), `storage_changes` for slot 0 (0xDEAD→0). (2) X for the collision touch at index 1. For `collision_only`, X's BAL entry is `empty()`. For `then_nonce_change`, X has `nonce_changes` at index 2 (post=2) and the inner-created child has `nonce_changes`/`code_changes` at index 2; X **MUST NOT** have spurious `code_changes`/`storage_changes`/`storage_reads`/`balance_changes`. For `then_storage_change`, X has `storage_changes` for slot 0x01 (post=0xCAFE) at index 2; **MUST NOT** have spurious entries on other axes. | ✅ Completed |
+| `test_bal_create2_deploy_then_collision` | Ensure BAL correctly preserves a colliding address's deployment entries when the same address is later touched again via a collision check, and that init code does NOT execute on the collision. | Tx1: factory CREATE2 deploys X; X's init code does `SSTORE(0, SLOAD(0)+1)` (increment) then deploys `STOP`. Tx2: same factory retries the identical CREATE2 — collision against X. | BAL **MUST** include: (1) Factory with `nonce_changes` at indices 1 and 2 (1→2→3) and `storage_changes` at slot 0 with entries at indices 1 (post=X.address) and 2 (post=0 from the failed CREATE2 return). (2) X with `nonce_changes=[(1, 1)]`, `code_changes=[(1, STOP)]`, and `storage_changes` slot 0 `[(1, 1)]` from the deployment; **no** entries at index 2 and `storage_reads` **MUST** be empty — a client that runs init then reverts on collision would leak slot 0 as a demoted read. Post-state: X slot 0 == 1 proves init executed exactly once (tx2 collided, didn't re-run init). | ✅ Completed |
 | `test_bal_create_selfdestruct_to_self_with_call` | Ensure BAL handles init code that calls external contract then selfdestructs to itself | Factory executes `CREATE2` with endowment=100. Init code (embedded in factory via CODECOPY): (1) `CALL(Oracle, 0)` - Oracle writes to its storage slot 0x01. (2) `SSTORE(0x01, 0x42)` - write to own storage. (3) `SELFDESTRUCT(SELF)` - selfdestruct to own address. Contract created and destroyed in same tx. | BAL **MUST** include: (1) Factory with `nonce_changes`, `balance_changes` (loses 100). (2) Oracle with `storage_changes` for slot 0x01 (external call succeeded). (3) Created address with `storage_reads` for slot 0x01 (aborted write becomes read) - **MUST NOT** have `nonce_changes`, `code_changes`, `storage_changes`, or `balance_changes` (ephemeral contract, balance burned via SELFDESTRUCT to self). | ✅ Completed |
 | `test_bal_selfdestruct_to_7702_delegation` | Ensure BAL correctly handles SELFDESTRUCT to a 7702 delegated account (no code execution on recipient) | Tx1: Alice authorizes delegation to Oracle (sets code to `0xef0100\|\|Oracle`). Tx2: Victim contract (balance=100) executes `SELFDESTRUCT(Alice)`. Two separate transactions in same block. Note: Alice starts with initial balance which accumulates with selfdestruct. | BAL **MUST** include: (1) Alice at block_access_index=1 with `code_changes` (delegation), `nonce_changes`. (2) Alice at block_access_index=2 with `balance_changes` (receives selfdestruct). (3) Victim at block_access_index=2 with `balance_changes` (100→0). **Oracle MUST NOT appear in tx2** - per EVM spec, SELFDESTRUCT transfers balance without executing recipient code, so delegation target is never accessed. | ✅ Completed |
-| `test_bal_call_revert_insufficient_funds` | Ensure BAL handles CALL failure due to insufficient balance (not OOG) | Contract (balance=100, storage slot 0x02=0xDEAD) executes: `SLOAD(0x01), CALL(target, value=1000), SSTORE(0x02, result)`. CALL fails because 1000 > 100. Target address 0xDEAD (pre-existing with non-zero balance to avoid pruning). Note: slot 0x02 must start non-zero so SSTORE(0) is a change. | BAL **MUST** include: (1) Contract with `storage_reads` for slot 0x01, `storage_changes` for slot 0x02 (value=0, CALL returned failure). (2) Target (0xDEAD) **MUST** appear in BAL with empty changes - target is accessed before balance check fails. | ✅ Completed |
+| `test_bal_call_revert_insufficient_funds` | Ensure BAL handles value-transferring call failure due to insufficient balance (not OOG), with and without 7702 delegation | Caller contract (balance=100, storage slot 0x02=0xDEAD) executes: `SLOAD(0x01), call_opcode(target, value=1000), SSTORE(0x02, result)`. The call fails because 1000 > 100. Parametrized: (1) `call_opcode` over CALL and CALLCODE via `with_all_call_opcodes(selector=...)`, (2) `delegated` (target is plain EOA vs. 7702-delegated EOA pointing to `delegation_target`=STOP), (3) `target_is_warm` (cold/warm via EIP-2930 access list), (4) `delegation_is_warm` (only when delegated). | BAL **MUST** include: (1) Caller with `storage_reads` for slot 0x01, `storage_changes` for slot 0x02 (value=0, call returned failure). (2) Target with empty changes — accessed before the balance check fails. (3) When delegated: `delegation_target` **MUST NOT** appear in the BAL — the balance check fails before `generic_call` runs, so the delegation target's account is never read. Access-list warming does NOT add to BAL on its own, so the BAL is identical across warm/cold variants. | ✅ Completed |
 | `test_bal_lexicographic_address_ordering` | Ensure BAL enforces strict lexicographic byte-wise ordering | Pre-fund three addresses with specific byte patterns: `addr_low = 0x0000...0001`, `addr_mid = 0x0000...0100`, `addr_high = 0x0100...0000`. Contract touches them in reverse order: `BALANCE(addr_high), BALANCE(addr_low), BALANCE(addr_mid)`. Additionally, include two endian-trap addresses that are byte-reversals of each other: `addr_endian_low = 0x0100000000000000000000000000000000000002`, `addr_endian_high = 0x0200000000000000000000000000000000000001`. Note: `reverse(addr_endian_low) = addr_endian_high`. Correct lexicographic order: `addr_endian_low < addr_endian_high` (0x01 < 0x02 at byte 0). If implementation incorrectly reverses bytes before comparing, it would get `addr_endian_low > addr_endian_high` (wrong). | BAL account list **MUST** be sorted lexicographically by address bytes: `addr_low` < `addr_mid` < `addr_high` < `addr_endian_low` < `addr_endian_high`, regardless of access order. The endian-trap addresses specifically catch byte-reversal bugs where addresses are compared with wrong byte order. Complements `test_bal_invalid_account_order` which tests rejection; this tests correct generation. | ✅ Completed |
+| `test_bal_gas_limit_boundary` | Ensure the BAL max-items cap is enforced on the **final** BAL — including pre-tx system work, user txs, and post-tx system work. Parametrized on two orthogonal axes: `with_tx ∈ {False, True}` × `with_cl_withdrawal ∈ {False, True}` × `boundary_offset ∈ {at, below}`. The `with_cl_withdrawal` axis exercises the EIP-4895 withdrawals path (processed between txs and `process_general_purpose_requests`); combined with `with_tx` it catches clients that validate the cap before `process_withdrawals` runs. | Baseline: 15 system items. `with_tx`: alice → bob value=1 adds 3 items (alice + bob + coinbase warmed via EIP-3651). `with_cl_withdrawal`: one EIP-4895 withdrawal to charlie adds 1 item at `block_access_index = N+1`. Gas limit set to `total_items * BLOCK_ACCESS_LIST_ITEM + boundary_offset`. | At boundary: block **MUST** be accepted; BAL includes alice's nonce_change, bob's balance_change (when `with_tx`), charlie's balance_change at the post-tx index (when `with_cl_withdrawal`). Below boundary: block **MUST** be rejected with `BLOCK_ACCESS_LIST_GAS_LIMIT_EXCEEDED`. | ✅ Completed |
 | `test_bal_transient_storage_not_tracked` | Ensure BAL excludes EIP-1153 transient storage operations | Contract executes: `TSTORE(0x01, 0x42)` (transient write), `TLOAD(0x01)` (transient read), `SSTORE(0x02, result)` (persistent write using transient value). | BAL **MUST** include slot 0x02 in `storage_changes` (persistent storage was modified). BAL **MUST NOT** include slot 0x01 in `storage_reads` or `storage_changes` (transient storage is not persisted, not needed for stateless execution). This verifies TSTORE/TLOAD don't pollute BAL. | ✅ Completed |
 | `test_bal_withdrawal_to_7702_delegation` | Ensure BAL correctly handles withdrawal to a 7702 delegated account (no code execution on recipient) | Tx1: Alice authorizes delegation to Oracle (sets code to `0xef0100\|\|Oracle`). Withdrawal: 10 gwei sent to Alice. Single block with tx + withdrawal. | BAL **MUST** include: (1) Alice at block_access_index=1 with `code_changes` (delegation), `nonce_changes`. (2) Alice at block_access_index=2 with `balance_changes` (receives withdrawal). **Oracle MUST NOT appear** - withdrawals credit balance without executing recipient code, so delegation target is never accessed. This complements `test_bal_selfdestruct_to_7702_delegation` (selfdestruct) and `test_bal_withdrawal_no_evm_execution` (withdrawal to contract). | ✅ Completed |
 | `test_init_collision_create_tx` | Ensure BAL tracks CREATE collisions correctly (pre-Amsterdam test with BAL) | CREATE transaction targeting address with existing storage aborts | BAL **MUST** show empty expectations for collision address (no changes occur due to abort) | ✅ Completed |
@@ -120,18 +148,39 @@
 | `test_bal_4788_simple` | Ensure BAL captures beacon root storage writes during pre-execution system call | Block with 2 normal user transactions: Alice sends 10 wei to Charlie, Bob sends 10 wei to Charlie. At block start (pre-execution), `SYSTEM_ADDRESS` calls `BEACON_ROOTS_ADDRESS` to store parent beacon root | BAL **MUST** include at `block_access_index=0`: `BEACON_ROOTS_ADDRESS` with two `storage_changes` (timestamp slot and beacon root slot); `SYSTEM_ADDRESS` **MUST NOT** be included in BAL. At `block_access_index=1`: Alice with `nonce_changes`, Charlie with `balance_changes` (10 wei). At `block_access_index=2`: Bob with `nonce_changes`, Charlie with `balance_changes` (20 wei total). | ✅ Completed |
 | `test_bal_4788_empty_block` | Ensure BAL captures beacon root storage writes in empty block | Block with no transactions. At block start (pre-execution), `SYSTEM_ADDRESS` calls `BEACON_ROOTS_ADDRESS` to store parent beacon root | BAL **MUST** include at `block_access_index=0`: `BEACON_ROOTS_ADDRESS` with two `storage_changes` (timestamp slot and beacon root slot); `SYSTEM_ADDRESS` **MUST NOT** be included in BAL. No transaction-related BAL entries. | ✅ Completed |
 | `test_bal_4788_query` | Ensure BAL captures storage reads when querying beacon root (valid and invalid queries) with optional value transfer | Parameterized test: Block 1 stores beacon root at timestamp 12. Block 2 queries with three timestamp scenarios (valid=12, invalid non-zero=42, invalid zero=0) and value (0 or 100 wei). Valid query (timestamp=12): reads both timestamp and root slots, writes returned value. If value > 0, beacon root contract receives balance. Invalid query with non-zero timestamp (timestamp=42): reads only timestamp slot before reverting, query contract has implicit SLOAD recorded (SSTORE reverts), no value transferred. Invalid query with zero timestamp (timestamp=0): reverts immediately without any storage access, query contract has implicit SLOAD recorded, no value transferred. | Block 1 BAL: System call writes. Block 2 BAL **MUST** include at `block_access_index=0`: System call writes for block 2. Valid case (timestamp=12) at `block_access_index=1`: `BEACON_ROOTS_ADDRESS` with `storage_reads` [timestamp_slot, root_slot] and `balance_changes` if value > 0, query contract with `storage_changes`. Invalid non-zero case (timestamp=42) at `block_access_index=1`: `BEACON_ROOTS_ADDRESS` with `storage_reads` [timestamp_slot only] and NO `balance_changes` (reverted), query contract with `storage_reads` [0] and NO `storage_changes`. Invalid zero case (timestamp=0) at `block_access_index=1`: `BEACON_ROOTS_ADDRESS` with NO `storage_reads` (reverts before access) and NO `balance_changes`, query contract with `storage_reads` [0] and NO `storage_changes`. | ✅ Completed |
+| `test_bal_4788_invalid_calldata_size` | Ensure BAL correctly handles EIP-4788 queries with invalid calldata size | Parameterized test: Query contract calls `BEACON_ROOTS_ADDRESS` with variable-size calldata (0, 31, or 33 bytes) and value (0 or 100 wei). EIP-4788 requires exactly 32 bytes of calldata; any other size reverts before any storage access. | BAL **MUST** include at `block_access_index=0`: `BEACON_ROOTS_ADDRESS` with `storage_changes` from system call. At `block_access_index=1`: `BEACON_ROOTS_ADDRESS` with NO `storage_reads` (reverts before access) and NO `balance_changes` (value not transferred), query contract with `storage_reads` [0] (implicit from no-op SSTORE) and NO `storage_changes`. If value > 0, query contract retains balance. Alice with `nonce_changes`. | ✅ Completed |
 | `test_bal_4788_selfdestruct_to_beacon_root` | Ensure BAL captures `SELFDESTRUCT` to beacon root address alongside system call storage writes | Single block: Pre-execution system call writes beacon root to storage. Transaction: Alice calls contract (pre-funded with 100 wei) that selfdestructs with `BEACON_ROOTS_ADDRESS` as beneficiary. | BAL **MUST** include at `block_access_index=0`: `BEACON_ROOTS_ADDRESS` with `storage_changes` (timestamp and root slots from system call). At `block_access_index=1`: Alice with `nonce_changes`, contract with `balance_changes` (100→0), `BEACON_ROOTS_ADDRESS` with `balance_changes` (receives 100 wei). | ✅ Completed |
-| `test_bal_selfdestruct_send_to_sender` | Ensure BAL tracks SELFDESTRUCT sending all funds back to the tx sender (no burn) | Pre-state: contract `C` exists from a prior transaction with non-empty code and balance = 100 wei. EOA `Alice` sends a transaction calling `C`. `C`’s code executes `SELFDESTRUCT(Alice)`. Under EIP-6780, because `C` was not created in this transaction, SELFDESTRUCT does not delete code or storage; it only transfers the entire 100 wei balance from `C` to `Alice`. Final post-state: `C` still exists with the same code and balance = 0; `Alice`’s balance increased by 100 wei (ignoring gas for this test). | BAL **MUST** include `Alice` with `nonce_changes` (tx sender) and `balance_changes` reflecting receipt of 100 wei, and **MUST** include `C` with `balance_changes` 100→0 and no `code_changes`. BAL **MUST NOT** include any other accounts. This test ensures SELFDESTRUCT-to-sender is modeled as a pure value transfer (no burn, no code deletion). | 🟡 Planned |
+| `test_selfdestruct_send_to_sender` | Ensure BAL tracks SELFDESTRUCT sending all funds back to the tx sender (no burn). Multi-fork: valid_from TangerineWhistle, BAL expectations applied from Amsterdam via `is_eip_enabled(7928)`. File: `tests/tangerine_whistle/eip150_operation_gas_costs/test_eip150_selfdestruct.py`. | Parametrized over `originator_balance: [0, 100]`. Pre-deployed contract `victim` with `code=SELFDESTRUCT(CALLER)` and the given balance. Alice (tx.sender) sends tx directly to `victim`; no intermediate caller. Pre-Cancun: victim destroyed. >=Cancun (EIP-6780, non-same-tx): victim preserved with balance 0. | When EIP-7928 is enabled, BAL **MUST** include Alice with `nonce_changes` coalesced with `balance_changes` (Alice is both sender and beneficiary). Victim has `balance_changes` 100→0 when funded, otherwise empty changes — and **MUST NOT** have `code_changes` or `nonce_changes`. | ✅ Completed |
 | `test_bal_7002_clean_sweep` | Ensure BAL correctly tracks "clean sweep" where all withdrawal requests are dequeued in same block (requests ≤ MAX). Parameterized: (1) pubkey first 32 bytes zero / non-zero, (2) amount zero / non-zero | Alice sends transaction to `WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS` with 1 withdrawal request. Validator pubkey has either first 32 bytes zero or non-zero. Amount is either zero or non-zero. Since 1 ≤ MAX_WITHDRAWAL_REQUESTS_PER_BLOCK, post-execution system call dequeues all requests ("clean sweep"), resetting head and tail to 0. | BAL **MUST** include Alice with `nonce_changes` at `block_access_index=1`. `WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS` **MUST** have: `balance_changes` at `block_access_index=1` (receives fee), `storage_reads` for excess, head, and slot 5 (first 32 bytes of pubkey) if zero. At `block_access_index=1` (tx enqueue): `storage_changes` for count (0→1), tail (0→1), slot 4 (source address), slot 5 (first 32 bytes, **ONLY** if non-zero), slot 6. At `block_access_index=2` (post-exec dequeue): `storage_changes` for count (1→0), tail (1→0). Clean sweep invariant: when all requests dequeued, both head and tail reset to 0. | ✅ Completed |
 | `test_bal_7002_partial_sweep` | Ensure BAL correctly tracks queue overflow when requests exceed MAX, demonstrating partial sweep in block 1 and cleanup in block 2 | Block 1: 20 different EOAs each send withdrawal request to `WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS`. Since 20 > MAX_WITHDRAWAL_REQUESTS_PER_BLOCK, only first MAX requests dequeued ("partial sweep"), leaving 4 in queue. Block 2: Empty block (no transactions), remaining 4 requests dequeued ("clean sweep"), queue becomes empty. | Block 1 BAL **MUST** include all 20 senders with `nonce_changes` at respective `block_access_index` (1-20). `WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS` at each tx: `storage_changes` for count (increments to 20), tail (increments to 20). At `block_access_index=21` (post-exec partial dequeue): `storage_changes` for count (20→0), head (0→MAX). Partial sweep: head advances by MAX, tail stays 20, queue has 4 remaining (tail - head = 4). Block 2 BAL **MUST** include `WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS` at `block_access_index=1` (post-exec clean sweep): `storage_changes` for head (MAX→0), tail (20→0). Clean sweep: both head and tail reset to 0, queue empty. |✅ Completed |
 | `test_bal_7002_no_withdrawal_requests` | Ensure BAL captures EIP-7002 system contract dequeue operation even when block has no withdrawal requests | Block with 1 transaction: Alice sends 10 wei to Bob. No withdrawal requests submitted. | BAL **MUST** include Alice with `nonce_changes` at `block_access_index=1`. BAL **MUST** include Bob with `balance_changes` at `block_access_index=1`. BAL **MUST** include EIP-7002 system contract (`WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS`) with `storage_reads` for slots: excess (slot 0), count (slot 1), head (slot 2), tail (slot 3). System contract **MUST NOT** have `storage_changes` (no writes occur when queue is empty). This test demonstrates that the post-execution dequeue operation always runs and reads queue state, even when no requests are present. | ✅ Completed |
 | `test_bal_7002_request_from_contract` | Ensure BAL captures withdrawal request from contract with correct source address | Alice calls `RelayContract` which internally calls EIP-7002 system contract with withdrawal request. Withdrawal request should have `source_address = RelayContract` (not Alice). | BAL **MUST** include Alice with `nonce_changes` at `block_access_index=1`. BAL **MUST** include `RelayContract` with `balance_changes` (fee paid to system contract) at `block_access_index=1`. BAL **MUST** include system contract with `balance_changes`, `storage_reads`, and `storage_changes` (queue modified). Source address in withdrawal request **MUST** be `RelayContract`. Clean sweep: count and tail reset to 0 at `block_access_index=2`. | ✅ Completed |
 | `test_bal_7002_request_invalid` | Ensure BAL correctly handles invalid withdrawal request scenarios | Parameterized test with 8 invalid scenarios: (1) insufficient_fee (fee=0), (2) calldata_too_short (55 bytes), (3) calldata_too_long (57 bytes), (4) oog (insufficient gas), (5-7) invalid_call_type (DELEGATECALL/STATICCALL/CALLCODE), (8) contract_reverts. Tests both EOA and contract-based withdrawal requests. | BAL **MUST** include sender with `nonce_changes` at `block_access_index=1`. BAL **MUST** include system contract with `storage_reads` for slots: excess (slot 0), count (slot 1), head (slot 2), tail (slot 3). System contract **MUST NOT** have `storage_changes` (transaction failed, no queue modification). | ✅ Completed |
 | `test_bal_invalid_extraneous_entries` | Verify clients reject blocks with any type of extraneous BAL entries | Alice sends 100 wei to Oracle contract (which reads storage slot 0). Charlie is uninvolved in this transaction. A valid BAL is created containing nonce change for Alice, balance change and storage read for Oracle. The BAL is corrupted by adding various extraneous entries: (1) extra_nonce, (2) extra_balance, (3) extra_code, (4) extra_storage_write_touched (slot 0 - already read), (5) extra_storage_write_untouched (slot 1 - not accessed), (6) extra_storage_write_uninvolved_account (Charlie - uninvolved account), (7) extra_account_access (Charlie), (8) extra_storage_read (slot 999). Each tested at block_access_index 1 (same tx), 2 (system tx), 3 (out of bounds). | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Clients **MUST** detect any extraneous entries in BAL. | ✅ Completed |
+| `test_bal_invalid_duplicate_entries` | Verify clients reject blocks where BAL violates uniqueness constraints | Oracle writes storage, reads storage, and CREATEs a contract. BAL is corrupted with duplicate entries: (1) duplicate_nonce_change, (2) duplicate_balance_change, (3) duplicate_code_change, (4) duplicate_storage_slot, (5) duplicate_storage_read, (6) duplicate_slot_change, (7) storage_key_in_both_changes_and_reads. | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Each `block_access_index` must appear at most once per change list, each storage key at most once in `storage_changes` and `storage_reads`, and no key in both. | ✅ Completed |
+| `test_bal_invalid_missing_withdrawal_account` | Verify clients reject blocks where BAL is missing an account modified only by a withdrawal | Alice sends 5 wei to Bob (1 transaction). Charlie receives 10 gwei withdrawal. BAL modifier removes Charlie's entry entirely. | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Clients **MUST** detect that Charlie's balance was modified by the withdrawal but has no corresponding BAL entry. | ✅ Completed |
+| `test_bal_invalid_missing_withdrawal_account_empty_block` | Verify clients reject blocks where BAL is missing a withdrawal-modified account in an empty block | Charlie receives 10 gwei withdrawal in block with no transactions. BAL modifier removes Charlie's entry entirely. | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Clients **MUST** detect withdrawal-modified accounts even when no transactions are present. | ✅ Completed |
+| `test_bal_invalid_hash_mismatch` | Verify clients reject blocks where the BAL hash in the header does not match the actual BAL content | Alice sends value to Bob. BAL content is valid but header hash is overridden to a wrong value via `rlp_modifier`. Unlike other invalid BAL tests (which corrupt BAL content with matching hash), this keeps the BAL valid but injects a wrong header hash. | Block **MUST** be rejected with `INVALID_BAL_HASH` or `INVALID_BLOCK_HASH` exception. Clients **MUST** re-derive the BAL from block execution and compare its hash to the header, not just verify the BAL content is self-consistent. | ✅ Completed |
+| `test_bal_invalid_field_entries` | Verify clients reject blocks with missing or incorrect field-level BAL entries | Oracle writes storage slot 1, reads storage slot 2, and CREATEs a small contract. A valid BAL is created, then corrupted by parameterized modifier: (1) missing_storage_change: Oracle's storage writes removed, (2) missing_storage_read: Oracle's storage reads removed, (3) missing_code_change: created contract's code change removed, (4) wrong_code_value: created contract's deployed bytecode changed to wrong value. | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Clients **MUST** validate all field-level BAL entries: storage writes, storage reads, and code changes. | ✅ Completed |
+| `test_bal_invalid_withdrawal_balance_value` | Verify clients reject blocks where BAL has an incorrect balance value for a withdrawal-modified account | Charlie receives 10 gwei withdrawal in an empty block. BAL modifier changes Charlie's post-balance from the correct 10_000_000_000 wei to 999. | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Clients **MUST** validate withdrawal balance values match actual withdrawal amounts (including gwei-to-wei conversion). | ✅ Completed |
+| `test_bal_invalid_missing_coinbase` | Verify clients reject blocks where BAL is missing the coinbase/fee recipient | Alice sends 100 wei to Bob with gas_price > base_fee so coinbase (charlie) receives a non-zero tip. BAL modifier removes charlie's entry entirely. | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Clients **MUST** include fee recipients that received tips in the BAL. | ✅ Completed |
+| `test_bal_invalid_coinbase_balance_value` | Verify clients reject blocks where BAL has an incorrect balance for the coinbase/fee recipient | Same setup as test_bal_invalid_missing_coinbase. BAL modifier changes charlie's post-balance from the actual tip to 999. | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Clients **MUST** validate coinbase balance values match actual fee accounting (priority fee x gas used). | ✅ Completed |
+| `test_bal_invalid_extraneous_coinbase` | Verify clients reject blocks with a spurious coinbase entry when coinbase received no fees | Parameterized: (1) empty_block: no txs, no withdrawals — only system contracts in valid BAL, (2) withdrawal_only: no txs, one withdrawal to a different address — withdrawals don't pay fees so coinbase is still untouched. BAL modifier appends spurious coinbase entry with empty changes. | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST` exception. Coinbase **MUST NOT** appear in BAL when it receives no transaction tips, even if the block has other state-modifying activity (withdrawals). | ✅ Completed |
+| `test_bal_invalid_surplus_system_address_from_system_call` | Verify clients reject a BAL containing `SYSTEM_ADDRESS` solely due to a system operation caller | Empty block with an EIP-4788 pre-execution system call to `BEACON_ROOTS_ADDRESS`. Helper `beacon_root_system_call_expectations` builds the valid baseline BAL: `BEACON_ROOTS_ADDRESS` has timestamp/root storage changes at `block_access_index=0`, while `SYSTEM_ADDRESS` is marked absent (`None`). The fixture BAL is then corrupted by appending an empty `SYSTEM_ADDRESS` entry. | Block **MUST** be rejected with `INVALID_BLOCK_ACCESS_LIST`. The synthetic system caller address **MUST NOT** be accepted unless it experienced an actual state access. | ✅ Completed |
 | `test_bal_2935_simple` | Ensure BAL captures EIP-2935 history storage writes during pre-execution system call alongside normal transactions | Block with 2 normal user transactions: Alice sends 10 wei to Charlie, Bob sends 10 wei to Charlie. At block start (pre-execution), `SYSTEM_ADDRESS` calls `HISTORY_STORAGE_ADDRESS` to store parent block hash. | BAL **MUST** include `HISTORY_STORAGE_ADDRESS` with `storage_changes` (ring buffer slot 0, empty `slot_changes` since parent hash is framework-computed); `SYSTEM_ADDRESS` **MUST NOT** be included in BAL. At `block_access_index=1`: Alice with `nonce_changes`, Charlie with `balance_changes` (10 wei). At `block_access_index=2`: Bob with `nonce_changes`, Charlie with `balance_changes` (20 wei total). | ✅ Completed |
 | `test_bal_2935_empty_block` | Ensure BAL captures EIP-2935 history storage writes in empty block | Block with no transactions. At block start (pre-execution), `SYSTEM_ADDRESS` calls `HISTORY_STORAGE_ADDRESS` to store parent block hash. | BAL **MUST** include `HISTORY_STORAGE_ADDRESS` with `storage_changes` (ring buffer slot 0, empty `slot_changes`); `SYSTEM_ADDRESS` **MUST NOT** be included in BAL. No transaction-related BAL entries. | ✅ Completed |
 | `test_bal_2935_query` | Ensure BAL captures storage reads when querying EIP-2935 historical block hashes (valid and invalid queries) with optional value transfer | Parameterized test: Block 1 (empty, stores genesis hash via system call). Block 2: Oracle contract queries `HISTORY_STORAGE_ADDRESS` with block number. Two block number scenarios (valid=0 genesis hash, invalid=1042 out of range) and value (0 or 100 wei). Valid query (block_number=0): reads genesis hash slot, oracle writes returned value. If value > 0, history storage contract receives balance. Invalid query (block_number=1042, out of range): reverts before storage access, oracle has implicit SLOAD recorded, value stays in oracle (not transferred to history storage). | Block 2 BAL **MUST** include: Valid case at `block_access_index=1`: `HISTORY_STORAGE_ADDRESS` with `storage_reads` [slot 0] and `balance_changes` if value > 0, oracle with `storage_changes` (empty `slot_changes`). Invalid case at `block_access_index=1`: `HISTORY_STORAGE_ADDRESS` with NO `storage_reads` (reverts before access) and NO `balance_changes`, oracle with `storage_reads` [0], NO `storage_changes`, and `balance_changes` if value > 0 (value stays in oracle). Alice with `nonce_changes` at `block_access_index=1`. | ✅ Completed |
 | `test_bal_2935_selfdestruct_to_history_storage` | Ensure BAL captures `SELFDESTRUCT` to EIP-2935 history storage address | Single block: Transaction where Alice calls contract (pre-funded with 100 wei) that selfdestructs with `HISTORY_STORAGE_ADDRESS` as beneficiary. | BAL **MUST** include at `block_access_index=1`: Alice with `nonce_changes`, contract with `balance_changes` (100→0), `HISTORY_STORAGE_ADDRESS` with `balance_changes` (receives 100 wei). | ✅ Completed |
 | `test_bal_2935_invalid_calldata_size` | Ensure BAL correctly handles EIP-2935 queries with invalid calldata size (reverts before any storage access) | Parameterized test: Block 1 stores genesis hash via system call. Block 2: Oracle contract calls `HISTORY_STORAGE_ADDRESS` with invalid calldata sizes (0, 31, 33 bytes). EIP-2935 requires exactly 32 bytes calldata; any other size causes immediate revert before storage access. Optional value transfer (0 or 100 wei). | Block 2 BAL **MUST** include: `HISTORY_STORAGE_ADDRESS` with NO `storage_reads` (calldata size check fails before any SLOAD) and NO `balance_changes` (call reverts). Oracle with `storage_reads` [0] (implicit SLOAD from no-op SSTORE), NO `storage_changes`, and `balance_changes` if value > 0 (value stays in oracle on revert). Alice with `nonce_changes`. | ✅ Completed |
-| `test_bal_create2_selfdestruct_then_recreate_same_block` | Ensure BAL handles **(tx1) create+SELFDESTRUCT** then **(tx2) CREATE2 "resurrection"** of the *same address* in the same block | Parameterized: `@pytest.mark.with_all_create_opcodes` for Tx1 create opcode (CREATE or CREATE2), and whether **A** has a pre-existing balance or not. **Tx1:** `Factory` executes `create_opcode` to deploy contract at **A** (for CREATE2: fixed `salt`, fixed `initcode` → deterministic address). The created contract optionally does `SLOAD/SSTORE` (to prove state touches), then `SELFDESTRUCT(beneficiary=B)` **in the same tx** (so under EIP-6780 the account is actually deleted after Tx1). **Tx2:** `Factory` executes `CREATE2(salt, initcode)` to recreate **A** at the same deterministic address, and this time the runtime code persists (no SELFDESTRUCT). | BAL **MUST** include: **Tx1 (`block_access_index=1`)**: (1) `Factory` with `nonce_changes` (create opcode increments nonce), and `balance_changes` if it endows A. (2) **A** in `account_changes` (it was accessed/created) but **MUST NOT** have persistent `code_changes`, `nonce_changes`, or `storage_changes` (it ends Tx1 non-existent due to same-tx create+SELFDESTRUCT). Any attempted `SSTORE` in A before SELFDESTRUCT **MUST NOT** appear in `storage_changes` (ephemeral). If A had a pre-existing balance, it **MUST** have `balance_changes` reflecting the transfer to B. (3) `B` with `balance_changes` if A had balance transferred on SELFDESTRUCT. **Tx2 (`block_access_index=2`)**: (1) `Factory` with another `nonce_changes`. (2) **A** with `code_changes` (runtime bytecode present), `nonce_changes = 1`, plus any `storage_changes` performed in Tx2. (3) If Tx2 endows or transfers value, include corresponding `balance_changes` for involved accounts. | 🟡 Planned |
+| `test_bal_create2_selfdestruct_then_recreate_same_block` | Ensure BAL handles **(tx1) CREATE2+SSTORE+SELFDESTRUCT** then **(tx2) CREATE2 "resurrection"** of the *same address* in the same block. Parametrized over `pre_balance: [0, 100]`. | Two identical txs invoke the same factory with the same initcode (same hash → same CREATE2 address A). The factory branches on its own `storage[1]`: on the first tx, slot 1 is 0 so the factory CREATE2's then CALLs A (runtime SSTOREs to a target slot then SELFDESTRUCTs to beneficiary) and records the CALL's return code in slot 1; on the second tx, slot 1 is non-zero so only CREATE2 runs and A persists with the runtime code (its runtime is never executed). When `pre_balance > 0`, A is pre-funded so Tx1's SELFDESTRUCT transfers a real balance. | At `block_access_index=1` (destructed A): **MUST NOT** include `nonce_changes` or `code_changes` for A (EIP-7928 SELFDESTRUCT-in-tx semantics); the SSTORE is demoted to `storage_reads` for the target slot (write demoted because A is destroyed same-tx). `balance_changes` for A appears only when pre-funded. Beneficiary appears with `balance_changes` if pre-funded, otherwise `empty()` (SELFDESTRUCT touches the beneficiary even with 0 value). At `block_access_index=2` (resurrection): A has `nonce_changes` (post=1) and `code_changes` (post=runtime). Post-state: A has empty `storage={}` (the tx1 SSTORE was wiped; tx2 never executed the runtime). Factory's `storage[1] = 1` confirms the Tx1 CALL went through. | ✅ Completed |
+| `test_bal_call_with_value_in_static_context` | CALL with nonzero value in static context: target NOT in BAL | Parametrized: `target_is_warm` (cold/warm via access list), `target_has_code` (EOA/contract). Static check must fire before account access. | `target` **MUST NOT** appear in BAL. Balances unchanged. | ✅ Completed |
+| `test_bal_create_in_static_context` | CREATE/CREATE2 in static context: created address NOT in BAL | Parametrized: `@pytest.mark.with_all_create_opcodes`, `value` (0/1). Static check must fire before balance check, address computation, or nonce increment. | Created address **MUST NOT** appear in BAL. Factory nonce unchanged. | ✅ Completed |
+| `test_bal_selfdestruct_in_static_context` | SELFDESTRUCT in static context: beneficiary NOT in BAL | Parametrized: `beneficiary_is_warm` (cold/warm via access list), `caller_balance` (0/100). Static check must fire before beneficiary access or balance transfer. | `beneficiary` **MUST NOT** appear in BAL. Balances unchanged. | ✅ Completed |
+| `test_bal_call_opcode_succeeds_in_static_context` | All call opcodes (no value) succeed in static context | Parametrized: `@pytest.mark.with_all_call_opcodes`. Caller invokes `call_opcode(target)` inside STATICCALL. | `target` **MUST** appear in BAL. Ensures clients don't over-restrict beyond EIP-214. | ✅ Completed |
+| `test_bal_callcode_with_value_in_static_context` | CALLCODE with nonzero value succeeds in static context | EIP-214 explicitly excludes CALLCODE from write-protection. Caller invokes `CALLCODE(value=1, target)` inside STATICCALL. | `target` **MUST** appear in BAL. Ensures clients don't apply CALL-with-value restriction to CALLCODE. | ✅ Completed |
+| `test_bal_create_and_oog` | CREATE/CREATE2 OOG boundary test at three gas levels | Parametrized: `@pytest.mark.with_all_create_opcodes`, `OutOfGasBoundary` (OOG_BEFORE_TARGET_ACCESS, OOG_AFTER_TARGET_ACCESS, SUCCESS). BEFORE and AFTER differ by 1 gas, proving the static cost boundary. | OOG_BEFORE: created address **MUST NOT** appear in BAL. OOG_AFTER: created address IS in BAL as `empty()` (accessed, state reverted). SUCCESS: created address in BAL with `nonce_changes`/`code_changes`. | ✅ Completed |
+| `test_bal_fork_transition_happy_path` | Verify a BAL is produced at the Amsterdam activation block and absent before it. File: `tests/amsterdam/eip7928_block_level_access_lists/test_fork_transition.py`. Uses `@pytest.mark.valid_at_transition_to("Amsterdam")` to run across the `BPO2 -> Amsterdam` boundary. | Two blocks: pre-fork (`timestamp=14_999`) with a simple Alice→Bob transfer, then activation block (`timestamp=15_000`) with the same kind of transfer. | Pre-fork block header **MUST NOT** carry `block_access_list_hash`. Activation block **MUST** include `block_access_list_hash` correctly derived from the BAL body, and the BAL body **MUST** record Alice's `nonce_changes` and Bob's `balance_changes` at `block_access_index=1`. | ✅ Completed |
+| `test_invalid_pre_fork_block_with_bal_hash_field` | Verify clients reject a pre-Amsterdam block whose header carries `block_access_list_hash`. File: `tests/amsterdam/eip7928_block_level_access_lists/test_fork_transition.py`. | Single block at `timestamp=14_999` with a regular transfer, mutated via `rlp_modifier=Header(block_access_list_hash=Hash(0))` to inject the field into the pre-fork header schema. | Block **MUST** be rejected with `BlockException.INVALID_BLOCK_HASH`: pre-fork clients compute the block hash without the injected field, mismatching the expected hash. | ✅ Completed |
+| `test_invalid_post_fork_block_without_bal_hash_field` | Verify clients reject an Amsterdam activation block whose header is missing `block_access_list_hash`. File: `tests/amsterdam/eip7928_block_level_access_lists/test_fork_transition.py`. | Single block at `timestamp=15_000` with a regular transfer, mutated via `rlp_modifier=Header(block_access_list_hash=Header.REMOVE_FIELD)` so the field is dropped from the header. | Block **MUST** be rejected with `BlockException.INVALID_BAL_HASH` or `BlockException.INVALID_BLOCK_HASH`: clients re-derive the BAL hash from execution and detect the mismatch either at the BAL hash check or the header hash check. | ✅ Completed |
+| `test_fork_transition_bal_size_constraint` | Verify the BAL size constraint (`bal_items <= gas_limit // BLOCK_ACCESS_LIST_ITEM`) applies only on/after Amsterdam. File: `tests/amsterdam/eip7928_block_level_access_lists/test_fork_transition.py`. Parametrized over `exceeds_limit_at_fork`: `at_fork_within_budget` (`gas_limit == empty_block_bal_item_count() * BLOCK_ACCESS_LIST_ITEM`) and `at_fork_over_budget` (`gas_limit` one wei below that). | Two empty blocks: pre-fork (`timestamp=14_999`) and activation block (`timestamp=15_000`). The same low `gas_limit` is used for both via `genesis_environment=Environment(gas_limit=...)`. | Pre-fork block **MUST** be accepted under both budgets (constraint not yet enforced). Activation block **MUST** be accepted at the exact budget and **MUST** be rejected with `BlockException.BLOCK_ACCESS_LIST_GAS_LIMIT_EXCEEDED` one item over the budget. | ✅ Completed |
 
diff --git a/tests/amsterdam/eip7928_block_level_access_lists/test_fork_transition.py b/tests/amsterdam/eip7928_block_level_access_lists/test_fork_transition.py
new file mode 100644
index 00000000000..6be8458434c
--- /dev/null
+++ b/tests/amsterdam/eip7928_block_level_access_lists/test_fork_transition.py
@@ -0,0 +1,212 @@
+"""Fork-transition tests for EIP-7928 (Block-level Access Lists)."""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    BalAccountExpectation,
+    BalBalanceChange,
+    BalNonceChange,
+    Block,
+    BlockAccessListExpectation,
+    BlockchainTestFiller,
+    BlockException,
+    EIPChecklist,
+    Environment,
+    Hash,
+    Header,
+    Transaction,
+    TransitionFork,
+)
+
+from .spec import ref_spec_7928
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7928.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7928.version
+
+FORK_TIMESTAMP = 15_000
+
+
+@EIPChecklist.BlockHeaderField.Test.ForkTransition.Initial()
+@pytest.mark.valid_at_transition_to("Amsterdam")
+def test_bal_fork_transition_happy_path(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+) -> None:
+    """
+    Verify that a BAL is produced at the Amsterdam activation block.
+
+    - Pre-fork block (timestamp < 15_000): no BAL hash, no BAL body.
+    - Activation block (timestamp == 15_000): BAL hash and body are present
+      and match the actual access activity in the block.
+    """
+    alice = pre.fund_eoa()
+    bob = pre.fund_eoa(amount=0)
+
+    pre_fork_tx = Transaction(sender=alice, to=bob, value=100, gas_price=10)
+    post_fork_tx = Transaction(sender=alice, to=bob, value=100, gas_price=10)
+
+    blocks = [
+        Block(
+            timestamp=FORK_TIMESTAMP - 1,
+            txs=[pre_fork_tx],
+            header_verify=Header(
+                block_access_list_hash=Header.EMPTY_FIELD,
+            ),
+        ),
+        Block(
+            timestamp=FORK_TIMESTAMP,
+            txs=[post_fork_tx],
+            expected_block_access_list=BlockAccessListExpectation(
+                account_expectations={
+                    alice: BalAccountExpectation(
+                        nonce_changes=[
+                            BalNonceChange(block_access_index=1, post_nonce=2)
+                        ],
+                    ),
+                    bob: BalAccountExpectation(
+                        balance_changes=[
+                            BalBalanceChange(
+                                block_access_index=1, post_balance=200
+                            ),
+                        ],
+                    ),
+                }
+            ),
+        ),
+    ]
+
+    blockchain_test(
+        pre=pre,
+        blocks=blocks,
+        post={bob: Account(balance=200)},
+    )
+
+
+@EIPChecklist.BlockHeaderField.Test.ForkTransition.Before()
+@pytest.mark.valid_at_transition_to("Amsterdam")
+@pytest.mark.exception_test
+def test_invalid_pre_fork_block_with_bal_hash_field(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+) -> None:
+    """
+    Reject a pre-Amsterdam block whose header carries
+    `block_access_list_hash`.
+    """
+    sender = pre.fund_eoa()
+    receiver = pre.fund_eoa(amount=0)
+
+    tx = Transaction(sender=sender, to=receiver, value=100, gas_price=10)
+
+    blockchain_test(
+        pre=pre,
+        post={},
+        blocks=[
+            Block(
+                timestamp=FORK_TIMESTAMP - 1,
+                txs=[tx],
+                rlp_modifier=Header(block_access_list_hash=Hash(0)),
+                exception=BlockException.INVALID_BLOCK_HASH,
+            ),
+        ],
+    )
+
+
+@EIPChecklist.BlockHeaderField.Test.ForkTransition.After()
+@pytest.mark.valid_at_transition_to("Amsterdam")
+@pytest.mark.exception_test
+def test_invalid_post_fork_block_without_bal_hash_field(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+) -> None:
+    """
+    Reject an Amsterdam activation block whose header is missing
+    `block_access_list_hash`.
+    """
+    sender = pre.fund_eoa()
+    receiver = pre.fund_eoa(amount=0)
+
+    tx = Transaction(sender=sender, to=receiver, value=100, gas_price=10)
+
+    blockchain_test(
+        pre=pre,
+        post={},
+        blocks=[
+            Block(
+                timestamp=FORK_TIMESTAMP,
+                txs=[tx],
+                rlp_modifier=Header(
+                    block_access_list_hash=Header.REMOVE_FIELD,
+                ),
+                exception=[
+                    BlockException.INVALID_BAL_HASH,
+                    BlockException.INVALID_BLOCK_HASH,
+                ],
+            ),
+        ],
+    )
+
+
+@EIPChecklist.BlockLevelConstraint.Test.ForkTransition.AcceptedBeforeFork()
+@EIPChecklist.BlockLevelConstraint.Test.ForkTransition.AcceptedAfterFork()
+@EIPChecklist.BlockLevelConstraint.Test.ForkTransition.RejectedAfterFork()
+@pytest.mark.valid_at_transition_to("Amsterdam")
+@pytest.mark.parametrize(
+    "exceeds_limit_at_fork",
+    [
+        pytest.param(False, id="at_fork_within_budget"),
+        pytest.param(
+            True,
+            marks=pytest.mark.exception_test,
+            id="at_fork_over_budget",
+        ),
+    ],
+)
+def test_fork_transition_bal_size_constraint(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: TransitionFork,
+    exceeds_limit_at_fork: bool,
+) -> None:
+    """
+    Verify the BAL size constraint applies only on/after Amsterdam.
+
+    - Pre-fork block at a `gas_limit` that *would* fail the post-fork
+      constraint is accepted (the constraint is not yet enforced).
+    - Activation block at the exact budget is accepted.
+    - Activation block one item over the budget is rejected with
+      `BLOCK_ACCESS_LIST_GAS_LIMIT_EXCEEDED`.
+    """
+    amsterdam = fork.transitions_to()
+    min_gas_limit = (
+        amsterdam.empty_block_bal_item_count()
+        * amsterdam.gas_costs().BLOCK_ACCESS_LIST_ITEM
+    )
+    over_budget_gas_limit = min_gas_limit - 1
+
+    pre_fork_block = Block(
+        timestamp=FORK_TIMESTAMP - 1,
+        txs=[],
+    )
+
+    if exceeds_limit_at_fork:
+        at_fork_block = Block(
+            timestamp=FORK_TIMESTAMP,
+            txs=[],
+            exception=BlockException.BLOCK_ACCESS_LIST_GAS_LIMIT_EXCEEDED,
+        )
+        block_gas_limit = over_budget_gas_limit
+    else:
+        at_fork_block = Block(
+            timestamp=FORK_TIMESTAMP,
+            txs=[],
+        )
+        block_gas_limit = min_gas_limit
+
+    blockchain_test(
+        pre=pre,
+        post={},
+        blocks=[pre_fork_block, at_fork_block],
+        genesis_environment=Environment(gas_limit=block_gas_limit),
+    )
diff --git a/tests/amsterdam/eip7954_increase_max_contract_size/__init__.py b/tests/amsterdam/eip7954_increase_max_contract_size/__init__.py
new file mode 100644
index 00000000000..7ea8f8276b3
--- /dev/null
+++ b/tests/amsterdam/eip7954_increase_max_contract_size/__init__.py
@@ -0,0 +1 @@
+"""Tests for [EIP-7954: Increase Maximum Contract Size](https://eips.ethereum.org/EIPS/eip-7954)."""
diff --git a/tests/amsterdam/eip7954_increase_max_contract_size/conftest.py b/tests/amsterdam/eip7954_increase_max_contract_size/conftest.py
new file mode 100644
index 00000000000..78cb66ed14d
--- /dev/null
+++ b/tests/amsterdam/eip7954_increase_max_contract_size/conftest.py
@@ -0,0 +1,28 @@
+"""Fixtures for the EIP-7954 max contract size tests."""
+
+import pytest
+from execution_testing import Address, Alloc, Bytecode, Fork, Op
+
+
+@pytest.fixture
+def max_code_size_contract(
+    pre: Alloc,
+    fork: Fork,
+) -> tuple[Address, Bytecode]:
+    """
+    Deploy a max-size self-checking contract deterministically.
+
+    The contract uses its own ADDRESS to query EXTCODESIZE, EXTCODEHASH,
+    and EXTCODECOPY on itself, storing results in storage slots 0-2.
+    Padded with JUMPDESTs to reach the fork's max code size.
+    """
+    logic = (
+        Op.SSTORE(0, Op.EXTCODESIZE(Op.ADDRESS))
+        + Op.SSTORE(1, Op.EXTCODEHASH(Op.ADDRESS))
+        + Op.EXTCODECOPY(Op.ADDRESS, 0, 0, Op.EXTCODESIZE(Op.ADDRESS))
+        + Op.SSTORE(2, Op.SHA3(0, Op.EXTCODESIZE(Op.ADDRESS)))
+        + Op.STOP
+    )
+    target_code = logic + Op.JUMPDEST * (fork.max_code_size() - len(logic))
+    target = pre.deterministic_deploy_contract(deploy_code=target_code)
+    return target, target_code
diff --git a/tests/amsterdam/eip7954_increase_max_contract_size/spec.py b/tests/amsterdam/eip7954_increase_max_contract_size/spec.py
new file mode 100644
index 00000000000..7dac2d83625
--- /dev/null
+++ b/tests/amsterdam/eip7954_increase_max_contract_size/spec.py
@@ -0,0 +1,17 @@
+"""Reference spec for [EIP-7954: Increase Maximum Contract Size](https://eips.ethereum.org/EIPS/eip-7954)."""
+
+from dataclasses import dataclass
+
+
+@dataclass(frozen=True)
+class ReferenceSpec:
+    """Reference specification."""
+
+    git_path: str
+    version: str
+
+
+ref_spec_7954 = ReferenceSpec(
+    git_path="EIPS/eip-7954.md",
+    version="b1f5bf8f70ba9306400f5e13313f781c35acc860",
+)
diff --git a/tests/amsterdam/eip7954_increase_max_contract_size/test_cases.md b/tests/amsterdam/eip7954_increase_max_contract_size/test_cases.md
new file mode 100644
index 00000000000..68d665d0c82
--- /dev/null
+++ b/tests/amsterdam/eip7954_increase_max_contract_size/test_cases.md
@@ -0,0 +1,23 @@
+# EIP-7954 Increase Maximum Contract Size Test Cases
+
+| Function Name | Goal | Setup | Expectation | Status |
+|---------------|------|-------|-------------|--------|
+| `test_max_code_size` | Enforce new `MAX_CODE_SIZE` boundary for contract creation transactions | Alice deploys contracts with runtime code at the new max and one byte over. | New max: contract deployed. Over max: deployment fails. | ✅ Completed |
+| `test_max_code_size_via_create` | Enforce new `MAX_CODE_SIZE` boundary via CREATE/CREATE2 opcodes | Same as above but deployment is done through a factory contract using CREATE and CREATE2. | New max: child contract deployed. Over max: child contract does not exist. | ✅ Completed |
+| `test_max_initcode_size` | Enforce new `MAX_INITCODE_SIZE` boundary for contract creation transactions | Alice sends creation transactions with initcode at the new max and one byte over. | New max: transaction accepted, contract deployed. Over max: transaction rejected. | ✅ Completed |
+| `test_max_initcode_size_via_create` | Enforce new `MAX_INITCODE_SIZE` boundary via CREATE/CREATE2 opcodes | Same as above but initcode is passed through a factory contract using CREATE and CREATE2. | New max: child contract deployed. Over max: CREATE returns 0, child contract does not exist. | ✅ Completed |
+| `test_max_initcode_size_gas_metering` | Verify initcode gas metering at the new max (transaction level) | Alice sends a creation transaction with max-size initcode. Gas limit set to exact intrinsic cost, then one short. | Exact gas: contract deployed. One short: transaction rejected. | ✅ Completed |
+| `test_max_initcode_size_gas_metering_via_create` | Verify initcode gas metering at the new max (opcode level) | Caller forwards computed exact gas to a factory that runs CREATE with max-size initcode. Tested with exact gas and one short. | Exact gas: CREATE succeeds, contract deployed. One short: factory runs out of gas. | ✅ Completed |
+| `test_max_code_size_deposit_gas` | Verify code deposit gas is charged correctly at the new max | Alice deploys a contract with exactly `MAX_CODE_SIZE` bytes. Gas set to exact deposit cost, then one short. | Exact gas: contract deployed. One short: deployment fails (out of gas during code deposit). | ✅ Completed |
+| `test_max_code_size_external_opcodes` | Verify external code opcodes work with max-size contracts | Deterministically pre-deploy a max-size self-checking contract. Call it to run EXTCODESIZE, EXTCODEHASH, and EXTCODECOPY on itself via ADDRESS. | Each opcode returns the correct value for the max-size contract. | ✅ Completed |
+| `test_max_code_size_self_opcodes` | Verify self code opcodes work with max-size contracts | Pre-deploy a max-size contract with CODESIZE and CODECOPY checker logic. Call via DELEGATECALL so opcodes operate on the large contract's own code. | CODESIZE returns the correct length, CODECOPY produces the correct hash. | ✅ Completed |
+| `test_max_code_size_with_max_initcode` | Deploy max-size code when initcode is also at max size | Alice deploys a contract with `MAX_CODE_SIZE` bytes of runtime code using initcode padded to `MAX_INITCODE_SIZE`. | Contract deployed with the full max-size runtime code. | ✅ Completed |
+| `test_max_code_size_fork_transition` | New `MAX_CODE_SIZE` activates exactly at the fork boundary | Before the fork, deploy a contract with the new `MAX_CODE_SIZE` bytes of runtime code. After the fork, attempt the same deployment. | Pre-fork: deployment fails (exceeds old limit). Post-fork: deployment succeeds. | ✅ Completed |
+| `test_max_code_size_via_create_fork_transition` | New `MAX_CODE_SIZE` activates at the fork boundary via CREATE/CREATE2 opcodes | Same as above but deployment is done through a factory contract using CREATE and CREATE2. | Pre-fork: child contract does not exist. Post-fork: child contract deployed. | ✅ Completed |
+| `test_max_initcode_size_fork_transition` | New `MAX_INITCODE_SIZE` activates exactly at the fork boundary for transactions | Before the fork, send a creation transaction with the new `MAX_INITCODE_SIZE` bytes of initcode. After the fork, send the same transaction. | Pre-fork: block rejected (initcode exceeds old limit). Post-fork: transaction accepted, contract deployed. | ✅ Completed |
+| `test_max_initcode_size_via_create_fork_transition` | New `MAX_INITCODE_SIZE` activates at the fork boundary via CREATE/CREATE2 opcodes | Same as above but initcode is passed through a factory contract using CREATE and CREATE2. | Pre-fork: CREATE fails (initcode exceeds old limit). Post-fork: child contract deployed. | ✅ Completed |
+| `test_max_code_size_with_max_initcode_fork_transition` | Both new limits activate together at the fork boundary | Before the fork, deploy max code with max initcode. After the fork, attempt the same deployment. | Pre-fork: block rejected (initcode exceeds old limit). Post-fork: contract deployed with max-size runtime code. | ✅ Completed |
+| `test_parent_max_code_size_across_fork` | Old `MAX_CODE_SIZE` still works on both sides of the transition | Before and after the fork, deploy a contract with the old `MAX_CODE_SIZE` bytes of runtime code. | Both deployments succeed. The old limit remains valid after the fork. | ✅ Completed |
+| `test_over_max_code_size_mainnet` | Deploying above the new limit fails on mainnet | Alice deploys a contract with `MAX_CODE_SIZE + 1` bytes of runtime code. | Contract does not exist (deployment fails during code deposit). | ✅ Completed |
+| `test_over_max_initcode_size_mainnet` | Oversized initcode creation is rejected on mainnet | Alice sends a creation transaction with `MAX_INITCODE_SIZE + 1` bytes of initcode. | Transaction rejected. No contract deployed. | ✅ Completed |
+| `test_max_code_size_with_max_initcode_mainnet` | Verify opcodes on a max-size contract on mainnet | Call the deterministic max-size self-checking contract. It queries EXTCODESIZE, EXTCODEHASH, and EXTCODECOPY on itself via ADDRESS. | Each opcode returns the correct value for the max-size contract. | ✅ Completed |
diff --git a/tests/amsterdam/eip7954_increase_max_contract_size/test_eip_mainnet.py b/tests/amsterdam/eip7954_increase_max_contract_size/test_eip_mainnet.py
new file mode 100644
index 00000000000..7d0ff0e0a36
--- /dev/null
+++ b/tests/amsterdam/eip7954_increase_max_contract_size/test_eip_mainnet.py
@@ -0,0 +1,119 @@
+"""
+Mainnet tests for
+[EIP-7954: Increase Maximum Contract Size](https://eips.ethereum.org/EIPS/eip-7954).
+"""
+
+from typing import Any
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Fork,
+    Initcode,
+    Op,
+    StateTestFiller,
+    Transaction,
+    TransactionException,
+    compute_create_address,
+    keccak256,
+)
+
+from .spec import ref_spec_7954
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7954.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7954.version
+
+pytestmark = [pytest.mark.valid_at("EIP7954"), pytest.mark.mainnet]
+
+
+def test_over_max_code_size_mainnet(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+) -> None:
+    """Verify deployment above the new limit is rejected on mainnet."""
+    deploy_code = Op.JUMPDEST * (fork.max_code_size() + 1)
+    initcode = Initcode(deploy_code=deploy_code)
+
+    alice = pre.fund_eoa()
+    create_address = compute_create_address(address=alice, nonce=0)
+
+    tx = Transaction(
+        sender=alice,
+        to=None,
+        data=initcode,
+        gas_limit=fork.transaction_gas_limit_cap(),
+    )
+
+    post: dict[Any, Account | None] = {
+        create_address: Account.NONEXISTENT,
+    }
+
+    state_test(pre=pre, tx=tx, post=post)
+
+
+@pytest.mark.exception_test
+def test_over_max_initcode_size_mainnet(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+) -> None:
+    """Verify a CREATE transaction over the new initcode limit is rejected."""
+    initcode = Initcode(
+        deploy_code=Op.STOP,
+        initcode_length=fork.max_initcode_size() + 1,
+    )
+
+    alice = pre.fund_eoa()
+    create_address = compute_create_address(address=alice, nonce=0)
+
+    tx = Transaction(
+        sender=alice,
+        to=None,
+        data=initcode,
+        gas_limit=fork.transaction_gas_limit_cap(),
+        error=TransactionException.INITCODE_SIZE_EXCEEDED,
+    )
+
+    post: dict[Any, Account | None] = {
+        create_address: Account.NONEXISTENT,
+    }
+
+    state_test(pre=pre, tx=tx, post=post)
+
+
+def test_max_code_size_with_max_initcode_mainnet(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    max_code_size_contract: tuple,
+) -> None:
+    """
+    Verify max-size contract works on mainnet.
+
+    Calls the deterministic max-size contract which checks EXTCODESIZE,
+    EXTCODEHASH, and EXTCODECOPY on itself. The contract bytecode is
+    the same used for deployment tests, padded to max code size.
+    """
+    target, target_code = max_code_size_contract
+
+    alice = pre.fund_eoa()
+
+    tx = Transaction(
+        sender=alice,
+        to=target,
+        gas_limit=fork.transaction_gas_limit_cap(),
+    )
+
+    post = {
+        target: Account(
+            storage={
+                0: len(target_code),
+                1: keccak256(bytes(target_code)),
+                2: keccak256(bytes(target_code)),
+            }
+        )
+    }
+
+    state_test(pre=pre, tx=tx, post=post)
diff --git a/tests/amsterdam/eip7954_increase_max_contract_size/test_fork_transition.py b/tests/amsterdam/eip7954_increase_max_contract_size/test_fork_transition.py
new file mode 100644
index 00000000000..4000ed7df4a
--- /dev/null
+++ b/tests/amsterdam/eip7954_increase_max_contract_size/test_fork_transition.py
@@ -0,0 +1,410 @@
+"""
+Fork transition tests for
+[EIP-7954: Increase Maximum Contract Size](https://eips.ethereum.org/EIPS/eip-7954).
+
+Tests that the new max code size and initcode size limits activate
+exactly at the EIP7954 fork boundary (timestamp 15,000).
+"""
+
+from typing import Any
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Block,
+    BlockchainTestFiller,
+    Initcode,
+    Op,
+    Transaction,
+    TransactionException,
+    TransitionFork,
+    compute_create_address,
+)
+
+from .spec import ref_spec_7954
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7954.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7954.version
+
+pytestmark = pytest.mark.valid_at_transition_to("EIP7954")
+
+CREATE2_SALT = 0xC0FFEE
+
+
+def test_max_code_size_fork_transition(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: TransitionFork,
+) -> None:
+    """Ensure the new max code size limit activates at the fork boundary."""
+    code_size = fork.transitions_to().max_code_size()
+    deploy_code = Op.JUMPDEST * code_size
+    initcode = Initcode(deploy_code=deploy_code)
+
+    alice = pre.fund_eoa()
+    bob = pre.fund_eoa()
+
+    create_address_pre = compute_create_address(address=alice, nonce=0)
+    create_address_post = compute_create_address(address=bob, nonce=0)
+
+    blocks = [
+        Block(
+            timestamp=14_999,
+            txs=[
+                Transaction(
+                    sender=alice,
+                    to=None,
+                    data=initcode,
+                    gas_limit=fork.transitions_from().transaction_gas_limit_cap(),
+                )
+            ],
+        ),
+        Block(
+            timestamp=15_000,
+            txs=[
+                Transaction(
+                    sender=bob,
+                    to=None,
+                    data=initcode,
+                    gas_limit=fork.transitions_to().transaction_gas_limit_cap(),
+                )
+            ],
+        ),
+    ]
+
+    post: dict[Any, Account | None] = {
+        create_address_pre: Account.NONEXISTENT,
+        create_address_post: Account(code=deploy_code),
+    }
+
+    blockchain_test(pre=pre, blocks=blocks, post=post)
+
+
+@pytest.mark.parametrize("create_opcode", [Op.CREATE, Op.CREATE2])
+def test_max_code_size_via_create_fork_transition(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: TransitionFork,
+    create_opcode: Op,
+) -> None:
+    """Ensure the new max code size limit activates at the fork via opcodes."""
+    code_size = fork.transitions_to().max_code_size()
+    deploy_code = Op.JUMPDEST * code_size
+    initcode = Initcode(deploy_code=deploy_code)
+    initcode_bytes = bytes(initcode)
+
+    alice = pre.fund_eoa()
+    bob = pre.fund_eoa()
+
+    create_call = (
+        create_opcode(
+            value=0, offset=0, size=Op.CALLDATASIZE, salt=CREATE2_SALT
+        )
+        if create_opcode == Op.CREATE2
+        else create_opcode(value=0, offset=0, size=Op.CALLDATASIZE)
+    )
+
+    factory_code = (
+        Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
+        + Op.SSTORE(0, create_call)
+        + Op.STOP
+    )
+
+    factory_pre = pre.deploy_contract(factory_code)
+    factory_post = pre.deploy_contract(factory_code)
+
+    create_address_pre = compute_create_address(
+        address=factory_pre,
+        nonce=1,
+        salt=CREATE2_SALT,
+        initcode=initcode,
+        opcode=create_opcode,
+    )
+    create_address_post = compute_create_address(
+        address=factory_post,
+        nonce=1,
+        salt=CREATE2_SALT,
+        initcode=initcode,
+        opcode=create_opcode,
+    )
+
+    blocks = [
+        Block(
+            timestamp=14_999,
+            txs=[
+                Transaction(
+                    sender=alice,
+                    to=factory_pre,
+                    data=initcode_bytes,
+                    gas_limit=fork.transitions_from().transaction_gas_limit_cap(),
+                )
+            ],
+        ),
+        Block(
+            timestamp=15_000,
+            txs=[
+                Transaction(
+                    sender=bob,
+                    to=factory_post,
+                    data=initcode_bytes,
+                    gas_limit=fork.transitions_to().transaction_gas_limit_cap(),
+                )
+            ],
+        ),
+    ]
+
+    post: dict[Any, Account | None] = {
+        create_address_pre: Account.NONEXISTENT,
+        create_address_post: Account(code=deploy_code),
+    }
+
+    blockchain_test(pre=pre, blocks=blocks, post=post)
+
+
+@pytest.mark.exception_test
+def test_max_initcode_size_fork_transition(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: TransitionFork,
+) -> None:
+    """Ensure the new max initcode size limit activates exactly at the fork."""
+    initcode = Initcode(
+        deploy_code=Op.STOP,
+        initcode_length=fork.transitions_to().max_initcode_size(),
+    )
+
+    alice = pre.fund_eoa()
+    bob = pre.fund_eoa()
+
+    create_address_post = compute_create_address(address=bob, nonce=0)
+
+    initcode_too_large = TransactionException.INITCODE_SIZE_EXCEEDED
+
+    blocks = [
+        # Pre-fork: initcode at the new max exceeds the parent fork's limit,
+        # so the tx is rejected and the block is invalid.
+        Block(
+            timestamp=14_999,
+            txs=[
+                Transaction(
+                    sender=alice,
+                    to=None,
+                    data=initcode,
+                    gas_limit=fork.transitions_from().transaction_gas_limit_cap(),
+                    error=initcode_too_large,
+                )
+            ],
+            exception=initcode_too_large,
+        ),
+        # Post-fork: the new limit is in effect, tx succeeds.
+        Block(
+            timestamp=15_000,
+            txs=[
+                Transaction(
+                    sender=bob,
+                    to=None,
+                    data=initcode,
+                    gas_limit=fork.transitions_to().transaction_gas_limit_cap(),
+                )
+            ],
+        ),
+    ]
+
+    post: dict[Any, Account | None] = {
+        create_address_post: Account(code=Op.STOP),
+    }
+
+    blockchain_test(pre=pre, blocks=blocks, post=post)
+
+
+@pytest.mark.parametrize("create_opcode", [Op.CREATE, Op.CREATE2])
+def test_max_initcode_size_via_create_fork_transition(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: TransitionFork,
+    create_opcode: Op,
+) -> None:
+    """Ensure the new max initcode size limit activates at fork via opcodes."""
+    initcode = Initcode(
+        deploy_code=Op.STOP,
+        initcode_length=fork.transitions_to().max_initcode_size(),
+    )
+    initcode_bytes = bytes(initcode)
+
+    alice = pre.fund_eoa()
+    bob = pre.fund_eoa()
+
+    create_call = (
+        create_opcode(
+            value=0, offset=0, size=Op.CALLDATASIZE, salt=CREATE2_SALT
+        )
+        if create_opcode == Op.CREATE2
+        else create_opcode(value=0, offset=0, size=Op.CALLDATASIZE)
+    )
+
+    factory_code = (
+        Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
+        + Op.SSTORE(0, create_call)
+        + Op.STOP
+    )
+
+    factory_pre = pre.deploy_contract(factory_code)
+    factory_post = pre.deploy_contract(factory_code)
+
+    create_address_pre = compute_create_address(
+        address=factory_pre,
+        nonce=1,
+        salt=CREATE2_SALT,
+        initcode=initcode,
+        opcode=create_opcode,
+    )
+    create_address_post = compute_create_address(
+        address=factory_post,
+        nonce=1,
+        salt=CREATE2_SALT,
+        initcode=initcode,
+        opcode=create_opcode,
+    )
+
+    blocks = [
+        Block(
+            timestamp=14_999,
+            txs=[
+                Transaction(
+                    sender=alice,
+                    to=factory_pre,
+                    data=initcode_bytes,
+                    gas_limit=fork.transitions_from().transaction_gas_limit_cap(),
+                )
+            ],
+        ),
+        Block(
+            timestamp=15_000,
+            txs=[
+                Transaction(
+                    sender=bob,
+                    to=factory_post,
+                    data=initcode_bytes,
+                    gas_limit=fork.transitions_to().transaction_gas_limit_cap(),
+                )
+            ],
+        ),
+    ]
+
+    # Pre-fork: CREATE returns 0 (initcode exceeds parent fork limit)
+    # Post-fork: CREATE succeeds
+    post: dict[Any, Account | None] = {
+        factory_pre: Account(storage={0: 0}),
+        create_address_pre: Account.NONEXISTENT,
+        factory_post: Account(storage={0: create_address_post}),
+        create_address_post: Account(code=Op.STOP),
+    }
+
+    blockchain_test(pre=pre, blocks=blocks, post=post)
+
+
+@pytest.mark.exception_test
+def test_max_code_size_with_max_initcode_fork_transition(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: TransitionFork,
+) -> None:
+    """Ensure max code + max initcode activates at the fork boundary."""
+    deploy_code = Op.JUMPDEST * fork.transitions_to().max_code_size()
+    initcode = Initcode(
+        deploy_code=deploy_code,
+        initcode_length=fork.transitions_to().max_initcode_size(),
+    )
+
+    alice = pre.fund_eoa()
+    bob = pre.fund_eoa()
+
+    create_address_post = compute_create_address(address=bob, nonce=0)
+
+    initcode_too_large = TransactionException.INITCODE_SIZE_EXCEEDED
+
+    blocks = [
+        Block(
+            timestamp=14_999,
+            txs=[
+                Transaction(
+                    sender=alice,
+                    to=None,
+                    data=initcode,
+                    gas_limit=fork.transitions_from().transaction_gas_limit_cap(),
+                    error=initcode_too_large,
+                )
+            ],
+            exception=initcode_too_large,
+        ),
+        Block(
+            timestamp=15_000,
+            txs=[
+                Transaction(
+                    sender=bob,
+                    to=None,
+                    data=initcode,
+                    gas_limit=fork.transitions_to().transaction_gas_limit_cap(),
+                )
+            ],
+        ),
+    ]
+
+    post: dict[Any, Account | None] = {
+        create_address_post: Account(code=deploy_code),
+    }
+
+    blockchain_test(pre=pre, blocks=blocks, post=post)
+
+
+def test_parent_max_code_size_across_fork(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: TransitionFork,
+) -> None:
+    """Ensure previous max code size works after transition."""
+    parent = fork.transitions_from()
+    assert parent is not None, "Parent fork must be defined for this test"
+
+    code_size = parent.max_code_size()
+    deploy_code = Op.JUMPDEST * code_size
+    initcode = Initcode(deploy_code=deploy_code)
+
+    alice = pre.fund_eoa()
+    bob = pre.fund_eoa()
+
+    create_address_pre = compute_create_address(address=alice, nonce=0)
+    create_address_post = compute_create_address(address=bob, nonce=0)
+
+    blocks = [
+        Block(
+            timestamp=14_999,
+            txs=[
+                Transaction(
+                    sender=alice,
+                    to=None,
+                    data=initcode,
+                    gas_limit=fork.transitions_from().transaction_gas_limit_cap(),
+                )
+            ],
+        ),
+        Block(
+            timestamp=15_000,
+            txs=[
+                Transaction(
+                    sender=bob,
+                    to=None,
+                    data=initcode,
+                    gas_limit=fork.transitions_to().transaction_gas_limit_cap(),
+                )
+            ],
+        ),
+    ]
+
+    post: dict[Any, Account | None] = {
+        create_address_pre: Account(code=deploy_code),
+        create_address_post: Account(code=deploy_code),
+    }
+
+    blockchain_test(pre=pre, blocks=blocks, post=post)
diff --git a/tests/amsterdam/eip7954_increase_max_contract_size/test_max_code_size.py b/tests/amsterdam/eip7954_increase_max_contract_size/test_max_code_size.py
new file mode 100644
index 00000000000..85ed98451c9
--- /dev/null
+++ b/tests/amsterdam/eip7954_increase_max_contract_size/test_max_code_size.py
@@ -0,0 +1,354 @@
+"""
+Test [EIP-7954: Increase Maximum Contract Size](https://eips.ethereum.org/EIPS/eip-7954).
+"""
+
+from typing import Any, Callable
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    CodeGasMeasure,
+    Fork,
+    Initcode,
+    Op,
+    StateTestFiller,
+    Transaction,
+    compute_create_address,
+    keccak256,
+)
+
+from .spec import ref_spec_7954
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7954.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7954.version
+
+pytestmark = pytest.mark.valid_from("EIP7954")
+
+CREATE2_SALT = 0xC0FFEE
+
+DEPLOY_CODE_SIZE_PARAMS = [
+    pytest.param(lambda f: f.max_code_size(), id="at_max"),
+    pytest.param(lambda f: f.max_code_size() + 1, id="over_max"),
+]
+
+
+@pytest.mark.parametrize("deploy_code_size", DEPLOY_CODE_SIZE_PARAMS)
+def test_max_code_size(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    deploy_code_size: Callable[[Fork], int],
+) -> None:
+    """Ensure the new max code size boundary is enforced."""
+    code_size = deploy_code_size(fork)
+    deploy_code = Op.JUMPDEST * code_size
+
+    alice = pre.fund_eoa()
+    initcode = Initcode(deploy_code=deploy_code)
+    create_address = compute_create_address(address=alice, nonce=0)
+
+    tx = Transaction(
+        sender=alice,
+        to=None,
+        data=initcode,
+        gas_limit=fork.transaction_gas_limit_cap(),
+    )
+
+    post: dict[Any, Account | None] = {}
+    if code_size <= fork.max_code_size():
+        post[create_address] = Account(code=deploy_code)
+    else:
+        post[create_address] = Account.NONEXISTENT
+
+    state_test(pre=pre, tx=tx, post=post)
+
+
+@pytest.mark.parametrize("deploy_code_size", DEPLOY_CODE_SIZE_PARAMS)
+@pytest.mark.with_all_create_opcodes()
+def test_max_code_size_via_create(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    deploy_code_size: Callable[[Fork], int],
+    create_opcode: Op,
+) -> None:
+    """Ensure the new max code size boundary is enforced via create opcodes."""
+    code_size = deploy_code_size(fork)
+    deploy_code = Op.JUMPDEST * code_size
+    initcode = Initcode(deploy_code=deploy_code)
+    initcode_bytes = bytes(initcode)
+
+    alice = pre.fund_eoa()
+
+    create_call = (
+        create_opcode(
+            value=0, offset=0, size=Op.CALLDATASIZE, salt=CREATE2_SALT
+        )
+        if create_opcode == Op.CREATE2
+        else create_opcode(value=0, offset=0, size=Op.CALLDATASIZE)
+    )
+
+    factory_code = (
+        Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
+        + Op.SSTORE(0, create_call)
+        + Op.STOP
+    )
+
+    factory = pre.deploy_contract(factory_code)
+
+    create_address = compute_create_address(
+        address=factory,
+        nonce=1,
+        salt=CREATE2_SALT,
+        initcode=initcode,
+        opcode=create_opcode,
+    )
+
+    tx = Transaction(
+        sender=alice,
+        to=factory,
+        data=initcode_bytes,
+        gas_limit=fork.transaction_gas_limit_cap(),
+    )
+
+    created = code_size <= fork.max_code_size()
+    post: dict[Any, Account | None] = {
+        factory: Account(storage={0: create_address if created else 0}),
+    }
+    if created:
+        post[create_address] = Account(code=deploy_code)
+    else:
+        post[create_address] = Account.NONEXISTENT
+
+    state_test(pre=pre, tx=tx, post=post)
+
+
+@pytest.mark.parametrize(
+    "gas_shortfall",
+    [
+        pytest.param(0, id="exact_gas"),
+        pytest.param(1, id="short_one_gas"),
+    ],
+)
+def test_max_code_size_deposit_gas(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_shortfall: int,
+) -> None:
+    """Ensure code deposit gas is charged correctly at the new max."""
+    deploy_code = Op.JUMPDEST * fork.max_code_size()
+    initcode = Initcode(deploy_code=deploy_code)
+
+    alice = pre.fund_eoa()
+    create_address = compute_create_address(address=alice, nonce=0)
+
+    intrinsic_gas = fork.transaction_intrinsic_cost_calculator()(
+        calldata=initcode,
+        contract_creation=True,
+        return_cost_deducted_prior_execution=True,
+    )
+
+    tx = Transaction(
+        sender=alice,
+        to=None,
+        data=initcode,
+        gas_limit=(
+            intrinsic_gas
+            + initcode.execution_gas(fork)
+            + initcode.deployment_gas(fork)
+            - gas_shortfall
+        ),
+    )
+    # With shortfall, code deposit OOGs: tx succeeds but
+    # contract is not deployed
+    post = {
+        create_address: Account(code=deploy_code)
+        if not gas_shortfall
+        else Account.NONEXISTENT,
+    }
+
+    state_test(pre=pre, tx=tx, post=post)
+
+
+def test_max_code_size_with_max_initcode(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+) -> None:
+    """Ensure max-size code deploys when initcode is also at max size."""
+    deploy_code = Op.JUMPDEST * fork.max_code_size()
+    initcode = Initcode(
+        deploy_code=deploy_code,
+        initcode_length=fork.max_initcode_size(),
+    )
+
+    alice = pre.fund_eoa()
+    create_address = compute_create_address(address=alice, nonce=0)
+
+    tx = Transaction(
+        sender=alice,
+        to=None,
+        data=initcode,
+        gas_limit=fork.transaction_gas_limit_cap(),
+    )
+
+    post = {create_address: Account(code=deploy_code)}
+
+    state_test(pre=pre, tx=tx, post=post)
+
+
+def test_max_code_size_external_opcodes(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    max_code_size_contract: tuple,
+) -> None:
+    """Ensure external code opcodes work with the new max contract size."""
+    target, target_code = max_code_size_contract
+
+    alice = pre.fund_eoa()
+
+    tx = Transaction(
+        sender=alice,
+        to=target,
+        gas_limit=fork.transaction_gas_limit_cap(),
+    )
+
+    post = {
+        target: Account(
+            storage={
+                0: len(target_code),
+                1: keccak256(bytes(target_code)),
+                2: keccak256(bytes(target_code)),
+            }
+        )
+    }
+
+    state_test(pre=pre, tx=tx, post=post)
+
+
+def test_max_code_size_self_opcodes(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+) -> None:
+    """
+    Ensure self code opcodes work with the new max contract size.
+
+    Tested via DELEGATECALL so opcodes operate on the large
+    contract's own code while writing results to the caller's
+    storage.
+    """
+    logic = (
+        Op.SSTORE(0, Op.CODESIZE)
+        + Op.CODECOPY(0, 0, Op.CODESIZE)
+        + Op.SSTORE(1, Op.SHA3(0, Op.CODESIZE))
+        + Op.STOP
+    )
+    target_code = logic + Op.JUMPDEST * (fork.max_code_size() - len(logic))
+    target = pre.deterministic_deploy_contract(deploy_code=target_code)
+
+    alice = pre.fund_eoa()
+    oracle = pre.deploy_contract(
+        code=Op.DELEGATECALL(gas=Op.GAS, address=target)
+    )
+
+    tx = Transaction(
+        sender=alice,
+        to=oracle,
+        gas_limit=fork.transaction_gas_limit_cap(),
+    )
+
+    post = {
+        oracle: Account(
+            storage={
+                0: len(target_code),
+                1: keccak256(bytes(target_code)),
+            }
+        )
+    }
+
+    state_test(pre=pre, tx=tx, post=post)
+
+
+@pytest.mark.parametrize(
+    "create_opcode",
+    [
+        pytest.param(Op.CREATE, id="CREATE"),
+        pytest.param(Op.CREATE2, id="CREATE2"),
+    ],
+)
+def test_warm_after_failed_create_over_max_code_size(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    create_opcode: Op,
+) -> None:
+    """
+    Verify the would-be contract address is warm after a CREATE that fails
+    because the returned deploy code exceeds max_code_size.
+
+    Unlike pre-validation aborts (insufficient balance, nonce overflow), the
+    address is added to the access list during initcode execution, so the
+    post-RETURN size check rejecting deployment must leave the address warm.
+    """
+    initcode = Op.RETURN(offset=0, size=fork.max_code_size() + 1)
+    initcode_bytes = bytes(initcode)
+    if create_opcode == Op.CREATE2:
+        salt = CREATE2_SALT
+        create_call = create_opcode(
+            value=0,
+            offset=0,
+            size=len(initcode_bytes),
+            salt=salt,
+        )
+    else:
+        salt = 0
+        create_call = create_opcode(
+            value=0, offset=0, size=len(initcode_bytes)
+        )
+
+    creator_code = Op.MSTORE(
+        0, Op.PUSH32(initcode_bytes.ljust(32, b"\0"))
+    ) + Op.SSTORE(0, create_call)
+
+    creator_address = pre.deploy_contract(creator_code, storage={0: 1})
+
+    contract_address = compute_create_address(
+        address=creator_address,
+        nonce=1,
+        salt=salt,
+        initcode=initcode_bytes,
+        opcode=create_opcode,
+    )
+
+    warm_balance = Op.BALANCE(contract_address, address_warm=True)
+    checker_address = pre.deploy_contract(
+        CodeGasMeasure(
+            code=warm_balance,
+            extra_stack_items=1,
+            sstore_key=1,
+        )
+    )
+
+    entry_address = pre.deploy_contract(
+        Op.CALL(gas=Op.GAS, address=creator_address)
+        + Op.CALL(gas=Op.GAS, address=checker_address)
+        + Op.STOP
+    )
+
+    tx = Transaction(
+        to=entry_address,
+        gas_limit=fork.transaction_gas_limit_cap(),
+        sender=pre.fund_eoa(),
+    )
+
+    post = {
+        creator_address: Account(storage={0: 0}),
+        checker_address: Account(storage={1: warm_balance.gas_cost(fork)}),
+        contract_address: Account.NONEXISTENT,
+    }
+
+    state_test(pre=pre, tx=tx, post=post)
diff --git a/tests/amsterdam/eip7954_increase_max_contract_size/test_max_initcode_size.py b/tests/amsterdam/eip7954_increase_max_contract_size/test_max_initcode_size.py
new file mode 100644
index 00000000000..f3a469c43a5
--- /dev/null
+++ b/tests/amsterdam/eip7954_increase_max_contract_size/test_max_initcode_size.py
@@ -0,0 +1,187 @@
+"""
+Test [EIP-7954: Increase Maximum Contract Size](https://eips.ethereum.org/EIPS/eip-7954).
+
+Tests for the increased maximum initcode size (64 KiB).
+"""
+
+from typing import Any, Callable
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Fork,
+    Initcode,
+    Op,
+    StateTestFiller,
+    Transaction,
+    TransactionException,
+    compute_create_address,
+)
+
+from .spec import ref_spec_7954
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7954.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7954.version
+
+pytestmark = pytest.mark.valid_from("EIP7954")
+
+CREATE2_SALT = 0xC0FFEE
+
+INITCODE_SIZE_PARAMS = [
+    pytest.param(lambda f: f.max_initcode_size(), id="at_max"),
+    pytest.param(lambda f: f.max_initcode_size() + 1, id="over_max"),
+]
+
+TX_INITCODE_SIZE_PARAMS = [
+    pytest.param(lambda f: f.max_initcode_size(), id="at_max"),
+    pytest.param(
+        lambda f: f.max_initcode_size() + 1,
+        id="over_max",
+        marks=pytest.mark.exception_test,
+    ),
+]
+
+
+@pytest.mark.parametrize("initcode_size", TX_INITCODE_SIZE_PARAMS)
+def test_max_initcode_size(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    initcode_size: Callable[[Fork], int],
+) -> None:
+    """Ensure the new max initcode size is enforced for transactions."""
+    size = initcode_size(fork)
+    initcode = Initcode(
+        deploy_code=Op.STOP,
+        initcode_length=size,
+    )
+
+    alice = pre.fund_eoa()
+    create_address = compute_create_address(address=alice, nonce=0)
+
+    tx = Transaction(
+        sender=alice,
+        to=None,
+        data=initcode,
+        gas_limit=fork.transaction_gas_limit_cap(),
+    )
+
+    post: dict[Any, Account | None] = {}
+    if size <= fork.max_initcode_size():
+        post[create_address] = Account(code=Op.STOP)
+    else:
+        tx.error = TransactionException.INITCODE_SIZE_EXCEEDED
+        post[create_address] = Account.NONEXISTENT
+
+    state_test(pre=pre, tx=tx, post=post)
+
+
+@pytest.mark.parametrize("initcode_size", INITCODE_SIZE_PARAMS)
+@pytest.mark.with_all_create_opcodes()
+def test_max_initcode_size_via_create(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    initcode_size: Callable[[Fork], int],
+    create_opcode: Op,
+) -> None:
+    """Ensure the new max initcode size is enforced via create opcodes."""
+    size = initcode_size(fork)
+    initcode = Initcode(
+        deploy_code=Op.STOP,
+        initcode_length=size,
+    )
+    initcode_bytes = bytes(initcode)
+
+    alice = pre.fund_eoa()
+
+    create_call = (
+        create_opcode(
+            value=0, offset=0, size=Op.CALLDATASIZE, salt=CREATE2_SALT
+        )
+        if create_opcode == Op.CREATE2
+        else create_opcode(value=0, offset=0, size=Op.CALLDATASIZE)
+    )
+
+    factory_code = (
+        Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
+        + Op.SSTORE(0, create_call)
+        + Op.STOP
+    )
+
+    factory = pre.deploy_contract(factory_code)
+
+    create_address = compute_create_address(
+        address=factory,
+        nonce=1,
+        salt=CREATE2_SALT,
+        initcode=initcode,
+        opcode=create_opcode,
+    )
+
+    tx = Transaction(
+        sender=alice,
+        to=factory,
+        data=initcode_bytes,
+        gas_limit=fork.transaction_gas_limit_cap(),
+    )
+
+    # Opcode-level: oversized initcode causes OutOfGasError
+    # (tx succeeds, CREATE returns 0)
+    created = size <= fork.max_initcode_size()
+    post: dict[Any, Account | None] = {
+        factory: Account(storage={0: create_address if created else 0}),
+    }
+    if created:
+        post[create_address] = Account(code=Op.STOP)
+    else:
+        post[create_address] = Account.NONEXISTENT
+
+    state_test(pre=pre, tx=tx, post=post)
+
+
+@pytest.mark.parametrize(
+    "gas_shortfall",
+    [
+        pytest.param(0, id="exact_gas"),
+        pytest.param(
+            1,
+            id="short_one_gas",
+            marks=pytest.mark.exception_test,
+        ),
+    ],
+)
+def test_max_initcode_size_gas_metering(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_shortfall: int,
+) -> None:
+    """Verify initcode gas metering at the new max initcode size."""
+    initcode = Initcode(
+        deploy_code=Op.STOP, initcode_length=fork.max_initcode_size()
+    )
+    alice = pre.fund_eoa()
+
+    intrinsic_gas = fork.transaction_intrinsic_cost_calculator()(
+        calldata=initcode, contract_creation=True
+    )
+
+    tx = Transaction(
+        sender=alice,
+        to=None,
+        data=initcode,
+        gas_limit=intrinsic_gas - gas_shortfall,
+        error=TransactionException.INTRINSIC_GAS_TOO_LOW
+        if gas_shortfall
+        else None,
+    )
+
+    post = {
+        compute_create_address(address=alice, nonce=0): Account.NONEXISTENT
+        if gas_shortfall
+        else Account(code=Op.STOP),
+    }
+
+    state_test(pre=pre, tx=tx, post=post)
diff --git a/tests/amsterdam/eip7976_increase_calldata_floor_cost/__init__.py b/tests/amsterdam/eip7976_increase_calldata_floor_cost/__init__.py
new file mode 100644
index 00000000000..3eb2006603d
--- /dev/null
+++ b/tests/amsterdam/eip7976_increase_calldata_floor_cost/__init__.py
@@ -0,0 +1,3 @@
+"""
+Test [EIP-7976: Increase calldata floor cost](https://eips.ethereum.org/EIPS/eip-7976).
+"""
diff --git a/tests/amsterdam/eip7976_increase_calldata_floor_cost/conftest.py b/tests/amsterdam/eip7976_increase_calldata_floor_cost/conftest.py
new file mode 100644
index 00000000000..78de4e79df2
--- /dev/null
+++ b/tests/amsterdam/eip7976_increase_calldata_floor_cost/conftest.py
@@ -0,0 +1,362 @@
+"""Fixtures for the EIP-7976 tests."""
+
+from typing import List, Sequence
+
+import pytest
+from execution_testing import (
+    EOA,
+    AccessList,
+    Address,
+    Alloc,
+    AuthorizationTuple,
+    Bytecode,
+    Bytes,
+    Fork,
+    Hash,
+    Op,
+    Transaction,
+    TransactionException,
+    add_kzg_version,
+)
+
+from ...osaka.eip7594_peerdas.spec import Spec as EIP_7594_Spec
+from .helpers import DataTestType, find_floor_cost_threshold
+
+
+@pytest.fixture
+def to(
+    request: pytest.FixtureRequest,
+    pre: Alloc,
+) -> Address | None:
+    """Create the sender account."""
+    param = getattr(request, "param", Op.STOP)
+
+    if param is None:
+        return None
+    if isinstance(param, str) and param == "eoa":
+        return pre.fund_eoa(amount=0)
+    if isinstance(param, Bytecode):
+        return pre.deploy_contract(param)
+
+    raise ValueError(f"Invalid value for `to` fixture: {param}")
+
+
+@pytest.fixture
+def protected() -> bool:
+    """
+    Return whether the transaction is protected or not. Only valid for type-0
+    transactions.
+    """
+    return True
+
+
+@pytest.fixture
+def access_list() -> List[AccessList] | None:
+    """Access list for the transaction."""
+    return None
+
+
+@pytest.fixture
+def authorization_refund() -> bool:
+    """
+    Return whether the transaction has an existing authority in the
+    authorization list.
+    """
+    return False
+
+
+@pytest.fixture
+def authorization_list(
+    request: pytest.FixtureRequest,
+    pre: Alloc,
+    authorization_refund: bool,
+) -> List[AuthorizationTuple] | None:
+    """
+    Authorization-list for the transaction.
+
+    This fixture needs to be parametrized indirectly in order to generate the
+    authorizations with valid signers using `pre` in this function, and the
+    parametrized value should be a list of addresses.
+    """
+    param = getattr(request, "param", None)
+    if param is None:
+        return None
+    return [
+        AuthorizationTuple(
+            signer=pre.fund_eoa(1 if authorization_refund else 0),
+            address=address,
+        )
+        for address in param
+    ]
+
+
+@pytest.fixture
+def blob_versioned_hashes(ty: int) -> Sequence[Hash] | None:
+    """Versioned hashes for the transaction."""
+    if ty == 3:
+        return add_kzg_version(
+            [Hash(1)],
+            EIP_7594_Spec.BLOB_COMMITMENT_VERSION_KZG,
+        )
+    return None
+
+
+@pytest.fixture
+def contract_creating_tx(to: Address | None) -> bool:
+    """Return whether the transaction creates a contract or not."""
+    return to is None
+
+
+@pytest.fixture
+def intrinsic_gas_data_floor_minimum_delta() -> int:
+    """
+    Induce a minimum delta between the transaction intrinsic gas cost and the
+    floor data gas cost.
+    """
+    return 0
+
+
+@pytest.fixture
+def tx_data(
+    fork: Fork,
+    data_test_type: DataTestType,
+    access_list: List[AccessList] | None,
+    authorization_list: List[AuthorizationTuple] | None,
+    contract_creating_tx: bool,
+    intrinsic_gas_data_floor_minimum_delta: int,
+) -> Bytes:
+    """
+    All tests in this file use data that is generated dynamically depending on
+    the case and the attributes of the transaction in order to reach the edge
+    cases where the floor gas cost is equal or barely greater than the
+    intrinsic gas cost.
+
+    We have two different types of tests:
+
+    - FLOOR_GAS_COST_LESS_THAN_OR_EQUAL_TO_INTRINSIC_GAS: The floor gas cost is
+        less than or equal to the intrinsic gas cost, which means that the size
+        of the data is not enough to trigger the floor gas cost.
+
+    - FLOOR_GAS_COST_GREATER_THAN_INTRINSIC_GAS: The floor gas cost is greater
+        than the intrinsic gas cost, which means that the size of the data is
+        enough to trigger the floor gas cost.
+
+    E.g. Given a transaction with a single access list and a single storage
+    key, its intrinsic gas cost (as of Amsterdam fork) can be calculated as:
+
+    - 21,000 gas for the transaction
+    - 2,400 gas for the access list
+    - 1,900 gas for the storage key
+    - 16 gas for each non-zero byte in the data
+    - 4 gas for each zero byte in the data
+
+    Its floor data gas cost can be calculated as:
+    - 21,000 gas for the transaction
+    - 64 gas for each byte in the data
+
+    Notice that the data included in the transaction affects both the intrinsic
+    gas cost and the floor data cost, but at different rates.
+
+    The purpose of this function is to find the exact amount of data where the
+    floor data gas cost starts exceeding the intrinsic gas cost.
+
+    After a binary search we find that adding X bytes of data triggers the
+    floor gas cost.
+
+    Therefore, this function will return a Bytes object with the appropriate
+    amount of data for each test type.
+    """
+
+    def bytes_to_data(byte_count: int) -> Bytes:
+        return Bytes(b"\x01" * byte_count)
+
+    fork_intrinsic_cost_calculator = (
+        fork.transaction_intrinsic_cost_calculator()
+    )
+
+    def transaction_intrinsic_cost_calculator(byte_count: int) -> int:
+        return (
+            fork_intrinsic_cost_calculator(
+                calldata=bytes_to_data(byte_count),
+                contract_creation=contract_creating_tx,
+                access_list=access_list,
+                authorization_list_or_count=authorization_list,
+                return_cost_deducted_prior_execution=True,
+            )
+            + intrinsic_gas_data_floor_minimum_delta
+        )
+
+    fork_data_floor_cost_calculator = (
+        fork.transaction_data_floor_cost_calculator()
+    )
+
+    def transaction_data_floor_cost_calculator(byte_count: int) -> int:
+        return fork_data_floor_cost_calculator(data=bytes_to_data(byte_count))
+
+    # Start with zero data and check the difference in the gas calculator
+    # between the intrinsic gas cost and the floor gas cost.
+    if transaction_data_floor_cost_calculator(
+        0
+    ) >= transaction_intrinsic_cost_calculator(0):
+        # Special case which is a transaction with no extra intrinsic gas costs
+        # other than the data cost, any data will trigger the floor gas cost.
+        if (
+            data_test_type
+            == DataTestType.FLOOR_GAS_COST_LESS_THAN_OR_EQUAL_TO_INTRINSIC_GAS
+        ):
+            return Bytes(b"")
+        else:
+            return Bytes(b"\0")
+
+    threshold_bytes = find_floor_cost_threshold(
+        floor_data_gas_cost_calculator=transaction_data_floor_cost_calculator,
+        intrinsic_gas_cost_calculator=transaction_intrinsic_cost_calculator,
+    )
+
+    if (
+        data_test_type
+        == DataTestType.FLOOR_GAS_COST_GREATER_THAN_INTRINSIC_GAS
+    ):
+        return bytes_to_data(threshold_bytes + 1)
+    return bytes_to_data(threshold_bytes)
+
+
+@pytest.fixture
+def tx_gas_delta() -> int:
+    """
+    Gas delta to modify the gas amount included with the transaction.
+
+    If negative, the transaction will be invalid because the intrinsic gas cost
+    is greater than the gas limit.
+
+    This value operates regardless of whether the floor data gas cost is
+    reached or not.
+
+    If the value is greater than zero, the transaction will also be valid and
+    the test will check that transaction processing does not consume more gas
+    than it should.
+    """
+    return 0
+
+
+@pytest.fixture
+def tx_intrinsic_gas_cost_before_execution(
+    fork: Fork,
+    tx_data: Bytes,
+    access_list: List[AccessList] | None,
+    authorization_list: List[AuthorizationTuple] | None,
+    contract_creating_tx: bool,
+) -> int:
+    """
+    Return the intrinsic gas cost that is applied before the execution start.
+
+    This value never includes the floor data gas cost.
+    """
+    intrinsic_gas_cost_calculator = (
+        fork.transaction_intrinsic_cost_calculator()
+    )
+    return intrinsic_gas_cost_calculator(
+        calldata=tx_data,
+        contract_creation=contract_creating_tx,
+        access_list=access_list,
+        authorization_list_or_count=authorization_list,
+        return_cost_deducted_prior_execution=True,
+    )
+
+
+@pytest.fixture
+def tx_intrinsic_gas_cost_including_floor_data_cost(
+    fork: Fork,
+    tx_data: Bytes,
+    access_list: List[AccessList] | None,
+    authorization_list: List[AuthorizationTuple] | None,
+    contract_creating_tx: bool,
+) -> int:
+    """
+    Transaction intrinsic gas cost.
+
+    The calculated value takes into account the normal intrinsic gas cost and
+    the floor data gas cost if it is greater than the intrinsic gas cost.
+
+    In other words, this is the value that is required for the transaction to
+    be valid.
+    """
+    intrinsic_gas_cost_calculator = (
+        fork.transaction_intrinsic_cost_calculator()
+    )
+    return intrinsic_gas_cost_calculator(
+        calldata=tx_data,
+        contract_creation=contract_creating_tx,
+        access_list=access_list,
+        authorization_list_or_count=authorization_list,
+    )
+
+
+@pytest.fixture
+def tx_floor_data_cost(
+    fork: Fork,
+    tx_data: Bytes,
+) -> int:
+    """Floor data cost for the given transaction data."""
+    fork_data_floor_cost_calculator = (
+        fork.transaction_data_floor_cost_calculator()
+    )
+    return fork_data_floor_cost_calculator(data=tx_data)
+
+
+@pytest.fixture
+def tx_gas_limit(
+    tx_intrinsic_gas_cost_including_floor_data_cost: int,
+    tx_gas_delta: int,
+) -> int:
+    """
+    Gas limit for the transaction.
+
+    The gas delta is added to the intrinsic gas cost to generate different test
+    scenarios.
+    """
+    return tx_intrinsic_gas_cost_including_floor_data_cost + tx_gas_delta
+
+
+@pytest.fixture
+def tx_error(
+    tx_gas_delta: int, data_test_type: DataTestType
+) -> TransactionException | None:
+    """Transaction error, only expected if the gas delta is negative."""
+    if tx_gas_delta < 0:
+        if (
+            data_test_type
+            == DataTestType.FLOOR_GAS_COST_GREATER_THAN_INTRINSIC_GAS
+        ):
+            return TransactionException.INTRINSIC_GAS_BELOW_FLOOR_GAS_COST
+        else:
+            return TransactionException.INTRINSIC_GAS_TOO_LOW
+    return None
+
+
+@pytest.fixture
+def tx(
+    sender: EOA,
+    ty: int,
+    tx_data: Bytes,
+    to: Address | None,
+    protected: bool,
+    access_list: List[AccessList] | None,
+    authorization_list: List[AuthorizationTuple] | None,
+    blob_versioned_hashes: Sequence[Hash] | None,
+    tx_gas_limit: int,
+    tx_error: TransactionException | None,
+) -> Transaction:
+    """Create the transaction used in each test."""
+    return Transaction(
+        ty=ty,
+        sender=sender,
+        data=tx_data,
+        to=to,
+        protected=protected,
+        access_list=access_list,
+        authorization_list=authorization_list,
+        gas_limit=tx_gas_limit,
+        blob_versioned_hashes=blob_versioned_hashes,
+        error=tx_error,
+    )
diff --git a/tests/amsterdam/eip7976_increase_calldata_floor_cost/helpers.py b/tests/amsterdam/eip7976_increase_calldata_floor_cost/helpers.py
new file mode 100644
index 00000000000..163db27662b
--- /dev/null
+++ b/tests/amsterdam/eip7976_increase_calldata_floor_cost/helpers.py
@@ -0,0 +1,56 @@
+"""Helpers for testing EIP-7976."""
+
+from enum import Enum, auto
+from typing import Callable
+
+
+class DataTestType(Enum):
+    """Enum for the different types of data tests."""
+
+    FLOOR_GAS_COST_LESS_THAN_OR_EQUAL_TO_INTRINSIC_GAS = auto()
+    FLOOR_GAS_COST_GREATER_THAN_INTRINSIC_GAS = auto()
+
+
+def find_floor_cost_threshold(
+    floor_data_gas_cost_calculator: Callable[[int], int],
+    intrinsic_gas_cost_calculator: Callable[[int], int],
+) -> int:
+    """
+    Find the minimum amount of tokens that will trigger the floor gas cost, by
+    using a binary search and the intrinsic gas cost and floor data
+    calculators.
+    """
+
+    def floor_cost(n: int) -> int:
+        return floor_data_gas_cost_calculator(n)
+
+    def intrinsic_cost(n: int) -> int:
+        return intrinsic_gas_cost_calculator(n)
+
+    # Start with 1000 tokens and if the intrinsic gas cost is greater than the
+    # floor gas cost, multiply the number of tokens by 2 until it's not.
+    tokens = 1000
+    while floor_cost(tokens) < intrinsic_cost(tokens):
+        tokens *= 2
+
+    # Binary search to find the minimum number of tokens that will trigger the
+    # floor gas cost.
+    left = 0
+    right = tokens
+    while left < right:
+        tokens = (left + right) // 2
+        if floor_cost(tokens) < intrinsic_cost(tokens):
+            left = tokens + 1
+        else:
+            right = tokens
+    tokens = left
+
+    if floor_cost(tokens) > intrinsic_cost(tokens):
+        tokens -= 1
+
+    # Verify that increasing the tokens by one would always trigger the floor
+    # gas cost.
+    assert floor_cost(tokens) <= intrinsic_cost(tokens), "invalid case"
+    assert floor_cost(tokens + 1) > intrinsic_cost(tokens + 1), "invalid case"
+
+    return tokens
diff --git a/tests/amsterdam/eip7976_increase_calldata_floor_cost/spec.py b/tests/amsterdam/eip7976_increase_calldata_floor_cost/spec.py
new file mode 100644
index 00000000000..209153c0d2a
--- /dev/null
+++ b/tests/amsterdam/eip7976_increase_calldata_floor_cost/spec.py
@@ -0,0 +1,28 @@
+"""Defines EIP-7976 specification constants and functions."""
+
+from dataclasses import dataclass
+
+
+@dataclass(frozen=True)
+class ReferenceSpec:
+    """Defines the reference spec version and git path."""
+
+    git_path: str
+    version: str
+
+
+ref_spec_7976 = ReferenceSpec(
+    "EIPS/eip-7976.md", "83d473b0504d316a06ce58ae581e7f03b5d54fe1"
+)
+
+
+# Constants
+@dataclass(frozen=True)
+class Spec:
+    """
+    Parameters from the EIP-7976 specifications as defined at
+    https://eips.ethereum.org/EIPS/eip-7976.
+    """
+
+    STANDARD_TOKEN_COST = 4
+    TOTAL_COST_FLOOR_PER_TOKEN = 16
diff --git a/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_additional_coverage.py b/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_additional_coverage.py
new file mode 100644
index 00000000000..c62550daa9d
--- /dev/null
+++ b/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_additional_coverage.py
@@ -0,0 +1,936 @@
+"""
+Additional test coverage for [EIP-7976: Increase calldata floor cost](https://eips.ethereum.org/EIPS/eip-7976).
+
+This module tests:
+1. Token calculation verification with different byte compositions
+2. Maximum calldata size handling
+3. Memory expansion interaction with floor cost
+4. Nested contract calls verification
+5. Exact threshold boundary testing
+6. Authorization list gas cost verification
+7. Gas refund cap interaction with floor cost
+"""
+
+from typing import List
+
+import pytest
+from execution_testing import (
+    AccessList,
+    Address,
+    Alloc,
+    AuthorizationTuple,
+    Bytecode,
+    Bytes,
+    Fork,
+    Op,
+    StateTestFiller,
+    Transaction,
+    TransactionReceipt,
+)
+
+from .spec import ref_spec_7976
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7976.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7976.version
+
+pytestmark = [pytest.mark.valid_from("EIP7976")]
+
+
+class TestTokenCalculation:
+    """Test token calculation with different byte compositions."""
+
+    @pytest.fixture
+    def sender(self, pre: Alloc) -> Address:
+        """Create sender account."""
+        return pre.fund_eoa()
+
+    @pytest.fixture
+    def to(self, pre: Alloc) -> Address:
+        """Deploy a simple contract that does nothing."""
+        return pre.deploy_contract(Op.STOP)
+
+    @pytest.mark.parametrize(
+        "calldata,expected_standard_tokens,description",
+        [
+            pytest.param(
+                Bytes(b"\x00" * 100),
+                100,
+                "all_zero_bytes",
+                id="all_zero_bytes",
+            ),
+            pytest.param(
+                Bytes(b"\x01" * 100),
+                400,
+                "all_nonzero_bytes",
+                id="all_nonzero_bytes",
+            ),
+            pytest.param(
+                Bytes(b"\x01" * 75 + b"\x00" * 25),
+                325,  # 75*4 + 25*1
+                "75_percent_nonzero",
+                id="75_percent_nonzero",
+            ),
+            pytest.param(
+                Bytes(b"\x01" * 25 + b"\x00" * 75),
+                175,  # 25*4 + 75*1
+                "25_percent_nonzero",
+                id="25_percent_nonzero",
+            ),
+            pytest.param(
+                Bytes(b"\x01\x02\x03\x00"),
+                13,  # 3*4 + 1*1
+                "three_nonzero_one_zero",
+                id="three_nonzero_one_zero",
+            ),
+            pytest.param(
+                Bytes(b"\xff" * 50 + b"\x00" * 50),
+                250,  # 50*4 + 50*1
+                "half_and_half",
+                id="half_and_half",
+            ),
+        ],
+    )
+    def test_token_calculation_verification(
+        self,
+        state_test: StateTestFiller,
+        pre: Alloc,
+        sender: Address,
+        to: Address,
+        calldata: Bytes,
+        expected_standard_tokens: int,
+        description: str,
+        fork: Fork,
+    ) -> None:
+        """
+        Verify token calculation is correct for different byte compositions.
+
+        Standard calldata token formula:
+        tokens = zero_bytes + (nonzero_bytes * 4)
+
+        Floor token formula introduced in EIP-7976:
+        floor_tokens = 4 * calldata_bytes
+        """
+        # Calculate expected costs
+        intrinsic_cost_calculator = (
+            fork.transaction_intrinsic_cost_calculator()
+        )
+        intrinsic_cost_before_execution = intrinsic_cost_calculator(
+            calldata=calldata,
+            contract_creation=False,
+            access_list=None,
+            authorization_list_or_count=None,
+            return_cost_deducted_prior_execution=True,
+        )
+
+        floor_cost_calculator = fork.transaction_data_floor_cost_calculator()
+        floor_cost = floor_cost_calculator(data=calldata)
+
+        # Verify floor token calculation:
+        # floor_cost = TX_BASE + (floor_tokens * floor_token_cost)
+        # where floor_tokens = 4 * calldata_bytes
+        gas_costs = fork.gas_costs()
+        floor_token_cost = gas_costs.TX_DATA_TOKEN_FLOOR
+        expected_floor_tokens = len(calldata) * 4
+        expected_floor_cost = gas_costs.TX_BASE + (
+            expected_floor_tokens * floor_token_cost
+        )
+        assert floor_cost == expected_floor_cost, (
+            f"Floor cost mismatch for {description}: "
+            f"{floor_cost} != {expected_floor_cost} "
+            f"(floor_tokens={expected_floor_tokens}, "
+            f"floor_cost_per_token={floor_token_cost})"
+        )
+
+        expected_intrinsic_cost = gas_costs.TX_BASE + (
+            expected_standard_tokens * gas_costs.TX_DATA_TOKEN_STANDARD
+        )
+        assert intrinsic_cost_before_execution == expected_intrinsic_cost, (
+            f"Intrinsic cost mismatch for {description}: "
+            f"{intrinsic_cost_before_execution} != {expected_intrinsic_cost} "
+            f"(standard_tokens={expected_standard_tokens})"
+        )
+
+        # Create transaction with exact gas needed
+        total_intrinsic_cost = max(intrinsic_cost_before_execution, floor_cost)
+        tx = Transaction(
+            sender=sender,
+            to=to,
+            data=calldata,
+            gas_limit=total_intrinsic_cost,
+        )
+
+        # Expected gas used should be the floor cost if it's greater
+        expected_gas_used = total_intrinsic_cost
+        tx.expected_receipt = TransactionReceipt(
+            cumulative_gas_used=expected_gas_used
+        )
+
+        state_test(
+            pre=pre,
+            post={},
+            tx=tx,
+        )
+
+
+class TestMaximumCalldata:
+    """Test maximum calldata size handling."""
+
+    @pytest.fixture
+    def sender(self, pre: Alloc) -> Address:
+        """Create sender account with massive balance."""
+        return pre.fund_eoa()
+
+    @pytest.fixture
+    def to(self, pre: Alloc) -> Address:
+        """Deploy a simple contract."""
+        return pre.deploy_contract(Op.STOP)
+
+    def test_maximum_calldata_size(
+        self,
+        state_test: StateTestFiller,
+        pre: Alloc,
+        sender: Address,
+        to: Address,
+        fork: Fork,
+    ) -> None:
+        """
+        Test transaction with large calldata size (~10M gas worth).
+
+        This verifies that floor cost calculation doesn't overflow and
+        gas metering is accurate at scale.
+        """
+        # Calculate calldata size that would cost approximately 10M gas
+        # (below the default block gas limit to avoid EIP-7825 cap issues)
+        # Using all non-zero bytes for maximum density
+        # floor_cost = TX_BASE + (TX_DATA_TOKEN_FLOOR * tokens)
+        # For non-zero bytes: tokens = bytes * 4
+        gas_costs = fork.gas_costs()
+        target_gas = 10_000_000
+        floor_token_cost = gas_costs.TX_DATA_TOKEN_FLOOR
+        target_tokens = (target_gas - gas_costs.TX_BASE) // floor_token_cost
+        # Use all non-zero bytes for maximum token density
+        num_bytes = target_tokens // 4
+
+        calldata = Bytes(b"\x01" * num_bytes)
+
+        # Calculate expected costs
+        floor_cost_calculator = fork.transaction_data_floor_cost_calculator()
+        floor_cost = floor_cost_calculator(data=calldata)
+
+        intrinsic_cost_calculator = (
+            fork.transaction_intrinsic_cost_calculator()
+        )
+        intrinsic_cost = intrinsic_cost_calculator(
+            calldata=calldata,
+            contract_creation=False,
+            access_list=None,
+            authorization_list_or_count=None,
+        )
+
+        # Floor cost should dominate for data-heavy transaction
+        assert floor_cost > 5_000_000, "Floor cost should be substantial"
+        expected_gas = max(intrinsic_cost, floor_cost)
+
+        # Add buffer for execution (cold address access + STOP opcode)
+        execution_buffer = 3000
+        gas_limit = expected_gas + execution_buffer
+
+        tx = Transaction(
+            sender=sender,
+            to=to,
+            data=calldata,
+            gas_limit=gas_limit,
+        )
+
+        # Gas used should be the floor cost (execution is minimal)
+        tx.expected_receipt = TransactionReceipt(
+            cumulative_gas_used=expected_gas
+        )
+
+        state_test(
+            pre=pre,
+            post={},
+            tx=tx,
+        )
+
+
+class TestMemoryExpansion:
+    """Test memory expansion interaction with floor cost."""
+
+    @pytest.fixture
+    def sender(self, pre: Alloc) -> Address:
+        """Create sender account."""
+        return pre.fund_eoa()
+
+    @pytest.fixture
+    def to(self, pre: Alloc) -> Address:
+        """
+        Deploy a contract that causes memory expansion.
+
+        The contract performs CALLDATACOPY to expand memory, then stops.
+        This ensures memory expansion gas is counted in execution gas.
+        """
+        # CALLDATACOPY(destOffset=0, offset=0, length=CALLDATASIZE)
+        # This will copy all calldata to memory starting at offset 0
+        code = (
+            Op.CALLDATASIZE  # Push calldata size
+            + Op.PUSH1(0)  # Push offset (0)
+            + Op.PUSH1(0)  # Push destOffset (0)
+            + Op.CALLDATACOPY  # Copy calldata to memory
+            + Op.STOP
+        )
+        return pre.deploy_contract(code)
+
+    @pytest.mark.parametrize(
+        "calldata_size",
+        [
+            pytest.param(1024, id="1kb"),
+            pytest.param(10240, id="10kb"),
+            pytest.param(32768, id="32kb"),
+        ],
+    )
+    def test_memory_expansion_with_calldata(
+        self,
+        state_test: StateTestFiller,
+        pre: Alloc,
+        sender: Address,
+        to: Address,
+        calldata_size: int,
+        fork: Fork,
+    ) -> None:
+        """
+        Test memory expansion gas is counted in execution_gas not floor.
+
+        The transaction pays max(standard_cost + execution_gas, floor_cost)
+        where execution_gas includes memory expansion costs.
+        """
+        # Create calldata with non-zero bytes to trigger floor cost
+        calldata = Bytes(b"\x01" * calldata_size)
+
+        # Calculate costs
+        intrinsic_cost_calculator = (
+            fork.transaction_intrinsic_cost_calculator()
+        )
+        intrinsic_cost_before_execution = intrinsic_cost_calculator(
+            calldata=calldata,
+            contract_creation=False,
+            access_list=None,
+            authorization_list_or_count=None,
+            return_cost_deducted_prior_execution=True,
+        )
+
+        floor_cost_calculator = fork.transaction_data_floor_cost_calculator()
+        floor_cost = floor_cost_calculator(data=calldata)
+
+        code = (
+            Op.CALLDATASIZE
+            + Op.PUSH1(0)
+            + Op.PUSH1(0)
+            + Op.CALLDATACOPY(
+                data_size=calldata_size,
+                new_memory_size=calldata_size,
+            )
+            + Op.STOP
+        )
+        execution_gas = code.gas_cost(fork)
+
+        # Total gas is intrinsic + execution
+        total_with_execution = intrinsic_cost_before_execution + execution_gas
+
+        # The actual gas used is max(total_with_execution, floor_cost)
+        expected_gas = max(total_with_execution, floor_cost)
+
+        tx = Transaction(
+            sender=sender,
+            to=to,
+            data=calldata,
+            gas_limit=expected_gas + 100000,  # Add buffer for safety
+        )
+
+        # Verify the transaction executes successfully
+        state_test(
+            pre=pre,
+            post={},
+            tx=tx,
+        )
+
+
+class TestNestedContractCalls:
+    """Test that nested contract calls don't trigger additional floor costs."""
+
+    @pytest.fixture
+    def sender(self, pre: Alloc) -> Address:
+        """Create sender account."""
+        return pre.fund_eoa()
+
+    @pytest.fixture
+    def contract_b(self, pre: Alloc) -> Address:
+        """
+        Deploy Contract B that receives calldata and stores something.
+
+        This contract will be called by Contract A with calldata.
+        """
+        # Simply store a value to show it was executed
+        code = Op.PUSH1(42) + Op.PUSH1(0) + Op.SSTORE + Op.STOP
+        return pre.deploy_contract(code)
+
+    @pytest.fixture
+    def contract_a(self, pre: Alloc, contract_b: Address) -> Address:
+        """
+        Deploy Contract A that calls Contract B with calldata.
+
+        This contract performs a CALL to contract_b with some calldata.
+        """
+        # Prepare call to contract_b with 100 bytes of data
+        # CALL(gas, address, value, argsOffset, argsSize, retOffset, retSize)
+        code = (
+            # Store some data in memory to pass as calldata
+            Op.PUSH1(100)  # Size
+            + Op.PUSH1(0)  # Offset
+            + Op.PUSH1(0xFF)  # Value to fill
+            + Op.MSTORE
+            +
+            # Perform CALL
+            Op.PUSH1(0)  # retSize
+            + Op.PUSH1(0)  # retOffset
+            + Op.PUSH1(100)  # argsSize (100 bytes)
+            + Op.PUSH1(0)  # argsOffset
+            + Op.PUSH1(0)  # value
+            + Op.PUSH20(contract_b.hex())  # address
+            + Op.GAS  # gas (all remaining)
+            + Op.CALL
+            + Op.STOP
+        )
+        return pre.deploy_contract(code)
+
+    def test_nested_call_no_additional_floor_cost(
+        self,
+        state_test: StateTestFiller,
+        pre: Alloc,
+        sender: Address,
+        contract_a: Address,
+        contract_b: Address,
+        fork: Fork,
+    ) -> None:
+        """
+        Verify only the transaction's calldata affects floor cost.
+
+        Internal CALL operations with calldata don't trigger additional
+        floor costs.
+        """
+        # Transaction calldata (sent to contract_a)
+        tx_calldata = Bytes(b"\x01" * 200)
+
+        # Calculate floor cost based ONLY on transaction calldata
+        floor_cost_calculator = fork.transaction_data_floor_cost_calculator()
+        floor_cost = floor_cost_calculator(data=tx_calldata)
+
+        intrinsic_cost_calculator = (
+            fork.transaction_intrinsic_cost_calculator()
+        )
+        intrinsic_cost = intrinsic_cost_calculator(
+            calldata=tx_calldata,
+            contract_creation=False,
+            access_list=None,
+            authorization_list_or_count=None,
+        )
+
+        # The floor cost should only consider the transaction's calldata,
+        # not the calldata passed in the internal CALL
+        tokens_tx = len(tx_calldata) * 4  # All non-zero bytes
+        gas_costs = fork.gas_costs()
+        expected_floor_cost = gas_costs.TX_BASE + (
+            tokens_tx * gas_costs.TX_DATA_TOKEN_FLOOR
+        )
+        assert floor_cost == expected_floor_cost
+
+        tx = Transaction(
+            sender=sender,
+            to=contract_a,
+            data=tx_calldata,
+            gas_limit=intrinsic_cost + 500000,  # Add execution gas buffer
+        )
+
+        state_test(
+            pre=pre,
+            post={
+                contract_b: {
+                    "storage": {0: 42},  # Verify contract_b was executed
+                }
+            },
+            tx=tx,
+        )
+
+    def test_delegatecall_no_additional_floor_cost(
+        self,
+        state_test: StateTestFiller,
+        pre: Alloc,
+        sender: Address,
+        fork: Fork,
+    ) -> None:
+        """
+        Verify DELEGATECALL operations don't trigger additional floor costs.
+        """
+        # Contract that will be delegatecalled
+        delegate_code = Op.PUSH1(99) + Op.PUSH1(0) + Op.SSTORE + Op.STOP
+        delegate_contract = pre.deploy_contract(delegate_code)
+
+        # Contract that performs DELEGATECALL
+        # DELEGATECALL(gas, address, argsOffset, argsSize, retOffset, retSize)
+        caller_code = (
+            Op.PUSH1(0)  # retSize
+            + Op.PUSH1(0)  # retOffset
+            + Op.PUSH1(64)  # argsSize
+            + Op.PUSH1(0)  # argsOffset
+            + Op.PUSH20(delegate_contract.hex())  # address
+            + Op.GAS  # gas
+            + Op.DELEGATECALL
+            + Op.STOP
+        )
+        caller_contract = pre.deploy_contract(caller_code, storage={})
+
+        # Transaction calldata
+        tx_calldata = Bytes(b"\x01" * 150)
+
+        intrinsic_cost_calculator = (
+            fork.transaction_intrinsic_cost_calculator()
+        )
+        intrinsic_cost = intrinsic_cost_calculator(
+            calldata=tx_calldata,
+            contract_creation=False,
+            access_list=None,
+            authorization_list_or_count=None,
+        )
+
+        tx = Transaction(
+            sender=sender,
+            to=caller_contract,
+            data=tx_calldata,
+            gas_limit=intrinsic_cost + 500000,
+        )
+
+        state_test(
+            pre=pre,
+            post={
+                caller_contract: {
+                    "storage": {
+                        0: 99
+                    },  # DELEGATECALL executes in caller's context
+                }
+            },
+            tx=tx,
+        )
+
+
+class TestExactThresholdBoundary:
+    """Test exact threshold where floor_cost == intrinsic_cost."""
+
+    @pytest.fixture
+    def sender(self, pre: Alloc) -> Address:
+        """Create sender account."""
+        return pre.fund_eoa()
+
+    @pytest.fixture
+    def to(self, pre: Alloc) -> Address:
+        """Deploy a simple contract."""
+        return pre.deploy_contract(Op.STOP)
+
+    @pytest.mark.parametrize(
+        "access_list,authorization_list",
+        [
+            pytest.param(None, None, id="no_extras"),
+            pytest.param(
+                [AccessList(address=Address(1), storage_keys=[])],
+                None,
+                id="with_access_list",
+            ),
+        ],
+        indirect=["authorization_list"],
+    )
+    @pytest.mark.parametrize(
+        "ty",
+        [
+            # Type 1 (EIP-2930) introduced access lists
+            pytest.param(1, id="type_1"),
+            pytest.param(2, id="type_2"),
+        ],
+    )
+    @pytest.mark.parametrize(
+        "threshold_offset",
+        [
+            pytest.param(0, id="below_threshold"),
+            pytest.param(1, id="above_threshold"),
+            pytest.param(2, id="above_threshold_plus_2"),
+        ],
+    )
+    def test_exact_threshold_boundary(
+        self,
+        state_test: StateTestFiller,
+        pre: Alloc,
+        sender: Address,
+        to: Address,
+        fork: Fork,
+        access_list: List[AccessList] | None,
+        authorization_list: List[AuthorizationTuple] | None,
+        ty: int,
+        threshold_offset: int,
+    ) -> None:
+        """
+        Find exact calldata byte count N where floor_cost == intrinsic_cost.
+
+        Test with N, N+1, and N+2 bytes to verify max() function
+        switches correctly.
+        """
+        from .helpers import find_floor_cost_threshold
+
+        def bytes_to_data(byte_count: int) -> Bytes:
+            """Convert byte count to calldata bytes."""
+            return Bytes(b"\x01" * byte_count)
+
+        intrinsic_cost_calculator = (
+            fork.transaction_intrinsic_cost_calculator()
+        )
+
+        def intrinsic_cost(byte_count: int) -> int:
+            return intrinsic_cost_calculator(
+                calldata=bytes_to_data(byte_count),
+                contract_creation=False,
+                access_list=access_list,
+                authorization_list_or_count=authorization_list,
+                return_cost_deducted_prior_execution=True,
+            )
+
+        floor_cost_calculator = fork.transaction_data_floor_cost_calculator()
+
+        def floor_cost(byte_count: int) -> int:
+            return floor_cost_calculator(data=bytes_to_data(byte_count))
+
+        # Find the threshold
+        threshold_bytes = find_floor_cost_threshold(
+            floor_data_gas_cost_calculator=floor_cost,
+            intrinsic_gas_cost_calculator=intrinsic_cost,
+        )
+
+        byte_count = threshold_bytes + threshold_offset
+        calldata = bytes_to_data(byte_count)
+        intrinsic_raw = intrinsic_cost(byte_count)
+        floor_raw = floor_cost(byte_count)
+
+        if threshold_offset == 0:
+            assert intrinsic_raw >= floor_raw, (
+                "At threshold: intrinsic should dominate"
+            )
+        else:
+            assert floor_raw > intrinsic_raw, (
+                f"Above threshold: floor should dominate. "
+                f"floor={floor_raw}, intrinsic={intrinsic_raw}"
+            )
+
+        intrinsic_total = intrinsic_cost_calculator(
+            calldata=calldata,
+            contract_creation=False,
+            access_list=access_list,
+            authorization_list_or_count=authorization_list,
+        )
+
+        tx = Transaction(
+            ty=ty,
+            sender=sender,
+            to=to,
+            nonce=0,
+            data=calldata,
+            gas_limit=intrinsic_total,
+            access_list=access_list,
+            authorization_list=authorization_list,
+        )
+        tx.expected_receipt = TransactionReceipt(
+            cumulative_gas_used=intrinsic_total
+        )
+
+        state_test(
+            pre=pre,
+            post={},
+            tx=tx,
+        )
+
+
+class TestAuthorizationListGasCost:
+    """Verify authorization list gas costs are included correctly."""
+
+    @pytest.fixture
+    def sender(self, pre: Alloc) -> Address:
+        """Create sender account."""
+        return pre.fund_eoa()
+
+    @pytest.fixture
+    def to(self, pre: Alloc) -> Address:
+        """Deploy a simple contract."""
+        return pre.deploy_contract(Op.STOP)
+
+    @pytest.mark.parametrize(
+        "num_authorizations",
+        [
+            pytest.param(1, id="single_auth"),
+            pytest.param(5, id="five_auths"),
+            pytest.param(10, id="ten_auths"),
+        ],
+    )
+    def test_authorization_list_intrinsic_gas(
+        self,
+        state_test: StateTestFiller,
+        pre: Alloc,
+        sender: Address,
+        to: Address,
+        fork: Fork,
+        num_authorizations: int,
+    ) -> None:
+        """
+        Verify authorization list gas costs are included in intrinsic gas.
+
+        Each authorization in the list adds a fixed gas cost to the
+        intrinsic gas. This should be accounted for before comparing
+        with floor cost.
+        """
+        # Create authorization list
+        authorization_list = [
+            AuthorizationTuple(
+                signer=pre.fund_eoa(0),
+                address=Address(i + 1),
+            )
+            for i in range(num_authorizations)
+        ]
+
+        # Use calldata that triggers floor cost
+        calldata = Bytes(b"\x01" * 500)
+
+        # Calculate costs
+        intrinsic_cost_calculator = (
+            fork.transaction_intrinsic_cost_calculator()
+        )
+        intrinsic_cost_with_auth = intrinsic_cost_calculator(
+            calldata=calldata,
+            contract_creation=False,
+            access_list=None,
+            authorization_list_or_count=authorization_list,
+        )
+
+        intrinsic_cost_without_auth = intrinsic_cost_calculator(
+            calldata=calldata,
+            contract_creation=False,
+            access_list=None,
+            authorization_list_or_count=None,
+        )
+
+        floor_cost_calculator = fork.transaction_data_floor_cost_calculator()
+        floor_cost = floor_cost_calculator(data=calldata)
+
+        # Each authorization adds calldata cost for the authorization tuple
+        # plus G_AUTHORIZATION gas cost. The difference we see should be
+        # primarily from the authorization gas but may include calldata costs
+        # for encoding the authorization list.
+        actual_auth_cost = (
+            intrinsic_cost_with_auth - intrinsic_cost_without_auth
+        )
+        # Just verify that there is a positive cost increase
+        assert actual_auth_cost > 0, (
+            f"Authorization should add gas cost, got: {actual_auth_cost}"
+        )
+
+        # The transaction should pay max(intrinsic_with_auth, floor_cost)
+        expected_gas = max(intrinsic_cost_with_auth, floor_cost)
+
+        tx = Transaction(
+            ty=4,  # Type 4 supports authorization lists
+            sender=sender,
+            to=to,
+            data=calldata,
+            gas_limit=expected_gas,
+            authorization_list=authorization_list,
+        )
+
+        tx.expected_receipt = TransactionReceipt(
+            cumulative_gas_used=expected_gas
+        )
+
+        state_test(
+            pre=pre,
+            post={},
+            tx=tx,
+        )
+
+
+class TestRefundCapInteraction:
+    """Test that the 1/5 refund cap interacts correctly with floor cost."""
+
+    @pytest.fixture
+    def sender(self, pre: Alloc) -> Address:
+        """Create sender account."""
+        return pre.fund_eoa()
+
+    def test_refund_cap_at_one_fifth(
+        self,
+        state_test: StateTestFiller,
+        pre: Alloc,
+        sender: Address,
+        fork: Fork,
+    ) -> None:
+        """
+        Test that refunds are capped at the fork max refund quotient.
+
+        Even if the refund counter is high, the actual refund cannot exceed
+        the fork cap. Use minimal calldata to avoid floor cost interference.
+        """
+        # Use minimal calldata so floor cost doesn't dominate
+        calldata = Bytes(b"")
+
+        # Deploy contract that clears multiple storage slots
+        # This generates a large refund counter
+        num_slots = 10
+        code = Bytecode()
+        storage = {i: 1 for i in range(num_slots)}  # noqa: C420
+
+        for i in range(num_slots):
+            code += Op.SSTORE(i, 0, original_value=1, new_value=0)
+
+        code += Op.STOP
+        contract = pre.deploy_contract(
+            code,
+            storage=storage,  # type: ignore[arg-type]
+        )
+
+        # Calculate costs
+        intrinsic_cost_calculator = (
+            fork.transaction_intrinsic_cost_calculator()
+        )
+        intrinsic_cost_before_execution = intrinsic_cost_calculator(
+            calldata=calldata,
+            contract_creation=False,
+            access_list=None,
+            authorization_list_or_count=None,
+            return_cost_deducted_prior_execution=True,
+        )
+
+        execution_gas = code.gas_cost(fork)
+
+        total_gas_before_refund = (
+            intrinsic_cost_before_execution + execution_gas
+        )
+
+        refund_counter = code.refund(fork)
+
+        # Actual refund is capped by the fork max refund quotient.
+        refund_cap = total_gas_before_refund // fork.max_refund_quotient()
+        actual_refund = min(refund_counter, refund_cap)
+
+        # Verify that refund counter exceeds cap
+        assert refund_counter > refund_cap, (
+            "Test requires refund_counter > refund cap"
+        )
+
+        # Gas after refund (floor cost is minimal with empty calldata)
+        expected_gas = total_gas_before_refund - actual_refund
+
+        tx = Transaction(
+            sender=sender,
+            to=contract,
+            data=calldata,
+            gas_limit=total_gas_before_refund,
+        )
+
+        tx.expected_receipt = TransactionReceipt(
+            cumulative_gas_used=expected_gas
+        )
+
+        # Verify all storage slots are cleared
+        expected_storage = dict.fromkeys(range(num_slots), 0)
+
+        state_test(
+            pre=pre,
+            post={
+                contract: {
+                    "storage": expected_storage,
+                }
+            },
+            tx=tx,
+        )
+
+    def test_floor_cost_not_reduced_by_refunds(
+        self,
+        state_test: StateTestFiller,
+        pre: Alloc,
+        sender: Address,
+        fork: Fork,
+    ) -> None:
+        """
+        Verify floor cost acts as a true floor and is never reduced.
+
+        Even with large refunds, the transaction must pay at least the
+        floor cost.
+        """
+        # Use calldata that strongly triggers floor cost
+        calldata = Bytes(b"\x01" * 1000)
+
+        # Deploy contract that clears storage
+        code = Op.SSTORE(0, 0, original_value=1, new_value=0) + Op.STOP
+        contract = pre.deploy_contract(
+            code,
+            storage={0: 1},
+        )
+
+        # Calculate costs
+        floor_cost_calculator = fork.transaction_data_floor_cost_calculator()
+        floor_cost = floor_cost_calculator(data=calldata)
+
+        intrinsic_cost_calculator = (
+            fork.transaction_intrinsic_cost_calculator()
+        )
+        intrinsic_cost_before_execution = intrinsic_cost_calculator(
+            calldata=calldata,
+            contract_creation=False,
+            access_list=None,
+            authorization_list_or_count=None,
+            return_cost_deducted_prior_execution=True,
+        )
+
+        execution_gas = code.gas_cost(fork)
+
+        total_gas_before_refund = (
+            intrinsic_cost_before_execution + execution_gas
+        )
+        refund = min(
+            code.refund(fork),
+            total_gas_before_refund // fork.max_refund_quotient(),
+        )
+        gas_after_refund = total_gas_before_refund - refund
+
+        # Even after refund, we should pay at least floor cost
+        expected_gas = max(gas_after_refund, floor_cost)
+
+        # Verify floor cost is the dominant factor
+        assert expected_gas == floor_cost, (
+            "Floor cost should dominate for data-heavy transaction"
+        )
+
+        # Gas limit must satisfy both execution needs and floor cost
+        gas_limit = max(total_gas_before_refund, floor_cost)
+
+        tx = Transaction(
+            sender=sender,
+            to=contract,
+            data=calldata,
+            gas_limit=gas_limit,
+        )
+
+        tx.expected_receipt = TransactionReceipt(
+            cumulative_gas_used=expected_gas
+        )
+
+        state_test(
+            pre=pre,
+            post={
+                contract: {
+                    "storage": {0: 0},
+                }
+            },
+            tx=tx,
+        )
diff --git a/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_eip_mainnet.py b/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_eip_mainnet.py
new file mode 100644
index 00000000000..7926edd7032
--- /dev/null
+++ b/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_eip_mainnet.py
@@ -0,0 +1,107 @@
+"""
+abstract: Crafted tests for mainnet of [EIP-7976: Increase calldata floor cost](https://eips.ethereum.org/EIPS/eip-7976).
+"""  # noqa: E501
+
+import pytest
+from execution_testing import (
+    AccessList,
+    Address,
+    Alloc,
+    Hash,
+    StateTestFiller,
+    Transaction,
+    add_kzg_version,
+)
+
+from ...osaka.eip7594_peerdas.spec import Spec as EIP_7594_Spec
+from .helpers import DataTestType
+from .spec import ref_spec_7976
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7976.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7976.version
+
+pytestmark = [pytest.mark.valid_at("EIP7976"), pytest.mark.mainnet]
+
+
+@pytest.mark.parametrize(
+    "ty,protected,access_list,blob_versioned_hashes,authorization_list",
+    [
+        pytest.param(0, True, None, None, None, id="type_0_protected"),
+        pytest.param(0, False, None, None, None, id="type_0_unprotected"),
+        pytest.param(
+            1,
+            True,
+            [AccessList(address=Address(1), storage_keys=[Hash(0)])],
+            None,
+            None,
+            id="type_1",
+        ),
+        pytest.param(
+            2,
+            True,
+            [AccessList(address=Address(1), storage_keys=[Hash(0)])],
+            None,
+            None,
+            id="type_2",
+        ),
+        pytest.param(
+            3,
+            True,
+            [AccessList(address=Address(1), storage_keys=[Hash(0)])],
+            add_kzg_version(
+                [Hash(x) for x in range(1)],
+                EIP_7594_Spec.BLOB_COMMITMENT_VERSION_KZG,
+            ),
+            None,
+            id="type_3",
+            marks=pytest.mark.fill(
+                pytest.mark.skip(reason="Blob txs not supported by fill")
+            ),
+        ),
+        pytest.param(
+            4,
+            True,
+            [AccessList(address=Address(1), storage_keys=[Hash(0)])],
+            None,
+            [Address(1)],
+            id="type_4",
+        ),
+    ],
+    indirect=["authorization_list"],
+)
+@pytest.mark.parametrize(
+    "tx_gas_delta",
+    [
+        pytest.param(0, id=""),
+    ],
+)
+@pytest.mark.parametrize(
+    "to",
+    [
+        pytest.param("eoa", id=""),
+    ],
+    indirect=True,
+)
+@pytest.mark.parametrize(
+    "data_test_type",
+    [
+        pytest.param(
+            DataTestType.FLOOR_GAS_COST_GREATER_THAN_INTRINSIC_GAS,
+            id="",
+        ),
+    ],
+)
+def test_eip_7976(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    tx: Transaction,
+) -> None:
+    """
+    Test transaction validity for transactions without access lists
+    and contract creation.
+    """
+    state_test(
+        pre=pre,
+        post={},
+        tx=tx,
+    )
diff --git a/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_execution_gas.py b/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_execution_gas.py
new file mode 100644
index 00000000000..a46c9d5daf6
--- /dev/null
+++ b/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_execution_gas.py
@@ -0,0 +1,173 @@
+"""
+Test [EIP-7976: Increase calldata floor cost](https://eips.ethereum.org/EIPS/eip-7976).
+"""
+
+from typing import List
+
+import pytest
+from execution_testing import (
+    AccessList,
+    Address,
+    Alloc,
+    AuthorizationTuple,
+    Bytes,
+    Fork,
+    Op,
+    StateTestFiller,
+    Transaction,
+    TransactionReceipt,
+)
+
+from .helpers import DataTestType
+from .spec import ref_spec_7976
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7976.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7976.version
+
+pytestmark = [pytest.mark.valid_from("EIP7976")]
+
+
+@pytest.fixture
+def data_test_type() -> DataTestType:
+    """Return data test type."""
+    return DataTestType.FLOOR_GAS_COST_GREATER_THAN_INTRINSIC_GAS
+
+
+class TestGasConsumption:
+    """Test gas consumption with EIP-7976 active."""
+
+    @pytest.fixture
+    def intrinsic_gas_data_floor_minimum_delta(self) -> int:
+        """
+        Force a minimum delta in order to have some gas to execute the invalid
+        opcode.
+        """
+        return 50_000
+
+    @pytest.fixture
+    def to(
+        self,
+        pre: Alloc,
+    ) -> Address | None:
+        """
+        Return a contract that consumes all gas when executed by calling an
+        invalid opcode.
+        """
+        return pre.deploy_contract(Op.INVALID)
+
+    @pytest.mark.parametrize(
+        "ty,protected,authorization_list",
+        [
+            pytest.param(0, False, None, id="type_0_unprotected"),
+            pytest.param(0, True, None, id="type_0_protected"),
+            pytest.param(1, True, None, id="type_1"),
+            pytest.param(2, True, None, id="type_2"),
+            pytest.param(3, True, None, id="type_3"),
+            pytest.param(4, True, [Address(1)], id="type_4"),
+        ],
+        indirect=["authorization_list"],
+    )
+    @pytest.mark.parametrize(
+        "tx_gas_delta",
+        [
+            # Test with exact gas and extra gas.
+            pytest.param(1, id="extra_gas"),
+            pytest.param(0, id="exact_gas"),
+        ],
+    )
+    def test_full_gas_consumption(
+        self,
+        state_test: StateTestFiller,
+        pre: Alloc,
+        tx: Transaction,
+    ) -> None:
+        """
+        Test executing a transaction that fully consumes its execution gas
+        allocation.
+        """
+        tx.expected_receipt = TransactionReceipt(
+            cumulative_gas_used=tx.gas_limit
+        )
+        state_test(
+            pre=pre,
+            post={},
+            tx=tx,
+        )
+
+
+class TestGasConsumptionBelowDataFloor:
+    """Test gas consumption barely below the floor data cost (1 gas below)."""
+
+    @pytest.fixture
+    def contract_creating_tx(self) -> bool:
+        """Use a constant in order to avoid circular fixture dependencies."""
+        return False
+
+    @pytest.fixture
+    def to(
+        self,
+        pre: Alloc,
+        fork: Fork,
+        tx_data: Bytes,
+        access_list: List[AccessList] | None,
+        authorization_list: List[AuthorizationTuple] | None,
+        tx_floor_data_cost: int,
+    ) -> Address | None:
+        """
+        Return a contract that consumes almost all the gas before reaching the
+        floor data cost.
+        """
+        intrinsic_gas_cost_calculator = (
+            fork.transaction_intrinsic_cost_calculator()
+        )
+        execution_gas = tx_floor_data_cost - intrinsic_gas_cost_calculator(
+            calldata=tx_data,
+            contract_creation=False,
+            access_list=access_list,
+            authorization_list_or_count=authorization_list,
+            return_cost_deducted_prior_execution=True,
+        )
+        assert execution_gas > 0
+
+        return pre.deploy_contract(
+            (Op.JUMPDEST * (execution_gas - 1)) + Op.STOP
+        )
+
+    @pytest.mark.parametrize(
+        "ty,protected,authorization_list",
+        [
+            pytest.param(0, False, None, id="type_0_unprotected"),
+            pytest.param(0, True, None, id="type_0_protected"),
+            pytest.param(1, True, None, id="type_1"),
+            pytest.param(2, True, None, id="type_2"),
+            pytest.param(3, True, None, id="type_3"),
+            pytest.param(4, True, [Address(1)], id="type_4"),
+        ],
+        indirect=["authorization_list"],
+    )
+    @pytest.mark.parametrize(
+        "tx_gas_delta",
+        [
+            # Test with exact gas and extra gas, to verify that the refund is
+            # correctly applied to the full consumed execution gas.
+            pytest.param(0, id="exact_gas"),
+        ],
+    )
+    def test_gas_consumption_below_data_floor(
+        self,
+        state_test: StateTestFiller,
+        pre: Alloc,
+        tx: Transaction,
+        tx_floor_data_cost: int,
+    ) -> None:
+        """
+        Test executing a transaction that almost consumes the floor data cost.
+        """
+        tx.expected_receipt = TransactionReceipt(
+            cumulative_gas_used=tx_floor_data_cost
+        )
+        state_test(
+            pre=pre,
+            post={},
+            tx=tx,
+        )
diff --git a/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_floor_boundary_exact_balance.py b/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_floor_boundary_exact_balance.py
new file mode 100644
index 00000000000..b913e674f4d
--- /dev/null
+++ b/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_floor_boundary_exact_balance.py
@@ -0,0 +1,78 @@
+"""
+abstract: Tests for floor-boundary rejection with exact-balance funding in [EIP-7976: Increase Calldata Floor Cost](https://eips.ethereum.org/EIPS/eip-7976).
+"""  # noqa: E501
+
+import pytest
+from execution_testing import (
+    Alloc,
+    Bytes,
+    Fork,
+    StateTestFiller,
+    Transaction,
+    TransactionException,
+)
+
+from ...prague.eip7623_increase_calldata_cost.spec import Spec as Spec7623
+from .spec import ref_spec_7976
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7976.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7976.version
+
+pytestmark = pytest.mark.valid_at("EIP7976")
+
+
+@pytest.mark.exception_test
+@pytest.mark.parametrize(
+    "zero_bytes",
+    [
+        pytest.param(100, id="100_zero_bytes"),
+        pytest.param(1000, id="1000_zero_bytes"),
+    ],
+)
+def test_below_amsterdam_floor_with_exact_balance_sender(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    zero_bytes: int,
+) -> None:
+    """
+    Reject when gas_limit sits between Prague and Amsterdam floor.
+
+    EIP-7976 raises the per-byte calldata floor cost. A transaction
+    with `gas_limit` in `[Prague_floor, Amsterdam_floor)` must reject
+    with `INTRINSIC_GAS_BELOW_FLOOR_GAS_COST`. The sender is funded
+    with exactly `gas_limit * gas_price` so an implementation that
+    uses the Prague floor cannot fall back to silent execution.
+
+    Type-0 only on purpose; broader type-1/2/3/4 coverage lives in
+    `test_transaction_validity.py`.
+    """
+    tx_data = Bytes(b"\x00" * zero_bytes)
+    intrinsic_regular = fork.transaction_intrinsic_cost_calculator()(
+        calldata=tx_data,
+        return_cost_deducted_prior_execution=True,
+    )
+    amsterdam_floor = fork.transaction_data_floor_cost_calculator()(
+        data=tx_data,
+    )
+    # Prague counts each zero byte as one token at TX_DATA_TOKEN_FLOOR
+    # gas/token. Cannot be derived from amsterdam_floor because EIP-7976
+    # changes both the per-token rate (10->16) and the floor tokenization
+    # (zero/nonzero both weighted by 4).
+    prague_floor = 21000 + Spec7623.TX_DATA_TOKEN_FLOOR * zero_bytes
+    gas_limit = (prague_floor + amsterdam_floor) // 2
+    assert intrinsic_regular <= gas_limit
+    assert prague_floor <= gas_limit < amsterdam_floor
+
+    gas_price = 10
+    sender = pre.fund_eoa(amount=gas_limit * gas_price)
+    tx = Transaction(
+        sender=sender,
+        to=pre.fund_eoa(amount=0),
+        data=tx_data,
+        gas_limit=gas_limit,
+        gas_price=gas_price,
+        error=TransactionException.INTRINSIC_GAS_BELOW_FLOOR_GAS_COST,
+    )
+
+    state_test(pre=pre, post={}, tx=tx)
diff --git a/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_refunds.py b/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_refunds.py
new file mode 100644
index 00000000000..4fcddcd316c
--- /dev/null
+++ b/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_refunds.py
@@ -0,0 +1,335 @@
+"""
+Test [EIP-7976: Increase calldata floor cost](https://eips.ethereum.org/EIPS/eip-7976).
+"""
+
+from enum import Enum
+from typing import Dict, List
+
+import pytest
+from execution_testing import (
+    Address,
+    Alloc,
+    AuthorizationTuple,
+    Bytecode,
+    Fork,
+    Op,
+    RefundTypes,
+    StateTestFiller,
+    Transaction,
+    TransactionReceipt,
+)
+
+from .helpers import DataTestType
+from .spec import ref_spec_7976
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7976.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7976.version
+
+pytestmark = [pytest.mark.valid_from("EIP7976")]
+
+
+class RefundTestType(Enum):
+    """Refund test type."""
+
+    EXECUTION_GAS_MINUS_REFUND_GREATER_THAN_DATA_FLOOR = 0
+    """
+    The execution gas minus the refund is greater than the data floor, hence
+    the execution gas cost is charged.
+    """
+    EXECUTION_GAS_MINUS_REFUND_LESS_THAN_DATA_FLOOR = 1
+    """
+    The execution gas minus the refund is less than the data floor, hence the
+    data floor cost is charged.
+    """
+    EXECUTION_GAS_MINUS_REFUND_EQUAL_TO_DATA_FLOOR = 2
+    """The execution gas minus the refund is equal to the data floor."""
+
+
+@pytest.fixture
+def data_test_type() -> DataTestType:
+    """Return data test type."""
+    return DataTestType.FLOOR_GAS_COST_GREATER_THAN_INTRINSIC_GAS
+
+
+@pytest.fixture
+def authorization_list(
+    pre: Alloc, refund_type: RefundTypes
+) -> List[AuthorizationTuple] | None:
+    """
+    Modify fixture from conftest to automatically read the refund_type
+    information.
+    """
+    if refund_type != RefundTypes.AUTHORIZATION_EXISTING_AUTHORITY:
+        return None
+    return [AuthorizationTuple(signer=pre.fund_eoa(1), address=Address(1))]
+
+
+@pytest.fixture
+def ty(refund_type: RefundTypes) -> int:
+    """
+    Modify fixture from conftest to automatically read the refund_type
+    information.
+    """
+    if refund_type == RefundTypes.AUTHORIZATION_EXISTING_AUTHORITY:
+        return 4
+    if refund_type == RefundTypes.STORAGE_CLEAR:
+        return 2
+    raise ValueError(f"Unknown refund type: {refund_type}")
+
+
+@pytest.fixture
+def max_refund(fork: Fork, refund_type: RefundTypes) -> int:
+    """Return the max refund gas of the transaction."""
+    gas_costs = fork.gas_costs()
+    max_refund = (
+        gas_costs.REFUND_STORAGE_CLEAR
+        if refund_type == RefundTypes.STORAGE_CLEAR
+        else 0
+    )
+    max_refund += (
+        gas_costs.REFUND_AUTH_PER_EXISTING_ACCOUNT
+        if refund_type == RefundTypes.AUTHORIZATION_EXISTING_AUTHORITY
+        else 0
+    )
+    return max_refund
+
+
+@pytest.fixture
+def prefix_code_gas(fork: Fork, refund_type: RefundTypes) -> int:
+    """Return the minimum execution gas cost due to the refund type."""
+    if refund_type == RefundTypes.STORAGE_CLEAR:
+        # Minimum code to generate a storage clear is Op.SSTORE(0, 0).
+        return (
+            Op.SSTORE(
+                key_warm=False,
+                original_value=1,
+                new_value=0,
+            )
+            + Op.PUSH1(0) * 2
+        ).gas_cost(fork)
+    return 0
+
+
+@pytest.fixture
+def prefix_code(refund_type: RefundTypes) -> Bytecode:
+    """Return the minimum execution gas cost due to the refund type."""
+    if refund_type == RefundTypes.STORAGE_CLEAR:
+        # Clear the storage to trigger a refund.
+        return Op.SSTORE(0, 0)
+    return Bytecode()
+
+
+@pytest.fixture
+def code_storage(refund_type: RefundTypes) -> Dict:
+    """Return the minimum execution gas cost due to the refund type."""
+    if refund_type == RefundTypes.STORAGE_CLEAR:
+        # Pre-set the storage to be cleared.
+        return {0: 1}
+    return {}
+
+
+@pytest.fixture
+def contract_creating_tx() -> bool:
+    """
+    Override fixture in order to avoid a circular fixture dependency since none
+    of these tests are contract creating transactions.
+    """
+    return False
+
+
+@pytest.fixture
+def intrinsic_gas_data_floor_minimum_delta() -> int:
+    """
+    Induce a minimum delta between the transaction intrinsic gas cost and the
+    floor data gas cost.
+
+    Since at least one of the cases requires some execution gas expenditure
+    (SSTORE clearing), we need to introduce an increment of the floor data cost
+    above the transaction intrinsic gas cost, otherwise the floor data cost
+    would always be the below the execution gas cost even after the refund is
+    applied.
+
+    This value has been set as of Amsterdam and should be adjusted if the gas
+    costs change.
+    """
+    return 250
+
+
+@pytest.fixture
+def execution_gas_used(
+    fork: Fork,
+    tx_intrinsic_gas_cost_before_execution: int,
+    tx_floor_data_cost: int,
+    max_refund: int,
+    prefix_code_gas: int,
+    refund_test_type: RefundTestType,
+) -> int:
+    """
+    Return the amount of gas that needs to be consumed by the execution.
+
+    This gas amount is on top of the transaction intrinsic gas cost.
+
+    If this value were zero it would result in the refund being applied to the
+    execution gas cost and the resulting amount being always below the floor
+    data cost, hence we need to find a higher value in this function to ensure
+    we get both scenarios where the refund drives the execution cost below the
+    floor data cost and above the floor data cost.
+    """
+
+    def execution_gas_cost(execution_gas: int) -> int:
+        total_gas_used = tx_intrinsic_gas_cost_before_execution + execution_gas
+        return total_gas_used - min(
+            max_refund, total_gas_used // fork.max_refund_quotient()
+        )
+
+    execution_gas = prefix_code_gas
+
+    assert execution_gas_cost(execution_gas) < tx_floor_data_cost, (
+        "tx_floor_data_cost is too low, there might have been a gas cost "
+        "change that caused this test to fail. Try increasing the "
+        "intrinsic_gas_data_floor_minimum_delta fixture."
+    )
+
+    # Dumb for-loop to find the execution gas cost that will result in the
+    # expected refund.
+    while execution_gas_cost(execution_gas) < tx_floor_data_cost:
+        execution_gas += 1
+    if (
+        refund_test_type
+        == RefundTestType.EXECUTION_GAS_MINUS_REFUND_EQUAL_TO_DATA_FLOOR
+    ):
+        return execution_gas
+    elif (
+        refund_test_type
+        == RefundTestType.EXECUTION_GAS_MINUS_REFUND_GREATER_THAN_DATA_FLOOR
+    ):
+        # Keep incrementing until we actually get gas_used > tx_floor_data_cost
+        # (adding just 1 may not be enough due to refund cap boundary effects)
+        while execution_gas_cost(execution_gas) <= tx_floor_data_cost:
+            execution_gas += 1
+        return execution_gas
+    elif (
+        refund_test_type
+        == RefundTestType.EXECUTION_GAS_MINUS_REFUND_LESS_THAN_DATA_FLOOR
+    ):
+        return execution_gas - 1
+
+    raise ValueError("Invalid refund test type")
+
+
+@pytest.fixture
+def refund(
+    fork: Fork,
+    tx_intrinsic_gas_cost_before_execution: int,
+    execution_gas_used: int,
+    max_refund: int,
+) -> int:
+    """Return the refund gas of the transaction."""
+    total_gas_used = (
+        tx_intrinsic_gas_cost_before_execution + execution_gas_used
+    )
+    return min(max_refund, total_gas_used // fork.max_refund_quotient())
+
+
+@pytest.fixture
+def to(
+    pre: Alloc,
+    execution_gas_used: int,
+    prefix_code: Bytecode,
+    prefix_code_gas: int,
+    code_storage: Dict,
+) -> Address | None:
+    """
+    Return a contract that consumes the expected execution gas.
+
+    At the moment we naively use JUMPDEST to consume the gas, which can yield
+    very big contracts.
+
+    Ideally, we can use memory expansion to consume gas.
+    """
+    extra_gas = execution_gas_used - prefix_code_gas
+    return pre.deploy_contract(
+        prefix_code + (Op.JUMPDEST * extra_gas) + Op.STOP,
+        storage=code_storage,
+    )
+
+
+@pytest.fixture
+def tx_gas_limit(
+    tx_intrinsic_gas_cost_including_floor_data_cost: int,
+    tx_intrinsic_gas_cost_before_execution: int,
+    execution_gas_used: int,
+) -> int:
+    """
+    Gas limit for the transaction.
+
+    The gas delta is added to the intrinsic gas cost to generate different test
+    scenarios.
+    """
+    tx_gas_limit = tx_intrinsic_gas_cost_before_execution + execution_gas_used
+    assert tx_gas_limit >= tx_intrinsic_gas_cost_including_floor_data_cost
+    return tx_gas_limit
+
+
+@pytest.mark.parametrize(
+    "refund_test_type",
+    [
+        RefundTestType.EXECUTION_GAS_MINUS_REFUND_GREATER_THAN_DATA_FLOOR,
+        RefundTestType.EXECUTION_GAS_MINUS_REFUND_LESS_THAN_DATA_FLOOR,
+        RefundTestType.EXECUTION_GAS_MINUS_REFUND_EQUAL_TO_DATA_FLOOR,
+    ],
+)
+@pytest.mark.with_all_refund_types()
+def test_gas_refunds_from_data_floor(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    tx: Transaction,
+    tx_floor_data_cost: int,
+    tx_intrinsic_gas_cost_before_execution: int,
+    execution_gas_used: int,
+    refund: int,
+    refund_test_type: RefundTestType,
+) -> None:
+    """
+    Test gas refunds deducted from the execution gas cost and not the data
+    floor.
+    """
+    gas_used = (
+        tx_intrinsic_gas_cost_before_execution + execution_gas_used - refund
+    )
+    if (
+        refund_test_type
+        == RefundTestType.EXECUTION_GAS_MINUS_REFUND_LESS_THAN_DATA_FLOOR
+    ):
+        assert gas_used < tx_floor_data_cost
+    elif (
+        refund_test_type
+        == RefundTestType.EXECUTION_GAS_MINUS_REFUND_GREATER_THAN_DATA_FLOOR
+    ):
+        assert gas_used > tx_floor_data_cost
+    elif (
+        refund_test_type
+        == RefundTestType.EXECUTION_GAS_MINUS_REFUND_EQUAL_TO_DATA_FLOOR
+    ):
+        assert gas_used == tx_floor_data_cost
+    else:
+        raise ValueError("Invalid refund test type")
+    if gas_used < tx_floor_data_cost:
+        gas_used = tx_floor_data_cost
+    # This is the actual test verification:
+    #   - During test filling, the receipt returned by the transition tool
+    #     (t8n) is verified against the expected receipt.
+    #   - During test consumption, this is reflected in the balance difference
+    #     and the state root.
+    tx.expected_receipt = TransactionReceipt(cumulative_gas_used=gas_used)
+    state_test(
+        pre=pre,
+        post={
+            tx.to: {
+                # Verify that the storage was cleared (for storage clear
+                # refund). See `code_storage` fixture for more details.
+                "storage": {0: 0},
+            }
+        },
+        tx=tx,
+    )
diff --git a/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_transaction_validity.py b/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_transaction_validity.py
new file mode 100644
index 00000000000..f12c8f11444
--- /dev/null
+++ b/tests/amsterdam/eip7976_increase_calldata_floor_cost/test_transaction_validity.py
@@ -0,0 +1,384 @@
+"""
+Test [EIP-7976: Increase calldata floor cost](https://eips.ethereum.org/EIPS/eip-7976).
+"""
+
+import pytest
+from execution_testing import (
+    AccessList,
+    Address,
+    Alloc,
+    Hash,
+    Op,
+    StateTestFiller,
+    Transaction,
+    add_kzg_version,
+)
+
+from ...osaka.eip7594_peerdas.spec import Spec as EIP_7594_Spec
+from .helpers import DataTestType
+from .spec import ref_spec_7976
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7976.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7976.version
+
+pytestmark = [pytest.mark.valid_from("EIP7976")]
+
+
+# All tests in this file are parametrized with the following parameters:
+pytestmark += [
+    pytest.mark.parametrize(
+        "tx_gas_delta",
+        [
+            # Test the case where the included gas is greater than the
+            # intrinsic gas to verify that the data floor does not consume more
+            # gas than it should.
+            pytest.param(1, id="extra_gas"),
+            pytest.param(0, id="exact_gas"),
+            pytest.param(
+                -1, id="insufficient_gas", marks=pytest.mark.exception_test
+            ),
+        ],
+    ),
+    pytest.mark.parametrize(
+        "data_test_type",
+        [
+            pytest.param(
+                DataTestType.FLOOR_GAS_COST_LESS_THAN_OR_EQUAL_TO_INTRINSIC_GAS,
+                id="floor_gas_less_than_or_equal_to_intrinsic_gas",
+            ),
+            pytest.param(
+                DataTestType.FLOOR_GAS_COST_GREATER_THAN_INTRINSIC_GAS,
+                id="floor_gas_greater_than_intrinsic_gas",
+            ),
+        ],
+    ),
+]
+
+
+@pytest.mark.parametrize(
+    "protected",
+    [
+        pytest.param(True, id="protected"),
+        pytest.param(False, id="unprotected"),
+    ],
+)
+@pytest.mark.parametrize(
+    "ty",
+    [pytest.param(0, id="type_0")],
+)
+@pytest.mark.parametrize(
+    "to",
+    [
+        pytest.param("eoa", id="to_eoa"),
+        pytest.param(None, id="contract_creating"),
+        pytest.param(Op.STOP, id=""),
+    ],
+    indirect=True,
+)
+def test_transaction_validity_type_0(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    tx: Transaction,
+) -> None:
+    """
+    Test transaction validity for transactions without access lists and
+    contract creation.
+    """
+    state_test(
+        pre=pre,
+        post={},
+        tx=tx,
+    )
+
+
+@pytest.mark.parametrize(
+    "to",
+    [
+        pytest.param("eoa", id="to_eoa"),
+        pytest.param(None, id="contract_creating"),
+        pytest.param(Op.STOP, id=""),
+    ],
+    indirect=True,
+)
+@pytest.mark.parametrize(
+    "access_list",
+    [
+        pytest.param(
+            None,
+            id="no_access_list",
+        ),
+        pytest.param(
+            [AccessList(address=Address(1), storage_keys=[])],
+            id="single_access_list_no_storage_keys",
+        ),
+        pytest.param(
+            [AccessList(address=Address(1), storage_keys=[Hash(0)])],
+            id="single_access_list_single_storage_key",
+        ),
+        pytest.param(
+            [
+                AccessList(
+                    address=Address(1),
+                    storage_keys=[Hash(k) for k in range(10)],
+                )
+            ],
+            id="single_access_list_multiple_storage_keys",
+        ),
+        pytest.param(
+            [
+                AccessList(address=Address(a), storage_keys=[])
+                for a in range(10)
+            ],
+            id="multiple_access_lists_no_storage_keys",
+        ),
+        pytest.param(
+            [
+                AccessList(address=Address(a), storage_keys=[Hash(0)])
+                for a in range(10)
+            ],
+            id="multiple_access_lists_single_storage_key",
+        ),
+        pytest.param(
+            [
+                AccessList(
+                    address=Address(a),
+                    storage_keys=[Hash(k) for k in range(10)],
+                )
+                for a in range(10)
+            ],
+            id="multiple_access_lists_multiple_storage_keys",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "ty",
+    [pytest.param(1, id="type_1"), pytest.param(2, id="type_2")],
+)
+def test_transaction_validity_type_1_type_2(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    tx: Transaction,
+) -> None:
+    """
+    Test transaction validity for transactions with access lists and contract
+    creation.
+    """
+    state_test(
+        pre=pre,
+        post={},
+        tx=tx,
+    )
+
+
+@pytest.mark.parametrize(
+    "access_list",
+    [
+        pytest.param(
+            None,
+            id="no_access_list",
+        ),
+        pytest.param(
+            [AccessList(address=Address(1), storage_keys=[])],
+            id="single_access_list_no_storage_keys",
+        ),
+        pytest.param(
+            [AccessList(address=Address(1), storage_keys=[Hash(0)])],
+            id="single_access_list_single_storage_key",
+        ),
+        pytest.param(
+            [
+                AccessList(
+                    address=Address(1),
+                    storage_keys=[Hash(k) for k in range(10)],
+                )
+            ],
+            id="single_access_list_multiple_storage_keys",
+        ),
+        pytest.param(
+            [
+                AccessList(address=Address(a), storage_keys=[])
+                for a in range(10)
+            ],
+            id="multiple_access_lists_no_storage_keys",
+        ),
+        pytest.param(
+            [
+                AccessList(address=Address(a), storage_keys=[Hash(0)])
+                for a in range(10)
+            ],
+            id="multiple_access_lists_single_storage_key",
+        ),
+        pytest.param(
+            [
+                AccessList(
+                    address=Address(a),
+                    storage_keys=[Hash(k) for k in range(10)],
+                )
+                for a in range(10)
+            ],
+            id="multiple_access_lists_multiple_storage_keys",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    # Blobs don't really have an effect because the blob gas does is not
+    # considered in the intrinsic gas calculation, but we still test it to make
+    # sure that the transaction is correctly processed.
+    "blob_versioned_hashes",
+    [
+        pytest.param(
+            add_kzg_version(
+                [Hash(x) for x in range(1)],
+                EIP_7594_Spec.BLOB_COMMITMENT_VERSION_KZG,
+            ),
+            id="single_blob",
+        ),
+        pytest.param(
+            add_kzg_version(
+                [Hash(x) for x in range(6)],
+                EIP_7594_Spec.BLOB_COMMITMENT_VERSION_KZG,
+            ),
+            id="multiple_blobs",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "ty",
+    [pytest.param(3, id="type_3")],
+)
+def test_transaction_validity_type_3(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    tx: Transaction,
+) -> None:
+    """
+    Test transaction validity for transactions with access lists, blobs, but no
+    contract creation.
+    """
+    state_test(
+        pre=pre,
+        post={},
+        tx=tx,
+    )
+
+
+@pytest.mark.parametrize(
+    "access_list",
+    [
+        pytest.param(
+            None,
+            id="no_access_list",
+        ),
+        pytest.param(
+            [AccessList(address=Address(1), storage_keys=[])],
+            id="single_access_list_no_storage_keys",
+        ),
+        pytest.param(
+            [AccessList(address=Address(1), storage_keys=[Hash(0)])],
+            id="single_access_list_single_storage_key",
+        ),
+        pytest.param(
+            [
+                AccessList(
+                    address=Address(1),
+                    storage_keys=[Hash(k) for k in range(10)],
+                )
+            ],
+            id="single_access_list_multiple_storage_keys",
+        ),
+        pytest.param(
+            [
+                AccessList(address=Address(a), storage_keys=[])
+                for a in range(10)
+            ],
+            id="multiple_access_lists_no_storage_keys",
+        ),
+        pytest.param(
+            [
+                AccessList(address=Address(a), storage_keys=[Hash(0)])
+                for a in range(10)
+            ],
+            id="multiple_access_lists_single_storage_key",
+        ),
+        pytest.param(
+            [
+                AccessList(
+                    address=Address(a),
+                    storage_keys=[Hash(k) for k in range(10)],
+                )
+                for a in range(10)
+            ],
+            id="multiple_access_lists_multiple_storage_keys",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "authorization_list",
+    [
+        pytest.param(
+            [Address(1)],
+            id="single_authorization",
+        ),
+        pytest.param(
+            [Address(i + 1) for i in range(10)],
+            id="multiple_authorizations",
+        ),
+    ],
+    indirect=True,
+)
+@pytest.mark.parametrize(
+    "ty",
+    [pytest.param(4, id="type_4")],
+)
+def test_transaction_validity_type_4(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    tx: Transaction,
+) -> None:
+    """
+    Test transaction validity for transactions with access lists, authorization
+    lists, but no contract creation.
+    """
+    state_test(
+        pre=pre,
+        post={},
+        tx=tx,
+    )
+
+
+@pytest.mark.parametrize(
+    "ty",
+    [pytest.param(0, id="type_0"), pytest.param(2, id="type_2")],
+)
+@pytest.mark.parametrize(
+    "to",
+    [
+        pytest.param(
+            Op.PUSH0
+            + Op.PUSH0
+            + Op.PUSH0
+            + Op.PUSH0
+            + Op.PUSH0
+            + Op.PUSH0
+            + Op.CREATE2
+            + Op.STOP,
+            id="contract_with_create2",
+        ),
+    ],
+    indirect=True,
+)
+def test_transaction_validity_with_create2(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    tx: Transaction,
+) -> None:
+    """
+    Test transaction validity for transactions calling a contract that uses
+    CREATE2 internally. This verifies that internal contract creation via
+    CREATE2 doesn't interfere with the floor gas cost mechanism.
+    """
+    state_test(
+        pre=pre,
+        post={},
+        tx=tx,
+    )
diff --git a/tests/amsterdam/eip7981_increase_access_list_cost/__init__.py b/tests/amsterdam/eip7981_increase_access_list_cost/__init__.py
new file mode 100644
index 00000000000..bbbd9412cb8
--- /dev/null
+++ b/tests/amsterdam/eip7981_increase_access_list_cost/__init__.py
@@ -0,0 +1 @@
+"""Tests for EIP-7981: Increase Access List Cost."""
diff --git a/tests/amsterdam/eip7981_increase_access_list_cost/conftest.py b/tests/amsterdam/eip7981_increase_access_list_cost/conftest.py
new file mode 100644
index 00000000000..104a73e464a
--- /dev/null
+++ b/tests/amsterdam/eip7981_increase_access_list_cost/conftest.py
@@ -0,0 +1,260 @@
+"""Fixtures for the EIP-7981 tests."""
+
+from typing import List, Sequence
+
+import pytest
+from execution_testing import (
+    EOA,
+    AccessList,
+    Address,
+    Alloc,
+    AuthorizationTuple,
+    Bytecode,
+    Bytes,
+    Fork,
+    Hash,
+    Op,
+    Transaction,
+    TransactionException,
+    add_kzg_version,
+)
+
+from ...cancun.eip4844_blobs.spec import Spec as EIP_4844_Spec
+
+
+@pytest.fixture
+def to(
+    request: pytest.FixtureRequest,
+    pre: Alloc,
+) -> Address | None:
+    """Create the recipient address."""
+    if hasattr(request, "param"):
+        param = request.param
+    else:
+        param = Op.STOP
+
+    if param is None:
+        return None
+    if isinstance(param, str) and param == "eoa":
+        return pre.fund_eoa(amount=0)
+    if isinstance(param, Bytecode):
+        return pre.deploy_contract(param)
+
+    raise ValueError(f"Invalid value for `to` fixture: {param}")
+
+
+@pytest.fixture
+def protected() -> bool:
+    """
+    Return whether the transaction is protected or not. Only valid for type-0
+    transactions.
+    """
+    return True
+
+
+@pytest.fixture
+def access_list() -> List[AccessList] | None:
+    """Access list for the transaction."""
+    return None
+
+
+@pytest.fixture
+def authorization_refund() -> bool:
+    """
+    Return whether the transaction has an existing authority in the
+    authorization list.
+    """
+    return False
+
+
+@pytest.fixture
+def authorization_list(
+    request: pytest.FixtureRequest,
+    pre: Alloc,
+    authorization_refund: bool,
+    tx_type: int,
+) -> List[AuthorizationTuple] | None:
+    """
+    Authorization-list for the transaction.
+
+    This fixture needs to be parametrized indirectly in order to generate the
+    authorizations with valid signers using `pre` in this function, and the
+    parametrized value should be a list of addresses.
+    """
+    if not hasattr(request, "param"):
+        if tx_type == 4:
+            return [
+                AuthorizationTuple(
+                    signer=pre.fund_eoa(1 if authorization_refund else 0),
+                    address=Address(1),
+                )
+            ]
+        return None
+    if request.param is None:
+        if tx_type == 4:
+            return [
+                AuthorizationTuple(
+                    signer=pre.fund_eoa(1 if authorization_refund else 0),
+                    address=Address(1),
+                )
+            ]
+        return None
+    return [
+        AuthorizationTuple(
+            signer=pre.fund_eoa(1 if authorization_refund else 0),
+            address=address,
+        )
+        for address in request.param
+    ]
+
+
+@pytest.fixture
+def blob_versioned_hashes(tx_type: int) -> Sequence[Hash] | None:
+    """Versioned hashes for the transaction."""
+    return (
+        add_kzg_version(
+            [Hash(1)],
+            EIP_4844_Spec.BLOB_COMMITMENT_VERSION_KZG,
+        )
+        if tx_type == 3
+        else None
+    )
+
+
+@pytest.fixture
+def contract_creating_tx(to: Address | None) -> bool:
+    """Return whether the transaction creates a contract or not."""
+    return to is None
+
+
+@pytest.fixture
+def tx_data() -> Bytes:
+    """
+    Transaction data.
+
+    Default is empty, but can be parametrized to test different scenarios.
+    """
+    return Bytes(b"")
+
+
+@pytest.fixture
+def tx_gas_delta() -> int:
+    """
+    Gas delta to modify the gas amount included with the transaction.
+
+    If negative, the transaction will be invalid because the intrinsic gas cost
+    is greater than the gas limit.
+
+    This value operates regardless of whether the floor data gas cost is
+    reached or not.
+
+    If the value is greater than zero, the transaction will also be valid and
+    the test will check that transaction processing does not consume more gas
+    than it should.
+    """
+    return 0
+
+
+@pytest.fixture
+def tx_intrinsic_gas_cost_before_execution(
+    fork: Fork,
+    tx_data: Bytes,
+    access_list: List[AccessList] | None,
+    authorization_list: List[AuthorizationTuple] | None,
+    contract_creating_tx: bool,
+) -> int:
+    """
+    Return the intrinsic gas cost that is applied before the execution start.
+
+    This value never includes the floor data gas cost.
+    """
+    intrinsic_gas_cost_calculator = (
+        fork.transaction_intrinsic_cost_calculator()
+    )
+    return intrinsic_gas_cost_calculator(
+        calldata=tx_data,
+        contract_creation=contract_creating_tx,
+        access_list=access_list,
+        authorization_list_or_count=authorization_list,
+        return_cost_deducted_prior_execution=True,
+    )
+
+
+@pytest.fixture
+def tx_intrinsic_gas_cost_including_floor_data_cost(
+    fork: Fork,
+    tx_data: Bytes,
+    access_list: List[AccessList] | None,
+    authorization_list: List[AuthorizationTuple] | None,
+    contract_creating_tx: bool,
+) -> int:
+    """
+    Transaction intrinsic gas cost.
+
+    The calculated value takes into account the normal intrinsic gas cost and
+    the floor data gas cost if it is greater than the intrinsic gas cost.
+
+    In other words, this is the value that is required for the transaction to
+    be valid.
+    """
+    intrinsic_gas_cost_calculator = (
+        fork.transaction_intrinsic_cost_calculator()
+    )
+    return intrinsic_gas_cost_calculator(
+        calldata=tx_data,
+        contract_creation=contract_creating_tx,
+        access_list=access_list,
+        authorization_list_or_count=authorization_list,
+    )
+
+
+@pytest.fixture
+def tx_gas_limit(
+    tx_intrinsic_gas_cost_including_floor_data_cost: int,
+    tx_gas_delta: int,
+) -> int:
+    """
+    Gas limit for the transaction.
+
+    The gas delta is added to the intrinsic gas cost to generate different test
+    scenarios.
+    """
+    return tx_intrinsic_gas_cost_including_floor_data_cost + tx_gas_delta
+
+
+@pytest.fixture
+def tx_error(
+    tx_gas_delta: int,
+) -> TransactionException | None:
+    """Transaction error, only expected if the gas delta is negative."""
+    if tx_gas_delta < 0:
+        return TransactionException.INTRINSIC_GAS_TOO_LOW
+    return None
+
+
+@pytest.fixture
+def tx(
+    sender: EOA,
+    tx_type: int,
+    tx_data: Bytes,
+    to: Address | None,
+    protected: bool,
+    access_list: List[AccessList] | None,
+    authorization_list: List[AuthorizationTuple] | None,
+    blob_versioned_hashes: Sequence[Hash] | None,
+    tx_gas_limit: int,
+    tx_error: TransactionException | None,
+) -> Transaction:
+    """Create the transaction used in each test."""
+    return Transaction(
+        ty=tx_type,
+        sender=sender,
+        data=tx_data,
+        to=to,
+        protected=protected,
+        access_list=access_list,
+        authorization_list=authorization_list,
+        gas_limit=tx_gas_limit,
+        blob_versioned_hashes=blob_versioned_hashes,
+        error=tx_error,
+    )
diff --git a/tests/amsterdam/eip7981_increase_access_list_cost/helpers.py b/tests/amsterdam/eip7981_increase_access_list_cost/helpers.py
new file mode 100644
index 00000000000..503905014f2
--- /dev/null
+++ b/tests/amsterdam/eip7981_increase_access_list_cost/helpers.py
@@ -0,0 +1,30 @@
+"""Helpers for testing EIP-7981."""
+
+from typing import List
+
+from execution_testing import AccessList
+
+
+def calculate_access_list_floor_tokens(access_list: List[AccessList]) -> int:
+    """
+    Calculate the number of floor tokens in an access list.
+
+    According to EIP-7981 (aligned with EIP-7976), floor tokens are
+    calculated from the raw access list byte length:
+    floor_tokens = total_bytes * 4
+
+    Where bytes come from:
+    - 20 bytes per address
+    - 32 bytes per storage key
+    """
+    total_bytes = 0
+
+    for access in access_list:
+        # Count bytes in address (20 bytes)
+        total_bytes += len(access.address)
+
+        # Count bytes in each storage key (32 bytes each)
+        for slot in access.storage_keys:
+            total_bytes += len(slot)
+
+    return total_bytes * 4
diff --git a/tests/amsterdam/eip7981_increase_access_list_cost/spec.py b/tests/amsterdam/eip7981_increase_access_list_cost/spec.py
new file mode 100644
index 00000000000..30ff97e4fcc
--- /dev/null
+++ b/tests/amsterdam/eip7981_increase_access_list_cost/spec.py
@@ -0,0 +1,28 @@
+"""Defines EIP-7981 specification constants and functions."""
+
+from dataclasses import dataclass
+
+
+@dataclass(frozen=True)
+class ReferenceSpec:
+    """Defines the reference spec version and git path."""
+
+    git_path: str
+    version: str
+
+
+ref_spec_7981 = ReferenceSpec(
+    "EIPS/eip-7981.md", "954963fb6315dffadd9c40d48e4dae313e20cff5"
+)
+
+
+# Constants
+@dataclass(frozen=True)
+class Spec:
+    """
+    Parameters from the EIP-7981 specifications as defined at
+    https://eips.ethereum.org/EIPS/eip-7981.
+    """
+
+    ACCESS_LIST_ADDRESS_COST = 2400
+    ACCESS_LIST_STORAGE_KEY_COST = 1900
diff --git a/tests/amsterdam/eip7981_increase_access_list_cost/test_access_list_cost.py b/tests/amsterdam/eip7981_increase_access_list_cost/test_access_list_cost.py
new file mode 100644
index 00000000000..e9479b276c9
--- /dev/null
+++ b/tests/amsterdam/eip7981_increase_access_list_cost/test_access_list_cost.py
@@ -0,0 +1,263 @@
+"""
+abstract: Tests for access list cost calculations in [EIP-7981: Increase Access List Cost](https://eips.ethereum.org/EIPS/eip-7981).
+"""  # noqa: E501
+
+import pytest
+from execution_testing import (
+    AccessList,
+    Address,
+    Alloc,
+    Bytes,
+    Fork,
+    Hash,
+    StateTestFiller,
+    Transaction,
+    TransactionReceipt,
+)
+
+from .helpers import calculate_access_list_floor_tokens
+from .spec import ref_spec_7981
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7981.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7981.version
+
+pytestmark = pytest.mark.valid_at("EIP7981")
+
+
+@pytest.mark.with_all_tx_types(selector=lambda tx_type: tx_type >= 1)
+@pytest.mark.parametrize(
+    "access_list,expected_floor_tokens",
+    [
+        pytest.param(
+            [AccessList(address=Address(0), storage_keys=[])],
+            # 20 bytes total: 20 * 4 = 80 floor tokens
+            80,
+            id="single_zero_address_no_keys",
+        ),
+        pytest.param(
+            [
+                AccessList(
+                    address=Address(
+                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+                    ),
+                    storage_keys=[],
+                )
+            ],
+            # 20 bytes total: 20 * 4 = 80 floor tokens
+            80,
+            id="single_nonzero_address_no_keys",
+        ),
+        pytest.param(
+            [AccessList(address=Address(0), storage_keys=[Hash(0)])],
+            # Total bytes: 20 + 32 = 52, floor tokens: 52 * 4 = 208
+            208,
+            id="zero_address_zero_key",
+        ),
+        pytest.param(
+            [
+                AccessList(
+                    address=Address(
+                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+                    ),
+                    storage_keys=[
+                        Hash(
+                            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+                        )
+                    ],
+                )
+            ],
+            # Total bytes: 20 + 32 = 52, floor tokens: 52 * 4 = 208
+            208,
+            id="nonzero_address_nonzero_key",
+        ),
+        pytest.param(
+            [
+                AccessList(
+                    address=Address(1),
+                    storage_keys=[Hash(0), Hash(1), Hash(2)],
+                )
+            ],
+            # Total bytes: 20 + (3 * 32) = 116, floor tokens: 116 * 4 = 464
+            464,
+            id="one_address_three_keys",
+        ),
+        pytest.param(
+            [
+                AccessList(address=Address(1), storage_keys=[Hash(0)]),
+                AccessList(address=Address(2), storage_keys=[Hash(1)]),
+            ],
+            # Total bytes: 2 * (20 + 32) = 104, floor tokens: 104 * 4 = 416
+            416,
+            id="two_addresses_with_keys",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "to",
+    [pytest.param("eoa", id="")],
+    indirect=True,
+)
+def test_access_list_token_calculation(
+    state_test: StateTestFiller,
+    fork: Fork,
+    pre: Alloc,
+    tx: Transaction,
+    access_list: list,
+    expected_floor_tokens: int,
+) -> None:
+    """
+    Test that access list floor tokens are calculated correctly.
+
+    Every access list byte contributes four floor tokens regardless of
+    whether it is zero or non-zero. Verify both the reference helper and
+    the fork's floor cost calculator agree with the expected token count.
+    """
+    assert (
+        calculate_access_list_floor_tokens(access_list)
+        == expected_floor_tokens
+    )
+
+    gas_costs = fork.gas_costs()
+    expected_floor_cost = (
+        expected_floor_tokens * gas_costs.TX_DATA_TOKEN_FLOOR
+        + gas_costs.TX_BASE
+    )
+    actual_floor_cost = fork.transaction_data_floor_cost_calculator()(
+        data=b"", access_list=access_list
+    )
+    assert actual_floor_cost == expected_floor_cost
+
+    state_test(
+        pre=pre,
+        post={},
+        tx=tx,
+    )
+
+
+@pytest.mark.with_all_tx_types(selector=lambda tx_type: tx_type >= 1)
+@pytest.mark.parametrize(
+    "access_list,tx_data",
+    [
+        pytest.param(
+            [AccessList(address=Address(1), storage_keys=[Hash(0)])],
+            Bytes(b"\x01" * 100),
+            id="access_list_and_calldata",
+        ),
+        pytest.param(
+            [
+                AccessList(
+                    address=Address(1),
+                    storage_keys=[Hash(i) for i in range(10)],
+                )
+            ],
+            Bytes(b"\x00" * 50 + b"\x01" * 50),
+            id="large_access_list_mixed_calldata",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "to",
+    [pytest.param("eoa", id="")],
+    indirect=True,
+)
+def test_access_list_floor_cost_with_calldata(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    tx: Transaction,
+    tx_intrinsic_gas_cost_including_floor_data_cost: int,
+) -> None:
+    """
+    Test that the floor cost correctly accounts for both access list
+    and calldata tokens.
+
+    According to EIP-7981:
+    - total_floor_data_tokens =
+      floor_tokens_in_calldata + floor_tokens_in_access_list
+    - floor_gas =
+      TX_BASE_COST + total_floor_data_tokens * TOTAL_COST_FLOOR_PER_TOKEN
+    """
+    tx.expected_receipt = TransactionReceipt(
+        cumulative_gas_used=tx_intrinsic_gas_cost_including_floor_data_cost
+    )
+
+    state_test(
+        pre=pre,
+        post={},
+        tx=tx,
+    )
+
+
+@pytest.mark.with_all_tx_types(selector=lambda tx_type: tx_type >= 1)
+@pytest.mark.parametrize(
+    "access_list",
+    [
+        pytest.param(
+            [
+                AccessList(
+                    address=Address(i),
+                    storage_keys=[Hash(j) for j in range(5)],
+                )
+                for i in range(1, 6)
+            ],
+            id="five_addresses_five_keys_each",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "to",
+    [pytest.param("eoa", id="")],
+    indirect=True,
+)
+def test_large_access_list_cost(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    tx: Transaction,
+) -> None:
+    """
+    Test gas costs for large access lists.
+
+    With EIP-7981, large access lists should incur:
+    1. Storage access costs (2400 per address + 1900 per key)
+    2. Data footprint costs (16 per floor token)
+    """
+    state_test(
+        pre=pre,
+        post={},
+        tx=tx,
+    )
+
+
+@pytest.mark.with_all_tx_types(selector=lambda tx_type: tx_type >= 1)
+@pytest.mark.parametrize(
+    "access_list",
+    [
+        pytest.param(
+            [
+                AccessList(address=Address(1), storage_keys=[Hash(0)]),
+                AccessList(address=Address(1), storage_keys=[Hash(0)]),
+            ],
+            id="duplicate_access_list_entries",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "to",
+    [pytest.param("eoa", id="")],
+    indirect=True,
+)
+def test_duplicate_access_list_entries(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    tx: Transaction,
+) -> None:
+    """
+    Test that duplicate access list entries are charged multiple times.
+
+    According to EIP-2930, non-unique addresses and storage keys are allowed
+    and charged multiple times. EIP-7981 should maintain this behavior.
+    """
+    state_test(
+        pre=pre,
+        post={},
+        tx=tx,
+    )
diff --git a/tests/amsterdam/eip7981_increase_access_list_cost/test_eip_mainnet.py b/tests/amsterdam/eip7981_increase_access_list_cost/test_eip_mainnet.py
new file mode 100644
index 00000000000..771828d80b8
--- /dev/null
+++ b/tests/amsterdam/eip7981_increase_access_list_cost/test_eip_mainnet.py
@@ -0,0 +1,149 @@
+"""
+abstract: Crafted tests for mainnet of [EIP-7981: Increase Access List Cost](https://eips.ethereum.org/EIPS/eip-7981).
+"""  # noqa: E501
+
+import pytest
+from execution_testing import (
+    AccessList,
+    Address,
+    Alloc,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+
+from .spec import ref_spec_7981
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7981.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7981.version
+
+pytestmark = [pytest.mark.valid_at("EIP7981"), pytest.mark.mainnet]
+
+
+@pytest.mark.with_all_tx_types(selector=lambda tx_type: tx_type >= 1)
+@pytest.mark.parametrize(
+    "access_list",
+    [
+        pytest.param(
+            [AccessList(address=Address(1), storage_keys=[Hash(0)])],
+            id="single_address_single_key",
+        ),
+        pytest.param(
+            [
+                AccessList(
+                    address=Address(1),
+                    storage_keys=[Hash(0), Hash(1), Hash(2)],
+                )
+            ],
+            id="single_address_multiple_keys",
+        ),
+        pytest.param(
+            [
+                AccessList(address=Address(1), storage_keys=[Hash(0)]),
+                AccessList(address=Address(2), storage_keys=[Hash(1)]),
+            ],
+            id="multiple_addresses",
+        ),
+        pytest.param(
+            [
+                AccessList(
+                    address=Address(
+                        0xDE0B295669A9FD93D5F28D9EC85E40F4CB697BAE
+                    ),
+                    storage_keys=[
+                        Hash(
+                            0x0000000000000000000000000000000000000000000000000000000000000003
+                        ),
+                        Hash(
+                            0x0000000000000000000000000000000000000000000000000000000000000007
+                        ),
+                    ],
+                )
+            ],
+            id="realistic_address_and_keys",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "to",
+    [
+        pytest.param("eoa", id="to_eoa"),
+    ],
+    indirect=True,
+)
+def test_access_list_gas_cost(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    tx: Transaction,
+) -> None:
+    """
+    Test that transactions with access lists are charged correctly
+    according to EIP-7981.
+
+    The test verifies that:
+    1. Access lists are charged for storage access (existing behavior)
+    2. Access lists are charged for their data footprint (new in EIP-7981)
+    3. Access list data contributes to the floor gas cost
+    """
+    state_test(
+        pre=pre,
+        post={},
+        tx=tx,
+    )
+
+
+@pytest.mark.with_all_tx_types(selector=lambda tx_type: tx_type >= 1)
+@pytest.mark.parametrize(
+    "access_list",
+    [
+        pytest.param(
+            [
+                AccessList(
+                    address=Address(0),
+                    storage_keys=[Hash(0) for _ in range(10)],
+                )
+            ],
+            id="all_zero_bytes",
+        ),
+        pytest.param(
+            [
+                AccessList(
+                    address=Address(
+                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+                    ),
+                    storage_keys=[
+                        Hash(
+                            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+                        )
+                        for _ in range(5)
+                    ],
+                )
+            ],
+            id="all_nonzero_bytes",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "to",
+    [
+        pytest.param("eoa", id=""),
+    ],
+    indirect=True,
+)
+def test_access_list_data_cost_edge_cases(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    tx: Transaction,
+) -> None:
+    """
+    Test edge cases for access list data costs.
+
+    Tests include:
+    - All zero bytes in access list
+    - All non-zero bytes in access list
+    """
+    state_test(
+        pre=pre,
+        post={},
+        tx=tx,
+    )
diff --git a/tests/amsterdam/eip7981_increase_access_list_cost/test_floor_boundary_exact_balance.py b/tests/amsterdam/eip7981_increase_access_list_cost/test_floor_boundary_exact_balance.py
new file mode 100644
index 00000000000..10c15ec10a3
--- /dev/null
+++ b/tests/amsterdam/eip7981_increase_access_list_cost/test_floor_boundary_exact_balance.py
@@ -0,0 +1,87 @@
+"""
+abstract: Tests for floor-boundary rejection with exact-balance funding in [EIP-7981: Increase Access List Cost](https://eips.ethereum.org/EIPS/eip-7981).
+"""  # noqa: E501
+
+import pytest
+from execution_testing import (
+    AccessList,
+    Address,
+    Alloc,
+    Bytes,
+    Fork,
+    Hash,
+    StateTestFiller,
+    Transaction,
+    TransactionException,
+)
+
+from .spec import ref_spec_7981
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7981.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7981.version
+
+pytestmark = pytest.mark.valid_at("EIP7981")
+
+
+@pytest.mark.exception_test
+@pytest.mark.parametrize(
+    "tx_type",
+    [pytest.param(1, id="type_1"), pytest.param(2, id="type_2")],
+)
+@pytest.mark.parametrize(
+    "nonzero_bytes",
+    [
+        pytest.param(1000, id="1000_nonzero_bytes"),
+        pytest.param(2000, id="2000_nonzero_bytes"),
+    ],
+)
+def test_below_amsterdam_floor_with_access_list_exact_balance(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    tx_type: int,
+    nonzero_bytes: int,
+) -> None:
+    """Reject when gas_limit sits in EIP-7981 access-list-byte floor gap."""
+    access_list = [
+        AccessList(
+            address=Address(1),
+            storage_keys=[Hash(k) for k in range(10)],
+        )
+    ]
+    tx_data = Bytes(b"\x01" * nonzero_bytes)
+    intrinsic_regular = fork.transaction_intrinsic_cost_calculator()(
+        calldata=tx_data,
+        access_list=access_list,
+        return_cost_deducted_prior_execution=True,
+    )
+    floor_calc = fork.transaction_data_floor_cost_calculator()
+    amsterdam_floor = floor_calc(data=tx_data, access_list=access_list)
+    amsterdam_floor_no_al = floor_calc(data=tx_data)
+    # Pin gas_limit inside the access-list-byte uplift gap so an
+    # implementation that omits this term from its floor accepts.
+    gas_limit = (amsterdam_floor_no_al + amsterdam_floor) // 2
+    assert intrinsic_regular <= gas_limit < amsterdam_floor
+    assert gas_limit >= amsterdam_floor_no_al
+
+    gas_price = 10
+    sender = pre.fund_eoa(amount=gas_limit * gas_price)
+    if tx_type == 1:
+        fee_args: dict = {"gas_price": gas_price}
+    else:
+        fee_args = {
+            "max_fee_per_gas": gas_price,
+            "max_priority_fee_per_gas": 0,
+        }
+    tx = Transaction(
+        ty=tx_type,
+        sender=sender,
+        to=pre.fund_eoa(amount=0),
+        data=tx_data,
+        gas_limit=gas_limit,
+        access_list=access_list,
+        error=TransactionException.INTRINSIC_GAS_BELOW_FLOOR_GAS_COST,
+        **fee_args,
+    )
+
+    state_test(pre=pre, post={}, tx=tx)
diff --git a/tests/amsterdam/eip7981_increase_access_list_cost/test_transaction_validity.py b/tests/amsterdam/eip7981_increase_access_list_cost/test_transaction_validity.py
new file mode 100644
index 00000000000..1f995b1f1b7
--- /dev/null
+++ b/tests/amsterdam/eip7981_increase_access_list_cost/test_transaction_validity.py
@@ -0,0 +1,279 @@
+"""
+abstract: Tests for transaction validity with [EIP-7981: Increase Access List Cost](https://eips.ethereum.org/EIPS/eip-7981).
+"""  # noqa: E501
+
+import pytest
+from execution_testing import (
+    AccessList,
+    Address,
+    Alloc,
+    Bytes,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+
+from .spec import ref_spec_7981
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7981.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7981.version
+
+pytestmark = pytest.mark.valid_at("EIP7981")
+
+
+@pytest.mark.exception_test
+@pytest.mark.with_all_tx_types(selector=lambda tx_type: tx_type >= 1)
+@pytest.mark.parametrize(
+    "access_list,tx_gas_delta",
+    [
+        pytest.param(
+            [AccessList(address=Address(1), storage_keys=[Hash(0)])],
+            -1,
+            id="insufficient_gas_by_one",
+        ),
+        pytest.param(
+            [AccessList(address=Address(1), storage_keys=[Hash(0)])],
+            -100,
+            id="insufficient_gas_by_hundred",
+        ),
+        pytest.param(
+            [
+                AccessList(
+                    address=Address(1),
+                    storage_keys=[Hash(i) for i in range(10)],
+                )
+            ],
+            -1,
+            id="large_access_list_insufficient_gas",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "to",
+    [pytest.param("eoa", id="")],
+    indirect=True,
+)
+def test_insufficient_gas_for_access_list(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    tx: Transaction,
+) -> None:
+    """
+    Test that transactions with insufficient gas for access list costs
+    are rejected.
+
+    With EIP-7981, the intrinsic gas must cover:
+    - Base transaction cost
+    - Calldata costs
+    - Access list storage costs
+    - Access list data costs (new in EIP-7981)
+    - Floor cost including access list tokens
+    """
+    state_test(
+        pre=pre,
+        post={},
+        tx=tx,
+    )
+
+
+@pytest.mark.exception_test
+@pytest.mark.with_all_tx_types(selector=lambda tx_type: tx_type >= 1)
+@pytest.mark.parametrize(
+    "access_list,tx_data,tx_gas_delta",
+    [
+        pytest.param(
+            [AccessList(address=Address(1), storage_keys=[Hash(0)])],
+            Bytes(b"\x01" * 1000),
+            -1,
+            id="large_calldata_and_access_list_insufficient_gas",
+        ),
+        pytest.param(
+            [AccessList(address=Address(1), storage_keys=[Hash(0)])],
+            Bytes(b"\x00" * 1000),
+            -1,
+            id="large_zero_calldata_and_access_list_insufficient_gas",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "to",
+    [pytest.param("eoa", id="")],
+    indirect=True,
+)
+def test_floor_cost_validation_with_access_list(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    tx: Transaction,
+) -> None:
+    """
+    Test that the floor cost validation includes access list tokens.
+
+    According to EIP-7981:
+    - Any transaction with a gas limit below the floor cost is invalid
+    - Floor cost = TX_BASE_COST + TOTAL_COST_FLOOR_PER_TOKEN *
+      total_floor_data_tokens
+    - total_floor_data_tokens =
+      floor_tokens_in_calldata + floor_tokens_in_access_list
+    """
+    state_test(
+        pre=pre,
+        post={},
+        tx=tx,
+    )
+
+
+@pytest.mark.with_all_tx_types(selector=lambda tx_type: tx_type >= 1)
+@pytest.mark.parametrize(
+    "access_list,tx_gas_delta",
+    [
+        pytest.param(
+            [AccessList(address=Address(1), storage_keys=[Hash(0)])],
+            0,
+            id="exact_gas",
+        ),
+        pytest.param(
+            [AccessList(address=Address(1), storage_keys=[Hash(0)])],
+            1,
+            id="one_extra_gas",
+        ),
+        pytest.param(
+            [AccessList(address=Address(1), storage_keys=[Hash(0)])],
+            1000,
+            id="plenty_extra_gas",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "to",
+    [pytest.param("eoa", id="")],
+    indirect=True,
+)
+def test_valid_gas_limits_with_access_list(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    tx: Transaction,
+) -> None:
+    """
+    Test that transactions with sufficient gas are valid.
+
+    Tests various gas limit scenarios:
+    - Exact intrinsic gas
+    - Slightly more than intrinsic gas
+    - Much more than intrinsic gas
+    """
+    state_test(
+        pre=pre,
+        post={},
+        tx=tx,
+    )
+
+
+@pytest.mark.with_all_tx_types(selector=lambda tx_type: tx_type >= 1)
+@pytest.mark.parametrize(
+    "access_list,tx_data",
+    [
+        pytest.param(
+            [AccessList(address=Address(0), storage_keys=[Hash(0)] * 100)],
+            Bytes(b"\x00" * 1000),
+            id="zero_heavy_data_and_access_list",
+        ),
+        pytest.param(
+            [
+                AccessList(
+                    address=Address(
+                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+                    ),
+                    storage_keys=[
+                        Hash(
+                            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+                        )
+                    ]
+                    * 50,
+                )
+            ],
+            Bytes(b"\xff" * 500),
+            id="nonzero_heavy_data_and_access_list",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "to",
+    [pytest.param("eoa", id="")],
+    indirect=True,
+)
+@pytest.mark.parametrize(
+    "tx_gas_delta",
+    [pytest.param(0, id="")],
+)
+def test_mixed_zero_nonzero_bytes_floor_cost(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    tx: Transaction,
+) -> None:
+    """
+    Test floor cost calculation with mixed zero and non-zero bytes.
+
+    This ensures floor gas uses floor token counting:
+    - Each data byte contributes 4 floor tokens
+    """
+    state_test(
+        pre=pre,
+        post={},
+        tx=tx,
+    )
+
+
+@pytest.mark.parametrize(
+    "tx_type,access_list",
+    [
+        pytest.param(
+            0,
+            None,
+            id="type_0_no_access_list",
+        ),
+        pytest.param(
+            1,
+            [],
+            id="type_1_empty_access_list",
+        ),
+        pytest.param(
+            2,
+            [],
+            id="type_2_empty_access_list",
+        ),
+        pytest.param(
+            3,
+            [],
+            id="type_3_empty_access_list",
+        ),
+        pytest.param(
+            4,
+            [],
+            id="type_4_empty_access_list",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    "to",
+    [pytest.param("eoa", id="")],
+    indirect=True,
+)
+@pytest.mark.parametrize(
+    "tx_gas_delta",
+    [pytest.param(0, id="")],
+)
+def test_transactions_without_access_list(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    tx: Transaction,
+) -> None:
+    """
+    Test that transactions without access lists still work correctly.
+
+    EIP-7981 should only affect transactions with non-empty access lists.
+    """
+    state_test(
+        pre=pre,
+        post={},
+        tx=tx,
+    )
diff --git a/tests/amsterdam/eip8024_dupn_swapn_exchange/__init__.py b/tests/amsterdam/eip8024_dupn_swapn_exchange/__init__.py
new file mode 100644
index 00000000000..3440302c87f
--- /dev/null
+++ b/tests/amsterdam/eip8024_dupn_swapn_exchange/__init__.py
@@ -0,0 +1 @@
+"""Tests for [EIP-8024: Stack Access Instructions](https://eips.ethereum.org/EIPS/eip-8024)."""
diff --git a/tests/amsterdam/eip8024_dupn_swapn_exchange/spec.py b/tests/amsterdam/eip8024_dupn_swapn_exchange/spec.py
new file mode 100644
index 00000000000..5f0037c67d8
--- /dev/null
+++ b/tests/amsterdam/eip8024_dupn_swapn_exchange/spec.py
@@ -0,0 +1,52 @@
+"""Reference spec for [EIP-8024: Stack Access Instructions](https://eips.ethereum.org/EIPS/eip-8024)."""
+
+from dataclasses import dataclass
+from typing import Tuple
+
+from ethereum_types.numeric import U8
+
+from ethereum.forks.amsterdam.vm.stack import decode_pair as _decode_pair
+from ethereum.forks.amsterdam.vm.stack import decode_single as _decode_single
+
+
+@dataclass(frozen=True)
+class ReferenceSpec:
+    """Reference specification."""
+
+    git_path: str
+    version: str
+
+
+ref_spec_8024 = ReferenceSpec(
+    git_path="EIPS/eip-8024.md",
+    version="380cb02832a6ed5310bfde51591e580ca6d1f3cd",
+)
+
+
+@dataclass(frozen=True)
+class Spec:
+    """Constants and parameters from EIP-8024."""
+
+    # Gas cost for DUPN, SWAPN, and EXCHANGE
+    GAS_COST: int = 3
+
+    # DUPN/SWAPN stack index range (after decoding)
+    MIN_STACK_INDEX: int = 17
+    MAX_STACK_INDEX: int = 235
+
+    # EXCHANGE constraints: 1 <= n < m <= 29, n + m <= 30
+    EXCHANGE_MIN_N: int = 1
+    EXCHANGE_MAX_N: int = 14
+    EXCHANGE_MAX_M: int = 29
+    EXCHANGE_MAX_SUM: int = 30
+
+
+def decode_pair(x: int) -> Tuple[int, int]:
+    """Decode a pair with proper typing for tests."""
+    n, m = _decode_pair(U8(x))
+    return int(n), int(m)
+
+
+def decode_single(x: int) -> int:
+    """Decode single with proper typing for tests."""
+    return int(_decode_single(U8(x)))
diff --git a/tests/amsterdam/eip8024_dupn_swapn_exchange/test_dupn.py b/tests/amsterdam/eip8024_dupn_swapn_exchange/test_dupn.py
new file mode 100644
index 00000000000..d3fccb9ad1c
--- /dev/null
+++ b/tests/amsterdam/eip8024_dupn_swapn_exchange/test_dupn.py
@@ -0,0 +1,400 @@
+"""
+DUPN instruction tests.
+
+Tests for DUPN instruction in
+[EIP-8024: Stack Access Instructions](https://eips.ethereum.org/EIPS/eip-8024).
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Bytecode,
+    EIPChecklist,
+    Fork,
+    Op,
+    StateTestFiller,
+    Transaction,
+)
+
+from .spec import Spec, decode_single, ref_spec_8024
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_8024.git_path
+REFERENCE_SPEC_VERSION = ref_spec_8024.version
+
+pytestmark = pytest.mark.valid_from("EIP8024")
+
+
+@pytest.mark.parametrize(
+    "stack_index",
+    [17, 18, 32, 64, 107, 108, 200, 235],
+    ids=lambda x: f"dupn_stack_{x}",
+)
+def test_dupn_basic(
+    stack_index: int,
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """Test DUPN with various stack indices (17-235)."""
+    sender = pre.fund_eoa()
+
+    # Build stack with enough items, then use DUPN to duplicate the nth item
+    # DUPN with immediate x duplicates the decode_single(x)th stack item
+    stack_height = stack_index
+    expected_value = 0xBEEF + stack_index
+
+    # Push values onto stack: the value at the target position will
+    # be expected_value
+    code = Bytecode()
+    for i in range(stack_height):
+        if i == 0:
+            # The first push will end up at position stack_index from top
+            code += Op.PUSH2(expected_value)
+        else:
+            code += Op.PUSH2(0x1000 + i)
+
+    # Pass stack index directly - encoder will handle encoding
+    code += Op.DUPN[stack_index]
+    # Store the duplicated value
+    code += Op.PUSH1(0) + Op.SSTORE
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    post = {contract_address: Account(storage={0: expected_value})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "immediate",
+    [0, 45, 90, 128, 200, 255],
+    ids=lambda x: f"dupn_imm_{x}",
+)
+def test_dupn_valid_immediates(
+    immediate: int,
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """Test DUPN with valid immediate values (0-90 and 128-255)."""
+    sender = pre.fund_eoa()
+
+    # Decode the immediate to get the stack index
+    stack_index = decode_single(immediate)
+    stack_height = stack_index
+    expected_value = 0xCAFE + immediate
+
+    # Push values onto stack
+    code = Bytecode()
+    for i in range(stack_height):
+        if i == 0:
+            code += Op.PUSH2(expected_value)
+        else:
+            code += Op.PUSH2(0x1000 + i)
+
+    # Pass immediate as bytes (raw immediate byte for testing)
+    code += Op.DUPN[immediate.to_bytes(1, "big")]
+    code += Op.PUSH1(0) + Op.SSTORE
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=10_000_000)
+
+    post = {contract_address: Account(storage={0: expected_value})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "immediate",
+    [0, 45, 90, 128, 200, 255],
+    ids=lambda x: f"dupn_underflow_imm_{x}",
+)
+def test_dupn_stack_underflow(
+    immediate: int,
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """Test DUPN causes transaction failure on stack underflow."""
+    sender = pre.fund_eoa()
+
+    # Decode the immediate to get the stack index
+    stack_index = decode_single(immediate)
+    # Push one less than required to trigger underflow
+    insufficient_items = stack_index - 1
+
+    code = Op.SSTORE(0, 1)
+    for i in range(insufficient_items):
+        code += Op.PUSH1(i)
+    # Pass immediate as bytes (raw immediate byte for testing)
+    # Needs stack_index items, underflow
+    code += Op.DUPN[immediate.to_bytes(1, "big")]
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # Transaction should fail, contract storage unchanged
+    post = {contract_address: Account(storage={0: 0})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+@EIPChecklist.Opcode.Test.GasUsage.Normal()
+@EIPChecklist.Opcode.Test.GasUsage.OutOfGasExecution()
+@EIPChecklist.Opcode.Test.GasUsage.ExtraGas()
+@pytest.mark.parametrize("gas_cost_delta", [-2, -1, 0, 1, 2])
+def test_dupn_gas_cost_boundary(
+    gas_cost_delta: int,
+    pre: Alloc,
+    fork: Fork,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test DUPN at the gas cost boundary.
+
+    DUPN is invoked in a callee that receives exactly its execution cost
+    plus `gas_cost_delta`. The caller records the CALL result: a negative
+    delta starves DUPN of its base gas (3) and the sub-call runs out of
+    gas (result 0); a zero or positive delta succeeds (result 1).
+    """
+    stack_index = Spec.MIN_STACK_INDEX  # 17
+
+    code = Bytecode()
+    for i in range(stack_index):
+        code += Op.PUSH1(i)
+    code += Op.DUPN[stack_index]
+
+    contract_address = pre.deploy_contract(code=code)
+
+    call_code = Op.SSTORE(
+        0,
+        Op.CALL(
+            gas=code.gas_cost(fork) + gas_cost_delta,
+            address=contract_address,
+        ),
+    )
+    call_address = pre.deploy_contract(
+        code=call_code,
+        storage={0: 0xDEADBEEF},
+    )
+
+    tx = Transaction(to=call_address, sender=pre.fund_eoa(), gas_limit=200_000)
+
+    post = {call_address: Account(storage={0: 0 if gas_cost_delta < 0 else 1})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_endofcode_behavior(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test DUPN when the immediate byte is beyond the end of code.
+
+    Per EIP-8024, code[pc + 1] evaluates to 0 if beyond the end of the code,
+    matching PUSH behavior. With immediate = 0, decode_single(0) = 145, so
+    DUPN duplicates the 145th stack item.
+
+    This test verifies the transaction succeeds (doesn't revert) when DUPN
+    is the last byte of the code with no immediate byte following it.
+    """
+    sender = pre.fund_eoa()
+
+    # decode_single(0) = 145, which duplicates the 145th item from top
+    # We need 145 items on the stack for this to succeed
+    stack_height = 145
+    marker_value = 0x42
+
+    # Build code: store marker, push enough items, then DUPN (no immediate)
+    code = Bytecode()
+    code += Op.SSTORE(0, marker_value)  # Store marker
+
+    # Push 145 items to stack so DUPN with implicit imm=0 succeeds
+    for i in range(stack_height):
+        code += Op.PUSH1(i % 256)
+
+    # Add just the DUPN opcode without immediate byte
+    # After DUPN, pc += 2 goes beyond code, causing implicit STOP
+    code += Op.DUPN  # no immediate
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # If tx succeeds, storage[0] = marker_value
+    # Bad implementation would revert and have empty storage
+    post = {contract_address: Account(storage={0: marker_value})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "invalid_immediate",
+    list(range(91, 128)),  # 0x5b to 0x7f (JUMPDEST and PUSH opcodes)
+    ids=lambda x: f"dupn_invalid_imm_0x{x:02x}",
+)
+def test_dupn_invalid_immediate_aborts(
+    invalid_immediate: int,
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test DUPN with invalid immediate values (90 < x < 128) aborts execution.
+
+    Per EIP-8024, immediate values in range [91, 127] (0x5b-0x7f) are invalid
+    because they correspond to JUMPDEST (0x5b) and PUSH opcodes (0x60-0x7f).
+    Attempting to execute DUPN with these immediates should abort.
+    """
+    sender = pre.fund_eoa()
+
+    # Build stack with enough items for any valid immediate
+    # Maximum stack index is 235, so push 235 items
+    code = Bytecode()
+    for i in range(235):
+        code += Op.PUSH1(i % 256)
+
+    # Attempt DUPN with invalid immediate - should abort
+    # Pass as bytes (raw immediate byte for testing invalid ranges)
+    code += Op.DUPN[invalid_immediate.to_bytes(1, "big")]
+
+    # This should never execute
+    code += Op.PUSH1(0x42) + Op.PUSH1(0) + Op.SSTORE
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=10_000_000)
+
+    # Transaction should fail - invalid immediate causes abort
+    post = {contract_address: Account(storage={})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_dupn_jump_to_immediate_byte_0x5b_succeeds(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test that jumping to 0x5b after DUPN succeeds (backward compatibility).
+
+    Bytecode: PUSH1(4) JUMP DUPN[0x5b]
+    Hex: 6004 56 e6 5b
+    Position 4 contains 0x5b which is an INVALID immediate for DUPN.
+    Per EIP-8024, 0x5b is preserved as valid JUMPDEST for compatibility.
+    The DUPN instruction is never executed due to the jump.
+    """
+    sender = pre.fund_eoa()
+
+    # Build code that jumps to 0x5b after DUPN opcode
+    code = Bytecode()
+    code += Op.PUSH1(4)  # Push jump target (position 4)
+    code += Op.JUMP  # Jump to position 4
+    # Pass as bytes (raw immediate byte for testing)
+    code += Op.DUPN[b"\x5b"]  # Position 3-4: DUPN + 0x5b (invalid immediate)
+
+    # This SHOULD execute because 0x5b is a valid JUMPDEST
+    code += Op.SSTORE(0, 0x42)
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # Transaction succeeds - 0x5b is preserved as valid JUMPDEST
+    post = {contract_address: Account(storage={0: 0x42})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_dupn_jump_to_valid_immediate_fails(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test jumping to a valid immediate byte fails.
+
+    Bytecode: PUSH1(4) JUMP DUPN[0x00]
+    Hex: 6004 56 e6 00
+    Position 4 contains 0x00 which is a VALID immediate for DUPN.
+    Valid immediates are skipped in JUMPDEST analysis, so jump fails.
+    """
+    sender = pre.fund_eoa()
+
+    # Build code that tries to jump to a valid immediate
+    code = Bytecode()
+    code += Op.PUSH1(4)  # Push jump target (position 4)
+    code += Op.JUMP  # Try to jump to position 4
+    # Pass as bytes (raw immediate byte for testing)
+    code += Op.DUPN[b"\x00"]  # Position 3-4: DUPN + 0x00 (valid immediate)
+
+    # This should never execute
+    code += Op.SSTORE(0, 0x42)
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # Transaction fails - position 4 is a valid immediate, not JUMPDEST
+    post = {contract_address: Account(storage={})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_dupn_with_dup1_sequence(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test DUPN duplicating the bottom item after building stack with DUP1.
+
+    Stack layout: PUSH1(1) PUSH1(0) DUP1*15 DUPN[0x80]
+    Before DUPN: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]
+    After DUPN[0x80] (decode_single(0x80)=17): [1, 0, 0, ..., 0, 1]
+    Result: 18 stack items, top=1, bottom=1, rest=0
+    """
+    sender = pre.fund_eoa()
+
+    # Build the stack: PUSH1(1), PUSH1(0), 15x DUP1
+    code = Bytecode()
+    code += Op.PUSH1(1)  # Bottom of stack (position 17 after DUP1s)
+    code += Op.PUSH1(0)
+    for _ in range(15):
+        code += Op.DUP1
+
+    # Stack now has 17 items:
+    # [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]
+    # DUPN with immediate 0x80 (decode_single(0x80) = 17) duplicates pos 17
+    # Pass as bytes (raw immediate byte for testing)
+    code += Op.DUPN[b"\x80"]
+
+    # Store all stack values to verify
+    for i in range(18):
+        code += Op.PUSH1(i) + Op.SSTORE
+
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # Expected: top (position 0) = 1, bottom (position 17) = 1, all others = 0
+    expected_storage = {}
+    for i in range(18):
+        if i == 0:
+            expected_storage[i] = 1  # Top of stack after DUPN
+        elif i == 17:
+            expected_storage[i] = 1  # Bottom of stack
+        else:
+            expected_storage[i] = 0  # All middle values
+
+    post = {contract_address: Account(storage=expected_storage)}
+
+    state_test(pre=pre, post=post, tx=tx)
diff --git a/tests/amsterdam/eip8024_dupn_swapn_exchange/test_eip_vectors.py b/tests/amsterdam/eip8024_dupn_swapn_exchange/test_eip_vectors.py
new file mode 100644
index 00000000000..382d6d540d7
--- /dev/null
+++ b/tests/amsterdam/eip8024_dupn_swapn_exchange/test_eip_vectors.py
@@ -0,0 +1,831 @@
+"""
+EIP-8024 Official Test Vectors.
+
+Test vectors from the EIP-8024 specification:
+[EIP-8024: Stack Access Instructions](https://eips.ethereum.org/EIPS/eip-8024).
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Bytecode,
+    Op,
+    StateTestFiller,
+    Transaction,
+)
+
+from .spec import ref_spec_8024
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_8024.git_path
+REFERENCE_SPEC_VERSION = ref_spec_8024.version
+
+pytestmark = pytest.mark.valid_from("EIP8024")
+
+
+def test_eip_vector_dupn_duplicate_bottom(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    EIP test vector: 60016000808080808080808080808080808080e680.
+
+    Results in 18 stack items, top=1, bottom=1, rest=0.
+
+    PUSH1 1, PUSH1 0, 15x DUP1, DUPN[0x80]
+    - After 15 DUP1s: 17 items [0,0,0,...,0,1]
+    - DUPN[0x80]: decode_single(0x80)=17, duplicate position 17 (value 1)
+    - Result: 18 items, top=1, bottom=1
+    """
+    sender = pre.fund_eoa()
+
+    # Build the exact bytecode from the EIP
+    code = Op.PUSH1[0x1] + Op.PUSH1[0x0] + Op.DUP1 * 15 + Op.DUPN[17]
+    assert bytes(code) == bytes.fromhex(
+        "60016000808080808080808080808080808080e680"
+    )
+
+    # Verify by storing top and bottom values
+    code += Op.PUSH1(0) + Op.SSTORE  # Store top (should be 1) at key 0
+
+    # Pop 16 items to get to bottom 2 items
+    code += Op.POP * 16
+    # Stack now has 1 item (bottom value = 1)
+
+    # Store bottom value at key 1
+    code += Op.PUSH1(1) + Op.SSTORE  # Store bottom (should be 1) at key 1
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    post = {
+        contract_address: Account(
+            storage={
+                0: 1,  # top = 1 (from DUPN duplicating position 17)
+                1: 1,  # bottom = 1 (original PUSH1 1)
+            }
+        )
+    }
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_eip_vector_swapn_swap_with_bottom(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    EIP test vector: 600160008080808080808080808080808080806002e780.
+
+    Results in 18 stack items, top=1, bottom=2, rest=0.
+
+    PUSH1 1, PUSH1 0, 15x DUP1, PUSH1 2, SWAPN[0x80]
+    - After PUSH1 2: 18 items with top=2, bottom=1
+    - SWAPN[0x80]: decode_single(0x80)=17, swap pos 1 with pos (17+1)=18
+    - Result: 18 items, top=1, bottom=2
+    """
+    sender = pre.fund_eoa()
+
+    # Build the exact bytecode from the EIP
+    code = (
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.DUP1 * 15
+        + Op.PUSH1[0x2]
+        + Op.SWAPN[17]
+    )
+    assert bytes(code) == bytes.fromhex(
+        "600160008080808080808080808080808080806002e780"
+    )
+
+    # Verify by storing top and bottom values
+    code += Op.PUSH1(0) + Op.SSTORE  # Store top (should be 1) at key 0
+
+    # Pop 16 items to get to bottom 1 item
+    code += Op.POP * 16
+    # Stack now has 1 item (bottom value = 2)
+
+    # Store bottom value at key 1
+    code += Op.PUSH1(1) + Op.SSTORE  # Store bottom (should be 2) at key 1
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    post = {
+        contract_address: Account(
+            storage={
+                0: 1,  # top = 1 (swapped from bottom)
+                1: 2,  # bottom = 2 (swapped from top)
+            }
+        )
+    }
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_eip_vector_exchange_swap_positions(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    EIP test vector: 600060016002e88e.
+
+    Results in 3 stack items, from top to bottom: [2, 0, 1].
+
+    PUSH1 0, PUSH1 1, PUSH1 2, EXCHANGE[0x8e]
+    - After pushes: [2, 1, 0] (top to bottom)
+    - EXCHANGE[0x8e]: decode_pair(0x8e)=(1,2), swap positions 2 and 3
+    - Result: [2, 0, 1]
+    """
+    sender = pre.fund_eoa()
+
+    # Build the exact bytecode from the EIP
+    code = Op.PUSH1[0x0] + Op.PUSH1[0x1] + Op.PUSH1[0x2] + Op.EXCHANGE[b"\x8e"]
+    assert bytes(code) == bytes.fromhex("600060016002e88e")
+
+    # Store all 3 stack values
+    code += Op.PUSH1(0) + Op.SSTORE  # Store position 1 / top (should be 2)
+    code += Op.PUSH1(1) + Op.SSTORE  # Store position 2 (should be 0)
+    code += Op.PUSH1(2) + Op.SSTORE  # Store position 3 / bottom (should be 1)
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    post = {
+        contract_address: Account(
+            storage={
+                0: 2,  # top = 2 (unchanged)
+                1: 0,  # position 2 = 0 (swapped from position 3)
+                2: 1,  # bottom = 1 (swapped from position 2)
+            }
+        )
+    }
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_eip_vector_swapn_invalid_immediate_reverts(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    EIP test vector: e75b reverts.
+
+    SWAPN with immediate 0x5b (91) is in the invalid range (90 < x < 128).
+    This should cause an exceptional halt.
+    """
+    sender = pre.fund_eoa()
+
+    # Build the exact bytecode from the EIP: SWAPN[0x5b]
+    # 0x5b = 91 which is in the forbidden range
+    code = Bytecode(
+        Op.SWAPN[b"\x5b"],
+        popped_stack_items=0,
+        pushed_stack_items=0,
+        terminating=True,
+    )
+    assert bytes(code) == bytes.fromhex("e75b")
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # Transaction should fail, storage unchanged
+    post = {contract_address: Account(storage={})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_eip_vector_jump_over_invalid_dupn(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    EIP test vector: 600456e65b executes successfully.
+
+    PUSH1 04, JUMP, DUPN[0x5b]
+    - The DUPN at position 2 has immediate 0x5b which would be invalid
+    - But we JUMP to position 4 (the 0x5b byte), which is a valid JUMPDEST
+    - The DUPN instruction is never executed
+    """
+    sender = pre.fund_eoa()
+
+    # Build the exact bytecode: PUSH1 04, JUMP, DUPN[0x5b]
+    # Position 0: PUSH1 (0x60)
+    # Position 1: 0x04
+    # Position 2: JUMP (0x56)
+    # Position 3: DUPN (0xe6)
+    # Position 4: 0x5b (JUMPDEST when executed as opcode)
+    code = Bytecode(
+        Op.PUSH1[0x4] + Op.JUMP + Op.DUPN[b"\x5b"],
+        popped_stack_items=0,
+        pushed_stack_items=0,
+    )
+    assert bytes(code) == bytes.fromhex("600456e65b")
+
+    # After jumping to JUMPDEST, mark success
+    code += Op.PUSH1(1) + Op.PUSH1(0) + Op.SSTORE
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # Transaction should succeed
+    post = {contract_address: Account(storage={0: 1})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_eip_vector_exchange_with_iszero(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    EIP test vector: 60008080e88e15.
+
+    Results in 3 stack items, top=1, rest=0.
+
+    PUSH1 0, DUP1, DUP1, EXCHANGE[0x8e], ISZERO
+    - After DUP1s: [0, 0, 0]
+    - EXCHANGE[0x8e]: decode_pair(0x8e)=(1,2), swap pos 2 and 3
+    - ISZERO: pop 0, push 1
+    - Result: [1, 0, 0]
+    """
+    sender = pre.fund_eoa()
+
+    # Build the exact bytecode from the EIP
+    code = Op.PUSH1[0x0] + Op.DUP1 + Op.DUP1 + Op.EXCHANGE[b"\x8e"] + Op.ISZERO
+    assert bytes(code) == bytes.fromhex("60008080e88e15")
+
+    # Store all 3 stack values
+    code += Op.PUSH1(0) + Op.SSTORE  # Store top (should be 1)
+    code += Op.PUSH1(1) + Op.SSTORE  # Store position 2 (should be 0)
+    code += Op.PUSH1(2) + Op.SSTORE  # Store position 3 (should be 0)
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    post = {
+        contract_address: Account(
+            storage={
+                0: 1,  # top = 1 (from ISZERO)
+                1: 0,  # position 2 = 0
+                2: 0,  # bottom = 0
+            }
+        )
+    }
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_eip_vector_dupn_stack_underflow(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    EIP test vector: 6000808080808080808080808080808080e680.
+
+    Results in exceptional halt (stack underflow).
+
+    PUSH1 0, 15x DUP1, DUPN[0x80]
+    - After 15 DUP1s: 16 items
+    - DUPN[0x80]: decode_single(0x80)=17, needs position 17 but only 16 items
+    - Result: exceptional halt
+    """
+    sender = pre.fund_eoa()
+
+    # Build the exact bytecode from the EIP
+    code = Op.PUSH1[0x0] + Op.DUP1 * 15 + Op.DUPN[b"\x80"]
+    assert bytes(code) == bytes.fromhex(
+        "6000808080808080808080808080808080e680"
+    )
+
+    # This should not execute due to stack underflow
+    code += Op.PUSH1(1) + Op.PUSH1(0) + Op.SSTORE
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # Transaction should fail, storage unchanged
+    post = {contract_address: Account(storage={})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_vector_dupn_followed_by_jumpdest(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test vector: e6805b [DUPN 17, JUMPDEST].
+
+    Verify that DUPN with immediate 0x80 (128) correctly consumes the
+    immediate byte. The 0x5b following the DUPN is a separate JUMPDEST
+    instruction, not part of DUPN. decode_single(0x80) = 17, so DUPN
+    duplicates the 17th stack item.
+    """
+    sender = pre.fund_eoa()
+
+    # Push 17 items so DUPN[17] (immediate 0x80 / 128) succeeds
+    marker_value = 0xBEEF
+    code = Bytecode()
+    code += Op.PUSH2(marker_value)  # This will be at position 17
+    for i in range(16):
+        code += Op.PUSH1(i)
+
+    # DUPN[17] encodes to immediate 0x80 (128), followed by JUMPDEST
+    # Bytecode: e6 80 5b
+    code += Op.DUPN[17] + Op.JUMPDEST
+
+    # Store the duplicated value (should be marker_value)
+    code += Op.PUSH1(0) + Op.SSTORE
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # DUPN should duplicate position 17 (marker_value)
+    post = {contract_address: Account(storage={0: marker_value})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_vector_dupn_invalid_0x60(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test vector: e6605b [INVALID_DUPN, PUSH1 0x5b].
+
+    DUPN with immediate 0x60 (96) is in the invalid range (91-127).
+    Execution should abort with exceptional halt.
+    """
+    sender = pre.fund_eoa()
+
+    # Push enough items on stack for any potential operation
+    code = Bytecode()
+    for i in range(235):
+        code += Op.PUSH1(i % 256)
+
+    # DUPN with invalid immediate 0x60 - should abort
+    # Hex: e6 60 5b
+    code += Op.DUPN[b"\x60"]
+
+    # This should never execute due to invalid immediate
+    code += Op.PUSH1(0x5B)  # Would be PUSH1 0x5b if we got here
+    code += Op.PUSH1(0x42) + Op.PUSH1(0) + Op.SSTORE
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=10_000_000)
+
+    # Transaction should fail, storage unchanged
+    post = {contract_address: Account(storage={})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_vector_swapn_invalid_0x61(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test vector: e7610000 [INVALID_SWAPN, PUSH2 0x0000].
+
+    SWAPN with immediate 0x61 (97) is in the invalid range (91-127).
+    Execution should abort with exceptional halt.
+    """
+    sender = pre.fund_eoa()
+
+    # Push enough items on stack for any potential operation
+    code = Bytecode()
+    for i in range(236):
+        code += Op.PUSH1(i % 256)
+
+    # SWAPN with invalid immediate 0x61 - should abort
+    # Hex: e7 61 00 00
+    code += Op.SWAPN[b"\x61"]
+
+    # These bytes would be PUSH2 0x0000 if we got here
+    code += Op.PUSH2(0x0000)
+    code += Op.PUSH1(0x42) + Op.PUSH1(0) + Op.SSTORE
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=10_000_000)
+
+    # Transaction should fail, storage unchanged
+    post = {contract_address: Account(storage={})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_vector_dupn_invalid_0x5f(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test vector: e65f [INVALID_DUPN, PUSH0].
+
+    DUPN with immediate 0x5f (95) is in the invalid range (91-127).
+    Execution should abort with exceptional halt.
+    """
+    sender = pre.fund_eoa()
+
+    # Push enough items on stack for any potential operation
+    code = Bytecode()
+    for i in range(235):
+        code += Op.PUSH1(i % 256)
+
+    # DUPN with invalid immediate 0x5f - should abort
+    # Hex: e6 5f
+    code += Op.DUPN[b"\x5f"]
+
+    # This should never execute
+    code += Op.PUSH1(0x42) + Op.PUSH1(0) + Op.SSTORE
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=10_000_000)
+
+    # Transaction should fail, storage unchanged
+    post = {contract_address: Account(storage={})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_vector_exchange_0x9d(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test vector: e89d [EXCHANGE 2 3].
+
+    EXCHANGE with immediate 0x9d (157 decimal).
+    decode_pair(0x9d) = (2, 3), swaps positions 3 and 4.
+    """
+    sender = pre.fund_eoa()
+
+    # Build stack with 4 items: positions 1, 2, 3, 4 from top
+    # Values: [top=0x1111, pos2=0x2222, pos3=0x3333, pos4=0x4444]
+    code = Bytecode()
+    code += Op.PUSH2(0x4444)  # Position 4 (will be swapped)
+    code += Op.PUSH2(0x3333)  # Position 3 (will be swapped)
+    code += Op.PUSH2(0x2222)  # Position 2
+    code += Op.PUSH2(0x1111)  # Position 1 (top)
+
+    # EXCHANGE with immediate 0x9d - swaps positions 3 and 4
+    # Hex: e8 9d
+    code += Op.EXCHANGE[b"\x9d"]
+
+    # Store all values to verify the swap
+    code += Op.PUSH1(0) + Op.SSTORE  # Position 1 (top)
+    code += Op.PUSH1(1) + Op.SSTORE  # Position 2
+    code += Op.PUSH1(2) + Op.SSTORE  # Position 3 (was 4)
+    code += Op.PUSH1(3) + Op.SSTORE  # Position 4 (was 3)
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # After EXCHANGE[0x9d]: positions 3 and 4 are swapped
+    post = {
+        contract_address: Account(
+            storage={
+                0: 0x1111,  # Position 1 unchanged
+                1: 0x2222,  # Position 2 unchanged
+                2: 0x4444,  # Position 3 now has value from position 4
+                3: 0x3333,  # Position 4 now has value from position 3
+            }
+        )
+    }
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_vector_exchange_0x2f(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test vector: e82f [EXCHANGE 1 19].
+
+    EXCHANGE with immediate 0x2f (47 decimal).
+    decode_pair(0x2f) = (1, 19), swaps positions 2 and 20.
+    """
+    sender = pre.fund_eoa()
+
+    # Build stack with 20 items
+    # Position 2 and position 20 will be swapped
+    code = Bytecode()
+    code += Op.PUSH2(0xBBBB)  # Position 20 (bottom, will be swapped)
+    for i in range(17):
+        code += Op.PUSH2(0x1000 + i)  # Positions 3-19
+    code += Op.PUSH2(0xAAAA)  # Position 2 (will be swapped)
+    code += Op.PUSH2(0x1111)  # Position 1 (top)
+
+    # EXCHANGE with immediate 0x2f - swaps positions 2 and 20
+    # Hex: e8 2f
+    code += Op.EXCHANGE[b"\x2f"]
+
+    # Store position 1, 2, and 20 to verify
+    code += Op.PUSH1(0) + Op.SSTORE  # Position 1 (top, unchanged)
+    code += Op.PUSH1(1) + Op.SSTORE  # Position 2 (was 0xBBBB from pos 20)
+
+    # Pop to get to position 20
+    for _ in range(17):
+        code += Op.POP
+
+    code += Op.PUSH1(2) + Op.SSTORE  # Position 20 (was 0xAAAA from pos 2)
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # After EXCHANGE[0x2f]: positions 2 and 20 are swapped
+    post = {
+        contract_address: Account(
+            storage={
+                0: 0x1111,  # Position 1 unchanged
+                1: 0xBBBB,  # Position 2 now has value from position 20
+                2: 0xAAAA,  # Position 20 now has value from position 2
+            }
+        )
+    }
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_vector_exchange_valid_0x50(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test vector: e850 [EXCHANGE 14 16].
+
+    EXCHANGE with immediate 0x50 (80 decimal) is valid.
+    decode_pair(0x50) = (14, 16), swaps positions 15 and 17.
+    """
+    sender = pre.fund_eoa()
+
+    # Build stack with 17 items, with known values at positions 15 and 17
+    code = Bytecode()
+    for i in range(17):
+        stack_pos = 17 - i  # Position from top (1-indexed)
+        if stack_pos == 15:
+            code += Op.PUSH2(0xAAAA)
+        elif stack_pos == 17:
+            code += Op.PUSH2(0xBBBB)
+        else:
+            code += Op.PUSH2(0x1000 + i)
+
+    # EXCHANGE with immediate 0x50 - swaps positions 15 and 17
+    code += Op.EXCHANGE[b"\x50"]
+
+    # Store swapped positions to verify
+    # Pop to position 15 (pop 14 items)
+    for _ in range(14):
+        code += Op.POP
+    code += Op.PUSH1(0) + Op.SSTORE  # Position 15 (was 0xBBBB)
+    code += Op.POP  # Skip position 16
+    code += Op.PUSH1(1) + Op.SSTORE  # Position 17 (was 0xAAAA)
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    post = {
+        contract_address: Account(
+            storage={
+                0: 0xBBBB,  # Position 15 now has value from 17
+                1: 0xAAAA,  # Position 17 now has value from 15
+            }
+        )
+    }
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_vector_exchange_valid_0x51(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test vector: e851 [EXCHANGE 14 15].
+
+    EXCHANGE with immediate 0x51 (81 decimal) is valid.
+    decode_pair(0x51) = (14, 15), swaps positions 15 and 16.
+    """
+    sender = pre.fund_eoa()
+
+    # Build stack with 16 items, with known values at positions 15 and 16
+    code = Bytecode()
+    for i in range(16):
+        stack_pos = 16 - i
+        if stack_pos == 15:
+            code += Op.PUSH2(0xAAAA)
+        elif stack_pos == 16:
+            code += Op.PUSH2(0xBBBB)
+        else:
+            code += Op.PUSH2(0x1000 + i)
+
+    # EXCHANGE with immediate 0x51 - swaps positions 15 and 16
+    code += Op.EXCHANGE[b"\x51"]
+
+    # Pop to position 15 (pop 14 items)
+    for _ in range(14):
+        code += Op.POP
+    code += Op.PUSH1(0) + Op.SSTORE  # Position 15 (was 0xBBBB)
+    code += Op.PUSH1(1) + Op.SSTORE  # Position 16 (was 0xAAAA)
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    post = {
+        contract_address: Account(
+            storage={
+                0: 0xBBBB,  # Position 15 now has value from 16
+                1: 0xAAAA,  # Position 16 now has value from 15
+            }
+        )
+    }
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_eip_vector_exchange_end_of_code(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    EIP test vector: 600260008080808080600160008080808080808080e8.
+
+    EXCHANGE at end of code, immediate = 0x00 (beyond code).
+    decode_pair(0) = (9, 16), swaps positions 10 and 17.
+    Results in 17 stack items, bottom=1, 10th from top=2, rest=0.
+    """
+    sender = pre.fund_eoa()
+
+    # Build exact bytecode from the EIP
+    code = (
+        Op.PUSH1[0x2]
+        + Op.PUSH1[0x0]
+        + Op.DUP1 * 5
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.DUP1 * 8
+        + Op.EXCHANGE
+    )
+    assert bytes(code) == bytes.fromhex(
+        "600260008080808080600160008080808080808080e8"
+    )
+    # 17 items on stack:
+    # pos 1-8: 0, pos 9: 0, pos 10: 1, pos 11-16: 0, pos 17: 2
+    # After EXCHANGE(9,16): swap pos 10 and 17 -> pos 10=2, pos 17=1
+
+    # Store marker before opcode to verify success
+    # Since EXCHANGE is at end of code, we verify by checking that the
+    # operation completed by storing the 10th and bottom items
+    contract_address = pre.deploy_contract(
+        code=Op.SSTORE(0, 0x42) + code + Op.STOP
+    )
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # Verify marker was stored (tx succeeded)
+    post = {contract_address: Account(storage={0: 0x42})}
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_eip_vector_exchange_30_items(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    EIP test vector (30-item EXCHANGE).
+
+    Bytecode: 600080...(27x DUP1)...60016002e88f.
+    decode_pair(0x8f / 143) = (1, 29), swaps positions 2 and 30.
+    Results in 30 stack items, top=2, bottom=1, rest=0.
+    """
+    sender = pre.fund_eoa()
+
+    code = (
+        Op.PUSH1[0x0]
+        + Op.DUP1 * 27
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.EXCHANGE[b"\x8f"]
+    )
+    assert bytes(code) == bytes.fromhex("6000" + "80" * 27 + "60016002e88f")
+    # 30 items: pos 1=2, pos 2=1, rest=0
+    # After EXCHANGE(1,29): swap pos 2 and 30 -> pos 2=0, pos 30=1
+    # Result: top=2, bottom=1, rest=0
+
+    # Store top value
+    code += Op.PUSH1(0) + Op.SSTORE  # top = 2
+
+    # Pop to get to bottom
+    code += Op.POP * 28
+
+    # Store bottom value
+    code += Op.PUSH1(1) + Op.SSTORE  # bottom = 1
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    post = {
+        contract_address: Account(
+            storage={
+                0: 2,  # top = 2 (unchanged)
+                1: 1,  # bottom = 1 (swapped from position 2)
+            }
+        )
+    }
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_vector_exchange_invalid_0x52(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test vector: e852 [INVALID_EXCHANGE, MSTORE].
+
+    EXCHANGE with immediate 0x52 (82 decimal) is in the invalid
+    range (82-127). Execution should abort with exceptional halt.
+    """
+    sender = pre.fund_eoa()
+
+    # Push enough items on stack for any potential operation
+    code = Bytecode()
+    for i in range(30):
+        code += Op.PUSH1(i)
+
+    # EXCHANGE with invalid immediate 0x52 - should abort
+    # Hex: e8 52
+    code += Op.EXCHANGE[b"\x52"]
+
+    # This would be MSTORE if we got here (0x52 = MSTORE opcode)
+    code += Op.MSTORE
+    code += Op.PUSH1(0x42) + Op.PUSH1(0) + Op.SSTORE
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # Transaction should fail, storage unchanged
+    post = {contract_address: Account(storage={})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "eip8024_opcode,stack_items",
+    [
+        pytest.param(Op.DUPN, 145, id="dupn"),
+        pytest.param(Op.SWAPN, 146, id="swapn"),
+        pytest.param(Op.EXCHANGE, 17, id="exchange"),
+    ],
+)
+def test_eip_vector_end_of_code(
+    pre: Alloc,
+    state_test: StateTestFiller,
+    eip8024_opcode: Op,
+    stack_items: int,
+) -> None:
+    """
+    Test EIP-8024 opcodes at end of code (no immediate byte).
+
+    When an opcode appears at end of code, code[pc+1] = 0 beyond end of code.
+    - DUPN: decode_single(0) = 145, needs 145 items on stack
+    - SWAPN: decode_single(0) = 145, needs 146 items on stack
+    - EXCHANGE: decode_pair(0) = (9, 16), needs 17 items on stack
+
+    Store a marker before the opcode to verify the transaction succeeded,
+    since adding any opcode after would make that opcode byte the immediate.
+    """
+    sender = pre.fund_eoa()
+    marker_value = 0x42
+
+    code = (
+        # store marker for verification
+        Op.SSTORE(0, marker_value)
+        # push minimum required stack items for the opcode
+        + Op.PUSH0 * stack_items
+        # end-of-code EIP-8024 opcode
+        + eip8024_opcode
+    )
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # verify marker was stored (tx succeeded)
+    post = {contract_address: Account(storage={0: marker_value})}
+    state_test(pre=pre, post=post, tx=tx)
diff --git a/tests/amsterdam/eip8024_dupn_swapn_exchange/test_endofcode_underflow.py b/tests/amsterdam/eip8024_dupn_swapn_exchange/test_endofcode_underflow.py
new file mode 100644
index 00000000000..b07d8622bbc
--- /dev/null
+++ b/tests/amsterdam/eip8024_dupn_swapn_exchange/test_endofcode_underflow.py
@@ -0,0 +1,79 @@
+"""
+EIP-8024 end-of-code stack underflow regression tests.
+
+When DUPN/SWAPN/EXCHANGE is the last byte of code, the missing immediate
+byte decodes to `0` per EIP-8024, and the opcode must still execute with
+that zero-decoded immediate. When the stack is short of the resulting
+required depth, execution must halt with stack underflow — clients must
+not treat the missing immediate as a graceful STOP.
+
+See:
+- EIP-8024: https://eips.ethereum.org/EIPS/eip-8024
+- Bounty: https://github.com/ethereum-bounty/nethermind/issues/12
+- Fix:    https://github.com/NethermindEth/nethermind/pull/11178
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Op,
+    StateTestFiller,
+    Transaction,
+)
+
+from .spec import ref_spec_8024
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_8024.git_path
+REFERENCE_SPEC_VERSION = ref_spec_8024.version
+
+pytestmark = pytest.mark.valid_from("EIP8024")
+
+
+@pytest.mark.parametrize(
+    "eip8024_opcode,pushed_items",
+    [
+        # DUPN: decode_single(0) = 145, needs 145 items — push 144.
+        pytest.param(Op.DUPN, 144, id="dupn"),
+        # SWAPN: decode_single(0) = 145, needs 146 items — push 145.
+        pytest.param(Op.SWAPN, 145, id="swapn"),
+        # EXCHANGE: decode_pair(0) = (9, 16), needs 17 items — push 16.
+        pytest.param(Op.EXCHANGE, 16, id="exchange"),
+    ],
+)
+def test_end_of_code_stack_underflow(
+    pre: Alloc,
+    state_test: StateTestFiller,
+    eip8024_opcode: Op,
+    pushed_items: int,
+) -> None:
+    """
+    Test EIP-8024 opcodes at end of code with one fewer stack item than
+    required by the zero-decoded immediate.
+
+    Per EIP-8024, `code[pc + 1]` evaluates to `0` when beyond end of code.
+    The opcode must still execute and, with insufficient stack depth for
+    the decoded immediate, must halt with stack underflow.
+
+    A buggy implementation that treats the missing immediate as an
+    implicit STOP would incorrectly succeed and persist the marker
+    stored before the opcode.
+    """
+    sender = pre.fund_eoa()
+    marker_value = 0x42
+
+    code = (
+        # store marker that must not persist if the opcode underflows
+        Op.SSTORE(0, marker_value)
+        # one fewer item than the zero-decoded immediate requires
+        + Op.PUSH0 * pushed_items
+        # end-of-code EIP-8024 opcode, no immediate byte
+        + eip8024_opcode
+    )
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # Transaction must fail (stack underflow), leaving storage untouched.
+    post = {contract_address: Account(storage={})}
+    state_test(pre=pre, post=post, tx=tx)
diff --git a/tests/amsterdam/eip8024_dupn_swapn_exchange/test_exchange.py b/tests/amsterdam/eip8024_dupn_swapn_exchange/test_exchange.py
new file mode 100644
index 00000000000..3ab77031139
--- /dev/null
+++ b/tests/amsterdam/eip8024_dupn_swapn_exchange/test_exchange.py
@@ -0,0 +1,496 @@
+"""
+EXCHANGE instruction tests.
+
+Tests for EXCHANGE instruction in
+[EIP-8024: Stack Access Instructions](https://eips.ethereum.org/EIPS/eip-8024).
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Bytecode,
+    EIPChecklist,
+    Fork,
+    Op,
+    StateTestFiller,
+    Transaction,
+)
+
+from .spec import Spec, decode_pair, ref_spec_8024
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_8024.git_path
+REFERENCE_SPEC_VERSION = ref_spec_8024.version
+
+pytestmark = pytest.mark.valid_from("EIP8024")
+
+
+@pytest.mark.parametrize(
+    "n,m",
+    [
+        (1, 2),  # Swap positions 2 and 3
+        (1, 16),  # Swap positions 2 and 17
+        (1, 29),  # Swap positions 2 and 30 (n + m = 30)
+        (5, 10),  # Swap positions 6 and 11
+        (13, 17),  # Swap positions 14 and 18 (n + m = 30)
+        (14, 16),  # Swap positions 15 and 17 (n + m = 30)
+    ],
+    ids=lambda x: f"{x}",
+)
+def test_exchange_basic(
+    n: int,
+    m: int,
+    pre: Alloc,
+    fork: Fork,
+    state_test: StateTestFiller,
+) -> None:
+    """Test EXCHANGE with various n and m values."""
+    sender = pre.fund_eoa()
+
+    # EXCHANGE with decoded (n, m) swaps position (n+1) with position (m+1)
+    stack_height = m + 1  # Need at least m+1 items
+    value_at_n_plus_1 = 0xAAAA
+    value_at_m_plus_1 = 0xBBBB
+
+    # Build stack with known values at swap positions (n+1) and (m+1)
+    code = Bytecode()
+    for i in range(stack_height):
+        # Stack position is 1-indexed from top, so i=0 is bottom
+        stack_pos = stack_height - i  # Position from top (1-indexed)
+        if stack_pos == n + 1:
+            code += Op.PUSH2(value_at_n_plus_1)
+        elif stack_pos == m + 1:
+            code += Op.PUSH2(value_at_m_plus_1)
+        else:
+            code += Op.PUSH2(0x1000 + i)
+
+    # Pass n and m directly - encoder will handle encoding
+    code += Op.EXCHANGE[n, m]
+
+    # Store all stack values to verify the swap
+    for i in range(stack_height):
+        code += Op.PUSH1(i) + Op.SSTORE
+
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    gas_limit = 1_000_000
+    if fork.is_eip_enabled(8037):
+        gas_limit = 5_000_000
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=gas_limit)
+
+    # Build expected storage
+    expected_storage = {}
+    for i in range(stack_height):
+        stack_pos = i + 1  # Position from top (1-indexed)
+        if stack_pos == n + 1:
+            expected_storage[i] = value_at_m_plus_1  # Now has value from m+1
+        elif stack_pos == m + 1:
+            expected_storage[i] = value_at_n_plus_1  # Now has value from n+1
+        else:
+            # Original value at this position
+            original_i = stack_height - stack_pos
+            expected_storage[i] = 0x1000 + original_i
+
+    post = {contract_address: Account(storage=expected_storage)}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "immediate",
+    [0, 1, 15, 78, 79, 80, 81, 128, 129, 200, 255],
+    ids=lambda x: f"exchange_imm_{x}",
+)
+def test_exchange_valid_immediates(
+    immediate: int,
+    pre: Alloc,
+    fork: Fork,
+    state_test: StateTestFiller,
+) -> None:
+    """Test EXCHANGE with valid immediate values (0-81 and 128-255)."""
+    sender = pre.fund_eoa()
+
+    # Decode the immediate to get the stack indices
+    # EXCHANGE with decoded (n, m) swaps position (n+1) with position (m+1)
+    n, m = decode_pair(immediate)
+    stack_height = m + 1  # Need at least m+1 items
+    value_at_n_plus_1 = 0xAAAA
+    value_at_m_plus_1 = 0xBBBB
+
+    # Build stack
+    code = Bytecode()
+    for i in range(stack_height):
+        stack_pos = stack_height - i
+        if stack_pos == n + 1:
+            code += Op.PUSH2(value_at_n_plus_1)
+        elif stack_pos == m + 1:
+            code += Op.PUSH2(value_at_m_plus_1)
+        else:
+            code += Op.PUSH2(0x1000 + i)
+
+    # Pass immediate as bytes (raw immediate byte for testing)
+    code += Op.EXCHANGE[immediate.to_bytes(1, "big")]
+
+    # Store the swapped values
+    for i in range(stack_height):
+        code += Op.PUSH1(i) + Op.SSTORE
+
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    gas_limit = 1_000_000
+    if fork.is_eip_enabled(8037):
+        gas_limit = 5_000_000
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=gas_limit)
+
+    # Build expected storage
+    expected_storage = {}
+    for i in range(stack_height):
+        stack_pos = i + 1
+        if stack_pos == n + 1:
+            expected_storage[i] = value_at_m_plus_1
+        elif stack_pos == m + 1:
+            expected_storage[i] = value_at_n_plus_1
+        else:
+            original_i = stack_height - stack_pos
+            expected_storage[i] = 0x1000 + original_i
+
+    post = {contract_address: Account(storage=expected_storage)}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_exchange_preserves_other_items(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """Test EXCHANGE only swaps specified items, leaving others unchanged."""
+    sender = pre.fund_eoa()
+
+    # Use n=1, m=5 - EXCHANGE swaps positions (n+1)=2 and (m+1)=6
+    n, m = 1, 5
+
+    # Create a stack with 6 distinct values
+    code = Bytecode()
+    code += Op.PUSH2(0x1111)  # Position 6 from top (will be swapped)
+    code += Op.PUSH2(0x2222)  # Position 5 from top
+    code += Op.PUSH2(0x3333)  # Position 4 from top
+    code += Op.PUSH2(0x4444)  # Position 3 from top
+    code += Op.PUSH2(0x5555)  # Position 2 from top (will be swapped)
+    code += Op.PUSH2(0x6666)  # Position 1 (top)
+
+    # EXCHANGE swaps position 2 with position 6
+    # Pass n and m directly - encoder will handle encoding
+    code += Op.EXCHANGE[n, m]
+
+    # Store all values
+    code += Op.PUSH1(0) + Op.SSTORE  # Position 1 (0x6666, unchanged)
+    code += Op.PUSH1(1) + Op.SSTORE  # Position 2 (was 0x1111, swapped from 6)
+    code += Op.PUSH1(2) + Op.SSTORE  # Position 3 (0x4444, unchanged)
+    code += Op.PUSH1(3) + Op.SSTORE  # Position 4 (0x3333, unchanged)
+    code += Op.PUSH1(4) + Op.SSTORE  # Position 5 (0x2222, unchanged)
+    code += Op.PUSH1(5) + Op.SSTORE  # Position 6 (was 0x5555, swapped from 2)
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    post = {
+        contract_address: Account(
+            storage={
+                0: 0x6666,  # Position 1 unchanged
+                1: 0x1111,  # Was at position 6, now at position 2
+                2: 0x4444,  # Position 3 unchanged
+                3: 0x3333,  # Position 4 unchanged
+                4: 0x2222,  # Position 5 unchanged
+                5: 0x5555,  # Was at position 2, now at position 6
+            }
+        )
+    }
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "immediate",
+    # Boundaries of both valid ranges (0x00, 0x51, 0x80, 0xFF)
+    [0, 78, 79, 80, 81, 128, 129, 255],
+    ids=lambda x: f"underflow_imm_{x}",
+)
+def test_exchange_stack_underflow(
+    immediate: int,
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """Test EXCHANGE causes transaction failure on stack underflow."""
+    sender = pre.fund_eoa()
+
+    # EXCHANGE needs m+1 items. Push one less to trigger underflow.
+    n, m = decode_pair(immediate)
+    insufficient_depth = m  # m+1 required, push only m
+
+    code = Bytecode()
+    code += Op.SSTORE(0, 1)  # Marker
+
+    for i in range(insufficient_depth):
+        code += Op.PUSH1(i)
+
+    code += Op.EXCHANGE[immediate.to_bytes(1, "big")]
+    code += Op.SSTORE(0, 2)  # Should never execute
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # Transaction should fail, contract storage unchanged
+    post = {contract_address: Account(storage={})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+@EIPChecklist.Opcode.Test.GasUsage.Normal()
+@EIPChecklist.Opcode.Test.GasUsage.OutOfGasExecution()
+@EIPChecklist.Opcode.Test.GasUsage.ExtraGas()
+@pytest.mark.parametrize("gas_cost_delta", [-2, -1, 0, 1, 2])
+def test_exchange_gas_cost_boundary(
+    gas_cost_delta: int,
+    pre: Alloc,
+    fork: Fork,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test EXCHANGE at the gas cost boundary.
+
+    EXCHANGE is invoked in a callee that receives exactly its execution
+    cost plus `gas_cost_delta`. The caller records the CALL result: a
+    negative delta starves EXCHANGE of its base gas (3) and the sub-call
+    runs out of gas (result 0); a zero or positive delta succeeds
+    (result 1).
+    """
+    # EXCHANGE with decoded (n, m) swaps position (n+1) with position
+    # (m+1); since n < m it needs m + 1 items on the stack. Use the
+    # smallest valid pair.
+    n = Spec.EXCHANGE_MIN_N  # 1
+    m = n + 1
+
+    code = Bytecode()
+    for i in range(m + 1):
+        code += Op.PUSH1(i)
+    code += Op.EXCHANGE[n, m]
+
+    contract_address = pre.deploy_contract(code=code)
+
+    call_code = Op.SSTORE(
+        0,
+        Op.CALL(
+            gas=code.gas_cost(fork) + gas_cost_delta,
+            address=contract_address,
+        ),
+    )
+    call_address = pre.deploy_contract(
+        code=call_code,
+        storage={0: 0xDEADBEEF},
+    )
+
+    tx = Transaction(to=call_address, sender=pre.fund_eoa(), gas_limit=200_000)
+
+    post = {call_address: Account(storage={0: 0 if gas_cost_delta < 0 else 1})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_endofcode_behavior(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test EXCHANGE when the immediate byte is beyond the end of code.
+
+    Per EIP-8024, code[pc + 1] evaluates to 0 if beyond the end of the code,
+    matching PUSH behavior. With immediate = 0, decode_pair(0) = (9, 16), so
+    EXCHANGE swaps positions 10 and 17.
+
+    This test verifies the transaction succeeds (doesn't revert) when EXCHANGE
+    is the last byte of the code with no immediate byte following it.
+    """
+    sender = pre.fund_eoa()
+
+    # decode_pair(0) = (9, 16), which swaps positions 10 and 17
+    # We need 17 items on the stack for this to succeed
+    stack_height = 17
+    marker_value = 0x42
+
+    # Build code: store marker, push enough items, then EXCHANGE (no immediate)
+    code = Bytecode()
+    code += Op.PUSH1(marker_value) + Op.PUSH1(0) + Op.SSTORE  # Store marker
+
+    # Push 17 items to stack so EXCHANGE with implicit imm=0 succeeds
+    for i in range(stack_height):
+        code += Op.PUSH1(i)
+
+    # Add just the EXCHANGE opcode without immediate byte
+    # After EXCHANGE, pc += 2 goes beyond code, causing implicit STOP
+    code += Op.EXCHANGE  # no immediate
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # If tx succeeds, storage[0] = marker_value
+    # Bad implementation would revert and have empty storage
+    post = {contract_address: Account(storage={0: marker_value})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "immediate",
+    [
+        # valid immediates (0-81 / 128-255): skipped during JUMPDEST
+        # analysis, not reachable as jump targets
+        0x00,
+        0x4F,  # 79
+        0x50,  # 80 — POP (valid for EXCHANGE)
+        0x51,  # 81 — MLOAD (valid for EXCHANGE)
+        # invalid immediates (82-127): not skipped during JUMPDEST
+        # analysis, only 0x5B (91) is a JUMPDEST
+        0x52,  # 82 — MSTORE (first invalid immediate)
+        0x5A,  # 90 — GAS (invalid immediate)
+        0x5B,  # 91 — JUMPDEST, only case where jump succeeds
+        0x5C,  # 92 — TLOAD (invalid immediate)
+        0x60,  # 96 — PUSH1 (invalid immediate)
+        0x7F,  # 127 — PUSH32 (last invalid immediate)
+        # valid immediates again (128-255)
+        0x80,  # 128
+        0xFF,  # 255
+    ],
+    ids=lambda x: f"imm_0x{x:02x}",
+)
+def test_exchange_jump_to_immediate_byte(
+    immediate: int,
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test jumping to EXCHANGE immediate byte position.
+
+    Valid immediates are skipped (can't jump to them).
+    Invalid immediates are not skipped - only 0x5B (JUMPDEST) allows jumping.
+    """
+    sender = pre.fund_eoa()
+
+    # Bytecode: PUSH1(4) JUMP EXCHANGE[imm] - position 4 is the immediate byte
+    code = Bytecode()
+    code += Op.PUSH1(4)
+    code += Op.JUMP
+    code += Op.EXCHANGE[immediate.to_bytes(1, "big")]
+
+    code += Op.PUSH1(0x42) + Op.PUSH1(0) + Op.SSTORE
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    if immediate == 0x5B:  # JUMPDEST - only case where jump succeeds
+        post = {contract_address: Account(storage={0: 0x42})}
+    else:
+        post = {contract_address: Account(storage={})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_exchange_with_push_sequence(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test EXCHANGE swapping positions 10 and 17 with a push sequence.
+
+    Build 17 stack items with markers at positions 10 and 17.
+    EXCHANGE[0x00]: decode_pair(0) = (9, 16), swaps positions 10 and 17.
+    """
+    sender = pre.fund_eoa()
+
+    # Build 17 items with markers at positions 10 and 17
+    code = Bytecode()
+    for i in range(17):
+        stack_pos = 17 - i  # Position from top (1-indexed)
+        if stack_pos == 10:
+            code += Op.PUSH2(0xAAAA)
+        elif stack_pos == 17:
+            code += Op.PUSH2(0xBBBB)
+        else:
+            code += Op.PUSH1(0)
+
+    # EXCHANGE with immediate 0 (decode_pair(0) = (9, 16))
+    # swaps pos 10 and 17
+    code += Op.EXCHANGE[b"\x00"]
+
+    # Store all stack values to verify
+    for i in range(17):
+        code += Op.PUSH1(i) + Op.SSTORE
+
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # Expected: position 9 has 0xBBBB (from pos 17), position 16 has
+    # 0xAAAA (from pos 10), rest = 0
+    expected_storage = {}
+    for i in range(17):
+        stack_pos = i + 1  # 1-indexed position from top
+        if stack_pos == 10:
+            expected_storage[i] = 0xBBBB  # Swapped from position 17
+        elif stack_pos == 17:
+            expected_storage[i] = 0xAAAA  # Swapped from position 10
+        else:
+            expected_storage[i] = 0
+
+    post = {contract_address: Account(storage=expected_storage)}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "immediate",
+    range(82, 128),  # Forbidden range: 0x52-0x7F
+    ids=lambda x: f"imm_{x}",
+)
+def test_exchange_invalid_immediate_aborts(
+    immediate: int,
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test EXCHANGE aborts with invalid immediates (82-127).
+
+    This range is forbidden because it overlaps with JUMPDEST and PUSH opcodes.
+    """
+    sender = pre.fund_eoa()
+
+    code = Bytecode()
+    code += Op.SSTORE(0, 1)  # Marker
+
+    # Push 30 items (max needed for any valid EXCHANGE)
+    for i in range(30):
+        code += Op.PUSH1(i)
+
+    code += Op.EXCHANGE[immediate.to_bytes(1, "big")]
+    code += Op.SSTORE(0, 2)  # Should never execute
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # Execution aborted, transaction reverts
+    post = {contract_address: Account(storage={})}
+
+    state_test(pre=pre, post=post, tx=tx)
diff --git a/tests/amsterdam/eip8024_dupn_swapn_exchange/test_pc_advancement.py b/tests/amsterdam/eip8024_dupn_swapn_exchange/test_pc_advancement.py
new file mode 100644
index 00000000000..b98cf813e44
--- /dev/null
+++ b/tests/amsterdam/eip8024_dupn_swapn_exchange/test_pc_advancement.py
@@ -0,0 +1,314 @@
+"""
+Program Counter (PC) advancement tests for EIP-8024 opcodes.
+
+Tests that verify DUPN, SWAPN, and EXCHANGE correctly advance the PC by 2 bytes
+(opcode + immediate byte) as specified in
+[EIP-8024: Stack Access Instructions](https://eips.ethereum.org/EIPS/eip-8024).
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Bytecode,
+    Op,
+    StateTestFiller,
+    Transaction,
+)
+
+from .spec import ref_spec_8024
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_8024.git_path
+REFERENCE_SPEC_VERSION = ref_spec_8024.version
+
+pytestmark = pytest.mark.valid_from("EIP8024")
+
+
+def test_dupn_pc_advances_by_2(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Verify PC advances by 2 after DUPN (opcode + immediate byte).
+
+    Tests that DUPN consumes the immediate byte and advances PC correctly.
+    """
+    sender = pre.fund_eoa()
+
+    code = Bytecode()
+
+    # Push 17 values so DUPN[17] will work
+    for i in range(17):
+        code += Op.PUSH1(i)
+
+    # Capture PC before DUPN and store it
+    code += Op.PC
+    code += Op.PUSH1(1) + Op.SSTORE  # Store PC_before at key 1
+
+    # Execute DUPN - should advance PC by 2 (opcode + immediate)
+    code += Op.DUPN[17]
+
+    # Capture PC after DUPN and store it
+    code += Op.PC
+    code += Op.PUSH1(2) + Op.SSTORE  # Store PC_after at key 2
+
+    # Calculate difference: get both values and subtract
+    code += Op.PUSH1(1) + Op.SLOAD  # Load PC_before
+    code += Op.PUSH1(2) + Op.SLOAD  # Load PC_after
+    code += Op.SUB  # PC_after - PC_before (SUB does: second - top)
+
+    # Store the difference
+    code += Op.PUSH1(0) + Op.SSTORE
+
+    # Clean up intermediate storage
+    code += Op.PUSH1(0) + Op.PUSH1(1) + Op.SSTORE  # Clear key 1
+    code += Op.PUSH1(0) + Op.PUSH1(2) + Op.SSTORE  # Clear key 2
+
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # The difference should be:
+    # PUSH1(2) + SSTORE(1) + DUPN(2) + PC(1) = 6
+    # Note: Keys 1 and 2 are used for intermediate storage
+    post = {
+        contract_address: Account(
+            storage={
+                0: 6,  # PC_after - PC_before (the main result)
+                # Keys 1 and 2 contain PC_before and PC_after for debugging
+            }
+        )
+    }
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_swapn_pc_advances_by_2(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Verify PC advances by 2 after SWAPN (opcode + immediate byte).
+
+    Tests that SWAPN consumes the immediate byte and advances PC correctly.
+    """
+    sender = pre.fund_eoa()
+
+    code = Bytecode()
+
+    # Push 18 values so SWAPN[17] will work (needs 18 items on stack)
+    for i in range(18):
+        code += Op.PUSH1(i)
+
+    # Capture PC before SWAPN and store it
+    code += Op.PC
+    code += Op.PUSH1(1) + Op.SSTORE
+
+    # Execute SWAPN - should advance PC by 2 (opcode + immediate)
+    code += Op.SWAPN[17]
+
+    # Capture PC after SWAPN and store it
+    code += Op.PC
+    code += Op.PUSH1(2) + Op.SSTORE
+
+    # Calculate difference
+    code += Op.PUSH1(1) + Op.SLOAD  # Load PC_before
+    code += Op.PUSH1(2) + Op.SLOAD  # Load PC_after
+    code += Op.SUB  # PC_after - PC_before
+
+    # Store the difference
+    code += Op.PUSH1(0) + Op.SSTORE
+
+    # Clean up intermediate storage
+    code += Op.PUSH1(0) + Op.PUSH1(1) + Op.SSTORE  # Clear key 1
+    code += Op.PUSH1(0) + Op.PUSH1(2) + Op.SSTORE  # Clear key 2
+
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    post = {
+        contract_address: Account(
+            storage={
+                0: 6,  # PUSH1(2) + SSTORE(1) + SWAPN(2) + PC(1) = 6
+            }
+        )
+    }
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_exchange_pc_advances_by_2(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Verify PC advances by 2 after EXCHANGE (opcode + immediate byte).
+
+    Tests that EXCHANGE consumes the immediate byte and advances PC correctly.
+    """
+    sender = pre.fund_eoa()
+
+    code = Bytecode()
+
+    # Push 6 values so EXCHANGE[1, 5] will work (needs 6 items on stack)
+    for i in range(6):
+        code += Op.PUSH1(i)
+
+    # Capture PC before EXCHANGE and store it
+    code += Op.PC
+    code += Op.PUSH1(1) + Op.SSTORE
+
+    # Execute EXCHANGE - should advance PC by 2 (opcode + immediate)
+    code += Op.EXCHANGE[1, 5]
+
+    # Capture PC after EXCHANGE and store it
+    code += Op.PC
+    code += Op.PUSH1(2) + Op.SSTORE
+
+    # Calculate difference
+    code += Op.PUSH1(1) + Op.SLOAD  # Load PC_before
+    code += Op.PUSH1(2) + Op.SLOAD  # Load PC_after
+    code += Op.SUB  # PC_after - PC_before
+
+    # Store the difference
+    code += Op.PUSH1(0) + Op.SSTORE
+
+    # Clean up intermediate storage
+    code += Op.PUSH1(0) + Op.PUSH1(1) + Op.SSTORE  # Clear key 1
+    code += Op.PUSH1(0) + Op.PUSH1(2) + Op.SSTORE  # Clear key 2
+
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    post = {
+        contract_address: Account(
+            storage={
+                0: 6,  # PUSH1(2) + SSTORE(1) + EXCHANGE(2) + PC(1) = 6
+            }
+        )
+    }
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_dupn_multiple_consecutive_pc_advancement(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Verify PC advances correctly with multiple consecutive DUPN opcodes.
+
+    Tests that each DUPN independently advances PC by 2 bytes.
+    """
+    sender = pre.fund_eoa()
+
+    code = Bytecode()
+
+    # Push enough values for multiple DUPNs
+    for i in range(20):
+        code += Op.PUSH1(i)
+
+    # Capture initial PC
+    code += Op.PC
+    code += Op.PUSH1(1) + Op.SSTORE
+
+    # Execute three consecutive DUPNs
+    code += Op.DUPN[17]
+    code += Op.DUPN[18]
+    code += Op.DUPN[19]
+
+    # Capture final PC
+    code += Op.PC
+    code += Op.PUSH1(2) + Op.SSTORE
+
+    # Calculate difference
+    code += Op.PUSH1(1) + Op.SLOAD  # Load PC_before
+    code += Op.PUSH1(2) + Op.SLOAD  # Load PC_after
+    code += Op.SUB  # PC_after - PC_before
+
+    # Store the difference
+    code += Op.PUSH1(0) + Op.SSTORE
+
+    # Clean up intermediate storage
+    code += Op.PUSH1(0) + Op.PUSH1(1) + Op.SSTORE  # Clear key 1
+    code += Op.PUSH1(0) + Op.PUSH1(2) + Op.SSTORE  # Clear key 2
+
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    post = {
+        contract_address: Account(
+            storage={
+                0: 10,  # PUSH1(2) + SSTORE(1) + DUPN(2)*3 + PC(1) = 10
+            }
+        )
+    }
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_mixed_opcodes_pc_advancement(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Verify PC advances correctly with mixed DUPN, SWAPN, and EXCHANGE opcodes.
+
+    Tests that different EIP-8024 opcodes each correctly advance PC by 2 bytes.
+    """
+    sender = pre.fund_eoa()
+
+    code = Bytecode()
+
+    # Push enough values for all operations
+    for i in range(30):
+        code += Op.PUSH1(i)
+
+    # Capture initial PC
+    code += Op.PC
+    code += Op.PUSH1(1) + Op.SSTORE
+
+    # Execute one of each opcode
+    code += Op.DUPN[17]
+    code += Op.SWAPN[18]
+    code += Op.EXCHANGE[1, 5]
+
+    # Capture final PC
+    code += Op.PC
+    code += Op.PUSH1(2) + Op.SSTORE
+
+    # Calculate difference
+    code += Op.PUSH1(1) + Op.SLOAD  # Load PC_before
+    code += Op.PUSH1(2) + Op.SLOAD  # Load PC_after
+    code += Op.SUB  # PC_after - PC_before
+
+    # Store the difference
+    code += Op.PUSH1(0) + Op.SSTORE
+
+    # Clean up intermediate storage
+    code += Op.PUSH1(0) + Op.PUSH1(1) + Op.SSTORE  # Clear key 1
+    code += Op.PUSH1(0) + Op.PUSH1(2) + Op.SSTORE  # Clear key 2
+
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    post = {
+        contract_address: Account(
+            storage={
+                # PUSH1(2) + SSTORE(1) + DUPN(2) + SWAPN(2)
+                # + EXCHANGE(2) + PC(1) = 10
+                0: 10,
+            }
+        )
+    }
+
+    state_test(pre=pre, post=post, tx=tx)
diff --git a/tests/amsterdam/eip8024_dupn_swapn_exchange/test_swapn.py b/tests/amsterdam/eip8024_dupn_swapn_exchange/test_swapn.py
new file mode 100644
index 00000000000..e238b39a5ff
--- /dev/null
+++ b/tests/amsterdam/eip8024_dupn_swapn_exchange/test_swapn.py
@@ -0,0 +1,477 @@
+"""
+SWAPN instruction tests.
+
+Tests for SWAPN instruction in
+[EIP-8024: Stack Access Instructions](https://eips.ethereum.org/EIPS/eip-8024).
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Bytecode,
+    EIPChecklist,
+    Fork,
+    Op,
+    StateTestFiller,
+    Transaction,
+)
+
+from .spec import Spec, decode_single, ref_spec_8024
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_8024.git_path
+REFERENCE_SPEC_VERSION = ref_spec_8024.version
+
+pytestmark = pytest.mark.valid_from("EIP8024")
+
+
+@pytest.mark.parametrize(
+    "stack_index",
+    [17, 18, 32, 64, 107, 108, 200, 235],
+    ids=lambda x: f"swapn_stack_{x}",
+)
+def test_swapn_basic(
+    stack_index: int,
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """Test SWAPN with various stack indices (17-235)."""
+    sender = pre.fund_eoa()
+
+    # SWAPN with decoded value n swaps position 1 with position (n+1)
+    # So we need stack_height = stack_index + 1 items
+    stack_height = stack_index + 1
+    top_value = 0xAAAA
+    swap_target_value = 0xBBBB
+
+    # Build stack with known values at top and swap position (n+1)
+    code = Bytecode()
+
+    # First push ends up at position (stack_index+1) from top
+    code += Op.PUSH2(swap_target_value)
+
+    # Pushes in-between
+    for i in range(1, stack_height - 1):
+        code += Op.PUSH2(0x1000 + i)
+
+    # Last push ends up at top
+    code += Op.PUSH2(top_value)
+
+    # Pass stack index directly - encoder will handle encoding
+    code += Op.SWAPN[stack_index]
+
+    # Store both swapped values to verify
+    code += Op.PUSH1(0) + Op.SSTORE  # New top (was swap_target_value)
+
+    # Pop intermediate values to get to the swapped position
+    for _ in range(stack_index - 1):
+        code += Op.POP
+
+    code += Op.PUSH1(1) + Op.SSTORE  # New position (was top_value)
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    post = {
+        contract_address: Account(
+            storage={
+                0: swap_target_value,  # Top now has the swapped value
+                1: top_value,  # Position (stack_index+1) now has original top
+            }
+        )
+    }
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "immediate",
+    [0, 45, 90, 128, 200, 255],
+    ids=lambda x: f"swapn_imm_{x}",
+)
+def test_swapn_valid_immediates(
+    immediate: int,
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """Test SWAPN with valid immediate values (0-90 and 128-255)."""
+    sender = pre.fund_eoa()
+
+    # Decode the immediate to get the stack index
+    # SWAPN with decoded value n swaps position 1 with position (n+1)
+    stack_index = decode_single(immediate)
+    stack_height = stack_index + 1
+    top_value = 0xAAAA
+    swap_target_value = 0xBBBB
+
+    # Build stack
+    code = Bytecode()
+
+    # First push ends up at position (stack_index+1) from top
+    code += Op.PUSH2(swap_target_value)
+
+    # Pushes in-between
+    for i in range(1, stack_height - 1):
+        code += Op.PUSH2(0x1000 + i)
+
+    # Last push ends up at top
+    code += Op.PUSH2(top_value)
+
+    # Pass immediate as bytes (raw immediate byte for testing)
+    code += Op.SWAPN[immediate.to_bytes(1, "big")]
+
+    # Store the new top value
+    code += Op.PUSH1(0) + Op.SSTORE
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=10_000_000)
+
+    post = {
+        contract_address: Account(
+            storage={
+                0: swap_target_value,  # Top now has the swapped value
+            }
+        )
+    }
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_swapn_preserves_other_stack_items(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """Test SWAPN only swaps the specified items, leaving others unchanged."""
+    sender = pre.fund_eoa()
+
+    # Use stack index 17 (smallest valid)
+    # SWAPN with n=17 swaps position 1 with position 18, so need 18 items
+    stack_index = 17
+    stack_height = stack_index + 1  # Need 18 items
+
+    # Create a stack with 18 distinct values
+    code = Bytecode()
+    for i in range(stack_height):
+        code += Op.PUSH2(0x1000 + i)
+
+    # SWAPN swaps top (position 1) with position 18
+    # Pass stack index directly - encoder will handle encoding
+    code += Op.SWAPN[stack_index]
+
+    # Store all values to verify only the swapped ones changed
+    for i in range(stack_height):
+        code += Op.PUSH1(i) + Op.SSTORE
+
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # After swap: position 1 and position 18 are swapped
+    # Original stack (top to bottom): 0x1011, 0x1010, ..., 0x1001, 0x1000
+    # After SWAPN[0]: 0x1000, 0x1010, ..., 0x1001, 0x1011
+    expected_storage = {}
+    for i in range(stack_height):
+        if i == 0:
+            expected_storage[i] = 0x1000  # Was at bottom, now at top
+        elif i == stack_height - 1:
+            expected_storage[i] = 0x1011  # Was at top, now at bottom
+        else:
+            expected_storage[i] = 0x1000 + (stack_height - 1 - i)
+
+    post = {contract_address: Account(storage=expected_storage)}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_swapn_stack_underflow(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """Test SWAPN causes transaction failure on stack underflow."""
+    sender = pre.fund_eoa()
+
+    # SWAPN with immediate 0x80 (n=17) swaps position 1 with position 18
+    # Need 18 items, so push only 17 to trigger underflow
+    code = Bytecode()
+    for i in range(17):
+        code += Op.PUSH1(i)
+    # Pass immediate as bytes (raw immediate byte for testing)
+    # decode_single(0x80) = 17, needs 18 items but only 17
+    code += Op.SWAPN[b"\x80"]
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # Transaction should fail, contract storage unchanged
+    post = {contract_address: Account(storage={})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+@EIPChecklist.Opcode.Test.GasUsage.Normal()
+@EIPChecklist.Opcode.Test.GasUsage.OutOfGasExecution()
+@EIPChecklist.Opcode.Test.GasUsage.ExtraGas()
+@pytest.mark.parametrize("gas_cost_delta", [-2, -1, 0, 1, 2])
+def test_swapn_gas_cost_boundary(
+    gas_cost_delta: int,
+    pre: Alloc,
+    fork: Fork,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test SWAPN at the gas cost boundary.
+
+    SWAPN is invoked in a callee that receives exactly its execution cost
+    plus `gas_cost_delta`. The caller records the CALL result: a negative
+    delta starves SWAPN of its base gas (3) and the sub-call runs out of
+    gas (result 0); a zero or positive delta succeeds (result 1).
+    """
+    # SWAPN with decoded value n swaps position 1 with position (n+1), so
+    # it needs stack_index + 1 items on the stack.
+    stack_index = Spec.MIN_STACK_INDEX  # 17
+
+    code = Bytecode()
+    for i in range(stack_index + 1):
+        code += Op.PUSH1(i)
+    code += Op.SWAPN[stack_index]
+
+    contract_address = pre.deploy_contract(code=code)
+
+    call_code = Op.SSTORE(
+        0,
+        Op.CALL(
+            gas=code.gas_cost(fork) + gas_cost_delta,
+            address=contract_address,
+        ),
+    )
+    call_address = pre.deploy_contract(
+        code=call_code,
+        storage={0: 0xDEADBEEF},
+    )
+
+    tx = Transaction(to=call_address, sender=pre.fund_eoa(), gas_limit=200_000)
+
+    post = {call_address: Account(storage={0: 0 if gas_cost_delta < 0 else 1})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+@pytest.mark.parametrize(
+    "invalid_immediate",
+    list(range(91, 128)),  # 0x5b to 0x7f (JUMPDEST and PUSH opcodes)
+    ids=lambda x: f"swapn_invalid_imm_0x{x:02x}",
+)
+def test_swapn_invalid_immediate_aborts(
+    invalid_immediate: int,
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test SWAPN with invalid immediate values (90 < x < 128) aborts.
+
+    Per EIP-8024, immediate values in range [91, 127] (0x5b-0x7f) are
+    invalid because they correspond to JUMPDEST (0x5b) and PUSH opcodes
+    (0x60-0x7f). Attempting to execute SWAPN with these immediates should
+    abort.
+    """
+    sender = pre.fund_eoa()
+
+    # Build a stack tall enough for any valid immediate (max decoded index
+    # is 235, SWAPN needs index + 1 items) so the abort is caused by the
+    # invalid immediate, never an underflow.
+    code = Bytecode()
+    for i in range(Spec.MAX_STACK_INDEX + 1):
+        code += Op.PUSH1(i % 256)
+
+    # Attempt SWAPN with invalid immediate - should abort.
+    # Pass as bytes (raw immediate byte for testing invalid ranges).
+    code += Op.SWAPN[invalid_immediate.to_bytes(1, "big")]
+
+    # This should never execute.
+    code += Op.PUSH1(0x42) + Op.PUSH1(0) + Op.SSTORE
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=10_000_000)
+
+    # Transaction should fail - invalid immediate causes abort.
+    post = {contract_address: Account(storage={})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_endofcode_behavior(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test SWAPN when the immediate byte is beyond the end of code.
+
+    Per EIP-8024, code[pc + 1] evaluates to 0 if beyond the end of the code,
+    matching PUSH behavior. With immediate = 0, decode_single(0) = 145, so
+    SWAPN swaps position 1 with position 146.
+
+    This test verifies the transaction succeeds (doesn't revert) when SWAPN
+    is the last byte of the code with no immediate byte following it.
+    """
+    sender = pre.fund_eoa()
+
+    # decode_single(0) = 145, which swaps position 1 with position 146
+    # We need 146 items on the stack for this to succeed
+    stack_height = 146
+    marker_value = 0x42
+
+    # Build code: store marker, push enough items, then SWAPN (no immediate)
+    code = Bytecode()
+    code += Op.PUSH1(marker_value) + Op.PUSH1(0) + Op.SSTORE  # Store marker
+
+    # Push 146 items to stack so SWAPN with implicit imm=0 succeeds
+    for i in range(stack_height):
+        code += Op.PUSH1(i % 256)
+
+    # Add just the SWAPN opcode without immediate byte
+    # After SWAPN, pc += 2 goes beyond code, causing implicit STOP
+    code += Op.SWAPN  # no immediate
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # If tx succeeds, storage[0] = marker_value
+    # Bad implementation would revert and have empty storage
+    post = {contract_address: Account(storage={0: marker_value})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_swapn_jump_to_immediate_byte_0x5b_succeeds(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test that jumping to 0x5b after SWAPN succeeds (backward compat).
+
+    Bytecode: PUSH1(4) JUMP SWAPN[0x5b]
+    Hex: 6004 56 e7 5b
+    Position 4 contains 0x5b which is an INVALID immediate for SWAPN.
+    Per EIP-8024, 0x5b is preserved as valid JUMPDEST for compatibility.
+    The SWAPN instruction is never executed due to the jump.
+    """
+    sender = pre.fund_eoa()
+
+    # Build code that jumps to 0x5b after SWAPN opcode
+    code = Bytecode()
+    code += Op.PUSH1(4)  # Push jump target (position 4)
+    code += Op.JUMP  # Jump to position 4
+    # Pass as bytes (raw immediate byte for testing)
+    code += Op.SWAPN[b"\x5b"]  # Position 3-4: SWAPN + 0x5b (invalid)
+
+    # This SHOULD execute because 0x5b is a valid JUMPDEST
+    code += Op.PUSH1(0x42) + Op.PUSH1(0) + Op.SSTORE
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # Transaction succeeds - 0x5b is preserved as valid JUMPDEST
+    post = {contract_address: Account(storage={0: 0x42})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_swapn_jump_to_valid_immediate_fails(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test jumping to a valid immediate byte fails.
+
+    Bytecode: PUSH1(4) JUMP SWAPN[0x00]
+    Hex: 6004 56 e7 00
+    Position 4 contains 0x00 which is a VALID immediate for SWAPN.
+    Valid immediates are skipped in JUMPDEST analysis, so jump fails.
+    """
+    sender = pre.fund_eoa()
+
+    # Build code that tries to jump to a valid immediate
+    code = Bytecode()
+    code += Op.PUSH1(4)  # Push jump target (position 4)
+    code += Op.JUMP  # Try to jump to position 4
+    # Pass as bytes (raw immediate byte for testing)
+    code += Op.SWAPN[b"\x00"]  # Position 3-4: SWAPN + 0x00 (valid)
+
+    # This should never execute
+    code += Op.PUSH1(0x42) + Op.PUSH1(0) + Op.SSTORE
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # Transaction fails - position 4 is a valid immediate, not JUMPDEST
+    post = {contract_address: Account(storage={})}
+
+    state_test(pre=pre, post=post, tx=tx)
+
+
+def test_swapn_with_dup1_and_push(
+    pre: Alloc,
+    state_test: StateTestFiller,
+) -> None:
+    """
+    Test SWAPN swapping top and bottom after building stack with DUP1.
+
+    Stack layout: PUSH1(1) PUSH1(0) DUP1*15 PUSH1(2) SWAPN[0x80]
+    Before SWAPN: [2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]
+    After SWAPN[0x80] (decode_single(0x80)=17, swaps pos 1 and 18):
+    [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2]
+    Result: 18 stack items, top=1, bottom=2, rest=0
+    """
+    sender = pre.fund_eoa()
+
+    # Build the stack: PUSH1(1), PUSH1(0), 15x DUP1, PUSH1(2)
+    code = Bytecode()
+    code += Op.PUSH1(1)  # Position 18 after DUP1s and final PUSH1
+    code += Op.PUSH1(0)
+    for _ in range(15):
+        code += Op.DUP1
+    code += Op.PUSH1(2)  # Top of stack (position 1)
+
+    # Stack: [2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]
+    # SWAPN with immediate 0x80 (decode_single(0x80)=17) swaps pos 1 and 18
+    # Pass as bytes (raw immediate byte for testing)
+    code += Op.SWAPN[b"\x80"]
+
+    # Store all stack values to verify
+    for i in range(18):
+        code += Op.PUSH1(i) + Op.SSTORE
+
+    code += Op.STOP
+
+    contract_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(to=contract_address, sender=sender, gas_limit=1_000_000)
+
+    # Expected: top (position 0) = 1, bottom (position 17) = 2, rest = 0
+    expected_storage = {}
+    for i in range(18):
+        if i == 0:
+            expected_storage[i] = 1  # Was at bottom, now at top
+        elif i == 17:
+            expected_storage[i] = 2  # Was at top, now at bottom
+        else:
+            expected_storage[i] = 0  # All middle values
+
+    post = {contract_address: Account(storage=expected_storage)}
+
+    state_test(pre=pre, post=post, tx=tx)
diff --git a/tests/benchmark/compute/eip7928_block_level_access_lists/__init__.py b/tests/benchmark/compute/eip7928_block_level_access_lists/__init__.py
new file mode 100644
index 00000000000..d02b97d33f6
--- /dev/null
+++ b/tests/benchmark/compute/eip7928_block_level_access_lists/__init__.py
@@ -0,0 +1 @@
+"""EIP-7928 Block-level Access List benchmark tests."""
diff --git a/tests/benchmark/compute/eip7928_block_level_access_lists/test_block_access_list.py b/tests/benchmark/compute/eip7928_block_level_access_lists/test_block_access_list.py
new file mode 100644
index 00000000000..7c5c5e0c41f
--- /dev/null
+++ b/tests/benchmark/compute/eip7928_block_level_access_lists/test_block_access_list.py
@@ -0,0 +1,842 @@
+"""
+Benchmark blocks with block access list (BAL) storage dependencies.
+
+Tests target different BAL optimization paths:
+
+- Parallel execution: The ability for clients to execute transactions
+  in parallel.
+- State root computation: The ability for clients to compute the post-state
+  root in parallel with execution.
+- Cold storage prefetching: The ability for clients to prefetch cold
+  storage slots in parallel with execution.
+"""
+
+import math
+from enum import Enum, auto
+
+import pytest
+from execution_testing import (
+    Alloc,
+    BenchmarkTestFiller,
+    Block,
+    Bytecode,
+    Fork,
+    Hash,
+    Initcode,
+    Op,
+    Storage,
+    TestPhaseManager,
+    Transaction,
+    While,
+    compute_create_address,
+)
+
+from ethereum.crypto.hash import keccak256
+
+REFERENCE_SPEC_GIT_PATH = "EIPS/eip-7928.md"
+REFERENCE_SPEC_VERSION = "aca88aa0932580c29d0233f902cb4390e88b8c41"
+
+pytestmark = pytest.mark.valid_from("Amsterdam")
+
+# Sentinel slot for inter-tx serialization in prefetch tests.
+# Chosen as max uint256 to avoid collision with data slots.
+_POINTER_SLOT = 2**256 - 1
+
+
+class TxDensity(Enum):
+    """
+    Control how many transactions a gas budget is divided into.
+
+    GREEDY: pack ``tx_gas_limit``-sized transactions (fewest txs).
+    HALF: 50 % of the maximum possible transaction count.
+    MAX: maximum transaction count (each tx at minimum viable gas).
+    """
+
+    GREEDY = auto()
+    HALF = auto()
+    MAX = auto()
+
+
+def _derive_loop_gas(body: Bytecode, fork: Fork) -> tuple[int, int]:
+    """
+    Derive per-iteration gas and exit overhead for a While loop.
+
+    Return ``(per_iter_gas, exit_overhead)``.
+
+    Uses a placeholder condition (``GT(GAS, 0)``) to measure the loop
+    overhead.  ``PUSH`` costs 3 gas regardless of the pushed value if
+    the value is nonzero, so the real condition (which pushes ``reserve_gas``)
+    has the same cost.
+    """
+    body_gas = body.gas_cost(fork)
+    placeholder = Op.GT(Op.GAS, Op.PUSH1(0))
+    per_iter_gas = While(body=body, condition=placeholder).gas_cost(fork)
+    exit_overhead = per_iter_gas - body_gas - Op.JUMPDEST.gas_cost(fork)
+    return per_iter_gas, exit_overhead
+
+
+def _build_keccak_chain(
+    fork: Fork,
+) -> tuple[Bytecode, int, int, int]:
+    """
+    Build keccak chain code and compute gas schedule.
+
+    Return ``(code, setup_gas, per_iter_gas, reserve_gas)``.
+
+    Contract flow:
+
+    1. Store literal ``1`` as seed in memory (no state access).
+    2. Keccak loop: ``MSTORE(0, SHA3(0, 32))`` until gas reserve.
+    3. Cleanup: ``SSTORE(0, ADD(SLOAD(0), MLOAD(0)))`` then STOP.
+
+    SLOAD(0) is deliberately placed in cleanup so speculative
+    parallel execution wastes maximum resources before discovering
+    the shared-state conflict on slot 0.
+    """
+    prefix = Op.MSTORE(
+        0,
+        1,
+        old_memory_size=0,
+        new_memory_size=32,
+    )
+
+    keccak_body = Op.MSTORE(
+        0,
+        Op.SHA3(0, 32, data_size=32),
+        old_memory_size=32,
+        new_memory_size=32,
+    )
+
+    # Cleanup: combine loop result with shared state, then store.
+    # SLOAD(0) is the first state access — deliberately late to
+    # force speculative parallel execution to waste maximum
+    # resources before discovering the shared-state conflict.
+    cleanup = (
+        Op.SSTORE(
+            0,
+            Op.ADD(
+                Op.SLOAD(0, key_warm=False),
+                Op.MLOAD(0),
+            ),
+            key_warm=True,
+            # Placeholder: actual value differs per tx but gas cost
+            # is identical for any nonzero -> nonzero write.
+            original_value=1,
+            current_value=1,
+            new_value=2,
+        )
+        + Op.STOP
+    )
+
+    setup_gas = prefix.gas_cost(fork)
+    cleanup_gas = cleanup.gas_cost(fork)
+    per_iter_gas, exit_overhead = _derive_loop_gas(keccak_body, fork)
+    reserve_gas = per_iter_gas + exit_overhead + cleanup_gas
+
+    condition = Op.GT(Op.GAS, reserve_gas)
+    loop = While(body=keccak_body, condition=condition)
+
+    return prefix + loop + cleanup, setup_gas, per_iter_gas, reserve_gas
+
+
+def _build_sequential_sstore_code(reserve_gas: int) -> Bytecode:
+    """
+    Build runtime code that SSTOREs to sequential cold storage slots.
+
+    Read ``start_slot`` from ``calldata[0:32]``, then loop writing a
+    max-weight value (``2**256 - 1``) to ``slot``, ``slot - 1``, ...
+    until remaining gas drops below ``reserve_gas``.  Counting down
+    from high keys with 32-byte values maximizes RLP encoding weight
+    per trie leaf for state root computation benchmarks.
+
+    Memory layout: ``[0:32]`` = current slot counter.
+    """
+    setup = Op.MSTORE(
+        0,
+        Op.CALLDATALOAD(0),
+        old_memory_size=0,
+        new_memory_size=32,
+    )
+
+    sstore_body = Op.SSTORE(
+        Op.MLOAD(0),
+        2**256 - 1,
+        key_warm=False,
+        original_value=1,
+        current_value=1,
+        new_value=2**256 - 1,
+    ) + Op.MSTORE(
+        0,
+        Op.SUB(Op.MLOAD(0), 1),
+        old_memory_size=32,
+        new_memory_size=32,
+    )
+
+    condition = Op.GT(Op.GAS, reserve_gas)
+
+    loop = While(body=sstore_body, condition=condition)
+
+    return setup + loop + Op.STOP
+
+
+def _build_sload_chain_code(reserve_gas: int) -> Bytecode:
+    """
+    Build runtime code that SLOADs a linked-list chain.
+
+    Read seed from ``_POINTER_SLOT``, then loop:
+    ``next_key = SLOAD(key)`` — the stored value IS the next key.
+    Repeat until remaining gas drops below ``reserve_gas``.  Write
+    final key back to ``_POINTER_SLOT`` to serialize transactions.
+
+    Keys are unpredictable without reading storage, so clients can
+    only prefetch via the BAL.
+
+    Caller must initialize ``_POINTER_SLOT`` to a nonzero value so
+    the final SSTORE is a nonzero-to-nonzero write for gas costing.
+
+    Memory layout: ``[0:32]`` = current slot key.
+    """
+    setup = Op.MSTORE(
+        0,
+        Op.SLOAD(_POINTER_SLOT, key_warm=False),
+        old_memory_size=0,
+        new_memory_size=32,
+    )
+
+    sload_body = Op.MSTORE(
+        0,
+        Op.SLOAD(
+            Op.MLOAD(0),
+            key_warm=False,
+        ),
+        old_memory_size=32,
+        new_memory_size=32,
+    )
+
+    condition = Op.GT(Op.GAS, reserve_gas)
+    loop = While(body=sload_body, condition=condition)
+
+    cleanup = (
+        Op.SSTORE(
+            _POINTER_SLOT,
+            Op.MLOAD(0),
+            key_warm=True,
+            original_value=1,
+            current_value=1,
+            new_value=2,
+        )
+        + Op.STOP
+    )
+
+    return setup + loop + cleanup
+
+
+def _compute_hash_chain(seed: int, length: int) -> list[int]:
+    """
+    Compute a keccak256 hash chain of storage slot keys.
+
+    Return a list of ``length`` slot keys where each key is
+    ``keccak256`` of the previous (starting from ``seed``).
+    """
+    slots = []
+    current = seed
+    for _ in range(length):
+        current = int.from_bytes(
+            keccak256(current.to_bytes(32, "big")),
+            "big",
+        )
+        slots.append(current)
+    return slots
+
+
+def _derive_tx_schedule(
+    gas_benchmark_value: int,
+    min_per_tx_gas: int,
+    tx_gas_limit: int,
+    tx_density: TxDensity,
+) -> list[int]:
+    """
+    Derive a list of per-tx gas limits that fill the gas budget.
+
+    ``GREEDY``: pack as many ``tx_gas_limit``-sized transactions as
+    fit and append a smaller remainder if the leftover gas meets
+    ``min_per_tx_gas``.
+
+    ``HALF``: use 50 % of the maximum possible transaction count and
+    distribute gas equally.
+
+    ``MAX``: maximize the transaction count (each tx near
+    ``min_per_tx_gas``).
+    """
+    if tx_density is TxDensity.GREEDY:
+        num_full = gas_benchmark_value // tx_gas_limit
+        remainder = gas_benchmark_value - num_full * tx_gas_limit
+        schedule = [tx_gas_limit] * num_full
+        if remainder >= min_per_tx_gas:
+            schedule.append(remainder)
+        return schedule
+
+    max_num_txs = gas_benchmark_value // min_per_tx_gas
+    fraction = 0.5 if tx_density is TxDensity.HALF else 1.0
+    num_txs = max(1, int(max_num_txs * fraction))
+    per_tx_gas = max(
+        min_per_tx_gas,
+        min(tx_gas_limit, gas_benchmark_value // num_txs),
+    )
+    return [per_tx_gas] * num_txs
+
+
+TX_DENSITY_PARAMS = [
+    pytest.param(TxDensity.GREEDY, id="greedy_fill"),
+    pytest.param(TxDensity.HALF, id="half_max_txs"),
+    pytest.param(TxDensity.MAX, id="max_txs"),
+]
+
+
+def test_parallel_execution_serial_chain(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+) -> None:
+    """
+    Benchmark a fully serial chain as a baseline for parallel execution.
+
+    All transactions conflict on slot 0 — with a BAL, clients know
+    upfront the block is serial and avoid speculation overhead.
+
+    Deploy a contract that initializes storage slot 0 to 1. Each
+    execution transaction performs a keccak256 hash chain from a
+    literal ``1`` seed (iteration count determined by available gas),
+    then combines the result with slot 0 via
+    ``SSTORE(0, ADD(SLOAD(0), result))``.
+
+    The shared-state access (SLOAD/SSTORE on slot 0) is
+    deliberately placed at the end so speculative parallel
+    execution wastes maximum resources before discovering the
+    conflict.
+    """
+    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+    intrinsic_gas = intrinsic_gas_calculator()
+
+    runtime_code, setup_gas, _, reserve_gas = _build_keccak_chain(fork)
+    min_per_tx_gas = intrinsic_gas + setup_gas + reserve_gas
+
+    tx_gas_schedule = _derive_tx_schedule(
+        gas_benchmark_value, min_per_tx_gas, tx_gas_limit, TxDensity.GREEDY
+    )
+
+    creation_code = Initcode(
+        deploy_code=runtime_code,
+        initcode_prefix=Op.SSTORE(0, 1),
+    )
+
+    blocks = []
+
+    with TestPhaseManager.setup():
+        deployer = pre.fund_eoa()
+        deploy_tx = Transaction(
+            to=None,
+            gas_limit=tx_gas_limit,
+            data=creation_code,
+            sender=deployer,
+        )
+        blocks.append(Block(txs=[deploy_tx]))
+
+    contract_address = compute_create_address(address=deployer, nonce=0)
+
+    with TestPhaseManager.execution():
+        exec_txs = []
+        for gas_limit in tx_gas_schedule:
+            exec_txs.append(
+                Transaction(
+                    to=contract_address,
+                    gas_limit=gas_limit,
+                    sender=pre.fund_eoa(),
+                )
+            )
+        blocks.append(Block(txs=exec_txs))
+
+    benchmark_test(blocks=blocks, skip_gas_used_validation=True)
+
+
+@pytest.mark.parametrize(
+    "contract_per_tx",
+    [
+        pytest.param(False, id="single_contract"),
+        pytest.param(True, id="contract_per_tx"),
+    ],
+)
+@pytest.mark.parametrize("tx_density", TX_DENSITY_PARAMS)
+def test_state_root_computation(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    tx_density: TxDensity,
+    contract_per_tx: bool,
+) -> None:
+    """
+    Benchmark state root computation with disjoint storage writes.
+
+    Deploy contracts with pre-populated storage. Each execution
+    transaction writes to a non-overlapping range of sequential cold
+    storage slots via a gas-check loop, so all transactions are
+    genuinely independent.
+
+    The ``contract_per_tx`` parameter controls whether each
+    transaction targets a unique contract (maximizing account trie
+    width) or all transactions share a single contract (maximizing
+    storage trie depth).
+    """
+    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+    # Worst-case calldata: 32 nonzero bytes for start_slot.
+    intrinsic_gas = intrinsic_gas_calculator(calldata=b"\xff" * 32)
+
+    # Reconstruct body bytecode to extract gas components;
+    # _build_sequential_sstore_code only returns assembled code.
+    setup = Op.MSTORE(
+        0,
+        Op.CALLDATALOAD(0),
+        old_memory_size=0,
+        new_memory_size=32,
+    )
+
+    sstore_body = Op.SSTORE(
+        Op.MLOAD(0),
+        2**256 - 1,
+        key_warm=False,
+        original_value=1,
+        current_value=1,
+        new_value=2**256 - 1,
+    ) + Op.MSTORE(
+        0,
+        Op.SUB(Op.MLOAD(0), 1),
+        old_memory_size=32,
+        new_memory_size=32,
+    )
+
+    setup_gas = setup.gas_cost(fork)
+    per_iter_gas, exit_overhead = _derive_loop_gas(sstore_body, fork)
+    cleanup_gas = Op.STOP.gas_cost(fork)
+    reserve_gas = per_iter_gas + exit_overhead + cleanup_gas
+
+    runtime_code = _build_sequential_sstore_code(reserve_gas)
+    min_per_tx_gas = intrinsic_gas + setup_gas + reserve_gas
+
+    tx_gas_schedule = _derive_tx_schedule(
+        gas_benchmark_value, min_per_tx_gas, tx_gas_limit, tx_density
+    )
+    num_exec_txs = len(tx_gas_schedule)
+
+    available_gas = tx_gas_schedule[0] - intrinsic_gas - setup_gas
+    estimated_slots_per_tx = max(1, available_gas // per_iter_gas)
+
+    num_contracts = num_exec_txs if contract_per_tx else 1
+    txs_per_contract = math.ceil(num_exec_txs / num_contracts)
+    slots_per_contract = (estimated_slots_per_tx + 1) * txs_per_contract
+
+    # Pre-populate storage counting down from near-max uint256.
+    # High slot keys + 32-byte stored values maximize RLP weight
+    # per trie leaf for state root computation.
+    high_start = 2**256 - 1
+    contracts = []
+    for _ in range(num_contracts):
+        storage: Storage.StorageDictType = {
+            high_start - i: 1 for i in range(slots_per_contract)
+        }
+        addr = pre.deploy_contract(
+            code=runtime_code,
+            storage=storage,
+        )
+        contracts.append(addr)
+
+    blocks: list[Block] = []
+    contract_tx_counts = [0] * num_contracts
+
+    with TestPhaseManager.execution():
+        exec_txs = []
+        for tx_idx in range(num_exec_txs):
+            c_idx = tx_idx % num_contracts
+            start_slot = (
+                high_start - contract_tx_counts[c_idx] * estimated_slots_per_tx
+            )
+            contract_tx_counts[c_idx] += 1
+            exec_txs.append(
+                Transaction(
+                    to=contracts[c_idx],
+                    gas_limit=tx_gas_schedule[tx_idx],
+                    data=Hash(start_slot),
+                    sender=pre.fund_eoa(),
+                )
+            )
+        blocks.append(Block(txs=exec_txs))
+
+    benchmark_test(blocks=blocks, skip_gas_used_validation=True)
+
+
+def test_prefetch_cold_storage(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+) -> None:
+    """
+    Benchmark cold storage prefetching via an SLOAD linked-list chain.
+
+    Deploy a contract with pre-populated linked-list storage where
+    each slot's value is the next key.  Each execution transaction
+    performs back-to-back cold SLOADs with minimal compute between reads
+    — a worst-case prefetch scenario.
+
+    Keys are unpredictable without reading storage, so clients can
+    only prefetch via the BAL.
+
+    A shared pointer slot (``_POINTER_SLOT``) serializes
+    transactions: each tx reads its seed from the pointer and writes
+    back the final key, preventing parallel execution without a BAL.
+
+    The BAL makes all accessed slots prefetchable: the data slots
+    appear in ``storage_reads`` (SLOADs not also written per
+    EIP-7928), while ``_POINTER_SLOT`` appears in
+    ``storage_changes`` (both read and written).
+    """
+    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+    intrinsic_gas = intrinsic_gas_calculator()
+
+    # Reconstruct body bytecode to extract gas components;
+    # _build_sload_chain_code only returns assembled code.
+    setup = Op.MSTORE(
+        0,
+        Op.SLOAD(_POINTER_SLOT, key_warm=False),
+        old_memory_size=0,
+        new_memory_size=32,
+    )
+
+    body = Op.MSTORE(
+        0,
+        Op.SLOAD(
+            Op.MLOAD(0),
+            key_warm=False,
+        ),
+        old_memory_size=32,
+        new_memory_size=32,
+    )
+
+    cleanup = (
+        Op.SSTORE(
+            _POINTER_SLOT,
+            Op.MLOAD(0),
+            key_warm=True,
+            original_value=1,
+            current_value=1,
+            new_value=2,
+        )
+        + Op.STOP
+    )
+
+    setup_gas = setup.gas_cost(fork)
+    cleanup_gas = cleanup.gas_cost(fork)
+    per_iter_gas, exit_overhead = _derive_loop_gas(body, fork)
+    reserve_gas = per_iter_gas + exit_overhead + cleanup_gas
+
+    runtime_code = _build_sload_chain_code(reserve_gas)
+
+    min_per_tx_gas = intrinsic_gas + setup_gas + reserve_gas
+
+    tx_gas_schedule = _derive_tx_schedule(
+        gas_benchmark_value, min_per_tx_gas, tx_gas_limit, TxDensity.GREEDY
+    )
+    num_exec_txs = len(tx_gas_schedule)
+
+    available_gas = tx_gas_schedule[0] - intrinsic_gas - setup_gas
+    estimated_slots_per_tx = max(1, available_gas // per_iter_gas)
+
+    # All txs share a single contract with disjoint slot ranges.
+    total_slots = (estimated_slots_per_tx + 1) * num_exec_txs
+
+    # Build linked-list storage: each tx continues where the
+    # previous left off via the shared pointer slot.
+    chain = _compute_hash_chain(1, total_slots)
+    storage = Storage()
+    storage[1] = chain[0]
+    for i in range(len(chain) - 1):
+        storage[chain[i]] = chain[i + 1]
+    storage[chain[-1]] = chain[-1]
+
+    # Nonzero initial value keeps the cleanup SSTORE a
+    # nonzero -> nonzero write (cheaper than 0 -> nonzero).
+    storage[_POINTER_SLOT] = 1
+
+    contract = pre.deploy_contract(
+        code=runtime_code,
+        storage=storage,
+    )
+
+    blocks: list[Block] = []
+
+    with TestPhaseManager.execution():
+        exec_txs = []
+        for gas_limit in tx_gas_schedule:
+            exec_txs.append(
+                Transaction(
+                    to=contract,
+                    gas_limit=gas_limit,
+                    sender=pre.fund_eoa(),
+                )
+            )
+        blocks.append(Block(txs=exec_txs))
+
+    benchmark_test(blocks=blocks, skip_gas_used_validation=True)
+
+
+@pytest.mark.parametrize(
+    "pair_independence",
+    [
+        pytest.param(True, id="independent_pairs"),
+        pytest.param(False, id="single_contract"),
+    ],
+)
+@pytest.mark.parametrize("tx_density", TX_DENSITY_PARAMS)
+def test_deploy_then_interact(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    tx_density: TxDensity,
+    pair_independence: bool,
+) -> None:
+    """
+    Benchmark structural cross-tx code dependencies.
+
+    Transactions include deploy and call operations within a single
+    block.  Without a BAL, clients must discover that calls depend on
+    deploys through speculative execution or re-execution.  With a BAL
+    the dependency is explicit.
+
+    With ``pair_independence=True`` each pair deploys and calls its own
+    contract — pairs are independent and parallelizable.  With
+    ``pair_independence=False`` a single contract is deployed first and
+    all subsequent txs call it, creating a fully serial dependency
+    chain (deploy + shared slot 0).
+    """
+    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+    intrinsic_gas = intrinsic_gas_calculator()
+
+    runtime_code, setup_gas, _, reserve_gas = _build_keccak_chain(fork)
+
+    creation_code = Initcode(
+        deploy_code=runtime_code,
+        initcode_prefix=Op.SSTORE(0, 1),
+    )
+
+    intrinsic_gas_create = intrinsic_gas_calculator(
+        calldata=bytes(creation_code),
+        contract_creation=True,
+    )
+
+    initcode_sstore = Op.SSTORE(
+        0,
+        1,
+        key_warm=False,
+        original_value=0,
+        current_value=0,
+        new_value=1,
+    )
+    initcode_exec_gas = initcode_sstore.gas_cost(fork)
+    code_deposit_gas = 200 * len(runtime_code)
+
+    # Buffer for Initcode wrapper overhead (CODECOPY + RETURN + memory).
+    deploy_gas_limit = (
+        intrinsic_gas_create + initcode_exec_gas + code_deposit_gas + 10000
+    )
+
+    min_call_gas = intrinsic_gas + setup_gas + reserve_gas
+
+    fraction = {
+        TxDensity.GREEDY: None,
+        TxDensity.HALF: 0.5,
+        TxDensity.MAX: 1.0,
+    }[tx_density]
+
+    if pair_independence:
+        # N pairs: [deploy_0, call_0, deploy_1, call_1, ...]
+        if fraction is None:
+            per_pair_gas = deploy_gas_limit + tx_gas_limit
+            num_pairs = max(1, gas_benchmark_value // per_pair_gas)
+            remainder = gas_benchmark_value - num_pairs * per_pair_gas
+            if remainder >= deploy_gas_limit + min_call_gas:
+                num_pairs += 1
+        else:
+            min_per_pair = deploy_gas_limit + min_call_gas
+            max_pairs = gas_benchmark_value // min_per_pair
+            num_pairs = max(1, int(max_pairs * fraction))
+        per_pair_gas = gas_benchmark_value // num_pairs
+        call_gas_limit = min(tx_gas_limit, per_pair_gas - deploy_gas_limit)
+        num_call_txs = num_pairs
+    else:
+        # 1 deploy + N calls: [deploy_0, call_0, call_1, ...]
+        call_budget = gas_benchmark_value - deploy_gas_limit
+        if fraction is None:
+            num_call_txs = call_budget // tx_gas_limit
+            remainder = call_budget - num_call_txs * tx_gas_limit
+            if remainder >= min_call_gas:
+                num_call_txs += 1
+        else:
+            max_calls = call_budget // min_call_gas
+            num_call_txs = max(1, int(max_calls * fraction))
+        call_gas_limit = min(tx_gas_limit, call_budget // num_call_txs)
+        num_pairs = 1
+
+    blocks: list[Block] = []
+
+    with TestPhaseManager.execution():
+        exec_txs: list[Transaction] = []
+
+        if pair_independence:
+            for _ in range(num_pairs):
+                deployer = pre.fund_eoa()
+                exec_txs.append(
+                    Transaction(
+                        to=None,
+                        gas_limit=deploy_gas_limit,
+                        data=creation_code,
+                        sender=deployer,
+                    )
+                )
+                contract = compute_create_address(address=deployer, nonce=0)
+                exec_txs.append(
+                    Transaction(
+                        to=contract,
+                        gas_limit=call_gas_limit,
+                        sender=pre.fund_eoa(),
+                    )
+                )
+        else:
+            # Single deploy followed by serial calls.
+            deployer = pre.fund_eoa()
+            exec_txs.append(
+                Transaction(
+                    to=None,
+                    gas_limit=deploy_gas_limit,
+                    data=creation_code,
+                    sender=deployer,
+                )
+            )
+            contract = compute_create_address(address=deployer, nonce=0)
+            for _ in range(num_call_txs):
+                exec_txs.append(
+                    Transaction(
+                        to=contract,
+                        gas_limit=call_gas_limit,
+                        sender=pre.fund_eoa(),
+                    )
+                )
+
+        blocks.append(Block(txs=exec_txs))
+
+    benchmark_test(blocks=blocks, skip_gas_used_validation=True)
+
+
+@pytest.mark.parametrize(
+    "group_size",
+    [
+        pytest.param(1, id="group_size_1"),
+        pytest.param(2, id="group_size_2"),
+        pytest.param(5, id="group_size_5"),
+    ],
+)
+@pytest.mark.parametrize("tx_density", TX_DENSITY_PARAMS)
+def test_mixed_dependency_graph(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    tx_density: TxDensity,
+    group_size: int,
+) -> None:
+    """
+    Benchmark partial-order parallel scheduling.
+
+    K independent groups each form an internally serial keccak chain
+    (shared slot 0).  Groups are **interleaved** in the block::
+
+        [g0_tx0, g1_tx0, g2_tx0, g0_tx1, g1_tx1, g2_tx1, ...]
+
+    This prevents position-based heuristics from discovering parallelism
+    without analyzing state dependencies.
+
+    ``group_size=1`` is fully parallel (degenerate baseline).
+    ``group_size=5`` creates long serial chains with limited parallelism.
+    """
+    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+    intrinsic_gas = intrinsic_gas_calculator()
+
+    runtime_code, setup_gas, _, reserve_gas = _build_keccak_chain(fork)
+    min_per_tx_gas = intrinsic_gas + setup_gas + reserve_gas
+
+    tx_gas_schedule = _derive_tx_schedule(
+        gas_benchmark_value, min_per_tx_gas, tx_gas_limit, tx_density
+    )
+
+    # Round down to complete groups; skip if the gas budget cannot
+    # fill even one complete group.
+    total_txs = len(tx_gas_schedule)
+    num_groups = total_txs // group_size
+    if num_groups == 0:
+        pytest.skip(
+            f"Gas budget too low for group_size={group_size} "
+            f"(only {total_txs} txs fit)"
+        )
+    num_exec_txs = num_groups * group_size
+    tx_gas_schedule = tx_gas_schedule[:num_exec_txs]
+
+    creation_code = Initcode(
+        deploy_code=runtime_code,
+        initcode_prefix=Op.SSTORE(0, 1),
+    )
+
+    blocks = []
+
+    with TestPhaseManager.setup():
+        deploy_txs = []
+        deployers = []
+        for _ in range(num_groups):
+            deployer = pre.fund_eoa()
+            deployers.append(deployer)
+            deploy_txs.append(
+                Transaction(
+                    to=None,
+                    gas_limit=tx_gas_limit,
+                    data=creation_code,
+                    sender=deployer,
+                )
+            )
+        blocks.append(Block(txs=deploy_txs))
+
+    group_contracts = [
+        compute_create_address(address=d, nonce=0) for d in deployers
+    ]
+
+    # Interleaved round-robin: txs from different groups alternate.
+    with TestPhaseManager.execution():
+        exec_txs = []
+        tx_idx = 0
+        for _round_idx in range(group_size):
+            for group_idx in range(num_groups):
+                exec_txs.append(
+                    Transaction(
+                        to=group_contracts[group_idx],
+                        gas_limit=tx_gas_schedule[tx_idx],
+                        sender=pre.fund_eoa(),
+                    )
+                )
+                tx_idx += 1
+        blocks.append(Block(txs=exec_txs))
+
+    benchmark_test(blocks=blocks, skip_gas_used_validation=True)
diff --git a/tests/benchmark/compute/helpers.py b/tests/benchmark/compute/helpers.py
index 13be98d788d..a05203445a9 100644
--- a/tests/benchmark/compute/helpers.py
+++ b/tests/benchmark/compute/helpers.py
@@ -16,6 +16,7 @@
     Initcode,
     IteratingBytecode,
     Op,
+    OpcodeTarget,
     TransactionWithCost,
     While,
     compute_create2_address,
@@ -27,6 +28,30 @@
     FieldElement,
 )
 
+
+class Precompile:
+    """Target opcode labels for precompile benchmarks."""
+
+    ECRECOVER = OpcodeTarget("ECRECOVER", Op.STATICCALL)
+    SHA256 = OpcodeTarget("SHA2-256", Op.STATICCALL)
+    RIPEMD160 = OpcodeTarget("RIPEMD-160", Op.STATICCALL)
+    IDENTITY = OpcodeTarget("IDENTITY", Op.STATICCALL)
+    MODEXP = OpcodeTarget("MODEXP", Op.STATICCALL)
+    BN128_ADD = OpcodeTarget("BN128_ADD", Op.STATICCALL)
+    BN128_MUL = OpcodeTarget("BN128_MUL", Op.STATICCALL)
+    BN128_PAIRING = OpcodeTarget("BN128_PAIRING", Op.STATICCALL)
+    BLAKE2F = OpcodeTarget("BLAKE2F", Op.STATICCALL)
+    POINT_EVALUATION = OpcodeTarget("POINT_EVALUATION", Op.STATICCALL)
+    P256VERIFY = OpcodeTarget("P256VERIFY", Op.STATICCALL)
+    BLS12_G1ADD = OpcodeTarget("BLS12_G1ADD", Op.STATICCALL)
+    BLS12_G1MSM = OpcodeTarget("BLS12_G1MSM", Op.STATICCALL)
+    BLS12_G2ADD = OpcodeTarget("BLS12_G2ADD", Op.STATICCALL)
+    BLS12_G2MSM = OpcodeTarget("BLS12_G2MSM", Op.STATICCALL)
+    BLS12_PAIRING = OpcodeTarget("BLS12_PAIRING", Op.STATICCALL)
+    BLS12_MAP_FP_TO_G1 = OpcodeTarget("BLS12_MAP_FP_TO_G1", Op.STATICCALL)
+    BLS12_MAP_FP2_TO_G2 = OpcodeTarget("BLS12_MAP_FP2_TO_G2", Op.STATICCALL)
+
+
 DEFAULT_BINOP_ARGS = (
     0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F,
     0x73EDA753299D7D483339D80809A1D80553BDA402FFFE5BFEFFFFFFFF00000001,
diff --git a/tests/benchmark/compute/instruction/test_account_query.py b/tests/benchmark/compute/instruction/test_account_query.py
index cdac229dbb7..43e7614065c 100644
--- a/tests/benchmark/compute/instruction/test_account_query.py
+++ b/tests/benchmark/compute/instruction/test_account_query.py
@@ -13,7 +13,6 @@
 """
 
 import math
-from typing import Any
 
 import pytest
 from execution_testing import (
@@ -153,90 +152,6 @@ def test_extcodecopy_warm(
     )
 
 
-@pytest.mark.repricing(
-    empty_code=True,
-    initial_balance=True,
-    initial_storage=True,
-)
-@pytest.mark.parametrize(
-    "opcode",
-    [
-        Op.BALANCE,
-        Op.EXTCODESIZE,
-        Op.EXTCODEHASH,
-        Op.CALL,
-        Op.CALLCODE,
-        Op.DELEGATECALL,
-        Op.STATICCALL,
-    ],
-)
-@pytest.mark.parametrize(
-    "empty_code",
-    [
-        True,
-        False,
-    ],
-)
-@pytest.mark.parametrize(
-    "initial_balance",
-    [
-        True,
-        False,
-    ],
-)
-@pytest.mark.parametrize(
-    "initial_storage",
-    [
-        True,
-        False,
-    ],
-)
-def test_ext_account_query_warm(
-    benchmark_test: BenchmarkTestFiller,
-    pre: Alloc,
-    opcode: Op,
-    empty_code: bool,
-    initial_balance: bool,
-    initial_storage: bool,
-) -> None:
-    """
-    Test running a block with as many stateful opcodes doing warm access
-    for an account.
-    """
-    # Setup
-    post = {}
-
-    # Case 1: Completely empty account (no balance, no storage, no code)
-    if not initial_balance and not initial_storage and empty_code:
-        target_addr = pre.nonexistent_account()
-    # Case 2: EOA with optional balance and storage
-    elif empty_code:
-        eoa_kwargs: dict[str, Any] = {}
-        if initial_balance:
-            eoa_kwargs["amount"] = 100
-        if initial_storage:
-            eoa_kwargs["storage"] = {0: 0x1337}
-        target_addr = pre.fund_eoa(**eoa_kwargs)
-    # Case 3: Contract with optional balance and storage
-    else:
-        contract_kwargs: dict[str, Any] = {"code": Op.STOP + Op.JUMPDEST * 100}
-        if initial_balance:
-            contract_kwargs["balance"] = 100
-        if initial_storage:
-            contract_kwargs["storage"] = {0: 0x1337}
-        target_addr = pre.deploy_contract(**contract_kwargs)
-        post[target_addr] = Account(**contract_kwargs)
-
-    benchmark_test(
-        target_opcode=opcode,
-        post=post,
-        code_generator=JumpLoopGenerator(
-            setup=Op.MSTORE(0, target_addr),
-            attack_block=Op.POP(opcode(address=Op.MLOAD(0))),
-        ),
-    )
-
-
 @pytest.mark.repricing(absent_accounts=True)
 @pytest.mark.parametrize(
     "opcode",
@@ -265,7 +180,10 @@ def test_ext_account_query_cold(
     Benchmark stateful opcodes accessing cold accounts.
     """
     if fixed_opcode_count:
-        pytest.skip("Fixed opcode count is not supported for this test")
+        pytest.skip(
+            "Cold-account queries need one unique account per opcode, "
+            "so the iteration count is gas-driven, not fixed"
+        )
 
     attack_gas_limit = gas_benchmark_value
 
diff --git a/tests/benchmark/compute/instruction/test_arithmetic.py b/tests/benchmark/compute/instruction/test_arithmetic.py
index f980107b882..937c3618215 100644
--- a/tests/benchmark/compute/instruction/test_arithmetic.py
+++ b/tests/benchmark/compute/instruction/test_arithmetic.py
@@ -214,7 +214,10 @@ def test_mod(
     # sign bits.
     # The result stays negative.
     if fixed_opcode_count is not None:
-        pytest.skip("fixed-opcode-count not supported in test_mode")
+        pytest.skip(
+            "test_mod uses a data-dependent chain length, "
+            "incompatible with --fixed-opcode-count"
+        )
     should_negate = opcode == Op.SMOD
 
     num_numerators = 15
@@ -299,6 +302,7 @@ def test_mod(
 
     input_value = initial_mod if not should_negate else neg(initial_mod)
     benchmark_test(
+        target_opcode=opcode,
         code_generator=JumpLoopGenerator(
             setup=setup,
             attack_block=attack_block,
@@ -437,6 +441,7 @@ def test_exp_bench_arithmetic(
     attack_block = Op.DUP2 + Op.EXP
     cleanup = Op.POP + Op.POP + Op.DUP2 + Op.DUP2
     benchmark_test(
+        target_opcode=Op.EXP,
         code_generator=JumpLoopGenerator(
             setup=setup,
             attack_block=attack_block,
diff --git a/tests/benchmark/compute/instruction/test_block_context.py b/tests/benchmark/compute/instruction/test_block_context.py
index c2a1e6cbbc3..d31dba05c0a 100644
--- a/tests/benchmark/compute/instruction/test_block_context.py
+++ b/tests/benchmark/compute/instruction/test_block_context.py
@@ -48,7 +48,6 @@ def test_block_context_ops(
     )
 
 
-@pytest.mark.skip(reason="Temporarily disabled pending investigation")
 @pytest.mark.repricing
 @pytest.mark.parametrize(
     "index,chain_length",
diff --git a/tests/benchmark/compute/instruction/test_call_context.py b/tests/benchmark/compute/instruction/test_call_context.py
index 584c5e21c67..bda9ae6c5ee 100644
--- a/tests/benchmark/compute/instruction/test_call_context.py
+++ b/tests/benchmark/compute/instruction/test_call_context.py
@@ -203,16 +203,14 @@ def test_calldatacopy_from_origin(
     ],
 )
 @pytest.mark.parametrize(
-    "non_zero_data",
+    "calldata_size,non_zero_data",
     [
-        True,
-        False,
+        (size, nzd)
+        for size in [0, 32, 256, 1024]
+        for nzd in [True, False]
+        if not (size == 0 and nzd)
     ],
 )
-@pytest.mark.parametrize(
-    "calldata_size",
-    [0, 32, 256, 1024],
-)
 def test_calldatacopy_from_call(
     benchmark_test: BenchmarkTestFiller,
     fork: Fork,
@@ -222,12 +220,8 @@ def test_calldatacopy_from_call(
     tx_gas_limit: int,
 ) -> None:
     """Benchmark CALLDATACOPY instruction."""
-    if calldata_size == 0 and non_zero_data:
-        pytest.skip("Non-zero data with size 0 is not applicable.")
-
     # If `non_zero_data` is True, we fill the calldata with deterministic
-    # random data. Note that if `size == 0` and `non_zero_data` is a skipped
-    # case.
+    # random data.
     data = (
         Bytes([i % 256 for i in range(calldata_size)])
         if non_zero_data
@@ -238,8 +232,8 @@ def test_calldatacopy_from_call(
     min_gas = intrinsic_gas_calculator(calldata=data)
     if min_gas > tx_gas_limit:
         pytest.skip(
-            "Minimum gas required for calldata ({min_gas}) is greater "
-            "than the gas limit"
+            f"Intrinsic gas for calldata ({min_gas}) exceeds "
+            f"tx gas limit ({tx_gas_limit})"
         )
 
     # We create the contract that will be doing the CALLDATACOPY multiple
diff --git a/tests/benchmark/compute/instruction/test_storage.py b/tests/benchmark/compute/instruction/test_storage.py
index c99608475ab..bb2814a9252 100644
--- a/tests/benchmark/compute/instruction/test_storage.py
+++ b/tests/benchmark/compute/instruction/test_storage.py
@@ -373,7 +373,6 @@ def calldata_generator(
     )
 
 
-@pytest.mark.repricing
 @pytest.mark.parametrize(
     "storage_action",
     [
@@ -480,7 +479,6 @@ def test_storage_access_warm(
     benchmark_test(blocks=blocks)
 
 
-@pytest.mark.repricing
 @pytest.mark.parametrize(
     "storage_action",
     [
diff --git a/tests/benchmark/compute/instruction/test_system.py b/tests/benchmark/compute/instruction/test_system.py
index 4f9161ae213..551a1e242d0 100644
--- a/tests/benchmark/compute/instruction/test_system.py
+++ b/tests/benchmark/compute/instruction/test_system.py
@@ -73,7 +73,7 @@ def loop(threshold: int) -> Bytecode:
 
     intrinsic_cost_calc = fork.transaction_intrinsic_cost_calculator()
     intrinsic_cost = intrinsic_cost_calc()
-    access_list_addr_cost = fork.gas_costs().GAS_TX_ACCESS_LIST_ADDRESS
+    access_list_addr_cost = fork.gas_costs().TX_ACCESS_LIST_ADDRESS
 
     txs = []
     remaining_gas = gas_benchmark_value
diff --git a/tests/benchmark/compute/precompile/test_alt_bn128.py b/tests/benchmark/compute/precompile/test_alt_bn128.py
index c780788c2d3..9d2943b2e7f 100644
--- a/tests/benchmark/compute/precompile/test_alt_bn128.py
+++ b/tests/benchmark/compute/precompile/test_alt_bn128.py
@@ -1,360 +1,471 @@
 """Benchmark ALT_BN128 precompile."""
 
+import math
 import random
 
 import pytest
 from execution_testing import (
     Address,
+    Alloc,
     BenchmarkTestFiller,
+    Block,
     Bytes,
     Fork,
     JumpLoopGenerator,
     Op,
+    OpcodeTarget,
+    Transaction,
+    While,
+    WhileGas,
 )
 from py_ecc.bn128 import G1, G2, multiply
+from py_ecc.fields import bn128_FQ2
 
-from ..helpers import concatenate_parameters
+from tests.benchmark.compute.helpers import Precompile
+from tests.byzantium.eip196_ec_add_mul.spec import (
+    PointG1,
+    Scalar,
+)
+from tests.byzantium.eip196_ec_add_mul.spec import (
+    Spec as EIP196Spec,
+)
+from tests.byzantium.eip197_ec_pairing.spec import (
+    PointG2,
+)
+from tests.byzantium.eip197_ec_pairing.spec import (
+    Spec as EIP197Spec,
+)
 
 
 @pytest.mark.parametrize(
-    "precompile_address,calldata",
+    "precompile_address,calldata,target",
     [
         pytest.param(
-            0x06,
-            concatenate_parameters(
-                [
-                    "18B18ACFB4C2C30276DB5411368E7185B311DD124691610C5D3B74034E093DC9",
-                    "063C909C4720840CB5134CB9F59FA749755796819658D32EFC0D288198F37266",
-                    "07C2B7F58A84BD6145F00C9C2BC0BB1A187F20FF2C92963A88019E7C6A014EED",
-                    "06614E20C147E940F2D70DA3F74C9A17DF361706A4485C742BD6788478FA17D7",
-                ]
+            EIP196Spec.ECADD,
+            PointG1(
+                x=0x18B18ACFB4C2C30276DB5411368E7185B311DD124691610C5D3B74034E093DC9,
+                y=0x063C909C4720840CB5134CB9F59FA749755796819658D32EFC0D288198F37266,
+            )
+            + PointG1(
+                x=0x07C2B7F58A84BD6145F00C9C2BC0BB1A187F20FF2C92963A88019E7C6A014EED,
+                y=0x06614E20C147E940F2D70DA3F74C9A17DF361706A4485C742BD6788478FA17D7,
             ),
+            Precompile.BN128_ADD,
             id="bn128_add",
             marks=pytest.mark.repricing,
         ),
+        pytest.param(
+            EIP196Spec.ECADD,
+            PointG1(
+                x=0x18B18ACFB4C2C30276DB5411368E7185B311DD124691610C5D3B74034E093DC9,
+                y=0x063C909C4720840CB5134CB9F59FA749755796819658D32EFC0D288198F37266,
+            )
+            + PointG1(
+                x=0x18B18ACFB4C2C30276DB5411368E7185B311DD124691610C5D3B74034E093DC9,
+                y=0x063C909C4720840CB5134CB9F59FA749755796819658D32EFC0D288198F37266,
+            ),
+            Precompile.BN128_ADD,
+            id="bn128_double",
+            marks=pytest.mark.repricing,
+        ),
+        # Second point is the negative of the first one
+        pytest.param(
+            EIP196Spec.ECADD,
+            PointG1(
+                x=0x18B18ACFB4C2C30276DB5411368E7185B311DD124691610C5D3B74034E093DC9,
+                y=0x063C909C4720840CB5134CB9F59FA749755796819658D32EFC0D288198F37266,
+            )
+            + PointG1(
+                x=0x18B18ACFB4C2C30276DB5411368E7185B311DD124691610C5D3B74034E093DC9,
+                y=0x2A27BDD69A111C1D033CF8FC8BE1B1142229D40FD218F75E401363953F898AE1,
+            ),
+            Precompile.BN128_ADD,
+            id="bn128_add_negative",
+            marks=pytest.mark.repricing,
+        ),
         # Ported from
         # https://github.com/NethermindEth/nethermind/blob/ceb8d57b8530ce8181d7427c115ca593386909d6/tools/EngineRequestsGenerator/TestCase.cs#L326
         pytest.param(
-            0x06,
-            concatenate_parameters(
-                [
-                    "0000000000000000000000000000000000000000000000000000000000000000",
-                    "0000000000000000000000000000000000000000000000000000000000000000",
-                    "0000000000000000000000000000000000000000000000000000000000000000",
-                    "0000000000000000000000000000000000000000000000000000000000000000",
-                ]
-            ),
+            EIP196Spec.ECADD,
+            EIP196Spec.INF_G1 + EIP196Spec.INF_G1,
+            Precompile.BN128_ADD,
             id="bn128_add_infinities",
             marks=pytest.mark.repricing,
         ),
         # Ported from
         # https://github.com/NethermindEth/nethermind/blob/ceb8d57b8530ce8181d7427c115ca593386909d6/tools/EngineRequestsGenerator/TestCase.cs#L329
         pytest.param(
-            0x06,
-            concatenate_parameters(
-                [
-                    "0000000000000000000000000000000000000000000000000000000000000001",
-                    "0000000000000000000000000000000000000000000000000000000000000002",
-                    "0000000000000000000000000000000000000000000000000000000000000001",
-                    "0000000000000000000000000000000000000000000000000000000000000002",
-                ]
-            ),
+            EIP196Spec.ECADD,
+            EIP196Spec.G1 + EIP196Spec.G1,
+            Precompile.BN128_ADD,
             id="bn128_add_1_2",
         ),
         pytest.param(
-            0x07,
-            concatenate_parameters(
-                [
-                    "1A87B0584CE92F4593D161480614F2989035225609F08058CCFA3D0F940FEBE3",
-                    "1A2F3C951F6DADCC7EE9007DFF81504B0FCD6D7CF59996EFDC33D92BF7F9F8F6",
-                    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
-                ]
+            EIP196Spec.ECMUL,
+            PointG1(
+                x=0x1A87B0584CE92F4593D161480614F2989035225609F08058CCFA3D0F940FEBE3,
+                y=0x1A2F3C951F6DADCC7EE9007DFF81504B0FCD6D7CF59996EFDC33D92BF7F9F8F6,
+            )
+            + Scalar(
+                x=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
             ),
+            Precompile.BN128_MUL,
             id="bn128_mul",
         ),
         # Ported from
         # https://github.com/NethermindEth/nethermind/blob/ceb8d57b8530ce8181d7427c115ca593386909d6/tools/EngineRequestsGenerator/TestCase.cs#L335
         pytest.param(
-            0x07,
-            concatenate_parameters(
-                [
-                    "0000000000000000000000000000000000000000000000000000000000000000",
-                    "0000000000000000000000000000000000000000000000000000000000000000",
-                    "0000000000000000000000000000000000000000000000000000000000000002",
-                ]
-            ),
+            EIP196Spec.ECMUL,
+            EIP196Spec.INF_G1 + Scalar(x=2),
+            Precompile.BN128_MUL,
             id="bn128_mul_infinities_2_scalar",
         ),
         # Ported from
         # https://github.com/NethermindEth/nethermind/blob/ceb8d57b8530ce8181d7427c115ca593386909d6/tools/EngineRequestsGenerator/TestCase.cs#L338
         pytest.param(
-            0x07,
-            concatenate_parameters(
-                [
-                    "0000000000000000000000000000000000000000000000000000000000000000",
-                    "0000000000000000000000000000000000000000000000000000000000000000",
-                    "25f8c89ea3437f44f8fc8b6bfbb6312074dc6f983809a5e809ff4e1d076dd585",
-                ]
+            EIP196Spec.ECMUL,
+            EIP196Spec.INF_G1
+            + Scalar(
+                x=0x25F8C89EA3437F44F8FC8B6BFBB6312074DC6F983809A5E809FF4E1D076DD585
             ),
+            Precompile.BN128_MUL,
             id="bn128_mul_infinities_32_byte_scalar",
             marks=pytest.mark.repricing,
         ),
         # Ported from
         # https://github.com/NethermindEth/nethermind/blob/ceb8d57b8530ce8181d7427c115ca593386909d6/tools/EngineRequestsGenerator/TestCase.cs#L341
         pytest.param(
-            0x07,
-            concatenate_parameters(
-                [
-                    "0000000000000000000000000000000000000000000000000000000000000001",
-                    "0000000000000000000000000000000000000000000000000000000000000002",
-                    "0000000000000000000000000000000000000000000000000000000000000002",
-                ]
-            ),
+            EIP196Spec.ECMUL,
+            EIP196Spec.G1 + Scalar(x=2),
+            Precompile.BN128_MUL,
             id="bn128_mul_1_2_2_scalar",
         ),
         # Ported from
         # https://github.com/NethermindEth/nethermind/blob/ceb8d57b8530ce8181d7427c115ca593386909d6/tools/EngineRequestsGenerator/TestCase.cs#L344
         pytest.param(
-            0x07,
-            concatenate_parameters(
-                [
-                    "0000000000000000000000000000000000000000000000000000000000000001",
-                    "0000000000000000000000000000000000000000000000000000000000000002",
-                    "25f8c89ea3437f44f8fc8b6bfbb6312074dc6f983809a5e809ff4e1d076dd585",
-                ]
+            EIP196Spec.ECMUL,
+            EIP196Spec.G1
+            + Scalar(
+                x=0x25F8C89EA3437F44F8FC8B6BFBB6312074DC6F983809A5E809FF4E1D076DD585
             ),
+            Precompile.BN128_MUL,
             id="bn128_mul_1_2_32_byte_scalar",
         ),
         # Ported from
         # https://github.com/NethermindEth/nethermind/blob/ceb8d57b8530ce8181d7427c115ca593386909d6/tools/EngineRequestsGenerator/TestCase.cs#L347
         pytest.param(
-            0x07,
-            concatenate_parameters(
-                [
-                    "089142debb13c461f61523586a60732d8b69c5b38a3380a74da7b2961d867dbf",
-                    "2d5fc7bbc013c16d7945f190b232eacc25da675c0eb093fe6b9f1b4b4e107b36",
-                    "0000000000000000000000000000000000000000000000000000000000000002",
-                ]
-            ),
+            EIP196Spec.ECMUL,
+            PointG1(
+                x=0x089142DEBB13C461F61523586A60732D8B69C5B38A3380A74DA7B2961D867DBF,
+                y=0x2D5FC7BBC013C16D7945F190B232EACC25DA675C0EB093FE6B9F1B4B4E107B36,
+            )
+            + Scalar(x=2),
+            Precompile.BN128_MUL,
             id="bn128_mul_32_byte_coord_and_2_scalar",
             marks=pytest.mark.repricing,
         ),
         # Ported from
         # https://github.com/NethermindEth/nethermind/blob/ceb8d57b8530ce8181d7427c115ca593386909d6/tools/EngineRequestsGenerator/TestCase.cs#L350
         pytest.param(
-            0x07,
-            concatenate_parameters(
-                [
-                    "089142debb13c461f61523586a60732d8b69c5b38a3380a74da7b2961d867dbf",
-                    "2d5fc7bbc013c16d7945f190b232eacc25da675c0eb093fe6b9f1b4b4e107b36",
-                    "25f8c89ea3437f44f8fc8b6bfbb6312074dc6f983809a5e809ff4e1d076dd585",
-                ]
+            EIP196Spec.ECMUL,
+            PointG1(
+                x=0x089142DEBB13C461F61523586A60732D8B69C5B38A3380A74DA7B2961D867DBF,
+                y=0x2D5FC7BBC013C16D7945F190B232EACC25DA675C0EB093FE6B9F1B4B4E107B36,
+            )
+            + Scalar(
+                x=0x25F8C89EA3437F44F8FC8B6BFBB6312074DC6F983809A5E809FF4E1D076DD585
             ),
+            Precompile.BN128_MUL,
             id="bn128_mul_32_byte_coord_and_scalar",
             marks=pytest.mark.repricing,
         ),
         pytest.param(
-            0x08,
-            concatenate_parameters(
-                [
-                    # First pairing
-                    "1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59",
-                    "3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41",
-                    "209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7",
-                    "04BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678",
-                    "2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D",
-                    "120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550",
-                    # Second pairing
-                    "111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C",
-                    "103188585E2364128FE25C70558F1560F4F9350BAF3959E603CC91486E110936",
-                    "198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2",
-                    "1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED",
-                    "090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B",
-                    "12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA",
-                ]
-            ),
+            EIP197Spec.ECPAIRING,
+            # First pairing
+            PointG1(
+                x=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,
+                y=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,
+            )
+            + PointG2(
+                x=(
+                    0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,
+                    0x04BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,
+                ),
+                y=(
+                    0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,
+                    0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,
+                ),
+            )
+            # Second pairing
+            + PointG1(
+                x=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,
+                y=0x103188585E2364128FE25C70558F1560F4F9350BAF3959E603CC91486E110936,
+            )
+            + EIP197Spec.G2,
+            Precompile.BN128_PAIRING,
             id="bn128_two_pairings",
         ),
         pytest.param(
-            0x08,
-            concatenate_parameters(
-                [
-                    # First pairing
-                    "1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59",
-                    "3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41",
-                    "209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7",
-                    "04BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678",
-                    "2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D",
-                    "120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550",
-                ]
+            EIP197Spec.ECPAIRING,
+            PointG1(
+                x=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,
+                y=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,
+            )
+            + PointG2(
+                x=(
+                    0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,
+                    0x04BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,
+                ),
+                y=(
+                    0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,
+                    0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,
+                ),
             ),
+            Precompile.BN128_PAIRING,
             id="bn128_one_pairing",
         ),
         # Ported from
         # https://github.com/NethermindEth/nethermind/blob/ceb8d57b8530ce8181d7427c115ca593386909d6/tools/EngineRequestsGenerator/TestCase.cs#L353
-        pytest.param(0x08, [], id="ec_pairing_zero_input"),
         pytest.param(
-            0x08,
-            concatenate_parameters(
-                [
-                    # First pairing
-                    "2cf44499d5d27bb186308b7af7af02ac5bc9eeb6a3d147c186b21fb1b76e18da",
-                    "2c0f001f52110ccfe69108924926e45f0b0c868df0e7bde1fe16d3242dc715f6",
-                    "1fb19bb476f6b9e44e2a32234da8212f61cd63919354bc06aef31e3cfaff3ebc",
-                    "22606845ff186793914e03e21df544c34ffe2f2f3504de8a79d9159eca2d98d9",
-                    "2bd368e28381e8eccb5fa81fc26cf3f048eea9abfdd85d7ed3ab3698d63e4f90",
-                    "2fe02e47887507adf0ff1743cbac6ba291e66f59be6bd763950bb16041a0a85e",
-                    # Second pairing
-                    "0000000000000000000000000000000000000000000000000000000000000013",
-                    "0644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451",
-                    "971ff0471b09fa93caaf13cbf443c1aede09cc4328f5a62aad45f40ec133eb40",
-                    "91058a3141822985733cbdddfed0fd8d6c104e9e9eff40bf5abfef9ab163bc72",
-                    "a23af9a5ce2ba2796c1f4e453a370eb0af8c212d9dc9acd8fc02c2e907baea22",
-                    "3a8eb0b0996252cb548a4487da97b02422ebc0e834613f954de6c7e0afdc1fc0",
-                ]
+            EIP197Spec.ECPAIRING,
+            [],
+            Precompile.BN128_PAIRING,
+            id="ec_pairing_zero_input",
+        ),
+        pytest.param(
+            EIP197Spec.ECPAIRING,
+            # First pairing
+            PointG1(
+                x=0x2CF44499D5D27BB186308B7AF7AF02AC5BC9EEB6A3D147C186B21FB1B76E18DA,
+                y=0x2C0F001F52110CCFE69108924926E45F0B0C868DF0E7BDE1FE16D3242DC715F6,
+            )
+            + PointG2(
+                x=(
+                    0x1FB19BB476F6B9E44E2A32234DA8212F61CD63919354BC06AEF31E3CFAFF3EBC,
+                    0x22606845FF186793914E03E21DF544C34FFE2F2F3504DE8A79D9159ECA2D98D9,
+                ),
+                y=(
+                    0x2BD368E28381E8ECCB5FA81FC26CF3F048EEA9ABFDD85D7ED3AB3698D63E4F90,
+                    0x2FE02E47887507ADF0FF1743CBAC6BA291E66F59BE6BD763950BB16041A0A85E,
+                ),
+            )
+            # Second pairing
+            + PointG1(
+                x=0x0000000000000000000000000000000000000000000000000000000000000013,
+                y=0x0644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD451,
+            )
+            + PointG2(
+                x=(
+                    0x971FF0471B09FA93CAAF13CBF443C1AEDE09CC4328F5A62AAD45F40EC133EB40,
+                    0x91058A3141822985733CBDDDFED0FD8D6C104E9E9EFF40BF5ABFEF9AB163BC72,
+                ),
+                y=(
+                    0xA23AF9A5CE2BA2796C1F4E453A370EB0AF8C212D9DC9ACD8FC02C2E907BAEA22,
+                    0x3A8EB0B0996252CB548A4487DA97B02422EBC0E834613F954DE6C7E0AFDC1FC0,
+                ),
             ),
+            Precompile.BN128_PAIRING,
             id="ec_pairing_2_sets",
         ),
         pytest.param(
-            0x08,
-            concatenate_parameters([""]),
+            EIP197Spec.ECPAIRING,
+            b"",
+            Precompile.BN128_PAIRING,
             id="ec_pairing_1_pair",
         ),
         pytest.param(
-            0x08,
-            concatenate_parameters(
-                [
-                    # First pairing
-                    "2371e7d92e9fc444d0e11526f0752b520318c80be68bf0131704b36b7976572e",
-                    "2dca8f05ed5d58e0f2e13c49ae40480c0f99dfcd9268521eea6c81c6387b66c4",
-                    "051a93d697db02afd3dcf8414ecb906a114a2bfdb6b06c95d41798d1801b3cbd",
-                    "2e275fef7a0bdb0a2aea77d8ec5817e66e199b3d55bc0fa308dcdda74e85060b",
-                    "1c7e33c2a72d6e12a31eababad3dbc388525135628102bb64742d9e325f43410",
-                    "115dc41fa10b2dbf99036f252ad6f00e8876b22f02cb4738dc4413b22ea9b2df",
-                    # Second pairing
-                    "09a760ea8f9bd87dc258a949395a03f7d2500c6e72c61f570986328a096b610a",
-                    "148027063c072345298117eb2cb980ad79601db31cc69bba6bcbe4937ada6720",
-                    "198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2",
-                    "1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed",
-                    "090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b",
-                    "12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
-                ]
-            ),
+            EIP197Spec.ECPAIRING,
+            # First pairing
+            PointG1(
+                x=0x2371E7D92E9FC444D0E11526F0752B520318C80BE68BF0131704B36B7976572E,
+                y=0x2DCA8F05ED5D58E0F2E13C49AE40480C0F99DFCD9268521EEA6C81C6387B66C4,
+            )
+            + PointG2(
+                x=(
+                    0x051A93D697DB02AFD3DCF8414ECB906A114A2BFDB6B06C95D41798D1801B3CBD,
+                    0x2E275FEF7A0BDB0A2AEA77D8EC5817E66E199B3D55BC0FA308DCDDA74E85060B,
+                ),
+                y=(
+                    0x1C7E33C2A72D6E12A31EABABAD3DBC388525135628102BB64742D9E325F43410,
+                    0x115DC41FA10B2DBF99036F252AD6F00E8876B22F02CB4738DC4413B22EA9B2DF,
+                ),
+            )
+            # Second pairing: G2 generator
+            + PointG1(
+                x=0x09A760EA8F9BD87DC258A949395A03F7D2500C6E72C61F570986328A096B610A,
+                y=0x148027063C072345298117EB2CB980AD79601DB31CC69BBA6BCBE4937ADA6720,
+            )
+            + EIP197Spec.G2,
+            Precompile.BN128_PAIRING,
             id="ec_pairing_2_pair",
         ),
         pytest.param(
-            0x08,
-            concatenate_parameters(
-                [
-                    # First pairing
-                    "0000000000000000000000000000000000000000000000000000000000000000",
-                    "0000000000000000000000000000000000000000000000000000000000000000",
-                    "0ef4aac9b7954d5fc6eafae7f4f4c2a732ab05b45f8d50d102cee4973f36eb2c",
-                    "23db7d30c99e0a2a7f3bb5cd1f04635aaea58732b58887df93d9239c28230d28",
-                    "2bd99d31a5054f2556d226f2e5ef0e075423d8604178b2e2c08006311caee54f",
-                    "0f11afb0c6073d12d21b13f4f78210e8ca9a66729206d3fcc2c1b04824c425f2",
-                    # Second pairing
-                    "0000000000000000000000000000000000000000000000000000000000000000",
-                    "198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2",
-                    "1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed",
-                    "090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b",
-                    "12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
-                    # Third pairing
-                    "0000000000000000000000000000000000000000000000000000000000000000",
-                    "198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2",
-                    "1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed",
-                    "090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b",
-                    "12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
-                ]
-            ),
+            EIP197Spec.ECPAIRING,
+            # First pairing
+            PointG1(x=0, y=0)
+            + PointG2(
+                x=(
+                    0x0EF4AAC9B7954D5FC6EAFAE7F4F4C2A732AB05B45F8D50D102CEE4973F36EB2C,
+                    0x23DB7D30C99E0A2A7F3BB5CD1F04635AAEA58732B58887DF93D9239C28230D28,
+                ),
+                y=(
+                    0x2BD99D31A5054F2556D226F2E5EF0E075423D8604178B2E2C08006311CAEE54F,
+                    0x0F11AFB0C6073D12D21B13F4F78210E8CA9A66729206D3FCC2C1B04824C425F2,
+                ),
+            )
+            # Second pairing (32 zero + G2 generator = 160 bytes)
+            + bytes(32)
+            + EIP197Spec.G2
+            # Third pairing (same structure as second)
+            + bytes(32)
+            + EIP197Spec.G2,
+            Precompile.BN128_PAIRING,
             id="ec_pairing_3_pair",
         ),
         pytest.param(
-            0x08,
-            concatenate_parameters(
-                [
-                    # First pairing
-                    "24ab69f46f3e3333027d67d51af71571141bd5652b9829157a3c5d1268461984",
-                    "0f0e1495665bccf97d627b714e8a49e9c77c21e8d5b383ad7dde7e50040d0f62",
-                    "2cab595b9d579f8b82e433249b83ae1d7b62d7073a4f67cb3aeb9b316988907f",
-                    "1326d1905ffde0c77e8ebd98257aa239b05ae76c8ec7723ec19bbc8282b0debe",
-                    "130502106676b537e01cc356765e91c005d6c4bd1a75f5f6d41d2556c73e56ac",
-                    "2dc4cb08068b4aa5f14b7f1096ab35d5c13d78319ec7e66e9f67a1ff20cbbf03",
-                    # Second pairing
-                    "1459f4140b271cbc8746de9dfcb477d5b72d50ef95bec5fef4a68dd69ddfdb2e",
-                    "2c589584551d16a9723b5d356d1ee2066d10381555cdc739e39efca2612fc544",
-                    "229ab0abdb0a7d1a5f0d93fb36ce41e12a31ba52fd9e3c27bebce524ab6c4e9b",
-                    "00f8756832b244377d06e2d00eeb95ec8096dcfd81f4e4931b50fea23c04a2fe",
-                    "29605352ce973ec48d1ab2c8355643c999b70ff771946078b519c556058c3d56",
-                    "059a65ae6e0189d4e04a966140aa40f781a1345824a90a91bb035e12ad29af1d",
-                    # Third pairing
-                    "1459f4140b271cbc8746de9dfcb477d5b72d50ef95bec5fef4a68dd69ddfdb2e",
-                    "2c589584551d16a9723b5d356d1ee2066d10381555cdc739e39efca2612fc544",
-                    "229ab0abdb0a7d1a5f0d93fb36ce41e12a31ba52fd9e3c27bebce524ab6c4e9b",
-                    "00f8756832b244377d06e2d00eeb95ec8096dcfd81f4e4931b50fea23c04a2fe",
-                    "29605352ce973ec48d1ab2c8355643c999b70ff771946078b519c556058c3d56",
-                    "059a65ae6e0189d4e04a966140aa40f781a1345824a90a91bb035e12ad29af1d",
-                    # Fourth pairing
-                    "24ab69f46f3e3333027d67d51af71571141bd5652b9829157a3c5d1268461984",
-                    "0f0e1495665bccf97d627b714e8a49e9c77c21e8d5b383ad7dde7e50040d0f62",
-                    "2cab595b9d579f8b82e433249b83ae1d7b62d7073a4f67cb3aeb9b316988907f",
-                    "1326d1905ffde0c77e8ebd98257aa239b05ae76c8ec7723ec19bbc8282b0debe",
-                    "130502106676b537e01cc356765e91c005d6c4bd1a75f5f6d41d2556c73e56ac",
-                    "2dc4cb08068b4aa5f14b7f1096ab35d5c13d78319ec7e66e9f67a1ff20cbbf03",
-                ]
+            EIP197Spec.ECPAIRING,
+            (
+                PointG1(
+                    x=0x24AB69F46F3E3333027D67D51AF71571141BD5652B9829157A3C5D1268461984,
+                    y=0x0F0E1495665BCCF97D627B714E8A49E9C77C21E8D5B383AD7DDE7E50040D0F62,
+                )
+                + PointG2(
+                    x=(
+                        0x2CAB595B9D579F8B82E433249B83AE1D7B62D7073A4F67CB3AEB9B316988907F,
+                        0x1326D1905FFDE0C77E8EBD98257AA239B05AE76C8EC7723EC19BBC8282B0DEBE,
+                    ),
+                    y=(
+                        0x130502106676B537E01CC356765E91C005D6C4BD1A75F5F6D41D2556C73E56AC,
+                        0x2DC4CB08068B4AA5F14B7F1096AB35D5C13D78319EC7E66E9F67A1FF20CBBF03,
+                    ),
+                )
+            )
+            + (
+                PointG1(
+                    x=0x1459F4140B271CBC8746DE9DFCB477D5B72D50EF95BEC5FEF4A68DD69DDFDB2E,
+                    y=0x2C589584551D16A9723B5D356D1EE2066D10381555CDC739E39EFCA2612FC544,
+                )
+                + PointG2(
+                    x=(
+                        0x229AB0ABDB0A7D1A5F0D93FB36CE41E12A31BA52FD9E3C27BEBCE524AB6C4E9B,
+                        0x00F8756832B244377D06E2D00EEB95EC8096DCFD81F4E4931B50FEA23C04A2FE,
+                    ),
+                    y=(
+                        0x29605352CE973EC48D1AB2C8355643C999B70FF771946078B519C556058C3D56,
+                        0x059A65AE6E0189D4E04A966140AA40F781A1345824A90A91BB035E12AD29AF1D,
+                    ),
+                )
+            )
+            + (
+                PointG1(
+                    x=0x1459F4140B271CBC8746DE9DFCB477D5B72D50EF95BEC5FEF4A68DD69DDFDB2E,
+                    y=0x2C589584551D16A9723B5D356D1EE2066D10381555CDC739E39EFCA2612FC544,
+                )
+                + PointG2(
+                    x=(
+                        0x229AB0ABDB0A7D1A5F0D93FB36CE41E12A31BA52FD9E3C27BEBCE524AB6C4E9B,
+                        0x00F8756832B244377D06E2D00EEB95EC8096DCFD81F4E4931B50FEA23C04A2FE,
+                    ),
+                    y=(
+                        0x29605352CE973EC48D1AB2C8355643C999B70FF771946078B519C556058C3D56,
+                        0x059A65AE6E0189D4E04A966140AA40F781A1345824A90A91BB035E12AD29AF1D,
+                    ),
+                )
+            )
+            + (
+                PointG1(
+                    x=0x24AB69F46F3E3333027D67D51AF71571141BD5652B9829157A3C5D1268461984,
+                    y=0x0F0E1495665BCCF97D627B714E8A49E9C77C21E8D5B383AD7DDE7E50040D0F62,
+                )
+                + PointG2(
+                    x=(
+                        0x2CAB595B9D579F8B82E433249B83AE1D7B62D7073A4F67CB3AEB9B316988907F,
+                        0x1326D1905FFDE0C77E8EBD98257AA239B05AE76C8EC7723EC19BBC8282B0DEBE,
+                    ),
+                    y=(
+                        0x130502106676B537E01CC356765E91C005D6C4BD1A75F5F6D41D2556C73E56AC,
+                        0x2DC4CB08068B4AA5F14B7F1096AB35D5C13D78319EC7E66E9F67A1FF20CBBF03,
+                    ),
+                )
             ),
+            Precompile.BN128_PAIRING,
             id="ec_pairing_4_pair",
         ),
         pytest.param(
-            0x08,
-            concatenate_parameters(
-                [
-                    # First pairing
-                    "1147057b17237df94a3186435acf66924e1d382b8c935fdd493ceb38c38def73",
-                    "03cd046286139915160357ce5b29b9ea28bfb781b71734455d20ef1a64be76ca",
-                    "0daa7cc4983cf74c94607519df747f61e317307c449bafb6923f6d6a65299a7e",
-                    "1d48db8f275830859fd61370addbc5d5ef3f0ce7491d16918e065f7e3727439d",
-                    "1ca8ac2f4a0f540e5505edbe1d15d13899a2a0dfccb012d068134ac66edec625",
-                    "2162c315417d1d12c9d7028c5619015391003a9006d4d8979784c7af2c4537a3",
-                    # Second pairing
-                    "0d221a19ca86dafa8cb804daff78fd3d1bed30aa32e7d4029b1aa69afda2d750",
-                    "018628c766a98de1d0cca887a6d90303e68a7729490f25f937b76b57624ba0be",
-                    "14550ccf7139312da6fa9eb1259c6365b0bd688a27473ccb42bc5cd6f14c8abd",
-                    "165f8721ee9f614382c8c7edb103c941d3a55c1849c9787f34317777d5d9365b",
-                    "0d19da7439edb573a1b3e357faade63d5d68b6031771fd911459b7ab0bda9d3f",
-                    "25a50a44d10c99c5f107e3b3874f717873cb2d4674699a468204df27c0c50a9a",
-                    # Third pairing
-                    "0d7136c59b907615e1b45cf730fbfd6cf38b7e126e85e52be804620a23ace4fb",
-                    "03e80c29d24ed5cc407329ae093bb1be00f9e3c9332f532bc3658937110d7607",
-                    "2129813bd7247065ac58eac42c81e874044e199f48c12aa749a9fe6bb6e4bddc",
-                    "1b72b9ab4579283e62445555d5b2921424213d09a776152361c46988b82be8a7",
-                    "111bc8198f932e379b8f9825f01af0f5e5cacbf8bfe274bf674f6eaa6e338e04",
-                    "259f58d438fd6391e158c991e155966218e6a432703a84068a32543965749857",
-                    # Fourth pairing
-                    "1ba47a91d487cce77aa78390a295df54d9351637d67810c400415fb374278e3f",
-                    "24318bbc05a4e4d779b9498075841c360c6973c1c51dea254281829bbc9aef33",
-                    "198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2",
-                    "1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed",
-                    "090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b",
-                    "12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
-                    # Fifth pairing
-                    "1e219772c16eee72450bbf43e9cadae7bf6b2e6ae6637cfeb1d1e8965287acfb",
-                    "0347e7bf4245debd3d00b6f51d2d50fd718e6769352f4fe1db0efe492fed2fc3",
-                    "24fdcc7d4ed0953e3dad500c7ef9836fc61ded44ba454ec76f0a6d0687f4c1b4",
-                    "282b18f7e59c1db4852e622919b2ce9aa5980ca883eac312049c19a3deb79f6d",
-                    "0c9d6ce303b7811dd7ea506c8fa124837405bd209b8731bda79a66eb7206277b",
-                    "1ac5dac62d2332faa8069faca3b0d27fcdf95d8c8bafc9074ee72b5c1f33aa70",
-                ]
+            EIP197Spec.ECPAIRING,
+            # First pairing
+            PointG1(
+                x=0x1147057B17237DF94A3186435ACF66924E1D382B8C935FDD493CEB38C38DEF73,
+                y=0x03CD046286139915160357CE5B29B9EA28BFB781B71734455D20EF1A64BE76CA,
+            )
+            + PointG2(
+                x=(
+                    0x0DAA7CC4983CF74C94607519DF747F61E317307C449BAFB6923F6D6A65299A7E,
+                    0x1D48DB8F275830859FD61370ADDBC5D5EF3F0CE7491D16918E065F7E3727439D,
+                ),
+                y=(
+                    0x1CA8AC2F4A0F540E5505EDBE1D15D13899A2A0DFCCB012D068134AC66EDEC625,
+                    0x2162C315417D1D12C9D7028C5619015391003A9006D4D8979784C7AF2C4537A3,
+                ),
+            )
+            # Second pairing
+            + PointG1(
+                x=0x0D221A19CA86DAFA8CB804DAFF78FD3D1BED30AA32E7D4029B1AA69AFDA2D750,
+                y=0x018628C766A98DE1D0CCA887A6D90303E68A7729490F25F937B76B57624BA0BE,
+            )
+            + PointG2(
+                x=(
+                    0x14550CCF7139312DA6FA9EB1259C6365B0BD688A27473CCB42BC5CD6F14C8ABD,
+                    0x165F8721EE9F614382C8C7EDB103C941D3A55C1849C9787F34317777D5D9365B,
+                ),
+                y=(
+                    0x0D19DA7439EDB573A1B3E357FAADE63D5D68B6031771FD911459B7AB0BDA9D3F,
+                    0x25A50A44D10C99C5F107E3B3874F717873CB2D4674699A468204DF27C0C50A9A,
+                ),
+            )
+            # Third pairing
+            + PointG1(
+                x=0x0D7136C59B907615E1B45CF730FBFD6CF38B7E126E85E52BE804620A23ACE4FB,
+                y=0x03E80C29D24ED5CC407329AE093BB1BE00F9E3C9332F532BC3658937110D7607,
+            )
+            + PointG2(
+                x=(
+                    0x2129813BD7247065AC58EAC42C81E874044E199F48C12AA749A9FE6BB6E4BDDC,
+                    0x1B72B9AB4579283E62445555D5B2921424213D09A776152361C46988B82BE8A7,
+                ),
+                y=(
+                    0x111BC8198F932E379B8F9825F01AF0F5E5CACBF8BFE274BF674F6EAA6E338E04,
+                    0x259F58D438FD6391E158C991E155966218E6A432703A84068A32543965749857,
+                ),
+            )
+            # Fourth pairing: G2 generator
+            + PointG1(
+                x=0x1BA47A91D487CCE77AA78390A295DF54D9351637D67810C400415FB374278E3F,
+                y=0x24318BBC05A4E4D779B9498075841C360C6973C1C51DEA254281829BBC9AEF33,
+            )
+            + EIP197Spec.G2
+            # Fifth pairing
+            + PointG1(
+                x=0x1E219772C16EEE72450BBF43E9CADAE7BF6B2E6AE6637CFEB1D1E8965287ACFB,
+                y=0x0347E7BF4245DEBD3D00B6F51D2D50FD718E6769352F4FE1DB0EFE492FED2FC3,
+            )
+            + PointG2(
+                x=(
+                    0x24FDCC7D4ED0953E3DAD500C7EF9836FC61DED44BA454EC76F0A6D0687F4C1B4,
+                    0x282B18F7E59C1DB4852E622919B2CE9AA5980CA883EAC312049C19A3DEB79F6D,
+                ),
+                y=(
+                    0x0C9D6CE303B7811DD7EA506C8FA124837405BD209B8731BDA79A66EB7206277B,
+                    0x1AC5DAC62D2332FAA8069FACA3B0D27FCDF95D8C8BAFC9074EE72B5C1F33AA70,
+                ),
             ),
+            Precompile.BN128_PAIRING,
             id="ec_pairing_5_pair",
         ),
         pytest.param(
-            0x08,
-            concatenate_parameters(
-                [
-                    "0000000000000000000000000000000000000000000000000000000000000000",
-                ]
-            ),
+            EIP197Spec.ECPAIRING,
+            bytes(32),
+            Precompile.BN128_PAIRING,
             id="ec_pairing_1_pair_empty",
         ),
     ],
@@ -363,6 +474,7 @@ def test_alt_bn128(
     benchmark_test: BenchmarkTestFiller,
     precompile_address: Address,
     calldata: bytes,
+    target: OpcodeTarget,
 ) -> None:
     """Benchmark ALT_BN128 precompile."""
     attack_block = Op.POP(
@@ -372,7 +484,7 @@ def test_alt_bn128(
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=target,
         code_generator=JumpLoopGenerator(
             setup=Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE),
             attack_block=attack_block,
@@ -398,21 +510,25 @@ def _generate_bn128_pairs(n: int, seed: int = 0) -> Bytes:
         assert point_y_affine is not None, (
             "G2 multiplication resulted in point at infinity"
         )
+        assert isinstance(point_y_affine[0], bn128_FQ2)
+        assert isinstance(point_y_affine[1], bn128_FQ2)
 
-        g1_x_bytes = point_x_affine[0].n.to_bytes(32, "big")
-        g1_y_bytes = point_x_affine[1].n.to_bytes(32, "big")
-        g1_serialized = g1_x_bytes + g1_y_bytes
-
-        g2_x_c1_bytes = point_y_affine[0].coeffs[1].n.to_bytes(32, "big")  # type: ignore
-        g2_x_c0_bytes = point_y_affine[0].coeffs[0].n.to_bytes(32, "big")  # type: ignore
-        g2_y_c1_bytes = point_y_affine[1].coeffs[1].n.to_bytes(32, "big")  # type: ignore
-        g2_y_c0_bytes = point_y_affine[1].coeffs[0].n.to_bytes(32, "big")  # type: ignore
-        g2_serialized = (
-            g2_x_c1_bytes + g2_x_c0_bytes + g2_y_c1_bytes + g2_y_c0_bytes
+        g1 = PointG1(
+            x=point_x_affine[0].n,
+            y=point_x_affine[1].n,
+        )
+        g2 = PointG2(
+            x=(
+                int(point_y_affine[0].coeffs[1]),
+                int(point_y_affine[0].coeffs[0]),
+            ),
+            y=(
+                int(point_y_affine[1].coeffs[1]),
+                int(point_y_affine[1].coeffs[0]),
+            ),
         )
 
-        pair_calldata = g1_serialized + g2_serialized
-        calldata = Bytes(calldata + pair_calldata)
+        calldata = Bytes(calldata + g1 + g2)
 
     return calldata
 
@@ -426,8 +542,8 @@ def test_bn128_pairings_amortized(
     size_per_pairing = 192
 
     gsc = fork.gas_costs()
-    base_cost = gsc.GAS_PRECOMPILE_ECPAIRING_BASE
-    pairing_cost = gsc.GAS_PRECOMPILE_ECPAIRING_PER_POINT
+    base_cost = gsc.PRECOMPILE_ECPAIRING_BASE
+    pairing_cost = gsc.PRECOMPILE_ECPAIRING_PER_POINT
     intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
     mem_exp_gas_calculator = fork.memory_expansion_gas_calculator()
     warm_account_access_cost = Op.STATICCALL(
@@ -484,11 +600,11 @@ def test_bn128_pairings_amortized(
 
     setup = Op.CALLDATACOPY(size=Op.CALLDATASIZE)
     attack_block = Op.POP(
-        Op.STATICCALL(Op.GAS, 0x08, 0, Op.CALLDATASIZE, 0, 0)
+        Op.STATICCALL(Op.GAS, EIP197Spec.ECPAIRING, 0, Op.CALLDATASIZE, 0, 0)
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=Precompile.BN128_PAIRING,
         code_generator=JumpLoopGenerator(
             setup=setup,
             attack_block=attack_block,
@@ -511,14 +627,251 @@ def test_alt_bn128_benchmark(
     calldata = _generate_bn128_pairs(num_pairs, seed=42)
 
     attack_block = Op.POP(
-        Op.STATICCALL(gas=Op.GAS, address=0x08, args_size=Op.CALLDATASIZE),
+        Op.STATICCALL(
+            gas=Op.GAS,
+            address=EIP197Spec.ECPAIRING,
+            args_size=Op.CALLDATASIZE,
+        ),
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=Precompile.BN128_PAIRING,
         code_generator=JumpLoopGenerator(
             setup=Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE),
             attack_block=attack_block,
             tx_kwargs={"data": calldata},
         ),
     )
+
+
+@pytest.mark.repricing
+@pytest.mark.parametrize("num_pairs", [1, 3, 6, 12, 24])
+def test_ec_pairing(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    num_pairs: int,
+) -> None:
+    """Benchmark ecpairing precompile with unique inputs per call."""
+    pair_size = num_pairs * 192
+    gsc = fork.gas_costs()
+    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+    mem_exp = fork.memory_expansion_gas_calculator()
+    precompile_cost = (
+        gsc.PRECOMPILE_ECPAIRING_BASE
+        + gsc.PRECOMPILE_ECPAIRING_PER_POINT * num_pairs
+    )
+
+    # Each iteration: STATICCALL ecpairing at advancing calldata offset,
+    # then advance offset by pair_size at memory[CALLDATASIZE].
+    # The loop condition checks remaining gas against one body execution.
+    attack_block = Op.POP(
+        Op.STATICCALL(
+            gas=Op.GAS,
+            address=EIP197Spec.ECPAIRING,
+            args_offset=Op.MLOAD(Op.CALLDATASIZE),
+            args_size=pair_size,
+            # gas accounting
+            address_warm=True,
+            inner_call_cost=precompile_cost,
+        ),
+    ) + Op.MSTORE(
+        Op.CALLDATASIZE,
+        Op.ADD(Op.MLOAD(Op.CALLDATASIZE), pair_size),
+    )
+
+    setup = Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
+    loop = While(
+        body=attack_block,
+        condition=Op.GT(Op.CALLDATASIZE, Op.MLOAD(Op.CALLDATASIZE)),
+    )
+    code = setup + loop
+    attack_contract_address = pre.deploy_contract(code=code)
+
+    iteration_cost = loop.gas_cost(fork)
+    setup_cost = setup.gas_cost(fork)
+
+    # Conservative per-variant estimate for sizing the calldata:
+    # one loop iteration + worst-case calldata intrinsic (all non-zero)
+    # + CALLDATACOPY copy and linear memory expansion.
+    words_per_variant = math.ceil(pair_size / 32)
+    per_variant_gas = (
+        iteration_cost
+        + pair_size * 16
+        + words_per_variant * (gsc.OPCODE_COPY_PER_WORD + gsc.MEMORY_PER_WORD)
+    )
+    empty_intrinsic = intrinsic_gas_calculator(
+        calldata=[], return_cost_deducted_prior_execution=True
+    )
+    fixed_overhead = empty_intrinsic + setup_cost + mem_exp(new_bytes=32)
+
+    seed_offset = 0
+    txs: list[Transaction] = []
+    remaining_gas = gas_benchmark_value
+
+    expected_opcode_count = 0
+    while remaining_gas > 0:
+        per_tx_gas = min(tx_gas_limit, remaining_gas)
+        per_tx_variants = max(
+            1, (per_tx_gas - fixed_overhead) // per_variant_gas
+        )
+        calldata = Bytes(
+            b"".join(
+                _generate_bn128_pairs(num_pairs, seed=42 + seed_offset + i)
+                for i in range(per_tx_variants)
+            )
+        )
+
+        execution_intrinsic = intrinsic_gas_calculator(
+            calldata=calldata,
+            return_cost_deducted_prior_execution=True,
+        )
+        gas_for_loop = (
+            per_tx_gas
+            - execution_intrinsic
+            - setup_cost
+            - math.ceil(len(calldata) / 32) * gsc.OPCODE_COPY_PER_WORD
+            - mem_exp(new_bytes=len(calldata) + 32)
+        )
+
+        if gas_for_loop < per_tx_variants * iteration_cost:
+            break
+        expected_opcode_count += per_tx_variants
+
+        txs.append(
+            Transaction(
+                to=attack_contract_address,
+                sender=pre.fund_eoa(),
+                gas_limit=per_tx_gas,
+                data=calldata,
+            )
+        )
+        remaining_gas -= per_tx_gas
+        seed_offset += per_tx_variants
+
+    assert len(txs) != 0, "No transactions were added to the test."
+
+    benchmark_test(
+        target_opcode=Precompile.BN128_PAIRING,
+        skip_gas_used_validation=True,
+        expected_receipt_status=1,
+        expected_opcode_count=expected_opcode_count,
+        blocks=[Block(txs=txs)],
+    )
+
+
+def _generate_g1_point(seed: int) -> Bytes:
+    """Generate a valid random G1 point from a deterministic seed."""
+    rng = random.Random(seed)
+    priv_key = rng.randint(1, 2**32 - 1)
+    point = multiply(G1, priv_key)
+    assert point is not None
+    return Bytes(PointG1(x=point[0].n, y=point[1].n))
+
+
+@pytest.mark.repricing
+@pytest.mark.parametrize(
+    "precompile_address,scalar,target",
+    [
+        pytest.param(
+            EIP196Spec.ECADD, None, Precompile.BN128_ADD, id="ec_add"
+        ),
+        pytest.param(
+            EIP196Spec.ECMUL,
+            2,
+            Precompile.BN128_MUL,
+            id="ec_mul_small_scalar",
+        ),
+        pytest.param(
+            EIP196Spec.ECMUL,
+            2**256 - 1,
+            Precompile.BN128_MUL,
+            id="ec_mul_max_scalar",
+        ),
+    ],
+)
+def test_alt_bn128_uncachable(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    precompile_address: Address,
+    scalar: int | None,
+    target: OpcodeTarget,
+) -> None:
+    """
+    Benchmark ecAdd/ecMul with unique input per call.
+
+    Write the precompile's G1 output (64 bytes) back over the
+    input point so each loop iteration receives a distinct
+    input, avoiding precompile result caching in clients.
+    """
+    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+    gsc = fork.gas_costs()
+    precompile_cost = (
+        gsc.PRECOMPILE_ECMUL
+        if precompile_address == EIP196Spec.ECMUL
+        else gsc.PRECOMPILE_ECADD
+    )
+    attack_block = Op.POP(
+        Op.STATICCALL(
+            gas=Op.GAS,
+            address=precompile_address,
+            args_size=Op.CALLDATASIZE,
+            # One G1 point (2 * 32 bytes), overwrites the input point
+            # so each iteration has unique precompile input.
+            ret_size=64,
+            # gas accounting
+            address_warm=True,
+            inner_call_cost=precompile_cost,
+        ),
+    )
+
+    setup = Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
+    loop = WhileGas(body=attack_block, fork=fork)
+    code = setup + loop
+    attack_contract_address = pre.deploy_contract(code=code)
+
+    txs: list[Transaction] = []
+    remaining_gas = gas_benchmark_value
+
+    seed = 0
+    expected_opcode_count = 0
+    while remaining_gas > 0:
+        gas_available = min(tx_gas_limit, remaining_gas)
+
+        calldata = Bytes(
+            _generate_g1_point(seed) + _generate_g1_point(seed + 1000)
+            if scalar is None
+            else _generate_g1_point(seed) + scalar.to_bytes(32, "big")
+        )
+
+        intrinsic = intrinsic_gas_calculator(
+            calldata=calldata,
+            return_cost_deducted_prior_execution=True,
+        )
+        gas_for_loop = gas_available - intrinsic - setup.gas_cost(fork)
+        if gas_for_loop < loop.gas_cost(fork):
+            break
+        expected_opcode_count += gas_for_loop // loop.gas_cost(fork)
+        txs.append(
+            Transaction(
+                to=attack_contract_address,
+                sender=pre.fund_eoa(),
+                gas_limit=gas_available,
+                data=calldata,
+            )
+        )
+        remaining_gas -= gas_available
+        seed += 1
+
+    benchmark_test(
+        target_opcode=target,
+        skip_gas_used_validation=True,
+        expected_receipt_status=1,
+        blocks=[Block(txs=txs)],
+        expected_opcode_count=expected_opcode_count,
+    )
diff --git a/tests/benchmark/compute/precompile/test_blake2f.py b/tests/benchmark/compute/precompile/test_blake2f.py
index db7e7ff2ae2..7083d108e56 100644
--- a/tests/benchmark/compute/precompile/test_blake2f.py
+++ b/tests/benchmark/compute/precompile/test_blake2f.py
@@ -1,18 +1,25 @@
 """Benchmark BLAKE2F precompile."""
 
+import random
+
 import pytest
 from execution_testing import (
     Address,
+    Alloc,
     BenchmarkTestFiller,
+    Block,
+    Bytes,
     Fork,
     JumpLoopGenerator,
     Op,
+    Transaction,
+    WhileGas,
 )
 
 from tests.istanbul.eip152_blake2.common import Blake2bInput
 from tests.istanbul.eip152_blake2.spec import Spec as Blake2bSpec
 
-from ..helpers import concatenate_parameters
+from ..helpers import Precompile, concatenate_parameters
 
 
 @pytest.mark.parametrize(
@@ -48,7 +55,7 @@ def test_blake2f(
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=Precompile.BLAKE2F,
         code_generator=JumpLoopGenerator(
             setup=Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE),
             attack_block=attack_block,
@@ -78,10 +85,129 @@ def test_blake2f_benchmark(
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=Precompile.BLAKE2F,
         code_generator=JumpLoopGenerator(
             setup=Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE),
             attack_block=attack_block,
             tx_kwargs={"data": calldata},
         ),
     )
+
+
+@pytest.mark.repricing
+@pytest.mark.parametrize("num_rounds", [1, 6, 12, 24])
+def test_blake2f_uncachable(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    num_rounds: int,
+) -> None:
+    """
+    Benchmark BLAKE2F with unique input per call.
+
+    Each iteration writes the 64-byte output back to offset 4 in
+    memory, overwriting the h[] state so every call receives a
+    distinct input, avoiding precompile result caching in
+    clients.
+    """
+    precompile_address = Blake2bSpec.BLAKE2_PRECOMPILE_ADDRESS
+    if precompile_address not in fork.precompiles():
+        pytest.skip("Precompile not enabled")
+
+    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+
+    # BLAKE2F costs num_rounds gas.
+    gsc = fork.gas_costs()
+    precompile_cost = (
+        num_rounds * gsc.PRECOMPILE_BLAKE2F_PER_ROUND
+    ) + gsc.PRECOMPILE_BLAKE2F_BASE
+
+    attack_block = Op.POP(
+        Op.STATICCALL(
+            gas=Op.GAS,
+            address=precompile_address,
+            args_size=Op.CALLDATASIZE,
+            # override the h state
+            ret_offset=4,
+            ret_size=64,
+            # gas accounting
+            address_warm=True,
+            inner_call_cost=precompile_cost,
+        ),
+    )
+
+    # rounds: data[0:4] 4 bytes
+    # h: data[4:68] 64 bytes
+    # m: data[68:196] 128 bytes
+    # t: data[196:212] 16 bytes
+    # f: data[212:213] 1 byte
+    setup = Op.CALLDATACOPY(
+        0,
+        0,
+        Op.CALLDATASIZE,
+        # gas accounting
+        data_size=213,
+        old_memory_size=0,
+        new_memory_size=213,
+    )
+    setup_cost = setup.gas_cost(fork)
+
+    loop = WhileGas(
+        body=attack_block,
+        fork=fork,
+    )
+    code = setup + loop
+    attack_contract_address = pre.deploy_contract(code=code)
+
+    iteration_cost = loop.gas_cost(fork)
+
+    base_calldata = Blake2bInput(
+        rounds=num_rounds, f=True
+    ).create_blake2b_tx_data()
+
+    txs: list[Transaction] = []
+    remaining_gas = gas_benchmark_value
+    rng = random.Random(42)
+
+    expected_opcode_count = 0
+    while remaining_gas > 0:
+        per_tx_gas = min(tx_gas_limit, remaining_gas)
+        h_state = rng.randbytes(64)
+
+        calldata = Bytes(
+            base_calldata[:4]  # rounds
+            + h_state  # h
+            + base_calldata[68:]  # m, t, f
+        )
+
+        intrinsic = intrinsic_gas_calculator(
+            calldata=calldata,
+            return_cost_deducted_prior_execution=True,
+        )
+        gas_for_loop = per_tx_gas - intrinsic - setup_cost
+        if gas_for_loop < iteration_cost:
+            break
+
+        expected_opcode_count += gas_for_loop // iteration_cost
+
+        txs.append(
+            Transaction(
+                to=attack_contract_address,
+                sender=pre.fund_eoa(),
+                gas_limit=per_tx_gas,
+                data=calldata,
+            )
+        )
+        remaining_gas -= per_tx_gas
+
+    assert len(txs) != 0, "No transactions were added to the test."
+
+    benchmark_test(
+        target_opcode=Op.STATICCALL,
+        skip_gas_used_validation=True,
+        expected_receipt_status=1,
+        blocks=[Block(txs=txs)],
+        expected_opcode_count=expected_opcode_count,
+    )
diff --git a/tests/benchmark/compute/precompile/test_bls12_381.py b/tests/benchmark/compute/precompile/test_bls12_381.py
index 7e59d955d20..d6e08db6597 100644
--- a/tests/benchmark/compute/precompile/test_bls12_381.py
+++ b/tests/benchmark/compute/precompile/test_bls12_381.py
@@ -1,104 +1,93 @@
 """Benchmark BLS12_381 precompile."""
 
+import math
+import random
+from collections.abc import Callable
+
 import pytest
 from execution_testing import (
     Address,
+    Alloc,
     BenchmarkTestFiller,
+    Block,
     Bytes,
     Fork,
     JumpLoopGenerator,
     Op,
+    OpcodeTarget,
+    Transaction,
+    While,
+    WhileGas,
 )
+from py_ecc import optimized_bls12_381 as bls_curve
 
+from tests.benchmark.compute.helpers import Precompile
 from tests.prague.eip2537_bls_12_381_precompiles import spec as bls12381_spec
-
-from ..helpers import concatenate_parameters
+from tests.prague.eip2537_bls_12_381_precompiles.spec import (
+    build_gas_calculation_function_map,
+)
 
 
 @pytest.mark.parametrize(
-    "precompile_address,calldata",
+    "precompile_address,calldata,target",
     [
         pytest.param(
             bls12381_spec.Spec.G1ADD,
-            concatenate_parameters(
-                [
-                    bls12381_spec.Spec.G1,
-                    bls12381_spec.Spec.P1,
-                ]
-            ),
+            bls12381_spec.Spec.G1 + bls12381_spec.Spec.P1,
+            Precompile.BLS12_G1ADD,
             id="bls12_g1add",
             marks=pytest.mark.repricing,
         ),
         pytest.param(
             bls12381_spec.Spec.G1MSM,
-            concatenate_parameters(
-                [
-                    (
-                        bls12381_spec.Spec.P1
-                        + bls12381_spec.Scalar(bls12381_spec.Spec.Q)
-                    )
-                    * (len(bls12381_spec.Spec.G1MSM_DISCOUNT_TABLE) - 1),
-                ]
-            ),
+            (
+                bls12381_spec.Spec.P1
+                + bls12381_spec.Scalar(bls12381_spec.Spec.Q)
+            )
+            * (len(bls12381_spec.Spec.G1MSM_DISCOUNT_TABLE) - 1),
+            Precompile.BLS12_G1MSM,
             id="bls12_g1msm",
         ),
         pytest.param(
             bls12381_spec.Spec.G2ADD,
-            concatenate_parameters(
-                [
-                    bls12381_spec.Spec.G2,
-                    bls12381_spec.Spec.P2,
-                ]
-            ),
+            bls12381_spec.Spec.G2 + bls12381_spec.Spec.P2,
+            Precompile.BLS12_G2ADD,
             id="bls12_g2add",
             marks=pytest.mark.repricing,
         ),
         pytest.param(
             bls12381_spec.Spec.G2MSM,
-            concatenate_parameters(
-                [
-                    # TODO: the //2 is required due to a limitation of the max
-                    # contract size limit. In a further iteration we can insert
-                    # inputs as calldata or storage and avoid doing PUSHes
-                    # which has this limitation. This also applies to G1MSM.
-                    (
-                        bls12381_spec.Spec.P2
-                        + bls12381_spec.Scalar(bls12381_spec.Spec.Q)
-                    )
-                    * (len(bls12381_spec.Spec.G2MSM_DISCOUNT_TABLE) // 2),
-                ]
-            ),
+            # TODO: the //2 is required due to a limitation of the max
+            # contract size limit. In a further iteration we can insert
+            # inputs as calldata or storage and avoid doing PUSHes which
+            # has this limitation. This also applies to G1MSM.
+            (
+                bls12381_spec.Spec.P2
+                + bls12381_spec.Scalar(bls12381_spec.Spec.Q)
+            )
+            * (len(bls12381_spec.Spec.G2MSM_DISCOUNT_TABLE) // 2),
+            Precompile.BLS12_G2MSM,
             id="bls12_g2msm",
         ),
         pytest.param(
             bls12381_spec.Spec.PAIRING,
-            concatenate_parameters(
-                [
-                    bls12381_spec.Spec.G1,
-                    bls12381_spec.Spec.G2,
-                ]
-            ),
+            bls12381_spec.Spec.G1 + bls12381_spec.Spec.G2,
+            Precompile.BLS12_PAIRING,
             id="bls12_pairing_check",
         ),
         pytest.param(
             bls12381_spec.Spec.MAP_FP_TO_G1,
-            concatenate_parameters(
-                [
-                    bls12381_spec.FP(bls12381_spec.Spec.P - 1),
-                ]
-            ),
+            bls12381_spec.FP(bls12381_spec.Spec.P - 1),
+            Precompile.BLS12_MAP_FP_TO_G1,
             id="bls12_fp_to_g1",
             marks=pytest.mark.repricing,
         ),
         pytest.param(
             bls12381_spec.Spec.MAP_FP2_TO_G2,
-            concatenate_parameters(
-                [
-                    bls12381_spec.FP2(
-                        (bls12381_spec.Spec.P - 1, bls12381_spec.Spec.P - 1)
-                    ),
-                ]
+            bls12381_spec.FP2(
+                (bls12381_spec.Spec.P - 1, bls12381_spec.Spec.P - 1)
             ),
+            Precompile.BLS12_MAP_FP2_TO_G2,
             id="bls12_fp_to_g2",
             marks=pytest.mark.repricing,
         ),
@@ -109,6 +98,7 @@ def test_bls12_381(
     fork: Fork,
     precompile_address: Address,
     calldata: bytes,
+    target: OpcodeTarget,
 ) -> None:
     """Benchmark BLS12_381 precompile."""
     if precompile_address not in fork.precompiles():
@@ -121,7 +111,7 @@ def test_bls12_381(
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=target,
         code_generator=JumpLoopGenerator(
             setup=Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE),
             attack_block=attack_block,
@@ -155,7 +145,7 @@ def test_bls12_g1_msm(
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=Precompile.BLS12_G1MSM,
         code_generator=JumpLoopGenerator(
             setup=Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE),
             attack_block=attack_block,
@@ -206,7 +196,7 @@ def test_bls12_g2_msm(
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=Precompile.BLS12_G2MSM,
         code_generator=JumpLoopGenerator(
             setup=Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE),
             attack_block=attack_block,
@@ -239,10 +229,360 @@ def test_bls12_pairing(
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=Precompile.BLS12_PAIRING,
         code_generator=JumpLoopGenerator(
             setup=Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE),
             attack_block=attack_block,
             tx_kwargs={"data": calldata},
         ),
     )
+
+
+def _generate_bls12_g1_point(seed: int) -> Bytes:
+    """Generate a valid BLS12-381 G1 point from a seed."""
+    rng = random.Random(seed)
+    k = rng.randint(1, 2**32 - 1)
+    point = bls_curve.normalize(bls_curve.multiply(bls_curve.G1, k))
+    x = int(point[0])
+    y = int(point[1])
+    return Bytes(x.to_bytes(64, "big") + y.to_bytes(64, "big"))
+
+
+def _generate_bls12_g2_point(seed: int) -> Bytes:
+    """Generate a valid BLS12-381 G2 point from a seed."""
+    rng = random.Random(seed)
+    k = rng.randint(1, 2**32 - 1)
+    point = bls_curve.normalize(bls_curve.multiply(bls_curve.G2, k))
+    x_im = int(point[0].coeffs[0])
+    x_re = int(point[0].coeffs[1])
+    y_im = int(point[1].coeffs[0])
+    y_re = int(point[1].coeffs[1])
+    return Bytes(
+        x_im.to_bytes(64, "big")
+        + x_re.to_bytes(64, "big")
+        + y_im.to_bytes(64, "big")
+        + y_re.to_bytes(64, "big")
+    )
+
+
+def _generate_bls12_pairs(n: int, seed: int = 0) -> Bytes:
+    """Generate n valid BLS12-381 (G1, G2) pairs."""
+    calldata = Bytes()
+    for i in range(n):
+        g1 = _generate_bls12_g1_point(seed + 2 * i)
+        g2 = _generate_bls12_g2_point(seed + 2 * i + 1)
+        calldata = Bytes(calldata + g1 + g2)
+    return calldata
+
+
+def _g1add_calldata(seed: int) -> Bytes:
+    """Generate G1ADD calldata with unique first point."""
+    return Bytes(_generate_bls12_g1_point(seed) + bls12381_spec.Spec.P1)
+
+
+def _g2add_calldata(seed: int) -> Bytes:
+    """Generate G2ADD calldata with unique first point."""
+    return Bytes(_generate_bls12_g2_point(seed) + bls12381_spec.Spec.P2)
+
+
+def _g1msm_calldata(seed: int) -> Bytes:
+    """Generate G1MSM calldata with unique point."""
+    return Bytes(
+        _generate_bls12_g1_point(seed)
+        + bls12381_spec.Scalar(bls12381_spec.Spec.Q)
+    )
+
+
+def _g2msm_calldata(seed: int) -> Bytes:
+    """Generate G2MSM calldata with unique point."""
+    return Bytes(
+        _generate_bls12_g2_point(seed)
+        + bls12381_spec.Scalar(bls12381_spec.Spec.Q)
+    )
+
+
+def _fp_to_g1_calldata(seed: int) -> Bytes:
+    """Generate MAP_FP_TO_G1 calldata with unique FP."""
+    rng = random.Random(seed)
+    return Bytes(bls12381_spec.FP(rng.randint(1, bls12381_spec.Spec.P - 1)))
+
+
+def _fp2_to_g2_calldata(seed: int) -> Bytes:
+    """Generate MAP_FP2_TO_G2 calldata with unique FP2."""
+    rng = random.Random(seed)
+    c0 = rng.randint(1, bls12381_spec.Spec.P - 1)
+    c1 = rng.randint(1, bls12381_spec.Spec.P - 1)
+    return Bytes(bls12381_spec.FP2((c0, c1)))
+
+
+@pytest.mark.repricing
+@pytest.mark.parametrize(
+    "precompile_address,ret_size,generate_calldata,target",
+    [
+        pytest.param(
+            bls12381_spec.Spec.G1ADD,
+            128,
+            _g1add_calldata,
+            Precompile.BLS12_G1ADD,
+            id="bls12_g1add",
+        ),
+        pytest.param(
+            bls12381_spec.Spec.G2ADD,
+            256,
+            _g2add_calldata,
+            Precompile.BLS12_G2ADD,
+            id="bls12_g2add",
+        ),
+        pytest.param(
+            bls12381_spec.Spec.G1MSM,
+            128,
+            _g1msm_calldata,
+            Precompile.BLS12_G1MSM,
+            id="bls12_g1msm",
+        ),
+        pytest.param(
+            bls12381_spec.Spec.G2MSM,
+            256,
+            _g2msm_calldata,
+            Precompile.BLS12_G2MSM,
+            id="bls12_g2msm",
+        ),
+        pytest.param(
+            bls12381_spec.Spec.MAP_FP_TO_G1,
+            64,
+            _fp_to_g1_calldata,
+            Precompile.BLS12_MAP_FP_TO_G1,
+            id="bls12_fp_to_g1",
+        ),
+        pytest.param(
+            bls12381_spec.Spec.MAP_FP2_TO_G2,
+            128,
+            _fp2_to_g2_calldata,
+            Precompile.BLS12_MAP_FP2_TO_G2,
+            id="bls12_fp_to_g2",
+        ),
+    ],
+)
+def test_bls12_381_uncachable(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    precompile_address: Address,
+    ret_size: int,
+    generate_calldata: Callable[[int], Bytes],
+    target: OpcodeTarget,
+) -> None:
+    """
+    Benchmark BLS12_381 with unique input per call.
+
+    Each iteration writes the precompile output back to the
+    start of the input so every call receives a distinct input,
+    avoiding precompile result caching in clients.
+    """
+    if precompile_address not in fork.precompiles():
+        pytest.skip("Precompile not enabled")
+
+    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+    gas_calc_map = build_gas_calculation_function_map(fork.gas_costs())
+    input_size = len(generate_calldata(0))
+    precompile_cost = gas_calc_map[int(precompile_address)](input_size)
+
+    attack_block = Op.POP(
+        Op.STATICCALL(
+            gas=Op.GAS,
+            address=precompile_address,
+            args_size=Op.CALLDATASIZE,
+            ret_size=ret_size,
+            # gas accounting
+            address_warm=True,
+            inner_call_cost=precompile_cost,
+        ),
+    )
+
+    setup = Op.CALLDATACOPY(
+        0,
+        0,
+        Op.CALLDATASIZE,
+        # gas accounting
+        data_size=input_size,
+        new_memory_size=input_size,
+    )
+    setup_cost = setup.gas_cost(fork)
+
+    loop = WhileGas(body=attack_block, fork=fork)
+
+    code = setup + loop
+    attack_contract_address = pre.deploy_contract(code=code)
+
+    iteration_cost = loop.gas_cost(fork)
+
+    txs: list[Transaction] = []
+    remaining_gas = gas_benchmark_value
+    seed = 0
+    expected_opcode_count = 0
+    while remaining_gas > 0:
+        per_tx_gas = min(tx_gas_limit, remaining_gas)
+        calldata = generate_calldata(seed)
+
+        intrinsic = intrinsic_gas_calculator(
+            calldata=calldata,
+            return_cost_deducted_prior_execution=True,
+        )
+        gas_for_loop = per_tx_gas - intrinsic - setup_cost
+        if gas_for_loop < iteration_cost:
+            break
+        expected_opcode_count += gas_for_loop // iteration_cost
+
+        txs.append(
+            Transaction(
+                to=attack_contract_address,
+                sender=pre.fund_eoa(),
+                gas_limit=per_tx_gas,
+                data=calldata,
+            )
+        )
+        remaining_gas -= per_tx_gas
+        seed += 1
+
+    assert len(txs) != 0, "No transactions were added to the test."
+
+    benchmark_test(
+        target_opcode=target,
+        skip_gas_used_validation=True,
+        expected_receipt_status=1,
+        blocks=[Block(txs=txs)],
+        expected_opcode_count=expected_opcode_count,
+    )
+
+
+@pytest.mark.repricing
+@pytest.mark.parametrize("num_pairs", [1, 3, 6, 12, 24])
+def test_bls12_pairing_uncachable(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    num_pairs: int,
+) -> None:
+    """Benchmark BLS12 pairing precompile with unique inputs per call."""
+    precompile_address = bls12381_spec.Spec.PAIRING
+    if precompile_address not in fork.precompiles():
+        pytest.skip("BLS12_PAIRING precompile not enabled")
+
+    pair_size = num_pairs * 384
+    gsc = fork.gas_costs()
+    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+    mem_exp = fork.memory_expansion_gas_calculator()
+
+    # Each iteration: STATICCALL pairing at advancing offset,
+    # then advance offset by pair_size at memory[CALLDATASIZE].
+    attack_block = Op.POP(
+        Op.STATICCALL(
+            gas=Op.GAS,
+            address=precompile_address,
+            args_offset=Op.MLOAD(Op.CALLDATASIZE),
+            args_size=pair_size,
+            address_warm=True,
+        ),
+    ) + Op.MSTORE(
+        Op.CALLDATASIZE,
+        Op.ADD(Op.MLOAD(Op.CALLDATASIZE), pair_size),
+    )
+
+    setup = Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
+    loop = While(
+        body=attack_block,
+        condition=Op.GT(Op.CALLDATASIZE, Op.MLOAD(Op.CALLDATASIZE)),
+    )
+    code = setup + loop
+    attack_contract_address = pre.deploy_contract(code=code)
+
+    precompile_cost = (
+        gsc.PRECOMPILE_BLS_PAIRING_BASE
+        + gsc.PRECOMPILE_BLS_PAIRING_PER_PAIR * num_pairs
+    )
+
+    iteration_cost = loop.gas_cost(fork) + precompile_cost
+    setup_cost = setup.gas_cost(fork)
+
+    # Conservative per-variant estimate: one loop iteration
+    # + worst-case calldata floor intrinsic (all non-zero, EIP-7623)
+    # + CALLDATACOPY copy and linear memory expansion.
+    words_per_variant = math.ceil(pair_size / 32)
+    tokens_per_variant = pair_size * 4  # worst case: all non-zero
+    per_variant_gas = (
+        iteration_cost
+        + tokens_per_variant * gsc.TX_DATA_TOKEN_FLOOR
+        + words_per_variant * (gsc.OPCODE_COPY_PER_WORD + gsc.MEMORY_PER_WORD)
+    )
+    empty_intrinsic = intrinsic_gas_calculator(
+        calldata=[],
+        return_cost_deducted_prior_execution=False,
+    )
+    fixed_overhead = empty_intrinsic + setup_cost + mem_exp(new_bytes=32)
+
+    seed_offset = 0
+    txs: list[Transaction] = []
+    remaining_gas = gas_benchmark_value
+    expected_opcode_count = 0
+    while remaining_gas > 0:
+        per_tx_gas = min(tx_gas_limit, remaining_gas)
+        per_tx_variants = max(
+            1,
+            (per_tx_gas - fixed_overhead) // per_variant_gas,
+        )
+        calldata = Bytes(
+            b"".join(
+                _generate_bls12_pairs(num_pairs, seed=42 + seed_offset + i)
+                for i in range(per_tx_variants)
+            )
+        )
+
+        execution_intrinsic = intrinsic_gas_calculator(
+            calldata=calldata,
+            return_cost_deducted_prior_execution=False,
+        )
+        gas_for_loop = (
+            per_tx_gas
+            - execution_intrinsic
+            - setup_cost
+            - math.ceil(len(calldata) / 32) * gsc.OPCODE_COPY_PER_WORD
+            - mem_exp(new_bytes=len(calldata) + 32)
+        )
+
+        if gas_for_loop < per_tx_variants * iteration_cost:
+            break
+        expected_opcode_count += per_tx_variants
+
+        txs.append(
+            Transaction(
+                to=attack_contract_address,
+                sender=pre.fund_eoa(),
+                gas_limit=per_tx_gas,
+                data=calldata,
+            )
+        )
+        remaining_gas -= per_tx_gas
+        seed_offset += per_tx_variants
+
+    # TODO: 24 pairs exceeds the 1M block gas limit used in CI,
+    # which breaks the test run
+    if num_pairs == 24:
+        pytest.skip(
+            f"gas_benchmark_value={gas_benchmark_value} too small for "
+            f"num_pairs={num_pairs} "
+            f"(need ~{per_variant_gas + fixed_overhead} gas)"
+        )
+
+    assert len(txs) != 0, "No transactions were added to the test."
+
+    benchmark_test(
+        target_opcode=Precompile.BLS12_PAIRING,
+        skip_gas_used_validation=True,
+        expected_receipt_status=1,
+        blocks=[Block(txs=txs)],
+        expected_opcode_count=expected_opcode_count,
+    )
diff --git a/tests/benchmark/compute/precompile/test_ecrecover.py b/tests/benchmark/compute/precompile/test_ecrecover.py
index a3906f721d3..6d7dec43e11 100644
--- a/tests/benchmark/compute/precompile/test_ecrecover.py
+++ b/tests/benchmark/compute/precompile/test_ecrecover.py
@@ -9,7 +9,9 @@
     Op,
 )
 
-from ..helpers import concatenate_parameters
+from tests.benchmark.compute.helpers import Precompile
+from tests.frontier.precompiles.spec import EcrecoverInput
+from tests.frontier.precompiles.spec import Spec as EcrecoverSpec
 
 
 @pytest.mark.repricing
@@ -17,16 +19,14 @@
     "precompile_address,calldata",
     [
         pytest.param(
-            0x01,
-            concatenate_parameters(
-                [
-                    # Inputs below are a valid signature, thus ECRECOVER call
-                    # will perform full computation, not blocked by validation.
-                    "38D18ACB67D25C8BB9942764B62F18E17054F66A817BD4295423ADF9ED98873E",
-                    "000000000000000000000000000000000000000000000000000000000000001B",
-                    "38D18ACB67D25C8BB9942764B62F18E17054F66A817BD4295423ADF9ED98873E",
-                    "789D1DD423D25F0772D2748D60F7E4B81BB14D086EBA8E8E8EFB6DCFF8A4AE02",
-                ]
+            EcrecoverSpec.ECRECOVER,
+            # Inputs below are a valid signature, thus ECRECOVER call
+            # will perform full computation, not blocked by validation.
+            EcrecoverInput(
+                msg_hash=0x38D18ACB67D25C8BB9942764B62F18E17054F66A817BD4295423ADF9ED98873E,
+                v=0x1B,
+                r=0x38D18ACB67D25C8BB9942764B62F18E17054F66A817BD4295423ADF9ED98873E,
+                s=0x789D1DD423D25F0772D2748D60F7E4B81BB14D086EBA8E8E8EFB6DCFF8A4AE02,
             ),
             id="ecrecover",
         )
@@ -38,18 +38,33 @@ def test_ecrecover(
     precompile_address: Address,
     calldata: bytes,
 ) -> None:
-    """Benchmark ECRECOVER precompile."""
+    """
+    Benchmark ECRECOVER precompile with unique input per call.
+
+    Each loop iteration increments the hash at memory[0] by
+    the STATICCALL success flag (1) so every call receives a
+    distinct input, avoiding precompile result caching in
+    clients.
+    """
     if precompile_address not in fork.precompiles():
         pytest.skip("Precompile not enabled")
 
-    attack_block = Op.POP(
-        Op.STATICCALL(
-            gas=Op.GAS, address=precompile_address, args_size=Op.CALLDATASIZE
+    attack_block = Op.MSTORE(
+        0,
+        Op.ADD(
+            Op.MLOAD(0),
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=precompile_address,
+                args_size=Op.CALLDATASIZE,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
         ),
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=Precompile.ECRECOVER,
         code_generator=JumpLoopGenerator(
             setup=Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE),
             attack_block=attack_block,
diff --git a/tests/benchmark/compute/precompile/test_identity.py b/tests/benchmark/compute/precompile/test_identity.py
index 2d447353950..759ad8d30a6 100644
--- a/tests/benchmark/compute/precompile/test_identity.py
+++ b/tests/benchmark/compute/precompile/test_identity.py
@@ -1,14 +1,26 @@
 """Benchmark IDENTITY precompile."""
 
+import math
+import random
+
 import pytest
 from execution_testing import (
+    Alloc,
     BenchmarkTestFiller,
+    Block,
+    Bytes,
     Fork,
     JumpLoopGenerator,
     Op,
+    Transaction,
+    WhileGas,
 )
 
-from ..helpers import calculate_optimal_input_length
+from tests.benchmark.compute.helpers import (
+    Precompile,
+    calculate_optimal_input_length,
+)
+from tests.frontier.identity_precompile.spec import Spec as IdentitySpec
 
 
 def test_identity(
@@ -24,19 +36,24 @@ def test_identity(
     optimal_input_length = calculate_optimal_input_length(
         available_gas=gas_available,
         fork=fork,
-        static_cost=gas_costs.GAS_PRECOMPILE_IDENTITY_BASE,
-        per_word_dynamic_cost=gas_costs.GAS_PRECOMPILE_IDENTITY_PER_WORD,
+        static_cost=gas_costs.PRECOMPILE_IDENTITY_BASE,
+        per_word_dynamic_cost=gas_costs.PRECOMPILE_IDENTITY_PER_WORD,
         bytes_per_unit_of_work=1,
     )
 
     attack_block = Op.POP(
         Op.STATICCALL(
-            Op.GAS, 0x04, Op.PUSH0, optimal_input_length, Op.PUSH0, Op.PUSH0
+            Op.GAS,
+            IdentitySpec.IDENTITY,
+            Op.PUSH0,
+            optimal_input_length,
+            Op.PUSH0,
+            Op.PUSH0,
         )
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=Precompile.IDENTITY,
         code_generator=JumpLoopGenerator(
             setup=Op.CODECOPY(0, 0, optimal_input_length),
             attack_block=attack_block,
@@ -51,12 +68,109 @@ def test_identity_fixed_size(
 ) -> None:
     """Benchmark IDENTITY with fixed size input."""
     attack_block = Op.POP(
-        Op.STATICCALL(Op.GAS, 0x04, Op.PUSH0, size, Op.PUSH0, Op.PUSH0)
+        Op.STATICCALL(
+            Op.GAS, IdentitySpec.IDENTITY, Op.PUSH0, size, Op.PUSH0, Op.PUSH0
+        )
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=Precompile.IDENTITY,
         code_generator=JumpLoopGenerator(
             setup=Op.CODECOPY(0, 0, size), attack_block=attack_block
         ),
     )
+
+
+@pytest.mark.repricing
+@pytest.mark.parametrize("size", [32, 256, 1024])
+def test_identity_uncachable(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    size: int,
+) -> None:
+    """Benchmark IDENTITY with unique input per call."""
+    gsc = fork.gas_costs()
+    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+
+    precompile_cost = (
+        # static cost
+        gsc.PRECOMPILE_IDENTITY_BASE
+        # dynamic cost
+        + math.ceil(size / 32) * gsc.PRECOMPILE_IDENTITY_PER_WORD
+    )
+
+    attack_block = Op.MSTORE(
+        0,
+        Op.ADD(
+            Op.MLOAD(0),
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=IdentitySpec.IDENTITY,
+                args_size=size,
+                ret_size=size,
+                # gas accounting
+                address_warm=True,
+                inner_call_cost=precompile_cost,
+            ),
+        ),
+        old_memory_size=size,
+        new_memory_size=size,
+    )
+
+    setup = Op.CALLDATACOPY(
+        0,
+        0,
+        Op.CALLDATASIZE,
+        # gas accounting
+        data_size=size,
+        old_memory_size=0,
+        new_memory_size=size,
+    )
+    setup_cost = setup.gas_cost(fork)
+
+    loop = WhileGas(
+        body=attack_block,
+        fork=fork,
+    )
+    code = setup + loop
+    attack_contract_address = pre.deploy_contract(code=code)
+
+    txs: list[Transaction] = []
+    remaining_gas = gas_benchmark_value
+    rng = random.Random(42)
+    expected_opcode_count = 0
+    while remaining_gas > 0:
+        per_tx_gas = min(tx_gas_limit, remaining_gas)
+        calldata = Bytes(rng.randbytes(size))
+
+        intrinsic = intrinsic_gas_calculator(
+            calldata=calldata,
+            return_cost_deducted_prior_execution=True,
+        )
+        gas_for_loop = per_tx_gas - intrinsic - setup_cost
+        if gas_for_loop < loop.gas_cost(fork):
+            break
+        expected_opcode_count += gas_for_loop // loop.gas_cost(fork)
+
+        txs.append(
+            Transaction(
+                to=attack_contract_address,
+                sender=pre.fund_eoa(),
+                gas_limit=per_tx_gas,
+                data=calldata,
+            )
+        )
+        remaining_gas -= per_tx_gas
+
+    assert len(txs) != 0, "No transactions were added to the test."
+
+    benchmark_test(
+        target_opcode=Precompile.IDENTITY,
+        skip_gas_used_validation=True,
+        expected_receipt_status=1,
+        blocks=[Block(txs=txs)],
+        expected_opcode_count=expected_opcode_count,
+    )
diff --git a/tests/benchmark/compute/precompile/test_modexp.py b/tests/benchmark/compute/precompile/test_modexp.py
index 7de5ab8b9bc..2906bf7b730 100644
--- a/tests/benchmark/compute/precompile/test_modexp.py
+++ b/tests/benchmark/compute/precompile/test_modexp.py
@@ -1,19 +1,71 @@
 """Benchmark MODEXP precompile."""
 
+import random
+
 import pytest
 from _pytest.mark import ParameterSet
 from execution_testing import (
+    Alloc,
     BenchmarkTestFiller,
+    Block,
+    Bytes,
+    Fork,
     JumpLoopGenerator,
     Op,
+    Transaction,
+    WhileGas,
 )
+from execution_testing.forks import Osaka
 
 from tests.byzantium.eip198_modexp_precompile.helpers import ModExpInput
+from tests.osaka.eip7883_modexp_gas_increase.spec import Spec, Spec7883
+
+from ..helpers import Precompile
+
+
+def create_random_modexp_test_case(
+    test_id: str,
+    rng: random.Random,
+    *,
+    modulus_length: int,
+    exponent_length: int,
+    base_length: int | None = None,
+    modulus_2arity: int | None = None,
+) -> tuple[str, str, str, str]:
+    """
+    Build a random MODEXP test case with the prescribed bit lengths.
+
+    base_length defaults to modulus_length. If modulus_2arity is set, the
+    modulus has exactly that many least-significant zero bits followed by
+    a 1 bit.
+    """
+    if base_length is None:
+        base_length = modulus_length
+
+    def random_bits(n: int) -> int:
+        return (1 << (n - 1)) | rng.getrandbits(n - 1)
+
+    def to_hex(value: int, bit_length: int) -> str:
+        return value.to_bytes((bit_length + 7) // 8, "big").hex()
+
+    base = random_bits(base_length)
+    exponent = random_bits(exponent_length)
+    modulus = random_bits(modulus_length)
+    if modulus_2arity is not None:
+        modulus &= ~((1 << modulus_2arity) - 1)
+        modulus |= 1 << modulus_2arity
+
+    return (
+        to_hex(base, base_length),
+        to_hex(exponent, exponent_length),
+        to_hex(modulus, modulus_length),
+        test_id,
+    )
 
 
 def create_modexp_test_cases() -> list[ParameterSet]:
     """Create test cases for the MODEXP precompile."""
-    test_cases = [
+    explicit_test_cases = [
         # (base, exponent, modulus, test_id)
         (8 * "ff", 112 * "ff", 7 * "ff" + "00", "mod_even_8b_exp_896"),
         (16 * "ff", 40 * "ff", 15 * "ff" + "00", "mod_even_16b_exp_320"),
@@ -366,6 +418,51 @@ def create_modexp_test_cases() -> list[ParameterSet]:
         ),
     ]
 
+    # Randomized cases avoid the special "ff..ff" / "ff..ff00" / "ff..ff01"
+    # patterns used above. With those shapes, base mod modulus collapses to
+    # an 8-bit value, and the Montgomery factor 2**R mod modulus stays small—
+    # this causes implementations with variable-length precomputation to
+    # run misleadingly fast.
+    #
+    # Exponent lengths 17/33/65 are deliberately off byte/word boundaries:
+    # gas is metered at bit-level, but implementations often work at byte/word
+    # granularity, so these probe worst-case rounding behavior.
+    #
+    # Modulus lengths 32/64/196/256 cover worst cases observed benchmarking
+    # the Go standard library (as of early 2026).
+    rng = random.Random(0xC0FFEE)
+
+    # Generates ids: mod_{even,odd}_random_{32,64,196,256}b_exp_{17,33,65}
+    random_cases = [
+        create_random_modexp_test_case(
+            f"mod_{'even' if m2arity == 0 else 'odd'}_random_"
+            f"{modulus_length}b_exp_{exponent_length}",
+            rng,
+            modulus_length=modulus_length,
+            exponent_length=exponent_length,
+            modulus_2arity=m2arity,
+        )
+        for modulus_length in (32, 64, 196, 256)
+        for exponent_length in (17, 33, 65)
+        for m2arity in (0, 8)
+    ]
+
+    # Power-of-2 moduli: fast cases, included for completeness.
+    random_cases_pow2 = [
+        create_random_modexp_test_case(
+            f"mod_pow2_{modulus_length}_exp_{exponent_length}",
+            rng,
+            modulus_length=modulus_length,
+            exponent_length=exponent_length,
+            modulus_2arity=modulus_length - 1,
+        )
+        for modulus_length, exponent_length in (
+            (64, 33),
+            (128, 33),
+            (256, 65),
+        )
+    ]
+
     special_cases = [
         pytest.param(
             ModExpInput.from_bytes(
@@ -384,9 +481,10 @@ def create_modexp_test_cases() -> list[ParameterSet]:
             ),
             id=test_id,
         )
-        for base, exponent, modulus, test_id in test_cases
+        for base, exponent, modulus, test_id in explicit_test_cases
+        + random_cases
+        + random_cases_pow2
     ]
-
     return regular_cases + special_cases
 
 
@@ -408,10 +506,138 @@ def test_modexp(
         )
     )
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=Precompile.MODEXP,
         code_generator=JumpLoopGenerator(
             setup=Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE),
             attack_block=attack_block,
             tx_kwargs={"data": bytes(mod_exp_input).rstrip(b"\x00")},
         ),
     )
+
+
+@pytest.mark.repricing
+@pytest.mark.parametrize(
+    "mod_exp_input",
+    [
+        pytest.param(
+            ModExpInput(
+                base=32 * b"\xff",
+                exponent=32 * b"\xff",
+                modulus=31 * b"\xff" + b"\x01",
+            ),
+            id="mod_odd_32b_exp_256",
+        ),
+        pytest.param(
+            ModExpInput(
+                base=64 * b"\xff",
+                exponent=64 * b"\xff",
+                modulus=63 * b"\xff" + b"\x01",
+            ),
+            id="mod_odd_64b_exp_512",
+        ),
+        pytest.param(
+            ModExpInput(
+                base=128 * b"\xff",
+                exponent=128 * b"\xff",
+                modulus=127 * b"\xff" + b"\x01",
+            ),
+            id="mod_odd_128b_exp_1024",
+        ),
+    ],
+)
+def test_modexp_uncachable(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    mod_exp_input: ModExpInput,
+) -> None:
+    """Benchmark MODEXP with unique input per call."""
+    base_length = len(mod_exp_input.base)
+    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+
+    base_calldata = bytes(mod_exp_input).rstrip(b"\x00")
+    calldata_len = len(base_calldata)
+    if fork >= Osaka:
+        precompile_cost = Spec7883.calculate_gas_cost(mod_exp_input)
+    else:
+        precompile_cost = Spec.calculate_gas_cost(mod_exp_input)
+
+    # bsize: data[0:31] 32 bytes
+    # esize: data[32:64] 32 bytes
+    # msize: data[64:96] 32 bytes
+    # B: data[96:96+blength] blength bytes
+    # E: data[96+blength:96+blength+elength] elength bytes
+    # M: data[96+blength+elength:96+blength+elength+msize] msize bytes
+
+    attack_block = Op.POP(
+        Op.STATICCALL(
+            gas=Op.GAS,
+            address=Spec.MODEXP_ADDRESS,
+            args_size=Op.CALLDATASIZE,
+            ret_offset=96,
+            ret_size=base_length,
+            # gas accounting
+            address_warm=True,
+            inner_call_cost=precompile_cost,
+        ),
+    )
+    setup = Op.CALLDATACOPY(
+        0,
+        0,
+        Op.CALLDATASIZE,
+        # gas accounting
+        data_size=calldata_len,
+        old_memory_size=0,
+        new_memory_size=calldata_len,
+    )
+    setup_cost = setup.gas_cost(fork)
+
+    loop = WhileGas(
+        body=attack_block,
+        fork=fork,
+    )
+    code = setup + loop
+    attack_contract_address = pre.deploy_contract(code=code)
+
+    txs: list[Transaction] = []
+    remaining_gas = gas_benchmark_value
+    rng = random.Random(42)
+    expected_opcode_count = 0
+
+    while remaining_gas > 0:
+        per_tx_gas = min(tx_gas_limit, remaining_gas)
+        new_base = rng.randbytes(base_length)
+        calldata = Bytes(
+            base_calldata[:96]  # bsize, esize, msize
+            + new_base  # B
+            + base_calldata[96 + base_length :]  # E, M
+        )
+
+        intrinsic = intrinsic_gas_calculator(
+            calldata=calldata,
+            return_cost_deducted_prior_execution=True,
+        )
+        gas_for_loop = per_tx_gas - intrinsic - setup_cost
+        if gas_for_loop < loop.gas_cost(fork):
+            break
+        expected_opcode_count += gas_for_loop // loop.gas_cost(fork)
+
+        txs.append(
+            Transaction(
+                to=attack_contract_address,
+                sender=pre.fund_eoa(),
+                gas_limit=per_tx_gas,
+                data=calldata,
+            )
+        )
+        remaining_gas -= per_tx_gas
+
+    benchmark_test(
+        target_opcode=Precompile.MODEXP,
+        skip_gas_used_validation=True,
+        expected_receipt_status=1,
+        blocks=[Block(txs=txs)],
+        expected_opcode_count=expected_opcode_count,
+    )
diff --git a/tests/benchmark/compute/precompile/test_p256verify.py b/tests/benchmark/compute/precompile/test_p256verify.py
index 514f5989c55..fedb648c51b 100644
--- a/tests/benchmark/compute/precompile/test_p256verify.py
+++ b/tests/benchmark/compute/precompile/test_p256verify.py
@@ -3,15 +3,20 @@
 import pytest
 from execution_testing import (
     Address,
+    Alloc,
     BenchmarkTestFiller,
+    Block,
+    Bytes,
     Fork,
     JumpLoopGenerator,
     Op,
+    Transaction,
+    WhileGas,
 )
 
+from tests.benchmark.compute.helpers import Precompile
 from tests.osaka.eip7951_p256verify_precompiles import spec as p256verify_spec
-
-from ..helpers import concatenate_parameters
+from tests.osaka.eip7951_p256verify_precompiles.spec import H, R, S, X, Y
 
 
 @pytest.mark.parametrize(
@@ -19,15 +24,11 @@
     [
         pytest.param(
             p256verify_spec.Spec.P256VERIFY,
-            concatenate_parameters(
-                [
-                    p256verify_spec.Spec.H0,
-                    p256verify_spec.Spec.R0,
-                    p256verify_spec.Spec.S0,
-                    p256verify_spec.Spec.X0,
-                    p256verify_spec.Spec.Y0,
-                ]
-            ),
+            p256verify_spec.Spec.H0
+            + p256verify_spec.Spec.R0
+            + p256verify_spec.Spec.S0
+            + p256verify_spec.Spec.X0
+            + p256verify_spec.Spec.Y0,
             id="p256verify",
             marks=[
                 pytest.mark.eip_checklist(
@@ -38,27 +39,39 @@
         ),
         pytest.param(
             p256verify_spec.Spec.P256VERIFY,
-            concatenate_parameters(
-                [
-                    "235060CAFE19A407880C272BC3E73600E3A12294F56143ED61929C2FF4525ABB",
-                    "182E5CBDF96ACCB859E8EEA1850DE5FF6E430A19D1D9A680ECD5946BBEA8A32B",
-                    "76DDFAE6797FA6777CAAB9FA10E75F52E70A4E6CEB117B3C5B2F445D850BD64C",
-                    "3828736CDFC4C8696008F71999260329AD8B12287846FEDCEDE3BA1205B12729",
-                    "3E5141734E971A8D55015068D9B3666760F4608A49B11F92E500ACEA647978C7",
-                ]
+            H(
+                value=0x235060CAFE19A407880C272BC3E73600E3A12294F56143ED61929C2FF4525ABB
+            )
+            + R(
+                value=0x182E5CBDF96ACCB859E8EEA1850DE5FF6E430A19D1D9A680ECD5946BBEA8A32B
+            )
+            + S(
+                value=0x76DDFAE6797FA6777CAAB9FA10E75F52E70A4E6CEB117B3C5B2F445D850BD64C
+            )
+            + X(
+                value=0x3828736CDFC4C8696008F71999260329AD8B12287846FEDCEDE3BA1205B12729
+            )
+            + Y(
+                value=0x3E5141734E971A8D55015068D9B3666760F4608A49B11F92E500ACEA647978C7
             ),
             id="p256verify_wrong_endianness",
         ),
         pytest.param(
             p256verify_spec.Spec.P256VERIFY,
-            concatenate_parameters(
-                [
-                    "BB5A52F42F9C9261ED4361F59422A1E30036E7C32B270C8807A419FECA605023",
-                    "000000000000000000000000000000004319055358E8617B0C46353D039CDAAB",
-                    "FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC63254E",
-                    "0AD99500288D466940031D72A9F5445A4D43784640855BF0A69874D2DE5FE103",
-                    "C5011E6EF2C42DCD50D5D3D29F99AE6EBA2C80C9244F4C5422F0979FF0C3BA5E",
-                ]
+            H(
+                value=0xBB5A52F42F9C9261ED4361F59422A1E30036E7C32B270C8807A419FECA605023
+            )
+            + R(
+                value=0x000000000000000000000000000000004319055358E8617B0C46353D039CDAAB
+            )
+            + S(
+                value=0xFFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC63254E
+            )
+            + X(
+                value=0x0AD99500288D466940031D72A9F5445A4D43784640855BF0A69874D2DE5FE103
+            )
+            + Y(
+                value=0xC5011E6EF2C42DCD50D5D3D29F99AE6EBA2C80C9244F4C5422F0979FF0C3BA5E
             ),
             id="p256verify_modular_comp_x_coordinate_exceeds_n",
         ),
@@ -81,10 +94,133 @@ def test_p256verify(
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=Precompile.P256VERIFY,
         code_generator=JumpLoopGenerator(
             setup=Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE),
             attack_block=attack_block,
             tx_kwargs={"data": calldata},
         ),
     )
+
+
+@pytest.mark.repricing
+@pytest.mark.parametrize(
+    "precompile_address,calldata",
+    [
+        pytest.param(
+            p256verify_spec.Spec.P256VERIFY,
+            p256verify_spec.Spec.H0
+            + p256verify_spec.Spec.R0
+            + p256verify_spec.Spec.S0
+            + p256verify_spec.Spec.X0
+            + p256verify_spec.Spec.Y0,
+            id="p256verify",
+        ),
+    ],
+)
+def test_p256verify_uncachable(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    precompile_address: Address,
+    calldata: bytes,
+) -> None:
+    """Benchmark P256VERIFY with unique input per call."""
+    if precompile_address not in fork.precompiles():
+        pytest.skip("Precompile not enabled")
+
+    gsc = fork.gas_costs()
+    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+
+    precompile_cost = gsc.PRECOMPILE_P256VERIFY
+
+    # h: data[0:32] 32 bytes
+    # r: data[32:64] 32 bytes
+    # s: data[64:96] 32 bytes
+    # qx: data[96:128] 32 bytes
+    # qy: data[128:160] 32 bytes
+    attack_block = Op.MSTORE(
+        0,
+        Op.ADD(
+            Op.MLOAD(0),
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=precompile_address,
+                args_size=Op.CALLDATASIZE,
+                ret_offset=Op.CALLDATASIZE,
+                ret_size=0x20,
+                # gas accounting
+                address_warm=True,
+                inner_call_cost=precompile_cost,
+            ),
+        ),
+        # gas accounting
+        old_memory_size=160,
+        new_memory_size=160,
+    )
+
+    setup = Op.CALLDATACOPY(
+        0,
+        0,
+        Op.CALLDATASIZE,
+        # gas accounting
+        data_size=160,
+        old_memory_size=0,
+        new_memory_size=160,
+    )
+    setup_cost = setup.gas_cost(fork)
+
+    loop = WhileGas(
+        body=attack_block,
+        fork=fork,
+        extra_gas=precompile_cost,
+    )
+    code = setup + loop
+    attack_contract_address = pre.deploy_contract(code=code)
+
+    iteration_cost = loop.gas_cost(fork)
+
+    txs: list[Transaction] = []
+    remaining_gas = gas_benchmark_value
+    seed = 0
+    expected_opcode_count = 0
+    while remaining_gas > 0:
+        per_tx_gas = min(tx_gas_limit, remaining_gas)
+        h = int.from_bytes(calldata[:32], "big") + seed
+
+        tx_calldata = Bytes(
+            h.to_bytes(32, "big")  # hash
+            + calldata[32:]  # r, s, qx, qy
+        )
+
+        intrinsic = intrinsic_gas_calculator(
+            calldata=tx_calldata,
+            return_cost_deducted_prior_execution=True,
+        )
+        gas_for_loop = per_tx_gas - intrinsic - setup_cost
+        if gas_for_loop < iteration_cost:
+            break
+        expected_opcode_count += gas_for_loop // iteration_cost
+
+        txs.append(
+            Transaction(
+                to=attack_contract_address,
+                sender=pre.fund_eoa(),
+                gas_limit=per_tx_gas,
+                data=tx_calldata,
+            )
+        )
+        remaining_gas -= per_tx_gas
+        seed += 10000
+
+    assert len(txs) != 0, "No transactions were added to the test."
+
+    benchmark_test(
+        target_opcode=Precompile.P256VERIFY,
+        skip_gas_used_validation=True,
+        expected_receipt_status=1,
+        blocks=[Block(txs=txs)],
+        expected_opcode_count=expected_opcode_count,
+    )
diff --git a/tests/benchmark/compute/precompile/test_point_evaluation.py b/tests/benchmark/compute/precompile/test_point_evaluation.py
index 09e84499feb..e8ab7eac799 100644
--- a/tests/benchmark/compute/precompile/test_point_evaluation.py
+++ b/tests/benchmark/compute/precompile/test_point_evaluation.py
@@ -1,17 +1,28 @@
 """Benchmark POINT EVALUATION precompile."""
 
+import math
+
+import ckzg  # type: ignore
 import pytest
 from execution_testing import (
     Address,
+    Alloc,
     BenchmarkTestFiller,
+    Block,
+    Bytes,
     Fork,
     JumpLoopGenerator,
     Op,
+    Transaction,
+    While,
 )
+from execution_testing.test_types.blob_types import Blob
 
+from tests.benchmark.compute.helpers import Precompile
+from tests.cancun.eip4844_blobs.spec import PointEvaluationInput
 from tests.cancun.eip4844_blobs.spec import Spec as BlobsSpec
 
-from ..helpers import concatenate_parameters
+INPUT_SIZE = 192
 
 
 @pytest.mark.repricing
@@ -20,14 +31,21 @@
     [
         pytest.param(
             BlobsSpec.POINT_EVALUATION_PRECOMPILE_ADDRESS,
-            concatenate_parameters(
-                [
-                    "01E798154708FE7789429634053CBF9F99B619F9F084048927333FCE637F549B",
-                    "564C0A11A0F704F4FC3E8ACFE0F8245F0AD1347B378FBF96E206DA11A5D36306",
-                    "24D25032E67A7E6A4910DF5834B8FE70E6BCFEEAC0352434196BDF4B2485D5A1",
-                    "8F59A8D2A1A625A17F3FEA0FE5EB8C896DB3764F3185481BC22F91B4AAFFCCA25F26936857BC3A7C2539EA8EC3A952B7",
-                    "873033E038326E87ED3E1276FD140253FA08E9FC25FB2D9A98527FC22A2C9612FBEAFDAD446CBC7BCDBDCD780AF2C16A",
-                ]
+            PointEvaluationInput(
+                versioned_hash=bytes.fromhex(
+                    "01E798154708FE7789429634053CBF9F"
+                    "99B619F9F084048927333FCE637F549B"
+                ),
+                z=0x564C0A11A0F704F4FC3E8ACFE0F8245F0AD1347B378FBF96E206DA11A5D36306,
+                y=0x24D25032E67A7E6A4910DF5834B8FE70E6BCFEEAC0352434196BDF4B2485D5A1,
+                commitment=bytes.fromhex(
+                    "8F59A8D2A1A625A17F3FEA0FE5EB8C896DB3764F3185481BC22F91B4AAFFCCA2"
+                    "5F26936857BC3A7C2539EA8EC3A952B7"
+                ),
+                proof=bytes.fromhex(
+                    "873033E038326E87ED3E1276FD140253FA08E9FC25FB2D9A98527FC22A2C9612"
+                    "FBEAFDAD446CBC7BCDBDCD780AF2C16A"
+                ),
             ),
             id="point_evaluation",
         ),
@@ -45,15 +63,181 @@ def test_point_evaluation(
 
     attack_block = Op.POP(
         Op.STATICCALL(
-            gas=Op.GAS, address=precompile_address, args_size=Op.CALLDATASIZE
+            gas=Op.GAS,
+            address=precompile_address,
+            args_size=Op.CALLDATASIZE,
         ),
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=Precompile.POINT_EVALUATION,
         code_generator=JumpLoopGenerator(
             setup=Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE),
             attack_block=attack_block,
             tx_kwargs={"data": calldata},
         ),
     )
+
+
+def _generate_point_evaluation_input(
+    *,
+    blob_data: bytes,
+    commitment: bytes,
+    versioned_hash: bytes,
+    z: int,
+    trusted_setup: object,
+) -> bytes:
+    """Generate a valid 192-byte point evaluation precompile input."""
+    z_bytes = z.to_bytes(32, "big")
+    proof_bytes, y_bytes = ckzg.compute_kzg_proof(
+        blob_data, z_bytes, trusted_setup
+    )
+    return bytes(
+        PointEvaluationInput(
+            versioned_hash=versioned_hash,
+            z=z,
+            y=int.from_bytes(y_bytes, "big"),
+            commitment=commitment,
+            proof=proof_bytes,
+        )
+    )
+
+
+@pytest.mark.repricing
+@pytest.mark.parametrize(
+    "precompile_address",
+    [
+        pytest.param(
+            BlobsSpec.POINT_EVALUATION_PRECOMPILE_ADDRESS,
+            id="point_evaluation",
+        ),
+    ],
+)
+def test_point_evaluation_uncachable(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    precompile_address: Address,
+) -> None:
+    """Benchmark POINT EVALUATION with unique valid input per call."""
+    if precompile_address not in fork.precompiles():
+        pytest.skip("Precompile not enabled")
+
+    gsc = fork.gas_costs()
+    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+    mem_exp = fork.memory_expansion_gas_calculator()
+    precompile_cost = gsc.PRECOMPILE_POINT_EVALUATION
+
+    # Each iteration: STATICCALL point_evaluation at advancing calldata
+    # offset, then advance offset at MEM[CALLDATASIZE].
+    attack_block = Op.POP(
+        Op.STATICCALL(
+            gas=Op.GAS,
+            address=precompile_address,
+            args_offset=Op.MLOAD(Op.CALLDATASIZE),
+            args_size=INPUT_SIZE,
+            # gas accounting
+            address_warm=True,
+            inner_call_cost=precompile_cost,
+        ),
+    ) + Op.MSTORE(
+        Op.CALLDATASIZE,
+        Op.ADD(Op.MLOAD(Op.CALLDATASIZE), INPUT_SIZE),
+    )
+
+    setup = Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
+    loop = While(
+        body=attack_block,
+        condition=Op.GT(Op.CALLDATASIZE, Op.MLOAD(Op.CALLDATASIZE)),
+    )
+    code = setup + loop
+    attack_contract_address = pre.deploy_contract(code=code)
+
+    iteration_cost = loop.gas_cost(fork)
+    setup_cost = setup.gas_cost(fork)
+
+    # Conservative per-variant estimate: one iteration + calldata
+    # intrinsic + CALLDATACOPY copy and linear memory expansion.
+    words_per_variant = math.ceil(INPUT_SIZE / 32)
+    per_variant_gas = (
+        iteration_cost
+        + INPUT_SIZE * gsc.TX_DATA_TOKEN_FLOOR
+        + words_per_variant * (gsc.OPCODE_COPY_PER_WORD + gsc.MEMORY_PER_WORD)
+    )
+    empty_intrinsic = intrinsic_gas_calculator(
+        calldata=[], return_cost_deducted_prior_execution=True
+    )
+    fixed_overhead = empty_intrinsic + setup_cost + mem_exp(new_bytes=32)
+
+    # Generate valid point evaluation inputs from a blob, each
+    # with a unique evaluation point z.
+    blob = Blob.from_fork(fork, seed=0)
+    trusted_setup = Blob.trusted_setup()
+    versioned_hash = BlobsSpec.kzg_to_versioned_hash(blob.commitment)
+
+    seed_offset = 0
+    txs: list[Transaction] = []
+    remaining_gas = gas_benchmark_value
+    expected_opcode_count = 0
+
+    while remaining_gas > 0:
+        per_tx_gas = min(tx_gas_limit, remaining_gas)
+        per_tx_variants = max(
+            1, (per_tx_gas - fixed_overhead) // per_variant_gas
+        )
+
+        points = [
+            _generate_point_evaluation_input(
+                blob_data=blob.data,
+                commitment=blob.commitment,
+                versioned_hash=versioned_hash,
+                z=seed_offset + i + 1,
+                trusted_setup=trusted_setup,
+            )
+            for i in range(per_tx_variants)
+        ]
+        calldata = Bytes(b"".join(points))
+        while True:
+            execution_intrinsic = intrinsic_gas_calculator(
+                calldata=calldata,
+                return_cost_deducted_prior_execution=True,
+            )
+            gas_for_loop = (
+                per_tx_gas
+                - execution_intrinsic
+                - setup_cost
+                - math.ceil(len(calldata) / 32) * gsc.OPCODE_COPY_PER_WORD
+                - mem_exp(new_bytes=len(calldata) + 32)
+            )
+
+            if gas_for_loop >= per_tx_variants * iteration_cost:
+                break
+            per_tx_variants -= 1
+            if not per_tx_variants:
+                raise Exception("Unable to find correct variants.")
+            calldata = Bytes(b"".join(points[:per_tx_variants]))
+
+        expected_opcode_count += per_tx_variants
+
+        assert len(calldata) != 0, "No valid calldata found for test"
+
+        txs.append(
+            Transaction(
+                to=attack_contract_address,
+                sender=pre.fund_eoa(),
+                gas_limit=per_tx_gas,
+                data=calldata,
+            )
+        )
+        remaining_gas -= per_tx_gas
+        seed_offset += per_tx_variants
+    assert len(txs) != 0, "No transactions were added to the test."
+    benchmark_test(
+        target_opcode=Precompile.POINT_EVALUATION,
+        skip_gas_used_validation=True,
+        expected_receipt_status=1,
+        expected_opcode_count=expected_opcode_count,
+        blocks=[Block(txs=txs)],
+    )
diff --git a/tests/benchmark/compute/precompile/test_ripemd160.py b/tests/benchmark/compute/precompile/test_ripemd160.py
index 7f5601e8408..7527eb48f3e 100644
--- a/tests/benchmark/compute/precompile/test_ripemd160.py
+++ b/tests/benchmark/compute/precompile/test_ripemd160.py
@@ -1,14 +1,26 @@
 """Benchmark RIPEMD-160 precompile."""
 
+import math
+import random
+
 import pytest
 from execution_testing import (
+    Alloc,
     BenchmarkTestFiller,
+    Block,
+    Bytes,
     Fork,
     JumpLoopGenerator,
     Op,
+    Transaction,
+    WhileGas,
 )
 
-from ..helpers import calculate_optimal_input_length
+from tests.benchmark.compute.helpers import (
+    Precompile,
+    calculate_optimal_input_length,
+)
+from tests.frontier.precompiles.spec import Spec as PrecompilesSpec
 
 
 def test_ripemd160(
@@ -24,19 +36,24 @@ def test_ripemd160(
     optimal_input_length = calculate_optimal_input_length(
         available_gas=gas_available,
         fork=fork,
-        static_cost=gas_costs.GAS_PRECOMPILE_RIPEMD160_BASE,
-        per_word_dynamic_cost=gas_costs.GAS_PRECOMPILE_RIPEMD160_PER_WORD,
+        static_cost=gas_costs.PRECOMPILE_RIPEMD160_BASE,
+        per_word_dynamic_cost=gas_costs.PRECOMPILE_RIPEMD160_PER_WORD,
         bytes_per_unit_of_work=64,
     )
 
     attack_block = Op.POP(
         Op.STATICCALL(
-            Op.GAS, 0x03, Op.PUSH0, optimal_input_length, Op.PUSH0, Op.PUSH0
+            Op.GAS,
+            PrecompilesSpec.RIPEMD160,
+            Op.PUSH0,
+            optimal_input_length,
+            Op.PUSH0,
+            Op.PUSH0,
         )
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=Precompile.RIPEMD160,
         code_generator=JumpLoopGenerator(
             setup=Op.CODECOPY(0, 0, optimal_input_length),
             attack_block=attack_block,
@@ -45,18 +62,119 @@ def test_ripemd160(
 
 
 @pytest.mark.repricing
-@pytest.mark.parametrize("size", [0, 32, 256, 1024])
+@pytest.mark.parametrize("size", [0, 32, 64, 256, 1024])
 def test_ripemd160_fixed_size(
     benchmark_test: BenchmarkTestFiller, size: int
 ) -> None:
     """Benchmark RIPEMD160 with fixed size input."""
     attack_block = Op.POP(
-        Op.STATICCALL(Op.GAS, 0x03, Op.PUSH0, size, Op.PUSH0, Op.PUSH0)
+        Op.STATICCALL(
+            Op.GAS,
+            PrecompilesSpec.RIPEMD160,
+            Op.PUSH0,
+            size,
+            Op.PUSH0,
+            Op.PUSH0,
+        )
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=Precompile.RIPEMD160,
         code_generator=JumpLoopGenerator(
             setup=Op.CODECOPY(0, 0, size), attack_block=attack_block
         ),
     )
+
+
+@pytest.mark.repricing
+@pytest.mark.parametrize("size", [32, 64, 256, 1024])
+def test_ripemd160_uncachable(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    size: int,
+) -> None:
+    """Benchmark RIPEMD-160 with unique input per call."""
+    gsc = fork.gas_costs()
+    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+
+    precompile_cost = (
+        # static cost
+        gsc.PRECOMPILE_RIPEMD160_BASE
+        # dynamic cost
+        + math.ceil(size / 32) * gsc.PRECOMPILE_RIPEMD160_PER_WORD
+    )
+
+    attack_block = Op.POP(
+        Op.STATICCALL(
+            gas=Op.GAS,
+            address=PrecompilesSpec.RIPEMD160,
+            args_size=size,
+            ret_size=0x20,
+            # gas accounting
+            address_warm=True,
+            inner_call_cost=precompile_cost,
+        ),
+    )
+
+    setup = Op.CALLDATACOPY(
+        0,
+        0,
+        Op.CALLDATASIZE,
+        # gas accounting
+        data_size=size,
+        old_memory_size=0,
+        new_memory_size=size,
+    )
+
+    setup_cost = setup.gas_cost(fork)
+
+    loop = WhileGas(
+        body=attack_block,
+        fork=fork,
+        extra_gas=precompile_cost,
+    )
+    code = setup + loop
+    attack_contract_address = pre.deploy_contract(code=code)
+
+    iteration_cost = loop.gas_cost(fork)
+
+    txs: list[Transaction] = []
+    remaining_gas = gas_benchmark_value
+    rng = random.Random(42)
+    expected_opcode_count = 0
+
+    while remaining_gas > 0:
+        per_tx_gas = min(tx_gas_limit, remaining_gas)
+        calldata = Bytes(rng.randbytes(size))
+
+        intrinsic = intrinsic_gas_calculator(
+            calldata=calldata,
+            return_cost_deducted_prior_execution=True,
+        )
+        gas_for_loop = per_tx_gas - intrinsic - setup_cost
+        if gas_for_loop < iteration_cost:
+            break
+        expected_opcode_count += gas_for_loop // iteration_cost
+
+        txs.append(
+            Transaction(
+                to=attack_contract_address,
+                sender=pre.fund_eoa(),
+                gas_limit=per_tx_gas,
+                data=calldata,
+            )
+        )
+        remaining_gas -= per_tx_gas
+
+    assert len(txs) != 0, "No transactions were added to the test."
+
+    benchmark_test(
+        target_opcode=Precompile.RIPEMD160,
+        skip_gas_used_validation=True,
+        expected_receipt_status=1,
+        blocks=[Block(txs=txs)],
+        expected_opcode_count=expected_opcode_count,
+    )
diff --git a/tests/benchmark/compute/precompile/test_sha256.py b/tests/benchmark/compute/precompile/test_sha256.py
index 7aa11e9c81e..2960fae90b4 100644
--- a/tests/benchmark/compute/precompile/test_sha256.py
+++ b/tests/benchmark/compute/precompile/test_sha256.py
@@ -1,14 +1,26 @@
 """Benchmark SHA256 precompile."""
 
+import math
+import random
+
 import pytest
 from execution_testing import (
+    Alloc,
     BenchmarkTestFiller,
+    Block,
+    Bytes,
     Fork,
     JumpLoopGenerator,
     Op,
+    Transaction,
+    WhileGas,
 )
 
-from ..helpers import calculate_optimal_input_length
+from tests.benchmark.compute.helpers import (
+    Precompile,
+    calculate_optimal_input_length,
+)
+from tests.frontier.precompiles.spec import Spec as PrecompilesSpec
 
 
 def test_sha256(
@@ -24,19 +36,24 @@ def test_sha256(
     optimal_input_length = calculate_optimal_input_length(
         available_gas=gas_available,
         fork=fork,
-        static_cost=gas_costs.GAS_PRECOMPILE_SHA256_BASE,
-        per_word_dynamic_cost=gas_costs.GAS_PRECOMPILE_SHA256_PER_WORD,
+        static_cost=gas_costs.PRECOMPILE_SHA256_BASE,
+        per_word_dynamic_cost=gas_costs.PRECOMPILE_SHA256_PER_WORD,
         bytes_per_unit_of_work=64,
     )
 
     attack_block = Op.POP(
         Op.STATICCALL(
-            Op.GAS, 0x02, Op.PUSH0, optimal_input_length, Op.PUSH0, Op.PUSH0
+            Op.GAS,
+            PrecompilesSpec.SHA256,
+            Op.PUSH0,
+            optimal_input_length,
+            Op.PUSH0,
+            Op.PUSH0,
         )
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=Precompile.SHA256,
         code_generator=JumpLoopGenerator(
             setup=Op.CODECOPY(0, 0, optimal_input_length),
             attack_block=attack_block,
@@ -45,18 +62,117 @@ def test_sha256(
 
 
 @pytest.mark.repricing
-@pytest.mark.parametrize("size", [0, 32, 256, 1024])
+@pytest.mark.parametrize("size", [0, 32, 64, 256, 1024])
 def test_sha256_fixed_size(
     benchmark_test: BenchmarkTestFiller, size: int
 ) -> None:
     """Benchmark SHA256 with fixed size input."""
     attack_block = Op.POP(
-        Op.STATICCALL(Op.GAS, 0x02, Op.PUSH0, size, Op.PUSH0, Op.PUSH0)
+        Op.STATICCALL(
+            Op.GAS,
+            PrecompilesSpec.SHA256,
+            Op.PUSH0,
+            size,
+            Op.PUSH0,
+            Op.PUSH0,
+        )
     )
 
     benchmark_test(
-        target_opcode=Op.STATICCALL,
+        target_opcode=Precompile.SHA256,
         code_generator=JumpLoopGenerator(
             setup=Op.CODECOPY(0, 0, size), attack_block=attack_block
         ),
     )
+
+
+@pytest.mark.repricing
+@pytest.mark.parametrize("size", [32, 64, 256, 1024])
+def test_sha256_uncachable(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    size: int,
+) -> None:
+    """Benchmark SHA256 with unique input per call."""
+    gsc = fork.gas_costs()
+    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+
+    precompile_cost = (
+        # static cost
+        gsc.PRECOMPILE_SHA256_BASE
+        # dynamic cost
+        + math.ceil(size / 32) * gsc.PRECOMPILE_SHA256_PER_WORD
+    )
+    attack_block = Op.POP(
+        Op.STATICCALL(
+            gas=Op.GAS,
+            address=PrecompilesSpec.SHA256,
+            args_size=size,
+            ret_size=0x20,
+            # gas accounting
+            address_warm=True,
+            inner_call_cost=precompile_cost,
+        ),
+    )
+
+    setup = Op.CALLDATACOPY(
+        0,
+        0,
+        Op.CALLDATASIZE,
+        # gas accounting
+        data_size=size,
+        old_memory_size=0,
+        new_memory_size=size,
+    )
+    setup_cost = setup.gas_cost(fork)
+
+    loop = WhileGas(
+        body=attack_block,
+        fork=fork,
+        extra_gas=precompile_cost,
+    )
+    code = setup + loop
+    attack_contract_address = pre.deploy_contract(code=code)
+
+    iteration_cost = loop.gas_cost(fork)
+
+    txs: list[Transaction] = []
+    remaining_gas = gas_benchmark_value
+    rng = random.Random(42)
+    expected_opcode_count = 0
+
+    while remaining_gas > 0:
+        per_tx_gas = min(tx_gas_limit, remaining_gas)
+        calldata = Bytes(rng.randbytes(size))
+
+        intrinsic = intrinsic_gas_calculator(
+            calldata=calldata,
+            return_cost_deducted_prior_execution=True,
+        )
+        gas_for_loop = per_tx_gas - intrinsic - setup_cost
+        if gas_for_loop < iteration_cost:
+            break
+        expected_opcode_count += gas_for_loop // iteration_cost
+
+        txs.append(
+            Transaction(
+                to=attack_contract_address,
+                sender=pre.fund_eoa(),
+                gas_limit=per_tx_gas,
+                data=calldata,
+            )
+        )
+        remaining_gas -= per_tx_gas
+
+    assert len(txs) != 0, "No transactions were added to the test."
+
+    benchmark_test(
+        target_opcode=Precompile.SHA256,
+        skip_gas_used_validation=True,
+        expected_receipt_status=1,
+        blocks=[Block(txs=txs)],
+        expected_opcode_count=expected_opcode_count,
+    )
diff --git a/tests/benchmark/compute/scenario/test_transaction_types.py b/tests/benchmark/compute/scenario/test_transaction_types.py
index 8ee1ed6546b..5d4c3d1b002 100644
--- a/tests/benchmark/compute/scenario/test_transaction_types.py
+++ b/tests/benchmark/compute/scenario/test_transaction_types.py
@@ -268,13 +268,13 @@ def test_ether_transfers_to_precompile(
 @pytest.fixture
 def total_cost_floor_per_token(fork: Fork) -> int:
     """Total cost floor per token (EIP-7623)."""
-    return fork.gas_costs().GAS_TX_DATA_TOKEN_FLOOR
+    return fork.gas_costs().TX_DATA_TOKEN_FLOOR
 
 
 @pytest.fixture
 def total_cost_standard_per_token(fork: Fork) -> int:
     """Standard cost per token (EIP-7623)."""
-    return fork.gas_costs().GAS_TX_DATA_TOKEN_STANDARD
+    return fork.gas_costs().TX_DATA_TOKEN_STANDARD
 
 
 def calldata_generator(
@@ -286,11 +286,11 @@ def calldata_generator(
     # Gas cost calculation based on EIP-7683: (https://eips.ethereum.org/EIPS/eip-7683)
     #
     #   tx.gasUsed = 21000 + max(
-    #       GAS_TX_DATA_TOKEN_STANDARD * tokens_in_calldata
+    #       TX_DATA_TOKEN_STANDARD * tokens_in_calldata
     #       + execution_gas_used
     #       + isContractCreation * (32000 +
     #                                 INITCODE_WORD_COST * words(calldata)),
-    #       GAS_TX_DATA_TOKEN_FLOOR * tokens_in_calldata)
+    #       TX_DATA_TOKEN_FLOOR * tokens_in_calldata)
     #
     # Simplified in this test case:
     # - No execution gas used (no opcodes are executed)
@@ -298,10 +298,10 @@ def calldata_generator(
     #
     # Therefore:
     #   max_token_cost =
-    #       max(GAS_TX_DATA_TOKEN_STANDARD, GAS_TX_DATA_TOKEN_FLOOR)
+    #       max(TX_DATA_TOKEN_STANDARD, TX_DATA_TOKEN_FLOOR)
     #   tx.gasUsed = 21000 + tokens_in_calldata * max_token_cost
     #
-    # Since max(GAS_TX_DATA_TOKEN_STANDARD, GAS_TX_DATA_TOKEN_FLOOR) = 10:
+    # Since max(TX_DATA_TOKEN_STANDARD, TX_DATA_TOKEN_FLOOR) = 10:
     #   tx.gasUsed = 21000 + tokens_in_calldata * 10
     #
     # Token accounting:
@@ -421,8 +421,8 @@ def test_block_full_access_list_and_data(
 
         # Access list gas costs from fork's gas_costs
         gas_costs = fork.gas_costs()
-        gas_per_address = gas_costs.GAS_TX_ACCESS_LIST_ADDRESS
-        gas_per_storage_key = gas_costs.GAS_TX_ACCESS_LIST_STORAGE_KEY
+        gas_per_address = gas_costs.TX_ACCESS_LIST_ADDRESS
+        gas_per_storage_key = gas_costs.TX_ACCESS_LIST_STORAGE_KEY
 
         # Calculate number of storage keys we can fit
         gas_after_address = gas_for_access_list - gas_per_address
@@ -594,7 +594,7 @@ def test_auth_transaction(
             total_refund += min(
                 tx_gas_used // 5,
                 (
-                    gas_costs.GAS_AUTH_PER_EMPTY_ACCOUNT
+                    gas_costs.AUTH_PER_EMPTY_ACCOUNT
                     - gas_costs.REFUND_AUTH_PER_EXISTING_ACCOUNT
                 )
                 * auths_in_this_tx,
@@ -612,11 +612,18 @@ def test_auth_transaction(
             )
         )
 
+    # EIP-7778: refunds no longer reduce block-level gas accounting
+    expected_gas_usage = (
+        total_gas_used
+        if fork.is_eip_enabled(7778)
+        else total_gas_used - total_refund
+    )
+
     benchmark_test(
         pre=pre,
         post={},
         blocks=[Block(txs=txs)],
-        expected_benchmark_gas_used=total_gas_used - total_refund,
+        expected_benchmark_gas_used=expected_gas_usage,
     )
 
 
diff --git a/tests/benchmark/conftest.py b/tests/benchmark/conftest.py
index 462e65035af..5a4643e2e38 100755
--- a/tests/benchmark/conftest.py
+++ b/tests/benchmark/conftest.py
@@ -5,14 +5,19 @@
 
 import pytest
 from execution_testing import Fork
+from execution_testing.cli.pytest_commands.plugins.shared.address_stubs import (  # noqa: E501
+    AddressStubs,
+)
 
 DEFAULT_BENCHMARK_FORK = "Prague"
 
 
 def pytest_generate_tests(metafunc: Any) -> None:
     """
-    Modify test generation to enforce default benchmark fork for benchmark
-    tests.
+    Modify test generation for benchmark tests.
+
+    Enforce default benchmark fork and inject stub parametrization
+    for tests marked with ``@pytest.mark.stub_parametrize``.
     """
     benchmark_dir = Path(__file__).parent
     test_file_path = Path(metafunc.definition.fspath)
@@ -31,60 +36,46 @@ def pytest_generate_tests(metafunc: Any) -> None:
             benchmark_marker = pytest.mark.valid_from(DEFAULT_BENCHMARK_FORK)
             metafunc.definition.add_marker(benchmark_marker)
 
+    # Inject parametrization from AddressStubs for stub_parametrize markers
+    address_stubs = metafunc.config.getoption("address_stubs", default=None)
+    require_stub_match = getattr(metafunc.config, "require_stub_match", False)
+    for marker in metafunc.definition.iter_markers("stub_parametrize"):
+        param_name, prefix = marker.args
+        kwargs = dict(marker.kwargs)
+        stubs = address_stubs or AddressStubs(root={})
+        values, ids = stubs.parametrize_args(
+            prefix, caller=metafunc.function.__name__
+        )
+        if not values and require_stub_match:
+            # Sentinel + marker: plugin's pytest_runtest_call fails this
+            # FAILED (not session-aborting ERROR) so the run continues.
+            msg = (
+                f"stub_parametrize: no stubs matched prefix {prefix!r} "
+                f"for {metafunc.definition.nodeid}. Pass --address-stubs "
+                "pointing at a snapshot (bloatnet, perfnet, ...) that has "
+                "these addresses pre-populated, or deselect the test."
+            )
+            values = [pytest.param(None, marks=pytest.mark.missing_stubs(msg))]
+            ids = ["MISSING_STUBS"]
+        kwargs.setdefault("ids", ids)
+        metafunc.parametrize(param_name, values, **kwargs)
+
+
+def pytest_ignore_collect(collection_path: Path, config: Any) -> bool | None:
+    """Skip benchmark directory unless explicitly targeted."""
+    if config.getoption("include_benchmark", default=False):
+        return False
 
-def pytest_collection_modifyitems(config: Any, items: Any) -> None:
-    """Add the `benchmark` marker to all tests under `./tests/benchmark`."""
     benchmark_dir = Path(__file__).parent
-    benchmark_marker = pytest.mark.benchmark
-    gen_docs = config.getoption("--gen-docs", default=False)
-
-    if gen_docs:
-        for item in items:
-            if (
-                benchmark_dir in Path(item.fspath).parents
-                and not item.get_closest_marker("benchmark")
-                and not item.get_closest_marker("stateful")
-            ):
-                item.add_marker(benchmark_marker)
-        return
-
-    marker_expr = config.getoption("-m", default="")
-
-    run_benchmarks = (
-        "benchmark" in marker_expr and "not benchmark" not in marker_expr
-    ) or ("repricing" in marker_expr and "not repricing" not in marker_expr)
-    run_stateful_tests = (
-        marker_expr
-        and "stateful" in marker_expr
-        and "not stateful" not in marker_expr
-    )
-
-    items_for_removal = []
-    for i, item in enumerate(items):
-        is_in_benchmark_dir = benchmark_dir in Path(item.fspath).parents
-        has_stateful_marker = item.get_closest_marker("stateful")
-        is_benchmark_test = (
-            is_in_benchmark_dir and not has_stateful_marker
-        ) or item.get_closest_marker("benchmark")
-
-        if is_benchmark_test:
-            if is_in_benchmark_dir and not item.get_closest_marker(
-                "benchmark"
-            ):
-                item.add_marker(benchmark_marker)
-            if not run_benchmarks:
-                items_for_removal.append(i)
-        elif run_benchmarks:
-            items_for_removal.append(i)
-        elif (
-            is_in_benchmark_dir
-            and has_stateful_marker
-            and not run_stateful_tests
-        ):
-            items_for_removal.append(i)
-
-    for i in reversed(items_for_removal):
-        items.pop(i)
+    args = config.invocation_params.args or ()
+    if any(
+        benchmark_dir in Path(a).resolve().parents
+        or Path(a).resolve() == benchmark_dir
+        for a in args
+    ):
+        return False
+
+    return True
 
 
 @pytest.fixture
diff --git a/tests/benchmark/stateful/bloatnet/depth_benchmarks/README.md b/tests/benchmark/stateful/bloatnet/depth_benchmarks/README.md
index e2f009c1167..a0075d0e02f 100644
--- a/tests/benchmark/stateful/bloatnet/depth_benchmarks/README.md
+++ b/tests/benchmark/stateful/bloatnet/depth_benchmarks/README.md
@@ -54,7 +54,6 @@ export RPC_CHAIN_ID=<RPC chain ID>
 uv run execute remote \
   --gas-benchmark-values 60 \
   --fork Prague \
-  -m stateful \
   tests/benchmark/stateful/bloatnet/depth_benchmarks/test_deep_branch.py
 ```
 
diff --git a/tests/benchmark/stateful/bloatnet/depth_benchmarks/test_deep_branch.py b/tests/benchmark/stateful/bloatnet/depth_benchmarks/test_deep_branch.py
index b4d3fabc6d1..07f94e8d9be 100644
--- a/tests/benchmark/stateful/bloatnet/depth_benchmarks/test_deep_branch.py
+++ b/tests/benchmark/stateful/bloatnet/depth_benchmarks/test_deep_branch.py
@@ -1,5 +1,5 @@
 """
-abstract: BloatNet worst-case attack benchmark for maximum SSTORE stress.
+abstract: BloatNet worst-case depth benchmarks for deep SSTORE and SLOAD.
 
 This test implements a worst-case scenario for Ethereum block processing
 that exploits the computational complexity of Patricia Merkle Trie
@@ -7,11 +7,12 @@
 with shared prefixes, maximizing trie traversal depth.
 
 Key features:
-- Attacks pre-deployed contracts via CREATE2 address derivation
+- Accesses pre-deployed contracts via CREATE2 address derivation
 - Each contract has deep storage slots with configurable trie depth
-- Executes optimized attack bytecode with multiple SSTORE operations
+- Includes both a mutating `attack(uint256)` benchmark and a read-only
+  `getDeepest()` benchmark
 - Respects Fusaka tx gas limit (16M gas) and fills blocks fully
-- Verifies attack success via a storage check in each of the attack contracts
+- Verifies correctness via post-state checks or receipt-status validation
 
 Test parameters:
 - storage_depth: Depth of storage slots (e.g., 10, 11)
@@ -44,6 +45,7 @@
     TransactionWithCost,
     While,
 )
+from execution_testing.base_types import StorageRootType
 from pydantic import BaseModel, BeforeValidator, Field
 
 # Folder path to the submodule and mined assets
@@ -53,6 +55,27 @@
 # Arbitrary value written to storage slots during attack
 DEFAULT_ATTACK_VALUE = 42
 
+# ABI selectors for the mined contracts
+ATTACK_SELECTOR = Hash(bytes.fromhex("64dd891a"), right_padding=True)
+GET_DEEPEST_SELECTOR = Hash(bytes.fromhex("d9339cc3"), right_padding=True)
+
+# From .worst_case_miner/mined_assets
+DEPTH_BENCHMARK_CASES = [
+    (10, 3),
+    (10, 4),
+    (10, 5),
+    (10, 6),
+    (10, 7),
+    (11, 3),
+    (11, 4),
+    (11, 5),
+    (11, 6),
+    (11, 7),
+    (12, 3),
+    (12, 4),
+    (12, 5),
+]
+
 
 def get_mined_asset(filename: str) -> str:
     """
@@ -156,71 +179,100 @@ def attack_value(request: pytest.FixtureRequest) -> int:
     However during execute we should use a random value to guarantee the
     storage update that's required for the attack.
     """
-    if request.config.pluginmanager.has_plugin(
-        "execution_testing.cli.pytest_commands.plugins.execute.execute"
-    ):
+    if is_execute_mode(request):
         return int(time.time())
     return DEFAULT_ATTACK_VALUE
 
 
-@pytest.mark.valid_from("Prague")
-@pytest.mark.parametrize(
-    "storage_depth,account_depth",
-    [
-        # From .worst_case_miner/mined_assets
-        (10, 3),
-        (10, 4),
-        (10, 5),
-        (10, 6),
-        (10, 7),
-        (11, 3),
-        (11, 4),
-        (11, 5),
-        (11, 6),
-        (11, 7),
-        (12, 3),
-        (12, 4),
-        (12, 5),
-    ],
-)
-def test_worst_depth_stateroot_recomp(
-    benchmark_test: BenchmarkTestFiller,
-    fork: Fork,
+def is_execute_mode(request: pytest.FixtureRequest) -> bool:
+    """
+    Return ``True`` when the test is running through the execute plugin.
+    """
+    return request.config.pluginmanager.has_plugin(
+        "execution_testing.cli.pytest_commands.plugins.execute.execute"
+    )
+
+
+def get_factory_address(fork: Fork) -> Address:
+    """
+    Return the deterministic deployment factory for the fork.
+    """
+    return (
+        fork.deterministic_factory_predeploy_address()
+        or DETERMINISTIC_FACTORY_ADDRESS
+    )
+
+
+def deploy_required_mined_contracts(
+    *,
     pre: Alloc,
-    gas_benchmark_value: int,
+    mined_contract_file: MinedContractFile,
+    contracts_required: int,
     storage_depth: int,
     account_depth: int,
-    attack_value: int,
-) -> None:
+    attacked_storage_value: int | None = None,
+) -> Alloc:
     """
-    BloatNet worst-case SSTORE attack benchmark with pre-deployed contracts.
+    Deploy the required set of mined contracts and their auxiliary accounts.
 
-    This test:
-    1. Derives CREATE2 addresses from initcode_hash + Nick's deployer
-    2. Deploys AttackOrchestrator that calls attack() on each target
-    3. Fills blocks with 16M gas transactions attacking contracts
-    4. Adds a verification transaction at the end to confirm success
+    When ``attacked_storage_value`` is provided, return the post-state
+    assertions for the deepest slot update. Otherwise, return an empty post.
+    """
+    if contracts_required > mined_contract_file.num_contracts:
+        raise RuntimeError(
+            "Depth benchmark requires more mined contracts than available for "
+            f"(storage_depth={storage_depth}, account_depth={account_depth}): "
+            f"required {contracts_required}, available "
+            f"{mined_contract_file.num_contracts}."
+        )
 
-    Args:
-        benchmark_test: The benchmark test filler
-        fork: The fork to test on
-        pre: Pre-state allocation
-        gas_benchmark_value: Gas budget for benchmark
-        storage_depth: Depth of storage slots in the contract (e.g., 9)
-        account_depth: Depth of account address prefix sharing (e.g., 5)
-        attack_value: The value to be written to storage in each attack
+    post = Alloc({})
+    for salt in range(contracts_required):
+        salted_contract_info = mined_contract_file.contracts[salt]
+        assert salted_contract_info.salt == salt, (
+            f"Salt out of order: {salted_contract_info.salt} != {salt}"
+        )
 
-    """
-    # Load the mined contract file
-    mined_contract_file = MinedContractFile.load(storage_depth, account_depth)
+        storage: StorageRootType = dict.fromkeys(
+            mined_contract_file.storage_keys, 1
+        )
+        deployed_contract_address = pre.deterministic_deploy_contract(
+            deploy_code=mined_contract_file.deploy_code,
+            salt=Hash(salt),
+            initcode=mined_contract_file.initcode,
+            storage=storage,
+        )
+        assert (
+            deployed_contract_address == salted_contract_info.contract_address
+        ), (
+            f"Contract address mismatch: {deployed_contract_address} != "
+            f"{salted_contract_info.contract_address}, salt: {salt}"
+        )
 
-    # Generate the attack orchestrator
-    factory_address = (
-        fork.deterministic_factory_predeploy_address()
-        or DETERMINISTIC_FACTORY_ADDRESS
-    )
+        for auxiliary_account in salted_contract_info.auxiliary_accounts:
+            # Ensure the account exists in the state trie
+            pre.fund_address(
+                address=auxiliary_account, amount=1, minimum_balance=True
+            )
+
+        if attacked_storage_value is not None:
+            attacked_storage = storage.copy()
+            attacked_storage[mined_contract_file.storage_keys[-1]] = (
+                attacked_storage_value
+            )
+            post[salted_contract_info.contract_address] = Account(
+                storage=attacked_storage
+            )
 
-    # Prepare attack contract
+    return post
+
+
+def build_attack_orchestrator_bytecode(
+    factory_address: Address,
+) -> IteratingBytecode:
+    """
+    Build the mutating orchestrator that calls ``attack(uint256)``.
+    """
     create2_preimage = Create2PreimageLayout(
         factory_address=factory_address,
         salt=Op.CALLDATALOAD(32),
@@ -232,7 +284,7 @@ def test_worst_depth_stateroot_recomp(
         # Place ABI (`attack(uint256)`) in memory
         + Op.MSTORE(
             args_offset,
-            Hash(bytes.fromhex("64dd891a"), right_padding=True),
+            ATTACK_SELECTOR,
             old_memory_size=args_offset,
             new_memory_size=args_offset + 32,
         )
@@ -297,13 +349,177 @@ def test_worst_depth_stateroot_recomp(
         + Op.SWAP1 * 2
     )
 
-    attack_orchestrator_bytecode = IteratingBytecode(
+    return IteratingBytecode(
         setup=setup,
         iterating=iterating,
         cleanup=cleanup,
         iterating_subcall=inner_call_bytecode,
     )
 
+
+def build_get_deepest_orchestrator_bytecode(
+    factory_address: Address,
+    *,
+    exact_expected_value: bool,
+) -> IteratingBytecode:
+    """
+    Build the read-only orchestrator that calls ``getDeepest()``.
+    """
+    create2_preimage = Create2PreimageLayout(
+        factory_address=factory_address,
+        salt=Op.CALLDATALOAD(0),
+        init_code_hash=Op.CALLDATALOAD(64),
+    )
+    args_offset = 96
+    return_offset = 128
+    success_offset = 160
+    setup_memory_size = 192
+    setup: Bytecode = (
+        create2_preimage
+        + Op.MSTORE(
+            args_offset,
+            GET_DEEPEST_SELECTOR,
+            old_memory_size=args_offset,
+            new_memory_size=args_offset + 32,
+        )
+        + Op.MSTORE(
+            success_offset,
+            0,
+            old_memory_size=args_offset + 32,
+            new_memory_size=setup_memory_size,
+        )
+        + Op.CALLDATALOAD(32)
+    )
+    return_value_check = (
+        Op.EQ(Op.MLOAD(return_offset), 1)
+        if exact_expected_value
+        else Op.ISZERO(Op.ISZERO(Op.MLOAD(return_offset)))
+    )
+
+    def assert_with_invalid(condition: Bytecode | Op) -> Bytecode:
+        """
+        Jump over ``INVALID`` when the invariant holds.
+        """
+        return (
+            # PC pushes its own offset; +3 accounts for the
+            # remaining push encoding + ADD + JUMPI bytes that
+            # follow PC, and len(Op.INVALID) accounts for the
+            # INVALID byte to skip over, landing on JUMPDEST.
+            Op.JUMPI(Op.ADD(Op.PC, len(Op.INVALID) + 3), condition)
+            + Op.INVALID
+            + Op.JUMPDEST
+        )
+
+    iterating = While(
+        body=(
+            Op.MSTORE(
+                success_offset,
+                Op.STATICCALL(
+                    address=create2_preimage.address_op(),
+                    args_offset=args_offset,
+                    args_size=4,
+                    ret_offset=return_offset,
+                    ret_size=32,
+                    old_memory_size=setup_memory_size,
+                    new_memory_size=setup_memory_size,
+                ),
+                old_memory_size=setup_memory_size,
+                new_memory_size=setup_memory_size,
+            )
+            # ``Bytecode.gas_cost()`` is path-insensitive, so ``Conditional``
+            # would charge the untaken failure branch and its extra jump
+            # scaffolding. This manual branch keeps that overhead minimal,
+            # and uses ``INVALID`` as the cheapest terminating failure path.
+            + assert_with_invalid(
+                condition=Op.AND(
+                    Op.AND(
+                        Op.MLOAD(success_offset),
+                        Op.EQ(Op.RETURNDATASIZE, 32),
+                    ),
+                    return_value_check,
+                )
+            )
+            + create2_preimage.increment_salt_op()
+        ),
+        condition=Op.LT(
+            Op.MLOAD(create2_preimage.salt_offset),
+            Op.DUP1,
+        ),
+    )
+
+    # Gas accounting model for the Solidity dispatch path and getDeepest body.
+    # PUSH/DUP/SWAP variants are collapsed into gas-equivalent representatives.
+    inner_call_bytecode = (
+        Op.MSTORE(new_memory_size=96)
+        + Op.CALLVALUE
+        + Op.DUP1 * 9
+        + Op.ISZERO
+        + Op.JUMPI * 8
+        + Op.JUMPDEST * 4
+        + Op.POP
+        + Op.CALLDATASIZE
+        + Op.LT
+        + Op.PUSH0
+        + Op.CALLDATALOAD
+        + Op.SHR
+        + Op.GT
+        + Op.EQ * 5
+        + Op.PUSH1 * 24
+        + Op.SLOAD(key_warm=False)
+        + Op.JUMP * 2
+        + Op.MLOAD * 2
+        + Op.SWAP1 * 3
+        + Op.MSTORE(old_memory_size=96, new_memory_size=160)
+        + Op.ADD
+        + Op.SUB
+        + Op.RETURN
+    )
+
+    return IteratingBytecode(
+        setup=setup,
+        iterating=iterating,
+        cleanup=Op.STOP,
+        iterating_subcall=inner_call_bytecode,
+    )
+
+
+@pytest.mark.parametrize(
+    "storage_depth,account_depth",
+    DEPTH_BENCHMARK_CASES,
+)
+def test_worst_depth_stateroot_recomp(
+    benchmark_test: BenchmarkTestFiller,
+    fork: Fork,
+    pre: Alloc,
+    gas_benchmark_value: int,
+    storage_depth: int,
+    account_depth: int,
+    attack_value: int,
+) -> None:
+    """
+    BloatNet worst-case SSTORE attack benchmark with pre-deployed contracts.
+
+    This test:
+    1. Derives CREATE2 addresses from initcode_hash + Nick's deployer
+    2. Deploys AttackOrchestrator that calls attack() on each target
+    3. Fills blocks with 16M gas transactions attacking contracts
+    4. Verifies the deepest-slot update through post-state assertions
+
+    Args:
+        benchmark_test: The benchmark test filler
+        fork: The fork to test on
+        pre: Pre-state allocation
+        gas_benchmark_value: Gas budget for benchmark
+        storage_depth: Depth of storage slots in the contract (e.g., 9)
+        account_depth: Depth of account address prefix sharing (e.g., 5)
+        attack_value: The value to be written to storage in each attack
+
+    """
+    mined_contract_file = MinedContractFile.load(storage_depth, account_depth)
+    attack_orchestrator_bytecode = build_attack_orchestrator_bytecode(
+        get_factory_address(fork)
+    )
+
     # Deploy orchestrator to deterministic address
     attack_orchestrator_address = pre.deterministic_deploy_contract(
         deploy_code=attack_orchestrator_bytecode
@@ -330,40 +546,14 @@ def calldata(iteration_count: int, start_iteration: int) -> bytes:
         )
     )
 
-    # Deploy all contracts required.
-    post = Alloc({})
-    for salt in range(contracts_required):
-        if salt >= len(mined_contract_file.contracts):
-            raise RuntimeError(
-                f"Requested salt {salt} but only "
-                f"{len(mined_contract_file.contracts)} available"
-            )
-        salted_contract_info = mined_contract_file.contracts[salt]
-        assert salted_contract_info.salt == salt, (
-            f"Salt out of order: {salted_contract_info.salt} != {salt}"
-        )
-        deployed_contract_address = pre.deterministic_deploy_contract(
-            deploy_code=mined_contract_file.deploy_code,
-            salt=Hash(salt),
-            initcode=mined_contract_file.initcode,
-            storage=dict.fromkeys(mined_contract_file.storage_keys, 1),
-        )
-        assert (
-            deployed_contract_address == salted_contract_info.contract_address
-        ), (
-            f"Contract address mismatch: {deployed_contract_address} != "
-            f"{salted_contract_info.contract_address}, salt: {salt}"
-        )
-        for auxiliary_account in salted_contract_info.auxiliary_accounts:
-            # Ensure the account exists in the state trie
-            pre.fund_address(
-                address=auxiliary_account, amount=1, minimum_balance=True
-            )
-
-        # Set the post expectations
-        storage = dict.fromkeys(mined_contract_file.storage_keys, 1)
-        storage[mined_contract_file.storage_keys[-1]] = attack_value
-        post[salted_contract_info.contract_address] = Account(storage=storage)
+    post = deploy_required_mined_contracts(
+        pre=pre,
+        mined_contract_file=mined_contract_file,
+        contracts_required=contracts_required,
+        storage_depth=storage_depth,
+        account_depth=account_depth,
+        attacked_storage_value=attack_value,
+    )
 
     # Create an EOA with funds for the deployer
     sender = pre.fund_eoa()
@@ -388,3 +578,86 @@ def calldata(iteration_count: int, start_iteration: int) -> bytes:
         post=post,
         expected_benchmark_gas_used=total_gas_cost,
     )
+
+
+@pytest.mark.parametrize(
+    "storage_depth,account_depth",
+    DEPTH_BENCHMARK_CASES,
+)
+def test_worst_depth_get_deepest(
+    benchmark_test: BenchmarkTestFiller,
+    fork: Fork,
+    pre: Alloc,
+    request: pytest.FixtureRequest,
+    gas_benchmark_value: int,
+    storage_depth: int,
+    account_depth: int,
+) -> None:
+    """
+    BloatNet worst-case SLOAD benchmark with deep CREATE2-derived contracts.
+
+    This benchmark calls ``getDeepest()`` on pre-mined contracts and validates
+    inside the orchestrator that every call succeeds and returns the expected
+    value. Fill mode requires the exact constructor-initialized value ``1``,
+    while execute mode only requires a non-zero value to tolerate reused
+    deterministic deployments on a dirty chain.
+    """
+    mined_contract_file = MinedContractFile.load(storage_depth, account_depth)
+    exact_expected_value = not is_execute_mode(request)
+    get_deepest_orchestrator_bytecode = (
+        build_get_deepest_orchestrator_bytecode(
+            get_factory_address(fork),
+            exact_expected_value=exact_expected_value,
+        )
+    )
+
+    orchestrator_address = pre.deterministic_deploy_contract(
+        deploy_code=get_deepest_orchestrator_bytecode
+    )
+    print(f"  Read orchestrator will be deployed at: {orchestrator_address}")
+
+    def calldata(iteration_count: int, start_iteration: int) -> bytes:
+        end_iteration = start_iteration + iteration_count
+        return (
+            Hash(start_iteration)
+            + Hash(end_iteration)
+            + mined_contract_file.initcode_hash
+        )
+
+    contracts_required = sum(
+        get_deepest_orchestrator_bytecode.tx_iterations_by_gas_limit(
+            fork=fork,
+            gas_limit=gas_benchmark_value,
+            start_iteration=0,
+            calldata=calldata,
+        )
+    )
+
+    deploy_required_mined_contracts(
+        pre=pre,
+        mined_contract_file=mined_contract_file,
+        contracts_required=contracts_required,
+        storage_depth=storage_depth,
+        account_depth=account_depth,
+    )
+
+    sender = pre.fund_eoa()
+    read_txs: list[TransactionWithCost] = list(
+        get_deepest_orchestrator_bytecode.transactions_by_gas_limit(
+            fork=fork,
+            gas_limit=gas_benchmark_value,
+            start_iteration=0,
+            sender=sender,
+            to=orchestrator_address,
+            calldata=calldata,
+        )
+    )
+
+    total_gas_cost = sum(tx.gas_cost for tx in read_txs)
+
+    benchmark_test(
+        pre=pre,
+        blocks=[Block(txs=read_txs)],
+        expected_benchmark_gas_used=total_gas_cost,
+        expected_receipt_status=1,
+    )
diff --git a/tests/benchmark/stateful/bloatnet/stubs_99.json b/tests/benchmark/stateful/bloatnet/stubs_99.json
deleted file mode 100644
index f10cc6c5e27..00000000000
--- a/tests/benchmark/stateful/bloatnet/stubs_99.json
+++ /dev/null
@@ -1,299 +0,0 @@
-{
-  "test_sload_empty_erc20_balanceof_30GB_ERC20": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C",
-  "test_sload_empty_erc20_balanceof_XEN": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8",
-  "test_sload_empty_erc20_balanceof_USDT": "0xdAC17F958D2ee523a2206206994597C13D831ec7",
-  "test_sload_empty_erc20_balanceof_USDC": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48",
-  "test_sload_empty_erc20_balanceof_LPT": "0x58b6A8a3302369DAEc383334672404Ee733AB239",
-  "test_sload_empty_erc20_balanceof_SHIB": "0x95aD61B0a150d79219dCF64E1E6Cc01f0B64C4cE",
-  "test_sload_empty_erc20_balanceof_WETH": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-  "test_sload_empty_erc20_balanceof_G-CRE": "0xa3Ee21c306A700E682AbcDfE9bAA6A08F3820419",
-  "test_sload_empty_erc20_balanceof_MEME": "0xB131F4A55907B10d1F0A50d8Ab8FA09EC342CD74",
-  "test_sload_empty_erc20_balanceof_OMG": "0xd26114cD6EE289AccF82350c8d8487fedB8A0C07",
-  "test_sload_empty_erc20_balanceof_MATIC": "0x7d1Afa7B718fb893DB30A3abc0Cfc608AaCfEbB0",
-  "test_sload_empty_erc20_balanceof_stETH": "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
-  "test_sload_empty_erc20_balanceof_DAI": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-  "test_sload_empty_erc20_balanceof_PEPE": "0x6982508145454Ce325dDbE47a25d4eC3d2311933",
-  "test_sload_empty_erc20_balanceof_old": "0x0cf0ee63788A0849FE5297F3407f701E122CC023",
-  "test_sload_empty_erc20_balanceof_BAT": "0x0D8775F648430679A709E98d2b0Cb6250d2887EF",
-  "test_sload_empty_erc20_balanceof_UNI": "0x1F9840a85d5aF5bf1D1762F925BdADdC4201F984",
-  "test_sload_empty_erc20_balanceof_AMB": "0x4dc3643Dbc642b72C158E7F3d2FF232df61cB6CE",
-  "test_sload_empty_erc20_balanceof_HEX": "0x2b591e99afE9f32eAA6214f7B7629768c40eEb39",
-  "test_sload_empty_erc20_balanceof_CRO": "0xa0b73e1ff0b80914ab6fe0444e65848c4c34450b",
-  "test_sload_empty_erc20_balanceof_UCASH": "0x92e52a1A235d9A103D970901066CE910AAceFD37",
-  "test_sload_empty_erc20_balanceof_BNB": "0xB8c77482e45F1F44dE1745F52C74426C631bDd52",
-  "test_sload_empty_erc20_balanceof_GSE": "0xe530441f4f73bdb6dc2fa5af7c3fc5fd551ec838",
-  "test_sload_empty_erc20_balanceof_MANA": "0x0F5D2FB29fb7d3cFeE444A200298f468908cC942",
-  "test_sload_empty_erc20_balanceof_OCN": "0x4092678e4E78230F46A1534C0fBC8Fa39780892B",
-  "test_sload_empty_erc20_balanceof_EIGEN": "0xEC53BF9167F50cDEb3aE105F56099AaAb9061F83",
-  "test_sload_empty_erc20_balanceof_COMP": "0xc00e94Cb662C3520282E6f5717214004A7f26888",
-  "test_sload_empty_erc20_balanceof_cUSDC": "0x39AA39c021dfbaE8faC545936693aC917d5E7563",
-  "test_sload_empty_erc20_balanceof_sMEME": "0xc059A531B4234d05e9EF4aC51028f7E6156E2CcE",
-  "test_sload_empty_erc20_balanceof_SAND": "0x3845badade8e6dff049820680d1f14bd3903a5d0",
-  "test_sload_empty_erc20_balanceof_AAVE": "0x7Fc66500c84A76Ad7e9c93437bFc5AC33E2DDAe9",
-  "test_sload_empty_erc20_balanceof_ZRX": "0xE41d2489571d322189246DaFA5ebDe1F4699F498",
-  "test_sload_empty_erc20_balanceof_KOK": "0x9B9647431632AF44be02ddd22477Ed94d14AacAa",
-  "test_sload_empty_erc20_balanceof_APE": "0x4d224452801ACEd8B2F0aebe155379bb5D594381",
-  "test_sload_empty_erc20_balanceof_SAI": "0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359",
-  "test_sload_empty_erc20_balanceof_GRT": "0xc944E90C64B2c07662A292be6244BDf05Cda44a7",
-  "test_sload_empty_erc20_balanceof_LRC": "0xBBbbCA6A901c926F240b89EacB641d8Aec7AEafD",
-  "test_sload_empty_erc20_balanceof_ELON": "0x761D38e5DDf6ccf6Cf7C55759d5210750B5D60F3",
-  "test_sload_empty_erc20_balanceof_QNT": "0x4a220E6096B25EADb88358cb44068A3248254675",
-  "test_sload_empty_erc20_balanceof_ONDO": "0xfAbA6f8e4a5E8Ab82F62fe7C39859FA577269BE3",
-  "test_sload_empty_erc20_balanceof_ENJ": "0xF629cBd94d3791c9250152BD8dfBDF380E2a3B9c",
-  "test_sload_empty_erc20_balanceof_FET": "0x1D287CC25dAD7cCaF76a26bc660c5F7C8E2a05BD",
-  "test_sload_empty_erc20_balanceof_eETH": "0x6c5024Cd4F8A59110119C56f8933403A539555EB",
-  "test_sload_empty_erc20_balanceof_XMX": "0x0F8c45B896784A1E408526B9300519ef8660209c",
-  "test_sload_empty_erc20_balanceof_FTI": "0x943ed852Dadb5C3938ECdC6883718df8142de4C8",
-  "test_sload_empty_erc20_balanceof_WBTC": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
-  "test_sload_empty_erc20_balanceof_LEND": "0x80fB784B7eD66730e8b1DBd9820aFD29931aab03",
-  "test_sload_empty_erc20_balanceof_ELEC": "0xd49ff13661451313ca1553fd6954bd1d9b6e02b9",
-  "test_sload_empty_erc20_balanceof_SUSHI": "0x6B3595068778DD592e39A122f4f5a5CF09C90fE2",
-  "test_sload_empty_erc20_balanceof_HOT": "0x6c6EE5e31d828De241282B9606C8e98Ea48526E2",
-  "test_sload_empty_erc20_balanceof_MITx": "0x4a527d8fc13c5203ab24ba0944f4cb14658d1db6",
-  "test_sload_empty_erc20_balanceof_1INCH": "0x111111111117dC0aa78b770fA6A738034120C302",
-  "test_sload_empty_erc20_balanceof_USDP": "0x1456688345527bE1f37E9e627DA0837D6f08C925",
-  "test_sload_empty_erc20_balanceof_ETHFI": "0xfe0c30065b384f05761f15d0cc899d4f9f9cc0eb",
-  "test_sload_empty_erc20_balanceof_POLY": "0x9992ec3cf6a55b00978cddf2b27bc6882d88d1ec",
-  "test_sload_empty_erc20_balanceof_AOA": "0x9ab165d795019b6d8b3e971dda91071421305e5a",
-  "test_sload_empty_erc20_balanceof_STORJ": "0xB64ef51C888972c908CFacf59B47C1AfBC0Ab8aC",
-  "test_sload_empty_erc20_balanceof_MKR": "0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2",
-  "test_sload_empty_erc20_balanceof_AMP": "0xfF20817765cB7F73d4Bde2e66e067e58d11095c2",
-  "test_sload_empty_erc20_balanceof_VRA": "0xF411903cbc70a74d22900a5DE66A2dda66507255",
-  "test_sload_empty_erc20_balanceof_GTC": "0xde30da39c46104798bb5aa3fe8b9e0e1f348163f",
-  "test_sload_empty_erc20_balanceof_FLOKI": "0x43F11c02439E2736800433B4594994Bd43Cd066D",
-  "test_sload_empty_erc20_balanceof_ALT": "0x8457CA5040ad67fdebbCC8EdCE889A335Bc0fbFB",
-  "test_sload_empty_erc20_balanceof_IMX": "0xf57e7e7c23978c3caec3c3548e3d615c346e79ff",
-  "test_sload_empty_erc20_balanceof_XYO": "0x55296f69f40ea6d20e478533c15A6b08B654E758",
-  "test_sload_empty_erc20_balanceof_REV": "0x2ef27bf41236bd859a95209e17a43fbd26851f92",
-  "test_sload_empty_erc20_balanceof_FUN": "0x419d0d8bdd9af5e606ae2232ed285aff190e711b",
-  "test_sload_empty_erc20_balanceof_CRV": "0xD533a949740bb3306d119CC777fa900bA034cd52",
-  "test_sload_empty_erc20_balanceof_CHZ": "0x3506424f91fd33084466f402d5d97f05f8e3b4af",
-  "test_sload_empty_erc20_balanceof_SMT": "0x78Eb8DC641077F049f910659b6d580E80dC4d237",
-  "test_sload_empty_erc20_balanceof_SNX": "0xC011A72400E58ecD99Ee497CF89E3775d4bd732F",
-  "test_sload_empty_erc20_balanceof_DENT": "0x3597bfD533a99c9aa083587B074434E61Eb0A258",
-  "test_sload_empty_erc20_balanceof_RNDR": "0x6De037ef9aD2725EB40118Bb1702EBb27e4Aeb24",
-  "test_sload_empty_erc20_balanceof_SNT": "0x744d70FDBe2Ba4CF95131626614a1763DF805B9E",
-  "test_sload_empty_erc20_balanceof_AXS": "0xBB0E17EF65F82Ab018d8EDd776e8DD940327B28b",
-  "test_sload_empty_erc20_balanceof_KNC": "0xdd974D5C2e2928deA5F71b9825b8b646686BD200",
-  "test_sload_empty_erc20_balanceof_WEPE": "0xccB365D2e11aE4D6d74715c680f56cf58bF4bF10",
-  "test_sload_empty_erc20_balanceof_ZETA": "0xf091867ec603a6628ed83d274e835539d82e9cc8",
-  "test_sload_empty_erc20_balanceof_LYM": "0xc690f7c7fcffa6a82b79fab7508c466fefdfc8c5",
-  "test_sload_empty_erc20_balanceof_nCASH": "0x809826cceAb68c387726af962713b64Cb5Cb3CCA",
-  "test_sload_empty_erc20_balanceof_LOOKS": "0xf4d2888d29D722226FafA5d9B24F9164c092421E",
-  "test_sload_empty_erc20_balanceof_Monfter/Monavale": "0x275f5ad03be0fa221b4c6649b8aee09a42d9412a",
-  "test_sload_empty_erc20_balanceof_cETH": "0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5",
-  "test_sload_empty_erc20_balanceof_SALT": "0x4156D3342D5c385a87D264F90653733592000581",
-  "test_sload_empty_erc20_balanceof_HOGE": "0xfAd45E47083e4607302aa43c65fB3106F1cd7607",
-  "test_sload_empty_erc20_balanceof_REN": "0x408e41876cCCDC0F92210600ef50372656052a38",
-  "test_sload_empty_erc20_balanceof_ENS": "0xC56b13EBBCffa67cfB7979b900B736b3fb480D78",
-  "test_sload_empty_erc20_balanceof_NEXO": "0xB62132e35a6c13ee1EE0f84dC5d40bad8d815206",
-  "test_sload_empty_erc20_balanceof_RFR": "0xD0929d411954c47438Dc1D871dd6081F5C5e149c",
-  "test_sload_empty_erc20_balanceof_COFI": "0x3137619705b5fc22a3048989F983905e456B59Ab",
-  "test_sload_empty_erc20_balanceof_SLP": "0xcc8fa225d80b9c7d42f96e9570156c65d6cAAa25",
-  "test_sload_empty_erc20_balanceof_FUEL": "0xea38eaa3c86c8f9b751533ba2e562deb9acded40",
-  "test_sload_empty_erc20_balanceof_ENA": "0x57e114B691Db790C35207b2e685D4A43181e6061",
-  "test_sload_empty_erc20_balanceof_AKITA": "0x3301Ee63Fb29F863f2333Bd4466acb46CD8323E6",
-  "test_sload_empty_erc20_balanceof_CVC": "0x41e5560054824ea6B0732E656e3Ad64E20e94e45",
-  "test_sload_empty_erc20_balanceof_IHT": "0xEda8B016efa8b1161208Cf041cD86972EEE0F31E",
-  "test_sload_empty_erc20_balanceof_ZSC": "0x7A41e0517a5ecA4FdbC7FbebA4D4c47B9fF6DC63",
-  "test_sload_empty_erc20_balanceof_cbETH": "0xBe9895146f7AF43049ca1c1AE358B0541Ea49704",
-  "test_sload_empty_erc20_balanceof_IMT": "0x13119e34e140097a507b07a5564bde1bc375d9e6",
-  "test_sstore_erc20_approve_30GB_ERC20": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C",
-  "test_sstore_erc20_approve_XEN": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8",
-  "test_sstore_erc20_approve_USDT": "0xdAC17F958D2ee523a2206206994597C13D831ec7",
-  "test_sstore_erc20_approve_USDC": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48",
-  "test_sstore_erc20_approve_LPT": "0x58b6A8a3302369DAEc383334672404Ee733AB239",
-  "test_sstore_erc20_approve_SHIB": "0x95aD61B0a150d79219dCF64E1E6Cc01f0B64C4cE",
-  "test_sstore_erc20_approve_WETH": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-  "test_sstore_erc20_approve_G-CRE": "0xa3Ee21c306A700E682AbcDfE9bAA6A08F3820419",
-  "test_sstore_erc20_approve_MEME": "0xB131F4A55907B10d1F0A50d8Ab8FA09EC342CD74",
-  "test_sstore_erc20_approve_OMG": "0xd26114cD6EE289AccF82350c8d8487fedB8A0C07",
-  "test_sstore_erc20_approve_MATIC": "0x7d1Afa7B718fb893DB30A3abc0Cfc608AaCfEbB0",
-  "test_sstore_erc20_approve_stETH": "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
-  "test_sstore_erc20_approve_DAI": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-  "test_sstore_erc20_approve_PEPE": "0x6982508145454Ce325dDbE47a25d4eC3d2311933",
-  "test_sstore_erc20_approve_old": "0x0cf0ee63788A0849FE5297F3407f701E122CC023",
-  "test_sstore_erc20_approve_BAT": "0x0D8775F648430679A709E98d2b0Cb6250d2887EF",
-  "test_sstore_erc20_approve_UNI": "0x1F9840a85d5aF5bf1D1762F925BdADdC4201F984",
-  "test_sstore_erc20_approve_AMB": "0x4dc3643Dbc642b72C158E7F3d2FF232df61cB6CE",
-  "test_sstore_erc20_approve_HEX": "0x2b591e99afE9f32eAA6214f7B7629768c40eEb39",
-  "test_sstore_erc20_approve_CRO": "0xa0b73e1ff0b80914ab6fe0444e65848c4c34450b",
-  "test_sstore_erc20_approve_UCASH": "0x92e52a1A235d9A103D970901066CE910AAceFD37",
-  "test_sstore_erc20_approve_BNB": "0xB8c77482e45F1F44dE1745F52C74426C631bDd52",
-  "test_sstore_erc20_approve_GSE": "0xe530441f4f73bdb6dc2fa5af7c3fc5fd551ec838",
-  "test_sstore_erc20_approve_MANA": "0x0F5D2FB29fb7d3cFeE444A200298f468908cC942",
-  "test_sstore_erc20_approve_OCN": "0x4092678e4E78230F46A1534C0fBC8Fa39780892B",
-  "test_sstore_erc20_approve_EIGEN": "0xEC53BF9167F50cDEb3aE105F56099AaAb9061F83",
-  "test_sstore_erc20_approve_COMP": "0xc00e94Cb662C3520282E6f5717214004A7f26888",
-  "test_sstore_erc20_approve_cUSDC": "0x39AA39c021dfbaE8faC545936693aC917d5E7563",
-  "test_sstore_erc20_approve_sMEME": "0xc059A531B4234d05e9EF4aC51028f7E6156E2CcE",
-  "test_sstore_erc20_approve_SAND": "0x3845badade8e6dff049820680d1f14bd3903a5d0",
-  "test_sstore_erc20_approve_AAVE": "0x7Fc66500c84A76Ad7e9c93437bFc5AC33E2DDAe9",
-  "test_sstore_erc20_approve_ZRX": "0xE41d2489571d322189246DaFA5ebDe1F4699F498",
-  "test_sstore_erc20_approve_KOK": "0x9B9647431632AF44be02ddd22477Ed94d14AacAa",
-  "test_sstore_erc20_approve_APE": "0x4d224452801ACEd8B2F0aebe155379bb5D594381",
-  "test_sstore_erc20_approve_SAI": "0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359",
-  "test_sstore_erc20_approve_GRT": "0xc944E90C64B2c07662A292be6244BDf05Cda44a7",
-  "test_sstore_erc20_approve_LRC": "0xBBbbCA6A901c926F240b89EacB641d8Aec7AEafD",
-  "test_sstore_erc20_approve_ELON": "0x761D38e5DDf6ccf6Cf7C55759d5210750B5D60F3",
-  "test_sstore_erc20_approve_QNT": "0x4a220E6096B25EADb88358cb44068A3248254675",
-  "test_sstore_erc20_approve_ONDO": "0xfAbA6f8e4a5E8Ab82F62fe7C39859FA577269BE3",
-  "test_sstore_erc20_approve_ENJ": "0xF629cBd94d3791c9250152BD8dfBDF380E2a3B9c",
-  "test_sstore_erc20_approve_FET": "0x1D287CC25dAD7cCaF76a26bc660c5F7C8E2a05BD",
-  "test_sstore_erc20_approve_eETH": "0x6c5024Cd4F8A59110119C56f8933403A539555EB",
-  "test_sstore_erc20_approve_XMX": "0x0F8c45B896784A1E408526B9300519ef8660209c",
-  "test_sstore_erc20_approve_FTI": "0x943ed852Dadb5C3938ECdC6883718df8142de4C8",
-  "test_sstore_erc20_approve_WBTC": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
-  "test_sstore_erc20_approve_LEND": "0x80fB784B7eD66730e8b1DBd9820aFD29931aab03",
-  "test_sstore_erc20_approve_ELEC": "0xd49ff13661451313ca1553fd6954bd1d9b6e02b9",
-  "test_sstore_erc20_approve_SUSHI": "0x6B3595068778DD592e39A122f4f5a5CF09C90fE2",
-  "test_sstore_erc20_approve_HOT": "0x6c6EE5e31d828De241282B9606C8e98Ea48526E2",
-  "test_sstore_erc20_approve_MITx": "0x4a527d8fc13c5203ab24ba0944f4cb14658d1db6",
-  "test_sstore_erc20_approve_1INCH": "0x111111111117dC0aa78b770fA6A738034120C302",
-  "test_sstore_erc20_approve_USDP": "0x1456688345527bE1f37E9e627DA0837D6f08C925",
-  "test_sstore_erc20_approve_ETHFI": "0xfe0c30065b384f05761f15d0cc899d4f9f9cc0eb",
-  "test_sstore_erc20_approve_POLY": "0x9992ec3cf6a55b00978cddf2b27bc6882d88d1ec",
-  "test_sstore_erc20_approve_AOA": "0x9ab165d795019b6d8b3e971dda91071421305e5a",
-  "test_sstore_erc20_approve_STORJ": "0xB64ef51C888972c908CFacf59B47C1AfBC0Ab8aC",
-  "test_sstore_erc20_approve_MKR": "0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2",
-  "test_sstore_erc20_approve_AMP": "0xfF20817765cB7F73d4Bde2e66e067e58d11095c2",
-  "test_sstore_erc20_approve_VRA": "0xF411903cbc70a74d22900a5DE66A2dda66507255",
-  "test_sstore_erc20_approve_GTC": "0xde30da39c46104798bb5aa3fe8b9e0e1f348163f",
-  "test_sstore_erc20_approve_FLOKI": "0x43F11c02439E2736800433B4594994Bd43Cd066D",
-  "test_sstore_erc20_approve_ALT": "0x8457CA5040ad67fdebbCC8EdCE889A335Bc0fbFB",
-  "test_sstore_erc20_approve_IMX": "0xf57e7e7c23978c3caec3c3548e3d615c346e79ff",
-  "test_sstore_erc20_approve_XYO": "0x55296f69f40ea6d20e478533c15A6b08B654E758",
-  "test_sstore_erc20_approve_REV": "0x2ef27bf41236bd859a95209e17a43fbd26851f92",
-  "test_sstore_erc20_approve_FUN": "0x419d0d8bdd9af5e606ae2232ed285aff190e711b",
-  "test_sstore_erc20_approve_CRV": "0xD533a949740bb3306d119CC777fa900bA034cd52",
-  "test_sstore_erc20_approve_CHZ": "0x3506424f91fd33084466f402d5d97f05f8e3b4af",
-  "test_sstore_erc20_approve_SMT": "0x78Eb8DC641077F049f910659b6d580E80dC4d237",
-  "test_sstore_erc20_approve_SNX": "0xC011A72400E58ecD99Ee497CF89E3775d4bd732F",
-  "test_sstore_erc20_approve_DENT": "0x3597bfD533a99c9aa083587B074434E61Eb0A258",
-  "test_sstore_erc20_approve_RNDR": "0x6De037ef9aD2725EB40118Bb1702EBb27e4Aeb24",
-  "test_sstore_erc20_approve_SNT": "0x744d70FDBe2Ba4CF95131626614a1763DF805B9E",
-  "test_sstore_erc20_approve_AXS": "0xBB0E17EF65F82Ab018d8EDd776e8DD940327B28b",
-  "test_sstore_erc20_approve_KNC": "0xdd974D5C2e2928deA5F71b9825b8b646686BD200",
-  "test_sstore_erc20_approve_WEPE": "0xccB365D2e11aE4D6d74715c680f56cf58bF4bF10",
-  "test_sstore_erc20_approve_ZETA": "0xf091867ec603a6628ed83d274e835539d82e9cc8",
-  "test_sstore_erc20_approve_LYM": "0xc690f7c7fcffa6a82b79fab7508c466fefdfc8c5",
-  "test_sstore_erc20_approve_nCASH": "0x809826cceAb68c387726af962713b64Cb5Cb3CCA",
-  "test_sstore_erc20_approve_LOOKS": "0xf4d2888d29D722226FafA5d9B24F9164c092421E",
-  "test_sstore_erc20_approve_Monfter/Monavale": "0x275f5ad03be0fa221b4c6649b8aee09a42d9412a",
-  "test_sstore_erc20_approve_cETH": "0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5",
-  "test_sstore_erc20_approve_SALT": "0x4156D3342D5c385a87D264F90653733592000581",
-  "test_sstore_erc20_approve_HOGE": "0xfAd45E47083e4607302aa43c65fB3106F1cd7607",
-  "test_sstore_erc20_approve_REN": "0x408e41876cCCDC0F92210600ef50372656052a38",
-  "test_sstore_erc20_approve_ENS": "0xC56b13EBBCffa67cfB7979b900B736b3fb480D78",
-  "test_sstore_erc20_approve_NEXO": "0xB62132e35a6c13ee1EE0f84dC5d40bad8d815206",
-  "test_sstore_erc20_approve_RFR": "0xD0929d411954c47438Dc1D871dd6081F5C5e149c",
-  "test_sstore_erc20_approve_COFI": "0x3137619705b5fc22a3048989F983905e456B59Ab",
-  "test_sstore_erc20_approve_SLP": "0xcc8fa225d80b9c7d42f96e9570156c65d6cAAa25",
-  "test_sstore_erc20_approve_FUEL": "0xea38eaa3c86c8f9b751533ba2e562deb9acded40",
-  "test_sstore_erc20_approve_ENA": "0x57e114B691Db790C35207b2e685D4A43181e6061",
-  "test_sstore_erc20_approve_AKITA": "0x3301Ee63Fb29F863f2333Bd4466acb46CD8323E6",
-  "test_sstore_erc20_approve_CVC": "0x41e5560054824ea6B0732E656e3Ad64E20e94e45",
-  "test_sstore_erc20_approve_IHT": "0xEda8B016efa8b1161208Cf041cD86972EEE0F31E",
-  "test_sstore_erc20_approve_ZSC": "0x7A41e0517a5ecA4FdbC7FbebA4D4c47B9fF6DC63",
-  "test_sstore_erc20_approve_cbETH": "0xBe9895146f7AF43049ca1c1AE358B0541Ea49704",
-  "test_sstore_erc20_approve_IMT": "0x13119e34e140097a507b07a5564bde1bc375d9e6",
-  "test_mixed_sload_sstore_30GB_ERC20": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C",
-  "test_mixed_sload_sstore_XEN": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8",
-  "test_mixed_sload_sstore_USDT": "0xdAC17F958D2ee523a2206206994597C13D831ec7",
-  "test_mixed_sload_sstore_USDC": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48",
-  "test_mixed_sload_sstore_LPT": "0x58b6A8a3302369DAEc383334672404Ee733AB239",
-  "test_mixed_sload_sstore_SHIB": "0x95aD61B0a150d79219dCF64E1E6Cc01f0B64C4cE",
-  "test_mixed_sload_sstore_WETH": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-  "test_mixed_sload_sstore_G-CRE": "0xa3Ee21c306A700E682AbcDfE9bAA6A08F3820419",
-  "test_mixed_sload_sstore_MEME": "0xB131F4A55907B10d1F0A50d8Ab8FA09EC342CD74",
-  "test_mixed_sload_sstore_OMG": "0xd26114cD6EE289AccF82350c8d8487fedB8A0C07",
-  "test_mixed_sload_sstore_MATIC": "0x7d1Afa7B718fb893DB30A3abc0Cfc608AaCfEbB0",
-  "test_mixed_sload_sstore_stETH": "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
-  "test_mixed_sload_sstore_DAI": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-  "test_mixed_sload_sstore_PEPE": "0x6982508145454Ce325dDbE47a25d4eC3d2311933",
-  "test_mixed_sload_sstore_old": "0x0cf0ee63788A0849FE5297F3407f701E122CC023",
-  "test_mixed_sload_sstore_BAT": "0x0D8775F648430679A709E98d2b0Cb6250d2887EF",
-  "test_mixed_sload_sstore_UNI": "0x1F9840a85d5aF5bf1D1762F925BdADdC4201F984",
-  "test_mixed_sload_sstore_AMB": "0x4dc3643Dbc642b72C158E7F3d2FF232df61cB6CE",
-  "test_mixed_sload_sstore_HEX": "0x2b591e99afE9f32eAA6214f7B7629768c40eEb39",
-  "test_mixed_sload_sstore_CRO": "0xa0b73e1ff0b80914ab6fe0444e65848c4c34450b",
-  "test_mixed_sload_sstore_UCASH": "0x92e52a1A235d9A103D970901066CE910AAceFD37",
-  "test_mixed_sload_sstore_BNB": "0xB8c77482e45F1F44dE1745F52C74426C631bDd52",
-  "test_mixed_sload_sstore_GSE": "0xe530441f4f73bdb6dc2fa5af7c3fc5fd551ec838",
-  "test_mixed_sload_sstore_MANA": "0x0F5D2FB29fb7d3cFeE444A200298f468908cC942",
-  "test_mixed_sload_sstore_OCN": "0x4092678e4E78230F46A1534C0fBC8Fa39780892B",
-  "test_mixed_sload_sstore_EIGEN": "0xEC53BF9167F50cDEb3aE105F56099AaAb9061F83",
-  "test_mixed_sload_sstore_COMP": "0xc00e94Cb662C3520282E6f5717214004A7f26888",
-  "test_mixed_sload_sstore_cUSDC": "0x39AA39c021dfbaE8faC545936693aC917d5E7563",
-  "test_mixed_sload_sstore_sMEME": "0xc059A531B4234d05e9EF4aC51028f7E6156E2CcE",
-  "test_mixed_sload_sstore_SAND": "0x3845badade8e6dff049820680d1f14bd3903a5d0",
-  "test_mixed_sload_sstore_AAVE": "0x7Fc66500c84A76Ad7e9c93437bFc5AC33E2DDAe9",
-  "test_mixed_sload_sstore_ZRX": "0xE41d2489571d322189246DaFA5ebDe1F4699F498",
-  "test_mixed_sload_sstore_KOK": "0x9B9647431632AF44be02ddd22477Ed94d14AacAa",
-  "test_mixed_sload_sstore_APE": "0x4d224452801ACEd8B2F0aebe155379bb5D594381",
-  "test_mixed_sload_sstore_SAI": "0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359",
-  "test_mixed_sload_sstore_GRT": "0xc944E90C64B2c07662A292be6244BDf05Cda44a7",
-  "test_mixed_sload_sstore_LRC": "0xBBbbCA6A901c926F240b89EacB641d8Aec7AEafD",
-  "test_mixed_sload_sstore_ELON": "0x761D38e5DDf6ccf6Cf7C55759d5210750B5D60F3",
-  "test_mixed_sload_sstore_QNT": "0x4a220E6096B25EADb88358cb44068A3248254675",
-  "test_mixed_sload_sstore_ONDO": "0xfAbA6f8e4a5E8Ab82F62fe7C39859FA577269BE3",
-  "test_mixed_sload_sstore_ENJ": "0xF629cBd94d3791c9250152BD8dfBDF380E2a3B9c",
-  "test_mixed_sload_sstore_FET": "0x1D287CC25dAD7cCaF76a26bc660c5F7C8E2a05BD",
-  "test_mixed_sload_sstore_eETH": "0x6c5024Cd4F8A59110119C56f8933403A539555EB",
-  "test_mixed_sload_sstore_XMX": "0x0F8c45B896784A1E408526B9300519ef8660209c",
-  "test_mixed_sload_sstore_FTI": "0x943ed852Dadb5C3938ECdC6883718df8142de4C8",
-  "test_mixed_sload_sstore_WBTC": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
-  "test_mixed_sload_sstore_LEND": "0x80fB784B7eD66730e8b1DBd9820aFD29931aab03",
-  "test_mixed_sload_sstore_ELEC": "0xd49ff13661451313ca1553fd6954bd1d9b6e02b9",
-  "test_mixed_sload_sstore_SUSHI": "0x6B3595068778DD592e39A122f4f5a5CF09C90fE2",
-  "test_mixed_sload_sstore_HOT": "0x6c6EE5e31d828De241282B9606C8e98Ea48526E2",
-  "test_mixed_sload_sstore_MITx": "0x4a527d8fc13c5203ab24ba0944f4cb14658d1db6",
-  "test_mixed_sload_sstore_1INCH": "0x111111111117dC0aa78b770fA6A738034120C302",
-  "test_mixed_sload_sstore_USDP": "0x1456688345527bE1f37E9e627DA0837D6f08C925",
-  "test_mixed_sload_sstore_ETHFI": "0xfe0c30065b384f05761f15d0cc899d4f9f9cc0eb",
-  "test_mixed_sload_sstore_POLY": "0x9992ec3cf6a55b00978cddf2b27bc6882d88d1ec",
-  "test_mixed_sload_sstore_AOA": "0x9ab165d795019b6d8b3e971dda91071421305e5a",
-  "test_mixed_sload_sstore_STORJ": "0xB64ef51C888972c908CFacf59B47C1AfBC0Ab8aC",
-  "test_mixed_sload_sstore_MKR": "0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2",
-  "test_mixed_sload_sstore_AMP": "0xfF20817765cB7F73d4Bde2e66e067e58d11095c2",
-  "test_mixed_sload_sstore_VRA": "0xF411903cbc70a74d22900a5DE66A2dda66507255",
-  "test_mixed_sload_sstore_GTC": "0xde30da39c46104798bb5aa3fe8b9e0e1f348163f",
-  "test_mixed_sload_sstore_FLOKI": "0x43F11c02439E2736800433B4594994Bd43Cd066D",
-  "test_mixed_sload_sstore_ALT": "0x8457CA5040ad67fdebbCC8EdCE889A335Bc0fbFB",
-  "test_mixed_sload_sstore_IMX": "0xf57e7e7c23978c3caec3c3548e3d615c346e79ff",
-  "test_mixed_sload_sstore_XYO": "0x55296f69f40ea6d20e478533c15A6b08B654E758",
-  "test_mixed_sload_sstore_REV": "0x2ef27bf41236bd859a95209e17a43fbd26851f92",
-  "test_mixed_sload_sstore_FUN": "0x419d0d8bdd9af5e606ae2232ed285aff190e711b",
-  "test_mixed_sload_sstore_CRV": "0xD533a949740bb3306d119CC777fa900bA034cd52",
-  "test_mixed_sload_sstore_CHZ": "0x3506424f91fd33084466f402d5d97f05f8e3b4af",
-  "test_mixed_sload_sstore_SMT": "0x78Eb8DC641077F049f910659b6d580E80dC4d237",
-  "test_mixed_sload_sstore_SNX": "0xC011A72400E58ecD99Ee497CF89E3775d4bd732F",
-  "test_mixed_sload_sstore_DENT": "0x3597bfD533a99c9aa083587B074434E61Eb0A258",
-  "test_mixed_sload_sstore_RNDR": "0x6De037ef9aD2725EB40118Bb1702EBb27e4Aeb24",
-  "test_mixed_sload_sstore_SNT": "0x744d70FDBe2Ba4CF95131626614a1763DF805B9E",
-  "test_mixed_sload_sstore_AXS": "0xBB0E17EF65F82Ab018d8EDd776e8DD940327B28b",
-  "test_mixed_sload_sstore_KNC": "0xdd974D5C2e2928deA5F71b9825b8b646686BD200",
-  "test_mixed_sload_sstore_WEPE": "0xccB365D2e11aE4D6d74715c680f56cf58bF4bF10",
-  "test_mixed_sload_sstore_ZETA": "0xf091867ec603a6628ed83d274e835539d82e9cc8",
-  "test_mixed_sload_sstore_LYM": "0xc690f7c7fcffa6a82b79fab7508c466fefdfc8c5",
-  "test_mixed_sload_sstore_nCASH": "0x809826cceAb68c387726af962713b64Cb5Cb3CCA",
-  "test_mixed_sload_sstore_LOOKS": "0xf4d2888d29D722226FafA5d9B24F9164c092421E",
-  "test_mixed_sload_sstore_Monfter/Monavale": "0x275f5ad03be0fa221b4c6649b8aee09a42d9412a",
-  "test_mixed_sload_sstore_cETH": "0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5",
-  "test_mixed_sload_sstore_SALT": "0x4156D3342D5c385a87D264F90653733592000581",
-  "test_mixed_sload_sstore_HOGE": "0xfAd45E47083e4607302aa43c65fB3106F1cd7607",
-  "test_mixed_sload_sstore_REN": "0x408e41876cCCDC0F92210600ef50372656052a38",
-  "test_mixed_sload_sstore_ENS": "0xC56b13EBBCffa67cfB7979b900B736b3fb480D78",
-  "test_mixed_sload_sstore_NEXO": "0xB62132e35a6c13ee1EE0f84dC5d40bad8d815206",
-  "test_mixed_sload_sstore_RFR": "0xD0929d411954c47438Dc1D871dd6081F5C5e149c",
-  "test_mixed_sload_sstore_COFI": "0x3137619705b5fc22a3048989F983905e456B59Ab",
-  "test_mixed_sload_sstore_SLP": "0xcc8fa225d80b9c7d42f96e9570156c65d6cAAa25",
-  "test_mixed_sload_sstore_FUEL": "0xea38eaa3c86c8f9b751533ba2e562deb9acded40",
-  "test_mixed_sload_sstore_ENA": "0x57e114B691Db790C35207b2e685D4A43181e6061",
-  "test_mixed_sload_sstore_AKITA": "0x3301Ee63Fb29F863f2333Bd4466acb46CD8323E6",
-  "test_mixed_sload_sstore_CVC": "0x41e5560054824ea6B0732E656e3Ad64E20e94e45",
-  "test_mixed_sload_sstore_IHT": "0xEda8B016efa8b1161208Cf041cD86972EEE0F31E",
-  "test_mixed_sload_sstore_ZSC": "0x7A41e0517a5ecA4FdbC7FbebA4D4c47B9fF6DC63",
-  "test_mixed_sload_sstore_cbETH": "0xBe9895146f7AF43049ca1c1AE358B0541Ea49704",
-  "test_mixed_sload_sstore_IMT": "0x13119e34e140097a507b07a5564bde1bc375d9e6"
-}
diff --git a/tests/benchmark/stateful/bloatnet/stubs_bloatnet.json b/tests/benchmark/stateful/bloatnet/stubs_bloatnet.json
deleted file mode 100644
index f11b4aa8b61..00000000000
--- a/tests/benchmark/stateful/bloatnet/stubs_bloatnet.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "test_sload_empty_erc20_balanceof_50GB_ERC20": "0x398324972FcE0e89E048c2104f1298031d1931fc",
-  "test_sload_empty_erc20_balanceof_30GB_ERC20": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C",
-  "test_sload_empty_erc20_balanceof_9_39GB_ERC20": "0xf7EfF64A1b7f3dB550A05fF2635Bb9744B8E21eb",
-  "test_sload_empty_erc20_balanceof_1GB_ERC20": "0x365cF1A2532919e1adf8650670B9e01e163a441D",
-  "test_sload_empty_erc20_balanceof_4_23MB_ERC20": "0xFdC419f77993E0E2E9Fed06299E367F6aEe909bE",
-  "test_sload_empty_erc20_balanceof_XEN": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8",
-  "test_sload_empty_erc20_balanceof_USDC": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48",
-  "test_sload_empty_erc20_balanceof_ARB": "0xad0c361ef902a7d9851ca7dcc85535da2d3c6fc7",
-  "test_sload_empty_erc20_balanceof_HST": "0x2e2a539285ce690e4c6bddd42deb7e37bdde9500",
-  "test_sstore_erc20_mint_50GB_ERC20": "0x398324972FcE0e89E048c2104f1298031d1931fc",
-  "test_sstore_erc20_mint_30GB_ERC20": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C",
-  "test_sstore_erc20_mint_9_39GB_ERC20": "0xf7EfF64A1b7f3dB550A05fF2635Bb9744B8E21eb",
-  "test_sstore_erc20_mint_1GB_ERC20": "0x365cF1A2532919e1adf8650670B9e01e163a441D",
-  "test_sstore_erc20_mint_4_23MB_ERC20": "0xFdC419f77993E0E2E9Fed06299E367F6aEe909bE",
-  "test_sstore_erc20_approve_50GB_ERC20": "0x398324972FcE0e89E048c2104f1298031d1931fc",
-  "test_sstore_erc20_approve_30GB_ERC20": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C",
-  "test_sstore_erc20_approve_9_39GB_ERC20": "0xf7EfF64A1b7f3dB550A05fF2635Bb9744B8E21eb",
-  "test_sstore_erc20_approve_1GB_ERC20": "0x365cF1A2532919e1adf8650670B9e01e163a441D",
-  "test_sstore_erc20_approve_4_23MB_ERC20": "0xFdC419f77993E0E2E9Fed06299E367F6aEe909bE",
-  "test_sstore_erc20_approve_XEN": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8",
-  "test_sstore_erc20_approve_USDC": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48",
-  "test_sstore_erc20_approve_ARB": "0xad0c361ef902a7d9851ca7dcc85535da2d3c6fc7",
-  "test_sstore_erc20_approve_HST": "0x2e2a539285ce690e4c6bddd42deb7e37bdde9500",
-  "test_mixed_sload_sstore_50GB_ERC20": "0x398324972FcE0e89E048c2104f1298031d1931fc",
-  "test_mixed_sload_sstore_30GB_ERC20": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C",
-  "test_mixed_sload_sstore_9_39GB_ERC20": "0xf7EfF64A1b7f3dB550A05fF2635Bb9744B8E21eb",
-  "test_mixed_sload_sstore_1GB_ERC20": "0x365cF1A2532919e1adf8650670B9e01e163a441D",
-  "test_mixed_sload_sstore_4_23MB_ERC20": "0xFdC419f77993E0E2E9Fed06299E367F6aEe909bE",
-  "test_mixed_sload_sstore_XEN": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8",
-  "test_mixed_sload_sstore_USDC": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48",
-  "test_mixed_sload_sstore_ARB": "0xad0c361ef902a7d9851ca7dcc85535da2d3c6fc7",
-  "test_mixed_sload_sstore_HST": "0x2e2a539285ce690e4c6bddd42deb7e37bdde9500",
-  "bloatnet_factory_0_5kb": "0xDf9da7E8660d38654C8aA267635222c9f5Ac0530",
-  "bloatnet_factory_1kb": "0xA52178573dc859741499946148CA1Fc3822Af600",
-  "bloatnet_factory_2kb": "0x88c159584059308C4B466bafC82c45d52De9951D",
-  "bloatnet_factory_5kb": "0x3f59809dac4b33e251e518acDadf923184151334",
-  "bloatnet_factory_10kb": "0xf90E8a6Ce32A949Ce5F58803BBa07476404cD89F",
-  "bloatnet_factory_24kb": "0x091988Afd81E0a2A3E20530A2510c089fF4bfAef"
-}
diff --git a/tests/benchmark/stateful/bloatnet/stubs_mainnet.json b/tests/benchmark/stateful/bloatnet/stubs_mainnet.json
deleted file mode 100644
index 0ec46aa09aa..00000000000
--- a/tests/benchmark/stateful/bloatnet/stubs_mainnet.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "test_sload_empty_erc20_balanceof_XEN": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8",
-  "test_sload_empty_erc20_balanceof_USDC": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48",
-  "test_sload_empty_erc20_balanceof_ARB": "0xad0c361ef902a7d9851ca7dcc85535da2d3c6fc7",
-  "test_sstore_erc20_approve_XEN": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8",
-  "test_sstore_erc20_approve_USDC": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48",
-  "test_sstore_erc20_approve_ARB": "0xad0c361ef902a7d9851ca7dcc85535da2d3c6fc7",
-  "test_mixed_sload_sstore_XEN": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8",
-  "test_mixed_sload_sstore_USDC": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48",
-  "test_mixed_sload_sstore_ARB": "0xad0c361ef902a7d9851ca7dcc85535da2d3c6fc7",
-  "test_sload_empty_erc20_balanceof_HST": "0x2e2a539285ce690e4c6bddd42deb7e37bdde9500",
-  "test_sstore_erc20_approve_HST": "0x2e2a539285ce690e4c6bddd42deb7e37bdde9500",
-  "test_mixed_sload_sstore_HST": "0x2e2a539285ce690e4c6bddd42deb7e37bdde9500",
-  "bloatnet_factory_0_5kb": "0xDf9da7E8660d38654C8aA267635222c9f5Ac0530",
-  "bloatnet_factory_1kb": "0xA52178573dc859741499946148CA1Fc3822Af600",
-  "bloatnet_factory_2kb": "0x88c159584059308C4B466bafC82c45d52De9951D",
-  "bloatnet_factory_5kb": "0x3f59809dac4b33e251e518acDadf923184151334",
-  "bloatnet_factory_10kb": "0xf90E8a6Ce32A949Ce5F58803BBa07476404cD89F",
-  "bloatnet_factory_24kb": "0x091988Afd81E0a2A3E20530A2510c089fF4bfAef"
-}
diff --git a/tests/benchmark/stateful/bloatnet/test_account_query.py b/tests/benchmark/stateful/bloatnet/test_account_query.py
index ece0cc06d9a..bbcaa785d7b 100644
--- a/tests/benchmark/stateful/bloatnet/test_account_query.py
+++ b/tests/benchmark/stateful/bloatnet/test_account_query.py
@@ -12,293 +12,97 @@
 - BALANCE
 """
 
-from typing import Dict, List
+from typing import Any
 
 import pytest
 from execution_testing import (
-    AccessList,
     Account,
     Alloc,
     BenchmarkTestFiller,
-    Block,
-    Bytecode,
-    Create2PreimageLayout,
-    Fork,
-    Hash,
-    IteratingBytecode,
+    JumpLoopGenerator,
     Op,
-    ParameterSet,
-    TestPhaseManager,
-    While,
 )
 
-from tests.benchmark.compute.helpers import (
-    ContractDeploymentTransaction,
-    CustomSizedContractFactory,
-)
-
-
-def generate_account_query_params() -> List[ParameterSet]:
-    """
-    Generate valid parameter combinations for test_account_query.
-
-    Returns tuples of: (opcode, access_warm, mem_size, code_size, value_sent)
-    """
-    all_mem_sizes = [0, 32, 256, 1024]
-    all_code_sizes = [0, 32, 256, 1024]
-    all_access_warm = [True, False]
-    all_value_sent = [0, 1]
-
-    params = []
-
-    # BALANCE, EXTCODESIZE, EXTCODEHASH:
-    # only mem_size=0, code_size=0, value_sent=0
-    for opcode in [Op.BALANCE, Op.EXTCODESIZE, Op.EXTCODEHASH]:
-        for access_warm in all_access_warm:
-            params.append(pytest.param(opcode, access_warm, 0, 0, 0))
-
-    # EXTCODECOPY: all mem_size, all code_size, value_sent=0
-    for access_warm in all_access_warm:
-        for mem_size in all_mem_sizes:
-            for code_size in all_code_sizes:
-                params.append(
-                    pytest.param(
-                        Op.EXTCODECOPY, access_warm, mem_size, code_size, 0
-                    )
-                )
-            # Add None (max_code_size) separately with custom ID
-            params.append(
-                pytest.param(
-                    Op.EXTCODECOPY,
-                    access_warm,
-                    mem_size,
-                    None,
-                    0,
-                    id=f"EXTCODECOPY-{access_warm}-{mem_size}-max_code_size-0",
-                )
-            )
-
-    # CALL, CALLCODE: all mem_size, code_size=0, all value_sent
-    for opcode in [Op.CALL, Op.CALLCODE]:
-        for access_warm in all_access_warm:
-            for mem_size in all_mem_sizes:
-                for value_sent in all_value_sent:
-                    params.append(
-                        pytest.param(
-                            opcode, access_warm, mem_size, 0, value_sent
-                        )
-                    )
-
-    # STATICCALL, DELEGATECALL: all mem_size, code_size=0, value_sent=0
-    for opcode in [Op.STATICCALL, Op.DELEGATECALL]:
-        for access_warm in all_access_warm:
-            for mem_size in all_mem_sizes:
-                params.append(
-                    pytest.param(opcode, access_warm, mem_size, 0, 0)
-                )
 
-    return params
-
-
-@pytest.mark.repricing
+@pytest.mark.repricing(
+    empty_code=True,
+    initial_balance=True,
+    initial_storage=True,
+)
 @pytest.mark.parametrize(
-    "opcode,access_warm,mem_size,code_size,value_sent",
-    generate_account_query_params(),
+    "opcode",
+    [
+        Op.BALANCE,
+        Op.EXTCODESIZE,
+        Op.EXTCODEHASH,
+        Op.CALL,
+        Op.CALLCODE,
+        Op.DELEGATECALL,
+        Op.STATICCALL,
+    ],
 )
-def test_account_query(
+@pytest.mark.parametrize(
+    "empty_code",
+    [
+        True,
+        False,
+    ],
+)
+@pytest.mark.parametrize(
+    "initial_balance",
+    [
+        True,
+        False,
+    ],
+)
+@pytest.mark.parametrize(
+    "initial_storage",
+    [
+        True,
+        False,
+    ],
+)
+def test_ext_account_query_warm(
     benchmark_test: BenchmarkTestFiller,
     pre: Alloc,
-    fork: Fork,
     opcode: Op,
-    access_warm: bool,
-    mem_size: int,
-    code_size: int,
-    value_sent: int,
-    gas_benchmark_value: int,
-    fixed_opcode_count: int | None,
+    empty_code: bool,
+    initial_balance: bool,
+    initial_storage: bool,
 ) -> None:
-    """Benchmark scenario of accessing max-code size bytecode."""
-    attack_gas_limit = gas_benchmark_value
-
-    # Create the max-sized fork-dependent contract factory.
-    custom_sized_contract_factory = CustomSizedContractFactory(
-        pre=pre, fork=fork, contract_size=code_size
-    )
-    factory_address = custom_sized_contract_factory.address()
-    initcode = custom_sized_contract_factory.initcode
-
-    # Prepare the attack iterating bytecode.
-    # Setup is just placing the CREATE2 Preimage in memory.
-    create2_preimage = Create2PreimageLayout(
-        factory_address=factory_address,
-        salt=Op.CALLDATALOAD(0),
-        init_code_hash=initcode.keccak256(),
-    )
-    setup_code: Bytecode = create2_preimage
-
-    if mem_size > 96:
-        setup_code += Op.MSTORE8(
-            mem_size - 1,
-            0,
-            # Gas accounting
-            old_memory_size=96,
-            new_memory_size=mem_size,
-        )
-
-    if opcode == Op.EXTCODECOPY:
-        attack_call = Op.EXTCODECOPY(
-            address=create2_preimage.address_op(),
-            dest_offset=0,
-            size=mem_size,
-            # Gas accounting
-            data_size=mem_size,
-            address_warm=access_warm,
-        )
-    elif opcode in (Op.CALL, Op.CALLCODE):
-        # CALL and CALLCODE accept value parameter
-        attack_call = Op.POP(
-            opcode(
-                address=create2_preimage.address_op(),
-                value=value_sent,
-                args_size=mem_size,
-                # Gas accounting
-                address_warm=access_warm,
-                new_memory_size=max(mem_size, 96),
-            )
-        )
-    elif opcode in (Op.STATICCALL, Op.DELEGATECALL):
-        # STATICCALL and DELEGATECALL don't have value parameter
-        attack_call = Op.POP(
-            opcode(
-                address=create2_preimage.address_op(),
-                args_size=mem_size,
-                # Gas accounting
-                address_warm=access_warm,
-                new_memory_size=max(mem_size, 96),
-            )
-        )
-    else:
-        # BALANCE, EXTCODESIZE, EXTCODEHASH
-        attack_call = Op.POP(
-            opcode(
-                address=create2_preimage.address_op(),
-                # Gas accounting
-                address_warm=access_warm,
-            )
-        )
-
-    loop_code = While(
-        body=attack_call + create2_preimage.increment_salt_op(),
-    )
-
-    attack_code = IteratingBytecode(
-        setup=setup_code,
-        iterating=loop_code,
-        # Since the target contract is guaranteed to have a STOP as the first
-        # instruction, we can use a STOP as the iterating subcall code.
-        iterating_subcall=Op.STOP,
-    )
-
-    # Calldata generator for each transaction of the iterating bytecode.
-    def calldata(iteration_count: int, start_iteration: int) -> bytes:
-        del iteration_count
-        # We only pass the start iteration index as calldata for this bytecode
-        return Hash(start_iteration)
-
-    # Access list generator for warm access tests.
-    # When access_warm=True, include all contract addresses that will be
-    # accessed in each transaction to warm them up via access list.
-    # Note: This access list generation is very expensive due to the binary
-    # search, which builds different access lists using the same elements
-    # over and over. Caching the elements helps a bit.
-    access_list_cache: Dict[int, AccessList] = {}
-
-    def access_list_generator(
-        iteration_count: int, start_iteration: int
-    ) -> list[AccessList] | None:
-        if not access_warm:
-            return None
-        return [
-            access_list_cache.setdefault(
-                i,
-                AccessList(
-                    address=custom_sized_contract_factory.created_contract_address(
-                        salt=i
-                    ),
-                    storage_keys=[],
-                ),
-            )
-            for i in range(start_iteration, start_iteration + iteration_count)
-        ]
-
-    attack_address = pre.deploy_contract(code=attack_code, balance=10**21)
-
-    # Calculate the number of contracts to be targeted.
-    if fixed_opcode_count is not None:
-        # Fixed opcode count mode
-        num_contracts = int(fixed_opcode_count * 1000)
-    else:
-        # Gas limit mode
-        num_contracts = sum(
-            attack_code.tx_iterations_by_gas_limit(
-                fork=fork,
-                gas_limit=attack_gas_limit,
-                calldata=calldata,
-                access_list=access_list_generator,
-            )
-        )
-
-    # Deploy num_contracts via multiple txs (each capped by tx gas limit).
+    """
+    Test running a block with as many stateful opcodes doing warm access
+    for an account.
+    """
+    # Setup
     post = {}
-    with TestPhaseManager.setup():
-        setup_sender = pre.fund_eoa()
-        contracts_deployment_txs: List[ContractDeploymentTransaction] = []
-        for contract_creating_tx in (
-            custom_sized_contract_factory.transactions_by_total_contract_count(
-                fork=fork,
-                sender=setup_sender,
-                contract_count=num_contracts,
-            )
-        ):
-            contracts_deployment_txs.append(contract_creating_tx)
-            if custom_sized_contract_factory.contract_size > 0:
-                post[contract_creating_tx.deployed_contracts[-1]] = Account(
-                    nonce=1
-                )
 
-    with TestPhaseManager.execution():
-        attack_sender = pre.fund_eoa()
-        if fixed_opcode_count is not None:
-            attack_txs = list(
-                attack_code.transactions_by_total_iteration_count(
-                    fork=fork,
-                    total_iterations=int(fixed_opcode_count * 1000),
-                    sender=attack_sender,
-                    to=attack_address,
-                    calldata=calldata,
-                    access_list=access_list_generator,
-                )
-            )
-        else:
-            attack_txs = list(
-                attack_code.transactions_by_gas_limit(
-                    fork=fork,
-                    gas_limit=attack_gas_limit,
-                    sender=attack_sender,
-                    to=attack_address,
-                    calldata=calldata,
-                    access_list=access_list_generator,
-                )
-            )
-        total_gas_cost = sum(tx.gas_cost for tx in attack_txs)
+    # Case 1: Completely empty account (no balance, no storage, no code)
+    if not initial_balance and not initial_storage and empty_code:
+        target_addr = pre.nonexistent_account()
+    # Case 2: EOA with optional balance and storage
+    elif empty_code:
+        eoa_kwargs: dict[str, Any] = {}
+        if initial_balance:
+            eoa_kwargs["amount"] = 100
+        if initial_storage:
+            eoa_kwargs["storage"] = {0: 0x1337}
+        target_addr = pre.fund_eoa(**eoa_kwargs)
+    # Case 3: Contract with optional balance and storage
+    else:
+        contract_kwargs: dict[str, Any] = {"code": Op.STOP + Op.JUMPDEST * 100}
+        if initial_balance:
+            contract_kwargs["balance"] = 100
+        if initial_storage:
+            contract_kwargs["storage"] = {0: 0x1337}
+        target_addr = pre.deploy_contract(**contract_kwargs)
+        post[target_addr] = Account(**contract_kwargs)
 
     benchmark_test(
-        pre=pre,
-        post=post,
-        blocks=[
-            Block(txs=contracts_deployment_txs),
-            Block(txs=attack_txs),
-        ],
         target_opcode=opcode,
-        expected_benchmark_gas_used=total_gas_cost,
+        post=post,
+        code_generator=JumpLoopGenerator(
+            setup=Op.MSTORE(0, target_addr),
+            attack_block=Op.POP(opcode(address=Op.MLOAD(0))),
+        ),
     )
diff --git a/tests/benchmark/stateful/bloatnet/test_bloatnet.py b/tests/benchmark/stateful/bloatnet/test_bloatnet.py
deleted file mode 100755
index e489de3aafe..00000000000
--- a/tests/benchmark/stateful/bloatnet/test_bloatnet.py
+++ /dev/null
@@ -1,6 +0,0 @@
-"""
-abstract: Tests benchmark worst-case bloatnet scenarios.
-    Tests benchmark worst-case bloatnet scenarios.
-
-Tests running worst-case bloatnet scenarios for benchmarking purposes.
-"""
diff --git a/tests/benchmark/stateful/bloatnet/test_extcodesize_bytecode_sizes.py b/tests/benchmark/stateful/bloatnet/test_extcodesize_bytecode_sizes.py
index 83812420f7f..8aedd7c376d 100644
--- a/tests/benchmark/stateful/bloatnet/test_extcodesize_bytecode_sizes.py
+++ b/tests/benchmark/stateful/bloatnet/test_extcodesize_bytecode_sizes.py
@@ -43,7 +43,7 @@
   --rpc-seed-key <SEED_KEY> \\
   --rpc-chain-id 1337 \\
   --address-stubs tests/benchmark/stateful/bloatnet/stubs.json \\
-  -- -m stateful --gas-benchmark-values 60 \\
+  -- --gas-benchmark-values 60 \\
   tests/benchmark/stateful/bloatnet/test_extcodesize_bytecode_sizes.py \\
   -k '24KB' -v
 ```
@@ -57,7 +57,7 @@
   --rpc-seed-key <SEED_KEY> \\
   --rpc-chain-id 1337 \\
   --address-stubs tests/benchmark/stateful/bloatnet/stubs.json \\
-  -- -m stateful --gas-benchmark-values 60 \\
+  -- --gas-benchmark-values 60 \\
   tests/benchmark/stateful/bloatnet/test_extcodesize_bytecode_sizes.py -v
 ```
 """
diff --git a/tests/benchmark/stateful/bloatnet/test_multi_opcode.py b/tests/benchmark/stateful/bloatnet/test_multi_opcode.py
index 28bfee53199..4e38786bb37 100755
--- a/tests/benchmark/stateful/bloatnet/test_multi_opcode.py
+++ b/tests/benchmark/stateful/bloatnet/test_multi_opcode.py
@@ -16,7 +16,6 @@
     Conditional,
     Create2PreimageLayout,
     Fork,
-    Hash,
     Op,
     Transaction,
     While,
@@ -26,8 +25,6 @@
     APPROVE_SELECTOR,
     BALANCEOF_SELECTOR,
     DECREMENT_COUNTER_CONDITION,
-    FACTORY_STUBS,
-    MIXED_TOKENS,
     build_benchmark_txs,
 )
 
@@ -59,11 +56,7 @@
 #   4. Attack rapidly accesses all contracts per factory stub
 
 
-@pytest.mark.parametrize(
-    "factory_stub",
-    FACTORY_STUBS,
-    ids=lambda s: s.replace("bloatnet_factory_", "").upper(),
-)
+@pytest.mark.stub_parametrize("factory_stub", "bloatnet_factory_")
 @pytest.mark.parametrize(
     "second_opcode",
     [Op.EXTCODESIZE, Op.EXTCODECOPY, Op.EXTCODEHASH, Op.STATICCALL, Op.CALL],
@@ -215,7 +208,7 @@ def test_bloatnet_balance_opcode(
 #   test_bloatnet_call_value_existing:
 #   Same factory pattern as test_bloatnet_balance_opcode, but performs
 #   CALL with value=1 wei to each factory contract. The subcall fails
-#   (insufficient gas for 24KB bytecode), but GAS_CALL_VALUE (9000 gas)
+#   (insufficient gas for 24KB bytecode), but CALL_VALUE (9000 gas)
 #   is still charged on top of the cold account access cost.
 #
 #   test_bloatnet_call_value_new_account:
@@ -226,11 +219,7 @@ def test_bloatnet_balance_opcode(
 #   stressing trie expansion through massive new account creation.
 
 
-@pytest.mark.parametrize(
-    "factory_stub",
-    FACTORY_STUBS,
-    ids=lambda s: s.replace("bloatnet_factory_", "").upper(),
-)
+@pytest.mark.stub_parametrize("factory_stub", "bloatnet_factory_")
 def test_bloatnet_call_value_existing(
     benchmark_test: BenchmarkTestFiller,
     pre: Alloc,
@@ -243,7 +232,7 @@ def test_bloatnet_call_value_existing(
     Benchmark CALL with value transfer to cold existing factory contracts.
 
     Unlike the existing CALL test which uses gas=1 and value=0, this test
-    passes value=1 wei per call, adding GAS_CALL_VALUE (9000 gas) to each
+    passes value=1 wei per call, adding CALL_VALUE (9000 gas) to each
     cold account access. The subcall fails (insufficient gas for bytecode
     execution), so value is not actually transferred, but the gas penalty
     is still charged.
@@ -343,8 +332,8 @@ def test_bloatnet_call_value_new_account(
     (via the 2300 gas stipend), transferring value and creating a new
     account in the trie. Each iteration costs ~36,600 gas:
     - GAS_COLD_ACCOUNT_ACCESS: 2,600
-    - GAS_CALL_VALUE: 9,000
-    - GAS_NEW_ACCOUNT: 25,000
+    - CALL_VALUE: 9,000
+    - NEW_ACCOUNT: 25,000
 
     This stresses trie expansion through massive new account creation.
     """
@@ -412,7 +401,7 @@ def test_bloatnet_call_value_new_account(
     )
 
 
-@pytest.mark.parametrize("token_name", MIXED_TOKENS)
+@pytest.mark.stub_parametrize("erc20_stub", "test_mixed_sload_sstore_")
 @pytest.mark.parametrize(
     "sload_percent,sstore_percent",
     [
@@ -429,62 +418,94 @@ def test_mixed_sload_sstore(
     fork: Fork,
     gas_benchmark_value: int,
     tx_gas_limit: int,
-    token_name: str,
+    erc20_stub: str,
     sload_percent: int,
     sstore_percent: int,
 ) -> None:
-    """Benchmark mixed SLOAD/SSTORE on bloatnet."""
+    """
+    Benchmark mixed SLOAD/SSTORE on bloatnet.
+
+    Uses runtime gas checking instead of pre-calculated iteration
+    counts.  Each ERC20 contract has its own implementation with
+    different per-call gas costs, so a single gas model cannot
+    predict the right iteration count.  Instead the contract
+    checks remaining gas via the GAS opcode each iteration and
+    splits the budget between SLOAD and SSTORE phases using a
+    pre-computed gas floor.
+    """
+    # The gas threshold is the minimum gas reserved to exit the
+    # loops and execute cleanup (SSTORE to persist slot offset).
+    # 150_000 is conservative: cold approve ~25K + cleanup ~20K.
+    gas_threshold = 150_000
+    slot_offset_key = 0  # storage slot for persistent offset
+
     # Stub Account
     erc20_address = pre.deploy_contract(
         code=Bytecode(),
-        stub=f"test_mixed_sload_sstore_{token_name}",
+        stub=erc20_stub,
     )
 
     # Contract Construction
-    # MEM[0] = function selector
-    # MEM[32] = address/slot offset (incremented each iteration)
-    # MEM[64] = spender/amount for approve (copied from MEM[32])
+    # MEM[0]   = function selector
+    # MEM[32]  = address/slot offset (incremented each iteration)
+    # MEM[64]  = spender/amount for approve (copied from MEM[32])
+    # MEM[96]  = initial_gas snapshot
+    # MEM[128] = gas_floor for SLOAD phase
     setup = (
         Op.MSTORE(
             0,
             BALANCEOF_SELECTOR,
-            # gas accounting
             old_memory_size=0,
             new_memory_size=32,
         )
         + Op.MSTORE(
             32,
-            Op.CALLDATALOAD(64),  # Slot Offset
-            # gas accounting
+            Op.SLOAD(slot_offset_key),
             old_memory_size=32,
             new_memory_size=64,
         )
-        + Op.CALLDATALOAD(0)  # [num_sload_calls]
+        + Op.MSTORE(
+            96,
+            Op.GAS,
+            old_memory_size=64,
+            new_memory_size=128,
+        )
+        # gas_floor = initial_gas * sstore_percent / 100
+        # This is the gas level at which SLOADs stop and
+        # SSTOREs begin, leaving sstore_percent of the
+        # initial gas for the SSTORE phase.
+        + Op.MSTORE(
+            128,
+            Op.DIV(Op.MUL(Op.MLOAD(96), sstore_percent), 100),
+            old_memory_size=128,
+            new_memory_size=160,
+        )
     )
 
+    # SLOAD loop — STATICCALL since balanceOf is a view function.
+    # Continues while both: gas is above the sload/sstore
+    # transition floor AND above the safety threshold.
     sload_loop = While(
         body=Op.POP(
-            Op.CALL(
+            Op.STATICCALL(
                 address=erc20_address,
-                value=0,
                 args_offset=28,
                 args_size=36,
                 ret_offset=0,
                 ret_size=0,
-                # gas accounting
                 address_warm=True,
             )
         )
         + Op.MSTORE(32, Op.ADD(Op.MLOAD(32), 1)),
-        condition=DECREMENT_COUNTER_CONDITION,
+        condition=Op.AND(
+            Op.GT(Op.GAS, Op.MLOAD(128)),
+            Op.GT(Op.GAS, gas_threshold),
+        ),
     )
 
-    transition = (
-        Op.POP  # remove 0 counter from sload loop
-        + Op.MSTORE(0, APPROVE_SELECTOR)
-        + Op.CALLDATALOAD(32)  # [num_sstore_calls]
-    )
+    transition = Op.MSTORE(0, APPROVE_SELECTOR)
 
+    # SSTORE loop — runs until gas drops below safety threshold.
     sstore_loop = While(
         body=(
             Op.MSTORE(64, Op.MLOAD(32))
@@ -496,159 +517,51 @@ def test_mixed_sload_sstore(
                     args_size=68,
                     ret_offset=0,
                     ret_size=0,
-                    # gas accounting
                     address_warm=True,
                 )
             )
             + Op.MSTORE(32, Op.ADD(Op.MLOAD(32), 1))
         ),
-        condition=DECREMENT_COUNTER_CONDITION,
+        condition=Op.GT(Op.GAS, gas_threshold),
     )
 
-    # Contract Deployment
-    code = setup + sload_loop + transition + sstore_loop
-    attack_contract_address = pre.deploy_contract(code=code)
+    # Persist the final slot offset so the next tx continues
+    # from where this one left off.
+    cleanup = Op.SSTORE(slot_offset_key, Op.MLOAD(32))
 
-    # Gas Accounting
-    setup_cost = setup.gas_cost(fork)
-    sload_loop_cost = sload_loop.gas_cost(fork)
-    transition_cost = transition.gas_cost(fork)
-    sstore_loop_cost = sstore_loop.gas_cost(fork)
+    # Contract Deployment
+    code = setup + sload_loop + transition + sstore_loop + cleanup
+    attack_contract_address = pre.deploy_contract(
+        code=code,
+        storage={slot_offset_key: 0},
+    )
 
+    # Transaction Construction — no iteration count math.
+    # Each tx gets up to tx_gas_limit gas; the contract
+    # self-regulates via the GAS opcode.
     access_list = [AccessList(address=erc20_address, storage_keys=[])]
-    intrinsic_cost_calc = fork.transaction_intrinsic_cost_calculator()
-    max_intrinsic = intrinsic_cost_calc(
+    intrinsic_gas_cost = fork.transaction_intrinsic_cost_calculator()(
         access_list=access_list,
-        calldata=b"\xff" * 96,
-    )
-
-    # ERC20 balanceOf bytecode structure (gas cost model):
-    sload_dispatch = (
-        # Selector dispatch
-        Op.PUSH4(BALANCEOF_SELECTOR)
-        + Op.EQ
-        + Op.JUMPI
-        # Function body
-        + Op.JUMPDEST
-        + Op.MSTORE(0, Op.CALLDATALOAD(4))
-        + Op.MSTORE(32, 0)
-        + Op.MSTORE(
-            0,
-            Op.SLOAD(
-                Op.SHA3(
-                    0,
-                    64,
-                    # gas accounting
-                    data_size=64,
-                    old_memory_size=0,
-                    new_memory_size=64,
-                )
-            ),
-        )
-        + Op.RETURN(0, 32)
-    )
-
-    sload_dispatch_cost = sload_dispatch.gas_cost(fork)
-
-    # ERC20 approve bytecode structure (gas cost model):
-    sstore_dispatch = (
-        # Selector dispatch
-        Op.PUSH4(APPROVE_SELECTOR)
-        + Op.EQ
-        + Op.JUMPI
-        # Function body
-        + Op.JUMPDEST
-        + Op.CALLDATALOAD(4)
-        + Op.CALLDATALOAD(36)
-        + Op.MSTORE(0, Op.CALLER)
-        + Op.MSTORE(32, 1)
-        + Op.MSTORE(
-            32,
-            Op.SHA3(
-                0,
-                64,
-                # gas accounting
-                data_size=64,
-                old_memory_size=0,
-                new_memory_size=64,
-            ),
-        )
-        + Op.MSTORE(0, Op.CALLDATALOAD(4))
-        + Op.SHA3(
-            0,
-            64,
-            # gas accounting
-            data_size=64,
-        )
-        + Op.DUP1
-        + Op.SLOAD.with_metadata(key_warm=False)
-        + Op.POP
-        + Op.SSTORE
-        # Return true
-        + Op.MSTORE(0, 1)
-        + Op.RETURN(0, 32)
     )
 
-    sstore_dispatch_cost = sstore_dispatch.gas_cost(fork)
-
-    sload_iter_cost = sload_loop_cost + sload_dispatch_cost
-    sstore_iter_cost = sstore_loop_cost + sstore_dispatch_cost
-    fixed_overhead = max_intrinsic + setup_cost + transition_cost
-
-    # Attack Loop
     gas_remaining = gas_benchmark_value
     txs = []
-    slot_offset = 0
-    total_gas_consumed = 0
-
-    while gas_remaining > fixed_overhead + sload_iter_cost + sstore_iter_cost:
-        gas_available = min(gas_remaining, tx_gas_limit)
-
-        if gas_available < fixed_overhead + sload_iter_cost + sstore_iter_cost:
-            break
-
-        available = gas_available - fixed_overhead
-        sload_gas = (available * sload_percent) // 100
-        sstore_gas = (available * sstore_percent) // 100
-
-        num_sload = sload_gas // sload_iter_cost
-        num_sstore = sstore_gas // sstore_iter_cost
-
-        if num_sload == 0 or num_sstore == 0:
-            break
-
-        calldata = Hash(num_sload) + Hash(num_sstore) + Hash(slot_offset)
-        actual_intrinsic = intrinsic_cost_calc(
-            access_list=access_list,
-            calldata=bytes(calldata),
-            return_cost_deducted_prior_execution=True,
-        )
-        tx_gas = (
-            actual_intrinsic
-            + setup_cost
-            + transition_cost
-            + num_sload * sload_iter_cost
-            + num_sstore * sstore_iter_cost
-        )
-
+    while gas_remaining >= intrinsic_gas_cost + gas_threshold:
+        gas_limit = min(gas_remaining, tx_gas_limit)
         txs.append(
             Transaction(
-                gas_limit=tx_gas,
-                data=calldata,
+                gas_limit=gas_limit,
                 to=attack_contract_address,
                 sender=pre.fund_eoa(),
                 access_list=access_list,
             )
         )
-
-        total_gas_consumed += tx_gas
-        gas_remaining -= gas_available
-        slot_offset += num_sload + num_sstore
+        gas_remaining -= gas_limit
 
     assert txs, "Gas loop produced zero transactions"
     benchmark_test(
         pre=pre,
         blocks=[Block(txs=txs)],
-        expected_benchmark_gas_used=total_gas_consumed,
         skip_gas_used_validation=True,
+        expected_receipt_status=True,
     )
diff --git a/tests/benchmark/stateful/bloatnet/test_single_opcode.py b/tests/benchmark/stateful/bloatnet/test_single_opcode.py
index 74d6557c1ac..6f97d3ff8ec 100644
--- a/tests/benchmark/stateful/bloatnet/test_single_opcode.py
+++ b/tests/benchmark/stateful/bloatnet/test_single_opcode.py
@@ -9,7 +9,7 @@
 
 from enum import Enum, auto
 from functools import partial
-from typing import Callable, List
+from typing import Generator, List
 
 import pytest
 from execution_testing import (
@@ -18,8 +18,12 @@
     Address,
     Alloc,
     AuthorizationTuple,
+    BalAccountExpectation,
+    BalNonceChange,
+    BalStorageSlot,
     BenchmarkTestFiller,
     Block,
+    BlockAccessListExpectation,
     Bytecode,
     CreatePreimageLayout,
     Fork,
@@ -37,16 +41,13 @@
 from execution_testing.base_types.base_types import Number
 
 from tests.benchmark.stateful.helpers import (
-    ALLOWANCE_SELECTOR,
     APPROVE_SELECTOR,
     BALANCEOF_SELECTOR,
-    DECREMENT_COUNTER_CONDITION,
-    MINT_SELECTOR,
-    SLOAD_TOKENS,
-    SSTORE_MINT_TOKENS,
-    SSTORE_TOKENS,
     CacheStrategy,
     build_cache_strategy_blocks,
+    build_delegated_storage_setup,
+    create_sstore_initializer,
+    initializer_calldata_generator,
 )
 
 REFERENCE_SPEC_GIT_PATH = "DUMMY/bloatnet.md"
@@ -60,55 +61,144 @@
     % (2**160)
 )
 
-# SLOAD BENCHMARK ARCHITECTURE:
-#
-#   [Pre-deployed ERC20 Contract] ──── Storage slots for balances
-#           │
-#           │  balanceOf(address) → SLOAD(keccak256(address || slot))
-#           │
-#   [Attack Contract] ──CALL──► ERC20.balanceOf(random_address)
-#           │
-#           └─► Loop(i=0 to N):
-#                 1. Generate random address from counter
-#                 2. CALL balanceOf(random_address) → forces cold SLOAD
-#                 3. Most addresses have zero balance → empty storage slots
-#
-# WHY IT STRESSES CLIENTS:
-#   - Each balanceOf() call forces a cold SLOAD on a likely-empty slot
-#   - Storage slot = keccak256(address || balances_slot)
-#   - Random addresses ensure maximum cache misses
-#   - Tests client's sparse storage handling efficiency
 
+def _max_sloads_per_tx(tx_gas_limit: int, fork: Fork) -> int:
+    """
+    Conservative upper bound on cold SLOADs that fit in a max-gas tx.
 
-# SSTORE BENCHMARK ARCHITECTURE:
-#
-#   [Pre-deployed ERC20 Contract] ──── Storage slots for allowances
-#           │
-#           │  approve(spender, amount)
-#           │    → SSTORE(keccak256(spender || slot), amount)
-#           │
-#   [Attack Contract]
-#       ──CALL──► ERC20.approve(counter_as_spender, counter_as_amount)
-#           │
-#           └─► Loop(i=0 to N):
-#                 1. Use counter as both spender address and amount
-#                 2. CALL approve(counter, counter) → forces cold SSTORE
-#                 3. Writes to new allowance slots in sparse storage
-#
-# WHY IT STRESSES CLIENTS:
-#   - Each approve() call forces an SSTORE to a new storage slot
-#   - Storage slot = keccak256(
-#       msg.sender || keccak256(spender || allowances_slot)
-#     )
-#   - Sequential counter ensures unique storage locations
-#   - Tests client's ability to handle many storage writes
-#   - Simulates real-world contract state accumulation over time
+    Derived from the cold SLOAD cost (EIP-2929: 2100 gas) and used by
+    the bloated SLOAD benchmarks both as the inter-tx offset stride
+    (to keep consecutive txs' SLOAD ranges disjoint) and as the
+    per-target storage pre-load count.
+    """
+    cold_sload_cost = Op.SLOAD(key_warm=False).gas_cost(fork)
+    return tx_gas_limit // cold_sload_cost
+
+
+def _sender_generator(
+    pre: Alloc, distinct_senders: bool
+) -> Generator[EOA, None, None]:
+    """
+    Yield one sender per tx.
+
+    In distinct mode, yields a fresh EOA per call. Otherwise, yields
+    the same shared sender for every call. Used by the bloated SLOAD
+    benchmarks so the BAL builder can group nonce changes by sender
+    uniformly regardless of mode.
+    """
+    shared_sender = pre.fund_eoa() if not distinct_senders else None
+    while True:
+        yield pre.fund_eoa() if shared_sender is None else shared_sender
+
+
+def delegate_with_calldata(
+    pre: Alloc,
+    authority: EOA,
+    address: Address,
+    calldata: Hash,
+) -> Transaction:
+    """
+    Create a tx that delegates the authority and calls it with calldata.
+
+    The delegated code determines what happens with the calldata.
+    The authority nonce is incremented in-place.
+    """
+    tx = Transaction(
+        gas_limit=100_000,
+        to=authority,
+        value=0,
+        data=calldata,
+        sender=pre.fund_eoa(),
+        authorization_list=[
+            AuthorizationTuple(
+                chain_id=0,
+                address=address,
+                nonce=authority.nonce,
+                signer=authority,
+            ),
+        ],
+    )
+    authority.nonce = Number(authority.nonce + 1)
+    return tx
 
 
-@pytest.mark.parametrize("token_name", SLOAD_TOKENS)
+def run_bloated_eoa_benchmark(
+    *,
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    authority: EOA,
+    existing_slots: bool,
+    runtime_code: Bytecode,
+    cache_strategy: CacheStrategy,
+) -> None:
+    """
+    Run a bloated-EOA benchmark with the given runtime delegation code.
+
+    Handles authority setup, slot 0 initialization, delegation to
+    runtime code, benchmark tx generation, and test invocation.
+    """
+    slot_0_value = Hash(1) if existing_slots else Hash(START_SLOT)
+
+    setter_address = pre.deploy_contract(code=Op.SSTORE(0, Op.CALLDATALOAD(0)))
+    runtime_address = pre.deploy_contract(code=runtime_code)
+
+    init_tx = delegate_with_calldata(
+        pre, authority, setter_address, slot_0_value
+    )
+    runtime_tx = delegate_with_calldata(
+        pre, authority, runtime_address, Hash(0)
+    )
+
+    blocks: list[Block] = [Block(txs=[init_tx, runtime_tx])]
+
+    gas_available = gas_benchmark_value
+    intrinsic_gas = fork.transaction_intrinsic_cost_calculator()()
+    sender = pre.fund_eoa()
+
+    txs: list[Transaction] = []
+    with TestPhaseManager.execution():
+        while gas_available >= intrinsic_gas:
+            tx_gas = min(gas_available, tx_gas_limit)
+            txs.append(
+                Transaction(
+                    gas_limit=tx_gas,
+                    to=authority,
+                    sender=sender,
+                )
+            )
+            gas_available -= tx_gas
+
+    cache_txs: list[Transaction] = []
+    if cache_strategy == CacheStrategy.CACHE_PREVIOUS_BLOCK:
+        with TestPhaseManager.setup():
+            cache_sender = pre.fund_eoa()
+            for tx in txs:
+                cache_txs.append(
+                    Transaction(
+                        gas_limit=tx.gas_limit,
+                        to=authority,
+                        sender=cache_sender,
+                    )
+                )
+
+    blocks += build_cache_strategy_blocks(cache_strategy, txs, cache_txs)
+
+    benchmark_test(
+        pre=pre,
+        blocks=blocks,
+        skip_gas_used_validation=True,
+        expected_receipt_status=True,
+    )
+
+
+@pytest.mark.repricing
+@pytest.mark.stub_parametrize("token_name", "bloated_eoa_")
 @pytest.mark.parametrize("existing_slots", [False, True])
 @pytest.mark.parametrize("cache_strategy", list(CacheStrategy))
-def test_sload_erc20_balanceof(
+def test_sload_bloated(
     benchmark_test: BenchmarkTestFiller,
     pre: Alloc,
     fork: Fork,
@@ -118,166 +208,378 @@ def test_sload_erc20_balanceof(
     existing_slots: bool,
     cache_strategy: CacheStrategy,
 ) -> None:
-    """Benchmark SLOAD using ERC20 balanceOf on bloatnet."""
-    # Stub Account
-    erc20_address = pre.deploy_contract(
-        code=Bytecode(),
-        stub=f"test_sload_empty_erc20_balanceof_{token_name}",
-    )
+    """
+    Benchmark SLOAD opcodes targeting an EOA with storage bloated.
 
-    # MEM[0] = function selector
-    # MEM[32] = starting address offset
-    setup = (
-        Op.MSTORE(
-            0,
-            BALANCEOF_SELECTOR,
-            # gas accounting
-            old_memory_size=0,
-            new_memory_size=32,
-        )
-        + Op.MSTORE(
-            32,
-            Op.CALLDATALOAD(32),  # Address Offset
-            # gas accounting
-            old_memory_size=32,
-            new_memory_size=64,
+    The storage is assumed to be filled from 0-N linearly, where
+    each slot has the value of the key. If this is not the
+    storage layout of the target account, then the existing_slots
+    parameter will not be correct.
+    """
+    slot_access = (
+        Op.DUP1  # [index, index]
+        + Op.SLOAD  # [s[index], index]
+        + Op.POP  # [index]
+    )
+    # CACHE_TX: access each slot twice so the second hit is uncached
+    if cache_strategy == CacheStrategy.CACHE_TX:
+        slot_access *= 2
+
+    runtime_code = (
+        Op.PUSH0  # [0]
+        + Op.SLOAD  # [index], s[0] = index
+        + While(
+            body=(
+                slot_access
+                + Op.PUSH1(1)  # [1, index]
+                + Op.ADD  # [index+1]
+            ),
+            condition=Op.GT(Op.GAS, 0xFFFF),
         )
-        + Op.CALLDATALOAD(0)  # [num_calls]
+        + Op.PUSH0  # [0, index+1]
+        + Op.SSTORE  # s[0] = index+1
     )
 
-    call_balance_of = Op.POP(
-        Op.CALL(
-            address=erc20_address,
-            value=0,
-            args_offset=32 - 4,
-            args_size=32 + 4,
-            ret_offset=0,
-            ret_size=0,
-            # gas accounting
-            address_warm=True,
-        )
+    run_bloated_eoa_benchmark(
+        benchmark_test=benchmark_test,
+        pre=pre,
+        fork=fork,
+        gas_benchmark_value=gas_benchmark_value,
+        tx_gas_limit=tx_gas_limit,
+        authority=pre.stub_eoa(token_name),
+        existing_slots=existing_slots,
+        runtime_code=runtime_code,
+        cache_strategy=cache_strategy,
     )
 
-    cache_loop = (
-        call_balance_of
-        if cache_strategy == CacheStrategy.CACHE_TX
-        else Bytecode()
+
+@pytest.mark.stub_parametrize("token_name", "bloated_eoa_")
+@pytest.mark.parametrize("distinct_senders", [False, True])
+@pytest.mark.parametrize("existing_slots", [False, True])
+def test_sload_bloated_prefetch_miss(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    token_name: str,
+    existing_slots: bool,
+    distinct_senders: bool,
+) -> None:
+    """
+    Benchmark SLOAD with calldata-driven offsets to defeat prefetching.
+
+    A small first transaction writes an initial offset into the
+    authority's slot 0 via calldata. Subsequent max-gas transactions
+    each read the previous offset from slot 0, immediately overwrite
+    slot 0 with a new offset from their own calldata, then SLOAD
+    sequentially from the previous offset. Because each transaction's
+    SLOAD range depends on state written by its predecessor, a
+    prefetcher that predicts SLOAD targets from pre-block state
+    without simulating intra-block writes will pre-warm incorrect
+    storage slots. The minimal first tx is load-bearing: it lives
+    inside the benchmark block so every subsequent max-gas tx reads
+    a slot 0 value that differs from the prefetcher's pre-block
+    snapshot, achieving a 100% miss rate.
+
+    When ``distinct_senders`` is True every transaction uses a fresh
+    sender. This additionally defeats per-sender prewarm
+    serialization (e.g. Nethermind) that groups txs by sender and
+    runs them sequentially to propagate state changes — forcing
+    every tx's prewarm scope to restart from pre-block state.
+    """
+    # Runtime: read old offset from slot 0, write new offset from
+    # calldata to slot 0, then SLOAD sequentially from old offset.
+    runtime_code = (
+        Op.SLOAD(Op.PUSH0)
+        + Op.SSTORE(Op.PUSH0, Op.CALLDATALOAD(Op.PUSH0))
+        + While(
+            body=(Op.DUP1 + Op.SLOAD + Op.POP + Op.PUSH1(1) + Op.ADD),
+            condition=Op.GT(Op.GAS, 0xFFFF),
+        )
     )
 
-    loop = While(
-        body=call_balance_of
-        # Do the same call again for the cached variant
-        + cache_loop
-        + Op.MSTORE(32, Op.ADD(Op.MLOAD(32), 1)),
-        condition=DECREMENT_COUNTER_CONDITION,
+    authority = pre.stub_eoa(token_name)
+    runtime_address = pre.deploy_contract(code=runtime_code)
+
+    # Setup: delegate authority to the runtime contract. Slot 0 is
+    # left at 0 (the delegation tx's calldata) so the benchmark
+    # block's pre-state has slot 0 = 0; the first benchmark tx
+    # then plants base_offset in slot 0 inside the benchmark block,
+    # forcing the prefetcher's pre-block snapshot to disagree with
+    # the actual slot 0 value seen by every max-gas tx that follows.
+    delegation_tx = delegate_with_calldata(
+        pre, authority, runtime_address, Hash(0)
     )
 
-    # Contract Deployment
-    code = setup + loop
-    attack_contract_address = pre.deploy_contract(code=code)
+    blocks: list[Block] = [Block(txs=[delegation_tx])]
 
-    # Gas Accounting
-    setup_cost = setup.gas_cost(fork)
-    loop_cost = loop.gas_cost(fork)
+    # Offset spacing: upper bound on SLOADs per tx ensures each
+    # transaction reads a completely disjoint slot range.
+    max_sloads_per_tx = _max_sloads_per_tx(tx_gas_limit, fork)
 
-    access_list = [AccessList(address=erc20_address, storage_keys=[])]
-    intrinsic_gas_with_access_list = (
-        fork.transaction_intrinsic_cost_calculator()(
-            access_list=access_list,
-            calldata=b"\xff" * 64,
-        )
+    # The base offset must be at least max_sloads_per_tx away from
+    # the pre-block slot 0 value (0) so the prefetcher's predicted
+    # SLOAD range is completely disjoint from the actual range.
+    base_offset = max_sloads_per_tx if existing_slots else START_SLOT
+    intrinsic_gas = fork.transaction_intrinsic_cost_calculator()(
+        calldata=b"\xff" * 32,
     )
 
-    # ERC20 balanceOf bytecode structure:
-    function_dispatch = (
-        # Selector dispatch
-        Op.PUSH4(BALANCEOF_SELECTOR)
-        + Op.EQ
-        + Op.JUMPI
-        # Function body
-        + Op.JUMPDEST
-        + Op.MSTORE(0, Op.CALLDATALOAD(4))
-        + Op.MSTORE(32, 0)
-        + Op.MSTORE(
-            0,
-            Op.SLOAD(
-                Op.SHA3(
-                    0,
-                    64,
-                    # gas accounting
-                    data_size=64,
-                    old_memory_size=0,
-                    new_memory_size=64,
-                )
+    # senders_iter yields one sender per tx (fresh per call in
+    # distinct mode, a single shared sender otherwise). The senders
+    # list collects one entry per tx so the BAL builder below can
+    # group nonce changes by sender uniformly.
+    senders_iter = _sender_generator(pre, distinct_senders)
+    senders: list[EOA] = []
+
+    gas_available = gas_benchmark_value
+    txs: list[Transaction] = []
+
+    # First transaction: minimal gas, only writes the initial
+    # offset. Gas limit ensures remaining gas after the SLOAD +
+    # SSTORE setup falls below the 0xFFFF loop threshold so the
+    # SLOAD loop does not run. This tx's job is to change slot 0
+    # inside the benchmark block so every subsequent max-gas tx
+    # reads an offset the prefetcher's pre-block snapshot does
+    # not see, achieving a 100% prefetch miss rate on max-gas txs.
+    first_tx_gas = min(gas_available, intrinsic_gas + 30_000)
+    sender = next(senders_iter)
+    senders.append(sender)
+    txs.append(
+        Transaction(
+            gas_limit=first_tx_gas,
+            to=authority,
+            data=Hash(base_offset),
+            sender=sender,
+        )
+    )
+    gas_available -= first_tx_gas
+
+    # Subsequent transactions: max gas, each shifts the offset
+    # so the next transaction SLOADs from a different range.
+    tx_index = 1
+    while gas_available >= intrinsic_gas:
+        tx_gas = min(gas_available, tx_gas_limit)
+        new_offset = base_offset + tx_index * max_sloads_per_tx
+        sender = next(senders_iter)
+        senders.append(sender)
+        txs.append(
+            Transaction(
+                gas_limit=tx_gas,
+                to=authority,
+                data=Hash(new_offset),
+                sender=sender,
+            )
+        )
+        gas_available -= tx_gas
+        tx_index += 1
+
+    expectations: dict[Address, BalAccountExpectation] = {
+        authority: BalAccountExpectation(
+            storage_reads=[base_offset],
+            storage_changes=[
+                BalStorageSlot(
+                    slot=0,
+                    validate_any_change=True,
+                ),
+            ],
+        ),
+    }
+    sender_nonces: dict[Address, list[BalNonceChange]] = {}
+    for i, s in enumerate(senders):
+        changes = sender_nonces.setdefault(s, [])
+        changes.append(
+            BalNonceChange(
+                block_access_index=i + 1,
+                post_nonce=len(changes) + 1,
+            )
+        )
+    for addr, nonces in sender_nonces.items():
+        expectations[addr] = BalAccountExpectation(nonce_changes=nonces)
+    blocks.append(
+        Block(
+            txs=txs,
+            expected_block_access_list=BlockAccessListExpectation(
+                account_expectations=expectations,
             ),
         )
-        + Op.RETURN(0, 32)
     )
 
-    function_dispatch_cost = function_dispatch.gas_cost(fork)
-
-    # Transaction Loops
-    txs = []
-    cache_txs = []
-    gas_remaining = gas_benchmark_value
-    # Start offset
-    slot_offset = 1 if existing_slots else START_SLOT
-
-    while gas_remaining > intrinsic_gas_with_access_list:
-        gas_available = min(gas_remaining, tx_gas_limit)
-
-        if gas_available < intrinsic_gas_with_access_list + setup_cost:
-            break
-
-        num_calls = (
-            gas_available - intrinsic_gas_with_access_list - setup_cost
-        ) // (function_dispatch_cost + loop_cost)
+    benchmark_test(
+        pre=pre,
+        blocks=blocks,
+        skip_gas_used_validation=True,
+        expected_receipt_status=True,
+    )
 
-        if num_calls == 0:
-            break
 
-        calldata = Hash(num_calls) + Hash(slot_offset)
+@pytest.mark.parametrize("distinct_senders", [False, True])
+@pytest.mark.parametrize("existing_slots", [False, True])
+def test_sload_bloated_multi_contract(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    existing_slots: bool,
+    distinct_senders: bool,
+) -> None:
+    """
+    Benchmark SLOAD across a distinct contract per transaction.
+
+    Each transaction calls a freshly-deployed contract whose slot 0
+    is pre-loaded with the starting offset; the contract then runs a
+    SLOAD loop over sequential slots until gas runs low. Unlike
+    test_sload_bloated_prefetch_miss which hammers one account's
+    storage trie via an EIP-7702 delegated EOA, every transaction
+    here opens a different storage trie, stressing cross-account
+    state access and state-trie breadth in a single block.
+
+    Every target contract first CALLs a shared offset_holder
+    contract whose slot 0 is read, incremented, and written back.
+    This mirrors the first test's "same-contract slot 0" dependency
+    pattern via cross-contract CALL: every transaction forms a
+    read-after-write edge on offset_holder's slot 0, preventing
+    parallel execution.
+
+    When ``distinct_senders`` is True every transaction uses a fresh
+    sender. This additionally exercises per-sender prewarm
+    serialization (e.g. Nethermind) differently than the shared-
+    sender case; we run both so clients can be measured in both
+    regimes.
+    """
+    # Shared offset_holder: reads, increments, and writes its own
+    # slot 0. Every target CALLs this to create an inter-tx RAW
+    # dependency chain on a single shared storage slot.
+    offset_holder = pre.deploy_contract(
+        code=Op.SSTORE(0, Op.ADD(Op.SLOAD(0), 1)),
+    )
 
-        if cache_strategy == CacheStrategy.CACHE_PREVIOUS_BLOCK:
-            with TestPhaseManager.setup():
-                # For block-level caching,
-                # we need to warm the slot in a separate transaction
-                cache_txs.append(
-                    Transaction(
-                        gas_limit=gas_available,
-                        data=calldata,
-                        to=attack_contract_address,
-                        sender=pre.fund_eoa(),
-                        access_list=access_list,
-                    )
-                )
+    # Target runtime: CALL offset_holder (for the dependency), then
+    # run the same SLOAD loop as test_sload_bloated in its own
+    # storage. Final counter is written back to slot 0.
+    runtime_code = (
+        Op.POP(
+            Op.CALL(
+                address=offset_holder,
+            )
+        )
+        + Op.SLOAD(Op.PUSH0)
+        + While(
+            body=(Op.DUP1 + Op.SLOAD + Op.POP + Op.PUSH1(1) + Op.ADD),
+            condition=Op.GT(Op.GAS, 0xFFFF),
+        )
+        + Op.PUSH0
+        + Op.SSTORE
+    )
 
-        with TestPhaseManager.execution():
-            txs.append(
-                Transaction(
-                    gas_limit=gas_available,
-                    data=calldata,
-                    to=attack_contract_address,
-                    sender=pre.fund_eoa(),
-                    access_list=access_list,
-                )
+    base_offset = 1 if existing_slots else START_SLOT
+    max_sloads_per_tx = _max_sloads_per_tx(tx_gas_limit, fork)
+
+    # Pre-load slot 0 with the starting offset. For existing_slots,
+    # also fill the slot range the loop will read so SLOADs land on
+    # populated entries rather than empty slots. A fresh Storage
+    # instance is built per deployment (below) so that every target
+    # gets an independent root dict, not an alias of the same one.
+    storage_data: Storage.StorageDictType = {0: base_offset}
+    if existing_slots:
+        for i in range(base_offset, base_offset + max_sloads_per_tx):
+            storage_data[i] = i
+
+    intrinsic_gas = fork.transaction_intrinsic_cost_calculator()()
+    # Minimum per-tx gas ensuring the SLOAD loop runs at least one
+    # iteration so every target satisfies storage_reads=[base_offset]:
+    # intrinsic + CALL + offset_holder + setup + 0xFFFF loop threshold
+    # + one iteration + final SSTORE, with buffer.
+    min_tx_gas = intrinsic_gas + 130_000
+
+    # senders_iter yields one sender per tx (fresh per call in
+    # distinct mode, a single shared sender otherwise). The senders
+    # list collects one entry per tx so the BAL builder below can
+    # group nonce changes by sender uniformly.
+    senders_iter = _sender_generator(pre, distinct_senders)
+    senders: list[EOA] = []
+
+    gas_available = gas_benchmark_value
+    targets: list[Address] = []
+    txs: list[Transaction] = []
+
+    # Each tx targets a freshly-deployed contract with identical code
+    # and storage layout.
+    while gas_available >= min_tx_gas:
+        tx_gas = min(gas_available, tx_gas_limit)
+        target = pre.deploy_contract(
+            code=runtime_code,
+            storage=Storage(storage_data),
+        )
+        targets.append(target)
+        sender = next(senders_iter)
+        senders.append(sender)
+        txs.append(
+            Transaction(
+                gas_limit=tx_gas,
+                to=target,
+                sender=sender,
+            )
+        )
+        gas_available -= tx_gas
+
+    expectations: dict[Address, BalAccountExpectation] = {
+        offset_holder: BalAccountExpectation(
+            storage_changes=[
+                BalStorageSlot(
+                    slot=0,
+                    validate_any_change=True,
+                ),
+            ],
+        ),
+    }
+    for t in targets:
+        expectations[t] = BalAccountExpectation(
+            storage_reads=[base_offset],
+            storage_changes=[
+                BalStorageSlot(
+                    slot=0,
+                    validate_any_change=True,
+                ),
+            ],
+        )
+    sender_nonces: dict[Address, list[BalNonceChange]] = {}
+    for i, s in enumerate(senders):
+        changes = sender_nonces.setdefault(s, [])
+        changes.append(
+            BalNonceChange(
+                block_access_index=i + 1,
+                post_nonce=len(changes) + 1,
             )
+        )
+    for addr, nonces in sender_nonces.items():
+        expectations[addr] = BalAccountExpectation(nonce_changes=nonces)
 
-        gas_remaining -= gas_available
-        slot_offset += num_calls
+    blocks = [
+        Block(
+            txs=txs,
+            expected_block_access_list=BlockAccessListExpectation(
+                account_expectations=expectations,
+            ),
+        )
+    ]
 
-    blocks = build_cache_strategy_blocks(cache_strategy, txs, cache_txs)
-    # FIXME: this should not use gas validation as this one should OOG
-    # If it does not OOG, the gas calculation is too high, it should be too low
-    benchmark_test(pre=pre, blocks=blocks, skip_gas_used_validation=True)
+    benchmark_test(
+        pre=pre,
+        blocks=blocks,
+        skip_gas_used_validation=True,
+        expected_receipt_status=True,
+    )
 
 
 @pytest.mark.repricing
-@pytest.mark.parametrize("cache_strategy", list(CacheStrategy))
-@pytest.mark.parametrize("token_name", SSTORE_TOKENS)
+@pytest.mark.stub_parametrize("token_name", "bloated_eoa_")
 @pytest.mark.parametrize("write_new_value", [False, True])
-@pytest.mark.parametrize("existing_slot", [True, False])
-def test_sstore_erc20_approve(
+@pytest.mark.parametrize("existing_slots", [True, False])
+@pytest.mark.parametrize("cache_strategy", list(CacheStrategy))
+def test_sstore_bloated(
     benchmark_test: BenchmarkTestFiller,
     pre: Alloc,
     fork: Fork,
@@ -285,549 +587,305 @@ def test_sstore_erc20_approve(
     tx_gas_limit: int,
     token_name: str,
     write_new_value: bool,
-    existing_slot: bool,
+    existing_slots: bool,
     cache_strategy: CacheStrategy,
 ) -> None:
-    """Benchmark SSTORE using ERC20 approve on bloatnet."""
-    sender = EOA(
-        key=0x90655B60A56E01389173510C3DDF1B969803A9F41844BF344CBF3D1AC3A80845,
-        # nonce fetched from the pre-deployed state on the network
-        nonce=45344,
+    """
+    Benchmark SSTORE opcodes targeting an EOA with storage bloated.
+
+    The storage is assumed to be filled from 0-N linearly, where
+    each slot has the value of the key. Except slot 0, this is the
+    pointer to the next free (empty) storage slot.
+
+    For this test to work correctly under all parameters then above
+    has to be true. If this is not the case then some tests will not
+    test what they claim to do. For instance, for `write_new_value`
+    set to False we need to know the current value of the slots.
+    """
+    setup = (
+        Op.PUSH0  # [0]
+        + Op.SLOAD  # [key], s[0] = key
+        + Op.DUP1  # [key, key]
+    )
+
+    if write_new_value:
+        setup += (
+            Op.PUSH1(1)  # [1, key, key]
+            + Op.ADD  # [key+1, key]
+            + Op.SWAP1  # [key, key+1]
+        )
+
+    # After setup phase, the stack element represents
+    # [slot, value], slot to write and value to write
+
+    cache_op = Bytecode()
+    if cache_strategy == CacheStrategy.CACHE_TX:
+        cache_op = (
+            Op.DUP1  # [slot, slot, value]
+            + Op.SLOAD  # [s[slot], slot, value]
+            + Op.POP  # [slot, value]
+        )
+
+    # The cache mechanism touches the slot before SSTORE
+
+    runtime_code = (
+        setup
+        + While(
+            body=(
+                cache_op  # [slot, value]
+                + Op.DUP2  # [value, slot, value]
+                + Op.DUP2  # [slot, value, slot, value]
+                + Op.SSTORE  # [slot, value], s[slot] = value
+                + Op.PUSH1(1)  # [1, slot, value]
+                + Op.ADD  # [slot+1, value]
+                + Op.SWAP1  # [value, slot+1]
+                + Op.PUSH1(1)  # [1, value, slot+1]
+                + Op.ADD  # [value+1, slot+1]
+                + Op.SWAP1  # [slot+1, value+1]
+            ),
+            condition=Op.GT(Op.GAS, 0xFFFF),
+        )
+        + Op.PUSH0  # [0, slot+1, value+1]
+        + Op.SSTORE  # s[0] = slot+1
+    )
+
+    run_bloated_eoa_benchmark(
+        benchmark_test=benchmark_test,
+        pre=pre,
+        fork=fork,
+        gas_benchmark_value=gas_benchmark_value,
+        tx_gas_limit=tx_gas_limit,
+        authority=pre.stub_eoa(token_name),
+        existing_slots=existing_slots,
+        runtime_code=runtime_code,
+        cache_strategy=cache_strategy,
     )
-    pre.fund_address(address=sender, amount=10**9)
-    assert Address(sender) == Address(
-        0x6C2624662DC514A69955E9A6A195ECE23ACED5A0
-    ), "EOA address mismatch"
 
+
+@pytest.mark.stub_parametrize(
+    "erc20_stub", "test_sload_empty_erc20_balanceof_"
+)
+def test_sload_erc20_generic(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    erc20_stub: str,
+) -> None:
+    """Benchmark SLOAD using ERC20 balanceOf on bloatnet."""
     # Stub Account
     erc20_address = pre.deploy_contract(
         code=Bytecode(),
-        stub=f"test_sstore_erc20_approve_{token_name}",
+        stub=erc20_stub,
     )
+    threshold = 100000
 
     # MEM[0] = function selector
     # MEM[32] = starting address offset
-    setup = (
-        Op.MSTORE(
-            0,
-            APPROVE_SELECTOR,
-            # gas accounting
-            old_memory_size=0,
-            new_memory_size=32,
-        )
-        + Op.MSTORE(
-            32,
-            Op.CALLDATALOAD(32),  # Address Offset
-            # gas accounting
-            old_memory_size=32,
-            new_memory_size=64,
-        )
-        + Op.CALLDATALOAD(0)  # [num_calls]
+    setup = Op.MSTORE(
+        0,
+        BALANCEOF_SELECTOR,
+        # gas accounting
+        old_memory_size=0,
+        new_memory_size=32,
+    ) + Op.MSTORE(
+        32,
+        Op.SLOAD(0),  # Address Offset
+        # gas accounting
+        old_memory_size=32,
+        new_memory_size=64,
     )
 
-    value_to_write: Bytecode | int
-    if write_new_value:
-        # non-zero, avoids refund and always differs from existing values
-        value_to_write = 1
-    else:
-        value_to_write = Op.MLOAD(32) if existing_slot else 0
-
-    call_approve = Op.MSTORE(64, value_to_write) + Op.POP(
+    call_balance_of = Op.POP(
         Op.CALL(
             address=erc20_address,
-            value=0,
-            args_offset=28,
-            args_size=68,
-            ret_offset=0,
-            ret_size=0,
-            # gas accounting
-            address_warm=True,
+            args_offset=32 - 4,
+            args_size=32 + 4,
         )
     )
 
-    cache_warmup = Bytecode()
-    if cache_strategy == CacheStrategy.CACHE_TX:
-        # Call allowance(ADDRESS, spender) to warm the allowance
-        # storage slot that approve will later write to.
-        # Memory: save spender→[64], put ADDRESS→[32],
-        # set allowance selector, call, then restore.
-        cache_warmup = (
-            Op.MSTORE(64, Op.MLOAD(32))
-            + Op.MSTORE(32, Op.ADDRESS)
-            + Op.MSTORE(0, ALLOWANCE_SELECTOR)
-            + Op.POP(
-                Op.CALL(
-                    address=erc20_address,
-                    value=0,
-                    args_offset=28,
-                    args_size=68,
-                    ret_offset=0,
-                    ret_size=0,
-                    # gas accounting
-                    address_warm=True,
-                )
-            )
-            + Op.MSTORE(0, APPROVE_SELECTOR)
-            + Op.MSTORE(32, Op.MLOAD(64))
-        )
-
     loop = While(
-        body=cache_warmup
-        + call_approve
-        + Op.MSTORE(32, Op.ADD(Op.MLOAD(32), 1)),
-        condition=DECREMENT_COUNTER_CONDITION,
+        body=call_balance_of + Op.MSTORE(32, Op.ADD(Op.MLOAD(32), 1)),
+        condition=Op.GT(Op.GAS, threshold),
     )
 
+    teardown = Op.SSTORE(0, Op.MLOAD(32))
+
     # Contract Deployment
-    code = setup + loop
+    code = setup + loop + teardown
     attack_contract_address = pre.deploy_contract(code=code)
 
-    # Gas Accounting
-    setup_cost = setup.gas_cost(fork)
-    loop_cost = loop.gas_cost(fork)
-    access_list = [AccessList(address=erc20_address, storage_keys=[])]
-    # Delegate sender to attack_contract_address once in setup
-    delegation_tx = Transaction(
-        gas_limit=100_000,
-        to=sender,
-        value=0,
-        sender=pre.fund_eoa(),
-        authorization_list=[
-            AuthorizationTuple(
-                chain_id=0,
-                address=attack_contract_address,
-                nonce=sender.nonce,
-                signer=sender,
-            ),
-        ],
-    )
-    sender.nonce = Number(sender.nonce + 1)
-    intrinsic_gas_with_access_list = (
-        fork.transaction_intrinsic_cost_calculator()(
-            access_list=access_list,
-            calldata=b"\xff" * 64,
-        )
-    )
-
-    # This dispatch is something close to the minimal amount
-    # of code to run for a contract only implementing approve
-    # It will therefore greatly underestimate the gas of any ERC20
-    # contract because all of them have much more overhead in practice
-    # (also function selector at the entry point of the contract)
-    function_dispatch = (
-        # Selector dispatch
-        Op.PUSH4(APPROVE_SELECTOR)
-        + Op.EQ
-        + Op.JUMPI
-        # Function body
-        + Op.JUMPDEST
-        + Op.CALLDATALOAD(4)
-        + Op.CALLDATALOAD(36)
-        + Op.MSTORE(0, Op.CALLER)
-        + Op.MSTORE(32, 1)
-        + Op.MSTORE(
-            32,
-            Op.SHA3(
-                0,
-                64,
-                # gas accounting
-                data_size=64,
-                old_memory_size=0,
-                new_memory_size=64,
-            ),
-        )
-        + Op.MSTORE(0, Op.CALLDATALOAD(4))
-        + Op.SHA3(
-            0,
-            64,
-            # gas accounting
-            data_size=64,
-        )
-        + (
-            Op.DUP1
-            + Op.SLOAD.with_metadata(key_warm=False)
-            + Op.POP
-            + Op.SSTORE.with_metadata(key_warm=True)
-            if cache_strategy == CacheStrategy.CACHE_TX
-            else Op.SSTORE.with_metadata(key_warm=False)
-        )
-        # Return true
-        + Op.MSTORE(0, 1)
-        + Op.RETURN(0, 32)
-    )
-
-    function_dispatch_cost = function_dispatch.gas_cost(fork)
-
-    with TestPhaseManager.setup():
-        delegation_block = Block(txs=[delegation_tx])
-
-    if cache_strategy == CacheStrategy.CACHE_TX:
-        # Add allowance dispatch cost for the warmup call.
-        # allowance(owner, spender) computes the same double-
-        # keccak slot as approve but does SLOAD + RETURN.
-        function_dispatch_allowance = (
-            Op.PUSH4(ALLOWANCE_SELECTOR)
-            + Op.EQ
-            + Op.JUMPI
-            + Op.JUMPDEST
-            + Op.CALLDATALOAD(4)
-            + Op.CALLDATALOAD(36)
-            + Op.MSTORE(0, Op.CALLDATALOAD(4))
-            + Op.MSTORE(32, 1)
-            + Op.MSTORE(
-                32,
-                Op.SHA3(
-                    0,
-                    64,
-                    # gas accounting
-                    data_size=64,
-                    old_memory_size=0,
-                    new_memory_size=64,
-                ),
-            )
-            + Op.MSTORE(0, Op.CALLDATALOAD(36))
-            + Op.SHA3(
-                0,
-                64,
-                # gas accounting
-                data_size=64,
-            )
-            + Op.SLOAD
-            + Op.PUSH0
-            + Op.MSTORE
-            + Op.RETURN(0, 32)
-        )
-        function_dispatch_cost += function_dispatch_allowance.gas_cost(fork)
+    intrinsic_gas = fork.transaction_intrinsic_cost_calculator()()
 
     # Transaction Loops
+    txs = []
     gas_remaining = gas_benchmark_value
-    # This sender is a stub account, the first initialized
-    # slot is 371 on perfnet. The initialized slots range
-    # is 371-45139; existing slots fall within that range.
-    slot_offset = 371 if existing_slot else START_SLOT
-
-    # Collect tx params first, then build Transaction objects
-    # so that nonces are allocated contiguously per block.
-    tx_params: list[tuple[int, bytes]] = []
-    while gas_remaining > intrinsic_gas_with_access_list:
-        gas_available = min(gas_remaining, tx_gas_limit)
 
-        if gas_available < intrinsic_gas_with_access_list + setup_cost:
-            break
+    sender = pre.fund_eoa()
 
-        num_calls = (
-            gas_available - intrinsic_gas_with_access_list - setup_cost
-        ) // (function_dispatch_cost + loop_cost)
+    while gas_remaining > intrinsic_gas:
+        gas_available = min(gas_remaining, tx_gas_limit)
 
-        if num_calls == 0:
+        if gas_available < intrinsic_gas:
             break
 
-        calldata = Hash(num_calls) + Hash(slot_offset)
-        tx_params.append((gas_available, calldata))
-
-        gas_remaining -= gas_available
-        slot_offset += num_calls
-
-    cache_txs = []
-    if cache_strategy == CacheStrategy.CACHE_PREVIOUS_BLOCK:
-        with TestPhaseManager.setup():
-            for gas_available, calldata in tx_params:
-                cache_txs.append(
-                    Transaction(
-                        gas_limit=gas_available,
-                        data=calldata,
-                        to=sender,
-                        sender=sender,
-                        access_list=access_list,
-                    )
-                )
-
-    txs = []
-    with TestPhaseManager.execution():
-        for gas_available, calldata in tx_params:
+        with TestPhaseManager.execution():
             txs.append(
                 Transaction(
                     gas_limit=gas_available,
-                    data=calldata,
-                    to=sender,
+                    to=attack_contract_address,
                     sender=sender,
-                    access_list=access_list,
                 )
             )
 
-    blocks = [delegation_block] + build_cache_strategy_blocks(
-        cache_strategy, txs, cache_txs
-    )
-    # TODO: this test can currently not estimate the gas used
-    # It will also overestimate the num_calls it can make to an unknown
-    # ERC20 contract and will therefore OOG
-    # (this actually passes the gas check as it consumes all gas and
-    # thus also the expected gas)
-    # TODO: find out how to tackle this. We do not want to OOG
-    # because the state root is part of the calculation
-    # NOTE: this is not crucial for gas repricing tests
-    # as the mint variant is used there.
-    benchmark_test(
-        pre=pre, blocks=blocks, skip_gas_used_validation=True
-    )  # FIXME: temp skips
-
-
-def build_call_memory_setup(
-    selector: int,
-    *args: Bytecode | int,
-) -> Bytecode:
-    """
-    Build ABI-encoded memory layout for a contract call.
+        gas_remaining -= gas_available
 
-    MEM[0]  = selector (4 bytes, right-aligned in 32-byte word)
-    MEM[32] = args[0]
-    MEM[64] = args[1]  ...
-    """
-    bytecode = Op.MSTORE(
-        0,
-        selector,
-        old_memory_size=0,
-        new_memory_size=32,
+    blocks = [Block(txs=txs)]
+    benchmark_test(
+        pre=pre,
+        blocks=blocks,
+        skip_gas_used_validation=True,
+        expected_receipt_status=True,
     )
-    for i, arg in enumerate(args):
-        offset = 32 * (i + 1)
-        bytecode += Op.MSTORE(
-            offset,
-            arg,
-            old_memory_size=offset,
-            new_memory_size=offset + 32,
-        )
-    return bytecode
 
 
-def build_external_call(
-    address: Address,
-    num_args: int,
-    *,
-    address_warm: bool = True,
-) -> Bytecode:
-    """
-    Build POP(CALL(...)) using standard ABI memory layout at offset 0.
+# SLOAD BENCHMARK ARCHITECTURE:
+#
+#   [Pre-deployed ERC20 Contract] ──── Storage slots for balances
+#           │
+#           │  balanceOf(address) → SLOAD(keccak256(address || slot))
+#           │
+#   [Attack Contract] ──CALL──► ERC20.balanceOf(random_address)
+#           │
+#           └─► Loop(i=0 to N):
+#                 1. Generate random address from counter
+#                 2. CALL balanceOf(random_address) → forces cold SLOAD
+#                 3. Most addresses have zero balance → empty storage slots
+#
+# WHY IT STRESSES CLIENTS:
+#   - Each balanceOf() call forces a cold SLOAD on a likely-empty slot
+#   - Storage slot = keccak256(address || balances_slot)
+#   - Random addresses ensure maximum cache misses
+#   - Tests client's sparse storage handling efficiency
 
-    args_offset = 28 (selector at byte 28 of the 32-byte word)
-    args_size   = 4 + 32 * num_args
-    """
-    return Op.POP(
-        Op.CALL(
-            address=address,
-            value=0,
-            args_offset=32 - 4,
-            args_size=4 + 32 * num_args,
-            ret_offset=0,
-            ret_size=0,
-            address_warm=address_warm,
-        )
-    )
+
+# SSTORE BENCHMARK ARCHITECTURE:
+#
+#   [Pre-deployed ERC20 Contract] ──── Storage slots for allowances
+#           │
+#           │  approve(spender, amount)
+#           │    → SSTORE(keccak256(spender || slot), amount)
+#           │
+#   [Attack Contract]
+#       ──CALL──► ERC20.approve(counter_as_spender, counter_as_amount)
+#           │
+#           └─► Loop(i=0 to N):
+#                 1. Use counter as both spender address and amount
+#                 2. CALL approve(counter, counter) → forces cold SSTORE
+#                 3. Writes to new allowance slots in sparse storage
+#
+# WHY IT STRESSES CLIENTS:
+#   - Each approve() call forces an SSTORE to a new storage slot
+#   - Storage slot = keccak256(
+#       msg.sender || keccak256(spender || allowances_slot)
+#     )
+#   - Sequential counter ensures unique storage locations
+#   - Tests client's ability to handle many storage writes
+#   - Simulates real-world contract state accumulation over time
 
 
-@pytest.mark.parametrize("token_name", SSTORE_MINT_TOKENS)
-@pytest.mark.parametrize("existing_slots", [False, True])
-@pytest.mark.parametrize("cache_strategy", list(CacheStrategy))
-@pytest.mark.parametrize("no_change", [False, True])
-def test_sstore_erc20_mint(
+@pytest.mark.stub_parametrize("erc20_stub", "test_sstore_erc20_approve_")
+def test_sstore_erc20_generic(
     benchmark_test: BenchmarkTestFiller,
     pre: Alloc,
     fork: Fork,
     gas_benchmark_value: int,
     tx_gas_limit: int,
-    token_name: str,
-    existing_slots: bool,
-    cache_strategy: CacheStrategy,
-    no_change: bool,
+    erc20_stub: str,
 ) -> None:
-    """
-    Benchmark SSTORE using ERC20 mint on bloatnet.
-    This targets very specific code and is meant to be
-    temporary for the gas repricings effort, to be replaced
-    by a robust benchmark which does not depend on specific
-    conditions like in this benchmark.
-    This contract calls mint() on an ERC20 contract
-    which supports the mint() function. It is intended
-    to be used with ERC20 contracts bloated via bloatStorage.
-    The mint will increase the total supply and the target account.
-    """
-    # The gas threshold is the minimum amount necessary
-    # of gas to re-enter the While loop.
-    # This must be high enough to ensure the tx
-    # does not go out-of-gas.
-    # This can be improved to an actual value by calculating
-    # the gas used of the second call to the unknown ERC20 contract
-    # and then adding the gas used for the code after the loop
-    # (this can be calculated) as extra.
-    gas_threshold = 100_000
-
-    # Storage key to read and write address pointer to
-    slot_offset = 0
-
-    # Start slot
-    start_slot = 1 if existing_slots else START_SLOT
+    """Benchmark SSTORE using ERC20 approve."""
+    sender = pre.fund_eoa()
+
+    threshold = 100_000
 
     # Stub Account
     erc20_address = pre.deploy_contract(
         code=Bytecode(),
-        stub=f"test_sstore_erc20_mint_{token_name}",
-    )
-
-    mint_amount = 0 if no_change else 1
-
-    # MEM[0] = function selector
-    # MEM[32] = target address
-    # MEM[64] = mint amount
-    mint_mem_setup = build_call_memory_setup(
-        MINT_SELECTOR, Op.SLOAD(slot_offset), mint_amount
+        stub=erc20_stub,
     )
-    mint_erc20_call = build_external_call(erc20_address, 2)
 
     # MEM[0] = function selector
-    # MEM[32] = target address
-    balance_mem_setup = build_call_memory_setup(
-        BALANCEOF_SELECTOR, Op.SLOAD(slot_offset)
+    # MEM[32] = starting address offset
+    setup = Op.MSTORE(
+        0,
+        APPROVE_SELECTOR,
+    ) + Op.MSTORE(
+        32,
+        Op.SLOAD(0),  # Address Offset
     )
-    balance_erc20_call = build_external_call(erc20_address, 1)
 
-    attack_code = mint_erc20_call
-    if cache_strategy == CacheStrategy.CACHE_TX:
-        # Warm up storage slot via balanceOf
-        attack_code = (
-            Op.MSTORE(0, BALANCEOF_SELECTOR)
-            + balance_erc20_call
-            + Op.MSTORE(0, MINT_SELECTOR)
-            + mint_erc20_call
+    call_approve = Op.MSTORE(
+        64,
+        Op.ADD(1, Op.MLOAD(32)),
+    ) + Op.POP(
+        Op.CALL(
+            address=erc20_address,
+            args_offset=28,
+            args_size=68,
         )
-
-    loop_code = While(
-        body=attack_code + Op.MSTORE(32, Op.ADD(Op.MLOAD(32), 1)),
-        condition=Op.GT(Op.GAS, gas_threshold),
     )
 
-    cleanup = Op.SSTORE(slot_offset, Op.MLOAD(32))
-
-    # Contract Deployment
-    attack_code = mint_mem_setup + loop_code + cleanup
-    attack_contract_address = pre.deploy_contract(
-        code=attack_code,
-        storage={slot_offset: start_slot},
+    loop = While(
+        body=call_approve + Op.MSTORE(32, Op.ADD(Op.MLOAD(32), 1)),
+        condition=Op.GT(Op.GAS, threshold),
     )
 
-    prewarm_contract_address = attack_contract_address
-    if cache_strategy == CacheStrategy.CACHE_PREVIOUS_BLOCK:
-        # TODO: calls balanceOf in previous block because
-        # mint will change the balance of the account
-        # This will SLOAD it in previous block and should
-        # put this into cache.
-        # Alternatively could also call mint(addr,0)
-        # on that. Not sure which is better.
-        # Call mint(addr, 0) because a nonzero value would
-        # edit the value, and would also create a slot
-        # if it was non-existent before. In attack block
-        # in non-existent test it would then suddenly
-        # be existent which is not the target scenario there.
-        warmup_setup = balance_mem_setup
-
-        warmup_attack_loop = While(
-            body=balance_erc20_call + Op.MSTORE(32, Op.ADD(Op.MLOAD(32), 1)),
-            condition=Op.GT(Op.GAS, gas_threshold),
-        )
+    teardown = Op.SSTORE(0, Op.MLOAD(32))
 
-        warmup_block = warmup_setup + warmup_attack_loop + cleanup
+    # Contract Deployment
+    code = setup + loop + teardown
+    attack_contract_address = pre.deploy_contract(code=code)
 
-        prewarm_contract_address = pre.deploy_contract(
-            code=warmup_block,
-            storage={slot_offset: start_slot},
-        )
+    intrinsic_gas = fork.transaction_intrinsic_cost_calculator()()
 
     # Transaction Loops
-    gas_limits = []
     gas_remaining = gas_benchmark_value
-    intrinsic_gas_cost = fork.transaction_intrinsic_cost_calculator()()
-    while gas_remaining >= intrinsic_gas_cost + gas_threshold:
-        gas_limit = min(gas_remaining, tx_gas_limit)
-        gas_limits.append(gas_limit)
-        gas_remaining -= gas_limit
 
-    cache_txs: List[Transaction] = []
-    if cache_strategy == CacheStrategy.CACHE_PREVIOUS_BLOCK:
-        with TestPhaseManager.setup():
-            cache_txs = [
-                Transaction(
-                    gas_limit=g,
-                    to=prewarm_contract_address,
-                    sender=pre.fund_eoa(),
-                )
-                for g in gas_limits
-            ]
+    # Collect tx params first, then build Transaction objects
+    # so that nonces are allocated contiguously per block.
+    tx_gas: list[int] = []
+    while gas_remaining > intrinsic_gas:
+        gas_available = min(gas_remaining, tx_gas_limit)
+
+        if gas_available < intrinsic_gas:
+            break
+
+        tx_gas.append(gas_available)
 
+        gas_remaining -= gas_available
+
+    txs = []
     with TestPhaseManager.execution():
-        txs = [
-            Transaction(
-                gas_limit=g, to=attack_contract_address, sender=pre.fund_eoa()
+        for gas_available in tx_gas:
+            txs.append(
+                Transaction(
+                    gas_limit=gas_available,
+                    to=attack_contract_address,
+                    sender=sender,
+                )
             )
-            for g in gas_limits
-        ]
 
-    blocks = build_cache_strategy_blocks(cache_strategy, txs, cache_txs)
+    blocks = [Block(txs=txs)]
 
     benchmark_test(
         pre=pre,
         blocks=blocks,
-        # NOTE: this specifically targets bloatnet code so the
-        # gas calculation could technically be done by inlining
-        # the bytecode. This test is temporary and will be removed
-        # after (or during) gas repricing effort is done. See
-        # https://github.com/ethereum/execution-specs/issues/2411
         skip_gas_used_validation=True,
+        expected_receipt_status=True,
     )
 
 
-def create_sstore_initializer(init_val: int) -> IteratingBytecode:
-    """
-    Create a contract that initializes storage slots from calldata parameters.
-
-    - CALLDATA[0..32] start slot (index)
-    - CALLDATA[32..64] slot count (num)
-
-    storage[i] = init_val for i in [index, index + num).
-
-    Returns: IteratingBytecode representing the storage initializer.
-    """
-    # Setup: [index, index + num]
-    prefix = (
-        Op.CALLDATALOAD(0)  # [index]
-        + Op.DUP1  # [index, index]
-        + Op.CALLDATALOAD(32)  # [index, index, num]
-        + Op.ADD  # [index, index + num]
-    )
-
-    # Loop: decrement counter and store at current position
-    # Stack after subtraction: [index, current]
-    # where current goes from index+num-1 down to index
-    loop = (
-        Op.JUMPDEST
-        + Op.PUSH1(1)  # [index, current, 1]
-        + Op.SWAP1  # [index, 1, current]
-        + Op.SUB  # [index, current - 1]
-        + Op.SSTORE(  # STORAGE[current-1] = initial_value
-            Op.DUP2,
-            init_val,
-            key_warm=False,
-            # gas accounting
-            original_value=0,
-            current_value=0,
-            new_value=init_val,
-        )
-        # After SSTORE: [index, current - 1]
-        # Continue while current - 1 > index
-        + Op.JUMPI(len(prefix), Op.GT(Op.DUP2, Op.DUP2))
-    )
-
-    return IteratingBytecode(setup=prefix, iterating=loop)
-
-
 def create_sstore_executor(
     sloads_before_sstore: bool,
     key_warm: bool,
@@ -989,140 +1047,6 @@ def executor_calldata_generator(
     return result
 
 
-def initializer_calldata_generator(
-    iteration_count: int, start_iteration: int
-) -> bytes:
-    """Calldata generator for the storage: Hash(start) + Hash(count)."""
-    return Hash(start_iteration) + Hash(iteration_count)
-
-
-def pack_transactions_into_blocks(
-    transactions: List[Transaction],
-    gas_limit: int,
-) -> List[Block]:
-    """
-    Pack transactions into blocks without exceeding gas_limit per block.
-
-    Greedily adds transactions to the current block until adding another
-    would exceed the gas limit, then starts a new block.
-    """
-    if not transactions:
-        return []
-
-    blocks: List[Block] = []
-    current_txs: List[Transaction] = []
-    current_gas = 0
-
-    for tx in transactions:
-        if current_gas + tx.gas_limit > gas_limit and current_txs:
-            blocks.append(Block(txs=current_txs))
-            current_txs = []
-            current_gas = 0
-
-        current_txs.append(tx)
-        current_gas += tx.gas_limit
-
-    if current_txs:
-        blocks.append(Block(txs=current_txs))
-
-    return blocks
-
-
-def build_delegated_storage_setup(
-    *,
-    pre: Alloc,
-    fork: Fork,
-    tx_gas_limit: int,
-    needs_init: bool,
-    num_target_slots: int,
-    initializer_code: IteratingBytecode,
-    initializer_addr: Address,
-    executor_addr: Address,
-    authority: EOA,
-    authority_nonce: int,
-    delegation_sender: EOA,
-    initializer_calldata_generator: Callable[[int, int], bytes],
-) -> List[Block]:
-    """
-    Build setup blocks for delegated storage benchmarks.
-
-    Returns:
-        List of blocks for the setup phase.
-
-    """
-    blocks: List[Block] = []
-
-    if needs_init:
-        # Block 1: Authorize to initializer
-        blocks.append(
-            Block(
-                txs=[
-                    Transaction(
-                        to=delegation_sender,
-                        gas_limit=tx_gas_limit,
-                        sender=delegation_sender,
-                        authorization_list=[
-                            AuthorizationTuple(
-                                address=initializer_addr,
-                                nonce=authority_nonce,
-                                signer=authority,
-                            ),
-                        ],
-                    )
-                ]
-            )
-        )
-        authority_nonce += 1
-
-        # Calculate max slots per transaction based on gas cost
-        iteration_cost = initializer_code.tx_gas_limit_by_iteration_count(
-            fork=fork,
-            iteration_count=1,
-            start_iteration=1,
-            calldata=initializer_calldata_generator,
-        )
-        iteration_count = max(1, tx_gas_limit // iteration_cost)
-
-        init_txs: List[Transaction] = []
-        for start in range(1, num_target_slots + 1, iteration_count):
-            chunk_size = min(iteration_count, num_target_slots - start + 1)
-            init_txs.extend(
-                initializer_code.transactions_by_total_iteration_count(
-                    fork=fork,
-                    total_iterations=chunk_size,
-                    sender=pre.fund_eoa(),
-                    to=authority,
-                    start_iteration=start,
-                    calldata=initializer_calldata_generator,
-                )
-            )
-
-        # Pack init transactions into blocks
-        blocks.extend(pack_transactions_into_blocks(init_txs, tx_gas_limit))
-
-    # Final block: Authorize to executor
-    blocks.append(
-        Block(
-            txs=[
-                Transaction(
-                    to=delegation_sender,
-                    gas_limit=tx_gas_limit,
-                    sender=delegation_sender,
-                    authorization_list=[
-                        AuthorizationTuple(
-                            address=executor_addr,
-                            nonce=authority_nonce,
-                            signer=authority,
-                        ),
-                    ],
-                )
-            ]
-        )
-    )
-
-    return blocks
-
-
 @pytest.mark.parametrize("access_warm", [True, False])
 @pytest.mark.parametrize("sloads_before_sstore", [True, False])
 @pytest.mark.parametrize(
@@ -1529,6 +1453,7 @@ def test_storage_sload_benchmark(
     )
 
 
+@pytest.mark.repricing
 @pytest.mark.parametrize("storage_keys_pre_set", [False, True])
 def test_storage_sload_same_key_benchmark(
     benchmark_test: BenchmarkTestFiller,
@@ -1607,8 +1532,11 @@ def test_account_access(
     # the previous one left off instead of re-targeting the same accounts.
     calldataload_start = Op.CALLDATALOAD(0)
     if account_mode == AccountMode.EXISTING_CONTRACT:
-        # Use ENS registry as target
-        target_address = Address(0x6090A6E47849629B7245DFA1CA21D94CD15878EF)
+        # Use Bittrex Controller as target. Created 1586350 contracts,
+        # which cannot selfdestruct, so guaranteed to be on-chain.
+        # This is safe for a gas benchmark up to 300M. (300_000_000 / 2000)
+        # (2000 is the min cost to target a cold address)
+        target_address = Address(0xA3C1E324CA1CE40DB73ED6026C4A177F099B5770)
         address_retriever = CreatePreimageLayout(
             sender_address=target_address,
             nonce=Op.ADD(1, calldataload_start),
@@ -1657,7 +1585,6 @@ def test_account_access(
         attack_call = Op.POP(
             opcode(
                 address=address_retriever.address_op(),
-                gas=1,
                 value=value_sent,
                 # Gas accounting
                 address_warm=access_warm,
@@ -1670,8 +1597,6 @@ def test_account_access(
         attack_call = Op.POP(
             opcode(
                 address=address_retriever.address_op(),
-                gas=1,
-                args_size=1024,
                 # Gas accounting
                 address_warm=access_warm,
             )
@@ -1688,6 +1613,7 @@ def test_account_access(
 
     loop_code = While(
         body=cache_op + attack_call + increment_op,
+        condition=Op.GT(Op.GAS, 0x9000) if value_sent > 0 else None,
     )
 
     attack_code = IteratingBytecode(
@@ -1699,9 +1625,13 @@ def test_account_access(
     )
 
     # Calldata generator for each transaction of the iterating bytecode.
+    # Start from 1 to skip the Bittrex Controller's nonce=1 contract
+    # which has a non-payable fallback that reverts when receiving value.
+    calldata_offset = 1 if account_mode == AccountMode.EXISTING_CONTRACT else 0
+
     def calldata(iteration_count: int, start_iteration: int) -> bytes:
         del iteration_count
-        return Hash(start_iteration)
+        return Hash(start_iteration + calldata_offset)
 
     attack_address = pre.deploy_contract(code=attack_code, balance=10**21)
 
@@ -1730,7 +1660,6 @@ def calldata(iteration_count: int, start_iteration: int) -> bytes:
                     calldata=calldata,
                 )
             )
-        total_gas_cost = sum(tx.gas_cost for tx in attack_txs)
 
     if cache_strategy == CacheStrategy.CACHE_PREVIOUS_BLOCK:
         with TestPhaseManager.setup():
@@ -1756,5 +1685,6 @@ def calldata(iteration_count: int, start_iteration: int) -> bytes:
         post=post,
         blocks=blocks,
         target_opcode=opcode,
-        expected_benchmark_gas_used=total_gas_cost,
+        skip_gas_used_validation=True,
+        expected_receipt_status=1,
     )
diff --git a/tests/benchmark/stateful/bloatnet/test_transaction_types.py b/tests/benchmark/stateful/bloatnet/test_transaction_types.py
new file mode 100644
index 00000000000..875c69fecdf
--- /dev/null
+++ b/tests/benchmark/stateful/bloatnet/test_transaction_types.py
@@ -0,0 +1,207 @@
+"""Benchmark ether transfers to receivers that exist on-chain."""
+
+import itertools
+from typing import Generator
+
+import pytest
+from execution_testing import (
+    DETERMINISTIC_FACTORY_ADDRESS,
+    EOA,
+    Address,
+    Alloc,
+    BenchmarkTestFiller,
+    Block,
+    Fork,
+    Op,
+    Transaction,
+    compute_create2_address,
+    compute_create_address,
+)
+
+# Deterministic sender pool of 15K accounts.
+# Funded via system contract withdrawals (funding.txt) in payload generation.
+# Placed outside pre-allocation to ensure accounts remain uncached.
+SENDER_BASE_KEY = (
+    0x1111111111111111111111111111111111111111111111111111111111111111
+)
+
+
+def yield_distinct_sender() -> Generator[EOA, None, None]:
+    """Yield deterministic sender EOAs pre-funded on-chain."""
+    for i in itertools.count(0):
+        yield EOA(key=SENDER_BASE_KEY + i)
+
+
+def build_unique_contract_initcode() -> bytes:
+    """
+    Deployed runtime contract layout.
+
+        offset    size   contents
+        ------    ----   --------------------------------
+        0x0000       4   PUSH2 0x5FFF; JUMP   <- entry
+        0x0004      28   JUMPDEST padding
+        0x0020      12   JUMPDEST padding
+        0x002C      20   contract ADDRESS     <- unique
+        0x0040   24512   JUMPDEST             <- 0x5FFF lands here
+        0x6000           STOP
+
+    Embedded ADDRESS makes runtime unique per contract;
+    initcode and its CREATE2 hash is shared across all salts.
+    """
+    max_code_size = 0x6000  # EIP-170 contract code size limit
+
+    # MCOPY fills MEM[0:0x8000] with JUMPDEST.
+    # Runtime only uses MEM[0:0x6000].
+    code = Op.MSTORE(0, bytes(Op.JUMPDEST * 32))
+    for size in (1 << s for s in range(5, 15)):
+        code += Op.MCOPY(size, 0, size)
+
+    # Runtime entry: JUMP to final JUMPDEST, then STOP.
+    entry = Op.JUMP(max_code_size - 1)
+    entry += Op.JUMPDEST * (32 - len(entry))  # Padding
+
+    code += Op.MSTORE(0, bytes(entry))
+
+    # Mask ADDRESS into a JUMPDEST template via OR:
+    #                  bytes 0..12   bytes 12..32
+    #                  -----------   ------------
+    #     ADDRESS      00 .. 00      <20-byte address>
+    #     addr_slot    5b .. 5b      00 .. 00
+    #     OR result    5b .. 5b      <20-byte address>
+    addr_slot = Op.JUMPDEST * 12 + Op.STOP * 20
+    code += Op.MSTORE(0x20, Op.OR(Op.ADDRESS, bytes(addr_slot)))
+
+    code += Op.RETURN(0, max_code_size)
+
+    return bytes(code)
+
+
+JOCHEMNET_UNIQUE_CONTRACT_INITCODE = build_unique_contract_initcode()
+
+
+def yield_distinct_unique_code_jumpdest_receiver() -> Generator[
+    Address, None, None
+]:
+    """
+    Yield contract addresses deployed by the deterministic CREATE2 factory.
+    """
+    for salt in itertools.count(0):
+        yield compute_create2_address(
+            address=DETERMINISTIC_FACTORY_ADDRESS,
+            salt=salt,
+            initcode=JOCHEMNET_UNIQUE_CONTRACT_INITCODE,
+        )
+
+
+# Bittrex controller mainnet address
+# Creates 1.5M contracts with deterministic address via CREATE
+# It is guaranteed no contract is destructed
+# Used for existing contract targets in benchmark
+BITTREX_CONTROLLER_ADDRESS = Address(
+    0xA3C1E324CA1CE40DB73ED6026C4A177F099B5770
+)
+
+
+def yield_distinct_contract_receiver() -> Generator[Address, None, None]:
+    """Yield contract account created by Bittrex controller via CREATE."""
+    for nonce in itertools.count(2):
+        yield compute_create_address(
+            address=BITTREX_CONTROLLER_ADDRESS, nonce=nonce
+        )
+
+
+def yield_distinct_existent_receiver() -> Generator[Address, None, None]:
+    """
+    Yield existing balance-only EOA on bloatnet. pre-funded by Spamoor
+    (https://github.com/CPerezz/spamoor/pull/12).
+    """
+    for address in itertools.count(0x1000):
+        yield Address(address)
+
+
+def yield_distinct_nonexistent_receiver() -> Generator[Address, None, None]:
+    """Yield non-existent accounts starting from keccak256('random')."""
+    for address in itertools.count(0xF3CF193BB4AF1022AF7D2089F37D8BAE7157B85F):
+        yield Address(address)
+
+
+@pytest.mark.repricing
+@pytest.mark.parametrize(
+    "case_id",
+    [
+        "diff_to_nonexistent",
+        "diff_to_existent",
+        "diff_to_contract",
+        "diff_to_unique_code_jumpdest_contract",
+    ],
+)
+@pytest.mark.parametrize("transfer_amount", [0, 1])
+def test_ether_transfers_onchain_receivers(
+    benchmark_test: BenchmarkTestFiller,
+    pre: Alloc,
+    case_id: str,
+    transfer_amount: int,
+    fork: Fork,
+    gas_benchmark_value: int,
+) -> None:
+    """
+    Ether transfers to receivers that exist on-chain at run time.
+
+    Scenarios:
+    - diff_to_nonexistent: distinct nonexistent receivers
+      (matches AccountMode.NON_EXISTING_ACCOUNT)
+    - diff_to_existent: distinct existent EOA receivers
+      (matches AccountMode.EXISTING_EOA)
+    - diff_to_contract: distinct contract receivers
+      (matches AccountMode.EXISTING_CONTRACT)
+    - diff_to_unique_code_jumpdest_contract: distinct CREATE2 contract
+      receivers each holding unique deployed code
+    """
+    senders = yield_distinct_sender()
+    receiver_execution_gas = 0
+    if case_id == "diff_to_nonexistent":
+        receivers = yield_distinct_nonexistent_receiver()
+    elif case_id == "diff_to_existent":
+        receivers = yield_distinct_existent_receiver()
+    elif case_id == "diff_to_contract":
+        receivers = yield_distinct_contract_receiver()
+        # Runtime code is the same across all the receivers
+        # Example contract: https://etherscan.io/address/0xa888df3ef62286dde06a79395760b9bce6c83c83#code
+        runtime = (
+            Op.MSTORE(0x40, 0x60, new_memory_size=0x60)
+            + Op.JUMPI(Op.PUSH2(0x49), Op.ISZERO(Op.CALLDATASIZE))
+            + Op.JUMPDEST * 3
+            + Op.JUMP(Op.PUSH2(0x50))
+            + Op.JUMPDEST
+        )
+        receiver_execution_gas = runtime.gas_cost(fork)
+    elif case_id == "diff_to_unique_code_jumpdest_contract":
+        receivers = yield_distinct_unique_code_jumpdest_receiver()
+        # Runtime code aligns entry code path.
+        runtime = Op.JUMP(Op.PUSH2(0x5FFF)) + Op.JUMPDEST
+        receiver_execution_gas = runtime.gas_cost(fork)
+    else:
+        raise ValueError(f"Unknown case: {case_id}")
+
+    iteration_cost = (
+        fork.transaction_intrinsic_cost_calculator()() + receiver_execution_gas
+    )
+    iteration_count = gas_benchmark_value // iteration_cost
+
+    txs = [
+        Transaction(
+            to=next(receivers),
+            value=transfer_amount,
+            gas_limit=iteration_cost,
+            sender=next(senders),
+        )
+        for _ in range(iteration_count)
+    ]
+
+    benchmark_test(
+        pre=pre,
+        post={},
+        blocks=[Block(txs=txs)],
+        expected_benchmark_gas_used=iteration_count * iteration_cost,
+        expected_receipt_status=1,
+    )
diff --git a/tests/benchmark/stateful/conftest.py b/tests/benchmark/stateful/conftest.py
deleted file mode 100755
index 9db46e3ccb6..00000000000
--- a/tests/benchmark/stateful/conftest.py
+++ /dev/null
@@ -1,74 +0,0 @@
-"""Pytest configuration for state tests."""
-
-from pathlib import Path
-from typing import Any
-
-import pytest
-
-DEFAULT_BENCHMARK_FORK = "Prague"
-
-
-def pytest_generate_tests(metafunc: Any) -> None:
-    """
-    Add default valid_from marker to state tests without explicit fork
-    specification.
-    """
-    state_dir = Path(__file__).parent
-    test_file_path = Path(metafunc.definition.fspath)
-
-    if state_dir in test_file_path.parents:
-        has_valid_from = any(
-            marker.name == "valid_from"
-            for marker in metafunc.definition.iter_markers()
-        )
-        if not has_valid_from:
-            metafunc.definition.add_marker(
-                pytest.mark.valid_from(DEFAULT_BENCHMARK_FORK)
-            )
-
-
-def pytest_collection_modifyitems(config: Any, items: Any) -> None:
-    """Manage stateful test markers and filtering."""
-    state_dir = Path(__file__).parent
-    gen_docs = config.getoption("--gen-docs", default=False)
-
-    if gen_docs:
-        _add_stateful_markers_for_docs(items, state_dir)
-        return
-
-    marker_expr = config.getoption("-m", default="")
-
-    items_to_remove = []
-
-    for i, item in enumerate(items):
-        item_path = Path(item.fspath)
-        is_in_state_dir = state_dir in item_path.parents
-
-        # Add stateful marker to tests in state directory that don't have it
-        if is_in_state_dir and not item.get_closest_marker("stateful"):
-            item.add_marker(pytest.mark.stateful)
-
-        has_stateful_marker = item.get_closest_marker("stateful")
-
-        run_stateful = (
-            marker_expr
-            and ("stateful" in marker_expr)
-            and ("not stateful" not in marker_expr)
-        )
-
-        # When not running stateful tests, remove all stateful tests
-        if not run_stateful and has_stateful_marker:
-            items_to_remove.append(i)
-
-    for i in reversed(items_to_remove):
-        items.pop(i)
-
-
-def _add_stateful_markers_for_docs(items: Any, state_dir: Any) -> None:
-    """Add stateful markers for documentation generation."""
-    for item in items:
-        item_path = Path(item.fspath)
-        if state_dir in item_path.parents and not item.get_closest_marker(
-            "stateful"
-        ):
-            item.add_marker(pytest.mark.stateful)
diff --git a/tests/benchmark/stateful/eip7928_block_level_access_lists/__init__.py b/tests/benchmark/stateful/eip7928_block_level_access_lists/__init__.py
new file mode 100644
index 00000000000..d02b97d33f6
--- /dev/null
+++ b/tests/benchmark/stateful/eip7928_block_level_access_lists/__init__.py
@@ -0,0 +1 @@
+"""EIP-7928 Block-level Access List benchmark tests."""
diff --git a/tests/benchmark/stateful/eip7928_block_level_access_lists/helpers.py b/tests/benchmark/stateful/eip7928_block_level_access_lists/helpers.py
new file mode 100644
index 00000000000..5efcb83a71b
--- /dev/null
+++ b/tests/benchmark/stateful/eip7928_block_level_access_lists/helpers.py
@@ -0,0 +1,337 @@
+"""
+Shared helpers for EIP-7928 BAL benchmark tests.
+
+Contracts use a gas-check loop: ``GAS > threshold`` at the top of
+each iteration exits when remaining gas is too low for another
+iteration plus teardown.  This avoids pre-calculating iteration
+counts and lets the last transaction naturally do fewer iterations.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    AuthorizationTuple,
+    BalAccountExpectation,
+    BalNonceChange,
+    BalStorageSlot,
+    BenchmarkTestFiller,
+    Block,
+    BlockAccessListExpectation,
+    Bytecode,
+    Fork,
+    Op,
+    TestPhaseManager,
+    Transaction,
+)
+from execution_testing.base_types.base_types import Number
+
+from tests.benchmark.stateful.helpers import (
+    StorageInitRange,
+    build_sequential_storage_init,
+)
+
+CURSOR_SLOT = 0
+CURSOR_INIT = 1
+
+
+def cursor_read() -> Bytecode:
+    """PUSH1(CURSOR_SLOT) + SLOAD → stack: [..., cursor]."""
+    return Op.PUSH1(CURSOR_SLOT) + Op.SLOAD
+
+
+def cursor_write() -> Bytecode:
+    """
+    PUSH1(CURSOR_SLOT) + SSTORE ← stack: [..., cursor].
+
+    SSTORE metadata reflects runtime: cursor slot is warm
+    (setup SLOADs it) and nonzero-to-nonzero.
+    """
+    return Op.PUSH1(CURSOR_SLOT) + Op.SSTORE(
+        key_warm=True,
+        original_value=1,
+        current_value=1,
+        new_value=2,
+    )
+
+
+def default_teardown() -> Bytecode:
+    """Standard loop teardown: write cursor and stop."""
+    return Op.JUMPDEST + cursor_write() + Op.STOP
+
+
+def sload_loop_body() -> Bytecode:
+    """SLOAD(cursor) then cursor++ (result discarded)."""
+    return Op.DUP1 + Op.SLOAD + Op.POP + Op.PUSH1(0x01) + Op.ADD
+
+
+def sload_loop_body_reverse() -> Bytecode:
+    """SLOAD(cursor) then cursor-- (result discarded)."""
+    return Op.DUP1 + Op.SLOAD + Op.POP + Op.PUSH1(0x01) + Op.SWAP1 + Op.SUB
+
+
+# -- Gas-check loop components -- #
+# Used by both gas_check_loop_contract (assembly) and plan_benchmark
+# (gas estimation).  Operand values are irrelevant for gas costs.
+
+
+def _pre_gas_header(gas_threshold: int = 0) -> Bytecode:
+    """Loop header prefix consumed before GAS reports."""
+    return Op.JUMPDEST + Op.PUSH3(gas_threshold) + Op.GAS
+
+
+def _loop_header(gas_threshold: int = 0) -> Bytecode:
+    """Full loop condition: JUMPDEST PUSH3 GAS GT ISZERO."""
+    return _pre_gas_header(gas_threshold) + Op.GT + Op.ISZERO
+
+
+def _loop_exit(target: int = 0) -> Bytecode:
+    """Exit jump when loop condition fails."""
+    return Op.PUSH2(target) + Op.JUMPI
+
+
+def _loop_back(target: int = 0) -> Bytecode:
+    """Back-edge jump to loop start."""
+    return Op.PUSH2(target) + Op.JUMP
+
+
+def gas_check_loop_contract(
+    setup: Bytecode,
+    body: Bytecode,
+    gas_threshold: int,
+    teardown: Bytecode | None = None,
+) -> Bytecode:
+    """
+    Assemble a contract with a gas-check loop.
+
+    Structure: setup | JUMPDEST GAS>threshold? body JUMP | teardown.
+    The loop exits when remaining gas is too low for another
+    iteration plus teardown.
+    """
+    if teardown is None:
+        teardown = default_teardown()
+
+    loop_start = len(setup)
+    header = _loop_header(gas_threshold)
+    loop_end = (
+        loop_start
+        + len(header)
+        + len(_loop_exit())
+        + len(body)
+        + len(_loop_back())
+    )
+
+    return (
+        setup
+        + header
+        + _loop_exit(loop_end)
+        + body
+        + _loop_back(loop_start)
+        + teardown
+    )
+
+
+@dataclass(frozen=True)
+class BenchmarkPlan:
+    """Pre-computed plan for a gas-check-loop benchmark."""
+
+    gas_limits: list[int]
+    iterations_per_tx: list[int]
+    total_iterations: int
+    gas_threshold: int
+
+
+def plan_benchmark(
+    fork: Fork,
+    loop_body_gas: int,
+    setup_gas: int,
+    gas_benchmark_value: int,
+    teardown: Bytecode | None = None,
+    num_transactions: int | None = None,
+    tx_gas_limit: int | None = None,
+) -> BenchmarkPlan:
+    """
+    Plan transactions for a gas-check-loop benchmark.
+
+    Fill up to *gas_benchmark_value* total gas with transactions.
+    The last transaction gets whatever gas remains.  Pass *teardown*
+    when it differs from ``default_teardown()``.
+    """
+    if teardown is None:
+        teardown = default_teardown()
+
+    overhead = (
+        _loop_header().gas_cost(fork)
+        + _loop_exit().gas_cost(fork)
+        + _loop_back().gas_cost(fork)
+    )
+    teardown_gas = teardown.gas_cost(fork)
+    gas_opcode_offset = _pre_gas_header().gas_cost(fork)
+
+    gas_threshold = loop_body_gas + overhead + teardown_gas
+    iteration_gas = loop_body_gas + overhead
+    intrinsic_gas = fork.transaction_intrinsic_cost_calculator()()
+    min_useful = (
+        intrinsic_gas + setup_gas + gas_threshold + gas_opcode_offset + 1
+    )
+    gas_limits: list[int] = []
+    # Build per-tx gas limits.
+    if num_transactions is not None and tx_gas_limit is not None:
+        gas_limits = [tx_gas_limit] * num_transactions
+    else:
+        max_tx_gas = fork.transaction_gas_limit_cap()
+        assert max_tx_gas is not None
+        remaining = gas_benchmark_value
+        while remaining >= min_useful:
+            g = min(remaining, max_tx_gas)
+            if g < min_useful:
+                break
+            gas_limits.append(g)
+            remaining -= g
+
+    # Expected iterations per tx.
+    def _iters(tx_gas: int) -> int:
+        avail = tx_gas - intrinsic_gas - setup_gas
+        if avail <= gas_threshold + gas_opcode_offset:
+            return 0
+        return (
+            avail - gas_threshold - gas_opcode_offset - 1
+        ) // iteration_gas + 1
+
+    iters = [_iters(g) for g in gas_limits]
+    return BenchmarkPlan(
+        gas_limits=gas_limits,
+        iterations_per_tx=iters,
+        total_iterations=sum(iters),
+        gas_threshold=gas_threshold,
+    )
+
+
+def run_bal_benchmark(
+    pre: Alloc,
+    fork: Fork,
+    benchmark_test: BenchmarkTestFiller,
+    contract_code: Bytecode,
+    plan: BenchmarkPlan,
+    tx_gas_limit: int,
+    authority: EOA,
+    storage_init_ranges: list[StorageInitRange] | None = None,
+    data_slot_reads: list[int] | None = None,
+    extra_expectations: (dict[Address, BalAccountExpectation] | None) = None,
+) -> None:
+    """
+    Run a BAL benchmark using EIP-7702 delegated storage initialization.
+
+    Deploy the executor contract, optionally initialize the
+    *authority*'s storage via delegation, then delegate to the
+    executor and run the benchmark transactions.  The authority's
+    nonce is incremented in-place.
+    """
+    executor_addr = pre.deploy_contract(code=contract_code)
+
+    blocks: list[Block] = []
+
+    with TestPhaseManager.setup():
+        if storage_init_ranges:
+            blocks.extend(
+                build_sequential_storage_init(
+                    pre=pre,
+                    fork=fork,
+                    tx_gas_limit=tx_gas_limit,
+                    authority=authority,
+                    storage_init_ranges=storage_init_ranges,
+                )
+            )
+
+        # Delegate authority to executor
+        delegation_sender = pre.fund_eoa()
+        blocks.append(
+            Block(
+                txs=[
+                    Transaction(
+                        to=delegation_sender,
+                        gas_limit=tx_gas_limit,
+                        sender=delegation_sender,
+                        authorization_list=[
+                            AuthorizationTuple(
+                                address=executor_addr,
+                                nonce=authority.nonce,
+                                signer=authority,
+                            ),
+                        ],
+                    )
+                ]
+            )
+        )
+        authority.nonce = Number(authority.nonce + 1)
+
+    # Execution phase
+    num_txs = len(plan.gas_limits)
+    with TestPhaseManager.execution():
+        sender = pre.fund_eoa()
+        transactions = [
+            Transaction(
+                sender=sender,
+                to=authority,
+                gas_limit=plan.gas_limits[i],
+                data=b"",
+            )
+            for i in range(num_txs)
+        ]
+
+    # BAL expectations: authority slots + sender nonces.
+    # Use validate_any_change for cursor — exact values depend
+    # on gas dynamics and are verified by consensus test suites.
+    # All txs share a single sender to prevent trivial per-sender
+    # optimizations in BAL implementations.
+    expectations: dict[Address, BalAccountExpectation] = {
+        authority: BalAccountExpectation(
+            storage_reads=sorted(set(data_slot_reads or [])),
+            storage_changes=[
+                BalStorageSlot(
+                    slot=CURSOR_SLOT,
+                    validate_any_change=True,
+                )
+            ],
+        ),
+        sender: BalAccountExpectation(
+            nonce_changes=[
+                BalNonceChange(
+                    block_access_index=tx_idx + 1,
+                    post_nonce=tx_idx + 1,
+                )
+                for tx_idx in range(num_txs)
+            ],
+        ),
+    }
+    if extra_expectations:
+        expectations.update(extra_expectations)
+
+    exec_block = Block(
+        txs=transactions,
+        expected_block_access_list=BlockAccessListExpectation(
+            account_expectations=expectations
+        ),
+    )
+
+    blocks.append(exec_block)
+
+    # Post-state: only check sender nonce (sanity).
+    # Exact storage values depend on gas dynamics and may be
+    # slightly off; consensus correctness is verified elsewhere.
+    post: dict[Address, Account] = {
+        sender: Account(nonce=num_txs),
+    }
+
+    benchmark_test(
+        pre=pre,
+        post=post,
+        blocks=blocks,
+        skip_gas_used_validation=True,
+        expected_receipt_status=1,
+    )
diff --git a/tests/benchmark/stateful/eip7928_block_level_access_lists/spec.py b/tests/benchmark/stateful/eip7928_block_level_access_lists/spec.py
new file mode 100644
index 00000000000..9f7c707d189
--- /dev/null
+++ b/tests/benchmark/stateful/eip7928_block_level_access_lists/spec.py
@@ -0,0 +1,21 @@
+"""
+Reference spec for EIP-7928: Block-level Access Lists.
+
+https://eips.ethereum.org/EIPS/eip-7928
+"""
+
+from dataclasses import dataclass
+
+
+@dataclass(frozen=True)
+class ReferenceSpec:
+    """Reference specification."""
+
+    git_path: str
+    version: str
+
+
+ref_spec_7928 = ReferenceSpec(
+    git_path="EIPS/eip-7928.md",
+    version="aca88aa0932580c29d0233f902cb4390e88b8c41",
+)
diff --git a/tests/benchmark/stateful/eip7928_block_level_access_lists/test_block_access_lists_compute_then_sload.py b/tests/benchmark/stateful/eip7928_block_level_access_lists/test_block_access_lists_compute_then_sload.py
new file mode 100644
index 00000000000..f499c571049
--- /dev/null
+++ b/tests/benchmark/stateful/eip7928_block_level_access_lists/test_block_access_lists_compute_then_sload.py
@@ -0,0 +1,103 @@
+"""
+Tests for EIP-7928 BAL with mixed computation and SLOADs.
+
+Each loop iteration performs N compute steps (pure arithmetic)
+followed by one SLOAD + cursor increment.  The ``compute_percent``
+parameter controls N so that approximately that fraction of each
+iteration's gas is spent on computation vs. storage reads.
+"""
+
+import pytest
+from execution_testing import (
+    Alloc,
+    BenchmarkTestFiller,
+    Bytecode,
+    Fork,
+    Op,
+)
+
+from .helpers import (
+    StorageInitRange,
+    cursor_read,
+    gas_check_loop_contract,
+    plan_benchmark,
+    run_bal_benchmark,
+    sload_loop_body,
+)
+from .spec import ref_spec_7928
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7928.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7928.version
+
+pytestmark = pytest.mark.valid_from("Amsterdam")
+
+
+def _compute_step() -> Bytecode:
+    """
+    One pure-compute step (stack unchanged).
+
+    Uses cursor on stack: DUP, multiply by 3, add 7, discard.
+    """
+    return Op.DUP1 + Op.PUSH1(0x03) + Op.MUL + Op.PUSH1(0x07) + Op.ADD + Op.POP
+
+
+def _compute_steps_for_percent(
+    fork: Fork,
+    compute_percent: int,
+) -> int:
+    """Return N compute steps per SLOAD for a target gas ratio."""
+    sload_gas = sload_loop_body().gas_cost(fork)
+    step_gas = _compute_step().gas_cost(fork)
+    # N = pct * sload_gas / (step_gas * (100 - pct))
+    n = compute_percent * sload_gas / (step_gas * (100 - compute_percent))
+    return max(1, round(n))
+
+
+def _mixed_body(compute_steps: int) -> Bytecode:
+    """N compute steps then SLOAD(cursor) + cursor++."""
+    step = _compute_step()
+    body = step
+    for _ in range(compute_steps - 1):
+        body += step
+    return body + sload_loop_body()
+
+
+@pytest.mark.parametrize(
+    "compute_percent",
+    [5, 10, 25, 50],
+    ids=lambda p: f"compute_{p}pct",
+)
+def test_bal_compute_then_sload(
+    pre: Alloc,
+    benchmark_test: BenchmarkTestFiller,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    compute_percent: int,
+) -> None:
+    """Test BAL with mixed computation and SLOAD per iteration."""
+    n = _compute_steps_for_percent(fork, compute_percent)
+    body = _mixed_body(n)
+    plan = plan_benchmark(
+        fork,
+        loop_body_gas=body.gas_cost(fork),
+        setup_gas=cursor_read().gas_cost(fork),
+        gas_benchmark_value=gas_benchmark_value,
+    )
+    total = plan.total_iterations
+    authority = pre.fund_eoa(amount=0)
+    run_bal_benchmark(
+        pre=pre,
+        fork=fork,
+        benchmark_test=benchmark_test,
+        contract_code=gas_check_loop_contract(
+            setup=cursor_read(),
+            body=body,
+            gas_threshold=plan.gas_threshold,
+        ),
+        plan=plan,
+        tx_gas_limit=tx_gas_limit,
+        authority=authority,
+        storage_init_ranges=[StorageInitRange(0, total + 1, 1)],
+        data_slot_reads=list(range(1, total + 1)),
+    )
diff --git a/tests/benchmark/stateful/eip7928_block_level_access_lists/test_block_access_lists_max_accounts.py b/tests/benchmark/stateful/eip7928_block_level_access_lists/test_block_access_lists_max_accounts.py
new file mode 100644
index 00000000000..9b20ce8ed40
--- /dev/null
+++ b/tests/benchmark/stateful/eip7928_block_level_access_lists/test_block_access_lists_max_accounts.py
@@ -0,0 +1,116 @@
+"""
+Tests for EIP-7928 BAL with maximum unique account accesses.
+
+Deploys a contract that reads its starting offset from CURSOR_SLOT,
+then calls BALANCE on sequential addresses while remaining gas
+exceeds a threshold.  Each transaction writes an updated cursor,
+creating inter-transaction dependencies that require the BAL.
+"""
+
+import pytest
+from execution_testing import (
+    Address,
+    Alloc,
+    BalAccountExpectation,
+    BenchmarkTestFiller,
+    Bytecode,
+    Fork,
+    Op,
+)
+
+from .helpers import (
+    CURSOR_INIT,
+    StorageInitRange,
+    cursor_read,
+    cursor_write,
+    gas_check_loop_contract,
+    plan_benchmark,
+    run_bal_benchmark,
+)
+from .spec import ref_spec_7928
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7928.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7928.version
+
+pytestmark = pytest.mark.valid_from("Amsterdam")
+
+# Start addresses above precompiles and system contracts.
+BASE_ADDR = 0x10000
+
+
+def _balance_body() -> Bytecode:
+    """
+    BALANCE loop body.
+
+    Stack on entry:  [addr]
+    Stack on exit:   [addr+1]
+    """
+    return Op.DUP1 + Op.BALANCE + Op.POP + Op.PUSH1(0x01) + Op.ADD
+
+
+def _teardown() -> Bytecode:
+    """Teardown: convert addr back to cursor, write, stop."""
+    return (
+        Op.JUMPDEST
+        + Op.PUSH3(BASE_ADDR)
+        + Op.SWAP1
+        + Op.SUB
+        + cursor_write()
+        + Op.STOP
+    )
+
+
+def create_balance_loop_contract(
+    gas_threshold: int,
+) -> Bytecode:
+    """
+    Create contract that calls BALANCE on sequential addresses.
+
+    1. cursor = SLOAD(CURSOR_SLOT)
+    2. addr   = BASE_ADDR + cursor
+    3. Loop while GAS > threshold: BALANCE(addr); addr++
+    4. SSTORE(CURSOR_SLOT, addr - BASE_ADDR)
+    """
+    setup = cursor_read() + Op.PUSH3(BASE_ADDR) + Op.ADD
+    return gas_check_loop_contract(
+        setup=setup,
+        body=_balance_body(),
+        gas_threshold=gas_threshold,
+        teardown=_teardown(),
+    )
+
+
+def test_bal_max_account_access(
+    pre: Alloc,
+    benchmark_test: BenchmarkTestFiller,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+) -> None:
+    """Test BAL with maximum unique account accesses via BALANCE."""
+    setup = cursor_read() + Op.PUSH3(BASE_ADDR) + Op.ADD
+    body_gas = _balance_body().gas_cost(fork)
+    plan = plan_benchmark(
+        fork,
+        loop_body_gas=body_gas,
+        setup_gas=setup.gas_cost(fork),
+        gas_benchmark_value=gas_benchmark_value,
+        teardown=_teardown(),
+    )
+    total = plan.total_iterations
+    extra = {
+        Address(BASE_ADDR + i): BalAccountExpectation.empty()
+        for i in range(CURSOR_INIT, total + CURSOR_INIT)
+    }
+    authority = pre.fund_eoa(amount=0)
+    run_bal_benchmark(
+        pre=pre,
+        fork=fork,
+        benchmark_test=benchmark_test,
+        contract_code=create_balance_loop_contract(plan.gas_threshold),
+        plan=plan,
+        tx_gas_limit=tx_gas_limit,
+        authority=authority,
+        storage_init_ranges=[StorageInitRange(0, 1, CURSOR_INIT)],
+        extra_expectations=extra,
+    )
diff --git a/tests/benchmark/stateful/eip7928_block_level_access_lists/test_block_access_lists_max_sloads.py b/tests/benchmark/stateful/eip7928_block_level_access_lists/test_block_access_lists_max_sloads.py
new file mode 100644
index 00000000000..9010c85404f
--- /dev/null
+++ b/tests/benchmark/stateful/eip7928_block_level_access_lists/test_block_access_lists_max_sloads.py
@@ -0,0 +1,101 @@
+"""
+Tests for EIP-7928 BAL with maximum SLOAD transactions.
+
+Deploys a loop-based contract that reads its starting cursor from
+storage, then SLOADs sequential slots until remaining gas drops
+below a threshold.  The updated cursor is written back, creating
+inter-transaction dependencies that require the BAL for parallel
+execution.
+
+Parametrized over direction: forward (ascending slots) and reverse
+(descending slots) to prevent direction-specific optimizations.
+"""
+
+import pytest
+from execution_testing import (
+    Alloc,
+    BenchmarkTestFiller,
+    Bytecode,
+    Fork,
+)
+
+from .helpers import (
+    StorageInitRange,
+    cursor_read,
+    gas_check_loop_contract,
+    plan_benchmark,
+    run_bal_benchmark,
+    sload_loop_body,
+    sload_loop_body_reverse,
+)
+from .spec import ref_spec_7928
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7928.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7928.version
+
+pytestmark = pytest.mark.valid_from("Amsterdam")
+
+
+def create_sload_loop_contract(
+    gas_threshold: int,
+    reverse: bool = False,
+) -> Bytecode:
+    """
+    Create contract that SLOADs sequential slots via cursor.
+
+    1. cursor = SLOAD(CURSOR_SLOT)
+    2. Loop while GAS > threshold:
+         SLOAD(cursor); cursor += 1 (forward) or -= 1 (reverse)
+    3. SSTORE(CURSOR_SLOT, cursor)
+    """
+    body = sload_loop_body_reverse() if reverse else sload_loop_body()
+    return gas_check_loop_contract(
+        setup=cursor_read(),
+        body=body,
+        gas_threshold=gas_threshold,
+    )
+
+
+@pytest.mark.parametrize(
+    "reverse",
+    [False, True],
+    ids=["forward", "reverse"],
+)
+def test_bal_max_sloads(
+    pre: Alloc,
+    benchmark_test: BenchmarkTestFiller,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+    reverse: bool,
+) -> None:
+    """Test BAL with maximum sequential SLOADs via cursor."""
+    body = sload_loop_body_reverse() if reverse else sload_loop_body()
+    body_gas = body.gas_cost(fork)
+    plan = plan_benchmark(
+        fork,
+        loop_body_gas=body_gas,
+        setup_gas=cursor_read().gas_cost(fork),
+        gas_benchmark_value=gas_benchmark_value,
+    )
+    total = plan.total_iterations
+    # Cursor starts at slot 0; forward reads slots 1..total,
+    # reverse reads slots total..1.
+    cursor_start = total if reverse else 1
+    authority = pre.fund_eoa(amount=0)
+    run_bal_benchmark(
+        pre=pre,
+        fork=fork,
+        benchmark_test=benchmark_test,
+        contract_code=create_sload_loop_contract(
+            plan.gas_threshold, reverse=reverse
+        ),
+        plan=plan,
+        tx_gas_limit=tx_gas_limit,
+        authority=authority,
+        storage_init_ranges=[
+            StorageInitRange(1, total, 0),
+            StorageInitRange(0, 1, cursor_start),
+        ],
+        data_slot_reads=list(range(1, total + 1)),
+    )
diff --git a/tests/benchmark/stateful/eip7928_block_level_access_lists/test_block_access_lists_pointer_chase.py b/tests/benchmark/stateful/eip7928_block_level_access_lists/test_block_access_lists_pointer_chase.py
new file mode 100644
index 00000000000..ab2e86f55bb
--- /dev/null
+++ b/tests/benchmark/stateful/eip7928_block_level_access_lists/test_block_access_lists_pointer_chase.py
@@ -0,0 +1,89 @@
+"""
+Tests for EIP-7928 BAL with dependent pointer-chasing SLOADs.
+
+Deploys a contract with linked-list storage (slot[i] = i+1) that
+reads its starting position from CURSOR_SLOT.  Each transaction
+follows the chain while remaining gas exceeds a threshold, then
+writes the final chased value back to CURSOR_SLOT, creating
+inter-transaction dependencies.
+"""
+
+import pytest
+from execution_testing import (
+    Alloc,
+    BenchmarkTestFiller,
+    Bytecode,
+    Fork,
+    Op,
+)
+
+from .helpers import (
+    StorageInitRange,
+    cursor_read,
+    gas_check_loop_contract,
+    plan_benchmark,
+    run_bal_benchmark,
+)
+from .spec import ref_spec_7928
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_7928.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7928.version
+
+pytestmark = pytest.mark.valid_from("Amsterdam")
+
+
+def _chase_body() -> Bytecode:
+    """
+    Pointer-chase loop body.
+
+    Stack on entry:  [cursor]
+    Stack on exit:   [new_cursor]
+    """
+    return Op.DUP1 + Op.SLOAD + Op.SWAP1 + Op.POP
+
+
+def create_pointer_chase_contract(
+    gas_threshold: int,
+) -> Bytecode:
+    """
+    Create contract that follows a pointer chain via cursor.
+
+    1. cursor = SLOAD(CURSOR_SLOT)
+    2. Loop while GAS > threshold: cursor = SLOAD(cursor)
+    3. SSTORE(CURSOR_SLOT, cursor)
+    """
+    return gas_check_loop_contract(
+        setup=cursor_read(),
+        body=_chase_body(),
+        gas_threshold=gas_threshold,
+    )
+
+
+def test_bal_max_pointer_chase(
+    pre: Alloc,
+    benchmark_test: BenchmarkTestFiller,
+    fork: Fork,
+    gas_benchmark_value: int,
+    tx_gas_limit: int,
+) -> None:
+    """Test BAL with maximum dependent pointer-chasing SLOADs."""
+    body_gas = _chase_body().gas_cost(fork)
+    plan = plan_benchmark(
+        fork,
+        loop_body_gas=body_gas,
+        setup_gas=cursor_read().gas_cost(fork),
+        gas_benchmark_value=gas_benchmark_value,
+    )
+    total = plan.total_iterations
+    authority = pre.fund_eoa(amount=0)
+    run_bal_benchmark(
+        pre=pre,
+        fork=fork,
+        benchmark_test=benchmark_test,
+        contract_code=create_pointer_chase_contract(plan.gas_threshold),
+        plan=plan,
+        tx_gas_limit=tx_gas_limit,
+        authority=authority,
+        storage_init_ranges=[StorageInitRange(0, total + 1, 1)],
+        data_slot_reads=list(range(1, total + 1)),
+    )
diff --git a/tests/benchmark/stateful/helpers.py b/tests/benchmark/stateful/helpers.py
index 62c6f758ab0..c746038a7d2 100644
--- a/tests/benchmark/stateful/helpers.py
+++ b/tests/benchmark/stateful/helpers.py
@@ -1,20 +1,24 @@
 """Shared constants and helpers for stateful benchmark tests."""
 
-import json
 from collections.abc import Callable
+from dataclasses import dataclass
 from enum import Enum
-from pathlib import Path
+from functools import partial
 
 from execution_testing import (
+    EOA,
     AccessList,
     Address,
     Alloc,
+    AuthorizationTuple,
     Block,
     Fork,
     Hash,
+    IteratingBytecode,
     Op,
     Transaction,
 )
+from execution_testing.base_types.base_types import Number
 
 # ERC20 function selectors
 BALANCEOF_SELECTOR = 0x70A08231  # balanceOf(address)
@@ -22,44 +26,6 @@
 ALLOWANCE_SELECTOR = 0xDD62ED3E  # allowance(address,address)
 MINT_SELECTOR = 0x40C10F19  # mint(address,uint256)
 
-# Load token names from stubs_bloatnet.json for test parametrization
-_STUBS_FILE = Path(__file__).parent / "bloatnet" / "stubs_bloatnet.json"
-with open(_STUBS_FILE) as f:
-    _STUBS = json.load(f)
-
-# Extract unique token names for each test type
-SLOAD_TOKENS = [
-    k.replace("test_sload_empty_erc20_balanceof_", "")
-    for k in _STUBS.keys()
-    if k.startswith("test_sload_empty_erc20_balanceof_")
-]
-SSTORE_TOKENS = [
-    k.replace("test_sstore_erc20_approve_", "")
-    for k in _STUBS.keys()
-    if k.startswith("test_sstore_erc20_approve_")
-]
-SSTORE_MINT_TOKENS = [
-    k.replace("test_sstore_erc20_mint_", "")
-    for k in _STUBS.keys()
-    if k.startswith("test_sstore_erc20_mint_")
-]
-MIXED_TOKENS = [
-    k.replace("test_mixed_sload_sstore_", "")
-    for k in _STUBS.keys()
-    if k.startswith("test_mixed_sload_sstore_")
-]
-
-# Extract factory stub names for factory-based benchmarks,
-# sorted by bytecode size
-FACTORY_STUBS = sorted(
-    [k for k in _STUBS if k.startswith("bloatnet_factory_")],
-    key=lambda name: float(
-        name.replace("bloatnet_factory_", "")
-        .replace("kb", "")
-        .replace("_", ".")
-    ),
-)
-assert FACTORY_STUBS, "No factory stubs found matching 'bloatnet_factory_*'"
 
 # Standard While-loop decrement-and-test condition.
 #
@@ -172,3 +138,313 @@ def build_cache_strategy_blocks(
     if cache_strategy != CacheStrategy.CACHE_PREVIOUS_BLOCK:
         return [Block(txs=txs)]
     return [Block(txs=cache_txs), Block(txs=txs)]
+
+
+def pack_transactions_into_blocks(
+    transactions: list[Transaction],
+    gas_limit: int,
+) -> list[Block]:
+    """
+    Pack transactions into blocks without exceeding gas_limit per block.
+
+    Greedily add transactions to the current block until adding another
+    would exceed the gas limit, then start a new block.
+    """
+    if not transactions:
+        return []
+
+    blocks: list[Block] = []
+    current_txs: list[Transaction] = []
+    current_gas = 0
+
+    for tx in transactions:
+        if current_gas + tx.gas_limit > gas_limit and current_txs:
+            blocks.append(Block(txs=current_txs))
+            current_txs = []
+            current_gas = 0
+
+        current_txs.append(tx)
+        current_gas += tx.gas_limit
+
+    if current_txs:
+        blocks.append(Block(txs=current_txs))
+
+    return blocks
+
+
+def build_delegated_storage_setup(
+    *,
+    pre: Alloc,
+    fork: Fork,
+    tx_gas_limit: int,
+    needs_init: bool,
+    num_target_slots: int,
+    initializer_code: IteratingBytecode,
+    initializer_addr: Address,
+    executor_addr: Address,
+    authority: EOA,
+    authority_nonce: int,
+    delegation_sender: EOA,
+    initializer_calldata_generator: Callable[[int, int], bytes],
+) -> list[Block]:
+    """
+    Build setup blocks for delegated storage benchmarks.
+
+    Use EIP-7702 authorization to delegate an authority EOA first to
+    a storage-initializer contract (if *needs_init*), then to the
+    benchmark executor contract.  Return the list of setup blocks.
+    """
+    blocks: list[Block] = []
+
+    if needs_init:
+        # Block 1: Authorize to initializer
+        blocks.append(
+            Block(
+                txs=[
+                    Transaction(
+                        to=delegation_sender,
+                        gas_limit=tx_gas_limit,
+                        sender=delegation_sender,
+                        authorization_list=[
+                            AuthorizationTuple(
+                                address=initializer_addr,
+                                nonce=authority_nonce,
+                                signer=authority,
+                            ),
+                        ],
+                    )
+                ]
+            )
+        )
+        authority_nonce += 1
+
+        # Calculate max slots per transaction based on gas cost
+        iteration_cost = initializer_code.tx_gas_limit_by_iteration_count(
+            fork=fork,
+            iteration_count=1,
+            start_iteration=1,
+            calldata=initializer_calldata_generator,
+        )
+        iteration_count = max(1, tx_gas_limit // iteration_cost)
+
+        init_txs: list[Transaction] = []
+        for start in range(1, num_target_slots + 1, iteration_count):
+            chunk_size = min(iteration_count, num_target_slots - start + 1)
+            init_txs.extend(
+                initializer_code.transactions_by_total_iteration_count(
+                    fork=fork,
+                    total_iterations=chunk_size,
+                    sender=pre.fund_eoa(),
+                    to=authority,
+                    start_iteration=start,
+                    calldata=initializer_calldata_generator,
+                )
+            )
+
+        # Pack init transactions into blocks
+        blocks.extend(pack_transactions_into_blocks(init_txs, tx_gas_limit))
+
+    # Final block: Authorize to executor
+    blocks.append(
+        Block(
+            txs=[
+                Transaction(
+                    to=delegation_sender,
+                    gas_limit=tx_gas_limit,
+                    sender=delegation_sender,
+                    authorization_list=[
+                        AuthorizationTuple(
+                            address=executor_addr,
+                            nonce=authority_nonce,
+                            signer=authority,
+                        ),
+                    ],
+                )
+            ]
+        )
+    )
+
+    return blocks
+
+
+def create_sstore_initializer(init_val: int) -> IteratingBytecode:
+    """
+    Create a contract that initializes storage slots from calldata.
+
+    - CALLDATA[0..32] start slot (index)
+    - CALLDATA[32..64] slot count (num)
+
+    storage[i] = init_val for i in [index, index + num).
+    """
+    # Setup: [index, index + num]
+    prefix = (
+        Op.CALLDATALOAD(0)  # [index]
+        + Op.DUP1  # [index, index]
+        + Op.CALLDATALOAD(32)  # [index, index, num]
+        + Op.ADD  # [index, index + num]
+    )
+
+    # Loop: decrement counter and store at current position
+    # Stack after subtraction: [index, current]
+    # where current goes from index+num-1 down to index
+    loop = (
+        Op.JUMPDEST
+        + Op.PUSH1(1)  # [index, current, 1]
+        + Op.SWAP1  # [index, 1, current]
+        + Op.SUB  # [index, current - 1]
+        + Op.SSTORE(  # STORAGE[current-1] = initial_value
+            Op.DUP2,
+            init_val,
+            key_warm=False,
+            # gas accounting
+            original_value=0,
+            current_value=0,
+            new_value=init_val,
+        )
+        # After SSTORE: [index, current - 1]
+        # Continue while current - 1 > index
+        + Op.JUMPI(len(prefix), Op.GT(Op.DUP2, Op.DUP2))
+    )
+
+    return IteratingBytecode(setup=prefix, iterating=loop)
+
+
+def initializer_calldata_generator(
+    iteration_count: int, start_iteration: int
+) -> bytes:
+    """Generate calldata for the storage initializer."""
+    return Hash(start_iteration) + Hash(iteration_count)
+
+
+def create_sequential_sstore_initializer() -> IteratingBytecode:
+    """
+    Create a contract that initializes storage with slot-dependent values.
+
+    - CALLDATA[0..32]  start slot (index)
+    - CALLDATA[32..64] slot count (num)
+    - CALLDATA[64..96] value offset
+
+    storage[i] = i + offset for i in [index, index + num).
+    """
+    # Setup: [offset, index, index + num]
+    prefix = (
+        Op.CALLDATALOAD(64)  # [offset]
+        + Op.CALLDATALOAD(0)  # [index, offset]
+        + Op.DUP1  # [index, index, offset]
+        + Op.CALLDATALOAD(32)  # [num, index, index, offset]
+        + Op.ADD  # [num + index, index, offset]
+    )
+
+    # Loop: decrement current and store slot-dependent value
+    # Stack: [current, index, offset]
+    # current goes from index+num down; stores at current-1
+    loop = (
+        Op.JUMPDEST
+        + Op.PUSH1(1)  # [1, current, index, offset]
+        + Op.SWAP1  # [current, 1, index, offset]
+        + Op.SUB  # [current-1, index, offset]
+        + Op.DUP1  # [current-1, current-1, index, offset]
+        + Op.DUP1  # [current-1, current-1, current-1, index, offset]
+        + Op.DUP5  # [offset, current-1, current-1, current-1, index, offset]
+        + Op.ADD  # [current-1 + offset, current-1, current-1, index, offset]
+        + Op.SWAP1  # [current-1, current-1 + offset, current-1, index, offset]
+        + Op.SSTORE(  # SSTORE(current-1, current-1 + offset)
+            key_warm=False,
+            original_value=0,
+            current_value=0,
+            new_value=1,
+        )
+        # Stack: [current-1, index, offset]
+        # Continue while current-1 > index
+        + Op.JUMPI(len(prefix), Op.GT(Op.DUP2, Op.DUP2))
+    )
+
+    return IteratingBytecode(setup=prefix, iterating=loop)
+
+
+def sequential_initializer_calldata_generator(
+    iteration_count: int,
+    start_iteration: int,
+    *,
+    offset: int = 0,
+) -> bytes:
+    """Generate calldata for the sequential storage initializer."""
+    return Hash(start_iteration) + Hash(iteration_count) + Hash(offset)
+
+
+@dataclass(frozen=True)
+class StorageInitRange:
+    """One contiguous range of storage to initialize."""
+
+    start_slot: int
+    num_slots: int
+    offset: int
+
+
+def build_sequential_storage_init(
+    *,
+    pre: Alloc,
+    fork: Fork,
+    tx_gas_limit: int,
+    authority: EOA,
+    storage_init_ranges: list[StorageInitRange],
+) -> list[Block]:
+    """
+    Build blocks that initialize storage with slot-dependent values.
+
+    Deploy a sequential-SSTORE initializer, delegate *authority* to it,
+    and emit transactions that write
+    ``storage[i] = i + range.offset`` for every range.  The authority's
+    nonce is incremented in-place.
+    """
+    initializer_code = create_sequential_sstore_initializer()
+    initializer_addr = pre.deploy_contract(code=initializer_code)
+
+    delegation_sender = pre.fund_eoa()
+    auth_tx = Transaction(
+        to=delegation_sender,
+        gas_limit=tx_gas_limit,
+        sender=delegation_sender,
+        authorization_list=[
+            AuthorizationTuple(
+                address=initializer_addr,
+                nonce=authority.nonce,
+                signer=authority,
+            ),
+        ],
+    )
+    authority.nonce = Number(authority.nonce + 1)
+
+    init_txs: list[Transaction] = []
+    for r in storage_init_ranges:
+        if r.num_slots == 0:
+            continue
+        calldata_gen = partial(
+            sequential_initializer_calldata_generator,
+            offset=r.offset,
+        )
+        iteration_cost = initializer_code.tx_gas_limit_by_iteration_count(
+            fork=fork,
+            iteration_count=1,
+            start_iteration=max(1, r.start_slot),
+            calldata=calldata_gen,
+        )
+        iteration_count = max(1, tx_gas_limit // iteration_cost)
+
+        end_slot = r.start_slot + r.num_slots
+        for start in range(r.start_slot, end_slot, iteration_count):
+            chunk = min(iteration_count, end_slot - start)
+            init_txs.extend(
+                initializer_code.transactions_by_total_iteration_count(
+                    fork=fork,
+                    total_iterations=chunk,
+                    sender=pre.fund_eoa(),
+                    to=authority,
+                    start_iteration=start,
+                    calldata=calldata_gen,
+                )
+            )
+
+    blocks: list[Block] = [Block(txs=[auth_tx])]
+    blocks.extend(pack_transactions_into_blocks(init_txs, tx_gas_limit))
+    return blocks
diff --git a/tests/benchmark/stateful/stubs/stubs_99.json b/tests/benchmark/stateful/stubs/stubs_99.json
new file mode 100644
index 00000000000..abd6d658229
--- /dev/null
+++ b/tests/benchmark/stateful/stubs/stubs_99.json
@@ -0,0 +1,893 @@
+{
+  "test_sload_empty_erc20_balanceof_30GB_ERC20": {
+    "addr": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C"
+  },
+  "test_sload_empty_erc20_balanceof_XEN": {
+    "addr": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8"
+  },
+  "test_sload_empty_erc20_balanceof_USDT": {
+    "addr": "0xdAC17F958D2ee523a2206206994597C13D831ec7"
+  },
+  "test_sload_empty_erc20_balanceof_USDC": {
+    "addr": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48"
+  },
+  "test_sload_empty_erc20_balanceof_LPT": {
+    "addr": "0x58b6A8a3302369DAEc383334672404Ee733AB239"
+  },
+  "test_sload_empty_erc20_balanceof_SHIB": {
+    "addr": "0x95aD61B0a150d79219dCF64E1E6Cc01f0B64C4cE"
+  },
+  "test_sload_empty_erc20_balanceof_WETH": {
+    "addr": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
+  },
+  "test_sload_empty_erc20_balanceof_G-CRE": {
+    "addr": "0xa3Ee21c306A700E682AbcDfE9bAA6A08F3820419"
+  },
+  "test_sload_empty_erc20_balanceof_MEME": {
+    "addr": "0xB131F4A55907B10d1F0A50d8Ab8FA09EC342CD74"
+  },
+  "test_sload_empty_erc20_balanceof_OMG": {
+    "addr": "0xd26114cD6EE289AccF82350c8d8487fedB8A0C07"
+  },
+  "test_sload_empty_erc20_balanceof_MATIC": {
+    "addr": "0x7d1Afa7B718fb893DB30A3abc0Cfc608AaCfEbB0"
+  },
+  "test_sload_empty_erc20_balanceof_stETH": {
+    "addr": "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84"
+  },
+  "test_sload_empty_erc20_balanceof_DAI": {
+    "addr": "0x6B175474E89094C44Da98b954EedeAC495271d0F"
+  },
+  "test_sload_empty_erc20_balanceof_PEPE": {
+    "addr": "0x6982508145454Ce325dDbE47a25d4eC3d2311933"
+  },
+  "test_sload_empty_erc20_balanceof_old": {
+    "addr": "0x0cf0ee63788A0849FE5297F3407f701E122CC023"
+  },
+  "test_sload_empty_erc20_balanceof_BAT": {
+    "addr": "0x0D8775F648430679A709E98d2b0Cb6250d2887EF"
+  },
+  "test_sload_empty_erc20_balanceof_UNI": {
+    "addr": "0x1F9840a85d5aF5bf1D1762F925BdADdC4201F984"
+  },
+  "test_sload_empty_erc20_balanceof_AMB": {
+    "addr": "0x4dc3643Dbc642b72C158E7F3d2FF232df61cB6CE"
+  },
+  "test_sload_empty_erc20_balanceof_HEX": {
+    "addr": "0x2b591e99afE9f32eAA6214f7B7629768c40eEb39"
+  },
+  "test_sload_empty_erc20_balanceof_CRO": {
+    "addr": "0xa0b73e1ff0b80914ab6fe0444e65848c4c34450b"
+  },
+  "test_sload_empty_erc20_balanceof_UCASH": {
+    "addr": "0x92e52a1A235d9A103D970901066CE910AAceFD37"
+  },
+  "test_sload_empty_erc20_balanceof_BNB": {
+    "addr": "0xB8c77482e45F1F44dE1745F52C74426C631bDd52"
+  },
+  "test_sload_empty_erc20_balanceof_GSE": {
+    "addr": "0xe530441f4f73bdb6dc2fa5af7c3fc5fd551ec838"
+  },
+  "test_sload_empty_erc20_balanceof_MANA": {
+    "addr": "0x0F5D2FB29fb7d3cFeE444A200298f468908cC942"
+  },
+  "test_sload_empty_erc20_balanceof_OCN": {
+    "addr": "0x4092678e4E78230F46A1534C0fBC8Fa39780892B"
+  },
+  "test_sload_empty_erc20_balanceof_EIGEN": {
+    "addr": "0xEC53BF9167F50cDEb3aE105F56099AaAb9061F83"
+  },
+  "test_sload_empty_erc20_balanceof_COMP": {
+    "addr": "0xc00e94Cb662C3520282E6f5717214004A7f26888"
+  },
+  "test_sload_empty_erc20_balanceof_cUSDC": {
+    "addr": "0x39AA39c021dfbaE8faC545936693aC917d5E7563"
+  },
+  "test_sload_empty_erc20_balanceof_sMEME": {
+    "addr": "0xc059A531B4234d05e9EF4aC51028f7E6156E2CcE"
+  },
+  "test_sload_empty_erc20_balanceof_SAND": {
+    "addr": "0x3845badade8e6dff049820680d1f14bd3903a5d0"
+  },
+  "test_sload_empty_erc20_balanceof_AAVE": {
+    "addr": "0x7Fc66500c84A76Ad7e9c93437bFc5AC33E2DDAe9"
+  },
+  "test_sload_empty_erc20_balanceof_ZRX": {
+    "addr": "0xE41d2489571d322189246DaFA5ebDe1F4699F498"
+  },
+  "test_sload_empty_erc20_balanceof_KOK": {
+    "addr": "0x9B9647431632AF44be02ddd22477Ed94d14AacAa"
+  },
+  "test_sload_empty_erc20_balanceof_APE": {
+    "addr": "0x4d224452801ACEd8B2F0aebe155379bb5D594381"
+  },
+  "test_sload_empty_erc20_balanceof_SAI": {
+    "addr": "0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359"
+  },
+  "test_sload_empty_erc20_balanceof_GRT": {
+    "addr": "0xc944E90C64B2c07662A292be6244BDf05Cda44a7"
+  },
+  "test_sload_empty_erc20_balanceof_LRC": {
+    "addr": "0xBBbbCA6A901c926F240b89EacB641d8Aec7AEafD"
+  },
+  "test_sload_empty_erc20_balanceof_ELON": {
+    "addr": "0x761D38e5DDf6ccf6Cf7C55759d5210750B5D60F3"
+  },
+  "test_sload_empty_erc20_balanceof_QNT": {
+    "addr": "0x4a220E6096B25EADb88358cb44068A3248254675"
+  },
+  "test_sload_empty_erc20_balanceof_ONDO": {
+    "addr": "0xfAbA6f8e4a5E8Ab82F62fe7C39859FA577269BE3"
+  },
+  "test_sload_empty_erc20_balanceof_ENJ": {
+    "addr": "0xF629cBd94d3791c9250152BD8dfBDF380E2a3B9c"
+  },
+  "test_sload_empty_erc20_balanceof_FET": {
+    "addr": "0x1D287CC25dAD7cCaF76a26bc660c5F7C8E2a05BD"
+  },
+  "test_sload_empty_erc20_balanceof_eETH": {
+    "addr": "0x6c5024Cd4F8A59110119C56f8933403A539555EB"
+  },
+  "test_sload_empty_erc20_balanceof_XMX": {
+    "addr": "0x0F8c45B896784A1E408526B9300519ef8660209c"
+  },
+  "test_sload_empty_erc20_balanceof_FTI": {
+    "addr": "0x943ed852Dadb5C3938ECdC6883718df8142de4C8"
+  },
+  "test_sload_empty_erc20_balanceof_WBTC": {
+    "addr": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599"
+  },
+  "test_sload_empty_erc20_balanceof_LEND": {
+    "addr": "0x80fB784B7eD66730e8b1DBd9820aFD29931aab03"
+  },
+  "test_sload_empty_erc20_balanceof_ELEC": {
+    "addr": "0xd49ff13661451313ca1553fd6954bd1d9b6e02b9"
+  },
+  "test_sload_empty_erc20_balanceof_SUSHI": {
+    "addr": "0x6B3595068778DD592e39A122f4f5a5CF09C90fE2"
+  },
+  "test_sload_empty_erc20_balanceof_HOT": {
+    "addr": "0x6c6EE5e31d828De241282B9606C8e98Ea48526E2"
+  },
+  "test_sload_empty_erc20_balanceof_MITx": {
+    "addr": "0x4a527d8fc13c5203ab24ba0944f4cb14658d1db6"
+  },
+  "test_sload_empty_erc20_balanceof_1INCH": {
+    "addr": "0x111111111117dC0aa78b770fA6A738034120C302"
+  },
+  "test_sload_empty_erc20_balanceof_USDP": {
+    "addr": "0x1456688345527bE1f37E9e627DA0837D6f08C925"
+  },
+  "test_sload_empty_erc20_balanceof_ETHFI": {
+    "addr": "0xfe0c30065b384f05761f15d0cc899d4f9f9cc0eb"
+  },
+  "test_sload_empty_erc20_balanceof_POLY": {
+    "addr": "0x9992ec3cf6a55b00978cddf2b27bc6882d88d1ec"
+  },
+  "test_sload_empty_erc20_balanceof_AOA": {
+    "addr": "0x9ab165d795019b6d8b3e971dda91071421305e5a"
+  },
+  "test_sload_empty_erc20_balanceof_STORJ": {
+    "addr": "0xB64ef51C888972c908CFacf59B47C1AfBC0Ab8aC"
+  },
+  "test_sload_empty_erc20_balanceof_MKR": {
+    "addr": "0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2"
+  },
+  "test_sload_empty_erc20_balanceof_AMP": {
+    "addr": "0xfF20817765cB7F73d4Bde2e66e067e58d11095c2"
+  },
+  "test_sload_empty_erc20_balanceof_VRA": {
+    "addr": "0xF411903cbc70a74d22900a5DE66A2dda66507255"
+  },
+  "test_sload_empty_erc20_balanceof_GTC": {
+    "addr": "0xde30da39c46104798bb5aa3fe8b9e0e1f348163f"
+  },
+  "test_sload_empty_erc20_balanceof_FLOKI": {
+    "addr": "0x43F11c02439E2736800433B4594994Bd43Cd066D"
+  },
+  "test_sload_empty_erc20_balanceof_ALT": {
+    "addr": "0x8457CA5040ad67fdebbCC8EdCE889A335Bc0fbFB"
+  },
+  "test_sload_empty_erc20_balanceof_IMX": {
+    "addr": "0xf57e7e7c23978c3caec3c3548e3d615c346e79ff"
+  },
+  "test_sload_empty_erc20_balanceof_XYO": {
+    "addr": "0x55296f69f40ea6d20e478533c15A6b08B654E758"
+  },
+  "test_sload_empty_erc20_balanceof_REV": {
+    "addr": "0x2ef27bf41236bd859a95209e17a43fbd26851f92"
+  },
+  "test_sload_empty_erc20_balanceof_FUN": {
+    "addr": "0x419d0d8bdd9af5e606ae2232ed285aff190e711b"
+  },
+  "test_sload_empty_erc20_balanceof_CRV": {
+    "addr": "0xD533a949740bb3306d119CC777fa900bA034cd52"
+  },
+  "test_sload_empty_erc20_balanceof_CHZ": {
+    "addr": "0x3506424f91fd33084466f402d5d97f05f8e3b4af"
+  },
+  "test_sload_empty_erc20_balanceof_SMT": {
+    "addr": "0x78Eb8DC641077F049f910659b6d580E80dC4d237"
+  },
+  "test_sload_empty_erc20_balanceof_SNX": {
+    "addr": "0xC011A72400E58ecD99Ee497CF89E3775d4bd732F"
+  },
+  "test_sload_empty_erc20_balanceof_DENT": {
+    "addr": "0x3597bfD533a99c9aa083587B074434E61Eb0A258"
+  },
+  "test_sload_empty_erc20_balanceof_RNDR": {
+    "addr": "0x6De037ef9aD2725EB40118Bb1702EBb27e4Aeb24"
+  },
+  "test_sload_empty_erc20_balanceof_SNT": {
+    "addr": "0x744d70FDBe2Ba4CF95131626614a1763DF805B9E"
+  },
+  "test_sload_empty_erc20_balanceof_AXS": {
+    "addr": "0xBB0E17EF65F82Ab018d8EDd776e8DD940327B28b"
+  },
+  "test_sload_empty_erc20_balanceof_KNC": {
+    "addr": "0xdd974D5C2e2928deA5F71b9825b8b646686BD200"
+  },
+  "test_sload_empty_erc20_balanceof_WEPE": {
+    "addr": "0xccB365D2e11aE4D6d74715c680f56cf58bF4bF10"
+  },
+  "test_sload_empty_erc20_balanceof_ZETA": {
+    "addr": "0xf091867ec603a6628ed83d274e835539d82e9cc8"
+  },
+  "test_sload_empty_erc20_balanceof_LYM": {
+    "addr": "0xc690f7c7fcffa6a82b79fab7508c466fefdfc8c5"
+  },
+  "test_sload_empty_erc20_balanceof_nCASH": {
+    "addr": "0x809826cceAb68c387726af962713b64Cb5Cb3CCA"
+  },
+  "test_sload_empty_erc20_balanceof_LOOKS": {
+    "addr": "0xf4d2888d29D722226FafA5d9B24F9164c092421E"
+  },
+  "test_sload_empty_erc20_balanceof_Monfter/Monavale": {
+    "addr": "0x275f5ad03be0fa221b4c6649b8aee09a42d9412a"
+  },
+  "test_sload_empty_erc20_balanceof_cETH": {
+    "addr": "0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5"
+  },
+  "test_sload_empty_erc20_balanceof_SALT": {
+    "addr": "0x4156D3342D5c385a87D264F90653733592000581"
+  },
+  "test_sload_empty_erc20_balanceof_HOGE": {
+    "addr": "0xfAd45E47083e4607302aa43c65fB3106F1cd7607"
+  },
+  "test_sload_empty_erc20_balanceof_REN": {
+    "addr": "0x408e41876cCCDC0F92210600ef50372656052a38"
+  },
+  "test_sload_empty_erc20_balanceof_ENS": {
+    "addr": "0xC56b13EBBCffa67cfB7979b900B736b3fb480D78"
+  },
+  "test_sload_empty_erc20_balanceof_NEXO": {
+    "addr": "0xB62132e35a6c13ee1EE0f84dC5d40bad8d815206"
+  },
+  "test_sload_empty_erc20_balanceof_RFR": {
+    "addr": "0xD0929d411954c47438Dc1D871dd6081F5C5e149c"
+  },
+  "test_sload_empty_erc20_balanceof_COFI": {
+    "addr": "0x3137619705b5fc22a3048989F983905e456B59Ab"
+  },
+  "test_sload_empty_erc20_balanceof_SLP": {
+    "addr": "0xcc8fa225d80b9c7d42f96e9570156c65d6cAAa25"
+  },
+  "test_sload_empty_erc20_balanceof_FUEL": {
+    "addr": "0xea38eaa3c86c8f9b751533ba2e562deb9acded40"
+  },
+  "test_sload_empty_erc20_balanceof_ENA": {
+    "addr": "0x57e114B691Db790C35207b2e685D4A43181e6061"
+  },
+  "test_sload_empty_erc20_balanceof_AKITA": {
+    "addr": "0x3301Ee63Fb29F863f2333Bd4466acb46CD8323E6"
+  },
+  "test_sload_empty_erc20_balanceof_CVC": {
+    "addr": "0x41e5560054824ea6B0732E656e3Ad64E20e94e45"
+  },
+  "test_sload_empty_erc20_balanceof_IHT": {
+    "addr": "0xEda8B016efa8b1161208Cf041cD86972EEE0F31E"
+  },
+  "test_sload_empty_erc20_balanceof_ZSC": {
+    "addr": "0x7A41e0517a5ecA4FdbC7FbebA4D4c47B9fF6DC63"
+  },
+  "test_sload_empty_erc20_balanceof_cbETH": {
+    "addr": "0xBe9895146f7AF43049ca1c1AE358B0541Ea49704"
+  },
+  "test_sload_empty_erc20_balanceof_IMT": {
+    "addr": "0x13119e34e140097a507b07a5564bde1bc375d9e6"
+  },
+  "test_sstore_erc20_approve_30GB_ERC20": {
+    "addr": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C"
+  },
+  "test_sstore_erc20_approve_XEN": {
+    "addr": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8"
+  },
+  "test_sstore_erc20_approve_USDT": {
+    "addr": "0xdAC17F958D2ee523a2206206994597C13D831ec7"
+  },
+  "test_sstore_erc20_approve_USDC": {
+    "addr": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48"
+  },
+  "test_sstore_erc20_approve_LPT": {
+    "addr": "0x58b6A8a3302369DAEc383334672404Ee733AB239"
+  },
+  "test_sstore_erc20_approve_SHIB": {
+    "addr": "0x95aD61B0a150d79219dCF64E1E6Cc01f0B64C4cE"
+  },
+  "test_sstore_erc20_approve_WETH": {
+    "addr": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
+  },
+  "test_sstore_erc20_approve_G-CRE": {
+    "addr": "0xa3Ee21c306A700E682AbcDfE9bAA6A08F3820419"
+  },
+  "test_sstore_erc20_approve_MEME": {
+    "addr": "0xB131F4A55907B10d1F0A50d8Ab8FA09EC342CD74"
+  },
+  "test_sstore_erc20_approve_OMG": {
+    "addr": "0xd26114cD6EE289AccF82350c8d8487fedB8A0C07"
+  },
+  "test_sstore_erc20_approve_MATIC": {
+    "addr": "0x7d1Afa7B718fb893DB30A3abc0Cfc608AaCfEbB0"
+  },
+  "test_sstore_erc20_approve_stETH": {
+    "addr": "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84"
+  },
+  "test_sstore_erc20_approve_DAI": {
+    "addr": "0x6B175474E89094C44Da98b954EedeAC495271d0F"
+  },
+  "test_sstore_erc20_approve_PEPE": {
+    "addr": "0x6982508145454Ce325dDbE47a25d4eC3d2311933"
+  },
+  "test_sstore_erc20_approve_old": {
+    "addr": "0x0cf0ee63788A0849FE5297F3407f701E122CC023"
+  },
+  "test_sstore_erc20_approve_BAT": {
+    "addr": "0x0D8775F648430679A709E98d2b0Cb6250d2887EF"
+  },
+  "test_sstore_erc20_approve_UNI": {
+    "addr": "0x1F9840a85d5aF5bf1D1762F925BdADdC4201F984"
+  },
+  "test_sstore_erc20_approve_AMB": {
+    "addr": "0x4dc3643Dbc642b72C158E7F3d2FF232df61cB6CE"
+  },
+  "test_sstore_erc20_approve_HEX": {
+    "addr": "0x2b591e99afE9f32eAA6214f7B7629768c40eEb39"
+  },
+  "test_sstore_erc20_approve_CRO": {
+    "addr": "0xa0b73e1ff0b80914ab6fe0444e65848c4c34450b"
+  },
+  "test_sstore_erc20_approve_UCASH": {
+    "addr": "0x92e52a1A235d9A103D970901066CE910AAceFD37"
+  },
+  "test_sstore_erc20_approve_BNB": {
+    "addr": "0xB8c77482e45F1F44dE1745F52C74426C631bDd52"
+  },
+  "test_sstore_erc20_approve_GSE": {
+    "addr": "0xe530441f4f73bdb6dc2fa5af7c3fc5fd551ec838"
+  },
+  "test_sstore_erc20_approve_MANA": {
+    "addr": "0x0F5D2FB29fb7d3cFeE444A200298f468908cC942"
+  },
+  "test_sstore_erc20_approve_OCN": {
+    "addr": "0x4092678e4E78230F46A1534C0fBC8Fa39780892B"
+  },
+  "test_sstore_erc20_approve_EIGEN": {
+    "addr": "0xEC53BF9167F50cDEb3aE105F56099AaAb9061F83"
+  },
+  "test_sstore_erc20_approve_COMP": {
+    "addr": "0xc00e94Cb662C3520282E6f5717214004A7f26888"
+  },
+  "test_sstore_erc20_approve_cUSDC": {
+    "addr": "0x39AA39c021dfbaE8faC545936693aC917d5E7563"
+  },
+  "test_sstore_erc20_approve_sMEME": {
+    "addr": "0xc059A531B4234d05e9EF4aC51028f7E6156E2CcE"
+  },
+  "test_sstore_erc20_approve_SAND": {
+    "addr": "0x3845badade8e6dff049820680d1f14bd3903a5d0"
+  },
+  "test_sstore_erc20_approve_AAVE": {
+    "addr": "0x7Fc66500c84A76Ad7e9c93437bFc5AC33E2DDAe9"
+  },
+  "test_sstore_erc20_approve_ZRX": {
+    "addr": "0xE41d2489571d322189246DaFA5ebDe1F4699F498"
+  },
+  "test_sstore_erc20_approve_KOK": {
+    "addr": "0x9B9647431632AF44be02ddd22477Ed94d14AacAa"
+  },
+  "test_sstore_erc20_approve_APE": {
+    "addr": "0x4d224452801ACEd8B2F0aebe155379bb5D594381"
+  },
+  "test_sstore_erc20_approve_SAI": {
+    "addr": "0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359"
+  },
+  "test_sstore_erc20_approve_GRT": {
+    "addr": "0xc944E90C64B2c07662A292be6244BDf05Cda44a7"
+  },
+  "test_sstore_erc20_approve_LRC": {
+    "addr": "0xBBbbCA6A901c926F240b89EacB641d8Aec7AEafD"
+  },
+  "test_sstore_erc20_approve_ELON": {
+    "addr": "0x761D38e5DDf6ccf6Cf7C55759d5210750B5D60F3"
+  },
+  "test_sstore_erc20_approve_QNT": {
+    "addr": "0x4a220E6096B25EADb88358cb44068A3248254675"
+  },
+  "test_sstore_erc20_approve_ONDO": {
+    "addr": "0xfAbA6f8e4a5E8Ab82F62fe7C39859FA577269BE3"
+  },
+  "test_sstore_erc20_approve_ENJ": {
+    "addr": "0xF629cBd94d3791c9250152BD8dfBDF380E2a3B9c"
+  },
+  "test_sstore_erc20_approve_FET": {
+    "addr": "0x1D287CC25dAD7cCaF76a26bc660c5F7C8E2a05BD"
+  },
+  "test_sstore_erc20_approve_eETH": {
+    "addr": "0x6c5024Cd4F8A59110119C56f8933403A539555EB"
+  },
+  "test_sstore_erc20_approve_XMX": {
+    "addr": "0x0F8c45B896784A1E408526B9300519ef8660209c"
+  },
+  "test_sstore_erc20_approve_FTI": {
+    "addr": "0x943ed852Dadb5C3938ECdC6883718df8142de4C8"
+  },
+  "test_sstore_erc20_approve_WBTC": {
+    "addr": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599"
+  },
+  "test_sstore_erc20_approve_LEND": {
+    "addr": "0x80fB784B7eD66730e8b1DBd9820aFD29931aab03"
+  },
+  "test_sstore_erc20_approve_ELEC": {
+    "addr": "0xd49ff13661451313ca1553fd6954bd1d9b6e02b9"
+  },
+  "test_sstore_erc20_approve_SUSHI": {
+    "addr": "0x6B3595068778DD592e39A122f4f5a5CF09C90fE2"
+  },
+  "test_sstore_erc20_approve_HOT": {
+    "addr": "0x6c6EE5e31d828De241282B9606C8e98Ea48526E2"
+  },
+  "test_sstore_erc20_approve_MITx": {
+    "addr": "0x4a527d8fc13c5203ab24ba0944f4cb14658d1db6"
+  },
+  "test_sstore_erc20_approve_1INCH": {
+    "addr": "0x111111111117dC0aa78b770fA6A738034120C302"
+  },
+  "test_sstore_erc20_approve_USDP": {
+    "addr": "0x1456688345527bE1f37E9e627DA0837D6f08C925"
+  },
+  "test_sstore_erc20_approve_ETHFI": {
+    "addr": "0xfe0c30065b384f05761f15d0cc899d4f9f9cc0eb"
+  },
+  "test_sstore_erc20_approve_POLY": {
+    "addr": "0x9992ec3cf6a55b00978cddf2b27bc6882d88d1ec"
+  },
+  "test_sstore_erc20_approve_AOA": {
+    "addr": "0x9ab165d795019b6d8b3e971dda91071421305e5a"
+  },
+  "test_sstore_erc20_approve_STORJ": {
+    "addr": "0xB64ef51C888972c908CFacf59B47C1AfBC0Ab8aC"
+  },
+  "test_sstore_erc20_approve_MKR": {
+    "addr": "0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2"
+  },
+  "test_sstore_erc20_approve_AMP": {
+    "addr": "0xfF20817765cB7F73d4Bde2e66e067e58d11095c2"
+  },
+  "test_sstore_erc20_approve_VRA": {
+    "addr": "0xF411903cbc70a74d22900a5DE66A2dda66507255"
+  },
+  "test_sstore_erc20_approve_GTC": {
+    "addr": "0xde30da39c46104798bb5aa3fe8b9e0e1f348163f"
+  },
+  "test_sstore_erc20_approve_FLOKI": {
+    "addr": "0x43F11c02439E2736800433B4594994Bd43Cd066D"
+  },
+  "test_sstore_erc20_approve_ALT": {
+    "addr": "0x8457CA5040ad67fdebbCC8EdCE889A335Bc0fbFB"
+  },
+  "test_sstore_erc20_approve_IMX": {
+    "addr": "0xf57e7e7c23978c3caec3c3548e3d615c346e79ff"
+  },
+  "test_sstore_erc20_approve_XYO": {
+    "addr": "0x55296f69f40ea6d20e478533c15A6b08B654E758"
+  },
+  "test_sstore_erc20_approve_REV": {
+    "addr": "0x2ef27bf41236bd859a95209e17a43fbd26851f92"
+  },
+  "test_sstore_erc20_approve_FUN": {
+    "addr": "0x419d0d8bdd9af5e606ae2232ed285aff190e711b"
+  },
+  "test_sstore_erc20_approve_CRV": {
+    "addr": "0xD533a949740bb3306d119CC777fa900bA034cd52"
+  },
+  "test_sstore_erc20_approve_CHZ": {
+    "addr": "0x3506424f91fd33084466f402d5d97f05f8e3b4af"
+  },
+  "test_sstore_erc20_approve_SMT": {
+    "addr": "0x78Eb8DC641077F049f910659b6d580E80dC4d237"
+  },
+  "test_sstore_erc20_approve_SNX": {
+    "addr": "0xC011A72400E58ecD99Ee497CF89E3775d4bd732F"
+  },
+  "test_sstore_erc20_approve_DENT": {
+    "addr": "0x3597bfD533a99c9aa083587B074434E61Eb0A258"
+  },
+  "test_sstore_erc20_approve_RNDR": {
+    "addr": "0x6De037ef9aD2725EB40118Bb1702EBb27e4Aeb24"
+  },
+  "test_sstore_erc20_approve_SNT": {
+    "addr": "0x744d70FDBe2Ba4CF95131626614a1763DF805B9E"
+  },
+  "test_sstore_erc20_approve_AXS": {
+    "addr": "0xBB0E17EF65F82Ab018d8EDd776e8DD940327B28b"
+  },
+  "test_sstore_erc20_approve_KNC": {
+    "addr": "0xdd974D5C2e2928deA5F71b9825b8b646686BD200"
+  },
+  "test_sstore_erc20_approve_WEPE": {
+    "addr": "0xccB365D2e11aE4D6d74715c680f56cf58bF4bF10"
+  },
+  "test_sstore_erc20_approve_ZETA": {
+    "addr": "0xf091867ec603a6628ed83d274e835539d82e9cc8"
+  },
+  "test_sstore_erc20_approve_LYM": {
+    "addr": "0xc690f7c7fcffa6a82b79fab7508c466fefdfc8c5"
+  },
+  "test_sstore_erc20_approve_nCASH": {
+    "addr": "0x809826cceAb68c387726af962713b64Cb5Cb3CCA"
+  },
+  "test_sstore_erc20_approve_LOOKS": {
+    "addr": "0xf4d2888d29D722226FafA5d9B24F9164c092421E"
+  },
+  "test_sstore_erc20_approve_Monfter/Monavale": {
+    "addr": "0x275f5ad03be0fa221b4c6649b8aee09a42d9412a"
+  },
+  "test_sstore_erc20_approve_cETH": {
+    "addr": "0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5"
+  },
+  "test_sstore_erc20_approve_SALT": {
+    "addr": "0x4156D3342D5c385a87D264F90653733592000581"
+  },
+  "test_sstore_erc20_approve_HOGE": {
+    "addr": "0xfAd45E47083e4607302aa43c65fB3106F1cd7607"
+  },
+  "test_sstore_erc20_approve_REN": {
+    "addr": "0x408e41876cCCDC0F92210600ef50372656052a38"
+  },
+  "test_sstore_erc20_approve_ENS": {
+    "addr": "0xC56b13EBBCffa67cfB7979b900B736b3fb480D78"
+  },
+  "test_sstore_erc20_approve_NEXO": {
+    "addr": "0xB62132e35a6c13ee1EE0f84dC5d40bad8d815206"
+  },
+  "test_sstore_erc20_approve_RFR": {
+    "addr": "0xD0929d411954c47438Dc1D871dd6081F5C5e149c"
+  },
+  "test_sstore_erc20_approve_COFI": {
+    "addr": "0x3137619705b5fc22a3048989F983905e456B59Ab"
+  },
+  "test_sstore_erc20_approve_SLP": {
+    "addr": "0xcc8fa225d80b9c7d42f96e9570156c65d6cAAa25"
+  },
+  "test_sstore_erc20_approve_FUEL": {
+    "addr": "0xea38eaa3c86c8f9b751533ba2e562deb9acded40"
+  },
+  "test_sstore_erc20_approve_ENA": {
+    "addr": "0x57e114B691Db790C35207b2e685D4A43181e6061"
+  },
+  "test_sstore_erc20_approve_AKITA": {
+    "addr": "0x3301Ee63Fb29F863f2333Bd4466acb46CD8323E6"
+  },
+  "test_sstore_erc20_approve_CVC": {
+    "addr": "0x41e5560054824ea6B0732E656e3Ad64E20e94e45"
+  },
+  "test_sstore_erc20_approve_IHT": {
+    "addr": "0xEda8B016efa8b1161208Cf041cD86972EEE0F31E"
+  },
+  "test_sstore_erc20_approve_ZSC": {
+    "addr": "0x7A41e0517a5ecA4FdbC7FbebA4D4c47B9fF6DC63"
+  },
+  "test_sstore_erc20_approve_cbETH": {
+    "addr": "0xBe9895146f7AF43049ca1c1AE358B0541Ea49704"
+  },
+  "test_sstore_erc20_approve_IMT": {
+    "addr": "0x13119e34e140097a507b07a5564bde1bc375d9e6"
+  },
+  "test_mixed_sload_sstore_30GB_ERC20": {
+    "addr": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C"
+  },
+  "test_mixed_sload_sstore_XEN": {
+    "addr": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8"
+  },
+  "test_mixed_sload_sstore_USDT": {
+    "addr": "0xdAC17F958D2ee523a2206206994597C13D831ec7"
+  },
+  "test_mixed_sload_sstore_USDC": {
+    "addr": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48"
+  },
+  "test_mixed_sload_sstore_LPT": {
+    "addr": "0x58b6A8a3302369DAEc383334672404Ee733AB239"
+  },
+  "test_mixed_sload_sstore_SHIB": {
+    "addr": "0x95aD61B0a150d79219dCF64E1E6Cc01f0B64C4cE"
+  },
+  "test_mixed_sload_sstore_WETH": {
+    "addr": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
+  },
+  "test_mixed_sload_sstore_G-CRE": {
+    "addr": "0xa3Ee21c306A700E682AbcDfE9bAA6A08F3820419"
+  },
+  "test_mixed_sload_sstore_MEME": {
+    "addr": "0xB131F4A55907B10d1F0A50d8Ab8FA09EC342CD74"
+  },
+  "test_mixed_sload_sstore_OMG": {
+    "addr": "0xd26114cD6EE289AccF82350c8d8487fedB8A0C07"
+  },
+  "test_mixed_sload_sstore_MATIC": {
+    "addr": "0x7d1Afa7B718fb893DB30A3abc0Cfc608AaCfEbB0"
+  },
+  "test_mixed_sload_sstore_stETH": {
+    "addr": "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84"
+  },
+  "test_mixed_sload_sstore_DAI": {
+    "addr": "0x6B175474E89094C44Da98b954EedeAC495271d0F"
+  },
+  "test_mixed_sload_sstore_PEPE": {
+    "addr": "0x6982508145454Ce325dDbE47a25d4eC3d2311933"
+  },
+  "test_mixed_sload_sstore_old": {
+    "addr": "0x0cf0ee63788A0849FE5297F3407f701E122CC023"
+  },
+  "test_mixed_sload_sstore_BAT": {
+    "addr": "0x0D8775F648430679A709E98d2b0Cb6250d2887EF"
+  },
+  "test_mixed_sload_sstore_UNI": {
+    "addr": "0x1F9840a85d5aF5bf1D1762F925BdADdC4201F984"
+  },
+  "test_mixed_sload_sstore_AMB": {
+    "addr": "0x4dc3643Dbc642b72C158E7F3d2FF232df61cB6CE"
+  },
+  "test_mixed_sload_sstore_HEX": {
+    "addr": "0x2b591e99afE9f32eAA6214f7B7629768c40eEb39"
+  },
+  "test_mixed_sload_sstore_CRO": {
+    "addr": "0xa0b73e1ff0b80914ab6fe0444e65848c4c34450b"
+  },
+  "test_mixed_sload_sstore_UCASH": {
+    "addr": "0x92e52a1A235d9A103D970901066CE910AAceFD37"
+  },
+  "test_mixed_sload_sstore_BNB": {
+    "addr": "0xB8c77482e45F1F44dE1745F52C74426C631bDd52"
+  },
+  "test_mixed_sload_sstore_GSE": {
+    "addr": "0xe530441f4f73bdb6dc2fa5af7c3fc5fd551ec838"
+  },
+  "test_mixed_sload_sstore_MANA": {
+    "addr": "0x0F5D2FB29fb7d3cFeE444A200298f468908cC942"
+  },
+  "test_mixed_sload_sstore_OCN": {
+    "addr": "0x4092678e4E78230F46A1534C0fBC8Fa39780892B"
+  },
+  "test_mixed_sload_sstore_EIGEN": {
+    "addr": "0xEC53BF9167F50cDEb3aE105F56099AaAb9061F83"
+  },
+  "test_mixed_sload_sstore_COMP": {
+    "addr": "0xc00e94Cb662C3520282E6f5717214004A7f26888"
+  },
+  "test_mixed_sload_sstore_cUSDC": {
+    "addr": "0x39AA39c021dfbaE8faC545936693aC917d5E7563"
+  },
+  "test_mixed_sload_sstore_sMEME": {
+    "addr": "0xc059A531B4234d05e9EF4aC51028f7E6156E2CcE"
+  },
+  "test_mixed_sload_sstore_SAND": {
+    "addr": "0x3845badade8e6dff049820680d1f14bd3903a5d0"
+  },
+  "test_mixed_sload_sstore_AAVE": {
+    "addr": "0x7Fc66500c84A76Ad7e9c93437bFc5AC33E2DDAe9"
+  },
+  "test_mixed_sload_sstore_ZRX": {
+    "addr": "0xE41d2489571d322189246DaFA5ebDe1F4699F498"
+  },
+  "test_mixed_sload_sstore_KOK": {
+    "addr": "0x9B9647431632AF44be02ddd22477Ed94d14AacAa"
+  },
+  "test_mixed_sload_sstore_APE": {
+    "addr": "0x4d224452801ACEd8B2F0aebe155379bb5D594381"
+  },
+  "test_mixed_sload_sstore_SAI": {
+    "addr": "0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359"
+  },
+  "test_mixed_sload_sstore_GRT": {
+    "addr": "0xc944E90C64B2c07662A292be6244BDf05Cda44a7"
+  },
+  "test_mixed_sload_sstore_LRC": {
+    "addr": "0xBBbbCA6A901c926F240b89EacB641d8Aec7AEafD"
+  },
+  "test_mixed_sload_sstore_ELON": {
+    "addr": "0x761D38e5DDf6ccf6Cf7C55759d5210750B5D60F3"
+  },
+  "test_mixed_sload_sstore_QNT": {
+    "addr": "0x4a220E6096B25EADb88358cb44068A3248254675"
+  },
+  "test_mixed_sload_sstore_ONDO": {
+    "addr": "0xfAbA6f8e4a5E8Ab82F62fe7C39859FA577269BE3"
+  },
+  "test_mixed_sload_sstore_ENJ": {
+    "addr": "0xF629cBd94d3791c9250152BD8dfBDF380E2a3B9c"
+  },
+  "test_mixed_sload_sstore_FET": {
+    "addr": "0x1D287CC25dAD7cCaF76a26bc660c5F7C8E2a05BD"
+  },
+  "test_mixed_sload_sstore_eETH": {
+    "addr": "0x6c5024Cd4F8A59110119C56f8933403A539555EB"
+  },
+  "test_mixed_sload_sstore_XMX": {
+    "addr": "0x0F8c45B896784A1E408526B9300519ef8660209c"
+  },
+  "test_mixed_sload_sstore_FTI": {
+    "addr": "0x943ed852Dadb5C3938ECdC6883718df8142de4C8"
+  },
+  "test_mixed_sload_sstore_WBTC": {
+    "addr": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599"
+  },
+  "test_mixed_sload_sstore_LEND": {
+    "addr": "0x80fB784B7eD66730e8b1DBd9820aFD29931aab03"
+  },
+  "test_mixed_sload_sstore_ELEC": {
+    "addr": "0xd49ff13661451313ca1553fd6954bd1d9b6e02b9"
+  },
+  "test_mixed_sload_sstore_SUSHI": {
+    "addr": "0x6B3595068778DD592e39A122f4f5a5CF09C90fE2"
+  },
+  "test_mixed_sload_sstore_HOT": {
+    "addr": "0x6c6EE5e31d828De241282B9606C8e98Ea48526E2"
+  },
+  "test_mixed_sload_sstore_MITx": {
+    "addr": "0x4a527d8fc13c5203ab24ba0944f4cb14658d1db6"
+  },
+  "test_mixed_sload_sstore_1INCH": {
+    "addr": "0x111111111117dC0aa78b770fA6A738034120C302"
+  },
+  "test_mixed_sload_sstore_USDP": {
+    "addr": "0x1456688345527bE1f37E9e627DA0837D6f08C925"
+  },
+  "test_mixed_sload_sstore_ETHFI": {
+    "addr": "0xfe0c30065b384f05761f15d0cc899d4f9f9cc0eb"
+  },
+  "test_mixed_sload_sstore_POLY": {
+    "addr": "0x9992ec3cf6a55b00978cddf2b27bc6882d88d1ec"
+  },
+  "test_mixed_sload_sstore_AOA": {
+    "addr": "0x9ab165d795019b6d8b3e971dda91071421305e5a"
+  },
+  "test_mixed_sload_sstore_STORJ": {
+    "addr": "0xB64ef51C888972c908CFacf59B47C1AfBC0Ab8aC"
+  },
+  "test_mixed_sload_sstore_MKR": {
+    "addr": "0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2"
+  },
+  "test_mixed_sload_sstore_AMP": {
+    "addr": "0xfF20817765cB7F73d4Bde2e66e067e58d11095c2"
+  },
+  "test_mixed_sload_sstore_VRA": {
+    "addr": "0xF411903cbc70a74d22900a5DE66A2dda66507255"
+  },
+  "test_mixed_sload_sstore_GTC": {
+    "addr": "0xde30da39c46104798bb5aa3fe8b9e0e1f348163f"
+  },
+  "test_mixed_sload_sstore_FLOKI": {
+    "addr": "0x43F11c02439E2736800433B4594994Bd43Cd066D"
+  },
+  "test_mixed_sload_sstore_ALT": {
+    "addr": "0x8457CA5040ad67fdebbCC8EdCE889A335Bc0fbFB"
+  },
+  "test_mixed_sload_sstore_IMX": {
+    "addr": "0xf57e7e7c23978c3caec3c3548e3d615c346e79ff"
+  },
+  "test_mixed_sload_sstore_XYO": {
+    "addr": "0x55296f69f40ea6d20e478533c15A6b08B654E758"
+  },
+  "test_mixed_sload_sstore_REV": {
+    "addr": "0x2ef27bf41236bd859a95209e17a43fbd26851f92"
+  },
+  "test_mixed_sload_sstore_FUN": {
+    "addr": "0x419d0d8bdd9af5e606ae2232ed285aff190e711b"
+  },
+  "test_mixed_sload_sstore_CRV": {
+    "addr": "0xD533a949740bb3306d119CC777fa900bA034cd52"
+  },
+  "test_mixed_sload_sstore_CHZ": {
+    "addr": "0x3506424f91fd33084466f402d5d97f05f8e3b4af"
+  },
+  "test_mixed_sload_sstore_SMT": {
+    "addr": "0x78Eb8DC641077F049f910659b6d580E80dC4d237"
+  },
+  "test_mixed_sload_sstore_SNX": {
+    "addr": "0xC011A72400E58ecD99Ee497CF89E3775d4bd732F"
+  },
+  "test_mixed_sload_sstore_DENT": {
+    "addr": "0x3597bfD533a99c9aa083587B074434E61Eb0A258"
+  },
+  "test_mixed_sload_sstore_RNDR": {
+    "addr": "0x6De037ef9aD2725EB40118Bb1702EBb27e4Aeb24"
+  },
+  "test_mixed_sload_sstore_SNT": {
+    "addr": "0x744d70FDBe2Ba4CF95131626614a1763DF805B9E"
+  },
+  "test_mixed_sload_sstore_AXS": {
+    "addr": "0xBB0E17EF65F82Ab018d8EDd776e8DD940327B28b"
+  },
+  "test_mixed_sload_sstore_KNC": {
+    "addr": "0xdd974D5C2e2928deA5F71b9825b8b646686BD200"
+  },
+  "test_mixed_sload_sstore_WEPE": {
+    "addr": "0xccB365D2e11aE4D6d74715c680f56cf58bF4bF10"
+  },
+  "test_mixed_sload_sstore_ZETA": {
+    "addr": "0xf091867ec603a6628ed83d274e835539d82e9cc8"
+  },
+  "test_mixed_sload_sstore_LYM": {
+    "addr": "0xc690f7c7fcffa6a82b79fab7508c466fefdfc8c5"
+  },
+  "test_mixed_sload_sstore_nCASH": {
+    "addr": "0x809826cceAb68c387726af962713b64Cb5Cb3CCA"
+  },
+  "test_mixed_sload_sstore_LOOKS": {
+    "addr": "0xf4d2888d29D722226FafA5d9B24F9164c092421E"
+  },
+  "test_mixed_sload_sstore_Monfter/Monavale": {
+    "addr": "0x275f5ad03be0fa221b4c6649b8aee09a42d9412a"
+  },
+  "test_mixed_sload_sstore_cETH": {
+    "addr": "0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5"
+  },
+  "test_mixed_sload_sstore_SALT": {
+    "addr": "0x4156D3342D5c385a87D264F90653733592000581"
+  },
+  "test_mixed_sload_sstore_HOGE": {
+    "addr": "0xfAd45E47083e4607302aa43c65fB3106F1cd7607"
+  },
+  "test_mixed_sload_sstore_REN": {
+    "addr": "0x408e41876cCCDC0F92210600ef50372656052a38"
+  },
+  "test_mixed_sload_sstore_ENS": {
+    "addr": "0xC56b13EBBCffa67cfB7979b900B736b3fb480D78"
+  },
+  "test_mixed_sload_sstore_NEXO": {
+    "addr": "0xB62132e35a6c13ee1EE0f84dC5d40bad8d815206"
+  },
+  "test_mixed_sload_sstore_RFR": {
+    "addr": "0xD0929d411954c47438Dc1D871dd6081F5C5e149c"
+  },
+  "test_mixed_sload_sstore_COFI": {
+    "addr": "0x3137619705b5fc22a3048989F983905e456B59Ab"
+  },
+  "test_mixed_sload_sstore_SLP": {
+    "addr": "0xcc8fa225d80b9c7d42f96e9570156c65d6cAAa25"
+  },
+  "test_mixed_sload_sstore_FUEL": {
+    "addr": "0xea38eaa3c86c8f9b751533ba2e562deb9acded40"
+  },
+  "test_mixed_sload_sstore_ENA": {
+    "addr": "0x57e114B691Db790C35207b2e685D4A43181e6061"
+  },
+  "test_mixed_sload_sstore_AKITA": {
+    "addr": "0x3301Ee63Fb29F863f2333Bd4466acb46CD8323E6"
+  },
+  "test_mixed_sload_sstore_CVC": {
+    "addr": "0x41e5560054824ea6B0732E656e3Ad64E20e94e45"
+  },
+  "test_mixed_sload_sstore_IHT": {
+    "addr": "0xEda8B016efa8b1161208Cf041cD86972EEE0F31E"
+  },
+  "test_mixed_sload_sstore_ZSC": {
+    "addr": "0x7A41e0517a5ecA4FdbC7FbebA4D4c47B9fF6DC63"
+  },
+  "test_mixed_sload_sstore_cbETH": {
+    "addr": "0xBe9895146f7AF43049ca1c1AE358B0541Ea49704"
+  },
+  "test_mixed_sload_sstore_IMT": {
+    "addr": "0x13119e34e140097a507b07a5564bde1bc375d9e6"
+  }
+}
diff --git a/tests/benchmark/stateful/stubs/stubs_bloatnet.json b/tests/benchmark/stateful/stubs/stubs_bloatnet.json
new file mode 100644
index 00000000000..9aadc6447c9
--- /dev/null
+++ b/tests/benchmark/stateful/stubs/stubs_bloatnet.json
@@ -0,0 +1,128 @@
+{
+  "test_sload_empty_erc20_balanceof_50GB_ERC20": {
+    "addr": "0x398324972FcE0e89E048c2104f1298031d1931fc"
+  },
+  "test_sload_empty_erc20_balanceof_30GB_ERC20": {
+    "addr": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C"
+  },
+  "test_sload_empty_erc20_balanceof_9_39GB_ERC20": {
+    "addr": "0xf7EfF64A1b7f3dB550A05fF2635Bb9744B8E21eb"
+  },
+  "test_sload_empty_erc20_balanceof_1GB_ERC20": {
+    "addr": "0x365cF1A2532919e1adf8650670B9e01e163a441D"
+  },
+  "test_sload_empty_erc20_balanceof_4_23MB_ERC20": {
+    "addr": "0xFdC419f77993E0E2E9Fed06299E367F6aEe909bE"
+  },
+  "test_sload_empty_erc20_balanceof_XEN": {
+    "addr": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8"
+  },
+  "test_sload_empty_erc20_balanceof_USDC": {
+    "addr": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48"
+  },
+  "test_sload_empty_erc20_balanceof_ARB": {
+    "addr": "0xad0c361ef902a7d9851ca7dcc85535da2d3c6fc7"
+  },
+  "test_sload_empty_erc20_balanceof_HST": {
+    "addr": "0x2e2a539285ce690e4c6bddd42deb7e37bdde9500"
+  },
+  "test_sstore_erc20_mint_50GB_ERC20": {
+    "addr": "0x398324972FcE0e89E048c2104f1298031d1931fc"
+  },
+  "test_sstore_erc20_mint_30GB_ERC20": {
+    "addr": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C"
+  },
+  "test_sstore_erc20_mint_9_39GB_ERC20": {
+    "addr": "0xf7EfF64A1b7f3dB550A05fF2635Bb9744B8E21eb"
+  },
+  "test_sstore_erc20_mint_1GB_ERC20": {
+    "addr": "0x365cF1A2532919e1adf8650670B9e01e163a441D"
+  },
+  "test_sstore_erc20_mint_4_23MB_ERC20": {
+    "addr": "0xFdC419f77993E0E2E9Fed06299E367F6aEe909bE"
+  },
+  "test_sstore_erc20_approve_50GB_ERC20": {
+    "addr": "0x398324972FcE0e89E048c2104f1298031d1931fc"
+  },
+  "test_sstore_erc20_approve_30GB_ERC20": {
+    "addr": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C"
+  },
+  "test_sstore_erc20_approve_9_39GB_ERC20": {
+    "addr": "0xf7EfF64A1b7f3dB550A05fF2635Bb9744B8E21eb"
+  },
+  "test_sstore_erc20_approve_1GB_ERC20": {
+    "addr": "0x365cF1A2532919e1adf8650670B9e01e163a441D"
+  },
+  "test_sstore_erc20_approve_4_23MB_ERC20": {
+    "addr": "0xFdC419f77993E0E2E9Fed06299E367F6aEe909bE"
+  },
+  "test_sstore_erc20_approve_XEN": {
+    "addr": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8"
+  },
+  "test_sstore_erc20_approve_USDC": {
+    "addr": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48"
+  },
+  "test_sstore_erc20_approve_ARB": {
+    "addr": "0xad0c361ef902a7d9851ca7dcc85535da2d3c6fc7"
+  },
+  "test_sstore_erc20_approve_HST": {
+    "addr": "0x2e2a539285ce690e4c6bddd42deb7e37bdde9500"
+  },
+  "test_mixed_sload_sstore_50GB_ERC20": {
+    "addr": "0x398324972FcE0e89E048c2104f1298031d1931fc"
+  },
+  "test_mixed_sload_sstore_30GB_ERC20": {
+    "addr": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C"
+  },
+  "test_mixed_sload_sstore_9_39GB_ERC20": {
+    "addr": "0xf7EfF64A1b7f3dB550A05fF2635Bb9744B8E21eb"
+  },
+  "test_mixed_sload_sstore_1GB_ERC20": {
+    "addr": "0x365cF1A2532919e1adf8650670B9e01e163a441D"
+  },
+  "test_mixed_sload_sstore_4_23MB_ERC20": {
+    "addr": "0xFdC419f77993E0E2E9Fed06299E367F6aEe909bE"
+  },
+  "test_mixed_sload_sstore_XEN": {
+    "addr": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8"
+  },
+  "test_mixed_sload_sstore_USDC": {
+    "addr": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48"
+  },
+  "test_mixed_sload_sstore_ARB": {
+    "addr": "0xad0c361ef902a7d9851ca7dcc85535da2d3c6fc7"
+  },
+  "test_mixed_sload_sstore_HST": {
+    "addr": "0x2e2a539285ce690e4c6bddd42deb7e37bdde9500"
+  },
+  "bloatnet_factory_0_5kb": {
+    "addr": "0xDf9da7E8660d38654C8aA267635222c9f5Ac0530"
+  },
+  "bloatnet_factory_1kb": {
+    "addr": "0xA52178573dc859741499946148CA1Fc3822Af600"
+  },
+  "bloatnet_factory_2kb": {
+    "addr": "0x88c159584059308C4B466bafC82c45d52De9951D"
+  },
+  "bloatnet_factory_5kb": {
+    "addr": "0x3f59809dac4b33e251e518acDadf923184151334"
+  },
+  "bloatnet_factory_10kb": {
+    "addr": "0xf90E8a6Ce32A949Ce5F58803BBa07476404cD89F"
+  },
+  "bloatnet_factory_24kb": {
+    "addr": "0x091988Afd81E0a2A3E20530A2510c089fF4bfAef"
+  },
+  "bloated_eoa_1GB": {
+    "addr": "0x3f8074692982594c1936bd27433a8b6e5d77e0f0",
+    "pkey": "0xc618d7bcd54de2f0dcf86e4ced86ccf07926619a74ee10432c3d1c60743e3427"
+  },
+  "bloated_eoa_10GB": {
+    "addr": "0x87a6314da5ac8832f6e7a176c8fb133b19f5be04",
+    "pkey": "0x4da32d29f6dcffa26e09dc4e102033f2d105de1444fb893493ae703289275e0e"
+  },
+  "bloated_eoa_20GB": {
+    "addr": "0x772604ee92ebc9afa5b6ce561f6f6a4c4cdd214a",
+    "pkey": "0xc025d5a1aa0f5eee1f50687901c5dc9a8e97a2be91aa381e4c938dc309105059"
+  }
+}
diff --git a/tests/benchmark/stateful/stubs/stubs_mainnet.json b/tests/benchmark/stateful/stubs/stubs_mainnet.json
new file mode 100644
index 00000000000..583f8263f92
--- /dev/null
+++ b/tests/benchmark/stateful/stubs/stubs_mainnet.json
@@ -0,0 +1,38 @@
+{
+  "test_sload_empty_erc20_balanceof_XEN": {
+    "addr": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8"
+  },
+  "test_sload_empty_erc20_balanceof_USDC": {
+    "addr": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48"
+  },
+  "test_sload_empty_erc20_balanceof_ARB": {
+    "addr": "0xad0c361ef902a7d9851ca7dcc85535da2d3c6fc7"
+  },
+  "test_sstore_erc20_approve_XEN": {
+    "addr": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8"
+  },
+  "test_sstore_erc20_approve_USDC": {
+    "addr": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48"
+  },
+  "test_sstore_erc20_approve_ARB": {
+    "addr": "0xad0c361ef902a7d9851ca7dcc85535da2d3c6fc7"
+  },
+  "test_mixed_sload_sstore_XEN": {
+    "addr": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8"
+  },
+  "test_mixed_sload_sstore_USDC": {
+    "addr": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48"
+  },
+  "test_mixed_sload_sstore_ARB": {
+    "addr": "0xad0c361ef902a7d9851ca7dcc85535da2d3c6fc7"
+  },
+  "test_sload_empty_erc20_balanceof_HST": {
+    "addr": "0x2e2a539285ce690e4c6bddd42deb7e37bdde9500"
+  },
+  "test_sstore_erc20_approve_HST": {
+    "addr": "0x2e2a539285ce690e4c6bddd42deb7e37bdde9500"
+  },
+  "test_mixed_sload_sstore_HST": {
+    "addr": "0x2e2a539285ce690e4c6bddd42deb7e37bdde9500"
+  }
+}
diff --git a/tests/benchmark/stateful/stubs/stubs_repricing.json b/tests/benchmark/stateful/stubs/stubs_repricing.json
new file mode 100644
index 00000000000..628001bece0
--- /dev/null
+++ b/tests/benchmark/stateful/stubs/stubs_repricing.json
@@ -0,0 +1,74 @@
+{
+  "test_sload_empty_erc20_balanceof_50GB_ERC20": {
+    "addr": "0x398324972FcE0e89E048c2104f1298031d1931fc"
+  },
+  "test_sload_empty_erc20_balanceof_30GB_ERC20": {
+    "addr": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C"
+  },
+  "test_sload_empty_erc20_balanceof_9_39GB_ERC20": {
+    "addr": "0xf7EfF64A1b7f3dB550A05fF2635Bb9744B8E21eb"
+  },
+  "test_sload_empty_erc20_balanceof_1GB_ERC20": {
+    "addr": "0x365cF1A2532919e1adf8650670B9e01e163a441D"
+  },
+  "test_sload_empty_erc20_balanceof_4_23MB_ERC20": {
+    "addr": "0xFdC419f77993E0E2E9Fed06299E367F6aEe909bE"
+  },
+  "test_sstore_erc20_mint_50GB_ERC20": {
+    "addr": "0x398324972FcE0e89E048c2104f1298031d1931fc"
+  },
+  "test_sstore_erc20_mint_30GB_ERC20": {
+    "addr": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C"
+  },
+  "test_sstore_erc20_mint_9_39GB_ERC20": {
+    "addr": "0xf7EfF64A1b7f3dB550A05fF2635Bb9744B8E21eb"
+  },
+  "test_sstore_erc20_mint_1GB_ERC20": {
+    "addr": "0x365cF1A2532919e1adf8650670B9e01e163a441D"
+  },
+  "test_sstore_erc20_mint_4_23MB_ERC20": {
+    "addr": "0xFdC419f77993E0E2E9Fed06299E367F6aEe909bE"
+  },
+  "test_sstore_erc20_approve_50GB_ERC20": {
+    "addr": "0x398324972FcE0e89E048c2104f1298031d1931fc"
+  },
+  "test_sstore_erc20_approve_30GB_ERC20": {
+    "addr": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C"
+  },
+  "test_sstore_erc20_approve_9_39GB_ERC20": {
+    "addr": "0xf7EfF64A1b7f3dB550A05fF2635Bb9744B8E21eb"
+  },
+  "test_sstore_erc20_approve_1GB_ERC20": {
+    "addr": "0x365cF1A2532919e1adf8650670B9e01e163a441D"
+  },
+  "test_sstore_erc20_approve_4_23MB_ERC20": {
+    "addr": "0xFdC419f77993E0E2E9Fed06299E367F6aEe909bE"
+  },
+  "test_mixed_sload_sstore_50GB_ERC20": {
+    "addr": "0x398324972FcE0e89E048c2104f1298031d1931fc"
+  },
+  "test_mixed_sload_sstore_30GB_ERC20": {
+    "addr": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C"
+  },
+  "test_mixed_sload_sstore_9_39GB_ERC20": {
+    "addr": "0xf7EfF64A1b7f3dB550A05fF2635Bb9744B8E21eb"
+  },
+  "test_mixed_sload_sstore_1GB_ERC20": {
+    "addr": "0x365cF1A2532919e1adf8650670B9e01e163a441D"
+  },
+  "test_mixed_sload_sstore_4_23MB_ERC20": {
+    "addr": "0xFdC419f77993E0E2E9Fed06299E367F6aEe909bE"
+  },
+  "bloated_eoa_1GB": {
+    "addr": "0x3f8074692982594c1936bd27433a8b6e5d77e0f0",
+    "pkey": "0xc618d7bcd54de2f0dcf86e4ced86ccf07926619a74ee10432c3d1c60743e3427"
+  },
+  "bloated_eoa_10GB": {
+    "addr": "0x87a6314da5ac8832f6e7a176c8fb133b19f5be04",
+    "pkey": "0x4da32d29f6dcffa26e09dc4e102033f2d105de1444fb893493ae703289275e0e"
+  },
+  "bloated_eoa_20GB": {
+    "addr": "0x772604ee92ebc9afa5b6ce561f6f6a4c4cdd214a",
+    "pkey": "0xc025d5a1aa0f5eee1f50687901c5dc9a8e97a2be91aa381e4c938dc309105059"
+  }
+}
diff --git a/tests/berlin/eip2929_gas_cost_increases/test_call.py b/tests/berlin/eip2929_gas_cost_increases/test_call.py
index 66b28b90b12..7322e1b1d2f 100644
--- a/tests/berlin/eip2929_gas_cost_increases/test_call.py
+++ b/tests/berlin/eip2929_gas_cost_increases/test_call.py
@@ -17,7 +17,7 @@
 
 
 @pytest.mark.valid_from("Berlin")
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_call_insufficient_balance(
     state_test: StateTestFiller, pre: Alloc, env: Environment, fork: Fork
 ) -> None:
diff --git a/tests/berlin/eip2929_gas_cost_increases/test_create.py b/tests/berlin/eip2929_gas_cost_increases/test_create.py
index bd05e546601..88d9f0aeb6f 100644
--- a/tests/berlin/eip2929_gas_cost_increases/test_create.py
+++ b/tests/berlin/eip2929_gas_cost_increases/test_create.py
@@ -23,6 +23,11 @@
 from execution_testing import (
     Account,
     Alloc,
+    BalAccountExpectation,
+    BalNonceChange,
+    BalStorageChange,
+    BalStorageSlot,
+    BlockAccessListExpectation,
     CodeGasMeasure,
     Environment,
     Fork,
@@ -100,10 +105,11 @@ def test_create_insufficient_balance(
         + Op.STOP
     )
 
+    sender = pre.fund_eoa()
     tx = Transaction(
         to=entry_address,
         gas_limit=1_000_000,
-        sender=pre.fund_eoa(),
+        sender=sender,
     )
 
     post = {
@@ -111,8 +117,63 @@ def test_create_insufficient_balance(
         creator_address: Account(storage={0: 0}),
         # BALANCE gas cost matches cold access
         checker_address: Account(storage={1: cold_balance.gas_cost(fork)}),
+        # Fail-proofing: confirm CREATE never deposited a contract.
+        contract_address: Account.NONEXISTENT,
     }
-    state_test(env=env, pre=pre, post=post, tx=tx)
+
+    # Under EIP-7928 (BAL): the failed CREATE itself does NOT add the
+    # would-be address to BAL (failure precedes `track_address`). The
+    # subsequent BALANCE call in `checker_address` is what brings it in,
+    # so it appears with empty changes. Creator/checker have real
+    # storage writes; entry is just a passthrough.
+    expected_bal = (
+        BlockAccessListExpectation(
+            account_expectations={
+                sender: BalAccountExpectation(
+                    nonce_changes=[
+                        BalNonceChange(block_access_index=1, post_nonce=1)
+                    ],
+                ),
+                entry_address: BalAccountExpectation.empty(),
+                creator_address: BalAccountExpectation(
+                    storage_changes=[
+                        BalStorageSlot(
+                            slot=0,
+                            slot_changes=[
+                                BalStorageChange(
+                                    block_access_index=1, post_value=0
+                                )
+                            ],
+                        )
+                    ],
+                ),
+                checker_address: BalAccountExpectation(
+                    storage_changes=[
+                        BalStorageSlot(
+                            slot=1,
+                            slot_changes=[
+                                BalStorageChange(
+                                    block_access_index=1,
+                                    post_value=cold_balance.gas_cost(fork),
+                                )
+                            ],
+                        )
+                    ],
+                ),
+                contract_address: BalAccountExpectation.empty(),
+            }
+        )
+        if fork.is_eip_enabled(7928)
+        else None
+    )
+
+    state_test(
+        env=env,
+        pre=pre,
+        post=post,
+        tx=tx,
+        expected_block_access_list=expected_bal,
+    )
 
 
 @pytest.mark.valid_from("Berlin")
diff --git a/tests/berlin/eip2929_gas_cost_increases/test_warm_status_revert.py b/tests/berlin/eip2929_gas_cost_increases/test_warm_status_revert.py
new file mode 100644
index 00000000000..3925cd89958
--- /dev/null
+++ b/tests/berlin/eip2929_gas_cost_increases/test_warm_status_revert.py
@@ -0,0 +1,139 @@
+"""
+Tests that warm/cold access status is reverted when a sub-call reverts.
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    CodeGasMeasure,
+    Conditional,
+    Environment,
+    Fork,
+    Op,
+    StateTestFiller,
+    Transaction,
+)
+
+REFERENCE_SPEC_GIT_PATH = "EIPS/eip-2929.md"
+REFERENCE_SPEC_VERSION = "0e11417265a623adb680c527b15d0cb6701b870b"
+
+
+@pytest.mark.valid_from("Berlin")
+def test_storage_warm_status_reverted_by_subcall(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+) -> None:
+    """
+    Test that storage slot warm status is reverted when a sub-call reverts.
+
+    Inner self-call does SLOAD(0) and SSTORE(0, 2) then REVERTs. After
+    revert, SLOAD(0) must be a cold access and storage[0] must still
+    hold its original value.
+    """
+    env = Environment()
+
+    # Inner behavior (no calldata): warm slot 0 via SLOAD+SSTORE, revert.
+    inner_code = (
+        Op.POP(Op.SLOAD(0)) + Op.SSTORE(0, 2) + Op.REVERT(offset=0, size=0)
+    )
+
+    # Overhead: PUSH instructions for the SLOAD key argument.
+    sload_push_cost = (Op.PUSH1(0) * len(Op.SLOAD.kwargs)).gas_cost(fork)
+    cold_sload_cost = Op.SLOAD(key_warm=False).gas_cost(fork)
+
+    # After revert, measure gas of SLOAD(0) — should be cold.
+    sload_measure = CodeGasMeasure(
+        code=Op.SLOAD(0),
+        overhead_cost=sload_push_cost,
+        extra_stack_items=1,
+        sstore_key=1,
+        stop=False,
+    )
+
+    # Also verify storage[0] value (should still be 1).
+    verify_value = Op.SSTORE(2, Op.SLOAD(0))
+
+    # Outer behavior (has calldata): call self (inner), measure, verify.
+    outer_code = (
+        Op.POP(Op.CALL(gas=100_000, address=Op.ADDRESS))
+        + sload_measure
+        + verify_value
+        + Op.STOP
+    )
+
+    code = Conditional(
+        condition=Op.CALLDATASIZE,
+        if_true=outer_code,
+        if_false=inner_code,
+    )
+
+    contract = pre.deploy_contract(code, storage={0: 1})
+    sender = pre.fund_eoa()
+
+    state_test(
+        env=env,
+        pre=pre,
+        post={
+            contract: Account(
+                storage={0: 1, 1: cold_sload_cost, 2: 1},
+            ),
+        },
+        tx=Transaction(
+            sender=sender,
+            to=contract,
+            gas_limit=1_000_000,
+            data=b"\x01",
+        ),
+    )
+
+
+@pytest.mark.valid_from("Berlin")
+def test_account_warm_status_reverted_by_subcall(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+) -> None:
+    """
+    Test that account warm status is reverted when a sub-call reverts.
+
+    Inner call does BALANCE(target) then REVERTs. After revert,
+    BALANCE(target) in the outer call must be a cold access.
+    """
+    env = Environment()
+
+    target = pre.fund_eoa(amount=1)
+
+    # Inner: BALANCE(target) warms target, then reverts.
+    inner = pre.deploy_contract(
+        Op.POP(Op.BALANCE(target)) + Op.REVERT(offset=0, size=0)
+    )
+
+    # Overhead: PUSH for the BALANCE address argument.
+    balance_push_cost = (Op.PUSH1(0) * len(Op.BALANCE.kwargs)).gas_cost(fork)
+    cold_balance_cost = Op.BALANCE(address_warm=False).gas_cost(fork)
+
+    # Outer: call inner (reverts), then measure BALANCE(target) gas.
+    outer = pre.deploy_contract(
+        Op.POP(Op.CALL(gas=100_000, address=inner))
+        + CodeGasMeasure(
+            code=Op.BALANCE(target),
+            overhead_cost=balance_push_cost,
+            extra_stack_items=1,
+            sstore_key=0,
+        )
+    )
+
+    sender = pre.fund_eoa()
+
+    state_test(
+        env=env,
+        pre=pre,
+        post={outer: Account(storage={0: cold_balance_cost})},
+        tx=Transaction(
+            sender=sender,
+            to=outer,
+            gas_limit=1_000_000,
+        ),
+    )
diff --git a/tests/berlin/eip2930_access_list/test_acl.py b/tests/berlin/eip2930_access_list/test_acl.py
index 80ea90018c8..7f0f3a82498 100644
--- a/tests/berlin/eip2930_access_list/test_acl.py
+++ b/tests/berlin/eip2930_access_list/test_acl.py
@@ -219,7 +219,7 @@ def test_account_storage_warm_cold_state(
         ),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_transaction_intrinsic_gas_cost(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/byzantium/eip196_ec_add_mul/conftest.py b/tests/byzantium/eip196_ec_add_mul/conftest.py
index 6fc5cae214d..42e0d29776f 100644
--- a/tests/byzantium/eip196_ec_add_mul/conftest.py
+++ b/tests/byzantium/eip196_ec_add_mul/conftest.py
@@ -27,9 +27,9 @@ def precompile_gas(precompile_address: Address, fork: Fork) -> int:
     gas_costs = fork.gas_costs()
     match precompile_address:
         case Spec.ECADD:
-            return gas_costs.GAS_PRECOMPILE_ECADD
+            return gas_costs.PRECOMPILE_ECADD
         case Spec.ECMUL:
-            return gas_costs.GAS_PRECOMPILE_ECMUL
+            return gas_costs.PRECOMPILE_ECMUL
         case _:
             raise ValueError(
                 f"Unexpected precompile address: {precompile_address}"
diff --git a/tests/byzantium/eip196_ec_add_mul/test_ecadd.py b/tests/byzantium/eip196_ec_add_mul/test_ecadd.py
index ca8a29c619f..6655695f21f 100644
--- a/tests/byzantium/eip196_ec_add_mul/test_ecadd.py
+++ b/tests/byzantium/eip196_ec_add_mul/test_ecadd.py
@@ -305,7 +305,7 @@ def test_valid(
         "https://github.com/ethereum/execution-specs/pull/2477",
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_invalid(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/byzantium/eip196_ec_add_mul/test_gas.py b/tests/byzantium/eip196_ec_add_mul/test_gas.py
index babaad835d7..bcf5012bc25 100644
--- a/tests/byzantium/eip196_ec_add_mul/test_gas.py
+++ b/tests/byzantium/eip196_ec_add_mul/test_gas.py
@@ -116,10 +116,10 @@ def test_invalid_gas_consumption(
         address_warm=False
     ).gas_cost(fork)
 
-    # Pre-EIP-2929: fixed G_call = 700; Berlin+: warm access cost.
+    # Pre-EIP-2929: fixed call = 700; Berlin+: warm access cost.
     gas_costs = fork.gas_costs()
     if fork >= Berlin:
-        staticcall_base = gas_costs.GAS_WARM_ACCOUNT_ACCESS
+        staticcall_base = gas_costs.WARM_ACCESS
     else:
         staticcall_base = 700
 
diff --git a/tests/byzantium/eip197_ec_pairing/conftest.py b/tests/byzantium/eip197_ec_pairing/conftest.py
index 01bc4552191..8f3164caadf 100644
--- a/tests/byzantium/eip197_ec_pairing/conftest.py
+++ b/tests/byzantium/eip197_ec_pairing/conftest.py
@@ -23,6 +23,6 @@ def precompile_gas(input_data: bytes, fork: Fork) -> int:
     gas_costs = fork.gas_costs()
     k = len(input_data) // 192
     return (
-        gas_costs.GAS_PRECOMPILE_ECPAIRING_BASE
-        + gas_costs.GAS_PRECOMPILE_ECPAIRING_PER_POINT * k
+        gas_costs.PRECOMPILE_ECPAIRING_BASE
+        + gas_costs.PRECOMPILE_ECPAIRING_PER_POINT * k
     )
diff --git a/tests/byzantium/eip197_ec_pairing/test_gas.py b/tests/byzantium/eip197_ec_pairing/test_gas.py
index 0717332c9c2..1a1108c37f0 100644
--- a/tests/byzantium/eip197_ec_pairing/test_gas.py
+++ b/tests/byzantium/eip197_ec_pairing/test_gas.py
@@ -106,10 +106,10 @@ def test_invalid_gas_consumption(
         address_warm=False
     ).gas_cost(fork)
 
-    # Pre-EIP-2929: fixed G_call = 700; Berlin+: warm access cost.
+    # Pre-EIP-2929: fixed call = 700; Berlin+: warm access cost.
     gas_costs = fork.gas_costs()
     if fork >= Berlin:
-        staticcall_base = gas_costs.GAS_WARM_ACCOUNT_ACCESS
+        staticcall_base = gas_costs.WARM_ACCESS
     else:
         staticcall_base = 700
 
diff --git a/tests/byzantium/eip198_modexp_precompile/test_modexp.py b/tests/byzantium/eip198_modexp_precompile/test_modexp.py
index 0344ca1b9d2..8e041d1a0a8 100644
--- a/tests/byzantium/eip198_modexp_precompile/test_modexp.py
+++ b/tests/byzantium/eip198_modexp_precompile/test_modexp.py
@@ -449,11 +449,40 @@
             ),
             id="truncated_input_4",
         ),
+        # 128-byte (1024-bit) operands exercising the multi-word
+        # Montgomery/Barrett reduction carry path. Modulus is
+        # 2**1024 - 0x69, so neither operand hits any 256-bit
+        # specialization. Both cases reduce to 9^exp mod m (base=m+9 in
+        # the first case), and with this exp, 9^exp ≡ 9 mod m.
+        pytest.param(
+            ModExpInput(
+                base="ff" * 127 + "a0",
+                exponent="ff" * 127 + "97",
+                modulus="ff" * 127 + "97",
+            ),
+            ModExpOutput(returned_data="0x" + "00" * 127 + "09"),
+            id="modexp_37120_37111_37111_1000000",
+        ),
+        pytest.param(
+            ModExpInput(
+                base="09",
+                exponent="ff" * 127 + "97",
+                modulus="ff" * 127 + "97",
+            ),
+            ModExpOutput(returned_data="0x" + "00" * 127 + "09"),
+            id="modexp_9_37111_37111_1000000",
+        ),
     ],
     ids=lambda param: param.__repr__(),  # only required to remove parameter
     # names (input/output)
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
+@pytest.mark.ported_from(
+    [
+        "https://github.com/ethereum/legacytests/blob/master/src/LegacyTests/Constantinople/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_1000000Filler.json",
+        "https://github.com/ethereum/legacytests/blob/master/src/LegacyTests/Constantinople/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_1000000Filler.json",
+    ],
+)
 def test_modexp(
     state_test: StateTestFiller,
     mod_exp_input: ModExpInput | Bytes,
@@ -504,7 +533,7 @@ def test_modexp(
         ty=0x0,
         to=account,
         data=mod_exp_input,
-        gas_limit=500_000,
+        gas_limit=2_000_000,
         protected=True,
         sender=sender,
     )
diff --git a/tests/byzantium/eip214_staticcall/test_staticcall.py b/tests/byzantium/eip214_staticcall/test_staticcall.py
index c4ba24ccbe9..5c0999a6fc5 100644
--- a/tests/byzantium/eip214_staticcall/test_staticcall.py
+++ b/tests/byzantium/eip214_staticcall/test_staticcall.py
@@ -105,7 +105,7 @@ def bal_expectation_for_contract_with_markers(
     "stStaticFlagEnabled/StaticcallForPrecompilesIssue683Filler.yml"
 )
 @pytest.mark.valid_from("Byzantium")
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_staticcall_reentrant_call_to_precompile(
     pre: Alloc,
     state_test: StateTestFiller,
@@ -152,7 +152,7 @@ def test_staticcall_reentrant_call_to_precompile(
     )
 
     bal_expectation = None
-    if fork.header_bal_hash_required():
+    if fork.is_eip_enabled(7928):
         # Target contract always receives tx value
         target_balance_changes = [
             BalBalanceChange(
@@ -255,7 +255,7 @@ def test_staticcall_call_to_precompile(
     staticcall_result = 1 if call_value == 0 else 0
 
     bal_expectation = None
-    if fork.header_bal_hash_required():
+    if fork.is_eip_enabled(7928):
         contract_a_balance_changes = [
             BalBalanceChange(
                 block_access_index=1,
@@ -393,7 +393,7 @@ def test_staticcall_nested_call_to_precompile(
     staticcall_result = 1 if call_value == 0 else 0
 
     bal_expectation = None
-    if fork.header_bal_hash_required():
+    if fork.is_eip_enabled(7928):
         # slot 1 read when call_value > 0
         account_expectations: dict[Address, BalAccountExpectation | None] = {
             contract_a: (
@@ -554,7 +554,7 @@ def test_staticcall_call_to_precompile_from_contract_init(
     staticcall_result = 1 if call_value == 0 else 0
 
     bal_expectation = None
-    if fork.header_bal_hash_required():
+    if fork.is_eip_enabled(7928):
         # stores created_contract in slot 1, receives tx value
         account_expectations: dict[Address, BalAccountExpectation | None] = {
             contract_a: BalAccountExpectation(
diff --git a/tests/cancun/create/test_create_oog_from_eoa_refunds.py b/tests/cancun/create/test_create_oog_from_eoa_refunds.py
index 050f54c91e0..179efb0f22d 100644
--- a/tests/cancun/create/test_create_oog_from_eoa_refunds.py
+++ b/tests/cancun/create/test_create_oog_from_eoa_refunds.py
@@ -345,7 +345,7 @@ def test_create_oog_from_eoa_refunds(
             )
 
     bal_expectation = None
-    if fork.header_bal_hash_required():
+    if fork.is_eip_enabled(7928):
         if oog_scenario == OogScenario.NO_OOG:
             # Success: storage write to slot 0 persists
             expected_nonce = (
diff --git a/tests/cancun/eip1153_tstore/test_tstorage_create_contexts.py b/tests/cancun/eip1153_tstore/test_tstorage_create_contexts.py
index ff9764bf706..6ee241be0fc 100644
--- a/tests/cancun/eip1153_tstore/test_tstorage_create_contexts.py
+++ b/tests/cancun/eip1153_tstore/test_tstorage_create_contexts.py
@@ -298,11 +298,13 @@ def test_tstore_rollback_on_failed_create(
     #
     # TLOAD(1)==0:     return_size = 0x600a > max code size -> fail
     # TLOAD(1)==0x6000: return_size = 0x0a <= max code size -> succeed
+    max_code_size = fork.max_code_size()
+
     initcode = (
         Op.TLOAD(1)
-        + Op.PUSH4(fork.max_code_size() + 0x0A)
+        + Op.PUSH4(max_code_size + 0x0A)
         + Op.SUB
-        + Op.TSTORE(1, fork.max_code_size())
+        + Op.TSTORE(1, max_code_size)
         + Op.PUSH1(0)
         + Op.RETURN
     )
diff --git a/tests/cancun/eip1153_tstore/test_tstorage_execution_contexts.py b/tests/cancun/eip1153_tstore/test_tstorage_execution_contexts.py
index b1ef41469d9..25708e81a15 100644
--- a/tests/cancun/eip1153_tstore/test_tstorage_execution_contexts.py
+++ b/tests/cancun/eip1153_tstore/test_tstorage_execution_contexts.py
@@ -368,7 +368,7 @@ def post(  # noqa: D103
 
 
 @CallContextTestCases.parametrize()
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_subcall(
     state_test: StateTestFiller,
     env: Environment,
diff --git a/tests/cancun/eip1153_tstore/test_tstorage_selfdestruct.py b/tests/cancun/eip1153_tstore/test_tstorage_selfdestruct.py
index b4fff4152d8..b1d9cd3d1cf 100644
--- a/tests/cancun/eip1153_tstore/test_tstorage_selfdestruct.py
+++ b/tests/cancun/eip1153_tstore/test_tstorage_selfdestruct.py
@@ -276,9 +276,9 @@ def test_reentrant_selfdestructing_call(
         data=data,
     )
 
-    expected_storage[0] = callee_address
+    post_storage = {**expected_storage, 0: callee_address}
 
-    post: Dict = {caller_address: Account(storage=expected_storage)}
+    post: Dict = {caller_address: Account(storage=post_storage)}
 
     if pre_existing_contract:
         post[callee_address] = Account(code=callee_bytecode)
diff --git a/tests/cancun/eip4788_beacon_root/test_beacon_root_contract.py b/tests/cancun/eip4788_beacon_root/test_beacon_root_contract.py
index 36837855942..ccc61b9a4d5 100644
--- a/tests/cancun/eip4788_beacon_root/test_beacon_root_contract.py
+++ b/tests/cancun/eip4788_beacon_root/test_beacon_root_contract.py
@@ -27,11 +27,11 @@
     Block,
     BlockchainTestFiller,
     Bytecode,
-    Fork,
     Hash,
     Op,
     Storage,
     Transaction,
+    TransitionFork,
     Withdrawal,
 )
 
@@ -546,7 +546,7 @@ def test_beacon_root_transition(
     block_count: int,
     call_gas: int,
     call_value: int,
-    fork: Fork,
+    fork: TransitionFork,
 ) -> None:
     """
     Tests the fork transition to cancun and verifies that blocks with timestamp
@@ -572,9 +572,9 @@ def test_beacon_root_transition(
     ):
         timestamp_index = timestamp % Spec.HISTORY_BUFFER_LENGTH
 
-        transitioned = fork.header_beacon_root_required(
+        transitioned = fork.fork_at(
             block_number=i, timestamp=timestamp
-        )
+        ).header_beacon_root_required()
         if transitioned:
             # We've transitioned, the current timestamp must contain a value in
             # the contract
@@ -678,15 +678,15 @@ def test_no_beacon_root_contract_at_transition(
     tx: Transaction,
     timestamp: int,
     caller_address: Address,
-    fork: Fork,
+    fork: TransitionFork,
 ) -> None:
     """
     Tests the fork transition to cancun in the case where the beacon root
     pre-deploy was not deployed in time for the fork.
     """
-    assert fork.header_beacon_root_required(
+    assert fork.fork_at(
         block_number=1, timestamp=timestamp
-    )
+    ).header_beacon_root_required()
     blocks: List[Block] = [
         Block(
             txs=[tx],
@@ -757,15 +757,15 @@ def test_beacon_root_contract_deploy(
     tx: Transaction,
     timestamp: int,
     post: Dict,
-    fork: Fork,
+    fork: TransitionFork,
 ) -> None:
     """
     Tests the fork transition to cancun deploying the contract during Shanghai
     and verifying the code deployed and its functionality after Cancun.
     """
-    assert fork.header_beacon_root_required(
+    assert fork.fork_at(
         block_number=1, timestamp=timestamp
-    )
+    ).header_beacon_root_required()
     tx_gas_limit = 0x3D090
     tx_gas_price = 0xE8D4A51000
     deployer_required_balance = tx_gas_limit * tx_gas_price
@@ -801,9 +801,9 @@ def test_beacon_root_contract_deploy(
                     txs=[deploy_tx],
                     parent_beacon_block_root=(
                         beacon_root
-                        if fork.header_beacon_root_required(
+                        if fork.fork_at(
                             block_number=1, timestamp=current_timestamp
-                        )
+                        ).header_beacon_root_required()
                         else None
                     ),
                     timestamp=timestamp // 2,
@@ -866,7 +866,7 @@ def test_beacon_root_contract_deploy(
         else:
             raise AssertionError("This test should only have two blocks")
 
-    expected_code = fork.pre_allocation_blockchain()[
+    expected_code = fork.transitions_to().pre_allocation_blockchain()[
         Spec.BEACON_ROOTS_ADDRESS
     ]["code"]
     pre[Spec.BEACON_ROOTS_ADDRESS] = Account(
diff --git a/tests/cancun/eip4844_blobs/common.py b/tests/cancun/eip4844_blobs/common.py
index 7f9787fcffe..a802ac989ef 100644
--- a/tests/cancun/eip4844_blobs/common.py
+++ b/tests/cancun/eip4844_blobs/common.py
@@ -3,6 +3,13 @@
 from typing import Literal
 
 INF_POINT = (0xC0 << 376).to_bytes(48, byteorder="big")
+# BLS12-381 G1 generator in compressed form (48 bytes, big-endian).
+G1_GENERATOR = bytes.fromhex(
+    "97f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac58"
+    "6c55e83ff97a1aeffb3af00adb22c6bb"
+)
+# Negation flips the y-sign bit (0x20) in the leading byte.
+NEG_G1_GENERATOR = bytes([G1_GENERATOR[0] ^ 0x20]) + G1_GENERATOR[1:]
 Z = 0x623CE31CF9759A5C8DAF3A357992F9F3DD7F9339D8998BC8E68373E54F00B75E
 Z_Y_INVALID_ENDIANNESS: Literal["little", "big"] = "little"
 Z_Y_VALID_ENDIANNESS: Literal["little", "big"] = "big"
diff --git a/tests/cancun/eip4844_blobs/conftest.py b/tests/cancun/eip4844_blobs/conftest.py
index 628686f5f7c..1504daa458f 100644
--- a/tests/cancun/eip4844_blobs/conftest.py
+++ b/tests/cancun/eip4844_blobs/conftest.py
@@ -10,6 +10,7 @@
     Fork,
     Hash,
     Transaction,
+    TransitionFork,
     add_kzg_version,
 )
 
@@ -25,25 +26,25 @@ def block_base_fee_per_gas() -> int:
 @pytest.fixture
 def target_blobs_per_block(fork: Fork) -> int:
     """Return default number of blobs to be included in the block."""
-    return fork.target_blobs_per_block()
+    return fork.transitions_to().target_blobs_per_block()
 
 
 @pytest.fixture
 def max_blobs_per_block(fork: Fork) -> int:
     """Return default number of blobs to be included in the block."""
-    return fork.max_blobs_per_block()
+    return fork.transitions_to().max_blobs_per_block()
 
 
 @pytest.fixture
 def max_blobs_per_tx(fork: Fork) -> int:
     """Return max number of blobs per transaction."""
-    return fork.max_blobs_per_tx()
+    return fork.transitions_to().max_blobs_per_tx()
 
 
 @pytest.fixture
 def blob_gas_per_blob(fork: Fork) -> int:
     """Return default blob gas cost per blob."""
-    return fork.blob_gas_per_blob()
+    return fork.transitions_to().blob_gas_per_blob()
 
 
 @pytest.fixture(autouse=True)
@@ -96,7 +97,7 @@ def excess_blob_gas(
     """
     if parent_excess_blobs is None or parent_blobs is None:
         return None
-    return fork.excess_blob_gas_calculator()(
+    return fork.transitions_to().excess_blob_gas_calculator()(
         parent_excess_blobs=parent_excess_blobs,
         parent_blob_count=parent_blobs,
         parent_base_fee_per_gas=block_base_fee_per_gas,
@@ -118,7 +119,7 @@ def correct_excess_blob_gas(
     """
     if parent_excess_blobs is None or parent_blobs is None:
         return 0
-    return fork.excess_blob_gas_calculator()(
+    return fork.transitions_to().excess_blob_gas_calculator()(
         parent_excess_blobs=parent_excess_blobs,
         parent_blob_count=parent_blobs,
         parent_base_fee_per_gas=block_base_fee_per_gas,
@@ -131,7 +132,7 @@ def block_fee_per_blob_gas(
     correct_excess_blob_gas: int,
 ) -> int:
     """Calculate the blob gas price for the current block."""
-    get_blob_gas_price = fork.blob_gas_price_calculator()
+    get_blob_gas_price = fork.transitions_to().blob_gas_price_calculator()
     return get_blob_gas_price(excess_blob_gas=correct_excess_blob_gas)
 
 
@@ -144,7 +145,7 @@ def blob_gas_price(
     if excess_blob_gas is None:
         return None
 
-    get_blob_gas_price = fork.blob_gas_price_calculator()
+    get_blob_gas_price = fork.transitions_to().blob_gas_price_calculator()
     return get_blob_gas_price(
         excess_blob_gas=excess_blob_gas,
     )
@@ -274,7 +275,7 @@ def tx_max_fee_per_blob_gas(  # noqa: D103
 def non_zero_blob_gas_used_genesis_block(
     pre: Alloc,
     parent_blobs: int,
-    fork: Fork,
+    fork: Fork | TransitionFork,
     genesis_excess_blob_gas: int,
     parent_excess_blob_gas: int,
     tx_max_fee_per_gas: int,
@@ -299,10 +300,8 @@ def non_zero_blob_gas_used_genesis_block(
     """
     if parent_blobs == 0:
         return None
-
-    excess_blob_gas_calculator = fork.excess_blob_gas_calculator(
-        block_number=1
-    )
+    block_fork = fork.fork_at(block_number=1)
+    excess_blob_gas_calculator = block_fork.excess_blob_gas_calculator()
     calculated_excess_blob_gas = excess_blob_gas_calculator(
         parent_excess_blob_gas=genesis_excess_blob_gas,
         parent_blob_count=0,
@@ -317,15 +316,15 @@ def non_zero_blob_gas_used_genesis_block(
 
     sender = pre.fund_eoa(10**42)
     empty_account_destination = pre.fund_eoa(0)
-    blob_gas_price_calculator = fork.blob_gas_price_calculator(block_number=1)
+    blob_gas_price_calculator = block_fork.blob_gas_price_calculator()
 
     # Split blobs into chunks when MAX_BLOBS_PER_TX < MAX_BLOBS_PER_BLOCK to
     # respect per-tx limits. Allows us to keep single txs for forks where per-
     # tx and per-block limits are equal, hitting coverage for block level blob
     # gas validation when parent_blobs > MAX_BLOBS_PER_BLOCK.
     max_blobs_per_tx = (
-        fork.max_blobs_per_tx()
-        if fork.max_blobs_per_tx() < fork.max_blobs_per_block()
+        block_fork.max_blobs_per_tx()
+        if block_fork.max_blobs_per_tx() < block_fork.max_blobs_per_block()
         else parent_blobs
     )
     blob_chunks = [
diff --git a/tests/cancun/eip4844_blobs/spec.py b/tests/cancun/eip4844_blobs/spec.py
index 430137bf475..a30a0da24d9 100644
--- a/tests/cancun/eip4844_blobs/spec.py
+++ b/tests/cancun/eip4844_blobs/spec.py
@@ -7,7 +7,36 @@
 from typing import List, Optional, Set, Tuple
 
 import pytest
-from execution_testing import Fork, ParameterSet, Transaction
+from execution_testing import (
+    BytesConcatenation,
+    Fork,
+    ParameterSet,
+    Transaction,
+)
+
+
+@dataclass(frozen=True)
+class PointEvaluationInput(BytesConcatenation):
+    """
+    EIP-4844 KZG point-evaluation precompile input (192 bytes):
+    versioned_hash (32) || z (32) || y (32) || commitment (48) || proof (48).
+    """
+
+    versioned_hash: bytes
+    z: int
+    y: int
+    commitment: bytes
+    proof: bytes
+
+    def __bytes__(self) -> bytes:
+        """Convert input to bytes."""
+        return (
+            self.versioned_hash
+            + self.z.to_bytes(32, byteorder="big")
+            + self.y.to_bytes(32, byteorder="big")
+            + self.commitment
+            + self.proof
+        )
 
 
 @dataclass(frozen=True)
diff --git a/tests/cancun/eip4844_blobs/test_blob_txs.py b/tests/cancun/eip4844_blobs/test_blob_txs.py
index a94d8b157e0..f0ebe359014 100644
--- a/tests/cancun/eip4844_blobs/test_blob_txs.py
+++ b/tests/cancun/eip4844_blobs/test_blob_txs.py
@@ -38,11 +38,14 @@
     Storage,
     Transaction,
     TransactionException,
+    TransitionFork,
     add_kzg_version,
 )
 
 from .spec import Spec, SpecHelpers, ref_spec_4844
 
+pytestmark = pytest.mark.not_valid_for("MONAD_EIGHT", subsequent_forks=True)
+
 REFERENCE_SPEC_GIT_PATH = ref_spec_4844.git_path
 REFERENCE_SPEC_VERSION = ref_spec_4844.version
 
@@ -76,12 +79,14 @@ def destination_account(
 
 @pytest.fixture
 def tx_gas(
-    fork: Fork,
+    fork: Fork | TransitionFork,
     tx_calldata: bytes,
     tx_access_list: List[AccessList],
 ) -> int:
     """Gas allocated to transactions sent during test."""
-    tx_intrinsic_cost_calculator = fork.transaction_intrinsic_cost_calculator()
+    tx_intrinsic_cost_calculator = (
+        fork.transitions_to().transaction_intrinsic_cost_calculator()
+    )
     return tx_intrinsic_cost_calculator(
         calldata=tx_calldata, access_list=tx_access_list
     )
@@ -296,20 +301,20 @@ def block_timestamp() -> int:
 
 @pytest.fixture
 def expected_blob_gas_used(
-    fork: Fork,
+    fork: Fork | TransitionFork,
     txs: List[Transaction],
     block_number: int,
     block_timestamp: int,
 ) -> Optional[int | Removable]:
     """Calculate blob gas used by the test block."""
-    if not fork.header_blob_gas_used_required(
+    if not fork.fork_at(
         block_number=block_number, timestamp=block_timestamp
-    ):
+    ).header_blob_gas_used_required():
         return Header.EMPTY_FIELD
-    blob_gas_per_blob = fork.blob_gas_per_blob(
+    blob_gas_per_blob = fork.fork_at(
         block_number=block_number,
         timestamp=block_timestamp,
-    )
+    ).blob_gas_per_blob()
     return sum(
         [
             Spec.get_total_blob_gas(tx=tx, blob_gas_per_blob=blob_gas_per_blob)
@@ -320,7 +325,7 @@ def expected_blob_gas_used(
 
 @pytest.fixture
 def expected_excess_blob_gas(
-    fork: Fork,
+    fork: Fork | TransitionFork,
     parent_excess_blobs: Optional[int],
     parent_blobs: Optional[int],
     block_number: int,
@@ -328,11 +333,13 @@ def expected_excess_blob_gas(
     block_base_fee_per_gas: int,
 ) -> Optional[int | Removable]:
     """Calculate blob gas used by the test block."""
-    if not fork.header_excess_blob_gas_required(
+    if not fork.fork_at(
         block_number=block_number, timestamp=block_timestamp
-    ):
+    ).header_excess_blob_gas_required():
         return Header.EMPTY_FIELD
-    excess_blob_gas = fork.excess_blob_gas_calculator()
+    excess_blob_gas = fork.fork_at(
+        block_number=block_number, timestamp=block_timestamp
+    ).excess_blob_gas_calculator()
     return excess_blob_gas(
         parent_excess_blobs=parent_excess_blobs if parent_excess_blobs else 0,
         parent_blob_count=parent_blobs if parent_blobs else 0,
@@ -417,9 +424,7 @@ def test_valid_blob_tx_combinations(
     )
 
 
-def generate_invalid_tx_max_fee_per_blob_gas_tests(
-    fork: Fork,
-) -> List:
+def generate_invalid_tx_max_fee_per_blob_gas_tests(fork: Fork) -> List:
     """
     Return a list of tests for invalid blob transactions due to insufficient
     max fee per blob gas parametrized for each different fork.
@@ -498,7 +503,7 @@ def generate_invalid_tx_max_fee_per_blob_gas_tests(
     [1_000_000_000],
 )  # Extra balance to cover block blob gas cost
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_invalid_tx_max_fee_per_blob_gas(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
@@ -564,7 +569,7 @@ def test_invalid_tx_max_fee_per_blob_gas_state(
 )
 @pytest.mark.exception_test
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_invalid_normal_gas(
     state_test: StateTestFiller,
     state_env: Environment,
@@ -605,7 +610,7 @@ def test_invalid_normal_gas(
 )
 @pytest.mark.exception_test
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_invalid_block_blob_count(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
@@ -937,7 +942,7 @@ def generate_invalid_tx_blob_count_tests(
 )
 @pytest.mark.exception_test
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_invalid_tx_blob_count(
     state_test: StateTestFiller,
     state_env: Environment,
@@ -1053,7 +1058,7 @@ def test_invalid_blob_hash_versioning_single_tx(
 )
 @pytest.mark.exception_test
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_invalid_blob_hash_versioning_multiple_txs(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
diff --git a/tests/cancun/eip4844_blobs/test_blob_txs_full.py b/tests/cancun/eip4844_blobs/test_blob_txs_full.py
index 7adc5ac568f..f4653f52f88 100644
--- a/tests/cancun/eip4844_blobs/test_blob_txs_full.py
+++ b/tests/cancun/eip4844_blobs/test_blob_txs_full.py
@@ -21,6 +21,8 @@
 
 from .spec import Spec, ref_spec_4844
 
+pytestmark = pytest.mark.not_valid_for("MONAD_EIGHT", subsequent_forks=True)
+
 REFERENCE_SPEC_GIT_PATH = ref_spec_4844.git_path
 REFERENCE_SPEC_VERSION = ref_spec_4844.version
 
diff --git a/tests/cancun/eip4844_blobs/test_blobhash_opcode.py b/tests/cancun/eip4844_blobs/test_blobhash_opcode.py
index 33a6a8d5183..77f381190ec 100644
--- a/tests/cancun/eip4844_blobs/test_blobhash_opcode.py
+++ b/tests/cancun/eip4844_blobs/test_blobhash_opcode.py
@@ -43,7 +43,10 @@
 REFERENCE_SPEC_GIT_PATH = ref_spec_4844.git_path
 REFERENCE_SPEC_VERSION = ref_spec_4844.version
 
-pytestmark = pytest.mark.valid_from("Cancun")
+pytestmark = [
+    pytest.mark.not_valid_for("MONAD_EIGHT", subsequent_forks=True),
+    pytest.mark.valid_from("Cancun"),
+]
 
 
 # Blobhash index values for test_blobhash_gas_cost
@@ -306,7 +309,7 @@ def test_blobhash_scenarios(
         "invalid_calls",
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_blobhash_invalid_blob_index(
     pre: Alloc,
     fork: Fork,
diff --git a/tests/cancun/eip4844_blobs/test_blobhash_opcode_contexts.py b/tests/cancun/eip4844_blobs/test_blobhash_opcode_contexts.py
index 02235e4edd1..10e19e704c4 100644
--- a/tests/cancun/eip4844_blobs/test_blobhash_opcode_contexts.py
+++ b/tests/cancun/eip4844_blobs/test_blobhash_opcode_contexts.py
@@ -26,7 +26,10 @@
 REFERENCE_SPEC_GIT_PATH = ref_spec_4844.git_path
 REFERENCE_SPEC_VERSION = ref_spec_4844.version
 
-pytestmark = pytest.mark.valid_from("Cancun")
+pytestmark = [
+    pytest.mark.not_valid_for("MONAD_EIGHT", subsequent_forks=True),
+    pytest.mark.valid_from("Cancun"),
+]
 
 
 class BlobhashContext(Enum):
diff --git a/tests/cancun/eip4844_blobs/test_excess_blob_gas.py b/tests/cancun/eip4844_blobs/test_excess_blob_gas.py
index 5d6c14a10e8..b941a82c881 100644
--- a/tests/cancun/eip4844_blobs/test_excess_blob_gas.py
+++ b/tests/cancun/eip4844_blobs/test_excess_blob_gas.py
@@ -53,7 +53,10 @@
 REFERENCE_SPEC_VERSION = ref_spec_4844.version
 
 # All tests run from Cancun fork
-pytestmark = pytest.mark.valid_from("Cancun")
+pytestmark = [
+    pytest.mark.not_valid_for("MONAD_EIGHT", subsequent_forks=True),
+    pytest.mark.valid_from("Cancun"),
+]
 
 
 @pytest.fixture
diff --git a/tests/cancun/eip4844_blobs/test_excess_blob_gas_fork_transition.py b/tests/cancun/eip4844_blobs/test_excess_blob_gas_fork_transition.py
index b36e7e5d84b..20c24e53215 100644
--- a/tests/cancun/eip4844_blobs/test_excess_blob_gas_fork_transition.py
+++ b/tests/cancun/eip4844_blobs/test_excess_blob_gas_fork_transition.py
@@ -17,16 +17,18 @@
     BlockException,
     EngineAPIError,
     Environment,
-    Fork,
     Hash,
     Header,
     Op,
     Transaction,
+    TransitionFork,
     add_kzg_version,
 )
 
 from .spec import Spec, SpecHelpers, ref_spec_4844
 
+pytestmark = pytest.mark.not_valid_for("MONAD_EIGHT", subsequent_forks=True)
+
 REFERENCE_SPEC_GIT_PATH = ref_spec_4844.git_path
 REFERENCE_SPEC_VERSION = ref_spec_4844.version
 
@@ -36,9 +38,9 @@
 
 
 @pytest.fixture
-def block_gas_limit(fork: Fork) -> int:  # noqa: D103
+def block_gas_limit(fork: TransitionFork) -> int:  # noqa: D103
     gas_limit = int(Environment().gas_limit)
-    tx_gas_limit_cap = fork.transaction_gas_limit_cap()
+    tx_gas_limit_cap = fork.transitions_from().transaction_gas_limit_cap()
     if tx_gas_limit_cap is not None:
         # Below transaction gas limit cap to reach gas limit easily
         gas_limit = min(gas_limit, tx_gas_limit_cap * 2)
@@ -63,17 +65,17 @@ def genesis_environment(
 
 
 @pytest.fixture
-def pre_fork_blobs_per_block(fork: Fork) -> int:
+def pre_fork_blobs_per_block(fork: TransitionFork) -> int:
     """Amount of blobs to produce with the pre-fork rules."""
-    if fork.supports_blobs(timestamp=0):
-        return fork.max_blobs_per_block(timestamp=0)
+    if fork.transitions_from().supports_blobs():
+        return fork.transitions_from().max_blobs_per_block()
     return 0
 
 
 @pytest.fixture
-def post_fork_blobs_per_block(fork: Fork) -> int:
+def post_fork_blobs_per_block(fork: TransitionFork) -> int:
     """Amount of blobs to produce with the post-fork rules."""
-    return fork.target_blobs_per_block(timestamp=FORK_TIMESTAMP) + 1
+    return fork.transitions_to().target_blobs_per_block() + 1
 
 
 @pytest.fixture
@@ -82,7 +84,7 @@ def pre_fork_blocks(
     destination_account: Address,
     gas_spender_account: Address,
     sender: EOA,
-    fork: Fork,
+    fork: TransitionFork,
     block_base_fee_per_gas: int,
     block_gas_limit: int,
 ) -> List[Block]:
@@ -113,7 +115,7 @@ def pre_fork_blocks(
         txs = []
         blob_index = 0
         remaining_blobs = pre_fork_blobs_per_block
-        max_blobs_per_tx = fork.max_blobs_per_tx(timestamp=0)
+        max_blobs_per_tx = fork.transitions_from().max_blobs_per_tx()
 
         while remaining_blobs > 0:
             tx_blobs = min(remaining_blobs, max_blobs_per_tx)
@@ -159,7 +161,7 @@ def pre_fork_blocks(
 
 @pytest.fixture
 def pre_fork_excess_blob_gas(
-    fork: Fork,
+    fork: TransitionFork,
     pre_fork_blobs_per_block: int,
     pre_fork_blocks: List[Block],
     block_base_fee_per_gas: int,
@@ -171,10 +173,10 @@ def pre_fork_excess_blob_gas(
     blocks using the fork's calculator, which handles EIP-7918 reserve price
     for >=Osaka.
     """
-    if not fork.supports_blobs(timestamp=0):
+    if not fork.transitions_from().supports_blobs():
         return 0
 
-    calc_excess_blob_gas = fork.excess_blob_gas_calculator(timestamp=0)
+    calc_excess_blob_gas = fork.transitions_from().excess_blob_gas_calculator()
     excess_blob_gas = 0
 
     # Calculate excess accumulation for each pre-fork block
@@ -191,13 +193,13 @@ def pre_fork_excess_blob_gas(
 
 
 @pytest.fixture
-def post_fork_block_count(fork: Fork) -> int:
+def post_fork_block_count(fork: TransitionFork) -> int:
     """Amount of blocks to produce with the post-fork rules."""
     return SpecHelpers.get_min_excess_blobs_for_blob_gas_price(
-        fork=fork, blob_gas_price=2
+        fork=fork.transitions_to(), blob_gas_price=2
     ) // (
-        fork.max_blobs_per_block(timestamp=FORK_TIMESTAMP)
-        - fork.target_blobs_per_block(timestamp=FORK_TIMESTAMP)
+        fork.transitions_to().max_blobs_per_block()
+        - fork.transitions_to().target_blobs_per_block()
     )
 
 
@@ -215,7 +217,7 @@ def gas_spender_account(pre: Alloc) -> Address:  # noqa: D103
 
 @pytest.fixture
 def fork_block_excess_blob_gas(
-    fork: Fork,
+    fork: TransitionFork,
     pre_fork_excess_blob_gas: int,
     pre_fork_blobs_per_block: int,
     block_base_fee_per_gas: int,
@@ -223,8 +225,8 @@ def fork_block_excess_blob_gas(
     """Calculate the expected excess blob gas for the fork block."""
     if pre_fork_blobs_per_block == 0:
         return 0
-    calc_excess_blob_gas_post_fork = fork.excess_blob_gas_calculator(
-        timestamp=FORK_TIMESTAMP
+    calc_excess_blob_gas_post_fork = (
+        fork.transitions_to().excess_blob_gas_calculator()
     )
     return calc_excess_blob_gas_post_fork(
         parent_excess_blob_gas=pre_fork_excess_blob_gas,
@@ -241,7 +243,7 @@ def post_fork_blocks(
     fork_block_excess_blob_gas: int,
     sender: EOA,
     pre_fork_blocks: List[Block],
-    fork: Fork,
+    fork: TransitionFork,
 ) -> list[Block]:
     """Generate blocks after the fork."""
     blocks = []
@@ -265,7 +267,7 @@ def post_fork_blocks(
         txs = []
         blob_index = 0
         remaining_blobs = post_fork_blobs_per_block
-        max_blobs_per_tx = fork.max_blobs_per_tx(timestamp=FORK_TIMESTAMP)
+        max_blobs_per_tx = fork.transitions_to().max_blobs_per_tx()
         while remaining_blobs > 0:
             tx_blobs = min(remaining_blobs, max_blobs_per_tx)
             txs.append(
@@ -309,18 +311,18 @@ def post(  # noqa: D103
     post_fork_block_count: int,
     post_fork_blobs_per_block: int,
     destination_account: Address,
-    fork: Fork,
+    fork: TransitionFork,
 ) -> Mapping[Address, Account]:
     pre_fork_tx_count_per_block = 0
     if pre_fork_blobs_per_block > 0:
-        max_blobs_per_tx_pre = fork.max_blobs_per_tx(timestamp=0)
+        max_blobs_per_tx_pre = fork.transitions_from().max_blobs_per_tx()
         pre_fork_tx_count_per_block = (
             pre_fork_blobs_per_block + max_blobs_per_tx_pre - 1
         ) // max_blobs_per_tx_pre
 
     post_fork_tx_count_per_block = 0
     if post_fork_blobs_per_block > 0:
-        max_blobs_per_tx_post = fork.max_blobs_per_tx(timestamp=FORK_TIMESTAMP)
+        max_blobs_per_tx_post = fork.transitions_to().max_blobs_per_tx()
         post_fork_tx_count_per_block = (
             post_fork_blobs_per_block + max_blobs_per_tx_post - 1
         ) // max_blobs_per_tx_post
@@ -435,25 +437,25 @@ def test_invalid_post_fork_block_without_blob_fields(
     lambda fork: [
         pytest.param(
             SpecHelpers.get_min_excess_blobs_for_blob_gas_price(
-                fork=fork, blob_gas_price=2
+                fork=fork.transitions_to(), blob_gas_price=2
             )
             // (
-                fork.max_blobs_per_block(timestamp=FORK_TIMESTAMP)
-                - fork.target_blobs_per_block(timestamp=FORK_TIMESTAMP)
+                fork.transitions_to().max_blobs_per_block()
+                - fork.transitions_to().target_blobs_per_block()
             )
             + 2,
-            fork.max_blobs_per_block(timestamp=FORK_TIMESTAMP),
+            fork.transitions_to().max_blobs_per_block(),
             id="max_blobs",
         ),
         pytest.param(10, 0, id="no_blobs"),
         pytest.param(
             10,
-            fork.target_blobs_per_block(timestamp=FORK_TIMESTAMP),
+            fork.transitions_to().target_blobs_per_block(),
             id="target_blobs",
         ),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_fork_transition_excess_blob_gas_at_blob_genesis(
     blockchain_test: BlockchainTestFiller,
     genesis_environment: Environment,
@@ -483,44 +485,44 @@ def test_fork_transition_excess_blob_gas_at_blob_genesis(
     lambda fork: [
         pytest.param(
             SpecHelpers.get_min_excess_blobs_for_blob_gas_price(
-                fork=fork, blob_gas_price=2
+                fork=fork.transitions_from(), blob_gas_price=2
             )
             // (
-                fork.max_blobs_per_block(timestamp=FORK_TIMESTAMP)
-                - fork.target_blobs_per_block(timestamp=FORK_TIMESTAMP)
+                fork.transitions_to().max_blobs_per_block()
+                - fork.transitions_to().target_blobs_per_block()
             )
             + 2,
-            fork.max_blobs_per_block(timestamp=0),
-            fork.max_blobs_per_block(timestamp=FORK_TIMESTAMP),
+            fork.transitions_from().max_blobs_per_block(),
+            fork.transitions_to().max_blobs_per_block(),
             id="max_blobs_before_and_after",
         ),
         pytest.param(
             10,
             0,
-            fork.max_blobs_per_block(timestamp=FORK_TIMESTAMP),
+            fork.transitions_to().max_blobs_per_block(),
             id="no_blobs_before_and_max_blobs_after",
         ),
         pytest.param(
             10,
-            fork.max_blobs_per_block(timestamp=0),
+            fork.transitions_from().max_blobs_per_block(),
             0,
             id="max_blobs_before_and_no_blobs_after",
         ),
         pytest.param(
             10,
-            fork.target_blobs_per_block(timestamp=0),
-            fork.target_blobs_per_block(timestamp=FORK_TIMESTAMP),
+            fork.transitions_from().target_blobs_per_block(),
+            fork.transitions_to().target_blobs_per_block(),
             id="target_blobs_before_and_after",
         ),
         pytest.param(
             10,
             1,
-            fork.max_blobs_per_block(timestamp=FORK_TIMESTAMP),
+            fork.transitions_to().max_blobs_per_block(),
             id="single_blob_before_and_max_blobs_after",
         ),
         pytest.param(
             10,
-            fork.max_blobs_per_block(timestamp=0),
+            fork.transitions_from().max_blobs_per_block(),
             1,
             id="max_blobs_before_and_single_blob_after",
         ),
diff --git a/tests/cancun/eip4844_blobs/test_point_evaluation_precompile.py b/tests/cancun/eip4844_blobs/test_point_evaluation_precompile.py
index 64a2aebdf08..68ef58f37e3 100644
--- a/tests/cancun/eip4844_blobs/test_point_evaluation_precompile.py
+++ b/tests/cancun/eip4844_blobs/test_point_evaluation_precompile.py
@@ -51,12 +51,21 @@
     Storage,
     Transaction,
     TransactionReceipt,
+    TransitionFork,
     call_return_code,
 )
 
-from .common import INF_POINT, Z_Y_VALID_ENDIANNESS, Z
+from .common import (
+    G1_GENERATOR,
+    INF_POINT,
+    NEG_G1_GENERATOR,
+    Z_Y_VALID_ENDIANNESS,
+    Z,
+)
 from .spec import Spec, ref_spec_4844
 
+pytestmark = pytest.mark.not_valid_for("MONAD_EIGHT", subsequent_forks=True)
+
 REFERENCE_SPEC_GIT_PATH = ref_spec_4844.git_path
 REFERENCE_SPEC_VERSION = ref_spec_4844.version
 
@@ -112,7 +121,7 @@ def call_gas(fork: Fork) -> int:
     Defaults to the point evaluation precompile gas cost, but can be
     parametrized to test different amounts.
     """
-    return fork.gas_costs().GAS_PRECOMPILE_POINT_EVALUATION
+    return fork.gas_costs().PRECOMPILE_POINT_EVALUATION
 
 
 precompile_caller_storage_keys = count()
@@ -194,14 +203,15 @@ def tx(
     precompile_caller_address: Address,
     precompile_input: bytes,
     sender: EOA,
-    fork: Fork,
+    fork: Fork | TransitionFork,
 ) -> Transaction:
     """Prepare transaction used to call the precompile caller account."""
     return Transaction(
         sender=sender,
         data=precompile_input,
         to=precompile_caller_address,
-        gas_limit=fork.gas_costs().GAS_PRECOMPILE_POINT_EVALUATION * 100,
+        gas_limit=fork.transitions_to().gas_costs().PRECOMPILE_POINT_EVALUATION
+        * 100,
     )
 
 
@@ -259,6 +269,8 @@ def post(
 @pytest.mark.parametrize(
     "z,y,kzg_commitment,kzg_proof,versioned_hash",
     [
+        # Commitment and proof at infinity represent the polynomial p == 0,
+        # so p(z) == 0 for any z and the call succeeds with y == 0.
         pytest.param(
             Spec.BLS_MODULUS - 1,
             0,
@@ -267,9 +279,9 @@ def post(
             None,
             id="in_bounds_z",
         ),
+        # Example valid input from a Mainnet transaction:
+        # https://etherscan.io/tx/0xcb3dc8f3b14f1cda0c16a619a112102a8ec70dce1b3f1b28272227cf8d5fbb0e
         pytest.param(
-            # Example valid input from a Mainnet transaction
-            # https://etherscan.io/tx/0xcb3dc8f3b14f1cda0c16a619a112102a8ec70dce1b3f1b28272227cf8d5fbb0e
             0x019123BCB9D06356701F7BE08B4494625B87A7B02EDC566126FB81F6306E915F,
             0x6C2EB1E94C2532935B8465351BA1BD88EABE2B3FA1AADFF7D1CD816E8315BD38,
             0xA9546D41993E10DF2A7429B8490394EA9EE62807BAE6F326D1044A51581306F58D4B9DFD5931E044688855280FF3799E,
@@ -287,13 +299,7 @@ def test_valid_inputs(
     tx: Transaction,
     post: Dict,
 ) -> None:
-    """
-    Test valid sanity precompile calls that are expected to succeed.
-
-    - `kzg_commitment` and `kzg_proof` are set to values such that `p(z)==0`
-        for all values of `z`, hence `y` is tested to be zero, and call to be
-        successful.
-    """
+    """Test valid sanity precompile calls that are expected to succeed."""
     state_test(
         env=Environment(),
         pre=pre,
@@ -305,71 +311,140 @@ def test_valid_inputs(
 @pytest.mark.parametrize(
     "z,y,kzg_commitment,kzg_proof,versioned_hash",
     [
-        (Spec.BLS_MODULUS, 0, INF_POINT, INF_POINT, None),
-        (0, Spec.BLS_MODULUS, INF_POINT, INF_POINT, None),
-        (Z, 0, INF_POINT, INF_POINT[:-1], None),
-        (Z, 0, INF_POINT, INF_POINT[0:1], None),
-        (Z, 0, INF_POINT, INF_POINT + bytes([0]), None),
-        (Z, 0, INF_POINT, INF_POINT + bytes([0] * 1023), None),
-        (bytes(), bytes(), bytes(), bytes(), bytes()),
-        (0, 0, 0, 0, 0),
-        (0, 0, 0, 0, None),
-        (
+        # Out of bounds z and y.
+        pytest.param(
+            Spec.BLS_MODULUS,
+            0,
+            INF_POINT,
+            INF_POINT,
+            None,
+            id="out_of_bounds_z",
+        ),
+        pytest.param(
+            0,
+            Spec.BLS_MODULUS,
+            INF_POINT,
+            INF_POINT,
+            None,
+            id="out_of_bounds_y",
+        ),
+        # Correct proof and commitment but incorrect input lengths.
+        pytest.param(
+            Z,
+            0,
+            INF_POINT,
+            INF_POINT[:-1],
+            None,
+            id="correct_proof_1_input_too_short",
+        ),
+        pytest.param(
+            Z,
+            0,
+            INF_POINT,
+            INF_POINT[0:1],
+            None,
+            id="correct_proof_1_input_too_short_2",
+        ),
+        pytest.param(
+            Z,
+            0,
+            INF_POINT,
+            INF_POINT + b"\x00",
+            None,
+            id="correct_proof_1_input_too_long",
+        ),
+        pytest.param(
+            Z,
+            0,
+            INF_POINT,
+            INF_POINT + b"\x00" * 1023,
+            None,
+            id="correct_proof_1_input_extra_long",
+        ),
+        # Empty calldata.
+        pytest.param(
+            b"",
+            b"",
+            b"",
+            b"",
+            b"",
+            id="null_inputs",
+        ),
+        # Zero commitment is not a valid compressed BLS12-381 point;
+        # the two cases differ only in whether the versioned hash matches
+        # the one derived from the zero commitment.
+        pytest.param(
+            0,
+            0,
+            0,
+            0,
+            0,
+            id="zeros_inputs",
+        ),
+        pytest.param(
+            0,
+            0,
+            0,
+            0,
+            None,
+            id="zeros_inputs_correct_versioned_hash",
+        ),
+        # Correct proof and commitment but incorrect versioned-hash version.
+        pytest.param(
             Z,
             0,
             INF_POINT,
             INF_POINT,
-            Spec.kzg_to_versioned_hash(0xC0 << 376, 0x00),
+            Spec.kzg_to_versioned_hash(INF_POINT, 0x00),
+            id="correct_proof_1_incorrect_versioned_hash_version_0x00",
         ),
-        (
+        pytest.param(
             Z,
             0,
             INF_POINT,
             INF_POINT,
-            Spec.kzg_to_versioned_hash(0xC0 << 376, 0x02),
+            Spec.kzg_to_versioned_hash(INF_POINT, 0x02),
+            id="correct_proof_1_incorrect_versioned_hash_version_0x02",
         ),
-        (
+        pytest.param(
             Z,
             0,
             INF_POINT,
             INF_POINT,
-            Spec.kzg_to_versioned_hash(0xC0 << 376, 0xFF),
+            Spec.kzg_to_versioned_hash(INF_POINT, 0xFF),
+            id="correct_proof_1_incorrect_versioned_hash_version_0xff",
+        ),
+        # Proof is the negation of G1_generator.
+        pytest.param(
+            0,
+            0,
+            G1_GENERATOR,
+            NEG_G1_GENERATOR,
+            None,
+            id="proof_neg_g1_generator",
+        ),
+        # P+P doubling in the final G1 add: verifier computes
+        # `C - [y]_1 = [-1]_1 + [-1]_1`, forcing the doubling path.
+        pytest.param(
+            0,
+            1,
+            NEG_G1_GENERATOR,
+            INF_POINT,
+            None,
+            id="g1_doubling_in_final_add",
         ),
-    ],
-    ids=[
-        "out_of_bounds_z",
-        "out_of_bounds_y",
-        "correct_proof_1_input_too_short",
-        "correct_proof_1_input_too_short_2",
-        "correct_proof_1_input_too_long",
-        "correct_proof_1_input_extra_long",
-        "null_inputs",
-        "zeros_inputs",
-        "zeros_inputs_correct_versioned_hash",
-        "correct_proof_1_incorrect_versioned_hash_version_0x00",
-        "correct_proof_1_incorrect_versioned_hash_version_0x02",
-        "correct_proof_1_incorrect_versioned_hash_version_0xff",
     ],
 )
 @pytest.mark.parametrize("result", [Result.FAILURE])
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_invalid_inputs(
     state_test: StateTestFiller,
     pre: Alloc,
     tx: Transaction,
     post: Dict,
 ) -> None:
-    """
-    Test invalid precompile calls.
-
-    - Out of bounds inputs `z` and `y`
-    - Correct proof, commitment, z and y, but incorrect lengths
-    - Null inputs
-    - Zero inputs
-    - Correct proof, commitment, z and y, but incorrect version versioned
-       hash
-    """
+    """Test invalid precompile calls; verification expected to fail."""
     state_test(
         env=Environment(),
         pre=pre,
@@ -585,7 +660,7 @@ def test_tx_entry_point(
     # Consumed gas will only be the precompile gas if the proof is correct and
     # the call gas is sufficient.
     # Otherwise, the call gas will be consumed in full.
-    precompile_gas = fork.gas_costs().GAS_PRECOMPILE_POINT_EVALUATION
+    precompile_gas = fork.gas_costs().PRECOMPILE_POINT_EVALUATION
     consumed_gas = (
         precompile_gas
         if call_gas >= precompile_gas and proof_correct
@@ -704,12 +779,14 @@ def test_precompile_during_fork(
     precompile_caller_address: Address,
     precompile_input: bytes,
     sender: EOA,
-    fork: Fork,
+    fork: TransitionFork,
 ) -> None:
     """
     Test calling the Point Evaluation Precompile during the appropriate fork.
     """
-    precompile_gas = fork.gas_costs().GAS_PRECOMPILE_POINT_EVALUATION
+    precompile_gas = (
+        fork.transitions_to().gas_costs().PRECOMPILE_POINT_EVALUATION
+    )
     # Blocks before fork
     blocks = [
         Block(
diff --git a/tests/cancun/eip4844_blobs/test_point_evaluation_precompile_gas.py b/tests/cancun/eip4844_blobs/test_point_evaluation_precompile_gas.py
index 832f20f4365..90798101947 100644
--- a/tests/cancun/eip4844_blobs/test_point_evaluation_precompile_gas.py
+++ b/tests/cancun/eip4844_blobs/test_point_evaluation_precompile_gas.py
@@ -25,6 +25,8 @@
 from .common import INF_POINT, Z
 from .spec import Spec, ref_spec_4844
 
+pytestmark = pytest.mark.not_valid_for("MONAD_EIGHT", subsequent_forks=True)
+
 REFERENCE_SPEC_GIT_PATH = ref_spec_4844.git_path
 REFERENCE_SPEC_VERSION = ref_spec_4844.version
 
@@ -66,7 +68,7 @@ def call_gas(fork: Fork) -> int:
     Defaults to the point evaluation precompile gas cost, but can be
     parametrized to test different amounts.
     """
-    return fork.gas_costs().GAS_PRECOMPILE_POINT_EVALUATION
+    return fork.gas_costs().PRECOMPILE_POINT_EVALUATION
 
 
 def copy_opcode_cost(fork: Fork, length: int) -> int:
@@ -157,7 +159,7 @@ def tx(
         data=precompile_input,
         to=precompile_caller_address,
         value=0,
-        gas_limit=fork.gas_costs().GAS_PRECOMPILE_POINT_EVALUATION * 20,
+        gas_limit=fork.gas_costs().PRECOMPILE_POINT_EVALUATION * 20,
     )
 
 
@@ -172,7 +174,7 @@ def post(
     Prepare expected post for each test, depending on the success or failure of
     the precompile call and the gas usage.
     """
-    precompile_gas = fork.gas_costs().GAS_PRECOMPILE_POINT_EVALUATION
+    precompile_gas = fork.gas_costs().PRECOMPILE_POINT_EVALUATION
     if proof == "correct":
         expected_gas_usage = (
             call_gas if call_gas < precompile_gas else precompile_gas
@@ -203,7 +205,7 @@ def post(
 )
 @pytest.mark.parametrize("proof", ["correct", "incorrect"])
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_point_evaluation_precompile_gas_usage(
     state_test: StateTestFiller,
     pre: Dict,
diff --git a/tests/cancun/eip5656_mcopy/test_mcopy.py b/tests/cancun/eip5656_mcopy/test_mcopy.py
index fd8606d1700..99f3b7a3294 100644
--- a/tests/cancun/eip5656_mcopy/test_mcopy.py
+++ b/tests/cancun/eip5656_mcopy/test_mcopy.py
@@ -130,7 +130,7 @@ def tx(  # noqa: D103
     sstore_gas = (
         max(len(initial_memory), len(final_memory))
         // 0x20
-        * (gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD)
+        * (gas_costs.STORAGE_SET + gas_costs.COLD_STORAGE_ACCESS)
     )
     data = Hash(dest) + Hash(src) + Hash(length)
     intrinsic_gas = fork.transaction_intrinsic_cost_calculator()(calldata=data)
diff --git a/tests/cancun/eip5656_mcopy/test_mcopy_contexts.py b/tests/cancun/eip5656_mcopy/test_mcopy_contexts.py
index 7a26919ada8..857643dd256 100644
--- a/tests/cancun/eip5656_mcopy/test_mcopy_contexts.py
+++ b/tests/cancun/eip5656_mcopy/test_mcopy_contexts.py
@@ -147,7 +147,7 @@ def tx(  # noqa: D103
     sstore_gas = (
         len(initial_memory)
         // 0x20
-        * (gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD)
+        * (gas_costs.STORAGE_SET + gas_costs.COLD_STORAGE_ACCESS)
     )
     return Transaction(
         sender=pre.fund_eoa(),
diff --git a/tests/cancun/eip6780_selfdestruct/conftest.py b/tests/cancun/eip6780_selfdestruct/conftest.py
index 2e978c03d9c..ba4b597f972 100644
--- a/tests/cancun/eip6780_selfdestruct/conftest.py
+++ b/tests/cancun/eip6780_selfdestruct/conftest.py
@@ -25,6 +25,6 @@ def fork_extra_gas(fork: Fork) -> int:
     amount of gas required is a very rough estimate.
     """
     gas_costs = fork.gas_costs()
-    sstore_cost = 5 * (gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD)
-    cold_access_cost = 5 * gas_costs.GAS_COLD_ACCOUNT_ACCESS
+    sstore_cost = 5 * (gas_costs.STORAGE_SET + gas_costs.COLD_STORAGE_ACCESS)
+    cold_access_cost = 5 * gas_costs.COLD_ACCOUNT_ACCESS
     return sstore_cost + cold_access_cost
diff --git a/tests/cancun/eip6780_selfdestruct/test_journal_revert.py b/tests/cancun/eip6780_selfdestruct/test_journal_revert.py
new file mode 100644
index 00000000000..6dfe7fa5d57
--- /dev/null
+++ b/tests/cancun/eip6780_selfdestruct/test_journal_revert.py
@@ -0,0 +1,111 @@
+"""
+Tests for SELFDESTRUCT balance transfer revert behavior (EIP-6780).
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    BalAccountExpectation,
+    BlockAccessListExpectation,
+    Environment,
+    Fork,
+    Op,
+    StateTestFiller,
+    Storage,
+    Transaction,
+    TransactionReceipt,
+)
+
+REFERENCE_SPEC_GIT_PATH = "EIPS/eip-6780.md"
+REFERENCE_SPEC_VERSION = "1b6a0e94cc47e859b9866e570391cf37dc55059a"
+
+
+@pytest.mark.valid_from("Cancun")
+def test_selfdestruct_balance_transfer_reverted(
+    state_test: StateTestFiller,
+    env: Environment,
+    pre: Alloc,
+    fork: Fork,
+) -> None:
+    """
+    Test that SELFDESTRUCT balance transfer is reverted on sub-call revert.
+
+    Post-Cancun, SELFDESTRUCT does not destroy the contract but still
+    transfers balance. When the sub-call containing SELFDESTRUCT reverts,
+    the balance transfer must also be reverted.
+    """
+    storage = Storage()
+
+    victim_balance = 1
+
+    beneficiary_balance = 1
+    beneficiary = pre.fund_eoa(amount=beneficiary_balance)
+
+    victim = pre.deploy_contract(
+        code=Op.SELFDESTRUCT(beneficiary),
+        balance=victim_balance,
+    )
+
+    # Controller calls victim (triggers SELFDESTRUCT) then reverts.
+    controller = pre.deploy_contract(
+        Op.POP(Op.CALL(gas=100_000, address=victim))
+        + Op.REVERT(offset=0, size=0)
+    )
+
+    # Outer calls controller, then checks beneficiary balance.
+    outer = pre.deploy_contract(
+        Op.POP(Op.CALL(gas=200_000, address=controller))
+        + Op.SSTORE(
+            storage.store_next(beneficiary_balance, "beneficiary_balance"),
+            Op.BALANCE(beneficiary),
+        )
+        + Op.SSTORE(
+            storage.store_next(victim_balance, "victim_balance"),
+            Op.BALANCE(victim),
+        )
+        + Op.STOP
+    )
+
+    sender = pre.fund_eoa()
+
+    # Under EIP-7708 the SELFDESTRUCT-triggered Transfer log is emitted inside
+    # the reverted sub-call, so it must be discarded together with the rest of
+    # the reverted state.
+    expected_receipt = (
+        TransactionReceipt(logs=[]) if fork.is_eip_enabled(7708) else None
+    )
+
+    # Under EIP-7928 (BAL): victim and beneficiary are touched in the
+    # reverted sub-call's SELFDESTRUCT and again by outer's BALANCE reads.
+    # The balance transfer is undone, so they appear with empty changes
+    # (accessed but no net state change).
+    expected_bal = (
+        BlockAccessListExpectation(
+            account_expectations={
+                victim: BalAccountExpectation.empty(),
+                beneficiary: BalAccountExpectation.empty(),
+            }
+        )
+        if fork.is_eip_enabled(7928)
+        else None
+    )
+
+    state_test(
+        env=env,
+        pre=pre,
+        post={
+            outer: Account(storage=storage),
+            # Beneficiary keeps only its initial balance (transfer reverted).
+            beneficiary: Account(balance=beneficiary_balance),
+            # Victim still has its balance.
+            victim: Account(balance=victim_balance),
+        },
+        tx=Transaction(
+            sender=sender,
+            to=outer,
+            gas_limit=1_000_000,
+            expected_receipt=expected_receipt,
+        ),
+        expected_block_access_list=expected_bal,
+    )
diff --git a/tests/cancun/eip6780_selfdestruct/test_reentrancy_selfdestruct_revert.py b/tests/cancun/eip6780_selfdestruct/test_reentrancy_selfdestruct_revert.py
index b7e29f966db..713b42afdf7 100644
--- a/tests/cancun/eip6780_selfdestruct/test_reentrancy_selfdestruct_revert.py
+++ b/tests/cancun/eip6780_selfdestruct/test_reentrancy_selfdestruct_revert.py
@@ -1,4 +1,7 @@
-"""Suicide scenario requested test https://github.com/ethereum/tests/issues/1325."""
+"""
+Self-destruct scenario requested test
+https://github.com/ethereum/tests/issues/1325.
+"""
 
 from typing import SupportsBytes
 
@@ -14,9 +17,12 @@
     Op,
     StateTestFiller,
     Transaction,
+    TransactionReceipt,
 )
 from execution_testing.forks import Cancun
 
+from tests.amsterdam.eip7708_eth_transfer_logs.spec import transfer_log
+
 REFERENCE_SPEC_GIT_PATH = "EIPS/eip-6780.md"
 REFERENCE_SPEC_VERSION = "1b6a0e94cc47e859b9866e570391cf37dc55059a"
 
@@ -49,7 +55,7 @@ def selfdestruct_contract_address(
 
 @pytest.fixture
 def executor_contract_bytecode(
-    first_suicide: Op,
+    first_selfdestruct: Op,
     revert_contract_address: Address,
     selfdestruct_contract_address: Address,
 ) -> Bytecode:
@@ -58,9 +64,11 @@ def executor_contract_bytecode(
         Op.SSTORE(
             1,
             (
-                first_suicide(address=selfdestruct_contract_address, value=0)
-                if first_suicide in [Op.CALL, Op.CALLCODE]
-                else first_suicide(address=selfdestruct_contract_address)
+                first_selfdestruct(
+                    address=selfdestruct_contract_address, value=0
+                )
+                if first_selfdestruct in [Op.CALL, Op.CALLCODE]
+                else first_selfdestruct(address=selfdestruct_contract_address)
             ),
         )
         + Op.SSTORE(2, Op.CALL(address=revert_contract_address))
@@ -100,14 +108,14 @@ def executor_contract_address(
 
 @pytest.fixture
 def revert_contract_bytecode(
-    second_suicide: Op,
+    second_selfdestruct: Op,
     selfdestruct_contract_address: Address,
 ) -> Bytecode:
     """Contract code that performs a call and then reverts."""
     call_op = (
-        second_suicide(address=selfdestruct_contract_address, value=100)
-        if second_suicide in [Op.CALL, Op.CALLCODE]
-        else second_suicide(address=selfdestruct_contract_address)
+        second_selfdestruct(address=selfdestruct_contract_address, value=100)
+        if second_selfdestruct in [Op.CALL, Op.CALLCODE]
+        else second_selfdestruct(address=selfdestruct_contract_address)
     )
     return Op.MSTORE(0, Op.ADD(15, call_op)) + Op.REVERT(0, 32)
 
@@ -131,18 +139,18 @@ def revert_contract_address(
 
 @pytest.mark.valid_from("Paris")
 @pytest.mark.parametrize(
-    "first_suicide", [Op.CALL, Op.CALLCODE, Op.DELEGATECALL]
+    "first_selfdestruct", [Op.CALL, Op.CALLCODE, Op.DELEGATECALL]
 )
 @pytest.mark.parametrize(
-    "second_suicide", [Op.CALL, Op.CALLCODE, Op.DELEGATECALL]
+    "second_selfdestruct", [Op.CALL, Op.CALLCODE, Op.DELEGATECALL]
 )
 def test_reentrancy_selfdestruct_revert(
     pre: Alloc,
     env: Environment,
     sender: EOA,
     fork: Fork,
-    first_suicide: Op,
-    second_suicide: Op,
+    first_selfdestruct: Op,
+    second_selfdestruct: Op,
     state_test: StateTestFiller,
     selfdestruct_contract_bytecode: Bytecode,
     selfdestruct_contract_address: Address,
@@ -172,23 +180,24 @@ def test_reentrancy_selfdestruct_revert(
         ),
     }
 
-    if first_suicide in [Op.CALLCODE, Op.DELEGATECALL]:
+    if first_selfdestruct in [Op.CALLCODE, Op.DELEGATECALL]:
         if fork >= Cancun:
             # On Cancun even callcode/delegatecall does not remove the account,
             # so the value remain
             post[executor_contract_address] = Account(
                 storage={
-                    0x01: 0x01,  # First call to contract S->suicide success
-                    0x02: 0x00,  # Second call to contract S->suicide reverted
+                    0x01: 0x01,  # 1st call to contract S->selfdestruct success
+                    0x02: 0x00,  # 2nd call to contract S->selfdestruct revert
                     0x03: 16,  # Reverted value to check that revert really
                     # worked
                 },
             )
         else:
-            # Callcode executed first suicide from sender. sender is deleted
+            # Callcode executed first selfdestruct from sender.
+            # Sender is deleted.
             post[executor_contract_address] = Account.NONEXISTENT  # type: ignore
 
-        # Original suicide account remains in state
+        # Original selfdestruct account remains in state
         post[selfdestruct_contract_address] = Account(
             balance=selfdestruct_contract_init_balance, storage={}
         )
@@ -197,19 +206,19 @@ def test_reentrancy_selfdestruct_revert(
             balance=executor_contract_init_balance,
         )
 
-    # On Cancun suicide no longer destroys the account from state, just cleans
-    # the balance
-    if first_suicide in [Op.CALL]:
+    # On Cancun selfdestruct no longer destroys the account from state, just
+    # cleans the balance
+    if first_selfdestruct in [Op.CALL]:
         post[executor_contract_address] = Account(
             storage={
-                0x01: 0x01,  # First call to contract S->suicide success
-                0x02: 0x00,  # Second call to contract S->suicide reverted
+                0x01: 0x01,  # First call to contract S->selfdestruct success
+                0x02: 0x00,  # Second call to contract S->selfdestruct reverted
                 0x03: 16,  # Reverted value to check that revert really worked
             },
         )
         if fork >= Cancun:
-            # On Cancun suicide does not remove the account, just sends the
-            # balance
+            # On Cancun selfdestruct does not remove the account, just sends
+            # the balance
             post[selfdestruct_contract_address] = Account(
                 balance=0, code=selfdestruct_contract_bytecode, storage={}
             )
@@ -221,11 +230,41 @@ def test_reentrancy_selfdestruct_revert(
             balance=selfdestruct_contract_init_balance,
         )
 
+    # Under EIP-7708 the first SELFDESTRUCT emits a Transfer log to the
+    # recipient; the second SELFDESTRUCT happens inside the reverted frame so
+    # its logs are discarded. For CALL the transfer is from S; for
+    # CALLCODE/DELEGATECALL the code runs in executor's context, so the
+    # transfer is from executor.
+    expected_receipt = None
+    if fork.is_eip_enabled(7708):
+        if first_selfdestruct == Op.CALL:
+            expected_logs = [
+                transfer_log(
+                    selfdestruct_contract_address,
+                    selfdestruct_recipient_address,
+                    selfdestruct_contract_init_balance,
+                )
+            ]
+        elif first_selfdestruct in [Op.CALLCODE, Op.DELEGATECALL]:
+            expected_logs = [
+                transfer_log(
+                    executor_contract_address,
+                    selfdestruct_recipient_address,
+                    executor_contract_init_balance,
+                )
+            ]
+        else:
+            raise RuntimeError(
+                f"Unexpected opcode for test: {first_selfdestruct}"
+            )
+        expected_receipt = TransactionReceipt(logs=expected_logs)
+
     tx = Transaction(
         sender=sender,
         to=executor_contract_address,
         gas_limit=500_000 + fork_extra_gas,
         value=0,
+        expected_receipt=expected_receipt,
     )
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/cancun/eip6780_selfdestruct/test_selfdestruct.py b/tests/cancun/eip6780_selfdestruct/test_selfdestruct.py
index 718505ae725..440052e3110 100644
--- a/tests/cancun/eip6780_selfdestruct/test_selfdestruct.py
+++ b/tests/cancun/eip6780_selfdestruct/test_selfdestruct.py
@@ -24,10 +24,16 @@
     StateTestFiller,
     Storage,
     Transaction,
+    TransactionReceipt,
     compute_create_address,
 )
 from execution_testing.forks import MONAD_EIGHT, Cancun
 
+from tests.amsterdam.eip7708_eth_transfer_logs.spec import (
+    burn_log,
+    transfer_log,
+)
+
 REFERENCE_SPEC_GIT_PATH = "EIPS/eip-6780.md"
 REFERENCE_SPEC_VERSION = "1b6a0e94cc47e859b9866e570391cf37dc55059a"
 
@@ -197,6 +203,7 @@ def test_create_selfdestruct_same_tx(
     state_test: StateTestFiller,
     pre: Alloc,
     sender: EOA,
+    fork: Fork,
     selfdestruct_code: Bytecode,
     sendall_recipient_addresses: List[Address],
     create_opcode: Op,
@@ -232,8 +239,8 @@ def test_create_selfdestruct_same_tx(
         initcode=selfdestruct_contract_initcode,
         opcode=create_opcode,
     )
-    for i in range(len(sendall_recipient_addresses)):
-        if sendall_recipient_addresses[i] == SELF_ADDRESS:
+    for i, addr in enumerate(sendall_recipient_addresses):
+        if addr == SELF_ADDRESS:
             sendall_recipient_addresses[i] = selfdestruct_contract_address
     if selfdestruct_contract_initial_balance > 0:
         pre.fund_address(
@@ -282,8 +289,13 @@ def test_create_selfdestruct_same_tx(
         Op.EXTCODEHASH(selfdestruct_contract_address),
     )
 
+    # Precompute entry_code_address (for Transfer log sender attribution)
+    entry_code_address = compute_create_address(address=sender, nonce=0)
+
     # Call the self-destructing contract multiple times as required, increasing
-    # the wei sent each time
+    # the wei sent each time. Also track the sequence of EIP-7708 logs so they
+    # can be asserted as expected receipt logs.
+    expected_logs_after_tx_value: list = []
     entry_code_balance = 0
     for i, sendall_recipient in zip(
         range(call_times), cycle(sendall_recipient_addresses)
@@ -304,6 +316,33 @@ def test_create_selfdestruct_same_tx(
         entry_code_balance += i
         selfdestruct_contract_current_balance += i
 
+        # CALL with value > 0 emits a Transfer log (entry_code -> contract)
+        if i > 0:
+            expected_logs_after_tx_value.append(
+                transfer_log(
+                    entry_code_address, selfdestruct_contract_address, i
+                )
+            )
+
+        # SELFDESTRUCT emits a Transfer log to a different address, or a Burn
+        # log when sending to self (contract was created in this tx).
+        if selfdestruct_contract_current_balance > 0:
+            if sendall_recipient == selfdestruct_contract_address:
+                expected_logs_after_tx_value.append(
+                    burn_log(
+                        selfdestruct_contract_address,
+                        selfdestruct_contract_current_balance,
+                    )
+                )
+            else:
+                expected_logs_after_tx_value.append(
+                    transfer_log(
+                        selfdestruct_contract_address,
+                        sendall_recipient,
+                        selfdestruct_contract_current_balance,
+                    )
+                )
+
         # Balance is always sent to other contracts
         if sendall_recipient != selfdestruct_contract_address:
             sendall_final_balances[sendall_recipient] += (
@@ -343,7 +382,7 @@ def test_create_selfdestruct_same_tx(
         gas_limit=500_000 + fork_extra_gas,
     )
 
-    entry_code_address = tx.created_contract
+    assert tx.created_contract == entry_code_address
 
     post: Dict[Address, Account] = {
         entry_code_address: Account(
@@ -357,11 +396,21 @@ def test_create_selfdestruct_same_tx(
 
     post[selfdestruct_contract_address] = Account.NONEXISTENT  # type: ignore
 
+    if fork.is_eip_enabled(7708):
+        expected_logs = []
+        if entry_code_balance > 0:
+            # tx value transfer: sender -> entry_code_address
+            expected_logs.append(
+                transfer_log(sender, entry_code_address, entry_code_balance)
+            )
+        expected_logs.extend(expected_logs_after_tx_value)
+        tx.expected_receipt = TransactionReceipt(logs=expected_logs)
+
     state_test(pre=pre, post=post, tx=tx)
 
 
 @pytest.mark.parametrize("create_opcode", [Op.CREATE, Op.CREATE2])
-@pytest.mark.parametrize("call_times", [0, 1])
+@pytest.mark.parametrize("call_times", [0, 1, 2])
 @pytest.mark.parametrize(
     "selfdestruct_contract_initial_balance",
     [0, 100_000],
@@ -371,6 +420,7 @@ def test_self_destructing_initcode(
     state_test: StateTestFiller,
     pre: Alloc,
     sender: EOA,
+    fork: Fork,
     selfdestruct_code: Bytecode,
     sendall_recipient_addresses: List[Address],
     create_opcode: Op,
@@ -378,7 +428,6 @@ def test_self_destructing_initcode(
     # in the same tx
     selfdestruct_contract_initial_balance: int,
     fork_extra_gas: int,
-    fork: Fork,
 ) -> None:
     """
     Test that a contract can self-destruct in its initcode.
@@ -455,7 +504,7 @@ def test_self_destructing_initcode(
         entry_code_balance += i
 
         entry_code += Op.SSTORE(
-            entry_code_storage.store_next(0),
+            entry_code_storage.store_next(entry_code_balance),
             Op.BALANCE(selfdestruct_contract_address),
         )
 
@@ -503,6 +552,38 @@ def test_self_destructing_initcode(
             ),
         }
 
+    if fork.is_eip_enabled(7708):
+        expected_logs = []
+        # tx value transfer: sender -> entry_code_address (created contract)
+        if entry_code_balance > 0:
+            expected_logs.append(
+                transfer_log(sender, entry_code_address, entry_code_balance)
+            )
+        # Initcode SELFDESTRUCT sends pre-existing balance to the recipient.
+        if selfdestruct_contract_initial_balance > 0:
+            expected_logs.append(
+                transfer_log(
+                    selfdestruct_contract_address,
+                    sendall_recipient_addresses[0],
+                    selfdestruct_contract_initial_balance,
+                )
+            )
+        # CALLs to the destroyed contract transfer ETH to it.
+        for i in range(call_times):
+            if i > 0:
+                expected_logs.append(
+                    transfer_log(
+                        entry_code_address, selfdestruct_contract_address, i
+                    )
+                )
+        # At finalization the (destroyed) contract has the accumulated
+        # post-SELFDESTRUCT balance, which is burned.
+        if entry_code_balance > 0:
+            expected_logs.append(
+                burn_log(selfdestruct_contract_address, entry_code_balance)
+            )
+        tx.expected_receipt = TransactionReceipt(logs=expected_logs)
+
     state_test(pre=pre, post=post, tx=tx)
 
 
@@ -516,12 +597,12 @@ def test_self_destructing_initcode_create_tx(
     state_test: StateTestFiller,
     pre: Alloc,
     sender: EOA,
+    fork: Fork,
     tx_value: int,
     selfdestruct_code: Bytecode,
     sendall_recipient_addresses: List[Address],
     selfdestruct_contract_initial_balance: int,
     fork_extra_gas: int,
-    fork: Fork,
 ) -> None:
     """
     Use a Create Transaction to execute a self-destructing initcode.
@@ -568,6 +649,22 @@ def test_self_destructing_initcode_create_tx(
             ),
         }
 
+    if fork.is_eip_enabled(7708):
+        expected_logs = []
+        if tx_value > 0:
+            expected_logs.append(
+                transfer_log(sender, selfdestruct_contract_address, tx_value)
+            )
+        if sendall_amount > 0:
+            expected_logs.append(
+                transfer_log(
+                    selfdestruct_contract_address,
+                    sendall_recipient_addresses[0],
+                    sendall_amount,
+                )
+            )
+        tx.expected_receipt = TransactionReceipt(logs=expected_logs)
+
     state_test(pre=pre, post=post, tx=tx)
 
 
@@ -598,6 +695,7 @@ def test_recreate_self_destructed_contract_different_txs(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
     sender: EOA,
+    fork: Fork,
     selfdestruct_code: Bytecode,
     selfdestruct_contract_initial_balance: int,
     sendall_recipient_addresses: List[Address],
@@ -625,7 +723,7 @@ def test_recreate_self_destructed_contract_different_txs(
     entry_code_storage = Storage()
     sendall_amount = selfdestruct_contract_initial_balance
 
-    # Bytecode used to create the contract
+    # Validate bytecode used to create the contract
     assert create_opcode != Op.CREATE, (
         "cannot recreate contract using CREATE opcode"
     )
@@ -673,18 +771,46 @@ def test_recreate_self_destructed_contract_different_txs(
             selfdestruct_contract_address,
             selfdestruct_contract_initial_balance,
         )
-    for i in range(len(sendall_recipient_addresses)):
-        if sendall_recipient_addresses[i] == SELF_ADDRESS:
+    for i, addr in enumerate(sendall_recipient_addresses):
+        if addr == SELF_ADDRESS:
             sendall_recipient_addresses[i] = selfdestruct_contract_address
 
     txs: List[Transaction] = []
     for i in range(recreate_times + 1):
+        expected_receipt = None
+        if fork.is_eip_enabled(7708):
+            # First tx: contract is recreated at the pre-funded address, then
+            # SELFDESTRUCTs transferring initial_balance to the recipient
+            # (or emitting a Burn log when SD to self). Subsequent txs see
+            # address with 0 balance (destroyed+cleared), so no log.
+            tx_logs: list = []
+            if i == 0 and selfdestruct_contract_initial_balance > 0:
+                if (
+                    sendall_recipient_addresses[0]
+                    == selfdestruct_contract_address
+                ):
+                    tx_logs.append(
+                        burn_log(
+                            selfdestruct_contract_address,
+                            selfdestruct_contract_initial_balance,
+                        )
+                    )
+                else:
+                    tx_logs.append(
+                        transfer_log(
+                            selfdestruct_contract_address,
+                            sendall_recipient_addresses[0],
+                            selfdestruct_contract_initial_balance,
+                        )
+                    )
+            expected_receipt = TransactionReceipt(logs=tx_logs)
         txs.append(
             Transaction(
                 data=Hash(i),
                 sender=sender,
                 to=entry_code_address,
                 gas_limit=500_000 + fork_extra_gas,
+                expected_receipt=expected_receipt,
             )
         )
         entry_code_storage[i] = selfdestruct_contract_address
@@ -765,6 +891,7 @@ def test_selfdestruct_pre_existing(
     eip_enabled: bool,
     pre: Alloc,
     sender: EOA,
+    fork: Fork,
     selfdestruct_code: Bytecode,
     selfdestruct_contract_initial_balance: int,
     sendall_recipient_addresses: List[Address],
@@ -789,8 +916,8 @@ def test_selfdestruct_pre_existing(
     )
     entry_code_storage = Storage()
 
-    for i in range(len(sendall_recipient_addresses)):
-        if sendall_recipient_addresses[i] == SELF_ADDRESS:
+    for i, addr in enumerate(sendall_recipient_addresses):
+        if addr == SELF_ADDRESS:
             sendall_recipient_addresses[i] = selfdestruct_contract_address
 
     # Create a dict to record the expected final balances
@@ -809,8 +936,12 @@ def test_selfdestruct_pre_existing(
     # destructing contract, as many times as required
     entry_code = Bytecode()
 
+    # Pre-compute the entry_code_address to use for Transfer log attribution.
+    entry_code_address = compute_create_address(address=sender, nonce=0)
+
     # Call the self-destructing contract multiple times as required, increasing
     # the wei sent each time
+    expected_logs_after_tx_value: list = []
     entry_code_balance = 0
     for i, sendall_recipient in zip(
         range(call_times), cycle(sendall_recipient_addresses)
@@ -831,6 +962,31 @@ def test_selfdestruct_pre_existing(
         entry_code_balance += i
         selfdestruct_contract_current_balance += i
 
+        # CALL with nonzero value emits Transfer(entry_code -> contract).
+        if i > 0:
+            expected_logs_after_tx_value.append(
+                transfer_log(
+                    entry_code_address, selfdestruct_contract_address, i
+                )
+            )
+
+        # SELFDESTRUCT emits Transfer to a different recipient; for a
+        # pre-existing contract sending to itself, no log is emitted (balance
+        # stays). Pre-Cancun, SD also burns on self, but EIP-7708 is
+        # Amsterdam+, long after EIP-6780 is enabled, so the self-keep path
+        # applies here.
+        if (
+            sendall_recipient != selfdestruct_contract_address
+            and selfdestruct_contract_current_balance > 0
+        ):
+            expected_logs_after_tx_value.append(
+                transfer_log(
+                    selfdestruct_contract_address,
+                    sendall_recipient,
+                    selfdestruct_contract_current_balance,
+                )
+            )
+
         # Balance is always sent to other contracts
         if sendall_recipient != selfdestruct_contract_address:
             sendall_final_balances[sendall_recipient] += (
@@ -876,7 +1032,7 @@ def test_selfdestruct_pre_existing(
         gas_limit=500_000 + fork_extra_gas,
     )
 
-    entry_code_address = tx.created_contract
+    assert tx.created_contract == entry_code_address
 
     post: Dict[Address, Account] = {
         entry_code_address: Account(
@@ -898,6 +1054,15 @@ def test_selfdestruct_pre_existing(
     else:
         post[selfdestruct_contract_address] = Account.NONEXISTENT  # type: ignore
 
+    if fork.is_eip_enabled(7708):
+        expected_logs = []
+        if entry_code_balance > 0:
+            expected_logs.append(
+                transfer_log(sender, entry_code_address, entry_code_balance)
+            )
+        expected_logs.extend(expected_logs_after_tx_value)
+        tx.expected_receipt = TransactionReceipt(logs=expected_logs)
+
     state_test(pre=pre, post=post, tx=tx)
 
 
@@ -909,6 +1074,7 @@ def test_selfdestruct_created_same_block_different_tx(
     eip_enabled: bool,
     pre: Alloc,
     sender: EOA,
+    fork: Fork,
     selfdestruct_contract_initial_balance: int,
     sendall_recipient_addresses: List[Address],
     call_times: int,
@@ -989,6 +1155,45 @@ def test_selfdestruct_created_same_block_different_tx(
     else:
         post[selfdestruct_contract_address] = Account.NONEXISTENT  # type: ignore
 
+    tx1_receipt = None
+    tx2_receipt = None
+    if fork.is_eip_enabled(7708):
+        tx1_logs = []
+        if selfdestruct_contract_initial_balance > 0:
+            tx1_logs.append(
+                transfer_log(
+                    sender,
+                    selfdestruct_contract_address,
+                    selfdestruct_contract_initial_balance,
+                )
+            )
+        tx1_receipt = TransactionReceipt(logs=tx1_logs)
+
+        tx2_logs = []
+        if entry_code_balance > 0:
+            tx2_logs.append(
+                transfer_log(sender, entry_code_address, entry_code_balance)
+            )
+        running_balance = selfdestruct_contract_initial_balance
+        for i in range(call_times):
+            if i > 0:
+                tx2_logs.append(
+                    transfer_log(
+                        entry_code_address, selfdestruct_contract_address, i
+                    )
+                )
+            running_balance += i
+            if running_balance > 0:
+                tx2_logs.append(
+                    transfer_log(
+                        selfdestruct_contract_address,
+                        sendall_recipient_addresses[0],
+                        running_balance,
+                    )
+                )
+            running_balance = 0
+        tx2_receipt = TransactionReceipt(logs=tx2_logs)
+
     txs = [
         Transaction(
             value=selfdestruct_contract_initial_balance,
@@ -996,6 +1201,7 @@ def test_selfdestruct_created_same_block_different_tx(
             sender=sender,
             to=None,
             gas_limit=500_000 + fork_extra_gas,
+            expected_receipt=tx1_receipt,
         ),
         Transaction(
             value=entry_code_balance,
@@ -1003,6 +1209,7 @@ def test_selfdestruct_created_same_block_different_tx(
             sender=sender,
             to=None,
             gas_limit=500_000 + fork_extra_gas,
+            expected_receipt=tx2_receipt,
         ),
     ]
 
@@ -1018,6 +1225,7 @@ def test_calling_from_new_contract_to_pre_existing_contract(
     state_test: StateTestFiller,
     pre: Alloc,
     sender: EOA,
+    fork: Fork,
     sendall_recipient_addresses: List[Address],
     create_opcode: Op,
     call_opcode: Op,
@@ -1152,6 +1360,35 @@ def test_calling_from_new_contract_to_pre_existing_contract(
         gas_limit=500_000 + fork_extra_gas,
     )
 
+    if fork.is_eip_enabled(7708):
+        # The new contract's body is a DELEGATECALL/CALLCODE to the pre-
+        # existing selfdestruct code, so SELFDESTRUCT runs in the NEW
+        # contract's context and transfers its balance to the recipient.
+        expected_logs = []
+        if entry_code_balance > 0:
+            expected_logs.append(
+                transfer_log(sender, entry_code_address, entry_code_balance)
+            )
+        running_balance = selfdestruct_contract_initial_balance
+        for i in range(call_times):
+            if i > 0:
+                expected_logs.append(
+                    transfer_log(
+                        entry_code_address, selfdestruct_contract_address, i
+                    )
+                )
+            running_balance += i
+            if running_balance > 0:
+                expected_logs.append(
+                    transfer_log(
+                        selfdestruct_contract_address,
+                        sendall_recipient_addresses[0],
+                        running_balance,
+                    )
+                )
+            running_balance = 0
+        tx.expected_receipt = TransactionReceipt(logs=expected_logs)
+
     state_test(pre=pre, post=post, tx=tx)
 
 
@@ -1166,6 +1403,7 @@ def test_calling_from_pre_existing_contract_to_new_contract(
     eip_enabled: bool,
     pre: Alloc,
     sender: EOA,
+    fork: Fork,
     selfdestruct_code: Bytecode,
     sendall_recipient_addresses: List[Address],
     call_opcode: Op,
@@ -1309,6 +1547,42 @@ def test_calling_from_pre_existing_contract_to_new_contract(
     else:
         post[caller_address] = Account.NONEXISTENT  # type: ignore
 
+    if fork.is_eip_enabled(7708):
+        # SELFDESTRUCT runs in the caller (pre-existing) contract's context
+        # via DELEGATECALL/CALLCODE, so the Transfer log attributes the
+        # balance flow from the caller to the recipient.
+        expected_logs = []
+        if entry_code_balance > 0:
+            expected_logs.append(
+                transfer_log(sender, entry_code_address, entry_code_balance)
+            )
+        if selfdestruct_contract_initial_balance > 0:
+            # CREATE with value: entry_code -> new selfdestruct_contract
+            expected_logs.append(
+                transfer_log(
+                    entry_code_address,
+                    selfdestruct_contract_address,
+                    selfdestruct_contract_initial_balance,
+                )
+            )
+        caller_running_balance = pre_existing_contract_initial_balance
+        for i in range(call_times):
+            if i > 0:
+                expected_logs.append(
+                    transfer_log(entry_code_address, caller_address, i)
+                )
+            caller_running_balance += i
+            if caller_running_balance > 0:
+                expected_logs.append(
+                    transfer_log(
+                        caller_address,
+                        sendall_recipient_addresses[0],
+                        caller_running_balance,
+                    )
+                )
+            caller_running_balance = 0
+        tx.expected_receipt = TransactionReceipt(logs=expected_logs)
+
     state_test(pre=pre, post=post, tx=tx)
 
 
@@ -1329,6 +1603,7 @@ def test_create_selfdestruct_same_tx_increased_nonce(
     state_test: StateTestFiller,
     pre: Alloc,
     sender: EOA,
+    fork: Fork,
     selfdestruct_code: Bytecode,
     sendall_recipient_addresses: List[Address],
     create_opcode: Op,
@@ -1410,8 +1685,11 @@ def test_create_selfdestruct_same_tx_increased_nonce(
         Op.EXTCODEHASH(selfdestruct_contract_address),
     )
 
+    entry_code_address = compute_create_address(address=sender, nonce=0)
+
     # Call the self-destructing contract multiple times as required, increasing
     # the wei sent each time
+    expected_logs_after_tx_value: list = []
     entry_code_balance = 0
     for i, sendall_recipient in zip(
         range(call_times), cycle(sendall_recipient_addresses)
@@ -1432,6 +1710,28 @@ def test_create_selfdestruct_same_tx_increased_nonce(
         entry_code_balance += i
         selfdestruct_contract_current_balance += i
 
+        # CALL with value > 0 emits a Transfer log (entry_code -> contract).
+        # The inner CREATE(value=0) prepended to selfdestruct_code does not
+        # emit a log (zero value).
+        if i > 0:
+            expected_logs_after_tx_value.append(
+                transfer_log(
+                    entry_code_address, selfdestruct_contract_address, i
+                )
+            )
+
+        # SELFDESTRUCT always sends to a pre-deployed recipient in this test
+        # (SELF_ADDRESS is not parametrized here), so a Transfer log is
+        # emitted whenever the contract has a nonzero balance.
+        if selfdestruct_contract_current_balance > 0:
+            expected_logs_after_tx_value.append(
+                transfer_log(
+                    selfdestruct_contract_address,
+                    sendall_recipient,
+                    selfdestruct_contract_current_balance,
+                )
+            )
+
         # Balance is always sent to other contracts
         if sendall_recipient != selfdestruct_contract_address:
             sendall_final_balances[sendall_recipient] += (
@@ -1471,7 +1771,7 @@ def test_create_selfdestruct_same_tx_increased_nonce(
         gas_limit=1_000_000 + fork_extra_gas,
     )
 
-    entry_code_address = tx.created_contract
+    assert tx.created_contract == entry_code_address
 
     post: Dict[Address, Account] = {
         entry_code_address: Account(
@@ -1501,6 +1801,15 @@ def test_create_selfdestruct_same_tx_increased_nonce(
 
     post[selfdestruct_contract_address] = Account.NONEXISTENT  # type: ignore
 
+    if fork.is_eip_enabled(7708):
+        expected_logs = []
+        if entry_code_balance > 0:
+            expected_logs.append(
+                transfer_log(sender, entry_code_address, entry_code_balance)
+            )
+        expected_logs.extend(expected_logs_after_tx_value)
+        tx.expected_receipt = TransactionReceipt(logs=expected_logs)
+
     state_test(pre=pre, post=post, tx=tx)
 
 
@@ -1511,6 +1820,7 @@ def test_create_and_destroy_multiple_contracts_same_tx(
     state_test: StateTestFiller,
     pre: Alloc,
     sender: EOA,
+    fork: Fork,
     num_contracts: int,
     selfdestruct_contract_initial_balance: int,
 ) -> None:
@@ -1616,6 +1926,23 @@ def test_create_and_destroy_multiple_contracts_same_tx(
     for addr in contract_addresses:
         post[addr] = Account.NONEXISTENT  # type: ignore
 
+    if fork.is_eip_enabled(7708):
+        # Each contract SELFDESTRUCTs to a shared recipient after being created
+        # in the same tx. CREATE2 uses value=0 and CALLs use value=0, so the
+        # only Transfer logs are emitted when each contract's pre-funded
+        # balance is sent to the recipient via SELFDESTRUCT.
+        expected_logs = []
+        if selfdestruct_contract_initial_balance > 0:
+            for addr in contract_addresses:
+                expected_logs.append(
+                    transfer_log(
+                        addr,
+                        sendall_recipient,
+                        selfdestruct_contract_initial_balance,
+                    )
+                )
+        tx.expected_receipt = TransactionReceipt(logs=expected_logs)
+
     state_test(pre=pre, post=post, tx=tx)
 
 
@@ -1626,6 +1953,7 @@ def test_create_multiple_contracts_destroy_one_then_destroy_other_next_tx(
     eip_enabled: bool,
     pre: Alloc,
     sender: EOA,
+    fork: Fork,
     selfdestruct_contract_initial_balance: int,
 ) -> None:
     """
@@ -1727,16 +2055,48 @@ def test_create_multiple_contracts_destroy_one_then_destroy_other_next_tx(
         + Op.STOP
     )
 
+    tx1_receipt = None
+    tx2_receipt = None
+    if fork.is_eip_enabled(7708):
+        # Tx1: only A SELFDESTRUCTs (flag=1), transferring its pre-funded
+        # balance to the shared recipient. B gets called with flag=0 and
+        # returns without emitting any log.
+        tx1_logs = []
+        if selfdestruct_contract_initial_balance > 0:
+            tx1_logs.append(
+                transfer_log(
+                    contract_a_address,
+                    sendall_recipient,
+                    selfdestruct_contract_initial_balance,
+                )
+            )
+        tx1_receipt = TransactionReceipt(logs=tx1_logs)
+
+        # Tx2: B (now pre-existing) SELFDESTRUCTs transferring its
+        # pre-funded balance to the recipient.
+        tx2_logs = []
+        if selfdestruct_contract_initial_balance > 0:
+            tx2_logs.append(
+                transfer_log(
+                    contract_b_address,
+                    sendall_recipient,
+                    selfdestruct_contract_initial_balance,
+                )
+            )
+        tx2_receipt = TransactionReceipt(logs=tx2_logs)
+
     txs = [
         Transaction(
             sender=sender,
             to=entry_code_address,
             gas_limit=1_000_000,
+            expected_receipt=tx1_receipt,
         ),
         Transaction(
             sender=sender,
             to=tx2_caller,
             gas_limit=500_000,
+            expected_receipt=tx2_receipt,
         ),
     ]
 
@@ -1775,6 +2135,7 @@ def test_parent_creates_child_selfdestruct_one(
     state_test: StateTestFiller,
     pre: Alloc,
     sender: EOA,
+    fork: Fork,
     destroy_parent: bool,
     selfdestruct_contract_initial_balance: int,
 ) -> None:
@@ -1890,6 +2251,22 @@ def test_parent_creates_child_selfdestruct_one(
             storage={0: 1},
         )
 
+    if fork.is_eip_enabled(7708):
+        # Only the SELFDESTRUCT that actually runs emits a log. Both parent
+        # and child are pre-funded via pre.fund_address, so whichever
+        # SELFDESTRUCTs to the shared recipient transfers its initial_balance.
+        expected_logs = []
+        if selfdestruct_contract_initial_balance > 0:
+            source = parent_address if destroy_parent else child_address
+            expected_logs.append(
+                transfer_log(
+                    source,
+                    sendall_recipient,
+                    selfdestruct_contract_initial_balance,
+                )
+            )
+        tx.expected_receipt = TransactionReceipt(logs=expected_logs)
+
     state_test(pre=pre, post=post, tx=tx)
 
 
@@ -1901,6 +2278,7 @@ def test_recursive_contract_creation_and_selfdestruct(
     state_test: StateTestFiller,
     pre: Alloc,
     sender: EOA,
+    fork: Fork,
     recursion_depth: int,
     selfdestruct_on_unwind: bool,
     selfdestruct_contract_initial_balance: int,
@@ -2055,4 +2433,25 @@ def test_recursive_contract_creation_and_selfdestruct(
         storage={0: 1},
     )
 
+    if fork.is_eip_enabled(7708):
+        # CREATE/CALL all use value=0, so the only Transfer logs come from
+        # each SELFDESTRUCT that runs. On unwind every contract SDs, starting
+        # from the deepest; otherwise only the deepest SDs.
+        expected_logs = []
+        if selfdestruct_contract_initial_balance > 0:
+            sd_sources = (
+                list(reversed(contract_addresses))
+                if selfdestruct_on_unwind
+                else [contract_addresses[-1]]
+            )
+            for addr in sd_sources:
+                expected_logs.append(
+                    transfer_log(
+                        addr,
+                        sendall_recipient,
+                        selfdestruct_contract_initial_balance,
+                    )
+                )
+        tx.expected_receipt = TransactionReceipt(logs=expected_logs)
+
     state_test(pre=pre, post=post, tx=tx)
diff --git a/tests/cancun/eip6780_selfdestruct/test_selfdestruct_revert.py b/tests/cancun/eip6780_selfdestruct/test_selfdestruct_revert.py
index b570e65c98b..96dc50d93b3 100644
--- a/tests/cancun/eip6780_selfdestruct/test_selfdestruct_revert.py
+++ b/tests/cancun/eip6780_selfdestruct/test_selfdestruct_revert.py
@@ -438,7 +438,7 @@ def test_selfdestruct_created_in_same_tx_with_revert(  # noqa SC200
     )
 
     expected_block_access_list = None
-    if fork.header_bal_hash_required():
+    if fork.is_eip_enabled(7928):
         account_expectations = {}
 
         if selfdestruct_on_outer_call > 0:
diff --git a/tests/constantinople/eip1014_create2/test_create2_revert.py b/tests/constantinople/eip1014_create2/test_create2_revert.py
new file mode 100644
index 00000000000..c611d06f4bd
--- /dev/null
+++ b/tests/constantinople/eip1014_create2/test_create2_revert.py
@@ -0,0 +1,183 @@
+"""
+Tests for CREATE2 state restoration after reverted sub-calls.
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Environment,
+    Initcode,
+    Op,
+    StateTestFiller,
+    Storage,
+    Transaction,
+    compute_create2_address,
+)
+
+from .spec import ref_spec_1014
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_1014.git_path
+REFERENCE_SPEC_VERSION = ref_spec_1014.version
+
+
+@pytest.mark.valid_from("Constantinople")
+@pytest.mark.pre_alloc_mutable
+def test_create2_revert_preserves_balance(
+    state_test: StateTestFiller,
+    pre: Alloc,
+) -> None:
+    """
+    Test that CREATE2 revert preserves pre-existing balance at target.
+
+    Address X has a pre-existing balance but no code. CREATE2 targets X
+    with init code that reverts. After the revert, X must still have its
+    original balance, nonce=0, and no code or storage.
+    """
+    env = Environment()
+    factory_storage = Storage()
+    salt = 0
+    pre_balance = 1
+
+    # Init code that writes storage then reverts.
+    initcode = Op.SSTORE(0, 1) + Op.REVERT(offset=0, size=0)
+
+    # Factory receives initcode via calldata, does CREATE2.
+    factory = pre.deploy_contract(
+        Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
+        + Op.SSTORE(
+            factory_storage.store_next(0, "create2_result"),
+            Op.CREATE2(
+                value=0,
+                offset=0,
+                size=Op.CALLDATASIZE,
+                salt=salt,
+            ),
+        )
+        + Op.STOP,
+        storage=factory_storage.canary(),
+    )
+
+    target = compute_create2_address(factory, salt, initcode)
+
+    # Pre-allocate target with balance only.
+    pre[target] = Account(balance=pre_balance)
+
+    sender = pre.fund_eoa()
+
+    state_test(
+        env=env,
+        pre=pre,
+        post={
+            # CREATE2 returns 0 on failure.
+            factory: Account(storage=factory_storage),
+            # Target keeps its balance, no code deployed.
+            target: Account(balance=pre_balance, nonce=0, code=b""),
+        },
+        tx=Transaction(
+            sender=sender,
+            to=factory,
+            gas_limit=1_000_000,
+            data=initcode,
+        ),
+    )
+
+
+@pytest.mark.valid_from("Constantinople")
+def test_create2_succeeds_after_reverted_create2(
+    state_test: StateTestFiller,
+    pre: Alloc,
+) -> None:
+    """
+    Test that CREATE2 succeeds after a previous CREATE2 at the same address
+    was reverted.
+
+    Inner call does CREATE2 then REVERTs. Outer call then does the same
+    CREATE2 which should succeed since the first was rolled back.
+    """
+    env = Environment()
+    storage = Storage()
+    salt = 1
+
+    runtime_code = Op.SSTORE(0, 1) + Op.STOP
+    initcode = Initcode(deploy_code=runtime_code)
+
+    # The "creator" contract that does CREATE2 when called.
+    creator_code = (
+        Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
+        + Op.SSTORE(
+            0,
+            Op.CREATE2(
+                value=0,
+                offset=0,
+                size=Op.CALLDATASIZE,
+                salt=salt,
+            ),
+        )
+        + Op.STOP
+    )
+    creator = pre.deploy_contract(creator_code)
+
+    expected_address = compute_create2_address(creator, salt, initcode)
+
+    # Outer contract:
+    # 1. Call creator wrapped in a sub-call that reverts.
+    # 2. Call creator again (should succeed).
+    #
+    # Use a "reverter" contract that calls creator then reverts.
+    reverter_code = (
+        Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
+        + Op.POP(
+            Op.CALL(
+                gas=200_000,
+                address=creator,
+                args_size=Op.CALLDATASIZE,
+            )
+        )
+        + Op.REVERT(offset=0, size=0)
+    )
+    reverter = pre.deploy_contract(reverter_code)
+
+    outer_code = (
+        Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
+        # First attempt: call reverter (which calls creator then reverts)
+        + Op.SSTORE(
+            storage.store_next(0, "reverter_call_result"),
+            Op.CALL(
+                gas=300_000,
+                address=reverter,
+                args_size=Op.CALLDATASIZE,
+            ),
+        )
+        # Second attempt: call creator directly (should succeed)
+        + Op.SSTORE(
+            storage.store_next(1, "creator_call_result"),
+            Op.CALL(
+                gas=300_000,
+                address=creator,
+                args_size=Op.CALLDATASIZE,
+            ),
+        )
+        + Op.STOP
+    )
+    outer = pre.deploy_contract(outer_code, storage=storage.canary())
+
+    sender = pre.fund_eoa()
+
+    state_test(
+        env=env,
+        pre=pre,
+        post={
+            outer: Account(storage=storage),
+            # The creator stored the CREATE2 result.
+            creator: Account(storage={0: expected_address}),
+            # The contract was deployed.
+            expected_address: Account(code=runtime_code),
+        },
+        tx=Transaction(
+            sender=sender,
+            to=outer,
+            gas_limit=2_000_000,
+            data=initcode,
+        ),
+    )
diff --git a/tests/constantinople/eip1014_create2/test_recreate.py b/tests/constantinople/eip1014_create2/test_recreate.py
index 5b98919c917..f89849779b9 100644
--- a/tests/constantinople/eip1014_create2/test_recreate.py
+++ b/tests/constantinople/eip1014_create2/test_recreate.py
@@ -21,7 +21,7 @@
 
 @pytest.mark.parametrize("recreate_on_separate_block", [True, False])
 @pytest.mark.valid_from("Constantinople")
-@pytest.mark.valid_until("Shanghai")
+@pytest.mark.valid_before("EIP6780")
 def test_recreate(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
diff --git a/tests/constantinople/eip1052_extcodehash/test_extcodehash.py b/tests/constantinople/eip1052_extcodehash/test_extcodehash.py
index e3257c12377..72bdd7536e1 100644
--- a/tests/constantinople/eip1052_extcodehash/test_extcodehash.py
+++ b/tests/constantinople/eip1052_extcodehash/test_extcodehash.py
@@ -39,7 +39,7 @@
     ],
     pr=["https://github.com/ethereum/execution-specs/pull/2249"],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_extcodehash_self(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/constantinople/eip145_bitwise_shift/test_shift_combinations.py b/tests/constantinople/eip145_bitwise_shift/test_shift_combinations.py
index 0d23d717850..573e0472f60 100644
--- a/tests/constantinople/eip145_bitwise_shift/test_shift_combinations.py
+++ b/tests/constantinople/eip145_bitwise_shift/test_shift_combinations.py
@@ -60,7 +60,7 @@
     ],
     pr=["https://github.com/ethereum/execution-spec-tests/pull/1683"],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_combinations(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -88,7 +88,7 @@ def test_combinations(
     gas_costs = fork.gas_costs()
     # Gas required depends on count and cost of SSTOREs used.
     sstore_gas = len(combinations) * (
-        gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD
+        gas_costs.STORAGE_SET + gas_costs.COLD_STORAGE_ACCESS
     )
 
     tx = Transaction(
diff --git a/tests/evm_tools/test_fork_cache.py b/tests/evm_tools/test_fork_cache.py
new file mode 100644
index 00000000000..b2b67f2bdf0
--- /dev/null
+++ b/tests/evm_tools/test_fork_cache.py
@@ -0,0 +1,268 @@
+"""Tests for temporary fork caching."""
+
+import importlib
+from typing import Any
+
+import pytest
+from ethereum_types.numeric import U64, Uint
+from typing_extensions import assert_never
+
+from ethereum.fork_criteria import (
+    ByBlockNumber,
+    ByTimestamp,
+    Unscheduled,
+)
+from ethereum_spec_tools.evm_tools.t8n import ForkCache
+from ethereum_spec_tools.forks import Hardfork
+
+pytestmark = pytest.mark.evm_tools
+
+OVERRIDE_FIELDS: tuple[str, ...] = (
+    "blob_target_gas_per_block",
+    "gas_per_blob",
+    "blob_min_gasprice",
+    "blob_base_fee_update_fraction",
+    "max_blob_gas_per_block",
+    "blob_schedule_target",
+    "blob_schedule_max",
+)
+
+
+class DummyTemporaryFork:
+    """Stand-in for a cloned hardfork."""
+
+    def __exit__(self, *args: Any, **kwargs: Any) -> None:
+        """Support ForkCache cleanup."""
+
+
+def _template() -> Hardfork:
+    """Return the Amsterdam fork template."""
+    return Hardfork(importlib.import_module("ethereum.forks.amsterdam"))
+
+
+def _different_fork_criteria(
+    criteria: ByBlockNumber | ByTimestamp | Unscheduled,
+) -> ByBlockNumber | ByTimestamp | Unscheduled:
+    """Return a fork criterion that differs from `criteria`."""
+    if isinstance(criteria, ByBlockNumber):
+        return ByBlockNumber(int(criteria.block_number) + 1)
+
+    if isinstance(criteria, ByTimestamp):
+        return ByTimestamp(int(criteria.timestamp) + 1)
+
+    if isinstance(criteria, Unscheduled):
+        zero_order = Unscheduled(order_index=0)
+        if criteria == zero_order:
+            return Unscheduled(order_index=1)
+        return zero_order
+
+    assert_never(criteria)
+
+
+def _gas_default(
+    gas_mod: Any,
+    gas_costs_attr: str,
+) -> U64 | Uint | None:
+    """Return a gas default from `GasCosts`."""
+    gas_costs = getattr(gas_mod, "GasCosts", None)
+    if gas_costs is None:
+        return None
+
+    value = getattr(gas_costs, gas_costs_attr, None)
+    if value is None:
+        return None
+
+    assert isinstance(value, U64 | Uint)
+    return value
+
+
+def _override_defaults(template: Hardfork) -> dict[str, U64 | Uint]:
+    """Return template defaults keyed by ForkCache override name."""
+    gas_mod = template.module("vm.gas")
+    fork_mod = template.module("fork")
+
+    defaults: dict[str, U64 | Uint | None] = {
+        "blob_target_gas_per_block": _gas_default(
+            gas_mod,
+            "BLOB_TARGET_GAS_PER_BLOCK",
+        ),
+        "gas_per_blob": _gas_default(gas_mod, "PER_BLOB"),
+        "blob_min_gasprice": _gas_default(gas_mod, "BLOB_MIN_GASPRICE"),
+        "blob_base_fee_update_fraction": _gas_default(
+            gas_mod,
+            "BLOB_BASE_FEE_UPDATE_FRACTION",
+        ),
+        "max_blob_gas_per_block": getattr(
+            fork_mod,
+            "MAX_BLOB_GAS_PER_BLOCK",
+            None,
+        ),
+        "blob_schedule_target": _gas_default(gas_mod, "BLOB_SCHEDULE_TARGET"),
+        "blob_schedule_max": _gas_default(gas_mod, "BLOB_SCHEDULE_MAX"),
+    }
+
+    missing = sorted(
+        name for name in OVERRIDE_FIELDS if defaults.get(name) is None
+    )
+    if missing:
+        raise AssertionError(
+            "missing template defaults for overrides: " + ", ".join(missing)
+        )
+
+    return {key: value for key, value in defaults.items() if value is not None}
+
+
+def test_fork_cache_returns_template_without_overrides(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Return the template when no overrides are provided."""
+    template = _template()
+
+    def clone(*args: Any, **kwargs: Any) -> DummyTemporaryFork:
+        pytest.fail("Hardfork.clone() should not run without overrides")
+
+    monkeypatch.setattr(Hardfork, "clone", clone)
+
+    with ForkCache() as cache:
+        fork = cache.get(template)
+
+    assert fork is template
+
+
+def test_fork_cache_returns_template_for_identical_overrides(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Return the template when requested overrides match it exactly."""
+    template = _template()
+    identical_overrides = _override_defaults(template)
+    identical_fork_criteria = template.criteria
+    assert isinstance(
+        identical_fork_criteria,
+        ByBlockNumber | ByTimestamp | Unscheduled,
+    )
+
+    def clone(*args: Any, **kwargs: Any) -> DummyTemporaryFork:
+        pytest.fail("Hardfork.clone() should not run for identical overrides")
+
+    monkeypatch.setattr(Hardfork, "clone", clone)
+
+    with ForkCache() as cache:
+        fork = cache.get(
+            template,
+            fork_criteria=identical_fork_criteria,
+            **identical_overrides,
+        )
+
+    assert fork is template
+
+
+def test_fork_cache_clones_when_fork_criteria_changes_template(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Clone the template when the fork criteria changes."""
+    template = _template()
+    cloned = DummyTemporaryFork()
+    seen: dict[str, Any] = {}
+
+    def clone(*args: Any, **kwargs: Any) -> DummyTemporaryFork:
+        seen.update(kwargs)
+        return cloned
+
+    monkeypatch.setattr(Hardfork, "clone", clone)
+
+    template_criteria = template.criteria
+    assert isinstance(
+        template_criteria,
+        ByBlockNumber | ByTimestamp | Unscheduled,
+    )
+    changed_fork_criteria = _different_fork_criteria(template_criteria)
+
+    with ForkCache() as cache:
+        fork = cache.get(template, fork_criteria=changed_fork_criteria)
+
+    assert fork is cloned
+    assert seen["template"] is template
+    assert seen["fork_criteria"] == changed_fork_criteria
+
+
+@pytest.mark.parametrize("field", OVERRIDE_FIELDS)
+def test_fork_cache_returns_template_for_each_identical_blob_override(
+    monkeypatch: pytest.MonkeyPatch,
+    field: str,
+) -> None:
+    """Return the template when each blob-related override matches it."""
+    template = _template()
+    value = _override_defaults(template)[field]
+
+    def clone(*args: Any, **kwargs: Any) -> DummyTemporaryFork:
+        pytest.fail("Hardfork.clone() should not run for identical overrides")
+
+    monkeypatch.setattr(Hardfork, "clone", clone)
+
+    with ForkCache() as cache:
+        fork = cache.get(template, **{field: value})
+
+    assert fork is template
+
+
+@pytest.mark.parametrize("field", OVERRIDE_FIELDS)
+def test_fork_cache_clones_for_each_changed_blob_override(
+    monkeypatch: pytest.MonkeyPatch,
+    field: str,
+) -> None:
+    """Clone the template when each blob-related override is changed."""
+    template = _template()
+    default_value = _override_defaults(template)[field]
+    changed_value = type(default_value)(int(default_value) + 1)
+    cloned = DummyTemporaryFork()
+    seen: dict[str, Any] = {}
+
+    def clone(*args: Any, **kwargs: Any) -> DummyTemporaryFork:
+        seen.update(kwargs)
+        return cloned
+
+    monkeypatch.setattr(Hardfork, "clone", clone)
+
+    with ForkCache() as cache:
+        fork = cache.get(template, **{field: changed_value})
+
+    assert fork is cloned
+    assert seen["template"] is template
+    assert seen[field] == changed_value
+
+
+def test_fork_cache_reuses_cached_clone_for_identical_changed_request(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Reuse the same cached clone when override requests repeat."""
+    template = _template()
+    default_blob_schedule_target = _override_defaults(template)[
+        "blob_schedule_target"
+    ]
+    changed_blob_schedule_target = U64(int(default_blob_schedule_target) + 1)
+    cloned = DummyTemporaryFork()
+    clone_count = 0
+
+    def clone(*args: Any, **kwargs: Any) -> DummyTemporaryFork:
+        del args
+        del kwargs
+        nonlocal clone_count
+        clone_count += 1
+        return cloned
+
+    monkeypatch.setattr(Hardfork, "clone", clone)
+
+    with ForkCache() as cache:
+        first = cache.get(
+            template,
+            blob_schedule_target=changed_blob_schedule_target,
+        )
+        second = cache.get(
+            template,
+            blob_schedule_target=changed_blob_schedule_target,
+        )
+
+    assert first is cloned
+    assert second is cloned
+    assert first is second
+    assert clone_count == 1
diff --git a/tests/frontier/create/test_create_deposit_oog.py b/tests/frontier/create/test_create_deposit_oog.py
index 6a322007580..1c5edf29e6b 100644
--- a/tests/frontier/create/test_create_deposit_oog.py
+++ b/tests/frontier/create/test_create_deposit_oog.py
@@ -21,7 +21,7 @@
 @pytest.mark.valid_from("Frontier")
 @pytest.mark.parametrize("enough_gas", [True, False])
 @pytest.mark.with_all_create_opcodes
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_create_deposit_oog(
     state_test: StateTestFiller,
     fork: Fork,
diff --git a/tests/frontier/create/test_create_one_byte.py b/tests/frontier/create/test_create_one_byte.py
index d64c550377b..10d89c330be 100644
--- a/tests/frontier/create/test_create_one_byte.py
+++ b/tests/frontier/create/test_create_one_byte.py
@@ -32,7 +32,7 @@
 )
 @pytest.mark.valid_from("Frontier")
 @pytest.mark.with_all_create_opcodes
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_create_one_byte(
     state_test: StateTestFiller,
     fork: Fork,
@@ -97,10 +97,10 @@ def test_create_one_byte(
 
     gas_costs = fork.gas_costs()
     sstore_cost = len(initcode) * (
-        gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD
+        gas_costs.STORAGE_SET + gas_costs.COLD_STORAGE_ACCESS
     )
     create_cost = len(initcode) * (
-        gas_costs.GAS_CREATE + gas_costs.GAS_CODE_DEPOSIT_PER_BYTE
+        gas_costs.OPCODE_CREATE_BASE + gas_costs.CODE_DEPOSIT_PER_BYTE
     )
 
     tx = Transaction(
diff --git a/tests/frontier/create/test_create_suicide_during_init.py b/tests/frontier/create/test_create_suicide_during_init.py
index 79e26d80894..ec9bc4bd64c 100644
--- a/tests/frontier/create/test_create_suicide_during_init.py
+++ b/tests/frontier/create/test_create_suicide_during_init.py
@@ -44,7 +44,13 @@ def __int__(self) -> int:
     "operation",
     [Operation.SUICIDE, Operation.SUICIDE_TO_ITSELF],
 )
-@pytest.mark.json_loader
+@pytest.mark.filter_combinations(
+    lambda create_opcode, transaction_create, **_: (
+        create_opcode == Op.CREATE or not transaction_create
+    ),
+    reason="transaction_create only valid with CREATE",
+)
+@pytest.mark.eels_base_coverage
 def test_create_suicide_during_transaction_create(
     state_test: StateTestFiller,
     fork: Fork,
@@ -54,9 +60,6 @@ def test_create_suicide_during_transaction_create(
     transaction_create: bool,
 ) -> None:
     """Contract init code calls suicide then measures different metrics."""
-    if create_opcode != Op.CREATE and transaction_create:
-        pytest.skip(f"Excluded: {create_opcode} with transaction_create=True")
-
     sender = pre.fund_eoa()
     contract_deploy = pre.deploy_contract(
         code=Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
diff --git a/tests/frontier/create/test_create_suicide_store.py b/tests/frontier/create/test_create_suicide_store.py
index d8a6ab82e3d..56340ef03c4 100644
--- a/tests/frontier/create/test_create_suicide_store.py
+++ b/tests/frontier/create/test_create_suicide_store.py
@@ -41,7 +41,7 @@ class Operation(IntEnum):
 )
 @pytest.mark.valid_from("Frontier")
 @pytest.mark.with_all_create_opcodes
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_create_suicide_store(
     state_test: StateTestFiller,
     fork: Fork,
diff --git a/tests/frontier/examples/test_block_intermediate_state.py b/tests/frontier/examples/test_block_intermediate_state.py
index 76dc9dd6135..522b1b444e5 100644
--- a/tests/frontier/examples/test_block_intermediate_state.py
+++ b/tests/frontier/examples/test_block_intermediate_state.py
@@ -12,7 +12,7 @@
 
 
 @pytest.mark.valid_from("Frontier")
-@pytest.mark.valid_until("Homestead")
+@pytest.mark.valid_before("SpuriousDragon")
 def test_block_intermediate_state(
     blockchain_test: BlockchainTestFiller, pre: Alloc
 ) -> None:
diff --git a/tests/frontier/identity_precompile/spec.py b/tests/frontier/identity_precompile/spec.py
new file mode 100644
index 00000000000..0d9fce9c5a2
--- /dev/null
+++ b/tests/frontier/identity_precompile/spec.py
@@ -0,0 +1,12 @@
+"""Defines spec constants for the IDENTITY precompile."""
+
+from dataclasses import dataclass
+
+from execution_testing import Address
+
+
+@dataclass(frozen=True)
+class Spec:
+    """Parameters for the IDENTITY precompile (frontier)."""
+
+    IDENTITY = Address(0x04)
diff --git a/tests/frontier/identity_precompile/test_identity.py b/tests/frontier/identity_precompile/test_identity.py
index cd608d12ef3..c4418e09937 100644
--- a/tests/frontier/identity_precompile/test_identity.py
+++ b/tests/frontier/identity_precompile/test_identity.py
@@ -113,7 +113,7 @@
         ),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_call_identity_precompile(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/frontier/opcodes/test_all_opcodes.py b/tests/frontier/opcodes/test_all_opcodes.py
index 5cb2322d152..db44e338902 100644
--- a/tests/frontier/opcodes/test_all_opcodes.py
+++ b/tests/frontier/opcodes/test_all_opcodes.py
@@ -66,7 +66,7 @@ def prepare_suffix(opcode: Opcode) -> Bytecode:
     pr=["https://github.com/ethereum/execution-spec-tests/pull/748"],
 )
 @pytest.mark.valid_from("Frontier")
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_all_opcodes(
     state_test: StateTestFiller, pre: Alloc, fork: Fork
 ) -> None:
@@ -81,9 +81,17 @@ def test_all_opcodes(
     valid_opcodes = set(fork.valid_opcodes())
     all_opcodes = set(Opcode(i) for i in range(0xFF + 1))
     for opcode in sorted(valid_opcodes | all_opcodes):
+        test_opcode: Opcode | Bytecode = opcode
+        if opcode.has_data_portion():
+            if opcode in [Op.SWAPN, Op.DUPN]:
+                test_opcode = opcode[17]
+            elif opcode == Op.EXCHANGE:
+                test_opcode = opcode[1, 2]
+            else:
+                test_opcode = opcode[0]
         code_contract[opcode] = pre.deploy_contract(
             balance=10,
-            code=prepare_stack(opcode) + opcode + prepare_suffix(opcode),
+            code=prepare_stack(opcode) + test_opcode + prepare_suffix(opcode),
             storage={},
         )
 
@@ -117,9 +125,9 @@ def test_all_opcodes(
 
     gas_costs = fork.gas_costs()
     sstore_cost = (len(code_contract) + 1) * (
-        gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD
+        gas_costs.STORAGE_SET + gas_costs.COLD_STORAGE_ACCESS
     )
-    access_cost = len(code_contract) * gas_costs.GAS_COLD_ACCOUNT_ACCESS
+    access_cost = len(code_contract) * gas_costs.COLD_ACCOUNT_ACCESS
 
     subcall_cost = (
         len(code_contract) - len(fork.valid_opcodes())
@@ -163,7 +171,7 @@ def fork_opcodes_increasing_stack(
 
 @pytest.mark.parametrize_by_fork("opcode", fork_opcodes_increasing_stack)
 @pytest.mark.parametrize("fails", [True, False])
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_stack_overflow(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -182,9 +190,11 @@ def test_stack_overflow(
     value_code_failed = 0xDEADBEEF
     value_code_worked = 1
 
+    push_opcode = Op.PUSH0 if Op.PUSH0 in fork.valid_opcodes() else Op.PUSH1(0)
+
     contract = pre.deploy_contract(
         code=Op.SSTORE(slot_code_worked, value_code_worked)
-        + Op.PUSH1(0) * pre_stack_items
+        + push_opcode * pre_stack_items
         + opcode
         + Op.STOP,
         storage={slot_code_worked: value_code_failed},
@@ -208,6 +218,72 @@ def test_stack_overflow(
     )
 
 
+def fork_opcodes_with_non_increasing_stack(
+    fork: Fork,
+) -> Iterator[Op]:
+    """
+    Yields opcodes which are valid for `fork` and decrease or leave static the
+    operand stack.
+    """
+    for opcode in fork.valid_opcodes():
+        if opcode.pushed_stack_items <= opcode.popped_stack_items:
+            if opcode not in [
+                # Incompatible with this test:
+                Op.REVERT,  # Reverts the storage required
+                Op.JUMP,  # Tries to jump to non-jumpdest
+                Op.BLOCKHASH,  # Incompatible with state_test
+                Op.SELFDESTRUCT,  # selfdestructs the contract in old forks
+            ]:
+                yield opcode
+
+
+@pytest.mark.parametrize_by_fork(
+    "opcode", fork_opcodes_with_non_increasing_stack
+)
+def test_max_stack(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    opcode: Op,
+    env: Environment,
+) -> None:
+    """
+    Test that opcodes that don't push more items than they pop from the
+    stack can operate when the stack is full.
+    """
+    pre_stack_items = fork.max_stack_height()
+    slot_code_worked = 1
+    value_code_failed = 0xDEADBEEF
+    value_code_worked = 1
+
+    push_opcode = Op.PUSH0 if Op.PUSH0 in fork.valid_opcodes() else Op.PUSH1(0)
+
+    contract = pre.deploy_contract(
+        code=Op.SSTORE(slot_code_worked, value_code_worked)
+        + push_opcode * pre_stack_items
+        + opcode
+        + Op.STOP,
+        storage={slot_code_worked: value_code_failed},
+    )
+    gas_limit = 100_000
+    if fork.is_eip_enabled(8037):
+        gas_limit = 500_000
+    tx = Transaction(
+        gas_limit=gas_limit,
+        to=contract,
+        sender=pre.fund_eoa(),
+        protected=fork.supports_protected_txs(),
+    )
+    expected_storage = {slot_code_worked: value_code_worked}
+
+    state_test(
+        env=env,
+        pre=pre,
+        tx=tx,
+        post={contract: Account(storage=expected_storage)},
+    )
+
+
 def prepare_stack_constant_gas_oog(opcode: Opcode) -> Bytecode:
     """Prepare valid stack for opcode."""
     if opcode == Op.JUMPI:
@@ -229,8 +305,10 @@ def constant_gas_opcodes(fork: Fork) -> Generator[ParameterSet, None, None]:
         # SSTORE - untestable due to 2300 gas stipend rule
         if opcode == Op.SSTORE:
             continue
-        if opcode.gas_cost(fork) == 0:
-            # zero constant gas opcodes - untestable
+        # EIP-8037: CREATE/CREATE2 have a state gas component charged from
+        # the state reservoir that cannot be measured via the GAS opcode
+        # delta used by gas_test. Excluded to keep the test meaningful.
+        if fork.is_eip_enabled(8037) and opcode in (Op.CREATE, Op.CREATE2):
             continue
         yield pytest.param(
             opcode,
@@ -240,7 +318,7 @@ def constant_gas_opcodes(fork: Fork) -> Generator[ParameterSet, None, None]:
 
 @pytest.mark.valid_from("Berlin")
 @pytest.mark.parametrize_by_fork("opcode", constant_gas_opcodes)
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_constant_gas(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -250,6 +328,11 @@ def test_constant_gas(
     """Test that constant gas opcodes work as expected."""
     # Using Op.GAS as salt to guarantee no address collision on CREATE2.
     create2_salt = Op.GAS if opcode == Op.CREATE2 else Bytecode()
+    if opcode.has_data_portion():
+        if opcode in [Op.SWAPN, Op.DUPN]:
+            opcode = opcode[17]
+        else:
+            opcode = opcode[0]
     setup_code = (
         Op.MLOAD(0)
         + Op.POP
@@ -273,4 +356,5 @@ def test_constant_gas(
         subject_code=opcode,
         subject_code_warm=warm_opcode,
         tear_down_code=prepare_suffix(opcode),
+        out_of_gas_testing=opcode.gas_cost(fork) > 0,
     )
diff --git a/tests/frontier/opcodes/test_blockhash_state_test_recency.py b/tests/frontier/opcodes/test_blockhash_state_test_recency.py
new file mode 100644
index 00000000000..401017f9bee
--- /dev/null
+++ b/tests/frontier/opcodes/test_blockhash_state_test_recency.py
@@ -0,0 +1,151 @@
+"""
+State-test regression for the BLOCKHASH (0x40) opcode recency window.
+
+In a *state test*, nethermind returns a non-zero hash for
+``BLOCKHASH(0)`` even when block 0 lies far outside the recency window (256
+blocks pre-Prague, 8191 via EIP-2935 from Prague). eels (the reference),
+go-ethereum, besu, erigon, evmone and reth all correctly return 0.
+
+Root cause (nethermind, state-test only):
+``src/Nethermind/Ethereum.Test.Base/TestBlockhashProvider.cs`` implements::
+
+    number != 0 ? Keccak.Zero : Keccak.Compute(number.ToString())
+
+It performs no recency-window check, and the opcode handler
+``InstructionBlockHash`` (in ``EvmInstructions.Environment.cs``) delegates
+that check to the provider -- it only rejects ``number >= current``. So
+``BLOCKHASH(0)`` returns ``keccak256("0")`` regardless of how ancient block
+0 is. Nethermind's *production* ``BlockhashProvider`` does enforce the
+window, so this is a state-test tooling bug, not a mainnet consensus bug --
+but it makes nethermind diverge under differential state-test fuzzing.
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Environment,
+    Hash,
+    Op,
+    StateTestFiller,
+    Storage,
+    Transaction,
+)
+
+# keccak256(b"0") -- the state-test convention hash for block 0 used by both
+# go-ethereum (vmTestBlockHash) and nethermind (TestBlockhashProvider). The
+# fuzzer sets env.previousHash to exactly this value so the in-window
+# block-0 hash agrees across clients.
+KECCAK_OF_BLOCK_0 = Hash(
+    0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
+)
+
+
+@pytest.mark.valid_from("Frontier")
+@pytest.mark.state_test_only
+@pytest.mark.parametrize(
+    "current_number",
+    [
+        pytest.param(0x101, id="just_past_256_window"),
+        pytest.param(0x2001, id="just_past_8191_window"),
+        pytest.param(0x100000, id="far_out_of_window"),
+        pytest.param(0xA63CCE, id="fuzzer_discovered_number"),
+    ],
+)
+def test_blockhash_zero_out_of_window(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    current_number: int,
+) -> None:
+    """
+    BLOCKHASH(0) must be 0 when block 0 is outside the recency window.
+
+    At ``current_number`` well past the window, block 0 is ancient, so every
+    spec-conformant client returns 0. Nethermind's state-test runner instead
+    returns ``keccak256("0")`` because ``TestBlockhashProvider`` skips the
+    window check, which is the bug this test guards against.
+
+    Marked ``state_test_only``: the bug lives solely in the state-test code
+    path (the production blockhash provider enforces the window), and a state
+    test with such a high ``env.number`` cannot be converted into a real
+    blockchain-test fixture (no genesis chain up to that height).
+    """
+    storage = Storage()
+    contract = pre.deploy_contract(
+        code=(
+            # slot 0: the raw hash -- must be zero
+            Op.SSTORE(
+                storage.store_next(0, "blockhash_0_value"),
+                Op.BLOCKHASH(0),
+            )
+            # slot 1: ISZERO of the hash -- must be 1 (written, so the
+            # divergence lands in a non-default slot too)
+            + Op.SSTORE(
+                storage.store_next(1, "blockhash_0_is_zero"),
+                Op.ISZERO(Op.BLOCKHASH(0)),
+            )
+        )
+    )
+    sender = pre.fund_eoa()
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        gas_limit=200_000,
+        protected=False,  # legacy tx so it fills on pre-EIP-155 forks too
+    )
+
+    state_test(
+        env=Environment(number=current_number),
+        pre=pre,
+        post={contract: Account(storage=storage)},
+        tx=tx,
+    )
+
+
+@pytest.mark.valid_from("Frontier")
+@pytest.mark.valid_until("Cancun")
+@pytest.mark.state_test_only
+def test_blockhash_zero_in_window_control(
+    state_test: StateTestFiller,
+    pre: Alloc,
+) -> None:
+    """
+    In-window control: BLOCKHASH(0) returns the block-0 hash at block 1.
+
+    This is the positive counterpart to the out-of-window test. With block 0
+    inside the recency window (current block == 1) and ``previousHash`` set
+    to the state-test convention value ``keccak256("0")``, all clients --
+    including nethermind -- agree on the result, pinning the window boundary.
+
+    Restricted to <= Cancun because EIP-2935 (Prague+) serves BLOCKHASH from
+    the history storage contract, which is not pre-populated in a bare state
+    test.
+    Marked ``state_test_only``: the asserted non-zero hash would not match the
+    real genesis hash of a derived blockchain-test fixture.
+    """
+    storage = Storage()
+    contract = pre.deploy_contract(
+        code=Op.SSTORE(
+            storage.store_next(KECCAK_OF_BLOCK_0, "blockhash_0_value"),
+            Op.BLOCKHASH(0),
+        )
+    )
+    sender = pre.fund_eoa()
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        gas_limit=200_000,
+        protected=False,  # legacy tx so it fills on pre-EIP-155 forks too
+    )
+
+    state_test(
+        env=Environment(
+            number=1,
+            block_hashes={0: KECCAK_OF_BLOCK_0},
+        ),
+        pre=pre,
+        post={contract: Account(storage=storage)},
+        tx=tx,
+    )
diff --git a/tests/frontier/opcodes/test_call.py b/tests/frontier/opcodes/test_call.py
index e8345e9d5bb..95ad749a868 100644
--- a/tests/frontier/opcodes/test_call.py
+++ b/tests/frontier/opcodes/test_call.py
@@ -33,7 +33,7 @@ def test_call_large_offset_mstore(
 
     mem_offset = 128  # arbitrary number
 
-    # Cost of pushing args onto the stack (each PUSH costs G_VERY_LOW)
+    # Cost of pushing args onto the stack (each PUSH costs VERY_LOW)
     call_push_cost = (Op.PUSH1(0) * len(Op.CALL.kwargs)).gas_cost(fork)
     mstore_push_cost = (Op.PUSH1(0) * len(Op.MSTORE.kwargs)).gas_cost(fork)
 
@@ -101,7 +101,7 @@ def test_call_memory_expands_on_early_revert(
     # arbitrary number, greater than memory size to trigger an expansion
     ret_size = 128
 
-    # Cost of pushing args onto the stack (each PUSH costs G_VERY_LOW)
+    # Cost of pushing args onto the stack (each PUSH costs VERY_LOW)
     call_push_cost = (Op.PUSH1(0) * len(Op.CALL.kwargs)).gas_cost(fork)
     mstore_push_cost = (Op.PUSH1(0) * len(Op.MSTORE.kwargs)).gas_cost(fork)
 
@@ -137,7 +137,7 @@ def test_call_memory_expands_on_early_revert(
 
     # call cost:
     #   address_access_cost+new_acc_cost+memory_expansion_cost+value-stipend
-    # G_CALL_STIPEND is a threshold check, not a gas cost — keep from gas_costs
+    # CALL_STIPEND is a threshold check, not a gas cost — keep from gas_costs
     gsc = fork.gas_costs()
     call_cost = (
         Op.CALL(
@@ -146,7 +146,7 @@ def test_call_memory_expands_on_early_revert(
             account_new=True,
             new_memory_size=ret_size,
         ).gas_cost(fork)
-        - gsc.GAS_CALL_STIPEND
+        - gsc.CALL_STIPEND
     )
 
     # mstore cost: base cost. No memory expansion cost needed, it was expanded
@@ -186,7 +186,7 @@ def test_call_large_args_offset_size_zero(
 
     very_large_offset = 2**100
 
-    # Cost of pushing args onto the stack (each PUSH costs G_VERY_LOW)
+    # Cost of pushing args onto the stack (each PUSH costs VERY_LOW)
     push_cost = (Op.PUSH1(0) * len(call_opcode.kwargs)).gas_cost(fork)
 
     call_measure = CodeGasMeasure(
diff --git a/tests/frontier/opcodes/test_call_and_callcode_gas_calculation.py b/tests/frontier/opcodes/test_call_and_callcode_gas_calculation.py
index 2d8f65ed966..c44e26616d2 100644
--- a/tests/frontier/opcodes/test_call_and_callcode_gas_calculation.py
+++ b/tests/frontier/opcodes/test_call_and_callcode_gas_calculation.py
@@ -94,17 +94,17 @@ def sufficient_gas(
         cost = 700  # Pre-Berlin call cost
         gas_costs = fork.gas_costs()
         if is_value_call:
-            cost += gas_costs.GAS_CALL_VALUE
+            cost += gas_costs.CALL_VALUE
         if callee_opcode == Op.CALL:
-            cost += gas_costs.GAS_NEW_ACCOUNT
+            cost += gas_costs.NEW_ACCOUNT
     elif fork == Homestead:
         cost = 40  # Homestead call cost
         cost += 1  # mandatory callee gas allowance
         gas_costs = fork.gas_costs()
         if is_value_call:
-            cost += gas_costs.GAS_CALL_VALUE
+            cost += gas_costs.CALL_VALUE
         if callee_opcode == Op.CALL:
-            cost += gas_costs.GAS_NEW_ACCOUNT
+            cost += gas_costs.NEW_ACCOUNT
     else:
         raise Exception("Only forks Homestead and >=Byzantium supported")
 
@@ -230,7 +230,7 @@ def expected_block_access_list(
     gas_shortage: int,
 ) -> None | BlockAccessListExpectation:
     """The expected block access list for >=Amsterdam cases."""
-    if fork.header_bal_hash_required():
+    if fork.is_eip_enabled(7928):
         if callee_opcode == Op.CALL:
             if gas_shortage:
                 # call runs OOG after state access due to `is_account_alive` in
@@ -318,7 +318,7 @@ def test_value_transfer_gas_calculation(
 @pytest.mark.parametrize("gas_shortage", [0, 1])
 @pytest.mark.valid_from("Byzantium")
 @pytest.mark.valid_until("Berlin")
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_value_transfer_gas_calculation_byzantium(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/frontier/opcodes/test_calldatacopy.py b/tests/frontier/opcodes/test_calldatacopy.py
index 787eac0cdeb..336c464c9d2 100644
--- a/tests/frontier/opcodes/test_calldatacopy.py
+++ b/tests/frontier/opcodes/test_calldatacopy.py
@@ -154,7 +154,7 @@
         "sec",
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_calldatacopy(
     state_test: StateTestFiller,
     code: Bytecode,
diff --git a/tests/frontier/opcodes/test_selfdestruct.py b/tests/frontier/opcodes/test_selfdestruct.py
index 0bf7c03c925..6ab8ff78e05 100644
--- a/tests/frontier/opcodes/test_selfdestruct.py
+++ b/tests/frontier/opcodes/test_selfdestruct.py
@@ -13,7 +13,7 @@
 
 
 @pytest.mark.valid_from("Frontier")
-@pytest.mark.valid_until("Homestead")
+@pytest.mark.valid_before("SpuriousDragon")
 def test_double_kill(
     blockchain_test: BlockchainTestFiller, pre: Alloc
 ) -> None:
diff --git a/tests/frontier/opcodes/test_swap.py b/tests/frontier/opcodes/test_swap.py
index 77152f4f765..03b1c6f3ca4 100644
--- a/tests/frontier/opcodes/test_swap.py
+++ b/tests/frontier/opcodes/test_swap.py
@@ -108,7 +108,7 @@ def test_swap(
     ids=lambda op: str(op),
 )
 @pytest.mark.valid_from("Frontier")
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_stack_underflow(
     state_test: StateTestFiller,
     fork: Fork,
diff --git a/tests/frontier/precompiles/spec.py b/tests/frontier/precompiles/spec.py
new file mode 100644
index 00000000000..68ecdf7e572
--- /dev/null
+++ b/tests/frontier/precompiles/spec.py
@@ -0,0 +1,34 @@
+"""Defines spec constants and input types for the ECRECOVER precompile."""
+
+from dataclasses import dataclass
+
+from execution_testing import Address, BytesConcatenation
+
+
+@dataclass(frozen=True)
+class EcrecoverInput(BytesConcatenation):
+    """
+    ECRECOVER precompile input: 32-byte message hash, 32-byte v, 32-byte r,
+    32-byte s — concatenated big-endian (128 bytes total).
+    """
+
+    msg_hash: int
+    v: int
+    r: int
+    s: int
+
+    def __bytes__(self) -> bytes:
+        """Convert input to bytes."""
+        return b"".join(
+            x.to_bytes(32, byteorder="big")
+            for x in (self.msg_hash, self.v, self.r, self.s)
+        )
+
+
+@dataclass(frozen=True)
+class Spec:
+    """Parameters for the frontier precompiles."""
+
+    ECRECOVER = Address(0x01)
+    SHA256 = Address(0x02)
+    RIPEMD160 = Address(0x03)
diff --git a/tests/frontier/precompiles/test_ecrecover.py b/tests/frontier/precompiles/test_ecrecover.py
index 38cd85f87cc..32da8ed80ee 100644
--- a/tests/frontier/precompiles/test_ecrecover.py
+++ b/tests/frontier/precompiles/test_ecrecover.py
@@ -394,7 +394,7 @@
         ),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_precompiles(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/frontier/precompiles/test_precompile_absence.py b/tests/frontier/precompiles/test_precompile_absence.py
index a7ec124cd28..ec86a1ba6a3 100644
--- a/tests/frontier/precompiles/test_precompile_absence.py
+++ b/tests/frontier/precompiles/test_precompile_absence.py
@@ -72,11 +72,11 @@ def test_precompile_absence(
     sstore_cost = (
         2
         * (UPPER_BOUND - len(active_precompiles))
-        * (gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD)
+        * (gas_costs.STORAGE_SET + gas_costs.COLD_STORAGE_ACCESS)
     )
     access_cost = (
         UPPER_BOUND - len(active_precompiles)
-    ) * gas_costs.GAS_COLD_ACCOUNT_ACCESS
+    ) * gas_costs.COLD_ACCOUNT_ACCESS
 
     tx = Transaction(
         to=entry_point_address,
diff --git a/tests/frontier/precompiles/test_precompiles.py b/tests/frontier/precompiles/test_precompiles.py
index 7a1a08d41b2..61faab7f284 100644
--- a/tests/frontier/precompiles/test_precompiles.py
+++ b/tests/frontier/precompiles/test_precompiles.py
@@ -57,7 +57,7 @@ def precompile_addresses(fork: Fork) -> Iterator[Tuple[Address, bool]]:
 @pytest.mark.parametrize_by_fork(
     "address,precompile_exists", precompile_addresses
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_precompiles(
     state_test: StateTestFiller,
     address: Address,
diff --git a/tests/frontier/precompiles/test_ripemd.py b/tests/frontier/precompiles/test_ripemd.py
index c20211fac03..3b788e20b2b 100644
--- a/tests/frontier/precompiles/test_ripemd.py
+++ b/tests/frontier/precompiles/test_ripemd.py
@@ -141,7 +141,7 @@
     ],
 )
 @pytest.mark.parametrize("oog", [True, False])
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_precompiles(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/frontier/scenarios/test_scenarios.py b/tests/frontier/scenarios/test_scenarios.py
index 4888c137043..f5cd856e97a 100644
--- a/tests/frontier/scenarios/test_scenarios.py
+++ b/tests/frontier/scenarios/test_scenarios.py
@@ -221,11 +221,9 @@ def test_scenarios(
             1, hint=f"runner result {scenario.name}"
         )
 
-        tx_max_gas = (
-            7_000_000
-            if test_program.id == ProgramInvalidOpcode().id
-            else 1_000_000
-        )
+        tx_max_gas = 1_000_000
+        if test_program.id == ProgramInvalidOpcode().id:
+            tx_max_gas = 10_000_000 if fork.is_eip_enabled(8037) else 7_000_000
         if scenario.category == "double_call_combinations":
             tx_max_gas *= 2
 
diff --git a/tests/frontier/touch/test_touch.py b/tests/frontier/touch/test_touch.py
index 5b6236ba424..6a70146af72 100644
--- a/tests/frontier/touch/test_touch.py
+++ b/tests/frontier/touch/test_touch.py
@@ -12,8 +12,8 @@
 
 
 @pytest.mark.valid_from("Frontier")
-@pytest.mark.valid_until("Berlin")
-@pytest.mark.json_loader
+@pytest.mark.valid_before("EIP1559")
+@pytest.mark.eels_base_coverage
 def test_zero_gas_price_and_touching(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/frontier/validation/test_header.py b/tests/frontier/validation/test_header.py
index e8d590e7241..f53ef2e43be 100644
--- a/tests/frontier/validation/test_header.py
+++ b/tests/frontier/validation/test_header.py
@@ -19,11 +19,11 @@
         pytest.param(0, marks=pytest.mark.exception_test),
         pytest.param(1, marks=pytest.mark.exception_test),
         pytest.param(4999, marks=pytest.mark.exception_test),
-        pytest.param(5000, marks=pytest.mark.valid_until("Osaka")),
+        pytest.param(5000, marks=pytest.mark.valid_before("EIP7928")),
         pytest.param(
             5000,
             marks=[
-                pytest.mark.valid_from("Amsterdam"),
+                pytest.mark.valid_from("EIP7928"),
                 pytest.mark.exception_test,
             ],
         ),
@@ -47,7 +47,7 @@ def test_gas_limit_below_minimum(
     if gas_limit < 5000:
         block.rlp_modifier = Header(**modified_fields)
         block.exception = BlockException.INVALID_GASLIMIT
-    elif fork.header_bal_hash_required():
+    elif fork.is_eip_enabled(7928):
         block.exception = BlockException.BLOCK_ACCESS_LIST_GAS_LIMIT_EXCEEDED
 
     blockchain_test(pre=pre, post={}, blocks=[block], genesis_environment=env)
diff --git a/tests/frontier/validation/test_transaction.py b/tests/frontier/validation/test_transaction.py
index 6dceb27832c..1b665a4e073 100644
--- a/tests/frontier/validation/test_transaction.py
+++ b/tests/frontier/validation/test_transaction.py
@@ -1,7 +1,14 @@
 """Test the transaction level validations applied from Frontier."""
 
 import pytest
-from execution_testing import Alloc, Transaction
+from execution_testing import (
+    Account,
+    Alloc,
+    Op,
+    StateTestFiller,
+    Storage,
+    Transaction,
+)
 from execution_testing.base_types.base_types import ZeroPaddedHexNumber
 from execution_testing.exceptions.exceptions import TransactionException
 from execution_testing.forks.base_fork import BaseFork
@@ -15,7 +22,7 @@
 
 
 @pytest.mark.exception_test
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_tx_gas_limit(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
@@ -66,7 +73,7 @@ def test_tx_gas_limit(
     ],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_tx_nonce(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
@@ -108,7 +115,7 @@ def test_tx_nonce(
         (1, None),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_sender_balance(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
@@ -149,3 +156,44 @@ def test_sender_balance(
     )
 
     blockchain_test(pre=pre, post={}, blocks=[block], genesis_environment=env)
+
+
+@pytest.mark.valid_from("Frontier")
+@pytest.mark.state_test_only
+@pytest.mark.exception_test
+@pytest.mark.eels_base_coverage
+def test_sender_balance_insufficient_state_test(
+    state_test: StateTestFiller,
+    pre: Alloc,
+) -> None:
+    """
+    A legacy transaction from a sender that cannot afford `gas * gasPrice`
+    must be rejected, exercised through the state-test code path.
+    """
+    storage = Storage()
+    # If the transaction were (incorrectly) executed, this SSTORE would land a
+    # non-default value in slot 0, diverging the post-state root from the
+    # rejected (pre == post) outcome.
+    contract = pre.deploy_contract(
+        code=Op.SSTORE(storage.store_next(0, "must_stay_unset"), 0x1)
+        + Op.STOP,
+    )
+    # Zero balance, unable to cover any gas cost.
+    sender = pre.fund_eoa(amount=0)
+
+    tx = Transaction(
+        sender=sender,
+        to=contract,
+        gas_limit=100_000,
+        gas_price=10,
+        protected=False,  # legacy tx
+        error=TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+    )
+
+    state_test(
+        env=Environment(),
+        pre=pre,
+        # Transaction rejected: contract storage stays empty.
+        post={contract: Account(storage=storage)},
+        tx=tx,
+    )
diff --git a/tests/istanbul/eip152_blake2/conftest.py b/tests/istanbul/eip152_blake2/conftest.py
index 3a9bc3cf9e4..f31e15bf0eb 100644
--- a/tests/istanbul/eip152_blake2/conftest.py
+++ b/tests/istanbul/eip152_blake2/conftest.py
@@ -14,7 +14,7 @@ def blake2b_contract_bytecode(call_opcode: Op, fork: Fork) -> Bytecode:
     BLAKE2b precompile and stores the result.
     """
     gas_costs = fork.gas_costs()
-    sstore_cost = 3 * (gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD)
+    sstore_cost = 3 * (gas_costs.STORAGE_SET + gas_costs.COLD_STORAGE_ACCESS)
     return (
         Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE())
         + Op.SSTORE(
diff --git a/tests/istanbul/eip152_blake2/test_blake2.py b/tests/istanbul/eip152_blake2/test_blake2.py
index 249288d601a..c324c9078af 100644
--- a/tests/istanbul/eip152_blake2/test_blake2.py
+++ b/tests/istanbul/eip152_blake2/test_blake2.py
@@ -408,8 +408,8 @@ def test_blake2b(
     sender = pre.fund_eoa()
 
     gas_costs = fork.gas_costs()
-    sstore_cost = gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD
-    blake_cost = data.rounds * gas_costs.GAS_PRECOMPILE_BLAKE2F_PER_ROUND
+    sstore_cost = gas_costs.STORAGE_SET + gas_costs.COLD_STORAGE_ACCESS
+    blake_cost = data.rounds * gas_costs.PRECOMPILE_BLAKE2F_PER_ROUND
 
     data_bytes = data.create_blake2b_tx_data()
 
@@ -454,7 +454,7 @@ def max_tx_gas_limit(fork: Fork) -> int:
 def non_max_tx_gas_limits(fork: Fork) -> List[int]:
     """List of tx gas limits below transaction max."""
     gas_costs = fork.gas_costs()
-    sstore_cost = gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD
+    sstore_cost = gas_costs.STORAGE_SET + gas_costs.COLD_STORAGE_ACCESS
     return [
         40_000 + 3 * sstore_cost,
         50_000 + 3 * sstore_cost,
@@ -540,7 +540,7 @@ def tx_gas_limits(fork: Fork) -> List[int]:
         ),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_blake2b_invalid_gas(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -652,7 +652,7 @@ def test_blake2b_invalid_gas(
         ),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_blake2b_gas_limit(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/istanbul/eip152_blake2/test_blake2_delegatecall.py b/tests/istanbul/eip152_blake2/test_blake2_delegatecall.py
index a5c9dc52643..19caa23a729 100644
--- a/tests/istanbul/eip152_blake2/test_blake2_delegatecall.py
+++ b/tests/istanbul/eip152_blake2/test_blake2_delegatecall.py
@@ -47,8 +47,8 @@ def test_blake2_precompile_delegatecall(
         to=account,
         sender=pre.fund_eoa(),
         gas_limit=20_000
-        + gas_costs.GAS_STORAGE_SET
-        + gas_costs.GAS_COLD_SLOAD
+        + gas_costs.STORAGE_SET
+        + gas_costs.COLD_STORAGE_ACCESS
         + fork.transaction_intrinsic_cost_calculator()(),
         protected=True,
     )
diff --git a/tests/json_loader/conftest.py b/tests/json_loader/conftest.py
index c8491ba1350..e5faa6b1532 100644
--- a/tests/json_loader/conftest.py
+++ b/tests/json_loader/conftest.py
@@ -94,6 +94,20 @@ def pytest_addoption(parser: Parser) -> None:
         help="Path to a file containing test ids, one per line",
     )
 
+    parser.addoption(
+        "--allow-post-state-hash",
+        dest="allow_post_state_hash",
+        default=False,
+        action="store_const",
+        const=True,
+        help=(
+            "Verify blockchain fixtures that only include `postStateHash` "
+            "(not the full `postState` dict). The EELS state transition's "
+            "internal state-root check plus the `lastblockhash` assertion "
+            "are cryptographically sufficient."
+        ),
+    )
+
 
 def pytest_configure(config: Config) -> None:
     """
diff --git a/tests/json_loader/helpers/load_blockchain_tests.py b/tests/json_loader/helpers/load_blockchain_tests.py
index 8bab4269ddf..d4d21a43012 100644
--- a/tests/json_loader/helpers/load_blockchain_tests.py
+++ b/tests/json_loader/helpers/load_blockchain_tests.py
@@ -12,6 +12,7 @@
 
 from ethereum.crypto.hash import keccak256
 from ethereum.exceptions import EthereumException, StateWithEmptyAccount
+from ethereum.state import close_state
 from ethereum.utils.hexadecimal import hex_to_bytes
 from ethereum_spec_tools.evm_tools.loaders.fixture_loader import Load
 
@@ -102,7 +103,16 @@ def test_dict(self) -> Dict[str, Any]:
     def runtest(self) -> None:
         """Run a blockchain state test from JSON test case data."""
         json_data = self.test_dict
-        if "postState" not in json_data:
+        has_post_state = "postState" in json_data
+        allow_post_state_hash = self.config.getoption(
+            "allow_post_state_hash", False
+        )
+        post_state_hash_only = (
+            not has_post_state
+            and "postStateHash" in json_data
+            and allow_post_state_hash
+        )
+        if not has_post_state and not post_state_hash_only:
             pytest.xfail(
                 f"{self.test_file}[{self.test_key}] doesn't have post state"
             )
@@ -176,7 +186,7 @@ def runtest(self) -> None:
                 #       of all of them.
                 with pytest.raises((EthereumException, RLPException)):
                     add_block_to_chain(chain, json_block, load, mock_pow)
-                    load.fork.close_state(chain.state)
+                    close_state(chain.state)
                 return
             else:
                 add_block_to_chain(chain, json_block, load, mock_pow)
@@ -186,10 +196,11 @@ def runtest(self) -> None:
             keccak256(rlp.encode(chain.blocks[-1].header)) == last_block_hash
         )
 
-        expected_post_state = load.json_to_state(json_data["postState"])
-        assert chain.state == expected_post_state
-        load.fork.close_state(chain.state)
-        load.fork.close_state(expected_post_state)
+        if has_post_state:
+            expected_post_state = load.json_to_state(json_data["postState"])
+            assert chain.state == expected_post_state
+            close_state(expected_post_state)
+        close_state(chain.state)
 
     def reportinfo(self) -> Tuple[Path, int, str]:
         """Return information for test reporting."""
diff --git a/tests/json_loader/helpers/load_vm_tests.py b/tests/json_loader/helpers/load_vm_tests.py
index 2f00b1a78c5..73660b42a05 100644
--- a/tests/json_loader/helpers/load_vm_tests.py
+++ b/tests/json_loader/helpers/load_vm_tests.py
@@ -1,6 +1,5 @@
 """Helper class to load and run VM tests."""
 
-from importlib import import_module
 from pathlib import Path
 from typing import Any, Dict, Generator, List, Tuple
 
@@ -49,19 +48,20 @@ class VmTestLoader:
     def __init__(self, network: str, fork_name: str):
         self.network = network
         self.fork_name = fork_name
+        self.hardfork = TestHardfork.by_short_name(fork_name)
 
         # Import relevant items from fork
         self.fork = self._module("fork")
         self.BlockChain = self.fork.BlockChain
         self.get_last_256_block_hashes = self.fork.get_last_256_block_hashes
 
-        self.state = self._module("state")
-        self.State = self.state.State
-        self.close_state = self.state.close_state
-        self.set_account = self.state.set_account
-        self.set_storage = self.state.set_storage
-        self.storage_root = self.state.storage_root
-        self.store_code = self.state.store_code
+        state_mod = self._state_module()
+        self.State = state_mod.State
+        self.close_state = state_mod.close_state
+        self.set_account = state_mod.set_account
+        self.set_storage = state_mod.set_storage
+        self.storage_root = state_mod.storage_root
+        self.store_code = state_mod.store_code
 
         self.fork_types = self._module("fork_types")
         self.Account = self.fork_types.Account
@@ -84,7 +84,17 @@ def __init__(self, network: str, fork_name: str):
         self.process_message_call = self.interpreter.process_message_call
 
     def _module(self, name: str) -> Any:
-        return import_module(f"ethereum.forks.{self.fork_name}.{name}")
+        return self.hardfork.module(name)
+
+    def _state_module(self) -> Any:
+        # TODO: remove this fallback once the state module is ported over
+        # to the older forks
+        try:
+            return self._module("state")
+        except ModuleNotFoundError:
+            import ethereum.state
+
+            return ethereum.state
 
     def run_test_from_dict(self, json_data: Dict[str, Any]) -> None:
         """
diff --git a/tests/json_loader/test_forks.py b/tests/json_loader/test_forks.py
new file mode 100644
index 00000000000..646b96f42dd
--- /dev/null
+++ b/tests/json_loader/test_forks.py
@@ -0,0 +1,31 @@
+"""Tests for hardfork discovery helpers."""
+
+import pytest
+
+from ethereum_spec_tools.forks import Hardfork
+
+
+class CustomHardfork(Hardfork):
+    """Hardfork subclass used to test generic class methods."""
+
+
+def test_by_short_name_returns_matching_hardfork() -> None:
+    """Return the hardfork matching the requested short name."""
+    fork = Hardfork.by_short_name("frontier")
+
+    assert fork.short_name == "frontier"
+    assert fork.name == "ethereum.forks.frontier"
+
+
+def test_by_short_name_preserves_subclass() -> None:
+    """Return the same hardfork subclass used for lookup."""
+    fork = CustomHardfork.by_short_name("frontier")
+
+    assert isinstance(fork, CustomHardfork)
+    assert fork.short_name == "frontier"
+
+
+def test_by_short_name_rejects_unknown_fork() -> None:
+    """Raise an error when the hardfork short name is unknown."""
+    with pytest.raises(ValueError, match="unknown hardfork `unknown_fork`"):
+        Hardfork.by_short_name("unknown_fork")
diff --git a/tests/json_loader/test_genesis.py b/tests/json_loader/test_genesis.py
index 431af272598..5fb45fcd887 100644
--- a/tests/json_loader/test_genesis.py
+++ b/tests/json_loader/test_genesis.py
@@ -8,21 +8,21 @@
 from ethereum.forks.frontier.blocks import Block, Header
 from ethereum.forks.frontier.fork import BlockChain
 from ethereum.forks.frontier.fork_types import Account, Bloom
-from ethereum.forks.frontier.state import (
-    State,
-    set_account,
-    set_storage,
-    state_root,
-    store_code,
-)
-from ethereum.forks.frontier.trie import Trie, root
 from ethereum.forks.frontier.utils.hexadecimal import hex_to_address
 from ethereum.genesis import (
     GenesisFork,
     add_genesis_block,
     get_genesis_configuration,
 )
-from ethereum.state import Address
+from ethereum.merkle_patricia_trie import Trie, root
+from ethereum.state import (
+    Address,
+    State,
+    set_account,
+    set_storage,
+    state_root,
+    store_code,
+)
 from ethereum.utils.hexadecimal import hex_to_hash
 from ethereum_spec_tools.forks import Hardfork
 
@@ -67,22 +67,50 @@ def fork_name(fork: Hardfork) -> str:
 @pytest.mark.parametrize("fork", Hardfork.discover(), ids=fork_name)
 def test_genesis(fork: Hardfork) -> None:
     """Tests genesis block creation for all hardforks."""
+    # TODO: remove once the changes have been back-ported
+    from ethereum.merkle_patricia_trie import Trie
+    from ethereum.state import (
+        Address,
+        State,
+        root,
+        set_account,
+        set_storage,
+        state_root,
+        store_code,
+    )
+
+    try:
+        _trie = fork.module("trie").Trie
+        _set_account = fork.module("state").set_account
+        _set_storage = fork.module("state").set_storage
+        _state_root = fork.module("state").state_root
+        _root = fork.module("trie").root
+        _store_code = fork.module("state").store_code
+        state = fork.module("state").State()
+    except ModuleNotFoundError:
+        _trie = Trie
+        _set_account = set_account
+        _set_storage = set_storage
+        _state_root = state_root
+        _root = root
+        _store_code = store_code
+        state = State()
+
     description: GenesisFork = GenesisFork(
         Address=Address,
         Account=fork.module("fork_types").Account,
-        Trie=fork.module("trie").Trie,
+        Trie=_trie,
         Bloom=fork.module("fork_types").Bloom,
         Header=fork.module("blocks").Header,
         Block=fork.module("blocks").Block,
-        set_account=fork.module("state").set_account,
-        set_storage=fork.module("state").set_storage,
-        state_root=fork.module("state").state_root,
-        root=fork.module("trie").root,
+        set_account=_set_account,
+        set_storage=_set_storage,
+        state_root=_state_root,
+        root=_root,
         hex_to_address=fork.module("utils.hexadecimal").hex_to_address,
-        store_code=fork.module("state").store_code,
+        store_code=_store_code,
     )
 
-    state = fork.module("state").State()
     chain = fork.module("fork").BlockChain([], state, U64(1))
     add_genesis_block(description, chain, MAINNET_GENESIS_CONFIGURATION)
 
diff --git a/tests/json_loader/test_optimized_state.py b/tests/json_loader/test_optimized_state.py
index 8db41952ac6..28763cee324 100644
--- a/tests/json_loader/test_optimized_state.py
+++ b/tests/json_loader/test_optimized_state.py
@@ -1,14 +1,23 @@
 """Tests for the optimized state implementation."""
 
-import sys
 from typing import Any, cast
 
 import pytest
 from ethereum_types.numeric import U256
 
-import ethereum.forks.frontier.state as state
-from ethereum.forks.frontier.fork_types import EMPTY_ACCOUNT
+import ethereum.state as state
 from ethereum.forks.tangerine_whistle.utils.hexadecimal import hex_to_address
+from ethereum.state import EMPTY_ACCOUNT
+from ethereum_spec_tools.forks import Hardfork
+
+# The optimized state integration predates the ``State`` refactor and has
+# not yet been rewired onto ``PreState``/``state_tracker`` — see
+# https://github.com/ethereum/execution-specs/issues/2256. Until then,
+# both ``get_optimized_state_patches`` and the per-fork ``destroy_storage``
+# API these tests assume no longer load, so the tests are skipped wholesale.
+pytestmark = pytest.mark.skip(
+    reason="optimized state pending redesign (see issue #2256)"
+)
 
 try:
     import ethereum_optimized.state_db as state_db
@@ -20,9 +29,8 @@ class OptimizedState:
 
     optimized_state = cast(Any, OptimizedState())
 
-    for name, value in state_db.get_optimized_state_patches(
-        "frontier"
-    ).items():
+    frontier = Hardfork.by_short_name("frontier")
+    for name, value in state_db.get_optimized_state_patches(frontier).items():
         setattr(optimized_state, name, value)
 
 except ImportError:
@@ -33,10 +41,6 @@ class OptimizedState:
 STORAGE_FOO = U256(101).to_be_bytes32()
 
 
-@pytest.mark.skipif(
-    "ethereum_optimized.state_db" not in sys.modules,
-    reason="missing dependency (use `pip install 'ethereum[optimized]'`)",
-)
 def test_storage_key() -> None:
     """
     Tests that optimized state storage operations match the normal
@@ -52,18 +56,14 @@ def actions(impl: Any) -> Any:
 
     state_normal = actions(state)
     state_optimized = actions(optimized_state)
-    assert state.get_storage(
-        state_normal, ADDRESS_FOO, STORAGE_FOO
+    assert state_normal.get_storage(
+        ADDRESS_FOO, STORAGE_FOO
     ) == optimized_state.get_storage(state_optimized, ADDRESS_FOO, STORAGE_FOO)
     assert state.state_root(state_normal) == optimized_state.state_root(
         state_optimized
     )
 
 
-@pytest.mark.skipif(
-    "ethereum_optimized.state_db" not in sys.modules,
-    reason="missing dependency (use `pip install 'ethereum[optimized]'`)",
-)
 def test_resurrection() -> None:
     """Tests that optimized state handles storage resurrection correctly."""
 
@@ -80,8 +80,8 @@ def actions(impl: Any) -> Any:
     state_normal = actions(state)
     state_optimized = actions(optimized_state)
     optimized_state.state_root(state_optimized)
-    assert state.get_storage(
-        state_normal, ADDRESS_FOO, STORAGE_FOO
+    assert state_normal.get_storage(
+        ADDRESS_FOO, STORAGE_FOO
     ) == optimized_state.get_storage(state_optimized, ADDRESS_FOO, STORAGE_FOO)
     assert state.state_root(state_normal) == optimized_state.state_root(
         state_optimized
diff --git a/tests/json_loader/test_tools_new_fork.py b/tests/json_loader/test_tools_new_fork.py
index 6cc7b584959..45e76591af5 100644
--- a/tests/json_loader/test_tools_new_fork.py
+++ b/tests/json_loader/test_tools_new_fork.py
@@ -75,25 +75,29 @@ def test_end_to_end(template_fork: str) -> None:
             source = f.read()
 
             expected = [
-                "BLOB_TARGET_GAS_PER_BLOCK = U64(199)",
-                "GAS_PER_BLOB = U64(1)",
-                "BLOB_MIN_GASPRICE = Uint(2)",
-                "BLOB_BASE_FEE_UPDATE_FRACTION = Uint(750)",
-                "BLOB_SCHEDULE_TARGET = U64(88)",
-                "BLOB_SCHEDULE_MAX = U64(77)",
+                "BLOB_TARGET_GAS_PER_BLOCK: Final[U64] = U64(199)",
+                "PER_BLOB: Final[U64] = U64(1)",
+                "BLOB_MIN_GASPRICE: Final[Uint] = Uint(2)",
+                "BLOB_BASE_FEE_UPDATE_FRACTION: Final[Uint] = Uint(750)",
+                "BLOB_SCHEDULE_TARGET: Final[U64] = U64(88)",
+                "BLOB_SCHEDULE_MAX: Final[U64] = U64(77)",
             ]
 
             for needle in expected:
                 assert needle in source
 
         with (fork_dir / "fork.py").open("r") as f:
-            assert "MAX_BLOB_GAS_PER_BLOCK = U64(99)" in f.read()
-
-        with (fork_dir / "trie.py").open("r") as f:
-            assert (
-                "from ethereum.forks.paris import trie as previous_trie"
-                in f.read()
-            )
+            assert "MAX_BLOB_GAS_PER_BLOCK: Final[U64] = U64(99)" in f.read()
+
+        # TODO: Remove this condition once trie.py is removed from all
+        # forks (i.e. fork-agnostic Trie is ported to pre-amsterdam forks).
+        template_has_trie = (
+            Path("src/ethereum/forks") / template_fork / "trie.py"
+        ).exists()
+        if template_has_trie:
+            assert (fork_dir / "trie.py").exists()
+        else:
+            assert not (fork_dir / "trie.py").exists()
 
 
 def has_module_docstring(file_path: Path) -> bool:
diff --git a/tests/monad_eight/reserve_balance/helpers.py b/tests/monad_eight/reserve_balance/helpers.py
index e994bfd5b71..4e3b716267b 100644
--- a/tests/monad_eight/reserve_balance/helpers.py
+++ b/tests/monad_eight/reserve_balance/helpers.py
@@ -17,10 +17,10 @@ def generous_gas(fork: Fork) -> int:
     """
     constant = 100_000
     gas_costs = fork.gas_costs()
-    sstore_cost = gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD
-    deploy_cost = gas_costs.GAS_CODE_DEPOSIT_PER_BYTE * len(Op.STOP)
-    access_cost = gas_costs.GAS_COLD_ACCOUNT_ACCESS
-    selfdestruct_cost = gas_costs.GAS_SELF_DESTRUCT
+    sstore_cost = gas_costs.STORAGE_SET + gas_costs.COLD_STORAGE_ACCESS
+    deploy_cost = gas_costs.CODE_DEPOSIT_PER_BYTE * len(Op.STOP)
+    access_cost = gas_costs.COLD_ACCOUNT_ACCESS
+    selfdestruct_cost = gas_costs.OPCODE_SELFDESTRUCT_BASE
     return (
         constant
         + sstore_cost
diff --git a/tests/monad_eight/reserve_balance/test_multi_block.py b/tests/monad_eight/reserve_balance/test_multi_block.py
index f8753c4e186..bf749b1a682 100644
--- a/tests/monad_eight/reserve_balance/test_multi_block.py
+++ b/tests/monad_eight/reserve_balance/test_multi_block.py
@@ -77,8 +77,7 @@ def test_exception_rule(
     """
     # gas spend by transactions send in setup blocks
     prepare_tx_gas = (
-        fork.gas_costs().GAS_TX_BASE
-        + fork.gas_costs().GAS_AUTH_PER_EMPTY_ACCOUNT * 2
+        fork.gas_costs().TX_BASE + fork.gas_costs().AUTH_PER_EMPTY_ACCOUNT * 2
     )
     # if any of the transactions in setup blocks are sent by main sender we
     # need to credit them extra
@@ -210,8 +209,7 @@ def test_exception_rule_invalid_block(
     """
     # gas spend by transactions send in setup blocks
     prepare_tx_gas = (
-        fork.gas_costs().GAS_TX_BASE
-        + fork.gas_costs().GAS_AUTH_PER_EMPTY_ACCOUNT * 2
+        fork.gas_costs().TX_BASE + fork.gas_costs().AUTH_PER_EMPTY_ACCOUNT * 2
     )
     # if any of the transactions in setup blocks are sent by main sender we
     # need to credit them extra
@@ -280,7 +278,7 @@ def test_exception_rule_invalid_block(
         if nblock == 0 and invalid_block:
             txs.append(
                 Transaction(
-                    gas_limit=fork.gas_costs().GAS_TX_BASE - 123,
+                    gas_limit=fork.gas_costs().TX_BASE - 123,
                     to=Address(0x7676),
                     sender=pre.fund_eoa(),
                     error=TransactionException.INTRINSIC_GAS_TOO_LOW
@@ -361,8 +359,7 @@ def test_credit(
     """
     # gas spend by transactions send in setup blocks
     prepare_tx_gas = (
-        fork.gas_costs().GAS_TX_BASE
-        + fork.gas_costs().GAS_AUTH_PER_EMPTY_ACCOUNT * 2
+        fork.gas_costs().TX_BASE + fork.gas_costs().AUTH_PER_EMPTY_ACCOUNT * 2
     )
     # if any of the transactions in setup blocks are sent by main sender we
     # need to credit them extra
@@ -503,7 +500,7 @@ def test_credit_with_value(
     Uses 4 blocks so send in block 0 falls outside the k=3 window,
     making the emptying exception reachable for undelegated senders.
     """
-    prepare_tx_gas = fork.gas_costs().GAS_TX_BASE
+    prepare_tx_gas = fork.gas_costs().TX_BASE
     prepare_tx_fee = GAS_PRICE * prepare_tx_gas
     initial_balance = Spec.RESERVE_BALANCE + send_value + prepare_tx_fee
 
@@ -687,7 +684,7 @@ def test_valid_tx_after_invalid(
     Test where a tx follows one which violated reserve balance.
     """
     # gas spend by transactions send in setup blocks
-    prepare_tx_gas = fork.gas_costs().GAS_TX_BASE
+    prepare_tx_gas = fork.gas_costs().TX_BASE
     prepare_tx_fee = GAS_PRICE * prepare_tx_gas
     balance += prepare_tx_fee
     test_sender = pre.fund_eoa(balance, delegation=Address(0x1111))
diff --git a/tests/monad_eight/reserve_balance/test_transfers.py b/tests/monad_eight/reserve_balance/test_transfers.py
index 571b29edd7f..5a06d5b19ce 100644
--- a/tests/monad_eight/reserve_balance/test_transfers.py
+++ b/tests/monad_eight/reserve_balance/test_transfers.py
@@ -405,7 +405,7 @@ def test_delegated_eoa_auth_list(
     contract = Op.SSTORE(slot_code_worked, value_code_worked) + Op.STOP
     contract_address = pre.deploy_contract(contract)
 
-    auth_gas = len(delegation_targets) * Spec7702.GAS_AUTH_PER_EMPTY_ACCOUNT
+    auth_gas = len(delegation_targets) * Spec7702.AUTH_PER_EMPTY_ACCOUNT
     tx_1 = Transaction(
         gas_limit=generous_gas(fork) + auth_gas,
         to=contract_address,
@@ -2000,7 +2000,7 @@ def test_many_accounts_balance_change(
             # Warmed using access lists for cheapest call
             delegated_address_warm=True,
         ).gas_cost(fork)
-        + gas_costs.GAS_TX_ACCESS_LIST_ADDRESS
+        + gas_costs.TX_ACCESS_LIST_ADDRESS
     )
     gas_limit = fork.transaction_gas_limit_cap()
     assert gas_limit is not None
diff --git a/tests/monad_nine/mip3_linear_memory/helpers.py b/tests/monad_nine/mip3_linear_memory/helpers.py
index 14a6864175c..daa786b8326 100644
--- a/tests/monad_nine/mip3_linear_memory/helpers.py
+++ b/tests/monad_nine/mip3_linear_memory/helpers.py
@@ -124,9 +124,9 @@ def generous_gas(fork: Fork) -> int:
     """
     constant = 100_000
     gas_costs = fork.gas_costs()
-    sstore_cost = gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD
-    deploy_cost = gas_costs.GAS_CODE_DEPOSIT_PER_BYTE * len(Op.STOP)
-    access_cost = gas_costs.GAS_COLD_ACCOUNT_ACCESS
+    sstore_cost = gas_costs.STORAGE_SET + gas_costs.COLD_STORAGE_ACCESS
+    deploy_cost = gas_costs.CODE_DEPOSIT_PER_BYTE * len(Op.STOP)
+    access_cost = gas_costs.COLD_ACCOUNT_ACCESS
     # Assume up to 5 memory expansions to the max size
     linear_memory_expansion_cost = 5 * fork.memory_expansion_gas_calculator()(
         new_bytes=Spec.MAX_TX_MEMORY_USAGE
@@ -134,7 +134,10 @@ def generous_gas(fork: Fork) -> int:
     # Account for per-word operation costs, assume 5 times up to max
     max_words = 5 * Spec.MAX_TX_MEMORY_USAGE // 32
     per_word_op_cost = (
-        max(gas_costs.GAS_COPY, gas_costs.GAS_KECCAK256_PER_WORD) * max_words
+        max(
+            gas_costs.OPCODE_COPY_PER_WORD, gas_costs.OPCODE_KECCAK256_PER_WORD
+        )
+        * max_words
     )
     return (
         constant
diff --git a/tests/monad_nine/mip3_linear_memory/test_gas_cost.py b/tests/monad_nine/mip3_linear_memory/test_gas_cost.py
index 4a429c8904e..ac151debace 100644
--- a/tests/monad_nine/mip3_linear_memory/test_gas_cost.py
+++ b/tests/monad_nine/mip3_linear_memory/test_gas_cost.py
@@ -54,7 +54,9 @@ def test_cost_non_quadratic(
     contract_address = pre.deploy_contract(contract)
 
     tx = Transaction(
-        gas_limit=fork.gas_costs().GAS_MEMORY * Spec.MAX_TX_MEMORY_USAGE // 32
+        gas_limit=fork.gas_costs().MEMORY_PER_WORD
+        * Spec.MAX_TX_MEMORY_USAGE
+        // 32
         + 100_000,
         to=contract_address,
         sender=pre.fund_eoa(),
@@ -82,24 +84,24 @@ def memory_copy_opcodes(
     gas_costs = fork.gas_costs()
 
     memory_opcodes = {
-        Op.CALLDATACOPY: gas_costs.GAS_VERY_LOW,
-        Op.CODECOPY: gas_costs.GAS_VERY_LOW,
-        Op.EXTCODECOPY: gas_costs.GAS_WARM_ACCOUNT_ACCESS,
-        Op.MCOPY: gas_costs.GAS_VERY_LOW,
-        Op.SHA3: gas_costs.GAS_KECCAK256,
-        Op.LOG0: gas_costs.GAS_LOG,
-        Op.LOG1: gas_costs.GAS_LOG + gas_costs.GAS_LOG_TOPIC,
-        Op.LOG2: gas_costs.GAS_LOG + 2 * gas_costs.GAS_LOG_TOPIC,
-        Op.LOG3: gas_costs.GAS_LOG + 3 * gas_costs.GAS_LOG_TOPIC,
-        Op.LOG4: gas_costs.GAS_LOG + 4 * gas_costs.GAS_LOG_TOPIC,
+        Op.CALLDATACOPY: gas_costs.VERY_LOW,
+        Op.CODECOPY: gas_costs.VERY_LOW,
+        Op.EXTCODECOPY: gas_costs.WARM_ACCESS,
+        Op.MCOPY: gas_costs.VERY_LOW,
+        Op.SHA3: gas_costs.OPCODE_KECCAK256_BASE,
+        Op.LOG0: gas_costs.OPCODE_LOG_BASE,
+        Op.LOG1: gas_costs.OPCODE_LOG_BASE + gas_costs.OPCODE_LOG_TOPIC,
+        Op.LOG2: gas_costs.OPCODE_LOG_BASE + 2 * gas_costs.OPCODE_LOG_TOPIC,
+        Op.LOG3: gas_costs.OPCODE_LOG_BASE + 3 * gas_costs.OPCODE_LOG_TOPIC,
+        Op.LOG4: gas_costs.OPCODE_LOG_BASE + 4 * gas_costs.OPCODE_LOG_TOPIC,
         Op.RETURN: 0,
         Op.REVERT: 0,
-        Op.CREATE: gas_costs.GAS_CREATE,
-        Op.CREATE2: gas_costs.GAS_CREATE,
-        Op.CALL: gas_costs.GAS_WARM_ACCOUNT_ACCESS,
-        Op.DELEGATECALL: gas_costs.GAS_WARM_ACCOUNT_ACCESS,
-        Op.STATICCALL: gas_costs.GAS_WARM_ACCOUNT_ACCESS,
-        Op.CALLCODE: gas_costs.GAS_WARM_ACCOUNT_ACCESS,
+        Op.CREATE: gas_costs.OPCODE_CREATE_BASE,
+        Op.CREATE2: gas_costs.OPCODE_CREATE_BASE,
+        Op.CALL: gas_costs.WARM_ACCESS,
+        Op.DELEGATECALL: gas_costs.WARM_ACCESS,
+        Op.STATICCALL: gas_costs.WARM_ACCESS,
+        Op.CALLCODE: gas_costs.WARM_ACCESS,
         # RETURNDATACOPY tested separately in test_returndatacopy_gas_cost
     }
 
@@ -119,9 +121,9 @@ def memory_stack_opcodes(
     gas_costs = fork.gas_costs()
 
     memory_opcodes = {
-        Op.MLOAD: gas_costs.GAS_VERY_LOW,
-        Op.MSTORE: gas_costs.GAS_VERY_LOW,
-        Op.MSTORE8: gas_costs.GAS_VERY_LOW,
+        Op.MLOAD: gas_costs.VERY_LOW,
+        Op.MSTORE: gas_costs.VERY_LOW,
+        Op.MSTORE8: gas_costs.VERY_LOW,
     }
 
     for opcode, warm_gas in memory_opcodes.items():
@@ -223,21 +225,23 @@ def test_memory_copy_opcodes(
         Op.EXTCODECOPY,
         Op.MCOPY,
     ):
-        dynamic_gas_cost = fork.gas_costs().GAS_COPY * ((size + 31) // 32)
+        dynamic_gas_cost = fork.gas_costs().OPCODE_COPY_PER_WORD * (
+            (size + 31) // 32
+        )
     if opcode == Op.SHA3:
-        dynamic_gas_cost = fork.gas_costs().GAS_KECCAK256_PER_WORD * (
+        dynamic_gas_cost = fork.gas_costs().OPCODE_KECCAK256_PER_WORD * (
             (size + 31) // 32
         )
     if opcode in (Op.LOG0, Op.LOG1, Op.LOG2, Op.LOG3, Op.LOG4):
-        dynamic_gas_cost = fork.gas_costs().GAS_LOG_DATA_PER_BYTE * size
+        dynamic_gas_cost = fork.gas_costs().OPCODE_LOG_DATA_PER_BYTE * size
     if opcode in (Op.RETURN, Op.REVERT):
         dynamic_gas_cost = 0
     if opcode in (Op.CREATE, Op.CREATE2):
-        init_code_cost = fork.gas_costs().GAS_CODE_INIT_PER_WORD * (
+        init_code_cost = fork.gas_costs().CODE_INIT_PER_WORD * (
             (size + 31) // 32
         )
         if opcode == Op.CREATE2:
-            hash_cost = fork.gas_costs().GAS_KECCAK256_PER_WORD * (
+            hash_cost = fork.gas_costs().OPCODE_KECCAK256_PER_WORD * (
                 (size + 31) // 32
             )
             dynamic_gas_cost = init_code_cost + hash_cost
@@ -347,8 +351,8 @@ def test_returndatacopy_gas_cost(
         new_bytes=size,
         previous_bytes=len(initial_memory),
     )
-    dynamic_gas_cost = gas_costs.GAS_COPY * ((size + 31) // 32)
-    base_gas = gas_costs.GAS_VERY_LOW
+    dynamic_gas_cost = gas_costs.OPCODE_COPY_PER_WORD * ((size + 31) // 32)
+    base_gas = gas_costs.VERY_LOW
 
     returner_address = pre.deploy_contract(Op.RETURN(0, size))
 
@@ -430,7 +434,7 @@ def test_consecutive_expansions(
     - Multiple small expansions equal one large expansion
     """
     gas_costs = fork.gas_costs()
-    base_gas_per_op = gas_costs.GAS_VERY_LOW
+    base_gas_per_op = gas_costs.VERY_LOW
 
     setup_code = Bytecode()
     for offset in reversed(offsets):
diff --git a/tests/monad_nine/mip3_linear_memory/test_oom.py b/tests/monad_nine/mip3_linear_memory/test_oom.py
index edfb0b26258..36a1fe3c55a 100644
--- a/tests/monad_nine/mip3_linear_memory/test_oom.py
+++ b/tests/monad_nine/mip3_linear_memory/test_oom.py
@@ -1148,10 +1148,10 @@ def test_charge_gas_before_oom_check(
         call_value = 1
         inner_offset = 32
         inner_gas = (
-            7 * gas_costs.GAS_VERY_LOW
-            + gas_costs.GAS_WARM_ACCOUNT_ACCESS
-            + gas_costs.GAS_CALL_VALUE
-            + gas_costs.GAS_NEW_ACCOUNT
+            7 * gas_costs.VERY_LOW
+            + gas_costs.WARM_ACCESS
+            + gas_costs.CALL_VALUE
+            + gas_costs.NEW_ACCOUNT
             + fork.memory_expansion_gas_calculator()(new_bytes=inner_offset)
             - 1
         )
@@ -1161,9 +1161,9 @@ def test_charge_gas_before_oom_check(
         call_value = 1 if trigger_oog else 0
         inner_offset = 32
         inner_gas = (
-            7 * gas_costs.GAS_VERY_LOW
-            + gas_costs.GAS_WARM_ACCOUNT_ACCESS
-            + gas_costs.GAS_CALL_VALUE
+            7 * gas_costs.VERY_LOW
+            + gas_costs.WARM_ACCESS
+            + gas_costs.CALL_VALUE
             + fork.memory_expansion_gas_calculator()(new_bytes=inner_offset)
             - 1
         )
@@ -1173,8 +1173,8 @@ def test_charge_gas_before_oom_check(
         call_value = 0
         inner_offset = 32
         inner_gas = (
-            7 * gas_costs.GAS_VERY_LOW
-            + gas_costs.GAS_COLD_ACCOUNT_ACCESS
+            7 * gas_costs.VERY_LOW
+            + gas_costs.COLD_ACCOUNT_ACCESS
             + fork.memory_expansion_gas_calculator()(new_bytes=inner_offset)
             - 1
         )
@@ -1185,8 +1185,8 @@ def test_charge_gas_before_oom_check(
         inner_offset = 1024 * 1024 if trigger_oog else 32
         inner_gas = (
             7
-            + gas_costs.GAS_VERY_LOW
-            + gas_costs.GAS_WARM_ACCOUNT_ACCESS
+            + gas_costs.VERY_LOW
+            + gas_costs.WARM_ACCESS
             + fork.memory_expansion_gas_calculator()(new_bytes=1024 * 1024)
             - 1
         )
@@ -1223,9 +1223,9 @@ def test_charge_gas_before_oom_check(
             slot_inner_gas_consumed,
             Op.LT(
                 inner_gas
-                + gas_costs.GAS_WARM_ACCOUNT_ACCESS
-                + gas_costs.GAS_VERY_LOW * 8
-                + gas_costs.GAS_COPY,
+                + gas_costs.WARM_ACCESS
+                + gas_costs.VERY_LOW * 8
+                + gas_costs.OPCODE_COPY_PER_WORD,
                 Op.SUB(Op.MLOAD(mem_gas), Op.GAS),
             ),
         )
diff --git a/tests/monad_nine/mip4_checkreservebalance/helpers.py b/tests/monad_nine/mip4_checkreservebalance/helpers.py
index 927f0bfdac2..9782a69fae1 100644
--- a/tests/monad_nine/mip4_checkreservebalance/helpers.py
+++ b/tests/monad_nine/mip4_checkreservebalance/helpers.py
@@ -40,11 +40,13 @@ def call_dipped_into_reserve() -> Bytecode:
 def generous_gas(fork: Fork) -> int:
     """Return generous parametrized gas to always be enough."""
     constant = 100_000
-    gas_costs = fork.gas_costs()
-    sstore_cost = gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD
-    deploy_cost = gas_costs.GAS_CODE_DEPOSIT_PER_BYTE * len(Op.STOP)
-    access_cost = gas_costs.GAS_COLD_ACCOUNT_ACCESS
-    selfdestruct_cost = gas_costs.GAS_SELF_DESTRUCT
+    # Transition forks don't expose gas_costs directly; resolve to the
+    # post-transition fork (no-op for regular forks).
+    gas_costs = fork.transitions_to().gas_costs()
+    sstore_cost = gas_costs.STORAGE_SET + gas_costs.COLD_STORAGE_ACCESS
+    deploy_cost = gas_costs.CODE_DEPOSIT_PER_BYTE * len(Op.STOP)
+    access_cost = gas_costs.COLD_ACCOUNT_ACCESS
+    selfdestruct_cost = gas_costs.OPCODE_SELFDESTRUCT_BASE
     return (
         constant
         + 5 * sstore_cost
diff --git a/tests/monad_nine/mip4_checkreservebalance/test_multi_block.py b/tests/monad_nine/mip4_checkreservebalance/test_multi_block.py
index 7e3c40cd367..e4d3e578a3a 100644
--- a/tests/monad_nine/mip4_checkreservebalance/test_multi_block.py
+++ b/tests/monad_nine/mip4_checkreservebalance/test_multi_block.py
@@ -80,8 +80,7 @@ def test_exception_rule(
     refill_call = refill_factory()
     # gas spend by transactions send in setup blocks
     prepare_tx_gas = (
-        fork.gas_costs().GAS_TX_BASE
-        + fork.gas_costs().GAS_AUTH_PER_EMPTY_ACCOUNT * 2
+        fork.gas_costs().TX_BASE + fork.gas_costs().AUTH_PER_EMPTY_ACCOUNT * 2
     )
     # if any of the transactions in setup blocks are sent by main sender we
     # need to credit them extra
diff --git a/tests/monad_nine/mip4_checkreservebalance/test_precompile_call.py b/tests/monad_nine/mip4_checkreservebalance/test_precompile_call.py
index df185a57049..cb56a262ae4 100644
--- a/tests/monad_nine/mip4_checkreservebalance/test_precompile_call.py
+++ b/tests/monad_nine/mip4_checkreservebalance/test_precompile_call.py
@@ -342,7 +342,7 @@ def test_gas(
     """
     Test that precompile consumes expected gas.
     """
-    gas_warm_sload = fork.gas_costs().GAS_WARM_SLOAD
+    gas_warm_sload = fork.gas_costs().WARM_SLOAD
     gas = gas_warm_sload if enough_gas else gas_warm_sload - 1
 
     contract = (
diff --git a/tests/monad_nine/mip4_checkreservebalance/test_transfers.py b/tests/monad_nine/mip4_checkreservebalance/test_transfers.py
index acfdd111f61..ec43d75dd91 100644
--- a/tests/monad_nine/mip4_checkreservebalance/test_transfers.py
+++ b/tests/monad_nine/mip4_checkreservebalance/test_transfers.py
@@ -1743,7 +1743,7 @@ def test_many_accounts_balance_change(
             # Warmed using access lists for cheapest call
             delegated_address_warm=True,
         ).gas_cost(fork)
-        + gas_costs.GAS_TX_ACCESS_LIST_ADDRESS
+        + gas_costs.TX_ACCESS_LIST_ADDRESS
     )
     gas_limit = fork.transaction_gas_limit_cap()
     assert gas_limit is not None
diff --git a/tests/osaka/eip7594_peerdas/test_get_blobs.py b/tests/osaka/eip7594_peerdas/test_get_blobs.py
index 0a6d2052ff9..df8a7c61245 100644
--- a/tests/osaka/eip7594_peerdas/test_get_blobs.py
+++ b/tests/osaka/eip7594_peerdas/test_get_blobs.py
@@ -26,6 +26,8 @@
 
 from .spec import ref_spec_7594
 
+pytestmark = pytest.mark.not_valid_for("MONAD_EIGHT", subsequent_forks=True)
+
 REFERENCE_SPEC_GIT_PATH = ref_spec_7594.git_path
 REFERENCE_SPEC_VERSION = ref_spec_7594.version
 
diff --git a/tests/osaka/eip7594_peerdas/test_max_blob_per_tx.py b/tests/osaka/eip7594_peerdas/test_max_blob_per_tx.py
index 307d5450dd3..c183debdfd8 100644
--- a/tests/osaka/eip7594_peerdas/test_max_blob_per_tx.py
+++ b/tests/osaka/eip7594_peerdas/test_max_blob_per_tx.py
@@ -17,16 +17,17 @@
     StateTestFiller,
     Transaction,
     TransactionException,
+    TransitionFork,
     add_kzg_version,
 )
 
 from .spec import Spec, ref_spec_7594
 
+pytestmark = pytest.mark.not_valid_for("MONAD_EIGHT", subsequent_forks=True)
+
 REFERENCE_SPEC_GIT_PATH = ref_spec_7594.git_path
 REFERENCE_SPEC_VERSION = ref_spec_7594.version
 
-FORK_TIMESTAMP = 15_000
-
 
 @pytest.fixture
 def env() -> Environment:
@@ -47,9 +48,12 @@ def destination(pre: Alloc) -> Address:
 
 
 @pytest.fixture
-def blob_gas_price(fork: Fork) -> int:
+def blob_gas_price(fork: Fork | TransitionFork) -> int:
     """Blob gas price for transactions."""
-    return fork.min_base_fee_per_blob_gas()
+    return max(
+        fork.transitions_from().min_base_fee_per_blob_gas(),
+        fork.transitions_to().min_base_fee_per_blob_gas(),
+    )
 
 
 @pytest.fixture
@@ -141,14 +145,14 @@ def test_invalid_max_blobs_per_tx(
 @pytest.mark.parametrize_by_fork(
     "blob_count",
     lambda fork: [
-        fork.max_blobs_per_tx(timestamp=FORK_TIMESTAMP) + 1,
-        fork.max_blobs_per_block(timestamp=FORK_TIMESTAMP) + 1,
+        fork.transitions_to().max_blobs_per_tx() + 1,
+        fork.transitions_to().max_blobs_per_block() + 1,
     ],
 )
 @pytest.mark.valid_at_transition_to("Osaka")
 @pytest.mark.exception_test
 def test_max_blobs_per_tx_fork_transition(
-    fork: Fork,
+    fork: TransitionFork,
     blockchain_test: BlockchainTestFiller,
     env: Environment,
     pre: Alloc,
@@ -158,29 +162,28 @@ def test_max_blobs_per_tx_fork_transition(
     """Test `MAX_BLOBS_PER_TX` limit enforcement across fork transition."""
     expected_exception = (
         TransactionException.TYPE_3_TX_MAX_BLOB_GAS_ALLOWANCE_EXCEEDED
-        if blob_count > fork.max_blobs_per_block(timestamp=FORK_TIMESTAMP)
+        if blob_count > fork.transitions_to().max_blobs_per_block()
         else TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED
     )
     pre_fork_block = Block(
         txs=[
             tx
-            if blob_count
-            < fork.max_blobs_per_block(timestamp=FORK_TIMESTAMP - 1)
+            if blob_count < fork.transitions_from().max_blobs_per_block()
             else tx.with_error(expected_exception)
         ],
-        timestamp=FORK_TIMESTAMP - 1,
+        timestamp=fork.at_timestamp - 1,
         exception=None
-        if blob_count < fork.max_blobs_per_block(timestamp=FORK_TIMESTAMP - 1)
+        if blob_count < fork.transitions_from().max_blobs_per_block()
         else [expected_exception],
     )
     fork_block = Block(
         txs=[tx.with_nonce(1).with_error(expected_exception)],
-        timestamp=FORK_TIMESTAMP,
+        timestamp=fork.at_timestamp,
         exception=[expected_exception],
     )
     post_fork_block = Block(
         txs=[tx.with_nonce(1).with_error(expected_exception)],
-        timestamp=FORK_TIMESTAMP + 1,
+        timestamp=fork.at_timestamp + 1,
         exception=[expected_exception],
     )
     blockchain_test(
diff --git a/tests/osaka/eip7825_transaction_gas_limit_cap/test_tx_gas_limit.py b/tests/osaka/eip7825_transaction_gas_limit_cap/test_tx_gas_limit.py
index 713a3bc2457..98e665bf6fd 100644
--- a/tests/osaka/eip7825_transaction_gas_limit_cap/test_tx_gas_limit.py
+++ b/tests/osaka/eip7825_transaction_gas_limit_cap/test_tx_gas_limit.py
@@ -331,7 +331,7 @@ def test_maximum_gas_refund(
 def total_cost_floor_per_token(fork: Fork) -> int:
     """Total cost floor per token."""
     gas_costs = fork.gas_costs()
-    return gas_costs.GAS_TX_DATA_TOKEN_FLOOR
+    return gas_costs.TX_DATA_TOKEN_FLOOR
 
 
 @pytest.mark.xdist_group(name="bigmem")
@@ -347,6 +347,7 @@ def total_cost_floor_per_token(fork: Fork) -> int:
 # Osaka originally, but Monad introduces tx gas limit cap differently
 @pytest.mark.valid_from("MONAD_EIGHT")
 @pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_tx_gas_limit_cap_full_calldata(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -686,7 +687,7 @@ def intrinsic_cost_for_auth_list_length(auth_count: int) -> int:
     # EIP-7702 authorization transaction cost:
     # 21000 + 16 * non-zero calldata bytes + 4 * zero calldata bytes + 1900 *
     # access list storage key count + 2400 * access list address count + access
-    # list data cost + GAS_AUTH_PER_EMPTY_ACCOUNT_COST * authorization list
+    # list data cost + AUTH_PER_EMPTY_ACCOUNT_COST * authorization list
     # length
     #
     # There is no calldata and no storage keys in this test case.
diff --git a/tests/osaka/eip7825_transaction_gas_limit_cap/test_tx_gas_limit_transition_fork.py b/tests/osaka/eip7825_transaction_gas_limit_cap/test_tx_gas_limit_transition_fork.py
index 243ce4640ee..091adf0acb2 100644
--- a/tests/osaka/eip7825_transaction_gas_limit_cap/test_tx_gas_limit_transition_fork.py
+++ b/tests/osaka/eip7825_transaction_gas_limit_cap/test_tx_gas_limit_transition_fork.py
@@ -12,10 +12,10 @@
     Block,
     BlockchainTestFiller,
     EIPChecklist,
-    Fork,
     Op,
     Transaction,
     TransactionException,
+    TransitionFork,
 )
 
 from .spec import ref_spec_7825
@@ -39,7 +39,7 @@
 def test_transaction_gas_limit_cap_at_transition(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
-    fork: Fork,
+    fork: TransitionFork,
     transaction_at_cap: bool,
 ) -> None:
     """
@@ -54,7 +54,7 @@ def test_transaction_gas_limit_cap_at_transition(
     )
 
     # Get the gas limit cap at fork activation
-    tx_gas_cap = fork.transaction_gas_limit_cap(timestamp=15_000)
+    tx_gas_cap = fork.fork_at(timestamp=15_000).transaction_gas_limit_cap()
     assert tx_gas_cap is not None, (
         "Gas limit cap should not be None after fork activation"
     )
diff --git a/tests/osaka/eip7883_modexp_gas_increase/test_modexp_thresholds.py b/tests/osaka/eip7883_modexp_gas_increase/test_modexp_thresholds.py
index 0ff27f5755d..f439f9f983e 100644
--- a/tests/osaka/eip7883_modexp_gas_increase/test_modexp_thresholds.py
+++ b/tests/osaka/eip7883_modexp_gas_increase/test_modexp_thresholds.py
@@ -392,7 +392,7 @@ def test_modexp_gas_usage_contract_wrapper(
 @EIPChecklist.Precompile.Test.CallContexts.TxEntry()
 @EIPChecklist.Precompile.Test.ValueTransfer.NoFee()
 @pytest.mark.valid_from("Berlin")
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_modexp_used_in_transaction_entry_points(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -786,7 +786,7 @@ def create_modexp_variable_gas_test_cases() -> Generator:
 @EIPChecklist.Precompile.Test.InputLengths.Zero()
 @EIPChecklist.GasCostChanges.Test.GasUpdatesMeasurement()
 @pytest.mark.valid_from("Berlin")
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_modexp_variable_gas_cost(
     state_test: StateTestFiller,
     precompile_gas: int,
diff --git a/tests/osaka/eip7883_modexp_gas_increase/test_modexp_thresholds_transition.py b/tests/osaka/eip7883_modexp_gas_increase/test_modexp_thresholds_transition.py
index f0e87e4cbc1..2ef88752bc8 100644
--- a/tests/osaka/eip7883_modexp_gas_increase/test_modexp_thresholds_transition.py
+++ b/tests/osaka/eip7883_modexp_gas_increase/test_modexp_thresholds_transition.py
@@ -8,10 +8,13 @@
     Alloc,
     Block,
     BlockchainTestFiller,
+    Bytecode,
     EIPChecklist,
+    Environment,
     Fork,
     Op,
     Transaction,
+    TransitionFork,
     keccak256,
 )
 
@@ -39,10 +42,10 @@
 def test_modexp_fork_transition(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
-    fork: Fork,
+    env: Environment,
+    fork: TransitionFork,
     gas_old: int,
     gas_new: int,
-    tx_gas_limit: int,
     modexp_input: ModExpInput,
     modexp_expected: bytes,
 ) -> None:
@@ -50,45 +53,56 @@ def test_modexp_fork_transition(
     Test ModExp gas cost transition from EIP-7883 before and after the Osaka
     hard fork.
     """
-    call_code = Op.CALL(
-        address=Spec.MODEXP_ADDRESS,
-        args_size=Op.CALLDATASIZE,
-    )
 
-    extra_gas = (
-        Op.CALL(
+    def generate_code(fork: Fork) -> Bytecode:
+        call_code = Op.CALL(
             address=Spec.MODEXP_ADDRESS,
             args_size=Op.CALLDATASIZE,
-            address_warm=True,
-        ).gas_cost(fork)
-        + Op.GAS.gas_cost(fork)  # second GAS in measurement
-    )
-    code = (
-        Op.CALLDATACOPY(dest_offset=0, offset=0, size=Op.CALLDATASIZE)
-        + Op.GAS  # [gas_start]
-        + call_code  # [gas_start, call_result]
-        + Op.GAS  # [gas_start, call_result, gas_end]
-        + Op.SWAP1  # [gas_start, gas_end, call_result]
-        + Op.POP  # [gas_start, gas_end]
-        + Op.PUSH2[extra_gas]  # [gas_start, gas_end, extra_gas]
-        + Op.ADD  # [gas_start, gas_end + extra_gas]
-        + Op.SWAP1  # [gas_end + extra_gas, gas_start]
-        + Op.SUB  # [gas_start - (gas_end + extra_gas)]
-        + Op.TIMESTAMP  # [gas_start - (gas_end + extra_gas), TIMESTAMP]
-        + Op.SSTORE  # []
-    )
+        )
 
-    # Verification the precompile call result
-    code += Op.RETURNDATACOPY(
-        dest_offset=0, offset=0, size=Op.RETURNDATASIZE()
-    ) + Op.SSTORE(
-        Op.AND(Op.TIMESTAMP, 0xFF),
-        Op.SHA3(0, Op.RETURNDATASIZE()),
-    )
+        extra_gas = (
+            Op.CALL(
+                address=Spec.MODEXP_ADDRESS,
+                args_size=Op.CALLDATASIZE,
+                address_warm=True,
+            ).gas_cost(fork.transitions_to())
+            + Op.GAS.gas_cost(
+                fork.transitions_to()
+            )  # second GAS in measurement
+        )
+        code = (
+            Op.CALLDATACOPY(dest_offset=0, offset=0, size=Op.CALLDATASIZE)
+            + Op.GAS  # [gas_start]
+            + call_code  # [gas_start, call_result]
+            + Op.GAS  # [gas_start, call_result, gas_end]
+            + Op.SWAP1  # [gas_start, gas_end, call_result]
+            + Op.POP  # [gas_start, gas_end]
+            + Op.PUSH2[extra_gas]  # [gas_start, gas_end, extra_gas]
+            + Op.ADD  # [gas_start, gas_end + extra_gas]
+            + Op.SWAP1  # [gas_end + extra_gas, gas_start]
+            + Op.SUB  # [gas_start - (gas_end + extra_gas)]
+            + Op.TIMESTAMP  # [gas_start - (gas_end + extra_gas), TIMESTAMP]
+            + Op.SSTORE  # []
+        )
+
+        # Verification the precompile call result
+        code += Op.RETURNDATACOPY(
+            dest_offset=0, offset=0, size=Op.RETURNDATASIZE()
+        ) + Op.SSTORE(
+            Op.AND(Op.TIMESTAMP, 0xFF),
+            Op.SHA3(0, Op.RETURNDATASIZE()),
+        )
+        return code
+
+    def calc_tx_gas_limit(fork: Fork) -> int:
+        tx_gas_limit_cap = fork.transaction_gas_limit_cap() or env.gas_limit
+        return tx_gas_limit_cap
 
-    senders = [pre.fund_eoa() for _ in range(3)]
-    contracts = [pre.deploy_contract(code) for _ in range(3)]
     timestamps = [14_999, 15_000, 15_001]
+    contracts = [
+        pre.deploy_contract(generate_code(fork.fork_at(timestamp=t)))
+        for t in timestamps
+    ]
     gas_values = [gas_old, gas_new, gas_new]
 
     blocks = [
@@ -98,14 +112,12 @@ def test_modexp_fork_transition(
                 Transaction(
                     to=contract,
                     data=modexp_input,
-                    sender=sender,
-                    gas_limit=tx_gas_limit,
+                    sender=pre.fund_eoa(),
+                    gas_limit=calc_tx_gas_limit(fork.fork_at(timestamp=ts)),
                 )
             ],
         )
-        for ts, contract, sender in zip(
-            timestamps, contracts, senders, strict=False
-        )
+        for ts, contract in zip(timestamps, contracts, strict=False)
     ]
 
     post = {
diff --git a/tests/osaka/eip7918_blob_reserve_price/conftest.py b/tests/osaka/eip7918_blob_reserve_price/conftest.py
index b1e0be81c27..cad0490ba9a 100644
--- a/tests/osaka/eip7918_blob_reserve_price/conftest.py
+++ b/tests/osaka/eip7918_blob_reserve_price/conftest.py
@@ -13,19 +13,19 @@
 @pytest.fixture
 def target_blobs_per_block(fork: Fork) -> int:
     """Return default number of target blobs per block."""
-    return fork.target_blobs_per_block()
+    return fork.transitions_to().target_blobs_per_block()
 
 
 @pytest.fixture
 def max_blobs_per_block(fork: Fork) -> int:
     """Return default number of max blobs per block."""
-    return fork.max_blobs_per_block()
+    return fork.transitions_to().max_blobs_per_block()
 
 
 @pytest.fixture
 def blob_gas_per_blob(fork: Fork) -> int:
     """Return default blob gas cost per blob."""
-    return fork.blob_gas_per_blob()
+    return fork.transitions_to().blob_gas_per_blob()
 
 
 @pytest.fixture(autouse=True)
@@ -97,12 +97,14 @@ def block_base_fee_per_gas(
     will trigger the reserve price.
     """
     blob_base_cost = Spec.BLOB_BASE_COST
-    gas_per_blob = fork.blob_gas_per_blob()
+    gas_per_blob = fork.transitions_to().blob_gas_per_blob()
     if parent_excess_blobs is None:
         blob_base_fee = 1
     else:
         parent_excess_blob_gas = parent_excess_blobs * gas_per_blob
-        blob_gas_price_calculator = fork.blob_gas_price_calculator()
+        blob_gas_price_calculator = (
+            fork.transitions_to().blob_gas_price_calculator()
+        )
         blob_base_fee = blob_gas_price_calculator(
             excess_blob_gas=parent_excess_blob_gas
         )
@@ -162,7 +164,7 @@ def excess_blob_gas(
     """
     if parent_excess_blobs is None or parent_blobs is None:
         return None
-    return fork.excess_blob_gas_calculator()(
+    return fork.transitions_to().excess_blob_gas_calculator()(
         parent_excess_blobs=parent_excess_blobs,
         parent_blob_count=parent_blobs,
         parent_base_fee_per_gas=block_base_fee_per_gas,
@@ -184,7 +186,7 @@ def correct_excess_blob_gas(
     """
     if parent_excess_blobs is None or parent_blobs is None:
         return 0
-    return fork.excess_blob_gas_calculator()(
+    return fork.transitions_to().excess_blob_gas_calculator()(
         parent_excess_blobs=parent_excess_blobs,
         parent_blob_count=parent_blobs,
         parent_base_fee_per_gas=block_base_fee_per_gas,
@@ -199,7 +201,7 @@ def blob_gas_price(
     """Return blob gas price for the block of the test."""
     if excess_blob_gas is None:
         return None
-    get_blob_gas_price = fork.blob_gas_price_calculator()
+    get_blob_gas_price = fork.transitions_to().blob_gas_price_calculator()
     return get_blob_gas_price(
         excess_blob_gas=excess_blob_gas,
     )
@@ -211,7 +213,7 @@ def correct_blob_gas_used(
     blobs_per_tx: int,
 ) -> int:
     """Correct blob gas used by the test transaction."""
-    return fork.blob_gas_per_blob() * blobs_per_tx
+    return fork.transitions_to().blob_gas_per_blob() * blobs_per_tx
 
 
 @pytest.fixture
diff --git a/tests/osaka/eip7918_blob_reserve_price/test_blob_base_fee.py b/tests/osaka/eip7918_blob_reserve_price/test_blob_base_fee.py
index 688e43d1f46..0ad8d34e420 100644
--- a/tests/osaka/eip7918_blob_reserve_price/test_blob_base_fee.py
+++ b/tests/osaka/eip7918_blob_reserve_price/test_blob_base_fee.py
@@ -28,7 +28,10 @@
 REFERENCE_SPEC_GIT_PATH = ref_spec_7918.git_path
 REFERENCE_SPEC_VERSION = ref_spec_7918.version
 
-pytestmark = pytest.mark.valid_from("Osaka")
+pytestmark = [
+    pytest.mark.not_valid_for("MONAD_EIGHT", subsequent_forks=True),
+    pytest.mark.valid_from("Osaka"),
+]
 
 
 @pytest.fixture
@@ -232,7 +235,7 @@ def get_boundary_scenarios(fork: Fork) -> Iterator[Any]:
     "parent_excess_blobs,block_base_fee_per_gas_delta",
     get_boundary_scenarios,
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_reserve_price_boundary(
     blockchain_test: BlockchainTestFiller,
     env: Environment,
diff --git a/tests/osaka/eip7918_blob_reserve_price/test_blob_reserve_price_with_bpo.py b/tests/osaka/eip7918_blob_reserve_price/test_blob_reserve_price_with_bpo.py
index c0eb3af65ca..e62d678980d 100644
--- a/tests/osaka/eip7918_blob_reserve_price/test_blob_reserve_price_with_bpo.py
+++ b/tests/osaka/eip7918_blob_reserve_price/test_blob_reserve_price_with_bpo.py
@@ -13,6 +13,8 @@
 
 from .spec import ref_spec_7918
 
+pytestmark = pytest.mark.not_valid_for("MONAD_EIGHT", subsequent_forks=True)
+
 REFERENCE_SPEC_GIT_PATH = ref_spec_7918.git_path
 REFERENCE_SPEC_VERSION = ref_spec_7918.version
 
diff --git a/tests/osaka/eip7918_blob_reserve_price/test_blob_reserve_price_with_bpo_transitions.py b/tests/osaka/eip7918_blob_reserve_price/test_blob_reserve_price_with_bpo_transitions.py
index e645020070d..f965557196c 100644
--- a/tests/osaka/eip7918_blob_reserve_price/test_blob_reserve_price_with_bpo_transitions.py
+++ b/tests/osaka/eip7918_blob_reserve_price/test_blob_reserve_price_with_bpo_transitions.py
@@ -17,12 +17,15 @@
     Op,
     ParameterSet,
     Transaction,
+    TransitionFork,
     add_kzg_version,
 )
 from execution_testing.forks import BPO2ToBPO3AtTime15k
 
 from .spec import Spec, ref_spec_7918
 
+pytestmark = pytest.mark.not_valid_for("MONAD_EIGHT", subsequent_forks=True)
+
 REFERENCE_SPEC_GIT_PATH = ref_spec_7918.git_path
 REFERENCE_SPEC_VERSION = ref_spec_7918.version
 
@@ -70,45 +73,46 @@ def blob_hashes_per_tx(blobs_per_tx: int) -> List[Hash]:
 
 
 @pytest.fixture
-def source_fork_target_blobs(fork: Fork) -> int:
+def source_fork_target_blobs(fork: TransitionFork) -> int:
     """Transition-from fork target blobs."""
-    return fork.target_blobs_per_block(timestamp=0)
+    return fork.transitions_from().target_blobs_per_block()
 
 
 @pytest.fixture
-def source_fork_gas_per_blob(fork: Fork) -> int:
+def source_fork_gas_per_blob(fork: TransitionFork) -> int:
     """Transition-from fork gas per blob."""
-    return fork.blob_gas_per_blob(timestamp=0)
+    return fork.transitions_from().blob_gas_per_blob()
 
 
 @pytest.fixture
-def transition_fork_target_blobs(fork: Fork) -> int:
+def transition_fork_target_blobs(fork: TransitionFork) -> int:
     """Transition-to fork target blobs."""
-    return fork.target_blobs_per_block(timestamp=15_000)
+    return fork.transitions_to().target_blobs_per_block()
 
 
 @pytest.fixture
-def transition_fork_gas_per_blob(fork: Fork) -> int:
+def transition_fork_gas_per_blob(fork: TransitionFork) -> int:
     """Transition-to fork gas per blob."""
-    return fork.blob_gas_per_blob(timestamp=15_000)
+    return fork.transitions_to().blob_gas_per_blob()
 
 
 @pytest.fixture
 def genesis_base_fee_per_gas(
-    fork: Fork,
+    fork: TransitionFork,
     parent_base_fee_per_gas: int,
 ) -> int:
     """Genesis base fee per gas."""
     # Base fee always drops from genesis to block 1 because the genesis block
     # never uses any tx gas.
     return (
-        parent_base_fee_per_gas * fork.base_fee_max_change_denominator()
+        parent_base_fee_per_gas
+        * fork.transitions_from().base_fee_max_change_denominator()
     ) // 7
 
 
 @pytest.fixture
 def genesis_excess_blob_gas(
-    fork: Fork,
+    fork: TransitionFork,
     genesis_base_fee_per_gas: int,
     parent_excess_blob_gas: int,
     source_fork_target_blobs: int,
@@ -118,7 +122,9 @@ def genesis_excess_blob_gas(
     genesis_excess_blob_gas = parent_excess_blob_gas + (
         source_fork_target_blobs * source_fork_gas_per_blob
     )
-    excess_blob_gas_calculator = fork.excess_blob_gas_calculator(timestamp=0)
+    excess_blob_gas_calculator = (
+        fork.transitions_from().excess_blob_gas_calculator()
+    )
     current_excess_blob_gas = excess_blob_gas_calculator(
         parent_excess_blob_gas=genesis_excess_blob_gas,
         parent_blob_count=0,
@@ -217,14 +223,14 @@ def tx_max_fee_per_blob_gas() -> int:
 
 
 @pytest.fixture
-def blob_cap_per_transaction(fork: Fork) -> int:
+def blob_cap_per_transaction(fork: TransitionFork) -> int:
     """Max blobs that a single transaction can contain."""
-    return fork.max_blobs_per_tx()
+    return fork.transitions_from().max_blobs_per_tx()
 
 
 @pytest.fixture
 def parent_block_txs(
-    fork: Fork,
+    fork: TransitionFork,
     sender: EOA,
     destination_account: Address,
     gas_spender_contract: Address,
@@ -253,7 +259,7 @@ def parent_block_txs(
         block_base_fee_per_gas=parent_base_fee_per_gas * 10,
         tx_max_fee_per_blob_gas=tx_max_fee_per_blob_gas,
     )
-    required_gas_used = fork.base_fee_change_calculator()(
+    required_gas_used = fork.transitions_from().base_fee_change_calculator()(
         parent_gas_limit=env.gas_limit,
         parent_base_fee_per_gas=parent_base_fee_per_gas,
         required_base_fee_per_gas=transition_block_base_fee_per_gas,
@@ -356,35 +362,32 @@ class BlobSchedule:
     """Blob schedule for a fork."""
 
     fork: Fork
-    timestamp: int
 
     @property
     def max(self) -> int:
         """Return the max blobs per block."""
-        return self.fork.max_blobs_per_block(timestamp=self.timestamp)
+        return self.fork.max_blobs_per_block()
 
     @property
     def target(self) -> int:
         """Return the target blobs per block."""
-        return self.fork.target_blobs_per_block(timestamp=self.timestamp)
+        return self.fork.target_blobs_per_block()
 
     @property
     def base_fee_update_fraction(self) -> int:
         """Return the base fee update fraction."""
-        return self.fork.blob_base_fee_update_fraction(
-            timestamp=self.timestamp
-        )
+        return self.fork.blob_base_fee_update_fraction()
 
     @property
     def blob_gas_per_blob(self) -> int:
         """Return the blob gas per blob."""
-        return self.fork.blob_gas_per_blob(timestamp=self.timestamp)
+        return self.fork.blob_gas_per_blob()
 
     @property
     def blob_base_cost(self) -> int | None:
         """Return the blob base cost."""
-        if self.fork.blob_reserve_price_active(timestamp=self.timestamp):
-            return self.fork.blob_base_cost(timestamp=self.timestamp)
+        if self.fork.blob_reserve_price_active():
+            return self.fork.blob_base_cost()
         return None
 
     @property
@@ -397,9 +400,7 @@ def calculate_excess_blob_gas(self, parent_header: ParentHeader) -> int:
         Calculate the excess blob gas for the current block based on the gas
         used in the parent block.
         """
-        excess_blob_gas_calculator = self.fork.excess_blob_gas_calculator(
-            timestamp=self.timestamp
-        )
+        excess_blob_gas_calculator = self.fork.excess_blob_gas_calculator()
         return excess_blob_gas_calculator(
             parent_excess_blob_gas=parent_header.excess_blob_gas,
             parent_blob_count=parent_header.blob_gas_used,
@@ -416,9 +417,7 @@ def execution_base_fee_threshold_from_excess_blob_gas(
         if self.blob_base_cost is None:
             return None
         target_blob_gas_price = self.blob_gas_per_blob
-        blob_gas_price_calculator = self.fork.blob_gas_price_calculator(
-            timestamp=self.timestamp
-        )
+        blob_gas_price_calculator = self.fork.blob_gas_price_calculator()
         target_blob_gas_price *= blob_gas_price_calculator(
             excess_blob_gas=excess_blob_gas
         )
@@ -426,13 +425,15 @@ def execution_base_fee_threshold_from_excess_blob_gas(
         return (base_blob_tx_price // self.blob_base_cost) + 1
 
 
-def get_fork_scenarios(fork: Fork) -> Iterator[ParameterSet]:
+def get_fork_scenarios(fork: TransitionFork) -> Iterator[ParameterSet]:
     """
     Return the list of scenarios at the fork boundary depending on the source
     fork and transition fork properties.
     """
-    source_blob_schedule = BlobSchedule(fork=fork, timestamp=0)
-    transition_blob_schedule = BlobSchedule(fork=fork, timestamp=15_000)
+    source_blob_schedule = BlobSchedule(fork=fork.fork_at(timestamp=0))
+    transition_blob_schedule = BlobSchedule(
+        fork=fork.fork_at(timestamp=15_000)
+    )
 
     excess_blobs_combinations = [0, 1, 10, 100]
 
diff --git a/tests/osaka/eip7934_block_rlp_limit/test_max_block_rlp_size.py b/tests/osaka/eip7934_block_rlp_limit/test_max_block_rlp_size.py
index 200e5d3f444..dccbdb28264 100644
--- a/tests/osaka/eip7934_block_rlp_limit/test_max_block_rlp_size.py
+++ b/tests/osaka/eip7934_block_rlp_limit/test_max_block_rlp_size.py
@@ -19,6 +19,7 @@
     Fork,
     Op,
     Transaction,
+    TransitionFork,
     Withdrawal,
 )
 from execution_testing.base_types import (
@@ -133,7 +134,6 @@ def _max_zero_calldata_bytes_for_gas(
 @lru_cache(maxsize=128)
 def calibrated_block_gas_limit(
     fork: Fork,
-    block_size_limit: int,
     requested_gas_limit: int,
 ) -> int:
     """
@@ -142,6 +142,8 @@ def calibrated_block_gas_limit(
     """
     calculator = fork.transaction_intrinsic_cost_calculator()
     tx_gas_limit_cap = fork.transaction_gas_limit_cap()
+    block_size_limit = fork.block_rlp_size_limit()
+    assert block_size_limit is not None
 
     # Estimate calldata bytes required to approach the RLP limit and reserve a
     # small margin for RLP overhead variability.
@@ -181,18 +183,31 @@ def calibrated_block_gas_limit(
 
 
 @pytest.fixture(autouse=True)
-def calibrate_gas_limit(
+def calibrate_genesis_gas_limit(
     env: Environment,
-    fork: Fork,
-    block_size_limit: int,
+    fork: Fork | TransitionFork,
 ) -> None:
-    """Calibrate block gas limit for fork-specific calldata pricing."""
-    env.gas_limit = ZeroPaddedHexNumber(
-        calibrated_block_gas_limit(
-            fork=fork,
-            block_size_limit=block_size_limit,
+    """
+    Calibrate block gas limit at genesis for fork-specific calldata pricing.
+
+    Take pre-fork and post-fork in the case of transition fork tests.
+    """
+    post_fork_calibrated_block_gas_limit = calibrated_block_gas_limit(
+        fork=fork.transitions_to(),
+        requested_gas_limit=env.gas_limit,
+    )
+    if fork.transitions_from().block_rlp_size_limit() is not None:
+        pre_fork_calibrated_block_gas_limit = calibrated_block_gas_limit(
+            fork=fork.transitions_from(),
             requested_gas_limit=env.gas_limit,
         )
+    else:
+        pre_fork_calibrated_block_gas_limit = 0
+    env.gas_limit = ZeroPaddedHexNumber(
+        max(
+            post_fork_calibrated_block_gas_limit,
+            pre_fork_calibrated_block_gas_limit,
+        )
     )
 
 
@@ -243,7 +258,6 @@ def get_block_rlp_size(
 
 def exact_size_transactions(
     sender: EOA,
-    block_size_limit: int,
     fork: Fork,
     pre: Alloc,
     gas_limit: int,
@@ -263,7 +277,6 @@ def exact_size_transactions(
 
     Args:
         sender: The sender account
-        block_size_limit: The target block RLP size limit
         fork: The fork to generate transactions for
         pre: Required if emit_logs is True, used to deploy the log contract
         gas_limit: The gas limit for the block
@@ -280,7 +293,6 @@ def exact_size_transactions(
     """
     effective_block_gas_limit = calibrated_block_gas_limit(
         fork=fork,
-        block_size_limit=block_size_limit,
         requested_gas_limit=gas_limit,
     )
 
@@ -312,7 +324,6 @@ def exact_size_transactions(
     if not specific_transaction_to_include and not withdrawals:
         # use cached version when possible for performance
         transactions, extra_data_len = _exact_size_transactions_cached(
-            block_size_limit,
             fork,
             effective_block_gas_limit,
             sender,
@@ -322,7 +333,6 @@ def exact_size_transactions(
         # Direct calculation, no cache, since `Transaction` / `Withdrawal`
         # are not hashable
         transactions, extra_data_len = _exact_size_transactions_impl(
-            block_size_limit,
             fork,
             effective_block_gas_limit,
             sender,
@@ -336,7 +346,6 @@ def exact_size_transactions(
 
 @lru_cache(maxsize=128)
 def _exact_size_transactions_cached(
-    block_size_limit: int,
     fork: Fork,
     gas_limit: int,
     sender: EOA,
@@ -353,7 +362,6 @@ def _exact_size_transactions_cached(
 
     """
     return _exact_size_transactions_impl(
-        block_size_limit,
         fork,
         gas_limit,
         sender,
@@ -364,7 +372,6 @@ def _exact_size_transactions_cached(
 
 
 def _exact_size_transactions_impl(
-    block_size_limit: int,
     fork: Fork,
     block_gas_limit: int,
     sender: EOA,
@@ -379,6 +386,8 @@ def _exact_size_transactions_impl(
     transactions = []
     nonce = 0
     total_gas_used = 0
+    block_size_limit = fork.block_rlp_size_limit()
+    assert block_size_limit is not None
 
     calculator = fork.transaction_intrinsic_cost_calculator()
     tx_gas_limit_cap = fork.transaction_gas_limit_cap()
@@ -664,7 +673,6 @@ def test_block_at_rlp_size_limit_boundary(
     """
     transactions, extra_data_len = exact_size_transactions(
         sender,
-        block_size_limit,
         fork,
         pre,
         env.gas_limit,
@@ -693,7 +701,7 @@ def test_block_at_rlp_size_limit_boundary(
 @pytest.mark.with_all_typed_transactions(selector=lambda x: x != 3)
 @pytest.mark.verify_sync
 @pytest.mark.valid_from("Osaka")
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_block_rlp_size_at_limit_with_all_typed_transactions(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
@@ -707,7 +715,6 @@ def test_block_rlp_size_at_limit_with_all_typed_transactions(
     """Test the block RLP size limit with all transaction types."""
     transactions, extra_data_len = exact_size_transactions(
         sender,
-        block_size_limit,
         fork,
         pre,
         env.gas_limit,
@@ -744,7 +751,6 @@ def test_block_at_rlp_limit_with_logs(
     """
     transactions, extra_data_len = exact_size_transactions(
         sender,
-        block_size_limit,
         fork,
         pre,
         env.gas_limit,
@@ -796,7 +802,6 @@ def test_block_at_rlp_limit_with_withdrawals(
 
     transactions, extra_data_len = exact_size_transactions(
         sender,
-        block_size_limit,
         fork,
         pre,
         env.gas_limit,
@@ -835,9 +840,8 @@ def test_fork_transition_block_rlp_limit(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
     env: Environment,
-    fork: Fork,
+    fork: TransitionFork,
     exceeds_limit_at_fork: bool,
-    block_size_limit: int,
 ) -> None:
     """
     Test block RLP size limit at fork transition boundary.
@@ -851,16 +855,16 @@ def test_fork_transition_block_rlp_limit(
 
     transactions_before, extra_data_len_before = exact_size_transactions(
         sender_before_fork,
-        block_size_limit,
-        fork,
+        fork.transitions_to()
+        if fork.transitions_from().block_rlp_size_limit() is None
+        else fork.transitions_from(),
         pre,
         env.gas_limit,
     )
 
     transactions_at_fork, extra_data_len_at_fork = exact_size_transactions(
         sender_at_fork,
-        block_size_limit,
-        fork,
+        fork.transitions_to(),
         pre,
         env.gas_limit,
     )
diff --git a/tests/osaka/eip7939_count_leading_zeros/test_count_leading_zeros.py b/tests/osaka/eip7939_count_leading_zeros/test_count_leading_zeros.py
index de4844ce726..17b3556f7ae 100644
--- a/tests/osaka/eip7939_count_leading_zeros/test_count_leading_zeros.py
+++ b/tests/osaka/eip7939_count_leading_zeros/test_count_leading_zeros.py
@@ -86,10 +86,10 @@ def generous_gas(fork: Fork, sstore_count: int = 1) -> int:
     """
     gas_costs = fork.gas_costs()
     sstore_cost = sstore_count * (
-        gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD
+        gas_costs.STORAGE_SET + gas_costs.COLD_STORAGE_ACCESS
     )
     intrinsic_cost = fork.transaction_intrinsic_cost_calculator()()
-    access_cost = gas_costs.GAS_COLD_ACCOUNT_ACCESS
+    access_cost = gas_costs.COLD_ACCOUNT_ACCESS
     return access_cost + sstore_cost + intrinsic_cost + 50_000
 
 
@@ -385,11 +385,18 @@ def test_clz_fork_transition(
 
 
 @pytest.mark.valid_from("Osaka")
-@pytest.mark.parametrize("opcode", [Op.JUMPI, Op.JUMP])
+@pytest.mark.parametrize(
+    "opcode,jumpi_condition",
+    [
+        (op, cond)
+        for op in [Op.JUMPI, Op.JUMP]
+        for cond in [True, False]
+        if not (op == Op.JUMP and not cond)
+    ],
+)
 @pytest.mark.parametrize("valid_jump", [True, False])
-@pytest.mark.parametrize("jumpi_condition", [True, False])
 @pytest.mark.parametrize("bits", [0, 16, 64, 128, 255])
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_clz_jump_operation(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -400,9 +407,6 @@ def test_clz_jump_operation(
     fork: Fork,
 ) -> None:
     """Test CLZ opcode with valid and invalid jump."""
-    if opcode == Op.JUMP and not jumpi_condition:
-        pytest.skip("Duplicate case for JUMP.")
-
     code = Op.PUSH32(1 << bits)
 
     if opcode == Op.JUMPI:
diff --git a/tests/osaka/eip7951_p256verify_precompiles/conftest.py b/tests/osaka/eip7951_p256verify_precompiles/conftest.py
index 2c313fda41b..af45811a5ba 100644
--- a/tests/osaka/eip7951_p256verify_precompiles/conftest.py
+++ b/tests/osaka/eip7951_p256verify_precompiles/conftest.py
@@ -33,7 +33,7 @@ def vector_gas_value() -> int | None:
 @pytest.fixture
 def precompile_gas(vector_gas_value: int | None, fork: Fork) -> int:
     """Gas cost for the precompile."""
-    gas = fork.gas_costs().GAS_PRECOMPILE_P256VERIFY
+    gas = fork.gas_costs().PRECOMPILE_P256VERIFY
     if vector_gas_value is not None:
         assert vector_gas_value == gas, (
             f"Calculated gas {vector_gas_value} != Vector gas {gas}"
diff --git a/tests/osaka/eip7951_p256verify_precompiles/test_p256verify.py b/tests/osaka/eip7951_p256verify_precompiles/test_p256verify.py
index df9e58c0bf8..b3e7eea8f83 100644
--- a/tests/osaka/eip7951_p256verify_precompiles/test_p256verify.py
+++ b/tests/osaka/eip7951_p256verify_precompiles/test_p256verify.py
@@ -43,7 +43,7 @@
 @EIPChecklist.Precompile.Test.CallContexts.Normal()
 @EIPChecklist.Precompile.Test.Inputs.Valid()
 @EIPChecklist.Precompile.Test.Inputs.MaxValues()
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_wycheproof_valid(
     state_test: StateTestFiller, pre: Alloc, post: dict, tx: Transaction
 ) -> None:
@@ -969,7 +969,7 @@ def test_valid(
 @EIPChecklist.Precompile.Test.InputLengths.Static.TooLong()
 @EIPChecklist.Precompile.Test.OutOfBounds.Max()
 @EIPChecklist.Precompile.Test.OutOfBounds.MaxPlusOne()
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_invalid(
     state_test: StateTestFiller, pre: Alloc, post: dict, tx: Transaction
 ) -> None:
@@ -1101,7 +1101,7 @@ def test_precompile_will_return_success_with_tx_value(
     call_256verify_bytecode = (
         Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE())
         + Op.CALL(
-            gas=fork.gas_costs().GAS_PRECOMPILE_P256VERIFY,
+            gas=fork.gas_costs().PRECOMPILE_P256VERIFY,
             address=Spec.P256VERIFY,
             value=Op.CALLVALUE(),
             args_offset=0,
@@ -1244,7 +1244,7 @@ def test_contract_creation_transaction(
     contract_bytecode = (
         Op.CODECOPY(0, Op.SUB(Op.CODESIZE, len(input_data)), len(input_data))
         + Op.CALL(
-            gas=fork.gas_costs().GAS_PRECOMPILE_P256VERIFY,
+            gas=fork.gas_costs().PRECOMPILE_P256VERIFY,
             address=Spec.P256VERIFY,
             value=0,
             args_offset=0,
@@ -1311,7 +1311,7 @@ def test_contract_initcode(
     call_256verify_bytecode = (
         Op.CODECOPY(0, Op.SUB(Op.CODESIZE, len(input_data)), len(input_data))
         + Op.CALL(
-            gas=fork.gas_costs().GAS_PRECOMPILE_P256VERIFY,
+            gas=fork.gas_costs().PRECOMPILE_P256VERIFY,
             address=Spec.P256VERIFY,
             value=0,
             args_offset=0,
diff --git a/tests/osaka/eip7951_p256verify_precompiles/test_p256verify_before_fork.py b/tests/osaka/eip7951_p256verify_precompiles/test_p256verify_before_fork.py
index 5476af69e6a..6e1e1f08317 100644
--- a/tests/osaka/eip7951_p256verify_precompiles/test_p256verify_before_fork.py
+++ b/tests/osaka/eip7951_p256verify_precompiles/test_p256verify_before_fork.py
@@ -14,6 +14,7 @@
     BlockchainTestFiller,
     EIPChecklist,
     Transaction,
+    TransitionFork,
 )
 
 from .spec import Spec, ref_spec_7951
@@ -24,6 +25,39 @@
 pytestmark = pytest.mark.valid_at_transition_to("MONAD_EIGHT")
 
 
+@pytest.fixture
+def precompile_gas(vector_gas_value: int | None, fork: TransitionFork) -> int:
+    """Gas cost for the precompile."""
+    gas = fork.transitions_to().gas_costs().PRECOMPILE_P256VERIFY
+    if vector_gas_value is not None:
+        assert vector_gas_value == gas, (
+            f"Calculated gas {vector_gas_value} != Vector gas {gas}"
+        )
+    return gas
+
+
+@pytest.fixture
+def tx_gas_limit(
+    fork: TransitionFork, input_data: bytes, precompile_gas: int
+) -> int:
+    """
+    Transaction gas limit used for the test (Can be overridden in the test).
+    """
+    intrinsic_gas_cost_calculator = (
+        fork.transitions_from().transaction_intrinsic_cost_calculator()
+    )
+    memory_expansion_gas_calculator = (
+        fork.transitions_from().memory_expansion_gas_calculator()
+    )
+    extra_gas = 100_000
+    return (
+        extra_gas
+        + intrinsic_gas_cost_calculator(calldata=input_data)
+        + memory_expansion_gas_calculator(new_bytes=len(input_data))
+        + precompile_gas
+    )
+
+
 @pytest.mark.parametrize(
     "precompile_address,input_data,precompile_gas_modifier",
     [
diff --git a/tests/paris/eip7610_create_collision/test_collision_selfdestruct.py b/tests/paris/eip7610_create_collision/test_collision_selfdestruct.py
new file mode 100644
index 00000000000..dea29c75234
--- /dev/null
+++ b/tests/paris/eip7610_create_collision/test_collision_selfdestruct.py
@@ -0,0 +1,115 @@
+"""
+Test CREATE2 collision interaction with SELFDESTRUCT (EIP-6780).
+
+Verify that a failed CREATE2 (due to collision) does not cause a
+subsequent SELFDESTRUCT to destroy the pre-existing contract.
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Environment,
+    Initcode,
+    Op,
+    StateTestFiller,
+    Storage,
+    Transaction,
+    compute_create2_address,
+)
+
+REFERENCE_SPEC_GIT_PATH = "EIPS/eip-7610.md"
+REFERENCE_SPEC_VERSION = "80ef48d0bbb5a4939ade51caaaac57b5df6acd4e"
+
+
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.pre_alloc_mutable
+def test_selfdestruct_after_create2_collision(
+    state_test: StateTestFiller,
+    pre: Alloc,
+) -> None:
+    """
+    Test that a failed CREATE2 collision does not count as creation.
+
+    A CREATE2 that collides with an existing contract fails. A
+    subsequent SELFDESTRUCT on the same address must not destroy the
+    contract because EIP-6780 only allows destruction if the contract
+    was created in the same transaction.
+    """
+    env = Environment()
+    storage = Storage()
+
+    salt = 0
+    initcode = Initcode(deploy_code=Op.STOP)
+
+    deployer_storage = Storage()
+    deployer_code = Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE) + Op.SSTORE(
+        deployer_storage.store_next(0, "create2_result"),
+        Op.CREATE2(value=0, offset=0, size=Op.CALLDATASIZE, salt=salt),
+    )
+    deployer = pre.deploy_contract(
+        deployer_code, storage=deployer_storage.canary()
+    )
+
+    target_address = compute_create2_address(deployer, salt, initcode)
+
+    beneficiary = pre.fund_eoa(amount=0)
+
+    # Target already exists with balance and code (causes collision).
+    target_code = Op.SELFDESTRUCT(beneficiary)
+    pre[target_address] = Account(
+        balance=1,
+        nonce=1,
+        code=target_code,
+    )
+
+    # Controller: attempt CREATE2 (will collide), then call target
+    # (SELFDESTRUCT should NOT destroy since target was not created
+    # in this tx).
+    controller = pre.deploy_contract(
+        Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
+        # CREATE2 via deployer — will fail (collision)
+        + Op.SSTORE(
+            storage.store_next(1, "create2_call_success"),
+            Op.CALL(
+                gas=500_000,
+                address=deployer,
+                args_size=Op.CALLDATASIZE,
+            ),
+        )
+        # Call target to trigger SELFDESTRUCT
+        + Op.SSTORE(
+            storage.store_next(1, "selfdestruct_call_success"),
+            Op.CALL(gas=100_000, address=target_address),
+        )
+        + Op.STOP
+    )
+
+    sender = pre.fund_eoa()
+
+    post = {
+        controller: Account(storage=storage),
+        # CREATE2 failed due to collision — returned 0.
+        deployer: Account(storage=deployer_storage),
+        # Target must still exist (SELFDESTRUCT did not destroy because
+        # it was NOT created in this tx). Balance was transferred to
+        # beneficiary.
+        target_address: Account(
+            balance=0,
+            nonce=1,
+            code=target_code,
+        ),
+        beneficiary: Account(balance=1),
+    }
+
+    state_test(
+        env=env,
+        pre=pre,
+        post=post,
+        tx=Transaction(
+            sender=sender,
+            to=controller,
+            gas_limit=2_000_000,
+            data=initcode,
+        ),
+    )
diff --git a/tests/paris/eip7610_create_collision/test_initcollision.py b/tests/paris/eip7610_create_collision/test_initcollision.py
index 00783c454a2..e7f4fe032fd 100644
--- a/tests/paris/eip7610_create_collision/test_initcollision.py
+++ b/tests/paris/eip7610_create_collision/test_initcollision.py
@@ -61,7 +61,7 @@
 
 
 @pytest.mark.with_all_contract_creating_tx_types
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_init_collision_create_tx(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -95,7 +95,7 @@ def test_init_collision_create_tx(
     )
 
     expected_block_access_list = None
-    if fork.header_bal_hash_required():
+    if fork.is_eip_enabled(7928):
         expected_block_access_list = BlockAccessListExpectation(
             account_expectations={
                 created_contract_address: BalAccountExpectation.empty()
diff --git a/tests/paris/eip7610_create_collision/test_revert_in_create.py b/tests/paris/eip7610_create_collision/test_revert_in_create.py
index e1fe55815f8..04a1f8f62f0 100644
--- a/tests/paris/eip7610_create_collision/test_revert_in_create.py
+++ b/tests/paris/eip7610_create_collision/test_revert_in_create.py
@@ -102,7 +102,7 @@ def test_collision_with_create2_revert_in_initcode(
         ),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_create2_collision_storage(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/ported_static/Cancun/__init__.py b/tests/ported_static/Cancun/__init__.py
deleted file mode 100644
index 75e316e97ec..00000000000
--- a/tests/ported_static/Cancun/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from Cancun."""
diff --git a/tests/ported_static/Cancun/stEIP1153_transientStorage/__init__.py b/tests/ported_static/Cancun/stEIP1153_transientStorage/__init__.py
deleted file mode 100644
index 84c4b8e0363..00000000000
--- a/tests/ported_static/Cancun/stEIP1153_transientStorage/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from stEIP1153_transientStorage."""
diff --git a/tests/ported_static/Cancun/stEIP1153_transientStorage/test_10_revert_undoes_store_after_return.py b/tests/ported_static/Cancun/stEIP1153_transientStorage/test_10_revert_undoes_store_after_return.py
deleted file mode 100644
index 2803bada33f..00000000000
--- a/tests/ported_static/Cancun/stEIP1153_transientStorage/test_10_revert_undoes_store_after_return.py
+++ /dev/null
@@ -1,157 +0,0 @@
-"""
-Revert undoes the transient storage writes after a successful call.
-
-Ported from:
-tests/static/state_tests/Cancun/stEIP1153_transientStorage
-10_revertUndoesStoreAfterReturnFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/Cancun/stEIP1153_transientStorage/10_revertUndoesStoreAfterReturnFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
-def test_10_revert_undoes_store_after_return(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Revert undoes the transient storage writes after a successful call."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xBE0E7D5FEA1604BF57E004B0B414DF8DE04816DBB1C8F8719B725D0D6619B531
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=4503599627370496,
-    )
-
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
-    # Source: Yul
-    # {
-    #   switch selector()
-    #
-    #   case 0x70ac643e { // doFirstCall()
-    #     doFirstCall()
-    #   }
-    #
-    #   case 0x76b85d23 { // doCallThenRevert()
-    #     doCallThenRevert()
-    #   }
-    #
-    #   case 0x4ccca553 { // doSuccessfulStore()
-    #     doSuccessfulStore()
-    #   }
-    #
-    #   function doFirstCall() {
-    #     verbatim_2i_0o(hex"5D", 0, 5)
-    #
-    #     let v := verbatim_1i_1o(hex"5C", 0)
-    #     sstore(0, v)
-    #
-    #     mstore(0, hex"76b85d23") // calls doCallThenRevert()
-    #     let fail := call(gas(), address(), 0, 0, 32, 0, 32)
-    #
-    #     sstore(1, fail) // should be 0 (revert)
-    #     sstore(2, mload(0)) // load 1 (successful call)
-    #
-    #     let val := verbatim_1i_1o(hex"5C", 0)
-    #     sstore(3, val)
-    #   }
-    # ... (23 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.SHR(0xE0, Op.CALLDATALOAD(offset=Op.PUSH0))
-            + Op.JUMPI(pc=0x2F, condition=Op.EQ(0x70AC643E, Op.DUP1))
-            + Op.JUMPI(pc=0x2B, condition=Op.EQ(0x76B85D23, Op.DUP1))
-            + Op.PUSH4[0x4CCCA553]
-            + Op.JUMPI(pc=0x23, condition=Op.EQ)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x29]
-            + Op.JUMP(pc=0x76)
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.JUMP(pc=0x5C)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x29]
-            + Op.TSTORE(key=Op.PUSH0, value=0x5)
-            + Op.SSTORE(key=Op.PUSH0, value=Op.TLOAD(key=Op.PUSH0))
-            + Op.MSTORE(offset=Op.PUSH0, value=Op.SHL(0xE0, 0x76B85D23))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.ADDRESS,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=Op.DUP2,
-                    ret_offset=Op.PUSH0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=Op.PUSH0))
-            + Op.SSTORE(key=0x3, value=Op.TLOAD(key=Op.PUSH0))
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=Op.PUSH0, value=Op.SHL(0xE0, 0x4CCCA553))
-            + Op.MSTORE(
-                offset=Op.PUSH0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.ADDRESS,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=Op.PUSH0,
-                ),
-            )
-            + Op.REVERT(offset=Op.PUSH0, size=0x20)
-            + Op.JUMPDEST
-            + Op.TSTORE(key=Op.PUSH0, value=0x6)
-            + Op.JUMP
-        ),
-        storage={0x1: 0xFFFF},
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xe42b9e92d5348b0fc6353d40e3d220c316d3c685"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("70ac643e"),
-        gas_limit=400000,
-        max_fee_per_gas=2000,
-    )
-
-    post = {
-        contract: Account(storage={0: 5, 2: 1, 3: 5}),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/Cancun/stEIP1153_transientStorage/test_14_revert_after_nested_staticcall.py b/tests/ported_static/Cancun/stEIP1153_transientStorage/test_14_revert_after_nested_staticcall.py
deleted file mode 100644
index b173fa87cca..00000000000
--- a/tests/ported_static/Cancun/stEIP1153_transientStorage/test_14_revert_after_nested_staticcall.py
+++ /dev/null
@@ -1,155 +0,0 @@
-"""
-Transient storage can't be manipulated from nested staticcall.
-
-Ported from:
-tests/static/state_tests/Cancun/stEIP1153_transientStorage
-14_revertAfterNestedStaticcallFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/Cancun/stEIP1153_transientStorage/14_revertAfterNestedStaticcallFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
-def test_14_revert_after_nested_staticcall(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Transient storage can't be manipulated from nested staticcall."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xBE0E7D5FEA1604BF57E004B0B414DF8DE04816DBB1C8F8719B725D0D6619B531
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=4503599627370496,
-    )
-
-    # Source: Yul
-    # {
-    #   switch selector()
-    #
-    #   case 0xf5f40590 { // doStoreAndStaticCall()
-    #     doStoreAndStaticCall()
-    #   }
-    #
-    #   case 0xf8dfc2d0 { // doCallToStore()
-    #     doCallToStore()
-    #   }
-    #
-    #   case 0x62fdb9be { // doStore()
-    #     doStore()
-    #   }
-    #
-    #   function doStoreAndStaticCall() {
-    #     verbatim_2i_0o(hex"5D", 0, 10)
-    #
-    #     let v := verbatim_1i_1o(hex"5C", 0)
-    #     sstore(0, v)
-    #
-    #     mstore(0, hex"f8dfc2d0") // doCallToStore()
-    #     let success := staticcall(0xffff, address(), 0, 32, 0, 32)
-    #
-    #     sstore(1, mload(0)) // should be 0 from nested unsuccessful call
-    #     sstore(2, success) // should be 1
-    #
-    #     let val := verbatim_1i_1o(hex"5C", 0)
-    #     sstore(3, val)
-    #   }
-    # ... (17 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.SHR(0xE0, Op.CALLDATALOAD(offset=Op.PUSH0))
-            + Op.JUMPI(pc=0x2F, condition=Op.EQ(0xF5F40590, Op.DUP1))
-            + Op.JUMPI(pc=0x2B, condition=Op.EQ(0xF8DFC2D0, Op.DUP1))
-            + Op.PUSH4[0x62FDB9BE]
-            + Op.JUMPI(pc=0x23, condition=Op.EQ)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x29]
-            + Op.JUMP(pc=0x77)
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.JUMP(pc=0x5D)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x29]
-            + Op.TSTORE(key=Op.PUSH0, value=0xA)
-            + Op.SSTORE(key=Op.PUSH0, value=Op.TLOAD(key=Op.PUSH0))
-            + Op.MSTORE(offset=Op.PUSH0, value=Op.SHL(0xE4, 0xF8DFC2D))
-            + Op.STATICCALL(
-                gas=0xFFFF,
-                address=Op.ADDRESS,
-                args_offset=Op.DUP2,
-                args_size=Op.DUP2,
-                ret_offset=Op.PUSH0,
-                ret_size=0x20,
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=Op.PUSH0))
-            + Op.PUSH1[0x2]
-            + Op.SSTORE
-            + Op.SSTORE(key=0x3, value=Op.TLOAD(key=Op.PUSH0))
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=Op.PUSH0, value=Op.SHL(0xE1, 0x317EDCDF))
-            + Op.MSTORE(
-                offset=Op.PUSH0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.ADDRESS,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=Op.PUSH0,
-                ),
-            )
-            + Op.RETURN(offset=Op.PUSH0, size=0x20)
-            + Op.JUMPDEST
-            + Op.TSTORE(key=Op.PUSH0, value=0xB)
-            + Op.JUMP
-        ),
-        storage={0x1: 0xFFFF},
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x1150baff55fdcea5fd92b0995358ec0c416debe3"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("f5f40590"),
-        gas_limit=400000,
-        max_fee_per_gas=2000,
-    )
-
-    post = {
-        contract: Account(storage={0: 10, 2: 1, 3: 10}),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/Cancun/stEIP1153_transientStorage/test_trans_storage_ok.py b/tests/ported_static/Cancun/stEIP1153_transientStorage/test_trans_storage_ok.py
deleted file mode 100644
index d578203bf59..00000000000
--- a/tests/ported_static/Cancun/stEIP1153_transientStorage/test_trans_storage_ok.py
+++ /dev/null
@@ -1,1557 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/Cancun/stEIP1153_transientStorage
-transStorageOKFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/Cancun/stEIP1153_transientStorage/transStorageOKFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "264bb86a0000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000264bb86a"): Account(
-                    storage={1: 6, 2: 1, 3: 63}
-                ),
-                Address("0x000000000000000000000000000000005d7935df"): Account(
-                    storage={2: 24743, 18: 24743}
-                ),
-                Address("0x000000000000000000000000000000007f9317bd"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x00000000000000000000000000000000ca11bacc"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0xdd53b677a6fd4e871a6355f283b1bd7ceb95a95e"): Account(
-                    storage={0: 0x264BB86A, 1: 1}
-                ),
-            },
-        ),
-        (
-            "5114e2c8000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000005114e2c8"): Account(
-                    storage={1: 10, 2: 1, 3: 55}
-                ),
-                Address("0x000000000000000000000000000000005d7935df"): Account(
-                    storage={2: 24743, 18: 24743}
-                ),
-                Address("0x000000000000000000000000000000007f9317bd"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xdd53b677a6fd4e871a6355f283b1bd7ceb95a95e"): Account(
-                    storage={0: 0x5114E2C8, 1: 1}
-                ),
-            },
-        ),
-        (
-            "5114e2c80000000000000000000000000000000000000000000000000000000000000032",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000005114e2c8"): Account(
-                    storage={1: 50, 2: 1, 3: 1275}
-                ),
-                Address("0x000000000000000000000000000000005d7935df"): Account(
-                    storage={2: 24743, 18: 24743}
-                ),
-                Address("0x000000000000000000000000000000007f9317bd"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xdd53b677a6fd4e871a6355f283b1bd7ceb95a95e"): Account(
-                    storage={0: 0x5114E2C8, 1: 1}
-                ),
-            },
-        ),
-        (
-            "6e3a72040000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000005d7935df"): Account(
-                    storage={2: 24743, 18: 24743}
-                ),
-                Address("0x000000000000000000000000000000006e3a7204"): Account(
-                    storage={1: 16, 2: 1, 3: 136}
-                ),
-                Address("0x000000000000000000000000000000007f9317bd"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x00000000000000000000000000000000ca11bacc"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0xdd53b677a6fd4e871a6355f283b1bd7ceb95a95e"): Account(
-                    storage={0: 0x6E3A7204, 1: 1}
-                ),
-            },
-        ),
-        (
-            "c54b5829f1f1f1f1f2f2f2f2f4f4f4f4f1f1f1f1f2f2f2f2f4f4f4f4f1f1f1f1f2f2f2f2",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000005d7935df"): Account(
-                    storage={2: 24743, 18: 24743}
-                ),
-                Address("0x000000000000000000000000000000007f9317bd"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x00000000000000000000000000000000c54b5829"): Account(
-                    storage={0: 2}
-                ),
-                Address("0x00000000000000000000000000000000ca11bacc"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0xdd53b677a6fd4e871a6355f283b1bd7ceb95a95e"): Account(
-                    storage={0: 0xC54B5829, 1: 1}
-                ),
-            },
-        ),
-        (
-            "c54b5829f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000005d7935df"): Account(
-                    storage={2: 24743, 18: 24743}
-                ),
-                Address("0x000000000000000000000000000000007f9317bd"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x00000000000000000000000000000000c54b5829"): Account(
-                    storage={0: 2}
-                ),
-                Address("0x00000000000000000000000000000000ca11bacc"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0xdd53b677a6fd4e871a6355f283b1bd7ceb95a95e"): Account(
-                    storage={0: 0xC54B5829, 1: 1}
-                ),
-            },
-        ),
-        (
-            "c54b5829f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000005d7935df"): Account(
-                    storage={2: 24743, 18: 24743}
-                ),
-                Address("0x000000000000000000000000000000007f9317bd"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x00000000000000000000000000000000c54b5829"): Account(
-                    storage={0: 2}
-                ),
-                Address("0x00000000000000000000000000000000ca11bacc"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0xdd53b677a6fd4e871a6355f283b1bd7ceb95a95e"): Account(
-                    storage={0: 0xC54B5829, 1: 1}
-                ),
-            },
-        ),
-        (
-            "c54b5829f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000005d7935df"): Account(
-                    storage={2: 24743, 18: 24743}
-                ),
-                Address("0x000000000000000000000000000000007f9317bd"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x00000000000000000000000000000000c54b5829"): Account(
-                    storage={0: 2}
-                ),
-                Address("0x00000000000000000000000000000000ca11bacc"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0xdd53b677a6fd4e871a6355f283b1bd7ceb95a95e"): Account(
-                    storage={0: 0xC54B5829, 1: 1}
-                ),
-            },
-        ),
-        (
-            "c54b5829f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000005d7935df"): Account(
-                    storage={2: 24743, 18: 24743}
-                ),
-                Address("0x000000000000000000000000000000007f9317bd"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x00000000000000000000000000000000c54b5829"): Account(
-                    storage={0: 2}
-                ),
-                Address("0x00000000000000000000000000000000ca11bacc"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0xdd53b677a6fd4e871a6355f283b1bd7ceb95a95e"): Account(
-                    storage={0: 0xC54B5829, 1: 1}
-                ),
-            },
-        ),
-        (
-            "c54b5829f2f4f1f2f4f1f2f4f1f2f4f1f2f4f1f2f4f1f2f4f1f2f4f1f2f4f1f2f4f1f1f1",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000005d7935df"): Account(
-                    storage={2: 24743, 18: 24743}
-                ),
-                Address("0x000000000000000000000000000000007f9317bd"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x00000000000000000000000000000000c54b5829"): Account(
-                    storage={0: 2}
-                ),
-                Address("0x00000000000000000000000000000000ca11bacc"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0xdd53b677a6fd4e871a6355f283b1bd7ceb95a95e"): Account(
-                    storage={0: 0xC54B5829, 1: 1}
-                ),
-            },
-        ),
-        (
-            "7074a4860000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000005d7935df"): Account(
-                    storage={2: 24743, 18: 24743}
-                ),
-                Address("0x000000000000000000000000000000007074a486"): Account(
-                    storage={1: 6, 2: 1, 3: 63}
-                ),
-                Address("0x000000000000000000000000000000007f9317bd"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x00000000000000000000000000000000ca11bacc"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0xdd53b677a6fd4e871a6355f283b1bd7ceb95a95e"): Account(
-                    storage={0: 0x7074A486, 1: 1}
-                ),
-            },
-        ),
-        (
-            "c1c922f10000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000005d7935df"): Account(
-                    storage={2: 24743, 18: 24743}
-                ),
-                Address("0x000000000000000000000000000000007f9317bd"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x00000000000000000000000000000000c1c922f1"): Account(
-                    storage={1: 16, 2: 1, 3: 136}
-                ),
-                Address("0x00000000000000000000000000000000ca11bacc"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0xdd53b677a6fd4e871a6355f283b1bd7ceb95a95e"): Account(
-                    storage={0: 0xC1C922F1, 1: 1}
-                ),
-            },
-        ),
-        (
-            "7f9317bd",
-            {
-                Address("0x000000000000000000000000000000005d7935df"): Account(
-                    storage={2: 24743, 18: 24743}
-                ),
-                Address("0x000000000000000000000000000000007f9317bd"): Account(
-                    storage={1: 1, 2: 2, 3: 2, 17: 1, 18: 1, 19: 1}
-                ),
-                Address("0x00000000000000000000000000000000ca11bacc"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0xdd53b677a6fd4e871a6355f283b1bd7ceb95a95e"): Account(
-                    storage={0: 0x7F9317BD, 1: 1}
-                ),
-            },
-        ),
-        (
-            "5d7935df",
-            {
-                Address("0x000000000000000000000000000000005d7935df"): Account(
-                    storage={0: 24743, 1: 24743, 16: 1, 17: 1}
-                ),
-                Address("0x000000000000000000000000000000007f9317bd"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x00000000000000000000000000000000ca11bacc"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0xdd53b677a6fd4e871a6355f283b1bd7ceb95a95e"): Account(
-                    storage={0: 0x5D7935DF, 1: 1}
-                ),
-            },
-        ),
-        (
-            "ebd141d50000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000005d7935df"): Account(
-                    storage={2: 24743, 18: 24743}
-                ),
-                Address("0x000000000000000000000000000000007f9317bd"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x00000000000000000000000000000000ca11bacc"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x00000000000000000000000000000000ebd141d5"): Account(
-                    storage={1: 16, 2: 1, 3: 136}
-                ),
-                Address("0xdd53b677a6fd4e871a6355f283b1bd7ceb95a95e"): Account(
-                    storage={0: 0xEBD141D5, 1: 1}
-                ),
-            },
-        ),
-        (
-            "ebd141d50000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000005d7935df"): Account(
-                    storage={2: 24743, 18: 24743}
-                ),
-                Address("0x000000000000000000000000000000007f9317bd"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x00000000000000000000000000000000ca11bacc"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x00000000000000000000000000000000ebd141d5"): Account(
-                    storage={1: 256, 2: 1, 3: 32896}
-                ),
-                Address("0xdd53b677a6fd4e871a6355f283b1bd7ceb95a95e"): Account(
-                    storage={0: 0xEBD141D5, 1: 1}
-                ),
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_trans_storage_ok(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x48DC5A9F099CAAAA557742CA3A990A94BE45B9969126A1BC74E5E8BE5A2B5B47
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    # Source: Yul
-    # {
-    #     function tload_temp(loc) -> val {
-    #       val := verbatim_1i_1o(hex"5C", loc)
-    #     }
-    #
-    #     function tstore_temp(loc, val) {
-    #       verbatim_2i_0o(hex"5D", loc, val)
-    #     }
-    #
-    #     // There is calldata, so write to Trans[0]
-    #     if calldatasize() {
-    #        tstore_temp(0, 0x60A7)
-    #     }
-    #
-    #     // Return Trans[0]
-    #     // This happens whether we are called with data or not.
-    #     mstore(0, tload_temp(0))
-    #     return(0,32)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x12, condition=Op.CALLDATASIZE)
-            + Op.JUMPDEST
-            + Op.PUSH1[0xB]
-            + Op.PUSH0
-            + Op.JUMP(pc=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH0
-            + Op.MSTORE
-            + Op.RETURN(offset=Op.PUSH0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1C]
-            + Op.PUSH2[0x60A7]
-            + Op.PUSH0
-            + Op.JUMP(pc=0x24)
-            + Op.JUMPDEST
-            + Op.JUMP(pc=0x4)
-            + Op.JUMPDEST
-            + Op.TLOAD
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.TSTORE
-            + Op.JUMP
-        ),
-        address=Address("0x00000000000000000000000000000000000057a7"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #     function tload_temp(loc) -> val {
-    #       val := verbatim_1i_1o(hex"5C", loc)
-    #     }
-    #
-    #     function tstore_temp(loc, val) {
-    #       verbatim_2i_0o(hex"5D", loc, val)
-    #     }
-    #
-    #     tstore_temp(0, add(tload_temp(0), 1))
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x10]
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0xA]
-            + Op.PUSH0
-            + Op.JUMP(pc=0x12)
-            + Op.JUMPDEST
-            + Op.ADD
-            + Op.PUSH0
-            + Op.JUMP(pc=0x16)
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.TLOAD
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.TSTORE
-            + Op.JUMP
-        ),
-        address=Address("0x000000000000000000000000000000000000add1"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #     function tload_temp(loc) -> val {
-    #       val := verbatim_1i_1o(hex"5C", loc)
-    #     }
-    #
-    #     function tstore_temp(loc, val) {
-    #       verbatim_2i_0o(hex"5D", loc, val)
-    #     }
-    #
-    #     // We are inside the loop
-    #     if eq(caller(), address()) {
-    #       let counter := tload_temp(0)
-    #
-    #       // If counter is zero, we're at an end of the loop (a leaf of
-    #       // the tree), return.
-    #       if eq(counter,0) {
-    #         return(0,0)
-    #       }
-    #
-    #       // If counter isn't zero, call yourself with counter-1 twice and
-    #       // add one to Trans[1]
-    #       tstore_temp(0, sub(counter, 1))
-    #       let res := call(gas(), address(), 0, 0,0, 0,0)
-    #       if iszero(res) { // If the call failed, fail too
-    #          revert(0,0)
-    #       }
-    #
-    #       // We need to repair Trans[0] because it got overwritten in
-    #       // the previous call
-    #       tstore_temp(0, sub(counter, 1))
-    # ... (22 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x33, condition=Op.EQ(Op.CALLER, Op.ADDRESS))
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0xE, condition=Op.SUB(Op.CALLER, Op.ADDRESS))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1B]
-            + Op.CALLDATALOAD(offset=Op.PUSH0)
-            + Op.SSTORE(key=0x1, value=Op.DUP1)
-            + Op.PUSH0
-            + Op.JUMP(pc=0x8D)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.ADDRESS,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=Op.PUSH0,
-                ),
-            )
-            + Op.PUSH1[0x2E]
-            + Op.PUSH1[0x1]
-            + Op.JUMP(pc=0x89)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x3]
-            + Op.SSTORE
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x3A]
-            + Op.PUSH0
-            + Op.JUMP(pc=0x89)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x87, condition=Op.ISZERO(Op.DUP1))
-            + Op.PUSH1[0x4A]
-            + Op.SUB(Op.DUP3, 0x1)
-            + Op.PUSH0
-            + Op.JUMP(pc=0x8D)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x83,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=Op.GAS,
-                        address=Op.ADDRESS,
-                        value=Op.DUP1,
-                        args_offset=Op.DUP1,
-                        args_size=Op.DUP1,
-                        ret_offset=Op.DUP1,
-                        ret_size=Op.PUSH0,
-                    ),
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x61]
-            + Op.SWAP2
-            + Op.SUB
-            + Op.PUSH0
-            + Op.JUMP(pc=0x8D)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x83,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=Op.GAS,
-                        address=Op.ADDRESS,
-                        value=Op.DUP1,
-                        args_offset=Op.DUP1,
-                        args_size=Op.DUP1,
-                        ret_offset=Op.DUP1,
-                        ret_size=Op.PUSH0,
-                    ),
-                ),
-            )
-            + Op.PUSH1[0x7F]
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x78]
-            + Op.DUP2
-            + Op.JUMP(pc=0x89)
-            + Op.JUMPDEST
-            + Op.ADD
-            + Op.PUSH1[0x1]
-            + Op.JUMP(pc=0x8D)
-            + Op.JUMPDEST
-            + Op.JUMP(pc=0x6)
-            + Op.JUMPDEST
-            + Op.REVERT(offset=Op.DUP1, size=Op.PUSH0)
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.TLOAD
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.TSTORE
-            + Op.JUMP
-        ),
-        address=Address("0x00000000000000000000000000000000264bb86a"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #     function tload_temp(loc) -> val {
-    #       val := verbatim_1i_1o(hex"5C", loc)
-    #     }
-    #
-    #     function tstore_temp(loc, val) {
-    #       verbatim_2i_0o(hex"5D", loc, val)
-    #     }
-    #
-    #     // If we are called by 0xca11bacc, this is part of the loop
-    #     if eq(caller(), 0xca11bacc) {
-    #       let counter := tload_temp(0)
-    #
-    #       // If the counter is equal to zero, we're done - return.
-    #       if eq(counter,0) {
-    #         return(0,0)
-    #       }
-    #
-    #       // If counter isn't zero, add counter to Trans[1] and do recursion
-    #       tstore_temp(1, add(tload_temp(1), counter))
-    #
-    #       // Change the loop variable and call 0xca11bacc, which calls us back.  # noqa: E501
-    #       tstore_temp(0, sub(counter, 1))
-    #       let res := call(gas(), 0xca11bacc, 0, 0,0, 0,0)
-    #       if iszero(res) { // If the call failed, fail too
-    #          revert(0,0)
-    #       }
-    #     }
-    #
-    #     // If called by a different address from 0xca11bacc, we are the first
-    # ... (12 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x3F, condition=Op.EQ(Op.CALLER, 0xCA11BACC))
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x16, condition=Op.SUB(Op.CALLER, 0xCA11BACC))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x23]
-            + Op.CALLDATALOAD(offset=Op.PUSH0)
-            + Op.SSTORE(key=0x1, value=Op.DUP1)
-            + Op.PUSH0
-            + Op.JUMP(pc=0x7F)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=0xCA11BACC,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=Op.PUSH0,
-                ),
-            )
-            + Op.PUSH1[0x3A]
-            + Op.PUSH1[0x1]
-            + Op.JUMP(pc=0x7B)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x3]
-            + Op.SSTORE
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x46]
-            + Op.PUSH0
-            + Op.JUMP(pc=0x7B)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x79, condition=Op.ISZERO(Op.DUP1))
-            + Op.PUSH1[0x1]
-            + Op.DUP2
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x66]
-            + Op.SWAP4
-            + Op.PUSH1[0x5A]
-            + Op.DUP5
-            + Op.JUMP(pc=0x7B)
-            + Op.JUMPDEST
-            + Op.ADD
-            + Op.DUP4
-            + Op.JUMP(pc=0x7F)
-            + Op.JUMPDEST
-            + Op.SUB
-            + Op.PUSH0
-            + Op.JUMP(pc=0x7F)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xA,
-                condition=Op.CALL(
-                    gas=Op.GAS,
-                    address=0xCA11BACC,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=Op.PUSH0,
-                ),
-            )
-            + Op.REVERT(offset=Op.DUP1, size=Op.PUSH0)
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.TLOAD
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.TSTORE
-            + Op.JUMP
-        ),
-        address=Address("0x000000000000000000000000000000005114e2c8"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #     // Set up Trans[0] with a regular call.
-    #     sstore(0x10,call(gas(), 0x57A7, 0, 0,1, 0,32))
-    #     sstore(0, mload(0))
-    #
-    #     // Use staticcall to read Trans[0] of 0x0..57A7.
-    #     mstore(0,0)
-    #     sstore(0x11,staticcall(gas(), 0x57A7, 0,0, 0,32))
-    #     sstore(1, mload(0))
-    #
-    #     // Try to use staticall to write Trans[0]. This should fail.
-    #     mstore(0,0)
-    #     sstore(0x12,staticcall(gas(), 0x57A7, 0,1, 0,32))
-    #     sstore(2, mload(0))
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x10,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=0x57A7,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x1,
-                    ret_offset=Op.PUSH0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=Op.PUSH0, value=Op.MLOAD(offset=Op.PUSH0))
-            + Op.MSTORE(offset=Op.DUP1, value=Op.PUSH0)
-            + Op.SSTORE(
-                key=0x11,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x57A7,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.PUSH0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=Op.PUSH0))
-            + Op.MSTORE(offset=Op.DUP1, value=Op.PUSH0)
-            + Op.SSTORE(
-                key=0x12,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x57A7,
-                    args_offset=Op.DUP2,
-                    args_size=0x1,
-                    ret_offset=Op.PUSH0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=Op.PUSH0))
-            + Op.STOP
-        ),
-        storage={0x2: 0x60A7, 0x12: 0x60A7},
-        address=Address("0x000000000000000000000000000000005d7935df"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #     function tload_temp(loc) -> val {
-    #       val := verbatim_1i_1o(hex"5C", loc)
-    #     }
-    #
-    #     function tstore_temp(loc, val) {
-    #       verbatim_2i_0o(hex"5D", loc, val)
-    #     }
-    #
-    #     // If we are called by ourselves, this is part of the loop.
-    #     if eq(caller(), address()) {
-    #       let counter := tload_temp(0)
-    #
-    #       // Loop ended, return
-    #       if eq(counter,0) {
-    #         return(0,0)
-    #       }
-    #
-    #
-    #       // Change the loop variable and call yourself
-    #       tstore_temp(1, add(tload_temp(1), counter))
-    #       tstore_temp(0, sub(counter, 1))
-    #       let res := callcode(gas(), address(), 0, 0,0, 0,0)
-    #       if iszero(res) { // If the call failed, fail too
-    #          revert(0,0)
-    #       }
-    #     }
-    #
-    #     // If called by a different address, we are the first call and need
-    #     // to setup Trans[0] before starting the loop.
-    # ... (15 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x33, condition=Op.EQ(Op.CALLER, Op.ADDRESS))
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0xE, condition=Op.SUB(Op.CALLER, Op.ADDRESS))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1B]
-            + Op.CALLDATALOAD(offset=Op.PUSH0)
-            + Op.SSTORE(key=0x1, value=Op.DUP1)
-            + Op.PUSH0
-            + Op.JUMP(pc=0x6F)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.ADDRESS,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=Op.PUSH0,
-                ),
-            )
-            + Op.PUSH1[0x2E]
-            + Op.PUSH1[0x1]
-            + Op.JUMP(pc=0x6B)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x3]
-            + Op.SSTORE
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x3A]
-            + Op.PUSH0
-            + Op.JUMP(pc=0x6B)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x69, condition=Op.ISZERO(Op.DUP1))
-            + Op.PUSH1[0x1]
-            + Op.DUP2
-            + Op.PUSH1[0x54]
-            + Op.PUSH1[0x5A]
-            + Op.SWAP4
-            + Op.PUSH1[0x4E]
-            + Op.DUP5
-            + Op.JUMP(pc=0x6B)
-            + Op.JUMPDEST
-            + Op.ADD
-            + Op.DUP4
-            + Op.JUMP(pc=0x6F)
-            + Op.JUMPDEST
-            + Op.SUB
-            + Op.PUSH0
-            + Op.JUMP(pc=0x6F)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x6,
-                condition=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=Op.ADDRESS,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=Op.PUSH0,
-                ),
-            )
-            + Op.REVERT(offset=Op.DUP1, size=Op.PUSH0)
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.TLOAD
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.TSTORE
-            + Op.JUMP
-        ),
-        address=Address("0x000000000000000000000000000000006e3a7204"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #     function tload_temp(loc) -> val {
-    #       val := verbatim_1i_1o(hex"5C", loc)
-    #     }
-    #
-    #     function tstore_temp(loc, val) {
-    #       verbatim_2i_0o(hex"5D", loc, val)
-    #     }
-    #
-    #     // If we are in the loop
-    #     if eq(caller(), address()) {
-    #       let counter := tload_temp(0)
-    #
-    #       // If the counter is zero, we're at loop's end, return
-    #       if eq(counter,0) {
-    #         return(0,0)
-    #       }
-    #
-    #       // If counter isn't zero
-    #       // Call yourself with counter-1 twice then add 1 to Trans[1]
-    #       // Note that one call is callcode() and the other delegatecall().
-    #       // This way the same test checks both of them.
-    #
-    #       tstore_temp(0, sub(counter, 1))
-    #       let res := callcode(gas(), address(), 0, 0,0, 0,0)
-    #       if iszero(res) { // If the call failed, fail too
-    #          revert(0,0)
-    #       }
-    #
-    #       // We need to repair Trans[0] because it got overwritten in
-    # ... (25 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x33, condition=Op.EQ(Op.CALLER, Op.ADDRESS))
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0xE, condition=Op.SUB(Op.CALLER, Op.ADDRESS))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1B]
-            + Op.CALLDATALOAD(offset=Op.PUSH0)
-            + Op.SSTORE(key=0x1, value=Op.DUP1)
-            + Op.PUSH0
-            + Op.JUMP(pc=0x8C)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.ADDRESS,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=Op.PUSH0,
-                ),
-            )
-            + Op.PUSH1[0x2E]
-            + Op.PUSH1[0x1]
-            + Op.JUMP(pc=0x88)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x3]
-            + Op.SSTORE
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x3A]
-            + Op.PUSH0
-            + Op.JUMP(pc=0x88)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x86, condition=Op.ISZERO(Op.DUP1))
-            + Op.PUSH1[0x4A]
-            + Op.SUB(Op.DUP3, 0x1)
-            + Op.PUSH0
-            + Op.JUMP(pc=0x8C)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x82,
-                condition=Op.ISZERO(
-                    Op.CALLCODE(
-                        gas=Op.GAS,
-                        address=Op.ADDRESS,
-                        value=Op.DUP1,
-                        args_offset=Op.DUP1,
-                        args_size=Op.DUP1,
-                        ret_offset=Op.DUP1,
-                        ret_size=Op.PUSH0,
-                    ),
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x61]
-            + Op.SWAP2
-            + Op.SUB
-            + Op.PUSH0
-            + Op.JUMP(pc=0x8C)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x82,
-                condition=Op.ISZERO(
-                    Op.DELEGATECALL(
-                        gas=Op.GAS,
-                        address=Op.ADDRESS,
-                        args_offset=Op.DUP1,
-                        args_size=Op.DUP1,
-                        ret_offset=Op.DUP1,
-                        ret_size=Op.PUSH0,
-                    ),
-                ),
-            )
-            + Op.PUSH1[0x7E]
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x77]
-            + Op.DUP2
-            + Op.JUMP(pc=0x88)
-            + Op.JUMPDEST
-            + Op.ADD
-            + Op.PUSH1[0x1]
-            + Op.JUMP(pc=0x8C)
-            + Op.JUMPDEST
-            + Op.JUMP(pc=0x6)
-            + Op.JUMPDEST
-            + Op.REVERT(offset=Op.DUP1, size=Op.PUSH0)
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.TLOAD
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.TSTORE
-            + Op.JUMP
-        ),
-        address=Address("0x000000000000000000000000000000007074a486"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #     function tload_temp(loc) -> val {
-    #       val := verbatim_1i_1o(hex"5C", loc)
-    #     }
-    #
-    #     function tstore_temp(loc, val) {
-    #       verbatim_2i_0o(hex"5D", loc, val)
-    #     }
-    #
-    #     // The initial value of the counter is zero
-    #     sstore(0, tload_temp(0))
-    #
-    #     // CALLCODE increments our Trans[0]
-    #     sstore(0x11, callcode(gas(), 0xadd1, 0, 0,0, 0,0))
-    #     sstore(1, tload_temp(0))
-    #
-    #     // DELEGATECALL increments our Trans[0]
-    #     sstore(0x12, delegatecall(gas(), 0xadd1, 0,0, 0,0))
-    #     sstore(2, tload_temp(0))
-    #
-    #     // CALL does not increment our Trans[0], it means a different
-    #     // transient storage
-    #     sstore(0x13, call(gas(), 0xadd1, 0, 0,0, 0,0))
-    #     sstore(3, tload_temp(0))
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x6]
-            + Op.PUSH0
-            + Op.JUMP(pc=0x4E)
-            + Op.JUMPDEST
-            + Op.PUSH0
-            + Op.SSTORE
-            + Op.SSTORE(
-                key=0x11,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0xADD1,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=Op.PUSH0,
-                ),
-            )
-            + Op.PUSH1[0x1C]
-            + Op.PUSH0
-            + Op.JUMP(pc=0x4E)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.SSTORE
-            + Op.SSTORE(
-                key=0x12,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0xADD1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=Op.PUSH0,
-                ),
-            )
-            + Op.PUSH1[0x32]
-            + Op.PUSH0
-            + Op.JUMP(pc=0x4E)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x2]
-            + Op.SSTORE
-            + Op.SSTORE(
-                key=0x13,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=0xADD1,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=Op.PUSH0,
-                ),
-            )
-            + Op.PUSH1[0x49]
-            + Op.PUSH0
-            + Op.JUMP(pc=0x4E)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x3]
-            + Op.SSTORE
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.TLOAD
-            + Op.SWAP1
-            + Op.JUMP
-        ),
-        storage={0x0: 0x60A7},
-        address=Address("0x000000000000000000000000000000007f9317bd"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #     function tload_temp(loc) -> val {
-    #       val := verbatim_1i_1o(hex"5C", loc)
-    #     }
-    #
-    #     function tstore_temp(loc, val) {
-    #       verbatim_2i_0o(hex"5D", loc, val)
-    #     }
-    #
-    #     // If we are called by ourselves, this is part of the loop.
-    #     if eq(caller(), address()) {
-    #       let counter := tload_temp(0)
-    #
-    #       // If the counter is equal to zero, we're done - return.
-    #       if eq(counter,0) {
-    #         return(0,0)
-    #       }
-    #
-    #       // Change the loop variable and call yourself
-    #       tstore_temp(1, add(tload_temp(1), counter))
-    #       tstore_temp(0, sub(counter, 1))
-    #       let res := delegatecall(gas(), address(), 0,0, 0,0)
-    #       if iszero(res) { // If the call failed, fail too
-    #          revert(0,0)
-    #       }
-    #     }
-    #
-    #
-    #     // If called by a different address, we are the first call and need
-    #     // to setup Trans[0] before starting the loop.
-    # ... (15 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x33, condition=Op.EQ(Op.CALLER, Op.ADDRESS))
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0xE, condition=Op.SUB(Op.CALLER, Op.ADDRESS))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1B]
-            + Op.CALLDATALOAD(offset=Op.PUSH0)
-            + Op.SSTORE(key=0x1, value=Op.DUP1)
-            + Op.PUSH0
-            + Op.JUMP(pc=0x6E)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.ADDRESS,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=Op.PUSH0,
-                ),
-            )
-            + Op.PUSH1[0x2E]
-            + Op.PUSH1[0x1]
-            + Op.JUMP(pc=0x6A)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x3]
-            + Op.SSTORE
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x3A]
-            + Op.PUSH0
-            + Op.JUMP(pc=0x6A)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x68, condition=Op.ISZERO(Op.DUP1))
-            + Op.PUSH1[0x1]
-            + Op.DUP2
-            + Op.PUSH1[0x54]
-            + Op.PUSH1[0x5A]
-            + Op.SWAP4
-            + Op.PUSH1[0x4E]
-            + Op.DUP5
-            + Op.JUMP(pc=0x6A)
-            + Op.JUMPDEST
-            + Op.ADD
-            + Op.DUP4
-            + Op.JUMP(pc=0x6E)
-            + Op.JUMPDEST
-            + Op.SUB
-            + Op.PUSH0
-            + Op.JUMP(pc=0x6E)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x6,
-                condition=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=Op.ADDRESS,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=Op.PUSH0,
-                ),
-            )
-            + Op.REVERT(offset=Op.DUP1, size=Op.PUSH0)
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.TLOAD
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.TSTORE
-            + Op.JUMP
-        ),
-        address=Address("0x00000000000000000000000000000000c1c922f1"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #     function tload_temp(loc) -> val {
-    #       val := verbatim_1i_1o(hex"5C", loc)
-    #     }
-    #
-    #     function tstore_temp(loc, val) {
-    #       verbatim_2i_0o(hex"5D", loc, val)
-    #     }
-    #
-    #     // If we are at the bottom of the call stack, increment
-    #     // the counter and return
-    #     if eq(calldatasize(), 0) {
-    #        tstore_temp(0, add(tload_temp(0),1))
-    #        return(0,0)
-    #     }
-    #
-    #     // If we are at the top of the stack (called by a different contract),  # noqa: E501
-    #     // set the counter to one
-    #     if iszero(eq(address(), caller())) {
-    #        tstore_temp(0, 1)
-    #     }
-    #
-    #     // Read the most significant byte of the input.
-    #     // Luckily for us the input is top justified - if the caller provided
-    #     // just n bytes (n<20), they will be the top n bytes of calldataload(0).  # noqa: E501
-    #     let callType := shr(
-    #         248,
-    #         calldataload(0)
-    #     )
-    #
-    # ... (32 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x81, condition=Op.ISZERO(Op.CALLDATASIZE))
-            + Op.JUMPI(pc=0x74, condition=Op.SUB(Op.ADDRESS, Op.CALLER))
-            + Op.JUMPDEST
-            + Op.SHR(0xF8, Op.CALLDATALOAD(offset=Op.PUSH0))
-            + Op.MSTORE(
-                offset=Op.PUSH0, value=Op.CALLDATALOAD(offset=Op.PUSH0)
-            )
-            + Op.SUB(Op.CALLDATASIZE, 0x1)
-            + Op.SWAP1
-            + Op.PUSH1[0x1]
-            + Op.SWAP1
-            + Op.JUMPI(pc=0x64, condition=Op.EQ(0xF1, Op.DUP1))
-            + Op.JUMPI(pc=0x54, condition=Op.EQ(0xF2, Op.DUP1))
-            + Op.PUSH1[0xF4]
-            + Op.JUMPI(pc=0x46, condition=Op.EQ)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.JUMPI(pc=0x3B, condition=Op.SUB(Op.ADDRESS, Op.CALLER))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x42]
-            + Op.PUSH0
-            + Op.JUMP(pc=0x94)
-            + Op.JUMPDEST
-            + Op.PUSH0
-            + Op.SSTORE
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH0
-            + Op.SWAP2
-            + Op.DUP3
-            + Op.SWAP2
-            + Op.ADDRESS
-            + Op.GAS
-            + Op.POP(Op.DELEGATECALL)
-            + Op.PUSH0
-            + Op.DUP1
-            + Op.JUMP(pc=0x31)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH0
-            + Op.SWAP2
-            + Op.DUP3
-            + Op.SWAP2
-            + Op.DUP3
-            + Op.ADDRESS
-            + Op.GAS
-            + Op.POP(Op.CALLCODE)
-            + Op.PUSH0
-            + Op.DUP1
-            + Op.JUMP(pc=0x31)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH0
-            + Op.SWAP2
-            + Op.DUP3
-            + Op.SWAP2
-            + Op.DUP3
-            + Op.ADDRESS
-            + Op.GAS
-            + Op.POP(Op.CALL)
-            + Op.PUSH0
-            + Op.DUP1
-            + Op.JUMP(pc=0x31)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x7D]
-            + Op.PUSH1[0x1]
-            + Op.PUSH0
-            + Op.JUMP(pc=0x98)
-            + Op.JUMPDEST
-            + Op.JUMP(pc=0xB)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x92]
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x8C]
-            + Op.PUSH0
-            + Op.JUMP(pc=0x94)
-            + Op.JUMPDEST
-            + Op.ADD
-            + Op.PUSH0
-            + Op.JUMP(pc=0x98)
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.TLOAD
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.TSTORE
-            + Op.JUMP
-        ),
-        address=Address("0x00000000000000000000000000000000c54b5829"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #     function tload_temp(loc) -> val {
-    #       val := verbatim_1i_1o(hex"5C", loc)
-    #     }
-    #
-    #     function tstore_temp(loc, val) {
-    #       verbatim_2i_0o(hex"5D", loc, val)
-    #     }
-    #
-    #     // Write these values to storage (overwriting the 0x60A7's).
-    #     // If these values are not zero, there is a problem.
-    #     sstore(0, tload_temp(0))
-    #     sstore(1, tload_temp(1))
-    #     pop(call(gas(), caller(), 0, 0,0, 0,0))
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x6]
-            + Op.PUSH0
-            + Op.JUMP(pc=0x1D)
-            + Op.JUMPDEST
-            + Op.PUSH0
-            + Op.SSTORE
-            + Op.PUSH1[0x10]
-            + Op.PUSH1[0x1]
-            + Op.JUMP(pc=0x1D)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.SSTORE
-            + Op.CALL(
-                gas=Op.GAS,
-                address=Op.CALLER,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=Op.PUSH0,
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.TLOAD
-            + Op.SWAP1
-            + Op.JUMP
-        ),
-        storage={0x0: 0x60A7, 0x1: 0x60A7},
-        address=Address("0x00000000000000000000000000000000ca11bacc"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #     // These two functions use transient storage.
-    #     // Once the relevant opcodes are added to Yul, simply remove
-    #     // them (from all contracts) and remove the _temp suffices.
-    #     function tload_temp(loc) -> val {
-    #       val := verbatim_1i_1o(hex"5C", loc)
-    #     }
-    #
-    #     function tstore_temp(loc, val) {
-    #       verbatim_2i_0o(hex"5D", loc, val)
-    #     }
-    #
-    #     // If we are called by ourselves, this is part of the loop.
-    #     if eq(caller(), address()) {
-    #       let counter := tload_temp(0)
-    #
-    #       // If the counter is equal to zero, we're done - return.
-    #       if eq(counter,0) {
-    #         return(0,0)
-    #       }
-    #
-    #       // If counter isn't zero, add counter to Trans[1] and do recursion
-    #       tstore_temp(1, add(tload_temp(1), counter))
-    #
-    #       // Change the loop variable and call yourself
-    #       tstore_temp(0, sub(counter, 1))
-    #       let res := call(gas(), address(), 0, 0,0, 0,0)
-    #       if iszero(res) { // If the call failed, fail too
-    #          revert(0,0)
-    #       }
-    # ... (15 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x33, condition=Op.EQ(Op.CALLER, Op.ADDRESS))
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0xE, condition=Op.SUB(Op.CALLER, Op.ADDRESS))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1B]
-            + Op.CALLDATALOAD(offset=Op.PUSH0)
-            + Op.SSTORE(key=0x1, value=Op.DUP1)
-            + Op.PUSH0
-            + Op.JUMP(pc=0x6F)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.ADDRESS,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=Op.PUSH0,
-                ),
-            )
-            + Op.PUSH1[0x2E]
-            + Op.PUSH1[0x1]
-            + Op.JUMP(pc=0x6B)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x3]
-            + Op.SSTORE
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x3A]
-            + Op.PUSH0
-            + Op.JUMP(pc=0x6B)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x69, condition=Op.ISZERO(Op.DUP1))
-            + Op.PUSH1[0x1]
-            + Op.DUP2
-            + Op.PUSH1[0x54]
-            + Op.PUSH1[0x5A]
-            + Op.SWAP4
-            + Op.PUSH1[0x4E]
-            + Op.DUP5
-            + Op.JUMP(pc=0x6B)
-            + Op.JUMPDEST
-            + Op.ADD
-            + Op.DUP4
-            + Op.JUMP(pc=0x6F)
-            + Op.JUMPDEST
-            + Op.SUB
-            + Op.PUSH0
-            + Op.JUMP(pc=0x6F)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x6,
-                condition=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.ADDRESS,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=Op.PUSH0,
-                ),
-            )
-            + Op.REVERT(offset=Op.DUP1, size=Op.PUSH0)
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.TLOAD
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.TSTORE
-            + Op.JUMP
-        ),
-        address=Address("0x00000000000000000000000000000000ebd141d5"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
-    # Source: Yul
-    # {
-    #   let func := shr(224, calldataload(0))
-    #   let param := calldataload(4)
-    #   sstore(0, func)
-    #   mstore(0, param)
-    #   sstore(1, call(gas(), func, 0, 0,32, 0,0))
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH0
-            + Op.DUP1
-            + Op.PUSH1[0x20]
-            + Op.DUP2
-            + Op.DUP1
-            + Op.SHR(0xE0, Op.CALLDATALOAD(offset=Op.DUP1))
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.SSTORE(key=Op.DUP4, value=Op.DUP2)
-            + Op.DUP3
-            + Op.MSTORE
-            + Op.GAS
-            + Op.SSTORE(key=0x1, value=Op.CALL)
-            + Op.STOP
-        ),
-        address=Address("0xdd53b677a6fd4e871a6355f283b1bd7ceb95a95e"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        nonce=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/Cancun/stEIP1153_transientStorage/test_trans_storage_reset.py b/tests/ported_static/Cancun/stEIP1153_transientStorage/test_trans_storage_reset.py
deleted file mode 100644
index 5b85bca033b..00000000000
--- a/tests/ported_static/Cancun/stEIP1153_transientStorage/test_trans_storage_reset.py
+++ /dev/null
@@ -1,845 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/Cancun/stEIP1153_transientStorage
-transStorageResetFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/Cancun/stEIP1153_transientStorage/transStorageResetFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f1f1fe",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f1f1fd",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f1f100",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 48879, 1: 1}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 1}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f100fe",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f100fd",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f10000",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743, 1: 1}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 32343}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f2f1fe",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f2f1fd",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f2f100",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 48879, 1: 1, 16: 1}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f2f2fe",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f2f2fd",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f2f200",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 48879, 1: 1, 16: 1}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f2f4fe",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f2f4fd",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f2f400",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 48879, 1: 1, 16: 1}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f200fe",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f200fd",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f20000",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 0xBAD0BEEF, 1: 1, 16: 32343}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f4f1fe",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f4f1fd",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f4f100",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 48879, 1: 1, 16: 1}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f4f2fe",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f4f2fd",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f4f200",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 48879, 1: 1, 16: 1}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f4f4fe",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f4f4fd",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f4f400",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 48879, 1: 1, 16: 1}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f400fe",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f400fd",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-        (
-            "d6c2107a0000000000000000000000009f075370ef41d4cd90151e731e33836e6f521669000000000000000000000000d1f046b080a87137c61a14bb81c2b6bbcec170840000000000000000000000000000000000000000000000000000000000f40000",  # noqa: E501
-            {
-                Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"): Account(
-                    storage={
-                        0: 0x9F075370EF41D4CD90151E731E33836E6F521669,
-                        1: 1,
-                    }
-                ),
-                Address("0x9f075370ef41d4cd90151e731e33836e6f521669"): Account(
-                    storage={0: 0xBAD0BEEF, 1: 1, 16: 32343}
-                ),
-                Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"): Account(
-                    storage={16: 24743}
-                ),
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_trans_storage_reset(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x48DC5A9F099CAAAA557742CA3A990A94BE45B9969126A1BC74E5E8BE5A2B5B47
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    # Source: Yul
-    # {
-    #   let reverter := calldataload(4)
-    #   let dead     := calldataload(36)
-    #   let param := calldataload(68)
-    #   sstore(0, reverter)
-    #   mstore(0, reverter)
-    #   mstore(32, dead)
-    #   mstore(64, param)
-    #   sstore(1, call(gas(), reverter, 0, 0, 96, 0, 0))
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH0
-            + Op.DUP1
-            + Op.PUSH1[0x60]
-            + Op.DUP2
-            + Op.DUP1
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.CALLDATALOAD(offset=0x24)
-            + Op.CALLDATALOAD(offset=0x44)
-            + Op.SWAP1
-            + Op.SSTORE(key=Op.DUP5, value=Op.DUP3)
-            + Op.MSTORE(offset=Op.DUP5, value=Op.DUP3)
-            + Op.PUSH1[0x20]
-            + Op.MSTORE
-            + Op.PUSH1[0x40]
-            + Op.MSTORE
-            + Op.GAS
-            + Op.SSTORE(key=0x1, value=Op.CALL)
-            + Op.STOP
-        ),
-        address=Address("0x1679c7439ef325a99a6afc54a8f7894c3da35b16"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
-    pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=Op.PUSH0)
-            + Op.CALLDATALOAD(offset=0x20)
-            + Op.SWAP1
-            + Op.PUSH0
-            + Op.MSTORE
-            + Op.MSTORE(offset=0x20, value=Op.DUP1)
-            + Op.BYTE(0x1D, Op.CALLDATALOAD(offset=0x40))
-            + Op.SWAP1
-            + Op.PUSH1[0x19]
-            + Op.PUSH0
-            + Op.JUMP(pc=0xA8)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x39, condition=Op.ISZERO)
-            + Op.PUSH2[0x60A7]
-            + Op.PUSH1[0x27]
-            + Op.PUSH0
-            + Op.JUMP(pc=0xA8)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x2D, condition=Op.EQ)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x37]
-            + Op.PUSH2[0xBEEF]
-            + Op.PUSH0
-            + Op.JUMP(pc=0xAC)
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x43]
-            + Op.PUSH2[0x60A7]
-            + Op.PUSH0
-            + Op.JUMP(pc=0xAC)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
-            + Op.PUSH0
-            + Op.SWAP2
-            + Op.DIV(Op.GAS, 0x2)
-            + Op.SWAP1
-            + Op.JUMPI(pc=0x96, condition=Op.EQ(0xF1, Op.DUP1))
-            + Op.JUMPI(pc=0x84, condition=Op.EQ(0xF2, Op.DUP1))
-            + Op.PUSH1[0xF4]
-            + Op.JUMPI(pc=0x74, condition=Op.EQ)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.DUP3)
-            + Op.PUSH1[0x70]
-            + Op.PUSH0
-            + Op.JUMP(pc=0xA8)
-            + Op.JUMPDEST
-            + Op.PUSH0
-            + Op.SSTORE
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH0
-            + Op.DUP1
-            + Op.SWAP4
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP3
-            + Op.PUSH1[0x60]
-            + Op.SWAP3
-            + Op.DELEGATECALL
-            + Op.PUSH0
-            + Op.DUP1
-            + Op.JUMP(pc=0x65)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH0
-            + Op.DUP1
-            + Op.DUP1
-            + Op.SWAP5
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP4
-            + Op.PUSH1[0x60]
-            + Op.SWAP4
-            + Op.CALLCODE
-            + Op.PUSH0
-            + Op.DUP1
-            + Op.JUMP(pc=0x65)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH0
-            + Op.DUP1
-            + Op.DUP1
-            + Op.SWAP5
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP4
-            + Op.PUSH1[0x60]
-            + Op.SWAP4
-            + Op.CALL
-            + Op.PUSH0
-            + Op.DUP1
-            + Op.JUMP(pc=0x65)
-            + Op.JUMPDEST
-            + Op.TLOAD
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.TSTORE
-            + Op.JUMP
-        ),
-        storage={0x1: 0x60A7},
-        address=Address("0x9f075370ef41d4cd90151e731e33836e6f521669"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=Op.PUSH0)
-            + Op.CALLDATALOAD(offset=0x20)
-            + Op.MSTORE(offset=Op.PUSH0, value=Op.DUP2)
-            + Op.PUSH1[0x20]
-            + Op.MSTORE
-            + Op.BYTE(0x1E, Op.CALLDATALOAD(offset=0x40))
-            + Op.BYTE(0x1F, Op.CALLDATALOAD(offset=0x40))
-            + Op.SWAP2
-            + Op.PUSH2[0x7E57]
-            + Op.SWAP2
-            + Op.SWAP1
-            + Op.JUMPI(pc=0x91, condition=Op.EQ(0xF1, Op.DUP2))
-            + Op.JUMPI(pc=0x80, condition=Op.EQ(0xF2, Op.DUP2))
-            + Op.JUMPI(pc=0x70, condition=Op.EQ(0xF4, Op.DUP2))
-            + Op.POP
-            + Op.JUMPI(pc=0x60, condition=Op.ISZERO)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x10]
-            + Op.SSTORE
-            + Op.JUMPI(pc=0x5E, condition=Op.ISZERO(Op.DUP1))
-            + Op.JUMPI(pc=0x5A, condition=Op.EQ(0xFD, Op.DUP1))
-            + Op.JUMPI(pc=0x58, condition=Op.EQ(0xFE, Op.DUP1))
-            + Op.PUSH1[0xFF]
-            + Op.JUMPI(pc=0x55, condition=Op.EQ)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SELFDESTRUCT(address=Op.PUSH0)
-            + Op.JUMPDEST
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.REVERT(offset=Op.DUP1, size=Op.PUSH0)
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x6C]
-            + Op.PUSH4[0xBAD0BEEF]
-            + Op.PUSH0
-            + Op.JUMP(pc=0xA2)
-            + Op.JUMPDEST
-            + Op.JUMP(pc=0x37)
-            + Op.JUMPDEST
-            + Op.PUSH0
-            + Op.DUP1
-            + Op.SWAP4
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH1[0x40]
-            + Op.SWAP2
-            + Op.GAS
-            + Op.DELEGATECALL
-            + Op.JUMP(pc=0x37)
-            + Op.JUMPDEST
-            + Op.PUSH0
-            + Op.DUP1
-            + Op.DUP1
-            + Op.SWAP5
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP4
-            + Op.POP
-            + Op.PUSH1[0x40]
-            + Op.SWAP3
-            + Op.GAS
-            + Op.CALLCODE
-            + Op.JUMP(pc=0x37)
-            + Op.JUMPDEST
-            + Op.PUSH0
-            + Op.DUP1
-            + Op.DUP1
-            + Op.SWAP5
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP4
-            + Op.POP
-            + Op.PUSH1[0x40]
-            + Op.SWAP3
-            + Op.GAS
-            + Op.CALL
-            + Op.JUMP(pc=0x37)
-            + Op.JUMPDEST
-            + Op.TSTORE
-            + Op.JUMP
-        ),
-        storage={0x10: 0x60A7},
-        address=Address("0xd1f046b080a87137c61a14bb81c2b6bbcec17084"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        nonce=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/Cancun/stEIP4844_blobtransactions/__init__.py b/tests/ported_static/Cancun/stEIP4844_blobtransactions/__init__.py
deleted file mode 100644
index 344841db7d1..00000000000
--- a/tests/ported_static/Cancun/stEIP4844_blobtransactions/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from stEIP4844_blobtransactions."""
diff --git a/tests/ported_static/Cancun/stEIP5656_MCOPY/__init__.py b/tests/ported_static/Cancun/stEIP5656_MCOPY/__init__.py
deleted file mode 100644
index 2743ddae1d6..00000000000
--- a/tests/ported_static/Cancun/stEIP5656_MCOPY/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from stEIP5656_MCOPY."""
diff --git a/tests/ported_static/Cancun/stEIP5656_MCOPY/test_mcopy.py b/tests/ported_static/Cancun/stEIP5656_MCOPY/test_mcopy.py
deleted file mode 100644
index 94329bb3711..00000000000
--- a/tests/ported_static/Cancun/stEIP5656_MCOPY/test_mcopy.py
+++ /dev/null
@@ -1,371 +0,0 @@
-"""
-MCOPY memory copy test cases.
-
-Ported from:
-tests/static/state_tests/Cancun/stEIP5656_MCOPY/MCOPYFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/Cancun/stEIP5656_MCOPY/MCOPYFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
-                        1: 0xC1C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xC1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0,  # noqa: E501
-                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xA0A1C1A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
-                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001f0000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDE,  # noqa: E501
-                        1: 0xDFC1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xA0A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0,  # noqa: E501
-                        1: 0xC1C2C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
-                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
-                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xA0A1A0A1A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
-                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001f0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
-                        1: 0xBFC1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001f",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
-                        1: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
-                        1: 0xA1A2C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xA0A0A1A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
-                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001f",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xA0A1A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBE,  # noqa: E501
-                        1: 0xBFC1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
-                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
-                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
-                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000033",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
-                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
-                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000001f0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"): Account(
-                    storage={
-                        0: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
-                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_mcopy(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """MCOPY memory copy test cases."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1687174231,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=1000000,
-    )
-
-    # Source: Yul
-    # {
-    #   // Fill memory at [0-96] (3x32) with the pattern of unique bytes.
-    #   mstore( 0, 0xa0a1a2a3a4a5a6a7a8a9aAaBaCaDaEaFb0b1b2b3b4b5b6b7b8b9bAbBbCbDbEbF)  # noqa: E501
-    #   mstore(32, 0xc0c1c2c3c4c5c6c7c8c9cAcBcCcDcEcFd0d1d2d3d4d5d6d7d8d9dAdBdCdDdEdF)  # noqa: E501
-    #   mstore(64, 0xe0e1e2e3e4e5e6e7e8e9eAeBeCeDeEeFf0f1f2f3f4f5f6f7f8f9fAfBfCfDfEfF)  # noqa: E501
-    #
-    #   // MCOPY using parameters from CALLDATA.
-    #   mcopy(calldataload(0), calldataload(32), calldataload(64))
-    #
-    #   // Dump memory at [0-96] to 3 storage slots.
-    #   sstore(0, mload( 0))
-    #   sstore(1, mload(32))
-    #   sstore(2, mload(64))
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=Op.PUSH0,
-                value=0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
-            )
-            + Op.MCOPY(
-                dest_offset=Op.CALLDATALOAD(offset=Op.PUSH0),
-                offset=Op.CALLDATALOAD(offset=0x20),
-                size=Op.CALLDATALOAD(offset=0x40),
-            )
-            + Op.SSTORE(key=Op.PUSH0, value=Op.MLOAD(offset=Op.PUSH0))
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x40))
-            + Op.STOP
-        ),
-        address=Address("0xbfd584ec9dc8fbadcea812c707e1765b4df8fa6c"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x3B9ACA00)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1000000,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/Cancun/stEIP5656_MCOPY/test_mcopy_copy_cost.py b/tests/ported_static/Cancun/stEIP5656_MCOPY/test_mcopy_copy_cost.py
deleted file mode 100644
index 4016ad003a3..00000000000
--- a/tests/ported_static/Cancun/stEIP5656_MCOPY/test_mcopy_copy_cost.py
+++ /dev/null
@@ -1,712 +0,0 @@
-"""
-Test cases for the cost of memory copy in the MCOPY instruction.
-
-Ported from:
-tests/static/state_tests/Cancun/stEIP5656_MCOPY/MCOPY_copy_costFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/Cancun/stEIP5656_MCOPY/MCOPY_copy_costFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
-    [
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001f",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001f",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aedf",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aedf",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aee0",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aee0",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aee1",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aee1",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001f",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001f",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000aedf",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000aedf",  # noqa: E501
-            55697,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000aee0",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000aee0",  # noqa: E501
-            55697,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000aee1",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000aee1",  # noqa: E501
-            55697,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000001f",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000001f",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f0000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f0000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f0000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f0000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000aedf",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000aedf",  # noqa: E501
-            55697,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000aee0",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000aee0",  # noqa: E501
-            55697,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000aee1",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000aee1",  # noqa: E501
-            55697,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001f",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001f",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            55697,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000aedf",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000aedf",  # noqa: E501
-            55697,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000aee0",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000aee0",  # noqa: E501
-            55697,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000aee1",  # noqa: E501
-            100000,
-            {
-                Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000aee1",  # noqa: E501
-            55697,
-            {},
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_mcopy_copy_cost(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Test cases for the cost of memory copy in the MCOPY instruction."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1687174231,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=1000000,
-    )
-
-    # Source: Yul
-    # {
-    #   function mcopy(dst, src, size) { verbatim_3i_0o(hex"5e", dst, src, size) }  # noqa: E501
-    #
-    #   // Put a flag in storage indicating successful execution (will be reverted in case of OOG).  # noqa: E501
-    #   sstore(0, 1)
-    #
-    #   // Expand memory to cover memory expansion cost before MCOPY.
-    #   // The test uses up to 1400 memory words.
-    #   mstore(44800, 1)
-    #
-    #   // MCOPY using src and size from CALLDATA to 0 destination.
-    #   mcopy(0, calldataload(0), calldataload(32))
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMP(pc=0xC)
-            + Op.JUMPDEST
-            + Op.MCOPY(dest_offset=Op.DUP3, offset=Op.DUP3, size=Op.DUP3)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.SSTORE(key=Op.PUSH0, value=0x1)
-            + Op.MSTORE(offset=0xAF00, value=0x1)
-            + Op.PUSH1[0x22]
-            + Op.CALLDATALOAD(offset=0x20)
-            + Op.CALLDATALOAD(offset=Op.PUSH0)
-            + Op.PUSH0
-            + Op.JUMP(pc=0x3)
-            + Op.JUMPDEST
-        ),
-        address=Address("0x9f1a7b52bb2d016223285964cb0876dff8c9c9f8"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x3B9ACA00)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/Cancun/stEIP5656_MCOPY/test_mcopy_memory_expansion_cost.py b/tests/ported_static/Cancun/stEIP5656_MCOPY/test_mcopy_memory_expansion_cost.py
deleted file mode 100644
index 796779825cb..00000000000
--- a/tests/ported_static/Cancun/stEIP5656_MCOPY/test_mcopy_memory_expansion_cost.py
+++ /dev/null
@@ -1,555 +0,0 @@
-"""
-Test cases for the memory expansion cost in the MCOPY instruction.
-
-Ported from:
-tests/static/state_tests/Cancun/stEIP5656_MCOPY
-MCOPY_memory_expansion_costFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/Cancun/stEIP5656_MCOPY/MCOPY_memory_expansion_costFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001f00000000000000000000000000000000000000000000000000000000000002c2",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 768}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000540",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 1408}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000540",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 1408}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002c2",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 768}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000002c2",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 768}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000540",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 1408}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000540",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 1408}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000540",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 1408}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000001f00000000000000000000000000000000000000000000000000000000000002c2",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 768}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000002c2",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 768}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000540",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 1408}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000540",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 1408}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000540",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 1408}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 0xFA11ED}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 0xFA11ED}
-                )
-            },
-        ),
-        (
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 0xFA11ED}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 0xFA11ED}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000ffffffffffffffff",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 0xFA11ED}
-                )
-            },
-        ),
-        (
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 0xFA11ED}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 0xFA11ED}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_mcopy_memory_expansion_cost(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Test cases for the memory expansion cost in the MCOPY instruction."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1687174231,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=1000000,
-    )
-
-    # Source: Yul
-    # {
-    #   // Take most of the SSTORE cost before MCOPY.
-    #   sstore(0, 1)
-    #
-    #   // MCOPY using parameters from CALLDATA.
-    #   mcopy(calldataload(0), calldataload(32), calldataload(64))
-    #
-    #   // Put MSIZE in storage.
-    #   sstore(0, msize())
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=Op.PUSH0, value=0x1)
-            + Op.MCOPY(
-                dest_offset=Op.CALLDATALOAD(offset=Op.PUSH0),
-                offset=Op.CALLDATALOAD(offset=0x20),
-                size=Op.CALLDATALOAD(offset=0x40),
-            )
-            + Op.SSTORE(key=Op.PUSH0, value=Op.MSIZE)
-            + Op.STOP
-        ),
-        storage={0x0: 0xFA11ED},
-        address=Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x3B9ACA00)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=100000,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/Cancun/stEIP5656_MCOPY/MCOPY_memory_expansion_costFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001f00000000000000000000000000000000000000000000000000000000000002c2",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 768}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000540",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 1408}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000540",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 1408}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002c2",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 768}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000002c2",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 768}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000540",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 1408}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000540",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 1408}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000540",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 1408}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000001f00000000000000000000000000000000000000000000000000000000000002c2",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 768}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000002c2",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 768}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000540",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 1408}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000540",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 1408}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000540",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 1408}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 0xFA11ED}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 0xFA11ED}
-                )
-            },
-        ),
-        (
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 0xFA11ED}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 0xFA11ED}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000ffffffffffffffff",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 0xFA11ED}
-                )
-            },
-        ),
-        (
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 0xFA11ED}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {
-                Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"): Account(
-                    storage={0: 0xFA11ED}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_mcopy_memory_expansion_cost_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Test cases for the memory expansion cost in the MCOPY instruction."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1687174231,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=1000000,
-    )
-
-    # Source: Yul
-    # {
-    #   // Take most of the SSTORE cost before MCOPY.
-    #   sstore(0, 1)
-    #
-    #   // MCOPY using parameters from CALLDATA.
-    #   mcopy(calldataload(0), calldataload(32), calldataload(64))
-    #
-    #   // Put MSIZE in storage.
-    #   sstore(0, msize())
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=Op.PUSH0, value=0x1)
-            + Op.MCOPY(
-                dest_offset=Op.CALLDATALOAD(offset=Op.PUSH0),
-                offset=Op.CALLDATALOAD(offset=0x20),
-                size=Op.CALLDATALOAD(offset=0x40),
-            )
-            + Op.SSTORE(key=Op.PUSH0, value=Op.MSIZE)
-            + Op.STOP
-        ),
-        storage={0x0: 0xFA11ED},
-        address=Address("0x147daecf943fa4fb48d1b7287571525b0baefeb9"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x3B9ACA00)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=100000,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/Shanghai/__init__.py b/tests/ported_static/Shanghai/__init__.py
deleted file mode 100644
index af31530b519..00000000000
--- a/tests/ported_static/Shanghai/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from Shanghai."""
diff --git a/tests/ported_static/Shanghai/stEIP3651_warmcoinbase/__init__.py b/tests/ported_static/Shanghai/stEIP3651_warmcoinbase/__init__.py
deleted file mode 100644
index 5519aca3d48..00000000000
--- a/tests/ported_static/Shanghai/stEIP3651_warmcoinbase/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from stEIP3651_warmcoinbase."""
diff --git a/tests/ported_static/Shanghai/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py b/tests/ported_static/Shanghai/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py
deleted file mode 100644
index 908daf17c4c..00000000000
--- a/tests/ported_static/Shanghai/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py
+++ /dev/null
@@ -1,310 +0,0 @@
-"""
-Test ported from static filler.
-
-Ported from:
-tests/static/state_tests/Shanghai/stEIP3651_warmcoinbase
-coinbaseWarmAccountCallGasFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/Shanghai/stEIP3651_warmcoinbase/coinbaseWarmAccountCallGasFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xa4a48fc5f3526a9bc06a0136ab0ba1d9574d15ba"): Account(
-                    storage={0: 100}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xa4a48fc5f3526a9bc06a0136ab0ba1d9574d15ba"): Account(
-                    storage={0: 100}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xa4a48fc5f3526a9bc06a0136ab0ba1d9574d15ba"): Account(
-                    storage={0: 100}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xa4a48fc5f3526a9bc06a0136ab0ba1d9574d15ba"): Account(
-                    storage={0: 100}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xa4a48fc5f3526a9bc06a0136ab0ba1d9574d15ba"): Account(
-                    storage={0: 100}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0xa4a48fc5f3526a9bc06a0136ab0ba1d9574d15ba"): Account(
-                    storage={0: 100}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0xa4a48fc5f3526a9bc06a0136ab0ba1d9574d15ba"): Account(
-                    storage={0: 100}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            {
-                Address("0xa4a48fc5f3526a9bc06a0136ab0ba1d9574d15ba"): Account(
-                    storage={0: 100}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_coinbase_warm_account_call_gas(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x50228c44ed92561d94511e8518a75aa463bd444b")
-    sender = EOA(
-        key=0x48DC5A9F099CAAAA557742CA3A990A94BE45B9969126A1BC74E5E8BE5A2B5B47
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
-    pre[coinbase] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
-    # Source: Yul
-    # {
-    #    // Save the coinbase value
-    #    let cb := coinbase()
-    #
-    #    // Minimum gas spent on the measurement, which changes depending on
-    #    // the tested opcode
-    #    //
-    #    // Note that this value can change (mostly down) when Yul rolls out new  # noqa: E501
-    #    // optimizations
-    #    let measureGas
-    #
-    #    let gas0, gas1
-    #    let retVal
-    #
-    #    // We can only check the gas of one opcode per transaction,
-    #    // because the first check adds the account to the
-    #    // 'accessed_addresses' list.
-    #    switch calldataload(4)
-    #    case 0 {
-    #      // EXTCODESIZE
-    #      measureGas := 8
-    #      gas0 := gas()
-    #      retVal := extcodesize(cb)
-    #      gas1 := gas()
-    #    }
-    #    case 1 {
-    #      // EXTCODECOPY
-    #      measureGas := 5
-    #      gas0 := gas()
-    #      extcodecopy(cb, 0, 0, 0)
-    # ... (53 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.COINBASE
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.PUSH1[0x0]
-            + Op.JUMPI(pc=0xCC, condition=Op.ISZERO(Op.DUP2))
-            + Op.JUMPI(pc=0xBA, condition=Op.EQ(0x1, Op.DUP2))
-            + Op.POP
-            + Op.JUMPI(pc=0xAD, condition=Op.EQ(0x2, Op.DUP1))
-            + Op.JUMPI(pc=0xA0, condition=Op.EQ(0x3, Op.DUP1))
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x4, Op.DUP1))
-            + Op.JUMPI(pc=0x74, condition=Op.EQ(0x5, Op.DUP1))
-            + Op.JUMPI(pc=0x5F, condition=Op.EQ(0x6, Op.DUP1))
-            + Op.PUSH1[0x7]
-            + Op.JUMPI(pc=0x40, condition=Op.EQ)
-            + Op.REVERT(offset=Op.DUP1, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH1[0xB]
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.GAS
-            + Op.SWAP6
-            + Op.PUSH2[0x2710]
-            + Op.STATICCALL
-            + Op.SWAP2
-            + Op.GAS
-            + Op.SWAP1
-            + Op.JUMPDEST
-            + Op.SUB
-            + Op.SSTORE(key=0x0, value=Op.SUB)
-            + Op.PUSH1[0x0]
-            + Op.MSTORE
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0xB]
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.GAS
-            + Op.SWAP6
-            + Op.PUSH2[0x2710]
-            + Op.DELEGATECALL
-            + Op.SWAP2
-            + Op.GAS
-            + Op.SWAP1
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0xB]
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.GAS
-            + Op.SWAP7
-            + Op.PUSH2[0x2710]
-            + Op.CALLCODE
-            + Op.SWAP2
-            + Op.GAS
-            + Op.SWAP1
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0xB]
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.GAS
-            + Op.SWAP7
-            + Op.PUSH2[0x2710]
-            + Op.CALL
-            + Op.SWAP2
-            + Op.GAS
-            + Op.SWAP1
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x8]
-            + Op.GAS
-            + Op.SWAP2
-            + Op.BALANCE
-            + Op.SWAP2
-            + Op.GAS
-            + Op.SWAP1
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x8]
-            + Op.GAS
-            + Op.SWAP2
-            + Op.EXTCODEHASH
-            + Op.SWAP2
-            + Op.GAS
-            + Op.SWAP1
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.SWAP2
-            + Op.PUSH1[0x5]
-            + Op.SWAP2
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.DUP1
-            + Op.GAS
-            + Op.SWAP4
-            + Op.EXTCODECOPY
-            + Op.GAS
-            + Op.SWAP1
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x8]
-            + Op.GAS
-            + Op.SWAP2
-            + Op.EXTCODESIZE
-            + Op.SWAP2
-            + Op.GAS
-            + Op.SWAP1
-            + Op.JUMP(pc=0x51)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0xa4a48fc5f3526a9bc06a0136ab0ba1d9574d15ba"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=80000,
-        nonce=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/Shanghai/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas_fail.py b/tests/ported_static/Shanghai/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas_fail.py
deleted file mode 100644
index cad9034e1ca..00000000000
--- a/tests/ported_static/Shanghai/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas_fail.py
+++ /dev/null
@@ -1,251 +0,0 @@
-"""
-Test ported from static filler.
-
-Ported from:
-tests/static/state_tests/Shanghai/stEIP3651_warmcoinbase
-coinbaseWarmAccountCallGasFailFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/Shanghai/stEIP3651_warmcoinbase/coinbaseWarmAccountCallGasFailFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000008ddf5d9a5251c41efd2949f53db0a464116c7c6e",  # noqa: E501
-            {
-                Address("0x0a92fc97bb4c47b3d5e9e96fbb1c3fc2f07dba81"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000498516b6b2f25cb6a8e011a7c37a617b77e7d500",  # noqa: E501
-            {
-                Address("0x0a92fc97bb4c47b3d5e9e96fbb1c3fc2f07dba81"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000008873820bb96daa39db93ae64a9d6397e4c6a48d7",  # noqa: E501
-            {
-                Address("0x0a92fc97bb4c47b3d5e9e96fbb1c3fc2f07dba81"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000303b6790d019874a107418eb549e4e7766a64728",  # noqa: E501
-            {
-                Address("0x0a92fc97bb4c47b3d5e9e96fbb1c3fc2f07dba81"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_coinbase_warm_account_call_gas_fail(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x50228c44ed92561d94511e8518a75aa463bd444b")
-    sender = EOA(
-        key=0x48DC5A9F099CAAAA557742CA3A990A94BE45B9969126A1BC74E5E8BE5A2B5B47
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    # Source: Yul
-    # {
-    #    // Depending on the called contract here, the subcall will perform
-    #    // another call/delegatecall/staticcall/callcode that will only succeed  # noqa: E501
-    #    // if coinbase is considered warm by default (post-Shanghai).
-    #    let calladdr := calldataload(4)
-    #
-    #    let callgas := 100
-    #    switch calladdr
-    #    case <contract:0x0000000000000000000000000000000000001000> {
-    #      // Extra: COINBASE + 6xPUSH1 + DUP6 + 2xPOP
-    #      callgas := add(callgas, 27)
-    #    }
-    #    case <contract:0x0000000000000000000000000000000000002000> {
-    #      // Extra: COINBASE + 6xPUSH1 + DUP6 + 2xPOP
-    #      callgas := add(callgas, 27)
-    #    }
-    #    case <contract:0x0000000000000000000000000000000000003000> {
-    #      // Extra: COINBASE + 5xPUSH1 + DUP6 + 2xPOP
-    #      callgas := add(callgas, 24)
-    #    }
-    #    case <contract:0x0000000000000000000000000000000000004000> {
-    #      // Extra: COINBASE + 5xPUSH1 + DUP6 + 2xPOP
-    #      callgas := add(callgas, 24)
-    #    }
-    #    // Call and save result
-    #    sstore(0, call(callgas, calladdr, 0, 0, 0, 0, 0))
-    #
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.PUSH1[0x64]
-            + Op.DUP2
-            + Op.JUMPI(
-                pc=0x88,
-                condition=Op.EQ(
-                    0x8DDF5D9A5251C41EFD2949F53DB0A464116C7C6E,
-                    Op.DUP1,
-                ),
-            )
-            + Op.JUMPI(
-                pc=0x88,
-                condition=Op.EQ(
-                    0x498516B6B2F25CB6A8E011A7C37A617B77E7D500,
-                    Op.DUP1,
-                ),
-            )
-            + Op.JUMPI(
-                pc=0x80,
-                condition=Op.EQ(
-                    0x8873820BB96DAA39DB93AE64A9D6397E4C6A48D7,
-                    Op.DUP1,
-                ),
-            )
-            + Op.PUSH20[0x303B6790D019874A107418EB549E4E7766A64728]
-            + Op.JUMPI(pc=0x79, condition=Op.EQ)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=Op.CALL)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x18]
-            + Op.ADD
-            + Op.JUMP(pc=0x73)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x18]
-            + Op.ADD
-            + Op.JUMP(pc=0x73)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x1B]
-            + Op.ADD
-            + Op.JUMP(pc=0x73)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0a92fc97bb4c47b3d5e9e96fbb1c3fc2f07dba81"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=Op.DUP2,
-                address=Op.COINBASE,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x303b6790d019874a107418eb549e4e7766a64728"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=Op.DUP2,
-                address=Op.COINBASE,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x498516b6b2f25cb6a8e011a7c37a617b77e7d500"),  # noqa: E501
-    )
-    pre[coinbase] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.DUP2,
-                address=Op.COINBASE,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x8873820bb96daa39db93ae64a9d6397e4c6a48d7"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=Op.DUP2,
-                address=Op.COINBASE,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x8ddf5d9a5251c41efd2949f53db0a464116c7c6e"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=80000,
-        nonce=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/Shanghai/stEIP3855_push0/__init__.py b/tests/ported_static/Shanghai/stEIP3855_push0/__init__.py
deleted file mode 100644
index 79966be3e0d..00000000000
--- a/tests/ported_static/Shanghai/stEIP3855_push0/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from stEIP3855_push0."""
diff --git a/tests/ported_static/Shanghai/stEIP3855_push0/test_push0.py b/tests/ported_static/Shanghai/stEIP3855_push0/test_push0.py
deleted file mode 100644
index 6ae9e2f0065..00000000000
--- a/tests/ported_static/Shanghai/stEIP3855_push0/test_push0.py
+++ /dev/null
@@ -1,1325 +0,0 @@
-"""
-Test ported from static filler.
-
-Ported from:
-tests/static/state_tests/Shanghai/stEIP3855_push0/push0Filler.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/Shanghai/stEIP3855_push0/push0Filler.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "0000000000000000000000000000000000000200",
-            {
-                Address("0x0000000000000000000000000000000000000200"): Account(
-                    storage={0: 1}
-                ),
-                Address("0x0000000000000000000000000000000000000400"): Account(
-                    storage={0: 10, 1: 10}
-                ),
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000300",
-            {
-                Address("0x0000000000000000000000000000000000000400"): Account(
-                    storage={0: 10, 1: 10}
-                ),
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={1: 1}
-                ),
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000700",
-            {
-                Address("0x0000000000000000000000000000000000000400"): Account(
-                    storage={0: 10, 1: 10}
-                ),
-                Address("0x0000000000000000000000000000000000000700"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000400",
-            {
-                Address("0x0000000000000000000000000000000000000400"): Account(
-                    storage={0: 2}
-                ),
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000500",
-            {
-                Address("0x0000000000000000000000000000000000000400"): Account(
-                    storage={0: 10, 1: 10}
-                ),
-                Address("0x0000000000000000000000000000000000000500"): Account(
-                    storage={0: 1, 1: 1, 2: 255}
-                ),
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
-        ),
-        (
-            "0000000000000000000000000000000000001000",
-            {
-                Address("0x0000000000000000000000000000000000000400"): Account(
-                    storage={0: 10, 1: 10}
-                ),
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4", "case5"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_push0(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=89128960,
-    )
-
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=bytes.fromhex(
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f"  # noqa: E501
-            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f1717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "171717171717171717171717171717171717171717171717171717171717171717171717"  # noqa: E501
-            "1717171717171717171717171717171717171717171717171717171717171760019055"  # noqa: E501
-        ),
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000000200"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-            + Op.PUSH0
-        ),
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000000300"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=Op.PUSH0, value=0x2) + Op.SSTORE(key=0x1, value=0x0)
-        ),
-        storage={0x0: 0xA, 0x1: 0xA},
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000000400"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x600,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.RETURNDATACOPY(dest_offset=0x1F, offset=0x0, size=0x1)
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000000500"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=Op.PUSH0, value=0xFF)
-            + Op.RETURN(offset=0x0, size=0x1)
-        ),
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000000600"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMP(pc=0x4)
-            + Op.PUSH0
-            + Op.JUMPDEST
-            + Op.SSTORE(key=Op.PUSH0, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000000700"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=Op.PUSH0, value=0x1),
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: Yul
-    # {
-    #     sstore(0, call(100000, shr(96, calldataload(0)), 0, 0, 0, 0, 0))
-    #     sstore(1, 1)
-    #   }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=Op.SHR(0x60, Op.CALLDATALOAD(offset=Op.DUP1)),
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=700000,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/Shanghai/stEIP3855_push0/test_push0_gas.py b/tests/ported_static/Shanghai/stEIP3855_push0/test_push0_gas.py
deleted file mode 100644
index 0302da5144c..00000000000
--- a/tests/ported_static/Shanghai/stEIP3855_push0/test_push0_gas.py
+++ /dev/null
@@ -1,71 +0,0 @@
-"""
-Test ported from static filler.
-
-Ported from:
-tests/static/state_tests/Shanghai/stEIP3855_push0/push0GasFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/Shanghai/stEIP3855_push0/push0GasFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
-def test_push0_gas(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xDC4EFA209AECDD4C2D5201A419EA27506151B4EC687F14A613229E310932491B
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=89128960,
-    )
-
-    pre[sender] = Account(balance=0x989680)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.PUSH0
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.SLOAD(key=0x0), Op.GAS))
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xc1aca9da71f5ea8db94b3428d8cbe5d544472ff7"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        gas_limit=100000,
-    )
-
-    post = {
-        contract: Account(storage={0: 0x13496, 1: 22107}),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/Shanghai/stEIP3855_push0/test_push0_gas2.py b/tests/ported_static/Shanghai/stEIP3855_push0/test_push0_gas2.py
deleted file mode 100644
index bdafa79b821..00000000000
--- a/tests/ported_static/Shanghai/stEIP3855_push0/test_push0_gas2.py
+++ /dev/null
@@ -1,146 +0,0 @@
-"""
-Test ported from static filler.
-
-Ported from:
-tests/static/state_tests/Shanghai/stEIP3855_push0/push0Gas2Filler.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/Shanghai/stEIP3855_push0/push0Gas2Filler.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "0000000000000000000000000000000000001000",
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 4}
-                ),
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000200",
-            {
-                Address("0x0000000000000000000000000000000000000200"): Account(
-                    storage={0: 5}
-                ),
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
-        ),
-    ],
-    ids=["case0", "case1"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_push0_gas2(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=89128960,
-    )
-
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.GAS
-            + Op.PUSH1[0x0]
-            + Op.GAS
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.SUB
-            + Op.SWAP1
-            + Op.SSTORE
-        ),
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000000200"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.GAS
-            + Op.PUSH0
-            + Op.GAS
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.SUB
-            + Op.SWAP1
-            + Op.SSTORE
-        ),
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x989680)
-    # Source: Yul
-    # {
-    #    sstore(0, call(100000, shr(96, calldataload(0)), 0, 0, 0, 0, 0))
-    #    sstore(1, 1)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=Op.SHR(0x60, Op.CALLDATALOAD(offset=Op.DUP1)),
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=300000,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/Shanghai/stEIP3860_limitmeterinitcode/__init__.py b/tests/ported_static/Shanghai/stEIP3860_limitmeterinitcode/__init__.py
deleted file mode 100644
index ad12e93b6d8..00000000000
--- a/tests/ported_static/Shanghai/stEIP3860_limitmeterinitcode/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from stEIP3860_limitmeterinitcode."""
diff --git a/tests/ported_static/Shanghai/stEIP3860_limitmeterinitcode/test_create2_init_code_size_limit.py b/tests/ported_static/Shanghai/stEIP3860_limitmeterinitcode/test_create2_init_code_size_limit.py
deleted file mode 100644
index 34eb8b74973..00000000000
--- a/tests/ported_static/Shanghai/stEIP3860_limitmeterinitcode/test_create2_init_code_size_limit.py
+++ /dev/null
@@ -1,158 +0,0 @@
-"""
-Test ported from static filler.
-
-Ported from:
-tests/static/state_tests/Shanghai/stEIP3860_limitmeterinitcode
-create2InitCodeSizeLimitFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/Shanghai/stEIP3860_limitmeterinitcode/create2InitCodeSizeLimitFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "000000000000000000000000000000000000000000000000000000000000c001",
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000c000",
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 0x9E7A3337D18C31FE4C1FE51AB2DA6CFD3629923D,
-                        10: 55539,
-                    }
-                ),
-            },
-        ),
-    ],
-    ids=["case0", "case1"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_create2_init_code_size_limit(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=20000000,
-    )
-
-    pre[sender] = Account(balance=0xBEBC200)
-    # Source: Yul
-    # {
-    #   mstore(0, calldataload(0))
-    #   let call_result := call(10000000, 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b, 0, 0, calldatasize(), 0, 0)  # noqa: E501
-    #   sstore(0, call_result)
-    #   sstore(1, 1)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x989680,
-                    address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=Op.CALLDATASIZE,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #   // :yul { codecopy(0x00, 0x00, 0x0a) return(0x00, 0x0a) }
-    #   mstore(0, 0x600a80600080396000f300000000000000000000000000000000000000000000)  # noqa: E501
-    #   // get initcode size from calldata
-    #   let initcode_size := calldataload(0)
-    #   let gas_before := gas()
-    #   let create_result := create2(0, 0, initcode_size, 0xdeadbeef)
-    #   sstore(10, sub(gas_before, gas()))
-    #   sstore(0, create_result)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SHL(0xB0, 0x600A80600080396000F3)
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.CALLDATALOAD
-            + Op.PUSH4[0xDEADBEEF]
-            + Op.GAS
-            + Op.SWAP2
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.CREATE2
-            + Op.SWAP1
-            + Op.GAS
-            + Op.SWAP1
-            + Op.SSTORE(key=0xA, value=Op.SUB)
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=15000000,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/Shanghai/stEIP3860_limitmeterinitcode/test_create_init_code_size_limit.py b/tests/ported_static/Shanghai/stEIP3860_limitmeterinitcode/test_create_init_code_size_limit.py
deleted file mode 100644
index 6427e6b6f6d..00000000000
--- a/tests/ported_static/Shanghai/stEIP3860_limitmeterinitcode/test_create_init_code_size_limit.py
+++ /dev/null
@@ -1,156 +0,0 @@
-"""
-Test ported from static filler.
-
-Ported from:
-tests/static/state_tests/Shanghai/stEIP3860_limitmeterinitcode
-createInitCodeSizeLimitFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/Shanghai/stEIP3860_limitmeterinitcode/createInitCodeSizeLimitFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "000000000000000000000000000000000000000000000000000000000000c001",
-            {
-                Address("0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000c000",
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={
-                        0: 0x5F6BAAEB5B7C97725F84D1569C4ABC85135F4716,
-                        10: 46323,
-                    }
-                ),
-                Address("0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
-        ),
-    ],
-    ids=["case0", "case1"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_create_init_code_size_limit(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=20000000,
-    )
-
-    # Source: Yul
-    # {
-    #   // :yul { codecopy(0x00, 0x00, 0x0a) return(0x00, 0x0a) }
-    #   mstore(0, 0x600a80600080396000f300000000000000000000000000000000000000000000)  # noqa: E501
-    #   // get initcode size from calldata
-    #   let initcode_size := calldataload(0)
-    #   let gas_before := gas()
-    #   let create_result := create(0, 0, initcode_size)
-    #   sstore(10, sub(gas_before, gas()))
-    #   sstore(0, create_result)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SHL(0xB0, 0x600A80600080396000F3)
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.CALLDATALOAD
-            + Op.GAS
-            + Op.SWAP1
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.CREATE
-            + Op.SWAP1
-            + Op.GAS
-            + Op.SWAP1
-            + Op.SSTORE(key=0xA, value=Op.SUB)
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.STOP
-        ),
-        address=Address("0x000000000000000000000000000000000000c0de"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBEBC200, nonce=1)
-    # Source: Yul
-    # {
-    #   mstore(0, calldataload(0))
-    #   let call_result := call(10000000, 0xc0de, 0, 0, calldatasize(), 0, 0)
-    #   sstore(0, call_result)
-    #   sstore(1, 1)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x989680,
-                    address=0xC0DE,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=Op.CALLDATASIZE,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.STOP
-        ),
-        address=Address("0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=15000000,
-        nonce=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/Shanghai/stEIP3860_limitmeterinitcode/test_creation_tx_init_code_size_limit.py b/tests/ported_static/Shanghai/stEIP3860_limitmeterinitcode/test_creation_tx_init_code_size_limit.py
deleted file mode 100644
index 44b4ebbbd53..00000000000
--- a/tests/ported_static/Shanghai/stEIP3860_limitmeterinitcode/test_creation_tx_init_code_size_limit.py
+++ /dev/null
@@ -1,151 +0,0 @@
-"""
-Test ported from static filler.
-
-Ported from:
-tests/static/state_tests/Shanghai/stEIP3860_limitmeterinitcode
-creationTxInitCodeSizeLimitFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-    TransactionException,
-)
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/Shanghai/stEIP3860_limitmeterinitcode/creationTxInitCodeSizeLimitFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, tx_error, expected_post",
-    [
-        pytest.param(
-            "601080600b6000396000f360606040523615610074576000357c010000000000000000000000000000000000000000000000000000000090048063a3b9f3e514610079578063b50345b61461008d578063d4f639ea146100a1578063d9bb316f146100b5578063e22a5d5b146100c9578063f983c0fa146100dd57610074565b610002565b346100025761008b60048050506100f1565b005b346100025761009f6004805050611097565b005b34610002576100b3600480505061203d565b005b34610002576100c76004805050612fe3565b005b34610002576100db6004805050613f89565b005b34610002576100ef6004805050614f2f565b005b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b505660606040523615610074576000357c010000000000000000000000000000000000000000000000000000000090048063a3b9f3e514610079578063b50345b61461008d578063d4f639ea146100a1578063d9bb316f146100b5578063e22a5d5b146100c9578063f983c0fa146100dd57610074565b610002565b346100025761008b60048050506100f1565b005b346100025761009f6004805050611097565b005b34610002576100b3600480505061203d565b005b34610002576100c76004805050612fe3565b005b34610002576100db6004805050613f89565b005b34610002576100ef6004805050614f2f565b005b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b505660606040523615610074576000357c010000000000000000000000000000000000000000000000000000000090048063a3b9f3e514610079578063b50345b61461008d578063d4f639ea146100a1578063d9bb316f146100b5578063e22a5d5b146100c9578063f983c0fa146100dd57610074565b610002565b346100025761008b60048050506100f1565b005b346100025761009f6004805050611097565b005b34610002576100b3600480505061203d565b005b34610002576100c76004805050612fe3565b005b34610002576100db6004805050613f89565b005b34610002576100ef6004805050614f2f565b005b60007310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000",  # noqa: E501
-            TransactionException.INITCODE_SIZE_EXCEEDED,
-            {},
-            id="case0",
-            marks=pytest.mark.exception_test,
-        ),
-        pytest.param(
-            "601080600b6000396000f360606040523615610074576000357c010000000000000000000000000000000000000000000000000000000090048063a3b9f3e514610079578063b50345b61461008d578063d4f639ea146100a1578063d9bb316f146100b5578063e22a5d5b146100c9578063f983c0fa146100dd57610074565b610002565b346100025761008b60048050506100f1565b005b346100025761009f6004805050611097565b005b34610002576100b3600480505061203d565b005b34610002576100c76004805050612fe3565b005b34610002576100db6004805050613f89565b005b34610002576100ef6004805050614f2f565b005b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b505660606040523615610074576000357c010000000000000000000000000000000000000000000000000000000090048063a3b9f3e514610079578063b50345b61461008d578063d4f639ea146100a1578063d9bb316f146100b5578063e22a5d5b146100c9578063f983c0fa146100dd57610074565b610002565b346100025761008b60048050506100f1565b005b346100025761009f6004805050611097565b005b34610002576100b3600480505061203d565b005b34610002576100c76004805050612fe3565b005b34610002576100db6004805050613f89565b005b34610002576100ef6004805050614f2f565b005b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b505660606040523615610074576000357c010000000000000000000000000000000000000000000000000000000090048063a3b9f3e514610079578063b50345b61461008d578063d4f639ea146100a1578063d9bb316f146100b5578063e22a5d5b146100c9578063f983c0fa146100dd57610074565b610002565b346100025761008b60048050506100f1565b005b346100025761009f6004805050611097565b005b34610002576100b3600480505061203d565b005b34610002576100c76004805050612fe3565b005b34610002576100db6004805050613f89565b005b34610002576100ef6004805050614f2f565b005b600073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000",  # noqa: E501
-            None,
-            {},
-            id="case1",
-        ),
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_creation_tx_init_code_size_limit(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    tx_error: object,
-    expected_post: dict,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=20000000,
-    )
-
-    pre[sender] = Account(balance=0xBEBC200)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=15000000,
-        error=tx_error,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/Shanghai/stEIP3860_limitmeterinitcode/creationTxInitCodeSizeLimitFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.parametrize(
-    "tx_data_hex, tx_error, expected_post",
-    [
-        pytest.param(
-            "601080600b6000396000f360606040523615610074576000357c010000000000000000000000000000000000000000000000000000000090048063a3b9f3e514610079578063b50345b61461008d578063d4f639ea146100a1578063d9bb316f146100b5578063e22a5d5b146100c9578063f983c0fa146100dd57610074565b610002565b346100025761008b60048050506100f1565b005b346100025761009f6004805050611097565b005b34610002576100b3600480505061203d565b005b34610002576100c76004805050612fe3565b005b34610002576100db6004805050613f89565b005b34610002576100ef6004805050614f2f565b005b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b505660606040523615610074576000357c010000000000000000000000000000000000000000000000000000000090048063a3b9f3e514610079578063b50345b61461008d578063d4f639ea146100a1578063d9bb316f146100b5578063e22a5d5b146100c9578063f983c0fa146100dd57610074565b610002565b346100025761008b60048050506100f1565b005b346100025761009f6004805050611097565b005b34610002576100b3600480505061203d565b005b34610002576100c76004805050612fe3565b005b34610002576100db6004805050613f89565b005b34610002576100ef6004805050614f2f565b005b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b505660606040523615610074576000357c010000000000000000000000000000000000000000000000000000000090048063a3b9f3e514610079578063b50345b61461008d578063d4f639ea146100a1578063d9bb316f146100b5578063e22a5d5b146100c9578063f983c0fa146100dd57610074565b610002565b346100025761008b60048050506100f1565b005b346100025761009f6004805050611097565b005b34610002576100b3600480505061203d565b005b34610002576100c76004805050612fe3565b005b34610002576100db6004805050613f89565b005b34610002576100ef6004805050614f2f565b005b60007310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000",  # noqa: E501
-            TransactionException.INITCODE_SIZE_EXCEEDED,
-            {},
-            id="case0",
-            marks=pytest.mark.exception_test,
-        ),
-        pytest.param(
-            "601080600b6000396000f360606040523615610074576000357c010000000000000000000000000000000000000000000000000000000090048063a3b9f3e514610079578063b50345b61461008d578063d4f639ea146100a1578063d9bb316f146100b5578063e22a5d5b146100c9578063f983c0fa146100dd57610074565b610002565b346100025761008b60048050506100f1565b005b346100025761009f6004805050611097565b005b34610002576100b3600480505061203d565b005b34610002576100c76004805050612fe3565b005b34610002576100db6004805050613f89565b005b34610002576100ef6004805050614f2f565b005b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b505660606040523615610074576000357c010000000000000000000000000000000000000000000000000000000090048063a3b9f3e514610079578063b50345b61461008d578063d4f639ea146100a1578063d9bb316f146100b5578063e22a5d5b146100c9578063f983c0fa146100dd57610074565b610002565b346100025761008b60048050506100f1565b005b346100025761009f6004805050611097565b005b34610002576100b3600480505061203d565b005b34610002576100c76004805050612fe3565b005b34610002576100db6004805050613f89565b005b34610002576100ef6004805050614f2f565b005b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b505660606040523615610074576000357c010000000000000000000000000000000000000000000000000000000090048063a3b9f3e514610079578063b50345b61461008d578063d4f639ea146100a1578063d9bb316f146100b5578063e22a5d5b146100c9578063f983c0fa146100dd57610074565b610002565b346100025761008b60048050506100f1565b005b346100025761009f6004805050611097565b005b34610002576100b3600480505061203d565b005b34610002576100c76004805050612fe3565b005b34610002576100db6004805050613f89565b005b34610002576100ef6004805050614f2f565b005b600073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000",  # noqa: E501
-            None,
-            {},
-            id="case1",
-        ),
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_creation_tx_init_code_size_limit_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    tx_error: object,
-    expected_post: dict,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=20000000,
-    )
-
-    pre[sender] = Account(balance=0xBEBC200)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=15000000,
-        error=tx_error,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/__init__.py b/tests/ported_static/VMTests/__init__.py
deleted file mode 100644
index 52c056cf6b1..00000000000
--- a/tests/ported_static/VMTests/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from VMTests."""
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/__init__.py b/tests/ported_static/VMTests/vmArithmeticTest/__init__.py
deleted file mode 100644
index df807e4fbfb..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from vmArithmeticTest."""
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_add.py b/tests/ported_static/VMTests/vmArithmeticTest/test_add.py
deleted file mode 100644
index 6ca382146a2..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_add.py
+++ /dev/null
@@ -1,187 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/addFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmArithmeticTest/addFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={0: 3}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_add(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.ADD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.ADD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0x4,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.ADD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0x1,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADD(0x0, 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.ADD(
-                    0x1,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_addmod.py b/tests/ported_static/VMTests/vmArithmeticTest/test_addmod.py
deleted file mode 100644
index 71ecc12186e..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_addmod.py
+++ /dev/null
@@ -1,407 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/addmodFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmArithmeticTest/addmodFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000f",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100f"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000d",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000e",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100b"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001005"): Account(
-                    storage={0: 5}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001008"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000009",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001009"): Account(
-                    storage={0: 2}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100a"): Account(
-                    storage={0: 4}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 2}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_addmod(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADDMOD(0x1, 0x2, 0x2)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.ADDMOD(Op.SUB(0x0, 0x1), Op.SUB(0x0, 0x2), 0x2),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADDMOD(Op.SUB(0x0, 0x6), 0x1, 0x3))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.EQ(
-                    Op.SMOD(Op.SUB(0x0, 0x5), 0x3),
-                    Op.ADDMOD(Op.SUB(0x0, 0x6), 0x1, 0x3),
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.EQ(
-                    Op.MOD(Op.SUB(0x0, 0x5), 0x3),
-                    Op.ADDMOD(Op.SUB(0x0, 0x6), 0x1, 0x3),
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADDMOD(0x4, 0x1, Op.SUB(0x0, 0x3)))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.EQ(Op.ADDMOD(0x4, 0x1, Op.SUB(0x0, 0x3)), 0x2),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADDMOD(Op.SUB(0x0, 0x1), 0x0, 0x5))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001007"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    [[0]] (addmod (- 0 1) 1 5)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADDMOD(Op.SUB(0x0, 0x1), 0x1, 0x5))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001008"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    [[0]] (addmod (- 0 1) 2 5)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADDMOD(Op.SUB(0x0, 0x1), 0x2, 0x5))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001009"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    [[0]] (addmod (- 0 1) (- 0 2) 5)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.ADDMOD(Op.SUB(0x0, 0x1), Op.SUB(0x0, 0x2), 0x5),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100a"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    ; ((2^160)-1 + 1) % 5
-    #    [[0]] (addmod 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 5)  # noqa: E501
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.ADDMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0x1,
-                    0x5,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100b"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    [[0]] (addmod 4 1 0)
-    # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADDMOD(0x4, 0x1, 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100c"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    [[0]] (addmod 0 1 0)
-    # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADDMOD(0x0, 0x1, 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100d"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    [[0]] (addmod 1 0 0)
-    # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADDMOD(0x1, 0x0, 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100e"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    [[0]] (- (addmod 0 0 0) 1)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SUB(Op.ADDMOD(0x0, 0x0, 0x0), 0x1))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100f"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_arith.py b/tests/ported_static/VMTests/vmArithmeticTest/test_arith.py
deleted file mode 100644
index 32341cea219..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_arith.py
+++ /dev/null
@@ -1,87 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/arithFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmArithmeticTest/arithFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
-def test_arith(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x1]
-            + Op.PUSH1[0x1]
-            + Op.SWAP1
-            + Op.ADD(0x5, Op.MUL(0x7, Op.ADD))
-            + Op.PUSH1[0x2]
-            + Op.SWAP1
-            + Op.DIV
-            + Op.PUSH1[0x4]
-            + Op.SWAP1
-            + Op.PUSH1[0x21]
-            + Op.SWAP1
-            + Op.MUL(0x3, Op.ADD(0x17, Op.SDIV))
-            + Op.PUSH1[0x5]
-            + Op.SWAP1
-            + Op.SUB(0x3, Op.SMOD)
-            + Op.SSTORE(key=0x0, value=Op.EXP(0x11, 0x9))
-            + Op.RETURN(offset=0x0, size=0x8)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x14814d06e93efb1102a15d5881432c9ff6c91362"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = {
-        contract: Account(storage={0: 0x1B9C636491}),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_div.py b/tests/ported_static/VMTests/vmArithmeticTest/test_div.py
deleted file mode 100644
index a2e1301061f..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_div.py
+++ /dev/null
@@ -1,214 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/divFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmArithmeticTest/divFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001007"): Account(
-                    storage={0: 7}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001005"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 2}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={0: 137}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_div(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DIV(
-                    0x2,
-                    0xFEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DIV(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBA,  # noqa: E501
-                    0x1DAE6076B981DAE6076B981DAE6076B981DAE6076B981DAE6076B981DAE6077,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.DIV(0x5, 0x2)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.DIV(0x17, 0x18)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.DIV(0x0, 0x18)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.DIV(0x1, 0x1)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.DIV(0x2, 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.DIV(0xD, 0x0), 0x7)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001007"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_div_by_zero.py b/tests/ported_static/VMTests/vmArithmeticTest/test_div_by_zero.py
deleted file mode 100644
index 1cb7406668d..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_div_by_zero.py
+++ /dev/null
@@ -1,651 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/divByZeroFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmArithmeticTest/divByZeroFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000008ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000008ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000008ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000008ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000008ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000008ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000008fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000008fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000008fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000008fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000008fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000008fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000008fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000008fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000047fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000067fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000068000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000001fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000002fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000009fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000009fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000009fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000009fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000009fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000009fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000009fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000009fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000057fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000058000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000077fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_div_by_zero(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (def 'NOP 0)
-    #     (def 'opcode $4)
-    #     (def 'a      $36)
-    #     (def 'b      $68)
-    #
-    #     (if (= opcode 0x04) [[0]] (div a 0) NOP)
-    #     (if (= opcode 0x05) [[0]] (sdiv a 0) NOP)
-    #     (if (= opcode 0x06) [[0]] (mod a 0) NOP)
-    #     (if (= opcode 0x07) [[0]] (smod a 0) NOP)
-    #     (if (= opcode 0x08) [[0]] (addmod a b 0) NOP)
-    #     (if (= opcode 0x09) [[0]] (mulmod a b 0) NOP)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0xF, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x4))
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x19)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x0, value=Op.DIV(Op.CALLDATALOAD(offset=0x24), 0x0)
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x29, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x5)
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x33)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x0, value=Op.SDIV(Op.CALLDATALOAD(offset=0x24), 0x0)
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x43, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x6)
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x4D)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x0, value=Op.MOD(Op.CALLDATALOAD(offset=0x24), 0x0)
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x5D, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x7)
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x67)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x0, value=Op.SMOD(Op.CALLDATALOAD(offset=0x24), 0x0)
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x77, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x8)
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x84)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.ADDMOD(
-                    Op.CALLDATALOAD(offset=0x24),
-                    Op.CALLDATALOAD(offset=0x44),
-                    0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x94, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x9)
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0xA1)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MULMOD(
-                    Op.CALLDATALOAD(offset=0x24),
-                    Op.CALLDATALOAD(offset=0x44),
-                    0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x935e36ee6cd0f1602d1abca9a391c696cfa4c04d"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_exp.py b/tests/ported_static/VMTests/vmArithmeticTest/test_exp.py
deleted file mode 100644
index a7faf9f1d83..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_exp.py
+++ /dev/null
@@ -1,270 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/expFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmArithmeticTest/expFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001008"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001006"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001005"): Account(
-                    storage={0: 257}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100a"): Account(
-                    storage={0: 32768}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 4}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000009",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={
-                        0: 0xBC8CCCCCCCC888888880000000AAAAAAB00000000FFFFFFFFFFFFFFF7FFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_exp(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.EXP(0x2, 0x2)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.EXP(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.EXP(0x7FFFFFFF, 0x7FFFFFFF)) + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.EXP(0x0, 0x7FFFFFFF)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.EXP(0x7FFFFFFF, 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.EXP(0x101, 0x1)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.EXP(0x1, 0x101)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.EXP(0x2, 0x101)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001007"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  ; 0^0 (that is 1 in evm arithmetic)
-    #    [[0]] (exp 0 0)
-    # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.EXP(0x0, 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001008"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  ; 2^big = 0
-    #    [[0]] (exp 2 0x0100000000000f)
-    # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.EXP(0x2, 0x100000000000F)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001009"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  ; 2^15 = 0x8000
-    #    [[0]] (exp 2 15)
-    # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.EXP(0x2, 0xF)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100a"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_exp_power2.py b/tests/ported_static/VMTests/vmArithmeticTest/test_exp_power2.py
deleted file mode 100644
index 9e42b6d819f..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_exp_power2.py
+++ /dev/null
@@ -1,207 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/expPower2Filler.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmArithmeticTest/expPower2Filler.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
-def test_exp_power2(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (def 'storageJump 0x10)
-    #
-    #     (def 'calc (m) {
-    #          (def 'n (exp 2 m))
-    #
-    #          [[(* storageJump m)]]       (exp 2 n)
-    #          [[(+ (* storageJump m) 1)]] (exp 2 (- n 1))
-    #          [[(+ (* storageJump m) 2)]] (exp 2 (+ n 1))
-    #       }
-    #     )
-    #
-    #     (calc 1)
-    #     (calc 2)
-    #     (calc 3)
-    #     (calc 4)
-    #     (calc 5)
-    #     (calc 6)
-    #     (calc 7)
-    #     (calc 8)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=Op.MUL(0x10, 0x1), value=Op.EXP(0x2, Op.EXP(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1), 0x1),
-                value=Op.EXP(0x2, Op.SUB(Op.EXP(0x2, 0x1), 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1), 0x2),
-                value=Op.EXP(0x2, Op.ADD(Op.EXP(0x2, 0x1), 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x2), value=Op.EXP(0x2, Op.EXP(0x2, 0x2))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x2), 0x1),
-                value=Op.EXP(0x2, Op.SUB(Op.EXP(0x2, 0x2), 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x2), 0x2),
-                value=Op.EXP(0x2, Op.ADD(Op.EXP(0x2, 0x2), 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x3), value=Op.EXP(0x2, Op.EXP(0x2, 0x3))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x3), 0x1),
-                value=Op.EXP(0x2, Op.SUB(Op.EXP(0x2, 0x3), 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x3), 0x2),
-                value=Op.EXP(0x2, Op.ADD(Op.EXP(0x2, 0x3), 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x4), value=Op.EXP(0x2, Op.EXP(0x2, 0x4))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x4), 0x1),
-                value=Op.EXP(0x2, Op.SUB(Op.EXP(0x2, 0x4), 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x4), 0x2),
-                value=Op.EXP(0x2, Op.ADD(Op.EXP(0x2, 0x4), 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x5), value=Op.EXP(0x2, Op.EXP(0x2, 0x5))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x5), 0x1),
-                value=Op.EXP(0x2, Op.SUB(Op.EXP(0x2, 0x5), 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x5), 0x2),
-                value=Op.EXP(0x2, Op.ADD(Op.EXP(0x2, 0x5), 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x6), value=Op.EXP(0x2, Op.EXP(0x2, 0x6))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x6), 0x1),
-                value=Op.EXP(0x2, Op.SUB(Op.EXP(0x2, 0x6), 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x6), 0x2),
-                value=Op.EXP(0x2, Op.ADD(Op.EXP(0x2, 0x6), 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x7), value=Op.EXP(0x2, Op.EXP(0x2, 0x7))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x7), 0x1),
-                value=Op.EXP(0x2, Op.SUB(Op.EXP(0x2, 0x7), 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x7), 0x2),
-                value=Op.EXP(0x2, Op.ADD(Op.EXP(0x2, 0x7), 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x8), value=Op.EXP(0x2, Op.EXP(0x2, 0x8))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x8), 0x1),
-                value=Op.EXP(0x2, Op.SUB(Op.EXP(0x2, 0x8), 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x8), 0x2),
-                value=Op.EXP(0x2, Op.ADD(Op.EXP(0x2, 0x8), 0x1)),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x5a18b275908ad6766155191a40654188fe012dc6"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "693c61390000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-        ),
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = {
-        contract: Account(
-            storage={
-                16: 4,
-                17: 2,
-                18: 8,
-                32: 16,
-                33: 8,
-                34: 32,
-                48: 256,
-                49: 128,
-                50: 512,
-                64: 0x10000,
-                65: 32768,
-                66: 0x20000,
-                80: 0x100000000,
-                81: 0x80000000,
-                82: 0x200000000,
-                96: 0x10000000000000000,
-                97: 0x8000000000000000,
-                98: 0x20000000000000000,
-                112: 0x100000000000000000000000000000000,
-                113: 0x80000000000000000000000000000000,
-                114: 0x200000000000000000000000000000000,
-                129: 0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_exp_power256.py b/tests/ported_static/VMTests/vmArithmeticTest/test_exp_power256.py
deleted file mode 100644
index acbdfccf87a..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_exp_power256.py
+++ /dev/null
@@ -1,515 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/expPower256Filler.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/VMTests/vmArithmeticTest/expPower256Filler.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
-def test_exp_power256(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (def 'storageJump 0x10)
-    #
-    #     (def 'calc (n) {
-    #          [[(* storageJump n)]] (exp 256 n)
-    #          [[(+ (* storageJump n) 1)]] (exp 255 n)
-    #          [[(+ (* storageJump n) 2)]] (exp 257 n)
-    #       }
-    #     )
-    #
-    #     (calc 0)
-    #     (calc 1)
-    #     (calc 2)
-    #     (calc 3)
-    #     (calc 4)
-    #     (calc 5)
-    #     (calc 6)
-    #     (calc 7)
-    #     (calc 8)
-    #     (calc 9)
-    #     (calc 10)
-    #     (calc 11)
-    #     (calc 12)
-    #     (calc 13)
-    #     (calc 14)
-    #     (calc 15)
-    #     (calc 16)
-    #     (calc 17)
-    #     (calc 18)
-    #     (calc 19)
-    # ... (15 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=Op.MUL(0x10, 0x0), value=Op.EXP(0x100, 0x0))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x0), 0x1),
-                value=Op.EXP(0xFF, 0x0),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x0), 0x2),
-                value=Op.EXP(0x101, 0x0),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x1), value=Op.EXP(0x100, 0x1))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1), 0x1),
-                value=Op.EXP(0xFF, 0x1),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1), 0x2),
-                value=Op.EXP(0x101, 0x1),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x2), value=Op.EXP(0x100, 0x2))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x2), 0x1),
-                value=Op.EXP(0xFF, 0x2),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x2), 0x2),
-                value=Op.EXP(0x101, 0x2),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x3), value=Op.EXP(0x100, 0x3))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x3), 0x1),
-                value=Op.EXP(0xFF, 0x3),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x3), 0x2),
-                value=Op.EXP(0x101, 0x3),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x4), value=Op.EXP(0x100, 0x4))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x4), 0x1),
-                value=Op.EXP(0xFF, 0x4),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x4), 0x2),
-                value=Op.EXP(0x101, 0x4),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x5), value=Op.EXP(0x100, 0x5))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x5), 0x1),
-                value=Op.EXP(0xFF, 0x5),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x5), 0x2),
-                value=Op.EXP(0x101, 0x5),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x6), value=Op.EXP(0x100, 0x6))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x6), 0x1),
-                value=Op.EXP(0xFF, 0x6),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x6), 0x2),
-                value=Op.EXP(0x101, 0x6),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x7), value=Op.EXP(0x100, 0x7))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x7), 0x1),
-                value=Op.EXP(0xFF, 0x7),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x7), 0x2),
-                value=Op.EXP(0x101, 0x7),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x8), value=Op.EXP(0x100, 0x8))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x8), 0x1),
-                value=Op.EXP(0xFF, 0x8),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x8), 0x2),
-                value=Op.EXP(0x101, 0x8),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x9), value=Op.EXP(0x100, 0x9))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x9), 0x1),
-                value=Op.EXP(0xFF, 0x9),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x9), 0x2),
-                value=Op.EXP(0x101, 0x9),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0xA), value=Op.EXP(0x100, 0xA))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xA), 0x1),
-                value=Op.EXP(0xFF, 0xA),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xA), 0x2),
-                value=Op.EXP(0x101, 0xA),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0xB), value=Op.EXP(0x100, 0xB))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xB), 0x1),
-                value=Op.EXP(0xFF, 0xB),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xB), 0x2),
-                value=Op.EXP(0x101, 0xB),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0xC), value=Op.EXP(0x100, 0xC))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xC), 0x1),
-                value=Op.EXP(0xFF, 0xC),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xC), 0x2),
-                value=Op.EXP(0x101, 0xC),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0xD), value=Op.EXP(0x100, 0xD))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xD), 0x1),
-                value=Op.EXP(0xFF, 0xD),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xD), 0x2),
-                value=Op.EXP(0x101, 0xD),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0xE), value=Op.EXP(0x100, 0xE))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xE), 0x1),
-                value=Op.EXP(0xFF, 0xE),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xE), 0x2),
-                value=Op.EXP(0x101, 0xE),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0xF), value=Op.EXP(0x100, 0xF))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xF), 0x1),
-                value=Op.EXP(0xFF, 0xF),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xF), 0x2),
-                value=Op.EXP(0x101, 0xF),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x10), value=Op.EXP(0x100, 0x10))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x10), 0x1),
-                value=Op.EXP(0xFF, 0x10),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x10), 0x2),
-                value=Op.EXP(0x101, 0x10),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x11), value=Op.EXP(0x100, 0x11))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x11), 0x1),
-                value=Op.EXP(0xFF, 0x11),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x11), 0x2),
-                value=Op.EXP(0x101, 0x11),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x12), value=Op.EXP(0x100, 0x12))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x12), 0x1),
-                value=Op.EXP(0xFF, 0x12),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x12), 0x2),
-                value=Op.EXP(0x101, 0x12),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x13), value=Op.EXP(0x100, 0x13))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x13), 0x1),
-                value=Op.EXP(0xFF, 0x13),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x13), 0x2),
-                value=Op.EXP(0x101, 0x13),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x14), value=Op.EXP(0x100, 0x14))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x14), 0x1),
-                value=Op.EXP(0xFF, 0x14),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x14), 0x2),
-                value=Op.EXP(0x101, 0x14),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x15), value=Op.EXP(0x100, 0x15))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x15), 0x1),
-                value=Op.EXP(0xFF, 0x15),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x15), 0x2),
-                value=Op.EXP(0x101, 0x15),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x16), value=Op.EXP(0x100, 0x16))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x16), 0x1),
-                value=Op.EXP(0xFF, 0x16),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x16), 0x2),
-                value=Op.EXP(0x101, 0x16),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x17), value=Op.EXP(0x100, 0x17))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x17), 0x1),
-                value=Op.EXP(0xFF, 0x17),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x17), 0x2),
-                value=Op.EXP(0x101, 0x17),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x18), value=Op.EXP(0x100, 0x18))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x18), 0x1),
-                value=Op.EXP(0xFF, 0x18),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x18), 0x2),
-                value=Op.EXP(0x101, 0x18),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x19), value=Op.EXP(0x100, 0x19))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x19), 0x1),
-                value=Op.EXP(0xFF, 0x19),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x19), 0x2),
-                value=Op.EXP(0x101, 0x19),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x1A), value=Op.EXP(0x100, 0x1A))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1A), 0x1),
-                value=Op.EXP(0xFF, 0x1A),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1A), 0x2),
-                value=Op.EXP(0x101, 0x1A),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x1B), value=Op.EXP(0x100, 0x1B))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1B), 0x1),
-                value=Op.EXP(0xFF, 0x1B),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1B), 0x2),
-                value=Op.EXP(0x101, 0x1B),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x1C), value=Op.EXP(0x100, 0x1C))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1C), 0x1),
-                value=Op.EXP(0xFF, 0x1C),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1C), 0x2),
-                value=Op.EXP(0x101, 0x1C),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x1D), value=Op.EXP(0x100, 0x1D))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1D), 0x1),
-                value=Op.EXP(0xFF, 0x1D),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1D), 0x2),
-                value=Op.EXP(0x101, 0x1D),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x1E), value=Op.EXP(0x100, 0x1E))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1E), 0x1),
-                value=Op.EXP(0xFF, 0x1E),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1E), 0x2),
-                value=Op.EXP(0x101, 0x1E),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x1F), value=Op.EXP(0x100, 0x1F))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1F), 0x1),
-                value=Op.EXP(0xFF, 0x1F),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1F), 0x2),
-                value=Op.EXP(0x101, 0x1F),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x20), value=Op.EXP(0x100, 0x20))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x20), 0x1),
-                value=Op.EXP(0xFF, 0x20),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x20), 0x2),
-                value=Op.EXP(0x101, 0x20),
-            )
-            + Op.SSTORE(key=Op.MUL(0x10, 0x21), value=Op.EXP(0x100, 0x21))
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x21), 0x1),
-                value=Op.EXP(0xFF, 0x21),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x21), 0x2),
-                value=Op.EXP(0x101, 0x21),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xe660d528e4a7ad36825f9d64f5f141596feff7ae"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "693c61390000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-        ),
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = {
-        contract: Account(
-            storage={
-                0: 1,
-                1: 1,
-                2: 1,
-                16: 256,
-                17: 255,
-                18: 257,
-                32: 0x10000,
-                33: 65025,
-                34: 0x10201,
-                48: 0x1000000,
-                49: 0xFD02FF,
-                50: 0x1030301,
-                64: 0x100000000,
-                65: 0xFC05FC01,
-                66: 0x104060401,
-                80: 0x10000000000,
-                81: 0xFB09F604FF,
-                82: 0x1050A0A0501,
-                96: 0x1000000000000,
-                97: 0xFA0EEC0EFA01,
-                98: 0x1060F140F0601,
-                112: 0x100000000000000,
-                113: 0xF914DD22EB06FF,
-                114: 0x107152323150701,
-                128: 0x10000000000000000,
-                129: 0xF81BC845C81BF801,
-                130: 0x1081C3846381C0801,
-                144: 0x1000000000000000000,
-                145: 0xF723AC7D8253DC08FF,
-                146: 0x10924547E7E54240901,
-                160: 0x100000000000000000000,
-                161: 0xF62C88D104D1882CF601,
-                162: 0x10A2D78D2FCD2782D0A01,
-                176: 0x10000000000000000000000,
-                177: 0xF5365C4833CCB6A4C90AFF,
-                178: 0x10B37A64BCFCF4AA5370B01,
-                192: 0x1000000000000000000000000,
-                193: 0xF44125EBEB98E9EE2441F401,
-                194: 0x10C42DDF21B9F19EFDC420C01,
-                208: 0x100000000000000000000000000,
-                209: 0xF34CE4C5FFAD5104361DB20CFF,
-                210: 0x10D4F20D00DBAB909CC1E4E0D01,
-                224: 0x10000000000000000000000000000,
-                225: 0xF25997E139ADA3B331E7945AF201,
-                226: 0x10E5C6FF0DDC873C2D5EA6C5B0E01,
-                240: 0x1000000000000000000000000000000,
-                241: 0xF1673E495873F60F7EB5ACC6970EFF,
-                242: 0x10F6ACC60CEA63C3698C056C7690F01,
-                256: 0x100000000000000000000000000000000,
-                257: 0xF075D70B0F1B82196F36F719D077F001,
-                258: 0x1107A372D2F74E272CF59171E30781001,
-                272: 0x10000000000000000000000000000000000,
-                273: 0xEF856134040C669755C7C022B6A77810FF,
-                274: 0x1118AB1645CA45755422870354EA8881101,
-                288: 0x1000000000000000000000000000000000000,
-                289: 0xEE95DBD2D0085A30BE71F86293F0D098EE01,
-                290: 0x1129C3C15C100FBAC976A98A583F730991201,
-                304: 0x100000000000000000000000000000000000000,
-                305: 0xEDA745F6FD3851D68DB3866A315CDFC85512FF,
-                306: 0x113AED851D6C1FCA84402033E297B27C9AB1301,
-                320: 0x10000000000000000000000000000000000000000,
-                321: 0xECB99EB1063B1984B725D2E3C72B82E88CBDEC01,
-                322: 0x114C2872A2898BEA4EC46054167A4A2F174BE1401,
-                336: 0x1000000000000000000000000000000000000000000,
-                337: 0xEBCCE5125534DE6B326EAD10E3645765A4312E14FF,
-                338: 0x115D749B152C1576391324B46A90C47946632D21501,
-                352: 0x100000000000000000000000000000000000000000000,
-                353: 0xEAE1182D42DFA98CC73C3E63D280F30E3E8CFCE6EA01,
-                354: 0x116ED20FB041418BAF4C37D91EFB553DBFA9904E71601,
-                368: 0x10000000000000000000000000000000000000000000000,
-                369: 0xE9F63715159CC9E33A7502256EAE721B304E6FEA0316FF,
-                370: 0x118040E1BFF182CD3AFB8410F81A5092FD6939DEBFD1701,
-                384: 0x1000000000000000000000000000000000000000000000000,
-                385: 0xE90C40DE00872D19573A8D23493FC3A9151E217A1913E801,
-                386: 0x1191C122A1B1745008367F9509126AE39066A3189E9141801,
-                400: 0x100000000000000000000000000000000000000000000000000,
-                401: 0xE823349D2286A5EC3DE3529625F683E56C0903589EFAD418FF,
-                402: 0x11A352E3C45325C4583EB6149E1B7D4E73F709BBB72FD2C1901,
-                416: 0x10000000000000000000000000000000000000000000000000000,
-                417: 0xE73B116885641F4651A56F438FD08D61869CFA55465BD944E601,
-                418: 0x11B4F636A81778EA1C96F4CAB2B998CBC26B00C572E7029451A01,
-                432: 0x1000000000000000000000000000000000000000000000000000000,
-                433: 0xE653D6571CDEBB270B53C9D44C40BCD425165D5AF1157D6BA11AFF,
-                434: 0x11C6AB2CDEBF906306B38BBF7D6C52648E2D6BC63859E996E5F1B01,
-                448: 0x100000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                449: 0xE56D8280C5C1DC6BE448760A77F47C1750F146FD962467EE3579E401,  # noqa: E501
-                450: 0x11D871D80B9E4FF369BA3F4B3CE9BEB6F2BB9931FE9243807CD7A1C01,  # noqa: E501
-                464: 0x10000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                465: 0xE48814FE44FC1A8F78642D946D7C879B39A055B6988E438647446A1CFF,  # noqa: E501
-                466: 0x11EA4A49E3A9EE435D23F98A8826A875A9AE54CB3090D5C3FD547961D01,  # noqa: E501
-                480: 0x1000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                481: 0xE3A38CE946B71E74E8EBC966D90F0B139E66B560E1F5B542C0FD25B2E201,  # noqa: E501
-                482: 0x11FC34942D8D9831A0811D8412AECF1E1F58031FFBC16699C151CDDB31E01,  # noqa: E501
-                496: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                497: 0xE2BFE95C5D7067567402DD9D7235FC088AC84EAB8113BF8D7E3C288D2F1EFF,  # noqa: E501
-                498: 0x120E30C8C1BB25C9D2219EA196C17DED3D775B231BBD28005B131FA90D11F01,  # noqa: E501
-                513: 0xE1DD29730112F6EF1D8EDABFD4C3C60C823D865CD592ABCDF0BDEC64A1EFE001,  # noqa: E501
-                514: 0x2203EF98A7CE0EF9BF3C04038583F6B2AB4D27E3ED8E5285B6E32C8B61F02001,  # noqa: E501
-                529: 0xFB4C498E11E3F82E714BE514EF024675BB48D678BD192222CD2E783D4DF020FF,  # noqa: E501
-                530: 0x25F3884075DD08B8FB400789097AA95DF8750BD17BE0D83C9A0FB7ED52102101,  # noqa: E501
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_exp_power256_of256.py b/tests/ported_static/VMTests/vmArithmeticTest/test_exp_power256_of256.py
deleted file mode 100644
index 24be45b6f9e..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_exp_power256_of256.py
+++ /dev/null
@@ -1,1542 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/expPower256Of256Filler.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/VMTests/vmArithmeticTest/expPower256Of256Filler.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
-def test_exp_power256_of256(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (def 'storageJump 0x10)
-    #
-    #     (def 'calc (n) {
-    #
-    #          [[(* storageJump n)]]       (exp 256 (exp 256 n))
-    #          [[(+ (* storageJump n) 1)]] (exp 256 (exp 255 n))
-    #          [[(+ (* storageJump n) 2)]] (exp 256 (exp 257 n))
-    #
-    #          [[(+ (* storageJump n) 3)]] (exp 255 (exp 256 n))
-    #          [[(+ (* storageJump n) 4)]] (exp 255 (exp 255 n))
-    #          [[(+ (* storageJump n) 5)]] (exp 255 (exp 257 n))
-    #
-    #          [[(+ (* storageJump n) 6)]] (exp 257 (exp 256 n))
-    #          [[(+ (* storageJump n) 7)]] (exp 257 (exp 255 n))
-    #          [[(+ (* storageJump n) 8)]] (exp 257 (exp 257 n))
-    #       }
-    #     )
-    #
-    #     (calc 0)
-    #     (calc 1)
-    #     (calc 2)
-    #     (calc 3)
-    #     (calc 4)
-    #     (calc 5)
-    #     (calc 6)
-    #     (calc 7)
-    #     (calc 8)
-    #     (calc 9)
-    #     (calc 10)
-    # ... (24 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=Op.MUL(0x10, 0x0),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x0)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x0), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x0)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x0), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x0)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x0), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x0)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x0), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x0)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x0), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x0)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x0), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x0)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x0), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x0)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x0), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x0)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x1),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x1)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x2)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x2), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x2)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x2), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x2)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x2), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x2)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x2), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x2)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x2), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x2)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x2), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x2)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x2), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x2)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x2), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x2)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x3),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x3)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x3), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x3)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x3), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x3)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x3), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x3)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x3), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x3)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x3), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x3)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x3), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x3)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x3), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x3)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x3), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x3)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x4),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x4)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x4), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x4)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x4), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x4)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x4), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x4)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x4), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x4)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x4), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x4)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x4), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x4)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x4), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x4)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x4), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x4)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x5),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x5)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x5), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x5)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x5), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x5)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x5), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x5)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x5), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x5)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x5), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x5)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x5), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x5)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x5), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x5)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x5), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x5)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x6),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x6)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x6), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x6)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x6), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x6)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x6), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x6)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x6), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x6)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x6), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x6)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x6), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x6)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x6), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x6)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x6), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x6)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x7),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x7)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x7), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x7)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x7), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x7)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x7), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x7)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x7), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x7)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x7), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x7)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x7), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x7)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x7), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x7)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x7), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x7)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x8),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x8)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x8), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x8)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x8), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x8)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x8), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x8)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x8), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x8)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x8), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x8)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x8), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x8)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x8), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x8)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x8), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x8)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x9),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x9)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x9), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x9)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x9), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x9)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x9), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x9)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x9), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x9)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x9), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x9)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x9), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x9)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x9), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x9)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x9), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x9)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0xA),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0xA)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xA), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0xA)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xA), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0xA)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xA), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0xA)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xA), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0xA)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xA), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0xA)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xA), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0xA)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xA), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0xA)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xA), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0xA)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0xB),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0xB)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xB), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0xB)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xB), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0xB)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xB), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0xB)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xB), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0xB)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xB), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0xB)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xB), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0xB)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xB), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0xB)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xB), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0xB)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0xC),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0xC)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xC), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0xC)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xC), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0xC)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xC), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0xC)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xC), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0xC)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xC), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0xC)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xC), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0xC)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xC), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0xC)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xC), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0xC)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0xD),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0xD)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xD), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0xD)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xD), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0xD)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xD), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0xD)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xD), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0xD)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xD), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0xD)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xD), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0xD)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xD), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0xD)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xD), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0xD)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0xE),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0xE)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xE), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0xE)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xE), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0xE)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xE), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0xE)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xE), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0xE)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xE), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0xE)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xE), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0xE)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xE), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0xE)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xE), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0xE)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0xF),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0xF)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xF), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0xF)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xF), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0xF)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xF), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0xF)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xF), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0xF)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xF), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0xF)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xF), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0xF)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xF), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0xF)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0xF), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0xF)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x10),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x10)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x10), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x10)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x10), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x10)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x10), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x10)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x10), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x10)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x10), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x10)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x10), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x10)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x10), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x10)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x10), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x10)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x11),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x11)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x11), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x11)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x11), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x11)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x11), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x11)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x11), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x11)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x11), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x11)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x11), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x11)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x11), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x11)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x11), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x11)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x12),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x12)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x12), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x12)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x12), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x12)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x12), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x12)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x12), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x12)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x12), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x12)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x12), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x12)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x12), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x12)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x12), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x12)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x13),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x13)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x13), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x13)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x13), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x13)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x13), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x13)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x13), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x13)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x13), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x13)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x13), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x13)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x13), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x13)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x13), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x13)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x14),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x14)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x14), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x14)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x14), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x14)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x14), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x14)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x14), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x14)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x14), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x14)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x14), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x14)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x14), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x14)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x14), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x14)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x15),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x15)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x15), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x15)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x15), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x15)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x15), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x15)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x15), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x15)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x15), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x15)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x15), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x15)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x15), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x15)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x15), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x15)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x16),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x16)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x16), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x16)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x16), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x16)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x16), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x16)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x16), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x16)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x16), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x16)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x16), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x16)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x16), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x16)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x16), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x16)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x17),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x17)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x17), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x17)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x17), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x17)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x17), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x17)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x17), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x17)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x17), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x17)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x17), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x17)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x17), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x17)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x17), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x17)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x18),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x18)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x18), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x18)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x18), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x18)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x18), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x18)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x18), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x18)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x18), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x18)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x18), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x18)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x18), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x18)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x18), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x18)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x19),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x19)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x19), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x19)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x19), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x19)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x19), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x19)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x19), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x19)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x19), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x19)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x19), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x19)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x19), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x19)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x19), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x19)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x1A),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x1A)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1A), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x1A)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1A), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x1A)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1A), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x1A)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1A), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x1A)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1A), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x1A)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1A), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x1A)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1A), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x1A)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1A), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x1A)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x1B),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x1B)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1B), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x1B)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1B), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x1B)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1B), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x1B)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1B), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x1B)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1B), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x1B)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1B), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x1B)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1B), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x1B)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1B), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x1B)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x1C),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x1C)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1C), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x1C)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1C), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x1C)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1C), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x1C)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1C), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x1C)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1C), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x1C)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1C), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x1C)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1C), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x1C)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1C), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x1C)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x1D),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x1D)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1D), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x1D)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1D), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x1D)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1D), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x1D)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1D), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x1D)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1D), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x1D)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1D), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x1D)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1D), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x1D)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1D), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x1D)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x1E),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x1E)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1E), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x1E)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1E), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x1E)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1E), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x1E)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1E), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x1E)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1E), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x1E)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1E), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x1E)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1E), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x1E)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1E), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x1E)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x1F),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x1F)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1F), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x1F)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1F), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x1F)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1F), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x1F)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1F), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x1F)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1F), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x1F)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1F), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x1F)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1F), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x1F)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x1F), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x1F)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x20),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x20)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x20), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x20)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x20), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x20)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x20), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x20)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x20), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x20)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x20), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x20)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x20), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x20)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x20), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x20)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x20), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x20)),
-            )
-            + Op.SSTORE(
-                key=Op.MUL(0x10, 0x21),
-                value=Op.EXP(0x100, Op.EXP(0x100, 0x21)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x21), 0x1),
-                value=Op.EXP(0x100, Op.EXP(0xFF, 0x21)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x21), 0x2),
-                value=Op.EXP(0x100, Op.EXP(0x101, 0x21)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x21), 0x3),
-                value=Op.EXP(0xFF, Op.EXP(0x100, 0x21)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x21), 0x4),
-                value=Op.EXP(0xFF, Op.EXP(0xFF, 0x21)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x21), 0x5),
-                value=Op.EXP(0xFF, Op.EXP(0x101, 0x21)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x21), 0x6),
-                value=Op.EXP(0x101, Op.EXP(0x100, 0x21)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x21), 0x7),
-                value=Op.EXP(0x101, Op.EXP(0xFF, 0x21)),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.MUL(0x10, 0x21), 0x8),
-                value=Op.EXP(0x101, Op.EXP(0x101, 0x21)),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x9f233ef2d697929edf542064b125e7d620270363"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "693c61390000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-        ),
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = {
-        contract: Account(
-            storage={
-                0: 256,
-                1: 256,
-                2: 256,
-                3: 255,
-                4: 255,
-                5: 255,
-                6: 257,
-                7: 257,
-                8: 257,
-                19: 0x6C3ACD330B959AD6EFABCE6D2D2125E73A88A65A9880D203DDDF5957F7F0001,  # noqa: E501
-                20: 0x8F965A06DA0AC41DCB3A34F1D8AB7D8FEE620A94FAA42C395997756B007FFEFF,  # noqa: E501
-                21: 0xBCE9265D88A053C18BC229EBFF404C1534E1DB43DE85131DA0179FE9FF8100FF,  # noqa: E501
-                22: 0x2B5E9D7A094C19F5EBDD4F2E618F859ED15E4F1F0351F286BF849EB7F810001,  # noqa: E501
-                23: 0xC73B7A6F68385C653A24993BB72EEA0E4BA17470816EC658CF9C5BEDFD81FF01,  # noqa: E501
-                24: 0xB89FC178355660FE1C92C7D8FF11524702FAD6E2255447946442356B00810101,  # noqa: E501
-                35: 0x4EE4CEEAAC565C81F55A87C43F82F7C889EF4FC7C679671E28D594FF7F000001,  # noqa: E501
-                36: 0x82F46A1B4E34D66712910615D2571D75606CEAC51FA8CA8C58CF6CA881FE00FF,  # noqa: E501
-                37: 0x81C9FCEFA5DE158AE2007F25D35C0D11CD735342A48905955A5A6852800200FF,  # noqa: E501
-                38: 0x666AC362902470ED850709E2A29969D10CBA09DEBC03C38D172AEAFF81000001,  # noqa: E501
-                39: 0xEB30A3C678A01BDE914548F98F3366DC0FFE9F85384EBF1111D03DAD7FFE0101,  # noqa: E501
-                40: 0x72D0A7939B6303CE1D46E6E3F1B8BE303BFDB2B00F41AD8076B0975782020101,  # noqa: E501
-                51: 0x109A00E1370D2D2922BF892E85BECB54297354B2E5C75388D514FF7F00000001,  # noqa: E501
-                52: 0x54A792F15E9ABA7E4AD9E716BC169EEA3A6E2E9C49BF9B335874613C8081FEFF,  # noqa: E501
-                53: 0x5D24A14D8E5E039372CD0F6A0F31E9ED6B75ADBA9F16B1C5B3EDD5BA818300FF,  # noqa: E501
-                54: 0x298E2F316B4CCDED5EBF515998D9EC20DF69404B04A441782A6AFF8100000001,  # noqa: E501
-                55: 0x4335694E98F372183C62A2339FA4AD161E9B4C42240BDC9452ABFFD07783FF01,  # noqa: E501
-                56: 0xF0F0820797315ACD063056BBA76F6A9C3E281CDB5197A233967CA94684830101,  # noqa: E501
-                67: 0xE6540CE46EAF70DA9D644015A661E0E245B13F307CB3885514FF7F0000000001,  # noqa: E501
-                68: 0x6526B38B05A6325B80E1C84AB41DC934FD70F33F1BD0EAB3D1F61A4707FC00FF,  # noqa: E501
-                69: 0xE959516CD27E5D8FD487B72DB2989B3EC2BA9FB7EAD41554526FE5A3040400FF,  # noqa: E501
-                70: 0xE7498A48C6CE2530BBE814EE3440C8C44FFFAB7AD8A277AA6AFF810000000001,  # noqa: E501
-                71: 0x2DFFA3E901E5A392D15B79F4193D2168147D2AA7C55870B46C3A905D03FC0101,  # noqa: E501
-                72: 0xE16EA721C96539EDB4F7FB82DE0DAD8CCCB1E7A6966A6777635F6FB908040101,  # noqa: E501
-                83: 0xB581AC185AAD71DB2D177C286929C4C22809E5DCB3085514FF7F000000000001,  # noqa: E501
-                84: 0x75789EB2A64BC971389FBD11A1E6D7ABBF95AD25E23FB9AA25E73A0BFC83FEFF,  # noqa: E501
-                85: 0xFC403FA42CEB6A0D0D3321BD9B2D8AF25B1B667F87A04F496C78168D078500FF,  # noqa: E501
-                86: 0xCEC5EC213B9CB5811F6AE00428FD7B6EF5A1AF39A1F7AA6AFF81000000000001,  # noqa: E501
-                87: 0x70AB32233202B98D382D17713FA0BE391EAF74F85BA1740C9C3238C4ED85FF01,  # noqa: E501
-                88: 0xB622672A213FAA79B32185FF93A7B27A8499E48F7B032CDB4D1A70300C850101,  # noqa: E501
-                99: 0x1948059DE1DEF03C4EC35FC22C2BB8F2BF45DC33085514FF7F00000000000001,  # noqa: E501
-                100: 0x41F818A8E24EB6D7BB7B193B4F2B5FDCF4BD0D453F2AC3499D8830D391FA00FF,  # noqa: E501
-                101: 0xEDE6FE4A943DFB5D967A2B85D6728759D40D2EF0AE4BC28BBB1867F98C0600FF,  # noqa: E501
-                102: 0x83C936CBAAD5DE592BADC2E142FE4EBD6103921F7AA6AFF8100000000000001,  # noqa: E501
-                103: 0x57385019FE4E0939CA3F35C37CADFAF52FBA5B1CDFB02DEF3866E8068BFA0101,  # noqa: E501
-                104: 0x810AC878BD98428F6BE8C6426BA9F9DA09E3E33BF4FE10BFA3F8B12C92060101,  # noqa: E501
-                115: 0x8BB02654111AD8C60AD8AF132283A81F455C33085514FF7F0000000000000001,  # noqa: E501
-                116: 0xA8F75C129DBB8466D6703A2A0B8212131B3248D70E2478862AC40FE17485FEFF,  # noqa: E501
-                117: 0x5FD4D2DE580383EE59F5E800DDB3F1717CEAE03AEDE19D3DEC5E5A69918700FF,  # noqa: E501
-                118: 0xC8624230B524B85D6340DA48A5DB20370FB921F7AA6AFF810000000000000001,  # noqa: E501
-                119: 0x287B58A5A13CD7F454468CA616C181712F5ED25433A7D5A894B6CED35F87FF01,  # noqa: E501
-                120: 0x9930D11AC2804FA977BF951593C8DFF8498779CC0CDC5812A4FBA2F98870101,  # noqa: E501
-                131: 0x230041A0E7602D6E459609ED39081EC55C33085514FF7F000000000000000001,  # noqa: E501
-                132: 0xC407D8A413EF9079EAD457ED686A05AC81039C0CAE0A7F6AFD01E8461FF800FF,  # noqa: E501
-                133: 0x67A397E0692385E4CD83853AABCE220A94D449E885FA867E96D3EF5E180800FF,  # noqa: E501
-                134: 0x70ADD926E753655D6D0EBE9C0F81368FB921F7AA6AFF81000000000000000001,  # noqa: E501
-                135: 0xBDCE80B8378E43F13D454B9D0A4C83CF311B8EAA45D5122CFD544A217F80101,  # noqa: E501
-                136: 0x629C25790E1488998877A9ECDF0FB69637E77D8A4BDC1B46270093BA20080101,  # noqa: E501
-                147: 0x53017D8EB210DB2C8CD4A299079EC55C33085514FF7F00000000000000000001,  # noqa: E501
-                148: 0x48BE09B6C6AE2AA660F1972125CECBB1038B5D236ECF766BA786E2C4E887FEFF,  # noqa: E501
-                149: 0x2E350D847BA73DC2099F83F532951C47269D9FD7E411B50BAE00A9581F8900FF,  # noqa: E501
-                150: 0x13AB9E1F0DF89A184B4D07080B68FB921F7AA6AFF8100000000000000000001,  # noqa: E501
-                151: 0xF387ED41C1050F9DA667F429A3E8FB30B61A55EDE97D7B8ACD797A03CD89FF01,  # noqa: E501
-                152: 0x525696C22BB3CE00FD2E3F6BBB9B4EA1046A5E31FCFF2FEDF8F8C74D28890101,  # noqa: E501
-                163: 0xFE0F60957DC223578A0298879EC55C33085514FF7F0000000000000000000001,  # noqa: E501
-                164: 0xC1EA45F348B5D351C4D8FE5C77DA979CADC33D866ACC42E981278896B1F600FF,  # noqa: E501
-                165: 0x56DDB29BCA94FB986AC0A40188B3B53F3216B3559BD8324A77EA8BD8A80A00FF,  # noqa: E501
-                166: 0x2D49FF6B0BBE177AE9317000B68FB921F7AA6AFF810000000000000000000001,  # noqa: E501
-                167: 0x185FA9EAB94CFE3016B69657E83B23FD24CC6960218254231C3DB627A7F60101,  # noqa: E501
-                168: 0xA7A0223829F26D6C635368034320563DF4AA5EB62EFC87A42BB35F69B20A0101,  # noqa: E501
-                179: 0xE1440264B8EE0CEA0218879EC55C33085514FF7F000000000000000000000001,  # noqa: E501
-                180: 0x29575FDCE377B23043E489E358581474BC863187FA85F9945473A2BE5889FEFF,  # noqa: E501
-                181: 0x3DF8C030EC521FB109C4D887DBBC14C7C9C9921B27058E3503971B60B18B00FF,  # noqa: E501
-                182: 0x67799740340DAF4A30F000B68FB921F7AA6AFF81000000000000000000000001,  # noqa: E501
-                183: 0x540A4E4635B40585E09FF10B63FFE310DD717FCA5C0A51570091E25E378BFF01,  # noqa: E501
-                184: 0xDBBAEF5C49FFEE61B08CDE6EBC8DBA6E9A62D56C2355D1980CB9E790BC8B0101,  # noqa: E501
-                195: 0xB0E95B83A36CE98218879EC55C33085514FF7F00000000000000000000000001,  # noqa: E501
-                196: 0xC482AB56EC19186DC48C88F30861A850B2253B1EA6DC021589E569BD47F400FF,  # noqa: E501
-                197: 0xCF45C7F9AF4BBE4A83055B55B97777AD5E0A3F08B129C9AE208C5D713C0C00FF,  # noqa: E501
-                198: 0xA5CBB62A421049B0F000B68FB921F7AA6AFF8100000000000000000000000001,  # noqa: E501
-                199: 0x3BDE6CA66DFFE1BF5D727C3EDEA74C7A4AF43B3912E6256D37705C8F3BF40101,  # noqa: E501
-                200: 0x3F49A1E40C5213AA4FFED57EB4C1AD2D181B2AAA289E9D59C2256C43480C0101,  # noqa: E501
-                211: 0xE02639036C698218879EC55C33085514FF7F0000000000000000000000000001,  # noqa: E501
-                212: 0x8BE664BDE946D939CE551B948B503787942D2A7734509288C1B62FD5C48BFEFF,  # noqa: E501
-                213: 0xA923A28E7A75AEF26C51580FFC686879E4A0B404B089BDBCD751D88B478D00FF,  # noqa: E501
-                214: 0x41AC5EA30FC9B0F000B68FB921F7AA6AFF810000000000000000000000000001,  # noqa: E501
-                215: 0xDAA3A177EC975CB69BB4ACF4A6E1BE7BCC1AD33D1FFAD97510F9FEA9D8DFF01,  # noqa: E501
-                216: 0x19E6822BEB889BE28310060F4FB9741BFD50A31FA81EC65DE21F7B02548D0101,  # noqa: E501
-                227: 0xDB9902EC698218879EC55C33085514FF7F000000000000000000000000000001,  # noqa: E501
-                228: 0x83FAB06C6C8FEF761EBBB9534C06AC2A9D61820623008069062FF3B1E1F200FF,  # noqa: E501
-                229: 0x3F791DD183ED5B963BD86E0DBA1A9DD5B8CEEB078F15C73062F1942FD40E00FF,  # noqa: E501
-                230: 0xE0BFA28FC9B0F000B68FB921F7AA6AFF81000000000000000000000000000001,  # noqa: E501
-                231: 0x8133B760DFAE27560EB490F235DDFA301F058DEE4F01F3FE4B3567D0D3F20101,  # noqa: E501
-                232: 0xCD4CD0124E983AF71620FB5F98275965C6A8BEBC4B8ADC288B63224EE20E0101,  # noqa: E501
-                243: 0x9882EC698218879EC55C33085514FF7F00000000000000000000000000000001,  # noqa: E501
-                244: 0x75C4915E18B96704209738F5CA765568BB4DC4113D56683977825A132C8DFEFF,  # noqa: E501
-                245: 0x5C76839BF5A80B1DA705DBDF43E4DD6770CD7501AF11FF2DAB7918DFE18F00FF,  # noqa: E501
-                246: 0xBF228FC9B0F000B68FB921F7AA6AFF8100000000000000000000000000000001,  # noqa: E501
-                247: 0xC6A29131E7594004BC2AA79F0D2C402A1409C57C77D284C14B1A3AB0FF8FFF01,  # noqa: E501
-                248: 0xE6B3E5CF6EC90E532FEF7D08455EBF92A03E9E3F6E224EA0FEBDF1A9F08F0101,  # noqa: E501
-                259: 0x82EC698218879EC55C33085514FF7F0000000000000000000000000000000001,  # noqa: E501
-                260: 0x3122F4BCDF6DD8B265CD18EB6AF28C879AED44A35E0BF59273E39E6C7FF000FF,  # noqa: E501
-                261: 0x6A2B3BC87A02C29B9D27757DF43047ECD0F15485270FCA27417A701C701000FF,  # noqa: E501
-                262: 0x228FC9B0F000B68FB921F7AA6AFF810000000000000000000000000000000001,  # noqa: E501
-                263: 0x88E1259502EEF93D46060AACC9E2FF506C734DADE0B6714AB12D17E46FF00101,  # noqa: E501
-                264: 0x4A103813C12C12169B218296BB0A9EAE80CF8D2B158AA70EB990F99480100101,  # noqa: E501
-                275: 0xEC698218879EC55C33085514FF7F000000000000000000000000000000000001,  # noqa: E501
-                276: 0x722AD218EB1995A2D257C4C06D8DE993C203CFC8E3512DF7D633E17E908FFEFF,  # noqa: E501
-                277: 0x8AC9B5EC08D74612CB29F941481D274B51721AF2296207C0DA8D24667F9100FF,  # noqa: E501
-                278: 0x8FC9B0F000B68FB921F7AA6AFF81000000000000000000000000000000000001,  # noqa: E501
-                279: 0x81D5FF63680841482299F3EAB616446DCD336F537C0C565AA4112AB95D91FF01,  # noqa: E501
-                280: 0x9C6CA90DAC4E97DEA02AC969E8649EE9E6232E0C3F4797411151CB8F90910101,  # noqa: E501
-                291: 0x698218879EC55C33085514FF7F00000000000000000000000000000000000001,  # noqa: E501
-                292: 0x8A2CBD9F40794E2205B13306F2AA0A43C60823C64B95D8601FA4F1E521EE00FF,  # noqa: E501
-                293: 0xC1B5A1E3A81DA51B10D84E880F0113FF67B863DDAD3FAF1F4ECF413F101200FF,  # noqa: E501
-                294: 0xC9B0F000B68FB921F7AA6AFF8100000000000000000000000000000000000001,  # noqa: E501
-                295: 0x410BE68E49452A1FBCD863BF6E8D637F8EAE4979C34C88D552AFBCC20FEE0101,  # noqa: E501
-                296: 0xF540CB714754B5B1EB0373833833BD7FB0EE925CE8B92962500B7A1C22120101,  # noqa: E501
-                307: 0x8218879EC55C33085514FF7F0000000000000000000000000000000000000001,  # noqa: E501
-                308: 0xB795AD7AC24CFBB7435CF53BD3584F3D4B2709935635C3CEB66E761FF091FEFF,  # noqa: E501
-                309: 0x1F0BB7BE91A0CCD0CCA93D75CF03DE3E6B56FE8F1C54242617665327219300FF,  # noqa: E501
-                310: 0xB0F000B68FB921F7AA6AFF810000000000000000000000000000000000000001,  # noqa: E501
-                311: 0xAD571756ECBFF1BFDEF064861E5E92C5D897A9CC380E54BDBAABD80BB793FF01,  # noqa: E501
-                312: 0xD8B5B531989E689F700DCDB43AB90E79A49DFBBB5A13DBF751DF98BB34930101,  # noqa: E501
-                323: 0x18879EC55C33085514FF7F000000000000000000000000000000000000000001,  # noqa: E501
-                324: 0x67E4797DC21F02CE4A7C52218C7DBEA5D212E6C244E24F0BA4C08613C7EC00FF,  # noqa: E501
-                325: 0xA1CE1A085F258785846939CC1D2E8725AC94AD4DFF8913234E00679FB41400FF,  # noqa: E501
-                326: 0xF000B68FB921F7AA6AFF81000000000000000000000000000000000000000001,  # noqa: E501
-                327: 0xCCE501857A1CB45473915A28082AF950E0F78F7E2DE68CE748ADB661B3EC0101,  # noqa: E501
-                328: 0x3B2E28D274A16C08B58A23BAD63BBA6D7B09685769D1F68CA3873BEDC8140101,  # noqa: E501
-                339: 0x879EC55C33085514FF7F00000000000000000000000000000000000000000001,  # noqa: E501
-                340: 0x7FD07055FF50CDFE4B4BD9A15133D72D3607D92EB7AC81BAC93DB7FF4C93FEFF,  # noqa: E501
-                341: 0x665AC5C769E87F61D5993ABC26522FBFCA2734D76A63216B2D550D29C79500FF,  # noqa: E501
-                342: 0xB68FB921F7AA6AFF8100000000000000000000000000000000000000000001,  # noqa: E501
-                343: 0x1C93DB67C9884BC694686D69A25A5D7ED089841D5CE147FDD7199AB00D95FF01,  # noqa: E501
-                344: 0x485053D8FF66BE52036597520344FAC87B6A305426A9E49221D3F934DC950101,  # noqa: E501
-                355: 0x9EC55C33085514FF7F0000000000000000000000000000000000000000000001,  # noqa: E501
-                356: 0xEC447E662AC08957D7E290A421DBF54C0AAF43AADC9CC465AD0B02F071EA00FF,  # noqa: E501
-                357: 0xDC9178D3BAB470096F01477C859B5F4173986640B659426412A653465C1600FF,  # noqa: E501
-                358: 0xB68FB921F7AA6AFF810000000000000000000000000000000000000000000001,  # noqa: E501
-                359: 0xDCF0A770777610503596AE0311AF46C171151ED45107D7E7BB8F74BB5BEA0101,  # noqa: E501
-                360: 0x4D65773387993928C95C861274232D3FB6F6B7FE1B22E4E61A30E71172160101,  # noqa: E501
-                371: 0xC55C33085514FF7F000000000000000000000000000000000000000000000001,  # noqa: E501
-                372: 0x537CA0F03F974303005F1E6693B55B72315A166841732E42B8353724A495FEFF,  # noqa: E501
-                373: 0x86418797EC60058DE6CCA47DFDBEE79923AC49D7801E01840041CA76719700FF,  # noqa: E501
-                374: 0x8FB921F7AA6AFF81000000000000000000000000000000000000000000000001,  # noqa: E501
-                375: 0x56A55341AB8D4318F1CFB55D5F21E2BA35D7E070A72BAC6B2B21BAAE5F97FF01,  # noqa: E501
-                376: 0x55DDD0EC77909DE6D8311116CF520398E816F928B06FDD90EC239D0488970101,  # noqa: E501
-                387: 0x5C33085514FF7F00000000000000000000000000000000000000000000000001,  # noqa: E501
-                388: 0xD542E526003539EAD104274AFF2D78332366E29D328C2161F0C120731FE800FF,  # noqa: E501
-                389: 0xC706CB25E8384CE9BB5C9CB48415238BA03E16C448E292C0A101843B081800FF,  # noqa: E501
-                390: 0xB921F7AA6AFF8100000000000000000000000000000000000000000000000001,  # noqa: E501
-                391: 0x4CA55F89202C524CB0F1CB3195D13C8D94A9F7A05C59E1D4031577C707E80101,  # noqa: E501
-                392: 0x8C4B0574E9156B80035F3ECDCF1FE79D273ED7559747A4322BCD338F20180101,  # noqa: E501
-                403: 0x33085514FF7F0000000000000000000000000000000000000000000000000001,  # noqa: E501
-                404: 0x7F510DD7198CAC0A92FF7EA80451838C0DFA12114C41A0EF05907397F897FEFF,  # noqa: E501
-                405: 0x1275E752B6AEE228ECBA5E9B57EF1111DEFF3C651E2CFBF2CCCD13151F9900FF,  # noqa: E501
-                406: 0x21F7AA6AFF810000000000000000000000000000000000000000000000000001,  # noqa: E501
-                407: 0x6646340AD51A03BB710CAF05756B685B33C7DAD62AE68D369243700EAD99FF01,  # noqa: E501
-                408: 0x29D80E8060EF2221929BB18215586C742686D6860E028CA0456B443238990101,  # noqa: E501
-                419: 0x85514FF7F000000000000000000000000000000000000000000000000000001,  # noqa: E501
-                420: 0x1D164DB738EB6893868B361AD2803F97BE35764456E82A837667A693D1E600FF,  # noqa: E501
-                421: 0x8B92C24ABEBF376A5AAB5FF4DFD3538A03D38A10BCED2AAE8E1A8A85B81A00FF,  # noqa: E501
-                422: 0xF7AA6AFF81000000000000000000000000000000000000000000000000000001,  # noqa: E501
-                423: 0x6931BDA98C70E860A1F6A5224940F1EC7E6734CD9456C95806384F7CB7E60101,  # noqa: E501
-                424: 0x3402A9DB66492DFC2A220715E76243469462F24EDC56903BA1D8E96ED21A0101,  # noqa: E501
-                435: 0x5514FF7F00000000000000000000000000000000000000000000000000000001,  # noqa: E501
-                436: 0x178918FFBCB401D4EFD2F7DFB4D01A897172267F0F491121AC52DD614899FEFF,  # noqa: E501
-                437: 0x38ECFF71480CA0B422F2ED6F780D5FEAD2AE234A49104B10A86F7F0DD19B00FF,  # noqa: E501
-                438: 0xAA6AFF8100000000000000000000000000000000000000000000000000000001,  # noqa: E501
-                439: 0xD02811CB5DC1D80567E810532B235B7672F5C78CD6E89BB511D5E2D8F79BFF01,  # noqa: E501
-                440: 0x1B4E6404F474C18055D30BB8987672F59E97980D6F9DE1764C0FBEC5EC9B0101,  # noqa: E501
-                451: 0x14FF7F0000000000000000000000000000000000000000000000000000000001,  # noqa: E501
-                452: 0xFFD368E44B3F85CB81AE394C9809CA9FA2DB46A83D7880A912AB6D4A87E400FF,  # noqa: E501
-                453: 0x981AD53C19B15A94BCF0BF20235DD0DA9DF25F46AE635029FE2062E6C1C00FF,  # noqa: E501
-                454: 0x6AFF810000000000000000000000000000000000000000000000000000000001,  # noqa: E501
-                455: 0x19DF06FFA28250867006726405FBC05D43DC2F9D2F025006DB089BD46BE40101,  # noqa: E501
-                456: 0x243FFFE3A4F2982F45055C08F379648AB886DA8027A7401117A8E0B8881C0101,  # noqa: E501
-                467: 0xFF7F000000000000000000000000000000000000000000000000000000000001,  # noqa: E501
-                468: 0x41E065D46E0349CFE624C4E8A2034AEA1F7EDFFF80E511CD8067D488949BFEFF,  # noqa: E501
-                469: 0xA84162CA6675A22C4C79DFC4EA15F760DB5A04DBF04246764199B668879D00FF,  # noqa: E501
-                470: 0xFF81000000000000000000000000000000000000000000000000000000000001,  # noqa: E501
-                471: 0x1226984FAA6B05EBDBD45D8477FA4FD5B55BFD5061DE03C319282B153D9DFF01,  # noqa: E501
-                472: 0x5CC9E6B0B749FD94541AD00364BDEC2FCA7816981CA3E38F485DECC7A49D0101,  # noqa: E501
-                483: 0x7F00000000000000000000000000000000000000000000000000000000000001,  # noqa: E501
-                484: 0xE9772778F50FA0A69CD10FA019AC56D72AC7A7D7AF26C4BA28415C8F41E200FF,  # noqa: E501
-                485: 0x33F0385EF73FEEBDB952E5ADB643DD0FA178FD9271578219AD50A73D241E00FF,  # noqa: E501
-                486: 0x8100000000000000000000000000000000000000000000000000000000000001,  # noqa: E501
-                487: 0xFD405CCE8F73DFFC04A6F0FF6FFC6BF7961876D09C5B4933A68F0CC623E20101,  # noqa: E501
-                488: 0xC5A8F4566FD2E96E4CE3A8B3EC0863E7B20BC3B2F3DC5261BA8A0174421E0101,  # noqa: E501
-                499: 1,
-                500: 0xF9CB87F5B1AB58602F52A1E9D392E5675B86A59A53943A8D4EC2A915DC9DFEFF,  # noqa: E501
-                501: 0x893D729A64E318860EC5047E70E598DA163EB41E71E74B04DFD4712D419F00FF,  # noqa: E501
-                502: 1,
-                503: 0xEE5F2839C1B4F6CA05E6FDB04E2FB49C0F860B3765C27DC781A150CB7F9FFF01,  # noqa: E501
-                504: 0xB4C358E3C6BCDDFB509EA487D733DF0E1854F29C3B6BFD4A8CAABE3F609F0101,  # noqa: E501
-                512: 1,
-                515: 1,
-                516: 0xB8247842BB5CE75C08D0C251669ED5870FA24A22952E5DB3A7C66C59FFE000FF,  # noqa: E501
-                517: 0xEE526E5A06F2A990B2BF6C951E5FEABF0E07EE16877296E1BE872DB9E02000FF,  # noqa: E501
-                518: 1,
-                519: 0xEDA7D024B6DE40A9D3B966E71F10A4667EDC5B71CAB07AEABCAC6249DFE00101,  # noqa: E501
-                520: 0x512ECFAEEB11205F0833E1054DCB1300488E0954BE5AF77A49E143AA00200101,  # noqa: E501
-                528: 1,
-                531: 1,
-                532: 0x8DCB65B5494EBA78CD6756A6F9851F6E26D0F2BB9ECD7E9ABD7E9B11209FFEFF,  # noqa: E501
-                533: 0x6694BB31B20CD625F3756897DAE6D738F2E64467B5B6F10FA3E07763FFA100FF,  # noqa: E501
-                534: 1,
-                535: 0xE678999AEFFD1F1F45081F64DE7F80AB083DD7DF04721ED64EE04C03BDA1FF01,  # noqa: E501
-                536: 0x39B68FB9898DD7568ABD178397251CE8226A25C1D305A4E79573333520A10101,  # noqa: E501
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_fib.py b/tests/ported_static/VMTests/vmArithmeticTest/test_fib.py
deleted file mode 100644
index facefac78c3..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_fib.py
+++ /dev/null
@@ -1,160 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/fibFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmArithmeticTest/fibFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
-def test_fib(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #    (def 'fib (n) [[n]] (+ @@(- n 1) @@(- n 2)))
-    #    (fib  2)
-    #    (fib  3)
-    #    (fib  4)
-    #    (fib  5)
-    #    (fib  6)
-    #    (fib  7)
-    #    (fib  8)
-    #    (fib  9)
-    #    (fib 10)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.ADD(
-                    Op.SLOAD(key=Op.SUB(0x2, 0x1)),
-                    Op.SLOAD(key=Op.SUB(0x2, 0x2)),
-                ),
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.ADD(
-                    Op.SLOAD(key=Op.SUB(0x3, 0x1)),
-                    Op.SLOAD(key=Op.SUB(0x3, 0x2)),
-                ),
-            )
-            + Op.SSTORE(
-                key=0x4,
-                value=Op.ADD(
-                    Op.SLOAD(key=Op.SUB(0x4, 0x1)),
-                    Op.SLOAD(key=Op.SUB(0x4, 0x2)),
-                ),
-            )
-            + Op.SSTORE(
-                key=0x5,
-                value=Op.ADD(
-                    Op.SLOAD(key=Op.SUB(0x5, 0x1)),
-                    Op.SLOAD(key=Op.SUB(0x5, 0x2)),
-                ),
-            )
-            + Op.SSTORE(
-                key=0x6,
-                value=Op.ADD(
-                    Op.SLOAD(key=Op.SUB(0x6, 0x1)),
-                    Op.SLOAD(key=Op.SUB(0x6, 0x2)),
-                ),
-            )
-            + Op.SSTORE(
-                key=0x7,
-                value=Op.ADD(
-                    Op.SLOAD(key=Op.SUB(0x7, 0x1)),
-                    Op.SLOAD(key=Op.SUB(0x7, 0x2)),
-                ),
-            )
-            + Op.SSTORE(
-                key=0x8,
-                value=Op.ADD(
-                    Op.SLOAD(key=Op.SUB(0x8, 0x1)),
-                    Op.SLOAD(key=Op.SUB(0x8, 0x2)),
-                ),
-            )
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.ADD(
-                    Op.SLOAD(key=Op.SUB(0x9, 0x1)),
-                    Op.SLOAD(key=Op.SUB(0x9, 0x2)),
-                ),
-            )
-            + Op.SSTORE(
-                key=0xA,
-                value=Op.ADD(
-                    Op.SLOAD(key=Op.SUB(0xA, 0x1)),
-                    Op.SLOAD(key=Op.SUB(0xA, 0x2)),
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0x0, 0x1: 0x1},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xf8d9ff3e0cf16acf51098c85f2cb8f082ef588c2"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("01"),
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = {
-        contract: Account(
-            storage={
-                1: 1,
-                2: 1,
-                3: 2,
-                4: 3,
-                5: 5,
-                6: 8,
-                7: 13,
-                8: 21,
-                9: 34,
-                10: 55,
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_mod.py b/tests/ported_static/VMTests/vmArithmeticTest/test_mod.py
deleted file mode 100644
index 7632ff4d764..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_mod.py
+++ /dev/null
@@ -1,189 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/modFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmArithmeticTest/modFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001005"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 2}
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4", "case5"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_mod(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.MOD(0x2, 0x3)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0x2,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(
-                    0x0,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.MOD(0x3, 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.MOD(Op.SUB(0x0, 0x2), 0x3)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SUB(Op.MOD(0x10, 0x0), 0x1)) + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_mul.py b/tests/ported_static/VMTests/vmArithmeticTest/test_mul.py
deleted file mode 100644
index 48046901ecb..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_mul.py
+++ /dev/null
@@ -1,268 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/mulFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmArithmeticTest/mulFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001007"): Account(
-                    storage={
-                        0: 0x47D0817E4167B1EB4F9FC722B133EF9D7D9A6FB4C2C1C442D000107A5E419561  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 23}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 6}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={
-                        0: 0x8000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001006"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_mul(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.MUL(0x2, 0x3)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.MUL(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.MUL(0x0, 0x17)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.MUL(0x17, 0x1)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.MUL(
-                    0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.MUL(
-                    0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.MUL(
-                    0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.MUL(
-                    Op.MUL(
-                        0x1234567890ABCDEF0FEDCBA0987654321,
-                        0x1234567890ABCDEF0FEDCBA0987654321,
-                    ),
-                    0x1234567890ABCDEF0FEDCBA0987654321,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001007"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=0x1) + Op.PUSH1[0x1] + Op.MUL + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001008"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_mulmod.py b/tests/ported_static/VMTests/vmArithmeticTest/test_mulmod.py
deleted file mode 100644
index 45c12871a4c..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_mulmod.py
+++ /dev/null
@@ -1,427 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/mulmodFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmArithmeticTest/mulmodFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000d",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 99}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001005"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001007"): Account(
-                    storage={0: 4}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001008"): Account(
-                    storage={0: 3}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000d",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 5}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 2}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100a"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000009",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000e",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100e"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_mulmod(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.MULMOD(0x1, 0x2, 0x2)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.MULMOD(Op.SUB(0x0, 0x1), Op.SUB(0x0, 0x2), 0x3),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.MULMOD(Op.SUB(0x0, 0x5), 0x1, 0x3))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.MULMOD(0x5, 0x1, Op.SUB(0x0, 0x3)))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.MULMOD(0x1B, 0x25, 0x64)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.MULMOD(
-                    0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    0x2,
-                    0x5,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.MULMOD(Op.SUB(0x0, 0x1), 0x2, 0x5))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.MULMOD(
-                    Op.SUB(
-                        0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                        0x1,
-                    ),
-                    0x2,
-                    0x5,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001007"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    (def 'pow2_255 0x8000000000000000000000000000000000000000000000000000000000000000)  # noqa: E501
-    #
-    #    ; 2^255%5 = 3
-    #    ;     2%5 = 2
-    #    ; ((3+1) * 2) % 5 = 3
-    #    [[0]] (mulmod (+ pow2_255 1) 2 5)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.MULMOD(
-                    Op.ADD(
-                        0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                        0x1,
-                    ),
-                    0x2,
-                    0x5,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001008"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    ; smod   is signed mod, -5%3 = -1
-    #    ; mulmod is unsigned mod, -5%3 = 2
-    #    ; -1 != 2
-    #    [[0]] (= (smod (- 0 5) 3) (mulmod (- 0 5) 1 3))
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.EQ(
-                    Op.SMOD(Op.SUB(0x0, 0x5), 0x3),
-                    Op.MULMOD(Op.SUB(0x0, 0x5), 0x1, 0x3),
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001009"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    ; mod and mulmod are both unsigned mod
-    #    ; equal
-    #    [[0]] (= (mod (- 0 5) 3) (mulmod (- 0 5) 1 3))
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.EQ(
-                    Op.MOD(Op.SUB(0x0, 0x5), 0x3),
-                    Op.MULMOD(Op.SUB(0x0, 0x5), 0x1, 0x3),
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100a"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    ; (mulmod a b -c) is usually a*b, because -c is
-    #    ; actually 2^256-c, which is huge
-    #    ; not equal
-    #    [[0]] (= (mulmod 5 1 (- 0 3)) 2)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.EQ(Op.MULMOD(0x5, 0x1, Op.SUB(0x0, 0x3)), 0x2),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100b"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    ; (mulmod x y 0) is zero
-    #    [[0]] (mulmod 0 1 0)
-    # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.MULMOD(0x0, 0x1, 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100c"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    ; (mulmod x y 0) is zero
-    #    [[0]] (mulmod 1 0 0)
-    # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.MULMOD(0x1, 0x0, 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100d"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    ; (mulmod x y 0) is zero
-    #    [[0]] (- 1 (mulmod 0 0 0))
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SUB(0x1, Op.MULMOD(0x0, 0x0, 0x0)))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100e"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    ; (mulmod x y 0) is zero
-    #    [[0]] (mulmod 5 1 0)
-    # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.MULMOD(0x5, 0x1, 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100f"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_sdiv.py b/tests/ported_static/VMTests/vmArithmeticTest/test_sdiv.py
deleted file mode 100644
index 1770862cf99..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_sdiv.py
+++ /dev/null
@@ -1,527 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/sdivFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmArithmeticTest/sdivFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001005"): Account(
-                    storage={
-                        0: 0x8000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000f",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100f"): Account(
-                    storage={
-                        0: 0x8000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000e",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100e"): Account(
-                    storage={
-                        0: 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000009",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001009"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001008"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000d",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100d"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_sdiv(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SDIV(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    Op.SUB(
-                        0x0,
-                        0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000000110"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SDIV(
-                    Op.SUB(
-                        0x0,
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ),
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SDIV(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    Op.SUB(
-                        0x0,
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0, value=Op.SDIV(Op.SUB(0x0, 0x2), Op.SUB(0x0, 0x4))
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SDIV(0x4, Op.SUB(0x0, 0x2))) + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SDIV(0x5, Op.SUB(0x0, 0x4))) + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SDIV(
-                    Op.SUB(
-                        0x0,
-                        0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    ),
-                    Op.SUB(0x0, 0x1),
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SDIV(
-                    Op.SUB(
-                        0x0,
-                        0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    ),
-                    0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SDIV(Op.SUB(0x0, 0x1), 0x19)) + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001007"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  ; (-1)/(-1) = 1
-    #
-    #    [[0]] (sdiv (- 0 1) (- 0 1))
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0, value=Op.SDIV(Op.SUB(0x0, 0x1), Op.SUB(0x0, 0x1))
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001008"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  ; (-1)/1 = -1
-    #
-    #    [[0]] (sdiv (- 0 1) 1)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SDIV(Op.SUB(0x0, 0x1), 0x1)) + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001009"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  ; (-3)/0 = 0
-    #    ; x/0 = 0 in evm
-    #
-    #    [[0]] (sdiv (- 0 3) (- 0 0))
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0, value=Op.SDIV(Op.SUB(0x0, 0x3), Op.SUB(0x0, 0x0))
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100a"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  ; (0-(-1))/0 = 0
-    #    ;
-    #    ; -1 = 2^256-1
-    #    (def 'neg1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
-    #
-    #    [[0]] (sdiv (- 0 neg1) 0)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SDIV(
-                    Op.SUB(
-                        0x0,
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ),
-                    0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100b"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  ; (0-(-1))/0 + 1 = 1
-    #    ;
-    #    ; -1 = 2^256-1
-    #    (def 'neg1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
-    #
-    #    [[0]] (+ (sdiv (- 0 neg1) 0) 1)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.ADD(
-                    Op.SDIV(
-                        Op.SUB(
-                            0x0,
-                            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                        ),
-                        0x0,
-                    ),
-                    0x1,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SDIV(Op.SUB(0x0, 0x9), 0x5)) + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100d"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    ; A negative number sdiv -1 is the absolute value of that number
-    #    (def 'pow2_255 0x8000000000000000000000000000000000000000000000000000000000000000)  # noqa: E501
-    #    (def 'pow2_255_min1 (- pow2_255 1))
-    #    [[0]] (sdiv (- 0 pow2_255_min1) (- 0 1))
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SDIV(
-                    Op.SUB(
-                        0x0,
-                        Op.SUB(
-                            0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                            0x1,
-                        ),
-                    ),
-                    Op.SUB(0x0, 0x1),
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100e"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    ; A negative number sdiv -1 is the absolute value of that number
-    #    (def 'pow2_255 0x8000000000000000000000000000000000000000000000000000000000000000)  # noqa: E501
-    #    [[0]] (sdiv (- 0 pow2_255) (- 0 1))
-    #    ; 2^255 = -2^255 in evm (modulo 2^256)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SDIV(
-                    Op.SUB(
-                        0x0,
-                        0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    ),
-                    Op.SUB(0x0, 0x1),
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100f"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_signextend.py b/tests/ported_static/VMTests/vmArithmeticTest/test_signextend.py
deleted file mode 100644
index a412fed77f5..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_signextend.py
+++ /dev/null
@@ -1,401 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/signextendFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmArithmeticTest/signextendFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001007"): Account(
-                    storage={0: 106}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001008"): Account(
-                    storage={0: 27380}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000009",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001009"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAF4  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000e",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100e"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000d",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100d"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 0x126AF4}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001005"): Account(
-                    storage={0: 255}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100b"): Account(
-                    storage={0: 65535}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100a"): Account(
-                    storage={0: 32768}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_signextend(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0x50, 0x126AF4)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0x0, 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SIGNEXTEND(
-                    0x0,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SIGNEXTEND(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SIGNEXTEND(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0xF00000000000000001, 0xFF))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SIGNEXTEND(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0x0, 0x122F6A)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001007"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  ; Extend the sign of 0x6af4, which is a positive 16 bit number
-    #    [[0]] (signextend 1 0x126af4)
-    # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0x1, 0x126AF4)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001008"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  ; The first two bytes are 0xfaf4, which is a negative 16 bit number
-    #    ; (-1292). The sign is extended from the first two bytes to the entire
-    #    ; value
-    #    [[0]] (signextend 1 0x12faf4)
-    # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0x1, 0x12FAF4)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001009"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    [[0]] (signextend 0x010000000000000001 0x8000)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0, value=Op.SIGNEXTEND(0x10000000000000001, 0x8000)
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100a"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    [[0]] (signextend 0xf0000000000001 0xFFFF)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0xF0000000000001, 0xFFFF))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100b"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    [[0]] (signextend 0 0x122ff4)
-    # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0x0, 0x122FF4)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100c"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    [[0]] (signextend 31 1)
-    # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0x1F, 0x1)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100d"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    [[0]] (signextend 31 (sub 0 1))
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0x1F, Op.SUB(0x0, 0x1)))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100e"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_smod.py b/tests/ported_static/VMTests/vmArithmeticTest/test_smod.py
deleted file mode 100644
index e591265c11e..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_smod.py
+++ /dev/null
@@ -1,195 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/smodFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmArithmeticTest/smodFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001005"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4", "case5"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_smod(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SMOD(0x2, 0x3)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0x2,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SMOD(
-                    0x0,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SMOD(0x3, 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SMOD(Op.SUB(0x0, 0x2), 0x3)) + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SUB(Op.SMOD(0x10, 0x0), 0x1)) + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_sub.py b/tests/ported_static/VMTests/vmArithmeticTest/test_sub.py
deleted file mode 100644
index 6047b8d31d2..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_sub.py
+++ /dev/null
@@ -1,185 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/subFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmArithmeticTest/subFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 22}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_sub(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SUB(0x17, 0x1)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SUB(0x2, 0x3)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SUB(0x0, 0x17)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    0x0,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_two_ops.py b/tests/ported_static/VMTests/vmArithmeticTest/test_two_ops.py
deleted file mode 100644
index 169ddadba6d..00000000000
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_two_ops.py
+++ /dev/null
@@ -1,4162 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/twoOpsFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmArithmeticTest/twoOpsFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
-def test_two_ops(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #
-    #
-    #     [[0x11000100010000]] (ADD (ADD 2 1) 3)
-    #     [[0x11000100010001]] (ADD (ADD 2 1) 1)
-    #     [[0x11000100020000]] (ADD (MUL 2 1) 3)
-    #     [[0x11000100020001]] (ADD (MUL 2 1) 1)
-    #     [[0x11000100030000]] (ADD (SUB 2 1) 3)
-    #     [[0x11000100030001]] (ADD (SUB 2 1) 1)
-    #     [[0x11000100040000]] (ADD (DIV 2 1) 3)
-    #     [[0x11000100040001]] (ADD (DIV 2 1) 1)
-    #     [[0x11000100050000]] (ADD (SDIV 2 1) 3)
-    #     [[0x11000100050001]] (ADD (SDIV 2 1) 1)
-    #     [[0x11000100060000]] (ADD (MOD 2 1) 3)
-    #     [[0x11000100060001]] (ADD (MOD 2 1) 1)
-    #     [[0x11000100070000]] (ADD (SMOD 2 1) 3)
-    #     [[0x11000100070001]] (ADD (SMOD 2 1) 1)
-    #     [[0x11000100080000]] (ADD (ADDMOD 2 1 3) 3)
-    #     [[0x11000100080001]] (ADD (ADDMOD 2 1 3) 1)
-    #     [[0x11000100090000]] (ADD (MULMOD 2 1 3) 3)
-    #     [[0x11000100090001]] (ADD (MULMOD 2 1 3) 1)
-    #     [[0x110001000a0000]] (ADD (EXP 2 1) 3)
-    #     [[0x110001000a0001]] (ADD (EXP 2 1) 1)
-    #     [[0x11000100100000]] (ADD (LT 2 1) 3)
-    #     [[0x11000100100001]] (ADD (LT 2 1) 1)
-    #     [[0x11000100110000]] (ADD (GT 2 1) 3)
-    #     [[0x11000100110001]] (ADD (GT 2 1) 1)
-    #     [[0x11000100120000]] (ADD (SLT 2 1) 3)
-    #     [[0x11000100120001]] (ADD (SLT 2 1) 1)
-    #     [[0x11000100130000]] (ADD (SGT 2 1) 3)
-    # ... (1127 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x11000100010000, value=Op.ADD(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000100010001, value=Op.ADD(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000100020000, value=Op.ADD(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000100020001, value=Op.ADD(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000100030000, value=Op.ADD(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000100030001, value=Op.ADD(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000100040000, value=Op.ADD(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000100040001, value=Op.ADD(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000100050000, value=Op.ADD(Op.SDIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000100050001, value=Op.ADD(Op.SDIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000100060000, value=Op.ADD(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000100060001, value=Op.ADD(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000100070000, value=Op.ADD(Op.SMOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000100070001, value=Op.ADD(Op.SMOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000100080000,
-                value=Op.ADD(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000100080001,
-                value=Op.ADD(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11000100090000,
-                value=Op.ADD(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000100090001,
-                value=Op.ADD(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x110001000A0000, value=Op.ADD(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110001000A0001, value=Op.ADD(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000100100000, value=Op.ADD(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000100100001, value=Op.ADD(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000100110000, value=Op.ADD(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000100110001, value=Op.ADD(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000100120000, value=Op.ADD(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000100120001, value=Op.ADD(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000100130000, value=Op.ADD(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000100130001, value=Op.ADD(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000100140000, value=Op.ADD(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000100140001, value=Op.ADD(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000100150000, value=Op.ADD(Op.ISZERO(0x2), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000100150001, value=Op.ADD(Op.ISZERO(0x2), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000100160000, value=Op.ADD(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000100160001, value=Op.ADD(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000100170000, value=Op.ADD(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000100170001, value=Op.ADD(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000100180000, value=Op.ADD(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000100180001, value=Op.ADD(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11000100190000, value=Op.ADD(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11000100190001, value=Op.ADD(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x110001001A0000, value=Op.ADD(Op.BYTE(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110001001A0001, value=Op.ADD(Op.BYTE(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110001001B0000, value=Op.ADD(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110001001B0001, value=Op.ADD(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110001001C0000, value=Op.ADD(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110001001C0001, value=Op.ADD(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110001001D0000, value=Op.ADD(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110001001D0001, value=Op.ADD(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000200010000, value=Op.MUL(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000200010001, value=Op.MUL(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000200020000, value=Op.MUL(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000200020001, value=Op.MUL(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000200030000, value=Op.MUL(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000200030001, value=Op.MUL(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000200040000, value=Op.MUL(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000200040001, value=Op.MUL(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000200050000, value=Op.MUL(Op.SDIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000200050001, value=Op.MUL(Op.SDIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000200060000, value=Op.MUL(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000200060001, value=Op.MUL(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000200070000, value=Op.MUL(Op.SMOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000200070001, value=Op.MUL(Op.SMOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000200080000,
-                value=Op.MUL(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000200080001,
-                value=Op.MUL(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11000200090000,
-                value=Op.MUL(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000200090001,
-                value=Op.MUL(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x110002000A0000, value=Op.MUL(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110002000A0001, value=Op.MUL(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000200100000, value=Op.MUL(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000200100001, value=Op.MUL(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000200110000, value=Op.MUL(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000200110001, value=Op.MUL(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000200120000, value=Op.MUL(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000200120001, value=Op.MUL(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000200130000, value=Op.MUL(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000200130001, value=Op.MUL(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000200140000, value=Op.MUL(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000200140001, value=Op.MUL(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000200150000, value=Op.MUL(Op.ISZERO(0x2), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000200150001, value=Op.MUL(Op.ISZERO(0x2), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000200160000, value=Op.MUL(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000200160001, value=Op.MUL(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000200170000, value=Op.MUL(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000200170001, value=Op.MUL(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000200180000, value=Op.MUL(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000200180001, value=Op.MUL(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11000200190000, value=Op.MUL(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11000200190001, value=Op.MUL(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x110002001A0000, value=Op.MUL(Op.BYTE(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110002001A0001, value=Op.MUL(Op.BYTE(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110002001B0000, value=Op.MUL(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110002001B0001, value=Op.MUL(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110002001C0000, value=Op.MUL(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110002001C0001, value=Op.MUL(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110002001D0000, value=Op.MUL(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110002001D0001, value=Op.MUL(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000300010000, value=Op.SUB(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000300010001, value=Op.SUB(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000300020000, value=Op.SUB(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000300020001, value=Op.SUB(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000300030000, value=Op.SUB(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000300030001, value=Op.SUB(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000300040000, value=Op.SUB(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000300040001, value=Op.SUB(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000300050000, value=Op.SUB(Op.SDIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000300050001, value=Op.SUB(Op.SDIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000300060000, value=Op.SUB(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000300060001, value=Op.SUB(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000300070000, value=Op.SUB(Op.SMOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000300070001, value=Op.SUB(Op.SMOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000300080000,
-                value=Op.SUB(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000300080001,
-                value=Op.SUB(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11000300090000,
-                value=Op.SUB(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000300090001,
-                value=Op.SUB(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x110003000A0000, value=Op.SUB(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110003000A0001, value=Op.SUB(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000300100000, value=Op.SUB(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000300100001, value=Op.SUB(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000300110000, value=Op.SUB(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000300110001, value=Op.SUB(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000300120000, value=Op.SUB(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000300120001, value=Op.SUB(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000300130000, value=Op.SUB(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000300130001, value=Op.SUB(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000300140000, value=Op.SUB(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000300140001, value=Op.SUB(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000300150000, value=Op.SUB(Op.ISZERO(0x2), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000300150001, value=Op.SUB(Op.ISZERO(0x2), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000300160000, value=Op.SUB(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000300160001, value=Op.SUB(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000300170000, value=Op.SUB(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000300170001, value=Op.SUB(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000300180000, value=Op.SUB(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000300180001, value=Op.SUB(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11000300190000, value=Op.SUB(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11000300190001, value=Op.SUB(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x110003001A0000, value=Op.SUB(Op.BYTE(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110003001A0001, value=Op.SUB(Op.BYTE(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110003001B0000, value=Op.SUB(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110003001B0001, value=Op.SUB(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110003001C0000, value=Op.SUB(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110003001C0001, value=Op.SUB(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110003001D0000, value=Op.SUB(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110003001D0001, value=Op.SUB(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000400010000, value=Op.DIV(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000400010001, value=Op.DIV(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000400020000, value=Op.DIV(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000400020001, value=Op.DIV(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000400030000, value=Op.DIV(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000400030001, value=Op.DIV(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000400040000, value=Op.DIV(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000400040001, value=Op.DIV(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000400050000, value=Op.DIV(Op.SDIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000400050001, value=Op.DIV(Op.SDIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000400060000, value=Op.DIV(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000400060001, value=Op.DIV(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000400070000, value=Op.DIV(Op.SMOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000400070001, value=Op.DIV(Op.SMOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000400080000,
-                value=Op.DIV(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000400080001,
-                value=Op.DIV(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11000400090000,
-                value=Op.DIV(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000400090001,
-                value=Op.DIV(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x110004000A0000, value=Op.DIV(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110004000A0001, value=Op.DIV(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000400100000, value=Op.DIV(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000400100001, value=Op.DIV(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000400110000, value=Op.DIV(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000400110001, value=Op.DIV(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000400120000, value=Op.DIV(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000400120001, value=Op.DIV(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000400130000, value=Op.DIV(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000400130001, value=Op.DIV(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000400140000, value=Op.DIV(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000400140001, value=Op.DIV(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000400150000, value=Op.DIV(Op.ISZERO(0x2), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000400150001, value=Op.DIV(Op.ISZERO(0x2), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000400160000, value=Op.DIV(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000400160001, value=Op.DIV(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000400170000, value=Op.DIV(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000400170001, value=Op.DIV(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000400180000, value=Op.DIV(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000400180001, value=Op.DIV(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11000400190000, value=Op.DIV(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11000400190001, value=Op.DIV(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x110004001A0000, value=Op.DIV(Op.BYTE(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110004001A0001, value=Op.DIV(Op.BYTE(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110004001B0000, value=Op.DIV(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110004001B0001, value=Op.DIV(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110004001C0000, value=Op.DIV(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110004001C0001, value=Op.DIV(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110004001D0000, value=Op.DIV(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110004001D0001, value=Op.DIV(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000500010000, value=Op.SDIV(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000500010001, value=Op.SDIV(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000500020000, value=Op.SDIV(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000500020001, value=Op.SDIV(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000500030000, value=Op.SDIV(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000500030001, value=Op.SDIV(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000500040000, value=Op.SDIV(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000500040001, value=Op.SDIV(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000500050000,
-                value=Op.SDIV(Op.SDIV(0x2, 0x1), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000500050001,
-                value=Op.SDIV(Op.SDIV(0x2, 0x1), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11000500060000, value=Op.SDIV(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000500060001, value=Op.SDIV(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000500070000,
-                value=Op.SDIV(Op.SMOD(0x2, 0x1), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000500070001,
-                value=Op.SDIV(Op.SMOD(0x2, 0x1), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11000500080000,
-                value=Op.SDIV(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000500080001,
-                value=Op.SDIV(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11000500090000,
-                value=Op.SDIV(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000500090001,
-                value=Op.SDIV(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x110005000A0000, value=Op.SDIV(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110005000A0001, value=Op.SDIV(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000500100000, value=Op.SDIV(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000500100001, value=Op.SDIV(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000500110000, value=Op.SDIV(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000500110001, value=Op.SDIV(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000500120000, value=Op.SDIV(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000500120001, value=Op.SDIV(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000500130000, value=Op.SDIV(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000500130001, value=Op.SDIV(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000500140000, value=Op.SDIV(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000500140001, value=Op.SDIV(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000500150000, value=Op.SDIV(Op.ISZERO(0x2), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000500150001, value=Op.SDIV(Op.ISZERO(0x2), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000500160000, value=Op.SDIV(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000500160001, value=Op.SDIV(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000500170000, value=Op.SDIV(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000500170001, value=Op.SDIV(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000500180000, value=Op.SDIV(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000500180001, value=Op.SDIV(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11000500190000, value=Op.SDIV(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11000500190001, value=Op.SDIV(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x110005001A0000,
-                value=Op.SDIV(Op.BYTE(0x2, 0x1), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x110005001A0001,
-                value=Op.SDIV(Op.BYTE(0x2, 0x1), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x110005001B0000, value=Op.SDIV(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110005001B0001, value=Op.SDIV(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110005001C0000, value=Op.SDIV(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110005001C0001, value=Op.SDIV(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110005001D0000, value=Op.SDIV(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110005001D0001, value=Op.SDIV(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000600010000, value=Op.MOD(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000600010001, value=Op.MOD(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000600020000, value=Op.MOD(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000600020001, value=Op.MOD(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000600030000, value=Op.MOD(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000600030001, value=Op.MOD(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000600040000, value=Op.MOD(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000600040001, value=Op.MOD(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000600050000, value=Op.MOD(Op.SDIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000600050001, value=Op.MOD(Op.SDIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000600060000, value=Op.MOD(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000600060001, value=Op.MOD(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000600070000, value=Op.MOD(Op.SMOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000600070001, value=Op.MOD(Op.SMOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000600080000,
-                value=Op.MOD(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000600080001,
-                value=Op.MOD(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11000600090000,
-                value=Op.MOD(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000600090001,
-                value=Op.MOD(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x110006000A0000, value=Op.MOD(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110006000A0001, value=Op.MOD(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000600100000, value=Op.MOD(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000600100001, value=Op.MOD(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000600110000, value=Op.MOD(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000600110001, value=Op.MOD(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000600120000, value=Op.MOD(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000600120001, value=Op.MOD(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000600130000, value=Op.MOD(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000600130001, value=Op.MOD(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000600140000, value=Op.MOD(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000600140001, value=Op.MOD(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000600150000, value=Op.MOD(Op.ISZERO(0x2), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000600150001, value=Op.MOD(Op.ISZERO(0x2), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000600160000, value=Op.MOD(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000600160001, value=Op.MOD(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000600170000, value=Op.MOD(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000600170001, value=Op.MOD(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000600180000, value=Op.MOD(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000600180001, value=Op.MOD(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11000600190000, value=Op.MOD(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11000600190001, value=Op.MOD(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x110006001A0000, value=Op.MOD(Op.BYTE(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110006001A0001, value=Op.MOD(Op.BYTE(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110006001B0000, value=Op.MOD(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110006001B0001, value=Op.MOD(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110006001C0000, value=Op.MOD(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110006001C0001, value=Op.MOD(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110006001D0000, value=Op.MOD(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110006001D0001, value=Op.MOD(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000700010000, value=Op.SMOD(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000700010001, value=Op.SMOD(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000700020000, value=Op.SMOD(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000700020001, value=Op.SMOD(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000700030000, value=Op.SMOD(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000700030001, value=Op.SMOD(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000700040000, value=Op.SMOD(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000700040001, value=Op.SMOD(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000700050000,
-                value=Op.SMOD(Op.SDIV(0x2, 0x1), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000700050001,
-                value=Op.SMOD(Op.SDIV(0x2, 0x1), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11000700060000, value=Op.SMOD(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000700060001, value=Op.SMOD(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000700070000,
-                value=Op.SMOD(Op.SMOD(0x2, 0x1), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000700070001,
-                value=Op.SMOD(Op.SMOD(0x2, 0x1), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11000700080000,
-                value=Op.SMOD(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000700080001,
-                value=Op.SMOD(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11000700090000,
-                value=Op.SMOD(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000700090001,
-                value=Op.SMOD(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x110007000A0000, value=Op.SMOD(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110007000A0001, value=Op.SMOD(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000700100000, value=Op.SMOD(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000700100001, value=Op.SMOD(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000700110000, value=Op.SMOD(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000700110001, value=Op.SMOD(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000700120000, value=Op.SMOD(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000700120001, value=Op.SMOD(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000700130000, value=Op.SMOD(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000700130001, value=Op.SMOD(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000700140000, value=Op.SMOD(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000700140001, value=Op.SMOD(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000700150000, value=Op.SMOD(Op.ISZERO(0x2), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000700150001, value=Op.SMOD(Op.ISZERO(0x2), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000700160000, value=Op.SMOD(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000700160001, value=Op.SMOD(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000700170000, value=Op.SMOD(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000700170001, value=Op.SMOD(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000700180000, value=Op.SMOD(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000700180001, value=Op.SMOD(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11000700190000, value=Op.SMOD(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11000700190001, value=Op.SMOD(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x110007001A0000,
-                value=Op.SMOD(Op.BYTE(0x2, 0x1), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x110007001A0001,
-                value=Op.SMOD(Op.BYTE(0x2, 0x1), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x110007001B0000, value=Op.SMOD(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110007001B0001, value=Op.SMOD(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110007001C0000, value=Op.SMOD(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110007001C0001, value=Op.SMOD(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110007001D0000, value=Op.SMOD(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110007001D0001, value=Op.SMOD(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000800010000,
-                value=Op.ADDMOD(Op.ADD(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800010001,
-                value=Op.ADDMOD(Op.ADD(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800020000,
-                value=Op.ADDMOD(Op.MUL(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800020001,
-                value=Op.ADDMOD(Op.MUL(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800030000,
-                value=Op.ADDMOD(Op.SUB(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800030001,
-                value=Op.ADDMOD(Op.SUB(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800040000,
-                value=Op.ADDMOD(Op.DIV(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800040001,
-                value=Op.ADDMOD(Op.DIV(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800050000,
-                value=Op.ADDMOD(Op.SDIV(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800050001,
-                value=Op.ADDMOD(Op.SDIV(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800060000,
-                value=Op.ADDMOD(Op.MOD(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800060001,
-                value=Op.ADDMOD(Op.MOD(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800070000,
-                value=Op.ADDMOD(Op.SMOD(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800070001,
-                value=Op.ADDMOD(Op.SMOD(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800080000,
-                value=Op.ADDMOD(Op.ADDMOD(0x2, 0x1, 0x3), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800080001,
-                value=Op.ADDMOD(Op.ADDMOD(0x2, 0x1, 0x3), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800090000,
-                value=Op.ADDMOD(Op.MULMOD(0x2, 0x1, 0x3), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800090001,
-                value=Op.ADDMOD(Op.MULMOD(0x2, 0x1, 0x3), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110008000A0000,
-                value=Op.ADDMOD(Op.EXP(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110008000A0001,
-                value=Op.ADDMOD(Op.EXP(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800100000,
-                value=Op.ADDMOD(Op.LT(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800100001,
-                value=Op.ADDMOD(Op.LT(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800110000,
-                value=Op.ADDMOD(Op.GT(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800110001,
-                value=Op.ADDMOD(Op.GT(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800120000,
-                value=Op.ADDMOD(Op.SLT(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800120001,
-                value=Op.ADDMOD(Op.SLT(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800130000,
-                value=Op.ADDMOD(Op.SGT(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800130001,
-                value=Op.ADDMOD(Op.SGT(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800140000,
-                value=Op.ADDMOD(Op.EQ(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800140001,
-                value=Op.ADDMOD(Op.EQ(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800150000,
-                value=Op.ADDMOD(Op.ISZERO(0x2), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800150001,
-                value=Op.ADDMOD(Op.ISZERO(0x2), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800160000,
-                value=Op.ADDMOD(Op.AND(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800160001,
-                value=Op.ADDMOD(Op.AND(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800170000,
-                value=Op.ADDMOD(Op.OR(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800170001,
-                value=Op.ADDMOD(Op.OR(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800180000,
-                value=Op.ADDMOD(Op.XOR(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800180001,
-                value=Op.ADDMOD(Op.XOR(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800190000,
-                value=Op.ADDMOD(Op.NOT(0x2), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000800190001,
-                value=Op.ADDMOD(Op.NOT(0x2), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110008001A0000,
-                value=Op.ADDMOD(Op.BYTE(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110008001A0001,
-                value=Op.ADDMOD(Op.BYTE(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110008001B0000,
-                value=Op.ADDMOD(Op.SHL(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110008001B0001,
-                value=Op.ADDMOD(Op.SHL(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110008001C0000,
-                value=Op.ADDMOD(Op.SHR(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110008001C0001,
-                value=Op.ADDMOD(Op.SHR(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110008001D0000,
-                value=Op.ADDMOD(Op.SAR(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110008001D0001,
-                value=Op.ADDMOD(Op.SAR(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900010000,
-                value=Op.MULMOD(Op.ADD(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900010001,
-                value=Op.MULMOD(Op.ADD(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900020000,
-                value=Op.MULMOD(Op.MUL(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900020001,
-                value=Op.MULMOD(Op.MUL(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900030000,
-                value=Op.MULMOD(Op.SUB(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900030001,
-                value=Op.MULMOD(Op.SUB(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900040000,
-                value=Op.MULMOD(Op.DIV(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900040001,
-                value=Op.MULMOD(Op.DIV(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900050000,
-                value=Op.MULMOD(Op.SDIV(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900050001,
-                value=Op.MULMOD(Op.SDIV(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900060000,
-                value=Op.MULMOD(Op.MOD(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900060001,
-                value=Op.MULMOD(Op.MOD(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900070000,
-                value=Op.MULMOD(Op.SMOD(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900070001,
-                value=Op.MULMOD(Op.SMOD(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900080000,
-                value=Op.MULMOD(Op.ADDMOD(0x2, 0x1, 0x3), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900080001,
-                value=Op.MULMOD(Op.ADDMOD(0x2, 0x1, 0x3), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900090000,
-                value=Op.MULMOD(Op.MULMOD(0x2, 0x1, 0x3), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900090001,
-                value=Op.MULMOD(Op.MULMOD(0x2, 0x1, 0x3), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110009000A0000,
-                value=Op.MULMOD(Op.EXP(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110009000A0001,
-                value=Op.MULMOD(Op.EXP(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900100000,
-                value=Op.MULMOD(Op.LT(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900100001,
-                value=Op.MULMOD(Op.LT(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900110000,
-                value=Op.MULMOD(Op.GT(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900110001,
-                value=Op.MULMOD(Op.GT(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900120000,
-                value=Op.MULMOD(Op.SLT(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900120001,
-                value=Op.MULMOD(Op.SLT(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900130000,
-                value=Op.MULMOD(Op.SGT(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900130001,
-                value=Op.MULMOD(Op.SGT(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900140000,
-                value=Op.MULMOD(Op.EQ(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900140001,
-                value=Op.MULMOD(Op.EQ(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900150000,
-                value=Op.MULMOD(Op.ISZERO(0x2), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900150001,
-                value=Op.MULMOD(Op.ISZERO(0x2), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900160000,
-                value=Op.MULMOD(Op.AND(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900160001,
-                value=Op.MULMOD(Op.AND(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900170000,
-                value=Op.MULMOD(Op.OR(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900170001,
-                value=Op.MULMOD(Op.OR(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900180000,
-                value=Op.MULMOD(Op.XOR(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900180001,
-                value=Op.MULMOD(Op.XOR(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900190000,
-                value=Op.MULMOD(Op.NOT(0x2), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000900190001,
-                value=Op.MULMOD(Op.NOT(0x2), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110009001A0000,
-                value=Op.MULMOD(Op.BYTE(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110009001A0001,
-                value=Op.MULMOD(Op.BYTE(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110009001B0000,
-                value=Op.MULMOD(Op.SHL(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110009001B0001,
-                value=Op.MULMOD(Op.SHL(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110009001C0000,
-                value=Op.MULMOD(Op.SHR(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110009001C0001,
-                value=Op.MULMOD(Op.SHR(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110009001D0000,
-                value=Op.MULMOD(Op.SAR(0x2, 0x1), 0x3, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x110009001D0001,
-                value=Op.MULMOD(Op.SAR(0x2, 0x1), 0x1, 0x2),
-            )
-            + Op.SSTORE(
-                key=0x11000A00010000, value=Op.EXP(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A00010001, value=Op.EXP(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A00020000, value=Op.EXP(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A00020001, value=Op.EXP(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A00030000, value=Op.EXP(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A00030001, value=Op.EXP(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A00040000, value=Op.EXP(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A00040001, value=Op.EXP(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A00050000, value=Op.EXP(Op.SDIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A00050001, value=Op.EXP(Op.SDIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A00060000, value=Op.EXP(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A00060001, value=Op.EXP(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A00070000, value=Op.EXP(Op.SMOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A00070001, value=Op.EXP(Op.SMOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A00080000,
-                value=Op.EXP(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000A00080001,
-                value=Op.EXP(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11000A00090000,
-                value=Op.EXP(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11000A00090001,
-                value=Op.EXP(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11000A000A0000, value=Op.EXP(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A000A0001, value=Op.EXP(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A00100000, value=Op.EXP(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A00100001, value=Op.EXP(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A00110000, value=Op.EXP(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A00110001, value=Op.EXP(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A00120000, value=Op.EXP(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A00120001, value=Op.EXP(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A00130000, value=Op.EXP(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A00130001, value=Op.EXP(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A00140000, value=Op.EXP(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A00140001, value=Op.EXP(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A00150000, value=Op.EXP(Op.ISZERO(0x2), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A00150001, value=Op.EXP(Op.ISZERO(0x2), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A00160000, value=Op.EXP(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A00160001, value=Op.EXP(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A00170000, value=Op.EXP(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A00170001, value=Op.EXP(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A00180000, value=Op.EXP(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A00180001, value=Op.EXP(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11000A00190000, value=Op.EXP(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11000A00190001, value=Op.EXP(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x11000A001A0000, value=Op.EXP(Op.BYTE(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A001A0001, value=Op.EXP(Op.BYTE(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A001B0000, value=Op.EXP(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A001B0001, value=Op.EXP(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A001C0000, value=Op.EXP(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A001C0001, value=Op.EXP(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11000A001D0000, value=Op.EXP(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11000A001D0001, value=Op.EXP(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001000010000, value=Op.LT(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001000010001, value=Op.LT(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001000020000, value=Op.LT(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001000020001, value=Op.LT(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001000030000, value=Op.LT(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001000030001, value=Op.LT(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001000040000, value=Op.LT(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001000040001, value=Op.LT(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001000050000, value=Op.LT(Op.SDIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001000050001, value=Op.LT(Op.SDIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001000060000, value=Op.LT(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001000060001, value=Op.LT(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001000070000, value=Op.LT(Op.SMOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001000070001, value=Op.LT(Op.SMOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001000080000,
-                value=Op.LT(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001000080001,
-                value=Op.LT(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001000090000,
-                value=Op.LT(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001000090001,
-                value=Op.LT(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x110010000A0000, value=Op.LT(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110010000A0001, value=Op.LT(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001000100000, value=Op.LT(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001000100001, value=Op.LT(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001000110000, value=Op.LT(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001000110001, value=Op.LT(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001000120000, value=Op.LT(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001000120001, value=Op.LT(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001000130000, value=Op.LT(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001000130001, value=Op.LT(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001000140000, value=Op.LT(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001000140001, value=Op.LT(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11001000150000, value=Op.LT(Op.ISZERO(0x2), 0x3))
-            + Op.SSTORE(key=0x11001000150001, value=Op.LT(Op.ISZERO(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x11001000160000, value=Op.LT(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001000160001, value=Op.LT(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001000170000, value=Op.LT(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001000170001, value=Op.LT(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001000180000, value=Op.LT(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001000180001, value=Op.LT(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11001000190000, value=Op.LT(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11001000190001, value=Op.LT(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x110010001A0000, value=Op.LT(Op.BYTE(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110010001A0001, value=Op.LT(Op.BYTE(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110010001B0000, value=Op.LT(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110010001B0001, value=Op.LT(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110010001C0000, value=Op.LT(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110010001C0001, value=Op.LT(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110010001D0000, value=Op.LT(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110010001D0001, value=Op.LT(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001100010000, value=Op.GT(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001100010001, value=Op.GT(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001100020000, value=Op.GT(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001100020001, value=Op.GT(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001100030000, value=Op.GT(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001100030001, value=Op.GT(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001100040000, value=Op.GT(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001100040001, value=Op.GT(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001100050000, value=Op.GT(Op.SDIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001100050001, value=Op.GT(Op.SDIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001100060000, value=Op.GT(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001100060001, value=Op.GT(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001100070000, value=Op.GT(Op.SMOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001100070001, value=Op.GT(Op.SMOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001100080000,
-                value=Op.GT(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001100080001,
-                value=Op.GT(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001100090000,
-                value=Op.GT(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001100090001,
-                value=Op.GT(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x110011000A0000, value=Op.GT(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110011000A0001, value=Op.GT(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001100100000, value=Op.GT(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001100100001, value=Op.GT(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001100110000, value=Op.GT(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001100110001, value=Op.GT(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001100120000, value=Op.GT(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001100120001, value=Op.GT(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001100130000, value=Op.GT(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001100130001, value=Op.GT(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001100140000, value=Op.GT(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001100140001, value=Op.GT(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11001100150000, value=Op.GT(Op.ISZERO(0x2), 0x3))
-            + Op.SSTORE(key=0x11001100150001, value=Op.GT(Op.ISZERO(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x11001100160000, value=Op.GT(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001100160001, value=Op.GT(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001100170000, value=Op.GT(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001100170001, value=Op.GT(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001100180000, value=Op.GT(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001100180001, value=Op.GT(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11001100190000, value=Op.GT(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11001100190001, value=Op.GT(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x110011001A0000, value=Op.GT(Op.BYTE(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110011001A0001, value=Op.GT(Op.BYTE(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110011001B0000, value=Op.GT(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110011001B0001, value=Op.GT(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110011001C0000, value=Op.GT(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110011001C0001, value=Op.GT(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110011001D0000, value=Op.GT(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110011001D0001, value=Op.GT(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001200010000, value=Op.SLT(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001200010001, value=Op.SLT(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001200020000, value=Op.SLT(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001200020001, value=Op.SLT(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001200030000, value=Op.SLT(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001200030001, value=Op.SLT(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001200040000, value=Op.SLT(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001200040001, value=Op.SLT(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001200050000, value=Op.SLT(Op.SDIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001200050001, value=Op.SLT(Op.SDIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001200060000, value=Op.SLT(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001200060001, value=Op.SLT(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001200070000, value=Op.SLT(Op.SMOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001200070001, value=Op.SLT(Op.SMOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001200080000,
-                value=Op.SLT(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001200080001,
-                value=Op.SLT(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001200090000,
-                value=Op.SLT(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001200090001,
-                value=Op.SLT(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x110012000A0000, value=Op.SLT(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110012000A0001, value=Op.SLT(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001200100000, value=Op.SLT(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001200100001, value=Op.SLT(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001200110000, value=Op.SLT(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001200110001, value=Op.SLT(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001200120000, value=Op.SLT(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001200120001, value=Op.SLT(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001200130000, value=Op.SLT(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001200130001, value=Op.SLT(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001200140000, value=Op.SLT(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001200140001, value=Op.SLT(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001200150000, value=Op.SLT(Op.ISZERO(0x2), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001200150001, value=Op.SLT(Op.ISZERO(0x2), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001200160000, value=Op.SLT(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001200160001, value=Op.SLT(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001200170000, value=Op.SLT(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001200170001, value=Op.SLT(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001200180000, value=Op.SLT(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001200180001, value=Op.SLT(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11001200190000, value=Op.SLT(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11001200190001, value=Op.SLT(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x110012001A0000, value=Op.SLT(Op.BYTE(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110012001A0001, value=Op.SLT(Op.BYTE(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110012001B0000, value=Op.SLT(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110012001B0001, value=Op.SLT(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110012001C0000, value=Op.SLT(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110012001C0001, value=Op.SLT(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110012001D0000, value=Op.SLT(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110012001D0001, value=Op.SLT(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001300010000, value=Op.SGT(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001300010001, value=Op.SGT(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001300020000, value=Op.SGT(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001300020001, value=Op.SGT(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001300030000, value=Op.SGT(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001300030001, value=Op.SGT(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001300040000, value=Op.SGT(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001300040001, value=Op.SGT(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001300050000, value=Op.SGT(Op.SDIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001300050001, value=Op.SGT(Op.SDIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001300060000, value=Op.SGT(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001300060001, value=Op.SGT(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001300070000, value=Op.SGT(Op.SMOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001300070001, value=Op.SGT(Op.SMOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001300080000,
-                value=Op.SGT(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001300080001,
-                value=Op.SGT(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001300090000,
-                value=Op.SGT(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001300090001,
-                value=Op.SGT(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x110013000A0000, value=Op.SGT(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110013000A0001, value=Op.SGT(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001300100000, value=Op.SGT(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001300100001, value=Op.SGT(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001300110000, value=Op.SGT(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001300110001, value=Op.SGT(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001300120000, value=Op.SGT(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001300120001, value=Op.SGT(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001300130000, value=Op.SGT(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001300130001, value=Op.SGT(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001300140000, value=Op.SGT(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001300140001, value=Op.SGT(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001300150000, value=Op.SGT(Op.ISZERO(0x2), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001300150001, value=Op.SGT(Op.ISZERO(0x2), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001300160000, value=Op.SGT(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001300160001, value=Op.SGT(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001300170000, value=Op.SGT(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001300170001, value=Op.SGT(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001300180000, value=Op.SGT(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001300180001, value=Op.SGT(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11001300190000, value=Op.SGT(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11001300190001, value=Op.SGT(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x110013001A0000, value=Op.SGT(Op.BYTE(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110013001A0001, value=Op.SGT(Op.BYTE(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110013001B0000, value=Op.SGT(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110013001B0001, value=Op.SGT(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110013001C0000, value=Op.SGT(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110013001C0001, value=Op.SGT(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110013001D0000, value=Op.SGT(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110013001D0001, value=Op.SGT(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001400010000, value=Op.EQ(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001400010001, value=Op.EQ(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001400020000, value=Op.EQ(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001400020001, value=Op.EQ(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001400030000, value=Op.EQ(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001400030001, value=Op.EQ(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001400040000, value=Op.EQ(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001400040001, value=Op.EQ(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001400050000, value=Op.EQ(Op.SDIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001400050001, value=Op.EQ(Op.SDIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001400060000, value=Op.EQ(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001400060001, value=Op.EQ(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001400070000, value=Op.EQ(Op.SMOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001400070001, value=Op.EQ(Op.SMOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001400080000,
-                value=Op.EQ(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001400080001,
-                value=Op.EQ(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001400090000,
-                value=Op.EQ(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001400090001,
-                value=Op.EQ(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x110014000A0000, value=Op.EQ(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110014000A0001, value=Op.EQ(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001400100000, value=Op.EQ(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001400100001, value=Op.EQ(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001400110000, value=Op.EQ(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001400110001, value=Op.EQ(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001400120000, value=Op.EQ(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001400120001, value=Op.EQ(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001400130000, value=Op.EQ(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001400130001, value=Op.EQ(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001400140000, value=Op.EQ(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001400140001, value=Op.EQ(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11001400150000, value=Op.EQ(Op.ISZERO(0x2), 0x3))
-            + Op.SSTORE(key=0x11001400150001, value=Op.EQ(Op.ISZERO(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x11001400160000, value=Op.EQ(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001400160001, value=Op.EQ(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001400170000, value=Op.EQ(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001400170001, value=Op.EQ(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001400180000, value=Op.EQ(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001400180001, value=Op.EQ(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11001400190000, value=Op.EQ(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11001400190001, value=Op.EQ(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x110014001A0000, value=Op.EQ(Op.BYTE(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110014001A0001, value=Op.EQ(Op.BYTE(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110014001B0000, value=Op.EQ(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110014001B0001, value=Op.EQ(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110014001C0000, value=Op.EQ(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110014001C0001, value=Op.EQ(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110014001D0000, value=Op.EQ(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110014001D0001, value=Op.EQ(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001500010000, value=Op.ISZERO(Op.ADD(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500010001, value=Op.ISZERO(Op.ADD(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500020000, value=Op.ISZERO(Op.MUL(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500020001, value=Op.ISZERO(Op.MUL(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500030000, value=Op.ISZERO(Op.SUB(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500030001, value=Op.ISZERO(Op.SUB(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500040000, value=Op.ISZERO(Op.DIV(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500040001, value=Op.ISZERO(Op.DIV(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500050000, value=Op.ISZERO(Op.SDIV(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500050001, value=Op.ISZERO(Op.SDIV(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500060000, value=Op.ISZERO(Op.MOD(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500060001, value=Op.ISZERO(Op.MOD(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500070000, value=Op.ISZERO(Op.SMOD(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500070001, value=Op.ISZERO(Op.SMOD(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500080000,
-                value=Op.ISZERO(Op.ADDMOD(0x2, 0x1, 0x3)),
-            )
-            + Op.SSTORE(
-                key=0x11001500080001,
-                value=Op.ISZERO(Op.ADDMOD(0x2, 0x1, 0x3)),
-            )
-            + Op.SSTORE(
-                key=0x11001500090000,
-                value=Op.ISZERO(Op.MULMOD(0x2, 0x1, 0x3)),
-            )
-            + Op.SSTORE(
-                key=0x11001500090001,
-                value=Op.ISZERO(Op.MULMOD(0x2, 0x1, 0x3)),
-            )
-            + Op.SSTORE(
-                key=0x110015000A0000, value=Op.ISZERO(Op.EXP(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x110015000A0001, value=Op.ISZERO(Op.EXP(0x2, 0x1))
-            )
-            + Op.SSTORE(key=0x11001500100000, value=Op.ISZERO(Op.LT(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001500100001, value=Op.ISZERO(Op.LT(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001500110000, value=Op.ISZERO(Op.GT(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001500110001, value=Op.ISZERO(Op.GT(0x2, 0x1)))
-            + Op.SSTORE(
-                key=0x11001500120000, value=Op.ISZERO(Op.SLT(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500120001, value=Op.ISZERO(Op.SLT(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500130000, value=Op.ISZERO(Op.SGT(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500130001, value=Op.ISZERO(Op.SGT(0x2, 0x1))
-            )
-            + Op.SSTORE(key=0x11001500140000, value=Op.ISZERO(Op.EQ(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001500140001, value=Op.ISZERO(Op.EQ(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001500150000, value=Op.ISZERO(Op.ISZERO(0x2)))
-            + Op.SSTORE(key=0x11001500150001, value=Op.ISZERO(Op.ISZERO(0x2)))
-            + Op.SSTORE(
-                key=0x11001500160000, value=Op.ISZERO(Op.AND(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500160001, value=Op.ISZERO(Op.AND(0x2, 0x1))
-            )
-            + Op.SSTORE(key=0x11001500170000, value=Op.ISZERO(Op.OR(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001500170001, value=Op.ISZERO(Op.OR(0x2, 0x1)))
-            + Op.SSTORE(
-                key=0x11001500180000, value=Op.ISZERO(Op.XOR(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001500180001, value=Op.ISZERO(Op.XOR(0x2, 0x1))
-            )
-            + Op.SSTORE(key=0x11001500190000, value=Op.ISZERO(Op.NOT(0x2)))
-            + Op.SSTORE(key=0x11001500190001, value=Op.ISZERO(Op.NOT(0x2)))
-            + Op.SSTORE(
-                key=0x110015001A0000, value=Op.ISZERO(Op.BYTE(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x110015001A0001, value=Op.ISZERO(Op.BYTE(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x110015001B0000, value=Op.ISZERO(Op.SHL(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x110015001B0001, value=Op.ISZERO(Op.SHL(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x110015001C0000, value=Op.ISZERO(Op.SHR(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x110015001C0001, value=Op.ISZERO(Op.SHR(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x110015001D0000, value=Op.ISZERO(Op.SAR(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x110015001D0001, value=Op.ISZERO(Op.SAR(0x2, 0x1))
-            )
-            + Op.SSTORE(
-                key=0x11001600010000, value=Op.AND(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001600010001, value=Op.AND(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001600020000, value=Op.AND(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001600020001, value=Op.AND(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001600030000, value=Op.AND(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001600030001, value=Op.AND(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001600040000, value=Op.AND(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001600040001, value=Op.AND(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001600050000, value=Op.AND(Op.SDIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001600050001, value=Op.AND(Op.SDIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001600060000, value=Op.AND(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001600060001, value=Op.AND(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001600070000, value=Op.AND(Op.SMOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001600070001, value=Op.AND(Op.SMOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001600080000,
-                value=Op.AND(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001600080001,
-                value=Op.AND(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001600090000,
-                value=Op.AND(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001600090001,
-                value=Op.AND(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x110016000A0000, value=Op.AND(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110016000A0001, value=Op.AND(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001600100000, value=Op.AND(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001600100001, value=Op.AND(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001600110000, value=Op.AND(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001600110001, value=Op.AND(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001600120000, value=Op.AND(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001600120001, value=Op.AND(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001600130000, value=Op.AND(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001600130001, value=Op.AND(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001600140000, value=Op.AND(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001600140001, value=Op.AND(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001600150000, value=Op.AND(Op.ISZERO(0x2), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001600150001, value=Op.AND(Op.ISZERO(0x2), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001600160000, value=Op.AND(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001600160001, value=Op.AND(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001600170000, value=Op.AND(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001600170001, value=Op.AND(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001600180000, value=Op.AND(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001600180001, value=Op.AND(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11001600190000, value=Op.AND(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11001600190001, value=Op.AND(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x110016001A0000, value=Op.AND(Op.BYTE(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110016001A0001, value=Op.AND(Op.BYTE(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110016001B0000, value=Op.AND(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110016001B0001, value=Op.AND(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110016001C0000, value=Op.AND(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110016001C0001, value=Op.AND(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110016001D0000, value=Op.AND(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110016001D0001, value=Op.AND(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001700010000, value=Op.OR(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001700010001, value=Op.OR(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001700020000, value=Op.OR(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001700020001, value=Op.OR(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001700030000, value=Op.OR(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001700030001, value=Op.OR(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001700040000, value=Op.OR(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001700040001, value=Op.OR(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001700050000, value=Op.OR(Op.SDIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001700050001, value=Op.OR(Op.SDIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001700060000, value=Op.OR(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001700060001, value=Op.OR(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001700070000, value=Op.OR(Op.SMOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001700070001, value=Op.OR(Op.SMOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001700080000,
-                value=Op.OR(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001700080001,
-                value=Op.OR(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001700090000,
-                value=Op.OR(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001700090001,
-                value=Op.OR(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x110017000A0000, value=Op.OR(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110017000A0001, value=Op.OR(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001700100000, value=Op.OR(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001700100001, value=Op.OR(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001700110000, value=Op.OR(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001700110001, value=Op.OR(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001700120000, value=Op.OR(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001700120001, value=Op.OR(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001700130000, value=Op.OR(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001700130001, value=Op.OR(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001700140000, value=Op.OR(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001700140001, value=Op.OR(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11001700150000, value=Op.OR(Op.ISZERO(0x2), 0x3))
-            + Op.SSTORE(key=0x11001700150001, value=Op.OR(Op.ISZERO(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x11001700160000, value=Op.OR(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001700160001, value=Op.OR(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001700170000, value=Op.OR(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001700170001, value=Op.OR(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001700180000, value=Op.OR(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001700180001, value=Op.OR(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11001700190000, value=Op.OR(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11001700190001, value=Op.OR(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x110017001A0000, value=Op.OR(Op.BYTE(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110017001A0001, value=Op.OR(Op.BYTE(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110017001B0000, value=Op.OR(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110017001B0001, value=Op.OR(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110017001C0000, value=Op.OR(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110017001C0001, value=Op.OR(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110017001D0000, value=Op.OR(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110017001D0001, value=Op.OR(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001800010000, value=Op.XOR(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001800010001, value=Op.XOR(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001800020000, value=Op.XOR(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001800020001, value=Op.XOR(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001800030000, value=Op.XOR(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001800030001, value=Op.XOR(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001800040000, value=Op.XOR(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001800040001, value=Op.XOR(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001800050000, value=Op.XOR(Op.SDIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001800050001, value=Op.XOR(Op.SDIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001800060000, value=Op.XOR(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001800060001, value=Op.XOR(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001800070000, value=Op.XOR(Op.SMOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001800070001, value=Op.XOR(Op.SMOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001800080000,
-                value=Op.XOR(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001800080001,
-                value=Op.XOR(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001800090000,
-                value=Op.XOR(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001800090001,
-                value=Op.XOR(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x110018000A0000, value=Op.XOR(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110018000A0001, value=Op.XOR(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001800100000, value=Op.XOR(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001800100001, value=Op.XOR(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001800110000, value=Op.XOR(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001800110001, value=Op.XOR(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001800120000, value=Op.XOR(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001800120001, value=Op.XOR(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001800130000, value=Op.XOR(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001800130001, value=Op.XOR(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001800140000, value=Op.XOR(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001800140001, value=Op.XOR(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001800150000, value=Op.XOR(Op.ISZERO(0x2), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001800150001, value=Op.XOR(Op.ISZERO(0x2), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001800160000, value=Op.XOR(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001800160001, value=Op.XOR(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001800170000, value=Op.XOR(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001800170001, value=Op.XOR(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001800180000, value=Op.XOR(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001800180001, value=Op.XOR(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11001800190000, value=Op.XOR(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11001800190001, value=Op.XOR(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x110018001A0000, value=Op.XOR(Op.BYTE(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110018001A0001, value=Op.XOR(Op.BYTE(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110018001B0000, value=Op.XOR(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110018001B0001, value=Op.XOR(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110018001C0000, value=Op.XOR(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110018001C0001, value=Op.XOR(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x110018001D0000, value=Op.XOR(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x110018001D0001, value=Op.XOR(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11001900010000, value=Op.NOT(Op.ADD(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900010001, value=Op.NOT(Op.ADD(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900020000, value=Op.NOT(Op.MUL(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900020001, value=Op.NOT(Op.MUL(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900030000, value=Op.NOT(Op.SUB(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900030001, value=Op.NOT(Op.SUB(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900040000, value=Op.NOT(Op.DIV(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900040001, value=Op.NOT(Op.DIV(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900050000, value=Op.NOT(Op.SDIV(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900050001, value=Op.NOT(Op.SDIV(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900060000, value=Op.NOT(Op.MOD(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900060001, value=Op.NOT(Op.MOD(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900070000, value=Op.NOT(Op.SMOD(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900070001, value=Op.NOT(Op.SMOD(0x2, 0x1)))
-            + Op.SSTORE(
-                key=0x11001900080000,
-                value=Op.NOT(Op.ADDMOD(0x2, 0x1, 0x3)),
-            )
-            + Op.SSTORE(
-                key=0x11001900080001,
-                value=Op.NOT(Op.ADDMOD(0x2, 0x1, 0x3)),
-            )
-            + Op.SSTORE(
-                key=0x11001900090000,
-                value=Op.NOT(Op.MULMOD(0x2, 0x1, 0x3)),
-            )
-            + Op.SSTORE(
-                key=0x11001900090001,
-                value=Op.NOT(Op.MULMOD(0x2, 0x1, 0x3)),
-            )
-            + Op.SSTORE(key=0x110019000A0000, value=Op.NOT(Op.EXP(0x2, 0x1)))
-            + Op.SSTORE(key=0x110019000A0001, value=Op.NOT(Op.EXP(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900100000, value=Op.NOT(Op.LT(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900100001, value=Op.NOT(Op.LT(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900110000, value=Op.NOT(Op.GT(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900110001, value=Op.NOT(Op.GT(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900120000, value=Op.NOT(Op.SLT(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900120001, value=Op.NOT(Op.SLT(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900130000, value=Op.NOT(Op.SGT(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900130001, value=Op.NOT(Op.SGT(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900140000, value=Op.NOT(Op.EQ(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900140001, value=Op.NOT(Op.EQ(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900150000, value=Op.NOT(Op.ISZERO(0x2)))
-            + Op.SSTORE(key=0x11001900150001, value=Op.NOT(Op.ISZERO(0x2)))
-            + Op.SSTORE(key=0x11001900160000, value=Op.NOT(Op.AND(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900160001, value=Op.NOT(Op.AND(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900170000, value=Op.NOT(Op.OR(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900170001, value=Op.NOT(Op.OR(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900180000, value=Op.NOT(Op.XOR(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900180001, value=Op.NOT(Op.XOR(0x2, 0x1)))
-            + Op.SSTORE(key=0x11001900190000, value=Op.NOT(Op.NOT(0x2)))
-            + Op.SSTORE(key=0x11001900190001, value=Op.NOT(Op.NOT(0x2)))
-            + Op.SSTORE(key=0x110019001A0000, value=Op.NOT(Op.BYTE(0x2, 0x1)))
-            + Op.SSTORE(key=0x110019001A0001, value=Op.NOT(Op.BYTE(0x2, 0x1)))
-            + Op.SSTORE(key=0x110019001B0000, value=Op.NOT(Op.SHL(0x2, 0x1)))
-            + Op.SSTORE(key=0x110019001B0001, value=Op.NOT(Op.SHL(0x2, 0x1)))
-            + Op.SSTORE(key=0x110019001C0000, value=Op.NOT(Op.SHR(0x2, 0x1)))
-            + Op.SSTORE(key=0x110019001C0001, value=Op.NOT(Op.SHR(0x2, 0x1)))
-            + Op.SSTORE(key=0x110019001D0000, value=Op.NOT(Op.SAR(0x2, 0x1)))
-            + Op.SSTORE(key=0x110019001D0001, value=Op.NOT(Op.SAR(0x2, 0x1)))
-            + Op.SSTORE(
-                key=0x11001A00010000, value=Op.BYTE(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A00010001, value=Op.BYTE(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001A00020000, value=Op.BYTE(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A00020001, value=Op.BYTE(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001A00030000, value=Op.BYTE(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A00030001, value=Op.BYTE(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001A00040000, value=Op.BYTE(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A00040001, value=Op.BYTE(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001A00050000,
-                value=Op.BYTE(Op.SDIV(0x2, 0x1), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001A00050001,
-                value=Op.BYTE(Op.SDIV(0x2, 0x1), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001A00060000, value=Op.BYTE(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A00060001, value=Op.BYTE(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001A00070000,
-                value=Op.BYTE(Op.SMOD(0x2, 0x1), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001A00070001,
-                value=Op.BYTE(Op.SMOD(0x2, 0x1), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001A00080000,
-                value=Op.BYTE(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001A00080001,
-                value=Op.BYTE(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001A00090000,
-                value=Op.BYTE(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001A00090001,
-                value=Op.BYTE(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001A000A0000, value=Op.BYTE(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A000A0001, value=Op.BYTE(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001A00100000, value=Op.BYTE(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A00100001, value=Op.BYTE(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001A00110000, value=Op.BYTE(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A00110001, value=Op.BYTE(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001A00120000, value=Op.BYTE(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A00120001, value=Op.BYTE(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001A00130000, value=Op.BYTE(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A00130001, value=Op.BYTE(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001A00140000, value=Op.BYTE(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A00140001, value=Op.BYTE(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001A00150000, value=Op.BYTE(Op.ISZERO(0x2), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A00150001, value=Op.BYTE(Op.ISZERO(0x2), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001A00160000, value=Op.BYTE(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A00160001, value=Op.BYTE(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001A00170000, value=Op.BYTE(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A00170001, value=Op.BYTE(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001A00180000, value=Op.BYTE(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A00180001, value=Op.BYTE(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11001A00190000, value=Op.BYTE(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11001A00190001, value=Op.BYTE(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x11001A001A0000,
-                value=Op.BYTE(Op.BYTE(0x2, 0x1), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001A001A0001,
-                value=Op.BYTE(Op.BYTE(0x2, 0x1), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001A001B0000, value=Op.BYTE(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A001B0001, value=Op.BYTE(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001A001C0000, value=Op.BYTE(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A001C0001, value=Op.BYTE(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001A001D0000, value=Op.BYTE(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001A001D0001, value=Op.BYTE(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B00010000, value=Op.SHL(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B00010001, value=Op.SHL(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B00020000, value=Op.SHL(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B00020001, value=Op.SHL(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B00030000, value=Op.SHL(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B00030001, value=Op.SHL(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B00040000, value=Op.SHL(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B00040001, value=Op.SHL(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B00050000, value=Op.SHL(Op.SDIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B00050001, value=Op.SHL(Op.SDIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B00060000, value=Op.SHL(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B00060001, value=Op.SHL(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B00070000, value=Op.SHL(Op.SMOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B00070001, value=Op.SHL(Op.SMOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B00080000,
-                value=Op.SHL(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001B00080001,
-                value=Op.SHL(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001B00090000,
-                value=Op.SHL(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001B00090001,
-                value=Op.SHL(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001B000A0000, value=Op.SHL(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B000A0001, value=Op.SHL(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B00100000, value=Op.SHL(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B00100001, value=Op.SHL(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B00110000, value=Op.SHL(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B00110001, value=Op.SHL(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B00120000, value=Op.SHL(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B00120001, value=Op.SHL(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B00130000, value=Op.SHL(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B00130001, value=Op.SHL(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B00140000, value=Op.SHL(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B00140001, value=Op.SHL(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B00150000, value=Op.SHL(Op.ISZERO(0x2), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B00150001, value=Op.SHL(Op.ISZERO(0x2), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B00160000, value=Op.SHL(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B00160001, value=Op.SHL(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B00170000, value=Op.SHL(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B00170001, value=Op.SHL(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B00180000, value=Op.SHL(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B00180001, value=Op.SHL(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11001B00190000, value=Op.SHL(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11001B00190001, value=Op.SHL(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x11001B001A0000, value=Op.SHL(Op.BYTE(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B001A0001, value=Op.SHL(Op.BYTE(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B001B0000, value=Op.SHL(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B001B0001, value=Op.SHL(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B001C0000, value=Op.SHL(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B001C0001, value=Op.SHL(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001B001D0000, value=Op.SHL(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001B001D0001, value=Op.SHL(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C00010000, value=Op.SHR(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C00010001, value=Op.SHR(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C00020000, value=Op.SHR(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C00020001, value=Op.SHR(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C00030000, value=Op.SHR(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C00030001, value=Op.SHR(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C00040000, value=Op.SHR(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C00040001, value=Op.SHR(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C00050000, value=Op.SHR(Op.SDIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C00050001, value=Op.SHR(Op.SDIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C00060000, value=Op.SHR(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C00060001, value=Op.SHR(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C00070000, value=Op.SHR(Op.SMOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C00070001, value=Op.SHR(Op.SMOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C00080000,
-                value=Op.SHR(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001C00080001,
-                value=Op.SHR(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001C00090000,
-                value=Op.SHR(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001C00090001,
-                value=Op.SHR(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001C000A0000, value=Op.SHR(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C000A0001, value=Op.SHR(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C00100000, value=Op.SHR(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C00100001, value=Op.SHR(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C00110000, value=Op.SHR(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C00110001, value=Op.SHR(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C00120000, value=Op.SHR(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C00120001, value=Op.SHR(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C00130000, value=Op.SHR(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C00130001, value=Op.SHR(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C00140000, value=Op.SHR(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C00140001, value=Op.SHR(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C00150000, value=Op.SHR(Op.ISZERO(0x2), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C00150001, value=Op.SHR(Op.ISZERO(0x2), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C00160000, value=Op.SHR(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C00160001, value=Op.SHR(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C00170000, value=Op.SHR(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C00170001, value=Op.SHR(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C00180000, value=Op.SHR(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C00180001, value=Op.SHR(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11001C00190000, value=Op.SHR(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11001C00190001, value=Op.SHR(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x11001C001A0000, value=Op.SHR(Op.BYTE(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C001A0001, value=Op.SHR(Op.BYTE(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C001B0000, value=Op.SHR(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C001B0001, value=Op.SHR(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C001C0000, value=Op.SHR(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C001C0001, value=Op.SHR(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001C001D0000, value=Op.SHR(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001C001D0001, value=Op.SHR(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D00010000, value=Op.SAR(Op.ADD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D00010001, value=Op.SAR(Op.ADD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D00020000, value=Op.SAR(Op.MUL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D00020001, value=Op.SAR(Op.MUL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D00030000, value=Op.SAR(Op.SUB(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D00030001, value=Op.SAR(Op.SUB(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D00040000, value=Op.SAR(Op.DIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D00040001, value=Op.SAR(Op.DIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D00050000, value=Op.SAR(Op.SDIV(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D00050001, value=Op.SAR(Op.SDIV(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D00060000, value=Op.SAR(Op.MOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D00060001, value=Op.SAR(Op.MOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D00070000, value=Op.SAR(Op.SMOD(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D00070001, value=Op.SAR(Op.SMOD(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D00080000,
-                value=Op.SAR(Op.ADDMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001D00080001,
-                value=Op.SAR(Op.ADDMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001D00090000,
-                value=Op.SAR(Op.MULMOD(0x2, 0x1, 0x3), 0x3),
-            )
-            + Op.SSTORE(
-                key=0x11001D00090001,
-                value=Op.SAR(Op.MULMOD(0x2, 0x1, 0x3), 0x1),
-            )
-            + Op.SSTORE(
-                key=0x11001D000A0000, value=Op.SAR(Op.EXP(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D000A0001, value=Op.SAR(Op.EXP(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D00100000, value=Op.SAR(Op.LT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D00100001, value=Op.SAR(Op.LT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D00110000, value=Op.SAR(Op.GT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D00110001, value=Op.SAR(Op.GT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D00120000, value=Op.SAR(Op.SLT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D00120001, value=Op.SAR(Op.SLT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D00130000, value=Op.SAR(Op.SGT(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D00130001, value=Op.SAR(Op.SGT(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D00140000, value=Op.SAR(Op.EQ(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D00140001, value=Op.SAR(Op.EQ(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D00150000, value=Op.SAR(Op.ISZERO(0x2), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D00150001, value=Op.SAR(Op.ISZERO(0x2), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D00160000, value=Op.SAR(Op.AND(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D00160001, value=Op.SAR(Op.AND(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D00170000, value=Op.SAR(Op.OR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D00170001, value=Op.SAR(Op.OR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D00180000, value=Op.SAR(Op.XOR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D00180001, value=Op.SAR(Op.XOR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(key=0x11001D00190000, value=Op.SAR(Op.NOT(0x2), 0x3))
-            + Op.SSTORE(key=0x11001D00190001, value=Op.SAR(Op.NOT(0x2), 0x1))
-            + Op.SSTORE(
-                key=0x11001D001A0000, value=Op.SAR(Op.BYTE(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D001A0001, value=Op.SAR(Op.BYTE(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D001B0000, value=Op.SAR(Op.SHL(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D001B0001, value=Op.SAR(Op.SHL(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D001C0000, value=Op.SAR(Op.SHR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D001C0001, value=Op.SAR(Op.SHR(0x2, 0x1), 0x1)
-            )
-            + Op.SSTORE(
-                key=0x11001D001D0000, value=Op.SAR(Op.SAR(0x2, 0x1), 0x3)
-            )
-            + Op.SSTORE(
-                key=0x11001D001D0001, value=Op.SAR(Op.SAR(0x2, 0x1), 0x1)
-            )
-            + Op.STOP
-        ),
-        address=Address("0xe262558822902632416f26edbf70ccac609cd2ce"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = {
-        contract: Account(
-            storage={
-                0x11000100010000: 6,
-                0x11000100010001: 4,
-                0x11000100020000: 5,
-                0x11000100020001: 3,
-                0x11000100030000: 4,
-                0x11000100030001: 2,
-                0x11000100040000: 5,
-                0x11000100040001: 3,
-                0x11000100050000: 5,
-                0x11000100050001: 3,
-                0x11000100060000: 3,
-                0x11000100060001: 1,
-                0x11000100070000: 3,
-                0x11000100070001: 1,
-                0x11000100080000: 3,
-                0x11000100080001: 1,
-                0x11000100090000: 5,
-                0x11000100090001: 3,
-                0x110001000A0000: 5,
-                0x110001000A0001: 3,
-                0x11000100100000: 3,
-                0x11000100100001: 1,
-                0x11000100110000: 4,
-                0x11000100110001: 2,
-                0x11000100120000: 3,
-                0x11000100120001: 1,
-                0x11000100130000: 4,
-                0x11000100130001: 2,
-                0x11000100140000: 3,
-                0x11000100140001: 1,
-                0x11000100150000: 3,
-                0x11000100150001: 1,
-                0x11000100160000: 3,
-                0x11000100160001: 1,
-                0x11000100170000: 6,
-                0x11000100170001: 4,
-                0x11000100180000: 6,
-                0x11000100180001: 4,
-                0x11000100190001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                0x110001001A0000: 3,
-                0x110001001A0001: 1,
-                0x110001001B0000: 7,
-                0x110001001B0001: 5,
-                0x110001001C0000: 3,
-                0x110001001C0001: 1,
-                0x110001001D0000: 3,
-                0x110001001D0001: 1,
-                0x11000200010000: 9,
-                0x11000200010001: 3,
-                0x11000200020000: 6,
-                0x11000200020001: 2,
-                0x11000200030000: 3,
-                0x11000200030001: 1,
-                0x11000200040000: 6,
-                0x11000200040001: 2,
-                0x11000200050000: 6,
-                0x11000200050001: 2,
-                0x11000200090000: 6,
-                0x11000200090001: 2,
-                0x110002000A0000: 6,
-                0x110002000A0001: 2,
-                0x11000200110000: 3,
-                0x11000200110001: 1,
-                0x11000200130000: 3,
-                0x11000200130001: 1,
-                0x11000200170000: 9,
-                0x11000200170001: 3,
-                0x11000200180000: 9,
-                0x11000200180001: 3,
-                0x11000200190000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7,  # noqa: E501
-                0x11000200190001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x110002001B0000: 12,
-                0x110002001B0001: 4,
-                0x11000300010001: 2,
-                0x11000300020000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11000300020001: 1,
-                0x11000300030000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                0x11000300040000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11000300040001: 1,
-                0x11000300050000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11000300050001: 1,
-                0x11000300060000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x11000300060001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11000300070000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x11000300070001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11000300080000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x11000300080001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11000300090000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11000300090001: 1,
-                0x110003000A0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x110003000A0001: 1,
-                0x11000300100000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x11000300100001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11000300110000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                0x11000300120000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x11000300120001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11000300130000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                0x11000300140000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x11000300140001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11000300150000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x11000300150001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11000300160000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x11000300160001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11000300170001: 2,
-                0x11000300180001: 2,
-                0x11000300190000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA,  # noqa: E501
-                0x11000300190001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
-                0x110003001A0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x110003001A0001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x110003001B0000: 1,
-                0x110003001B0001: 3,
-                0x110003001C0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x110003001C0001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x110003001D0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x110003001D0001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11000400010000: 1,
-                0x11000400010001: 3,
-                0x11000400020001: 2,
-                0x11000400030001: 1,
-                0x11000400040001: 2,
-                0x11000400050001: 2,
-                0x11000400090001: 2,
-                0x110004000A0001: 2,
-                0x11000400110001: 1,
-                0x11000400130001: 1,
-                0x11000400170000: 1,
-                0x11000400170001: 3,
-                0x11000400180000: 1,
-                0x11000400180001: 3,
-                0x11000400190000: 0x5555555555555555555555555555555555555555555555555555555555555554,  # noqa: E501
-                0x11000400190001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x110004001B0000: 1,
-                0x110004001B0001: 4,
-                0x11000500010000: 1,
-                0x11000500010001: 3,
-                0x11000500020001: 2,
-                0x11000500030001: 1,
-                0x11000500040001: 2,
-                0x11000500050001: 2,
-                0x11000500090001: 2,
-                0x110005000A0001: 2,
-                0x11000500110001: 1,
-                0x11000500130001: 1,
-                0x11000500170000: 1,
-                0x11000500170001: 3,
-                0x11000500180000: 1,
-                0x11000500180001: 3,
-                0x11000500190000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11000500190001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x110005001B0000: 1,
-                0x110005001B0001: 4,
-                0x11000600020000: 2,
-                0x11000600030000: 1,
-                0x11000600040000: 2,
-                0x11000600050000: 2,
-                0x11000600090000: 2,
-                0x110006000A0000: 2,
-                0x11000600110000: 1,
-                0x11000600130000: 1,
-                0x11000600190000: 1,
-                0x110006001B0000: 1,
-                0x11000700020000: 2,
-                0x11000700030000: 1,
-                0x11000700040000: 2,
-                0x11000700050000: 2,
-                0x11000700090000: 2,
-                0x110007000A0000: 2,
-                0x11000700110000: 1,
-                0x11000700130000: 1,
-                0x110007001B0000: 1,
-                0x11000800020000: 1,
-                0x11000800020001: 1,
-                0x11000800040000: 1,
-                0x11000800040001: 1,
-                0x11000800050000: 1,
-                0x11000800050001: 1,
-                0x11000800060000: 1,
-                0x11000800060001: 1,
-                0x11000800070000: 1,
-                0x11000800070001: 1,
-                0x11000800080000: 1,
-                0x11000800080001: 1,
-                0x11000800090000: 1,
-                0x11000800090001: 1,
-                0x110008000A0000: 1,
-                0x110008000A0001: 1,
-                0x11000800100000: 1,
-                0x11000800100001: 1,
-                0x11000800120000: 1,
-                0x11000800120001: 1,
-                0x11000800140000: 1,
-                0x11000800140001: 1,
-                0x11000800150000: 1,
-                0x11000800150001: 1,
-                0x11000800160000: 1,
-                0x11000800160001: 1,
-                0x110008001A0000: 1,
-                0x110008001A0001: 1,
-                0x110008001B0000: 1,
-                0x110008001B0001: 1,
-                0x110008001C0000: 1,
-                0x110008001C0001: 1,
-                0x110008001D0000: 1,
-                0x110008001D0001: 1,
-                0x11000900010000: 1,
-                0x11000900010001: 1,
-                0x11000900030000: 1,
-                0x11000900030001: 1,
-                0x11000900110000: 1,
-                0x11000900110001: 1,
-                0x11000900130000: 1,
-                0x11000900130001: 1,
-                0x11000900170000: 1,
-                0x11000900170001: 1,
-                0x11000900180000: 1,
-                0x11000900180001: 1,
-                0x11000900190000: 1,
-                0x11000900190001: 1,
-                0x11000A00010000: 27,
-                0x11000A00010001: 3,
-                0x11000A00020000: 8,
-                0x11000A00020001: 2,
-                0x11000A00030000: 1,
-                0x11000A00030001: 1,
-                0x11000A00040000: 8,
-                0x11000A00040001: 2,
-                0x11000A00050000: 8,
-                0x11000A00050001: 2,
-                0x11000A00090000: 8,
-                0x11000A00090001: 2,
-                0x11000A000A0000: 8,
-                0x11000A000A0001: 2,
-                0x11000A00110000: 1,
-                0x11000A00110001: 1,
-                0x11000A00130000: 1,
-                0x11000A00130001: 1,
-                0x11000A00170000: 27,
-                0x11000A00170001: 3,
-                0x11000A00180000: 27,
-                0x11000A00180001: 3,
-                0x11000A00190000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5,  # noqa: E501
-                0x11000A00190001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x11000A001B0000: 64,
-                0x11000A001B0001: 4,
-                0x11001000020000: 1,
-                0x11001000030000: 1,
-                0x11001000040000: 1,
-                0x11001000050000: 1,
-                0x11001000060000: 1,
-                0x11001000060001: 1,
-                0x11001000070000: 1,
-                0x11001000070001: 1,
-                0x11001000080000: 1,
-                0x11001000080001: 1,
-                0x11001000090000: 1,
-                0x110010000A0000: 1,
-                0x11001000100000: 1,
-                0x11001000100001: 1,
-                0x11001000110000: 1,
-                0x11001000120000: 1,
-                0x11001000120001: 1,
-                0x11001000130000: 1,
-                0x11001000140000: 1,
-                0x11001000140001: 1,
-                0x11001000150000: 1,
-                0x11001000150001: 1,
-                0x11001000160000: 1,
-                0x11001000160001: 1,
-                0x110010001A0000: 1,
-                0x110010001A0001: 1,
-                0x110010001C0000: 1,
-                0x110010001C0001: 1,
-                0x110010001D0000: 1,
-                0x110010001D0001: 1,
-                0x11001100010001: 1,
-                0x11001100020001: 1,
-                0x11001100040001: 1,
-                0x11001100050001: 1,
-                0x11001100090001: 1,
-                0x110011000A0001: 1,
-                0x11001100170001: 1,
-                0x11001100180001: 1,
-                0x11001100190000: 1,
-                0x11001100190001: 1,
-                0x110011001B0000: 1,
-                0x110011001B0001: 1,
-                0x11001200020000: 1,
-                0x11001200030000: 1,
-                0x11001200040000: 1,
-                0x11001200050000: 1,
-                0x11001200060000: 1,
-                0x11001200060001: 1,
-                0x11001200070000: 1,
-                0x11001200070001: 1,
-                0x11001200080000: 1,
-                0x11001200080001: 1,
-                0x11001200090000: 1,
-                0x110012000A0000: 1,
-                0x11001200100000: 1,
-                0x11001200100001: 1,
-                0x11001200110000: 1,
-                0x11001200120000: 1,
-                0x11001200120001: 1,
-                0x11001200130000: 1,
-                0x11001200140000: 1,
-                0x11001200140001: 1,
-                0x11001200150000: 1,
-                0x11001200150001: 1,
-                0x11001200160000: 1,
-                0x11001200160001: 1,
-                0x11001200190000: 1,
-                0x11001200190001: 1,
-                0x110012001A0000: 1,
-                0x110012001A0001: 1,
-                0x110012001C0000: 1,
-                0x110012001C0001: 1,
-                0x110012001D0000: 1,
-                0x110012001D0001: 1,
-                0x11001300010001: 1,
-                0x11001300020001: 1,
-                0x11001300040001: 1,
-                0x11001300050001: 1,
-                0x11001300090001: 1,
-                0x110013000A0001: 1,
-                0x11001300170001: 1,
-                0x11001300180001: 1,
-                0x110013001B0000: 1,
-                0x110013001B0001: 1,
-                0x11001400010000: 1,
-                0x11001400030001: 1,
-                0x11001400110001: 1,
-                0x11001400130001: 1,
-                0x11001400170000: 1,
-                0x11001400180000: 1,
-                0x11001500060000: 1,
-                0x11001500060001: 1,
-                0x11001500070000: 1,
-                0x11001500070001: 1,
-                0x11001500080000: 1,
-                0x11001500080001: 1,
-                0x11001500100000: 1,
-                0x11001500100001: 1,
-                0x11001500120000: 1,
-                0x11001500120001: 1,
-                0x11001500140000: 1,
-                0x11001500140001: 1,
-                0x11001500150000: 1,
-                0x11001500150001: 1,
-                0x11001500160000: 1,
-                0x11001500160001: 1,
-                0x110015001A0000: 1,
-                0x110015001A0001: 1,
-                0x110015001C0000: 1,
-                0x110015001C0001: 1,
-                0x110015001D0000: 1,
-                0x110015001D0001: 1,
-                0x11001600010000: 3,
-                0x11001600010001: 1,
-                0x11001600020000: 2,
-                0x11001600030000: 1,
-                0x11001600030001: 1,
-                0x11001600040000: 2,
-                0x11001600050000: 2,
-                0x11001600090000: 2,
-                0x110016000A0000: 2,
-                0x11001600110000: 1,
-                0x11001600110001: 1,
-                0x11001600130000: 1,
-                0x11001600130001: 1,
-                0x11001600170000: 3,
-                0x11001600170001: 1,
-                0x11001600180000: 3,
-                0x11001600180001: 1,
-                0x11001600190000: 1,
-                0x11001600190001: 1,
-                0x11001700010000: 3,
-                0x11001700010001: 3,
-                0x11001700020000: 3,
-                0x11001700020001: 3,
-                0x11001700030000: 3,
-                0x11001700030001: 1,
-                0x11001700040000: 3,
-                0x11001700040001: 3,
-                0x11001700050000: 3,
-                0x11001700050001: 3,
-                0x11001700060000: 3,
-                0x11001700060001: 1,
-                0x11001700070000: 3,
-                0x11001700070001: 1,
-                0x11001700080000: 3,
-                0x11001700080001: 1,
-                0x11001700090000: 3,
-                0x11001700090001: 3,
-                0x110017000A0000: 3,
-                0x110017000A0001: 3,
-                0x11001700100000: 3,
-                0x11001700100001: 1,
-                0x11001700110000: 3,
-                0x11001700110001: 1,
-                0x11001700120000: 3,
-                0x11001700120001: 1,
-                0x11001700130000: 3,
-                0x11001700130001: 1,
-                0x11001700140000: 3,
-                0x11001700140001: 1,
-                0x11001700150000: 3,
-                0x11001700150001: 1,
-                0x11001700160000: 3,
-                0x11001700160001: 1,
-                0x11001700170000: 3,
-                0x11001700170001: 3,
-                0x11001700180000: 3,
-                0x11001700180001: 3,
-                0x11001700190000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001700190001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x110017001A0000: 3,
-                0x110017001A0001: 1,
-                0x110017001B0000: 7,
-                0x110017001B0001: 5,
-                0x110017001C0000: 3,
-                0x110017001C0001: 1,
-                0x110017001D0000: 3,
-                0x110017001D0001: 1,
-                0x11001800010001: 2,
-                0x11001800020000: 1,
-                0x11001800020001: 3,
-                0x11001800030000: 2,
-                0x11001800040000: 1,
-                0x11001800040001: 3,
-                0x11001800050000: 1,
-                0x11001800050001: 3,
-                0x11001800060000: 3,
-                0x11001800060001: 1,
-                0x11001800070000: 3,
-                0x11001800070001: 1,
-                0x11001800080000: 3,
-                0x11001800080001: 1,
-                0x11001800090000: 1,
-                0x11001800090001: 3,
-                0x110018000A0000: 1,
-                0x110018000A0001: 3,
-                0x11001800100000: 3,
-                0x11001800100001: 1,
-                0x11001800110000: 2,
-                0x11001800120000: 3,
-                0x11001800120001: 1,
-                0x11001800130000: 2,
-                0x11001800140000: 3,
-                0x11001800140001: 1,
-                0x11001800150000: 3,
-                0x11001800150001: 1,
-                0x11001800160000: 3,
-                0x11001800160001: 1,
-                0x11001800170001: 2,
-                0x11001800180001: 2,
-                0x11001800190000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                0x11001800190001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
-                0x110018001A0000: 3,
-                0x110018001A0001: 1,
-                0x110018001B0000: 7,
-                0x110018001B0001: 5,
-                0x110018001C0000: 3,
-                0x110018001C0001: 1,
-                0x110018001D0000: 3,
-                0x110018001D0001: 1,
-                0x11001900010000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
-                0x11001900010001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
-                0x11001900020000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x11001900020001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x11001900030000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                0x11001900030001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                0x11001900040000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x11001900040001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x11001900050000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x11001900050001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x11001900060000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001900060001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001900070000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001900070001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001900080000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001900080001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001900090000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x11001900090001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x110019000A0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x110019000A0001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
-                0x11001900100000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001900100001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001900110000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                0x11001900110001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                0x11001900120000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001900120001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001900130000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                0x11001900130001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                0x11001900140000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001900140001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001900150000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001900150001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001900160000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001900160001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001900170000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
-                0x11001900170001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
-                0x11001900180000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
-                0x11001900180001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
-                0x11001900190000: 2,
-                0x11001900190001: 2,
-                0x110019001A0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x110019001A0001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x110019001B0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB,  # noqa: E501
-                0x110019001B0001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB,  # noqa: E501
-                0x110019001C0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x110019001C0001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x110019001D0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x110019001D0001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0x11001B00010000: 24,
-                0x11001B00010001: 8,
-                0x11001B00020000: 12,
-                0x11001B00020001: 4,
-                0x11001B00030000: 6,
-                0x11001B00030001: 2,
-                0x11001B00040000: 12,
-                0x11001B00040001: 4,
-                0x11001B00050000: 12,
-                0x11001B00050001: 4,
-                0x11001B00060000: 3,
-                0x11001B00060001: 1,
-                0x11001B00070000: 3,
-                0x11001B00070001: 1,
-                0x11001B00080000: 3,
-                0x11001B00080001: 1,
-                0x11001B00090000: 12,
-                0x11001B00090001: 4,
-                0x11001B000A0000: 12,
-                0x11001B000A0001: 4,
-                0x11001B00100000: 3,
-                0x11001B00100001: 1,
-                0x11001B00110000: 6,
-                0x11001B00110001: 2,
-                0x11001B00120000: 3,
-                0x11001B00120001: 1,
-                0x11001B00130000: 6,
-                0x11001B00130001: 2,
-                0x11001B00140000: 3,
-                0x11001B00140001: 1,
-                0x11001B00150000: 3,
-                0x11001B00150001: 1,
-                0x11001B00160000: 3,
-                0x11001B00160001: 1,
-                0x11001B00170000: 24,
-                0x11001B00170001: 8,
-                0x11001B00180000: 24,
-                0x11001B00180001: 8,
-                0x11001B001A0000: 3,
-                0x11001B001A0001: 1,
-                0x11001B001B0000: 48,
-                0x11001B001B0001: 16,
-                0x11001B001C0000: 3,
-                0x11001B001C0001: 1,
-                0x11001B001D0000: 3,
-                0x11001B001D0001: 1,
-                0x11001C00030000: 1,
-                0x11001C00060000: 3,
-                0x11001C00060001: 1,
-                0x11001C00070000: 3,
-                0x11001C00070001: 1,
-                0x11001C00080000: 3,
-                0x11001C00080001: 1,
-                0x11001C00100000: 3,
-                0x11001C00100001: 1,
-                0x11001C00110000: 1,
-                0x11001C00120000: 3,
-                0x11001C00120001: 1,
-                0x11001C00130000: 1,
-                0x11001C00140000: 3,
-                0x11001C00140001: 1,
-                0x11001C00150000: 3,
-                0x11001C00150001: 1,
-                0x11001C00160000: 3,
-                0x11001C00160001: 1,
-                0x11001C001A0000: 3,
-                0x11001C001A0001: 1,
-                0x11001C001C0000: 3,
-                0x11001C001C0001: 1,
-                0x11001C001D0000: 3,
-                0x11001C001D0001: 1,
-                0x11001D00030000: 1,
-                0x11001D00060000: 3,
-                0x11001D00060001: 1,
-                0x11001D00070000: 3,
-                0x11001D00070001: 1,
-                0x11001D00080000: 3,
-                0x11001D00080001: 1,
-                0x11001D00100000: 3,
-                0x11001D00100001: 1,
-                0x11001D00110000: 1,
-                0x11001D00120000: 3,
-                0x11001D00120001: 1,
-                0x11001D00130000: 1,
-                0x11001D00140000: 3,
-                0x11001D00140001: 1,
-                0x11001D00150000: 3,
-                0x11001D00150001: 1,
-                0x11001D00160000: 3,
-                0x11001D00160001: 1,
-                0x11001D001A0000: 3,
-                0x11001D001A0001: 1,
-                0x11001D001C0000: 3,
-                0x11001D001C0001: 1,
-                0x11001D001D0000: 3,
-                0x11001D001D0001: 1,
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmBitwiseLogicOperation/__init__.py b/tests/ported_static/VMTests/vmBitwiseLogicOperation/__init__.py
deleted file mode 100644
index 677d6898ee3..00000000000
--- a/tests/ported_static/VMTests/vmBitwiseLogicOperation/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from vmBitwiseLogicOperation."""
diff --git a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_and.py b/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_and.py
deleted file mode 100644
index 99588064590..00000000000
--- a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_and.py
+++ /dev/null
@@ -1,179 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmBitwiseLogicOperation/andFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmBitwiseLogicOperation/andFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={
-                        0: 0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={
-                        0: 0xEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_and(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.AND(0x2, 0x2)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.AND(0x2, 0x1)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.AND(0x3, 0x1)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.AND(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.AND(
-                    0xEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_byte.py b/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_byte.py
deleted file mode 100644
index 60f639f52ed..00000000000
--- a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_byte.py
+++ /dev/null
@@ -1,392 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmBitwiseLogicOperation/byteFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/VMTests/vmBitwiseLogicOperation/byteFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001008",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001009",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001007",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001007"): Account(
-                    storage={0: 128}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001006",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001006"): Account(
-                    storage={0: 64}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001005",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001005"): Account(
-                    storage={0: 32}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001004",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 16}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001003",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 8}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001002",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 4}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={0: 2}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000200",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000000200"): Account(
-                    storage={
-                        1: 1,
-                        2: 2,
-                        3: 3,
-                        4: 4,
-                        5: 5,
-                        6: 6,
-                        7: 7,
-                        8: 8,
-                        9: 9,
-                        10: 10,
-                        11: 11,
-                        12: 12,
-                        13: 13,
-                        14: 14,
-                        15: 15,
-                        16: 16,
-                        17: 17,
-                        18: 18,
-                        19: 19,
-                        20: 20,
-                        21: 21,
-                        22: 22,
-                        23: 23,
-                        24: 24,
-                        25: 25,
-                        26: 26,
-                        27: 27,
-                        28: 28,
-                        29: 29,
-                        30: 30,
-                        31: 31,
-                    }
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000100a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100a"): Account(
-                    storage={1: 172}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_byte(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x100, value=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4A,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x100), 0x20)),
-            )
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x100),
-                value=Op.BYTE(
-                    Op.MLOAD(offset=0x100),
-                    0x102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F,  # noqa: E501
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x100, value=Op.ADD(Op.MLOAD(offset=0x100), 0x1)
-            )
-            + Op.JUMP(pc=0x6)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000000200"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.BYTE(Op.SUB(0x1F, 0x0), 0x8040201008040201),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.BYTE(Op.SUB(0x1F, 0x1), 0x8040201008040201),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.BYTE(Op.SUB(0x1F, 0x2), 0x8040201008040201),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.BYTE(Op.SUB(0x1F, 0x3), 0x8040201008040201),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.BYTE(Op.SUB(0x1F, 0x4), 0x8040201008040201),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.BYTE(Op.SUB(0x1F, 0x5), 0x8040201008040201),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.BYTE(Op.SUB(0x1F, 0x6), 0x8040201008040201),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.BYTE(Op.SUB(0x1F, 0x7), 0x8040201008040201),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001007"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    [[0]] (byte (- 31 31) 0x8040201008040201)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.BYTE(Op.SUB(0x1F, 0x1F), 0x8040201008040201),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001008"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    [[0]] (byte (sdiv 31 32) 0x8040201008040201)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.BYTE(Op.SDIV(0x1F, 0x20), 0x8040201008040201),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001009"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.ADD(Op.DUP1, Op.BYTE(0x1F, 0x1234523456)),
-            )
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100a"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff $4 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.CALLDATALOAD(offset=0x4),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_eq.py b/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_eq.py
deleted file mode 100644
index 3c4dfedb7fd..00000000000
--- a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_eq.py
+++ /dev/null
@@ -1,141 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmBitwiseLogicOperation/eqFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmBitwiseLogicOperation/eqFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=["case0", "case1", "case2"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_eq(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.EQ(Op.SUB(0x0, 0x5), Op.SUB(0x0, 0x3)))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.EQ(0x0, 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.EQ(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_gt.py b/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_gt.py
deleted file mode 100644
index d5c818f6e51..00000000000
--- a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_gt.py
+++ /dev/null
@@ -1,157 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmBitwiseLogicOperation/gtFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmBitwiseLogicOperation/gtFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_gt(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.GT(Op.SUB(0x0, 0x2), 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.GT(0x0, Op.SUB(0x0, 0x2))) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.GT(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.GT(
-                    0x0,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_iszero.py b/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_iszero.py
deleted file mode 100644
index 7a7a2927f8e..00000000000
--- a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_iszero.py
+++ /dev/null
@@ -1,135 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmBitwiseLogicOperation/iszeroFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/VMTests/vmBitwiseLogicOperation/iszeroFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=["case0", "case1", "case2"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_iszero(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.ISZERO(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ISZERO(0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ISZERO(Op.SUB(0x0, 0x2))) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_lt.py b/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_lt.py
deleted file mode 100644
index a16996c9bff..00000000000
--- a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_lt.py
+++ /dev/null
@@ -1,157 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmBitwiseLogicOperation/ltFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmBitwiseLogicOperation/ltFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_lt(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.LT(Op.SUB(0x0, 0x2), 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.LT(0x0, Op.SUB(0x0, 0x2))) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.LT(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.LT(
-                    0x0,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_not.py b/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_not.py
deleted file mode 100644
index dc887af6710..00000000000
--- a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_not.py
+++ /dev/null
@@ -1,198 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmBitwiseLogicOperation/notFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmBitwiseLogicOperation/notFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001005"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4", "case5"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_not(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.NOT(0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.NOT(0x2)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.NOT(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.NOT(Op.SUB(0x0, 0x2))) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.NOT(
-                    Op.SUB(
-                        0x0,
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.NOT(Op.SUB(0x0, 0x0))) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_or.py b/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_or.py
deleted file mode 100644
index e0728fd0d3a..00000000000
--- a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_or.py
+++ /dev/null
@@ -1,208 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmBitwiseLogicOperation/orFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmBitwiseLogicOperation/orFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={0: 3}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 3}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001005"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4", "case5"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_or(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.OR(0x2, 0x2)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.OR(0x2, 0x1)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.OR(0x3, 0x1)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.OR(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.OR(
-                    0xEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.OR(
-                    0xEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_sgt.py b/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_sgt.py
deleted file mode 100644
index c58bea216e9..00000000000
--- a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_sgt.py
+++ /dev/null
@@ -1,157 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmBitwiseLogicOperation/sgtFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmBitwiseLogicOperation/sgtFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_sgt(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SGT(Op.SUB(0x0, 0x2), 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SGT(0x0, Op.SUB(0x0, 0x2))) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SGT(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SGT(
-                    0x0,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_slt.py b/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_slt.py
deleted file mode 100644
index 15c0d032e1b..00000000000
--- a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_slt.py
+++ /dev/null
@@ -1,157 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmBitwiseLogicOperation/sltFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmBitwiseLogicOperation/sltFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_slt(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SLT(Op.SUB(0x0, 0x2), 0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SLT(0x0, Op.SUB(0x0, 0x2))) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SLT(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SLT(
-                    0x0,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_xor.py b/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_xor.py
deleted file mode 100644
index bc1ba382116..00000000000
--- a/tests/ported_static/VMTests/vmBitwiseLogicOperation/test_xor.py
+++ /dev/null
@@ -1,204 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmBitwiseLogicOperation/xorFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmBitwiseLogicOperation/xorFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={0: 3}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 2}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={
-                        0: 0x1111111111111111111111111111111111111111111111111111111111111111  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={
-                        0: 0xFEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001005"): Account(
-                    storage={
-                        0: 0x1111111111111111111111111111101111111111111111111111111111111111  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4", "case5"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_xor(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.XOR(0x2, 0x2)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.XOR(0x2, 0x1)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.XOR(0x3, 0x1)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.XOR(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.XOR(
-                    0xEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.XOR(
-                    0xEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmIOandFlowOperations/__init__.py b/tests/ported_static/VMTests/vmIOandFlowOperations/__init__.py
deleted file mode 100644
index 0732cd07686..00000000000
--- a/tests/ported_static/VMTests/vmIOandFlowOperations/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from vmIOandFlowOperations."""
diff --git a/tests/ported_static/VMTests/vmIOandFlowOperations/test_codecopy.py b/tests/ported_static/VMTests/vmIOandFlowOperations/test_codecopy.py
deleted file mode 100644
index 11ff6e44aff..00000000000
--- a/tests/ported_static/VMTests/vmIOandFlowOperations/test_codecopy.py
+++ /dev/null
@@ -1,266 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmIOandFlowOperations/codecopyFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/VMTests/vmIOandFlowOperations/codecopyFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        0: 0x6040600060003960005160005560205160015500000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        0: 0x6010600F600E600D600C600B600A600960086007600660056004600360026001,  # noqa: E501
-                        1: 0x101010101010101010101010101016101005260206000600039604060206020,  # noqa: E501
-                        2: 0x3960005160005560205160015560405160025500000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        0: 0x6110006000600039600051600055602051600155000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        0: 0x3860FF5560FF5460006000396160A76000556160A76001556160A76002556000,  # noqa: E501
-                        1: 0x5160005560205160015560405160025560605160035560805160045560A05160,  # noqa: E501
-                        2: 0x5550061DEADFF60FF546000F360AA60BB60CC60DD60EE60FFF4000000000000,  # noqa: E501
-                        255: 91,
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_codecopy(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x40)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.CODECOPY(dest_offset=0x0, offset=0x0, size=Op.SUB(0x0, 0x1))
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x1000)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x100,
-                value=Op.ADD(
-                    Op.ADD(
-                        Op.ADD(
-                            Op.ADD(
-                                Op.ADD(
-                                    Op.ADD(
-                                        Op.ADD(
-                                            Op.ADD(
-                                                Op.ADD(
-                                                    Op.ADD(
-                                                        Op.ADD(
-                                                            Op.ADD(
-                                                                Op.ADD(
-                                                                    Op.ADD(
-                                                                        Op.ADD(
-                                                                            0x1,  # noqa: E501
-                                                                            0x2,  # noqa: E501
-                                                                        ),
-                                                                        0x3,
-                                                                    ),
-                                                                    0x4,
-                                                                ),
-                                                                0x5,
-                                                            ),
-                                                            0x6,
-                                                        ),
-                                                        0x7,
-                                                    ),
-                                                    0x8,
-                                                ),
-                                                0x9,
-                                            ),
-                                            0xA,
-                                        ),
-                                        0xB,
-                                    ),
-                                    0xC,
-                                ),
-                                0xD,
-                            ),
-                            0xE,
-                        ),
-                        0xF,
-                    ),
-                    0x10,
-                ),
-            )
-            + Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.CODECOPY(dest_offset=0x20, offset=0x20, size=0x40)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x40))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0xFF, value=Op.CODESIZE)
-            + Op.CODECOPY(dest_offset=0x0, offset=0x0, size=Op.SLOAD(key=0xFF))
-            + Op.SSTORE(key=0x0, value=0x60A7)
-            + Op.SSTORE(key=0x1, value=0x60A7)
-            + Op.SSTORE(key=0x2, value=0x60A7)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x40))
-            + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x60))
-            + Op.SSTORE(key=0x4, value=Op.MLOAD(offset=0x80))
-            + Op.SSTORE(key=0x5, value=Op.MLOAD(offset=0xA0))
-            + Op.STOP
-            + Op.SELFDESTRUCT(address=0xDEAD)
-            + Op.RETURN(offset=0x0, size=Op.SLOAD(key=0xFF))
-            + Op.DELEGATECALL(
-                gas=0xFF,
-                address=0xEE,
-                args_offset=0xDD,
-                args_size=0xCC,
-                ret_offset=0xBB,
-                ret_size=0xAA,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (delegatecall 0xffffff (+ 0x1000 $4) 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmIOandFlowOperations/test_gas.py b/tests/ported_static/VMTests/vmIOandFlowOperations/test_gas.py
deleted file mode 100644
index f88a0b8343f..00000000000
--- a/tests/ported_static/VMTests/vmIOandFlowOperations/test_gas.py
+++ /dev/null
@@ -1,125 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmIOandFlowOperations/gasFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmIOandFlowOperations/gasFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0x4B1457B}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0x4B1458D}
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_gas(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xFFFFFFFFFF)
-            + Op.MSTORE(offset=0x5A, value=0xEEEE)
-            + Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.GAS) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0xBAD},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=80000000,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmIOandFlowOperations/test_jump.py b/tests/ported_static/VMTests/vmIOandFlowOperations/test_jump.py
deleted file mode 100644
index eb38d259dc1..00000000000
--- a/tests/ported_static/VMTests/vmIOandFlowOperations/test_jump.py
+++ /dev/null
@@ -1,467 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000009",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000d",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000e",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000f",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_jump(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x600D)
-            + Op.JUMP(pc=Op.MUL(0x20, 0x10))
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x600D)
-            + Op.JUMPI(pc=Op.MUL(0x20, 0x10), condition=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMP(pc=0x4)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x600D) + Op.JUMP(pc=0xFFFFFFF) + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x23]
-            + Op.JUMP(pc=0x8)
-            + Op.PUSH1[0x1]
-            + Op.JUMPDEST
-            + Op.PUSH1[0x2]
-            + Op.SSTORE
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=0x600D) + Op.JUMPDEST + Op.JUMP(pc=0x6),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.PUSH2[0x600D]
-            + Op.JUMP(pc=0x8)
-            + Op.PUSH1[0xFF]
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMP(pc=0xB)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.JUMP(pc=0x3)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001007"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMP(pc=Op.ADD(0x5, 0x2))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=0x600D)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001008"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMP(pc=0x5)
-            + Op.STOP
-            + Op.PUSH1[0x5B]
-            + Op.SSTORE(key=0x0, value=0x600D)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001009"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMP(pc=0x5)
-            + Op.STOP
-            + Op.PUSH1[0x1]
-            + Op.SSTORE(key=0x0, value=0x600D)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x600D)
-            + Op.JUMP(pc=0xB)
-            + Op.GAS
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x600D)
-            + Op.JUMP(pc=0x9)
-            + Op.GAS
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMP(pc=0x1000000000000000B)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=0x1)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100d"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMP(pc=0x100000007)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=0x1)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100e"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   @0 (- 0 1)
-    #   (asm 0 mload jump 0x600D 0x00 sstore)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.MLOAD(offset=0x0))
-            + Op.POP(Op.SUB(0x0, 0x1))
-            + Op.JUMP(pc=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100f"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMP(pc=0xE)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=0x600D)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001010"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     ; limited gas because of the endless loop
-    #     (delegatecall 0x10000 (+ 0x1000 $4) 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x10000,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0xBAD},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmIOandFlowOperations/test_jump_to_push.py b/tests/ported_static/VMTests/vmIOandFlowOperations/test_jump_to_push.py
deleted file mode 100644
index 242086547f3..00000000000
--- a/tests/ported_static/VMTests/vmIOandFlowOperations/test_jump_to_push.py
+++ /dev/null
@@ -1,1669 +0,0 @@
-"""
-Test ported from static filler.
-
-Ported from:
-tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpToPushFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpToPushFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000ac",  # noqa: E501
-            {},
-        ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000bc",  # noqa: E501
-            {},
-        ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000cc",  # noqa: E501
-            {},
-        ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000dc",  # noqa: E501
-            {},
-        ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000ec",  # noqa: E501
-            {},
-        ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000fc",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000010c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000011c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000012c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000013c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000014c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000015c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000016c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000017c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000018c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000019c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000020c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000002c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000002c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000004c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000005c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000006c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000007c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000008c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000009c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000ac",  # noqa: E501
-            {},
-        ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000bc",  # noqa: E501
-            {},
-        ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000cc",  # noqa: E501
-            {},
-        ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000dc",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000ec",  # noqa: E501
-            {},
-        ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000fc",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000010c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000011c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000012c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000013c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000014c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000015c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000016c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000017c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000004c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000018c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000019c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000020c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000005c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000006c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000007c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000008c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000009c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {},
-        ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000aa",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000ba",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000ca",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000da",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000ea",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000fa",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000010a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000011a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000012a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000013a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000014a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000015a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000016a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000017a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000018a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000019a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000020a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000002a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000003a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000004a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000005a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000006a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000007a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000008a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000009a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_jump_to_push(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0xA)
-            + Op.PUSH1[0x5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000001a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH1[0x5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000001b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0xB)
-            + Op.PUSH2[0x5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000002a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH2[0x5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000002b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0xA)
-            + Op.PUSH2[0x5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000002c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0xC)
-            + Op.PUSH3[0x5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000003a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH3[0x5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000003b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0xB)
-            + Op.PUSH3[0x5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000003c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0xD)
-            + Op.PUSH4[0x5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000004a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH4[0x5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000004b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0xC)
-            + Op.PUSH4[0x5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000004c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0xE)
-            + Op.PUSH5[0x5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000005a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH5[0x5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000005b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0xD)
-            + Op.PUSH5[0x5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000005c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0xF)
-            + Op.PUSH6[0x5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000006a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH6[0x5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000006b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0xE)
-            + Op.PUSH6[0x5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000006c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x10)
-            + Op.PUSH7[0x5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000007a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH7[0x5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000007b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0xF)
-            + Op.PUSH7[0x5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000007c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x11)
-            + Op.PUSH8[0x5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000008a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH8[0x5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000008b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x10)
-            + Op.PUSH8[0x5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000008c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x12)
-            + Op.PUSH9[0x5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000009a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH9[0x5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000009b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x11)
-            + Op.PUSH9[0x5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000009c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x13)
-            + Op.PUSH10[0x5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000aa"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH10[0x5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000ab"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x12)
-            + Op.PUSH10[0x5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000ac"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x14)
-            + Op.PUSH11[0x5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000ba"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH11[0x5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000bb"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x13)
-            + Op.PUSH11[0x5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000bc"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x15)
-            + Op.PUSH12[0x5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000ca"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH12[0x5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000cb"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x14)
-            + Op.PUSH12[0x5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000cc"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x16)
-            + Op.PUSH13[0x5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000da"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH13[0x5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000db"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x15)
-            + Op.PUSH13[0x5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000dc"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x17)
-            + Op.PUSH14[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000ea"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH14[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000eb"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x16)
-            + Op.PUSH14[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000ec"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x18)
-            + Op.PUSH15[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000fa"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH15[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000fb"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x17)
-            + Op.PUSH15[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000000fc"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x19)
-            + Op.PUSH16[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000010a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH16[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000010b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x18)
-            + Op.PUSH16[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000010c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x1A)
-            + Op.PUSH17[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000011a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH17[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000011b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x19)
-            + Op.PUSH17[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000011c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x1B)
-            + Op.PUSH18[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000012a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH18[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000012b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x1A)
-            + Op.PUSH18[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000012c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x1C)
-            + Op.PUSH19[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000013a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH19[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000013b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x1B)
-            + Op.PUSH19[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000013c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x1D)
-            + Op.PUSH20[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000014a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH20[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000014b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x1C)
-            + Op.PUSH20[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000014c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x1E)
-            + Op.PUSH21[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000015a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH21[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000015b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x1D)
-            + Op.PUSH21[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000015c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x1F)
-            + Op.PUSH22[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000016a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH22[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000016b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x1E)
-            + Op.PUSH22[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000016c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x20)
-            + Op.PUSH23[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000017a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH23[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000017b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x1F)
-            + Op.PUSH23[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000017c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x21)
-            + Op.PUSH24[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000018a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH24[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000018b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x20)
-            + Op.PUSH24[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000018c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x22)
-            + Op.PUSH25[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000019a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH25[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000019b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x21)
-            + Op.PUSH25[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000019c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x23)
-            + Op.PUSH26[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001aa"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH26[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001ab"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x22)
-            + Op.PUSH26[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001ac"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x24)
-            + Op.PUSH27[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001ba"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH27[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001bb"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x23)
-            + Op.PUSH27[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001bc"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x25)
-            + Op.PUSH28[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001ca"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH28[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001cb"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x24)
-            + Op.PUSH28[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001cc"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x26)
-            + Op.PUSH29[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001da"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH29[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001db"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x25)
-            + Op.PUSH29[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001dc"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x27)
-            + Op.PUSH30[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001ea"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH30[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001eb"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x26)
-            + Op.PUSH30[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001ec"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x28)
-            + Op.PUSH31[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001fa"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH31[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001fb"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x27)
-            + Op.PUSH31[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000001fc"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x29)
-            + Op.PUSH32[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000020a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x9)
-            + Op.PUSH32[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000020b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x28)
-            + Op.PUSH32[
-                0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
-            ]
-            + Op.JUMPDEST
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000020c"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: Yul
-    # {
-    #   let addr := calldataload(4)
-    #   pop(delegatecall(sub(gas(), 5000), addr, 0, 0, 0, 0))
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.SUB(Op.GAS, 0x1388),
-                address=Op.CALLDATALOAD(offset=0x4),
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0x0},
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmIOandFlowOperations/test_jumpi.py b/tests/ported_static/VMTests/vmIOandFlowOperations/test_jumpi.py
deleted file mode 100644
index 6ae2a011f6d..00000000000
--- a/tests/ported_static/VMTests/vmIOandFlowOperations/test_jumpi.py
+++ /dev/null
@@ -1,667 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpiFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpiFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001005",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000100a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001009",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001007",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001006",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001008",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000100d",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000100e",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000100f",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000100b",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000100c",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000110",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000111",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000208",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000201",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000203",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000020d",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000020e",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000020f",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000200",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000202",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_jumpi(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0xE, condition=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=0x600D)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000000110"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x600D)
-            + Op.MSTORE(offset=0x0, value=0x10)
-            + Op.JUMPDEST
-            + Op.SUB(Op.MLOAD(offset=0x0), 0x1)
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.PUSH1[0xB]
-            + Op.JUMPI
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000000111"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x600D)
-            + Op.JUMPI(pc=Op.MUL(0x20, 0x10), condition=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000000200"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x600D)
-            + Op.JUMPI(pc=Op.MUL(0x20, 0x10), condition=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000000201"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x6, condition=0x0)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000000202"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x600D)
-            + Op.JUMPI(pc=0xFFFFFFF, condition=0x0)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000000203"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=Op.ADD(0x5, 0x4), condition=0x0)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=0x600D)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000000208"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x1000000000000000D, condition=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=0x600D)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000020d"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x100000009, condition=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=0x600D)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000020e"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   @0 (- 0 1)
-    #   (asm 0 0 mload jumpi 0x600D 0x00 sstore)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.MLOAD(offset=0x0))
-            + Op.POP(Op.SUB(0x0, 0x1))
-            + Op.JUMPI(pc=Op.MLOAD(offset=0x0), condition=0x0)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000020f"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x600D)
-            + Op.JUMPI(pc=Op.MUL(0x20, 0x10), condition=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x600D)
-            + Op.JUMPI(pc=Op.MUL(0x20, 0x10), condition=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x6, condition=0x1)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x600D)
-            + Op.JUMPI(pc=0xFFFFFFF, condition=0xFF)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x23]
-            + Op.JUMPI(pc=0x8, condition=0x1)
-            + Op.PUSH1[0x1]
-            + Op.JUMPDEST
-            + Op.PUSH1[0x2]
-            + Op.SSTORE
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x600D)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x6, condition=0x6)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.PUSH2[0x600D]
-            + Op.JUMPI(pc=0xA, condition=0x1)
-            + Op.PUSH1[0xFF]
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMP(pc=0xB)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x3, condition=0x1)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001007"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=Op.ADD(0x5, 0x4), condition=0x1)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=0x600D)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001008"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x7, condition=0x1)
-            + Op.STOP
-            + Op.PUSH1[0x5B]
-            + Op.SSTORE(key=0x0, value=0x600D)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001009"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x7, condition=0x1)
-            + Op.STOP
-            + Op.PUSH1[0x1]
-            + Op.SSTORE(key=0x0, value=0x600D)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x600D)
-            + Op.JUMPI(pc=0xD, condition=0x1)
-            + Op.GAS
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x600D)
-            + Op.JUMPI(pc=0xB, condition=0x1)
-            + Op.GAS
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x1000000000000000D, condition=0x11)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=0x600D)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100d"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x100000009, condition=0x11)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=0x600D)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100e"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   @0 (- 0 1)
-    #   (asm 1 0 mload jumpi 0x600D 0x00 sstore)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.MLOAD(offset=0x0))
-            + Op.POP(Op.SUB(0x0, 0x1))
-            + Op.JUMPI(pc=Op.MLOAD(offset=0x0), condition=0x1)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100f"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     ; limited gas because of the endless loop
-    #     (delegatecall 0x10000 $4 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x10000,
-                address=Op.CALLDATALOAD(offset=0x4),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0xBAD},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmIOandFlowOperations/test_loop_stacklimit.py b/tests/ported_static/VMTests/vmIOandFlowOperations/test_loop_stacklimit.py
deleted file mode 100644
index 8c7961aa12b..00000000000
--- a/tests/ported_static/VMTests/vmIOandFlowOperations/test_loop_stacklimit.py
+++ /dev/null
@@ -1,152 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmIOandFlowOperations
-loop_stacklimitFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/VMTests/vmIOandFlowOperations/loop_stacklimitFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=["case0", "case1"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_loop_stacklimit(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA62D63F95900B04CCD3FEE13360DE78966F24695945E8B2C09E646352BC5AF94
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.CALLVALUE
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.SWAP1
-            + Op.SUB
-            + Op.SWAP1
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.DUP2
-            + Op.JUMPI(pc=0x3, condition=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.MSTORE
-            + Op.PUSH1[0x1]
-            + Op.MSTORE
-            + Op.RETURN(offset=Op.MSIZE, size=0x0)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x15f0298e83391f673b708790f259f3f34dfbd788"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.CALLVALUE
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.SWAP1
-            + Op.SUB
-            + Op.SWAP1
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.DUP2
-            + Op.JUMPI(pc=0x3, condition=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.MSTORE
-            + Op.PUSH1[0x1]
-            + Op.MSTORE
-            + Op.RETURN(offset=Op.MSIZE, size=0x0)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x3b20573c5048e5ba16083407e59fc0bbc044b6c0"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0x0},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xf9b46c1d708104b4e6007d17ae485b0a00d8e952"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmIOandFlowOperations/test_loops_conditionals.py b/tests/ported_static/VMTests/vmIOandFlowOperations/test_loops_conditionals.py
deleted file mode 100644
index 290d0f22751..00000000000
--- a/tests/ported_static/VMTests/vmIOandFlowOperations/test_loops_conditionals.py
+++ /dev/null
@@ -1,401 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmIOandFlowOperations
-loopsConditionalsFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/VMTests/vmIOandFlowOperations/loopsConditionalsFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={1: 0x10000}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000009",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 55}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 55}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={1: 0x10000}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={1: 0x10000}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_loops_conditionals(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0xF, condition=Op.ISZERO(Op.GT(0x1, 0x0)))
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0xF, condition=Op.ISZERO(Op.LT(0x1, 0x0)))
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0xE, condition=Op.GT(0x1, 0x0))
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0xE, condition=Op.LT(0x1, 0x0))
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0xE, condition=Op.GT(0x1, 0x0))
-            + Op.PUSH2[0x60A7]
-            + Op.JUMP(pc=0x12)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x600D]
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0xE, condition=Op.LT(0x1, 0x0))
-            + Op.PUSH2[0x60A7]
-            + Op.JUMP(pc=0x12)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x600D]
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x10)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x27, condition=Op.ISZERO(Op.SLOAD(key=0x0)))
-            + Op.SSTORE(key=0x0, value=Op.SUB(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(key=0x1, value=Op.MUL(Op.SLOAD(key=0x1), 0x2))
-            + Op.JUMP(pc=0xA)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x10)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x29, condition=Op.EQ(Op.SLOAD(key=0x0), 0x0))
-            + Op.SSTORE(key=0x0, value=Op.SUB(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(key=0x1, value=Op.MUL(Op.SLOAD(key=0x1), 0x2))
-            + Op.JUMP(pc=0xA)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001007"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #     (for
-    #       { [[0]] 0x10  [[1]] 0x01 }         ; initialization
-    #       (> @@0 0)                          ; predicate
-    #       [[0]] (- @@0 1)                    ; post
-    #       [[1]] (* @@1 2)                    ; body
-    #     )   ; for loop
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x10)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2A, condition=Op.ISZERO(Op.GT(Op.SLOAD(key=0x0), 0x0))
-            )
-            + Op.SSTORE(key=0x1, value=Op.MUL(Op.SLOAD(key=0x1), 0x2))
-            + Op.SSTORE(key=0x0, value=Op.SUB(Op.SLOAD(key=0x0), 0x1))
-            + Op.JUMP(pc=0xA)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001008"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #     (def 'i 0x80)
-    #     (def 'j 0xA0)
-    #
-    #     (for [i] 10        ; init
-    #          (> @i 0)      ; predicate
-    #          [i] (- @i 1)  ; post
-    #          [j] (+ @i @j) ; body
-    #     )    ; for loop
-    #
-    #     [[0]] @j
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x80, value=0xA)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x26,
-                condition=Op.ISZERO(Op.GT(Op.MLOAD(offset=0x80), 0x0)),
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=Op.ADD(Op.MLOAD(offset=0x80), Op.MLOAD(offset=0xA0)),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.SUB(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x5)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0xA0))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001009"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #     (def 'i 0x80)
-    #     (def 'j 0xA0)
-    #
-    #     (for [i] 0         ; init
-    #          (<= @i 10)    ; predicate
-    #          [i] (+ @i 1)  ; post
-    #          [j] (+ @i @j) ; body
-    #     )    ; for loop
-    #
-    #     [[0]] @j
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x80, value=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x27,
-                condition=Op.ISZERO(
-                    Op.ISZERO(Op.GT(Op.MLOAD(offset=0x80), 0xA))
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=Op.ADD(Op.MLOAD(offset=0x80), Op.MLOAD(offset=0xA0)),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x5)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0xA0))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100a"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0xBAD},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmIOandFlowOperations/test_mload.py b/tests/ported_static/VMTests/vmIOandFlowOperations/test_mload.py
deleted file mode 100644
index 1909500c810..00000000000
--- a/tests/ported_static/VMTests/vmIOandFlowOperations/test_mload.py
+++ /dev/null
@@ -1,142 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmIOandFlowOperations/mloadFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmIOandFlowOperations/mloadFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        0: 0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_mload(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0xFFFFFFF)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x724825)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0xBAD},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmIOandFlowOperations/test_msize.py b/tests/ported_static/VMTests/vmIOandFlowOperations/test_msize.py
deleted file mode 100644
index e7812d01929..00000000000
--- a/tests/ported_static/VMTests/vmIOandFlowOperations/test_msize.py
+++ /dev/null
@@ -1,205 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmIOandFlowOperations/msizeFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmIOandFlowOperations/msizeFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 32, 1: 64, 2: 64}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xB00020}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 32}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 32}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 128}
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4", "case5"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_msize(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=4294967296,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xFF)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xFFFFFFFFFF)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xFFFFFFFFFF)
-            + Op.MSTORE(offset=0x20, value=0xEEEE)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xFFFFFFFFFF)
-            + Op.MSTORE(offset=0x5A, value=0xEEEE)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x1F, value=0x1)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.MSTORE8(offset=0x20, value=0x1)
-            + Op.SSTORE(key=0x1, value=Op.MSIZE)
-            + Op.MSTORE8(offset=0x20, value=0x0)
-            + Op.SSTORE(key=0x2, value=Op.MSIZE)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0xB00000, value=0x1)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=268435456,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmIOandFlowOperations/test_mstore.py b/tests/ported_static/VMTests/vmIOandFlowOperations/test_mstore.py
deleted file mode 100644
index 7869a558f11..00000000000
--- a/tests/ported_static/VMTests/vmIOandFlowOperations/test_mstore.py
+++ /dev/null
@@ -1,192 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmIOandFlowOperations/mstoreFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/VMTests/vmIOandFlowOperations/mstoreFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 255}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_mstore(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x1,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x1))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x1,
-                value=Op.ADD(
-                    0x2,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x1))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=Op.SUB(0x0, 0x1))
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x1))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0xFF)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0xFF00)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0xBAD},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmIOandFlowOperations/test_mstore8.py b/tests/ported_static/VMTests/vmIOandFlowOperations/test_mstore8.py
deleted file mode 100644
index 811a369c4dd..00000000000
--- a/tests/ported_static/VMTests/vmIOandFlowOperations/test_mstore8.py
+++ /dev/null
@@ -1,154 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmIOandFlowOperations/mstore8Filler.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/VMTests/vmIOandFlowOperations/mstore8Filler.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        0: 0xFF00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        0: 0xFF00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        0: 0xFFEE0000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_mstore8(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x1, value=0x112233445566778899AABBCCDDEEFF)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x1))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x1, value=0xFF)
-            + Op.MSTORE8(offset=0x2, value=0xEE)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x1, value=Op.SUB(0x0, 0x1))
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x1))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0xBAD},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmIOandFlowOperations/test_pc.py b/tests/ported_static/VMTests/vmIOandFlowOperations/test_pc.py
deleted file mode 100644
index 3a8e39ba544..00000000000
--- a/tests/ported_static/VMTests/vmIOandFlowOperations/test_pc.py
+++ /dev/null
@@ -1,119 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmIOandFlowOperations/pcFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmIOandFlowOperations/pcFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 255, 1: 5}
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_pc(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.PC) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0xFF)
-            + Op.SSTORE(key=0x1, value=Op.PC)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0xBAD},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmIOandFlowOperations/test_pop.py b/tests/ported_static/VMTests/vmIOandFlowOperations/test_pop.py
deleted file mode 100644
index 950b8fe76b8..00000000000
--- a/tests/ported_static/VMTests/vmIOandFlowOperations/test_pop.py
+++ /dev/null
@@ -1,116 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmIOandFlowOperations/popFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmIOandFlowOperations/popFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={3: 2}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=["case0", "case1"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_pop(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.PUSH1[0x2] + Op.PUSH1[0x3] + Op.POP(0x4) + Op.SSTORE,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.POP + Op.PUSH1[0x2] + Op.SSTORE(key=0x4, value=0x3),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmIOandFlowOperations/test_return.py b/tests/ported_static/VMTests/vmIOandFlowOperations/test_return.py
deleted file mode 100644
index 6fac12cdf0c..00000000000
--- a/tests/ported_static/VMTests/vmIOandFlowOperations/test_return.py
+++ /dev/null
@@ -1,225 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmIOandFlowOperations/returnFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/VMTests/vmIOandFlowOperations/returnFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        0: 0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
-                        255: 24589,
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={255: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        0: 0xABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0000000000,  # noqa: E501
-                        255: 24589,
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 39, 255: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        0: 0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
-                        255: 24589,
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_return(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
-            )
-            + Op.SSTORE(key=0xFF, value=0x600D)
-            + Op.RETURN(offset=0x0, size=0x40)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
-            )
-            + Op.SSTORE(key=0xFF, value=0x600D)
-            + Op.RETURN(offset=0x0, size=Op.SUB(0x0, 0x1))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
-            )
-            + Op.SSTORE(key=0xFF, value=0x600D)
-            + Op.RETURN(offset=0x0, size=0x1000)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
-            )
-            + Op.SSTORE(key=0xFF, value=0x600D)
-            + Op.RETURN(offset=0x5, size=0x20)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x80, value=0x1)
-            + Op.JUMPI(pc=0x1B, condition=Op.GT(Op.MLOAD(offset=0x80), 0x0))
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMP(pc=0x2B)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=0x27)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.MSTORE(offset=0x80, value=0x2)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     ; read 0x40 bytes of return data
-    #     (delegatecall 0xffffff (+ 0x1000 $4) 0 0 0x00 0x40)
-    #
-    #     [[0]] @0x00
-    #     [[1]] @0x20
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xFFFFFF,
-                    address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
-            + Op.STOP
-        ),
-        storage={0xFF: 0xBAD},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmIOandFlowOperations/test_sstore_sload.py b/tests/ported_static/VMTests/vmIOandFlowOperations/test_sstore_sload.py
deleted file mode 100644
index 6f784df4e87..00000000000
--- a/tests/ported_static/VMTests/vmIOandFlowOperations/test_sstore_sload.py
+++ /dev/null
@@ -1,152 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmIOandFlowOperations/sstore_sloadFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/VMTests/vmIOandFlowOperations/sstore_sloadFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 255, 10: 238, 20: 255}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 255, 1: 238, 2: 221, 10: 238, 20: 221}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 255, 10: 238}
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_sstore_sload(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0xFF)
-            + Op.SSTORE(key=0xA, value=0xEE)
-            + Op.SSTORE(key=0x14, value=Op.SLOAD(key=0x0))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0xFF)
-            + Op.SSTORE(key=0xA, value=0xEE)
-            + Op.SSTORE(key=0x14, value=Op.SLOAD(key=0x64))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0xFF)
-            + Op.SSTORE(key=0x1, value=0xEE)
-            + Op.SSTORE(key=0x2, value=0xDD)
-            + Op.SSTORE(key=0xA, value=Op.SLOAD(key=0x1))
-            + Op.SSTORE(key=0x14, value=Op.SLOAD(key=0x2))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0xBAD},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmLogTest/__init__.py b/tests/ported_static/VMTests/vmLogTest/__init__.py
deleted file mode 100644
index e1e9eb5dd89..00000000000
--- a/tests/ported_static/VMTests/vmLogTest/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from vmLogTest."""
diff --git a/tests/ported_static/VMTests/vmLogTest/test_log0.py b/tests/ported_static/VMTests/vmLogTest/test_log0.py
deleted file mode 100644
index beb3939869f..00000000000
--- a/tests/ported_static/VMTests/vmLogTest/test_log0.py
+++ /dev/null
@@ -1,286 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmLogTest/log0Filler.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmLogTest/log0Filler.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_log0(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.LOG0(offset=0x0, size=0x0)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG0(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=0x1,
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG0(
-                offset=0x1,
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG0(offset=0x1, size=0x0)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.LOG0(offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG0(offset=0x0, size=0x1)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG0(offset=0x1F, size=0x1)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    # Source: LLL
-    # {        ; logTwice
-    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
-    #    (log0 0 32)
-    #    (log0 2 16)
-    #    [[0]] 0x600D
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG0(offset=0x0, size=0x20)
-            + Op.LOG0(offset=0x2, size=0x10)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100a"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0xBAD},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmLogTest/test_log1.py b/tests/ported_static/VMTests/vmLogTest/test_log1.py
deleted file mode 100644
index 871c510e06e..00000000000
--- a/tests/ported_static/VMTests/vmLogTest/test_log1.py
+++ /dev/null
@@ -1,308 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmLogTest/log1Filler.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmLogTest/log1Filler.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_log1(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.LOG1(offset=0x0, size=0x0, topic_1=0x0)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG1(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=0x1,
-                topic_1=0x0,
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG1(
-                offset=0x1,
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                topic_1=0x0,
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG1(offset=0x1, size=0x0, topic_1=0x0)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.LOG1(offset=0x0, size=0x20, topic_1=0x0)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG1(offset=0x0, size=0x1, topic_1=0x0)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG1(offset=0x1F, size=0x1, topic_1=0x0)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG1(offset=0x0, size=0x20, topic_1=Op.CALLER)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001007"),  # noqa: E501
-    )
-    # Source: LLL
-    # {        ; maxTopic
-    #    (def 'neg1 (- 0 1))
-    #
-    #    (mstore8 0 0xFF)
-    #    (log1 31 1 neg1)
-    #    [[0]] 0x600D
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xFF)
-            + Op.LOG1(offset=0x1F, size=0x1, topic_1=Op.SUB(0x0, 0x1))
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001008"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0xBAD},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmLogTest/test_log2.py b/tests/ported_static/VMTests/vmLogTest/test_log2.py
deleted file mode 100644
index 8dc5072144d..00000000000
--- a/tests/ported_static/VMTests/vmLogTest/test_log2.py
+++ /dev/null
@@ -1,309 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmLogTest/log2Filler.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmLogTest/log2Filler.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_log2(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.LOG2(offset=0x0, size=0x0, topic_1=0x0, topic_2=0x0)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG2(
-                offset=Op.SUB(0x0, 0x1), size=0x1, topic_1=0x0, topic_2=0x0
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG2(
-                offset=0x1, size=Op.SUB(0x0, 0x1), topic_1=0x0, topic_2=0x0
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG2(offset=0x1, size=0x0, topic_1=0x0, topic_2=0x0)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.LOG2(offset=0x0, size=0x20, topic_1=0x0, topic_2=0x0)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG2(offset=0x0, size=0x1, topic_1=0x0, topic_2=0x0)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG2(offset=0x1F, size=0x1, topic_1=0x0, topic_2=0x0)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG2(offset=0x0, size=0x20, topic_1=0x0, topic_2=Op.CALLER)
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001007"),  # noqa: E501
-    )
-    # Source: LLL
-    # {        ; maxTopic
-    #    (def 'neg1 (- 0 1))
-    #
-    #    (mstore8 0 0xFF)
-    #    (log2 31 1 neg1 neg1)
-    #    [[0]] 0x600D
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xFF)
-            + Op.LOG2(
-                offset=0x1F,
-                size=0x1,
-                topic_1=Op.SUB(0x0, 0x1),
-                topic_2=Op.SUB(0x0, 0x1),
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001008"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0xBAD},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmLogTest/test_log3.py b/tests/ported_static/VMTests/vmLogTest/test_log3.py
deleted file mode 100644
index 8b562b1b9ea..00000000000
--- a/tests/ported_static/VMTests/vmLogTest/test_log3.py
+++ /dev/null
@@ -1,369 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmLogTest/log3Filler.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmLogTest/log3Filler.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000009",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_log3(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.LOG3(
-                offset=0x0, size=0x0, topic_1=0x0, topic_2=0x0, topic_3=0x0
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG3(
-                offset=Op.SUB(0x0, 0x1),
-                size=0x1,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG3(
-                offset=0x1,
-                size=Op.SUB(0x0, 0x1),
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG3(
-                offset=0x1, size=0x0, topic_1=0x0, topic_2=0x0, topic_3=0x0
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.LOG3(
-                offset=0x0, size=0x20, topic_1=0x0, topic_2=0x0, topic_3=0x0
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG3(
-                offset=0x0, size=0x1, topic_1=0x0, topic_2=0x0, topic_3=0x0
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG3(
-                offset=0x1F, size=0x1, topic_1=0x0, topic_2=0x0, topic_3=0x0
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG3(
-                offset=0x0,
-                size=0x20,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=Op.CALLER,
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001007"),  # noqa: E501
-    )
-    # Source: LLL
-    # {        ; maxTopic
-    #    (def 'neg1 (- 0 1))
-    #
-    #    (mstore8 0 0xFF)
-    #    (log3 31 1 neg1 neg1 neg1)
-    #    [[0]] 0x600D
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xFF)
-            + Op.LOG3(
-                offset=0x1F,
-                size=0x1,
-                topic_1=Op.SUB(0x0, 0x1),
-                topic_2=Op.SUB(0x0, 0x1),
-                topic_3=Op.SUB(0x0, 0x1),
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001008"),  # noqa: E501
-    )
-    # Source: LLL
-    # {        ; pc
-    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
-    #    (log3 31 1 (pc) (pc) (pc))
-    #    [[0]] 0x600D
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG3(
-                offset=0x1F,
-                size=0x1,
-                topic_1=Op.PC,
-                topic_2=Op.PC,
-                topic_3=Op.PC,
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001009"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0xBAD},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmLogTest/test_log4.py b/tests/ported_static/VMTests/vmLogTest/test_log4.py
deleted file mode 100644
index d8340d1db7d..00000000000
--- a/tests/ported_static/VMTests/vmLogTest/test_log4.py
+++ /dev/null
@@ -1,399 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmLogTest/log4Filler.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmLogTest/log4Filler.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2989}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000009",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 24589}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_log4(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.LOG4(
-                offset=0x0,
-                size=0x0,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-                topic_4=0x0,
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG4(
-                offset=Op.SUB(0x0, 0x1),
-                size=0x1,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-                topic_4=0x0,
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG4(
-                offset=0x1,
-                size=Op.SUB(0x0, 0x1),
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-                topic_4=0x0,
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG4(
-                offset=0x1,
-                size=0x0,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-                topic_4=0x0,
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.LOG4(
-                offset=0x0,
-                size=0x20,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-                topic_4=0x0,
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG4(
-                offset=0x0,
-                size=0x1,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-                topic_4=0x0,
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG4(
-                offset=0x1F,
-                size=0x1,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-                topic_4=0x0,
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG4(
-                offset=0x0,
-                size=0x20,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-                topic_4=Op.CALLER,
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001007"),  # noqa: E501
-    )
-    # Source: LLL
-    # {        ; maxTopic
-    #    (def 'neg1 (- 0 1))
-    #
-    #    (mstore8 0 0xFF)
-    #    (log4 31 1 neg1 neg1 neg1 neg1)
-    #    [[0]] 0x600D
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xFF)
-            + Op.LOG4(
-                offset=0x1F,
-                size=0x1,
-                topic_1=Op.SUB(0x0, 0x1),
-                topic_2=Op.SUB(0x0, 0x1),
-                topic_3=Op.SUB(0x0, 0x1),
-                topic_4=Op.SUB(0x0, 0x1),
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001008"),  # noqa: E501
-    )
-    # Source: LLL
-    # {        ; pc
-    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
-    #    (log4 31 1 (pc) (pc) (pc) (pc))
-    #    [[0]] 0x600D
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG4(
-                offset=0x1F,
-                size=0x1,
-                topic_1=Op.PC,
-                topic_2=Op.PC,
-                topic_3=Op.PC,
-                topic_4=Op.PC,
-            )
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001009"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0xBAD},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmTests/__init__.py b/tests/ported_static/VMTests/vmTests/__init__.py
deleted file mode 100644
index 59730d62829..00000000000
--- a/tests/ported_static/VMTests/vmTests/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from vmTests."""
diff --git a/tests/ported_static/VMTests/vmTests/test_block_info.py b/tests/ported_static/VMTests/vmTests/test_block_info.py
deleted file mode 100644
index ba58010dbea..00000000000
--- a/tests/ported_static/VMTests/vmTests/test_block_info.py
+++ /dev/null
@@ -1,161 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmTests/blockInfoFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmTests/blockInfoFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={0: 0x20000}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 0x5F5E100}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 1000}
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_block_info(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.COINBASE) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.PREVRANDAO) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.GASLIMIT) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.NUMBER) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.TIMESTAMP) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmTests/test_env_info.py b/tests/ported_static/VMTests/vmTests/test_env_info.py
deleted file mode 100644
index 2deed441c88..00000000000
--- a/tests/ported_static/VMTests/vmTests/test_env_info.py
+++ /dev/null
@@ -1,257 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmTests/envInfoFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmTests/envInfoFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 4096}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000009",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001005"): Account(
-                    storage={0: 16}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={
-                        0: 0x6007600060003900000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001006"): Account(
-                    storage={0: 5}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001007"): Account(
-                    storage={0: 4660}
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001008"): Account(
-                    storage={0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_env_info(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADDRESS) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x7)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x0)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.CODECOPY(
-                dest_offset=0x0,
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA,  # noqa: E501
-                size=0x8,
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.CALLER) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.CALLVALUE) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.CODESIZE) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.GASPRICE) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001007"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    [[0]] (origin)
-    # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ORIGIN) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001008"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    [[0]] (calldatasize)
-    # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.CALLDATASIZE) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001009"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #     (call 0xffffff (+ 0x1000 $4) 0x10 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x10,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        gas_price=4660,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmTests/test_random.py b/tests/ported_static/VMTests/vmTests/test_random.py
deleted file mode 100644
index 60cff84fe6e..00000000000
--- a/tests/ported_static/VMTests/vmTests/test_random.py
+++ /dev/null
@@ -1,176 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmTests/randomFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmTests/randomFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4", "case5"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_random(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xF3630C36A29EC9AF814AE38E4D48056A3368BB1435C5C2B3289763E4C77A3DF0
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=bytes.fromhex("4040459143404144809759886d608f"),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x15adfb805be4f3ee3e5c535abc860890a3a2a6c9"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.BLOCKHASH + Op.COINBASE,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x2e3b99613a2e74ebb0cd62d7b9eb38bad240cec6"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.BLOCKHASH
-            + Op.BLOCKHASH(block_number=Op.GASLIMIT)
-            + Op.COINBASE
-            + Op.GASLIMIT
-            + Op.GASLIMIT
-            + Op.CODECOPY(
-                dest_offset=Op.CALLVALUE,
-                offset=Op.COINBASE,
-                size=Op.PREVRANDAO,
-            )
-            + Op.SELFDESTRUCT(address=Op.DUP8)
-            + Op.CALLDATACOPY
-            + Op.CALLDATALOAD
-            + Op.SSTORE(key=Op.ADDRESS, value=Op.DIV)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x3412d3ebac3fcacfb451708aef7cc8e5bf1e5261"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x10000000000000)
-    pre.deploy_contract(
-        code=(
-            Op.NUMBER
-            + Op.NUMBER
-            + Op.TIMESTAMP
-            + Op.PREVRANDAO
-            + Op.TIMESTAMP
-            + Op.PREVRANDAO
-            + Op.GASLIMIT
-            + Op.GASLIMIT
-            + Op.SWAP8
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x66b8dba513dc25f967ef7e84306616c0071cccae"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #     (call (gas) (+ 0x1000 $4) 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=Op.GAS,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xa83db56c7ce68c06129b80c7be0d0f5e0869d536"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=bytes.fromhex("65424555"),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xacd000f275b1a28d0c3b7dee7f114c4d28fb1636"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=bytes.fromhex("7745414245403745f31387900a8d55"),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xdfe69e96fb3aafde261565670b1fea29869c6950"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmTests/test_sha3.py b/tests/ported_static/VMTests/vmTests/test_sha3.py
deleted file mode 100644
index ba6b4b0b838..00000000000
--- a/tests/ported_static/VMTests/vmTests/test_sha3.py
+++ /dev/null
@@ -1,432 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmTests/sha3Filler.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmTests/sha3Filler.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={
-                        0: 0xBE6F1B42B34644F918560A07F959D23E532DEA5338E4B9F63DB0CAEB608018FA  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000f",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100f"): Account(
-                    storage={
-                        0: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100b"): Account(
-                    storage={
-                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100c"): Account(
-                    storage={
-                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000d",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100d"): Account(
-                    storage={
-                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000e",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100e"): Account(
-                    storage={
-                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000009",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001009"): Account(
-                    storage={
-                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000100a"): Account(
-                    storage={
-                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={
-                        0: 0xC41589E7559804EA4A2080DAD19D876A024CCB05117835447D72CE08C1D020EC  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={
-                        0: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={
-                        0: 0x6BD2DD6BD408CBEE33429358BF24FDC64612FBF8B1B4DB604518F40FFD34B607  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_sha3(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x0, size=0x0)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x4, size=0x5)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0xA, size=0xA)) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x3E8, size=0xFFFFF))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SHA3(offset=0xFFFFFFFFF, size=0x64))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x2710, size=0xFFFFFFFFF))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SHA3(
-                    offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SHA3(
-                    offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    size=0x2,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001007"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #     [[0]] (sha3 0x1000000 2)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x1000000, size=0x2))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001008"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   [[ 0 ]] (sha3 960 1)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x3C0, size=0x1)) + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001009"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   [[ 0 ]] (sha3 992 1)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x3E0, size=0x1)) + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100a"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   [[ 0 ]] (sha3 1024 1)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x400, size=0x1)) + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100b"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   [[ 0 ]] (sha3 1984 1)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x7C0, size=0x1)) + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100c"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   [[ 0 ]] (sha3 2016 1)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x7E0, size=0x1)) + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100d"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   [[ 0 ]] (sha3 2048 1)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x800, size=0x1)) + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100e"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   [[ 0 ]] (sha3 1024 0)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x400, size=0x0)) + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000100f"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x7E0, size=0x20))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001010"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
-    # {
-    #     (call (- 0 1) (+ 0x1000 $4) 0
-    #        0x0F 0x10   ; arg offset and length to get the 0x1234...f0 value
-    #        0x20 0x40)  ; return offset and length
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=Op.SUB(0x0, 0x1),
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0xF,
-                args_size=0x10,
-                ret_offset=0x20,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmTests/test_suicide.py b/tests/ported_static/VMTests/vmTests/test_suicide.py
deleted file mode 100644
index 1f343be3702..00000000000
--- a/tests/ported_static/VMTests/vmTests/test_suicide.py
+++ /dev/null
@@ -1,120 +0,0 @@
-"""
-Ori Pomerantz qbzzt1@gmail.com.
-
-Ported from:
-tests/static/state_tests/VMTests/vmTests/suicideFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmTests/suicideFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001002",  # noqa: E501
-            {},
-        ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000001001",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=["case0", "case1", "case2"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_suicide(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=Op.CALLER) + Op.STOP,
-        balance=0xFF000000000000,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=0xDEAD) + Op.STOP,
-        balance=0x100000000000,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=Op.ADDRESS) + Op.STOP,
-        balance=0x100000000000,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x5AF3107A4000)
-    # Source: LLL
-    # {
-    #    (call (gas) $4 0 0 0 0 0)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=Op.GAS,
-                address=Op.CALLDATALOAD(offset=0x4),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0x100000000000,
-        nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/__init__.py b/tests/ported_static/__init__.py
deleted file mode 100644
index 8dd614f2fa5..00000000000
--- a/tests/ported_static/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from ported_tests_v5."""
diff --git a/tests/ported_static/stArgsZeroOneBalance/__init__.py b/tests/ported_static/stArgsZeroOneBalance/__init__.py
index 5b491a6262e..a45793d03c8 100644
--- a/tests/ported_static/stArgsZeroOneBalance/__init__.py
+++ b/tests/ported_static/stArgsZeroOneBalance/__init__.py
@@ -1 +1 @@
-"""Tests ported from stArgsZeroOneBalance."""
+"""Ported static tests: stArgsZeroOneBalance."""  # noqa: N999
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_add_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_add_non_const.py
index c6b8329fce0..0a24f5ffbc1 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_add_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_add_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_add_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/addNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/addNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,36 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/addNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/addNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0xf1722fe346fa35e045de07e47cf6af9bae8ade0a"): Account(
-                    storage={0: 2}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_add_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_add_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -62,35 +68,49 @@ def test_add_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](ADD (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.ADD(
-                    Op.BALANCE(
-                        address=0xF1722FE346FA35E045DE07E47CF6AF9BAE8ADE0A
-                    ),
-                    Op.BALANCE(
-                        address=0xF1722FE346FA35E045DE07E47CF6AF9BAE8ADE0A
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.ADD(
+                Op.BALANCE(address=0xF1722FE346FA35E045DE07E47CF6AF9BAE8ADE0A),
+                Op.BALANCE(address=0xF1722FE346FA35E045DE07E47CF6AF9BAE8ADE0A),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf1722fe346fa35e045de07e47cf6af9bae8ade0a"),  # noqa: E501
+        address=Address(0xF1722FE346FA35E045DE07E47CF6AF9BAE8ADE0A),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 2})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_addmod_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_addmod_non_const.py
index 51acd3ce21e..fae816dfd1e 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_addmod_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_addmod_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_addmod_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/addmodNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/addmodNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/addmodNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/addmodNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_addmod_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_addmod_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,38 +68,50 @@ def test_addmod_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](ADDMOD (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.ADDMOD(
-                    Op.BALANCE(
-                        address=0x92D2FC80312ACD8C37857696D2224AF18CE6F966
-                    ),
-                    Op.BALANCE(
-                        address=0x92D2FC80312ACD8C37857696D2224AF18CE6F966
-                    ),
-                    Op.BALANCE(
-                        address=0x92D2FC80312ACD8C37857696D2224AF18CE6F966
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.ADDMOD(
+                Op.BALANCE(address=0x92D2FC80312ACD8C37857696D2224AF18CE6F966),
+                Op.BALANCE(address=0x92D2FC80312ACD8C37857696D2224AF18CE6F966),
+                Op.BALANCE(address=0x92D2FC80312ACD8C37857696D2224AF18CE6F966),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x92d2fc80312acd8c37857696d2224af18ce6f966"),  # noqa: E501
+        address=Address(0x92D2FC80312ACD8C37857696D2224AF18CE6F966),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_and_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_and_non_const.py
index d9d2108d1a3..8eb6f763863 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_and_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_and_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_and_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/andNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/andNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,36 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/andNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/andNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x4c26357e0d164b702bceb18690fc742ee1d36913"): Account(
-                    storage={0: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_and_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_and_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -62,35 +68,49 @@ def test_and_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](AND (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.AND(
-                    Op.BALANCE(
-                        address=0x4C26357E0D164B702BCEB18690FC742EE1D36913
-                    ),
-                    Op.BALANCE(
-                        address=0x4C26357E0D164B702BCEB18690FC742EE1D36913
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.AND(
+                Op.BALANCE(address=0x4C26357E0D164B702BCEB18690FC742EE1D36913),
+                Op.BALANCE(address=0x4C26357E0D164B702BCEB18690FC742EE1D36913),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x4c26357e0d164b702bceb18690fc742ee1d36913"),  # noqa: E501
+        address=Address(0x4C26357E0D164B702BCEB18690FC742EE1D36913),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_balance_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_balance_non_const.py
index 495b5b4d721..ae940bbaa03 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_balance_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_balance_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_balance_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/balanceNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/balanceNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stArgsZeroOneBalance/balanceNonConstFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stArgsZeroOneBalance/balanceNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_balance_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_balance_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,32 +68,50 @@ def test_balance_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](BALANCE (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.BALANCE(
-                    address=Op.BALANCE(
-                        address=0xEE6A324B2ECE5EACDF881ABFDCC62B5361D0FB50,
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.BALANCE(
+                address=Op.BALANCE(
+                    address=0xEE6A324B2ECE5EACDF881ABFDCC62B5361D0FB50
+                )
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xee6a324b2ece5eacdf881abfdcc62b5361d0fb50"),  # noqa: E501
+        address=Address(0xEE6A324B2ECE5EACDF881ABFDCC62B5361D0FB50),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_byte_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_byte_non_const.py
index 1e9b33cc893..544001d697d 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_byte_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_byte_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_byte_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/byteNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/byteNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/byteNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/byteNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_byte_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_byte_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,35 +68,49 @@ def test_byte_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](BYTE (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.BYTE(
-                    Op.BALANCE(
-                        address=0x86D606901085BA78C64D2E0B16831E6AFD89DE2D
-                    ),
-                    Op.BALANCE(
-                        address=0x86D606901085BA78C64D2E0B16831E6AFD89DE2D
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.BYTE(
+                Op.BALANCE(address=0x86D606901085BA78C64D2E0B16831E6AFD89DE2D),
+                Op.BALANCE(address=0x86D606901085BA78C64D2E0B16831E6AFD89DE2D),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x86d606901085ba78c64d2e0b16831e6afd89de2d"),  # noqa: E501
+        address=Address(0x86D606901085BA78C64D2E0B16831E6AFD89DE2D),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_call_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_call_non_const.py
index 1814b462807..a8e915e499a 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_call_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_call_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_call_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/callNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/callNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,36 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/callNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/callNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
+            0,
             0,
-            {
-                Address("0x7d7e1645af7df916da558f0695e9dedd23b1215e"): Account(
-                    storage={0: 1}
-                )
-            },
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
         ),
-        (1, {}),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_call_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_call_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -62,50 +68,68 @@ def test_call_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (CALL (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.BALANCE(
-                        address=0x7D7E1645AF7DF916DA558F0695E9DEDD23B1215E,
-                    ),
-                    address=Op.BALANCE(
-                        address=0x7D7E1645AF7DF916DA558F0695E9DEDD23B1215E,
-                    ),
-                    value=Op.BALANCE(
-                        address=0x7D7E1645AF7DF916DA558F0695E9DEDD23B1215E,
-                    ),
-                    args_offset=Op.BALANCE(
-                        address=0x7D7E1645AF7DF916DA558F0695E9DEDD23B1215E,
-                    ),
-                    args_size=Op.BALANCE(
-                        address=0x7D7E1645AF7DF916DA558F0695E9DEDD23B1215E,
-                    ),
-                    ret_offset=Op.BALANCE(
-                        address=0x7D7E1645AF7DF916DA558F0695E9DEDD23B1215E,
-                    ),
-                    ret_size=Op.BALANCE(
-                        address=0x7D7E1645AF7DF916DA558F0695E9DEDD23B1215E,
-                    ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.BALANCE(
+                    address=0x7D7E1645AF7DF916DA558F0695E9DEDD23B1215E
                 ),
-            )
-            + Op.STOP
-        ),
+                address=Op.BALANCE(
+                    address=0x7D7E1645AF7DF916DA558F0695E9DEDD23B1215E
+                ),
+                value=Op.BALANCE(
+                    address=0x7D7E1645AF7DF916DA558F0695E9DEDD23B1215E
+                ),
+                args_offset=Op.BALANCE(
+                    address=0x7D7E1645AF7DF916DA558F0695E9DEDD23B1215E
+                ),
+                args_size=Op.BALANCE(
+                    address=0x7D7E1645AF7DF916DA558F0695E9DEDD23B1215E
+                ),
+                ret_offset=Op.BALANCE(
+                    address=0x7D7E1645AF7DF916DA558F0695E9DEDD23B1215E
+                ),
+                ret_size=Op.BALANCE(
+                    address=0x7D7E1645AF7DF916DA558F0695E9DEDD23B1215E
+                ),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x7d7e1645af7df916da558f0695e9dedd23b1215e"),  # noqa: E501
+        address=Address(0x7D7E1645AF7DF916DA558F0695E9DEDD23B1215E),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_callcode_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_callcode_non_const.py
index 0aa7be477ff..e24b3d5f963 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_callcode_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_callcode_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_callcode_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/callcodeNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/callcodeNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,38 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stArgsZeroOneBalance/callcodeNonConstFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stArgsZeroOneBalance/callcodeNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
+            0,
             0,
-            {
-                Address("0x443a994e18105c3ea686d3931729a1ac3d8fdd93"): Account(
-                    storage={0: 1}
-                )
-            },
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
         ),
-        (1, {}),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_callcode_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_callcode_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -64,50 +68,68 @@ def test_callcode_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (CALLCODE (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=Op.BALANCE(
-                        address=0x443A994E18105C3EA686D3931729A1AC3D8FDD93,
-                    ),
-                    address=Op.BALANCE(
-                        address=0x443A994E18105C3EA686D3931729A1AC3D8FDD93,
-                    ),
-                    value=Op.BALANCE(
-                        address=0x443A994E18105C3EA686D3931729A1AC3D8FDD93,
-                    ),
-                    args_offset=Op.BALANCE(
-                        address=0x443A994E18105C3EA686D3931729A1AC3D8FDD93,
-                    ),
-                    args_size=Op.BALANCE(
-                        address=0x443A994E18105C3EA686D3931729A1AC3D8FDD93,
-                    ),
-                    ret_offset=Op.BALANCE(
-                        address=0x443A994E18105C3EA686D3931729A1AC3D8FDD93,
-                    ),
-                    ret_size=Op.BALANCE(
-                        address=0x443A994E18105C3EA686D3931729A1AC3D8FDD93,
-                    ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=Op.BALANCE(
+                    address=0x443A994E18105C3EA686D3931729A1AC3D8FDD93
                 ),
-            )
-            + Op.STOP
-        ),
+                address=Op.BALANCE(
+                    address=0x443A994E18105C3EA686D3931729A1AC3D8FDD93
+                ),
+                value=Op.BALANCE(
+                    address=0x443A994E18105C3EA686D3931729A1AC3D8FDD93
+                ),
+                args_offset=Op.BALANCE(
+                    address=0x443A994E18105C3EA686D3931729A1AC3D8FDD93
+                ),
+                args_size=Op.BALANCE(
+                    address=0x443A994E18105C3EA686D3931729A1AC3D8FDD93
+                ),
+                ret_offset=Op.BALANCE(
+                    address=0x443A994E18105C3EA686D3931729A1AC3D8FDD93
+                ),
+                ret_size=Op.BALANCE(
+                    address=0x443A994E18105C3EA686D3931729A1AC3D8FDD93
+                ),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x443a994e18105c3ea686d3931729a1ac3d8fdd93"),  # noqa: E501
+        address=Address(0x443A994E18105C3EA686D3931729A1AC3D8FDD93),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_calldatacopy_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_calldatacopy_non_const.py
index 44c9553e358..9a0b8f9f9c2 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_calldatacopy_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_calldatacopy_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_calldatacopy_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/calldatacopyNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/calldatacopyNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,34 +26,50 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stArgsZeroOneBalance/calldatacopyNonConstFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stArgsZeroOneBalance/calldatacopyNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_value, expected_post",
+    "d, g, v",
     [
-        ("", 0, {}),
-        ("", 1, {}),
-        ("11223344", 0, {}),
-        ("11223344", 1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="d0-v1",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-v0",
+        ),
+        pytest.param(
+            1,
+            0,
+            1,
+            id="d1-v1",
+        ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_calldatacopy_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_calldatacopy_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -60,38 +80,54 @@ def test_calldatacopy_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (CALLDATACOPY (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATACOPY(
-                dest_offset=Op.BALANCE(
-                    address=0x444C2681920E1105C9104FB32249DDBB41CBA4A0,
-                ),
-                offset=Op.BALANCE(
-                    address=0x444C2681920E1105C9104FB32249DDBB41CBA4A0,
-                ),
-                size=Op.BALANCE(
-                    address=0x444C2681920E1105C9104FB32249DDBB41CBA4A0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATACOPY(
+            dest_offset=Op.BALANCE(
+                address=0x444C2681920E1105C9104FB32249DDBB41CBA4A0
+            ),
+            offset=Op.BALANCE(
+                address=0x444C2681920E1105C9104FB32249DDBB41CBA4A0
+            ),
+            size=Op.BALANCE(
+                address=0x444C2681920E1105C9104FB32249DDBB41CBA4A0
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x444c2681920e1105c9104fb32249ddbb41cba4a0"),  # noqa: E501
+        address=Address(0x444C2681920E1105C9104FB32249DDBB41CBA4A0),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+        Bytes("11223344"),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_calldataload_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_calldataload_non_const.py
index 730861ab2da..dc0f8b82b2e 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_calldataload_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_calldataload_non_const.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_calldataload_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/calldataloadNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/calldataloadNonConstFiller.yml
 """
 
 import pytest
@@ -11,10 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,51 +27,49 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stArgsZeroOneBalance/calldataloadNonConstFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stArgsZeroOneBalance/calldataloadNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_value, expected_post",
+    "d, g, v",
     [
-        ("", 0, {}),
-        ("", 1, {}),
-        (
-            "11223344",
+        pytest.param(
             0,
-            {
-                Address("0x148f97630d3668441f1a33a5e509f268b64f998f"): Account(
-                    storage={
-                        0: 0x1122334400000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+            0,
+            0,
+            id="d0-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="d0-v1",
         ),
-        (
-            "11223344",
+        pytest.param(
             1,
-            {
-                Address("0x148f97630d3668441f1a33a5e509f268b64f998f"): Account(
-                    storage={
-                        0: 0x2233440000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+            0,
+            0,
+            id="d1-v0",
+        ),
+        pytest.param(
+            1,
+            0,
+            1,
+            id="d1-v1",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_calldataload_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_calldataload_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -80,35 +83,74 @@ def test_calldataload_non_const(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { [[ 0 ]](CALLDATALOAD (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLDATALOAD(
-                    offset=Op.BALANCE(
-                        address=0x148F97630D3668441F1A33A5E509F268B64F998F,
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLDATALOAD(
+                offset=Op.BALANCE(
+                    address=0x148F97630D3668441F1A33A5E509F268B64F998F
+                )
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x148f97630d3668441f1a33a5e509f268b64f998f"),  # noqa: E501
+        address=Address(0x148F97630D3668441F1A33A5E509F268B64F998F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0x1122334400000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0x2233440000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+        Bytes("11223344"),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_codecopy_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_codecopy_non_const.py
index ef0ed8f84fb..c097c5f467e 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_codecopy_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_codecopy_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_codecopy_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/codecopyNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/codecopyNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stArgsZeroOneBalance/codecopyNonConstFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stArgsZeroOneBalance/codecopyNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_codecopy_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_codecopy_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,35 +68,53 @@ def test_codecopy_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (CODECOPY (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CODECOPY(
-                dest_offset=Op.BALANCE(
-                    address=0xEDD4D7CDACB700CA3E28F8DDBCFB6AAC31F64925,
-                ),
-                offset=Op.BALANCE(
-                    address=0xEDD4D7CDACB700CA3E28F8DDBCFB6AAC31F64925,
-                ),
-                size=Op.BALANCE(
-                    address=0xEDD4D7CDACB700CA3E28F8DDBCFB6AAC31F64925,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CODECOPY(
+            dest_offset=Op.BALANCE(
+                address=0xEDD4D7CDACB700CA3E28F8DDBCFB6AAC31F64925
+            ),
+            offset=Op.BALANCE(
+                address=0xEDD4D7CDACB700CA3E28F8DDBCFB6AAC31F64925
+            ),
+            size=Op.BALANCE(
+                address=0xEDD4D7CDACB700CA3E28F8DDBCFB6AAC31F64925
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xedd4d7cdacb700ca3e28f8ddbcfb6aac31f64925"),  # noqa: E501
+        address=Address(0xEDD4D7CDACB700CA3E28F8DDBCFB6AAC31F64925),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_create_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_create_non_const.py
index f697a28e8b9..5106ec78a51 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_create_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_create_non_const.py
@@ -1,19 +1,24 @@
 """
-Test ported from static filler.
+Test_create_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/createNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/createNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,43 +27,39 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/createNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/createNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
             0,
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 0xD2571607E241ECF590ED94B12D87C94BABE36DB6}
-                )
-            },
+            0,
+            0,
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 0xD2571607E241ECF590ED94B12D87C94BABE36DB6}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -69,38 +70,68 @@ def test_create_non_const(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (CREATE (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(
-                    value=Op.BALANCE(
-                        address=0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87,
-                    ),
-                    offset=Op.BALANCE(
-                        address=0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87,
-                    ),
-                    size=Op.BALANCE(
-                        address=0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87,
-                    ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE(
+                value=Op.BALANCE(
+                    address=0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87
                 ),
-            )
-            + Op.STOP
-        ),
+                offset=Op.BALANCE(
+                    address=0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87
+                ),
+                size=Op.BALANCE(
+                    address=0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87
+                ),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={
+                        0: compute_create_address(address=contract_0, nonce=0),
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={
+                        0: compute_create_address(address=contract_0, nonce=0),
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_delegatecall_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_delegatecall_non_const.py
index 17a664dd254..2fc22d2747d 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_delegatecall_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_delegatecall_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_delegatecall_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/delegatecallNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/delegatecallNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,38 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stArgsZeroOneBalance/delegatecallNonConstFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stArgsZeroOneBalance/delegatecallNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
+            0,
             0,
-            {
-                Address("0x365aae42316e918da716d904fe31eea4134112c4"): Account(
-                    storage={0: 1}
-                )
-            },
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
         ),
-        (1, {}),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_delegatecall_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_delegatecall_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -64,47 +68,65 @@ def test_delegatecall_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (DELEGATECALL (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=Op.BALANCE(
-                        address=0x365AAE42316E918DA716D904FE31EEA4134112C4,
-                    ),
-                    address=Op.BALANCE(
-                        address=0x365AAE42316E918DA716D904FE31EEA4134112C4,
-                    ),
-                    args_offset=Op.BALANCE(
-                        address=0x365AAE42316E918DA716D904FE31EEA4134112C4,
-                    ),
-                    args_size=Op.BALANCE(
-                        address=0x365AAE42316E918DA716D904FE31EEA4134112C4,
-                    ),
-                    ret_offset=Op.BALANCE(
-                        address=0x365AAE42316E918DA716D904FE31EEA4134112C4,
-                    ),
-                    ret_size=Op.BALANCE(
-                        address=0x365AAE42316E918DA716D904FE31EEA4134112C4,
-                    ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=Op.BALANCE(
+                    address=0x365AAE42316E918DA716D904FE31EEA4134112C4
                 ),
-            )
-            + Op.STOP
-        ),
+                address=Op.BALANCE(
+                    address=0x365AAE42316E918DA716D904FE31EEA4134112C4
+                ),
+                args_offset=Op.BALANCE(
+                    address=0x365AAE42316E918DA716D904FE31EEA4134112C4
+                ),
+                args_size=Op.BALANCE(
+                    address=0x365AAE42316E918DA716D904FE31EEA4134112C4
+                ),
+                ret_offset=Op.BALANCE(
+                    address=0x365AAE42316E918DA716D904FE31EEA4134112C4
+                ),
+                ret_size=Op.BALANCE(
+                    address=0x365AAE42316E918DA716D904FE31EEA4134112C4
+                ),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x365aae42316e918da716d904fe31eea4134112c4"),  # noqa: E501
+        address=Address(0x365AAE42316E918DA716D904FE31EEA4134112C4),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_div_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_div_non_const.py
index 0e2f29b3c77..754da2814ab 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_div_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_div_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_div_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/divNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/divNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,36 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/divNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/divNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x61fd7e3e20ceea9426c3021f589e9eb7754d486f"): Account(
-                    storage={0: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_div_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_div_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -62,35 +68,49 @@ def test_div_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](DIV (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DIV(
-                    Op.BALANCE(
-                        address=0x61FD7E3E20CEEA9426C3021F589E9EB7754D486F
-                    ),
-                    Op.BALANCE(
-                        address=0x61FD7E3E20CEEA9426C3021F589E9EB7754D486F
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DIV(
+                Op.BALANCE(address=0x61FD7E3E20CEEA9426C3021F589E9EB7754D486F),
+                Op.BALANCE(address=0x61FD7E3E20CEEA9426C3021F589E9EB7754D486F),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x61fd7e3e20ceea9426c3021f589e9eb7754d486f"),  # noqa: E501
+        address=Address(0x61FD7E3E20CEEA9426C3021F589E9EB7754D486F),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_eq_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_eq_non_const.py
index 7d3c9bf0ace..09c30fc9052 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_eq_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_eq_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_eq_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/eqNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/eqNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,43 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/eqNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/eqNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
+            0,
             0,
-            {
-                Address("0x197f978175cea58c57cfab837cf028d4c8d12ef3"): Account(
-                    storage={0: 1}
-                )
-            },
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x197f978175cea58c57cfab837cf028d4c8d12ef3"): Account(
-                    storage={0: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_eq_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_eq_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -69,35 +68,49 @@ def test_eq_non_const(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](EQ (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.EQ(
-                    Op.BALANCE(
-                        address=0x197F978175CEA58C57CFAB837CF028D4C8D12EF3
-                    ),
-                    Op.BALANCE(
-                        address=0x197F978175CEA58C57CFAB837CF028D4C8D12EF3
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.EQ(
+                Op.BALANCE(address=0x197F978175CEA58C57CFAB837CF028D4C8D12EF3),
+                Op.BALANCE(address=0x197F978175CEA58C57CFAB837CF028D4C8D12EF3),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x197f978175cea58c57cfab837cf028d4c8d12ef3"),  # noqa: E501
+        address=Address(0x197F978175CEA58C57CFAB837CF028D4C8D12EF3),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_exp_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_exp_non_const.py
index 23683dbbfab..72f6aace5a0 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_exp_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_exp_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_exp_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/expNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/expNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,43 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/expNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/expNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
+            0,
             0,
-            {
-                Address("0xcfcd07426079da1457676de53f8dbe738c832d7f"): Account(
-                    storage={0: 1}
-                )
-            },
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0xcfcd07426079da1457676de53f8dbe738c832d7f"): Account(
-                    storage={0: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_exp_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_exp_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -69,35 +68,49 @@ def test_exp_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](EXP (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.EXP(
-                    Op.BALANCE(
-                        address=0xCFCD07426079DA1457676DE53F8DBE738C832D7F
-                    ),
-                    Op.BALANCE(
-                        address=0xCFCD07426079DA1457676DE53F8DBE738C832D7F
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.EXP(
+                Op.BALANCE(address=0xCFCD07426079DA1457676DE53F8DBE738C832D7F),
+                Op.BALANCE(address=0xCFCD07426079DA1457676DE53F8DBE738C832D7F),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xcfcd07426079da1457676de53f8dbe738c832d7f"),  # noqa: E501
+        address=Address(0xCFCD07426079DA1457676DE53F8DBE738C832D7F),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_extcodecopy_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_extcodecopy_non_const.py
index 4af53b47e98..1b0cd7e9c8c 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_extcodecopy_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_extcodecopy_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_extcodecopy_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/extcodecopyNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/extcodecopyNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stArgsZeroOneBalance/extcodecopyNonConstFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stArgsZeroOneBalance/extcodecopyNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_extcodecopy_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_extcodecopy_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,38 +68,56 @@ def test_extcodecopy_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (EXTCODECOPY (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.EXTCODECOPY(
-                address=Op.BALANCE(
-                    address=0xF7A7FBF01DBCFEFDFD9AE65E4892C576994F31BF,
-                ),
-                dest_offset=Op.BALANCE(
-                    address=0xF7A7FBF01DBCFEFDFD9AE65E4892C576994F31BF,
-                ),
-                offset=Op.BALANCE(
-                    address=0xF7A7FBF01DBCFEFDFD9AE65E4892C576994F31BF,
-                ),
-                size=Op.BALANCE(
-                    address=0xF7A7FBF01DBCFEFDFD9AE65E4892C576994F31BF,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.EXTCODECOPY(
+            address=Op.BALANCE(
+                address=0xF7A7FBF01DBCFEFDFD9AE65E4892C576994F31BF
+            ),
+            dest_offset=Op.BALANCE(
+                address=0xF7A7FBF01DBCFEFDFD9AE65E4892C576994F31BF
+            ),
+            offset=Op.BALANCE(
+                address=0xF7A7FBF01DBCFEFDFD9AE65E4892C576994F31BF
+            ),
+            size=Op.BALANCE(
+                address=0xF7A7FBF01DBCFEFDFD9AE65E4892C576994F31BF
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf7a7fbf01dbcfefdfd9ae65e4892c576994f31bf"),  # noqa: E501
+        address=Address(0xF7A7FBF01DBCFEFDFD9AE65E4892C576994F31BF),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_extcodesize_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_extcodesize_non_const.py
index aab0b762066..e67e53ea57c 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_extcodesize_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_extcodesize_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_extcodesize_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/extcodesizeNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/extcodesizeNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stArgsZeroOneBalance/extcodesizeNonConstFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stArgsZeroOneBalance/extcodesizeNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_extcodesize_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_extcodesize_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,32 +68,50 @@ def test_extcodesize_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](EXTCODESIZE (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.EXTCODESIZE(
-                    address=Op.BALANCE(
-                        address=0x4CD5F424AC9E070C2A651452C5666CF8A05F27A7,
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.EXTCODESIZE(
+                address=Op.BALANCE(
+                    address=0x4CD5F424AC9E070C2A651452C5666CF8A05F27A7
+                )
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x4cd5f424ac9e070c2a651452c5666cf8a05f27a7"),  # noqa: E501
+        address=Address(0x4CD5F424AC9E070C2A651452C5666CF8A05F27A7),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_gt_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_gt_non_const.py
index b5da12e0e5f..d8db68a6f82 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_gt_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_gt_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_gt_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/gtNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/gtNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/gtNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/gtNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_gt_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_gt_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,35 +68,49 @@ def test_gt_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](GT (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.GT(
-                    Op.BALANCE(
-                        address=0xF5176EDE711CCF689D689BFCEBDAE4C04910517E
-                    ),
-                    Op.BALANCE(
-                        address=0xF5176EDE711CCF689D689BFCEBDAE4C04910517E
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.GT(
+                Op.BALANCE(address=0xF5176EDE711CCF689D689BFCEBDAE4C04910517E),
+                Op.BALANCE(address=0xF5176EDE711CCF689D689BFCEBDAE4C04910517E),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf5176ede711ccf689d689bfcebdae4c04910517e"),  # noqa: E501
+        address=Address(0xF5176EDE711CCF689D689BFCEBDAE4C04910517E),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_iszero_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_iszero_non_const.py
index 04fcc30eca3..dc4585cd190 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_iszero_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_iszero_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_iszero_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/iszeroNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/iszeroNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,36 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/iszeroNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/iszeroNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
             0,
-            {
-                Address("0x2623813a00dfdc5bc378481671d8d9e38ad9956c"): Account(
-                    storage={0: 1}
-                )
-            },
+            1,
+            id="-v1",
         ),
-        (1, {}),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_iszero_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_iszero_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -62,32 +68,48 @@ def test_iszero_non_const(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](ISZERO (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.ISZERO(
-                    Op.BALANCE(
-                        address=0x2623813A00DFDC5BC378481671D8D9E38AD9956C
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.ISZERO(
+                Op.BALANCE(address=0x2623813A00DFDC5BC378481671D8D9E38AD9956C)
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2623813a00dfdc5bc378481671d8d9e38ad9956c"),  # noqa: E501
+        address=Address(0x2623813A00DFDC5BC378481671D8D9E38AD9956C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_jump_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_jump_non_const.py
index f071fef50c4..a7a6d0ed8b7 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_jump_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_jump_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_jump_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/jumpNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/jumpNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,28 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/jumpNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/jumpNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value",
+    "d, g, v",
     [
-        0,
-        1,
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_jump_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_jump_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -54,29 +68,45 @@ def test_jump_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (JUMP (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMP(
-                pc=Op.BALANCE(
-                    address=0xA82AE24D0D34B26FCB664DACD3E18371C9315E79
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMP(
+            pc=Op.BALANCE(address=0xA82AE24D0D34B26FCB664DACD3E18371C9315E79)
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa82ae24d0d34b26fcb664dacd3e18371c9315e79"),  # noqa: E501
+        address=Address(0xA82AE24D0D34B26FCB664DACD3E18371C9315E79),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post: dict = {}
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_jumpi_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_jumpi_non_const.py
index 5d6d43568dc..8ad626d763f 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_jumpi_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_jumpi_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_jumpi_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/jumpiNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/jumpiNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/jumpiNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/jumpiNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_jumpi_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_jumpi_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,32 +68,48 @@ def test_jumpi_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (JUMPI (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=Op.BALANCE(
-                    address=0xEEF87925C20B97E4EE58E24DD39D7C09785362BA
-                ),
-                condition=Op.BALANCE(
-                    address=0xEEF87925C20B97E4EE58E24DD39D7C09785362BA,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=Op.BALANCE(address=0xEEF87925C20B97E4EE58E24DD39D7C09785362BA),
+            condition=Op.BALANCE(
+                address=0xEEF87925C20B97E4EE58E24DD39D7C09785362BA
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xeef87925c20b97e4ee58e24dd39d7c09785362ba"),  # noqa: E501
+        address=Address(0xEEF87925C20B97E4EE58E24DD39D7C09785362BA),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_log0_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_log0_non_const.py
index 7a654bd4c68..365c39eaccf 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_log0_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_log0_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_log0_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/log0NonConstFiller.yml
+state_tests/stArgsZeroOneBalance/log0NonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/log0NonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/log0NonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_log0_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_log0_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,32 +68,50 @@ def test_log0_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (LOG0 (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.LOG0(
-                offset=Op.BALANCE(
-                    address=0x39332A3856E9E6DBAEBCDBD67B72B3E7209FFCB2,
-                ),
-                size=Op.BALANCE(
-                    address=0x39332A3856E9E6DBAEBCDBD67B72B3E7209FFCB2,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG0(
+            offset=Op.BALANCE(
+                address=0x39332A3856E9E6DBAEBCDBD67B72B3E7209FFCB2
+            ),
+            size=Op.BALANCE(
+                address=0x39332A3856E9E6DBAEBCDBD67B72B3E7209FFCB2
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x39332a3856e9e6dbaebcdbd67b72b3e7209ffcb2"),  # noqa: E501
+        address=Address(0x39332A3856E9E6DBAEBCDBD67B72B3E7209FFCB2),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_log1_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_log1_non_const.py
index e30c28acec2..83826d6f6b3 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_log1_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_log1_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_log1_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/log1NonConstFiller.yml
+state_tests/stArgsZeroOneBalance/log1NonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/log1NonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/log1NonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_log1_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_log1_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,35 +68,53 @@ def test_log1_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (LOG1 (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.LOG1(
-                offset=Op.BALANCE(
-                    address=0x99914055ED765EA48582ACC6C8196D07835DA7D7,
-                ),
-                size=Op.BALANCE(
-                    address=0x99914055ED765EA48582ACC6C8196D07835DA7D7,
-                ),
-                topic_1=Op.BALANCE(
-                    address=0x99914055ED765EA48582ACC6C8196D07835DA7D7,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG1(
+            offset=Op.BALANCE(
+                address=0x99914055ED765EA48582ACC6C8196D07835DA7D7
+            ),
+            size=Op.BALANCE(
+                address=0x99914055ED765EA48582ACC6C8196D07835DA7D7
+            ),
+            topic_1=Op.BALANCE(
+                address=0x99914055ED765EA48582ACC6C8196D07835DA7D7
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x99914055ed765ea48582acc6c8196d07835da7d7"),  # noqa: E501
+        address=Address(0x99914055ED765EA48582ACC6C8196D07835DA7D7),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_log2_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_log2_non_const.py
index 3025fafb7d6..418cb6e8be0 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_log2_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_log2_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_log2_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/log2NonConstFiller.yml
+state_tests/stArgsZeroOneBalance/log2NonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/log2NonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/log2NonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_log2_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_log2_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,38 +68,54 @@ def test_log2_non_const(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (LOG2 (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.LOG2(
-                offset=Op.BALANCE(
-                    address=0x7631BF0FC6669FE93C41401498B2612BBF41CF,
-                ),
-                size=Op.BALANCE(
-                    address=0x7631BF0FC6669FE93C41401498B2612BBF41CF
-                ),
-                topic_1=Op.BALANCE(
-                    address=0x7631BF0FC6669FE93C41401498B2612BBF41CF,
-                ),
-                topic_2=Op.BALANCE(
-                    address=0x7631BF0FC6669FE93C41401498B2612BBF41CF,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG2(
+            offset=Op.BALANCE(
+                address=0x7631BF0FC6669FE93C41401498B2612BBF41CF
+            ),
+            size=Op.BALANCE(address=0x7631BF0FC6669FE93C41401498B2612BBF41CF),
+            topic_1=Op.BALANCE(
+                address=0x7631BF0FC6669FE93C41401498B2612BBF41CF
+            ),
+            topic_2=Op.BALANCE(
+                address=0x7631BF0FC6669FE93C41401498B2612BBF41CF
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x007631bf0fc6669fe93c41401498b2612bbf41cf"),  # noqa: E501
+        address=Address(0x007631BF0FC6669FE93C41401498B2612BBF41CF),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_log3_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_log3_non_const.py
index cf77e3ab260..4a34ed3a76c 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_log3_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_log3_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_log3_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/log3NonConstFiller.yml
+state_tests/stArgsZeroOneBalance/log3NonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/log3NonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/log3NonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_log3_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_log3_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,41 +68,57 @@ def test_log3_non_const(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (LOG3 (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.LOG3(
-                offset=Op.BALANCE(
-                    address=0x2724F6CB897BBC3E063A03633D2CE4E83DA8678,
-                ),
-                size=Op.BALANCE(
-                    address=0x2724F6CB897BBC3E063A03633D2CE4E83DA8678
-                ),
-                topic_1=Op.BALANCE(
-                    address=0x2724F6CB897BBC3E063A03633D2CE4E83DA8678,
-                ),
-                topic_2=Op.BALANCE(
-                    address=0x2724F6CB897BBC3E063A03633D2CE4E83DA8678,
-                ),
-                topic_3=Op.BALANCE(
-                    address=0x2724F6CB897BBC3E063A03633D2CE4E83DA8678,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG3(
+            offset=Op.BALANCE(
+                address=0x2724F6CB897BBC3E063A03633D2CE4E83DA8678
+            ),
+            size=Op.BALANCE(address=0x2724F6CB897BBC3E063A03633D2CE4E83DA8678),
+            topic_1=Op.BALANCE(
+                address=0x2724F6CB897BBC3E063A03633D2CE4E83DA8678
+            ),
+            topic_2=Op.BALANCE(
+                address=0x2724F6CB897BBC3E063A03633D2CE4E83DA8678
+            ),
+            topic_3=Op.BALANCE(
+                address=0x2724F6CB897BBC3E063A03633D2CE4E83DA8678
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x02724f6cb897bbc3e063a03633d2ce4e83da8678"),  # noqa: E501
+        address=Address(0x02724F6CB897BBC3E063A03633D2CE4E83DA8678),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_lt_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_lt_non_const.py
index 67f43fad564..34354330ff4 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_lt_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_lt_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_lt_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/ltNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/ltNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/ltNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/ltNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_lt_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_lt_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,35 +68,49 @@ def test_lt_non_const(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](LT (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.LT(
-                    Op.BALANCE(
-                        address=0x2538BC735B54983A8F85ED92072DC2D0F07A2797
-                    ),
-                    Op.BALANCE(
-                        address=0x2538BC735B54983A8F85ED92072DC2D0F07A2797
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.LT(
+                Op.BALANCE(address=0x2538BC735B54983A8F85ED92072DC2D0F07A2797),
+                Op.BALANCE(address=0x2538BC735B54983A8F85ED92072DC2D0F07A2797),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2538bc735b54983a8f85ed92072dc2d0f07a2797"),  # noqa: E501
+        address=Address(0x2538BC735B54983A8F85ED92072DC2D0F07A2797),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_mload_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_mload_non_const.py
index d9cf755a59e..244fefd710b 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_mload_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_mload_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_mload_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/mloadNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/mloadNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/mloadNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/mloadNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_mload_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_mload_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,32 +68,50 @@ def test_mload_non_const(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](MLOAD (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.MLOAD(
-                    offset=Op.BALANCE(
-                        address=0x14DD543A6D90CE85F819B764F0F38AFC1DF76C48,
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.MLOAD(
+                offset=Op.BALANCE(
+                    address=0x14DD543A6D90CE85F819B764F0F38AFC1DF76C48
+                )
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x14dd543a6d90ce85f819b764f0f38afc1df76c48"),  # noqa: E501
+        address=Address(0x14DD543A6D90CE85F819B764F0F38AFC1DF76C48),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_mod_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_mod_non_const.py
index 8964681d74b..bda76416253 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_mod_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_mod_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_mod_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/modNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/modNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/modNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/modNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_mod_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_mod_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,35 +68,49 @@ def test_mod_non_const(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](MOD (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(
-                    Op.BALANCE(
-                        address=0x1FD117CCD0620EDE7967DAF31CDD8926B5B4EF5C
-                    ),
-                    Op.BALANCE(
-                        address=0x1FD117CCD0620EDE7967DAF31CDD8926B5B4EF5C
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.MOD(
+                Op.BALANCE(address=0x1FD117CCD0620EDE7967DAF31CDD8926B5B4EF5C),
+                Op.BALANCE(address=0x1FD117CCD0620EDE7967DAF31CDD8926B5B4EF5C),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1fd117ccd0620ede7967daf31cdd8926b5b4ef5c"),  # noqa: E501
+        address=Address(0x1FD117CCD0620EDE7967DAF31CDD8926B5B4EF5C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_mstore8_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_mstore8_non_const.py
index 73b35e922c5..0447a50df4c 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_mstore8_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_mstore8_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_mstore8_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/mstore8NonConstFiller.yml
+state_tests/stArgsZeroOneBalance/mstore8NonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stArgsZeroOneBalance/mstore8NonConstFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stArgsZeroOneBalance/mstore8NonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_mstore8_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_mstore8_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,32 +68,50 @@ def test_mstore8_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(
-                offset=Op.BALANCE(
-                    address=0xF9BB7A1F4D45DD4F87D9C94A491CE7606BA41276,
-                ),
-                value=Op.BALANCE(
-                    address=0xF9BB7A1F4D45DD4F87D9C94A491CE7606BA41276,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(
+            offset=Op.BALANCE(
+                address=0xF9BB7A1F4D45DD4F87D9C94A491CE7606BA41276
+            ),
+            value=Op.BALANCE(
+                address=0xF9BB7A1F4D45DD4F87D9C94A491CE7606BA41276
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf9bb7a1f4d45dd4f87d9c94a491ce7606ba41276"),  # noqa: E501
+        address=Address(0xF9BB7A1F4D45DD4F87D9C94A491CE7606BA41276),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_mstore_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_mstore_non_const.py
index f98462b09de..8b021a9b2cd 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_mstore_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_mstore_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_mstore_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/mstoreNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/mstoreNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/mstoreNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/mstoreNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_mstore_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_mstore_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,32 +68,50 @@ def test_mstore_non_const(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=Op.BALANCE(
-                    address=0x2737DAE115785244CFD2540FD942DC496B37CB71,
-                ),
-                value=Op.BALANCE(
-                    address=0x2737DAE115785244CFD2540FD942DC496B37CB71,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=Op.BALANCE(
+                address=0x2737DAE115785244CFD2540FD942DC496B37CB71
+            ),
+            value=Op.BALANCE(
+                address=0x2737DAE115785244CFD2540FD942DC496B37CB71
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2737dae115785244cfd2540fd942dc496b37cb71"),  # noqa: E501
+        address=Address(0x2737DAE115785244CFD2540FD942DC496B37CB71),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_mul_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_mul_non_const.py
index ee0ad06af60..76886038831 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_mul_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_mul_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_mul_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/mulNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/mulNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,36 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/mulNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/mulNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0xb64c7a374e0080660379ebd421077ab5866cc9ef"): Account(
-                    storage={0: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_mul_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_mul_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -62,35 +68,49 @@ def test_mul_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](MUL (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.MUL(
-                    Op.BALANCE(
-                        address=0xB64C7A374E0080660379EBD421077AB5866CC9EF
-                    ),
-                    Op.BALANCE(
-                        address=0xB64C7A374E0080660379EBD421077AB5866CC9EF
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.MUL(
+                Op.BALANCE(address=0xB64C7A374E0080660379EBD421077AB5866CC9EF),
+                Op.BALANCE(address=0xB64C7A374E0080660379EBD421077AB5866CC9EF),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb64c7a374e0080660379ebd421077ab5866cc9ef"),  # noqa: E501
+        address=Address(0xB64C7A374E0080660379EBD421077AB5866CC9EF),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_mulmod_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_mulmod_non_const.py
index 329467e72ab..cd61591b4c6 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_mulmod_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_mulmod_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_mulmod_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/mulmodNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/mulmodNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/mulmodNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/mulmodNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_mulmod_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_mulmod_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,38 +68,50 @@ def test_mulmod_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](MULMOD (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.MULMOD(
-                    Op.BALANCE(
-                        address=0x9793633B7AD5CA376BA862E9D9B098A0EF8E71D8
-                    ),
-                    Op.BALANCE(
-                        address=0x9793633B7AD5CA376BA862E9D9B098A0EF8E71D8
-                    ),
-                    Op.BALANCE(
-                        address=0x9793633B7AD5CA376BA862E9D9B098A0EF8E71D8
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.MULMOD(
+                Op.BALANCE(address=0x9793633B7AD5CA376BA862E9D9B098A0EF8E71D8),
+                Op.BALANCE(address=0x9793633B7AD5CA376BA862E9D9B098A0EF8E71D8),
+                Op.BALANCE(address=0x9793633B7AD5CA376BA862E9D9B098A0EF8E71D8),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9793633b7ad5ca376ba862e9d9b098a0ef8e71d8"),  # noqa: E501
+        address=Address(0x9793633B7AD5CA376BA862E9D9B098A0EF8E71D8),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_not_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_not_non_const.py
index 66f94eadabd..5ff4ec0e605 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_not_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_not_non_const.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_not_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/notNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/notNonConstFiller.yml
 """
 
 import pytest
@@ -11,10 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,44 +27,37 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/notNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/notNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
             0,
-            {
-                Address("0xcb87599782f7101d77a9b56283a67cd13fa0d97e"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
+            0,
+            0,
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0xcb87599782f7101d77a9b56283a67cd13fa0d97e"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-                    }
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_not_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_not_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -74,31 +72,60 @@ def test_not_non_const(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](NOT (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.NOT(
-                    Op.BALANCE(
-                        address=0xCB87599782F7101D77A9B56283A67CD13FA0D97E
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.NOT(
+                Op.BALANCE(address=0xCB87599782F7101D77A9B56283A67CD13FA0D97E)
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xcb87599782f7101d77a9b56283a67cd13fa0d97e"),  # noqa: E501
+        address=Address(0xCB87599782F7101D77A9B56283A67CD13FA0D97E),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_or_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_or_non_const.py
index edacf12007e..343f19c2fec 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_or_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_or_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_or_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/orNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/orNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,36 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/orNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/orNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x60da449405b736a6920d45831cd6b173520fdf34"): Account(
-                    storage={0: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_or_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_or_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -62,35 +68,49 @@ def test_or_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](OR (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.OR(
-                    Op.BALANCE(
-                        address=0x60DA449405B736A6920D45831CD6B173520FDF34
-                    ),
-                    Op.BALANCE(
-                        address=0x60DA449405B736A6920D45831CD6B173520FDF34
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.OR(
+                Op.BALANCE(address=0x60DA449405B736A6920D45831CD6B173520FDF34),
+                Op.BALANCE(address=0x60DA449405B736A6920D45831CD6B173520FDF34),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x60da449405b736a6920d45831cd6b173520fdf34"),  # noqa: E501
+        address=Address(0x60DA449405B736A6920D45831CD6B173520FDF34),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_return_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_return_non_const.py
index 49d75bba32e..4e790b391e0 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_return_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_return_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_return_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/returnNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/returnNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/returnNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/returnNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_return_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_return_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,32 +68,50 @@ def test_return_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (RETURN (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.RETURN(
-                offset=Op.BALANCE(
-                    address=0xC40D7523B9B65560BE87507FD6FF17AB29DFCFF0,
-                ),
-                size=Op.BALANCE(
-                    address=0xC40D7523B9B65560BE87507FD6FF17AB29DFCFF0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(
+            offset=Op.BALANCE(
+                address=0xC40D7523B9B65560BE87507FD6FF17AB29DFCFF0
+            ),
+            size=Op.BALANCE(
+                address=0xC40D7523B9B65560BE87507FD6FF17AB29DFCFF0
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc40d7523b9b65560be87507fd6ff17ab29dfcff0"),  # noqa: E501
+        address=Address(0xC40D7523B9B65560BE87507FD6FF17AB29DFCFF0),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_sdiv_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_sdiv_non_const.py
index 5cba553d69c..fe11f8c49a8 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_sdiv_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_sdiv_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_sdiv_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/sdivNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/sdivNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,36 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/sdivNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/sdivNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0xa652fe2c234233d6eb3d62b283d56f67c76635bd"): Account(
-                    storage={0: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sdiv_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_sdiv_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -62,35 +68,49 @@ def test_sdiv_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](SDIV (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SDIV(
-                    Op.BALANCE(
-                        address=0xA652FE2C234233D6EB3D62B283D56F67C76635BD
-                    ),
-                    Op.BALANCE(
-                        address=0xA652FE2C234233D6EB3D62B283D56F67C76635BD
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SDIV(
+                Op.BALANCE(address=0xA652FE2C234233D6EB3D62B283D56F67C76635BD),
+                Op.BALANCE(address=0xA652FE2C234233D6EB3D62B283D56F67C76635BD),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa652fe2c234233d6eb3d62b283d56f67c76635bd"),  # noqa: E501
+        address=Address(0xA652FE2C234233D6EB3D62B283D56F67C76635BD),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_sgt_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_sgt_non_const.py
index 4d5b3574881..8e955bebd63 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_sgt_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_sgt_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_sgt_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/sgtNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/sgtNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/sgtNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/sgtNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sgt_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_sgt_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,35 +68,49 @@ def test_sgt_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](SGT (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SGT(
-                    Op.BALANCE(
-                        address=0x696E25C48BC937162438ECD7B3CCD13B4EA2B98B
-                    ),
-                    Op.BALANCE(
-                        address=0x696E25C48BC937162438ECD7B3CCD13B4EA2B98B
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SGT(
+                Op.BALANCE(address=0x696E25C48BC937162438ECD7B3CCD13B4EA2B98B),
+                Op.BALANCE(address=0x696E25C48BC937162438ECD7B3CCD13B4EA2B98B),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x696e25c48bc937162438ecd7b3ccd13b4ea2b98b"),  # noqa: E501
+        address=Address(0x696E25C48BC937162438ECD7B3CCD13B4EA2B98B),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_sha3_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_sha3_non_const.py
index 2df74590d4f..6efbe2105b6 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_sha3_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_sha3_non_const.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_sha3_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/sha3NonConstFiller.yml
+state_tests/stArgsZeroOneBalance/sha3NonConstFiller.yml
 """
 
 import pytest
@@ -11,10 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,44 +27,37 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/sha3NonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/sha3NonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
             0,
-            {
-                Address("0x8f7eceea4b37c6f7faf5d64d64fbffbcd14b79a4"): Account(
-                    storage={
-                        0: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470  # noqa: E501
-                    }
-                )
-            },
+            0,
+            0,
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x8f7eceea4b37c6f7faf5d64d64fbffbcd14b79a4"): Account(
-                    storage={
-                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A  # noqa: E501
-                    }
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sha3_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_sha3_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -74,34 +72,65 @@ def test_sha3_non_const(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](KECCAK256 (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SHA3(
-                    offset=Op.BALANCE(
-                        address=0x8F7ECEEA4B37C6F7FAF5D64D64FBFFBCD14B79A4,
-                    ),
-                    size=Op.BALANCE(
-                        address=0x8F7ECEEA4B37C6F7FAF5D64D64FBFFBCD14B79A4,
-                    ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SHA3(
+                offset=Op.BALANCE(
+                    address=0x8F7ECEEA4B37C6F7FAF5D64D64FBFFBCD14B79A4
                 ),
-            )
-            + Op.STOP
-        ),
+                size=Op.BALANCE(
+                    address=0x8F7ECEEA4B37C6F7FAF5D64D64FBFFBCD14B79A4
+                ),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8f7eceea4b37c6f7faf5d64d64fbffbcd14b79a4"),  # noqa: E501
+        address=Address(0x8F7ECEEA4B37C6F7FAF5D64D64FBFFBCD14B79A4),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_signext_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_signext_non_const.py
index 0a9f228c1ed..ca26efca5c8 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_signext_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_signext_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_signext_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/signextNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/signextNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,38 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stArgsZeroOneBalance/signextNonConstFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stArgsZeroOneBalance/signextNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x36325c04eb27abe09cffaf61ac7823254b193ac8"): Account(
-                    storage={0: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_signext_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_signext_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -64,35 +68,49 @@ def test_signext_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](SIGNEXTEND (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SIGNEXTEND(
-                    Op.BALANCE(
-                        address=0x36325C04EB27ABE09CFFAF61AC7823254B193AC8
-                    ),
-                    Op.BALANCE(
-                        address=0x36325C04EB27ABE09CFFAF61AC7823254B193AC8
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SIGNEXTEND(
+                Op.BALANCE(address=0x36325C04EB27ABE09CFFAF61AC7823254B193AC8),
+                Op.BALANCE(address=0x36325C04EB27ABE09CFFAF61AC7823254B193AC8),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x36325c04eb27abe09cffaf61ac7823254b193ac8"),  # noqa: E501
+        address=Address(0x36325C04EB27ABE09CFFAF61AC7823254B193AC8),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_sload_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_sload_non_const.py
index d49c330cd09..253acce3f33 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_sload_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_sload_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_sload_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/sloadNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/sloadNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/sloadNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/sloadNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sload_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_sload_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,32 +68,50 @@ def test_sload_non_const(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 3 ]] (SLOAD (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x3,
-                value=Op.SLOAD(
-                    key=Op.BALANCE(
-                        address=0x14F6D924BBF6563DD087359472133FFE566E60B1,
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x3,
+            value=Op.SLOAD(
+                key=Op.BALANCE(
+                    address=0x14F6D924BBF6563DD087359472133FFE566E60B1
+                )
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x14f6d924bbf6563dd087359472133ffe566e60b1"),  # noqa: E501
+        address=Address(0x14F6D924BBF6563DD087359472133FFE566E60B1),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={3: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={3: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_slt_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_slt_non_const.py
index d4c37b2a54a..4785add59ca 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_slt_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_slt_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_slt_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/sltNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/sltNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/sltNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/sltNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_slt_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_slt_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,35 +68,49 @@ def test_slt_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](SLT (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SLT(
-                    Op.BALANCE(
-                        address=0x31D72308BB942D557F1F7AD5987321FB3D75C896
-                    ),
-                    Op.BALANCE(
-                        address=0x31D72308BB942D557F1F7AD5987321FB3D75C896
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SLT(
+                Op.BALANCE(address=0x31D72308BB942D557F1F7AD5987321FB3D75C896),
+                Op.BALANCE(address=0x31D72308BB942D557F1F7AD5987321FB3D75C896),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x31d72308bb942d557f1f7ad5987321fb3d75c896"),  # noqa: E501
+        address=Address(0x31D72308BB942D557F1F7AD5987321FB3D75C896),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_smod_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_smod_non_const.py
index 0d0497c6563..1408d1dbfb2 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_smod_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_smod_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_smod_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/smodNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/smodNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/smodNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/smodNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_smod_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_smod_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,35 +68,49 @@ def test_smod_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](SMOD (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SMOD(
-                    Op.BALANCE(
-                        address=0xB5ACE6E2AD4512822412E4E09FA278096CE8C63D
-                    ),
-                    Op.BALANCE(
-                        address=0xB5ACE6E2AD4512822412E4E09FA278096CE8C63D
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SMOD(
+                Op.BALANCE(address=0xB5ACE6E2AD4512822412E4E09FA278096CE8C63D),
+                Op.BALANCE(address=0xB5ACE6E2AD4512822412E4E09FA278096CE8C63D),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb5ace6e2ad4512822412e4e09fa278096ce8c63d"),  # noqa: E501
+        address=Address(0xB5ACE6E2AD4512822412E4E09FA278096CE8C63D),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_sstore_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_sstore_non_const.py
index 97eb61a188a..8f1e6ba7914 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_sstore_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_sstore_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_sstore_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/sstoreNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/sstoreNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,36 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/sstoreNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/sstoreNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x82d3d8be7168e697ed33f2a50810fa614393171e"): Account(
-                    storage={1: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_sstore_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -62,32 +68,48 @@ def test_sstore_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (SSTORE (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=Op.BALANCE(
-                    address=0x82D3D8BE7168E697ED33F2A50810FA614393171E
-                ),
-                value=Op.BALANCE(
-                    address=0x82D3D8BE7168E697ED33F2A50810FA614393171E,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=Op.BALANCE(address=0x82D3D8BE7168E697ED33F2A50810FA614393171E),
+            value=Op.BALANCE(
+                address=0x82D3D8BE7168E697ED33F2A50810FA614393171E
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x82d3d8be7168e697ed33f2a50810fa614393171e"),  # noqa: E501
+        address=Address(0x82D3D8BE7168E697ED33F2A50810FA614393171E),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={1: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_sub_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_sub_non_const.py
index 4c6d6d9ae7c..311cc71bfa2 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_sub_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_sub_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_sub_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/subNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/subNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/subNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/subNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sub_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_sub_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,35 +68,49 @@ def test_sub_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](SUB (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.BALANCE(
-                        address=0xF9A85AC17DF3D37B898990AED6481E88D77DFA36
-                    ),
-                    Op.BALANCE(
-                        address=0xF9A85AC17DF3D37B898990AED6481E88D77DFA36
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                Op.BALANCE(address=0xF9A85AC17DF3D37B898990AED6481E88D77DFA36),
+                Op.BALANCE(address=0xF9A85AC17DF3D37B898990AED6481E88D77DFA36),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf9a85ac17df3d37b898990aed6481e88d77dfa36"),  # noqa: E501
+        address=Address(0xF9A85AC17DF3D37B898990AED6481E88D77DFA36),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_suicide_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_suicide_non_const.py
index 5f1ffb1cad6..3cbaaecceb4 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_suicide_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_suicide_non_const.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_suicide_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/suicideNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/suicideNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stArgsZeroOneBalance/suicideNonConstFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stArgsZeroOneBalance/suicideNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_suicide_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_suicide_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,29 +66,42 @@ def test_suicide_non_const(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (SELFDESTRUCT (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(
-                address=Op.BALANCE(
-                    address=0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87,
-                ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=Op.BALANCE(
+                address=0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87
             )
-            + Op.STOP
-        ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        contract_0: Account(
+            storage={},
+            code=bytes.fromhex(
+                "73095e7baea6a6c7c4c2dfeb977efac326af552d8731ff00"
+            ),
+            balance=0,
+            nonce=0,
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stArgsZeroOneBalance/test_xor_non_const.py b/tests/ported_static/stArgsZeroOneBalance/test_xor_non_const.py
index 4c331809b55..1ca082aca84 100644
--- a/tests/ported_static/stArgsZeroOneBalance/test_xor_non_const.py
+++ b/tests/ported_static/stArgsZeroOneBalance/test_xor_non_const.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_xor_non_const.
 
 Ported from:
-tests/static/state_tests/stArgsZeroOneBalance/xorNonConstFiller.yml
+state_tests/stArgsZeroOneBalance/xorNonConstFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stArgsZeroOneBalance/xorNonConstFiller.yml"],
+    ["state_tests/stArgsZeroOneBalance/xorNonConstFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_xor_non_const(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_xor_non_const."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,35 +68,49 @@ def test_xor_non_const(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]](XOR (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) (BALANCE <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.XOR(
-                    Op.BALANCE(
-                        address=0x49A48E464281CDA5C9CA67F9A29A7CBD7CF86590
-                    ),
-                    Op.BALANCE(
-                        address=0x49A48E464281CDA5C9CA67F9A29A7CBD7CF86590
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.XOR(
+                Op.BALANCE(address=0x49A48E464281CDA5C9CA67F9A29A7CBD7CF86590),
+                Op.BALANCE(address=0x49A48E464281CDA5C9CA67F9A29A7CBD7CF86590),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x49a48e464281cda5c9ca67f9a29a7cbd7cf86590"),  # noqa: E501
+        address=Address(0x49A48E464281CDA5C9CA67F9A29A7CBD7CF86590),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [400000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stAttackTest/__init__.py b/tests/ported_static/stAttackTest/__init__.py
index 09aa8f34e95..b4c8d23a81c 100644
--- a/tests/ported_static/stAttackTest/__init__.py
+++ b/tests/ported_static/stAttackTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stAttackTest."""
+"""Ported static tests: stAttackTest."""  # noqa: N999
diff --git a/tests/ported_static/stAttackTest/test_contract_creation_spam.py b/tests/ported_static/stAttackTest/test_contract_creation_spam.py
index 22f348f62fa..1805f8cc254 100644
--- a/tests/ported_static/stAttackTest/test_contract_creation_spam.py
+++ b/tests/ported_static/stAttackTest/test_contract_creation_spam.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_contract_creation_spam.
 
 Ported from:
-tests/static/state_tests/stAttackTest/ContractCreationSpamFiller.json
+state_tests/stAttackTest/ContractCreationSpamFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stAttackTest/ContractCreationSpamFiller.json"],
+    ["state_tests/stAttackTest/ContractCreationSpamFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.slow
@@ -31,8 +32,9 @@ def test_contract_creation_spam(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_contract_creation_spam."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6A0A0FC761C612C340A0E98D33B37A75E5268472)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -46,595 +48,623 @@ def test_contract_creation_spam(
         gas_limit=100000000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x6004600C60003960046000F3600035FF00000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.CREATE(value=0x0, offset=0x0, size=0x20)
-            + Op.SLOAD(key=0x0)
-            + Op.DUP1
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x6,
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x20,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(pc=Op.PUSH3[0x2F], condition=Op.LT(0x6000, Op.GAS))
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-        ),
+    pre[sender] = Account(balance=0xC9F2C9CD04674EDEA40000000)
+    # Source: hex
+    # 0x7f6004600c60003960046000f3600035ff00000000000000000000000000000000600052602060006000f0600054805b6001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1505a616000106200002f57600055  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x6004600C60003960046000F3600035FF00000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.CREATE(value=0x0, offset=0x0, size=0x20)
+        + Op.SLOAD(key=0x0)
+        + Op.DUP1
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x6,
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPI(pc=Op.PUSH3[0x2F], condition=Op.LT(0x6000, Op.GAS))
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6a0a0fc761c612c340a0e98d33b37a75e5268472"),  # noqa: E501
+        address=Address(0x6A0A0FC761C612C340A0E98D33B37A75E5268472),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xC9F2C9CD04674EDEA40000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=10000000,
     )
 
     post = {
-        contract: Account(storage={0: 0x10C20}),
+        contract_0: Account(storage={0: 0x10C20}, nonce=1),
+        sender: Account(storage={}, nonce=1),
+        Address(
+            0x0000000000000000000000000000000000000001
+        ): Account.NONEXISTENT,
+        Address(
+            0x0000000000000000000000000000000000000002
+        ): Account.NONEXISTENT,
+        Address(
+            0x0000000000000000000000000000000000000003
+        ): Account.NONEXISTENT,
+        Address(
+            0x0000000000000000000000000000000000000004
+        ): Account.NONEXISTENT,
+        Address(
+            0x0000000000000000000000000000000000000005
+        ): Account.NONEXISTENT,
+        Address(
+            0x0000000000000000000000000000000000000006
+        ): Account.NONEXISTENT,
+        Address(
+            0x0000000000000000000000000000000000000015
+        ): Account.NONEXISTENT,
+        Address(
+            0x000000000000000000000000000000000000006E
+        ): Account.NONEXISTENT,
+        Address(
+            0x0000000000000000000000000000000000002170
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stAttackTest/test_crashing_transaction.py b/tests/ported_static/stAttackTest/test_crashing_transaction.py
index 0bae408acc6..8f8320dd1b8 100644
--- a/tests/ported_static/stAttackTest/test_crashing_transaction.py
+++ b/tests/ported_static/stAttackTest/test_crashing_transaction.py
@@ -1,27 +1,28 @@
 """
-https://ropsten.etherscan.io/tx/0x8ec445380649f6c75a042a438ea9256c2fab2a6a34...
+Https://ropsten.etherscan.io/tx/0x8ec445380649f6c75a042a438ea9256c2fab2a...
 
 Ported from:
-tests/static/state_tests/stAttackTest/CrashingTransactionFiller.json
+state_tests/stAttackTest/CrashingTransactionFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stAttackTest/CrashingTransactionFiller.json"],
+    ["state_tests/stAttackTest/CrashingTransactionFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -29,11 +30,9 @@ def test_crashing_transaction(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Https://ropsten.etherscan.io/tx/0x8ec445380649f6c75a042a438ea9256c..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Https://ropsten."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=3270)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -44,23 +43,65 @@ def test_crashing_transaction(
         gas_limit=4712388,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=3270)
-
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "60606040525b5b61c3505a1115602c576040516034806039833901809050604051809103"  # noqa: E501
-            "906000f0506006565b5b600a80606d6000396000f360606040525b3373ffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffff16ff5b600a80602a6000396000f360606040526008565b"  # noqa: E501
-            "0060606040526008565b00"
-        ),
+        data=Op.MSTORE(offset=0x40, value=0x60)
+        + Op.JUMPDEST * 2
+        + Op.JUMPI(pc=0x2C, condition=Op.ISZERO(Op.GT(Op.GAS, 0xC350)))
+        + Op.MLOAD(offset=0x40)
+        + Op.PUSH1[0x34]
+        + Op.CODECOPY(dest_offset=Op.DUP4, offset=0x39, size=Op.DUP1)
+        + Op.ADD
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MLOAD(offset=0x40)
+        + Op.DUP1
+        + Op.SWAP2
+        + Op.SUB
+        + Op.SWAP1
+        + Op.PUSH1[0x0]
+        + Op.POP(Op.CREATE)
+        + Op.JUMP(pc=0x6)
+        + Op.JUMPDEST * 2
+        + Op.PUSH1[0xA]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x6D, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.MSTORE(offset=0x40, value=0x60)
+        + Op.JUMPDEST
+        + Op.SELFDESTRUCT(
+            address=Op.AND(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.CALLER
+            )
+        )
+        + Op.JUMPDEST
+        + Op.PUSH1[0xA]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x2A, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.MSTORE(offset=0x40, value=0x60)
+        + Op.JUMP(pc=0x8)
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.MSTORE(offset=0x40, value=0x60)
+        + Op.JUMP(pc=0x8)
+        + Op.JUMPDEST
+        + Op.STOP,
         gas_limit=4657786,
-        gas_price=11,
-        nonce=3270,
         value=1,
+        nonce=3270,
+        gas_price=11,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=3271),
+        compute_create_address(address=sender, nonce=3270): Account(
+            code=bytes.fromhex("60606040526008565b00"),
+            balance=1,
+            nonce=124,
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stBadOpcode/__init__.py b/tests/ported_static/stBadOpcode/__init__.py
index af21d6fa8a3..73851b77e59 100644
--- a/tests/ported_static/stBadOpcode/__init__.py
+++ b/tests/ported_static/stBadOpcode/__init__.py
@@ -1 +1 @@
-"""Tests ported from stBadOpcode."""
+"""Ported static tests: stBadOpcode."""  # noqa: N999
diff --git a/tests/ported_static/stBadOpcode/test_eip2315_not_removed.py b/tests/ported_static/stBadOpcode/test_eip2315_not_removed.py
index 306555fbef1..f2d0943b19d 100644
--- a/tests/ported_static/stBadOpcode/test_eip2315_not_removed.py
+++ b/tests/ported_static/stBadOpcode/test_eip2315_not_removed.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_eip2315_not_removed.
 
 Ported from:
-tests/static/state_tests/stBadOpcode/eip2315NotRemovedFiller.json
+state_tests/stBadOpcode/eip2315NotRemovedFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stBadOpcode/eip2315NotRemovedFiller.json"],
+    ["state_tests/stBadOpcode/eip2315NotRemovedFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_eip2315_not_removed(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x31B5AF02B012484AE954B3A43943242EDE546A2E76FC0A6ACC17435107C385EB
-    )
+    """Test_eip2315_not_removed."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x7FFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,28 +43,26 @@ def test_eip2315_not_removed(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x4]
-            + Op.MCOPY
-            + Op.STOP
-            + Op.TLOAD
-            + Op.SSTORE(key=0x0, value=0x1)
-            + Op.TSTORE
-        ),
+    # Source: raw
+    # 0x60045e005c60016000555d
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x4]
+        + Op.MCOPY
+        + Op.STOP
+        + Op.TLOAD
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.TSTORE,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x147943601b1281618e4d824d11073025cd2ac623"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x7FFFFFFFFFFFFFFF)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stBadOpcode/test_invalid_addr.py b/tests/ported_static/stBadOpcode/test_invalid_addr.py
index 65864a30d38..2f3e97b7ed8 100644
--- a/tests/ported_static/stBadOpcode/test_invalid_addr.py
+++ b/tests/ported_static/stBadOpcode/test_invalid_addr.py
@@ -2,19 +2,21 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stBadOpcode/invalidAddrFiller.yml
+state_tests/stBadOpcode/invalidAddrFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,453 +24,536 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stBadOpcode/invalidAddrFiller.yml"],
+    ["state_tests/stBadOpcode/invalidAddrFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            38,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            39,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            40,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            41,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            42,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            43,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            44,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            45,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            46,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            47,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            48,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            49,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            50,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            51,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            52,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            53,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            54,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            55,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            56,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            57,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            58,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            59,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            60,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            61,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            62,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            63,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            64,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            65,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            66,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            67,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            68,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            69,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            70,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            71,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            72,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            73,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            74,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            75,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            76,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            77,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            78,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            79,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            80,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            81,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            82,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            83,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            84,
+            0,
+            0,
+            id="ok",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003f00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003f00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003f00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003f00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003f00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003f00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003f00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003f00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003f00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003f00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f400000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f400000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f400000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f400000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f400000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000ff00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000ff00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000ff00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000ff00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000ff00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_invalid_addr(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -479,17 +564,40 @@ def test_invalid_addr(
         gas_limit=100000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xDEADBEEF)
-            + Op.RETURN(offset=0x0, size=0x120)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {
+    #       [0] 0xDEADBEEF
+    #       (return 0 0x120)
+    # }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xDEADBEEF)
+        + Op.RETURN(offset=0x0, size=0x120)
+        + Op.STOP,
         balance=0x10000,
         nonce=0,
-        address=Address("0x1c60a961cff23c82b2f809e76b815d003898e196"),  # noqa: E501
+        address=Address(0x1C60A961CFF23C82B2F809E76B815D003898E196),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
+    # {
+    #    (selfdestruct $0)
+    # }
+    dead1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=Op.CALLDATALOAD(offset=0x0)) + Op.STOP,
+        balance=4096,
+        nonce=0,
+        address=Address(0x9CB657C71386D578195B90DA7DE545482E0A9440),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    (selfdestruct $0)
+    # }
+    dead2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=Op.CALLDATALOAD(offset=0x0)) + Op.STOP,
+        balance=4096,
+        nonce=0,
+        address=Address(0xE2CFFD6602680D87B7872C3B69F42FA631058CBF),  # noqa: E501
+    )
+    # Source: lll
     # {
     #    ; Inputs
     #    (def 'opcode $4)
@@ -521,473 +629,513 @@ def test_invalid_addr(
     #    ; addrType  2 is addr1 + 2^254
     #    ; addrType  3 is addr1 + 2^255
     # ... (108 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=Op.PUSH2[0x11],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x2B])
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x2000,
-                value=0x1C60A961CFF23C82B2F809E76B815D003898E196,
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x3D],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x2),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x44])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2000, value=0x2)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x56],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x0),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x5F])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2040, value=Op.MLOAD(offset=0x2000))
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x71],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x1),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x83])
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x2040,
-                value=Op.ADD(
-                    Op.MLOAD(offset=0x2000),
-                    Op.MUL(0x1, Op.EXP(0x2, 0xA0)),
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x95],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x2),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xA7])
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x2040,
-                value=Op.ADD(
-                    Op.MLOAD(offset=0x2000),
-                    Op.MUL(0x1, Op.EXP(0x2, 0xFE)),
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xB9],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x3),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xCB])
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x2040,
-                value=Op.ADD(
-                    Op.MLOAD(offset=0x2000),
-                    Op.MUL(0x1, Op.EXP(0x2, 0xFF)),
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xDD],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x4),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xEF])
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x2040,
-                value=Op.SUB(
-                    Op.MLOAD(offset=0x2000),
-                    Op.MUL(0x1, Op.EXP(0x2, 0xA0)),
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0xFF00FF00FF00FF00)
-            + Op.MSTORE(offset=0x2060, value=0xFF00FF00FF00FF)
-            + Op.JUMPI(
-                pc=0x11A,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x31),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x14B)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x2020,
-                value=Op.BALANCE(address=Op.MLOAD(offset=0x2000)),
-            )
-            + Op.MSTORE(
-                offset=0x2060,
-                value=Op.BALANCE(address=Op.MLOAD(offset=0x2040)),
-            )
-            + Op.JUMPI(
-                pc=0x141,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1),
-            )
-            + Op.MSTORE(offset=0x2080, value=0x0)
-            + Op.JUMP(pc=0x14A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2080, value=0x10000)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x15D,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3B),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x18C)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x2020,
-                value=Op.EXTCODESIZE(address=Op.MLOAD(offset=0x2000)),
-            )
-            + Op.MSTORE(
-                offset=0x2060,
-                value=Op.EXTCODESIZE(address=Op.MLOAD(offset=0x2040)),
-            )
-            + Op.JUMPI(
-                pc=0x184,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1),
-            )
-            + Op.MSTORE(offset=0x2080, value=0x0)
-            + Op.JUMP(pc=0x18B)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2080, value=0xF)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x19E,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3C),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x1F2)
-            + Op.JUMPDEST
-            + Op.EXTCODECOPY(
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=Op.PUSH2[0x11],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x2B])
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x2000, value=0x1C60A961CFF23C82B2F809E76B815D003898E196
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x3D],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x2),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x44])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2000, value=0x2)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x56],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x0),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x5F])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2040, value=Op.MLOAD(offset=0x2000))
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x71],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x1),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x83])
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x2040,
+            value=Op.ADD(
+                Op.MLOAD(offset=0x2000), Op.MUL(0x1, Op.EXP(0x2, 0xA0))
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x95],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x2),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xA7])
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x2040,
+            value=Op.ADD(
+                Op.MLOAD(offset=0x2000), Op.MUL(0x1, Op.EXP(0x2, 0xFE))
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xB9],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x3),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xCB])
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x2040,
+            value=Op.ADD(
+                Op.MLOAD(offset=0x2000), Op.MUL(0x1, Op.EXP(0x2, 0xFF))
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xDD],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x4),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xEF])
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x2040,
+            value=Op.SUB(
+                Op.MLOAD(offset=0x2000), Op.MUL(0x1, Op.EXP(0x2, 0xA0))
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0xFF00FF00FF00FF00)
+        + Op.MSTORE(offset=0x2060, value=0xFF00FF00FF00FF)
+        + Op.JUMPI(
+            pc=0x11A, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x31)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x14B)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x2020, value=Op.BALANCE(address=Op.MLOAD(offset=0x2000))
+        )
+        + Op.MSTORE(
+            offset=0x2060, value=Op.BALANCE(address=Op.MLOAD(offset=0x2040))
+        )
+        + Op.JUMPI(
+            pc=0x141, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1)
+        )
+        + Op.MSTORE(offset=0x2080, value=0x0)
+        + Op.JUMP(pc=0x14A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2080, value=0x10000)
+        + Op.JUMPDEST * 2
+        + Op.JUMPI(
+            pc=0x15D, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3B)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x18C)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x2020,
+            value=Op.EXTCODESIZE(address=Op.MLOAD(offset=0x2000)),
+        )
+        + Op.MSTORE(
+            offset=0x2060,
+            value=Op.EXTCODESIZE(address=Op.MLOAD(offset=0x2040)),
+        )
+        + Op.JUMPI(
+            pc=0x184, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1)
+        )
+        + Op.MSTORE(offset=0x2080, value=0x0)
+        + Op.JUMP(pc=0x18B)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2080, value=0xF)
+        + Op.JUMPDEST * 2
+        + Op.JUMPI(
+            pc=0x19E, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3C)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x1F2)
+        + Op.JUMPDEST
+        + Op.EXTCODECOPY(
+            address=Op.MLOAD(offset=0x2000),
+            dest_offset=0x2020,
+            offset=0x0,
+            size=0x20,
+        )
+        + Op.EXTCODECOPY(
+            address=Op.MLOAD(offset=0x2040),
+            dest_offset=0x2060,
+            offset=0x0,
+            size=0x20,
+        )
+        + Op.JUMPI(
+            pc=0x1CB, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1)
+        )
+        + Op.MSTORE(offset=0x2080, value=0x0)
+        + Op.JUMP(pc=0x1F1)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x2080,
+            value=0x63DEADBEEF6000526101206000F3000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.JUMPDEST * 2
+        + Op.JUMPI(
+            pc=0x204, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3F)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x252)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x2020,
+            value=Op.EXTCODEHASH(address=Op.MLOAD(offset=0x2000)),
+        )
+        + Op.MSTORE(
+            offset=0x2060,
+            value=Op.EXTCODEHASH(address=Op.MLOAD(offset=0x2040)),
+        )
+        + Op.JUMPI(
+            pc=0x22B, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1)
+        )
+        + Op.MSTORE(offset=0x2080, value=0x0)
+        + Op.JUMP(pc=0x251)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x2080,
+            value=0x85AB232A015279867A1F5B5DA4F9688C6C92E555C122E9147F9D13BC53C03E92,  # noqa: E501
+        )
+        + Op.JUMPDEST * 2
+        + Op.JUMPI(
+            pc=0x264, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF1)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x2CD)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.CALL(
+                gas=0x1000,
                 address=Op.MLOAD(offset=0x2000),
-                dest_offset=0x2020,
-                offset=0x0,
-                size=0x20,
+                value=0x0,
+                args_offset=0x2000,
+                args_size=0x20,
+                ret_offset=0x2020,
+                ret_size=0x20,
             )
-            + Op.EXTCODECOPY(
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x1000,
                 address=Op.MLOAD(offset=0x2040),
-                dest_offset=0x2060,
-                offset=0x0,
-                size=0x20,
-            )
-            + Op.JUMPI(
-                pc=0x1CB,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1),
-            )
-            + Op.MSTORE(offset=0x2080, value=0x0)
-            + Op.JUMP(pc=0x1F1)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x2080,
-                value=0x63DEADBEEF6000526101206000F3000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x204,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3F),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x252)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x2020,
-                value=Op.EXTCODEHASH(address=Op.MLOAD(offset=0x2000)),
-            )
-            + Op.MSTORE(
-                offset=0x2060,
-                value=Op.EXTCODEHASH(address=Op.MLOAD(offset=0x2040)),
+                value=0x0,
+                args_offset=0x2000,
+                args_size=0x20,
+                ret_offset=0x2060,
+                ret_size=0x20,
             )
-            + Op.JUMPI(
-                pc=0x22B,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1),
-            )
-            + Op.MSTORE(offset=0x2080, value=0x0)
-            + Op.JUMP(pc=0x251)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x2080,
-                value=0x85AB232A015279867A1F5B5DA4F9688C6C92E555C122E9147F9D13BC53C03E92,  # noqa: E501
-            )
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x264,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF1),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x2CD)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.CALL(
-                    gas=0x1000,
-                    address=Op.MLOAD(offset=0x2000),
-                    value=0x0,
-                    args_offset=0x2000,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x1000,
-                    address=Op.MLOAD(offset=0x2040),
-                    value=0x0,
-                    args_offset=0x2000,
-                    args_size=0x20,
-                    ret_offset=0x2060,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.JUMPI(
-                pc=0x2C2,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1),
-            )
-            + Op.MSTORE(
-                offset=0x2080,
-                value=0x9267D3DBED802941483F1AFA2A6BC68DE5F653128ACA9BF1461C5D0A3AD36ED2,  # noqa: E501
-            )
-            + Op.JUMP(pc=0x2CC)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2080, value=0xDEADBEEF)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2DF,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF2),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x348)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x1000,
-                    address=Op.MLOAD(offset=0x2000),
-                    value=0x0,
-                    args_offset=0x2000,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x1000,
-                    address=Op.MLOAD(offset=0x2040),
-                    value=0x0,
-                    args_offset=0x2000,
-                    args_size=0x20,
-                    ret_offset=0x2060,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.JUMPI(
-                pc=0x33D,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1),
-            )
-            + Op.MSTORE(
-                offset=0x2080,
-                value=0x9267D3DBED802941483F1AFA2A6BC68DE5F653128ACA9BF1461C5D0A3AD36ED2,  # noqa: E501
-            )
-            + Op.JUMP(pc=0x347)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2080, value=0xDEADBEEF)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x35A,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF4),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x3BF)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x1000,
-                    address=Op.MLOAD(offset=0x2000),
-                    args_offset=0x2000,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x1000,
-                    address=Op.MLOAD(offset=0x2040),
-                    args_offset=0x2000,
-                    args_size=0x20,
-                    ret_offset=0x2060,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.JUMPI(
-                pc=0x3B4,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1),
-            )
-            + Op.MSTORE(
-                offset=0x2080,
-                value=0x9267D3DBED802941483F1AFA2A6BC68DE5F653128ACA9BF1461C5D0A3AD36ED2,  # noqa: E501
-            )
-            + Op.JUMP(pc=0x3BE)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2080, value=0xDEADBEEF)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3D1,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xFA),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x436)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x1000,
-                    address=Op.MLOAD(offset=0x2000),
-                    args_offset=0x2000,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x1000,
-                    address=Op.MLOAD(offset=0x2040),
-                    args_offset=0x2000,
-                    args_size=0x20,
-                    ret_offset=0x2060,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.JUMPI(
-                pc=0x42B,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1),
-            )
-            + Op.MSTORE(
-                offset=0x2080,
-                value=0x9267D3DBED802941483F1AFA2A6BC68DE5F653128ACA9BF1461C5D0A3AD36ED2,  # noqa: E501
-            )
-            + Op.JUMP(pc=0x435)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2080, value=0xDEADBEEF)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x448,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xFF),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x4EA)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x20A0,
-                value=Op.BALANCE(address=Op.MLOAD(offset=0x2000)),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000000,
-                    address=0x9CB657C71386D578195B90DA7DE545482E0A9440,
-                    value=0x0,
-                    args_offset=0x2000,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x2020,
-                value=Op.BALANCE(address=Op.MLOAD(offset=0x2000)),
+        )
+        + Op.JUMPI(
+            pc=0x2C2, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1)
+        )
+        + Op.MSTORE(
+            offset=0x2080,
+            value=0x9267D3DBED802941483F1AFA2A6BC68DE5F653128ACA9BF1461C5D0A3AD36ED2,  # noqa: E501
+        )
+        + Op.JUMP(pc=0x2CC)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2080, value=0xDEADBEEF)
+        + Op.JUMPDEST * 2
+        + Op.JUMPI(
+            pc=0x2DF, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF2)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x348)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x1000,
+                address=Op.MLOAD(offset=0x2000),
+                value=0x0,
+                args_offset=0x2000,
+                args_size=0x20,
+                ret_offset=0x2020,
+                ret_size=0x20,
             )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000000,
-                    address=0xE2CFFD6602680D87B7872C3B69F42FA631058CBF,
-                    value=0x0,
-                    args_offset=0x2040,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x1000,
+                address=Op.MLOAD(offset=0x2040),
+                value=0x0,
+                args_offset=0x2000,
+                args_size=0x20,
+                ret_offset=0x2060,
+                ret_size=0x20,
             )
-            + Op.MSTORE(
-                offset=0x2060,
-                value=Op.BALANCE(address=Op.MLOAD(offset=0x2000)),
+        )
+        + Op.JUMPI(
+            pc=0x33D, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1)
+        )
+        + Op.MSTORE(
+            offset=0x2080,
+            value=0x9267D3DBED802941483F1AFA2A6BC68DE5F653128ACA9BF1461C5D0A3AD36ED2,  # noqa: E501
+        )
+        + Op.JUMP(pc=0x347)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2080, value=0xDEADBEEF)
+        + Op.JUMPDEST * 2
+        + Op.JUMPI(
+            pc=0x35A, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF4)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x3BF)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x1000,
+                address=Op.MLOAD(offset=0x2000),
+                args_offset=0x2000,
+                args_size=0x20,
+                ret_offset=0x2020,
+                ret_size=0x20,
             )
-            + Op.MSTORE(
-                offset=0x2060,
-                value=Op.SUB(Op.MLOAD(offset=0x2060), Op.MLOAD(offset=0x2020)),
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x1000,
+                address=Op.MLOAD(offset=0x2040),
+                args_offset=0x2000,
+                args_size=0x20,
+                ret_offset=0x2060,
+                ret_size=0x20,
             )
-            + Op.MSTORE(
-                offset=0x2020,
-                value=Op.SUB(Op.MLOAD(offset=0x2020), Op.MLOAD(offset=0x20A0)),
+        )
+        + Op.JUMPI(
+            pc=0x3B4, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1)
+        )
+        + Op.MSTORE(
+            offset=0x2080,
+            value=0x9267D3DBED802941483F1AFA2A6BC68DE5F653128ACA9BF1461C5D0A3AD36ED2,  # noqa: E501
+        )
+        + Op.JUMP(pc=0x3BE)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2080, value=0xDEADBEEF)
+        + Op.JUMPDEST * 2
+        + Op.JUMPI(
+            pc=0x3D1, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xFA)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x436)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x1000,
+                address=Op.MLOAD(offset=0x2000),
+                args_offset=0x2000,
+                args_size=0x20,
+                ret_offset=0x2020,
+                ret_size=0x20,
             )
-            + Op.JUMPI(
-                pc=0x4E1,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1),
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x1000,
+                address=Op.MLOAD(offset=0x2040),
+                args_offset=0x2000,
+                args_size=0x20,
+                ret_offset=0x2060,
+                ret_size=0x20,
             )
-            + Op.MSTORE(offset=0x2080, value=0x1000)
-            + Op.JUMP(pc=0x4E9)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2080, value=0x1000)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(Op.MLOAD(offset=0x2020), Op.MLOAD(offset=0x2060)),
+        )
+        + Op.JUMPI(
+            pc=0x42B, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1)
+        )
+        + Op.MSTORE(
+            offset=0x2080,
+            value=0x9267D3DBED802941483F1AFA2A6BC68DE5F653128ACA9BF1461C5D0A3AD36ED2,  # noqa: E501
+        )
+        + Op.JUMP(pc=0x435)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2080, value=0xDEADBEEF)
+        + Op.JUMPDEST * 2
+        + Op.JUMPI(
+            pc=0x448, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xFF)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x4EA)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x20A0, value=Op.BALANCE(address=Op.MLOAD(offset=0x2000))
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x10000000,
+                address=0x9CB657C71386D578195B90DA7DE545482E0A9440,
+                value=0x0,
+                args_offset=0x2000,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.SUB(Op.MLOAD(offset=0x2020), Op.MLOAD(offset=0x2080)),
+        )
+        + Op.MSTORE(
+            offset=0x2020, value=Op.BALANCE(address=Op.MLOAD(offset=0x2000))
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x10000000,
+                address=0xE2CFFD6602680D87B7872C3B69F42FA631058CBF,
+                value=0x0,
+                args_offset=0x2040,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x100, value=0x0)
-            + Op.STOP
-        ),
-        storage={0x100: 0x60A7},
+        )
+        + Op.MSTORE(
+            offset=0x2060, value=Op.BALANCE(address=Op.MLOAD(offset=0x2000))
+        )
+        + Op.MSTORE(
+            offset=0x2060,
+            value=Op.SUB(Op.MLOAD(offset=0x2060), Op.MLOAD(offset=0x2020)),
+        )
+        + Op.MSTORE(
+            offset=0x2020,
+            value=Op.SUB(Op.MLOAD(offset=0x2020), Op.MLOAD(offset=0x20A0)),
+        )
+        + Op.JUMPI(
+            pc=0x4E1, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1)
+        )
+        + Op.MSTORE(offset=0x2080, value=0x1000)
+        + Op.JUMP(pc=0x4E9)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2080, value=0x1000)
+        + Op.JUMPDEST * 2
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(Op.MLOAD(offset=0x2020), Op.MLOAD(offset=0x2060)),
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.SUB(Op.MLOAD(offset=0x2020), Op.MLOAD(offset=0x2080)),
+        )
+        + Op.SSTORE(key=0x100, value=0x0)
+        + Op.STOP,
+        storage={256: 24743},
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x2d876fd03a90703f170c256363ba225f9494e604"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=Op.CALLDATALOAD(offset=0x0)) + Op.STOP,
-        balance=4096,
-        nonce=0,
-        address=Address("0x9cb657c71386d578195b90da7de545482e0a9440"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=Op.CALLDATALOAD(offset=0x0)) + Op.STOP,
-        balance=4096,
-        nonce=0,
-        address=Address("0xe2cffd6602680d87b7872c3b69f42fa631058cbf"),  # noqa: E501
+        address=Address(0x2D876FD03A90703F170C256363BA225F9494E604),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Bytes("048071d3") + Hash(0x31) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x31) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x31) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x31) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x31) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x31) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x31) + Hash(0x1) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x31) + Hash(0x2) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x31) + Hash(0x1) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x31) + Hash(0x2) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x3B) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x3B) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x3B) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3B) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3B) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x3B) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x3B) + Hash(0x1) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x3B) + Hash(0x2) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x3B) + Hash(0x1) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x3B) + Hash(0x2) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x1) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x2) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x1) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x2) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x3F) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x3F) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x3F) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3F) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3F) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x3F) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x3F) + Hash(0x1) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x3F) + Hash(0x2) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x3F) + Hash(0x1) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x3F) + Hash(0x2) + Hash(0x4),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0x1) + Hash(0x3),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0x2) + Hash(0x3),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0x1) + Hash(0x4),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0x2) + Hash(0x4),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0x1) + Hash(0x3),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0x2) + Hash(0x3),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0x1) + Hash(0x4),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0x2) + Hash(0x4),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0x1) + Hash(0x3),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0x2) + Hash(0x3),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0x1) + Hash(0x4),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0x2) + Hash(0x4),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0x1) + Hash(0x3),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0x2) + Hash(0x3),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0x1) + Hash(0x4),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0x2) + Hash(0x4),
+        Bytes("048071d3") + Hash(0xFF) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0xFF) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xFF) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0xFF) + Hash(0x1) + Hash(0x3),
+        Bytes("048071d3") + Hash(0xFF) + Hash(0x1) + Hash(0x4),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        target: Account(
+            storage={0: 0, 1: 0, 2: 0, 3: 0, 4: 0, 5: 0, 6: 0, 256: 0},
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stBadOpcode/test_measure_gas.py b/tests/ported_static/stBadOpcode/test_measure_gas.py
index 4579bfdcd1b..b262b96b127 100644
--- a/tests/ported_static/stBadOpcode/test_measure_gas.py
+++ b/tests/ported_static/stBadOpcode/test_measure_gas.py
@@ -2,7 +2,7 @@
 Ori Pomerantz   qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stBadOpcode/measureGasFiller.yml
+state_tests/stBadOpcode/measureGasFiller.yml
 """
 
 import pytest
@@ -11,10 +11,16 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,124 +28,104 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stBadOpcode/measureGasFiller.yml"],
+    ["state_tests/stBadOpcode/measureGasFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f2",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 144}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="CREATE",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f1",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 144}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="CREATE2",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f5",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 32193}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="CALL",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f0",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 32089}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="CALLCODE",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f4",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 141}
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="DELEGATECALL",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 221}
-                )
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="STATICCALL",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000051",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 8110}
-                )
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="MLOAD",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000053",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 8113}
-                )
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="MSTORE",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000052",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 8113}
-                )
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="MSTORE8",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 18348}
-                )
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="SHA3",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000fa",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 141}
-                )
-            },
+        pytest.param(
+            10,
+            0,
+            0,
+            id="EXTCODE",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_measure_gas(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz   qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Ori Pomerantz   qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000C0DEF0)
+    contract_1 = Address(0x0000000000000000000000000000000000C0DEF5)
+    contract_2 = Address(0x000000000000000000000000000000000000CA11)
+    contract_3 = Address(0x0000000000000000000000000000000000C0DEF1)
+    contract_4 = Address(0x0000000000000000000000000000000000C0DEF2)
+    contract_5 = Address(0x0000000000000000000000000000000000C0DEF4)
+    contract_6 = Address(0x0000000000000000000000000000000000C0DEFA)
+    contract_7 = Address(0x0000000000000000000000000000000000C0DE51)
+    contract_8 = Address(0x0000000000000000000000000000000000C0DE52)
+    contract_9 = Address(0x0000000000000000000000000000000000C0DE53)
+    contract_10 = Address(0x0000000000000000000000000000000000C0DE20)
+    contract_11 = Address(0x0000000000000000000000000000000000C0DE3B)
+    contract_12 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -153,244 +139,297 @@ def test_measure_gas(
         gas_limit=100000000,
     )
 
-    # Source: Yul
-    # {
-    #    stop()
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
+    # Source: yul
+    # berlin {
+    #    pop(create(0, 0, 0x200))
     # }
-    pre.deploy_contract(
-        code=bytes.fromhex("00"),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CREATE(value=Op.DUP1, offset=0x0, size=0x200) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x000000000000000000000000000000000000ca11"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DEF0),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #    let useless := keccak256(0,0xBEEF)
+    # Source: yul
+    # berlin {
+    #    // SALT needs to be different each time
+    #    pop(create2(0, 0, 0x200, add(0x5A17, gas())))
     # }
-    pre.deploy_contract(
-        code=Op.SHA3(offset=0x0, size=0xBEEF) + Op.STOP,
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.CREATE2(
+            value=Op.DUP1, offset=0x0, size=0x200, salt=Op.ADD(0x5A17, Op.GAS)
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0de20"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DEF5),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #   let addr := 0xCA11
-    #   extcodecopy(addr, 0, 0, extcodesize(addr))
+    # Source: yul
+    # berlin {
+    #    stop()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH2[0xCA11]
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.EXTCODESIZE(address=Op.DUP3)
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0de3b"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000CA11),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #    let useless := mload(0xB000)
     # }
-    pre.deploy_contract(
+    contract_7 = pre.deploy_contract(  # noqa: F841
         code=Op.MLOAD(offset=0xB000) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0de51"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DE51),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #    mstore(0xB000, 0xFF)
     # }
-    pre.deploy_contract(
+    contract_8 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0xB000, value=0xFF) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0de52"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DE52),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #    mstore8(0xB000, 0xFF)
     # }
-    pre.deploy_contract(
+    contract_9 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE8(offset=0xB000, value=0xFF) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0de53"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DE53),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #    pop(create(0, 0, 0x200))
+    # Source: yul
+    # berlin {
+    #    let useless := keccak256(0,0xBEEF)
     # }
-    pre.deploy_contract(
-        code=Op.CREATE(value=Op.DUP1, offset=0x0, size=0x200) + Op.STOP,
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.SHA3(offset=0x0, size=0xBEEF) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0def0"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DE20),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #    let retval := call(gas(), 0xCA11, 0, 0, 0x100, 0, 0x100)
+    # Source: yul
+    # berlin {
+    #   // Find the operation's cost in gas
+    #   let min :=     0
+    #   let max := 60000
+    #   let addr := add(0xC0DE00, calldataload(0x04))
+    #
+    #   for { } gt(sub(max,min), 1) { } { // Until we get the exact figure
+    #      let middle := div(add(min,max),2)
+    #      let result := call(middle, addr, 0, 0, 0, 0, 0)
+    #      if eq(result, 0) { min := middle }
+    #      if eq(result, 1) { max := middle }
+    #   }
+    #   sstore(0, max)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=Op.GAS,
-                address=0xCA11,
-                value=Op.DUP1,
-                args_offset=Op.DUP2,
-                args_size=Op.DUP2,
-                ret_offset=0x0,
-                ret_size=0x100,
-            )
-            + Op.STOP
-        ),
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH2[0xEA60]
+        + Op.ADD(Op.CALLDATALOAD(offset=0x4), 0xC0DE00)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1C, condition=Op.GT(Op.SUB(Op.DUP5, Op.DUP2), 0x1))
+        + Op.SSTORE(key=0x0, value=Op.DUP3)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.DIV(Op.ADD(Op.DUP3, Op.DUP4), 0x2)
+        + Op.CALL(
+            gas=Op.DUP7,
+            address=Op.DUP8,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.JUMPI(pc=0x44, condition=Op.ISZERO(Op.DUP1))
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.JUMPI(pc=0x3D, condition=Op.EQ)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMP(pc=0xD)
+        + Op.JUMPDEST
+        + Op.SWAP3
+        + Op.POP
+        + Op.CODESIZE
+        + Op.JUMP(pc=0x38)
+        + Op.JUMPDEST
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.POP
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.JUMP(pc=0x31),
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0def1"),  # noqa: E501
+        nonce=1,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #    let retval := callcode(gas(), 0xCA11, 0, 0, 0x100, 0, 0x100)
+    # Source: yul
+    # berlin {
+    #    let retval := call(gas(), 0xCA11, 0, 0, 0x100, 0, 0x100)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=Op.GAS,
-                address=0xCA11,
-                value=Op.DUP1,
-                args_offset=Op.DUP2,
-                args_size=Op.DUP2,
-                ret_offset=0x0,
-                ret_size=0x100,
-            )
-            + Op.STOP
-        ),
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            value=Op.DUP1,
+            args_offset=Op.DUP2,
+            args_size=Op.DUP2,
+            ret_offset=0x0,
+            ret_size=0x100,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0def2"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DEF1),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #    let retval := delegatecall(gas(), 0xCA11, 0, 0x100, 0, 0x100)
+    # Source: yul
+    # berlin {
+    #   let addr := 0xCA11
+    #   extcodecopy(addr, 0, 0, extcodesize(addr))
     # }
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0xCA11,
-                args_offset=Op.DUP2,
-                args_size=Op.DUP2,
-                ret_offset=0x0,
-                ret_size=0x100,
-            )
-            + Op.STOP
-        ),
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH2[0xCA11]
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.EXTCODESIZE(address=Op.DUP3)
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0def4"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DE3B),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #    // SALT needs to be different each time
-    #    pop(create2(0, 0, 0x200, add(0x5A17, gas())))
+    # Source: yul
+    # berlin {
+    #    let retval := staticcall(gas(), 0xCA11, 0, 0x100, 0, 0x100)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.CREATE2(
-                value=Op.DUP1,
-                offset=0x0,
-                size=0x200,
-                salt=Op.ADD(0x5A17, Op.GAS),
-            )
-            + Op.STOP
-        ),
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            args_offset=Op.DUP2,
+            args_size=Op.DUP2,
+            ret_offset=0x0,
+            ret_size=0x100,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0def5"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DEFA),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #    let retval := staticcall(gas(), 0xCA11, 0, 0x100, 0, 0x100)
+    # Source: yul
+    # berlin {
+    #    let retval := delegatecall(gas(), 0xCA11, 0, 0x100, 0, 0x100)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=Op.GAS,
-                address=0xCA11,
-                args_offset=Op.DUP2,
-                args_size=Op.DUP2,
-                ret_offset=0x0,
-                ret_size=0x100,
-            )
-            + Op.STOP
-        ),
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            args_offset=Op.DUP2,
+            args_size=Op.DUP2,
+            ret_offset=0x0,
+            ret_size=0x100,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0defa"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DEF4),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
-    # Source: Yul
-    # {
-    #   // Find the operation's cost in gas
-    #   let min :=     0
-    #   let max := 60000
-    #   let addr := add(0xC0DE00, calldataload(0x04))
-    #
-    #   for { } gt(sub(max,min), 1) { } { // Until we get the exact figure
-    #      let middle := div(add(min,max),2)
-    #      let result := call(middle, addr, 0, 0, 0, 0, 0)
-    #      if eq(result, 0) { min := middle }
-    #      if eq(result, 1) { max := middle }
-    #   }
-    #   sstore(0, max)
+    # Source: yul
+    # berlin {
+    #    let retval := callcode(gas(), 0xCA11, 0, 0, 0x100, 0, 0x100)
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH2[0xEA60]
-            + Op.ADD(Op.CALLDATALOAD(offset=0x4), 0xC0DE00)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x1C, condition=Op.GT(Op.SUB(Op.DUP5, Op.DUP2), 0x1))
-            + Op.SSTORE(key=0x0, value=Op.DUP3)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.DIV(Op.ADD(Op.DUP3, Op.DUP4), 0x2)
-            + Op.CALL(
-                gas=Op.DUP7,
-                address=Op.DUP8,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.JUMPI(pc=0x44, condition=Op.ISZERO(Op.DUP1))
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.JUMPI(pc=0x3D, condition=Op.EQ)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMP(pc=0xD)
-            + Op.JUMPDEST
-            + Op.SWAP3
-            + Op.POP
-            + Op.CODESIZE
-            + Op.JUMP(pc=0x38)
-            + Op.JUMPDEST
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.POP
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.JUMP(pc=0x31)
-        ),
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA11,
+            value=Op.DUP1,
+            args_offset=Op.DUP2,
+            args_size=Op.DUP2,
+            ret_offset=0x0,
+            ret_size=0x100,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DEF2),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_12: Account(storage={0: 32089})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_12: Account(storage={0: 32193})},
+        },
+        {
+            "indexes": {"data": [2, 3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_12: Account(storage={0: 144})},
+        },
+        {
+            "indexes": {"data": [4, 5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_12: Account(storage={0: 141})},
+        },
+        {
+            "indexes": {"data": [6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_12: Account(storage={0: 8110})},
+        },
+        {
+            "indexes": {"data": [8, 7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_12: Account(storage={0: 8113})},
+        },
+        {
+            "indexes": {"data": [10], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_12: Account(storage={0: 221})},
+        },
+        {
+            "indexes": {"data": [9], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_12: Account(storage={0: 18348})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0xF0),
+        Bytes("693c6139") + Hash(0xF5),
+        Bytes("693c6139") + Hash(0xF1),
+        Bytes("693c6139") + Hash(0xF2),
+        Bytes("693c6139") + Hash(0xF4),
+        Bytes("693c6139") + Hash(0xFA),
+        Bytes("693c6139") + Hash(0x51),
+        Bytes("693c6139") + Hash(0x52),
+        Bytes("693c6139") + Hash(0x53),
+        Bytes("693c6139") + Hash(0x20),
+        Bytes("693c6139") + Hash(0x3B),
+    ]
+    tx_gas = [16777216]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
+        to=contract_12,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stBadOpcode/test_operation_diff_gas.py b/tests/ported_static/stBadOpcode/test_operation_diff_gas.py
index 2319e390cad..82a3e5c4cbd 100644
--- a/tests/ported_static/stBadOpcode/test_operation_diff_gas.py
+++ b/tests/ported_static/stBadOpcode/test_operation_diff_gas.py
@@ -2,7 +2,7 @@
 Ori Pomerantz   qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stBadOpcode/operationDiffGasFiller.yml
+state_tests/stBadOpcode/operationDiffGasFiller.yml
 """
 
 import pytest
@@ -11,10 +11,16 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,130 +28,104 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stBadOpcode/operationDiffGasFiller.yml"],
+    ["state_tests/stBadOpcode/operationDiffGasFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2700}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="CREATE",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2700}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="CREATE2",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000c0def5"): Account(
-                    storage={0: 0x1C1BD7A2F25CA2F4577AD12388656BC147F96DAB}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 54300}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="CALL",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000c0def0"): Account(
-                    storage={0: 0xB44F2C88D3D4283CD1E54E418C4FF7E6A6C73202}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 54200}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="CALLCODE",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2700}
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="DELEGATECALL",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2800}
-                )
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="STATICCALL",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000005100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 9200}
-                )
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="MLOAD",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000005300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 9200}
-                )
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="MSTORE",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000005200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 9200}
-                )
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="MSTORE8",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 18400}
-                )
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="SHA3",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2700}
-                )
-            },
+        pytest.param(
+            10,
+            0,
+            0,
+            id="EXTCODE",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_operation_diff_gas(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz   qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Ori Pomerantz   qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000C0DEF0)
+    contract_1 = Address(0x0000000000000000000000000000000000C0DEF5)
+    contract_2 = Address(0x0000000000000000000000000000000000C0DEF1)
+    contract_3 = Address(0x0000000000000000000000000000000000C0DEF2)
+    contract_4 = Address(0x0000000000000000000000000000000000C0DEF4)
+    contract_5 = Address(0x0000000000000000000000000000000000C0DEFA)
+    contract_6 = Address(0x000000000000000000000000000000000000CA11)
+    contract_7 = Address(0x0000000000000000000000000000000000C0DE51)
+    contract_8 = Address(0x0000000000000000000000000000000000C0DE52)
+    contract_9 = Address(0x0000000000000000000000000000000000C0DE53)
+    contract_10 = Address(0x0000000000000000000000000000000000C0DE20)
+    contract_11 = Address(0x0000000000000000000000000000000000C0DE3B)
+    contract_12 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -159,244 +139,282 @@ def test_operation_diff_gas(
         gas_limit=100000000,
     )
 
-    # Source: Yul
-    # {
-    #    mstore(0, 0xDEADBEEF)
-    #    return(0, 0x100)
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
+    # Source: yul
+    # berlin {
+    #    sstore(0,create(0, 0, 0x200))
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xDEADBEEF)
-            + Op.RETURN(offset=0x0, size=0x100)
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.CREATE(value=Op.DUP1, offset=0x0, size=0x200)
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x000000000000000000000000000000000000ca11"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DEF0),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #    let useless := keccak256(0,0xBEEF)
+    # Source: yul
+    # berlin {
+    #    sstore(0,create2(0, 0, 0x200, 0x5A17))
     # }
-    pre.deploy_contract(
-        code=Op.SHA3(offset=0x0, size=0xBEEF) + Op.STOP,
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE2(
+                value=Op.DUP1, offset=0x0, size=0x200, salt=0x5A17
+            ),
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0de20"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DEF5),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #   let addr := 0xCA11
-    #   extcodecopy(addr, 0, 0, extcodesize(addr))
+    # Source: yul
+    # berlin {
+    #    mstore(0, 0xDEADBEEF)
+    #    return(0, 0x100)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH2[0xCA11]
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.EXTCODESIZE(address=Op.DUP3)
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.STOP
-        ),
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xDEADBEEF)
+        + Op.RETURN(offset=0x0, size=0x100),
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0de3b"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000CA11),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #    let useless := mload(0xBEEF)
     # }
-    pre.deploy_contract(
+    contract_7 = pre.deploy_contract(  # noqa: F841
         code=Op.MLOAD(offset=0xBEEF) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0de51"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DE51),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #    mstore(0xBEEF, 0xFF)
     # }
-    pre.deploy_contract(
+    contract_8 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0xBEEF, value=0xFF) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0de52"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DE52),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #    mstore8(0xBEEF, 0xFF)
     # }
-    pre.deploy_contract(
+    contract_9 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE8(offset=0xBEEF, value=0xFF) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0de53"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DE53),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #    sstore(0,create(0, 0, 0x200))
+    # Source: yul
+    # berlin {
+    #    let useless := keccak256(0,0xBEEF)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(value=Op.DUP1, offset=0x0, size=0x200),
-            )
-            + Op.STOP
-        ),
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.SHA3(offset=0x0, size=0xBEEF) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0def0"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DE20),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #    let retval := call(gas(), 0xCA11, 0, 0, 0x100, 0, 0x100)
+    # Source: yul
+    # berlin {
+    #   // Run the operation with gasAmt, gasAmt+gasDiff, gasAmt+2*gasDiff, etc.  # noqa: E501
+    #   let gasAmt := calldataload(0x24)
+    #   let gasDiff := calldataload(0x44)
+    #   let addr := add(0xC0DE00, calldataload(0x04))
+    #   let result := 0
+    #
+    #   for { } eq(result, 0) { } {     // Until the operation is successful
+    #      result := call(gasAmt, addr, 0, 0, 0, 0, 0)
+    #      gasAmt := add(gasAmt, gasDiff)
+    #   }
+    #   sstore(0, sub(gasAmt, gasDiff))
     # }
-    pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=Op.GAS,
-                address=0xCA11,
-                value=Op.DUP1,
-                args_offset=Op.DUP2,
-                args_size=Op.DUP2,
-                ret_offset=0x0,
-                ret_size=0x100,
-            )
-            + Op.STOP
-        ),
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x44)
+        + Op.CALLDATALOAD(offset=0x24)
+        + Op.ADD(Op.CALLDATALOAD(offset=0x4), 0xC0DE00)
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1C, condition=Op.EQ)
+        + Op.POP
+        + Op.SSTORE(key=0x0, value=Op.SUB)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.DUP4
+        + Op.CALL(
+            gas=Op.DUP10,
+            address=Op.DUP8,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=Op.DUP2,
+        )
+        + Op.SWAP4
+        + Op.ADD
+        + Op.SWAP3
+        + Op.JUMP(pc=0x11),
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0def1"),  # noqa: E501
+        nonce=1,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #    let retval := callcode(gas(), 0xCA11, 0, 0, 0x100, 0, 0x100)
+    # Source: yul
+    # berlin {
+    #    let retval := call(gas(), 0xCA11, 0, 0, 0x100, 0, 0x100)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=Op.GAS,
-                address=0xCA11,
-                value=Op.DUP1,
-                args_offset=Op.DUP2,
-                args_size=Op.DUP2,
-                ret_offset=0x0,
-                ret_size=0x100,
-            )
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            value=Op.DUP1,
+            args_offset=Op.DUP2,
+            args_size=Op.DUP2,
+            ret_offset=0x0,
+            ret_size=0x100,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0def2"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DEF1),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #    let retval := delegatecall(gas(), 0xCA11, 0, 0x100, 0, 0x100)
+    # Source: yul
+    # berlin {
+    #   let addr := 0xCA11
+    #   extcodecopy(addr, 0, 0, extcodesize(addr))
     # }
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0xCA11,
-                args_offset=Op.DUP2,
-                args_size=Op.DUP2,
-                ret_offset=0x0,
-                ret_size=0x100,
-            )
-            + Op.STOP
-        ),
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH2[0xCA11]
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.EXTCODESIZE(address=Op.DUP3)
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0def4"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DE3B),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #    sstore(0,create2(0, 0, 0x200, 0x5A17))
+    # Source: yul
+    # berlin {
+    #    let retval := staticcall(gas(), 0xCA11, 0, 0x100, 0, 0x100)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE2(
-                    value=Op.DUP1,
-                    offset=0x0,
-                    size=0x200,
-                    salt=0x5A17,
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            args_offset=Op.DUP2,
+            args_size=Op.DUP2,
+            ret_offset=0x0,
+            ret_size=0x100,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0def5"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DEFA),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #    let retval := staticcall(gas(), 0xCA11, 0, 0x100, 0, 0x100)
+    # Source: yul
+    # berlin {
+    #    let retval := delegatecall(gas(), 0xCA11, 0, 0x100, 0, 0x100)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=Op.GAS,
-                address=0xCA11,
-                args_offset=Op.DUP2,
-                args_size=Op.DUP2,
-                ret_offset=0x0,
-                ret_size=0x100,
-            )
-            + Op.STOP
-        ),
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            args_offset=Op.DUP2,
+            args_size=Op.DUP2,
+            ret_offset=0x0,
+            ret_size=0x100,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0defa"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DEF4),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
-    # Source: Yul
-    # {
-    #   // Run the operation with gasAmt, gasAmt+gasDiff, gasAmt+2*gasDiff, etc.  # noqa: E501
-    #   let gasAmt := calldataload(0x24)
-    #   let gasDiff := calldataload(0x44)
-    #   let addr := add(0xC0DE00, calldataload(0x04))
-    #   let result := 0
-    #
-    #   for { } eq(result, 0) { } {     // Until the operation is successful
-    #      result := call(gasAmt, addr, 0, 0, 0, 0, 0)
-    #      gasAmt := add(gasAmt, gasDiff)
-    #   }
-    #   sstore(0, sub(gasAmt, gasDiff))
+    # Source: yul
+    # berlin {
+    #    let retval := callcode(gas(), 0xCA11, 0, 0, 0x100, 0, 0x100)
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x44)
-            + Op.CALLDATALOAD(offset=0x24)
-            + Op.ADD(Op.CALLDATALOAD(offset=0x4), 0xC0DE00)
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x1C, condition=Op.EQ)
-            + Op.POP
-            + Op.SSTORE(key=0x0, value=Op.SUB)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.DUP4
-            + Op.CALL(
-                gas=Op.DUP10,
-                address=Op.DUP8,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=Op.DUP2,
-            )
-            + Op.SWAP4
-            + Op.ADD
-            + Op.SWAP3
-            + Op.JUMP(pc=0x11)
-        ),
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA11,
+            value=Op.DUP1,
+            args_offset=Op.DUP2,
+            args_size=Op.DUP2,
+            ret_offset=0x0,
+            ret_size=0x100,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DEF2),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_12: Account(storage={0: 54200})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_12: Account(storage={0: 54300})},
+        },
+        {
+            "indexes": {"data": [2, 3, 4, 5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_12: Account(storage={0: 2700})},
+        },
+        {
+            "indexes": {"data": [8, 6, 7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_12: Account(storage={0: 9200})},
+        },
+        {
+            "indexes": {"data": [10], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_12: Account(storage={0: 2800})},
+        },
+        {
+            "indexes": {"data": [9], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_12: Account(storage={0: 18400})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("048071d3") + Hash(0xF0) + Hash(0x0) + Hash(0x64),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0x0) + Hash(0x64),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0x0) + Hash(0x64),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0x0) + Hash(0x64),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0x0) + Hash(0x64),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0x0) + Hash(0x64),
+        Bytes("048071d3") + Hash(0x51) + Hash(0x0) + Hash(0x64),
+        Bytes("048071d3") + Hash(0x52) + Hash(0x0) + Hash(0x64),
+        Bytes("048071d3") + Hash(0x53) + Hash(0x0) + Hash(0x64),
+        Bytes("048071d3") + Hash(0x20) + Hash(0x0) + Hash(0x64),
+        Bytes("048071d3") + Hash(0x3B) + Hash(0x0) + Hash(0x64),
+    ]
+    tx_gas = [16777216]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
+        to=contract_12,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stBugs/__init__.py b/tests/ported_static/stBugs/__init__.py
index 0e48ad4e537..a0617deafeb 100644
--- a/tests/ported_static/stBugs/__init__.py
+++ b/tests/ported_static/stBugs/__init__.py
@@ -1 +1 @@
-"""Tests ported from stBugs."""
+"""Ported static tests: stBugs."""  # noqa: N999
diff --git a/tests/ported_static/stBugs/test_random_statetest_default_minus_tue_07_58_41_minus_15153_minus_575192.py b/tests/ported_static/stBugs/test_random_statetest_default_minus_tue_07_58_41_minus_15153_minus_575192.py
index ceaaa55f5c2..ebb0afbf4b4 100644
--- a/tests/ported_static/stBugs/test_random_statetest_default_minus_tue_07_58_41_minus_15153_minus_575192.py
+++ b/tests/ported_static/stBugs/test_random_statetest_default_minus_tue_07_58_41_minus_15153_minus_575192.py
@@ -1,17 +1,16 @@
 """
-Is a canon example of a test found by fuzzing with EVMlab, demoing how a...
+Test: this is a canon example of a test found by fuzzing with EVMlab,...
 
 Ported from:
-tests/static/state_tests/stBugs
-randomStatetestDEFAULT-Tue_07_58_41-15153-575192Filler.json
+state_tests/stBugs/randomStatetestDEFAULT-Tue_07_58_41-15153-575192Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stBugs/randomStatetestDEFAULT-Tue_07_58_41-15153-575192Filler.json",  # noqa: E501
+        "state_tests/stBugs/randomStatetestDEFAULT-Tue_07_58_41-15153-575192Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_random_statetest_default_minus_tue_07_58_41_minus_15153_minus_575192(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Is a canon example of a test found by fuzzing with EVMlab,..."""
-    coinbase = Address("0xdf5277352f687058bec2d433f2e2d1b7f0c970ae")
-    sender = EOA(
-        key=0xEDDB5B1A0109F06919449A6279E9DE92A892086BDD851894EB8FFA6C8FF4E563
-    )
+    """Test: tis is a canon example of a test found by fuzzing with EVMlab,..."""  # noqa: E501
+    coinbase = Address(0xDF5277352F687058BEC2D433F2E2D1B7F0C970AE)
+    sender = pre.fund_eoa(amount=0x5D8FDD3FF54298B4, nonce=28)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,40 +45,48 @@ def test_random_statetest_default_minus_tue_07_58_41_minus_15153_minus_575192(
         gas_limit=20000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x62abcdefff
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0xABCDEF),
         nonce=28,
-        address=Address("0x589d1b72331c25effee38732d79f48f729681853"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5D8FDD3FF54298B4, nonce=28)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.PUSH2[0xDEAD]
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xDEAD,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.SSTORE(key=0x1, value=Op.EXTCODEHASH(address=0xABCDEF))
-        ),
+    # Source: raw
+    # 0x61dead6000600060006000600061dead5af162abcdef3f600155
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH2[0xDEAD]
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xDEAD,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.SSTORE(key=0x1, value=Op.EXTCODEHASH(address=0xABCDEF)),
         nonce=28,
-        address=coinbase,  # noqa: E501
+        address=Address(0xDF5277352F687058BEC2D433F2E2D1B7F0C970AE),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
         to=coinbase,
+        data=Bytes(""),
         gas_limit=6282759,
-        gas_price=11,
         nonce=28,
+        gas_price=11,
     )
 
-    post: dict = {}
+    post = {
+        coinbase: Account(
+            storage={},
+            code=bytes.fromhex(
+                "61dead6000600060006000600061dead5af162abcdef3f600155"
+            ),
+            nonce=28,
+        ),
+        sender: Account(storage={}, code=b"", nonce=29),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stBugs/test_random_statetest_default_minus_tue_07_58_41_minus_15153_minus_575192_london.py b/tests/ported_static/stBugs/test_random_statetest_default_minus_tue_07_58_41_minus_15153_minus_575192_london.py
index 44438298a3b..254bb3ee7f4 100644
--- a/tests/ported_static/stBugs/test_random_statetest_default_minus_tue_07_58_41_minus_15153_minus_575192_london.py
+++ b/tests/ported_static/stBugs/test_random_statetest_default_minus_tue_07_58_41_minus_15153_minus_575192_london.py
@@ -1,17 +1,16 @@
 """
-Is a canon example of a test found by fuzzing with EVMlab, demoing how a...
+Test: this is a canon example of a test found by fuzzing with EVMlab,...
 
 Ported from:
-tests/static/state_tests/stBugs
-randomStatetestDEFAULT-Tue_07_58_41-15153-575192_londonFiller.json
+state_tests/stBugs/randomStatetestDEFAULT-Tue_07_58_41-15153-575192_londonFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stBugs/randomStatetestDEFAULT-Tue_07_58_41-15153-575192_londonFiller.json",  # noqa: E501
+        "state_tests/stBugs/randomStatetestDEFAULT-Tue_07_58_41-15153-575192_londonFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_random_statetest_default_minus_tue_07_58_41_minus_15153_minus_575192_lo
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Is a canon example of a test found by fuzzing with EVMlab,..."""
-    coinbase = Address("0xdf5277352f687058bec2d433f2e2d1b7f0c970ae")
-    sender = EOA(
-        key=0xEDDB5B1A0109F06919449A6279E9DE92A892086BDD851894EB8FFA6C8FF4E563
-    )
+    """Test: tis is a canon example of a test found by fuzzing with EVMlab,..."""  # noqa: E501
+    coinbase = Address(0xDF5277352F687058BEC2D433F2E2D1B7F0C970AE)
+    sender = pre.fund_eoa(amount=0x5D8FDD3FF54298B4, nonce=28)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,39 +45,47 @@ def test_random_statetest_default_minus_tue_07_58_41_minus_15153_minus_575192_lo
         gas_limit=20000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x62abcdefff
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0xABCDEF),
         nonce=28,
-        address=Address("0x589d1b72331c25effee38732d79f48f729681853"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5D8FDD3FF54298B4, nonce=28)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.PUSH2[0xDEAD]
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xDEAD,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.SSTORE(key=0x1, value=Op.EXTCODEHASH(address=0xABCDEF))
-        ),
+    # Source: raw
+    # 0x61dead6000600060006000600061dead5af162abcdef3f600155
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH2[0xDEAD]
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xDEAD,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.SSTORE(key=0x1, value=Op.EXTCODEHASH(address=0xABCDEF)),
         nonce=28,
-        address=coinbase,  # noqa: E501
+        address=Address(0xDF5277352F687058BEC2D433F2E2D1B7F0C970AE),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
         to=coinbase,
+        data=Bytes(""),
         gas_limit=6282759,
         nonce=28,
     )
 
-    post: dict = {}
+    post = {
+        coinbase: Account(
+            storage={},
+            code=bytes.fromhex(
+                "61dead6000600060006000600061dead5af162abcdef3f600155"
+            ),
+            nonce=28,
+        ),
+        sender: Account(storage={}, code=b"", nonce=29),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stBugs/test_returndatacopy_python_bug_tue_03_48_41_minus_1432.py b/tests/ported_static/stBugs/test_returndatacopy_python_bug_tue_03_48_41_minus_1432.py
index e625f2fc610..2e34a2366d4 100644
--- a/tests/ported_static/stBugs/test_returndatacopy_python_bug_tue_03_48_41_minus_1432.py
+++ b/tests/ported_static/stBugs/test_returndatacopy_python_bug_tue_03_48_41_minus_1432.py
@@ -2,20 +2,21 @@
 Fuzzer generated bug. No code source.
 
 Ported from:
-tests/static/state_tests/stBugs
-returndatacopyPythonBug_Tue_03_48_41-1432Filler.json
+state_tests/stBugs/returndatacopyPythonBug_Tue_03_48_41-1432Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,33 +25,50 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stBugs/returndatacopyPythonBug_Tue_03_48_41-1432Filler.json",  # noqa: E501
+        "state_tests/stBugs/returndatacopyPythonBug_Tue_03_48_41-1432Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (8777204, 2759170368, {}),
-        (8777204, 0, {}),
-        (3000000, 2759170368, {}),
-        (3000000, 0, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-g0-v1",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1-v0",
+        ),
+        pytest.param(
+            0,
+            1,
+            1,
+            id="-g1-v1",
+        ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
-@pytest.mark.pre_alloc_mutable
 def test_returndatacopy_python_bug_tue_03_48_41_minus_1432(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Fuzzer generated bug. No code source."""
-    coinbase = Address("0x1000000000000000000000000000000000000000")
-    sender = EOA(
-        key=0x7B8E1B8983BDCF0DF1A8A35F27CE0D6E94E340D0C15BD288E587771F560B3570
-    )
+    """Fuzzer generated bug."""
+    coinbase = Address(0x1000000000000000000000000000000000000000)
+    sender = pre.fund_eoa(amount=0x38BEEC8FEECA2598)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -61,201 +79,142 @@ def test_returndatacopy_python_bug_tue_03_48_41_minus_1432(
         gas_limit=23826461031063688,
     )
 
-    pre[sender] = Account(balance=0x38BEEC8FEECA2598)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=bytes.fromhex(
-            "6102dd6103e06103146052632318d76f7332f4d5419b41e6887cca98e0943f141a5c66df"  # noqa: E501
-            "986347cfe65df16abd0c6d6c4cec6593afaa8c7de1769c96cd0751aa76a98c8196fa8c92"  # noqa: E501
-            "e70d7bda1799c91c7f05de318110659b819438774667f9ec15a6e0233f75669e43360bd4"  # noqa: E501
-            "e0a0764e9f395117afcd072774ce12d13dc73305858002a921407eb6508e3a3be377d482"  # noqa: E501
-            "5dbf618a393c7c061e75a8a496a33afe0f017f2e3354789e321838b083d48893f23dced4"  # noqa: E501
-            "592e9ea08fe3f80970d6334b626c6f1f6ede8bcc81d03a7ccc244231cb6606db986101d7"  # noqa: E501
-            "61010761031c61025673ffffffffffffffffffffffffffffffffffffffff6311ecd01bfa"  # noqa: E501
-            "7aa6d0c1c5158ef0db6994192acbd4cac6abc8449d80fc2c3247194668e0d9606bd39026"  # noqa: E501
-            "6d7f78712766f4765076283ad67450d7ab4df6f3f6ee014ab802ec9d55727ed96dc0b9ce"  # noqa: E501
-            "7bd14b193dc1f0d11ce19283c77ef651d4d2e7c180715ff7fcbc995ea8b27613cc516dad"  # noqa: E501
-            "16d17f29a93220ce0d6edb0a65d3d474dbc39cba5bcb3d4fcf6a9fef19107dc04511df27"  # noqa: E501
-            "52fb346103ce6101c163459d135bf0712ab2475fbb2ba0720711a903dbecfa0429bf6811"  # noqa: E501
-            "e6e90cbb0f13d4ee61050c7052c865e0216b4096186fc604fb563fa59f761263ee91d55e"  # noqa: E501
-            "407fdffe82ca1558f793f3a218dd9ba69084621fdea97de498f0b0e1874331115e31aaad"  # noqa: E501
-            "4d87227362a9ec3e1c1be11cdb23097bbc600c64692eeadfa97f1616b8aec24564487dc7"  # noqa: E501
-            "4f8e17e6a133b5dbe576838697de73f856197203ef1a733a54f7edb0dbd60f9d52db6b5c"  # noqa: E501
-            "1477169b77f0d86917ed731a20db4b9e5b836bd26bffefab084a31c4afda166f8156612f"  # noqa: E501
-            "281da0be688e5bdb1f31ed7869bc62343a7665abad657369482449e68b3acfe820997d3d"  # noqa: E501
-            "df5785384d51aaa0612dab5ddbf2a9bf550736ad42293387d70693587d74f6ccfae5218d"  # noqa: E501
-            "01559bac159497edb6a665eae52f52784975568a159c0cae9044d258c55b10f4d1008d29"  # noqa: E501
-            "ab1df7fceb76b789e2a8cdbaa9c67c42cd1ebe81716ead0e94c721279d77d3a0b3de3115"  # noqa: E501
-            "96d547292878449ccce511e6991b3dc636a16278159a9f61014a6102216342ce224df06f"  # noqa: E501
-            "3d9a062274cd9a67ccba17c2cb06de46628e0bf703610106602e636db4b55bf061020561"  # noqa: E501
-            "02c9633ff89b31f0788e55af17e19973f2c3f5d4c21c169890b9a92491f91aa1e714605d"  # noqa: E501
-            "526103a1601f609b6103ee73d94f5374fce5edbc8e2a8697c15331677e6ebf0b6335adea"  # noqa: E501
-            "bdf46d26060d385ed594e21b02b23a6c4c157350e7ab6a3ef66f83a29845b4ba85c4fdfb"  # noqa: E501
-            "d0054a620123ad6893eff4b525b0f4b08d73285f36f3bcac6a985b906c348472b7cbc5a0"  # noqa: E501
-            "2e61678666f0c50eecdc1167f20fc1dc41c2fd95856d7752e55ede4e56f4f536a04d436a"  # noqa: E501
-            "7fd418a1ca44c0173c10f1806ba284f9c9c7c13670005de594dec538cd56c2743b66fdfa"  # noqa: E501
-            "7683ae0df6917b8bbcb53461be606ef617322e6448e3e4124dbe061257a8f486529de369"  # noqa: E501
-            "97f08ce92502957f85587a18082b5b5b49e36de5a83e8a270663088571bf2fdf8f5f29b9"  # noqa: E501
-            "49976b41e3859928a237f5e5df84c17d3c431e82328f9093e64defbdd07d74d848358009"  # noqa: E501
-            "99791abc41260472d96f9362604d077b198e859adc806beae7200cf116d2b55e89ddd564"  # noqa: E501
-            "abc3900e69a68b0f6f0e9e4f12998728815d01c42f3b109ed25561027b610132635f4495"  # noqa: E501
-            "86f06101726101ec631fe4bdc3f06101316101246103b33e60bd19610284610305fd6102"  # noqa: E501
-            "db6102e4631ea09dc6f06b72a6cf13500241c2a5e5c4e1777ea9ed9b05ba9b57d70dd270"  # noqa: E501
-            "ece76ecf21d3a41ad554f795167084dcab761d4c8437774cad4bb13b2bece16d40358df9"  # noqa: E501
-            "3ec0f49abe102cd44e475560476101f3fd605b61030a6328f7e2e9f032604a547db71c02"  # noqa: E501
-            "37247865fa2add74c8b27041c5718a2554a72662720296dff5b3b5327d59df4558b8a5b2"  # noqa: E501
-            "c9e7d15eb3947a70064f935c8fdf0a4e6f644aa31b42c17d0280e50ea92a366c3d060c12"  # noqa: E501
-            "c6a16a75522fbeb3d7cca702807f521781ab6101b252639cceb9e27f37ee8fde4ed3a23d"  # noqa: E501
-            "3ec8db334ac1caa7e06523b0132dd615cf3fc16140d34c19761617823c3af47c42bc36b6"  # noqa: E501
-            "9cb4385463595c7f6f9ea451396fe05303603e0cd401e13df744e2a67382774d94394155"  # noqa: E501
-            "1704ff14dfa8646efbb2d8abc4ac6e258e99240372924b8001f8f0650d66b37411d484b1"  # noqa: E501
-            "8f41e779702bd1c169fa52bbfc8af4a45f20acb0ef956edb2ecbc0d4eadbbbf6732f8bd3"  # noqa: E501
-            "3b367a33c0faf0cf1970bcd38093a50a44fd253b0e74f2706239c499217b7bdae332e21d"  # noqa: E501
-            "5d5e7e795c998cceed14cf46977e7d3cbb3c79ef0530c36fa8ac3fd8d49f10bb0ae919fa"  # noqa: E501
-            "149adead7f67dae0b9ba628e056e0e87e029b8e5f42821d775338e6774301ecb428b3938"  # noqa: E501
-            "237c6ee22b0b5edf2ad6997869f427ba0672a7168614233e85f61dae5ed428643a53f605"  # noqa: E501
-            "116d6dad586dce62833a62ca8c914c646b1f861a5b1c4ea7298a95029e63cb849fe08b6c"  # noqa: E501
-            "943cb9d854c7d50ad04cfdfe64718e2868b8f2b53e55fe01a152c8496cbcc69956787447"  # noqa: E501
-            "062b734cebde6c6452e9efc4aba5bf071cbff56208a52561a8ef635f52399b724f3369d9"  # noqa: E501
-            "88884f58166d734881774eff46d77b76b189c89c55b1c6591f178d2d21bf2b023adf9bc5"  # noqa: E501
-            "b862127935e3346d98d56047a3f71241fd5a24abbb0cfc463fb8a5e67e327b055696fe51"  # noqa: E501
-            "258dd07526ebd8439bcebb514ae26dc12d653a5c1263707c5109097ec5dcdb3918ab1149"  # noqa: E501
-            "85f709d3003b50e58fba91007825a6b80073f644eaa306051808460fc3b2d8e276b2187c"  # noqa: E501
-            "583f7ef29ee0b0c34f9ee57bac9ebb996402e3300ddf06c760fc5f531f6b1e2beda77fa1"  # noqa: E501
-            "5c07f90f92422822e8d33c5d2409ea75197f7cd6d61770eddb078206cfc7c57b006cd0e9"  # noqa: E501
-            "a9ec65fa4fc683da22cfaf6dfc995feb5f8386a052851fc58b7402f32e7ef9343d4633de"  # noqa: E501
-            "f4c0a4b9be12f2cd7c646073e14ca3fb977524f677714c3d994ea05f1997a246537d2fc0"  # noqa: E501
-            "ab20ed2a5958f3712602bee2a270429abbd3ff3b9945f72f58dcf4f86eb344417a87dfa1"  # noqa: E501
-            "ebd701a0ff381bb40b620bb8287cd7781d2ef7c0fd8695f705465fbadf99fdffef2afd94"  # noqa: E501
-            "b0e76531b6ea0d537a23d2332d13c20368a0724e41bc1130a6b1ebc3464527e34c26a437"  # noqa: E501
-            "51649f9dfe4f8e7957981a9fc08558c90d38079f1921b60fe6fa448171fec55c4c630575"  # noqa: E501
-            "e811712211cf72f489a4e83a2f5427eab647b075a91064929de0a65517"
-        ),
-        balance=0x161150E7531F1933,
-        nonce=29,
-        address=Address("0x47a24dd3a5f1a6a8238efdb32782a0b56ab9a1dd"),  # noqa: E501
+    # Source: raw
+    # 0x7b1db054ccc801c0666b34b3c6242bbfc5e98f20c14fb95e0118be9ad054326f33d50e215ff59297861847ea911a6a9d566103a560a860fb60cb6342a46f5073b94f5374fce5edbc8e2a8697c15331677e6ebf0b632c1e2816f26d135e2f826dc603850e0db21d105b778732a34b873c7d943050b8659794f0bd3e841d35a2231ef6027e97f8cde11728fa2051e87933cf858e4e5e91baa74fc1e9ffe4c7b15ba600e8678f095989dc68f47e67d704be2b41c7f8670a  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SLOAD(
+            key=0x1DB054CCC801C0666B34B3C6242BBFC5E98F20C14FB95E0118BE9AD0
+        )
+        + Op.ORIGIN
+        + Op.JUMP(pc=0x33D50E215FF59297861847EA911A6A9D)
+        + Op.CALLCODE(
+            gas=0x2C1E2816,
+            address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+            value=0x42A46F50,
+            args_offset=0xCB,
+            args_size=0xFB,
+            ret_offset=0xA8,
+            ret_size=0x3A5,
+        )
+        + Op.MUL(
+            0x8732A34B873C7D943050B8659794F0BD3E841D35A2231EF6,
+            0x135E2F826DC603850E0DB21D105B,
+        )
+        + Op.PUSH31[
+            0x97F8CDE11728FA2051E87933CF858E4E5E91BAA74FC1E9FFE4C7B15BA600E8
+        ]
+        + Op.EXP(0xD704BE2B41C7F867, 0x8F095989DC68F47E),
+        balance=0x2CE99FC81ED55962,
+        nonce=63,
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x610326610100fd79c940b5f2046740058558468f238b85db7f6bbe3f3d51e92a3e326102d85268b7f7c4147541c695f376705288410b81b217e80726fb9e4c5c7b4c49eca0c1b6b9137e117c16c26c9816459f38396ffc36da48d65defdc7d055cbc846c07e81cfab0607c6cbc968774d4de7df8e3236f581e688cc2081a96b1cad9e0fb6103ca601361019f6101016364b68c8e73ffffffffffffffffffffffffffffffffffffffff63200fbd63f16017610215610161610119635af7465b73000000000000000000000000000000000000000863792c6916f1799bf4fddda49ae97714e7d325ceab23acd5f4a15b52104741161261023f608ff360197021a04ff3f933b9ad91b735bfbfe41da7066b499c5d47b6de1fe398cb91fd68f681cbb8661dd457cf713cef75dabf5ea496d7012f4c56b9fee6c4208461022d61021661036e610200630277795a73ffffffffffffffffffffffffffffffffffffffff6333d3d55ff1644720e3ce666101ad526b874cead08499d57a5497d3776102fa60ff60f561014863202b2ea873d94f5374fce5edbc8e2a8697c15331677e6ebf0b6302e83dbef1327144ce205e051f296fb116fc9e5f3c280919af70f3c93c5d5cefff338db2b1165b4918f1780a73852663192a9579a68b50eefdc639ca0b62ab4d5230  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "610326610100fd79c940b5f2046740058558468f238b85db7f6bbe3f3d51e92a3e326102"  # noqa: E501
-            "d85268b7f7c4147541c695f376705288410b81b217e80726fb9e4c5c7b4c49eca0c1b6b9"  # noqa: E501
-            "137e117c16c26c9816459f38396ffc36da48d65defdc7d055cbc846c07e81cfab0607c6c"  # noqa: E501
-            "bc968774d4de7df8e3236f581e688cc2081a96b1cad9e0fb6103ca601361019f61010163"  # noqa: E501
-            "64b68c8e73ffffffffffffffffffffffffffffffffffffffff63200fbd63f16017610215"  # noqa: E501
-            "610161610119635af7465b73000000000000000000000000000000000000000863792c69"  # noqa: E501
-            "16f1799bf4fddda49ae97714e7d325ceab23acd5f4a15b52104741161261023f608ff360"  # noqa: E501
-            "197021a04ff3f933b9ad91b735bfbfe41da7066b499c5d47b6de1fe398cb91fd68f681cb"  # noqa: E501
-            "b8661dd457cf713cef75dabf5ea496d7012f4c56b9fee6c4208461022d61021661036e61"  # noqa: E501
-            "0200630277795a73ffffffffffffffffffffffffffffffffffffffff6333d3d55ff16447"  # noqa: E501
-            "20e3ce666101ad526b874cead08499d57a5497d3776102fa60ff60f561014863202b2ea8"  # noqa: E501
-            "73d94f5374fce5edbc8e2a8697c15331677e6ebf0b6302e83dbef1327144ce205e051f29"  # noqa: E501
-            "6fb116fc9e5f3c280919af70f3c93c5d5cefff338db2b1165b4918f1780a73852663192a"  # noqa: E501
-            "9579a68b50eefdc639ca0b62ab4d5230"
+            "610326610100fd79c940b5f2046740058558468f238b85db7f6bbe3f3d51e92a3e326102d85268b7f7c4147541c695f376705288410b81b217e80726fb9e4c5c7b4c49eca0c1b6b9137e117c16c26c9816459f38396ffc36da48d65defdc7d055cbc846c07e81cfab0607c6cbc968774d4de7df8e3236f581e688cc2081a96b1cad9e0fb6103ca601361019f6101016364b68c8e73ffffffffffffffffffffffffffffffffffffffff63200fbd63f16017610215610161610119635af7465b73000000000000000000000000000000000000000863792c6916f1799bf4fddda49ae97714e7d325ceab23acd5f4a15b52104741161261023f608ff360197021a04ff3f933b9ad91b735bfbfe41da7066b499c5d47b6de1fe398cb91fd68f681cbb8661dd457cf713cef75dabf5ea496d7012f4c56b9fee6c4208461022d61021661036e610200630277795a73ffffffffffffffffffffffffffffffffffffffff6333d3d55ff1644720e3ce666101ad526b874cead08499d57a5497d3776102fa60ff60f561014863202b2ea873d94f5374fce5edbc8e2a8697c15331677e6ebf0b6302e83dbef1327144ce205e051f296fb116fc9e5f3c280919af70f3c93c5d5cefff338db2b1165b4918f1780a73852663192a9579a68b50eefdc639ca0b62ab4d5230"  # noqa: E501
         ),
         balance=0x442F5872DD93B01A,
         nonce=28,
-        address=Address("0x786208c0f93dac2045bec6a3f8a41b73ab845593"),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x6102dd6103e06103146052632318d76f7332f4d5419b41e6887cca98e0943f141a5c66df986347cfe65df16abd0c6d6c4cec6593afaa8c7de1769c96cd0751aa76a98c8196fa8c92e70d7bda1799c91c7f05de318110659b819438774667f9ec15a6e0233f75669e43360bd4e0a0764e9f395117afcd072774ce12d13dc73305858002a921407eb6508e3a3be377d4825dbf618a393c7c061e75a8a496a33afe0f017f2e3354789e321838b083d48893f23dced4592e9ea08fe3f80970d6334b626c6f1f6ede8bcc81d03a7ccc244231cb6606db986101d761010761031c61025673ffffffffffffffffffffffffffffffffffffffff6311ecd01bfa7aa6d0c1c5158ef0db6994192acbd4cac6abc8449d80fc2c3247194668e0d9606bd390266d7f78712766f4765076283ad67450d7ab4df6f3f6ee014ab802ec9d55727ed96dc0b9ce7bd14b193dc1f0d11ce19283c77ef651d4d2e7c180715ff7fcbc995ea8b27613cc516dad16d17f29a93220ce0d6edb0a65d3d474dbc39cba5bcb3d4fcf6a9fef19107dc04511df2752fb346103ce6101c163459d135bf0712ab2475fbb2ba0720711a903dbecfa0429bf6811e6e90cbb0f13d4ee61050c7052c865e0216b4096186fc604fb563fa59f761263ee91d55e407fdffe82ca1558f793f3a218dd9ba69084621fdea97de498f0b0e1874331115e31aaad4d87227362a9ec3e1c1be11cdb23097bbc600c64692eeadfa97f1616b8aec24564487dc74f8e17e6a133b5dbe576838697de73f856197203ef1a733a54f7edb0dbd60f9d52db6b5c1477169b77f0d86917ed731a20db4b9e5b836bd26bffefab084a31c4afda166f8156612f281da0be688e5bdb1f31ed7869bc62343a7665abad657369482449e68b3acfe820997d3ddf5785384d51aaa0612dab5ddbf2a9bf550736ad42293387d70693587d74f6ccfae5218d01559bac159497edb6a665eae52f52784975568a159c0cae9044d258c55b10f4d1008d29ab1df7fceb76b789e2a8cdbaa9c67c42cd1ebe81716ead0e94c721279d77d3a0b3de311596d547292878449ccce511e6991b3dc636a16278159a9f61014a6102216342ce224df06f3d9a062274cd9a67ccba17c2cb06de46628e0bf703610106602e636db4b55bf06102056102c9633ff89b31f0788e55af17e19973f2c3f5d4c21c169890b9a92491f91aa1e714605d526103a1601f609b6103ee73d94f5374fce5edbc8e2a8697c15331677e6ebf0b6335adeabdf46d26060d385ed594e21b02b23a6c4c157350e7ab6a3ef66f83a29845b4ba85c4fdfbd0054a620123ad6893eff4b525b0f4b08d73285f36f3bcac6a985b906c348472b7cbc5a02e61678666f0c50eecdc1167f20fc1dc41c2fd95856d7752e55ede4e56f4f536a04d436a7fd418a1ca44c0173c10f1806ba284f9c9c7c13670005de594dec538cd56c2743b66fdfa7683ae0df6917b8bbcb53461be606ef617322e6448e3e4124dbe061257a8f486529de36997f08ce92502957f85587a18082b5b5b49e36de5a83e8a270663088571bf2fdf8f5f29b949976b41e3859928a237f5e5df84c17d3c431e82328f9093e64defbdd07d74d84835800999791abc41260472d96f9362604d077b198e859adc806beae7200cf116d2b55e89ddd564abc3900e69a68b0f6f0e9e4f12998728815d01c42f3b109ed25561027b610132635f449586f06101726101ec631fe4bdc3f06101316101246103b33e60bd19610284610305fd6102db6102e4631ea09dc6f06b72a6cf13500241c2a5e5c4e1777ea9ed9b05ba9b57d70dd270ece76ecf21d3a41ad554f795167084dcab761d4c8437774cad4bb13b2bece16d40358df93ec0f49abe102cd44e475560476101f3fd605b61030a6328f7e2e9f032604a547db71c0237247865fa2add74c8b27041c5718a2554a72662720296dff5b3b5327d59df4558b8a5b2c9e7d15eb3947a70064f935c8fdf0a4e6f644aa31b42c17d0280e50ea92a366c3d060c12c6a16a75522fbeb3d7cca702807f521781ab6101b252639cceb9e27f37ee8fde4ed3a23d3ec8db334ac1caa7e06523b0132dd615cf3fc16140d34c19761617823c3af47c42bc36b69cb4385463595c7f6f9ea451396fe05303603e0cd401e13df744e2a67382774d943941551704ff14dfa8646efbb2d8abc4ac6e258e99240372924b8001f8f0650d66b37411d484b18f41e779702bd1c169fa52bbfc8af4a45f20acb0ef956edb2ecbc0d4eadbbbf6732f8bd33b367a33c0faf0cf1970bcd38093a50a44fd253b0e74f2706239c499217b7bdae332e21d5d5e7e795c998cceed14cf46977e7d3cbb3c79ef0530c36fa8ac3fd8d49f10bb0ae919fa149adead7f67dae0b9ba628e056e0e87e029b8e5f42821d775338e6774301ecb428b3938237c6ee22b0b5edf2ad6997869f427ba0672a7168614233e85f61dae5ed428643a53f605116d6dad586dce62833a62ca8c914c646b1f861a5b1c4ea7298a95029e63cb849fe08b6c943cb9d854c7d50ad04cfdfe64718e2868b8f2b53e55fe01a152c8496cbcc69956787447062b734cebde6c6452e9efc4aba5bf071cbff56208a52561a8ef635f52399b724f3369d988884f58166d734881774eff46d77b76b189c89c55b1c6591f178d2d21bf2b023adf9bc5b862127935e3346d98d56047a3f71241fd5a24abbb0cfc463fb8a5e67e327b055696fe51258dd07526ebd8439bcebb514ae26dc12d653a5c1263707c5109097ec5dcdb3918ab114985f709d3003b50e58fba91007825a6b80073f644eaa306051808460fc3b2d8e276b2187c583f7ef29ee0b0c34f9ee57bac9ebb996402e3300ddf06c760fc5f531f6b1e2beda77fa15c07f90f92422822e8d33c5d2409ea75197f7cd6d61770eddb078206cfc7c57b006cd0e9a9ec65fa4fc683da22cfaf6dfc995feb5f8386a052851fc58b7402f32e7ef9343d4633def4c0a4b9be12f2cd7c646073e14ca3fb977524f677714c3d994ea05f1997a246537d2fc0ab20ed2a5958f3712602bee2a270429abbd3ff3b9945f72f58dcf4f86eb344417a87dfa1ebd701a0ff381bb40b620bb8287cd7781d2ef7c0fd8695f705465fbadf99fdffef2afd94b0e76531b6ea0d537a23d2332d13c20368a0724e41bc1130a6b1ebc3464527e34c26a43751649f9dfe4f8e7957981a9fc08558c90d38079f1921b60fe6fa448171fec55c4c630575e811712211cf72f489a4e83a2f5427eab647b075a91064929de0a65517  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7e4fc1426b49cd8e2c770339616ce9c501fb746715dd4a20219229d0673ac05575993bd0"  # noqa: E501
-            "89a6663f6dff488574195b848fbb357eb7be1f61026352605861011761027f60e373c94f"  # noqa: E501
-            "5374fce5edbc8e2a8697c15331677e6ebf0b63748b4abbfa60e76101bc6103f33e60d861"  # noqa: E501
-            "036a6315193f47f07aff076e997770d03b70288679871dc28aa5a1399b21c8afa8155ecd"  # noqa: E501
-            "7e75dd05f9d7eb42fa3e79c6a2109dff2a1e53e612fbe000bed18eec8345f00574f537c7"  # noqa: E501
-            "2820d8b97350ae523a8f7467ae14a8bd9aae6be55862b685e32476cc67ae2c6a40cf5572"  # noqa: E501
-            "9540d111f44c63629458da68e7ad2a9b389ed3bb60682169ea8a7b3a1bcf92621919c062"  # noqa: E501
-            "413cb5986101236103596101776103be73d94f5374fce5edbc8e2a8697c15331677e6ebf"  # noqa: E501
-            "0b631f6d9dfffa6103716101f760163e76d609ca9a51645238e4f1f8268f973c3a01a0b6"  # noqa: E501
-            "7479a34563d1e70065610173525b64e6d218af5474c3d8045447d06c726801695cfa26fd"  # noqa: E501
-            "faa6460a868569cd662855a55716140ae07eb1e25aeaf04ae7cf54e8aa7a22206da5a6e5"  # noqa: E501
-            "2bdd3ef82ad40a4681d25811167f7b0a3f66a727652592924dc1291a6085d537c5da2d62"  # noqa: E501
-            "72a54f882460bc76407d666361c40cc56bc8778a8bc9a9b45d44c78cfe4333fe0c49418d"  # noqa: E501
-            "d61f183d41132f755340e48ababb825a26ebc0ca693a8b465121200fd21a727b4c365a65"  # noqa: E501
-            "a3255278f6705e5ca0f6146fccd3766a6e5b9decfb6e50968851e829313a2cc9d5b518e2"  # noqa: E501
-            "586166c31ba04ed3f5a377310bd9993aa534b007858d9545342410ce8c156d780a8cb477"  # noqa: E501
-            "a65efed30aa9d6bd63c48a134c9cb0c677ecda48aacef0c17c91de37e3cfdae691537424"  # noqa: E501
-            "06995ea81bbae6a201663b9b37a6a9f597ae8d5a634f40e44e517174ea92616bc228ced0"  # noqa: E501
-            "d712c265c2925470326102f26102146101b13e601d6103a360726103ec73ffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffff6319628a1bf4740e5f285d15a08a263b0a444516266b"  # noqa: E501
-            "d51fe7266771604469df3c080d07dd47c4eb9e7344a87541ddc5a6971632a021033eb354"  # noqa: E501
-            "2b375cd06bd0dfb48f6acde07152794b556839563efff1afed3b0a857615166526175e71"  # noqa: E501
-            "84b83cc2dedf61ec5d65d1eee66efcb87b4f2c73335db9fba49e3d40638cd7f462f1d3b3"  # noqa: E501
-            "15f18dc1f692a68b24036102c16101f36102f23e783d6331b166ee517c71a4ba159dd322"  # noqa: E501
-            "b9fa5f3237dfb85d2594edd580948177bd72d2244f767352371e3428d28bc6356c553b18"  # noqa: E501
-            "d00e6b3cf602061672c2abbd7763059f61940b0d19fde33f7b5a960861025b61021d6101"  # noqa: E501
-            "d361035173b94f5374fce5edbc8e2a8697c15331677e6ebf0b635ba25f69f4790d251e9a"  # noqa: E501
-            "e89c718dd41c3f57b0c304fbb83978de28d23499bdd1729c04301ff527ccc9f7ed74a8db"  # noqa: E501
-            "d906b468d4487ffba738f193e3047b02e40beb08b4f11707681ef103ec1b00585a85f272"  # noqa: E501
-            "27a179917ef15e97a359268b06ff34bcee23a869974fbca6e201cb16179743ac0f8c9f86"  # noqa: E501
-            "7003d5e26a5aad5217ebfff31407169237230772efaab6cd87fbc9fd408d4ac5a048e43f"  # noqa: E501
-            "b4e7a261037c6101f76103e13e"
+            "6102dd6103e06103146052632318d76f7332f4d5419b41e6887cca98e0943f141a5c66df986347cfe65df16abd0c6d6c4cec6593afaa8c7de1769c96cd0751aa76a98c8196fa8c92e70d7bda1799c91c7f05de318110659b819438774667f9ec15a6e0233f75669e43360bd4e0a0764e9f395117afcd072774ce12d13dc73305858002a921407eb6508e3a3be377d4825dbf618a393c7c061e75a8a496a33afe0f017f2e3354789e321838b083d48893f23dced4592e9ea08fe3f80970d6334b626c6f1f6ede8bcc81d03a7ccc244231cb6606db986101d761010761031c61025673ffffffffffffffffffffffffffffffffffffffff6311ecd01bfa7aa6d0c1c5158ef0db6994192acbd4cac6abc8449d80fc2c3247194668e0d9606bd390266d7f78712766f4765076283ad67450d7ab4df6f3f6ee014ab802ec9d55727ed96dc0b9ce7bd14b193dc1f0d11ce19283c77ef651d4d2e7c180715ff7fcbc995ea8b27613cc516dad16d17f29a93220ce0d6edb0a65d3d474dbc39cba5bcb3d4fcf6a9fef19107dc04511df2752fb346103ce6101c163459d135bf0712ab2475fbb2ba0720711a903dbecfa0429bf6811e6e90cbb0f13d4ee61050c7052c865e0216b4096186fc604fb563fa59f761263ee91d55e407fdffe82ca1558f793f3a218dd9ba69084621fdea97de498f0b0e1874331115e31aaad4d87227362a9ec3e1c1be11cdb23097bbc600c64692eeadfa97f1616b8aec24564487dc74f8e17e6a133b5dbe576838697de73f856197203ef1a733a54f7edb0dbd60f9d52db6b5c1477169b77f0d86917ed731a20db4b9e5b836bd26bffefab084a31c4afda166f8156612f281da0be688e5bdb1f31ed7869bc62343a7665abad657369482449e68b3acfe820997d3ddf5785384d51aaa0612dab5ddbf2a9bf550736ad42293387d70693587d74f6ccfae5218d01559bac159497edb6a665eae52f52784975568a159c0cae9044d258c55b10f4d1008d29ab1df7fceb76b789e2a8cdbaa9c67c42cd1ebe81716ead0e94c721279d77d3a0b3de311596d547292878449ccce511e6991b3dc636a16278159a9f61014a6102216342ce224df06f3d9a062274cd9a67ccba17c2cb06de46628e0bf703610106602e636db4b55bf06102056102c9633ff89b31f0788e55af17e19973f2c3f5d4c21c169890b9a92491f91aa1e714605d526103a1601f609b6103ee73d94f5374fce5edbc8e2a8697c15331677e6ebf0b6335adeabdf46d26060d385ed594e21b02b23a6c4c157350e7ab6a3ef66f83a29845b4ba85c4fdfbd0054a620123ad6893eff4b525b0f4b08d73285f36f3bcac6a985b906c348472b7cbc5a02e61678666f0c50eecdc1167f20fc1dc41c2fd95856d7752e55ede4e56f4f536a04d436a7fd418a1ca44c0173c10f1806ba284f9c9c7c13670005de594dec538cd56c2743b66fdfa7683ae0df6917b8bbcb53461be606ef617322e6448e3e4124dbe061257a8f486529de36997f08ce92502957f85587a18082b5b5b49e36de5a83e8a270663088571bf2fdf8f5f29b949976b41e3859928a237f5e5df84c17d3c431e82328f9093e64defbdd07d74d84835800999791abc41260472d96f9362604d077b198e859adc806beae7200cf116d2b55e89ddd564abc3900e69a68b0f6f0e9e4f12998728815d01c42f3b109ed25561027b610132635f449586f06101726101ec631fe4bdc3f06101316101246103b33e60bd19610284610305fd6102db6102e4631ea09dc6f06b72a6cf13500241c2a5e5c4e1777ea9ed9b05ba9b57d70dd270ece76ecf21d3a41ad554f795167084dcab761d4c8437774cad4bb13b2bece16d40358df93ec0f49abe102cd44e475560476101f3fd605b61030a6328f7e2e9f032604a547db71c0237247865fa2add74c8b27041c5718a2554a72662720296dff5b3b5327d59df4558b8a5b2c9e7d15eb3947a70064f935c8fdf0a4e6f644aa31b42c17d0280e50ea92a366c3d060c12c6a16a75522fbeb3d7cca702807f521781ab6101b252639cceb9e27f37ee8fde4ed3a23d3ec8db334ac1caa7e06523b0132dd615cf3fc16140d34c19761617823c3af47c42bc36b69cb4385463595c7f6f9ea451396fe05303603e0cd401e13df744e2a67382774d943941551704ff14dfa8646efbb2d8abc4ac6e258e99240372924b8001f8f0650d66b37411d484b18f41e779702bd1c169fa52bbfc8af4a45f20acb0ef956edb2ecbc0d4eadbbbf6732f8bd33b367a33c0faf0cf1970bcd38093a50a44fd253b0e74f2706239c499217b7bdae332e21d5d5e7e795c998cceed14cf46977e7d3cbb3c79ef0530c36fa8ac3fd8d49f10bb0ae919fa149adead7f67dae0b9ba628e056e0e87e029b8e5f42821d775338e6774301ecb428b3938237c6ee22b0b5edf2ad6997869f427ba0672a7168614233e85f61dae5ed428643a53f605116d6dad586dce62833a62ca8c914c646b1f861a5b1c4ea7298a95029e63cb849fe08b6c943cb9d854c7d50ad04cfdfe64718e2868b8f2b53e55fe01a152c8496cbcc69956787447062b734cebde6c6452e9efc4aba5bf071cbff56208a52561a8ef635f52399b724f3369d988884f58166d734881774eff46d77b76b189c89c55b1c6591f178d2d21bf2b023adf9bc5b862127935e3346d98d56047a3f71241fd5a24abbb0cfc463fb8a5e67e327b055696fe51258dd07526ebd8439bcebb514ae26dc12d653a5c1263707c5109097ec5dcdb3918ab114985f709d3003b50e58fba91007825a6b80073f644eaa306051808460fc3b2d8e276b2187c583f7ef29ee0b0c34f9ee57bac9ebb996402e3300ddf06c760fc5f531f6b1e2beda77fa15c07f90f92422822e8d33c5d2409ea75197f7cd6d61770eddb078206cfc7c57b006cd0e9a9ec65fa4fc683da22cfaf6dfc995feb5f8386a052851fc58b7402f32e7ef9343d4633def4c0a4b9be12f2cd7c646073e14ca3fb977524f677714c3d994ea05f1997a246537d2fc0ab20ed2a5958f3712602bee2a270429abbd3ff3b9945f72f58dcf4f86eb344417a87dfa1ebd701a0ff381bb40b620bb8287cd7781d2ef7c0fd8695f705465fbadf99fdffef2afd94b0e76531b6ea0d537a23d2332d13c20368a0724e41bc1130a6b1ebc3464527e34c26a43751649f9dfe4f8e7957981a9fc08558c90d38079f1921b60fe6fa448171fec55c4c630575e811712211cf72f489a4e83a2f5427eab647b075a91064929de0a65517"  # noqa: E501
+        ),
+        balance=0x161150E7531F1933,
+        nonce=29,
+    )
+    # Source: raw
+    # 0x7e4fc1426b49cd8e2c770339616ce9c501fb746715dd4a20219229d0673ac05575993bd089a6663f6dff488574195b848fbb357eb7be1f61026352605861011761027f60e373c94f5374fce5edbc8e2a8697c15331677e6ebf0b63748b4abbfa60e76101bc6103f33e60d861036a6315193f47f07aff076e997770d03b70288679871dc28aa5a1399b21c8afa8155ecd7e75dd05f9d7eb42fa3e79c6a2109dff2a1e53e612fbe000bed18eec8345f00574f537c72820d8b97350ae523a8f7467ae14a8bd9aae6be55862b685e32476cc67ae2c6a40cf55729540d111f44c63629458da68e7ad2a9b389ed3bb60682169ea8a7b3a1bcf92621919c062413cb5986101236103596101776103be73d94f5374fce5edbc8e2a8697c15331677e6ebf0b631f6d9dfffa6103716101f760163e76d609ca9a51645238e4f1f8268f973c3a01a0b67479a34563d1e70065610173525b64e6d218af5474c3d8045447d06c726801695cfa26fdfaa6460a868569cd662855a55716140ae07eb1e25aeaf04ae7cf54e8aa7a22206da5a6e52bdd3ef82ad40a4681d25811167f7b0a3f66a727652592924dc1291a6085d537c5da2d6272a54f882460bc76407d666361c40cc56bc8778a8bc9a9b45d44c78cfe4333fe0c49418dd61f183d41132f755340e48ababb825a26ebc0ca693a8b465121200fd21a727b4c365a65a3255278f6705e5ca0f6146fccd3766a6e5b9decfb6e50968851e829313a2cc9d5b518e2586166c31ba04ed3f5a377310bd9993aa534b007858d9545342410ce8c156d780a8cb477a65efed30aa9d6bd63c48a134c9cb0c677ecda48aacef0c17c91de37e3cfdae69153742406995ea81bbae6a201663b9b37a6a9f597ae8d5a634f40e44e517174ea92616bc228ced0d712c265c2925470326102f26102146101b13e601d6103a360726103ec73ffffffffffffffffffffffffffffffffffffffff6319628a1bf4740e5f285d15a08a263b0a444516266bd51fe7266771604469df3c080d07dd47c4eb9e7344a87541ddc5a6971632a021033eb3542b375cd06bd0dfb48f6acde07152794b556839563efff1afed3b0a857615166526175e7184b83cc2dedf61ec5d65d1eee66efcb87b4f2c73335db9fba49e3d40638cd7f462f1d3b315f18dc1f692a68b24036102c16101f36102f23e783d6331b166ee517c71a4ba159dd322b9fa5f3237dfb85d2594edd580948177bd72d2244f767352371e3428d28bc6356c553b18d00e6b3cf602061672c2abbd7763059f61940b0d19fde33f7b5a960861025b61021d6101d361035173b94f5374fce5edbc8e2a8697c15331677e6ebf0b635ba25f69f4790d251e9ae89c718dd41c3f57b0c304fbb83978de28d23499bdd1729c04301ff527ccc9f7ed74a8dbd906b468d4487ffba738f193e3047b02e40beb08b4f11707681ef103ec1b00585a85f27227a179917ef15e97a359268b06ff34bcee23a869974fbca6e201cb16179743ac0f8c9f867003d5e26a5aad5217ebfff31407169237230772efaab6cd87fbc9fd408d4ac5a048e43fb4e7a261037c6101f76103e13e  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7e4fc1426b49cd8e2c770339616ce9c501fb746715dd4a20219229d0673ac05575993bd089a6663f6dff488574195b848fbb357eb7be1f61026352605861011761027f60e373c94f5374fce5edbc8e2a8697c15331677e6ebf0b63748b4abbfa60e76101bc6103f33e60d861036a6315193f47f07aff076e997770d03b70288679871dc28aa5a1399b21c8afa8155ecd7e75dd05f9d7eb42fa3e79c6a2109dff2a1e53e612fbe000bed18eec8345f00574f537c72820d8b97350ae523a8f7467ae14a8bd9aae6be55862b685e32476cc67ae2c6a40cf55729540d111f44c63629458da68e7ad2a9b389ed3bb60682169ea8a7b3a1bcf92621919c062413cb5986101236103596101776103be73d94f5374fce5edbc8e2a8697c15331677e6ebf0b631f6d9dfffa6103716101f760163e76d609ca9a51645238e4f1f8268f973c3a01a0b67479a34563d1e70065610173525b64e6d218af5474c3d8045447d06c726801695cfa26fdfaa6460a868569cd662855a55716140ae07eb1e25aeaf04ae7cf54e8aa7a22206da5a6e52bdd3ef82ad40a4681d25811167f7b0a3f66a727652592924dc1291a6085d537c5da2d6272a54f882460bc76407d666361c40cc56bc8778a8bc9a9b45d44c78cfe4333fe0c49418dd61f183d41132f755340e48ababb825a26ebc0ca693a8b465121200fd21a727b4c365a65a3255278f6705e5ca0f6146fccd3766a6e5b9decfb6e50968851e829313a2cc9d5b518e2586166c31ba04ed3f5a377310bd9993aa534b007858d9545342410ce8c156d780a8cb477a65efed30aa9d6bd63c48a134c9cb0c677ecda48aacef0c17c91de37e3cfdae69153742406995ea81bbae6a201663b9b37a6a9f597ae8d5a634f40e44e517174ea92616bc228ced0d712c265c2925470326102f26102146101b13e601d6103a360726103ec73ffffffffffffffffffffffffffffffffffffffff6319628a1bf4740e5f285d15a08a263b0a444516266bd51fe7266771604469df3c080d07dd47c4eb9e7344a87541ddc5a6971632a021033eb3542b375cd06bd0dfb48f6acde07152794b556839563efff1afed3b0a857615166526175e7184b83cc2dedf61ec5d65d1eee66efcb87b4f2c73335db9fba49e3d40638cd7f462f1d3b315f18dc1f692a68b24036102c16101f36102f23e783d6331b166ee517c71a4ba159dd322b9fa5f3237dfb85d2594edd580948177bd72d2244f767352371e3428d28bc6356c553b18d00e6b3cf602061672c2abbd7763059f61940b0d19fde33f7b5a960861025b61021d6101d361035173b94f5374fce5edbc8e2a8697c15331677e6ebf0b635ba25f69f4790d251e9ae89c718dd41c3f57b0c304fbb83978de28d23499bdd1729c04301ff527ccc9f7ed74a8dbd906b468d4487ffba738f193e3047b02e40beb08b4f11707681ef103ec1b00585a85f27227a179917ef15e97a359268b06ff34bcee23a869974fbca6e201cb16179743ac0f8c9f867003d5e26a5aad5217ebfff31407169237230772efaab6cd87fbc9fd408d4ac5a048e43fb4e7a261037c6101f76103e13e"  # noqa: E501
         ),
         balance=0x16B3E0323B4F717D,
         nonce=28,
-        address=Address("0xd1f0befc94d951fb4b787ada0927f60a9a94ce12"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SLOAD(
-                key=0x1DB054CCC801C0666B34B3C6242BBFC5E98F20C14FB95E0118BE9AD0,
-            )
-            + Op.ORIGIN
-            + Op.JUMP(pc=0x33D50E215FF59297861847EA911A6A9D)
-            + Op.CALLCODE(
-                gas=0x2C1E2816,
-                address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                value=0x42A46F50,
-                args_offset=0xCB,
-                args_size=0xFB,
-                ret_offset=0xA8,
-                ret_size=0x3A5,
-            )
-            + Op.MUL(
-                0x8732A34B873C7D943050B8659794F0BD3E841D35A2231EF6,
-                0x135E2F826DC603850E0DB21D105B,
-            )
-            + Op.PUSH31[
-                0x97F8CDE11728FA2051E87933CF858E4E5E91BAA74FC1E9FFE4C7B15BA600E8  # noqa: E501
-            ]
-            + Op.EXP(0xD704BE2B41C7F867, 0x8F095989DC68F47E)
+
+    tx_data = [
+        Bytes("79b94053")
+        + Hash(
+            0xBF1FB725756225CDE415738A99E1A7690CBE409744B73761038F5277367DEDC8
+        )
+        + Hash(
+            0x2E30635BC57E35FCB2038306D9A3A6E4DDCB9D306C879E470F5DD81E1148184F
+        )
+        + Hash(
+            0x62BD6361AE97087AFF61CEE25C694A734342BE5043B1FDE117BA383682BA0D91
+        )
+        + Hash(
+            0xE0DB8B6A29C882A044D0C8BB4925A6796D8480DF1B1CCC25641DF94F43D5802A
+        )
+        + Hash(
+            0xA8F44BF70A6817ED784E675725BDC7718A54D686307DA5234286085240BA8457
+        )
+        + Hash(
+            0x5DAC25D7FC32C59999A9D38FEE0D25E7C23986006E9C5BB022F7D28A2CAB01A4
+        )
+        + Hash(
+            0xBB37DD4210608D6101BF6101606079637BE1AE4373C94F5374FCE5EDBC8E2A86
+        )
+        + Hash(
+            0x97C15331677E6EBF0B63627CBC7DF161023161030A60213E60686102596102C8
+        )
+        + Hash(
+            0x61032B73B94F5374FCE5EDBC8E2A8697C15331677E6EBF0B630A549E50F46103
+        )
+        + Hash(
+            0x6761038161026C6103D1633ADED16B73B94F5374FCE5EDBC8E2A8697C1533167
+        )
+        + Hash(
+            0x7E6EBF0B6320EDF4A4F161EA427BD5141D55F5730CD82BF08BFF3928AEA77E71
+        )
+        + Hash(
+            0x53BCC4A3A53996BE367E77C98CB6FE85797E1D020284D4D302C8B4EBE6B28A9C
+        )
+        + Hash(
+            0x64A9AE6B2AD6894716732F245E7FDC527443F79A0AE9B8D8900CAA1C5796A285
+        )
+        + Hash(
+            0x4CEDDB00A82BFB724EC01B513ED61CCE89400A06FE90A109BAD6D57AE028143E
+        )
+        + Hash(
+            0x7552930136347EB71A49DB0072C87BD437B9CD7B2F7E6E609F653A85875C9EDE
+        )
+        + Hash(
+            0x69360F9D06D4C2E82CAF2E6A87043C0BF5A235431ACBB394775DCBFC7B86074B
+        )
+        + Hash(
+            0x99C9E6F959D84184E5E40C854C280218C07FCD4E98DC3BC44F7D651D7191EAD4
+        )
+        + Hash(
+            0xBE3AAA6657719AF4FBF6B9741D3C2C1ECA740B7C46E7B87CE36EB18A407FCA52
+        )
+        + Hash(
+            0x7573156E83888DFF152DC41FD0F98972D378A02F8465D755C426DE2E81E23ED5
+        )
+        + Hash(
+            0xB68990E3C73C65071B0C7B046CAE8CDD18828C27F10A8BA8E3616103F7610378
+        )
+        + Hash(
+            0x6363763A4BF078FAA8E34791ED3692F5784A35B7BBE3DB838DCEA84CE1955EEC
         ),
-        balance=0x2CE99FC81ED55962,
-        nonce=63,
-        address=Address("0xf4c98e0dda63a5c89847ca3e6ddf34f23443370f"),  # noqa: E501
-    )
+    ]
+    tx_gas = [8777204, 3000000]
+    tx_value = [2759170368, 0]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "79b94053bf1fb725756225cde415738a99e1a7690cbe409744b73761038f5277367dedc8"  # noqa: E501
-            "2e30635bc57e35fcb2038306d9a3a6e4ddcb9d306c879e470f5dd81e1148184f62bd6361"  # noqa: E501
-            "ae97087aff61cee25c694a734342be5043b1fde117ba383682ba0d91e0db8b6a29c882a0"  # noqa: E501
-            "44d0c8bb4925a6796d8480df1b1ccc25641df94f43d5802aa8f44bf70a6817ed784e6757"  # noqa: E501
-            "25bdc7718a54d686307da5234286085240ba84575dac25d7fc32c59999a9d38fee0d25e7"  # noqa: E501
-            "c23986006e9c5bb022f7d28a2cab01a4bb37dd4210608d6101bf6101606079637be1ae43"  # noqa: E501
-            "73c94f5374fce5edbc8e2a8697c15331677e6ebf0b63627cbc7df161023161030a60213e"  # noqa: E501
-            "60686102596102c861032b73b94f5374fce5edbc8e2a8697c15331677e6ebf0b630a549e"  # noqa: E501
-            "50f461036761038161026c6103d1633aded16b73b94f5374fce5edbc8e2a8697c1533167"  # noqa: E501
-            "7e6ebf0b6320edf4a4f161ea427bd5141d55f5730cd82bf08bff3928aea77e7153bcc4a3"  # noqa: E501
-            "a53996be367e77c98cb6fe85797e1d020284d4d302c8b4ebe6b28a9c64a9ae6b2ad68947"  # noqa: E501
-            "16732f245e7fdc527443f79a0ae9b8d8900caa1c5796a2854ceddb00a82bfb724ec01b51"  # noqa: E501
-            "3ed61cce89400a06fe90a109bad6d57ae028143e7552930136347eb71a49db0072c87bd4"  # noqa: E501
-            "37b9cd7b2f7e6e609f653a85875c9ede69360f9d06d4c2e82caf2e6a87043c0bf5a23543"  # noqa: E501
-            "1acbb394775dcbfc7b86074b99c9e6f959d84184e5e40c854c280218c07fcd4e98dc3bc4"  # noqa: E501
-            "4f7d651d7191ead4be3aaa6657719af4fbf6b9741d3c2c1eca740b7c46e7b87ce36eb18a"  # noqa: E501
-            "407fca527573156e83888dff152dc41fd0f98972d378a02f8465d755c426de2e81e23ed5"  # noqa: E501
-            "b68990e3c73c65071b0c7b046cae8cdd18828c27f10a8ba8e3616103f76103786363763a"  # noqa: E501
-            "4bf078faa8e34791ed3692f5784a35b7bbe3db838dcea84ce1955eec"
-        ),
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        target: Account(storage={1: 0}),
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stBugs/test_staticcall_createfails.py b/tests/ported_static/stBugs/test_staticcall_createfails.py
index 67a02b5d1ba..4d63012c711 100644
--- a/tests/ported_static/stBugs/test_staticcall_createfails.py
+++ b/tests/ported_static/stBugs/test_staticcall_createfails.py
@@ -1,20 +1,22 @@
 """
-Test ported from static filler.
+Test_staticcall_createfails.
 
 Ported from:
-tests/static/state_tests/stBugs/staticcall_createfailsFiller.json
+state_tests/stBugs/staticcall_createfailsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,28 +24,41 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stBugs/staticcall_createfailsFiller.json"],
+    ["state_tests/stBugs/staticcall_createfailsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-        "000000000000000000000000d94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_staticcall_createfails(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x1000000000000000000000000000000000000000")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_staticcall_createfails."""
+    coinbase = Address(0x1000000000000000000000000000000000000000)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_2 = Address(0xD94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x38BEEC8FEECA2598)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -54,57 +69,60 @@ def test_staticcall_createfails(
         gas_limit=23826461031063688,
     )
 
-    pre[sender] = Account(balance=0x38BEEC8FEECA2598)
-    # Source: LLL
+    # Source: lll
     # { [[1]] (STATICCALL 70000 (CALLDATALOAD 0) 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x11170,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x11170,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        storage={1: 1},
         nonce=63,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 1 1) [[2]] (CREATE 1 1 1) }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.SSTORE(
-                key=0x2, value=Op.CREATE(value=0x1, offset=0x1, size=0x1)
-            )
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.SSTORE(key=0x2, value=Op.CREATE(value=0x1, offset=0x1, size=0x1))
+        + Op.STOP,
         nonce=63,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.PUSH1[0x0] + Op.PUSH1[0x0] + Op.CREATE,
+    # Source: raw
+    # 0x60006000f0
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0] * 2 + Op.CREATE,
         nonce=63,
-        address=Address("0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xD94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(contract_1, left_padding=True),
+        Hash(contract_2, left_padding=True),
+    ]
+    tx_gas = [120000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=120000,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post: dict = {}
+    post = {
+        contract_0: Account(storage={1: 0}),
+        compute_create_address(
+            address=contract_1, nonce=63
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/__init__.py b/tests/ported_static/stCallCodes/__init__.py
index c4cb0ee645d..acd97fdc3ed 100644
--- a/tests/ported_static/stCallCodes/__init__.py
+++ b/tests/ported_static/stCallCodes/__init__.py
@@ -1 +1 @@
-"""Tests ported from stCallCodes."""
+"""Ported static tests: stCallCodes."""  # noqa: N999
diff --git a/tests/ported_static/stCallCodes/test_call_oog_additional_gas_costs1.py b/tests/ported_static/stCallCodes/test_call_oog_additional_gas_costs1.py
index 1cf2c2156cc..e8b77af0ac3 100644
--- a/tests/ported_static/stCallCodes/test_call_oog_additional_gas_costs1.py
+++ b/tests/ported_static/stCallCodes/test_call_oog_additional_gas_costs1.py
@@ -1,16 +1,16 @@
 """
-call(oog during init) ->  code.
+Call(oog during init) ->  code.
 
 Ported from:
-tests/static/state_tests/stCallCodes/call_OOG_additionalGasCosts1Filler.json
+state_tests/stCallCodes/call_OOG_additionalGasCosts1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/call_OOG_additionalGasCosts1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/call_OOG_additionalGasCosts1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_call_oog_additional_gas_costs1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Call(oog during init) ->  code."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Call(oog during init) ->  code ."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,41 +43,38 @@ def test_call_oog_additional_gas_costs1(
         gas_limit=3000000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
+    pre[coinbase] = Account(balance=0, nonce=1)
+    # Source: raw
+    # 0x6000
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.PUSH1[0x0],
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd0735f094c16e509e8d76999d9ee2e4fd5166c2e"),  # noqa: E501
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (CALL 6000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x1770,
-                address=0xD0735F094C16E509E8D76999D9EE2E4FD5166C2E,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x1770,
+            address=addr,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xef8dd89dea93dc2bff0ce3a1196188496e6c28dc"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=30000,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_call_oog_additional_gas_costs2.py b/tests/ported_static/stCallCodes/test_call_oog_additional_gas_costs2.py
index 1074ee2a856..fe9d6e75686 100644
--- a/tests/ported_static/stCallCodes/test_call_oog_additional_gas_costs2.py
+++ b/tests/ported_static/stCallCodes/test_call_oog_additional_gas_costs2.py
@@ -1,16 +1,16 @@
 """
-call(oog during init) ->  code.
+Call(oog during init) ->  code.
 
 Ported from:
-tests/static/state_tests/stCallCodes/call_OOG_additionalGasCosts2Filler.json
+state_tests/stCallCodes/call_OOG_additionalGasCosts2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/call_OOG_additionalGasCosts2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/call_OOG_additionalGasCosts2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_call_oog_additional_gas_costs2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Call(oog during init) ->  code."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Call(oog during init) ->  code ."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,46 +43,44 @@ def test_call_oog_additional_gas_costs2(
         gas_limit=3000000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
+    pre[coinbase] = Account(balance=0, nonce=1)
+    # Source: raw
+    # 0x6000
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.PUSH1[0x0],
         nonce=0,
-        address=Address("0x89cd1cb7ad11c6949bec0c8c7533dc073960c54f"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[0]] (CALL 6000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x1770,
-                    address=0x89CD1CB7AD11C6949BEC0C8C7533DC073960C54F,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0x2},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x1770,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        storage={0: 2},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc1f36f15e971b13f8178b8c0c5c4f5e6b1b2b2c3"),  # noqa: E501
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=30000,
     )
 
     post = {
-        contract: Account(storage={0: 2}),
+        addr: Account(balance=0),
+        target: Account(storage={0: 2}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcall_00.py b/tests/ported_static/stCallCodes/test_callcall_00.py
index 9f4fa2e0780..b3738552685 100644
--- a/tests/ported_static/stCallCodes/test_callcall_00.py
+++ b/tests/ported_static/stCallCodes/test_callcall_00.py
@@ -1,16 +1,16 @@
 """
-call -> call -> code, params check.
+Call -> call -> code, params check.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcall_00Filler.json
+state_tests/stCallCodes/callcall_00Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCallCodes/callcall_00Filler.json"],
+    ["state_tests/stCallCodes/callcall_00Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,10 +31,8 @@ def test_callcall_00(
     pre: Alloc,
 ) -> None:
     """Call -> call -> code, params check."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,86 +43,79 @@ def test_callcall_00(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
-            + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
-            + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
-            + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 2 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE))}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
+        + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
+        + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
+        + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x33f368f0b54063613cf5944941e8e0e4eeb64697"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x3D090,
-                    address=0x33F368F0B54063613CF5944941E8E0E4EEB64697,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 250000 <contract:0x1000000000000000000000000000000000000002> 2 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x3D090,
+                address=addr_2,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc3e151e887921d1edb46aae9b4a3ffc5b85e2a89"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x55730,
-                    address=0xC3E151E887921D1EDB46AAE9B4A3FFC5B85E2A89,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xeb09ff15547417853f6f4b240b8804769c37b0f1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(
+        addr_2: Account(
             storage={
                 2: 1,
-                4: 0xC3E151E887921D1EDB46AAE9B4A3FFC5B85E2A89,
+                4: addr,
                 7: 2,
-                230: 0x33F368F0B54063613CF5944941E8E0E4EEB64697,
-                232: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                230: addr_2,
+                232: sender,
                 236: 64,
                 238: 34,
                 240: 10,
             },
         ),
-        callee_1: Account(storage={1: 1}),
-        contract: Account(storage={0: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcall_00_ooge.py b/tests/ported_static/stCallCodes/test_callcall_00_ooge.py
index 8570f4ac579..531f8276f0b 100644
--- a/tests/ported_static/stCallCodes/test_callcall_00_ooge.py
+++ b/tests/ported_static/stCallCodes/test_callcall_00_ooge.py
@@ -1,16 +1,16 @@
 """
-call -> call -> code oog.
+Call -> call -> code oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcall_00_OOGEFiller.json
+state_tests/stCallCodes/callcall_00_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCallCodes/callcall_00_OOGEFiller.json"],
+    ["state_tests/stCallCodes/callcall_00_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_callcall_00_ooge(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Call -> call -> code oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Call -> call -> code oog ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,68 +43,64 @@ def test_callcall_00_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0x9196F97BCA1B117E521275693C79420479D9CC90,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 2 1) (KECCAK256 0x00 0x2fffff) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 1 ]] (CALL 20020 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x4E34,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x766b2cf0691f51029181fc511395b7ab71353a88"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x4E34,
-                    address=0x766B2CF0691F51029181FC511395B7AB71353A88,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9196f97bca1b117e521275693c79420479d9cc90"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={11: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={11: 1}),
+        addr_2: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcall_00_ooge_value_transfer.py b/tests/ported_static/stCallCodes/test_callcall_00_ooge_value_transfer.py
index 346f719a72f..1116a38c40a 100644
--- a/tests/ported_static/stCallCodes/test_callcall_00_ooge_value_transfer.py
+++ b/tests/ported_static/stCallCodes/test_callcall_00_ooge_value_transfer.py
@@ -1,16 +1,16 @@
 """
-call -> call -> code oog.
+Call -> call -> code oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcall_00_OOGE_valueTransferFiller.json
+state_tests/stCallCodes/callcall_00_OOGE_valueTransferFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcall_00_OOGE_valueTransferFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcall_00_OOGE_valueTransferFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_callcall_00_ooge_value_transfer(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Call -> call -> code oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Call -> call -> code oog ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,68 +43,64 @@ def test_callcall_00_ooge_value_transfer(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 2 1) (KECCAK256 0x00 0x2fffff) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x766b2cf0691f51029181fc511395b7ab71353a88"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x766B2CF0691F51029181FC511395B7AB71353A88,
-                    value=0xA,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 10 0 64 0 64 )  [[11]] 1}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0xA,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa781ad010268e97d590d07e5b442975243b2f05b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 20 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0xA781AD010268E97D590D07E5B442975243B2F05B,
-                    value=0x14,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x14,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb06c4ff2e2503bb892cc3c9237a1ae465a759616"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        callee_1: Account(storage={11: 1}),
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={11: 1}),
+        addr_2: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcall_00_suicide_end.py b/tests/ported_static/stCallCodes/test_callcall_00_suicide_end.py
index c59b109453c..86d19960801 100644
--- a/tests/ported_static/stCallCodes/test_callcall_00_suicide_end.py
+++ b/tests/ported_static/stCallCodes/test_callcall_00_suicide_end.py
@@ -1,16 +1,16 @@
 """
-call -> (call -> code) suicide.
+Call -> (call -> code) suicide.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcall_00_SuicideEndFiller.json
+state_tests/stCallCodes/callcall_00_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCallCodes/callcall_00_SuicideEndFiller.json"],
+    ["state_tests/stCallCodes/callcall_00_SuicideEndFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_callcall_00_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Call -> (call -> code) suicide."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Call -> (call -> code) suicide ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,69 +43,66 @@ def test_callcall_00_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0xF741CFEE7B7FB1025DCCEF3DB5A3CBC8FFB776F8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
-    )
-    callee = pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 2 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x703b936fd4d674f0ff5d6957f61097152f8781b8"),  # noqa: E501
+        address=Address(0x703B936FD4D674F0FF5D6957F61097152F8781B8),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=0xF741CFEE7B7FB1025DCCEF3DB5A3CBC8FFB776F8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x4353E77718BE108D4C149D88B34CACEDA42C5C66),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 50000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xf741cfee7b7fb1025dccef3db5a3cbc8ffb776f8"),  # noqa: E501
+        address=Address(0xF741CFEE7B7FB1025DCCEF3DB5A3CBC8FFB776F8),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee: Account(storage={2: 1}),
-        callee_1: Account(storage={1: 1}),
+        target: Account(balance=0xDE0B6B5FB6FE400),
+        addr_2: Account(storage={2: 1}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcall_000.py b/tests/ported_static/stCallCodes/test_callcallcall_000.py
index 9fdae80e1ee..e4289de543f 100644
--- a/tests/ported_static/stCallCodes/test_callcallcall_000.py
+++ b/tests/ported_static/stCallCodes/test_callcallcall_000.py
@@ -1,16 +1,16 @@
 """
-call -> call -> call -> code, params check.
+Call -> call -> call -> code, params check.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcall_000Filler.json
+state_tests/stCallCodes/callcallcall_000Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCallCodes/callcallcall_000Filler.json"],
+    ["state_tests/stCallCodes/callcallcall_000Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,10 +31,8 @@ def test_callcallcall_000(
     pre: Alloc,
 ) -> None:
     """Call -> call -> call -> code, params check."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,107 +43,98 @@ def test_callcallcall_000(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE))}  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x181b4ed322e192361633cc3c0a418f259ab0cf4b"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x3D090,
-                    address=0x181B4ED322E192361633CC3C0A418F259AB0CF4B,
-                    value=0x3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 250000 <contract:0x1000000000000000000000000000000000000003> 3 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x3D090,
+                address=addr_3,
+                value=0x3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x62441cbe78aa4a4244e084d4f86098e31dced749"),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0x62441CBE78AA4A4244E084D4F86098E31DCED749,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 300000 <contract:0x1000000000000000000000000000000000000002> 2 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=addr_2,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9073671d2bfb351331716fd279282eacf50824ad"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x55730,
-                    address=0x9073671D2BFB351331716FD279282EACF50824AD,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xeb09ff15547417853f6f4b240b8804769c37b0f1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(
+        addr_3: Account(
             storage={
                 3: 1,
-                4: 0x62441CBE78AA4A4244E084D4F86098E31DCED749,
+                4: addr_2,
                 7: 3,
-                330: 0x181B4ED322E192361633CC3C0A418F259AB0CF4B,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: addr_3,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
-        callee_1: Account(storage={2: 1}),
-        callee_2: Account(storage={1: 1}),
-        contract: Account(storage={0: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcall_000_ooge.py b/tests/ported_static/stCallCodes/test_callcallcall_000_ooge.py
index 58ff8bfe8a1..77f967932fc 100644
--- a/tests/ported_static/stCallCodes/test_callcallcall_000_ooge.py
+++ b/tests/ported_static/stCallCodes/test_callcallcall_000_ooge.py
@@ -1,16 +1,16 @@
 """
-call -> call -> call -> code oog.
+Call -> call -> call -> code oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcall_000_OOGEFiller.json
+state_tests/stCallCodes/callcallcall_000_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCallCodes/callcallcall_000_OOGEFiller.json"],
+    ["state_tests/stCallCodes/callcallcall_000_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_callcallcall_000_ooge(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Call -> call -> call -> code oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Call -> call -> call -> code oog ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,88 +43,83 @@ def test_callcallcall_000_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0xBBDCE54B3C571B853032CB3A637E8F5B81DBAF0D,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335b558774699d81f685543cfbcde5c4e5407686"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb11130cf7eef6d3f1552623d3506a5bbb07b12ce"),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0xB11130CF7EEF6D3F1552623D3506A5BBB07B12CE,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbbdce54b3c571b853032cb3a637e8f5b81dbaf0d"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={11: 1}),
-        callee_2: Account(storage={1: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={1: 1}),
+        addr_2: Account(storage={11: 1}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcall_000_oogm_after.py b/tests/ported_static/stCallCodes/test_callcallcall_000_oogm_after.py
index f7034cc77b5..11cc5e458fb 100644
--- a/tests/ported_static/stCallCodes/test_callcallcall_000_oogm_after.py
+++ b/tests/ported_static/stCallCodes/test_callcallcall_000_oogm_after.py
@@ -1,16 +1,16 @@
 """
-call -> (call -> call -> code) oog.
+Call -> (call -> call -> code) oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcall_000_OOGMAfterFiller.json
+state_tests/stCallCodes/callcallcall_000_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcall_000_OOGMAfterFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcall_000_OOGMAfterFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_callcallcall_000_oogm_after(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Call -> (call -> call -> code) oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Call -> (call -> call -> code) oog ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,83 +43,82 @@ def test_callcallcall_000_oogm_after(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0xB5D1A486869D27225126C47727513F57D329A01A,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x1f4cb3e7976ba5835015b9c3b0075aea78aaa482"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8d7270785422b63a97d83bada6aac80bebc3a99d"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x8D7270785422B63A97D83BADA6AAC80BEBC3A99D,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb5d1a486869d27225126c47727513f57d329a01a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcall_000_oogm_before.py b/tests/ported_static/stCallCodes/test_callcallcall_000_oogm_before.py
index b145ab52679..c5391539ca9 100644
--- a/tests/ported_static/stCallCodes/test_callcallcall_000_oogm_before.py
+++ b/tests/ported_static/stCallCodes/test_callcallcall_000_oogm_before.py
@@ -1,16 +1,16 @@
 """
-call -> call -> oog call -> code.
+Call -> call -> oog call -> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcall_000_OOGMBeforeFiller.json
+state_tests/stCallCodes/callcallcall_000_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcall_000_OOGMBeforeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcall_000_OOGMBeforeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcallcall_000_oogm_before(
     pre: Alloc,
 ) -> None:
     """Call -> call -> oog call -> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,84 +43,82 @@ def test_callcallcall_000_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0x471072D55A5A95044C2326F0E94A6D8DF5B8089E,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335b558774699d81f685543cfbcde5c4e5407686"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x51A61D678EC27711369C527E5D42A9DE66A5727F,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (KECCAK256 0x00 0x2fffff) [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x471072d55a5a95044c2326f0e94a6d8df5b8089e"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x51a61d678ec27711369c527e5d42a9de66a5727f"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee: Account(storage={11: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={11: 1}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcall_000_suicide_end.py b/tests/ported_static/stCallCodes/test_callcallcall_000_suicide_end.py
index ea6dffa4bb0..1ddf3839b34 100644
--- a/tests/ported_static/stCallCodes/test_callcallcall_000_suicide_end.py
+++ b/tests/ported_static/stCallCodes/test_callcallcall_000_suicide_end.py
@@ -1,16 +1,16 @@
 """
-call -> call -> (call -> code) suicide.
+Call -> call -> (call -> code) suicide.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcall_000_SuicideEndFiller.json
+state_tests/stCallCodes/callcallcall_000_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcall_000_SuicideEndFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcall_000_SuicideEndFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcallcall_000_suicide_end(
     pre: Alloc,
 ) -> None:
     """Call -> call -> (call -> code) suicide."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,90 +43,86 @@ def test_callcallcall_000_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1)  }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
+        address=Address(0xCB6497F0337B6CD0F7239A8819295EC7D1DAFD34),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+    # Source: lll
+    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x77b749ffff7ec61d31c79ed104f230a7959b2879"),  # noqa: E501
+        address=Address(0x4353E77718BE108D4C149D88B34CACEDA42C5C66),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xcb6497f0337b6cd0f7239a8819295ec7d1dafd34"),  # noqa: E501
+        address=Address(0x77B749FFFF7EC61D31C79ED104F230A7959B2879),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0xCB6497F0337B6CD0F7239A8819295EC7D1DAFD34,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0xCB6497F0337B6CD0F7239A8819295EC7D1DAFD34,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xd957e143ad2c011bc6a2b142795f1a9ba70d0680"),  # noqa: E501
+        address=Address(0xD957E143AD2C011BC6A2B142795F1A9BA70D0680),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee: Account(storage={1: 1}),
-        callee_1: Account(storage={3: 1}),
-        callee_2: Account(storage={2: 1}),
+        addr: Account(balance=0x4A817C800),
+        addr_3: Account(storage={3: 1}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcall_000_suicide_middle.py b/tests/ported_static/stCallCodes/test_callcallcall_000_suicide_middle.py
index 6b1325a0008..3c0d5a31284 100644
--- a/tests/ported_static/stCallCodes/test_callcallcall_000_suicide_middle.py
+++ b/tests/ported_static/stCallCodes/test_callcallcall_000_suicide_middle.py
@@ -1,16 +1,16 @@
 """
-call -> call -> suicide, call -> code.
+Call -> call -> suicide, call -> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcall_000_SuicideMiddleFiller.json
+state_tests/stCallCodes/callcallcall_000_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcall_000_SuicideMiddleFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcall_000_SuicideMiddleFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcallcall_000_suicide_middle(
     pre: Alloc,
 ) -> None:
     """Call -> call -> suicide, call -> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,86 +43,88 @@ def test_callcallcall_000_suicide_middle(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x4353E77718BE108D4C149D88B34CACEDA42C5C66),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0xBA5A575C914981FB64BFB082DC59434C66EB2714,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0xBA5A575C914981FB64BFB082DC59434C66EB2714,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x77b749ffff7ec61d31c79ed104f230a7959b2879"),  # noqa: E501
+        address=Address(0x77B749FFFF7EC61D31C79ED104F230A7959B2879),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (CALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xba5a575c914981fb64bfb082dc59434c66eb2714"),  # noqa: E501
+        address=Address(0xBA5A575C914981FB64BFB082DC59434C66EB2714),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={1: 1}),
+        target: Account(storage={0: 1}, balance=0xDE0B6B5FB6FE400),
+        addr: Account(storage={1: 1}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcall_abcb_recursive.py b/tests/ported_static/stCallCodes/test_callcallcall_abcb_recursive.py
index d9458b715d3..7a87fcd56c9 100644
--- a/tests/ported_static/stCallCodes/test_callcallcall_abcb_recursive.py
+++ b/tests/ported_static/stCallCodes/test_callcallcall_abcb_recursive.py
@@ -1,16 +1,16 @@
 """
-call -> call <-> call.
+Call -> call <-> call.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json
+state_tests/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcallcall_abcb_recursive(
     pre: Alloc,
 ) -> None:
     """Call -> call <-> call."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,79 +43,78 @@ def test_callcallcall_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x17D7840,
-                    address=0x66C0D9F841A86866465E6385C3827BE02B580020,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x17D7840,
+                address=0x66C0D9F841A86866465E6385C3827BE02B580020,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x039f3900e280b9c74d46e825b0b3814df4d705ac"),  # noqa: E501
+        address=Address(0x039F3900E280B9C74D46E825B0B3814DF4D705AC),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xF4240,
-                    address=0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xF4240,
+                address=0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x66c0d9f841a86866465e6385c3827be02b580020"),  # noqa: E501
+        address=Address(0x66C0D9F841A86866465E6385C3827BE02B580020),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x7A120,
-                    address=0x66C0D9F841A86866465E6385C3827BE02B580020,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x7A120,
+                address=0x66C0D9F841A86866465E6385C3827BE02B580020,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x91a8703c1bef34c1e76e152c1f7fb8c336c3be24"),  # noqa: E501
+        address=Address(0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee: Account(storage={1: 1}),
+        target: Account(storage={0: 1, 1: 0}),
+        addr: Account(storage={1: 1, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcallcode_001.py b/tests/ported_static/stCallCodes/test_callcallcallcode_001.py
index 05bd2c7d873..ca7c0a3198c 100644
--- a/tests/ported_static/stCallCodes/test_callcallcallcode_001.py
+++ b/tests/ported_static/stCallCodes/test_callcallcallcode_001.py
@@ -1,16 +1,16 @@
 """
-call -> call -> callcode - > code, params check.
+Call -> call -> callcode - > code, params check.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcallcode_001Filler.json
+state_tests/stCallCodes/callcallcallcode_001Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCallCodes/callcallcallcode_001Filler.json"],
+    ["state_tests/stCallCodes/callcallcallcode_001Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,10 +31,8 @@ def test_callcallcallcode_001(
     pre: Alloc,
 ) -> None:
     """Call -> call -> callcode - > code, params check."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,107 +43,99 @@ def test_callcallcallcode_001(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x3D090,
-                    address=0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
-                    value=0x3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0ffffaeb931552e5f094ca96a70be612da56b887"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 250000 <contract:0x1000000000000000000000000000000000000003> 3 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x3D090,
+                address=addr_3,
+                value=0x3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7e63847aad8ca50fb7c04777dce6871a6bf8de0c"),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0xFFFFAEB931552E5F094CA96A70BE612DA56B887,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 300000 <contract:0x1000000000000000000000000000000000000002> 2 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=addr_2,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9073671d2bfb351331716fd279282eacf50824ad"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x55730,
-                    address=0x9073671D2BFB351331716FD279282EACF50824AD,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xeb09ff15547417853f6f4b240b8804769c37b0f1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(
+        addr_2: Account(
             storage={
                 2: 1,
                 3: 1,
-                4: 0xFFFFAEB931552E5F094CA96A70BE612DA56B887,
+                4: addr_2,
                 7: 3,
-                330: 0xFFFFAEB931552E5F094CA96A70BE612DA56B887,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: addr_2,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
-        callee_2: Account(storage={1: 1}),
-        contract: Account(storage={0: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcallcode_001_ooge.py b/tests/ported_static/stCallCodes/test_callcallcallcode_001_ooge.py
index 742a36361c9..e8e85b353f4 100644
--- a/tests/ported_static/stCallCodes/test_callcallcallcode_001_ooge.py
+++ b/tests/ported_static/stCallCodes/test_callcallcallcode_001_ooge.py
@@ -1,16 +1,16 @@
 """
-call -> call -> callcode -> code oog.
+Call -> call -> callcode -> code oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcallcode_001_OOGEFiller.json
+state_tests/stCallCodes/callcallcallcode_001_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcallcode_001_OOGEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcallcode_001_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcallcallcode_001_ooge(
     pre: Alloc,
 ) -> None:
     """Call -> call -> callcode -> code oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,88 +43,83 @@ def test_callcallcallcode_001_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0xBBDCE54B3C571B853032CB3A637E8F5B81DBAF0D,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335b558774699d81f685543cfbcde5c4e5407686"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6322dc554acdcada01cbf7ac6a163d207c34ded2"),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x6322DC554ACDCADA01CBF7AC6A163D207C34DED2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbbdce54b3c571b853032cb3a637e8f5b81dbaf0d"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={11: 1}),
-        callee_2: Account(storage={1: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={1: 1}),
+        addr_2: Account(storage={11: 1}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcallcode_001_oogm_after.py b/tests/ported_static/stCallCodes/test_callcallcallcode_001_oogm_after.py
index b8adc29132e..0c425122802 100644
--- a/tests/ported_static/stCallCodes/test_callcallcallcode_001_oogm_after.py
+++ b/tests/ported_static/stCallCodes/test_callcallcallcode_001_oogm_after.py
@@ -1,16 +1,16 @@
 """
-call -> (call -> callcode -> code) oog.
+Call -> (call -> callcode -> code) oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcallcode_001_OOGMAfterFiller.json
+state_tests/stCallCodes/callcallcallcode_001_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcallcode_001_OOGMAfterFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcallcode_001_OOGMAfterFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcallcallcode_001_oogm_after(
     pre: Alloc,
 ) -> None:
     """Call -> (call -> callcode -> code) oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,83 +43,82 @@ def test_callcallcallcode_001_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x0be2d28f50cb59ffbd66d2eb6a3e8d34f3561d8b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # { [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0xBE2D28F50CB59FFBD66D2EB6A3E8D34F3561D8B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb5d1a486869d27225126c47727513f57d329a01a"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0xB5D1A486869D27225126C47727513F57D329A01A,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe54ccfa5e33a84943997885f0ab9c19c587d8c4f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcallcode_001_oogm_before.py b/tests/ported_static/stCallCodes/test_callcallcallcode_001_oogm_before.py
index 3cc2c722cd7..965ca6c1752 100644
--- a/tests/ported_static/stCallCodes/test_callcallcallcode_001_oogm_before.py
+++ b/tests/ported_static/stCallCodes/test_callcallcallcode_001_oogm_before.py
@@ -1,16 +1,16 @@
 """
-call -> call -> oog callcode -> code.
+Call -> call -> oog callcode -> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcallcode_001_OOGMBeforeFiller.json
+state_tests/stCallCodes/callcallcallcode_001_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcallcode_001_OOGMBeforeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcallcode_001_OOGMBeforeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_callcallcallcode_001_oogm_before(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Call -> call -> oog callcode -> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Call -> call -> oog callcode -> code ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,84 +43,82 @@ def test_callcallcallcode_001_oogm_before(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x0d33ab78ac3965e7d6f9548dff5839138a9f69c5"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0x471072D55A5A95044C2326F0E94A6D8DF5B8089E,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # { (KECCAK256 0x00 0x2fffff) [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335b558774699d81f685543cfbcde5c4e5407686"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0xD33AB78AC3965E7D6F9548DFF5839138A9F69C5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x471072d55a5a95044c2326f0e94a6d8df5b8089e"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={11: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={11: 1}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcallcode_001_suicide_end.py b/tests/ported_static/stCallCodes/test_callcallcallcode_001_suicide_end.py
index ef443898415..10bf588c464 100644
--- a/tests/ported_static/stCallCodes/test_callcallcallcode_001_suicide_end.py
+++ b/tests/ported_static/stCallCodes/test_callcallcallcode_001_suicide_end.py
@@ -1,16 +1,16 @@
 """
-call -> call -> ( callcode - > code ) suicide.
+Call -> call -> ( callcode - > code ) suicide.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcallcode_001_SuicideEndFiller.json
+state_tests/stCallCodes/callcallcallcode_001_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcallcode_001_SuicideEndFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcallcode_001_SuicideEndFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcallcallcode_001_suicide_end(
     pre: Alloc,
 ) -> None:
     """Call -> call -> ( callcode - > code ) suicide."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,89 +43,86 @@ def test_callcallcallcode_001_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x4353E77718BE108D4C149D88B34CACEDA42C5C66),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x77b749ffff7ec61d31c79ed104f230a7959b2879"),  # noqa: E501
+        address=Address(0x77B749FFFF7EC61D31C79ED104F230A7959B2879),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x94c8f980aeecbb6575b12ae614a249fc3e836f21"),  # noqa: E501
+        address=Address(0x94C8F980AEECBB6575B12AE614A249FC3E836F21),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={1: 1}),
-        callee_2: Account(storage={2: 1, 3: 1}),
+        addr: Account(balance=0x4A817C800),
+        addr_3: Account(storage={3: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcallcode_001_suicide_middle.py b/tests/ported_static/stCallCodes/test_callcallcallcode_001_suicide_middle.py
index 6bdb6ae9e6f..8819bcc98d8 100644
--- a/tests/ported_static/stCallCodes/test_callcallcallcode_001_suicide_middle.py
+++ b/tests/ported_static/stCallCodes/test_callcallcallcode_001_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-call -> call -> (suicide) callcode - > code.
+Call -> call -> (suicide) callcode - > code.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcallcallcode_001_SuicideMiddleFiller.json
+state_tests/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,8 @@ def test_callcallcallcode_001_suicide_middle(
     pre: Alloc,
 ) -> None:
     """Call -> call -> (suicide) callcode - > code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,86 +43,88 @@ def test_callcallcallcode_001_suicide_middle(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x23a077e1e6b0740d6bfbc41de582f2930abd1762"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
+        address=Address(0x4353E77718BE108D4C149D88B34CACEDA42C5C66),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0x23A077E1E6B0740D6BFBC41DE582F2930ABD1762,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x77B749FFFF7EC61D31C79ED104F230A7959B2879),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x23A077E1E6B0740D6BFBC41DE582F2930ABD1762,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x77b749ffff7ec61d31c79ed104f230a7959b2879"),  # noqa: E501
+        address=Address(0x23A077E1E6B0740D6BFBC41DE582F2930ABD1762),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_2: Account(storage={1: 1}),
+        target: Account(storage={0: 1}, balance=0xDE0B6B5FB6FE400),
+        addr_3: Account(storage={2: 0, 3: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcallcode_abcb_recursive.py b/tests/ported_static/stCallCodes/test_callcallcallcode_abcb_recursive.py
index 81237a3e9e5..14f3e6c6cad 100644
--- a/tests/ported_static/stCallCodes/test_callcallcallcode_abcb_recursive.py
+++ b/tests/ported_static/stCallCodes/test_callcallcallcode_abcb_recursive.py
@@ -1,16 +1,16 @@
 """
-call -> call  <-> callcode.
+Call -> call  <-> callcode.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json
+state_tests/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcallcallcode_abcb_recursive(
     pre: Alloc,
 ) -> None:
     """Call -> call  <-> callcode."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,79 +43,78 @@ def test_callcallcallcode_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x17D7840,
-                    address=0x66C0D9F841A86866465E6385C3827BE02B580020,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x17D7840,
+                address=0x66C0D9F841A86866465E6385C3827BE02B580020,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x039f3900e280b9c74d46e825b0b3814df4d705ac"),  # noqa: E501
+        address=Address(0x039F3900E280B9C74D46E825B0B3814DF4D705AC),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xF4240,
-                    address=0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xF4240,
+                address=0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x66c0d9f841a86866465e6385c3827be02b580020"),  # noqa: E501
+        address=Address(0x66C0D9F841A86866465E6385C3827BE02B580020),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x66C0D9F841A86866465E6385C3827BE02B580020,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 500000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0x66C0D9F841A86866465E6385C3827BE02B580020,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa71333d8c0291cfd6da54bec5a3957563ab16c1c"),  # noqa: E501
+        address=Address(0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee: Account(storage={1: 1}),
+        target: Account(storage={0: 1, 1: 0}),
+        addr: Account(storage={1: 1, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcode_01.py b/tests/ported_static/stCallCodes/test_callcallcode_01.py
index 531a2dcdc50..f57fa53ef1d 100644
--- a/tests/ported_static/stCallCodes/test_callcallcode_01.py
+++ b/tests/ported_static/stCallCodes/test_callcallcode_01.py
@@ -1,16 +1,16 @@
 """
-call -> callcode  -> code, params check.
+Call -> callcode  -> code, params check.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcode_01Filler.json
+state_tests/stCallCodes/callcallcode_01Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCallCodes/callcallcode_01Filler.json"],
+    ["state_tests/stCallCodes/callcallcode_01Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,10 +31,8 @@ def test_callcallcode_01(
     pre: Alloc,
 ) -> None:
     """Call -> callcode  -> code, params check."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,86 +43,80 @@ def test_callcallcode_01(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x3D090,
-                    address=0xB096ECA04CD5C92C88BA466F92627D4F04D53C95,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 2 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
+        + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
+        + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
+        + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x69142b38329c92930601fe8da12dc5866cde11c3"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
-            + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
-            + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
-            + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 250000 <contract:0x1000000000000000000000000000000000000002> 2 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x3D090,
+                address=addr_2,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb096eca04cd5c92c88ba466f92627d4f04d53c95"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x55730,
-                    address=0x69142B38329C92930601FE8DA12DC5866CDE11C3,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xeb09ff15547417853f6f4b240b8804769c37b0f1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(
+        addr: Account(
             storage={
                 1: 1,
                 2: 1,
-                4: 0x69142B38329C92930601FE8DA12DC5866CDE11C3,
+                4: addr,
                 7: 2,
-                230: 0x69142B38329C92930601FE8DA12DC5866CDE11C3,
-                232: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                230: addr,
+                232: sender,
                 236: 64,
                 238: 34,
                 240: 10,
             },
         ),
-        contract: Account(storage={0: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcode_01_ooge.py b/tests/ported_static/stCallCodes/test_callcallcode_01_ooge.py
index 697c95223d1..bde8c6665fe 100644
--- a/tests/ported_static/stCallCodes/test_callcallcode_01_ooge.py
+++ b/tests/ported_static/stCallCodes/test_callcallcode_01_ooge.py
@@ -1,16 +1,16 @@
 """
-call -> callcode -> code oog.
+Call -> callcode -> code oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcode_01_OOGEFiller.json
+state_tests/stCallCodes/callcallcode_01_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCallCodes/callcallcode_01_OOGEFiller.json"],
+    ["state_tests/stCallCodes/callcallcode_01_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_callcallcode_01_ooge(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Call -> callcode -> code oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Call -> callcode -> code oog ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,68 +43,64 @@ def test_callcallcode_01_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0x8E6E134402F2EECA8E910E8EC62B45B36EE31F30,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 2 1) (KECCAK256 0x00 0x2fffff) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335b558774699d81f685543cfbcde5c4e5407686"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x766b2cf0691f51029181fc511395b7ab71353a88"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0x766B2CF0691F51029181FC511395B7AB71353A88,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x8e6e134402f2eeca8e910e8ec62b45b36ee31f30"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={11: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={11: 1}),
+        addr_2: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcode_01_suicide_end.py b/tests/ported_static/stCallCodes/test_callcallcode_01_suicide_end.py
index 4c8e4cbf6f2..fb4a9010a5e 100644
--- a/tests/ported_static/stCallCodes/test_callcallcode_01_suicide_end.py
+++ b/tests/ported_static/stCallCodes/test_callcallcode_01_suicide_end.py
@@ -1,16 +1,16 @@
 """
-call -> (callcode  -> code) suicide.
+Call -> (callcode  -> code) suicide.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcode_01_SuicideEndFiller.json
+state_tests/stCallCodes/callcallcode_01_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcode_01_SuicideEndFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcode_01_SuicideEndFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcallcode_01_suicide_end(
     pre: Alloc,
 ) -> None:
     """Call -> (callcode  -> code) suicide."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,68 +43,66 @@ def test_callcallcode_01_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0x799DA5A3C983A22F9C430DE1BF99134EE561E856,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 2 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x703b936fd4d674f0ff5d6957f61097152f8781b8"),  # noqa: E501
+        address=Address(0x703B936FD4D674F0FF5D6957F61097152F8781B8),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=0x799DA5A3C983A22F9C430DE1BF99134EE561E856,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x4353E77718BE108D4C149D88B34CACEDA42C5C66),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x799da5a3c983a22f9c430de1bf99134ee561e856"),  # noqa: E501
+        address=Address(0x799DA5A3C983A22F9C430DE1BF99134EE561E856),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={1: 1, 2: 1}),
+        target: Account(balance=0xDE0B6B5FB6FE400),
+        addr_2: Account(storage={2: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcodecall_010.py b/tests/ported_static/stCallCodes/test_callcallcodecall_010.py
index b15e9f2ece6..ba39016c1c6 100644
--- a/tests/ported_static/stCallCodes/test_callcallcodecall_010.py
+++ b/tests/ported_static/stCallCodes/test_callcallcodecall_010.py
@@ -1,16 +1,16 @@
 """
-call -> callcode -> call -> code, params check.
+Call -> callcode -> call -> code, params check.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcodecall_010Filler.json
+state_tests/stCallCodes/callcallcodecall_010Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCallCodes/callcallcodecall_010Filler.json"],
+    ["state_tests/stCallCodes/callcallcodecall_010Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,10 +31,8 @@ def test_callcallcodecall_010(
     pre: Alloc,
 ) -> None:
     """Call -> callcode -> call -> code, params check."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,106 +43,99 @@ def test_callcallcodecall_010(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x493E0,
-                    address=0x62441CBE78AA4A4244E084D4F86098E31DCED749,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x4c0de71b93de6b7055a3686e4bf93add02b39ed8"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x3D090,
-                    address=0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
-                    value=0x3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 250000 <contract:0x1000000000000000000000000000000000000003> 3 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x3D090,
+                address=addr_3,
+                value=0x3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x62441cbe78aa4a4244e084d4f86098e31dced749"),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 300000 <contract:0x1000000000000000000000000000000000000002> 2 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x493E0,
+                address=addr_2,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7e63847aad8ca50fb7c04777dce6871a6bf8de0c"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x55730,
-                    address=0x4C0DE71B93DE6B7055A3686E4BF93ADD02B39ED8,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xeb09ff15547417853f6f4b240b8804769c37b0f1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(storage={1: 1, 2: 1}),
-        callee_2: Account(
+        addr: Account(storage={1: 1, 2: 1}),
+        addr_3: Account(
             storage={
                 3: 1,
-                4: 0x4C0DE71B93DE6B7055A3686E4BF93ADD02B39ED8,
+                4: addr,
                 7: 3,
-                330: 0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: addr_3,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
-        contract: Account(storage={0: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcodecall_010_ooge.py b/tests/ported_static/stCallCodes/test_callcallcodecall_010_ooge.py
index 1a5cab14cd1..59d81ad6585 100644
--- a/tests/ported_static/stCallCodes/test_callcallcodecall_010_ooge.py
+++ b/tests/ported_static/stCallCodes/test_callcallcodecall_010_ooge.py
@@ -1,16 +1,16 @@
 """
-call -> callcode -> call -> code oog.
+Call -> callcode -> call -> code oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcodecall_010_OOGEFiller.json
+state_tests/stCallCodes/callcallcodecall_010_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcodecall_010_OOGEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcodecall_010_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcallcodecall_010_ooge(
     pre: Alloc,
 ) -> None:
     """Call -> callcode -> call -> code oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,87 +43,83 @@ def test_callcallcodecall_010_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0x913CF7A18F61BAB7BCCF5607DFA9B730C5976000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) [[ 11 ]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335b558774699d81f685543cfbcde5c4e5407686"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8232556dc6a7eed9ebe5b86c640a52aadf2c29af"),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0x8232556DC6A7EED9EBE5B86C640A52AADF2C29AF,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x913cf7a18f61bab7bccf5607dfa9b730c5976000"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_2: Account(storage={1: 1, 11: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={1: 1, 11: 1}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcodecall_010_oogm_after.py b/tests/ported_static/stCallCodes/test_callcallcodecall_010_oogm_after.py
index 70b496d159c..fa22c791099 100644
--- a/tests/ported_static/stCallCodes/test_callcallcodecall_010_oogm_after.py
+++ b/tests/ported_static/stCallCodes/test_callcallcodecall_010_oogm_after.py
@@ -1,16 +1,16 @@
 """
-call -> (callcode -> call -> code) oog.
+Call -> (callcode -> call -> code) oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcodecall_010_OOGMAfterFiller.json
+state_tests/stCallCodes/callcallcodecall_010_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcodecall_010_OOGMAfterFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcodecall_010_OOGMAfterFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcallcodecall_010_oogm_after(
     pre: Alloc,
 ) -> None:
     """Call -> (callcode -> call -> code) oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,83 +43,82 @@ def test_callcallcodecall_010_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0x8D7270785422B63A97D83BADA6AAC80BEBC3A99D,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x37e72dd6ff3c2ac8c1ddab092a26164a2ad5988c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8d7270785422b63a97d83bada6aac80bebc3a99d"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0x37E72DD6FF3C2AC8C1DDAB092A26164A2AD5988C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe54ccfa5e33a84943997885f0ab9c19c587d8c4f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcodecall_010_oogm_before.py b/tests/ported_static/stCallCodes/test_callcallcodecall_010_oogm_before.py
index 5017a26cac3..09664f945ba 100644
--- a/tests/ported_static/stCallCodes/test_callcallcodecall_010_oogm_before.py
+++ b/tests/ported_static/stCallCodes/test_callcallcodecall_010_oogm_before.py
@@ -1,16 +1,16 @@
 """
-call -> callcode -> oog call -> code.
+Call -> callcode -> oog call -> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcodecall_010_OOGMBeforeFiller.json
+state_tests/stCallCodes/callcallcodecall_010_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcodecall_010_OOGMBeforeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcodecall_010_OOGMBeforeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_callcallcodecall_010_oogm_before(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Call -> callcode -> oog call -> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Call -> callcode -> oog call -> code ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,84 +43,82 @@ def test_callcallcodecall_010_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0x8E6E134402F2EECA8E910E8EC62B45B36EE31F30,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335b558774699d81f685543cfbcde5c4e5407686"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (KECCAK256 0x00 0x2fffff) [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x51a61d678ec27711369c527e5d42a9de66a5727f"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0x51A61D678EC27711369C527E5D42A9DE66A5727F,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8e6e134402f2eeca8e910e8ec62b45b36ee31f30"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={11: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={11: 1}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcodecall_010_suicide_end.py b/tests/ported_static/stCallCodes/test_callcallcodecall_010_suicide_end.py
index 12924c92cc1..f58f5b44ccc 100644
--- a/tests/ported_static/stCallCodes/test_callcallcodecall_010_suicide_end.py
+++ b/tests/ported_static/stCallCodes/test_callcallcodecall_010_suicide_end.py
@@ -1,16 +1,16 @@
 """
-call -> callcode -> (call -> code) (suicide).
+Call -> callcode -> (call -> code) (suicide).
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcodecall_010_SuicideEndFiller.json
+state_tests/stCallCodes/callcallcodecall_010_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcodecall_010_SuicideEndFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcodecall_010_SuicideEndFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcallcodecall_010_suicide_end(
     pre: Alloc,
 ) -> None:
     """Call -> callcode -> (call -> code) (suicide)."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,89 +43,86 @@ def test_callcallcodecall_010_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
-    )
-    callee = pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x4353E77718BE108D4C149D88B34CACEDA42C5C66),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xd957e143ad2c011bc6a2b142795f1a9ba70d0680"),  # noqa: E501
+        address=Address(0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xeaf8c2ae0d01a880cea4e1aa88def5edd153d57b"),  # noqa: E501
+        address=Address(0xD957E143AD2C011BC6A2B142795F1A9BA70D0680),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee: Account(storage={3: 1}),
-        callee_2: Account(storage={1: 1, 2: 1}),
+        addr_2: Account(storage={1: 0, 2: 0}, balance=0x2540BE400),
+        addr_3: Account(storage={3: 1}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcodecall_010_suicide_middle.py b/tests/ported_static/stCallCodes/test_callcallcodecall_010_suicide_middle.py
index fd0cce137c5..ba15575df15 100644
--- a/tests/ported_static/stCallCodes/test_callcallcodecall_010_suicide_middle.py
+++ b/tests/ported_static/stCallCodes/test_callcallcodecall_010_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-call -> callcode -> (suicide) call -> code.
+Call -> callcode -> (suicide) call -> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcallcodecall_010_SuicideMiddleFiller.json
+state_tests/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,8 @@ def test_callcallcodecall_010_suicide_middle(
     pre: Alloc,
 ) -> None:
     """Call -> callcode -> (suicide) call -> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,86 +43,89 @@ def test_callcallcodecall_010_suicide_middle(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x4353E77718BE108D4C149D88B34CACEDA42C5C66),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0xAC90BB4611B91D4C6292BD64E8656110822E01ED,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xac90bb4611b91d4c6292bd64e8656110822e01ed"),  # noqa: E501
+        address=Address(0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0xAC90BB4611B91D4C6292BD64E8656110822E01ED,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (CALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xeaf8c2ae0d01a880cea4e1aa88def5edd153d57b"),  # noqa: E501
+        address=Address(0xAC90BB4611B91D4C6292BD64E8656110822E01ED),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_2: Account(storage={1: 1}),
+        target: Account(storage={0: 1}, balance=0xDE0B6B5FB6FE400),
+        addr_2: Account(storage={1: 0, 2: 0}, balance=0x2540BE400),
+        addr_3: Account(storage={3: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcodecall_abcb_recursive.py b/tests/ported_static/stCallCodes/test_callcallcodecall_abcb_recursive.py
index 92c384a6000..7df4c42b423 100644
--- a/tests/ported_static/stCallCodes/test_callcallcodecall_abcb_recursive.py
+++ b/tests/ported_static/stCallCodes/test_callcallcodecall_abcb_recursive.py
@@ -1,16 +1,16 @@
 """
-call -> callcode <->  call.
+Call -> callcode <->  call.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json
+state_tests/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcallcodecall_abcb_recursive(
     pre: Alloc,
 ) -> None:
     """Call -> callcode <->  call."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,79 +43,78 @@ def test_callcallcodecall_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x17D7840,
-                    address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x17D7840,
+                address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x039f3900e280b9c74d46e825b0b3814df4d705ac"),  # noqa: E501
+        address=Address(0x039F3900E280B9C74D46E825B0B3814DF4D705AC),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x7A120,
-                    address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 1000000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xF4240,
+                address=0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x91a8703c1bef34c1e76e152c1f7fb8c336c3be24"),  # noqa: E501
+        address=Address(0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xF4240,
-                    address=0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x7A120,
+                address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xe2ab9779f4fb1d9d39211cc2082083add172e69c"),  # noqa: E501
+        address=Address(0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={1: 1}),
+        target: Account(storage={0: 1, 1: 0}),
+        addr: Account(storage={1: 1, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcodecallcode_011.py b/tests/ported_static/stCallCodes/test_callcallcodecallcode_011.py
index a1df86a1257..f9b66fda98b 100644
--- a/tests/ported_static/stCallCodes/test_callcallcodecallcode_011.py
+++ b/tests/ported_static/stCallCodes/test_callcallcodecallcode_011.py
@@ -1,16 +1,16 @@
 """
-call -> callcode ->  callcode -> code, check params.
+Call -> callcode ->  callcode -> code, check params.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcodecallcode_011Filler.json
+state_tests/stCallCodes/callcallcodecallcode_011Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcodecallcode_011Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcodecallcode_011Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcallcodecallcode_011(
     pre: Alloc,
 ) -> None:
     """Call -> callcode ->  callcode -> code, check params."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,107 +43,100 @@ def test_callcallcodecallcode_011(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x3D090,
-                    address=0x181B4ED322E192361633CC3C0A418F259AB0CF4B,
-                    value=0x3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE))}  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0ffffaeb931552e5f094ca96a70be612da56b887"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 250000 <contract:0x1000000000000000000000000000000000000003> 3 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x3D090,
+                address=addr_3,
+                value=0x3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x181b4ed322e192361633cc3c0a418f259ab0cf4b"),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x493E0,
-                    address=0xFFFFAEB931552E5F094CA96A70BE612DA56B887,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 300000 <contract:0x1000000000000000000000000000000000000002> 2 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x493E0,
+                address=addr_2,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4c0de71b93de6b7055a3686e4bf93add02b39ed8"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x55730,
-                    address=0x4C0DE71B93DE6B7055A3686E4BF93ADD02B39ED8,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xeb09ff15547417853f6f4b240b8804769c37b0f1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee_2: Account(
+        addr: Account(
             storage={
                 1: 1,
                 2: 1,
                 3: 1,
-                4: 0x4C0DE71B93DE6B7055A3686E4BF93ADD02B39ED8,
+                4: addr,
                 7: 3,
-                330: 0x4C0DE71B93DE6B7055A3686E4BF93ADD02B39ED8,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: addr,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
-        contract: Account(storage={0: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_ooge.py b/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_ooge.py
index c1c848f3c7e..ce3e20242b0 100644
--- a/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_ooge.py
+++ b/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_ooge.py
@@ -1,16 +1,16 @@
 """
-call -> callcode -> callcode -> code oog.
+Call -> callcode -> callcode -> code oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcallcodecallcode_011_OOGEFiller.json
+state_tests/stCallCodes/callcallcodecallcode_011_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcodecallcode_011_OOGEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcodecallcode_011_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcallcodecallcode_011_ooge(
     pre: Alloc,
 ) -> None:
     """Call -> callcode -> callcode -> code oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,87 +43,83 @@ def test_callcallcodecallcode_011_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0x913CF7A18F61BAB7BCCF5607DFA9B730C5976000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335b558774699d81f685543cfbcde5c4e5407686"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6322dc554acdcada01cbf7ac6a163d207c34ded2"),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0x6322DC554ACDCADA01CBF7AC6A163D207C34DED2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x913cf7a18f61bab7bccf5607dfa9b730c5976000"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_2: Account(storage={1: 1, 11: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={1: 1, 11: 1}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_oogm_after.py b/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_oogm_after.py
index 5a31817a091..284456ca466 100644
--- a/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_oogm_after.py
+++ b/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_oogm_after.py
@@ -1,17 +1,16 @@
 """
-call -> callcode oog -> callcode -> code.
+Call -> callcode oog -> callcode -> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcallcodecallcode_011_OOGMAfterFiller.json
+state_tests/stCallCodes/callcallcodecallcode_011_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcodecallcode_011_OOGMAfterFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcodecallcode_011_OOGMAfterFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,8 @@ def test_callcallcodecallcode_011_oogm_after(
     pre: Alloc,
 ) -> None:
     """Call -> callcode oog -> callcode -> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,83 +43,82 @@ def test_callcallcodecallcode_011_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0x926DFBCC20B2AB686FC85331883541D174CCC738,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x37e72dd6ff3c2ac8c1ddab092a26164a2ad5988c"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[ 11 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0x37E72DD6FF3C2AC8C1DDAB092A26164A2AD5988C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x497a77ddb638324a7b8ebf99e189f9ff8c118f19"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x926dfbcc20b2ab686fc85331883541d174ccc738"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[ 11 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_oogm_before.py b/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_oogm_before.py
index 77eff20cd53..7065ab4fb25 100644
--- a/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_oogm_before.py
+++ b/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_oogm_before.py
@@ -1,17 +1,16 @@
 """
-call -> callcode -> oog callcode -> code.
+Call -> callcode -> oog callcode -> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcallcodecallcode_011_OOGMBeforeFiller.json
+state_tests/stCallCodes/callcallcodecallcode_011_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcodecallcode_011_OOGMBeforeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcodecallcode_011_OOGMBeforeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,8 @@ def test_callcallcodecallcode_011_oogm_before(
     pre: Alloc,
 ) -> None:
     """Call -> callcode -> oog callcode -> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,84 +43,82 @@ def test_callcallcodecallcode_011_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0x8E6E134402F2EECA8E910E8EC62B45B36EE31F30,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335b558774699d81f685543cfbcde5c4e5407686"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0xDBB53599A5D13E0C465E1CC4FF24D7F00D780DF4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (KECCAK256 0x00 0x2fffff) [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8e6e134402f2eeca8e910e8ec62b45b36ee31f30"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdbb53599a5d13e0c465e1cc4ff24d7f00d780df4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee: Account(storage={11: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={11: 1}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_suicide_end.py b/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_suicide_end.py
index ba05eaee984..7891fd9c1cb 100644
--- a/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_suicide_end.py
+++ b/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_suicide_end.py
@@ -1,17 +1,16 @@
 """
-call -> callcode ->  (callcode -> code) (suicide).
+Call -> callcode ->  (callcode -> code) (suicide).
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcallcodecallcode_011_SuicideEndFiller.json
+state_tests/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,8 @@ def test_callcallcodecallcode_011_suicide_end(
     pre: Alloc,
 ) -> None:
     """Call -> callcode ->  (callcode -> code) (suicide)."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,88 +43,83 @@ def test_callcallcodecallcode_011_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x4353E77718BE108D4C149D88B34CACEDA42C5C66),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x94c8f980aeecbb6575b12ae614a249fc3e836f21"),  # noqa: E501
+        address=Address(0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xeaf8c2ae0d01a880cea4e1aa88def5edd153d57b"),  # noqa: E501
+        address=Address(0x94C8F980AEECBB6575B12AE614A249FC3E836F21),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-        callee_2: Account(storage={1: 1, 2: 1, 3: 1}),
-    }
+    post = {addr_2: Account(storage={1: 0, 2: 0, 3: 0}, balance=0x2540BE400)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_suicide_middle.py b/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_suicide_middle.py
index 4b5a889efbc..ad05de3c39c 100644
--- a/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_suicide_middle.py
+++ b/tests/ported_static/stCallCodes/test_callcallcodecallcode_011_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-call -> callcode -> (suicide) callcode -> code.
+Call -> callcode -> (suicide) callcode -> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcallcodecallcode_011_SuicideMiddleFiller.json
+state_tests/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcodecallcode_011_suicide_middle(
     pre: Alloc,
 ) -> None:
     """Call -> callcode -> (suicide) callcode -> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,86 +45,92 @@ def test_callcallcodecallcode_011_suicide_middle(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+    # Source: lll
+    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x58ded445d89963dfb8668b9a16b24afa6f9b83a8"),  # noqa: E501
+        address=Address(0x4353E77718BE108D4C149D88B34CACEDA42C5C66),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0x58DED445D89963DFB8668B9A16B24AFA6F9B83A8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0x58DED445D89963DFB8668B9A16B24AFA6F9B83A8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xeaf8c2ae0d01a880cea4e1aa88def5edd153d57b"),  # noqa: E501
+        address=Address(0x58DED445D89963DFB8668B9A16B24AFA6F9B83A8),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_2: Account(storage={1: 1}),
+        target: Account(
+            storage={0: 1, 1: 0, 2: 0, 3: 0},
+            balance=0xDE0B6B5FB6FE400,
+        ),
+        addr_2: Account(storage={1: 0, 2: 0}, balance=0x2540BE400),
+        addr_3: Account(storage={3: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcallcodecallcode_abcb_recursive.py b/tests/ported_static/stCallCodes/test_callcallcodecallcode_abcb_recursive.py
index 5ca24258157..8cbf5fa938c 100644
--- a/tests/ported_static/stCallCodes/test_callcallcodecallcode_abcb_recursive.py
+++ b/tests/ported_static/stCallCodes/test_callcallcodecallcode_abcb_recursive.py
@@ -1,17 +1,16 @@
 """
-call -> callcode <-> callcode.
+Call -> callcode <-> callcode.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcallcodecallcode_ABCB_RECURSIVEFiller.json
+state_tests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,8 @@ def test_callcallcodecallcode_abcb_recursive(
     pre: Alloc,
 ) -> None:
     """Call -> callcode <-> callcode."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,79 +43,78 @@ def test_callcallcodecallcode_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x17D7840,
-                    address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x17D7840,
+                address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x039f3900e280b9c74d46e825b0b3814df4d705ac"),  # noqa: E501
+        address=Address(0x039F3900E280B9C74D46E825B0B3814DF4D705AC),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 1000000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xF4240,
+                address=0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa71333d8c0291cfd6da54bec5a3957563ab16c1c"),  # noqa: E501
+        address=Address(0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xF4240,
-                    address=0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 500000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xe2ab9779f4fb1d9d39211cc2082083add172e69c"),  # noqa: E501
+        address=Address(0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={1: 1}),
+        target: Account(storage={0: 1, 1: 0}),
+        addr: Account(storage={1: 1, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcode_check_pc.py b/tests/ported_static/stCallCodes/test_callcode_check_pc.py
index e884a53030a..8f16fd6661e 100644
--- a/tests/ported_static/stCallCodes/test_callcode_check_pc.py
+++ b/tests/ported_static/stCallCodes/test_callcode_check_pc.py
@@ -1,16 +1,16 @@
 """
-check the PC after doing call to a contract.
+Check the PC after doing call to a contract.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcode_checkPCFiller.json
+state_tests/stCallCodes/callcode_checkPCFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCallCodes/callcode_checkPCFiller.json"],
+    ["state_tests/stCallCodes/callcode_checkPCFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,10 +31,8 @@ def test_callcode_check_pc(
     pre: Alloc,
 ) -> None:
     """Check the PC after doing call to a contract."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,45 +43,40 @@ def test_callcode_check_pc(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
+    # { [[0]] 1 }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+    )
+    # Source: lll
     # { (CALL 1000000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[3]] (PC) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0xF4240,
-                    address=0xFA7FC61138EE12431F8693335FB2BF5AF4051632,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0xF4240,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x3, value=Op.PC)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x3, value=Op.PC)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6861b8d2ba9a24e77f63623e4a5e83e2bc6a30df"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=0x1) + Op.STOP,
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0xfa7fc61138ee12431f8693335fb2bf5af4051632"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1100000,
     )
 
-    post = {
-        contract: Account(storage={3: 37}),
-        callee: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={3: 37})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcode_dynamic_code.py b/tests/ported_static/stCallCodes/test_callcode_dynamic_code.py
index 0e716ad014b..b9d711740ab 100644
--- a/tests/ported_static/stCallCodes/test_callcode_dynamic_code.py
+++ b/tests/ported_static/stCallCodes/test_callcode_dynamic_code.py
@@ -1,8 +1,8 @@
 """
-callcode to a contract that is being created in the same transaction.
+Callcode to a contract that is being created in the same transaction.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodeDynamicCodeFiller.json
+state_tests/stCallCodes/callcodeDynamicCodeFiller.json
 """
 
 import pytest
@@ -12,8 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,84 +28,54 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCallCodes/callcodeDynamicCodeFiller.json"],
+    ["state_tests/stCallCodes/callcodeDynamicCodeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000001000000000000000000000000000000000000000",
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={
-                        0: 1,
-                        10: 0x13136008B64FF592819B2FA6D43F2835C452020E,
-                        11: 1,
-                        20: 0x1000000000000000000000000000000000000000,
-                        21: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        22: 0x1000000000000000000000000000000000000000,
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000002000000000000000000000000000000000000000",
-            {
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={
-                        0: 1,
-                        10: 0x2D39FAD743351D4CF3F4717907D3DDA5E0A689A7,
-                        11: 1,
-                        20: 0x2000000000000000000000000000000000000000,
-                        21: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        22: 0x2000000000000000000000000000000000000000,
-                    }
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "0000000000000000000000003000000000000000000000000000000000000000",
-            {
-                Address("0x4b86c4ed99b87f0f396bc0c76885453c343916ed"): Account(
-                    storage={
-                        0: 1,
-                        10: 0xBF1676BE6038AB86D66E00824C2E3577858040F6,
-                        11: 1,
-                        20: 0x4B86C4ED99B87F0F396BC0C76885453C343916ED,
-                        21: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        22: 0x4B86C4ED99B87F0F396BC0C76885453C343916ED,
-                    }
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "0000000000000000000000004000000000000000000000000000000000000000",
-            {
-                Address("0xa51c188504a60578914fcae68f7a1f0dcbb856a9"): Account(
-                    storage={
-                        0: 1,
-                        10: 0xF2D6BF688FAE45DA62AB2DD4F36945BC924CC61,
-                        11: 1,
-                        20: 0xA51C188504A60578914FCAE68F7A1F0DCBB856A9,
-                        21: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        22: 0xA51C188504A60578914FCAE68F7A1F0DCBB856A9,
-                    }
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_callcode_dynamic_code(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Callcode to a contract that is being created in the same transaction."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1100000000000000000000000000000000000000)
+    contract_1 = Address(0x1000000000000000000000000000000000000000)
+    contract_2 = Address(0x2000000000000000000000000000000000000000)
+    contract_3 = Address(0x3000000000000000000000000000000000000000)
+    contract_4 = Address(0x4000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -113,207 +89,281 @@ def test_callcode_dynamic_code(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # {(seq [[10]] (CREATE 0 0 (lll(seq  (RETURN 0 (lll(seq [[0]] 1  [[20]] (ADDRESS) [[21]] (ORIGIN) [[22]] (CALLER)   )0) )  )0)   )  [[11]] (CALLCODE 100000 (SLOAD 10) 0 0 64 0 64)                   )}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x1F]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x27, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.SSTORE(key=0xA, value=Op.CREATE)
-            + Op.SSTORE(
-                key=0xB,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=Op.SLOAD(key=0xA),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-            + Op.INVALID
-            + Op.PUSH1[0x12]
-            + Op.CODECOPY(dest_offset=0x0, offset=0xD, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=0x14, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x15, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x16, value=Op.CALLER)
-            + Op.STOP
-        ),
-        balance=0x2710,
+    pre[sender] = Account(balance=0x2386F26FC10000)
+    # Source: lll
+    # { (CALL 800000 (CALLDATALOAD 0) 0 0 0 0 0) }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xC3500,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1100000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
-    # { (CALL 800000 (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xC3500,
-                address=Op.CALLDATALOAD(offset=0x0),
+    # Source: lll
+    # {(seq [[10]] (CREATE 0 0 (lll(seq  (RETURN 0 (lll(seq [[0]] 1  [[20]] (ADDRESS) [[21]] (ORIGIN) [[22]] (CALLER)   )0) )  )0)   )  [[11]] (CALLCODE 100000 (SLOAD 10) 0 0 64 0 64)                   )}  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x1F]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x27, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.SSTORE(key=0xA, value=Op.CREATE)
+        + Op.SSTORE(
+            key=0xB,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=Op.SLOAD(key=0xA),
                 value=0x0,
                 args_offset=0x0,
-                args_size=0x0,
+                args_size=0x40,
                 ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP
+        + Op.INVALID
+        + Op.PUSH1[0x12]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xD, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x14, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x15, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x16, value=Op.CALLER)
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0x1100000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {(seq [[10]] (CREATE2 0 0 (lll(seq  (RETURN 0 (lll(seq [[0]] 1  [[20]] (ADDRESS) [[21]] (ORIGIN) [[22]] (CALLER)  )0) )  )0)  0 )  [[11]] (CALLCODE 100000 (SLOAD 10) 0 0 64 0 64)                   )}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x1F]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x29, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.SSTORE(key=0xA, value=Op.CREATE2)
-            + Op.SSTORE(
-                key=0xB,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=Op.SLOAD(key=0xA),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-            + Op.INVALID
-            + Op.PUSH1[0x12]
-            + Op.CODECOPY(dest_offset=0x0, offset=0xD, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=0x14, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x15, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x16, value=Op.CALLER)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0x1F]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x29, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.SSTORE(key=0xA, value=Op.CREATE2)
+        + Op.SSTORE(
+            key=0xB,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=Op.SLOAD(key=0xA),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP
+        + Op.INVALID
+        + Op.PUSH1[0x12]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xD, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x14, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x15, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x16, value=Op.CALLER)
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x2000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {(seq (CREATE 0 0 (lll(seq       [[10]] (CREATE 0 0 (lll(seq  (RETURN 0 (lll(seq [[0]] 1  [[20]] (ADDRESS)  [[21]] (ORIGIN) [[22]] (CALLER)  )0) )  )0)   )  [[11]] (CALLCODE 100000 (SLOAD 10) 0 0 64 0 64)            )0))       )}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x46]
-            + Op.CODECOPY(dest_offset=0x0, offset=0xF, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.CREATE
-            + Op.STOP
-            + Op.INVALID
-            + Op.PUSH1[0x1F]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x27, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.SSTORE(key=0xA, value=Op.CREATE)
-            + Op.SSTORE(
-                key=0xB,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=Op.SLOAD(key=0xA),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-            + Op.INVALID
-            + Op.PUSH1[0x12]
-            + Op.CODECOPY(dest_offset=0x0, offset=0xD, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=0x14, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x15, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x16, value=Op.CALLER)
-            + Op.STOP
-        ),
-        balance=0x2710,
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x46]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xF, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.CREATE
+        + Op.STOP
+        + Op.INVALID
+        + Op.PUSH1[0x1F]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x27, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.SSTORE(key=0xA, value=Op.CREATE)
+        + Op.SSTORE(
+            key=0xB,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=Op.SLOAD(key=0xA),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP
+        + Op.INVALID
+        + Op.PUSH1[0x12]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xD, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x14, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x15, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x16, value=Op.CALLER)
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0x3000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x3000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {(seq (CREATE 0 0 (lll(seq       [[10]] (CREATE2 0 0 (lll(seq  (RETURN 0 (lll(seq [[0]] 1  [[20]] (ADDRESS)  [[21]] (ORIGIN) [[22]] (CALLER)  )0) )  )0)  0 )  [[11]] (CALLCODE 100000 (SLOAD 10) 0 0 64 0 64)            )0))       )}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x48]
-            + Op.CODECOPY(dest_offset=0x0, offset=0xF, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.CREATE
-            + Op.STOP
-            + Op.INVALID
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x1F]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x29, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.SSTORE(key=0xA, value=Op.CREATE2)
-            + Op.SSTORE(
-                key=0xB,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=Op.SLOAD(key=0xA),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-            + Op.INVALID
-            + Op.PUSH1[0x12]
-            + Op.CODECOPY(dest_offset=0x0, offset=0xD, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=0x14, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x15, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x16, value=Op.CALLER)
-            + Op.STOP
-        ),
-        balance=0x2710,
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x48]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xF, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.CREATE
+        + Op.STOP
+        + Op.INVALID
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x1F]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x29, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.SSTORE(key=0xA, value=Op.CREATE2)
+        + Op.SSTORE(
+            key=0xB,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=Op.SLOAD(key=0xA),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP
+        + Op.INVALID
+        + Op.PUSH1[0x12]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xD, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x14, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x15, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x16, value=Op.CALLER)
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0x4000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x4000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2386F26FC10000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(
+                    storage={
+                        0: 1,
+                        10: compute_create_address(
+                            address=contract_1, nonce=0
+                        ),
+                        11: 1,
+                        20: contract_1,
+                        21: sender,
+                        22: contract_1,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_2: Account(
+                    storage={
+                        0: 1,
+                        10: 0x2D39FAD743351D4CF3F4717907D3DDA5E0A689A7,
+                        11: 1,
+                        20: contract_2,
+                        21: sender,
+                        22: contract_2,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 2, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=contract_3, nonce=0): Account(
+                    storage={
+                        0: 1,
+                        10: 0xBF1676BE6038AB86D66E00824C2E3577858040F6,
+                        11: 1,
+                        20: compute_create_address(
+                            address=contract_3, nonce=0
+                        ),
+                        21: sender,
+                        22: compute_create_address(
+                            address=contract_3, nonce=0
+                        ),
+                    },
+                    code=b"",
+                    balance=0,
+                    nonce=2,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=contract_4, nonce=0): Account(
+                    storage={
+                        0: 1,
+                        10: 0xF2D6BF688FAE45DA62AB2DD4F36945BC924CC61,
+                        11: 1,
+                        20: compute_create_address(
+                            address=contract_4, nonce=0
+                        ),
+                        21: sender,
+                        22: compute_create_address(
+                            address=contract_4, nonce=0
+                        ),
+                    },
+                    code=b"",
+                    balance=0,
+                    nonce=2,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(contract_1, left_padding=True),
+        Hash(contract_2, left_padding=True),
+        Hash(contract_3, left_padding=True),
+        Hash(contract_4, left_padding=True),
+    ]
+    tx_gas = [1000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1000000,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcode_dynamic_code2_self_call.py b/tests/ported_static/stCallCodes/test_callcode_dynamic_code2_self_call.py
index 51232851233..258217d6fae 100644
--- a/tests/ported_static/stCallCodes/test_callcode_dynamic_code2_self_call.py
+++ b/tests/ported_static/stCallCodes/test_callcode_dynamic_code2_self_call.py
@@ -1,8 +1,8 @@
 """
-callcode happen to a contract that is dynamically created from within the...
+Callcode happen to a contract that is dynamically created from within...
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodeDynamicCode2SelfCallFiller.json
+state_tests/stCallCodes/callcodeDynamicCode2SelfCallFiller.json
 """
 
 import pytest
@@ -12,8 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,55 +28,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodeDynamicCode2SelfCallFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodeDynamicCode2SelfCallFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000a000000000000000000000000000000000000000",
-            {
-                Address("0x7db299e0885c85039f56fa504a13dd8ce8a56aa7"): Account(
-                    storage={
-                        11: 1,
-                        12: 0xA000000000000000000000000000000000000000,
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000001000000000000000000000000000000000000000",
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={
-                        0: 1,
-                        10: 0x13136008B64FF592819B2FA6D43F2835C452020E,
-                        11: 1,
-                        20: 0x1000000000000000000000000000000000000000,
-                        21: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        22: 0x1000000000000000000000000000000000000000,
-                    }
-                ),
-                Address("0x13136008b64ff592819b2fa6d43f2835c452020e"): Account(
-                    storage={122: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_callcode_dynamic_code2_self_call(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Callcode happen to a contract that is dynamically created from..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1100000000000000000000000000000000000000)
+    contract_1 = Address(0xA000000000000000000000000000000000000000)
+    contract_2 = Address(0x1000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -84,105 +75,137 @@ def test_callcode_dynamic_code2_self_call(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # {(seq [[10]] (CREATE 0 0 (lll(seq  [[122]] (CALLCODE 100000 0x13136008b64ff592819b2fa6d43f2835c452020e 0 0 64 0 64)  (RETURN 0 (lll(seq [[0]] 1  [[20]] (ADDRESS) [[21]] (ORIGIN) [[22]] (CALLER)   )0) )  )0)   )  [[11]] (CALLCODE 100000 (SLOAD 10) 0 0 64 0 64)                   )}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x46]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x27, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.SSTORE(key=0xA, value=Op.CREATE)
-            + Op.SSTORE(
-                key=0xB,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=Op.SLOAD(key=0xA),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(
-                key=0x7A,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0x13136008B64FF592819B2FA6D43F2835C452020E,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.PUSH1[0x12]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x34, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=0x14, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x15, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x16, value=Op.CALLER)
-            + Op.STOP
-        ),
-        balance=0x2710,
+    pre[sender] = Account(balance=0x2386F26FC10000)
+    # Source: lll
+    # { (CALL 800000 (CALLDATALOAD 0) 0 0 0 0 0) }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xC3500,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1100000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
-    # { (CALL 800000 (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xC3500,
-                address=Op.CALLDATALOAD(offset=0x0),
+    # Source: lll
+    # {  (MSTORE 0 0x604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e62) (MSTORE 32 0x0186a0f2600b5533600c55000000000000000000000000000000000000000000)  (CREATE 1 0 64) }  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x604060006040600060007313136008B64FF592819B2FA6D43F2835C452020E62,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x186A0F2600B5533600C55000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.CREATE(value=0x1, offset=0x0, size=0x40)
+        + Op.STOP,
+        balance=10000,
+        nonce=0,
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
+    )
+    # Source: lll
+    # {(seq [[10]] (CREATE 0 0 (lll(seq  [[122]] (CALLCODE 100000 0x13136008b64ff592819b2fa6d43f2835c452020e 0 0 64 0 64)  (RETURN 0 (lll(seq [[0]] 1  [[20]] (ADDRESS) [[21]] (ORIGIN) [[22]] (CALLER)   )0) )  )0)   )  [[11]] (CALLCODE 100000 (SLOAD 10) 0 0 64 0 64)                   )}  # noqa: E501
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x46]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x27, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.SSTORE(key=0xA, value=Op.CREATE)
+        + Op.SSTORE(
+            key=0xB,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=Op.SLOAD(key=0xA),
                 value=0x0,
                 args_offset=0x0,
-                args_size=0x0,
+                args_size=0x40,
                 ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x1100000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  (MSTORE 0 0x604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e62) (MSTORE 32 0x0186a0f2600b5533600c55000000000000000000000000000000000000000000)  (CREATE 1 0 64) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x604060006040600060007313136008B64FF592819B2FA6D43F2835C452020E62,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x186A0F2600B5533600C55000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.CREATE(value=0x1, offset=0x0, size=0x40)
-            + Op.STOP
-        ),
-        balance=0x2710,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(
+            key=0x7A,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0x13136008B64FF592819B2FA6D43F2835C452020E,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.PUSH1[0x12]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x34, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x14, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x15, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x16, value=Op.CALLER)
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2386F26FC10000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=contract_1, nonce=0): Account(
+                    storage={11: 1, 12: contract_1}, balance=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_2: Account(
+                    storage={
+                        0: 1,
+                        10: compute_create_address(
+                            address=contract_2, nonce=0
+                        ),
+                        11: 1,
+                        20: contract_2,
+                        21: sender,
+                        22: contract_2,
+                    },
+                    nonce=1,
+                ),
+                compute_create_address(address=contract_2, nonce=0): Account(
+                    storage={122: 1}, nonce=1
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(contract_1, left_padding=True),
+        Hash(contract_2, left_padding=True),
+    ]
+    tx_gas = [1453081]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1453081,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcode_emptycontract.py b/tests/ported_static/stCallCodes/test_callcode_emptycontract.py
index 3cfd6ce289e..4e33f02ada6 100644
--- a/tests/ported_static/stCallCodes/test_callcode_emptycontract.py
+++ b/tests/ported_static/stCallCodes/test_callcode_emptycontract.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_callcode_emptycontract.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodeEmptycontractFiller.json
+state_tests/stCallCodes/callcodeEmptycontractFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCallCodes/callcodeEmptycontractFiller.json"],
+    ["state_tests/stCallCodes/callcodeEmptycontractFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_callcode_emptycontract(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA2333EEF5630066B928DEA5FD85A239F511B5B067D1441EE7AC290D0122B917B
-    )
+    """Test_callcode_emptycontract."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,38 +43,33 @@ def test_callcode_emptycontract(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (CALLCODE 50000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 1000 0 64 0 64 )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x945304EB96065B2A98B57A48A06AE28D285A71B5,
-                    value=0x3E8,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x945304EB96065B2A98B57A48A06AE28D285A71B5,
+                value=0x3E8,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0x594f6a1a002fc9949ac40616cc146845680302e1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1050440,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_empty_contract.py b/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_empty_contract.py
index 737391a38fc..edd2ad15114 100644
--- a/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_empty_contract.py
+++ b/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_empty_contract.py
@@ -1,9 +1,8 @@
 """
-callcode inside create contract init to non-existent contract.
+Callcode inside create contract init to non-existent contract.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodeInInitcodeToEmptyContractFiller.json
+state_tests/stCallCodes/callcodeInInitcodeToEmptyContractFiller.json
 """
 
 import pytest
@@ -13,8 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -23,42 +28,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodeInInitcodeToEmptyContractFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodeInInitcodeToEmptyContractFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000001000000000000000000000000000000000000000",
-            {
-                Address("0x13136008b64ff592819b2fa6d43f2835c452020e"): Account(
-                    storage={2: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000002000000000000000000000000000000000000000",
-            {
-                Address("0x9f9f2f99f78bfedcd1f32d936203bd1c0cb00853"): Account(
-                    storage={2: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_callcode_in_initcode_to_empty_contract(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Callcode inside create contract init to non-existent contract."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1100000000000000000000000000000000000000)
+    contract_1 = Address(0x1000000000000000000000000000000000000000)
+    contract_2 = Address(0x2000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -72,96 +75,114 @@ def test_callcode_in_initcode_to_empty_contract(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # {(seq (CREATE 0 0 (lll (seq  [[1]] (CALLCODE 500000 0x1000000000000000000000000000000000000001 1 0 0 0 0)  [[2]] 1  ) 0)   )           )}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x2D]
-            + Op.CODECOPY(dest_offset=0x0, offset=0xF, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.CREATE
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x1000000000000000000000000000000000000001,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.STOP
-        ),
-        balance=0x2710,
+    pre[sender] = Account(balance=0x2386F26FC10000)
+    # Source: lll
+    # { (CALL 300000 (CALLDATALOAD 0) 0 0 0 0 0) }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x493E0,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1100000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
-    # { (CALL 300000 (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x493E0,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=0x0,
+    # Source: lll
+    # {(seq (CREATE 0 0 (lll (seq  [[1]] (CALLCODE 500000 0x1000000000000000000000000000000000000001 1 0 0 0 0)  [[2]] 1  ) 0)   )           )}  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x2D]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xF, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.CREATE
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0x1000000000000000000000000000000000000001,
+                value=0x1,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0x1100000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {(seq (CREATE2 0 0 (lll (seq  [[1]] (CALLCODE 500000 0x1000000000000000000000000000000000000001 1 0 0 0 0) [[2]] 1 ) 0)   0)           )}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x2D]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x11, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.CREATE2
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x1000000000000000000000000000000000000001,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.STOP
-        ),
-        balance=0x2710,
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0x2D]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x11, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.CREATE2
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0x1000000000000000000000000000000000000001,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x2000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2386F26FC10000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=contract_1, nonce=0): Account(
+                    storage={2: 1}
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x9F9F2F99F78BFEDCD1F32D936203BD1C0CB00853): Account(
+                    storage={2: 1}
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(contract_1, left_padding=True),
+        Hash(contract_2, left_padding=True),
+    ]
+    tx_gas = [1453081]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1453081,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_exis_contract_with_v_transfer_ne_money.py b/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_exis_contract_with_v_transfer_ne_money.py
index ba61831947d..12715a68d24 100644
--- a/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_exis_contract_with_v_transfer_ne_money.py
+++ b/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_exis_contract_with_v_transfer_ne_money.py
@@ -1,9 +1,8 @@
 """
-callcode inside create/create2 contract init to existing contract. callcode...
+Callcode inside create/create2 contract init to existing contract....
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodeInInitcodeToExisContractWithVTransferNEMoneyFiller.json
+state_tests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoneyFiller.json
 """
 
 import pytest
@@ -13,8 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -24,33 +29,42 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoneyFiller.json",  # noqa: E501
+        "state_tests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoneyFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000001000000000000000000000000000000000000000",
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000002000000000000000000000000000000000000000",
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_callcode_in_initcode_to_exis_contract_with_v_transfer_ne_money(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Callcode inside create/create2 contract init to existing..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Callcode inside create/create2 contract init to existing contract."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1100000000000000000000000000000000000000)
+    contract_1 = Address(0x1000000000000000000000000000000000000000)
+    contract_2 = Address(0x2000000000000000000000000000000000000000)
+    contract_3 = Address(0x1000000000000000000000000000000000000001)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -64,101 +78,119 @@ def test_callcode_in_initcode_to_exis_contract_with_v_transfer_ne_money(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # {(seq (CREATE 0 0 (lll (seq  [[1]] (CALLCODE 500000 0x1000000000000000000000000000000000000001 1 0 0 0 0)) 0)   )           )}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x28]
-            + Op.CODECOPY(dest_offset=0x0, offset=0xF, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.CREATE
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x1000000000000000000000000000000000000001,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2710,
+    pre[sender] = Account(balance=0x2386F26FC10000)
+    # Source: lll
+    # { (CALL 300000 (CALLDATALOAD 0) 0 0 0 0 0) }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x493E0,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1100000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (SSTORE 2 1) }
-    pre.deploy_contract(
+    contract_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000001"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000001),  # noqa: E501
     )
-    # Source: LLL
-    # { (CALL 300000 (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x493E0,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=0x0,
+    # Source: lll
+    # {(seq (CREATE2 0 0 (lll (seq  [[1]] (CALLCODE 500000 0x1000000000000000000000000000000000000001 1 0 0 0 0)) 0)   0)           )}  # noqa: E501
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0x28]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x11, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.CREATE2
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0x1000000000000000000000000000000000000001,
+                value=0x1,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0x1100000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x2000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
-    # {(seq (CREATE2 0 0 (lll (seq  [[1]] (CALLCODE 500000 0x1000000000000000000000000000000000000001 1 0 0 0 0)) 0)   0)           )}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x28]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x11, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.CREATE2
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x1000000000000000000000000000000000000001,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2710,
+    # Source: lll
+    # {(seq (CREATE 0 0 (lll (seq  [[1]] (CALLCODE 500000 0x1000000000000000000000000000000000000001 1 0 0 0 0)) 0)   )           )}  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x28]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xF, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.CREATE
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0x1000000000000000000000000000000000000001,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2386F26FC10000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=contract_1, nonce=0): Account(
+                    storage={1: 0, 2: 0}, balance=0, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xB0DE090B1E01BD09AC6B1D9224229302ED48FD47): Account(
+                    storage={1: 0, 2: 0}, balance=0, nonce=1
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(contract_1, left_padding=True),
+        Hash(contract_2, left_padding=True),
+    ]
+    tx_gas = [1000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1000000,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_existing_contract.py b/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_existing_contract.py
index 45349463e86..68451f0f3ad 100644
--- a/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_existing_contract.py
+++ b/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_existing_contract.py
@@ -1,9 +1,8 @@
 """
-callcode inside create/create2 contract init to existing contract.
+Callcode inside create/create2 contract init to existing contract.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodeInInitcodeToExistingContractFiller.json
+state_tests/stCallCodes/callcodeInInitcodeToExistingContractFiller.json
 """
 
 import pytest
@@ -13,8 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -24,41 +29,42 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCodes/callcodeInInitcodeToExistingContractFiller.json",  # noqa: E501
+        "state_tests/stCallCodes/callcodeInInitcodeToExistingContractFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000001000000000000000000000000000000000000000",
-            {
-                Address("0x13136008b64ff592819b2fa6d43f2835c452020e"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000002000000000000000000000000000000000000000",
-            {
-                Address("0x11b62573be8f72b4085bafe5b675b3e7f08ed522"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_callcode_in_initcode_to_existing_contract(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Callcode inside create/create2 contract init to existing contract."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1100000000000000000000000000000000000000)
+    contract_1 = Address(0x1000000000000000000000000000000000000000)
+    contract_2 = Address(0x2000000000000000000000000000000000000000)
+    contract_3 = Address(0x1000000000000000000000000000000000000001)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -72,101 +78,121 @@ def test_callcode_in_initcode_to_existing_contract(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # {(seq (CREATE 1 0 (lll (seq  [[1]] (CALLCODE 50000 0x1000000000000000000000000000000000000001 1 0 0 0 0)) 0)   )           )}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x27]
-            + Op.CODECOPY(dest_offset=0x0, offset=0xF, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x1]
-            + Op.CREATE
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x1000000000000000000000000000000000000001,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2710,
+    pre[sender] = Account(balance=0x2386F26FC10000)
+    # Source: lll
+    # { (CALL 300000 (CALLDATALOAD 0) 0 0 0 0 0) }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x493E0,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1100000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (SSTORE 2 1) }
-    pre.deploy_contract(
+    contract_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000001"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000001),  # noqa: E501
     )
-    # Source: LLL
-    # { (CALL 300000 (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x493E0,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=0x0,
+    # Source: lll
+    # {(seq (CREATE2 1 0 (lll (seq  [[1]] (CALLCODE 50000 0x1000000000000000000000000000000000000001 1 0 0 0 0)) 0)   0)           )}  # noqa: E501
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0x27]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x11, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x1]
+        + Op.CREATE2
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x1000000000000000000000000000000000000001,
+                value=0x1,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0x1100000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x2000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
-    # {(seq (CREATE2 1 0 (lll (seq  [[1]] (CALLCODE 50000 0x1000000000000000000000000000000000000001 1 0 0 0 0)) 0)   0)           )}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x27]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x11, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x1]
-            + Op.CREATE2
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x1000000000000000000000000000000000000001,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2710,
+    # Source: lll
+    # {(seq (CREATE 1 0 (lll (seq  [[1]] (CALLCODE 50000 0x1000000000000000000000000000000000000001 1 0 0 0 0)) 0)   )           )}  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x27]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xF, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x1]
+        + Op.CREATE
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x1000000000000000000000000000000000000001,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2386F26FC10000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=contract_1, nonce=0): Account(
+                    storage={1: 1, 2: 1}, balance=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x11B62573BE8F72B4085BAFE5B675B3E7F08ED522): Account(
+                    storage={1: 1, 2: 1}, balance=1
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(contract_1, left_padding=True),
+        Hash(contract_2, left_padding=True),
+    ]
+    tx_gas = [1000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1000000,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_existing_contract_with_value_transfer.py b/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_existing_contract_with_value_transfer.py
index e014e5a2bc2..4822486a1ea 100644
--- a/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_existing_contract_with_value_transfer.py
+++ b/tests/ported_static/stCallCodes/test_callcode_in_initcode_to_existing_contract_with_value_transfer.py
@@ -1,9 +1,8 @@
 """
-callcode inside create/create2 contract init to existing contract.
+Callcode inside create/create2 contract init to existing contract.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodeInInitcodeToExistingContractWithValueTransferFiller.json
+state_tests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransferFiller.json
 """
 
 import pytest
@@ -12,9 +11,11 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +25,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransferFiller.json",  # noqa: E501
+        "state_tests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransferFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,7 +35,9 @@ def test_callcode_in_initcode_to_existing_contract_with_value_transfer(
     pre: Alloc,
 ) -> None:
     """Callcode inside create/create2 contract init to existing contract."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
+    contract_1 = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,43 +51,42 @@ def test_callcode_in_initcode_to_existing_contract_with_value_transfer(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0x2386F26FC10000)
+    # Source: lll
     # { (MSTORE 0 0x6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b562) (MSTORE 32 0x0186a0f260005500000000000000000000000000000000000000000000000000) (CREATE 5 0 64) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x6040600060406000600573945304EB96065B2A98B57A48A06AE28D285A71B562,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x186A0F260005500000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.CREATE(value=0x5, offset=0x0, size=0x40)
-            + Op.STOP
-        ),
-        balance=0x2710,
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x6040600060406000600573945304EB96065B2A98B57A48A06AE28D285A71B562,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x186A0F260005500000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.CREATE(value=0x5, offset=0x0, size=0x40)
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (SSTORE 2 1) }
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2386F26FC10000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=453081,
     )
 
     post = {
-        Address("0x13136008b64ff592819b2fa6d43f2835c452020e"): Account(
-            storage={0: 1, 2: 1},
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={0: 1, 2: 1}, balance=5
         ),
     }
 
diff --git a/tests/ported_static/stCallCodes/test_callcodecall_10.py b/tests/ported_static/stCallCodes/test_callcodecall_10.py
index 6f522323cb9..d35ec4f4c3d 100644
--- a/tests/ported_static/stCallCodes/test_callcodecall_10.py
+++ b/tests/ported_static/stCallCodes/test_callcodecall_10.py
@@ -1,16 +1,16 @@
 """
-callcode -> call -> code, params check.
+Callcode -> call -> code, params check.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodecall_10Filler.json
+state_tests/stCallCodes/callcodecall_10Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCallCodes/callcodecall_10Filler.json"],
+    ["state_tests/stCallCodes/callcodecall_10Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_callcodecall_10(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Callcode -> call -> code, params check."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Callcode -> call -> code, params check ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,85 +43,80 @@ def test_callcodecall_10(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
-            + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
-            + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
-            + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 2 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
+        + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
+        + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
+        + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb096eca04cd5c92c88ba466f92627d4f04d53c95"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x3D090,
-                    address=0xB096ECA04CD5C92C88BA466F92627D4F04D53C95,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 250000 <contract:0x1000000000000000000000000000000000000002> 2 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x3D090,
+                address=addr_2,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc3e151e887921d1edb46aae9b4a3ffc5b85e2a89"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x55730,
-                    address=0xC3E151E887921D1EDB46AAE9B4A3FFC5B85E2A89,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdb43306b16c521b9cc3667fbe7d1b697bb1f9605"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(
+        target: Account(storage={0: 1, 1: 1}),
+        addr_2: Account(
             storage={
                 2: 1,
-                4: 0xDB43306B16C521B9CC3667FBE7D1B697BB1F9605,
+                4: target,
                 7: 2,
-                230: 0xB096ECA04CD5C92C88BA466F92627D4F04D53C95,
-                232: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                230: addr_2,
+                232: sender,
                 236: 64,
                 238: 34,
                 240: 10,
             },
         ),
-        contract: Account(storage={0: 1, 1: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecall_10_ooge.py b/tests/ported_static/stCallCodes/test_callcodecall_10_ooge.py
index 50b217e179a..a91fce61861 100644
--- a/tests/ported_static/stCallCodes/test_callcodecall_10_ooge.py
+++ b/tests/ported_static/stCallCodes/test_callcodecall_10_ooge.py
@@ -1,16 +1,16 @@
 """
-callcode -> call -> code oog.
+Callcode -> call -> code oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodecall_10_OOGEFiller.json
+state_tests/stCallCodes/callcodecall_10_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCallCodes/callcodecall_10_OOGEFiller.json"],
+    ["state_tests/stCallCodes/callcodecall_10_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_callcodecall_10_ooge(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Callcode -> call -> code oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Callcode -> call -> code oog ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,67 +43,64 @@ def test_callcodecall_10_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x766B2CF0691F51029181FC511395B7AB71353A88,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 2 1) (KECCAK256 0x00 0x2fffff) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x471072d55a5a95044c2326f0e94a6d8df5b8089e"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x766b2cf0691f51029181fc511395b7ab71353a88"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0x471072D55A5A95044C2326F0E94A6D8DF5B8089E,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9e57433afaff8a546fbc43cf0330afb6561dc550"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecall_10_suicide_end.py b/tests/ported_static/stCallCodes/test_callcodecall_10_suicide_end.py
index 2aef2ab9254..9c9e867ae0b 100644
--- a/tests/ported_static/stCallCodes/test_callcodecall_10_suicide_end.py
+++ b/tests/ported_static/stCallCodes/test_callcodecall_10_suicide_end.py
@@ -2,15 +2,15 @@
 CALLCODE -> (CALL -> code) (suicide).
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodecall_10_SuicideEndFiller.json
+state_tests/stCallCodes/callcodecall_10_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecall_10_SuicideEndFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecall_10_SuicideEndFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcodecall_10_suicide_end(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> (CALL -> code) (suicide)."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,68 +43,66 @@ def test_callcodecall_10_suicide_end(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 2 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x703b936fd4d674f0ff5d6957f61097152f8781b8"),  # noqa: E501
+        address=Address(0x703B936FD4D674F0FF5D6957F61097152F8781B8),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0xF741CFEE7B7FB1025DCCEF3DB5A3CBC8FFB776F8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0xF741CFEE7B7FB1025DCCEF3DB5A3CBC8FFB776F8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa74ca10b765dcda3b60687f73f2881e2a56eda64"),  # noqa: E501
+        address=Address(0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 50000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xf741cfee7b7fb1025dccef3db5a3cbc8ffb776f8"),  # noqa: E501
+        address=Address(0xF741CFEE7B7FB1025DCCEF3DB5A3CBC8FFB776F8),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(storage={2: 1}),
-        contract: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={0: 0, 1: 0}, balance=0x2540BE400),
+        addr_2: Account(storage={2: 1}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcall_100.py b/tests/ported_static/stCallCodes/test_callcodecallcall_100.py
index 2d679c7c4f1..ae6e5485b21 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcall_100.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcall_100.py
@@ -2,15 +2,15 @@
 CALLCODE -> CALL -> CALL-> code, params check.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodecallcall_100Filler.json
+state_tests/stCallCodes/callcodecallcall_100Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCallCodes/callcodecallcall_100Filler.json"],
+    ["state_tests/stCallCodes/callcodecallcall_100Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,10 +31,8 @@ def test_callcodecallcall_100(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALL -> CALL-> code, params check."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,106 +43,100 @@ def test_callcodecallcall_100(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x3D090,
-                    address=0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
-                    value=0x3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x62441cbe78aa4a4244e084d4f86098e31dced749"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 250000 <contract:0x1000000000000000000000000000000000000003> 3 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x3D090,
+                address=addr_3,
+                value=0x3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7e63847aad8ca50fb7c04777dce6871a6bf8de0c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0x62441CBE78AA4A4244E084D4F86098E31DCED749,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 300000 <contract:0x1000000000000000000000000000000000000002> 2 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=addr_2,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9073671d2bfb351331716fd279282eacf50824ad"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x55730,
-                    address=0x9073671D2BFB351331716FD279282EACF50824AD,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdb43306b16c521b9cc3667fbe7d1b697bb1f9605"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(storage={2: 1}),
-        callee_1: Account(
+        target: Account(storage={0: 1, 1: 1}),
+        addr_2: Account(storage={2: 1}),
+        addr_3: Account(
             storage={
                 3: 1,
-                4: 0x62441CBE78AA4A4244E084D4F86098E31DCED749,
+                4: addr_2,
                 7: 3,
-                330: 0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: addr_3,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
-        contract: Account(storage={0: 1, 1: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcall_100_ooge.py b/tests/ported_static/stCallCodes/test_callcodecallcall_100_ooge.py
index 545721043d1..73f66d5b3ce 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcall_100_ooge.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcall_100_ooge.py
@@ -1,16 +1,16 @@
 """
-callcode -> call -> call -> code oog.
+Callcode -> call -> call -> code oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodecallcall_100_OOGEFiller.json
+state_tests/stCallCodes/callcodecallcall_100_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcall_100_OOGEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcall_100_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcodecallcall_100_ooge(
     pre: Alloc,
 ) -> None:
     """Callcode -> call -> call -> code oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,87 +43,83 @@ def test_callcodecallcall_100_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) [[ 11 ]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8232556dc6a7eed9ebe5b86c640a52aadf2c29af"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0xBBDCE54B3C571B853032CB3A637E8F5B81DBAF0D,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9e57433afaff8a546fbc43cf0330afb6561dc550"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x8232556DC6A7EED9EBE5B86C640A52AADF2C29AF,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbbdce54b3c571b853032cb3a637e8f5b81dbaf0d"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        callee_1: Account(storage={11: 1}),
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={11: 1}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcall_100_oogm_after.py b/tests/ported_static/stCallCodes/test_callcodecallcall_100_oogm_after.py
index 0239d34997e..ea93eb8f53f 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcall_100_oogm_after.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcall_100_oogm_after.py
@@ -1,16 +1,16 @@
 """
-callcode -> (call -> call -> code) oog.
+Callcode -> (call -> call -> code) oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodecallcall_100_OOGMAfterFiller.json
+state_tests/stCallCodes/callcodecallcall_100_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcall_100_OOGMAfterFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcall_100_OOGMAfterFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcodecallcall_100_oogm_after(
     pre: Alloc,
 ) -> None:
     """Callcode -> (call -> call -> code) oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,83 +43,82 @@ def test_callcodecallcall_100_oogm_after(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0xB5D1A486869D27225126C47727513F57D329A01A,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x400347dada8c51a2aac4b4c31ae726ba8551e2b9"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8d7270785422b63a97d83bada6aac80bebc3a99d"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x8D7270785422B63A97D83BADA6AAC80BEBC3A99D,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb5d1a486869d27225126c47727513f57d329a01a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcall_100_oogm_before.py b/tests/ported_static/stCallCodes/test_callcodecallcall_100_oogm_before.py
index 5a093e2db2b..d2ea7d3209f 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcall_100_oogm_before.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcall_100_oogm_before.py
@@ -1,16 +1,16 @@
 """
-callcode -> call -> oog call -> code.
+Callcode -> call -> oog call -> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodecallcall_100_OOGMBeforeFiller.json
+state_tests/stCallCodes/callcodecallcall_100_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcall_100_OOGMBeforeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcall_100_OOGMBeforeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_callcodecallcall_100_oogm_before(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Callcode -> call -> oog call -> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Callcode -> call -> oog call -> code ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,83 +43,82 @@ def test_callcodecallcall_100_oogm_before(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x4A780315E172DB6C0A08FE70FF4362B0E061B668,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x471072d55a5a95044c2326f0e94a6d8df5b8089e"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (KECCAK256 0x00 0x2fffff) [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x4a780315e172db6c0a08fe70ff4362b0e061b668"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0x471072D55A5A95044C2326F0E94A6D8DF5B8089E,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9e57433afaff8a546fbc43cf0330afb6561dc550"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcall_100_suicide_end.py b/tests/ported_static/stCallCodes/test_callcodecallcall_100_suicide_end.py
index 4c16f34e68f..a3d8aa6d8fc 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcall_100_suicide_end.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcall_100_suicide_end.py
@@ -2,15 +2,15 @@
 CALLCODE -> CALL -> (CALL-> code) (suicide).
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodecallcall_100_SuicideEndFiller.json
+state_tests/stCallCodes/callcodecallcall_100_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcall_100_SuicideEndFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcall_100_SuicideEndFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcodecallcall_100_suicide_end(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALL -> (CALL-> code) (suicide)."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,89 +43,87 @@ def test_callcodecallcall_100_suicide_end(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x77b749ffff7ec61d31c79ed104f230a7959b2879"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa74ca10b765dcda3b60687f73f2881e2a56eda64"),  # noqa: E501
+        address=Address(0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 1 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x77B749FFFF7EC61D31C79ED104F230A7959B2879),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xd957e143ad2c011bc6a2b142795f1a9ba70d0680"),  # noqa: E501
+        address=Address(0xD957E143AD2C011BC6A2B142795F1A9BA70D0680),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(storage={3: 1}),
-        contract: Account(storage={0: 1, 1: 1}),
-        callee_2: Account(storage={2: 1}),
+        target: Account(storage={0: 1, 1: 1}, balance=0xDE0B6B3A7640000),
+        addr: Account(storage={2: 0}, balance=0x4A817C800),
+        addr_3: Account(storage={3: 1}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcall_100_suicide_middle.py b/tests/ported_static/stCallCodes/test_callcodecallcall_100_suicide_middle.py
index 17a8843e62f..15ad5968229 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcall_100_suicide_middle.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcall_100_suicide_middle.py
@@ -2,16 +2,15 @@
 CALLCODE -> CALL -> (suicide) CALL-> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodecallcall_100_SuicideMiddleFiller.json
+state_tests/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,8 @@ def test_callcodecallcall_100_suicide_middle(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALL -> (suicide) CALL-> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,85 +43,88 @@ def test_callcodecallcall_100_suicide_middle(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0xAC90BB4611B91D4C6292BD64E8656110822E01ED,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x77b749ffff7ec61d31c79ed104f230a7959b2879"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa74ca10b765dcda3b60687f73f2881e2a56eda64"),  # noqa: E501
+        address=Address(0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 1 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0xAC90BB4611B91D4C6292BD64E8656110822E01ED,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x77B749FFFF7EC61D31C79ED104F230A7959B2879),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (CALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xac90bb4611b91d4c6292bd64e8656110822e01ed"),  # noqa: E501
+        address=Address(0xAC90BB4611B91D4C6292BD64E8656110822E01ED),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}, balance=0xDE0B6B5FB6FE400),
+        addr_3: Account(storage={3: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcall_abcb_recursive.py b/tests/ported_static/stCallCodes/test_callcodecallcall_abcb_recursive.py
index 5e416e875eb..98afc48d9db 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcall_abcb_recursive.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcall_abcb_recursive.py
@@ -2,15 +2,15 @@
 CALLCODE -> CALL <-> CALL.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json
+state_tests/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcodecallcall_abcb_recursive(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALL <-> CALL."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,78 +43,78 @@ def test_callcodecallcall_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xF4240,
-                    address=0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x66c0d9f841a86866465e6385c3827be02b580020"),  # noqa: E501
-    )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 25000000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x17D7840,
-                    address=0x66C0D9F841A86866465E6385C3827BE02B580020,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x17D7840,
+                address=0x66C0D9F841A86866465E6385C3827BE02B580020,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6d477a21d3906d4c0cd1edbfa7d272e6e21f1ca1"),  # noqa: E501
+        address=Address(0x6D477A21D3906D4C0CD1EDBFA7D272E6E21F1CA1),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 1 ]] (CALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xF4240,
+                address=0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x66C0D9F841A86866465E6385C3827BE02B580020),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x7A120,
-                    address=0x66C0D9F841A86866465E6385C3827BE02B580020,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x7A120,
+                address=0x66C0D9F841A86866465E6385C3827BE02B580020,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x91a8703c1bef34c1e76e152c1f7fb8c336c3be24"),  # noqa: E501
+        address=Address(0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcallcode_101.py b/tests/ported_static/stCallCodes/test_callcodecallcallcode_101.py
index 4952fe7c3cd..ed620198470 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcallcode_101.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcallcode_101.py
@@ -2,15 +2,15 @@
 CALLCODE -> CALL -> CALLCODE -> code parameters check.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodecallcallcode_101Filler.json
+state_tests/stCallCodes/callcodecallcallcode_101Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcallcode_101Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcallcode_101Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcodecallcallcode_101(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALL -> CALLCODE -> code parameters check."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,106 +43,100 @@ def test_callcodecallcallcode_101(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x3D090,
-                    address=0x181B4ED322E192361633CC3C0A418F259AB0CF4B,
-                    value=0x3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE))}  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0ffffaeb931552e5f094ca96a70be612da56b887"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 250000 <contract:0x1000000000000000000000000000000000000003> 3 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x3D090,
+                address=addr_3,
+                value=0x3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x181b4ed322e192361633cc3c0a418f259ab0cf4b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0xFFFFAEB931552E5F094CA96A70BE612DA56B887,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 300000 <contract:0x1000000000000000000000000000000000000002> 2 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=addr_2,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9073671d2bfb351331716fd279282eacf50824ad"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x55730,
-                    address=0x9073671D2BFB351331716FD279282EACF50824AD,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdb43306b16c521b9cc3667fbe7d1b697bb1f9605"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(
+        target: Account(storage={0: 1, 1: 1}),
+        addr_2: Account(
             storage={
                 2: 1,
                 3: 1,
-                4: 0xFFFFAEB931552E5F094CA96A70BE612DA56B887,
+                4: addr_2,
                 7: 3,
-                330: 0xFFFFAEB931552E5F094CA96A70BE612DA56B887,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: addr_2,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
-        contract: Account(storage={0: 1, 1: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_ooge.py b/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_ooge.py
index 757105e300a..585d1c19276 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_ooge.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_ooge.py
@@ -1,16 +1,16 @@
 """
-callcode -> call -> callcode -> code oog.
+Callcode -> call -> callcode -> code oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodecallcallcode_101_OOGEFiller.json
+state_tests/stCallCodes/callcodecallcallcode_101_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcallcode_101_OOGEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcallcode_101_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcodecallcallcode_101_ooge(
     pre: Alloc,
 ) -> None:
     """Callcode -> call -> callcode -> code oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,87 +43,83 @@ def test_callcodecallcallcode_101_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) [[11]] 1}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3568ec0dda63b253e338fbc4990869fd168ab515"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0xBBDCE54B3C571B853032CB3A637E8F5B81DBAF0D,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9e57433afaff8a546fbc43cf0330afb6561dc550"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x3568EC0DDA63B253E338FBC4990869FD168AB515,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbbdce54b3c571b853032cb3a637e8f5b81dbaf0d"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        callee_1: Account(storage={11: 1}),
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={11: 1}),
+        addr_3: Account(storage={3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_oogm_after.py b/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_oogm_after.py
index 85533603c9a..5a7ee2f591e 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_oogm_after.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_oogm_after.py
@@ -1,17 +1,16 @@
 """
-callcode -> call oog -> callcode -> code.
+Callcode -> call oog -> callcode -> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodecallcallcode_101_OOGMAfterFiller.json
+state_tests/stCallCodes/callcodecallcallcode_101_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcallcode_101_OOGMAfterFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcallcode_101_OOGMAfterFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,8 @@ def test_callcodecallcallcode_101_oogm_after(
     pre: Alloc,
 ) -> None:
     """Callcode -> call oog -> callcode -> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,83 +43,82 @@ def test_callcodecallcallcode_101_oogm_after(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0xB5D1A486869D27225126C47727513F57D329A01A,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x400347dada8c51a2aac4b4c31ae726ba8551e2b9"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x926dfbcc20b2ab686fc85331883541d174ccc738"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x926DFBCC20B2AB686FC85331883541D174CCC738,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb5d1a486869d27225126c47727513f57d329a01a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_oogm_before.py b/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_oogm_before.py
index a38fe5010fb..0fb2b0dcefd 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_oogm_before.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_oogm_before.py
@@ -1,17 +1,16 @@
 """
-callcode -> call -> oog callcode -> code.
+Callcode -> call -> oog callcode -> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodecallcallcode_101_OOGMBeforeFiller.json
+state_tests/stCallCodes/callcodecallcallcode_101_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcallcode_101_OOGMBeforeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcallcode_101_OOGMBeforeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,8 @@ def test_callcodecallcallcode_101_oogm_before(
     pre: Alloc,
 ) -> None:
     """Callcode -> call -> oog callcode -> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,83 +43,82 @@ def test_callcodecallcallcode_101_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0xCECED485B74F13EAFA913073424DC443A976CF14,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x9e57433afaff8a546fbc43cf0330afb6561dc550"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (KECCAK256 0x00 0x2fffff) [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0xDBB53599A5D13E0C465E1CC4FF24D7F00D780DF4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 )  [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xceced485b74f13eafa913073424dc443a976cf14"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdbb53599a5d13e0c465e1cc4ff24d7f00d780df4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_suicide_end.py b/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_suicide_end.py
index b66c589cdff..7c20c53bf1a 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_suicide_end.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_suicide_end.py
@@ -2,16 +2,15 @@
 CALLCODE -> CALL -> (CALLCODE -> code) (suicide).
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodecallcallcode_101_SuicideEndFiller.json
+state_tests/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,8 @@ def test_callcodecallcallcode_101_suicide_end(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALL -> (CALLCODE -> code) (suicide)."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,88 +43,86 @@ def test_callcodecallcallcode_101_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x77b749ffff7ec61d31c79ed104f230a7959b2879"),  # noqa: E501
+        address=Address(0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x94c8f980aeecbb6575b12ae614a249fc3e836f21"),  # noqa: E501
+        address=Address(0x77B749FFFF7EC61D31C79ED104F230A7959B2879),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879)
+        + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa74ca10b765dcda3b60687f73f2881e2a56eda64"),  # noqa: E501
+        address=Address(0x94C8F980AEECBB6575B12AE614A249FC3E836F21),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee_2: Account(storage={2: 1, 3: 1}),
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={2: 0}, balance=0x4A817C800),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_suicide_middle.py b/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_suicide_middle.py
index dec91ccf7d5..6fe65bcb0de 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_suicide_middle.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcallcode_101_suicide_middle.py
@@ -2,16 +2,15 @@
 CALLCODE -> CALL -> (suicide) CALLCODE -> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodecallcallcode_101_SuicideMiddleFiller.json
+state_tests/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,12 @@ def test_callcodecallcallcode_101_suicide_middle(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALL -> (suicide) CALLCODE -> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
+    contract_1 = Address(0x1000000000000000000000000000000000000001)
+    contract_2 = Address(0x1000000000000000000000000000000000000002)
+    contract_3 = Address(0x1000000000000000000000000000000000000003)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,91 +49,89 @@ def test_callcodecallcallcode_101_suicide_middle(
         gas_limit=30000000,
     )
 
-    # Source: LLL
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x1000000000000000000000000000000000000003),  # noqa: E501
+    )
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x1000000000000000000000000000000000000001,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0x1000000000000000000000000000000000000001,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 1 ]] (CALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x1000000000000000000000000000000000000002,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0x1000000000000000000000000000000000000002,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000001"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000001),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x1000000000000000000000000000000000000000)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x1000000000000000000000000000000000000003,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x1000000000000000000000000000000000000002"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  (SSTORE 3 1) }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x1000000000000000000000000000000000000000
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x1000000000000000000000000000000000000003,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000003"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000002),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        contract_0: Account(storage={0: 1, 1: 1}, balance=0xDE0B6B5FB6FE400),
+        contract_1: Account(storage={2: 0, 3: 0}, balance=0x2540BE400),
+        contract_3: Account(storage={2: 0, 3: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcallcode_abcb_recursive.py b/tests/ported_static/stCallCodes/test_callcodecallcallcode_abcb_recursive.py
index b5fbc5de41f..c4ad5a066d8 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcallcode_abcb_recursive.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcallcode_abcb_recursive.py
@@ -2,16 +2,15 @@
 CALLCODE -> CALL <-> CALLCODE.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodecallcallcode_ABCB_RECURSIVEFiller.json
+state_tests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,8 @@ def test_callcodecallcallcode_abcb_recursive(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALL <-> CALLCODE."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,78 +43,78 @@ def test_callcodecallcallcode_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xF4240,
-                    address=0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x66c0d9f841a86866465e6385c3827be02b580020"),  # noqa: E501
-    )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 25000000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x17D7840,
-                    address=0x66C0D9F841A86866465E6385C3827BE02B580020,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x17D7840,
+                address=0x66C0D9F841A86866465E6385C3827BE02B580020,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6d477a21d3906d4c0cd1edbfa7d272e6e21f1ca1"),  # noqa: E501
+        address=Address(0x6D477A21D3906D4C0CD1EDBFA7D272E6E21F1CA1),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 1 ]] (CALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xF4240,
+                address=0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x66C0D9F841A86866465E6385C3827BE02B580020),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x66C0D9F841A86866465E6385C3827BE02B580020,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 500000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0x66C0D9F841A86866465E6385C3827BE02B580020,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa71333d8c0291cfd6da54bec5a3957563ab16c1c"),  # noqa: E501
+        address=Address(0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcode_11.py b/tests/ported_static/stCallCodes/test_callcodecallcode_11.py
index ec5801b5ce6..ae4f5601541 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcode_11.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcode_11.py
@@ -2,15 +2,15 @@
 CALLCODE -> CALLCODE -> code, check parameters.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodecallcode_11Filler.json
+state_tests/stCallCodes/callcodecallcode_11Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCallCodes/callcodecallcode_11Filler.json"],
+    ["state_tests/stCallCodes/callcodecallcode_11Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,10 +31,8 @@ def test_callcodecallcode_11(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALLCODE -> code, check parameters."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,81 +43,76 @@ def test_callcodecallcode_11(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x3D090,
-                    address=0xB096ECA04CD5C92C88BA466F92627D4F04D53C95,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 2 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
+        + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
+        + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
+        + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x69142b38329c92930601fe8da12dc5866cde11c3"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
-            + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
-            + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
-            + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 250000 <contract:0x1000000000000000000000000000000000000002> 2 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x3D090,
+                address=addr_2,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb096eca04cd5c92c88ba466f92627d4f04d53c95"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x55730,
-                    address=0x69142B38329C92930601FE8DA12DC5866CDE11C3,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdb43306b16c521b9cc3667fbe7d1b697bb1f9605"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 1,
                 1: 1,
                 2: 1,
-                4: 0xDB43306B16C521B9CC3667FBE7D1B697BB1F9605,
+                4: target,
                 7: 2,
-                230: 0xDB43306B16C521B9CC3667FBE7D1B697BB1F9605,
-                232: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                230: target,
+                232: sender,
                 236: 64,
                 238: 34,
                 240: 10,
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcode_11_ooge.py b/tests/ported_static/stCallCodes/test_callcodecallcode_11_ooge.py
index ab3c1547eac..675cb20b369 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcode_11_ooge.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcode_11_ooge.py
@@ -1,16 +1,16 @@
 """
-callcode -> callcode -> code oog.
+Callcode -> callcode -> code oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodecallcode_11_OOGEFiller.json
+state_tests/stCallCodes/callcodecallcode_11_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcode_11_OOGEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcode_11_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcodecallcode_11_ooge(
     pre: Alloc,
 ) -> None:
     """Callcode -> callcode -> code oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,67 +43,64 @@ def test_callcodecallcode_11_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 2 1) (KECCAK256 0x00 0x2fffff) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x766b2cf0691f51029181fc511395b7ab71353a88"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0x766B2CF0691F51029181FC511395B7AB71353A88,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8e6e134402f2eeca8e910e8ec62b45b36ee31f30"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0x8E6E134402F2EECA8E910E8EC62B45B36EE31F30,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9e57433afaff8a546fbc43cf0330afb6561dc550"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcode_11_suicide_end.py b/tests/ported_static/stCallCodes/test_callcodecallcode_11_suicide_end.py
index a654cee7697..eed97ff5128 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcode_11_suicide_end.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcode_11_suicide_end.py
@@ -2,15 +2,15 @@
 CALLCODE -> (CALLCODE -> code) selfdestruct.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodecallcode_11_SuicideEndFiller.json
+state_tests/stCallCodes/callcodecallcode_11_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcode_11_SuicideEndFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcode_11_SuicideEndFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcodecallcode_11_suicide_end(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> (CALLCODE -> code) selfdestruct."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,67 +43,66 @@ def test_callcodecallcode_11_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 2 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x703b936fd4d674f0ff5d6957f61097152f8781b8"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x799da5a3c983a22f9c430de1bf99134ee561e856"),  # noqa: E501
+        address=Address(0x703B936FD4D674F0FF5D6957F61097152F8781B8),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x799DA5A3C983A22F9C430DE1BF99134EE561E856,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0x799DA5A3C983A22F9C430DE1BF99134EE561E856,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa74ca10b765dcda3b60687f73f2881e2a56eda64"),  # noqa: E501
+        address=Address(0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64)
+        + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x799DA5A3C983A22F9C430DE1BF99134EE561E856),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 2: 1}),
+        addr: Account(storage={0: 0, 1: 0}, balance=0x2540BE400),
+        addr_2: Account(storage={2: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcodecall_110.py b/tests/ported_static/stCallCodes/test_callcodecallcodecall_110.py
index dc8d69aa2f5..554208349a6 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcodecall_110.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcodecall_110.py
@@ -2,15 +2,15 @@
 CALLCODE -> CALLCODE -> CALL -> code, check parameters.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodecallcodecall_110Filler.json
+state_tests/stCallCodes/callcodecallcodecall_110Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcodecall_110Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcodecall_110Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcodecallcodecall_110(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALLCODE -> CALL -> code, check parameters."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,105 +43,99 @@ def test_callcodecallcodecall_110(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE))}  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x181b4ed322e192361633cc3c0a418f259ab0cf4b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x493E0,
-                    address=0x62441CBE78AA4A4244E084D4F86098E31DCED749,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 250000 <contract:0x1000000000000000000000000000000000000003> 3 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x3D090,
+                address=addr_3,
+                value=0x3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4c0de71b93de6b7055a3686e4bf93add02b39ed8"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x3D090,
-                    address=0x181B4ED322E192361633CC3C0A418F259AB0CF4B,
-                    value=0x3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 300000 <contract:0x1000000000000000000000000000000000000002> 2 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x493E0,
+                address=addr_2,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x62441cbe78aa4a4244e084d4f86098e31dced749"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x55730,
-                    address=0x4C0DE71B93DE6B7055A3686E4BF93ADD02B39ED8,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdb43306b16c521b9cc3667fbe7d1b697bb1f9605"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(
+        target: Account(storage={0: 1, 1: 1, 2: 1}),
+        addr_3: Account(
             storage={
                 3: 1,
-                4: 0xDB43306B16C521B9CC3667FBE7D1B697BB1F9605,
+                4: target,
                 7: 3,
-                330: 0x181B4ED322E192361633CC3C0A418F259AB0CF4B,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: addr_3,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
-        contract: Account(storage={0: 1, 1: 1, 2: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_ooge.py b/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_ooge.py
index d19654891f2..12893a6eea3 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_ooge.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_ooge.py
@@ -1,16 +1,16 @@
 """
-callcode -> callcode -> call -> code oog.
+Callcode -> callcode -> call -> code oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodecallcodecall_110_OOGEFiller.json
+state_tests/stCallCodes/callcodecallcodecall_110_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcodecall_110_OOGEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcodecall_110_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcodecallcodecall_110_ooge(
     pre: Alloc,
 ) -> None:
     """Callcode -> callcode -> call -> code oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,86 +43,83 @@ def test_callcodecallcodecall_110_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0xDB067DDF10E702A0CDCAA489117330E5395155CB,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 )  [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x913cf7a18f61bab7bccf5607dfa9b730c5976000"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0x913CF7A18F61BAB7BCCF5607DFA9B730C5976000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9e57433afaff8a546fbc43cf0330afb6561dc550"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdb067ddf10e702a0cdcaa489117330e5395155cb"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 11: 1}),
+        target: Account(storage={0: 1, 1: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_oogm_after.py b/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_oogm_after.py
index 6e1b455983c..3dcb2cbd581 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_oogm_after.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_oogm_after.py
@@ -1,17 +1,16 @@
 """
-callcode -> callcode (oog) -> call -> code.
+Callcode -> callcode (oog) -> call -> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodecallcodecall_110_OOGMAfterFiller.json
+state_tests/stCallCodes/callcodecallcodecall_110_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcodecall_110_OOGMAfterFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcodecall_110_OOGMAfterFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,8 @@ def test_callcodecallcodecall_110_oogm_after(
     pre: Alloc,
 ) -> None:
     """Callcode -> callcode (oog) -> call -> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,83 +43,82 @@ def test_callcodecallcodecall_110_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0x83B7D129B58AB5315B795F9A8D34294EC60C9D63,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x37e72dd6ff3c2ac8c1ddab092a26164a2ad5988c"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0x37E72DD6FF3C2AC8C1DDAB092A26164A2AD5988C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # { [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x400347dada8c51a2aac4b4c31ae726ba8551e2b9"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x83b7d129b58ab5315b795f9a8d34294ec60c9d63"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_oogm_before.py b/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_oogm_before.py
index d76c45fc4f6..728e22c7664 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_oogm_before.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_oogm_before.py
@@ -1,17 +1,16 @@
 """
-callcode -> callcode -> (oog) call -> code.
+Callcode -> callcode -> (oog) call -> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodecallcodecall_110_OOGMBeforeFiller.json
+state_tests/stCallCodes/callcodecallcodecall_110_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcodecall_110_OOGMBeforeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcodecall_110_OOGMBeforeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,8 @@ def test_callcodecallcodecall_110_oogm_before(
     pre: Alloc,
 ) -> None:
     """Callcode -> callcode -> (oog) call -> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,83 +43,82 @@ def test_callcodecallcodecall_110_oogm_before(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x51a61d678ec27711369c527e5d42a9de66a5727f"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0x51A61D678EC27711369C527E5D42A9DE66A5727F,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (KECCAK256 0x00 0x2fffff) [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8e6e134402f2eeca8e910e8ec62b45b36ee31f30"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0x8E6E134402F2EECA8E910E8EC62B45B36EE31F30,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9e57433afaff8a546fbc43cf0330afb6561dc550"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_suicide_end.py b/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_suicide_end.py
index 75609247603..b988b59cc26 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_suicide_end.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_suicide_end.py
@@ -2,16 +2,15 @@
 CALLCODE -> CALLCODE -> (CALL -> code) (suicide).
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodecallcodecall_110_SuicideEndFiller.json
+state_tests/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_callcodecallcodecall_110_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """CALLCODE -> CALLCODE -> (CALL -> code) (suicide)."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """CALLCODE -> CALLCODE -> (CALL -> code) (suicide) ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,88 +43,86 @@ def test_callcodecallcodecall_110_suicide_end(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa74ca10b765dcda3b60687f73f2881e2a56eda64"),  # noqa: E501
+        address=Address(0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xd957e143ad2c011bc6a2b142795f1a9ba70d0680"),  # noqa: E501
+        address=Address(0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xeaf8c2ae0d01a880cea4e1aa88def5edd153d57b"),  # noqa: E501
+        address=Address(0xD957E143AD2C011BC6A2B142795F1A9BA70D0680),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(storage={3: 1}),
-        contract: Account(storage={0: 1, 1: 1, 2: 1}),
+        addr: Account(balance=0xDE0B6B5FB6FE400),
+        addr_3: Account(storage={3: 1}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_suicide_middle.py b/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_suicide_middle.py
index 8e629040ceb..23e3bf3b6fb 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_suicide_middle.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcodecall_110_suicide_middle.py
@@ -2,16 +2,15 @@
 CALLCODE -> CALLCODE -> (suicide) CALL -> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodecallcodecall_110_SuicideMiddleFiller.json
+state_tests/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcodecall_110_suicide_middle(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALLCODE -> (suicide) CALL -> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,85 +45,89 @@ def test_callcodecallcodecall_110_suicide_middle(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa74ca10b765dcda3b60687f73f2881e2a56eda64"),  # noqa: E501
+        address=Address(0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0xAC90BB4611B91D4C6292BD64E8656110822E01ED,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xac90bb4611b91d4c6292bd64e8656110822e01ed"),  # noqa: E501
+        address=Address(0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0xAC90BB4611B91D4C6292BD64E8656110822E01ED,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (CALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xeaf8c2ae0d01a880cea4e1aa88def5edd153d57b"),  # noqa: E501
+        address=Address(0xAC90BB4611B91D4C6292BD64E8656110822E01ED),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={0: 0, 1: 0, 2: 0}, balance=0x2540BE400),
+        addr_2: Account(storage={3: 0}, balance=0x2540BE400),
+        addr_3: Account(storage={3: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcodecall_abcb_recursive.py b/tests/ported_static/stCallCodes/test_callcodecallcodecall_abcb_recursive.py
index f8c2bca0bb3..ce4795cb975 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcodecall_abcb_recursive.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcodecall_abcb_recursive.py
@@ -2,16 +2,15 @@
 CALLCODE -> CALLCODE <-> CALL.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodecallcodecall_ABCB_RECURSIVEFiller.json
+state_tests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_callcodecallcodecall_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """CALLCODE -> CALLCODE <-> CALL."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """CALLCODE -> CALLCODE <-> CALL ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,78 +43,78 @@ def test_callcodecallcodecall_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 25000000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x17D7840,
-                    address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x17D7840,
+                address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6d477a21d3906d4c0cd1edbfa7d272e6e21f1ca1"),  # noqa: E501
+        address=Address(0x6D477A21D3906D4C0CD1EDBFA7D272E6E21F1CA1),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x7A120,
-                    address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 1000000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xF4240,
+                address=0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x91a8703c1bef34c1e76e152c1f7fb8c336c3be24"),  # noqa: E501
+        address=Address(0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xF4240,
-                    address=0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x7A120,
+                address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xe2ab9779f4fb1d9d39211cc2082083add172e69c"),  # noqa: E501
+        address=Address(0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111.py b/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111.py
index cf75d18ab78..3eecfb14554 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111.py
@@ -2,15 +2,15 @@
 CALLCODE -> CALLCODE -> CALLCODE -> code check parameter opcodes.
 
 Ported from:
-tests/static/state_tests/stCallCodes/callcodecallcodecallcode_111Filler.json
+state_tests/stCallCodes/callcodecallcodecallcode_111Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcodecallcode_111Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcodecallcode_111Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_callcodecallcodecallcode_111(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALLCODE -> CALLCODE -> code check parameter opcodes."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,102 +43,96 @@ def test_callcodecallcodecallcode_111(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x3D090,
-                    address=0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
-                    value=0x3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0ffffaeb931552e5f094ca96a70be612da56b887"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x493E0,
-                    address=0xFFFFAEB931552E5F094CA96A70BE612DA56B887,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 250000 <contract:0x1000000000000000000000000000000000000003> 3 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x3D090,
+                address=addr_3,
+                value=0x3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4c0de71b93de6b7055a3686e4bf93add02b39ed8"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 300000 <contract:0x1000000000000000000000000000000000000002> 2 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x493E0,
+                address=addr_2,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7e63847aad8ca50fb7c04777dce6871a6bf8de0c"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x55730,
-                    address=0x4C0DE71B93DE6B7055A3686E4BF93ADD02B39ED8,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdb43306b16c521b9cc3667fbe7d1b697bb1f9605"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 1,
                 1: 1,
                 2: 1,
                 3: 1,
-                4: 0xDB43306B16C521B9CC3667FBE7D1B697BB1F9605,
+                4: target,
                 7: 3,
-                330: 0xDB43306B16C521B9CC3667FBE7D1B697BB1F9605,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: target,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_ooge.py b/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_ooge.py
index c33bd2a9bdd..3f6392ba446 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_ooge.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_ooge.py
@@ -1,17 +1,16 @@
 """
-callcode -> callcode -> callcode -> code oog.
+Callcode -> callcode -> callcode -> code oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodecallcodecallcode_111_OOGEFiller.json
+state_tests/stCallCodes/callcodecallcodecallcode_111_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCodes/callcodecallcodecallcode_111_OOGEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCodes/callcodecallcodecallcode_111_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,8 @@ def test_callcodecallcodecallcode_111_ooge(
     pre: Alloc,
 ) -> None:
     """Callcode -> callcode -> callcode -> code oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,86 +43,83 @@ def test_callcodecallcodecallcode_111_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6322dc554acdcada01cbf7ac6a163d207c34ded2"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0x6322DC554ACDCADA01CBF7AC6A163D207C34DED2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x913cf7a18f61bab7bccf5607dfa9b730c5976000"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0x913CF7A18F61BAB7BCCF5607DFA9B730C5976000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9e57433afaff8a546fbc43cf0330afb6561dc550"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 11: 1}),
+        target: Account(storage={0: 1, 1: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_oogm_after.py b/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_oogm_after.py
index 87256c3596f..68d26a9b033 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_oogm_after.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_oogm_after.py
@@ -1,17 +1,16 @@
 """
-callcode -> (callcode -> callcode -> code)  oog.
+Callcode -> (callcode -> callcode -> code)  oog.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodecallcodecallcode_111_OOGMAfterFiller.json
+state_tests/stCallCodes/callcodecallcodecallcode_111_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCodes/callcodecallcodecallcode_111_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stCallCodes/callcodecallcodecallcode_111_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcodecallcode_111_oogm_after(
     pre: Alloc,
 ) -> None:
     """Callcode -> (callcode -> callcode -> code)  oog."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,83 +45,82 @@ def test_callcodecallcodecallcode_111_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0x926DFBCC20B2AB686FC85331883541D174CCC738,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x37e72dd6ff3c2ac8c1ddab092a26164a2ad5988c"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0x37E72DD6FF3C2AC8C1DDAB092A26164A2AD5988C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x400347dada8c51a2aac4b4c31ae726ba8551e2b9"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x926dfbcc20b2ab686fc85331883541d174ccc738"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_oogm_before.py b/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_oogm_before.py
index 9bf147aacfa..d42b32ac321 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_oogm_before.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_oogm_before.py
@@ -1,17 +1,16 @@
 """
-callcode -> callcode -> (OOG) callcode -> code.
+Callcode -> callcode -> (OOG) callcode -> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodecallcodecallcode_111_OOGMBeforeFiller.json
+state_tests/stCallCodes/callcodecallcodecallcode_111_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCodes/callcodecallcodecallcode_111_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stCallCodes/callcodecallcodecallcode_111_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcodecallcode_111_oogm_before(
     pre: Alloc,
 ) -> None:
     """Callcode -> callcode -> (OOG) callcode -> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,83 +45,82 @@ def test_callcodecallcodecallcode_111_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0xA4173498C0DA91570D8AF9A128C337A67A6B4E69,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x9e57433afaff8a546fbc43cf0330afb6561dc550"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0xDBB53599A5D13E0C465E1CC4FF24D7F00D780DF4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (KECCAK256 0x00 0x2fffff) [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa4173498c0da91570d8af9a128c337a67a6b4e69"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[ 11 ]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdbb53599a5d13e0c465e1cc4ff24d7f00d780df4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_suicide_end.py b/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_suicide_end.py
index 14c2d20a8a9..d3b29c3988d 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_suicide_end.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_suicide_end.py
@@ -2,16 +2,15 @@
 CALLCODE -> CALLCODE -> (CALLCODE -> code) suicide.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodecallcodecallcode_111_SuicideEndFiller.json
+state_tests/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcodecallcode_111_suicide_end(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALLCODE -> (CALLCODE -> code) suicide."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,87 +45,86 @@ def test_callcodecallcodecallcode_111_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x94c8f980aeecbb6575b12ae614a249fc3e836f21"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa74ca10b765dcda3b60687f73f2881e2a56eda64"),  # noqa: E501
+        address=Address(0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xeaf8c2ae0d01a880cea4e1aa88def5edd153d57b"),  # noqa: E501
+        address=Address(0x94C8F980AEECBB6575B12AE614A249FC3E836F21),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 2: 1, 3: 1}),
+        addr: Account(balance=0xDE0B6B5FB6FE400),
+        addr_2: Account(storage={0: 0, 1: 0, 2: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_suicide_middle.py b/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_suicide_middle.py
index 2cb9b468cf2..16b7662f27c 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_suicide_middle.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_111_suicide_middle.py
@@ -2,16 +2,15 @@
 CALLCODE -> CALLCODE -> (suicide) CALLCODE -> code.
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodecallcodecallcode_111_SuicideMiddleFiller.json
+state_tests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcodecallcode_111_suicide_middle(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALLCODE -> (suicide) CALLCODE -> code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,85 +45,90 @@ def test_callcodecallcodecallcode_111_suicide_middle(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x23a077e1e6b0740d6bfbc41de582f2930abd1762"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa74ca10b765dcda3b60687f73f2881e2a56eda64"),  # noqa: E501
+        address=Address(0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0x23A077E1E6B0740D6BFBC41DE582F2930ABD1762,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0x23A077E1E6B0740D6BFBC41DE582F2930ABD1762,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xeaf8c2ae0d01a880cea4e1aa88def5edd153d57b"),  # noqa: E501
+        address=Address(0x23A077E1E6B0740D6BFBC41DE582F2930ABD1762),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={0: 0, 1: 0, 2: 0}, balance=0x2540BE400),
+        addr_2: Account(storage={3: 0}, balance=0x2540BE400),
+        addr_3: Account(storage={3: 0}, balance=0x2540BE400),
+        target: Account(storage={0: 1, 1: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_abcb_recursive.py b/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_abcb_recursive.py
index 6446e4c06ee..0c73ba78c27 100644
--- a/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_abcb_recursive.py
+++ b/tests/ported_static/stCallCodes/test_callcodecallcodecallcode_abcb_recursive.py
@@ -1,17 +1,16 @@
 """
-CALLCODE -> CALLCODE2 -> CALLCODE3 -> CALLCODE2 -> ...  the gas usage is...
+CALLCODE -> CALLCODE2 -> CALLCODE3 -> CALLCODE2 -> ...  the gas usage...
 
 Ported from:
-tests/static/state_tests/stCallCodes
-callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
+state_tests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcodecallcode_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """CALLCODE -> CALLCODE2 -> CALLCODE3 -> CALLCODE2 -> ...  the gas..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """CALLCODE -> CALLCODE2 -> CALLCODE3 -> CALLCODE2 -> ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,78 +45,78 @@ def test_callcodecallcodecallcode_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 25000000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x17D7840,
-                    address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x17D7840,
+                address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6d477a21d3906d4c0cd1edbfa7d272e6e21f1ca1"),  # noqa: E501
+        address=Address(0x6D477A21D3906D4C0CD1EDBFA7D272E6E21F1CA1),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 1000000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xF4240,
+                address=0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa71333d8c0291cfd6da54bec5a3957563ab16c1c"),  # noqa: E501
+        address=Address(0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xF4240,
-                    address=0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 500000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xe2ab9779f4fb1d9d39211cc2082083add172e69c"),  # noqa: E501
+        address=Address(0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/__init__.py b/tests/ported_static/stCallCreateCallCodeTest/__init__.py
index 511dfd1c343..e73c1423c25 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/__init__.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stCallCreateCallCodeTest."""
+"""Ported static tests: stCallCreateCallCodeTest."""  # noqa: N999
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_call1024_balance_too_low.py b/tests/ported_static/stCallCreateCallCodeTest/test_call1024_balance_too_low.py
index 92939b6ae93..8eeee9b6815 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_call1024_balance_too_low.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_call1024_balance_too_low.py
@@ -1,17 +1,16 @@
 """
-calldepth with balance too low.
+Calldepth with balance too low.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-Call1024BalanceTooLowFiller.json
+state_tests/stCallCreateCallCodeTest/Call1024BalanceTooLowFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/Call1024BalanceTooLowFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/Call1024BalanceTooLowFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -35,11 +32,8 @@ def test_call1024_balance_too_low(
     pre: Alloc,
 ) -> None:
     """Calldepth with balance too low."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -50,41 +44,37 @@ def test_call1024_balance_too_low(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
     # { [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALL 0xfffffffffff <contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> @@0 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xFFFFFFFFFFF,
-                    address=0x2AAA3AB47A59B4AD0BA3F72AD0B5BC35388333B4,
-                    value=Op.SLOAD(key=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xFFFFFFFFFFF,
+                address=0x2AAA3AB47A59B4AD0BA3F72AD0B5BC35388333B4,
+                value=Op.SLOAD(key=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0x2aaa3ab47a59b4ad0ba3f72ad0b5bc35388333b4"),  # noqa: E501
+        address=Address(0x2AAA3AB47A59B4AD0BA3F72AD0B5BC35388333B4),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre[callee] = Account(balance=7000, nonce=0)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=17592186099592,
         value=10,
     )
 
-    post = {
-        contract: Account(storage={0: 1025, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1025, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_call1024_oog.py b/tests/ported_static/stCallCreateCallCodeTest/test_call1024_oog.py
index 8cb728b0387..127b02327fd 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_call1024_oog.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_call1024_oog.py
@@ -1,20 +1,24 @@
 """
-calldepth with oog.
+Calldepth with oog.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest/Call1024OOGFiller.json
+state_tests/stCallCreateCallCodeTest/Call1024OOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,62 +26,50 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/Call1024OOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/Call1024OOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            13120826,
-            {
-                Address("0x0878bc1c3d660907b056e31c854a309f7ef1b4c4"): Account(
-                    storage={0: 134, 1: 1, 2: 0x20B71}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
         ),
-        (
-            9320826,
-            {
-                Address("0x0878bc1c3d660907b056e31c854a309f7ef1b4c4"): Account(
-                    storage={0: 113, 1: 1, 2: 0x1B969}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
-        (
-            15720826,
-            {
-                Address("0x0878bc1c3d660907b056e31c854a309f7ef1b4c4"): Account(
-                    storage={0: 146, 1: 1, 2: 0x23A51}
-                )
-            },
+        pytest.param(
+            0,
+            2,
+            0,
+            id="-g2",
         ),
-        (
-            11220826,
-            {
-                Address("0x0878bc1c3d660907b056e31c854a309f7ef1b4c4"): Account(
-                    storage={0: 124, 1: 1, 2: 0x1E461}
-                )
-            },
+        pytest.param(
+            0,
+            3,
+            0,
+            id="-g3",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_call1024_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Calldepth with oog."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -88,46 +80,73 @@ def test_call1024_oog(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
     # { [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALL (MUL (SUB (GAS) 10000) (SUB 1 (DIV @@0 1025))) <contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.MUL(
-                        Op.SUB(Op.GAS, 0x2710),
-                        Op.SUB(0x1, Op.DIV(Op.SLOAD(key=0x0), 0x401)),
-                    ),
-                    address=0x878BC1C3D660907B056E31C854A309F7EF1B4C4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.MUL(
+                    Op.SUB(Op.GAS, 0x2710),
+                    Op.SUB(0x1, Op.DIV(Op.SLOAD(key=0x0), 0x401)),
                 ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8)),
-            )
-            + Op.STOP
-        ),
+                address=0x878BC1C3D660907B056E31C854A309F7EF1B4C4,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2, value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8))
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0x0878bc1c3d660907b056e31c854a309f7ef1b4c4"),  # noqa: E501
+        address=Address(0x0878BC1C3D660907B056E31C854A309F7EF1B4C4),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre[callee] = Account(balance=7000, nonce=0)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 134, 1: 1, 2: 0x20B71})},
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 113, 1: 1, 2: 0x1B969})},
+        },
+        {
+            "indexes": {"data": -1, "gas": 2, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 146, 1: 1, 2: 0x23A51})},
+        },
+        {
+            "indexes": {"data": -1, "gas": 3, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 124, 1: 1, 2: 0x1E461})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [13120826, 9320826, 15720826, 11220826]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_call1024_pre_calls.py b/tests/ported_static/stCallCreateCallCodeTest/test_call1024_pre_calls.py
index 99fb57d5f89..bece3316ff2 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_call1024_pre_calls.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_call1024_pre_calls.py
@@ -1,8 +1,8 @@
 """
-calldepth with subcall.
+Calldepth with subcall.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest/Call1024PreCallsFiller.json
+state_tests/stCallCreateCallCodeTest/Call1024PreCallsFiller.json
 """
 
 import pytest
@@ -11,10 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,32 +27,42 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/Call1024PreCallsFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/Call1024PreCallsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
 @pytest.mark.parametrize(
-    "tx_gas_limit",
+    "d, g, v",
     [
-        9214364837600034817,
-        11837600034817,
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_call1024_pre_calls(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Calldepth with subcall."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    addr = Address(0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0)
     sender = EOA(
         key=0xCC381C83857B17CA629268ED418E2915A0287B84EFE9CF2204C020302E83CDA0
     )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -59,64 +74,81 @@ def test_call1024_pre_calls(
     )
 
     pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    pre[addr] = Account(balance=7000)
+    # Source: lll
     # { [[ 2 ]] (CALL 0xffff <eoa:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 0 0 0) [[ 3 ]] (CALL 0xffff <eoa:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 0 0 0)  [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALL 0xfffffffffff <contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xFFFF,
-                    address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.CALL(
-                    gas=0xFFFF,
-                    address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xFFFFFFFFFFF,
-                    address=0x48C20CD83DDBD3908712F4D31C51B3CDAAE287CE,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xFFFF,
+                address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.CALL(
+                gas=0xFFFF,
+                address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xFFFFFFFFFFF,
+                address=0x48C20CD83DDBD3908712F4D31C51B3CDAAE287CE,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=2024,
         nonce=0,
-        address=Address("0x48c20cd83ddbd3908712f4d31c51b3cdaae287ce"),  # noqa: E501
+        address=Address(0x48C20CD83DDBD3908712F4D31C51B3CDAAE287CE),  # noqa: E501
     )
-    pre[callee] = Account(balance=7000, nonce=0)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 1025, 1: 1, 2: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 1025, 1: 1, 2: 0, 3: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [9214364837600034817, 11837600034817]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = {
-        contract: Account(storage={0: 1025, 1: 1}),
-    }
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_call_lose_gas_oog.py b/tests/ported_static/stCallCreateCallCodeTest/test_call_lose_gas_oog.py
index 8db107ecc71..ccae45c2c76 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_call_lose_gas_oog.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_call_lose_gas_oog.py
@@ -1,16 +1,16 @@
 """
-recursive call.
+Recursive call.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest/CallLoseGasOOGFiller.json
+state_tests/stCallCreateCallCodeTest/CallLoseGasOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/CallLoseGasOOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/CallLoseGasOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +31,8 @@ def test_call_lose_gas_oog(
     pre: Alloc,
 ) -> None:
     """Recursive call."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,45 +43,40 @@ def test_call_lose_gas_oog(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
     # { [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALL (ADD 1(MUL @@0 100000)) <contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x186A0)),
-                    address=0x180F2D7E0C9A56B7BB287E2F50101660110B641F,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8)),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x186A0)),
+                address=0x180F2D7E0C9A56B7BB287E2F50101660110B641F,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2, value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8))
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0x180f2d7e0c9a56b7bb287e2f50101660110b641f"),  # noqa: E501
+        address=Address(0x180F2D7E0C9A56B7BB287E2F50101660110B641F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre[callee] = Account(balance=7000, nonce=0)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=200000,
         value=10,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 2: 1001}),
-    }
+    post = {target: Account(storage={0: 1, 2: 1001})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_call_output1.py b/tests/ported_static/stCallCreateCallCodeTest/test_call_output1.py
index a88f2757824..36f89a60db9 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_call_output1.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_call_output1.py
@@ -1,8 +1,8 @@
 """
-check the output memory after call.
+Check the output memory after call.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest/callOutput1Filler.json
+state_tests/stCallCreateCallCodeTest/callOutput1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callOutput1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/callOutput1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,7 +32,7 @@ def test_call_output1(
     pre: Alloc,
 ) -> None:
     """Check the output memory after call."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -48,54 +47,53 @@ def test_call_output1(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALL 150000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 0) [[ 0 ]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x249F0,
-                    address=0xBCC1197CCD23A97607F2F96D031F3432E0D16A02,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x6001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x62c381fd04b6e4f31ba6d6f58c6a0d34eee4fc52"),  # noqa: E501
+        address=Address(0xBCC1197CCD23A97607F2F96D031F3432E0D16A02),  # noqa: E501
     )
-    # Source: raw bytecode
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
+    # Source: lll
+    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALL 150000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 0) [[ 0 ]] (MLOAD 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x249F0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
+        address=Address(0x62C381FD04B6E4F31BA6D6F58C6A0D34EEE4FC52),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
         ),
-        callee: Account(storage={0: 2}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_call_output2.py b/tests/ported_static/stCallCreateCallCodeTest/test_call_output2.py
index 6336cd95407..ca7edcd92d1 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_call_output2.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_call_output2.py
@@ -1,8 +1,8 @@
 """
-check the output memory after call.
+Check the output memory after call.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest/callOutput2Filler.json
+state_tests/stCallCreateCallCodeTest/callOutput2Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callOutput2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/callOutput2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,7 +32,7 @@ def test_call_output2(
     pre: Alloc,
 ) -> None:
     """Check the output memory after call."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -48,54 +47,53 @@ def test_call_output2(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALL 150000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 32 0 0) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x249F0,
-                    address=0xBCC1197CCD23A97607F2F96D031F3432E0D16A02,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x6001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7eceed6f6dd8b5ed0637dc20761945256e2bafc7"),  # noqa: E501
+        address=Address(0xBCC1197CCD23A97607F2F96D031F3432E0D16A02),  # noqa: E501
     )
-    # Source: raw bytecode
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
+    # Source: lll
+    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALL 150000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 32 0 0) [[ 0 ]] (MLOAD 0)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x249F0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
+        address=Address(0x7ECEED6F6DD8B5ED0637DC20761945256E2BAFC7),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
         ),
-        callee: Account(storage={0: 2}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_call_output3.py b/tests/ported_static/stCallCreateCallCodeTest/test_call_output3.py
index 3feb45668d0..ba359981dcd 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_call_output3.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_call_output3.py
@@ -1,8 +1,8 @@
 """
-check the output memory after call.
+Check the output memory after call.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest/callOutput3Filler.json
+state_tests/stCallCreateCallCodeTest/callOutput3Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callOutput3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/callOutput3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,7 +32,7 @@ def test_call_output3(
     pre: Alloc,
 ) -> None:
     """Check the output memory after call."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -48,50 +47,49 @@ def test_call_output3(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    callee = pre.deploy_contract(
+    # Source: raw
+    # 0x6001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
+        address=Address(0xBCC1197CCD23A97607F2F96D031F3432E0D16A02),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALL 150000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x249F0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
             )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x249F0,
-                    address=0xBCC1197CCD23A97607F2F96D031F3432E0D16A02,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd4e4bfa87dc8f20706bf63f45861945315be24f0"),  # noqa: E501
+        address=Address(0xD4E4BFA87DC8F20706BF63F45861945315BE24F0),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        callee: Account(storage={0: 2}),
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_call_output3_fail.py b/tests/ported_static/stCallCreateCallCodeTest/test_call_output3_fail.py
index 79412327e88..68e27013ea7 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_call_output3_fail.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_call_output3_fail.py
@@ -1,8 +1,8 @@
 """
-check the output memory after call.
+Check the output memory after call.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest/callOutput3FailFiller.json
+state_tests/stCallCreateCallCodeTest/callOutput3FailFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callOutput3FailFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/callOutput3FailFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,7 +32,7 @@ def test_call_output3_fail(
     pre: Alloc,
 ) -> None:
     """Check the output memory after call."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -48,49 +47,49 @@ def test_call_output3_fail(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x834ABC2C68C5F44EA9AE82B67AAF92044901CDC6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x016001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.ADD + Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3d63522c16b6dcc36f08db61fcdcf5ecea92f4d4"),  # noqa: E501
+        address=Address(0x834ABC2C68C5F44EA9AE82B67AAF92044901CDC6),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.ADD + Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
+    # Source: lll
+    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x834abc2c68c5f44ea9ae82b67aaf92044901cdc6"),  # noqa: E501
+        address=Address(0x3D63522C16B6DCC36F08DB61FCDCF5ECEA92F4D4),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_call_output3partial.py b/tests/ported_static/stCallCreateCallCodeTest/test_call_output3partial.py
index 01597da7a58..43d7672e0c9 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_call_output3partial.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_call_output3partial.py
@@ -1,8 +1,8 @@
 """
-check the output memory after call.
+Check the output memory after call.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest/callOutput3partialFiller.json
+state_tests/stCallCreateCallCodeTest/callOutput3partialFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callOutput3partialFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/callOutput3partialFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,7 +32,7 @@ def test_call_output3partial(
     pre: Alloc,
 ) -> None:
     """Check the output memory after call."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -47,55 +46,54 @@ def test_call_output3partial(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALL 150000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 10) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x249F0,
-                    address=0xBCC1197CCD23A97607F2F96D031F3432E0D16A02,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0xA,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x24bc72d274ab8e9445bb449bbea2ccd492f6a2bf"),  # noqa: E501
+        address=Address(0xBCC1197CCD23A97607F2F96D031F3432E0D16A02),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
+    # Source: lll
+    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALL 150000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 10) [[ 0 ]] (MLOAD 0)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x249F0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0xA,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
+        address=Address(0x24BC72D274AB8E9445BB449BBEA2CCD492F6A2BF),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
         ),
-        callee: Account(storage={0: 2}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_call_output3partial_fail.py b/tests/ported_static/stCallCreateCallCodeTest/test_call_output3partial_fail.py
index 876341338a3..b18c1007da4 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_call_output3partial_fail.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_call_output3partial_fail.py
@@ -1,9 +1,8 @@
 """
-check the output memory after call.
+Check the output memory after call.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-callOutput3partialFailFiller.json
+state_tests/stCallCreateCallCodeTest/callOutput3partialFailFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callOutput3partialFailFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/callOutput3partialFailFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,7 +32,7 @@ def test_call_output3partial_fail(
     pre: Alloc,
 ) -> None:
     """Check the output memory after call."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -49,49 +47,49 @@ def test_call_output3partial_fail(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x016001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.ADD + Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x834abc2c68c5f44ea9ae82b67aaf92044901cdc6"),  # noqa: E501
+        address=Address(0x834ABC2C68C5F44EA9AE82B67AAF92044901CDC6),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 10) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0xA,
             )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x834ABC2C68C5F44EA9AE82B67AAF92044901CDC6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0xA,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x974e2490eac79ca8aa70e20696e15f538ee8f02f"),  # noqa: E501
+        address=Address(0x974E2490EAC79CA8AA70E20696E15F538EE8F02F),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_call_recursive_bomb_pre_call.py b/tests/ported_static/stCallCreateCallCodeTest/test_call_recursive_bomb_pre_call.py
index dbbbf48df41..2261b2901e2 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_call_recursive_bomb_pre_call.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_call_recursive_bomb_pre_call.py
@@ -1,17 +1,16 @@
 """
-recursive call.
+Recursive call.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-CallRecursiveBombPreCallFiller.json
+state_tests/stCallCreateCallCodeTest/CallRecursiveBombPreCallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/CallRecursiveBombPreCallFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/CallRecursiveBombPreCallFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -35,10 +34,8 @@ def test_call_recursive_bomb_pre_call(
     pre: Alloc,
 ) -> None:
     """Recursive call."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x77F65B71F1F16A75476F469F7106D1B60BFEC266AE25B8DA16A9091D223AA24A
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,67 +46,64 @@ def test_call_recursive_bomb_pre_call(
         gas_limit=9223372036854775807,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x36B00),
-                    address=Op.ADDRESS,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 224000) (ADDRESS) 0 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x36B00),
+                address=Op.ADDRESS,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1b3f200856856edc2e98efcd637775c6e341e3c0"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (CALL 100000 0xbad304eb96065b2a98b57a48a06ae28d285a71b5 23 0 0 0 0)  (CALL 0x7ffffffffffffff <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 0 0 0)  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x186A0,
-                    address=0xBAD304EB96065B2A98B57A48A06AE28D285A71B5,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.CALL(
-                gas=0x7FFFFFFFFFFFFFF,
-                address=0x1B3F200856856EDC2E98EFCD637775C6E341E3C0,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x186A0,
+                address=0xBAD304EB96065B2A98B57A48A06AE28D285A71B5,
                 value=0x17,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.CALL(
+            gas=0x7FFFFFFFFFFFFFF,
+            address=addr,
+            value=0x17,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0x55bd941930d381e552d261d75ed997be59e36350"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=9214364837600034817,
     )
 
     post = {
-        callee: Account(storage={0: 1024, 1: 1}),
+        addr: Account(storage={0: 1024, 1: 1}),
+        sender: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_call_with_high_value.py b/tests/ported_static/stCallCreateCallCodeTest/test_call_with_high_value.py
index 5e5d3ea3258..8f1c61f19fb 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_call_with_high_value.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_call_with_high_value.py
@@ -1,16 +1,16 @@
 """
-call with value and not enough value to send.
+Call with value and not enough value to send.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest/callWithHighValueFiller.json
+state_tests/stCallCreateCallCodeTest/callWithHighValueFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callWithHighValueFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/callWithHighValueFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_call_with_high_value(
     pre: Alloc,
 ) -> None:
     """Call with value and not enough value to send."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,42 +43,43 @@ def test_call_with_high_value(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # { [[2]] 1 }
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0x9d8c3fed067968360493f6deb5b169a720dac8a2"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 150000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 1000000000000000001 0 64 0 2 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0x9D8C3FED067968360493F6DEB5B169A720DAC8A2,
-                    value=0xDE0B6B3A7640001,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=addr,
+                value=0xDE0B6B3A7640001,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xccc6849cd07c3e5b61ab6d7e798d3c4007615284"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}),
+        addr: Account(storage={}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_call_with_high_value_and_gas_oog.py b/tests/ported_static/stCallCreateCallCodeTest/test_call_with_high_value_and_gas_oog.py
index 7dcf299b8fa..5240cae80cd 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_call_with_high_value_and_gas_oog.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_call_with_high_value_and_gas_oog.py
@@ -1,9 +1,8 @@
 """
-call with value. call takes more gas then tx has, and more value than...
+Call with value. call takes more gas then tx has, and more value than...
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-callWithHighValueAndGasOOGFiller.json
+state_tests/stCallCreateCallCodeTest/callWithHighValueAndGasOOGFiller.json
 """
 
 import pytest
@@ -12,10 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,49 +28,38 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callWithHighValueAndGasOOGFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/callWithHighValueAndGasOOGFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            100000,
-            {
-                Address("0xdfad372452688759edd82c422bf3976eafc89c2b"): Account(
-                    storage={
-                        1: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
         ),
-        (
-            100000000000000000000,
-            {
-                Address("0x0896f13e800125c0ccec44f3c434335f0a97bc1b"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdfad372452688759edd82c422bf3976eafc89c2b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0x3700FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    }
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_call_with_high_value_and_gas_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Call with value. call takes more gas then tx has, and more value..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Call with value."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x897B12D02D588D8A4FE16FF831CBD4459C6F62F8C845B0CCDD31CAF068C84A26
     )
@@ -80,58 +73,89 @@ def test_call_with_high_value_and_gas_oog(
         gas_limit=30000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-        ),
+    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
+    # Source: raw
+    # 0x6001600155603760005360026000f3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2),
         balance=23,
         nonce=0,
-        address=Address("0x0896f13e800125c0ccec44f3c434335f0a97bc1b"),  # noqa: E501
+        address=Address(0x0896F13E800125C0CCEC44F3C434335F0A97BC1B),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 0xffffffffffffffffffffffff <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 100000000000000000000 0 64 0 2 ) [[1]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xFFFFFFFFFFFFFFFFFFFFFFFF,
-                    address=0x896F13E800125C0CCEC44F3C434335F0A97BC1B,
-                    value=0x56BC75E2D63100000,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0x5},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xFFFFFFFFFFFFFFFFFFFFFFFF,
+                address=addr,
+                value=0x56BC75E2D63100000,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 5},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdfad372452688759edd82c422bf3976eafc89c2b"),  # noqa: E501
+        address=Address(0xDFAD372452688759EDD82C422BF3976EAFC89C2B),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        1: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 1,
+                        1: 0x3700FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [6000000]
+    tx_value = [100000, 100000000000000000000]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=6000000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_call_with_high_value_and_oo_gat_tx_level.py b/tests/ported_static/stCallCreateCallCodeTest/test_call_with_high_value_and_oo_gat_tx_level.py
index 2ee9b579971..d105d652d73 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_call_with_high_value_and_oo_gat_tx_level.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_call_with_high_value_and_oo_gat_tx_level.py
@@ -1,21 +1,24 @@
 """
-call with value. call takes more gas then tx has, and more value than...
+Call with value. call takes more gas then tx has, and more value than...
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-callWithHighValueAndOOGatTxLevelFiller.json
+state_tests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevelFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,40 +27,39 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevelFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevelFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x0896f13e800125c0ccec44f3c434335f0a97bc1b"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x9001fa64dbba07e3eb711a42cf25b34ccee2bd2b"): Account(
-                    storage={0: 1}
-                ),
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_call_with_high_value_and_oo_gat_tx_level(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Call with value. call takes more gas then tx has, and more value..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Call with value."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -68,49 +70,67 @@ def test_call_with_high_value_and_oo_gat_tx_level(
         gas_limit=30000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-        ),
+    # Source: raw
+    # 0x6001600155603760005360026000f3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2),
         balance=23,
         nonce=0,
-        address=Address("0x0896f13e800125c0ccec44f3c434335f0a97bc1b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 3000001 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 100001 0 0 0 0 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x2DC6C1,
-                    address=0x896F13E800125C0CCEC44F3C434335F0A97BC1B,
-                    value=0x186A1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0x5},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x2DC6C1,
+                address=addr,
+                value=0x186A1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        storage={0: 5},
         balance=0x186A0,
         nonce=0,
-        address=Address("0x9001fa64dbba07e3eb711a42cf25b34ccee2bd2b"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 1}),
+                addr: Account(storage={1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [3000000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=3000000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_call_with_high_value_oo_gin_call.py b/tests/ported_static/stCallCreateCallCodeTest/test_call_with_high_value_oo_gin_call.py
index 22ee8d79df9..e460ca99647 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_call_with_high_value_oo_gin_call.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_call_with_high_value_oo_gin_call.py
@@ -1,17 +1,16 @@
 """
-call with value and oog happens inside.
+Call with value and oog happens inside.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-callWithHighValueOOGinCallFiller.json
+state_tests/stCallCreateCallCodeTest/callWithHighValueOOGinCallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callWithHighValueOOGinCallFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/callWithHighValueOOGinCallFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_call_with_high_value_oo_gin_call(
     pre: Alloc,
 ) -> None:
     """Call with value and oog happens inside."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,52 +45,48 @@ def test_call_with_high_value_oo_gin_call(
         gas_limit=30000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-        ),
+    # Source: raw
+    # 0x6001600155603760005360026000f3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2),
         balance=23,
         nonce=0,
-        address=Address("0x0896f13e800125c0ccec44f3c434335f0a97bc1b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (ADD (CALL 10000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 1000000000000000000 0 0 0 0 ) 1) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.ADD(
-                    Op.CALL(
-                        gas=0x2710,
-                        address=0x896F13E800125C0CCEC44F3C434335F0A97BC1B,
-                        value=0xDE0B6B3A7640000,
-                        args_offset=0x0,
-                        args_size=0x0,
-                        ret_offset=0x0,
-                        ret_size=0x0,
-                    ),
-                    0x1,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.ADD(
+                Op.CALL(
+                    gas=0x2710,
+                    address=addr,
+                    value=0xDE0B6B3A7640000,
+                    args_offset=0x0,
+                    args_size=0x0,
+                    ret_offset=0x0,
+                    ret_size=0x0,
                 ),
-            )
-            + Op.STOP
-        ),
+                0x1,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640001,
         nonce=0,
-        address=Address("0xab77465b5abf0c394945e4186c02776f8eb9f2e7"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}, balance=0xDE0B6B3A7640001),
+        addr: Account(balance=23),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_callcode1024_balance_too_low.py b/tests/ported_static/stCallCreateCallCodeTest/test_callcode1024_balance_too_low.py
index 01f4cfa10da..ba34a69fc14 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_callcode1024_balance_too_low.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_callcode1024_balance_too_low.py
@@ -1,17 +1,16 @@
 """
-calldepth and balance.
+Calldepth and balance.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-Callcode1024BalanceTooLowFiller.json
+state_tests/stCallCreateCallCodeTest/Callcode1024BalanceTooLowFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/Callcode1024BalanceTooLowFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/Callcode1024BalanceTooLowFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -35,11 +34,8 @@ def test_callcode1024_balance_too_low(
     pre: Alloc,
 ) -> None:
     """Calldepth and balance."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -50,41 +46,37 @@ def test_callcode1024_balance_too_low(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
     # { [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALLCODE 0xfffffffffff <contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> @@0 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xFFFFFFFFFFF,
-                    address=0x63E310ADA77469A7A18B4CBF231FCCEFB6F18267,
-                    value=Op.SLOAD(key=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xFFFFFFFFFFF,
+                address=0x63E310ADA77469A7A18B4CBF231FCCEFB6F18267,
+                value=Op.SLOAD(key=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0x63e310ada77469a7a18b4cbf231fccefb6f18267"),  # noqa: E501
+        address=Address(0x63E310ADA77469A7A18B4CBF231FCCEFB6F18267),  # noqa: E501
     )
-    pre[callee] = Account(balance=7000, nonce=0)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=9151332035002892287,
         value=10,
     )
 
-    post = {
-        contract: Account(storage={0: 1025, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1025, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_callcode1024_oog.py b/tests/ported_static/stCallCreateCallCodeTest/test_callcode1024_oog.py
index c8d58c49aaa..2b2f42bd104 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_callcode1024_oog.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_callcode1024_oog.py
@@ -1,20 +1,24 @@
 """
-calldepth and oog.
+Calldepth and oog.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest/Callcode1024OOGFiller.json
+state_tests/stCallCreateCallCodeTest/Callcode1024OOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,46 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/Callcode1024OOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/Callcode1024OOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            15720826,
-            {
-                Address("0x1b803058288dc00000f98311b059597434253374"): Account(
-                    storage={0: 146, 1: 1, 2: 0x23A51}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
         ),
-        (
-            13120826,
-            {
-                Address("0x1b803058288dc00000f98311b059597434253374"): Account(
-                    storage={0: 134, 1: 1, 2: 0x20B71}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_callcode1024_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Calldepth and oog."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -72,46 +68,63 @@ def test_callcode1024_oog(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
     # { [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALLCODE (MUL (SUB (GAS) 10000) (SUB 1 (DIV @@0 1025))) <contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=Op.MUL(
-                        Op.SUB(Op.GAS, 0x2710),
-                        Op.SUB(0x1, Op.DIV(Op.SLOAD(key=0x0), 0x401)),
-                    ),
-                    address=0x1B803058288DC00000F98311B059597434253374,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=Op.MUL(
+                    Op.SUB(Op.GAS, 0x2710),
+                    Op.SUB(0x1, Op.DIV(Op.SLOAD(key=0x0), 0x401)),
                 ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8)),
-            )
-            + Op.STOP
-        ),
+                address=0x1B803058288DC00000F98311B059597434253374,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2, value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8))
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0x1b803058288dc00000f98311b059597434253374"),  # noqa: E501
+        address=Address(0x1B803058288DC00000F98311B059597434253374),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre[callee] = Account(balance=7000, nonce=0)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 146, 1: 1, 2: 0x23A51})},
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 134, 1: 1, 2: 0x20B71})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [15720826, 13120826]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_lose_gas_oog.py b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_lose_gas_oog.py
index 08efc38a0a6..8ed143eb578 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_lose_gas_oog.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_lose_gas_oog.py
@@ -1,20 +1,24 @@
 """
-recursive call.
+Recursive call.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json
+state_tests/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,40 +26,44 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (166262, {}),
-        (156262, {}),
-        (
-            170000,
-            {
-                Address("0xb0fafbe5aa1d6f184eb4bcb79b292e4d3238f4ca"): Account(
-                    storage={0: 1, 2: 1001}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="-g2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_callcode_lose_gas_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Recursive call."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -66,43 +74,65 @@ def test_callcode_lose_gas_oog(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
     # { [[ 0 ]] (ADD @@0 1) [[ 1 ]] (CALLCODE (ADD 1(MUL @@0 100000)) <contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x186A0)),
-                    address=0xB0FAFBE5AA1D6F184EB4BCB79B292E4D3238F4CA,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8)),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x186A0)),
+                address=0xB0FAFBE5AA1D6F184EB4BCB79B292E4D3238F4CA,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2, value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8))
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0xb0fafbe5aa1d6f184eb4bcb79b292e4d3238f4ca"),  # noqa: E501
+        address=Address(0xB0FAFBE5AA1D6F184EB4BCB79B292E4D3238F4CA),  # noqa: E501
     )
-    pre[callee] = Account(balance=7000, nonce=0)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0, 2: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0, 2: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": 2, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 2: 1001})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [166262, 156262, 170000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output1.py b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output1.py
index 5139b991f86..20ab325d5ce 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output1.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output1.py
@@ -1,8 +1,8 @@
 """
-check output memory after callcode.
+Check output memory after callcode.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest/callcodeOutput1Filler.json
+state_tests/stCallCreateCallCodeTest/callcodeOutput1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callcodeOutput1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/callcodeOutput1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,7 +32,7 @@ def test_callcode_output1(
     pre: Alloc,
 ) -> None:
     """Check output memory after callcode."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -48,49 +47,49 @@ def test_callcode_output1(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALLCODE 150000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 0) [[ 0 ]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0xBCC1197CCD23A97607F2F96D031F3432E0D16A02,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x6001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x64636cc2405b11c8d19ab153eac44ccce0fb70f9"),  # noqa: E501
+        address=Address(0xBCC1197CCD23A97607F2F96D031F3432E0D16A02),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
+    # Source: lll
+    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALLCODE 150000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 0) [[ 0 ]] (MLOAD 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x249F0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
+        address=Address(0x64636CC2405B11C8D19AB153EAC44CCCE0FB70F9),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output2.py b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output2.py
index 3893fc03018..ca92837a551 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output2.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output2.py
@@ -1,8 +1,8 @@
 """
-check output memory after callcode.
+Check output memory after callcode.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest/callcodeOutput2Filler.json
+state_tests/stCallCreateCallCodeTest/callcodeOutput2Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callcodeOutput2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/callcodeOutput2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,7 +32,7 @@ def test_callcode_output2(
     pre: Alloc,
 ) -> None:
     """Check output memory after callcode."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -48,49 +47,49 @@ def test_callcode_output2(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x6001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
+        address=Address(0xBCC1197CCD23A97607F2F96D031F3432E0D16A02),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALLCODE 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 32 0 0) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0xBCC1197CCD23A97607F2F96D031F3432E0D16A02,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe6470a86a9862d2ce7db006ee9c99092cd5e71bb"),  # noqa: E501
+        address=Address(0xE6470A86A9862D2CE7DB006EE9C99092CD5E71BB),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output3.py b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output3.py
index 8bd433a6fce..3cc762fbdae 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output3.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output3.py
@@ -1,8 +1,8 @@
 """
-check output memory after callcode.
+Check output memory after callcode.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest/callcodeOutput3Filler.json
+state_tests/stCallCreateCallCodeTest/callcodeOutput3Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callcodeOutput3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/callcodeOutput3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,7 +32,7 @@ def test_callcode_output3(
     pre: Alloc,
 ) -> None:
     """Check output memory after callcode."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -48,49 +47,49 @@ def test_callcode_output3(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALLCODE 150000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0xBCC1197CCD23A97607F2F96D031F3432E0D16A02,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x6001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xadfa10b17cf59bbec369dcaaa1413070463820c0"),  # noqa: E501
+        address=Address(0xBCC1197CCD23A97607F2F96D031F3432E0D16A02),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
+    # Source: lll
+    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALLCODE 150000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x249F0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
+        address=Address(0xADFA10B17CF59BBEC369DCAAA1413070463820C0),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output3_fail.py b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output3_fail.py
index 305a0667835..d13ae6c8bfe 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output3_fail.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output3_fail.py
@@ -1,9 +1,8 @@
 """
-check output memory after callcode. callcode fails with underflow.
+Check output memory after callcode. callcode fails with underflow.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-callcodeOutput3FailFiller.json
+state_tests/stCallCreateCallCodeTest/callcodeOutput3FailFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callcodeOutput3FailFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/callcodeOutput3FailFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,8 +31,8 @@ def test_callcode_output3_fail(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Check output memory after callcode. callcode fails with underflow."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Check output memory after callcode."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -49,49 +47,49 @@ def test_callcode_output3_fail(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x016001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.ADD + Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x834abc2c68c5f44ea9ae82b67aaf92044901cdc6"),  # noqa: E501
+        address=Address(0x834ABC2C68C5F44EA9AE82B67AAF92044901CDC6),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALLCODE 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
             )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x834ABC2C68C5F44EA9AE82B67AAF92044901CDC6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfbf2d514aad518cdf2e9d81e541c85fcddef6509"),  # noqa: E501
+        address=Address(0xFBF2D514AAD518CDF2E9D81E541C85FCDDEF6509),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output3partial.py b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output3partial.py
index 04ef85ad877..27445c6e3ca 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output3partial.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output3partial.py
@@ -1,9 +1,8 @@
 """
-check output memory after callcode.
+Check output memory after callcode.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-callcodeOutput3partialFiller.json
+state_tests/stCallCreateCallCodeTest/callcodeOutput3partialFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callcodeOutput3partialFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/callcodeOutput3partialFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,7 +32,7 @@ def test_callcode_output3partial(
     pre: Alloc,
 ) -> None:
     """Check output memory after callcode."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -49,49 +47,49 @@ def test_callcode_output3partial(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALLCODE 150000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 10) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0xBCC1197CCD23A97607F2F96D031F3432E0D16A02,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0xA,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x6001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x8e33b4f8eb53a43a1e8ef9b4b46a65fb94fef790"),  # noqa: E501
+        address=Address(0xBCC1197CCD23A97607F2F96D031F3432E0D16A02),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
+    # Source: lll
+    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALLCODE 150000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 10) [[ 0 ]] (MLOAD 0)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x249F0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0xA,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
+        address=Address(0x8E33B4F8EB53A43A1E8EF9B4B46A65FB94FEF790),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output3partial_fail.py b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output3partial_fail.py
index 7f372a68363..a63d7360ced 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output3partial_fail.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_output3partial_fail.py
@@ -1,9 +1,8 @@
 """
-check output memory after callcode. callcode fails with underflow stack.
+Check output memory after callcode. callcode fails with underflow stack.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-callcodeOutput3partialFailFiller.json
+state_tests/stCallCreateCallCodeTest/callcodeOutput3partialFailFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callcodeOutput3partialFailFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/callcodeOutput3partialFailFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_callcode_output3partial_fail(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Check output memory after callcode. callcode fails with underflow..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Check output memory after callcode."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -49,49 +49,49 @@ def test_callcode_output3partial_fail(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x016001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.ADD + Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x834abc2c68c5f44ea9ae82b67aaf92044901cdc6"),  # noqa: E501
+        address=Address(0x834ABC2C68C5F44EA9AE82B67AAF92044901CDC6),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (CALLCODE 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 10) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0xA,
             )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x834ABC2C68C5F44EA9AE82B67AAF92044901CDC6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0xA,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xee172f045cfa9101ee8c62faf6975d8f4c1e2099"),  # noqa: E501
+        address=Address(0xEE172F045CFA9101EE8C62FAF6975D8F4C1E2099),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_with_high_value.py b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_with_high_value.py
index 3ef7aba827a..7289130c10b 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_with_high_value.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_with_high_value.py
@@ -1,17 +1,16 @@
 """
-callcode with high value fails.
+Callcode with high value fails.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-callcodeWithHighValueFiller.json
+state_tests/stCallCreateCallCodeTest/callcodeWithHighValueFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callcodeWithHighValueFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/callcodeWithHighValueFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,8 @@ def test_callcode_with_high_value(
     pre: Alloc,
 ) -> None:
     """Callcode with high value fails."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,47 +43,42 @@ def test_callcode_with_high_value(
         gas_limit=30000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-        ),
+    # Source: raw
+    # 0x6001600155603760005360026000f3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2),
         balance=23,
         nonce=0,
-        address=Address("0x0896f13e800125c0ccec44f3c434335f0a97bc1b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 50000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 1000000000000000001 0 64 0 2 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x896F13E800125C0CCEC44F3C434335F0A97BC1B,
-                    value=0xDE0B6B3A7640001,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=addr,
+                value=0xDE0B6B3A7640001,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x177bd06bad8f3fe1b5d335d0aba2f2a6b18b2fc6"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_with_high_value_and_gas_oog.py b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_with_high_value_and_gas_oog.py
index bb18be5d365..920a5c06d3e 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_callcode_with_high_value_and_gas_oog.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_callcode_with_high_value_and_gas_oog.py
@@ -1,17 +1,16 @@
 """
-callcode with high value fails.
+Callcode with high value fails.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-callcodeWithHighValueAndGasOOGFiller.json
+state_tests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOGFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOGFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcode_with_high_value_and_gas_oog(
     pre: Alloc,
 ) -> None:
     """Callcode with high value fails."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,56 +45,51 @@ def test_callcode_with_high_value_and_gas_oog(
         gas_limit=30000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-        ),
+    # Source: raw
+    # 0x6001600155603760005360026000f3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2),
         balance=23,
         nonce=0,
-        address=Address("0x0896f13e800125c0ccec44f3c434335f0a97bc1b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 0xffffffffffffffffffffffff <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 100000000000000000000 0 64 0 2 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xFFFFFFFFFFFFFFFFFFFFFFFF,
-                    address=0x896F13E800125C0CCEC44F3C434335F0A97BC1B,
-                    value=0x56BC75E2D63100000,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xFFFFFFFFFFFFFFFFFFFFFFFF,
+                address=addr,
+                value=0x56BC75E2D63100000,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0b4e1c683c41f86dc747fbf0dd02cd4398b41373"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_contract_creation_make_call_that_ask_more_gas_then_transaction_provided.py b/tests/ported_static/stCallCreateCallCodeTest/test_contract_creation_make_call_that_ask_more_gas_then_transaction_provided.py
index 212ba740559..8571a26ae45 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_contract_creation_make_call_that_ask_more_gas_then_transaction_provided.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_contract_creation_make_call_that_ask_more_gas_then_transaction_provided.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_contract_creation_make_call_that_ask_more_gas_then_transaction_prov...
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json
+state_tests/stCallCreateCallCodeTest/contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json
 """
 
 import pytest
@@ -15,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -24,34 +28,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            96000,
-            {
-                Address("0x1000000000000000000000000000000000000001"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
-        (60000, {}),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_contract_creation_make_call_that_ask_more_gas_then_transaction_provided(  # noqa: E501
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_contract_creation_make_call_that_ask_more_gas_then_transaction..."""  # noqa: E501
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0x1000000000000000000000000000000000000001)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -65,44 +75,77 @@ def test_contract_creation_make_call_that_ask_more_gas_then_transaction_provided
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0x10C8E0)
+    # Source: lll
     # {(SSTORE 1 1)}
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x1) + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000001"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000001),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x10C8E0)
-    # Source: LLL
+    # Source: lll
     # {(CALL 50000 0x1000000000000000000000000000000000000001 0 0 64 0 64)}
-    pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xC350,
-                address=0x1000000000000000000000000000000000000001,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xC350,
+            address=0x1000000000000000000000000000000000000001,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": [0], "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=sender, nonce=0): Account(
+                    balance=0
+                ),
+                contract_1: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": [1], "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=sender, nonce=0): Account(
+                    balance=0
+                ),
+                contract_1: Account(storage={1: 0}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.CALL(
+            gas=0xC350,
+            address=contract_1,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        ),
+    ]
+    tx_gas = [96000, 60000]
+
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "6040600060406000600073100000000000000000000000000000000000000161c350f1"  # noqa: E501
-        ),
-        gas_limit=tx_gas_limit,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_fail_balance_too_low.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_fail_balance_too_low.py
index 4c91fee8bcc..a9036d4c58c 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_create_fail_balance_too_low.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_fail_balance_too_low.py
@@ -1,9 +1,8 @@
 """
-create fails because we try to send more wei to it that we have.
+Create fails because we try to send more wei to it that we have.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-createFailBalanceTooLowFiller.json
+state_tests/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json
 """
 
 import pytest
@@ -12,9 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -24,34 +29,39 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (23, {}),
-        (
-            24,
-            {
-                Address("0xd2571607e241ecf590ed94b12d87c94babe36db6"): Account(
-                    storage={2: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_fail_balance_too_low(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Create fails because we try to send more wei to it that we have."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -65,31 +75,62 @@ def test_create_fail_balance_too_low(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # {(MSTORE 0 0x6001600255 ) (SELFDESTRUCT (CREATE 1000000000000000024 27 5)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6001600255)
-            + Op.SELFDESTRUCT(
-                address=Op.CREATE(
-                    value=0xDE0B6B3A7640018, offset=0x1B, size=0x5
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6001600255)
+        + Op.SELFDESTRUCT(
+            address=Op.CREATE(value=0xDE0B6B3A7640018, offset=0x1B, size=0x5)
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x0000000000000000000000000000000000000000): Account(
+                    storage={}
+                ),
+                compute_create_address(
+                    address=contract_0, nonce=0
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(
+                    0x0000000000000000000000000000000000000000
+                ): Account.NONEXISTENT,
+                compute_create_address(address=contract_0, nonce=0): Account(
+                    storage={2: 1}
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [253021]
+    tx_value = [23, 24]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=253021,
-        value=tx_value,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_bad_jump_destination.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_bad_jump_destination.py
index cc5670ef5c7..4ad74976023 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_bad_jump_destination.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_bad_jump_destination.py
@@ -1,9 +1,8 @@
 """
-create fails because init code has bad jump dest (underflow).
+Create fails because init code has bad jump dest (underflow).
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-createInitFailBadJumpDestinationFiller.json
+state_tests/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,7 +34,7 @@ def test_create_init_fail_bad_jump_destination(
     pre: Alloc,
 ) -> None:
     """Create fails because init code has bad jump dest (underflow)."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,29 +48,30 @@ def test_create_init_fail_bad_jump_destination(
         gas_limit=1000000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # {(MSTORE8 0 0x56 ) (SELFDESTRUCT (CREATE 1 0 1)) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0x56)
-            + Op.SELFDESTRUCT(
-                address=Op.CREATE(value=0x1, offset=0x0, size=0x1)
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0x56)
+        + Op.SELFDESTRUCT(address=Op.CREATE(value=0x1, offset=0x0, size=0x1))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x866b704865d7d80842e1d7c2c1c8bf682a3a437c"),  # noqa: E501
+        address=Address(0x866B704865D7D80842E1D7C2C1C8BF682A3A437C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=2200000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x0000000000000000000000000000000000000000): Account(
+            balance=0xDE0B6B3A76586A0
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_bad_jump_destination2.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_bad_jump_destination2.py
index 0ad761449cd..d5ec37b9225 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_bad_jump_destination2.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_bad_jump_destination2.py
@@ -1,9 +1,8 @@
 """
-create fails because init code has bad jump dest.
+Create fails because init code has bad jump dest.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-createInitFailBadJumpDestination2Filler.json
+state_tests/stCallCreateCallCodeTest/createInitFailBadJumpDestination2Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/createInitFailBadJumpDestination2Filler.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/createInitFailBadJumpDestination2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,7 +34,7 @@ def test_create_init_fail_bad_jump_destination2(
     pre: Alloc,
 ) -> None:
     """Create fails because init code has bad jump dest."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,29 +48,30 @@ def test_create_init_fail_bad_jump_destination2(
         gas_limit=1000000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # {(MSTORE 0 0x61ffff56 ) (SELFDESTRUCT (CREATE 1 28 4)) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x61FFFF56)
-            + Op.SELFDESTRUCT(
-                address=Op.CREATE(value=0x1, offset=0x1C, size=0x4)
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x61FFFF56)
+        + Op.SELFDESTRUCT(address=Op.CREATE(value=0x1, offset=0x1C, size=0x4))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9cc12364004e761c5c594f6dce3787cff273029c"),  # noqa: E501
+        address=Address(0x9CC12364004E761C5C594F6DCE3787CFF273029C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=2200000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x0000000000000000000000000000000000000000): Account(
+            balance=0xDE0B6B3A76586A0
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_oo_gduring_init.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_oo_gduring_init.py
index 27f59c85bbc..464d32eb2c5 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_oo_gduring_init.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_oo_gduring_init.py
@@ -1,9 +1,8 @@
 """
-create fails because init code has OOG.
+Create fails because init code has OOG.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-createInitFail_OOGduringInitFiller.json
+state_tests/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,7 +34,8 @@ def test_create_init_fail_oo_gduring_init(
     pre: Alloc,
 ) -> None:
     """Create fails because init code has OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,29 +49,30 @@ def test_create_init_fail_oo_gduring_init(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # {(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0x5A)
-            + Op.SELFDESTRUCT(
-                address=Op.CREATE(value=0x1, offset=0x0, size=0x1)
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0x5A)
+        + Op.SELFDESTRUCT(address=Op.CREATE(value=0x1, offset=0x0, size=0x1))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=53021,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        Address(
+            0x0000000000000000000000000000000000000000
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_oo_gduring_init2.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_oo_gduring_init2.py
index f75008063d2..565c4fd1974 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_oo_gduring_init2.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_oo_gduring_init2.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_create_init_fail_oo_gduring_init2.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-createInitFail_OOGduringInit2Filler.json
+state_tests/stCallCreateCallCodeTest/createInitFail_OOGduringInit2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/createInitFail_OOGduringInit2Filler.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/createInitFail_OOGduringInit2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_create_init_fail_oo_gduring_init2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_init_fail_oo_gduring_init2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,34 +47,35 @@ def test_create_init_fail_oo_gduring_init2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (CREATE 1 0  (lll(seq [[1]] 1 (KECCAK256 0x00 0x2fffff) )0))   }
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0xD]
-            + Op.CODECOPY(dest_offset=0x0, offset=0xF, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x1]
-            + Op.CREATE
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0xD]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xF, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x1]
+        + Op.CREATE
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_stack_size_larger_than1024.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_stack_size_larger_than1024.py
index c98a2f4f3e3..4b568b6fd9e 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_stack_size_larger_than1024.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_stack_size_larger_than1024.py
@@ -1,9 +1,8 @@
 """
-create fails because init code has stack size >1024.
+Create fails because init code has stack size >1024.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-createInitFailStackSizeLargerThan1024Filler.json
+state_tests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,7 +34,7 @@ def test_create_init_fail_stack_size_larger_than1024(
     pre: Alloc,
 ) -> None:
     """Create fails because init code has stack size >1024."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,36 +48,37 @@ def test_create_init_fail_stack_size_larger_than1024(
         gas_limit=1000000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # {(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SELFDESTRUCT (CREATE 1 0 64)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x6103FF6000525B7F0102030405060708090A0102030405060708090A01020304,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x5060708090A0102600160005103600052600051600657000000000000000000,  # noqa: E501
-            )
-            + Op.SELFDESTRUCT(
-                address=Op.CREATE(value=0x1, offset=0x0, size=0x40)
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x6103FF6000525B7F0102030405060708090A0102030405060708090A01020304,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x5060708090A0102600160005103600052600051600657000000000000000000,  # noqa: E501
+        )
+        + Op.SELFDESTRUCT(address=Op.CREATE(value=0x1, offset=0x0, size=0x40))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0ee6db8c4a76cab3bb0584e06916cea75d307db0"),  # noqa: E501
+        address=Address(0x0EE6DB8C4A76CAB3BB0584E06916CEA75D307DB0),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=2200000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x0000000000000000000000000000000000000000): Account(
+            balance=0xDE0B6B3A76586A0
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_stack_underflow.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_stack_underflow.py
index c9495befc1f..b00eaa43c05 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_stack_underflow.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_stack_underflow.py
@@ -1,9 +1,8 @@
 """
-create fails because init code has stack underflow, trying to suicide to it.
+Create fails because init code has stack underflow, trying to suicide...
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-createInitFailStackUnderflowFiller.json
+state_tests/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,7 +34,7 @@ def test_create_init_fail_stack_underflow(
     pre: Alloc,
 ) -> None:
     """Create fails because init code has stack underflow, trying to..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,29 +48,30 @@ def test_create_init_fail_stack_underflow(
         gas_limit=1000000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # {(MSTORE8 0 0x01 ) (SELFDESTRUCT (CREATE 1 0 1)) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0x1)
-            + Op.SELFDESTRUCT(
-                address=Op.CREATE(value=0x1, offset=0x0, size=0x1)
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0x1)
+        + Op.SELFDESTRUCT(address=Op.CREATE(value=0x1, offset=0x0, size=0x1))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1ec952083e988eeb19fcab317760ffc6671246fd"),  # noqa: E501
+        address=Address(0x1EC952083E988EEB19FCAB317760FFC6671246FD),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=2200000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x0000000000000000000000000000000000000000): Account(
+            balance=0xDE0B6B3A76586A0
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_undefined_instruction.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_undefined_instruction.py
index 26d18d17038..bf25c3a23a2 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_undefined_instruction.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_undefined_instruction.py
@@ -1,17 +1,16 @@
 """
-create fails because init code has undefined opcode, trying to suicide to it.
+Create fails because init code has undefined opcode, trying to suicide...
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-createInitFailUndefinedInstructionFiller.json
+state_tests/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_create_init_fail_undefined_instruction(
     pre: Alloc,
 ) -> None:
     """Create fails because init code has undefined opcode, trying to..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,76 +45,67 @@ def test_create_init_fail_undefined_instruction(
         gas_limit=1000000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xF9)
-            + Op.SELFDESTRUCT(
-                address=Op.CREATE2(value=0x1, offset=0x0, size=0x1, salt=0x0),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {(MSTORE8 0 0xf9 ) (SELFDESTRUCT (CREATE 1 0 1)) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xF9)
+        + Op.SELFDESTRUCT(address=Op.CREATE(value=0x1, offset=0x0, size=0x1))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0183feb7335d767d4d6ae41bbdea7afb27227860"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xF9)
-            + Op.SELFDESTRUCT(
-                address=Op.CREATE(value=0x1, offset=0x0, size=0x1)
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {(MSTORE8 0 0xf9 ) (SELFDESTRUCT (CREATE2 1 0 1 0)) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xF9)
+        + Op.SELFDESTRUCT(
+            address=Op.CREATE2(value=0x1, offset=0x0, size=0x1, salt=0x0)
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x552f200b75457440ee6df9159d6b188e9d18c222"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[0]] (CALL 400000 <contract:0x1000000000000000000000000000000000000000> 0 0 0 0 0) [[1]] (CALL 400000 <contract:0x2000000000000000000000000000000000000000> 0 0 0 0 0) [[2]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0x552F200B75457440EE6DF9159D6B188E9D18C222,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0x183FEB7335D767D4D6AE41BBDEA7AFB27227860,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x73e58ff0ab0c422709d507efb9d4889740040144"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=900000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_undefined_instruction2.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_undefined_instruction2.py
index 8d49317efc8..d1c8ed82d72 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_undefined_instruction2.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_fail_undefined_instruction2.py
@@ -1,9 +1,8 @@
 """
-original test of createInitFailUndefinedInstruction, interesting expect...
+Original test of createInitFailUndefinedInstruction, interesting expect...
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-createInitFailUndefinedInstruction2Filler.json
+state_tests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction2Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction2Filler.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,7 +34,7 @@ def test_create_init_fail_undefined_instruction2(
     pre: Alloc,
 ) -> None:
     """Original test of createInitFailUndefinedInstruction, interesting..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,29 +48,30 @@ def test_create_init_fail_undefined_instruction2(
         gas_limit=1000000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # {(MSTORE8 0 0xf4 ) (SELFDESTRUCT (CREATE 1 0 1)) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xF4)
-            + Op.SELFDESTRUCT(
-                address=Op.CREATE(value=0x1, offset=0x0, size=0x1)
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xF4)
+        + Op.SELFDESTRUCT(address=Op.CREATE(value=0x1, offset=0x0, size=0x1))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xcb1256d163ab8cc6fefa7f8eee45ba8db7ea9946"),  # noqa: E501
+        address=Address(0xCB1256D163AB8CC6FEFA7F8EEE45BA8DB7EA9946),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=2200000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x0000000000000000000000000000000000000000): Account(
+            balance=0xDE0B6B3A76586A0
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_oo_gfor_create.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_oo_gfor_create.py
index d94fe9b8142..7207b0ccaa1 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_create_init_oo_gfor_create.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_init_oo_gfor_create.py
@@ -2,19 +2,23 @@
 Suicide to a dynamic created contract, oog on create.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-createInitOOGforCREATEFiller.json
+state_tests/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -23,31 +27,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (53020, {}),
-        (1000000, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_init_oo_gfor_create(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Suicide to a dynamic created contract, oog on create."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,29 +70,49 @@ def test_create_init_oo_gfor_create(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0x5A)
-            + Op.SELFDESTRUCT(
-                address=Op.CREATE(value=0x1, offset=0x0, size=0x1)
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0x5A)
+        + Op.SELFDESTRUCT(address=Op.CREATE(value=0x1, offset=0x0, size=0x1))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(balance=0, nonce=1),
+                compute_create_address(address=contract_0, nonce=0): Account(
+                    nonce=1
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [53020, 1000000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=100000,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_js_example_contract.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_js_example_contract.py
index 7e9bfe9424f..98e50dcbe48 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_create_js_example_contract.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_js_example_contract.py
@@ -2,16 +2,15 @@
 Deploy legacy contract normally.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-createJS_ExampleContractFiller.json
+state_tests/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_create_js_example_contract(
     pre: Alloc,
 ) -> None:
     """Deploy legacy contract normally."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x6600370D1F9991E2D92FFE661C84E7C8C6ECAFC094774F0F3DB0F8DD663590E9
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x9184E72A000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,435 +45,375 @@ def test_create_js_example_contract(
         gas_limit=1000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.EXP(0x2, 0xE0)
-            + Op.SWAP1
-            + Op.DIV
-            + Op.JUMPI(pc=Op.PUSH2[0x42], condition=Op.EQ(0x43D726D6, Op.DUP1))
-            + Op.JUMPI(pc=Op.PUSH2[0x50], condition=Op.EQ(0x91B7F5ED, Op.DUP1))
-            + Op.JUMPI(pc=Op.PUSH2[0x61], condition=Op.EQ(0xD686F9EE, Op.DUP1))
-            + Op.JUMPI(pc=Op.PUSH2[0x6F], condition=Op.EQ(0xF5BADE66, Op.DUP1))
-            + Op.JUMPI(pc=Op.PUSH2[0x80], condition=Op.EQ(0xFCFFF16F, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH2[0x4A]
-            + Op.JUMP(pc=0x1DE)
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x5B]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.JUMP(pc=Op.PUSH2[0xBF])
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x69]
-            + Op.JUMP(pc=0x304)
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x7A]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.JUMP(pc=Op.PUSH2[0x8E])
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x88]
-            + Op.JUMP(pc=Op.PUSH2[0xF0])
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xAF],
-                condition=Op.ISZERO(
-                    Op.EQ(
-                        Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.CALLER),
-                        Op.AND(
-                            Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)
-                        ),
-                    ),
-                ),
-            )
-            + Op.JUMP(pc=Op.PUSH2[0xB4])
-            + Op.JUMPDEST
-            + Op.JUMP(pc=Op.PUSH2[0xBC])
-            + Op.JUMPDEST
-            + Op.DUP1
-            + Op.PUSH1[0x1]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xE0],
-                condition=Op.ISZERO(
-                    Op.EQ(
-                        Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.CALLER),
-                        Op.AND(
-                            Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)
-                        ),
-                    ),
-                ),
-            )
-            + Op.JUMP(pc=Op.PUSH2[0xE5])
-            + Op.JUMPDEST
-            + Op.JUMP(pc=Op.PUSH2[0xED])
-            + Op.JUMPDEST
-            + Op.DUP1
-            + Op.PUSH1[0x2]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.EQ(
-                Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.CALLER),
-                Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)),
-            )
-            + Op.JUMPI(pc=0x125, condition=Op.DUP1)
-            + Op.POP
-            + Op.EQ(
-                Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.CALLER),
-                Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x3)),
-            )
-            + Op.JUMPDEST
-            + Op.PUSH2[0x12E]
-            + Op.JUMPI
-            + Op.JUMP(pc=0x161)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x4]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.LOG1(
-                offset=0x0,
-                size=0x0,
-                topic_1=0x59EBEB90BC63057B6515673C3ECF9438E5058BCA0F92585014ECED636878C9A5,  # noqa: E501
-            )
-            + Op.JUMP(pc=0x1DC)
-            + Op.JUMPDEST
-            + Op.EQ(0x1, Op.SLOAD(key=0x4))
-            + Op.JUMPI(pc=0x173, condition=Op.DUP1)
-            + Op.POP
-            + Op.LT(Op.CALLVALUE, Op.SLOAD(key=0x1))
-            + Op.JUMPDEST
-            + Op.PUSH2[0x1B8]
-            + Op.JUMPI
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x4]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.LOG1(
-                offset=0x0,
-                size=0x0,
-                topic_1=0x59EBEB90BC63057B6515673C3ECF9438E5058BCA0F92585014ECED636878C9A5,  # noqa: E501
-            )
-            + Op.TIMESTAMP
-            + Op.PUSH1[0x5]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.CALLER
-            + Op.PUSH1[0x3]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.JUMP(pc=0x1DB)
-            + Op.JUMPDEST
-            + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.CALLER)
-            + Op.PUSH1[0x0]
-            + Op.CALLVALUE
-            + Op.JUMPI(
-                pc=0x1D7,
-                condition=Op.CALL(
-                    gas=Op.DUP8,
-                    address=Op.DUP8,
-                    value=Op.DUP5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.JUMPI(pc=0x1EF, condition=Op.EQ(0x0, Op.SLOAD(key=0x4)))
-            + Op.JUMP(pc=0x1F4)
-            + Op.JUMPDEST
-            + Op.JUMP(pc=0x301)
-            + Op.JUMPDEST
-            + Op.EQ(
+    # Source: raw
+    # 0x60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.EXP(0x2, 0xE0)
+        + Op.SWAP1
+        + Op.DIV
+        + Op.JUMPI(pc=Op.PUSH2[0x42], condition=Op.EQ(0x43D726D6, Op.DUP1))
+        + Op.JUMPI(pc=Op.PUSH2[0x50], condition=Op.EQ(0x91B7F5ED, Op.DUP1))
+        + Op.JUMPI(pc=Op.PUSH2[0x61], condition=Op.EQ(0xD686F9EE, Op.DUP1))
+        + Op.JUMPI(pc=Op.PUSH2[0x6F], condition=Op.EQ(0xF5BADE66, Op.DUP1))
+        + Op.JUMPI(pc=Op.PUSH2[0x80], condition=Op.EQ(0xFCFFF16F, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH2[0x4A]
+        + Op.JUMP(pc=0x1DE)
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x5B]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.JUMP(pc=Op.PUSH2[0xBF])
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x69]
+        + Op.JUMP(pc=0x304)
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x7A]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.JUMP(pc=Op.PUSH2[0x8E])
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x88]
+        + Op.JUMP(pc=Op.PUSH2[0xF0])
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xAF],
+            condition=Op.ISZERO(
+                Op.EQ(
+                    Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.CALLER),
+                    Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)),
+                )
+            ),
+        )
+        + Op.JUMP(pc=Op.PUSH2[0xB4])
+        + Op.JUMPDEST
+        + Op.JUMP(pc=Op.PUSH2[0xBC])
+        + Op.JUMPDEST
+        + Op.DUP1
+        + Op.PUSH1[0x1]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xE0],
+            condition=Op.ISZERO(
+                Op.EQ(
+                    Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.CALLER),
+                    Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)),
+                )
+            ),
+        )
+        + Op.JUMP(pc=Op.PUSH2[0xE5])
+        + Op.JUMPDEST
+        + Op.JUMP(pc=Op.PUSH2[0xED])
+        + Op.JUMPDEST
+        + Op.DUP1
+        + Op.PUSH1[0x2]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.EQ(
+            Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.CALLER),
+            Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)),
+        )
+        + Op.JUMPI(pc=0x125, condition=Op.DUP1)
+        + Op.POP
+        + Op.EQ(
+            Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.CALLER),
+            Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x3)),
+        )
+        + Op.JUMPDEST
+        + Op.PUSH2[0x12E]
+        + Op.JUMPI
+        + Op.JUMP(pc=0x161)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x4]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.LOG1(
+            offset=0x0,
+            size=0x0,
+            topic_1=0x59EBEB90BC63057B6515673C3ECF9438E5058BCA0F92585014ECED636878C9A5,  # noqa: E501
+        )
+        + Op.JUMP(pc=0x1DC)
+        + Op.JUMPDEST
+        + Op.EQ(0x1, Op.SLOAD(key=0x4))
+        + Op.JUMPI(pc=0x173, condition=Op.DUP1)
+        + Op.POP
+        + Op.LT(Op.CALLVALUE, Op.SLOAD(key=0x1))
+        + Op.JUMPDEST
+        + Op.PUSH2[0x1B8]
+        + Op.JUMPI
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x4]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.LOG1(
+            offset=0x0,
+            size=0x0,
+            topic_1=0x59EBEB90BC63057B6515673C3ECF9438E5058BCA0F92585014ECED636878C9A5,  # noqa: E501
+        )
+        + Op.TIMESTAMP
+        + Op.PUSH1[0x5]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.CALLER
+        + Op.PUSH1[0x3]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.JUMP(pc=0x1DB)
+        + Op.JUMPDEST
+        + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.CALLER)
+        + Op.PUSH1[0x0]
+        + Op.CALLVALUE
+        + Op.JUMPI(
+            pc=0x1D7,
+            condition=Op.CALL(
+                gas=Op.DUP8,
+                address=Op.DUP8,
+                value=Op.DUP5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP * 3
+        + Op.JUMPDEST * 2
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.JUMPI(pc=0x1EF, condition=Op.EQ(0x0, Op.SLOAD(key=0x4)))
+        + Op.JUMP(pc=0x1F4)
+        + Op.JUMPDEST
+        + Op.JUMP(pc=0x301)
+        + Op.JUMPDEST
+        + Op.EQ(
+            Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.CALLER),
+            Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)),
+        )
+        + Op.JUMPI(pc=0x22C, condition=Op.ISZERO(Op.DUP1))
+        + Op.POP
+        + Op.EQ(
+            Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x3)),
+            Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)),
+        )
+        + Op.JUMPDEST
+        + Op.PUSH2[0x235]
+        + Op.JUMPI
+        + Op.JUMP(pc=0x242)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x4]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.JUMP(pc=0x301)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x262,
+            condition=Op.EQ(
                 Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.CALLER),
-                Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)),
-            )
-            + Op.JUMPI(pc=0x22C, condition=Op.ISZERO(Op.DUP1))
-            + Op.POP
-            + Op.EQ(
                 Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x3)),
-                Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)),
-            )
-            + Op.JUMPDEST
-            + Op.PUSH2[0x235]
-            + Op.JUMPI
-            + Op.JUMP(pc=0x242)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x4]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.JUMP(pc=0x301)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x262,
-                condition=Op.EQ(
+            ),
+        )
+        + Op.JUMP(pc=0x300)
+        + Op.JUMPDEST
+        + Op.MUL(Op.SLOAD(key=0x2), Op.SUB(Op.TIMESTAMP, Op.SLOAD(key=0x5)))
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(pc=0x2C7, condition=Op.GT(Op.DUP2, Op.SLOAD(key=0x1)))
+        + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x3))
+        + Op.PUSH1[0x0]
+        + Op.SUB(Op.SLOAD(key=0x1), Op.DUP3)
+        + Op.JUMPI(
+            pc=0x29B,
+            condition=Op.CALL(
+                gas=Op.DUP8,
+                address=Op.DUP8,
+                value=Op.DUP5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP * 3
+        + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0))
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.JUMPI(
+            pc=0x2BF,
+            condition=Op.CALL(
+                gas=Op.DUP8,
+                address=Op.DUP8,
+                value=Op.DUP5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP * 3
+        + Op.JUMP(pc=0x2EE)
+        + Op.JUMPDEST
+        + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0))
+        + Op.PUSH1[0x0]
+        + Op.SLOAD(key=0x1)
+        + Op.JUMPI(
+            pc=0x2EA,
+            condition=Op.CALL(
+                gas=Op.DUP8,
+                address=Op.DUP8,
+                value=Op.DUP5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP * 3
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x4]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.SLOAD(key=0x0)
+        + Op.PUSH1[0x3]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.JUMPDEST * 2
+        + Op.POP
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.JUMPI(
+            pc=0x327,
+            condition=Op.ISZERO(
+                Op.EQ(
                     Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.CALLER),
-                    Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x3)),
-                ),
-            )
-            + Op.JUMP(pc=0x300)
-            + Op.JUMPDEST
-            + Op.MUL(
-                Op.SLOAD(key=0x2), Op.SUB(Op.TIMESTAMP, Op.SLOAD(key=0x5))
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(pc=0x2C7, condition=Op.GT(Op.DUP2, Op.SLOAD(key=0x1)))
-            + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x3))
-            + Op.PUSH1[0x0]
-            + Op.SUB(Op.SLOAD(key=0x1), Op.DUP3)
-            + Op.JUMPI(
-                pc=0x29B,
-                condition=Op.CALL(
-                    gas=Op.DUP8,
-                    address=Op.DUP8,
-                    value=Op.DUP5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0))
-            + Op.PUSH1[0x0]
-            + Op.DUP3
-            + Op.JUMPI(
-                pc=0x2BF,
-                condition=Op.CALL(
-                    gas=Op.DUP8,
-                    address=Op.DUP8,
-                    value=Op.DUP5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMP(pc=0x2EE)
-            + Op.JUMPDEST
-            + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0))
-            + Op.PUSH1[0x0]
-            + Op.SLOAD(key=0x1)
-            + Op.JUMPI(
-                pc=0x2EA,
-                condition=Op.CALL(
-                    gas=Op.DUP8,
-                    address=Op.DUP8,
-                    value=Op.DUP5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x4]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.SLOAD(key=0x0)
-            + Op.PUSH1[0x3]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.JUMPI(
-                pc=0x327,
-                condition=Op.ISZERO(
-                    Op.EQ(
-                        Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.CALLER),
-                        Op.AND(
-                            Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)
-                        ),
-                    ),
-                ),
-            )
-            + Op.JUMP(pc=0x32C)
-            + Op.JUMPDEST
-            + Op.JUMP(pc=0x37E)
-            + Op.JUMPDEST
-            + Op.MUL(
-                Op.SLOAD(key=0x2), Op.SUB(Op.TIMESTAMP, Op.SLOAD(key=0x5))
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(pc=0x345, condition=Op.GT(Op.DUP2, Op.SLOAD(key=0x1)))
-            + Op.JUMP(pc=0x37D)
-            + Op.JUMPDEST
-            + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0))
-            + Op.PUSH1[0x0]
-            + Op.SLOAD(key=0x1)
-            + Op.JUMPI(
-                pc=0x368,
-                condition=Op.CALL(
-                    gas=Op.DUP8,
-                    address=Op.DUP8,
-                    value=Op.DUP5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x4]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.SLOAD(key=0x0)
-            + Op.PUSH1[0x3]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMP
-        ),
+                    Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)),
+                )
+            ),
+        )
+        + Op.JUMP(pc=0x32C)
+        + Op.JUMPDEST
+        + Op.JUMP(pc=0x37E)
+        + Op.JUMPDEST
+        + Op.MUL(Op.SLOAD(key=0x2), Op.SUB(Op.TIMESTAMP, Op.SLOAD(key=0x5)))
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(pc=0x345, condition=Op.GT(Op.DUP2, Op.SLOAD(key=0x1)))
+        + Op.JUMP(pc=0x37D)
+        + Op.JUMPDEST
+        + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0))
+        + Op.PUSH1[0x0]
+        + Op.SLOAD(key=0x1)
+        + Op.JUMPI(
+            pc=0x368,
+            condition=Op.CALL(
+                gas=Op.DUP8,
+                address=Op.DUP8,
+                value=Op.DUP5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP * 3
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x4]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.SLOAD(key=0x0)
+        + Op.PUSH1[0x3]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.JUMPDEST * 2
+        + Op.POP
+        + Op.JUMP,
         storage={
-            0x0: 0xBCC416D85E26124EA4EC199A92CF495584A99831,
-            0x1: 0x42,
-            0x2: 0x23,
-            0x3: 0xBCC416D85E26124EA4EC199A92CF495584A99831,
-            0x5: 0x54C98C81,
+            0: sender,
+            1: 66,
+            2: 35,
+            3: sender,
+            5: 0x54C98C81,
         },
         balance=0x186A0,
         nonce=0,
-        address=Address("0x1119d4ccf86b65812d85f2ff3e9b2d851e40ba5a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x9184E72A000)
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "60406103ca60043960045160245133600081905550600060048190555081600181905550"  # noqa: E501
-            "8060028190555042600581905550336003819055505050610381806100496000396000f3"  # noqa: E501
-            "0060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d6"  # noqa: E501
-            "86f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a61"  # noqa: E501
-            "01de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60"  # noqa: E501
-            "006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b"  # noqa: E501
-            "600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc"  # noqa: E501
-            "565b806001819055505b50565b600054600160a060020a031633600160a060020a031614"  # noqa: E501
-            "156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a"  # noqa: E501
-            "031633600160a060020a031614806101255750600354600160a060020a031633600160a0"  # noqa: E501
-            "60020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b651567"  # noqa: E501
-            "3c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b6004546001"  # noqa: E501
-            "1480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515"  # noqa: E501
-            "673c3ecf9438e5058bca0f92585014eced636878c9a560006000a1426005819055503360"  # noqa: E501
-            "03819055506101db565b33600160a060020a03166000346000600060006000848787f161"  # noqa: E501
-            "01d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b6000"  # noqa: E501
-            "54600160a060020a031633600160a060020a031614801561022c5750600054600160a060"  # noqa: E501
-            "020a0316600354600160a060020a0316145b61023557610242565b600060048190555061"  # noqa: E501
-            "0301565b600354600160a060020a031633600160a060020a03161461026257610300565b"  # noqa: E501
-            "600554420360025402905060015481116102c757600354600160a060020a031660008260"  # noqa: E501
-            "0154036000600060006000848787f161029b57005b505050600054600160a060020a0316"  # noqa: E501
-            "6000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a0"  # noqa: E501
-            "60020a031660006001546000600060006000848787f16102ea57005b5050505b60006004"  # noqa: E501
-            "819055506000546003819055505b5b50565b6000600054600160a060020a031633600160"  # noqa: E501
-            "a060020a031614156103275761032c565b61037e565b6005544203600254029050600154"  # noqa: E501
-            "81116103455761037d565b600054600160a060020a031660006001546000600060006000"  # noqa: E501
-            "848787f161036857005b50505060006004819055506000546003819055505b5b50560000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000042000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000023"
+        data=Bytes(
+            "60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b505600000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000023"  # noqa: E501
         ),
         gas_limit=600000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        addr: Account(
             storage={
-                0: 0xBCC416D85E26124EA4EC199A92CF495584A99831,
+                0: sender,
                 1: 66,
                 2: 35,
-                3: 0xBCC416D85E26124EA4EC199A92CF495584A99831,
+                3: sender,
                 5: 0x54C98C81,
             },
-        ),
-        Address("0x1ce6265a59bf9efb80a801e28d956a6974834375"): Account(
-            storage={
-                0: 0xBCC416D85E26124EA4EC199A92CF495584A99831,
-                1: 66,
-                2: 35,
-                3: 0xBCC416D85E26124EA4EC199A92CF495584A99831,
-                5: 1000,
-            },
+            code=bytes.fromhex(
+                "60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056"  # noqa: E501
+            ),
         ),
     }
 
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_js_no_collision.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_js_no_collision.py
index 04d94708764..98c0900c511 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_create_js_no_collision.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_js_no_collision.py
@@ -2,19 +2,19 @@
 Deploy legacy contract normally.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-createJS_NoCollisionFiller.json
+state_tests/stCallCreateCallCodeTest/createJS_NoCollisionFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,21 +22,16 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallCreateCallCodeTest/createJS_NoCollisionFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCallCreateCallCodeTest/createJS_NoCollisionFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_create_js_no_collision(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """Deploy legacy contract normally."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x9184E72A000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,55 +42,19 @@ def test_create_js_no_collision(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0x9184E72A000)
-
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "60406103ca60043960045160245133600081905550600060048190555081600181905550"  # noqa: E501
-            "8060028190555042600581905550336003819055505050610381806100496000396000f3"  # noqa: E501
-            "0060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d6"  # noqa: E501
-            "86f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a61"  # noqa: E501
-            "01de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60"  # noqa: E501
-            "006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b"  # noqa: E501
-            "600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc"  # noqa: E501
-            "565b806001819055505b50565b600054600160a060020a031633600160a060020a031614"  # noqa: E501
-            "156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a"  # noqa: E501
-            "031633600160a060020a031614806101255750600354600160a060020a031633600160a0"  # noqa: E501
-            "60020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b651567"  # noqa: E501
-            "3c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b6004546001"  # noqa: E501
-            "1480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515"  # noqa: E501
-            "673c3ecf9438e5058bca0f92585014eced636878c9a560006000a1426005819055503360"  # noqa: E501
-            "03819055506101db565b33600160a060020a03166000346000600060006000848787f161"  # noqa: E501
-            "01d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b6000"  # noqa: E501
-            "54600160a060020a031633600160a060020a031614801561022c5750600054600160a060"  # noqa: E501
-            "020a0316600354600160a060020a0316145b61023557610242565b600060048190555061"  # noqa: E501
-            "0301565b600354600160a060020a031633600160a060020a03161461026257610300565b"  # noqa: E501
-            "600554420360025402905060015481116102c757600354600160a060020a031660008260"  # noqa: E501
-            "0154036000600060006000848787f161029b57005b505050600054600160a060020a0316"  # noqa: E501
-            "6000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a0"  # noqa: E501
-            "60020a031660006001546000600060006000848787f16102ea57005b5050505b60006004"  # noqa: E501
-            "819055506000546003819055505b5b50565b6000600054600160a060020a031633600160"  # noqa: E501
-            "a060020a031614156103275761032c565b61037e565b6005544203600254029050600154"  # noqa: E501
-            "81116103455761037d565b600054600160a060020a031660006001546000600060006000"  # noqa: E501
-            "848787f161036857005b50505060006004819055506000546003819055505b5b50560000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000042000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000023"
+        data=Bytes(
+            "60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b505600000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000023"  # noqa: E501
         ),
         gas_limit=600000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                1: 66,
-                2: 35,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                5: 1000,
-            },
+        compute_create_address(address=sender, nonce=0): Account(
+            storage={0: sender, 1: 66, 2: 35, 3: sender, 5: 1000},
         ),
     }
 
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_name_registrator_per_txs.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_name_registrator_per_txs.py
index 841222d315f..5a456ae36ae 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_create_name_registrator_per_txs.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_name_registrator_per_txs.py
@@ -2,20 +2,20 @@
 Legacy Test from Christoph. J.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-createNameRegistratorPerTxsFiller.json
+state_tests/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
@@ -23,20 +23,17 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_create_name_registrator_per_txs(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Legacy Test from Christoph. J."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Legacy Test from Christoph."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,21 +44,34 @@ def test_create_name_registrator_per_txs(
         gas_limit=10000000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "6001600155601080600c6000396000f3006000355415600957005b60203560003555"  # noqa: E501
+        data=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP
+        + Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         gas_limit=1250528,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
+        compute_create_address(address=sender, nonce=0): Account(
             storage={1: 1},
+            code=bytes.fromhex("396000f3006000355415600957005b60"),
+            balance=0x186A0,
+            nonce=1,
         ),
     }
 
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_name_registrator_per_txs_not_enough_gas.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_name_registrator_per_txs_not_enough_gas.py
index 97651378624..a6159ad7409 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_create_name_registrator_per_txs_not_enough_gas.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_name_registrator_per_txs_not_enough_gas.py
@@ -2,20 +2,24 @@
 Legacy Test from Christoph. J.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-createNameRegistratorPerTxsNotEnoughGasFiller.json
+state_tests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
@@ -23,37 +27,38 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (56157, {}),
-        (
-            86157,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
-@pytest.mark.pre_alloc_mutable
 def test_create_name_registrator_per_txs_not_enough_gas(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Legacy Test from Christoph. J."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Legacy Test from Christoph."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -64,18 +69,58 @@ def test_create_name_registrator_per_txs_not_enough_gas(
         gas_limit=10000000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                compute_create_address(
+                    address=sender, nonce=0
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={1: 1}
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP
+        + Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
+        ),
+    ]
+    tx_gas = [56157, 86157]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "6001600155601080600c6000396000f3006000355415600957005b60203560003555"  # noqa: E501
-        ),
-        gas_limit=tx_gas_limit,
-        value=100000,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_name_registrator_pre_store1_not_enough_gas.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_name_registrator_pre_store1_not_enough_gas.py
index c6991baf0ff..cc76b3587f5 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_create_name_registrator_pre_store1_not_enough_gas.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_name_registrator_pre_store1_not_enough_gas.py
@@ -2,19 +2,19 @@
 Legacy Test from Christoph. J.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-createNameRegistratorPreStore1NotEnoughGasFiller.json
+state_tests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGasFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGasFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_create_name_registrator_pre_store1_not_enough_gas(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Legacy Test from Christoph. J."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Legacy Test from Christoph."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,32 +47,34 @@ def test_create_name_registrator_pre_store1_not_enough_gas(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 0 0x6001600155601080600c6000396000f3006000355415600957005b6020356000 )  (MSTORE8 32 0x35) (MSTORE8 33 0x55) (CREATE 23 0 34) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x6001600155601080600C6000396000F3006000355415600957005B6020356000,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0x20, value=0x35)
-            + Op.MSTORE8(offset=0x21, value=0x55)
-            + Op.CREATE(value=0x17, offset=0x0, size=0x22)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x6001600155601080600C6000396000F3006000355415600957005B6020356000,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0x20, value=0x35)
+        + Op.MSTORE8(offset=0x21, value=0x55)
+        + Op.CREATE(value=0x17, offset=0x0, size=0x22)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=73071,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        contract_0: Account(nonce=1),
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallCreateCallCodeTest/test_create_name_registratorendowment_too_high.py b/tests/ported_static/stCallCreateCallCodeTest/test_create_name_registratorendowment_too_high.py
index 0f1b76e0a0f..208b26f09cb 100644
--- a/tests/ported_static/stCallCreateCallCodeTest/test_create_name_registratorendowment_too_high.py
+++ b/tests/ported_static/stCallCreateCallCodeTest/test_create_name_registratorendowment_too_high.py
@@ -2,16 +2,15 @@
 Legacy Test from Christoph. J.
 
 Ported from:
-tests/static/state_tests/stCallCreateCallCodeTest
-createNameRegistratorendowmentTooHighFiller.json
+state_tests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHighFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHighFiller.json",  # noqa: E501
+        "state_tests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHighFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_create_name_registratorendowment_too_high(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Legacy Test from Christoph. J."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Legacy Test from Christoph."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,34 +45,29 @@ def test_create_name_registratorendowment_too_high(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 1000000000000000001 3 29) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x601080600C6000396000F3006000355415600957005B60203560003555,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(
-                    value=0xDE0B6B3A7640001, offset=0x3, size=0x1D
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x601080600C6000396000F3006000355415600957005B60203560003555,
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE(value=0xDE0B6B3A7640001, offset=0x3, size=0x1D),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x84d56fc4fefc05a5bce6c569883a47ee499ee0da"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/__init__.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/__init__.py
index ed8549235d7..10d1ff02a1b 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/__init__.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/__init__.py
@@ -1 +1 @@
-"""Tests ported from stCallDelegateCodesCallCodeHomestead."""
+"""Ported static tests: stCallDelegateCodesCallCodeHomestead."""  # noqa: N999
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001.py
index 27d9748349c..34843e7be67 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcallcode_001.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcallcode_001Filler.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcallcode_001(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcallcode_001."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,106 +45,103 @@ def test_callcallcallcode_001(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x493E0,
-                    address=0x6F50426AA1BBB3CBD865847823F377D918757C07,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 5 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x5, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x4c0de71b93de6b7055a3686e4bf93add02b39ed8"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x3D090,
-                    address=0xC534813374D4D5C43DD9A367926A3DBEECD02964,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x3D090,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6f50426aa1bbb3cbd865847823f377d918757c07"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x5, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 300000 <contract:0x1000000000000000000000000000000000000002> 2 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x493E0,
+                address=addr_2,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc534813374d4d5c43dd9a367926a3dbeecd02964"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x55730,
-                    address=0x4C0DE71B93DE6B7055A3686E4BF93ADD02B39ED8,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdb43306b16c521b9cc3667fbe7d1b697bb1f9605"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 1,
                 1: 1,
                 2: 1,
                 3: 1,
-                4: 0xDB43306B16C521B9CC3667FBE7D1B697BB1F9605,
+                4: target,
                 5: 2,
-                330: 0xDB43306B16C521B9CC3667FBE7D1B697BB1F9605,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: target,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
+        addr: Account(storage={1: 0, 3: 0, 4: 0, 5: 0}),
+        addr_2: Account(storage={2: 0, 3: 0, 4: 0, 5: 0}),
+        addr_3: Account(storage={2: 0, 3: 0, 4: 0, 5: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_ooge.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_ooge.py
index 18841f11a98..9c823864d91 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_ooge.py
@@ -2,16 +2,15 @@
 CALLCODE -> CALLCODE -> DELEGATE -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcallcode_001_OOGEFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcallcode_001_ooge(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALLCODE -> DELEGATE -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,85 +45,83 @@ def test_callcallcallcode_001_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3e423a7b1fba04d0c3f9423a3ae2a180d2878d5b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0x3E423A7B1FBA04D0C3F9423A3AE2A180D2878D5B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x913cf7a18f61bab7bccf5607dfa9b730c5976000"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0x913CF7A18F61BAB7BCCF5607DFA9B730C5976000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9e57433afaff8a546fbc43cf0330afb6561dc550"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 11: 1}),
+        target: Account(storage={0: 1, 1: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={2: 0}),
+        addr_3: Account(storage={3: 0}),
+        sender: Account(storage={1: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_oogm_after.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_oogm_after.py
index 7853fbc9f20..1d4bbe04a14 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_oogm_after.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_oogm_after.py
@@ -2,16 +2,15 @@
 CALLCODE -> (CALLCODE -> DELEGATE -> CODE) OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcallcode_001_OOGMAfterFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcallcode_001_oogm_after(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> (CALLCODE -> DELEGATE -> CODE) OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,82 +45,82 @@ def test_callcallcallcode_001_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0x7B1ED5FA290739659102E7C47B650EFD2EBA625B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x37e72dd6ff3c2ac8c1ddab092a26164a2ad5988c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x7b1ed5fa290739659102e7c47b650efd2eba625b"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0x37E72DD6FF3C2AC8C1DDAB092A26164A2AD5988C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x7dabf2bb39aaf74720cfa113ae52f673bf477e2b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1  }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_oogm_before.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_oogm_before.py
index cef9fbab2ae..3ddc82e6af5 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_oogm_before.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_oogm_before.py
@@ -2,16 +2,15 @@
 CALLCODE -> CALLCODE -> OOG DELEGATE -> CODE.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcallcode_001_OOGMBeforeFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcallcode_001_oogm_before(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> CALLCODE -> OOG DELEGATE -> CODE."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,82 +45,82 @@ def test_callcallcallcode_001_oogm_before(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0xEFE4727369C5F495AEBF4EA778CC48D1155BF978,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x8e6e134402f2eeca8e910e8ec62b45b36ee31f30"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0x8E6E134402F2EECA8E910E8EC62B45B36EE31F30,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # { (KECCAK256 0x00 0x2fffff) [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9e57433afaff8a546fbc43cf0330afb6561dc550"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xefe4727369c5f495aebf4ea778cc48d1155bf978"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_end.py
index 14d5f85dd95..98081b8eff6 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcallcode_001_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcallcode_001_SuicideEndFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcallcode_001_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcallcode_001_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,86 +45,95 @@ def test_callcallcallcode_001_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa74ca10b765dcda3b60687f73f2881e2a56eda64"),  # noqa: E501
+        address=Address(0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xac521409e2fa9526bfe6b827805783d2e307c4ce"),  # noqa: E501
+        address=Address(0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xeaf8c2ae0d01a880cea4e1aa88def5edd153d57b"),  # noqa: E501
+        address=Address(0xAC521409E2FA9526BFE6B827805783D2E307C4CE),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 2: 1, 3: 1}),
+        target: Account(
+            storage={0: 1, 1: 1, 2: 1, 3: 1},
+            code=bytes.fromhex(
+                "6040600060406000600073eaf8c2ae0d01a880cea4e1aa88def5edd153d57b620249f0f260005500"  # noqa: E501
+            ),
+            balance=0,
+            nonce=0,
+        ),
+        addr: Account(storage={1: 0, 3: 0}),
+        addr_2: Account(storage={0: 0, 2: 0}),
+        addr_3: Account(storage={3: 0}),
+        sender: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_middle.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_middle.py
index 99602a6fcd5..21882d10003 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_middle.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_001_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcallcode_001_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcallcode_001_SuicideMiddleFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcallcode_001_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcallcode_001_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,84 +45,94 @@ def test_callcallcallcode_001_suicide_middle(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x124b38fa011c9d36b7fe193dc636813a2f8bdaa7"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa74ca10b765dcda3b60687f73f2881e2a56eda64"),  # noqa: E501
+        address=Address(0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0x124B38FA011C9D36B7FE193DC636813A2F8BDAA7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0x124B38FA011C9D36B7FE193DC636813A2F8BDAA7,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xeaf8c2ae0d01a880cea4e1aa88def5edd153d57b"),  # noqa: E501
+        address=Address(0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B),  # noqa: E501
+    )
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x124B38FA011C9D36B7FE193DC636813A2F8BDAA7),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(
+            storage={0: 1, 1: 1},
+            balance=0xDE0B6B3A7640000,
+            nonce=0,
+        ),
+        addr: Account(storage={1: 0, 2: 0}, balance=0x2540BE400),
+        addr_2: Account(storage={0: 0, 2: 0}, balance=0x2540BE400),
+        addr_3: Account(storage={2: 0, 3: 0}, balance=0x2540BE400),
+        sender: Account(storage={2: 0, 3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_abcb_recursive.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_abcb_recursive.py
index 14987ddf33f..df4566923a7 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_abcb_recursive.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcallcode_abcb_recursive.py
@@ -2,16 +2,15 @@
 CALLCODE -> CALLCODE1 -> DELEGATECALL2 -> CALLCODE1 -> ...
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcallcode_ABCB_RECURSIVEFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcallcode_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """CALLCODE -> CALLCODE1 -> DELEGATECALL2 -> CALLCODE1 -> ..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """CALLCODE -> CALLCODE1 -> DELEGATECALL2 -> CALLCODE1 -> ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,77 +45,77 @@ def test_callcallcallcode_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 25000000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x17D7840,
-                    address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x17D7840,
+                address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6d477a21d3906d4c0cd1edbfa7d272e6e21f1ca1"),  # noqa: E501
+        address=Address(0x6D477A21D3906D4C0CD1EDBFA7D272E6E21F1CA1),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x7A120,
-                    address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 1000000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xF4240,
+                address=0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa72f0e2f2fc5fd0878af9b8e4aaed09983670929"),  # noqa: E501
+        address=Address(0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xF4240,
-                    address=0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x7A120,
+                address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xe2ab9779f4fb1d9d39211cc2082083add172e69c"),  # noqa: E501
+        address=Address(0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01.py
index 9d878ffbcb5..62281359646 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcode_01.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcode_01Filler.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcode_01Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcode_01Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcode_01Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcode_01(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcode_01."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,85 +45,82 @@ def test_callcallcode_01(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x3D090,
-                    address=0xD42CD48F1D9A88F4B75BFB5E46E754C1128BD7FB,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 2 1) (SSTORE 4 (CALLER)) (SSTORE 5 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x5, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
+        + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
+        + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
+        + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1ccccf19d84280c8a0e94209761296dabd87b3c9"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x5, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
-            + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
-            + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
-            + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 250000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x3D090,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd42cd48f1d9a88f4b75bfb5e46e754c1128bd7fb"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x55730,
-                    address=0x1CCCCF19D84280C8A0E94209761296DABD87B3C9,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdb43306b16c521b9cc3667fbe7d1b697bb1f9605"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 1,
                 1: 1,
                 2: 1,
-                4: 0xDB43306B16C521B9CC3667FBE7D1B697BB1F9605,
+                4: target,
                 5: 1,
-                230: 0xDB43306B16C521B9CC3667FBE7D1B697BB1F9605,
-                232: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                230: target,
+                232: sender,
                 236: 64,
                 238: 34,
                 240: 10,
             },
         ),
+        addr: Account(storage={1: 0, 2: 0, 4: 0}),
+        addr_2: Account(storage={4: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01_ooge.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01_ooge.py
index a7252f5ddca..cd659ce1b7c 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01_ooge.py
@@ -2,16 +2,15 @@
 CALLCODE -> DELEGATE -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcode_01_OOGEFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcode_01_ooge(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> DELEGATE -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,66 +45,63 @@ def test_callcallcode_01_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x766B2CF0691F51029181FC511395B7AB71353A88,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 2 1) (KECCAK256 0x00 0x2fffff) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x29f893b720e998ccd5971409fa9a8802822fdcbc"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x766b2cf0691f51029181fc511395b7ab71353a88"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0x29F893B720E998CCD5971409FA9A8802822FDCBC,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9e57433afaff8a546fbc43cf0330afb6561dc550"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01_suicide_end.py
index 0ff822b9171..8e30857302f 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcode_01_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcode_01_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcode_01_SuicideEndFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcode_01_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcode_01_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,66 +45,71 @@ def test_callcallcode_01_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x1cca6e93108ec94304ae5eb121d323e6c317fe7a"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 2 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x703b936fd4d674f0ff5d6957f61097152f8781b8"),  # noqa: E501
+        address=Address(0x703B936FD4D674F0FF5D6957F61097152F8781B8),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x1CCA6E93108EC94304AE5EB121D323E6C317FE7A,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0x1CCA6E93108EC94304AE5EB121D323E6C317FE7A,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa74ca10b765dcda3b60687f73f2881e2a56eda64"),  # noqa: E501
+        address=Address(0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64)
+        + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x1CCA6E93108EC94304AE5EB121D323E6C317FE7A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 2: 1}),
+        target: Account(
+            storage={0: 1, 1: 1, 2: 1},
+            balance=0xDE0B6B3A7640000,
+            nonce=0,
+        ),
+        addr: Account(storage={0: 0, 1: 0, 2: 0}),
+        addr_2: Account(storage={2: 0, 3: 0}),
+        sender: Account(storage={1: 0, 2: 0, 3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010.py
index b8f38ab1001..1b71c97c2cc 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcodecall_010.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcodecall_010Filler.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcodecall_010(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcodecall_010."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,108 +45,105 @@ def test_callcallcodecall_010(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x3D090,
-                    address=0xB8601B04BFD9EB63BC6FF0263567113D4CB874E4,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x5, value=Op.CALLER)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 6 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE))}  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x6, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8738ab5302009e8bad163c8a9e91e72926b09d34"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x6, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 250000 <contract:0x1000000000000000000000000000000000000003> 2 0 64 0 64 ) (SSTORE 5 (CALLER))}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x3D090,
+                address=addr_3,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x5, value=Op.CALLER)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb8601b04bfd9eb63bc6ff0263567113d4cb874e4"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x55730,
-                    address=0xFED08E44AE95ECE264BC94A1FC45AF8BC4EF4F1D,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x493E0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdb43306b16c521b9cc3667fbe7d1b697bb1f9605"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x493E0,
-                    address=0x8738AB5302009E8BAD163C8A9E91E72926B09D34,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfed08e44ae95ece264bc94a1fc45af8bc4ef4f1d"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 1,
                 1: 1,
                 2: 1,
                 3: 1,
-                4: 0xDB43306B16C521B9CC3667FBE7D1B697BB1F9605,
-                5: 0xDB43306B16C521B9CC3667FBE7D1B697BB1F9605,
+                4: target,
+                5: target,
                 6: 2,
-                330: 0xDB43306B16C521B9CC3667FBE7D1B697BB1F9605,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: target,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
+        addr: Account(storage={1: 0, 2: 0, 5: 0}),
+        addr_2: Account(storage={2: 0}),
+        addr_3: Account(storage={3: 0, 4: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_ooge.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_ooge.py
index ccb1064ece8..e0ad0d14f1b 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_ooge.py
@@ -2,16 +2,15 @@
 CALLCODE -> DELEGATE -> CALLCODE -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcodecall_010_OOGEFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcodecall_010_ooge(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> DELEGATE -> CALLCODE -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,85 +45,83 @@ def test_callcallcodecall_010_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6322dc554acdcada01cbf7ac6a163d207c34ded2"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x6322DC554ACDCADA01CBF7AC6A163D207C34DED2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x69a0017a51ad556682f48b32235d0b61abdf4da4"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0x69A0017A51AD556682F48B32235D0B61ABDF4DA4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9e57433afaff8a546fbc43cf0330afb6561dc550"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 11: 1}),
+        target: Account(storage={0: 1, 1: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={2: 0}),
+        addr_3: Account(storage={3: 0}),
+        sender: Account(storage={1: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_oogm_after.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_oogm_after.py
index 219cae1c405..a3e4b5fa7d8 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_oogm_after.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_oogm_after.py
@@ -2,16 +2,15 @@
 CALLCODE -> (DELEGATE -> CALLCODE -> CODE) OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcodecall_010_OOGMAfterFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcodecall_010_oogm_after(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> (DELEGATE -> CALLCODE -> CODE) OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,82 +45,82 @@ def test_callcallcodecall_010_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x926DFBCC20B2AB686FC85331883541D174CCC738,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x1adae71ad3aeec97978e38be04da2a1773dfc506"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0x1ADAE71AD3AEEC97978E38BE04DA2A1773DFC506,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x400347dada8c51a2aac4b4c31ae726ba8551e2b9"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x926dfbcc20b2ab686fc85331883541d174ccc738"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_oogm_before.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_oogm_before.py
index 961813bda84..518da115c97 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_oogm_before.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_oogm_before.py
@@ -2,16 +2,15 @@
 CALLCODE -> DELEGATE -> OOG CALLCODE -> CODE.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcodecall_010_OOGMBeforeFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcodecall_010_oogm_before(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> DELEGATE -> OOG CALLCODE -> CODE."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,82 +45,82 @@ def test_callcallcodecall_010_oogm_before(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x0d33ab78ac3965e7d6f9548dff5839138a9f69c5"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0xD33AB78AC3965E7D6F9548DFF5839138A9F69C5,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (KECCAK256 0x00 0x2fffff) [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x29f893b720e998ccd5971409fa9a8802822fdcbc"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0x29F893B720E998CCD5971409FA9A8802822FDCBC,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9e57433afaff8a546fbc43cf0330afb6561dc550"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_end.py
index e43289ff57b..02e73911b14 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcodecall_010_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcodecall_010_SuicideEndFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcodecall_010_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcodecall_010_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,86 +45,87 @@ def test_callcallcodecall_010_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2cac1d43f00e8b40b63426ab460c7e8717ee6455"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
-        balance=0x2540BE400,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x94c8f980aeecbb6575b12ae614a249fc3e836f21"),  # noqa: E501
+        address=Address(0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455)
+        + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa74ca10b765dcda3b60687f73f2881e2a56eda64"),  # noqa: E501
+        address=Address(0x94C8F980AEECBB6575B12AE614A249FC3E836F21),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 2: 1, 3: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 1, 3: 1}),
+        addr: Account(storage={0: 0, 1: 0, 3: 0}),
+        addr_3: Account(storage={3: 0}),
+        sender: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_middle.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_middle.py
index 450193b5da3..c381640d752 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_middle.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_010_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcodecall_010_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcodecall_010_SuicideMiddleFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcodecall_010_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcodecall_010_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,84 +45,89 @@ def test_callcallcodecall_010_suicide_middle(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x23a077e1e6b0740d6bfbc41de582f2930abd1762"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0x23A077E1E6B0740D6BFBC41DE582F2930ABD1762,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2cac1d43f00e8b40b63426ab460c7e8717ee6455"),  # noqa: E501
+        address=Address(0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0x23A077E1E6B0740D6BFBC41DE582F2930ABD1762,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa74ca10b765dcda3b60687f73f2881e2a56eda64"),  # noqa: E501
+        address=Address(0x23A077E1E6B0740D6BFBC41DE582F2930ABD1762),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={0: 0, 1: 0}, balance=0x2540BE400),
+        addr_3: Account(storage={2: 0, 3: 0}, balance=0x2540BE400),
+        sender: Account(storage={2: 0, 3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_abcb_recursive.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_abcb_recursive.py
index 73be7cdbeb4..cb858cf97a2 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_abcb_recursive.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecall_abcb_recursive.py
@@ -2,16 +2,15 @@
 CALLCODE -> DELEGATECALL -> CALLCODE2 -> DELEGATECALL -> CALLCODE2 -> ...
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcodecall_ABCB_RECURSIVEFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcodecall_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """CALLCODE -> DELEGATECALL -> CALLCODE2 -> DELEGATECALL ->..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """CALLCODE -> DELEGATECALL -> CALLCODE2 -> DELEGATECALL -> CALLCODE2..."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,77 +45,77 @@ def test_callcallcodecall_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 25000000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x17D7840,
-                    address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x17D7840,
+                address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6d477a21d3906d4c0cd1edbfa7d272e6e21f1ca1"),  # noqa: E501
+        address=Address(0x6D477A21D3906D4C0CD1EDBFA7D272E6E21F1CA1),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xF4240,
+                address=0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa71333d8c0291cfd6da54bec5a3957563ab16c1c"),  # noqa: E501
+        address=Address(0xE0B280638526CECD3EC29969B517AEB3FCBB31FA),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xF4240,
-                    address=0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 500000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xe0b280638526cecd3ec29969b517aeb3fcbb31fa"),  # noqa: E501
+        address=Address(0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011.py
index 18db4433cd2..48ad74e3fd5 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcodecallcode_011.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcodecallcode_011Filler.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcodecallcode_011(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcodecallcode_011."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,103 +45,98 @@ def test_callcallcodecallcode_011(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x30D40,
-                    address=0xB8601B04BFD9EB63BC6FF0263567113D4CB874E4,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 6 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE))}  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x6, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x563b277206f3bab1099c59abb457c3d14e2def7b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x493E0,
-                    address=0x563B277206F3BAB1099C59ABB457C3D14E2DEF7B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 200000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x30D40,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x66f7a765dc70598f71b119f636a53aaa43c4cca1"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x6, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x493E0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb8601b04bfd9eb63bc6ff0263567113d4cb874e4"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x55730,
-                    address=0x66F7A765DC70598F71B119F636A53AAA43C4CCA1,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdb43306b16c521b9cc3667fbe7d1b697bb1f9605"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 1,
                 1: 1,
                 2: 1,
                 3: 1,
-                4: 0xDB43306B16C521B9CC3667FBE7D1B697BB1F9605,
+                4: target,
                 6: 1,
-                330: 0xDB43306B16C521B9CC3667FBE7D1B697BB1F9605,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: target,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
+        addr: Account(storage={1: 0, 2: 0, 3: 0, 4: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_ooge.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_ooge.py
index ba48008aada..b682d1c1536 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_ooge.py
@@ -2,16 +2,15 @@
 CALLCODE -> DELEGATE -> DELEGATE -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcodecallcode_011_OOGEFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcodecallcode_011_ooge(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> DELEGATE -> DELEGATE -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,84 +45,82 @@ def test_callcallcodecallcode_011_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3e423a7b1fba04d0c3f9423a3ae2a180d2878d5b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x3E423A7B1FBA04D0C3F9423A3AE2A180D2878D5B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x69a0017a51ad556682f48b32235d0b61abdf4da4"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0x69A0017A51AD556682F48B32235D0B61ABDF4DA4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9e57433afaff8a546fbc43cf0330afb6561dc550"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 11: 1}),
+        target: Account(storage={0: 1, 1: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_oogm_after.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_oogm_after.py
index 55ab0fba30e..65bd6cdcd38 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_oogm_after.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_oogm_after.py
@@ -2,16 +2,15 @@
 CALLCODE -> (DELEGATE -> DELEGATE -> CODE) OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcodecallcode_011_OOGMAfterFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcodecallcode_011_oogm_after(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> (DELEGATE -> DELEGATE -> CODE) OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,81 +45,81 @@ def test_callcallcodecallcode_011_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0xDA11FDF0CE02240C6B4711F56AFCD9763B44D3DC,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x1adae71ad3aeec97978e38be04da2a1773dfc506"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC3500,
-                    address=0x1ADAE71AD3AEEC97978E38BE04DA2A1773DFC506,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x400347dada8c51a2aac4b4c31ae726ba8551e2b9"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xda11fdf0ce02240c6b4711f56afcd9763b44d3dc"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_oogm_before.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_oogm_before.py
index 66ea6478a80..f720fd6f4c2 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_oogm_before.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_oogm_before.py
@@ -2,16 +2,15 @@
 CALLCODE -> DELEGATE -> OOG DELEGATE -> CODE.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcodecallcode_011_OOGMBeforeFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcodecallcode_011_oogm_before(
     pre: Alloc,
 ) -> None:
     """CALLCODE -> DELEGATE -> OOG DELEGATE -> CODE."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,81 +45,81 @@ def test_callcallcodecallcode_011_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0xB5104F0F7758CE0CAAC73F593C6D63EB9A5EF905,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0xa74ca10b765dcda3b60687f73f2881e2a56eda64"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (KECCAK256 0x00 0x2fffff) [[ 2 ]] (DELEGATECALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x4E34,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x9C90,
-                    address=0xC176D297FF74C0F684B73D6CC8617E7F5FFE34FE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 40080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x9C90,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb5104f0f7758ce0caac73f593c6d63eb9a5ef905"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x4E34,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc176d297ff74c0f684b73d6cc8617e7f5ffe34fe"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=172000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_end.py
index bb23be0db19..8ff0ce634da 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcodecallcode_011_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcodecallcode_011_SuicideEndFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcodecallcode_011_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcodecallcode_011_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,85 +45,87 @@ def test_callcallcodecallcode_011_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x2cac1d43f00e8b40b63426ab460c7e8717ee6455"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa74ca10b765dcda3b60687f73f2881e2a56eda64"),  # noqa: E501
+        address=Address(0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xac521409e2fa9526bfe6b827805783d2e307c4ce"),  # noqa: E501
+        address=Address(0xAC521409E2FA9526BFE6B827805783D2E307C4CE),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 2: 1, 3: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 1, 3: 1}),
+        addr: Account(storage={0: 0, 1: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
+        addr_3: Account(storage={3: 0}),
+        sender: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_middle.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_middle.py
index 56b6c36c817..749ef20c287 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_middle.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_011_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcodecallcode_011_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcodecallcode_011_SuicideMiddleFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcodecallcode_011_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcodecallcode_011_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,83 +45,87 @@ def test_callcallcodecallcode_011_suicide_middle(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0x6A45EC7F08C71B222CFC454A9608BC278E87F0AB,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2cac1d43f00e8b40b63426ab460c7e8717ee6455"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6a45ec7f08c71b222cfc454a9608bc278e87f0ab"),  # noqa: E501
+        address=Address(0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0x6A45EC7F08C71B222CFC454A9608BC278E87F0AB,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xA74CA10B765DCDA3B60687F73F2881E2A56EDA64
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa74ca10b765dcda3b60687f73f2881e2a56eda64"),  # noqa: E501
+        address=Address(0x6A45EC7F08C71B222CFC454A9608BC278E87F0AB),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr_2: Account(storage={1: 0, 2: 0}, balance=0x2540BE400),
+        addr_3: Account(storage={3: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_abcb_recursive.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_abcb_recursive.py
index 4b697e7bfe2..c4c99123100 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_abcb_recursive.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcallcodecallcode_abcb_recursive.py
@@ -2,16 +2,15 @@
 CALLCODE -> DELEGATECALL1 -> DELEGATECALL2 -> DELEGATECALL1 -> ...
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcallcodecallcode_ABCB_RECURSIVEFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcodecallcode_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """CALLCODE -> DELEGATECALL1 -> DELEGATECALL2 -> DELEGATECALL1 -> ..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """CALLCODE -> DELEGATECALL1 -> DELEGATECALL2 -> DELEGATECALL1 -> ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,76 +45,76 @@ def test_callcallcodecallcode_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 25000000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x17D7840,
-                    address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x17D7840,
+                address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6d477a21d3906d4c0cd1edbfa7d272e6e21f1ca1"),  # noqa: E501
+        address=Address(0x6D477A21D3906D4C0CD1EDBFA7D272E6E21F1CA1),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x7A120,
-                    address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xF4240,
+                address=0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa72f0e2f2fc5fd0878af9b8e4aaed09983670929"),  # noqa: E501
+        address=Address(0xE0B280638526CECD3EC29969B517AEB3FCBB31FA),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xF4240,
-                    address=0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x7A120,
+                address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xe0b280638526cecd3ec29969b517aeb3fcbb31fa"),  # noqa: E501
+        address=Address(0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10.py
index b07f2d3baa1..89451d38412 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecall_10.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecall_10Filler.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecall_10Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecall_10Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecall_10Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecall_10(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecall_10."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,85 +45,81 @@ def test_callcodecall_10(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x3D090,
-                    address=0xD42CD48F1D9A88F4B75BFB5E46E754C1128BD7FB,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 2 1) (SSTORE 4 (CALLER)) (SSTORE 5 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x5, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
+        + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
+        + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
+        + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x69142b38329c92930601fe8da12dc5866cde11c3"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x55730,
-                    address=0x69142B38329C92930601FE8DA12DC5866CDE11C3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 250000 <contract:0x1000000000000000000000000000000000000002> 2 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x3D090,
+                address=addr_2,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd26e26d5a4796d450bfa296d70c05f02dbc1a4b9"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x5, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
-            + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
-            + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
-            + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd42cd48f1d9a88f4b75bfb5e46e754c1128bd7fb"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 1,
                 1: 1,
                 2: 1,
-                4: 0xD26E26D5A4796D450BFA296D70C05F02DBC1A4B9,
+                4: target,
                 5: 2,
-                230: 0xD26E26D5A4796D450BFA296D70C05F02DBC1A4B9,
-                232: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                230: target,
+                232: sender,
                 236: 64,
                 238: 34,
                 240: 10,
             },
         ),
+        addr_2: Account(storage={2: 0, 4: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10_ooge.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10_ooge.py
index 2edcf60f1ca..1094066e048 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10_ooge.py
@@ -2,16 +2,15 @@
 DELEGATE -> CALLCODE -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecall_10_OOGEFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecall_10_ooge(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> CALLCODE -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,66 +45,64 @@ def test_callcodecall_10_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x8E6E134402F2EECA8E910E8EC62B45B36EE31F30,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 2 1) (KECCAK256 0x00 0x2fffff) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x766b2cf0691f51029181fc511395b7ab71353a88"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0x766B2CF0691F51029181FC511395B7AB71353A88,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x8e6e134402f2eeca8e910e8ec62b45b36ee31f30"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={2: 0}),
+        sender: Account(storage={1: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10_suicide_end.py
index 03154140bb9..ed560a050f0 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecall_10_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecall_10_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecall_10_SuicideEndFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecall_10_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecall_10_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,66 +45,66 @@ def test_callcodecall_10_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x799DA5A3C983A22F9C430DE1BF99134EE561E856,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 2 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x703b936fd4d674f0ff5d6957f61097152f8781b8"),  # noqa: E501
+        address=Address(0x703B936FD4D674F0FF5D6957F61097152F8781B8),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x799DA5A3C983A22F9C430DE1BF99134EE561E856,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x799da5a3c983a22f9c430de1bf99134ee561e856"),  # noqa: E501
+        address=Address(0x799DA5A3C983A22F9C430DE1BF99134EE561E856),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 2: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 1}),
+        addr: Account(storage={0: 0, 2: 0}),
+        addr_2: Account(storage={2: 0, 3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100.py
index 7a5a21493d5..571626d265a 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcall_100.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcall_100Filler.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcall_100(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcall_100."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,108 +45,104 @@ def test_callcodecallcall_100(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x3D090,
-                    address=0x9BA8D9F7285EBC9BCAAF9DD90F3C123797489566,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 6 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x6, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x47f860829f84284269e427671425e1991a340efa"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x6, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 250000 <contract:0x1000000000000000000000000000000000000003> 2 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x3D090,
+                address=addr_3,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9ba8d9f7285ebc9bcaaf9dd90f3c123797489566"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x493E0,
-                    address=0x47F860829F84284269E427671425E1991A340EFA,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x5, value=Op.CALLER)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 300000 <contract:0x1000000000000000000000000000000000000002> 1 0 64 0 64 ) (SSTORE 5 (CALLER))}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x493E0,
+                address=addr_2,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x5, value=Op.CALLER)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc37470fbb132de68b5746ff4463735a31b5f0c"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x55730,
-                    address=0xBCC37470FBB132DE68B5746FF4463735A31B5F0C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd26e26d5a4796d450bfa296d70c05f02dbc1a4b9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 1,
                 1: 1,
                 2: 1,
                 3: 1,
-                4: 0xD26E26D5A4796D450BFA296D70C05F02DBC1A4B9,
-                5: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                4: target,
+                5: sender,
                 6: 2,
-                330: 0xD26E26D5A4796D450BFA296D70C05F02DBC1A4B9,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: target,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
+        addr_2: Account(storage={2: 0}),
+        addr_3: Account(storage={3: 0, 4: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_ooge.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_ooge.py
index ab4cb7d8f3a..c1b01da23e8 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_ooge.py
@@ -2,16 +2,15 @@
 DELEGATE -> CALLCODE -> CALLCODE -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcall_100_OOGEFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcall_100_ooge(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> CALLCODE -> CALLCODE -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,85 +45,83 @@ def test_callcodecallcall_100_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x913CF7A18F61BAB7BCCF5607DFA9B730C5976000,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff)  }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0x6389DE20837EC4A47465AED415C7912598FEDC96,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6322dc554acdcada01cbf7ac6a163d207c34ded2"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6389de20837ec4a47465aed415c7912598fedc96"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0x6322DC554ACDCADA01CBF7AC6A163D207C34DED2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x913cf7a18f61bab7bccf5607dfa9b730c5976000"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 11: 1}),
+        target: Account(storage={0: 1, 1: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_oogm_after.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_oogm_after.py
index 9d0474c3cf8..df871326fe5 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_oogm_after.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_oogm_after.py
@@ -2,16 +2,15 @@
 DELEGATE -> (CALLCODE -> CALLCODE -> CODE) OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcall_100_OOGMAfterFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcall_100_oogm_after(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> (CALLCODE -> CALLCODE -> CODE) OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,82 +45,82 @@ def test_callcodecallcall_100_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0x926DFBCC20B2AB686FC85331883541D174CCC738,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x37e72dd6ff3c2ac8c1ddab092a26164a2ad5988c"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x37E72DD6FF3C2AC8C1DDAB092A26164A2AD5988C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x74ecd5f6537b2b48ebbff8d66aee8eb8f98430a3"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x926dfbcc20b2ab686fc85331883541d174ccc738"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_oogm_before.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_oogm_before.py
index 63ba4e5af3a..2f8db11c656 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_oogm_before.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_oogm_before.py
@@ -2,16 +2,15 @@
 DELEGATE -> CALLCODE -> OOG CALLCODE -> CODE.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcall_100_OOGMBeforeFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcall_100_oogm_before(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> CALLCODE -> OOG CALLCODE -> CODE."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,82 +45,82 @@ def test_callcodecallcall_100_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x8E6E134402F2EECA8E910E8EC62B45B36EE31F30,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0xDBB53599A5D13E0C465E1CC4FF24D7F00D780DF4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (KECCAK256 0x00 0x2fffff) [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8e6e134402f2eeca8e910e8ec62b45b36ee31f30"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdbb53599a5d13e0c465e1cc4ff24d7f00d780df4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_end.py
index a7ec2ec31f4..51991cb8e36 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcall_100_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcall_100_SuicideEndFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcall_100_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcall_100_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,86 +45,88 @@ def test_callcodecallcall_100_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x94c8f980aeecbb6575b12ae614a249fc3e836f21"),  # noqa: E501
+        address=Address(0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xeaf8c2ae0d01a880cea4e1aa88def5edd153d57b"),  # noqa: E501
+        address=Address(0x94C8F980AEECBB6575B12AE614A249FC3E836F21),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 2: 1, 3: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 1, 3: 1}),
+        addr: Account(storage={1: 0, 2: 0, 3: 0}),
+        addr_2: Account(storage={0: 0, 1: 0, 2: 0}),
+        addr_3: Account(storage={3: 0}),
+        sender: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_middle.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_middle.py
index 9771f03157d..c61cace9877 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_middle.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_100_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcall_100_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcall_100_SuicideMiddleFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcall_100_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcall_100_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,84 +45,89 @@ def test_callcodecallcall_100_suicide_middle(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x23a077e1e6b0740d6bfbc41de582f2930abd1762"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0x23A077E1E6B0740D6BFBC41DE582F2930ABD1762,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0x23A077E1E6B0740D6BFBC41DE582F2930ABD1762,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xeaf8c2ae0d01a880cea4e1aa88def5edd153d57b"),  # noqa: E501
+        address=Address(0x23A077E1E6B0740D6BFBC41DE582F2930ABD1762),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr_2: Account(storage={0: 0, 1: 0}),
+        addr_3: Account(storage={3: 0}, balance=0x2540BE400),
+        sender: Account(storage={1: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_abcb_recursive.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_abcb_recursive.py
index 146ce9a7dce..1265bc7fe0b 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_abcb_recursive.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcall_abcb_recursive.py
@@ -2,16 +2,15 @@
 DELEGATE -> CALLCODE1 -> CALLCODE2  -> CALLCODE1 -> ...
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcall_ABCB_RECURSIVEFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcall_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """DELEGATE -> CALLCODE1 -> CALLCODE2  -> CALLCODE1 -> ..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """DELEGATE -> CALLCODE1 -> CALLCODE2  -> CALLCODE1 -> ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,77 +45,78 @@ def test_callcodecallcall_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x17D7840,
-                    address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x17D7840,
+                address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x15600a91a7af84b8c85782714b3391ed5d73f9a0"),  # noqa: E501
+        address=Address(0x15600A91A7AF84B8C85782714B3391ED5D73F9A0),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 1000000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xF4240,
+                address=0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa71333d8c0291cfd6da54bec5a3957563ab16c1c"),  # noqa: E501
+        address=Address(0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xF4240,
-                    address=0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 500000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xe2ab9779f4fb1d9d39211cc2082083add172e69c"),  # noqa: E501
+        address=Address(0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 0}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
+        sender: Account(storage={1: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101.py
index 38636f2cacd..9104aa608e2 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcallcode_101.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcallcode_101Filler.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcallcode_101(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcallcode_101."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,109 +45,106 @@ def test_callcodecallcallcode_101(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x7e63847aad8ca50fb7c04777dce6871a6bf8de0c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x3D090,
-                    address=0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x6, value=Op.CALLER)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SSTORE 6 (CALLER)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x3D090,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x6, value=Op.CALLER)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xae5f44e50ecbf16179774393c643204383fde833"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x493E0,
-                    address=0xAE5F44E50ECBF16179774393C643204383FDE833,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x5, value=Op.CALLER)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 300000 <contract:0x1000000000000000000000000000000000000002> 1 0 64 0 64 ) (SSTORE 5 (CALLER)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x493E0,
+                address=addr_2,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x5, value=Op.CALLER)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xcc06dd0686d0e620fbd99f6a023ba77440119f71"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x55730,
-                    address=0xCC06DD0686D0E620FBD99F6A023BA77440119F71,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd26e26d5a4796d450bfa296d70c05f02dbc1a4b9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 1,
                 1: 1,
                 2: 1,
                 3: 1,
-                4: 0xD26E26D5A4796D450BFA296D70C05F02DBC1A4B9,
-                5: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-                6: 0xD26E26D5A4796D450BFA296D70C05F02DBC1A4B9,
+                4: target,
+                5: sender,
+                6: target,
                 7: 1,
-                330: 0xD26E26D5A4796D450BFA296D70C05F02DBC1A4B9,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: target,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={2: 0, 3: 0, 4: 0, 6: 0}),
+        sender: Account(storage={1: 0, 3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_ooge.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_ooge.py
index 823d442bc73..5ef5accb284 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_ooge.py
@@ -2,16 +2,15 @@
 DELEGATE -> CALLCODE -> CALLCODE -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcallcode_101_OOGEFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcallcode_101_ooge(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> CALLCODE -> CALLCODE -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,84 +45,82 @@ def test_callcodecallcallcode_101_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x913CF7A18F61BAB7BCCF5607DFA9B730C5976000,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 )  [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0xFCF790146E167FB47D128896C5BA30B0265B1780,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x913cf7a18f61bab7bccf5607dfa9b730c5976000"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfcf790146e167fb47d128896c5ba30b0265b1780"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 11: 1}),
+        target: Account(storage={0: 1, 1: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_oogm_after.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_oogm_after.py
index 9772ab8b1b3..6dd1d8b9f58 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_oogm_after.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_oogm_after.py
@@ -2,16 +2,15 @@
 DELEGATE -> (CALLCODE -> DELEGATE -> CODE) OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcallcode_101_OOGMAfterFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcallcode_101_oogm_after(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> (CALLCODE -> DELEGATE -> CODE) OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,81 +45,81 @@ def test_callcodecallcallcode_101_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0xDA11FDF0CE02240C6B4711F56AFCD9763B44D3DC,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x37e72dd6ff3c2ac8c1ddab092a26164a2ad5988c"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[11]] 1}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x37E72DD6FF3C2AC8C1DDAB092A26164A2AD5988C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x5afccf55d80f6c4c95515cffd8e7d51d2c4c9f4a"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[11]] 1}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xda11fdf0ce02240c6b4711f56afcd9763b44d3dc"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_oogm_before.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_oogm_before.py
index df4ca1e11a3..dcf7c6314dd 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_oogm_before.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_oogm_before.py
@@ -2,16 +2,15 @@
 DELEGATE -> CALLCODE -> OOG DELEGATE -> CODE.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcallcode_101_OOGMBeforeFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcallcode_101_oogm_before(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> CALLCODE -> OOG DELEGATE -> CODE."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,81 +45,81 @@ def test_callcodecallcallcode_101_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x8E6E134402F2EECA8E910E8EC62B45B36EE31F30,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (KECCAK256 0x00 0x2fffff) [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x71e7e95d2dfe9f65b4522f2d3aa71fb33f49920c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0x71E7E95D2DFE9F65B4522F2D3AA71FB33F49920C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8e6e134402f2eeca8e910e8ec62b45b36ee31f30"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_end.py
index 9e0d388378c..c83fec414f8 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcallcode_101_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcallcode_101_SuicideEndFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcallcode_101_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcallcode_101_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,85 +45,87 @@ def test_callcodecallcallcode_101_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xac521409e2fa9526bfe6b827805783d2e307c4ce"),  # noqa: E501
+        address=Address(0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0xEAF8C2AE0D01A880CEA4E1AA88DEF5EDD153D57B)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xeaf8c2ae0d01a880cea4e1aa88def5edd153d57b"),  # noqa: E501
+        address=Address(0xAC521409E2FA9526BFE6B827805783D2E307C4CE),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 2: 1, 3: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 1, 3: 1}),
+        addr: Account(storage={1: 0, 3: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
+        addr_3: Account(storage={3: 0}),
+        sender: Account(storage={1: 0, 2: 0, 3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_middle.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_middle.py
index b7a15e6d668..631811f181d 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_middle.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_101_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcallcode_101_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcallcode_101_SuicideMiddleFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,13 @@ def test_callcodecallcallcode_101_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_callcodecallcallcode_101_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
+    contract_1 = Address(0x1000000000000000000000000000000000000001)
+    contract_2 = Address(0x1000000000000000000000000000000000000002)
+    contract_3 = Address(0x1000000000000000000000000000000000000003)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,89 +49,89 @@ def test_callcodecallcallcode_101_suicide_middle(
         gas_limit=30000000,
     )
 
-    # Source: LLL
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x1000000000000000000000000000000000000003),  # noqa: E501
+    )
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x1000000000000000000000000000000000000001,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x1000000000000000000000000000000000000001,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 1 ]] (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0x1000000000000000000000000000000000000002,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0x1000000000000000000000000000000000000002,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000001"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000001),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x1000000000000000000000000000000000000000)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x1000000000000000000000000000000000000003,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x1000000000000000000000000000000000000002"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  (SSTORE 3 1) }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x1000000000000000000000000000000000000000
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x1000000000000000000000000000000000000003,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000003"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000002),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        contract_0: Account(storage={0: 1, 1: 1}),
+        contract_1: Account(storage={1: 0}, balance=0x2540BE400),
+        contract_2: Account(storage={2: 0}, balance=0x2540BE400),
+        contract_3: Account(storage={3: 0}, balance=0x2540BE400),
+        sender: Account(storage={1: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_abcb_recursive.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_abcb_recursive.py
index 3f7d1867af3..277bfc1c57d 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_abcb_recursive.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcallcode_abcb_recursive.py
@@ -1,17 +1,16 @@
 """
-DELEGATECALL -> CALLCODE -> DELEGATECALL2 -> CALLCODE -> DELEGATECALL2 -> ...
+DELEGATECALL -> CALLCODE -> DELEGATECALL2 -> CALLCODE -> DELEGATECALL2...
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcallcode_ABCB_RECURSIVEFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcallcode_abcb_recursive(
     pre: Alloc,
 ) -> None:
     """DELEGATECALL -> CALLCODE -> DELEGATECALL2 -> CALLCODE ->..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,76 +45,77 @@ def test_callcodecallcallcode_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x17D7840,
-                    address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x17D7840,
+                address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x15600a91a7af84b8c85782714b3391ed5d73f9a0"),  # noqa: E501
+        address=Address(0x15600A91A7AF84B8C85782714B3391ED5D73F9A0),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x7A120,
-                    address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALLCODE 1000000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xF4240,
+                address=0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa72f0e2f2fc5fd0878af9b8e4aaed09983670929"),  # noqa: E501
+        address=Address(0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xF4240,
-                    address=0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x7A120,
+                address=0xE2AB9779F4FB1D9D39211CC2082083ADD172E69C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xe2ab9779f4fb1d9d39211cc2082083add172e69c"),  # noqa: E501
+        address=Address(0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
+        sender: Account(storage={1: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11.py
index aac7727e127..b9187af14a7 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcode_11.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcode_11Filler.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcode_11(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcode_11."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,82 +45,80 @@ def test_callcodecallcode_11(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x3D090,
-                    address=0xD42CD48F1D9A88F4B75BFB5E46E754C1128BD7FB,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 2 1) (SSTORE 4 (CALLER)) (SSTORE 5 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x5, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
+        + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
+        + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
+        + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2b0691cd58a1cf4628d642e9aca9ab04946e3ec9"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x55730,
-                    address=0x2B0691CD58A1CF4628D642E9ACA9AB04946E3EC9,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 250000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x3D090,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xd26e26d5a4796d450bfa296d70c05f02dbc1a4b9"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x5, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
-            + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
-            + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
-            + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd42cd48f1d9a88f4b75bfb5e46e754c1128bd7fb"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 1,
                 1: 1,
                 2: 1,
-                4: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-                230: 0xD26E26D5A4796D450BFA296D70C05F02DBC1A4B9,
-                232: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                4: sender,
+                230: target,
+                232: sender,
                 236: 64,
                 238: 34,
                 240: 10,
             },
         ),
+        addr: Account(storage={1: 0, 2: 0, 4: 0, 5: 0}),
+        addr_2: Account(storage={2: 0}),
+        sender: Account(storage={1: 0, 2: 0, 4: 0, 5: 0}, nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11_ooge.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11_ooge.py
index 74294ac5877..61e6338b5b9 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11_ooge.py
@@ -2,16 +2,15 @@
 DELEGATE -> DELEGATE -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcode_11_OOGEFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcode_11_ooge(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> DELEGATE -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,65 +45,63 @@ def test_callcodecallcode_11_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0xECB18A704984B0E051E46358D64EF7811F2945BA,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 2 1) (KECCAK256 0x00 0x2fffff) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) [[11]] 1}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x766b2cf0691f51029181fc511395b7ab71353a88"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x766B2CF0691F51029181FC511395B7AB71353A88,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xecb18a704984b0e051e46358d64ef7811f2945ba"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={2: 0}),
+        sender: Account(storage={1: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11_suicide_end.py
index 746f3d6cefb..98290b68642 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcode_11_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcode_11_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcode_11_SuicideEndFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcode_11_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcode_11_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,65 +45,65 @@ def test_callcodecallcode_11_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 2 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x1cca6e93108ec94304ae5eb121d323e6c317fe7a"),  # noqa: E501
+        address=Address(0x703B936FD4D674F0FF5D6957F61097152F8781B8),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x1CCA6E93108EC94304AE5EB121D323E6C317FE7A,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x1CCA6E93108EC94304AE5EB121D323E6C317FE7A,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x703b936fd4d674f0ff5d6957f61097152f8781b8"),  # noqa: E501
+        address=Address(0x1CCA6E93108EC94304AE5EB121D323E6C317FE7A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 2: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 1}),
+        addr: Account(storage={0: 0, 1: 0, 2: 0}),
+        addr_2: Account(storage={2: 0, 3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110.py
index 1752d42574b..7329364f7f2 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcodecall_110.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcodecall_110Filler.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcodecall_110(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcodecall_110."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,109 +45,105 @@ def test_callcodecallcodecall_110(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x3D090,
-                    address=0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x6, value=Op.CALLER)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2f1dbd8e6a5782a1a446d6ced65d3b316c857b55"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x493E0,
-                    address=0x2F1DBD8E6A5782A1A446D6CED65D3B316C857B55,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x5, value=Op.CALLER)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 250000 <contract:0x1000000000000000000000000000000000000003> 1 0 64 0 64 ) (SSTORE 6 (CALLER))}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x3D090,
+                address=addr_3,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x6, value=Op.CALLER)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x669e33b1aa30351139b73c3942acde1b09e75bcd"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SSTORE 5 (CALLER))}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x493E0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x5, value=Op.CALLER)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7e63847aad8ca50fb7c04777dce6871a6bf8de0c"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x55730,
-                    address=0x669E33B1AA30351139B73C3942ACDE1B09E75BCD,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd26e26d5a4796d450bfa296d70c05f02dbc1a4b9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 1,
                 1: 1,
                 2: 1,
                 3: 1,
-                4: 0xD26E26D5A4796D450BFA296D70C05F02DBC1A4B9,
-                5: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-                6: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                4: target,
+                5: sender,
+                6: sender,
                 7: 1,
-                330: 0xD26E26D5A4796D450BFA296D70C05F02DBC1A4B9,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: target,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
+        addr_3: Account(storage={3: 0, 4: 0}),
+        sender: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_ooge.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_ooge.py
index 7cc236f2cb6..e52fb64f847 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_ooge.py
@@ -2,16 +2,15 @@
 DELEGATE -> DELEGATE -> CALLCODE -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcodecall_110_OOGEFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcodecall_110_ooge(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> DELEGATE -> CALLCODE -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,84 +45,82 @@ def test_callcodecallcodecall_110_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x69A0017A51AD556682F48B32235D0B61ABDF4DA4,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) [[11]] 1}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3568ec0dda63b253e338fbc4990869fd168ab515"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x3568EC0DDA63B253E338FBC4990869FD168AB515,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x69a0017a51ad556682f48b32235d0b61abdf4da4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 11: 1}),
+        target: Account(storage={0: 1, 1: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_oogm_after.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_oogm_after.py
index 1879b57efbf..19362172d87 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_oogm_after.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_oogm_after.py
@@ -2,16 +2,15 @@
 DELEGATE -> (DELEGATE -> CALLCODE -> CODE) OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcodecall_110_OOGMAfterFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcodecall_110_oogm_after(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> (DELEGATE -> CALLCODE -> CODE) OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,81 +45,81 @@ def test_callcodecallcodecall_110_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x0be2d28f50cb59ffbd66d2eb6a3e8d34f3561d8b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0xBE2D28F50CB59FFBD66D2EB6A3E8D34F3561D8B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1adae71ad3aeec97978e38be04da2a1773dfc506"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x1ADAE71AD3AEEC97978E38BE04DA2A1773DFC506,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x74ecd5f6537b2b48ebbff8d66aee8eb8f98430a3"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_oogm_before.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_oogm_before.py
index 123713447b9..490de6e49aa 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_oogm_before.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_oogm_before.py
@@ -2,16 +2,15 @@
 DELEGATE -> DELEGATE -> OOG CALLCODE -> CODE.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcodecall_110_OOGMBeforeFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcodecall_110_oogm_before(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> DELEGATE -> OOG CALLCODE -> CODE."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,81 +45,81 @@ def test_callcodecallcodecall_110_oogm_before(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x0d33ab78ac3965e7d6f9548dff5839138a9f69c5"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x29F893B720E998CCD5971409FA9A8802822FDCBC,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # { (KECCAK256 0x00 0x2fffff) [[ 2 ]] (CALLCODE 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0xD33AB78AC3965E7D6F9548DFF5839138A9F69C5,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x29f893b720e998ccd5971409fa9a8802822fdcbc"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_end.py
index d6ee8321558..39e4bd7fee8 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcodecall_110_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcodecall_110_SuicideEndFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcodecall_110_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcodecall_110_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,85 +45,86 @@ def test_callcodecallcodecall_110_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2cac1d43f00e8b40b63426ab460c7e8717ee6455"),  # noqa: E501
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0x94C8F980AEECBB6575B12AE614A249FC3E836F21,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x94c8f980aeecbb6575b12ae614a249fc3e836f21"),  # noqa: E501
+        address=Address(0x94C8F980AEECBB6575B12AE614A249FC3E836F21),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 2: 1, 3: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 1, 3: 1}),
+        addr: Account(storage={1: 0, 3: 0}),
+        addr_2: Account(storage={2: 0, 3: 0}),
+        addr_3: Account(storage={3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_middle.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_middle.py
index 7dc9fb0c1eb..7a5f1346336 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_middle.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_110_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcodecall_110_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcodecall_110_SuicideMiddleFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcodecall_110_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcodecall_110_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,83 +45,88 @@ def test_callcodecallcodecall_110_suicide_middle(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x23a077e1e6b0740d6bfbc41de582f2930abd1762"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0x23A077E1E6B0740D6BFBC41DE582F2930ABD1762,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0x23A077E1E6B0740D6BFBC41DE582F2930ABD1762,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2cac1d43f00e8b40b63426ab460c7e8717ee6455"),  # noqa: E501
+        address=Address(0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x23A077E1E6B0740D6BFBC41DE582F2930ABD1762),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={0: 0, 1: 0}),
+        addr_2: Account(storage={2: 0}, balance=0x2540BE400),
+        addr_3: Account(storage={3: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_abcb_recursive.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_abcb_recursive.py
index ad704e8d2dc..b671556b16a 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_abcb_recursive.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecall_abcb_recursive.py
@@ -2,16 +2,15 @@
 DELEGATECALL -> DELEGATECALL2 -> CALLCODE -> DELEGATECALL2 -> ..
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcodecall_ABCB_RECURSIVEFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcodecall_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """DELEGATECALL -> DELEGATECALL2 -> CALLCODE -> DELEGATECALL2 -> .."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """DELEGATECALL -> DELEGATECALL2 -> CALLCODE -> DELEGATECALL2 -> ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,76 +45,77 @@ def test_callcodecallcodecall_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x17D7840,
-                    address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x17D7840,
+                address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x15600a91a7af84b8c85782714b3391ed5d73f9a0"),  # noqa: E501
+        address=Address(0x15600A91A7AF84B8C85782714B3391ED5D73F9A0),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xF4240,
+                address=0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa71333d8c0291cfd6da54bec5a3957563ab16c1c"),  # noqa: E501
+        address=Address(0xE0B280638526CECD3EC29969B517AEB3FCBB31FA),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xF4240,
-                    address=0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 500000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xe0b280638526cecd3ec29969b517aeb3fcbb31fa"),  # noqa: E501
+        address=Address(0xA71333D8C0291CFD6DA54BEC5A3957563AB16C1C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
+        sender: Account(storage={1: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111.py
index 9ae5bc822ff..4c12782ba77 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcodecallcode_111.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcodecallcode_111Filler.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcodecallcode_111(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcodecallcode_111."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,101 +45,96 @@ def test_callcodecallcodecallcode_111(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x3D090,
-                    address=0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x12bdab5af7fd144e2841e58cb6cf90d467054643"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x493E0,
-                    address=0x12BDAB5AF7FD144E2841E58CB6CF90D467054643,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x3D090,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x66f7a765dc70598f71b119f636a53aaa43c4cca1"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x493E0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x7e63847aad8ca50fb7c04777dce6871a6bf8de0c"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x55730,
-                    address=0x66F7A765DC70598F71B119F636A53AAA43C4CCA1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd26e26d5a4796d450bfa296d70c05f02dbc1a4b9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 1,
                 1: 1,
                 2: 1,
                 3: 1,
-                4: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-                330: 0xD26E26D5A4796D450BFA296D70C05F02DBC1A4B9,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                4: sender,
+                330: target,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
+        sender: Account(storage={1: 0, 2: 0, 3: 0, 4: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_ooge.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_ooge.py
index c4ac6882efa..bf14e1278f1 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_ooge.py
@@ -2,16 +2,15 @@
 DELEGATE -> DELEGATE -> OOG DELEGATE -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcodecallcode_111_OOGEFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcodecallcode_111_ooge(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> DELEGATE -> OOG DELEGATE -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,83 +45,81 @@ def test_callcodecallcodecallcode_111_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x69A0017A51AD556682F48B32235D0B61ABDF4DA4,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3e423a7b1fba04d0c3f9423a3ae2a180d2878d5b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x3E423A7B1FBA04D0C3F9423A3AE2A180D2878D5B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x69a0017a51ad556682f48b32235d0b61abdf4da4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 11: 1}),
+        target: Account(storage={0: 1, 1: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_oogm_after.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_oogm_after.py
index b02f240e109..4d17a391930 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_oogm_after.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_oogm_after.py
@@ -2,16 +2,15 @@
 DELEGATE -> (DELEGATE -> OOG DELEGATE -> CODE) OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcodecallcode_111_OOGMAfterFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcodecallcode_111_oogm_after(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> (DELEGATE -> OOG DELEGATE -> CODE) OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,80 +45,80 @@ def test_callcodecallcodecallcode_111_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0xDA11FDF0CE02240C6B4711F56AFCD9763B44D3DC,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x1adae71ad3aeec97978e38be04da2a1773dfc506"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x1ADAE71AD3AEEC97978E38BE04DA2A1773DFC506,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x74ecd5f6537b2b48ebbff8d66aee8eb8f98430a3"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xda11fdf0ce02240c6b4711f56afcd9763b44d3dc"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_oogm_before.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_oogm_before.py
index f4e920904c1..cee5b30363f 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_oogm_before.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_oogm_before.py
@@ -2,16 +2,15 @@
 DELEGATE -> DELEGATE -> OOG DELEGATE -> CODE.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcodecallcode_111_OOGMBeforeFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcodecallcode_111_oogm_before(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> DELEGATE -> OOG DELEGATE -> CODE."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,80 +45,80 @@ def test_callcodecallcodecallcode_111_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x29F893B720E998CCD5971409FA9A8802822FDCBC,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x71E7E95D2DFE9F65B4522F2D3AA71FB33F49920C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (KECCAK256 0x00 0x2fffff) [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x29f893b720e998ccd5971409fa9a8802822fdcbc"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x71e7e95d2dfe9f65b4522f2d3aa71fb33f49920c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_suicide_end.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_suicide_end.py
index e5b26bc63ed..de51b0fb329 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcodecallcode_111_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcodecallcode_111_SuicideEndFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcodecallcode_111_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcodecallcode_111_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,87 +45,87 @@ def test_callcodecallcodecallcode_111_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x9CFF7A3C9C90A301C47982DC2C4399C93700F0FD,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x9CFF7A3C9C90A301C47982DC2C4399C93700F0FD,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0xB207980945728D64A3C9F905932314C8F130EE38,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 1 0 64 0 64) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0xB207980945728D64A3C9F905932314C8F130EE38,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x9cff7a3c9c90a301c47982dc2c4399c93700f0fd"),  # noqa: E501
+        address=Address(0x9CFF7A3C9C90A301C47982DC2C4399C93700F0FD),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x9CFF7A3C9C90A301C47982DC2C4399C93700F0FD
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 2 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x9CFF7A3C9C90A301C47982DC2C4399C93700F0FD)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xb207980945728d64a3c9f905932314c8f130ee38"),  # noqa: E501
+        address=Address(0xB207980945728D64A3C9F905932314C8F130EE38),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
-        callee_2: Account(storage={2: 1, 3: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 0, 3: 0}),
+        addr: Account(storage={1: 0, 2: 0, 3: 0}),
+        addr_2: Account(storage={2: 1, 3: 1}),
+        addr_3: Account(storage={2: 0, 3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_suicide_middle.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_suicide_middle.py
index 7dda3f59fee..5bfe55fa878 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_suicide_middle.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_111_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcodecallcode_111_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcodecallcode_111_SuicideMiddleFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcodecallcode_111_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcodecallcode_111_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,82 +45,90 @@ def test_callcodecallcodecallcode_111_suicide_middle(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x124b38fa011c9d36b7fe193dc636813a2f8bdaa7"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0x124B38FA011C9D36B7FE193DC636813A2F8BDAA7,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0x124B38FA011C9D36B7FE193DC636813A2F8BDAA7,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2cac1d43f00e8b40b63426ab460c7e8717ee6455"),  # noqa: E501
+        address=Address(0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x124B38FA011C9D36B7FE193DC636813A2F8BDAA7),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(
+            storage={0: 1, 1: 1, 2: 0},
+            balance=0xDE0B6B3A7640000,
+        ),
+        addr: Account(storage={0: 0, 1: 0, 2: 0}, balance=0x2540BE400),
+        addr_2: Account(storage={2: 0, 3: 0}, balance=0x2540BE400),
+        addr_3: Account(storage={3: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_abcb_recursive.py b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_abcb_recursive.py
index 15fdaed876b..57136f08e9f 100644
--- a/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_abcb_recursive.py
+++ b/tests/ported_static/stCallDelegateCodesCallCodeHomestead/test_callcodecallcodecallcode_abcb_recursive.py
@@ -2,16 +2,15 @@
 DELEGATECALL -> DELEGATECALL1 -> DELEGATECALL2 -> DELEGATECAL1 -> ...
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesCallCodeHomestead
-callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
+state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcodecallcode_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """DELEGATECALL -> DELEGATECALL1 -> DELEGATECALL2 -> DELEGATECAL1 -> ..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """DELEGATECALL -> DELEGATECALL1 -> DELEGATECALL2 -> DELEGATECAL1 -> ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,75 +45,76 @@ def test_callcodecallcodecallcode_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x17D7840,
-                    address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x17D7840,
+                address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x15600a91a7af84b8c85782714b3391ed5d73f9a0"),  # noqa: E501
+        address=Address(0x15600A91A7AF84B8C85782714B3391ED5D73F9A0),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x7A120,
-                    address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xF4240,
+                address=0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa72f0e2f2fc5fd0878af9b8e4aaed09983670929"),  # noqa: E501
+        address=Address(0xE0B280638526CECD3EC29969B517AEB3FCBB31FA),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xF4240,
-                    address=0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x7A120,
+                address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xe0b280638526cecd3ec29969b517aeb3fcbb31fa"),  # noqa: E501
+        address=Address(0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
+        sender: Account(storage={1: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/__init__.py b/tests/ported_static/stCallDelegateCodesHomestead/__init__.py
index a8b94011fd3..e279839d020 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/__init__.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/__init__.py
@@ -1 +1 @@
-"""Tests ported from stCallDelegateCodesHomestead."""
+"""Ported static tests: stCallDelegateCodesHomestead."""  # noqa: N999
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001.py
index e405d4039e7..521fce6999d 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcallcode_001.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcallcode_001Filler.json
+state_tests/stCallDelegateCodesHomestead/callcallcallcode_001Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcallcode_001Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcallcode_001Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcallcode_001(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcallcode_001."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,106 +45,101 @@ def test_callcallcallcode_001(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x3D090,
-                    address=0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6f50426aa1bbb3cbd865847823f377d918757c07"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x3D090,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7e63847aad8ca50fb7c04777dce6871a6bf8de0c"),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0x6F50426AA1BBB3CBD865847823F377D918757C07,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 300000 <contract:0x1000000000000000000000000000000000000002> 2 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=addr_2,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9073671d2bfb351331716fd279282eacf50824ad"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x55730,
-                    address=0x9073671D2BFB351331716FD279282EACF50824AD,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xeb09ff15547417853f6f4b240b8804769c37b0f1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(
+        target: Account(storage={0: 1, 1: 0, 3: 0, 4: 0}),
+        addr: Account(storage={1: 1, 3: 0, 4: 0}),
+        addr_2: Account(
             storage={
                 2: 1,
                 3: 1,
-                4: 0x9073671D2BFB351331716FD279282EACF50824AD,
+                4: addr,
                 7: 2,
-                330: 0x6F50426AA1BBB3CBD865847823F377D918757C07,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: addr_2,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
-        callee_2: Account(storage={1: 1}),
-        contract: Account(storage={0: 1}),
+        addr_3: Account(storage={2: 0, 3: 0, 4: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_ooge.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_ooge.py
index ce3e20445b0..b138b7b3994 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_ooge.py
@@ -2,16 +2,15 @@
 CALL -> CALL -> DELEGATE -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcallcode_001_OOGEFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcallcode_001_ooge(
     pre: Alloc,
 ) -> None:
     """CALL -> CALL -> DELEGATE -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,87 +45,83 @@ def test_callcallcallcode_001_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0xBBDCE54B3C571B853032CB3A637E8F5B81DBAF0D,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335b558774699d81f685543cfbcde5c4e5407686"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3e423a7b1fba04d0c3f9423a3ae2a180d2878d5b"),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x3E423A7B1FBA04D0C3F9423A3AE2A180D2878D5B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbbdce54b3c571b853032cb3a637e8f5b81dbaf0d"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={11: 1}),
-        callee_2: Account(storage={1: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={1: 1}),
+        addr_2: Account(storage={11: 1}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_oogm_after.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_oogm_after.py
index 6aaad4e9307..e969889555f 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_oogm_after.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_oogm_after.py
@@ -2,16 +2,15 @@
 CALL -> (CALL -> DELEGATE -> CODE) OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcallcode_001_OOGMAfterFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcallcode_001_oogm_after(
     pre: Alloc,
 ) -> None:
     """CALL -> (CALL -> DELEGATE -> CODE) OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,82 +45,82 @@ def test_callcallcallcode_001_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x7b1ed5fa290739659102e7c47b650efd2eba625b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # { [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0xB5D1A486869D27225126C47727513F57D329A01A,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb501c5662091e198627416e5579d42acee74dbfc"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x7B1ED5FA290739659102E7C47B650EFD2EBA625B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1  }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb5d1a486869d27225126c47727513f57d329a01a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_oogm_before.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_oogm_before.py
index 7600c491bab..2f1530511a9 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_oogm_before.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_oogm_before.py
@@ -2,16 +2,15 @@
 CALL -> CALL -> OOG DELEGATE -> CODE.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcallcode_001_OOGMBeforeFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcallcode_001_oogm_before(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """CALL -> CALL -> OOG DELEGATE -> CODE."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """CALL -> CALL -> OOG DELEGATE -> CODE ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,83 +45,82 @@ def test_callcallcallcode_001_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0x471072D55A5A95044C2326F0E94A6D8DF5B8089E,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335b558774699d81f685543cfbcde5c4e5407686"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0xEFE4727369C5F495AEBF4EA778CC48D1155BF978,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (KECCAK256 0x00 0x2fffff) [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x471072d55a5a95044c2326f0e94a6d8df5b8089e"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xefe4727369c5f495aebf4ea778cc48d1155bf978"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee: Account(storage={11: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={11: 1}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_end.py
index 34ff159d5e6..9d145663f00 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcallcode_001_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcallcode_001_SuicideEndFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcallcode_001_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcallcode_001_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,88 +45,88 @@ def test_callcallcallcode_001_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x4353E77718BE108D4C149D88B34CACEDA42C5C66),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x77b749ffff7ec61d31c79ed104f230a7959b2879"),  # noqa: E501
+        address=Address(0x77B749FFFF7EC61D31C79ED104F230A7959B2879),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xac521409e2fa9526bfe6b827805783d2e307c4ce"),  # noqa: E501
+        address=Address(0xAC521409E2FA9526BFE6B827805783D2E307C4CE),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={1: 1}),
-        callee_2: Account(storage={2: 1, 3: 1}),
+        target: Account(storage={0: 1, 2: 0}),
+        addr: Account(storage={1: 1, 3: 0}),
+        addr_2: Account(storage={2: 1, 3: 1}, balance=0),
+        addr_3: Account(storage={3: 0}),
+        sender: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_middle.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_middle.py
index 6dd0d53813d..9bddbd06ff9 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_middle.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_001_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcallcode_001_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcallcode_001_SuicideMiddleFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcallcode_001_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcallcode_001_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,85 +45,97 @@ def test_callcallcallcode_001_suicide_middle(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x124b38fa011c9d36b7fe193dc636813a2f8bdaa7"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
+        address=Address(0x4353E77718BE108D4C149D88B34CACEDA42C5C66),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0x124B38FA011C9D36B7FE193DC636813A2F8BDAA7,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x77B749FFFF7EC61D31C79ED104F230A7959B2879),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x124B38FA011C9D36B7FE193DC636813A2F8BDAA7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x77b749ffff7ec61d31c79ed104f230a7959b2879"),  # noqa: E501
+        address=Address(0x124B38FA011C9D36B7FE193DC636813A2F8BDAA7),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_2: Account(storage={1: 1}),
+        addr_2: Account(
+            storage={},
+            code=bytes.fromhex(
+                "734353e77718be108d4c149d88b34caceda42c5c66ff60406000604060007373b954ebc05bb0ff4a0f6a13a054d50ad158409961c350f460025500"  # noqa: E501
+            ),
+            balance=0,
+            nonce=0,
+        ),
+        target: Account(storage={0: 1}, balance=0xDE0B6B5FB6FE400),
+        addr: Account(storage={1: 1, 2: 0}, balance=0x2540BE400),
+        addr_3: Account(storage={2: 0, 3: 0}, balance=0x2540BE400),
+        sender: Account(storage={2: 0, 3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_abcb_recursive.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_abcb_recursive.py
index 2870ef70f42..6800472a043 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_abcb_recursive.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcallcode_abcb_recursive.py
@@ -2,16 +2,15 @@
 CALL -> CALL2 -> DELEGATECALL -> CALL2 -> ...
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcallcode_ABCB_RECURSIVEFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcallcode_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """CALL -> CALL2 -> DELEGATECALL -> CALL2 -> ..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """CALL -> CALL2 -> DELEGATECALL -> CALL2 -> ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,78 +45,77 @@ def test_callcallcallcode_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x17D7840,
-                    address=0x66C0D9F841A86866465E6385C3827BE02B580020,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x17D7840,
+                address=0x66C0D9F841A86866465E6385C3827BE02B580020,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x039f3900e280b9c74d46e825b0b3814df4d705ac"),  # noqa: E501
+        address=Address(0x039F3900E280B9C74D46E825B0B3814DF4D705AC),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xF4240,
-                    address=0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xF4240,
+                address=0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x66c0d9f841a86866465e6385c3827be02b580020"),  # noqa: E501
+        address=Address(0x66C0D9F841A86866465E6385C3827BE02B580020),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x7A120,
-                    address=0x66C0D9F841A86866465E6385C3827BE02B580020,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x7A120,
+                address=0x66C0D9F841A86866465E6385C3827BE02B580020,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa72f0e2f2fc5fd0878af9b8e4aaed09983670929"),  # noqa: E501
+        address=Address(0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee: Account(storage={1: 1}),
+        target: Account(storage={0: 1, 1: 0}),
+        addr: Account(storage={1: 1, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcode_01.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcode_01.py
index 316be6d640c..b507415274d 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcode_01.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcode_01.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcode_01.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcode_01Filler.json
+state_tests/stCallDelegateCodesHomestead/callcallcode_01Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcode_01Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCallDelegateCodesHomestead/callcallcode_01Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_callcallcode_01(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcode_01."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,84 +43,80 @@ def test_callcallcode_01(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x3D090,
-                    address=0xB096ECA04CD5C92C88BA466F92627D4F04D53C95,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 2 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
+        + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
+        + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
+        + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2b0691cd58a1cf4628d642e9aca9ab04946e3ec9"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
-            + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
-            + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
-            + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 250000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x3D090,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb096eca04cd5c92c88ba466f92627d4f04d53c95"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x55730,
-                    address=0x2B0691CD58A1CF4628D642E9ACA9AB04946E3EC9,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xeb09ff15547417853f6f4b240b8804769c37b0f1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(
+        target: Account(storage={0: 1}),
+        addr: Account(
             storage={
                 1: 1,
                 2: 1,
-                4: 0xEB09FF15547417853F6F4B240B8804769C37B0F1,
+                4: target,
                 7: 1,
-                230: 0x2B0691CD58A1CF4628D642E9ACA9AB04946E3EC9,
-                232: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                230: addr,
+                232: sender,
                 236: 64,
                 238: 34,
                 240: 10,
             },
         ),
-        contract: Account(storage={0: 1}),
+        addr_2: Account(storage={4: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcode_01_ooge.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcode_01_ooge.py
index 16d3448c3cb..cbb050fc430 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcode_01_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcode_01_ooge.py
@@ -2,16 +2,15 @@
 CALL -> DELEGATE -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcode_01_OOGEFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcode_01_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcode_01_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcode_01_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcode_01_ooge(
     pre: Alloc,
 ) -> None:
     """CALL -> DELEGATE -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,67 +45,63 @@ def test_callcallcode_01_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0x42473C2734EB62B91E4E2AC3DAB63AB2443F4236,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 2 1) (KECCAK256 0x00 0x2fffff) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335b558774699d81f685543cfbcde5c4e5407686"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x766B2CF0691F51029181FC511395B7AB71353A88,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) [[11]] 1  }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x42473c2734eb62b91e4e2ac3dab63ab2443f4236"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x766b2cf0691f51029181fc511395b7ab71353a88"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee: Account(storage={11: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={11: 1}),
+        addr_2: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcode_01_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcode_01_suicide_end.py
index d9dbc0a301a..9ce57b4ea26 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcode_01_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcode_01_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcode_01_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcode_01_SuicideEndFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcode_01_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcode_01_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,67 +45,67 @@ def test_callcallcode_01_suicide_end(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 2 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x1cca6e93108ec94304ae5eb121d323e6c317fe7a"),  # noqa: E501
+        address=Address(0x703B936FD4D674F0FF5D6957F61097152F8781B8),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0x1CCA6E93108EC94304AE5EB121D323E6C317FE7A,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=0x1CCA6E93108EC94304AE5EB121D323E6C317FE7A,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
+        address=Address(0x4353E77718BE108D4C149D88B34CACEDA42C5C66),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x703b936fd4d674f0ff5d6957f61097152f8781b8"),  # noqa: E501
+        address=Address(0x1CCA6E93108EC94304AE5EB121D323E6C317FE7A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(storage={1: 1, 2: 1}),
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1, 2: 0}),
+        addr: Account(storage={1: 1, 2: 1}, balance=0, nonce=0),
+        addr_2: Account(storage={2: 0, 3: 0}),
+        sender: Account(storage={1: 0, 2: 0, 3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010.py
index bedc0e1259b..2887e55659b 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcodecall_010.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcodecall_010Filler.json
+state_tests/stCallDelegateCodesHomestead/callcallcodecall_010Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecall_010Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcodecall_010Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcodecall_010(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcodecall_010."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,112 +45,101 @@ def test_callcallcodecall_010(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x7e63847aad8ca50fb7c04777dce6871a6bf8de0c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x3D090,
-                    address=0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x5, value=Op.CALLER)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 250000 <contract:0x1000000000000000000000000000000000000003> 2 0 64 0 64 ) (SSTORE 5 (CALLER))}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x3D090,
+                address=addr_3,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x5, value=Op.CALLER)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa297e445dc76a67bf6fc17c444c1ec2c389ce53d"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x55730,
-                    address=0xFED08E44AE95ECE264BC94A1FC45AF8BC4EF4F1D,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x493E0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xeb09ff15547417853f6f4b240b8804769c37b0f1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x493E0,
-                    address=0xA297E445DC76A67BF6FC17C444C1EC2C389CE53D,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfed08e44ae95ece264bc94a1fc45af8bc4ef4f1d"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(
+        target: Account(storage={0: 1, 2: 0}),
+        addr: Account(storage={1: 1, 2: 1, 5: target}),
+        addr_2: Account(storage={2: 0}),
+        addr_3: Account(
             storage={
                 3: 1,
-                4: 0xFED08E44AE95ECE264BC94A1FC45AF8BC4EF4F1D,
+                4: addr,
                 7: 2,
-                330: 0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: addr_3,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
-        contract: Account(storage={0: 1}),
-        callee_2: Account(
-            storage={
-                1: 1,
-                2: 1,
-                5: 0xEB09FF15547417853F6F4B240B8804769C37B0F1,
-            },
-        ),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_ooge.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_ooge.py
index b0054c35f19..422ac1d273e 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_ooge.py
@@ -2,16 +2,15 @@
 CALL -> DELEGATE -> CALL -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcodecall_010_OOGEFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcodecall_010_ooge(
     pre: Alloc,
 ) -> None:
     """CALL -> DELEGATE -> CALL -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,86 +45,83 @@ def test_callcallcodecall_010_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0x69A0017A51AD556682F48B32235D0B61ABDF4DA4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335b558774699d81f685543cfbcde5c4e5407686"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0xB11130CF7EEF6D3F1552623D3506A5BBB07B12CE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x69a0017a51ad556682f48b32235d0b61abdf4da4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb11130cf7eef6d3f1552623d3506a5bbb07b12ce"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={1: 1, 11: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={1: 1, 11: 1}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_oogm_after.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_oogm_after.py
index 2e5dc826918..7c63c9cccec 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_oogm_after.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_oogm_after.py
@@ -2,16 +2,15 @@
 CALL -> (DELEGATE -> CALL -> CODE) OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcodecall_010_OOGMAfterFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcodecall_010_oogm_after(
     pre: Alloc,
 ) -> None:
     """CALL -> (DELEGATE -> CALL -> CODE) OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,82 +45,82 @@ def test_callcallcodecall_010_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x8D7270785422B63A97D83BADA6AAC80BEBC3A99D,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x1adae71ad3aeec97978e38be04da2a1773dfc506"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8d7270785422b63a97d83bada6aac80bebc3a99d"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0x1ADAE71AD3AEEC97978E38BE04DA2A1773DFC506,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe54ccfa5e33a84943997885f0ab9c19c587d8c4f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_oogm_before.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_oogm_before.py
index 5c27384b51b..7ee856213d8 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_oogm_before.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_oogm_before.py
@@ -2,16 +2,15 @@
 CALL -> DELEGATE -> OOG CALL -> CODE.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcodecall_010_OOGMBeforeFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcodecall_010_oogm_before(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """CALL -> DELEGATE -> OOG CALL -> CODE."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """CALL -> DELEGATE -> OOG CALL -> CODE ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,83 +45,82 @@ def test_callcallcodecall_010_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0x97367129E262C26FF9D41B4424EB9E460270F83F,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335b558774699d81f685543cfbcde5c4e5407686"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (KECCAK256 0x00 0x2fffff) [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x51a61d678ec27711369c527e5d42a9de66a5727f"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x51A61D678EC27711369C527E5D42A9DE66A5727F,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 )  [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x97367129e262c26ff9d41b4424eb9e460270f83f"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={11: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={11: 1}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_end.py
index 388645c86fd..3e51d28ac20 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcodecall_010_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcodecall_010_SuicideEndFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcodecall_010_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcodecall_010_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,88 +45,87 @@ def test_callcallcodecall_010_suicide_end(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2cac1d43f00e8b40b63426ab460c7e8717ee6455"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
+        address=Address(0x4353E77718BE108D4C149D88B34CACEDA42C5C66),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xd957e143ad2c011bc6a2b142795f1a9ba70d0680"),  # noqa: E501
+        address=Address(0xD957E143AD2C011BC6A2B142795F1A9BA70D0680),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(storage={1: 1, 2: 1}),
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={3: 1}),
+        target: Account(storage={0: 1, 1: 0, 3: 0}),
+        addr: Account(storage={1: 1, 2: 1}, balance=0x2540BE400, nonce=0),
+        addr_3: Account(storage={3: 1}),
+        sender: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_middle.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_middle.py
index a6ea1bab592..d4585d7fbae 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_middle.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_010_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcodecall_010_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcodecall_010_SuicideMiddleFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcodecall_010_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcodecall_010_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,85 +45,89 @@ def test_callcallcodecall_010_suicide_middle(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0xAC90BB4611B91D4C6292BD64E8656110822E01ED,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2cac1d43f00e8b40b63426ab460c7e8717ee6455"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
+        address=Address(0x4353E77718BE108D4C149D88B34CACEDA42C5C66),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0xAC90BB4611B91D4C6292BD64E8656110822E01ED,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (CALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xac90bb4611b91d4c6292bd64e8656110822e01ed"),  # noqa: E501
+        address=Address(0xAC90BB4611B91D4C6292BD64E8656110822E01ED),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(storage={1: 1}),
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}, balance=0xDE0B6B5FB6FE400),
+        addr: Account(storage={1: 1}, balance=0),
+        addr_3: Account(storage={2: 0, 3: 0}, balance=0x2540BE400),
+        sender: Account(storage={2: 0, 3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_abcb_recursive.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_abcb_recursive.py
index 5afa1f429f1..bd68d956080 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_abcb_recursive.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecall_abcb_recursive.py
@@ -2,16 +2,15 @@
 CALL -> DELEGATECALL -> CALL2 -> DELEGATECALL -> ...
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcodecall_ABCB_RECURSIVEFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcodecall_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """CALL -> DELEGATECALL -> CALL2 -> DELEGATECALL -> ..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """CALL -> DELEGATECALL -> CALL2 -> DELEGATECALL -> ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,78 +45,77 @@ def test_callcallcodecall_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x17D7840,
-                    address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x17D7840,
+                address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x039f3900e280b9c74d46e825b0b3814df4d705ac"),  # noqa: E501
+        address=Address(0x039F3900E280B9C74D46E825B0B3814DF4D705AC),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x7A120,
-                    address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xF4240,
+                address=0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x91a8703c1bef34c1e76e152c1f7fb8c336c3be24"),  # noqa: E501
+        address=Address(0xE0B280638526CECD3EC29969B517AEB3FCBB31FA),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xF4240,
-                    address=0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x7A120,
+                address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xe0b280638526cecd3ec29969b517aeb3fcbb31fa"),  # noqa: E501
+        address=Address(0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={1: 1}),
+        target: Account(storage={0: 1, 1: 0}),
+        addr: Account(storage={1: 1, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011.py
index 0c8a0b88648..2230e5e1316 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcodecallcode_011.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcodecallcode_011Filler.json
+state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcodecallcode_011(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcodecallcode_011."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,100 +45,94 @@ def test_callcallcodecallcode_011(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x3D090,
-                    address=0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6f50426aa1bbb3cbd865847823f377d918757c07"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x3D090,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7e63847aad8ca50fb7c04777dce6871a6bf8de0c"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x55730,
-                    address=0xFED08E44AE95ECE264BC94A1FC45AF8BC4EF4F1D,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x493E0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xeb09ff15547417853f6f4b240b8804769c37b0f1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x493E0,
-                    address=0x6F50426AA1BBB3CBD865847823F377D918757C07,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfed08e44ae95ece264bc94a1fc45af8bc4ef4f1d"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_2: Account(
+        target: Account(storage={0: 1, 2: 0, 3: 0, 4: 0}),
+        addr: Account(
             storage={
                 1: 1,
                 2: 1,
                 3: 1,
-                4: 0xEB09FF15547417853F6F4B240B8804769C37B0F1,
+                4: target,
                 7: 1,
-                330: 0xFED08E44AE95ECE264BC94A1FC45AF8BC4EF4F1D,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: addr,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_ooge.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_ooge.py
index 084f0e1e253..238a89aa72a 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_ooge.py
@@ -2,16 +2,15 @@
 CALL -> DELEGATE -> DELEGATE -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcodecallcode_011_OOGEFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcodecallcode_011_ooge(
     pre: Alloc,
 ) -> None:
     """CALL -> DELEGATE -> DELEGATE -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,85 +45,82 @@ def test_callcallcodecallcode_011_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0x69A0017A51AD556682F48B32235D0B61ABDF4DA4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335b558774699d81f685543cfbcde5c4e5407686"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3e423a7b1fba04d0c3f9423a3ae2a180d2878d5b"),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x3E423A7B1FBA04D0C3F9423A3AE2A180D2878D5B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x69a0017a51ad556682f48b32235d0b61abdf4da4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_2: Account(storage={1: 1, 11: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={1: 1, 11: 1}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_oogm_after.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_oogm_after.py
index 3319b5c65b4..23e7b6217ef 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_oogm_after.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_oogm_after.py
@@ -2,16 +2,15 @@
 CALL -> (DELEGATE -> DELEGATE -> CODE) OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcodecallcode_011_OOGMAfterFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcodecallcode_011_oogm_after(
     pre: Alloc,
 ) -> None:
     """CALL -> (DELEGATE -> DELEGATE -> CODE) OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,81 +45,81 @@ def test_callcallcodecallcode_011_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0xDA11FDF0CE02240C6B4711F56AFCD9763B44D3DC,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x1adae71ad3aeec97978e38be04da2a1773dfc506"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xda11fdf0ce02240c6b4711f56afcd9763b44d3dc"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0x1ADAE71AD3AEEC97978E38BE04DA2A1773DFC506,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe54ccfa5e33a84943997885f0ab9c19c587d8c4f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_oogm_before.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_oogm_before.py
index 728adc54749..5aecfe71aec 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_oogm_before.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_oogm_before.py
@@ -2,16 +2,15 @@
 CALL -> DELEGATE -> OOG DELEGATE -> CODE.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcodecallcode_011_OOGMBeforeFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcallcodecallcode_011_oogm_before(
     pre: Alloc,
 ) -> None:
     """CALL -> DELEGATE -> OOG DELEGATE -> CODE."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,82 +45,81 @@ def test_callcallcodecallcode_011_oogm_before(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x71E7E95D2DFE9F65B4522F2D3AA71FB33F49920C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x29f893b720e998ccd5971409fa9a8802822fdcbc"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC3500,
-                    address=0x29F893B720E998CCD5971409FA9A8802822FDCBC,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (KECCAK256 0x00 0x2fffff) [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335b558774699d81f685543cfbcde5c4e5407686"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x71e7e95d2dfe9f65b4522f2d3aa71fb33f49920c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (CALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC3500,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        callee: Account(storage={11: 1}),
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={11: 1}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_end.py
index 44cd580ee70..2f8cd246a17 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcodecallcode_011_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcodecallcode_011_SuicideEndFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcodecallcode_011_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcodecallcode_011_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,86 +45,87 @@ def test_callcallcodecallcode_011_suicide_end(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2cac1d43f00e8b40b63426ab460c7e8717ee6455"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
+        address=Address(0x4353E77718BE108D4C149D88B34CACEDA42C5C66),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xac521409e2fa9526bfe6b827805783d2e307c4ce"),  # noqa: E501
+        address=Address(0xAC521409E2FA9526BFE6B827805783D2E307C4CE),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(storage={1: 1, 2: 1, 3: 1}),
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}),
+        addr: Account(storage={1: 1, 2: 1, 3: 1}, balance=0x2540BE400),
+        addr_2: Account(storage={1: 0, 2: 0}),
+        addr_3: Account(storage={3: 0}),
+        sender: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_middle.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_middle.py
index 2d9c0a7e0a3..7b2dd08bcdd 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_middle.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_011_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcodecallcode_011_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcodecallcode_011_SuicideMiddleFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcodecallcode_011_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcodecallcode_011_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,84 +45,87 @@ def test_callcallcodecallcode_011_suicide_middle(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0x6A45EC7F08C71B222CFC454A9608BC278E87F0AB,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2cac1d43f00e8b40b63426ab460c7e8717ee6455"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4353e77718be108d4c149d88b34caceda42c5c66"),  # noqa: E501
+        address=Address(0x4353E77718BE108D4C149D88B34CACEDA42C5C66),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0x6A45EC7F08C71B222CFC454A9608BC278E87F0AB,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x6a45ec7f08c71b222cfc454a9608bc278e87f0ab"),  # noqa: E501
+        address=Address(0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x4353E77718BE108D4C149D88B34CACEDA42C5C66
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x6A45EC7F08C71B222CFC454A9608BC278E87F0AB),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(storage={1: 1}),
-        contract: Account(storage={0: 1}),
+        addr: Account(storage={1: 1}, balance=0),
+        addr_2: Account(storage={1: 0, 2: 0}, balance=0x2540BE400),
+        addr_3: Account(storage={3: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_abcb_recursive.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_abcb_recursive.py
index 45afd052213..f50349c2e61 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_abcb_recursive.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcallcodecallcode_abcb_recursive.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcallcodecallcode_abcb_recursive.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcallcodecallcode_ABCB_RECURSIVEFiller.json
+state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcallcodecallcode_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcallcodecallcode_abcb_recursive."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,77 +45,76 @@ def test_callcallcodecallcode_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x17D7840,
-                    address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x17D7840,
+                address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x039f3900e280b9c74d46e825b0b3814df4d705ac"),  # noqa: E501
+        address=Address(0x039F3900E280B9C74D46E825B0B3814DF4D705AC),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x7A120,
-                    address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xF4240,
+                address=0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa72f0e2f2fc5fd0878af9b8e4aaed09983670929"),  # noqa: E501
+        address=Address(0xE0B280638526CECD3EC29969B517AEB3FCBB31FA),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xF4240,
-                    address=0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x7A120,
+                address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xe0b280638526cecd3ec29969b517aeb3fcbb31fa"),  # noqa: E501
+        address=Address(0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee_1: Account(storage={1: 1}),
+        target: Account(storage={0: 1, 1: 0}),
+        addr: Account(storage={1: 1, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecall_10.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecall_10.py
index c44bc8fdbde..b689ffd226d 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecall_10.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecall_10.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecall_10.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecall_10Filler.json
+state_tests/stCallDelegateCodesHomestead/callcodecall_10Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecall_10Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCallDelegateCodesHomestead/callcodecall_10Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_callcodecall_10(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecall_10."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,84 +43,79 @@ def test_callcodecall_10(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
-            + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
-            + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
-            + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 2 1) (SSTORE 4 (CALLER))  (SSTORE 7 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
+        + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
+        + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
+        + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xcb4336321fac69281bd2902d427f4ef9e8584251"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x55730,
-                    address=0xFD0CC1F9A105E057B84065348C4C878DD79FA4BE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 250000 <contract:0x1000000000000000000000000000000000000002> 1 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x3D090,
+                address=addr_2,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd26e26d5a4796d450bfa296d70c05f02dbc1a4b9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x3D090,
-                    address=0xCB4336321FAC69281BD2902D427F4EF9E8584251,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfd0cc1f9a105e057b84065348c4c878dd79fa4be"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(
+        target: Account(storage={0: 1, 1: 1}),
+        addr_2: Account(
             storage={
                 2: 1,
-                4: 0xD26E26D5A4796D450BFA296D70C05F02DBC1A4B9,
+                4: target,
                 7: 1,
-                230: 0xCB4336321FAC69281BD2902D427F4EF9E8584251,
-                232: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                230: addr_2,
+                232: sender,
                 236: 64,
                 238: 34,
                 240: 10,
             },
         ),
-        contract: Account(storage={0: 1, 1: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecall_10_ooge.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecall_10_ooge.py
index 65a441ec5c5..4bd43c7abf0 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecall_10_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecall_10_ooge.py
@@ -2,16 +2,15 @@
 DELEGATE -> CALL -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecall_10_OOGEFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecall_10_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecall_10_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecall_10_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecall_10_ooge(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> CALL -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,66 +45,64 @@ def test_callcodecall_10_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x471072D55A5A95044C2326F0E94A6D8DF5B8089E,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 2 1) (KECCAK256 0x00 0x2fffff) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x766B2CF0691F51029181FC511395B7AB71353A88,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x471072d55a5a95044c2326f0e94a6d8df5b8089e"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x766b2cf0691f51029181fc511395b7ab71353a88"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecall_10_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecall_10_suicide_end.py
index 542400bdfce..10a12ffbe2a 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecall_10_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecall_10_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecall_10_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecall_10_SuicideEndFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecall_10_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecall_10_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,67 +45,66 @@ def test_callcodecall_10_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0xF741CFEE7B7FB1025DCCEF3DB5A3CBC8FFB776F8,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
-    )
-    callee = pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 2 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x703b936fd4d674f0ff5d6957f61097152f8781b8"),  # noqa: E501
+        address=Address(0x703B936FD4D674F0FF5D6957F61097152F8781B8),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0xF741CFEE7B7FB1025DCCEF3DB5A3CBC8FFB776F8,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 50000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xf741cfee7b7fb1025dccef3db5a3cbc8ffb776f8"),  # noqa: E501
+        address=Address(0xF741CFEE7B7FB1025DCCEF3DB5A3CBC8FFB776F8),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
-        callee: Account(storage={2: 1}),
+        target: Account(storage={0: 1, 1: 1}, balance=0xDE0B6B3A7640000),
+        addr: Account(storage={0: 0, 2: 0}),
+        addr_2: Account(storage={2: 1, 3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100.py
index ef40839b92f..ce2dc3a924e 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcall_100.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcall_100Filler.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcall_100Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcall_100Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcall_100Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcall_100(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcall_100."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,112 +45,100 @@ def test_callcodecallcall_100(
         gas_limit=30000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE))}  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x181b4ed322e192361633cc3c0a418f259ab0cf4b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0x5F6EACDE5A1E97F48C5DB4EE84FDF614F9DD9756,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x5, value=Op.CALLER)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 250000 <contract:0x1000000000000000000000000000000000000003> 2 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x3D090,
+                address=addr_3,
+                value=0x2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3c83297c6dcbc0520cd68714f85dc444469fb287"),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x3D090,
-                    address=0x181B4ED322E192361633CC3C0A418F259AB0CF4B,
-                    value=0x2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 300000 <contract:0x1000000000000000000000000000000000000002> 1 0 64 0 64 ) (SSTORE 5 (CALLER))}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=addr_2,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x5, value=Op.CALLER)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x5f6eacde5a1e97f48c5db4ee84fdf614f9dd9756"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x55730,
-                    address=0x3C83297C6DCBC0520CD68714F85DC444469FB287,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd26e26d5a4796d450bfa296d70c05f02dbc1a4b9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee: Account(
+        target: Account(storage={0: 1, 1: 1, 5: sender}),
+        addr_2: Account(storage={2: 1}),
+        addr_3: Account(
             storage={
                 3: 1,
-                4: 0x5F6EACDE5A1E97F48C5DB4EE84FDF614F9DD9756,
+                4: addr_2,
                 7: 2,
-                330: 0x181B4ED322E192361633CC3C0A418F259AB0CF4B,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: addr_3,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
-        callee_2: Account(storage={2: 1}),
-        contract: Account(
-            storage={
-                0: 1,
-                1: 1,
-                5: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-            },
-        ),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_ooge.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_ooge.py
index d8ad6c75b82..ecd3d7ab292 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_ooge.py
@@ -2,16 +2,15 @@
 DELEGATE -> CALL -> CALL -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcall_100_OOGEFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcall_100_ooge(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> CALL -> CALL -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,86 +45,83 @@ def test_callcodecallcall_100_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0xBBDCE54B3C571B853032CB3A637E8F5B81DBAF0D,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb11130cf7eef6d3f1552623d3506a5bbb07b12ce"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0xB11130CF7EEF6D3F1552623D3506A5BBB07B12CE,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbbdce54b3c571b853032cb3a637e8f5b81dbaf0d"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
-        callee_1: Account(storage={11: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={11: 1}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_oogm_after.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_oogm_after.py
index ef6544f3d8b..53369cc5493 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_oogm_after.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_oogm_after.py
@@ -2,16 +2,15 @@
 DELEGATE -> (CALL -> CALL -> CODE) OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcall_100_OOGMAfterFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcall_100_oogm_after(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> (CALL -> CALL -> CODE) OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,82 +45,82 @@ def test_callcodecallcall_100_oogm_after(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0xB5D1A486869D27225126C47727513F57D329A01A,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x74ecd5f6537b2b48ebbff8d66aee8eb8f98430a3"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8d7270785422b63a97d83bada6aac80bebc3a99d"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x8D7270785422B63A97D83BADA6AAC80BEBC3A99D,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb5d1a486869d27225126c47727513f57d329a01a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_oogm_before.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_oogm_before.py
index f433064de94..b2020ce01e8 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_oogm_before.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_oogm_before.py
@@ -2,16 +2,15 @@
 DELEGATE -> CALL -> OOG CALL -> CODE.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcall_100_OOGMBeforeFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcall_100_oogm_before(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """DELEGATE -> CALL -> OOG CALL -> CODE."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """DELEGATE -> CALL -> OOG CALL -> CODE ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,82 +45,82 @@ def test_callcodecallcall_100_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x471072D55A5A95044C2326F0E94A6D8DF5B8089E,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x4A780315E172DB6C0A08FE70FF4362B0E061B668,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (KECCAK256 0x00 0x2fffff) [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x471072d55a5a95044c2326f0e94a6d8df5b8089e"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x4a780315e172db6c0a08fe70ff4362b0e061b668"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_end.py
index 2a797cfe597..37c468d6f04 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcall_100_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcall_100_SuicideEndFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcall_100_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcall_100_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,88 +45,88 @@ def test_callcodecallcall_100_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
-    )
-    callee = pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x77b749ffff7ec61d31c79ed104f230a7959b2879"),  # noqa: E501
+        address=Address(0x77B749FFFF7EC61D31C79ED104F230A7959B2879),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xd957e143ad2c011bc6a2b142795f1a9ba70d0680"),  # noqa: E501
+        address=Address(0xD957E143AD2C011BC6A2B142795F1A9BA70D0680),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
-        callee: Account(storage={3: 1}),
-        callee_2: Account(storage={2: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 0}),
+        addr: Account(storage={1: 0, 3: 0}),
+        addr_2: Account(storage={2: 1}, balance=0),
+        addr_3: Account(storage={3: 1}),
+        sender: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_middle.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_middle.py
index bfd2fa9fe5c..2a652b6170e 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_middle.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_100_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcall_100_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcall_100_SuicideMiddleFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcall_100_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcall_100_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,84 +45,96 @@ def test_callcodecallcall_100_suicide_middle(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0xAC90BB4611B91D4C6292BD64E8656110822E01ED,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 1 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0xAC90BB4611B91D4C6292BD64E8656110822E01ED,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x77b749ffff7ec61d31c79ed104f230a7959b2879"),  # noqa: E501
+        address=Address(0x77B749FFFF7EC61D31C79ED104F230A7959B2879),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (CALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xac90bb4611b91d4c6292bd64e8656110822e01ed"),  # noqa: E501
+        address=Address(0xAC90BB4611B91D4C6292BD64E8656110822E01ED),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}, balance=0xDE0B6B5FB6FE400),
+        addr_2: Account(
+            storage={},
+            code=bytes.fromhex(
+                "732b30b637f37e3f5b8ca4ab846331d0779a3f4671ff604060006040600060007373b954ebc05bb0ff4a0f6a13a054d50ad158409961c350f160025500"  # noqa: E501
+            ),
+            balance=0,
+            nonce=0,
+        ),
+        addr_3: Account(storage={3: 0}, balance=0x2540BE400),
+        sender: Account(storage={1: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_abcb_recursive.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_abcb_recursive.py
index 354d416a88f..c9b8a4c7e21 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_abcb_recursive.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcall_abcb_recursive.py
@@ -2,16 +2,15 @@
 DELEGATECALL -> CALL1 -> CALL2 -> CALL1 -> ...
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcall_ABCB_RECURSIVEFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcall_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """DELEGATECALL -> CALL1 -> CALL2 -> CALL1 -> ..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """DELEGATECALL -> CALL1 -> CALL2 -> CALL1 -> ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,77 +45,78 @@ def test_callcodecallcall_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x17D7840,
-                    address=0x66C0D9F841A86866465E6385C3827BE02B580020,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x17D7840,
+                address=0x66C0D9F841A86866465E6385C3827BE02B580020,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x15600a91a7af84b8c85782714b3391ed5d73f9a0"),  # noqa: E501
+        address=Address(0x15600A91A7AF84B8C85782714B3391ED5D73F9A0),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xF4240,
-                    address=0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xF4240,
+                address=0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x66c0d9f841a86866465e6385c3827be02b580020"),  # noqa: E501
+        address=Address(0x66C0D9F841A86866465E6385C3827BE02B580020),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x7A120,
-                    address=0x66C0D9F841A86866465E6385C3827BE02B580020,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x7A120,
+                address=0x66C0D9F841A86866465E6385C3827BE02B580020,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x91a8703c1bef34c1e76e152c1f7fb8c336c3be24"),  # noqa: E501
+        address=Address(0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
+        sender: Account(storage={1: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101.py
index f44dc279d37..626025ac0f5 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcallcode_101.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcallcode_101Filler.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcallcode_101(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcallcode_101."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,113 +45,103 @@ def test_callcodecallcallcode_101(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0xAE5F44E50ECBF16179774393C643204383FDE833,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x5, value=Op.CALLER)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE))}  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x063f88dcf511e5686bc6b446d10538e665bf81a8"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SSTORE 6 (CALLER)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x3D090,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x6, value=Op.CALLER)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x181b4ed322e192361633cc3c0a418f259ab0cf4b"),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x3D090,
-                    address=0x181B4ED322E192361633CC3C0A418F259AB0CF4B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x6, value=Op.CALLER)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 300000 <contract:0x1000000000000000000000000000000000000002> 1 0 64 0 64 ) (SSTORE 5 (CALLER)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=addr_2,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x5, value=Op.CALLER)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xae5f44e50ecbf16179774393c643204383fde833"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x55730,
-                    address=0x63F88DCF511E5686BC6B446D10538E665BF81A8,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd26e26d5a4796d450bfa296d70c05f02dbc1a4b9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee_2: Account(
+        target: Account(storage={0: 1, 1: 1, 5: sender}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(
             storage={
                 2: 1,
                 3: 1,
-                4: 0xD26E26D5A4796D450BFA296D70C05F02DBC1A4B9,
-                6: 0xD26E26D5A4796D450BFA296D70C05F02DBC1A4B9,
+                4: target,
+                6: target,
                 7: 1,
-                330: 0xAE5F44E50ECBF16179774393C643204383FDE833,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: addr_2,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
-        contract: Account(
-            storage={
-                0: 1,
-                1: 1,
-                5: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-            },
-        ),
+        sender: Account(storage={1: 0, 3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_ooge.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_ooge.py
index bafe6bfe624..7cb6eac1873 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_ooge.py
@@ -2,16 +2,15 @@
 DELEGATE -> CALL -> DELEGATE -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcallcode_101_OOGEFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcallcode_101_ooge(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> CALL -> DELEGATE -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,85 +45,82 @@ def test_callcodecallcallcode_101_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0xBBDCE54B3C571B853032CB3A637E8F5B81DBAF0D,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3e423a7b1fba04d0c3f9423a3ae2a180d2878d5b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x3E423A7B1FBA04D0C3F9423A3AE2A180D2878D5B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbbdce54b3c571b853032cb3a637e8f5b81dbaf0d"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
-        callee_1: Account(storage={11: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={11: 1}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_oogm_after.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_oogm_after.py
index 7c7f091bc4a..74bb7a20506 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_oogm_after.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_oogm_after.py
@@ -2,16 +2,15 @@
 DELEGATE -> (CALL -> DELEGATE -> CODE) OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcallcode_101_OOGMAfterFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcallcode_101_oogm_after(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> (CALL -> DELEGATE -> CODE) OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,81 +45,81 @@ def test_callcodecallcallcode_101_oogm_after(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0xB5D1A486869D27225126C47727513F57D329A01A,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x74ecd5f6537b2b48ebbff8d66aee8eb8f98430a3"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0xDA11FDF0CE02240C6B4711F56AFCD9763B44D3DC,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb5d1a486869d27225126c47727513f57d329a01a"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xda11fdf0ce02240c6b4711f56afcd9763b44d3dc"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_oogm_before.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_oogm_before.py
index 474e612a411..1e145c9cbf4 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_oogm_before.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_oogm_before.py
@@ -2,16 +2,15 @@
 DELEGATE -> CALL -> OOG DELEGATE -> CODE.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcallcode_101_OOGMBeforeFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcallcode_101_oogm_before(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> CALL -> OOG DELEGATE -> CODE."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,81 +45,81 @@ def test_callcodecallcallcode_101_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x471072D55A5A95044C2326F0E94A6D8DF5B8089E,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (KECCAK256 0x00 0x2fffff)  [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2640fcba4a90a13a6438eed47fafbd5d59ecbc47"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x2640FCBA4A90A13A6438EED47FAFBD5D59ECBC47,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x471072d55a5a95044c2326f0e94a6d8df5b8089e"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_end.py
index ac2b0339f14..af4852ff563 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcallcode_101_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcallcode_101_SuicideEndFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcallcode_101_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcallcode_101_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,86 +45,87 @@ def test_callcodecallcallcode_101_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x77b749ffff7ec61d31c79ed104f230a7959b2879"),  # noqa: E501
+        address=Address(0x77B749FFFF7EC61D31C79ED104F230A7959B2879),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x77B749FFFF7EC61D31C79ED104F230A7959B2879)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xac521409e2fa9526bfe6b827805783d2e307c4ce"),  # noqa: E501
+        address=Address(0xAC521409E2FA9526BFE6B827805783D2E307C4CE),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
-        callee_2: Account(storage={2: 1, 3: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 0, 3: 0}),
+        addr: Account(storage={1: 0, 3: 0}),
+        addr_2: Account(storage={2: 1, 3: 1}, balance=0),
+        addr_3: Account(storage={3: 0}),
+        sender: Account(storage={1: 0, 2: 0, 3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_middle.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_middle.py
index 3c4cd811faf..5ff96f90136 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_middle.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_101_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcallcode_101_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcallcode_101_SuicideMiddleFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,13 @@ def test_callcodecallcallcode_101_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_callcodecallcallcode_101_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
+    contract_1 = Address(0x1000000000000000000000000000000000000001)
+    contract_2 = Address(0x1000000000000000000000000000000000000002)
+    contract_3 = Address(0x1000000000000000000000000000000000000003)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,89 +49,95 @@ def test_callcodecallcallcode_101_suicide_middle(
         gas_limit=30000000,
     )
 
-    # Source: LLL
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x1000000000000000000000000000000000000003),  # noqa: E501
+    )
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x1000000000000000000000000000000000000001,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x1000000000000000000000000000000000000001,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 1 ]] (CALL 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x1000000000000000000000000000000000000002,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0x1000000000000000000000000000000000000002,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000001"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000001),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x1000000000000000000000000000000000000000)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x1000000000000000000000000000000000000003,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x1000000000000000000000000000000000000000
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x1000000000000000000000000000000000000003,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000002"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000002),  # noqa: E501
     )
-    # Source: LLL
-    # {  (SSTORE 3 1) }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x1000000000000000000000000000000000000003"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        contract_0: Account(storage={0: 1, 1: 1}, balance=0xDE0B6B5FB6FE400),
+        contract_2: Account(
+            storage={},
+            code=bytes.fromhex(
+                "731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f460025500"  # noqa: E501
+            ),
+            balance=0,
+            nonce=0,
+        ),
+        contract_3: Account(storage={3: 0}, balance=0x2540BE400),
+        sender: Account(storage={1: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_abcb_recursive.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_abcb_recursive.py
index f9865109d6b..152c6ca4597 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_abcb_recursive.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcallcode_abcb_recursive.py
@@ -2,16 +2,15 @@
 DELEGATECALL -> CALL -> DELEGATECALL2 -> CALL -> ...
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcallcode_ABCB_RECURSIVEFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcallcode_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """DELEGATECALL -> CALL -> DELEGATECALL2 -> CALL -> ..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """DELEGATECALL -> CALL -> DELEGATECALL2 -> CALL -> ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,76 +45,77 @@ def test_callcodecallcallcode_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x17D7840,
-                    address=0x66C0D9F841A86866465E6385C3827BE02B580020,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x17D7840,
+                address=0x66C0D9F841A86866465E6385C3827BE02B580020,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x15600a91a7af84b8c85782714b3391ed5d73f9a0"),  # noqa: E501
+        address=Address(0x15600A91A7AF84B8C85782714B3391ED5D73F9A0),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xF4240,
-                    address=0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (CALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xF4240,
+                address=0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x66c0d9f841a86866465e6385c3827be02b580020"),  # noqa: E501
+        address=Address(0x66C0D9F841A86866465E6385C3827BE02B580020),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x7A120,
-                    address=0x66C0D9F841A86866465E6385C3827BE02B580020,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x7A120,
+                address=0x66C0D9F841A86866465E6385C3827BE02B580020,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa72f0e2f2fc5fd0878af9b8e4aaed09983670929"),  # noqa: E501
+        address=Address(0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
+        sender: Account(storage={1: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcode_11.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcode_11.py
index 685634efde6..bc8e57b4105 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcode_11.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcode_11.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcode_11.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcode_11Filler.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcode_11Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcode_11Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcode_11Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcode_11(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcode_11."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,82 +45,80 @@ def test_callcodecallcode_11(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x3D090,
-                    address=0xCB4336321FAC69281BD2902D427F4EF9E8584251,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 2 1) (SSTORE 4 (CALLER))  (SSTORE 7 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
+        + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
+        + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
+        + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2b0691cd58a1cf4628d642e9aca9ab04946e3ec9"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
-            + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
-            + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
-            + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 250000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x3D090,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xcb4336321fac69281bd2902d427f4ef9e8584251"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x55730,
-                    address=0x2B0691CD58A1CF4628D642E9ACA9AB04946E3EC9,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd26e26d5a4796d450bfa296d70c05f02dbc1a4b9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 1,
                 1: 1,
                 2: 1,
-                4: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-                230: 0xD26E26D5A4796D450BFA296D70C05F02DBC1A4B9,
-                232: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                4: sender,
+                230: target,
+                232: sender,
                 236: 64,
                 238: 34,
                 240: 10,
             },
         ),
+        addr: Account(storage={1: 0, 2: 0, 4: 0}),
+        addr_2: Account(storage={2: 0}),
+        sender: Account(storage={1: 0, 2: 0, 4: 0}, nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcode_11_ooge.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcode_11_ooge.py
index c222f205cf6..3211880c454 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcode_11_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcode_11_ooge.py
@@ -2,16 +2,15 @@
 DELEGATE -> DELEGATE -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcode_11_OOGEFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcode_11_ooge(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> DELEGATE -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,65 +45,63 @@ def test_callcodecallcode_11_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0xECB18A704984B0E051E46358D64EF7811F2945BA,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 2 1) (KECCAK256 0x00 0x2fffff) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) [[11]] 1}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x766b2cf0691f51029181fc511395b7ab71353a88"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x766B2CF0691F51029181FC511395B7AB71353A88,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xecb18a704984b0e051e46358d64ef7811f2945ba"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcode_11_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcode_11_suicide_end.py
index 0bdfa15e2b4..4675d8f476b 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcode_11_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcode_11_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcode_11_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcode_11_SuicideEndFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcode_11_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcode_11_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,65 +45,68 @@ def test_callcodecallcode_11_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 2 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x1cca6e93108ec94304ae5eb121d323e6c317fe7a"),  # noqa: E501
+        address=Address(0x703B936FD4D674F0FF5D6957F61097152F8781B8),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x1CCA6E93108EC94304AE5EB121D323E6C317FE7A,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x1CCA6E93108EC94304AE5EB121D323E6C317FE7A,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x703B936FD4D674F0FF5D6957F61097152F8781B8,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x703b936fd4d674f0ff5d6957f61097152f8781b8"),  # noqa: E501
+        address=Address(0x1CCA6E93108EC94304AE5EB121D323E6C317FE7A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 2: 1}),
+        target: Account(
+            storage={0: 1, 1: 1, 2: 1},
+            balance=0xDE0B6B3A7640000,
+        ),
+        addr: Account(storage={0: 0, 1: 0, 2: 0}),
+        addr_2: Account(storage={2: 0, 3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110.py
index 688e49e45a0..6ff719a5e6c 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcodecall_110.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcodecall_110Filler.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcodecall_110(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcodecall_110."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,113 +45,100 @@ def test_callcodecallcodecall_110(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x493E0,
-                    address=0x78B5BD809B0B6FE0B8E371F286D7AA6A3B930718,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x5, value=Op.CALLER)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x669e33b1aa30351139b73c3942acde1b09e75bcd"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x3D090,
-                    address=0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x6, value=Op.CALLER)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 250000 <contract:0x1000000000000000000000000000000000000003> 1 0 64 0 64 ) (SSTORE 6 (CALLER))}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x3D090,
+                address=addr_3,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x6, value=Op.CALLER)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x78b5bd809b0b6fe0b8e371f286d7aa6a3b930718"),  # noqa: E501
     )
-    callee_2 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SSTORE 5 (CALLER))}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x493E0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x5, value=Op.CALLER)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7e63847aad8ca50fb7c04777dce6871a6bf8de0c"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x55730,
-                    address=0x669E33B1AA30351139B73C3942ACDE1B09E75BCD,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd26e26d5a4796d450bfa296d70c05f02dbc1a4b9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        callee_2: Account(
+        target: Account(storage={0: 1, 1: 1, 2: 1, 5: sender, 6: sender}),
+        addr_3: Account(
             storage={
                 3: 1,
-                4: 0xD26E26D5A4796D450BFA296D70C05F02DBC1A4B9,
+                4: target,
                 7: 1,
-                330: 0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                330: addr_3,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
-        contract: Account(
-            storage={
-                0: 1,
-                1: 1,
-                2: 1,
-                5: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-                6: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-            },
-        ),
+        sender: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_ooge.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_ooge.py
index ee692928cd1..4ef197b46b0 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_ooge.py
@@ -2,16 +2,15 @@
 DELEGATE -> DELEGATE -> CALL -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcodecall_110_OOGEFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcodecall_110_ooge(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> DELEGATE -> CALL -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,84 +45,82 @@ def test_callcodecallcodecall_110_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x69A0017A51AD556682F48B32235D0B61ABDF4DA4,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0xB11130CF7EEF6D3F1552623D3506A5BBB07B12CE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x69a0017a51ad556682f48b32235d0b61abdf4da4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb11130cf7eef6d3f1552623d3506a5bbb07b12ce"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 11: 1}),
+        target: Account(storage={0: 1, 1: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_oogm_after.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_oogm_after.py
index c7a534f3127..1c133ee31b4 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_oogm_after.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_oogm_after.py
@@ -2,16 +2,15 @@
 DELEGATE -> (DELEGATE -> CALL -> CODE) OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcodecall_110_OOGMAfterFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcodecall_110_oogm_after(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> (DELEGATE -> CALL -> CODE) OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,81 +45,81 @@ def test_callcodecallcodecall_110_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x83B7D129B58AB5315B795F9A8D34294EC60C9D63,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x1adae71ad3aeec97978e38be04da2a1773dfc506"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x1ADAE71AD3AEEC97978E38BE04DA2A1773DFC506,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # { [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x74ecd5f6537b2b48ebbff8d66aee8eb8f98430a3"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x83b7d129b58ab5315b795f9a8d34294ec60c9d63"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_oogm_before.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_oogm_before.py
index 28d5b4713bf..fa9b7278710 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_oogm_before.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_oogm_before.py
@@ -2,16 +2,15 @@
 DELEGATE -> DELEGATE -> OOG CALL -> CODE.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcodecall_110_OOGMBeforeFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcodecall_110_oogm_before(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> DELEGATE -> OOG CALL -> CODE."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,81 +45,81 @@ def test_callcodecallcodecall_110_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x29F893B720E998CCD5971409FA9A8802822FDCBC,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x51A61D678EC27711369C527E5D42A9DE66A5727F,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (KECCAK256 0x00 0x2fffff) [[ 2 ]] (CALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x61A80,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x29f893b720e998ccd5971409fa9a8802822fdcbc"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x51a61d678ec27711369c527e5d42a9de66a5727f"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_end.py
index 4d022df156e..1c41be7b462 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcodecall_110_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcodecall_110_SuicideEndFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcodecall_110_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcodecall_110_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,86 +45,86 @@ def test_callcodecallcodecall_110_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2cac1d43f00e8b40b63426ab460c7e8717ee6455"),  # noqa: E501
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0xD957E143AD2C011BC6A2B142795F1A9BA70D0680,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xd957e143ad2c011bc6a2b142795f1a9ba70d0680"),  # noqa: E501
+        address=Address(0xD957E143AD2C011BC6A2B142795F1A9BA70D0680),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 2: 1}),
-        callee_1: Account(storage={3: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 1}, balance=0),
+        addr: Account(storage={1: 0, 3: 0}),
+        addr_2: Account(storage={2: 0, 3: 0}),
+        addr_3: Account(storage={3: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_middle.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_middle.py
index 846ffa1f6a1..30952c011df 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_middle.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_110_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcodecall_110_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcodecall_110_SuicideMiddleFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcodecall_110_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcodecall_110_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,83 +45,88 @@ def test_callcodecallcodecall_110_suicide_middle(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0xAC90BB4611B91D4C6292BD64E8656110822E01ED,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2cac1d43f00e8b40b63426ab460c7e8717ee6455"),  # noqa: E501
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0xAC90BB4611B91D4C6292BD64E8656110822E01ED,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (CALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xac90bb4611b91d4c6292bd64e8656110822e01ed"),  # noqa: E501
+        address=Address(0xAC90BB4611B91D4C6292BD64E8656110822E01ED),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}, balance=0xDE0B6B3A7640000),
+        addr: Account(storage={0: 0, 1: 0}),
+        addr_2: Account(storage={2: 0}, balance=0x2540BE400),
+        addr_3: Account(storage={3: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_abcb_recursive.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_abcb_recursive.py
index fbbe0581a0a..61c2398da8c 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_abcb_recursive.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecall_abcb_recursive.py
@@ -2,16 +2,15 @@
 DELEGATECALL -> DELEGATECALL2 -> CALL -> DELEGATECALL2 -> ...
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcodecall_ABCB_RECURSIVEFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcodecall_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """DELEGATECALL -> DELEGATECALL2 -> CALL -> DELEGATECALL2 -> ..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """DELEGATECALL -> DELEGATECALL2 -> CALL -> DELEGATECALL2 -> ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,76 +45,77 @@ def test_callcodecallcodecall_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x17D7840,
-                    address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x17D7840,
+                address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x15600a91a7af84b8c85782714b3391ed5d73f9a0"),  # noqa: E501
+        address=Address(0x15600A91A7AF84B8C85782714B3391ED5D73F9A0),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x7A120,
-                    address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xF4240,
+                address=0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x91a8703c1bef34c1e76e152c1f7fb8c336c3be24"),  # noqa: E501
+        address=Address(0xE0B280638526CECD3EC29969B517AEB3FCBB31FA),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xF4240,
-                    address=0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (CALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x7A120,
+                address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xe0b280638526cecd3ec29969b517aeb3fcbb31fa"),  # noqa: E501
+        address=Address(0x91A8703C1BEF34C1E76E152C1F7FB8C336C3BE24),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
+        sender: Account(storage={1: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111.py
index 4bda5bb8911..79b74221b0c 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcodecallcode_111.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcodecallcode_111Filler.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111Filler.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcodecallcode_111(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcodecallcode_111."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,103 +45,98 @@ def test_callcodecallcodecallcode_111(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x3D090,
-                    address=0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6f50426aa1bbb3cbd865847823f377d918757c07"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x3D090,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7e63847aad8ca50fb7c04777dce6871a6bf8de0c"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x55730,
-                    address=0xFED08E44AE95ECE264BC94A1FC45AF8BC4EF4F1D,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x493E0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd26e26d5a4796d450bfa296d70c05f02dbc1a4b9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x493E0,
-                    address=0x6F50426AA1BBB3CBD865847823F377D918757C07,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfed08e44ae95ece264bc94a1fc45af8bc4ef4f1d"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 1,
                 1: 1,
                 2: 1,
                 3: 1,
-                4: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-                330: 0xD26E26D5A4796D450BFA296D70C05F02DBC1A4B9,
-                332: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
+                4: sender,
+                330: target,
+                332: sender,
                 336: 64,
                 338: 39,
                 340: 10,
             },
         ),
+        sender: Account(storage={1: 0, 2: 0, 3: 0, 4: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_ooge.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_ooge.py
index d355ffa6c91..ee9b0bcea8a 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_ooge.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_ooge.py
@@ -2,16 +2,15 @@
 DELEGATE -> DELEGATE -> DELEGATE -> CODE OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcodecallcode_111_OOGEFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcodecallcode_111_ooge(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> DELEGATE -> DELEGATE -> CODE OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,83 +45,81 @@ def test_callcodecallcodecallcode_111_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x69A0017A51AD556682F48B32235D0B61ABDF4DA4,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (KECCAK256 0x00 0x2fffff) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dd747f92062bb53bb8e867ec2902792435f1748"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0x1DD747F92062BB53BB8E867EC2902792435F1748,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3e423a7b1fba04d0c3f9423a3ae2a180d2878d5b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x3E423A7B1FBA04D0C3F9423A3AE2A180D2878D5B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x69a0017a51ad556682f48b32235d0b61abdf4da4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 11: 1}),
+        target: Account(storage={0: 1, 1: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_oogm_after.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_oogm_after.py
index a6958af0f9b..6601196e797 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_oogm_after.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_oogm_after.py
@@ -2,16 +2,15 @@
 DELEGATE -> (DELEGATE -> DELEGATE -> CODE) OOG.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcodecallcode_111_OOGMAfterFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcodecallcode_111_oogm_after(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> (DELEGATE -> DELEGATE -> CODE) OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,80 +45,80 @@ def test_callcodecallcodecallcode_111_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0xDA11FDF0CE02240C6B4711F56AFCD9763B44D3DC,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x1adae71ad3aeec97978e38be04da2a1773dfc506"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x1ADAE71AD3AEEC97978E38BE04DA2A1773DFC506,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x74ecd5f6537b2b48ebbff8d66aee8eb8f98430a3"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xda11fdf0ce02240c6b4711f56afcd9763b44d3dc"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={11: 1}),
+        target: Account(storage={0: 0, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_oogm_before.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_oogm_before.py
index 3a4a9c733ec..a78bec5f2aa 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_oogm_before.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_oogm_before.py
@@ -2,16 +2,15 @@
 DELEGATE -> DELEGATE -> OOG DELEGATE -> CODE.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcodecallcode_111_OOGMBeforeFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_callcodecallcodecallcode_111_oogm_before(
     pre: Alloc,
 ) -> None:
     """DELEGATE -> DELEGATE -> OOG DELEGATE -> CODE."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,80 +45,80 @@ def test_callcodecallcodecallcode_111_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC3500,
-                    address=0x29F893B720E998CCD5971409FA9A8802822FDCBC,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x0e7163a4a90126c4a13e52f48e84c74600e844da"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0x71E7E95D2DFE9F65B4522F2D3AA71FB33F49920C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (KECCAK256 0x00 0x2fffff) [[ 2 ]] (DELEGATECALL 400000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x61A80,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x29f893b720e998ccd5971409fa9a8802822fdcbc"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x61A80,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) [[11]] 1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x71e7e95d2dfe9f65b4522f2d3aa71fb33f49920c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC3500,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 11: 1}),
+        target: Account(storage={0: 1, 11: 1}),
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr_3: Account(storage={}),
+        sender: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_end.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_end.py
index c176834770d..881e54676f3 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_end.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcodecallcode_111_suicide_end.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcodecallcode_111_SuicideEndFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcodecallcode_111_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcodecallcode_111_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,84 +45,85 @@ def test_callcodecallcodecallcode_111_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2cac1d43f00e8b40b63426ab460c7e8717ee6455"),  # noqa: E501
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0xAC521409E2FA9526BFE6B827805783D2E307C4CE,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xac521409e2fa9526bfe6b827805783d2e307c4ce"),  # noqa: E501
+        address=Address(0xAC521409E2FA9526BFE6B827805783D2E307C4CE),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1, 2: 1, 3: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 1, 3: 1}, balance=0),
+        addr: Account(storage={1: 0, 3: 0}),
+        addr_2: Account(storage={2: 0, 3: 0}),
+        addr_3: Account(storage={3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_middle.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_middle.py
index 8a8209375bd..7b62d827fbf 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_middle.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_111_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcodecallcodecallcode_111_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcodecallcode_111_SuicideMiddleFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcodecallcode_111_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcodecallcodecallcode_111_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,82 +45,87 @@ def test_callcodecallcodecallcode_111_suicide_middle(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x124b38fa011c9d36b7fe193dc636813a2f8bdaa7"),  # noqa: E501
+        address=Address(0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0x124B38FA011C9D36B7FE193DC636813A2F8BDAA7,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0x124B38FA011C9D36B7FE193DC636813A2F8BDAA7,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2cac1d43f00e8b40b63426ab460c7e8717ee6455"),  # noqa: E501
+        address=Address(0x2CAC1D43F00E8B40B63426AB460C7E8717EE6455),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) [[ 2 ]] (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x73B954EBC05BB0FF4A0F6A13A054D50AD1584099,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x73b954ebc05bb0ff4a0f6a13a054d50ad1584099"),  # noqa: E501
+        address=Address(0x124B38FA011C9D36B7FE193DC636813A2F8BDAA7),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}, balance=0xDE0B6B3A7640000),
+        addr: Account(storage={0: 0, 1: 0, 2: 0}, balance=0x2540BE400),
+        addr_2: Account(storage={2: 0, 3: 0}, balance=0x2540BE400),
+        addr_3: Account(storage={3: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_abcb_recursive.py b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_abcb_recursive.py
index d8180163734..4b7748b2981 100644
--- a/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_abcb_recursive.py
+++ b/tests/ported_static/stCallDelegateCodesHomestead/test_callcodecallcodecallcode_abcb_recursive.py
@@ -2,16 +2,15 @@
 DELEGATECALL -> DELEGATECALL2 -> DELEGATECALl3 -> DELEGATECALL2 -> ...
 
 Ported from:
-tests/static/state_tests/stCallDelegateCodesHomestead
-callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
+state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcodecallcodecallcode_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """DELEGATECALL -> DELEGATECALL2 -> DELEGATECALl3 -> DELEGATECALL2..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """DELEGATECALL -> DELEGATECALL2 -> DELEGATECALl3 -> DELEGATECALL2 -> ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,75 +45,76 @@ def test_callcodecallcodecallcode_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x17D7840,
-                    address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x17D7840,
+                address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x15600a91a7af84b8c85782714b3391ed5d73f9a0"),  # noqa: E501
+        address=Address(0x15600A91A7AF84B8C85782714B3391ED5D73F9A0),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.DELEGATECALL(
-                    gas=0x7A120,
-                    address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 1 ]] (DELEGATECALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xF4240,
+                address=0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa72f0e2f2fc5fd0878af9b8e4aaed09983670929"),  # noqa: E501
+        address=Address(0xE0B280638526CECD3EC29969B517AEB3FCBB31FA),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xF4240,
-                    address=0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 2 ]] (DELEGATECALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.DELEGATECALL(
+                gas=0x7A120,
+                address=0xE0B280638526CECD3EC29969B517AEB3FCBB31FA,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xe0b280638526cecd3ec29969b517aeb3fcbb31fa"),  # noqa: E501
+        address=Address(0xA72F0E2F2FC5FD0878AF9B8E4AAED09983670929),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
+        sender: Account(storage={1: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stChainId/__init__.py b/tests/ported_static/stChainId/__init__.py
deleted file mode 100644
index 4f873207fe0..00000000000
--- a/tests/ported_static/stChainId/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from stChainId."""
diff --git a/tests/ported_static/stChainId/test_chain_id.py b/tests/ported_static/stChainId/test_chain_id.py
deleted file mode 100644
index b04babc6fea..00000000000
--- a/tests/ported_static/stChainId/test_chain_id.py
+++ /dev/null
@@ -1,67 +0,0 @@
-"""
-Test ported from static filler.
-
-Ported from:
-tests/static/state_tests/stChainId/chainIdFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stChainId/chainIdFiller.json"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
-def test_chain_id(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x897B12D02D588D8A4FE16FF831CBD4459C6F62F8C845B0CCDD31CAF068C84A26
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000000,
-    )
-
-    # Source: LLL
-    # { [[ 1 ]] (CHAINID) }
-    contract = pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=Op.CHAINID) + Op.STOP,
-        nonce=0,
-        address=Address("0x103e5381df5048a8827bb6ff5d2860ed88635718"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        gas_limit=100000,
-    )
-
-    post = {
-        contract: Account(storage={1: 1}),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stChainId/test_chain_id_gas_cost.py b/tests/ported_static/stChainId/test_chain_id_gas_cost.py
deleted file mode 100644
index 562190fffb2..00000000000
--- a/tests/ported_static/stChainId/test_chain_id_gas_cost.py
+++ /dev/null
@@ -1,79 +0,0 @@
-"""
-Test ported from static filler.
-
-Ported from:
-tests/static/state_tests/stChainId/chainIdGasCostFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stChainId/chainIdGasCostFiller.json"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
-def test_chain_id_gas_cost(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x897B12D02D588D8A4FE16FF831CBD4459C6F62F8C845B0CCDD31CAF068C84A26
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000000,
-    )
-
-    # Source: asm
-    # (asm GAS CHAINID GAS SWAP1 POP SWAP1 SUB 2 SWAP1 SUB 0x01 SSTORE)
-    contract = pre.deploy_contract(
-        code=(
-            Op.GAS
-            + Op.CHAINID
-            + Op.GAS
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.SUB
-            + Op.PUSH1[0x2]
-            + Op.SWAP1
-            + Op.SSTORE(key=0x1, value=Op.SUB)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x53f64910db5c1bbb54ccb272c0e28bd47249ba9b"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        gas_limit=100000,
-    )
-
-    post = {
-        contract: Account(storage={1: 2}),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCodeCopyTest/__init__.py b/tests/ported_static/stCodeCopyTest/__init__.py
index 60118afd1cd..fad8ae324c1 100644
--- a/tests/ported_static/stCodeCopyTest/__init__.py
+++ b/tests/ported_static/stCodeCopyTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stCodeCopyTest."""
+"""Ported static tests: stCodeCopyTest."""  # noqa: N999
diff --git a/tests/ported_static/stCodeCopyTest/test_ext_code_copy_target_range_longer_than_code_tests.py b/tests/ported_static/stCodeCopyTest/test_ext_code_copy_target_range_longer_than_code_tests.py
index 6df5090a7f3..714f03d6c34 100644
--- a/tests/ported_static/stCodeCopyTest/test_ext_code_copy_target_range_longer_than_code_tests.py
+++ b/tests/ported_static/stCodeCopyTest/test_ext_code_copy_target_range_longer_than_code_tests.py
@@ -1,9 +1,8 @@
 """
-Uses EXTCODECOPY to copy 32 bytes of code into a 64 byte range of memory...
+Uses EXTCODECOPY to copy 32 bytes of code into a 64 byte range of...
 
 Ported from:
-tests/static/state_tests/stCodeCopyTest
-ExtCodeCopyTargetRangeLongerThanCodeTestsFiller.json
+state_tests/stCodeCopyTest/ExtCodeCopyTargetRangeLongerThanCodeTestsFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCodeCopyTest/ExtCodeCopyTargetRangeLongerThanCodeTestsFiller.json",  # noqa: E501
+        "state_tests/stCodeCopyTest/ExtCodeCopyTargetRangeLongerThanCodeTestsFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,7 +34,7 @@ def test_ext_code_copy_target_range_longer_than_code_tests(
     pre: Alloc,
 ) -> None:
     """Uses EXTCODECOPY to copy 32 bytes of code into a 64 byte range of..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
     )
@@ -49,52 +49,48 @@ def test_ext_code_copy_target_range_longer_than_code_tests(
     )
 
     pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
-    # { (MSTORE 32 0x1234) (EXTCODECOPY <contract:0xeeef5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 64) [[0]] (MLOAD 0) [[1]] (MLOAD 32) (MSTORE 96 0x5678) (EXTCODECOPY <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> 64 0 64) [[2]] (MLOAD 64) [[3]] (MLOAD 96)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x20, value=0x1234)
-            + Op.EXTCODECOPY(
-                address=0x7AC02E797F450C7EA62753383F618E1903CD6BBA,
-                dest_offset=0x0,
-                offset=0x0,
-                size=0x40,
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
-            + Op.MSTORE(offset=0x60, value=0x5678)
-            + Op.EXTCODECOPY(
-                address=0x4768B5E50B0EBE91AE38D84A47E3179E615F9C40,
-                dest_offset=0x40,
-                offset=0x0,
-                size=0x40,
-            )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x40))
-            + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x60))
-            + Op.STOP
-        ),
-        balance=7000,
-        nonce=0,
-        address=Address("0x48d8f710ab8cb48f77b602d24696926e31787a17"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x1122334455667788991011121314151617181920212223242526272829303132
+    addr = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
             "1122334455667788991011121314151617181920212223242526272829303132"
         ),
-        address=Address("0x7ac02e797f450c7ea62753383f618e1903cd6bba"),  # noqa: E501
+        nonce=1,
+        address=Address(0x7AC02E797F450C7EA62753383F618E1903CD6BBA),  # noqa: E501
+    )
+    # Source: lll
+    # { (MSTORE 32 0x1234) (EXTCODECOPY <contract:0xeeef5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 64) [[0]] (MLOAD 0) [[1]] (MLOAD 32) (MSTORE 96 0x5678) (EXTCODECOPY <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> 64 0 64) [[2]] (MLOAD 64) [[3]] (MLOAD 96)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x20, value=0x1234)
+        + Op.EXTCODECOPY(address=addr, dest_offset=0x0, offset=0x0, size=0x40)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
+        + Op.MSTORE(offset=0x60, value=0x5678)
+        + Op.EXTCODECOPY(
+            address=sender, dest_offset=0x40, offset=0x0, size=0x40
+        )
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x40))
+        + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x60))
+        + Op.STOP,
+        balance=7000,
+        nonce=0,
+        address=Address(0x48D8F710AB8CB48F77B602D24696926E31787A17),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x1122334455667788991011121314151617181920212223242526272829303132,  # noqa: E501
+                1: 0,
+                2: 0,
+                3: 0,
             },
         ),
     }
diff --git a/tests/ported_static/stCodeCopyTest/test_ext_code_copy_tests_paris.py b/tests/ported_static/stCodeCopyTest/test_ext_code_copy_tests_paris.py
index 31e89d74237..a3324ff89b2 100644
--- a/tests/ported_static/stCodeCopyTest/test_ext_code_copy_tests_paris.py
+++ b/tests/ported_static/stCodeCopyTest/test_ext_code_copy_tests_paris.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_ext_code_copy_tests_paris.
 
 Ported from:
-tests/static/state_tests/stCodeCopyTest/ExtCodeCopyTestsParisFiller.json
+state_tests/stCodeCopyTest/ExtCodeCopyTestsParisFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCodeCopyTest/ExtCodeCopyTestsParisFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCodeCopyTest/ExtCodeCopyTestsParisFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,13 +31,15 @@ def test_ext_code_copy_tests_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_ext_code_copy_tests_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xCCCF5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_2 = Address(0xDDDF5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_3 = Address(0xEEEF5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
-    callee = Address("0xcccf5374fce5edbc8e2a8697c15331677e6ebf0b")
-    callee_1 = Address("0xdddf5374fce5edbc8e2a8697c15331677e6ebf0b")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -50,74 +51,71 @@ def test_ext_code_copy_tests_paris(
     )
 
     pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
-    # { (EXTCODECOPY 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 1 10 2) [[2]] (MLOAD 0) (EXTCODECOPY 0xcccf5374fce5edbc8e2a8697c15331677e6ebf0b 1 10 2) [[3]] (MLOAD 0) (EXTCODECOPY 0xdddf5374fce5edbc8e2a8697c15331677e6ebf0b 1 10 2) [[4]] (MLOAD 0) (EXTCODECOPY 0xeeef5374fce5edbc8e2a8697c15331677e6ebf0b 1 10 2) [[5]] (MLOAD 0) (EXTCODECOPY 0xeeef5374fce5edbc8e2a8697c15331677e6ebf0b 1 10 200) [[6]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.EXTCODECOPY(
-                address=0xBBBF5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                dest_offset=0x1,
-                offset=0xA,
-                size=0x2,
-            )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
-            + Op.EXTCODECOPY(
-                address=0xCCCF5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                dest_offset=0x1,
-                offset=0xA,
-                size=0x2,
-            )
-            + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x0))
-            + Op.EXTCODECOPY(
-                address=0xDDDF5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                dest_offset=0x1,
-                offset=0xA,
-                size=0x2,
-            )
-            + Op.SSTORE(key=0x4, value=Op.MLOAD(offset=0x0))
-            + Op.EXTCODECOPY(
-                address=0xEEEF5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                dest_offset=0x1,
-                offset=0xA,
-                size=0x2,
-            )
-            + Op.SSTORE(key=0x5, value=Op.MLOAD(offset=0x0))
-            + Op.EXTCODECOPY(
-                address=0xEEEF5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                dest_offset=0x1,
-                offset=0xA,
-                size=0xC8,
-            )
-            + Op.SSTORE(key=0x6, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        balance=7000,
-        nonce=0,
-        address=Address("0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-    pre[callee] = Account(balance=10, nonce=0)
-    pre[callee_1] = Account(balance=0, nonce=1)
-    # Source: raw bytecode
-    pre.deploy_contract(
+    pre[contract_1] = Account(balance=10)
+    pre[contract_2] = Account(balance=0, nonce=1)
+    # Source: raw
+    # 0x1122334455667788991011121314151617181920212223242526272829303132
+    contract_3 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
             "1122334455667788991011121314151617181920212223242526272829303132"
         ),
-        address=Address("0xeeef5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        nonce=1,
+        address=Address(0xEEEF5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
+    )
+    # Source: lll
+    # { (EXTCODECOPY 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 1 10 2) [[2]] (MLOAD 0) (EXTCODECOPY 0xcccf5374fce5edbc8e2a8697c15331677e6ebf0b 1 10 2) [[3]] (MLOAD 0) (EXTCODECOPY 0xdddf5374fce5edbc8e2a8697c15331677e6ebf0b 1 10 2) [[4]] (MLOAD 0) (EXTCODECOPY 0xeeef5374fce5edbc8e2a8697c15331677e6ebf0b 1 10 2) [[5]] (MLOAD 0) (EXTCODECOPY 0xeeef5374fce5edbc8e2a8697c15331677e6ebf0b 1 10 200) [[6]] (MLOAD 0)}  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.EXTCODECOPY(
+            address=0xBBBF5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+            dest_offset=0x1,
+            offset=0xA,
+            size=0x2,
+        )
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
+        + Op.EXTCODECOPY(
+            address=contract_1, dest_offset=0x1, offset=0xA, size=0x2
+        )
+        + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x0))
+        + Op.EXTCODECOPY(
+            address=contract_2, dest_offset=0x1, offset=0xA, size=0x2
+        )
+        + Op.SSTORE(key=0x4, value=Op.MLOAD(offset=0x0))
+        + Op.EXTCODECOPY(
+            address=contract_3, dest_offset=0x1, offset=0xA, size=0x2
+        )
+        + Op.SSTORE(key=0x5, value=Op.MLOAD(offset=0x0))
+        + Op.EXTCODECOPY(
+            address=contract_3, dest_offset=0x1, offset=0xA, size=0xC8
+        )
+        + Op.SSTORE(key=0x6, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        balance=7000,
+        nonce=0,
+        address=Address(0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=400000,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
+                2: 0,
+                3: 0,
+                4: 0,
                 5: 0x11120000000000000000000000000000000000000000000000000000000000,  # noqa: E501
                 6: 0x11121314151617181920212223242526272829303132000000000000000000,  # noqa: E501
             },
         ),
+        Address(
+            0xBBBF5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        ): Account.NONEXISTENT,
+        contract_1: Account(balance=10),
+        contract_2: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCodeSizeLimit/__init__.py b/tests/ported_static/stCodeSizeLimit/__init__.py
index 84b8037b9e0..c24f9f4faff 100644
--- a/tests/ported_static/stCodeSizeLimit/__init__.py
+++ b/tests/ported_static/stCodeSizeLimit/__init__.py
@@ -1 +1 @@
-"""Tests ported from stCodeSizeLimit."""
+"""Ported static tests: stCodeSizeLimit."""  # noqa: N999
diff --git a/tests/ported_static/stCodeSizeLimit/test_codesize_init.py b/tests/ported_static/stCodeSizeLimit/test_codesize_init.py
index 5c1a49c76ca..fbffc7f5b40 100644
--- a/tests/ported_static/stCodeSizeLimit/test_codesize_init.py
+++ b/tests/ported_static/stCodeSizeLimit/test_codesize_init.py
@@ -1,39 +1,37 @@
 """
-Test ported from static filler.
+Test_codesize_init.
 
 Ported from:
-tests/static/state_tests/stCodeSizeLimit/codesizeInitFiller.json
+state_tests/stCodeSizeLimit/codesizeInitFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCodeSizeLimit/codesizeInitFiller.json"],
+    ["state_tests/stCodeSizeLimit/codesizeInitFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_codesize_init(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_codesize_init."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -44,18 +42,18 @@ def test_codesize_init(
         gas_limit=20000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex("38600155303b60025500"),
+        data=Op.SSTORE(key=0x1, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x2, value=Op.EXTCODESIZE(address=Op.ADDRESS))
+        + Op.STOP,
         gas_limit=15000000,
     )
 
     post = {
-        Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-            storage={1: 10},
+        compute_create_address(address=sender, nonce=0): Account(
+            storage={1: 10, 2: 0}, balance=0
         ),
     }
 
diff --git a/tests/ported_static/stCodeSizeLimit/test_codesize_oog_invalid_size.py b/tests/ported_static/stCodeSizeLimit/test_codesize_oog_invalid_size.py
index 8722a785cd4..f7781ee3d97 100644
--- a/tests/ported_static/stCodeSizeLimit/test_codesize_oog_invalid_size.py
+++ b/tests/ported_static/stCodeSizeLimit/test_codesize_oog_invalid_size.py
@@ -1,50 +1,60 @@
 """
-Test ported from static filler.
+Test_codesize_oog_invalid_size.
 
 Ported from:
-tests/static/state_tests/stCodeSizeLimit/codesizeOOGInvalidSizeFiller.json
+state_tests/stCodeSizeLimit/codesizeOOGInvalidSizeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCodeSizeLimit/codesizeOOGInvalidSizeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCodeSizeLimit/codesizeOOGInvalidSizeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.valid_before("EIP7954")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "61600d600d60003961600d6000f3",
-        "616001600d6000396160016000f3",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
-@pytest.mark.pre_alloc_mutable
 def test_codesize_oog_invalid_size(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_codesize_oog_invalid_size."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,18 +65,25 @@ def test_codesize_oog_invalid_size(
         gas_limit=20000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.CODECOPY(dest_offset=0x0, offset=0xD, size=0x600D)
+        + Op.RETURN(offset=0x0, size=0x600D),
+        Op.CODECOPY(dest_offset=0x0, offset=0xD, size=0x6001)
+        + Op.RETURN(offset=0x0, size=0x6001),
+    ]
+    tx_gas = [15000000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=15000000,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=sender, nonce=0): Account.NONEXISTENT
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCodeSizeLimit/test_codesize_valid.py b/tests/ported_static/stCodeSizeLimit/test_codesize_valid.py
index ce52d5c7681..b0a4a1fd5ff 100644
--- a/tests/ported_static/stCodeSizeLimit/test_codesize_valid.py
+++ b/tests/ported_static/stCodeSizeLimit/test_codesize_valid.py
@@ -1,49 +1,59 @@
 """
-Test ported from static filler.
+Test_codesize_valid.
 
 Ported from:
-tests/static/state_tests/stCodeSizeLimit/codesizeValidFiller.json
+state_tests/stCodeSizeLimit/codesizeValidFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCodeSizeLimit/codesizeValidFiller.json"],
+    ["state_tests/stCodeSizeLimit/codesizeValidFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        ("615ed5600d600039615ed56000f3", {}),
-        ("616000600d6000396160006000f3", {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
-@pytest.mark.pre_alloc_mutable
 def test_codesize_valid(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_codesize_valid."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -54,18 +64,25 @@ def test_codesize_valid(
         gas_limit=20000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.CODECOPY(dest_offset=0x0, offset=0xD, size=0x5ED5)
+        + Op.RETURN(offset=0x0, size=0x5ED5),
+        Op.CODECOPY(dest_offset=0x0, offset=0xD, size=0x6000)
+        + Op.RETURN(offset=0x0, size=0x6000),
+    ]
+    tx_gas = [15000000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=15000000,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        compute_create_address(address=sender, nonce=0): Account(balance=1)
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCodeSizeLimit/test_create2_code_size_limit.py b/tests/ported_static/stCodeSizeLimit/test_create2_code_size_limit.py
index 1f6c86b658c..b3bf7840879 100644
--- a/tests/ported_static/stCodeSizeLimit/test_create2_code_size_limit.py
+++ b/tests/ported_static/stCodeSizeLimit/test_create2_code_size_limit.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_create2_code_size_limit.
 
 Ported from:
-tests/static/state_tests/stCodeSizeLimit/create2CodeSizeLimitFiller.yml
+state_tests/stCodeSizeLimit/create2CodeSizeLimitFiller.yml
 """
 
 import pytest
@@ -11,10 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,45 +27,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCodeSizeLimit/create2CodeSizeLimitFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stCodeSizeLimit/create2CodeSizeLimitFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.valid_before("EIP7954")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "6160016000f3",
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "6160006000f3",
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 0x81C305016AB9CA56033A07CC37E7A30FC3E079AC,
-                        1: 1,
-                    }
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="invalid",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2_code_size_limit(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_create2_code_size_limit."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -75,40 +74,71 @@ def test_create2_code_size_limit(
     )
 
     pre[sender] = Account(balance=0xBEBC200)
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   mstore(0, calldataload(0))
     #   sstore(0, create2(0, 0, calldatasize(), 0))
     #   sstore(1, 1)
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE2(
-                    value=Op.DUP1,
-                    offset=Op.DUP2,
-                    size=Op.CALLDATASIZE,
-                    salt=0x0,
-                ),
-            )
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE2(
+                value=Op.DUP1, offset=Op.DUP2, size=Op.CALLDATASIZE, salt=0x0
+            ),
+        )
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
+                    storage={
+                        0: 0x81C305016AB9CA56033A07CC37E7A30FC3E079AC,
+                        1: 1,
+                    },
+                ),
+                Address(0x81C305016AB9CA56033A07CC37E7A30FC3E079AC): Account(
+                    storage={}, balance=0, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(storage={0: 0, 1: 1}),
+                Address(
+                    0x81C305016AB9CA56033A07CC37E7A30FC3E079AC
+                ): Account.NONEXISTENT,
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("6160006000f3"),
+        Bytes("6160016000f3"),
+    ]
+    tx_gas = [15000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=15000000,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCodeSizeLimit/test_create_code_size_limit.py b/tests/ported_static/stCodeSizeLimit/test_create_code_size_limit.py
index 6aa66e77e51..84ab61dc09c 100644
--- a/tests/ported_static/stCodeSizeLimit/test_create_code_size_limit.py
+++ b/tests/ported_static/stCodeSizeLimit/test_create_code_size_limit.py
@@ -1,19 +1,24 @@
 """
-Test ported from static filler.
+Test_create_code_size_limit.
 
 Ported from:
-tests/static/state_tests/stCodeSizeLimit/createCodeSizeLimitFiller.yml
+state_tests/stCodeSizeLimit/createCodeSizeLimitFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,46 +27,40 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCodeSizeLimit/createCodeSizeLimitFiller.yml"],
+    ["state_tests/stCodeSizeLimit/createCodeSizeLimitFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.valid_before("EIP7954")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "6160016000f3",
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "6160006000f3",
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 0xF1ECF98489FA9ED60A664FC4998DB699CFA39D40,
-                        1: 1,
-                    }
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="invalid",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_code_size_limit(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_code_size_limit."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xBEBC200)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -72,38 +71,68 @@ def test_create_code_size_limit(
         gas_limit=20000000,
     )
 
-    pre[sender] = Account(balance=0xBEBC200)
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   mstore(0, calldataload(0))
     #   sstore(0, create(0, 0, calldatasize()))
     #   sstore(1, 1)
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(
-                    value=Op.DUP1, offset=0x0, size=Op.CALLDATASIZE
-                ),
-            )
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE(value=Op.DUP1, offset=0x0, size=Op.CALLDATASIZE),
+        )
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
+                    storage={
+                        0: compute_create_address(address=contract_0, nonce=0),
+                        1: 1,
+                    },
+                ),
+                compute_create_address(address=contract_0, nonce=0): Account(
+                    storage={}, balance=0, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(storage={0: 0, 1: 1}),
+                compute_create_address(
+                    address=contract_0, nonce=0
+                ): Account.NONEXISTENT,
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("6160006000f3"),
+        Bytes("6160016000f3"),
+    ]
+    tx_gas = [15000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=15000000,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/__init__.py b/tests/ported_static/stCreate2/__init__.py
index 1365688d6c9..8fa08629df2 100644
--- a/tests/ported_static/stCreate2/__init__.py
+++ b/tests/ported_static/stCreate2/__init__.py
@@ -1 +1 @@
-"""Tests ported from stCreate2."""
+"""Ported static tests: stCreate2."""  # noqa: N999
diff --git a/tests/ported_static/stCreate2/test_call_outsize_then_create2_successful_then_returndatasize.py b/tests/ported_static/stCreate2/test_call_outsize_then_create2_successful_then_returndatasize.py
index 7044d0014b2..3c2976dd8f9 100644
--- a/tests/ported_static/stCreate2/test_call_outsize_then_create2_successful_then_returndatasize.py
+++ b/tests/ported_static/stCreate2/test_call_outsize_then_create2_successful_then_returndatasize.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_outsize_then_create2_successful_then_returndatasize.
 
 Ported from:
-tests/static/state_tests/stCreate2
-call_outsize_then_create2_successful_then_returndatasizeFiller.json
+state_tests/stCreate2/call_outsize_then_create2_successful_then_returndatasizeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCreate2/call_outsize_then_create2_successful_then_returndatasizeFiller.json",  # noqa: E501
+        "state_tests/stCreate2/call_outsize_then_create2_successful_then_returndatasizeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,11 @@ def test_call_outsize_then_create2_successful_then_returndatasize(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_call_outsize_then_create2_successful_then_returndatasize."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0AABBCCDD5C57F15886F9B263E2F6D2D6C7B5EC6)
+    contract_1 = Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,62 +47,53 @@ def test_call_outsize_then_create2_successful_then_returndatasize(
         gas_limit=47244640256,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32)) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (seq (CALL 0x0900000000 0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0x20) (CREATE2 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32) (STOP) ) 0) 0) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x900000000,
-                    address=0xAABBCCDD5C57F15886F9B263E2F6D2D6C7B5EC6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x900000000,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
             )
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xE]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x3E, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE2)
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(offset=0x0, value=0x112233)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+        )
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xE]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3E, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=0x112233)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP * 2,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_1,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {contract_1: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_call_then_create2_successful_then_returndatasize.py b/tests/ported_static/stCreate2/test_call_then_create2_successful_then_returndatasize.py
index 944c53a3354..ff1f8f14b55 100644
--- a/tests/ported_static/stCreate2/test_call_then_create2_successful_then_returndatasize.py
+++ b/tests/ported_static/stCreate2/test_call_then_create2_successful_then_returndatasize.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_then_create2_successful_then_returndatasize.
 
 Ported from:
-tests/static/state_tests/stCreate2
-call_then_create2_successful_then_returndatasizeFiller.json
+state_tests/stCreate2/call_then_create2_successful_then_returndatasizeFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCreate2/call_then_create2_successful_then_returndatasizeFiller.json",  # noqa: E501
+        "state_tests/stCreate2/call_then_create2_successful_then_returndatasizeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,10 @@ def test_call_then_create2_successful_then_returndatasize(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_then_create2_successful_then_returndatasize."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0AABBCCDD5C57F15886F9B263E2F6D2D6C7B5EC6)
+    contract_1 = Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,63 +50,63 @@ def test_call_then_create2_successful_then_returndatasize(
         gas_limit=47244640256,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0x6400000000)
+    # Source: lll
     # { (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32) (STOP) ) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP * 2,
         nonce=0,
-        address=Address("0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
+        address=Address(0x0AABBCCDD5C57F15886F9B263E2F6D2D6C7B5EC6),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (seq (CALL 0x0900000000 0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0) (CREATE2 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32) (STOP) ) 0) 0) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x900000000,
-                    address=0xAABBCCDD5C57F15886F9B263E2F6D2D6C7B5EC6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x900000000,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xE]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x3E, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE2)
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(offset=0x0, value=0x112233)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+        )
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xE]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3E, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=0x112233)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP * 2,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
+        address=Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_1,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {
+        Address(0xC0C06666FAD9E52251740536E21FC0F3DB0E0FA0): Account(
+            code=bytes.fromhex(
+                "0000000000000000000000000000000000000000000000000000000000112233"  # noqa: E501
+            ),
+        ),
+        contract_1: Account(storage={0: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_bounds.py b/tests/ported_static/stCreate2/test_create2_bounds.py
index f24fffa6b2d..42c5cb34ec6 100644
--- a/tests/ported_static/stCreate2/test_create2_bounds.py
+++ b/tests/ported_static/stCreate2/test_create2_bounds.py
@@ -1,20 +1,22 @@
 """
-Test ported from static filler.
+Test_create2_bounds.
 
 Ported from:
-tests/static/state_tests/stCreate2/CREATE2_BoundsFiller.json
+state_tests/stCreate2/CREATE2_BoundsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,28 +24,40 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/CREATE2_BoundsFiller.json"],
+    ["state_tests/stCreate2/CREATE2_BoundsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2_bounds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    """Test_create2_bounds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
     )
 
     env = Environment(
@@ -55,34 +69,42 @@ def test_create2_bounds(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  (MSTORE 0 0x6001600155601080600c6000396000f3006000355415600957005b6020356000 )  (MSTORE8 32 0x35) (MSTORE8 33 0x55) (CREATE2 1 0 0 0) (CREATE2 1 0 0xfffffff 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x6001600155601080600C6000396000F3006000355415600957005B6020356000,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0x20, value=0x35)
-            + Op.MSTORE8(offset=0x21, value=0x55)
-            + Op.POP(Op.CREATE2(value=0x1, offset=0x0, size=0x0, salt=0x0))
-            + Op.CREATE2(value=0x1, offset=0x0, size=0xFFFFFFF, salt=0x0)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x6001600155601080600C6000396000F3006000355415600957005B6020356000,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0x20, value=0x35)
+        + Op.MSTORE8(offset=0x21, value=0x55)
+        + Op.POP(Op.CREATE2(value=0x1, offset=0x0, size=0x0, salt=0x0))
+        + Op.CREATE2(value=0x1, offset=0x0, size=0xFFFFFFF, salt=0x0)
+        + Op.STOP,
         balance=100,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {
+        contract_0: Account(balance=100),
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
+        compute_create_address(
+            address=contract_0, nonce=1
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_bounds2.py b/tests/ported_static/stCreate2/test_create2_bounds2.py
index 3568d7a95d7..175cddce83a 100644
--- a/tests/ported_static/stCreate2/test_create2_bounds2.py
+++ b/tests/ported_static/stCreate2/test_create2_bounds2.py
@@ -1,20 +1,22 @@
 """
-Test ported from static filler.
+Test_create2_bounds2.
 
 Ported from:
-tests/static/state_tests/stCreate2/CREATE2_Bounds2Filler.json
+state_tests/stCreate2/CREATE2_Bounds2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,28 +24,40 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/CREATE2_Bounds2Filler.json"],
+    ["state_tests/stCreate2/CREATE2_Bounds2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2_bounds2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    """Test_create2_bounds2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
     )
 
     env = Environment(
@@ -55,33 +69,38 @@ def test_create2_bounds2(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  (MSTORE 0 0x6001600155601080600c6000396000f3006000355415600957005b6020356000 )  (MSTORE8 32 0x35) (MSTORE8 33 0x55) (CREATE2 1 0 0xffffffff 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x6001600155601080600C6000396000F3006000355415600957005B6020356000,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0x20, value=0x35)
-            + Op.MSTORE8(offset=0x21, value=0x55)
-            + Op.CREATE2(value=0x1, offset=0x0, size=0xFFFFFFFF, salt=0x0)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x6001600155601080600C6000396000F3006000355415600957005B6020356000,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0x20, value=0x35)
+        + Op.MSTORE8(offset=0x21, value=0x55)
+        + Op.CREATE2(value=0x1, offset=0x0, size=0xFFFFFFFF, salt=0x0)
+        + Op.STOP,
         balance=100,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {
+        contract_0: Account(balance=100),
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_bounds3.py b/tests/ported_static/stCreate2/test_create2_bounds3.py
index 374fa1205a2..d7c3c6c325f 100644
--- a/tests/ported_static/stCreate2/test_create2_bounds3.py
+++ b/tests/ported_static/stCreate2/test_create2_bounds3.py
@@ -1,20 +1,22 @@
 """
-Test ported from static filler.
+Test_create2_bounds3.
 
 Ported from:
-tests/static/state_tests/stCreate2/CREATE2_Bounds3Filler.json
+state_tests/stCreate2/CREATE2_Bounds3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +24,46 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/CREATE2_Bounds3Filler.json"],
+    ["state_tests/stCreate2/CREATE2_Bounds3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (1000000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="-g2",
+        ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2_bounds3(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    """Test_create2_bounds3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
     )
 
     env = Environment(
@@ -56,121 +75,109 @@ def test_create2_bounds3(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  (MSTORE 0 0x6001600155601080600c6000396000f3006000355415600957005b6020356000 )  (MSTORE8 32 0x35) (MSTORE8 33 0x55) (CREATE2 1 0 0xffffffffffffffff 0) (CREATE2 1 0 0xffffffffffffffffffffffffffffffff 0) (CREATE2 1 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) (CREATE2 1 0xfffffff 0 0) (CREATE2 1 0xffffffff 0 0) (CREATE2 1 0xffffffffffffffff 0 0) (CREATE2 1 0xffffffffffffffffffffffffffffffff 0 0) (CREATE2 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0) (CREATE2 1 0xfffffff 0xfffffff 0) (CREATE2 1 0xffffffff 0xffffffff 0) (CREATE2 1 0xffffffffffffffff 0xffffffffffffffff 0) (CREATE2 1 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0) (CREATE2 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x6001600155601080600C6000396000F3006000355415600957005B6020356000,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0x20, value=0x35)
-            + Op.MSTORE8(offset=0x21, value=0x55)
-            + Op.POP(
-                Op.CREATE2(
-                    value=0x1,
-                    offset=0x0,
-                    size=0xFFFFFFFFFFFFFFFF,
-                    salt=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CREATE2(
-                    value=0x1,
-                    offset=0x0,
-                    size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    salt=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CREATE2(
-                    value=0x1,
-                    offset=0x0,
-                    size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    salt=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CREATE2(value=0x1, offset=0xFFFFFFF, size=0x0, salt=0x0)
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x6001600155601080600C6000396000F3006000355415600957005B6020356000,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0x20, value=0x35)
+        + Op.MSTORE8(offset=0x21, value=0x55)
+        + Op.POP(
+            Op.CREATE2(
+                value=0x1, offset=0x0, size=0xFFFFFFFFFFFFFFFF, salt=0x0
             )
-            + Op.POP(
-                Op.CREATE2(value=0x1, offset=0xFFFFFFFF, size=0x0, salt=0x0)
-            )
-            + Op.POP(
-                Op.CREATE2(
-                    value=0x1,
-                    offset=0xFFFFFFFFFFFFFFFF,
-                    size=0x0,
-                    salt=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CREATE2(
-                    value=0x1,
-                    offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    size=0x0,
-                    salt=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.CREATE2(
+                value=0x1,
+                offset=0x0,
+                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                salt=0x0,
             )
-            + Op.POP(
-                Op.CREATE2(
-                    value=0x1,
-                    offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    size=0x0,
-                    salt=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.CREATE2(
+                value=0x1,
+                offset=0x0,
+                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                salt=0x0,
             )
-            + Op.POP(
-                Op.CREATE2(
-                    value=0x1, offset=0xFFFFFFF, size=0xFFFFFFF, salt=0x0
-                ),
+        )
+        + Op.POP(Op.CREATE2(value=0x1, offset=0xFFFFFFF, size=0x0, salt=0x0))
+        + Op.POP(Op.CREATE2(value=0x1, offset=0xFFFFFFFF, size=0x0, salt=0x0))
+        + Op.POP(
+            Op.CREATE2(
+                value=0x1, offset=0xFFFFFFFFFFFFFFFF, size=0x0, salt=0x0
             )
-            + Op.POP(
-                Op.CREATE2(
-                    value=0x1,
-                    offset=0xFFFFFFFF,
-                    size=0xFFFFFFFF,
-                    salt=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.CREATE2(
+                value=0x1,
+                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                size=0x0,
+                salt=0x0,
             )
-            + Op.POP(
-                Op.CREATE2(
-                    value=0x1,
-                    offset=0xFFFFFFFFFFFFFFFF,
-                    size=0xFFFFFFFFFFFFFFFF,
-                    salt=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.CREATE2(
+                value=0x1,
+                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                size=0x0,
+                salt=0x0,
             )
-            + Op.POP(
-                Op.CREATE2(
-                    value=0x1,
-                    offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    salt=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.CREATE2(value=0x1, offset=0xFFFFFFF, size=0xFFFFFFF, salt=0x0)
+        )
+        + Op.POP(
+            Op.CREATE2(value=0x1, offset=0xFFFFFFFF, size=0xFFFFFFFF, salt=0x0)
+        )
+        + Op.POP(
+            Op.CREATE2(
+                value=0x1,
+                offset=0xFFFFFFFFFFFFFFFF,
+                size=0xFFFFFFFFFFFFFFFF,
+                salt=0x0,
             )
-            + Op.CREATE2(
+        )
+        + Op.POP(
+            Op.CREATE2(
                 value=0x1,
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
                 salt=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.CREATE2(
+            value=0x1,
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            salt=0x0,
+        )
+        + Op.STOP,
         balance=100,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 1000000, 16777216]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {
+        contract_0: Account(balance=100),
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_contract_suicide_during_init_then_store_then_return.py b/tests/ported_static/stCreate2/test_create2_contract_suicide_during_init_then_store_then_return.py
index a67e2d94ba8..faa8f7c9a01 100644
--- a/tests/ported_static/stCreate2/test_create2_contract_suicide_during_init_then_store_then_return.py
+++ b/tests/ported_static/stCreate2/test_create2_contract_suicide_during_init_then_store_then_return.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_create2_contract_suicide_during_init_then_store_then_return.
 
 Ported from:
-tests/static/state_tests/stCreate2
-CREATE2_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
+state_tests/stCreate2/CREATE2_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCreate2/CREATE2_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json",  # noqa: E501
+        "state_tests/stCreate2/CREATE2_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,10 @@ def test_create2_contract_suicide_during_init_then_store_then_return(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_create2_contract_suicide_during_init_then_store_then_return."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -49,60 +51,59 @@ def test_create2_contract_suicide_during_init_then_store_then_return(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
-    # { (CALL 150000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 32) (SSTORE 1 (MLOAD 0)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x249F0,
-                    address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0x6d64600c6000556000526005601bf36000526001ff) (CREATE2 1 11 21 0) [[0]] 11 (RETURN 18 14) }  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x6D64600C6000556000526005601BF36000526001FF
+        )
+        + Op.POP(Op.CREATE2(value=0x1, offset=0xB, size=0x15, salt=0x0))
+        + Op.SSTORE(key=0x0, value=0xB)
+        + Op.RETURN(offset=0x12, size=0xE)
+        + Op.STOP,
         balance=0xE8D4A51000,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
-    # Source: LLL
-    # { (MSTORE 0 0x6d64600c6000556000526005601bf36000526001ff) (CREATE2 1 11 21 0) [[0]] 11 (RETURN 18 14) }  # noqa: E501
-    callee = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x6D64600C6000556000526005601BF36000526001FF,
+    # Source: lll
+    # { (CALL 150000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 32) (SSTORE 1 (MLOAD 0)) }  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x249F0,
+                address=contract_1,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
             )
-            + Op.POP(Op.CREATE2(value=0x1, offset=0xB, size=0x15, salt=0x0))
-            + Op.SSTORE(key=0x0, value=0xB)
-            + Op.RETURN(offset=0x12, size=0xE)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xE8D4A51000,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
         value=10,
     )
 
     post = {
-        contract: Account(
+        Address(0x0000000000000000000000000000000000000001): Account(
+            balance=1
+        ),
+        contract_0: Account(
             storage={
                 1: 0x6000526005601BF36000526001FF000000000000000000000000000000000000,  # noqa: E501
             },
         ),
-        callee: Account(storage={0: 11}),
+        contract_1: Account(storage={0: 11}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_first_byte_loop.py b/tests/ported_static/stCreate2/test_create2_first_byte_loop.py
index 6787b73ee1c..65d516db2aa 100644
--- a/tests/ported_static/stCreate2/test_create2_first_byte_loop.py
+++ b/tests/ported_static/stCreate2/test_create2_first_byte_loop.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_create2_first_byte_loop.
 
 Ported from:
-tests/static/state_tests/stCreate2/CREATE2_FirstByte_loopFiller.yml
+state_tests/stCreate2/CREATE2_FirstByte_loopFiller.yml
 """
 
 import pytest
@@ -11,10 +11,16 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,48 +28,43 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/CREATE2_FirstByte_loopFiller.yml"],
+    ["state_tests/stCreate2/CREATE2_FirstByte_loopFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ef",  # noqa: E501
-            {
-                Address("0x09fdd11d68be787a4c43f692a0778befc011cd35"): Account(
-                    storage={256: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="firstHalf",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ef00000000000000000000000000000000000000000000000000000000000000f0",  # noqa: E501
-            {
-                Address("0x09fdd11d68be787a4c43f692a0778befc011cd35"): Account(
-                    storage={239: 1, 256: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="invalidByte",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x09fdd11d68be787a4c43f692a0778befc011cd35"): Account(
-                    storage={256: 1}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="secondHalf",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2_first_byte_loop(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_create2_first_byte_loop."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
     )
@@ -77,7 +78,9 @@ def test_create2_first_byte_loop(
         gas_limit=89128960,
     )
 
-    # Source: Yul
+    pre[sender] = Account(balance=0x3B9ACA00)
+    # Source: yul
+    # berlin
     # {
     #   let start := calldataload(4)
     #   let end := calldataload(36)
@@ -90,53 +93,96 @@ def test_create2_first_byte_loop(
     #   }
     #   sstore(256, 1)
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x600060005360016000F300000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.CALLDATALOAD(offset=0x24)
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x38, condition=Op.LT(Op.DUP2, Op.DUP2))
-            + Op.SSTORE(key=0x100, value=0x1)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.DUP1
-            + Op.PUSH1[0x1]
-            + Op.SWAP2
-            + Op.DUP3
-            + Op.MSTORE8
-            + Op.JUMPI(
-                pc=0x4F,
-                condition=Op.ISZERO(
-                    Op.CREATE2(
-                        value=Op.DUP1, offset=Op.DUP2, size=0xA, salt=0x0
-                    ),
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.ADD
-            + Op.JUMP(pc=0x2A)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
-            + Op.JUMP(pc=0x4A)
-        ),
+    entry = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x600060005360016000F300000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.CALLDATALOAD(offset=0x24)
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x38, condition=Op.LT(Op.DUP2, Op.DUP2))
+        + Op.SSTORE(key=0x100, value=0x1)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.DUP1
+        + Op.PUSH1[0x1]
+        + Op.SWAP2
+        + Op.DUP3
+        + Op.MSTORE8
+        + Op.JUMPI(
+            pc=0x4F,
+            condition=Op.ISZERO(
+                Op.CREATE2(value=Op.DUP1, offset=Op.DUP2, size=0xA, salt=0x0)
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.ADD
+        + Op.JUMP(pc=0x2A)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
+        + Op.JUMP(pc=0x4A),
         nonce=0,
-        address=Address("0x09fdd11d68be787a4c43f692a0778befc011cd35"),  # noqa: E501
+        address=Address(0x09FDD11D68BE787A4C43F692A0778BEFC011CD35),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3B9ACA00)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                entry: Account(storage={256: 1}, nonce=239),
+                Address(0x0D03885ED4F051B06AE83D869CD60F8EBDDE37D8): Account(
+                    nonce=1
+                ),
+                Address(0x94B507D001A223D7948119D899358A073FE5E331): Account(
+                    nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                entry: Account(storage={256: 1}, nonce=16),
+                Address(0x896E9DC41224489ED98380921EF0AEAC66115D7B): Account(
+                    nonce=1
+                ),
+                Address(0x070DB4FA29B5D139BEDB29347001BB9C3D75DC3A): Account(
+                    nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                entry: Account(storage={239: 1, 256: 1}, nonce=1),
+                Address(
+                    0xA492678492A13F1031904DE45F26A114234B668D
+                ): Account.NONEXISTENT,
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("1a8451e6") + Hash(0x0) + Hash(0xEF),
+        Bytes("1a8451e6") + Hash(0xEF) + Hash(0xF0),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0x100),
+    ]
+    tx_gas = [16777216]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
+        to=entry,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_high_nonce.py b/tests/ported_static/stCreate2/test_create2_high_nonce.py
index cb031e91010..7d91f2f60da 100644
--- a/tests/ported_static/stCreate2/test_create2_high_nonce.py
+++ b/tests/ported_static/stCreate2/test_create2_high_nonce.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_create2_high_nonce.
 
 Ported from:
-tests/static/state_tests/stCreate2/CREATE2_HighNonceFiller.yml
+state_tests/stCreate2/CREATE2_HighNonceFiller.yml
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/CREATE2_HighNonceFiller.yml"],
+    ["state_tests/stCreate2/CREATE2_HighNonceFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_create2_high_nonce(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_create2_high_nonce."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -46,39 +48,43 @@ def test_create2_high_nonce(
     )
 
     pre[sender] = Account(balance=0x3B9ACA00)
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   // initcode: { return(0, 1) }
     #   mstore(0, 0x60016000f3000000000000000000000000000000000000000000000000000000)  # noqa: E501
     #   sstore(0, create2(0, 0, 5, 0))
     #   sstore(1, 1)
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SHL(0xD8, 0x60016000F3)
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.PUSH1[0x5]
-            + Op.DUP2
-            + Op.DUP1
-            + Op.SSTORE(key=0x0, value=Op.CREATE2)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SHL(0xD8, 0x60016000F3)
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.PUSH1[0x5]
+        + Op.DUP2
+        + Op.DUP1
+        + Op.SSTORE(key=0x0, value=Op.CREATE2)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.STOP,
         nonce=18446744073709551615,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=16777216,
     )
 
     post = {
-        contract: Account(storage={1: 1}),
+        sender: Account(nonce=1),
+        contract_0: Account(storage={0: 0, 1: 1}, nonce=18446744073709551615),
+        Address(
+            0x77DD5D2A2B742CA01EE2CFFF306445E3741EF744
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_high_nonce_delegatecall.py b/tests/ported_static/stCreate2/test_create2_high_nonce_delegatecall.py
index e866ec2b573..bccd4bc252a 100644
--- a/tests/ported_static/stCreate2/test_create2_high_nonce_delegatecall.py
+++ b/tests/ported_static/stCreate2/test_create2_high_nonce_delegatecall.py
@@ -1,8 +1,8 @@
 """
-Delegate calls CREATE/CREATE2 from an account with max allowed nonce/max...
+Delegate calls CREATE/CREATE2 from an account with max allowed...
 
 Ported from:
-tests/static/state_tests/stCreate2/CREATE2_HighNonceDelegatecallFiller.yml
+state_tests/stCreate2/CREATE2_HighNonceDelegatecallFiller.yml
 """
 
 import pytest
@@ -11,10 +11,16 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,479 +28,169 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/CREATE2_HighNonceDelegatecallFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/CREATE2_HighNonceDelegatecallFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000fffffffffffffffe000000000000000000000000cf7dd310db9459fa2e6eec97d4b972ba24ff23eb0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x09f07a698496a643301174853c4f7f1eaab166be"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={
-                        1: 0x9F07A698496A643301174853C4F7F1EAAB166BE,
-                        2: 0x9F07A698496A643301174853C4F7F1EAAB166BE,
-                        65535: 0xFFFFFFFFFFFFFFFF,
-                    }
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="A_MaxNonceMinus1_DelegateCall_B_MaxNonceMinus1_Create",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000fffffffffffffffe000000000000000000000000cf7dd310db9459fa2e6eec97d4b972ba24ff23eb0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x74f5960e3479218ec095e853ed1fc95e285adc3b"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={
-                        1: 0x74F5960E3479218EC095E853ED1FC95E285ADC3B,
-                        2: 0x74F5960E3479218EC095E853ED1FC95E285ADC3B,
-                        65535: 0xFFFFFFFFFFFFFFFF,
-                    }
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="A_MaxNonceMinus1_DelegateCall_B_MaxNonce_Create",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000fffffffffffffffe000000000000000000000000e51bc07f90c9661fa42db3bde8dd52b942ac69e00000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x09f07a698496a643301174853c4f7f1eaab166be"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={
-                        1: 0x9F07A698496A643301174853C4F7F1EAAB166BE,
-                        2: 0x9F07A698496A643301174853C4F7F1EAAB166BE,
-                        65535: 0xFFFFFFFFFFFFFFFF,
-                    }
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="A_MaxNonceMinus1_CallCode_B_MaxNonceMinus1_Create",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000fffffffffffffffe000000000000000000000000e51bc07f90c9661fa42db3bde8dd52b942ac69e00000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x74f5960e3479218ec095e853ed1fc95e285adc3b"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={
-                        1: 0x74F5960E3479218EC095E853ED1FC95E285ADC3B,
-                        2: 0x74F5960E3479218EC095E853ED1FC95E285ADC3B,
-                        65535: 0xFFFFFFFFFFFFFFFF,
-                    }
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="A_MaxNonceMinus1_CallCode_B_MaxNonce_Create",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000fffffffffffffffe000000000000000000000000cf7dd310db9459fa2e6eec97d4b972ba24ff23eb0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x1cfc908bb573719841cad6a8bc34e7c1ce5ee020"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={
-                        2: 0x1CFC908BB573719841CAD6A8BC34E7C1CE5EE020,
-                        65535: 0xFFFFFFFFFFFFFFFF,
-                    }
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={
-                        1: 0x1CFC908BB573719841CAD6A8BC34E7C1CE5EE020,
-                        65535: 0xFFFFFFFFFFFFFFFE,
-                    }
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="A_MaxNonceMinus1_Call_B_MaxNonceMinus1_Create",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000fffffffffffffffe000000000000000000000000cf7dd310db9459fa2e6eec97d4b972ba24ff23eb0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x99f1bfb202fdf527e07fb8eb682a03c713aeaf11"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={
-                        2: 0x99F1BFB202FDF527E07FB8EB682A03C713AEAF11,
-                        65535: 0xFFFFFFFFFFFFFFFF,
-                    }
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={
-                        1: 0x99F1BFB202FDF527E07FB8EB682A03C713AEAF11,
-                        65535: 0xFFFFFFFFFFFFFFFE,
-                    }
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="A_MaxNonceMinus1_Call_B_MaxNonce_Create",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000fffffffffffffffe000000000000000000000000e51bc07f90c9661fa42db3bde8dd52b942ac69e00000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="A_MaxNonce_DelegateCall_B_MaxNonceMinus1_Create",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000fffffffffffffffe000000000000000000000000e51bc07f90c9661fa42db3bde8dd52b942ac69e00000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="A_MaxNonce_DelegateCall_B_MaxNonce_Create",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fffffffffffffffe000000000000000000000000cf7dd310db9459fa2e6eec97d4b972ba24ff23eb0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x09f07a698496a643301174853c4f7f1eaab166be"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={
-                        1: 0x9F07A698496A643301174853C4F7F1EAAB166BE,
-                        2: 0x9F07A698496A643301174853C4F7F1EAAB166BE,
-                        65535: 0xFFFFFFFFFFFFFFFF,
-                    }
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="A_MaxNonce_CallCode_B_MaxNonceMinus1_Create",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fffffffffffffffe000000000000000000000000cf7dd310db9459fa2e6eec97d4b972ba24ff23eb0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x74f5960e3479218ec095e853ed1fc95e285adc3b"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={
-                        1: 0x74F5960E3479218EC095E853ED1FC95E285ADC3B,
-                        2: 0x74F5960E3479218EC095E853ED1FC95E285ADC3B,
-                        65535: 0xFFFFFFFFFFFFFFFF,
-                    }
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="A_MaxNonce_CallCode_B_MaxNonce_Create",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fffffffffffffffe000000000000000000000000e51bc07f90c9661fa42db3bde8dd52b942ac69e00000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x09f07a698496a643301174853c4f7f1eaab166be"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={
-                        1: 0x9F07A698496A643301174853C4F7F1EAAB166BE,
-                        2: 0x9F07A698496A643301174853C4F7F1EAAB166BE,
-                        65535: 0xFFFFFFFFFFFFFFFF,
-                    }
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            10,
+            0,
+            0,
+            id="A_MaxNonce_Call_B_MaxNonceMinus1_Create",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fffffffffffffffe000000000000000000000000e51bc07f90c9661fa42db3bde8dd52b942ac69e00000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x74f5960e3479218ec095e853ed1fc95e285adc3b"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={
-                        1: 0x74F5960E3479218EC095E853ED1FC95E285ADC3B,
-                        2: 0x74F5960E3479218EC095E853ED1FC95E285ADC3B,
-                        65535: 0xFFFFFFFFFFFFFFFF,
-                    }
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            11,
+            0,
+            0,
+            id="A_MaxNonce_Call_B_MaxNonce_Create",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000ffffffffffffffff000000000000000000000000cf7dd310db9459fa2e6eec97d4b972ba24ff23eb0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            12,
+            0,
+            0,
+            id="A_MaxNonceMinus1_DelegateCall_B_MaxNonceMinus1_Create2",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000ffffffffffffffff000000000000000000000000cf7dd310db9459fa2e6eec97d4b972ba24ff23eb0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            13,
+            0,
+            0,
+            id="A_MaxNonceMinus1_DelegateCall_B_MaxNonce_Create2",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000ffffffffffffffff000000000000000000000000e51bc07f90c9661fa42db3bde8dd52b942ac69e00000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            14,
+            0,
+            0,
+            id="A_MaxNonceMinus1_CallCode_B_MaxNonceMinus1_Create2",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000ffffffffffffffff000000000000000000000000e51bc07f90c9661fa42db3bde8dd52b942ac69e00000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            15,
+            0,
+            0,
+            id="A_MaxNonceMinus1_CallCode_B_MaxNonce_Create2",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000ffffffffffffffff000000000000000000000000cf7dd310db9459fa2e6eec97d4b972ba24ff23eb0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x1cfc908bb573719841cad6a8bc34e7c1ce5ee020"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={
-                        2: 0x1CFC908BB573719841CAD6A8BC34E7C1CE5EE020,
-                        65535: 0xFFFFFFFFFFFFFFFF,
-                    }
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={
-                        1: 0x1CFC908BB573719841CAD6A8BC34E7C1CE5EE020,
-                        65535: 0xFFFFFFFFFFFFFFFF,
-                    }
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            16,
+            0,
+            0,
+            id="A_MaxNonceMinus1_Call_B_MaxNonceMinus1_Create2",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000ffffffffffffffff000000000000000000000000cf7dd310db9459fa2e6eec97d4b972ba24ff23eb0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x99f1bfb202fdf527e07fb8eb682a03c713aeaf11"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={
-                        2: 0x99F1BFB202FDF527E07FB8EB682A03C713AEAF11,
-                        65535: 0xFFFFFFFFFFFFFFFF,
-                    }
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={
-                        1: 0x99F1BFB202FDF527E07FB8EB682A03C713AEAF11,
-                        65535: 0xFFFFFFFFFFFFFFFF,
-                    }
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            17,
+            0,
+            0,
+            id="A_MaxNonceMinus1_Call_B_MaxNonce_Create2",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000ffffffffffffffff000000000000000000000000e51bc07f90c9661fa42db3bde8dd52b942ac69e00000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            18,
+            0,
+            0,
+            id="A_MaxNonce_DelegateCall_B_MaxNonceMinus1_Create2",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000ffffffffffffffff000000000000000000000000e51bc07f90c9661fa42db3bde8dd52b942ac69e00000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            19,
+            0,
+            0,
+            id="A_MaxNonce_DelegateCall_B_MaxNonce_Create2",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff000000000000000000000000cf7dd310db9459fa2e6eec97d4b972ba24ff23eb0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            20,
+            0,
+            0,
+            id="A_MaxNonce_CallCode_B_MaxNonceMinus1_Create2",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff000000000000000000000000cf7dd310db9459fa2e6eec97d4b972ba24ff23eb0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            21,
+            0,
+            0,
+            id="A_MaxNonce_CallCode_B_MaxNonce_Create2",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff000000000000000000000000e51bc07f90c9661fa42db3bde8dd52b942ac69e00000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            22,
+            0,
+            0,
+            id="A_MaxNonce_Call_B_MaxNonceMinus1_Create2",
         ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff000000000000000000000000e51bc07f90c9661fa42db3bde8dd52b942ac69e00000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFE}
-                ),
-                Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-                Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"): Account(
-                    storage={65535: 0xFFFFFFFFFFFFFFFF}
-                ),
-            },
+        pytest.param(
+            23,
+            0,
+            0,
+            id="A_MaxNonce_Call_B_MaxNonce_Create2",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2_high_nonce_delegatecall(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Delegate calls CREATE/CREATE2 from an account with max allowed..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
     )
@@ -509,199 +205,775 @@ def test_create2_high_nonce_delegatecall(
     )
 
     pre[sender] = Account(balance=0x3B9ACA00)
-    pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.SLOAD(key=0xFFFF)
-            + Op.MSTORE(offset=0x0, value=0x6005600C60003960056000F36001600155)
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.JUMPI(pc=0x5E, condition=Op.EQ(Op.DUP2, 0x0))
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.JUMPI(pc=0x4F, condition=Op.EQ)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x2, value=Op.DUP2)
-            + Op.JUMPI(pc=0x43, condition=Op.GT(Op.DUP3, 0x0))
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.MSTORE
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.SSTORE(key=0xFFFF, value=Op.ADD)
-            + Op.CODESIZE
-            + Op.JUMP(pc=0x39)
-            + Op.JUMPDEST
-            + Op.SWAP1
-            + Op.POP
-            + Op.CREATE2(value=0x0, offset=0xF, size=0x11, salt=Op.DUP1)
-            + Op.SWAP1
-            + Op.JUMP(pc=0x2D)
-            + Op.JUMPDEST
-            + Op.SWAP2
-            + Op.POP
-            + Op.PUSH1[0x1]
-            + Op.CREATE(value=0x0, offset=0xF, size=0x11)
-            + Op.SWAP3
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x26)
-        ),
-        storage={0xFFFF: 0xFFFFFFFFFFFFFFFE},
+    # Source: yul
+    # berlin
+    # {
+    #   let createtype    := calldataload(0)
+    #   let contextnonce  := sload(0xffff)
+    #
+    #   // initcode: { codecopy(0, 12, 5); return(0, 5); sstore(1, 1) }
+    #   mstore(0, 0x6005600c60003960056000f36001600155 )
+    #   let addr
+    #   if eq(createtype, 0) {
+    #     addr := create(0, sub(32, 17), 17)
+    #   }
+    #   if eq(createtype, 1) {
+    #     // We use the context nonce to mimic CREATE's nonce based address calculation and make verification easier  # noqa: E501
+    #     addr := create2(0, sub(32, 17), 17, contextnonce)
+    #   }
+    #   sstore(2, addr)
+    #   if gt(addr, 0) { sstore(0xffff, add(contextnonce, 1)) }
+    #   mstore(0, addr)
+    #   return(0, 32)
+    # }
+    max_nonce_minus_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.SLOAD(key=0xFFFF)
+        + Op.MSTORE(offset=0x0, value=0x6005600C60003960056000F36001600155)
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.JUMPI(pc=0x5E, condition=Op.EQ(Op.DUP2, 0x0))
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.JUMPI(pc=0x4F, condition=Op.EQ)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x2, value=Op.DUP2)
+        + Op.JUMPI(pc=0x43, condition=Op.GT(Op.DUP3, 0x0))
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.MSTORE
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0xFFFF, value=Op.ADD)
+        + Op.CODESIZE
+        + Op.JUMP(pc=0x39)
+        + Op.JUMPDEST
+        + Op.SWAP1
+        + Op.POP
+        + Op.CREATE2(value=0x0, offset=0xF, size=0x11, salt=Op.DUP1)
+        + Op.SWAP1
+        + Op.JUMP(pc=0x2D)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH1[0x1]
+        + Op.CREATE(value=0x0, offset=0xF, size=0x11)
+        + Op.SWAP3
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x26),
+        storage={65535: 0xFFFFFFFFFFFFFFFE},
         nonce=18446744073709551614,
-        address=Address("0xcf7dd310db9459fa2e6eec97d4b972ba24ff23eb"),  # noqa: E501
+        address=Address(0xCF7DD310DB9459FA2E6EEC97D4B972BA24FF23EB),  # noqa: E501
     )
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x4)
-            + Op.CALLDATALOAD(offset=0x24)
-            + Op.SWAP1
-            + Op.CALLDATALOAD(offset=0x44)
-            + Op.SWAP1
-            + Op.CALLDATALOAD(offset=0x64)
-            + Op.SLOAD(key=0xFFFF)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8B, condition=Op.LT(Op.DUP2, Op.DUP5))
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.MSTORE
-            + Op.PUSH1[0x2]
-            + Op.SWAP1
-            + Op.JUMPI(pc=0x79, condition=Op.ISZERO(Op.DUP1))
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x66, condition=Op.EQ(Op.DUP2, 0x1))
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x52, condition=Op.EQ)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE(key=0x1, value=Op.DUP1)
-            + Op.JUMPI(pc=0x43, condition=Op.GT(Op.DUP2, 0x0))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.SWAP5
-            + Op.SUB(Op.GAS, 0x3E8)
-            + Op.CALL
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x20]
-            + Op.DUP2
-            + Op.DUP1
-            + Op.DUP3
-            + Op.SWAP5
-            + Op.SUB(Op.GAS, 0x3E8)
-            + Op.POP(Op.CALL)
-            + Op.DUP1
-            + Op.JUMP(pc=0x32)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=Op.SUB(Op.GAS, 0x3E8),
-                    address=Op.DUP8,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=Op.DUP2,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
+    # Source: yul
+    # berlin
+    # {
+    #   let createtype    := calldataload(0)
+    #   let contextnonce  := sload(0xffff)
+    #
+    #   // initcode: { codecopy(0, 12, 5); return(0, 5); sstore(1, 1) }
+    #   mstore(0, 0x6005600c60003960056000f36001600155)
+    #   let addr
+    #   if eq(createtype, 0) {
+    #     addr := create(0, sub(32, 17), 17)
+    #   }
+    #   if eq(createtype, 1) {
+    #     // We use the context nonce to mimic CREATE's nonce based address calculation and make verification easier  # noqa: E501
+    #     addr := create2(0, sub(32, 17), 17, contextnonce)
+    #   }
+    #   sstore(2, addr)
+    #   if gt(addr, 0) { sstore(0xffff, add(contextnonce, 1)) }
+    #   mstore(0, addr)
+    #   return(0, 32)
+    # }
+    max_nonce = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.SLOAD(key=0xFFFF)
+        + Op.MSTORE(offset=0x0, value=0x6005600C60003960056000F36001600155)
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.JUMPI(pc=0x5E, condition=Op.EQ(Op.DUP2, 0x0))
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.JUMPI(pc=0x4F, condition=Op.EQ)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x2, value=Op.DUP2)
+        + Op.JUMPI(pc=0x43, condition=Op.GT(Op.DUP3, 0x0))
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.MSTORE
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0xFFFF, value=Op.ADD)
+        + Op.CODESIZE
+        + Op.JUMP(pc=0x39)
+        + Op.JUMPDEST
+        + Op.SWAP1
+        + Op.POP
+        + Op.CREATE2(value=0x0, offset=0xF, size=0x11, salt=Op.DUP1)
+        + Op.SWAP1
+        + Op.JUMP(pc=0x2D)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH1[0x1]
+        + Op.CREATE(value=0x0, offset=0xF, size=0x11)
+        + Op.SWAP3
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x26),
+        storage={65535: 0xFFFFFFFFFFFFFFFF},
+        nonce=18446744073709551615,
+        address=Address(0xE51BC07F90C9661FA42DB3BDE8DD52B942AC69E0),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #   let calltype      := calldataload(4)
+    #   let callernonce   := calldataload(36)
+    #   let destnonce     := calldataload(68)
+    #   let createtype    := calldataload(100)
+    #
+    #   for { let contextnonce := sload(0xffff) } lt(contextnonce, callernonce) { contextnonce := sload(0xffff) } {  # noqa: E501
+    #     // We have a lower nonce than required for the caller, create dummy contract to increase nonce  # noqa: E501
+    #     mstore(0, 0x60016000f3)
+    #     let addr := create(0, sub(32, 5), 5)
+    #     if gt(addr, 0) { sstore(0xffff, add(contextnonce, 1)) }
+    #   }
+    #
+    #   mstore(0, createtype)
+    #   if eq(calltype, 0) {
+    #     pop(delegatecall(sub(gas(), 1000), destnonce, 0, 32, 0, 32))
+    #   }
+    #   if eq(calltype, 1) {
+    #     pop(callcode(sub(gas(), 1000), destnonce, 0, 0, 32, 0, 32))
+    #   }
+    #   if eq(calltype, 2) {
+    #     pop(call(sub(gas(), 1000), destnonce, 0, 0, 32, 0, 32))
+    #   }
+    #   let result := mload(0)
+    #   sstore(1, result)
+    #   if gt(result, 0) {
+    #     pop(call(sub(gas(), 1000), result, 0, 0, 0, 0, 0))
+    #   }
+    # }
+    entry = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x4)
+        + Op.CALLDATALOAD(offset=0x24)
+        + Op.SWAP1
+        + Op.CALLDATALOAD(offset=0x44)
+        + Op.SWAP1
+        + Op.CALLDATALOAD(offset=0x64)
+        + Op.SLOAD(key=0xFFFF)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8B, condition=Op.LT(Op.DUP2, Op.DUP5))
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.MSTORE
+        + Op.PUSH1[0x2]
+        + Op.SWAP1
+        + Op.JUMPI(pc=0x79, condition=Op.ISZERO(Op.DUP1))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x66, condition=Op.EQ(Op.DUP2, 0x1))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x52, condition=Op.EQ)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE(key=0x1, value=Op.DUP1)
+        + Op.JUMPI(pc=0x43, condition=Op.GT(Op.DUP2, 0x0))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.DUP1 * 4
+        + Op.SWAP5
+        + Op.SUB(Op.GAS, 0x3E8)
+        + Op.CALL
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x20]
+        + Op.DUP2
+        + Op.DUP1
+        + Op.DUP3
+        + Op.SWAP5
+        + Op.SUB(Op.GAS, 0x3E8)
+        + Op.POP(Op.CALL)
+        + Op.DUP1
+        + Op.JUMP(pc=0x32)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.CALLCODE(
+                gas=Op.SUB(Op.GAS, 0x3E8),
+                address=Op.DUP8,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=Op.DUP2,
+                ret_offset=0x0,
+                ret_size=0x20,
             )
-            + Op.JUMP(pc=0x2D)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.SUB(Op.GAS, 0x3E8),
-                    address=Op.DUP7,
-                    args_offset=Op.DUP2,
-                    args_size=Op.DUP2,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
+        )
+        + Op.JUMP(pc=0x2D)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=Op.SUB(Op.GAS, 0x3E8),
+                address=Op.DUP7,
+                args_offset=Op.DUP2,
+                args_size=Op.DUP2,
+                ret_offset=0x0,
+                ret_size=0x20,
             )
-            + Op.JUMP(pc=0x25)
-            + Op.JUMPDEST
-            + Op.PUSH5[0x60016000F3]
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.CREATE(value=Op.DUP3, offset=0x1B, size=0x5)
-            + Op.JUMPI(pc=0xAA, condition=Op.GT)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.SLOAD(key=0xFFFF)
-            + Op.JUMP(pc=0x12)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.SSTORE(key=0xFFFF, value=Op.ADD)
-            + Op.CODESIZE
-            + Op.JUMP(pc=0xA1)
-        ),
-        storage={0xFFFF: 0xFFFFFFFFFFFFFFFE},
+        )
+        + Op.JUMP(pc=0x25)
+        + Op.JUMPDEST
+        + Op.PUSH5[0x60016000F3]
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.CREATE(value=Op.DUP3, offset=0x1B, size=0x5)
+        + Op.JUMPI(pc=0xAA, condition=Op.GT)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.SLOAD(key=0xFFFF)
+        + Op.JUMP(pc=0x12)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0xFFFF, value=Op.ADD)
+        + Op.CODESIZE
+        + Op.JUMP(pc=0xA1),
+        storage={65535: 0xFFFFFFFFFFFFFFFE},
         nonce=18446744073709551614,
-        address=Address("0xd7d7b37fc131964cd181d47c9b705028776fe3d4"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.SLOAD(key=0xFFFF)
-            + Op.MSTORE(offset=0x0, value=0x6005600C60003960056000F36001600155)
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.JUMPI(pc=0x5E, condition=Op.EQ(Op.DUP2, 0x0))
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.JUMPI(pc=0x4F, condition=Op.EQ)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x2, value=Op.DUP2)
-            + Op.JUMPI(pc=0x43, condition=Op.GT(Op.DUP3, 0x0))
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.MSTORE
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.SSTORE(key=0xFFFF, value=Op.ADD)
-            + Op.CODESIZE
-            + Op.JUMP(pc=0x39)
-            + Op.JUMPDEST
-            + Op.SWAP1
-            + Op.POP
-            + Op.CREATE2(value=0x0, offset=0xF, size=0x11, salt=Op.DUP1)
-            + Op.SWAP1
-            + Op.JUMP(pc=0x2D)
-            + Op.JUMPDEST
-            + Op.SWAP2
-            + Op.POP
-            + Op.PUSH1[0x1]
-            + Op.CREATE(value=0x0, offset=0xF, size=0x11)
-            + Op.SWAP3
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x26)
-        ),
-        storage={0xFFFF: 0xFFFFFFFFFFFFFFFF},
-        nonce=18446744073709551615,
-        address=Address("0xe51bc07f90c9661fa42db3bde8dd52b942ac69e0"),  # noqa: E501
+        address=Address(0xD7D7B37FC131964CD181D47C9B705028776FE3D4),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [8, 9, 6, 7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                entry: Account(
+                    storage={1: 0, 2: 0, 65535: 0xFFFFFFFFFFFFFFFF},
+                    nonce=18446744073709551615,
+                ),
+                max_nonce_minus_1: Account(
+                    storage={65535: 0xFFFFFFFFFFFFFFFE},
+                    nonce=18446744073709551614,
+                ),
+                max_nonce: Account(
+                    storage={65535: 0xFFFFFFFFFFFFFFFF},
+                    nonce=18446744073709551615,
+                ),
+                Address(
+                    0x3689DBE15F5217CDA3865B4158DA57C7A3F9AD88
+                ): Account.NONEXISTENT,
+                Address(
+                    0xD77662C5102179C42ABBCAFCCC90AB351E7A1E4B
+                ): Account.NONEXISTENT,
+                Address(
+                    0xB840E64C3AA027210A2CEBA09411CF1DD48C56A7
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [10], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                entry: Account(
+                    storage={
+                        1: 0x99F1BFB202FDF527E07FB8EB682A03C713AEAF11,
+                        65535: 0xFFFFFFFFFFFFFFFF,
+                    },
+                    nonce=18446744073709551615,
+                ),
+                max_nonce_minus_1: Account(
+                    storage={
+                        2: 0x99F1BFB202FDF527E07FB8EB682A03C713AEAF11,
+                        65535: 0xFFFFFFFFFFFFFFFF,
+                    },
+                    nonce=18446744073709551615,
+                ),
+                max_nonce: Account(
+                    storage={65535: 0xFFFFFFFFFFFFFFFF},
+                    nonce=18446744073709551615,
+                ),
+                Address(0x99F1BFB202FDF527E07FB8EB682A03C713AEAF11): Account(
+                    storage={1: 1}, code=bytes.fromhex("6001600155")
+                ),
+                Address(
+                    0x3689DBE15F5217CDA3865B4158DA57C7A3F9AD88
+                ): Account.NONEXISTENT,
+                Address(
+                    0xD77662C5102179C42ABBCAFCCC90AB351E7A1E4B
+                ): Account.NONEXISTENT,
+                Address(
+                    0xB840E64C3AA027210A2CEBA09411CF1DD48C56A7
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [11], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                entry: Account(
+                    storage={1: 0, 65535: 0xFFFFFFFFFFFFFFFF},
+                    nonce=18446744073709551615,
+                ),
+                max_nonce_minus_1: Account(
+                    storage={65535: 0xFFFFFFFFFFFFFFFE},
+                    nonce=18446744073709551614,
+                ),
+                max_nonce: Account(
+                    storage={2: 0, 65535: 0xFFFFFFFFFFFFFFFF},
+                    nonce=18446744073709551615,
+                ),
+                Address(
+                    0x3689DBE15F5217CDA3865B4158DA57C7A3F9AD88
+                ): Account.NONEXISTENT,
+                Address(
+                    0xD77662C5102179C42ABBCAFCCC90AB351E7A1E4B
+                ): Account.NONEXISTENT,
+                Address(
+                    0xB840E64C3AA027210A2CEBA09411CF1DD48C56A7
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [0, 1, 2, 3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                entry: Account(
+                    storage={
+                        1: 0x74F5960E3479218EC095E853ED1FC95E285ADC3B,
+                        2: 0x74F5960E3479218EC095E853ED1FC95E285ADC3B,
+                        65535: 0xFFFFFFFFFFFFFFFF,
+                    },
+                    nonce=18446744073709551615,
+                ),
+                max_nonce_minus_1: Account(
+                    storage={65535: 0xFFFFFFFFFFFFFFFE},
+                    nonce=18446744073709551614,
+                ),
+                max_nonce: Account(
+                    storage={65535: 0xFFFFFFFFFFFFFFFF},
+                    nonce=18446744073709551615,
+                ),
+                Address(0x74F5960E3479218EC095E853ED1FC95E285ADC3B): Account(
+                    storage={1: 1}, code=bytes.fromhex("6001600155")
+                ),
+                Address(
+                    0x3689DBE15F5217CDA3865B4158DA57C7A3F9AD88
+                ): Account.NONEXISTENT,
+                Address(
+                    0xD77662C5102179C42ABBCAFCCC90AB351E7A1E4B
+                ): Account.NONEXISTENT,
+                Address(
+                    0xB840E64C3AA027210A2CEBA09411CF1DD48C56A7
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                entry: Account(
+                    storage={
+                        1: 0x99F1BFB202FDF527E07FB8EB682A03C713AEAF11,
+                        65535: 0xFFFFFFFFFFFFFFFE,
+                    },
+                    nonce=18446744073709551614,
+                ),
+                max_nonce_minus_1: Account(
+                    storage={
+                        2: 0x99F1BFB202FDF527E07FB8EB682A03C713AEAF11,
+                        65535: 0xFFFFFFFFFFFFFFFF,
+                    },
+                    nonce=18446744073709551615,
+                ),
+                max_nonce: Account(
+                    storage={65535: 0xFFFFFFFFFFFFFFFF},
+                    nonce=18446744073709551615,
+                ),
+                Address(0x99F1BFB202FDF527E07FB8EB682A03C713AEAF11): Account(
+                    storage={1: 1}, code=bytes.fromhex("6001600155")
+                ),
+                Address(
+                    0x3689DBE15F5217CDA3865B4158DA57C7A3F9AD88
+                ): Account.NONEXISTENT,
+                Address(
+                    0xD77662C5102179C42ABBCAFCCC90AB351E7A1E4B
+                ): Account.NONEXISTENT,
+                Address(
+                    0xB840E64C3AA027210A2CEBA09411CF1DD48C56A7
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                entry: Account(
+                    storage={1: 0, 65535: 0xFFFFFFFFFFFFFFFE},
+                    nonce=18446744073709551614,
+                ),
+                max_nonce_minus_1: Account(
+                    storage={65535: 0xFFFFFFFFFFFFFFFE},
+                    nonce=18446744073709551614,
+                ),
+                max_nonce: Account(
+                    storage={2: 0, 65535: 0xFFFFFFFFFFFFFFFF},
+                    nonce=18446744073709551615,
+                ),
+                Address(
+                    0x3689DBE15F5217CDA3865B4158DA57C7A3F9AD88
+                ): Account.NONEXISTENT,
+                Address(
+                    0xD77662C5102179C42ABBCAFCCC90AB351E7A1E4B
+                ): Account.NONEXISTENT,
+                Address(
+                    0xB840E64C3AA027210A2CEBA09411CF1DD48C56A7
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [18, 19, 20, 21], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                entry: Account(
+                    storage={1: 0, 2: 0, 65535: 0xFFFFFFFFFFFFFFFF},
+                    nonce=18446744073709551615,
+                ),
+                max_nonce_minus_1: Account(
+                    storage={65535: 0xFFFFFFFFFFFFFFFE},
+                    nonce=18446744073709551614,
+                ),
+                max_nonce: Account(
+                    storage={65535: 0xFFFFFFFFFFFFFFFF},
+                    nonce=18446744073709551615,
+                ),
+                Address(
+                    0x4E060B3A192FD2A082A00259BE2F021AD996D71C
+                ): Account.NONEXISTENT,
+                Address(
+                    0xAA17FC42EF60F987CD7BC803EC28BCC9F0ED1C31
+                ): Account.NONEXISTENT,
+                Address(
+                    0x76E76DCFBBE7DB1A0A9AB7D6B12E3A309188018A
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [22], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                entry: Account(
+                    storage={
+                        1: 0x1CFC908BB573719841CAD6A8BC34E7C1CE5EE020,
+                        65535: 0xFFFFFFFFFFFFFFFF,
+                    },
+                    nonce=18446744073709551615,
+                ),
+                max_nonce_minus_1: Account(
+                    storage={
+                        2: 0x1CFC908BB573719841CAD6A8BC34E7C1CE5EE020,
+                        65535: 0xFFFFFFFFFFFFFFFF,
+                    },
+                    nonce=18446744073709551615,
+                ),
+                max_nonce: Account(
+                    storage={65535: 0xFFFFFFFFFFFFFFFF},
+                    nonce=18446744073709551615,
+                ),
+                Address(0x1CFC908BB573719841CAD6A8BC34E7C1CE5EE020): Account(
+                    storage={1: 1}, code=bytes.fromhex("6001600155")
+                ),
+                Address(
+                    0x4E060B3A192FD2A082A00259BE2F021AD996D71C
+                ): Account.NONEXISTENT,
+                Address(
+                    0xAA17FC42EF60F987CD7BC803EC28BCC9F0ED1C31
+                ): Account.NONEXISTENT,
+                Address(
+                    0x76E76DCFBBE7DB1A0A9AB7D6B12E3A309188018A
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [23], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                entry: Account(
+                    storage={1: 0, 65535: 0xFFFFFFFFFFFFFFFF},
+                    nonce=18446744073709551615,
+                ),
+                max_nonce_minus_1: Account(
+                    storage={65535: 0xFFFFFFFFFFFFFFFE},
+                    nonce=18446744073709551614,
+                ),
+                max_nonce: Account(
+                    storage={2: 0, 65535: 0xFFFFFFFFFFFFFFFF},
+                    nonce=18446744073709551615,
+                ),
+                Address(
+                    0x4E060B3A192FD2A082A00259BE2F021AD996D71C
+                ): Account.NONEXISTENT,
+                Address(
+                    0xAA17FC42EF60F987CD7BC803EC28BCC9F0ED1C31
+                ): Account.NONEXISTENT,
+                Address(
+                    0x76E76DCFBBE7DB1A0A9AB7D6B12E3A309188018A
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [12, 13, 14, 15], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                entry: Account(
+                    storage={
+                        1: 0x9F07A698496A643301174853C4F7F1EAAB166BE,
+                        2: 0x9F07A698496A643301174853C4F7F1EAAB166BE,
+                        65535: 0xFFFFFFFFFFFFFFFF,
+                    },
+                    nonce=18446744073709551615,
+                ),
+                max_nonce_minus_1: Account(
+                    storage={65535: 0xFFFFFFFFFFFFFFFE},
+                    nonce=18446744073709551614,
+                ),
+                max_nonce: Account(
+                    storage={65535: 0xFFFFFFFFFFFFFFFF},
+                    nonce=18446744073709551615,
+                ),
+                Address(0x09F07A698496A643301174853C4F7F1EAAB166BE): Account(
+                    storage={1: 1}, code=bytes.fromhex("6001600155")
+                ),
+                Address(
+                    0x4E060B3A192FD2A082A00259BE2F021AD996D71C
+                ): Account.NONEXISTENT,
+                Address(
+                    0xAA17FC42EF60F987CD7BC803EC28BCC9F0ED1C31
+                ): Account.NONEXISTENT,
+                Address(
+                    0x76E76DCFBBE7DB1A0A9AB7D6B12E3A309188018A
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [16], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                entry: Account(
+                    storage={
+                        1: 0x1CFC908BB573719841CAD6A8BC34E7C1CE5EE020,
+                        65535: 0xFFFFFFFFFFFFFFFE,
+                    },
+                    nonce=18446744073709551614,
+                ),
+                max_nonce_minus_1: Account(
+                    storage={
+                        2: 0x1CFC908BB573719841CAD6A8BC34E7C1CE5EE020,
+                        65535: 0xFFFFFFFFFFFFFFFF,
+                    },
+                    nonce=18446744073709551615,
+                ),
+                max_nonce: Account(
+                    storage={65535: 0xFFFFFFFFFFFFFFFF},
+                    nonce=18446744073709551615,
+                ),
+                Address(0x1CFC908BB573719841CAD6A8BC34E7C1CE5EE020): Account(
+                    storage={1: 1}, code=bytes.fromhex("6001600155")
+                ),
+                Address(
+                    0x4E060B3A192FD2A082A00259BE2F021AD996D71C
+                ): Account.NONEXISTENT,
+                Address(
+                    0xAA17FC42EF60F987CD7BC803EC28BCC9F0ED1C31
+                ): Account.NONEXISTENT,
+                Address(
+                    0x76E76DCFBBE7DB1A0A9AB7D6B12E3A309188018A
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [17], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                entry: Account(
+                    storage={1: 0, 65535: 0xFFFFFFFFFFFFFFFE},
+                    nonce=18446744073709551614,
+                ),
+                max_nonce_minus_1: Account(
+                    storage={65535: 0xFFFFFFFFFFFFFFFE},
+                    nonce=18446744073709551614,
+                ),
+                max_nonce: Account(
+                    storage={2: 0, 65535: 0xFFFFFFFFFFFFFFFF},
+                    nonce=18446744073709551615,
+                ),
+                Address(
+                    0x4E060B3A192FD2A082A00259BE2F021AD996D71C
+                ): Account.NONEXISTENT,
+                Address(
+                    0xAA17FC42EF60F987CD7BC803EC28BCC9F0ED1C31
+                ): Account.NONEXISTENT,
+                Address(
+                    0x76E76DCFBBE7DB1A0A9AB7D6B12E3A309188018A
+                ): Account.NONEXISTENT,
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0xFFFFFFFFFFFFFFFE)
+        + Hash(max_nonce_minus_1, left_padding=True)
+        + Hash(0x0),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0xFFFFFFFFFFFFFFFE)
+        + Hash(max_nonce, left_padding=True)
+        + Hash(0x0),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0xFFFFFFFFFFFFFFFE)
+        + Hash(max_nonce_minus_1, left_padding=True)
+        + Hash(0x0),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0xFFFFFFFFFFFFFFFE)
+        + Hash(max_nonce, left_padding=True)
+        + Hash(0x0),
+        Bytes("917694f9")
+        + Hash(0x2)
+        + Hash(0xFFFFFFFFFFFFFFFE)
+        + Hash(max_nonce_minus_1, left_padding=True)
+        + Hash(0x0),
+        Bytes("917694f9")
+        + Hash(0x2)
+        + Hash(0xFFFFFFFFFFFFFFFE)
+        + Hash(max_nonce, left_padding=True)
+        + Hash(0x0),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0xFFFFFFFFFFFFFFFF)
+        + Hash(max_nonce_minus_1, left_padding=True)
+        + Hash(0x0),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0xFFFFFFFFFFFFFFFF)
+        + Hash(max_nonce, left_padding=True)
+        + Hash(0x0),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0xFFFFFFFFFFFFFFFF)
+        + Hash(max_nonce_minus_1, left_padding=True)
+        + Hash(0x0),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0xFFFFFFFFFFFFFFFF)
+        + Hash(max_nonce, left_padding=True)
+        + Hash(0x0),
+        Bytes("917694f9")
+        + Hash(0x2)
+        + Hash(0xFFFFFFFFFFFFFFFF)
+        + Hash(max_nonce_minus_1, left_padding=True)
+        + Hash(0x0),
+        Bytes("917694f9")
+        + Hash(0x2)
+        + Hash(0xFFFFFFFFFFFFFFFF)
+        + Hash(max_nonce, left_padding=True)
+        + Hash(0x0),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0xFFFFFFFFFFFFFFFE)
+        + Hash(max_nonce_minus_1, left_padding=True)
+        + Hash(0x1),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0xFFFFFFFFFFFFFFFE)
+        + Hash(max_nonce, left_padding=True)
+        + Hash(0x1),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0xFFFFFFFFFFFFFFFE)
+        + Hash(max_nonce_minus_1, left_padding=True)
+        + Hash(0x1),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0xFFFFFFFFFFFFFFFE)
+        + Hash(max_nonce, left_padding=True)
+        + Hash(0x1),
+        Bytes("917694f9")
+        + Hash(0x2)
+        + Hash(0xFFFFFFFFFFFFFFFE)
+        + Hash(max_nonce_minus_1, left_padding=True)
+        + Hash(0x1),
+        Bytes("917694f9")
+        + Hash(0x2)
+        + Hash(0xFFFFFFFFFFFFFFFE)
+        + Hash(max_nonce, left_padding=True)
+        + Hash(0x1),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0xFFFFFFFFFFFFFFFF)
+        + Hash(max_nonce_minus_1, left_padding=True)
+        + Hash(0x1),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0xFFFFFFFFFFFFFFFF)
+        + Hash(max_nonce, left_padding=True)
+        + Hash(0x1),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0xFFFFFFFFFFFFFFFF)
+        + Hash(max_nonce_minus_1, left_padding=True)
+        + Hash(0x1),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0xFFFFFFFFFFFFFFFF)
+        + Hash(max_nonce, left_padding=True)
+        + Hash(0x1),
+        Bytes("917694f9")
+        + Hash(0x2)
+        + Hash(0xFFFFFFFFFFFFFFFF)
+        + Hash(max_nonce_minus_1, left_padding=True)
+        + Hash(0x1),
+        Bytes("917694f9")
+        + Hash(0x2)
+        + Hash(0xFFFFFFFFFFFFFFFF)
+        + Hash(max_nonce, left_padding=True)
+        + Hash(0x1),
+    ]
+    tx_gas = [16777216]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
+        to=entry,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_high_nonce_minus1.py b/tests/ported_static/stCreate2/test_create2_high_nonce_minus1.py
index 368bbdf77c1..10ac3bc04d9 100644
--- a/tests/ported_static/stCreate2/test_create2_high_nonce_minus1.py
+++ b/tests/ported_static/stCreate2/test_create2_high_nonce_minus1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_create2_high_nonce_minus1.
 
 Ported from:
-tests/static/state_tests/stCreate2/CREATE2_HighNonceMinus1Filler.yml
+state_tests/stCreate2/CREATE2_HighNonceMinus1Filler.yml
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/CREATE2_HighNonceMinus1Filler.yml"],
+    ["state_tests/stCreate2/CREATE2_HighNonceMinus1Filler.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_create2_high_nonce_minus1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_create2_high_nonce_minus1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -46,43 +48,48 @@ def test_create2_high_nonce_minus1(
     )
 
     pre[sender] = Account(balance=0x3B9ACA00)
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   // initcode: { return(0, 1) }
     #   mstore(0, 0x60016000f3000000000000000000000000000000000000000000000000000000)  # noqa: E501
     #   sstore(0, create2(0, 0, 5, 0))
     #   sstore(1, 1)
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SHL(0xD8, 0x60016000F3)
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.PUSH1[0x5]
-            + Op.DUP2
-            + Op.DUP1
-            + Op.SSTORE(key=0x0, value=Op.CREATE2)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SHL(0xD8, 0x60016000F3)
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.PUSH1[0x5]
+        + Op.DUP2
+        + Op.DUP1
+        + Op.SSTORE(key=0x0, value=Op.CREATE2)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.STOP,
         nonce=18446744073709551614,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=16777216,
     )
 
     post = {
-        contract: Account(
+        sender: Account(nonce=1),
+        contract_0: Account(
             storage={
                 0: 0x77DD5D2A2B742CA01EE2CFFF306445E3741EF744,
                 1: 1,
             },
+            nonce=18446744073709551615,
+        ),
+        Address(0x77DD5D2A2B742CA01EE2CFFF306445E3741EF744): Account(
+            code=bytes.fromhex("00")
         ),
     }
 
diff --git a/tests/ported_static/stCreate2/test_create2_init_codes.py b/tests/ported_static/stCreate2/test_create2_init_codes.py
index 6e6309558ec..e1ad5fa965b 100644
--- a/tests/ported_static/stCreate2/test_create2_init_codes.py
+++ b/tests/ported_static/stCreate2/test_create2_init_codes.py
@@ -1,8 +1,8 @@
 """
-testing different byte opcodes inside create2 init code.
+Testing different byte opcodes inside create2 init code.
 
 Ported from:
-tests/static/state_tests/stCreate2/create2InitCodesFiller.json
+state_tests/stCreate2/create2InitCodesFiller.json
 """
 
 import pytest
@@ -14,95 +14,92 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/create2InitCodesFiller.json"],
+    ["state_tests/stCreate2/create2InitCodesFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "60006000536000600160006000f560005500",
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={0: 0x9CCB06046C674D1A423C968D7998235BC33D40C1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        ("60566000536000600160006000f560005500", {}),
-        ("60016000536000600160006000f560005500", {}),
-        ("60f46000536000600160006000f560005500", {}),
-        (
-            "6a60016001556001546002556000526000600b60156000f560005500",
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={0: 0xD46F8D2A93844FB23D8A2803A615F3D00849B8AB}
-                ),
-                Address("0xd46f8d2a93844fb23d8a2803a615f3d00849b8ab"): Account(
-                    storage={1: 1, 2: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "626001ff60005260006003601d6000f560005500",
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={0: 0xADF52AAFB61364F699F9B15EE605EF82DCA7F53D}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "626001ff60005260006003601d6001f560005500",
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={0: 0xADF52AAFB61364F699F9B15EE605EF82DCA7F53D}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
-        (
-            "60006003601d6000f560005500",
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={0: 0x52B620D9A3FD03486496061138825A08B4DA501F}
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
         ),
-        (
-            "6160a960005260006002601e6001f560005500",
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={0: 0x5210981AE8161A02A1B7E37452AE142AEDC66EA3}
-                )
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
         ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2_init_codes(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Testing different byte opcodes inside create2 init code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -118,16 +115,164 @@ def test_create2_init_codes(
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x9CCB06046C674D1A423C968D7998235BC33D40C1): Account(
+                    nonce=1
+                ),
+                sender: Account(nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={0: 0x9CCB06046C674D1A423C968D7998235BC33D40C1},
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2, 3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=sender, nonce=0): Account(
+                    balance=1, nonce=2
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xD46F8D2A93844FB23D8A2803A615F3D00849B8AB): Account(
+                    storage={1: 1, 2: 1}
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(
+                    0xADF52AAFB61364F699F9B15EE605EF82DCA7F53D
+                ): Account.NONEXISTENT,
+                sender: Account(nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={0: 0xADF52AAFB61364F699F9B15EE605EF82DCA7F53D},
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(
+                    0xADF52AAFB61364F699F9B15EE605EF82DCA7F53D
+                ): Account.NONEXISTENT,
+                Address(0x0000000000000000000000000000000000000001): Account(
+                    balance=1
+                ),
+                sender: Account(nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={0: 0xADF52AAFB61364F699F9B15EE605EF82DCA7F53D},
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x52B620D9A3FD03486496061138825A08B4DA501F): Account(
+                    nonce=1
+                ),
+                sender: Account(nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={0: 0x52B620D9A3FD03486496061138825A08B4DA501F},
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [8], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x5210981AE8161A02A1B7E37452AE142AEDC66EA3): Account(
+                    balance=1, nonce=1
+                ),
+                sender: Account(nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={0: 0x5210981AE8161A02A1B7E37452AE142AEDC66EA3},
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.MSTORE8(offset=0x0, value=0x0)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE2(value=0x0, offset=0x0, size=0x1, salt=0x0),
+        )
+        + Op.STOP,
+        Op.MSTORE8(offset=0x0, value=0x56)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE2(value=0x0, offset=0x0, size=0x1, salt=0x0),
+        )
+        + Op.STOP,
+        Op.MSTORE8(offset=0x0, value=0x1)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE2(value=0x0, offset=0x0, size=0x1, salt=0x0),
+        )
+        + Op.STOP,
+        Op.MSTORE8(offset=0x0, value=0xF4)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE2(value=0x0, offset=0x0, size=0x1, salt=0x0),
+        )
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x6001600155600154600255)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE2(value=0x0, offset=0x15, size=0xB, salt=0x0),
+        )
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x6001FF)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE2(value=0x0, offset=0x1D, size=0x3, salt=0x0),
+        )
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x6001FF)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE2(value=0x1, offset=0x1D, size=0x3, salt=0x0),
+        )
+        + Op.STOP,
+        Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE2(value=0x0, offset=0x1D, size=0x3, salt=0x0),
+        )
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x60A9)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE2(value=0x1, offset=0x1E, size=0x2, salt=0x0),
+        )
+        + Op.STOP,
+    ]
+    tx_gas = [800000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=800000,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_on_depth1023.py b/tests/ported_static/stCreate2/test_create2_on_depth1023.py
index 1381fa65250..6f7aaf2b6a7 100644
--- a/tests/ported_static/stCreate2/test_create2_on_depth1023.py
+++ b/tests/ported_static/stCreate2/test_create2_on_depth1023.py
@@ -2,7 +2,7 @@
 Create2OnDepth1023, 0x0400 indicates 1022 level.
 
 Ported from:
-tests/static/state_tests/stCreate2/Create2OnDepth1023Filler.json
+state_tests/stCreate2/Create2OnDepth1023Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/Create2OnDepth1023Filler.json"],
+    ["state_tests/stCreate2/Create2OnDepth1023Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -32,7 +33,9 @@ def test_create2_on_depth1023(
     pre: Alloc,
 ) -> None:
     """Create2OnDepth1023, 0x0400 indicates 1022 level."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -47,70 +50,68 @@ def test_create2_on_depth1023(
     )
 
     pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 (CALLDATALOAD 0)) (MSTORE 0 (ADD 2 (MLOAD 0))) (if (EQ (MLOAD 0) 0x0400) (seq (MSTORE 32 0x6000600060006000f5600155) [[1]] (CREATE2 0 52 12 0))  (CALL (GAS) 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b (EQ (MLOAD 0) 0x0400) 0 32 0 0)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(offset=0x0, value=Op.ADD(0x2, Op.MLOAD(offset=0x0)))
-            + Op.JUMPI(pc=0x43, condition=Op.EQ(Op.MLOAD(offset=0x0), 0x400))
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=Op.EQ(Op.MLOAD(offset=0x0), 0x400),
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMP(pc=0x60)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x20, value=0x6000600060006000F5600155)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CREATE2(value=0x0, offset=0x34, size=0xC, salt=0x0),
-            )
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (MSTORE 0 (CALLDATALOAD 0)) (CALL (GAS) 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 32 0 0) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.CALL(
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.MSTORE(offset=0x0, value=Op.ADD(0x2, Op.MLOAD(offset=0x0)))
+        + Op.JUMPI(pc=0x43, condition=Op.EQ(Op.MLOAD(offset=0x0), 0x400))
+        + Op.POP(
+            Op.CALL(
                 gas=Op.GAS,
-                address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                value=0x0,
+                address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                value=Op.EQ(Op.MLOAD(offset=0x0), 0x400),
                 args_offset=0x0,
                 args_size=0x20,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.JUMP(pc=0x60)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x20, value=0x6000600060006000F5600155)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CREATE2(value=0x0, offset=0x34, size=0xC, salt=0x0),
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
+    )
+    # Source: lll
+    # { (MSTORE 0 (CALLDATALOAD 0)) (CALL (GAS) 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 32 0 0) }  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x20,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=9151314442816847871,
     )
 
     post = {
-        Address("0xa3da9580897e90044fa0de6969815406b3172e3a"): Account(
+        Address(0x4F05179F0987710F94F2CBDE67C5357BC1815AF3): Account(nonce=1),
+        Address(0xA3DA9580897E90044FA0DE6969815406B3172E3A): Account(
             storage={1: 0x4F05179F0987710F94F2CBDE67C5357BC1815AF3},
         ),
-        contract: Account(
+        contract_0: Account(
             storage={1: 0xA3DA9580897E90044FA0DE6969815406B3172E3A},
         ),
     }
diff --git a/tests/ported_static/stCreate2/test_create2_on_depth1024.py b/tests/ported_static/stCreate2/test_create2_on_depth1024.py
index db131125404..68c67ed0a13 100644
--- a/tests/ported_static/stCreate2/test_create2_on_depth1024.py
+++ b/tests/ported_static/stCreate2/test_create2_on_depth1024.py
@@ -2,7 +2,7 @@
 Create2OnDepth1024, 0x0400 indicates 1022 level.
 
 Ported from:
-tests/static/state_tests/stCreate2/Create2OnDepth1024Filler.json
+state_tests/stCreate2/Create2OnDepth1024Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/Create2OnDepth1024Filler.json"],
+    ["state_tests/stCreate2/Create2OnDepth1024Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -32,7 +33,9 @@ def test_create2_on_depth1024(
     pre: Alloc,
 ) -> None:
     """Create2OnDepth1024, 0x0400 indicates 1022 level."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -47,73 +50,71 @@ def test_create2_on_depth1024(
     )
 
     pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 (CALLDATALOAD 0)) (MSTORE 0 (ADD 2 (MLOAD 0))) (if (EQ (MLOAD 0) 0x0400) (seq (MSTORE 32 0x686000600060006000f56000526000600960176000f5600155) [[1]] (CREATE2 0 39 25 0))  (CALL (GAS) 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b (EQ (MLOAD 0) 0x0400) 0 32 0 0)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(offset=0x0, value=Op.ADD(0x2, Op.MLOAD(offset=0x0)))
-            + Op.JUMPI(pc=0x43, condition=Op.EQ(Op.MLOAD(offset=0x0), 0x400))
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=Op.EQ(Op.MLOAD(offset=0x0), 0x400),
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMP(pc=0x6D)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x686000600060006000F56000526000600960176000F5600155,
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CREATE2(value=0x0, offset=0x27, size=0x19, salt=0x0),
-            )
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (MSTORE 0 (CALLDATALOAD 0)) (CALL (GAS) 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 32 0 0) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.CALL(
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.MSTORE(offset=0x0, value=Op.ADD(0x2, Op.MLOAD(offset=0x0)))
+        + Op.JUMPI(pc=0x43, condition=Op.EQ(Op.MLOAD(offset=0x0), 0x400))
+        + Op.POP(
+            Op.CALL(
                 gas=Op.GAS,
-                address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                value=0x0,
+                address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                value=Op.EQ(Op.MLOAD(offset=0x0), 0x400),
                 args_offset=0x0,
                 args_size=0x20,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.JUMP(pc=0x6D)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x686000600060006000F56000526000600960176000F5600155,
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CREATE2(value=0x0, offset=0x27, size=0x19, salt=0x0),
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
+    )
+    # Source: lll
+    # { (MSTORE 0 (CALLDATALOAD 0)) (CALL (GAS) 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 32 0 0) }  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x20,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=9151314442816847871,
     )
 
     post = {
-        Address("0xb250d8cdad4a7a81323be508f4ac44584dd27597"): Account(
+        Address(0x436B8F99E8D953CDAF8F9472116ADD83CCD82A65): Account(nonce=1),
+        Address(0xB250D8CDAD4A7A81323BE508F4AC44584DD27597): Account(
             storage={1: 0x436B8F99E8D953CDAF8F9472116ADD83CCD82A65},
         ),
-        contract: Account(
+        contract_0: Account(
             storage={1: 0xB250D8CDAD4A7A81323BE508F4AC44584DD27597},
         ),
     }
diff --git a/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code.py b/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code.py
index e5c019a4b77..ab52f770473 100644
--- a/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code.py
+++ b/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_create2_oo_gafter_init_code.
 
 Ported from:
-tests/static/state_tests/stCreate2/Create2OOGafterInitCodeFiller.json
+state_tests/stCreate2/Create2OOGafterInitCodeFiller.json
 """
 
 import pytest
@@ -11,10 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,26 +27,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/Create2OOGafterInitCodeFiller.json"],
+    ["state_tests/stCreate2/Create2OOGafterInitCodeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (54000, {}),
-        (55000, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2_oo_gafter_init_code(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_create2_oo_gafter_init_code."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -56,24 +73,52 @@ def test_create2_oo_gafter_init_code(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
-            + Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 0}),
+                Address(
+                    0x6878B140F875209C82AB4D5F083B55947299EF6B
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 0}),
+                Address(0x6878B140F875209C82AB4D5F083B55947299EF6B): Account(
+                    code=bytes.fromhex("6001600155")
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [54000, 55000]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_returndata.py b/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_returndata.py
index 2f8291be207..acbce0f8db4 100644
--- a/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_returndata.py
+++ b/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_returndata.py
@@ -1,20 +1,22 @@
 """
-Call RETURNDATASIZE and RETURNDATACOPY (BufferOverrun) after CREATE2 deploy...
+Call RETURNDATASIZE and RETURNDATACOPY (BufferOverrun) after CREATE2...
 
 Ported from:
-tests/static/state_tests/stCreate2/Create2OOGafterInitCodeReturndataFiller.json
+state_tests/stCreate2/Create2OOGafterInitCodeReturndataFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,45 +24,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/Create2OOGafterInitCodeReturndataFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/Create2OOGafterInitCodeReturndataFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            54000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
         ),
-        (
-            95000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2_oo_gafter_init_code_returndata(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Call RETURNDATASIZE and RETURNDATACOPY (BufferOverrun) after..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -71,29 +67,36 @@ def test_create2_oo_gafter_init_code_returndata(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) [[ 1 ]] (RETURNDATASIZE) (RETURNDATACOPY 0 0 32) [[ 2 ]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
-            + Op.POP(Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0))
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x1: 0x1, 0x2: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0))
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={1: 1, 2: 1},
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [54000, 95000]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {
+        contract_0: Account(storage={1: 1, 2: 1}),
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_returndata2.py b/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_returndata2.py
index 085f97df077..f259f787b86 100644
--- a/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_returndata2.py
+++ b/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_returndata2.py
@@ -2,8 +2,7 @@
 Call RETURNDATASIZE and RETURNDATACOPY after CREATE2 deploy a contract....
 
 Ported from:
-tests/static/state_tests/stCreate2
-Create2OOGafterInitCodeReturndata2Filler.json
+state_tests/stCreate2/Create2OOGafterInitCodeReturndata2Filler.json
 """
 
 import pytest
@@ -12,9 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -23,42 +28,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/Create2OOGafterInitCodeReturndata2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/Create2OOGafterInitCodeReturndata2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            54000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={1: 2}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
         ),
-        (
-            95000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={2: 0x6460016001556000526005601BF3}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2_oo_gafter_init_code_returndata2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Call RETURNDATASIZE and RETURNDATACOPY after CREATE2 deploy a..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -73,28 +74,58 @@ def test_create2_oo_gafter_init_code_returndata2(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) [[ 1 ]] (RETURNDATASIZE) (RETURNDATACOPY 0 0 0) [[ 2 ]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
-            + Op.POP(Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0))
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x0)
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x1: 0x2},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0))
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x0)
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={1: 2},
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 2, 2: 0}),
+                compute_create_address(
+                    address=contract_0, nonce=0
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={1: 0, 2: 0x6460016001556000526005601BF3}
+                ),
+                Address(0x6878B140F875209C82AB4D5F083B55947299EF6B): Account(
+                    code=bytes.fromhex("6001600155")
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [54000, 95000]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_returndata3.py b/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_returndata3.py
index 4a47727d834..075f116015f 100644
--- a/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_returndata3.py
+++ b/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_returndata3.py
@@ -1,20 +1,20 @@
 """
-Calls a contract that runs CREATE2 which deploy a code. then OOG happens...
+Calls a contract that runs CREATE2 which deploy a code. then OOG...
 
 Ported from:
-tests/static/state_tests/stCreate2
-Create2OOGafterInitCodeReturndata3Filler.json
+state_tests/stCreate2/Create2OOGafterInitCodeReturndata3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/Create2OOGafterInitCodeReturndata3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/Create2OOGafterInitCodeReturndata3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +31,11 @@ def test_create2_oo_gafter_init_code_returndata3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Calls a contract that runs CREATE2 which deploy a code. then OOG..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Calls a contract that runs CREATE2 which deploy a code."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,50 +46,47 @@ def test_create2_oo_gafter_init_code_returndata3(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
-            + Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (CALLCODE (GAS) 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 32) (RETURNDATACOPY 0 0 32) [[ 1 ]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=Op.GAS,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
             )
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+        )
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=55000,
     )
 
     post = {
-        contract: Account(storage={1: 1}),
+        contract_0: Account(storage={1: 1}),
+        compute_create_address(
+            address=contract_1, nonce=0
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_returndata_size.py b/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_returndata_size.py
index 24768e3b7e9..77799dc86dd 100644
--- a/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_returndata_size.py
+++ b/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_returndata_size.py
@@ -1,20 +1,20 @@
 """
-Calls a contract that runs CREATE2 which deploy a code. then OOG happens...
+Calls a contract that runs CREATE2 which deploy a code. then OOG...
 
 Ported from:
-tests/static/state_tests/stCreate2
-Create2OOGafterInitCodeReturndataSizeFiller.json
+state_tests/stCreate2/Create2OOGafterInitCodeReturndataSizeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/Create2OOGafterInitCodeReturndataSizeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/Create2OOGafterInitCodeReturndataSizeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +31,10 @@ def test_create2_oo_gafter_init_code_returndata_size(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Calls a contract that runs CREATE2 which deploy a code. then OOG..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Calls a contract that runs CREATE2 which deploy a code."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,29 +45,31 @@ def test_create2_oo_gafter_init_code_returndata_size(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x6960016001556001600255600052600a6016f3) (CREATE2 0 13 19 0) (EXP 2 (RETURNDATASIZE)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0, value=0x6960016001556001600255600052600A6016F3
-            )
-            + Op.POP(Op.CREATE2(value=0x0, offset=0xD, size=0x13, salt=0x0))
-            + Op.EXP(0x2, Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x6960016001556001600255600052600A6016F3
+        )
+        + Op.POP(Op.CREATE2(value=0x0, offset=0xD, size=0x13, salt=0x0))
+        + Op.EXP(0x2, Op.RETURNDATASIZE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=55054,
         value=1,
     )
 
-    post: dict = {}
+    post = {
+        contract_0: Account(balance=1),
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_revert.py b/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_revert.py
index 2a45a82ea22..7bc66a9747b 100644
--- a/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_revert.py
+++ b/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_revert.py
@@ -2,7 +2,7 @@
 Calls a contract that runs CREATE2 which deploy a code. then after...
 
 Ported from:
-tests/static/state_tests/stCreate2/Create2OOGafterInitCodeRevertFiller.json
+state_tests/stCreate2/Create2OOGafterInitCodeRevertFiller.json
 """
 
 import pytest
@@ -11,9 +11,11 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,9 +24,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/Create2OOGafterInitCodeRevertFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/Create2OOGafterInitCodeRevertFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +32,10 @@ def test_create2_oo_gafter_init_code_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Calls a contract that runs CREATE2 which deploy a code. then..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Calls a contract that runs CREATE2 which deploy a code."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,49 +50,49 @@ def test_create2_oo_gafter_init_code_revert(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) (REVERT 0 32) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
-            + Op.POP(Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0))
-            + Op.REVERT(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0))
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (CALL (GAS) 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 32) [[ 1 ]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
             )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=75000,
     )
 
     post = {
-        contract: Account(storage={1: 0x6460016001556000526005601BF3}),
+        contract_0: Account(storage={1: 0x6460016001556000526005601BF3}),
+        compute_create_address(
+            address=contract_1, nonce=0
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_revert2.py b/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_revert2.py
index e705b394ec1..2b48b4cb0bd 100644
--- a/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_revert2.py
+++ b/tests/ported_static/stCreate2/test_create2_oo_gafter_init_code_revert2.py
@@ -2,7 +2,7 @@
 Calls a contract that runs CREATE2 which deploy a code. then after...
 
 Ported from:
-tests/static/state_tests/stCreate2/Create2OOGafterInitCodeRevert2Filler.json
+state_tests/stCreate2/Create2OOGafterInitCodeRevert2Filler.json
 """
 
 import pytest
@@ -11,9 +11,11 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,9 +24,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/Create2OOGafterInitCodeRevert2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/Create2OOGafterInitCodeRevert2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +32,10 @@ def test_create2_oo_gafter_init_code_revert2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Calls a contract that runs CREATE2 which deploy a code. then..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Calls a contract that runs CREATE2 which deploy a code."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,49 +50,49 @@ def test_create2_oo_gafter_init_code_revert2(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) (REVERT 0 32) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
-            + Op.POP(Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0))
-            + Op.REVERT(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0))
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (CALL 33000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 32) [[ 1 ]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x80E8,
-                    address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x80E8,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
             )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=75000,
     )
 
     post = {
-        contract: Account(storage={1: 0x6460016001556000526005601BF3}),
+        contract_0: Account(storage={1: 0x6460016001556000526005601BF3}),
+        compute_create_address(
+            address=contract_1, nonce=0
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_oog_from_call_refunds.py b/tests/ported_static/stCreate2/test_create2_oog_from_call_refunds.py
index 810da7e92d5..41fa4bb6e0d 100644
--- a/tests/ported_static/stCreate2/test_create2_oog_from_call_refunds.py
+++ b/tests/ported_static/stCreate2/test_create2_oog_from_call_refunds.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_create2_oog_from_call_refunds.
 
 Ported from:
-tests/static/state_tests/stCreate2/Create2OOGFromCallRefundsFiller.yml
+state_tests/stCreate2/Create2OOGFromCallRefundsFiller.yml
 """
 
 import pytest
@@ -11,10 +11,16 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,406 +28,198 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/Create2OOGFromCallRefundsFiller.yml"],
+    ["state_tests/stCreate2/Create2OOGFromCallRefundsFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000006a",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x2a2141ed764598d4c5a8b6e036987928d5ec6bea"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="SStore_Refund_NoOoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000006c",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="SStore_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000006b",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="SStore_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000004a",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x858ec13538276b49d5ece2a408c8331ccb79ad89"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="SStore_Call_Refund_NoOoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000002a",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xd615c5eaff84f487cff253b50dc18517fc8385b0"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="SStore_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000008a",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x5a2664b55822aa3c6d9d90fec18b4c87cde07d04"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="SStore_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000008c",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="SStore_DelegateCall_Refund_NoOoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000008b",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="SStore_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000007a",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdeb7d920f2653a8eddcffca0a77f56fcd788c00a"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="SStore_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000007c",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="SStore_CallCode_Refund_NoOoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000007b",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            10,
+            0,
+            0,
+            id="SStore_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000003a",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x0d44b2ad06c5c9f9a86c9edf8d13fb7d44fe756c"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            11,
+            0,
+            0,
+            id="SStore_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xcfb6834f84b9e726f5f8aef446d585b732abdd99"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            12,
+            0,
+            0,
+            id="SelfDestruct_Refund_NoOoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            13,
+            0,
+            0,
+            id="SelfDestruct_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000002b",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            14,
+            0,
+            0,
+            id="SelfDestruct_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000002c",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            15,
+            0,
+            0,
+            id="LogOp_NoOoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            16,
+            0,
+            0,
+            id="LogOp_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            17,
+            0,
+            0,
+            id="LogOp_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000004b",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            18,
+            0,
+            0,
+            id="SStore_Create_Refund_NoOoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000004c",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            19,
+            0,
+            0,
+            id="SStore_Create_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            20,
+            0,
+            0,
+            id="SStore_Create_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000005a",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xd83e541aa11c5ae1e9c847aa1728d5bc47d32faf"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            21,
+            0,
+            0,
+            id="SStore_Create2_Refund_NoOoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000005c",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            22,
+            0,
+            0,
+            id="SStore_Create2_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000005b",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            23,
+            0,
+            0,
+            id="SStore_Create2_Refund_OoG",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2_oog_from_call_refunds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_create2_oog_from_call_refunds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA)
+    contract_1 = Address(0x000000000000000000000000000000000000001A)
+    contract_2 = Address(0x000000000000000000000000000000000000001B)
+    contract_3 = Address(0x000000000000000000000000000000000000001C)
+    contract_4 = Address(0x000000000000000000000000000000000000002A)
+    contract_5 = Address(0x000000000000000000000000000000000000002B)
+    contract_6 = Address(0x000000000000000000000000000000000000002C)
+    contract_7 = Address(0x000000000000000000000000000000000000003A)
+    contract_8 = Address(0x000000000000000000000000000000000000003B)
+    contract_9 = Address(0x000000000000000000000000000000000000003C)
+    contract_10 = Address(0x000000000000000000000000000000000000004A)
+    contract_11 = Address(0x000000000000000000000000000000000000004B)
+    contract_12 = Address(0x000000000000000000000000000000000000004C)
+    contract_13 = Address(0x000000000000000000000000000000000000005A)
+    contract_14 = Address(0x000000000000000000000000000000000000005B)
+    contract_15 = Address(0x000000000000000000000000000000000000005C)
+    contract_16 = Address(0x000000000000000000000000000000000000006A)
+    contract_17 = Address(0x000000000000000000000000000000000000006B)
+    contract_18 = Address(0x000000000000000000000000000000000000006C)
+    contract_19 = Address(0x000000000000000000000000000000000000007A)
+    contract_20 = Address(0x000000000000000000000000000000000000007B)
+    contract_21 = Address(0x000000000000000000000000000000000000007C)
+    contract_22 = Address(0x000000000000000000000000000000000000008A)
+    contract_23 = Address(0x000000000000000000000000000000000000008B)
+    contract_24 = Address(0x000000000000000000000000000000000000008C)
+    contract_25 = Address(0x00000000000000000000000000000000000C0DEA)
+    contract_26 = Address(0x00000000000000000000000000000000000C0DED)
+    contract_27 = Address(0x00000000000000000000000000000000000C0DE0)
+    contract_28 = Address(0x00000000000000000000000000000000000C0DE1)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -435,133 +233,254 @@ def test_create2_oog_from_call_refunds(
         gas_limit=4294967296,
     )
 
-    # Source: Yul
+    pre[sender] = Account(balance=0x3D0900, nonce=1)
+    # Source: yul
+    # berlin
+    # {
+    #   let init_addr := calldataload(4)
+    #   let init_length := extcodesize(init_addr)
+    #   extcodecopy(init_addr, 0, 0, init_length)
+    #   let created_addr := create2(0, 0, init_length, 0)
+    #   if eq(created_addr, 0) {
+    #     /* This invalid will deplete the remaining gas to make refund check deterministic */  # noqa: E501
+    #     invalid()
+    #   }
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.DUP1 * 2
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.DUP2
+        + Op.JUMPI(pc=0x16, condition=Op.EQ(Op.CREATE2, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.INVALID,
+        nonce=1,
+        address=Address(0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
     #   sstore(1, 0)
     #   return(0, 1)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x1]
-            + Op.PUSH1[0x0]
-            + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
-            + Op.SSTORE(key=Op.DUP3, value=Op.DUP1)
-            + Op.RETURN
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
+        + Op.SSTORE(key=Op.DUP3, value=Op.DUP1)
+        + Op.RETURN,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000001a"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000001A),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
     #   sstore(1, 0)
     #   return(0, 5000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.RETURN(offset=0x0, size=0x1388)
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.RETURN(offset=0x0, size=0x1388),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000001b"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000001B),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
     #   sstore(1, 0)
     #   invalid()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x1]
-            + Op.PUSH1[0x0]
-            + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.INVALID
-        ),
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.INVALID,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000001c"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000001C),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
+    # {
+    #   // Simple SSTORE to zero to get a refund
+    #   sstore(1, 0)
+    # }
+    contract_25 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
+        storage={1: 1},
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000C0DEA),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #   selfdestruct(origin())
+    # }
+    contract_26 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=Op.ORIGIN),
+        storage={1: 1},
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000C0DED),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #   mstore(0, 0xff)
+    #   log0(0, 32)
+    #   log1(0, 32, 0xfa)
+    #   log2(0, 32, 0xfa, 0xfb)
+    #   log3(0, 32, 0xfa, 0xfb, 0xfc)
+    #   log4(0, 32, 0xfa, 0xfb, 0xfc, 0xfd)
+    # }
+    contract_27 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xFF)
+        + Op.LOG0(offset=0x0, size=0x20)
+        + Op.LOG1(offset=0x0, size=0x20, topic_1=0xFA)
+        + Op.LOG2(offset=0x0, size=0x20, topic_1=0xFA, topic_2=0xFB)
+        + Op.LOG3(
+            offset=0x0, size=0x20, topic_1=0xFA, topic_2=0xFB, topic_3=0xFC
+        )
+        + Op.LOG4(
+            offset=0x0,
+            size=0x20,
+            topic_1=0xFA,
+            topic_2=0xFB,
+            topic_3=0xFC,
+            topic_4=0xFD,
+        )
+        + Op.STOP,
+        storage={1: 1},
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000C0DE0),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #   sstore(0, 1)
+    #   sstore(0, 0)
+    #   return(0, 1)
+    # }
+    contract_28 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.SSTORE(key=Op.DUP1, value=Op.DUP1)
+        + Op.PUSH1[0x1]
+        + Op.SWAP1
+        + Op.RETURN,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000C0DE1),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   pop(call(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0, 0))  # noqa: E501
     #   return(0, 1)
     #   let noOpt := msize()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xC0DEA,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.RETURN(offset=0x0, size=0x1)
-        ),
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_25,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000002a"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000002A),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   pop(call(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0, 0))  # noqa: E501
     #   return(0, 5000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.CALL(
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_25,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1388),
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000002B),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #   sstore(0, 1)
+    #   sstore(1, 1)
+    #   pop(delegatecall(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0))  # noqa: E501
+    #   invalid()
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
                 gas=Op.GAS,
-                address=0xC0DEA,
-                value=Op.DUP1,
+                address=contract_25,
                 args_offset=Op.DUP1,
                 args_size=Op.DUP1,
                 ret_offset=Op.DUP1,
                 ret_size=0x0,
             )
-            + Op.RETURN(offset=0x0, size=0x1388)
-        ),
+        )
+        + Op.INVALID,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000002b"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000003C),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   pop(call(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0, 0))  # noqa: E501
     #   invalid()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xC0DEA,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=contract_25,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.INVALID
-        ),
+        )
+        + Op.INVALID,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000002c"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000002C),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
@@ -569,74 +488,70 @@ def test_create2_oog_from_call_refunds(
     #   return(0, 1)
     #   let noOpt := msize()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0xC0DEA,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.RETURN(offset=0x0, size=0x1)
-        ),
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=contract_25,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000003a"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000003A),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
-    #   pop(delegatecall(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0))  # noqa: E501
+    #   pop(callcode(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0, 0))  # noqa: E501
     #   return(0, 5000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0xC0DEA,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.RETURN(offset=0x0, size=0x1388)
-        ),
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=contract_25,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1388),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000003b"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000004B),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
     #   pop(delegatecall(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0))  # noqa: E501
-    #   invalid()
+    #   return(0, 5000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0xC0DEA,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.INVALID
-        ),
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=contract_25,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1388),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000003c"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000003B),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
@@ -644,221 +559,188 @@ def test_create2_oog_from_call_refunds(
     #   return(0, 1)
     #   let noOpt := msize()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.CALLCODE(
-                gas=Op.GAS,
-                address=0xC0DEA,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.RETURN(offset=0x0, size=0x1)
-        ),
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=contract_25,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000004a"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000004A),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
     #   pop(callcode(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0, 0))  # noqa: E501
-    #   return(0, 5000)
+    #   invalid()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.CALLCODE(
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.POP(
+            Op.CALLCODE(
                 gas=Op.GAS,
-                address=0xC0DEA,
+                address=contract_25,
                 value=Op.DUP1,
                 args_offset=Op.DUP1,
                 args_size=Op.DUP1,
                 ret_offset=Op.DUP1,
                 ret_size=0x0,
             )
-            + Op.RETURN(offset=0x0, size=0x1388)
-        ),
+        )
+        + Op.INVALID,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000004b"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000004C),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
-    #   sstore(1, 1)
-    #   pop(callcode(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0, 0))  # noqa: E501
-    #   invalid()
+    #   pop(call(gas(), 0x00000000000000000000000000000000000c0deD, 0, 0, 0, 0, 0))  # noqa: E501
+    #   return(0, 5000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0xC0DEA,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.INVALID
-        ),
+    contract_14 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_26,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1388),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000004c"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000005B),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   pop(call(gas(), 0x00000000000000000000000000000000000c0deD, 0, 0, 0, 0, 0))  # noqa: E501
     #   return(0, 1)
     #   let noOpt := msize()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xC0DED,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.RETURN(offset=0x0, size=0x1)
-        ),
+    contract_13 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_26,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000005a"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000005A),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   pop(call(gas(), 0x00000000000000000000000000000000000c0deD, 0, 0, 0, 0, 0))  # noqa: E501
-    #   return(0, 5000)
+    #   invalid()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.CALL(
+    contract_15 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.POP(
+            Op.CALL(
                 gas=Op.GAS,
-                address=0xC0DED,
+                address=contract_26,
                 value=Op.DUP1,
                 args_offset=Op.DUP1,
                 args_size=Op.DUP1,
                 ret_offset=Op.DUP1,
                 ret_size=0x0,
             )
-            + Op.RETURN(offset=0x0, size=0x1388)
-        ),
+        )
+        + Op.INVALID,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000005b"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000005C),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
-    #   pop(call(gas(), 0x00000000000000000000000000000000000c0deD, 0, 0, 0, 0, 0))  # noqa: E501
-    #   invalid()
+    #   pop(call(gas(), 0x00000000000000000000000000000000000c0de0, 0, 0, 0, 0, 0))  # noqa: E501
+    #   return(0, 1)
+    #   let noOpt := msize()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xC0DED,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.INVALID
-        ),
+    contract_16 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_27,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000005c"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000006A),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   pop(call(gas(), 0x00000000000000000000000000000000000c0de0, 0, 0, 0, 0, 0))  # noqa: E501
-    #   return(0, 1)
-    #   let noOpt := msize()
+    #   return(0, 5000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xC0DE0,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.RETURN(offset=0x0, size=0x1)
-        ),
+    contract_17 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_27,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1388),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000006a"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000006B),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   pop(call(gas(), 0x00000000000000000000000000000000000c0de0, 0, 0, 0, 0, 0))  # noqa: E501
-    #   return(0, 5000)
+    #   invalid()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.CALL(
+    contract_18 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.POP(
+            Op.CALL(
                 gas=Op.GAS,
-                address=0xC0DE0,
+                address=contract_27,
                 value=Op.DUP1,
                 args_offset=Op.DUP1,
                 args_size=Op.DUP1,
                 ret_offset=Op.DUP1,
                 ret_size=0x0,
             )
-            + Op.RETURN(offset=0x0, size=0x1388)
-        ),
+        )
+        + Op.INVALID,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000006b"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000006C),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #   sstore(0, 1)
-    #   pop(call(gas(), 0x00000000000000000000000000000000000c0de0, 0, 0, 0, 0, 0))  # noqa: E501
-    #   invalid()
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xC0DE0,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.INVALID
-        ),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000006c"),  # noqa: E501
-    )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
@@ -866,34 +748,33 @@ def test_create2_oog_from_call_refunds(
     #   let initcodeaddr := 0x00000000000000000000000000000000000c0de1
     #   let initcodelength := extcodesize(initcodeaddr)
     #   extcodecopy(initcodeaddr, 0, 0, initcodelength)
-    #   pop(create(0, 0, initcodelength))
-    #   return(add(initcodelength, 1), 1)
-    #   let noOptimization := msize()
+    #   pop(create2(0, 0, initcodelength, 0))
+    #   return(add(initcodelength, 1), 5000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x1]
-            + Op.PUSH1[0x0]
-            + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
-            + Op.SSTORE(key=Op.DUP3, value=Op.DUP1)
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.PUSH3[0xC0DE1]
-            + Op.EXTCODESIZE(address=Op.DUP1)
-            + Op.SWAP2
-            + Op.DUP3
-            + Op.SWAP2
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.EXTCODECOPY
-            + Op.POP(Op.CREATE(value=Op.DUP1, offset=0x0, size=Op.DUP1))
-            + Op.ADD
-            + Op.RETURN
-        ),
+    contract_23 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.PUSH2[0x1388]
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.PUSH3[0xC0DE1]
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.POP(
+            Op.CREATE2(value=Op.DUP1, offset=Op.DUP2, size=Op.DUP2, salt=0x0)
+        )
+        + Op.ADD
+        + Op.RETURN,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000007a"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000008B),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
@@ -901,32 +782,35 @@ def test_create2_oog_from_call_refunds(
     #   let initcodeaddr := 0x00000000000000000000000000000000000c0de1
     #   let initcodelength := extcodesize(initcodeaddr)
     #   extcodecopy(initcodeaddr, 0, 0, initcodelength)
-    #   pop(create(0, 0, initcodelength))
-    #   return(add(initcodelength, 1), 5000)
+    #   pop(create2(0, 0, initcodelength, 0))
+    #   return(add(initcodelength, 1), 1)
+    #   let noOpt := msize()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.PUSH2[0x1388]
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x0]
-            + Op.PUSH3[0xC0DE1]
-            + Op.DUP2
-            + Op.EXTCODESIZE(address=Op.DUP2)
-            + Op.SWAP3
-            + Op.DUP4
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.POP(Op.CREATE(value=Op.DUP1, offset=0x0, size=Op.DUP1))
-            + Op.ADD
-            + Op.RETURN
-        ),
+    contract_22 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
+        + Op.SSTORE(key=Op.DUP3, value=Op.DUP1)
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.PUSH3[0xC0DE1]
+        + Op.EXTCODESIZE(address=Op.DUP1)
+        + Op.SWAP2
+        + Op.DUP3
+        + Op.SWAP2
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.EXTCODECOPY
+        + Op.POP(
+            Op.CREATE2(value=Op.DUP1, offset=Op.DUP2, size=Op.DUP2, salt=0x0)
+        )
+        + Op.ADD
+        + Op.RETURN,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000007b"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000008A),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
@@ -934,31 +818,31 @@ def test_create2_oog_from_call_refunds(
     #   let initcodeaddr := 0x00000000000000000000000000000000000c0de1
     #   let initcodelength := extcodesize(initcodeaddr)
     #   extcodecopy(initcodeaddr, 0, 0, initcodelength)
-    #   pop(create(0, 0, initcodelength))
+    #   pop(create2(0, 0, initcodelength, 0))
     #   invalid()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.PUSH1[0x0]
-            + Op.PUSH3[0xC0DE1]
-            + Op.DUP2
-            + Op.EXTCODESIZE(address=Op.DUP2)
-            + Op.SWAP3
-            + Op.DUP4
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.POP(Op.CREATE)
-            + Op.INVALID
-        ),
+    contract_24 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.PUSH3[0xC0DE1]
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.DUP2
+        + Op.DUP1
+        + Op.POP(Op.CREATE2)
+        + Op.INVALID,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000007c"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000008C),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
@@ -966,38 +850,31 @@ def test_create2_oog_from_call_refunds(
     #   let initcodeaddr := 0x00000000000000000000000000000000000c0de1
     #   let initcodelength := extcodesize(initcodeaddr)
     #   extcodecopy(initcodeaddr, 0, 0, initcodelength)
-    #   pop(create2(0, 0, initcodelength, 0))
-    #   return(add(initcodelength, 1), 1)
-    #   let noOpt := msize()
+    #   pop(create(0, 0, initcodelength))
+    #   return(add(initcodelength, 1), 5000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x1]
-            + Op.PUSH1[0x0]
-            + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
-            + Op.SSTORE(key=Op.DUP3, value=Op.DUP1)
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.PUSH3[0xC0DE1]
-            + Op.EXTCODESIZE(address=Op.DUP1)
-            + Op.SWAP2
-            + Op.DUP3
-            + Op.SWAP2
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.EXTCODECOPY
-            + Op.POP(
-                Op.CREATE2(
-                    value=Op.DUP1, offset=Op.DUP2, size=Op.DUP2, salt=0x0
-                ),
-            )
-            + Op.ADD
-            + Op.RETURN
-        ),
+    contract_20 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.PUSH2[0x1388]
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.PUSH3[0xC0DE1]
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.POP(Op.CREATE(value=Op.DUP1, offset=0x0, size=Op.DUP1))
+        + Op.ADD
+        + Op.RETURN,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000008a"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000007B),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
@@ -1005,36 +882,30 @@ def test_create2_oog_from_call_refunds(
     #   let initcodeaddr := 0x00000000000000000000000000000000000c0de1
     #   let initcodelength := extcodesize(initcodeaddr)
     #   extcodecopy(initcodeaddr, 0, 0, initcodelength)
-    #   pop(create2(0, 0, initcodelength, 0))
-    #   return(add(initcodelength, 1), 5000)
+    #   pop(create(0, 0, initcodelength))
+    #   invalid()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.PUSH2[0x1388]
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x0]
-            + Op.PUSH3[0xC0DE1]
-            + Op.DUP2
-            + Op.EXTCODESIZE(address=Op.DUP2)
-            + Op.SWAP3
-            + Op.DUP4
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.POP(
-                Op.CREATE2(
-                    value=Op.DUP1, offset=Op.DUP2, size=Op.DUP2, salt=0x0
-                ),
-            )
-            + Op.ADD
-            + Op.RETURN
-        ),
+    contract_21 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.PUSH1[0x0]
+        + Op.PUSH3[0xC0DE1]
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.POP(Op.CREATE)
+        + Op.INVALID,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000008b"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000007C),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
@@ -1042,144 +913,261 @@ def test_create2_oog_from_call_refunds(
     #   let initcodeaddr := 0x00000000000000000000000000000000000c0de1
     #   let initcodelength := extcodesize(initcodeaddr)
     #   extcodecopy(initcodeaddr, 0, 0, initcodelength)
-    #   pop(create2(0, 0, initcodelength, 0))
-    #   invalid()
+    #   pop(create(0, 0, initcodelength))
+    #   return(add(initcodelength, 1), 1)
+    #   let noOptimization := msize()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.PUSH3[0xC0DE1]
-            + Op.DUP2
-            + Op.EXTCODESIZE(address=Op.DUP2)
-            + Op.SWAP3
-            + Op.DUP4
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.DUP2
-            + Op.DUP1
-            + Op.POP(Op.CREATE2)
-            + Op.INVALID
-        ),
+    contract_19 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
+        + Op.SSTORE(key=Op.DUP3, value=Op.DUP1)
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.PUSH3[0xC0DE1]
+        + Op.EXTCODESIZE(address=Op.DUP1)
+        + Op.SWAP2
+        + Op.DUP3
+        + Op.SWAP2
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.EXTCODECOPY
+        + Op.POP(Op.CREATE(value=Op.DUP1, offset=0x0, size=Op.DUP1))
+        + Op.ADD
+        + Op.RETURN,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000008c"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #   mstore(0, 0xff)
-    #   log0(0, 32)
-    #   log1(0, 32, 0xfa)
-    #   log2(0, 32, 0xfa, 0xfb)
-    #   log3(0, 32, 0xfa, 0xfb, 0xfc)
-    #   log4(0, 32, 0xfa, 0xfb, 0xfc, 0xfd)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xFF)
-            + Op.LOG0(offset=0x0, size=0x20)
-            + Op.LOG1(offset=0x0, size=0x20, topic_1=0xFA)
-            + Op.LOG2(offset=0x0, size=0x20, topic_1=0xFA, topic_2=0xFB)
-            + Op.LOG3(
-                offset=0x0,
-                size=0x20,
-                topic_1=0xFA,
-                topic_2=0xFB,
-                topic_3=0xFC,
-            )
-            + Op.LOG4(
-                offset=0x0,
-                size=0x20,
-                topic_1=0xFA,
-                topic_2=0xFB,
-                topic_3=0xFC,
-                topic_4=0xFD,
-            )
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
-        address=Address("0x00000000000000000000000000000000000c0de0"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #   sstore(0, 1)
-    #   sstore(0, 0)
-    #   return(0, 1)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.SSTORE(key=Op.DUP1, value=Op.DUP1)
-            + Op.PUSH1[0x1]
-            + Op.SWAP1
-            + Op.RETURN
-        ),
-        address=Address("0x00000000000000000000000000000000000c0de1"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #   // Simple SSTORE to zero to get a refund
-    #   sstore(1, 0)
-    # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
-        storage={0x1: 0x1},
-        address=Address("0x00000000000000000000000000000000000c0dea"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #   selfdestruct(origin())
-    # }
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=Op.ORIGIN),
-        storage={0x1: 0x1},
-        address=Address("0x00000000000000000000000000000000000c0ded"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x3D0900, nonce=1)
-    # Source: Yul
-    # {
-    #   let init_addr := calldataload(4)
-    #   let init_length := extcodesize(init_addr)
-    #   extcodecopy(init_addr, 0, 0, init_length)
-    #   let created_addr := create2(0, 0, init_length, 0)
-    #   if eq(created_addr, 0) {
-    #     /* This invalid will deplete the remaining gas to make refund check deterministic */  # noqa: E501
-    #     invalid()
-    #   }
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.DUP1
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.DUP2
-            + Op.EXTCODESIZE(address=Op.DUP2)
-            + Op.SWAP3
-            + Op.DUP4
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.DUP2
-            + Op.JUMPI(pc=0x16, condition=Op.EQ(Op.CREATE2, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.INVALID
-        ),
-        address=Address("0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000007A),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=2),
+                Address(0xCFB6834F84B9E726F5F8AEF446D585B732ABDD99): Account(
+                    storage={0: 1}, code=bytes.fromhex("00"), nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=2),
+                Address(0xD615C5EAFF84F487CFF253B50DC18517FC8385B0): Account(
+                    storage={0: 1}, code=bytes.fromhex("00"), nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=2),
+                Address(0x0D44B2AD06C5C9F9A86C9EDF8D13FB7D44FE756C): Account(
+                    storage={0: 1}, code=bytes.fromhex("00"), nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [9], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=2),
+                Address(0x858EC13538276B49D5ECE2A408C8331CCB79AD89): Account(
+                    storage={0: 1}, code=bytes.fromhex("00"), nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {
+                "data": [1, 2, 4, 5, 7, 8, 10, 11],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(balance=0, nonce=2),
+                Address(
+                    0x95E88628C53B5C0E40FF6DE65A3CF8CDC3B477F7
+                ): Account.NONEXISTENT,
+                Address(
+                    0x66E1CC2616A273450621C8CC5E91D8CFD92494FA
+                ): Account.NONEXISTENT,
+                Address(
+                    0x6175BA9976476425B1CDA8E1DA479768FB429542
+                ): Account.NONEXISTENT,
+                Address(
+                    0x8DFF0E448F1E078E9B8A7FCF0BF6C291F167AAEF
+                ): Account.NONEXISTENT,
+                Address(
+                    0xA2C4270800A5DBEEA48464E5F2420EFB1747725A
+                ): Account.NONEXISTENT,
+                Address(
+                    0x4D80F1150EE236ADFAAB47C70DF90E757CEF1141
+                ): Account.NONEXISTENT,
+                Address(
+                    0x0566DC8DABC80FAD3ED9AB2B4309EBFD98894F44
+                ): Account.NONEXISTENT,
+                Address(
+                    0x55305CC46BDAF1E755A05A771D55CFEC3FEDEF90
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [12], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=2),
+                Address(0xD83E541AA11C5AE1E9C847AA1728D5BC47D32FAF): Account(
+                    storage={0: 1}, code=bytes.fromhex("00"), nonce=1
+                ),
+                contract_26: Account(balance=0, nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": [13, 14], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(balance=0, nonce=2),
+                Address(
+                    0x8F6E6C741AC95C1A9109850EA1A3FFC722DC3BF8
+                ): Account.NONEXISTENT,
+                Address(
+                    0x1F5D187BB3A48DBB2C011D0A6E731AC8131799AD
+                ): Account.NONEXISTENT,
+                contract_26: Account(
+                    storage={1: 1}, code=bytes.fromhex("32ff"), nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [15], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=2),
+                Address(0x2A2141ED764598D4C5A8B6E036987928D5EC6BEA): Account(
+                    storage={0: 1}, code=bytes.fromhex("00"), nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [16, 17], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(balance=0, nonce=2),
+                Address(
+                    0x74B39291DFC237C0D42FD15457754778F51C6DE8
+                ): Account.NONEXISTENT,
+                Address(
+                    0x3399C78929EAB89C673A8986FF7CA9CCC49DB454
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [18], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=2),
+                Address(0xDEB7D920F2653A8EDDCFFCA0A77F56FCD788C00A): Account(
+                    storage={0: 1}, code=bytes.fromhex("00"), nonce=2
+                ),
+                Address(0x8109D28DE74BFAC2F298EC019548B8C346E51310): Account(
+                    storage={}, code=bytes.fromhex("00"), nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [19, 20], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(balance=0, nonce=2),
+                Address(
+                    0xF922B2F70110C83F8EC7DF512B41BAC5627E8E59
+                ): Account.NONEXISTENT,
+                Address(
+                    0x2CA788D22E21134AB1909266ED3B6C352E2A07CB
+                ): Account.NONEXISTENT,
+                Address(
+                    0x398426E736801FE712DF1EF078A3B6CA3C6F063B
+                ): Account.NONEXISTENT,
+                Address(
+                    0xB520686759CED3BC9D8898E02EE41623032FF47F
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [21], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=2),
+                Address(0x5A2664B55822AA3C6D9D90FEC18B4C87CDE07D04): Account(
+                    storage={0: 1}, code=bytes.fromhex("00"), nonce=2
+                ),
+                Address(0x442ED1B502544D146E46B5D9849A476AEBD3B8DB): Account(
+                    storage={}, code=bytes.fromhex("00"), nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [22, 23], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(balance=0, nonce=2),
+                Address(
+                    0xDD2C53BFCAF5C1D698A2B21C0908F15F7FBFD635
+                ): Account.NONEXISTENT,
+                Address(
+                    0x2D556BDBCC37C7A021879A21ABE25D1850D4FD36
+                ): Account.NONEXISTENT,
+                Address(
+                    0xA99DA4EA490335C986D52B0CC9E3F78B286AC5FC
+                ): Account.NONEXISTENT,
+                Address(
+                    0xB4AB8AB0D363765586925E35C715E342E4AE3C63
+                ): Account.NONEXISTENT,
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(contract_1, left_padding=True),
+        Bytes("693c6139") + Hash(contract_2, left_padding=True),
+        Bytes("693c6139") + Hash(contract_3, left_padding=True),
+        Bytes("693c6139") + Hash(contract_4, left_padding=True),
+        Bytes("693c6139") + Hash(contract_5, left_padding=True),
+        Bytes("693c6139") + Hash(contract_6, left_padding=True),
+        Bytes("693c6139") + Hash(contract_7, left_padding=True),
+        Bytes("693c6139") + Hash(contract_8, left_padding=True),
+        Bytes("693c6139") + Hash(contract_9, left_padding=True),
+        Bytes("693c6139") + Hash(contract_10, left_padding=True),
+        Bytes("693c6139") + Hash(contract_11, left_padding=True),
+        Bytes("693c6139") + Hash(contract_12, left_padding=True),
+        Bytes("693c6139") + Hash(contract_13, left_padding=True),
+        Bytes("693c6139") + Hash(contract_14, left_padding=True),
+        Bytes("693c6139") + Hash(contract_15, left_padding=True),
+        Bytes("693c6139") + Hash(contract_16, left_padding=True),
+        Bytes("693c6139") + Hash(contract_17, left_padding=True),
+        Bytes("693c6139") + Hash(contract_18, left_padding=True),
+        Bytes("693c6139") + Hash(contract_19, left_padding=True),
+        Bytes("693c6139") + Hash(contract_20, left_padding=True),
+        Bytes("693c6139") + Hash(contract_21, left_padding=True),
+        Bytes("693c6139") + Hash(contract_22, left_padding=True),
+        Bytes("693c6139") + Hash(contract_23, left_padding=True),
+        Bytes("693c6139") + Hash(contract_24, left_padding=True),
+    ]
+    tx_gas = [400000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=400000,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_recursive.py b/tests/ported_static/stCreate2/test_create2_recursive.py
index 42d49244f14..0f9066fe503 100644
--- a/tests/ported_static/stCreate2/test_create2_recursive.py
+++ b/tests/ported_static/stCreate2/test_create2_recursive.py
@@ -2,7 +2,7 @@
 Create2 inside Create2 inside Create2....
 
 Ported from:
-tests/static/state_tests/stCreate2/Create2RecursiveFiller.json
+state_tests/stCreate2/Create2RecursiveFiller.json
 """
 
 import pytest
@@ -11,10 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,28 +27,45 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/Create2RecursiveFiller.json"],
+    ["state_tests/stCreate2/Create2RecursiveFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (9151314442816847871, {}),
-        (20070000000000, {}),
-        (20080000000000, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="-g2",
+        ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Create2 inside Create2 inside Create2...."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Create2 inside Create2 inside Create2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -58,29 +80,64 @@ def test_create2_recursive(
     )
 
     pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x606460006000396103e85a10601b576000606460006000f5601d565b5a5b)  (CREATE2 0 2 30 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x606460006000396103E85A10601B576000606460006000F5601D565B5A5B,  # noqa: E501
-            )
-            + Op.CREATE2(value=0x0, offset=0x2, size=0x1E, salt=0x0)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x606460006000396103E85A10601B576000606460006000F5601D565B5A5B,  # noqa: E501
+        )
+        + Op.CREATE2(value=0x0, offset=0x2, size=0x1E, salt=0x0)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                Address(0x4B17A07E119E86A0FF1FD21CDC9B4ABA196ED3F8): Account(
+                    nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                Address(
+                    0x4B17A07E119E86A0FF1FD21CDC9B4ABA196ED3F8
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 2, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                Address(0x471A0E624A2AC11C82CF1FF843127F1C6AA98351): Account(
+                    nonce=1
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [9151314442816847871, 20070000000000, 20080000000000]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_smart_init_code.py b/tests/ported_static/stCreate2/test_create2_smart_init_code.py
index 7361c8da95e..0d5a967638e 100644
--- a/tests/ported_static/stCreate2/test_create2_smart_init_code.py
+++ b/tests/ported_static/stCreate2/test_create2_smart_init_code.py
@@ -1,8 +1,8 @@
 """
-create2SmartInitCode. create2 works different each time you call it.
+Create2SmartInitCode. create2 works different each time you call it.
 
 Ported from:
-tests/static/state_tests/stCreate2/create2SmartInitCodeFiller.json
+state_tests/stCreate2/create2SmartInitCodeFiller.json
 """
 
 import pytest
@@ -12,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,43 +27,40 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/create2SmartInitCodeFiller.json"],
+    ["state_tests/stCreate2/create2SmartInitCodeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000000f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            {
-                Address("0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"): Account(
-                    storage={1: 0xF6510583D425CFCF94B99F8B073B44F60D1912B}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000001f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            {
-                Address("0x1f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"): Account(
-                    storage={1: 0xD27E800C69122409AC5609FE4DF903745F3988A0}
-                ),
-                Address("0xd27e800c69122409ac5609fe4df903745f3988a0"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2_smart_init_code(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Create2SmartInitCode. create2 works different each time you call it."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Create2SmartInitCode."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6)
+    contract_1 = Address(0x1F572E5295C57F15886F9B263E2F6D2D6C7B5EC6)
+    contract_2 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -72,80 +74,109 @@ def test_create2_smart_init_code(
         gas_limit=47244640256,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0x6400000000)
+    # Source: lll
     # { (MSTORE 0 0x600060015414601157600a6000f3601a565b60016001556001ff5b) [[1]](CREATE2 1 5 27 0) [[2]](CREATE2 1 5 27 0) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x600060015414601157600A6000F3601A565B60016001556001FF5B,
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CREATE2(value=0x1, offset=0x5, size=0x1B, salt=0x0),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CREATE2(value=0x1, offset=0x5, size=0x1B, salt=0x0),
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x600060015414601157600A6000F3601A565B60016001556001FF5B,
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CREATE2(value=0x1, offset=0x5, size=0x1B, salt=0x0),
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CREATE2(value=0x1, offset=0x5, size=0x1B, salt=0x0),
+        )
+        + Op.STOP,
         balance=100,
         nonce=0,
-        address=Address("0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
+        address=Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x600060015414601157600a6000f3601c565b6001600155600a6000f35b) [[1]](CREATE2 1 3 29 0) [[2]](CREATE2 1 5 27 0) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x600060015414601157600A6000F3601C565B6001600155600A6000F35B,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CREATE2(value=0x1, offset=0x3, size=0x1D, salt=0x0),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CREATE2(value=0x1, offset=0x5, size=0x1B, salt=0x0),
-            )
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x600060015414601157600A6000F3601C565B6001600155600A6000F35B,
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CREATE2(value=0x1, offset=0x3, size=0x1D, salt=0x0),
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CREATE2(value=0x1, offset=0x5, size=0x1B, salt=0x0),
+        )
+        + Op.STOP,
         balance=100,
         nonce=0,
-        address=Address("0x1f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
+        address=Address(0x1F572E5295C57F15886F9B263E2F6D2D6C7B5EC6),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
-    # Source: LLL
+    # Source: lll
     # { (CALL (GAS) (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=Op.GAS,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=Op.GAS,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0x6400000000,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x0000000000000000000000000000000000000001): Account(
+                    balance=1
+                ),
+                contract_0: Account(nonce=2),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(
+                    storage={
+                        1: 0xD27E800C69122409AC5609FE4DF903745F3988A0,
+                        2: 0,
+                    },
+                ),
+                Address(0xD27E800C69122409AC5609FE4DF903745F3988A0): Account(
+                    storage={1: 1},
+                    code=bytes.fromhex("00000000000000000000"),
+                    nonce=1,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(contract_0, left_padding=True),
+        Hash(contract_1, left_padding=True),
+    ]
+    tx_gas = [400000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=400000,
+        to=contract_2,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2_suicide.py b/tests/ported_static/stCreate2/test_create2_suicide.py
index 4b326b7ce5b..0fa854ae984 100644
--- a/tests/ported_static/stCreate2/test_create2_suicide.py
+++ b/tests/ported_static/stCreate2/test_create2_suicide.py
@@ -2,7 +2,7 @@
 CREATE2 suicide with/without value, CREATE2 suicide to itself   +  this...
 
 Ported from:
-tests/static/state_tests/stCreate2/CREATE2_SuicideFiller.json
+state_tests/stCreate2/CREATE2_SuicideFiller.json
 """
 
 import pytest
@@ -14,80 +14,110 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/CREATE2_SuicideFiller.json"],
+    ["state_tests/stCreate2/CREATE2_SuicideFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        ("626001ff60005260006003601d6000f500", {}),
-        (
-            "6a6130ff6000526002601ef36000526000600b60156000f5506000600060006000736cd0e5133771823da00d4cb545ec8cdab0e38203620249f0fa00",  # noqa: E501
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "6a6130ff6000526002601ef36000526000600b60156001f5506000600060006000736cd0e5133771823da00d4cb545ec8cdab0e38203620249f0fa00",  # noqa: E501
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "6b626001ff6000526003601df36000526000600c60146000f55060006000600060006000735649527a8464a86cae579719d347065f6eb27279620249f0f100",  # noqa: E501
-            {},
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        ("626001ff60005260006003601d6001f500", {}),
-        (
-            "6b626001ff6000526003601df36000526000600c60146001f55060006000600060006000735649527a8464a86cae579719d347065f6eb27279620249f0f100",  # noqa: E501
-            {},
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
-        ("6130ff60005260006002601e6000f500", {}),
-        (
-            "6a6130ff6000526002601ef36000526000600b60156000f55060006000600060006000736cd0e5133771823da00d4cb545ec8cdab0e38203620249f0f100",  # noqa: E501
-            {},
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
         ),
-        ("6130ff60005260006002601e6001f500", {}),
-        (
-            "6a6130ff6000526002601ef36000526000600b60156001f55060006000600060006000736cd0e5133771823da00d4cb545ec8cdab0e38203620249f0f100",  # noqa: E501
-            {},
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
         ),
-        (
-            "6b626001ff6000526003601df36000526000600c60146000f5506000600060006000735649527a8464a86cae579719d347065f6eb27279620249f0fa00",  # noqa: E501
-            {},
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
         ),
-        (
-            "6b626001ff6000526003601df36000526000600c60146001f5506000600060006000735649527a8464a86cae579719d347065f6eb27279620249f0fa00",  # noqa: E501
-            {},
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
         ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2_suicide(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """CREATE2 suicide with/without value, CREATE2 suicide to itself   +..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """CREATE2 suicide with/without value, CREATE2 suicide to itself   + ..."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -103,16 +133,205 @@ def test_create2_suicide(
 
     pre[sender] = Account(balance=0xE8D4A51000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(
+                    0x0000000000000000000000000000000000000001
+                ): Account.NONEXISTENT,
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=2
+                ),
+                Address(
+                    0x5649527A8464A86CAE579719D347065F6EB27279
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [2, 3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x0000000000000000000000000000000000000001): Account(
+                    balance=1
+                ),
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=2
+                ),
+                Address(
+                    0x5649527A8464A86CAE579719D347065F6EB27279
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [4, 5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=2
+                ),
+                Address(
+                    0x6CD0E5133771823DA00D4CB545EC8CDAB0E38203
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [6, 7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=sender, nonce=0): Account(
+                    balance=9, nonce=2
+                ),
+                Address(
+                    0x6CD0E5133771823DA00D4CB545EC8CDAB0E38203
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [8, 9], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=2
+                ),
+                Address(0x5649527A8464A86CAE579719D347065F6EB27279): Account(
+                    code=bytes.fromhex("6001ff")
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [10, 11], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=2
+                ),
+                Address(0x6CD0E5133771823DA00D4CB545EC8CDAB0E38203): Account(
+                    code=bytes.fromhex("30ff")
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.MSTORE(offset=0x0, value=0x6001FF)
+        + Op.CREATE2(value=0x0, offset=0x1D, size=0x3, salt=0x0)
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x626001FF6000526003601DF3)
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x14, size=0xC, salt=0x0))
+        + Op.CALL(
+            gas=0x249F0,
+            address=0x5649527A8464A86CAE579719D347065F6EB27279,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x6001FF)
+        + Op.CREATE2(value=0x1, offset=0x1D, size=0x3, salt=0x0)
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x626001FF6000526003601DF3)
+        + Op.POP(Op.CREATE2(value=0x1, offset=0x14, size=0xC, salt=0x0))
+        + Op.CALL(
+            gas=0x249F0,
+            address=0x5649527A8464A86CAE579719D347065F6EB27279,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x30FF)
+        + Op.CREATE2(value=0x0, offset=0x1E, size=0x2, salt=0x0)
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x6130FF6000526002601EF3)
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x15, size=0xB, salt=0x0))
+        + Op.CALL(
+            gas=0x249F0,
+            address=0x6CD0E5133771823DA00D4CB545EC8CDAB0E38203,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x30FF)
+        + Op.CREATE2(value=0x1, offset=0x1E, size=0x2, salt=0x0)
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x6130FF6000526002601EF3)
+        + Op.POP(Op.CREATE2(value=0x1, offset=0x15, size=0xB, salt=0x0))
+        + Op.CALL(
+            gas=0x249F0,
+            address=0x6CD0E5133771823DA00D4CB545EC8CDAB0E38203,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x626001FF6000526003601DF3)
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x14, size=0xC, salt=0x0))
+        + Op.STATICCALL(
+            gas=0x249F0,
+            address=0x5649527A8464A86CAE579719D347065F6EB27279,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x626001FF6000526003601DF3)
+        + Op.POP(Op.CREATE2(value=0x1, offset=0x14, size=0xC, salt=0x0))
+        + Op.STATICCALL(
+            gas=0x249F0,
+            address=0x5649527A8464A86CAE579719D347065F6EB27279,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x6130FF6000526002601EF3)
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x15, size=0xB, salt=0x0))
+        + Op.STATICCALL(
+            gas=0x249F0,
+            address=0x6CD0E5133771823DA00D4CB545EC8CDAB0E38203,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x6130FF6000526002601EF3)
+        + Op.POP(Op.CREATE2(value=0x1, offset=0x15, size=0xB, salt=0x0))
+        + Op.STATICCALL(
+            gas=0x249F0,
+            address=0x6CD0E5133771823DA00D4CB545EC8CDAB0E38203,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+    ]
+    tx_gas = [600000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=600000,
-        value=10,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2call_precompiles.py b/tests/ported_static/stCreate2/test_create2call_precompiles.py
index 9c24bf9f7ac..969be62840e 100644
--- a/tests/ported_static/stCreate2/test_create2call_precompiles.py
+++ b/tests/ported_static/stCreate2/test_create2call_precompiles.py
@@ -2,7 +2,7 @@
 CALL precompiles during init code of CREATE2 contract.
 
 Ported from:
-tests/static/state_tests/stCreate2/create2callPrecompilesFiller.json
+state_tests/stCreate2/create2callPrecompilesFiller.json
 """
 
 import pytest
@@ -15,6 +15,10 @@
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,124 +26,75 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/create2callPrecompilesFiller.json"],
+    ["state_tests/stCreate2/create2callPrecompilesFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "6000609b80601360003960006000f5500000fe7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a6080510660005560005432146001550000",  # noqa: E501
-            {
-                Address("0xf68e26002db0f9ca9b54367c57c25e474c581622"): Account(
-                    storage={
-                        0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        1: 1,
-                        2: 1,
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "6000602480601360003960006000f5500000fe64f34578907f6005526020600060256000600060026101f4f16002556000516000550000",  # noqa: E501
-            {
-                Address("0x3b9ea59b92545beb727022289665cf38fa462bae"): Account(
-                    storage={
-                        0: 0xCB39B3BDE22925B2F931111130C774761D8895E0E08437C9B396C1E97D10F34D,  # noqa: E501
-                        2: 1,
-                    }
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "6000601b80601360003960006000f5500000fe602060006000600060006003610258f16002556000516000550000",  # noqa: E501
-            {
-                Address("0x7525f19e2970539fd2897357777a4c275175bcf5"): Account(
-                    storage={
-                        0: 0x9C1185A5C5E9FC54612808977EE8F548B2258D31,
-                        2: 1,
-                    }
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "6000602480601360003960006000f5500000fe64f34578907f6000526020600060256000600060046101f4f16002556000516000550000",  # noqa: E501
-            {
-                Address("0x0ee431db7c48fc10a9a56c909bfefa87661442fb"): Account(
-                    storage={0: 0xF34578907F, 2: 1}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
-        (
-            "6000609680601360003960006000f5500000fe6001600052602060205260206040527f03fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc6060527f2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc6080527f2f0000000000000000000000000000000000000000000000000000000000000060965260206103e860976000600060055af26001556103e8516002550000",  # noqa: E501
-            {
-                Address("0xbbd394930b408da783ee071ced240ece997bc8b2"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x162EAD82CADEFAEAF6E9283248FDF2F2845F6396F6F17C4D5A39F820B6F6B5F9,  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
         ),
-        (
-            "6000602280601360003960006000f5500000fe600160005260206000610100600060006006620927c0f16002556000516000550000",  # noqa: E501
-            {
-                Address("0x2e3ec33a50ed32c2fcbef07a1bab8643db4dc670"): Account(
-                    storage={0: 1}
-                )
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
         ),
-        (
-            "600060b780601360003960006000f5500000fe7f0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd26000527f16da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba6020527f1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2866040527f0217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d46060526000600060806000600073addf5374fce5edbc8e2a8697c15331677e6ebf0b6207a120f2500000",  # noqa: E501
-            {
-                Address("0xaa0ab87aa0e27e22e21671040c11f3537cdc7b3e"): Account(
-                    storage={
-                        0: 1,
-                        1: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                        2: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
         ),
-        (
-            "600060c680601360003960006000f5500000fe7f1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2866000527f0217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4602052600060405260006060527f1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2866080527f0217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d460a052600160c0526000600060e06000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6207a120f2500000",  # noqa: E501
-            {
-                Address("0xab7cf4e4980432e892fa512ec2b9e8532c23ac15"): Account(
-                    storage={
-                        0: 1,
-                        1: 1,
-                        2: 1,
-                        3: 1,
-                        10: 0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-                        11: 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-                        20: 0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-                        21: 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2call_precompiles(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """CALL precompiles during init code of CREATE2 contract."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """CALL precompiles during init code of CREATE2 contract ."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xADDF5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -154,185 +109,170 @@ def test_create2call_precompiles(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) [[0]](CALLCODE 500000 6 0 0 128 200 64)  [[1]] (MLOAD 200)  [[2]] (MLOAD 232) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0xC8,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xC8))
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0xE8))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0x6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0xC8,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xC8))
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0xE8))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xaddf5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xADDF5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96))  (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) [[0]](CALLCODE 500000 6 0 0 128 300 64)  [[1]](CALLCODE 500000 7 0 128 96 400 64) [[10]] (MLOAD 300)  [[11]] (MLOAD 332) [[20]] (MLOAD 400)  [[21]] (MLOAD 432) [[2]] (EQ (SLOAD 10) (SLOAD 20)) [[3]] (EQ (SLOAD 11) (SLOAD 21))}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x80))
-            + Op.MSTORE(offset=0xA0, value=Op.CALLDATALOAD(offset=0xA0))
-            + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0xC0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x12C,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x80,
-                    args_size=0x60,
-                    ret_offset=0x190,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xA, value=Op.MLOAD(offset=0x12C))
-            + Op.SSTORE(key=0xB, value=Op.MLOAD(offset=0x14C))
-            + Op.SSTORE(key=0x14, value=Op.MLOAD(offset=0x190))
-            + Op.SSTORE(key=0x15, value=Op.MLOAD(offset=0x1B0))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.EQ(Op.SLOAD(key=0xA), Op.SLOAD(key=0x14)),
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.EQ(Op.SLOAD(key=0xB), Op.SLOAD(key=0x15)),
-            )
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x80))
+        + Op.MSTORE(offset=0xA0, value=Op.CALLDATALOAD(offset=0xA0))
+        + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0xC0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0x6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x12C,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0x7,
+                value=0x0,
+                args_offset=0x80,
+                args_size=0x60,
+                ret_offset=0x190,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xA, value=Op.MLOAD(offset=0x12C))
+        + Op.SSTORE(key=0xB, value=Op.MLOAD(offset=0x14C))
+        + Op.SSTORE(key=0x14, value=Op.MLOAD(offset=0x190))
+        + Op.SSTORE(key=0x15, value=Op.MLOAD(offset=0x1B0))
+        + Op.SSTORE(
+            key=0x2, value=Op.EQ(Op.SLOAD(key=0xA), Op.SLOAD(key=0x14))
+        )
+        + Op.SSTORE(
+            key=0x3, value=Op.EQ(Op.SLOAD(key=0xB), Op.SLOAD(key=0x15))
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=15000000,
-        value=1,
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/create2callPrecompilesFiller.json"],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "6000609b80601360003960006000f5500000fe7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a6080510660005560005432146001550000",  # noqa: E501
-            {
-                Address("0xf68e26002db0f9ca9b54367c57c25e474c581622"): Account(
-                    storage={
-                        0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        1: 1,
-                        2: 1,
-                    }
-                )
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                Address(0xF68E26002DB0F9CA9B54367C57C25E474C581622): Account(
+                    storage={0: sender, 1: 1, 2: 1}
+                ),
             },
-        ),
-        (
-            "6000602480601360003960006000f5500000fe64f34578907f6005526020600060256000600060026101f4f16002556000516000550000",  # noqa: E501
-            {
-                Address("0x3b9ea59b92545beb727022289665cf38fa462bae"): Account(
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                Address(0x3B9EA59B92545BEB727022289665CF38FA462BAE): Account(
                     storage={
                         0: 0xCB39B3BDE22925B2F931111130C774761D8895E0E08437C9B396C1E97D10F34D,  # noqa: E501
                         2: 1,
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "6000601b80601360003960006000f5500000fe602060006000600060006003610258f16002556000516000550000",  # noqa: E501
-            {
-                Address("0x7525f19e2970539fd2897357777a4c275175bcf5"): Account(
+        },
+        {
+            "indexes": {"data": 2, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                Address(0x7525F19E2970539FD2897357777A4C275175BCF5): Account(
                     storage={
                         0: 0x9C1185A5C5E9FC54612808977EE8F548B2258D31,
                         2: 1,
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "6000602480601360003960006000f5500000fe64f34578907f6000526020600060256000600060046101f4f16002556000516000550000",  # noqa: E501
-            {
-                Address("0x0ee431db7c48fc10a9a56c909bfefa87661442fb"): Account(
+        },
+        {
+            "indexes": {"data": 3, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                Address(0x0EE431DB7C48FC10A9A56C909BFEFA87661442FB): Account(
                     storage={0: 0xF34578907F, 2: 1}
-                )
+                ),
             },
-        ),
-        (
-            "6000609680601360003960006000f5500000fe6001600052602060205260206040527f03fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc6060527f2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc6080527f2f0000000000000000000000000000000000000000000000000000000000000060965260206103e860976000600060055af26001556103e8516002550000",  # noqa: E501
-            {
-                Address("0xbbd394930b408da783ee071ced240ece997bc8b2"): Account(
+        },
+        {
+            "indexes": {"data": 4, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                Address(0xBBD394930B408DA783EE071CED240ECE997BC8B2): Account(
                     storage={
                         1: 1,
                         2: 0x162EAD82CADEFAEAF6E9283248FDF2F2845F6396F6F17C4D5A39F820B6F6B5F9,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "6000602280601360003960006000f5500000fe600160005260206000610100600060006006620927c0f16002556000516000550000",  # noqa: E501
-            {
-                Address("0x2e3ec33a50ed32c2fcbef07a1bab8643db4dc670"): Account(
-                    storage={0: 1}
-                )
+        },
+        {
+            "indexes": {"data": 5, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                Address(0x2E3EC33A50ED32C2FCBEF07A1BAB8643DB4DC670): Account(
+                    storage={0: 1, 2: 0}
+                ),
             },
-        ),
-        (
-            "600060b780601360003960006000f5500000fe7f0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd26000527f16da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba6020527f1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2866040527f0217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d46060526000600060806000600073addf5374fce5edbc8e2a8697c15331677e6ebf0b6207a120f2500000",  # noqa: E501
-            {
-                Address("0xaa0ab87aa0e27e22e21671040c11f3537cdc7b3e"): Account(
+        },
+        {
+            "indexes": {"data": 6, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                Address(0xAA0AB87AA0E27E22E21671040C11F3537CDC7B3E): Account(
                     storage={
                         0: 1,
                         1: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
                         2: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "600060c680601360003960006000f5500000fe7f1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2866000527f0217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4602052600060405260006060527f1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2866080527f0217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d460a052600160c0526000600060e06000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6207a120f2500000",  # noqa: E501
-            {
-                Address("0xab7cf4e4980432e892fa512ec2b9e8532c23ac15"): Account(
+        },
+        {
+            "indexes": {"data": 7, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                Address(0xAB7CF4E4980432E892FA512EC2B9E8532C23AC15): Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -342,135 +282,259 @@ def test_create2call_precompiles(
                         11: 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
                         20: 0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
                         21: 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_create2call_precompiles_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """CALL precompiles during init code of CREATE2 contract."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+        },
+    ]
 
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=1000000000000,
-    )
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {(MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) [[0]](CALLCODE 500000 6 0 0 128 200 64)  [[1]] (MLOAD 200)  [[2]] (MLOAD 232) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0xC8,
-                    ret_size=0x40,
-                ),
+    tx_data = [
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x9B]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP * 2,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x24]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(offset=0x5, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x1F4,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP * 2,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x1B]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x258,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP * 2,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x24]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x1F4,
+                address=0x4,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP * 2,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x96]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=0x1)
+        + Op.MSTORE(offset=0x20, value=0x20)
+        + Op.MSTORE(offset=0x40, value=0x20)
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x96,
+            value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x5,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x97,
+                ret_offset=0x3E8,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x3E8))
+        + Op.STOP * 2,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x22]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=0x1)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=0x6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x100,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP * 2,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0xB7]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x7A120,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xC8))
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0xE8))
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xaddf5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-    # Source: LLL
-    # {(MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96))  (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) [[0]](CALLCODE 500000 6 0 0 128 300 64)  [[1]](CALLCODE 500000 7 0 128 96 400 64) [[10]] (MLOAD 300)  [[11]] (MLOAD 332) [[20]] (MLOAD 400)  [[21]] (MLOAD 432) [[2]] (EQ (SLOAD 10) (SLOAD 20)) [[3]] (EQ (SLOAD 11) (SLOAD 21))}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x80))
-            + Op.MSTORE(offset=0xA0, value=Op.CALLDATALOAD(offset=0xA0))
-            + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0xC0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x12C,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x80,
-                    args_size=0x60,
-                    ret_offset=0x190,
-                    ret_size=0x40,
-                ),
+        )
+        + Op.STOP * 2,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0xC6]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0xC0, value=0x1)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x7A120,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xE0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0xA, value=Op.MLOAD(offset=0x12C))
-            + Op.SSTORE(key=0xB, value=Op.MLOAD(offset=0x14C))
-            + Op.SSTORE(key=0x14, value=Op.MLOAD(offset=0x190))
-            + Op.SSTORE(key=0x15, value=Op.MLOAD(offset=0x1B0))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.EQ(Op.SLOAD(key=0xA), Op.SLOAD(key=0x14)),
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.EQ(Op.SLOAD(key=0xB), Op.SLOAD(key=0x15)),
-            )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+        )
+        + Op.STOP * 2,
+    ]
+    tx_gas = [15000000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=15000000,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2check_fields_in_initcode.py b/tests/ported_static/stCreate2/test_create2check_fields_in_initcode.py
index 83cad4d1c8c..4f883160226 100644
--- a/tests/ported_static/stCreate2/test_create2check_fields_in_initcode.py
+++ b/tests/ported_static/stCreate2/test_create2check_fields_in_initcode.py
@@ -2,7 +2,7 @@
 Check opcode values in create2 init code. Create2 called with different...
 
 Ported from:
-tests/static/state_tests/stCreate2/create2checkFieldsInInitcodeFiller.json
+state_tests/stCreate2/create2checkFieldsInInitcodeFiller.json
 """
 
 import pytest
@@ -12,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,127 +27,84 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/create2checkFieldsInInitcodeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/create2checkFieldsInInitcodeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000001000000000000000000000000000000000000000",
-            {
-                Address("0xdaf9f53e732f21fe517e624b6dfe92dc8d0e51e0"): Account(
-                    storage={
-                        0: 0xDAF9F53E732F21FE517E624B6DFE92DC8D0E51E0,
-                        2: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        3: 0xF000000000000000000000000000000000000000,
-                        6: 35,
-                        7: 10,
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000002000000000000000000000000000000000000000",
-            {
-                Address("0xdfad1c567f12d848fabb8d9d8872c42e7aa81e95"): Account(
-                    storage={
-                        0: 0xDFAD1C567F12D848FABB8D9D8872C42E7AA81E95,
-                        2: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        3: 0x2000000000000000000000000000000000000000,
-                        6: 35,
-                        7: 10,
-                    }
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "0000000000000000000000003000000000000000000000000000000000000000",
-            {
-                Address("0x3ff16480055c6ccc070257c61fa902448f4ae111"): Account(
-                    storage={
-                        0: 0x3FF16480055C6CCC070257C61FA902448F4AE111,
-                        2: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        3: 0x3000000000000000000000000000000000000000,
-                        6: 35,
-                        7: 10,
-                    }
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "0000000000000000000000004000000000000000000000000000000000000000",
-            {},
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
-        (
-            "0000000000000000000000001100000000000000000000000000000000000000",
-            {
-                Address("0xdaf9f53e732f21fe517e624b6dfe92dc8d0e51e0"): Account(
-                    storage={
-                        0: 0xDAF9F53E732F21FE517E624B6DFE92DC8D0E51E0,
-                        2: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        3: 0xF000000000000000000000000000000000000000,
-                        6: 35,
-                        7: 10,
-                    }
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
         ),
-        (
-            "0000000000000000000000002200000000000000000000000000000000000000",
-            {
-                Address("0x7ce21e3c16d63738cbbb697c919555c910504278"): Account(
-                    storage={
-                        0: 0x7CE21E3C16D63738CBBB697C919555C910504278,
-                        2: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        3: 0x9D25FBABDEB081B9ECD0645B9B6ABA8C7EB3821D,
-                        6: 35,
-                        7: 10,
-                    }
-                )
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
         ),
-        (
-            "0000000000000000000000003300000000000000000000000000000000000000",
-            {
-                Address("0xbb1b88ea45d33397f45583ca612adea3eb267318"): Account(
-                    storage={
-                        0: 0xBB1B88EA45D33397F45583CA612ADEA3EB267318,
-                        2: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        3: 0x45DDE7FBF9F1CF09E18C4E584BA93C82E83C8898,
-                        6: 35,
-                        7: 10,
-                    }
-                )
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
         ),
-        (
-            "0000000000000000000000004400000000000000000000000000000000000000",
-            {},
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2check_fields_in_initcode(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Check opcode values in create2 init code. Create2 called with..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Check opcode values in create2 init code."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0x1000000000000000000000000000000000000000)
+    contract_2 = Address(0x1100000000000000000000000000000000000000)
+    contract_3 = Address(0x2000000000000000000000000000000000000000)
+    contract_4 = Address(0x2200000000000000000000000000000000000000)
+    contract_5 = Address(0x3000000000000000000000000000000000000000)
+    contract_6 = Address(0x3300000000000000000000000000000000000000)
+    contract_7 = Address(0x4000000000000000000000000000000000000000)
+    contract_8 = Address(0x4400000000000000000000000000000000000000)
+    contract_9 = Address(0xF000000000000000000000000000000000000000)
+    contract_10 = Address(0xF200000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -156,283 +118,368 @@ def test_create2check_fields_in_initcode(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { (CALL (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0 0) }
-    pre.deploy_contract(
-        code=(
-            Op.CALL(
+    pre[sender] = Account(balance=0x56BC75E2D63100000)
+    # Source: lll
+    # { (CALL (GAS) (CALLDATALOAD 0) 0 0 0 0 0) }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=Op.GAS,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
+    )
+    # Source: lll
+    # { (CREATE2 0 0 (lll (seq   [[0]] (ADDRESS) [[1]] (BALANCE (ADDRESS)) [[2]] (ORIGIN) [[3]] (CALLER) [[4]] (CALLVALUE) [[5]] (CALLDATASIZE) [[6]] (CODESIZE) [[7]] (GASPRICE) (STOP)   ) 0) 0) (STOP) }  # noqa: E501
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0x23]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x1, value=Op.BALANCE(address=Op.ADDRESS))
+        + Op.SSTORE(key=0x2, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x3, value=Op.CALLER)
+        + Op.SSTORE(key=0x4, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x5, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x6, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x7, value=Op.GASPRICE)
+        + Op.STOP * 2,
+        nonce=0,
+        address=Address(0xF000000000000000000000000000000000000000),  # noqa: E501
+    )
+    # Source: lll
+    # { (CREATE2 0 0 (lll (seq   [0] (ADDRESS) [32] (BALANCE (ADDRESS)) [64] (ORIGIN) [96] (CALLER) [128] (CALLVALUE) [160] (CALLDATASIZE) [192] (CODESIZE) [224] (GASPRICE) (RETURN 0 256)  (STOP)   ) 0) 0)  }  # noqa: E501
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0x29]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x11, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.CREATE2
+        + Op.STOP
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=Op.ADDRESS)
+        + Op.MSTORE(offset=0x20, value=Op.BALANCE(address=Op.ADDRESS))
+        + Op.MSTORE(offset=0x40, value=Op.ORIGIN)
+        + Op.MSTORE(offset=0x60, value=Op.CALLER)
+        + Op.MSTORE(offset=0x80, value=Op.CALLVALUE)
+        + Op.MSTORE(offset=0xA0, value=Op.CALLDATASIZE)
+        + Op.MSTORE(offset=0xC0, value=Op.CODESIZE)
+        + Op.MSTORE(offset=0xE0, value=Op.GASPRICE)
+        + Op.RETURN(offset=0x0, size=0x100)
+        + Op.STOP * 2,
+        nonce=0,
+        address=Address(0xF200000000000000000000000000000000000000),  # noqa: E501
+    )
+    # Source: lll
+    # { (DELEGATECALL (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0) (STOP) }  # noqa: E501
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
                 gas=Op.GAS,
                 address=0xF000000000000000000000000000000000000000,
-                value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.STOP * 2,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x3000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
-    # { (CREATE2 0 0 (lll (seq (CALL (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0 0) (STOP) ) 0) 0) (STOP) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x24]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE2)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xF000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (CALL (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0 0) }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=Op.GAS,
+            address=0xF000000000000000000000000000000000000000,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1100000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
-    # { (CALLCODE (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0 0) }
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
+    # Source: lll
+    # { (CREATE2 0 0 (lll (seq (DELEGATECALL (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0) (STOP) ) 0) 0) (STOP) }  # noqa: E501
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0x22]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.POP(
+            Op.DELEGATECALL(
                 gas=Op.GAS,
                 address=0xF000000000000000000000000000000000000000,
-                value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (CREATE2 0 0 (lll (seq (CALLCODE (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0 0) (STOP) ) 0) 0)  (STOP) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x24]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE2)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0xF000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-            + Op.STOP
-        ),
+        )
+        + Op.STOP * 2,
         nonce=0,
-        address=Address("0x2200000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x3300000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
-    # { (DELEGATECALL (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0) (STOP) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0xF000000000000000000000000000000000000000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (CALLCODE (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0 0) }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xF000000000000000000000000000000000000000,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x2000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
-    # { (CREATE2 0 0 (lll (seq (DELEGATECALL (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0) (STOP) ) 0) 0) (STOP) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x22]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE2)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0xF000000000000000000000000000000000000000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # { (CREATE2 0 0 (lll (seq (CALL (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0 0) (STOP) ) 0) 0) (STOP) }  # noqa: E501
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0x24]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xF000000000000000000000000000000000000000,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.STOP
-            + Op.STOP
-        ),
+        )
+        + Op.STOP * 2,
         nonce=0,
-        address=Address("0x3300000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1100000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
-    # { (STATICCALL (GAS) 0xf200000000000000000000000000000000000000 0 0 0 256) [[10]] (MLOAD 0) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0xF200000000000000000000000000000000000000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x100,
-                ),
+    # Source: lll
+    # { (CREATE2 0 0 (lll (seq (CALLCODE (GAS) 0xf000000000000000000000000000000000000000 0 0 0 0 0) (STOP) ) 0) 0)  (STOP) }  # noqa: E501
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0x24]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.POP(
+            Op.CALLCODE(
+                gas=Op.GAS,
+                address=0xF000000000000000000000000000000000000000,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0xA, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.STOP * 2,
         nonce=0,
-        address=Address("0x4000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x2200000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (CREATE2 0 0 (lll (seq (STATICCALL (GAS) 0xf200000000000000000000000000000000000000 0 0 0 256) [[10]] (MLOAD 0)  (STOP) ) 0) 0 ) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x29]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x11, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.CREATE2
-            + Op.STOP
-            + Op.INVALID
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0xF200000000000000000000000000000000000000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x100,
-                ),
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0x29]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x11, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.CREATE2
+        + Op.STOP
+        + Op.INVALID
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=0xF200000000000000000000000000000000000000,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x100,
             )
-            + Op.SSTORE(key=0xA, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0xA, value=Op.MLOAD(offset=0x0))
+        + Op.STOP * 2,
         nonce=0,
-        address=Address("0x4400000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x4400000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x56BC75E2D63100000)
-    # Source: LLL
-    # { (CALL (GAS) (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
+    # Source: lll
+    # { (STATICCALL (GAS) 0xf200000000000000000000000000000000000000 0 0 0 256) [[10]] (MLOAD 0) }  # noqa: E501
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
                 gas=Op.GAS,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=0x0,
+                address=0xF200000000000000000000000000000000000000,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
-                ret_size=0x0,
+                ret_size=0x100,
             )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (CREATE2 0 0 (lll (seq   [[0]] (ADDRESS) [[1]] (BALANCE (ADDRESS)) [[2]] (ORIGIN) [[3]] (CALLER) [[4]] (CALLVALUE) [[5]] (CALLDATASIZE) [[6]] (CODESIZE) [[7]] (GASPRICE) (STOP)   ) 0) 0) (STOP) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x23]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE2)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(key=0x0, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x1, value=Op.BALANCE(address=Op.ADDRESS))
-            + Op.SSTORE(key=0x2, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x3, value=Op.CALLER)
-            + Op.SSTORE(key=0x4, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x5, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x6, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x7, value=Op.GASPRICE)
-            + Op.STOP
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xf000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (CREATE2 0 0 (lll (seq   [0] (ADDRESS) [32] (BALANCE (ADDRESS)) [64] (ORIGIN) [96] (CALLER) [128] (CALLVALUE) [160] (CALLDATASIZE) [192] (CODESIZE) [224] (GASPRICE) (RETURN 0 256)  (STOP)   ) 0) 0)  }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x29]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x11, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.CREATE2
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(offset=0x0, value=Op.ADDRESS)
-            + Op.MSTORE(offset=0x20, value=Op.BALANCE(address=Op.ADDRESS))
-            + Op.MSTORE(offset=0x40, value=Op.ORIGIN)
-            + Op.MSTORE(offset=0x60, value=Op.CALLER)
-            + Op.MSTORE(offset=0x80, value=Op.CALLVALUE)
-            + Op.MSTORE(offset=0xA0, value=Op.CALLDATASIZE)
-            + Op.MSTORE(offset=0xC0, value=Op.CODESIZE)
-            + Op.MSTORE(offset=0xE0, value=Op.GASPRICE)
-            + Op.RETURN(offset=0x0, size=0x100)
-            + Op.STOP
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0xA, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf200000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x4000000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xDAF9F53E732F21FE517E624B6DFE92DC8D0E51E0): Account(
+                    storage={
+                        0: 0xDAF9F53E732F21FE517E624B6DFE92DC8D0E51E0,
+                        1: 0,
+                        2: sender,
+                        3: contract_9,
+                        4: 0,
+                        5: 0,
+                        6: 35,
+                        7: 10,
+                    },
+                    balance=0,
+                    nonce=1,
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xDFAD1C567F12D848FABB8D9D8872C42E7AA81E95): Account(
+                    storage={
+                        0: 0xDFAD1C567F12D848FABB8D9D8872C42E7AA81E95,
+                        1: 0,
+                        2: sender,
+                        3: contract_3,
+                        4: 0,
+                        5: 0,
+                        6: 35,
+                        7: 10,
+                    },
+                    balance=0,
+                    nonce=1,
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": 2, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x3FF16480055C6CCC070257C61FA902448F4AE111): Account(
+                    storage={
+                        0: 0x3FF16480055C6CCC070257C61FA902448F4AE111,
+                        1: 0,
+                        2: sender,
+                        3: contract_5,
+                        4: 0,
+                        5: 0,
+                        6: 35,
+                        7: 10,
+                    },
+                    balance=0,
+                    nonce=1,
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": [3, 7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {sender: Account(nonce=1)},
+        },
+        {
+            "indexes": {"data": 5, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x7CE21E3C16D63738CBBB697C919555C910504278): Account(
+                    storage={
+                        0: 0x7CE21E3C16D63738CBBB697C919555C910504278,
+                        1: 0,
+                        2: sender,
+                        3: 0x9D25FBABDEB081B9ECD0645B9B6ABA8C7EB3821D,
+                        4: 0,
+                        5: 0,
+                        6: 35,
+                        7: 10,
+                    },
+                    balance=0,
+                    nonce=1,
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": 6, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xBB1B88EA45D33397F45583CA612ADEA3EB267318): Account(
+                    storage={
+                        0: 0xBB1B88EA45D33397F45583CA612ADEA3EB267318,
+                        1: 0,
+                        2: sender,
+                        3: 0x45DDE7FBF9F1CF09E18C4E584BA93C82E83C8898,
+                        4: 0,
+                        5: 0,
+                        6: 35,
+                        7: 10,
+                    },
+                    balance=0,
+                    nonce=1,
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(contract_1, left_padding=True),
+        Hash(contract_3, left_padding=True),
+        Hash(contract_5, left_padding=True),
+        Hash(contract_7, left_padding=True),
+        Hash(contract_2, left_padding=True),
+        Hash(contract_4, left_padding=True),
+        Hash(contract_6, left_padding=True),
+        Hash(contract_8, left_padding=True),
+    ]
+    tx_gas = [600000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=600000,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2collision_balance.py b/tests/ported_static/stCreate2/test_create2collision_balance.py
index b34564d1f3b..463ebb5f599 100644
--- a/tests/ported_static/stCreate2/test_create2collision_balance.py
+++ b/tests/ported_static/stCreate2/test_create2collision_balance.py
@@ -1,8 +1,8 @@
 """
-create2 generates an account that already exists and has balance != 0.
+Create2 generates an account that already exists and has balance != 0.
 
 Ported from:
-tests/static/state_tests/stCreate2/create2collisionBalanceFiller.json
+state_tests/stCreate2/create2collisionBalanceFiller.json
 """
 
 import pytest
@@ -14,48 +14,68 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/create2collisionBalanceFiller.json"],
+    ["state_tests/stCreate2/create2collisionBalanceFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        ("6000600060006000f500", {}),
-        (
-            "64600160015560005260006005601b6000f500",
-            {
-                Address("0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
-        ("6d6460016001556000526005601bf36000526000600e60126000f500", {}),
-        ("6000600060006001f500", {}),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2collision_balance(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Create2 generates an account that already exists and has balance..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Create2 generates an account that already exists and has balance != 0."""  # noqa: E501
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xE2B35478FDD26477CC576DD906E6277761246A3C)
+    contract_1 = Address(0xAF3ECBA2FE09A4F6C19F16A9D119E44E08C2DA01)
+    contract_2 = Address(0xEC2C6832D00680ECE8FF9254F81FDAB0A5A2AC50)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
-    contract = Address("0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01")
-    callee_1 = Address("0xe2b35478fdd26477cc576dd906e6277761246a3c")
-    callee_2 = Address("0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -67,20 +87,107 @@ def test_create2collision_balance(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre[contract] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
+    # Source: hex
+    # 0x
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0xE2B35478FDD26477CC576DD906E6277761246A3C),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0xAF3ECBA2FE09A4F6C19F16A9D119E44E08C2DA01),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0xEC2C6832D00680ECE8FF9254F81FDAB0A5A2AC50),  # noqa: E501
+    )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(balance=1, nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    balance=1, nonce=2
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(
+                    storage={1: 1}, code=b"", balance=1, nonce=1
+                ),
+                compute_create_address(address=sender, nonce=0): Account(
+                    balance=1, nonce=2
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": 2, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_2: Account(
+                    storage={},
+                    code=bytes.fromhex("6001600155"),
+                    balance=1,
+                    nonce=1,
+                ),
+                compute_create_address(address=sender, nonce=0): Account(
+                    balance=1, nonce=2
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(balance=2, nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    balance=0, nonce=2
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.CREATE2(value=0x0, offset=0x0, size=0x0, salt=0x0) + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x6001600155)
+        + Op.CREATE2(value=0x0, offset=0x1B, size=0x5, salt=0x0)
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0)
+        + Op.STOP,
+        Op.CREATE2(value=0x1, offset=0x0, size=0x0, salt=0x0) + Op.STOP,
+    ]
+    tx_gas = [400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=400000,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2collision_code.py b/tests/ported_static/stCreate2/test_create2collision_code.py
index 4a82899c2d8..e234fd58d91 100644
--- a/tests/ported_static/stCreate2/test_create2collision_code.py
+++ b/tests/ported_static/stCreate2/test_create2collision_code.py
@@ -1,8 +1,8 @@
 """
-create2 generates an account that already exists and has not empty code.
+Create2 generates an account that already exists and has not empty code.
 
 Ported from:
-tests/static/state_tests/stCreate2/create2collisionCodeFiller.json
+state_tests/stCreate2/create2collisionCodeFiller.json
 """
 
 import pytest
@@ -14,7 +14,9 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,27 +24,46 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/create2collisionCodeFiller.json"],
+    ["state_tests/stCreate2/create2collisionCodeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        ("6000600060006000f500", {}),
-        ("64600160015560005260006005601b6000f500", {}),
-        ("6d6460016001556000526005601bf36000526000600e60126000f500", {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2collision_code(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Create2 generates an account that already exists and has not..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Create2 generates an account that already exists and has not empty..."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xE2B35478FDD26477CC576DD906E6277761246A3C)
+    contract_1 = Address(0xAF3ECBA2FE09A4F6C19F16A9D119E44E08C2DA01)
+    contract_2 = Address(0xEC2C6832D00680ECE8FF9254F81FDAB0A5A2AC50)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -57,35 +78,71 @@ def test_create2collision_code(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x010203
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SUB(Op.MUL, Op.ADD),
         nonce=0,
-        address=Address("0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01"),  # noqa: E501
+        address=Address(0xE2B35478FDD26477CC576DD906E6277761246A3C),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x010203
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SUB(Op.MUL, Op.ADD),
         nonce=0,
-        address=Address("0xe2b35478fdd26477cc576dd906e6277761246a3c"),  # noqa: E501
+        address=Address(0xAF3ECBA2FE09A4F6C19F16A9D119E44E08C2DA01),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x010203
+    contract_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SUB(Op.MUL, Op.ADD),
         nonce=0,
-        address=Address("0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50"),  # noqa: E501
+        address=Address(0xEC2C6832D00680ECE8FF9254F81FDAB0A5A2AC50),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.CREATE2(value=0x0, offset=0x0, size=0x0, salt=0x0) + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x6001600155)
+        + Op.CREATE2(value=0x0, offset=0x1B, size=0x5, salt=0x0)
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0)
+        + Op.STOP,
+    ]
+    tx_gas = [400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=400000,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        contract_0: Account(
+            storage={},
+            code=bytes.fromhex("010203"),
+            balance=0,
+            nonce=0,
+        ),
+        contract_1: Account(
+            storage={},
+            code=bytes.fromhex("010203"),
+            balance=0,
+            nonce=0,
+        ),
+        contract_2: Account(
+            storage={},
+            code=bytes.fromhex("010203"),
+            balance=0,
+            nonce=0,
+        ),
+        compute_create_address(address=sender, nonce=0): Account(
+            code=b"", balance=1, nonce=2
+        ),
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2collision_code2.py b/tests/ported_static/stCreate2/test_create2collision_code2.py
index 52e777c9982..fce405e07c9 100644
--- a/tests/ported_static/stCreate2/test_create2collision_code2.py
+++ b/tests/ported_static/stCreate2/test_create2collision_code2.py
@@ -1,8 +1,8 @@
 """
-collision with the contract that already has the same init code that we are...
+Collision with the contract that already has the same init code that we...
 
 Ported from:
-tests/static/state_tests/stCreate2/create2collisionCode2Filler.json
+state_tests/stCreate2/create2collisionCode2Filler.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,25 +27,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/create2collisionCode2Filler.json"],
+    ["state_tests/stCreate2/create2collisionCode2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "6b620102036000526003601df36000526000600c60146000f500",
-        "6b620102036000526003601df36000526000600c60146001f500",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2collision_code2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Collision with the contract that already has the same init code..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xFCE41D047B4A1D4450382DCC29EC7E5FEDC5F9A3)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -55,22 +73,63 @@ def test_create2collision_code2(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x010203
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SUB(Op.MUL, Op.ADD),
-        address=Address("0xfce41d047b4a1d4450382dcc29ec7e5fedc5f9a3"),  # noqa: E501
+        nonce=1,
+        address=Address(0xFCE41D047B4A1D4450382DCC29EC7E5FEDC5F9A3),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    code=bytes.fromhex("010203"), balance=0, nonce=1
+                ),
+                compute_create_address(address=sender, nonce=0): Account(
+                    code=b"", balance=1, nonce=2
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    code=bytes.fromhex("010203"), balance=0, nonce=1
+                ),
+                compute_create_address(address=sender, nonce=0): Account(
+                    code=b"", balance=1, nonce=2
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.MSTORE(offset=0x0, value=0x620102036000526003601DF3)
+        + Op.CREATE2(value=0x0, offset=0x14, size=0xC, salt=0x0)
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x620102036000526003601DF3)
+        + Op.CREATE2(value=0x1, offset=0x14, size=0xC, salt=0x0)
+        + Op.STOP,
+    ]
+    tx_gas = [400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=400000,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post: dict = {}
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2collision_nonce.py b/tests/ported_static/stCreate2/test_create2collision_nonce.py
index 4cf3176fa57..58135a80dd0 100644
--- a/tests/ported_static/stCreate2/test_create2collision_nonce.py
+++ b/tests/ported_static/stCreate2/test_create2collision_nonce.py
@@ -1,8 +1,8 @@
 """
-create2 generates an account that already exists and has nonce != 0.
+Create2 generates an account that already exists and has nonce != 0.
 
 Ported from:
-tests/static/state_tests/stCreate2/create2collisionNonceFiller.json
+state_tests/stCreate2/create2collisionNonceFiller.json
 """
 
 import pytest
@@ -14,40 +14,59 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/create2collisionNonceFiller.json"],
+    ["state_tests/stCreate2/create2collisionNonceFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        ("6000600060006000f500", {}),
-        ("64600160015560005260006005601b6000f500", {}),
-        ("6d6460016001556000526005601bf36000526000600e60126000f500", {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2collision_nonce(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Create2 generates an account that already exists and has nonce != 0."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xE2B35478FDD26477CC576DD906E6277761246A3C)
+    contract_1 = Address(0xAF3ECBA2FE09A4F6C19F16A9D119E44E08C2DA01)
+    contract_2 = Address(0xEC2C6832D00680ECE8FF9254F81FDAB0A5A2AC50)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
-    contract = Address("0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01")
-    callee_1 = Address("0xe2b35478fdd26477cc576dd906e6277761246a3c")
-    callee_2 = Address("0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -59,20 +78,56 @@ def test_create2collision_nonce(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre[contract] = Account(balance=0, nonce=1)
-    pre[callee_1] = Account(balance=0, nonce=1)
-    pre[callee_2] = Account(balance=0, nonce=1)
+    # Source: hex
+    # 0x
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code="",
+        nonce=1,
+        address=Address(0xE2B35478FDD26477CC576DD906E6277761246A3C),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code="",
+        nonce=1,
+        address=Address(0xAF3ECBA2FE09A4F6C19F16A9D119E44E08C2DA01),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code="",
+        nonce=1,
+        address=Address(0xEC2C6832D00680ECE8FF9254F81FDAB0A5A2AC50),  # noqa: E501
+    )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.CREATE2(value=0x0, offset=0x0, size=0x0, salt=0x0) + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x6001600155)
+        + Op.CREATE2(value=0x0, offset=0x1B, size=0x5, salt=0x0)
+        + Op.STOP,
+        Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0)
+        + Op.STOP,
+    ]
+    tx_gas = [400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=400000,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        contract_0: Account(storage={}, code=b"", balance=0, nonce=1),
+        contract_1: Account(storage={}, code=b"", balance=0, nonce=1),
+        contract_2: Account(storage={}, code=b"", balance=0, nonce=1),
+        compute_create_address(address=sender, nonce=0): Account(
+            balance=1, nonce=2
+        ),
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2collision_selfdestructed.py b/tests/ported_static/stCreate2/test_create2collision_selfdestructed.py
index 8c9204fc321..e3a2e1ae029 100644
--- a/tests/ported_static/stCreate2/test_create2collision_selfdestructed.py
+++ b/tests/ported_static/stCreate2/test_create2collision_selfdestructed.py
@@ -1,8 +1,8 @@
 """
-collision with address that has been selfdestructed in the same transaction.
+Collision with address that has been selfdestructed in the same...
 
 Ported from:
-tests/static/state_tests/stCreate2/create2collisionSelfdestructedFiller.json
+state_tests/stCreate2/create2collisionSelfdestructedFiller.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,126 +27,46 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/create2collisionSelfdestructedFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/create2collisionSelfdestructedFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f500",  # noqa: E501
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f500",  # noqa: E501
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f500",  # noqa: E501
-            {},
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2collision_selfdestructed(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Collision with address that has been selfdestructed in the same..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=1000000,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # { (SELFDESTRUCT 0x10) }
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=0x10) + Op.STOP,
-        balance=1,
-        nonce=0,
-        address=Address("0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (SELFDESTRUCT 0x10) }
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=0x10) + Op.STOP,
-        balance=1,
-        nonce=0,
-        address=Address("0xe2b35478fdd26477cc576dd906e6277761246a3c"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (SELFDESTRUCT 0x10) }
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=0x10) + Op.STOP,
-        balance=1,
-        nonce=0,
-        address=Address("0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=400000,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/create2collisionSelfdestructedFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f500",  # noqa: E501
-            {},
-        ),
-        (
-            "6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f500",  # noqa: E501
-            {},
-        ),
-        (
-            "6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f500",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=["case0", "case1", "case2"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_create2collision_selfdestructed_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Collision with address that has been selfdestructed in the same..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xE2B35478FDD26477CC576DD906E6277761246A3C)
+    contract_1 = Address(0xAF3ECBA2FE09A4F6C19F16A9D119E44E08C2DA01)
+    contract_2 = Address(0xEC2C6832D00680ECE8FF9254F81FDAB0A5A2AC50)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -156,41 +81,131 @@ def test_create2collision_selfdestructed_from_prague(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (SELFDESTRUCT 0x10) }
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0x10) + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01"),  # noqa: E501
+        address=Address(0xE2B35478FDD26477CC576DD906E6277761246A3C),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (SELFDESTRUCT 0x10) }
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0x10) + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xe2b35478fdd26477cc576dd906e6277761246a3c"),  # noqa: E501
+        address=Address(0xAF3ECBA2FE09A4F6C19F16A9D119E44E08C2DA01),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (SELFDESTRUCT 0x10) }
-    pre.deploy_contract(
+    contract_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0x10) + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50"),  # noqa: E501
+        address=Address(0xEC2C6832D00680ECE8FF9254F81FDAB0A5A2AC50),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(balance=0, nonce=0),
+                Address(0x0000000000000000000000000000000000000010): Account(
+                    balance=1
+                ),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={0: 0}, balance=1, nonce=2
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(balance=0, nonce=0),
+                Address(0x0000000000000000000000000000000000000010): Account(
+                    balance=1
+                ),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={0: 0}, balance=1, nonce=2
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": 2, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_2: Account(balance=0, nonce=0),
+                Address(0x0000000000000000000000000000000000000010): Account(
+                    balance=1
+                ),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={0: 0}, balance=1, nonce=2
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CREATE2(value=0x0, offset=0x0, size=0x0, salt=0x0)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=0x6001600155)
+        + Op.CREATE2(value=0x0, offset=0x1B, size=0x5, salt=0x0)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0)
+        + Op.STOP,
+    ]
+    tx_gas = [400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=400000,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2collision_selfdestructed2.py b/tests/ported_static/stCreate2/test_create2collision_selfdestructed2.py
index 1bc41b93efb..c55ec9f9d50 100644
--- a/tests/ported_static/stCreate2/test_create2collision_selfdestructed2.py
+++ b/tests/ported_static/stCreate2/test_create2collision_selfdestructed2.py
@@ -1,8 +1,8 @@
 """
-A contract which performs SUICIDE, and is then attempted to be recreated...
+A contract which performs SUICIDE, and is then attempted to be...
 
 Ported from:
-tests/static/state_tests/stCreate2/create2collisionSelfdestructed2Filler.json
+state_tests/stCreate2/create2collisionSelfdestructed2Filler.json
 """
 
 import pytest
@@ -15,6 +15,10 @@
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,35 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/create2collisionSelfdestructed2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/create2collisionSelfdestructed2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073fce41d047b4a1d4450382dcc29ec7e5fedc5f9a361c350f1506b620102036000526003601df36000526000600c60146000f500",  # noqa: E501
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "6000600060006000600073cff64f4c5df8f436c4f2c1af4b2e3f9e3004c77961c350f1506b626010ff6000526003601df36000526000600c60146000f500",  # noqa: E501
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2collision_selfdestructed2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """A contract which performs SUICIDE, and is then attempted to be..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xFCE41D047B4A1D4450382DCC29EC7E5FEDC5F9A3)
+    contract_1 = Address(0xCFF64F4C5DF8F436C4F2C1AF4B2E3F9E3004C779)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -65,102 +73,93 @@ def test_create2collision_selfdestructed2(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=0x10),
-        balance=1,
-        address=Address("0xcff64f4c5df8f436c4f2c1af4b2e3f9e3004c779"),  # noqa: E501
-    )
-    # Source: LLL
+    # Source: lll
     # { (SELFDESTRUCT 0x10) }
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0x10) + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xfce41d047b4a1d4450382dcc29ec7e5fedc5f9a3"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=400000,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/create2collisionSelfdestructed2Filler.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "6000600060006000600073fce41d047b4a1d4450382dcc29ec7e5fedc5f9a361c350f1506b620102036000526003601df36000526000600c60146000f500",  # noqa: E501
-            {},
-        ),
-        (
-            "6000600060006000600073cff64f4c5df8f436c4f2c1af4b2e3f9e3004c77961c350f1506b626010ff6000526003601df36000526000600c60146000f500",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=["case0", "case1"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_create2collision_selfdestructed2_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """A contract which performs SUICIDE, and is then attempted to be..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=1000000,
+        address=Address(0xFCE41D047B4A1D4450382DCC29EC7E5FEDC5F9A3),  # noqa: E501
     )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x6010ff
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0x10),
         balance=1,
-        address=Address("0xcff64f4c5df8f436c4f2c1af4b2e3f9e3004c779"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (SELFDESTRUCT 0x10) }
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=0x10) + Op.STOP,
-        balance=1,
-        nonce=0,
-        address=Address("0xfce41d047b4a1d4450382dcc29ec7e5fedc5f9a3"),  # noqa: E501
+        nonce=1,
+        address=Address(0xCFF64F4C5DF8F436C4F2C1AF4B2E3F9E3004C779),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={},
+                    code=bytes.fromhex("6010ff00"),
+                    balance=0,
+                    nonce=0,
+                ),
+                Address(0x0000000000000000000000000000000000000010): Account(
+                    balance=1
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(balance=0, nonce=1),
+                Address(0x0000000000000000000000000000000000000010): Account(
+                    balance=1
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=0x620102036000526003601DF3)
+        + Op.CREATE2(value=0x0, offset=0x14, size=0xC, salt=0x0)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=0x626010FF6000526003601DF3)
+        + Op.CREATE2(value=0x0, offset=0x14, size=0xC, salt=0x0)
+        + Op.STOP,
+    ]
+    tx_gas = [400000]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=400000,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2collision_selfdestructed_oog.py b/tests/ported_static/stCreate2/test_create2collision_selfdestructed_oog.py
index dfeccc00f7f..4def59bad89 100644
--- a/tests/ported_static/stCreate2/test_create2collision_selfdestructed_oog.py
+++ b/tests/ported_static/stCreate2/test_create2collision_selfdestructed_oog.py
@@ -1,8 +1,8 @@
 """
-collision with address that has been selfdestructed in the same transaction...
+Collision with address that has been selfdestructed in the same...
 
 Ported from:
-tests/static/state_tests/stCreate2/create2collisionSelfdestructedOOGFiller.json
+state_tests/stCreate2/create2collisionSelfdestructedOOGFiller.json
 """
 
 import pytest
@@ -14,7 +14,9 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,28 +24,46 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/create2collisionSelfdestructedOOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/create2collisionSelfdestructedOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f5506211223360005500",  # noqa: E501
-        "6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f5506211223360005500",  # noqa: E501
-        "6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f5506211223360005500",  # noqa: E501
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2collision_selfdestructed_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Collision with address that has been selfdestructed in the same..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xE2B35478FDD26477CC576DD906E6277761246A3C)
+    contract_1 = Address(0xAF3ECBA2FE09A4F6C19F16A9D119E44E08C2DA01)
+    contract_2 = Address(0xEC2C6832D00680ECE8FF9254F81FDAB0A5A2AC50)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -58,41 +78,97 @@ def test_create2collision_selfdestructed_oog(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (SELFDESTRUCT 0x10) }
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0x10) + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01"),  # noqa: E501
+        address=Address(0xE2B35478FDD26477CC576DD906E6277761246A3C),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (SELFDESTRUCT 0x10) }
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0x10) + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xe2b35478fdd26477cc576dd906e6277761246a3c"),  # noqa: E501
+        address=Address(0xAF3ECBA2FE09A4F6C19F16A9D119E44E08C2DA01),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (SELFDESTRUCT 0x10) }
-    pre.deploy_contract(
+    contract_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0x10) + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50"),  # noqa: E501
+        address=Address(0xEC2C6832D00680ECE8FF9254F81FDAB0A5A2AC50),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x0, size=0x0, salt=0x0))
+        + Op.SSTORE(key=0x0, value=0x112233)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=0x6001600155)
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x1B, size=0x5, salt=0x0))
+        + Op.SSTORE(key=0x0, value=0x112233)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0))
+        + Op.SSTORE(key=0x0, value=0x112233)
+        + Op.STOP,
+    ]
+    tx_gas = [200000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=200000,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post: dict = {}
+    post = {
+        contract_0: Account(code=bytes.fromhex("6010ff00"), balance=1),
+        contract_1: Account(code=bytes.fromhex("6010ff00"), balance=1),
+        contract_2: Account(code=bytes.fromhex("6010ff00"), balance=1),
+        Address(
+            0x0000000000000000000000000000000000000010
+        ): Account.NONEXISTENT,
+        compute_create_address(address=sender, nonce=0): Account.NONEXISTENT,
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2collision_selfdestructed_revert.py b/tests/ported_static/stCreate2/test_create2collision_selfdestructed_revert.py
index 3a17e729608..062a07a32e6 100644
--- a/tests/ported_static/stCreate2/test_create2collision_selfdestructed_revert.py
+++ b/tests/ported_static/stCreate2/test_create2collision_selfdestructed_revert.py
@@ -1,9 +1,8 @@
 """
-collision with address that has been selfdestructed in the same transaction...
+Collision with address that has been selfdestructed in the same...
 
 Ported from:
-tests/static/state_tests/stCreate2
-create2collisionSelfdestructedRevertFiller.json
+state_tests/stCreate2/create2collisionSelfdestructedRevertFiller.json
 """
 
 import pytest
@@ -15,7 +14,9 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,126 +24,46 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/create2collisionSelfdestructedRevertFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/create2collisionSelfdestructedRevertFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000526003601dfd00",  # noqa: E501
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f15064600160015560005260006005601b6000f550621122336000526003601dfd00",  # noqa: E501
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506d6460016001556000526005601bf36000526000600e60126000f550621122336000526003601dfd00",  # noqa: E501
-            {},
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2collision_selfdestructed_revert(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Collision with address that has been selfdestructed in the same..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=1000000,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # { (SELFDESTRUCT 0x10) }
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=0x10) + Op.STOP,
-        balance=1,
-        nonce=0,
-        address=Address("0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (SELFDESTRUCT 0x10) }
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=0x10) + Op.STOP,
-        balance=1,
-        nonce=0,
-        address=Address("0xe2b35478fdd26477cc576dd906e6277761246a3c"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (SELFDESTRUCT 0x10) }
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=0x10) + Op.STOP,
-        balance=1,
-        nonce=0,
-        address=Address("0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=400000,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/create2collisionSelfdestructedRevertFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000526003601dfd00",  # noqa: E501
-            {},
-        ),
-        (
-            "6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f15064600160015560005260006005601b6000f550621122336000526003601dfd00",  # noqa: E501
-            {},
-        ),
-        (
-            "6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506d6460016001556000526005601bf36000526000600e60126000f550621122336000526003601dfd00",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=["case0", "case1", "case2"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_create2collision_selfdestructed_revert_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Collision with address that has been selfdestructed in the same..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xE2B35478FDD26477CC576DD906E6277761246A3C)
+    contract_1 = Address(0xAF3ECBA2FE09A4F6C19F16A9D119E44E08C2DA01)
+    contract_2 = Address(0xEC2C6832D00680ECE8FF9254F81FDAB0A5A2AC50)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -157,41 +78,100 @@ def test_create2collision_selfdestructed_revert_from_prague(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (SELFDESTRUCT 0x10) }
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0x10) + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01"),  # noqa: E501
+        address=Address(0xE2B35478FDD26477CC576DD906E6277761246A3C),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (SELFDESTRUCT 0x10) }
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0x10) + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xe2b35478fdd26477cc576dd906e6277761246a3c"),  # noqa: E501
+        address=Address(0xAF3ECBA2FE09A4F6C19F16A9D119E44E08C2DA01),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (SELFDESTRUCT 0x10) }
-    pre.deploy_contract(
+    contract_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0x10) + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50"),  # noqa: E501
+        address=Address(0xEC2C6832D00680ECE8FF9254F81FDAB0A5A2AC50),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x0, size=0x0, salt=0x0))
+        + Op.MSTORE(offset=0x0, value=0x112233)
+        + Op.REVERT(offset=0x1D, size=0x3)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=0x6001600155)
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x1B, size=0x5, salt=0x0))
+        + Op.MSTORE(offset=0x0, value=0x112233)
+        + Op.REVERT(offset=0x1D, size=0x3)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x12, size=0xE, salt=0x0))
+        + Op.MSTORE(offset=0x0, value=0x112233)
+        + Op.REVERT(offset=0x1D, size=0x3)
+        + Op.STOP,
+    ]
+    tx_gas = [400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=400000,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        contract_0: Account(code=bytes.fromhex("6010ff00"), balance=1),
+        contract_1: Account(code=bytes.fromhex("6010ff00"), balance=1),
+        contract_2: Account(code=bytes.fromhex("6010ff00"), balance=1),
+        Address(
+            0x0000000000000000000000000000000000000010
+        ): Account.NONEXISTENT,
+        compute_create_address(address=sender, nonce=0): Account.NONEXISTENT,
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create2no_cash.py b/tests/ported_static/stCreate2/test_create2no_cash.py
index fd2490b1f97..0d5894a3320 100644
--- a/tests/ported_static/stCreate2/test_create2no_cash.py
+++ b/tests/ported_static/stCreate2/test_create2no_cash.py
@@ -1,8 +1,8 @@
 """
-create2 fails with not enough cash (endowment of a new account) + inside...
+Create2 fails with not enough cash (endowment of a new account) +...
 
 Ported from:
-tests/static/state_tests/stCreate2/create2noCashFiller.json
+state_tests/stCreate2/create2noCashFiller.json
 """
 
 import pytest
@@ -15,6 +15,10 @@
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,36 +26,44 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/create2noCashFiller.json"],
+    ["state_tests/stCreate2/create2noCashFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c620249f0f100",  # noqa: E501
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "6000600060006000600173e2b35478fdd26477cc576dd906e6277761246a3c620249f0f100",  # noqa: E501
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c620249f0fa00",  # noqa: E501
-            {},
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create2no_cash(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Create2 fails with not enough cash (endowment of a new account) +..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xE2B35478FDD26477CC576DD906E6277761246A3C)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -66,25 +78,83 @@ def test_create2no_cash(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (CREATE2 101 0 0 0) }
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.CREATE2(value=0x65, offset=0x0, size=0x0, salt=0x0) + Op.STOP,
         balance=100,
         nonce=0,
-        address=Address("0xe2b35478fdd26477cc576dd906e6277761246a3c"),  # noqa: E501
+        address=Address(0xE2B35478FDD26477CC576DD906E6277761246A3C),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(balance=100),
+                Address(
+                    0x12AAEFBC0350A026228076E5369E6CE148CE67BE
+                ): Account.NONEXISTENT,
+                sender: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(balance=0),
+                Address(0x12AAEFBC0350A026228076E5369E6CE148CE67BE): Account(
+                    balance=101
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.CALL(
+            gas=0x249F0,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.CALL(
+            gas=0x249F0,
+            address=contract_0,
+            value=0x1,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.STATICCALL(
+            gas=0x249F0,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+    ]
+    tx_gas = [400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=400000,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create_message_reverted.py b/tests/ported_static/stCreate2/test_create_message_reverted.py
index b7c92f0b357..0d0a5bff1f3 100644
--- a/tests/ported_static/stCreate2/test_create_message_reverted.py
+++ b/tests/ported_static/stCreate2/test_create_message_reverted.py
@@ -2,7 +2,7 @@
 CreateMessageReverted for CREATE2.
 
 Ported from:
-tests/static/state_tests/stCreate2/CreateMessageRevertedFiller.json
+state_tests/stCreate2/CreateMessageRevertedFiller.json
 """
 
 import pytest
@@ -11,10 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,33 +27,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/CreateMessageRevertedFiller.json"],
+    ["state_tests/stCreate2/CreateMessageRevertedFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (80000, {}),
-        (
-            150000,
-            {
-                Address("0x244fe9a7867edcc140245e775071fbfe6ebedbae"): Account(
-                    storage={0: 12, 1: 13}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_message_reverted(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """CreateMessageReverted for CREATE2."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -63,25 +73,54 @@ def test_create_message_reverted(
     )
 
     pre[sender] = Account(balance=0x2DC6C0)
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 0 0x600c600055600d600155) (CREATE2 0 22 10 0)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x600C600055600D600155)
-            + Op.CREATE2(value=0x0, offset=0x16, size=0xA, salt=0x0)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x600C600055600D600155)
+        + Op.CREATE2(value=0x0, offset=0x16, size=0xA, salt=0x0)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                Address(
+                    0x244FE9A7867EDCC140245E775071FBFE6EBEDBAE
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                Address(0x244FE9A7867EDCC140245E775071FBFE6EBEDBAE): Account(
+                    storage={0: 12, 1: 13}, balance=0, nonce=1
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [80000, 150000]
+    tx_value = [100]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=100,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_create_message_reverted_oog_in_init2.py b/tests/ported_static/stCreate2/test_create_message_reverted_oog_in_init2.py
index a24b572bb10..927b3fa082e 100644
--- a/tests/ported_static/stCreate2/test_create_message_reverted_oog_in_init2.py
+++ b/tests/ported_static/stCreate2/test_create_message_reverted_oog_in_init2.py
@@ -1,8 +1,8 @@
 """
-create2 oog during the init code, + when create2 is from transaction init...
+Create2 oog during the init code, + when create2 is from transaction...
 
 Ported from:
-tests/static/state_tests/stCreate2/CreateMessageRevertedOOGInInit2Filler.json
+state_tests/stCreate2/CreateMessageRevertedOOGInInit2Filler.json
 """
 
 import pytest
@@ -15,45 +15,52 @@
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/CreateMessageRevertedOOGInInit2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/CreateMessageRevertedOOGInInit2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (110000, {}),
-        (
-            150000,
-            {
-                Address("0xf3059e18a327c662766f6ba11808c400635847ef"): Account(
-                    storage={0: 12, 1: 13}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_message_reverted_oog_in_init2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Create2 oog during the init code, + when create2 is from..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -65,16 +72,55 @@ def test_create_message_reverted_oog_in_init2(
     )
 
     pre[sender] = Account(balance=0x2DC6C0)
-    pre[contract] = Account(balance=10, nonce=0)
+    # Source: hex
+    # 0x
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=10,
+        nonce=0,
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                Address(
+                    0xF3059E18A327C662766F6BA11808C400635847EF
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                Address(0xF3059E18A327C662766F6BA11808C400635847EF): Account(
+                    storage={0: 12, 1: 13}, balance=0, nonce=1
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.MSTORE(offset=0x0, value=0x600C600055600D600155)
+        + Op.CREATE2(value=0x0, offset=0x16, size=0xA, salt=0x0)
+        + Op.STOP,
+    ]
+    tx_gas = [110000, 150000]
+    tx_value = [100]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex("69600c600055600d6001556000526000600a60166000f500"),
-        gas_limit=tx_gas_limit,
-        value=100,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_returndatacopy_0_0_following_successful_create.py b/tests/ported_static/stCreate2/test_returndatacopy_0_0_following_successful_create.py
index c010a2a21d1..dcf711122d6 100644
--- a/tests/ported_static/stCreate2/test_returndatacopy_0_0_following_successful_create.py
+++ b/tests/ported_static/stCreate2/test_returndatacopy_0_0_following_successful_create.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_returndatacopy_0_0_following_successful_create.
 
 Ported from:
-tests/static/state_tests/stCreate2
-returndatacopy_0_0_following_successful_createFiller.json
+state_tests/stCreate2/returndatacopy_0_0_following_successful_createFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCreate2/returndatacopy_0_0_following_successful_createFiller.json",  # noqa: E501
+        "state_tests/stCreate2/returndatacopy_0_0_following_successful_createFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,9 @@ def test_returndatacopy_0_0_following_successful_create(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_returndatacopy_0_0_following_successful_create."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,40 +49,37 @@ def test_returndatacopy_0_0_following_successful_create(
         gas_limit=47244640256,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0x6400000000)
+    # Source: lll
     # { (create2 0 0 (lll (seq (SSTORE 0 1) (STOP) ) 0) 0) (RETURNDATACOPY 0 0 0) (SSTORE 0 0) (STOP) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x7]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x1F, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE2)
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x0)
-            + Op.SSTORE(key=0x0, value=0x0)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(key=0x0, value=0x1)
-            + Op.STOP
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0x7]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x1F, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x0)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.STOP * 2,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
+        address=Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
     post = {
-        Address("0x75579e0e990d8361c48b86c1b57686589df3264a"): Account(
-            storage={0: 1},
+        contract_0: Account(storage={0: 0}),
+        Address(0x75579E0E990D8361C48B86C1B57686589DF3264A): Account(
+            storage={0: 1}
         ),
     }
 
diff --git a/tests/ported_static/stCreate2/test_returndatacopy_after_failing_create.py b/tests/ported_static/stCreate2/test_returndatacopy_after_failing_create.py
index 95556534179..e08efa80d4d 100644
--- a/tests/ported_static/stCreate2/test_returndatacopy_after_failing_create.py
+++ b/tests/ported_static/stCreate2/test_returndatacopy_after_failing_create.py
@@ -2,16 +2,15 @@
 Returndatacopy after failing create case due to 0xfd code.
 
 Ported from:
-tests/static/state_tests/stCreate2
-returndatacopy_afterFailing_createFiller.json
+state_tests/stCreate2/returndatacopy_afterFailing_createFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/returndatacopy_afterFailing_createFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/returndatacopy_afterFailing_createFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,9 @@ def test_returndatacopy_after_failing_create(
     pre: Alloc,
 ) -> None:
     """Returndatacopy after failing create case due to 0xfd code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,31 +44,26 @@ def test_returndatacopy_after_failing_create(
         gas_limit=47244640256,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x600260005260206000fd) (create2 0 22 10 0) (SSTORE 0 (RETURNDATASIZE)) (RETURNDATACOPY 0 0 32) (SSTORE 1 (MLOAD 0)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x600260005260206000FD)
-            + Op.POP(Op.CREATE2(value=0x0, offset=0x16, size=0xA, salt=0x0))
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x600260005260206000FD)
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x16, size=0xA, salt=0x0))
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 32, 1: 2}),
-    }
+    post = {contract_0: Account(storage={0: 32, 1: 2})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_returndatacopy_following_create.py b/tests/ported_static/stCreate2/test_returndatacopy_following_create.py
index 4842c932c34..323a9dda6c8 100644
--- a/tests/ported_static/stCreate2/test_returndatacopy_following_create.py
+++ b/tests/ported_static/stCreate2/test_returndatacopy_following_create.py
@@ -2,7 +2,7 @@
 Check that create2 does not fill returndata buffer with its return opcode.
 
 Ported from:
-tests/static/state_tests/stCreate2/returndatacopy_following_createFiller.json
+state_tests/stCreate2/returndatacopy_following_createFiller.json
 """
 
 import pytest
@@ -12,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,27 +27,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/returndatacopy_following_createFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/returndatacopy_following_createFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "0000000000000000000000000f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-        "0000000000000000000000001f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_returndatacopy_following_create(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Check that create2 does not fill returndata buffer with its..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Check that create2 does not fill returndata buffer with its return..."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1AABBCCDD5C57F15886F9B263E2F6D2D6C7B5EC6)
+    contract_1 = Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6)
+    contract_2 = Address(0x1F572E5295C57F15886F9B263E2F6D2D6C7B5EC6)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -56,84 +74,90 @@ def test_returndatacopy_following_create(
         gas_limit=47244640256,
     )
 
-    # Source: LLL
-    # { (CREATE2 0 0 (lll (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32)) 0) 0) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) }  # noqa: E501
-    callee = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x28]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x1F, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE2)
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    pre[sender] = Account(balance=0x6400000000)
+    # Source: lll
+    # { (CALL (GAS) (CALLDATALOAD 0) 0 0 0 0 0) }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=Op.GAS,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
+        address=Address(0x1AABBCCDD5C57F15886F9B263E2F6D2D6C7B5EC6),  # noqa: E501
     )
-    # Source: LLL
-    # { (CALL (GAS) (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=Op.GAS,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (CREATE2 0 0 (lll (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32)) 0) 0) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) }  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0x28]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x1F, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP
+        + Op.INVALID
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x1aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
+        address=Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (seq (create2 0 0 (lll (STOP) 0) 0) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) )}  # noqa: E501
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x2]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x1F, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE2)
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.INVALID
-            + Op.STOP
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0x2]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x1F, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP
+        + Op.INVALID
+        + Op.STOP * 2,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x1f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
+        address=Address(0x1F572E5295C57F15886F9B263E2F6D2D6C7B5EC6),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(contract_1, left_padding=True),
+        Hash(contract_2, left_padding=True),
+    ]
+    tx_gas = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=100000,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = {
-        callee: Account(storage={0: 1}),
-        callee_1: Account(storage={0: 1}),
-    }
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_returndatacopy_following_revert_in_create.py b/tests/ported_static/stCreate2/test_returndatacopy_following_revert_in_create.py
index 4bea5b32e3c..f1a7794a0bc 100644
--- a/tests/ported_static/stCreate2/test_returndatacopy_following_revert_in_create.py
+++ b/tests/ported_static/stCreate2/test_returndatacopy_following_revert_in_create.py
@@ -1,9 +1,8 @@
 """
-returndatacopy_following_revert_in_create for CREATE2.
+Returndatacopy_following_revert_in_create for CREATE2.
 
 Ported from:
-tests/static/state_tests/stCreate2
-returndatacopy_following_revert_in_createFiller.json
+state_tests/stCreate2/returndatacopy_following_revert_in_createFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCreate2/returndatacopy_following_revert_in_createFiller.json",  # noqa: E501
+        "state_tests/stCreate2/returndatacopy_following_revert_in_createFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,7 +34,8 @@ def test_returndatacopy_following_revert_in_create(
     pre: Alloc,
 ) -> None:
     """Returndatacopy_following_revert_in_create for CREATE2."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,43 +49,39 @@ def test_returndatacopy_following_revert_in_create(
         gas_limit=47244640256,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0x6400000000)
+    # Source: lll
     # { (seq (CREATE2 0 0 (lll (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (REVERT 0 32) (STOP) ) 0) 0) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) (STOP) )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x29]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x20, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE2)
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
-            )
-            + Op.REVERT(offset=0x0, size=0x20)
-            + Op.STOP
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0x29]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x20, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
+        address=Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
             },
diff --git a/tests/ported_static/stCreate2/test_returndatacopy_following_successful_create.py b/tests/ported_static/stCreate2/test_returndatacopy_following_successful_create.py
index e6f42ac9bd6..aa1c2c33f7a 100644
--- a/tests/ported_static/stCreate2/test_returndatacopy_following_successful_create.py
+++ b/tests/ported_static/stCreate2/test_returndatacopy_following_successful_create.py
@@ -1,17 +1,16 @@
 """
-returndatacopy_following_successful_create for CREATE2.
+Returndatacopy_following_successful_create for CREATE2.
 
 Ported from:
-tests/static/state_tests/stCreate2
-returndatacopy_following_successful_createFiller.json
+state_tests/stCreate2/returndatacopy_following_successful_createFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCreate2/returndatacopy_following_successful_createFiller.json",  # noqa: E501
+        "state_tests/stCreate2/returndatacopy_following_successful_createFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,9 @@ def test_returndatacopy_following_successful_create(
     pre: Alloc,
 ) -> None:
     """Returndatacopy_following_successful_create for CREATE2."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,37 +46,30 @@ def test_returndatacopy_following_successful_create(
         gas_limit=51539607552,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (create2 0 0 (lll (seq (STOP)) 0) 0) (RETURNDATACOPY 0 1 32) (SSTORE 0 (MLOAD 0)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x2]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x1F, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE2)
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x1, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.INVALID
-            + Op.STOP
-            + Op.STOP
-        ),
-        storage={0x0: 0x2},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0x2]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x1F, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x1, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP
+        + Op.INVALID
+        + Op.STOP * 2,
+        storage={0: 2},
         nonce=0,
-        address=Address("0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 2}),
-    }
+    post = {contract_0: Account(storage={0: 2})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_returndatasize_following_successful_create.py b/tests/ported_static/stCreate2/test_returndatasize_following_successful_create.py
index edd6c00daf5..7d2fd9b8afc 100644
--- a/tests/ported_static/stCreate2/test_returndatasize_following_successful_create.py
+++ b/tests/ported_static/stCreate2/test_returndatasize_following_successful_create.py
@@ -1,17 +1,16 @@
 """
-returndatasize_following_successful_create for create2.
+Returndatasize_following_successful_create for create2.
 
 Ported from:
-tests/static/state_tests/stCreate2
-returndatasize_following_successful_createFiller.json
+state_tests/stCreate2/returndatasize_following_successful_createFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCreate2/returndatasize_following_successful_createFiller.json",  # noqa: E501
+        "state_tests/stCreate2/returndatasize_following_successful_createFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,9 @@ def test_returndatasize_following_successful_create(
     pre: Alloc,
 ) -> None:
     """Returndatasize_following_successful_create for create2."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,36 +46,31 @@ def test_returndatasize_following_successful_create(
         gas_limit=47244640256,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (seq (CREATE2 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32)) 0) 0) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0xD]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x17, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE2)
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(offset=0x0, value=0x112233)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0xD]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x17, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=0x112233)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {contract_0: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_revert_depth_create2_oog.py b/tests/ported_static/stCreate2/test_revert_depth_create2_oog.py
index 911362b889c..293fe888c7a 100644
--- a/tests/ported_static/stCreate2/test_revert_depth_create2_oog.py
+++ b/tests/ported_static/stCreate2/test_revert_depth_create2_oog.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_revert_depth_create2_oog.
 
 Ported from:
-tests/static/state_tests/stCreate2/RevertDepthCreate2OOGFiller.json
+state_tests/stCreate2/RevertDepthCreate2OOGFiller.json
 """
 
 import pytest
@@ -12,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,105 +27,75 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/RevertDepthCreate2OOGFiller.json"],
+    ["state_tests/stCreate2/RevertDepthCreate2OOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            110000,
-            1,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            110000,
+        pytest.param(
             0,
-            {},
+            0,
+            0,
+            id="d0-g0-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            170000,
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0xa000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 4: 12}
-                )
-            },
+            id="d0-g0-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            170000,
+        pytest.param(
             0,
-            {
-                Address("0xa000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 4: 12}
-                )
-            },
+            1,
+            0,
+            id="d0-g1-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            110000,
+        pytest.param(
+            0,
             1,
-            {},
+            1,
+            id="d0-g1-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            110000,
+        pytest.param(
+            1,
+            0,
             0,
-            {},
+            id="d1-g0-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            170000,
+        pytest.param(
             1,
-            {
-                Address("0xa000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 4: 12}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={2: 8, 3: 12}
-                ),
-            },
+            0,
+            1,
+            id="d1-g0-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            170000,
+        pytest.param(
+            1,
+            1,
             0,
-            {
-                Address("0xa000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 4: 12}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={2: 8, 3: 12}
-                ),
-            },
+            id="d1-g1-v0",
+        ),
+        pytest.param(
+            1,
+            1,
+            1,
+            id="d1-g1-v1",
         ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_depth_create2_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_revert_depth_create2_oog."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xA000000000000000000000000000000000000000)
+    contract_1 = Address(0xB000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -134,54 +109,92 @@ def test_revert_depth_create2_oog(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.CALLDATALOAD(offset=0x0),
-                    address=0xB000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.STOP
-        ),
-        balance=5,
-        nonce=54,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[2]] 8 (CREATE2 0 0 0 0) [[3]] 12}
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x8)
-            + Op.POP(Op.CREATE2(value=0x0, offset=0x0, size=0x0, salt=0x0))
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x8)
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x0, size=0x0, salt=0x0))
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
+    )
+    # Source: lll
+    # { [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.CALLDATALOAD(offset=0x0),
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.STOP,
+        balance=5,
+        nonce=54,
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x05A28FC366483258507BCF739658573CB47E4FAD): Account(
+                    nonce=1
+                ),
+                contract_0: Account(storage={0: 1, 1: 1, 4: 12}),
+                contract_1: Account(storage={2: 8, 3: 12}),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(
+                    0x05A28FC366483258507BCF739658573CB47E4FAD
+                ): Account.NONEXISTENT,
+                contract_0: Account(storage={0: 1, 4: 12}),
+                contract_1: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": [0, 1], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(
+                    0x05A28FC366483258507BCF739658573CB47E4FAD
+                ): Account.NONEXISTENT,
+                contract_0: Account(storage={}),
+                contract_1: Account(storage={}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0xEA60),
+        Hash(0x1EA60),
+    ]
+    tx_gas = [110000, 170000]
+    tx_value = [1, 0]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_revert_depth_create2_oog_berlin.py b/tests/ported_static/stCreate2/test_revert_depth_create2_oog_berlin.py
index d09f2cf2ab0..e55f6b2a6ef 100644
--- a/tests/ported_static/stCreate2/test_revert_depth_create2_oog_berlin.py
+++ b/tests/ported_static/stCreate2/test_revert_depth_create2_oog_berlin.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_revert_depth_create2_oog_berlin.
 
 Ported from:
-tests/static/state_tests/stCreate2/RevertDepthCreate2OOGBerlinFiller.json
+state_tests/stCreate2/RevertDepthCreate2OOGBerlinFiller.json
 """
 
 import pytest
@@ -12,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,107 +27,75 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/RevertDepthCreate2OOGBerlinFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/RevertDepthCreate2OOGBerlinFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            110000,
-            1,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            110000,
+        pytest.param(
+            0,
+            0,
             0,
-            {},
+            id="d0-g0-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            170000,
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0xa000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 4: 12}
-                )
-            },
+            id="d0-g0-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            170000,
+        pytest.param(
             0,
-            {
-                Address("0xa000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 4: 12}
-                )
-            },
+            1,
+            0,
+            id="d0-g1-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            110000,
+        pytest.param(
+            0,
+            1,
             1,
-            {},
+            id="d0-g1-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            110000,
+        pytest.param(
+            1,
             0,
-            {},
+            0,
+            id="d1-g0-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            170000,
+        pytest.param(
             1,
-            {
-                Address("0xa000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 4: 12}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={2: 8, 3: 12}
-                ),
-            },
+            0,
+            1,
+            id="d1-g0-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            170000,
+        pytest.param(
+            1,
+            1,
             0,
-            {
-                Address("0xa000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 4: 12}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={2: 8, 3: 12}
-                ),
-            },
+            id="d1-g1-v0",
+        ),
+        pytest.param(
+            1,
+            1,
+            1,
+            id="d1-g1-v1",
         ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_depth_create2_oog_berlin(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_revert_depth_create2_oog_berlin."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xA000000000000000000000000000000000000000)
+    contract_1 = Address(0xB000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -136,54 +109,92 @@ def test_revert_depth_create2_oog_berlin(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.CALLDATALOAD(offset=0x0),
-                    address=0xB000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.STOP
-        ),
-        balance=5,
-        nonce=54,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[2]] 8 (CREATE2 0 0 0 0) [[3]] 12}
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x8)
-            + Op.POP(Op.CREATE2(value=0x0, offset=0x0, size=0x0, salt=0x0))
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x8)
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x0, size=0x0, salt=0x0))
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
+    )
+    # Source: lll
+    # { [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.CALLDATALOAD(offset=0x0),
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.STOP,
+        balance=5,
+        nonce=54,
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x05A28FC366483258507BCF739658573CB47E4FAD): Account(
+                    nonce=1
+                ),
+                contract_0: Account(storage={0: 1, 1: 1, 4: 12}),
+                contract_1: Account(storage={2: 8, 3: 12}),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(
+                    0x05A28FC366483258507BCF739658573CB47E4FAD
+                ): Account.NONEXISTENT,
+                contract_0: Account(storage={0: 1, 4: 12}),
+                contract_1: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": [0, 1], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(
+                    0x05A28FC366483258507BCF739658573CB47E4FAD
+                ): Account.NONEXISTENT,
+                contract_0: Account(storage={}),
+                contract_1: Account(storage={}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0xEA60),
+        Hash(0x1EA60),
+    ]
+    tx_gas = [110000, 170000]
+    tx_value = [1, 0]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_revert_depth_create_address_collision.py b/tests/ported_static/stCreate2/test_revert_depth_create_address_collision.py
index 62e9884677f..3cd45030619 100644
--- a/tests/ported_static/stCreate2/test_revert_depth_create_address_collision.py
+++ b/tests/ported_static/stCreate2/test_revert_depth_create_address_collision.py
@@ -1,8 +1,8 @@
 """
-copy of this test for CREATE2.
+Copy of this test for CREATE2.
 
 Ported from:
-tests/static/state_tests/stCreate2/RevertDepthCreateAddressCollisionFiller.json
+state_tests/stCreate2/RevertDepthCreateAddressCollisionFiller.json
 """
 
 import pytest
@@ -12,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,107 +27,75 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/RevertDepthCreateAddressCollisionFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/RevertDepthCreateAddressCollisionFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            110000,
-            1,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            110000,
+        pytest.param(
+            0,
+            0,
             0,
-            {},
+            id="d0-g0-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            170000,
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x3e180b1862f9d158abb5e519a6d8605540c23682"): Account(
-                    storage={0: 1, 4: 12}
-                )
-            },
+            id="d0-g0-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            170000,
+        pytest.param(
             0,
-            {
-                Address("0x3e180b1862f9d158abb5e519a6d8605540c23682"): Account(
-                    storage={0: 1, 4: 12}
-                )
-            },
+            1,
+            0,
+            id="d0-g1-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            110000,
+        pytest.param(
+            0,
+            1,
             1,
-            {},
+            id="d0-g1-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            110000,
+        pytest.param(
+            1,
+            0,
             0,
-            {},
+            id="d1-g0-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            170000,
+        pytest.param(
             1,
-            {
-                Address("0x3e180b1862f9d158abb5e519a6d8605540c23682"): Account(
-                    storage={0: 1, 1: 1, 4: 12}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={2: 8, 3: 12}
-                ),
-            },
+            0,
+            1,
+            id="d1-g0-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            170000,
+        pytest.param(
+            1,
+            1,
             0,
-            {
-                Address("0x3e180b1862f9d158abb5e519a6d8605540c23682"): Account(
-                    storage={0: 1, 1: 1, 4: 12}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={2: 8, 3: 12}
-                ),
-            },
+            id="d1-g1-v0",
+        ),
+        pytest.param(
+            1,
+            1,
+            1,
+            id="d1-g1-v1",
         ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_depth_create_address_collision(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Copy of this test for CREATE2."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x3E180B1862F9D158ABB5E519A6D8605540C23682)
+    contract_1 = Address(0xB000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -136,54 +109,104 @@ def test_revert_depth_create_address_collision(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.CALLDATALOAD(offset=0x0),
-                    address=0xB000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.STOP
-        ),
-        balance=5,
-        nonce=54,
-        address=Address("0x3e180b1862f9d158abb5e519a6d8605540c23682"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[2]] 8 (CREATE2 0 0 0 0) [[3]] 12}
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x8)
-            + Op.POP(Op.CREATE2(value=0x0, offset=0x0, size=0x0, salt=0x0))
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x8)
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x0, size=0x0, salt=0x0))
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
+    )
+    # Source: lll
+    # { [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.CALLDATALOAD(offset=0x0),
+                address=0xB000000000000000000000000000000000000000,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.STOP,
+        balance=5,
+        nonce=54,
+        address=Address(0x3E180B1862F9D158ABB5E519A6D8605540C23682),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={0: 1, 1: 1, 4: 12}, nonce=54),
+                contract_1: Account(storage={2: 8, 3: 12}),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={0: 1, 4: 12}, nonce=54),
+                contract_1: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c60045500"  # noqa: E501
+                    ),
+                    balance=5,
+                    nonce=54,
+                ),
+                contract_1: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c60045500"  # noqa: E501
+                    ),
+                    nonce=54,
+                ),
+                contract_1: Account(storage={}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0xEA60),
+        Hash(0x1EA60),
+    ]
+    tx_gas = [110000, 170000]
+    tx_value = [1, 0]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_revert_depth_create_address_collision_berlin.py b/tests/ported_static/stCreate2/test_revert_depth_create_address_collision_berlin.py
index 622c238f002..72fca5e4127 100644
--- a/tests/ported_static/stCreate2/test_revert_depth_create_address_collision_berlin.py
+++ b/tests/ported_static/stCreate2/test_revert_depth_create_address_collision_berlin.py
@@ -1,9 +1,8 @@
 """
-copy of this test for CREATE2.
+Copy of this test for CREATE2.
 
 Ported from:
-tests/static/state_tests/stCreate2
-RevertDepthCreateAddressCollisionBerlinFiller.json
+state_tests/stCreate2/RevertDepthCreateAddressCollisionBerlinFiller.json
 """
 
 import pytest
@@ -13,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,106 +28,76 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCreate2/RevertDepthCreateAddressCollisionBerlinFiller.json",  # noqa: E501
+        "state_tests/stCreate2/RevertDepthCreateAddressCollisionBerlinFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            110000,
-            1,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            110000,
+        pytest.param(
+            0,
             0,
-            {},
+            0,
+            id="d0-g0-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            170000,
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x3e180b1862f9d158abb5e519a6d8605540c23682"): Account(
-                    storage={0: 1, 4: 12}
-                )
-            },
+            id="d0-g0-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            170000,
+        pytest.param(
             0,
-            {
-                Address("0x3e180b1862f9d158abb5e519a6d8605540c23682"): Account(
-                    storage={0: 1, 4: 12}
-                )
-            },
+            1,
+            0,
+            id="d0-g1-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            110000,
+        pytest.param(
+            0,
+            1,
             1,
-            {},
+            id="d0-g1-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            110000,
+        pytest.param(
+            1,
+            0,
             0,
-            {},
+            id="d1-g0-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            170000,
+        pytest.param(
             1,
-            {
-                Address("0x3e180b1862f9d158abb5e519a6d8605540c23682"): Account(
-                    storage={0: 1, 1: 1, 4: 12}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={2: 8, 3: 12}
-                ),
-            },
+            0,
+            1,
+            id="d1-g0-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            170000,
+        pytest.param(
+            1,
+            1,
             0,
-            {
-                Address("0x3e180b1862f9d158abb5e519a6d8605540c23682"): Account(
-                    storage={0: 1, 1: 1, 4: 12}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={2: 8, 3: 12}
-                ),
-            },
+            id="d1-g1-v0",
+        ),
+        pytest.param(
+            1,
+            1,
+            1,
+            id="d1-g1-v1",
         ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_depth_create_address_collision_berlin(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Copy of this test for CREATE2."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x3E180B1862F9D158ABB5E519A6D8605540C23682)
+    contract_1 = Address(0xB000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -137,54 +111,104 @@ def test_revert_depth_create_address_collision_berlin(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.CALLDATALOAD(offset=0x0),
-                    address=0xB000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.STOP
-        ),
-        balance=5,
-        nonce=54,
-        address=Address("0x3e180b1862f9d158abb5e519a6d8605540c23682"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[2]] 8 (CREATE2 0 0 0 0) [[3]] 12}
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x8)
-            + Op.POP(Op.CREATE2(value=0x0, offset=0x0, size=0x0, salt=0x0))
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x8)
+        + Op.POP(Op.CREATE2(value=0x0, offset=0x0, size=0x0, salt=0x0))
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
+    # Source: lll
+    # { [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.CALLDATALOAD(offset=0x0),
+                address=0xB000000000000000000000000000000000000000,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.STOP,
+        balance=5,
+        nonce=54,
+        address=Address(0x3E180B1862F9D158ABB5E519A6D8605540C23682),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={0: 1, 1: 1, 4: 12}, nonce=54),
+                contract_1: Account(storage={2: 8, 3: 12}),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={0: 1, 4: 12}, nonce=54),
+                contract_1: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c60045500"  # noqa: E501
+                    ),
+                    balance=5,
+                    nonce=54,
+                ),
+                contract_1: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c60045500"  # noqa: E501
+                    ),
+                    nonce=54,
+                ),
+                contract_1: Account(storage={}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(0xEA60),
+        Hash(0x1EA60),
+    ]
+    tx_gas = [110000, 170000]
+    tx_value = [1, 0]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_revert_opcode_create.py b/tests/ported_static/stCreate2/test_revert_opcode_create.py
index 1f6204fab29..73c21783789 100644
--- a/tests/ported_static/stCreate2/test_revert_opcode_create.py
+++ b/tests/ported_static/stCreate2/test_revert_opcode_create.py
@@ -2,19 +2,23 @@
 RevertOpcodeCreate for CREATE2.
 
 Ported from:
-tests/static/state_tests/stCreate2/RevertOpcodeCreateFiller.json
+state_tests/stCreate2/RevertOpcodeCreateFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,36 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreate2/RevertOpcodeCreateFiller.json"],
+    ["state_tests/stCreate2/RevertOpcodeCreateFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            460000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 12}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
-        (70000, {}),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_opcode_create(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """RevertOpcodeCreate for CREATE2."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -62,31 +69,46 @@ def test_revert_opcode_create(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x600160005560016000fd6011600155 ) [[1]](CREATE2 1 17 15 0) [[0]] 12 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x600160005560016000FD6011600155)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CREATE2(value=0x1, offset=0x11, size=0xF, salt=0x0),
-            )
-            + Op.SSTORE(key=0x0, value=0xC)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x600160005560016000FD6011600155)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CREATE2(value=0x1, offset=0x11, size=0xF, salt=0x0),
+        )
+        + Op.SSTORE(key=0x0, value=0xC)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 12, 1: 0}, nonce=1)},
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(nonce=0)},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("600160005560016000fe6011600155"),
+    ]
+    tx_gas = [460000, 70000]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("600160005560016000fe6011600155"),
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreate2/test_revert_opcode_in_create_returns_create2.py b/tests/ported_static/stCreate2/test_revert_opcode_in_create_returns_create2.py
index d6be8adb0b7..6ead4a1821d 100644
--- a/tests/ported_static/stCreate2/test_revert_opcode_in_create_returns_create2.py
+++ b/tests/ported_static/stCreate2/test_revert_opcode_in_create_returns_create2.py
@@ -2,16 +2,15 @@
 RevertOpcodeInCreateReturns for CREATE2.
 
 Ported from:
-tests/static/state_tests/stCreate2
-RevertOpcodeInCreateReturnsCreate2Filler.json
+state_tests/stCreate2/RevertOpcodeInCreateReturnsCreate2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreate2/RevertOpcodeInCreateReturnsCreate2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCreate2/RevertOpcodeInCreateReturnsCreate2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,9 @@ def test_revert_opcode_in_create_returns_create2(
     pre: Alloc,
 ) -> None:
     """RevertOpcodeInCreateReturns for CREATE2."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,39 +44,31 @@ def test_revert_opcode_in_create_returns_create2(
         gas_limit=47244640256,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (seq (CREATE2 0 0 (lll (seq (mstore 0 0x112233) (revert 0 32) (STOP)) 0) 0) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0xE]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x17, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE2)
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(offset=0x0, value=0x112233)
-            + Op.REVERT(offset=0x0, size=0x20)
-            + Op.STOP
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0xE]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x17, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=0x112233)
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 32}),
-    }
+    post = {contract_0: Account(storage={0: 32})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/__init__.py b/tests/ported_static/stCreateTest/__init__.py
index f3412d981b2..eefc6b97c6d 100644
--- a/tests/ported_static/stCreateTest/__init__.py
+++ b/tests/ported_static/stCreateTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stCreateTest."""
+"""Ported static tests: stCreateTest."""  # noqa: N999
diff --git a/tests/ported_static/stCreateTest/test_code_in_constructor.py b/tests/ported_static/stCreateTest/test_code_in_constructor.py
index 9a227ea88ad..1a33dbe1033 100644
--- a/tests/ported_static/stCreateTest/test_code_in_constructor.py
+++ b/tests/ported_static/stCreateTest/test_code_in_constructor.py
@@ -2,7 +2,7 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stCreateTest/CodeInConstructorFiller.yml
+state_tests/stCreateTest/CodeInConstructorFiller.yml
 """
 
 import pytest
@@ -11,9 +11,16 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,54 +29,39 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreateTest/CodeInConstructorFiller.yml"],
+    ["state_tests/stCreateTest/CodeInConstructorFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "83c7d7580000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000da7a"): Account(
-                    storage={
-                        0: 8,
-                        1: 10,
-                        2: 0x8AF6A7AF30D840BA137E8F3F34D54CFB8BEBA6E2,
-                        3: 262,
-                        5: 0x610100610100610100395861026052600060006020610260600061DA7A62FFFF,  # noqa: E501
-                        7: 184,
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "83c7d7580000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000da7a"): Account(
-                    storage={
-                        0: 8,
-                        1: 10,
-                        2: 0x33C409678A4289F0184C95C627BA09DA2DAEAA46,
-                        3: 262,
-                        5: 0x610100610100610100395861026052600060006020610260600061DA7A62FFFF,  # noqa: E501
-                        7: 184,
-                    }
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_code_in_constructor(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0xba5e0000ba5e0000ba5e0000ba5e0000ba5e0000")
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0xBA5E0000BA5E0000BA5E0000BA5E0000BA5E0000)
+    contract_0 = Address(0x000000000000000000000000000000000000DA7A)
+    contract_1 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -83,26 +75,26 @@ def test_code_in_constructor(
         gas_limit=4294967296,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
     # {
     #     (def 'counterLoc 0)
     #     (def 'counterVal @@counterLoc)
     #     [[counterVal]] $0
     #     [[counterLoc]] (+ counterVal 1)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=Op.SLOAD(key=0x0), value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=Op.SLOAD(key=0x0), value=Op.CALLDATALOAD(offset=0x0)
+        )
+        + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.STOP,
+        storage={0: 1},
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000da7a"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000DA7A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
+    # Source: lll
     # {
     #   ; Variables are 0x20 bytes (= 256 bits) apart, except for
     #   ; code buffers that get 0x100 (256 bytes)
@@ -134,150 +126,183 @@ def test_code_in_constructor(
     #     )
     #   [constructorLength]
     # ... (36 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x6]
-            + Op.CODECOPY(
-                dest_offset=0x100, offset=Op.PUSH2[0x4C], size=Op.DUP1
-            )
-            + Op.PUSH2[0x200]
-            + Op.MSTORE
-            + Op.PUSH1[0xDB]
-            + Op.CODECOPY(dest_offset=0x0, offset=Op.PUSH2[0x52], size=Op.DUP1)
-            + Op.PUSH2[0x220]
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=0x37, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x1)
-            )
-            + Op.CREATE2(
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x6]
+        + Op.CODECOPY(dest_offset=0x100, offset=Op.PUSH2[0x4C], size=Op.DUP1)
+        + Op.PUSH2[0x200]
+        + Op.MSTORE
+        + Op.PUSH1[0xDB]
+        + Op.CODECOPY(dest_offset=0x0, offset=Op.PUSH2[0x52], size=Op.DUP1)
+        + Op.PUSH2[0x220]
+        + Op.MSTORE
+        + Op.JUMPI(pc=0x37, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x1))
+        + Op.CREATE2(
+            value=0x0,
+            offset=0x0,
+            size=Op.ADD(0x100, Op.MLOAD(offset=0x200)),
+            salt=0x5A17,
+        )
+        + Op.JUMP(pc=0x45)
+        + Op.JUMPDEST
+        + Op.CREATE(
+            value=0x0, offset=0x0, size=Op.ADD(0x100, Op.MLOAD(offset=0x200))
+        )
+        + Op.JUMPDEST
+        + Op.PUSH2[0x240]
+        + Op.MSTORE
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0xFF)
+        + Op.STOP
+        + Op.CODECOPY(dest_offset=0x100, offset=0x100, size=0x100)
+        + Op.MSTORE(offset=0x260, value=Op.PC)
+        + Op.POP(
+            Op.CALL(
+                gas=0xFFFFFF,
+                address=contract_0,
                 value=0x0,
-                offset=0x0,
-                size=Op.ADD(0x100, Op.MLOAD(offset=0x200)),
-                salt=0x5A17,
+                args_offset=0x260,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.JUMP(pc=0x45)
-            + Op.JUMPDEST
-            + Op.CREATE(
+        )
+        + Op.MSTORE(offset=0x260, value=Op.ADDRESS)
+        + Op.POP(
+            Op.CALL(
+                gas=0xFFFFFF,
+                address=contract_0,
                 value=0x0,
-                offset=0x0,
-                size=Op.ADD(0x100, Op.MLOAD(offset=0x200)),
-            )
-            + Op.JUMPDEST
-            + Op.PUSH2[0x240]
-            + Op.MSTORE
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(key=0x0, value=0xFF)
-            + Op.STOP
-            + Op.CODECOPY(dest_offset=0x100, offset=0x100, size=0x100)
-            + Op.MSTORE(offset=0x260, value=Op.PC)
-            + Op.POP(
-                Op.CALL(
-                    gas=0xFFFFFF,
-                    address=0xDA7A,
-                    value=0x0,
-                    args_offset=0x260,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x260, value=Op.ADDRESS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0xFFFFFF,
-                    address=0xDA7A,
-                    value=0x0,
-                    args_offset=0x260,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+                args_offset=0x260,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x260, value=Op.CODESIZE)
-            + Op.POP(
-                Op.CALL(
-                    gas=0xFFFFFF,
-                    address=0xDA7A,
-                    value=0x0,
-                    args_offset=0x260,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x260, value=Op.EXTCODESIZE(address=Op.ADDRESS))
-            + Op.POP(
-                Op.CALL(
-                    gas=0xFFFFFF,
-                    address=0xDA7A,
-                    value=0x0,
-                    args_offset=0x260,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x260, value=Op.CODESIZE)
+        + Op.POP(
+            Op.CALL(
+                gas=0xFFFFFF,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x260,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.CODECOPY(dest_offset=0x100, offset=0x0, size=0x20)
-            + Op.MSTORE(offset=0x260, value=Op.MLOAD(offset=0x100))
-            + Op.POP(
-                Op.CALL(
-                    gas=0xFFFFFF,
-                    address=0xDA7A,
-                    value=0x0,
-                    args_offset=0x260,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x260, value=Op.EXTCODESIZE(address=Op.ADDRESS))
+        + Op.POP(
+            Op.CALL(
+                gas=0xFFFFFF,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x260,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.EXTCODECOPY(
-                address=Op.ADDRESS,
-                dest_offset=0x100,
-                offset=0x0,
-                size=0x20,
+        )
+        + Op.CODECOPY(dest_offset=0x100, offset=0x0, size=0x20)
+        + Op.MSTORE(offset=0x260, value=Op.MLOAD(offset=0x100))
+        + Op.POP(
+            Op.CALL(
+                gas=0xFFFFFF,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x260,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x260, value=Op.MLOAD(offset=0x100))
-            + Op.POP(
-                Op.CALL(
-                    gas=0xFFFFFF,
-                    address=0xDA7A,
-                    value=0x0,
-                    args_offset=0x260,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.EXTCODECOPY(
+            address=Op.ADDRESS, dest_offset=0x100, offset=0x0, size=0x20
+        )
+        + Op.MSTORE(offset=0x260, value=Op.MLOAD(offset=0x100))
+        + Op.POP(
+            Op.CALL(
+                gas=0xFFFFFF,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x260,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x260, value=Op.PC)
-            + Op.POP(
-                Op.CALL(
-                    gas=0xFFFFFF,
-                    address=0xDA7A,
-                    value=0x0,
-                    args_offset=0x260,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x260, value=Op.PC)
+        + Op.POP(
+            Op.CALL(
+                gas=0xFFFFFF,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x260,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.RETURN(offset=0x100, size=Op.SUB(Op.CODESIZE, 0x100))
-            + Op.STOP
-        ),
+        )
+        + Op.RETURN(offset=0x100, size=Op.SUB(Op.CODESIZE, 0x100))
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": 0, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={
+                        0: 8,
+                        1: 10,
+                        2: compute_create_address(address=contract_1, nonce=0),
+                        3: 262,
+                        4: 0,
+                        5: 0x610100610100610100395861026052600060006020610260600061DA7A62FFFF,  # noqa: E501
+                        6: 0,
+                        7: 184,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 0, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={
+                        0: 8,
+                        1: 10,
+                        2: 0x33C409678A4289F0184C95C627BA09DA2DAEAA46,
+                        3: 262,
+                        4: 0,
+                        5: 0x610100610100610100395861026052600060006020610260600061DA7A62FFFF,  # noqa: E501
+                        6: 0,
+                        7: 184,
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("83c7d758") + Hash(0x1),
+        Bytes("83c7d758") + Hash(0x2),
+    ]
+    tx_gas = [9437184]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=9437184,
+        to=contract_1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create2_call_data.py b/tests/ported_static/stCreateTest/test_create2_call_data.py
index 97081cb5887..3bc1b02f2ad 100644
--- a/tests/ported_static/stCreateTest/test_create2_call_data.py
+++ b/tests/ported_static/stCreateTest/test_create2_call_data.py
@@ -1,8 +1,9 @@
 """
 Test if calldata is empty in initcode context.
 
+
 Ported from:
-tests/static/state_tests/stCreateTest/CREATE2_CallDataFiller.yml
+state_tests/stCreateTest/CREATE2_CallDataFiller.yml
 """
 
 import pytest
@@ -11,6 +12,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +24,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreateTest/CREATE2_CallDataFiller.yml"],
+    ["state_tests/stCreateTest/CREATE2_CallDataFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,13 +33,13 @@ def test_create2_call_data(
     pre: Alloc,
 ) -> None:
     """Test if calldata is empty in initcode context."""
-    coinbase = Address("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    contract_0 = Address(0x000000000000000000000000000000000C5EA705)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
 
     env = Environment(
-        fee_recipient=coinbase,
+        fee_recipient=sender,
         number=1,
         timestamp=1000,
         prev_randao=0x20000,
@@ -45,8 +47,9 @@ def test_create2_call_data(
         gas_limit=1000000,
     )
 
-    # Source: Yul
-    # {
+    pre[sender] = Account(balance=0x5AF3107A4000)
+    # Source: yul
+    # berlin object "C" {
     #   code {
     #     let s := datasize("initcode")
     #     let o := dataoffset("initcode")
@@ -64,35 +67,38 @@ def test_create2_call_data(
     #     }
     #   }
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x10]
-            + Op.CODECOPY(dest_offset=Op.DUP4, offset=0x11, size=Op.DUP1)
-            + Op.DUP2
-            + Op.DUP1
-            + Op.SSTORE(key=0x0, value=Op.CREATE2)
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(key=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.CALLDATACOPY(dest_offset=Op.DUP1, offset=0x0, size=0x40)
-            + Op.RETURN(offset=0x0, size=Op.MSIZE)
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=Op.DUP4, offset=0x11, size=Op.DUP1)
+        + Op.DUP2
+        + Op.DUP1
+        + Op.SSTORE(key=0x0, value=Op.CREATE2)
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.CALLDATACOPY(dest_offset=Op.DUP1, offset=0x0, size=0x40)
+        + Op.RETURN(offset=0x0, size=Op.MSIZE),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000c5ea705"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000C5EA705),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5AF3107A4000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={0: 0x7F8330AD7BC2AFE0DFFB2FDC76BBAD8BC326296A},
         ),
+        Address(0x7F8330AD7BC2AFE0DFFB2FDC76BBAD8BC326296A): Account(
+            code=bytes.fromhex(
+                "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+            ),
+        ),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create2_refund_ef.py b/tests/ported_static/stCreateTest/test_create2_refund_ef.py
index 05f4dea1686..f2b5c529ecc 100644
--- a/tests/ported_static/stCreateTest/test_create2_refund_ef.py
+++ b/tests/ported_static/stCreateTest/test_create2_refund_ef.py
@@ -1,8 +1,9 @@
 """
 Test combination of gas refund and EF-prefixed CREATE2 failure.
 
+
 Ported from:
-tests/static/state_tests/stCreateTest/CREATE2_RefundEFFiller.yml
+state_tests/stCreateTest/CREATE2_RefundEFFiller.yml
 """
 
 import pytest
@@ -11,6 +12,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +24,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreateTest/CREATE2_RefundEFFiller.yml"],
+    ["state_tests/stCreateTest/CREATE2_RefundEFFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,13 +33,14 @@ def test_create2_refund_ef(
     pre: Alloc,
 ) -> None:
     """Test combination of gas refund and EF-prefixed CREATE2 failure."""
-    coinbase = Address("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    contract_0 = Address(0x00000000000000000000000000000000005EF94D)
+    contract_1 = Address(0x000000000000000000000000000000000C5EA705)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
 
     env = Environment(
-        fee_recipient=coinbase,
+        fee_recipient=sender,
         number=1,
         timestamp=1000,
         prev_randao=0x20000,
@@ -45,18 +48,19 @@ def test_create2_refund_ef(
         gas_limit=1000000,
     )
 
-    # Source: Yul
-    # {
+    pre[sender] = Account(balance=0x5AF3107A4000)
+    # Source: yul
+    # london {
     #   sstore(0,0)
     # }
-    callee = pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=Op.DUP1, value=0x0) + Op.STOP,
-        storage={0x0: 0x1},
+        storage={0: 1},
         nonce=0,
-        address=Address("0x00000000000000000000000000000000005ef94d"),  # noqa: E501
+        address=Address(0x00000000000000000000000000000000005EF94D),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # london object "C" {
     #   code {
     #     let s := datasize("initcode")
     #     let o := dataoffset("initcode")
@@ -76,43 +80,44 @@ def test_create2_refund_ef(
     #     }
     #   }
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x19]
-            + Op.CODECOPY(dest_offset=Op.DUP4, offset=0x11, size=Op.DUP1)
-            + Op.DUP2
-            + Op.DUP1
-            + Op.SSTORE(key=0x0, value=Op.CREATE2)
-            + Op.STOP
-            + Op.INVALID
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x5EF94D,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH1[0x19]
+        + Op.CODECOPY(dest_offset=Op.DUP4, offset=0x11, size=Op.DUP1)
+        + Op.DUP2
+        + Op.DUP1
+        + Op.SSTORE(key=0x0, value=Op.CREATE2)
+        + Op.STOP
+        + Op.INVALID
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=contract_0,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.MSTORE8(offset=0x0, value=0xEF)
-            + Op.RETURN(offset=0x0, size=0x1)
-        ),
+        )
+        + Op.MSTORE8(offset=0x0, value=0xEF)
+        + Op.RETURN(offset=0x0, size=0x1),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000c5ea705"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000C5EA705),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5AF3107A4000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_1,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
     post = {
-        callee: Account(storage={0: 1}),
+        contract_0: Account(storage={0: 1}),
+        Address(
+            0xBE8F87148D0767989CCE2E6A6A5D91C7D0C840E0
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_address_warm_after_fail.py b/tests/ported_static/stCreateTest/test_create_address_warm_after_fail.py
index 9d9fed6b0cc..fc6321be024 100644
--- a/tests/ported_static/stCreateTest/test_create_address_warm_after_fail.py
+++ b/tests/ported_static/stCreateTest/test_create_address_warm_after_fail.py
@@ -8,7 +8,7 @@
 Written primarily by Paweł Bylica (@chfast). Somewhat modified by Ori (@qbzzt)
 
 Ported from:
-tests/static/state_tests/stCreateTest/CreateAddressWarmAfterFailFiller.yml
+state_tests/stCreateTest/CreateAddressWarmAfterFailFiller.yml
 """
 
 import pytest
@@ -17,9 +17,16 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -28,312 +35,463 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CreateAddressWarmAfterFailFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CreateAddressWarmAfterFailFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
+        pytest.param(
             0,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
-                    storage={
-                        2: 1,
-                        3: 1,
-                        4: 1,
-                        5: 1,
-                        12: 328,
-                        13: 316,
-                        14: 2828,
-                        15: 316,
-                    }
-                )
-            },
+            0,
+            0,
+            id="create-contructor-revert-v0",
         ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
-                    storage={
-                        2: 1,
-                        3: 1,
-                        4: 1,
-                        5: 1,
-                        12: 32028,
-                        13: 7016,
-                        14: 34528,
-                        15: 7016,
-                    }
-                )
-            },
+            id="create-contructor-revert-v1",
         ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
+        pytest.param(
+            1,
             0,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
-                    storage={
-                        2: 1,
-                        3: 1,
-                        4: 1,
-                        5: 1,
-                        12: 328,
-                        13: 316,
-                        14: 2828,
-                        15: 316,
-                    }
-                )
-            },
+            0,
+            id="create2-contructor-revert-v0",
         ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
+        pytest.param(
             1,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
-                    storage={
-                        2: 1,
-                        3: 1,
-                        4: 1,
-                        5: 1,
-                        12: 32028,
-                        13: 7016,
-                        14: 34528,
-                        15: 7016,
-                    }
-                )
-            },
+            0,
+            1,
+            id="create2-contructor-revert-v1",
         ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
+        pytest.param(
+            2,
             0,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
-                    storage={
-                        2: 1,
-                        3: 1,
-                        4: 1,
-                        5: 1,
-                        12: 328,
-                        13: 316,
-                        14: 2828,
-                        15: 316,
-                    }
-                )
-            },
+            0,
+            id="create-code-too-big-v0",
+            marks=pytest.mark.valid_before("EIP7954"),
         ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
+        pytest.param(
+            2,
+            0,
             1,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
-                    storage={
-                        2: 1,
-                        3: 1,
-                        4: 1,
-                        5: 1,
-                        12: 32028,
-                        13: 7016,
-                        14: 34528,
-                        15: 7016,
-                    }
-                )
-            },
+            id="create-code-too-big-v1",
+            marks=pytest.mark.valid_before("EIP7954"),
         ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
+        pytest.param(
+            3,
             0,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
-                    storage={
-                        0: 1,
-                        2: 1,
-                        3: 1,
-                        4: 1,
-                        5: 1,
-                        12: 2828,
-                        13: 316,
-                        14: 2828,
-                        15: 316,
-                    }
-                )
-            },
+            0,
+            id="create2-code-too-big-v0",
+            marks=pytest.mark.valid_before("EIP7954"),
         ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
+        pytest.param(
+            3,
+            0,
             1,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
-                    storage={
-                        0: 1,
-                        2: 1,
-                        3: 1,
-                        4: 1,
-                        5: 1,
-                        12: 34528,
-                        13: 7016,
-                        14: 34528,
-                        15: 7016,
-                    }
-                )
-            },
+            id="create2-code-too-big-v1",
+            marks=pytest.mark.valid_before("EIP7954"),
         ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
+        pytest.param(
+            4,
             0,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
-                    storage={
-                        2: 1,
-                        3: 1,
-                        4: 1,
-                        5: 1,
-                        12: 328,
-                        13: 316,
-                        14: 2828,
-                        15: 316,
-                    }
-                )
-            },
+            0,
+            id="create-invalid-opcode-v0",
         ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
+        pytest.param(
+            4,
+            0,
             1,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
-                    storage={
-                        2: 1,
-                        3: 1,
-                        4: 1,
-                        5: 1,
-                        12: 32028,
-                        13: 7016,
-                        14: 34528,
-                        15: 7016,
-                    }
-                )
-            },
+            id="create-invalid-opcode-v1",
         ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
+        pytest.param(
+            5,
             0,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
-                    storage={
-                        0: 0xD4E7AE083132925A4927C1F5816238BA17B82A65,
-                        2: 1,
-                        3: 1,
-                        4: 1,
-                        5: 1,
-                        12: 328,
-                        13: 316,
-                        14: 2828,
-                        15: 316,
-                    }
-                )
-            },
+            0,
+            id="create2-invalid-opcode-v0",
         ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
+        pytest.param(
+            5,
+            0,
             1,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
-                    storage={
-                        0: 0xD4E7AE083132925A4927C1F5816238BA17B82A65,
-                        2: 1,
-                        3: 1,
-                        4: 1,
-                        5: 1,
-                        12: 7028,
-                        13: 7016,
-                        14: 34528,
-                        15: 7016,
-                    }
-                )
-            },
+            id="create2-invalid-opcode-v1",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="create-oog-constructor-v0",
+        ),
+        pytest.param(
+            6,
+            0,
+            1,
+            id="create-oog-constructor-v1",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="create-oog-post-constr-v0",
+        ),
+        pytest.param(
+            7,
+            0,
+            1,
+            id="create-oog-post-constr-v1",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="create2-oog-constructor-v0",
+        ),
+        pytest.param(
+            8,
+            0,
+            1,
+            id="create2-oog-constructor-v1",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="create2-oog-post-constr-v0",
+        ),
+        pytest.param(
+            9,
+            0,
+            1,
+            id="create2-oog-post-constr-v1",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="create-high-nonce-v0",
+        ),
+        pytest.param(
+            10,
+            0,
+            1,
+            id="create-high-nonce-v1",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="create-0xef-v0",
+        ),
+        pytest.param(
+            11,
+            0,
+            1,
+            id="create-0xef-v1",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="create2-0xef-v0",
+        ),
+        pytest.param(
+            12,
+            0,
+            1,
+            id="create2-0xef-v1",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="create-ok-v0",
+        ),
+        pytest.param(
+            13,
+            0,
+            1,
+            id="create-ok-v1",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="create2-ok-v0",
         ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
+        pytest.param(
+            14,
             0,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+            1,
+            id="create2-ok-v1",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_create_address_warm_after_fail(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """
+    Invokes failing CREATE (because initcode fails) and checks
+    if the...
+    """
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x00000000000000000000000000000000000C0DEC)
+    contract_1 = Address(0x00000000000000000000000000000000C0DE1006)
+    contract_2 = Address(0x00000000000000000000000000000020C0DE1006)
+    contract_3 = Address(0x00000000000000000000000000000000C0DEFFFF)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=999,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=3000000000,
+    )
+
+    pre[sender] = Account(balance=0xE8D4A51001)
+    # Source: yul
+    # berlin
+    #   object "C" {
+    #     code {
+    #       datacopy(0, dataoffset("dummy"), datasize("dummy"))
+    #       sstore(0, create(0, 0, datasize("dummy")))
+    #       stop()
+    #     }
+    #     object "dummy" {
+    #       code {
+    #         return(0,0x6000)
+    #     }
+    #   }
+    #  }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.CODECOPY(dest_offset=0x0, offset=0x12, size=0x6)
+        + Op.SSTORE(
+            key=0x0, value=Op.CREATE(value=Op.DUP1, offset=0x0, size=0x6)
+        )
+        + Op.STOP
+        + Op.INVALID
+        + Op.RETURN(offset=0x0, size=0x6000),
+        balance=4096,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000C0DE1006),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    #   object "C" {
+    #     code {
+    #       datacopy(0, dataoffset("dummy"), datasize("dummy"))
+    #       sstore(0, create2(0, 0, datasize("dummy"), 0))
+    #       stop()
+    #     }
+    #     object "dummy" {
+    #       code {
+    #         return(0,0x6000)
+    #     }
+    #   }
+    #  }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.CODECOPY(dest_offset=0x0, offset=0x13, size=0x6)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE2(
+                value=Op.DUP1, offset=Op.DUP2, size=0x6, salt=0x0
+            ),
+        )
+        + Op.STOP
+        + Op.INVALID
+        + Op.RETURN(offset=0x0, size=0x6000),
+        balance=4096,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000020C0DE1006),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    #   object "C" {
+    #     code {
+    #       datacopy(0, dataoffset("dummy"), datasize("dummy"))
+    #       sstore(0, create(0, 0, datasize("dummy")))
+    #       stop()
+    #     }
+    #     object "dummy" {
+    #       code {
+    #         return(0,0x20)
+    #     }
+    #   }
+    #  }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.CODECOPY(dest_offset=0x0, offset=0x12, size=0x5)
+        + Op.SSTORE(
+            key=0x0, value=Op.CREATE(value=Op.DUP1, offset=0x0, size=0x5)
+        )
+        + Op.STOP
+        + Op.INVALID
+        + Op.RETURN(offset=0x0, size=0x20),
+        balance=4096,
+        nonce=18446744073709551615,
+        address=Address(0x00000000000000000000000000000000C0DEFFFF),  # noqa: E501
+    )
+    # Source: yul
+    # london
+    #   object "C" {
+    #     code {
+    #       let failType := calldataload(4)
+    #       let initcode_size
+    #
+    #       // The return values of various actions. Done twice to see if there is a difference  # noqa: E501
+    #       let create_1 := 0
+    #       let call_created_1 := 2
+    #       let call_created_2 := 3
+    #       let call_empty_1 := 4
+    #       let call_empty_2 := 5
+    #
+    #       // The costs of those operations
+    #       let create_1_cost := 10
+    #       let call_created_1_cost := 12
+    #       let call_created_2_cost := 13
+    #       let call_empty_1_cost := 14
+    #       let call_empty_2_cost := 15
+    #
+    #       // Make the storage cells we use here are warm
+    #       sstore(create_1, 0xdead60A7)
+    #       sstore(call_created_1, 0xdead60A7)
+    #       sstore(call_created_2, 0xdead60A7)
+    #       sstore(call_empty_1, 0xdead60A7)
+    #       sstore(call_empty_2, 0xdead60A7)
+    #       sstore(call_created_1_cost, 0xdead60A7)
+    #       sstore(call_created_2_cost, 0xdead60A7)
+    #       sstore(call_empty_1_cost, 0xdead60A7)
+    #       sstore(call_empty_2_cost, 0xdead60A7)
+    # ... (173 more lines)
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "6004356000906002600390600493600593600c90600d96600e90600f9863dead60a7865563dead60a7875563dead60a7885563dead60a7825563dead60a7895563dead60a7855563dead60a7815563dead60a7835563dead60a78a5573d4e7ae083132925a4927c1f5816238ba17b82a00938060001461044c5780600a1461040e57806001146103dc5780600b146103a357806002146103715780600c1461033257806003146102f757806004146102bb578060051461027f5780600d146102435780600e1461020657806006146101d4578060101461019b5780600714610169576011146100ed57600080fd5b60009788808080809b9a819b9a829b73f7fef4b66b1570a057d7d5cec5c58846befa5b5c92615a1760058061049488398680f590555b5a825583808080348782f190555a81540390555a8755349082f190555a81540390555a825583808080348782f190555a81540390555a8755349082f190555a8154039055005b5060009788808080809b9a819b9a829b6000805160206104998339815191529260058061049487398580f09055610123565b5060009788808080809b9a819b9a829b73562d97e3e4d6d3c6e791ea64bb73d820871aa2199284600a8061048a83398180f59055610123565b5060009788808080809b9a819b9a829b60008051602061049983398151915292600a8061048a87398580f09055610123565b5060009788808080809b9a819b9a829b73d70df326038a3c7ca8fac785a99162bfe75ccc469284808080806420c0de100662010000f19055610123565b5060009788808080809b9a819b9a829b73d70df326038a3c7ca8fac785a99162bfe75ccc469284808080806420c0de1006617000f19055610123565b5060009788808080809b9a819b9a829b73b2050fc27ab6d6d42dc0ce6f7c0bf9481a4c3fc392848080808063c0deffff62010000f19055610123565b5060009788808080809b9a819b9a829b73a5a6a95fd9554f15ab6986a57519092be209512592848080808063c0de100662010000f19055610123565b5060009788808080809b9a819b9a829b73a5a6a95fd9554f15ab6986a57519092be209512592848080808063c0de1006617000f19055610123565b5060009788808080809b9a819b9a829b73a13d43586820e5d97a3fd1960625d537c86dc4e79284600665fe60106000f360d01b82528180f59055610123565b5060009788808080809b9a819b9a829b6000805160206104998339815191529260018061048987398580f09055610123565b5060009788808080809b9a819b9a829b73014001fdbede82315f4b8c2a7d45e980a8a4a12e928460068061048383398180f59055610123565b5060009788808080809b9a819b9a829b6000805160206104998339815191529260068061048387398580f09055610123565b5060009788808080809b9a819b9a829b7343255ee039968e0254887fc8c7172736983d878c928460056460006000fd60d81b82528180f59055610123565b5060009788808080809b9a819b9a829b6000805160206104998339815191529260048061047f87398580f0905561012356fe600080fd6160016000f3fe60ef60005360106000f360016000f3000000000000000000000000d4e7ae083132925a4927c1f5816238ba17b82a65"  # noqa: E501
+        ),
+        balance=4096,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000C0DEC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 2, 11, 4], "gas": -1, "value": [0]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
+                        0: 0,
                         2: 1,
                         3: 1,
                         4: 1,
                         5: 1,
-                        12: 2828,
+                        12: 328,
                         13: 316,
                         14: 2828,
                         15: 316,
-                    }
-                )
+                    },
+                    nonce=1,
+                ),
+                compute_create_address(
+                    address=contract_0, nonce=0
+                ): Account.NONEXISTENT,
             },
-        ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            1,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+        },
+        {
+            "indexes": {"data": [0, 2, 11, 4], "gas": -1, "value": [1]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
+                        0: 0,
                         2: 1,
                         3: 1,
                         4: 1,
                         5: 1,
-                        12: 34528,
+                        12: 32028,
                         13: 7016,
                         14: 34528,
                         15: 7016,
-                    }
-                )
+                    },
+                    nonce=1,
+                ),
+                compute_create_address(address=contract_0, nonce=0): Account(
+                    code=b"", balance=2, nonce=0
+                ),
+                Address(0xD4E7AE083132925A4927C1F5816238BA17B82A00): Account(
+                    code=b"", balance=2, nonce=0
+                ),
             },
-        ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            0,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": [0]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
+                        0: 0,
                         2: 1,
                         3: 1,
                         4: 1,
                         5: 1,
-                        12: 2828,
+                        12: 328,
                         13: 316,
                         14: 2828,
                         15: 316,
-                    }
-                )
+                    },
+                    nonce=1,
+                ),
+                compute_create_address(
+                    address=contract_0, nonce=0
+                ): Account.NONEXISTENT,
             },
-        ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            1,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": [1]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
+                        0: 0,
                         2: 1,
                         3: 1,
                         4: 1,
                         5: 1,
-                        12: 34528,
+                        12: 32028,
                         13: 7016,
                         14: 34528,
                         15: 7016,
-                    }
-                )
+                    },
+                    nonce=1,
+                ),
+                Address(0x43255EE039968E0254887FC8C7172736983D878C): Account(
+                    code=b"", balance=2, nonce=0
+                ),
+                Address(0xD4E7AE083132925A4927C1F5816238BA17B82A00): Account(
+                    code=b"", balance=2, nonce=0
+                ),
             },
-        ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            0,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+        },
+        {
+            "indexes": {"data": [12], "gas": -1, "value": [0]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
+                        0: 0,
                         2: 1,
                         3: 1,
                         4: 1,
@@ -342,16 +500,22 @@
                         13: 316,
                         14: 2828,
                         15: 316,
-                    }
-                )
+                    },
+                    nonce=1,
+                ),
+                Address(
+                    0x562D97E3E4D6D3C6E791EA64BB73D820871AA219
+                ): Account.NONEXISTENT,
             },
-        ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            1,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+        },
+        {
+            "indexes": {"data": [12], "gas": -1, "value": [1]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
+                        0: 0,
                         2: 1,
                         3: 1,
                         4: 1,
@@ -360,16 +524,25 @@
                         13: 7016,
                         14: 34528,
                         15: 7016,
-                    }
-                )
+                    },
+                    nonce=1,
+                ),
+                Address(0x562D97E3E4D6D3C6E791EA64BB73D820871AA219): Account(
+                    code=b"", balance=2, nonce=0
+                ),
+                Address(0xD4E7AE083132925A4927C1F5816238BA17B82A00): Account(
+                    code=b"", balance=2, nonce=0
+                ),
             },
-        ),
-        (
-            "52c3fd24000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            0,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": [0]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
+                        0: 0,
                         2: 1,
                         3: 1,
                         4: 1,
@@ -378,16 +551,22 @@
                         13: 316,
                         14: 2828,
                         15: 316,
-                    }
-                )
+                    },
+                    nonce=1,
+                ),
+                Address(
+                    0x014001FDBEDE82315F4B8C2A7D45E980A8A4A12E
+                ): Account.NONEXISTENT,
             },
-        ),
-        (
-            "52c3fd24000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            1,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": [1]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
+                        0: 0,
                         2: 1,
                         3: 1,
                         4: 1,
@@ -396,16 +575,25 @@
                         13: 7016,
                         14: 34528,
                         15: 7016,
-                    }
-                )
+                    },
+                    nonce=1,
+                ),
+                Address(0x014001FDBEDE82315F4B8C2A7D45E980A8A4A12E): Account(
+                    code=b"", balance=2, nonce=0
+                ),
+                Address(0xD4E7AE083132925A4927C1F5816238BA17B82A00): Account(
+                    code=b"", balance=2, nonce=0
+                ),
             },
-        ),
-        (
-            "52c3fd24000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            0,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": [0]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
+                        0: 0,
                         2: 1,
                         3: 1,
                         4: 1,
@@ -414,16 +602,22 @@
                         13: 316,
                         14: 2828,
                         15: 316,
-                    }
-                )
+                    },
+                    nonce=1,
+                ),
+                Address(
+                    0xA13D43586820E5D97A3FD1960625D537C86DC4E7
+                ): Account.NONEXISTENT,
             },
-        ),
-        (
-            "52c3fd24000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            1,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": [1]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
+                        0: 0,
                         2: 1,
                         3: 1,
                         4: 1,
@@ -432,385 +626,252 @@
                         13: 7016,
                         14: 34528,
                         15: 7016,
-                    }
-                )
+                    },
+                    nonce=1,
+                ),
+                Address(0xA13D43586820E5D97A3FD1960625D537C86DC4E7): Account(
+                    code=b"", balance=2, nonce=0
+                ),
+                Address(0xD4E7AE083132925A4927C1F5816238BA17B82A00): Account(
+                    code=b"", balance=2, nonce=0
+                ),
             },
-        ),
-        (
-            "52c3fd24000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            0,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+        },
+        {
+            "indexes": {"data": [10], "gas": -1, "value": [0]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
+                        0: 1,
                         2: 1,
                         3: 1,
                         4: 1,
                         5: 1,
-                        12: 328,
+                        12: 2828,
                         13: 316,
                         14: 2828,
                         15: 316,
-                    }
-                )
+                    },
+                    nonce=0,
+                ),
+                Address(
+                    0xB2050FC27AB6D6D42DC0CE6F7C0BF9481A4C3FC3
+                ): Account.NONEXISTENT,
+                Address(
+                    0xD4E7AE083132925A4927C1F5816238BA17B82A00
+                ): Account.NONEXISTENT,
             },
-        ),
-        (
-            "52c3fd24000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            1,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+        },
+        {
+            "indexes": {"data": [10], "gas": -1, "value": [1]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
+                        0: 1,
                         2: 1,
                         3: 1,
                         4: 1,
                         5: 1,
-                        12: 32028,
+                        12: 34528,
                         13: 7016,
                         14: 34528,
                         15: 7016,
-                    }
-                )
+                    },
+                    nonce=0,
+                ),
+                Address(0xD4E7AE083132925A4927C1F5816238BA17B82A00): Account(
+                    code=b"", balance=2, nonce=0
+                ),
+                Address(0xB2050FC27AB6D6D42DC0CE6F7C0BF9481A4C3FC3): Account(
+                    code=b"", balance=2, nonce=0
+                ),
             },
-        ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000011",  # noqa: E501
-            0,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+        },
+        {
+            "indexes": {"data": [8, 9, 6, 7], "gas": -1, "value": [0]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
-                        0: 0xF7FEF4B66B1570A057D7D5CEC5C58846BEFA5B5C,
+                        0: 0,
                         2: 1,
                         3: 1,
                         4: 1,
                         5: 1,
-                        12: 328,
+                        12: 2828,
                         13: 316,
                         14: 2828,
                         15: 316,
-                    }
-                )
+                    },
+                    nonce=0,
+                ),
+                compute_create_address(
+                    address=contract_0, nonce=0
+                ): Account.NONEXISTENT,
             },
-        ),
-        (
-            "52c3fd240000000000000000000000000000000000000000000000000000000000000011",  # noqa: E501
-            1,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+        },
+        {
+            "indexes": {"data": [8, 9, 6, 7], "gas": -1, "value": [1]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
-                        0: 0xF7FEF4B66B1570A057D7D5CEC5C58846BEFA5B5C,
+                        0: 0,
                         2: 1,
                         3: 1,
                         4: 1,
                         5: 1,
-                        12: 7028,
+                        12: 34528,
                         13: 7016,
                         14: 34528,
                         15: 7016,
-                    }
-                )
+                    },
+                    nonce=0,
+                ),
+                Address(0xD4E7AE083132925A4927C1F5816238BA17B82A00): Account(
+                    code=b"", balance=2, nonce=0
+                ),
             },
-        ),
-        (
-            "52c3fd24000000000000000000000000000000000000000000000000000000000000000d",  # noqa: E501
-            0,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+        },
+        {
+            "indexes": {"data": [13], "gas": -1, "value": [0]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
+                        0: compute_create_address(address=contract_0, nonce=0),
                         2: 1,
                         3: 1,
                         4: 1,
                         5: 1,
-                        12: 2828,
+                        12: 328,
                         13: 316,
                         14: 2828,
                         15: 316,
-                    }
-                )
+                    },
+                    nonce=1,
+                ),
+                compute_create_address(address=contract_0, nonce=0): Account(
+                    code=bytes.fromhex("00")
+                ),
             },
-        ),
-        (
-            "52c3fd24000000000000000000000000000000000000000000000000000000000000000d",  # noqa: E501
-            1,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+        },
+        {
+            "indexes": {"data": [13], "gas": -1, "value": [1]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
+                        0: compute_create_address(address=contract_0, nonce=0),
                         2: 1,
                         3: 1,
                         4: 1,
                         5: 1,
-                        12: 34528,
+                        12: 7028,
                         13: 7016,
                         14: 34528,
                         15: 7016,
-                    }
-                )
+                    },
+                    nonce=1,
+                ),
+                compute_create_address(address=contract_0, nonce=0): Account(
+                    code=bytes.fromhex("00"), balance=2, nonce=1
+                ),
+                Address(0xD4E7AE083132925A4927C1F5816238BA17B82A00): Account(
+                    code=b"", balance=2, nonce=0
+                ),
             },
-        ),
-        (
-            "52c3fd24000000000000000000000000000000000000000000000000000000000000000e",  # noqa: E501
-            0,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+        },
+        {
+            "indexes": {"data": [14], "gas": -1, "value": [0]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
+                        0: 0xF7FEF4B66B1570A057D7D5CEC5C58846BEFA5B5C,
                         2: 1,
                         3: 1,
                         4: 1,
                         5: 1,
-                        12: 2828,
+                        12: 328,
                         13: 316,
                         14: 2828,
                         15: 316,
-                    }
-                )
+                    },
+                    nonce=1,
+                ),
+                Address(0xF7FEF4B66B1570A057D7D5CEC5C58846BEFA5B5C): Account(
+                    code=bytes.fromhex("00"), nonce=1
+                ),
             },
-        ),
-        (
-            "52c3fd24000000000000000000000000000000000000000000000000000000000000000e",  # noqa: E501
-            1,
-            {
-                Address("0x00000000000000000000000000000000000c0dec"): Account(
+        },
+        {
+            "indexes": {"data": [14], "gas": -1, "value": [1]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
                     storage={
+                        0: 0xF7FEF4B66B1570A057D7D5CEC5C58846BEFA5B5C,
                         2: 1,
                         3: 1,
                         4: 1,
                         5: 1,
-                        12: 34528,
+                        12: 7028,
                         13: 7016,
                         14: 34528,
                         15: 7016,
-                    }
-                )
+                    },
+                    nonce=1,
+                ),
+                Address(0xF7FEF4B66B1570A057D7D5CEC5C58846BEFA5B5C): Account(
+                    code=bytes.fromhex("00"), balance=2, nonce=1
+                ),
+                Address(0xD4E7AE083132925A4927C1F5816238BA17B82A00): Account(
+                    code=b"", balance=2, nonce=0
+                ),
             },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_create_address_warm_after_fail(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    tx_value: int,
-    expected_post: dict,
-) -> None:
-    """Invokes failing CREATE (because initcode fails) and checks."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+        },
+    ]
 
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=999,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=3000000000,
-    )
-
-    # Source: Yul
-    # {
-    #     code {
-    #       let failType := calldataload(4)
-    #       let initcode_size
-    #
-    #       // The return values of various actions. Done twice to see if there is a difference  # noqa: E501
-    #       let create_1 := 0
-    #       let call_created_1 := 2
-    #       let call_created_2 := 3
-    #       let call_empty_1 := 4
-    #       let call_empty_2 := 5
-    #
-    #       // The costs of those operations
-    #       let create_1_cost := 10
-    #       let call_created_1_cost := 12
-    #       let call_created_2_cost := 13
-    #       let call_empty_1_cost := 14
-    #       let call_empty_2_cost := 15
-    #
-    #       // Make the storage cells we use here are warm
-    #       sstore(create_1, 0xdead60A7)
-    #       sstore(call_created_1, 0xdead60A7)
-    #       sstore(call_created_2, 0xdead60A7)
-    #       sstore(call_empty_1, 0xdead60A7)
-    #       sstore(call_empty_2, 0xdead60A7)
-    #       sstore(call_created_1_cost, 0xdead60A7)
-    #       sstore(call_created_2_cost, 0xdead60A7)
-    #       sstore(call_empty_1_cost, 0xdead60A7)
-    #       sstore(call_empty_2_cost, 0xdead60A7)
-    #
-    # ... (172 more lines)
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "6004356000906002600390600493600593600c90600d96600e90600f9863dead60a78655"  # noqa: E501
-            "63dead60a7875563dead60a7885563dead60a7825563dead60a7895563dead60a7855563"  # noqa: E501
-            "dead60a7815563dead60a7835563dead60a78a5573d4e7ae083132925a4927c1f5816238"  # noqa: E501
-            "ba17b82a00938060001461044c5780600a1461040e57806001146103dc5780600b146103"  # noqa: E501
-            "a357806002146103715780600c1461033257806003146102f757806004146102bb578060"  # noqa: E501
-            "051461027f5780600d146102435780600e1461020657806006146101d457806010146101"  # noqa: E501
-            "9b5780600714610169576011146100ed57600080fd5b60009788808080809b9a819b9a82"  # noqa: E501
-            "9b73f7fef4b66b1570a057d7d5cec5c58846befa5b5c92615a1760058061049488398680"  # noqa: E501
-            "f590555b5a825583808080348782f190555a81540390555a8755349082f190555a815403"  # noqa: E501
-            "90555a825583808080348782f190555a81540390555a8755349082f190555a8154039055"  # noqa: E501
-            "005b5060009788808080809b9a819b9a829b600080516020610499833981519152926005"  # noqa: E501
-            "8061049487398580f09055610123565b5060009788808080809b9a819b9a829b73562d97"  # noqa: E501
-            "e3e4d6d3c6e791ea64bb73d820871aa2199284600a8061048a83398180f5905561012356"  # noqa: E501
-            "5b5060009788808080809b9a819b9a829b60008051602061049983398151915292600a80"  # noqa: E501
-            "61048a87398580f09055610123565b5060009788808080809b9a819b9a829b73d70df326"  # noqa: E501
-            "038a3c7ca8fac785a99162bfe75ccc469284808080806420c0de100662010000f1905561"  # noqa: E501
-            "0123565b5060009788808080809b9a819b9a829b73d70df326038a3c7ca8fac785a99162"  # noqa: E501
-            "bfe75ccc469284808080806420c0de1006617000f19055610123565b5060009788808080"  # noqa: E501
-            "809b9a819b9a829b73b2050fc27ab6d6d42dc0ce6f7c0bf9481a4c3fc392848080808063"  # noqa: E501
-            "c0deffff62010000f19055610123565b5060009788808080809b9a819b9a829b73a5a6a9"  # noqa: E501
-            "5fd9554f15ab6986a57519092be209512592848080808063c0de100662010000f1905561"  # noqa: E501
-            "0123565b5060009788808080809b9a819b9a829b73a5a6a95fd9554f15ab6986a5751909"  # noqa: E501
-            "2be209512592848080808063c0de1006617000f19055610123565b506000978880808080"  # noqa: E501
-            "9b9a819b9a829b73a13d43586820e5d97a3fd1960625d537c86dc4e79284600665fe6010"  # noqa: E501
-            "6000f360d01b82528180f59055610123565b5060009788808080809b9a819b9a829b6000"  # noqa: E501
-            "805160206104998339815191529260018061048987398580f09055610123565b50600097"  # noqa: E501
-            "88808080809b9a819b9a829b73014001fdbede82315f4b8c2a7d45e980a8a4a12e928460"  # noqa: E501
-            "068061048383398180f59055610123565b5060009788808080809b9a819b9a829b600080"  # noqa: E501
-            "5160206104998339815191529260068061048387398580f09055610123565b5060009788"  # noqa: E501
-            "808080809b9a819b9a829b7343255ee039968e0254887fc8c7172736983d878c92846005"  # noqa: E501
-            "6460006000fd60d81b82528180f59055610123565b5060009788808080809b9a819b9a82"  # noqa: E501
-            "9b6000805160206104998339815191529260048061047f87398580f0905561012356fe60"  # noqa: E501
-            "0080fd6160016000f3fe60ef60005360106000f360016000f30000000000000000000000"  # noqa: E501
-            "00d4e7ae083132925a4927c1f5816238ba17b82a65"
-        ),
-        balance=4096,
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000c0dec"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #     code {
-    #       datacopy(0, dataoffset("dummy"), datasize("dummy"))
-    #       sstore(0, create(0, 0, datasize("dummy")))
-    #       stop()
-    #     }
-    #     object "dummy" {
-    #       code {
-    #         return(0,0x6000)
-    #     }
-    #   }
-    #  }
-    pre.deploy_contract(
-        code=(
-            Op.CODECOPY(dest_offset=0x0, offset=0x12, size=0x6)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(value=Op.DUP1, offset=0x0, size=0x6),
-            )
-            + Op.STOP
-            + Op.INVALID
-            + Op.RETURN(offset=0x0, size=0x6000)
-        ),
-        balance=4096,
-        address=Address("0x00000000000000000000000000000000c0de1006"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #     code {
-    #       datacopy(0, dataoffset("dummy"), datasize("dummy"))
-    #       sstore(0, create(0, 0, datasize("dummy")))
-    #       stop()
-    #     }
-    #     object "dummy" {
-    #       code {
-    #         return(0,0x20)
-    #     }
-    #   }
-    #  }
-    pre.deploy_contract(
-        code=(
-            Op.CODECOPY(dest_offset=0x0, offset=0x12, size=0x5)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(value=Op.DUP1, offset=0x0, size=0x5),
-            )
-            + Op.STOP
-            + Op.INVALID
-            + Op.RETURN(offset=0x0, size=0x20)
-        ),
-        balance=4096,
-        nonce=18446744073709551615,
-        address=Address("0x00000000000000000000000000000000c0deffff"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #     code {
-    #       datacopy(0, dataoffset("dummy"), datasize("dummy"))
-    #       sstore(0, create2(0, 0, datasize("dummy"), 0))
-    #       stop()
-    #     }
-    #     object "dummy" {
-    #       code {
-    #         return(0,0x6000)
-    #     }
-    #   }
-    #  }
-    pre.deploy_contract(
-        code=(
-            Op.CODECOPY(dest_offset=0x0, offset=0x13, size=0x6)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE2(
-                    value=Op.DUP1,
-                    offset=Op.DUP2,
-                    size=0x6,
-                    salt=0x0,
-                ),
-            )
-            + Op.STOP
-            + Op.INVALID
-            + Op.RETURN(offset=0x0, size=0x6000)
-        ),
-        balance=4096,
-        address=Address("0x00000000000000000000000000000020c0de1006"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xE8D4A51001)
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Bytes("52c3fd24") + Hash(0x0),
+        Bytes("52c3fd24") + Hash(0xA),
+        Bytes("52c3fd24") + Hash(0x1),
+        Bytes("52c3fd24") + Hash(0xB),
+        Bytes("52c3fd24") + Hash(0x2),
+        Bytes("52c3fd24") + Hash(0xC),
+        Bytes("52c3fd24") + Hash(0x3),
+        Bytes("52c3fd24") + Hash(0x4),
+        Bytes("52c3fd24") + Hash(0xD),
+        Bytes("52c3fd24") + Hash(0xE),
+        Bytes("52c3fd24") + Hash(0x5),
+        Bytes("52c3fd24") + Hash(0x6),
+        Bytes("52c3fd24") + Hash(0x10),
+        Bytes("52c3fd24") + Hash(0x7),
+        Bytes("52c3fd24") + Hash(0x11),
+    ]
+    tx_gas = [16777216]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=tx_value,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_collision_results.py b/tests/ported_static/stCreateTest/test_create_collision_results.py
index 0e4ee0f47c4..19688d523ef 100644
--- a/tests/ported_static/stCreateTest/test_create_collision_results.py
+++ b/tests/ported_static/stCreateTest/test_create_collision_results.py
@@ -2,7 +2,7 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stCreateTest/CreateCollisionResultsFiller.yml
+state_tests/stCreateTest/CreateCollisionResultsFiller.yml
 """
 
 import pytest
@@ -11,10 +11,12 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,68 +24,40 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreateTest/CreateCollisionResultsFiller.yml"],
+    ["state_tests/stCreateTest/CreateCollisionResultsFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "01",
-            {
-                Address("0x40f1299359ea754ac29eb2662a1900752bf8275f"): Account(
-                    storage={0: 29}
-                ),
-                Address("0x8af6a7af30d840ba137e8f3f34d54cfb8beba6e2"): Account(
-                    storage={0: 29}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        32: 89,
-                        33: 143,
-                        34: 200,
-                        48: 6,
-                        49: 0x601D600055000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                        50: 6,
-                        51: 0x601D600055000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "02",
-            {
-                Address("0x40f1299359ea754ac29eb2662a1900752bf8275f"): Account(
-                    storage={0: 29}
-                ),
-                Address("0x8af6a7af30d840ba137e8f3f34d54cfb8beba6e2"): Account(
-                    storage={0: 29}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        32: 89,
-                        33: 143,
-                        34: 200,
-                        48: 6,
-                        49: 0x601D600055000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                        50: 6,
-                        51: 0x601D600055000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_collision_results(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x8AF6A7AF30D840BA137E8F3F34D54CFB8BEBA6E2)
+    contract_1 = Address(0x40F1299359EA754AC29EB2662A1900752BF8275F)
+    contract_2 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -97,30 +71,30 @@ def test_create_collision_results(
         gas_limit=4294967296,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
     # {
     #   [[0]] 0x001D
     # }
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=0x1D) + Op.STOP,
-        storage={0x0: 0x60A7},
+        storage={0: 24743},
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x40f1299359ea754ac29eb2662a1900752bf8275f"),  # noqa: E501
+        address=Address(0x8AF6A7AF30D840BA137E8F3F34D54CFB8BEBA6E2),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
     #   [[0]] 0x001D
     # }
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=0x1D) + Op.STOP,
-        storage={0x0: 0x60A7},
+        storage={0: 24743},
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x8af6a7af30d840ba137e8f3f34d54cfb8beba6e2"),  # noqa: E501
+        address=Address(0x40F1299359EA754AC29EB2662A1900752BF8275F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
+    # Source: lll
     # {
     #   ; Variables are 0x20 bytes (= 256 bits) apart, except for
     #   ; code buffers that get 0x100 (256 bytes)
@@ -152,141 +126,148 @@ def test_create_collision_results(
     #   [constructorLength]
     #     (lll
     # ... (43 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x100,
-                value=Op.DIV(Op.CALLDATALOAD(offset=0x0), Op.EXP(0x2, 0xF8)),
-            )
-            + Op.PUSH1[0x15]
-            + Op.CODECOPY(dest_offset=0x300, offset=0x158, size=Op.DUP1)
-            + Op.PUSH2[0x540]
-            + Op.MSTORE
-            + Op.PUSH1[0x6]
-            + Op.CODECOPY(dest_offset=0x200, offset=0x16D, size=Op.DUP1)
-            + Op.PUSH2[0x520]
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x49],
-                condition=Op.EQ(Op.MLOAD(offset=0x100), 0x1),
-            )
-            + Op.MSTORE(
-                offset=0x600,
-                value=Op.CREATE2(
-                    value=0x0,
-                    offset=0x300,
-                    size=Op.MLOAD(offset=0x540),
-                    salt=0x5A17,
-                ),
-            )
-            + Op.JUMP(pc=Op.PUSH2[0x58])
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x600,
-                value=Op.CREATE(
-                    value=0x0,
-                    offset=0x300,
-                    size=Op.MLOAD(offset=0x540),
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x20, value=Op.PC)
-            + Op.SSTORE(key=0x10, value=Op.RETURNDATASIZE)
-            + Op.SSTORE(key=0x11, value=Op.MLOAD(offset=0x600))
-            + Op.MSTORE(
-                offset=0x640,
-                value=Op.CALL(
-                    gas=0xFFFF,
-                    address=0x8AF6A7AF30D840BA137E8F3F34D54CFB8BEBA6E2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x21, value=Op.PC)
-            + Op.SSTORE(key=0x12, value=Op.SUB(Op.MLOAD(offset=0x640), 0x1))
-            + Op.SSTORE(key=0x13, value=Op.RETURNDATASIZE)
-            + Op.MSTORE(
-                offset=0x640,
-                value=Op.CALL(
-                    gas=0xFFFF,
-                    address=0x40F1299359EA754AC29EB2662A1900752BF8275F,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x22, value=Op.PC)
-            + Op.SSTORE(key=0x14, value=Op.SUB(Op.MLOAD(offset=0x640), 0x1))
-            + Op.SSTORE(key=0x15, value=Op.RETURNDATASIZE)
-            + Op.SSTORE(
-                key=0x30,
-                value=Op.EXTCODESIZE(
-                    address=0x8AF6A7AF30D840BA137E8F3F34D54CFB8BEBA6E2,
-                ),
-            )
-            + Op.EXTCODECOPY(
-                address=0x8AF6A7AF30D840BA137E8F3F34D54CFB8BEBA6E2,
-                dest_offset=0x660,
-                offset=0x0,
-                size=Op.SLOAD(key=0x30),
-            )
-            + Op.SSTORE(key=0x31, value=Op.MLOAD(offset=0x660))
-            + Op.SSTORE(
-                key=0x32,
-                value=Op.EXTCODESIZE(
-                    address=0x40F1299359EA754AC29EB2662A1900752BF8275F,
-                ),
-            )
-            + Op.EXTCODECOPY(
-                address=0x40F1299359EA754AC29EB2662A1900752BF8275F,
-                dest_offset=0x660,
-                offset=0x0,
-                size=Op.SLOAD(key=0x32),
-            )
-            + Op.SSTORE(key=0x33, value=Op.MLOAD(offset=0x660))
-            + Op.STOP
-            + Op.INVALID
-            + Op.PUSH1[0x6]
-            + Op.CODECOPY(dest_offset=0x200, offset=0xF, size=Op.DUP1)
-            + Op.PUSH2[0x200]
-            + Op.RETURN
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(key=0x0, value=0xFF)
-            + Op.STOP
-            + Op.SSTORE(key=0x0, value=0xFF)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x100,
+            value=Op.DIV(Op.CALLDATALOAD(offset=0x0), Op.EXP(0x2, 0xF8)),
+        )
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x300, offset=0x158, size=Op.DUP1)
+        + Op.PUSH2[0x540]
+        + Op.MSTORE
+        + Op.PUSH1[0x6]
+        + Op.CODECOPY(dest_offset=0x200, offset=0x16D, size=Op.DUP1)
+        + Op.PUSH2[0x520]
+        + Op.MSTORE
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x49], condition=Op.EQ(Op.MLOAD(offset=0x100), 0x1)
+        )
+        + Op.MSTORE(
+            offset=0x600,
+            value=Op.CREATE2(
+                value=0x0,
+                offset=0x300,
+                size=Op.MLOAD(offset=0x540),
+                salt=0x5A17,
+            ),
+        )
+        + Op.JUMP(pc=Op.PUSH2[0x58])
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x600,
+            value=Op.CREATE(
+                value=0x0, offset=0x300, size=Op.MLOAD(offset=0x540)
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x20, value=Op.PC)
+        + Op.SSTORE(key=0x10, value=Op.RETURNDATASIZE)
+        + Op.SSTORE(key=0x11, value=Op.MLOAD(offset=0x600))
+        + Op.MSTORE(
+            offset=0x640,
+            value=Op.CALL(
+                gas=0xFFFF,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x21, value=Op.PC)
+        + Op.SSTORE(key=0x12, value=Op.SUB(Op.MLOAD(offset=0x640), 0x1))
+        + Op.SSTORE(key=0x13, value=Op.RETURNDATASIZE)
+        + Op.MSTORE(
+            offset=0x640,
+            value=Op.CALL(
+                gas=0xFFFF,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x22, value=Op.PC)
+        + Op.SSTORE(key=0x14, value=Op.SUB(Op.MLOAD(offset=0x640), 0x1))
+        + Op.SSTORE(key=0x15, value=Op.RETURNDATASIZE)
+        + Op.SSTORE(key=0x30, value=Op.EXTCODESIZE(address=contract_0))
+        + Op.EXTCODECOPY(
+            address=contract_0,
+            dest_offset=0x660,
+            offset=0x0,
+            size=Op.SLOAD(key=0x30),
+        )
+        + Op.SSTORE(key=0x31, value=Op.MLOAD(offset=0x660))
+        + Op.SSTORE(key=0x32, value=Op.EXTCODESIZE(address=contract_1))
+        + Op.EXTCODECOPY(
+            address=contract_1,
+            dest_offset=0x660,
+            offset=0x0,
+            size=Op.SLOAD(key=0x32),
+        )
+        + Op.SSTORE(key=0x33, value=Op.MLOAD(offset=0x660))
+        + Op.STOP
+        + Op.INVALID
+        + Op.PUSH1[0x6]
+        + Op.CODECOPY(dest_offset=0x200, offset=0xF, size=Op.DUP1)
+        + Op.PUSH2[0x200]
+        + Op.RETURN
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0xFF)
+        + Op.STOP
+        + Op.SSTORE(key=0x0, value=0xFF)
+        + Op.STOP,
         storage={
-            0x10: 0x60A7,
-            0x11: 0x60A7,
-            0x12: 0x60A7,
-            0x13: 0x60A7,
-            0x14: 0x60A7,
-            0x15: 0x60A7,
-            0x20: 0x60A7,
-            0x21: 0x60A7,
-            0x22: 0x60A7,
+            16: 24743,
+            17: 24743,
+            18: 24743,
+            19: 24743,
+            20: 24743,
+            21: 24743,
+            32: 24743,
+            33: 24743,
+            34: 24743,
         },
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Bytes("01"),
+        Bytes("02"),
+    ]
+    tx_gas = [16777216]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
+        to=contract_2,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {
+        contract_2: Account(
+            storage={
+                32: 89,
+                33: 143,
+                34: 200,
+                48: 6,
+                49: 0x601D600055000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                50: 6,
+                51: 0x601D600055000000000000000000000000000000000000000000000000000000,  # noqa: E501
+            },
+        ),
+        contract_0: Account(
+            storage={0: 29}, code=bytes.fromhex("601d60005500")
+        ),
+        contract_1: Account(
+            storage={0: 29}, code=bytes.fromhex("601d60005500")
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_collision_to_empty2.py b/tests/ported_static/stCreateTest/test_create_collision_to_empty2.py
index 094c99cb2ea..a8cb5f0f42e 100644
--- a/tests/ported_static/stCreateTest/test_create_collision_to_empty2.py
+++ b/tests/ported_static/stCreateTest/test_create_collision_to_empty2.py
@@ -1,8 +1,8 @@
 """
-data0 - create collision to empty, data1 - to empty but nonce, data2 - to...
+Data0 - create collision to empty, data1 - to empty but nonce, data2 -...
 
 Ported from:
-tests/static/state_tests/stCreateTest/CreateCollisionToEmpty2Filler.json
+state_tests/stCreateTest/CreateCollisionToEmpty2Filler.json
 """
 
 import pytest
@@ -12,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,132 +27,107 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CreateCollisionToEmpty2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CreateCollisionToEmpty2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000001000000000000000000000000000000000000000",
-            600000,
+        pytest.param(
             0,
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={1: 0x13136008B64FF592819B2FA6D43F2835C452020E}
-                ),
-                Address("0x13136008b64ff592819b2fa6d43f2835c452020e"): Account(
-                    storage={1: 1}
-                ),
-            },
+            0,
+            0,
+            id="d0-g0-v0",
         ),
-        (
-            "0000000000000000000000001000000000000000000000000000000000000000",
-            600000,
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={1: 0x13136008B64FF592819B2FA6D43F2835C452020E}
-                ),
-                Address("0x13136008b64ff592819b2fa6d43f2835c452020e"): Account(
-                    storage={1: 1}
-                ),
-            },
+            id="d0-g0-v1",
         ),
-        (
-            "0000000000000000000000001000000000000000000000000000000000000000",
-            54000,
+        pytest.param(
             0,
-            {},
+            1,
+            0,
+            id="d0-g1-v0",
         ),
-        (
-            "0000000000000000000000001000000000000000000000000000000000000000",
-            54000,
+        pytest.param(
+            0,
             1,
-            {},
+            1,
+            id="d0-g1-v1",
         ),
-        (
-            "0000000000000000000000002000000000000000000000000000000000000000",
-            600000,
+        pytest.param(
+            1,
+            0,
             0,
-            {},
+            id="d1-g0-v0",
         ),
-        (
-            "0000000000000000000000002000000000000000000000000000000000000000",
-            600000,
+        pytest.param(
             1,
-            {},
+            0,
+            1,
+            id="d1-g0-v1",
         ),
-        (
-            "0000000000000000000000002000000000000000000000000000000000000000",
-            54000,
+        pytest.param(
+            1,
+            1,
             0,
-            {},
+            id="d1-g1-v0",
         ),
-        (
-            "0000000000000000000000002000000000000000000000000000000000000000",
-            54000,
+        pytest.param(
+            1,
+            1,
             1,
-            {},
+            id="d1-g1-v1",
         ),
-        (
-            "0000000000000000000000003000000000000000000000000000000000000000",
-            600000,
+        pytest.param(
+            2,
             0,
-            {},
+            0,
+            id="d2-g0-v0",
         ),
-        (
-            "0000000000000000000000003000000000000000000000000000000000000000",
-            600000,
+        pytest.param(
+            2,
+            0,
             1,
-            {},
+            id="d2-g0-v1",
         ),
-        (
-            "0000000000000000000000003000000000000000000000000000000000000000",
-            54000,
+        pytest.param(
+            2,
+            1,
             0,
-            {},
+            id="d2-g1-v0",
         ),
-        (
-            "0000000000000000000000003000000000000000000000000000000000000000",
-            54000,
+        pytest.param(
+            2,
+            1,
             1,
-            {},
+            id="d2-g1-v1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_collision_to_empty2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Data0 - create collision to empty, data1 - to empty but nonce,..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1A00000000000000000000000000000000000000)
+    contract_1 = Address(0x1000000000000000000000000000000000000000)
+    contract_2 = Address(0x2000000000000000000000000000000000000000)
+    contract_3 = Address(0x3000000000000000000000000000000000000000)
+    contract_4 = Address(0x13136008B64FF592819B2FA6D43F2835C452020E)
+    contract_5 = Address(0x0BF4C804E0579073BAF54EC4EC37CD04F3455C65)
+    contract_6 = Address(0x4B86C4ED99B87F0F396BC0C76885453C343916ED)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
-    callee = Address("0x0bf4c804e0579073baf54ec4ec37cd04f3455c65")
-    callee_2 = Address("0x13136008b64ff592819b2fa6d43f2835c452020e")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -158,83 +138,131 @@ def test_create_collision_to_empty2(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=0, nonce=2)
-    # Source: LLL
-    # { (MSTORE 0 0x6001600155) [[1]] (CREATE 0 27 5) }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6001600155)
-            + Op.SSTORE(
-                key=0x1, value=Op.CREATE(value=0x0, offset=0x1B, size=0x5)
-            )
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[contract_4] = Account(balance=10)
+    pre[contract_5] = Account(balance=0, nonce=2)
+    # Source: lll
+    # { (CALL 80000 (CALLDATALOAD 0) 0 0 0 0 0) }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x13880,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1A00000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[callee_2] = Account(balance=10, nonce=0)
-    # Source: LLL
-    # { (CALL 80000 (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x13880,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0x6001600155) [[1]] (CREATE 0 27 5) }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6001600155)
+        + Op.SSTORE(key=0x1, value=Op.CREATE(value=0x0, offset=0x1B, size=0x5))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1a00000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x6001600155) [[1]] (CREATE 0 27 5) }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6001600155)
-            + Op.SSTORE(
-                key=0x1, value=Op.CREATE(value=0x0, offset=0x1B, size=0x5)
-            )
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6001600155)
+        + Op.SSTORE(key=0x1, value=Op.CREATE(value=0x0, offset=0x1B, size=0x5))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x2000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x6001600155) [[1]] (CREATE 0 27 5) }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6001600155)
-            + Op.SSTORE(
-                key=0x1, value=Op.CREATE(value=0x0, offset=0x1B, size=0x5)
-            )
-            + Op.STOP
-        ),
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6001600155)
+        + Op.SSTORE(key=0x1, value=Op.CREATE(value=0x0, offset=0x1B, size=0x5))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x3000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x1122334455
+    contract_6 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex("1122334455"),
         nonce=0,
-        address=Address("0x4b86c4ed99b87f0f396bc0c76885453c343916ed"),  # noqa: E501
+        address=Address(0x4B86C4ED99B87F0F396BC0C76885453C343916ED),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_1: Account(storage={}, nonce=0),
+                contract_4: Account(storage={}, code=b"", balance=10, nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_1: Account(storage={1: contract_4}, nonce=1),
+                contract_4: Account(
+                    storage={1: 1}, code=b"", balance=10, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_2: Account(storage={1: 0}, nonce=0),
+                contract_5: Account(storage={}, code=b"", nonce=2),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_2: Account(storage={1: 0}, nonce=0),
+                contract_5: Account(storage={}, code=b"", nonce=2),
+            },
+        },
+        {
+            "indexes": {"data": 2, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_3: Account(storage={1: 0}, nonce=0),
+                contract_6: Account(
+                    storage={},
+                    code=bytes.fromhex("1122334455"),
+                    nonce=0,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(contract_1, left_padding=True),
+        Hash(contract_2, left_padding=True),
+        Hash(contract_3, left_padding=True),
+    ]
+    tx_gas = [600000, 54000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_contract_return_big_offset.py b/tests/ported_static/stCreateTest/test_create_contract_return_big_offset.py
index 30bdcc03b4b..ceb298ae540 100644
--- a/tests/ported_static/stCreateTest/test_create_contract_return_big_offset.py
+++ b/tests/ported_static/stCreateTest/test_create_contract_return_big_offset.py
@@ -1,52 +1,71 @@
 """
-Test ported from static filler.
+Test_create_contract_return_big_offset.
 
 Ported from:
-tests/static/state_tests/stCreateTest/CREATE_ContractRETURNBigOffsetFiller.yml
+state_tests/stCreateTest/CREATE_ContractRETURNBigOffsetFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CREATE_ContractRETURNBigOffsetFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CREATE_ContractRETURNBigOffsetFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "6201000062074ac2f3",
-        "62051eb862074ac2f3",
-        "62051eb962074ac2f3",
-        "620d15bc62074ac2f3",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
-@pytest.mark.pre_alloc_mutable
 def test_create_contract_return_big_offset(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_contract_return_big_offset."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x9184E72A000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,17 +76,24 @@ def test_create_contract_return_big_offset(
         gas_limit=89128960,
     )
 
-    pre[sender] = Account(balance=0x9184E72A000)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.RETURN(offset=0x74AC2, size=0x10000),
+        Op.RETURN(offset=0x74AC2, size=0x51EB8),
+        Op.RETURN(offset=0x74AC2, size=0x51EB9),
+        Op.RETURN(offset=0x74AC2, size=0xD15BC),
+    ]
+    tx_gas = [16777216]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=16777216,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        compute_create_address(address=sender, nonce=0): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_contract_sstore_during_init.py b/tests/ported_static/stCreateTest/test_create_contract_sstore_during_init.py
index 6d044bced0c..a84b5c722a0 100644
--- a/tests/ported_static/stCreateTest/test_create_contract_sstore_during_init.py
+++ b/tests/ported_static/stCreateTest/test_create_contract_sstore_during_init.py
@@ -1,42 +1,37 @@
 """
-Test ported from static filler.
+Test_create_contract_sstore_during_init.
 
 Ported from:
-tests/static/state_tests/stCreateTest
-CREATE_ContractSSTOREDuringInitFiller.json
+state_tests/stCreateTest/CREATE_ContractSSTOREDuringInitFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CREATE_ContractSSTOREDuringInitFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CREATE_ContractSSTOREDuringInitFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_create_contract_sstore_during_init(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_contract_sstore_during_init."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x174876E800)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,18 +42,16 @@ def test_create_contract_sstore_during_init(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0x174876E800)
-
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex("60ff600055"),
+        data=Op.SSTORE(key=0x0, value=0xFF),
         gas_limit=150000,
     )
 
     post = {
-        Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-            storage={0: 255},
+        compute_create_address(address=sender, nonce=0): Account(
+            storage={0: 255}
         ),
     }
 
diff --git a/tests/ported_static/stCreateTest/test_create_e_contract_create_e_contract_in_init_tr.py b/tests/ported_static/stCreateTest/test_create_e_contract_create_e_contract_in_init_tr.py
index 1860f032f33..d3288602010 100644
--- a/tests/ported_static/stCreateTest/test_create_e_contract_create_e_contract_in_init_tr.py
+++ b/tests/ported_static/stCreateTest/test_create_e_contract_create_e_contract_in_init_tr.py
@@ -1,20 +1,19 @@
 """
-Test ported from static filler.
+Test_create_e_contract_create_e_contract_in_init_tr.
 
 Ported from:
-tests/static/state_tests/stCreateTest
-CREATE_EContractCreateEContractInInit_TrFiller.json
+state_tests/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json",  # noqa: E501
+        "state_tests/stCreateTest/CREATE_EContractCreateEContractInInit_TrFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,10 @@ def test_create_e_contract_create_e_contract_in_init_tr(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_e_contract_create_e_contract_in_init_tr."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,28 +46,35 @@ def test_create_e_contract_create_e_contract_in_init_tr(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # {[[1]]12}
-    contract = pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
         balance=0xE8D4A51000,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150"  # noqa: E501
-            "602060006000f0"
-        ),
+        data=Op.POP(
+            Op.CALL(
+                gas=0xEA60,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CREATE(value=0x0, offset=0x0, size=0x20),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={1: 12}),
+        contract_0: Account(storage={1: 12}),
+        compute_create_address(address=sender, nonce=0): Account(nonce=2),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_e_contract_create_ne_contract_in_init_oog_tr.py b/tests/ported_static/stCreateTest/test_create_e_contract_create_ne_contract_in_init_oog_tr.py
index 08d0179de2c..c5b2fbd670f 100644
--- a/tests/ported_static/stCreateTest/test_create_e_contract_create_ne_contract_in_init_oog_tr.py
+++ b/tests/ported_static/stCreateTest/test_create_e_contract_create_ne_contract_in_init_oog_tr.py
@@ -1,20 +1,23 @@
 """
-Test ported from static filler.
+Test_create_e_contract_create_ne_contract_in_init_oog_tr.
 
 Ported from:
-tests/static/state_tests/stCreateTest
-CREATE_EContractCreateNEContractInInitOOG_TrFiller.json
+state_tests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -24,37 +27,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json",  # noqa: E501
+        "state_tests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_TrFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            160000,
-            {
-                Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={1: 12}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
-        (60000, {}),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_e_contract_create_ne_contract_in_init_oog_tr(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_e_contract_create_ne_contract_in_init_oog_tr."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -65,26 +71,70 @@ def test_create_e_contract_create_ne_contract_in_init_oog_tr(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # {[[1]]12}
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
         balance=0xE8D4A51000,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 12}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=2
+                ),
+                compute_create_address(
+                    address=compute_create_address(address=sender, nonce=0),
+                    nonce=0,
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 0}),
+                compute_create_address(
+                    address=sender, nonce=0
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=compute_create_address(address=sender, nonce=0),
+                    nonce=0,
+                ): Account.NONEXISTENT,
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0xEA60,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=0x64600C6000556000526005601BF3)
+        + Op.CREATE(value=0x0, offset=0x12, size=0xE),
+    ]
+    tx_gas = [160000, 60000]
+
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150"  # noqa: E501
-            "6d64600c6000556000526005601bf3600052600e60126000f0"
-        ),
-        gas_limit=tx_gas_limit,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_e_contract_create_ne_contract_in_init_tr.py b/tests/ported_static/stCreateTest/test_create_e_contract_create_ne_contract_in_init_tr.py
index f94ca911941..67efdc53a18 100644
--- a/tests/ported_static/stCreateTest/test_create_e_contract_create_ne_contract_in_init_tr.py
+++ b/tests/ported_static/stCreateTest/test_create_e_contract_create_ne_contract_in_init_tr.py
@@ -1,20 +1,19 @@
 """
-Test ported from static filler.
+Test_create_e_contract_create_ne_contract_in_init_tr.
 
 Ported from:
-tests/static/state_tests/stCreateTest
-CREATE_EContractCreateNEContractInInit_TrFiller.json
+state_tests/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json",  # noqa: E501
+        "state_tests/stCreateTest/CREATE_EContractCreateNEContractInInit_TrFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,10 @@ def test_create_e_contract_create_ne_contract_in_init_tr(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_e_contract_create_ne_contract_in_init_tr."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,28 +46,39 @@ def test_create_e_contract_create_ne_contract_in_init_tr(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # {[[1]]12}
-    contract = pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
         balance=0xE8D4A51000,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150"  # noqa: E501
-            "6d64600c6000556000526005601bf3600052600e60126000f0"
-        ),
+        data=Op.POP(
+            Op.CALL(
+                gas=0xEA60,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=0x64600C6000556000526005601BF3)
+        + Op.CREATE(value=0x0, offset=0x12, size=0xE),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={1: 12}),
+        contract_0: Account(storage={1: 12}),
+        compute_create_address(address=sender, nonce=0): Account(nonce=2),
+        compute_create_address(
+            address=compute_create_address(address=sender, nonce=0), nonce=1
+        ): Account(code=bytes.fromhex("600c600055")),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_e_contract_then_call_to_non_existent_acc.py b/tests/ported_static/stCreateTest/test_create_e_contract_then_call_to_non_existent_acc.py
index 3b89a424c76..f752c8b1f6b 100644
--- a/tests/ported_static/stCreateTest/test_create_e_contract_then_call_to_non_existent_acc.py
+++ b/tests/ported_static/stCreateTest/test_create_e_contract_then_call_to_non_existent_acc.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_create_e_contract_then_call_to_non_existent_acc.
 
 Ported from:
-tests/static/state_tests/stCreateTest
-CREATE_EContract_ThenCALLToNonExistentAccFiller.json
+state_tests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAccFiller.json
 """
 
 import pytest
@@ -12,9 +11,11 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +25,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAccFiller.json",  # noqa: E501
+        "state_tests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAccFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +34,9 @@ def test_create_e_contract_then_call_to_non_existent_acc(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_create_e_contract_then_call_to_non_existent_acc."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -49,50 +51,51 @@ def test_create_e_contract_then_call_to_non_existent_acc(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[0]](GAS) [[1]] (CREATE 0 0 32) [[2]](GAS) [[3]] (CALL 60000 0xe1ecf98489fa9ed60a664fc4998db699cfa39d40 0 0 0 0 0) [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x20)
-            )
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=0xE1ECF98489FA9ED60A664FC4998DB699CFA39D40,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x20))
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=0xE1ECF98489FA9ED60A664FC4998DB699CFA39D40,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 0x8D5B6,
-                1: 0xF1ECF98489FA9ED60A664FC4998DB699CFA39D40,
+                1: compute_create_address(address=contract_0, nonce=0),
                 2: 0x7ABF8,
                 3: 1,
                 100: 0x6F50B,
             },
         ),
+        compute_create_address(address=contract_0, nonce=0): Account(nonce=1),
+        Address(
+            0xE1ECF98489FA9ED60A664FC4998DB699CFA39D40
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_empty000_createin_init_code_transaction.py b/tests/ported_static/stCreateTest/test_create_empty000_createin_init_code_transaction.py
index 727b3a634ba..6161631fc90 100644
--- a/tests/ported_static/stCreateTest/test_create_empty000_createin_init_code_transaction.py
+++ b/tests/ported_static/stCreateTest/test_create_empty000_createin_init_code_transaction.py
@@ -1,20 +1,19 @@
 """
-Test ported from static filler.
+Test_create_empty000_createin_init_code_transaction.
 
 Ported from:
-tests/static/state_tests/stCreateTest
-CREATE_empty000CreateinInitCode_TransactionFiller.json
+state_tests/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json",  # noqa: E501
+        "state_tests/stCreateTest/CREATE_empty000CreateinInitCode_TransactionFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,10 @@ def test_create_empty000_createin_init_code_transaction(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_empty000_createin_init_code_transaction."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,28 +46,38 @@ def test_create_empty000_createin_init_code_transaction(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # {[[1]]12}
-    contract = pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
         balance=0xE8D4A51000,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150"  # noqa: E501
-            "600060006000f0"
-        ),
+        data=Op.POP(
+            Op.CALL(
+                gas=0xEA60,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CREATE(value=0x0, offset=0x0, size=0x0),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={1: 12}),
+        contract_0: Account(storage={1: 12}),
+        compute_create_address(address=sender, nonce=0): Account(nonce=2),
+        compute_create_address(
+            address=compute_create_address(address=sender, nonce=0), nonce=0
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_empty_contract.py b/tests/ported_static/stCreateTest/test_create_empty_contract.py
index 5610d9f2a1a..9790df29d6c 100644
--- a/tests/ported_static/stCreateTest/test_create_empty_contract.py
+++ b/tests/ported_static/stCreateTest/test_create_empty_contract.py
@@ -1,19 +1,20 @@
 """
-Test ported from static filler.
+Test_create_empty_contract.
 
 Ported from:
-tests/static/state_tests/stCreateTest/CREATE_EmptyContractFiller.json
+state_tests/stCreateTest/CREATE_EmptyContractFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreateTest/CREATE_EmptyContractFiller.json"],
+    ["state_tests/stCreateTest/CREATE_EmptyContractFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +31,10 @@ def test_create_empty_contract(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_empty_contract."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,33 +45,29 @@ def test_create_empty_contract(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[0]](GAS) [[1]] (CREATE 0 0 32) [[100]] (GAS) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x20)
-            )
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x20))
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(
+        compute_create_address(address=contract_0, nonce=0): Account(nonce=1),
+        contract_0: Account(
             storage={
                 0: 0x8D5B6,
-                1: 0xF1ECF98489FA9ED60A664FC4998DB699CFA39D40,
+                1: compute_create_address(address=contract_0, nonce=0),
                 100: 0x7ABF8,
             },
         ),
diff --git a/tests/ported_static/stCreateTest/test_create_empty_contract_and_call_it_0wei.py b/tests/ported_static/stCreateTest/test_create_empty_contract_and_call_it_0wei.py
index 4ab4d9652cf..b8efc72b9a5 100644
--- a/tests/ported_static/stCreateTest/test_create_empty_contract_and_call_it_0wei.py
+++ b/tests/ported_static/stCreateTest/test_create_empty_contract_and_call_it_0wei.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_create_empty_contract_and_call_it_0wei.
 
 Ported from:
-tests/static/state_tests/stCreateTest
-CREATE_EmptyContractAndCallIt_0weiFiller.json
+state_tests/stCreateTest/CREATE_EmptyContractAndCallIt_0weiFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CREATE_EmptyContractAndCallIt_0weiFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CREATE_EmptyContractAndCallIt_0weiFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +31,10 @@ def test_create_empty_contract_and_call_it_0wei(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_empty_contract_and_call_it_0wei."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,51 +45,48 @@ def test_create_empty_contract_and_call_it_0wei(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[0]](GAS) [[1]] (CREATE 0 0 32) [[2]](GAS) [[3]] (CALL 60000 (SLOAD 1) 0 0 0 0 0) [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x20)
-            )
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=Op.SLOAD(key=0x1),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x20))
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=Op.SLOAD(key=0x1),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 0x8D5B6,
-                1: 0xF1ECF98489FA9ED60A664FC4998DB699CFA39D40,
+                1: compute_create_address(address=contract_0, nonce=0),
                 2: 0x7ABF8,
                 3: 1,
                 100: 0x6FE6B,
             },
         ),
+        compute_create_address(address=contract_0, nonce=0): Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_empty_contract_and_call_it_1wei.py b/tests/ported_static/stCreateTest/test_create_empty_contract_and_call_it_1wei.py
index fa503edcd7a..1b35d16c1b5 100644
--- a/tests/ported_static/stCreateTest/test_create_empty_contract_and_call_it_1wei.py
+++ b/tests/ported_static/stCreateTest/test_create_empty_contract_and_call_it_1wei.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_create_empty_contract_and_call_it_1wei.
 
 Ported from:
-tests/static/state_tests/stCreateTest
-CREATE_EmptyContractAndCallIt_1weiFiller.json
+state_tests/stCreateTest/CREATE_EmptyContractAndCallIt_1weiFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CREATE_EmptyContractAndCallIt_1weiFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CREATE_EmptyContractAndCallIt_1weiFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +31,10 @@ def test_create_empty_contract_and_call_it_1wei(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_empty_contract_and_call_it_1wei."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,52 +45,51 @@ def test_create_empty_contract_and_call_it_1wei(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[0]](GAS) [[1]] (CREATE 0 0 32) [[2]](GAS) [[3]](CALL 60000 (SLOAD 1) 1 0 0 0 0) [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x20)
-            )
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=Op.SLOAD(key=0x1),
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x20))
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=Op.SLOAD(key=0x1),
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 0x8D5B6,
-                1: 0xF1ECF98489FA9ED60A664FC4998DB699CFA39D40,
+                1: compute_create_address(address=contract_0, nonce=0),
                 2: 0x7ABF8,
                 3: 1,
                 100: 0x6E43F,
             },
         ),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            balance=1, nonce=1
+        ),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_empty_contract_with_balance.py b/tests/ported_static/stCreateTest/test_create_empty_contract_with_balance.py
index 956c2c5237f..60862e9022b 100644
--- a/tests/ported_static/stCreateTest/test_create_empty_contract_with_balance.py
+++ b/tests/ported_static/stCreateTest/test_create_empty_contract_with_balance.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_create_empty_contract_with_balance.
 
 Ported from:
-tests/static/state_tests/stCreateTest
-CREATE_EmptyContractWithBalanceFiller.json
+state_tests/stCreateTest/CREATE_EmptyContractWithBalanceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CREATE_EmptyContractWithBalanceFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CREATE_EmptyContractWithBalanceFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +31,10 @@ def test_create_empty_contract_with_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_empty_contract_with_balance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,37 +45,35 @@ def test_create_empty_contract_with_balance(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[0]](GAS) [[1]] (CREATE 1 0 32) [[100]] (GAS) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1, value=Op.CREATE(value=0x1, offset=0x0, size=0x20)
-            )
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x1, value=Op.CREATE(value=0x1, offset=0x0, size=0x20))
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 0x8D5B6,
-                1: 0xF1ECF98489FA9ED60A664FC4998DB699CFA39D40,
+                1: compute_create_address(address=contract_0, nonce=0),
                 100: 0x7ABF8,
             },
         ),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            balance=1
+        ),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_empty_contract_with_storage.py b/tests/ported_static/stCreateTest/test_create_empty_contract_with_storage.py
index 418fb98a582..9ca299282ef 100644
--- a/tests/ported_static/stCreateTest/test_create_empty_contract_with_storage.py
+++ b/tests/ported_static/stCreateTest/test_create_empty_contract_with_storage.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_create_empty_contract_with_storage.
 
 Ported from:
-tests/static/state_tests/stCreateTest
-CREATE_EmptyContractWithStorageFiller.json
+state_tests/stCreateTest/CREATE_EmptyContractWithStorageFiller.json
 """
 
 import pytest
@@ -12,9 +11,11 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -23,9 +24,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CREATE_EmptyContractWithStorageFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CREATE_EmptyContractWithStorageFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,8 +32,10 @@ def test_create_empty_contract_with_storage(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_create_empty_contract_with_storage."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -49,55 +50,50 @@ def test_create_empty_contract_with_storage(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[0]](GAS) (MSTORE 0 0x600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c1533167) (MSTORE 32 0x7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000) [[1]] (CREATE 0 0 64) [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x600C6000556000600060006000600073C94F5374FCE5EDBC8E2A8697C1533167,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x7E6EBF0B61EA60F1000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x40)
-            )
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x600C6000556000600060006000600073C94F5374FCE5EDBC8E2A8697C1533167,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x7E6EBF0B61EA60F1000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.SSTORE(key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x40))
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {[[1]]12}
-    callee = pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
         balance=0xE8D4A51000,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 0x8D5B6,
-                1: 0xF1ECF98489FA9ED60A664FC4998DB699CFA39D40,
+                1: compute_create_address(address=contract_0, nonce=0),
                 100: 0x6F4F0,
             },
         ),
-        callee: Account(storage={1: 12}),
-        Address("0xf1ecf98489fa9ed60a664fc4998db699cfa39d40"): Account(
-            storage={0: 12},
-        ),
+        compute_create_address(address=contract_0, nonce=0): Account(nonce=1),
+        contract_1: Account(storage={1: 12}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_empty_contract_with_storage_and_call_it_0wei.py b/tests/ported_static/stCreateTest/test_create_empty_contract_with_storage_and_call_it_0wei.py
index a952982dffc..d7940716427 100644
--- a/tests/ported_static/stCreateTest/test_create_empty_contract_with_storage_and_call_it_0wei.py
+++ b/tests/ported_static/stCreateTest/test_create_empty_contract_with_storage_and_call_it_0wei.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_create_empty_contract_with_storage_and_call_it_0wei.
 
 Ported from:
-tests/static/state_tests/stCreateTest
-CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json
+state_tests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json",  # noqa: E501
+        "state_tests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,11 @@ def test_create_empty_contract_with_storage_and_call_it_0wei(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_empty_contract_with_storage_and_call_it_0wei."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,71 +48,65 @@ def test_create_empty_contract_with_storage_and_call_it_0wei(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[0]](GAS) (MSTORE 0 0x600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c1533167) (MSTORE 32 0x7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000) [[1]] (CREATE 0 0 64) [[2]] (GAS) [[3]] (CALL 60000 (SLOAD 1) 0 0 0 0 0) [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x600C6000556000600060006000600073C94F5374FCE5EDBC8E2A8697C1533167,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x7E6EBF0B61EA60F1000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x40)
-            )
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=Op.SLOAD(key=0x1),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x600C6000556000600060006000600073C94F5374FCE5EDBC8E2A8697C1533167,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x7E6EBF0B61EA60F1000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.SSTORE(key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x40))
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=Op.SLOAD(key=0x1),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {[[1]]12}
-    callee = pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
         balance=0xE8D4A51000,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 0x8D5B6,
-                1: 0xF1ECF98489FA9ED60A664FC4998DB699CFA39D40,
+                1: compute_create_address(address=contract_0, nonce=0),
                 2: 0x6F4F0,
                 3: 1,
                 100: 0x64763,
             },
         ),
-        callee: Account(storage={1: 12}),
-        Address("0xf1ecf98489fa9ed60a664fc4998db699cfa39d40"): Account(
-            storage={0: 12},
-        ),
+        compute_create_address(address=contract_0, nonce=0): Account(nonce=1),
+        contract_1: Account(storage={1: 12}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_empty_contract_with_storage_and_call_it_1wei.py b/tests/ported_static/stCreateTest/test_create_empty_contract_with_storage_and_call_it_1wei.py
index d9cd8dc0996..cbd15afeba3 100644
--- a/tests/ported_static/stCreateTest/test_create_empty_contract_with_storage_and_call_it_1wei.py
+++ b/tests/ported_static/stCreateTest/test_create_empty_contract_with_storage_and_call_it_1wei.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_create_empty_contract_with_storage_and_call_it_1wei.
 
 Ported from:
-tests/static/state_tests/stCreateTest
-CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json
+state_tests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json",  # noqa: E501
+        "state_tests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,11 @@ def test_create_empty_contract_with_storage_and_call_it_1wei(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_empty_contract_with_storage_and_call_it_1wei."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,72 +48,68 @@ def test_create_empty_contract_with_storage_and_call_it_1wei(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[0]](GAS) (MSTORE 0 0x600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c1533167) (MSTORE 32 0x7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000) [[1]] (CREATE 0 0 64) [[2]] (GAS) [[3]] (CALL 60000 (SLOAD 1) 1 0 0 0 0) [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x600C6000556000600060006000600073C94F5374FCE5EDBC8E2A8697C1533167,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x7E6EBF0B61EA60F1000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x40)
-            )
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=Op.SLOAD(key=0x1),
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x600C6000556000600060006000600073C94F5374FCE5EDBC8E2A8697C1533167,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x7E6EBF0B61EA60F1000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.SSTORE(key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x40))
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=Op.SLOAD(key=0x1),
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {[[1]]12}
-    callee = pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
         balance=0xE8D4A51000,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 0x8D5B6,
-                1: 0xF1ECF98489FA9ED60A664FC4998DB699CFA39D40,
+                1: compute_create_address(address=contract_0, nonce=0),
                 2: 0x6F4F0,
                 3: 1,
                 100: 0x62D37,
             },
         ),
-        callee: Account(storage={1: 12}),
-        Address("0xf1ecf98489fa9ed60a664fc4998db699cfa39d40"): Account(
-            storage={0: 12},
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={0: 12}, balance=1
         ),
+        contract_1: Account(storage={1: 12}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_fail_result.py b/tests/ported_static/stCreateTest/test_create_fail_result.py
index 90e1062553e..c87f3c0ec2d 100644
--- a/tests/ported_static/stCreateTest/test_create_fail_result.py
+++ b/tests/ported_static/stCreateTest/test_create_fail_result.py
@@ -2,7 +2,7 @@
 Ori Pomerantz   qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stCreateTest/createFailResultFiller.yml
+state_tests/stCreateTest/createFailResultFiller.yml
 """
 
 import pytest
@@ -11,9 +11,16 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,165 +29,96 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreateTest/createFailResultFiller.yml"],
+    ["state_tests/stCreateTest/createFailResultFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ee0000000000000000000000000000000000000000000000000000000000000bad",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000c0deee"): Account(
-                    storage={16: 1, 17: 64, 18: 0xDEADBEEF, 19: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1, 16: 1, 17: 64, 18: 0xDEADBEEF, 19: 24743}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="CREATE--OOG",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000000bad",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000c0def0"): Account(
-                    storage={
-                        1: 32,
-                        2: 0xBAD0BAD0BAD,
-                        16: 1,
-                        17: 64,
-                        18: 0xDEADBEEF,
-                        19: 24743,
-                    }
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1, 16: 1, 17: 64, 18: 0xDEADBEEF, 19: 24743}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="CREATE2-OOG",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ee000000000000000000000000000000000000000000000000000000000000600d",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000c0deee"): Account(
-                    storage={16: 1, 17: 64, 18: 0xDEADBEEF, 19: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1, 16: 1, 17: 64, 18: 0xDEADBEEF, 19: 24743}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="CREATE--GOOD",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000600d",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000c0def0"): Account(
-                    storage={
-                        0: 0xB44F2C88D3D4283CD1E54E418C4FF7E6A6C73202,
-                        16: 1,
-                        17: 64,
-                        18: 0xDEADBEEF,
-                        19: 24743,
-                    }
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1, 16: 1, 17: 64, 18: 0xDEADBEEF, 19: 24743}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="CREATE2-GOOD",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={16: 1, 17: 64, 18: 0xDEADBEEF, 19: 24743}
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="CREATE--BAD",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ff0000000000000000000000000000000000000000000000000000000000000bad",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000c0deff"): Account(
-                    storage={16: 1, 17: 64, 18: 0xDEADBEEF, 19: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1, 16: 1, 17: 64, 18: 0xDEADBEEF, 19: 24743}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="CREATE2-BAD",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f50000000000000000000000000000000000000000000000000000000000000bad",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000c0def5"): Account(
-                    storage={
-                        1: 32,
-                        2: 0xBAD0BAD0BAD,
-                        16: 1,
-                        17: 64,
-                        18: 0xDEADBEEF,
-                        19: 24743,
-                    }
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1, 16: 1, 17: 64, 18: 0xDEADBEEF, 19: 24743}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="CREATE2-BOOM",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ff000000000000000000000000000000000000000000000000000000000000600d",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000c0deff"): Account(
-                    storage={16: 1, 17: 64, 18: 0xDEADBEEF, 19: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1, 16: 1, 17: 64, 18: 0xDEADBEEF, 19: 24743}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="CREATE2-BAD-BOOM",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000600d",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000c0def5"): Account(
-                    storage={
-                        0: 0x65EE26A034447B6AC64ABDCA1CCCB7B747E4A231,
-                        16: 1,
-                        17: 64,
-                        18: 0xDEADBEEF,
-                        19: 24743,
-                    }
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1, 16: 1, 17: 64, 18: 0xDEADBEEF, 19: 24743}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="CREATE--BOOM",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f50000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={16: 1, 17: 64, 18: 0xDEADBEEF, 19: 24743}
-                )
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="CREATE--BAD-BOOM",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_fail_result(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz   qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Ori Pomerantz   qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x000000000000000000000000000000000000DA7A)
+    contract_1 = Address(0x0000000000000000000000000000000000000BAD)
+    contract_2 = Address(0x000000000000000000000000000000000000600D)
+    contract_3 = Address(0x0000000000000000000000000000000000C0DEF0)
+    contract_4 = Address(0x0000000000000000000000000000000000C0DEF5)
+    contract_5 = Address(0x0000000000000000000000000000000000C0DEFF)
+    contract_6 = Address(0xBB0237AB04970E3CF3E813C02064662ADC89336B)
+    contract_7 = Address(0x13C950F8740FFAEA1869A88D70B029E8B0C9A8DA)
+    contract_8 = Address(0x0000000000000000000000000000000000C0DEEE)
+    contract_9 = Address(0xF9D1EA8EAB6963659EE85B3E0B4D8A57E7EDBA2B)
+    contract_10 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -194,33 +132,9 @@ def test_create_fail_result(
         gas_limit=100000000,
     )
 
-    # Source: Yul
-    # {
-    #    mstore(0, 0x0BAD0BAD0BAD)
-    #    revert(0, 0x20)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xBAD0BAD0BAD)
-            + Op.REVERT(offset=0x0, size=0x20)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000000bad"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #    mstore(0, 0x600D)
-    #    return(0, 0x20)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x600D)
-            + Op.RETURN(offset=0x0, size=0x20)
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x000000000000000000000000000000000000600d"),  # noqa: E501
-    )
-    # Source: Yul
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
+    # Source: yul
+    # berlin
     # {
     #     mstore(0x00, 0xDEADBEEF)
     #     mstore(0x20, 0x60A7)
@@ -228,16 +142,53 @@ def test_create_fail_result(
     #     // Return with two words of data
     #     return(0, 0x40)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xDEADBEEF)
-            + Op.MSTORE(offset=0x20, value=0x60A7)
-            + Op.RETURN(offset=0x0, size=0x40)
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xDEADBEEF)
+        + Op.MSTORE(offset=0x20, value=0x60A7)
+        + Op.RETURN(offset=0x0, size=0x40),
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x000000000000000000000000000000000000da7a"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000DA7A),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
+    # {
+    #    mstore(0, 0x0BAD0BAD0BAD)
+    #    revert(0, 0x20)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xBAD0BAD0BAD)
+        + Op.REVERT(offset=0x0, size=0x20),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000000BAD),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600100
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x1] + Op.STOP,
+        balance=24589,
+        nonce=1,
+        address=Address(0xBB0237AB04970E3CF3E813C02064662ADC89336B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600100
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x1] + Op.STOP,
+        balance=24589,
+        nonce=1,
+        address=Address(0x13C950F8740FFAEA1869A88D70B029E8B0C9A8DA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600100
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x1] + Op.STOP,
+        balance=24589,
+        nonce=1,
+        address=Address(0xF9D1EA8EAB6963659EE85B3E0B4D8A57E7EDBA2B),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
     # {
     #    // Before the main call, call DA7A to fill up the return buffer
     #    sstore(0x10, call(gas(), 0xDA7A, 0, 0, 0, 0x100, 0x40))
@@ -252,7 +203,7 @@ def test_create_fail_result(
     #    extcodecopy(srcAddr, 0, 0, codeSize)
     #
     #    // Create
-    #    sstore(0,create(0, 0, codeSize))
+    #    sstore(0,create2(0, 0, codeSize, 0x5A17))
     #
     #    // If we have a returned buffer, see what it is
     #    sstore(1,returndatasize())
@@ -260,48 +211,47 @@ def test_create_fail_result(
     #    sstore(2, mload(0x200))
     #    sstore(3, mload(0x220))
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x10,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDA7A,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=0x100,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x11, value=Op.RETURNDATASIZE)
-            + Op.SSTORE(key=0x12, value=Op.MLOAD(offset=0x100))
-            + Op.SSTORE(key=0x13, value=Op.MLOAD(offset=0x120))
-            + Op.PUSH1[0x0]
-            + Op.CALLDATALOAD(offset=Op.DUP1)
-            + Op.DUP2
-            + Op.EXTCODESIZE(address=Op.DUP2)
-            + Op.SWAP3
-            + Op.DUP4
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.SSTORE(key=0x0, value=Op.CREATE)
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.RETURNDATACOPY(
-                dest_offset=0x200,
-                offset=0x0,
-                size=Op.RETURNDATASIZE,
-            )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x200))
-            + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x220))
-            + Op.STOP
-        ),
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x10,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=contract_0,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=0x0,
+                ret_offset=0x100,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x11, value=Op.RETURNDATASIZE)
+        + Op.SSTORE(key=0x12, value=Op.MLOAD(offset=0x100))
+        + Op.SSTORE(key=0x13, value=Op.MLOAD(offset=0x120))
+        + Op.PUSH2[0x5A17]
+        + Op.PUSH1[0x0]
+        + Op.CALLDATALOAD(offset=Op.DUP1)
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.SSTORE(key=0x0, value=Op.CREATE2)
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.RETURNDATACOPY(
+            dest_offset=0x200, offset=0x0, size=Op.RETURNDATASIZE
+        )
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x200))
+        + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x220))
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0deee"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DEF5),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    // Before the main call, call DA7A to fill up the return buffer
     #    sstore(0x10, call(gas(), 0xDA7A, 0, 0, 0, 0x100, 0x40))
@@ -309,7 +259,6 @@ def test_create_fail_result(
     #    sstore(0x12, mload(0x100))
     #    sstore(0x13, mload(0x120))
     #
-    #
     #    // Read the constructor code from the appropriate contract
     #    let srcAddr := calldataload(0)   // either 600D or BAD
     #
@@ -325,48 +274,120 @@ def test_create_fail_result(
     #    sstore(2, mload(0x200))
     #    sstore(3, mload(0x220))
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x10,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDA7A,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=0x100,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x11, value=Op.RETURNDATASIZE)
-            + Op.SSTORE(key=0x12, value=Op.MLOAD(offset=0x100))
-            + Op.SSTORE(key=0x13, value=Op.MLOAD(offset=0x120))
-            + Op.PUSH1[0x0]
-            + Op.CALLDATALOAD(offset=Op.DUP1)
-            + Op.DUP2
-            + Op.EXTCODESIZE(address=Op.DUP2)
-            + Op.SWAP3
-            + Op.DUP4
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.SSTORE(key=0x0, value=Op.CREATE)
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.RETURNDATACOPY(
-                dest_offset=0x200,
-                offset=0x0,
-                size=Op.RETURNDATASIZE,
-            )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x200))
-            + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x220))
-            + Op.STOP
-        ),
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x10,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=contract_0,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=0x0,
+                ret_offset=0x100,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x11, value=Op.RETURNDATASIZE)
+        + Op.SSTORE(key=0x12, value=Op.MLOAD(offset=0x100))
+        + Op.SSTORE(key=0x13, value=Op.MLOAD(offset=0x120))
+        + Op.PUSH1[0x0]
+        + Op.CALLDATALOAD(offset=Op.DUP1)
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.SSTORE(key=0x0, value=Op.CREATE)
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.RETURNDATACOPY(
+            dest_offset=0x200, offset=0x0, size=Op.RETURNDATASIZE
+        )
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x200))
+        + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x220))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DEEE),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #   // The operation to run
+    #   // F0 - CREATE
+    #   // F5 - CREATE2
+    #   let oper := calldataload(0x04)
+    #
+    #   // The condition for it
+    #   // 0x0006 - OUT OF GAS
+    #   // 0x0BAD - REVERT with data
+    #   // 0x600D - Success
+    #   let cond := calldataload(0x24)
+    #   let addr := add(0xC0DE00, oper)
+    #
+    #
+    #
+    #   // Before the main call, call DA7A to fill up the return buffer
+    #   sstore(0x10, call(gas(), 0xDA7A, 0, 0, 0, 0x100, 0x40))
+    #   sstore(0x11, returndatasize())
+    #   sstore(0x12, mload(0x100))
+    #   sstore(0x13, mload(0x120))
+    #
+    #
+    #   let gasAmt := gas()
+    #
+    #   // Out Of Gas, CREATE[2] always costs more than 32k in gas
+    #   // but we need to also pay for the four SSTOREs that verify DA7A was
+    #   // called correctly
+    #   if eq(cond,0x0006) { gasAmt := add(30000,mul(22100,4)) }
+    #
+    # ... (14 more lines)
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x20]
+        + Op.PUSH2[0x200]
+        + Op.DUP2
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.ADD(Op.CALLDATALOAD(offset=0x4), 0xC0DE00)
+        + Op.CALLDATALOAD(offset=0x24)
+        + Op.SSTORE(
+            key=0x10,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=contract_0,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP5,
+                ret_offset=0x100,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x11, value=Op.RETURNDATASIZE)
+        + Op.SSTORE(key=0x12, value=Op.MLOAD(offset=0x100))
+        + Op.SSTORE(key=0x13, value=Op.MLOAD(offset=0x120))
+        + Op.GAS
+        + Op.SWAP1
+        + Op.JUMPI(pc=0x52, condition=Op.EQ(Op.DUP2, 0x6))
+        + Op.JUMPDEST
+        + Op.DUP4
+        + Op.MSTORE
+        + Op.SSTORE(key=0x0, value=Op.CALL)
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x200))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH3[0x1CE80]
+        + Op.SWAP2
+        + Op.POP
+        + Op.JUMP(pc=0x3F),
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0def0"),  # noqa: E501
+        nonce=1,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    // Before the main call, call DA7A to fill up the return buffer
     #    sstore(0x10, call(gas(), 0xDA7A, 0, 0, 0, 0x100, 0x40))
@@ -374,6 +395,7 @@ def test_create_fail_result(
     #    sstore(0x12, mload(0x100))
     #    sstore(0x13, mload(0x120))
     #
+    #
     #    // Read the constructor code from the appropriate contract
     #    let srcAddr := calldataload(0)   // either 600D or BAD
     #
@@ -381,7 +403,7 @@ def test_create_fail_result(
     #    extcodecopy(srcAddr, 0, 0, codeSize)
     #
     #    // Create
-    #    sstore(0,create2(0, 0, codeSize, 0x5A17))
+    #    sstore(0,create(0, 0, codeSize))
     #
     #    // If we have a returned buffer, see what it is
     #    sstore(1,returndatasize())
@@ -389,49 +411,46 @@ def test_create_fail_result(
     #    sstore(2, mload(0x200))
     #    sstore(3, mload(0x220))
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x10,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDA7A,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=0x100,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x11, value=Op.RETURNDATASIZE)
-            + Op.SSTORE(key=0x12, value=Op.MLOAD(offset=0x100))
-            + Op.SSTORE(key=0x13, value=Op.MLOAD(offset=0x120))
-            + Op.PUSH2[0x5A17]
-            + Op.PUSH1[0x0]
-            + Op.CALLDATALOAD(offset=Op.DUP1)
-            + Op.DUP2
-            + Op.EXTCODESIZE(address=Op.DUP2)
-            + Op.SWAP3
-            + Op.DUP4
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.SSTORE(key=0x0, value=Op.CREATE2)
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.RETURNDATACOPY(
-                dest_offset=0x200,
-                offset=0x0,
-                size=Op.RETURNDATASIZE,
-            )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x200))
-            + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x220))
-            + Op.STOP
-        ),
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x10,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=contract_0,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=0x0,
+                ret_offset=0x100,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x11, value=Op.RETURNDATASIZE)
+        + Op.SSTORE(key=0x12, value=Op.MLOAD(offset=0x100))
+        + Op.SSTORE(key=0x13, value=Op.MLOAD(offset=0x120))
+        + Op.PUSH1[0x0]
+        + Op.CALLDATALOAD(offset=Op.DUP1)
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.SSTORE(key=0x0, value=Op.CREATE)
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.RETURNDATACOPY(
+            dest_offset=0x200, offset=0x0, size=Op.RETURNDATASIZE
+        )
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x200))
+        + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x220))
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0def5"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DEF0),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    // Before the main call, call DA7A to fill up the return buffer
     #    sstore(0x10, call(gas(), 0xDA7A, 0, 0, 0, 0x100, 0x40))
@@ -454,153 +473,236 @@ def test_create_fail_result(
     #    sstore(2, mload(0x200))
     #    sstore(3, mload(0x220))
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x10,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDA7A,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=0x100,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x11, value=Op.RETURNDATASIZE)
-            + Op.SSTORE(key=0x12, value=Op.MLOAD(offset=0x100))
-            + Op.SSTORE(key=0x13, value=Op.MLOAD(offset=0x120))
-            + Op.PUSH4[0xBAD05A17]
-            + Op.PUSH1[0x0]
-            + Op.CALLDATALOAD(offset=Op.DUP1)
-            + Op.DUP2
-            + Op.EXTCODESIZE(address=Op.DUP2)
-            + Op.SWAP3
-            + Op.DUP4
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.SSTORE(key=0x0, value=Op.CREATE2)
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.RETURNDATACOPY(
-                dest_offset=0x200,
-                offset=0x0,
-                size=Op.RETURNDATASIZE,
-            )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x200))
-            + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x220))
-            + Op.STOP
-        ),
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x10,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=contract_0,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=0x0,
+                ret_offset=0x100,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x11, value=Op.RETURNDATASIZE)
+        + Op.SSTORE(key=0x12, value=Op.MLOAD(offset=0x100))
+        + Op.SSTORE(key=0x13, value=Op.MLOAD(offset=0x120))
+        + Op.PUSH4[0xBAD05A17]
+        + Op.PUSH1[0x0]
+        + Op.CALLDATALOAD(offset=Op.DUP1)
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.SSTORE(key=0x0, value=Op.CREATE2)
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.RETURNDATACOPY(
+            dest_offset=0x200, offset=0x0, size=Op.RETURNDATASIZE
+        )
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x200))
+        + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x220))
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000c0deff"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.PUSH1[0x1] + Op.STOP,
-        balance=0x600D,
-        address=Address("0x13c950f8740ffaea1869a88d70b029e8b0c9a8da"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.PUSH1[0x1] + Op.STOP,
-        balance=0x600D,
-        address=Address("0xbb0237ab04970e3cf3e813c02064662adc89336b"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000C0DEFF),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
-    #   // The operation to run
-    #   // F0 - CREATE
-    #   // F5 - CREATE2
-    #   let oper := calldataload(0x04)
-    #
-    #   // The condition for it
-    #   // 0x0006 - OUT OF GAS
-    #   // 0x0BAD - REVERT with data
-    #   // 0x600D - Success
-    #   let cond := calldataload(0x24)
-    #   let addr := add(0xC0DE00, oper)
-    #
-    #
-    #
-    #   // Before the main call, call DA7A to fill up the return buffer
-    #   sstore(0x10, call(gas(), 0xDA7A, 0, 0, 0, 0x100, 0x40))
-    #   sstore(0x11, returndatasize())
-    #   sstore(0x12, mload(0x100))
-    #   sstore(0x13, mload(0x120))
-    #
-    #
-    #   let gasAmt := gas()
-    #
-    #   // Out Of Gas, CREATE[2] always costs more than 32k in gas
-    #   // but we need to also pay for the four SSTOREs that verify DA7A was
-    #   // called correctly
-    #   if eq(cond,0x0006) { gasAmt := add(30000,mul(22100,4)) }
-    #
-    #   // Send the condition to the contract we call so it'll know whether
-    # ... (13 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x20]
-            + Op.PUSH2[0x200]
-            + Op.DUP2
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.ADD(Op.CALLDATALOAD(offset=0x4), 0xC0DE00)
-            + Op.CALLDATALOAD(offset=0x24)
-            + Op.SSTORE(
-                key=0x10,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDA7A,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP5,
-                    ret_offset=0x100,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x11, value=Op.RETURNDATASIZE)
-            + Op.SSTORE(key=0x12, value=Op.MLOAD(offset=0x100))
-            + Op.SSTORE(key=0x13, value=Op.MLOAD(offset=0x120))
-            + Op.GAS
-            + Op.SWAP1
-            + Op.JUMPI(pc=0x52, condition=Op.EQ(Op.DUP2, 0x6))
-            + Op.JUMPDEST
-            + Op.DUP4
-            + Op.MSTORE
-            + Op.SSTORE(key=0x0, value=Op.CALL)
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x200))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH3[0x1CE80]
-            + Op.SWAP2
-            + Op.POP
-            + Op.JUMP(pc=0x3F)
-        ),
+    #    mstore(0, 0x600D)
+    #    return(0, 0x20)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x600D)
+        + Op.RETURN(offset=0x0, size=0x20),
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.PUSH1[0x1] + Op.STOP,
-        balance=0x600D,
-        address=Address("0xf9d1ea8eab6963659ee85b3e0b4d8a57e7edba2b"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000600D),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_10: Account(
+                    storage={
+                        0: 0,
+                        1: 0,
+                        2: 0,
+                        16: 1,
+                        17: 64,
+                        18: 0xDEADBEEF,
+                        19: 24743,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_3: Account(
+                    storage={
+                        0: compute_create_address(address=contract_3, nonce=1),
+                        1: 0,
+                        2: 0,
+                        3: 0,
+                        16: 1,
+                        17: 64,
+                        18: 0xDEADBEEF,
+                        19: 24743,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_4: Account(
+                    storage={
+                        0: 0x65EE26A034447B6AC64ABDCA1CCCB7B747E4A231,
+                        1: 0,
+                        2: 0,
+                        3: 0,
+                        16: 1,
+                        17: 64,
+                        18: 0xDEADBEEF,
+                        19: 24743,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_3: Account(
+                    storage={
+                        0: 0,
+                        1: 32,
+                        2: 0xBAD0BAD0BAD,
+                        16: 1,
+                        17: 64,
+                        18: 0xDEADBEEF,
+                        19: 24743,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_4: Account(
+                    storage={
+                        0: 0,
+                        1: 32,
+                        2: 0xBAD0BAD0BAD,
+                        16: 1,
+                        17: 64,
+                        18: 0xDEADBEEF,
+                        19: 24743,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_5: Account(
+                    storage={
+                        0: 0,
+                        1: 0,
+                        16: 1,
+                        17: 64,
+                        18: 0xDEADBEEF,
+                        19: 24743,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_5: Account(
+                    storage={
+                        0: 0,
+                        1: 0,
+                        16: 1,
+                        17: 64,
+                        18: 0xDEADBEEF,
+                        19: 24743,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [8], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_8: Account(
+                    storage={
+                        0: 0,
+                        1: 0,
+                        16: 1,
+                        17: 64,
+                        18: 0xDEADBEEF,
+                        19: 24743,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [9], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_8: Account(
+                    storage={
+                        0: 0,
+                        1: 0,
+                        16: 1,
+                        17: 64,
+                        18: 0xDEADBEEF,
+                        19: 24743,
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0x6),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0x6),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(contract_2, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(contract_2, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(contract_1, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(contract_1, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xFF) + Hash(contract_2, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xFF) + Hash(contract_1, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xEE) + Hash(contract_2, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xEE) + Hash(contract_1, left_padding=True),
+    ]
+    tx_gas = [16777216]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
+        to=contract_10,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_high_nonce.py b/tests/ported_static/stCreateTest/test_create_high_nonce.py
index 50c0cbf0458..6aa4fad41ee 100644
--- a/tests/ported_static/stCreateTest/test_create_high_nonce.py
+++ b/tests/ported_static/stCreateTest/test_create_high_nonce.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_create_high_nonce.
 
 Ported from:
-tests/static/state_tests/stCreateTest/CREATE_HighNonceFiller.yml
+state_tests/stCreateTest/CREATE_HighNonceFiller.yml
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreateTest/CREATE_HighNonceFiller.yml"],
+    ["state_tests/stCreateTest/CREATE_HighNonceFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_create_high_nonce(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_create_high_nonce."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -46,7 +48,8 @@ def test_create_high_nonce(
     )
 
     pre[sender] = Account(balance=0x3B9ACA00)
-    # Source: Yul
+    # Source: yul
+    # byzantium
     # {
     #   // initcode: { return(0, 1) }
     #   mstore(0, 0x60016000f3000000000000000000000000000000000000000000000000000000)  # noqa: E501
@@ -55,31 +58,33 @@ def test_create_high_nonce(
     #
     #   let noOptimization := msize()
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x60016000F3000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(value=Op.DUP1, offset=0x0, size=0x5),
-            )
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x60016000F3000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.CREATE(value=Op.DUP1, offset=0x0, size=0x5)
+        )
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.STOP,
         nonce=18446744073709551615,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=16777216,
     )
 
     post = {
-        contract: Account(storage={1: 1}),
+        sender: Account(nonce=1),
+        contract_0: Account(storage={0: 0, 1: 1}, nonce=18446744073709551615),
+        Address(
+            0x04E9A8460199E670FFB592F93A2F74BDCB44B0BD
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_high_nonce_minus1.py b/tests/ported_static/stCreateTest/test_create_high_nonce_minus1.py
index 7a86b8d7999..688ddf9750e 100644
--- a/tests/ported_static/stCreateTest/test_create_high_nonce_minus1.py
+++ b/tests/ported_static/stCreateTest/test_create_high_nonce_minus1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_create_high_nonce_minus1.
 
 Ported from:
-tests/static/state_tests/stCreateTest/CREATE_HighNonceMinus1Filler.yml
+state_tests/stCreateTest/CREATE_HighNonceMinus1Filler.yml
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreateTest/CREATE_HighNonceMinus1Filler.yml"],
+    ["state_tests/stCreateTest/CREATE_HighNonceMinus1Filler.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_create_high_nonce_minus1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_create_high_nonce_minus1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -46,7 +48,8 @@ def test_create_high_nonce_minus1(
     )
 
     pre[sender] = Account(balance=0x3B9ACA00)
-    # Source: Yul
+    # Source: yul
+    # byzantium
     # {
     #   // initcode: { return(0, 1) }
     #   mstore(0, 0x60016000f3000000000000000000000000000000000000000000000000000000)  # noqa: E501
@@ -55,35 +58,38 @@ def test_create_high_nonce_minus1(
     #
     #   let noOptimization := msize()
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x60016000F3000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(value=Op.DUP1, offset=0x0, size=0x5),
-            )
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x60016000F3000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.CREATE(value=Op.DUP1, offset=0x0, size=0x5)
+        )
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.STOP,
         nonce=18446744073709551614,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=16777216,
     )
 
     post = {
-        contract: Account(
+        sender: Account(nonce=1),
+        contract_0: Account(
             storage={
                 0: 0xD061B08A84EBC70FE797F9BD62F4269EF8274A13,
                 1: 1,
             },
+            nonce=18446744073709551615,
+        ),
+        Address(0xD061B08A84EBC70FE797F9BD62F4269EF8274A13): Account(
+            code=bytes.fromhex("00")
         ),
     }
 
diff --git a/tests/ported_static/stCreateTest/test_create_large_result.py b/tests/ported_static/stCreateTest/test_create_large_result.py
index 4f74f23224f..936dde89a2a 100644
--- a/tests/ported_static/stCreateTest/test_create_large_result.py
+++ b/tests/ported_static/stCreateTest/test_create_large_result.py
@@ -2,7 +2,7 @@
 Ori Pomerantz   qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stCreateTest/createLargeResultFiller.yml
+state_tests/stCreateTest/createLargeResultFiller.yml
 """
 
 import pytest
@@ -11,9 +11,16 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,186 +29,124 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreateTest/createLargeResultFiller.yml"],
+    ["state_tests/stCreateTest/createLargeResultFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000000f3000000000000000000000000000000000000000000000000000000000000c000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={1: 0x4B1649D}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="CREATE-RETURN",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000000f30000000000000000000000000000000000000000000000000000000000006000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        0: 0x553E6C30AF61E7A3576F31311EA8A620F80D047E,
-                        1: 0x4BBCE4,
-                        2: 0xDCBCC213F0C91B71D38DEDD06C95CCB99467B9B05F275BED536DE1044F5F18FA,  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="CREATE2-RETURN",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000000f30000000000000000000000000000000000000000000000000000000000006001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={1: 0x4B16491}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="CREATE-REVERT",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000000f30000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        0: 0x553E6C30AF61E7A3576F31311EA8A620F80D047E,
-                        1: 0x1777F,
-                        2: 0xD956C0ABD597440481902014A37B733358EE7685461EB1B5916EEFD83381E6D9,  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="CREATE2-REVERT",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000000fd000000000000000000000000000000000000000000000000000000000000c000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={1: 54116}
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="CREATE-RETURN-MAX",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000000fd0000000000000000000000000000000000000000000000000000000000006000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={1: 48356}
-                )
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="CREATE2-RETURN-MAX",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000000fd0000000000000000000000000000000000000000000000000000000000006001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={1: 48362}
-                )
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="CREATE-REVERT-MAX",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000000fd0000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={1: 44927}
-                )
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="CREATE2-REVERT-MAX",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f500000000000000000000000000000000000000000000000000000000000000f3000000000000000000000000000000000000000000000000000000000000c000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={1: 0x4B1649E}
-                )
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="CREATE-RETURN-TOOBIG",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f500000000000000000000000000000000000000000000000000000000000000f30000000000000000000000000000000000000000000000000000000000006000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        0: 0xA5DC71D47D0D8DCF5990E81C74E981BAF24A8FA2,
-                        1: 0x4BBD2E,
-                        2: 0xDCBCC213F0C91B71D38DEDD06C95CCB99467B9B05F275BED536DE1044F5F18FA,  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="CREATE2-RETURN-TOOBIG",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f500000000000000000000000000000000000000000000000000000000000000f30000000000000000000000000000000000000000000000000000000000006001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={1: 0x4B16492}
-                )
-            },
+        pytest.param(
+            10,
+            0,
+            0,
+            id="CREATE-REVERT-TOOBIG",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f500000000000000000000000000000000000000000000000000000000000000f30000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        0: 0x595C5D0C272757CFF0B3DCA4ED60D60CD6E9F58,
-                        1: 0x177C9,
-                        2: 0xD956C0ABD597440481902014A37B733358EE7685461EB1B5916EEFD83381E6D9,  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            11,
+            0,
+            0,
+            id="CREATE2-REVERT-TOOBIG",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f500000000000000000000000000000000000000000000000000000000000000fd000000000000000000000000000000000000000000000000000000000000c000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={1: 54190}
-                )
-            },
+        pytest.param(
+            12,
+            0,
+            0,
+            id="CREATE-RETURN-HUGE",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f500000000000000000000000000000000000000000000000000000000000000fd0000000000000000000000000000000000000000000000000000000000006000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={1: 48430}
-                )
-            },
+        pytest.param(
+            13,
+            0,
+            0,
+            id="CREATE2-RETURN-HUGE",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f500000000000000000000000000000000000000000000000000000000000000fd0000000000000000000000000000000000000000000000000000000000006001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={1: 48436}
-                )
-            },
+        pytest.param(
+            14,
+            0,
+            0,
+            id="CREATE-REVERT-HUGE",
         ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f500000000000000000000000000000000000000000000000000000000000000fd0000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={1: 45001}
-                )
-            },
+        pytest.param(
+            15,
+            0,
+            0,
+            id="CREATE2-REVERT-HUGE",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_large_result(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz   qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Ori Pomerantz   qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x000000000000000000000000000000000000C0DE)
+    contract_1 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -215,7 +160,9 @@ def test_create_large_result(
         gas_limit=100000000,
     )
 
-    # Source: Yul
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
+    # Source: yul
+    # london
     # {
     #    // Store some data
     #    mstore(0, not(0))
@@ -226,16 +173,15 @@ def test_create_large_result(
     #    // Return it as the new contract
     #    return(0, mload(0x100))
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.NOT(0x0))
-            + Op.CODECOPY(dest_offset=Op.DUP1, offset=0x100, size=0x20)
-            + Op.RETURN(offset=0x0, size=Op.MLOAD(offset=0x100))
-        ),
-        address=Address("0x000000000000000000000000000000000000c0de"),  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.NOT(0x0))
+        + Op.CODECOPY(dest_offset=Op.DUP1, offset=0x100, size=0x20)
+        + Op.RETURN(offset=0x0, size=Op.MLOAD(offset=0x100)),
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000C0DE),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
-    # Source: Yul
+    # Source: yul
+    # london
     # {
     #   sstore(1, gas())
     #
@@ -265,62 +211,198 @@ def test_create_large_result(
     #   // Create the contract
     #   let newAddr
     #   switch operation
-    #   case 0xF0 { newAddr := create(0, 0, 0x120) }
-    # ... (9 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.CALLDATALOAD(offset=0x24)
-            + Op.CALLDATALOAD(offset=0x44)
-            + Op.SWAP1
-            + Op.PUSH1[0x1]
-            + Op.EXTCODESIZE(address=0xC0DE)
-            + Op.EXTCODECOPY(
-                address=0xC0DE,
-                dest_offset=Op.DUP1,
-                offset=0x0,
-                size=Op.DUP1,
-            )
-            + Op.SUB
-            + Op.MSTORE8
-            + Op.PUSH2[0x100]
-            + Op.MSTORE
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.JUMPI(pc=0x53, condition=Op.EQ(0xF0, Op.DUP1))
-            + Op.PUSH1[0xF5]
-            + Op.JUMPI(pc=0x44, condition=Op.EQ)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=Op.DUP1)
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.SLOAD(key=0x1), Op.GAS))
-            + Op.SSTORE(key=0x2, value=Op.EXTCODEHASH)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.CREATE2(value=Op.DUP1, offset=0x0, size=0x120, salt=0x5A17)
-            + Op.JUMP(pc=0x32)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.CREATE(value=Op.DUP1, offset=0x0, size=0x120)
-            + Op.JUMP(pc=0x32)
-        ),
-        storage={0x0: 0x60A7, 0x1: 0x60A7, 0x2: 0x60A7},
+    # ... (10 more lines)
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.CALLDATALOAD(offset=0x24)
+        + Op.CALLDATALOAD(offset=0x44)
+        + Op.SWAP1
+        + Op.PUSH1[0x1]
+        + Op.EXTCODESIZE(address=contract_0)
+        + Op.EXTCODECOPY(
+            address=contract_0, dest_offset=Op.DUP1, offset=0x0, size=Op.DUP1
+        )
+        + Op.SUB
+        + Op.MSTORE8
+        + Op.PUSH2[0x100]
+        + Op.MSTORE
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.JUMPI(pc=0x53, condition=Op.EQ(0xF0, Op.DUP1))
+        + Op.PUSH1[0xF5]
+        + Op.JUMPI(pc=0x44, condition=Op.EQ)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=Op.DUP1)
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.SLOAD(key=0x1), Op.GAS))
+        + Op.SSTORE(key=0x2, value=Op.EXTCODEHASH)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.CREATE2(value=Op.DUP1, offset=0x0, size=0x120, salt=0x5A17)
+        + Op.JUMP(pc=0x32)
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.CREATE(value=Op.DUP1, offset=0x0, size=0x120)
+        + Op.JUMP(pc=0x32),
+        storage={0: 24743, 1: 24743, 2: 24743},
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        nonce=1,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                contract_1: Account(
+                    storage={
+                        0: compute_create_address(address=contract_1, nonce=1),
+                        1: 0x1777F,
+                        2: 0xD956C0ABD597440481902014A37B733358EE7685461EB1B5916EEFD83381E6D9,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                contract_1: Account(
+                    storage={
+                        0: 0x595C5D0C272757CFF0B3DCA4ED60D60CD6E9F58,
+                        1: 0x177C9,
+                        2: 0xD956C0ABD597440481902014A37B733358EE7685461EB1B5916EEFD83381E6D9,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {contract_1: Account(storage={0: 0, 1: 44927, 2: 0})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {contract_1: Account(storage={0: 0, 1: 45001, 2: 0})},
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                contract_1: Account(
+                    storage={
+                        0: compute_create_address(address=contract_1, nonce=1),
+                        1: 0x4BBCE4,
+                        2: 0xDCBCC213F0C91B71D38DEDD06C95CCB99467B9B05F275BED536DE1044F5F18FA,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                contract_1: Account(
+                    storage={
+                        0: 0xA5DC71D47D0D8DCF5990E81C74E981BAF24A8FA2,
+                        1: 0x4BBD2E,
+                        2: 0xDCBCC213F0C91B71D38DEDD06C95CCB99467B9B05F275BED536DE1044F5F18FA,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [6], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {contract_1: Account(storage={0: 0, 1: 48356, 2: 0})},
+        },
+        {
+            "indexes": {"data": [7], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {contract_1: Account(storage={0: 0, 1: 48430, 2: 0})},
+        },
+        {
+            "indexes": {"data": [8], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                contract_1: Account(storage={0: 0, 1: 0x4B16491, 2: 0})
+            },
+        },
+        {
+            "indexes": {"data": [9], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                contract_1: Account(storage={0: 0, 1: 0x4B16492, 2: 0})
+            },
+        },
+        {
+            "indexes": {"data": [10], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {contract_1: Account(storage={0: 0, 1: 48362, 2: 0})},
+        },
+        {
+            "indexes": {"data": [11], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {contract_1: Account(storage={0: 0, 1: 48436, 2: 0})},
+        },
+        {
+            "indexes": {"data": [12], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                contract_1: Account(storage={0: 0, 1: 0x4B1649D, 2: 0})
+            },
+        },
+        {
+            "indexes": {"data": [13], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                contract_1: Account(storage={0: 0, 1: 0x4B1649E, 2: 0})
+            },
+        },
+        {
+            "indexes": {"data": [14], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {contract_1: Account(storage={0: 0, 1: 54116, 2: 0})},
+        },
+        {
+            "indexes": {"data": [15], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {contract_1: Account(storage={0: 0, 1: 54190, 2: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xF3) + Hash(0x100),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xF3) + Hash(0x100),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xFD) + Hash(0x100),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xFD) + Hash(0x100),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xF3) + Hash(0x6000),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xF3) + Hash(0x6000),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xFD) + Hash(0x6000),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xFD) + Hash(0x6000),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xF3) + Hash(0x6001),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xF3) + Hash(0x6001),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xFD) + Hash(0x6001),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xFD) + Hash(0x6001),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xF3) + Hash(0xC000),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xF3) + Hash(0xC000),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xFD) + Hash(0xC000),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xFD) + Hash(0xC000),
+    ]
+    tx_gas = [80000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=80000000,
+        to=contract_1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code.py b/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code.py
index 0e47570ed12..8a4e086e17c 100644
--- a/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code.py
+++ b/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code.py
@@ -1,19 +1,24 @@
 """
-Test ported from static filler.
+Test_create_oo_gafter_init_code.
 
 Ported from:
-tests/static/state_tests/stCreateTest/CreateOOGafterInitCodeFiller.json
+state_tests/stCreateTest/CreateOOGafterInitCodeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,31 +27,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CreateOOGafterInitCodeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CreateOOGafterInitCodeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (54000, {}),
-        (55000, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_oo_gafter_init_code(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_oo_gafter_init_code."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,25 +70,51 @@ def test_create_oo_gafter_init_code(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x6460016001556000526005601bf3) (CREATE 0 18 14) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
-            + Op.CREATE(value=0x0, offset=0x12, size=0xE)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.CREATE(value=0x0, offset=0x12, size=0xE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 0}),
+                compute_create_address(
+                    address=contract_0, nonce=0
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 0}),
+                compute_create_address(address=contract_0, nonce=0): Account(
+                    code=bytes.fromhex("6001600155")
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [54000, 55000]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_returndata.py b/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_returndata.py
index 857e48c33e6..5b0054ddd8b 100644
--- a/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_returndata.py
+++ b/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_returndata.py
@@ -2,20 +2,21 @@
 Call RETURNDATASIZE and RETURNDATACOPY after CREATE deploy a contract.
 
 Ported from:
-tests/static/state_tests/stCreateTest
-CreateOOGafterInitCodeReturndataFiller.json
+state_tests/stCreateTest/CreateOOGafterInitCodeReturndataFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,31 +24,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CreateOOGafterInitCodeReturndataFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CreateOOGafterInitCodeReturndataFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (54000, {}),
-        (95000, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_oo_gafter_init_code_returndata(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Call RETURNDATASIZE and RETURNDATACOPY after CREATE deploy a..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Call RETURNDATASIZE and RETURNDATACOPY after CREATE deploy a contract."""  # noqa: E501
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,28 +67,35 @@ def test_create_oo_gafter_init_code_returndata(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x6460016001556000526005601bf3) (CREATE 0 18 14) [[ 1 ]] (RETURNDATASIZE) (RETURNDATACOPY 0 0 32) [[ 2 ]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
-            + Op.POP(Op.CREATE(value=0x0, offset=0x12, size=0xE))
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.POP(Op.CREATE(value=0x0, offset=0x12, size=0xE))
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [54000, 95000]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {
+        contract_0: Account(storage={1: 0}),
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_returndata2.py b/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_returndata2.py
index 53c668c3563..baf51e193f4 100644
--- a/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_returndata2.py
+++ b/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_returndata2.py
@@ -2,8 +2,7 @@
 Call RETURNDATASIZE and RETURNDATACOPY after CREATE deploy a contract....
 
 Ported from:
-tests/static/state_tests/stCreateTest
-CreateOOGafterInitCodeReturndata2Filler.json
+state_tests/stCreateTest/CreateOOGafterInitCodeReturndata2Filler.json
 """
 
 import pytest
@@ -12,9 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -23,35 +28,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CreateOOGafterInitCodeReturndata2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CreateOOGafterInitCodeReturndata2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (54000, {}),
-        (
-            95000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={2: 0x6460016001556000526005601BF3}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_oo_gafter_init_code_returndata2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Call RETURNDATASIZE and RETURNDATACOPY after CREATE deploy a..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Call RETURNDATASIZE and RETURNDATACOPY after CREATE deploy a contract."""  # noqa: E501
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -66,27 +74,57 @@ def test_create_oo_gafter_init_code_returndata2(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x6460016001556000526005601bf3) (CREATE 0 18 14) [[ 1 ]] (RETURNDATASIZE) (RETURNDATACOPY 0 0 0) [[ 2 ]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
-            + Op.POP(Op.CREATE(value=0x0, offset=0x12, size=0xE))
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x0)
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.POP(Op.CREATE(value=0x0, offset=0x12, size=0xE))
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x0)
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 0}),
+                compute_create_address(
+                    address=contract_0, nonce=0
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={1: 0, 2: 0x6460016001556000526005601BF3}
+                ),
+                compute_create_address(address=contract_0, nonce=0): Account(
+                    code=bytes.fromhex("6001600155")
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [54000, 95000]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_returndata3.py b/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_returndata3.py
index 2de510c2b7c..f7506f2dde7 100644
--- a/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_returndata3.py
+++ b/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_returndata3.py
@@ -2,19 +2,19 @@
 Calls a contract that runs CREATE which deploy a code. then OOG happens...
 
 Ported from:
-tests/static/state_tests/stCreateTest
-CreateOOGafterInitCodeReturndata3Filler.json
+state_tests/stCreateTest/CreateOOGafterInitCodeReturndata3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CreateOOGafterInitCodeReturndata3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CreateOOGafterInitCodeReturndata3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +31,11 @@ def test_create_oo_gafter_init_code_returndata3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Calls a contract that runs CREATE which deploy a code. then OOG..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Calls a contract that runs CREATE which deploy a code."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,47 +46,46 @@ def test_create_oo_gafter_init_code_returndata3(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x6460016001556000526005601bf3) (CREATE 0 18 14) }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
-            + Op.CREATE(value=0x0, offset=0x12, size=0xE)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.CREATE(value=0x0, offset=0x12, size=0xE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (CALLCODE (GAS) 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 32) (RETURNDATACOPY 0 0 32) [[ 1 ]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=Op.GAS,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
             )
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=55000,
     )
 
-    post: dict = {}
+    post = {
+        contract_0: Account(storage={1: 0}),
+        compute_create_address(
+            address=contract_1, nonce=0
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_returndata_size.py b/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_returndata_size.py
index 4587333768a..6f458740e9d 100644
--- a/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_returndata_size.py
+++ b/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_returndata_size.py
@@ -2,19 +2,19 @@
 Calls a contract that runs CREATE which deploy a code. then OOG happens...
 
 Ported from:
-tests/static/state_tests/stCreateTest
-CreateOOGafterInitCodeReturndataSizeFiller.json
+state_tests/stCreateTest/CreateOOGafterInitCodeReturndataSizeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCreateTest/CreateOOGafterInitCodeReturndataSizeFiller.json",  # noqa: E501
+        "state_tests/stCreateTest/CreateOOGafterInitCodeReturndataSizeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_create_oo_gafter_init_code_returndata_size(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Calls a contract that runs CREATE which deploy a code. then OOG..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Calls a contract that runs CREATE which deploy a code."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,29 +47,31 @@ def test_create_oo_gafter_init_code_returndata_size(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x6960016001556001600255600052600a6016f3) (CREATE 0 13 19) (EXP 2 (RETURNDATASIZE)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0, value=0x6960016001556001600255600052600A6016F3
-            )
-            + Op.POP(Op.CREATE(value=0x0, offset=0xD, size=0x13))
-            + Op.EXP(0x2, Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x6960016001556001600255600052600A6016F3
+        )
+        + Op.POP(Op.CREATE(value=0x0, offset=0xD, size=0x13))
+        + Op.EXP(0x2, Op.RETURNDATASIZE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=55054,
         value=1,
     )
 
-    post: dict = {}
+    post = {
+        contract_0: Account(balance=1),
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_revert.py b/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_revert.py
index f560062be50..5efacdc166e 100644
--- a/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_revert.py
+++ b/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_revert.py
@@ -2,7 +2,7 @@
 Calls a contract that runs CREATE which deploy a code. then after...
 
 Ported from:
-tests/static/state_tests/stCreateTest/CreateOOGafterInitCodeRevertFiller.json
+state_tests/stCreateTest/CreateOOGafterInitCodeRevertFiller.json
 """
 
 import pytest
@@ -11,9 +11,11 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,9 +24,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CreateOOGafterInitCodeRevertFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CreateOOGafterInitCodeRevertFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +32,11 @@ def test_create_oo_gafter_init_code_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Calls a contract that runs CREATE which deploy a code. then after..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Calls a contract that runs CREATE which deploy a code."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_2 = Address(0x094F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -47,67 +50,67 @@ def test_create_oo_gafter_init_code_revert(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    # Source: lll
     # { (KECCAK256 0x00 0x2fffff) }
-    pre.deploy_contract(
+    contract_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SHA3(offset=0x0, size=0x2FFFFF) + Op.STOP,
         nonce=0,
-        address=Address("0x094f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0x094F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x6460016001556000526005601bf3) (CREATE 0 18 14) (CALLCODE 10000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (REVERT 0 32) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
-            + Op.POP(Op.CREATE(value=0x0, offset=0x12, size=0xE))
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x2710,
-                    address=0x94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.POP(Op.CREATE(value=0x0, offset=0x12, size=0xE))
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x2710,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.REVERT(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (CALL (GAS) 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 32) [[ 1 ]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
             )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=285000,
     )
 
     post = {
-        contract: Account(storage={1: 0x6460016001556000526005601BF3}),
+        contract_0: Account(storage={1: 0x6460016001556000526005601BF3}),
+        compute_create_address(
+            address=contract_1, nonce=0
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_revert2.py b/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_revert2.py
index c37130da314..d7a8fbcadff 100644
--- a/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_revert2.py
+++ b/tests/ported_static/stCreateTest/test_create_oo_gafter_init_code_revert2.py
@@ -2,7 +2,7 @@
 Calls a contract that runs CREATE which deploy a code. then after...
 
 Ported from:
-tests/static/state_tests/stCreateTest/CreateOOGafterInitCodeRevert2Filler.json
+state_tests/stCreateTest/CreateOOGafterInitCodeRevert2Filler.json
 """
 
 import pytest
@@ -12,8 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,45 +28,41 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CreateOOGafterInitCodeRevert2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CreateOOGafterInitCodeRevert2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            {
-                Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={1: 0x6460016001556000526005601BF3}
-                ),
-                Address("0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={1: 255}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000d94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            {
-                Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={1: 255}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_oo_gafter_init_code_revert2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Calls a contract that runs CREATE which deploy a code. then after..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Calls a contract that runs CREATE which deploy a code."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
+    contract_1 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_2 = Address(0xD94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_3 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -74,92 +76,114 @@ def test_create_oo_gafter_init_code_revert2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    # Source: lll
     # { (CALL (GAS) (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=Op.GAS,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=Op.GAS,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xE8D4A51000,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x6460016001556000526005601bf3) (CREATE 0 18 14) (REVERT 0 32) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
-            + Op.POP(Op.CREATE(value=0x0, offset=0x12, size=0xE))
-            + Op.REVERT(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.POP(Op.CREATE(value=0x0, offset=0x12, size=0xE))
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (CALL 33000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 32) [[ 1 ]] (MLOAD 0) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x80E8,
-                    address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x80E8,
+                address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
             )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x1: 0xFF},
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={1: 255},
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (CALL 23000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 32) [[ 1 ]] (MLOAD 0) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x59D8,
-                    address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x59D8,
+                address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
             )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x1: 0xFF},
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={1: 255},
         nonce=0,
-        address=Address("0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xD94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(
+                    storage={1: 0x6460016001556000526005601BF3}
+                ),
+                compute_create_address(
+                    address=contract_3, nonce=0
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_2: Account(storage={1: 0}),
+                compute_create_address(
+                    address=contract_3, nonce=0
+                ): Account.NONEXISTENT,
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(contract_1, left_padding=True),
+        Hash(contract_2, left_padding=True),
+    ]
+    tx_gas = [175000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=175000,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_oo_gafter_max_codesize.py b/tests/ported_static/stCreateTest/test_create_oo_gafter_max_codesize.py
index 15b7eafb134..4cd22b226bc 100644
--- a/tests/ported_static/stCreateTest/test_create_oo_gafter_max_codesize.py
+++ b/tests/ported_static/stCreateTest/test_create_oo_gafter_max_codesize.py
@@ -1,921 +1,95 @@
 """
-Test ported from static filler.
+Test_create_oo_gafter_max_codesize.
 
 Ported from:
-tests/static/state_tests/stCreateTest/CreateOOGafterMaxCodesizeFiller.yml
+state_tests/stCreateTest/CreateOOGafterMaxCodesizeFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CreateOOGafterMaxCodesizeFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "a6f227c000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x008fe4a99394ff41d3689b06e1206ebb5e841b05"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x009f2c334b4957b72c252ab42bbd0dc7c3289edf"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x00c7a731691874e9e97493e2b16e7c6787197e48"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x01295f79874d5247b4b665a92f73931900f1af6d"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x0171dea2507cc731b1ba8bdbf35008111f59f619"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x030d1f67dd69d59b426d610dc4965702eb155b6a"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x036f16e234d8a011d864210d0d3e70494ae1a3a0"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x038955d1e23d253db998914d068201cd814d52b4"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x039cd5ea0a9bf718b11e0b649692bd15fb0f298d"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x03bc5e3b1d12e870bfa0372aed3b121c0761f199"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x041218fe5a5552adf0bfc447cecf0715fc34b890"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x0461e813a48f3589693639de73c14fe6f3e3b114"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x0583ad2e135ac542b1ef85c150b94322853158c9"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x067cc58d35dd7591cc4203b79c709c8a1035d366"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x071d4688164ccd18e2e53260285796bcb164f2db"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x074a7dabb0c390eafbee22baa0575637da1d42fb"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x07c32f644fbf840aa4815a6e1b16f7d8e27ffe54"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x07f65ca20efa11bb369d6380745a26a995a6d990"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x084c10d2bcf80dfaeae486a4cd8741b990145977"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x08ce0c79d24ec8b39aff98c87c1467067ceee26e"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x090744f767347333e2a5e08fae58f2ca7eb434d9"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x097a1dadf2e42ac2d3a61aa0a74f4485150b7fc8"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x0a005a10daa8947d7986cef760cbab34e2aa19fa"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x0b8eccd09ac0ccad79e27441d10979c9bc880213"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x0f6339ac04e016cc2bf11910912597b65e27fe1a"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x1088f8abbbe5e2d16e7105e70f6cc8b47529559b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x12388e20268ad46d1a9d10b47050fa45a58e0670"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x12b4ca840fc837233d4760863b242954d896641d"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x142b0c4c07d7592c1018e9c5133b8a535482a3ab"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x14a65aef3fbdb53d66b97abf4bee064e4af74831"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x1544b32742f0ef65b83bef63d8da3f79747a122b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x18e03de511a3191c75505fa99adee652682a60dc"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x190922de67df80176c3a3af07e9372438b1e5057"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x19a62f6e9c37c0daccb7fb627663bf22dc20ca5b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x19e84fa14eaa2d667245981c08baa7e93ae94b92"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x1a2dfe43e35a2a2bc4719ef2126af20066b636e5"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x1aa67b714216e355be2b374609f98f2372631702"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x1e4802f8e20a034148f9f7e9f7ff8fcf89a1f3c8"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x1ea15370a48589c62ca0de7aaa001ff14290d651"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x1f03637d1c15acf5c8f41fbe4caa43fd5be5cd8e"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x20543219cb5496cdb12905720e336a36ab8584a3"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x20ae87c7b64ae11a7b9930b87157f18124cfe82c"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x20d1c37d492b7ebaca028f1048a898189b18d13f"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x22959e4445ef9eef4c56a735d5d83611b2733b04"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x25ec69783ad564c5089b35529705c813bf36dbe4"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x27c860b8374013394fbeb583b67dc9d5819007b8"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x27fad120d123a456afff7901a618249a1cb402fc"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x286000ed447bee4415eb336abce3d58f2f41a667"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x2b13e6d598d1ff118f1e7c8004933ff8ed19ebb5"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x2b2308528a9d4ae9dd0d4fd128a936cccd49606e"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x2d84a0f4a5c0431731c561f07da860cee6a685ca"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x2f0411b3af6e4925b16e23fff8abbee62083619b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x30d71546cd3769b96ddc33d1b2fbf7e6afa5c816"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x30f35a56e64cce71d4939a89433a62cdd041c33d"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x31ce43f969bd048e8c02c12b95e29a0c5c4cd90f"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x333354aa92066991501f72cf48ba3aacb4d284a5"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x336debb8ce5a3cf4b40be471ac04f77b51f2d2e1"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x34eca9e866a93f9a817d4e8c2a634488a1995549"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x3963c5ba8ec666e841450ad411c7ee46f5916cdb"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x396b47fae89161b1959b5a833acf816be526b860"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x39e86858df5a34c9a2625bcf973cf289931c415a"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x3a74fefeb9841b01a56e80ae0d353a0028b4c73a"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x3df4a81ea5b969a1b6883a78a8c5467bd59723c6"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x4380c6b5ce52da72b7c144bd040f0dc142c100d2"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x45c60faf3bac6b671b29fb6c756a5db8fece2b73"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x45f8b2981c97ffbcb5712808678b539ce7089b9d"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x461d621b21d3484e5967063bbdabe432236b6d1e"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x464e9263b5ec030efff98377d7b0af65b91a6d12"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x46d195d72aaf347a802fdc1273f647db8abda19c"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x47d608e9eb2a9603cad5f0ce10029434efcd873e"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x497d3d33f7c079fc7ab53f5baa7d96ccd802c96f"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x4a5de374d69c1de39cbfb7f3963ce460a64c6495"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x4b2c1b96e4b881960f7241f496a85155136528c6"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x4ccb281d5393f491edb218da6fe87e7383e5f8c2"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x4d70a4f9d072ad765bce998b8ccb5e61c29cd6d2"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x4e799c8bdc45c386d64c005e7784fff3e44807dd"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x50db39e8efeff6e63ab8228feaec3a6e24a6e95e"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x53acf65110278d0917b0218ea70c5c82a50ae78a"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x5518286da4b2adc58f17b4ad52fc3f9a38a8c552"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x55bbb55f14ca906c870f8e2898a2a3279b72782b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x56f8eefb2f0d9b3fddbcca160d7adb0f06ee2798"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x57f440c1e3896e48c29d59c02ec330f8858d1f98"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x5806f1701c5e1fa25c406f30ae3258df58acf078"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x584549b2d2211d49289a27d5b1ce2c15f13eb577"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x59612f767697ed38e477238326f3372aa3e5eb6a"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x5baac4dce052912f038c5e003ef3b4ea15c9306e"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x5bbf0533d9045f72efe987c4674e112c7300d07c"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x5da99b5c1a17088158989bf3641459bcea07975d"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x5e37a04adf836d7c1b1dbc84ce065955d4e51f68"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x5ea06af477885dbd9eaaf073edf03f8f14e20601"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x6186e6dd86ffd92e6d9203db6ebdd2a52cece6f6"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x6355ac4b9d8b9a0280d85bca5fc5d7178bd8f895"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x63f4c7e61ac2b5276bdaa7dae7110561be17e98b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x672b53b234366400ecc07d1cf0e8a28f7ee204f8"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x67828d8484ce84789f9ace803f5fa6375427ee74"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x67ddaac192b9e0a7c977e027ec71641ad2d1e17c"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x69063beaa2ccc2af95d158fe33443c61ca08b306"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x69bbf6b71f9895aede8b7d72c04d83d386746858"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x6ab290e1599c21399b71281f9d5a3a907f794796"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x6f90f79698c2df7072b254f44298c21bc900a2fd"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x6fb954faac7af474042ca4ed99a494608a6b2034"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x70179a1e41ca5110788e3906a987282e091fa582"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x706eec6be586e6faaccd7c08fe500cdb762f9a03"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x70983d6bacc64c167901a0756ccecb9c2756f76c"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x713df334cbd70c9e2dd027f6d9820854a03297ab"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x73281f5dbd975c5b9335dbb3220451d4550ec187"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x74ce5dfe5278e34c844f9526e835754d8f2a4853"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x7603643a3c2fd2120ed9d28500e2da905b4a4c30"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x76398682b927b04cfd13473d001c8152c66bb05f"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x79243f03010f35335bdc5dd8bac8fd053b0ed5dd"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x79d0076fa2213249c34ecf0f4cd85d01c8059106"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x7b544c88e59949827e3b90698af52957f0abc279"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x7b7884b6efdd6c91862a7065487277a39abac083"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x7b80ecab4092371721de2015dbdc35dccd3fcf5c"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x7c8b3524fffc0e8eb78704b27de270a016ae75c8"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x7cd8a3c6b9680e9891e60404ef6567fde5dcec98"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x7e3bd590a907dd2efd9a59ff5a323060ef22d805"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x7e6095002ed2d430bc4b2878a6b450b29009b16b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x7e916fa8af1b00423505d9a2f160d023d9c6af99"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x7eb2135adfbd65150b8e2a9e0c4fe8713a8e386c"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x7eeaf9e649b762242a1034392e084bafd2a8aff6"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x81bd8848da166eaf3454dd7d4193d2f90045b420"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x81da7e005190adde1e6cb19603f71546d8f8dc72"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x823bd47cf1dd771fe33b75e8e391a198b696cf96"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x82e0efdcc3624e23e978fa09df7def295320238a"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x831dff3eeb5fad5fc684f480870703287d559d47"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x863e236652e374c1dc8734330abede9b6bb164a7"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x88441d8123594b08ccb9716a77193fc45bb55c5f"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x8b6ed72e9fc557e79819e4cf3f806d85a68d0b33"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x8bbafbd848a59cdc3108087d83b94280ec69b5a8"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x8bd7418790ee476f2a30a29598684aadbb10f6c3"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x8cab2bbd02c94f4b35265b07aefa257c82647a28"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x8d852742356d237ffe887a0b54bb561918558ac2"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x8dba3fba0e82e23675d9e27ad38ba3133814fdd9"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x910ace9558901f0dc6818b5d71eb753cf65f56e2"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x91394dff8adea637c7953b9cd1dfaa306f09c6a8"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x9205d637c34fd000dedbd577f4c3fd082acc0202"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x92ccd8ac1dda8d6f1c2a8cd9b51dc56c44febe74"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x935cd6233eeca8b850842868f2b61ed396de3c0c"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x955faee8bb23113f60de8288e27464520625d14d"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x97480fb5804ba35e012bcb30880c64c92b1948a8"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x97752d900db15f9799c49af7799fbb47aac58cff"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x98cb664adcedfb7f04b94bbc935f2bf68a53a447"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x995576eccf99c1152b573e092fc068f9809ebabf"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x9999bf853301842aa9f6dd1aa0e1e811b2a00f49"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x99e62e63345e1e76b8e7cbafb433544e2fe99512"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x9ad039a0ead301cfdefcdd927c649f7eb60b05ee"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x9c191b43e684189f0bb14204f0b60f52e7e31800"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x9cefd6dfd201466bcc8660fadfe779ad84e51035"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x9d10dcbc98f78393a77f384c2d5a85ac77dc03fb"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x9da6b16741ad3fea4cbc6fec1cbf40222edf8428"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x9dbc2d09bb39017b664df01a88116ae746f41e87"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x9f06236f6bbc43f8e9dc6cc27535fbc5b4df2968"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x9f13f558023e03e7dfb170a255366bdf10f6cc5b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xa0b22b335f81bf3ef9aa288ef42552a01d34dcf3"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xa0cc667684a51bd538e5d7602cd6fc55b1ce6718"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xa28e6aa3788e693b543a17080e01f791144f2e9b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xa2e43c5a3581af1eede0e10f4003b84eb9368638"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xa30cf3d83271b69e6197fa49d9f018304e212567"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xa351ff71f4fd8b6f3874b04b6263d680288fe811"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xa3c759b6f18c232a1341ed2304cbd5952c9e3c55"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xa4b939c22ace39e879f458e720d855fc0f6b5c93"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xa51223385dd45a032f44ffd7941e032cac410ada"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xa6e9ab9401062d4235410d5b86b251ab4de8407d"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xa6ee313e03f64eecca90630cb4298e7246b7b058"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xa6f4afe1dccafc6d36fea6c64b0732268d09cf66"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xa75e4a2ca659acabce9517b58ce590613c7671a8"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xaa4680e68d6a2a169e5e732a73c57c02570cda32"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xac480c906cf962ee3c280babb088bd6b738c8830"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xac57a076a56bae969b09ae83acd86e1e74688cc0"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xac80ac315dc1820f3fc02c1e84ebeefe63a5cf6b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xac9f2596ca3df3b4d0f7726e4269f728fc3b5513"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xad501ee176ef7eeff9a7b405c5ba7ebd65f0b3d8"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xb17ad9ade2750fddb466f227822a9641ddf4b368"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xb36e4bd752a91835d63187d1a76028633f446717"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xb9bdd9506b309419030783e39fb338a9d0657b50"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xbaea4cd4f2c66b8e86231569acfac98105fb371f"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xbb9815ee614931c4b647fcff59903bd85d43a195"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xbbda9bf1d8293fd1dcb8b5acd094f0b0be9854a1"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xbceba3b431a27d67b0d5d1e9e2e543f996dcb1c5"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xbd205415c24eb289b6a275baae74527b92b49fe2"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xbea91c3bf16bf4e6682a83cafd23e51d07320c3d"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xbf2fa91409040bccf9a3057e7b44fed6180964d5"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xbfb2c6fd3f376fe54cdf43528ea75c4d654520a9"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xc0c6609d8fec3dbc72fe75b58741c0adc8017d5b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xc1aed2b66223b9945bfc1ded7b8ebd1a2b0b558c"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xc3b253f5eebfbd146945c8c8f9a6387548724793"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xc412ac76da31762387ebf037b7ab858630be14fb"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xc4640f70c30da2a012c272fb6b35ac3bdf2faa1d"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xc5b42bd4e227777fa40fcc664361a4b2aa92cd2e"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xc61255fc2d9231a8ad0ff0bcdd1dc18e0bc36716"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xc812181698640e4d903d48905300d09d0b6aca44"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xcbd155ea3136979e3dd290b98d9213c2378156e7"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xcd0e1ca16526f06894785b0c3f70da8e12c840c7"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xcd7dab3a880d717525774e609007fe293fb3c6f2"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xcf88cbac56d349d1d84608fd65f326335f9d231b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xcf95a24035f540e1d4f4c2d5dd23907c65d25c25"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xd02bf23894916bed08d673bd9137e250a05cbe24"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xd1266923606dbf8316d9a309d11dfe01046bdcca"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xd151f07b9d42f35be65e24648c6666e2cbf6eb65"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xd26f2c133e89a7529f5b55eee3a69cad1c0d162a"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xd2fd46818ca3704f604fd8576d6949de46d2615f"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xd3da3859340f1bceb3c9446dd317fcda11cdef8d"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xd43081adf2b74142abe506a7a0876282a01ef49b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xd463d91663aa618c69c07806ba6f73b7f01e706e"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xd4afca98581c37bf178054492f6dab0589ee711b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xd61f89dc08860ee934633c02f49b7085518f731b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xd6927a4164b187980d0a503535bb94af52571faa"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xd6f074b660f8ad09331a383ed48db828204e1ea6"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xd7b1c8b11acd78fa3125d7ee69932370fa9a533b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xd7cb633e099309c2a91161a933ef489e7d9671b7"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xda1b4f166ae6d95a678d8a3c4eca060f0b2d6a57"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xdafa6d1c2ea9f96df2ce75a706b8b1ee435bb7a7"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xdb2ac5470240c92226eaed73a5c34533a9304766"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xdc6bb7ce6f6eff34c2ee81ad05ec8d7631719b7b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xdc9765208a36a8aaf7f475389c868a14d961c441"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xde6f03bdbba9eb4b8becc08112dae6215dfdb95c"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xdebe3f92bd63cfdb1ab101cb4b1546b96170b716"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xded1c9cd48d8a533d740319fbf315a68c1d65cbd"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xdefd25b398b32da0afa86c952c858e274783dae1"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xdf61cf5f503998e276d793e92a32af594040f937"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xdf886c55b8f41489b52494a0ccb90ba70dda997e"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xe0094e969365326a29193fcab569ae60f5e54945"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xe0cae5c048a12782a2efdec6d562e56611396c45"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xe790ad9580ac0bea21227734986f57f3ee3c1a84"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xe910a8ca565ec674f2a46eda4d722ea1f1938d95"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xeafabe69ca5e42707bf4d44f2ec4a782583ed97c"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xebce9236147061a129aa9496c430e1bb0889f8e6"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xed77f383abf53117deffe2e56d013e8087d41edb"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xee181e7b8a23dd52c3560427a14a4e2339d28b1b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xee27c2a7b3b6f044c59d05555cbb81f473042cdc"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xeea5c1baff7b7b1e8196bd5afa6c6d18b9be4b2d"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xef0c6075b5cba0dfecda04952e19cc4264867a67"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xf000b382b68194ed352685fc99c583225ecc5de0"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xf13479778d51d2cc64c1d9f983306e8dfcdcac6c"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xf2a3ea55e5dd2d0a119b6b1c4076baffa7ae6869"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xf316028cf521c739d9ee401490316226be239860"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xf38d8de0d20676358b74f0275f5a6874c68836db"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xf39fcb2d6cdaf2a8d9bfd1a4d8ae7b3f179bebae"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xf454233cead1d5e7e2b9fa211a9d53ef68596d8d"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xf4d88c8a72b7e57149c2ea7b3f470503d774a79b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xf513793f67421ab27eb347562356faf1896d8666"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xf669f56570a0b318051ea10c0bb6283feb1b2e7d"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xf68aab9af66e3a0d817c122cd794f2bc1baa18d1"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xfb4a3af2f0dd26eb2175e4125ace12f82d6f5050"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xfc1fd51bddf33415d2518a8e2b334504e4698307"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xfd10ec14dcb59438c9172dcdad21a45eb29a47b2"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xfd2525a0ad5e89a50cca0220e071712deb4482e0"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xfe5731d330bf0508c4eac46618d5c13bcf5db7a4"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xfff4b3a27da4bb06d74a040bcff00d8e995f9a19"): Account(
-                    storage={0: 24576}
-                ),
-            },
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/stCreateTest/CreateOOGafterMaxCodesizeFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.valid_until("Prague")
+@pytest.mark.slow
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="LowContractCount_NoDelegateCreate_CallCreateOOG",
         ),
-        (
-            "a6f227c000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ee",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0deb"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x511c6c5591eacfc8b9bf2658916225418508f548"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x782f34ee13897680a5000838ce53d07b9558b5e2"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x9ca6a1cfda677fc2679fce570dd47120686cb7c0"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xdf7cd0b9839e4d93b98f09bf4c79366b9ffbe638"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xe0fad4310f169961f052ac02bb70707ebfa3ece2"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xee8b40edee25283a8c934b9c3a2ad8c848dc61b9"): Account(
-                    storage={0: 24576}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="LowContractCount_DelegateCreate_CallCreateOOG",
         ),
-        (
-            "a6f227c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="LowContractCount_DelegateCreate_CallCreate_SelfDestruct",
         ),
-        (
-            "a6f227c0000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x1a2dfe43e35a2a2bc4719ef2126af20066b636e5"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x1e4802f8e20a034148f9f7e9f7ff8fcf89a1f3c8"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x396b47fae89161b1959b5a833acf816be526b860"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x4b2c1b96e4b881960f7241f496a85155136528c6"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x7e3bd590a907dd2efd9a59ff5a323060ef22d805"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x92ccd8ac1dda8d6f1c2a8cd9b51dc56c44febe74"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x995576eccf99c1152b573e092fc068f9809ebabf"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xbd205415c24eb289b6a275baae74527b92b49fe2"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xc412ac76da31762387ebf037b7ab858630be14fb"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xc812181698640e4d903d48905300d09d0b6aca44"): Account(
-                    storage={0: 24576}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="HighContractCount_NoDelegateCreate_CallCreateOOG",
         ),
-        (
-            "a6f227c0000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0deb"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x2e5a5ec103443f6b299cf31a52c69cf222ae4e6b"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0x67262aa10552371ec665c2f90c56d9d65c16715e"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xb3210b741a5dfbddc1636521965b3558defa3e60"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xbade62b355fe6b7117f4f7c913321b318ca3a4da"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xd8a8f3569a1d76027f9ece5010489576897014ea"): Account(
-                    storage={0: 24576}
-                ),
-                Address("0xfcdccc3b46b9fbe71221061091e8fe82b77e02f2"): Account(
-                    storage={0: 24576}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="HighContractCount_DelegateCreate_CallCreateOOG",
         ),
-        (
-            "a6f227c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="HighContractCount_DelegateCreate_CallCreate_SelfDestruct",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3", "case4", "case5"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_oo_gafter_max_codesize(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_oo_gafter_max_codesize."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x00000000000000000000000000000000000C0DE0)
+    contract_1 = Address(0x00000000000000000000000000000000000C0DE1)
+    contract_2 = Address(0x00000000000000000000000000000000000C0DEB)
+    contract_3 = Address(0x00000000000000000000000000000000000C0DEA)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -926,7 +100,8 @@ def test_create_oo_gafter_max_codesize(
         gas_limit=4294967296,
     )
 
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   // If calldata > 0, self-destruct, otherwise
     #   sstore(0, codesize())
@@ -934,38 +109,95 @@ def test_create_oo_gafter_max_codesize(
     #     selfdestruct(0)
     #   }
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.CODESIZE)
-            + Op.JUMPI(pc=0xC, condition=Op.GT(Op.CALLDATASIZE, 0x0))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SELFDESTRUCT(address=0x0)
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.CODESIZE)
+        + Op.JUMPI(pc=0xC, condition=Op.GT(Op.CALLDATASIZE, 0x0))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SELFDESTRUCT(address=0x0),
         nonce=0,
-        address=Address("0x00000000000000000000000000000000000c0de0"),  # noqa: E501
+        address=Address(0x00000000000000000000000000000000000C0DE0),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   // Init code that uses max codesize and can be called to selfdestruct
     #   let code_addr := 0x00000000000000000000000000000000000c0de0
     #   extcodecopy(code_addr, 0, 0, extcodesize(code_addr))
     #   return(0, 0x6000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH3[0xC0DE0]
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.EXTCODESIZE(address=Op.DUP3)
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.RETURN(offset=0x0, size=0x6000)
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH3[0xC0DE0]
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.EXTCODESIZE(address=Op.DUP3)
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.RETURN(offset=0x0, size=0x6000),
         nonce=0,
-        address=Address("0x00000000000000000000000000000000000c0de1"),  # noqa: E501
+        address=Address(0x00000000000000000000000000000000000C0DE1),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #   sstore (1, 1)
+    #   let contract_count := calldataload(0)
+    #   let should_oog := calldataload(32)
+    #
+    #   // get the init code that returns max codesize from another contract
+    #   let initcode_addr := 0x00000000000000000000000000000000000c0de1
+    #   let initcode_size := extcodesize(initcode_addr)
+    #   extcodecopy(initcode_addr, 0, 0, initcode_size)
+    #
+    #   // create contracts with max codesize in loop
+    #   for { let i := 0 } lt(i, contract_count) { i := add(i, 1) }
+    #   {
+    #       let address_created := create(0, 0, initcode_size)
+    #       mstore( add(initcode_size, mul(i, 32)), address_created )
+    #   }
+    #   if gt(should_oog, 0) {
+    #     invalid()
+    #   }
+    #   return(initcode_size, mul(contract_count, 32))
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.PUSH1[0x0]
+        + Op.CALLDATALOAD(offset=Op.DUP1)
+        + Op.CALLDATALOAD(offset=0x20)
+        + Op.PUSH3[0xC0DE1]
+        + Op.DUP4
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP5
+        + Op.DUP6
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x2D, condition=Op.LT(Op.DUP2, Op.DUP3))
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPI(pc=0x2B, condition=Op.LT)
+        + Op.PUSH1[0x20]
+        + Op.MUL
+        + Op.SWAP1
+        + Op.RETURN
+        + Op.JUMPDEST
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.SWAP1
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP7, Op.MUL(Op.DUP3, 0x20)),
+            value=Op.CREATE(value=Op.DUP1, offset=0x0, size=Op.DUP5),
+        )
+        + Op.ADD
+        + Op.JUMP(pc=0x18),
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000C0DEB),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #
     #   // Get the amount of contracts to create on this level
@@ -995,170 +227,258 @@ def test_create_oo_gafter_max_codesize(
     #   // Call for OOG contract creation
     #   mstore(0, subcall_contract_count)
     #   mstore(32, subcall_oog)
-    #   returnStart := add(64, mul(delegate_contract_count, 32))
-    # ... (30 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x4)
-            + Op.CALLDATALOAD(offset=0x24)
-            + Op.CALLDATALOAD(offset=0x44)
-            + Op.SWAP1
-            + Op.CALLDATALOAD(offset=0x64)
-            + Op.SWAP3
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x40]
-            + Op.MUL(Op.DUP4, 0x20)
-            + Op.SWAP1
-            + Op.PUSH1[0x40]
-            + Op.DUP4
-            + Op.PUSH3[0xC0DEB]
-            + Op.JUMPI(
-                pc=0xBF,
-                condition=Op.EQ(Op.DELEGATECALL, Op.DIV(Op.GAS, 0x2)),
-            )
-            + Op.MSTORE(offset=0x0, value=Op.DUP2)
-            + Op.MSTORE(offset=0x20, value=Op.DUP3)
-            + Op.PUSH1[0x0]
-            + Op.ADD(0x40, Op.MUL(Op.DUP3, 0x20))
-            + Op.MUL(Op.DUP5, 0x20)
-            + Op.SWAP1
-            + Op.PUSH1[0x40]
-            + Op.DUP4
-            + Op.DUP1
-            + Op.PUSH3[0xC0DEB]
-            + Op.JUMPI(pc=0xBA, condition=Op.EQ(Op.CALL, Op.DIV(Op.GAS, 0x2)))
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.DUP2
-            + Op.SWAP4
-            + Op.JUMPI(pc=0xB1, condition=Op.EQ)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x94, condition=Op.LT(Op.DUP2, Op.DUP2))
-            + Op.DUP3
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x77, condition=Op.LT(Op.DUP2, Op.DUP2))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.DUP1
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.PUSH1[0x1]
-            + Op.DUP2
-            + Op.DUP1
-            + Op.PUSH1[0x20]
-            + Op.DUP4
-            + Op.SWAP8
-            + Op.MLOAD(offset=Op.ADD(0x40, Op.MUL))
-            + Op.SUB(Op.GAS, 0x3E8)
-            + Op.POP(Op.CALL)
-            + Op.ADD
-            + Op.JUMP(pc=0x6F)
-            + Op.JUMPDEST
-            + Op.DUP1
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.PUSH1[0x20]
-            + Op.PUSH1[0x1]
-            + Op.SWAP8
-            + Op.MLOAD(offset=Op.ADD(0x40, Op.MUL))
-            + Op.SUB(Op.GAS, 0x3E8)
-            + Op.POP(Op.CALL)
-            + Op.ADD
-            + Op.JUMP(pc=0x65)
-            + Op.JUMPDEST
-            + Op.ADD
-            + Op.SWAP1
-            + Op.POP
-            + Op.CODESIZE
-            + Op.DUP1
-            + Op.JUMP(pc=0x60)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x57, condition=Op.DUP3)
-            + Op.JUMPDEST
-            + Op.REVERT(offset=Op.DUP1, size=0x0)
-        ),
-        address=Address("0x00000000000000000000000000000000000c0dea"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #   sstore (1, 1)
-    #   let contract_count := calldataload(0)
-    #   let should_oog := calldataload(32)
-    #
-    #   // get the init code that returns max codesize from another contract
-    #   let initcode_addr := 0x00000000000000000000000000000000000c0de1
-    #   let initcode_size := extcodesize(initcode_addr)
-    #   extcodecopy(initcode_addr, 0, 0, initcode_size)
-    #
-    #   // create contracts with max codesize in loop
-    #   for { let i := 0 } lt(i, contract_count) { i := add(i, 1) }
-    #   {
-    #       let address_created := create(0, 0, initcode_size)
-    #       mstore( add(initcode_size, mul(i, 32)), address_created )
-    #   }
-    #   if gt(should_oog, 0) {
-    #     invalid()
-    #   }
-    #   return(initcode_size, mul(contract_count, 32))
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.PUSH1[0x0]
-            + Op.CALLDATALOAD(offset=Op.DUP1)
-            + Op.CALLDATALOAD(offset=0x20)
-            + Op.PUSH3[0xC0DE1]
-            + Op.DUP4
-            + Op.EXTCODESIZE(address=Op.DUP2)
-            + Op.SWAP5
-            + Op.DUP6
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x2D, condition=Op.LT(Op.DUP2, Op.DUP3))
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPI(pc=0x2B, condition=Op.LT)
-            + Op.PUSH1[0x20]
-            + Op.MUL
-            + Op.SWAP1
-            + Op.RETURN
-            + Op.JUMPDEST
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.SWAP1
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP7, Op.MUL(Op.DUP3, 0x20)),
-                value=Op.CREATE(value=Op.DUP1, offset=0x0, size=Op.DUP5),
-            )
-            + Op.ADD
-            + Op.JUMP(pc=0x18)
-        ),
-        address=Address("0x00000000000000000000000000000000000c0deb"),  # noqa: E501
+    # ... (31 more lines)
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x4)
+        + Op.CALLDATALOAD(offset=0x24)
+        + Op.CALLDATALOAD(offset=0x44)
+        + Op.SWAP1
+        + Op.CALLDATALOAD(offset=0x64)
+        + Op.SWAP3
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x40]
+        + Op.MUL(Op.DUP4, 0x20)
+        + Op.SWAP1
+        + Op.PUSH1[0x40]
+        + Op.DUP4
+        + Op.PUSH3[0xC0DEB]
+        + Op.JUMPI(
+            pc=0xBF, condition=Op.EQ(Op.DELEGATECALL, Op.DIV(Op.GAS, 0x2))
+        )
+        + Op.MSTORE(offset=0x0, value=Op.DUP2)
+        + Op.MSTORE(offset=0x20, value=Op.DUP3)
+        + Op.PUSH1[0x0]
+        + Op.ADD(0x40, Op.MUL(Op.DUP3, 0x20))
+        + Op.MUL(Op.DUP5, 0x20)
+        + Op.SWAP1
+        + Op.PUSH1[0x40]
+        + Op.DUP4
+        + Op.DUP1
+        + Op.PUSH3[0xC0DEB]
+        + Op.JUMPI(pc=0xBA, condition=Op.EQ(Op.CALL, Op.DIV(Op.GAS, 0x2)))
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.DUP2
+        + Op.SWAP4
+        + Op.JUMPI(pc=0xB1, condition=Op.EQ)
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x94, condition=Op.LT(Op.DUP2, Op.DUP2))
+        + Op.DUP3
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x77, condition=Op.LT(Op.DUP2, Op.DUP2))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.DUP1
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.PUSH1[0x1]
+        + Op.DUP2
+        + Op.DUP1
+        + Op.PUSH1[0x20]
+        + Op.DUP4
+        + Op.SWAP8
+        + Op.MLOAD(offset=Op.ADD(0x40, Op.MUL))
+        + Op.SUB(Op.GAS, 0x3E8)
+        + Op.POP(Op.CALL)
+        + Op.ADD
+        + Op.JUMP(pc=0x6F)
+        + Op.JUMPDEST
+        + Op.DUP1
+        + Op.PUSH1[0x0]
+        + Op.DUP1 * 4
+        + Op.PUSH1[0x20]
+        + Op.PUSH1[0x1]
+        + Op.SWAP8
+        + Op.MLOAD(offset=Op.ADD(0x40, Op.MUL))
+        + Op.SUB(Op.GAS, 0x3E8)
+        + Op.POP(Op.CALL)
+        + Op.ADD
+        + Op.JUMP(pc=0x65)
+        + Op.JUMPDEST
+        + Op.ADD
+        + Op.SWAP1
+        + Op.POP
+        + Op.CODESIZE
+        + Op.DUP1
+        + Op.JUMP(pc=0x60)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x57, condition=Op.DUP3)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=Op.DUP1, size=0x0),
+        nonce=1,
     )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                contract_3: Account(storage={1: 1}, nonce=1),
+                contract_2: Account(storage={}, nonce=1),
+                compute_create_address(
+                    address=contract_2, nonce=1
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_2, nonce=10
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                contract_3: Account(storage={1: 1}, nonce=11),
+                contract_2: Account(storage={}, nonce=1),
+                compute_create_address(address=contract_3, nonce=1): Account(
+                    storage={0: 24576}
+                ),
+                compute_create_address(address=contract_3, nonce=10): Account(
+                    storage={0: 24576}
+                ),
+                compute_create_address(
+                    address=contract_2, nonce=1
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_2, nonce=10
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                contract_3: Account(storage={1: 1}, nonce=11),
+                contract_2: Account(storage={1: 1}, nonce=11),
+                compute_create_address(
+                    address=contract_3, nonce=1
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_3, nonce=10
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_2, nonce=1
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_2, nonce=4
+                ): Account.NONEXISTENT,
+                compute_create_address(address=contract_2, nonce=5): Account(
+                    storage={0: 24576}
+                ),
+                compute_create_address(address=contract_2, nonce=6): Account(
+                    storage={0: 24576}
+                ),
+                compute_create_address(address=contract_2, nonce=7): Account(
+                    storage={0: 24576}
+                ),
+                compute_create_address(address=contract_2, nonce=8): Account(
+                    storage={0: 24576}
+                ),
+                compute_create_address(address=contract_2, nonce=9): Account(
+                    storage={0: 24576}
+                ),
+                compute_create_address(address=contract_2, nonce=10): Account(
+                    storage={0: 24576}
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                contract_3: Account(storage={1: 1}, nonce=1),
+                contract_2: Account(storage={}, nonce=1),
+                compute_create_address(
+                    address=contract_2, nonce=1
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_2, nonce=250
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                contract_3: Account(storage={1: 1}, nonce=251),
+                contract_2: Account(storage={}, nonce=1),
+                compute_create_address(address=contract_3, nonce=1): Account(
+                    storage={0: 24576}
+                ),
+                compute_create_address(address=contract_3, nonce=250): Account(
+                    storage={0: 24576}
+                ),
+                compute_create_address(
+                    address=contract_2, nonce=1
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_2, nonce=250
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                contract_3: Account(storage={1: 1}, nonce=251),
+                contract_2: Account(storage={1: 1}, nonce=251),
+                compute_create_address(
+                    address=contract_3, nonce=1
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_3, nonce=250
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_2, nonce=1
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_2, nonce=244
+                ): Account.NONEXISTENT,
+                compute_create_address(address=contract_2, nonce=245): Account(
+                    storage={0: 24576}
+                ),
+                compute_create_address(address=contract_2, nonce=246): Account(
+                    storage={0: 24576}
+                ),
+                compute_create_address(address=contract_2, nonce=247): Account(
+                    storage={0: 24576}
+                ),
+                compute_create_address(address=contract_2, nonce=248): Account(
+                    storage={0: 24576}
+                ),
+                compute_create_address(address=contract_2, nonce=249): Account(
+                    storage={0: 24576}
+                ),
+                compute_create_address(address=contract_2, nonce=250): Account(
+                    storage={0: 24576}
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("a6f227c0") + Hash(0x0) + Hash(0xA) + Hash(0x1) + Hash(0x0),
+        Bytes("a6f227c0") + Hash(0xA) + Hash(0xA) + Hash(0x1) + Hash(0x0),
+        Bytes("a6f227c0") + Hash(0xA) + Hash(0xA) + Hash(0x0) + Hash(0xE),
+        Bytes("a6f227c0") + Hash(0x0) + Hash(0xFA) + Hash(0x1) + Hash(0x0),
+        Bytes("a6f227c0") + Hash(0xFA) + Hash(0xFA) + Hash(0x1) + Hash(0x0),
+        Bytes("a6f227c0") + Hash(0xFA) + Hash(0xFA) + Hash(0x0) + Hash(0x1EE),
+    ]
+    tx_gas = [4294967296]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=4294967296,
+        to=contract_3,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_oog_from_call_refunds.py b/tests/ported_static/stCreateTest/test_create_oog_from_call_refunds.py
index 42b2e7a09c6..f1ff087ac10 100644
--- a/tests/ported_static/stCreateTest/test_create_oog_from_call_refunds.py
+++ b/tests/ported_static/stCreateTest/test_create_oog_from_call_refunds.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_create_oog_from_call_refunds.
 
 Ported from:
-tests/static/state_tests/stCreateTest/CreateOOGFromCallRefundsFiller.yml
+state_tests/stCreateTest/CreateOOGFromCallRefundsFiller.yml
 """
 
 import pytest
@@ -11,9 +11,16 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,408 +29,198 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CreateOOGFromCallRefundsFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CreateOOGFromCallRefundsFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000006a",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x4501f8fa1e67827ebfb1f6d5510c606871c5a599"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="SStore_Refund_NoOoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000006c",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="SStore_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000006b",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="SStore_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000008a",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x4501f8fa1e67827ebfb1f6d5510c606871c5a599"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="SStore_Refund_NoOoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000008c",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="SStore_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000008b",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="SStore_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000007a",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x4501f8fa1e67827ebfb1f6d5510c606871c5a599"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="SStore_Refund_NoOoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000007c",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="SStore_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000007b",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="SStore_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000002a",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x4501f8fa1e67827ebfb1f6d5510c606871c5a599"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="SStore_Refund_NoOoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000003a",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x4501f8fa1e67827ebfb1f6d5510c606871c5a599"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            10,
+            0,
+            0,
+            id="SStore_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000004a",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x4501f8fa1e67827ebfb1f6d5510c606871c5a599"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            11,
+            0,
+            0,
+            id="SStore_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x4501f8fa1e67827ebfb1f6d5510c606871c5a599"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            12,
+            0,
+            0,
+            id="SelfDestruct_Refund_NoOoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            13,
+            0,
+            0,
+            id="SelfDestruct_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000002b",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            14,
+            0,
+            0,
+            id="SelfDestruct_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000002c",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            15,
+            0,
+            0,
+            id="LogOp_NoOoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            16,
+            0,
+            0,
+            id="LogOp_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            17,
+            0,
+            0,
+            id="LogOp_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000004b",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            18,
+            0,
+            0,
+            id="SStore_Create_Refund_NoOoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000004c",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            19,
+            0,
+            0,
+            id="SStore_Create_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            20,
+            0,
+            0,
+            id="SStore_Create_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000005a",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x4501f8fa1e67827ebfb1f6d5510c606871c5a599"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            21,
+            0,
+            0,
+            id="SStore_Create2_Refund_NoOoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000005c",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            22,
+            0,
+            0,
+            id="SStore_Create2_Refund_OoG",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000005b",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000c0de0"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0dea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x00000000000000000000000000000000000c0ded"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            23,
+            0,
+            0,
+            id="SStore_Create2_Refund_OoG",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_oog_from_call_refunds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_create_oog_from_call_refunds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA)
+    contract_1 = Address(0x000000000000000000000000000000000000001A)
+    contract_2 = Address(0x000000000000000000000000000000000000001B)
+    contract_3 = Address(0x000000000000000000000000000000000000001C)
+    contract_4 = Address(0x000000000000000000000000000000000000002A)
+    contract_5 = Address(0x000000000000000000000000000000000000002B)
+    contract_6 = Address(0x000000000000000000000000000000000000002C)
+    contract_7 = Address(0x000000000000000000000000000000000000003A)
+    contract_8 = Address(0x000000000000000000000000000000000000003B)
+    contract_9 = Address(0x000000000000000000000000000000000000003C)
+    contract_10 = Address(0x000000000000000000000000000000000000004A)
+    contract_11 = Address(0x000000000000000000000000000000000000004B)
+    contract_12 = Address(0x000000000000000000000000000000000000004C)
+    contract_13 = Address(0x000000000000000000000000000000000000005A)
+    contract_14 = Address(0x000000000000000000000000000000000000005B)
+    contract_15 = Address(0x000000000000000000000000000000000000005C)
+    contract_16 = Address(0x000000000000000000000000000000000000006A)
+    contract_17 = Address(0x000000000000000000000000000000000000006B)
+    contract_18 = Address(0x000000000000000000000000000000000000006C)
+    contract_19 = Address(0x000000000000000000000000000000000000007A)
+    contract_20 = Address(0x000000000000000000000000000000000000007B)
+    contract_21 = Address(0x000000000000000000000000000000000000007C)
+    contract_22 = Address(0x000000000000000000000000000000000000008A)
+    contract_23 = Address(0x000000000000000000000000000000000000008B)
+    contract_24 = Address(0x000000000000000000000000000000000000008C)
+    contract_25 = Address(0x00000000000000000000000000000000000C0DEA)
+    contract_26 = Address(0x00000000000000000000000000000000000C0DED)
+    contract_27 = Address(0x00000000000000000000000000000000000C0DE0)
+    contract_28 = Address(0x00000000000000000000000000000000000C0DE1)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -437,459 +234,547 @@ def test_create_oog_from_call_refunds(
         gas_limit=4294967296,
     )
 
-    # Source: Yul
+    pre[sender] = Account(balance=0x3D0900, nonce=1)
+    # Source: yul
+    # berlin
+    # {
+    #   let init_addr := calldataload(4)
+    #   let init_length := extcodesize(init_addr)
+    #   extcodecopy(init_addr, 0, 0, init_length)
+    #   let created_addr := create(0, 0, init_length)
+    #   if eq(created_addr, 0) {
+    #     /* This invalid will deplete the remaining gas to make refund check deterministic */  # noqa: E501
+    #     invalid()
+    #   }
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.DUP2
+        + Op.JUMPI(pc=0x15, condition=Op.EQ(Op.CREATE, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.INVALID,
+        nonce=1,
+        address=Address(0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
     #   sstore(1, 0)
     #   return(0, 1)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x1]
-            + Op.PUSH1[0x0]
-            + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
-            + Op.SSTORE(key=Op.DUP3, value=Op.DUP1)
-            + Op.RETURN
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
+        + Op.SSTORE(key=Op.DUP3, value=Op.DUP1)
+        + Op.RETURN,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000001a"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000001A),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
     #   sstore(1, 0)
     #   return(0, 5000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.RETURN(offset=0x0, size=0x1388)
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.RETURN(offset=0x0, size=0x1388),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000001b"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000001B),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
     #   sstore(1, 0)
     #   invalid()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x1]
-            + Op.PUSH1[0x0]
-            + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.INVALID
-        ),
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.INVALID,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000001c"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000001C),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
-    #   pop(call(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0, 0))  # noqa: E501
-    #   return(0, 1)
+    #   sstore(1, 1)
+    #   sstore(1, 0)
+    #   let initcodeaddr := 0x00000000000000000000000000000000000c0de1
+    #   //let initcodelength := extcodesize(initcodeaddr)
+    #   //extcodecopy(initcodeaddr, 0, 0, initcodelength)
+    #
+    #   // protection from solc version changing init code
+    #   let initcodelength := 15
+    #   mstore(0, 0x6001600055600060005560016000f30000000000000000000000000000000000)  # noqa: E501
+    #
+    #   pop(create2(0, 0, initcodelength, 0))
+    #   return(add(initcodelength, 1), 1)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xC0DEA,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.RETURN(offset=0x0, size=0x1)
-        ),
+    contract_22 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
+        + Op.SSTORE(key=Op.DUP3, value=Op.DUP1)
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=0x6001600055600060005560016000F30000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.PUSH1[0xF]
+        + Op.SWAP1
+        + Op.DUP2 * 2
+        + Op.DUP1
+        + Op.POP(Op.CREATE2)
+        + Op.ADD
+        + Op.RETURN,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000002a"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000008A),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #   // Simple SSTORE to zero to get a refund
+    #   sstore(1, 0)
+    # }
+    contract_25 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
+        storage={1: 1},
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000C0DEA),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #   selfdestruct(origin())
+    # }
+    contract_26 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=Op.ORIGIN),
+        storage={1: 1},
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000C0DED),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
+    # {
+    #   mstore(0, 0xff)
+    #   log0(0, 32)
+    #   log1(0, 32, 0xfa)
+    #   log2(0, 32, 0xfa, 0xfb)
+    #   log3(0, 32, 0xfa, 0xfb, 0xfc)
+    #   log4(0, 32, 0xfa, 0xfb, 0xfc, 0xfd)
+    # }
+    contract_27 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xFF)
+        + Op.LOG0(offset=0x0, size=0x20)
+        + Op.LOG1(offset=0x0, size=0x20, topic_1=0xFA)
+        + Op.LOG2(offset=0x0, size=0x20, topic_1=0xFA, topic_2=0xFB)
+        + Op.LOG3(
+            offset=0x0, size=0x20, topic_1=0xFA, topic_2=0xFB, topic_3=0xFC
+        )
+        + Op.LOG4(
+            offset=0x0,
+            size=0x20,
+            topic_1=0xFA,
+            topic_2=0xFB,
+            topic_3=0xFC,
+            topic_4=0xFD,
+        )
+        + Op.STOP,
+        storage={1: 1},
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000C0DE0),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #   sstore(0, 1)
+    #   sstore(0, 0)
+    #   return(0, 1)
+    # }
+    contract_28 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.SSTORE(key=Op.DUP1, value=Op.DUP1)
+        + Op.PUSH1[0x1]
+        + Op.SWAP1
+        + Op.RETURN,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000C0DE1),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   pop(call(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0, 0))  # noqa: E501
-    #   return(0, 5000)
+    #   return(0, 1)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xC0DEA,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.RETURN(offset=0x0, size=0x1388)
-        ),
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_25,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000002b"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000002A),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   pop(call(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0, 0))  # noqa: E501
-    #   invalid()
+    #   return(0, 5000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xC0DEA,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.INVALID
-        ),
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_25,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1388),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000002c"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000002B),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
     #   pop(delegatecall(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0))  # noqa: E501
-    #   return(0, 1)
+    #   invalid()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.DELEGATECALL(
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
                 gas=Op.GAS,
-                address=0xC0DEA,
+                address=contract_25,
                 args_offset=Op.DUP1,
                 args_size=Op.DUP1,
                 ret_offset=Op.DUP1,
                 ret_size=0x0,
             )
-            + Op.RETURN(offset=0x0, size=0x1)
-        ),
+        )
+        + Op.INVALID,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000003a"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000003C),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
-    #   sstore(1, 1)
-    #   pop(delegatecall(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0))  # noqa: E501
-    #   return(0, 5000)
+    #   pop(call(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0, 0))  # noqa: E501
+    #   invalid()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.DELEGATECALL(
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.POP(
+            Op.CALL(
                 gas=Op.GAS,
-                address=0xC0DEA,
+                address=contract_25,
+                value=Op.DUP1,
                 args_offset=Op.DUP1,
                 args_size=Op.DUP1,
                 ret_offset=Op.DUP1,
                 ret_size=0x0,
             )
-            + Op.RETURN(offset=0x0, size=0x1388)
-        ),
+        )
+        + Op.INVALID,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000003b"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000002C),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
     #   pop(delegatecall(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0))  # noqa: E501
-    #   invalid()
+    #   return(0, 1)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0xC0DEA,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.INVALID
-        ),
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=contract_25,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000003c"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000003A),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
     #   pop(callcode(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0, 0))  # noqa: E501
-    #   return(0, 1)
+    #   return(0, 5000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.CALLCODE(
-                gas=Op.GAS,
-                address=0xC0DEA,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.RETURN(offset=0x0, size=0x1)
-        ),
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=contract_25,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1388),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000004a"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000004B),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
-    #   pop(callcode(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0, 0))  # noqa: E501
+    #   pop(delegatecall(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0))  # noqa: E501
     #   return(0, 5000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.CALLCODE(
-                gas=Op.GAS,
-                address=0xC0DEA,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.RETURN(offset=0x0, size=0x1388)
-        ),
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=contract_25,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1388),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000004b"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000003B),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
     #   pop(callcode(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0, 0))  # noqa: E501
-    #   invalid()
+    #   return(0, 1)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0xC0DEA,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.INVALID
-        ),
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=contract_25,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000004c"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000004A),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
-    #   pop(call(gas(), 0x00000000000000000000000000000000000c0deD, 0, 0, 0, 0, 0))  # noqa: E501
-    #   return(0, 1)
+    #   sstore(1, 1)
+    #   pop(callcode(gas(), 0x00000000000000000000000000000000000c0deA, 0, 0, 0, 0, 0))  # noqa: E501
+    #   invalid()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.CALL(
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.POP(
+            Op.CALLCODE(
                 gas=Op.GAS,
-                address=0xC0DED,
+                address=contract_25,
                 value=Op.DUP1,
                 args_offset=Op.DUP1,
                 args_size=Op.DUP1,
                 ret_offset=Op.DUP1,
                 ret_size=0x0,
             )
-            + Op.RETURN(offset=0x0, size=0x1)
-        ),
+        )
+        + Op.INVALID,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000005a"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000004C),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   pop(call(gas(), 0x00000000000000000000000000000000000c0deD, 0, 0, 0, 0, 0))  # noqa: E501
     #   return(0, 5000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xC0DED,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.RETURN(offset=0x0, size=0x1388)
-        ),
+    contract_14 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_26,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1388),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000005b"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000005B),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   pop(call(gas(), 0x00000000000000000000000000000000000c0deD, 0, 0, 0, 0, 0))  # noqa: E501
-    #   invalid()
+    #   return(0, 1)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xC0DED,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.INVALID
-        ),
+    contract_13 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_26,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000005c"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000005A),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
-    #   pop(call(gas(), 0x00000000000000000000000000000000000c0de0, 0, 0, 0, 0, 0))  # noqa: E501
-    #   return(0, 1)
+    #   pop(call(gas(), 0x00000000000000000000000000000000000c0deD, 0, 0, 0, 0, 0))  # noqa: E501
+    #   invalid()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.CALL(
+    contract_15 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.POP(
+            Op.CALL(
                 gas=Op.GAS,
-                address=0xC0DE0,
+                address=contract_26,
                 value=Op.DUP1,
                 args_offset=Op.DUP1,
                 args_size=Op.DUP1,
                 ret_offset=Op.DUP1,
                 ret_size=0x0,
             )
-            + Op.RETURN(offset=0x0, size=0x1)
-        ),
+        )
+        + Op.INVALID,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000006a"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000005C),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   pop(call(gas(), 0x00000000000000000000000000000000000c0de0, 0, 0, 0, 0, 0))  # noqa: E501
-    #   return(0, 5000)
+    #   return(0, 1)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xC0DE0,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.RETURN(offset=0x0, size=0x1388)
-        ),
+    contract_16 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_27,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000006b"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000006A),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   pop(call(gas(), 0x00000000000000000000000000000000000c0de0, 0, 0, 0, 0, 0))  # noqa: E501
-    #   invalid()
+    #   return(0, 5000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xC0DE0,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.INVALID
-        ),
+    contract_17 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_27,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.RETURN(offset=0x0, size=0x1388),
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000006c"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000006B),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
-    #   sstore(1, 1)
-    #   sstore(1, 0)
-    #   let initcodeaddr := 0x00000000000000000000000000000000000c0de1
-    #   let initcodelength := extcodesize(initcodeaddr)
-    #   extcodecopy(initcodeaddr, 0, 0, initcodelength)
-    #   pop(create(0, 0, initcodelength))
-    #   return(add(initcodelength, 1), 1)
+    #   pop(call(gas(), 0x00000000000000000000000000000000000c0de0, 0, 0, 0, 0, 0))  # noqa: E501
+    #   invalid()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x1]
-            + Op.PUSH1[0x0]
-            + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
-            + Op.SSTORE(key=Op.DUP3, value=Op.DUP1)
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.PUSH3[0xC0DE1]
-            + Op.EXTCODESIZE(address=Op.DUP1)
-            + Op.SWAP2
-            + Op.DUP3
-            + Op.SWAP2
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.EXTCODECOPY
-            + Op.POP(Op.CREATE(value=Op.DUP1, offset=0x0, size=Op.DUP1))
-            + Op.ADD
-            + Op.RETURN
-        ),
+    contract_18 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=contract_27,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.INVALID,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000007a"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000006C),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
@@ -897,32 +782,33 @@ def test_create_oog_from_call_refunds(
     #   let initcodeaddr := 0x00000000000000000000000000000000000c0de1
     #   let initcodelength := extcodesize(initcodeaddr)
     #   extcodecopy(initcodeaddr, 0, 0, initcodelength)
-    #   pop(create(0, 0, initcodelength))
+    #   pop(create2(0, 0, initcodelength, 0))
     #   return(add(initcodelength, 1), 5000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.PUSH2[0x1388]
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x0]
-            + Op.PUSH3[0xC0DE1]
-            + Op.DUP2
-            + Op.EXTCODESIZE(address=Op.DUP2)
-            + Op.SWAP3
-            + Op.DUP4
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.POP(Op.CREATE(value=Op.DUP1, offset=0x0, size=Op.DUP1))
-            + Op.ADD
-            + Op.RETURN
-        ),
+    contract_23 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.PUSH2[0x1388]
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.PUSH3[0xC0DE1]
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.POP(
+            Op.CREATE2(value=Op.DUP1, offset=Op.DUP2, size=Op.DUP2, salt=0x0)
+        )
+        + Op.ADD
+        + Op.RETURN,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000007b"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000008B),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
@@ -930,71 +816,63 @@ def test_create_oog_from_call_refunds(
     #   let initcodeaddr := 0x00000000000000000000000000000000000c0de1
     #   let initcodelength := extcodesize(initcodeaddr)
     #   extcodecopy(initcodeaddr, 0, 0, initcodelength)
-    #   pop(create(0, 0, initcodelength))
+    #   pop(create2(0, 0, initcodelength, 0))
     #   invalid()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.PUSH1[0x0]
-            + Op.PUSH3[0xC0DE1]
-            + Op.DUP2
-            + Op.EXTCODESIZE(address=Op.DUP2)
-            + Op.SWAP3
-            + Op.DUP4
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.POP(Op.CREATE)
-            + Op.INVALID
-        ),
+    contract_24 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.PUSH3[0xC0DE1]
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.DUP2
+        + Op.DUP1
+        + Op.POP(Op.CREATE2)
+        + Op.INVALID,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000007c"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000008C),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
     #   sstore(1, 0)
     #   let initcodeaddr := 0x00000000000000000000000000000000000c0de1
-    #   //let initcodelength := extcodesize(initcodeaddr)
-    #   //extcodecopy(initcodeaddr, 0, 0, initcodelength)
-    #
-    #   // protection from solc version changing init code
-    #   let initcodelength := 15
-    #   mstore(0, 0x6001600055600060005560016000f30000000000000000000000000000000000)  # noqa: E501
-    #
-    #   pop(create2(0, 0, initcodelength, 0))
-    #   return(add(initcodelength, 1), 1)
+    #   let initcodelength := extcodesize(initcodeaddr)
+    #   extcodecopy(initcodeaddr, 0, 0, initcodelength)
+    #   pop(create(0, 0, initcodelength))
+    #   return(add(initcodelength, 1), 5000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x1]
-            + Op.PUSH1[0x0]
-            + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
-            + Op.SSTORE(key=Op.DUP3, value=Op.DUP1)
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=0x6001600055600060005560016000F30000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.PUSH1[0xF]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.DUP2
-            + Op.DUP1
-            + Op.POP(Op.CREATE2)
-            + Op.ADD
-            + Op.RETURN
-        ),
+    contract_20 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.PUSH2[0x1388]
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.PUSH3[0xC0DE1]
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.POP(Op.CREATE(value=Op.DUP1, offset=0x0, size=Op.DUP1))
+        + Op.ADD
+        + Op.RETURN,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000008a"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000007B),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
@@ -1002,36 +880,30 @@ def test_create_oog_from_call_refunds(
     #   let initcodeaddr := 0x00000000000000000000000000000000000c0de1
     #   let initcodelength := extcodesize(initcodeaddr)
     #   extcodecopy(initcodeaddr, 0, 0, initcodelength)
-    #   pop(create2(0, 0, initcodelength, 0))
-    #   return(add(initcodelength, 1), 5000)
+    #   pop(create(0, 0, initcodelength))
+    #   invalid()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.PUSH2[0x1388]
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x0]
-            + Op.PUSH3[0xC0DE1]
-            + Op.DUP2
-            + Op.EXTCODESIZE(address=Op.DUP2)
-            + Op.SWAP3
-            + Op.DUP4
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.POP(
-                Op.CREATE2(
-                    value=Op.DUP1, offset=Op.DUP2, size=Op.DUP2, salt=0x0
-                ),
-            )
-            + Op.ADD
-            + Op.RETURN
-        ),
+    contract_21 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.PUSH1[0x0]
+        + Op.PUSH3[0xC0DE1]
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.POP(Op.CREATE)
+        + Op.INVALID,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000008b"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000007C),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   sstore(0, 1)
     #   sstore(1, 1)
@@ -1039,143 +911,197 @@ def test_create_oog_from_call_refunds(
     #   let initcodeaddr := 0x00000000000000000000000000000000000c0de1
     #   let initcodelength := extcodesize(initcodeaddr)
     #   extcodecopy(initcodeaddr, 0, 0, initcodelength)
-    #   pop(create2(0, 0, initcodelength, 0))
-    #   invalid()
+    #   pop(create(0, 0, initcodelength))
+    #   return(add(initcodelength, 1), 1)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(key=Op.DUP1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.PUSH3[0xC0DE1]
-            + Op.DUP2
-            + Op.EXTCODESIZE(address=Op.DUP2)
-            + Op.SWAP3
-            + Op.DUP4
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.DUP2
-            + Op.DUP1
-            + Op.POP(Op.CREATE2)
-            + Op.INVALID
-        ),
+    contract_19 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
+        + Op.SSTORE(key=Op.DUP3, value=Op.DUP1)
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.PUSH3[0xC0DE1]
+        + Op.EXTCODESIZE(address=Op.DUP1)
+        + Op.SWAP2
+        + Op.DUP3
+        + Op.SWAP2
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.EXTCODECOPY
+        + Op.POP(Op.CREATE(value=Op.DUP1, offset=0x0, size=Op.DUP1))
+        + Op.ADD
+        + Op.RETURN,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000008c"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #   mstore(0, 0xff)
-    #   log0(0, 32)
-    #   log1(0, 32, 0xfa)
-    #   log2(0, 32, 0xfa, 0xfb)
-    #   log3(0, 32, 0xfa, 0xfb, 0xfc)
-    #   log4(0, 32, 0xfa, 0xfb, 0xfc, 0xfd)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xFF)
-            + Op.LOG0(offset=0x0, size=0x20)
-            + Op.LOG1(offset=0x0, size=0x20, topic_1=0xFA)
-            + Op.LOG2(offset=0x0, size=0x20, topic_1=0xFA, topic_2=0xFB)
-            + Op.LOG3(
-                offset=0x0,
-                size=0x20,
-                topic_1=0xFA,
-                topic_2=0xFB,
-                topic_3=0xFC,
-            )
-            + Op.LOG4(
-                offset=0x0,
-                size=0x20,
-                topic_1=0xFA,
-                topic_2=0xFB,
-                topic_3=0xFC,
-                topic_4=0xFD,
-            )
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
-        address=Address("0x00000000000000000000000000000000000c0de0"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #   sstore(0, 1)
-    #   sstore(0, 0)
-    #   return(0, 1)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.SSTORE(key=Op.DUP1, value=Op.DUP1)
-            + Op.PUSH1[0x1]
-            + Op.SWAP1
-            + Op.RETURN
-        ),
-        address=Address("0x00000000000000000000000000000000000c0de1"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #   // Simple SSTORE to zero to get a refund
-    #   sstore(1, 0)
-    # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
-        storage={0x1: 0x1},
-        address=Address("0x00000000000000000000000000000000000c0dea"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #   selfdestruct(origin())
-    # }
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=Op.ORIGIN),
-        storage={0x1: 0x1},
-        address=Address("0x00000000000000000000000000000000000c0ded"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x3D0900, nonce=1)
-    # Source: Yul
-    # {
-    #   let init_addr := calldataload(4)
-    #   let init_length := extcodesize(init_addr)
-    #   extcodecopy(init_addr, 0, 0, init_length)
-    #   let created_addr := create(0, 0, init_length)
-    #   if eq(created_addr, 0) {
-    #     /* This invalid will deplete the remaining gas to make refund check deterministic */  # noqa: E501
-    #     invalid()
-    #   }
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.DUP2
-            + Op.EXTCODESIZE(address=Op.DUP2)
-            + Op.SWAP3
-            + Op.DUP4
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.DUP2
-            + Op.JUMPI(pc=0x15, condition=Op.EQ(Op.CREATE, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.INVALID
-        ),
-        address=Address("0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000007A),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 9, 3, 6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=2),
+                compute_create_address(address=contract_0, nonce=1): Account(
+                    storage={0: 1}, code=bytes.fromhex("00"), nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {
+                "data": [1, 2, 4, 5, 7, 8, 10, 11],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(balance=0, nonce=2),
+                compute_create_address(
+                    address=contract_0, nonce=1
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [12], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=2),
+                compute_create_address(address=contract_0, nonce=1): Account(
+                    storage={0: 1}, code=bytes.fromhex("00"), nonce=1
+                ),
+                contract_26: Account(balance=0, nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": [13, 14], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(balance=0, nonce=2),
+                compute_create_address(
+                    address=contract_0, nonce=1
+                ): Account.NONEXISTENT,
+                contract_26: Account(
+                    storage={1: 1}, code=bytes.fromhex("32ff"), nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [15], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=2),
+                compute_create_address(address=contract_0, nonce=1): Account(
+                    storage={0: 1}, code=bytes.fromhex("00"), nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [16, 17], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(balance=0, nonce=2),
+                compute_create_address(
+                    address=contract_0, nonce=1
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [18], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=2),
+                compute_create_address(address=contract_0, nonce=1): Account(
+                    storage={0: 1}, code=bytes.fromhex("00"), nonce=2
+                ),
+                compute_create_address(
+                    address=compute_create_address(
+                        address=contract_0, nonce=1
+                    ),
+                    nonce=1,
+                ): Account(storage={}, code=bytes.fromhex("00"), nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": [19, 20], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(balance=0, nonce=2),
+                compute_create_address(
+                    address=contract_0, nonce=1
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=compute_create_address(
+                        address=contract_0, nonce=1
+                    ),
+                    nonce=1,
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [21], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=2),
+                compute_create_address(address=contract_0, nonce=1): Account(
+                    storage={0: 1}, code=bytes.fromhex("00"), nonce=2
+                ),
+                Address(0x06019547B6E360ABDAFEADE158A9667CC6106C17): Account(
+                    storage={}, code=bytes.fromhex("00"), nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [22, 23], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(balance=0, nonce=2),
+                compute_create_address(
+                    address=contract_0, nonce=1
+                ): Account.NONEXISTENT,
+                Address(
+                    0x06019547B6E360ABDAFEADE158A9667CC6106C17
+                ): Account.NONEXISTENT,
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(contract_1, left_padding=True),
+        Bytes("693c6139") + Hash(contract_2, left_padding=True),
+        Bytes("693c6139") + Hash(contract_3, left_padding=True),
+        Bytes("693c6139") + Hash(contract_4, left_padding=True),
+        Bytes("693c6139") + Hash(contract_5, left_padding=True),
+        Bytes("693c6139") + Hash(contract_6, left_padding=True),
+        Bytes("693c6139") + Hash(contract_7, left_padding=True),
+        Bytes("693c6139") + Hash(contract_8, left_padding=True),
+        Bytes("693c6139") + Hash(contract_9, left_padding=True),
+        Bytes("693c6139") + Hash(contract_10, left_padding=True),
+        Bytes("693c6139") + Hash(contract_11, left_padding=True),
+        Bytes("693c6139") + Hash(contract_12, left_padding=True),
+        Bytes("693c6139") + Hash(contract_13, left_padding=True),
+        Bytes("693c6139") + Hash(contract_14, left_padding=True),
+        Bytes("693c6139") + Hash(contract_15, left_padding=True),
+        Bytes("693c6139") + Hash(contract_16, left_padding=True),
+        Bytes("693c6139") + Hash(contract_17, left_padding=True),
+        Bytes("693c6139") + Hash(contract_18, left_padding=True),
+        Bytes("693c6139") + Hash(contract_19, left_padding=True),
+        Bytes("693c6139") + Hash(contract_20, left_padding=True),
+        Bytes("693c6139") + Hash(contract_21, left_padding=True),
+        Bytes("693c6139") + Hash(contract_22, left_padding=True),
+        Bytes("693c6139") + Hash(contract_23, left_padding=True),
+        Bytes("693c6139") + Hash(contract_24, left_padding=True),
+    ]
+    tx_gas = [400000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=400000,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_results.py b/tests/ported_static/stCreateTest/test_create_results.py
index 9cd26b8f943..67af6122a4d 100644
--- a/tests/ported_static/stCreateTest/test_create_results.py
+++ b/tests/ported_static/stCreateTest/test_create_results.py
@@ -2,7 +2,7 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stCreateTest/CreateResultsFiller.yml
+state_tests/stCreateTest/CreateResultsFiller.yml
 """
 
 import pytest
@@ -11,10 +11,16 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,415 +28,183 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stCreateTest/CreateResultsFiller.yml"],
+    ["state_tests/stCreateTest/CreateResultsFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000060a7"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={32: 295, 33: 551}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        18: 18,
-                        19: 0x600060006000600060006160A761FFFFF1000000000000000000000000000000,  # noqa: E501
-                        20: 24743,
-                        21: 24743,
-                        32: 295,
-                        33: 551,
-                    }
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        18: 18,
-                        19: 0x600060006000600060006160A761FFFFF1000000000000000000000000000000,  # noqa: E501
-                        20: 24743,
-                        21: 24743,
-                        32: 295,
-                        33: 551,
-                    }
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        18: 18,
-                        19: 0x600060006000600060006160A761FFFFF1000000000000000000000000000000,  # noqa: E501
-                        20: 24743,
-                        21: 24743,
-                        32: 295,
-                        33: 551,
-                    }
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        18: 18,
-                        19: 0x600060006000600060006160A761FFFFF1000000000000000000000000000000,  # noqa: E501
-                        20: 24743,
-                        21: 24743,
-                        32: 295,
-                        33: 551,
-                    }
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        18: 18,
-                        19: 0x600060006000600060006160A761FFFFF1000000000000000000000000000000,  # noqa: E501
-                        20: 24743,
-                        21: 24743,
-                        32: 295,
-                        33: 551,
-                    }
-                )
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        18: 18,
-                        19: 0x600060006000600060006160A761FFFFF1000000000000000000000000000000,  # noqa: E501
-                        20: 24743,
-                        21: 24743,
-                        32: 295,
-                        33: 551,
-                    }
-                )
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        16: 32,
-                        17: 24743,
-                        18: 18,
-                        19: 0x600060006000600060006160A761FFFFF1000000000000000000000000000000,  # noqa: E501
-                        20: 24743,
-                        21: 24743,
-                        32: 295,
-                        33: 551,
-                    }
-                )
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        16: 32,
-                        17: 24743,
-                        18: 18,
-                        19: 0x600060006000600060006160A761FFFFF1000000000000000000000000000000,  # noqa: E501
-                        20: 24743,
-                        21: 24743,
-                        32: 295,
-                        33: 551,
-                    }
-                )
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        16: 24743,
-                        18: 24743,
-                        19: 24743,
-                        20: 24743,
-                        21: 24743,
-                        32: 24743,
-                        33: 24743,
-                    }
-                )
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        16: 24743,
-                        18: 24743,
-                        19: 24743,
-                        20: 24743,
-                        21: 24743,
-                        32: 24743,
-                        33: 24743,
-                    }
-                )
-            },
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000060a7"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={32: 295, 33: 551}
-                ),
-            },
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        16: 24743,
-                        18: 24743,
-                        19: 24743,
-                        20: 24743,
-                        21: 24743,
-                        32: 24743,
-                        33: 24743,
-                    }
-                )
-            },
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        16: 24743,
-                        18: 24743,
-                        19: 24743,
-                        20: 24743,
-                        21: 24743,
-                        32: 24743,
-                        33: 24743,
-                    }
-                )
-            },
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        16: 24743,
-                        18: 24743,
-                        19: 24743,
-                        20: 24743,
-                        21: 24743,
-                        32: 24743,
-                        33: 24743,
-                    }
-                )
-            },
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        16: 24743,
-                        18: 24743,
-                        19: 24743,
-                        20: 24743,
-                        21: 24743,
-                        32: 24743,
-                        33: 24743,
-                    }
-                )
-            },
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        16: 24743,
-                        18: 24743,
-                        19: 24743,
-                        20: 24743,
-                        21: 24743,
-                        32: 24743,
-                        33: 24743,
-                    }
-                )
-            },
+        pytest.param(
+            16,
+            0,
+            0,
+            id="d16",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        16: 24743,
-                        18: 24743,
-                        19: 24743,
-                        20: 24743,
-                        21: 24743,
-                        32: 24743,
-                        33: 24743,
-                    }
-                )
-            },
+        pytest.param(
+            17,
+            0,
+            0,
+            id="d17",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000060a7"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={32: 295, 33: 551}
-                ),
-            },
+        pytest.param(
+            18,
+            0,
+            0,
+            id="d18",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={32: 295, 33: 551}
-                )
-            },
+        pytest.param(
+            19,
+            0,
+            0,
+            id="d19",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000060a7"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={32: 295, 33: 551}
-                ),
-            },
+        pytest.param(
+            20,
+            0,
+            0,
+            id="d20",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000060a7"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={32: 295, 33: 551}
-                ),
-            },
+        pytest.param(
+            21,
+            0,
+            0,
+            id="d21",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x00000000000000000000000000000000000060a7"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={32: 295, 33: 551}
-                ),
-            },
+        pytest.param(
+            22,
+            0,
+            0,
+            id="d22",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={32: 295, 33: 551}
-                )
-            },
+        pytest.param(
+            23,
+            0,
+            0,
+            id="d23",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        18: 18,
-                        19: 0x600060006000600060006160A761FFFFF1000000000000000000000000000000,  # noqa: E501
-                        20: 24743,
-                        21: 24743,
-                        32: 295,
-                        33: 551,
-                    }
-                )
-            },
+        pytest.param(
+            24,
+            0,
+            0,
+            id="d24",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={
-                        18: 18,
-                        19: 0x600060006000600060006160A761FFFFF1000000000000000000000000000000,  # noqa: E501
-                        20: 24743,
-                        21: 24743,
-                        32: 295,
-                        33: 551,
-                    }
-                )
-            },
+        pytest.param(
+            25,
+            0,
+            0,
+            id="d25",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_results(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    contract_1 = Address(0x00000000000000000000000000000000000060A7)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -444,18 +218,8 @@ def test_create_results(
         gas_limit=4294967296,
     )
 
-    # Source: LLL
-    # {
-    #   [[0]] 0x60A7
-    # }   ; end of LLL code
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=0x60A7) + Op.STOP,
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x00000000000000000000000000000000000060a7"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
+    # Source: lll
     # {
     #   ; Variables are 0x20 bytes (= 256 bits) apart, except for
     #   ; code buffers that get 0x100 (256 bytes)
@@ -487,361 +251,464 @@ def test_create_results(
     #   )
     #   ; I did not want to rely on knowing the address at which the contract
     # ... (138 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x100, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x140, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x2F],
-                condition=Op.OR(
-                    Op.EQ(Op.MLOAD(offset=0x140), 0x0),
-                    Op.EQ(Op.MLOAD(offset=0x140), 0x4),
-                ),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x3E])
-            + Op.JUMPDEST
-            + Op.PUSH1[0x21]
-            + Op.CODECOPY(dest_offset=0x300, offset=0x250, size=Op.DUP1)
-            + Op.PUSH2[0x540]
-            + Op.MSTORE
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x51],
-                condition=Op.EQ(Op.MLOAD(offset=0x140), 0x1),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x60])
-            + Op.JUMPDEST
-            + Op.PUSH1[0x29]
-            + Op.CODECOPY(dest_offset=0x300, offset=0x271, size=Op.DUP1)
-            + Op.PUSH2[0x540]
-            + Op.MSTORE
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x73],
-                condition=Op.EQ(Op.MLOAD(offset=0x140), 0x2),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x82])
-            + Op.JUMPDEST
-            + Op.PUSH1[0x26]
-            + Op.CODECOPY(dest_offset=0x300, offset=0x29A, size=Op.DUP1)
-            + Op.PUSH2[0x540]
-            + Op.MSTORE
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x95],
-                condition=Op.EQ(Op.MLOAD(offset=0x140), 0x3),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xA4])
-            + Op.JUMPDEST
-            + Op.PUSH1[0x2C]
-            + Op.CODECOPY(dest_offset=0x300, offset=0x2C0, size=Op.DUP1)
-            + Op.PUSH2[0x540]
-            + Op.MSTORE
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xB7],
-                condition=Op.EQ(Op.MLOAD(offset=0x140), 0x5),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xC6])
-            + Op.JUMPDEST
-            + Op.PUSH1[0x28]
-            + Op.CODECOPY(dest_offset=0x300, offset=0x2EC, size=Op.DUP1)
-            + Op.PUSH2[0x540]
-            + Op.MSTORE
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xD9],
-                condition=Op.EQ(Op.MLOAD(offset=0x140), 0x6),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xE8])
-            + Op.JUMPDEST
-            + Op.PUSH1[0x2A]
-            + Op.CODECOPY(dest_offset=0x300, offset=0x314, size=Op.DUP1)
-            + Op.PUSH2[0x540]
-            + Op.MSTORE
-            + Op.JUMPDEST
-            + Op.PUSH1[0x12]
-            + Op.CODECOPY(dest_offset=0x200, offset=0x33E, size=Op.DUP1)
-            + Op.PUSH2[0x520]
-            + Op.MSTORE
-            + Op.JUMPI(pc=0x117, condition=Op.EQ(Op.MLOAD(offset=0x100), 0x1))
-            + Op.MSTORE(
-                offset=0x600,
-                value=Op.CREATE2(
-                    value=0x0,
-                    offset=0x300,
-                    size=Op.MLOAD(offset=0x540),
-                    salt=0x5A17,
-                ),
-            )
-            + Op.JUMP(pc=0x126)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x600,
-                value=Op.CREATE(
-                    value=0x0,
-                    offset=0x300,
-                    size=Op.MLOAD(offset=0x540),
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x20, value=Op.PC)
-            + Op.SSTORE(key=0x10, value=Op.RETURNDATASIZE)
-            + Op.JUMPI(
-                pc=0x143,
-                condition=Op.OR(
-                    Op.RETURNDATASIZE,
-                    Op.EQ(Op.MLOAD(offset=0x140), 0x4),
-                ),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x153)
-            + Op.JUMPDEST
-            + Op.RETURNDATACOPY(dest_offset=0x160, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x11, value=Op.MLOAD(offset=0x160))
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x560,
-                value=Op.EXTCODESIZE(address=Op.MLOAD(offset=0x600)),
-            )
-            + Op.EXTCODECOPY(
-                address=Op.MLOAD(offset=0x600),
-                dest_offset=0x400,
-                offset=0x0,
-                size=Op.MLOAD(offset=0x560),
-            )
-            + Op.SSTORE(
-                key=0x12,
-                value=Op.SUB(Op.MLOAD(offset=0x520), Op.MLOAD(offset=0x560)),
-            )
-            + Op.SSTORE(
-                key=0x13,
-                value=Op.SUB(Op.MLOAD(offset=0x200), Op.MLOAD(offset=0x400)),
-            )
-            + Op.JUMPI(pc=0x195, condition=Op.EQ(Op.MLOAD(offset=0x120), 0x1))
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x1AC)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x640,
-                value=Op.CALL(
-                    gas=0xFFFF,
-                    address=Op.MLOAD(offset=0x600),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x1BF, condition=Op.EQ(Op.MLOAD(offset=0x120), 0x2))
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x1D6)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x640,
-                value=Op.CALLCODE(
-                    gas=0xFFFF,
-                    address=Op.MLOAD(offset=0x600),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x1E9, condition=Op.EQ(Op.MLOAD(offset=0x120), 0x3))
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x1FE)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x640,
-                value=Op.DELEGATECALL(
-                    gas=0xFFFF,
-                    address=Op.MLOAD(offset=0x600),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x211, condition=Op.EQ(Op.MLOAD(offset=0x120), 0x4))
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x226)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x640,
-                value=Op.STATICCALL(
-                    gas=0xFFFF,
-                    address=Op.MLOAD(offset=0x600),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x21, value=Op.PC)
-            + Op.JUMPI(
-                pc=0x23E,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x120), 0x0)),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x24D)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x14, value=Op.SUB(Op.MLOAD(offset=0x640), 0x1))
-            + Op.SSTORE(key=0x15, value=Op.RETURNDATASIZE)
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.INVALID
-            + Op.PUSH1[0x12]
-            + Op.CODECOPY(dest_offset=0x200, offset=0xF, size=Op.DUP1)
-            + Op.PUSH2[0x200]
-            + Op.RETURN
-            + Op.STOP
-            + Op.INVALID
-            + Op.CALL(
-                gas=0xFFFF,
-                address=0x60A7,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-            + Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.PUSH1[0x12]
-            + Op.CODECOPY(dest_offset=0x200, offset=0x17, size=Op.DUP1)
-            + Op.PUSH2[0x200]
-            + Op.RETURN
-            + Op.STOP
-            + Op.INVALID
-            + Op.CALL(
-                gas=0xFFFF,
-                address=0x60A7,
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x100, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x140, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x2F],
+            condition=Op.OR(
+                Op.EQ(Op.MLOAD(offset=0x140), 0x0),
+                Op.EQ(Op.MLOAD(offset=0x140), 0x4),
+            ),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x3E])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x21]
+        + Op.CODECOPY(dest_offset=0x300, offset=0x250, size=Op.DUP1)
+        + Op.PUSH2[0x540]
+        + Op.MSTORE
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x51], condition=Op.EQ(Op.MLOAD(offset=0x140), 0x1)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x60])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x29]
+        + Op.CODECOPY(dest_offset=0x300, offset=0x271, size=Op.DUP1)
+        + Op.PUSH2[0x540]
+        + Op.MSTORE
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x73], condition=Op.EQ(Op.MLOAD(offset=0x140), 0x2)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x82])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x26]
+        + Op.CODECOPY(dest_offset=0x300, offset=0x29A, size=Op.DUP1)
+        + Op.PUSH2[0x540]
+        + Op.MSTORE
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x95], condition=Op.EQ(Op.MLOAD(offset=0x140), 0x3)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xA4])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x2C]
+        + Op.CODECOPY(dest_offset=0x300, offset=0x2C0, size=Op.DUP1)
+        + Op.PUSH2[0x540]
+        + Op.MSTORE
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xB7], condition=Op.EQ(Op.MLOAD(offset=0x140), 0x5)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xC6])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x28]
+        + Op.CODECOPY(dest_offset=0x300, offset=0x2EC, size=Op.DUP1)
+        + Op.PUSH2[0x540]
+        + Op.MSTORE
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xD9], condition=Op.EQ(Op.MLOAD(offset=0x140), 0x6)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xE8])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x2A]
+        + Op.CODECOPY(dest_offset=0x300, offset=0x314, size=Op.DUP1)
+        + Op.PUSH2[0x540]
+        + Op.MSTORE
+        + Op.JUMPDEST
+        + Op.PUSH1[0x12]
+        + Op.CODECOPY(dest_offset=0x200, offset=0x33E, size=Op.DUP1)
+        + Op.PUSH2[0x520]
+        + Op.MSTORE
+        + Op.JUMPI(pc=0x117, condition=Op.EQ(Op.MLOAD(offset=0x100), 0x1))
+        + Op.MSTORE(
+            offset=0x600,
+            value=Op.CREATE2(
                 value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-            + Op.REVERT(offset=0x0, size=0x0)
-            + Op.PUSH1[0x12]
-            + Op.CODECOPY(dest_offset=0x200, offset=0x14, size=Op.DUP1)
-            + Op.PUSH2[0x200]
-            + Op.RETURN
-            + Op.STOP
-            + Op.INVALID
-            + Op.CALL(
-                gas=0xFFFF,
-                address=0x60A7,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-            + Op.MSTORE(offset=0x0, value=0x60A7)
-            + Op.REVERT(offset=0x0, size=0x20)
-            + Op.PUSH1[0x12]
-            + Op.CODECOPY(dest_offset=0x200, offset=0x1A, size=Op.DUP1)
-            + Op.PUSH2[0x200]
-            + Op.RETURN
-            + Op.STOP
-            + Op.INVALID
-            + Op.CALL(
+                offset=0x300,
+                size=Op.MLOAD(offset=0x540),
+                salt=0x5A17,
+            ),
+        )
+        + Op.JUMP(pc=0x126)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x600,
+            value=Op.CREATE(
+                value=0x0, offset=0x300, size=Op.MLOAD(offset=0x540)
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x20, value=Op.PC)
+        + Op.SSTORE(key=0x10, value=Op.RETURNDATASIZE)
+        + Op.JUMPI(
+            pc=0x143,
+            condition=Op.OR(
+                Op.RETURNDATASIZE, Op.EQ(Op.MLOAD(offset=0x140), 0x4)
+            ),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x153)
+        + Op.JUMPDEST
+        + Op.RETURNDATACOPY(dest_offset=0x160, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x11, value=Op.MLOAD(offset=0x160))
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x560, value=Op.EXTCODESIZE(address=Op.MLOAD(offset=0x600))
+        )
+        + Op.EXTCODECOPY(
+            address=Op.MLOAD(offset=0x600),
+            dest_offset=0x400,
+            offset=0x0,
+            size=Op.MLOAD(offset=0x560),
+        )
+        + Op.SSTORE(
+            key=0x12,
+            value=Op.SUB(Op.MLOAD(offset=0x520), Op.MLOAD(offset=0x560)),
+        )
+        + Op.SSTORE(
+            key=0x13,
+            value=Op.SUB(Op.MLOAD(offset=0x200), Op.MLOAD(offset=0x400)),
+        )
+        + Op.JUMPI(pc=0x195, condition=Op.EQ(Op.MLOAD(offset=0x120), 0x1))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x1AC)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x640,
+            value=Op.CALL(
                 gas=0xFFFF,
-                address=0x60A7,
+                address=Op.MLOAD(offset=0x600),
                 value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-            + Op.MSTORE(offset=0x0, value=0x60A7)
-            + Op.STOP
-            + Op.PUSH1[0x12]
-            + Op.CODECOPY(dest_offset=0x200, offset=0x16, size=Op.DUP1)
-            + Op.PUSH2[0x200]
-            + Op.RETURN
-            + Op.STOP
-            + Op.INVALID
-            + Op.CALL(
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1BF, condition=Op.EQ(Op.MLOAD(offset=0x120), 0x2))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x1D6)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x640,
+            value=Op.CALLCODE(
                 gas=0xFFFF,
-                address=0x60A7,
+                address=Op.MLOAD(offset=0x600),
                 value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-            + Op.MSTORE(offset=0x0, value=0x60A7)
-            + Op.SELFDESTRUCT(address=0x0)
-            + Op.PUSH1[0x12]
-            + Op.CODECOPY(dest_offset=0x200, offset=0x18, size=Op.DUP1)
-            + Op.PUSH2[0x200]
-            + Op.RETURN
-            + Op.STOP
-            + Op.INVALID
-            + Op.CALL(
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1E9, condition=Op.EQ(Op.MLOAD(offset=0x120), 0x3))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x1FE)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x640,
+            value=Op.DELEGATECALL(
                 gas=0xFFFF,
-                address=0x60A7,
-                value=0x0,
+                address=Op.MLOAD(offset=0x600),
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-            + Op.CALL(
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x211, condition=Op.EQ(Op.MLOAD(offset=0x120), 0x4))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x226)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x640,
+            value=Op.STATICCALL(
                 gas=0xFFFF,
-                address=0x60A7,
-                value=0x0,
+                address=Op.MLOAD(offset=0x600),
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x21, value=Op.PC)
+        + Op.JUMPI(
+            pc=0x23E, condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x120), 0x0))
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x24D)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x14, value=Op.SUB(Op.MLOAD(offset=0x640), 0x1))
+        + Op.SSTORE(key=0x15, value=Op.RETURNDATASIZE)
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.INVALID
+        + Op.PUSH1[0x12]
+        + Op.CODECOPY(dest_offset=0x200, offset=0xF, size=Op.DUP1)
+        + Op.PUSH2[0x200]
+        + Op.RETURN
+        + Op.STOP
+        + Op.INVALID
+        + Op.CALL(
+            gas=0xFFFF,
+            address=0x60A7,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP
+        + Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.PUSH1[0x12]
+        + Op.CODECOPY(dest_offset=0x200, offset=0x17, size=Op.DUP1)
+        + Op.PUSH2[0x200]
+        + Op.RETURN
+        + Op.STOP
+        + Op.INVALID
+        + Op.CALL(
+            gas=0xFFFF,
+            address=0x60A7,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP
+        + Op.REVERT(offset=0x0, size=0x0)
+        + Op.PUSH1[0x12]
+        + Op.CODECOPY(dest_offset=0x200, offset=0x14, size=Op.DUP1)
+        + Op.PUSH2[0x200]
+        + Op.RETURN
+        + Op.STOP
+        + Op.INVALID
+        + Op.CALL(
+            gas=0xFFFF,
+            address=0x60A7,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP
+        + Op.MSTORE(offset=0x0, value=0x60A7)
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.PUSH1[0x12]
+        + Op.CODECOPY(dest_offset=0x200, offset=0x1A, size=Op.DUP1)
+        + Op.PUSH2[0x200]
+        + Op.RETURN
+        + Op.STOP
+        + Op.INVALID
+        + Op.CALL(
+            gas=0xFFFF,
+            address=0x60A7,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP
+        + Op.MSTORE(offset=0x0, value=0x60A7)
+        + Op.STOP
+        + Op.PUSH1[0x12]
+        + Op.CODECOPY(dest_offset=0x200, offset=0x16, size=Op.DUP1)
+        + Op.PUSH2[0x200]
+        + Op.RETURN
+        + Op.STOP
+        + Op.INVALID
+        + Op.CALL(
+            gas=0xFFFF,
+            address=0x60A7,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP
+        + Op.MSTORE(offset=0x0, value=0x60A7)
+        + Op.SELFDESTRUCT(address=0x0)
+        + Op.PUSH1[0x12]
+        + Op.CODECOPY(dest_offset=0x200, offset=0x18, size=Op.DUP1)
+        + Op.PUSH2[0x200]
+        + Op.RETURN
+        + Op.STOP
+        + Op.INVALID
+        + Op.CALL(
+            gas=0xFFFF,
+            address=0x60A7,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP
+        + Op.CALL(
+            gas=0xFFFF,
+            address=0x60A7,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         storage={
-            0x10: 0x60A7,
-            0x12: 0x60A7,
-            0x13: 0x60A7,
-            0x14: 0x60A7,
-            0x15: 0x60A7,
-            0x20: 0x60A7,
-            0x21: 0x60A7,
+            16: contract_1,
+            18: contract_1,
+            19: contract_1,
+            20: contract_1,
+            21: contract_1,
+            32: contract_1,
+            33: contract_1,
         },
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   [[0]] 0x60A7
+    # }   ; end of LLL code
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x60A7) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000060A7),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 1, 2, 4, 5, 6], "gas": 0, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={32: 295, 33: 551}),
+                contract_1: Account(storage={0: contract_1}),
+            },
+        },
+        {
+            "indexes": {"data": [3, 7], "gas": 0, "value": 0},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={32: 295, 33: 551})},
+        },
+        {
+            "indexes": {
+                "data": [8, 9, 10, 11, 12, 13, 14, 15],
+                "gas": 0,
+                "value": 0,
+            },
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={
+                        18: 18,
+                        19: 0x600060006000600060006160A761FFFFF1000000000000000000000000000000,  # noqa: E501
+                        20: contract_1,
+                        21: contract_1,
+                        32: 295,
+                        33: 551,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [16, 17], "gas": 0, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={
+                        16: 32,
+                        17: contract_1,
+                        18: 18,
+                        19: 0x600060006000600060006160A761FFFFF1000000000000000000000000000000,  # noqa: E501
+                        20: contract_1,
+                        21: contract_1,
+                        32: 295,
+                        33: 551,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {
+                "data": [18, 19, 20, 21, 22, 23, 24, 25],
+                "gas": 0,
+                "value": 0,
+            },
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={
+                        16: contract_1,
+                        17: 0,
+                        18: contract_1,
+                        19: contract_1,
+                        20: contract_1,
+                        21: contract_1,
+                        32: contract_1,
+                        33: contract_1,
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x3) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x4) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x3) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x4) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x0) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x0) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x5),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x0) + Hash(0x5),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x6),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x0) + Hash(0x6),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x0) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x2) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x3) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x4) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x1) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x2) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x3) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x4) + Hash(0x4),
+    ]
+    tx_gas = [9437184]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=9437184,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_transaction_call_data.py b/tests/ported_static/stCreateTest/test_create_transaction_call_data.py
index 8df77ac053f..e30600d6af6 100644
--- a/tests/ported_static/stCreateTest/test_create_transaction_call_data.py
+++ b/tests/ported_static/stCreateTest/test_create_transaction_call_data.py
@@ -1,57 +1,72 @@
 """
-Tests if CALLDATALOAD, CALLDATACOPY, CODECOPY and CODESIZE work correctly...
+Tests if CALLDATALOAD, CALLDATACOPY, CODECOPY and CODESIZE work...
 
 call data is always empty in initcode context and "code" is initcode.
 
 Ported from:
-tests/static/state_tests/stCreateTest/CreateTransactionCallDataFiller.yml
+state_tests/stCreateTest/CreateTransactionCallDataFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
-    Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CreateTransactionCallDataFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CreateTransactionCallDataFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        ("6001600080376000516000556020600160003760005160015500", {}),
-        ("60003560005560213560015500", {}),
-        ("3860008039386000f3", {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="calldataload",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="calldatacopy",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="codecopy",
+        ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_transaction_call_data(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Tests if CALLDATALOAD, CALLDATACOPY, CODECOPY and CODESIZE work..."""
-    coinbase = Address("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    sender = pre.fund_eoa(amount=0x5AF3107A4000)
 
     env = Environment(
-        fee_recipient=coinbase,
+        fee_recipient=sender,
         number=1,
         timestamp=1000,
         prev_randao=0x20000,
@@ -59,17 +74,51 @@ def test_create_transaction_call_data(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0x5AF3107A4000)
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, code=b"", nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={},
+                    code=bytes.fromhex("3860008039386000f3"),
+                    nonce=1,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.SSTORE(key=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(key=0x1, value=Op.CALLDATALOAD(offset=0x21))
+        + Op.STOP,
+        Op.CALLDATACOPY(dest_offset=Op.DUP1, offset=0x0, size=0x1)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.CALLDATACOPY(dest_offset=0x0, offset=0x1, size=0x20)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        Op.CODECOPY(dest_offset=Op.DUP1, offset=0x0, size=Op.CODESIZE)
+        + Op.RETURN(offset=0x0, size=Op.CODESIZE),
+    ]
+    tx_gas = [100000]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=100000,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_transaction_high_nonce.py b/tests/ported_static/stCreateTest/test_create_transaction_high_nonce.py
index a81106dd2d8..6ba82dc452b 100644
--- a/tests/ported_static/stCreateTest/test_create_transaction_high_nonce.py
+++ b/tests/ported_static/stCreateTest/test_create_transaction_high_nonce.py
@@ -1,57 +1,67 @@
 """
-The test check if the create transaction is reject if the origin's nonce is...
+The test check if the create transaction is reject if the origin's...
 
 (and would overflow if increased by 1).
 
 Ported from:
-tests/static/state_tests/stCreateTest/CreateTransactionHighNonceFiller.yml
+state_tests/stCreateTest/CreateTransactionHighNonceFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
-    Account,
-    Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
     TransactionException,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CreateTransactionHighNonceFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CreateTransactionHighNonceFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value",
+    "d, g, v",
     [
-        0,
-        1,
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+            marks=pytest.mark.exception_test,
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+            marks=pytest.mark.exception_test,
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.exception_test
 def test_create_transaction_high_nonce(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """The test check if the create transaction is reject if the..."""
-    coinbase = Address("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """The test check if the create transaction is reject if the origin's..."""
+    sender = pre.fund_eoa(amount=0x5AF3107A4000, nonce=18446744073709551615)
 
     env = Environment(
-        fee_recipient=coinbase,
+        fee_recipient=sender,
         number=1,
         timestamp=1000,
         prev_randao=0x20000,
@@ -59,18 +69,33 @@ def test_create_transaction_high_nonce(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0x5AF3107A4000, nonce=18446744073709551615)
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.NONCE_IS_MAX
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.RETURN(offset=0x0, size=0x1),
+    ]
+    tx_gas = [90000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex("60016000f3"),
-        gas_limit=90000,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
         nonce=18446744073709551615,
-        value=tx_value,
         error=TransactionException.NONCE_IS_MAX,
     )
 
-    post: dict = {}
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_create_transaction_refund_ef.py b/tests/ported_static/stCreateTest/test_create_transaction_refund_ef.py
index 1a15e154854..a9d2329d3bb 100644
--- a/tests/ported_static/stCreateTest/test_create_transaction_refund_ef.py
+++ b/tests/ported_static/stCreateTest/test_create_transaction_refund_ef.py
@@ -1,8 +1,9 @@
 """
 Test combination of gas refund and EF-prefixed create transaction failure.
 
+
 Ported from:
-tests/static/state_tests/stCreateTest/CreateTransactionRefundEFFiller.yml
+state_tests/stCreateTest/CreateTransactionRefundEFFiller.yml
 """
 
 import pytest
@@ -14,6 +15,7 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,9 +24,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/CreateTransactionRefundEFFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/CreateTransactionRefundEFFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,13 +33,13 @@ def test_create_transaction_refund_ef(
     pre: Alloc,
 ) -> None:
     """Test combination of gas refund and EF-prefixed create transaction..."""
-    coinbase = Address("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    contract_0 = Address(0x00000000000000000000000000000000005EF94D)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
 
     env = Environment(
-        fee_recipient=coinbase,
+        fee_recipient=sender,
         number=1,
         timestamp=1000,
         prev_randao=0x20000,
@@ -47,29 +47,40 @@ def test_create_transaction_refund_ef(
         gas_limit=1000000,
     )
 
-    # Source: Yul
-    # {
+    pre[sender] = Account(balance=0x5AF3107A4000)
+    # Source: yul
+    # berlin {
     #   sstore(0,0)
     # }
-    contract = pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=Op.DUP1, value=0x0) + Op.STOP,
-        storage={0x0: 0x1},
+        storage={0: 1},
         nonce=0,
-        address=Address("0x00000000000000000000000000000000005ef94d"),  # noqa: E501
+        address=Address(0x00000000000000000000000000000000005EF94D),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5AF3107A4000)
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "600080808080625ef94d61c350f15060ef60005360016000f3"
-        ),
+        data=Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=contract_0,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE8(offset=0x0, value=0xEF)
+        + Op.RETURN(offset=0x0, size=0x1),
         gas_limit=100000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        contract_0: Account(storage={0: 1}),
+        compute_create_address(address=sender, nonce=0): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_transaction_collision_to_empty2.py b/tests/ported_static/stCreateTest/test_transaction_collision_to_empty2.py
index 786dd5e33b0..2e85f6b9b3c 100644
--- a/tests/ported_static/stCreateTest/test_transaction_collision_to_empty2.py
+++ b/tests/ported_static/stCreateTest/test_transaction_collision_to_empty2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_transaction_collision_to_empty2.
 
 Ported from:
-tests/static/state_tests/stCreateTest/TransactionCollisionToEmpty2Filler.json
+state_tests/stCreateTest/TransactionCollisionToEmpty2Filler.json
 """
 
 import pytest
@@ -15,57 +15,64 @@
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/TransactionCollisionToEmpty2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/TransactionCollisionToEmpty2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            600000,
+        pytest.param(
             0,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                )
-            },
+            0,
+            0,
+            id="-g0-v0",
         ),
-        (
-            600000,
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                )
-            },
+            id="-g0-v1",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1-v0",
+        ),
+        pytest.param(
+            0,
+            1,
+            1,
+            id="-g1-v1",
         ),
-        (54000, 0, {}),
-        (54000, 1, {}),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_transaction_collision_to_empty2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_transaction_collision_to_empty2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
-    contract = Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -76,17 +83,51 @@ def test_transaction_collision_to_empty2(
         gas_limit=10000000,
     )
 
-    pre[contract] = Account(balance=10, nonce=0)
     pre[sender] = Account(balance=0xE8D4A51000)
+    pre[contract_0] = Account(balance=10)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(storage={1: 1}, balance=10, nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": 1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(storage={1: 1}, balance=11, nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(storage={}, balance=10, nonce=0),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.SSTORE(key=0x1, value=0x1),
+    ]
+    tx_gas = [600000, 54000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex("6001600155"),
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_transaction_collision_to_empty_but_code.py b/tests/ported_static/stCreateTest/test_transaction_collision_to_empty_but_code.py
index 74a209c3bb1..36f9cdd064e 100644
--- a/tests/ported_static/stCreateTest/test_transaction_collision_to_empty_but_code.py
+++ b/tests/ported_static/stCreateTest/test_transaction_collision_to_empty_but_code.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_transaction_collision_to_empty_but_code.
 
 Ported from:
-tests/static/state_tests/stCreateTest
-TransactionCollisionToEmptyButCodeFiller.json
+state_tests/stCreateTest/TransactionCollisionToEmptyButCodeFiller.json
 """
 
 import pytest
@@ -16,37 +15,61 @@
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stCreateTest/TransactionCollisionToEmptyButCodeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stCreateTest/TransactionCollisionToEmptyButCodeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (600000, 0, {}),
-        (600000, 1, {}),
-        (54000, 0, {}),
-        (54000, 1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-g0-v1",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1-v0",
+        ),
+        pytest.param(
+            0,
+            1,
+            1,
+            id="-g1-v1",
+        ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_transaction_collision_to_empty_but_code(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_transaction_collision_to_empty_but_code."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -60,22 +83,57 @@ def test_transaction_collision_to_empty_but_code(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
+    pre[sender] = Account(balance=0xE8D4A51000)
+    # Source: raw
+    # 0x1122334455
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex("1122334455"),
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
+                    storage={1: 0},
+                    code=bytes.fromhex("1122334455"),
+                    nonce=0,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(
+                    storage={},
+                    code=bytes.fromhex("1122334455"),
+                    nonce=0,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.SSTORE(key=0x1, value=0x1),
+    ]
+    tx_gas = [600000, 54000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex("6001600155"),
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stCreateTest/test_transaction_collision_to_empty_but_nonce.py b/tests/ported_static/stCreateTest/test_transaction_collision_to_empty_but_nonce.py
index 1dea48a62b7..90368103d9b 100644
--- a/tests/ported_static/stCreateTest/test_transaction_collision_to_empty_but_nonce.py
+++ b/tests/ported_static/stCreateTest/test_transaction_collision_to_empty_but_nonce.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_transaction_collision_to_empty_but_nonce.
 
 Ported from:
-tests/static/state_tests/stCreateTest
-TransactionCollisionToEmptyButNonceFiller.json
+state_tests/stCreateTest/TransactionCollisionToEmptyButNonceFiller.json
 """
 
 import pytest
@@ -16,6 +15,8 @@
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
@@ -23,34 +24,54 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stCreateTest/TransactionCollisionToEmptyButNonceFiller.json",  # noqa: E501
+        "state_tests/stCreateTest/TransactionCollisionToEmptyButNonceFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (600000, 0, {}),
-        (600000, 1, {}),
-        (54000, 0, {}),
-        (54000, 1, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-g0-v1",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1-v0",
+        ),
+        pytest.param(
+            0,
+            1,
+            1,
+            id="-g1-v1",
+        ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_transaction_collision_to_empty_but_nonce(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_transaction_collision_to_empty_but_nonce."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
-    contract = Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -61,17 +82,26 @@ def test_transaction_collision_to_empty_but_nonce(
         gas_limit=10000000,
     )
 
-    pre[contract] = Account(balance=0, nonce=1)
     pre[sender] = Account(balance=0xE8D4A51000)
+    pre[contract_0] = Account(balance=0, nonce=1)
+
+    tx_data = [
+        Op.SSTORE(key=0x1, value=0x1),
+    ]
+    tx_gas = [600000, 54000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex("6001600155"),
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        sender: Account(nonce=1),
+        contract_0: Account(storage={1: 0}, nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/__init__.py b/tests/ported_static/stDelegatecallTestHomestead/__init__.py
index fde91181132..a009cddc163 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/__init__.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/__init__.py
@@ -1 +1 @@
-"""Tests ported from stDelegatecallTestHomestead."""
+"""Ported static tests: stDelegatecallTestHomestead."""  # noqa: N999
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_call1024_balance_too_low.py b/tests/ported_static/stDelegatecallTestHomestead/test_call1024_balance_too_low.py
index 9d998d6a719..ea046c78c62 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_call1024_balance_too_low.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_call1024_balance_too_low.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call1024_balance_too_low.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-Call1024BalanceTooLowFiller.json
+state_tests/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json",  # noqa: E501
+        "state_tests/stDelegatecallTestHomestead/Call1024BalanceTooLowFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,12 +33,9 @@ def test_call1024_balance_too_low(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    """Test_call1024_balance_too_low."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -50,40 +46,36 @@ def test_call1024_balance_too_low(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre[callee] = Account(balance=7000, nonce=0)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
     # { [[ 0 ]] (ADD @@0 1) [[ 1 ]] (DELEGATECALL 0xfffffffffff <contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xFFFFFFFFFFF,
-                    address=0xE7ADDF870A481E1A0829E5A67DEBD5B963861979,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xFFFFFFFFFFF,
+                address=0xE7ADDF870A481E1A0829E5A67DEBD5B963861979,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0xe7addf870a481e1a0829e5a67debd5b963861979"),  # noqa: E501
+        address=Address(0xE7ADDF870A481E1A0829E5A67DEBD5B963861979),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=17592186099592,
         value=10,
     )
 
-    post = {
-        contract: Account(storage={0: 1025, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1025, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_call1024_oog.py b/tests/ported_static/stDelegatecallTestHomestead/test_call1024_oog.py
index cb1ad0fd5bb..2eb7e09753e 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_call1024_oog.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_call1024_oog.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_call1024_oog.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead/Call1024OOGFiller.json
+state_tests/stDelegatecallTestHomestead/Call1024OOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,46 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stDelegatecallTestHomestead/Call1024OOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stDelegatecallTestHomestead/Call1024OOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            13120826,
-            {
-                Address("0x62c5c9278da01e6594d6fede061838cf5e597f2b"): Account(
-                    storage={0: 134, 1: 1, 2: 0x20B71}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
         ),
-        (
-            15720826,
-            {
-                Address("0x62c5c9278da01e6594d6fede061838cf5e597f2b"): Account(
-                    storage={0: 146, 1: 1, 2: 0x23A51}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_call1024_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    """Test_call1024_oog."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -72,45 +68,62 @@ def test_call1024_oog(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
     # { [[ 0 ]] (ADD @@0 1) [[ 1 ]] (DELEGATECALL (MUL (SUB (GAS) 10000) (SUB 1 (DIV @@0 1025))) <contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=Op.MUL(
-                        Op.SUB(Op.GAS, 0x2710),
-                        Op.SUB(0x1, Op.DIV(Op.SLOAD(key=0x0), 0x401)),
-                    ),
-                    address=0x62C5C9278DA01E6594D6FEDE061838CF5E597F2B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=Op.MUL(
+                    Op.SUB(Op.GAS, 0x2710),
+                    Op.SUB(0x1, Op.DIV(Op.SLOAD(key=0x0), 0x401)),
                 ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8)),
-            )
-            + Op.STOP
-        ),
+                address=0x62C5C9278DA01E6594D6FEDE061838CF5E597F2B,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2, value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8))
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0x62c5c9278da01e6594d6fede061838cf5e597f2b"),  # noqa: E501
+        address=Address(0x62C5C9278DA01E6594D6FEDE061838CF5E597F2B),  # noqa: E501
     )
-    pre[callee] = Account(balance=7000, nonce=0)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 134, 1: 1, 2: 0x20B71})},
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 146, 1: 1, 2: 0x23A51})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [13120826, 15720826]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_call1024_pre_calls.py b/tests/ported_static/stDelegatecallTestHomestead/test_call1024_pre_calls.py
index 7a730710105..79dc8d66b56 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_call1024_pre_calls.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_call1024_pre_calls.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call1024_pre_calls.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-Call1024PreCallsFiller.json
+state_tests/stDelegatecallTestHomestead/Call1024PreCallsFiller.json
 """
 
 import pytest
@@ -12,10 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,55 +27,48 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stDelegatecallTestHomestead/Call1024PreCallsFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stDelegatecallTestHomestead/Call1024PreCallsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            11937600034817,
-            {
-                Address("0x515e9a6500c10f0db92754d10136694bb188153b"): Account(
-                    storage={0: 1025, 1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
         ),
-        (
-            9214364837600034817,
-            {
-                Address("0x515e9a6500c10f0db92754d10136694bb188153b"): Account(
-                    storage={0: 1025, 1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
-        (
-            9381323795670,
-            {
-                Address("0x515e9a6500c10f0db92754d10136694bb188153b"): Account(
-                    storage={0: 989, 1: 1, 2: 1, 3: 1}
-                )
-            },
+        pytest.param(
+            0,
+            2,
+            0,
+            id="-g2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_call1024_pre_calls(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    """Test_call1024_pre_calls."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    addr = Address(0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0)
     sender = EOA(
         key=0xCC381C83857B17CA629268ED418E2915A0287B84EFE9CF2204C020302E83CDA0
     )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -83,61 +80,85 @@ def test_call1024_pre_calls(
     )
 
     pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    pre[addr] = Account(balance=7000)
+    # Source: lll
     # { [[ 2 ]] (CALL 0xffff <eoa:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 0 0 0) [[ 3 ]] (CALL 0xffff <eoa:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 0 0 0)  [[ 0 ]] (ADD @@0 1) [[ 1 ]] (DELEGATECALL 0xfffffffffff <contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xFFFF,
-                    address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.CALL(
-                    gas=0xFFFF,
-                    address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xFFFFFFFFFFF,
-                    address=0x515E9A6500C10F0DB92754D10136694BB188153B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xFFFF,
+                address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.CALL(
+                gas=0xFFFF,
+                address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xFFFFFFFFFFF,
+                address=0x515E9A6500C10F0DB92754D10136694BB188153B,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=2024,
         nonce=0,
-        address=Address("0x515e9a6500c10f0db92754d10136694bb188153b"),  # noqa: E501
+        address=Address(0x515E9A6500C10F0DB92754D10136694BB188153B),  # noqa: E501
     )
-    pre[callee] = Account(balance=7000, nonce=0)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 1025, 1: 1, 2: 0, 3: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": 2, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 989, 1: 1, 2: 1, 3: 1})},
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 1025, 1: 1, 2: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [11937600034817, 9214364837600034817, 9381323795670]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_call_lose_gas_oog.py b/tests/ported_static/stDelegatecallTestHomestead/test_call_lose_gas_oog.py
index 1462699a764..6c3d024c7a4 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_call_lose_gas_oog.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_call_lose_gas_oog.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_lose_gas_oog.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
+state_tests/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stDelegatecallTestHomestead/CallLoseGasOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,12 +30,9 @@ def test_call_lose_gas_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    """Test_call_lose_gas_oog."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,44 +43,39 @@ def test_call_lose_gas_oog(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
     # { [[ 0 ]] (ADD @@0 1) [[ 1 ]] (DELEGATECALL (ADD 1(MUL @@0 100000)) <contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x186A0)),
-                    address=0xBE855315B63D137B74D5EED6BE5CD9DDE6E2478D,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8)),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x186A0)),
+                address=0xBE855315B63D137B74D5EED6BE5CD9DDE6E2478D,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2, value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8))
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0xbe855315b63d137b74d5eed6be5cd9dde6e2478d"),  # noqa: E501
+        address=Address(0xBE855315B63D137B74D5EED6BE5CD9DDE6E2478D),  # noqa: E501
     )
-    pre[callee] = Account(balance=7000, nonce=0)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=200000,
         value=10,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 2: 1001}),
-    }
+    post = {target: Account(storage={0: 1, 2: 1001})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_call_output1.py b/tests/ported_static/stDelegatecallTestHomestead/test_call_output1.py
index 45356e20cc4..e5ab00975ff 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_call_output1.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_call_output1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_output1.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead/callOutput1Filler.json
+state_tests/stDelegatecallTestHomestead/callOutput1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stDelegatecallTestHomestead/callOutput1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stDelegatecallTestHomestead/callOutput1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_call_output1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_output1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -48,52 +47,54 @@ def test_call_output1(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (DELEGATECALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0) [[ 0 ]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0xBCC1197CCD23A97607F2F96D031F3432E0D16A02,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x6001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x79accf3a3f2d0e87beb2d0f72039a5aa27d46426"),  # noqa: E501
+        address=Address(0xBCC1197CCD23A97607F2F96D031F3432E0D16A02),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
+    # Source: lll
+    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (DELEGATECALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0) [[ 0 ]] (MLOAD 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
+        address=Address(0x79ACCF3A3F2D0E87BEB2D0F72039A5AA27D46426),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=900000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
         ),
+        addr: Account(storage={}),
+        sender: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_call_output2.py b/tests/ported_static/stDelegatecallTestHomestead/test_call_output2.py
index 51cced17cae..40d1f6758af 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_call_output2.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_call_output2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_output2.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead/callOutput2Filler.json
+state_tests/stDelegatecallTestHomestead/callOutput2Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stDelegatecallTestHomestead/callOutput2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stDelegatecallTestHomestead/callOutput2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_call_output2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_output2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -48,52 +47,54 @@ def test_call_output2(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (DELEGATECALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 32 0 0) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0xBCC1197CCD23A97607F2F96D031F3432E0D16A02,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x6001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6f04a8ba354531ecd357e2cd4ddb43140f1e5fc9"),  # noqa: E501
+        address=Address(0xBCC1197CCD23A97607F2F96D031F3432E0D16A02),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
+    # Source: lll
+    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (DELEGATECALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 32 0 0) [[ 0 ]] (MLOAD 0)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
+        address=Address(0x6F04A8BA354531ECD357E2CD4DDB43140F1E5FC9),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=900000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
         ),
+        addr: Account(storage={}),
+        sender: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_call_output3.py b/tests/ported_static/stDelegatecallTestHomestead/test_call_output3.py
index fb22a06f86a..dd3cd83e332 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_call_output3.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_call_output3.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_output3.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead/callOutput3Filler.json
+state_tests/stDelegatecallTestHomestead/callOutput3Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stDelegatecallTestHomestead/callOutput3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stDelegatecallTestHomestead/callOutput3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_call_output3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_output3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -48,52 +47,54 @@ def test_call_output3(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (DELEGATECALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0xBCC1197CCD23A97607F2F96D031F3432E0D16A02,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x6001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4e40004dedfdad4927c60de1289ab14535f5121a"),  # noqa: E501
+        address=Address(0xBCC1197CCD23A97607F2F96D031F3432E0D16A02),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
+    # Source: lll
+    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (DELEGATECALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
+        address=Address(0x4E40004DEDFDAD4927C60DE1289AB14535F5121A),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=900000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
         ),
+        addr: Account(storage={}),
+        sender: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_call_output3partial.py b/tests/ported_static/stDelegatecallTestHomestead/test_call_output3partial.py
index 8e8094a64e6..2f4902b73d1 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_call_output3partial.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_call_output3partial.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_output3partial.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-callOutput3partialFiller.json
+state_tests/stDelegatecallTestHomestead/callOutput3partialFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stDelegatecallTestHomestead/callOutput3partialFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stDelegatecallTestHomestead/callOutput3partialFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,8 +31,8 @@ def test_call_output3partial(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_output3partial."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -49,52 +47,54 @@ def test_call_output3partial(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x6001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
+        address=Address(0xBCC1197CCD23A97607F2F96D031F3432E0D16A02),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (DELEGATECALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 10) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0xA,
             )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0xBCC1197CCD23A97607F2F96D031F3432E0D16A02,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0xA,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xefb6356473f53e06a8627e7ac82ab3ab3d24e68a"),  # noqa: E501
+        address=Address(0xEFB6356473F53E06A8627E7AC82AB3AB3D24E68A),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=900000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
         ),
+        addr: Account(storage={}),
+        sender: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_call_output3partial_fail.py b/tests/ported_static/stDelegatecallTestHomestead/test_call_output3partial_fail.py
index d47862eefbd..e7f0b8e4810 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_call_output3partial_fail.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_call_output3partial_fail.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_output3partial_fail.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-callOutput3partialFailFiller.json
+state_tests/stDelegatecallTestHomestead/callOutput3partialFailFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stDelegatecallTestHomestead/callOutput3partialFailFiller.json",  # noqa: E501
+        "state_tests/stDelegatecallTestHomestead/callOutput3partialFailFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_call_output3partial_fail(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_output3partial_fail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -49,52 +49,54 @@ def test_call_output3partial_fail(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x016001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.ADD + Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x834abc2c68c5f44ea9ae82b67aaf92044901cdc6"),  # noqa: E501
+        address=Address(0x834ABC2C68C5F44EA9AE82B67AAF92044901CDC6),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (DELEGATECALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 10) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0xA,
             )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x834ABC2C68C5F44EA9AE82B67AAF92044901CDC6,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0xA,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xefb6356473f53e06a8627e7ac82ab3ab3d24e68a"),  # noqa: E501
+        address=Address(0xEFB6356473F53E06A8627E7AC82AB3AB3D24E68A),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=900000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
         ),
+        addr: Account(storage={}),
+        sender: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_call_recursive_bomb_pre_call.py b/tests/ported_static/stDelegatecallTestHomestead/test_call_recursive_bomb_pre_call.py
index 2be3ee4e35e..6460d6ad306 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_call_recursive_bomb_pre_call.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_call_recursive_bomb_pre_call.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_recursive_bomb_pre_call.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-CallRecursiveBombPreCallFiller.json
+state_tests/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json",  # noqa: E501
+        "state_tests/stDelegatecallTestHomestead/CallRecursiveBombPreCallFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,11 +33,9 @@ def test_call_recursive_bomb_pre_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x77F65B71F1F16A75476F469F7106D1B60BFEC266AE25B8DA16A9091D223AA24A
-    )
+    """Test_call_recursive_bomb_pre_call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,67 +46,66 @@ def test_call_recursive_bomb_pre_call(
         gas_limit=9223372036854775807,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x36B00),
-                    address=0x3046257C307A51F1A8AE73F6F6360937DD21138E,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # { (CALL 100000 0xbad304eb96065b2a98b57a48a06ae28d285a71b5 23 0 0 0 0)  (DELEGATECALL 0x7ffffffffffffff <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0)  }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x186A0,
+                address=0xBAD304EB96065B2A98B57A48A06AE28D285A71B5,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.DELEGATECALL(
+            gas=0x7FFFFFFFFFFFFFF,
+            address=0x3046257C307A51F1A8AE73F6F6360937DD21138E,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0x3046257c307a51f1a8ae73f6f6360937dd21138e"),  # noqa: E501
+        address=Address(0x7A11B1B8911ECCCFCCB030A17F9CEBDE63A92190),  # noqa: E501
     )
-    # Source: LLL
-    # { (CALL 100000 0xbad304eb96065b2a98b57a48a06ae28d285a71b5 23 0 0 0 0)  (DELEGATECALL 0x7ffffffffffffff <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0)  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x186A0,
-                    address=0xBAD304EB96065B2A98B57A48A06AE28D285A71B5,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.DELEGATECALL(
-                gas=0x7FFFFFFFFFFFFFF,
+    # Source: lll
+    # { [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 224000) <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x36B00),
                 address=0x3046257C307A51F1A8AE73F6F6360937DD21138E,
+                value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7a11b1b8911ecccfccb030a17f9cebde63a92190"),  # noqa: E501
+        address=Address(0x3046257C307A51F1A8AE73F6F6360937DD21138E),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=9214364837600034817,
     )
 
     post = {
-        callee: Account(storage={0: 1023, 1: 1}),
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={0: 1023, 1: 1}),
+        sender: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_call_with_high_value_and_gas_oog.py b/tests/ported_static/stDelegatecallTestHomestead/test_call_with_high_value_and_gas_oog.py
index c64fc692f89..10228549068 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_call_with_high_value_and_gas_oog.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_call_with_high_value_and_gas_oog.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_with_high_value_and_gas_oog.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-callWithHighValueAndGasOOGFiller.json
+state_tests/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json",  # noqa: E501
+        "state_tests/stDelegatecallTestHomestead/callWithHighValueAndGasOOGFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_with_high_value_and_gas_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_with_high_value_and_gas_oog."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,57 +45,50 @@ def test_call_with_high_value_and_gas_oog(
         gas_limit=30000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-        ),
+    # Source: raw
+    # 0x6001600155603760005360026000f3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2),
         balance=23,
         nonce=0,
-        address=Address("0x0896f13e800125c0ccec44f3c434335f0a97bc1b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (DELEGATECALL 0xffffffffffffffffffffffff <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 2 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xFFFFFFFFFFFFFFFFFFFFFFFF,
-                    address=0x896F13E800125C0CCEC44F3C434335F0A97BC1B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xFFFFFFFFFFFFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa7465a0005567e06fbaa3ae783e57f22419c5a0a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_callcode_lose_gas_oog.py b/tests/ported_static/stDelegatecallTestHomestead/test_callcode_lose_gas_oog.py
index 41b60774b6f..37d33839061 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_callcode_lose_gas_oog.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_callcode_lose_gas_oog.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_callcode_lose_gas_oog.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-CallcodeLoseGasOOGFiller.json
+state_tests/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,40 +26,44 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stDelegatecallTestHomestead/CallcodeLoseGasOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (166262, {}),
-        (156262, {}),
-        (
-            600000,
-            {
-                Address("0xbe855315b63d137b74d5eed6be5cd9dde6e2478d"): Account(
-                    storage={0: 1, 2: 1001}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="-g2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_callcode_lose_gas_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    """Test_callcode_lose_gas_oog."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -67,42 +74,64 @@ def test_callcode_lose_gas_oog(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
     # { [[ 0 ]] (ADD @@0 1) [[ 1 ]] (DELEGATECALL (ADD 1(MUL @@0 100000)) <contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x186A0)),
-                    address=0xBE855315B63D137B74D5EED6BE5CD9DDE6E2478D,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8)),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x186A0)),
+                address=0xBE855315B63D137B74D5EED6BE5CD9DDE6E2478D,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2, value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8))
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0xbe855315b63d137b74d5eed6be5cd9dde6e2478d"),  # noqa: E501
+        address=Address(0xBE855315B63D137B74D5EED6BE5CD9DDE6E2478D),  # noqa: E501
     )
-    pre[callee] = Account(balance=7000, nonce=0)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0, 2: 0})},
+        },
+        {
+            "indexes": {"data": -1, "gas": 2, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 2: 1001})},
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0, 2: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [166262, 156262, 600000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_callcode_output3.py b/tests/ported_static/stDelegatecallTestHomestead/test_callcode_output3.py
index 74c08c961fc..c90119c6d77 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_callcode_output3.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_callcode_output3.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_output3.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead/callcodeOutput3Filler.json
+state_tests/stDelegatecallTestHomestead/callcodeOutput3Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stDelegatecallTestHomestead/callcodeOutput3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stDelegatecallTestHomestead/callcodeOutput3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_callcode_output3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_output3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -48,48 +47,48 @@ def test_callcode_output3(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (DELEGATECALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0xBCC1197CCD23A97607F2F96D031F3432E0D16A02,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x6001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4e40004dedfdad4927c60de1289ab14535f5121a"),  # noqa: E501
+        address=Address(0xBCC1197CCD23A97607F2F96D031F3432E0D16A02),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
+    # Source: lll
+    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (DELEGATECALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
+        address=Address(0x4E40004DEDFDAD4927C60DE1289AB14535F5121A),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=900000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_callcode_with_high_value_and_gas_oog.py b/tests/ported_static/stDelegatecallTestHomestead/test_callcode_with_high_value_and_gas_oog.py
index 458839f3853..3d9988dab1b 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_callcode_with_high_value_and_gas_oog.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_callcode_with_high_value_and_gas_oog.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcode_with_high_value_and_gas_oog.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-callcodeWithHighValueAndGasOOGFiller.json
+state_tests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json",  # noqa: E501
+        "state_tests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOGFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcode_with_high_value_and_gas_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcode_with_high_value_and_gas_oog."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,57 +45,50 @@ def test_callcode_with_high_value_and_gas_oog(
         gas_limit=30000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-        ),
+    # Source: raw
+    # 0x6001600155603760005360026000f3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2),
         balance=23,
         nonce=0,
-        address=Address("0x0896f13e800125c0ccec44f3c434335f0a97bc1b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (DELEGATECALL 0xffffffffffffffffffffffff <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 2 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xFFFFFFFFFFFFFFFFFFFFFFFF,
-                    address=0x896F13E800125C0CCEC44F3C434335F0A97BC1B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xFFFFFFFFFFFFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa7465a0005567e06fbaa3ae783e57f22419c5a0a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_deleagate_call_after_value_transfer.py b/tests/ported_static/stDelegatecallTestHomestead/test_deleagate_call_after_value_transfer.py
index 4ba237eab71..a17a34fd41e 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_deleagate_call_after_value_transfer.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_deleagate_call_after_value_transfer.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_deleagate_call_after_value_transfer.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-deleagateCallAfterValueTransferFiller.json
+state_tests/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json",  # noqa: E501
+        "state_tests/stDelegatecallTestHomestead/deleagateCallAfterValueTransferFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_deleagate_call_after_value_transfer(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x3722FAAB4D25B944622D559EA4BCF38B4BCF3CAF07A6D2C6FD99321C1A66C974
-    )
+    """Test_deleagate_call_after_value_transfer."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x2386F26FC10000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,50 +45,42 @@ def test_deleagate_call_after_value_transfer(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x1, value=Op.CALLER)
-            + Op.SSTORE(key=0x2, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 (CALLVALUE)) (SSTORE 1 (CALLER)) (SSTORE 2 (CALLDATALOAD 0)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x1, value=Op.CALLER)
+        + Op.SSTORE(key=0x2, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0346aa231cb52f55ddf201dc19ca469cc73e6495"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2386F26FC10000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x01) (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x1)
-            + Op.DELEGATECALL(
-                gas=0x186A0,
-                address=0x346AA231CB52F55DDF201DC19CA469CC73E6495,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x1)
+        + Op.DELEGATECALL(
+            gas=0x186A0,
+            address=addr,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x10C8E0,
         nonce=0,
-        address=Address("0xdd657898b318b3d967472eaa82bb75c4141b6735"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=453081,
     )
 
     post = {
-        contract: Account(
-            storage={
-                1: 0x6FDA566D1950D7E0A4DAC1DE87109B2CA7D12DA4,
-                2: 1,
-            },
-        ),
+        target: Account(storage={0: 0, 1: sender, 2: 1}),
+        addr: Account(storage={0: 0, 1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall1024.py b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall1024.py
index 7dd94812c70..fc95b4c8ca8 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall1024.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall1024.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_delegatecall1024.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-Delegatecall1024Filler.json
+state_tests/stDelegatecallTestHomestead/Delegatecall1024Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stDelegatecallTestHomestead/Delegatecall1024Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stDelegatecallTestHomestead/Delegatecall1024Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -34,12 +31,9 @@ def test_delegatecall1024(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    """Test_delegatecall1024."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -50,40 +44,36 @@ def test_delegatecall1024(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre[callee] = Account(balance=7000, nonce=0)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
     # { [[ 0 ]] (ADD @@0 1) [[ 1 ]] (DELEGATECALL 0xfffffffffff <contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xFFFFFFFFFFF,
-                    address=0xE7ADDF870A481E1A0829E5A67DEBD5B963861979,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xFFFFFFFFFFF,
+                address=0xE7ADDF870A481E1A0829E5A67DEBD5B963861979,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0xe7addf870a481e1a0829e5a67debd5b963861979"),  # noqa: E501
+        address=Address(0xE7ADDF870A481E1A0829E5A67DEBD5B963861979),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=9214364837600034817,
         value=10,
     )
 
-    post = {
-        contract: Account(storage={0: 1025, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1025, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall1024_oog.py b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall1024_oog.py
index b38ffb63ee3..42959c58111 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall1024_oog.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall1024_oog.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_delegatecall1024_oog.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-Delegatecall1024OOGFiller.json
+state_tests/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stDelegatecallTestHomestead/Delegatecall1024OOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,12 +30,9 @@ def test_delegatecall1024_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    """Test_delegatecall1024_oog."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,47 +43,42 @@ def test_delegatecall1024_oog(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
     # { [[ 0 ]] (ADD @@0 1) [[ 1 ]] (DELEGATECALL (MUL (SUB (GAS) 10000) (SUB 1 (DIV @@0 1025))) <contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=Op.MUL(
-                        Op.SUB(Op.GAS, 0x2710),
-                        Op.SUB(0x1, Op.DIV(Op.SLOAD(key=0x0), 0x401)),
-                    ),
-                    address=0x62C5C9278DA01E6594D6FEDE061838CF5E597F2B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=Op.MUL(
+                    Op.SUB(Op.GAS, 0x2710),
+                    Op.SUB(0x1, Op.DIV(Op.SLOAD(key=0x0), 0x401)),
                 ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8)),
-            )
-            + Op.STOP
-        ),
+                address=0x62C5C9278DA01E6594D6FEDE061838CF5E597F2B,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2, value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8))
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0x62c5c9278da01e6594d6fede061838cf5e597f2b"),  # noqa: E501
+        address=Address(0x62C5C9278DA01E6594D6FEDE061838CF5E597F2B),  # noqa: E501
     )
-    pre[callee] = Account(balance=7000, nonce=0)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=15720826,
         value=10,
     )
 
-    post = {
-        contract: Account(storage={0: 146, 1: 1, 2: 0x23A51}),
-    }
+    post = {target: Account(storage={0: 146, 1: 1, 2: 0x23A51})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_and_oo_gat_tx_level.py b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_and_oo_gat_tx_level.py
index 26b747dd266..8b5a6413104 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_and_oo_gat_tx_level.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_and_oo_gat_tx_level.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_delegatecall_and_oo_gat_tx_level.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-delegatecallAndOOGatTxLevelFiller.json
+state_tests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json",  # noqa: E501
+        "state_tests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevelFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_delegatecall_and_oo_gat_tx_level(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_delegatecall_and_oo_gat_tx_level."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,48 +45,41 @@ def test_delegatecall_and_oo_gat_tx_level(
         gas_limit=30000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-        ),
+    # Source: raw
+    # 0x6001600155603760005360026000f3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2),
         balance=23,
         nonce=0,
-        address=Address("0x0896f13e800125c0ccec44f3c434335f0a97bc1b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 3000001 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x2DC6C1,
-                    address=0x896F13E800125C0CCEC44F3C434335F0A97BC1B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x2DC6C1,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x830ab9ad91366bfb2bb745e4a637f97b25087928"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_basic.py b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_basic.py
index b4802347d65..9ff0b5b6fce 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_basic.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_basic.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_delegatecall_basic.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-delegatecallBasicFiller.json
+state_tests/stDelegatecallTestHomestead/delegatecallBasicFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stDelegatecallTestHomestead/delegatecallBasicFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stDelegatecallTestHomestead/delegatecallBasicFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_delegatecall_basic(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_delegatecall_basic."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,48 +43,41 @@ def test_delegatecall_basic(
         gas_limit=30000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-        ),
+    # Source: raw
+    # 0x6001600155603760005360026000f3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2),
         balance=23,
         nonce=0,
-        address=Address("0x0896f13e800125c0ccec44f3c434335f0a97bc1b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 500000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 2 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x7A120,
-                    address=0x896F13E800125C0CCEC44F3C434335F0A97BC1B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x7A120,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x55bb8a8658b848ebbbb73cbf6ac9d59d715aec58"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_emptycontract.py b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_emptycontract.py
index 34dd1fb8a96..60b0410f6c4 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_emptycontract.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_emptycontract.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_delegatecall_emptycontract.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-delegatecallEmptycontractFiller.json
+state_tests/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json",  # noqa: E501
+        "state_tests/stDelegatecallTestHomestead/delegatecallEmptycontractFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_delegatecall_emptycontract(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x11489F9B076D3F3185EBE5C6E2DBEDBE9E283A6CE75895780134252B3DD5DBCC
-    )
+    """Test_delegatecall_emptycontract."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x10C8E0)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,37 +45,32 @@ def test_delegatecall_emptycontract(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (DELEGATECALL 50000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 0 64 0 64 )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x945304EB96065B2A98B57A48A06AE28D285A71B5,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x945304EB96065B2A98B57A48A06AE28D285A71B5,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0x4a88cf3b3f1dabdd27e62fcb5df86d7d685e0044"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x10C8E0)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=105044,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_in_initcode_to_empty_contract.py b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_in_initcode_to_empty_contract.py
index 78d5f8ef701..1cac7ff8c76 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_in_initcode_to_empty_contract.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_in_initcode_to_empty_contract.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_delegatecall_in_initcode_to_empty_contract.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-delegatecallInInitcodeToEmptyContractFiller.json
+state_tests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json",  # noqa: E501
+        "state_tests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContractFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_delegatecall_in_initcode_to_empty_contract(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_delegatecall_in_initcode_to_empty_contract."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
+    sender = pre.fund_eoa(amount=0x2386F26FC10000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,36 +47,33 @@ def test_delegatecall_in_initcode_to_empty_contract(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b5620186) (MSTORE 32 0xa0f4600055000000000000000000000000000000000000000000000000000000) (CREATE 1 0 64) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x604060006040600073945304EB96065B2A98B57A48A06AE28D285A71B5620186,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xA0F4600055000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.CREATE(value=0x1, offset=0x0, size=0x40)
-            + Op.STOP
-        ),
-        balance=0x2710,
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x604060006040600073945304EB96065B2A98B57A48A06AE28D285A71B5620186,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xA0F4600055000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.CREATE(value=0x1, offset=0x0, size=0x40)
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2386F26FC10000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=453081,
     )
 
     post = {
-        Address("0x13136008b64ff592819b2fa6d43f2835c452020e"): Account(
-            storage={0: 1},
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={0: 1}, balance=1
         ),
     }
 
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_in_initcode_to_existing_contract.py b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_in_initcode_to_existing_contract.py
index 2b8f83ed20e..e20c162ae59 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_in_initcode_to_existing_contract.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_in_initcode_to_existing_contract.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_delegatecall_in_initcode_to_existing_contract.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-delegatecallInInitcodeToExistingContractFiller.json
+state_tests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json
 """
 
 import pytest
@@ -12,9 +11,11 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +25,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json",  # noqa: E501
+        "state_tests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +34,11 @@ def test_delegatecall_in_initcode_to_existing_contract(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_delegatecall_in_initcode_to_existing_contract."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
+    contract_1 = Address(0x1000000000000000000000000000000000000001)
+    contract_2 = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,64 +52,55 @@ def test_delegatecall_in_initcode_to_existing_contract(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0x2386F26FC10000)
+    # Source: lll
     # { (MSTORE 0 0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b5620186) (MSTORE 32 0xa0f4600055336001550000000000000000000000000000000000000000000000) (CREATE 1 0 64) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x604060006040600073945304EB96065B2A98B57A48A06AE28D285A71B5620186,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xA0F4600055336001550000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.CREATE(value=0x1, offset=0x0, size=0x40)
-            + Op.STOP
-        ),
-        balance=0x2710,
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x604060006040600073945304EB96065B2A98B57A48A06AE28D285A71B5620186,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xA0F4600055336001550000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.CREATE(value=0x1, offset=0x0, size=0x40)
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x6001600055) (CREATE 1 27 5) }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6001600055)
-            + Op.CREATE(value=0x1, offset=0x1B, size=0x5)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6001600055)
+        + Op.CREATE(value=0x1, offset=0x1B, size=0x5)
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000001"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000001),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (SSTORE 2 1) [[ 11 ]] (CALLER) }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0xB, value=Op.CALLER)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0xB, value=Op.CALLER)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2386F26FC10000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=453081,
     )
 
     post = {
-        Address("0x13136008b64ff592819b2fa6d43f2835c452020e"): Account(
-            storage={
-                0: 1,
-                1: 0x1000000000000000000000000000000000000000,
-                2: 1,
-                11: 0x1000000000000000000000000000000000000000,
-            },
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={0: 1, 1: contract_0, 2: 1, 11: contract_0},
+            balance=1,
         ),
     }
 
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_in_initcode_to_existing_contract_oog.py b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_in_initcode_to_existing_contract_oog.py
index 53a4a6c6b89..b9d882a9583 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_in_initcode_to_existing_contract_oog.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_in_initcode_to_existing_contract_oog.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_delegatecall_in_initcode_to_existing_contract_oog.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-delegatecallInInitcodeToExistingContractOOGFiller.json
+state_tests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json
 """
 
 import pytest
@@ -12,9 +11,11 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +25,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json",  # noqa: E501
+        "state_tests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOGFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +34,10 @@ def test_delegatecall_in_initcode_to_existing_contract_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_delegatecall_in_initcode_to_existing_contract_oog."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
+    contract_1 = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,47 +51,42 @@ def test_delegatecall_in_initcode_to_existing_contract_oog(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0x2386F26FC10000)
+    # Source: lll
     # { (MSTORE 0 0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b5620186) (MSTORE 32 0xa0f4600a5533600b550000000000000000000000000000000000000000000000) (CREATE 5 0 64) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x604060006040600073945304EB96065B2A98B57A48A06AE28D285A71B5620186,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xA0F4600A5533600B550000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.CREATE(value=0x5, offset=0x0, size=0x40)
-            + Op.STOP
-        ),
-        balance=0x2710,
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x604060006040600073945304EB96065B2A98B57A48A06AE28D285A71B5620186,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xA0F4600A5533600B550000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.CREATE(value=0x5, offset=0x0, size=0x40)
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (SSTORE 2 1) }
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2386F26FC10000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=153096,
     )
 
     post = {
-        Address("0x13136008b64ff592819b2fa6d43f2835c452020e"): Account(
-            storage={
-                2: 1,
-                10: 1,
-                11: 0x1000000000000000000000000000000000000000,
-            },
+        compute_create_address(address=contract_0, nonce=0): Account(
+            balance=5
         ),
     }
 
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_oo_gin_call.py b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_oo_gin_call.py
index 7834608d16c..f56089b6c0a 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_oo_gin_call.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_oo_gin_call.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_delegatecall_oo_gin_call.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-delegatecallOOGinCallFiller.json
+state_tests/stDelegatecallTestHomestead/delegatecallOOGinCallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stDelegatecallTestHomestead/delegatecallOOGinCallFiller.json",  # noqa: E501
+        "state_tests/stDelegatecallTestHomestead/delegatecallOOGinCallFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_delegatecall_oo_gin_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_delegatecall_oo_gin_call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,51 +45,48 @@ def test_delegatecall_oo_gin_call(
         gas_limit=30000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-        ),
+    # Source: raw
+    # 0x6001600155603760005360026000f3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2),
         balance=23,
         nonce=0,
-        address=Address("0x0896f13e800125c0ccec44f3c434335f0a97bc1b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (ADD (DELEGATECALL 10000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0 ) 1) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.ADD(
-                    Op.DELEGATECALL(
-                        gas=0x2710,
-                        address=0x896F13E800125C0CCEC44F3C434335F0A97BC1B,
-                        args_offset=0x0,
-                        args_size=0x0,
-                        ret_offset=0x0,
-                        ret_size=0x0,
-                    ),
-                    0x1,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.ADD(
+                Op.DELEGATECALL(
+                    gas=0x2710,
+                    address=addr,
+                    args_offset=0x0,
+                    args_size=0x0,
+                    ret_offset=0x0,
+                    ret_size=0x0,
                 ),
-            )
-            + Op.STOP
-        ),
+                0x1,
+            ),
+        )
+        + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0xc0eee677168d4abe7e0974ef0a4284cca6133b11"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1, 1: 0}),
+        addr: Account(storage={0: 0, 1: 0}),
+        sender: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_sender_check.py b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_sender_check.py
index 7b09bcd91c1..1a8518db75f 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_sender_check.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_sender_check.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_delegatecall_sender_check.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-delegatecallSenderCheckFiller.json
+state_tests/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json",  # noqa: E501
+        "state_tests/stDelegatecallTestHomestead/delegatecallSenderCheckFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_delegatecall_sender_check(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_delegatecall_sender_check."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,48 +45,39 @@ def test_delegatecall_sender_check(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 500000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 2 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x7A120,
-                    address=0x7607CC240D38CCF9B55D1EEB1DF0C187F8EC28C1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x55bb8a8658b848ebbbb73cbf6ac9d59d715aec58"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {[[ 1 ]] (CALLER)}
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=Op.CALLER) + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0x7607cc240d38ccf9b55d1eeb1df0c187f8ec28c1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 500000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 2 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x7A120,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+    )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 1,
-                1: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-            },
-        ),
-    }
+    post = {target: Account(storage={0: 1, 1: sender})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_value_check.py b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_value_check.py
index 59dad437cf8..9d544dbdff8 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_value_check.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecall_value_check.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_delegatecall_value_check.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-delegatecallValueCheckFiller.json
+state_tests/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json",  # noqa: E501
+        "state_tests/stDelegatecallTestHomestead/delegatecallValueCheckFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_delegatecall_value_check(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_delegatecall_value_check."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,44 +45,40 @@ def test_delegatecall_value_check(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 500000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 2 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x7A120,
-                    address=0x5D25AD2A26F849E9400D6B65244F26F4EEA11ADF,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x55bb8a8658b848ebbbb73cbf6ac9d59d715aec58"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {[[ 1 ]] (CALLVALUE) }
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=Op.CALLVALUE) + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0x5d25ad2a26f849e9400d6b65244f26f4eea11adf"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 500000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 2 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x7A120,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+    )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
         value=23,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 23}),
-    }
+    post = {target: Account(storage={0: 1, 1: 23})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecode_dynamic_code.py b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecode_dynamic_code.py
index 49fee8ee601..13cf2e5404a 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecode_dynamic_code.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecode_dynamic_code.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_delegatecode_dynamic_code.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-delegatecodeDynamicCodeFiller.json
+state_tests/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json
 """
 
 import pytest
@@ -12,9 +11,11 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +25,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json",  # noqa: E501
+        "state_tests/stDelegatecallTestHomestead/delegatecodeDynamicCodeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +34,9 @@ def test_delegatecode_dynamic_code(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_delegatecode_dynamic_code."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,43 +50,49 @@ def test_delegatecode_dynamic_code(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0x2386F26FC10000)
+    # Source: lll
     # { (MSTORE 0 0x716860016000553360145560005260096017f36000526012600e6001f0600a55) (MSTORE 32 0x604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6620186) (MSTORE 64 0xa0f4600b55000000000000000000000000000000000000000000000000000000) (CREATE 1 0 96) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x716860016000553360145560005260096017F36000526012600E6001F0600A55,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x604060006040600073FFE4EBD2A68C02D9DCB0A17283D13346BEB2D8B6620186,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xA0F4600B55000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.CREATE(value=0x1, offset=0x0, size=0x60)
-            + Op.STOP
-        ),
-        balance=0x2710,
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x716860016000553360145560005260096017F36000526012600E6001F0600A55,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x604060006040600073FFE4EBD2A68C02D9DCB0A17283D13346BEB2D8B6620186,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xA0F4600B55000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.CREATE(value=0x1, offset=0x0, size=0x60)
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2386F26FC10000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=453081,
     )
 
     post = {
-        Address("0x13136008b64ff592819b2fa6d43f2835c452020e"): Account(
+        compute_create_address(
+            address=compute_create_address(address=contract_0, nonce=0),
+            nonce=0,
+        ): Account.NONEXISTENT,
+        compute_create_address(address=contract_0, nonce=0): Account(
             storage={
+                0: 0,
                 10: 0x568A95F77B047BECE6AA68843D2019332C46A585,
                 11: 1,
+                20: 0,
             },
+            balance=0,
         ),
     }
 
diff --git a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecode_dynamic_code2_self_call.py b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecode_dynamic_code2_self_call.py
index 536e35aaf47..dafe15bd0c0 100644
--- a/tests/ported_static/stDelegatecallTestHomestead/test_delegatecode_dynamic_code2_self_call.py
+++ b/tests/ported_static/stDelegatecallTestHomestead/test_delegatecode_dynamic_code2_self_call.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_delegatecode_dynamic_code2_self_call.
 
 Ported from:
-tests/static/state_tests/stDelegatecallTestHomestead
-delegatecodeDynamicCode2SelfCallFiller.json
+state_tests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json
 """
 
 import pytest
@@ -12,9 +11,11 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +25,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json",  # noqa: E501
+        "state_tests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCallFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +34,9 @@ def test_delegatecode_dynamic_code2_self_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_delegatecode_dynamic_code2_self_call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,39 +50,35 @@ def test_delegatecode_dynamic_code2_self_call(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0x2386F26FC10000)
+    # Source: lll
     # {(MSTORE 0 0x60406000604060007313136008b64ff592819b2fa6d43f2835c452020e620186) (MSTORE 32 0xa0f4600b5533600c550000000000000000000000000000000000000000000000) (CREATE 1 0 64) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x60406000604060007313136008B64FF592819B2FA6D43F2835C452020E620186,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xA0F4600B5533600C550000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.CREATE(value=0x1, offset=0x0, size=0x40)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x60406000604060007313136008B64FF592819B2FA6D43F2835C452020E620186,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xA0F4600B5533600C550000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.CREATE(value=0x1, offset=0x0, size=0x40)
+        + Op.STOP,
         balance=0x10C8E0,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2386F26FC10000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=453081,
     )
 
     post = {
-        Address("0x13136008b64ff592819b2fa6d43f2835c452020e"): Account(
-            storage={
-                11: 1,
-                12: 0x1000000000000000000000000000000000000000,
-            },
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={11: 1, 12: contract_0}, balance=1
         ),
     }
 
diff --git a/tests/ported_static/stEIP1153_transientStorage/__init__.py b/tests/ported_static/stEIP1153_transientStorage/__init__.py
new file mode 100644
index 00000000000..83b003de6f6
--- /dev/null
+++ b/tests/ported_static/stEIP1153_transientStorage/__init__.py
@@ -0,0 +1 @@
+"""Ported static tests: stEIP1153_transientStorage."""  # noqa: N999
diff --git a/tests/ported_static/stEIP1153_transientStorage/test_10_revert_undoes_store_after_return.py b/tests/ported_static/stEIP1153_transientStorage/test_10_revert_undoes_store_after_return.py
new file mode 100644
index 00000000000..888bace084d
--- /dev/null
+++ b/tests/ported_static/stEIP1153_transientStorage/test_10_revert_undoes_store_after_return.py
@@ -0,0 +1,150 @@
+"""
+Revert undoes the transient storage writes after a successful call.
+
+Ported from:
+state_tests/Cancun/stEIP1153_transientStorage/10_revertUndoesStoreAfterReturnFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    [
+        "state_tests/Cancun/stEIP1153_transientStorage/10_revertUndoesStoreAfterReturnFiller.yml"  # noqa: E501
+    ],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.pre_alloc_mutable
+def test_10_revert_undoes_store_after_return(
+    state_test: StateTestFiller,
+    pre: Alloc,
+) -> None:
+    """Revert undoes the transient storage writes after a successful call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3635C9ADC5DEA00000)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=4503599627370496,
+    )
+
+    # Source: yul
+    # {
+    #   switch selector()
+    #
+    #   case 0x70ac643e { // doFirstCall()
+    #     doFirstCall()
+    #   }
+    #
+    #   case 0x76b85d23 { // doCallThenRevert()
+    #     doCallThenRevert()
+    #   }
+    #
+    #   case 0x4ccca553 { // doSuccessfulStore()
+    #     doSuccessfulStore()
+    #   }
+    #
+    #   function doFirstCall() {
+    #     verbatim_2i_0o(hex"5D", 0, 5)
+    #
+    #     let v := verbatim_1i_1o(hex"5C", 0)
+    #     sstore(0, v)
+    #
+    #     mstore(0, hex"76b85d23") // calls doCallThenRevert()
+    #     let fail := call(gas(), address(), 0, 0, 32, 0, 32)
+    #
+    #     sstore(1, fail) // should be 0 (revert)
+    #     sstore(2, mload(0)) // load 1 (successful call)
+    #
+    #     let val := verbatim_1i_1o(hex"5C", 0)
+    #     sstore(3, val)
+    #   }
+    # ... (23 more lines)
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SHR(0xE0, Op.CALLDATALOAD(offset=Op.PUSH0))
+        + Op.JUMPI(pc=0x2F, condition=Op.EQ(0x70AC643E, Op.DUP1))
+        + Op.JUMPI(pc=0x2B, condition=Op.EQ(0x76B85D23, Op.DUP1))
+        + Op.PUSH4[0x4CCCA553]
+        + Op.JUMPI(pc=0x23, condition=Op.EQ)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x29]
+        + Op.JUMP(pc=0x76)
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.JUMP(pc=0x5C)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x29]
+        + Op.TSTORE(key=Op.PUSH0, value=0x5)
+        + Op.SSTORE(key=Op.PUSH0, value=Op.TLOAD(key=Op.PUSH0))
+        + Op.MSTORE(offset=Op.PUSH0, value=Op.SHL(0xE0, 0x76B85D23))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.ADDRESS,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=Op.DUP2,
+                ret_offset=Op.PUSH0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=Op.PUSH0))
+        + Op.SSTORE(key=0x3, value=Op.TLOAD(key=Op.PUSH0))
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=Op.PUSH0, value=Op.SHL(0xE0, 0x4CCCA553))
+        + Op.MSTORE(
+            offset=Op.PUSH0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.ADDRESS,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=Op.PUSH0,
+            ),
+        )
+        + Op.REVERT(offset=Op.PUSH0, size=0x20)
+        + Op.JUMPDEST
+        + Op.TSTORE(key=Op.PUSH0, value=0x6)
+        + Op.JUMP,
+        storage={1: 65535},
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+    )
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=Bytes("70ac643e"),
+        gas_limit=400000,
+        max_fee_per_gas=2000,
+        max_priority_fee_per_gas=0,
+        access_list=[],
+    )
+
+    post = {target: Account(storage={0: 5, 1: 0, 2: 1, 3: 5})}
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP1153_transientStorage/test_14_revert_after_nested_staticcall.py b/tests/ported_static/stEIP1153_transientStorage/test_14_revert_after_nested_staticcall.py
new file mode 100644
index 00000000000..c68b03a7c0c
--- /dev/null
+++ b/tests/ported_static/stEIP1153_transientStorage/test_14_revert_after_nested_staticcall.py
@@ -0,0 +1,148 @@
+"""
+Transient storage can't be manipulated from nested staticcall.
+
+Ported from:
+state_tests/Cancun/stEIP1153_transientStorage/14_revertAfterNestedStaticcallFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    [
+        "state_tests/Cancun/stEIP1153_transientStorage/14_revertAfterNestedStaticcallFiller.yml"  # noqa: E501
+    ],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.pre_alloc_mutable
+def test_14_revert_after_nested_staticcall(
+    state_test: StateTestFiller,
+    pre: Alloc,
+) -> None:
+    """Transient storage can't be manipulated from nested staticcall."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3635C9ADC5DEA00000)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=4503599627370496,
+    )
+
+    # Source: yul
+    # {
+    #   switch selector()
+    #
+    #   case 0xf5f40590 { // doStoreAndStaticCall()
+    #     doStoreAndStaticCall()
+    #   }
+    #
+    #   case 0xf8dfc2d0 { // doCallToStore()
+    #     doCallToStore()
+    #   }
+    #
+    #   case 0x62fdb9be { // doStore()
+    #     doStore()
+    #   }
+    #
+    #   function doStoreAndStaticCall() {
+    #     verbatim_2i_0o(hex"5D", 0, 10)
+    #
+    #     let v := verbatim_1i_1o(hex"5C", 0)
+    #     sstore(0, v)
+    #
+    #     mstore(0, hex"f8dfc2d0") // doCallToStore()
+    #     let success := staticcall(0xffff, address(), 0, 32, 0, 32)
+    #
+    #     sstore(1, mload(0)) // should be 0 from nested unsuccessful call
+    #     sstore(2, success) // should be 1
+    #
+    #     let val := verbatim_1i_1o(hex"5C", 0)
+    #     sstore(3, val)
+    #   }
+    # ... (17 more lines)
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SHR(0xE0, Op.CALLDATALOAD(offset=Op.PUSH0))
+        + Op.JUMPI(pc=0x2F, condition=Op.EQ(0xF5F40590, Op.DUP1))
+        + Op.JUMPI(pc=0x2B, condition=Op.EQ(0xF8DFC2D0, Op.DUP1))
+        + Op.PUSH4[0x62FDB9BE]
+        + Op.JUMPI(pc=0x23, condition=Op.EQ)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x29]
+        + Op.JUMP(pc=0x77)
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.JUMP(pc=0x5D)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x29]
+        + Op.TSTORE(key=Op.PUSH0, value=0xA)
+        + Op.SSTORE(key=Op.PUSH0, value=Op.TLOAD(key=Op.PUSH0))
+        + Op.MSTORE(offset=Op.PUSH0, value=Op.SHL(0xE4, 0xF8DFC2D))
+        + Op.STATICCALL(
+            gas=0xFFFF,
+            address=Op.ADDRESS,
+            args_offset=Op.DUP2,
+            args_size=Op.DUP2,
+            ret_offset=Op.PUSH0,
+            ret_size=0x20,
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=Op.PUSH0))
+        + Op.PUSH1[0x2]
+        + Op.SSTORE
+        + Op.SSTORE(key=0x3, value=Op.TLOAD(key=Op.PUSH0))
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=Op.PUSH0, value=Op.SHL(0xE1, 0x317EDCDF))
+        + Op.MSTORE(
+            offset=Op.PUSH0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.ADDRESS,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=Op.PUSH0,
+            ),
+        )
+        + Op.RETURN(offset=Op.PUSH0, size=0x20)
+        + Op.JUMPDEST
+        + Op.TSTORE(key=Op.PUSH0, value=0xB)
+        + Op.JUMP,
+        storage={1: 65535},
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+    )
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=Bytes("f5f40590"),
+        gas_limit=400000,
+        max_fee_per_gas=2000,
+        max_priority_fee_per_gas=0,
+        access_list=[],
+    )
+
+    post = {target: Account(storage={0: 10, 1: 0, 2: 1, 3: 10})}
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP1153_transientStorage/test_trans_storage_ok.py b/tests/ported_static/stEIP1153_transientStorage/test_trans_storage_ok.py
new file mode 100644
index 00000000000..818e6e4d756
--- /dev/null
+++ b/tests/ported_static/stEIP1153_transientStorage/test_trans_storage_ok.py
@@ -0,0 +1,1466 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/Cancun/stEIP1153_transientStorage/transStorageOKFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/Cancun/stEIP1153_transientStorage/transStorageOKFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="sum_16",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="callcode_sum_16",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="delegate_sum_16",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="sum_256",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="callback_sum_10",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="callback_sum_50",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="bin_tree_6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="delegate_bin_tree_6",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="inherit_trans",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="deep_call",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="deep_call",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="deep_call",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="deep_call",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="deep_call",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="deep_call",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="static_call",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_trans_storage_ok(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x00000000000000000000000000000000EBD141D5)
+    contract_1 = Address(0x000000000000000000000000000000006E3A7204)
+    contract_2 = Address(0x00000000000000000000000000000000C1C922F1)
+    contract_3 = Address(0x00000000000000000000000000000000CA11BACC)
+    contract_4 = Address(0x000000000000000000000000000000005114E2C8)
+    contract_5 = Address(0x00000000000000000000000000000000264BB86A)
+    contract_6 = Address(0x000000000000000000000000000000007074A486)
+    contract_7 = Address(0x000000000000000000000000000000000000ADD1)
+    contract_8 = Address(0x000000000000000000000000000000007F9317BD)
+    contract_9 = Address(0x00000000000000000000000000000000C54B5829)
+    contract_10 = Address(0x00000000000000000000000000000000000057A7)
+    contract_11 = Address(0x000000000000000000000000000000005D7935DF)
+    sender = EOA(
+        key=0x48DC5A9F099CAAAA557742CA3A990A94BE45B9969126A1BC74E5E8BE5A2B5B47
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
+    # Source: yul
+    # {
+    #     // These two functions use transient storage.
+    #     // Once the relevant opcodes are added to Yul, simply remove
+    #     // them (from all contracts) and remove the _temp suffices.
+    #     function tload_temp(loc) -> val {
+    #       val := verbatim_1i_1o(hex"5C", loc)
+    #     }
+    #
+    #     function tstore_temp(loc, val) {
+    #       verbatim_2i_0o(hex"5D", loc, val)
+    #     }
+    #
+    #     // If we are called by ourselves, this is part of the loop.
+    #     if eq(caller(), address()) {
+    #       let counter := tload_temp(0)
+    #
+    #       // If the counter is equal to zero, we're done - return.
+    #       if eq(counter,0) {
+    #         return(0,0)
+    #       }
+    #
+    #       // If counter isn't zero, add counter to Trans[1] and do recursion
+    #       tstore_temp(1, add(tload_temp(1), counter))
+    #
+    #       // Change the loop variable and call yourself
+    #       tstore_temp(0, sub(counter, 1))
+    #       let res := call(gas(), address(), 0, 0,0, 0,0)
+    #       if iszero(res) { // If the call failed, fail too
+    #          revert(0,0)
+    #       }
+    # ... (15 more lines)
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x33, condition=Op.EQ(Op.CALLER, Op.ADDRESS))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xE, condition=Op.SUB(Op.CALLER, Op.ADDRESS))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1B]
+        + Op.CALLDATALOAD(offset=Op.PUSH0)
+        + Op.SSTORE(key=0x1, value=Op.DUP1)
+        + Op.PUSH0
+        + Op.JUMP(pc=0x6F)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.ADDRESS,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=Op.PUSH0,
+            ),
+        )
+        + Op.PUSH1[0x2E]
+        + Op.PUSH1[0x1]
+        + Op.JUMP(pc=0x6B)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x3]
+        + Op.SSTORE
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x3A]
+        + Op.PUSH0
+        + Op.JUMP(pc=0x6B)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x69, condition=Op.ISZERO(Op.DUP1))
+        + Op.PUSH1[0x1]
+        + Op.DUP2
+        + Op.PUSH1[0x54]
+        + Op.PUSH1[0x5A]
+        + Op.SWAP4
+        + Op.PUSH1[0x4E]
+        + Op.DUP5
+        + Op.JUMP(pc=0x6B)
+        + Op.JUMPDEST
+        + Op.ADD
+        + Op.DUP4
+        + Op.JUMP(pc=0x6F)
+        + Op.JUMPDEST
+        + Op.SUB
+        + Op.PUSH0
+        + Op.JUMP(pc=0x6F)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x6,
+            condition=Op.CALL(
+                gas=Op.GAS,
+                address=Op.ADDRESS,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=Op.PUSH0,
+            ),
+        )
+        + Op.REVERT(offset=Op.DUP1, size=Op.PUSH0)
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.TLOAD
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.TSTORE
+        + Op.JUMP,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000EBD141D5),  # noqa: E501
+    )
+    # Source: yul
+    # {
+    #     function tload_temp(loc) -> val {
+    #       val := verbatim_1i_1o(hex"5C", loc)
+    #     }
+    #
+    #     function tstore_temp(loc, val) {
+    #       verbatim_2i_0o(hex"5D", loc, val)
+    #     }
+    #
+    #     // If we are called by ourselves, this is part of the loop.
+    #     if eq(caller(), address()) {
+    #       let counter := tload_temp(0)
+    #
+    #       // Loop ended, return
+    #       if eq(counter,0) {
+    #         return(0,0)
+    #       }
+    #
+    #
+    #       // Change the loop variable and call yourself
+    #       tstore_temp(1, add(tload_temp(1), counter))
+    #       tstore_temp(0, sub(counter, 1))
+    #       let res := callcode(gas(), address(), 0, 0,0, 0,0)
+    #       if iszero(res) { // If the call failed, fail too
+    #          revert(0,0)
+    #       }
+    #     }
+    #
+    #     // If called by a different address, we are the first call and need
+    #     // to setup Trans[0] before starting the loop.
+    # ... (15 more lines)
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x33, condition=Op.EQ(Op.CALLER, Op.ADDRESS))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xE, condition=Op.SUB(Op.CALLER, Op.ADDRESS))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1B]
+        + Op.CALLDATALOAD(offset=Op.PUSH0)
+        + Op.SSTORE(key=0x1, value=Op.DUP1)
+        + Op.PUSH0
+        + Op.JUMP(pc=0x6F)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.ADDRESS,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=Op.PUSH0,
+            ),
+        )
+        + Op.PUSH1[0x2E]
+        + Op.PUSH1[0x1]
+        + Op.JUMP(pc=0x6B)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x3]
+        + Op.SSTORE
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x3A]
+        + Op.PUSH0
+        + Op.JUMP(pc=0x6B)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x69, condition=Op.ISZERO(Op.DUP1))
+        + Op.PUSH1[0x1]
+        + Op.DUP2
+        + Op.PUSH1[0x54]
+        + Op.PUSH1[0x5A]
+        + Op.SWAP4
+        + Op.PUSH1[0x4E]
+        + Op.DUP5
+        + Op.JUMP(pc=0x6B)
+        + Op.JUMPDEST
+        + Op.ADD
+        + Op.DUP4
+        + Op.JUMP(pc=0x6F)
+        + Op.JUMPDEST
+        + Op.SUB
+        + Op.PUSH0
+        + Op.JUMP(pc=0x6F)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x6,
+            condition=Op.CALLCODE(
+                gas=Op.GAS,
+                address=Op.ADDRESS,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=Op.PUSH0,
+            ),
+        )
+        + Op.REVERT(offset=Op.DUP1, size=Op.PUSH0)
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.TLOAD
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.TSTORE
+        + Op.JUMP,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000006E3A7204),  # noqa: E501
+    )
+    # Source: yul
+    # {
+    #     function tload_temp(loc) -> val {
+    #       val := verbatim_1i_1o(hex"5C", loc)
+    #     }
+    #
+    #     function tstore_temp(loc, val) {
+    #       verbatim_2i_0o(hex"5D", loc, val)
+    #     }
+    #
+    #     // If we are called by ourselves, this is part of the loop.
+    #     if eq(caller(), address()) {
+    #       let counter := tload_temp(0)
+    #
+    #       // If the counter is equal to zero, we're done - return.
+    #       if eq(counter,0) {
+    #         return(0,0)
+    #       }
+    #
+    #       // Change the loop variable and call yourself
+    #       tstore_temp(1, add(tload_temp(1), counter))
+    #       tstore_temp(0, sub(counter, 1))
+    #       let res := delegatecall(gas(), address(), 0,0, 0,0)
+    #       if iszero(res) { // If the call failed, fail too
+    #          revert(0,0)
+    #       }
+    #     }
+    #
+    #
+    #     // If called by a different address, we are the first call and need
+    #     // to setup Trans[0] before starting the loop.
+    # ... (15 more lines)
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x33, condition=Op.EQ(Op.CALLER, Op.ADDRESS))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xE, condition=Op.SUB(Op.CALLER, Op.ADDRESS))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1B]
+        + Op.CALLDATALOAD(offset=Op.PUSH0)
+        + Op.SSTORE(key=0x1, value=Op.DUP1)
+        + Op.PUSH0
+        + Op.JUMP(pc=0x6E)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.ADDRESS,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=Op.PUSH0,
+            ),
+        )
+        + Op.PUSH1[0x2E]
+        + Op.PUSH1[0x1]
+        + Op.JUMP(pc=0x6A)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x3]
+        + Op.SSTORE
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x3A]
+        + Op.PUSH0
+        + Op.JUMP(pc=0x6A)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x68, condition=Op.ISZERO(Op.DUP1))
+        + Op.PUSH1[0x1]
+        + Op.DUP2
+        + Op.PUSH1[0x54]
+        + Op.PUSH1[0x5A]
+        + Op.SWAP4
+        + Op.PUSH1[0x4E]
+        + Op.DUP5
+        + Op.JUMP(pc=0x6A)
+        + Op.JUMPDEST
+        + Op.ADD
+        + Op.DUP4
+        + Op.JUMP(pc=0x6E)
+        + Op.JUMPDEST
+        + Op.SUB
+        + Op.PUSH0
+        + Op.JUMP(pc=0x6E)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x6,
+            condition=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=Op.ADDRESS,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=Op.PUSH0,
+            ),
+        )
+        + Op.REVERT(offset=Op.DUP1, size=Op.PUSH0)
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.TLOAD
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.TSTORE
+        + Op.JUMP,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000C1C922F1),  # noqa: E501
+    )
+    # Source: yul
+    # {
+    #     function tload_temp(loc) -> val {
+    #       val := verbatim_1i_1o(hex"5C", loc)
+    #     }
+    #
+    #     function tstore_temp(loc, val) {
+    #       verbatim_2i_0o(hex"5D", loc, val)
+    #     }
+    #
+    #     // Write these values to storage (overwriting the 0x60A7's).
+    #     // If these values are not zero, there is a problem.
+    #     sstore(0, tload_temp(0))
+    #     sstore(1, tload_temp(1))
+    #     pop(call(gas(), caller(), 0, 0,0, 0,0))
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x6]
+        + Op.PUSH0
+        + Op.JUMP(pc=0x1D)
+        + Op.JUMPDEST
+        + Op.PUSH0
+        + Op.SSTORE
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x1]
+        + Op.JUMP(pc=0x1D)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.SSTORE
+        + Op.CALL(
+            gas=Op.GAS,
+            address=Op.CALLER,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=Op.PUSH0,
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.TLOAD
+        + Op.SWAP1
+        + Op.JUMP,
+        storage={0: 24743, 1: 24743},
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000CA11BACC),  # noqa: E501
+    )
+    # Source: yul
+    # {
+    #     function tload_temp(loc) -> val {
+    #       val := verbatim_1i_1o(hex"5C", loc)
+    #     }
+    #
+    #     function tstore_temp(loc, val) {
+    #       verbatim_2i_0o(hex"5D", loc, val)
+    #     }
+    #
+    #     // We are inside the loop
+    #     if eq(caller(), address()) {
+    #       let counter := tload_temp(0)
+    #
+    #       // If counter is zero, we're at an end of the loop (a leaf of
+    #       // the tree), return.
+    #       if eq(counter,0) {
+    #         return(0,0)
+    #       }
+    #
+    #       // If counter isn't zero, call yourself with counter-1 twice and
+    #       // add one to Trans[1]
+    #       tstore_temp(0, sub(counter, 1))
+    #       let res := call(gas(), address(), 0, 0,0, 0,0)
+    #       if iszero(res) { // If the call failed, fail too
+    #          revert(0,0)
+    #       }
+    #
+    #       // We need to repair Trans[0] because it got overwritten in
+    #       // the previous call
+    #       tstore_temp(0, sub(counter, 1))
+    # ... (22 more lines)
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x33, condition=Op.EQ(Op.CALLER, Op.ADDRESS))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xE, condition=Op.SUB(Op.CALLER, Op.ADDRESS))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1B]
+        + Op.CALLDATALOAD(offset=Op.PUSH0)
+        + Op.SSTORE(key=0x1, value=Op.DUP1)
+        + Op.PUSH0
+        + Op.JUMP(pc=0x8D)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.ADDRESS,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=Op.PUSH0,
+            ),
+        )
+        + Op.PUSH1[0x2E]
+        + Op.PUSH1[0x1]
+        + Op.JUMP(pc=0x89)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x3]
+        + Op.SSTORE
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x3A]
+        + Op.PUSH0
+        + Op.JUMP(pc=0x89)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x87, condition=Op.ISZERO(Op.DUP1))
+        + Op.PUSH1[0x4A]
+        + Op.SUB(Op.DUP3, 0x1)
+        + Op.PUSH0
+        + Op.JUMP(pc=0x8D)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x83,
+            condition=Op.ISZERO(
+                Op.CALL(
+                    gas=Op.GAS,
+                    address=Op.ADDRESS,
+                    value=Op.DUP1,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=Op.DUP1,
+                    ret_size=Op.PUSH0,
+                )
+            ),
+        )
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x61]
+        + Op.SWAP2
+        + Op.SUB
+        + Op.PUSH0
+        + Op.JUMP(pc=0x8D)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x83,
+            condition=Op.ISZERO(
+                Op.CALL(
+                    gas=Op.GAS,
+                    address=Op.ADDRESS,
+                    value=Op.DUP1,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=Op.DUP1,
+                    ret_size=Op.PUSH0,
+                )
+            ),
+        )
+        + Op.PUSH1[0x7F]
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x78]
+        + Op.DUP2
+        + Op.JUMP(pc=0x89)
+        + Op.JUMPDEST
+        + Op.ADD
+        + Op.PUSH1[0x1]
+        + Op.JUMP(pc=0x8D)
+        + Op.JUMPDEST
+        + Op.JUMP(pc=0x6)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=Op.DUP1, size=Op.PUSH0)
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.TLOAD
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.TSTORE
+        + Op.JUMP,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000264BB86A),  # noqa: E501
+    )
+    # Source: yul
+    # {
+    #     function tload_temp(loc) -> val {
+    #       val := verbatim_1i_1o(hex"5C", loc)
+    #     }
+    #
+    #     function tstore_temp(loc, val) {
+    #       verbatim_2i_0o(hex"5D", loc, val)
+    #     }
+    #
+    #     // If we are in the loop
+    #     if eq(caller(), address()) {
+    #       let counter := tload_temp(0)
+    #
+    #       // If the counter is zero, we're at loop's end, return
+    #       if eq(counter,0) {
+    #         return(0,0)
+    #       }
+    #
+    #       // If counter isn't zero
+    #       // Call yourself with counter-1 twice then add 1 to Trans[1]
+    #       // Note that one call is callcode() and the other delegatecall().
+    #       // This way the same test checks both of them.
+    #
+    #       tstore_temp(0, sub(counter, 1))
+    #       let res := callcode(gas(), address(), 0, 0,0, 0,0)
+    #       if iszero(res) { // If the call failed, fail too
+    #          revert(0,0)
+    #       }
+    #
+    #       // We need to repair Trans[0] because it got overwritten in
+    # ... (25 more lines)
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x33, condition=Op.EQ(Op.CALLER, Op.ADDRESS))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xE, condition=Op.SUB(Op.CALLER, Op.ADDRESS))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1B]
+        + Op.CALLDATALOAD(offset=Op.PUSH0)
+        + Op.SSTORE(key=0x1, value=Op.DUP1)
+        + Op.PUSH0
+        + Op.JUMP(pc=0x8C)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.ADDRESS,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=Op.PUSH0,
+            ),
+        )
+        + Op.PUSH1[0x2E]
+        + Op.PUSH1[0x1]
+        + Op.JUMP(pc=0x88)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x3]
+        + Op.SSTORE
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x3A]
+        + Op.PUSH0
+        + Op.JUMP(pc=0x88)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x86, condition=Op.ISZERO(Op.DUP1))
+        + Op.PUSH1[0x4A]
+        + Op.SUB(Op.DUP3, 0x1)
+        + Op.PUSH0
+        + Op.JUMP(pc=0x8C)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x82,
+            condition=Op.ISZERO(
+                Op.CALLCODE(
+                    gas=Op.GAS,
+                    address=Op.ADDRESS,
+                    value=Op.DUP1,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=Op.DUP1,
+                    ret_size=Op.PUSH0,
+                )
+            ),
+        )
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x61]
+        + Op.SWAP2
+        + Op.SUB
+        + Op.PUSH0
+        + Op.JUMP(pc=0x8C)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x82,
+            condition=Op.ISZERO(
+                Op.DELEGATECALL(
+                    gas=Op.GAS,
+                    address=Op.ADDRESS,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=Op.DUP1,
+                    ret_size=Op.PUSH0,
+                )
+            ),
+        )
+        + Op.PUSH1[0x7E]
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x77]
+        + Op.DUP2
+        + Op.JUMP(pc=0x88)
+        + Op.JUMPDEST
+        + Op.ADD
+        + Op.PUSH1[0x1]
+        + Op.JUMP(pc=0x8C)
+        + Op.JUMPDEST
+        + Op.JUMP(pc=0x6)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=Op.DUP1, size=Op.PUSH0)
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.TLOAD
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.TSTORE
+        + Op.JUMP,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000007074A486),  # noqa: E501
+    )
+    # Source: yul
+    # {
+    #     function tload_temp(loc) -> val {
+    #       val := verbatim_1i_1o(hex"5C", loc)
+    #     }
+    #
+    #     function tstore_temp(loc, val) {
+    #       verbatim_2i_0o(hex"5D", loc, val)
+    #     }
+    #
+    #     tstore_temp(0, add(tload_temp(0), 1))
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x10]
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0xA]
+        + Op.PUSH0
+        + Op.JUMP(pc=0x12)
+        + Op.JUMPDEST
+        + Op.ADD
+        + Op.PUSH0
+        + Op.JUMP(pc=0x16)
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.TLOAD
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.TSTORE
+        + Op.JUMP,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000ADD1),  # noqa: E501
+    )
+    # Source: yul
+    # {
+    #     function tload_temp(loc) -> val {
+    #       val := verbatim_1i_1o(hex"5C", loc)
+    #     }
+    #
+    #     function tstore_temp(loc, val) {
+    #       verbatim_2i_0o(hex"5D", loc, val)
+    #     }
+    #
+    #     // If we are at the bottom of the call stack, increment
+    #     // the counter and return
+    #     if eq(calldatasize(), 0) {
+    #        tstore_temp(0, add(tload_temp(0),1))
+    #        return(0,0)
+    #     }
+    #
+    #     // If we are at the top of the stack (called by a different contract),  # noqa: E501
+    #     // set the counter to one
+    #     if iszero(eq(address(), caller())) {
+    #        tstore_temp(0, 1)
+    #     }
+    #
+    #     // Read the most significant byte of the input.
+    #     // Luckily for us the input is top justified - if the caller provided
+    #     // just n bytes (n<20), they will be the top n bytes of calldataload(0).  # noqa: E501
+    #     let callType := shr(
+    #         248,
+    #         calldataload(0)
+    #     )
+    #
+    # ... (32 more lines)
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x81, condition=Op.ISZERO(Op.CALLDATASIZE))
+        + Op.JUMPI(pc=0x74, condition=Op.SUB(Op.ADDRESS, Op.CALLER))
+        + Op.JUMPDEST
+        + Op.SHR(0xF8, Op.CALLDATALOAD(offset=Op.PUSH0))
+        + Op.MSTORE(offset=Op.PUSH0, value=Op.CALLDATALOAD(offset=Op.PUSH0))
+        + Op.SUB(Op.CALLDATASIZE, 0x1)
+        + Op.SWAP1
+        + Op.PUSH1[0x1]
+        + Op.SWAP1
+        + Op.JUMPI(pc=0x64, condition=Op.EQ(0xF1, Op.DUP1))
+        + Op.JUMPI(pc=0x54, condition=Op.EQ(0xF2, Op.DUP1))
+        + Op.PUSH1[0xF4]
+        + Op.JUMPI(pc=0x46, condition=Op.EQ)
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.JUMPI(pc=0x3B, condition=Op.SUB(Op.ADDRESS, Op.CALLER))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x42]
+        + Op.PUSH0
+        + Op.JUMP(pc=0x94)
+        + Op.JUMPDEST
+        + Op.PUSH0
+        + Op.SSTORE
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH0
+        + Op.SWAP2
+        + Op.DUP3
+        + Op.SWAP2
+        + Op.ADDRESS
+        + Op.GAS
+        + Op.POP(Op.DELEGATECALL)
+        + Op.PUSH0
+        + Op.DUP1
+        + Op.JUMP(pc=0x31)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH0
+        + Op.SWAP2
+        + Op.DUP3
+        + Op.SWAP2
+        + Op.DUP3
+        + Op.ADDRESS
+        + Op.GAS
+        + Op.POP(Op.CALLCODE)
+        + Op.PUSH0
+        + Op.DUP1
+        + Op.JUMP(pc=0x31)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH0
+        + Op.SWAP2
+        + Op.DUP3
+        + Op.SWAP2
+        + Op.DUP3
+        + Op.ADDRESS
+        + Op.GAS
+        + Op.POP(Op.CALL)
+        + Op.PUSH0
+        + Op.DUP1
+        + Op.JUMP(pc=0x31)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x7D]
+        + Op.PUSH1[0x1]
+        + Op.PUSH0
+        + Op.JUMP(pc=0x98)
+        + Op.JUMPDEST
+        + Op.JUMP(pc=0xB)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x92]
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x8C]
+        + Op.PUSH0
+        + Op.JUMP(pc=0x94)
+        + Op.JUMPDEST
+        + Op.ADD
+        + Op.PUSH0
+        + Op.JUMP(pc=0x98)
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.TLOAD
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.TSTORE
+        + Op.JUMP,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000C54B5829),  # noqa: E501
+    )
+    # Source: yul
+    # {
+    #     function tload_temp(loc) -> val {
+    #       val := verbatim_1i_1o(hex"5C", loc)
+    #     }
+    #
+    #     function tstore_temp(loc, val) {
+    #       verbatim_2i_0o(hex"5D", loc, val)
+    #     }
+    #
+    #     // There is calldata, so write to Trans[0]
+    #     if calldatasize() {
+    #        tstore_temp(0, 0x60A7)
+    #     }
+    #
+    #     // Return Trans[0]
+    #     // This happens whether we are called with data or not.
+    #     mstore(0, tload_temp(0))
+    #     return(0,32)
+    # }
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x12, condition=Op.CALLDATASIZE)
+        + Op.JUMPDEST
+        + Op.PUSH1[0xB]
+        + Op.PUSH0
+        + Op.JUMP(pc=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH0
+        + Op.MSTORE
+        + Op.RETURN(offset=Op.PUSH0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1C]
+        + Op.PUSH2[0x60A7]
+        + Op.PUSH0
+        + Op.JUMP(pc=0x24)
+        + Op.JUMPDEST
+        + Op.JUMP(pc=0x4)
+        + Op.JUMPDEST
+        + Op.TLOAD
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.TSTORE
+        + Op.JUMP,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000057A7),  # noqa: E501
+    )
+    # Source: yul
+    # {
+    #   let func := shr(224, calldataload(0))
+    #   let param := calldataload(4)
+    #   sstore(0, func)
+    #   mstore(0, param)
+    #   sstore(1, call(gas(), func, 0, 0,32, 0,0))
+    # }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH0
+        + Op.DUP1
+        + Op.PUSH1[0x20]
+        + Op.DUP2
+        + Op.DUP1
+        + Op.SHR(0xE0, Op.CALLDATALOAD(offset=Op.DUP1))
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.SSTORE(key=Op.DUP4, value=Op.DUP2)
+        + Op.DUP3
+        + Op.MSTORE
+        + Op.GAS
+        + Op.SSTORE(key=0x1, value=Op.CALL)
+        + Op.STOP,
+        nonce=1,
+        address=Address(0xDD53B677A6FD4E871A6355F283B1BD7CEB95A95E),  # noqa: E501
+    )
+    # Source: yul
+    # {
+    #     function tload_temp(loc) -> val {
+    #       val := verbatim_1i_1o(hex"5C", loc)
+    #     }
+    #
+    #     function tstore_temp(loc, val) {
+    #       verbatim_2i_0o(hex"5D", loc, val)
+    #     }
+    #
+    #     // If we are called by 0xca11bacc, this is part of the loop
+    #     if eq(caller(), 0xca11bacc) {
+    #       let counter := tload_temp(0)
+    #
+    #       // If the counter is equal to zero, we're done - return.
+    #       if eq(counter,0) {
+    #         return(0,0)
+    #       }
+    #
+    #       // If counter isn't zero, add counter to Trans[1] and do recursion
+    #       tstore_temp(1, add(tload_temp(1), counter))
+    #
+    #       // Change the loop variable and call 0xca11bacc, which calls us back.  # noqa: E501
+    #       tstore_temp(0, sub(counter, 1))
+    #       let res := call(gas(), 0xca11bacc, 0, 0,0, 0,0)
+    #       if iszero(res) { // If the call failed, fail too
+    #          revert(0,0)
+    #       }
+    #     }
+    #
+    #     // If called by a different address from 0xca11bacc, we are the first
+    # ... (12 more lines)
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x3F, condition=Op.EQ(Op.CALLER, 0xCA11BACC))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x16, condition=Op.SUB(Op.CALLER, 0xCA11BACC))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x23]
+        + Op.CALLDATALOAD(offset=Op.PUSH0)
+        + Op.SSTORE(key=0x1, value=Op.DUP1)
+        + Op.PUSH0
+        + Op.JUMP(pc=0x7F)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=0xCA11BACC,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=Op.PUSH0,
+            ),
+        )
+        + Op.PUSH1[0x3A]
+        + Op.PUSH1[0x1]
+        + Op.JUMP(pc=0x7B)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x3]
+        + Op.SSTORE
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x46]
+        + Op.PUSH0
+        + Op.JUMP(pc=0x7B)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x79, condition=Op.ISZERO(Op.DUP1))
+        + Op.PUSH1[0x1]
+        + Op.DUP2
+        + Op.PUSH1[0x60]
+        + Op.PUSH1[0x66]
+        + Op.SWAP4
+        + Op.PUSH1[0x5A]
+        + Op.DUP5
+        + Op.JUMP(pc=0x7B)
+        + Op.JUMPDEST
+        + Op.ADD
+        + Op.DUP4
+        + Op.JUMP(pc=0x7F)
+        + Op.JUMPDEST
+        + Op.SUB
+        + Op.PUSH0
+        + Op.JUMP(pc=0x7F)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0xA,
+            condition=Op.CALL(
+                gas=Op.GAS,
+                address=0xCA11BACC,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=Op.PUSH0,
+            ),
+        )
+        + Op.REVERT(offset=Op.DUP1, size=Op.PUSH0)
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.TLOAD
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.TSTORE
+        + Op.JUMP,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000005114E2C8),  # noqa: E501
+    )
+    # Source: yul
+    # {
+    #     function tload_temp(loc) -> val {
+    #       val := verbatim_1i_1o(hex"5C", loc)
+    #     }
+    #
+    #     function tstore_temp(loc, val) {
+    #       verbatim_2i_0o(hex"5D", loc, val)
+    #     }
+    #
+    #     // The initial value of the counter is zero
+    #     sstore(0, tload_temp(0))
+    #
+    #     // CALLCODE increments our Trans[0]
+    #     sstore(0x11, callcode(gas(), 0xadd1, 0, 0,0, 0,0))
+    #     sstore(1, tload_temp(0))
+    #
+    #     // DELEGATECALL increments our Trans[0]
+    #     sstore(0x12, delegatecall(gas(), 0xadd1, 0,0, 0,0))
+    #     sstore(2, tload_temp(0))
+    #
+    #     // CALL does not increment our Trans[0], it means a different
+    #     // transient storage
+    #     sstore(0x13, call(gas(), 0xadd1, 0, 0,0, 0,0))
+    #     sstore(3, tload_temp(0))
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x6]
+        + Op.PUSH0
+        + Op.JUMP(pc=0x4E)
+        + Op.JUMPDEST
+        + Op.PUSH0
+        + Op.SSTORE
+        + Op.SSTORE(
+            key=0x11,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0xADD1,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=Op.PUSH0,
+            ),
+        )
+        + Op.PUSH1[0x1C]
+        + Op.PUSH0
+        + Op.JUMP(pc=0x4E)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.SSTORE
+        + Op.SSTORE(
+            key=0x12,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0xADD1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=Op.PUSH0,
+            ),
+        )
+        + Op.PUSH1[0x32]
+        + Op.PUSH0
+        + Op.JUMP(pc=0x4E)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x2]
+        + Op.SSTORE
+        + Op.SSTORE(
+            key=0x13,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=0xADD1,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=Op.PUSH0,
+            ),
+        )
+        + Op.PUSH1[0x49]
+        + Op.PUSH0
+        + Op.JUMP(pc=0x4E)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x3]
+        + Op.SSTORE
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.TLOAD
+        + Op.SWAP1
+        + Op.JUMP,
+        storage={0: 24743},
+        nonce=1,
+        address=Address(0x000000000000000000000000000000007F9317BD),  # noqa: E501
+    )
+    # Source: yul
+    # {
+    #     // Set up Trans[0] with a regular call.
+    #     sstore(0x10,call(gas(), 0x57A7, 0, 0,1, 0,32))
+    #     sstore(0, mload(0))
+    #
+    #     // Use staticcall to read Trans[0] of 0x0..57A7.
+    #     mstore(0,0)
+    #     sstore(0x11,staticcall(gas(), 0x57A7, 0,0, 0,32))
+    #     sstore(1, mload(0))
+    #
+    #     // Try to use staticall to write Trans[0]. This should fail.
+    #     mstore(0,0)
+    #     sstore(0x12,staticcall(gas(), 0x57A7, 0,1, 0,32))
+    #     sstore(2, mload(0))
+    # }
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x10,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=0x57A7,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x1,
+                ret_offset=Op.PUSH0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=Op.PUSH0, value=Op.MLOAD(offset=Op.PUSH0))
+        + Op.MSTORE(offset=Op.DUP1, value=Op.PUSH0)
+        + Op.SSTORE(
+            key=0x11,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x57A7,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.PUSH0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=Op.PUSH0))
+        + Op.MSTORE(offset=Op.DUP1, value=Op.PUSH0)
+        + Op.SSTORE(
+            key=0x12,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x57A7,
+                args_offset=Op.DUP2,
+                args_size=0x1,
+                ret_offset=Op.PUSH0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=Op.PUSH0))
+        + Op.STOP,
+        storage={2: 24743, 18: 24743},
+        nonce=1,
+        address=Address(0x000000000000000000000000000000005D7935DF),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: contract_0, 1: 1}),
+                contract_0: Account(storage={1: 16, 2: 1, 3: 136}),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: contract_1, 1: 1}),
+                contract_1: Account(storage={1: 16, 2: 1, 3: 136}),
+            },
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: contract_2, 1: 1}),
+                contract_2: Account(storage={1: 16, 2: 1, 3: 136}),
+            },
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: contract_0, 1: 1}),
+                contract_0: Account(storage={1: 256, 2: 1, 3: 32896}),
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: contract_4, 1: 1}),
+                contract_4: Account(storage={1: 10, 2: 1, 3: 55}),
+                contract_3: Account(storage={0: 0, 1: 0}),
+            },
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: contract_4, 1: 1}),
+                contract_4: Account(storage={1: 50, 2: 1, 3: 1275}),
+                contract_3: Account(storage={0: 0, 1: 0}),
+            },
+        },
+        {
+            "indexes": {"data": [6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: contract_5, 1: 1}),
+                contract_5: Account(storage={1: 6, 2: 1, 3: 63}),
+            },
+        },
+        {
+            "indexes": {"data": [7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: contract_6, 1: 1}),
+                contract_6: Account(storage={1: 6, 2: 1, 3: 63}),
+            },
+        },
+        {
+            "indexes": {"data": [8], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: contract_8, 1: 1}),
+                contract_8: Account(
+                    storage={0: 0, 1: 1, 2: 2, 3: 2, 17: 1, 18: 1, 19: 1},
+                ),
+            },
+        },
+        {
+            "indexes": {
+                "data": [9, 10, 11, 12, 13, 14],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: contract_9, 1: 1}),
+                contract_9: Account(storage={0: 2}),
+            },
+        },
+        {
+            "indexes": {"data": [15], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: contract_11, 1: 1}),
+                contract_11: Account(
+                    storage={0: 24743, 1: 24743, 2: 0, 16: 1, 17: 1, 18: 0},
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("ebd141d5") + Hash(0x10),
+        Bytes("6e3a7204") + Hash(0x10),
+        Bytes("c1c922f1") + Hash(0x10),
+        Bytes("ebd141d5") + Hash(0x100),
+        Bytes("5114e2c8") + Hash(0xA),
+        Bytes("5114e2c8") + Hash(0x32),
+        Bytes("264bb86a") + Hash(0x6),
+        Bytes("7074a486") + Hash(0x6),
+        Bytes("7f9317bd"),
+        Bytes("c54b5829")
+        + Hash(
+            0xF2F4F1F2F4F1F2F4F1F2F4F1F2F4F1F2F4F1F2F4F1F2F4F1F2F4F1F2F4F1F1F1
+        ),
+        Bytes("c54b5829")
+        + Hash(
+            0xF1F1F1F1F2F2F2F2F4F4F4F4F1F1F1F1F2F2F2F2F4F4F4F4F1F1F1F1F2F2F2F2
+        ),
+        Bytes("c54b5829")
+        + Hash(
+            0xF1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1
+        ),
+        Bytes("c54b5829")
+        + Hash(
+            0xF1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1
+        ),
+        Bytes("c54b5829")
+        + Hash(
+            0xF2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2F2
+        ),
+        Bytes("c54b5829")
+        + Hash(
+            0xF4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4F4
+        ),
+        Bytes("5d7935df"),
+    ]
+    tx_gas = [16777216]
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        nonce=1,
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP1153_transientStorage/test_trans_storage_reset.py b/tests/ported_static/stEIP1153_transientStorage/test_trans_storage_reset.py
new file mode 100644
index 00000000000..de1ad618dd6
--- /dev/null
+++ b/tests/ported_static/stEIP1153_transientStorage/test_trans_storage_reset.py
@@ -0,0 +1,734 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/Cancun/stEIP1153_transientStorage/transStorageResetFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    [
+        "state_tests/Cancun/stEIP1153_transientStorage/transStorageResetFiller.yml"  # noqa: E501
+    ],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="reverter-call-call-stop",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="reverter-call-call-revert",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="reverter-call-call-invalid",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="reverter-delegate-call-stop",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="reverter-delegate-call-revert",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="reverter-delegate-call-invalid",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="reverter-code-call-stop",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="reverter-code-call-revert",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="reverter-code-call-invalid",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="reverter-delegate-delegate-stop",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="reverter-delegate-delegate-revert",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="reverter-delegate-delegate-invalid",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="reverter-delegate-code-stop",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="reverter-delegate-code-revert",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="reverter-delegate-code-invalid",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="reverter-code-delegate-stop",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="reverter-code-delegate-revert",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="reverter-code-delegate-invalid",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="reverter-code-code-stop",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="reverter-code-code-revert",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="reverter-code-code-invalid",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="reverter-call-nop-stop",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="reverter-call-nop-revert",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="reverter-call-nop-invalid",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="reverter-delegate-nop-stop",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="reverter-delegate-nop-revert",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="reverter-delegate-nop-invalid",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="reverter-code-nop-stop",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="reverter-code-nop-revert",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="reverter-code-nop-invalid",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_trans_storage_reset(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE, nonce=1)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: yul
+    # {
+    #     // These two functions use transient storage.
+    #     // Once the relevant opcodes are added to Yul, simply remove
+    #     // them (from all contracts) and remove the _temp suffices.
+    #     function tload_temp(loc) -> val {
+    #       val := verbatim_1i_1o(hex"5C", loc)
+    #     }
+    #
+    #     function tstore_temp(loc, val) {
+    #       verbatim_2i_0o(hex"5D", loc, val)
+    #     }
+    #
+    #     let reverter := calldataload(0)
+    #     let dead     := calldataload(32)
+    #     mstore(0, reverter)
+    #     mstore(32, dead)
+    #
+    #     let callType := byte(0x1E, calldataload(64))
+    #     let failType := byte(0x1F, calldataload(64))
+    #
+    #     let callRes := 0x7E57
+    #
+    #     switch callType
+    #     // We cannot use caller() because if we were delegatecall()ed or
+    #     // callcode()ed caller() is still 0xCCC...CCC
+    #     case 0xF1 { callRes := call        (gas(), reverter, 0, 0,64, 0,0) }
+    #     case 0xF2 { callRes := callcode    (gas(), reverter, 0, 0,64, 0,0) }
+    #     case 0xF4 { callRes := delegatecall(gas(), reverter,    0,64, 0,0) }
+    #
+    #     // Don't call anything, just set Trans[0] here.
+    # ... (13 more lines)
+    dead = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=Op.PUSH0)
+        + Op.CALLDATALOAD(offset=0x20)
+        + Op.MSTORE(offset=Op.PUSH0, value=Op.DUP2)
+        + Op.PUSH1[0x20]
+        + Op.MSTORE
+        + Op.BYTE(0x1E, Op.CALLDATALOAD(offset=0x40))
+        + Op.BYTE(0x1F, Op.CALLDATALOAD(offset=0x40))
+        + Op.SWAP2
+        + Op.PUSH2[0x7E57]
+        + Op.SWAP2
+        + Op.SWAP1
+        + Op.JUMPI(pc=0x91, condition=Op.EQ(0xF1, Op.DUP2))
+        + Op.JUMPI(pc=0x80, condition=Op.EQ(0xF2, Op.DUP2))
+        + Op.JUMPI(pc=0x70, condition=Op.EQ(0xF4, Op.DUP2))
+        + Op.POP
+        + Op.JUMPI(pc=0x60, condition=Op.ISZERO)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x10]
+        + Op.SSTORE
+        + Op.JUMPI(pc=0x5E, condition=Op.ISZERO(Op.DUP1))
+        + Op.JUMPI(pc=0x5A, condition=Op.EQ(0xFD, Op.DUP1))
+        + Op.JUMPI(pc=0x58, condition=Op.EQ(0xFE, Op.DUP1))
+        + Op.PUSH1[0xFF]
+        + Op.JUMPI(pc=0x55, condition=Op.EQ)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SELFDESTRUCT(address=Op.PUSH0)
+        + Op.JUMPDEST
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.REVERT(offset=Op.DUP1, size=Op.PUSH0)
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x6C]
+        + Op.PUSH4[0xBAD0BEEF]
+        + Op.PUSH0
+        + Op.JUMP(pc=0xA2)
+        + Op.JUMPDEST
+        + Op.JUMP(pc=0x37)
+        + Op.JUMPDEST
+        + Op.PUSH0
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x40]
+        + Op.SWAP2
+        + Op.GAS
+        + Op.DELEGATECALL
+        + Op.JUMP(pc=0x37)
+        + Op.JUMPDEST
+        + Op.PUSH0
+        + Op.DUP1 * 2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x40]
+        + Op.SWAP3
+        + Op.GAS
+        + Op.CALLCODE
+        + Op.JUMP(pc=0x37)
+        + Op.JUMPDEST
+        + Op.PUSH0
+        + Op.DUP1 * 2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x40]
+        + Op.SWAP3
+        + Op.GAS
+        + Op.CALL
+        + Op.JUMP(pc=0x37)
+        + Op.JUMPDEST
+        + Op.TSTORE
+        + Op.JUMP,
+        storage={16: 24743},
+        nonce=1,
+    )
+    # Source: yul
+    # {
+    #     function tload_temp(loc) -> val {
+    #       val := verbatim_1i_1o(hex"5C", loc)
+    #     }
+    #
+    #     function tstore_temp(loc, val) {
+    #       verbatim_2i_0o(hex"5D", loc, val)
+    #     }
+    #
+    #     let reverter := calldataload(0)
+    #     let dead     := calldataload(32)
+    #     mstore(0, reverter)
+    #     mstore(32, dead)
+    #
+    #     // The type of call to use here
+    #     let callType := byte(0x1D, calldataload(64))
+    #
+    #
+    #     // Because we use DELEGATECALL in some cases, we cannot rely on caller()  # noqa: E501
+    #     // (in a DELEGATECALL the caller is the one who called the contract that  # noqa: E501
+    #     // has the storage.
+    #
+    #     // First invocation, called by  0xCCCCC...CCCC
+    #     if iszero(tload_temp(0)) {
+    #       tstore_temp(0, 0x60A7)
+    #       mstore(64, calldataload(64))
+    #
+    #       let callRes := 0
+    #
+    #       // We only send half the gas because the call may spend all
+    # ... (22 more lines)
+    reverter = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=Op.PUSH0)
+        + Op.CALLDATALOAD(offset=0x20)
+        + Op.SWAP1
+        + Op.PUSH0
+        + Op.MSTORE
+        + Op.MSTORE(offset=0x20, value=Op.DUP1)
+        + Op.BYTE(0x1D, Op.CALLDATALOAD(offset=0x40))
+        + Op.SWAP1
+        + Op.PUSH1[0x19]
+        + Op.PUSH0
+        + Op.JUMP(pc=0xA8)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x39, condition=Op.ISZERO)
+        + Op.PUSH2[0x60A7]
+        + Op.PUSH1[0x27]
+        + Op.PUSH0
+        + Op.JUMP(pc=0xA8)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x2D, condition=Op.EQ)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x37]
+        + Op.PUSH2[0xBEEF]
+        + Op.PUSH0
+        + Op.JUMP(pc=0xAC)
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x43]
+        + Op.PUSH2[0x60A7]
+        + Op.PUSH0
+        + Op.JUMP(pc=0xAC)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
+        + Op.PUSH0
+        + Op.SWAP2
+        + Op.DIV(Op.GAS, 0x2)
+        + Op.SWAP1
+        + Op.JUMPI(pc=0x96, condition=Op.EQ(0xF1, Op.DUP1))
+        + Op.JUMPI(pc=0x84, condition=Op.EQ(0xF2, Op.DUP1))
+        + Op.PUSH1[0xF4]
+        + Op.JUMPI(pc=0x74, condition=Op.EQ)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.DUP3)
+        + Op.PUSH1[0x70]
+        + Op.PUSH0
+        + Op.JUMP(pc=0xA8)
+        + Op.JUMPDEST
+        + Op.PUSH0
+        + Op.SSTORE
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH0
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.PUSH1[0x60]
+        + Op.SWAP3
+        + Op.DELEGATECALL
+        + Op.PUSH0
+        + Op.DUP1
+        + Op.JUMP(pc=0x65)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH0
+        + Op.DUP1 * 2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.PUSH1[0x60]
+        + Op.SWAP4
+        + Op.CALLCODE
+        + Op.PUSH0
+        + Op.DUP1
+        + Op.JUMP(pc=0x65)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH0
+        + Op.DUP1 * 2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.PUSH1[0x60]
+        + Op.SWAP4
+        + Op.CALL
+        + Op.PUSH0
+        + Op.DUP1
+        + Op.JUMP(pc=0x65)
+        + Op.JUMPDEST
+        + Op.TLOAD
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.TSTORE
+        + Op.JUMP,
+        storage={1: 24743},
+        nonce=1,
+    )
+    # Source: yul
+    # {
+    #   let reverter := calldataload(4)
+    #   let dead     := calldataload(36)
+    #   let param := calldataload(68)
+    #   sstore(0, reverter)
+    #   mstore(0, reverter)
+    #   mstore(32, dead)
+    #   mstore(64, param)
+    #   sstore(1, call(gas(), reverter, 0, 0, 96, 0, 0))
+    # }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH0
+        + Op.DUP1
+        + Op.PUSH1[0x60]
+        + Op.DUP2
+        + Op.DUP1
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.CALLDATALOAD(offset=0x24)
+        + Op.CALLDATALOAD(offset=0x44)
+        + Op.SWAP1
+        + Op.SSTORE(key=Op.DUP5, value=Op.DUP3)
+        + Op.MSTORE(offset=Op.DUP5, value=Op.DUP3)
+        + Op.PUSH1[0x20]
+        + Op.MSTORE
+        + Op.PUSH1[0x40]
+        + Op.MSTORE
+        + Op.GAS
+        + Op.SSTORE(key=0x1, value=Op.CALL)
+        + Op.STOP,
+        nonce=1,
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: reverter, 1: 1}),
+                reverter: Account(storage={0: 48879, 1: 1}),
+                dead: Account(storage={16: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [3, 6, 9, 12, 15, 18], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: reverter, 1: 1}),
+                reverter: Account(storage={0: 48879, 1: 1, 16: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [24, 27], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: reverter, 1: 1}),
+                reverter: Account(storage={0: 0xBAD0BEEF, 1: 1, 16: 32343}),
+            },
+        },
+        {
+            "indexes": {
+                "data": [
+                    1,
+                    2,
+                    4,
+                    5,
+                    7,
+                    8,
+                    10,
+                    11,
+                    13,
+                    14,
+                    16,
+                    17,
+                    19,
+                    20,
+                    22,
+                    23,
+                    25,
+                    26,
+                    28,
+                    29,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: reverter, 1: 1}),
+                reverter: Account(storage={0: 24743, 1: 0}),
+                dead: Account(storage={16: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [21], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: reverter, 1: 1}),
+                reverter: Account(storage={0: 24743, 1: 1}),
+                dead: Account(storage={16: 32343}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF1F100),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF1F1FD),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF1F1FE),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF4F100),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF4F1FD),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF4F1FE),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF2F100),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF2F1FD),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF2F1FE),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF4F400),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF4F4FD),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF4F4FE),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF4F200),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF4F2FD),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF4F2FE),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF2F400),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF2F4FD),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF2F4FE),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF2F200),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF2F2FD),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF2F2FE),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF10000),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF100FD),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF100FE),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF40000),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF400FD),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF400FE),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF20000),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF200FD),
+        Bytes("d6c2107a")
+        + Hash(reverter, left_padding=True)
+        + Hash(dead, left_padding=True)
+        + Hash(0xF200FE),
+    ]
+    tx_gas = [16777216]
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        nonce=1,
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150Specific/__init__.py b/tests/ported_static/stEIP150Specific/__init__.py
index 0426e344a7a..b4c3c0beb5f 100644
--- a/tests/ported_static/stEIP150Specific/__init__.py
+++ b/tests/ported_static/stEIP150Specific/__init__.py
@@ -1 +1 @@
-"""Tests ported from stEIP150Specific."""
+"""Ported static tests: stEIP150Specific."""  # noqa: N999
diff --git a/tests/ported_static/stEIP150Specific/test_call_and_callcode_consume_more_gas_then_transaction_has.py b/tests/ported_static/stEIP150Specific/test_call_and_callcode_consume_more_gas_then_transaction_has.py
index afe52172701..aa6ecf33493 100644
--- a/tests/ported_static/stEIP150Specific/test_call_and_callcode_consume_more_gas_then_transaction_has.py
+++ b/tests/ported_static/stEIP150Specific/test_call_and_callcode_consume_more_gas_then_transaction_has.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_and_callcode_consume_more_gas_then_transaction_has.
 
 Ported from:
-tests/static/state_tests/stEIP150Specific
-CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json
+state_tests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json",  # noqa: E501
+        "state_tests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_and_callcode_consume_more_gas_then_transaction_has(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_call_and_callcode_consume_more_gas_then_transaction_has."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,56 +45,51 @@ def test_call_and_callcode_consume_more_gas_then_transaction_has(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 <contract:0x1000000000000000000000000000000000000103> 0 0 0 0 0)) (SSTORE 10 (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000103> 0 0 0 0 0)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0xFD59ABAE521384B5731AC657616680219FBC423D,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xA,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0xFD59ABAE521384B5731AC657616680219FBC423D,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 0x12) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x12) + Op.STOP,
         nonce=0,
-        address=Address("0x9bdb308c9b567e1dbc906d9d592a8464a05ffd44"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=0x12) + Op.STOP,
+    # Source: lll
+    # { (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 <contract:0x1000000000000000000000000000000000000103> 0 0 0 0 0)) (SSTORE 10 (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000103> 0 0 0 0 0)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xA,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xfd59abae521384b5731ac657616680219fbc423d"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post = {
-        contract: Account(storage={0: 18, 8: 0x8D5B6, 9: 1, 10: 1}),
-        callee: Account(storage={0: 18}),
-    }
+    post = {target: Account(storage={0: 18, 8: 0x8D5B6, 9: 1, 10: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150Specific/test_call_ask_more_gas_on_depth2_then_transaction_has.py b/tests/ported_static/stEIP150Specific/test_call_ask_more_gas_on_depth2_then_transaction_has.py
index 810ca7c5c73..61fd1052dec 100644
--- a/tests/ported_static/stEIP150Specific/test_call_ask_more_gas_on_depth2_then_transaction_has.py
+++ b/tests/ported_static/stEIP150Specific/test_call_ask_more_gas_on_depth2_then_transaction_has.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_ask_more_gas_on_depth2_then_transaction_has.
 
 Ported from:
-tests/static/state_tests/stEIP150Specific
-CallAskMoreGasOnDepth2ThenTransactionHasFiller.json
+state_tests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json",  # noqa: E501
+        "state_tests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_ask_more_gas_on_depth2_then_transaction_has(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_call_ask_more_gas_on_depth2_then_transaction_has."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,65 +45,61 @@ def test_call_ask_more_gas_on_depth2_then_transaction_has(
         gas_limit=10000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0xF39D40EACB6D2C685AC10664E759D1CF8F775DFF,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 8 (GAS))}
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x25c370b55ec8467127bc4e13404915901d689098"),  # noqa: E501
     )
-    # Source: LLL
-    # { (SSTORE 8 (GAS)) (SSTORE 9 (CALL 200000 <contract:0x1000000000000000000000000000000000000107> 0 0 0 0 0)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.CALL(
-                    gas=0x30D40,
-                    address=0x25C370B55EC8467127BC4E13404915901D689098,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 <contract:0x1000000000000000000000000000000000000108> 0 0 0 0 0)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8553d06001d46f3b0b18a938acf8c552d87c5837"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=Op.SSTORE(key=0x8, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { (SSTORE 8 (GAS)) (SSTORE 9 (CALL 200000 <contract:0x1000000000000000000000000000000000000107> 0 0 0 0 0)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.CALL(
+                gas=0x30D40,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf39d40eacb6d2c685ac10664e759d1cf8f775dff"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        callee: Account(storage={8: 0x30D3E, 9: 1}),
-        contract: Account(storage={8: 0x8D5B6, 9: 1}),
-        callee_1: Account(storage={8: 0x2A1F6}),
+        addr: Account(storage={8: 0x30D3E, 9: 1}),
+        addr_2: Account(storage={8: 0x2A1F6}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150Specific/test_call_goes_oog_on_second_level.py b/tests/ported_static/stEIP150Specific/test_call_goes_oog_on_second_level.py
index 0dc5ba2735e..ce3ec8f7f19 100644
--- a/tests/ported_static/stEIP150Specific/test_call_goes_oog_on_second_level.py
+++ b/tests/ported_static/stEIP150Specific/test_call_goes_oog_on_second_level.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_goes_oog_on_second_level.
 
 Ported from:
-tests/static/state_tests/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json
+state_tests/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_call_goes_oog_on_second_level(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_call_goes_oog_on_second_level."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,71 +43,67 @@ def test_call_goes_oog_on_second_level(
         gas_limit=10000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0xCCC0159BD2EF7118B5E7B8D958E72237F02493FE,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 8 (GAS)) (KECCAK256 0x00 0x2fffff) (SSTORE 9 (GAS)) (SSTORE 10 (GAS)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(key=0x9, value=Op.GAS)
+        + Op.SSTORE(key=0xA, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x066f77b181e0e662e17d427c7320267adf2fd624"),  # noqa: E501
     )
-    # Source: LLL
-    # { (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 <contract:0x1000000000000000000000000000000000000110> 0 0 0 0 0)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x66F77B181E0E662E17D427C7320267ADF2FD624,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 8 (GAS)) (SSTORE 9 (CALL 300000 <contract:0x1000000000000000000000000000000000000111> 0 0 0 0 0)) [[12]] 1}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3c6dca5471c6305d0642c6210d39d4613b5ea30b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(key=0x9, value=Op.GAS)
-            + Op.SSTORE(key=0xA, value=Op.GAS)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 <contract:0x1000000000000000000000000000000000000110> 0 0 0 0 0)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xccc0159bd2ef7118b5e7b8d958e72237f02493fe"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=2200000,
     )
 
     post = {
-        callee: Account(storage={8: 0x927BE, 12: 1}),
-        contract: Account(storage={8: 0x213FB6, 9: 1}),
+        addr: Account(storage={8: 0x927BE, 12: 1}),
+        addr_2: Account(storage={}),
+        target: Account(storage={8: 0x213FB6, 9: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150Specific/test_call_goes_oog_on_second_level2.py b/tests/ported_static/stEIP150Specific/test_call_goes_oog_on_second_level2.py
index e940a29d0ef..186b2ad0636 100644
--- a/tests/ported_static/stEIP150Specific/test_call_goes_oog_on_second_level2.py
+++ b/tests/ported_static/stEIP150Specific/test_call_goes_oog_on_second_level2.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_goes_oog_on_second_level2.
 
 Ported from:
-tests/static/state_tests/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json
+state_tests/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_call_goes_oog_on_second_level2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_call_goes_oog_on_second_level2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,65 +43,64 @@ def test_call_goes_oog_on_second_level2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 <contract:0x1000000000000000000000000000000000000113> 0 0 0 0 0)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0xE1D370A0538366EAFFBC9FCD571AF7B1E80D377C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 8 (GAS)) (KECCAK256 0x00 0x2fffff) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x171742e7809e3b571e899f0d4d9d35cd5deeacf1"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 <contract:0x1000000000000000000000000000000000000114> 0 0 0 0 0)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xbfb2b65e4ef26a144a185b32c7baf39ef8e40b4b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0xBFB2B65E4EF26A144A185B32C7BAF39EF8E40B4B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 8 (GAS)) (SSTORE 9 (CALL 600000 <contract:0x1000000000000000000000000000000000000113> 0 0 0 0 0)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe1d370a0538366eaffbc9fcd571af7b1e80d377c"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=160000,
     )
 
-    post: dict = {}
+    post = {
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        target: Account(storage={}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150Specific/test_create_and_gas_inside_create.py b/tests/ported_static/stEIP150Specific/test_create_and_gas_inside_create.py
index f0ff7b83bad..0bcf52c7d85 100644
--- a/tests/ported_static/stEIP150Specific/test_create_and_gas_inside_create.py
+++ b/tests/ported_static/stEIP150Specific/test_create_and_gas_inside_create.py
@@ -1,19 +1,20 @@
 """
-Test ported from static filler.
+Test_create_and_gas_inside_create.
 
 Ported from:
-tests/static/state_tests/stEIP150Specific/CreateAndGasInsideCreateFiller.json
+state_tests/stEIP150Specific/CreateAndGasInsideCreateFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150Specific/CreateAndGasInsideCreateFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150Specific/CreateAndGasInsideCreateFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +31,10 @@ def test_create_and_gas_inside_create(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_and_gas_inside_create."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,38 +45,33 @@ def test_create_and_gas_inside_create(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [100] (GAS) (MSTORE 0 0x5a60fd55) (SSTORE 11 (CREATE 0 28 4)) (SSTORE 9 (SUB @100 (GAS))) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x64, value=Op.GAS)
-            + Op.MSTORE(offset=0x0, value=0x5A60FD55)
-            + Op.SSTORE(
-                key=0xB, value=Op.CREATE(value=0x0, offset=0x1C, size=0x4)
-            )
-            + Op.SSTORE(key=0x9, value=Op.SUB(Op.MLOAD(offset=0x64), Op.GAS))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x64, value=Op.GAS)
+        + Op.MSTORE(offset=0x0, value=0x5A60FD55)
+        + Op.SSTORE(key=0xB, value=Op.CREATE(value=0x0, offset=0x1C, size=0x4))
+        + Op.SSTORE(key=0x9, value=Op.SUB(Op.MLOAD(offset=0x64), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 9: 0x129DB,
-                11: 0xF1ECF98489FA9ED60A664FC4998DB699CFA39D40,
+                11: compute_create_address(address=contract_0, nonce=0),
             },
         ),
-        Address("0xf1ecf98489fa9ed60a664fc4998db699cfa39d40"): Account(
-            storage={253: 0x83729},
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={253: 0x83729}
         ),
     }
 
diff --git a/tests/ported_static/stEIP150Specific/test_delegate_call_on_eip.py b/tests/ported_static/stEIP150Specific/test_delegate_call_on_eip.py
index c0b4bacf6f6..5156516411b 100644
--- a/tests/ported_static/stEIP150Specific/test_delegate_call_on_eip.py
+++ b/tests/ported_static/stEIP150Specific/test_delegate_call_on_eip.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_delegate_call_on_eip.
 
 Ported from:
-tests/static/state_tests/stEIP150Specific/DelegateCallOnEIPFiller.json
+state_tests/stEIP150Specific/DelegateCallOnEIPFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP150Specific/DelegateCallOnEIPFiller.json"],
+    ["state_tests/stEIP150Specific/DelegateCallOnEIPFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_delegate_call_on_eip(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_delegate_call_on_eip."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,43 +43,39 @@ def test_delegate_call_on_eip(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [8] (GAS) (SSTORE 9 (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000105> 0 0 0 0)) [[8]] (SUB @8 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x8, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0xFD59ABAE521384B5731AC657616680219FBC423D,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x8, value=Op.SUB(Op.MLOAD(offset=0x8), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 0x12) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x12) + Op.STOP,
         nonce=0,
-        address=Address("0x90bc108216940a7ddaf3ba6624f2fdbe4c5e83dc"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=0x12) + Op.STOP,
+    # Source: lll
+    # { [8] (GAS) (SSTORE 9 (DELEGATECALL 600000 <contract:0x1000000000000000000000000000000000000105> 0 0 0 0)) [[8]] (SUB @8 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x8, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x8, value=Op.SUB(Op.MLOAD(offset=0x8), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xfd59abae521384b5731ac657616680219fbc423d"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post = {
-        contract: Account(storage={0: 18, 8: 46841, 9: 1}),
-    }
+    post = {target: Account(storage={0: 18, 8: 46841, 9: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150Specific/test_execute_call_that_ask_fore_gas_then_trabsaction_has.py b/tests/ported_static/stEIP150Specific/test_execute_call_that_ask_fore_gas_then_trabsaction_has.py
index 203de2356f5..4e96ff618dd 100644
--- a/tests/ported_static/stEIP150Specific/test_execute_call_that_ask_fore_gas_then_trabsaction_has.py
+++ b/tests/ported_static/stEIP150Specific/test_execute_call_that_ask_fore_gas_then_trabsaction_has.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_execute_call_that_ask_fore_gas_then_trabsaction_has.
 
 Ported from:
-tests/static/state_tests/stEIP150Specific
-ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json
+state_tests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json",  # noqa: E501
+        "state_tests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_execute_call_that_ask_fore_gas_then_trabsaction_has(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA2333EEF5630066B928DEA5FD85A239F511B5B067D1441EE7AC290D0122B917B
-    )
+    """Test_execute_call_that_ask_fore_gas_then_trabsaction_has."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,44 +45,39 @@ def test_execute_call_that_ask_fore_gas_then_trabsaction_has(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [[1]] (CALL 600000 <contract:0x1000000000000000000000000000000000000001> 0 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0xBFDD294028701B119D416C68EFF7DD9F7EFFD249,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x1819cf5bff62f0d379f146b85baaf9bd18239832"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x5F5E100)
-    callee = pre.deploy_contract(
+    # Source: lll
+    # { [[1]] 12 }
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0xbfdd294028701b119d416c68eff7dd9f7effd249"),  # noqa: E501
+    )
+    # Source: lll
+    # { [[1]] (CALL 600000 <contract:0x1000000000000000000000000000000000000001> 0 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        nonce=0,
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-        callee: Account(storage={1: 12}),
-    }
+    post = {addr: Account(storage={1: 12})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150Specific/test_new_gas_price_for_codes.py b/tests/ported_static/stEIP150Specific/test_new_gas_price_for_codes.py
index c29b9173ea6..0be45107816 100644
--- a/tests/ported_static/stEIP150Specific/test_new_gas_price_for_codes.py
+++ b/tests/ported_static/stEIP150Specific/test_new_gas_price_for_codes.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_new_gas_price_for_codes.
 
 Ported from:
-tests/static/state_tests/stEIP150Specific/NewGasPriceForCodesFiller.json
+state_tests/stEIP150Specific/NewGasPriceForCodesFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150Specific/NewGasPriceForCodesFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150Specific/NewGasPriceForCodesFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_new_gas_price_for_codes(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_new_gas_price_for_codes."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
@@ -47,109 +46,96 @@ def test_new_gas_price_for_codes(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x64, value=0x11) + Op.STOP,
-        nonce=0,
-        address=Address("0xad9d325b811cb0701839c07c6f139f3799476798"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    pre[sender] = Account(balance=0xE8D4A51000)
+    # Source: raw
+    # 0x1122334455667788991011121314151617181920212223242526272829303132
+    addr = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
             "1122334455667788991011121314151617181920212223242526272829303132"
         ),
         balance=111,
         nonce=0,
-        address=Address("0xc572a70afaab9d01d0a2afb855bfbafb47c8211b"),  # noqa: E501
+        address=Address(0xC572A70AFAAB9D01D0A2AFB855BFBAFB47C8211B),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
+    # { (SSTORE 100 0x11) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x64, value=0x11) + Op.STOP,
+        nonce=0,
+        address=Address(0xAD9D325B811CB0701839C07C6F139F3799476798),  # noqa: E501
+    )
+    # Source: lll
     # { [999] (GAS) (SSTORE 1 (EXTCODESIZE <contract:0x1000000000000000000000000000000000000010>)) (EXTCODECOPY <contract:0x1000000000000000000000000000000000000010> 0 0 20) (SSTORE 2 (MLOAD 0)) (SSTORE 4 (SLOAD 0)) (SSTORE 5 (CALL 30000 <contract:0x1000000000000000000000000000000000000011> 1 0 0 0 0)) (SSTORE 6 (CALLCODE 30000 <contract:0x1000000000000000000000000000000000000011> 1 0 0 0 0)) (SSTORE 7 (DELEGATECALL 30000 <contract:0x1000000000000000000000000000000000000011> 0 0 0 0)) (SSTORE 8 (CALL 30000 0x1000000000000000000000000000000000000013 0 0 0 0 0)) (SSTORE 3 (BALANCE <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>)) (SSTORE 10 (SUB (MLOAD 999) (GAS))) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3E7, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.EXTCODESIZE(
-                    address=0xC572A70AFAAB9D01D0A2AFB855BFBAFB47C8211B,
-                ),
-            )
-            + Op.EXTCODECOPY(
-                address=0xC572A70AFAAB9D01D0A2AFB855BFBAFB47C8211B,
-                dest_offset=0x0,
-                offset=0x0,
-                size=0x14,
-            )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x4, value=Op.SLOAD(key=0x0))
-            + Op.SSTORE(
-                key=0x5,
-                value=Op.CALL(
-                    gas=0x7530,
-                    address=0xAD9D325B811CB0701839C07C6F139F3799476798,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x6,
-                value=Op.CALLCODE(
-                    gas=0x7530,
-                    address=0xAD9D325B811CB0701839C07C6F139F3799476798,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x7,
-                value=Op.DELEGATECALL(
-                    gas=0x7530,
-                    address=0xAD9D325B811CB0701839C07C6F139F3799476798,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x8,
-                value=Op.CALL(
-                    gas=0x7530,
-                    address=0x1000000000000000000000000000000000000013,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.BALANCE(
-                    address=0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                ),
-            )
-            + Op.SSTORE(key=0xA, value=Op.SUB(Op.MLOAD(offset=0x3E7), Op.GAS))
-            + Op.STOP
-        ),
-        storage={0x0: 0x12},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3E7, value=Op.GAS)
+        + Op.SSTORE(key=0x1, value=Op.EXTCODESIZE(address=addr))
+        + Op.EXTCODECOPY(address=addr, dest_offset=0x0, offset=0x0, size=0x14)
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x4, value=Op.SLOAD(key=0x0))
+        + Op.SSTORE(
+            key=0x5,
+            value=Op.CALL(
+                gas=0x7530,
+                address=addr_2,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x6,
+            value=Op.CALLCODE(
+                gas=0x7530,
+                address=addr_2,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x7,
+            value=Op.DELEGATECALL(
+                gas=0x7530,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x8,
+            value=Op.CALL(
+                gas=0x7530,
+                address=0x1000000000000000000000000000000000000013,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x3, value=Op.BALANCE(address=sender))
+        + Op.SSTORE(key=0xA, value=Op.SUB(Op.MLOAD(offset=0x3E7), Op.GAS))
+        + Op.STOP,
+        storage={0: 18},
         nonce=0,
-        address=Address("0xfd9afc8315a88141164e2a753157ea3e0f72c707"),  # noqa: E501
+        address=Address(0xFD9AFC8315A88141164E2A753157EA3E0F72C707),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 18,
                 1: 32,
diff --git a/tests/ported_static/stEIP150Specific/test_suicide_to_existing_contract.py b/tests/ported_static/stEIP150Specific/test_suicide_to_existing_contract.py
index b5296b14367..f8cea302098 100644
--- a/tests/ported_static/stEIP150Specific/test_suicide_to_existing_contract.py
+++ b/tests/ported_static/stEIP150Specific/test_suicide_to_existing_contract.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_suicide_to_existing_contract.
 
 Ported from:
-tests/static/state_tests/stEIP150Specific/SuicideToExistingContractFiller.json
+state_tests/stEIP150Specific/SuicideToExistingContractFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150Specific/SuicideToExistingContractFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150Specific/SuicideToExistingContractFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_suicide_to_existing_contract(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_suicide_to_existing_contract."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,46 +43,54 @@ def test_suicide_to_existing_contract(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xE110D543AADC3060D6B9E80D3E16BE7A828128EC)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x79968a94dbedb20475585e9dd4dae6333add4c01"),  # noqa: E501
-    )
-    # Source: LLL
+    # Source: lll
     # { [0] (GAS) (CALL 60000 <contract:0x1000000000000000000000000000000000000118> 0 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0xEA60,
-                    address=0x79968A94DBEDB20475585E9DD4DAE6333ADD4C01,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0xEA60,
+                address=0x79968A94DBEDB20475585E9DD4DAE6333ADD4C01,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xE110D543AADC3060D6B9E80D3E16BE7A828128EC),  # noqa: E501
+    )
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xE110D543AADC3060D6B9E80D3E16BE7A828128EC
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe110d543aadc3060d6b9e80d3e16be7a828128ec"),  # noqa: E501
+        address=Address(0x79968A94DBEDB20475585E9DD4DAE6333ADD4C01),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={1: 7637}),
+        addr: Account(
+            storage={},
+            code=bytes.fromhex(
+                "73e110d543aadc3060d6b9e80d3e16be7a828128ecff00"
+            ),
+            balance=0,
+            nonce=0,
+        ),
+        target: Account(storage={1: 7637}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150Specific/test_suicide_to_not_existing_contract.py b/tests/ported_static/stEIP150Specific/test_suicide_to_not_existing_contract.py
index a4f468ff881..5a3ff77c96f 100644
--- a/tests/ported_static/stEIP150Specific/test_suicide_to_not_existing_contract.py
+++ b/tests/ported_static/stEIP150Specific/test_suicide_to_not_existing_contract.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_suicide_to_not_existing_contract.
 
 Ported from:
-tests/static/state_tests/stEIP150Specific
-SuicideToNotExistingContractFiller.json
+state_tests/stEIP150Specific/SuicideToNotExistingContractFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150Specific/SuicideToNotExistingContractFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150Specific/SuicideToNotExistingContractFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_suicide_to_not_existing_contract(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_suicide_to_not_existing_contract."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,46 +43,52 @@ def test_suicide_to_not_existing_contract(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x2000000000000000000000000000000000000115)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SELFDESTRUCT 0x2000000000000000000000000000000000000115) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x2000000000000000000000000000000000000115
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x09d6d7885d3d58a49c8352635776c205f722501c"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [0] (GAS) (CALL 60000 <contract:0x1000000000000000000000000000000000000116> 0 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0xEA60,
-                    address=0x9D6D7885D3D58A49C8352635776C205F722501C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0xEA60,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xbabae893bee69e2141e0e92f2251664ac445ea2a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={1: 10237}),
+        addr: Account(
+            storage={},
+            code=bytes.fromhex(
+                "732000000000000000000000000000000000000115ff00"
+            ),
+            balance=0,
+            nonce=0,
+        ),
+        target: Account(storage={1: 10237}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150Specific/test_transaction64_rule_d64e0.py b/tests/ported_static/stEIP150Specific/test_transaction64_rule_d64e0.py
index 5d6644439d4..256cf7ea0bb 100644
--- a/tests/ported_static/stEIP150Specific/test_transaction64_rule_d64e0.py
+++ b/tests/ported_static/stEIP150Specific/test_transaction64_rule_d64e0.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_transaction64_rule_d64e0.
 
 Ported from:
-tests/static/state_tests/stEIP150Specific/Transaction64Rule_d64e0Filler.json
+state_tests/stEIP150Specific/Transaction64Rule_d64e0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150Specific/Transaction64Rule_d64e0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150Specific/Transaction64Rule_d64e0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_transaction64_rule_d64e0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_transaction64_rule_d64e0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,44 +43,42 @@ def test_transaction64_rule_d64e0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (CALL 160000 <contract:0x1000000000000000000000000000000000000118> 0 0 0 0 0) [[2]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x27100,
-                    address=0x6B7466044211F090B767199794F6F7041829BA85,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[1]] 12 }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
         nonce=0,
-        address=Address("0x4cbc458d12c7f73a3b12ef4515c3eb1bb7430798"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (CALL 160000 <contract:0x1000000000000000000000000000000000000118> 0 0 0 0 0) [[2]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x27100,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x2, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6b7466044211f090b767199794f6f7041829ba85"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=160062,
     )
 
     post = {
-        contract: Account(storage={2: 24740}),
-        callee: Account(storage={1: 12}),
+        addr: Account(storage={1: 12}),
+        target: Account(storage={2: 24740}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150Specific/test_transaction64_rule_d64m1.py b/tests/ported_static/stEIP150Specific/test_transaction64_rule_d64m1.py
index 27df93319ab..dd89bd167ec 100644
--- a/tests/ported_static/stEIP150Specific/test_transaction64_rule_d64m1.py
+++ b/tests/ported_static/stEIP150Specific/test_transaction64_rule_d64m1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_transaction64_rule_d64m1.
 
 Ported from:
-tests/static/state_tests/stEIP150Specific/Transaction64Rule_d64m1Filler.json
+state_tests/stEIP150Specific/Transaction64Rule_d64m1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150Specific/Transaction64Rule_d64m1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150Specific/Transaction64Rule_d64m1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_transaction64_rule_d64m1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_transaction64_rule_d64m1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,44 +43,42 @@ def test_transaction64_rule_d64m1(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (CALL 160000 <contract:0x1000000000000000000000000000000000000118> 0 0 0 0 0) [[2]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x27100,
-                    address=0x6B7466044211F090B767199794F6F7041829BA85,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[1]] 12 }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
         nonce=0,
-        address=Address("0x4cbc458d12c7f73a3b12ef4515c3eb1bb7430798"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (CALL 160000 <contract:0x1000000000000000000000000000000000000118> 0 0 0 0 0) [[2]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x27100,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x2, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6b7466044211f090b767199794f6f7041829ba85"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=160061,
     )
 
     post = {
-        contract: Account(storage={2: 24740}),
-        callee: Account(storage={1: 12}),
+        addr: Account(storage={1: 12}),
+        target: Account(storage={2: 24740}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150Specific/test_transaction64_rule_d64p1.py b/tests/ported_static/stEIP150Specific/test_transaction64_rule_d64p1.py
index 9140908eb17..2dead5d9e1a 100644
--- a/tests/ported_static/stEIP150Specific/test_transaction64_rule_d64p1.py
+++ b/tests/ported_static/stEIP150Specific/test_transaction64_rule_d64p1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_transaction64_rule_d64p1.
 
 Ported from:
-tests/static/state_tests/stEIP150Specific/Transaction64Rule_d64p1Filler.json
+state_tests/stEIP150Specific/Transaction64Rule_d64p1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150Specific/Transaction64Rule_d64p1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150Specific/Transaction64Rule_d64p1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_transaction64_rule_d64p1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_transaction64_rule_d64p1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,44 +43,42 @@ def test_transaction64_rule_d64p1(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (CALL 160000 <contract:0x1000000000000000000000000000000000000118> 0 0 0 0 0) [[2]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x27100,
-                    address=0x6B7466044211F090B767199794F6F7041829BA85,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[1]] 12 }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
         nonce=0,
-        address=Address("0x4cbc458d12c7f73a3b12ef4515c3eb1bb7430798"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (CALL 160000 <contract:0x1000000000000000000000000000000000000118> 0 0 0 0 0) [[2]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x27100,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x2, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6b7466044211f090b767199794f6f7041829ba85"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=160063,
     )
 
     post = {
-        contract: Account(storage={2: 24740}),
-        callee: Account(storage={1: 12}),
+        addr: Account(storage={1: 12}),
+        target: Account(storage={2: 24740}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150Specific/test_transaction64_rule_integer_boundaries.py b/tests/ported_static/stEIP150Specific/test_transaction64_rule_integer_boundaries.py
index 07c40358385..0940f507d26 100644
--- a/tests/ported_static/stEIP150Specific/test_transaction64_rule_integer_boundaries.py
+++ b/tests/ported_static/stEIP150Specific/test_transaction64_rule_integer_boundaries.py
@@ -2,20 +2,20 @@
 Danno Ferrin danno.ferrin@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP150Specific
-Transaction64Rule_integerBoundariesFiller.yml
+state_tests/stEIP150Specific/Transaction64Rule_integerBoundariesFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,137 +24,101 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150Specific/Transaction64Rule_integerBoundariesFiller.yml",  # noqa: E501
+        "state_tests/stEIP150Specific/Transaction64Rule_integerBoundariesFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000000000007fffffffffffffffffffffffffffffff",
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="int8",
         ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000007fff",
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="uint8",
         ),
-        (
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="int16",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000007fffffff",
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="uint16",
         ),
-        (
-            "0000000000000000000000000000000000000000000000007fffffffffffffff",
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="int32",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000007f",
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="uint32",
         ),
-        (
-            "000000000000000000000000000000008fffffffffffffffffffffffffffffff",
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="int64",
         ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000008fff",
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="uint64",
         ),
-        (
-            "8fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="int128",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000008fffffff",
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="uint128",
         ),
-        (
-            "0000000000000000000000000000000000000000000000008fffffffffffffff",
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
+        pytest.param(
+            10,
+            0,
+            0,
+            id="int256",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000008f",
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
+        pytest.param(
+            11,
+            0,
+            0,
+            id="uint256",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_transaction64_rule_integer_boundaries(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Danno Ferrin danno.ferrin@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Danno Ferrin danno."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x000000000000000000000000000000000000C0DE)
+    sender = pre.fund_eoa(amount=0x10000000000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -165,14 +129,16 @@ def test_transaction64_rule_integer_boundaries(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x600060FF00
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.PUSH1[0x0] + Op.PUSH1[0xFF] + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   let initialgas := gas()
     #   let callgas := calldataload(0)
@@ -189,70 +155,83 @@ def test_transaction64_rule_integer_boundaries(
     #   pop(staticcall(callgas, 0x1000, 0, 0x20, 0, 0x20))
     #   sstore(3, lt(gas(), initialgas))
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.GAS
-            + Op.PUSH1[0x20]
-            + Op.PUSH1[0x0]
-            + Op.DUP2
-            + Op.DUP2
-            + Op.PUSH2[0x1000]
-            + Op.CALLDATALOAD(offset=Op.DUP2)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.DUP7,
-                    address=Op.DUP7,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP4,
-                    ret_size=Op.DUP4,
-                ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.GAS
+        + Op.PUSH1[0x20]
+        + Op.PUSH1[0x0]
+        + Op.DUP2 * 2
+        + Op.PUSH2[0x1000]
+        + Op.CALLDATALOAD(offset=Op.DUP2)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.DUP7,
+                address=Op.DUP7,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP4,
+                ret_size=Op.DUP4,
             )
-            + Op.SSTORE(key=Op.DUP4, value=Op.LT(Op.GAS, Op.DUP7))
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=Op.DUP7,
-                    address=Op.DUP7,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP4,
-                    ret_size=Op.DUP4,
-                ),
+        )
+        + Op.SSTORE(key=Op.DUP4, value=Op.LT(Op.GAS, Op.DUP7))
+        + Op.POP(
+            Op.CALLCODE(
+                gas=Op.DUP7,
+                address=Op.DUP7,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP4,
+                ret_size=Op.DUP4,
             )
-            + Op.SSTORE(key=0x1, value=Op.LT(Op.GAS, Op.DUP7))
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.DUP6,
-                    address=Op.DUP6,
-                    args_offset=Op.DUP2,
-                    args_size=Op.DUP2,
-                    ret_offset=Op.DUP4,
-                    ret_size=Op.DUP4,
-                ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.LT(Op.GAS, Op.DUP7))
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=Op.DUP6,
+                address=Op.DUP6,
+                args_offset=Op.DUP2,
+                args_size=Op.DUP2,
+                ret_offset=Op.DUP4,
+                ret_size=Op.DUP4,
             )
-            + Op.SSTORE(key=0x2, value=Op.LT(Op.GAS, Op.DUP7))
-            + Op.POP(Op.STATICCALL)
-            + Op.GAS
-            + Op.SSTORE(key=0x3, value=Op.LT)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x2, value=Op.LT(Op.GAS, Op.DUP7))
+        + Op.POP(Op.STATICCALL)
+        + Op.GAS
+        + Op.SSTORE(key=0x3, value=Op.LT)
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000c0de"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x10000000000000000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(0x7F),
+        Hash(0x8F),
+        Hash(0x7FFF),
+        Hash(0x8FFF),
+        Hash(0x7FFFFFFF),
+        Hash(0x8FFFFFFF),
+        Hash(0x7FFFFFFFFFFFFFFF),
+        Hash(0x8FFFFFFFFFFFFFFF),
+        Hash(0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF),
+        Hash(0x8FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF),
+        Hash(
+            0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Hash(
+            0x8FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+    ]
+    tx_gas = [800000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=800000,
+        to=contract_1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {contract_1: Account(storage={0: 1, 1: 1, 2: 1, 3: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/__init__.py b/tests/ported_static/stEIP150singleCodeGasPrices/__init__.py
index 2f119559555..c7cded7ed36 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/__init__.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/__init__.py
@@ -1 +1 @@
-"""Tests ported from stEIP150singleCodeGasPrices."""
+"""Ported static tests: stEIP150singleCodeGasPrices."""  # noqa: N999
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_eip2929.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_eip2929.py
index a4bde04b7be..c62a6e1859a 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_eip2929.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_eip2929.py
@@ -2,19 +2,24 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929Filler.yml
+state_tests/stEIP150singleCodeGasPrices/eip2929Filler.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,366 +27,258 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929Filler.yml"],
+    ["state_tests/stEIP150singleCodeGasPrices/eip2929Filler.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2590, 1: 90, 2: 90}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000e",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2590, 1: 90, 2: 90}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000e",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2590, 1: 90, 2: 90}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2590, 1: 90, 2: 90}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000000e",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2590, 1: 90, 2: 90}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2590, 1: 90, 2: 90}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2590, 1: 90, 2: 90}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2590, 1: 90, 2: 90}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2590, 1: 90, 2: 90}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001f",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2590, 1: 90, 2: 211}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000150000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2590, 1: 108, 2: 108}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000150000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2590, 1: 108, 2: 108}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000b00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2590, 1: 108, 2: 108}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2590, 1: 108, 2: 108}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2590, 1: 108, 2: 108}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000b00000000000000000000000000000000000000000000000000000000000000150000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2590, 1: 108, 2: 108}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000000e",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2590, 1: 211, 2: 90}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2605, 1: 105, 2: 105}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000001700000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2605, 1: 105, 2: 105}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000001700000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2605, 1: 105, 2: 105}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000001700000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2605, 1: 105, 2: 105}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2608, 1: 108, 2: 108}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000001500000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2608, 1: 108, 2: 108}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2608, 1: 108, 2: 108}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000001500000000000000000000000000000000000000000000000000000000000000150000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2608, 1: 108, 2: 108}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2597, 1: 97, 2: 97}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2711, 1: 90, 2: 90}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000001f",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2711, 1: 211, 2: 211}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2208, 1: 208, 2: 208}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2208, 1: 90, 2: 2891}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2211, 1: 211, 2: 211}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2211, 1: 90, 2: 208}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2090, 1: 211, 2: 208}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2090, 1: 90, 2: 90}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2090, 1: 2891, 2: 208}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2090, 1: 2891, 2: 90}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 4991, 1: 91, 2: 91}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="nop-nop-nop",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="sload-sload-sload",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="sstore-sstore-sstore",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="addr-addr-addr",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="addr-addr-addr",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="copy-copy-copy",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="addr-addr-addr",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="call8-call8-call8",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="call8-call8-call8",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="call5-call5-call5",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="call5-call5-call5",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="faraddr-faraddr-faraddr",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="farcall8-farcall8-farcall8",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="farcall5-farcall5-farcall5",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="sload-sstore-sload",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="sload-farcall8-farcall5",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="sload-sstore-farcall5",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="farcall8-sload-farcall5",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="farcall5-sload-sstore",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="addr-addr-addr",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="addr-addr-addr",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="addr-addr-addr",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="addr-addr-addr",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="addr-addr-addr",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="addr-addr-addr",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="call8-call8-call8",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="call8-call8-call8",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="call5-call5-call5",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="call5-call5-call5",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="addr-call8-call8",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="addr-call8-call8",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="addr-call8-call8",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="addr-call8-call8",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="addr-call8-call8",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="addr-call8-call8",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="addr-addr-faraddr",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="addr-faraddr-addr",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="faraddr-addr-addr",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_eip2929(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x000000000000000000000000000000000000CA11)
+    contract_1 = Address(0x000000000000000000000000000000CA1100CA11)
+    contract_2 = Address(0x00000000000000000000000000000000CA110100)
+    contract_3 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -392,35 +289,35 @@ def test_eip2929(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=bytes.fromhex("00"),
+    # Source: raw
+    # 0x00
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000ca11"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000CA11),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
     #     @@0x100
     # }
-    pre.deploy_contract(
+    contract_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SLOAD(key=0x100) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x00000000000000000000000000000000ca110100"),  # noqa: E501
+        address=Address(0x00000000000000000000000000000000CA110100),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
     #      (balance 0xca11)
     # }
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.BALANCE(address=0xCA11) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x000000000000000000000000000000ca1100ca11"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000CA1100CA11),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
+    # Source: lll
     # {
     #    (def 'oper1 $4)
     #    (def 'oper2 $36)
@@ -452,517 +349,653 @@ def test_eip2929(
     #        (if (= @operation 21) (call 0x1000 0xca11 0 0 0 0 0) NOP) ; CALL
     #        (if (= @operation 22) (callcode 0x1000 0xca11 0 0 0 0 0) NOP) ; CALLCODE  # noqa: E501
     # ... (35 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.POP(Op.BALANCE(address=0xCA1100CA11))
-            + Op.POP(Op.BALANCE(address=0xCA110100))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x31],
-                condition=Op.EQ(Op.MLOAD(offset=0x40), 0x1),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=Op.PUSH2[0x36])
-            + Op.JUMPDEST
-            + Op.SLOAD(key=0x100)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x49],
-                condition=Op.EQ(Op.MLOAD(offset=0x40), 0x2),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x50])
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x100, value=0x5)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x61],
-                condition=Op.EQ(Op.MLOAD(offset=0x40), 0xB),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=Op.PUSH2[0x66])
-            + Op.JUMPDEST
-            + Op.BALANCE(address=0xCA11)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x78],
-                condition=Op.EQ(Op.MLOAD(offset=0x40), 0xC),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=Op.PUSH2[0x7D])
-            + Op.JUMPDEST
-            + Op.EXTCODESIZE(address=0xCA11)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x90],
-                condition=Op.EQ(Op.MLOAD(offset=0x40), 0xD),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x9B])
-            + Op.JUMPDEST
-            + Op.EXTCODECOPY(
-                address=0xCA11, dest_offset=0x0, offset=0x0, size=0x0
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xAC],
-                condition=Op.EQ(Op.MLOAD(offset=0x40), 0xE),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=Op.PUSH2[0xB1])
-            + Op.JUMPDEST
-            + Op.EXTCODEHASH(address=0xCA11)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xC3],
-                condition=Op.EQ(Op.MLOAD(offset=0x40), 0x15),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=Op.PUSH2[0xD5])
-            + Op.JUMPDEST
-            + Op.CALL(
-                gas=0x1000,
-                address=0xCA11,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xE7],
-                condition=Op.EQ(Op.MLOAD(offset=0x40), 0x16),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=Op.PUSH2[0xF9])
-            + Op.JUMPDEST
-            + Op.CALLCODE(
-                gas=0x1000,
-                address=0xCA11,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x10B, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x17))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x11B)
-            + Op.JUMPDEST
-            + Op.DELEGATECALL(
-                gas=0x1000,
-                address=0xCA11,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x12D, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x18))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x13D)
-            + Op.JUMPDEST
-            + Op.STATICCALL(
-                gas=0x1000,
-                address=0xCA11,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x14F, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x1F))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x164)
-            + Op.JUMPDEST
-            + Op.CALL(
-                gas=0x1000,
-                address=0xCA1100CA11,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x176, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x20))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x18A)
-            + Op.JUMPDEST
-            + Op.CALLCODE(
-                gas=0x1000,
-                address=0xCA110100,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x19C, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x21))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x1AE)
-            + Op.JUMPDEST
-            + Op.DELEGATECALL(
-                gas=0x1000,
-                address=0xCA110100,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)),
-                    0x22A,
-                ),
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.JUMPI(pc=0x1DC, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x1))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x1E1)
-            + Op.JUMPDEST
-            + Op.SLOAD(key=0x100)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x1F4, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x2))
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x1FB)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x100, value=0x5)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x20C, condition=Op.EQ(Op.MLOAD(offset=0x40), 0xB))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x211)
-            + Op.JUMPDEST
-            + Op.BALANCE(address=0xCA11)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x223, condition=Op.EQ(Op.MLOAD(offset=0x40), 0xC))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x228)
-            + Op.JUMPDEST
-            + Op.EXTCODESIZE(address=0xCA11)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x23B, condition=Op.EQ(Op.MLOAD(offset=0x40), 0xD))
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x246)
-            + Op.JUMPDEST
-            + Op.EXTCODECOPY(
-                address=0xCA11, dest_offset=0x0, offset=0x0, size=0x0
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x257, condition=Op.EQ(Op.MLOAD(offset=0x40), 0xE))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x25C)
-            + Op.JUMPDEST
-            + Op.EXTCODEHASH(address=0xCA11)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x26E, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x15))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x280)
-            + Op.JUMPDEST
-            + Op.CALL(
-                gas=0x1000,
-                address=0xCA11,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x292, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x16))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x2A4)
-            + Op.JUMPDEST
-            + Op.CALLCODE(
-                gas=0x1000,
-                address=0xCA11,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x2B6, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x17))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x2C6)
-            + Op.JUMPDEST
-            + Op.DELEGATECALL(
-                gas=0x1000,
-                address=0xCA11,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x2D8, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x18))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x2E8)
-            + Op.JUMPDEST
-            + Op.STATICCALL(
-                gas=0x1000,
-                address=0xCA11,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x2FA, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x1F))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x30F)
-            + Op.JUMPDEST
-            + Op.CALL(
-                gas=0x1000,
-                address=0xCA1100CA11,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x321, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x20))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x335)
-            + Op.JUMPDEST
-            + Op.CALLCODE(
-                gas=0x1000,
-                address=0xCA110100,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x347, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x21))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x359)
-            + Op.JUMPDEST
-            + Op.DELEGATECALL(
-                gas=0x1000,
-                address=0xCA110100,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)),
-                    0x22A,
-                ),
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.JUMPI(pc=0x387, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x1))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x38C)
-            + Op.JUMPDEST
-            + Op.SLOAD(key=0x100)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x39F, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x2))
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x3A6)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x100, value=0x5)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x3B7, condition=Op.EQ(Op.MLOAD(offset=0x40), 0xB))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x3BC)
-            + Op.JUMPDEST
-            + Op.BALANCE(address=0xCA11)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x3CE, condition=Op.EQ(Op.MLOAD(offset=0x40), 0xC))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x3D3)
-            + Op.JUMPDEST
-            + Op.EXTCODESIZE(address=0xCA11)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x3E6, condition=Op.EQ(Op.MLOAD(offset=0x40), 0xD))
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x3F1)
-            + Op.JUMPDEST
-            + Op.EXTCODECOPY(
-                address=0xCA11, dest_offset=0x0, offset=0x0, size=0x0
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x402, condition=Op.EQ(Op.MLOAD(offset=0x40), 0xE))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x407)
-            + Op.JUMPDEST
-            + Op.EXTCODEHASH(address=0xCA11)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x419, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x15))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x42B)
-            + Op.JUMPDEST
-            + Op.CALL(
-                gas=0x1000,
-                address=0xCA11,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x43D, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x16))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x44F)
-            + Op.JUMPDEST
-            + Op.CALLCODE(
-                gas=0x1000,
-                address=0xCA11,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x461, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x17))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x471)
-            + Op.JUMPDEST
-            + Op.DELEGATECALL(
-                gas=0x1000,
-                address=0xCA11,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x483, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x18))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x493)
-            + Op.JUMPDEST
-            + Op.STATICCALL(
-                gas=0x1000,
-                address=0xCA11,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x4A5, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x1F))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x4BA)
-            + Op.JUMPDEST
-            + Op.CALL(
-                gas=0x1000,
-                address=0xCA1100CA11,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x4CC, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x20))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x4E0)
-            + Op.JUMPDEST
-            + Op.CALLCODE(
-                gas=0x1000,
-                address=0xCA110100,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(pc=0x4F2, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x21))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x504)
-            + Op.JUMPDEST
-            + Op.DELEGATECALL(
-                gas=0x1000,
-                address=0xCA110100,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)),
-                    0x22A,
-                ),
-            )
-            + Op.SSTORE(key=0x100, value=0x0)
-            + Op.STOP
-        ),
-        storage={0x100: 0x60A7},
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.POP(Op.BALANCE(address=contract_1))
+        + Op.POP(Op.BALANCE(address=contract_2))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x31], condition=Op.EQ(Op.MLOAD(offset=0x40), 0x1)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=Op.PUSH2[0x36])
+        + Op.JUMPDEST
+        + Op.SLOAD(key=0x100)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x49], condition=Op.EQ(Op.MLOAD(offset=0x40), 0x2)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x50])
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x100, value=0x5)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x61], condition=Op.EQ(Op.MLOAD(offset=0x40), 0xB)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=Op.PUSH2[0x66])
+        + Op.JUMPDEST
+        + Op.BALANCE(address=contract_0)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x78], condition=Op.EQ(Op.MLOAD(offset=0x40), 0xC)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=Op.PUSH2[0x7D])
+        + Op.JUMPDEST
+        + Op.EXTCODESIZE(address=contract_0)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x90], condition=Op.EQ(Op.MLOAD(offset=0x40), 0xD)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x9B])
+        + Op.JUMPDEST
+        + Op.EXTCODECOPY(
+            address=contract_0, dest_offset=0x0, offset=0x0, size=0x0
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xAC], condition=Op.EQ(Op.MLOAD(offset=0x40), 0xE)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=Op.PUSH2[0xB1])
+        + Op.JUMPDEST
+        + Op.EXTCODEHASH(address=contract_0)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xC3], condition=Op.EQ(Op.MLOAD(offset=0x40), 0x15)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=Op.PUSH2[0xD5])
+        + Op.JUMPDEST
+        + Op.CALL(
+            gas=0x1000,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xE7], condition=Op.EQ(Op.MLOAD(offset=0x40), 0x16)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=Op.PUSH2[0xF9])
+        + Op.JUMPDEST
+        + Op.CALLCODE(
+            gas=0x1000,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x10B, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x17))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x11B)
+        + Op.JUMPDEST
+        + Op.DELEGATECALL(
+            gas=0x1000,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x12D, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x18))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x13D)
+        + Op.JUMPDEST
+        + Op.STATICCALL(
+            gas=0x1000,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x14F, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x1F))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x164)
+        + Op.JUMPDEST
+        + Op.CALL(
+            gas=0x1000,
+            address=contract_1,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x176, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x20))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x18A)
+        + Op.JUMPDEST
+        + Op.CALLCODE(
+            gas=0x1000,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x19C, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x21))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x1AE)
+        + Op.JUMPDEST
+        + Op.DELEGATECALL(
+            gas=0x1000,
+            address=contract_2,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)), 0x22A
+            ),
+        )
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.JUMPI(pc=0x1DC, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x1))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x1E1)
+        + Op.JUMPDEST
+        + Op.SLOAD(key=0x100)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x1F4, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x2))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x1FB)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x100, value=0x5)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x20C, condition=Op.EQ(Op.MLOAD(offset=0x40), 0xB))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x211)
+        + Op.JUMPDEST
+        + Op.BALANCE(address=contract_0)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x223, condition=Op.EQ(Op.MLOAD(offset=0x40), 0xC))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x228)
+        + Op.JUMPDEST
+        + Op.EXTCODESIZE(address=contract_0)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x23B, condition=Op.EQ(Op.MLOAD(offset=0x40), 0xD))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x246)
+        + Op.JUMPDEST
+        + Op.EXTCODECOPY(
+            address=contract_0, dest_offset=0x0, offset=0x0, size=0x0
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x257, condition=Op.EQ(Op.MLOAD(offset=0x40), 0xE))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x25C)
+        + Op.JUMPDEST
+        + Op.EXTCODEHASH(address=contract_0)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x26E, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x15))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x280)
+        + Op.JUMPDEST
+        + Op.CALL(
+            gas=0x1000,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x292, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x16))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x2A4)
+        + Op.JUMPDEST
+        + Op.CALLCODE(
+            gas=0x1000,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x2B6, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x17))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x2C6)
+        + Op.JUMPDEST
+        + Op.DELEGATECALL(
+            gas=0x1000,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x2D8, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x18))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x2E8)
+        + Op.JUMPDEST
+        + Op.STATICCALL(
+            gas=0x1000,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x2FA, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x1F))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x30F)
+        + Op.JUMPDEST
+        + Op.CALL(
+            gas=0x1000,
+            address=contract_1,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x321, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x20))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x335)
+        + Op.JUMPDEST
+        + Op.CALLCODE(
+            gas=0x1000,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x347, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x21))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x359)
+        + Op.JUMPDEST
+        + Op.DELEGATECALL(
+            gas=0x1000,
+            address=contract_2,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.SUB(
+                Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)), 0x22A
+            ),
+        )
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.JUMPI(pc=0x387, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x1))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x38C)
+        + Op.JUMPDEST
+        + Op.SLOAD(key=0x100)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x39F, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x2))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x3A6)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x100, value=0x5)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x3B7, condition=Op.EQ(Op.MLOAD(offset=0x40), 0xB))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x3BC)
+        + Op.JUMPDEST
+        + Op.BALANCE(address=contract_0)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x3CE, condition=Op.EQ(Op.MLOAD(offset=0x40), 0xC))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x3D3)
+        + Op.JUMPDEST
+        + Op.EXTCODESIZE(address=contract_0)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x3E6, condition=Op.EQ(Op.MLOAD(offset=0x40), 0xD))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x3F1)
+        + Op.JUMPDEST
+        + Op.EXTCODECOPY(
+            address=contract_0, dest_offset=0x0, offset=0x0, size=0x0
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x402, condition=Op.EQ(Op.MLOAD(offset=0x40), 0xE))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x407)
+        + Op.JUMPDEST
+        + Op.EXTCODEHASH(address=contract_0)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x419, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x15))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x42B)
+        + Op.JUMPDEST
+        + Op.CALL(
+            gas=0x1000,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x43D, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x16))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x44F)
+        + Op.JUMPDEST
+        + Op.CALLCODE(
+            gas=0x1000,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x461, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x17))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x471)
+        + Op.JUMPDEST
+        + Op.DELEGATECALL(
+            gas=0x1000,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x483, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x18))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x493)
+        + Op.JUMPDEST
+        + Op.STATICCALL(
+            gas=0x1000,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x4A5, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x1F))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x4BA)
+        + Op.JUMPDEST
+        + Op.CALL(
+            gas=0x1000,
+            address=contract_1,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x4CC, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x20))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x4E0)
+        + Op.JUMPDEST
+        + Op.CALLCODE(
+            gas=0x1000,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(pc=0x4F2, condition=Op.EQ(Op.MLOAD(offset=0x40), 0x21))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x504)
+        + Op.JUMPDEST
+        + Op.DELEGATECALL(
+            gas=0x1000,
+            address=contract_2,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.SUB(
+                Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)), 0x22A
+            ),
+        )
+        + Op.SSTORE(key=0x100, value=0x0)
+        + Op.STOP,
+        storage={256: 24743},
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 2090, 1: 90, 2: 90})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 4991, 1: 91, 2: 91})},
+        },
+        {
+            "indexes": {"data": [14], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 2090, 1: 2891, 2: 90})},
+        },
+        {
+            "indexes": {
+                "data": [3, 4, 6, 19, 20, 21, 22, 23, 24],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 2590, 1: 90, 2: 90})},
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 2597, 1: 97, 2: 97})},
+        },
+        {
+            "indexes": {"data": [8, 25, 26, 7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 2608, 1: 108, 2: 108})},
+        },
+        {
+            "indexes": {"data": [9, 10, 27, 28], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 2605, 1: 105, 2: 105})},
+        },
+        {
+            "indexes": {
+                "data": [32, 33, 34, 29, 30, 31],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 2590, 1: 108, 2: 108})},
+        },
+        {
+            "indexes": {"data": [11], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 2711, 1: 211, 2: 211})},
+        },
+        {
+            "indexes": {"data": [35], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 2590, 1: 90, 2: 211})},
+        },
+        {
+            "indexes": {"data": [36], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 2590, 1: 211, 2: 90})},
+        },
+        {
+            "indexes": {"data": [37], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 2711, 1: 90, 2: 90})},
+        },
+        {
+            "indexes": {"data": [12], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 2211, 1: 211, 2: 211})},
+        },
+        {
+            "indexes": {"data": [13], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 2208, 1: 208, 2: 208})},
+        },
+        {
+            "indexes": {"data": [15], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 2090, 1: 211, 2: 208})},
+        },
+        {
+            "indexes": {"data": [16], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_3: Account(storage={0: 2090, 1: 2891, 2: 208})
+            },
+        },
+        {
+            "indexes": {"data": [17], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 2211, 1: 90, 2: 208})},
+        },
+        {
+            "indexes": {"data": [18], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 2208, 1: 90, 2: 2891})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0xB) + Hash(0xB) + Hash(0xB),
+        Bytes("048071d3") + Hash(0xC) + Hash(0xC) + Hash(0xC),
+        Bytes("048071d3") + Hash(0xD) + Hash(0xD) + Hash(0xD),
+        Bytes("048071d3") + Hash(0xE) + Hash(0xE) + Hash(0xE),
+        Bytes("048071d3") + Hash(0x15) + Hash(0x15) + Hash(0x15),
+        Bytes("048071d3") + Hash(0x16) + Hash(0x16) + Hash(0x16),
+        Bytes("048071d3") + Hash(0x17) + Hash(0x17) + Hash(0x17),
+        Bytes("048071d3") + Hash(0x18) + Hash(0x18) + Hash(0x18),
+        Bytes("048071d3") + Hash(0x1F) + Hash(0x1F) + Hash(0x1F),
+        Bytes("048071d3") + Hash(0x20) + Hash(0x20) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x21) + Hash(0x21) + Hash(0x21),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x20) + Hash(0x21),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x2) + Hash(0x21),
+        Bytes("048071d3") + Hash(0x20) + Hash(0x1) + Hash(0x21),
+        Bytes("048071d3") + Hash(0x21) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0xB) + Hash(0xC) + Hash(0xE),
+        Bytes("048071d3") + Hash(0xB) + Hash(0xE) + Hash(0xC),
+        Bytes("048071d3") + Hash(0xC) + Hash(0xB) + Hash(0xE),
+        Bytes("048071d3") + Hash(0xC) + Hash(0xE) + Hash(0xB),
+        Bytes("048071d3") + Hash(0xE) + Hash(0xC) + Hash(0xB),
+        Bytes("048071d3") + Hash(0xE) + Hash(0xB) + Hash(0xC),
+        Bytes("048071d3") + Hash(0x15) + Hash(0x16) + Hash(0x15),
+        Bytes("048071d3") + Hash(0x16) + Hash(0x16) + Hash(0x15),
+        Bytes("048071d3") + Hash(0x17) + Hash(0x18) + Hash(0x17),
+        Bytes("048071d3") + Hash(0x17) + Hash(0x18) + Hash(0x18),
+        Bytes("048071d3") + Hash(0xB) + Hash(0x15) + Hash(0x16),
+        Bytes("048071d3") + Hash(0xC) + Hash(0x15) + Hash(0x16),
+        Bytes("048071d3") + Hash(0xE) + Hash(0x15) + Hash(0x16),
+        Bytes("048071d3") + Hash(0xB) + Hash(0x16) + Hash(0x15),
+        Bytes("048071d3") + Hash(0xC) + Hash(0x16) + Hash(0x15),
+        Bytes("048071d3") + Hash(0xE) + Hash(0x16) + Hash(0x15),
+        Bytes("048071d3") + Hash(0xB) + Hash(0xC) + Hash(0x1F),
+        Bytes("048071d3") + Hash(0xB) + Hash(0x1F) + Hash(0xE),
+        Bytes("048071d3") + Hash(0x1F) + Hash(0xE) + Hash(0xB),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
+        to=contract_3,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_eip2929_minus_ff.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_eip2929_minus_ff.py
index 4c85e6b7f1a..0e9ecf78d46 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_eip2929_minus_ff.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_eip2929_minus_ff.py
@@ -2,19 +2,24 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929-ffFiller.yml
+state_tests/stEIP150singleCodeGasPrices/eip2929-ffFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,111 +27,83 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929-ffFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/eip2929-ffFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 5126, 1: 105}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="simple",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f1",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 5126, 1: 105}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="balance",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f2",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 5126, 1: 105}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="extcodesize",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f4",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 5126, 1: 105}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="extcodecopy",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 5126, 1: 105}
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="extcodehash",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 5126, 1: 105}
-                )
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="call",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 5126, 1: 105}
-                )
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="callcode",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 7726, 1: 105}
-                )
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="delegatecall",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000fa",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 5126, 1: 105}
-                )
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="staticcall",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_eip2929_minus_ff(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x000000000000000000000000000000000000DE57)
+    contract_1 = Address(0x000000000000000000000000000000000000CA11)
+    contract_2 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -137,24 +114,24 @@ def test_eip2929_minus_ff(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: raw
+    # 0x00
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.STOP,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000DE57),  # noqa: E501
+    )
+    # Source: lll
     # {
     #      (selfdestruct 0xDE57)
     # }
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0xDE57) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000ca11"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000CA11),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=bytes.fromhex("00"),
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000de57"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
+    # Source: lll
     # {
     #    (def 'operation $4)
     #
@@ -186,169 +163,194 @@ def test_eip2929_minus_ff(
     #    (if (= operation 0xFA) (staticcall 0x10000 dest 0 0 0 0) NOP)
     #
     # ... (18 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x100, value=0xFF)
-            + Op.MSTORE(offset=0x120, value=0xFF)
-            + Op.POP(Op.BALANCE(address=0xCA11))
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x21],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x31),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=Op.PUSH2[0x26])
-            + Op.JUMPDEST
-            + Op.BALANCE(address=0xDE57)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x38],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3B),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=Op.PUSH2[0x3D])
-            + Op.JUMPDEST
-            + Op.EXTCODESIZE(address=0xDE57)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x50],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3C),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x5B])
-            + Op.JUMPDEST
-            + Op.EXTCODECOPY(
-                address=0xDE57, dest_offset=0x0, offset=0x0, size=0x1
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x6C],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3F),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=Op.PUSH2[0x71])
-            + Op.JUMPDEST
-            + Op.EXTCODEHASH(address=0xDE57)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x83],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF1),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=Op.PUSH2[0x96])
-            + Op.JUMPDEST
-            + Op.CALL(
-                gas=0x10000,
-                address=0xDE57,
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x100, value=0xFF)
+        + Op.MSTORE(offset=0x120, value=0xFF)
+        + Op.POP(Op.BALANCE(address=contract_1))
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x21],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x31),
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=Op.PUSH2[0x26])
+        + Op.JUMPDEST
+        + Op.BALANCE(address=contract_0)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x38],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3B),
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=Op.PUSH2[0x3D])
+        + Op.JUMPDEST
+        + Op.EXTCODESIZE(address=contract_0)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x50],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3C),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x5B])
+        + Op.JUMPDEST
+        + Op.EXTCODECOPY(
+            address=contract_0, dest_offset=0x0, offset=0x0, size=0x1
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x6C],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3F),
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=Op.PUSH2[0x71])
+        + Op.JUMPDEST
+        + Op.EXTCODEHASH(address=contract_0)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x83],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF1),
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=Op.PUSH2[0x96])
+        + Op.JUMPDEST
+        + Op.CALL(
+            gas=0x10000,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xA8],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF2),
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=Op.PUSH2[0xBB])
+        + Op.JUMPDEST
+        + Op.CALLCODE(
+            gas=0x10000,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xCD],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF4),
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=Op.PUSH2[0xDE])
+        + Op.JUMPDEST
+        + Op.DELEGATECALL(
+            gas=0x10000,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xF0],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xFA),
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x101)
+        + Op.JUMPDEST
+        + Op.STATICCALL(
+            gas=0x10000,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.MSTORE(offset=0x100, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x1000000,
+                address=contract_1,
                 value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xA8],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF2),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=Op.PUSH2[0xBB])
-            + Op.JUMPDEST
-            + Op.CALLCODE(
-                gas=0x10000,
-                address=0xDE57,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xCD],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF4),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=Op.PUSH2[0xDE])
-            + Op.JUMPDEST
-            + Op.DELEGATECALL(
-                gas=0x10000,
-                address=0xDE57,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xF0],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xFA),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x101)
-            + Op.JUMPDEST
-            + Op.STATICCALL(
-                gas=0x10000,
-                address=0xDE57,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.MSTORE(offset=0x100, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x1000000,
-                    address=0xCA11,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x120, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x100), Op.MLOAD(offset=0x120)),
-                    0x8,
-                ),
-            )
-            + Op.MSTORE(offset=0x100, value=Op.GAS)
-            + Op.POP(Op.BALANCE(address=0xDE57))
-            + Op.MSTORE(offset=0x120, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x100), Op.MLOAD(offset=0x120)),
-                    0x8,
-                ),
-            )
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x120, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                Op.SUB(Op.MLOAD(offset=0x100), Op.MLOAD(offset=0x120)), 0x8
+            ),
+        )
+        + Op.MSTORE(offset=0x100, value=Op.GAS)
+        + Op.POP(Op.BALANCE(address=contract_0))
+        + Op.MSTORE(offset=0x120, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.SUB(
+                Op.SUB(Op.MLOAD(offset=0x100), Op.MLOAD(offset=0x120)), 0x8
+            ),
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 7726, 1: 105})},
+        },
+        {
+            "indexes": {
+                "data": [1, 2, 3, 4, 5, 6, 7, 8],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 5126, 1: 105})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x31),
+        Bytes("693c6139") + Hash(0x3B),
+        Bytes("693c6139") + Hash(0x3C),
+        Bytes("693c6139") + Hash(0x3F),
+        Bytes("693c6139") + Hash(0xF1),
+        Bytes("693c6139") + Hash(0xF2),
+        Bytes("693c6139") + Hash(0xF4),
+        Bytes("693c6139") + Hash(0xFA),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
+        to=contract_2,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_eip2929_oog.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_eip2929_oog.py
index 1b0a4a8492c..c1624aa5866 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_eip2929_oog.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_eip2929_oog.py
@@ -2,7 +2,7 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929OOGFiller.yml
+state_tests/stEIP150singleCodeGasPrices/eip2929OOGFiller.yml
 """
 
 import pytest
@@ -11,10 +11,13 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,77 +25,97 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929OOGFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/eip2929OOGFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010fa00000000000000000000000000000000000000000000000000000000000006d6",  # noqa: E501
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="failEIP2929",
         ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000105500000000000000000000000000000000000000000000000000000000000055f0",  # noqa: E501
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="failEIP2929",
         ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000103100000000000000000000000000000000000000000000000000000000000007d0",  # noqa: E501
-            {},
+        pytest.param(
+            2,
+            0,
+            0,
+            id="failEIP2929",
         ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000103b00000000000000000000000000000000000000000000000000000000000009c4",  # noqa: E501
-            {},
+        pytest.param(
+            3,
+            0,
+            0,
+            id="failEIP2929",
         ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000103c00000000000000000000000000000000000000000000000000000000000009c4",  # noqa: E501
-            {},
+        pytest.param(
+            4,
+            0,
+            0,
+            id="failEIP2929",
         ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000103f00000000000000000000000000000000000000000000000000000000000009c4",  # noqa: E501
-            {},
+        pytest.param(
+            5,
+            0,
+            0,
+            id="failEIP2929",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010f100000000000000000000000000000000000000000000000000000000000006d6",  # noqa: E501
-            {},
+        pytest.param(
+            6,
+            0,
+            0,
+            id="failEIP2929",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010f200000000000000000000000000000000000000000000000000000000000006d6",  # noqa: E501
-            {},
+        pytest.param(
+            7,
+            0,
+            0,
+            id="failEIP2929",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010f400000000000000000000000000000000000000000000000000000000000006d6",  # noqa: E501
-            {},
+        pytest.param(
+            8,
+            0,
+            0,
+            id="failEIP2929",
         ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000105400000000000000000000000000000000000000000000000000000000000007d0",  # noqa: E501
-            {},
+        pytest.param(
+            9,
+            0,
+            0,
+            id="failEIP2929",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_eip2929_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001054)
+    contract_1 = Address(0x0000000000000000000000000000000000001055)
+    contract_2 = Address(0x0000000000000000000000000000000000001031)
+    contract_3 = Address(0x000000000000000000000000000000000000103B)
+    contract_4 = Address(0x000000000000000000000000000000000000103C)
+    contract_5 = Address(0x000000000000000000000000000000000000103F)
+    contract_6 = Address(0x00000000000000000000000000000000000010F1)
+    contract_7 = Address(0x00000000000000000000000000000000000010F2)
+    contract_8 = Address(0x00000000000000000000000000000000000010F4)
+    contract_9 = Address(0x00000000000000000000000000000000000010FA)
+    contract_10 = Address(0x000000000000000000000000000000000000ACC7)
+    contract_11 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -106,183 +129,205 @@ def test_eip2929_oog(
         gas_limit=100000000,
     )
 
-    pre.deploy_contract(
-        code=Op.BALANCE(address=0xACC7) + Op.STOP,
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
+    # Source: lll
+    # {
+    #    @@0
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SLOAD(key=0x0) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000001031"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000001054),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
-    #    (extcodesize 0x1031)
+    #    [[0]] 0x60A7
     # }
-    pre.deploy_contract(
-        code=Op.EXTCODESIZE(address=0x1031) + Op.STOP,
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x60A7) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x000000000000000000000000000000000000103b"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000001055),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
-    #    (extcodecopy 0x1031 0 0 0x20)
+    #    (return 0 0)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.EXTCODECOPY(
-                address=0x1031,
-                dest_offset=0x0,
-                offset=0x0,
-                size=0x20,
-            )
-            + Op.STOP
-        ),
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0x0, size=0x0) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x000000000000000000000000000000000000103c"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000ACC7),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
-    #    (extcodehash 0x1031)
+    #    (def 'addr     $4)     ; the address to call
+    #    (def 'callGas $36)     ; the amount of gas to give it
+    #
+    #    [[0]] (call callGas addr 0 0 0 0 0)
     # }
-    pre.deploy_contract(
-        code=Op.EXTCODEHASH(address=0x1031) + Op.STOP,
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.CALLDATALOAD(offset=0x24),
+                address=Op.CALLDATALOAD(offset=0x4),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        storage={0: 24743},
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x000000000000000000000000000000000000103f"),  # noqa: E501
+        nonce=1,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SLOAD(key=0x0) + Op.STOP,
+    # Source: lll
+    # {
+    #    (balance 0xACC7)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.BALANCE(address=0xACC7) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000001054"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000001031),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=0x60A7) + Op.STOP,
+    # Source: lll
+    # {
+    #    (call 0x06A5 0xACC7 0 0 0 0 0)
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x6A5,
+            address=0xACC7,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000001055"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000010F1),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
-    #    (call 0x06A5 0xACC7 0 0 0 0 0)
+    #    (staticcall 0x06A5 0xACC7 0 0 0 0)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x6A5,
-                address=0xACC7,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x6A5,
+            address=0xACC7,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x00000000000000000000000000000000000010f1"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000010FA),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
     #    (callcode 0x06A5 0xACC7 0 0 0 0 0)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x6A5,
-                address=0xACC7,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x6A5,
+            address=0xACC7,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x00000000000000000000000000000000000010f2"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000010F2),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
     #    (delegatecall 0x06A5 0xACC7 0 0 0 0)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x6A5,
-                address=0xACC7,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x6A5,
+            address=0xACC7,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x00000000000000000000000000000000000010f4"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000010F4),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
-    #    (staticcall 0x06A5 0xACC7 0 0 0 0)
+    #    (extcodecopy 0x1031 0 0 0x20)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x6A5,
-                address=0xACC7,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.EXTCODECOPY(
+            address=0x1031, dest_offset=0x0, offset=0x0, size=0x20
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x00000000000000000000000000000000000010fa"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000103C),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
-    #    (return 0 0)
+    #    (extcodesize 0x1031)
     # }
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0x0, size=0x0) + Op.STOP,
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.EXTCODESIZE(address=0x1031) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x000000000000000000000000000000000000acc7"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000103B),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
-    # Source: LLL
+    # Source: lll
     # {
-    #    (def 'addr     $4)     ; the address to call
-    #    (def 'callGas $36)     ; the amount of gas to give it
-    #
-    #    [[0]] (call callGas addr 0 0 0 0 0)
+    #    (extcodehash 0x1031)
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.CALLDATALOAD(offset=0x24),
-                    address=Op.CALLDATALOAD(offset=0x4),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.EXTCODEHASH(address=0x1031) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000103F),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Bytes("1a8451e6") + Hash(contract_0, left_padding=True) + Hash(0x7D0),
+        Bytes("1a8451e6") + Hash(contract_1, left_padding=True) + Hash(0x55F0),
+        Bytes("1a8451e6") + Hash(contract_2, left_padding=True) + Hash(0x7D0),
+        Bytes("1a8451e6") + Hash(contract_3, left_padding=True) + Hash(0x9C4),
+        Bytes("1a8451e6") + Hash(contract_4, left_padding=True) + Hash(0x9C4),
+        Bytes("1a8451e6") + Hash(contract_5, left_padding=True) + Hash(0x9C4),
+        Bytes("1a8451e6") + Hash(contract_6, left_padding=True) + Hash(0x6D6),
+        Bytes("1a8451e6") + Hash(contract_7, left_padding=True) + Hash(0x6D6),
+        Bytes("1a8451e6") + Hash(contract_8, left_padding=True) + Hash(0x6D6),
+        Bytes("1a8451e6") + Hash(contract_9, left_padding=True) + Hash(0x6D6),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
+        to=contract_11,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
         nonce=1,
-        value=1,
     )
 
-    post = expected_post
+    post = {contract_11: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost.py
index 71513322de4..98b4497269a 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost.py
@@ -2,7 +2,7 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostFiller.yml
+state_tests/stEIP150singleCodeGasPrices/gasCostFiller.yml
 """
 
 import pytest
@@ -11,1343 +11,710 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
+    Storage,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
+def _storage_with_any(base: dict, any_keys: list) -> Storage:
+    """Create Storage with set_expect_any for specified keys."""
+    s = Storage(base)
+    for k in any_keys:
+        s.set_expect_any(k)
+    return s
+
+
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostFiller.yml"],
+    ["state_tests/stEIP150singleCodeGasPrices/gasCostFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "960003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "970003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "980003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "990003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "9a0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "9b0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "9c0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "9d0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "9e0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "9f0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "0b0005",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 5,
-                    }
-                )
-            },
-        ),
-        (
-            "100003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "110003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "120003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "130003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "140003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "150003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "160003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "170003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "180003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "010003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "190003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "1a0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "300002",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "3102bc",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={0: 1300, 1: 700}
-                )
-            },
-        ),
-        (
-            "320002",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "330002",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "340002",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "350003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "360002",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "380002",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "020005",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 5,
-                    }
-                )
-            },
-        ),
-        (
-            "3a0002",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "3b02bc",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={0: 1300, 1: 700}
-                )
-            },
-        ),
-        (
-            "400014",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 20,
-                    }
-                )
-            },
-        ),
-        (
-            "410002",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "420002",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "430002",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "440002",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "450002",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "500002",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "540320",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={0: 700, 1: 800}
-                )
-            },
-        ),
-        (
-            "030003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "554e20",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={0: 1500, 1: 20000}
-                ),
-                Address("0xdc2d1a1ce0200314bdb0f043a127691734cfd302"): Account(
-                    storage={55930: 55930}
-                ),
-            },
-        ),
-        (
-            "580002",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "590002",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "5a0002",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "5b0001",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 1,
-                    }
-                )
-            },
-        ),
-        (
-            "ff1388",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={0: 2000, 1: 5000}
-                )
-            },
-        ),
-        (
-            "600003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "610003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "620003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "630003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "040005",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 5,
-                    }
-                )
-            },
-        ),
-        (
-            "640003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "650003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "660003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "670003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "680003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "690003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="d16",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="d17",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="d18",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="d19",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="d20",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="d21",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="d22",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="d23",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="d24",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="d25",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="d26",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="d27",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="d28",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="d29",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="d30",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="d31",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="d32",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="d33",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="d34",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="d35",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="d36",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="d37",
+        ),
+        pytest.param(
+            38,
+            0,
+            0,
+            id="d38",
+        ),
+        pytest.param(
+            39,
+            0,
+            0,
+            id="d39",
+        ),
+        pytest.param(
+            40,
+            0,
+            0,
+            id="d40",
+        ),
+        pytest.param(
+            41,
+            0,
+            0,
+            id="d41",
+        ),
+        pytest.param(
+            42,
+            0,
+            0,
+            id="d42",
+        ),
+        pytest.param(
+            43,
+            0,
+            0,
+            id="d43",
+        ),
+        pytest.param(
+            44,
+            0,
+            0,
+            id="d44",
+        ),
+        pytest.param(
+            45,
+            0,
+            0,
+            id="d45",
+        ),
+        pytest.param(
+            46,
+            0,
+            0,
+            id="d46",
+        ),
+        pytest.param(
+            47,
+            0,
+            0,
+            id="d47",
+        ),
+        pytest.param(
+            48,
+            0,
+            0,
+            id="d48",
+        ),
+        pytest.param(
+            49,
+            0,
+            0,
+            id="d49",
+        ),
+        pytest.param(
+            50,
+            0,
+            0,
+            id="d50",
+        ),
+        pytest.param(
+            51,
+            0,
+            0,
+            id="d51",
+        ),
+        pytest.param(
+            52,
+            0,
+            0,
+            id="d52",
+        ),
+        pytest.param(
+            53,
+            0,
+            0,
+            id="d53",
+        ),
+        pytest.param(
+            54,
+            0,
+            0,
+            id="d54",
+        ),
+        pytest.param(
+            55,
+            0,
+            0,
+            id="d55",
+        ),
+        pytest.param(
+            56,
+            0,
+            0,
+            id="d56",
+        ),
+        pytest.param(
+            57,
+            0,
+            0,
+            id="d57",
+        ),
+        pytest.param(
+            58,
+            0,
+            0,
+            id="d58",
+        ),
+        pytest.param(
+            59,
+            0,
+            0,
+            id="d59",
+        ),
+        pytest.param(
+            60,
+            0,
+            0,
+            id="d60",
+        ),
+        pytest.param(
+            61,
+            0,
+            0,
+            id="d61",
+        ),
+        pytest.param(
+            62,
+            0,
+            0,
+            id="d62",
+        ),
+        pytest.param(
+            63,
+            0,
+            0,
+            id="d63",
+        ),
+        pytest.param(
+            64,
+            0,
+            0,
+            id="d64",
+        ),
+        pytest.param(
+            65,
+            0,
+            0,
+            id="d65",
+        ),
+        pytest.param(
+            66,
+            0,
+            0,
+            id="d66",
+        ),
+        pytest.param(
+            67,
+            0,
+            0,
+            id="d67",
+        ),
+        pytest.param(
+            68,
+            0,
+            0,
+            id="d68",
+        ),
+        pytest.param(
+            69,
+            0,
+            0,
+            id="d69",
+        ),
+        pytest.param(
+            70,
+            0,
+            0,
+            id="d70",
+        ),
+        pytest.param(
+            71,
+            0,
+            0,
+            id="d71",
+        ),
+        pytest.param(
+            72,
+            0,
+            0,
+            id="d72",
+        ),
+        pytest.param(
+            73,
+            0,
+            0,
+            id="d73",
+        ),
+        pytest.param(
+            74,
+            0,
+            0,
+            id="d74",
+        ),
+        pytest.param(
+            75,
+            0,
+            0,
+            id="d75",
+        ),
+        pytest.param(
+            76,
+            0,
+            0,
+            id="d76",
+        ),
+        pytest.param(
+            77,
+            0,
+            0,
+            id="d77",
+        ),
+        pytest.param(
+            78,
+            0,
+            0,
+            id="d78",
+        ),
+        pytest.param(
+            79,
+            0,
+            0,
+            id="d79",
+        ),
+        pytest.param(
+            80,
+            0,
+            0,
+            id="d80",
+        ),
+        pytest.param(
+            81,
+            0,
+            0,
+            id="d81",
+        ),
+        pytest.param(
+            82,
+            0,
+            0,
+            id="d82",
+        ),
+        pytest.param(
+            83,
+            0,
+            0,
+            id="d83",
+        ),
+        pytest.param(
+            84,
+            0,
+            0,
+            id="d84",
+        ),
+        pytest.param(
+            85,
+            0,
+            0,
+            id="d85",
+        ),
+        pytest.param(
+            86,
+            0,
+            0,
+            id="d86",
+        ),
+        pytest.param(
+            87,
+            0,
+            0,
+            id="d87",
+        ),
+        pytest.param(
+            88,
+            0,
+            0,
+            id="d88",
+        ),
+        pytest.param(
+            89,
+            0,
+            0,
+            id="d89",
+        ),
+        pytest.param(
+            90,
+            0,
+            0,
+            id="d90",
+        ),
+        pytest.param(
+            91,
+            0,
+            0,
+            id="d91",
+        ),
+        pytest.param(
+            92,
+            0,
+            0,
+            id="d92",
+        ),
+        pytest.param(
+            93,
+            0,
+            0,
+            id="d93",
+        ),
+        pytest.param(
+            94,
+            0,
+            0,
+            id="d94",
+        ),
+        pytest.param(
+            95,
+            0,
+            0,
+            id="d95",
+        ),
+        pytest.param(
+            96,
+            0,
+            0,
+            id="d96",
+        ),
+        pytest.param(
+            97,
+            0,
+            0,
+            id="d97",
+        ),
+        pytest.param(
+            98,
+            0,
+            0,
+            id="d98",
+        ),
+        pytest.param(
+            99,
+            0,
+            0,
+            id="d99",
+        ),
+        pytest.param(
+            100,
+            0,
+            0,
+            id="d100",
+        ),
+        pytest.param(
+            101,
+            0,
+            0,
+            id="d101",
+        ),
+        pytest.param(
+            102,
+            0,
+            0,
+            id="d102",
+        ),
+        pytest.param(
+            103,
+            0,
+            0,
+            id="d103",
+        ),
+        pytest.param(
+            104,
+            0,
+            0,
+            id="d104",
+        ),
+        pytest.param(
+            105,
+            0,
+            0,
+            id="d105",
+        ),
+        pytest.param(
+            106,
+            0,
+            0,
+            id="d106",
+        ),
+        pytest.param(
+            107,
+            0,
+            0,
+            id="d107",
+        ),
+        pytest.param(
+            108,
+            0,
+            0,
+            id="d108",
+        ),
+        pytest.param(
+            109,
+            0,
+            0,
+            id="d109",
         ),
-        (
-            "6a0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "6b0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "6c0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "6d0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "050005",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 5,
-                    }
-                )
-            },
-        ),
-        (
-            "6e0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "6f0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "700003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "710003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "720003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "730003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "740003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "750003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "760003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "770003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "060005",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 5,
-                    }
-                )
-            },
-        ),
-        (
-            "780003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "790003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "7a0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "7b0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "7c0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "7d0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "7e0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "7f0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "800003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "810003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "070005",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 5,
-                    }
-                )
-            },
-        ),
-        (
-            "820003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "830003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "840003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "850003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "860003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "870003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "880003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "890003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "8a0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "8b0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "080008",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 8,
-                    }
-                )
-            },
-        ),
-        (
-            "8c0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "8d0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "8e0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "8f0003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "900003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "910003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "920003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "930003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "940003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "950003",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 3,
-                    }
-                )
-            },
-        ),
-        (
-            "090008",
-            {
-                Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"): Account(
-                    storage={
-                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
-                        1: 8,
-                    }
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_gas_cost(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
     )
@@ -1362,122 +729,500 @@ def test_gas_cost(
     )
 
     pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x200,
-                value=Op.DIV(Op.CALLDATALOAD(offset=0x0), Op.EXP(0x2, 0xF8)),
-            )
-            + Op.MSTORE(
-                offset=0x340,
-                value=Op.AND(
-                    Op.DIV(Op.CALLDATALOAD(offset=0x0), Op.EXP(0x2, 0xE8)),
-                    0xFFFF,
-                ),
-            )
-            + Op.MSTORE(offset=0x260, value=0x11)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x76, condition=Op.ISZERO(Op.MLOAD(offset=0x260)))
-            + Op.MSTORE(
-                offset=0x260, value=Op.SUB(Op.MLOAD(offset=0x260), 0x1)
-            )
-            + Op.MSTORE8(
-                offset=Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)),
-                value=0x61,
-            )
-            + Op.MSTORE8(
-                offset=Op.ADD(
-                    Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)),
-                    0x1,
-                ),
-                value=0xDA,
-            )
-            + Op.MSTORE8(
-                offset=Op.ADD(
-                    Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)),
-                    0x2,
-                ),
-                value=0x7A,
-            )
-            + Op.MSTORE(
-                offset=0x220, value=Op.ADD(Op.MLOAD(offset=0x220), 0x3)
-            )
-            + Op.JUMP(pc=0x24)
-            + Op.JUMPDEST
-            + Op.MSTORE8(
-                offset=Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)),
-                value=Op.MLOAD(offset=0x200),
-            )
-            + Op.MSTORE8(
-                offset=Op.ADD(
-                    Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)),
-                    0x1,
-                ),
+    # Source: lll
+    # { ; LLL doesn't let us call arbitrary code, so we craft
+    #   ; a new contract with the opcode and then call it to see
+    #   ; how much the contract cost
+    #   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    #   ; Initialization
+    #
+    #   ; Variables (0x20 byte wide)
+    #   (def 'opcode            0x200)
+    #   (def 'contractLength    0x220)
+    #   (def 'constructorLength 0x240)
+    #   (def 'i                 0x260)
+    #   (def 'addr              0x280)
+    #   (def 'gasB4             0x300)
+    #   (def 'gasAfter          0x320)
+    #   (def 'expectedCost      0x340)
+    #
+    #   ; Maximum length of contract
+    #   (def 'maxLength         0x100)
+    #
+    #   ; Code in memory
+    #   (def 'constructorCode   0x000)
+    #   (def 'contractCode      (+ constructorCode maxLength))
+    #   ; contractCode has to be immediately after constructoCode
+    #   ; for us to send it as part of the constructor code
+    #
+    #   ; Cost of everything around the opcode
+    #   (def 'sysCost           0x311)
+    #
+    #
+    #   ; Understand the input
+    # ... (55 more lines)
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x200,
+            value=Op.DIV(Op.CALLDATALOAD(offset=0x0), Op.EXP(0x2, 0xF8)),
+        )
+        + Op.MSTORE(
+            offset=0x340,
+            value=Op.AND(
+                Op.DIV(Op.CALLDATALOAD(offset=0x0), Op.EXP(0x2, 0xE8)), 0xFFFF
+            ),
+        )
+        + Op.MSTORE(offset=0x260, value=0x11)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x76, condition=Op.ISZERO(Op.MLOAD(offset=0x260)))
+        + Op.MSTORE(offset=0x260, value=Op.SUB(Op.MLOAD(offset=0x260), 0x1))
+        + Op.MSTORE8(
+            offset=Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)),
+            value=0x61,
+        )
+        + Op.MSTORE8(
+            offset=Op.ADD(
+                Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)), 0x1
+            ),
+            value=0xDA,
+        )
+        + Op.MSTORE8(
+            offset=Op.ADD(
+                Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)), 0x2
+            ),
+            value=0x7A,
+        )
+        + Op.MSTORE(offset=0x220, value=Op.ADD(Op.MLOAD(offset=0x220), 0x3))
+        + Op.JUMP(pc=0x24)
+        + Op.JUMPDEST
+        + Op.MSTORE8(
+            offset=Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)),
+            value=Op.MLOAD(offset=0x200),
+        )
+        + Op.MSTORE8(
+            offset=Op.ADD(
+                Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)), 0x1
+            ),
+            value=0x0,
+        )
+        + Op.MSTORE(offset=0x220, value=Op.ADD(Op.MLOAD(offset=0x220), 0x2))
+        + Op.PUSH1[0x1B]
+        + Op.CODECOPY(dest_offset=0x0, offset=Op.PUSH2[0xFB], size=Op.DUP1)
+        + Op.PUSH2[0x240]
+        + Op.MSTORE
+        + Op.MSTORE(
+            offset=0x280,
+            value=Op.CREATE(value=0x0, offset=0x0, size=Op.MUL(0x100, 0x2)),
+        )
+        + Op.MSTORE(offset=0x300, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x10000,
+                address=Op.MLOAD(offset=0x280),
                 value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(
-                offset=0x220, value=Op.ADD(Op.MLOAD(offset=0x220), 0x2)
-            )
-            + Op.PUSH1[0x1B]
-            + Op.CODECOPY(dest_offset=0x0, offset=Op.PUSH2[0xFB], size=Op.DUP1)
-            + Op.PUSH2[0x240]
-            + Op.MSTORE
-            + Op.MSTORE(
-                offset=0x280,
-                value=Op.CREATE(
-                    value=0x0, offset=0x0, size=Op.MUL(0x100, 0x2)
-                ),
-            )
-            + Op.MSTORE(offset=0x300, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=Op.MLOAD(offset=0x280),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x320, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(
-                        Op.SUB(Op.MLOAD(offset=0x300), Op.MLOAD(offset=0x320)),
-                        0x311,
-                    ),
-                    Op.MLOAD(offset=0x340),
+        )
+        + Op.MSTORE(offset=0x320, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                Op.SUB(
+                    Op.SUB(Op.MLOAD(offset=0x300), Op.MLOAD(offset=0x320)),
+                    0x311,
                 ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x340))
-            + Op.STOP
-            + Op.INVALID
-            + Op.CODECOPY(
-                dest_offset=Op.ADD(0x0, 0x100),
-                offset=Op.ADD(0x0, 0x100),
-                size=0x100,
-            )
-            + Op.RETURN(offset=Op.ADD(0x0, 0x100), size=0x100)
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
+                Op.MLOAD(offset=0x340),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x340))
+        + Op.STOP
+        + Op.INVALID
+        + Op.CODECOPY(
+            dest_offset=Op.ADD(0x0, 0x100),
+            offset=Op.ADD(0x0, 0x100),
+            size=0x100,
+        )
+        + Op.RETURN(offset=Op.ADD(0x0, 0x100), size=0x100)
+        + Op.STOP,
+        storage={0: 24743},
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xccdcf3ff42c8382abeef05bb8949f975a6bc345c"),  # noqa: E501
+        address=Address(0xCCDCF3FF42C8382ABEEF05BB8949F975A6BC345C),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [
+                    0,
+                    1,
+                    2,
+                    3,
+                    4,
+                    5,
+                    6,
+                    7,
+                    8,
+                    9,
+                    10,
+                    11,
+                    12,
+                    13,
+                    14,
+                    15,
+                    16,
+                    17,
+                    18,
+                    19,
+                    20,
+                    21,
+                    22,
+                    24,
+                    25,
+                    26,
+                    27,
+                    28,
+                    29,
+                    30,
+                    32,
+                    33,
+                    34,
+                    35,
+                    36,
+                    37,
+                    38,
+                    41,
+                    42,
+                    43,
+                    44,
+                    46,
+                    47,
+                    48,
+                    49,
+                    50,
+                    51,
+                    52,
+                    53,
+                    54,
+                    55,
+                    56,
+                    57,
+                    58,
+                    59,
+                    60,
+                    61,
+                    62,
+                    63,
+                    64,
+                    65,
+                    66,
+                    67,
+                    68,
+                    69,
+                    70,
+                    71,
+                    72,
+                    73,
+                    74,
+                    75,
+                    76,
+                    77,
+                    78,
+                    79,
+                    80,
+                    81,
+                    82,
+                    83,
+                    84,
+                    85,
+                    86,
+                    87,
+                    88,
+                    89,
+                    90,
+                    91,
+                    92,
+                    93,
+                    94,
+                    95,
+                    96,
+                    97,
+                    98,
+                    99,
+                    100,
+                    101,
+                    102,
+                    103,
+                    104,
+                    105,
+                    106,
+                    107,
+                    108,
+                    109,
+                    110,
+                    111,
+                    112,
+                    113,
+                    114,
+                    115,
+                    116,
+                    117,
+                    118,
+                    119,
+                    120,
+                    121,
+                    122,
+                    123,
+                    124,
+                    125,
+                    126,
+                    127,
+                    128,
+                    129,
+                    130,
+                    131,
+                    132,
+                    133,
+                    134,
+                    135,
+                    136,
+                    137,
+                    138,
+                    139,
+                    140,
+                    141,
+                    142,
+                    143,
+                    144,
+                    145,
+                    146,
+                    147,
+                    148,
+                    149,
+                    150,
+                    151,
+                    152,
+                    153,
+                    154,
+                    155,
+                    156,
+                    157,
+                    158,
+                    159,
+                    160,
+                    161,
+                    162,
+                    163,
+                    164,
+                    165,
+                    166,
+                    167,
+                    168,
+                    169,
+                    170,
+                    171,
+                    172,
+                    173,
+                    174,
+                    175,
+                    176,
+                    177,
+                    178,
+                    179,
+                    180,
+                    181,
+                    182,
+                    183,
+                    184,
+                    185,
+                    186,
+                    187,
+                    188,
+                    189,
+                    190,
+                    191,
+                    192,
+                    193,
+                    194,
+                    195,
+                    196,
+                    197,
+                    198,
+                    199,
+                    200,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {
+                addr: Account(
+                    storage=_storage_with_any(
+                        {
+                            0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDA8,  # noqa: E501
+                        },
+                        [1],
+                    ),
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [39], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr: Account(storage=_storage_with_any({0: 700}, [1]))
+            },
+        },
+        {
+            "indexes": {"data": [40], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr: Account(storage=_storage_with_any({0: 1500}, [1]))
+            },
+        },
+        {
+            "indexes": {"data": [45], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr: Account(storage=_storage_with_any({0: 2000}, [1]))
+            },
+        },
+        {
+            "indexes": {"data": [31, 23], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr: Account(storage=_storage_with_any({0: 1300}, [1]))
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("000000"),
+        Bytes("010003"),
+        Bytes("020005"),
+        Bytes("030003"),
+        Bytes("040005"),
+        Bytes("050005"),
+        Bytes("060005"),
+        Bytes("070005"),
+        Bytes("080008"),
+        Bytes("090008"),
+        Bytes("0b0005"),
+        Bytes("100003"),
+        Bytes("110003"),
+        Bytes("120003"),
+        Bytes("130003"),
+        Bytes("140003"),
+        Bytes("150003"),
+        Bytes("160003"),
+        Bytes("170003"),
+        Bytes("180003"),
+        Bytes("190003"),
+        Bytes("1a0003"),
+        Bytes("300002"),
+        Bytes("3102bc"),
+        Bytes("320002"),
+        Bytes("330002"),
+        Bytes("340002"),
+        Bytes("350003"),
+        Bytes("360002"),
+        Bytes("380002"),
+        Bytes("3a0002"),
+        Bytes("3b02bc"),
+        Bytes("400014"),
+        Bytes("410002"),
+        Bytes("420002"),
+        Bytes("430002"),
+        Bytes("440002"),
+        Bytes("450002"),
+        Bytes("500002"),
+        Bytes("540320"),
+        Bytes("554e20"),
+        Bytes("580002"),
+        Bytes("590002"),
+        Bytes("5a0002"),
+        Bytes("5b0001"),
+        Bytes("ff1388"),
+        Bytes("600003"),
+        Bytes("610003"),
+        Bytes("620003"),
+        Bytes("630003"),
+        Bytes("640003"),
+        Bytes("650003"),
+        Bytes("660003"),
+        Bytes("670003"),
+        Bytes("680003"),
+        Bytes("690003"),
+        Bytes("6a0003"),
+        Bytes("6b0003"),
+        Bytes("6c0003"),
+        Bytes("6d0003"),
+        Bytes("6e0003"),
+        Bytes("6f0003"),
+        Bytes("700003"),
+        Bytes("710003"),
+        Bytes("720003"),
+        Bytes("730003"),
+        Bytes("740003"),
+        Bytes("750003"),
+        Bytes("760003"),
+        Bytes("770003"),
+        Bytes("780003"),
+        Bytes("790003"),
+        Bytes("7a0003"),
+        Bytes("7b0003"),
+        Bytes("7c0003"),
+        Bytes("7d0003"),
+        Bytes("7e0003"),
+        Bytes("7f0003"),
+        Bytes("800003"),
+        Bytes("810003"),
+        Bytes("820003"),
+        Bytes("830003"),
+        Bytes("840003"),
+        Bytes("850003"),
+        Bytes("860003"),
+        Bytes("870003"),
+        Bytes("880003"),
+        Bytes("890003"),
+        Bytes("8a0003"),
+        Bytes("8b0003"),
+        Bytes("8c0003"),
+        Bytes("8d0003"),
+        Bytes("8e0003"),
+        Bytes("8f0003"),
+        Bytes("900003"),
+        Bytes("910003"),
+        Bytes("920003"),
+        Bytes("930003"),
+        Bytes("940003"),
+        Bytes("950003"),
+        Bytes("960003"),
+        Bytes("970003"),
+        Bytes("980003"),
+        Bytes("990003"),
+        Bytes("9a0003"),
+        Bytes("9b0003"),
+        Bytes("9c0003"),
+        Bytes("9d0003"),
+        Bytes("9e0003"),
+        Bytes("9f0003"),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
+        to=addr,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_berlin.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_berlin.py
index 57cb45a9b80..c122aab7d30 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_berlin.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_berlin.py
@@ -2,1036 +2,716 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostBerlinFiller.yml
+state_tests/stEIP150singleCodeGasPrices/gasCostBerlinFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
+    Storage,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
+def _storage_with_any(base: dict, any_keys: list) -> Storage:
+    """Create Storage with set_expect_any for specified keys."""
+    s = Storage(base)
+    for k in any_keys:
+        s.set_expect_any(k)
+    return s
+
+
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostBerlinFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/gasCostBerlinFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        ("000000", {}),
-        (
-            "960003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "970003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "980003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "990003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "9a0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "9b0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "9c0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "9d0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "9e0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "9f0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "0b0005",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 5}
-                )
-            },
-        ),
-        (
-            "100003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "110003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "120003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "130003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "140003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "150003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "160003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "170003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "180003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "010003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "190003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "1a0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "300002",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2}
-                )
-            },
-        ),
-        (
-            "310a28",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2600}
-                )
-            },
-        ),
-        (
-            "320002",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2}
-                )
-            },
-        ),
-        (
-            "330002",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2}
-                )
-            },
-        ),
-        (
-            "340002",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2}
-                )
-            },
-        ),
-        (
-            "350003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "360002",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2}
-                )
-            },
-        ),
-        (
-            "380002",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2}
-                )
-            },
-        ),
-        (
-            "020005",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 5}
-                )
-            },
-        ),
-        (
-            "3a0002",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2}
-                )
-            },
-        ),
-        (
-            "3b0a28",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2600}
-                )
-            },
-        ),
-        (
-            "400014",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 20}
-                )
-            },
-        ),
-        (
-            "410002",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2}
-                )
-            },
-        ),
-        (
-            "420002",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2}
-                )
-            },
-        ),
-        (
-            "430002",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2}
-                )
-            },
-        ),
-        (
-            "440002",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2}
-                )
-            },
-        ),
-        (
-            "450002",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2}
-                )
-            },
-        ),
-        (
-            "500002",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2}
-                )
-            },
-        ),
-        (
-            "540834",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2100}
-                )
-            },
-        ),
-        (
-            "030003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "555654",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 22100}
-                ),
-                Address("0xfaba096ee63239c821f1dfdd7fa180664a9cb7a2"): Account(
-                    storage={55930: 55930}
-                ),
-            },
-        ),
-        (
-            "580002",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2}
-                )
-            },
-        ),
-        (
-            "590002",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2}
-                )
-            },
-        ),
-        (
-            "5a0002",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 2}
-                )
-            },
-        ),
-        (
-            "5b0001",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "ff1db0",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 7600}
-                )
-            },
-        ),
-        (
-            "600003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "610003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "620003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "630003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "040005",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 5}
-                )
-            },
-        ),
-        (
-            "640003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "650003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "660003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "670003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "680003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "690003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "6a0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "6b0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "6c0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "6d0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "050005",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 5}
-                )
-            },
-        ),
-        (
-            "6e0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "6f0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "700003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "710003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "720003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "730003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "740003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "750003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "760003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "770003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "060005",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 5}
-                )
-            },
-        ),
-        (
-            "780003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "790003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "7a0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "7b0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "7c0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "7d0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "7e0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "7f0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "800003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "810003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "070005",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 5}
-                )
-            },
-        ),
-        (
-            "820003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "830003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "840003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "850003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "860003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "870003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "880003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "890003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "8a0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "8b0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "080008",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 8}
-                )
-            },
-        ),
-        (
-            "8c0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "8d0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "8e0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "8f0003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "900003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "910003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "920003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "930003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "940003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "950003",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 3}
-                )
-            },
-        ),
-        (
-            "090008",
-            {
-                Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"): Account(
-                    storage={1: 8}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="d16",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="d17",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="d18",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="d19",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="d20",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="d21",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="d22",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="d23",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="d24",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="d25",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="d26",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="d27",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="d28",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="d29",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="d30",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="d31",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="d32",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="d33",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="d34",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="d35",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="d36",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="d37",
+        ),
+        pytest.param(
+            38,
+            0,
+            0,
+            id="d38",
+        ),
+        pytest.param(
+            39,
+            0,
+            0,
+            id="d39",
+        ),
+        pytest.param(
+            40,
+            0,
+            0,
+            id="d40",
+        ),
+        pytest.param(
+            41,
+            0,
+            0,
+            id="d41",
+        ),
+        pytest.param(
+            42,
+            0,
+            0,
+            id="d42",
+        ),
+        pytest.param(
+            43,
+            0,
+            0,
+            id="d43",
+        ),
+        pytest.param(
+            44,
+            0,
+            0,
+            id="d44",
+        ),
+        pytest.param(
+            45,
+            0,
+            0,
+            id="d45",
+        ),
+        pytest.param(
+            46,
+            0,
+            0,
+            id="d46",
+        ),
+        pytest.param(
+            47,
+            0,
+            0,
+            id="d47",
+        ),
+        pytest.param(
+            48,
+            0,
+            0,
+            id="d48",
+        ),
+        pytest.param(
+            49,
+            0,
+            0,
+            id="d49",
+        ),
+        pytest.param(
+            50,
+            0,
+            0,
+            id="d50",
+        ),
+        pytest.param(
+            51,
+            0,
+            0,
+            id="d51",
+        ),
+        pytest.param(
+            52,
+            0,
+            0,
+            id="d52",
+        ),
+        pytest.param(
+            53,
+            0,
+            0,
+            id="d53",
+        ),
+        pytest.param(
+            54,
+            0,
+            0,
+            id="d54",
+        ),
+        pytest.param(
+            55,
+            0,
+            0,
+            id="d55",
+        ),
+        pytest.param(
+            56,
+            0,
+            0,
+            id="d56",
+        ),
+        pytest.param(
+            57,
+            0,
+            0,
+            id="d57",
+        ),
+        pytest.param(
+            58,
+            0,
+            0,
+            id="d58",
+        ),
+        pytest.param(
+            59,
+            0,
+            0,
+            id="d59",
+        ),
+        pytest.param(
+            60,
+            0,
+            0,
+            id="d60",
+        ),
+        pytest.param(
+            61,
+            0,
+            0,
+            id="d61",
+        ),
+        pytest.param(
+            62,
+            0,
+            0,
+            id="d62",
+        ),
+        pytest.param(
+            63,
+            0,
+            0,
+            id="d63",
+        ),
+        pytest.param(
+            64,
+            0,
+            0,
+            id="d64",
+        ),
+        pytest.param(
+            65,
+            0,
+            0,
+            id="d65",
+        ),
+        pytest.param(
+            66,
+            0,
+            0,
+            id="d66",
+        ),
+        pytest.param(
+            67,
+            0,
+            0,
+            id="d67",
+        ),
+        pytest.param(
+            68,
+            0,
+            0,
+            id="d68",
+        ),
+        pytest.param(
+            69,
+            0,
+            0,
+            id="d69",
+        ),
+        pytest.param(
+            70,
+            0,
+            0,
+            id="d70",
+        ),
+        pytest.param(
+            71,
+            0,
+            0,
+            id="d71",
+        ),
+        pytest.param(
+            72,
+            0,
+            0,
+            id="d72",
+        ),
+        pytest.param(
+            73,
+            0,
+            0,
+            id="d73",
+        ),
+        pytest.param(
+            74,
+            0,
+            0,
+            id="d74",
+        ),
+        pytest.param(
+            75,
+            0,
+            0,
+            id="d75",
+        ),
+        pytest.param(
+            76,
+            0,
+            0,
+            id="d76",
+        ),
+        pytest.param(
+            77,
+            0,
+            0,
+            id="d77",
+        ),
+        pytest.param(
+            78,
+            0,
+            0,
+            id="d78",
+        ),
+        pytest.param(
+            79,
+            0,
+            0,
+            id="d79",
+        ),
+        pytest.param(
+            80,
+            0,
+            0,
+            id="d80",
+        ),
+        pytest.param(
+            81,
+            0,
+            0,
+            id="d81",
+        ),
+        pytest.param(
+            82,
+            0,
+            0,
+            id="d82",
+        ),
+        pytest.param(
+            83,
+            0,
+            0,
+            id="d83",
+        ),
+        pytest.param(
+            84,
+            0,
+            0,
+            id="d84",
+        ),
+        pytest.param(
+            85,
+            0,
+            0,
+            id="d85",
+        ),
+        pytest.param(
+            86,
+            0,
+            0,
+            id="d86",
+        ),
+        pytest.param(
+            87,
+            0,
+            0,
+            id="d87",
+        ),
+        pytest.param(
+            88,
+            0,
+            0,
+            id="d88",
+        ),
+        pytest.param(
+            89,
+            0,
+            0,
+            id="d89",
+        ),
+        pytest.param(
+            90,
+            0,
+            0,
+            id="d90",
+        ),
+        pytest.param(
+            91,
+            0,
+            0,
+            id="d91",
+        ),
+        pytest.param(
+            92,
+            0,
+            0,
+            id="d92",
+        ),
+        pytest.param(
+            93,
+            0,
+            0,
+            id="d93",
+        ),
+        pytest.param(
+            94,
+            0,
+            0,
+            id="d94",
+        ),
+        pytest.param(
+            95,
+            0,
+            0,
+            id="d95",
+        ),
+        pytest.param(
+            96,
+            0,
+            0,
+            id="d96",
+        ),
+        pytest.param(
+            97,
+            0,
+            0,
+            id="d97",
+        ),
+        pytest.param(
+            98,
+            0,
+            0,
+            id="d98",
+        ),
+        pytest.param(
+            99,
+            0,
+            0,
+            id="d99",
+        ),
+        pytest.param(
+            100,
+            0,
+            0,
+            id="d100",
+        ),
+        pytest.param(
+            101,
+            0,
+            0,
+            id="d101",
+        ),
+        pytest.param(
+            102,
+            0,
+            0,
+            id="d102",
+        ),
+        pytest.param(
+            103,
+            0,
+            0,
+            id="d103",
+        ),
+        pytest.param(
+            104,
+            0,
+            0,
+            id="d104",
+        ),
+        pytest.param(
+            105,
+            0,
+            0,
+            id="d105",
+        ),
+        pytest.param(
+            106,
+            0,
+            0,
+            id="d106",
+        ),
+        pytest.param(
+            107,
+            0,
+            0,
+            id="d107",
+        ),
+        pytest.param(
+            108,
+            0,
+            0,
+            id="d108",
+        ),
+        pytest.param(
+            109,
+            0,
+            0,
+            id="d109",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_gas_cost_berlin(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -1042,123 +722,253 @@ def test_gas_cost_berlin(
         gas_limit=100000000,
     )
 
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x200,
-                value=Op.DIV(Op.CALLDATALOAD(offset=0x0), Op.EXP(0x2, 0xF8)),
-            )
-            + Op.MSTORE(
-                offset=0x340,
-                value=Op.AND(
-                    Op.DIV(Op.CALLDATALOAD(offset=0x0), Op.EXP(0x2, 0xE8)),
-                    0xFFFF,
-                ),
-            )
-            + Op.MSTORE(offset=0x260, value=0x11)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x76, condition=Op.ISZERO(Op.MLOAD(offset=0x260)))
-            + Op.MSTORE(
-                offset=0x260, value=Op.SUB(Op.MLOAD(offset=0x260), 0x1)
-            )
-            + Op.MSTORE8(
-                offset=Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)),
-                value=0x61,
-            )
-            + Op.MSTORE8(
-                offset=Op.ADD(
-                    Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)),
-                    0x1,
-                ),
-                value=0xDA,
-            )
-            + Op.MSTORE8(
-                offset=Op.ADD(
-                    Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)),
-                    0x2,
-                ),
-                value=0x7A,
-            )
-            + Op.MSTORE(
-                offset=0x220, value=Op.ADD(Op.MLOAD(offset=0x220), 0x3)
-            )
-            + Op.JUMP(pc=0x24)
-            + Op.JUMPDEST
-            + Op.MSTORE8(
-                offset=Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)),
-                value=Op.MLOAD(offset=0x200),
-            )
-            + Op.MSTORE8(
-                offset=Op.ADD(
-                    Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)),
-                    0x1,
-                ),
+    # Source: lll
+    # { ; LLL doesn't let us call arbitrary code, so we craft
+    #   ; a new contract with the opcode and then call it to see
+    #   ; how much the contract cost
+    #   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    #   ; Initialization
+    #
+    #   ; Variables (0x20 byte wide)
+    #   (def 'opcode            0x200)
+    #   (def 'contractLength    0x220)
+    #   (def 'constructorLength 0x240)
+    #   (def 'i                 0x260)
+    #   (def 'addr              0x280)
+    #   (def 'gasB4             0x300)
+    #   (def 'gasAfter          0x320)
+    #   (def 'expectedCost      0x340)
+    #
+    #   ; Maximum length of contract
+    #   (def 'maxLength         0x100)
+    #
+    #   ; Code in memory
+    #   (def 'constructorCode   0x000)
+    #   (def 'contractCode      (+ constructorCode maxLength))
+    #   ; contractCode has to be immediately after constructoCode
+    #   ; for us to send it as part of the constructor code
+    #
+    #   ; Cost of everything around the opcode
+    #   (def 'sysCost           0xb9)
+    #
+    #
+    #   ; Understand the input
+    # ... (55 more lines)
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x200,
+            value=Op.DIV(Op.CALLDATALOAD(offset=0x0), Op.EXP(0x2, 0xF8)),
+        )
+        + Op.MSTORE(
+            offset=0x340,
+            value=Op.AND(
+                Op.DIV(Op.CALLDATALOAD(offset=0x0), Op.EXP(0x2, 0xE8)), 0xFFFF
+            ),
+        )
+        + Op.MSTORE(offset=0x260, value=0x11)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x76, condition=Op.ISZERO(Op.MLOAD(offset=0x260)))
+        + Op.MSTORE(offset=0x260, value=Op.SUB(Op.MLOAD(offset=0x260), 0x1))
+        + Op.MSTORE8(
+            offset=Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)),
+            value=0x61,
+        )
+        + Op.MSTORE8(
+            offset=Op.ADD(
+                Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)), 0x1
+            ),
+            value=0xDA,
+        )
+        + Op.MSTORE8(
+            offset=Op.ADD(
+                Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)), 0x2
+            ),
+            value=0x7A,
+        )
+        + Op.MSTORE(offset=0x220, value=Op.ADD(Op.MLOAD(offset=0x220), 0x3))
+        + Op.JUMP(pc=0x24)
+        + Op.JUMPDEST
+        + Op.MSTORE8(
+            offset=Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)),
+            value=Op.MLOAD(offset=0x200),
+        )
+        + Op.MSTORE8(
+            offset=Op.ADD(
+                Op.ADD(Op.ADD(0x0, 0x100), Op.MLOAD(offset=0x220)), 0x1
+            ),
+            value=0x0,
+        )
+        + Op.MSTORE(offset=0x220, value=Op.ADD(Op.MLOAD(offset=0x220), 0x2))
+        + Op.PUSH1[0x1B]
+        + Op.CODECOPY(dest_offset=0x0, offset=Op.PUSH2[0xFA], size=Op.DUP1)
+        + Op.PUSH2[0x240]
+        + Op.MSTORE
+        + Op.MSTORE(
+            offset=0x280,
+            value=Op.CREATE(value=0x0, offset=0x0, size=Op.MUL(0x100, 0x2)),
+        )
+        + Op.MSTORE(offset=0x300, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x10000,
+                address=Op.MLOAD(offset=0x280),
                 value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(
-                offset=0x220, value=Op.ADD(Op.MLOAD(offset=0x220), 0x2)
-            )
-            + Op.PUSH1[0x1B]
-            + Op.CODECOPY(dest_offset=0x0, offset=Op.PUSH2[0xFA], size=Op.DUP1)
-            + Op.PUSH2[0x240]
-            + Op.MSTORE
-            + Op.MSTORE(
-                offset=0x280,
-                value=Op.CREATE(
-                    value=0x0, offset=0x0, size=Op.MUL(0x100, 0x2)
+        )
+        + Op.MSTORE(offset=0x320, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                Op.SUB(
+                    Op.SUB(Op.MLOAD(offset=0x300), Op.MLOAD(offset=0x320)),
+                    0xB9,
                 ),
-            )
-            + Op.MSTORE(offset=0x300, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=Op.MLOAD(offset=0x280),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x320, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(
-                        Op.SUB(Op.MLOAD(offset=0x300), Op.MLOAD(offset=0x320)),
-                        0xB9,
-                    ),
-                    Op.MLOAD(offset=0x340),
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x340))
-            + Op.STOP
-            + Op.INVALID
-            + Op.CODECOPY(
-                dest_offset=Op.ADD(0x0, 0x100),
-                offset=Op.ADD(0x0, 0x100),
-                size=0x100,
-            )
-            + Op.RETURN(offset=Op.ADD(0x0, 0x100), size=0x100)
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
+                Op.MLOAD(offset=0x340),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x340))
+        + Op.STOP
+        + Op.INVALID
+        + Op.CODECOPY(
+            dest_offset=Op.ADD(0x0, 0x100),
+            offset=Op.ADD(0x0, 0x100),
+            size=0x100,
+        )
+        + Op.RETURN(offset=Op.ADD(0x0, 0x100), size=0x100)
+        + Op.STOP,
+        storage={0: 24743},
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x2f170b2347023bb6bf3eec84b53259b96e0268c3"),  # noqa: E501
+        address=Address(0x2F170B2347023BB6BF3EEC84B53259B96E0268C3),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Bytes("000000"),
+        Bytes("010003"),
+        Bytes("020005"),
+        Bytes("030003"),
+        Bytes("040005"),
+        Bytes("050005"),
+        Bytes("060005"),
+        Bytes("070005"),
+        Bytes("080008"),
+        Bytes("090008"),
+        Bytes("0b0005"),
+        Bytes("100003"),
+        Bytes("110003"),
+        Bytes("120003"),
+        Bytes("130003"),
+        Bytes("140003"),
+        Bytes("150003"),
+        Bytes("160003"),
+        Bytes("170003"),
+        Bytes("180003"),
+        Bytes("190003"),
+        Bytes("1a0003"),
+        Bytes("300002"),
+        Bytes("310a28"),
+        Bytes("320002"),
+        Bytes("330002"),
+        Bytes("340002"),
+        Bytes("350003"),
+        Bytes("360002"),
+        Bytes("380002"),
+        Bytes("3a0002"),
+        Bytes("3b0a28"),
+        Bytes("400014"),
+        Bytes("410002"),
+        Bytes("420002"),
+        Bytes("430002"),
+        Bytes("440002"),
+        Bytes("450002"),
+        Bytes("500002"),
+        Bytes("540834"),
+        Bytes("555654"),
+        Bytes("580002"),
+        Bytes("590002"),
+        Bytes("5a0002"),
+        Bytes("5b0001"),
+        Bytes("ff1db0"),
+        Bytes("600003"),
+        Bytes("610003"),
+        Bytes("620003"),
+        Bytes("630003"),
+        Bytes("640003"),
+        Bytes("650003"),
+        Bytes("660003"),
+        Bytes("670003"),
+        Bytes("680003"),
+        Bytes("690003"),
+        Bytes("6a0003"),
+        Bytes("6b0003"),
+        Bytes("6c0003"),
+        Bytes("6d0003"),
+        Bytes("6e0003"),
+        Bytes("6f0003"),
+        Bytes("700003"),
+        Bytes("710003"),
+        Bytes("720003"),
+        Bytes("730003"),
+        Bytes("740003"),
+        Bytes("750003"),
+        Bytes("760003"),
+        Bytes("770003"),
+        Bytes("780003"),
+        Bytes("790003"),
+        Bytes("7a0003"),
+        Bytes("7b0003"),
+        Bytes("7c0003"),
+        Bytes("7d0003"),
+        Bytes("7e0003"),
+        Bytes("7f0003"),
+        Bytes("800003"),
+        Bytes("810003"),
+        Bytes("820003"),
+        Bytes("830003"),
+        Bytes("840003"),
+        Bytes("850003"),
+        Bytes("860003"),
+        Bytes("870003"),
+        Bytes("880003"),
+        Bytes("890003"),
+        Bytes("8a0003"),
+        Bytes("8b0003"),
+        Bytes("8c0003"),
+        Bytes("8d0003"),
+        Bytes("8e0003"),
+        Bytes("8f0003"),
+        Bytes("900003"),
+        Bytes("910003"),
+        Bytes("920003"),
+        Bytes("930003"),
+        Bytes("940003"),
+        Bytes("950003"),
+        Bytes("960003"),
+        Bytes("970003"),
+        Bytes("980003"),
+        Bytes("990003"),
+        Bytes("9a0003"),
+        Bytes("9b0003"),
+        Bytes("9c0003"),
+        Bytes("9d0003"),
+        Bytes("9e0003"),
+        Bytes("9f0003"),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
+        to=addr,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {addr: Account(storage=_storage_with_any({0: 0}, [1]))}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_exp.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_exp.py
index b185d38b406..6b9f898a757 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_exp.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_exp.py
@@ -2,19 +2,21 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostExpFiller.yml
+state_tests/stEIP150singleCodeGasPrices/gasCostExpFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,76 +24,80 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostExpFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/gasCostExpFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "c5b5a1ae00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {},
-        ),
-        (
-            "c5b5a1ae00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000052",  # noqa: E501
-            {},
-        ),
-        (
-            "c5b5a1ae00000000000000000000000000000000000000000000000000000000000000ff0000000000000000000000000000000000000000000000000000000000000052",  # noqa: E501
-            {},
-        ),
-        (
-            "c5b5a1ae00000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000084",  # noqa: E501
-            {},
-        ),
-        (
-            "c5b5a1ae000000000000000000000000000000000000000000000000000000000000ffff0000000000000000000000000000000000000000000000000000000000000084",  # noqa: E501
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
         ),
-        (
-            "c5b5a1ae000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000b6",  # noqa: E501
-            {},
-        ),
-        (
-            "c5b5a1ae0000000000000000000000000000000000000000000000000000000000ffffff00000000000000000000000000000000000000000000000000000000000000b6",  # noqa: E501
-            {},
-        ),
-        (
-            "c5b5a1ae000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000e8",  # noqa: E501
-            {},
-        ),
-        (
-            "c5b5a1ae00000000000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000000000000000000000000000000000e8",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_gas_cost_exp(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -102,7 +108,7 @@ def test_gas_cost_exp(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {
     #   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     #   ; Initialization
@@ -132,187 +138,47 @@ def test_gas_cost_exp(
     #
     #   [[0]] (- @gasB4 @gasAfter @expectedCost)
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x40, value=Op.GAS)
-            + Op.POP(Op.EXP(0x2, Op.MLOAD(offset=0x0)))
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x40), Op.MLOAD(offset=0x60)),
-                    Op.MLOAD(offset=0x20),
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x087aab8070088fbbe4f60141cf79032d28528b89"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostExpFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "c5b5a1ae00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {},
-        ),
-        (
-            "c5b5a1ae00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000052",  # noqa: E501
-            {},
-        ),
-        (
-            "c5b5a1ae00000000000000000000000000000000000000000000000000000000000000ff0000000000000000000000000000000000000000000000000000000000000052",  # noqa: E501
-            {},
-        ),
-        (
-            "c5b5a1ae00000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000084",  # noqa: E501
-            {},
-        ),
-        (
-            "c5b5a1ae000000000000000000000000000000000000000000000000000000000000ffff0000000000000000000000000000000000000000000000000000000000000084",  # noqa: E501
-            {},
-        ),
-        (
-            "c5b5a1ae000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000b6",  # noqa: E501
-            {},
-        ),
-        (
-            "c5b5a1ae0000000000000000000000000000000000000000000000000000000000ffffff00000000000000000000000000000000000000000000000000000000000000b6",  # noqa: E501
-            {},
-        ),
-        (
-            "c5b5a1ae000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000e8",  # noqa: E501
-            {},
-        ),
-        (
-            "c5b5a1ae00000000000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000000000000000000000000000000000e8",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_gas_cost_exp_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    # Source: LLL
-    # {
-    #   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    #   ; Initialization
-    #
-    #   ; Variables (0x20 byte wide)
-    #   (def 'powerOf           0x000)  ; A to the power of @powerOf
-    #   (def 'expectedCost      0x020)  ; Expected gas cost
-    #   (def 'gasB4             0x040)  ; Before the action being measured
-    #   (def 'gasAfter          0x060)  ; After the action being measured
-    #
-    #   ; Understand CALLDATA. It is four bytes of function
-    #   ; selector (irrelevant) followed by 32 byte words
-    #   ; of the parameters
-    #   [powerOf]       $4
-    #   [expectedCost]  $36
-    #
-    #
-    #   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    #   ; Run the operation
-    #   [gasB4]    (gas)
-    #   (exp 2 @powerOf)
-    #   [gasAfter] (gas)
-    #
-    #
-    #   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    #   ; Return value
-    #
-    #   [[0]] (- @gasB4 @gasAfter @expectedCost)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x40, value=Op.GAS)
-            + Op.POP(Op.EXP(0x2, Op.MLOAD(offset=0x0)))
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x40), Op.MLOAD(offset=0x60)),
-                    Op.MLOAD(offset=0x20),
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x40, value=Op.GAS)
+        + Op.POP(Op.EXP(0x2, Op.MLOAD(offset=0x0)))
+        + Op.MSTORE(offset=0x60, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                Op.SUB(Op.MLOAD(offset=0x40), Op.MLOAD(offset=0x60)),
+                Op.MLOAD(offset=0x20),
+            ),
+        )
+        + Op.STOP,
+        storage={0: 24743},
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x087aab8070088fbbe4f60141cf79032d28528b89"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Bytes("c5b5a1ae") + Hash(0x0) + Hash(0x20),
+        Bytes("c5b5a1ae") + Hash(0x1) + Hash(0x52),
+        Bytes("c5b5a1ae") + Hash(0xFF) + Hash(0x52),
+        Bytes("c5b5a1ae") + Hash(0x100) + Hash(0x84),
+        Bytes("c5b5a1ae") + Hash(0xFFFF) + Hash(0x84),
+        Bytes("c5b5a1ae") + Hash(0x10000) + Hash(0xB6),
+        Bytes("c5b5a1ae") + Hash(0xFFFFFF) + Hash(0xB6),
+        Bytes("c5b5a1ae") + Hash(0x1000000) + Hash(0xE8),
+        Bytes("c5b5a1ae") + Hash(0xFFFFFFFF) + Hash(0xE8),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_jump.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_jump.py
index 0543932a404..e176e90fd86 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_jump.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_jump.py
@@ -2,19 +2,21 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostJumpFiller.yml
+state_tests/stEIP150singleCodeGasPrices/gasCostJumpFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,41 +24,49 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostJumpFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/gasCostJumpFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "c5b5a1ae00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "c5b5a1ae00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "c5b5a1ae00000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {},
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_gas_cost_jump(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000002000)
+    contract_2 = Address(0x0000000000000000000000000000000000003000)
+    contract_3 = Address(0x0000000000000000000000000000000000004000)
+    contract_4 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -67,37 +77,39 @@ def test_gas_cost_jump(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0] + Op.PUSH1[0x0] + Op.JUMPDEST + Op.JUMPDEST + Op.STOP
-        ),
+    # Source: raw
+    # 0x600060005B5B00
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0] * 2 + Op.JUMPDEST * 2 + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x60006005565B00
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.PUSH1[0x0] + Op.JUMP(pc=0x5) + Op.JUMPDEST + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000002000"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000002000),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x60016005575B00
+    contract_2 = pre.deploy_contract(  # noqa: F841
         code=Op.JUMPI(pc=0x5, condition=0x1) + Op.JUMPDEST + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000003000"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000003000),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x60006005575B00
+    contract_3 = pre.deploy_contract(  # noqa: F841
         code=Op.JUMPI(pc=0x5, condition=0x0) + Op.JUMPDEST + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000004000"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000004000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
     #   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     #   ; Initialization
@@ -129,115 +141,103 @@ def test_gas_cost_jump(
     #
     #   ; Get the baseline cost
     # ... (51 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=0x1000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x20, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS)
-            )
-            + Op.JUMPI(
-                pc=0x2E, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x1)
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x4E)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=0x2000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x10000,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(
-                offset=0x40, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS)
+        )
+        + Op.MSTORE(offset=0x20, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.JUMPI(pc=0x2E, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x1))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x4E)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x10000,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x5E, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x2)
+        )
+        + Op.MSTORE(offset=0x40, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x5E, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x2))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x7E)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x10000,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x7E)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=0x3000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x40, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8E, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0xAE)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x10000,
+                address=contract_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(
-                offset=0x40, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS)
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x8E, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3)
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0xAE)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=0x4000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x40, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS)
-            )
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x40), Op.MLOAD(offset=0x20)),
-                    Op.CALLDATALOAD(offset=0x24),
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
+        )
+        + Op.MSTORE(offset=0x40, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                Op.SUB(Op.MLOAD(offset=0x40), Op.MLOAD(offset=0x20)),
+                Op.CALLDATALOAD(offset=0x24),
+            ),
+        )
+        + Op.STOP,
+        storage={0: 24743},
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Bytes("c5b5a1ae") + Hash(0x1) + Hash(0x4),
+        Bytes("c5b5a1ae") + Hash(0x2) + Hash(0x6),
+        Bytes("c5b5a1ae") + Hash(0x3) + Hash(0x6),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
+        to=contract_4,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {contract_4: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_mem_seg.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_mem_seg.py
index a4350d7d62a..1b37685b220 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_mem_seg.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_mem_seg.py
@@ -2,19 +2,21 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostMemSegFiller.yml
+state_tests/stEIP150singleCodeGasPrices/gasCostMemSegFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,797 +24,356 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostMemSegFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/gasCostMemSegFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000003a00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000021000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000004100000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000004700000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000004d00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000005300000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000005900000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000005f00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003a00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000021000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000004100000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000004700000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000004d00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000005300000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000005900000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000005f00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021000000000000000000000000000000000000000000000000000000000000004300000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000193",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000019b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000001a3",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000001ab",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000305",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a10000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000030d",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000315",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a10000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000031d",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a100000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000325",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004300000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000047f",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000487",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000048f",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000497",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000049f",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005f9",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000601",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000609",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a300000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000611",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a300000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000619",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000004c00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="d16",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="d17",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="d18",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="d19",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="d20",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="d21",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="d22",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="d23",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="d24",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="d25",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="d26",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="d27",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="d28",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="d29",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="d30",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="d31",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="d32",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="d33",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="d34",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="d35",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="d36",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="d37",
+        ),
+        pytest.param(
+            38,
+            0,
+            0,
+            id="d38",
+        ),
+        pytest.param(
+            39,
+            0,
+            0,
+            id="d39",
+        ),
+        pytest.param(
+            40,
+            0,
+            0,
+            id="d40",
+        ),
+        pytest.param(
+            41,
+            0,
+            0,
+            id="d41",
+        ),
+        pytest.param(
+            42,
+            0,
+            0,
+            id="d42",
+        ),
+        pytest.param(
+            43,
+            0,
+            0,
+            id="d43",
+        ),
+        pytest.param(
+            44,
+            0,
+            0,
+            id="d44",
+        ),
+        pytest.param(
+            45,
+            0,
+            0,
+            id="d45",
+        ),
+        pytest.param(
+            46,
+            0,
+            0,
+            id="d46",
+        ),
+        pytest.param(
+            47,
+            0,
+            0,
+            id="d47",
+        ),
+        pytest.param(
+            48,
+            0,
+            0,
+            id="d48",
+        ),
+        pytest.param(
+            49,
+            0,
+            0,
+            id="d49",
+        ),
+        pytest.param(
+            50,
+            0,
+            0,
+            id="d50",
+        ),
+        pytest.param(
+            51,
+            0,
+            0,
+            id="d51",
+        ),
+        pytest.param(
+            52,
+            0,
+            0,
+            id="d52",
+        ),
+        pytest.param(
+            53,
+            0,
+            0,
+            id="d53",
+        ),
+        pytest.param(
+            54,
+            0,
+            0,
+            id="d54",
         ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000773",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a40000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000077b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000783",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a40000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000078b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000793",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000005500000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000005e00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000006700000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000007900000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_gas_cost_mem_seg(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
-    # {
-    #   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    #   ; Initialization
-    #
-    #   ; Variables (0x20 byte wide)
-    #   (def 'gasB4             0x000)  ; Before the action being measured
-    #   (def 'gasAfter          0x020)  ; After the action being measured
-    #
-    #   (def 'afterVars         0x100)  ; Memory after the variables,
-    #                                   ; safe to copy into
-    #
-    #   ; Understand CALLDATA. It is four bytes of function
-    #   ; selector (irrelevant) followed by 32 byte words
-    #   ; of the parameters
-    #   (def 'opcode     $4 )
-    #   (def 'length     $36)
-    #   (def 'expectedCost $68)
-    #
-    #   ; NOP for if statements
-    #   (def 'NOP     0)
-    #
-    #   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    #   ; Run the operation
-    #
-    #   ; SHA3
-    #   (if (= opcode 0x20) {
-    #       [gasB4]    (gas)
-    #       (sha3 0 length)
-    #       [gasAfter] (gas)
-    #   } NOP)
-    # ... (70 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=Op.PUSH2[0x11],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x20),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x21])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.SHA3(offset=0x0, size=Op.CALLDATALOAD(offset=0x24)))
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x33],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x37),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x45])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.CALLDATACOPY(
-                dest_offset=0x100,
-                offset=0x0,
-                size=Op.CALLDATALOAD(offset=0x24),
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x57],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x39),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x69])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.CODECOPY(
-                dest_offset=0x100,
-                offset=0x0,
-                size=Op.CALLDATALOAD(offset=0x24),
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x7B],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA0),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x8A])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.LOG0(offset=0x0, size=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x9C],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA1),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xAD])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.LOG1(
-                offset=0x0, size=Op.CALLDATALOAD(offset=0x24), topic_1=0x1
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xBF],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA2),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xD2])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.LOG2(
-                offset=0x0,
-                size=Op.CALLDATALOAD(offset=0x24),
-                topic_1=0x1,
-                topic_2=0x2,
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xE4],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA3),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xF9])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.LOG3(
-                offset=0x0,
-                size=Op.CALLDATALOAD(offset=0x24),
-                topic_1=0x1,
-                topic_2=0x2,
-                topic_3=0x3,
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x10B,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA4),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x122)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.LOG4(
-                offset=0x0,
-                size=Op.CALLDATALOAD(offset=0x24),
-                topic_1=0x1,
-                topic_2=0x2,
-                topic_3=0x3,
-                topic_4=0x4,
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)),
-                    Op.CALLDATALOAD(offset=0x44),
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x727437e50af8535411157a4aca154c81d72baad4"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostMemSegFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000003a00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000021000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000004100000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000004700000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000004d00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000005300000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000005900000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000005f00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003a00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000021000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000003b00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000004100000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000004700000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000004d00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000005300000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000005900000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000005f00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021000000000000000000000000000000000000000000000000000000000000004300000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000193",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000019b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000001a3",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000001ab",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000305",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a10000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000030d",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000315",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a10000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000031d",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a100000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000325",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004300000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000047f",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000487",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000048f",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000497",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000049f",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005f9",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000601",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000609",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a300000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000611",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a300000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000619",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000004c00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000773",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a40000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000077b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000783",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a40000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000078b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000793",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000005500000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000005e00000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000006700000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-        (
-            "98eed7a400000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000007900000000000000000000000000000000000000000000000000000000dead60a700000000000000000000000000000000000000000000000000000000deadbeef0000000000000000000000000000000000000000000000000000000060a7beef",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_gas_cost_mem_seg_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -823,8 +384,7 @@ def test_gas_cost_mem_seg_from_prague(
         gas_limit=100000000,
     )
 
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
+    # Source: lll
     # {
     #   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     #   ; Initialization
@@ -856,149 +416,377 @@ def test_gas_cost_mem_seg_from_prague(
     #       [gasAfter] (gas)
     #   } NOP)
     # ... (70 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=Op.PUSH2[0x11],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x20),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x21])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.SHA3(offset=0x0, size=Op.CALLDATALOAD(offset=0x24)))
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x33],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x37),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x45])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.CALLDATACOPY(
-                dest_offset=0x100,
-                offset=0x0,
-                size=Op.CALLDATALOAD(offset=0x24),
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x57],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x39),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x69])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.CODECOPY(
-                dest_offset=0x100,
-                offset=0x0,
-                size=Op.CALLDATALOAD(offset=0x24),
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x7B],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA0),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x8A])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.LOG0(offset=0x0, size=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x9C],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA1),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xAD])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.LOG1(
-                offset=0x0, size=Op.CALLDATALOAD(offset=0x24), topic_1=0x1
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xBF],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA2),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xD2])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.LOG2(
-                offset=0x0,
-                size=Op.CALLDATALOAD(offset=0x24),
-                topic_1=0x1,
-                topic_2=0x2,
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xE4],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA3),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xF9])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.LOG3(
-                offset=0x0,
-                size=Op.CALLDATALOAD(offset=0x24),
-                topic_1=0x1,
-                topic_2=0x2,
-                topic_3=0x3,
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x10B,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA4),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x122)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.LOG4(
-                offset=0x0,
-                size=Op.CALLDATALOAD(offset=0x24),
-                topic_1=0x1,
-                topic_2=0x2,
-                topic_3=0x3,
-                topic_4=0x4,
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)),
-                    Op.CALLDATALOAD(offset=0x44),
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=Op.PUSH2[0x11],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x20),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x21])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.SHA3(offset=0x0, size=Op.CALLDATALOAD(offset=0x24)))
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x33],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x37),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x45])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.CALLDATACOPY(
+            dest_offset=0x100, offset=0x0, size=Op.CALLDATALOAD(offset=0x24)
+        )
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x57],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x39),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x69])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.CODECOPY(
+            dest_offset=0x100, offset=0x0, size=Op.CALLDATALOAD(offset=0x24)
+        )
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x7B],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA0),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x8A])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.LOG0(offset=0x0, size=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x9C],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA1),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xAD])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.LOG1(offset=0x0, size=Op.CALLDATALOAD(offset=0x24), topic_1=0x1)
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xBF],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA2),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xD2])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.LOG2(
+            offset=0x0,
+            size=Op.CALLDATALOAD(offset=0x24),
+            topic_1=0x1,
+            topic_2=0x2,
+        )
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xE4],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA3),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xF9])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.LOG3(
+            offset=0x0,
+            size=Op.CALLDATALOAD(offset=0x24),
+            topic_1=0x1,
+            topic_2=0x2,
+            topic_3=0x3,
+        )
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x10B, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA4)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x122)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.LOG4(
+            offset=0x0,
+            size=Op.CALLDATALOAD(offset=0x24),
+            topic_1=0x1,
+            topic_2=0x2,
+            topic_3=0x3,
+            topic_4=0x4,
+        )
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)),
+                Op.CALLDATALOAD(offset=0x44),
+            ),
+        )
+        + Op.STOP,
+        storage={0: 24743},
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x727437e50af8535411157a4aca154c81d72baad4"),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Bytes("98eed7a4")
+        + Hash(0x20)
+        + Hash(0x1)
+        + Hash(0x3A)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x20)
+        + Hash(0x20)
+        + Hash(0x3A)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x20)
+        + Hash(0x21)
+        + Hash(0x43)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x20)
+        + Hash(0x40)
+        + Hash(0x43)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x20)
+        + Hash(0x60)
+        + Hash(0x4C)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x20)
+        + Hash(0x80)
+        + Hash(0x55)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x20)
+        + Hash(0xA0)
+        + Hash(0x5E)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x20)
+        + Hash(0xC0)
+        + Hash(0x67)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x20)
+        + Hash(0xE0)
+        + Hash(0x70)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x20)
+        + Hash(0x100)
+        + Hash(0x79)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x37)
+        + Hash(0x1)
+        + Hash(0x35)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x37)
+        + Hash(0x20)
+        + Hash(0x35)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x37)
+        + Hash(0x21)
+        + Hash(0x3B)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x37)
+        + Hash(0x40)
+        + Hash(0x3B)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x37)
+        + Hash(0x60)
+        + Hash(0x41)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x37)
+        + Hash(0x80)
+        + Hash(0x47)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x37)
+        + Hash(0xA0)
+        + Hash(0x4D)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x37)
+        + Hash(0xC0)
+        + Hash(0x53)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x37)
+        + Hash(0xE0)
+        + Hash(0x59)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x37)
+        + Hash(0x100)
+        + Hash(0x5F)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x39)
+        + Hash(0x1)
+        + Hash(0x35)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x39)
+        + Hash(0x20)
+        + Hash(0x35)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x39)
+        + Hash(0x21)
+        + Hash(0x3B)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x39)
+        + Hash(0x40)
+        + Hash(0x3B)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x39)
+        + Hash(0x60)
+        + Hash(0x41)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x39)
+        + Hash(0x80)
+        + Hash(0x47)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x39)
+        + Hash(0xA0)
+        + Hash(0x4D)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x39)
+        + Hash(0xC0)
+        + Hash(0x53)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x39)
+        + Hash(0xE0)
+        + Hash(0x59)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("98eed7a4")
+        + Hash(0x39)
+        + Hash(0x100)
+        + Hash(0x5F)
+        + Hash(0xDEAD60A7)
+        + Hash(0xDEADBEEF)
+        + Hash(0x60A7BEEF),
+        Bytes("d086d23d") + Hash(0xA0) + Hash(0x0) + Hash(0x18B),
+        Bytes("d086d23d") + Hash(0xA0) + Hash(0x1) + Hash(0x193),
+        Bytes("d086d23d") + Hash(0xA0) + Hash(0x2) + Hash(0x19B),
+        Bytes("d086d23d") + Hash(0xA0) + Hash(0x3) + Hash(0x1A3),
+        Bytes("d086d23d") + Hash(0xA0) + Hash(0x4) + Hash(0x1AB),
+        Bytes("d086d23d") + Hash(0xA1) + Hash(0x0) + Hash(0x305),
+        Bytes("d086d23d") + Hash(0xA1) + Hash(0x1) + Hash(0x30D),
+        Bytes("d086d23d") + Hash(0xA1) + Hash(0x2) + Hash(0x315),
+        Bytes("d086d23d") + Hash(0xA1) + Hash(0x3) + Hash(0x31D),
+        Bytes("d086d23d") + Hash(0xA1) + Hash(0x4) + Hash(0x325),
+        Bytes("d086d23d") + Hash(0xA2) + Hash(0x0) + Hash(0x47F),
+        Bytes("d086d23d") + Hash(0xA2) + Hash(0x1) + Hash(0x487),
+        Bytes("d086d23d") + Hash(0xA2) + Hash(0x2) + Hash(0x48F),
+        Bytes("d086d23d") + Hash(0xA2) + Hash(0x3) + Hash(0x497),
+        Bytes("d086d23d") + Hash(0xA2) + Hash(0x4) + Hash(0x49F),
+        Bytes("d086d23d") + Hash(0xA3) + Hash(0x0) + Hash(0x5F9),
+        Bytes("d086d23d") + Hash(0xA3) + Hash(0x1) + Hash(0x601),
+        Bytes("d086d23d") + Hash(0xA3) + Hash(0x2) + Hash(0x609),
+        Bytes("d086d23d") + Hash(0xA3) + Hash(0x3) + Hash(0x611),
+        Bytes("d086d23d") + Hash(0xA3) + Hash(0x4) + Hash(0x619),
+        Bytes("d086d23d") + Hash(0xA4) + Hash(0x0) + Hash(0x773),
+        Bytes("d086d23d") + Hash(0xA4) + Hash(0x1) + Hash(0x77B),
+        Bytes("d086d23d") + Hash(0xA4) + Hash(0x2) + Hash(0x783),
+        Bytes("d086d23d") + Hash(0xA4) + Hash(0x3) + Hash(0x78B),
+        Bytes("d086d23d") + Hash(0xA4) + Hash(0x4) + Hash(0x793),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_memory.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_memory.py
index d5e8217898e..aad4a36436a 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_memory.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_memory.py
@@ -2,19 +2,24 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostMemoryFiller.yml
+state_tests/stEIP150singleCodeGasPrices/gasCostMemoryFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,458 +27,480 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostMemoryFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/gasCostMemoryFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000025",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000038e",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000005ae",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000026",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000029",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000002c",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000002f",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000032",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000003e",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000057",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000070",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000028",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d6",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ae",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000038f",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000005af",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000026",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000029",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000002c",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000002f",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000032",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000003e",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000002b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000057",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000070",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d6",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ae",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000038f",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000005af",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002f6",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002f9",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000002fc",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000002ff",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000002e",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000302",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030e",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000326",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000358",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000003be",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000496",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000677",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000af8",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000016fa",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000003d",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000056",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000006f",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d5",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ad",  # noqa: E501
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="d16",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="d17",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="d18",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="d19",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="d20",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="d21",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="d22",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="d23",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="d24",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="d25",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="d26",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="d27",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="d28",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="d29",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="d30",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="d31",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="d32",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="d33",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="d34",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="d35",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="d36",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="d37",
+        ),
+        pytest.param(
+            38,
+            0,
+            0,
+            id="d38",
+        ),
+        pytest.param(
+            39,
+            0,
+            0,
+            id="d39",
+        ),
+        pytest.param(
+            40,
+            0,
+            0,
+            id="d40",
+        ),
+        pytest.param(
+            41,
+            0,
+            0,
+            id="d41",
+        ),
+        pytest.param(
+            42,
+            0,
+            0,
+            id="d42",
+        ),
+        pytest.param(
+            43,
+            0,
+            0,
+            id="d43",
+        ),
+        pytest.param(
+            44,
+            0,
+            0,
+            id="d44",
+        ),
+        pytest.param(
+            45,
+            0,
+            0,
+            id="d45",
+        ),
+        pytest.param(
+            46,
+            0,
+            0,
+            id="d46",
+        ),
+        pytest.param(
+            47,
+            0,
+            0,
+            id="d47",
+        ),
+        pytest.param(
+            48,
+            0,
+            0,
+            id="d48",
+        ),
+        pytest.param(
+            49,
+            0,
+            0,
+            id="d49",
+        ),
+        pytest.param(
+            50,
+            0,
+            0,
+            id="d50",
+        ),
+        pytest.param(
+            51,
+            0,
+            0,
+            id="d51",
+        ),
+        pytest.param(
+            52,
+            0,
+            0,
+            id="d52",
+        ),
+        pytest.param(
+            53,
+            0,
+            0,
+            id="d53",
+        ),
+        pytest.param(
+            54,
+            0,
+            0,
+            id="d54",
+        ),
+        pytest.param(
+            55,
+            0,
+            0,
+            id="d55",
+        ),
+        pytest.param(
+            56,
+            0,
+            0,
+            id="d56",
+        ),
+        pytest.param(
+            57,
+            0,
+            0,
+            id="d57",
+        ),
+        pytest.param(
+            58,
+            0,
+            0,
+            id="d58",
+        ),
+        pytest.param(
+            59,
+            0,
+            0,
+            id="d59",
+        ),
+        pytest.param(
+            60,
+            0,
+            0,
+            id="d60",
+        ),
+        pytest.param(
+            61,
+            0,
+            0,
+            id="d61",
+        ),
+        pytest.param(
+            62,
+            0,
+            0,
+            id="d62",
+        ),
+        pytest.param(
+            63,
+            0,
+            0,
+            id="d63",
+        ),
+        pytest.param(
+            64,
+            0,
+            0,
+            id="d64",
+        ),
+        pytest.param(
+            65,
+            0,
+            0,
+            id="d65",
+        ),
+        pytest.param(
+            66,
+            0,
+            0,
+            id="d66",
+        ),
+        pytest.param(
+            67,
+            0,
+            0,
+            id="d67",
+        ),
+        pytest.param(
+            68,
+            0,
+            0,
+            id="d68",
+        ),
+        pytest.param(
+            69,
+            0,
+            0,
+            id="d69",
+        ),
+        pytest.param(
+            70,
+            0,
+            0,
+            id="d70",
+        ),
+        pytest.param(
+            71,
+            0,
+            0,
+            id="d71",
+        ),
+        pytest.param(
+            72,
+            0,
+            0,
+            id="d72",
+        ),
+        pytest.param(
+            73,
+            0,
+            0,
+            id="d73",
+        ),
+        pytest.param(
+            74,
+            0,
+            0,
+            id="d74",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_gas_cost_memory(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x000000000000000000000000000000000000BA5E)
+    contract_1 = Address(0x000000000000000000000000000000000010BA5E)
+    contract_2 = Address(0x000000000000000000000000000000000011BA5E)
+    contract_3 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -484,56 +511,50 @@ def test_gas_cost_memory(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {
     #    (mstore $0 0x60A7)
     #    (mload $0)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=Op.CALLDATALOAD(offset=0x0), value=0x60A7)
-            + Op.MLOAD(offset=Op.CALLDATALOAD(offset=0x0))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=Op.CALLDATALOAD(offset=0x0), value=0x60A7)
+        + Op.MLOAD(offset=Op.CALLDATALOAD(offset=0x0))
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000ba5e"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000BA5E),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
     #    (mstore $0 0x60A7)
     #    (mload $0)
     #    (mload $0)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=Op.CALLDATALOAD(offset=0x0), value=0x60A7)
-            + Op.POP(Op.MLOAD(offset=Op.CALLDATALOAD(offset=0x0)))
-            + Op.MLOAD(offset=Op.CALLDATALOAD(offset=0x0))
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=Op.CALLDATALOAD(offset=0x0), value=0x60A7)
+        + Op.POP(Op.MLOAD(offset=Op.CALLDATALOAD(offset=0x0)))
+        + Op.MLOAD(offset=Op.CALLDATALOAD(offset=0x0))
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000010ba5e"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000010BA5E),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
     #    (mstore $0 0x60A7)
     #    (mload $0)
     #    (mstore $0 0x60A7)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=Op.CALLDATALOAD(offset=0x0), value=0x60A7)
-            + Op.POP(Op.MLOAD(offset=Op.CALLDATALOAD(offset=0x0)))
-            + Op.MSTORE(offset=Op.CALLDATALOAD(offset=0x0), value=0x60A7)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=Op.CALLDATALOAD(offset=0x0), value=0x60A7)
+        + Op.POP(Op.MLOAD(offset=Op.CALLDATALOAD(offset=0x0)))
+        + Op.MSTORE(offset=Op.CALLDATALOAD(offset=0x0), value=0x60A7)
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000011ba5e"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000011BA5E),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
     #   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     #   ; Initialization
@@ -565,958 +586,359 @@ def test_gas_cost_memory(
     #   ; Constants
     #   (def  'NOP    0) ; No operation (for if statements)
     # ... (103 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x23],
-                condition=Op.EQ(Op.MLOAD(offset=0x0), 0x0),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x31])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.POP(Op.MLOAD(offset=Op.MLOAD(offset=0x20)))
-            + Op.MSTORE(offset=0x80, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x43],
-                condition=Op.EQ(Op.MLOAD(offset=0x0), 0x1),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x53])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.MSTORE(offset=Op.MLOAD(offset=0x20), value=0x60A7)
-            + Op.MSTORE(offset=0x80, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x65],
-                condition=Op.EQ(Op.MLOAD(offset=0x0), 0x2),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x74])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.MSTORE8(offset=Op.MLOAD(offset=0x20), value=0xFF)
-            + Op.MSTORE(offset=0x80, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x86],
-                condition=Op.EQ(Op.MLOAD(offset=0x0), 0x3),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xAC])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=0xBA5E,
-                    value=0x0,
-                    args_offset=0x20,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0xA0,
-                value=Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xBE],
-                condition=Op.EQ(Op.MLOAD(offset=0x0), 0x10),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x10A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=0xBA5E,
-                    value=0x0,
-                    args_offset=0x20,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0xA0,
-                value=Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
-            )
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=0x10BA5E,
-                    value=0x0,
-                    args_offset=0x20,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0xC0,
-                value=Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x11C, condition=Op.EQ(Op.MLOAD(offset=0x0), 0x11))
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x168)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=0xBA5E,
-                    value=0x0,
-                    args_offset=0x20,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0xA0,
-                value=Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
-            )
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=0x11BA5E,
-                    value=0x0,
-                    args_offset=0x20,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0xC0,
-                value=Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x17B,
-                condition=Op.ISZERO(Op.GT(Op.MLOAD(offset=0x0), 0x2)),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x18A)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
-                    Op.MLOAD(offset=0x40),
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x19C, condition=Op.EQ(Op.MLOAD(offset=0x0), 0x3))
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x1A7)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(Op.MLOAD(offset=0xA0), Op.MLOAD(offset=0x40)),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1BC,
-                condition=Op.EQ(0x10, Op.AND(Op.MLOAD(offset=0x0), 0xF0)),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x1CB)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0xC0), Op.MLOAD(offset=0xA0)),
-                    Op.MLOAD(offset=0x40),
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x23], condition=Op.EQ(Op.MLOAD(offset=0x0), 0x0)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x31])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x60, value=Op.GAS)
+        + Op.POP(Op.MLOAD(offset=Op.MLOAD(offset=0x20)))
+        + Op.MSTORE(offset=0x80, value=Op.GAS)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x43], condition=Op.EQ(Op.MLOAD(offset=0x0), 0x1)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x53])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x60, value=Op.GAS)
+        + Op.MSTORE(offset=Op.MLOAD(offset=0x20), value=0x60A7)
+        + Op.MSTORE(offset=0x80, value=Op.GAS)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x65], condition=Op.EQ(Op.MLOAD(offset=0x0), 0x2)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x74])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x60, value=Op.GAS)
+        + Op.MSTORE8(offset=Op.MLOAD(offset=0x20), value=0xFF)
+        + Op.MSTORE(offset=0x80, value=Op.GAS)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x86], condition=Op.EQ(Op.MLOAD(offset=0x0), 0x3)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xAC])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x60, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x10000,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x20,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x80, value=Op.GAS)
+        + Op.MSTORE(
+            offset=0xA0,
+            value=Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xBE], condition=Op.EQ(Op.MLOAD(offset=0x0), 0x10)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x10A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x60, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x10000,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x20,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x80, value=Op.GAS)
+        + Op.MSTORE(
+            offset=0xA0,
+            value=Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
+        )
+        + Op.MSTORE(offset=0x60, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x10000,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x20,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x80, value=Op.GAS)
+        + Op.MSTORE(
+            offset=0xC0,
+            value=Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x11C, condition=Op.EQ(Op.MLOAD(offset=0x0), 0x11))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x168)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x60, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x10000,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x20,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x80, value=Op.GAS)
+        + Op.MSTORE(
+            offset=0xA0,
+            value=Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
+        )
+        + Op.MSTORE(offset=0x60, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x10000,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x20,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x80, value=Op.GAS)
+        + Op.MSTORE(
+            offset=0xC0,
+            value=Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x17B, condition=Op.ISZERO(Op.GT(Op.MLOAD(offset=0x0), 0x2))
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x18A)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
+                Op.MLOAD(offset=0x40),
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x19C, condition=Op.EQ(Op.MLOAD(offset=0x0), 0x3))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x1A7)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=0x0, value=Op.SUB(Op.MLOAD(offset=0xA0), Op.MLOAD(offset=0x40))
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1BC, condition=Op.EQ(0x10, Op.AND(Op.MLOAD(offset=0x0), 0xF0))
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x1CB)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                Op.SUB(Op.MLOAD(offset=0xC0), Op.MLOAD(offset=0xA0)),
+                Op.MLOAD(offset=0x40),
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
+        storage={0: 24743},
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
 
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostMemoryFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000025",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000038e",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000005ae",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000026",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000029",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000002c",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000002f",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000032",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000003e",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000057",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000070",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000028",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d6",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ae",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000038f",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000005af",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000026",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000029",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000002c",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000002f",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000032",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000003e",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000002b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000057",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000070",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d6",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ae",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000038f",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000005af",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002f6",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002f9",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000002fc",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000002ff",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000002e",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000302",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030e",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000326",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000358",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000003be",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000496",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [
+                    0,
+                    1,
+                    2,
+                    3,
+                    4,
+                    5,
+                    6,
+                    7,
+                    8,
+                    9,
+                    10,
+                    11,
+                    12,
+                    13,
+                    14,
+                    15,
+                    16,
+                    17,
+                    18,
+                    19,
+                    20,
+                    21,
+                    22,
+                    23,
+                    24,
+                    25,
+                    26,
+                    27,
+                    28,
+                    29,
+                    30,
+                    31,
+                    32,
+                    33,
+                    34,
+                    35,
+                    49,
+                    50,
+                    51,
+                    52,
+                    53,
+                    54,
+                    55,
+                    56,
+                    57,
+                    58,
+                    59,
+                    60,
+                    61,
+                    62,
+                    63,
+                    64,
+                    65,
+                    66,
+                    67,
+                    68,
+                    69,
+                    70,
+                    71,
+                    72,
+                    73,
+                    74,
+                ],
+                "gas": -1,
+                "value": -1,
             },
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000677",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000af8",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
-            },
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000016fa",  # noqa: E501
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 1900}
-                )
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {
+                "data": [36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48],
+                "gas": -1,
+                "value": -1,
             },
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000003d",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000056",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000006f",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d5",  # noqa: E501
-            {},
-        ),
-        (
-            "d086d23d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ad",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_gas_cost_memory_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 1900})},
+        },
+    ]
 
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
 
-    # Source: LLL
-    # {
-    #    (mstore $0 0x60A7)
-    #    (mload $0)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=Op.CALLDATALOAD(offset=0x0), value=0x60A7)
-            + Op.MLOAD(offset=Op.CALLDATALOAD(offset=0x0))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000ba5e"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    (mstore $0 0x60A7)
-    #    (mload $0)
-    #    (mload $0)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=Op.CALLDATALOAD(offset=0x0), value=0x60A7)
-            + Op.POP(Op.MLOAD(offset=Op.CALLDATALOAD(offset=0x0)))
-            + Op.MLOAD(offset=Op.CALLDATALOAD(offset=0x0))
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000010ba5e"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #    (mstore $0 0x60A7)
-    #    (mload $0)
-    #    (mstore $0 0x60A7)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=Op.CALLDATALOAD(offset=0x0), value=0x60A7)
-            + Op.POP(Op.MLOAD(offset=Op.CALLDATALOAD(offset=0x0)))
-            + Op.MSTORE(offset=Op.CALLDATALOAD(offset=0x0), value=0x60A7)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000011ba5e"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    #   ; Initialization
-    #
-    #   ; Variables (0x20 byte wide)
-    #   (def 'action            0x000)  ; Action to take with the memory
-    #   (def 'addr              0x020)  ; Address to read / write
-    #   (def 'expectedCost      0x040)  ; Expected gas cost
-    #   (def 'gasB4             0x060)  ; Before the action being measured
-    #   (def 'gasAfter          0x080)  ; After the action being measured
-    #
-    #   ; Gas cost for a baseline operation (call a contract that does mstore
-    #   ; and then mload)
-    #   (def 'gasBaseline       0x0A0)
-    #
-    #   ; Gas for for the action intself (call a contract plus <whatever>)
-    #   (def 'gasAction         0x0C0)
-    #
-    #   ; Temporary values
-    #   (def 'temp              0x0E0)
-    #
-    #   ; Understand CALLDATA. It is four bytes of function
-    #   ; selector (irrelevant) followed by 32 byte words
-    #   ; of the parameters
-    #   [action]        $4
-    #   [addr]          $36
-    #   [expectedCost]  $68
-    #
-    #   ; Constants
-    #   (def  'NOP    0) ; No operation (for if statements)
-    # ... (103 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x23],
-                condition=Op.EQ(Op.MLOAD(offset=0x0), 0x0),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x31])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.POP(Op.MLOAD(offset=Op.MLOAD(offset=0x20)))
-            + Op.MSTORE(offset=0x80, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x43],
-                condition=Op.EQ(Op.MLOAD(offset=0x0), 0x1),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x53])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.MSTORE(offset=Op.MLOAD(offset=0x20), value=0x60A7)
-            + Op.MSTORE(offset=0x80, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x65],
-                condition=Op.EQ(Op.MLOAD(offset=0x0), 0x2),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x74])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.MSTORE8(offset=Op.MLOAD(offset=0x20), value=0xFF)
-            + Op.MSTORE(offset=0x80, value=Op.GAS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x86],
-                condition=Op.EQ(Op.MLOAD(offset=0x0), 0x3),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xAC])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=0xBA5E,
-                    value=0x0,
-                    args_offset=0x20,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0xA0,
-                value=Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xBE],
-                condition=Op.EQ(Op.MLOAD(offset=0x0), 0x10),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x10A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=0xBA5E,
-                    value=0x0,
-                    args_offset=0x20,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0xA0,
-                value=Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
-            )
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=0x10BA5E,
-                    value=0x0,
-                    args_offset=0x20,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0xC0,
-                value=Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x11C, condition=Op.EQ(Op.MLOAD(offset=0x0), 0x11))
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x168)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=0xBA5E,
-                    value=0x0,
-                    args_offset=0x20,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0xA0,
-                value=Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
-            )
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=0x11BA5E,
-                    value=0x0,
-                    args_offset=0x20,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0xC0,
-                value=Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x17B,
-                condition=Op.ISZERO(Op.GT(Op.MLOAD(offset=0x0), 0x2)),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x18A)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x60), Op.MLOAD(offset=0x80)),
-                    Op.MLOAD(offset=0x40),
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x19C, condition=Op.EQ(Op.MLOAD(offset=0x0), 0x3))
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x1A7)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(Op.MLOAD(offset=0xA0), Op.MLOAD(offset=0x40)),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1BC,
-                condition=Op.EQ(0x10, Op.AND(Op.MLOAD(offset=0x0), 0xF0)),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x1CB)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0xC0), Op.MLOAD(offset=0xA0)),
-                    Op.MLOAD(offset=0x40),
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Bytes("d086d23d") + Hash(0x0) + Hash(0x100) + Hash(0x25),
+        Bytes("d086d23d") + Hash(0x0) + Hash(0x120) + Hash(0x28),
+        Bytes("d086d23d") + Hash(0x0) + Hash(0x140) + Hash(0x2B),
+        Bytes("d086d23d") + Hash(0x0) + Hash(0x160) + Hash(0x2E),
+        Bytes("d086d23d") + Hash(0x0) + Hash(0x180) + Hash(0x31),
+        Bytes("d086d23d") + Hash(0x0) + Hash(0x200) + Hash(0x3D),
+        Bytes("d086d23d") + Hash(0x0) + Hash(0x300) + Hash(0x56),
+        Bytes("d086d23d") + Hash(0x0) + Hash(0x400) + Hash(0x6F),
+        Bytes("d086d23d") + Hash(0x0) + Hash(0x800) + Hash(0xD5),
+        Bytes("d086d23d") + Hash(0x0) + Hash(0x1000) + Hash(0x1AD),
+        Bytes("d086d23d") + Hash(0x0) + Hash(0x2000) + Hash(0x38E),
+        Bytes("d086d23d") + Hash(0x0) + Hash(0x3000) + Hash(0x5AE),
+        Bytes("d086d23d") + Hash(0x1) + Hash(0x100) + Hash(0x26),
+        Bytes("d086d23d") + Hash(0x1) + Hash(0x120) + Hash(0x29),
+        Bytes("d086d23d") + Hash(0x1) + Hash(0x140) + Hash(0x2C),
+        Bytes("d086d23d") + Hash(0x1) + Hash(0x160) + Hash(0x2F),
+        Bytes("d086d23d") + Hash(0x1) + Hash(0x180) + Hash(0x32),
+        Bytes("d086d23d") + Hash(0x1) + Hash(0x200) + Hash(0x3E),
+        Bytes("d086d23d") + Hash(0x1) + Hash(0x300) + Hash(0x57),
+        Bytes("d086d23d") + Hash(0x1) + Hash(0x400) + Hash(0x70),
+        Bytes("d086d23d") + Hash(0x1) + Hash(0x800) + Hash(0xD6),
+        Bytes("d086d23d") + Hash(0x1) + Hash(0x1000) + Hash(0x1AE),
+        Bytes("d086d23d") + Hash(0x1) + Hash(0x2000) + Hash(0x38F),
+        Bytes("d086d23d") + Hash(0x1) + Hash(0x3000) + Hash(0x5AF),
+        Bytes("d086d23d") + Hash(0x2) + Hash(0x100) + Hash(0x26),
+        Bytes("d086d23d") + Hash(0x2) + Hash(0x120) + Hash(0x29),
+        Bytes("d086d23d") + Hash(0x2) + Hash(0x140) + Hash(0x2C),
+        Bytes("d086d23d") + Hash(0x2) + Hash(0x160) + Hash(0x2F),
+        Bytes("d086d23d") + Hash(0x2) + Hash(0x180) + Hash(0x32),
+        Bytes("d086d23d") + Hash(0x2) + Hash(0x200) + Hash(0x3E),
+        Bytes("d086d23d") + Hash(0x2) + Hash(0x300) + Hash(0x57),
+        Bytes("d086d23d") + Hash(0x2) + Hash(0x400) + Hash(0x70),
+        Bytes("d086d23d") + Hash(0x2) + Hash(0x800) + Hash(0xD6),
+        Bytes("d086d23d") + Hash(0x2) + Hash(0x1000) + Hash(0x1AE),
+        Bytes("d086d23d") + Hash(0x2) + Hash(0x2000) + Hash(0x38F),
+        Bytes("d086d23d") + Hash(0x2) + Hash(0x3000) + Hash(0x5AF),
+        Bytes("d086d23d") + Hash(0x3) + Hash(0x0) + Hash(0x2F6),
+        Bytes("d086d23d") + Hash(0x3) + Hash(0x20) + Hash(0x2F9),
+        Bytes("d086d23d") + Hash(0x3) + Hash(0x40) + Hash(0x2FC),
+        Bytes("d086d23d") + Hash(0x3) + Hash(0x60) + Hash(0x2FF),
+        Bytes("d086d23d") + Hash(0x3) + Hash(0x80) + Hash(0x302),
+        Bytes("d086d23d") + Hash(0x3) + Hash(0x100) + Hash(0x30E),
+        Bytes("d086d23d") + Hash(0x3) + Hash(0x200) + Hash(0x326),
+        Bytes("d086d23d") + Hash(0x3) + Hash(0x400) + Hash(0x358),
+        Bytes("d086d23d") + Hash(0x3) + Hash(0x800) + Hash(0x3BE),
+        Bytes("d086d23d") + Hash(0x3) + Hash(0x1000) + Hash(0x496),
+        Bytes("d086d23d") + Hash(0x3) + Hash(0x2000) + Hash(0x677),
+        Bytes("d086d23d") + Hash(0x3) + Hash(0x4000) + Hash(0xAF8),
+        Bytes("d086d23d") + Hash(0x3) + Hash(0x8000) + Hash(0x16FA),
+        Bytes("d086d23d") + Hash(0x10) + Hash(0x0) + Hash(0x8),
+        Bytes("d086d23d") + Hash(0x10) + Hash(0x10) + Hash(0x8),
+        Bytes("d086d23d") + Hash(0x10) + Hash(0x20) + Hash(0x8),
+        Bytes("d086d23d") + Hash(0x10) + Hash(0x40) + Hash(0x8),
+        Bytes("d086d23d") + Hash(0x10) + Hash(0x80) + Hash(0x8),
+        Bytes("d086d23d") + Hash(0x10) + Hash(0x100) + Hash(0x8),
+        Bytes("d086d23d") + Hash(0x10) + Hash(0x200) + Hash(0x8),
+        Bytes("d086d23d") + Hash(0x10) + Hash(0x400) + Hash(0x8),
+        Bytes("d086d23d") + Hash(0x10) + Hash(0x800) + Hash(0x8),
+        Bytes("d086d23d") + Hash(0x10) + Hash(0x1000) + Hash(0x8),
+        Bytes("d086d23d") + Hash(0x10) + Hash(0x2000) + Hash(0x8),
+        Bytes("d086d23d") + Hash(0x10) + Hash(0x4000) + Hash(0x8),
+        Bytes("d086d23d") + Hash(0x10) + Hash(0x8000) + Hash(0x8),
+        Bytes("d086d23d") + Hash(0x11) + Hash(0x0) + Hash(0xB),
+        Bytes("d086d23d") + Hash(0x11) + Hash(0x10) + Hash(0xB),
+        Bytes("d086d23d") + Hash(0x11) + Hash(0x20) + Hash(0xB),
+        Bytes("d086d23d") + Hash(0x11) + Hash(0x40) + Hash(0xB),
+        Bytes("d086d23d") + Hash(0x11) + Hash(0x80) + Hash(0xB),
+        Bytes("d086d23d") + Hash(0x11) + Hash(0x100) + Hash(0xB),
+        Bytes("d086d23d") + Hash(0x11) + Hash(0x200) + Hash(0xB),
+        Bytes("d086d23d") + Hash(0x11) + Hash(0x400) + Hash(0xB),
+        Bytes("d086d23d") + Hash(0x11) + Hash(0x800) + Hash(0xB),
+        Bytes("d086d23d") + Hash(0x11) + Hash(0x1000) + Hash(0xB),
+        Bytes("d086d23d") + Hash(0x11) + Hash(0x2000) + Hash(0xB),
+        Bytes("d086d23d") + Hash(0x11) + Hash(0x4000) + Hash(0xB),
+        Bytes("d086d23d") + Hash(0x11) + Hash(0x8000) + Hash(0xB),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
+        to=contract_3,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_return.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_return.py
index df122cb1eee..cebe282fc29 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_return.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_gas_cost_return.py
@@ -2,15 +2,15 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostReturnFiller.yml
+state_tests/stEIP150singleCodeGasPrices/gasCostReturnFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostReturnFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/gasCostReturnFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_gas_cost_return(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,7 +43,21 @@ def test_gas_cost_return(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: raw
+    # 0x600060FF00
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0] + Op.PUSH1[0xFF] + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+    )
+    # Source: raw
+    # 0x600060FFF3
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFF, size=0x0),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+    )
+    # Source: lll
     # {
     #   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     #   ; Initialization
@@ -79,76 +89,53 @@ def test_gas_cost_return(
     #   (call 0x10000 0x2000 0 0 0 0 0)
     #   [gasRETURN] (- @gasB4 (gas))
     # ... (11 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x60A7)
-            + Op.MSTORE(offset=0x20, value=0x60A7)
-            + Op.MSTORE(offset=0x40, value=0x60A7)
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=0x1000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x20, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS)
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x60A7)
+        + Op.MSTORE(offset=0x20, value=0x60A7)
+        + Op.MSTORE(offset=0x40, value=0x60A7)
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x10000,
+                address=0x1000,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=0x2000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x20, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x10000,
+                address=0x2000,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(
-                offset=0x40, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS)
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(Op.MLOAD(offset=0x20), Op.MLOAD(offset=0x40)),
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x155665fb22995bb5b9dc1d8d9d57a00ac64dc1e0"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0xFF, size=0x0),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x35cd99e56b0f9ac243172a86bef4d042dfdbc166"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.PUSH1[0x0] + Op.PUSH1[0xFF] + Op.STOP,
+        )
+        + Op.MSTORE(offset=0x40, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.SSTORE(
+            key=0x0, value=Op.SUB(Op.MLOAD(offset=0x20), Op.MLOAD(offset=0x40))
+        )
+        + Op.STOP,
+        storage={0: 24743},
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xeb0e68b88a12fc84ad4a1eeb07b289638c4d9f3c"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=target,
+        data=Bytes("00"),
         gas_limit=16777216,
         value=1,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0, 1: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_balance_gas.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_balance_gas.py
index daa0c580f2e..9b410ce9fb9 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_balance_gas.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_balance_gas.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_balance_gas.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices/RawBalanceGasFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawBalanceGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawBalanceGasFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/RawBalanceGasFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_raw_balance_gas(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_balance_gas."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,30 +43,23 @@ def test_raw_balance_gas(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [0] (GAS) (BALANCE <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.BALANCE(address=0xFAA10B404AB607779993C016CD5DA73AE1F29D7E),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.BALANCE(address=sender))
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdfde2d07c7829a62d244d6b9791742b2921af7c0"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post = {
-        contract: Account(storage={1: 116}),
-    }
+    post = {target: Account(storage={1: 116})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas.py
index dfc781be123..ce267ffe0b9 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_call_code_gas.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_raw_call_code_gas(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_call_code_gas."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,43 +43,42 @@ def test_raw_call_code_gas(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (CALLCODE 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x7530,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x2368fc9631cc2861d8e253341f166876337e12b0"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (CALLCODE 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x7530,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
     )
 
     post = {
-        contract: Account(storage={1: 24739, 2: 29998}),
+        addr: Account(storage={}),
+        target: Account(storage={1: 24739, 2: 29998}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_ask.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_ask.py
index b3c45a40b37..4850de47a79 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_ask.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_ask.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_call_code_gas_ask.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCallCodeGasAskFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasAskFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasAskFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasAskFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_raw_call_code_gas_ask(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_call_code_gas_ask."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,43 +43,42 @@ def test_raw_call_code_gas_ask(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (CALLCODE 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x2DC6C0,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x971fad0ee9240291bba0691a5c8db57fcb9a6a22"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (CALLCODE 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x2DC6C0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
     )
 
     post = {
-        contract: Account(storage={1: 24739, 2: 0x727BB}),
+        addr: Account(storage={}),
+        target: Account(storage={1: 24739, 2: 0x727BB}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_memory.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_memory.py
index 900c8b03b78..d5eecdff81e 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_memory.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_memory.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_call_code_gas_memory.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCallCodeGasMemoryFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryFiller.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_raw_call_code_gas_memory(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_call_code_gas_memory."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,43 +45,42 @@ def test_raw_call_code_gas_memory(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [0] (GAS) (CALLCODE 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 8000 0 8000) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x7530,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x1F40,
-                    ret_offset=0x0,
-                    ret_size=0x1F40,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x7530,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x1F40,
+                ret_offset=0x0,
+                ret_size=0x1F40,
             )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xefbb83cb8bb5ed4f8cbce07972c071d88020ea1f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
     )
 
     post = {
-        contract: Account(storage={1: 25608, 2: 29998}),
+        addr: Account(storage={}),
+        target: Account(storage={1: 25608, 2: 29998}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_memory_ask.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_memory_ask.py
index 83f7a52c2af..dbed9f97250 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_memory_ask.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_memory_ask.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_call_code_gas_memory_ask.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCallCodeGasMemoryAskFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAskFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAskFiller.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAskFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_raw_call_code_gas_memory_ask(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_call_code_gas_memory_ask."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,43 +45,42 @@ def test_raw_call_code_gas_memory_ask(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (CALLCODE 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 8000 0 8000) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x2DC6C0,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x1F40,
-                    ret_offset=0x0,
-                    ret_size=0x1F40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x71a0bcd4587fb3c57b8066a375518dada2a8ecdb"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (CALLCODE 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 8000 0 8000) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x2DC6C0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x1F40,
+                ret_offset=0x0,
+                ret_size=0x1F40,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
     )
 
     post = {
-        contract: Account(storage={1: 25608, 2: 0x72464}),
+        addr: Account(storage={}),
+        target: Account(storage={1: 25608, 2: 0x72464}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_value_transfer.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_value_transfer.py
index a33883b5889..8082a69671c 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_value_transfer.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_value_transfer.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_call_code_gas_value_transfer.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCallCodeGasValueTransferFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferFiller.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_raw_call_code_gas_value_transfer(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_call_code_gas_value_transfer."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,44 +45,43 @@ def test_raw_call_code_gas_value_transfer(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (CALLCODE 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 10 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x7530,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    value=0xA,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x52aa4aaf09161ccb2c2fdbdd1f646420a6b96087"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (CALLCODE 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 10 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x7530,
+                address=addr,
+                value=0xA,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 31439, 2: 32298}),
+        addr: Account(storage={}),
+        target: Account(storage={1: 31439, 2: 32298}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_value_transfer_ask.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_value_transfer_ask.py
index be7037c2af1..d69e9eec044 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_value_transfer_ask.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_value_transfer_ask.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_call_code_gas_value_transfer_ask.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCallCodeGasValueTransferAskFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAskFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAskFiller.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAskFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_raw_call_code_gas_value_transfer_ask(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_call_code_gas_value_transfer_ask."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,44 +45,43 @@ def test_raw_call_code_gas_value_transfer_ask(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (CALLCODE 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 10 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x2DC6C0,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    value=0xA,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x956d6bbd9f4f04f26a090166e43c641b1c5c2ede"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (CALLCODE 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 10 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x2DC6C0,
+                address=addr,
+                value=0xA,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 31439, 2: 0x70E1C}),
+        addr: Account(storage={}),
+        target: Account(storage={1: 31439, 2: 0x70E1C}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_value_transfer_memory.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_value_transfer_memory.py
index 06bfb07fc85..adc2b040768 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_value_transfer_memory.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_value_transfer_memory.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_call_code_gas_value_transfer_memory.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCallCodeGasValueTransferMemoryFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryFiller.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_raw_call_code_gas_value_transfer_memory(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_call_code_gas_value_transfer_memory."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,44 +45,43 @@ def test_raw_call_code_gas_value_transfer_memory(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [0] (GAS) (CALLCODE 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 10 0 8000 0 8000) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x7530,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    value=0xA,
-                    args_offset=0x0,
-                    args_size=0x1F40,
-                    ret_offset=0x0,
-                    ret_size=0x1F40,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x7530,
+                address=addr,
+                value=0xA,
+                args_offset=0x0,
+                args_size=0x1F40,
+                ret_offset=0x0,
+                ret_size=0x1F40,
             )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf1f3a9af4253bd7852a915ed5dcaa2360de438f6"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 32308, 2: 32298}),
+        addr: Account(storage={}),
+        target: Account(storage={1: 32308, 2: 32298}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_value_transfer_memory_ask.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_value_transfer_memory_ask.py
index 165cdef2ec7..db089d6d3fc 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_value_transfer_memory_ask.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_code_gas_value_transfer_memory_ask.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_call_code_gas_value_transfer_memory_ask.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCallCodeGasValueTransferMemoryAskFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAskFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAskFiller.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAskFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_raw_call_code_gas_value_transfer_memory_ask(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_call_code_gas_value_transfer_memory_ask."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,44 +45,43 @@ def test_raw_call_code_gas_value_transfer_memory_ask(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (CALLCODE 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 10 0 8000 0 8000) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x2DC6C0,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    value=0xA,
-                    args_offset=0x0,
-                    args_size=0x1F40,
-                    ret_offset=0x0,
-                    ret_size=0x1F40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x2a2cf91e47a7d53e3aa1d443454ef6afac34e2c8"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (CALLCODE 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 10 0 8000 0 8000) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x2DC6C0,
+                address=addr,
+                value=0xA,
+                args_offset=0x0,
+                args_size=0x1F40,
+                ret_offset=0x0,
+                ret_size=0x1F40,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 32308, 2: 0x70AC4}),
+        addr: Account(storage={}),
+        target: Account(storage={1: 32308, 2: 0x70AC4}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas.py
index bd81f6bc62f..97bc8524d66 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_call_gas.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallGasFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCallGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallGasFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/RawCallGasFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_raw_call_gas(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_call_gas."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,44 +43,42 @@ def test_raw_call_gas(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (CALL 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x7530,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x7541fd15b3cbf59ffe4c9fa7303c5a98c7c2aefd"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (CALL 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x7530,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
     )
 
     post = {
-        contract: Account(storage={1: 24739}),
-        callee: Account(storage={2: 29998}),
+        addr: Account(storage={2: 29998}),
+        target: Account(storage={1: 24739}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_ask.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_ask.py
index a420bb99202..6935ff2a0d7 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_ask.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_ask.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_call_gas_ask.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallGasAskFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCallGasAskFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallGasAskFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/RawCallGasAskFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_raw_call_gas_ask(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_call_gas_ask."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,44 +43,42 @@ def test_raw_call_gas_ask(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (CALL 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x2DC6C0,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x18817869e5f5b3f55f57bb7791ea8ee6f62604c8"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (CALL 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x2DC6C0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
     )
 
     post = {
-        contract: Account(storage={1: 24739}),
-        callee: Account(storage={2: 0x727BB}),
+        addr: Account(storage={2: 0x727BB}),
+        target: Account(storage={1: 24739}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_value_transfer.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_value_transfer.py
index f9677705380..c94dd98e65a 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_value_transfer.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_value_transfer.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_call_gas_value_transfer.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCallGasValueTransferFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCallGasValueTransferFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallGasValueTransferFiller.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawCallGasValueTransferFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_raw_call_gas_value_transfer(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_call_gas_value_transfer."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,45 +45,43 @@ def test_raw_call_gas_value_transfer(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (CALL 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 10 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x7530,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    value=0xA,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0xc2955af3f56c0d3150be7abbd80a01914337d211"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (CALL 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 10 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x7530,
+                address=addr,
+                value=0xA,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 31439}),
-        callee: Account(storage={2: 32298}),
+        addr: Account(storage={2: 32298}),
+        target: Account(storage={1: 31439}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_value_transfer_ask.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_value_transfer_ask.py
index 2a11ed2f702..46240d39693 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_value_transfer_ask.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_value_transfer_ask.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_call_gas_value_transfer_ask.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCallGasValueTransferAskFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAskFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAskFiller.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAskFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_raw_call_gas_value_transfer_ask(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_call_gas_value_transfer_ask."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,45 +45,43 @@ def test_raw_call_gas_value_transfer_ask(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (CALL 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 10 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x2DC6C0,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    value=0xA,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x75da17be9a3b7768a69e918c1574a320a6f9e59f"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (CALL 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 10 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x2DC6C0,
+                address=addr,
+                value=0xA,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 31439}),
-        callee: Account(storage={2: 0x70E1C}),
+        addr: Account(storage={2: 0x70E1C}),
+        target: Account(storage={1: 31439}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_value_transfer_memory.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_value_transfer_memory.py
index 1ded133c38e..cd1f9f68c18 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_value_transfer_memory.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_value_transfer_memory.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_call_gas_value_transfer_memory.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCallGasValueTransferMemoryFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryFiller.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_raw_call_gas_value_transfer_memory(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_call_gas_value_transfer_memory."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,45 +45,43 @@ def test_raw_call_gas_value_transfer_memory(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (CALL 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 10 0 8000 0 8000) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x7530,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    value=0xA,
-                    args_offset=0x0,
-                    args_size=0x1F40,
-                    ret_offset=0x0,
-                    ret_size=0x1F40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0xad8277a2165d713af6e54a1cefb7e5e29022b8a5"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (CALL 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 10 0 8000 0 8000) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x7530,
+                address=addr,
+                value=0xA,
+                args_offset=0x0,
+                args_size=0x1F40,
+                ret_offset=0x0,
+                ret_size=0x1F40,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 32308}),
-        callee: Account(storage={2: 32298}),
+        addr: Account(storage={2: 32298}),
+        target: Account(storage={1: 32308}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_value_transfer_memory_ask.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_value_transfer_memory_ask.py
index 7e6c5411633..0939cc07c2a 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_value_transfer_memory_ask.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_gas_value_transfer_memory_ask.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_call_gas_value_transfer_memory_ask.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCallGasValueTransferMemoryAskFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAskFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAskFiller.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAskFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_raw_call_gas_value_transfer_memory_ask(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_call_gas_value_transfer_memory_ask."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,45 +45,43 @@ def test_raw_call_gas_value_transfer_memory_ask(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (CALL 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 10 0 8000 0 8000) [[1]] (SUB @0  (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x2DC6C0,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    value=0xA,
-                    args_offset=0x0,
-                    args_size=0x1F40,
-                    ret_offset=0x0,
-                    ret_size=0x1F40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x29902ea04a72cbb6f877f6d27471a102e0700f20"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (CALL 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 10 0 8000 0 8000) [[1]] (SUB @0  (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x2DC6C0,
+                address=addr,
+                value=0xA,
+                args_offset=0x0,
+                args_size=0x1F40,
+                ret_offset=0x0,
+                ret_size=0x1F40,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 32308}),
-        callee: Account(storage={2: 0x70AC4}),
+        addr: Account(storage={2: 0x70AC4}),
+        target: Account(storage={1: 32308}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_memory_gas.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_memory_gas.py
index 7bb0e7c98ed..2626ed1afa2 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_memory_gas.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_memory_gas.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_call_memory_gas.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCallMemoryGasFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCallMemoryGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallMemoryGasFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/RawCallMemoryGasFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_raw_call_memory_gas(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_call_memory_gas."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,44 +43,42 @@ def test_raw_call_memory_gas(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (CALL 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 8000 0 8000) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x7530,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x1F40,
-                    ret_offset=0x0,
-                    ret_size=0x1F40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x590b5b415a9a5f546bdb1a7781b31b91c53902ed"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (CALL 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 8000 0 8000) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x7530,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x1F40,
+                ret_offset=0x0,
+                ret_size=0x1F40,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
     )
 
     post = {
-        contract: Account(storage={1: 25608}),
-        callee: Account(storage={2: 29998}),
+        addr: Account(storage={2: 29998}),
+        target: Account(storage={1: 25608}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_memory_gas_ask.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_memory_gas_ask.py
index 93bde6e2498..1ea4c6eab02 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_memory_gas_ask.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_call_memory_gas_ask.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_call_memory_gas_ask.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCallMemoryGasAskFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCallMemoryGasAskFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCallMemoryGasAskFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/RawCallMemoryGasAskFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_raw_call_memory_gas_ask(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_call_memory_gas_ask."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,44 +43,42 @@ def test_raw_call_memory_gas_ask(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (CALL 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 8000 0 8000) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x2DC6C0,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x1F40,
-                    ret_offset=0x0,
-                    ret_size=0x1F40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x708c831c65c2fb3b3ce85a39a273b30726324a8a"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (CALL 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 8000 0 8000) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0x2DC6C0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x1F40,
+                ret_offset=0x0,
+                ret_size=0x1F40,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
     )
 
     post = {
-        contract: Account(storage={1: 25608}),
-        callee: Account(storage={2: 0x72464}),
+        addr: Account(storage={2: 0x72464}),
+        target: Account(storage={1: 25608}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_fail_gas_value_transfer.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_fail_gas_value_transfer.py
index b9a549b1a99..b1926166116 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_fail_gas_value_transfer.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_fail_gas_value_transfer.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_raw_create_fail_gas_value_transfer.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCreateFailGasValueTransferFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransferFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransferFiller.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransferFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_raw_create_fail_gas_value_transfer(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_raw_create_fail_gas_value_transfer."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,29 +47,29 @@ def test_raw_create_fail_gas_value_transfer(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [0] (GAS) (CREATE 11 0 0) [[1]] (SUB @0 (GAS)) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.CREATE(value=0xB, offset=0x0, size=0x0))
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.CREATE(value=0xB, offset=0x0, size=0x0))
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=500000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 32022}),
+        contract_0: Account(storage={1: 32022}),
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_fail_gas_value_transfer2.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_fail_gas_value_transfer2.py
index 29042000de1..cff6a4c875c 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_fail_gas_value_transfer2.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_fail_gas_value_transfer2.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_raw_create_fail_gas_value_transfer2.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCreateFailGasValueTransfer2Filler.json
+state_tests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2Filler.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_raw_create_fail_gas_value_transfer2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_raw_create_fail_gas_value_transfer2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,29 +47,29 @@ def test_raw_create_fail_gas_value_transfer2(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [0] (GAS) (CREATE 11 0 8000) [[1]] (SUB @0 (GAS)) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.CREATE(value=0xB, offset=0x0, size=0x1F40))
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.CREATE(value=0xB, offset=0x0, size=0x1F40))
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=500000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 33391}),
+        contract_0: Account(storage={1: 33391}),
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_gas.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_gas.py
index dbd1abd4b2a..cfcdaf8e86f 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_gas.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_gas.py
@@ -1,19 +1,20 @@
 """
-Test ported from static filler.
+Test_raw_create_gas.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices/RawCreateGasFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCreateGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCreateGasFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/RawCreateGasFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +31,10 @@ def test_raw_create_gas(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_raw_create_gas."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,28 +45,28 @@ def test_raw_create_gas(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [0] (GAS) (CREATE 0 0 0) [[1]] (SUB @0 (GAS)) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.CREATE(value=0x0, offset=0x0, size=0x0))
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.CREATE(value=0x0, offset=0x0, size=0x0))
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=500000,
     )
 
     post = {
-        contract: Account(storage={1: 32022}),
+        contract_0: Account(storage={1: 32022}),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            balance=0
+        ),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_gas_memory.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_gas_memory.py
index ea70469d0f8..78b9d6682e6 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_gas_memory.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_gas_memory.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_raw_create_gas_memory.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCreateGasMemoryFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCreateGasMemoryFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCreateGasMemoryFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/RawCreateGasMemoryFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +31,10 @@ def test_raw_create_gas_memory(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_raw_create_gas_memory."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,28 +45,28 @@ def test_raw_create_gas_memory(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [0] (GAS) (CREATE 0 0 8000) [[1]] (SUB @0 (GAS)) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.CREATE(value=0x0, offset=0x0, size=0x1F40))
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.CREATE(value=0x0, offset=0x0, size=0x1F40))
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=500000,
     )
 
     post = {
-        contract: Account(storage={1: 33391}),
+        contract_0: Account(storage={1: 33391}),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            balance=0
+        ),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_gas_value_transfer.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_gas_value_transfer.py
index 5c6870ab997..355d74d1dfd 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_gas_value_transfer.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_gas_value_transfer.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_raw_create_gas_value_transfer.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCreateGasValueTransferFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferFiller.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_raw_create_gas_value_transfer(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_raw_create_gas_value_transfer."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,29 +47,29 @@ def test_raw_create_gas_value_transfer(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [0] (GAS) (CREATE 10 0 0) [[1]] (SUB @0 (GAS)) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.CREATE(value=0xA, offset=0x0, size=0x0))
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.CREATE(value=0xA, offset=0x0, size=0x0))
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=500000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 32022}),
+        contract_0: Account(storage={1: 32022}),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            balance=10
+        ),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_gas_value_transfer_memory.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_gas_value_transfer_memory.py
index add819a6454..52578c5b4b9 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_gas_value_transfer_memory.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_create_gas_value_transfer_memory.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_raw_create_gas_value_transfer_memory.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawCreateGasValueTransferMemoryFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemoryFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemoryFiller.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemoryFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_raw_create_gas_value_transfer_memory(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_raw_create_gas_value_transfer_memory."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,29 +47,29 @@ def test_raw_create_gas_value_transfer_memory(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [0] (GAS) (CREATE 10 0 8000) [[1]] (SUB @0 (GAS)) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.CREATE(value=0xA, offset=0x0, size=0x1F40))
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.CREATE(value=0xA, offset=0x0, size=0x1F40))
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=500000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 33391}),
+        contract_0: Account(storage={1: 33391}),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            balance=10
+        ),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_delegate_call_gas.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_delegate_call_gas.py
index 1cee5f3b8c8..9ff87ffdc2a 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_delegate_call_gas.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_delegate_call_gas.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_delegate_call_gas.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawDelegateCallGasFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawDelegateCallGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawDelegateCallGasFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/RawDelegateCallGasFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_raw_delegate_call_gas(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_delegate_call_gas."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,42 +43,41 @@ def test_raw_delegate_call_gas(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (DELEGATECALL 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x7530,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x8dfc4f381eee03447d510a61a1266821a480bd85"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (DELEGATECALL 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x7530,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
     )
 
     post = {
-        contract: Account(storage={1: 24736, 2: 29998}),
+        addr: Account(storage={}),
+        target: Account(storage={1: 24736, 2: 29998}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_delegate_call_gas_ask.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_delegate_call_gas_ask.py
index 06f18acfce6..64eeacabb25 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_delegate_call_gas_ask.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_delegate_call_gas_ask.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_delegate_call_gas_ask.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawDelegateCallGasAskFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawDelegateCallGasAskFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawDelegateCallGasAskFiller.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawDelegateCallGasAskFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_raw_delegate_call_gas_ask(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_delegate_call_gas_ask."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,42 +45,41 @@ def test_raw_delegate_call_gas_ask(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (DELEGATECALL 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x2DC6C0,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0xdc20eaf593590f91c2439b61f29cf075006750ff"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (DELEGATECALL 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x2DC6C0,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
     )
 
     post = {
-        contract: Account(storage={1: 24736, 2: 0x727BE}),
+        addr: Account(storage={}),
+        target: Account(storage={1: 24736, 2: 0x727BE}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_delegate_call_gas_memory.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_delegate_call_gas_memory.py
index 1c5ce366e9c..3db2620bb5a 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_delegate_call_gas_memory.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_delegate_call_gas_memory.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_delegate_call_gas_memory.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawDelegateCallGasMemoryFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryFiller.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_raw_delegate_call_gas_memory(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_delegate_call_gas_memory."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,42 +45,41 @@ def test_raw_delegate_call_gas_memory(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (DELEGATECALL 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 8000 0 8000) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x7530,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    args_offset=0x0,
-                    args_size=0x1F40,
-                    ret_offset=0x0,
-                    ret_size=0x1F40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x2da2093c616ee035cc42f6a9297b0c3838d01605"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (DELEGATECALL 30000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 8000 0 8000) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x7530,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x1F40,
+                ret_offset=0x0,
+                ret_size=0x1F40,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
     )
 
     post = {
-        contract: Account(storage={1: 25605, 2: 29998}),
+        addr: Account(storage={}),
+        target: Account(storage={1: 25605, 2: 29998}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_delegate_call_gas_memory_ask.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_delegate_call_gas_memory_ask.py
index 459900e4f24..37333476bf2 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_delegate_call_gas_memory_ask.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_delegate_call_gas_memory_ask.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_delegate_call_gas_memory_ask.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawDelegateCallGasMemoryAskFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAskFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAskFiller.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAskFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_raw_delegate_call_gas_memory_ask(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_delegate_call_gas_memory_ask."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,42 +45,41 @@ def test_raw_delegate_call_gas_memory_ask(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (DELEGATECALL 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 8000 0 8000) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x2DC6C0,
-                    address=0xE497CD0909C3691E0B6D2A42E26F36696FC27BA5,
-                    args_offset=0x0,
-                    args_size=0x1F40,
-                    ret_offset=0x0,
-                    ret_size=0x1F40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x8759cfbf878e9ff3cd4d3d7413fc8a44b7935cec"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=Op.GAS) + Op.STOP,
+    # Source: lll
+    # { [0] (GAS) (DELEGATECALL 3000000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 8000 0 8000) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x2DC6C0,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x1F40,
+                ret_offset=0x0,
+                ret_size=0x1F40,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe497cd0909c3691e0b6d2a42e26f36696fc27ba5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
     )
 
     post = {
-        contract: Account(storage={1: 25605, 2: 0x72467}),
+        addr: Account(storage={}),
+        target: Account(storage={1: 25605, 2: 0x72467}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_ext_code_copy_gas.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_ext_code_copy_gas.py
index 9211a904992..c75b732ee35 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_ext_code_copy_gas.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_ext_code_copy_gas.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_ext_code_copy_gas.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawExtCodeCopyGasFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawExtCodeCopyGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawExtCodeCopyGasFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/RawExtCodeCopyGasFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_raw_ext_code_copy_gas(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_ext_code_copy_gas."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,41 +43,31 @@ def test_raw_ext_code_copy_gas(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [0] (GAS) (EXTCODECOPY <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 32 0 20) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.EXTCODECOPY(
-                address=0x4A84C43FBA78AE75CBC15C5B63CAA15DA55F4464,
-                dest_offset=0x20,
-                offset=0x0,
-                size=0x14,
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x3d74e06fe0af85e65c8b2f5dcff3fa076f5b5bb8"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x0112233445566778899101112131415161718191202122232425
+    addr = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
             "0112233445566778899101112131415161718191202122232425"
         ),
         nonce=0,
-        address=Address("0x4a84c43fba78ae75cbc15c5b63caa15da55f4464"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
+    # Source: lll
+    # { [0] (GAS) (EXTCODECOPY <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 32 0 20) [[1]] (SUB @0 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.EXTCODECOPY(address=addr, dest_offset=0x20, offset=0x0, size=0x14)
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
+        nonce=0,
+    )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post = {
-        contract: Account(storage={1: 2629}),
-    }
+    post = {target: Account(storage={1: 2629})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_ext_code_copy_memory_gas.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_ext_code_copy_memory_gas.py
index 6262b185de2..a03431f4f6c 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_ext_code_copy_memory_gas.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_ext_code_copy_memory_gas.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_ext_code_copy_memory_gas.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawExtCodeCopyMemoryGasFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGasFiller.json",  # noqa: E501
+        "state_tests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGasFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_raw_ext_code_copy_memory_gas(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_ext_code_copy_memory_gas."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,41 +45,33 @@ def test_raw_ext_code_copy_memory_gas(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x0112233445566778899101112131415161718191202122232425
+    addr = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
             "0112233445566778899101112131415161718191202122232425"
         ),
         nonce=0,
-        address=Address("0x4a84c43fba78ae75cbc15c5b63caa15da55f4464"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [0] (GAS) (EXTCODECOPY <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 32 0 11120) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.EXTCODECOPY(
-                address=0x4A84C43FBA78AE75CBC15C5B63CAA15DA55F4464,
-                dest_offset=0x20,
-                offset=0x0,
-                size=0x2B70,
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.EXTCODECOPY(
+            address=addr, dest_offset=0x20, offset=0x0, size=0x2B70
+        )
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x792ed227b10fcd174acc9e5a69c1f1471a138c5d"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post = {
-        contract: Account(storage={1: 4948}),
-    }
+    post = {target: Account(storage={1: 4948})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_ext_code_size_gas.py b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_ext_code_size_gas.py
index 5eb5a7444e1..4da7798cbdc 100644
--- a/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_ext_code_size_gas.py
+++ b/tests/ported_static/stEIP150singleCodeGasPrices/test_raw_ext_code_size_gas.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_raw_ext_code_size_gas.
 
 Ported from:
-tests/static/state_tests/stEIP150singleCodeGasPrices
-RawExtCodeSizeGasFiller.json
+state_tests/stEIP150singleCodeGasPrices/RawExtCodeSizeGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP150singleCodeGasPrices/RawExtCodeSizeGasFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP150singleCodeGasPrices/RawExtCodeSizeGasFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_raw_ext_code_size_gas(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_raw_ext_code_size_gas."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,40 +43,31 @@ def test_raw_ext_code_size_gas(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x0112233445566778899101112131415161718191202122232425
+    addr = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
             "0112233445566778899101112131415161718191202122232425"
         ),
         nonce=0,
-        address=Address("0x4a84c43fba78ae75cbc15c5b63caa15da55f4464"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [0] (GAS) (EXTCODESIZE <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b>) [[1]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.EXTCODESIZE(
-                    address=0x4A84C43FBA78AE75CBC15C5B63CAA15DA55F4464
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.EXTCODESIZE(address=addr))
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x585f8515632dd8b3acce933a4c2de8ba66a09a36"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post = {
-        contract: Account(storage={1: 2616}),
-    }
+    post = {target: Account(storage={1: 2616})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP1559/__init__.py b/tests/ported_static/stEIP1559/__init__.py
index fb4dd75fd5e..39b8b2b3d60 100644
--- a/tests/ported_static/stEIP1559/__init__.py
+++ b/tests/ported_static/stEIP1559/__init__.py
@@ -1 +1 @@
-"""Tests ported from stEIP1559."""
+"""Ported static tests: stEIP1559."""  # noqa: N999
diff --git a/tests/ported_static/stEIP1559/test_base_fee_diff_places.py b/tests/ported_static/stEIP1559/test_base_fee_diff_places.py
index dae9717dfc3..51016abbbae 100644
--- a/tests/ported_static/stEIP1559/test_base_fee_diff_places.py
+++ b/tests/ported_static/stEIP1559/test_base_fee_diff_places.py
@@ -2,19 +2,21 @@
 Ori Pomerantz   qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP1559/baseFeeDiffPlacesFiller.yml
+state_tests/stEIP1559/baseFeeDiffPlacesFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,554 +24,250 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP1559/baseFeeDiffPlacesFiller.yml"],
+    ["state_tests/stEIP1559/baseFeeDiffPlacesFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f2f2",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="normal",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f4f2",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="normal",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000faf2",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="normal",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f1f4",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f2f4",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f4f4",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000faf4",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f1fa",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f2fa",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f4fa",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000fafa",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000fd",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000fe",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f0",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f5",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f0f1",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            16,
+            0,
+            0,
+            id="d16",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f5f1",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            17,
+            0,
+            0,
+            id="d17",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f0f2",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            18,
+            0,
+            0,
+            id="d18",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f5f2",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            19,
+            0,
+            0,
+            id="d19",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f0f4",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            20,
+            0,
+            0,
+            id="d20",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f5f4",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            21,
+            0,
+            0,
+            id="d21",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f0fa",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            22,
+            0,
+            0,
+            id="d22",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f5fa",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            23,
+            0,
+            0,
+            id="d23",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000060baccfa57",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            24,
+            0,
+            0,
+            id="d24",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f4",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            25,
+            0,
+            0,
+            id="d25",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000fa",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            26,
+            0,
+            0,
+            id="d26",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f1f1",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            27,
+            0,
+            0,
+            id="d27",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f2f1",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            28,
+            0,
+            0,
+            id="d28",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f4f1",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            29,
+            0,
+            0,
+            id="d29",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000faf1",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            30,
+            0,
+            0,
+            id="d30",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f1f2",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            31,
+            0,
+            0,
+            id="d31",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f1",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            32,
+            0,
+            0,
+            id="d32",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f2",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            33,
+            0,
+            0,
+            id="d33",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
+        pytest.param(
+            34,
+            0,
+            0,
+            id="d34",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_base_fee_diff_places(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz   qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Ori Pomerantz   qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x000000000000000000000000000000000000C0DE)
+    contract_1 = Address(0x000000000000000000000000000000000020C0DE)
+    contract_2 = Address(0x00000000000000000000000000000000C0DEC0DE)
+    contract_3 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    contract_4 = Address(0x000000000000000000000000000000000000CA11)
+    contract_5 = Address(0x00000000000000000000000000000000CA1100F1)
+    contract_6 = Address(0x00000000000000000000000000000000CA1100F2)
+    contract_7 = Address(0x00000000000000000000000000000000CA1100F4)
+    contract_8 = Address(0x00000000000000000000000000000000CA1100FA)
+    contract_9 = Address(0x0000000000000000000000000000000000060006)
+    contract_10 = Address(0x000000000000000000000000000000000060BACC)
+    contract_11 = Address(0x00000000000000000000000000000000DEADDEAD)
+    contract_12 = Address(0x00000000000000000000000000000060BACCFA57)
+    sender = pre.fund_eoa(amount=0x3635C9ADC5DEA00000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -580,8 +278,8 @@ def test_base_fee_diff_places(
         gas_limit=4503599627370496,
     )
 
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #    // basefee is still not supported in Yul 0.8.5
     #
     #
@@ -599,17 +297,35 @@ def test_base_fee_diff_places(
     #    mstore(0x40, mload(0x00))
     #    return(0x3F, 0x21)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.BASEFEE)
-            + Op.MSTORE(offset=0x40, value=Op.MLOAD(offset=0x0))
-            + Op.RETURN(offset=0x3F, size=0x21)
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.MSTORE(offset=0x40, value=Op.MLOAD(offset=0x0))
+        + Op.RETURN(offset=0x3F, size=0x21),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000C0DE),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    // basefee is still not supported in Yul 0.8.5
+    #
+    #
+    #     mstore(0, verbatim_0i_1o(hex"48"))
+    #
+    #
+    #
+    #    // Here the result is is mload(0).
+    #    return(0x00, 0x20)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.RETURN(offset=0x0, size=0x20),
         balance=0xDE0B6B3A7640000,
-        address=Address("0x000000000000000000000000000000000000c0de"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000020C0DE),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #   // basefee is still not supported in Yul 0.8.5
     #
     #
@@ -618,46 +334,35 @@ def test_base_fee_diff_places(
     #
     #   return(0, 0x20)     // return the result as our return value
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.BASEFEE)
-            + Op.RETURN(offset=0x0, size=0x20)
-        ),
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.RETURN(offset=0x0, size=0x20),
         balance=0xDE0B6B3A7640000,
-        address=Address("0x000000000000000000000000000000000000ca11"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.BASEFEE)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.INVALID
-        ),
-        storage={0x0: 0x60A7},
-        balance=0xDE0B6B3A7640000,
-        address=Address("0x0000000000000000000000000000000000060006"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000CA11),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #    // basefee is still not supported in Yul 0.8.5
     #
     #
     #     mstore(0, verbatim_0i_1o(hex"48"))
     #
     #
-    #
-    #    // Here the result is is mload(0).
-    #    return(0x00, 0x20)
+    #    sstore(0,mload(0))
+    #    invalid()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.BASEFEE)
-            + Op.RETURN(offset=0x0, size=0x20)
-        ),
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.INVALID,
+        storage={0: 24743},
         balance=0xDE0B6B3A7640000,
-        address=Address("0x000000000000000000000000000000000020c0de"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000060006),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #    // basefee is still not supported in Yul 0.8.5
     #
     #
@@ -667,18 +372,27 @@ def test_base_fee_diff_places(
     #    sstore(0,mload(0))
     #    revert(0,0x20)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.BASEFEE)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.REVERT(offset=0x0, size=0x20)
-        ),
-        storage={0x0: 0x60A7},
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.REVERT(offset=0x0, size=0x20),
+        storage={0: 24743},
         balance=0xDE0B6B3A7640000,
-        address=Address("0x000000000000000000000000000000000060bacc"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000060BACC),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
+    #    selfdestruct(0)
+    # }
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=0x0),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000DEADDEAD),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
     #    let addr := 0x20C0DE
     #    let length := extcodesize(addr)
     #
@@ -688,209 +402,137 @@ def test_base_fee_diff_places(
     #    // Return this memory as the code for the contract
     #    return(0, length)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH3[0x20C0DE]
-            + Op.DUP2
-            + Op.EXTCODESIZE(address=Op.DUP2)
-            + Op.SWAP3
-            + Op.DUP4
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH3[0x20C0DE]
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.RETURN,
         balance=0xDE0B6B3A7640000,
-        address=Address("0x00000000000000000000000000000000c0dec0de"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #   if iszero(call(gas(), 0xca11, 0, 0, 0, 0, 0x20))
-    #      { revert(0,0x20) }
-    #
-    #   return(0, 0x20)     // return the result as our return value
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x15,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=Op.GAS,
-                        address=0xCA11,
-                        value=Op.DUP1,
-                        args_offset=Op.DUP1,
-                        args_size=Op.DUP1,
-                        ret_offset=0x0,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.REVERT(offset=0x0, size=0x20)
-        ),
-        balance=0xDE0B6B3A7640000,
-        address=Address("0x00000000000000000000000000000000ca1100f1"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000C0DEC0DE),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #   if iszero(callcode(gas(), 0xca11, 0, 0, 0, 0, 0x20))
     #      { revert(0,0x20) }
     #
     #   return(0, 0x20)     // return the result as our return value
     # }
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x15,
-                condition=Op.ISZERO(
-                    Op.CALLCODE(
-                        gas=Op.GAS,
-                        address=0xCA11,
-                        value=Op.DUP1,
-                        args_offset=Op.DUP1,
-                        args_size=Op.DUP1,
-                        ret_offset=0x0,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.REVERT(offset=0x0, size=0x20)
-        ),
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x15,
+            condition=Op.ISZERO(
+                Op.CALLCODE(
+                    gas=Op.GAS,
+                    address=0xCA11,
+                    value=Op.DUP1,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20),
         balance=0xDE0B6B3A7640000,
-        address=Address("0x00000000000000000000000000000000ca1100f2"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000CA1100F2),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #   if iszero(delegatecall(gas(), 0xca11, 0, 0, 0, 0x20))
+    # Source: yul
+    # berlin {
+    #   if iszero(call(gas(), 0xca11, 0, 0, 0, 0, 0x20))
     #      { revert(0,0x20) }
     #
     #   return(0, 0x20)     // return the result as our return value
     # }
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x14,
-                condition=Op.ISZERO(
-                    Op.DELEGATECALL(
-                        gas=Op.GAS,
-                        address=0xCA11,
-                        args_offset=Op.DUP1,
-                        args_size=Op.DUP1,
-                        ret_offset=0x0,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.REVERT(offset=0x0, size=0x20)
-        ),
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x15,
+            condition=Op.ISZERO(
+                Op.CALL(
+                    gas=Op.GAS,
+                    address=0xCA11,
+                    value=Op.DUP1,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20),
         balance=0xDE0B6B3A7640000,
-        address=Address("0x00000000000000000000000000000000ca1100f4"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000CA1100F1),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #   if iszero(staticcall(gas(), 0xca11, 0, 0, 0, 0x20))
     #      { revert(0,0x20) }
     #
     #   return(0, 0x20)     // return the result as our return value
     # }
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x14,
-                condition=Op.ISZERO(
-                    Op.STATICCALL(
-                        gas=Op.GAS,
-                        address=0xCA11,
-                        args_offset=Op.DUP1,
-                        args_size=Op.DUP1,
-                        ret_offset=0x0,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.REVERT(offset=0x0, size=0x20)
-        ),
-        balance=0xDE0B6B3A7640000,
-        address=Address("0x00000000000000000000000000000000ca1100fa"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #    selfdestruct(0)
-    # }
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=0x0),
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x14,
+            condition=Op.ISZERO(
+                Op.STATICCALL(
+                    gas=Op.GAS,
+                    address=0xCA11,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20),
         balance=0xDE0B6B3A7640000,
-        address=Address("0x00000000000000000000000000000000deaddead"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000CA1100FA),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #    let depth := calldataload(0)
-    #
-    #    if eq(depth,0) {
-    #        // basefee is still not supported in Yul 0.8.5
-    #
-    #
-    #     mstore(0, verbatim_0i_1o(hex"48"))
-    #
-    #
-    #        return(0, 0x20)
-    #    }
-    #
-    #    // Dig deeper
-    #    mstore(0, sub(depth,1))
-    #
-    #    // Call yourself with depth-1
-    #    if iszero(call(gas(), 0x60BACCFA57, 0, 0, 0x20, 0, 0x20)) {
-    #       // Propagate failure if we failed
-    #       revert(0, 0x20)
-    #    }
+    # Source: yul
+    # berlin {
+    #   if iszero(delegatecall(gas(), 0xca11, 0, 0, 0, 0x20))
+    #      { revert(0,0x20) }
     #
-    #    // Propagate success
-    #    return (0, 0x20)
+    #   return(0, 0x20)     // return the result as our return value
     # }
-    pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.JUMPI(pc=0x2D, condition=Op.ISZERO(Op.DUP1))
-            + Op.PUSH1[0x1]
-            + Op.SWAP1
-            + Op.MSTORE(offset=0x0, value=Op.SUB)
-            + Op.JUMPI(
-                pc=0x27,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=Op.GAS,
-                        address=0x60BACCFA57,
-                        value=Op.DUP1,
-                        args_offset=Op.DUP2,
-                        args_size=Op.DUP2,
-                        ret_offset=0x0,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.REVERT(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
-            + Op.RETURN(offset=0x0, size=0x20)
-        ),
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x14,
+            condition=Op.ISZERO(
+                Op.DELEGATECALL(
+                    gas=Op.GAS,
+                    address=0xCA11,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20),
         balance=0xDE0B6B3A7640000,
-        address=Address("0x00000000000000000000000000000060baccfa57"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000CA1100F4),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000, nonce=1)
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #    let action := calldataload(4)
     #    let res := 1   // If the result of a call is revert, revert here too
     #    let addr := 1  // If the result of CREATE[2] is zero, it reverted
@@ -921,728 +563,714 @@ def test_base_fee_diff_places(
     #    }
     #    case 0xF2 {  // callcode a contract to run this code
     # ... (290 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x60A7)
-            + Op.PUSH1[0x1]
-            + Op.DUP1
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.EXTCODESIZE(address=0xC0DEC0DE)
-            + Op.PUSH1[0x20]
-            + Op.EXTCODESIZE(address=0xC0DE)
-            + Op.JUMPI(pc=0x58A, condition=Op.ISZERO(Op.DUP4))
-            + Op.JUMPI(pc=0x574, condition=Op.EQ(0xF1, Op.DUP4))
-            + Op.JUMPI(pc=0x55E, condition=Op.EQ(0xF2, Op.DUP4))
-            + Op.JUMPI(pc=0x549, condition=Op.EQ(0xF4, Op.DUP4))
-            + Op.JUMPI(pc=0x534, condition=Op.EQ(0xFA, Op.DUP4))
-            + Op.JUMPI(pc=0x51C, condition=Op.EQ(0xF1F1, Op.DUP4))
-            + Op.JUMPI(pc=0x504, condition=Op.EQ(0xF2F1, Op.DUP4))
-            + Op.JUMPI(pc=0x4ED, condition=Op.EQ(0xF4F1, Op.DUP4))
-            + Op.JUMPI(pc=0x4D6, condition=Op.EQ(0xFAF1, Op.DUP4))
-            + Op.JUMPI(pc=0x4BE, condition=Op.EQ(0xF1F2, Op.DUP4))
-            + Op.JUMPI(pc=0x4A6, condition=Op.EQ(0xF2F2, Op.DUP4))
-            + Op.JUMPI(pc=0x48F, condition=Op.EQ(0xF4F2, Op.DUP4))
-            + Op.JUMPI(pc=0x478, condition=Op.EQ(0xFAF2, Op.DUP4))
-            + Op.JUMPI(pc=0x460, condition=Op.EQ(0xF1F4, Op.DUP4))
-            + Op.JUMPI(pc=0x448, condition=Op.EQ(0xF2F4, Op.DUP4))
-            + Op.JUMPI(pc=0x431, condition=Op.EQ(0xF4F4, Op.DUP4))
-            + Op.JUMPI(pc=0x41A, condition=Op.EQ(0xFAF4, Op.DUP4))
-            + Op.JUMPI(pc=0x402, condition=Op.EQ(0xF1FA, Op.DUP4))
-            + Op.JUMPI(pc=0x3EA, condition=Op.EQ(0xF2FA, Op.DUP4))
-            + Op.JUMPI(pc=0x3D3, condition=Op.EQ(0xF4FA, Op.DUP4))
-            + Op.JUMPI(pc=0x3BC, condition=Op.EQ(0xFAFA, Op.DUP4))
-            + Op.JUMPI(pc=0x384, condition=Op.EQ(0xFD, Op.DUP4))
-            + Op.JUMPI(pc=0x34A, condition=Op.EQ(0xFE, Op.DUP4))
-            + Op.JUMPI(pc=0x311, condition=Op.EQ(0xFF, Op.DUP4))
-            + Op.JUMPI(pc=0x2EB, condition=Op.EQ(0xF0, Op.DUP4))
-            + Op.JUMPI(pc=0x2C1, condition=Op.EQ(0xF5, Op.DUP4))
-            + Op.POP
-            + Op.JUMPI(pc=0x297, condition=Op.EQ(0xF0F1, Op.DUP3))
-            + Op.JUMPI(pc=0x26B, condition=Op.EQ(0xF5F1, Op.DUP3))
-            + Op.JUMPI(pc=0x248, condition=Op.EQ(0xF0F2, Op.DUP3))
-            + Op.JUMPI(pc=0x223, condition=Op.EQ(0xF5F2, Op.DUP3))
-            + Op.JUMPI(pc=0x201, condition=Op.EQ(0xF0F4, Op.DUP3))
-            + Op.JUMPI(pc=0x1DD, condition=Op.EQ(0xF5F4, Op.DUP3))
-            + Op.JUMPI(pc=0x1B4, condition=Op.EQ(0xF0FA, Op.DUP3))
-            + Op.JUMPI(pc=0x189, condition=Op.EQ(0xF5FA, Op.DUP3))
-            + Op.POP
-            + Op.POP
-            + Op.PUSH5[0x60BACCFA57]
-            + Op.JUMPI(pc=0x16E, condition=Op.EQ)
-            + Op.MSTORE(offset=0x0, value=0xBAD0BAD0BAD0)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x168, condition=Op.ISZERO)
-            + Op.JUMPI(pc=0x168, condition=Op.ISZERO)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.REVERT(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.MSTORE(offset=0x0, value=0x3FF)
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0x60BACCFA57,
-                value=Op.DUP1,
-                args_offset=Op.DUP2,
-                args_size=Op.DUP2,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.SWAP2
-            + Op.POP
-            + Op.PUSH2[0x5A17]
-            + Op.SWAP4
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.DUP3
-            + Op.PUSH4[0xC0DEC0DE]
-            + Op.EXTCODECOPY
-            + Op.PUSH8[0xDE0B6B3A7640000]
-            + Op.CREATE2
-            + Op.STATICCALL(
-                gas=Op.GAS,
-                address=Op.DUP5,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.DUP2
-            + Op.SWAP5
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP4
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH4[0xC0DEC0DE]
-            + Op.EXTCODECOPY
-            + Op.PUSH8[0xDE0B6B3A7640000]
-            + Op.CREATE
-            + Op.STATICCALL(
-                gas=Op.GAS,
-                address=Op.DUP5,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.SWAP2
-            + Op.POP
-            + Op.PUSH2[0x5A17]
-            + Op.SWAP4
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.DUP3
-            + Op.PUSH4[0xC0DEC0DE]
-            + Op.EXTCODECOPY
-            + Op.PUSH1[0x0]
-            + Op.CREATE2
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.DUP5,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.DUP2
-            + Op.SWAP5
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP4
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH4[0xC0DEC0DE]
-            + Op.EXTCODECOPY
-            + Op.PUSH1[0x0]
-            + Op.CREATE
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.DUP5,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.SWAP2
-            + Op.POP
-            + Op.PUSH2[0x5A17]
-            + Op.SWAP4
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.DUP3
-            + Op.PUSH4[0xC0DEC0DE]
-            + Op.EXTCODECOPY
-            + Op.PUSH1[0x0]
-            + Op.CREATE2
-            + Op.CALLCODE(
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x60A7)
+        + Op.PUSH1[0x1]
+        + Op.DUP1
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.EXTCODESIZE(address=0xC0DEC0DE)
+        + Op.PUSH1[0x20]
+        + Op.EXTCODESIZE(address=0xC0DE)
+        + Op.JUMPI(pc=0x58A, condition=Op.ISZERO(Op.DUP4))
+        + Op.JUMPI(pc=0x574, condition=Op.EQ(0xF1, Op.DUP4))
+        + Op.JUMPI(pc=0x55E, condition=Op.EQ(0xF2, Op.DUP4))
+        + Op.JUMPI(pc=0x549, condition=Op.EQ(0xF4, Op.DUP4))
+        + Op.JUMPI(pc=0x534, condition=Op.EQ(0xFA, Op.DUP4))
+        + Op.JUMPI(pc=0x51C, condition=Op.EQ(0xF1F1, Op.DUP4))
+        + Op.JUMPI(pc=0x504, condition=Op.EQ(0xF2F1, Op.DUP4))
+        + Op.JUMPI(pc=0x4ED, condition=Op.EQ(0xF4F1, Op.DUP4))
+        + Op.JUMPI(pc=0x4D6, condition=Op.EQ(0xFAF1, Op.DUP4))
+        + Op.JUMPI(pc=0x4BE, condition=Op.EQ(0xF1F2, Op.DUP4))
+        + Op.JUMPI(pc=0x4A6, condition=Op.EQ(0xF2F2, Op.DUP4))
+        + Op.JUMPI(pc=0x48F, condition=Op.EQ(0xF4F2, Op.DUP4))
+        + Op.JUMPI(pc=0x478, condition=Op.EQ(0xFAF2, Op.DUP4))
+        + Op.JUMPI(pc=0x460, condition=Op.EQ(0xF1F4, Op.DUP4))
+        + Op.JUMPI(pc=0x448, condition=Op.EQ(0xF2F4, Op.DUP4))
+        + Op.JUMPI(pc=0x431, condition=Op.EQ(0xF4F4, Op.DUP4))
+        + Op.JUMPI(pc=0x41A, condition=Op.EQ(0xFAF4, Op.DUP4))
+        + Op.JUMPI(pc=0x402, condition=Op.EQ(0xF1FA, Op.DUP4))
+        + Op.JUMPI(pc=0x3EA, condition=Op.EQ(0xF2FA, Op.DUP4))
+        + Op.JUMPI(pc=0x3D3, condition=Op.EQ(0xF4FA, Op.DUP4))
+        + Op.JUMPI(pc=0x3BC, condition=Op.EQ(0xFAFA, Op.DUP4))
+        + Op.JUMPI(pc=0x384, condition=Op.EQ(0xFD, Op.DUP4))
+        + Op.JUMPI(pc=0x34A, condition=Op.EQ(0xFE, Op.DUP4))
+        + Op.JUMPI(pc=0x311, condition=Op.EQ(0xFF, Op.DUP4))
+        + Op.JUMPI(pc=0x2EB, condition=Op.EQ(0xF0, Op.DUP4))
+        + Op.JUMPI(pc=0x2C1, condition=Op.EQ(0xF5, Op.DUP4))
+        + Op.POP
+        + Op.JUMPI(pc=0x297, condition=Op.EQ(0xF0F1, Op.DUP3))
+        + Op.JUMPI(pc=0x26B, condition=Op.EQ(0xF5F1, Op.DUP3))
+        + Op.JUMPI(pc=0x248, condition=Op.EQ(0xF0F2, Op.DUP3))
+        + Op.JUMPI(pc=0x223, condition=Op.EQ(0xF5F2, Op.DUP3))
+        + Op.JUMPI(pc=0x201, condition=Op.EQ(0xF0F4, Op.DUP3))
+        + Op.JUMPI(pc=0x1DD, condition=Op.EQ(0xF5F4, Op.DUP3))
+        + Op.JUMPI(pc=0x1B4, condition=Op.EQ(0xF0FA, Op.DUP3))
+        + Op.JUMPI(pc=0x189, condition=Op.EQ(0xF5FA, Op.DUP3))
+        + Op.POP * 2
+        + Op.PUSH5[0x60BACCFA57]
+        + Op.JUMPI(pc=0x16E, condition=Op.EQ)
+        + Op.MSTORE(offset=0x0, value=0xBAD0BAD0BAD0)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x168, condition=Op.ISZERO) * 2
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.MSTORE(offset=0x0, value=0x3FF)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0x60BACCFA57,
+            value=Op.DUP1,
+            args_offset=Op.DUP2,
+            args_size=Op.DUP2,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE2
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=Op.DUP5,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=Op.DUP5,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.CREATE2
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.DUP5,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.CREATE
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.DUP5,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.CREATE2
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=Op.DUP6,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.CREATE
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=Op.DUP6,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE2
+        + Op.CALL(
+            gas=Op.GAS,
+            address=Op.DUP6,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE
+        + Op.CALL(
+            gas=Op.GAS,
+            address=Op.DUP6,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP3
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP3
+        + Op.SWAP4
+        + Op.POP
+        + Op.EXTCODECOPY(
+            address=0xC0DE, dest_offset=Op.DUP3, offset=0x0, size=Op.DUP2
+        )
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE2
+        + Op.SWAP1
+        + Op.EXTCODECOPY(
+            address=Op.DUP5, dest_offset=0x0, offset=0x1, size=0x20
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP4
+        + Op.SWAP5
+        + Op.POP
+        + Op.SWAP2
+        + Op.POP * 2
+        + Op.EXTCODECOPY(
+            address=0xC0DE, dest_offset=Op.DUP3, offset=0x0, size=Op.DUP2
+        )
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE
+        + Op.SWAP1
+        + Op.EXTCODECOPY(
+            address=Op.DUP5, dest_offset=0x0, offset=0x1, size=0x20
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.POP(
+            Op.CALL(
                 gas=Op.GAS,
-                address=Op.DUP6,
+                address=0xDEADDEAD,
                 value=Op.DUP1,
                 args_offset=Op.DUP1,
                 args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.DUP2
-            + Op.SWAP5
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP4
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH4[0xC0DEC0DE]
-            + Op.EXTCODECOPY
-            + Op.PUSH1[0x0]
-            + Op.CREATE
-            + Op.CALLCODE(
-                gas=Op.GAS,
-                address=Op.DUP6,
+        )
+        + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.JUMPI(
+            pc=0x156, condition=Op.EQ(Op.SLOAD(key=0x0), Op.MLOAD(offset=0x0))
+        )
+        + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.POP(
+            Op.CALL(
+                gas=0x61A8,
+                address=0x60006,
                 value=Op.DUP1,
                 args_offset=Op.DUP1,
                 args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.SWAP2
-            + Op.POP
-            + Op.PUSH2[0x5A17]
-            + Op.SWAP4
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.DUP3
-            + Op.PUSH4[0xC0DEC0DE]
-            + Op.EXTCODECOPY
-            + Op.PUSH8[0xDE0B6B3A7640000]
-            + Op.CREATE2
-            + Op.CALL(
+        )
+        + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.JUMPI(
+            pc=0x156, condition=Op.EQ(Op.SLOAD(key=0x0), Op.MLOAD(offset=0x0))
+        )
+        + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.POP(
+            Op.CALL(
                 gas=Op.GAS,
-                address=Op.DUP6,
+                address=0x60BACC,
                 value=Op.DUP1,
                 args_offset=Op.DUP1,
                 args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.DUP2
-            + Op.SWAP5
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP4
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH4[0xC0DEC0DE]
-            + Op.EXTCODECOPY
-            + Op.PUSH8[0xDE0B6B3A7640000]
-            + Op.CREATE
-            + Op.CALL(
-                gas=Op.GAS,
-                address=Op.DUP6,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.SWAP3
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x5A17]
-            + Op.SWAP3
-            + Op.SWAP4
-            + Op.POP
-            + Op.EXTCODECOPY(
-                address=0xC0DE,
-                dest_offset=Op.DUP3,
-                offset=0x0,
-                size=Op.DUP2,
-            )
-            + Op.PUSH8[0xDE0B6B3A7640000]
-            + Op.CREATE2
-            + Op.SWAP1
-            + Op.EXTCODECOPY(
-                address=Op.DUP5,
-                dest_offset=0x0,
-                offset=0x1,
-                size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.SWAP4
-            + Op.SWAP5
-            + Op.POP
-            + Op.SWAP2
-            + Op.POP
-            + Op.POP
-            + Op.EXTCODECOPY(
-                address=0xC0DE,
-                dest_offset=Op.DUP3,
-                offset=0x0,
-                size=Op.DUP2,
-            )
-            + Op.PUSH8[0xDE0B6B3A7640000]
-            + Op.CREATE
-            + Op.SWAP1
-            + Op.EXTCODECOPY(
-                address=Op.DUP5,
-                dest_offset=0x0,
-                offset=0x1,
-                size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEADDEAD,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
-            + Op.JUMPI(
-                pc=0x156,
-                condition=Op.EQ(Op.SLOAD(key=0x0), Op.MLOAD(offset=0x0)),
-            )
-            + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.POP(
-                Op.CALL(
-                    gas=0x61A8,
-                    address=0x60006,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
-            + Op.JUMPI(
-                pc=0x156,
-                condition=Op.EQ(Op.SLOAD(key=0x0), Op.MLOAD(offset=0x0)),
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.POP(
+        )
+        + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.JUMPI(
+            pc=0x156, condition=Op.EQ(Op.SLOAD(key=0x0), Op.MLOAD(offset=0x0))
+        )
+        + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA1100FA,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA1100FA,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA1100FA,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA1100FA,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA1100F4,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA1100F4,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA1100F4,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA1100F4,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA1100F2,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA1100F2,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA1100F2,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA1100F2,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA1100F1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA1100F1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA1100F1,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA1100F1,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA11,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.JUMP(pc=0x156),
+        storage={0: 24743},
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    let depth := calldataload(0)
+    #
+    #    if eq(depth,0) {
+    #        // basefee is still not supported in Yul 0.8.5
+    #
+    #
+    #     mstore(0, verbatim_0i_1o(hex"48"))
+    #
+    #
+    #        return(0, 0x20)
+    #    }
+    #
+    #    // Dig deeper
+    #    mstore(0, sub(depth,1))
+    #
+    #    // Call yourself with depth-1
+    #    if iszero(call(gas(), 0x60BACCFA57, 0, 0, 0x20, 0, 0x20)) {
+    #       // Propagate failure if we failed
+    #       revert(0, 0x20)
+    #    }
+    #
+    #    // Propagate success
+    #    return (0, 0x20)
+    # }
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.JUMPI(pc=0x2D, condition=Op.ISZERO(Op.DUP1))
+        + Op.PUSH1[0x1]
+        + Op.SWAP1
+        + Op.MSTORE(offset=0x0, value=Op.SUB)
+        + Op.JUMPI(
+            pc=0x27,
+            condition=Op.ISZERO(
                 Op.CALL(
                     gas=Op.GAS,
-                    address=0x60BACC,
+                    address=0x60BACCFA57,
                     value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
-            + Op.JUMPI(
-                pc=0x156,
-                condition=Op.EQ(Op.SLOAD(key=0x0), Op.MLOAD(offset=0x0)),
-            )
-            + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.STATICCALL(
-                gas=Op.GAS,
-                address=0xCA1100FA,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0xCA1100FA,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALLCODE(
-                gas=Op.GAS,
-                address=0xCA1100FA,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xCA1100FA,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.STATICCALL(
-                gas=Op.GAS,
-                address=0xCA1100F4,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0xCA1100F4,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALLCODE(
-                gas=Op.GAS,
-                address=0xCA1100F4,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xCA1100F4,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.STATICCALL(
-                gas=Op.GAS,
-                address=0xCA1100F2,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0xCA1100F2,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALLCODE(
-                gas=Op.GAS,
-                address=0xCA1100F2,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xCA1100F2,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.STATICCALL(
-                gas=Op.GAS,
-                address=0xCA1100F1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0xCA1100F1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALLCODE(
-                gas=Op.GAS,
-                address=0xCA1100F1,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xCA1100F1,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.STATICCALL(
-                gas=Op.GAS,
-                address=0xCA11,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0xCA11,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALLCODE(
-                gas=Op.GAS,
-                address=0xCA11,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xCA11,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
-            + Op.JUMP(pc=0x156)
-        ),
-        storage={0x0: 0x60A7},
+                    args_offset=Op.DUP2,
+                    args_size=Op.DUP2,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.RETURN(offset=0x0, size=0x20),
         balance=0xDE0B6B3A7640000,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000060BACCFA57),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0xF1),
+        Bytes("693c6139") + Hash(0xF2),
+        Bytes("693c6139") + Hash(0xF4),
+        Bytes("693c6139") + Hash(0xFA),
+        Bytes("693c6139") + Hash(0xF1F1),
+        Bytes("693c6139") + Hash(0xF2F1),
+        Bytes("693c6139") + Hash(0xF4F1),
+        Bytes("693c6139") + Hash(0xFAF1),
+        Bytes("693c6139") + Hash(0xF1F2),
+        Bytes("693c6139") + Hash(0xF2F2),
+        Bytes("693c6139") + Hash(0xF4F2),
+        Bytes("693c6139") + Hash(0xFAF2),
+        Bytes("693c6139") + Hash(0xF1F4),
+        Bytes("693c6139") + Hash(0xF2F4),
+        Bytes("693c6139") + Hash(0xF4F4),
+        Bytes("693c6139") + Hash(0xFAF4),
+        Bytes("693c6139") + Hash(0xF1FA),
+        Bytes("693c6139") + Hash(0xF2FA),
+        Bytes("693c6139") + Hash(0xF4FA),
+        Bytes("693c6139") + Hash(0xFAFA),
+        Bytes("693c6139") + Hash(0xFD),
+        Bytes("693c6139") + Hash(0xFE),
+        Bytes("693c6139") + Hash(0xFF),
+        Bytes("693c6139") + Hash(0xF0),
+        Bytes("693c6139") + Hash(0xF5),
+        Bytes("693c6139") + Hash(0xF0F1),
+        Bytes("693c6139") + Hash(0xF5F1),
+        Bytes("693c6139") + Hash(0xF0F2),
+        Bytes("693c6139") + Hash(0xF5F2),
+        Bytes("693c6139") + Hash(0xF0F4),
+        Bytes("693c6139") + Hash(0xF5F4),
+        Bytes("693c6139") + Hash(0xF0FA),
+        Bytes("693c6139") + Hash(0xF5FA),
+        Bytes("693c6139") + Hash(contract_12, left_padding=True),
+    ]
+    tx_gas = [4503599627370496]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=4503599627370496,
-        gas_price=2000,
+        to=contract_3,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        gas_price=2000,
     )
 
-    post = expected_post
+    post = {
+        contract_3: Account(storage={0: 10}),
+        contract_10: Account(storage={0: 24743}),
+        contract_9: Account(storage={0: 24743}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP1559/test_base_fee_diff_places_osaka.py b/tests/ported_static/stEIP1559/test_base_fee_diff_places_osaka.py
new file mode 100644
index 00000000000..8eb133b8c6e
--- /dev/null
+++ b/tests/ported_static/stEIP1559/test_base_fee_diff_places_osaka.py
@@ -0,0 +1,1268 @@
+"""
+Ori Pomerantz   qbzzt1@gmail.com.
+
+Ported from:
+state_tests/stEIP1559/baseFeeDiffPlacesOsakaFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/stEIP1559/baseFeeDiffPlacesOsakaFiller.yml"],
+)
+@pytest.mark.valid_from("Osaka")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="normal",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="normal",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="normal",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="d16",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="d17",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="d18",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="d19",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="d20",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="d21",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="d22",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="d23",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="d24",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="d25",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="d26",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="d27",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="d28",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="d29",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="d30",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="d31",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="d32",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="d33",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_base_fee_diff_places(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz   qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x000000000000000000000000000000000000C0DE)
+    contract_1 = Address(0x000000000000000000000000000000000020C0DE)
+    contract_2 = Address(0x00000000000000000000000000000000C0DEC0DE)
+    contract_3 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    contract_4 = Address(0x000000000000000000000000000000000000CA11)
+    contract_5 = Address(0x00000000000000000000000000000000CA1100F1)
+    contract_6 = Address(0x00000000000000000000000000000000CA1100F2)
+    contract_7 = Address(0x00000000000000000000000000000000CA1100F4)
+    contract_8 = Address(0x00000000000000000000000000000000CA1100FA)
+    contract_9 = Address(0x0000000000000000000000000000000000060006)
+    contract_10 = Address(0x000000000000000000000000000000000060BACC)
+    contract_11 = Address(0x00000000000000000000000000000000DEADDEAD)
+    contract_12 = Address(0x00000000000000000000000000000060BACCFA57)
+    sender = pre.fund_eoa(amount=0x3635C9ADC5DEA00000, nonce=1)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=4503599627370496,
+    )
+
+    # Source: yul
+    # berlin {
+    #    // basefee is still not supported in Yul 0.8.5
+    #
+    #
+    #     mstore(0, verbatim_0i_1o(hex"48"))
+    #
+    #
+    #
+    #    // Here the result is is mload(0). We want to run it, but
+    #    // prefix it with a zero so we'll be safe from being considered
+    #    // an invalid program.
+    #    //
+    #    // If we use this as a constructor the result will be
+    #    // the code of the created contract, but we can live
+    #    // with that. We won't call it.
+    #    mstore(0x40, mload(0x00))
+    #    return(0x3F, 0x21)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.MSTORE(offset=0x40, value=Op.MLOAD(offset=0x0))
+        + Op.RETURN(offset=0x3F, size=0x21),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000C0DE),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    // basefee is still not supported in Yul 0.8.5
+    #
+    #
+    #     mstore(0, verbatim_0i_1o(hex"48"))
+    #
+    #
+    #
+    #    // Here the result is is mload(0).
+    #    return(0x00, 0x20)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.RETURN(offset=0x0, size=0x20),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000020C0DE),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #   // basefee is still not supported in Yul 0.8.5
+    #
+    #
+    #   mstore(0, verbatim_0i_1o(hex"48"))
+    #
+    #
+    #   return(0, 0x20)     // return the result as our return value
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.RETURN(offset=0x0, size=0x20),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000CA11),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    // basefee is still not supported in Yul 0.8.5
+    #
+    #
+    #     mstore(0, verbatim_0i_1o(hex"48"))
+    #
+    #
+    #    sstore(0,mload(0))
+    #    invalid()
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.INVALID,
+        storage={0: 24743},
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000060006),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    // basefee is still not supported in Yul 0.8.5
+    #
+    #
+    #     mstore(0, verbatim_0i_1o(hex"48"))
+    #
+    #
+    #    sstore(0,mload(0))
+    #    revert(0,0x20)
+    # }
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.REVERT(offset=0x0, size=0x20),
+        storage={0: 24743},
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000060BACC),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    selfdestruct(0)
+    # }
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=0x0),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000DEADDEAD),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    let addr := 0x20C0DE
+    #    let length := extcodesize(addr)
+    #
+    #    // Read the code from 0x20C0DE
+    #    extcodecopy(addr, 0, 0, length)
+    #
+    #    // Return this memory as the code for the contract
+    #    return(0, length)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH3[0x20C0DE]
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.RETURN,
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000C0DEC0DE),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #   if iszero(callcode(gas(), 0xca11, 0, 0, 0, 0, 0x20))
+    #      { revert(0,0x20) }
+    #
+    #   return(0, 0x20)     // return the result as our return value
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x15,
+            condition=Op.ISZERO(
+                Op.CALLCODE(
+                    gas=Op.GAS,
+                    address=0xCA11,
+                    value=Op.DUP1,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000CA1100F2),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #   if iszero(call(gas(), 0xca11, 0, 0, 0, 0, 0x20))
+    #      { revert(0,0x20) }
+    #
+    #   return(0, 0x20)     // return the result as our return value
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x15,
+            condition=Op.ISZERO(
+                Op.CALL(
+                    gas=Op.GAS,
+                    address=0xCA11,
+                    value=Op.DUP1,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000CA1100F1),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #   if iszero(staticcall(gas(), 0xca11, 0, 0, 0, 0x20))
+    #      { revert(0,0x20) }
+    #
+    #   return(0, 0x20)     // return the result as our return value
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x14,
+            condition=Op.ISZERO(
+                Op.STATICCALL(
+                    gas=Op.GAS,
+                    address=0xCA11,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000CA1100FA),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #   if iszero(delegatecall(gas(), 0xca11, 0, 0, 0, 0x20))
+    #      { revert(0,0x20) }
+    #
+    #   return(0, 0x20)     // return the result as our return value
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x14,
+            condition=Op.ISZERO(
+                Op.DELEGATECALL(
+                    gas=Op.GAS,
+                    address=0xCA11,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000CA1100F4),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    let action := calldataload(4)
+    #    let res := 1   // If the result of a call is revert, revert here too
+    #    let addr := 1  // If the result of CREATE[2] is zero, it reverted
+    #
+    #    // For when we need code in our memory
+    #    let codeBuffer := 0x20
+    #    // When running the template in the constructor
+    #    let codeLength := extcodesize(0xC0DE)
+    #    // When running the template in the created code
+    #    let codeLength2 := extcodesize(0xC0DEC0DE)
+    #
+    #    // Goat should be overwritten
+    #    mstore(0, 0x60A7)
+    #
+    #    switch action
+    #    case 0 {  // run the code snippet as normal code
+    #       // basefee is still not supported in Yul 0.8.5
+    #
+    #
+    #   mstore(0, verbatim_0i_1o(hex"48"))
+    #
+    #
+    #    }
+    #
+    #    // One level of call stack
+    #    case 0xF1 {  // call a contract to run this code
+    #       res := call(gas(), 0xca11, 0, 0, 0, 0, 0x20) // call template code
+    #    }
+    #    case 0xF2 {  // callcode a contract to run this code
+    # ... (290 more lines)
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x60A7)
+        + Op.PUSH1[0x1]
+        + Op.DUP1
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.EXTCODESIZE(address=0xC0DEC0DE)
+        + Op.PUSH1[0x20]
+        + Op.EXTCODESIZE(address=0xC0DE)
+        + Op.JUMPI(pc=0x58A, condition=Op.ISZERO(Op.DUP4))
+        + Op.JUMPI(pc=0x574, condition=Op.EQ(0xF1, Op.DUP4))
+        + Op.JUMPI(pc=0x55E, condition=Op.EQ(0xF2, Op.DUP4))
+        + Op.JUMPI(pc=0x549, condition=Op.EQ(0xF4, Op.DUP4))
+        + Op.JUMPI(pc=0x534, condition=Op.EQ(0xFA, Op.DUP4))
+        + Op.JUMPI(pc=0x51C, condition=Op.EQ(0xF1F1, Op.DUP4))
+        + Op.JUMPI(pc=0x504, condition=Op.EQ(0xF2F1, Op.DUP4))
+        + Op.JUMPI(pc=0x4ED, condition=Op.EQ(0xF4F1, Op.DUP4))
+        + Op.JUMPI(pc=0x4D6, condition=Op.EQ(0xFAF1, Op.DUP4))
+        + Op.JUMPI(pc=0x4BE, condition=Op.EQ(0xF1F2, Op.DUP4))
+        + Op.JUMPI(pc=0x4A6, condition=Op.EQ(0xF2F2, Op.DUP4))
+        + Op.JUMPI(pc=0x48F, condition=Op.EQ(0xF4F2, Op.DUP4))
+        + Op.JUMPI(pc=0x478, condition=Op.EQ(0xFAF2, Op.DUP4))
+        + Op.JUMPI(pc=0x460, condition=Op.EQ(0xF1F4, Op.DUP4))
+        + Op.JUMPI(pc=0x448, condition=Op.EQ(0xF2F4, Op.DUP4))
+        + Op.JUMPI(pc=0x431, condition=Op.EQ(0xF4F4, Op.DUP4))
+        + Op.JUMPI(pc=0x41A, condition=Op.EQ(0xFAF4, Op.DUP4))
+        + Op.JUMPI(pc=0x402, condition=Op.EQ(0xF1FA, Op.DUP4))
+        + Op.JUMPI(pc=0x3EA, condition=Op.EQ(0xF2FA, Op.DUP4))
+        + Op.JUMPI(pc=0x3D3, condition=Op.EQ(0xF4FA, Op.DUP4))
+        + Op.JUMPI(pc=0x3BC, condition=Op.EQ(0xFAFA, Op.DUP4))
+        + Op.JUMPI(pc=0x384, condition=Op.EQ(0xFD, Op.DUP4))
+        + Op.JUMPI(pc=0x34A, condition=Op.EQ(0xFE, Op.DUP4))
+        + Op.JUMPI(pc=0x311, condition=Op.EQ(0xFF, Op.DUP4))
+        + Op.JUMPI(pc=0x2EB, condition=Op.EQ(0xF0, Op.DUP4))
+        + Op.JUMPI(pc=0x2C1, condition=Op.EQ(0xF5, Op.DUP4))
+        + Op.POP
+        + Op.JUMPI(pc=0x297, condition=Op.EQ(0xF0F1, Op.DUP3))
+        + Op.JUMPI(pc=0x26B, condition=Op.EQ(0xF5F1, Op.DUP3))
+        + Op.JUMPI(pc=0x248, condition=Op.EQ(0xF0F2, Op.DUP3))
+        + Op.JUMPI(pc=0x223, condition=Op.EQ(0xF5F2, Op.DUP3))
+        + Op.JUMPI(pc=0x201, condition=Op.EQ(0xF0F4, Op.DUP3))
+        + Op.JUMPI(pc=0x1DD, condition=Op.EQ(0xF5F4, Op.DUP3))
+        + Op.JUMPI(pc=0x1B4, condition=Op.EQ(0xF0FA, Op.DUP3))
+        + Op.JUMPI(pc=0x189, condition=Op.EQ(0xF5FA, Op.DUP3))
+        + Op.POP * 2
+        + Op.PUSH5[0x60BACCFA57]
+        + Op.JUMPI(pc=0x16E, condition=Op.EQ)
+        + Op.MSTORE(offset=0x0, value=0xBAD0BAD0BAD0)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x168, condition=Op.ISZERO) * 2
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.MSTORE(offset=0x0, value=0x3FF)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0x60BACCFA57,
+            value=Op.DUP1,
+            args_offset=Op.DUP2,
+            args_size=Op.DUP2,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE2
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=Op.DUP5,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=Op.DUP5,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.CREATE2
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.DUP5,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.CREATE
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.DUP5,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.CREATE2
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=Op.DUP6,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.CREATE
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=Op.DUP6,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE2
+        + Op.CALL(
+            gas=Op.GAS,
+            address=Op.DUP6,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE
+        + Op.CALL(
+            gas=Op.GAS,
+            address=Op.DUP6,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP3
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP3
+        + Op.SWAP4
+        + Op.POP
+        + Op.EXTCODECOPY(
+            address=0xC0DE, dest_offset=Op.DUP3, offset=0x0, size=Op.DUP2
+        )
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE2
+        + Op.SWAP1
+        + Op.EXTCODECOPY(
+            address=Op.DUP5, dest_offset=0x0, offset=0x1, size=0x20
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP4
+        + Op.SWAP5
+        + Op.POP
+        + Op.SWAP2
+        + Op.POP * 2
+        + Op.EXTCODECOPY(
+            address=0xC0DE, dest_offset=Op.DUP3, offset=0x0, size=Op.DUP2
+        )
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE
+        + Op.SWAP1
+        + Op.EXTCODECOPY(
+            address=Op.DUP5, dest_offset=0x0, offset=0x1, size=0x20
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEADDEAD,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.JUMPI(
+            pc=0x156, condition=Op.EQ(Op.SLOAD(key=0x0), Op.MLOAD(offset=0x0))
+        )
+        + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.POP(
+            Op.CALL(
+                gas=0x61A8,
+                address=0x60006,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.JUMPI(
+            pc=0x156, condition=Op.EQ(Op.SLOAD(key=0x0), Op.MLOAD(offset=0x0))
+        )
+        + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0x60BACC,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.JUMPI(
+            pc=0x156, condition=Op.EQ(Op.SLOAD(key=0x0), Op.MLOAD(offset=0x0))
+        )
+        + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA1100FA,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA1100FA,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA1100FA,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA1100FA,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA1100F4,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA1100F4,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA1100F4,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA1100F4,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA1100F2,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA1100F2,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA1100F2,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA1100F2,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA1100F1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA1100F1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA1100F1,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA1100F1,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA11,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.JUMP(pc=0x156),
+        storage={0: 24743},
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    let depth := calldataload(0)
+    #
+    #    if eq(depth,0) {
+    #        // basefee is still not supported in Yul 0.8.5
+    #
+    #
+    #     mstore(0, verbatim_0i_1o(hex"48"))
+    #
+    #
+    #        return(0, 0x20)
+    #    }
+    #
+    #    // Dig deeper
+    #    mstore(0, sub(depth,1))
+    #
+    #    // Call yourself with depth-1
+    #    if iszero(call(gas(), 0x60BACCFA57, 0, 0, 0x20, 0, 0x20)) {
+    #       // Propagate failure if we failed
+    #       revert(0, 0x20)
+    #    }
+    #
+    #    // Propagate success
+    #    return (0, 0x20)
+    # }
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.JUMPI(pc=0x2D, condition=Op.ISZERO(Op.DUP1))
+        + Op.PUSH1[0x1]
+        + Op.SWAP1
+        + Op.MSTORE(offset=0x0, value=Op.SUB)
+        + Op.JUMPI(
+            pc=0x27,
+            condition=Op.ISZERO(
+                Op.CALL(
+                    gas=Op.GAS,
+                    address=0x60BACCFA57,
+                    value=Op.DUP1,
+                    args_offset=Op.DUP2,
+                    args_size=Op.DUP2,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.BASEFEE)
+        + Op.RETURN(offset=0x0, size=0x20),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000060BACCFA57),  # noqa: E501
+    )
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0xF1),
+        Bytes("693c6139") + Hash(0xF2),
+        Bytes("693c6139") + Hash(0xF4),
+        Bytes("693c6139") + Hash(0xFA),
+        Bytes("693c6139") + Hash(0xF1F1),
+        Bytes("693c6139") + Hash(0xF2F1),
+        Bytes("693c6139") + Hash(0xF4F1),
+        Bytes("693c6139") + Hash(0xFAF1),
+        Bytes("693c6139") + Hash(0xF1F2),
+        Bytes("693c6139") + Hash(0xF2F2),
+        Bytes("693c6139") + Hash(0xF4F2),
+        Bytes("693c6139") + Hash(0xFAF2),
+        Bytes("693c6139") + Hash(0xF1F4),
+        Bytes("693c6139") + Hash(0xF2F4),
+        Bytes("693c6139") + Hash(0xF4F4),
+        Bytes("693c6139") + Hash(0xFAF4),
+        Bytes("693c6139") + Hash(0xF1FA),
+        Bytes("693c6139") + Hash(0xF2FA),
+        Bytes("693c6139") + Hash(0xF4FA),
+        Bytes("693c6139") + Hash(0xFAFA),
+        Bytes("693c6139") + Hash(0xFD),
+        Bytes("693c6139") + Hash(0xFE),
+        Bytes("693c6139") + Hash(0xFF),
+        Bytes("693c6139") + Hash(0xF0),
+        Bytes("693c6139") + Hash(0xF5),
+        Bytes("693c6139") + Hash(0xF0F1),
+        Bytes("693c6139") + Hash(0xF5F1),
+        Bytes("693c6139") + Hash(0xF0F2),
+        Bytes("693c6139") + Hash(0xF5F2),
+        Bytes("693c6139") + Hash(0xF0F4),
+        Bytes("693c6139") + Hash(0xF5F4),
+        Bytes("693c6139") + Hash(0xF0FA),
+        Bytes("693c6139") + Hash(0xF5FA),
+    ]
+    tx_gas = [1000000]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_3,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        nonce=1,
+        gas_price=2000,
+    )
+
+    post = {
+        contract_3: Account(storage={0: 10}),
+        contract_10: Account(storage={0: 24743}),
+        contract_9: Account(storage={0: 24743}),
+    }
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP1559/test_gas_price_diff_places.py b/tests/ported_static/stEIP1559/test_gas_price_diff_places.py
index ff21329e5d3..40115726f8a 100644
--- a/tests/ported_static/stEIP1559/test_gas_price_diff_places.py
+++ b/tests/ported_static/stEIP1559/test_gas_price_diff_places.py
@@ -2,19 +2,21 @@
 Ori Pomerantz   qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP1559/gasPriceDiffPlacesFiller.yml
+state_tests/stEIP1559/gasPriceDiffPlacesFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,554 +24,250 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP1559/gasPriceDiffPlacesFiller.yml"],
+    ["state_tests/stEIP1559/gasPriceDiffPlacesFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f2f2",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="normal",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f4f2",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="normal",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000faf2",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="normal",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f1f4",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f2f4",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f4f4",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000faf4",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f1fa",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f2fa",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f4fa",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000fafa",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000fd",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000fe",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f0",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f5",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f0f1",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            16,
+            0,
+            0,
+            id="d16",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f5f1",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            17,
+            0,
+            0,
+            id="d17",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f0f2",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            18,
+            0,
+            0,
+            id="d18",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f5f2",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            19,
+            0,
+            0,
+            id="d19",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f0f4",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            20,
+            0,
+            0,
+            id="d20",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f5f4",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            21,
+            0,
+            0,
+            id="d21",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f0fa",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            22,
+            0,
+            0,
+            id="d22",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f5fa",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            23,
+            0,
+            0,
+            id="d23",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000060baccfa57",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            24,
+            0,
+            0,
+            id="d24",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f4",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            25,
+            0,
+            0,
+            id="d25",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000fa",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            26,
+            0,
+            0,
+            id="d26",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f1f1",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            27,
+            0,
+            0,
+            id="d27",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f2f1",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            28,
+            0,
+            0,
+            id="d28",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f4f1",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            29,
+            0,
+            0,
+            id="d29",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000faf1",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            30,
+            0,
+            0,
+            id="d30",
         ),
-        (
-            "693c6139000000000000000000000000000000000000000000000000000000000000f1f2",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            31,
+            0,
+            0,
+            id="d31",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f1",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            32,
+            0,
+            0,
+            id="d32",
         ),
-        (
-            "693c613900000000000000000000000000000000000000000000000000000000000000f2",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            33,
+            0,
+            0,
+            id="d33",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x0000000000000000000000000000000000060006"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x000000000000000000000000000000000060bacc"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2000}
-                ),
-            },
+        pytest.param(
+            34,
+            0,
+            0,
+            id="d34",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_gas_price_diff_places(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz   qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Ori Pomerantz   qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x000000000000000000000000000000000000C0DE)
+    contract_1 = Address(0x000000000000000000000000000000000020C0DE)
+    contract_2 = Address(0x00000000000000000000000000000000C0DEC0DE)
+    contract_3 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    contract_4 = Address(0x000000000000000000000000000000000000CA11)
+    contract_5 = Address(0x00000000000000000000000000000000CA1100F1)
+    contract_6 = Address(0x00000000000000000000000000000000CA1100F2)
+    contract_7 = Address(0x00000000000000000000000000000000CA1100F4)
+    contract_8 = Address(0x00000000000000000000000000000000CA1100FA)
+    contract_9 = Address(0x0000000000000000000000000000000000060006)
+    contract_10 = Address(0x000000000000000000000000000000000060BACC)
+    contract_11 = Address(0x00000000000000000000000000000000DEADDEAD)
+    contract_12 = Address(0x00000000000000000000000000000060BACCFA57)
+    sender = pre.fund_eoa(amount=0x3635C9ADC5DEA00000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -580,8 +278,8 @@ def test_gas_price_diff_places(
         gas_limit=4503599627370496,
     )
 
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #    mstore(0, gasprice())
     #
     #
@@ -596,79 +294,92 @@ def test_gas_price_diff_places(
     #    mstore(0x40, mload(0x00))
     #    return(0x3F, 0x21)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GASPRICE)
-            + Op.MSTORE(offset=0x40, value=Op.MLOAD(offset=0x0))
-            + Op.RETURN(offset=0x3F, size=0x21)
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.MSTORE(offset=0x40, value=Op.MLOAD(offset=0x0))
+        + Op.RETURN(offset=0x3F, size=0x21),
         balance=0xDE0B6B3A7640000,
-        address=Address("0x000000000000000000000000000000000000c0de"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000C0DE),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #   mstore(0, gasprice())
+    # Source: yul
+    # berlin {
+    #    mstore(0, gasprice())
     #
     #
-    #   return(0, 0x20)     // return the result as our return value
+    #
+    #    // Here the result is is mload(0).
+    #    return(0x00, 0x20)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GASPRICE)
-            + Op.RETURN(offset=0x0, size=0x20)
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.RETURN(offset=0x0, size=0x20),
         balance=0xDE0B6B3A7640000,
-        address=Address("0x000000000000000000000000000000000000ca11"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000020C0DE),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.GASPRICE
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.SSTORE
-            + Op.INVALID
-        ),
-        storage={0x0: 0x60A7},
+    # Source: yul
+    # berlin {
+    #   mstore(0, gasprice())
+    #
+    #
+    #   return(0, 0x20)     // return the result as our return value
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.RETURN(offset=0x0, size=0x20),
         balance=0xDE0B6B3A7640000,
-        address=Address("0x0000000000000000000000000000000000060006"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000CA11),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #    mstore(0, gasprice())
     #
     #
-    #
-    #    // Here the result is is mload(0).
-    #    return(0x00, 0x20)
+    #    sstore(0,mload(0))
+    #    invalid()
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GASPRICE)
-            + Op.RETURN(offset=0x0, size=0x20)
-        ),
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.GASPRICE
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.SSTORE
+        + Op.INVALID,
+        storage={0: 24743},
         balance=0xDE0B6B3A7640000,
-        address=Address("0x000000000000000000000000000000000020c0de"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000060006),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #    mstore(0, gasprice())
     #
     #
     #    sstore(0,mload(0))
     #    revert(0,0x20)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GASPRICE)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.REVERT(offset=0x0, size=0x20)
-        ),
-        storage={0x0: 0x60A7},
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.REVERT(offset=0x0, size=0x20),
+        storage={0: 24743},
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000060BACC),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    selfdestruct(0)
+    # }
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=0x0),
         balance=0xDE0B6B3A7640000,
-        address=Address("0x000000000000000000000000000000000060bacc"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000DEADDEAD),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #    let addr := 0x20C0DE
     #    let length := extcodesize(addr)
     #
@@ -678,206 +389,137 @@ def test_gas_price_diff_places(
     #    // Return this memory as the code for the contract
     #    return(0, length)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH3[0x20C0DE]
-            + Op.DUP2
-            + Op.EXTCODESIZE(address=Op.DUP2)
-            + Op.SWAP3
-            + Op.DUP4
-            + Op.SWAP3
-            + Op.EXTCODECOPY
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH3[0x20C0DE]
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.RETURN,
         balance=0xDE0B6B3A7640000,
-        address=Address("0x00000000000000000000000000000000c0dec0de"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #   if iszero(call(gas(), 0xca11, 0, 0, 0, 0, 0x20))
-    #      { revert(0,0x20) }
-    #
-    #   return(0, 0x20)     // return the result as our return value
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x15,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=Op.GAS,
-                        address=0xCA11,
-                        value=Op.DUP1,
-                        args_offset=Op.DUP1,
-                        args_size=Op.DUP1,
-                        ret_offset=0x0,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.REVERT(offset=0x0, size=0x20)
-        ),
-        balance=0xDE0B6B3A7640000,
-        address=Address("0x00000000000000000000000000000000ca1100f1"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000C0DEC0DE),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #   if iszero(callcode(gas(), 0xca11, 0, 0, 0, 0, 0x20))
     #      { revert(0,0x20) }
     #
     #   return(0, 0x20)     // return the result as our return value
     # }
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x15,
-                condition=Op.ISZERO(
-                    Op.CALLCODE(
-                        gas=Op.GAS,
-                        address=0xCA11,
-                        value=Op.DUP1,
-                        args_offset=Op.DUP1,
-                        args_size=Op.DUP1,
-                        ret_offset=0x0,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.REVERT(offset=0x0, size=0x20)
-        ),
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x15,
+            condition=Op.ISZERO(
+                Op.CALLCODE(
+                    gas=Op.GAS,
+                    address=0xCA11,
+                    value=Op.DUP1,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20),
         balance=0xDE0B6B3A7640000,
-        address=Address("0x00000000000000000000000000000000ca1100f2"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000CA1100F2),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #   if iszero(delegatecall(gas(), 0xca11, 0, 0, 0, 0x20))
+    # Source: yul
+    # berlin {
+    #   if iszero(call(gas(), 0xca11, 0, 0, 0, 0, 0x20))
     #      { revert(0,0x20) }
     #
     #   return(0, 0x20)     // return the result as our return value
     # }
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x14,
-                condition=Op.ISZERO(
-                    Op.DELEGATECALL(
-                        gas=Op.GAS,
-                        address=0xCA11,
-                        args_offset=Op.DUP1,
-                        args_size=Op.DUP1,
-                        ret_offset=0x0,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.REVERT(offset=0x0, size=0x20)
-        ),
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x15,
+            condition=Op.ISZERO(
+                Op.CALL(
+                    gas=Op.GAS,
+                    address=0xCA11,
+                    value=Op.DUP1,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20),
         balance=0xDE0B6B3A7640000,
-        address=Address("0x00000000000000000000000000000000ca1100f4"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000CA1100F1),  # noqa: E501
     )
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #   if iszero(staticcall(gas(), 0xca11, 0, 0, 0, 0x20))
     #      { revert(0,0x20) }
     #
     #   return(0, 0x20)     // return the result as our return value
     # }
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x14,
-                condition=Op.ISZERO(
-                    Op.STATICCALL(
-                        gas=Op.GAS,
-                        address=0xCA11,
-                        args_offset=Op.DUP1,
-                        args_size=Op.DUP1,
-                        ret_offset=0x0,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.REVERT(offset=0x0, size=0x20)
-        ),
-        balance=0xDE0B6B3A7640000,
-        address=Address("0x00000000000000000000000000000000ca1100fa"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #    selfdestruct(0)
-    # }
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=0x0),
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x14,
+            condition=Op.ISZERO(
+                Op.STATICCALL(
+                    gas=Op.GAS,
+                    address=0xCA11,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20),
         balance=0xDE0B6B3A7640000,
-        address=Address("0x00000000000000000000000000000000deaddead"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000CA1100FA),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #    let depth := calldataload(0)
-    #
-    #    if eq(depth,0) {
-    #        mstore(0, gasprice())
-    #
-    #
-    #        return(0, 0x20)
-    #    }
-    #
-    #    // Dig deeper
-    #    mstore(0, sub(depth,1))
-    #
-    #    // Call yourself with depth-1
-    #    if iszero(call(gas(), 0x60BACCFA57, 0, 0, 0x20, 0, 0x20)) {
-    #       // Propagate failure if we failed
-    #       revert(0, 0x20)
-    #    }
+    # Source: yul
+    # berlin {
+    #   if iszero(delegatecall(gas(), 0xca11, 0, 0, 0, 0x20))
+    #      { revert(0,0x20) }
     #
-    #    // Propagate success
-    #    return (0, 0x20)
+    #   return(0, 0x20)     // return the result as our return value
     # }
-    pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.JUMPI(pc=0x2D, condition=Op.ISZERO(Op.DUP1))
-            + Op.PUSH1[0x1]
-            + Op.SWAP1
-            + Op.MSTORE(offset=0x0, value=Op.SUB)
-            + Op.JUMPI(
-                pc=0x27,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=Op.GAS,
-                        address=0x60BACCFA57,
-                        value=Op.DUP1,
-                        args_offset=Op.DUP2,
-                        args_size=Op.DUP2,
-                        ret_offset=0x0,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.REVERT(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GASPRICE)
-            + Op.RETURN(offset=0x0, size=0x20)
-        ),
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x14,
+            condition=Op.ISZERO(
+                Op.DELEGATECALL(
+                    gas=Op.GAS,
+                    address=0xCA11,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20),
         balance=0xDE0B6B3A7640000,
-        address=Address("0x00000000000000000000000000000060baccfa57"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000CA1100F4),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000, nonce=1)
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #    let action := calldataload(4)
     #    let res := 1   // If the result of a call is revert, revert here too
     #    let addr := 1  // If the result of CREATE[2] is zero, it reverted
@@ -908,728 +550,714 @@ def test_gas_price_diff_places(
     #    }
     #    case 0xF4 {  // delegate call a contract to run this code
     # ... (269 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x60A7)
-            + Op.PUSH1[0x1]
-            + Op.DUP1
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.EXTCODESIZE(address=0xC0DEC0DE)
-            + Op.PUSH1[0x20]
-            + Op.EXTCODESIZE(address=0xC0DE)
-            + Op.JUMPI(pc=0x581, condition=Op.ISZERO(Op.DUP4))
-            + Op.JUMPI(pc=0x56B, condition=Op.EQ(0xF1, Op.DUP4))
-            + Op.JUMPI(pc=0x555, condition=Op.EQ(0xF2, Op.DUP4))
-            + Op.JUMPI(pc=0x540, condition=Op.EQ(0xF4, Op.DUP4))
-            + Op.JUMPI(pc=0x52B, condition=Op.EQ(0xFA, Op.DUP4))
-            + Op.JUMPI(pc=0x513, condition=Op.EQ(0xF1F1, Op.DUP4))
-            + Op.JUMPI(pc=0x4FB, condition=Op.EQ(0xF2F1, Op.DUP4))
-            + Op.JUMPI(pc=0x4E4, condition=Op.EQ(0xF4F1, Op.DUP4))
-            + Op.JUMPI(pc=0x4CD, condition=Op.EQ(0xFAF1, Op.DUP4))
-            + Op.JUMPI(pc=0x4B5, condition=Op.EQ(0xF1F2, Op.DUP4))
-            + Op.JUMPI(pc=0x49D, condition=Op.EQ(0xF2F2, Op.DUP4))
-            + Op.JUMPI(pc=0x486, condition=Op.EQ(0xF4F2, Op.DUP4))
-            + Op.JUMPI(pc=0x46F, condition=Op.EQ(0xFAF2, Op.DUP4))
-            + Op.JUMPI(pc=0x457, condition=Op.EQ(0xF1F4, Op.DUP4))
-            + Op.JUMPI(pc=0x43F, condition=Op.EQ(0xF2F4, Op.DUP4))
-            + Op.JUMPI(pc=0x428, condition=Op.EQ(0xF4F4, Op.DUP4))
-            + Op.JUMPI(pc=0x411, condition=Op.EQ(0xFAF4, Op.DUP4))
-            + Op.JUMPI(pc=0x3F9, condition=Op.EQ(0xF1FA, Op.DUP4))
-            + Op.JUMPI(pc=0x3E1, condition=Op.EQ(0xF2FA, Op.DUP4))
-            + Op.JUMPI(pc=0x3CA, condition=Op.EQ(0xF4FA, Op.DUP4))
-            + Op.JUMPI(pc=0x3B3, condition=Op.EQ(0xFAFA, Op.DUP4))
-            + Op.JUMPI(pc=0x37E, condition=Op.EQ(0xFD, Op.DUP4))
-            + Op.JUMPI(pc=0x347, condition=Op.EQ(0xFE, Op.DUP4))
-            + Op.JUMPI(pc=0x311, condition=Op.EQ(0xFF, Op.DUP4))
-            + Op.JUMPI(pc=0x2EB, condition=Op.EQ(0xF0, Op.DUP4))
-            + Op.JUMPI(pc=0x2C1, condition=Op.EQ(0xF5, Op.DUP4))
-            + Op.POP
-            + Op.JUMPI(pc=0x297, condition=Op.EQ(0xF0F1, Op.DUP3))
-            + Op.JUMPI(pc=0x26B, condition=Op.EQ(0xF5F1, Op.DUP3))
-            + Op.JUMPI(pc=0x248, condition=Op.EQ(0xF0F2, Op.DUP3))
-            + Op.JUMPI(pc=0x223, condition=Op.EQ(0xF5F2, Op.DUP3))
-            + Op.JUMPI(pc=0x201, condition=Op.EQ(0xF0F4, Op.DUP3))
-            + Op.JUMPI(pc=0x1DD, condition=Op.EQ(0xF5F4, Op.DUP3))
-            + Op.JUMPI(pc=0x1B4, condition=Op.EQ(0xF0FA, Op.DUP3))
-            + Op.JUMPI(pc=0x189, condition=Op.EQ(0xF5FA, Op.DUP3))
-            + Op.POP
-            + Op.POP
-            + Op.PUSH5[0x60BACCFA57]
-            + Op.JUMPI(pc=0x16E, condition=Op.EQ)
-            + Op.MSTORE(offset=0x0, value=0xBAD0BAD0BAD0)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x168, condition=Op.ISZERO)
-            + Op.JUMPI(pc=0x168, condition=Op.ISZERO)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.REVERT(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.MSTORE(offset=0x0, value=0x3FF)
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0x60BACCFA57,
-                value=Op.DUP1,
-                args_offset=Op.DUP2,
-                args_size=Op.DUP2,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.SWAP2
-            + Op.POP
-            + Op.PUSH2[0x5A17]
-            + Op.SWAP4
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.DUP3
-            + Op.PUSH4[0xC0DEC0DE]
-            + Op.EXTCODECOPY
-            + Op.PUSH8[0xDE0B6B3A7640000]
-            + Op.CREATE2
-            + Op.STATICCALL(
-                gas=Op.GAS,
-                address=Op.DUP5,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.DUP2
-            + Op.SWAP5
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP4
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH4[0xC0DEC0DE]
-            + Op.EXTCODECOPY
-            + Op.PUSH8[0xDE0B6B3A7640000]
-            + Op.CREATE
-            + Op.STATICCALL(
-                gas=Op.GAS,
-                address=Op.DUP5,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.SWAP2
-            + Op.POP
-            + Op.PUSH2[0x5A17]
-            + Op.SWAP4
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.DUP3
-            + Op.PUSH4[0xC0DEC0DE]
-            + Op.EXTCODECOPY
-            + Op.PUSH1[0x0]
-            + Op.CREATE2
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.DUP5,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.DUP2
-            + Op.SWAP5
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP4
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH4[0xC0DEC0DE]
-            + Op.EXTCODECOPY
-            + Op.PUSH1[0x0]
-            + Op.CREATE
-            + Op.DELEGATECALL(
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x60A7)
+        + Op.PUSH1[0x1]
+        + Op.DUP1
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.EXTCODESIZE(address=0xC0DEC0DE)
+        + Op.PUSH1[0x20]
+        + Op.EXTCODESIZE(address=0xC0DE)
+        + Op.JUMPI(pc=0x581, condition=Op.ISZERO(Op.DUP4))
+        + Op.JUMPI(pc=0x56B, condition=Op.EQ(0xF1, Op.DUP4))
+        + Op.JUMPI(pc=0x555, condition=Op.EQ(0xF2, Op.DUP4))
+        + Op.JUMPI(pc=0x540, condition=Op.EQ(0xF4, Op.DUP4))
+        + Op.JUMPI(pc=0x52B, condition=Op.EQ(0xFA, Op.DUP4))
+        + Op.JUMPI(pc=0x513, condition=Op.EQ(0xF1F1, Op.DUP4))
+        + Op.JUMPI(pc=0x4FB, condition=Op.EQ(0xF2F1, Op.DUP4))
+        + Op.JUMPI(pc=0x4E4, condition=Op.EQ(0xF4F1, Op.DUP4))
+        + Op.JUMPI(pc=0x4CD, condition=Op.EQ(0xFAF1, Op.DUP4))
+        + Op.JUMPI(pc=0x4B5, condition=Op.EQ(0xF1F2, Op.DUP4))
+        + Op.JUMPI(pc=0x49D, condition=Op.EQ(0xF2F2, Op.DUP4))
+        + Op.JUMPI(pc=0x486, condition=Op.EQ(0xF4F2, Op.DUP4))
+        + Op.JUMPI(pc=0x46F, condition=Op.EQ(0xFAF2, Op.DUP4))
+        + Op.JUMPI(pc=0x457, condition=Op.EQ(0xF1F4, Op.DUP4))
+        + Op.JUMPI(pc=0x43F, condition=Op.EQ(0xF2F4, Op.DUP4))
+        + Op.JUMPI(pc=0x428, condition=Op.EQ(0xF4F4, Op.DUP4))
+        + Op.JUMPI(pc=0x411, condition=Op.EQ(0xFAF4, Op.DUP4))
+        + Op.JUMPI(pc=0x3F9, condition=Op.EQ(0xF1FA, Op.DUP4))
+        + Op.JUMPI(pc=0x3E1, condition=Op.EQ(0xF2FA, Op.DUP4))
+        + Op.JUMPI(pc=0x3CA, condition=Op.EQ(0xF4FA, Op.DUP4))
+        + Op.JUMPI(pc=0x3B3, condition=Op.EQ(0xFAFA, Op.DUP4))
+        + Op.JUMPI(pc=0x37E, condition=Op.EQ(0xFD, Op.DUP4))
+        + Op.JUMPI(pc=0x347, condition=Op.EQ(0xFE, Op.DUP4))
+        + Op.JUMPI(pc=0x311, condition=Op.EQ(0xFF, Op.DUP4))
+        + Op.JUMPI(pc=0x2EB, condition=Op.EQ(0xF0, Op.DUP4))
+        + Op.JUMPI(pc=0x2C1, condition=Op.EQ(0xF5, Op.DUP4))
+        + Op.POP
+        + Op.JUMPI(pc=0x297, condition=Op.EQ(0xF0F1, Op.DUP3))
+        + Op.JUMPI(pc=0x26B, condition=Op.EQ(0xF5F1, Op.DUP3))
+        + Op.JUMPI(pc=0x248, condition=Op.EQ(0xF0F2, Op.DUP3))
+        + Op.JUMPI(pc=0x223, condition=Op.EQ(0xF5F2, Op.DUP3))
+        + Op.JUMPI(pc=0x201, condition=Op.EQ(0xF0F4, Op.DUP3))
+        + Op.JUMPI(pc=0x1DD, condition=Op.EQ(0xF5F4, Op.DUP3))
+        + Op.JUMPI(pc=0x1B4, condition=Op.EQ(0xF0FA, Op.DUP3))
+        + Op.JUMPI(pc=0x189, condition=Op.EQ(0xF5FA, Op.DUP3))
+        + Op.POP * 2
+        + Op.PUSH5[0x60BACCFA57]
+        + Op.JUMPI(pc=0x16E, condition=Op.EQ)
+        + Op.MSTORE(offset=0x0, value=0xBAD0BAD0BAD0)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x168, condition=Op.ISZERO) * 2
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.MSTORE(offset=0x0, value=0x3FF)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0x60BACCFA57,
+            value=Op.DUP1,
+            args_offset=Op.DUP2,
+            args_size=Op.DUP2,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE2
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=Op.DUP5,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=Op.DUP5,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.CREATE2
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.DUP5,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.CREATE
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.DUP5,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.CREATE2
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=Op.DUP6,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.CREATE
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=Op.DUP6,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE2
+        + Op.CALL(
+            gas=Op.GAS,
+            address=Op.DUP6,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE
+        + Op.CALL(
+            gas=Op.GAS,
+            address=Op.DUP6,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP3
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP3
+        + Op.SWAP4
+        + Op.POP
+        + Op.EXTCODECOPY(
+            address=0xC0DE, dest_offset=Op.DUP3, offset=0x0, size=Op.DUP2
+        )
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE2
+        + Op.SWAP1
+        + Op.EXTCODECOPY(
+            address=Op.DUP5, dest_offset=0x0, offset=0x1, size=0x20
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP4
+        + Op.SWAP5
+        + Op.POP
+        + Op.SWAP2
+        + Op.POP * 2
+        + Op.EXTCODECOPY(
+            address=0xC0DE, dest_offset=Op.DUP3, offset=0x0, size=Op.DUP2
+        )
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE
+        + Op.SWAP1
+        + Op.EXTCODECOPY(
+            address=Op.DUP5, dest_offset=0x0, offset=0x1, size=0x20
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.POP(
+            Op.CALL(
                 gas=Op.GAS,
-                address=Op.DUP5,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.SWAP2
-            + Op.POP
-            + Op.PUSH2[0x5A17]
-            + Op.SWAP4
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.DUP3
-            + Op.PUSH4[0xC0DEC0DE]
-            + Op.EXTCODECOPY
-            + Op.PUSH1[0x0]
-            + Op.CREATE2
-            + Op.CALLCODE(
-                gas=Op.GAS,
-                address=Op.DUP6,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.DUP2
-            + Op.SWAP5
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP4
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH4[0xC0DEC0DE]
-            + Op.EXTCODECOPY
-            + Op.PUSH1[0x0]
-            + Op.CREATE
-            + Op.CALLCODE(
-                gas=Op.GAS,
-                address=Op.DUP6,
+                address=0xDEADDEAD,
                 value=Op.DUP1,
                 args_offset=Op.DUP1,
                 args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.SWAP2
-            + Op.POP
-            + Op.PUSH2[0x5A17]
-            + Op.SWAP4
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.DUP3
-            + Op.PUSH4[0xC0DEC0DE]
-            + Op.EXTCODECOPY
-            + Op.PUSH8[0xDE0B6B3A7640000]
-            + Op.CREATE2
-            + Op.CALL(
-                gas=Op.GAS,
-                address=Op.DUP6,
+        )
+        + Op.GASPRICE
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.SLOAD
+        + Op.JUMPI(pc=0x156, condition=Op.EQ)
+        + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.POP(
+            Op.CALL(
+                gas=0x61A8,
+                address=0x60006,
                 value=Op.DUP1,
                 args_offset=Op.DUP1,
                 args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.DUP2
-            + Op.SWAP5
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP4
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH4[0xC0DEC0DE]
-            + Op.EXTCODECOPY
-            + Op.PUSH8[0xDE0B6B3A7640000]
-            + Op.CREATE
-            + Op.CALL(
+        )
+        + Op.GASPRICE
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.SLOAD
+        + Op.JUMPI(pc=0x156, condition=Op.EQ)
+        + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.POP(
+            Op.CALL(
                 gas=Op.GAS,
-                address=Op.DUP6,
+                address=0x60BACC,
                 value=Op.DUP1,
                 args_offset=Op.DUP1,
                 args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.SWAP3
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x5A17]
-            + Op.SWAP3
-            + Op.SWAP4
-            + Op.POP
-            + Op.EXTCODECOPY(
-                address=0xC0DE,
-                dest_offset=Op.DUP3,
-                offset=0x0,
-                size=Op.DUP2,
-            )
-            + Op.PUSH8[0xDE0B6B3A7640000]
-            + Op.CREATE2
-            + Op.SWAP1
-            + Op.EXTCODECOPY(
-                address=Op.DUP5,
-                dest_offset=0x0,
-                offset=0x1,
-                size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.SWAP4
-            + Op.SWAP5
-            + Op.POP
-            + Op.SWAP2
-            + Op.POP
-            + Op.POP
-            + Op.EXTCODECOPY(
-                address=0xC0DE,
-                dest_offset=Op.DUP3,
-                offset=0x0,
-                size=Op.DUP2,
-            )
-            + Op.PUSH8[0xDE0B6B3A7640000]
-            + Op.CREATE
-            + Op.SWAP1
-            + Op.EXTCODECOPY(
-                address=Op.DUP5,
-                dest_offset=0x0,
-                offset=0x1,
-                size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x0, value=Op.GASPRICE)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEADDEAD,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GASPRICE
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.SLOAD
-            + Op.JUMPI(pc=0x156, condition=Op.EQ)
-            + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x0, value=Op.GASPRICE)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.POP(
-                Op.CALL(
-                    gas=0x61A8,
-                    address=0x60006,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GASPRICE
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.SLOAD
-            + Op.JUMPI(pc=0x156, condition=Op.EQ)
-            + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x0, value=Op.GASPRICE)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.POP(
+        )
+        + Op.GASPRICE
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.SLOAD
+        + Op.JUMPI(pc=0x156, condition=Op.EQ)
+        + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA1100FA,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA1100FA,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA1100FA,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA1100FA,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA1100F4,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA1100F4,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA1100F4,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA1100F4,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA1100F2,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA1100F2,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA1100F2,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA1100F2,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA1100F1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA1100F1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA1100F1,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA1100F1,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA11,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.JUMP(pc=0x156),
+        storage={0: 24743},
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    let depth := calldataload(0)
+    #
+    #    if eq(depth,0) {
+    #        mstore(0, gasprice())
+    #
+    #
+    #        return(0, 0x20)
+    #    }
+    #
+    #    // Dig deeper
+    #    mstore(0, sub(depth,1))
+    #
+    #    // Call yourself with depth-1
+    #    if iszero(call(gas(), 0x60BACCFA57, 0, 0, 0x20, 0, 0x20)) {
+    #       // Propagate failure if we failed
+    #       revert(0, 0x20)
+    #    }
+    #
+    #    // Propagate success
+    #    return (0, 0x20)
+    # }
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.JUMPI(pc=0x2D, condition=Op.ISZERO(Op.DUP1))
+        + Op.PUSH1[0x1]
+        + Op.SWAP1
+        + Op.MSTORE(offset=0x0, value=Op.SUB)
+        + Op.JUMPI(
+            pc=0x27,
+            condition=Op.ISZERO(
                 Op.CALL(
                     gas=Op.GAS,
-                    address=0x60BACC,
+                    address=0x60BACCFA57,
                     value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GASPRICE
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.SLOAD
-            + Op.JUMPI(pc=0x156, condition=Op.EQ)
-            + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.STATICCALL(
-                gas=Op.GAS,
-                address=0xCA1100FA,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0xCA1100FA,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALLCODE(
-                gas=Op.GAS,
-                address=0xCA1100FA,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xCA1100FA,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.STATICCALL(
-                gas=Op.GAS,
-                address=0xCA1100F4,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0xCA1100F4,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALLCODE(
-                gas=Op.GAS,
-                address=0xCA1100F4,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xCA1100F4,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.STATICCALL(
-                gas=Op.GAS,
-                address=0xCA1100F2,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0xCA1100F2,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALLCODE(
-                gas=Op.GAS,
-                address=0xCA1100F2,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xCA1100F2,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.STATICCALL(
-                gas=Op.GAS,
-                address=0xCA1100F1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0xCA1100F1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALLCODE(
-                gas=Op.GAS,
-                address=0xCA1100F1,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xCA1100F1,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.STATICCALL(
-                gas=Op.GAS,
-                address=0xCA11,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0xCA11,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALLCODE(
-                gas=Op.GAS,
-                address=0xCA11,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xCA11,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x0, value=Op.GASPRICE)
-            + Op.JUMP(pc=0x156)
-        ),
-        storage={0x0: 0x60A7},
+                    args_offset=Op.DUP2,
+                    args_size=Op.DUP2,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.RETURN(offset=0x0, size=0x20),
         balance=0xDE0B6B3A7640000,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000060BACCFA57),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0xF1),
+        Bytes("693c6139") + Hash(0xF2),
+        Bytes("693c6139") + Hash(0xF4),
+        Bytes("693c6139") + Hash(0xFA),
+        Bytes("693c6139") + Hash(0xF1F1),
+        Bytes("693c6139") + Hash(0xF2F1),
+        Bytes("693c6139") + Hash(0xF4F1),
+        Bytes("693c6139") + Hash(0xFAF1),
+        Bytes("693c6139") + Hash(0xF1F2),
+        Bytes("693c6139") + Hash(0xF2F2),
+        Bytes("693c6139") + Hash(0xF4F2),
+        Bytes("693c6139") + Hash(0xFAF2),
+        Bytes("693c6139") + Hash(0xF1F4),
+        Bytes("693c6139") + Hash(0xF2F4),
+        Bytes("693c6139") + Hash(0xF4F4),
+        Bytes("693c6139") + Hash(0xFAF4),
+        Bytes("693c6139") + Hash(0xF1FA),
+        Bytes("693c6139") + Hash(0xF2FA),
+        Bytes("693c6139") + Hash(0xF4FA),
+        Bytes("693c6139") + Hash(0xFAFA),
+        Bytes("693c6139") + Hash(0xFD),
+        Bytes("693c6139") + Hash(0xFE),
+        Bytes("693c6139") + Hash(0xFF),
+        Bytes("693c6139") + Hash(0xF0),
+        Bytes("693c6139") + Hash(0xF5),
+        Bytes("693c6139") + Hash(0xF0F1),
+        Bytes("693c6139") + Hash(0xF5F1),
+        Bytes("693c6139") + Hash(0xF0F2),
+        Bytes("693c6139") + Hash(0xF5F2),
+        Bytes("693c6139") + Hash(0xF0F4),
+        Bytes("693c6139") + Hash(0xF5F4),
+        Bytes("693c6139") + Hash(0xF0FA),
+        Bytes("693c6139") + Hash(0xF5FA),
+        Bytes("693c6139") + Hash(contract_12, left_padding=True),
+    ]
+    tx_gas = [4503599627370496]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=4503599627370496,
-        gas_price=2000,
+        to=contract_3,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        gas_price=2000,
     )
 
-    post = expected_post
+    post = {
+        contract_3: Account(storage={0: 2000}),
+        contract_10: Account(storage={0: 24743}),
+        contract_9: Account(storage={0: 24743}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP1559/test_gas_price_diff_places_osaka.py b/tests/ported_static/stEIP1559/test_gas_price_diff_places_osaka.py
new file mode 100644
index 00000000000..873dae98658
--- /dev/null
+++ b/tests/ported_static/stEIP1559/test_gas_price_diff_places_osaka.py
@@ -0,0 +1,1255 @@
+"""
+Ori Pomerantz   qbzzt1@gmail.com.
+
+Ported from:
+state_tests/stEIP1559/gasPriceDiffPlacesOsakaFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/stEIP1559/gasPriceDiffPlacesOsakaFiller.yml"],
+)
+@pytest.mark.valid_from("Osaka")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="normal",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="normal",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="normal",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="d16",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="d17",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="d18",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="d19",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="d20",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="d21",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="d22",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="d23",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="d24",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="d25",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="d26",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="d27",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="d28",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="d29",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="d30",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="d31",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="d32",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="d33",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_gas_price_diff_places(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz   qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x000000000000000000000000000000000000C0DE)
+    contract_1 = Address(0x000000000000000000000000000000000020C0DE)
+    contract_2 = Address(0x00000000000000000000000000000000C0DEC0DE)
+    contract_3 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    contract_4 = Address(0x000000000000000000000000000000000000CA11)
+    contract_5 = Address(0x00000000000000000000000000000000CA1100F1)
+    contract_6 = Address(0x00000000000000000000000000000000CA1100F2)
+    contract_7 = Address(0x00000000000000000000000000000000CA1100F4)
+    contract_8 = Address(0x00000000000000000000000000000000CA1100FA)
+    contract_9 = Address(0x0000000000000000000000000000000000060006)
+    contract_10 = Address(0x000000000000000000000000000000000060BACC)
+    contract_11 = Address(0x00000000000000000000000000000000DEADDEAD)
+    contract_12 = Address(0x00000000000000000000000000000060BACCFA57)
+    sender = pre.fund_eoa(amount=0x3635C9ADC5DEA00000, nonce=1)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=4503599627370496,
+    )
+
+    # Source: yul
+    # berlin {
+    #    mstore(0, gasprice())
+    #
+    #
+    #
+    #    // Here the result is is mload(0). We want to run it, but
+    #    // prefix it with a zero so we'll be safe from being considered
+    #    // an invalid program.
+    #    //
+    #    // If we use this as a constructor the result will be
+    #    // the code of the created contract, but we can live
+    #    // with that. We won't call it.
+    #    mstore(0x40, mload(0x00))
+    #    return(0x3F, 0x21)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.MSTORE(offset=0x40, value=Op.MLOAD(offset=0x0))
+        + Op.RETURN(offset=0x3F, size=0x21),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000C0DE),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    mstore(0, gasprice())
+    #
+    #
+    #
+    #    // Here the result is is mload(0).
+    #    return(0x00, 0x20)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.RETURN(offset=0x0, size=0x20),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000020C0DE),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #   mstore(0, gasprice())
+    #
+    #
+    #   return(0, 0x20)     // return the result as our return value
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.RETURN(offset=0x0, size=0x20),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000CA11),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    mstore(0, gasprice())
+    #
+    #
+    #    sstore(0,mload(0))
+    #    invalid()
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.GASPRICE
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.SSTORE
+        + Op.INVALID,
+        storage={0: 24743},
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000060006),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    mstore(0, gasprice())
+    #
+    #
+    #    sstore(0,mload(0))
+    #    revert(0,0x20)
+    # }
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.REVERT(offset=0x0, size=0x20),
+        storage={0: 24743},
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000060BACC),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    selfdestruct(0)
+    # }
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=0x0),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000DEADDEAD),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    let addr := 0x20C0DE
+    #    let length := extcodesize(addr)
+    #
+    #    // Read the code from 0x20C0DE
+    #    extcodecopy(addr, 0, 0, length)
+    #
+    #    // Return this memory as the code for the contract
+    #    return(0, length)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.PUSH3[0x20C0DE]
+        + Op.DUP2
+        + Op.EXTCODESIZE(address=Op.DUP2)
+        + Op.SWAP3
+        + Op.DUP4
+        + Op.SWAP3
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.RETURN,
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000C0DEC0DE),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #   if iszero(callcode(gas(), 0xca11, 0, 0, 0, 0, 0x20))
+    #      { revert(0,0x20) }
+    #
+    #   return(0, 0x20)     // return the result as our return value
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x15,
+            condition=Op.ISZERO(
+                Op.CALLCODE(
+                    gas=Op.GAS,
+                    address=0xCA11,
+                    value=Op.DUP1,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000CA1100F2),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #   if iszero(call(gas(), 0xca11, 0, 0, 0, 0, 0x20))
+    #      { revert(0,0x20) }
+    #
+    #   return(0, 0x20)     // return the result as our return value
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x15,
+            condition=Op.ISZERO(
+                Op.CALL(
+                    gas=Op.GAS,
+                    address=0xCA11,
+                    value=Op.DUP1,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000CA1100F1),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #   if iszero(staticcall(gas(), 0xca11, 0, 0, 0, 0x20))
+    #      { revert(0,0x20) }
+    #
+    #   return(0, 0x20)     // return the result as our return value
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x14,
+            condition=Op.ISZERO(
+                Op.STATICCALL(
+                    gas=Op.GAS,
+                    address=0xCA11,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000CA1100FA),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #   if iszero(delegatecall(gas(), 0xca11, 0, 0, 0, 0x20))
+    #      { revert(0,0x20) }
+    #
+    #   return(0, 0x20)     // return the result as our return value
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x14,
+            condition=Op.ISZERO(
+                Op.DELEGATECALL(
+                    gas=Op.GAS,
+                    address=0xCA11,
+                    args_offset=Op.DUP1,
+                    args_size=Op.DUP1,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000CA1100F4),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    let action := calldataload(4)
+    #    let res := 1   // If the result of a call is revert, revert here too
+    #    let addr := 1  // If the result of CREATE[2] is zero, it reverted
+    #
+    #    // For when we need code in our memory
+    #    let codeBuffer := 0x20
+    #    // When running the template in the constructor
+    #    let codeLength := extcodesize(0xC0DE)
+    #    // When running the template in the created code
+    #    let codeLength2 := extcodesize(0xC0DEC0DE)
+    #
+    #    // Goat should be overwritten
+    #    mstore(0, 0x60A7)
+    #
+    #    switch action
+    #    case 0 {  // run the code snippet as normal code
+    #       mstore(0, gasprice())
+    #
+    #
+    #    }
+    #
+    #    // One level of call stack
+    #    case 0xF1 {  // call a contract to run this code
+    #       res := call(gas(), 0xca11, 0, 0, 0, 0, 0x20) // call template code
+    #    }
+    #    case 0xF2 {  // callcode a contract to run this code
+    #       res := callcode(gas(), 0xca11, 0, 0, 0, 0, 0x20)
+    #    }
+    #    case 0xF4 {  // delegate call a contract to run this code
+    # ... (269 more lines)
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x60A7)
+        + Op.PUSH1[0x1]
+        + Op.DUP1
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.EXTCODESIZE(address=0xC0DEC0DE)
+        + Op.PUSH1[0x20]
+        + Op.EXTCODESIZE(address=0xC0DE)
+        + Op.JUMPI(pc=0x581, condition=Op.ISZERO(Op.DUP4))
+        + Op.JUMPI(pc=0x56B, condition=Op.EQ(0xF1, Op.DUP4))
+        + Op.JUMPI(pc=0x555, condition=Op.EQ(0xF2, Op.DUP4))
+        + Op.JUMPI(pc=0x540, condition=Op.EQ(0xF4, Op.DUP4))
+        + Op.JUMPI(pc=0x52B, condition=Op.EQ(0xFA, Op.DUP4))
+        + Op.JUMPI(pc=0x513, condition=Op.EQ(0xF1F1, Op.DUP4))
+        + Op.JUMPI(pc=0x4FB, condition=Op.EQ(0xF2F1, Op.DUP4))
+        + Op.JUMPI(pc=0x4E4, condition=Op.EQ(0xF4F1, Op.DUP4))
+        + Op.JUMPI(pc=0x4CD, condition=Op.EQ(0xFAF1, Op.DUP4))
+        + Op.JUMPI(pc=0x4B5, condition=Op.EQ(0xF1F2, Op.DUP4))
+        + Op.JUMPI(pc=0x49D, condition=Op.EQ(0xF2F2, Op.DUP4))
+        + Op.JUMPI(pc=0x486, condition=Op.EQ(0xF4F2, Op.DUP4))
+        + Op.JUMPI(pc=0x46F, condition=Op.EQ(0xFAF2, Op.DUP4))
+        + Op.JUMPI(pc=0x457, condition=Op.EQ(0xF1F4, Op.DUP4))
+        + Op.JUMPI(pc=0x43F, condition=Op.EQ(0xF2F4, Op.DUP4))
+        + Op.JUMPI(pc=0x428, condition=Op.EQ(0xF4F4, Op.DUP4))
+        + Op.JUMPI(pc=0x411, condition=Op.EQ(0xFAF4, Op.DUP4))
+        + Op.JUMPI(pc=0x3F9, condition=Op.EQ(0xF1FA, Op.DUP4))
+        + Op.JUMPI(pc=0x3E1, condition=Op.EQ(0xF2FA, Op.DUP4))
+        + Op.JUMPI(pc=0x3CA, condition=Op.EQ(0xF4FA, Op.DUP4))
+        + Op.JUMPI(pc=0x3B3, condition=Op.EQ(0xFAFA, Op.DUP4))
+        + Op.JUMPI(pc=0x37E, condition=Op.EQ(0xFD, Op.DUP4))
+        + Op.JUMPI(pc=0x347, condition=Op.EQ(0xFE, Op.DUP4))
+        + Op.JUMPI(pc=0x311, condition=Op.EQ(0xFF, Op.DUP4))
+        + Op.JUMPI(pc=0x2EB, condition=Op.EQ(0xF0, Op.DUP4))
+        + Op.JUMPI(pc=0x2C1, condition=Op.EQ(0xF5, Op.DUP4))
+        + Op.POP
+        + Op.JUMPI(pc=0x297, condition=Op.EQ(0xF0F1, Op.DUP3))
+        + Op.JUMPI(pc=0x26B, condition=Op.EQ(0xF5F1, Op.DUP3))
+        + Op.JUMPI(pc=0x248, condition=Op.EQ(0xF0F2, Op.DUP3))
+        + Op.JUMPI(pc=0x223, condition=Op.EQ(0xF5F2, Op.DUP3))
+        + Op.JUMPI(pc=0x201, condition=Op.EQ(0xF0F4, Op.DUP3))
+        + Op.JUMPI(pc=0x1DD, condition=Op.EQ(0xF5F4, Op.DUP3))
+        + Op.JUMPI(pc=0x1B4, condition=Op.EQ(0xF0FA, Op.DUP3))
+        + Op.JUMPI(pc=0x189, condition=Op.EQ(0xF5FA, Op.DUP3))
+        + Op.POP * 2
+        + Op.PUSH5[0x60BACCFA57]
+        + Op.JUMPI(pc=0x16E, condition=Op.EQ)
+        + Op.MSTORE(offset=0x0, value=0xBAD0BAD0BAD0)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x168, condition=Op.ISZERO) * 2
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.MSTORE(offset=0x0, value=0x3FF)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0x60BACCFA57,
+            value=Op.DUP1,
+            args_offset=Op.DUP2,
+            args_size=Op.DUP2,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE2
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=Op.DUP5,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=Op.DUP5,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.CREATE2
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.DUP5,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.CREATE
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.DUP5,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.CREATE2
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=Op.DUP6,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.CREATE
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=Op.DUP6,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP4
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE2
+        + Op.CALL(
+            gas=Op.GAS,
+            address=Op.DUP6,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP5
+        + Op.POP
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH4[0xC0DEC0DE]
+        + Op.EXTCODECOPY
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE
+        + Op.CALL(
+            gas=Op.GAS,
+            address=Op.DUP6,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP3
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP3
+        + Op.SWAP4
+        + Op.POP
+        + Op.EXTCODECOPY(
+            address=0xC0DE, dest_offset=Op.DUP3, offset=0x0, size=Op.DUP2
+        )
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE2
+        + Op.SWAP1
+        + Op.EXTCODECOPY(
+            address=Op.DUP5, dest_offset=0x0, offset=0x1, size=0x20
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.SWAP4
+        + Op.SWAP5
+        + Op.POP
+        + Op.SWAP2
+        + Op.POP * 2
+        + Op.EXTCODECOPY(
+            address=0xC0DE, dest_offset=Op.DUP3, offset=0x0, size=Op.DUP2
+        )
+        + Op.PUSH8[0xDE0B6B3A7640000]
+        + Op.CREATE
+        + Op.SWAP1
+        + Op.EXTCODECOPY(
+            address=Op.DUP5, dest_offset=0x0, offset=0x1, size=0x20
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEADDEAD,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.GASPRICE
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.SLOAD
+        + Op.JUMPI(pc=0x156, condition=Op.EQ)
+        + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.POP(
+            Op.CALL(
+                gas=0x61A8,
+                address=0x60006,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.GASPRICE
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.SLOAD
+        + Op.JUMPI(pc=0x156, condition=Op.EQ)
+        + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0x60BACC,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.GASPRICE
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.SLOAD
+        + Op.JUMPI(pc=0x156, condition=Op.EQ)
+        + Op.MSTORE(offset=0x0, value=0xBADBADBAD)
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA1100FA,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA1100FA,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA1100FA,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA1100FA,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA1100F4,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA1100F4,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA1100F4,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA1100F4,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA1100F2,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA1100F2,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA1100F2,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA1100F2,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA1100F1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA1100F1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA1100F1,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA1100F1,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.STATICCALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xCA11,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xCA11,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.JUMP(pc=0x156),
+        storage={0: 24743},
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #    let depth := calldataload(0)
+    #
+    #    if eq(depth,0) {
+    #        mstore(0, gasprice())
+    #
+    #
+    #        return(0, 0x20)
+    #    }
+    #
+    #    // Dig deeper
+    #    mstore(0, sub(depth,1))
+    #
+    #    // Call yourself with depth-1
+    #    if iszero(call(gas(), 0x60BACCFA57, 0, 0, 0x20, 0, 0x20)) {
+    #       // Propagate failure if we failed
+    #       revert(0, 0x20)
+    #    }
+    #
+    #    // Propagate success
+    #    return (0, 0x20)
+    # }
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.JUMPI(pc=0x2D, condition=Op.ISZERO(Op.DUP1))
+        + Op.PUSH1[0x1]
+        + Op.SWAP1
+        + Op.MSTORE(offset=0x0, value=Op.SUB)
+        + Op.JUMPI(
+            pc=0x27,
+            condition=Op.ISZERO(
+                Op.CALL(
+                    gas=Op.GAS,
+                    address=0x60BACCFA57,
+                    value=Op.DUP1,
+                    args_offset=Op.DUP2,
+                    args_size=Op.DUP2,
+                    ret_offset=0x0,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GASPRICE)
+        + Op.RETURN(offset=0x0, size=0x20),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x00000000000000000000000000000060BACCFA57),  # noqa: E501
+    )
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0xF1),
+        Bytes("693c6139") + Hash(0xF2),
+        Bytes("693c6139") + Hash(0xF4),
+        Bytes("693c6139") + Hash(0xFA),
+        Bytes("693c6139") + Hash(0xF1F1),
+        Bytes("693c6139") + Hash(0xF2F1),
+        Bytes("693c6139") + Hash(0xF4F1),
+        Bytes("693c6139") + Hash(0xFAF1),
+        Bytes("693c6139") + Hash(0xF1F2),
+        Bytes("693c6139") + Hash(0xF2F2),
+        Bytes("693c6139") + Hash(0xF4F2),
+        Bytes("693c6139") + Hash(0xFAF2),
+        Bytes("693c6139") + Hash(0xF1F4),
+        Bytes("693c6139") + Hash(0xF2F4),
+        Bytes("693c6139") + Hash(0xF4F4),
+        Bytes("693c6139") + Hash(0xFAF4),
+        Bytes("693c6139") + Hash(0xF1FA),
+        Bytes("693c6139") + Hash(0xF2FA),
+        Bytes("693c6139") + Hash(0xF4FA),
+        Bytes("693c6139") + Hash(0xFAFA),
+        Bytes("693c6139") + Hash(0xFD),
+        Bytes("693c6139") + Hash(0xFE),
+        Bytes("693c6139") + Hash(0xFF),
+        Bytes("693c6139") + Hash(0xF0),
+        Bytes("693c6139") + Hash(0xF5),
+        Bytes("693c6139") + Hash(0xF0F1),
+        Bytes("693c6139") + Hash(0xF5F1),
+        Bytes("693c6139") + Hash(0xF0F2),
+        Bytes("693c6139") + Hash(0xF5F2),
+        Bytes("693c6139") + Hash(0xF0F4),
+        Bytes("693c6139") + Hash(0xF5F4),
+        Bytes("693c6139") + Hash(0xF0FA),
+        Bytes("693c6139") + Hash(0xF5FA),
+    ]
+    tx_gas = [1000000]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_3,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        nonce=1,
+        gas_price=2000,
+    )
+
+    post = {
+        contract_3: Account(storage={0: 2000}),
+        contract_10: Account(storage={0: 24743}),
+        contract_9: Account(storage={0: 24743}),
+    }
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP1559/test_low_fee_cap.py b/tests/ported_static/stEIP1559/test_low_fee_cap.py
index 847c19db5ae..82deed00eff 100644
--- a/tests/ported_static/stEIP1559/test_low_fee_cap.py
+++ b/tests/ported_static/stEIP1559/test_low_fee_cap.py
@@ -2,15 +2,14 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP1559/lowFeeCapFiller.yml
+state_tests/stEIP1559/lowFeeCapFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
-    Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,20 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP1559/lowFeeCapFiller.yml"],
+    ["state_tests/stEIP1559/lowFeeCapFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.exception_test
+@pytest.mark.pre_alloc_mutable
 def test_low_fee_cap(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xDE0C95357363DA5C1C5A73BD7C2781CA5C9FECC1014103B5E1D1E990AE8208EC
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,27 +44,26 @@ def test_low_fee_cap(
         gas_limit=71794957647893862,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #     sstore(0, add(1,1))
     # }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=0x2) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd71b14c239fc39327f25764dd784c85ef0285fda"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=target,
+        data=Bytes("00"),
         gas_limit=400000,
+        value=0x186A0,
         max_fee_per_gas=999,
         max_priority_fee_per_gas=100,
         nonce=1,
-        value=100000,
+        access_list=[],
         error=TransactionException.INSUFFICIENT_MAX_FEE_PER_GAS,
     )
 
diff --git a/tests/ported_static/stEIP1559/test_low_gas_limit.py b/tests/ported_static/stEIP1559/test_low_gas_limit.py
index 366284f8c9e..d2baa131eae 100644
--- a/tests/ported_static/stEIP1559/test_low_gas_limit.py
+++ b/tests/ported_static/stEIP1559/test_low_gas_limit.py
@@ -2,20 +2,24 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP1559/lowGasLimitFiller.yml
+state_tests/stEIP1559/lowGasLimitFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
     TransactionException,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,52 +27,36 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP1559/lowGasLimitFiller.yml"],
+    ["state_tests/stEIP1559/lowGasLimitFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, tx_error, expected_post",
+    "d, g, v",
     [
         pytest.param(
-            90000,
-            TransactionException.GAS_ALLOWANCE_EXCEEDED,
-            {
-                Address("0xef0454d0376d1921b9a83868282725853c293ab5"): Account(
-                    storage={0: 24743}
-                )
-            },
-            id="case0",
+            0,
+            0,
+            0,
+            id="-g0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            50000,
-            None,
-            {
-                Address("0xef0454d0376d1921b9a83868282725853c293ab5"): Account(
-                    storage={0: 2}
-                )
-            },
-            id="case1",
+            0,
+            1,
+            0,
+            id="-g1",
         ),
         pytest.param(
-            25000,
-            None,
-            {
-                Address("0xef0454d0376d1921b9a83868282725853c293ab5"): Account(
-                    storage={0: 24743}
-                )
-            },
-            id="case2",
+            0,
+            2,
+            0,
+            id="-g2",
         ),
         pytest.param(
-            20000,
-            TransactionException.INTRINSIC_GAS_TOO_LOW,
-            {
-                Address("0xef0454d0376d1921b9a83868282725853c293ab5"): Account(
-                    storage={0: 24743}
-                )
-            },
-            id="case3",
+            0,
+            3,
+            0,
+            id="-g3",
             marks=pytest.mark.exception_test,
         ),
     ],
@@ -77,15 +65,14 @@
 def test_low_gas_limit(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    tx_error: object,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xDE0C95357363DA5C1C5A73BD7C2781CA5C9FECC1014103B5E1D1E990AE8208EC
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -96,30 +83,67 @@ def test_low_gas_limit(
         gas_limit=80000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #     sstore(0, add(1,1))
     # }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=0x2) + Op.STOP,
-        storage={0x0: 0x60A7},
+        storage={0: 24743},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xef0454d0376d1921b9a83868282725853c293ab5"),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.GAS_ALLOWANCE_EXCEEDED
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 2})},
+        },
+        {
+            "indexes": {"data": -1, "gas": 2, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 24743})},
+        },
+        {
+            "indexes": {"data": -1, "gas": 3, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INTRINSIC_GAS_TOO_LOW
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("00"),
+    ]
+    tx_gas = [90000, 50000, 25000, 20000]
+    tx_access_lists: dict[int, list] = {
+        0: [],
+    }
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         max_fee_per_gas=1000,
         max_priority_fee_per_gas=1000,
         nonce=1,
-        error=tx_error,
+        access_list=tx_access_lists.get(d),
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP1559/test_low_gas_price_old_types.py b/tests/ported_static/stEIP1559/test_low_gas_price_old_types.py
index 3a42c3c0dec..48974cd0123 100644
--- a/tests/ported_static/stEIP1559/test_low_gas_price_old_types.py
+++ b/tests/ported_static/stEIP1559/test_low_gas_price_old_types.py
@@ -2,20 +2,23 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP1559/lowGasPriceOldTypesFiller.yml
+state_tests/stEIP1559/lowGasPriceOldTypesFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
-    Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
     TransactionException,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,30 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP1559/lowGasPriceOldTypesFiller.yml"],
+    ["state_tests/stEIP1559/lowGasPriceOldTypesFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_access_list",
+    "d, g, v",
     [
-        ("00", None),
-        ("01", []),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+            marks=pytest.mark.exception_test,
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+            marks=pytest.mark.exception_test,
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.exception_test
 def test_low_gas_price_old_types(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_access_list: list | None,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xDE0C95357363DA5C1C5A73BD7C2781CA5C9FECC1014103B5E1D1E990AE8208EC
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,32 +70,49 @@ def test_low_gas_price_old_types(
         gas_limit=71794957647893862,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #     sstore(0, add(1,1))
     # }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=0x2) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd71b14c239fc39327f25764dd784c85ef0285fda"),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INSUFFICIENT_MAX_FEE_PER_GAS
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("00"),
+        Bytes("01"),
+    ]
+    tx_gas = [400000]
+    tx_value = [100000]
+    tx_access_lists: dict[int, list] = {
+        1: [],
+    }
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=400000,
-        gas_price=999,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
         nonce=1,
-        value=100000,
-        access_list=tx_access_list,
+        gas_price=999,
+        access_list=tx_access_lists.get(d),
         error=TransactionException.INSUFFICIENT_MAX_FEE_PER_GAS,
     )
 
-    post: dict = {}
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP1559/test_out_of_funds.py b/tests/ported_static/stEIP1559/test_out_of_funds.py
index cf7ea352889..8684ccdbf0d 100644
--- a/tests/ported_static/stEIP1559/test_out_of_funds.py
+++ b/tests/ported_static/stEIP1559/test_out_of_funds.py
@@ -2,20 +2,23 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP1559/outOfFundsFiller.yml
+state_tests/stEIP1559/outOfFundsFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
-    Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
     TransactionException,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,35 +26,37 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP1559/outOfFundsFiller.yml"],
+    ["state_tests/stEIP1559/outOfFundsFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, tx_value, tx_error, expected_post",
+    "d, g, v",
     [
         pytest.param(
-            16777216,
             0,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            {},
-            id="case0",
+            0,
+            0,
+            id="declaredKeyWrite-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            16777216,
-            1000000000000000000,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            {},
-            id="case1",
+            0,
+            0,
+            1,
+            id="declaredKeyWrite-g0-v1",
             marks=pytest.mark.exception_test,
         ),
-        pytest.param(40000, 0, None, {}, id="case2"),
         pytest.param(
-            40000,
-            1000000000000000000,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            {},
-            id="case3",
+            0,
+            1,
+            0,
+            id="declaredKeyWrite-g1-v0",
+        ),
+        pytest.param(
+            0,
+            1,
+            1,
+            id="declaredKeyWrite-g1-v1",
             marks=pytest.mark.exception_test,
         ),
     ],
@@ -60,16 +65,14 @@
 def test_out_of_funds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    tx_value: int,
-    tx_error: object,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xDE0C95357363DA5C1C5A73BD7C2781CA5C9FECC1014103B5E1D1E990AE8208EC
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -80,30 +83,62 @@ def test_out_of_funds(
         gas_limit=71794957647893862,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #     sstore(0, add(1,1))
     # }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=0x2) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd71b14c239fc39327f25764dd784c85ef0285fda"),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INSUFFICIENT_ACCOUNT_FUNDS
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {},
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INSUFFICIENT_ACCOUNT_FUNDS
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("00"),
+    ]
+    tx_gas = [16777216, 40000]
+    tx_value = [0, 1000000000000000000]
+    tx_access_lists: dict[int, list] = {
+        0: [],
+    }
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
         max_fee_per_gas=100000000000,
         max_priority_fee_per_gas=100000000000,
         nonce=1,
-        value=tx_value,
-        error=tx_error,
+        access_list=tx_access_lists.get(d),
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP1559/test_out_of_funds_old_types.py b/tests/ported_static/stEIP1559/test_out_of_funds_old_types.py
index cf82fa5e921..faa5538f101 100644
--- a/tests/ported_static/stEIP1559/test_out_of_funds_old_types.py
+++ b/tests/ported_static/stEIP1559/test_out_of_funds_old_types.py
@@ -2,20 +2,23 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP1559/outOfFundsOldTypesFiller.yml
+state_tests/stEIP1559/outOfFundsOldTypesFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
-    Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
     TransactionException,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,72 +26,64 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP1559/outOfFundsOldTypesFiller.yml"],
+    ["state_tests/stEIP1559/outOfFundsOldTypesFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, tx_value, tx_access_list, tx_error, expected_post",  # noqa: E501
+    "d, g, v",
     [
         pytest.param(
-            "00",
-            16777216,
             0,
-            None,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            {},
-            id="case0",
+            0,
+            0,
+            id="d0-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            16777216,
-            1000000000000000000,
-            None,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            {},
-            id="case1",
+            0,
+            0,
+            1,
+            id="d0-g0-v1",
             marks=pytest.mark.exception_test,
         ),
-        pytest.param("00", 40000, 0, None, None, {}, id="case2"),
         pytest.param(
-            "00",
-            40000,
-            1000000000000000000,
-            None,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            {},
-            id="case3",
+            0,
+            1,
+            0,
+            id="d0-g1-v0",
+        ),
+        pytest.param(
+            0,
+            1,
+            1,
+            id="d0-g1-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "01",
-            16777216,
+            1,
+            0,
             0,
-            [],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            {},
-            id="case4",
+            id="d1-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "01",
-            16777216,
-            1000000000000000000,
-            [],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            {},
-            id="case5",
+            1,
+            0,
+            1,
+            id="d1-g0-v1",
             marks=pytest.mark.exception_test,
         ),
-        pytest.param("01", 40000, 0, [], None, {}, id="case6"),
         pytest.param(
-            "01",
-            40000,
-            1000000000000000000,
-            [],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            {},
-            id="case7",
+            1,
+            1,
+            0,
+            id="d1-g1-v0",
+        ),
+        pytest.param(
+            1,
+            1,
+            1,
+            id="d1-g1-v1",
             marks=pytest.mark.exception_test,
         ),
     ],
@@ -97,18 +92,14 @@
 def test_out_of_funds_old_types(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    tx_value: int,
-    tx_access_list: list | None,
-    tx_error: object,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xDE0C95357363DA5C1C5A73BD7C2781CA5C9FECC1014103B5E1D1E990AE8208EC
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -119,32 +110,62 @@ def test_out_of_funds_old_types(
         gas_limit=71794957647893862,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    # Source: Yul
-    # {
+    # Source: yul
+    # berlin {
     #     sstore(0, add(1,1))
     # }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=0x2) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd71b14c239fc39327f25764dd784c85ef0285fda"),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INSUFFICIENT_ACCOUNT_FUNDS
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {},
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INSUFFICIENT_ACCOUNT_FUNDS
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("00"),
+        Bytes("01"),
+    ]
+    tx_gas = [16777216, 40000]
+    tx_value = [0, 1000000000000000000]
+    tx_access_lists: dict[int, list] = {
+        1: [],
+    }
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        gas_price=100000000000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
         nonce=1,
-        value=tx_value,
-        access_list=tx_access_list,
-        error=tx_error,
+        gas_price=100000000000,
+        access_list=tx_access_lists.get(d),
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP1559/test_sender_balance.py b/tests/ported_static/stEIP1559/test_sender_balance.py
index 331ce686190..c248718b4df 100644
--- a/tests/ported_static/stEIP1559/test_sender_balance.py
+++ b/tests/ported_static/stEIP1559/test_sender_balance.py
@@ -1,12 +1,12 @@
 """
-The execution records the EIP-1559 transaction origin balance to make sure...
+The execution records the EIP-1559 transaction origin balance to make...
 
 properly computed based on the effective gas price (not the maximum gas price
 as in
 the transaction validity check).
 
 Ported from:
-tests/static/state_tests/stEIP1559/senderBalanceFiller.yml
+state_tests/stEIP1559/senderBalanceFiller.yml
 """
 
 import pytest
@@ -15,6 +15,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -26,7 +27,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP1559/senderBalanceFiller.yml"],
+    ["state_tests/stEIP1559/senderBalanceFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -35,7 +36,7 @@ def test_sender_balance(
     pre: Alloc,
 ) -> None:
     """The execution records the EIP-1559 transaction origin balance to..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -49,27 +50,28 @@ def test_sender_balance(
         gas_limit=30000000,
     )
 
-    # Source: Yul
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: yul
+    # london
     # {
     #   sstore(0, balance(caller()))
     # }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.BALANCE(address=Op.CALLER)) + Op.STOP,
         nonce=0,
-        address=Address("0x420132f96200ba8e5c98298a85633c35c4f052ef"),  # noqa: E501
+        address=Address(0x420132F96200BA8E5C98298A85633C35C4F052EF),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=60000,
         max_fee_per_gas=1000,
         max_priority_fee_per_gas=100,
+        access_list=[],
     )
 
-    post = {
-        contract: Account(storage={0: 0xDE0B6B3A6FE6060}),
-    }
+    post = {target: Account(storage={0: 0xDE0B6B3A6FE6060})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP1559/test_tip_too_high.py b/tests/ported_static/stEIP1559/test_tip_too_high.py
index 8e7e60f5c71..5a019d933c0 100644
--- a/tests/ported_static/stEIP1559/test_tip_too_high.py
+++ b/tests/ported_static/stEIP1559/test_tip_too_high.py
@@ -2,15 +2,14 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP1559/tipTooHighFiller.yml
+state_tests/stEIP1559/tipTooHighFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
-    Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,20 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP1559/tipTooHighFiller.yml"],
+    ["state_tests/stEIP1559/tipTooHighFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.exception_test
+@pytest.mark.pre_alloc_mutable
 def test_tip_too_high(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xDE0C95357363DA5C1C5A73BD7C2781CA5C9FECC1014103B5E1D1E990AE8208EC
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,27 +44,27 @@ def test_tip_too_high(
         gas_limit=71794957647893862,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    # Source: Yul
+    # Source: yul
+    # london
     # {
     #     sstore(0, add(1,1))
     # }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=0x2) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xec75f5d282f63da54cb0dad4ff8eaaa070d2da2b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=target,
+        data=Bytes("00"),
         gas_limit=400000,
+        value=0x186A0,
         max_fee_per_gas=1000,
         max_priority_fee_per_gas=1001,
         nonce=1,
-        value=100000,
+        access_list=[],
         error=TransactionException.PRIORITY_GREATER_THAN_MAX_FEE_PER_GAS,
     )
 
diff --git a/tests/ported_static/stEIP1559/test_transaction_intinsic_bug_paris.py b/tests/ported_static/stEIP1559/test_transaction_intinsic_bug_paris.py
index fef6bbe20c6..46e0c57138f 100644
--- a/tests/ported_static/stEIP1559/test_transaction_intinsic_bug_paris.py
+++ b/tests/ported_static/stEIP1559/test_transaction_intinsic_bug_paris.py
@@ -1,16 +1,16 @@
 """
-Bug discovered on ropsten...
+Bug discovered on ropsten https://github.com/ethereum/go-ethereum/pull/2...
 
 Ported from:
-tests/static/state_tests/stEIP1559/transactionIntinsicBug_ParisFiller.yml
+state_tests/stEIP1559/transactionIntinsicBug_ParisFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,23 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP1559/transactionIntinsicBug_ParisFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stEIP1559/transactionIntinsicBug_ParisFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.exception_test
+@pytest.mark.pre_alloc_mutable
 def test_transaction_intinsic_bug_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Bug discovered on ropsten..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x91E0C3C68D9DE64B3299188625BEBD08C8B66D1C7E853E155F997C465E8F5F47
-    )
-    contract = Address("0x85b89db0e2aef2a23f50801209a3de4c65c58d9d")
+    """Bug discovered on ropsten https://github."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x2FAF094, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,21 +44,21 @@ def test_transaction_intinsic_bug_paris(
         gas_limit=71794957647893862,
     )
 
-    pre[sender] = Account(balance=0x2FAF094, nonce=1)
-    pre[contract] = Account(balance=10, nonce=0)
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=addr,
+        data=Bytes("00"),
         gas_limit=50000,
+        value=0x2DC6C14,
         max_fee_per_gas=1000,
         max_priority_fee_per_gas=20,
         nonce=1,
-        value=48000020,
+        access_list=[],
         error=TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
     )
 
-    post: dict = {}
+    post = {sender: Account(balance=0x2FAF094)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP1559/test_val_causes_oof.py b/tests/ported_static/stEIP1559/test_val_causes_oof.py
index 80a8a76454b..dfbb5a3e162 100644
--- a/tests/ported_static/stEIP1559/test_val_causes_oof.py
+++ b/tests/ported_static/stEIP1559/test_val_causes_oof.py
@@ -2,20 +2,24 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP1559/valCausesOOFFiller.yml
+state_tests/stEIP1559/valCausesOOFFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
-    Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
     TransactionException,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,136 +27,88 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP1559/valCausesOOFFiller.yml"],
+    ["state_tests/stEIP1559/valCausesOOFFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, tx_value, tx_error, expected_post",
+    "d, g, v",
     [
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            100000,
-            0,
-            None,
-            {
-                Address("0x71e12b76ab6be1efbc98ac17ebfe5faf488da45e"): Account(
-                    storage={1: 24743}
-                )
-            },
-            id="case0",
+            0,
+            0,
+            0,
+            id="d0-g0-v0",
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            100000,
+            0,
+            0,
             1,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            {},
-            id="case1",
+            id="d0-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            90000,
-            0,
-            None,
-            {
-                Address("0x71e12b76ab6be1efbc98ac17ebfe5faf488da45e"): Account(
-                    storage={1: 24743}
-                )
-            },
-            id="case2",
+            0,
+            1,
+            0,
+            id="d0-g1-v0",
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            90000,
-            1,
-            None,
-            {
-                Address("0x71e12b76ab6be1efbc98ac17ebfe5faf488da45e"): Account(
-                    storage={1: 24743}
-                )
-            },
-            id="case3",
+            0,
+            1,
+            1,
+            id="d0-g1-v1",
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            110000,
             0,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            {},
-            id="case4",
+            2,
+            0,
+            id="d0-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            110000,
+            0,
+            2,
             1,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            {},
-            id="case5",
+            id="d0-g2-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            100000,
-            0,
-            None,
-            {
-                Address("0x71e12b76ab6be1efbc98ac17ebfe5faf488da45e"): Account(
-                    storage={1: 24743, 2: 24743}
-                )
-            },
-            id="case6",
+            1,
+            0,
+            0,
+            id="d1-g0-v0",
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            100000,
             1,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            {},
-            id="case7",
+            0,
+            1,
+            id="d1-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            90000,
-            0,
-            None,
-            {
-                Address("0x71e12b76ab6be1efbc98ac17ebfe5faf488da45e"): Account(
-                    storage={1: 24743, 2: 24743}
-                )
-            },
-            id="case8",
+            1,
+            1,
+            0,
+            id="d1-g1-v0",
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            90000,
-            1,
-            None,
-            {
-                Address("0x71e12b76ab6be1efbc98ac17ebfe5faf488da45e"): Account(
-                    storage={1: 24743, 2: 24743}
-                )
-            },
-            id="case9",
+            1,
+            1,
+            1,
+            id="d1-g1-v1",
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            110000,
+            1,
+            2,
             0,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            {},
-            id="case10",
+            id="d1-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            110000,
             1,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            {},
-            id="case11",
+            2,
+            1,
+            id="d1-g2-v1",
             marks=pytest.mark.exception_test,
         ),
     ],
@@ -161,17 +117,14 @@
 def test_val_causes_oof(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    tx_value: int,
-    tx_error: object,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7608AB0A661408930040C5E3EB5B0C6520ACBB6CE5B28DDBE53676109E8EA24B
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5F5E100, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -182,8 +135,8 @@ def test_val_causes_oof(
         gas_limit=71794957647893862,
     )
 
-    pre[sender] = Account(balance=0x5F5E100, nonce=1)
-    # Source: Yul
+    # Source: yul
+    # london
     # {
     #     // This loop runs a number of times specified in the data,
     #     // so the gas cost depends on the data
@@ -191,36 +144,73 @@ def test_val_causes_oof(
     #        sstore(i, 0x60A7)
     #     }     // for loop
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x4)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0xC, condition=Op.GT(Op.DUP2, 0x0))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(key=Op.DUP2, value=0x60A7)
-            + Op.NOT(0x0)
-            + Op.ADD
-            + Op.JUMP(pc=0x3)
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x4)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xC, condition=Op.GT(Op.DUP2, 0x0))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(key=Op.DUP2, value=0x60A7)
+        + Op.NOT(0x0)
+        + Op.ADD
+        + Op.JUMP(pc=0x3),
         balance=0x5AF3107A4000,
         nonce=0,
-        address=Address("0x71e12b76ab6be1efbc98ac17ebfe5faf488da45e"),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": [0, 1], "value": 0},
+            "network": [">=Cancun"],
+            "result": {},
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": 1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INSUFFICIENT_ACCOUNT_FUNDS
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {},
+        },
+        {
+            "indexes": {"data": -1, "gas": 2, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INSUFFICIENT_ACCOUNT_FUNDS
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+    ]
+    tx_gas = [100000, 90000, 110000]
+    tx_value = [0, 1]
+    tx_access_lists: dict[int, list] = {
+        0: [],
+        1: [],
+    }
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
         max_fee_per_gas=1000,
+        max_priority_fee_per_gas=0,
         nonce=1,
-        value=tx_value,
-        error=tx_error,
+        access_list=tx_access_lists.get(d),
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP158Specific/__init__.py b/tests/ported_static/stEIP158Specific/__init__.py
index 248cb4571b0..2c8015fa59f 100644
--- a/tests/ported_static/stEIP158Specific/__init__.py
+++ b/tests/ported_static/stEIP158Specific/__init__.py
@@ -1 +1 @@
-"""Tests ported from stEIP158Specific."""
+"""Ported static tests: stEIP158Specific."""  # noqa: N999
diff --git a/tests/ported_static/stEIP158Specific/test_call_one_v_call_suicide.py b/tests/ported_static/stEIP158Specific/test_call_one_v_call_suicide.py
index 855b21c59b3..d99dcdf7185 100644
--- a/tests/ported_static/stEIP158Specific/test_call_one_v_call_suicide.py
+++ b/tests/ported_static/stEIP158Specific/test_call_one_v_call_suicide.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_one_v_call_suicide.
 
 Ported from:
-tests/static/state_tests/stEIP158Specific/CALL_OneVCallSuicideFiller.json
+state_tests/stEIP158Specific/CALL_OneVCallSuicideFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP158Specific/CALL_OneVCallSuicideFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP158Specific/CALL_OneVCallSuicideFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_call_one_v_call_suicide(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_call_one_v_call_suicide."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,47 +43,48 @@ def test_call_one_v_call_suicide(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xEA04224539257FBE043981AA6058FBC1D5E21B1A)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x79968a94dbedb20475585e9dd4dae6333add4c01"),  # noqa: E501
-    )
-    # Source: LLL
+    # Source: lll
     # { [0](GAS) (CALL 60000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 0 0 0) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0xEA60,
-                    address=0x79968A94DBEDB20475585E9DD4DAE6333ADD4C01,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0xEA60,
+                address=0x79968A94DBEDB20475585E9DD4DAE6333ADD4C01,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         balance=100,
         nonce=0,
-        address=Address("0xea04224539257fbe043981aa6058fbc1d5e21b1a"),  # noqa: E501
+        address=Address(0xEA04224539257FBE043981AA6058FBC1D5E21B1A),  # noqa: E501
+    )
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xEA04224539257FBE043981AA6058FBC1D5E21B1A
+        )
+        + Op.STOP,
+        nonce=0,
+        address=Address(0x79968A94DBEDB20475585E9DD4DAE6333ADD4C01),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={100: 14337}),
+        addr: Account(storage={}, balance=0),
+        target: Account(storage={100: 14337}, balance=100),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP158Specific/test_call_one_v_call_suicide2.py b/tests/ported_static/stEIP158Specific/test_call_one_v_call_suicide2.py
index 35f9a28e1fb..2c222ca68f4 100644
--- a/tests/ported_static/stEIP158Specific/test_call_one_v_call_suicide2.py
+++ b/tests/ported_static/stEIP158Specific/test_call_one_v_call_suicide2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_one_v_call_suicide2.
 
 Ported from:
-tests/static/state_tests/stEIP158Specific/CALL_OneVCallSuicide2Filler.json
+state_tests/stEIP158Specific/CALL_OneVCallSuicide2Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP158Specific/CALL_OneVCallSuicide2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP158Specific/CALL_OneVCallSuicide2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,12 +31,12 @@ def test_call_one_v_call_suicide2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_one_v_call_suicide2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr_2 = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    callee_1 = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,48 +47,51 @@ def test_call_one_v_call_suicide2(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xEB201D2887816E041F6E807E804F64F3A7A226FE)
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr_2] = Account(balance=0, nonce=1)
+    # Source: lll
+    # { (SELFDESTRUCT <eoa:0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b>) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xEB201D2887816E041F6E807E804F64F3A7A226FE
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x99378e0db04e57ae174ad69770e1b7a0aa805930"),  # noqa: E501
+        address=Address(0x99378E0DB04E57AE174AD69770E1B7A0AA805930),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [0](GAS) (CALL 60000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 0 0 0) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0xEA60,
-                    address=0x99378E0DB04E57AE174AD69770E1B7A0AA805930,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0xEA60,
+                address=0x99378E0DB04E57AE174AD69770E1B7A0AA805930,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         balance=100,
         nonce=0,
-        address=Address("0xea04224539257fbe043981aa6058fbc1d5e21b1a"),  # noqa: E501
+        address=Address(0xEA04224539257FBE043981AA6058FBC1D5E21B1A),  # noqa: E501
     )
-    pre[callee_1] = Account(balance=0, nonce=1)
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={100: 16937}),
+        addr: Account(storage={}, balance=0),
+        target: Account(storage={100: 16937}, balance=99),
+        addr_2: Account(balance=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP158Specific/test_call_to_empty_then_call_error_paris.py b/tests/ported_static/stEIP158Specific/test_call_to_empty_then_call_error_paris.py
index 887481a56a0..c0efd41acce 100644
--- a/tests/ported_static/stEIP158Specific/test_call_to_empty_then_call_error_paris.py
+++ b/tests/ported_static/stEIP158Specific/test_call_to_empty_then_call_error_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_to_empty_then_call_error_paris.
 
 Ported from:
-tests/static/state_tests/stEIP158Specific
-callToEmptyThenCallErrorParisFiller.json
+state_tests/stEIP158Specific/callToEmptyThenCallErrorParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP158Specific/callToEmptyThenCallErrorParisFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP158Specific/callToEmptyThenCallErrorParisFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,12 +30,9 @@ def test_call_to_empty_then_call_error_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_call_to_empty_then_call_error_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,49 +43,47 @@ def test_call_to_empty_then_call_error_paris(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    addr_2 = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
+    # { (GAS) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.GAS + Op.STOP,
+        nonce=0,
+    )
+    # Source: lll
     # { (CALL 0 <eoa:0xee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4> 0 0 0 0 0) (CALL 0 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.CALL(
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
                 gas=0x0,
-                address=0xAB4CDAE660B629C6F7BE5A12139558E6296AD0B5,
+                address=addr_2,
                 value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2fd4e62119e6702b1b340b14aab503af144d0da4"),  # noqa: E501
-    )
-    pre[callee] = Account(balance=10, nonce=0)
-    pre.deploy_contract(
-        code=Op.GAS + Op.STOP,
+        )
+        + Op.CALL(
+            gas=0x0,
+            address=addr,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xab4cdae660b629c6f7be5a12139558e6296ad0b5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post: dict = {}
+    post = {addr_2: Account(balance=10)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP158Specific/test_call_zero_v_call_suicide.py b/tests/ported_static/stEIP158Specific/test_call_zero_v_call_suicide.py
index 83d8ca18198..901902b9a5b 100644
--- a/tests/ported_static/stEIP158Specific/test_call_zero_v_call_suicide.py
+++ b/tests/ported_static/stEIP158Specific/test_call_zero_v_call_suicide.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_zero_v_call_suicide.
 
 Ported from:
-tests/static/state_tests/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json
+state_tests/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_call_zero_v_call_suicide(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_call_zero_v_call_suicide."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,46 +43,47 @@ def test_call_zero_v_call_suicide(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [0](GAS) (CALL 60000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=0xEA60,
-                    address=0x79968A94DBEDB20475585E9DD4DAE6333ADD4C01,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=0xEA60,
+                address=0x79968A94DBEDB20475585E9DD4DAE6333ADD4C01,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x61385ed1c4e08aa26be16da3851df1cc90ed2777"),  # noqa: E501
+        address=Address(0x61385ED1C4E08AA26BE16DA3851DF1CC90ED2777),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x61385ED1C4E08AA26BE16DA3851DF1CC90ED2777)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x61385ED1C4E08AA26BE16DA3851DF1CC90ED2777
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x79968a94dbedb20475585e9dd4dae6333add4c01"),  # noqa: E501
+        address=Address(0x79968A94DBEDB20475585E9DD4DAE6333ADD4C01),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={100: 7637}),
+        addr: Account(balance=0),
+        target: Account(storage={100: 7637}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP158Specific/test_exp_empty.py b/tests/ported_static/stEIP158Specific/test_exp_empty.py
index 874146b8c15..9b7b323744c 100644
--- a/tests/ported_static/stEIP158Specific/test_exp_empty.py
+++ b/tests/ported_static/stEIP158Specific/test_exp_empty.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_exp_empty.
 
 Ported from:
-tests/static/state_tests/stEIP158Specific/EXP_EmptyFiller.json
+state_tests/stEIP158Specific/EXP_EmptyFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP158Specific/EXP_EmptyFiller.json"],
+    ["state_tests/stEIP158Specific/EXP_EmptyFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_exp_empty(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_exp_empty."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,67 +43,62 @@ def test_exp_empty(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [0](GAS) [[1]](EXP 0 12)  [[2]](SUB @0 (GAS)) [0](GAS) [[3]](EXP 12 0) [[4]](SUB @0 (GAS)) [0](GAS) [[5]](EXP 0 0xffffffffffffffff) [[6]](SUB @0 (GAS)) [0](GAS) [[7]](EXP 0 0xffffffffffffffffffffffffffffffff) [[8]](SUB @0 (GAS)) [0](GAS) [[9]](EXP 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[10]](SUB @0 (GAS)) [0](GAS) [[11]](EXP 0xffffffffffffffff 0) [[12]](SUB @0 (GAS)) [0](GAS) [[13]](EXP 0xffffffffffffffffffffffffffffffff 0) [[14]](SUB @0 (GAS)) [0] (GAS) [[15]](EXP 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x1, value=Op.EXP(0x0, 0xC))
-            + Op.SSTORE(key=0x2, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x3, value=Op.EXP(0xC, 0x0))
-            + Op.SSTORE(key=0x4, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x5, value=Op.EXP(0x0, 0xFFFFFFFFFFFFFFFF))
-            + Op.SSTORE(key=0x6, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x7,
-                value=Op.EXP(0x0, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF),
-            )
-            + Op.SSTORE(key=0x8, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.EXP(
-                    0x0,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.SSTORE(key=0xA, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0xB, value=Op.EXP(0xFFFFFFFFFFFFFFFF, 0x0))
-            + Op.SSTORE(key=0xC, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0xD,
-                value=Op.EXP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 0x0),
-            )
-            + Op.SSTORE(key=0xE, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0xF,
-                value=Op.EXP(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x1, value=Op.EXP(0x0, 0xC))
+        + Op.SSTORE(key=0x2, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x3, value=Op.EXP(0xC, 0x0))
+        + Op.SSTORE(key=0x4, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x5, value=Op.EXP(0x0, 0xFFFFFFFFFFFFFFFF))
+        + Op.SSTORE(key=0x6, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x7, value=Op.EXP(0x0, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        )
+        + Op.SSTORE(key=0x8, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.EXP(
+                0x0,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.SSTORE(key=0xA, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0xB, value=Op.EXP(0xFFFFFFFFFFFFFFFF, 0x0))
+        + Op.SSTORE(key=0xC, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0xD, value=Op.EXP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 0x0)
+        )
+        + Op.SSTORE(key=0xE, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0xF,
+            value=Op.EXP(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8a3c9879fc69c8c45c1201c27da63312e9e9f6fe"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 2: 2280,
                 3: 1,
diff --git a/tests/ported_static/stEIP158Specific/test_extcodesize_to_epmty_paris.py b/tests/ported_static/stEIP158Specific/test_extcodesize_to_epmty_paris.py
index 7689794365f..35e01d26d30 100644
--- a/tests/ported_static/stEIP158Specific/test_extcodesize_to_epmty_paris.py
+++ b/tests/ported_static/stEIP158Specific/test_extcodesize_to_epmty_paris.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_extcodesize_to_epmty_paris.
 
 Ported from:
-tests/static/state_tests/stEIP158Specific/EXTCODESIZE_toEpmtyParisFiller.json
+state_tests/stEIP158Specific/EXTCODESIZE_toEpmtyParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP158Specific/EXTCODESIZE_toEpmtyParisFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP158Specific/EXTCODESIZE_toEpmtyParisFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,12 +30,9 @@ def test_extcodesize_to_epmty_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_extcodesize_to_epmty_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,35 +43,28 @@ def test_extcodesize_to_epmty_paris(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
     # { [0](GAS) [[1]] (EXTCODESIZE <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b>) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.EXTCODESIZE(
-                    address=0x76FAE819612A29489A1A43208613D8F8557B8898,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
-        storage={0x1: 0x600},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x1, value=Op.EXTCODESIZE(address=addr))
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
+        storage={1: 1536},
         nonce=0,
-        address=Address("0x6a7ca130ba6213231c23332fa5fcab8ccb85c04b"),  # noqa: E501
     )
-    pre[callee] = Account(balance=10, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={100: 7617}),
+        addr: Account(storage={}, code=b"", balance=10, nonce=0),
+        target: Account(storage={100: 7617}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP158Specific/test_extcodesize_to_non_existent.py b/tests/ported_static/stEIP158Specific/test_extcodesize_to_non_existent.py
index 123082fabfa..66b98387b28 100644
--- a/tests/ported_static/stEIP158Specific/test_extcodesize_to_non_existent.py
+++ b/tests/ported_static/stEIP158Specific/test_extcodesize_to_non_existent.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_extcodesize_to_non_existent.
 
 Ported from:
-tests/static/state_tests/stEIP158Specific/EXTCODESIZE_toNonExistentFiller.json
+state_tests/stEIP158Specific/EXTCODESIZE_toNonExistentFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP158Specific/EXTCODESIZE_toNonExistentFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP158Specific/EXTCODESIZE_toNonExistentFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,9 @@ def test_extcodesize_to_non_existent(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_extcodesize_to_non_existent."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,32 +48,34 @@ def test_extcodesize_to_non_existent(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [0](GAS) [[1]] (EXTCODESIZE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.EXTCODESIZE(
-                    address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.EXTCODESIZE(
+                address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={100: 4817}),
+        Address(
+            0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        ): Account.NONEXISTENT,
+        contract_0: Account(storage={100: 4817}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP158Specific/test_vitalik_transaction_test_paris.py b/tests/ported_static/stEIP158Specific/test_vitalik_transaction_test_paris.py
index fc849857e9e..0dd5b77613a 100644
--- a/tests/ported_static/stEIP158Specific/test_vitalik_transaction_test_paris.py
+++ b/tests/ported_static/stEIP158Specific/test_vitalik_transaction_test_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_vitalik_transaction_test_paris.
 
 Ported from:
-tests/static/state_tests/stEIP158Specific
-vitalikTransactionTestParisFiller.json
+state_tests/stEIP158Specific/vitalikTransactionTestParisFiller.json
 """
 
 import pytest
@@ -15,16 +14,16 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP158Specific/vitalikTransactionTestParisFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stEIP158Specific/vitalikTransactionTestParisFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,12 +31,12 @@ def test_vitalik_transaction_test_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_vitalik_transaction_test_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xEE098E6C2A43D9E2C04F08F0C3A87B0BA59079D4)
     sender = EOA(
         key=0xC85EF7D79691FE79573B1A7064C19C1A9819EBDBD1FAAAB1A8EC92344438AAF4
     )
-    contract = Address("0xee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -50,25 +49,125 @@ def test_vitalik_transaction_test_paris(
 
     pre[coinbase] = Account(balance=0, nonce=1)
     pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFF, nonce=335)
-    pre[contract] = Account(balance=10, nonce=0)
+    # Source: hex
+    # 0x
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=10,
+        nonce=0,
+        address=Address(0xEE098E6C2A43D9E2C04F08F0C3A87B0BA59079D4),  # noqa: E501
+    )
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "6000607f5359610043806100135939610056566c010000000000000000000000007fee09"  # noqa: E501
-            "8e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff61000080"  # noqa: E501
-            "61003f60003961003f565b6000f35b816000f0905050596100718061006c59396100dd56"  # noqa: E501
-            "61005f8061000e60003961006d566000603f5359610043806100135939610056566c0100"  # noqa: E501
-            "00000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d5353207"  # noqa: E501
-            "1d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050"  # noqa: E501
-            "fe5b6000f35b816000f0905060405260006000600060006000604051620249f0f1506100"  # noqa: E501
-            "0080610108600039610108565b6000f3"
-        ),
+        data=Op.MSTORE8(offset=0x7F, value=0x0)
+        + Op.MSIZE
+        + Op.PUSH2[0x43]
+        + Op.CODECOPY(
+            dest_offset=Op.MSIZE, offset=Op.PUSH2[0x13], size=Op.DUP1
+        )
+        + Op.JUMP(pc=Op.PUSH2[0x56])
+        + Op.SELFDESTRUCT(
+            address=Op.SDIV(
+                0xEE098E6C2A43D9E2C04F08F0C3A87B0BA59079D4D53532071D6CD0CB86FACD56,  # noqa: E501
+                0x1000000000000000000000000,
+            )
+        )
+        + Op.PUSH2[0x0]
+        + Op.CODECOPY(dest_offset=0x0, offset=Op.PUSH2[0x3F], size=Op.DUP1)
+        + Op.JUMP(pc=Op.PUSH2[0x3F])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.PUSH1[0x0]
+        + Op.CREATE
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.MSIZE
+        + Op.PUSH2[0x71]
+        + Op.CODECOPY(
+            dest_offset=Op.MSIZE, offset=Op.PUSH2[0x6C], size=Op.DUP1
+        )
+        + Op.JUMP(pc=Op.PUSH2[0xDD])
+        + Op.PUSH2[0x5F]
+        + Op.CODECOPY(dest_offset=0x0, offset=Op.PUSH2[0xE], size=Op.DUP1)
+        + Op.JUMP(pc=Op.PUSH2[0x6D])
+        + Op.MSTORE8(offset=0x3F, value=0x0)
+        + Op.MSIZE
+        + Op.PUSH2[0x43]
+        + Op.CODECOPY(
+            dest_offset=Op.MSIZE, offset=Op.PUSH2[0x13], size=Op.DUP1
+        )
+        + Op.JUMP(pc=Op.PUSH2[0x56])
+        + Op.SELFDESTRUCT(
+            address=Op.SDIV(
+                0xEE098E6C2A43D9E2C04F08F0C3A87B0BA59079D4D53532071D6CD0CB86FACD56,  # noqa: E501
+                0x1000000000000000000000000,
+            )
+        )
+        + Op.PUSH2[0x0]
+        + Op.CODECOPY(dest_offset=0x0, offset=Op.PUSH2[0x3F], size=Op.DUP1)
+        + Op.JUMP(pc=Op.PUSH2[0x3F])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.PUSH1[0x0]
+        + Op.CREATE
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.PUSH1[0x0]
+        + Op.CREATE
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x40]
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=0x249F0,
+                address=Op.MLOAD(offset=0x40),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH2[0x0]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x108, size=Op.DUP1)
+        + Op.JUMP(pc=0x108)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.RETURN,
         gas_limit=2097151,
         nonce=335,
     )
 
-    post: dict = {}
+    post = {
+        coinbase: Account(storage={}, code=b"", nonce=1),
+        sender: Account(storage={}, code=b"", nonce=336),
+        compute_create_address(address=sender, nonce=335): Account(
+            storage={}, code=b"", nonce=3
+        ),
+        Address(0x51F9D7F98E997BDD6BEBDE4C2DD27BE8C99303AA): Account(
+            storage={},
+            code=bytes.fromhex(
+                "6000603f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050fe"  # noqa: E501
+            ),
+            balance=0,
+            nonce=1,
+        ),
+        contract_0: Account(storage={}, code=b"", balance=10, nonce=0),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP2930/__init__.py b/tests/ported_static/stEIP2930/__init__.py
index 2177fb78aa5..b9bac4a2c8f 100644
--- a/tests/ported_static/stEIP2930/__init__.py
+++ b/tests/ported_static/stEIP2930/__init__.py
@@ -1 +1 @@
-"""Tests ported from stEIP2930."""
+"""Ported static tests: stEIP2930."""  # noqa: N999
diff --git a/tests/ported_static/stEIP2930/test_address_opcodes.py b/tests/ported_static/stEIP2930/test_address_opcodes.py
index e7881848d96..2461399d90c 100644
--- a/tests/ported_static/stEIP2930/test_address_opcodes.py
+++ b/tests/ported_static/stEIP2930/test_address_opcodes.py
@@ -2,21 +2,25 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP2930/addressOpcodesFiller.yml
+state_tests/stEIP2930/addressOpcodesFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     AccessList,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,873 +28,316 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP2930/addressOpcodesFiller.yml"],
+    ["state_tests/stEIP2930/addressOpcodesFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_access_list, expected_post",
+    "d, g, v",
     [
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xf00000000000000000000000000000000000f101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2597, 1: 97}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2597, 1: 97}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xf00000000000000000000000000000000000f101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2597, 1: 97}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="invalid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2597, 1: 97}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="invalid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xf00000000000000000000000000000000000f101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2597, 1: 97}
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2597, 1: 97}
-                )
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xf00000000000000000000000000000000000f101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2597, 1: 97}
-                )
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2597, 1: 97}
-                )
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001001"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001001"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            10,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            11,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            12,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xcccccccccccccccccccccccccccccccccccccccc"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            13,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            14,
+            0,
+            0,
+            id="invalid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001000"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            15,
+            0,
+            0,
+            id="invalid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            16,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000001"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            17,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            18,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001001"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            19,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001001"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            20,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            21,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            22,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xcccccccccccccccccccccccccccccccccccccccc"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            23,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            24,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001000"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            25,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            26,
+            0,
+            0,
+            id="invalid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000001"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            27,
+            0,
+            0,
+            id="invalid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001001"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            28,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            29,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001001"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            30,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001001"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            31,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            32,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            33,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xcccccccccccccccccccccccccccccccccccccccc"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            34,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            35,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001000"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            36,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            37,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000001"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            38,
+            0,
+            0,
+            id="invalid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            39,
+            0,
+            0,
+            id="invalid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            40,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            41,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xcccccccccccccccccccccccccccccccccccccccc"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            42,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            43,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001000"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            44,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            45,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000001"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            46,
+            0,
+            0,
+            id="valid",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001001"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 97, 1: 97}
-                )
-            },
+        pytest.param(
+            47,
+            0,
+            0,
+            id="valid",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_address_opcodes(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_access_list: list | None,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -901,153 +348,172 @@ def test_address_opcodes(
         gas_limit=71794957647893862,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=Op.PUSH2[0x11],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x0),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x18])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x20, value=0x1001)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x2A],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x1),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x2F])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x20, value=Op.ORIGIN)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x41],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x2),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x46])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x20, value=Op.CALLER)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x58],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x3),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x5D])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x20, value=Op.ADDRESS)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x6F],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x4),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x75])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x8D],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x20), 0x0),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xB6])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.BALANCE(address=Op.MLOAD(offset=0x20)))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x16),
-            )
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.BALANCE(address=Op.MLOAD(offset=0x20)))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x16),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xC8],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x20), 0x1),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xF1])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.EXTCODESIZE(address=Op.MLOAD(offset=0x20)))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x16),
-            )
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.EXTCODESIZE(address=Op.MLOAD(offset=0x20)))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x16),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x103,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x20), 0x2),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x12C)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.EXTCODEHASH(address=Op.MLOAD(offset=0x20)))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x16),
-            )
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.EXTCODEHASH(address=Op.MLOAD(offset=0x20)))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x16),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x13E,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x20), 0x3),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x17A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x100, value=0x6A5)
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.EXTCODECOPY(
-                address=Op.MLOAD(offset=0x20),
-                dest_offset=0x100,
-                offset=0x0,
-                size=0x20,
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x20),
-            )
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.EXTCODECOPY(
-                address=Op.MLOAD(offset=0x20),
-                dest_offset=0x100,
-                offset=0x0,
-                size=0x20,
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x20),
-            )
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {
+    #    (def 'acctType  $0)   ; type of account we handle
+    #    (def 'opcode $0x20)   ; the opcode we are dealing with
+    #
+    #    (def 'acct 0x20)
+    #
+    #    (def 'NOP 0)
+    #
+    #
+    #    ; the type of account we handle
+    #
+    #    ; unrelated account
+    #    (if (= acctType 0) [acct] 0x1001 NOP)
+    #
+    #    ; transaction sender
+    #    (if (= acctType 1) [acct] (origin) NOP)
+    #
+    #    ; the contract that called us
+    #    (if (= acctType 2) [acct] (caller) NOP)
+    #
+    #    ; our own contract
+    #    (if (= acctType 3) [acct] (address) NOP)
+    #
+    #    ; a precompile
+    #    (if (= acctType 4) [acct] 0x0001 NOP)
+    #
+    #
+    #    [0] @0    ; Just to disable the first use of memory cost
+    #
+    #    (if (= opcode 0) {
+    # ... (47 more lines)
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=Op.PUSH2[0x11],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x0),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x18])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x20, value=0x1001)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x2A],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x1),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x2F])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x20, value=Op.ORIGIN)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x41],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x2),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x46])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x20, value=Op.CALLER)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x58],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x3),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x5D])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x20, value=Op.ADDRESS)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x6F],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x4),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x75])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x8D],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x20), 0x0),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xB6])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.BALANCE(address=Op.MLOAD(offset=0x20)))
+        + Op.SSTORE(
+            key=0x0, value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x16)
+        )
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.BALANCE(address=Op.MLOAD(offset=0x20)))
+        + Op.SSTORE(
+            key=0x1, value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x16)
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xC8],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x20), 0x1),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xF1])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.EXTCODESIZE(address=Op.MLOAD(offset=0x20)))
+        + Op.SSTORE(
+            key=0x0, value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x16)
+        )
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.EXTCODESIZE(address=Op.MLOAD(offset=0x20)))
+        + Op.SSTORE(
+            key=0x1, value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x16)
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x103, condition=Op.EQ(Op.CALLDATALOAD(offset=0x20), 0x2)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x12C)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.EXTCODEHASH(address=Op.MLOAD(offset=0x20)))
+        + Op.SSTORE(
+            key=0x0, value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x16)
+        )
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.EXTCODEHASH(address=Op.MLOAD(offset=0x20)))
+        + Op.SSTORE(
+            key=0x1, value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x16)
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x13E, condition=Op.EQ(Op.CALLDATALOAD(offset=0x20), 0x3)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x17A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x100, value=0x6A5)
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.EXTCODECOPY(
+            address=Op.MLOAD(offset=0x20),
+            dest_offset=0x100,
+            offset=0x0,
+            size=0x20,
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x20)
+        )
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.EXTCODECOPY(
+            address=Op.MLOAD(offset=0x20),
+            dest_offset=0x100,
+            offset=0x0,
+            size=0x20,
+        )
+        + Op.SSTORE(
+            key=0x1, value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x20)
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # {
     #     ; relay the parameters
     #     [0x100] $4
@@ -1058,41 +524,511 @@ def test_address_opcodes(
     #     [[0]] @0x00
     #     [[1]] @0x20
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x100, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0x1000,
-                    value=0x0,
-                    args_offset=0x100,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x100, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0x1000,
+                value=0x0,
+                args_offset=0x100,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [
+                    0,
+                    1,
+                    4,
+                    5,
+                    6,
+                    7,
+                    8,
+                    9,
+                    10,
+                    11,
+                    12,
+                    13,
+                    16,
+                    17,
+                    18,
+                    19,
+                    20,
+                    21,
+                    22,
+                    23,
+                    24,
+                    25,
+                    28,
+                    29,
+                    30,
+                    31,
+                    32,
+                    33,
+                    34,
+                    35,
+                    36,
+                    37,
+                    40,
+                    41,
+                    42,
+                    43,
+                    44,
+                    45,
+                    46,
+                    47,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 97, 1: 97})},
+        },
+        {
+            "indexes": {
+                "data": [2, 3, 14, 15, 26, 27, 38, 39],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 2597, 1: 97, 2: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("1a8451e6") + Hash(0x0) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x0) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x0) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x0) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x0) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x0) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x0) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x0) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x0) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x0) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x0) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x0) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x0) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(0x0) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(0x0) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(0x0) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0x3),
+    ]
+    tx_gas = [16777216]
+    tx_value = [100000]
+    tx_access_lists: dict[int, list] = {
+        0: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000001001),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        1: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000001001),
+                storage_keys=[],
+            ),
+        ],
+        2: [],
+        3: [
+            AccessList(
+                address=Address(0xF00000000000000000000000000000000000F101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        4: [
+            AccessList(
+                address=sender,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        5: [],
+        6: [
+            AccessList(
+                address=contract_1,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        7: [],
+        8: [
+            AccessList(
+                address=contract_0,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        9: [],
+        10: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000001),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        11: [],
+        12: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000001001),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        13: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000001001),
+                storage_keys=[],
+            ),
+        ],
+        14: [],
+        15: [
+            AccessList(
+                address=Address(0xF00000000000000000000000000000000000F101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        16: [
+            AccessList(
+                address=sender,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        17: [],
+        18: [
+            AccessList(
+                address=contract_1,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        19: [],
+        20: [
+            AccessList(
+                address=contract_0,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        21: [],
+        22: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000001),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        23: [],
+        24: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000001001),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        25: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000001001),
+                storage_keys=[],
+            ),
+        ],
+        26: [],
+        27: [
+            AccessList(
+                address=Address(0xF00000000000000000000000000000000000F101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        28: [
+            AccessList(
+                address=sender,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        29: [],
+        30: [
+            AccessList(
+                address=contract_1,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        31: [],
+        32: [
+            AccessList(
+                address=contract_0,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        33: [],
+        34: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000001),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        35: [],
+        36: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000001001),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        37: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000001001),
+                storage_keys=[],
+            ),
+        ],
+        38: [],
+        39: [
+            AccessList(
+                address=Address(0xF00000000000000000000000000000000000F101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        40: [
+            AccessList(
+                address=sender,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        41: [],
+        42: [
+            AccessList(
+                address=contract_1,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        43: [],
+        44: [
+            AccessList(
+                address=contract_0,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        45: [],
+        46: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000001),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        47: [],
+    }
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=100000,
-        access_list=tx_access_list,
+        to=contract_1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        access_list=tx_access_lists.get(d),
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP2930/test_coinbase_t01.py b/tests/ported_static/stEIP2930/test_coinbase_t01.py
index 7705e6c3522..62e00904240 100644
--- a/tests/ported_static/stEIP2930/test_coinbase_t01.py
+++ b/tests/ported_static/stEIP2930/test_coinbase_t01.py
@@ -2,20 +2,25 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP2930/coinbaseT01Filler.yml
+state_tests/stEIP2930/coinbaseT01Filler.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     AccessList,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,65 +28,44 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP2930/coinbaseT01Filler.yml"],
+    ["state_tests/stEIP2930/coinbaseT01Filler.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_access_list, expected_post",
+    "d, g, v",
     [
-        (
-            None,
-            {
-                Address("0x30873f83c35401e315e6e5994c012f1ee8119585"): Account(
-                    storage={0: 6800}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="T0",
         ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x7704d8a022a1ba8f3539fc82c7d7fb065abc0df3"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            {
-                Address("0x30873f83c35401e315e6e5994c012f1ee8119585"): Account(
-                    storage={0: 6800}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="T1baseInList",
         ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x000000000000000000000000000000000000ba5a"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            {
-                Address("0x30873f83c35401e315e6e5994c012f1ee8119585"): Account(
-                    storage={0: 6800}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="T1baseNotInList",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_coinbase_t01(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_access_list: list | None,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x7704d8a022a1ba8f3539fc82c7d7fb065abc0df3")
-    sender = EOA(
-        key=0xDE0C95357363DA5C1C5A73BD7C2781CA5C9FECC1014103B5E1D1E990AE8208EC
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x7704D8A022A1BA8F3539FC82C7D7FB065ABC0DF3)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -92,7 +76,9 @@ def test_coinbase_t01(
         gas_limit=71794957647893862,
     )
 
-    # Source: Yul
+    pre[coinbase] = Account(balance=0, nonce=1)
+    # Source: yul
+    # berlin
     # {
     #   mstore(0, gas())
     #   pop(call(gas(), <eoa:0x000000000000000000000000000000000000ba5e>, 1000000, 0, 0, 0, 0))  # noqa: E501
@@ -101,48 +87,76 @@ def test_coinbase_t01(
     #   // The 24 is the cost of twi gas(), seven pushes(), a pop(), and an mstore()  # noqa: E501
     #   sstore(0, sub(sub(mload(0), mload(0x20)),33))
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0x7704D8A022A1BA8F3539FC82C7D7FB065ABC0DF3,
-                    value=0xF4240,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)),
-                    0x21,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=coinbase,
+                value=0xF4240,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)), 0x21
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
-        address=Address("0x30873f83c35401e315e6e5994c012f1ee8119585"),  # noqa: E501
+        nonce=1,
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 6800})},
+        },
+        {
+            "indexes": {"data": [0, 2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 6800})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x0),
+    ]
+    tx_gas = [16777216]
+    tx_access_lists: dict[int, list] = {
+        1: [
+            AccessList(
+                address=coinbase,
+                storage_keys=[],
+            ),
+        ],
+        2: [
+            AccessList(
+                address=Address(0x000000000000000000000000000000000000BA5A),
+                storage_keys=[],
+            ),
+        ],
+    }
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "693c61390000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-        ),
-        gas_limit=16777216,
-        gas_price=1000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
-        access_list=tx_access_list,
+        gas_price=1000,
+        access_list=tx_access_lists.get(d),
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP2930/test_coinbase_t2.py b/tests/ported_static/stEIP2930/test_coinbase_t2.py
index 42506971fc1..22716cfa65b 100644
--- a/tests/ported_static/stEIP2930/test_coinbase_t2.py
+++ b/tests/ported_static/stEIP2930/test_coinbase_t2.py
@@ -2,20 +2,25 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP2930/coinbaseT2Filler.yml
+state_tests/stEIP2930/coinbaseT2Filler.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     AccessList,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,38 +28,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP2930/coinbaseT2Filler.yml"],
+    ["state_tests/stEIP2930/coinbaseT2Filler.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_access_list",
+    "d, g, v",
     [
-        [
-            AccessList(
-                address=Address("0x7704d8a022a1ba8f3539fc82c7d7fb065abc0df3"),
-                storage_keys=[],
-            )
-        ],
-        [
-            AccessList(
-                address=Address("0x000000000000000000000000000000000000ba5a"),
-                storage_keys=[],
-            )
-        ],
+        pytest.param(
+            0,
+            0,
+            0,
+            id="T2baseInList",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="T2baseNotInList",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_coinbase_t2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_access_list: list | None,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x7704d8a022a1ba8f3539fc82c7d7fb065abc0df3")
-    sender = EOA(
-        key=0xDE0C95357363DA5C1C5A73BD7C2781CA5C9FECC1014103B5E1D1E990AE8208EC
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x7704D8A022A1BA8F3539FC82C7D7FB065ABC0DF3)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -65,7 +70,9 @@ def test_coinbase_t2(
         gas_limit=71794957647893862,
     )
 
-    # Source: Yul
+    pre[coinbase] = Account(balance=0, nonce=1)
+    # Source: yul
+    # berlin
     # {
     #   mstore(0, gas())
     #   pop(call(gas(), <eoa:0x000000000000000000000000000000000000ba5e>, 1000000, 0, 0, 0, 0))  # noqa: E501
@@ -74,51 +81,76 @@ def test_coinbase_t2(
     #   // The 24 is the cost of twi gas(), seven pushes(), a pop(), and an mstore()  # noqa: E501
     #   sstore(0, sub(sub(mload(0), mload(0x20)),33))
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0x7704D8A022A1BA8F3539FC82C7D7FB065ABC0DF3,
-                    value=0xF4240,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)),
-                    0x21,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=coinbase,
+                value=0xF4240,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)), 0x21
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
-        address=Address("0x30873f83c35401e315e6e5994c012f1ee8119585"),  # noqa: E501
+        nonce=1,
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 6800})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 6800})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x0),
+    ]
+    tx_gas = [16777216]
+    tx_access_lists: dict[int, list] = {
+        0: [
+            AccessList(
+                address=coinbase,
+                storage_keys=[],
+            ),
+        ],
+        1: [
+            AccessList(
+                address=Address(0x000000000000000000000000000000000000BA5A),
+                storage_keys=[],
+            ),
+        ],
+    }
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "693c61390000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-        ),
-        gas_limit=16777216,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         max_fee_per_gas=10000,
         max_priority_fee_per_gas=100,
         nonce=1,
-        access_list=tx_access_list,
+        access_list=tx_access_lists.get(d),
+        error=_exc,
     )
 
-    post = {
-        contract: Account(storage={0: 6800}),
-    }
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP2930/test_manual_create.py b/tests/ported_static/stEIP2930/test_manual_create.py
index ba4b2ca2e7a..057b623c7e0 100644
--- a/tests/ported_static/stEIP2930/test_manual_create.py
+++ b/tests/ported_static/stEIP2930/test_manual_create.py
@@ -2,7 +2,7 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP2930/manualCreateFiller.yml
+state_tests/stEIP2930/manualCreateFiller.yml
 """
 
 import pytest
@@ -16,88 +16,56 @@
     Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP2930/manualCreateFiller.yml"],
+    ["state_tests/stEIP2930/manualCreateFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_access_list, expected_post",
+    "d, g, v",
     [
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0xec0e71ad0a90ffe1909d27dac207f7680abba42d"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"): Account(
-                    storage={0: 22108, 1: 106}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="allBad",
         ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000100"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"): Account(
-                    storage={0: 22108, 1: 106}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="addrGoodCellBad",
         ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0xec0e71ad0a90ffe1909d27dac207f7680abba42d"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"): Account(
-                    storage={0: 20008, 1: 106}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="allGood",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_manual_create(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_access_list: list | None,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -113,15 +81,106 @@ def test_manual_create(
 
     pre[sender] = Account(balance=0x1000000000000000000, nonce=1)
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=sender, nonce=1): Account(
+                    storage={0: 20008, 1: 106}
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [0, 1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=sender, nonce=1): Account(
+                    storage={0: 22108, 1: 106}
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.GAS
+        + Op.POP(Op.BALANCE(address=Op.ADDRESS))
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SSTORE(key=0x1, value=Op.SUB)
+        + Op.GAS
+        + Op.SSTORE(key=0x0, value=0xFF)
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SSTORE(key=0x0, value=Op.SUB)
+        + Op.STOP,
+        Op.GAS
+        + Op.POP(Op.BALANCE(address=Op.ADDRESS))
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SSTORE(key=0x1, value=Op.SUB)
+        + Op.GAS
+        + Op.SSTORE(key=0x0, value=0xFF)
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SSTORE(key=0x0, value=Op.SUB)
+        + Op.STOP,
+        Op.GAS
+        + Op.POP(Op.BALANCE(address=Op.ADDRESS))
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SSTORE(key=0x1, value=Op.SUB)
+        + Op.GAS
+        + Op.SSTORE(key=0x0, value=0xFF)
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SSTORE(key=0x0, value=Op.SUB)
+        + Op.STOP,
+    ]
+    tx_gas = [400000]
+    tx_access_lists: dict[int, list] = {
+        0: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000100),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        1: [
+            AccessList(
+                address=Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        2: [
+            AccessList(
+                address=Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+    }
+
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex("5a3031505a90036001555a60ff6000555a900360005500"),
-        gas_limit=400000,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
-        access_list=tx_access_list,
+        access_list=tx_access_lists.get(d),
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP2930/test_storage_costs.py b/tests/ported_static/stEIP2930/test_storage_costs.py
index 99cc39b97c9..2c5f0f91686 100644
--- a/tests/ported_static/stEIP2930/test_storage_costs.py
+++ b/tests/ported_static/stEIP2930/test_storage_costs.py
@@ -2,21 +2,25 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP2930/storageCostsFiller.yml
+state_tests/stEIP2930/storageCostsFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     AccessList,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,1208 +28,253 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP2930/storageCostsFiller.yml"],
+    ["state_tests/stEIP2930/storageCostsFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_access_list, expected_post",
+    "d, g, v",
     [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001002"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={1: 2903}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="declaredKeyWrite",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001005"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001005"): Account(
-                    storage={1: 103}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="declaredKeyRead",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001004"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743, 1: 103}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="declaredKeyDel",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001001"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={1: 100}
-                ),
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="declaredKeyUpdate",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001021"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001021"): Account(
-                    storage={1: 97}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="declaredKeyNOP",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000011",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001011"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001011"): Account(
-                    storage={0: 24743, 1: 100}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="declaredKeyNOP0",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001003"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 48879, 1: 2903}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="undeclaredKeyWrite",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x00000000000000000000000000000000000060a7"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000fffffad"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000000ad"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000123214342ad"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000deadbeef"  # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001000"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000fffff"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000123214342"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000deadbeef"  # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000010000000000100"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000fffffbc"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000000bc"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000123214342bc"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000deadbeefbc"  # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0xffffffffffffffffffffffffffffffffffffffff"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000fffffbc"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000000bc"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000123214342bc"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000deadbeefbc"  # noqa: E501
-                        ),
-                        Hash(
-                            "0xdeadbeef12345678deadbeef12345678deadbeef12345678deadbeef12345678"  # noqa: E501
-                        ),
-                        Hash(
-                            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-                        ),
-                    ],
-                ),
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2, 1: 20003}
-                ),
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="undeclaredKeyRead",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001000"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2, 1: 20003}
-                ),
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="undeclaredKeyDel",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001020"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001020"): Account(
-                    storage={0: 2, 1: 20000}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="undeclaredKeyUpdate",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001010"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={0: 2, 1: 103}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            10,
+            0,
+            0,
+            id="undeclaredKeyNOP",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xcccccccccccccccccccccccccccccccccccccccc"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000002"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 100, 2: 20000, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            11,
+            0,
+            0,
+            id="undeclaredKeyNOP0",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xf000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={1: 5003}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            12,
+            0,
+            0,
+            id="undeclaredKeyWrite",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            None,
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={1: 5003}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            13,
+            0,
+            0,
+            id="undeclaredKeyRead",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001002"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={1: 5003}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            14,
+            0,
+            0,
+            id="undeclaredKeyDel",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xf000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743, 1: 2203}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            15,
+            0,
+            0,
+            id="undeclaredKeyUpdate",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            None,
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743, 1: 2203}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            16,
+            0,
+            0,
+            id="undeclaredKeyNOP",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xf000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001005"): Account(
-                    storage={1: 2203}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            17,
+            0,
+            0,
+            id="undeclaredKeyNOP0",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            None,
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001005"): Account(
-                    storage={1: 2203}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            18,
+            0,
+            0,
+            id="undeclaredKeyWrite",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001005"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001005"): Account(
-                    storage={1: 2203}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            19,
+            0,
+            0,
+            id="undeclaredKeyRead",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001004"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743, 1: 2203}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            20,
+            0,
+            0,
+            id="undeclaredKeyDel",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xf000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={1: 2100}
-                ),
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            21,
+            0,
+            0,
+            id="undeclaredKeyUpdate",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            None,
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={1: 2100}
-                ),
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            22,
+            0,
+            0,
+            id="undeclaredKeyNOP",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001001"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001001"): Account(
-                    storage={1: 2100}
-                ),
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            23,
+            0,
+            0,
+            id="undeclaredKeyNOP0",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001021"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001021"): Account(
-                    storage={1: 97}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            24,
+            0,
+            0,
+            id="declaredKeyWrite_postSSTORE",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000011",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001011"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001011"): Account(
-                    storage={0: 24743, 1: 100}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            25,
+            0,
+            0,
+            id="undeclaredKeyWrite_postSSTORE",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xf000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 48879, 1: 5003}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            26,
+            0,
+            0,
+            id="declaredKeyRead_postSSTORE",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            None,
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 48879, 1: 5003}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            27,
+            0,
+            0,
+            id="undeclaredKeyRead_postSSTORE",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001003"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 48879, 1: 5003}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            28,
+            0,
+            0,
+            id="declaredKeyWrite_postSLOAD",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xf000000000000000000000000000000000000100"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2, 1: 22103}
-                ),
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            29,
+            0,
+            0,
+            id="undeclaredKeyWrite_postSLOAD",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            None,
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2, 1: 22103}
-                ),
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            30,
+            0,
+            0,
+            id="declaredKeyRead_postSLOAD",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001000"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2, 1: 22103}
-                ),
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            31,
+            0,
+            0,
+            id="undeclaredKeyRead_postSLOAD",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001020"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001020"): Account(
-                    storage={0: 2, 1: 20000}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            32,
+            0,
+            0,
+            id="declaredTo",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001010"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={0: 2, 1: 103}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            33,
+            0,
+            0,
+            id="undeclaredTo",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xcccccccccccccccccccccccccccccccccccccccc"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f001"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f002"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f0a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            34,
+            0,
+            0,
+            id="undeclaredTo",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xcccccccccccccccccccccccccccccccccc000000"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000002"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001004"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
-                ),
-            },
+        pytest.param(
+            35,
+            0,
+            0,
+            id="declaredKeyWrite",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_storage_costs(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_access_list: list | None,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001010)
+    contract_7 = Address(0x0000000000000000000000000000000000001011)
+    contract_8 = Address(0x0000000000000000000000000000000000001020)
+    contract_9 = Address(0x0000000000000000000000000000000000001021)
+    contract_10 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -1236,166 +285,311 @@ def test_storage_costs(
         gas_limit=71794957647893862,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0x2)
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: lll
+    # {
+    #  ; Write to @@0, and see how much gas that cost. It should
+    #  ; cost more when it is not declared storage
+    #    [0]   (gas)
+    #   [[0]]  0x02
+    #    [0]   (- @0 (gas) 17)
+    #   [[1]] @0
+    #
+    #  ; The 17 is the cost of the extra opcodes:
+    #  ; PUSH1 0x00, MSTORE
+    #  ; PUSH1 0x02, PUSH1 0x00, (and then comes the SSTORE we are measuring)
+    #  ; GAS
+    #
+    #  ; If the storage cell is declared the cost in @@1 should be 20003
+    #  ; If the storage cell is not declared the cost    should be 22103
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.SLOAD(key=0x0))
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x13),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: lll
+    # {
+    #  ; Read @@0, and see how much gas that cost. It should
+    #  ; cost more when it is not declared storage
+    #    [0]   (gas)
+    #    @@0
+    #    [0]   (- @0 (gas) 19)
+    #   [[1]] @0
+    #
+    #  ; If the storage cell is declared the cost in @@1 should be  100
+    #  ; If the storage cell is not declared the cost    should be 2100
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.SLOAD(key=0x0))
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x13),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
+    # Source: lll
+    # {
+    #  ; Write to @@0, and see how much gas that cost. It should
+    #  ; cost more when it is not declared storage
+    #    [0]   (gas)
+    #   [[0]]  0x00
+    #    [0]   (- @0 (gas) 17)
+    #   [[1]] @0
+    #
+    #  ; The 17 is the cost of the extra opcodes:
+    #  ; PUSH1 0x00, MSTORE
+    #  ; PUSH1 0x02, PUSH1 0x00, (and then comes the SSTORE we are measuring)
+    #  ; GAS
+    #
+    #  ; If the storage cell is declared the cost in @@1 should be 2903
+    #  ; If the storage cell is not declared the cost    should be 5003
+    #  ;
+    #  ; The refund for freeing memory happens at the end of the transaction,
+    #  ; so we don't see it
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 24743},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0xBEEF)
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
+    # Source: lll
+    # {
+    #  ; Write to @@0, and see how much gas that cost. It should
+    #  ; cost more when it is not declared storage
+    #    [0]   (gas)
+    #   [[0]]  0xBEEF
+    #    [0]   (- @0 (gas) 17)
+    #   [[1]] @0
+    #
+    #  ; The 17 is the cost of the extra opcodes:
+    #  ; PUSH1 0x00, MSTORE
+    #  ; PUSH1 0x02, PUSH1 0x00, (and then comes the SSTORE we are measuring)
+    #  ; GAS
+    #
+    #  ; If the storage cell is declared the cost in @@1 should be  103
+    #  ; If the storage cell is not declared the cost    should be 2203
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0xBEEF)
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 24743},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0x60A7)
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
+    # Source: lll
+    # {
+    #  ; Write to @@0, and see how much gas that cost. It should
+    #  ; cost more when it is not declared storage
+    #    [0]   (gas)
+    #   [[0]]  0x60A7
+    #    [0]   (- @0 (gas) 17)
+    #   [[1]] @0
+    #
+    #  ; The 17 is the cost of the extra opcodes:
+    #  ; PUSH1 0x00, MSTORE
+    #  ; PUSH1 0x02, PUSH1 0x00, (and then comes the SSTORE we are measuring)
+    #  ; GAS
+    #
+    #  ; This costs 103, regadless of whether it is declared or not
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0x60A7)
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 24743},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0x0},
+    # Source: lll
+    # {
+    #  ; Write to @@0, and see how much gas that cost. It should
+    #  ; cost more when it is not declared storage
+    #    [0]   (gas)
+    #   [[0]]  0x00
+    #    [0]   (- @0 (gas) 17)
+    #   [[1]] @0
+    #
+    #  ; The 17 is the cost of the extra opcodes:
+    #  ; PUSH1 0x00, MSTORE
+    #  ; PUSH1 0x02, PUSH1 0x00, (and then comes the SSTORE we are measuring)
+    #  ; GAS
+    #
+    #  ; This costs 103, regadless of whether it is declared or not
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 0},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x60A7)
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0x2)
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: lll
+    # {
+    #
+    #   [[0]] 0x60A7
+    #
+    #  ; Write to @@0, and see how much gas that cost. It should
+    #  ; cost more when it is not declared storage
+    #    [0]   (gas)
+    #   [[0]]  0x02
+    #    [0]   (- @0 (gas) 17)
+    #   [[1]] @0
+    #
+    #  ; The 17 is the cost of the extra opcodes:
+    #  ; PUSH1 0x00, MSTORE
+    #  ; PUSH1 0x02, PUSH1 0x00, (and then comes the SSTORE we are measuring)
+    #  ; GAS
+    #
+    #  ; Since this is second access, it will cost 103
+    #  ; regardless of whether it was declared or not
+    #
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x60A7)
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001010"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001010),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x60A7)
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.SLOAD(key=0x0))
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x13),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: lll
+    # {
+    #   [[0]] 0x60A7
+    #
+    #  ; Read @@0, and see how much gas that cost. It should
+    #  ; cost more when it is not declared storage
+    #    [0]   (gas)
+    #    @@0
+    #    [0]   (- @0 (gas) 19)
+    #   [[1]] @0
+    #
+    #  ; Since this is second access, it will cost 100
+    #  ; regardless of whether it was declared or not
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x60A7)
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.SLOAD(key=0x0))
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x13),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001011"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001011),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x20, value=Op.SLOAD(key=0x0))
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0x2)
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: lll
+    # {
+    #   [0x20] @@0
+    #
+    #  ; Write to @@0, and see how much gas that cost. It should
+    #  ; cost more when it is not declared storage
+    #    [0]   (gas)
+    #   [[0]]  0x02
+    #    [0]   (- @0 (gas) 17)
+    #   [[1]] @0
+    #
+    #  ; The 17 is the cost of the extra opcodes:
+    #  ; PUSH1 0x00, MSTORE
+    #  ; PUSH1 0x02, PUSH1 0x00, (and then comes the SSTORE we are measuring)
+    #  ; GAS
+    #
+    #  ; Since this is second access, it will cost 20k
+    #  ; regardless of whether it was declared or not
+    #
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x20, value=Op.SLOAD(key=0x0))
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001020"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001020),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x20, value=Op.SLOAD(key=0x0))
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.SLOAD(key=0x0))
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x13),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: lll
+    # {
+    #   [0x20] @@0
+    #
+    #  ; Read @@0, and see how much gas that cost.
+    #    [0]   (gas)
+    #    @@0
+    #    [0]   (- @0 (gas) 19)
+    #   [[1]] @0
+    #
+    #  ; Since this is second access, it will cost 97
+    #  ; regardless of whether it was declared or not
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x20, value=Op.SLOAD(key=0x0))
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.SLOAD(key=0x0))
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x13),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001021"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001021),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { ; TO_ADDR_VALID   TO_ADDR_INVALID_ADDR    TO_ADDR_INVALID_CELL
     #   ; Call a different contract
     #   (call (gas) (+ 0x1000 $4) 0 0 0 0 0)
@@ -1421,52 +615,589 @@ def test_storage_costs(
     #
     #
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(Op.SLOAD(key=0x60A7))
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x13),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0x2)
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x60A7: 0xDEAD},
+        )
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(Op.SLOAD(key=0x60A7))
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x13),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
+        )
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={24743: 57005},
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 35], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 2, 1: 20003})},
+        },
+        {
+            "indexes": {"data": [6, 12, 18], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 2, 1: 22103})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 48879, 1: 2903})},
+        },
+        {
+            "indexes": {"data": [9, 15, 21], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 48879, 1: 5003})},
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_4: Account(storage={0: 24743, 1: 103})},
+        },
+        {
+            "indexes": {"data": [10, 16, 22], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_4: Account(storage={0: 24743, 1: 2203})},
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_5: Account(storage={1: 103})},
+        },
+        {
+            "indexes": {"data": [11, 17, 23], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_5: Account(storage={1: 2203})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 0, 1: 2903})},
+        },
+        {
+            "indexes": {"data": [8, 14, 20], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 0, 1: 5003})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={1: 100})},
+        },
+        {
+            "indexes": {"data": [7, 13, 19], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={1: 2100})},
+        },
+        {
+            "indexes": {"data": [24, 25], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_6: Account(storage={0: 2, 1: 103})},
+        },
+        {
+            "indexes": {"data": [26, 27], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_7: Account(storage={0: 24743, 1: 100})},
+        },
+        {
+            "indexes": {"data": [28, 29], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_8: Account(storage={0: 2, 1: 20000})},
+        },
+        {
+            "indexes": {"data": [30, 31], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_9: Account(storage={1: 97})},
+        },
+        {
+            "indexes": {"data": [32], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_10: Account(
+                    storage={0: 2, 1: 100, 2: 20000, 24743: 57005}
+                )
+            },
+        },
+        {
+            "indexes": {"data": [33, 34], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_10: Account(
+                    storage={0: 2, 1: 2100, 2: 22100, 24743: 57005}
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x10),
+        Bytes("693c6139") + Hash(0x10),
+        Bytes("693c6139") + Hash(0x11),
+        Bytes("693c6139") + Hash(0x11),
+        Bytes("693c6139") + Hash(0x20),
+        Bytes("693c6139") + Hash(0x20),
+        Bytes("693c6139") + Hash(0x21),
+        Bytes("693c6139") + Hash(0x21),
+        Bytes("693c6139") + Hash(0xFFF),
+        Bytes("693c6139") + Hash(0xFFF),
+        Bytes("693c6139") + Hash(0xFFF),
+        Bytes("693c6139") + Hash(0x0),
+    ]
+    tx_gas = [400000]
+    tx_value = [100000]
+    tx_access_lists: dict[int, list] = {
+        0: [
+            AccessList(
+                address=contract_0,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        1: [
+            AccessList(
+                address=contract_1,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        2: [
+            AccessList(
+                address=contract_2,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        3: [
+            AccessList(
+                address=contract_3,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        4: [
+            AccessList(
+                address=contract_4,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        5: [
+            AccessList(
+                address=contract_5,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        6: [
+            AccessList(
+                address=contract_0,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        7: [
+            AccessList(
+                address=contract_1,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        8: [
+            AccessList(
+                address=contract_2,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        9: [
+            AccessList(
+                address=contract_3,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        10: [
+            AccessList(
+                address=contract_4,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        11: [
+            AccessList(
+                address=contract_5,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        12: [
+            AccessList(
+                address=Address(0xF000000000000000000000000000000000000100),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        13: [
+            AccessList(
+                address=Address(0xF000000000000000000000000000000000000101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        14: [
+            AccessList(
+                address=Address(0xF000000000000000000000000000000000000101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        15: [
+            AccessList(
+                address=Address(0xF000000000000000000000000000000000000101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        16: [
+            AccessList(
+                address=Address(0xF000000000000000000000000000000000000101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        17: [
+            AccessList(
+                address=Address(0xF000000000000000000000000000000000000101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        24: [
+            AccessList(
+                address=contract_6,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        25: [
+            AccessList(
+                address=contract_6,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        26: [
+            AccessList(
+                address=contract_7,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        27: [
+            AccessList(
+                address=contract_7,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        28: [
+            AccessList(
+                address=contract_8,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        29: [
+            AccessList(
+                address=contract_8,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        30: [
+            AccessList(
+                address=contract_9,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        31: [
+            AccessList(
+                address=contract_9,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        32: [
+            AccessList(
+                address=contract_10,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000002"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        33: [
+            AccessList(
+                address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000002"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        34: [
+            AccessList(
+                address=contract_10,
+                storage_keys=[
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f001"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f002"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f0a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        35: [
+            AccessList(
+                address=Address(0x00000000000000000000000000000000000060A7),
+                storage_keys=[
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000fffffad"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000000ad"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000123214342ad"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000deadbeef"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+            AccessList(
+                address=contract_0,
+                storage_keys=[
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000fffff"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000123214342"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000deadbeef"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+            AccessList(
+                address=Address(0x0000000000000000000000000010000000000100),
+                storage_keys=[
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000fffffbc"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000000bc"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000123214342bc"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000deadbeefbc"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+            AccessList(
+                address=Address(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF),
+                storage_keys=[
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000fffffbc"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000000bc"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000123214342bc"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000deadbeefbc"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0xdeadbeef12345678deadbeef12345678deadbeef12345678deadbeef12345678"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+    }
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=400000,
-        value=100000,
-        access_list=tx_access_list,
+        to=contract_10,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        access_list=tx_access_lists.get(d),
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP2930/test_transaction_costs.py b/tests/ported_static/stEIP2930/test_transaction_costs.py
index 8a0b2e89be3..3695bf9a542 100644
--- a/tests/ported_static/stEIP2930/test_transaction_costs.py
+++ b/tests/ported_static/stEIP2930/test_transaction_costs.py
@@ -2,418 +2,124 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP2930/transactionCostsFiller.yml
+state_tests/stEIP2930/transactionCostsFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     AccessList,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Amsterdam, Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP2930/transactionCostsFiller.yml"],
+    ["state_tests/stEIP2930/transactionCostsFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.parametrize(
-    "tx_access_list, expected_post",
+    "d, g, v",
     [
-        ([], {}),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000100"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000fffffffffffffff"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000102"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000fffffffffffffff"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000103"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000104"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000fffffffffffffff"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000105"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000001111"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000002222"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000003333"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000106"
-                    ),
-                    storage_keys=[],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000107"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000108"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000fffffffffffffff"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000109"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-            ],
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="type0",
         ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000102"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="addrs_0_keys_0",
         ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0xff00000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {},
+        pytest.param(
+            2,
+            0,
+            0,
+            id="addrs_1_keys_0",
         ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0xff00000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x000000000000000000000000000000000000000fffffffffffffffffffffffff"
-                            # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {},
+        pytest.param(
+            3,
+            0,
+            0,
+            id="addrs_1_keys_1",
         ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {},
+        pytest.param(
+            4,
+            0,
+            0,
+            id="addrs_1_keys_1",
         ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {},
+        pytest.param(
+            5,
+            0,
+            0,
+            id="addrs_1_keys_1",
         ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"
-                            # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {},
+        pytest.param(
+            6,
+            0,
+            0,
+            id="addrs_1_keys_2",
         ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        )
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"
-                            # noqa: E501
-                        )
-                    ],
-                ),
-            ],
-            {},
+        pytest.param(
+            7,
+            0,
+            0,
+            id="addrs_2_keys_2",
         ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        )
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        )
-                    ],
-                ),
-            ],
-            {},
+        pytest.param(
+            8,
+            0,
+            0,
+            id="addrs_2_keys_2",
         ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        )
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000102"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"
-                            # noqa: E501
-                        )
-                    ],
-                ),
-            ],
-            {},
+        pytest.param(
+            9,
+            0,
+            0,
+            id="addrs_2_keys_2",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="addrs_1_keys_2",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="addrs_10_keys_25",
         ),
-        (None, {}),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_transaction_costs(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_access_list: list | None,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7778A3B885EA30938725C6E00831943A454477163CDBC252DEBEB9612B4FA5F7
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5FA9C18)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -424,450 +130,354 @@ def test_transaction_costs(
         gas_limit=71794957647893862,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex("00"),
+    # Source: raw
+    # 0x00
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x1bf4bd50bbda0f09948556f87d37f86f2e19e84a"),
-        # noqa: E501
-    )
-    pre[sender] = Account(balance=0x5FA9C18)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
-        gas_limit=400000,
-        value=100000,
-        access_list=tx_access_list,
     )
 
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP2930/transactionCostsFiller.yml"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.parametrize(
-    "tx_access_list, expected_post",
-    [
-        ([], {}),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000100"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000fffffffffffffff"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000102"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000fffffffffffffff"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000103"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000104"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000fffffffffffffff"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000105"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000001111"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000002222"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000003333"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000106"
-                    ),
-                    storage_keys=[],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000107"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000108"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000fffffffffffffff"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000109"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000010"
-                            # noqa: E501
-                        ),
-                    ],
-                ),
-            ],
-            {},
-        ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000102"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            {},
-        ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0xff00000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {},
-        ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0xff00000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x000000000000000000000000000000000000000fffffffffffffffffffffffff"
-                            # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {},
-        ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {},
-        ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {},
-        ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"
-                            # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {},
-        ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        )
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"
-                            # noqa: E501
-                        )
-                    ],
-                ),
-            ],
-            {},
-        ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        )
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        )
-                    ],
-                ),
-            ],
-            {},
-        ),
-        (
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000101"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"
-                            # noqa: E501
-                        )
-                    ],
-                ),
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000102"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"
-                            # noqa: E501
-                        )
-                    ],
-                ),
-            ],
-            {},
-        ),
-        (None, {}),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_transaction_costs_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_access_list: list | None,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7778A3B885EA30938725C6E00831943A454477163CDBC252DEBEB9612B4FA5F7
-    )
+    expect_entries: list[dict] = [
+        # EIP-7981 changes access list costs in Amsterdam+. Balance is a
+        # placeholder; the expected value is computed dynamically below.
+        # Ordered first so Amsterdam+ forks match here instead of the
+        # entries below.
+        {
+            "indexes": {"data": -1, "gas": -1, "value": -1},
+            "network": [">=Amsterdam"],
+            "result": {sender: Account(balance=0)},
+        },
+        {
+            "indexes": {"data": [0, 1], "gas": -1, "value": -1},
+            "network": ["Cancun"],
+            "result": {sender: Account(balance=0x5F5E100)},
+        },
+        {
+            "indexes": {"data": [0, 1], "gas": -1, "value": -1},
+            "network": [">=Prague"],
+            "result": {sender: Account(balance=0x5F5E0C4)},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {sender: Account(balance=0x5F58340)},
+        },
+        {
+            "indexes": {"data": [3, 4, 5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {sender: Account(balance=0x5F53908)},
+        },
+        {
+            "indexes": {"data": [6, 10], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {sender: Account(balance=0x5F4EED0)},
+        },
+        {
+            "indexes": {"data": [7, 8, 9], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {sender: Account(balance=0x5F49110)},
+        },
+        {
+            "indexes": {"data": [11], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {sender: Account(balance=0x5EAF808)},
+        },
+    ]
 
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=71794957647893862,
-    )
+    post, _exc = resolve_expect_post(expect_entries, d, g, v, fork)
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex("00"),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x1bf4bd50bbda0f09948556f87d37f86f2e19e84a"),
-        # noqa: E501
-    )
-    pre[sender] = Account(balance=0x5FA9C18)
+    tx_data = [
+        Bytes("00"),
+        Bytes("00"),
+        Bytes("00"),
+        Bytes("00"),
+        Bytes("00"),
+        Bytes("00"),
+        Bytes("00"),
+        Bytes("00"),
+        Bytes("00"),
+        Bytes("00"),
+        Bytes("00"),
+        Bytes("00"),
+    ]
+    tx_gas = [400000]
+    tx_value = [100000]
+    tx_access_lists: dict[int, list] = {
+        1: [],
+        2: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000102),
+                storage_keys=[],
+            ),
+        ],
+        3: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        4: [
+            AccessList(
+                address=Address(0xFF00000000000000000000000000000000000101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        5: [
+            AccessList(
+                address=Address(0xFF00000000000000000000000000000000000101),
+                storage_keys=[
+                    Hash(
+                        "0x000000000000000000000000000000000000000fffffffffffffffffffffffff"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        6: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        7: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000102),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        8: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        9: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        10: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        11: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000100),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000fffffffffffffff"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000101),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000102),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000fffffffffffffff"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000103),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000104),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000fffffffffffffff"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000105),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000001111"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000002222"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000003333"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000106),
+                storage_keys=[],
+            ),
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000107),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000108),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000fffffffffffffff"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000109),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000010"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+    }
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
-        gas_limit=400000,
-        value=100000,
-        access_list=tx_access_list,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        access_list=tx_access_lists.get(d),
+        error=_exc,
     )
 
-    post = expected_post
+    # EIP-7981 (access list repricing) activates in Amsterdam. Compute the
+    # expected balance dynamically from the fork's intrinsic cost calculator
+    # rather than hardcoding values that change as EIP-7981 evolves. Past
+    # forks keep their original hardcoded values above.
+    if _exc is None and fork >= Amsterdam:
+        sender_pre = pre[sender]
+        assert sender_pre is not None
+        gas_price = int(tx.gas_price or tx.max_fee_per_gas or 0)
+        intrinsic_gas = fork.transaction_intrinsic_cost_calculator()(
+            calldata=tx.data,
+            contract_creation=tx.to is None,
+            access_list=tx.access_list,
+        )
+        post[sender] = Account(
+            balance=(
+                int(sender_pre.balance)
+                - int(tx.value)
+                - intrinsic_gas * gas_price
+            ),
+        )
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP2930/test_varied_context.py b/tests/ported_static/stEIP2930/test_varied_context.py
index 2900972c82c..20f3bd03c20 100644
--- a/tests/ported_static/stEIP2930/test_varied_context.py
+++ b/tests/ported_static/stEIP2930/test_varied_context.py
@@ -2,7 +2,7 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stEIP2930/variedContextFiller.yml
+state_tests/stEIP2930/variedContextFiller.yml
 """
 
 import pytest
@@ -12,10 +12,16 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -24,1956 +30,268 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stEIP2930/variedContextFiller.yml"],
+    ["state_tests/stEIP2930/variedContextFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_access_list, expected_post",
+    "d, g, v",
     [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x000000000000000000000000000000000000c057"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={0: 2, 1: 20003, 2: 107, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="delegateCallerInAccessList",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001001"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={0: 2, 1: 22103, 2: 2107, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="delegateCalleeInAccessList",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000023",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x58fd03a2d731b2fb751e4a0f593d373ee77d39e6"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000ffff"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x0000000000000000000000000000000000001023"): Account(
-                    storage={1: 0x530508498D2AA75D8E591612809FEC3D37A45615}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x530508498d2aa75d8e591612809fec3d37a45615"): Account(
-                    storage={0: 65535, 1: 22117}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="callcodeCallerInAccessList",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000023",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x530508498d2aa75d8e591612809fec3d37a45615"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x0000000000000000000000000000000000001023"): Account(
-                    storage={1: 0x530508498D2AA75D8E591612809FEC3D37A45615}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x530508498d2aa75d8e591612809fec3d37a45615"): Account(
-                    storage={0: 65535, 1: 20017}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="callcodeCalleeInAccessList",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000022",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x58fd03a2d731b2fb751e4a0f593d373ee77d39e6"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000ffff"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x0000000000000000000000000000000000001022"): Account(
-                    storage={1: 0x58FD03A2D731B2FB751E4A0F593D373EE77D39E6}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x58fd03a2d731b2fb751e4a0f593d373ee77d39e6"): Account(
-                    storage={0: 65535, 1: 22117}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="callCallerInAccessList",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000022",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x58fd03a2d731b2fb751e4a0f593d373ee77d39e6"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x0000000000000000000000000000000000001022"): Account(
-                    storage={1: 0x58FD03A2D731B2FB751E4A0F593D373EE77D39E6}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x58fd03a2d731b2fb751e4a0f593d373ee77d39e6"): Account(
-                    storage={0: 65535, 1: 20017}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="callCalleeInAccessList",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000012",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001012"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001012"): Account(
-                    storage={0: 4600}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="staticcallCallerInAccessList",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000012",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x00000000000000000000000000000000dead0112"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001012"): Account(
-                    storage={0: 100}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="staticcallCalleeInAccessList",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001010"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 20003, 1: 100}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="callRevertCalleeInAccessList",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xcccccccccccccccccccccccccccccccccccccccc"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 22103, 1: 2100}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="callRevertCallerInAccessList",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000026",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x000000000000000000000000000000000000f126"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f126"): Account(
-                    storage={0: 24743, 1: 22117, 2: 117}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            10,
+            0,
+            0,
+            id="callWriteSuicideValid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000026",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x000000000000000000000000000000000000f126"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f126"): Account(
-                    storage={0: 24743, 1: 20017, 2: 117}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            11,
+            0,
+            0,
+            id="callWriteSuicideInvalid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000011",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001011"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001011"): Account(
-                    storage={0: 24601}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0111"): Account(
-                    storage={0: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            12,
+            0,
+            0,
+            id="callReadSuicideValid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000011",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x00000000000000000000000000000000dead0111"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001011"): Account(
-                    storage={0: 20001}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0111"): Account(
-                    storage={0: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            13,
+            0,
+            0,
+            id="callReadSuicideInvalid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x000000000000000000000000000000000000c057"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 2, 1: 22103, 2: 2107}
-                ),
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            14,
+            0,
+            0,
+            id="staticWriteInvalid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001002"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001002"): Account(
-                    storage={0: 2, 1: 20003, 2: 107}
-                ),
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            15,
+            0,
+            0,
+            id="staticWriteValid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000025",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x58fd03a2d731b2fb751e4a0f593d373ee77d39e6"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000ffff"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x0000000000000000000000000000000000001025"): Account(
-                    storage={1: 0x83FBDAE70258AC0FA837B701CC63CEDF48D4B6BF}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x83fbdae70258ac0fa837b701cc63cedf48d4b6bf"): Account(
-                    storage={0: 65535, 1: 22117, 2: 117}
-                ),
-            },
+        pytest.param(
+            16,
+            0,
+            0,
+            id="writeValidGas",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000025",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x83fbdae70258ac0fa837b701cc63cedf48d4b6bf"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x0000000000000000000000000000000000001025"): Account(
-                    storage={1: 0x83FBDAE70258AC0FA837B701CC63CEDF48D4B6BF}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x83fbdae70258ac0fa837b701cc63cedf48d4b6bf"): Account(
-                    storage={0: 65535, 1: 20017, 2: 117}
-                ),
-            },
+        pytest.param(
+            17,
+            0,
+            0,
+            id="writeInvalidOOG",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xf342e57f24e0333f3af34af08fdbbe9c72cbd37c"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x0000000000000000000000000000000000001021"): Account(
-                    storage={1: 0xD82F21135ED7D7D833A9F2A0F1CF6C3DA214B8E3}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0xd82f21135ed7d7d833a9f2a0f1cf6c3da214b8e3"): Account(
-                    storage={0: 65535, 1: 22117}
-                ),
-            },
+        pytest.param(
+            18,
+            0,
+            0,
+            id="readValidGas",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000021",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xd82f21135ed7d7d833a9f2a0f1cf6c3da214b8e3"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x0000000000000000000000000000000000001021"): Account(
-                    storage={1: 0xD82F21135ED7D7D833A9F2A0F1CF6C3DA214B8E3}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0xd82f21135ed7d7d833a9f2a0f1cf6c3da214b8e3"): Account(
-                    storage={0: 65535, 1: 20017}
-                ),
-            },
+        pytest.param(
+            19,
+            0,
+            0,
+            id="readInvalidOOG",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000024",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x58fd03a2d731b2fb751e4a0f593d373ee77d39e6"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000ffff"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x0000000000000000000000000000000000001024"): Account(
-                    storage={1: 0xB76AB2D646C4DF221EDD345957D0A396A2AB1B6D}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0xb76ab2d646c4df221edd345957d0a396a2ab1b6d"): Account(
-                    storage={0: 65535, 1: 22117, 2: 117}
-                ),
-            },
+        pytest.param(
+            20,
+            0,
+            0,
+            id="recurseValid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000024",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xb76ab2d646c4df221edd345957d0a396a2ab1b6d"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x0000000000000000000000000000000000001024"): Account(
-                    storage={1: 0xB76AB2D646C4DF221EDD345957D0A396A2AB1B6D}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0xb76ab2d646c4df221edd345957d0a396a2ab1b6d"): Account(
-                    storage={0: 65535, 1: 20017, 2: 117}
-                ),
-            },
+        pytest.param(
+            21,
+            0,
+            0,
+            id="recurseInvalid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xf342e57f24e0333f3af34af08fdbbe9c72cbd37c"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x0000000000000000000000000000000000001020"): Account(
-                    storage={1: 0xF342E57F24E0333F3AF34AF08FDBBE9C72CBD37C}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0xf342e57f24e0333f3af34af08fdbbe9c72cbd37c"): Account(
-                    storage={0: 65535, 1: 22117}
-                ),
-            },
+        pytest.param(
+            22,
+            0,
+            0,
+            id="createValid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xf342e57f24e0333f3af34af08fdbbe9c72cbd37c"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x0000000000000000000000000000000000001020"): Account(
-                    storage={1: 0xF342E57F24E0333F3AF34AF08FDBBE9C72CBD37C}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0xf342e57f24e0333f3af34af08fdbbe9c72cbd37c"): Account(
-                    storage={0: 65535, 1: 20017}
-                ),
-            },
+        pytest.param(
+            23,
+            0,
+            0,
+            id="createInvalid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x000000000000000000000000000000000000c057"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2, 1: 22103, 2: 2107}
-                ),
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            24,
+            0,
+            0,
+            id="create2Valid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001000"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001000"): Account(
-                    storage={0: 2, 1: 20003, 2: 107}
-                ),
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            25,
+            0,
+            0,
+            id="create2Invalid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001015"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            26,
+            0,
+            0,
+            id="callCreatedValid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x000000000000000000000000000000000000f115"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 24589, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            27,
+            0,
+            0,
+            id="callCreatedInvalid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0xf000000000000000000000000000000000000116"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000beef"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={
-                        256: 103,
-                        257: 103,
-                        258: 103,
-                        259: 103,
-                        260: 103,
-                        261: 103,
-                        262: 103,
-                        263: 103,
-                        264: 103,
-                        265: 103,
-                        266: 103,
-                        267: 103,
-                        268: 103,
-                        269: 103,
-                        270: 103,
-                        271: 22103,
-                        512: 100,
-                        513: 100,
-                        514: 100,
-                        515: 100,
-                        516: 100,
-                        517: 100,
-                        518: 100,
-                        519: 100,
-                        520: 100,
-                        521: 100,
-                        522: 100,
-                        523: 100,
-                        524: 100,
-                        525: 100,
-                        526: 100,
-                        527: 2100,
-                        768: 22103,
-                        769: 22103,
-                        770: 22103,
-                        771: 22103,
-                        772: 22103,
-                        773: 22103,
-                        774: 22103,
-                        775: 22103,
-                        776: 22103,
-                        777: 22103,
-                        778: 22103,
-                        779: 22103,
-                        780: 22103,
-                        781: 22103,
-                        782: 22103,
-                        783: 22103,
-                        1024: 2100,
-                        1025: 2100,
-                        1026: 2100,
-                        1027: 2100,
-                        1028: 2100,
-                        1029: 2100,
-                        1030: 2100,
-                        1031: 2100,
-                        1032: 2100,
-                        1033: 2100,
-                        1034: 2100,
-                        1035: 2100,
-                        1036: 2100,
-                        1037: 2100,
-                        1038: 2100,
-                        1039: 2100,
-                        24743: 57005,
-                        48879: 2,
-                        61440: 48879,
-                        61441: 48879,
-                        61442: 48879,
-                        61443: 48879,
-                        61444: 48879,
-                        61445: 48879,
-                        61446: 48879,
-                        61447: 48879,
-                        61448: 48879,
-                        61449: 48879,
-                        61450: 48879,
-                        61451: 48879,
-                        61452: 48879,
-                        61453: 48879,
-                        61454: 48879,
-                        61455: 48879,
-                    }
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            28,
+            0,
+            0,
+            id="callCreate2edValid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001016"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000beef"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f001"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f002"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f003"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f004"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f005"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f006"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f007"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f008"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f009"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f00a"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f00b"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f00c"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f00d"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f00e"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f00f"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f010"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f011"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f012"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f013"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f014"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f015"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f016"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f017"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f018"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f019"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f01a"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f01b"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f01c"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f01d"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f01e"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x000000000000000000000000000000000000000000000000000000000000f01f"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={
-                        256: 103,
-                        257: 103,
-                        258: 103,
-                        259: 103,
-                        260: 103,
-                        261: 103,
-                        262: 103,
-                        263: 103,
-                        264: 103,
-                        265: 103,
-                        266: 103,
-                        267: 103,
-                        268: 103,
-                        269: 103,
-                        270: 103,
-                        271: 20003,
-                        512: 100,
-                        513: 100,
-                        514: 100,
-                        515: 100,
-                        516: 100,
-                        517: 100,
-                        518: 100,
-                        519: 100,
-                        520: 100,
-                        521: 100,
-                        522: 100,
-                        523: 100,
-                        524: 100,
-                        525: 100,
-                        526: 100,
-                        527: 100,
-                        768: 20003,
-                        769: 20003,
-                        770: 20003,
-                        771: 20003,
-                        772: 20003,
-                        773: 20003,
-                        774: 20003,
-                        775: 20003,
-                        776: 20003,
-                        777: 20003,
-                        778: 20003,
-                        779: 20003,
-                        780: 20003,
-                        781: 20003,
-                        782: 20003,
-                        783: 20003,
-                        1024: 100,
-                        1025: 100,
-                        1026: 100,
-                        1027: 100,
-                        1028: 100,
-                        1029: 100,
-                        1030: 100,
-                        1031: 100,
-                        1032: 100,
-                        1033: 100,
-                        1034: 100,
-                        1035: 100,
-                        1036: 100,
-                        1037: 100,
-                        1038: 100,
-                        1039: 100,
-                        24743: 57005,
-                        48879: 2,
-                        61440: 48879,
-                        61441: 48879,
-                        61442: 48879,
-                        61443: 48879,
-                        61444: 48879,
-                        61445: 48879,
-                        61446: 48879,
-                        61447: 48879,
-                        61448: 48879,
-                        61449: 48879,
-                        61450: 48879,
-                        61451: 48879,
-                        61452: 48879,
-                        61453: 48879,
-                        61454: 48879,
-                        61455: 48879,
-                    }
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            29,
+            0,
+            0,
+            id="callCreate2edInvalid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000013",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000000000"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            30,
+            0,
+            0,
+            id="createAndCallValid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000013",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x000000000000000000000000000000000000f113"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            31,
+            0,
+            0,
+            id="createAndCallInvalid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x00000000000000000000000000000000ead0c057"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 107}
-                ),
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            32,
+            0,
+            0,
+            id="create2AndCallValid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001003"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001003"): Account(
-                    storage={0: 2107}
-                ),
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            33,
+            0,
+            0,
+            id="create2AndCallInvalid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x0000000000000000000000000000000000001014"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 2989}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            34,
+            0,
+            0,
+            id="callTwiceValid",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            [
-                AccessList(
-                    address=Address(
-                        "0x000000000000000000000000000000000000f114"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        )
-                    ],
-                )
-            ],
-            {
-                Address("0x0000000000000000000000000000000000001010"): Account(
-                    storage={24743: 48879}
-                ),
-                Address("0x0000000000000000000000000000000000001013"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0x0000000000000000000000000000000000001016"): Account(
-                    storage={0: 15, 24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000c057"): Account(
-                    storage={24743: 57005}
-                ),
-                Address("0x000000000000000000000000000000000000f114"): Account(
-                    storage={0: 24589}
-                ),
-                Address("0x000000000000000000000000000000000000f115"): Account(
-                    storage={0: 2989, 24743: 57005}
-                ),
-                Address("0x00000000000000000000000000000000dead0112"): Account(
-                    storage={0: 0xDEAD0060A7}
-                ),
-                Address("0x00000000000000000000000000000000ead0c057"): Account(
-                    storage={24743: 57005}
-                ),
-            },
+        pytest.param(
+            35,
+            0,
+            0,
+            id="callTwiceInvalid",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_varied_context(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_access_list: list | None,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x000000000000000000000000000000000000C057)
+    contract_4 = Address(0x0000000000000000000000000000000000001003)
+    contract_5 = Address(0x00000000000000000000000000000000EAD0C057)
+    contract_6 = Address(0x0000000000000000000000000000000000001010)
+    contract_7 = Address(0x0000000000000000000000000000000000001011)
+    contract_8 = Address(0x00000000000000000000000000000000DEAD0111)
+    contract_9 = Address(0x0000000000000000000000000000000000001012)
+    contract_10 = Address(0x00000000000000000000000000000000DEAD0112)
+    contract_11 = Address(0x0000000000000000000000000000000000001013)
+    contract_12 = Address(0x000000000000000000000000000000000000F113)
+    contract_13 = Address(0x0000000000000000000000000000000000001014)
+    contract_14 = Address(0x000000000000000000000000000000000000F114)
+    contract_15 = Address(0x0000000000000000000000000000000000001015)
+    contract_16 = Address(0x000000000000000000000000000000000000F115)
+    contract_17 = Address(0x0000000000000000000000000000000000001016)
+    contract_18 = Address(0x0000000000000000000000000000000000001020)
+    contract_19 = Address(0x0000000000000000000000000000000000001021)
+    contract_20 = Address(0x0000000000000000000000000000000000001022)
+    contract_21 = Address(0x0000000000000000000000000000000000001023)
+    contract_22 = Address(0x0000000000000000000000000000000000001024)
+    contract_23 = Address(0x0000000000000000000000000000000000001025)
+    contract_24 = Address(0x0000000000000000000000000000000000001026)
+    contract_25 = Address(0x000000000000000000000000000000000000F126)
+    contract_26 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -1987,737 +305,905 @@ def test_varied_context(
         gas_limit=71794957647893862,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0xC057,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
+    # {
+    #    ; 0xC057: DELEGATE_VALID DELEGATE_INVALID
+    #    ;         CALL_INVALID CALL_VALID
+    #    ;         CALLCODE_VALID CALLCODE_INVALID
+    #
+    #
+    #  ; Write to [[0]], and see how much gas that cost. It should
+    #  ; cost more when it is not declared storage
+    #    [0]   (gas)
+    #   [[0]]  0x02
+    #    [0]   (- @0 (gas) 17)
+    #   [[1]] @0
+    #
+    #  ; The 17 is the cost of the extra opcodes:
+    #  ; PUSH1 0x00, MSTORE
+    #  ; PUSH1 0x02, PUSH1 0x00, (and then comes the SSTORE we are measuring)
+    #  ; GAS
+    #
+    #  ; Read [[0x60A7]], and see how much gas that cost. It should
+    #  ; cost more when it is not declared storage
+    #    [0]   (gas)
+    #   [0x20] @@0x60A7
+    #    [0]   (- @0 (gas) 16)
+    #   [[2]] @0
+    #
+    #  ; The 16 is the cost of the extra opcodes
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.MSTORE(offset=0x20, value=Op.SLOAD(key=0x60A7))
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x10),
+        )
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={24743: 57005},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000C057),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=Op.GAS,
-                address=0xC057,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {
+    #  ;   STATICCALL_VALID  STATICCALL_INVALID
+    #
+    #
+    #  ; Read [[0x60A7]], and see how much gas that cost. It should
+    #  ; cost more when it is not declared storage
+    #    [0]   (gas)
+    #  [0x20] @@0x60A7
+    #    [0]   (- @0 (gas) 19)
+    #  ; The 19 is the cost of the extra opcodes
+    #
+    #  (return 0x00 0x20) ; a.k.a. @0
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.MSTORE(offset=0x20, value=Op.SLOAD(key=0x60A7))
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x13),
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
+        storage={24743: 57005},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
+        address=Address(0x00000000000000000000000000000000EAD0C057),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=Op.GAS,
-                address=0xC057,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {
+    #  ;   CALL_REVERT_VALID     CALL_REVERT_INVALID
+    #
+    #  ; Write to [[0]], and see how much gas that cost. It should
+    #  ; cost more when it is not declared storage
+    #    [0]   (gas)
+    #   [[0]]  0x02
+    #    [0]   (- @0 (gas) 17)
+    #
+    #  ; The 17 is the cost of the extra opcodes:
+    #  ; PUSH1 0x00, MSTORE
+    #  ; PUSH1 0x02, PUSH1 0x00, (and then comes the SSTORE we are measuring)
+    #  ; GAS
+    #
+    #  ; Read [[0x60A7]], and see how much gas that cost. It should
+    #  ; cost more when it is not declared storage
+    #   [0x20] (gas)
+    #   [0x40] @@0x60A7
+    #   [0x20] (- @0x20 (gas) 26)
+    #
+    #  ; The 29 is the cost of the extra opcodes
+    #
+    #  ; Send the results the only way we can
+    #
+    #  (revert 0 0x40)
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
+        )
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.MSTORE(offset=0x40, value=Op.SLOAD(key=0x60A7))
+        + Op.MSTORE(
+            offset=0x20,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x20), Op.GAS), 0x1A),
+        )
+        + Op.REVERT(offset=0x0, size=0x40)
+        + Op.STOP,
+        storage={24743: 48879},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001010),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0xEAD0C057,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: lll
+    # {
+    #    ; CALL_WRITE_SUICIDE_VALID      CALL_WRITE_SUICIDE_INVALID
+    #    [[0]] 0xDEAD
+    #
+    #    (selfdestruct 0)
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0xDEAD)
+        + Op.SELFDESTRUCT(address=0x0)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
+        address=Address(0x00000000000000000000000000000000DEAD0111),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0x2)
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.MSTORE(offset=0x40, value=Op.SLOAD(key=0x60A7))
-            + Op.MSTORE(
-                offset=0x20,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x20), Op.GAS), 0x1A),
-            )
-            + Op.REVERT(offset=0x0, size=0x40)
-            + Op.STOP
-        ),
-        storage={0x60A7: 0xBEEF},
+    # Source: lll
+    # {
+    #    ; CALL_READ_SUICIDE_VALID      CALL_READ_SUICIDE_INVALID
+    #    @@0
+    #
+    #    (selfdestruct 0)
+    # }
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SLOAD(key=0x0))
+        + Op.SELFDESTRUCT(address=0x0)
+        + Op.STOP,
+        storage={0: 0xDEAD0060A7},
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000DEAD0112),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; STATIC_WRITE_VALID     STATIC_WRITE_INVALID
+    #    [[0]] 0xDEAD60A7
+    #
+    #    ; If we get here, GOOD
+    #    [0] 0x600D
+    #    (return 0 0x20)
+    # }
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0xDEAD60A7)
+        + Op.MSTORE(offset=0x0, value=0x600D)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000F113),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; WRITE_INVALID_OOG    WRITE_VALID_NO_OOG
+    #
+    #   [[0]] 0x600D
+    # }
+    contract_14 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x600D) + Op.STOP,
+        storage={0: 2989},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001010"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000F114),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEAD0111,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x7FE8),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  ; READ_INVALID_OOG    READ_VALID_NO_OOG
+    #    [0] @@0x60A7
+    #    [[0]] 0x600D
+    # }
+    contract_16 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.SLOAD(key=0x60A7))
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        storage={0: 2989, 24743: 57005},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001011"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000F115),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEAD0112,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x7FE8),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {
+    #   ; CREATE_VALID   CREATE_INVALID
+    #
+    #   ; Variables are 0x20 bytes (= 256 bits) apart, except for
+    #   ; code buffers that get 0x100 (256 bytes)
+    #   (def 'constructorCode   0x000)
+    #   (def 'contractCode      0x100)
+    #   (def 'contractLength    0x200)
+    #   (def 'constructorLength 0x220)
+    #   (def 'addr              0x240)
+    #
+    #   (def 'bufLength         0x100)
+    #
+    #   ; Create the contract code
+    #   [contractLength]
+    #     (lll
+    #       {
+    #          [[0]] 0xFF
+    #       } contractCode
+    #     )     ; contract lll
+    #
+    #   ; Create the constructor code, which runs with the contract address
+    #   ; of the newly created contract. If we declare that address in the
+    #   ; transaction's access list we get the discount
+    #   [constructorLength]
+    #     (lll
+    #       {
+    #          ; write to storage
+    #          [0] (gas)
+    #          [[0]] 0xFFFF
+    # ... (14 more lines)
+    contract_18 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x6]
+        + Op.CODECOPY(dest_offset=0x100, offset=0x33, size=Op.DUP1)
+        + Op.PUSH2[0x200]
+        + Op.MSTORE
+        + Op.PUSH1[0x21]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x39, size=Op.DUP1)
+        + Op.PUSH2[0x220]
+        + Op.MSTORE
+        + Op.MSTORE(
+            offset=0x240,
+            value=Op.CREATE(
+                value=0x0,
+                offset=0x0,
+                size=Op.ADD(0x100, Op.MLOAD(offset=0x200)),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x240))
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0xFF)
+        + Op.STOP
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0xFFFF)
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.CODECOPY(dest_offset=0x0, offset=0x100, size=0x100)
+        + Op.RETURN(offset=0x0, size=0x10)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001012"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001020),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xBAD)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0xF113,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {
+    #   ; CREATE2_VALID   CREATE2_INVALID
+    #
+    #   ; Variables are 0x20 bytes (= 256 bits) apart, except for
+    #   ; code buffers that get 0x100 (256 bytes)
+    #   (def 'constructorCode   0x000)
+    #   (def 'contractCode      0x100)
+    #   (def 'contractLength    0x200)
+    #   (def 'constructorLength 0x220)
+    #   (def 'addr              0x240)
+    #
+    #   (def 'bufLength         0x100)
+    #
+    #   ; Create the contract code
+    #   [contractLength]
+    #     (lll
+    #       {
+    #          [[0]] 0xFF
+    #       } contractCode
+    #     )     ; contract lll
+    #
+    #   ; Create the constructor code, which runs with the contract address
+    #   ; of the newly created contract. If we declare that address in the
+    #   ; transaction's access list we get the discount
+    #   [constructorLength]
+    #     (lll
+    #       {
+    #          ; write to storage
+    #          [0] (gas)
+    #          [[0]] 0xFFFF
+    # ... (14 more lines)
+    contract_19 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x6]
+        + Op.CODECOPY(dest_offset=0x100, offset=0x36, size=Op.DUP1)
+        + Op.PUSH2[0x200]
+        + Op.MSTORE
+        + Op.PUSH1[0x21]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3C, size=Op.DUP1)
+        + Op.PUSH2[0x220]
+        + Op.MSTORE
+        + Op.MSTORE(
+            offset=0x240,
+            value=Op.CREATE2(
+                value=0x0,
+                offset=0x0,
+                size=Op.ADD(0x100, Op.MLOAD(offset=0x200)),
+                salt=0x5A17,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x240))
+        + Op.STOP
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0xFF)
+        + Op.STOP
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0xFFFF)
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.CODECOPY(dest_offset=0x0, offset=0x100, size=0x100)
+        + Op.RETURN(offset=0x0, size=0x10)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001013"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001021),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
+    # Source: lll
+    # {
+    #   ; CALL_CREATED_VALID     CALL_CREATED_INVALID
+    #
+    #
+    #   ; Variables are 0x20 bytes (= 256 bits) apart, except for
+    #   ; code buffers that get 0x100 (256 bytes)
+    #   (def 'constructorCode   0x000)
+    #   (def 'contractCode      0x100)
+    #   (def 'contractLength    0x200)
+    #   (def 'constructorLength 0x220)
+    #   (def 'addr              0x240)
+    #
+    #   (def 'bufLength         0x100)
+    #
+    #   ; Create the contract code
+    #   [contractLength]
+    #     (lll
+    #       {
+    #          ; write to storage
+    #          [0] (gas)
+    #          [[0]] 0xFFFF
+    #          [[1]] (- @0 (gas))
+    #       } contractCode
+    #     )     ; contract lll
+    #
+    #
+    #   ; Create the constructor code
+    #   [constructorLength]
+    #     (lll
+    #       {
+    # ... (13 more lines)
+    contract_20 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x13]
+        + Op.CODECOPY(dest_offset=0x100, offset=0x44, size=Op.DUP1)
+        + Op.PUSH2[0x200]
+        + Op.MSTORE
+        + Op.PUSH1[0xF]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x57, size=Op.DUP1)
+        + Op.PUSH2[0x220]
+        + Op.MSTORE
+        + Op.MSTORE(
+            offset=0x240,
+            value=Op.CREATE(
+                value=0x0,
+                offset=0x0,
+                size=Op.ADD(0x100, Op.MLOAD(offset=0x200)),
+            ),
+        )
+        + Op.POP(
             Op.CALL(
-                gas=0xB65,
-                address=0xF114,
+                gas=Op.GAS,
+                address=Op.MLOAD(offset=0x240),
                 value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
-                ret_size=0x20,
+                ret_size=0x0,
             )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x240))
+        + Op.STOP
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0xFFFF)
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP
+        + Op.CODECOPY(dest_offset=0x0, offset=0x100, size=0x100)
+        + Op.RETURN(offset=0x0, size=0x80)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001014"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001022),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
+    # Source: lll
+    # {
+    #   ; CALL_CREATE2_ED_VALID     CALL_CREATE2_ED_INVALID
+    #
+    #
+    #   ; Variables are 0x20 bytes (= 256 bits) apart, except for
+    #   ; code buffers that get 0x100 (256 bytes)
+    #   (def 'constructorCode   0x000)
+    #   (def 'contractCode      0x100)
+    #   (def 'contractLength    0x200)
+    #   (def 'constructorLength 0x220)
+    #   (def 'addr              0x240)
+    #
+    #   (def 'bufLength         0x100)
+    #
+    #   ; Create the contract code
+    #   [contractLength]
+    #     (lll
+    #       {
+    #          ; write to storage
+    #          [0] (gas)
+    #          [[0]] 0xFFFF
+    #          [[1]] (- @0 (gas))
+    #       } contractCode
+    #     )     ; contract lll
+    #
+    #
+    #   ; Create the constructor code
+    #   [constructorLength]
+    #     (lll
+    #       {
+    # ... (13 more lines)
+    contract_21 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x13]
+        + Op.CODECOPY(dest_offset=0x100, offset=0x47, size=Op.DUP1)
+        + Op.PUSH2[0x200]
+        + Op.MSTORE
+        + Op.PUSH1[0xF]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x5A, size=Op.DUP1)
+        + Op.PUSH2[0x220]
+        + Op.MSTORE
+        + Op.MSTORE(
+            offset=0x240,
+            value=Op.CREATE2(
+                value=0x0,
+                offset=0x0,
+                size=Op.ADD(0x100, Op.MLOAD(offset=0x200)),
+                salt=0x5A17,
+            ),
+        )
+        + Op.POP(
             Op.CALL(
-                gas=0x1800,
-                address=0xF115,
+                gas=Op.GAS,
+                address=Op.MLOAD(offset=0x240),
                 value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
-                ret_size=0x20,
+                ret_size=0x0,
             )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x240))
+        + Op.STOP
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0xFFFF)
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP
+        + Op.CODECOPY(dest_offset=0x0, offset=0x100, size=0x100)
+        + Op.RETURN(offset=0x0, size=0x80)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001015"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001023),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SLOAD(key=0x0))
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0xBEEF, value=0x2)
-            + Op.MSTORE(
+    # Source: lll
+    # {
+    #   ; CREATE_&_CALL_VALID           CREATE_&_CALL_INVALID
+    #
+    #   ; Variables are 0x20 bytes (= 256 bits) apart, except for
+    #   ; code buffers that get 0x100 (256 bytes)
+    #   (def 'constructorCode   0x000)
+    #   (def 'contractCode      0x100)
+    #   (def 'contractLength    0x200)
+    #   (def 'constructorLength 0x220)
+    #   (def 'addr              0x240)
+    #
+    #   (def 'bufLength         0x100)
+    #
+    #   ; Create the contract code
+    #   [contractLength]
+    #     (lll
+    #       {
+    #          ; write to storage
+    #          [0] (gas)
+    #          [[0]] 0xFFFF
+    #          [[2]] (- @0 (gas))
+    #       } contractCode
+    #     )     ; contract lll
+    #
+    #
+    #   ; Create the constructor code
+    #   [constructorLength]
+    #     (lll
+    #       {
+    #          ; write to storage
+    # ... (18 more lines)
+    contract_22 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x13]
+        + Op.CODECOPY(dest_offset=0x100, offset=0x44, size=Op.DUP1)
+        + Op.PUSH2[0x200]
+        + Op.MSTORE
+        + Op.PUSH1[0x21]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x57, size=Op.DUP1)
+        + Op.PUSH2[0x220]
+        + Op.MSTORE
+        + Op.MSTORE(
+            offset=0x240,
+            value=Op.CREATE(
+                value=0x0,
                 offset=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.MSTORE(offset=0xA0, value=Op.SLOAD(key=0x60A7))
-            + Op.MSTORE(
-                offset=0x20,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x20), Op.GAS), 0x23),
-            )
-            + Op.MSTORE(offset=0x40, value=Op.GAS)
-            + Op.SSTORE(key=Op.ADD(0xF000, Op.SLOAD(key=0x0)), value=0xBEEF)
-            + Op.MSTORE(
-                offset=0x40,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x40), Op.GAS), 0x78),
-            )
-            + Op.MSTORE(offset=0x60, value=Op.GAS)
-            + Op.POP(Op.SLOAD(key=Op.ADD(0xF010, Op.SLOAD(key=0x0))))
-            + Op.MSTORE(
-                offset=0x60,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x60), Op.GAS), 0x7A),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(0x100, Op.SLOAD(key=0x0)),
-                value=Op.MLOAD(offset=0x0),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(0x200, Op.SLOAD(key=0x0)),
-                value=Op.MLOAD(offset=0x20),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(0x300, Op.SLOAD(key=0x0)),
-                value=Op.MLOAD(offset=0x40),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(0x400, Op.SLOAD(key=0x0)),
-                value=Op.MLOAD(offset=0x60),
-            )
-            + Op.JUMPI(pc=0x9B, condition=Op.GT(Op.SLOAD(key=0x0), 0x0))
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0xB4)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=Op.SUB(Op.SLOAD(key=0x0), 0x1))
-            + Op.CALL(
+                size=Op.ADD(0x100, Op.MLOAD(offset=0x200)),
+            ),
+        )
+        + Op.POP(
+            Op.CALL(
                 gas=Op.GAS,
-                address=0x1016,
+                address=Op.MLOAD(offset=0x240),
                 value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        storage={0x0: 0xF, 0x60A7: 0xDEAD},
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001016"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x6]
-            + Op.CODECOPY(dest_offset=0x100, offset=0x33, size=Op.DUP1)
-            + Op.PUSH2[0x200]
-            + Op.MSTORE
-            + Op.PUSH1[0x21]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x39, size=Op.DUP1)
-            + Op.PUSH2[0x220]
-            + Op.MSTORE
-            + Op.MSTORE(
-                offset=0x240,
-                value=Op.CREATE(
-                    value=0x0,
-                    offset=0x0,
-                    size=Op.ADD(0x100, Op.MLOAD(offset=0x200)),
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x240))
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(key=0x0, value=0xFF)
-            + Op.STOP
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0xFFFF)
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.CODECOPY(dest_offset=0x0, offset=0x100, size=0x100)
-            + Op.RETURN(offset=0x0, size=0x10)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001020"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x6]
-            + Op.CODECOPY(dest_offset=0x100, offset=0x36, size=Op.DUP1)
-            + Op.PUSH2[0x200]
-            + Op.MSTORE
-            + Op.PUSH1[0x21]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x3C, size=Op.DUP1)
-            + Op.PUSH2[0x220]
-            + Op.MSTORE
-            + Op.MSTORE(
-                offset=0x240,
-                value=Op.CREATE2(
-                    value=0x0,
-                    offset=0x0,
-                    size=Op.ADD(0x100, Op.MLOAD(offset=0x200)),
-                    salt=0x5A17,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x240))
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(key=0x0, value=0xFF)
-            + Op.STOP
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0xFFFF)
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.CODECOPY(dest_offset=0x0, offset=0x100, size=0x100)
-            + Op.RETURN(offset=0x0, size=0x10)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001021"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x13]
-            + Op.CODECOPY(dest_offset=0x100, offset=0x44, size=Op.DUP1)
-            + Op.PUSH2[0x200]
-            + Op.MSTORE
-            + Op.PUSH1[0xF]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x57, size=Op.DUP1)
-            + Op.PUSH2[0x220]
-            + Op.MSTORE
-            + Op.MSTORE(
-                offset=0x240,
-                value=Op.CREATE(
-                    value=0x0,
-                    offset=0x0,
-                    size=Op.ADD(0x100, Op.MLOAD(offset=0x200)),
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.MLOAD(offset=0x240),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x240))
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0xFFFF)
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-            + Op.CODECOPY(dest_offset=0x0, offset=0x100, size=0x100)
-            + Op.RETURN(offset=0x0, size=0x80)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001022"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x13]
-            + Op.CODECOPY(dest_offset=0x100, offset=0x47, size=Op.DUP1)
-            + Op.PUSH2[0x200]
-            + Op.MSTORE
-            + Op.PUSH1[0xF]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x5A, size=Op.DUP1)
-            + Op.PUSH2[0x220]
-            + Op.MSTORE
-            + Op.MSTORE(
-                offset=0x240,
-                value=Op.CREATE2(
-                    value=0x0,
-                    offset=0x0,
-                    size=Op.ADD(0x100, Op.MLOAD(offset=0x200)),
-                    salt=0x5A17,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.MLOAD(offset=0x240),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x240))
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0xFFFF)
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-            + Op.CODECOPY(dest_offset=0x0, offset=0x100, size=0x100)
-            + Op.RETURN(offset=0x0, size=0x80)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001023"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x13]
-            + Op.CODECOPY(dest_offset=0x100, offset=0x44, size=Op.DUP1)
-            + Op.PUSH2[0x200]
-            + Op.MSTORE
-            + Op.PUSH1[0x21]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x57, size=Op.DUP1)
-            + Op.PUSH2[0x220]
-            + Op.MSTORE
-            + Op.MSTORE(
-                offset=0x240,
-                value=Op.CREATE(
-                    value=0x0,
-                    offset=0x0,
-                    size=Op.ADD(0x100, Op.MLOAD(offset=0x200)),
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.MLOAD(offset=0x240),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x240))
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0xFFFF)
-            + Op.SSTORE(key=0x2, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0xFFFF)
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.CODECOPY(dest_offset=0x0, offset=0x100, size=0x100)
-            + Op.RETURN(offset=0x0, size=0x80)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001024"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x13]
-            + Op.CODECOPY(dest_offset=0x100, offset=0x47, size=Op.DUP1)
-            + Op.PUSH2[0x200]
-            + Op.MSTORE
-            + Op.PUSH1[0x21]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x5A, size=Op.DUP1)
-            + Op.PUSH2[0x220]
-            + Op.MSTORE
-            + Op.MSTORE(
-                offset=0x240,
-                value=Op.CREATE2(
-                    value=0x0,
-                    offset=0x0,
-                    size=Op.ADD(0x100, Op.MLOAD(offset=0x200)),
-                    salt=0x5A17,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.MLOAD(offset=0x240),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x240))
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0xFFFF)
-            + Op.SSTORE(key=0x2, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0xFFFF)
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.CODECOPY(dest_offset=0x0, offset=0x100, size=0x100)
-            + Op.RETURN(offset=0x0, size=0x80)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x240))
+        + Op.STOP
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0xFFFF)
+        + Op.SSTORE(key=0x2, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0xFFFF)
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.CODECOPY(dest_offset=0x0, offset=0x100, size=0x100)
+        + Op.RETURN(offset=0x0, size=0x80)
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001025"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001024),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xF126,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.CALL(
+    # Source: lll
+    # {
+    #   ; CREATE2_&_CALL_VALID           CREATE2_&_CALL_INVALID
+    #
+    #   ; Variables are 0x20 bytes (= 256 bits) apart, except for
+    #   ; code buffers that get 0x100 (256 bytes)
+    #   (def 'constructorCode   0x000)
+    #   (def 'contractCode      0x100)
+    #   (def 'contractLength    0x200)
+    #   (def 'constructorLength 0x220)
+    #   (def 'addr              0x240)
+    #
+    #   (def 'bufLength         0x100)
+    #
+    #   ; Create the contract code
+    #   [contractLength]
+    #     (lll
+    #       {
+    #          ; write to storage
+    #          [0] (gas)
+    #          [[0]] 0xFFFF
+    #          [[2]] (- @0 (gas))
+    #       } contractCode
+    #     )     ; contract lll
+    #
+    #
+    #   ; Create the constructor code
+    #   [constructorLength]
+    #     (lll
+    #       {
+    #          ; write to storage
+    # ... (18 more lines)
+    contract_23 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x13]
+        + Op.CODECOPY(dest_offset=0x100, offset=0x47, size=Op.DUP1)
+        + Op.PUSH2[0x200]
+        + Op.MSTORE
+        + Op.PUSH1[0x21]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x5A, size=Op.DUP1)
+        + Op.PUSH2[0x220]
+        + Op.MSTORE
+        + Op.MSTORE(
+            offset=0x240,
+            value=Op.CREATE2(
+                value=0x0,
+                offset=0x0,
+                size=Op.ADD(0x100, Op.MLOAD(offset=0x200)),
+                salt=0x5A17,
+            ),
+        )
+        + Op.POP(
+            Op.CALL(
                 gas=Op.GAS,
-                address=0xF126,
+                address=Op.MLOAD(offset=0x240),
                 value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x240))
+        + Op.STOP
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0xFFFF)
+        + Op.SSTORE(key=0x2, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0xFFFF)
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.CODECOPY(dest_offset=0x0, offset=0x100, size=0x100)
+        + Op.RETURN(offset=0x0, size=0x80)
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001026"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001025),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
-    #    ; 0xC057: DELEGATE_VALID DELEGATE_INVALID
-    #    ;         CALL_INVALID CALL_VALID
-    #    ;         CALLCODE_VALID CALLCODE_INVALID
-    #
-    #
-    #  ; Write to [[0]], and see how much gas that cost. It should
-    #  ; cost more when it is not declared storage
-    #    [0]   (gas)
-    #   [[0]]  0x02
-    #    [0]   (- @0 (gas) 17)
-    #   [[1]] @0
-    #
-    #  ; The 17 is the cost of the extra opcodes:
-    #  ; PUSH1 0x00, MSTORE
-    #  ; PUSH1 0x02, PUSH1 0x00, (and then comes the SSTORE we are measuring)
-    #  ; GAS
+    #   ; CALL_TWICE_VALID     CALL_TWICE_INVALID
+    #   [0] (gas)
+    #   [[0x00]] 0x60A7
+    #   [0] (- @0 (gas))
     #
-    #  ; Read [[0x60A7]], and see how much gas that cost. It should
-    #  ; cost more when it is not declared storage
-    #    [0]   (gas)
-    #   [0x20] @@0x60A7
-    #    [0]   (- @0 (gas) 16)
-    #   [[2]] @0
+    #   ; If @@1 is empty, write to it. Otherwise, write to @@2
+    #   (if (= @@1 0) {[[1]] @0} {[[2]] @0})
     #
-    #  ; The 16 is the cost of the extra opcodes
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0x2)
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.MSTORE(offset=0x20, value=Op.SLOAD(key=0x60A7))
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x10),
-            )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x60A7: 0xDEAD},
-        balance=0xDE0B6B3A7640000,
+    contract_25 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x0, value=0x60A7)
+        + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.JUMPI(pc=0x24, condition=Op.EQ(Op.SLOAD(key=0x1), 0x0))
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
+        + Op.JUMP(pc=0x2B)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000c057"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000F126),  # noqa: E501
     )
-    # Source: LLL
-    # {  ; STATIC_WRITE_VALID     STATIC_WRITE_INVALID
-    #    [[0]] 0xDEAD60A7
+    # Source: lll
+    # {
+    #    ; DELEGATE_VALID   DELEGATE_INVALID
     #
-    #    ; If we get here, GOOD
-    #    [0] 0x600D
-    #    (return 0 0x20)
+    #    (delegatecall (gas) 0xC057 0 0 0 0)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0xDEAD60A7)
-            + Op.MSTORE(offset=0x0, value=0x600D)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xC057,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000f113"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
     )
-    # Source: LLL
-    # {  ; WRITE_INVALID_OOG    WRITE_VALID_NO_OOG
-    #
-    #   [[0]] 0x600D
+    # Source: lll
+    # {
+    #    ; CALLCODE_VALID       CALLCODE_INVALID
+    #    (callcode (gas) 0xC057 0 0 0 0 0)
     # }
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=0x600D) + Op.STOP,
-        storage={0x0: 0xBAD},
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=Op.GAS,
+            address=0xC057,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000f114"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
     )
-    # Source: LLL
-    # {  ; READ_INVALID_OOG    READ_VALID_NO_OOG
-    #    [0] @@0x60A7
-    #    [[0]] 0x600D
+    # Source: lll
+    # {
+    #    ; CALL_VALID    CALL_INVALID
+    #    (call (gas) 0xC057 0 0 0 0 0)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.SLOAD(key=0x60A7))
-            + Op.SSTORE(key=0x0, value=0x600D)
-            + Op.STOP
-        ),
-        storage={0x0: 0xBAD, 0x60A7: 0xDEAD},
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=Op.GAS,
+            address=0xC057,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000f115"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
-    #   ; CALL_TWICE_VALID     CALL_TWICE_INVALID
-    #   [0] (gas)
-    #   [[0x00]] 0x60A7
-    #   [0] (- @0 (gas))
-    #
-    #   ; If @@1 is empty, write to it. Otherwise, write to @@2
-    #   (if (= @@1 0) {[[1]] @0} {[[2]] @0})
+    #    ; STATICCALL_VALID  STATICCALL_INVALID
     #
+    #    ; Need to store the result here, because static call is, well, static
+    #    (staticcall (gas) 0xEAD0C057 0 0 0 0x20)
+    #    [[0]] @0
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(key=0x0, value=0x60A7)
-            + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.JUMPI(pc=0x24, condition=Op.EQ(Op.SLOAD(key=0x1), 0x0))
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
-            + Op.JUMP(pc=0x2B)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=0xEAD0C057,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000f126"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
     #    ; CALL_WRITE_SUICIDE_VALID      CALL_WRITE_SUICIDE_INVALID
-    #    [[0]] 0xDEAD
-    #
-    #    (selfdestruct 0)
+    #    [0] (gas)
+    #    (call (gas) 0xDEAD0111 0 0 0 0 0)
+    #    [[0]] (- @0 (gas) 0x7fe8)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0xDEAD)
-            + Op.SELFDESTRUCT(address=0x0)
-            + Op.STOP
-        ),
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEAD0111,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x7FE8)
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x00000000000000000000000000000000dead0111"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001011),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
     #    ; CALL_READ_SUICIDE_VALID      CALL_READ_SUICIDE_INVALID
-    #    @@0
-    #
-    #    (selfdestruct 0)
+    #    [0] (gas)
+    #    (call (gas) 0xDEAD0112 0 0 0 0 0)
+    #    [[0]] (- @0 (gas) 0x7fe8)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.POP(Op.SLOAD(key=0x0)) + Op.SELFDESTRUCT(address=0x0) + Op.STOP
-        ),
-        storage={0x0: 0xDEAD0060A7},
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEAD0112,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x7FE8)
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x00000000000000000000000000000000dead0112"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001012),  # noqa: E501
     )
-    # Source: LLL
-    # {
-    #  ;   STATICCALL_VALID  STATICCALL_INVALID
+    # Source: lll
+    # {  ; STATIC_WRITE_VALID     STATIC_WRITE_INVALID
     #
+    #    [0x00] 0x0BAD
     #
-    #  ; Read [[0x60A7]], and see how much gas that cost. It should
-    #  ; cost more when it is not declared storage
-    #    [0]   (gas)
-    #  [0x20] @@0x60A7
-    #    [0]   (- @0 (gas) 19)
-    #  ; The 19 is the cost of the extra opcodes
+    #    ; If the call is successful @0 becomes 0x600D
+    #    (staticcall (gas) 0xF113 0 0 0 0x20)
     #
-    #  (return 0x00 0x20) ; a.k.a. @0
+    #    [[0]] @0x00
+    # }
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xBAD)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=0xF113,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 24743},
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001013),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; WRITE_INVALID_OOG    WRITE_VALID_NO_OOG
+    #    (call 0x0B65 0xF114 0 0 0 0 0x20)
+    # }
+    contract_13 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xB65,
+            address=0xF114,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001014),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; READ_INVALID_OOG    READ_VALID_NO_OOG
+    #    (call 0x1800 0xF115 0 0 0 0 0x20)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.MSTORE(offset=0x20, value=Op.SLOAD(key=0x60A7))
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x13),
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
-        storage={0x60A7: 0xDEAD},
+    contract_15 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x1800,
+            address=0xF115,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x00000000000000000000000000000000ead0c057"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001015),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
+    # {
+    #   ; CALL_TWICE_VALID     CALL_TWICE_INVALID
+    #   (call (gas) 0xF126 0 0 0 0 0)
+    #   (call (gas) 0xF126 0 0 0 0 0)
+    # }
+    contract_24 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xF126,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xF126,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001026),  # noqa: E501
+    )
+    # Source: lll
     # {
     #     ; ccc...ccc  revert and suicide contract
     #     (call (gas) (+ 0x1000 $4) 0 0 0 0 0x40)
@@ -2726,38 +1212,1075 @@ def test_varied_context(
     #     [[0]] @0x00
     #     [[1]] @0x20
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    contract_26 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; RECURSE_VALID   RECURSE_INVALID
+    #    (def 'NOP 0)
+    #
+    #    ; Read storage cell zero, so the first time we read it to won't
+    #    ; be added to the cost
+    #    @@0
+    #
+    #    ; Write to [[0xBEEF]], and see how much gas that cost. It should
+    #    ; cost more when it is not declared storage
+    #      [0]   (gas)
+    #     [[0xBEEF]]  0x02
+    #      [0]   (- @0 (gas) 17)
+    #
+    #    ; Read [[0x60A7]], and see how much gas that cost. It should
+    #    ; cost more when it is not declared storage
+    #    [0x20] (gas)
+    #    [0xA0] @@0x60A7
+    #    [0x20] (- @0x20 (gas) 35)
+    #
+    #    ; Write to a different cell each time
+    #    [0x40] (gas)
+    #    [[(+ 0xF000 @@0)]] 0xBEEF
+    #    [0x40] (- @0x40 (gas) 0x78)
+    #
+    #    ; Read from a different cell each time
+    #    [0x60] (gas)
+    #    @@(+ 0xF010 @@0)
+    #    [0x60] (- @0x60 (gas) 0x7a)
+    #
+    #
+    # ... (13 more lines)
+    contract_17 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SLOAD(key=0x0))
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0xBEEF, value=0x2)
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x0), Op.GAS), 0x11),
+        )
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.MSTORE(offset=0xA0, value=Op.SLOAD(key=0x60A7))
+        + Op.MSTORE(
+            offset=0x20,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x20), Op.GAS), 0x23),
+        )
+        + Op.MSTORE(offset=0x40, value=Op.GAS)
+        + Op.SSTORE(key=Op.ADD(0xF000, Op.SLOAD(key=0x0)), value=0xBEEF)
+        + Op.MSTORE(
+            offset=0x40,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x40), Op.GAS), 0x78),
+        )
+        + Op.MSTORE(offset=0x60, value=Op.GAS)
+        + Op.POP(Op.SLOAD(key=Op.ADD(0xF010, Op.SLOAD(key=0x0))))
+        + Op.MSTORE(
+            offset=0x60,
+            value=Op.SUB(Op.SUB(Op.MLOAD(offset=0x60), Op.GAS), 0x7A),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(0x100, Op.SLOAD(key=0x0)), value=Op.MLOAD(offset=0x0)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(0x200, Op.SLOAD(key=0x0)), value=Op.MLOAD(offset=0x20)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(0x300, Op.SLOAD(key=0x0)), value=Op.MLOAD(offset=0x40)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(0x400, Op.SLOAD(key=0x0)), value=Op.MLOAD(offset=0x60)
+        )
+        + Op.JUMPI(pc=0x9B, condition=Op.GT(Op.SLOAD(key=0x0), 0x0))
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0xB4)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=Op.SUB(Op.SLOAD(key=0x0), 0x1))
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0x1016,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
+        storage={0: 15, 24743: 57005},
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001016),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 2, 1: 20003, 2: 107})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 2, 1: 22103, 2: 2107})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 2, 1: 20003, 2: 107})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 2, 1: 22103, 2: 2107})},
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_3: Account(
+                    storage={0: 2, 1: 22103, 2: 2107, 24743: 57005}
+                )
+            },
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_3: Account(
+                    storage={0: 2, 1: 20003, 2: 107, 24743: 57005}
+                )
+            },
+        },
+        {
+            "indexes": {"data": [6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_4: Account(storage={0: 2107})},
+        },
+        {
+            "indexes": {"data": [7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_4: Account(storage={0: 107})},
+        },
+        {
+            "indexes": {"data": [8], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_26: Account(storage={0: 20003, 1: 100})},
+        },
+        {
+            "indexes": {"data": [9], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_26: Account(storage={0: 22103, 1: 2100})},
+        },
+        {
+            "indexes": {"data": [10], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_7: Account(storage={0: 20001})},
+        },
+        {
+            "indexes": {"data": [11], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_7: Account(storage={0: 24601})},
+        },
+        {
+            "indexes": {"data": [12], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_9: Account(storage={0: 100})},
+        },
+        {
+            "indexes": {"data": [13], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_9: Account(storage={0: 4600})},
+        },
+        {
+            "indexes": {"data": [14, 15], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_11: Account(storage={0: 2989})},
+        },
+        {
+            "indexes": {"data": [16], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_14: Account(storage={0: 24589})},
+        },
+        {
+            "indexes": {"data": [17], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_14: Account(storage={0: 2989})},
+        },
+        {
+            "indexes": {"data": [18], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_16: Account(storage={0: 24589, 24743: 57005})},
+        },
+        {
+            "indexes": {"data": [19], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_16: Account(storage={0: 2989, 24743: 57005})},
+        },
+        {
+            "indexes": {"data": [20], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_17: Account(
+                    storage={
+                        0: 0,
+                        256: 103,
+                        257: 103,
+                        258: 103,
+                        259: 103,
+                        260: 103,
+                        261: 103,
+                        262: 103,
+                        263: 103,
+                        264: 103,
+                        265: 103,
+                        266: 103,
+                        267: 103,
+                        268: 103,
+                        269: 103,
+                        270: 103,
+                        271: 20003,
+                        512: 100,
+                        513: 100,
+                        514: 100,
+                        515: 100,
+                        516: 100,
+                        517: 100,
+                        518: 100,
+                        519: 100,
+                        520: 100,
+                        521: 100,
+                        522: 100,
+                        523: 100,
+                        524: 100,
+                        525: 100,
+                        526: 100,
+                        527: 100,
+                        768: 20003,
+                        769: 20003,
+                        770: 20003,
+                        771: 20003,
+                        772: 20003,
+                        773: 20003,
+                        774: 20003,
+                        775: 20003,
+                        776: 20003,
+                        777: 20003,
+                        778: 20003,
+                        779: 20003,
+                        780: 20003,
+                        781: 20003,
+                        782: 20003,
+                        783: 20003,
+                        1024: 100,
+                        1025: 100,
+                        1026: 100,
+                        1027: 100,
+                        1028: 100,
+                        1029: 100,
+                        1030: 100,
+                        1031: 100,
+                        1032: 100,
+                        1033: 100,
+                        1034: 100,
+                        1035: 100,
+                        1036: 100,
+                        1037: 100,
+                        1038: 100,
+                        1039: 100,
+                        24743: 57005,
+                        48879: 2,
+                        61440: 48879,
+                        61441: 48879,
+                        61442: 48879,
+                        61443: 48879,
+                        61444: 48879,
+                        61445: 48879,
+                        61446: 48879,
+                        61447: 48879,
+                        61448: 48879,
+                        61449: 48879,
+                        61450: 48879,
+                        61451: 48879,
+                        61452: 48879,
+                        61453: 48879,
+                        61454: 48879,
+                        61455: 48879,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [21], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_17: Account(
+                    storage={
+                        0: 0,
+                        256: 103,
+                        257: 103,
+                        258: 103,
+                        259: 103,
+                        260: 103,
+                        261: 103,
+                        262: 103,
+                        263: 103,
+                        264: 103,
+                        265: 103,
+                        266: 103,
+                        267: 103,
+                        268: 103,
+                        269: 103,
+                        270: 103,
+                        271: 22103,
+                        512: 100,
+                        513: 100,
+                        514: 100,
+                        515: 100,
+                        516: 100,
+                        517: 100,
+                        518: 100,
+                        519: 100,
+                        520: 100,
+                        521: 100,
+                        522: 100,
+                        523: 100,
+                        524: 100,
+                        525: 100,
+                        526: 100,
+                        527: 2100,
+                        768: 22103,
+                        769: 22103,
+                        770: 22103,
+                        771: 22103,
+                        772: 22103,
+                        773: 22103,
+                        774: 22103,
+                        775: 22103,
+                        776: 22103,
+                        777: 22103,
+                        778: 22103,
+                        779: 22103,
+                        780: 22103,
+                        781: 22103,
+                        782: 22103,
+                        783: 22103,
+                        1024: 2100,
+                        1025: 2100,
+                        1026: 2100,
+                        1027: 2100,
+                        1028: 2100,
+                        1029: 2100,
+                        1030: 2100,
+                        1031: 2100,
+                        1032: 2100,
+                        1033: 2100,
+                        1034: 2100,
+                        1035: 2100,
+                        1036: 2100,
+                        1037: 2100,
+                        1038: 2100,
+                        1039: 2100,
+                        24743: 57005,
+                        48879: 2,
+                        61440: 48879,
+                        61441: 48879,
+                        61442: 48879,
+                        61443: 48879,
+                        61444: 48879,
+                        61445: 48879,
+                        61446: 48879,
+                        61447: 48879,
+                        61448: 48879,
+                        61449: 48879,
+                        61450: 48879,
+                        61451: 48879,
+                        61452: 48879,
+                        61453: 48879,
+                        61454: 48879,
+                        61455: 48879,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [22], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=contract_18, nonce=0): Account(
+                    storage={0: 65535, 1: 20017}
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [23], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=contract_18, nonce=0): Account(
+                    storage={0: 65535, 1: 22117}
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [24], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xD82F21135ED7D7D833A9F2A0F1CF6C3DA214B8E3): Account(
+                    storage={0: 65535, 1: 20017}
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [25], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xD82F21135ED7D7D833A9F2A0F1CF6C3DA214B8E3): Account(
+                    storage={0: 65535, 1: 22117}
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [26], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=contract_20, nonce=0): Account(
+                    storage={0: 65535, 1: 20017}
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [27], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=contract_20, nonce=0): Account(
+                    storage={0: 65535, 1: 22117}
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [28], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x530508498D2AA75D8E591612809FEC3D37A45615): Account(
+                    storage={0: 65535, 1: 20017}
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [29], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x530508498D2AA75D8E591612809FEC3D37A45615): Account(
+                    storage={0: 65535, 1: 22117}
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [30], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=contract_22, nonce=0): Account(
+                    storage={0: 65535, 1: 20017, 2: 117}
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [31], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=contract_22, nonce=0): Account(
+                    storage={0: 65535, 1: 22117, 2: 117}
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [32], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x83FBDAE70258AC0FA837B701CC63CEDF48D4B6BF): Account(
+                    storage={0: 65535, 1: 20017, 2: 117}
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [33], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x83FBDAE70258AC0FA837B701CC63CEDF48D4B6BF): Account(
+                    storage={0: 65535, 1: 22117, 2: 117}
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [34], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_25: Account(storage={0: 24743, 1: 20017, 2: 117})
+            },
+        },
+        {
+            "indexes": {"data": [35], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_25: Account(storage={0: 24743, 1: 22117, 2: 117})
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x10),
+        Bytes("693c6139") + Hash(0x10),
+        Bytes("693c6139") + Hash(0x11),
+        Bytes("693c6139") + Hash(0x11),
+        Bytes("693c6139") + Hash(0x12),
+        Bytes("693c6139") + Hash(0x12),
+        Bytes("693c6139") + Hash(0x13),
+        Bytes("693c6139") + Hash(0x13),
+        Bytes("693c6139") + Hash(0x14),
+        Bytes("693c6139") + Hash(0x14),
+        Bytes("693c6139") + Hash(0x15),
+        Bytes("693c6139") + Hash(0x15),
+        Bytes("693c6139") + Hash(0x16),
+        Bytes("693c6139") + Hash(0x16),
+        Bytes("693c6139") + Hash(0x20),
+        Bytes("693c6139") + Hash(0x20),
+        Bytes("693c6139") + Hash(0x21),
+        Bytes("693c6139") + Hash(0x21),
+        Bytes("693c6139") + Hash(0x22),
+        Bytes("693c6139") + Hash(0x22),
+        Bytes("693c6139") + Hash(0x23),
+        Bytes("693c6139") + Hash(0x23),
+        Bytes("693c6139") + Hash(0x24),
+        Bytes("693c6139") + Hash(0x24),
+        Bytes("693c6139") + Hash(0x25),
+        Bytes("693c6139") + Hash(0x25),
+        Bytes("693c6139") + Hash(0x26),
+        Bytes("693c6139") + Hash(0x26),
+    ]
+    tx_gas = [16777216]
+    tx_value = [100000]
+    tx_access_lists: dict[int, list] = {
+        0: [
+            AccessList(
+                address=contract_0,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        1: [
+            AccessList(
+                address=contract_3,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        2: [
+            AccessList(
+                address=contract_2,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        3: [
+            AccessList(
+                address=contract_3,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        4: [
+            AccessList(
+                address=contract_1,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        5: [
+            AccessList(
+                address=contract_3,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        6: [
+            AccessList(
+                address=contract_4,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        7: [
+            AccessList(
+                address=contract_5,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        8: [
+            AccessList(
+                address=contract_6,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        9: [
+            AccessList(
+                address=contract_26,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        10: [
+            AccessList(
+                address=contract_8,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        11: [
+            AccessList(
+                address=contract_7,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        12: [
+            AccessList(
+                address=contract_10,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        13: [
+            AccessList(
+                address=contract_9,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        14: [
+            AccessList(
+                address=Address(0x0000000000000000000000000000000000000000),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        15: [
+            AccessList(
+                address=contract_12,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        16: [
+            AccessList(
+                address=contract_14,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        17: [
+            AccessList(
+                address=contract_13,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        18: [
+            AccessList(
+                address=contract_16,
+                storage_keys=[
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        19: [
+            AccessList(
+                address=contract_15,
+                storage_keys=[
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        20: [
+            AccessList(
+                address=contract_17,
+                storage_keys=[
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000beef"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f001"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f002"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f003"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f004"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f005"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f006"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f007"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f008"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f009"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f00a"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f00b"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f00c"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f00d"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f00e"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f00f"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f010"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f011"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f012"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f013"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f014"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f015"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f016"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f017"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f018"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f019"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f01a"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f01b"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f01c"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f01d"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f01e"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000f01f"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        21: [
+            AccessList(
+                address=Address(0xF000000000000000000000000000000000000116),
+                storage_keys=[
+                    Hash(
+                        "0x00000000000000000000000000000000000000000000000000000000000060a7"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000beef"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        22: [
+            AccessList(
+                address=Address(0xF342E57F24E0333F3AF34AF08FDBBE9C72CBD37C),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        23: [
+            AccessList(
+                address=Address(0xF342E57F24E0333F3AF34AF08FDBBE9C72CBD37C),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        24: [
+            AccessList(
+                address=Address(0xD82F21135ED7D7D833A9F2A0F1CF6C3DA214B8E3),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        25: [
+            AccessList(
+                address=Address(0xF342E57F24E0333F3AF34AF08FDBBE9C72CBD37C),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        26: [
+            AccessList(
+                address=Address(0x58FD03A2D731B2FB751E4A0F593D373EE77D39E6),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        27: [
+            AccessList(
+                address=Address(0x58FD03A2D731B2FB751E4A0F593D373EE77D39E6),
+                storage_keys=[
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000ffff"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        28: [
+            AccessList(
+                address=Address(0x530508498D2AA75D8E591612809FEC3D37A45615),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        29: [
+            AccessList(
+                address=Address(0x58FD03A2D731B2FB751E4A0F593D373EE77D39E6),
+                storage_keys=[
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000ffff"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        30: [
+            AccessList(
+                address=Address(0xB76AB2D646C4DF221EDD345957D0A396A2AB1B6D),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        31: [
+            AccessList(
+                address=Address(0x58FD03A2D731B2FB751E4A0F593D373EE77D39E6),
+                storage_keys=[
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000ffff"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        32: [
+            AccessList(
+                address=Address(0x83FBDAE70258AC0FA837B701CC63CEDF48D4B6BF),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        33: [
+            AccessList(
+                address=Address(0x58FD03A2D731B2FB751E4A0F593D373EE77D39E6),
+                storage_keys=[
+                    Hash(
+                        "0x000000000000000000000000000000000000000000000000000000000000ffff"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        34: [
+            AccessList(
+                address=contract_25,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+        35: [
+            AccessList(
+                address=contract_25,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+    }
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=100000,
-        access_list=tx_access_list,
+        to=contract_26,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        access_list=tx_access_lists.get(d),
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP3607/__init__.py b/tests/ported_static/stEIP3607/__init__.py
index fdf6a395294..295c5919689 100644
--- a/tests/ported_static/stEIP3607/__init__.py
+++ b/tests/ported_static/stEIP3607/__init__.py
@@ -1 +1 @@
-"""Tests ported from stEIP3607."""
+"""Ported static tests: stEIP3607."""  # noqa: N999
diff --git a/tests/ported_static/stEIP3607/test_init_colliding_with_non_empty_account.py b/tests/ported_static/stEIP3607/test_init_colliding_with_non_empty_account.py
index 92c410b9f51..6e40d5dac89 100644
--- a/tests/ported_static/stEIP3607/test_init_colliding_with_non_empty_account.py
+++ b/tests/ported_static/stEIP3607/test_init_colliding_with_non_empty_account.py
@@ -2,7 +2,7 @@
 Account attempts to send tx to create a contract on a non-empty address.
 
 Ported from:
-tests/static/state_tests/stEIP3607/initCollidingWithNonEmptyAccountFiller.yml
+state_tests/stEIP3607/initCollidingWithNonEmptyAccountFiller.yml
 """
 
 import pytest
@@ -14,7 +14,9 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,30 +24,57 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stEIP3607/initCollidingWithNonEmptyAccountFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stEIP3607/initCollidingWithNonEmptyAccountFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "60206000f3",
-        "6001600055600080808061271073d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d05af100",  # noqa: E501
-        "60016000556000602081612710f500",
-        "600160005560206000612710f000",
-        "6001600055600080808073d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d05af400",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
+        ),
     ],
-    ids=["case0", "case1", "case2", "case3", "case4"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_init_colliding_with_non_empty_account(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Account attempts to send tx to create a contract on a non-empty..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
+    contract_1 = Address(0xD0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -60,31 +89,79 @@ def test_init_colliding_with_non_empty_account(
     )
 
     pre[coinbase] = Account(balance=0, nonce=1)
-    # Source: raw bytecode
-    pre.deploy_contract(
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000600155
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x0),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=bytes.fromhex("00"),
+    # Source: raw
+    # 0x00
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.STOP,
         nonce=0,
-        address=Address("0xd0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0"),  # noqa: E501
+        address=Address(0xD0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.RETURN(offset=0x0, size=0x20),
+        Op.SSTORE(key=0x0, value=0x1)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_1,
+            value=0x2710,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.SSTORE(key=0x0, value=0x1)
+        + Op.CREATE2(value=0x2710, offset=Op.DUP2, size=0x20, salt=0x0)
+        + Op.STOP,
+        Op.SSTORE(key=0x0, value=0x1)
+        + Op.CREATE(value=0x2710, offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.SSTORE(key=0x0, value=0x1)
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=contract_1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+    ]
+    tx_gas = [400000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=400000,
-        value=100000,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post: dict = {}
+    post = {
+        contract_0: Account(
+            storage={},
+            code=bytes.fromhex("6000600155"),
+            balance=0xDE0B6B3A7640000,
+            nonce=0,
+        ),
+        contract_1: Account(balance=0),
+        Address(
+            0x05CD8493115C3299094A269E839E2F5F25691785
+        ): Account.NONEXISTENT,
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_calls.py b/tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_calls.py
index f4eb9703f62..89535daf33f 100644
--- a/tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_calls.py
+++ b/tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_calls.py
@@ -2,8 +2,7 @@
 Account with non-empty code attempts to send tx to call a contract.
 
 Ported from:
-tests/static/state_tests/stEIP3607
-transactionCollidingWithNonEmptyAccount_callsFiller.yml
+state_tests/stEIP3607/transactionCollidingWithNonEmptyAccount_callsFiller.yml
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -25,18 +25,18 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP3607/transactionCollidingWithNonEmptyAccount_callsFiller.yml",  # noqa: E501
+        "state_tests/stEIP3607/transactionCollidingWithNonEmptyAccount_callsFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.exception_test
+@pytest.mark.pre_alloc_mutable
 def test_transaction_colliding_with_non_empty_account_calls(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """Account with non-empty code attempts to send tx to call a contract."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
     sender = EOA(
         key=0x402790500EA083A617EC567407D9EC3BBB3A5C8B812547D9F66E8D7878B8A75D
     )
@@ -50,26 +50,24 @@ def test_transaction_colliding_with_non_empty_account_calls(
         gas_limit=71794957647893862,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x0),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=sender,  # noqa: E501
+    pre[coinbase] = Account(balance=0, nonce=1)
+    pre[sender] = Account(
+        balance=0xDE0B6B3A7640000, code=Op.SSTORE(key=0x1, value=0x0)
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x6000600155
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x0),
         nonce=0,
-        address=Address("0xd857dad5866e190fd86b79f027fb8ee8e60fbda7"),  # noqa: E501
+        address=Address(0xD857DAD5866E190FD86B79F027FB8EE8E60FBDA7),  # noqa: E501
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
         error=TransactionException.SENDER_NOT_EOA,
     )
 
diff --git a/tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_calls_itself.py b/tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_calls_itself.py
index f35f82a01ae..7e86eabc8e6 100644
--- a/tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_calls_itself.py
+++ b/tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_calls_itself.py
@@ -2,8 +2,7 @@
 Account with non-empty code attempts to send tx to call itself.
 
 Ported from:
-tests/static/state_tests/stEIP3607
-transactionCollidingWithNonEmptyAccount_callsItselfFiller.yml
+state_tests/stEIP3607/transactionCollidingWithNonEmptyAccount_callsItselfFiller.yml
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -25,18 +25,18 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP3607/transactionCollidingWithNonEmptyAccount_callsItselfFiller.yml",  # noqa: E501
+        "state_tests/stEIP3607/transactionCollidingWithNonEmptyAccount_callsItselfFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.exception_test
+@pytest.mark.pre_alloc_mutable
 def test_transaction_colliding_with_non_empty_account_calls_itself(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """Account with non-empty code attempts to send tx to call itself."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
     sender = EOA(
         key=0x402790500EA083A617EC567407D9EC3BBB3A5C8B812547D9F66E8D7878B8A75D
     )
@@ -50,20 +50,17 @@ def test_transaction_colliding_with_non_empty_account_calls_itself(
         gas_limit=71794957647893862,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x0),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=sender,  # noqa: E501
-    )
     pre[coinbase] = Account(balance=0, nonce=1)
+    pre[sender] = Account(
+        balance=0xDE0B6B3A7640000, code=Op.SSTORE(key=0x1, value=0x0)
+    )
 
     tx = Transaction(
         sender=sender,
         to=sender,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
         error=TransactionException.SENDER_NOT_EOA,
     )
 
diff --git a/tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_init_paris.py b/tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_init_paris.py
index f8c2587675b..2428bbb10d9 100644
--- a/tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_init_paris.py
+++ b/tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_init_paris.py
@@ -2,8 +2,7 @@
 Account with non-empty code attempts to send tx to create a contract.
 
 Ported from:
-tests/static/state_tests/stEIP3607
-transactionCollidingWithNonEmptyAccount_init_ParisFiller.yml
+state_tests/stEIP3607/transactionCollidingWithNonEmptyAccount_init_ParisFiller.yml
 """
 
 import pytest
@@ -17,6 +16,11 @@
     Transaction,
     TransactionException,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
@@ -24,30 +28,55 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP3607/transactionCollidingWithNonEmptyAccount_init_ParisFiller.yml",  # noqa: E501
+        "state_tests/stEIP3607/transactionCollidingWithNonEmptyAccount_init_ParisFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "00",
-        "60206000f3",
-        "600080808061271073cc7c3c64708397216f5f8aeb34a43f1749693fa95af100",
-        "600080808073cc7c3c64708397216f5f8aeb34a43f1749693fa95af400",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+            marks=pytest.mark.exception_test,
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+            marks=pytest.mark.exception_test,
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+            marks=pytest.mark.exception_test,
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+            marks=pytest.mark.exception_test,
+        ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.exception_test
 def test_transaction_colliding_with_non_empty_account_init_paris(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Account with non-empty code attempts to send tx to create a contract."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    contract = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    addr = Address(0x76FAE819612A29489A1A43208613D8F8557B8898)
     sender = EOA(
         key=0x3696BFBDBC65B14F4DC76D7762E0567E1DD55F053314276E47969D22E70A554E
     )
@@ -61,34 +90,64 @@ def test_transaction_colliding_with_non_empty_account_init_paris(
         gas_limit=71794957647893862,
     )
 
-    pre[contract] = Account(balance=10, nonce=0)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=bytes.fromhex("00"),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=sender,  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=bytes.fromhex("00"),
+    pre[coinbase] = Account(balance=0, nonce=1)
+    pre[sender] = Account(balance=0xDE0B6B3A7640000, code=Op.STOP)
+    pre[addr] = Account(balance=10)
+    # Source: raw
+    # 0x00
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STOP,
         balance=10,
         nonce=0,
-        address=Address("0xcc7c3c64708397216f5f8aeb34a43f1749693fa9"),  # noqa: E501
+        address=Address(0xCC7C3C64708397216F5F8AEB34A43F1749693FA9),  # noqa: E501
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Frontier": TransactionException.SENDER_NOT_EOA
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.STOP,
+        Op.RETURN(offset=0x0, size=0x20),
+        Op.CALL(
+            gas=Op.GAS,
+            address=addr_2,
+            value=0x2710,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=addr_2,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+    ]
+    tx_gas = [400000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=400000,
-        value=100000,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
         error=TransactionException.SENDER_NOT_EOA,
     )
 
-    post: dict = {}
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_send_paris.py b/tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_send_paris.py
index c369ce8469d..da4feb61952 100644
--- a/tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_send_paris.py
+++ b/tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_send_paris.py
@@ -2,8 +2,7 @@
 Account with non-empty code attempts to send tx to another account with...
 
 Ported from:
-tests/static/state_tests/stEIP3607
-transactionCollidingWithNonEmptyAccount_send_ParisFiller.yml
+state_tests/stEIP3607/transactionCollidingWithNonEmptyAccount_send_ParisFiller.yml
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -25,19 +25,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stEIP3607/transactionCollidingWithNonEmptyAccount_send_ParisFiller.yml",  # noqa: E501
+        "state_tests/stEIP3607/transactionCollidingWithNonEmptyAccount_send_ParisFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.exception_test
+@pytest.mark.pre_alloc_mutable
 def test_transaction_colliding_with_non_empty_account_send_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Account with non-empty code attempts to send tx to another..."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    contract = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Account with non-empty code attempts to send tx to another account..."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    addr = Address(0x76FAE819612A29489A1A43208613D8F8557B8898)
     sender = EOA(
         key=0x402790500EA083A617EC567407D9EC3BBB3A5C8B812547D9F66E8D7878B8A75D
     )
@@ -51,21 +51,18 @@ def test_transaction_colliding_with_non_empty_account_send_paris(
         gas_limit=71794957647893862,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x0),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=sender,  # noqa: E501
-    )
-    pre[contract] = Account(balance=10, nonce=0)
     pre[coinbase] = Account(balance=0, nonce=1)
+    pre[sender] = Account(
+        balance=0xDE0B6B3A7640000, code=Op.SSTORE(key=0x1, value=0x0)
+    )
+    pre[addr] = Account(balance=10)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=addr,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
         error=TransactionException.SENDER_NOT_EOA,
     )
 
diff --git a/tests/ported_static/stEIP3651_warmcoinbase/__init__.py b/tests/ported_static/stEIP3651_warmcoinbase/__init__.py
new file mode 100644
index 00000000000..645cecd5aff
--- /dev/null
+++ b/tests/ported_static/stEIP3651_warmcoinbase/__init__.py
@@ -0,0 +1 @@
+"""Ported static tests: stEIP3651_warmcoinbase."""  # noqa: N999
diff --git a/tests/ported_static/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py b/tests/ported_static/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py
new file mode 100644
index 00000000000..6bdb6c49c1a
--- /dev/null
+++ b/tests/ported_static/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py
@@ -0,0 +1,285 @@
+"""
+Test_coinbase_warm_account_call_gas.
+
+Ported from:
+state_tests/Shanghai/stEIP3651_warmcoinbase/coinbaseWarmAccountCallGasFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    [
+        "state_tests/Shanghai/stEIP3651_warmcoinbase/coinbaseWarmAccountCallGasFiller.yml"  # noqa: E501
+    ],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_coinbase_warm_account_call_gas(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Test_coinbase_warm_account_call_gas."""
+    coinbase = Address(0x50228C44ED92561D94511E8518A75AA463BD444B)
+    sender = EOA(
+        key=0x48DC5A9F099CAAAA557742CA3A990A94BE45B9969126A1BC74E5E8BE5A2B5B47
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[coinbase] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
+    # Source: yul
+    # berlin
+    # {
+    #    // Save the coinbase value
+    #    let cb := coinbase()
+    #
+    #    // Minimum gas spent on the measurement, which changes depending on
+    #    // the tested opcode
+    #    //
+    #    // Note that this value can change (mostly down) when Yul rolls out new  # noqa: E501
+    #    // optimizations
+    #    let measureGas
+    #
+    #    let gas0, gas1
+    #    let retVal
+    #
+    #    // We can only check the gas of one opcode per transaction,
+    #    // because the first check adds the account to the
+    #    // 'accessed_addresses' list.
+    #    switch calldataload(4)
+    #    case 0 {
+    #      // EXTCODESIZE
+    #      measureGas := 8
+    #      gas0 := gas()
+    #      retVal := extcodesize(cb)
+    #      gas1 := gas()
+    #    }
+    #    case 1 {
+    #      // EXTCODECOPY
+    #      measureGas := 5
+    #      gas0 := gas()
+    # ... (54 more lines)
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.COINBASE
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.PUSH1[0x0]
+        + Op.JUMPI(pc=0xCC, condition=Op.ISZERO(Op.DUP2))
+        + Op.JUMPI(pc=0xBA, condition=Op.EQ(0x1, Op.DUP2))
+        + Op.POP
+        + Op.JUMPI(pc=0xAD, condition=Op.EQ(0x2, Op.DUP1))
+        + Op.JUMPI(pc=0xA0, condition=Op.EQ(0x3, Op.DUP1))
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x4, Op.DUP1))
+        + Op.JUMPI(pc=0x74, condition=Op.EQ(0x5, Op.DUP1))
+        + Op.JUMPI(pc=0x5F, condition=Op.EQ(0x6, Op.DUP1))
+        + Op.PUSH1[0x7]
+        + Op.JUMPI(pc=0x40, condition=Op.EQ)
+        + Op.REVERT(offset=Op.DUP1, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH1[0xB]
+        + Op.PUSH1[0x0]
+        + Op.DUP1 * 3
+        + Op.GAS
+        + Op.SWAP6
+        + Op.PUSH2[0x2710]
+        + Op.STATICCALL
+        + Op.SWAP2
+        + Op.GAS
+        + Op.SWAP1
+        + Op.JUMPDEST
+        + Op.SUB
+        + Op.SSTORE(key=0x0, value=Op.SUB)
+        + Op.PUSH1[0x0]
+        + Op.MSTORE
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0xB]
+        + Op.PUSH1[0x0]
+        + Op.DUP1 * 3
+        + Op.GAS
+        + Op.SWAP6
+        + Op.PUSH2[0x2710]
+        + Op.DELEGATECALL
+        + Op.SWAP2
+        + Op.GAS
+        + Op.SWAP1
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0xB]
+        + Op.PUSH1[0x0]
+        + Op.DUP1 * 4
+        + Op.GAS
+        + Op.SWAP7
+        + Op.PUSH2[0x2710]
+        + Op.CALLCODE
+        + Op.SWAP2
+        + Op.GAS
+        + Op.SWAP1
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0xB]
+        + Op.PUSH1[0x0]
+        + Op.DUP1 * 4
+        + Op.GAS
+        + Op.SWAP7
+        + Op.PUSH2[0x2710]
+        + Op.CALL
+        + Op.SWAP2
+        + Op.GAS
+        + Op.SWAP1
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x8]
+        + Op.GAS
+        + Op.SWAP2
+        + Op.BALANCE
+        + Op.SWAP2
+        + Op.GAS
+        + Op.SWAP1
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x8]
+        + Op.GAS
+        + Op.SWAP2
+        + Op.EXTCODEHASH
+        + Op.SWAP2
+        + Op.GAS
+        + Op.SWAP1
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.SWAP2
+        + Op.PUSH1[0x5]
+        + Op.SWAP2
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.DUP1 * 2
+        + Op.GAS
+        + Op.SWAP4
+        + Op.EXTCODECOPY
+        + Op.GAS
+        + Op.SWAP1
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.PUSH1[0x8]
+        + Op.GAS
+        + Op.SWAP2
+        + Op.EXTCODESIZE
+        + Op.SWAP2
+        + Op.GAS
+        + Op.SWAP1
+        + Op.JUMP(pc=0x51),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=1,
+        address=Address(0xA4A48FC5F3526A9BC06A0136AB0BA1D9574D15BA),  # noqa: E501
+    )
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+        Bytes("693c6139") + Hash(0x7),
+    ]
+    tx_gas = [80000]
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        nonce=1,
+    )
+
+    post = {target: Account(storage={0: 100})}
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas_fail.py b/tests/ported_static/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas_fail.py
new file mode 100644
index 00000000000..cc58c53e55a
--- /dev/null
+++ b/tests/ported_static/stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas_fail.py
@@ -0,0 +1,266 @@
+"""
+Test_coinbase_warm_account_call_gas_fail.
+
+Ported from:
+state_tests/Shanghai/stEIP3651_warmcoinbase/coinbaseWarmAccountCallGasFailFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    [
+        "state_tests/Shanghai/stEIP3651_warmcoinbase/coinbaseWarmAccountCallGasFailFiller.yml"  # noqa: E501
+    ],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_coinbase_warm_account_call_gas_fail(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Test_coinbase_warm_account_call_gas_fail."""
+    coinbase = Address(0x50228C44ED92561D94511E8518A75AA463BD444B)
+    sender = EOA(
+        key=0x48DC5A9F099CAAAA557742CA3A990A94BE45B9969126A1BC74E5E8BE5A2B5B47
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[coinbase] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
+    # Source: yul
+    # berlin
+    # {
+    #    let cb := coinbase()
+    #    pop(call(0, cb, 0, 0, 0, 0, 0))
+    # }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=Op.DUP2,
+            address=Op.COINBASE,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=1,
+        address=Address(0x8DDF5D9A5251C41EFD2949F53DB0A464116C7C6E),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #    let cb := coinbase()
+    #    pop(callcode(0, cb, 0, 0, 0, 0, 0))
+    # }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=Op.DUP2,
+            address=Op.COINBASE,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=1,
+        address=Address(0x498516B6B2F25CB6A8E011A7C37A617B77E7D500),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #    let cb := coinbase()
+    #    pop(delegatecall(0, cb, 0, 0, 0, 0))
+    # }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.DUP2,
+            address=Op.COINBASE,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=1,
+        address=Address(0x8873820BB96DAA39DB93AE64A9D6397E4C6A48D7),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #    let cb := coinbase()
+    #    pop(staticcall(0, cb, 0, 0, 0, 0))
+    # }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=Op.DUP2,
+            address=Op.COINBASE,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=1,
+        address=Address(0x303B6790D019874A107418EB549E4E7766A64728),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #    // Depending on the called contract here, the subcall will perform
+    #    // another call/delegatecall/staticcall/callcode that will only succeed  # noqa: E501
+    #    // if coinbase is considered warm by default (post-Shanghai).
+    #    let calladdr := calldataload(4)
+    #
+    #    let callgas := 100
+    #    switch calladdr
+    #    case <contract:0x0000000000000000000000000000000000001000> {
+    #      // Extra: COINBASE + 6xPUSH1 + DUP6 + 2xPOP
+    #      callgas := add(callgas, 27)
+    #    }
+    #    case <contract:0x0000000000000000000000000000000000002000> {
+    #      // Extra: COINBASE + 6xPUSH1 + DUP6 + 2xPOP
+    #      callgas := add(callgas, 27)
+    #    }
+    #    case <contract:0x0000000000000000000000000000000000003000> {
+    #      // Extra: COINBASE + 5xPUSH1 + DUP6 + 2xPOP
+    #      callgas := add(callgas, 24)
+    #    }
+    #    case <contract:0x0000000000000000000000000000000000004000> {
+    #      // Extra: COINBASE + 5xPUSH1 + DUP6 + 2xPOP
+    #      callgas := add(callgas, 24)
+    #    }
+    #    // Call and save result
+    #    sstore(0, call(callgas, calladdr, 0, 0, 0, 0, 0))
+    #
+    # }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.DUP1 * 4
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.PUSH1[0x64]
+        + Op.DUP2
+        + Op.JUMPI(
+            pc=0x88,
+            condition=Op.EQ(
+                0x8DDF5D9A5251C41EFD2949F53DB0A464116C7C6E, Op.DUP1
+            ),
+        )
+        + Op.JUMPI(
+            pc=0x88,
+            condition=Op.EQ(
+                0x498516B6B2F25CB6A8E011A7C37A617B77E7D500, Op.DUP1
+            ),
+        )
+        + Op.JUMPI(
+            pc=0x80,
+            condition=Op.EQ(
+                0x8873820BB96DAA39DB93AE64A9D6397E4C6A48D7, Op.DUP1
+            ),
+        )
+        + Op.PUSH20[0x303B6790D019874A107418EB549E4E7766A64728]
+        + Op.JUMPI(pc=0x79, condition=Op.EQ)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=Op.CALL)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x18]
+        + Op.ADD
+        + Op.JUMP(pc=0x73)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x18]
+        + Op.ADD
+        + Op.JUMP(pc=0x73)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x1B]
+        + Op.ADD
+        + Op.JUMP(pc=0x73),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=1,
+        address=Address(0x0A92FC97BB4C47B3D5E9E96FBB1C3FC2F07DBA81),  # noqa: E501
+    )
+
+    tx_data = [
+        Bytes("693c6139") + Hash(addr, left_padding=True),
+        Bytes("693c6139") + Hash(addr_2, left_padding=True),
+        Bytes("693c6139") + Hash(addr_3, left_padding=True),
+        Bytes("693c6139") + Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [80000]
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        nonce=1,
+    )
+
+    post = {target: Account(storage={0: 1})}
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP3855_push0/__init__.py b/tests/ported_static/stEIP3855_push0/__init__.py
new file mode 100644
index 00000000000..8dc8522ac41
--- /dev/null
+++ b/tests/ported_static/stEIP3855_push0/__init__.py
@@ -0,0 +1 @@
+"""Ported static tests: stEIP3855_push0."""  # noqa: N999
diff --git a/tests/ported_static/stEIP3855_push0/test_push0.py b/tests/ported_static/stEIP3855_push0/test_push0.py
new file mode 100644
index 00000000000..82a91325613
--- /dev/null
+++ b/tests/ported_static/stEIP3855_push0/test_push0.py
@@ -0,0 +1,279 @@
+"""
+Test_push0.
+
+Ported from:
+state_tests/Shanghai/stEIP3855_push0/push0Filler.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Environment,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/Shanghai/stEIP3855_push0/push0Filler.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="single_push0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="1024_push0",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="1025_push0",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="push0_upd_storage",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="push0_upd_storage_sc",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="jumpdest",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_push0(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Test_push0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0x0000000000000000000000000000000000001000)
+    contract_2 = Address(0x0000000000000000000000000000000000000200)
+    contract_3 = Address(0x0000000000000000000000000000000000000300)
+    contract_4 = Address(0x0000000000000000000000000000000000000400)
+    contract_5 = Address(0x0000000000000000000000000000000000000500)
+    contract_6 = Address(0x0000000000000000000000000000000000000600)
+    contract_7 = Address(0x0000000000000000000000000000000000000700)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=89128960,
+    )
+
+    pre[sender] = Account(balance=0x100000000000)
+    # Source: yul
+    # berlin
+    #   {
+    #     sstore(0, call(100000, shr(96, calldataload(0)), 0, 0, 0, 0, 0))
+    #     sstore(1, 1)
+    #   }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=Op.SHR(0x60, Op.CALLDATALOAD(offset=Op.DUP1)),
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60015f55
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=Op.PUSH0, value=0x1),
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: raw
+    # 0x5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f17171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171760019055  # noqa: E501
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f17171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171760019055"  # noqa: E501
+        ),
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000200),  # noqa: E501
+    )
+    # Source: raw
+    # 0x5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f  # noqa: E501
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH0 * 1025,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000300),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60025f556000600155
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=Op.PUSH0, value=0x2)
+        + Op.SSTORE(key=0x1, value=0x0),
+        storage={0: 10, 1: 10},
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000400),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60ff5f5360016000f3
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=Op.PUSH0, value=0xFF)
+        + Op.RETURN(offset=0x0, size=0x1),
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000600),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6004565f5b60015f5500
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMP(pc=0x4)
+        + Op.PUSH0
+        + Op.JUMPDEST
+        + Op.SSTORE(key=Op.PUSH0, value=0x1)
+        + Op.STOP,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000700),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #    sstore(0,
+    #      staticcall(100000, 0x0000000000000000000000000000000000000600, 0, 0, 0, 0))  # noqa: E501
+    #    sstore(1, 1)
+    #    returndatacopy(0x1f, 0x0, 0x1)
+    #    sstore(0x2, mload(0x00))
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=0x600,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.RETURNDATACOPY(dest_offset=0x1F, offset=0x0, size=0x1)
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000500),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(storage={0: 1}),
+                contract_0: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_2: Account(storage={0: 1}),
+                contract_0: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_4: Account(storage={0: 2, 1: 0}),
+                contract_0: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_5: Account(storage={0: 1, 1: 1, 2: 255}),
+                contract_6: Account(storage={}),
+                contract_0: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_7: Account(storage={0: 1}),
+                contract_0: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        contract_1,
+        contract_2,
+        contract_3,
+        contract_4,
+        contract_5,
+        contract_7,
+    ]
+    tx_gas = [700000]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP3855_push0/test_push0_gas.py b/tests/ported_static/stEIP3855_push0/test_push0_gas.py
new file mode 100644
index 00000000000..e9a870b6600
--- /dev/null
+++ b/tests/ported_static/stEIP3855_push0/test_push0_gas.py
@@ -0,0 +1,65 @@
+"""
+Test_push0_gas.
+
+Ported from:
+state_tests/Shanghai/stEIP3855_push0/push0GasFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/Shanghai/stEIP3855_push0/push0GasFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.pre_alloc_mutable
+def test_push0_gas(
+    state_test: StateTestFiller,
+    pre: Alloc,
+) -> None:
+    """Test_push0_gas."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x989680)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=89128960,
+    )
+
+    # Source: raw
+    # 0x5a6000555f5a6000540360015500
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.PUSH0
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.SLOAD(key=0x0), Op.GAS))
+        + Op.STOP,
+        nonce=0,
+    )
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=Bytes(""),
+        gas_limit=100000,
+    )
+
+    post = {target: Account(storage={0: 0x13496, 1: 22107})}
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP3855_push0/test_push0_gas2.py b/tests/ported_static/stEIP3855_push0/test_push0_gas2.py
new file mode 100644
index 00000000000..7405bce15a3
--- /dev/null
+++ b/tests/ported_static/stEIP3855_push0/test_push0_gas2.py
@@ -0,0 +1,165 @@
+"""
+Test_push0_gas2.
+
+Ported from:
+state_tests/Shanghai/stEIP3855_push0/push0Gas2Filler.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Environment,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/Shanghai/stEIP3855_push0/push0Gas2Filler.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="use_push0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="use_push1_00",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_push0_gas2(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Test_push0_gas2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0x0000000000000000000000000000000000001000)
+    contract_2 = Address(0x0000000000000000000000000000000000000200)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=89128960,
+    )
+
+    pre[sender] = Account(balance=0x989680)
+    # Source: yul
+    # berlin
+    # {
+    #    sstore(0, call(100000, shr(96, calldataload(0)), 0, 0, 0, 0, 0))
+    #    sstore(1, 1)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=Op.SHR(0x60, Op.CALLDATALOAD(offset=Op.DUP1)),
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x5a5f5a9091039055
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.GAS
+        + Op.PUSH0
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.SUB
+        + Op.SWAP1
+        + Op.SSTORE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: raw
+    # 0x5a60005a9091039055
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.GAS
+        + Op.PUSH1[0x0]
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.SUB
+        + Op.SWAP1
+        + Op.SSTORE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000200),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(storage={0: 4}, balance=0),
+                contract_0: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_2: Account(storage={0: 5}, balance=0),
+                contract_0: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        contract_1,
+        contract_2,
+    ]
+    tx_gas = [300000]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP3860_limitmeterinitcode/__init__.py b/tests/ported_static/stEIP3860_limitmeterinitcode/__init__.py
new file mode 100644
index 00000000000..e38f7d5eb67
--- /dev/null
+++ b/tests/ported_static/stEIP3860_limitmeterinitcode/__init__.py
@@ -0,0 +1 @@
+"""Ported static tests: stEIP3860_limitmeterinitcode."""  # noqa: N999
diff --git a/tests/ported_static/stEIP3860_limitmeterinitcode/test_create2_init_code_size_limit.py b/tests/ported_static/stEIP3860_limitmeterinitcode/test_create2_init_code_size_limit.py
new file mode 100644
index 00000000000..006e46e0616
--- /dev/null
+++ b/tests/ported_static/stEIP3860_limitmeterinitcode/test_create2_init_code_size_limit.py
@@ -0,0 +1,194 @@
+"""
+Test_create2_init_code_size_limit.
+
+Ported from:
+state_tests/Shanghai/stEIP3860_limitmeterinitcode/create2InitCodeSizeLimitFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    [
+        "state_tests/Shanghai/stEIP3860_limitmeterinitcode/create2InitCodeSizeLimitFiller.yml"  # noqa: E501
+    ],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.valid_before("EIP7954")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="valid",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="invalid",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_create2_init_code_size_limit(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Test_create2_init_code_size_limit."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=20000000,
+    )
+
+    pre[sender] = Account(balance=0xBEBC200)
+    # Source: yul
+    # berlin
+    # {
+    #   // :yul { codecopy(0x00, 0x00, 0x0a) return(0x00, 0x0a) }
+    #   mstore(0, 0x600a80600080396000f300000000000000000000000000000000000000000000)  # noqa: E501
+    #   // get initcode size from calldata
+    #   let initcode_size := calldataload(0)
+    #   let gas_before := gas()
+    #   let create_result := create2(0, 0, initcode_size, 0xdeadbeef)
+    #   sstore(10, sub(gas_before, gas()))
+    #   sstore(0, create_result)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SHL(0xB0, 0x600A80600080396000F3)
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.CALLDATALOAD
+        + Op.PUSH4[0xDEADBEEF]
+        + Op.GAS
+        + Op.SWAP2
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.CREATE2
+        + Op.SWAP1
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SSTORE(key=0xA, value=Op.SUB)
+        + Op.PUSH1[0x0]
+        + Op.SSTORE
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #   mstore(0, calldataload(0))
+    #   let call_result := call(10000000, 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b, 0, 0, calldatasize(), 0, 0)  # noqa: E501
+    #   sstore(0, call_result)
+    #   sstore(1, 1)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x989680,
+                address=contract_1,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=Op.CALLDATASIZE,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(storage={0: 1, 1: 1}),
+                contract_1: Account(
+                    storage={
+                        0: 0x9E7A3337D18C31FE4C1FE51AB2DA6CFD3629923D,
+                        10: 55539,
+                    },
+                ),
+                Address(0x9E7A3337D18C31FE4C1FE51AB2DA6CFD3629923D): Account(
+                    storage={},
+                    code=bytes.fromhex("600a80600080396000f3"),
+                    balance=0,
+                    nonce=1,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(storage={0: 0, 1: 1}, nonce=0),
+                contract_1: Account(storage={}),
+                Address(
+                    0x67D49AE27E912B3B508D62CE1E463298DB6EDF32
+                ): Account.NONEXISTENT,
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0xC000),
+        Hash(0xC001),
+    ]
+    tx_gas = [15000000]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP3860_limitmeterinitcode/test_create_init_code_size_limit.py b/tests/ported_static/stEIP3860_limitmeterinitcode/test_create_init_code_size_limit.py
new file mode 100644
index 00000000000..dd3acfc9717
--- /dev/null
+++ b/tests/ported_static/stEIP3860_limitmeterinitcode/test_create_init_code_size_limit.py
@@ -0,0 +1,195 @@
+"""
+Test_create_init_code_size_limit.
+
+Ported from:
+state_tests/Shanghai/stEIP3860_limitmeterinitcode/createInitCodeSizeLimitFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    [
+        "state_tests/Shanghai/stEIP3860_limitmeterinitcode/createInitCodeSizeLimitFiller.yml"  # noqa: E501
+    ],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.valid_before("EIP7954")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="valid",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="invalid",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_create_init_code_size_limit(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Test_create_init_code_size_limit."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB)
+    contract_1 = Address(0x000000000000000000000000000000000000C0DE)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=20000000,
+    )
+
+    pre[sender] = Account(balance=0xBEBC200, nonce=1)
+    # Source: yul
+    # berlin
+    # {
+    #   // :yul { codecopy(0x00, 0x00, 0x0a) return(0x00, 0x0a) }
+    #   mstore(0, 0x600a80600080396000f300000000000000000000000000000000000000000000)  # noqa: E501
+    #   // get initcode size from calldata
+    #   let initcode_size := calldataload(0)
+    #   let gas_before := gas()
+    #   let create_result := create(0, 0, initcode_size)
+    #   sstore(10, sub(gas_before, gas()))
+    #   sstore(0, create_result)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SHL(0xB0, 0x600A80600080396000F3)
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.CALLDATALOAD
+        + Op.GAS
+        + Op.SWAP1
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.CREATE
+        + Op.SWAP1
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SSTORE(key=0xA, value=Op.SUB)
+        + Op.PUSH1[0x0]
+        + Op.SSTORE
+        + Op.STOP,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000C0DE),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #   mstore(0, calldataload(0))
+    #   let call_result := call(10000000, 0xc0de, 0, 0, calldatasize(), 0, 0)
+    #   sstore(0, call_result)
+    #   sstore(1, 1)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x989680,
+                address=contract_1,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=Op.CALLDATASIZE,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=Op.DUP1, value=0x1)
+        + Op.STOP,
+        nonce=1,
+        address=Address(0xBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=2),
+                contract_0: Account(storage={0: 1, 1: 1}),
+                contract_1: Account(
+                    storage={
+                        0: compute_create_address(address=contract_1, nonce=1),
+                        10: 46323,
+                    },
+                ),
+                compute_create_address(address=contract_1, nonce=1): Account(
+                    storage={},
+                    code=bytes.fromhex("600a80600080396000f3"),
+                    balance=0,
+                    nonce=1,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=2),
+                contract_0: Account(storage={0: 0, 1: 1}, nonce=1),
+                contract_1: Account(storage={}),
+                Address(
+                    0x682327124C5D2DC0CD2158BA65D37AC3D2140C91
+                ): Account.NONEXISTENT,
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0xC000),
+        Hash(0xC001),
+    ]
+    tx_gas = [15000000]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        nonce=1,
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP3860_limitmeterinitcode/test_creation_tx_init_code_size_limit.py b/tests/ported_static/stEIP3860_limitmeterinitcode/test_creation_tx_init_code_size_limit.py
new file mode 100644
index 00000000000..8a935525416
--- /dev/null
+++ b/tests/ported_static/stEIP3860_limitmeterinitcode/test_creation_tx_init_code_size_limit.py
@@ -0,0 +1,2655 @@
+"""
+Test_creation_tx_init_code_size_limit.
+
+Ported from:
+state_tests/Shanghai/stEIP3860_limitmeterinitcode/creationTxInitCodeSizeLimitFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+    TransactionException,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    [
+        "state_tests/Shanghai/stEIP3860_limitmeterinitcode/creationTxInitCodeSizeLimitFiller.yml"  # noqa: E501
+    ],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.valid_before("EIP7954")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="valid",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="invalid",
+            marks=pytest.mark.exception_test,
+        ),
+    ],
+)
+def test_creation_tx_init_code_size_limit(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Test_creation_tx_init_code_size_limit."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xBEBC200)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=20000000,
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": ["Cancun"],
+            "result": {
+                sender: Account(balance=0xBA82720, nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={},
+                    code=bytes.fromhex("60606040523615610074576000357c01"),
+                    balance=0,
+                    nonce=1,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Prague"],
+            "result": {
+                sender: Account(balance=0xB562920, nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={},
+                    code=bytes.fromhex("60606040523615610074576000357c01"),
+                    balance=0,
+                    nonce=1,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=0),
+                compute_create_address(
+                    address=sender, nonce=0
+                ): Account.NONEXISTENT,
+            },
+            "expect_exception": {
+                ">=Cancun": TransactionException.INITCODE_SIZE_EXCEEDED
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(
+            0x601080600B6000396000F360606040523615610074576000357C010000000000
+        )
+        + Hash(0x90048063A3B9F3E514)
+        + Hash(
+            0x610079578063B50345B61461008D578063D4F639EA146100A1578063D9BB316F
+        )
+        + Hash(
+            0x146100B5578063E22A5D5B146100C9578063F983C0FA146100DD57610074565B
+        )
+        + Hash(
+            0x610002565B346100025761008B60048050506100F1565B005B34610002576100
+        )
+        + Hash(
+            0x9F6004805050611097565B005B34610002576100B3600480505061203D565B00
+        )
+        + Hash(
+            0x5B34610002576100C76004805050612FE3565B005B34610002576100DB600480
+        )
+        + Hash(
+            0x5050613F89565B005B34610002576100EF6004805050614F2F565B005B600073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000001905080507310000000000000
+        )
+        + Hash(0x190508050731000000000000000000000000000)
+        + Hash(0x29050805073100000000000000000000000000000000000000290)
+        + Hash(
+            0x5080507310000000000000000000000000000000000000039050805073100000
+        )
+        + Hash(0x3905080507310000000000000000000)
+        + Hash(0x490508050731000000000000000000000000000000000)
+        + Hash(0x49050805073100000000000000000000000000000000000000590508050)
+        + Hash(
+            0x7310000000000000000000000000000000000000059050805073100000000000
+        )
+        + Hash(0x6905080507310000000000000000000000000)
+        + Hash(0x690508050731000000000000000000000000000000000000007)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000000790508050731000
+        )
+        + Hash(0x89050805073100000000000000000)
+        + Hash(0x8905080507310000000000000000000000000000000)
+        + Hash(0x990508050731000000000000000000000000000000000000009905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000001090508050731000000000
+        )
+        + Hash(0x109050805073100000000000000000000000)
+        + Hash(0x101905080507310000000000000000000000000000000000001)
+        + Hash(
+            0x190508050731000000000000000000000000000000000000102905080507310
+        )
+        + Hash(0x10290508050731000000000000000)
+        + Hash(0x1039050805073100000000000000000000000000000)
+        + Hash(0x103905080507310000000000000000000000000000000000001049050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000104905080507310000000
+        )
+        + Hash(0x10590508050731000000000000000000000)
+        + Hash(0x1059050805073100000000000000000000000000000000000)
+        + Hash(
+            0x106905080507310000000000000000000000000000000000001069050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000107905080507310000000000000
+        )
+        + Hash(0x10790508050731000000000000000000000000000)
+        + Hash(0x1089050805073100000000000000000000000000000000000010890)
+        + Hash(
+            0x5080507310000000000000000000000000000000000001099050805073100000
+        )
+        + Hash(0x109905080507310000000000000000000)
+        + Hash(0x11090508050731000000000000000000000000000000000)
+        + Hash(0x1109050805073100000000000000000000000000000000000020190508050)
+        + Hash(
+            0x7310000000000000000000000000000000000002019050805073100000000000
+        )
+        + Hash(0x202905080507310000000000000000000000000)
+        + Hash(0x20290508050731000000000000000000000000000000000000203)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000020390508050731000
+        )
+        + Hash(0x2049050805073100000000000000000)
+        + Hash(0x204905080507310000000000000000000000000000000)
+        + Hash(0x20590508050731000000000000000000000000000000000000204905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000020690508050731000000000
+        )
+        + Hash(0x2069050805073100000000000000000000000)
+        + Hash(0x207905080507310000000000000000000000000000000000002)
+        + Hash(
+            0x790508050731000000000000000000000000000000000000208905080507310
+        )
+        + Hash(0x20890508050731000000000000000)
+        + Hash(0x2099050805073100000000000000000000000000000)
+        + Hash(0x209905080507310000000000000000000000000000000000002109050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000210905080507310000000
+        )
+        + Hash(0x30190508050731000000000000000000000)
+        + Hash(0x3019050805073100000000000000000000000000000000000)
+        + Hash(
+            0x302905080507310000000000000000000000000000000000003029050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000303905080507310000000000000
+        )
+        + Hash(0x30390508050731000000000000000000000000000)
+        + Hash(0x3049050805073100000000000000000000000000000000000030490)
+        + Hash(
+            0x5080507310000000000000000000000000000000000003059050805073100000
+        )
+        + Hash(0x305905080507310000000000000000000)
+        + Hash(0x30690508050731000000000000000000000000000000000)
+        + Hash(0x3069050805073100000000000000000000000000000000000030790508050)
+        + Hash(
+            0x7310000000000000000000000000000000000003079050805073100000000000
+        )
+        + Hash(0x308905080507310000000000000000000000000)
+        + Hash(0x30890508050731000000000000000000000000000000000000309)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000030990508050731000
+        )
+        + Hash(0x3109050805073100000000000000000)
+        + Hash(0x310905080507310000000000000000000000000000000)
+        + Hash(0x190508050731000000000000000000000000000000000000001905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000000290508050731000000000
+        )
+        + Hash(0x29050805073100000000000000000000000)
+        + Hash(0x3905080507310000000000000000000000000000000000000)
+        + Hash(
+            0x390508050731000000000000000000000000000000000000004905080507310
+        )
+        + Hash(0x490508050731000000000000000)
+        + Hash(0x59050805073100000000000000000000000000000)
+        + Hash(0x5905080507310000000000000000000000000000000000000069050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000006905080507310000000
+        )
+        + Hash(0x790508050731000000000000000000000)
+        + Hash(0x79050805073100000000000000000000000000000000000)
+        + Hash(0x8905080507310000000000000000000000000000000000000089050805073)
+        + Hash(
+            0x1000000000000000000000000000000000000009905080507310000000000000
+        )
+        + Hash(0x990508050731000000000000000000000000000)
+        + Hash(0x109050805073100000000000000000000000000000000000001090)
+        + Hash(
+            0x5080507310000000000000000000000000000000000001019050805073100000
+        )
+        + Hash(0x101905080507310000000000000000000)
+        + Hash(0x10290508050731000000000000000000000000000000000)
+        + Hash(0x1029050805073100000000000000000000000000000000000010390508050)
+        + Hash(
+            0x7310000000000000000000000000000000000001039050805073100000000000
+        )
+        + Hash(0x104905080507310000000000000000000000000)
+        + Hash(0x10490508050731000000000000000000000000000000000000105)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000010590508050731000
+        )
+        + Hash(0x1069050805073100000000000000000)
+        + Hash(0x106905080507310000000000000000000000000000000)
+        + Hash(0x10790508050731000000000000000000000000000000000000107905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000010890508050731000000000
+        )
+        + Hash(0x1089050805073100000000000000000000000)
+        + Hash(0x109905080507310000000000000000000000000000000000001)
+        + Hash(
+            0x990508050731000000000000000000000000000000000000110905080507310
+        )
+        + Hash(0x11090508050731000000000000000)
+        + Hash(0x2019050805073100000000000000000000000000000)
+        + Hash(0x201905080507310000000000000000000000000000000000002029050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000202905080507310000000
+        )
+        + Hash(0x20390508050731000000000000000000000)
+        + Hash(0x2039050805073100000000000000000000000000000000000)
+        + Hash(
+            0x204905080507310000000000000000000000000000000000002049050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000205905080507310000000000000
+        )
+        + Hash(0x20490508050731000000000000000000000000000)
+        + Hash(0x2069050805073100000000000000000000000000000000000020690)
+        + Hash(
+            0x5080507310000000000000000000000000000000000002079050805073100000
+        )
+        + Hash(0x207905080507310000000000000000000)
+        + Hash(0x20890508050731000000000000000000000000000000000)
+        + Hash(0x2089050805073100000000000000000000000000000000000020990508050)
+        + Hash(
+            0x7310000000000000000000000000000000000002099050805073100000000000
+        )
+        + Hash(0x210905080507310000000000000000000000000)
+        + Hash(0x21090508050731000000000000000000000000000000000000301)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000030190508050731000
+        )
+        + Hash(0x3029050805073100000000000000000)
+        + Hash(0x302905080507310000000000000000000000000000000)
+        + Hash(0x30390508050731000000000000000000000000000000000000303905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000030490508050731000000000
+        )
+        + Hash(0x3049050805073100000000000000000000000)
+        + Hash(0x305905080507310000000000000000000000000000000000003)
+        + Hash(
+            0x590508050731000000000000000000000000000000000000306905080507310
+        )
+        + Hash(0x30690508050731000000000000000)
+        + Hash(0x3079050805073100000000000000000000000000000)
+        + Hash(0x307905080507310000000000000000000000000000000000003089050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000308905080507310000000
+        )
+        + Hash(0x30990508050731000000000000000000000)
+        + Hash(0x3099050805073100000000000000000000000000000000000)
+        + Hash(
+            0x31090508050731000000000000000000000000000000000000310905080505B
+        )
+        + Hash(
+            0x50565B6000731000000000000000000000000000000000000001905080507310
+        )
+        + Hash(0x190508050731000000000000000)
+        + Hash(0x29050805073100000000000000000000000000000)
+        + Hash(0x2905080507310000000000000000000000000000000000000039050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000003905080507310000000
+        )
+        + Hash(0x490508050731000000000000000000000)
+        + Hash(0x49050805073100000000000000000000000000000000000)
+        + Hash(0x5905080507310000000000000000000000000000000000000059050805073)
+        + Hash(
+            0x1000000000000000000000000000000000000006905080507310000000000000
+        )
+        + Hash(0x690508050731000000000000000000000000000)
+        + Hash(0x79050805073100000000000000000000000000000000000000790)
+        + Hash(
+            0x5080507310000000000000000000000000000000000000089050805073100000
+        )
+        + Hash(0x8905080507310000000000000000000)
+        + Hash(0x990508050731000000000000000000000000000000000)
+        + Hash(0x99050805073100000000000000000000000000000000000001090508050)
+        + Hash(
+            0x7310000000000000000000000000000000000000109050805073100000000000
+        )
+        + Hash(0x101905080507310000000000000000000000000)
+        + Hash(0x10190508050731000000000000000000000000000000000000102)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000010290508050731000
+        )
+        + Hash(0x1039050805073100000000000000000)
+        + Hash(0x103905080507310000000000000000000000000000000)
+        + Hash(0x10490508050731000000000000000000000000000000000000104905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000010590508050731000000000
+        )
+        + Hash(0x1059050805073100000000000000000000000)
+        + Hash(0x106905080507310000000000000000000000000000000000001)
+        + Hash(
+            0x690508050731000000000000000000000000000000000000107905080507310
+        )
+        + Hash(0x10790508050731000000000000000)
+        + Hash(0x1089050805073100000000000000000000000000000)
+        + Hash(0x108905080507310000000000000000000000000000000000001099050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000109905080507310000000
+        )
+        + Hash(0x11090508050731000000000000000000000)
+        + Hash(0x1109050805073100000000000000000000000000000000000)
+        + Hash(
+            0x201905080507310000000000000000000000000000000000002019050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000202905080507310000000000000
+        )
+        + Hash(0x20290508050731000000000000000000000000000)
+        + Hash(0x2039050805073100000000000000000000000000000000000020390)
+        + Hash(
+            0x5080507310000000000000000000000000000000000002049050805073100000
+        )
+        + Hash(0x204905080507310000000000000000000)
+        + Hash(0x20590508050731000000000000000000000000000000000)
+        + Hash(0x2049050805073100000000000000000000000000000000000020690508050)
+        + Hash(
+            0x7310000000000000000000000000000000000002069050805073100000000000
+        )
+        + Hash(0x207905080507310000000000000000000000000)
+        + Hash(0x20790508050731000000000000000000000000000000000000208)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000020890508050731000
+        )
+        + Hash(0x2099050805073100000000000000000)
+        + Hash(0x209905080507310000000000000000000000000000000)
+        + Hash(0x21090508050731000000000000000000000000000000000000210905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000030190508050731000000000
+        )
+        + Hash(0x3019050805073100000000000000000000000)
+        + Hash(0x302905080507310000000000000000000000000000000000003)
+        + Hash(
+            0x290508050731000000000000000000000000000000000000303905080507310
+        )
+        + Hash(0x30390508050731000000000000000)
+        + Hash(0x3049050805073100000000000000000000000000000)
+        + Hash(0x304905080507310000000000000000000000000000000000003059050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000305905080507310000000
+        )
+        + Hash(0x30690508050731000000000000000000000)
+        + Hash(0x3069050805073100000000000000000000000000000000000)
+        + Hash(
+            0x307905080507310000000000000000000000000000000000003079050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000308905080507310000000000000
+        )
+        + Hash(0x30890508050731000000000000000000000000000)
+        + Hash(0x3099050805073100000000000000000000000000000000000030990)
+        + Hash(
+            0x5080507310000000000000000000000000000000000003109050805073100000
+        )
+        + Hash(0x310905080507310000000000000000000)
+        + Hash(0x190508050731000000000000000000000000000000000)
+        + Hash(0x19050805073100000000000000000000000000000000000000290508050)
+        + Hash(
+            0x7310000000000000000000000000000000000000029050805073100000000000
+        )
+        + Hash(0x3905080507310000000000000000000000000)
+        + Hash(0x390508050731000000000000000000000000000000000000004)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000000490508050731000
+        )
+        + Hash(0x59050805073100000000000000000)
+        + Hash(0x5905080507310000000000000000000000000000000)
+        + Hash(0x690508050731000000000000000000000000000000000000006905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000000790508050731000000000
+        )
+        + Hash(0x79050805073100000000000000000000000)
+        + Hash(0x8905080507310000000000000000000000000000000000000)
+        + Hash(
+            0x890508050731000000000000000000000000000000000000009905080507310
+        )
+        + Hash(0x990508050731000000000000000)
+        + Hash(0x109050805073100000000000000000000000000000)
+        + Hash(0x10905080507310000000000000000000000000000000000001019050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000101905080507310000000
+        )
+        + Hash(0x10290508050731000000000000000000000)
+        + Hash(0x1029050805073100000000000000000000000000000000000)
+        + Hash(
+            0x103905080507310000000000000000000000000000000000001039050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000104905080507310000000000000
+        )
+        + Hash(0x10490508050731000000000000000000000000000)
+        + Hash(0x1059050805073100000000000000000000000000000000000010590)
+        + Hash(
+            0x5080507310000000000000000000000000000000000001069050805073100000
+        )
+        + Hash(0x106905080507310000000000000000000)
+        + Hash(0x10790508050731000000000000000000000000000000000)
+        + Hash(0x1079050805073100000000000000000000000000000000000010890508050)
+        + Hash(
+            0x7310000000000000000000000000000000000001089050805073100000000000
+        )
+        + Hash(0x109905080507310000000000000000000000000)
+        + Hash(0x10990508050731000000000000000000000000000000000000110)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000011090508050731000
+        )
+        + Hash(0x2019050805073100000000000000000)
+        + Hash(0x201905080507310000000000000000000000000000000)
+        + Hash(0x20290508050731000000000000000000000000000000000000202905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000020390508050731000000000
+        )
+        + Hash(0x2039050805073100000000000000000000000)
+        + Hash(0x204905080507310000000000000000000000000000000000002)
+        + Hash(
+            0x490508050731000000000000000000000000000000000000205905080507310
+        )
+        + Hash(0x20490508050731000000000000000)
+        + Hash(0x2069050805073100000000000000000000000000000)
+        + Hash(0x206905080507310000000000000000000000000000000000002079050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000207905080507310000000
+        )
+        + Hash(0x20890508050731000000000000000000000)
+        + Hash(0x2089050805073100000000000000000000000000000000000)
+        + Hash(
+            0x209905080507310000000000000000000000000000000000002099050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000210905080507310000000000000
+        )
+        + Hash(0x21090508050731000000000000000000000000000)
+        + Hash(0x3019050805073100000000000000000000000000000000000030190)
+        + Hash(
+            0x5080507310000000000000000000000000000000000003029050805073100000
+        )
+        + Hash(0x302905080507310000000000000000000)
+        + Hash(0x30390508050731000000000000000000000000000000000)
+        + Hash(0x3039050805073100000000000000000000000000000000000030490508050)
+        + Hash(
+            0x7310000000000000000000000000000000000003049050805073100000000000
+        )
+        + Hash(0x305905080507310000000000000000000000000)
+        + Hash(0x30590508050731000000000000000000000000000000000000306)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000030690508050731000
+        )
+        + Hash(0x3079050805073100000000000000000)
+        + Hash(0x307905080507310000000000000000000000000000000)
+        + Hash(0x30890508050731000000000000000000000000000000000000308905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000030990508050731000000000
+        )
+        + Hash(0x3099050805073100000000000000000000000)
+        + Hash(0x310905080507310000000000000000000000000000000000003)
+        + Hash(
+            0x10905080505B50565B6000731000000000000000000000000000000000000001
+        )
+        + Hash(
+            0x9050805073100000000000000000000000000000000000000190508050731000
+        )
+        + Hash(0x29050805073100000000000000000)
+        + Hash(0x2905080507310000000000000000000000000000000)
+        + Hash(0x390508050731000000000000000000000000000000000000003905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000000490508050731000000000
+        )
+        + Hash(0x49050805073100000000000000000000000)
+        + Hash(0x5905080507310000000000000000000000000000000000000)
+        + Hash(
+            0x590508050731000000000000000000000000000000000000006905080507310
+        )
+        + Hash(0x690508050731000000000000000)
+        + Hash(0x79050805073100000000000000000000000000000)
+        + Hash(0x7905080507310000000000000000000000000000000000000089050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000008905080507310000000
+        )
+        + Hash(0x990508050731000000000000000000000)
+        + Hash(0x99050805073100000000000000000000000000000000000)
+        + Hash(
+            0x10905080507310000000000000000000000000000000000000109050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000101905080507310000000000000
+        )
+        + Hash(0x10190508050731000000000000000000000000000)
+        + Hash(0x1029050805073100000000000000000000000000000000000010290)
+        + Hash(
+            0x5080507310000000000000000000000000000000000001039050805073100000
+        )
+        + Hash(0x103905080507310000000000000000000)
+        + Hash(0x10490508050731000000000000000000000000000000000)
+        + Hash(0x1049050805073100000000000000000000000000000000000010590508050)
+        + Hash(
+            0x7310000000000000000000000000000000000001059050805073100000000000
+        )
+        + Hash(0x106905080507310000000000000000000000000)
+        + Hash(0x10690508050731000000000000000000000000000000000000107)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000010790508050731000
+        )
+        + Hash(0x1089050805073100000000000000000)
+        + Hash(0x108905080507310000000000000000000000000000000)
+        + Hash(0x10990508050731000000000000000000000000000000000000109905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000011090508050731000000000
+        )
+        + Hash(0x1109050805073100000000000000000000000)
+        + Hash(0x201905080507310000000000000000000000000000000000002)
+        + Hash(
+            0x190508050731000000000000000000000000000000000000202905080507310
+        )
+        + Hash(0x20290508050731000000000000000)
+        + Hash(0x2039050805073100000000000000000000000000000)
+        + Hash(0x203905080507310000000000000000000000000000000000002049050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000204905080507310000000
+        )
+        + Hash(0x20590508050731000000000000000000000)
+        + Hash(0x2049050805073100000000000000000000000000000000000)
+        + Hash(
+            0x206905080507310000000000000000000000000000000000002069050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000207905080507310000000000000
+        )
+        + Hash(0x20790508050731000000000000000000000000000)
+        + Hash(0x2089050805073100000000000000000000000000000000000020890)
+        + Hash(
+            0x5080507310000000000000000000000000000000000002099050805073100000
+        )
+        + Hash(0x209905080507310000000000000000000)
+        + Hash(0x21090508050731000000000000000000000000000000000)
+        + Hash(0x2109050805073100000000000000000000000000000000000030190508050)
+        + Hash(
+            0x7310000000000000000000000000000000000003019050805073100000000000
+        )
+        + Hash(0x302905080507310000000000000000000000000)
+        + Hash(0x30290508050731000000000000000000000000000000000000303)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000030390508050731000
+        )
+        + Hash(0x3049050805073100000000000000000)
+        + Hash(0x304905080507310000000000000000000000000000000)
+        + Hash(0x30590508050731000000000000000000000000000000000000305905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000030690508050731000000000
+        )
+        + Hash(0x3069050805073100000000000000000000000)
+        + Hash(0x307905080507310000000000000000000000000000000000003)
+        + Hash(
+            0x790508050731000000000000000000000000000000000000308905080507310
+        )
+        + Hash(0x30890508050731000000000000000)
+        + Hash(0x3099050805073100000000000000000000000000000)
+        + Hash(0x309905080507310000000000000000000000000000000000003109050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000310905080507310000000
+        )
+        + Hash(0x190508050731000000000000000000000)
+        + Hash(0x19050805073100000000000000000000000000000000000)
+        + Hash(0x2905080507310000000000000000000000000000000000000029050805073)
+        + Hash(
+            0x1000000000000000000000000000000000000003905080507310000000000000
+        )
+        + Hash(0x390508050731000000000000000000000000000)
+        + Hash(0x49050805073100000000000000000000000000000000000000490)
+        + Hash(
+            0x5080507310000000000000000000000000000000000000059050805073100000
+        )
+        + Hash(0x5905080507310000000000000000000)
+        + Hash(0x690508050731000000000000000000000000000000000)
+        + Hash(0x69050805073100000000000000000000000000000000000000790508050)
+        + Hash(
+            0x7310000000000000000000000000000000000000079050805073100000000000
+        )
+        + Hash(0x8905080507310000000000000000000000000)
+        + Hash(0x890508050731000000000000000000000000000000000000009)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000000990508050731000
+        )
+        + Hash(0x109050805073100000000000000000)
+        + Hash(0x10905080507310000000000000000000000000000000)
+        + Hash(0x10190508050731000000000000000000000000000000000000101905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000010290508050731000000000
+        )
+        + Hash(0x1029050805073100000000000000000000000)
+        + Hash(0x103905080507310000000000000000000000000000000000001)
+        + Hash(
+            0x390508050731000000000000000000000000000000000000104905080507310
+        )
+        + Hash(0x10490508050731000000000000000)
+        + Hash(0x1059050805073100000000000000000000000000000)
+        + Hash(0x105905080507310000000000000000000000000000000000001069050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000106905080507310000000
+        )
+        + Hash(0x10790508050731000000000000000000000)
+        + Hash(0x1079050805073100000000000000000000000000000000000)
+        + Hash(
+            0x108905080507310000000000000000000000000000000000001089050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000109905080507310000000000000
+        )
+        + Hash(0x10990508050731000000000000000000000000000)
+        + Hash(0x1109050805073100000000000000000000000000000000000011090)
+        + Hash(
+            0x5080507310000000000000000000000000000000000002019050805073100000
+        )
+        + Hash(0x201905080507310000000000000000000)
+        + Hash(0x20290508050731000000000000000000000000000000000)
+        + Hash(0x2029050805073100000000000000000000000000000000000020390508050)
+        + Hash(
+            0x7310000000000000000000000000000000000002039050805073100000000000
+        )
+        + Hash(0x204905080507310000000000000000000000000)
+        + Hash(0x20490508050731000000000000000000000000000000000000205)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000020490508050731000
+        )
+        + Hash(0x2069050805073100000000000000000)
+        + Hash(0x206905080507310000000000000000000000000000000)
+        + Hash(0x20790508050731000000000000000000000000000000000000207905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000020890508050731000000000
+        )
+        + Hash(0x2089050805073100000000000000000000000)
+        + Hash(0x209905080507310000000000000000000000000000000000002)
+        + Hash(
+            0x990508050731000000000000000000000000000000000000210905080507310
+        )
+        + Hash(0x21090508050731000000000000000)
+        + Hash(0x3019050805073100000000000000000000000000000)
+        + Hash(0x301905080507310000000000000000000000000000000000003029050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000302905080507310000000
+        )
+        + Hash(0x30390508050731000000000000000000000)
+        + Hash(0x3039050805073100000000000000000000000000000000000)
+        + Hash(
+            0x304905080507310000000000000000000000000000000000003049050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000305905080507310000000000000
+        )
+        + Hash(0x30590508050731000000000000000000000000000)
+        + Hash(0x3069050805073100000000000000000000000000000000000030690)
+        + Hash(
+            0x5080507310000000000000000000000000000000000003079050805073100000
+        )
+        + Hash(0x307905080507310000000000000000000)
+        + Hash(0x30890508050731000000000000000000000000000000000)
+        + Hash(0x3089050805073100000000000000000000000000000000000030990508050)
+        + Hash(
+            0x7310000000000000000000000000000000000003099050805073100000000000
+        )
+        + Hash(0x310905080507310000000000000000000000000)
+        + Hash(0x310905080505B50565B6000731000000000000000000000000000)
+        + Hash(0x19050805073100000000000000000000000000000000000000190)
+        + Hash(
+            0x5080507310000000000000000000000000000000000000029050805073100000
+        )
+        + Hash(0x2905080507310000000000000000000)
+        + Hash(0x390508050731000000000000000000000000000000000)
+        + Hash(0x39050805073100000000000000000000000000000000000000490508050)
+        + Hash(
+            0x7310000000000000000000000000000000000000049050805073100000000000
+        )
+        + Hash(0x5905080507310000000000000000000000000)
+        + Hash(0x590508050731000000000000000000000000000000000000006)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000000690508050731000
+        )
+        + Hash(0x79050805073100000000000000000)
+        + Hash(0x7905080507310000000000000000000000000000000)
+        + Hash(0x890508050731000000000000000000000000000000000000008905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000000990508050731000000000
+        )
+        + Hash(0x99050805073100000000000000000000000)
+        + Hash(0x10905080507310000000000000000000000000000000000000)
+        + Hash(
+            0x1090508050731000000000000000000000000000000000000101905080507310
+        )
+        + Hash(0x10190508050731000000000000000)
+        + Hash(0x1029050805073100000000000000000000000000000)
+        + Hash(0x102905080507310000000000000000000000000000000000001039050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000103905080507310000000
+        )
+        + Hash(0x10490508050731000000000000000000000)
+        + Hash(0x1049050805073100000000000000000000000000000000000)
+        + Hash(
+            0x105905080507310000000000000000000000000000000000001059050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000106905080507310000000000000
+        )
+        + Hash(0x10690508050731000000000000000000000000000)
+        + Hash(0x1079050805073100000000000000000000000000000000000010790)
+        + Hash(
+            0x5080507310000000000000000000000000000000000001089050805073100000
+        )
+        + Hash(0x108905080507310000000000000000000)
+        + Hash(0x10990508050731000000000000000000000000000000000)
+        + Hash(0x1099050805073100000000000000000000000000000000000011090508050)
+        + Hash(
+            0x7310000000000000000000000000000000000001109050805073100000000000
+        )
+        + Hash(0x201905080507310000000000000000000000000)
+        + Hash(0x20190508050731000000000000000000000000000000000000202)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000020290508050731000
+        )
+        + Hash(0x2039050805073100000000000000000)
+        + Hash(0x203905080507310000000000000000000000000000000)
+        + Hash(0x20490508050731000000000000000000000000000000000000204905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000020590508050731000000000
+        )
+        + Hash(0x2049050805073100000000000000000000000)
+        + Hash(0x206905080507310000000000000000000000000000000000002)
+        + Hash(
+            0x690508050731000000000000000000000000000000000000207905080507310
+        )
+        + Hash(0x20790508050731000000000000000)
+        + Hash(0x2089050805073100000000000000000000000000000)
+        + Hash(0x208905080507310000000000000000000000000000000000002099050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000209905080507310000000
+        )
+        + Hash(0x21090508050731000000000000000000000)
+        + Hash(0x2109050805073100000000000000000000000000000000000)
+        + Hash(
+            0x301905080507310000000000000000000000000000000000003019050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000302905080507310000000000000
+        )
+        + Hash(0x30290508050731000000000000000000000000000)
+        + Hash(0x3039050805073100000000000000000000000000000000000030390)
+        + Hash(
+            0x5080507310000000000000000000000000000000000003049050805073100000
+        )
+        + Hash(0x304905080507310000000000000000000)
+        + Hash(0x30590508050731000000000000000000000000000000000)
+        + Hash(0x3059050805073100000000000000000000000000000000000030690508050)
+        + Hash(
+            0x7310000000000000000000000000000000000003069050805073100000000000
+        )
+        + Hash(0x307905080507310000000000000000000000000)
+        + Hash(0x30790508050731000000000000000000000000000000000000308)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000030890508050731000
+        )
+        + Hash(0x3099050805073100000000000000000)
+        + Hash(0x309905080507310000000000000000000000000000000)
+        + Hash(0x31090508050731000000000000000000000000000000000000310905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000000190508050731000000000
+        )
+        + Hash(0x19050805073100000000000000000000000)
+        + Hash(0x2905080507310000000000000000000000000000000000000)
+        + Hash(
+            0x290508050731000000000000000000000000000000000000003905080507310
+        )
+        + Hash(0x390508050731000000000000000)
+        + Hash(0x49050805073100000000000000000000000000000)
+        + Hash(0x4905080507310000000000000000000000000000000000000059050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000005905080507310000000
+        )
+        + Hash(0x690508050731000000000000000000000)
+        + Hash(0x69050805073100000000000000000000000000000000000)
+        + Hash(0x7905080507310000000000000000000000000000000000000079050805073)
+        + Hash(
+            0x1000000000000000000000000000000000000008905080507310000000000000
+        )
+        + Hash(0x890508050731000000000000000000000000000)
+        + Hash(0x99050805073100000000000000000000000000000000000000990)
+        + Hash(
+            0x5080507310000000000000000000000000000000000000109050805073100000
+        )
+        + Hash(0x10905080507310000000000000000000)
+        + Hash(0x10190508050731000000000000000000000000000000000)
+        + Hash(0x1019050805073100000000000000000000000000000000000010290508050)
+        + Hash(
+            0x7310000000000000000000000000000000000001029050805073100000000000
+        )
+        + Hash(0x103905080507310000000000000000000000000)
+        + Hash(0x10390508050731000000000000000000000000000000000000104)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000010490508050731000
+        )
+        + Hash(0x1059050805073100000000000000000)
+        + Hash(0x105905080507310000000000000000000000000000000)
+        + Hash(0x10690508050731000000000000000000000000000000000000106905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000010790508050731000000000
+        )
+        + Hash(0x1079050805073100000000000000000000000)
+        + Hash(0x108905080507310000000000000000000000000000000000001)
+        + Hash(
+            0x890508050731000000000000000000000000000000000000109905080507310
+        )
+        + Hash(0x10990508050731000000000000000)
+        + Hash(0x1109050805073100000000000000000000000000000)
+        + Hash(0x110905080507310000000000000000000000000000000000002019050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000201905080507310000000
+        )
+        + Hash(0x20290508050731000000000000000000000)
+        + Hash(0x2029050805073100000000000000000000000000000000000)
+        + Hash(
+            0x203905080507310000000000000000000000000000000000002039050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000204905080507310000000000000
+        )
+        + Hash(0x20490508050731000000000000000000000000000)
+        + Hash(0x2059050805073100000000000000000000000000000000000020490)
+        + Hash(
+            0x5080507310000000000000000000000000000000000002069050805073100000
+        )
+        + Hash(0x206905080507310000000000000000000)
+        + Hash(0x20790508050731000000000000000000000000000000000)
+        + Hash(0x2079050805073100000000000000000000000000000000000020890508050)
+        + Hash(
+            0x7310000000000000000000000000000000000002089050805073100000000000
+        )
+        + Hash(0x209905080507310000000000000000000000000)
+        + Hash(0x20990508050731000000000000000000000000000000000000210)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000021090508050731000
+        )
+        + Hash(0x3019050805073100000000000000000)
+        + Hash(0x301905080507310000000000000000000000000000000)
+        + Hash(0x30290508050731000000000000000000000000000000000000302905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000030390508050731000000000
+        )
+        + Hash(0x3039050805073100000000000000000000000)
+        + Hash(0x304905080507310000000000000000000000000000000000003)
+        + Hash(
+            0x490508050731000000000000000000000000000000000000305905080507310
+        )
+        + Hash(0x30590508050731000000000000000)
+        + Hash(0x3069050805073100000000000000000000000000000)
+        + Hash(0x306905080507310000000000000000000000000000000000003079050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000307905080507310000000
+        )
+        + Hash(0x30890508050731000000000000000000000)
+        + Hash(0x3089050805073100000000000000000000000000000000000)
+        + Hash(
+            0x309905080507310000000000000000000000000000000000003099050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000310905080507310000000000000
+        )
+        + Hash(0x310905080505B50565B6000731000000000000000)
+        + Hash(0x19050805073100000000000000000000000000000)
+        + Hash(0x1905080507310000000000000000000000000000000000000029050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000002905080507310000000
+        )
+        + Hash(0x390508050731000000000000000000000)
+        + Hash(0x39050805073100000000000000000000000000000000000)
+        + Hash(0x4905080507310000000000000000000000000000000000000049050805073)
+        + Hash(
+            0x1000000000000000000000000000000000000005905080507310000000000000
+        )
+        + Hash(0x590508050731000000000000000000000000000)
+        + Hash(0x69050805073100000000000000000000000000000000000000690)
+        + Hash(
+            0x5080507310000000000000000000000000000000000000079050805073100000
+        )
+        + Hash(0x7905080507310000000000000000000)
+        + Hash(0x890508050731000000000000000000000000000000000)
+        + Hash(0x89050805073100000000000000000000000000000000000000990508050)
+        + Hash(
+            0x7310000000000000000000000000000000000000099050805073100000000000
+        )
+        + Hash(0x10905080507310000000000000000000000000)
+        + Hash(0x1090508050731000000000000000000000000000000000000101)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000010190508050731000
+        )
+        + Hash(0x1029050805073100000000000000000)
+        + Hash(0x102905080507310000000000000000000000000000000)
+        + Hash(0x10390508050731000000000000000000000000000000000000103905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000010490508050731000000000
+        )
+        + Hash(0x1049050805073100000000000000000000000)
+        + Hash(0x105905080507310000000000000000000000000000000000001)
+        + Hash(
+            0x590508050731000000000000000000000000000000000000106905080507310
+        )
+        + Hash(0x10690508050731000000000000000)
+        + Hash(0x1079050805073100000000000000000000000000000)
+        + Hash(0x107905080507310000000000000000000000000000000000001089050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000108905080507310000000
+        )
+        + Hash(0x10990508050731000000000000000000000)
+        + Hash(0x1099050805073100000000000000000000000000000000000)
+        + Hash(
+            0x110905080507310000000000000000000000000000000000001109050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000201905080507310000000000000
+        )
+        + Hash(0x20190508050731000000000000000000000000000)
+        + Hash(0x2029050805073100000000000000000000000000000000000020290)
+        + Hash(
+            0x5080507310000000000000000000000000000000000002039050805073100000
+        )
+        + Hash(0x203905080507310000000000000000000)
+        + Hash(0x20490508050731000000000000000000000000000000000)
+        + Hash(0x2049050805073100000000000000000000000000000000000020590508050)
+        + Hash(
+            0x7310000000000000000000000000000000000002049050805073100000000000
+        )
+        + Hash(0x206905080507310000000000000000000000000)
+        + Hash(0x20690508050731000000000000000000000000000000000000207)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000020790508050731000
+        )
+        + Hash(0x2089050805073100000000000000000)
+        + Hash(0x208905080507310000000000000000000000000000000)
+        + Hash(0x20990508050731000000000000000000000000000000000000209905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000021090508050731000000000
+        )
+        + Hash(0x2109050805073100000000000000000000000)
+        + Hash(0x301905080507310000000000000000000000000000000000003)
+        + Hash(
+            0x190508050731000000000000000000000000000000000000302905080507310
+        )
+        + Hash(0x30290508050731000000000000000)
+        + Hash(0x3039050805073100000000000000000000000000000)
+        + Hash(0x303905080507310000000000000000000000000000000000003049050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000304905080507310000000
+        )
+        + Hash(0x30590508050731000000000000000000000)
+        + Hash(0x3059050805073100000000000000000000000000000000000)
+        + Hash(
+            0x306905080507310000000000000000000000000000000000003069050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000307905080507310000000000000
+        )
+        + Hash(0x30790508050731000000000000000000000000000)
+        + Hash(0x3089050805073100000000000000000000000000000000000030890)
+        + Hash(
+            0x5080507310000000000000000000000000000000000003099050805073100000
+        )
+        + Hash(0x309905080507310000000000000000000)
+        + Hash(0x31090508050731000000000000000000000000000000000)
+        + Hash(0x3109050805073100000000000000000000000000000000000000190508050)
+        + Hash(
+            0x7310000000000000000000000000000000000000019050805073100000000000
+        )
+        + Hash(0x2905080507310000000000000000000000000)
+        + Hash(0x290508050731000000000000000000000000000000000000003)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000000390508050731000
+        )
+        + Hash(0x49050805073100000000000000000)
+        + Hash(0x4905080507310000000000000000000000000000000)
+        + Hash(0x590508050731000000000000000000000000000000000000005905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000000690508050731000000000
+        )
+        + Hash(0x69050805073100000000000000000000000)
+        + Hash(0x7905080507310000000000000000000000000000000000000)
+        + Hash(
+            0x790508050731000000000000000000000000000000000000008905080507310
+        )
+        + Hash(0x890508050731000000000000000)
+        + Hash(0x99050805073100000000000000000000000000000)
+        + Hash(0x9905080507310000000000000000000000000000000000000109050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000010905080507310000000
+        )
+        + Hash(0x10190508050731000000000000000000000)
+        + Hash(0x1019050805073100000000000000000000000000000000000)
+        + Hash(
+            0x102905080507310000000000000000000000000000000000001029050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000103905080507310000000000000
+        )
+        + Hash(0x10390508050731000000000000000000000000000)
+        + Hash(0x1049050805073100000000000000000000000000000000000010490)
+        + Hash(
+            0x5080507310000000000000000000000000000000000001059050805073100000
+        )
+        + Hash(0x105905080507310000000000000000000)
+        + Hash(0x10690508050731000000000000000000000000000000000)
+        + Hash(0x1069050805073100000000000000000000000000000000000010790508050)
+        + Hash(
+            0x7310000000000000000000000000000000000001079050805073100000000000
+        )
+        + Hash(0x108905080507310000000000000000000000000)
+        + Hash(0x10890508050731000000000000000000000000000000000000109)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000010990508050731000
+        )
+        + Hash(0x1109050805073100000000000000000)
+        + Hash(0x110905080507310000000000000000000000000000000)
+        + Hash(0x20190508050731000000000000000000000000000000000000201905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000020290508050731000000000
+        )
+        + Hash(0x2029050805073100000000000000000000000)
+        + Hash(0x203905080507310000000000000000000000000000000000002)
+        + Hash(
+            0x390508050731000000000000000000000000000000000000204905080507310
+        )
+        + Hash(0x20490508050731000000000000000)
+        + Hash(0x2059050805073100000000000000000000000000000)
+        + Hash(0x204905080507310000000000000000000000000000000000002069050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000206905080507310000000
+        )
+        + Hash(0x20790508050731000000000000000000000)
+        + Hash(0x2079050805073100000000000000000000000000000000000)
+        + Hash(
+            0x208905080507310000000000000000000000000000000000002089050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000209905080507310000000000000
+        )
+        + Hash(0x20990508050731000000000000000000000000000)
+        + Hash(0x2109050805073100000000000000000000000000000000000021090)
+        + Hash(
+            0x5080507310000000000000000000000000000000000003019050805073100000
+        )
+        + Hash(0x301905080507310000000000000000000)
+        + Hash(0x30290508050731000000000000000000000000000000000)
+        + Hash(0x3029050805073100000000000000000000000000000000000030390508050)
+        + Hash(
+            0x7310000000000000000000000000000000000003039050805073100000000000
+        )
+        + Hash(0x304905080507310000000000000000000000000)
+        + Hash(0x30490508050731000000000000000000000000000000000000305)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000030590508050731000
+        )
+        + Hash(0x3069050805073100000000000000000)
+        + Hash(0x306905080507310000000000000000000000000000000)
+        + Hash(0x30790508050731000000000000000000000000000000000000307905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000030890508050731000000000
+        )
+        + Hash(0x3089050805073100000000000000000000000)
+        + Hash(0x309905080507310000000000000000000000000000000000003)
+        + Hash(
+            0x990508050731000000000000000000000000000000000000310905080507310
+        )
+        + Hash(0x310905080505B50565B6000731000)
+        + Hash(0x19050805073100000000000000000)
+        + Hash(0x1905080507310000000000000000000000000000000)
+        + Hash(0x290508050731000000000000000000000000000000000000002905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000000390508050731000000000
+        )
+        + Hash(0x39050805073100000000000000000000000)
+        + Hash(0x4905080507310000000000000000000000000000000000000)
+        + Hash(
+            0x490508050731000000000000000000000000000000000000005905080507310
+        )
+        + Hash(0x590508050731000000000000000)
+        + Hash(0x69050805073100000000000000000000000000000)
+        + Hash(0x6905080507310000000000000000000000000000000000000079050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000007905080507310000000
+        )
+        + Hash(0x890508050731000000000000000000000)
+        + Hash(0x89050805073100000000000000000000000000000000000)
+        + Hash(0x9905080507310000000000000000000000000000000000000099050805073)
+        + Hash(
+            0x1000000000000000000000000000000000000010905080507310000000000000
+        )
+        + Hash(0x1090508050731000000000000000000000000000)
+        + Hash(0x1019050805073100000000000000000000000000000000000010190)
+        + Hash(
+            0x5080507310000000000000000000000000000000000001029050805073100000
+        )
+        + Hash(0x102905080507310000000000000000000)
+        + Hash(0x10390508050731000000000000000000000000000000000)
+        + Hash(0x1039050805073100000000000000000000000000000000000010490508050)
+        + Hash(
+            0x7310000000000000000000000000000000000001049050805073100000000000
+        )
+        + Hash(0x105905080507310000000000000000000000000)
+        + Hash(0x10590508050731000000000000000000000000000000000000106)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000010690508050731000
+        )
+        + Hash(0x1079050805073100000000000000000)
+        + Hash(0x107905080507310000000000000000000000000000000)
+        + Hash(0x10890508050731000000000000000000000000000000000000108905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000010990508050731000000000
+        )
+        + Hash(0x1099050805073100000000000000000000000)
+        + Hash(0x110905080507310000000000000000000000000000000000001)
+        + Hash(
+            0x1090508050731000000000000000000000000000000000000201905080507310
+        )
+        + Hash(0x20190508050731000000000000000)
+        + Hash(0x2029050805073100000000000000000000000000000)
+        + Hash(0x202905080507310000000000000000000000000000000000002039050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000203905080507310000000
+        )
+        + Hash(0x20490508050731000000000000000000000)
+        + Hash(0x2049050805073100000000000000000000000000000000000)
+        + Hash(
+            0x205905080507310000000000000000000000000000000000002049050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000206905080507310000000000000
+        )
+        + Hash(0x20690508050731000000000000000000000000000)
+        + Hash(0x2079050805073100000000000000000000000000000000000020790)
+        + Hash(
+            0x5080507310000000000000000000000000000000000002089050805073100000
+        )
+        + Hash(0x208905080507310000000000000000000)
+        + Hash(0x20990508050731000000000000000000000000000000000)
+        + Hash(0x2099050805073100000000000000000000000000000000000021090508050)
+        + Hash(
+            0x7310000000000000000000000000000000000002109050805073100000000000
+        )
+        + Hash(0x301905080507310000000000000000000000000)
+        + Hash(0x30190508050731000000000000000000000000000000000000302)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000030290508050731000
+        )
+        + Hash(0x3039050805073100000000000000000)
+        + Hash(0x303905080507310000000000000000000000000000000)
+        + Hash(0x30490508050731000000000000000000000000000000000000304905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000030590508050731000000000
+        )
+        + Hash(0x3059050805073100000000000000000000000)
+        + Hash(0x306905080507310000000000000000000000000000000000003)
+        + Hash(
+            0x690508050731000000000000000000000000000000000000307905080507310
+        )
+        + Hash(0x30790508050731000000000000000)
+        + Hash(0x3089050805073100000000000000000000000000000)
+        + Hash(0x308905080507310000000000000000000000000000000000003099050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000309905080507310000000
+        )
+        + Hash(0x31090508050731000000000000000000000)
+        + Hash(0x3109050805073100000000000000000000000000000000000)
+        + Hash(0x1905080507310000000000000000000000000000000000000019050805073)
+        + Hash(
+            0x1000000000000000000000000000000000000002905080507310000000000000
+        )
+        + Hash(0x290508050731000000000000000000000000000)
+        + Hash(0x39050805073100000000000000000000000000000000000000390)
+        + Hash(
+            0x5080507310000000000000000000000000000000000000049050805073100000
+        )
+        + Hash(0x4905080507310000000000000000000)
+        + Hash(0x590508050731000000000000000000000000000000000)
+        + Hash(0x59050805073100000000000000000000000000000000000000690508050)
+        + Hash(
+            0x7310000000000000000000000000000000000000069050805073100000000000
+        )
+        + Hash(0x7905080507310000000000000000000000000)
+        + Hash(0x790508050731000000000000000000000000000000000000008)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000000890508050731000
+        )
+        + Hash(0x99050805073100000000000000000)
+        + Hash(0x9905080507310000000000000000000000000000000)
+        + Hash(0x1090508050731000000000000000000000000000000000000010905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000010190508050731000000000
+        )
+        + Hash(0x1019050805073100000000000000000000000)
+        + Hash(0x102905080507310000000000000000000000000000000000001)
+        + Hash(
+            0x290508050731000000000000000000000000000000000000103905080507310
+        )
+        + Hash(0x10390508050731000000000000000)
+        + Hash(0x1049050805073100000000000000000000000000000)
+        + Hash(0x104905080507310000000000000000000000000000000000001059050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000105905080507310000000
+        )
+        + Hash(0x10690508050731000000000000000000000)
+        + Hash(0x1069050805073100000000000000000000000000000000000)
+        + Hash(
+            0x107905080507310000000000000000000000000000000000001079050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000108905080507310000000000000
+        )
+        + Hash(0x10890508050731000000000000000000000000000)
+        + Hash(0x1099050805073100000000000000000000000000000000000010990)
+        + Hash(
+            0x5080507310000000000000000000000000000000000001109050805073100000
+        )
+        + Hash(0x110905080507310000000000000000000)
+        + Hash(0x20190508050731000000000000000000000000000000000)
+        + Hash(0x2019050805073100000000000000000000000000000000000020290508050)
+        + Hash(
+            0x7310000000000000000000000000000000000002029050805073100000000000
+        )
+        + Hash(0x203905080507310000000000000000000000000)
+        + Hash(0x20390508050731000000000000000000000000000000000000204)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000020490508050731000
+        )
+        + Hash(0x2059050805073100000000000000000)
+        + Hash(0x204905080507310000000000000000000000000000000)
+        + Hash(0x20690508050731000000000000000000000000000000000000206905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000020790508050731000000000
+        )
+        + Hash(0x2079050805073100000000000000000000000)
+        + Hash(0x208905080507310000000000000000000000000000000000002)
+        + Hash(
+            0x890508050731000000000000000000000000000000000000209905080507310
+        )
+        + Hash(0x20990508050731000000000000000)
+        + Hash(0x2109050805073100000000000000000000000000000)
+        + Hash(0x210905080507310000000000000000000000000000000000003019050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000301905080507310000000
+        )
+        + Hash(0x30290508050731000000000000000000000)
+        + Hash(0x3029050805073100000000000000000000000000000000000)
+        + Hash(
+            0x303905080507310000000000000000000000000000000000003039050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000304905080507310000000000000
+        )
+        + Hash(0x30490508050731000000000000000000000000000)
+        + Hash(0x3059050805073100000000000000000000000000000000000030590)
+        + Hash(
+            0x5080507310000000000000000000000000000000000003069050805073100000
+        )
+        + Hash(0x306905080507310000000000000000000)
+        + Hash(0x30790508050731000000000000000000000000000000000)
+        + Hash(0x3079050805073100000000000000000000000000000000000030890508050)
+        + Hash(
+            0x7310000000000000000000000000000000000003089050805073100000000000
+        )
+        + Hash(0x309905080507310000000000000000000000000)
+        + Hash(0x30990508050731000000000000000000000000000000000000310)
+        + Hash(
+            0x90508050731000000000000000000000000000000000000310905080505B5056
+        )
+        + Hash(
+            0x60606040523615610074576000357C0100000000000000000000000000000000
+        )
+        + Hash(0x90048063A3B9F3E514610079578063B50345B614)
+        + Hash(
+            0x61008D578063D4F639EA146100A1578063D9BB316F146100B5578063E22A5D5B
+        )
+        + Hash(
+            0x146100C9578063F983C0FA146100DD57610074565B610002565B346100025761
+        )
+        + Hash(
+            0x8B60048050506100F1565B005B346100025761009F6004805050611097565B
+        )
+        + Hash(
+            0x5B34610002576100B3600480505061203D565B005B34610002576100C76004
+        )
+        + Hash(
+            0x805050612FE3565B005B34610002576100DB6004805050613F89565B005B3461
+        )
+        + Hash(0x2576100EF6004805050614F2F565B005B6000731000000000000000000000)
+        + Hash(0x19050805073100000000000000000000000000000000000)
+        + Hash(0x1905080507310000000000000000000000000000000000000029050805073)
+        + Hash(
+            0x1000000000000000000000000000000000000002905080507310000000000000
+        )
+        + Hash(0x390508050731000000000000000000000000000)
+        + Hash(0x39050805073100000000000000000000000000000000000000490)
+        + Hash(
+            0x5080507310000000000000000000000000000000000000049050805073100000
+        )
+        + Hash(0x5905080507310000000000000000000)
+        + Hash(0x590508050731000000000000000000000000000000000)
+        + Hash(0x69050805073100000000000000000000000000000000000000690508050)
+        + Hash(
+            0x7310000000000000000000000000000000000000079050805073100000000000
+        )
+        + Hash(0x7905080507310000000000000000000000000)
+        + Hash(0x890508050731000000000000000000000000000000000000008)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000000990508050731000
+        )
+        + Hash(0x99050805073100000000000000000)
+        + Hash(0x10905080507310000000000000000000000000000000)
+        + Hash(0x1090508050731000000000000000000000000000000000000101905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000010190508050731000000000
+        )
+        + Hash(0x1029050805073100000000000000000000000)
+        + Hash(0x102905080507310000000000000000000000000000000000001)
+        + Hash(
+            0x390508050731000000000000000000000000000000000000103905080507310
+        )
+        + Hash(0x10490508050731000000000000000)
+        + Hash(0x1049050805073100000000000000000000000000000)
+        + Hash(0x105905080507310000000000000000000000000000000000001059050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000106905080507310000000
+        )
+        + Hash(0x10690508050731000000000000000000000)
+        + Hash(0x1079050805073100000000000000000000000000000000000)
+        + Hash(
+            0x107905080507310000000000000000000000000000000000001089050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000108905080507310000000000000
+        )
+        + Hash(0x10990508050731000000000000000000000000000)
+        + Hash(0x1099050805073100000000000000000000000000000000000011090)
+        + Hash(
+            0x5080507310000000000000000000000000000000000001109050805073100000
+        )
+        + Hash(0x201905080507310000000000000000000)
+        + Hash(0x20190508050731000000000000000000000000000000000)
+        + Hash(0x2029050805073100000000000000000000000000000000000020290508050)
+        + Hash(
+            0x7310000000000000000000000000000000000002039050805073100000000000
+        )
+        + Hash(0x203905080507310000000000000000000000000)
+        + Hash(0x20490508050731000000000000000000000000000000000000204)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000020590508050731000
+        )
+        + Hash(0x2049050805073100000000000000000)
+        + Hash(0x206905080507310000000000000000000000000000000)
+        + Hash(0x20690508050731000000000000000000000000000000000000207905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000020790508050731000000000
+        )
+        + Hash(0x2089050805073100000000000000000000000)
+        + Hash(0x208905080507310000000000000000000000000000000000002)
+        + Hash(
+            0x990508050731000000000000000000000000000000000000209905080507310
+        )
+        + Hash(0x21090508050731000000000000000)
+        + Hash(0x2109050805073100000000000000000000000000000)
+        + Hash(0x301905080507310000000000000000000000000000000000003019050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000302905080507310000000
+        )
+        + Hash(0x30290508050731000000000000000000000)
+        + Hash(0x3039050805073100000000000000000000000000000000000)
+        + Hash(
+            0x303905080507310000000000000000000000000000000000003049050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000304905080507310000000000000
+        )
+        + Hash(0x30590508050731000000000000000000000000000)
+        + Hash(0x3059050805073100000000000000000000000000000000000030690)
+        + Hash(
+            0x5080507310000000000000000000000000000000000003069050805073100000
+        )
+        + Hash(0x307905080507310000000000000000000)
+        + Hash(0x30790508050731000000000000000000000000000000000)
+        + Hash(0x3089050805073100000000000000000000000000000000000030890508050)
+        + Hash(
+            0x7310000000000000000000000000000000000003099050805073100000000000
+        )
+        + Hash(0x309905080507310000000000000000000000000)
+        + Hash(0x31090508050731000000000000000000000000000000000000310)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000000190508050731000
+        )
+        + Hash(0x19050805073100000000000000000)
+        + Hash(0x2905080507310000000000000000000000000000000)
+        + Hash(0x290508050731000000000000000000000000000000000000003905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000000390508050731000000000
+        )
+        + Hash(0x49050805073100000000000000000000000)
+        + Hash(0x4905080507310000000000000000000000000000000000000)
+        + Hash(
+            0x590508050731000000000000000000000000000000000000005905080507310
+        )
+        + Hash(0x690508050731000000000000000)
+        + Hash(0x69050805073100000000000000000000000000000)
+        + Hash(0x7905080507310000000000000000000000000000000000000079050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000008905080507310000000
+        )
+        + Hash(0x890508050731000000000000000000000)
+        + Hash(0x99050805073100000000000000000000000000000000000)
+        + Hash(0x9905080507310000000000000000000000000000000000000109050805073)
+        + Hash(
+            0x1000000000000000000000000000000000000010905080507310000000000000
+        )
+        + Hash(0x10190508050731000000000000000000000000000)
+        + Hash(0x1019050805073100000000000000000000000000000000000010290)
+        + Hash(
+            0x5080507310000000000000000000000000000000000001029050805073100000
+        )
+        + Hash(0x103905080507310000000000000000000)
+        + Hash(0x10390508050731000000000000000000000000000000000)
+        + Hash(0x1049050805073100000000000000000000000000000000000010490508050)
+        + Hash(
+            0x7310000000000000000000000000000000000001059050805073100000000000
+        )
+        + Hash(0x105905080507310000000000000000000000000)
+        + Hash(0x10690508050731000000000000000000000000000000000000106)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000010790508050731000
+        )
+        + Hash(0x1079050805073100000000000000000)
+        + Hash(0x108905080507310000000000000000000000000000000)
+        + Hash(0x10890508050731000000000000000000000000000000000000109905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000010990508050731000000000
+        )
+        + Hash(0x1109050805073100000000000000000000000)
+        + Hash(0x110905080507310000000000000000000000000000000000002)
+        + Hash(
+            0x190508050731000000000000000000000000000000000000201905080507310
+        )
+        + Hash(0x20290508050731000000000000000)
+        + Hash(0x2029050805073100000000000000000000000000000)
+        + Hash(0x203905080507310000000000000000000000000000000000002039050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000204905080507310000000
+        )
+        + Hash(0x20490508050731000000000000000000000)
+        + Hash(0x2059050805073100000000000000000000000000000000000)
+        + Hash(
+            0x204905080507310000000000000000000000000000000000002069050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000206905080507310000000000000
+        )
+        + Hash(0x20790508050731000000000000000000000000000)
+        + Hash(0x2079050805073100000000000000000000000000000000000020890)
+        + Hash(
+            0x5080507310000000000000000000000000000000000002089050805073100000
+        )
+        + Hash(0x209905080507310000000000000000000)
+        + Hash(0x20990508050731000000000000000000000000000000000)
+        + Hash(0x2109050805073100000000000000000000000000000000000021090508050)
+        + Hash(
+            0x7310000000000000000000000000000000000003019050805073100000000000
+        )
+        + Hash(0x301905080507310000000000000000000000000)
+        + Hash(0x30290508050731000000000000000000000000000000000000302)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000030390508050731000
+        )
+        + Hash(0x3039050805073100000000000000000)
+        + Hash(0x304905080507310000000000000000000000000000000)
+        + Hash(0x30490508050731000000000000000000000000000000000000305905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000030590508050731000000000
+        )
+        + Hash(0x3069050805073100000000000000000000000)
+        + Hash(0x306905080507310000000000000000000000000000000000003)
+        + Hash(
+            0x790508050731000000000000000000000000000000000000307905080507310
+        )
+        + Hash(0x30890508050731000000000000000)
+        + Hash(0x3089050805073100000000000000000000000000000)
+        + Hash(0x309905080507310000000000000000000000000000000000003099050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000310905080507310000000
+        )
+        + Hash(0x310905080505B50565B6000731000000000)
+        + Hash(0x19050805073100000000000000000000000)
+        + Hash(0x1905080507310000000000000000000000000000000000000)
+        + Hash(
+            0x290508050731000000000000000000000000000000000000002905080507310
+        )
+        + Hash(0x390508050731000000000000000)
+        + Hash(0x39050805073100000000000000000000000000000)
+        + Hash(0x4905080507310000000000000000000000000000000000000049050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000005905080507310000000
+        )
+        + Hash(0x590508050731000000000000000000000)
+        + Hash(0x69050805073100000000000000000000000000000000000)
+        + Hash(0x6905080507310000000000000000000000000000000000000079050805073)
+        + Hash(
+            0x1000000000000000000000000000000000000007905080507310000000000000
+        )
+        + Hash(0x890508050731000000000000000000000000000)
+        + Hash(0x89050805073100000000000000000000000000000000000000990)
+        + Hash(
+            0x5080507310000000000000000000000000000000000000099050805073100000
+        )
+        + Hash(0x10905080507310000000000000000000)
+        + Hash(0x1090508050731000000000000000000000000000000000)
+        + Hash(0x1019050805073100000000000000000000000000000000000010190508050)
+        + Hash(
+            0x7310000000000000000000000000000000000001029050805073100000000000
+        )
+        + Hash(0x102905080507310000000000000000000000000)
+        + Hash(0x10390508050731000000000000000000000000000000000000103)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000010490508050731000
+        )
+        + Hash(0x1049050805073100000000000000000)
+        + Hash(0x105905080507310000000000000000000000000000000)
+        + Hash(0x10590508050731000000000000000000000000000000000000106905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000010690508050731000000000
+        )
+        + Hash(0x1079050805073100000000000000000000000)
+        + Hash(0x107905080507310000000000000000000000000000000000001)
+        + Hash(
+            0x890508050731000000000000000000000000000000000000108905080507310
+        )
+        + Hash(0x10990508050731000000000000000)
+        + Hash(0x1099050805073100000000000000000000000000000)
+        + Hash(0x110905080507310000000000000000000000000000000000001109050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000201905080507310000000
+        )
+        + Hash(0x20190508050731000000000000000000000)
+        + Hash(0x2029050805073100000000000000000000000000000000000)
+        + Hash(
+            0x202905080507310000000000000000000000000000000000002039050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000203905080507310000000000000
+        )
+        + Hash(0x20490508050731000000000000000000000000000)
+        + Hash(0x2049050805073100000000000000000000000000000000000020590)
+        + Hash(
+            0x5080507310000000000000000000000000000000000002049050805073100000
+        )
+        + Hash(0x206905080507310000000000000000000)
+        + Hash(0x20690508050731000000000000000000000000000000000)
+        + Hash(0x2079050805073100000000000000000000000000000000000020790508050)
+        + Hash(
+            0x7310000000000000000000000000000000000002089050805073100000000000
+        )
+        + Hash(0x208905080507310000000000000000000000000)
+        + Hash(0x20990508050731000000000000000000000000000000000000209)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000021090508050731000
+        )
+        + Hash(0x2109050805073100000000000000000)
+        + Hash(0x301905080507310000000000000000000000000000000)
+        + Hash(0x30190508050731000000000000000000000000000000000000302905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000030290508050731000000000
+        )
+        + Hash(0x3039050805073100000000000000000000000)
+        + Hash(0x303905080507310000000000000000000000000000000000003)
+        + Hash(
+            0x490508050731000000000000000000000000000000000000304905080507310
+        )
+        + Hash(0x30590508050731000000000000000)
+        + Hash(0x3059050805073100000000000000000000000000000)
+        + Hash(0x306905080507310000000000000000000000000000000000003069050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000307905080507310000000
+        )
+        + Hash(0x30790508050731000000000000000000000)
+        + Hash(0x3089050805073100000000000000000000000000000000000)
+        + Hash(
+            0x308905080507310000000000000000000000000000000000003099050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000309905080507310000000000000
+        )
+        + Hash(0x31090508050731000000000000000000000000000)
+        + Hash(0x3109050805073100000000000000000000000000000000000000190)
+        + Hash(
+            0x5080507310000000000000000000000000000000000000019050805073100000
+        )
+        + Hash(0x2905080507310000000000000000000)
+        + Hash(0x290508050731000000000000000000000000000000000)
+        + Hash(0x39050805073100000000000000000000000000000000000000390508050)
+        + Hash(
+            0x7310000000000000000000000000000000000000049050805073100000000000
+        )
+        + Hash(0x4905080507310000000000000000000000000)
+        + Hash(0x590508050731000000000000000000000000000000000000005)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000000690508050731000
+        )
+        + Hash(0x69050805073100000000000000000)
+        + Hash(0x7905080507310000000000000000000000000000000)
+        + Hash(0x790508050731000000000000000000000000000000000000008905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000000890508050731000000000
+        )
+        + Hash(0x99050805073100000000000000000000000)
+        + Hash(0x9905080507310000000000000000000000000000000000000)
+        + Hash(
+            0x1090508050731000000000000000000000000000000000000010905080507310
+        )
+        + Hash(0x10190508050731000000000000000)
+        + Hash(0x1019050805073100000000000000000000000000000)
+        + Hash(0x102905080507310000000000000000000000000000000000001029050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000103905080507310000000
+        )
+        + Hash(0x10390508050731000000000000000000000)
+        + Hash(0x1049050805073100000000000000000000000000000000000)
+        + Hash(
+            0x104905080507310000000000000000000000000000000000001059050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000105905080507310000000000000
+        )
+        + Hash(0x10690508050731000000000000000000000000000)
+        + Hash(0x1069050805073100000000000000000000000000000000000010790)
+        + Hash(
+            0x5080507310000000000000000000000000000000000001079050805073100000
+        )
+        + Hash(0x108905080507310000000000000000000)
+        + Hash(0x10890508050731000000000000000000000000000000000)
+        + Hash(0x1099050805073100000000000000000000000000000000000010990508050)
+        + Hash(
+            0x7310000000000000000000000000000000000001109050805073100000000000
+        )
+        + Hash(0x110905080507310000000000000000000000000)
+        + Hash(0x20190508050731000000000000000000000000000000000000201)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000020290508050731000
+        )
+        + Hash(0x2029050805073100000000000000000)
+        + Hash(0x203905080507310000000000000000000000000000000)
+        + Hash(0x20390508050731000000000000000000000000000000000000204905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000020490508050731000000000
+        )
+        + Hash(0x2059050805073100000000000000000000000)
+        + Hash(0x204905080507310000000000000000000000000000000000002)
+        + Hash(
+            0x690508050731000000000000000000000000000000000000206905080507310
+        )
+        + Hash(0x20790508050731000000000000000)
+        + Hash(0x2079050805073100000000000000000000000000000)
+        + Hash(0x208905080507310000000000000000000000000000000000002089050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000209905080507310000000
+        )
+        + Hash(0x20990508050731000000000000000000000)
+        + Hash(0x2109050805073100000000000000000000000000000000000)
+        + Hash(
+            0x210905080507310000000000000000000000000000000000003019050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000301905080507310000000000000
+        )
+        + Hash(0x30290508050731000000000000000000000000000)
+        + Hash(0x3029050805073100000000000000000000000000000000000030390)
+        + Hash(
+            0x5080507310000000000000000000000000000000000003039050805073100000
+        )
+        + Hash(0x304905080507310000000000000000000)
+        + Hash(0x30490508050731000000000000000000000000000000000)
+        + Hash(0x3059050805073100000000000000000000000000000000000030590508050)
+        + Hash(
+            0x7310000000000000000000000000000000000003069050805073100000000000
+        )
+        + Hash(0x306905080507310000000000000000000000000)
+        + Hash(0x30790508050731000000000000000000000000000000000000307)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000030890508050731000
+        )
+        + Hash(0x3089050805073100000000000000000)
+        + Hash(0x309905080507310000000000000000000000000000000)
+        + Hash(0x30990508050731000000000000000000000000000000000000310905080)
+        + Hash(
+            0x50731000000000000000000000000000000000000310905080505B50565B6000
+        )
+        + Hash(
+            0x7310000000000000000000000000000000000000019050805073100000000000
+        )
+        + Hash(0x1905080507310000000000000000000000000)
+        + Hash(0x290508050731000000000000000000000000000000000000002)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000000390508050731000
+        )
+        + Hash(0x39050805073100000000000000000)
+        + Hash(0x4905080507310000000000000000000000000000000)
+        + Hash(0x490508050731000000000000000000000000000000000000005905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000000590508050731000000000
+        )
+        + Hash(0x69050805073100000000000000000000000)
+        + Hash(0x6905080507310000000000000000000000000000000000000)
+        + Hash(
+            0x790508050731000000000000000000000000000000000000007905080507310
+        )
+        + Hash(0x890508050731000000000000000)
+        + Hash(0x89050805073100000000000000000000000000000)
+        + Hash(0x9905080507310000000000000000000000000000000000000099050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000010905080507310000000
+        )
+        + Hash(0x1090508050731000000000000000000000)
+        + Hash(0x1019050805073100000000000000000000000000000000000)
+        + Hash(
+            0x101905080507310000000000000000000000000000000000001029050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000102905080507310000000000000
+        )
+        + Hash(0x10390508050731000000000000000000000000000)
+        + Hash(0x1039050805073100000000000000000000000000000000000010490)
+        + Hash(
+            0x5080507310000000000000000000000000000000000001049050805073100000
+        )
+        + Hash(0x105905080507310000000000000000000)
+        + Hash(0x10590508050731000000000000000000000000000000000)
+        + Hash(0x1069050805073100000000000000000000000000000000000010690508050)
+        + Hash(
+            0x7310000000000000000000000000000000000001079050805073100000000000
+        )
+        + Hash(0x107905080507310000000000000000000000000)
+        + Hash(0x10890508050731000000000000000000000000000000000000108)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000010990508050731000
+        )
+        + Hash(0x1099050805073100000000000000000)
+        + Hash(0x110905080507310000000000000000000000000000000)
+        + Hash(0x11090508050731000000000000000000000000000000000000201905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000020190508050731000000000
+        )
+        + Hash(0x2029050805073100000000000000000000000)
+        + Hash(0x202905080507310000000000000000000000000000000000002)
+        + Hash(
+            0x390508050731000000000000000000000000000000000000203905080507310
+        )
+        + Hash(0x20490508050731000000000000000)
+        + Hash(0x2049050805073100000000000000000000000000000)
+        + Hash(0x205905080507310000000000000000000000000000000000002049050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000206905080507310000000
+        )
+        + Hash(0x20690508050731000000000000000000000)
+        + Hash(0x2079050805073100000000000000000000000000000000000)
+        + Hash(
+            0x207905080507310000000000000000000000000000000000002089050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000208905080507310000000000000
+        )
+        + Hash(0x20990508050731000000000000000000000000000)
+        + Hash(0x2099050805073100000000000000000000000000000000000021090)
+        + Hash(
+            0x5080507310000000000000000000000000000000000002109050805073100000
+        )
+        + Hash(0x301905080507310000000000000000000)
+        + Hash(0x30190508050731000000000000000000000000000000000)
+        + Hash(0x3029050805073100000000000000000000000000000000000030290508050)
+        + Hash(
+            0x7310000000000000000000000000000000000003039050805073100000000000
+        )
+        + Hash(0x303905080507310000000000000000000000000)
+        + Hash(0x30490508050731000000000000000000000000000000000000304)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000030590508050731000
+        )
+        + Hash(0x3059050805073100000000000000000)
+        + Hash(0x306905080507310000000000000000000000000000000)
+        + Hash(0x30690508050731000000000000000000000000000000000000307905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000030790508050731000000000
+        )
+        + Hash(0x3089050805073100000000000000000000000)
+        + Hash(0x308905080507310000000000000000000000000000000000003)
+        + Hash(
+            0x990508050731000000000000000000000000000000000000309905080507310
+        )
+        + Hash(0x31090508050731000000000000000)
+        + Hash(0x3109050805073100000000000000000000000000000)
+        + Hash(0x1905080507310000000000000000000000000000000000000019050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000002905080507310000000
+        )
+        + Hash(0x290508050731000000000000000000000)
+        + Hash(0x39050805073100000000000000000000000000000000000)
+        + Hash(0x3905080507310000000000000000000000000000000000000049050805073)
+        + Hash(
+            0x1000000000000000000000000000000000000004905080507310000000000000
+        )
+        + Hash(0x590508050731000000000000000000000000000)
+        + Hash(0x59050805073100000000000000000000000000000000000000690)
+        + Hash(
+            0x5080507310000000000000000000000000000000000000069050805073100000
+        )
+        + Hash(0x7905080507310000000000000000000)
+        + Hash(0x790508050731000000000000000000000000000000000)
+        + Hash(0x89050805073100000000000000000000000000000000000000890508050)
+        + Hash(
+            0x7310000000000000000000000000000000000000099050805073100000000000
+        )
+        + Hash(0x9905080507310000000000000000000000000)
+        + Hash(0x1090508050731000000000000000000000000000000000000010)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000010190508050731000
+        )
+        + Hash(0x1019050805073100000000000000000)
+        + Hash(0x102905080507310000000000000000000000000000000)
+        + Hash(0x10290508050731000000000000000000000000000000000000103905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000010390508050731000000000
+        )
+        + Hash(0x1049050805073100000000000000000000000)
+        + Hash(0x104905080507310000000000000000000000000000000000001)
+        + Hash(
+            0x590508050731000000000000000000000000000000000000105905080507310
+        )
+        + Hash(0x10690508050731000000000000000)
+        + Hash(0x1069050805073100000000000000000000000000000)
+        + Hash(0x107905080507310000000000000000000000000000000000001079050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000108905080507310000000
+        )
+        + Hash(0x10890508050731000000000000000000000)
+        + Hash(0x1099050805073100000000000000000000000000000000000)
+        + Hash(
+            0x109905080507310000000000000000000000000000000000001109050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000110905080507310000000000000
+        )
+        + Hash(0x20190508050731000000000000000000000000000)
+        + Hash(0x2019050805073100000000000000000000000000000000000020290)
+        + Hash(
+            0x5080507310000000000000000000000000000000000002029050805073100000
+        )
+        + Hash(0x203905080507310000000000000000000)
+        + Hash(0x20390508050731000000000000000000000000000000000)
+        + Hash(0x2049050805073100000000000000000000000000000000000020490508050)
+        + Hash(
+            0x7310000000000000000000000000000000000002059050805073100000000000
+        )
+        + Hash(0x204905080507310000000000000000000000000)
+        + Hash(0x20690508050731000000000000000000000000000000000000206)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000020790508050731000
+        )
+        + Hash(0x2079050805073100000000000000000)
+        + Hash(0x208905080507310000000000000000000000000000000)
+        + Hash(0x20890508050731000000000000000000000000000000000000209905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000020990508050731000000000
+        )
+        + Hash(0x2109050805073100000000000000000000000)
+        + Hash(0x210905080507310000000000000000000000000000000000003)
+        + Hash(
+            0x190508050731000000000000000000000000000000000000301905080507310
+        )
+        + Hash(0x30290508050731000000000000000)
+        + Hash(0x3029050805073100000000000000000000000000000)
+        + Hash(0x303905080507310000000000000000000000000000000000003039050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000304905080507310000000
+        )
+        + Hash(0x30490508050731000000000000000000000)
+        + Hash(0x3059050805073100000000000000000000000000000000000)
+        + Hash(
+            0x305905080507310000000000000000000000000000000000003069050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000306905080507310000000000000
+        )
+        + Hash(0x30790508050731000000000000000000000000000)
+        + Hash(0x3079050805073100000000000000000000000000000000000030890)
+        + Hash(
+            0x5080507310000000000000000000000000000000000003089050805073100000
+        )
+        + Hash(0x309905080507310000000000000000000)
+        + Hash(0x30990508050731000000000000000000000000000000000)
+        + Hash(0x3109050805073100000000000000000000000000000000000031090508050)
+        + Hash(
+            0x5B50565B60007310000000000000000000000000000000000000019050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000001905080507310000000000000
+        )
+        + Hash(0x290508050731000000000000000000000000000)
+        + Hash(0x29050805073100000000000000000000000000000000000000390)
+        + Hash(
+            0x5080507310000000000000000000000000000000000000039050805073100000
+        )
+        + Hash(0x4905080507310000000000000000000)
+        + Hash(0x490508050731000000000000000000000000000000000)
+        + Hash(0x59050805073100000000000000000000000000000000000000590508050)
+        + Hash(
+            0x7310000000000000000000000000000000000000069050805073100000000000
+        )
+        + Hash(0x6905080507310000000000000000000000000)
+        + Hash(0x790508050731000000000000000000000000000000000000007)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000000890508050731000
+        )
+        + Hash(0x89050805073100000000000000000)
+        + Hash(0x9905080507310000000000000000000000000000000)
+        + Hash(0x990508050731000000000000000000000000000000000000010905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000001090508050731000000000
+        )
+        + Hash(0x1019050805073100000000000000000000000)
+        + Hash(0x101905080507310000000000000000000000000000000000001)
+        + Hash(
+            0x290508050731000000000000000000000000000000000000102905080507310
+        )
+        + Hash(0x10390508050731000000000000000)
+        + Hash(0x1039050805073100000000000000000000000000000)
+        + Hash(0x104905080507310000000000000000000000000000000000001049050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000105905080507310000000
+        )
+        + Hash(0x10590508050731000000000000000000000)
+        + Hash(0x1069050805073100000000000000000000000000000000000)
+        + Hash(
+            0x106905080507310000000000000000000000000000000000001079050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000107905080507310000000000000
+        )
+        + Hash(0x10890508050731000000000000000000000000000)
+        + Hash(0x1089050805073100000000000000000000000000000000000010990)
+        + Hash(
+            0x5080507310000000000000000000000000000000000001099050805073100000
+        )
+        + Hash(0x110905080507310000000000000000000)
+        + Hash(0x11090508050731000000000000000000000000000000000)
+        + Hash(0x2019050805073100000000000000000000000000000000000020190508050)
+        + Hash(
+            0x7310000000000000000000000000000000000002029050805073100000000000
+        )
+        + Hash(0x202905080507310000000000000000000000000)
+        + Hash(0x20390508050731000000000000000000000000000000000000203)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000020490508050731000
+        )
+        + Hash(0x2049050805073100000000000000000)
+        + Hash(0x205905080507310000000000000000000000000000000)
+        + Hash(0x20490508050731000000000000000000000000000000000000206905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000020690508050731000000000
+        )
+        + Hash(0x2079050805073100000000000000000000000)
+        + Hash(0x207905080507310000000000000000000000000000000000002)
+        + Hash(
+            0x890508050731000000000000000000000000000000000000208905080507310
+        )
+        + Hash(0x20990508050731000000000000000)
+        + Hash(0x2099050805073100000000000000000000000000000)
+        + Hash(0x210905080507310000000000000000000000000000000000002109050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000301905080507310000000
+        )
+        + Hash(0x30190508050731000000000000000000000)
+        + Hash(0x3029050805073100000000000000000000000000000000000)
+        + Hash(
+            0x302905080507310000000000000000000000000000000000003039050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000303905080507310000000000000
+        )
+        + Hash(0x30490508050731000000000000000000000000000)
+        + Hash(0x3049050805073100000000000000000000000000000000000030590)
+        + Hash(
+            0x5080507310000000000000000000000000000000000003059050805073100000
+        )
+        + Hash(0x306905080507310000000000000000000)
+        + Hash(0x30690508050731000000000000000000000000000000000)
+        + Hash(0x3079050805073100000000000000000000000000000000000030790508050)
+        + Hash(
+            0x7310000000000000000000000000000000000003089050805073100000000000
+        )
+        + Hash(0x308905080507310000000000000000000000000)
+        + Hash(0x30990508050731000000000000000000000000000000000000309)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000031090508050731000
+        )
+        + Hash(0x3109050805073100000000000000000)
+        + Hash(0x1905080507310000000000000000000000000000000)
+        + Hash(0x190508050731000000000000000000000000000000000000002905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000000290508050731000000000
+        )
+        + Hash(0x39050805073100000000000000000000000)
+        + Hash(0x3905080507310000000000000000000000000000000000000)
+        + Hash(
+            0x490508050731000000000000000000000000000000000000004905080507310
+        )
+        + Hash(0x590508050731000000000000000)
+        + Hash(0x59050805073100000000000000000000000000000)
+        + Hash(0x6905080507310000000000000000000000000000000000000069050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000007905080507310000000
+        )
+        + Hash(0x790508050731000000000000000000000)
+        + Hash(0x89050805073100000000000000000000000000000000000)
+        + Hash(0x8905080507310000000000000000000000000000000000000099050805073)
+        + Hash(
+            0x1000000000000000000000000000000000000009905080507310000000000000
+        )
+        + Hash(0x1090508050731000000000000000000000000000)
+        + Hash(0x109050805073100000000000000000000000000000000000010190)
+        + Hash(
+            0x5080507310000000000000000000000000000000000001019050805073100000
+        )
+        + Hash(0x102905080507310000000000000000000)
+        + Hash(0x10290508050731000000000000000000000000000000000)
+        + Hash(0x1039050805073100000000000000000000000000000000000010390508050)
+        + Hash(
+            0x7310000000000000000000000000000000000001049050805073100000000000
+        )
+        + Hash(0x104905080507310000000000000000000000000)
+        + Hash(0x10590508050731000000000000000000000000000000000000105)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000010690508050731000
+        )
+        + Hash(0x1069050805073100000000000000000)
+        + Hash(0x107905080507310000000000000000000000000000000)
+        + Hash(0x10790508050731000000000000000000000000000000000000108905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000010890508050731000000000
+        )
+        + Hash(0x1099050805073100000000000000000000000)
+        + Hash(0x109905080507310000000000000000000000000000000000001)
+        + Hash(
+            0x1090508050731000000000000000000000000000000000000110905080507310
+        )
+        + Hash(0x20190508050731000000000000000)
+        + Hash(0x2019050805073100000000000000000000000000000)
+        + Hash(0x202905080507310000000000000000000000000000000000002029050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000203905080507310000000
+        )
+        + Hash(0x20390508050731000000000000000000000)
+        + Hash(0x2049050805073100000000000000000000000000000000000)
+        + Hash(
+            0x204905080507310000000000000000000000000000000000002059050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000204905080507310000000000000
+        )
+        + Hash(0x20690508050731000000000000000000000000000)
+        + Hash(0x2069050805073100000000000000000000000000000000000020790)
+        + Hash(
+            0x5080507310000000000000000000000000000000000002079050805073100000
+        )
+        + Hash(0x208905080507310000000000000000000)
+        + Hash(0x20890508050731000000000000000000000000000000000)
+        + Hash(0x2099050805073100000000000000000000000000000000000020990508050)
+        + Hash(
+            0x7310000000000000000000000000000000000002109050805073100000000000
+        )
+        + Hash(0x210905080507310000000000000000000000000)
+        + Hash(0x30190508050731000000000000000000000000000000000000301)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000030290508050731000
+        )
+        + Hash(0x3029050805073100000000000000000)
+        + Hash(0x303905080507310000000000000000000000000000000)
+        + Hash(0x30390508050731000000000000000000000000000000000000304905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000030490508050731000000000
+        )
+        + Hash(0x3059050805073100000000000000000000000)
+        + Hash(0x305905080507310000000000000000000000000000000000003)
+        + Hash(
+            0x690508050731000000000000000000000000000000000000306905080507310
+        )
+        + Hash(0x30790508050731000000000000000)
+        + Hash(0x3079050805073100000000000000000000000000000)
+        + Hash(0x308905080507310000000000000000000000000000000000003089050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000309905080507310000000
+        )
+        + Hash(0x30990508050731000000000000000000000)
+        + Hash(0x3109050805073100000000000000000000000000000000000)
+        + Hash(
+            0x310905080505B50565B60007310000000000000000000000000000000000000
+        )
+        + Hash(
+            0x190508050731000000000000000000000000000000000000001905080507310
+        )
+        + Hash(0x290508050731000000000000000)
+        + Hash(0x29050805073100000000000000000000000000000)
+        + Hash(0x3905080507310000000000000000000000000000000000000039050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000004905080507310000000
+        )
+        + Hash(0x490508050731000000000000000000000)
+        + Hash(0x59050805073100000000000000000000000000000000000)
+        + Hash(0x5905080507310000000000000000000000000000000000000069050805073)
+        + Hash(
+            0x1000000000000000000000000000000000000006905080507310000000000000
+        )
+        + Hash(0x790508050731000000000000000000000000000)
+        + Hash(0x79050805073100000000000000000000000000000000000000890)
+        + Hash(
+            0x5080507310000000000000000000000000000000000000089050805073100000
+        )
+        + Hash(0x9905080507310000000000000000000)
+        + Hash(0x990508050731000000000000000000000000000000000)
+        + Hash(0x109050805073100000000000000000000000000000000000001090508050)
+        + Hash(
+            0x7310000000000000000000000000000000000001019050805073100000000000
+        )
+        + Hash(0x101905080507310000000000000000000000000)
+        + Hash(0x10290508050731000000000000000000000000000000000000102)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000010390508050731000
+        )
+        + Hash(0x1039050805073100000000000000000)
+        + Hash(0x104905080507310000000000000000000000000000000)
+        + Hash(0x10490508050731000000000000000000000000000000000000105905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000010590508050731000000000
+        )
+        + Hash(0x1069050805073100000000000000000000000)
+        + Hash(0x106905080507310000000000000000000000000000000000001)
+        + Hash(
+            0x790508050731000000000000000000000000000000000000107905080507310
+        )
+        + Hash(0x10890508050731000000000000000)
+        + Hash(0x1089050805073100000000000000000000000000000)
+        + Hash(0x109905080507310000000000000000000000000000000000001099050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000110905080507310000000
+        )
+        + Hash(0x11090508050731000000000000000000000)
+        + Hash(0x2019050805073100000000000000000000000000000000000)
+        + Hash(
+            0x201905080507310000000000000000000000000000000000002029050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000202905080507310000000000000
+        )
+        + Hash(0x20390508050731000000000000000000000000000)
+        + Hash(0x2039050805073100000000000000000000000000000000000020490)
+        + Hash(
+            0x5080507310000000000000000000000000000000000002049050805073100000
+        )
+        + Hash(0x205905080507310000000000000000000)
+        + Hash(0x20490508050731000000000000000000000000000000000)
+        + Hash(0x2069050805073100000000000000000000000000000000000020690508050)
+        + Hash(
+            0x7310000000000000000000000000000000000002079050805073100000000000
+        )
+        + Hash(0x207905080507310000000000000000000000000)
+        + Hash(0x20890508050731000000000000000000000000000000000000208)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000020990508050731000
+        )
+        + Hash(0x2099050805073100000000000000000)
+        + Hash(0x210905080507310000000000000000000000000000000)
+        + Hash(0x21090508050731000000000000000000000000000000000000301905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000030190508050731000000000
+        )
+        + Hash(0x3029050805073100000000000000000000000)
+        + Hash(0x302905080507310000000000000000000000000000000000003)
+        + Hash(
+            0x390508050731000000000000000000000000000000000000303905080507310
+        )
+        + Hash(0x30490508050731000000000000000)
+        + Hash(0x3049050805073100000000000000000000000000000)
+        + Hash(0x305905080507310000000000000000000000000000000000003059050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000306905080507310000000
+        )
+        + Hash(0x30690508050731000000000000000000000)
+        + Hash(0x3079050805073100000000000000000000000000000000000)
+        + Hash(
+            0x307905080507310000000000000000000000000000000000003089050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000308905080507310000000000000
+        )
+        + Hash(0x30990508050731000000000000000000000000000)
+        + Hash(0x3099050805073100000000000000000000000000000000000031090)
+        + Hash(
+            0x5080507310000000000000000000000000000000000003109050805073100000
+        )
+        + Hash(0x1905080507310000000000000000000)
+        + Hash(0x190508050731000000000000000000000000000000000)
+        + Hash(0x29050805073100000000000000000000000000000000000000290508050)
+        + Hash(
+            0x7310000000000000000000000000000000000000039050805073100000000000
+        )
+        + Hash(0x3905080507310000000000000000000000000)
+        + Hash(0x490508050731000000000000000000000000000000000000004)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000000590508050731000
+        )
+        + Hash(0x59050805073100000000000000000)
+        + Hash(0x6905080507310000000000000000000000000000000)
+        + Hash(0x690508050731000000000000000000000000000000000000007905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000000790508050731000000000
+        )
+        + Hash(0x89050805073100000000000000000000000)
+        + Hash(0x8905080507310000000000000000000000000000000000000)
+        + Hash(
+            0x990508050731000000000000000000000000000000000000009905080507310
+        )
+        + Hash(0x1090508050731000000000000000)
+        + Hash(0x109050805073100000000000000000000000000000)
+        + Hash(0x101905080507310000000000000000000000000000000000001019050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000102905080507310000000
+        )
+        + Hash(0x10290508050731000000000000000000000)
+        + Hash(0x1039050805073100000000000000000000000000000000000)
+        + Hash(
+            0x103905080507310000000000000000000000000000000000001049050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000104905080507310000000000000
+        )
+        + Hash(0x10590508050731000000000000000000000000000)
+        + Hash(0x1059050805073100000000000000000000000000000000000010690)
+        + Hash(
+            0x5080507310000000000000000000000000000000000001069050805073100000
+        )
+        + Hash(0x107905080507310000000000000000000)
+        + Hash(0x10790508050731000000000000000000000000000000000)
+        + Hash(0x1089050805073100000000000000000000000000000000000010890508050)
+        + Hash(
+            0x7310000000000000000000000000000000000001099050805073100000000000
+        )
+        + Hash(0x109905080507310000000000000000000000000)
+        + Hash(0x11090508050731000000000000000000000000000000000000110)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000020190508050731000
+        )
+        + Hash(0x2019050805073100000000000000000)
+        + Hash(0x202905080507310000000000000000000000000000000)
+        + Hash(0x20290508050731000000000000000000000000000000000000203905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000020390508050731000000000
+        )
+        + Hash(0x2049050805073100000000000000000000000)
+        + Hash(0x204905080507310000000000000000000000000000000000002)
+        + Hash(
+            0x590508050731000000000000000000000000000000000000204905080507310
+        )
+        + Hash(0x20690508050731000000000000000)
+        + Hash(0x2069050805073100000000000000000000000000000)
+        + Hash(0x207905080507310000000000000000000000000000000000002079050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000208905080507310000000
+        )
+        + Hash(0x20890508050731000000000000000000000)
+        + Hash(0x2099050805073100000000000000000000000000000000000)
+        + Hash(
+            0x209905080507310000000000000000000000000000000000002109050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000210905080507310000000000000
+        )
+        + Hash(0x30190508050731000000000000000000000000000)
+        + Hash(0x3019050805073100000000000000000000000000000000000030290)
+        + Hash(
+            0x5080507310000000000000000000000000000000000003029050805073100000
+        )
+        + Hash(0x303905080507310000000000000000000)
+        + Hash(0x30390508050731000000000000000000000000000000000)
+        + Hash(0x3049050805073100000000000000000000000000000000000030490508050)
+        + Hash(
+            0x7310000000000000000000000000000000000003059050805073100000000000
+        )
+        + Hash(0x305905080507310000000000000000000000000)
+        + Hash(0x30690508050731000000000000000000000000000000000000306)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000030790508050731000
+        )
+        + Hash(0x3079050805073100000000000000000)
+        + Hash(0x308905080507310000000000000000000000000000000)
+        + Hash(0x30890508050731000000000000000000000000000000000000309905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000030990508050731000000000
+        )
+        + Hash(0x3109050805073100000000000000000000000)
+        + Hash(0x310905080505B50565B60007310000000000000000000000000)
+        + Hash(0x190508050731000000000000000000000000000000000000001)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000000290508050731000
+        )
+        + Hash(0x29050805073100000000000000000)
+        + Hash(0x3905080507310000000000000000000000000000000)
+        + Hash(0x390508050731000000000000000000000000000000000000004905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000000490508050731000000000
+        )
+        + Hash(0x59050805073100000000000000000000000)
+        + Hash(0x5905080507310000000000000000000000000000000000000)
+        + Hash(
+            0x690508050731000000000000000000000000000000000000006905080507310
+        )
+        + Hash(0x790508050731000000000000000)
+        + Hash(0x79050805073100000000000000000000000000000)
+        + Hash(0x8905080507310000000000000000000000000000000000000089050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000009905080507310000000
+        )
+        + Hash(0x990508050731000000000000000000000)
+        + Hash(0x109050805073100000000000000000000000000000000000)
+        + Hash(
+            0x10905080507310000000000000000000000000000000000001019050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000101905080507310000000000000
+        )
+        + Hash(0x10290508050731000000000000000000000000000)
+        + Hash(0x1029050805073100000000000000000000000000000000000010390)
+        + Hash(
+            0x5080507310000000000000000000000000000000000001039050805073100000
+        )
+        + Hash(0x104905080507310000000000000000000)
+        + Hash(0x10490508050731000000000000000000000000000000000)
+        + Hash(0x1059050805073100000000000000000000000000000000000010590508050)
+        + Hash(
+            0x7310000000000000000000000000000000000001069050805073100000000000
+        )
+        + Hash(0x106905080507310000000000000000000000000)
+        + Hash(0x10790508050731000000000000000000000000000000000000107)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000010890508050731000
+        )
+        + Hash(0x1089050805073100000000000000000)
+        + Hash(0x109905080507310000000000000000000000000000000)
+        + Hash(0x10990508050731000000000000000000000000000000000000110905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000011090508050731000000000
+        )
+        + Hash(0x2019050805073100000000000000000000000)
+        + Hash(0x201905080507310000000000000000000000000000000000002)
+        + Hash(
+            0x290508050731000000000000000000000000000000000000202905080507310
+        )
+        + Hash(0x20390508050731000000000000000)
+        + Hash(0x2039050805073100000000000000000000000000000)
+        + Hash(0x204905080507310000000000000000000000000000000000002049050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000205905080507310000000
+        )
+        + Hash(0x20490508050731000000000000000000000)
+        + Hash(0x2069050805073100000000000000000000000000000000000)
+        + Hash(
+            0x206905080507310000000000000000000000000000000000002079050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000207905080507310000000000000
+        )
+        + Hash(0x20890508050731000000000000000000000000000)
+        + Hash(0x2089050805073100000000000000000000000000000000000020990)
+        + Hash(
+            0x5080507310000000000000000000000000000000000002099050805073100000
+        )
+        + Hash(0x210905080507310000000000000000000)
+        + Hash(0x21090508050731000000000000000000000000000000000)
+        + Hash(0x3019050805073100000000000000000000000000000000000030190508050)
+        + Hash(
+            0x7310000000000000000000000000000000000003029050805073100000000000
+        )
+        + Hash(0x302905080507310000000000000000000000000)
+        + Hash(0x30390508050731000000000000000000000000000000000000303)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000030490508050731000
+        )
+        + Hash(0x3049050805073100000000000000000)
+        + Hash(0x305905080507310000000000000000000000000000000)
+        + Hash(0x30590508050731000000000000000000000000000000000000306905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000030690508050731000000000
+        )
+        + Hash(0x3079050805073100000000000000000000000)
+        + Hash(0x307905080507310000000000000000000000000000000000003)
+        + Hash(
+            0x890508050731000000000000000000000000000000000000308905080507310
+        )
+        + Hash(0x30990508050731000000000000000)
+        + Hash(0x3099050805073100000000000000000000000000000)
+        + Hash(0x310905080507310000000000000000000000000000000000003109050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000001905080507310000000
+        )
+        + Hash(0x190508050731000000000000000000000)
+        + Hash(0x29050805073100000000000000000000000000000000000)
+        + Hash(0x2905080507310000000000000000000000000000000000000039050805073)
+        + Hash(
+            0x1000000000000000000000000000000000000003905080507310000000000000
+        )
+        + Hash(0x490508050731000000000000000000000000000)
+        + Hash(0x49050805073100000000000000000000000000000000000000590)
+        + Hash(
+            0x5080507310000000000000000000000000000000000000059050805073100000
+        )
+        + Hash(0x6905080507310000000000000000000)
+        + Hash(0x690508050731000000000000000000000000000000000)
+        + Hash(0x79050805073100000000000000000000000000000000000000790508050)
+        + Hash(
+            0x7310000000000000000000000000000000000000089050805073100000000000
+        )
+        + Hash(0x8905080507310000000000000000000000000)
+        + Hash(0x990508050731000000000000000000000000000000000000009)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000001090508050731000
+        )
+        + Hash(0x109050805073100000000000000000)
+        + Hash(0x101905080507310000000000000000000000000000000)
+        + Hash(0x10190508050731000000000000000000000000000000000000102905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000010290508050731000000000
+        )
+        + Hash(0x1039050805073100000000000000000000000)
+        + Hash(0x103905080507310000000000000000000000000000000000001)
+        + Hash(
+            0x490508050731000000000000000000000000000000000000104905080507310
+        )
+        + Hash(0x10590508050731000000000000000)
+        + Hash(0x1059050805073100000000000000000000000000000)
+        + Hash(0x106905080507310000000000000000000000000000000000001069050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000107905080507310000000
+        )
+        + Hash(0x10790508050731000000000000000000000)
+        + Hash(0x1089050805073100000000000000000000000000000000000)
+        + Hash(
+            0x108905080507310000000000000000000000000000000000001099050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000109905080507310000000000000
+        )
+        + Hash(0x11090508050731000000000000000000000000000)
+        + Hash(0x1109050805073100000000000000000000000000000000000020190)
+        + Hash(
+            0x5080507310000000000000000000000000000000000002019050805073100000
+        )
+        + Hash(0x202905080507310000000000000000000)
+        + Hash(0x20290508050731000000000000000000000000000000000)
+        + Hash(0x2039050805073100000000000000000000000000000000000020390508050)
+        + Hash(
+            0x7310000000000000000000000000000000000002049050805073100000000000
+        )
+        + Hash(0x204905080507310000000000000000000000000)
+        + Hash(0x20590508050731000000000000000000000000000000000000204)
+        + Hash(
+            0x9050805073100000000000000000000000000000000000020690508050731000
+        )
+        + Hash(0x2069050805073100000000000000000)
+        + Hash(0x207905080507310000000000000000000000000000000)
+        + Hash(0x20790508050731000000000000000000000000000000000000208905080)
+        + Hash(
+            0x5073100000000000000000000000000000000000020890508050731000000000
+        )
+        + Hash(0x2099050805073100000000000000000000000)
+        + Hash(0x209905080507310000000000000000000000000000000000002)
+        + Hash(
+            0x1090508050731000000000000000000000000000000000000210905080507310
+        )
+        + Hash(0x30190508050731000000000000000)
+        + Hash(0x3019050805073100000000000000000000000000000)
+        + Hash(0x302905080507310000000000000000000000000000000000003029050)
+        + Hash(
+            0x8050731000000000000000000000000000000000000303905080507310000000
+        )
+        + Hash(0x30390508050731000000000000000000000)
+        + Hash(0x3049050805073100000000000000000000000000000000000)
+        + Hash(
+            0x304905080507310000000000000000000000000000000000003059050805073
+        )
+        + Hash(
+            0x1000000000000000000000000000000000000305905080507310000000000000
+        )
+        + Hash(0x30690508050731000000000000000000000000000)
+        + Hash(0x3069050805073100000000000000000000000000000000000030790)
+        + Hash(
+            0x5080507310000000000000000000000000000000000003079050805073100000
+        )
+        + Hash(0x308905080507310000000000000000000)
+        + Hash(0x30890508050731000000000000000000000000000000000)
+        + Hash(0x3099050805073100000000000000000000000000000000000030990508050)
+        + Hash(
+            0x7310000000000000000000000000000000000003109050805073100000000000
+        )
+        + Hash(0x310905080505B50566060604052361561007457)
+        + Hash(
+            0x6000357C01000000000000000000000000000000000000000000000000000000
+        )
+        + Hash(
+            0x90048063A3B9F3E514610079578063B50345B61461008D578063D4F639EA14
+        )
+        + Hash(
+            0x6100A1578063D9BB316F146100B5578063E22A5D5B146100C9578063F983C0FA
+        )
+        + Hash(
+            0x146100DD57610074565B610002565B346100025761008B60048050506100F156
+        )
+        + Hash(
+            0x5B005B346100025761009F6004805050611097565B005B34610002576100B360
+        )
+        + Hash(
+            0x480505061203D565B005B34610002576100C76004805050612FE3565B005B34
+        )
+        + Hash(
+            0x610002576100DB6004805050613F89565B005B34610002576100EF6004805050
+        )
+        + Hash(
+            0x614F2F565B005B60007310000000000000000000000000000000000000019050
+        )
+        + Hash(
+            0x8050731000000000000000000000000000000000000001905080507310000000
+        )
+        + Hash(0x290508050731000000000000000000000)
+        + Hash(0x29050805073100000000000000000000000000000000000)
+        + Hash(0x3905080507310000000000000000000000000000000000000039050805073)
+        + Hash(
+            0x1000000000000000000000000000000000000004905080507310000000000000
+        )
+        + Hash(0x490508050731000000000000000000000000000)
+        + Hash(0x59050805073100000000000000000000000000000000000000590)
+        + Hash(
+            0x5080507310000000000000000000000000000000000000069050805073100000
+        )
+        + Hash(0x6905080507310000000000000000000)
+        + Hash(0x790508050731000000000000000000000000000000000),
+        Bytes(
+            "601080600b6000396000f360606040523615610074576000357c010000000000000000000000000000000000000000000000000000000090048063a3b9f3e514610079578063b50345b61461008d578063d4f639ea146100a1578063d9bb316f146100b5578063e22a5d5b146100c9578063f983c0fa146100dd57610074565b610002565b346100025761008b60048050506100f1565b005b346100025761009f6004805050611097565b005b34610002576100b3600480505061203d565b005b34610002576100c76004805050612fe3565b005b34610002576100db6004805050613f89565b005b34610002576100ef6004805050614f2f565b005b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b505660606040523615610074576000357c010000000000000000000000000000000000000000000000000000000090048063a3b9f3e514610079578063b50345b61461008d578063d4f639ea146100a1578063d9bb316f146100b5578063e22a5d5b146100c9578063f983c0fa146100dd57610074565b610002565b346100025761008b60048050506100f1565b005b346100025761009f6004805050611097565b005b34610002576100b3600480505061203d565b005b34610002576100c76004805050612fe3565b005b34610002576100db6004805050613f89565b005b34610002576100ef6004805050614f2f565b005b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b505660606040523615610074576000357c010000000000000000000000000000000000000000000000000000000090048063a3b9f3e514610079578063b50345b61461008d578063d4f639ea146100a1578063d9bb316f146100b5578063e22a5d5b146100c9578063f983c0fa146100dd57610074565b610002565b346100025761008b60048050506100f1565b005b346100025761009f6004805050611097565b005b34610002576100b3600480505061203d565b005b34610002576100c76004805050612fe3565b005b34610002576100db6004805050613f89565b005b34610002576100ef6004805050614f2f565b005b60007310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000"  # noqa: E501
+        ),
+    ]
+    tx_gas = [15000000]
+
+    tx = Transaction(
+        sender=sender,
+        to=None,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP4844_blobtransactions/__init__.py b/tests/ported_static/stEIP4844_blobtransactions/__init__.py
new file mode 100644
index 00000000000..d0128b23c12
--- /dev/null
+++ b/tests/ported_static/stEIP4844_blobtransactions/__init__.py
@@ -0,0 +1 @@
+"""Ported static tests: stEIP4844_blobtransactions."""  # noqa: N999
diff --git a/tests/ported_static/Cancun/stEIP4844_blobtransactions/test_create_blobhash_tx.py b/tests/ported_static/stEIP4844_blobtransactions/test_create_blobhash_tx.py
similarity index 72%
rename from tests/ported_static/Cancun/stEIP4844_blobtransactions/test_create_blobhash_tx.py
rename to tests/ported_static/stEIP4844_blobtransactions/test_create_blobhash_tx.py
index 9f2720d00ad..d11cc789e44 100644
--- a/tests/ported_static/Cancun/stEIP4844_blobtransactions/test_create_blobhash_tx.py
+++ b/tests/ported_static/stEIP4844_blobtransactions/test_create_blobhash_tx.py
@@ -2,13 +2,11 @@
 BLOB002.
 
 Ported from:
-tests/static/state_tests/Cancun/stEIP4844_blobtransactions
-createBlobhashTxFiller.yml
+state_tests/Cancun/stEIP4844_blobtransactions/createBlobhashTxFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     AccessList,
     Account,
     Address,
@@ -27,21 +25,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/Cancun/stEIP4844_blobtransactions/createBlobhashTxFiller.yml",  # noqa: E501
+        "state_tests/Cancun/stEIP4844_blobtransactions/createBlobhashTxFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.exception_test
+@pytest.mark.pre_alloc_mutable
 def test_create_blobhash_tx(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """BLOB002."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,22 +45,27 @@ def test_create_blobhash_tx(
         timestamp=1000,
         prev_randao=0x20000,
         base_fee_per_gas=7,
+        excess_blob_gas=0,
         gas_limit=68719476736,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
+    # Source: lll
+    # {
+    #    ; Can also add lll style comments here
+    #    [[0]] (BLOBHASH 0)
+    # }
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.BLOBHASH(index=0x0)) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc4dcf66bd4cdefe4ce7fba4951be4e9f580122c5"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex("00"),
+        data=Op.STOP,
         gas_limit=4000000,
+        value=0x186A0,
         max_fee_per_gas=5000000000,
         max_priority_fee_per_gas=2,
         max_fee_per_blob_gas=10,
@@ -73,10 +74,9 @@ def test_create_blobhash_tx(
                 "0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"  # noqa: E501
             ),
         ],
-        value=100000,
         access_list=[
             AccessList(
-                address=Address("0xc4dcf66bd4cdefe4ce7fba4951be4e9f580122c5"),
+                address=addr,
                 storage_keys=[
                     Hash(
                         "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
@@ -90,6 +90,6 @@ def test_create_blobhash_tx(
         error=TransactionException.TYPE_3_TX_CONTRACT_CREATION,
     )
 
-    post: dict = {}
+    post = {addr: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/Cancun/stEIP4844_blobtransactions/test_empty_blobhash_list.py b/tests/ported_static/stEIP4844_blobtransactions/test_empty_blobhash_list.py
similarity index 70%
rename from tests/ported_static/Cancun/stEIP4844_blobtransactions/test_empty_blobhash_list.py
rename to tests/ported_static/stEIP4844_blobtransactions/test_empty_blobhash_list.py
index a5116edc9d4..e97a3c33320 100644
--- a/tests/ported_static/Cancun/stEIP4844_blobtransactions/test_empty_blobhash_list.py
+++ b/tests/ported_static/stEIP4844_blobtransactions/test_empty_blobhash_list.py
@@ -2,17 +2,16 @@
 BLOB000.
 
 Ported from:
-tests/static/state_tests/Cancun/stEIP4844_blobtransactions
-emptyBlobhashListFiller.yml
+state_tests/Cancun/stEIP4844_blobtransactions/emptyBlobhashListFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     AccessList,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     Hash,
     StateTestFiller,
@@ -27,21 +26,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/Cancun/stEIP4844_blobtransactions/emptyBlobhashListFiller.yml",  # noqa: E501
+        "state_tests/Cancun/stEIP4844_blobtransactions/emptyBlobhashListFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.exception_test
+@pytest.mark.pre_alloc_mutable
 def test_empty_blobhash_list(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """BLOB000."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,35 +46,34 @@ def test_empty_blobhash_list(
         timestamp=1000,
         prev_randao=0x20000,
         base_fee_per_gas=7,
+        excess_blob_gas=0,
         gas_limit=68719476736,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # {
     #    ; Can also add lll style comments here
     #    [[0]] (BLOBHASH 0)
     # }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.BLOBHASH(index=0x0)) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc4dcf66bd4cdefe4ce7fba4951be4e9f580122c5"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=target,
+        data=Bytes("00"),
         gas_limit=4000000,
+        value=0x186A0,
         max_fee_per_gas=5000000000,
         max_priority_fee_per_gas=2,
         max_fee_per_blob_gas=10,
         blob_versioned_hashes=[],
-        value=100000,
         access_list=[
             AccessList(
-                address=Address("0xc4dcf66bd4cdefe4ce7fba4951be4e9f580122c5"),
+                address=target,
                 storage_keys=[
                     Hash(
                         "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
@@ -91,6 +87,6 @@ def test_empty_blobhash_list(
         error=TransactionException.TYPE_3_TX_ZERO_BLOBS,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/Cancun/stEIP4844_blobtransactions/test_opcode_blobh_bounds.py b/tests/ported_static/stEIP4844_blobtransactions/test_opcode_blobh_bounds.py
similarity index 63%
rename from tests/ported_static/Cancun/stEIP4844_blobtransactions/test_opcode_blobh_bounds.py
rename to tests/ported_static/stEIP4844_blobtransactions/test_opcode_blobh_bounds.py
index 46d0a237089..dadd17acd8c 100644
--- a/tests/ported_static/Cancun/stEIP4844_blobtransactions/test_opcode_blobh_bounds.py
+++ b/tests/ported_static/stEIP4844_blobtransactions/test_opcode_blobh_bounds.py
@@ -2,8 +2,7 @@
 BLOB005.
 
 Ported from:
-tests/static/state_tests/Cancun/stEIP4844_blobtransactions
-opcodeBlobhBoundsFiller.yml
+state_tests/Cancun/stEIP4844_blobtransactions/opcodeBlobhBoundsFiller.yml
 """
 
 import pytest
@@ -13,6 +12,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     Hash,
     StateTestFiller,
@@ -26,7 +26,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/Cancun/stEIP4844_blobtransactions/opcodeBlobhBoundsFiller.yml",  # noqa: E501
+        "state_tests/Cancun/stEIP4844_blobtransactions/opcodeBlobhBoundsFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -36,7 +36,7 @@ def test_opcode_blobh_bounds(
     pre: Alloc,
 ) -> None:
     """BLOB005."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -47,11 +47,12 @@ def test_opcode_blobh_bounds(
         timestamp=1000,
         prev_randao=0x20000,
         base_fee_per_gas=1,
+        excess_blob_gas=0,
         gas_limit=68719476736,
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # {
     #    ; Can also add lll style comments here
     #    [[0]] (BLOBHASH 0)
@@ -61,42 +62,34 @@ def test_opcode_blobh_bounds(
     #    [[4]] (BLOBHASH 0xffffffffffffffffffffffffffffffff) ; 128
     #    [[5]] (BLOBHASH 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) ; 256  # noqa: E501
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.BLOBHASH(index=0x0))
-            + Op.SSTORE(key=0x1, value=Op.BLOBHASH(index=0xA))
-            + Op.SSTORE(key=0x2, value=Op.BLOBHASH(index=0xFFFFFFFF))
-            + Op.SSTORE(key=0x3, value=Op.BLOBHASH(index=0xFFFFFFFFFFFFFFFF))
-            + Op.SSTORE(
-                key=0x4,
-                value=Op.BLOBHASH(index=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF),
-            )
-            + Op.SSTORE(
-                key=0x5,
-                value=Op.BLOBHASH(
-                    index=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x2: 0x1,
-            0x3: 0x1,
-            0x4: 0x1,
-            0x5: 0x1,
-        },
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.BLOBHASH(index=0x0))
+        + Op.SSTORE(key=0x1, value=Op.BLOBHASH(index=0xA))
+        + Op.SSTORE(key=0x2, value=Op.BLOBHASH(index=0xFFFFFFFF))
+        + Op.SSTORE(key=0x3, value=Op.BLOBHASH(index=0xFFFFFFFFFFFFFFFF))
+        + Op.SSTORE(
+            key=0x4,
+            value=Op.BLOBHASH(index=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF),
+        )
+        + Op.SSTORE(
+            key=0x5,
+            value=Op.BLOBHASH(
+                index=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        storage={0: 1, 1: 1, 2: 1, 3: 1, 4: 1, 5: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc8126e943c569c35df09619f8e1e67460acff695"),  # noqa: E501
+        address=Address(0xC8126E943C569C35DF09619F8E1E67460ACFF695),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=target,
+        data=Bytes("00"),
         gas_limit=4000000,
+        value=0x186A0,
         max_fee_per_gas=5000000000,
         max_priority_fee_per_gas=2,
         max_fee_per_blob_gas=10,
@@ -108,10 +101,9 @@ def test_opcode_blobh_bounds(
                 "0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"  # noqa: E501
             ),
         ],
-        value=100000,
         access_list=[
             AccessList(
-                address=Address("0xc8126e943c569c35df09619f8e1e67460acff695"),
+                address=target,
                 storage_keys=[
                     Hash(
                         "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
@@ -125,7 +117,7 @@ def test_opcode_blobh_bounds(
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x1A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8,  # noqa: E501
             },
diff --git a/tests/ported_static/Cancun/stEIP4844_blobtransactions/test_opcode_blobhash_out_of_range.py b/tests/ported_static/stEIP4844_blobtransactions/test_opcode_blobhash_out_of_range.py
similarity index 73%
rename from tests/ported_static/Cancun/stEIP4844_blobtransactions/test_opcode_blobhash_out_of_range.py
rename to tests/ported_static/stEIP4844_blobtransactions/test_opcode_blobhash_out_of_range.py
index acb3e2d0966..39c73145913 100644
--- a/tests/ported_static/Cancun/stEIP4844_blobtransactions/test_opcode_blobhash_out_of_range.py
+++ b/tests/ported_static/stEIP4844_blobtransactions/test_opcode_blobhash_out_of_range.py
@@ -2,8 +2,7 @@
 BLOB003, BLOB004.
 
 Ported from:
-tests/static/state_tests/Cancun/stEIP4844_blobtransactions
-opcodeBlobhashOutOfRangeFiller.yml
+state_tests/Cancun/stEIP4844_blobtransactions/opcodeBlobhashOutOfRangeFiller.yml
 """
 
 import pytest
@@ -13,6 +12,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     Hash,
     StateTestFiller,
@@ -26,7 +26,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/Cancun/stEIP4844_blobtransactions/opcodeBlobhashOutOfRangeFiller.yml",  # noqa: E501
+        "state_tests/Cancun/stEIP4844_blobtransactions/opcodeBlobhashOutOfRangeFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -36,7 +36,7 @@ def test_opcode_blobhash_out_of_range(
     pre: Alloc,
 ) -> None:
     """BLOB003, BLOB004."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -47,33 +47,33 @@ def test_opcode_blobhash_out_of_range(
         timestamp=1000,
         prev_randao=0x20000,
         base_fee_per_gas=7,
+        excess_blob_gas=0,
         gas_limit=68719476736,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # {
     #    ; Can also add lll style comments here
     #    [[0]] (BLOBHASH 0)
     #    [[1]] (BLOBHASH 10)
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.BLOBHASH(index=0x0))
-            + Op.SSTORE(key=0x1, value=Op.BLOBHASH(index=0xA))
-            + Op.STOP
-        ),
-        storage={0x0: 0x1, 0x1: 0x1},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.BLOBHASH(index=0x0))
+        + Op.SSTORE(key=0x1, value=Op.BLOBHASH(index=0xA))
+        + Op.STOP,
+        storage={0: 1, 1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0c4d6f62d3c85069cea2411284bd520ac87fb7eb"),  # noqa: E501
+        address=Address(0x0C4D6F62D3C85069CEA2411284BD520AC87FB7EB),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=target,
+        data=Bytes("00"),
         gas_limit=4000000,
+        value=0x186A0,
         max_fee_per_gas=5000000000,
         max_priority_fee_per_gas=2,
         max_fee_per_blob_gas=10,
@@ -85,10 +85,9 @@ def test_opcode_blobhash_out_of_range(
                 "0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"  # noqa: E501
             ),
         ],
-        value=100000,
         access_list=[
             AccessList(
-                address=Address("0x0c4d6f62d3c85069cea2411284bd520ac87fb7eb"),
+                address=target,
                 storage_keys=[
                     Hash(
                         "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
@@ -102,7 +101,7 @@ def test_opcode_blobhash_out_of_range(
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x1A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8,  # noqa: E501
             },
diff --git a/tests/ported_static/Cancun/stEIP4844_blobtransactions/test_wrong_blobhash_version.py b/tests/ported_static/stEIP4844_blobtransactions/test_wrong_blobhash_version.py
similarity index 73%
rename from tests/ported_static/Cancun/stEIP4844_blobtransactions/test_wrong_blobhash_version.py
rename to tests/ported_static/stEIP4844_blobtransactions/test_wrong_blobhash_version.py
index 41129e070be..33ae23f221a 100644
--- a/tests/ported_static/Cancun/stEIP4844_blobtransactions/test_wrong_blobhash_version.py
+++ b/tests/ported_static/stEIP4844_blobtransactions/test_wrong_blobhash_version.py
@@ -2,17 +2,16 @@
 BLOB001.
 
 Ported from:
-tests/static/state_tests/Cancun/stEIP4844_blobtransactions
-wrongBlobhashVersionFiller.yml
+state_tests/Cancun/stEIP4844_blobtransactions/wrongBlobhashVersionFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     AccessList,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     Hash,
     StateTestFiller,
@@ -27,21 +26,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/Cancun/stEIP4844_blobtransactions/wrongBlobhashVersionFiller.yml",  # noqa: E501
+        "state_tests/Cancun/stEIP4844_blobtransactions/wrongBlobhashVersionFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.exception_test
+@pytest.mark.pre_alloc_mutable
 def test_wrong_blobhash_version(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """BLOB001."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,27 +46,27 @@ def test_wrong_blobhash_version(
         timestamp=1000,
         prev_randao=0x20000,
         base_fee_per_gas=7,
+        excess_blob_gas=0,
         gas_limit=68719476736,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # {
     #    ; Can also add lll style comments here
     #    [[0]] (BLOBHASH 0)
     # }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.BLOBHASH(index=0x0)) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc4dcf66bd4cdefe4ce7fba4951be4e9f580122c5"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=target,
+        data=Bytes("00"),
         gas_limit=4000000,
+        value=0x186A0,
         max_fee_per_gas=5000000000,
         max_priority_fee_per_gas=2,
         max_fee_per_blob_gas=10,
@@ -81,10 +78,9 @@ def test_wrong_blobhash_version(
                 "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"  # noqa: E501
             ),
         ],
-        value=100000,
         access_list=[
             AccessList(
-                address=Address("0xc4dcf66bd4cdefe4ce7fba4951be4e9f580122c5"),
+                address=target,
                 storage_keys=[
                     Hash(
                         "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
@@ -98,6 +94,6 @@ def test_wrong_blobhash_version(
         error=TransactionException.TYPE_3_TX_INVALID_BLOB_VERSIONED_HASH,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP5656_MCOPY/__init__.py b/tests/ported_static/stEIP5656_MCOPY/__init__.py
new file mode 100644
index 00000000000..203b87176d2
--- /dev/null
+++ b/tests/ported_static/stEIP5656_MCOPY/__init__.py
@@ -0,0 +1 @@
+"""Ported static tests: stEIP5656_MCOPY."""  # noqa: N999
diff --git a/tests/ported_static/stEIP5656_MCOPY/test_mcopy.py b/tests/ported_static/stEIP5656_MCOPY/test_mcopy.py
new file mode 100644
index 00000000000..acae638389f
--- /dev/null
+++ b/tests/ported_static/stEIP5656_MCOPY/test_mcopy.py
@@ -0,0 +1,434 @@
+"""
+MCOPY memory copy test cases.
+
+Ported from:
+state_tests/Cancun/stEIP5656_MCOPY/MCOPYFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/Cancun/stEIP5656_MCOPY/MCOPYFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="forward_size0_0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="forward_size0_1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="backward_size0_0",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="backward_size0_1",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="inplace_size0_0",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="inplace_size0_1",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="forward_overlapped_0",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="forward_overlapped_1",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="forward_disjoint_0",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="forward_disjoint_1",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="forward_adjacent_0",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="forward_adjacent_1",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="backward_overlapped_0",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="backward_overlapped_1",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="backward_disjoint_0",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="backward_disjoint_1",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="backward_adjacent_0",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="backward_adjacent_1",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="inplace_0",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="inplace_1",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_mcopy(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """MCOPY memory copy test cases."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = EOA(
+        key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1687174231,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=1000000,
+    )
+
+    pre[sender] = Account(balance=0x3B9ACA00)
+    # Source: yul
+    # cancun {
+    #   // Fill memory at [0-96] (3x32) with the pattern of unique bytes.
+    #   mstore( 0, 0xa0a1a2a3a4a5a6a7a8a9aAaBaCaDaEaFb0b1b2b3b4b5b6b7b8b9bAbBbCbDbEbF)  # noqa: E501
+    #   mstore(32, 0xc0c1c2c3c4c5c6c7c8c9cAcBcCcDcEcFd0d1d2d3d4d5d6d7d8d9dAdBdCdDdEdF)  # noqa: E501
+    #   mstore(64, 0xe0e1e2e3e4e5e6e7e8e9eAeBeCeDeEeFf0f1f2f3f4f5f6f7f8f9fAfBfCfDfEfF)  # noqa: E501
+    #
+    #   // MCOPY using parameters from CALLDATA.
+    #   mcopy(calldataload(0), calldataload(32), calldataload(64))
+    #
+    #   // Dump memory at [0-96] to 3 storage slots.
+    #   sstore(0, mload( 0))
+    #   sstore(1, mload(32))
+    #   sstore(2, mload(64))
+    # }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=Op.PUSH0,
+            value=0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
+        )
+        + Op.MCOPY(
+            dest_offset=Op.CALLDATALOAD(offset=Op.PUSH0),
+            offset=Op.CALLDATALOAD(offset=0x20),
+            size=Op.CALLDATALOAD(offset=0x40),
+        )
+        + Op.SSTORE(key=Op.PUSH0, value=Op.MLOAD(offset=Op.PUSH0))
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x40))
+        + Op.STOP,
+        nonce=1,
+        address=Address(0xBFD584EC9DC8FBADCEA812C707E1765B4DF8FA6C),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [0, 1, 2, 3, 4, 5, 18, 19],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
+                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
+                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0xA0A0A1A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
+                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
+                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0xA0A1A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBE,  # noqa: E501
+                        1: 0xBFC1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
+                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [8], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
+                        1: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEDF,  # noqa: E501
+                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [9], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
+                        1: 0xA1A2C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
+                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [10], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0xA0A1A0A1A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
+                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
+                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [11], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
+                        1: 0xBFC1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
+                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [12], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0xBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDE,  # noqa: E501
+                        1: 0xDFC1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
+                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [13], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0xA0A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0,  # noqa: E501
+                        1: 0xC1C2C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
+                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [14], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0xC1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0,  # noqa: E501
+                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
+                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [15], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0xA0A1C1A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
+                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
+                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [16], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
+                        1: 0xC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
+                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [17], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0xA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF,  # noqa: E501
+                        1: 0xC1C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF,  # noqa: E501
+                        2: 0xE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0x2) + Hash(0x0) + Hash(0x0),
+        Hash(0x20) + Hash(0x1) + Hash(0x0),
+        Hash(0x0) + Hash(0x1) + Hash(0x0),
+        Hash(0x20) + Hash(0x21) + Hash(0x0),
+        Hash(0x0) + Hash(0x0) + Hash(0x0),
+        Hash(0x1F) + Hash(0x1F) + Hash(0x0),
+        Hash(0x1) + Hash(0x0) + Hash(0x2),
+        Hash(0x2) + Hash(0x1) + Hash(0x1F),
+        Hash(0x20) + Hash(0x0) + Hash(0x1F),
+        Hash(0x20) + Hash(0x1) + Hash(0x2),
+        Hash(0x2) + Hash(0x0) + Hash(0x2),
+        Hash(0x20) + Hash(0x1F) + Hash(0x1),
+        Hash(0x0) + Hash(0x1F) + Hash(0x21),
+        Hash(0x1) + Hash(0x2) + Hash(0x21),
+        Hash(0x0) + Hash(0x21) + Hash(0x20),
+        Hash(0x2) + Hash(0x21) + Hash(0x1),
+        Hash(0x0) + Hash(0x20) + Hash(0x20),
+        Hash(0x20) + Hash(0x21) + Hash(0x1),
+        Hash(0x0) + Hash(0x0) + Hash(0x1),
+        Hash(0x2) + Hash(0x2) + Hash(0x33),
+    ]
+    tx_gas = [1000000]
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP5656_MCOPY/test_mcopy_copy_cost.py b/tests/ported_static/stEIP5656_MCOPY/test_mcopy_copy_cost.py
new file mode 100644
index 00000000000..92430e5fbce
--- /dev/null
+++ b/tests/ported_static/stEIP5656_MCOPY/test_mcopy_copy_cost.py
@@ -0,0 +1,607 @@
+"""
+Test cases for the cost of memory copy in the MCOPY instruction.
+
+Ported from:
+state_tests/Cancun/stEIP5656_MCOPY/MCOPY_copy_costFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/Cancun/stEIP5656_MCOPY/MCOPY_copy_costFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="src0_size0-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="src0_size0-g1",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="src0_size1-g0",
+        ),
+        pytest.param(
+            1,
+            1,
+            0,
+            id="src0_size1-g1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="src0_size31-g0",
+        ),
+        pytest.param(
+            2,
+            1,
+            0,
+            id="src0_size31-g1",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="src0_size32-g0",
+        ),
+        pytest.param(
+            3,
+            1,
+            0,
+            id="src0_size32-g1",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="src0_size33-g0",
+        ),
+        pytest.param(
+            4,
+            1,
+            0,
+            id="src0_size33-g1",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="src0_size44767-g0",
+        ),
+        pytest.param(
+            5,
+            1,
+            0,
+            id="src0_size44767-g1",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="src0_size44768-g0",
+        ),
+        pytest.param(
+            6,
+            1,
+            0,
+            id="src0_size44768-g1",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="src0_size44769-g0",
+        ),
+        pytest.param(
+            7,
+            1,
+            0,
+            id="src0_size44769-g1",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="src1_size0-g0",
+        ),
+        pytest.param(
+            8,
+            1,
+            0,
+            id="src1_size0-g1",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="src1_size1-g0",
+        ),
+        pytest.param(
+            9,
+            1,
+            0,
+            id="src1_size1-g1",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="src1_size31-g0",
+        ),
+        pytest.param(
+            10,
+            1,
+            0,
+            id="src1_size31-g1",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="src1_size32-g0",
+        ),
+        pytest.param(
+            11,
+            1,
+            0,
+            id="src1_size32-g1",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="src1_size33-g0",
+        ),
+        pytest.param(
+            12,
+            1,
+            0,
+            id="src1_size33-g1",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="src1_size44767-g0",
+        ),
+        pytest.param(
+            13,
+            1,
+            0,
+            id="src1_size44767-g1",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="src1_size44768-g0",
+        ),
+        pytest.param(
+            14,
+            1,
+            0,
+            id="src1_size44768-g1",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="src1_size44769-g0",
+        ),
+        pytest.param(
+            15,
+            1,
+            0,
+            id="src1_size44769-g1",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="src31_size0-g0",
+        ),
+        pytest.param(
+            16,
+            1,
+            0,
+            id="src31_size0-g1",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="src31_size1-g0",
+        ),
+        pytest.param(
+            17,
+            1,
+            0,
+            id="src31_size1-g1",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="src31_size31-g0",
+        ),
+        pytest.param(
+            18,
+            1,
+            0,
+            id="src31_size31-g1",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="src31_size32-g0",
+        ),
+        pytest.param(
+            19,
+            1,
+            0,
+            id="src31_size32-g1",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="src31_size33-g0",
+        ),
+        pytest.param(
+            20,
+            1,
+            0,
+            id="src31_size33-g1",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="src31_size44767-g0",
+        ),
+        pytest.param(
+            21,
+            1,
+            0,
+            id="src31_size44767-g1",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="src31_size44768-g0",
+        ),
+        pytest.param(
+            22,
+            1,
+            0,
+            id="src31_size44768-g1",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="src31_size44769-g0",
+        ),
+        pytest.param(
+            23,
+            1,
+            0,
+            id="src31_size44769-g1",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="src32_size0-g0",
+        ),
+        pytest.param(
+            24,
+            1,
+            0,
+            id="src32_size0-g1",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="src32_size1-g0",
+        ),
+        pytest.param(
+            25,
+            1,
+            0,
+            id="src32_size1-g1",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="src32_size31-g0",
+        ),
+        pytest.param(
+            26,
+            1,
+            0,
+            id="src32_size31-g1",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="src32_size32-g0",
+        ),
+        pytest.param(
+            27,
+            1,
+            0,
+            id="src32_size32-g1",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="src32_size33-g0",
+        ),
+        pytest.param(
+            28,
+            1,
+            0,
+            id="src32_size33-g1",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="src32_size44767-g0",
+        ),
+        pytest.param(
+            29,
+            1,
+            0,
+            id="src32_size44767-g1",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="src32_size44768-g0",
+        ),
+        pytest.param(
+            30,
+            1,
+            0,
+            id="src32_size44768-g1",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="src32_size44769-g0",
+        ),
+        pytest.param(
+            31,
+            1,
+            0,
+            id="src32_size44769-g1",
+        ),
+    ],
+)
+def test_mcopy_copy_cost(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Test cases for the cost of memory copy in the MCOPY instruction."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3B9ACA00)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1687174231,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=1000000,
+    )
+
+    # Source: yul
+    # shanghai optimise {
+    #   function mcopy(dst, src, size) { verbatim_3i_0o(hex"5e", dst, src, size) }  # noqa: E501
+    #
+    #   // Put a flag in storage indicating successful execution (will be reverted in case of OOG).  # noqa: E501
+    #   sstore(0, 1)
+    #
+    #   // Expand memory to cover memory expansion cost before MCOPY.
+    #   // The test uses up to 1400 memory words.
+    #   mstore(44800, 1)
+    #
+    #   // MCOPY using src and size from CALLDATA to 0 destination.
+    #   mcopy(0, calldataload(0), calldataload(32))
+    # }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMP(pc=0xC)
+        + Op.JUMPDEST
+        + Op.MCOPY(dest_offset=Op.DUP3, offset=Op.DUP3, size=Op.DUP3)
+        + Op.POP * 3
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.SSTORE(key=Op.PUSH0, value=0x1)
+        + Op.MSTORE(offset=0xAF00, value=0x1)
+        + Op.PUSH1[0x22]
+        + Op.CALLDATALOAD(offset=0x20)
+        + Op.CALLDATALOAD(offset=Op.PUSH0)
+        + Op.PUSH0
+        + Op.JUMP(pc=0x3)
+        + Op.JUMPDEST,
+        nonce=1,
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [
+                    0,
+                    1,
+                    2,
+                    3,
+                    4,
+                    5,
+                    6,
+                    7,
+                    8,
+                    9,
+                    10,
+                    11,
+                    12,
+                    13,
+                    14,
+                    15,
+                    16,
+                    17,
+                    18,
+                    19,
+                    20,
+                    21,
+                    22,
+                    23,
+                    24,
+                    25,
+                    26,
+                    27,
+                    28,
+                    29,
+                    30,
+                    31,
+                ],
+                "gas": 0,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {
+                "data": [
+                    0,
+                    1,
+                    2,
+                    3,
+                    4,
+                    5,
+                    6,
+                    7,
+                    8,
+                    9,
+                    10,
+                    11,
+                    12,
+                    16,
+                    17,
+                    18,
+                    19,
+                    20,
+                    24,
+                    25,
+                    26,
+                    27,
+                    28,
+                ],
+                "gas": 1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {
+                "data": [13, 14, 15, 21, 22, 23, 29, 30, 31],
+                "gas": 1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0x0) + Hash(0x0),
+        Hash(0x0) + Hash(0x1),
+        Hash(0x0) + Hash(0x1F),
+        Hash(0x0) + Hash(0x20),
+        Hash(0x0) + Hash(0x21),
+        Hash(0x0) + Hash(0xAEDF),
+        Hash(0x0) + Hash(0xAEE0),
+        Hash(0x0) + Hash(0xAEE1),
+        Hash(0x1) + Hash(0x0),
+        Hash(0x1) + Hash(0x1),
+        Hash(0x1) + Hash(0x1F),
+        Hash(0x1) + Hash(0x20),
+        Hash(0x1) + Hash(0x21),
+        Hash(0x1) + Hash(0xAEDF),
+        Hash(0x1) + Hash(0xAEE0),
+        Hash(0x1) + Hash(0xAEE1),
+        Hash(0x1F) + Hash(0x0),
+        Hash(0x1F) + Hash(0x1),
+        Hash(0x1F) + Hash(0x1F),
+        Hash(0x1F) + Hash(0x20),
+        Hash(0x1F) + Hash(0x21),
+        Hash(0x1F) + Hash(0xAEDF),
+        Hash(0x1F) + Hash(0xAEE0),
+        Hash(0x1F) + Hash(0xAEE1),
+        Hash(0x20) + Hash(0x0),
+        Hash(0x20) + Hash(0x1),
+        Hash(0x20) + Hash(0x1F),
+        Hash(0x20) + Hash(0x20),
+        Hash(0x20) + Hash(0x21),
+        Hash(0x20) + Hash(0xAEDF),
+        Hash(0x20) + Hash(0xAEE0),
+        Hash(0x20) + Hash(0xAEE1),
+    ]
+    tx_gas = [100000, 55697]
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stEIP5656_MCOPY/test_mcopy_memory_expansion_cost.py b/tests/ported_static/stEIP5656_MCOPY/test_mcopy_memory_expansion_cost.py
new file mode 100644
index 00000000000..c6b1b90837d
--- /dev/null
+++ b/tests/ported_static/stEIP5656_MCOPY/test_mcopy_memory_expansion_cost.py
@@ -0,0 +1,309 @@
+"""
+Test cases for the memory expansion cost in the MCOPY instruction.
+
+Ported from:
+state_tests/Cancun/stEIP5656_MCOPY/MCOPY_memory_expansion_costFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    [
+        "state_tests/Cancun/stEIP5656_MCOPY/MCOPY_memory_expansion_costFiller.yml"  # noqa: E501
+    ],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="dst0_src0_size0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="dst0_src31_size706",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="dst31_src0_size706",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="dst62_src31_size706",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="dst31_src62_size706",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="dst62_src62_size706",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="dst64_src0_size1344",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="dst0_src64_size1344",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="dst64_src33_size1344",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="dst33_src64_size1344",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="dst1_src33_size1344",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="dst33_src1_size1344",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="dst33_src33_size1344",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="dst64_src64_size1344",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="huge_size0",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="huge_src0_size1",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="huge_dst0_size1",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="huge_size_n255",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="huge_dst0_size_n256",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="huge_src0_size_n256",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="huge_size_n63",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="huge_size_n64",
+        ),
+    ],
+)
+def test_mcopy_memory_expansion_cost(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Test cases for the memory expansion cost in the MCOPY instruction."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3B9ACA00)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1687174231,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=1000000,
+    )
+
+    # Source: yul
+    # cancun {
+    #   // Take most of the SSTORE cost before MCOPY.
+    #   sstore(0, 1)
+    #
+    #   // MCOPY using parameters from CALLDATA.
+    #   mcopy(calldataload(0), calldataload(32), calldataload(64))
+    #
+    #   // Put MSIZE in storage.
+    #   sstore(0, msize())
+    # }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=Op.PUSH0, value=0x1)
+        + Op.MCOPY(
+            dest_offset=Op.CALLDATALOAD(offset=Op.PUSH0),
+            offset=Op.CALLDATALOAD(offset=0x20),
+            size=Op.CALLDATALOAD(offset=0x40),
+        )
+        + Op.SSTORE(key=Op.PUSH0, value=Op.MSIZE)
+        + Op.STOP,
+        storage={0: 0xFA11ED},
+        nonce=1,
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 14], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [1, 2, 3, 4, 5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 768})},
+        },
+        {
+            "indexes": {
+                "data": [6, 7, 8, 9, 10, 11, 12, 13],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1408})},
+        },
+        {
+            "indexes": {
+                "data": [15, 16, 17, 18, 19, 20, 21],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0xFA11ED})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0x0) + Hash(0x0) + Hash(0x0),
+        Hash(0x0) + Hash(0x1F) + Hash(0x2C2),
+        Hash(0x1F) + Hash(0x0) + Hash(0x2C2),
+        Hash(0x3E) + Hash(0x1F) + Hash(0x2C2),
+        Hash(0x1F) + Hash(0x3E) + Hash(0x2C2),
+        Hash(0x3E) + Hash(0x3E) + Hash(0x2C2),
+        Hash(0x40) + Hash(0x0) + Hash(0x540),
+        Hash(0x0) + Hash(0x40) + Hash(0x540),
+        Hash(0x40) + Hash(0x21) + Hash(0x540),
+        Hash(0x21) + Hash(0x40) + Hash(0x540),
+        Hash(0x1) + Hash(0x21) + Hash(0x540),
+        Hash(0x21) + Hash(0x1) + Hash(0x540),
+        Hash(0x21) + Hash(0x21) + Hash(0x540),
+        Hash(0x40) + Hash(0x40) + Hash(0x540),
+        Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(0x0),
+        Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(0x0)
+        + Hash(0x1),
+        Hash(0x0)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(0x1),
+        Hash(0x0)
+        + Hash(0x0)
+        + Hash(
+            0x8000000000000000000000000000000000000000000000000000000000000000
+        ),
+        Hash(0x0)
+        + Hash(0x1)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Hash(0x1)
+        + Hash(0x0)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Hash(0x0) + Hash(0x0) + Hash(0x8000000000000000),
+        Hash(0x1) + Hash(0x1) + Hash(0xFFFFFFFFFFFFFFFF),
+    ]
+    tx_gas = [100000]
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stExample/__init__.py b/tests/ported_static/stExample/__init__.py
index 41bbedc9768..241c882ddf7 100644
--- a/tests/ported_static/stExample/__init__.py
+++ b/tests/ported_static/stExample/__init__.py
@@ -1 +1 @@
-"""Tests ported from stExample."""
+"""Ported static tests: stExample."""  # noqa: N999
diff --git a/tests/ported_static/stExample/test_add11.py b/tests/ported_static/stExample/test_add11.py
index 9c5ef61cc3d..5d6769f2d7a 100644
--- a/tests/ported_static/stExample/test_add11.py
+++ b/tests/ported_static/stExample/test_add11.py
@@ -2,7 +2,7 @@
 A test for (add 1 1) opcode result.
 
 Ported from:
-tests/static/state_tests/stExample/add11Filler.json
+state_tests/stExample/add11Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stExample/add11Filler.json"],
+    ["state_tests/stExample/add11Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,7 +32,8 @@ def test_add11(
     pre: Alloc,
 ) -> None:
     """A test for (add 1 1) opcode result."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,26 +47,41 @@ def test_add11(
         gas_limit=71794957647893862,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: hex
+    # 0x
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code="",
+        nonce=1,
+        address=Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA),  # noqa: E501
+    )
+    # Source: lll
     # { [[0]] (ADD 1 1) }
-    contract = pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={0: 2}),
+        contract_0: Account(
+            storage={0: 2},
+            code=bytes.fromhex("600160010160005500"),
+        ),
+        coinbase: Account(nonce=1),
+        sender: Account(storage={}, code=b"", nonce=1),
+        Address(
+            0xE94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stExample/test_add11_yml.py b/tests/ported_static/stExample/test_add11_yml.py
index f13de3dab10..bf7cbfdba7d 100644
--- a/tests/ported_static/stExample/test_add11_yml.py
+++ b/tests/ported_static/stExample/test_add11_yml.py
@@ -2,7 +2,7 @@
 A test for (add 1 1) opcode result.
 
 Ported from:
-tests/static/state_tests/stExample/add11_ymlFiller.yml
+state_tests/stExample/add11_ymlFiller.yml
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stExample/add11_ymlFiller.yml"],
+    ["state_tests/stExample/add11_ymlFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,7 +32,8 @@ def test_add11_yml(
     pre: Alloc,
 ) -> None:
     """A test for (add 1 1) opcode result."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,29 +47,38 @@ def test_add11_yml(
         gas_limit=71794957647893862,
     )
 
-    # Source: LLL
+    pre[coinbase] = Account(balance=0, nonce=1)
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # {
     #    ; Can also add lll style comments here
     #    [[0]] (ADD 1 1)
     # }
-    contract = pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={0: 2}),
+        contract_0: Account(
+            storage={0: 2},
+            code=bytes.fromhex("600160010160005500"),
+        ),
+        coinbase: Account(nonce=1),
+        sender: Account(storage={}, code=b"", nonce=1),
+        Address(
+            0xE94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stExample/test_basefee_example.py b/tests/ported_static/stExample/test_basefee_example.py
index 2d505165523..047f10ea622 100644
--- a/tests/ported_static/stExample/test_basefee_example.py
+++ b/tests/ported_static/stExample/test_basefee_example.py
@@ -2,16 +2,16 @@
 A test shows basefee transaction example.
 
 Ported from:
-tests/static/state_tests/stExample/basefeeExampleFiller.yml
+state_tests/stExample/basefeeExampleFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     AccessList,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     Hash,
     StateTestFiller,
@@ -24,7 +24,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stExample/basefeeExampleFiller.yml"],
+    ["state_tests/stExample/basefeeExampleFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +33,8 @@ def test_basefee_example(
     pre: Alloc,
 ) -> None:
     """A test shows basefee transaction example."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,30 +45,28 @@ def test_basefee_example(
         gas_limit=68719476736,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # {
     #    ; Can also add lll style comments here
     #    [[0]] (ADD 1 1)
     # }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xad21eb96c7a254c810474f7b1e1e66ca449a3426"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=target,
+        data=Bytes("00"),
         gas_limit=4000000,
+        value=0x186A0,
         max_fee_per_gas=5000000000,
         max_priority_fee_per_gas=2,
-        value=100000,
         access_list=[
             AccessList(
-                address=Address("0xad21eb96c7a254c810474f7b1e1e66ca449a3426"),
+                address=target,
                 storage_keys=[
                     Hash(
                         "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
@@ -83,8 +79,6 @@ def test_basefee_example(
         ],
     )
 
-    post = {
-        contract: Account(storage={0: 2}),
-    }
+    post = {target: Account(storage={0: 2})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stExample/test_eip1559.py b/tests/ported_static/stExample/test_eip1559.py
index 5ae8a2435e7..7b107d1f969 100644
--- a/tests/ported_static/stExample/test_eip1559.py
+++ b/tests/ported_static/stExample/test_eip1559.py
@@ -2,16 +2,16 @@
 Ori Pomerantz   qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stExample/eip1559Filler.yml
+state_tests/stExample/eip1559Filler.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     AccessList,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     Hash,
     StateTestFiller,
@@ -24,7 +24,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stExample/eip1559Filler.yml"],
+    ["state_tests/stExample/eip1559Filler.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +32,9 @@ def test_eip1559(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Ori Pomerantz   qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xDE0C95357363DA5C1C5A73BD7C2781CA5C9FECC1014103B5E1D1E990AE8208EC
-    )
+    """Ori Pomerantz   qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,33 +45,30 @@ def test_eip1559(
         gas_limit=16777216,
     )
 
-    # Source: LLL
+    # Source: lll
     # {
     #    (sstore 0 (gasprice))
     #    (sstore 1 (basefee))
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GASPRICE)
-            + Op.SSTORE(key=0x1, value=Op.BASEFEE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GASPRICE)
+        + Op.SSTORE(key=0x1, value=Op.BASEFEE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
-        address=Address("0x38dc047054d46298a5bb7ed3a0bad84bf69090d4"),  # noqa: E501
+        nonce=1,
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=target,
+        data=Bytes("00"),
         gas_limit=4000000,
         max_fee_per_gas=2000,
         max_priority_fee_per_gas=10,
         nonce=1,
         access_list=[
             AccessList(
-                address=Address("0x38dc047054d46298a5bb7ed3a0bad84bf69090d4"),
+                address=target,
                 storage_keys=[
                     Hash(
                         "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
@@ -86,8 +81,6 @@ def test_eip1559(
         ],
     )
 
-    post = {
-        contract: Account(storage={0: 1010, 1: 1000}),
-    }
+    post = {target: Account(storage={0: 1010, 1: 1000})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stExample/test_indexes_omit_example.py b/tests/ported_static/stExample/test_indexes_omit_example.py
index 35ba99a4bf8..71c4aec9f8d 100644
--- a/tests/ported_static/stExample/test_indexes_omit_example.py
+++ b/tests/ported_static/stExample/test_indexes_omit_example.py
@@ -1,16 +1,16 @@
 """
-expect section set -indexes field by default equal to -1.
+Expect section set -indexes field by default equal to -1.
 
 Ported from:
-tests/static/state_tests/stExample/indexesOmitExampleFiller.yml
+state_tests/stExample/indexesOmitExampleFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stExample/indexesOmitExampleFiller.yml"],
+    ["state_tests/stExample/indexesOmitExampleFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,10 +31,8 @@ def test_indexes_omit_example(
     pre: Alloc,
 ) -> None:
     """Expect section set -indexes field by default equal to -1."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,31 @@ def test_indexes_omit_example(
         gas_limit=71794957647893862,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    pre[coinbase] = Account(balance=0, nonce=1)
+    # Source: lll
     # {
     #    ; Can also add lll style comments here
     #    [[0]] (ADD 1 1)
     # }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xad21eb96c7a254c810474f7b1e1e66ca449a3426"),  # noqa: E501
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={0: 2}),
+        target: Account(
+            storage={0: 2},
+            code=bytes.fromhex("600160010160005500"),
+        ),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stExample/test_invalid_tr.py b/tests/ported_static/stExample/test_invalid_tr.py
index c1a01913796..c55aa6717b0 100644
--- a/tests/ported_static/stExample/test_invalid_tr.py
+++ b/tests/ported_static/stExample/test_invalid_tr.py
@@ -2,15 +2,15 @@
 A state test with invalid transaction example filler.
 
 Ported from:
-tests/static/state_tests/stExample/invalidTrFiller.json
+state_tests/stExample/invalidTrFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,20 +23,18 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stExample/invalidTrFiller.json"],
+    ["state_tests/stExample/invalidTrFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.exception_test
+@pytest.mark.pre_alloc_mutable
 def test_invalid_tr(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """A state test with invalid transaction example filler."""
-    coinbase = Address("0x7704d8a022a1ba8f3539fc82c7d7fb065abc0df3")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    coinbase = Address(0x7704D8A022A1BA8F3539FC82C7D7FB065ABC0DF3)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,25 +45,27 @@ def test_invalid_tr(
         gas_limit=71794957647893862,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    pre[coinbase] = Account(balance=0, nonce=1)
+    # Source: lll
     # { [[0]] (ADD 1 1) }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4567f627abb612a28ed0a355e3fa9bf1e455677a"),  # noqa: E501
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000,
-        value=100000,
+        value=0x186A0,
         error=TransactionException.INTRINSIC_GAS_TOO_LOW,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={0: 0}),
+        sender: Account(nonce=0),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stExample/test_labels_example.py b/tests/ported_static/stExample/test_labels_example.py
index fe491db2a86..9a8208197ee 100644
--- a/tests/ported_static/stExample/test_labels_example.py
+++ b/tests/ported_static/stExample/test_labels_example.py
@@ -2,7 +2,7 @@
 An example how to use labels in expect section.
 
 Ported from:
-tests/static/state_tests/stExample/labelsExampleFiller.yml
+state_tests/stExample/labelsExampleFiller.yml
 """
 
 import pytest
@@ -11,10 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,64 +27,49 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stExample/labelsExampleFiller.yml"],
+    ["state_tests/stExample/labelsExampleFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "01",
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="transaction1",
         ),
-        (
-            "02",
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x200000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="transaction2",
         ),
-        (
-            "03",
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x300000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="transaction3",
         ),
-        (
-            "03",
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x300000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="transaction3",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_labels_example(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """An example how to use labels in expect section."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -94,27 +84,71 @@ def test_labels_example(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # {
     #    [[0]] (CALLDATALOAD 0)
     # }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.CALLDATALOAD(offset=0x0)) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"),  # noqa: E501
+        address=Address(0xA054BC58F204030CBC0EC558A5B88AC9BD5ADED2),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0x200000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [2, 3], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0x300000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("01"),
+        Bytes("02"),
+        Bytes("03"),
+        Bytes("03"),
+    ]
+    tx_gas = [400000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=400000,
-        value=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stExample/test_merge_test.py b/tests/ported_static/stExample/test_merge_test.py
index 13ee74f42e1..a15fb3a5cc0 100644
--- a/tests/ported_static/stExample/test_merge_test.py
+++ b/tests/ported_static/stExample/test_merge_test.py
@@ -2,7 +2,7 @@
 Example of PoS merge state test.
 
 Ported from:
-tests/static/state_tests/stExample/mergeTestFiller.yml
+state_tests/stExample/mergeTestFiller.yml
 """
 
 import pytest
@@ -12,6 +12,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     Hash,
     StateTestFiller,
@@ -24,7 +25,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stExample/mergeTestFiller.yml"],
+    ["state_tests/stExample/mergeTestFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,7 +34,7 @@ def test_merge_test(
     pre: Alloc,
 ) -> None:
     """Example of PoS merge state test."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xDE0C95357363DA5C1C5A73BD7C2781CA5C9FECC1014103B5E1D1E990AE8208EC
     )
@@ -47,35 +48,34 @@ def test_merge_test(
         gas_limit=16777216,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
+    # Source: lll
     # {
     #    (sstore 0 (gasprice))
     #    (sstore 1 (basefee))
     #    (sstore 2 (difficulty))
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GASPRICE)
-            + Op.SSTORE(key=0x1, value=Op.BASEFEE)
-            + Op.SSTORE(key=0x2, value=Op.PREVRANDAO)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GASPRICE)
+        + Op.SSTORE(key=0x1, value=Op.BASEFEE)
+        + Op.SSTORE(key=0x2, value=Op.PREVRANDAO)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
-        address=Address("0x49a0fe79e28d1d65e16cdf53acafeae7baccac0e"),  # noqa: E501
+        nonce=1,
+        address=Address(0x49A0FE79E28D1D65E16CDF53ACAFEAE7BACCAC0E),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=target,
+        data=Bytes("00"),
         gas_limit=4000000,
         max_fee_per_gas=2000,
         max_priority_fee_per_gas=10,
         nonce=1,
         access_list=[
             AccessList(
-                address=Address("0x49a0fe79e28d1d65e16cdf53acafeae7baccac0e"),
+                address=target,
                 storage_keys=[
                     Hash(
                         "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
@@ -89,12 +89,13 @@ def test_merge_test(
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 1010,
                 1: 1000,
                 2: 0x1500000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
             },
+            nonce=1,
         ),
     }
 
diff --git a/tests/ported_static/stExample/test_ranges_example.py b/tests/ported_static/stExample/test_ranges_example.py
index e7ac2defadd..2a1990456f4 100644
--- a/tests/ported_static/stExample/test_ranges_example.py
+++ b/tests/ported_static/stExample/test_ranges_example.py
@@ -2,7 +2,7 @@
 An example how to use ranges in expect section.
 
 Ported from:
-tests/static/state_tests/stExample/rangesExampleFiller.yml
+state_tests/stExample/rangesExampleFiller.yml
 """
 
 import pytest
@@ -11,10 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,339 +27,169 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stExample/rangesExampleFiller.yml"],
+    ["state_tests/stExample/rangesExampleFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            "01",
-            400000,
-            100000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="transaction1-g0-v0",
         ),
-        (
-            "01",
-            400000,
-            200000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            1,
+            id="transaction1-g0-v1",
         ),
-        (
-            "01",
-            1400000,
-            100000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="transaction1-g1-v0",
         ),
-        (
-            "01",
-            1400000,
-            200000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            1,
+            id="transaction1-g1-v1",
         ),
-        (
-            "01",
-            2400000,
-            100000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            2,
+            0,
+            id="transaction1-g2-v0",
         ),
-        (
-            "01",
-            2400000,
-            200000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            2,
+            1,
+            id="transaction1-g2-v1",
         ),
-        (
-            "01",
-            400000,
-            100000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0-v0",
         ),
-        (
-            "01",
-            400000,
-            200000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            1,
+            id="d1-g0-v1",
         ),
-        (
-            "01",
-            1400000,
-            100000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1-v0",
         ),
-        (
-            "01",
-            1400000,
-            200000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            1,
+            1,
+            1,
+            id="d1-g1-v1",
         ),
-        (
-            "01",
-            2400000,
-            100000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            1,
+            2,
+            0,
+            id="d1-g2-v0",
         ),
-        (
-            "01",
-            2400000,
-            200000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            1,
+            2,
+            1,
+            id="d1-g2-v1",
         ),
-        (
-            "04",
-            400000,
-            100000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x400000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0-v0",
         ),
-        (
-            "04",
-            400000,
-            200000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x400000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            1,
+            id="d2-g0-v1",
         ),
-        (
-            "04",
-            1400000,
-            100000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x400000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1-v0",
         ),
-        (
-            "04",
-            1400000,
-            200000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x400000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            2,
+            1,
+            1,
+            id="d2-g1-v1",
         ),
-        (
-            "04",
-            2400000,
-            100000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x400000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            2,
+            2,
+            0,
+            id="d2-g2-v0",
         ),
-        (
-            "04",
-            2400000,
-            200000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x400000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            2,
+            2,
+            1,
+            id="d2-g2-v1",
         ),
-        (
-            "01",
-            400000,
-            100000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0-v0",
         ),
-        (
-            "01",
-            400000,
-            200000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            1,
+            id="d3-g0-v1",
         ),
-        (
-            "01",
-            1400000,
-            100000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1-v0",
         ),
-        (
-            "01",
-            1400000,
-            200000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            3,
+            1,
+            1,
+            id="d3-g1-v1",
         ),
-        (
-            "01",
-            2400000,
-            100000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            3,
+            2,
+            0,
+            id="d3-g2-v0",
         ),
-        (
-            "01",
-            2400000,
-            200000,
-            {
-                Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"): Account(
-                    storage={
-                        0: 0x100000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            3,
+            2,
+            1,
+            id="d3-g2-v1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_ranges_example(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """An example how to use ranges in expect section."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -369,27 +204,71 @@ def test_ranges_example(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # {
     #    [[0]] (CALLDATALOAD 0)
     # }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.CALLDATALOAD(offset=0x0)) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa054bc58f204030cbc0ec558a5b88ac9bd5aded2"),  # noqa: E501
+        address=Address(0xA054BC58F204030CBC0EC558A5B88AC9BD5ADED2),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [0, 1, 2], "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": [0, 1, 2], "value": [0, 1]},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 0x400000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("01"),
+        Bytes("01"),
+        Bytes("01"),
+        Bytes("04"),
+    ]
+    tx_gas = [400000, 1400000, 2400000]
+    tx_value = [100000, 200000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stExample/test_yul_example.py b/tests/ported_static/stExample/test_yul_example.py
index 95ed26a3144..710c01076b7 100644
--- a/tests/ported_static/stExample/test_yul_example.py
+++ b/tests/ported_static/stExample/test_yul_example.py
@@ -2,15 +2,15 @@
 An example test for using simple yul contracts in the test.
 
 Ported from:
-tests/static/state_tests/stExample/yulExampleFiller.yml
+state_tests/stExample/yulExampleFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stExample/yulExampleFiller.yml"],
+    ["state_tests/stExample/yulExampleFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,10 +31,8 @@ def test_yul_example(
     pre: Alloc,
 ) -> None:
     """An example test for using simple yul contracts in the test."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,8 +43,8 @@ def test_yul_example(
         gas_limit=100000000,
     )
 
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   function f(a, b) -> c {
     #     c := add(a, b)
@@ -55,21 +53,19 @@ def test_yul_example(
     #   sstore(0, f(1, 2))
     #   return(0, 32)
     # }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=0x3) + Op.RETURN(offset=0x0, size=0x20),
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xf30c160326a04ecb32e7651c0a8f373468bea269"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=16777216,
     )
 
-    post = {
-        contract: Account(storage={0: 3}),
-    }
+    post = {target: Account(storage={0: 3})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stExtCodeHash/__init__.py b/tests/ported_static/stExtCodeHash/__init__.py
deleted file mode 100644
index 4e064332cf5..00000000000
--- a/tests/ported_static/stExtCodeHash/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from stExtCodeHash."""
diff --git a/tests/ported_static/stExtCodeHash/test_code_copy_zero_paris.py b/tests/ported_static/stExtCodeHash/test_code_copy_zero_paris.py
deleted file mode 100644
index e3fe9051b9e..00000000000
--- a/tests/ported_static/stExtCodeHash/test_code_copy_zero_paris.py
+++ /dev/null
@@ -1,286 +0,0 @@
-"""
-https://github.com/ethereum/tests/issues/493,  CODECOPY and EXTCODECOPY...
-
-Ported from:
-tests/static/state_tests/stExtCodeHash/codeCopyZero_ParisFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stExtCodeHash/codeCopyZero_ParisFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
-def test_code_copy_zero_paris(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Https://github.com/ethereum/tests/issues/493,  CODECOPY and..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    callee_1 = Address("0xa200000000000000000000000000000000000000")
-    callee_2 = Address("0xa300000000000000000000000000000000000000")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    # Source: LLL
-    # {
-    #
-    #   ;; EXTCODECOPY of nonexistent account
-    #   (EXTCODECOPY 0xa222000000000000000000000000000000000000 0 0 32)
-    #   (SSTORE 0x10 (MLOAD 0))
-    #   (SSTORE 0x11 (EXTCODESIZE 0xa222000000000000000000000000000000000000))
-    #   (SSTORE 0x12 (EXTCODEHASH 0xa222000000000000000000000000000000000000))
-    #   (SSTORE 0x13 (CALLCODE 50000 0xa222000000000000000000000000000000000000 0 0 0 0 0))  # noqa: E501
-    #
-    #
-    #   ;; EXTCODECOPY of account with empty code
-    #   (EXTCODECOPY 0xa200000000000000000000000000000000000000 0 0 32)
-    #   (SSTORE 0x20 (MLOAD 0))
-    #   (SSTORE 0x21 (EXTCODESIZE 0xa200000000000000000000000000000000000000))
-    #   (SSTORE 0x22 (EXTCODEHASH 0xa200000000000000000000000000000000000000))
-    #   (SSTORE 0x23 (CALLCODE 50000 0xa200000000000000000000000000000000000000 0 0 0 0 0))  # noqa: E501
-    #
-    #
-    #   ;; EXTCODECOPY of empty account with empty code
-    #   (EXTCODECOPY 0xa300000000000000000000000000000000000000 0 0 32)
-    #   (SSTORE 0x30 (MLOAD 0))
-    #   (SSTORE 0x31 (EXTCODESIZE 0xa300000000000000000000000000000000000000))
-    #   (SSTORE 0x32 (EXTCODEHASH 0xa300000000000000000000000000000000000000))
-    #   (SSTORE 0x33 (CALLCODE 50000 0xa300000000000000000000000000000000000000 0 0 0 0 0))  # noqa: E501
-    #
-    #   ;; CODECOPY of dynamic account which has empty code
-    #   (CALL 550000 0xa100000000000000000000000000000000000000 0 0 0 0 32)
-    #   (SSTORE 0x40 (MLOAD 0))
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.EXTCODECOPY(
-                address=0xA222000000000000000000000000000000000000,
-                dest_offset=0x0,
-                offset=0x0,
-                size=0x20,
-            )
-            + Op.SSTORE(key=0x10, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x11,
-                value=Op.EXTCODESIZE(
-                    address=0xA222000000000000000000000000000000000000,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x12,
-                value=Op.EXTCODEHASH(
-                    address=0xA222000000000000000000000000000000000000,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x13,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0xA222000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.EXTCODECOPY(
-                address=0xA200000000000000000000000000000000000000,
-                dest_offset=0x0,
-                offset=0x0,
-                size=0x20,
-            )
-            + Op.SSTORE(key=0x20, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x21,
-                value=Op.EXTCODESIZE(
-                    address=0xA200000000000000000000000000000000000000,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x22,
-                value=Op.EXTCODEHASH(
-                    address=0xA200000000000000000000000000000000000000,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x23,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0xA200000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.EXTCODECOPY(
-                address=0xA300000000000000000000000000000000000000,
-                dest_offset=0x0,
-                offset=0x0,
-                size=0x20,
-            )
-            + Op.SSTORE(key=0x30, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x31,
-                value=Op.EXTCODESIZE(
-                    address=0xA300000000000000000000000000000000000000,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x32,
-                value=Op.EXTCODEHASH(
-                    address=0xA300000000000000000000000000000000000000,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x33,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0xA300000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x86470,
-                    address=0xA100000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x40, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   (MSTORE 0
-    #     (CREATE2 0 0
-    #       (lll
-    #       {
-    #         ;; codecopy of empty code
-    #         (CODECOPY 0 0 32)
-    #         [[0x50]] (MLOAD 0)
-    #         [[0x51]] (EXTCODESIZE (ADDRESS))
-    #         [[0x52]] (EXTCODEHASH (ADDRESS))
-    #         [[0x53]] (EXTCODESIZE (CALLCODE 50000 (ADDRESS) 0 0 0 0 0))
-    #         (EXTCODECOPY (ADDRESS) 0 0 32)
-    #         (SSTORE 0x54 (MLOAD 0))
-    #       }
-    #       0)
-    #     0))
-    #    (RETURN 0 32)
-    #    (STOP)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0x39]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x1A, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=0x0, value=Op.CREATE2)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x50, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x51, value=Op.EXTCODESIZE(address=Op.ADDRESS))
-            + Op.SSTORE(key=0x52, value=Op.EXTCODEHASH(address=Op.ADDRESS))
-            + Op.SSTORE(
-                key=0x53,
-                value=Op.EXTCODESIZE(
-                    address=Op.CALLCODE(
-                        gas=0xC350,
-                        address=Op.ADDRESS,
-                        value=0x0,
-                        args_offset=0x0,
-                        args_size=0x0,
-                        ret_offset=0x0,
-                        ret_size=0x0,
-                    ),
-                ),
-            )
-            + Op.EXTCODECOPY(
-                address=Op.ADDRESS,
-                dest_offset=0x0,
-                offset=0x0,
-                size=0x20,
-            )
-            + Op.SSTORE(key=0x54, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xa100000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[callee_1] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_2] = Account(balance=10, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        gas_limit=1400000,
-        value=1,
-    )
-
-    post = {
-        Address("0x64bc50092fd622c9cc47d658b99c1af75aaa3d68"): Account(
-            storage={
-                80: 0x60206000600039600051605055303B605155303F605255600060006000600060,  # noqa: E501
-                82: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-            },
-        ),
-        contract: Account(
-            storage={
-                19: 1,
-                34: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                35: 1,
-                50: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                51: 1,
-                64: 0x64BC50092FD622C9CC47D658B99C1AF75AAA3D68,
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stExtCodeHash/test_ext_code_hash_created_and_deleted_account_recheck_in_outer_call.py b/tests/ported_static/stExtCodeHash/test_ext_code_hash_created_and_deleted_account_recheck_in_outer_call.py
deleted file mode 100644
index d99f0169103..00000000000
--- a/tests/ported_static/stExtCodeHash/test_ext_code_hash_created_and_deleted_account_recheck_in_outer_call.py
+++ /dev/null
@@ -1,164 +0,0 @@
-"""
-EXTCODEHASH/EXTCODESIZE of an account created then deleted in a CALL,...
-
-Ported from:
-tests/static/state_tests/stExtCodeHash
-extCodeHashCreatedAndDeletedAccountRecheckInOuterCallFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountRecheckInOuterCallFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
-def test_ext_code_hash_created_and_deleted_account_recheck_in_outer_call(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """EXTCODEHASH/EXTCODESIZE of an account created then deleted in a..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=1000000,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # { (MSTORE 0 (CREATE2 0 128 (lll { (RETURN 0 (lll { (SELFDESTRUCT 0x0) } 0)) } 128) 0x10)) [[0]] (EXTCODEHASH (MLOAD 0)) [[1]] (EXTCODESIZE (MLOAD 0)) (CALL 0x10000 (MLOAD 0) 0 0 0 0 0) [[2]] (EXTCODEHASH (MLOAD 0)) [[3]] (EXTCODESIZE (MLOAD 0)) (STOP) }  # noqa: E501
-    callee = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x10]
-            + Op.PUSH1[0x11]
-            + Op.CODECOPY(dest_offset=0x80, offset=0x44, size=Op.DUP1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=0x0, value=Op.CREATE2)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.EXTCODEHASH(address=Op.MLOAD(offset=0x0)),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.EXTCODESIZE(address=Op.MLOAD(offset=0x0)),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x10000,
-                    address=Op.MLOAD(offset=0x0),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.EXTCODEHASH(address=Op.MLOAD(offset=0x0)),
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.EXTCODESIZE(address=Op.MLOAD(offset=0x0)),
-            )
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.PUSH1[0x4]
-            + Op.CODECOPY(dest_offset=0x0, offset=0xD, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.INVALID
-            + Op.SELFDESTRUCT(address=0x0)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xdeadbeef00000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (CALL 0x20000 0xdeadbeef00000000000000000000000000000000 0 0 0 0 0) [[0]] (EXTCODEHASH 0x123f4c415171383dcf6f3ac6c3b70fe321e11b5e) [[1]] (EXTCODESIZE 0x123f4c415171383dcf6f3ac6c3b70fe321e11b5e) (STOP) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x20000,
-                    address=0xDEADBEEF00000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.EXTCODEHASH(
-                    address=0x123F4C415171383DCF6F3AC6C3B70FE321E11B5E,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.EXTCODESIZE(
-                    address=0x123F4C415171383DCF6F3AC6C3B70FE321E11B5E,
-                ),
-            )
-            + Op.STOP
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xdeadbeef00000000000000000000000000000001"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        gas_limit=400000,
-        value=1,
-    )
-
-    post = {
-        callee: Account(
-            storage={
-                0: 0x73C5F15B1290FD9E66722596C2FA1E1C9341F7ACB185530DCE0BF0E0FEC7DFC6,  # noqa: E501
-                1: 4,
-                2: 0x73C5F15B1290FD9E66722596C2FA1E1C9341F7ACB185530DCE0BF0E0FEC7DFC6,  # noqa: E501
-                3: 4,
-            },
-        ),
-        contract: Account(
-            storage={
-                0: 0x73C5F15B1290FD9E66722596C2FA1E1C9341F7ACB185530DCE0BF0E0FEC7DFC6,  # noqa: E501
-                1: 4,
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stExtCodeHash/test_ext_code_hash_subcall_oog.py b/tests/ported_static/stExtCodeHash/test_ext_code_hash_subcall_oog.py
deleted file mode 100644
index 6e939b7f247..00000000000
--- a/tests/ported_static/stExtCodeHash/test_ext_code_hash_subcall_oog.py
+++ /dev/null
@@ -1,402 +0,0 @@
-"""
-create contract A in a subcall. go OOG in a subcall (revert happens) check...
-
-Ported from:
-tests/static/state_tests/stExtCodeHash/extCodeHashSubcallOOGFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stExtCodeHash/extCodeHashSubcallOOGFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "0000000000000000000000002000000000000000000000000000000000000000",
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={
-                        1: 0x9FF1F274B33E3B56EDD7734520CBCDF2699FC1DC78B51644CDC56CA65BEBEEAE,  # noqa: E501
-                        2: 5,
-                        3: 0x6020602055000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                        4: 1,
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000002100000000000000000000000000000000000000",
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={
-                        1: 0x9FF1F274B33E3B56EDD7734520CBCDF2699FC1DC78B51644CDC56CA65BEBEEAE,  # noqa: E501
-                        2: 5,
-                        3: 0x6020602055000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                        4: 1,
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000002200000000000000000000000000000000000000",
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={
-                        1: 0x9FF1F274B33E3B56EDD7734520CBCDF2699FC1DC78B51644CDC56CA65BEBEEAE,  # noqa: E501
-                        2: 5,
-                        3: 0x6020602055000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                        4: 1,
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000003000000000000000000000000000000000000000",
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={4: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000003100000000000000000000000000000000000000",
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={4: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000003200000000000000000000000000000000000000",
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={4: 1}
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4", "case5"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ext_code_hash_subcall_oog(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Create contract A in a subcall. go OOG in a subcall (revert..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    # Source: LLL
-    # {
-    #   (CALLCODE 350000 (CALLDATALOAD 0) 0 0 0 0 32)
-    #   (SSTORE 1 (EXTCODEHASH (MLOAD 0)))
-    #   (SSTORE 2 (EXTCODESIZE (MLOAD 0)))
-    #   (EXTCODECOPY (MLOAD 0) 0 0 32)
-    #   (SSTORE 3 (MLOAD 0))
-    #   (SSTORE 4 (CALLCODE 50000 (MLOAD 0) 0 0 0 0 0))
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x55730,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.EXTCODEHASH(address=Op.MLOAD(offset=0x0)),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.EXTCODESIZE(address=Op.MLOAD(offset=0x0)),
-            )
-            + Op.EXTCODECOPY(
-                address=Op.MLOAD(offset=0x0),
-                dest_offset=0x0,
-                offset=0x0,
-                size=0x20,
-            )
-            + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x4,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=Op.MLOAD(offset=0x0),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (CALL 150000 0xa000000000000000000000000000000000000000 0 0 0 0 32) (RETURN 0 32)}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x249F0,
-                    address=0xA000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (CALLCODE 150000 0xa000000000000000000000000000000000000000 0 0 0 0 32) (RETURN 0 32)}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0xA000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x2100000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (DELEGATECALL 150000 0xa000000000000000000000000000000000000000 0 0 0 32) (RETURN 0 32)}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0xA000000000000000000000000000000000000000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x2200000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (CALL 150000 0xa100000000000000000000000000000000000000 0 0 0 0 32) (RETURN 0 32)}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x249F0,
-                    address=0xA100000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x3000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (CALLCODE 250000 0xa100000000000000000000000000000000000000 0 0 0 0 32) (RETURN 0 32)}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x3D090,
-                    address=0xA100000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x3100000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (DELEGATECALL 150000 0xa100000000000000000000000000000000000000 0 0 0 32) (RETURN 0 32)}  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0xA100000000000000000000000000000000000000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x3200000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   (MSTORE 0
-    #     (CREATE2 0 0
-    #       (lll
-    #       {
-    #         (MSTORE 0 0x6020602055)
-    #         (RETURN 27 5)
-    #       }
-    #       0)
-    #     0))
-    #    (RETURN 0 32)
-    #    (STOP)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0xF]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x1A, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=0x0, value=Op.CREATE2)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(offset=0x0, value=0x6020602055)
-            + Op.RETURN(offset=0x1B, size=0x5)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   (MSTORE 0
-    #     (CREATE2 0 0
-    #       (lll
-    #       {
-    #         (MSTORE 0 0x6020602055)
-    #         (RETURN 27 5)
-    #       }
-    #       0)
-    #     0))
-    #   (SSTORE 1 1) (SSTORE 2 1) (SSTORE 3 1) (SSTORE 4 1) (SSTORE 5 1) (SSTORE 6 1) (SSTORE 7 1)  # noqa: E501
-    #   (SSTORE 8 1) (SSTORE 9 1) (SSTORE 10 1) (SSTORE 11 1) (SSTORE 12 1) (SSTORE 13 1) (SSTORE 14 1)  # noqa: E501
-    #   (RETURN 0 32)
-    #   (STOP)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.PUSH1[0xF]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x60, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=0x0, value=Op.CREATE2)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(offset=0x0, value=0x6020602055)
-            + Op.RETURN(offset=0x1B, size=0x5)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xa100000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=400000,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stExtCodeHash/test_ext_code_hash_subcall_suicide.py b/tests/ported_static/stExtCodeHash/test_ext_code_hash_subcall_suicide.py
deleted file mode 100644
index 73a1caf3ae8..00000000000
--- a/tests/ported_static/stExtCodeHash/test_ext_code_hash_subcall_suicide.py
+++ /dev/null
@@ -1,192 +0,0 @@
-"""
-transaction to B | B call to A | A delegatecall/callcode to C (C has...
-
-Ported from:
-tests/static/state_tests/stExtCodeHash/extCodeHashSubcallSuicideFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stExtCodeHash/extCodeHashSubcallSuicideFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
-def test_ext_code_hash_subcall_suicide(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Transaction to B | B call to A | A delegatecall/callcode to C (C..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    # Source: LLL
-    # {
-    #   (CALLCODE 350000 0xc000000000000000000000000000000000000000 0 0 0 0 32)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x55730,
-                address=0xC000000000000000000000000000000000000000,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {
-    #   (SSTORE 1 (EXTCODEHASH 0xa000000000000000000000000000000000000000))
-    #   (SSTORE 2 (EXTCODESIZE 0xa000000000000000000000000000000000000000))
-    #   (EXTCODECOPY 0xa000000000000000000000000000000000000000 0 0 32)
-    #   (SSTORE 3 (MLOAD 0))
-    #
-    #   (CALL 350000 0xa000000000000000000000000000000000000000 0 0 0 0 32)
-    #
-    #   (SSTORE 4 (EXTCODEHASH 0xa000000000000000000000000000000000000000))
-    #   (SSTORE 5 (EXTCODESIZE 0xa000000000000000000000000000000000000000))
-    #   (EXTCODECOPY 0xa000000000000000000000000000000000000000 0 0 32)
-    #   (SSTORE 6 (MLOAD 0))
-    #
-    #   [[7]] (CALL 350000 0xa000000000000000000000000000000000000000 0 0 0 0 32)  # noqa: E501
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.EXTCODEHASH(
-                    address=0xA000000000000000000000000000000000000000,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.EXTCODESIZE(
-                    address=0xA000000000000000000000000000000000000000,
-                ),
-            )
-            + Op.EXTCODECOPY(
-                address=0xA000000000000000000000000000000000000000,
-                dest_offset=0x0,
-                offset=0x0,
-                size=0x20,
-            )
-            + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x0))
-            + Op.POP(
-                Op.CALL(
-                    gas=0x55730,
-                    address=0xA000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x4,
-                value=Op.EXTCODEHASH(
-                    address=0xA000000000000000000000000000000000000000,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x5,
-                value=Op.EXTCODESIZE(
-                    address=0xA000000000000000000000000000000000000000,
-                ),
-            )
-            + Op.EXTCODECOPY(
-                address=0xA000000000000000000000000000000000000000,
-                dest_offset=0x0,
-                offset=0x0,
-                size=0x20,
-            )
-            + Op.SSTORE(key=0x6, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x7,
-                value=Op.CALL(
-                    gas=0x55730,
-                    address=0xA000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        gas_limit=500000,
-        value=1,
-    )
-
-    post = {
-        contract: Account(
-            storage={
-                1: 0x367D3C0E810BBDEBC72C25E80DCB9A337C7C87E3A36E6FAE87D1D51B3C745D24,  # noqa: E501
-                2: 37,
-                3: 0x6020600060006000600073C00000000000000000000000000000000000000062,  # noqa: E501
-                4: 0x367D3C0E810BBDEBC72C25E80DCB9A337C7C87E3A36E6FAE87D1D51B3C745D24,  # noqa: E501
-                5: 37,
-                6: 0x6020600060006000600073C00000000000000000000000000000000000000062,  # noqa: E501
-                7: 1,
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stExtCodeHash/test_ext_code_hash_subcall_suicide_cancun.py b/tests/ported_static/stExtCodeHash/test_ext_code_hash_subcall_suicide_cancun.py
deleted file mode 100644
index 27c0e673e31..00000000000
--- a/tests/ported_static/stExtCodeHash/test_ext_code_hash_subcall_suicide_cancun.py
+++ /dev/null
@@ -1,230 +0,0 @@
-"""
-transaction to B | B call to A | A delegatecall/callcode to C (C has...
-
-Ported from:
-tests/static/state_tests/stExtCodeHash
-extCodeHashSubcallSuicideCancunFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stExtCodeHash/extCodeHashSubcallSuicideCancunFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
-def test_ext_code_hash_subcall_suicide_cancun(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Transaction to B | B call to A | A delegatecall/callcode to C (C..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    # Source: LLL
-    # {
-    #   (CALLCODE 350000 0x3e180b1862f9d158abb5e519a6d8605540c23682 0 0 0 0 32)
-    # }
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x55730,
-                address=0x3E180B1862F9D158ABB5E519A6D8605540C23682,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {
-    #   ;; create 0x3e180b1862f9d158abb5e519a6d8605540c23682 (Account A)
-    #   (CREATE 1000000000000000000 0 (lll
-    #         {
-    #             (CALL 100000 0xd000000000000000000000000000000000000000 0 0 0 0 0)  # noqa: E501
-    #             (RETURN 0 (lll
-    #                 {
-    #                   (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)  # noqa: E501
-    #                 }
-    #             0))
-    #         }
-    #   0))
-    #
-    #   (SSTORE 1 (EXTCODEHASH 0xa000000000000000000000000000000000000000))
-    #   (SSTORE 2 (EXTCODESIZE 0xa000000000000000000000000000000000000000))
-    #   (EXTCODECOPY 0xa000000000000000000000000000000000000000 0 0 32)
-    #   (SSTORE 3 (MLOAD 0))
-    #
-    #   (CALL 350000 0xa000000000000000000000000000000000000000 0 0 0 0 32)
-    #
-    #   (SSTORE 4 (EXTCODEHASH 0xa000000000000000000000000000000000000000))
-    #   (SSTORE 5 (EXTCODESIZE 0xa000000000000000000000000000000000000000))
-    #   (EXTCODECOPY 0xa000000000000000000000000000000000000000 0 0 32)
-    #   (SSTORE 6 (MLOAD 0))
-    #
-    #   [[7]] (CALL 350000 0xa000000000000000000000000000000000000000 0 0 0 0 32)  # noqa: E501
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x49]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x10C, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH8[0xDE0B6B3A7640000]
-            + Op.POP(Op.CREATE)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.EXTCODEHASH(
-                    address=0xA000000000000000000000000000000000000000,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.EXTCODESIZE(
-                    address=0xA000000000000000000000000000000000000000,
-                ),
-            )
-            + Op.EXTCODECOPY(
-                address=0xA000000000000000000000000000000000000000,
-                dest_offset=0x0,
-                offset=0x0,
-                size=0x20,
-            )
-            + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x0))
-            + Op.POP(
-                Op.CALL(
-                    gas=0x55730,
-                    address=0xA000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x4,
-                value=Op.EXTCODEHASH(
-                    address=0xA000000000000000000000000000000000000000,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x5,
-                value=Op.EXTCODESIZE(
-                    address=0xA000000000000000000000000000000000000000,
-                ),
-            )
-            + Op.EXTCODECOPY(
-                address=0xA000000000000000000000000000000000000000,
-                dest_offset=0x0,
-                offset=0x0,
-                size=0x20,
-            )
-            + Op.SSTORE(key=0x6, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x7,
-                value=Op.CALL(
-                    gas=0x55730,
-                    address=0xA000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.STOP
-            + Op.INVALID
-            + Op.POP(
-                Op.CALL(
-                    gas=0x186A0,
-                    address=0xD000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x17]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x32, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.INVALID
-            + Op.SELFDESTRUCT(
-                address=0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   [[1]] 1
-    # }
-    callee_1 = pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.STOP,
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xd000000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        gas_limit=500000,
-        value=1,
-    )
-
-    post = {
-        contract: Account(
-            storage={
-                1: 0x807D478BD0D0173122F5531D4C43781631444232A0816DD35578747C7D67AF0D,  # noqa: E501
-                2: 37,
-                3: 0x60206000600060006000733E180B1862F9D158ABB5E519A6D8605540C2368262,  # noqa: E501
-                4: 0x807D478BD0D0173122F5531D4C43781631444232A0816DD35578747C7D67AF0D,  # noqa: E501
-                5: 37,
-                6: 0x60206000600060006000733E180B1862F9D158ABB5E519A6D8605540C2368262,  # noqa: E501
-                7: 1,
-            },
-        ),
-        callee_1: Account(storage={1: 1}),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stHomesteadSpecific/__init__.py b/tests/ported_static/stHomesteadSpecific/__init__.py
index 2a44512e2b5..a536effb1d6 100644
--- a/tests/ported_static/stHomesteadSpecific/__init__.py
+++ b/tests/ported_static/stHomesteadSpecific/__init__.py
@@ -1 +1 @@
-"""Tests ported from stHomesteadSpecific."""
+"""Ported static tests: stHomesteadSpecific."""  # noqa: N999
diff --git a/tests/ported_static/stHomesteadSpecific/test_contract_creation_oo_gdont_leave_empty_contract.py b/tests/ported_static/stHomesteadSpecific/test_contract_creation_oo_gdont_leave_empty_contract.py
index 814c00059ec..dce50fa3f12 100644
--- a/tests/ported_static/stHomesteadSpecific/test_contract_creation_oo_gdont_leave_empty_contract.py
+++ b/tests/ported_static/stHomesteadSpecific/test_contract_creation_oo_gdont_leave_empty_contract.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_contract_creation_oo_gdont_leave_empty_contract.
 
 Ported from:
-tests/static/state_tests/stHomesteadSpecific
-contractCreationOOGdontLeaveEmptyContractFiller.json
+state_tests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractFiller.json",  # noqa: E501
+        "state_tests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_contract_creation_oo_gdont_leave_empty_contract(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_contract_creation_oo_gdont_leave_empty_contract."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000001)
+    sender = pre.fund_eoa(amount=0xF4240)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,31 +47,30 @@ def test_contract_creation_oo_gdont_leave_empty_contract(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (SSTORE 1 0x10) (MSTORE 0 0x6001600155601080600c6000396000f3006000355415600957005b6020356000 ) (CREATE 0 0 32)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x10)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x6001600155601080600C6000396000F3006000355415600957005B6020356000,  # noqa: E501
-            )
-            + Op.CREATE(value=0x0, offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x10)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x6001600155601080600C6000396000F3006000355415600957005B6020356000,  # noqa: E501
+        )
+        + Op.CREATE(value=0x0, offset=0x0, size=0x20)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000001"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xF4240)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=93056,
     )
 
     post = {
-        contract: Account(storage={1: 16}),
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stHomesteadSpecific/test_contract_creation_oo_gdont_leave_empty_contract_via_transaction.py b/tests/ported_static/stHomesteadSpecific/test_contract_creation_oo_gdont_leave_empty_contract_via_transaction.py
index 42982660a3c..82d92551fc3 100644
--- a/tests/ported_static/stHomesteadSpecific/test_contract_creation_oo_gdont_leave_empty_contract_via_transaction.py
+++ b/tests/ported_static/stHomesteadSpecific/test_contract_creation_oo_gdont_leave_empty_contract_via_transaction.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_contract_creation_oo_gdont_leave_empty_contract_via_transaction.
 
 Ported from:
-tests/static/state_tests/stHomesteadSpecific
-contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json
+state_tests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json
 """
 
 import pytest
@@ -15,6 +14,7 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json",  # noqa: E501
+        "state_tests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,10 @@ def test_contract_creation_oo_gdont_leave_empty_contract_via_transaction(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_contract_creation_oo_gdont_leave_empty_contract_via_transaction."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0x1000000000000000000000000000000000000001)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,45 +50,49 @@ def test_contract_creation_oo_gdont_leave_empty_contract_via_transaction(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0x10C8E0)
+    # Source: lll
     # {(SSTORE 1 1)}
-    contract = pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000001"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000001),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x10C8E0)
-    # Source: LLL
+    # Source: lll
     # {(CALL 50000 0x1000000000000000000000000000000000000001 0 0 64 0 64)}
-    pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xC350,
-                address=0x1000000000000000000000000000000000000001,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xC350,
+            address=0x1000000000000000000000000000000000000001,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "6040600060406000600073100000000000000000000000000000000000000161c350f1"  # noqa: E501
+        data=Op.CALL(
+            gas=0xC350,
+            address=contract_1,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
         ),
         gas_limit=96000,
     )
 
     post = {
-        contract: Account(storage={1: 1}),
+        compute_create_address(address=sender, nonce=0): Account(balance=0)
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stHomesteadSpecific/test_create_contract_via_contract.py b/tests/ported_static/stHomesteadSpecific/test_create_contract_via_contract.py
index 84e3aa82d65..1989648a8b1 100644
--- a/tests/ported_static/stHomesteadSpecific/test_create_contract_via_contract.py
+++ b/tests/ported_static/stHomesteadSpecific/test_create_contract_via_contract.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_create_contract_via_contract.
 
 Ported from:
-tests/static/state_tests/stHomesteadSpecific
-createContractViaContractFiller.json
+state_tests/stHomesteadSpecific/createContractViaContractFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stHomesteadSpecific/createContractViaContractFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stHomesteadSpecific/createContractViaContractFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,10 @@ def test_create_contract_via_contract(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_contract_via_contract."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000001)
+    sender = pre.fund_eoa(amount=0xF4240)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,21 +44,20 @@ def test_create_contract_via_contract(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (CREATE 0 0 0)}
-    contract = pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.CREATE(value=0x0, offset=0x0, size=0x0) + Op.STOP,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000001"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xF4240)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stHomesteadSpecific/test_create_contract_via_contract_oog_init_code.py b/tests/ported_static/stHomesteadSpecific/test_create_contract_via_contract_oog_init_code.py
index 89ef673db39..7b3e101416a 100644
--- a/tests/ported_static/stHomesteadSpecific/test_create_contract_via_contract_oog_init_code.py
+++ b/tests/ported_static/stHomesteadSpecific/test_create_contract_via_contract_oog_init_code.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_create_contract_via_contract_oog_init_code.
 
 Ported from:
-tests/static/state_tests/stHomesteadSpecific
-createContractViaContractOOGInitCodeFiller.json
+state_tests/stHomesteadSpecific/createContractViaContractOOGInitCodeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stHomesteadSpecific/createContractViaContractOOGInitCodeFiller.json",  # noqa: E501
+        "state_tests/stHomesteadSpecific/createContractViaContractOOGInitCodeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_create_contract_via_contract_oog_init_code(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_contract_via_contract_oog_init_code."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000001)
+    sender = pre.fund_eoa(amount=0x10C8E0)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,25 +47,27 @@ def test_create_contract_via_contract_oog_init_code(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x602060406000f0600c600055)(CREATE 0 20 12)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x602060406000F0600C600055)
-            + Op.CREATE(value=0x0, offset=0x14, size=0xC)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x602060406000F0600C600055)
+        + Op.CREATE(value=0x0, offset=0x14, size=0xC)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000001"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x10C8E0)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=105044,
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(
+            address=compute_create_address(address=contract_0, nonce=0),
+            nonce=0,
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stHomesteadSpecific/test_create_contract_via_transaction_cost53000.py b/tests/ported_static/stHomesteadSpecific/test_create_contract_via_transaction_cost53000.py
index 7e0e9a7f4d9..aaa0ab8e85f 100644
--- a/tests/ported_static/stHomesteadSpecific/test_create_contract_via_transaction_cost53000.py
+++ b/tests/ported_static/stHomesteadSpecific/test_create_contract_via_transaction_cost53000.py
@@ -1,17 +1,16 @@
 """
-trigger transaction creating gasPrice in the state.
+Trigger transaction creating gasPrice in the state.
 
 Ported from:
-tests/static/state_tests/stHomesteadSpecific
-createContractViaTransactionCost53000Filler.json
+state_tests/stHomesteadSpecific/createContractViaTransactionCost53000Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,20 +22,17 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stHomesteadSpecific/createContractViaTransactionCost53000Filler.json",  # noqa: E501
+        "state_tests/stHomesteadSpecific/createContractViaTransactionCost53000Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_create_contract_via_transaction_cost53000(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """Trigger transaction creating gasPrice in the state."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xF4240)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,14 +43,13 @@ def test_create_contract_via_transaction_cost53000(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xF4240)
-
     tx = Transaction(
         sender=sender,
         to=None,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stInitCodeTest/__init__.py b/tests/ported_static/stInitCodeTest/__init__.py
index 4cdee0eddc4..a2898a67a06 100644
--- a/tests/ported_static/stInitCodeTest/__init__.py
+++ b/tests/ported_static/stInitCodeTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stInitCodeTest."""
+"""Ported static tests: stInitCodeTest."""  # noqa: N999
diff --git a/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_and_call_it_oog.py b/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_and_call_it_oog.py
index bab4cd48758..e5dde4f4373 100644
--- a/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_and_call_it_oog.py
+++ b/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_and_call_it_oog.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_call_contract_to_create_contract_and_call_it_oog.
 
 Ported from:
-tests/static/state_tests/stInitCodeTest
-CallContractToCreateContractAndCallItOOGFiller.json
+state_tests/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json",  # noqa: E501
+        "state_tests/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_call_contract_to_create_contract_and_call_it_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_call_contract_to_create_contract_and_call_it_oog."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,47 +47,45 @@ def test_call_contract_to_create_contract_and_call_it_oog(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 0 0x600c60005566602060406000f060205260076039f3)[[0]](CREATE 1 11 21)(CALL 1000 (SLOAD 0) 0 0 0 0 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x600C60005566602060406000F060205260076039F3,
-            )
-            + Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x1, offset=0xB, size=0x15)
-            )
-            + Op.CALL(
-                gas=0x3E8,
-                address=Op.SLOAD(key=0x0),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x600C60005566602060406000F060205260076039F3
+        )
+        + Op.SSTORE(key=0x0, value=Op.CREATE(value=0x1, offset=0xB, size=0x15))
+        + Op.CALL(
+            gas=0x3E8,
+            address=Op.SLOAD(key=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=contract_0,
+        data=Bytes("00"),
         gas_limit=203000,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0xD2571607E241ECF590ED94B12D87C94BABE36DB6},
+        contract_0: Account(
+            storage={
+                0: compute_create_address(address=contract_0, nonce=0),
+            },
+            nonce=1,
         ),
-        Address("0xd2571607e241ecf590ed94b12d87c94babe36db6"): Account(
-            storage={0: 12},
+        sender: Account(nonce=1),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={0: 12}, balance=1, nonce=1
         ),
     }
 
diff --git a/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_no_cash.py b/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_no_cash.py
index 573526d9449..4298cd98ba6 100644
--- a/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_no_cash.py
+++ b/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_no_cash.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_contract_to_create_contract_no_cash.
 
 Ported from:
-tests/static/state_tests/stInitCodeTest
-CallContractToCreateContractNoCashFiller.json
+state_tests/stInitCodeTest/CallContractToCreateContractNoCashFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stInitCodeTest/CallContractToCreateContractNoCashFiller.json",  # noqa: E501
+        "state_tests/stInitCodeTest/CallContractToCreateContractNoCashFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_contract_to_create_contract_no_cash(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
-    )
+    """Test_call_contract_to_create_contract_no_cash."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3B9ACA00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,33 +45,30 @@ def test_call_contract_to_create_contract_no_cash(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 0 0x600c60005566602060406000f060205260076039f3)[[0]](CREATE 100000 11 21)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x600C60005566602060406000F060205260076039F3,
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(value=0x186A0, offset=0xB, size=0x15),
-            )
-            + Op.STOP
-        ),
-        balance=0x2710,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x600C60005566602060406000F060205260076039F3
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.CREATE(value=0x186A0, offset=0xB, size=0x15)
+        )
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0x985aca92559c5b1b9cd7897fec0f7c7993ad0d60"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3B9ACA00)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=target,
+        data=Bytes("00"),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(nonce=0),
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_oog.py b/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_oog.py
index 2aa7496c0fd..32bd64fd55a 100644
--- a/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_oog.py
+++ b/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_oog.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_contract_to_create_contract_oog.
 
 Ported from:
-tests/static/state_tests/stInitCodeTest
-CallContractToCreateContractOOGFiller.json
+state_tests/stInitCodeTest/CallContractToCreateContractOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stInitCodeTest/CallContractToCreateContractOOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stInitCodeTest/CallContractToCreateContractOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_call_contract_to_create_contract_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
-    )
+    """Test_call_contract_to_create_contract_oog."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3B9ACA00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,40 +43,37 @@ def test_call_contract_to_create_contract_oog(
         gas_limit=1000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 0 0x600c60005566602060406000f060205260076039f3)[[0]](CREATE 1 11 21)(CALL 0 (SLOAD 0) 0 0 0 0 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x600C60005566602060406000F060205260076039F3,
-            )
-            + Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x1, offset=0xB, size=0x15)
-            )
-            + Op.CALL(
-                gas=0x0,
-                address=Op.SLOAD(key=0x0),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x600C60005566602060406000F060205260076039F3
+        )
+        + Op.SSTORE(key=0x0, value=Op.CREATE(value=0x1, offset=0xB, size=0x15))
+        + Op.CALL(
+            gas=0x0,
+            address=Op.SLOAD(key=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1bc6342e077e772b0f4cc48116bc171f9a35d09e"),  # noqa: E501
+        address=Address(0x1BC6342E077E772B0F4CC48116BC171F9A35D09E),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3B9ACA00)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=target,
+        data=Bytes("00"),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(nonce=0),
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_oog_bonus_gas.py b/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_oog_bonus_gas.py
index ff2061aaacf..11a0f3780e7 100644
--- a/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_oog_bonus_gas.py
+++ b/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_oog_bonus_gas.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_call_contract_to_create_contract_oog_bonus_gas.
 
 Ported from:
-tests/static/state_tests/stInitCodeTest
-CallContractToCreateContractOOGBonusGasFiller.json
+state_tests/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json",  # noqa: E501
+        "state_tests/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_call_contract_to_create_contract_oog_bonus_gas(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_call_contract_to_create_contract_oog_bonus_gas."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0x3B9ACA00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,47 +47,45 @@ def test_call_contract_to_create_contract_oog_bonus_gas(
         gas_limit=1000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 0 0x600c60005566602060406000f060205260076039f3)[[0]](CREATE 1 11 21)(CALL 0 (SLOAD 0) 12 0 0 0 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x600C60005566602060406000F060205260076039F3,
-            )
-            + Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x1, offset=0xB, size=0x15)
-            )
-            + Op.CALL(
-                gas=0x0,
-                address=Op.SLOAD(key=0x0),
-                value=0xC,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x600C60005566602060406000F060205260076039F3
+        )
+        + Op.SSTORE(key=0x0, value=Op.CREATE(value=0x1, offset=0xB, size=0x15))
+        + Op.CALL(
+            gas=0x0,
+            address=Op.SLOAD(key=0x0),
+            value=0xC,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=112,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3B9ACA00)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=contract_0,
+        data=Bytes("00"),
         gas_limit=200000,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0xD2571607E241ECF590ED94B12D87C94BABE36DB6},
+        contract_0: Account(
+            storage={
+                0: compute_create_address(address=contract_0, nonce=0),
+            },
+            nonce=1,
         ),
-        Address("0xd2571607e241ecf590ed94b12d87c94babe36db6"): Account(
-            storage={0: 12},
+        sender: Account(nonce=1),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={0: 12}, balance=1, nonce=1
         ),
     }
 
diff --git a/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_which_would_create_contract_if_called.py b/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_which_would_create_contract_if_called.py
index 5b89c8bea44..16fb7d6b4df 100644
--- a/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_which_would_create_contract_if_called.py
+++ b/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_which_would_create_contract_if_called.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_call_contract_to_create_contract_which_would_create_contract_if_cal...
 
 Ported from:
-tests/static/state_tests/stInitCodeTest
-CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
+state_tests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json",  # noqa: E501
+        "state_tests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_call_contract_to_create_contract_which_would_create_contract_if_called(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_call_contract_to_create_contract_which_would_create_contract_i..."""  # noqa: E501
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0x3B9ACA00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,47 +47,49 @@ def test_call_contract_to_create_contract_which_would_create_contract_if_called(
         gas_limit=1000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 0 0x600c60005566602060406000f060205260076039f3)[[0]](CREATE 1 11 21)(CALL 50000 (SLOAD 0) 1 0 0 0 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x600C60005566602060406000F060205260076039F3,
-            )
-            + Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x1, offset=0xB, size=0x15)
-            )
-            + Op.CALL(
-                gas=0xC350,
-                address=Op.SLOAD(key=0x0),
-                value=0x1,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x600C60005566602060406000F060205260076039F3
+        )
+        + Op.SSTORE(key=0x0, value=Op.CREATE(value=0x1, offset=0xB, size=0x15))
+        + Op.CALL(
+            gas=0xC350,
+            address=Op.SLOAD(key=0x0),
+            value=0x1,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3B9ACA00)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=contract_0,
+        data=Bytes("00"),
         gas_limit=200000,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0xD2571607E241ECF590ED94B12D87C94BABE36DB6},
+        contract_0: Account(
+            storage={
+                0: compute_create_address(address=contract_0, nonce=0),
+            },
+            nonce=1,
         ),
-        Address("0xd2571607e241ecf590ed94b12d87c94babe36db6"): Account(
-            storage={0: 12},
+        compute_create_address(
+            address=compute_create_address(address=contract_0, nonce=0),
+            nonce=0,
+        ): Account.NONEXISTENT,
+        sender: Account(nonce=1),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={0: 12}, balance=2, nonce=2
         ),
     }
 
diff --git a/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_which_would_create_contract_in_init_code.py b/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_which_would_create_contract_in_init_code.py
index 9a1c5324c57..b1dabf644aa 100644
--- a/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_which_would_create_contract_in_init_code.py
+++ b/tests/ported_static/stInitCodeTest/test_call_contract_to_create_contract_which_would_create_contract_in_init_code.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_call_contract_to_create_contract_which_would_create_contract_in_ini...
 
 Ported from:
-tests/static/state_tests/stInitCodeTest
-CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json
+state_tests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json",  # noqa: E501
+        "state_tests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_call_contract_to_create_contract_which_would_create_contract_in_init_co
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_call_contract_to_create_contract_which_would_create_contract_i..."""  # noqa: E501
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0x3B9ACA00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,30 +47,32 @@ def test_call_contract_to_create_contract_which_would_create_contract_in_init_co
         gas_limit=1000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 0 0x600c600055602060406000f0)(CREATE 0 20 12)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x600C600055602060406000F0)
-            + Op.CREATE(value=0x0, offset=0x14, size=0xC)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x600C600055602060406000F0)
+        + Op.CREATE(value=0x0, offset=0x14, size=0xC)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3B9ACA00)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=contract_0,
+        data=Bytes("00"),
         gas_limit=200000,
     )
 
     post = {
-        Address("0xd2571607e241ecf590ed94b12d87c94babe36db6"): Account(
-            storage={0: 12},
+        contract_0: Account(balance=1, nonce=1),
+        compute_create_address(
+            address=compute_create_address(address=contract_0, nonce=0),
+            nonce=0,
+        ): Account.NONEXISTENT,
+        sender: Account(nonce=1),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={0: 12}, nonce=2
         ),
     }
 
diff --git a/tests/ported_static/stInitCodeTest/test_call_recursive_contract.py b/tests/ported_static/stInitCodeTest/test_call_recursive_contract.py
index e8e5fe5786c..971bc2d4760 100644
--- a/tests/ported_static/stInitCodeTest/test_call_recursive_contract.py
+++ b/tests/ported_static/stInitCodeTest/test_call_recursive_contract.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_recursive_contract.
 
 Ported from:
-tests/static/state_tests/stInitCodeTest/CallRecursiveContractFiller.json
+state_tests/stInitCodeTest/CallRecursiveContractFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stInitCodeTest/CallRecursiveContractFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stInitCodeTest/CallRecursiveContractFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,9 @@ def test_call_recursive_contract(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_recursive_contract."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -47,47 +47,34 @@ def test_call_recursive_contract(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0x989680)
+    # Source: lll
     # {[[ 2 ]](ADDRESS)(CODECOPY 0 0 32)(CREATE 0 0 32)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=Op.ADDRESS)
-            + Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.CREATE(value=0x0, offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=Op.ADDRESS)
+        + Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.CREATE(value=0x0, offset=0x0, size=0x20)
+        + Op.STOP,
         nonce=40,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x989680)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=contract_0,
+        data=Bytes("00"),
         gas_limit=400000,
         value=1,
     )
 
     post = {
-        contract: Account(
-            storage={2: 0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87},
-        ),
-        Address("0x4b0b4b3c7fd3dd5cea1d04dcf027dea29f84acb1"): Account(
-            storage={2: 0x4B0B4B3C7FD3DD5CEA1D04DCF027DEA29F84ACB1},
-        ),
-        Address("0x60f971aa65f7e520dcb750823e2c239e61c3736b"): Account(
-            storage={2: 0x60F971AA65F7E520DCB750823E2C239E61C3736B},
-        ),
-        Address("0x6fc9df08d2206eff4f4c378aeb2a1f8c570952b9"): Account(
-            storage={2: 0x6FC9DF08D2206EFF4F4C378AEB2A1F8C570952B9},
-        ),
-        Address("0x74a77e95f3228f0b4d116d5a12e09aaf99ce54ae"): Account(
-            storage={2: 0x74A77E95F3228F0B4D116D5A12E09AAF99CE54AE},
-        ),
-        Address("0xf0064be0919341a45680ec0d592eaee47df671ac"): Account(
-            storage={2: 0xF0064BE0919341A45680EC0D592EAEE47DF671AC},
-        ),
+        contract_0: Account(storage={2: contract_0}, balance=1, nonce=41),
+        Address(
+            0x1A4C83E1A9834CDC7E4A905FF7F0CF44AED73180
+        ): Account.NONEXISTENT,
+        Address(
+            0x8E3411C91D5DD4081B4846FA2F93808F5AD19686
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stInitCodeTest/test_call_the_contract_to_create_empty_contract.py b/tests/ported_static/stInitCodeTest/test_call_the_contract_to_create_empty_contract.py
index 235d1e09063..08cb3cc54f5 100644
--- a/tests/ported_static/stInitCodeTest/test_call_the_contract_to_create_empty_contract.py
+++ b/tests/ported_static/stInitCodeTest/test_call_the_contract_to_create_empty_contract.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_call_the_contract_to_create_empty_contract.
 
 Ported from:
-tests/static/state_tests/stInitCodeTest
-CallTheContractToCreateEmptyContractFiller.json
+state_tests/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json",  # noqa: E501
+        "state_tests/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_call_the_contract_to_create_empty_contract(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_call_the_contract_to_create_empty_contract."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0x989680)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,23 +47,27 @@ def test_call_the_contract_to_create_empty_contract(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(CREATE 0 0 32)}
-    contract = pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.CREATE(value=0x0, offset=0x0, size=0x20) + Op.STOP,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x989680)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=contract_0,
+        data=Bytes("00"),
         gas_limit=100000,
         value=1,
     )
 
-    post: dict = {}
+    post = {
+        contract_0: Account(balance=1, nonce=1),
+        sender: Account(nonce=1),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={}, code=b"", balance=0, nonce=1
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stInitCodeTest/test_out_of_gas_contract_creation.py b/tests/ported_static/stInitCodeTest/test_out_of_gas_contract_creation.py
index 04a098b8b2b..9525495cff9 100644
--- a/tests/ported_static/stInitCodeTest/test_out_of_gas_contract_creation.py
+++ b/tests/ported_static/stInitCodeTest/test_out_of_gas_contract_creation.py
@@ -1,65 +1,75 @@
 """
-Test ported from static filler.
+Test_out_of_gas_contract_creation.
 
 Ported from:
-tests/static/state_tests/stInitCodeTest/OutOfGasContractCreationFiller.json
+state_tests/stInitCodeTest/OutOfGasContractCreationFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stInitCodeTest/OutOfGasContractCreationFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stInitCodeTest/OutOfGasContractCreationFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        ("600a80600c6000396000f200600160008035811a8100", 56000, {}),
-        ("600a80600c6000396000f200600160008035811a8100", 150000, {}),
-        (
-            "600160015560026001556003600155600460015560056001556006600155",
-            56000,
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "600160015560026001556003600155600460015560056001556006600155",
-            150000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 6}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
+        ),
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
-@pytest.mark.pre_alloc_mutable
 def test_out_of_gas_contract_creation(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    """Test_out_of_gas_contract_creation."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
 
     env = Environment(
@@ -71,20 +81,69 @@ def test_out_of_gas_contract_creation(
         gas_limit=100000000000000,
     )
 
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-    )
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                compute_create_address(
+                    address=sender, nonce=0
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                compute_create_address(
+                    address=sender, nonce=0
+                ): Account.NONEXISTENT,
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.PUSH1[0xA]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.CALLCODE
+        + Op.STOP
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.BYTE(Op.DUP2, Op.CALLDATALOAD(offset=Op.DUP1))
+        + Op.DUP2
+        + Op.STOP,
+        Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.SSTORE(key=0x1, value=0x3)
+        + Op.SSTORE(key=0x1, value=0x4)
+        + Op.SSTORE(key=0x1, value=0x5)
+        + Op.SSTORE(key=0x1, value=0x6),
+    ]
+    tx_gas = [56000, 150000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stInitCodeTest/test_out_of_gas_prefunded_contract_creation.py b/tests/ported_static/stInitCodeTest/test_out_of_gas_prefunded_contract_creation.py
index 9ae0a5f05b6..51dd0b6725e 100644
--- a/tests/ported_static/stInitCodeTest/test_out_of_gas_prefunded_contract_creation.py
+++ b/tests/ported_static/stInitCodeTest/test_out_of_gas_prefunded_contract_creation.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_out_of_gas_prefunded_contract_creation.
 
 Ported from:
-tests/static/state_tests/stInitCodeTest
-OutOfGasPrefundedContractCreationFiller.json
+state_tests/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json
 """
 
 import pytest
@@ -16,6 +15,11 @@
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
@@ -23,39 +27,48 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json",  # noqa: E501
+        "state_tests/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            154000,
-            {
-                Address("0x64e2ebd6405af8cb348aec519084d3fff42ebba6"): Account(
-                    storage={0: 0x112233}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="-g2",
         ),
-        (65000, {}),
-        (95000, {}),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_out_of_gas_prefunded_contract_creation(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_out_of_gas_prefunded_contract_creation."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
-    contract = Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -66,19 +79,58 @@ def test_out_of_gas_prefunded_contract_creation(
         gas_limit=1000000000,
     )
 
-    pre[contract] = Account(balance=1, nonce=0)
     pre[sender] = Account(balance=0xF424000)
+    # Source: hex
+    # 0x
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": [0, 1], "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(balance=1),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": [2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(balance=2),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.PUSH1[0x9]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x11, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x1]
+        + Op.POP(Op.CREATE)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x112233)
+        + Op.STOP * 2,
+    ]
+    tx_gas = [154000, 65000, 95000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "600980601160003960006001f0500000fe621122336000550000"
-        ),
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stInitCodeTest/test_return_test.py b/tests/ported_static/stInitCodeTest/test_return_test.py
index 54874b4d29b..63721b3fe3b 100644
--- a/tests/ported_static/stInitCodeTest/test_return_test.py
+++ b/tests/ported_static/stInitCodeTest/test_return_test.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_return_test.
 
 Ported from:
-tests/static/state_tests/stInitCodeTest/ReturnTestFiller.json
+state_tests/stInitCodeTest/ReturnTestFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stInitCodeTest/ReturnTestFiller.json"],
+    ["state_tests/stInitCodeTest/ReturnTestFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,11 @@ def test_return_test(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_return_test."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x194F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x989680)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,50 +45,42 @@ def test_return_test(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # {(CALL 2000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 30 1 31 1) [[0]](MLOAD 0) (RETURN 30 2)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x7D0,
-                    address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=0x0,
-                    args_offset=0x1E,
-                    args_size=0x1,
-                    ret_offset=0x1F,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.RETURN(offset=0x1E, size=0x2)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x194f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x989680)
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 0 0x15) (RETURN 31 1)}
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x15)
-            + Op.RETURN(offset=0x1F, size=0x1)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x15)
+        + Op.RETURN(offset=0x1F, size=0x1)
+        + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+    )
+    # Source: lll
+    # {(CALL 2000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 30 1 31 1) [[0]](MLOAD 0) (RETURN 30 2)}  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x7D0,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x1E,
+                args_size=0x1,
+                ret_offset=0x1F,
+                ret_size=0x1,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.RETURN(offset=0x1E, size=0x2)
+        + Op.STOP,
+        nonce=0,
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=300000,
     )
 
-    post = {
-        contract: Account(storage={0: 21}),
-    }
+    post = {contract_0: Account(storage={0: 21})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stInitCodeTest/test_return_test2.py b/tests/ported_static/stInitCodeTest/test_return_test2.py
index 9bdd465dba3..44212cd0b15 100644
--- a/tests/ported_static/stInitCodeTest/test_return_test2.py
+++ b/tests/ported_static/stInitCodeTest/test_return_test2.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_return_test2.
 
 Ported from:
-tests/static/state_tests/stInitCodeTest/ReturnTest2Filler.json
+state_tests/stInitCodeTest/ReturnTest2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stInitCodeTest/ReturnTest2Filler.json"],
+    ["state_tests/stInitCodeTest/ReturnTest2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,11 @@ def test_return_test2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_return_test2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x194F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x989680)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +45,46 @@ def test_return_test2(
         gas_limit=1000000000,
     )
 
-    # Source: LLL
-    # {(MSTORE 0 0x15)(CALL 7000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 32 32 32) [[0]](MLOAD 0) [[1]](MLOAD 32) (RETURN 0 64)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x15)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x1B58,
-                    address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x20,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
-            + Op.RETURN(offset=0x0, size=0x40)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {(MSTORE 0 (MUL 3 (CALLDATALOAD 0)))(RETURN 0 32)}
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=Op.MUL(0x3, Op.CALLDATALOAD(offset=0x0))
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
+        balance=0x186A0,
         nonce=0,
-        address=Address("0x194f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x989680)
-    # Source: LLL
-    # {(MSTORE 0 (MUL 3 (CALLDATALOAD 0)))(RETURN 0 32)}
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0, value=Op.MUL(0x3, Op.CALLDATALOAD(offset=0x0))
+    # Source: lll
+    # {(MSTORE 0 0x15)(CALL 7000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 32 32 32) [[0]](MLOAD 0) [[1]](MLOAD 32) (RETURN 0 64)}  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x15)
+        + Op.POP(
+            Op.CALL(
+                gas=0x1B58,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x20,
+                ret_size=0x20,
             )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
-        balance=0x186A0,
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
+        + Op.RETURN(offset=0x0, size=0x40)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=250000,
     )
 
-    post = {
-        contract: Account(storage={0: 21, 1: 63}),
-    }
+    post = {contract_0: Account(storage={0: 21, 1: 63})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stInitCodeTest/test_stack_under_flow_contract_creation.py b/tests/ported_static/stInitCodeTest/test_stack_under_flow_contract_creation.py
index 3df1e234c14..6648c3ae81d 100644
--- a/tests/ported_static/stInitCodeTest/test_stack_under_flow_contract_creation.py
+++ b/tests/ported_static/stInitCodeTest/test_stack_under_flow_contract_creation.py
@@ -1,30 +1,28 @@
 """
-Test ported from static filler.
+Test_stack_under_flow_contract_creation.
 
 Ported from:
-tests/static/state_tests/stInitCodeTest
-StackUnderFlowContractCreationFiller.json
+state_tests/stInitCodeTest/StackUnderFlowContractCreationFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stInitCodeTest/StackUnderFlowContractCreationFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stInitCodeTest/StackUnderFlowContractCreationFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_stack_under_flow_contract_creation(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_stack_under_flow_contract_creation."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xAE9F7BCC00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,15 +44,17 @@ def test_stack_under_flow_contract_creation(
     )
 
     pre[coinbase] = Account(balance=0, nonce=1)
-    pre[sender] = Account(balance=0xAE9F7BCC00)
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex("6000f1"),
+        data=Op.PUSH1[0x0] + Op.CALL,
         gas_limit=72000,
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=sender, nonce=0): Account.NONEXISTENT,
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stInitCodeTest/test_transaction_create_auto_suicide_contract.py b/tests/ported_static/stInitCodeTest/test_transaction_create_auto_suicide_contract.py
index a970caf6251..271a5a75705 100644
--- a/tests/ported_static/stInitCodeTest/test_transaction_create_auto_suicide_contract.py
+++ b/tests/ported_static/stInitCodeTest/test_transaction_create_auto_suicide_contract.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_transaction_create_auto_suicide_contract.
 
 Ported from:
-tests/static/state_tests/stInitCodeTest
-TransactionCreateAutoSuicideContractFiller.json
+state_tests/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json
 """
 
 import pytest
@@ -16,6 +15,7 @@
     StateTestFiller,
     Transaction,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
@@ -23,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json",  # noqa: E501
+        "state_tests/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -32,8 +32,8 @@ def test_transaction_create_auto_suicide_contract(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_transaction_create_auto_suicide_contract."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -52,11 +52,23 @@ def test_transaction_create_auto_suicide_contract(
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex("600a80600c6000396000fff2ffff600160008035811a81"),
+        data=Op.PUSH1[0xA]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
+        + Op.SELFDESTRUCT(address=0x0)
+        + Op.SELFDESTRUCT(address=Op.CALLCODE)
+        + Op.SELFDESTRUCT
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.BYTE(Op.DUP2, Op.CALLDATALOAD(offset=Op.DUP1))
+        + Op.DUP2,
         gas_limit=55000,
         value=15,
     )
 
-    post: dict = {}
+    post = {
+        Address(
+            0x0000000000000000000000000000000000000000
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stInitCodeTest/test_transaction_create_random_init_code.py b/tests/ported_static/stInitCodeTest/test_transaction_create_random_init_code.py
index a064da8a615..2924e4d01ee 100644
--- a/tests/ported_static/stInitCodeTest/test_transaction_create_random_init_code.py
+++ b/tests/ported_static/stInitCodeTest/test_transaction_create_random_init_code.py
@@ -1,30 +1,28 @@
 """
-stack underflow in init code.
+Stack underflow in init code.
 
 Ported from:
-tests/static/state_tests/stInitCodeTest
-TransactionCreateRandomInitCodeFiller.json
+state_tests/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_transaction_create_random_init_code(
     pre: Alloc,
 ) -> None:
     """Stack underflow in init code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x2540BE400)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,16 +44,27 @@ def test_transaction_create_random_init_code(
     )
 
     pre[coinbase] = Account(balance=0, nonce=1)
-    pre[sender] = Account(balance=0x2540BE400)
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex("600a80600c6000396000f200600160008035811a8100"),
+        data=Op.PUSH1[0xA]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.CALLCODE
+        + Op.STOP
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.BYTE(Op.DUP2, Op.CALLDATALOAD(offset=Op.DUP1))
+        + Op.DUP2
+        + Op.STOP,
         gas_limit=64599,
         value=1,
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=sender, nonce=0): Account.NONEXISTENT,
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stInitCodeTest/test_transaction_create_stop_in_initcode.py b/tests/ported_static/stInitCodeTest/test_transaction_create_stop_in_initcode.py
index 20fe26ef8c1..15156479273 100644
--- a/tests/ported_static/stInitCodeTest/test_transaction_create_stop_in_initcode.py
+++ b/tests/ported_static/stInitCodeTest/test_transaction_create_stop_in_initcode.py
@@ -1,42 +1,37 @@
 """
-Test ported from static filler.
+Test_transaction_create_stop_in_initcode.
 
 Ported from:
-tests/static/state_tests/stInitCodeTest
-TransactionCreateStopInInitcodeFiller.json
+state_tests/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_transaction_create_stop_in_initcode(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_transaction_create_stop_in_initcode."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xF4240)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,16 +42,26 @@ def test_transaction_create_stop_in_initcode(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xF4240)
-
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex("600a80600c600039600000f20000600160008035811a81"),
+        data=Op.PUSH1[0xA]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.STOP
+        + Op.CALLCODE
+        + Op.STOP * 2
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.BYTE(Op.DUP2, Op.CALLDATALOAD(offset=Op.DUP1))
+        + Op.DUP2,
         gas_limit=55000,
         value=1,
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=sender, nonce=0): Account(balance=1),
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stInitCodeTest/test_transaction_create_suicide_in_initcode.py b/tests/ported_static/stInitCodeTest/test_transaction_create_suicide_in_initcode.py
index d78d7a13757..59214c2f5d8 100644
--- a/tests/ported_static/stInitCodeTest/test_transaction_create_suicide_in_initcode.py
+++ b/tests/ported_static/stInitCodeTest/test_transaction_create_suicide_in_initcode.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_transaction_create_suicide_in_initcode.
 
 Ported from:
-tests/static/state_tests/stInitCodeTest
-TransactionCreateSuicideInInitcodeFiller.json
+state_tests/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
@@ -23,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json",  # noqa: E501
+        "state_tests/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -32,11 +32,9 @@ def test_transaction_create_suicide_in_initcode(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_transaction_create_suicide_in_initcode."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3B9ACA00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,16 +46,18 @@ def test_transaction_create_suicide_in_initcode(
     )
 
     pre[coinbase] = Account(balance=0, nonce=1)
-    pre[sender] = Account(balance=0x3B9ACA00)
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex("30ff00"),
+        data=Op.SELFDESTRUCT(address=Op.ADDRESS) + Op.STOP,
         gas_limit=155000,
         value=1,
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=sender, nonce=0): Account.NONEXISTENT,
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/__init__.py b/tests/ported_static/stLogTests/__init__.py
index ec7e9210bcf..663df0591dd 100644
--- a/tests/ported_static/stLogTests/__init__.py
+++ b/tests/ported_static/stLogTests/__init__.py
@@ -1 +1 @@
-"""Tests ported from stLogTests."""
+"""Ported static tests: stLogTests."""  # noqa: N999
diff --git a/tests/ported_static/stLogTests/test_log0_empty_mem.py b/tests/ported_static/stLogTests/test_log0_empty_mem.py
index 4d326580550..8569ed72148 100644
--- a/tests/ported_static/stLogTests/test_log0_empty_mem.py
+++ b/tests/ported_static/stLogTests/test_log0_empty_mem.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log0_empty_mem.
 
 Ported from:
-tests/static/state_tests/stLogTests/log0_emptyMemFiller.json
+state_tests/stLogTests/log0_emptyMemFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log0_emptyMemFiller.json"],
+    ["state_tests/stLogTests/log0_emptyMemFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log0_empty_mem(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log0_empty_mem."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,45 +43,41 @@ def test_log0_empty_mem(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0xC2A943E837808399D9C1B946C6188739D4D4475E,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (LOG0 0 0) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG0(offset=0x0, size=0x0) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.LOG0(offset=0x0, size=0x0) + Op.STOP,
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc2a943e837808399d9c1b946c6188739d4d4475e"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log0_log_mem_start_too_high.py b/tests/ported_static/stLogTests/test_log0_log_mem_start_too_high.py
index fc32371223f..cddabdb16d0 100644
--- a/tests/ported_static/stLogTests/test_log0_log_mem_start_too_high.py
+++ b/tests/ported_static/stLogTests/test_log0_log_mem_start_too_high.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log0_log_mem_start_too_high.
 
 Ported from:
-tests/static/state_tests/stLogTests/log0_logMemStartTooHighFiller.json
+state_tests/stLogTests/log0_logMemStartTooHighFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log0_logMemStartTooHighFiller.json"],
+    ["state_tests/stLogTests/log0_logMemStartTooHighFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log0_log_mem_start_too_high(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log0_log_mem_start_too_high."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,53 +43,49 @@ def test_log0_log_mem_start_too_high(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x4E46DD6CCD823BBE05D8CEAF0CA778101F8D8E6B,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG0(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=0x1,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG0(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=0x1,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4e46dd6ccd823bbe05d8ceaf0ca778101f8d8e6b"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log0_log_memsize_too_high.py b/tests/ported_static/stLogTests/test_log0_log_memsize_too_high.py
index 1882820fd8d..1a45b8be972 100644
--- a/tests/ported_static/stLogTests/test_log0_log_memsize_too_high.py
+++ b/tests/ported_static/stLogTests/test_log0_log_memsize_too_high.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log0_log_memsize_too_high.
 
 Ported from:
-tests/static/state_tests/stLogTests/log0_logMemsizeTooHighFiller.json
+state_tests/stLogTests/log0_logMemsizeTooHighFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log0_logMemsizeTooHighFiller.json"],
+    ["state_tests/stLogTests/log0_logMemsizeTooHighFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log0_log_memsize_too_high(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log0_log_memsize_too_high."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,53 +43,49 @@ def test_log0_log_memsize_too_high(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x6573BB447199FC94C98AD0F26068653C70DA4044,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG0(
+            offset=0x1,
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG0(
-                offset=0x1,
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6573bb447199fc94c98ad0f26068653c70da4044"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log0_log_memsize_zero.py b/tests/ported_static/stLogTests/test_log0_log_memsize_zero.py
index 316978b9c28..c65a16813a5 100644
--- a/tests/ported_static/stLogTests/test_log0_log_memsize_zero.py
+++ b/tests/ported_static/stLogTests/test_log0_log_memsize_zero.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log0_log_memsize_zero.
 
 Ported from:
-tests/static/state_tests/stLogTests/log0_logMemsizeZeroFiller.json
+state_tests/stLogTests/log0_logMemsizeZeroFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log0_logMemsizeZeroFiller.json"],
+    ["state_tests/stLogTests/log0_logMemsizeZeroFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log0_log_memsize_zero(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log0_log_memsize_zero."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,52 +43,46 @@ def test_log0_log_memsize_zero(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x2F70A6BCEE18358A07F12FF4630E0A802D8C293A,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 1 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG0(offset=0x1, size=0x0)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG0(offset=0x1, size=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2f70a6bcee18358a07f12ff4630e0a802d8c293a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log0_non_empty_mem.py b/tests/ported_static/stLogTests/test_log0_non_empty_mem.py
index 8cb2277b354..ade885f9145 100644
--- a/tests/ported_static/stLogTests/test_log0_non_empty_mem.py
+++ b/tests/ported_static/stLogTests/test_log0_non_empty_mem.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log0_non_empty_mem.
 
 Ported from:
-tests/static/state_tests/stLogTests/log0_nonEmptyMemFiller.json
+state_tests/stLogTests/log0_nonEmptyMemFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log0_nonEmptyMemFiller.json"],
+    ["state_tests/stLogTests/log0_nonEmptyMemFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log0_non_empty_mem(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log0_non_empty_mem."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,52 +43,46 @@ def test_log0_non_empty_mem(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x86BB6680BEC59591FA113B66365D1BF87A4C6910,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG0 0 32) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.LOG0(offset=0x0, size=0x20)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.LOG0(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x86bb6680bec59591fa113b66365d1bf87a4c6910"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log0_non_empty_mem_log_mem_size1.py b/tests/ported_static/stLogTests/test_log0_non_empty_mem_log_mem_size1.py
index b905b343ffb..30dbc528cf9 100644
--- a/tests/ported_static/stLogTests/test_log0_non_empty_mem_log_mem_size1.py
+++ b/tests/ported_static/stLogTests/test_log0_non_empty_mem_log_mem_size1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log0_non_empty_mem_log_mem_size1.
 
 Ported from:
-tests/static/state_tests/stLogTests/log0_nonEmptyMem_logMemSize1Filler.json
+state_tests/stLogTests/log0_nonEmptyMem_logMemSize1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stLogTests/log0_nonEmptyMem_logMemSize1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stLogTests/log0_nonEmptyMem_logMemSize1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_log0_non_empty_mem_log_mem_size1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log0_non_empty_mem_log_mem_size1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,52 +43,46 @@ def test_log0_non_empty_mem_log_mem_size1(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG0(offset=0x0, size=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 0 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG0(offset=0x0, size=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x02da68e115cd98f7d70e0b7cfabe76581fd2d667"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x2DA68E115CD98F7D70E0B7CFABE76581FD2D667,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=2100000,
+        value=0x200B20,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log0_non_empty_mem_log_mem_size1_log_mem_start31.py b/tests/ported_static/stLogTests/test_log0_non_empty_mem_log_mem_size1_log_mem_start31.py
index dd55d2cf86b..588dc0232c1 100644
--- a/tests/ported_static/stLogTests/test_log0_non_empty_mem_log_mem_size1_log_mem_start31.py
+++ b/tests/ported_static/stLogTests/test_log0_non_empty_mem_log_mem_size1_log_mem_start31.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_log0_non_empty_mem_log_mem_size1_log_mem_start31.
 
 Ported from:
-tests/static/state_tests/stLogTests
-log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+state_tests/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json",  # noqa: E501
+        "state_tests/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_log0_non_empty_mem_log_mem_size1_log_mem_start31(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log0_non_empty_mem_log_mem_size1_log_mem_start31."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,52 +45,46 @@ def test_log0_non_empty_mem_log_mem_size1_log_mem_start31(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x897FEE72AFB437BE678EE00C486726DA08ADB887,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 31 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG0(offset=0x1F, size=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG0(offset=0x1F, size=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x897fee72afb437be678ee00c486726da08adb887"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log1_caller.py b/tests/ported_static/stLogTests/test_log1_caller.py
index 426941af6db..1047550d155 100644
--- a/tests/ported_static/stLogTests/test_log1_caller.py
+++ b/tests/ported_static/stLogTests/test_log1_caller.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log1_caller.
 
 Ported from:
-tests/static/state_tests/stLogTests/log1_CallerFiller.json
+state_tests/stLogTests/log1_CallerFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log1_CallerFiller.json"],
+    ["state_tests/stLogTests/log1_CallerFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log1_caller(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log1_caller."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,49 +43,43 @@ def test_log1_caller(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x488E90E8584A9B411FD53CFBB85544DE674BB24F,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE8 0 0xff) (LOG1 0 32 (CALLER)) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xFF)
+        + Op.LOG1(offset=0x0, size=0x20, topic_1=Op.CALLER)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xFF)
-            + Op.LOG1(offset=0x0, size=0x20, topic_1=Op.CALLER)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x488e90e8584a9b411fd53cfbb85544de674bb24f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log1_empty_mem.py b/tests/ported_static/stLogTests/test_log1_empty_mem.py
index 0833332a746..c4a3eac61c4 100644
--- a/tests/ported_static/stLogTests/test_log1_empty_mem.py
+++ b/tests/ported_static/stLogTests/test_log1_empty_mem.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log1_empty_mem.
 
 Ported from:
-tests/static/state_tests/stLogTests/log1_emptyMemFiller.json
+state_tests/stLogTests/log1_emptyMemFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log1_emptyMemFiller.json"],
+    ["state_tests/stLogTests/log1_emptyMemFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log1_empty_mem(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log1_empty_mem."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,45 +43,41 @@ def test_log1_empty_mem(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0xA86CBC14A38774A22B21CC067FF70DD74CC18E7F,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (LOG1 0 0 0) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG1(offset=0x0, size=0x0, topic_1=0x0) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.LOG1(offset=0x0, size=0x0, topic_1=0x0) + Op.STOP,
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa86cbc14a38774a22b21cc067ff70dd74cc18e7f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log1_log_mem_start_too_high.py b/tests/ported_static/stLogTests/test_log1_log_mem_start_too_high.py
index 1e91badcd90..cc40876e27e 100644
--- a/tests/ported_static/stLogTests/test_log1_log_mem_start_too_high.py
+++ b/tests/ported_static/stLogTests/test_log1_log_mem_start_too_high.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log1_log_mem_start_too_high.
 
 Ported from:
-tests/static/state_tests/stLogTests/log1_logMemStartTooHighFiller.json
+state_tests/stLogTests/log1_logMemStartTooHighFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log1_logMemStartTooHighFiller.json"],
+    ["state_tests/stLogTests/log1_logMemStartTooHighFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log1_log_mem_start_too_high(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log1_log_mem_start_too_high."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,50 @@ def test_log1_log_mem_start_too_high(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x2884BD4A36D3BF28249C493EEFC971380A638684,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG1(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=0x1,
+            topic_1=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG1(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=0x1,
-                topic_1=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2884bd4a36d3bf28249c493eefc971380a638684"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log1_log_memsize_too_high.py b/tests/ported_static/stLogTests/test_log1_log_memsize_too_high.py
index ed6da905a5d..22c8d411255 100644
--- a/tests/ported_static/stLogTests/test_log1_log_memsize_too_high.py
+++ b/tests/ported_static/stLogTests/test_log1_log_memsize_too_high.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log1_log_memsize_too_high.
 
 Ported from:
-tests/static/state_tests/stLogTests/log1_logMemsizeTooHighFiller.json
+state_tests/stLogTests/log1_logMemsizeTooHighFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log1_logMemsizeTooHighFiller.json"],
+    ["state_tests/stLogTests/log1_logMemsizeTooHighFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log1_log_memsize_too_high(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log1_log_memsize_too_high."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,50 @@ def test_log1_log_memsize_too_high(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x232172C10FC2B2CB5CCBC4349B5D177EB640EDC0,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG1(
+            offset=0x1,
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            topic_1=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG1(
-                offset=0x1,
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                topic_1=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x232172c10fc2b2cb5ccbc4349b5d177eb640edc0"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log1_log_memsize_zero.py b/tests/ported_static/stLogTests/test_log1_log_memsize_zero.py
index 0d504e5fafa..1c69477bcff 100644
--- a/tests/ported_static/stLogTests/test_log1_log_memsize_zero.py
+++ b/tests/ported_static/stLogTests/test_log1_log_memsize_zero.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log1_log_memsize_zero.
 
 Ported from:
-tests/static/state_tests/stLogTests/log1_logMemsizeZeroFiller.json
+state_tests/stLogTests/log1_logMemsizeZeroFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log1_logMemsizeZeroFiller.json"],
+    ["state_tests/stLogTests/log1_logMemsizeZeroFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log1_log_memsize_zero(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log1_log_memsize_zero."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,52 +43,46 @@ def test_log1_log_memsize_zero(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0xC1F290174E61D4F7F40C5E11677591C31E0F63C7,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 1 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG1(offset=0x1, size=0x0, topic_1=0x0)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG1(offset=0x1, size=0x0, topic_1=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc1f290174e61d4f7f40c5e11677591c31e0f63c7"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log1_max_topic.py b/tests/ported_static/stLogTests/test_log1_max_topic.py
index 284c5295e75..c53b2d36149 100644
--- a/tests/ported_static/stLogTests/test_log1_max_topic.py
+++ b/tests/ported_static/stLogTests/test_log1_max_topic.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log1_max_topic.
 
 Ported from:
-tests/static/state_tests/stLogTests/log1_MaxTopicFiller.json
+state_tests/stLogTests/log1_MaxTopicFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log1_MaxTopicFiller.json"],
+    ["state_tests/stLogTests/log1_MaxTopicFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log1_max_topic(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log1_max_topic."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,50 @@ def test_log1_max_topic(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0xFAA3ACCE157A3DEDD9D750DD925F6067D252752E,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 0 32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG1(
+            offset=0x0,
+            size=0x20,
+            topic_1=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG1(
-                offset=0x0,
-                size=0x20,
-                topic_1=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfaa3acce157a3dedd9d750dd925f6067d252752e"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log1_non_empty_mem.py b/tests/ported_static/stLogTests/test_log1_non_empty_mem.py
index b38d929018d..87119697c9c 100644
--- a/tests/ported_static/stLogTests/test_log1_non_empty_mem.py
+++ b/tests/ported_static/stLogTests/test_log1_non_empty_mem.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_log1_non_empty_mem.
 
 Ported from:
-tests/static/state_tests/stLogTests/log1_nonEmptyMemFiller.json
+state_tests/stLogTests/log1_nonEmptyMemFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log1_nonEmptyMemFiller.json"],
+    ["state_tests/stLogTests/log1_nonEmptyMemFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_log1_non_empty_mem(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_log1_non_empty_mem."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -45,52 +46,49 @@ def test_log1_non_empty_mem(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x6727EA02222B905F7708C2B4CB20898F34DFF1DD,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
+    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.LOG1(offset=0x0, size=0x20, topic_1=0x0)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
+        address=Address(0x6727EA02222B905F7708C2B4CB20898F34DFF1DD),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.LOG1(offset=0x0, size=0x20, topic_1=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=0x6727EA02222B905F7708C2B4CB20898F34DFF1DD,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6727ea02222b905f7708c2b4cb20898f34dff1dd"),  # noqa: E501
+        address=Address(0x1E5597B6168FE79952CB2DE7AF91C3449BC95BD4),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log1_non_empty_mem_log_mem_size1.py b/tests/ported_static/stLogTests/test_log1_non_empty_mem_log_mem_size1.py
index cd0ce79ab19..415c2cf396f 100644
--- a/tests/ported_static/stLogTests/test_log1_non_empty_mem_log_mem_size1.py
+++ b/tests/ported_static/stLogTests/test_log1_non_empty_mem_log_mem_size1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log1_non_empty_mem_log_mem_size1.
 
 Ported from:
-tests/static/state_tests/stLogTests/log1_nonEmptyMem_logMemSize1Filler.json
+state_tests/stLogTests/log1_nonEmptyMem_logMemSize1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stLogTests/log1_nonEmptyMem_logMemSize1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stLogTests/log1_nonEmptyMem_logMemSize1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_log1_non_empty_mem_log_mem_size1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log1_non_empty_mem_log_mem_size1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,52 +43,46 @@ def test_log1_non_empty_mem_log_mem_size1(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0xAA71C9D8F626B8430A90ADE1BC39F086C51A2E13,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 0 1 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG1(offset=0x0, size=0x1, topic_1=0x0)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG1(offset=0x0, size=0x1, topic_1=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xaa71c9d8f626b8430a90ade1bc39f086c51a2e13"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log1_non_empty_mem_log_mem_size1_log_mem_start31.py b/tests/ported_static/stLogTests/test_log1_non_empty_mem_log_mem_size1_log_mem_start31.py
index 23b6d7e431d..d459d004d50 100644
--- a/tests/ported_static/stLogTests/test_log1_non_empty_mem_log_mem_size1_log_mem_start31.py
+++ b/tests/ported_static/stLogTests/test_log1_non_empty_mem_log_mem_size1_log_mem_start31.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_log1_non_empty_mem_log_mem_size1_log_mem_start31.
 
 Ported from:
-tests/static/state_tests/stLogTests
-log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+state_tests/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json",  # noqa: E501
+        "state_tests/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_log1_non_empty_mem_log_mem_size1_log_mem_start31(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log1_non_empty_mem_log_mem_size1_log_mem_start31."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,52 +45,46 @@ def test_log1_non_empty_mem_log_mem_size1_log_mem_start31(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0xB0C981060788593ED6C8A538DE7CBDC696D8D76C,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 31 1 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG1(offset=0x1F, size=0x1, topic_1=0x0)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG1(offset=0x1F, size=0x1, topic_1=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb0c981060788593ed6c8a538de7cbdc696d8d76c"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log2_caller.py b/tests/ported_static/stLogTests/test_log2_caller.py
index 150c16fa601..f719f43f081 100644
--- a/tests/ported_static/stLogTests/test_log2_caller.py
+++ b/tests/ported_static/stLogTests/test_log2_caller.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log2_caller.
 
 Ported from:
-tests/static/state_tests/stLogTests/log2_CallerFiller.json
+state_tests/stLogTests/log2_CallerFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log2_CallerFiller.json"],
+    ["state_tests/stLogTests/log2_CallerFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log2_caller(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log2_caller."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,49 +43,43 @@ def test_log2_caller(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x861CCCBD560D81A33AAC05190E986540663C6BBA,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE8 0 0xff) (LOG2 0 32 0 (CALLER) ) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xFF)
+        + Op.LOG2(offset=0x0, size=0x20, topic_1=0x0, topic_2=Op.CALLER)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xFF)
-            + Op.LOG2(offset=0x0, size=0x20, topic_1=0x0, topic_2=Op.CALLER)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x861cccbd560d81a33aac05190e986540663c6bba"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log2_empty_mem.py b/tests/ported_static/stLogTests/test_log2_empty_mem.py
index 5ce625d4a3a..1413a36e56d 100644
--- a/tests/ported_static/stLogTests/test_log2_empty_mem.py
+++ b/tests/ported_static/stLogTests/test_log2_empty_mem.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log2_empty_mem.
 
 Ported from:
-tests/static/state_tests/stLogTests/log2_emptyMemFiller.json
+state_tests/stLogTests/log2_emptyMemFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log2_emptyMemFiller.json"],
+    ["state_tests/stLogTests/log2_emptyMemFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log2_empty_mem(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log2_empty_mem."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,45 +43,41 @@ def test_log2_empty_mem(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0xE0A9386910935A6148822DDB2A8361DF15EF268F,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (LOG2 0 0 0 0) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG2(offset=0x0, size=0x0, topic_1=0x0, topic_2=0x0) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.LOG2(offset=0x0, size=0x0, topic_1=0x0, topic_2=0x0) + Op.STOP,
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe0a9386910935a6148822ddb2a8361df15ef268f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log2_log_mem_start_too_high.py b/tests/ported_static/stLogTests/test_log2_log_mem_start_too_high.py
index 6b2fdd17e70..b3e9f3ea501 100644
--- a/tests/ported_static/stLogTests/test_log2_log_mem_start_too_high.py
+++ b/tests/ported_static/stLogTests/test_log2_log_mem_start_too_high.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log2_log_mem_start_too_high.
 
 Ported from:
-tests/static/state_tests/stLogTests/log2_logMemStartTooHighFiller.json
+state_tests/stLogTests/log2_logMemStartTooHighFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log2_logMemStartTooHighFiller.json"],
+    ["state_tests/stLogTests/log2_logMemStartTooHighFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log2_log_mem_start_too_high(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log2_log_mem_start_too_high."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,55 +43,51 @@ def test_log2_log_mem_start_too_high(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x9C6A28DAEC9E2AF2FA5C362EEDC028ACD207E63B,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG2(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=0x1,
+            topic_1=0x0,
+            topic_2=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG2(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=0x1,
-                topic_1=0x0,
-                topic_2=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9c6a28daec9e2af2fa5c362eedc028acd207e63b"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log2_log_memsize_too_high.py b/tests/ported_static/stLogTests/test_log2_log_memsize_too_high.py
index aab2189a2f3..2e03f0322f3 100644
--- a/tests/ported_static/stLogTests/test_log2_log_memsize_too_high.py
+++ b/tests/ported_static/stLogTests/test_log2_log_memsize_too_high.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log2_log_memsize_too_high.
 
 Ported from:
-tests/static/state_tests/stLogTests/log2_logMemsizeTooHighFiller.json
+state_tests/stLogTests/log2_logMemsizeTooHighFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log2_logMemsizeTooHighFiller.json"],
+    ["state_tests/stLogTests/log2_logMemsizeTooHighFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log2_log_memsize_too_high(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log2_log_memsize_too_high."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,55 +43,51 @@ def test_log2_log_memsize_too_high(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x3BAD71F49AD0CABDA27D388877A6CF157E9A3471,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG2(
+            offset=0x1,
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            topic_1=0x0,
+            topic_2=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG2(
-                offset=0x1,
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                topic_1=0x0,
-                topic_2=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3bad71f49ad0cabda27d388877a6cf157e9a3471"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log2_log_memsize_zero.py b/tests/ported_static/stLogTests/test_log2_log_memsize_zero.py
index 7301b8369f6..e8dcfaf31d4 100644
--- a/tests/ported_static/stLogTests/test_log2_log_memsize_zero.py
+++ b/tests/ported_static/stLogTests/test_log2_log_memsize_zero.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log2_log_memsize_zero.
 
 Ported from:
-tests/static/state_tests/stLogTests/log2_logMemsizeZeroFiller.json
+state_tests/stLogTests/log2_logMemsizeZeroFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log2_logMemsizeZeroFiller.json"],
+    ["state_tests/stLogTests/log2_logMemsizeZeroFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log2_log_memsize_zero(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log2_log_memsize_zero."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,52 +43,46 @@ def test_log2_log_memsize_zero(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x5FE859FD0650FAB879E19018F55B76BE2E4C6391,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 1 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG2(offset=0x1, size=0x0, topic_1=0x0, topic_2=0x0)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG2(offset=0x1, size=0x0, topic_1=0x0, topic_2=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x5fe859fd0650fab879e19018f55b76be2e4c6391"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log2_max_topic.py b/tests/ported_static/stLogTests/test_log2_max_topic.py
index 346a48cd66c..b75f87756b4 100644
--- a/tests/ported_static/stLogTests/test_log2_max_topic.py
+++ b/tests/ported_static/stLogTests/test_log2_max_topic.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log2_max_topic.
 
 Ported from:
-tests/static/state_tests/stLogTests/log2_MaxTopicFiller.json
+state_tests/stLogTests/log2_MaxTopicFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log2_MaxTopicFiller.json"],
+    ["state_tests/stLogTests/log2_MaxTopicFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log2_max_topic(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log2_max_topic."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,57 +43,51 @@ def test_log2_max_topic(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x317504258A7AACAC178DA9B86E047C40C8A0A15B,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 0 32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG2(
+            offset=0x0,
+            size=0x20,
+            topic_1=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            topic_2=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG2(
-                offset=0x0,
-                size=0x20,
-                topic_1=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                topic_2=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x317504258a7aacac178da9b86e047c40c8a0a15b"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log2_non_empty_mem.py b/tests/ported_static/stLogTests/test_log2_non_empty_mem.py
index 710341c2f1e..2f1e7cd061b 100644
--- a/tests/ported_static/stLogTests/test_log2_non_empty_mem.py
+++ b/tests/ported_static/stLogTests/test_log2_non_empty_mem.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log2_non_empty_mem.
 
 Ported from:
-tests/static/state_tests/stLogTests/log2_nonEmptyMemFiller.json
+state_tests/stLogTests/log2_nonEmptyMemFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log2_nonEmptyMemFiller.json"],
+    ["state_tests/stLogTests/log2_nonEmptyMemFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log2_non_empty_mem(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log2_non_empty_mem."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,52 +43,46 @@ def test_log2_non_empty_mem(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0xFD7C64173AC47172BBAED3CC40C7ECCEE3BBE114,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG2 0 32 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.LOG2(offset=0x0, size=0x20, topic_1=0x0, topic_2=0x0)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.LOG2(offset=0x0, size=0x20, topic_1=0x0, topic_2=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfd7c64173ac47172bbaed3cc40c7eccee3bbe114"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log2_non_empty_mem_log_mem_size1.py b/tests/ported_static/stLogTests/test_log2_non_empty_mem_log_mem_size1.py
index d723bc6433e..21c251780cd 100644
--- a/tests/ported_static/stLogTests/test_log2_non_empty_mem_log_mem_size1.py
+++ b/tests/ported_static/stLogTests/test_log2_non_empty_mem_log_mem_size1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log2_non_empty_mem_log_mem_size1.
 
 Ported from:
-tests/static/state_tests/stLogTests/log2_nonEmptyMem_logMemSize1Filler.json
+state_tests/stLogTests/log2_nonEmptyMem_logMemSize1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stLogTests/log2_nonEmptyMem_logMemSize1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stLogTests/log2_nonEmptyMem_logMemSize1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_log2_non_empty_mem_log_mem_size1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log2_non_empty_mem_log_mem_size1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,52 +43,46 @@ def test_log2_non_empty_mem_log_mem_size1(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x9B06D70A66BB79592EDCFA38DA878F8610EBC1A8,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 0 1 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG2(offset=0x0, size=0x1, topic_1=0x0, topic_2=0x0)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG2(offset=0x0, size=0x1, topic_1=0x0, topic_2=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9b06d70a66bb79592edcfa38da878f8610ebc1a8"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log2_non_empty_mem_log_mem_size1_log_mem_start31.py b/tests/ported_static/stLogTests/test_log2_non_empty_mem_log_mem_size1_log_mem_start31.py
index 76f07953d99..d717f6e86ee 100644
--- a/tests/ported_static/stLogTests/test_log2_non_empty_mem_log_mem_size1_log_mem_start31.py
+++ b/tests/ported_static/stLogTests/test_log2_non_empty_mem_log_mem_size1_log_mem_start31.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_log2_non_empty_mem_log_mem_size1_log_mem_start31.
 
 Ported from:
-tests/static/state_tests/stLogTests
-log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+state_tests/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json",  # noqa: E501
+        "state_tests/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_log2_non_empty_mem_log_mem_size1_log_mem_start31(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log2_non_empty_mem_log_mem_size1_log_mem_start31."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,52 +45,46 @@ def test_log2_non_empty_mem_log_mem_size1_log_mem_start31(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x54972C7257A6C4CDC7C3C144E8CCB3D8EB7AFE19,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 31 1 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG2(offset=0x1F, size=0x1, topic_1=0x0, topic_2=0x0)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG2(offset=0x1F, size=0x1, topic_1=0x0, topic_2=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x54972c7257a6c4cdc7c3c144e8ccb3d8eb7afe19"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log3_caller.py b/tests/ported_static/stLogTests/test_log3_caller.py
index 427203d4300..8c7d121b848 100644
--- a/tests/ported_static/stLogTests/test_log3_caller.py
+++ b/tests/ported_static/stLogTests/test_log3_caller.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log3_caller.
 
 Ported from:
-tests/static/state_tests/stLogTests/log3_CallerFiller.json
+state_tests/stLogTests/log3_CallerFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log3_CallerFiller.json"],
+    ["state_tests/stLogTests/log3_CallerFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log3_caller(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log3_caller."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,55 +43,45 @@ def test_log3_caller(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x6C5DA6457F756A77C392C72FE884F7F650428AEF,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE8 0 0xff) (LOG3 0 32 0 0 (CALLER) ) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xFF)
+        + Op.LOG3(
+            offset=0x0, size=0x20, topic_1=0x0, topic_2=0x0, topic_3=Op.CALLER
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xFF)
-            + Op.LOG3(
-                offset=0x0,
-                size=0x20,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=Op.CALLER,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6c5da6457f756a77c392c72fe884f7f650428aef"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log3_empty_mem.py b/tests/ported_static/stLogTests/test_log3_empty_mem.py
index ec29bc10bcc..9f8d986475d 100644
--- a/tests/ported_static/stLogTests/test_log3_empty_mem.py
+++ b/tests/ported_static/stLogTests/test_log3_empty_mem.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log3_empty_mem.
 
 Ported from:
-tests/static/state_tests/stLogTests/log3_emptyMemFiller.json
+state_tests/stLogTests/log3_emptyMemFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log3_emptyMemFiller.json"],
+    ["state_tests/stLogTests/log3_emptyMemFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log3_empty_mem(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log3_empty_mem."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,50 +43,44 @@ def test_log3_empty_mem(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x7314CC13D5F8CF58DB63F7C590A16C8CA956B249,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (LOG3 0 0 0 0 0) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG3(
+            offset=0x0, size=0x0, topic_1=0x0, topic_2=0x0, topic_3=0x0
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.LOG3(
-                offset=0x0, size=0x0, topic_1=0x0, topic_2=0x0, topic_3=0x0
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7314cc13d5f8cf58db63f7c590a16c8ca956b249"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log3_log_mem_start_too_high.py b/tests/ported_static/stLogTests/test_log3_log_mem_start_too_high.py
index acb6c5ea478..c0b58437f75 100644
--- a/tests/ported_static/stLogTests/test_log3_log_mem_start_too_high.py
+++ b/tests/ported_static/stLogTests/test_log3_log_mem_start_too_high.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log3_log_mem_start_too_high.
 
 Ported from:
-tests/static/state_tests/stLogTests/log3_logMemStartTooHighFiller.json
+state_tests/stLogTests/log3_logMemStartTooHighFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log3_logMemStartTooHighFiller.json"],
+    ["state_tests/stLogTests/log3_logMemStartTooHighFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log3_log_mem_start_too_high(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log3_log_mem_start_too_high."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,52 @@ def test_log3_log_mem_start_too_high(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG3(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=0x1,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG3(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=0x1,
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1034f91c93da34534eff3f8efa3a807a417e2496"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x1034F91C93DA34534EFF3F8EFA3A807A417E2496,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log3_log_memsize_too_high.py b/tests/ported_static/stLogTests/test_log3_log_memsize_too_high.py
index 31e12f95d54..b41f6cb0b79 100644
--- a/tests/ported_static/stLogTests/test_log3_log_memsize_too_high.py
+++ b/tests/ported_static/stLogTests/test_log3_log_memsize_too_high.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log3_log_memsize_too_high.
 
 Ported from:
-tests/static/state_tests/stLogTests/log3_logMemsizeTooHighFiller.json
+state_tests/stLogTests/log3_logMemsizeTooHighFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log3_logMemsizeTooHighFiller.json"],
+    ["state_tests/stLogTests/log3_logMemsizeTooHighFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log3_log_memsize_too_high(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log3_log_memsize_too_high."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,52 @@ def test_log3_log_memsize_too_high(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x9C9665291C53FC348FC97C4ACA92EA13459C8367,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG3(
+            offset=0x1,
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG3(
-                offset=0x1,
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9c9665291c53fc348fc97c4aca92ea13459c8367"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log3_log_memsize_zero.py b/tests/ported_static/stLogTests/test_log3_log_memsize_zero.py
index 81c24a5fbed..55ea2718000 100644
--- a/tests/ported_static/stLogTests/test_log3_log_memsize_zero.py
+++ b/tests/ported_static/stLogTests/test_log3_log_memsize_zero.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log3_log_memsize_zero.
 
 Ported from:
-tests/static/state_tests/stLogTests/log3_logMemsizeZeroFiller.json
+state_tests/stLogTests/log3_logMemsizeZeroFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log3_logMemsizeZeroFiller.json"],
+    ["state_tests/stLogTests/log3_logMemsizeZeroFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log3_log_memsize_zero(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log3_log_memsize_zero."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,46 @@ def test_log3_log_memsize_zero(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x561CEB099A0D44D31649D7270095033C4003881F,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 1 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG3(offset=0x1, size=0x0, topic_1=0x0, topic_2=0x0, topic_3=0x0)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG3(
-                offset=0x1, size=0x0, topic_1=0x0, topic_2=0x0, topic_3=0x0
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x561ceb099a0d44d31649d7270095033c4003881f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log3_max_topic.py b/tests/ported_static/stLogTests/test_log3_max_topic.py
index a0455dd42c7..4b3acca45b9 100644
--- a/tests/ported_static/stLogTests/test_log3_max_topic.py
+++ b/tests/ported_static/stLogTests/test_log3_max_topic.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log3_max_topic.
 
 Ported from:
-tests/static/state_tests/stLogTests/log3_MaxTopicFiller.json
+state_tests/stLogTests/log3_MaxTopicFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log3_MaxTopicFiller.json"],
+    ["state_tests/stLogTests/log3_MaxTopicFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log3_max_topic(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log3_max_topic."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,58 +43,52 @@ def test_log3_max_topic(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x3105241BE1236A8BD2D48B82BDD4DA7C7FCEC2D7,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 0 32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG3(
+            offset=0x0,
+            size=0x20,
+            topic_1=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            topic_2=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            topic_3=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG3(
-                offset=0x0,
-                size=0x20,
-                topic_1=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                topic_2=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                topic_3=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3105241be1236a8bd2d48b82bdd4da7c7fcec2d7"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log3_non_empty_mem.py b/tests/ported_static/stLogTests/test_log3_non_empty_mem.py
index a6dcdcc9c9b..3310575f7e3 100644
--- a/tests/ported_static/stLogTests/test_log3_non_empty_mem.py
+++ b/tests/ported_static/stLogTests/test_log3_non_empty_mem.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log3_non_empty_mem.
 
 Ported from:
-tests/static/state_tests/stLogTests/log3_nonEmptyMemFiller.json
+state_tests/stLogTests/log3_nonEmptyMemFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log3_nonEmptyMemFiller.json"],
+    ["state_tests/stLogTests/log3_nonEmptyMemFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log3_non_empty_mem(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log3_non_empty_mem."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,46 @@ def test_log3_non_empty_mem(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0xF9578A6384BFFF36932A673BB3B0A9B92290E65C,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG3 0 32 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.LOG3(offset=0x0, size=0x20, topic_1=0x0, topic_2=0x0, topic_3=0x0)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.LOG3(
-                offset=0x0, size=0x20, topic_1=0x0, topic_2=0x0, topic_3=0x0
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf9578a6384bfff36932a673bb3b0a9b92290e65c"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log3_non_empty_mem_log_mem_size1.py b/tests/ported_static/stLogTests/test_log3_non_empty_mem_log_mem_size1.py
index 853e10c4e24..76f639fe3f2 100644
--- a/tests/ported_static/stLogTests/test_log3_non_empty_mem_log_mem_size1.py
+++ b/tests/ported_static/stLogTests/test_log3_non_empty_mem_log_mem_size1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log3_non_empty_mem_log_mem_size1.
 
 Ported from:
-tests/static/state_tests/stLogTests/log3_nonEmptyMem_logMemSize1Filler.json
+state_tests/stLogTests/log3_nonEmptyMem_logMemSize1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stLogTests/log3_nonEmptyMem_logMemSize1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stLogTests/log3_nonEmptyMem_logMemSize1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_log3_non_empty_mem_log_mem_size1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log3_non_empty_mem_log_mem_size1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,54 +43,46 @@ def test_log3_non_empty_mem_log_mem_size1(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0xE0885D29735CC94D2CF68DA45B9EC5079C7102CC,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 0 1 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG3(offset=0x0, size=0x1, topic_1=0x0, topic_2=0x0, topic_3=0x0)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG3(
-                offset=0x0, size=0x1, topic_1=0x0, topic_2=0x0, topic_3=0x0
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe0885d29735cc94d2cf68da45b9ec5079c7102cc"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log3_non_empty_mem_log_mem_size1_log_mem_start31.py b/tests/ported_static/stLogTests/test_log3_non_empty_mem_log_mem_size1_log_mem_start31.py
index 5ed4848cfdf..42ce8374089 100644
--- a/tests/ported_static/stLogTests/test_log3_non_empty_mem_log_mem_size1_log_mem_start31.py
+++ b/tests/ported_static/stLogTests/test_log3_non_empty_mem_log_mem_size1_log_mem_start31.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_log3_non_empty_mem_log_mem_size1_log_mem_start31.
 
 Ported from:
-tests/static/state_tests/stLogTests
-log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+state_tests/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json",  # noqa: E501
+        "state_tests/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_log3_non_empty_mem_log_mem_size1_log_mem_start31(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log3_non_empty_mem_log_mem_size1_log_mem_start31."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,54 +45,46 @@ def test_log3_non_empty_mem_log_mem_size1_log_mem_start31(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG3(
-                offset=0x1F, size=0x1, topic_1=0x0, topic_2=0x0, topic_3=0x0
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 31 1 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG3(offset=0x1F, size=0x1, topic_1=0x0, topic_2=0x0, topic_3=0x0)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x14fa8bbd322a53ad4dab974aef0df9eaa219f627"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x14FA8BBD322A53AD4DAB974AEF0DF9EAA219F627,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log3_pc.py b/tests/ported_static/stLogTests/test_log3_pc.py
index 94bed1e469f..7b62c047c5d 100644
--- a/tests/ported_static/stLogTests/test_log3_pc.py
+++ b/tests/ported_static/stLogTests/test_log3_pc.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log3_pc.
 
 Ported from:
-tests/static/state_tests/stLogTests/log3_PCFiller.json
+state_tests/stLogTests/log3_PCFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log3_PCFiller.json"],
+    ["state_tests/stLogTests/log3_PCFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log3_pc(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log3_pc."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,55 +43,45 @@ def test_log3_pc(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x2D74CBAE3F7951CF201441F09537705A05E5290C,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE8 0 0xff) (LOG3 0 32 (PC) (PC) (PC) ) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xFF)
+        + Op.LOG3(
+            offset=0x0, size=0x20, topic_1=Op.PC, topic_2=Op.PC, topic_3=Op.PC
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xFF)
-            + Op.LOG3(
-                offset=0x0,
-                size=0x20,
-                topic_1=Op.PC,
-                topic_2=Op.PC,
-                topic_3=Op.PC,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2d74cbae3f7951cf201441f09537705a05e5290c"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log4_caller.py b/tests/ported_static/stLogTests/test_log4_caller.py
index 6ab3419b408..60556c375ad 100644
--- a/tests/ported_static/stLogTests/test_log4_caller.py
+++ b/tests/ported_static/stLogTests/test_log4_caller.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log4_caller.
 
 Ported from:
-tests/static/state_tests/stLogTests/log4_CallerFiller.json
+state_tests/stLogTests/log4_CallerFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log4_CallerFiller.json"],
+    ["state_tests/stLogTests/log4_CallerFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log4_caller(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log4_caller."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,50 @@ def test_log4_caller(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x3AAC40E63F4E85B4F222671FB5691C8A4FDFB3DE,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE8 0 0xff) (LOG4 0 32 0 0 0 (CALLER) ) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xFF)
+        + Op.LOG4(
+            offset=0x0,
+            size=0x20,
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+            topic_4=Op.CALLER,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xFF)
-            + Op.LOG4(
-                offset=0x0,
-                size=0x20,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-                topic_4=Op.CALLER,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3aac40e63f4e85b4f222671fb5691c8a4fdfb3de"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log4_empty_mem.py b/tests/ported_static/stLogTests/test_log4_empty_mem.py
index 83b4c8d463d..d1b6ecc5d10 100644
--- a/tests/ported_static/stLogTests/test_log4_empty_mem.py
+++ b/tests/ported_static/stLogTests/test_log4_empty_mem.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log4_empty_mem.
 
 Ported from:
-tests/static/state_tests/stLogTests/log4_emptyMemFiller.json
+state_tests/stLogTests/log4_emptyMemFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log4_emptyMemFiller.json"],
+    ["state_tests/stLogTests/log4_emptyMemFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log4_empty_mem(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log4_empty_mem."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,55 +43,49 @@ def test_log4_empty_mem(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x4D1560AF4D4E7F6B2B987D349D4B631048EBB581,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (LOG4 0 0 0 0 0 0) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG4(
+            offset=0x0,
+            size=0x0,
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+            topic_4=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.LOG4(
-                offset=0x0,
-                size=0x0,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-                topic_4=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4d1560af4d4e7f6b2b987d349d4b631048ebb581"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log4_log_mem_start_too_high.py b/tests/ported_static/stLogTests/test_log4_log_mem_start_too_high.py
index bc98c950725..ecb1fe7f51d 100644
--- a/tests/ported_static/stLogTests/test_log4_log_mem_start_too_high.py
+++ b/tests/ported_static/stLogTests/test_log4_log_mem_start_too_high.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log4_log_mem_start_too_high.
 
 Ported from:
-tests/static/state_tests/stLogTests/log4_logMemStartTooHighFiller.json
+state_tests/stLogTests/log4_logMemStartTooHighFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log4_logMemStartTooHighFiller.json"],
+    ["state_tests/stLogTests/log4_logMemStartTooHighFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log4_log_mem_start_too_high(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log4_log_mem_start_too_high."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,57 +43,53 @@ def test_log4_log_mem_start_too_high(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x57D85807540DA11B345D5909E74550D27E116302,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG4(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=0x1,
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+            topic_4=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG4(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=0x1,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-                topic_4=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x57d85807540da11b345d5909e74550d27e116302"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log4_log_memsize_too_high.py b/tests/ported_static/stLogTests/test_log4_log_memsize_too_high.py
index 391481d3fe0..78ac2beb50b 100644
--- a/tests/ported_static/stLogTests/test_log4_log_memsize_too_high.py
+++ b/tests/ported_static/stLogTests/test_log4_log_memsize_too_high.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log4_log_memsize_too_high.
 
 Ported from:
-tests/static/state_tests/stLogTests/log4_logMemsizeTooHighFiller.json
+state_tests/stLogTests/log4_logMemsizeTooHighFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log4_logMemsizeTooHighFiller.json"],
+    ["state_tests/stLogTests/log4_logMemsizeTooHighFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log4_log_memsize_too_high(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log4_log_memsize_too_high."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,57 +43,53 @@ def test_log4_log_memsize_too_high(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x59E2F8FDF907D6E627FCAFD97606824CE1FE1E2A,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG4(
+            offset=0x1,
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+            topic_4=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG4(
-                offset=0x1,
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-                topic_4=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x59e2f8fdf907d6e627fcafd97606824ce1fe1e2a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log4_log_memsize_zero.py b/tests/ported_static/stLogTests/test_log4_log_memsize_zero.py
index a5e67b14e83..4049b43cc09 100644
--- a/tests/ported_static/stLogTests/test_log4_log_memsize_zero.py
+++ b/tests/ported_static/stLogTests/test_log4_log_memsize_zero.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log4_log_memsize_zero.
 
 Ported from:
-tests/static/state_tests/stLogTests/log4_logMemsizeZeroFiller.json
+state_tests/stLogTests/log4_logMemsizeZeroFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log4_logMemsizeZeroFiller.json"],
+    ["state_tests/stLogTests/log4_logMemsizeZeroFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log4_log_memsize_zero(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log4_log_memsize_zero."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,59 +43,53 @@ def test_log4_log_memsize_zero(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0xB03FD6E714A14074A17E2ECFD412E35B1DDB21E5,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 1 0 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG4(
+            offset=0x1,
+            size=0x0,
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+            topic_4=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG4(
-                offset=0x1,
-                size=0x0,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-                topic_4=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb03fd6e714a14074a17e2ecfd412e35b1ddb21e5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log4_max_topic.py b/tests/ported_static/stLogTests/test_log4_max_topic.py
index e2d6bb3859b..b8efc373d81 100644
--- a/tests/ported_static/stLogTests/test_log4_max_topic.py
+++ b/tests/ported_static/stLogTests/test_log4_max_topic.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log4_max_topic.
 
 Ported from:
-tests/static/state_tests/stLogTests/log4_MaxTopicFiller.json
+state_tests/stLogTests/log4_MaxTopicFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log4_MaxTopicFiller.json"],
+    ["state_tests/stLogTests/log4_MaxTopicFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log4_max_topic(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log4_max_topic."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,59 +43,53 @@ def test_log4_max_topic(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0xCCB217083DF3658F7F5BB3325D2368AC932ED83B,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 0 32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG4(
+            offset=0x0,
+            size=0x20,
+            topic_1=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            topic_2=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            topic_3=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            topic_4=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG4(
-                offset=0x0,
-                size=0x20,
-                topic_1=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                topic_2=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                topic_3=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                topic_4=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xccb217083df3658f7f5bb3325d2368ac932ed83b"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log4_non_empty_mem.py b/tests/ported_static/stLogTests/test_log4_non_empty_mem.py
index 5dc4139a23c..542de72a9fe 100644
--- a/tests/ported_static/stLogTests/test_log4_non_empty_mem.py
+++ b/tests/ported_static/stLogTests/test_log4_non_empty_mem.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log4_non_empty_mem.
 
 Ported from:
-tests/static/state_tests/stLogTests/log4_nonEmptyMemFiller.json
+state_tests/stLogTests/log4_nonEmptyMemFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log4_nonEmptyMemFiller.json"],
+    ["state_tests/stLogTests/log4_nonEmptyMemFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log4_non_empty_mem(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log4_non_empty_mem."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,59 +43,53 @@ def test_log4_non_empty_mem(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0xD78CA74FB91DC10B6315B23141F23FCE8317AB9A,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG4 0 32 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.LOG4(
+            offset=0x0,
+            size=0x20,
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+            topic_4=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.LOG4(
-                offset=0x0,
-                size=0x20,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-                topic_4=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd78ca74fb91dc10b6315b23141f23fce8317ab9a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log4_non_empty_mem_log_mem_size1.py b/tests/ported_static/stLogTests/test_log4_non_empty_mem_log_mem_size1.py
index bb086fe0399..63933ed45ad 100644
--- a/tests/ported_static/stLogTests/test_log4_non_empty_mem_log_mem_size1.py
+++ b/tests/ported_static/stLogTests/test_log4_non_empty_mem_log_mem_size1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log4_non_empty_mem_log_mem_size1.
 
 Ported from:
-tests/static/state_tests/stLogTests/log4_nonEmptyMem_logMemSize1Filler.json
+state_tests/stLogTests/log4_nonEmptyMem_logMemSize1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stLogTests/log4_nonEmptyMem_logMemSize1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stLogTests/log4_nonEmptyMem_logMemSize1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_log4_non_empty_mem_log_mem_size1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log4_non_empty_mem_log_mem_size1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,59 +43,53 @@ def test_log4_non_empty_mem_log_mem_size1(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0xA1BA9EDCB02902136B7A79A5C49409E244BC01C5,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 0 1 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG4(
+            offset=0x0,
+            size=0x1,
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+            topic_4=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG4(
-                offset=0x0,
-                size=0x1,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-                topic_4=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa1ba9edcb02902136b7a79a5c49409e244bc01c5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log4_non_empty_mem_log_mem_size1_log_mem_start31.py b/tests/ported_static/stLogTests/test_log4_non_empty_mem_log_mem_size1_log_mem_start31.py
index f8c5be8cf34..5d25ff48d5a 100644
--- a/tests/ported_static/stLogTests/test_log4_non_empty_mem_log_mem_size1_log_mem_start31.py
+++ b/tests/ported_static/stLogTests/test_log4_non_empty_mem_log_mem_size1_log_mem_start31.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_log4_non_empty_mem_log_mem_size1_log_mem_start31.
 
 Ported from:
-tests/static/state_tests/stLogTests
-log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+state_tests/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json",  # noqa: E501
+        "state_tests/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_log4_non_empty_mem_log_mem_size1_log_mem_start31(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log4_non_empty_mem_log_mem_size1_log_mem_start31."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,59 +45,53 @@ def test_log4_non_empty_mem_log_mem_size1_log_mem_start31(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x23886789BD30D62944A3475276B774A785CB3329,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 31 1 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG4(
+            offset=0x1F,
+            size=0x1,
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+            topic_4=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG4(
-                offset=0x1F,
-                size=0x1,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-                topic_4=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x23886789bd30d62944a3475276b774a785cb3329"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log4_pc.py b/tests/ported_static/stLogTests/test_log4_pc.py
index da1a93ff8d6..958493ee98a 100644
--- a/tests/ported_static/stLogTests/test_log4_pc.py
+++ b/tests/ported_static/stLogTests/test_log4_pc.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log4_pc.
 
 Ported from:
-tests/static/state_tests/stLogTests/log4_PCFiller.json
+state_tests/stLogTests/log4_PCFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/log4_PCFiller.json"],
+    ["state_tests/stLogTests/log4_PCFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log4_pc(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log4_pc."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,50 @@ def test_log4_pc(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x84861F45AE3E1AA4792A50F336696EFA9902C95B,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE8 0 0xff) (LOG4 0 32 (PC) (PC) (PC) (PC) ) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xFF)
+        + Op.LOG4(
+            offset=0x0,
+            size=0x20,
+            topic_1=Op.PC,
+            topic_2=Op.PC,
+            topic_3=Op.PC,
+            topic_4=Op.PC,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e5597b6168fe79952cb2de7af91c3449bc95bd4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xFF)
-            + Op.LOG4(
-                offset=0x0,
-                size=0x20,
-                topic_1=Op.PC,
-                topic_2=Op.PC,
-                topic_3=Op.PC,
-                topic_4=Op.PC,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x84861f45ae3e1aa4792a50f336696efa9902c95b"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stLogTests/test_log_in_oog_call.py b/tests/ported_static/stLogTests/test_log_in_oog_call.py
index 112910254e4..577c60f1347 100644
--- a/tests/ported_static/stLogTests/test_log_in_oog_call.py
+++ b/tests/ported_static/stLogTests/test_log_in_oog_call.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log_in_oog_call.
 
 Ported from:
-tests/static/state_tests/stLogTests/logInOOG_CallFiller.json
+state_tests/stLogTests/logInOOG_CallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stLogTests/logInOOG_CallFiller.json"],
+    ["state_tests/stLogTests/logInOOG_CallFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log_in_oog_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_log_in_oog_call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,47 +43,43 @@ def test_log_in_oog_call(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.LOG0(offset=0x0, size=0x20)
-            + Op.MLOAD(offset=0xFFFFFFFFFFFFFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (LOG0 0 32) (MLOAD 0xffffffffffffffff) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG0(offset=0x0, size=0x20)
+        + Op.MLOAD(offset=0xFFFFFFFFFFFFFFFF)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x69b6134b97e638b919a7089df82af74961e71ff8"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (CALL 100000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x69B6134B97E638B919A7089DF82AF74961E71FF8,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x825dcc9fbf5cff44e688bae15b79e8e11951be2a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemExpandingEIP150Calls/__init__.py b/tests/ported_static/stMemExpandingEIP150Calls/__init__.py
index 9457e5b4c62..2bfff1f8f58 100644
--- a/tests/ported_static/stMemExpandingEIP150Calls/__init__.py
+++ b/tests/ported_static/stMemExpandingEIP150Calls/__init__.py
@@ -1 +1 @@
-"""Tests ported from stMemExpandingEIP150Calls."""
+"""Ported static tests: stMemExpandingEIP150Calls."""  # noqa: N999
diff --git a/tests/ported_static/stMemExpandingEIP150Calls/test_call_and_callcode_consume_more_gas_then_transaction_has_with_mem_expanding_calls.py b/tests/ported_static/stMemExpandingEIP150Calls/test_call_and_callcode_consume_more_gas_then_transaction_has_with_mem_expanding_calls.py
index e4709bc1d9a..ff44e5b435b 100644
--- a/tests/ported_static/stMemExpandingEIP150Calls/test_call_and_callcode_consume_more_gas_then_transaction_has_with_mem_expanding_calls.py
+++ b/tests/ported_static/stMemExpandingEIP150Calls/test_call_and_callcode_consume_more_gas_then_transaction_has_with_mem_expanding_calls.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_and_callcode_consume_more_gas_then_transaction_has_with_mem_ex...
 
 Ported from:
-tests/static/state_tests/stMemExpandingEIP150Calls
-CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCallsFiller.json
+state_tests/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCallsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCallsFiller.json",  # noqa: E501
+        "state_tests/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCallsFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_and_callcode_consume_more_gas_then_transaction_has_with_mem_expand
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x8D19F2B0D2F5689C1771FBCA70476CA6E877A81EE15C3733DE87FAE38E5ABCEF
-    )
+    """Test_call_and_callcode_consume_more_gas_then_transaction_has_with_m..."""  # noqa: E501
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,55 +45,54 @@ def test_call_and_callcode_consume_more_gas_then_transaction_has_with_mem_expand
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0xA1F6E75A455896613053D45331763A07F4718969,
-                    value=0x0,
-                    args_offset=0xFF,
-                    args_size=0xFF,
-                    ret_offset=0xFF,
-                    ret_size=0xFF,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xA,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0xA1F6E75A455896613053D45331763A07F4718969,
-                    value=0x0,
-                    args_offset=0xFF,
-                    args_size=0xFF,
-                    ret_offset=0xFF,
-                    ret_size=0xFF,
-                ),
-            )
-        ),
+    # Source: hex
+    # 0x6012600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x12),
         nonce=0,
-        address=Address("0x346e4c3e54a808e0cad66173de0d81ff4d06babf"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: raw bytecode
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=0x12),
+    # Source: hex
+    # 0x5a60085560ff60ff60ff60ff600073<contract:0x1000000000000000000000000000000000000103>620927c0f160095560ff60ff60ff60ff600073<contract:0x1000000000000000000000000000000000000103>620927c0f2600a55  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr,
+                value=0x0,
+                args_offset=0xFF,
+                args_size=0xFF,
+                ret_offset=0xFF,
+                ret_size=0xFF,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xA,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=addr,
+                value=0x0,
+                args_offset=0xFF,
+                args_size=0xFF,
+                ret_offset=0xFF,
+                ret_size=0xFF,
+            ),
+        ),
         nonce=0,
-        address=Address("0xa1f6e75a455896613053d45331763a07f4718969"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 18, 8: 0x8D5B6, 9: 1, 10: 1}),
-        callee: Account(storage={0: 18}),
+        sender: Account(nonce=1),
+        target: Account(storage={0: 18, 8: 0x8D5B6, 9: 1, 10: 1}),
+        addr: Account(storage={0: 18}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemExpandingEIP150Calls/test_call_ask_more_gas_on_depth2_then_transaction_has_with_mem_expanding_calls.py b/tests/ported_static/stMemExpandingEIP150Calls/test_call_ask_more_gas_on_depth2_then_transaction_has_with_mem_expanding_calls.py
index 7f43b4aef84..e181c5c7f03 100644
--- a/tests/ported_static/stMemExpandingEIP150Calls/test_call_ask_more_gas_on_depth2_then_transaction_has_with_mem_expanding_calls.py
+++ b/tests/ported_static/stMemExpandingEIP150Calls/test_call_ask_more_gas_on_depth2_then_transaction_has_with_mem_expanding_calls.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_ask_more_gas_on_depth2_then_transaction_has_with_mem_expanding...
 
 Ported from:
-tests/static/state_tests/stMemExpandingEIP150Calls
-CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCallsFiller.json
+state_tests/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCallsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCallsFiller.json",  # noqa: E501
+        "state_tests/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCallsFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_ask_more_gas_on_depth2_then_transaction_has_with_mem_expanding_cal
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x8D19F2B0D2F5689C1771FBCA70476CA6E877A81EE15C3733DE87FAE38E5ABCEF
-    )
+    """Test_call_ask_more_gas_on_depth2_then_transaction_has_with_mem_expa..."""  # noqa: E501
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,63 +45,61 @@ def test_call_ask_more_gas_on_depth2_then_transaction_has_with_mem_expanding_cal
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.CALL(
-                    gas=0x30D40,
-                    address=0xA229D9EFD075227ED1E0EA0427045B5EE24DC40A,
-                    value=0x0,
-                    args_offset=0xFF,
-                    args_size=0xFF,
-                    ret_offset=0xFF,
-                    ret_size=0xFF,
-                ),
-            )
-        ),
+    # Source: hex
+    # 0x5a600855
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS),
         nonce=0,
-        address=Address("0x97442da68a5f2b1be1728c655c0f395cffb999cf"),  # noqa: E501
     )
-    # Source: raw bytecode
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x8, value=Op.GAS),
+    # Source: hex
+    # 0x5a60085560ff60ff60ff60ff600073<contract:0x1000000000000000000000000000000000000108>620927c0f1600955  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr,
+                value=0x0,
+                args_offset=0xFF,
+                args_size=0xFF,
+                ret_offset=0xFF,
+                ret_size=0xFF,
+            ),
+        ),
         nonce=0,
-        address=Address("0x9edefdfb5a11a6b30dba1bff8726f94f9d9e1232"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x9EDEFDFB5A11A6B30DBA1BFF8726F94F9D9E1232,
-                    value=0x0,
-                    args_offset=0xFF,
-                    args_size=0xFF,
-                    ret_offset=0xFF,
-                    ret_size=0xFF,
-                ),
-            )
+    # Source: hex
+    # 0x5a60085560ff60ff60ff60ff600073<contract:0x1000000000000000000000000000000000000107>62030d40f1600955  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.CALL(
+                gas=0x30D40,
+                address=addr_2,
+                value=0x0,
+                args_offset=0xFF,
+                args_size=0xFF,
+                ret_offset=0xFF,
+                ret_size=0xFF,
+            ),
         ),
         nonce=0,
-        address=Address("0xa229d9efd075227ed1e0ea0427045b5ee24dc40a"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={8: 0x8D5B6, 9: 1}),
-        callee: Account(storage={8: 0x2A1C7}),
-        callee_1: Account(storage={8: 0x30D3E, 9: 1}),
+        sender: Account(nonce=1),
+        target: Account(storage={8: 0x8D5B6, 9: 1}),
+        addr: Account(storage={8: 0x2A1C7}),
+        addr_2: Account(storage={8: 0x30D3E, 9: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemExpandingEIP150Calls/test_call_goes_oog_on_second_level2_with_mem_expanding_calls.py b/tests/ported_static/stMemExpandingEIP150Calls/test_call_goes_oog_on_second_level2_with_mem_expanding_calls.py
index 2e7cc8864f5..03fba477f8e 100644
--- a/tests/ported_static/stMemExpandingEIP150Calls/test_call_goes_oog_on_second_level2_with_mem_expanding_calls.py
+++ b/tests/ported_static/stMemExpandingEIP150Calls/test_call_goes_oog_on_second_level2_with_mem_expanding_calls.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_goes_oog_on_second_level2_with_mem_expanding_calls.
 
 Ported from:
-tests/static/state_tests/stMemExpandingEIP150Calls
-CallGoesOOGOnSecondLevel2WithMemExpandingCallsFiller.json
+state_tests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCallsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCallsFiller.json",  # noqa: E501
+        "state_tests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCallsFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_goes_oog_on_second_level2_with_mem_expanding_calls(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x0B51075BB33D347A23B516E327E1B71C54F63FAA192D1D94B62C76E0C26CF98A
-    )
+    """Test_call_goes_oog_on_second_level2_with_mem_expanding_calls."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A510000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,63 +45,63 @@ def test_call_goes_oog_on_second_level2_with_mem_expanding_calls(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0xC10A98222464B07008CEB5A0EC44ED49920ADDDA,
-                    value=0x0,
-                    args_offset=0xFF,
-                    args_size=0xFF,
-                    ret_offset=0xFF,
-                    ret_size=0xFF,
-                ),
-            )
-        ),
+    # Source: hex
+    # 0x5a6008555a6009555a600a55
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.SSTORE(key=0x9, value=Op.GAS)
+        + Op.SSTORE(key=0xA, value=Op.GAS),
         nonce=0,
-        address=Address("0x0700bb425d7d4c412ac658014015bd6c98652dc4"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.SSTORE(key=0x9, value=Op.GAS)
-            + Op.SSTORE(key=0xA, value=Op.GAS)
+    # Source: hex
+    # 0x5a60085560ff60ff60ff60ff600073<contract:0x1000000000000000000000000000000000000114>620927c0f1600955  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr,
+                value=0x0,
+                args_offset=0xFF,
+                args_size=0xFF,
+                ret_offset=0xFF,
+                ret_size=0xFF,
+            ),
         ),
         nonce=0,
-        address=Address("0x96983de02bfbcb5d0f4e0ee98fdde6d6f0c75fe0"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A510000)
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x96983DE02BFBCB5D0F4E0EE98FDDE6D6F0C75FE0,
-                    value=0x0,
-                    args_offset=0xFF,
-                    args_size=0xFF,
-                    ret_offset=0xFF,
-                    ret_size=0xFF,
-                ),
-            )
+    # Source: hex
+    # 0x5a60085560ff60ff60ff60ff600073<contract:0x1000000000000000000000000000000000000113>620927c0f1600955  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0xFF,
+                args_size=0xFF,
+                ret_offset=0xFF,
+                ret_size=0xFF,
+            ),
         ),
         nonce=0,
-        address=Address("0xc10a98222464b07008ceb5a0ec44ed49920addda"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=160000,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        target: Account(storage={}),
+        addr_2: Account(storage={}),
+        addr: Account(storage={}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemExpandingEIP150Calls/test_call_goes_oog_on_second_level_with_mem_expanding_calls.py b/tests/ported_static/stMemExpandingEIP150Calls/test_call_goes_oog_on_second_level_with_mem_expanding_calls.py
index b7d38caf03d..3c9a3facb41 100644
--- a/tests/ported_static/stMemExpandingEIP150Calls/test_call_goes_oog_on_second_level_with_mem_expanding_calls.py
+++ b/tests/ported_static/stMemExpandingEIP150Calls/test_call_goes_oog_on_second_level_with_mem_expanding_calls.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_goes_oog_on_second_level_with_mem_expanding_calls.
 
 Ported from:
-tests/static/state_tests/stMemExpandingEIP150Calls
-CallGoesOOGOnSecondLevelWithMemExpandingCallsFiller.json
+state_tests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCallsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCallsFiller.json",  # noqa: E501
+        "state_tests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCallsFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_goes_oog_on_second_level_with_mem_expanding_calls(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x8D19F2B0D2F5689C1771FBCA70476CA6E877A81EE15C3733DE87FAE38E5ABCEF
-    )
+    """Test_call_goes_oog_on_second_level_with_mem_expanding_calls."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,67 +45,64 @@ def test_call_goes_oog_on_second_level_with_mem_expanding_calls(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.POP(Op.CREATE(value=0x0, offset=0x0, size=0x0))
-            + Op.POP(Op.CREATE(value=0x0, offset=0x0, size=0x0))
-            + Op.SSTORE(key=0x9, value=Op.GAS)
-            + Op.SSTORE(key=0xA, value=Op.GAS)
-        ),
+    # Source: hex
+    # 0x5a600855600060006000f050600060006000f0505a6009555a600a55
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.POP(Op.CREATE(value=0x0, offset=0x0, size=0x0)) * 2
+        + Op.SSTORE(key=0x9, value=Op.GAS)
+        + Op.SSTORE(key=0xA, value=Op.GAS),
         nonce=0,
-        address=Address("0x2ef686162bebf2542147767d5be471976860cceb"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x2EF686162BEBF2542147767D5BE471976860CCEB,
-                    value=0x0,
-                    args_offset=0xFF,
-                    args_size=0xFF,
-                    ret_offset=0xFF,
-                    ret_size=0xFF,
-                ),
-            )
+    # Source: hex
+    # 0x5a60085560ff60ff60ff60ff600073<contract:0x1000000000000000000000000000000000000111>620927c0f1600955  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr,
+                value=0x0,
+                args_offset=0xFF,
+                args_size=0xFF,
+                ret_offset=0xFF,
+                ret_size=0xFF,
+            ),
         ),
         nonce=0,
-        address=Address("0xa27e20572430916b3d6772b27329cc460224904d"),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0xA27E20572430916B3D6772B27329CC460224904D,
-                    value=0x0,
-                    args_offset=0xFF,
-                    args_size=0xFF,
-                    ret_offset=0xFF,
-                    ret_size=0xFF,
-                ),
-            )
+    # Source: hex
+    # 0x5a60085560ff60ff60ff60ff600073<contract:0x1000000000000000000000000000000000000110>620927c0f1600955  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0xFF,
+                args_size=0xFF,
+                ret_offset=0xFF,
+                ret_size=0xFF,
+            ),
         ),
         nonce=0,
-        address=Address("0xaf229807016a538dfcdab92a53337de38178d40f"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=220000,
     )
 
     post = {
-        contract: Account(storage={8: 0x30956}),
+        sender: Account(nonce=1),
+        target: Account(storage={8: 0x30956}),
+        addr_2: Account(storage={}),
+        addr: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemExpandingEIP150Calls/test_create_and_gas_inside_create_with_mem_expanding_calls.py b/tests/ported_static/stMemExpandingEIP150Calls/test_create_and_gas_inside_create_with_mem_expanding_calls.py
index 5ce7ca3c991..705e9e760f9 100644
--- a/tests/ported_static/stMemExpandingEIP150Calls/test_create_and_gas_inside_create_with_mem_expanding_calls.py
+++ b/tests/ported_static/stMemExpandingEIP150Calls/test_create_and_gas_inside_create_with_mem_expanding_calls.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_create_and_gas_inside_create_with_mem_expanding_calls.
 
 Ported from:
-tests/static/state_tests/stMemExpandingEIP150Calls
-CreateAndGasInsideCreateWithMemExpandingCallsFiller.json
+state_tests/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCallsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCallsFiller.json",  # noqa: E501
+        "state_tests/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCallsFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_create_and_gas_inside_create_with_mem_expanding_calls(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_and_gas_inside_create_with_mem_expanding_calls."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,37 +47,35 @@ def test_create_and_gas_inside_create_with_mem_expanding_calls(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0xA, value=Op.GAS)
-            + Op.MSTORE(offset=0x0, value=0x5A60FD55)
-            + Op.SSTORE(
-                key=0xB, value=Op.CREATE(value=0x0, offset=0x1C, size=0x4)
-            )
-            + Op.SSTORE(key=0x9, value=Op.GAS)
-        ),
+    # Source: hex
+    # 0x5a600a55635a60fd556000526004601c6000f0600b555a600955
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0xA, value=Op.GAS)
+        + Op.MSTORE(offset=0x0, value=0x5A60FD55)
+        + Op.SSTORE(key=0xB, value=Op.CREATE(value=0x0, offset=0x1C, size=0x4))
+        + Op.SSTORE(key=0x9, value=Op.GAS),
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(
+        sender: Account(nonce=1),
+        contract_0: Account(
             storage={
                 9: 0x75596,
                 10: 0x8D5B6,
-                11: 0xF1ECF98489FA9ED60A664FC4998DB699CFA39D40,
+                11: compute_create_address(address=contract_0, nonce=0),
             },
+            nonce=1,
         ),
-        Address("0xf1ecf98489fa9ed60a664fc4998db699cfa39d40"): Account(
-            storage={253: 0x7E23D},
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={253: 0x7E23D}
         ),
     }
 
diff --git a/tests/ported_static/stMemExpandingEIP150Calls/test_delegate_call_on_eip_with_mem_expanding_calls.py b/tests/ported_static/stMemExpandingEIP150Calls/test_delegate_call_on_eip_with_mem_expanding_calls.py
index 9dcd7f71063..dec68916fab 100644
--- a/tests/ported_static/stMemExpandingEIP150Calls/test_delegate_call_on_eip_with_mem_expanding_calls.py
+++ b/tests/ported_static/stMemExpandingEIP150Calls/test_delegate_call_on_eip_with_mem_expanding_calls.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_delegate_call_on_eip_with_mem_expanding_calls.
 
 Ported from:
-tests/static/state_tests/stMemExpandingEIP150Calls
-DelegateCallOnEIPWithMemExpandingCallsFiller.json
+state_tests/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCallsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCallsFiller.json",  # noqa: E501
+        "state_tests/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCallsFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_delegate_call_on_eip_with_mem_expanding_calls(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x8D19F2B0D2F5689C1771FBCA70476CA6E877A81EE15C3733DE87FAE38E5ABCEF
-    )
+    """Test_delegate_call_on_eip_with_mem_expanding_calls."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,41 +45,41 @@ def test_delegate_call_on_eip_with_mem_expanding_calls(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.DELEGATECALL(
-                    gas=0x927C0,
-                    address=0xA1F6E75A455896613053D45331763A07F4718969,
-                    args_offset=0xFF,
-                    args_size=0xFF,
-                    ret_offset=0xFF,
-                    ret_size=0xFF,
-                ),
-            )
-        ),
+    # Source: hex
+    # 0x6012600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x12),
         nonce=0,
-        address=Address("0x3fc906a124d4054023be5dd8666ce29aa3712ccb"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=0x12),
+    # Source: hex
+    # 0x5a60085560ff60ff60ff60ff73<contract:0x1000000000000000000000000000000000000105>620927c0f4600955  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.DELEGATECALL(
+                gas=0x927C0,
+                address=addr,
+                args_offset=0xFF,
+                args_size=0xFF,
+                ret_offset=0xFF,
+                ret_size=0xFF,
+            ),
+        ),
         nonce=0,
-        address=Address("0xa1f6e75a455896613053d45331763a07f4718969"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 18, 8: 0x8D5B6, 9: 1}),
+        sender: Account(nonce=1),
+        target: Account(storage={0: 18, 8: 0x8D5B6, 9: 1}),
+        addr: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemExpandingEIP150Calls/test_execute_call_that_ask_more_gas_then_transaction_has_with_mem_expanding_calls.py b/tests/ported_static/stMemExpandingEIP150Calls/test_execute_call_that_ask_more_gas_then_transaction_has_with_mem_expanding_calls.py
index 1309a676307..0779b06c87b 100644
--- a/tests/ported_static/stMemExpandingEIP150Calls/test_execute_call_that_ask_more_gas_then_transaction_has_with_mem_expanding_calls.py
+++ b/tests/ported_static/stMemExpandingEIP150Calls/test_execute_call_that_ask_more_gas_then_transaction_has_with_mem_expanding_calls.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_execute_call_that_ask_more_gas_then_transaction_has_with_mem_expand...
 
 Ported from:
-tests/static/state_tests/stMemExpandingEIP150Calls
-ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCallsFiller.json
+state_tests/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCallsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCallsFiller.json",  # noqa: E501
+        "state_tests/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCallsFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_execute_call_that_ask_more_gas_then_transaction_has_with_mem_expanding_
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x6A3A7E4100E459734759453F3AEBB7F5FE9B806BAA83232CD5C42FE0A359CA67
-    )
+    """Test_execute_call_that_ask_more_gas_then_transaction_has_with_mem_e..."""  # noqa: E501
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x186A000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,43 +45,42 @@ def test_execute_call_that_ask_more_gas_then_transaction_has_with_mem_expanding_
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    callee = pre.deploy_contract(
+    # Source: hex
+    # 0x600c600155
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0xC),
         balance=0x186A0,
         nonce=0,
-        address=Address("0x73d01f7d28c5a55520cd80d2c3f0938c1834ccff"),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x927C0,
-                    address=0x73D01F7D28C5A55520CD80D2C3F0938C1834CCFF,
-                    value=0x0,
-                    args_offset=0xFF,
-                    args_size=0xFF,
-                    ret_offset=0xFF,
-                    ret_size=0xFF,
-                ),
-            )
+    # Source: hex
+    # 0x60ff60ff60ff60ff600073<contract:0x1000000000000000000000000000000000000001>620927c0f1600155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x927C0,
+                address=addr,
+                value=0x0,
+                args_offset=0xFF,
+                args_size=0xFF,
+                ret_offset=0xFF,
+                ret_size=0xFF,
+            ),
         ),
         nonce=0,
-        address=Address("0xbdbacb5fb8222511832eb176b990cd8ad511c271"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x186A000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
     post = {
-        callee: Account(storage={1: 12}),
-        contract: Account(storage={1: 1}),
+        sender: Account(nonce=1),
+        target: Account(storage={1: 1}),
+        addr: Account(storage={1: 12}, balance=0x186A0),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemExpandingEIP150Calls/test_new_gas_price_for_codes_with_mem_expanding_calls.py b/tests/ported_static/stMemExpandingEIP150Calls/test_new_gas_price_for_codes_with_mem_expanding_calls.py
index cdcab869618..47aed815167 100644
--- a/tests/ported_static/stMemExpandingEIP150Calls/test_new_gas_price_for_codes_with_mem_expanding_calls.py
+++ b/tests/ported_static/stMemExpandingEIP150Calls/test_new_gas_price_for_codes_with_mem_expanding_calls.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_new_gas_price_for_codes_with_mem_expanding_calls.
 
 Ported from:
-tests/static/state_tests/stMemExpandingEIP150Calls
-NewGasPriceForCodesWithMemExpandingCallsFiller.json
+state_tests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCallsFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCallsFiller.json",  # noqa: E501
+        "state_tests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCallsFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,10 +33,10 @@ def test_new_gas_price_for_codes_with_mem_expanding_calls(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_new_gas_price_for_codes_with_mem_expanding_calls."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
-        key=0x03956FC06BD55836ACDB92DA0E38A15F2E568C088022CF2278180477F3F7702A
+        key=0x3956FC06BD55836ACDB92DA0E38A15F2E568C088022CF2278180477F3F7702A
     )
 
     env = Environment(
@@ -48,107 +48,95 @@ def test_new_gas_price_for_codes_with_mem_expanding_calls(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.EXTCODESIZE(
-                    address=0x6B6AF3C6E1714081C8C3085ACBAC8C2B21FADF0B,
-                ),
-            )
-            + Op.EXTCODECOPY(
-                address=0x6B6AF3C6E1714081C8C3085ACBAC8C2B21FADF0B,
-                dest_offset=0x0,
-                offset=0x0,
-                size=0x14,
-            )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x4, value=Op.SLOAD(key=0x0))
-            + Op.SSTORE(
-                key=0x5,
-                value=Op.CALL(
-                    gas=0x7530,
-                    address=0x7B8C83E74CC8DFADB03138C2743C70588ACE4222,
-                    value=0x1,
-                    args_offset=0xFF,
-                    args_size=0xFF,
-                    ret_offset=0xFF,
-                    ret_size=0xFF,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x6,
-                value=Op.CALLCODE(
-                    gas=0x7530,
-                    address=0x7B8C83E74CC8DFADB03138C2743C70588ACE4222,
-                    value=0x1,
-                    args_offset=0xFF,
-                    args_size=0xFF,
-                    ret_offset=0xFF,
-                    ret_size=0xFF,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x7,
-                value=Op.DELEGATECALL(
-                    gas=0x7530,
-                    address=0x7B8C83E74CC8DFADB03138C2743C70588ACE4222,
-                    args_offset=0xFF,
-                    args_size=0xFF,
-                    ret_offset=0xFF,
-                    ret_size=0xFF,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x8,
-                value=Op.CALL(
-                    gas=0x7530,
-                    address=0x1000000000000000000000000000000000000013,
-                    value=0x0,
-                    args_offset=0xFF,
-                    args_size=0xFF,
-                    ret_offset=0xFF,
-                    ret_size=0xFF,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.BALANCE(
-                    address=0xF1100237A29F570CBF8B107BA3CB5BF2DB42BD3F,
-                ),
-            )
-            + Op.SSTORE(key=0xA, value=Op.GAS)
-        ),
-        storage={0x0: 0x12},
-        nonce=0,
-        address=Address("0x23a2ec54f5f8589778da7c2199caf3b179a24cb9"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    pre[sender] = Account(balance=0xE8D4A5100000)
+    # Source: hex
+    # 0x1122334455667788991011121314151617181920212223242526272829303132
+    addr = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
             "1122334455667788991011121314151617181920212223242526272829303132"
         ),
         balance=111,
         nonce=0,
-        address=Address("0x6b6af3c6e1714081c8c3085acbac8c2b21fadf0b"),  # noqa: E501
+        address=Address(0x6B6AF3C6E1714081C8C3085ACBAC8C2B21FADF0B),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: hex
+    # 0x6011606455
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x64, value=0x11),
         nonce=0,
-        address=Address("0x7b8c83e74cc8dfadb03138c2743c70588ace4222"),  # noqa: E501
+        address=Address(0x7B8C83E74CC8DFADB03138C2743C70588ACE4222),  # noqa: E501
+    )
+    # Source: hex
+    # 0x73<contract:0x1000000000000000000000000000000000000010>3b60015560146000600073<contract:0x1000000000000000000000000000000000000010>3c60005160025560005460045560ff60ff60ff60ff600173<contract:0x1000000000000000000000000000000000000011>617530f160055560ff60ff60ff60ff600173<contract:0x1000000000000000000000000000000000000011>617530f260065560ff60ff60ff60ff73<contract:0x1000000000000000000000000000000000000011>617530f460075560ff60ff60ff60ff6000731000000000000000000000000000000000000013617530f160085573<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>316003555a600a55  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=Op.EXTCODESIZE(address=addr))
+        + Op.EXTCODECOPY(address=addr, dest_offset=0x0, offset=0x0, size=0x14)
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x4, value=Op.SLOAD(key=0x0))
+        + Op.SSTORE(
+            key=0x5,
+            value=Op.CALL(
+                gas=0x7530,
+                address=addr_2,
+                value=0x1,
+                args_offset=0xFF,
+                args_size=0xFF,
+                ret_offset=0xFF,
+                ret_size=0xFF,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x6,
+            value=Op.CALLCODE(
+                gas=0x7530,
+                address=addr_2,
+                value=0x1,
+                args_offset=0xFF,
+                args_size=0xFF,
+                ret_offset=0xFF,
+                ret_size=0xFF,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x7,
+            value=Op.DELEGATECALL(
+                gas=0x7530,
+                address=addr_2,
+                args_offset=0xFF,
+                args_size=0xFF,
+                ret_offset=0xFF,
+                ret_size=0xFF,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x8,
+            value=Op.CALL(
+                gas=0x7530,
+                address=0x1000000000000000000000000000000000000013,
+                value=0x0,
+                args_offset=0xFF,
+                args_size=0xFF,
+                ret_offset=0xFF,
+                ret_size=0xFF,
+            ),
+        )
+        + Op.SSTORE(key=0x3, value=Op.BALANCE(address=sender))
+        + Op.SSTORE(key=0xA, value=Op.GAS),
+        storage={0: 18},
+        nonce=0,
+        address=Address(0x23A2EC54F5F8589778DA7C2199CAF3B179A24CB9),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A5100000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(
+        addr: Account(balance=111),
+        target: Account(
             storage={
                 0: 18,
                 1: 32,
@@ -161,6 +149,7 @@ def test_new_gas_price_for_codes_with_mem_expanding_calls(
                 100: 17,
             },
         ),
+        sender: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemExpandingEIP150Calls/test_oo_gin_return.py b/tests/ported_static/stMemExpandingEIP150Calls/test_oo_gin_return.py
index 1eb430120cd..145e2b341e1 100644
--- a/tests/ported_static/stMemExpandingEIP150Calls/test_oo_gin_return.py
+++ b/tests/ported_static/stMemExpandingEIP150Calls/test_oo_gin_return.py
@@ -2,19 +2,24 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stMemExpandingEIP150Calls/OOGinReturnFiller.yml
+state_tests/stMemExpandingEIP150Calls/OOGinReturnFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,77 +27,62 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stMemExpandingEIP150Calls/OOGinReturnFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stMemExpandingEIP150Calls/OOGinReturnFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "1a8451e60000000000000000000000009f5c4c430e37b429d18f8aba147e2302af08f2100000000000000000000000000000000000000000000000000000000000000036",  # noqa: E501
-            {
-                Address("0xebd3191dd8150f47e30f87927db4592163ee9224"): Account(
-                    storage={0: 0xDEAD60A7, 1: 0xDEAD60A7}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "1a8451e6000000000000000000000000cee9f0c6117cc881ad7b4c378c2bebee8fcd04a90000000000000000000000000000000000000000000000000000000000000036",  # noqa: E501
-            {
-                Address("0xebd3191dd8150f47e30f87927db4592163ee9224"): Account(
-                    storage={0: 0xDEAD60A7, 1: 0xDEAD60A7}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "1a8451e60000000000000000000000009f5c4c430e37b429d18f8aba147e2302af08f2100000000000000000000000000000000000000000000000000000000000000025",  # noqa: E501
-            {
-                Address("0xebd3191dd8150f47e30f87927db4592163ee9224"): Account(
-                    storage={0: 0x60A760A7}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "1a8451e6000000000000000000000000cee9f0c6117cc881ad7b4c378c2bebee8fcd04a90000000000000000000000000000000000000000000000000000000000000025",  # noqa: E501
-            {
-                Address("0xebd3191dd8150f47e30f87927db4592163ee9224"): Account(
-                    storage={0: 0x60A760A7}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
-        (
-            "1a8451e60000000000000000000000009f5c4c430e37b429d18f8aba147e2302af08f2100000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0xebd3191dd8150f47e30f87927db4592163ee9224"): Account(
-                    storage={0: 0x60A760A7}
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
         ),
-        (
-            "1a8451e6000000000000000000000000cee9f0c6117cc881ad7b4c378c2bebee8fcd04a90000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0xebd3191dd8150f47e30f87927db4592163ee9224"): Account(
-                    storage={0: 0x60A760A7}
-                )
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3", "case4", "case5"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_oo_gin_return(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -103,28 +93,33 @@ def test_oo_gin_return(
         gas_limit=4294967296,
     )
 
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xDEAD60A7)
-            + Op.RETURN(offset=0x0, size=0x100)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {
+    #     [0] 0xDEAD60A7
+    #     (return 0 0x100)
+    # }
+    return_ = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xDEAD60A7)
+        + Op.RETURN(offset=0x0, size=0x100)
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x9f5c4c430e37b429d18f8aba147e2302af08f210"),  # noqa: E501
+        address=Address(0x9F5C4C430E37B429D18F8ABA147E2302AF08F210),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xDEAD60A7)
-            + Op.REVERT(offset=0x0, size=0x100)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {
+    #     [0] 0xDEAD60A7
+    #     (revert 0 0x100)
+    # }
+    revert = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xDEAD60A7)
+        + Op.REVERT(offset=0x0, size=0x100)
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xcee9f0c6117cc881ad7b4c378c2bebee8fcd04a9"),  # noqa: E501
+        address=Address(0xCEE9F0C6117CC881AD7B4C378C2BEBEE8FCD04A9),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
     #   ; Variables are 0x20 bytes (= 256 bits) apart, except for
     #   ; code buffers that get 0x100 (256 bytes)
@@ -148,47 +143,69 @@ def test_oo_gin_return(
     #   (if (> (returndatasize) 0) (returndatacopy retVal 0 0x20) NOP)
     #   [[1]] @retVal
     # }   ; end of LLL code
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x140, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x0, value=0x60A760A7)
-            + Op.MSTORE(
-                offset=0x100,
-                value=Op.CALL(
-                    gas=Op.MLOAD(offset=0x140),
-                    address=Op.MLOAD(offset=0x120),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x100,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.JUMPI(pc=0x41, condition=Op.GT(Op.RETURNDATASIZE, 0x0))
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x4A)
-            + Op.JUMPDEST
-            + Op.RETURNDATACOPY(dest_offset=0x160, offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x160))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x140, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x0, value=0x60A760A7)
+        + Op.MSTORE(
+            offset=0x100,
+            value=Op.CALL(
+                gas=Op.MLOAD(offset=0x140),
+                address=Op.MLOAD(offset=0x120),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x100,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.JUMPI(pc=0x41, condition=Op.GT(Op.RETURNDATASIZE, 0x0))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x4A)
+        + Op.JUMPDEST
+        + Op.RETURNDATACOPY(dest_offset=0x160, offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x160))
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xebd3191dd8150f47e30f87927db4592163ee9224"),  # noqa: E501
+        address=Address(0xEBD3191DD8150F47E30F87927DB4592163EE9224),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 1], "gas": 0, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 0xDEAD60A7, 1: 0xDEAD60A7})
+            },
+        },
+        {
+            "indexes": {"data": [2, 3, 4, 5], "gas": 0, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0x60A760A7})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("1a8451e6") + Hash(return_, left_padding=True) + Hash(0x36),
+        Bytes("1a8451e6") + Hash(revert, left_padding=True) + Hash(0x36),
+        Bytes("1a8451e6") + Hash(return_, left_padding=True) + Hash(0x25),
+        Bytes("1a8451e6") + Hash(revert, left_padding=True) + Hash(0x25),
+        Bytes("1a8451e6") + Hash(return_, left_padding=True) + Hash(0x10),
+        Bytes("1a8451e6") + Hash(revert, left_padding=True) + Hash(0x10),
+    ]
+    tx_gas = [9437184]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=9437184,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/__init__.py b/tests/ported_static/stMemoryStressTest/__init__.py
index 14e44ed86ae..4ba56a46334 100644
--- a/tests/ported_static/stMemoryStressTest/__init__.py
+++ b/tests/ported_static/stMemoryStressTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stMemoryStressTest."""
+"""Ported static tests: stMemoryStressTest."""  # noqa: N999
diff --git a/tests/ported_static/stMemoryStressTest/test_call_bounds.py b/tests/ported_static/stMemoryStressTest/test_call_bounds.py
index 3e207f08bfc..49a2518ece9 100644
--- a/tests/ported_static/stMemoryStressTest/test_call_bounds.py
+++ b/tests/ported_static/stMemoryStressTest/test_call_bounds.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_call_bounds.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/CALL_BoundsFiller.json
+state_tests/stMemoryStressTest/CALL_BoundsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,28 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/CALL_BoundsFiller.json"],
+    ["state_tests/stMemoryStressTest/CALL_BoundsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_call_bounds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xEF111BBDAB3A1622936AFDFC9BBEC4B5BC05B4FA4B1EF0CE2A55CEF552F7650E
+    """Test_call_bounds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
     )
 
     env = Environment(
@@ -55,119 +67,123 @@ def test_call_bounds(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+    # Source: lll
+    # { (SSTORE 0 (ADD 1 (SLOAD 0))) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.STOP,
+        nonce=0,
     )
-    # Source: LLL
+    # Source: lll
     # {  (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0 0 0) (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0xfffffff 0 0xfffffff) (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0xffffffff 0 0xffffffff) (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xfffffff 0 0xfffffff 0) (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffff 0 0xffffffff 0) (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffff 0 0xffffffffffffffff 0) (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff 0) (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0)  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFF,
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFF,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFFF,
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFFF,
-                ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xFFFFFFF,
+                ret_offset=0x0,
+                ret_size=0xFFFFFFF,
             )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0xFFFFFFF,
-                    args_size=0x0,
-                    ret_offset=0xFFFFFFF,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xFFFFFFFF,
+                ret_offset=0x0,
+                ret_size=0xFFFFFFFF,
             )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0xFFFFFFFF,
-                    args_size=0x0,
-                    ret_offset=0xFFFFFFFF,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0xFFFFFFF,
+                args_size=0x0,
+                ret_offset=0xFFFFFFF,
+                ret_size=0x0,
             )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0xFFFFFFFFFFFFFFFF,
-                    args_size=0x0,
-                    ret_offset=0xFFFFFFFFFFFFFFFF,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0xFFFFFFFF,
+                args_size=0x0,
+                ret_offset=0xFFFFFFFF,
+                ret_size=0x0,
             )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    args_size=0x0,
-                    ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0xFFFFFFFFFFFFFFFF,
+                args_size=0x0,
+                ret_offset=0xFFFFFFFFFFFFFFFF,
+                ret_size=0x0,
             )
-            + Op.CALL(
+        )
+        + Op.POP(
+            Op.CALL(
                 gas=0x7FFFFFFFFFFFFFF,
-                address=0x849F53126ADE5F72469029537296F2B6644D4D41,
+                address=addr,
                 value=0x0,
-                args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
                 args_size=0x0,
-                ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.CALL(
+            gas=0x7FFFFFFFFFFFFFF,
+            address=addr,
+            value=0x0,
+            args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            args_size=0x0,
+            ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x5f620f2ea7307fd66700749255ade959893706ff"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0))) + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x849f53126ade5f72469029537296f2b6644d4d41"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        target: Account(balance=0),
+        addr: Account(storage={0: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_call_bounds2.py b/tests/ported_static/stMemoryStressTest/test_call_bounds2.py
index 6fafbe31a41..3638beda9b6 100644
--- a/tests/ported_static/stMemoryStressTest/test_call_bounds2.py
+++ b/tests/ported_static/stMemoryStressTest/test_call_bounds2.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_call_bounds2.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/CALL_Bounds2Filler.json
+state_tests/stMemoryStressTest/CALL_Bounds2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,28 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/CALL_Bounds2Filler.json"],
+    ["state_tests/stMemoryStressTest/CALL_Bounds2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_call_bounds2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xEF111BBDAB3A1622936AFDFC9BBEC4B5BC05B4FA4B1EF0CE2A55CEF552F7650E
+    """Test_call_bounds2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
     )
 
     env = Environment(
@@ -55,42 +67,46 @@ def test_call_bounds2(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0))) + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 (ADD 1 (SLOAD 0))) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x849f53126ade5f72469029537296f2b6644d4d41"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {   (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xfffffff 0xfffffff 0xfffffff 0xfffffff)   }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x7FFFFFFFFFFFFFF,
-                address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                value=0x0,
-                args_offset=0xFFFFFFF,
-                args_size=0xFFFFFFF,
-                ret_offset=0xFFFFFFF,
-                ret_size=0xFFFFFFF,
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x7FFFFFFFFFFFFFF,
+            address=addr,
+            value=0x0,
+            args_offset=0xFFFFFFF,
+            args_size=0xFFFFFFF,
+            ret_offset=0xFFFFFFF,
+            ret_size=0xFFFFFFF,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb6055ee15f692591c71b50a7bda55180b78f6ef9"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        target: Account(balance=0),
+        addr: Account(storage={0: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_call_bounds2a.py b/tests/ported_static/stMemoryStressTest/test_call_bounds2a.py
index 861d1b5de4d..1065f6cec49 100644
--- a/tests/ported_static/stMemoryStressTest/test_call_bounds2a.py
+++ b/tests/ported_static/stMemoryStressTest/test_call_bounds2a.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_call_bounds2a.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/CALL_Bounds2aFiller.json
+state_tests/stMemoryStressTest/CALL_Bounds2aFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,28 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/CALL_Bounds2aFiller.json"],
+    ["state_tests/stMemoryStressTest/CALL_Bounds2aFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_call_bounds2a(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xEF111BBDAB3A1622936AFDFC9BBEC4B5BC05B4FA4B1EF0CE2A55CEF552F7650E
+    """Test_call_bounds2a."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
     )
 
     env = Environment(
@@ -55,42 +67,46 @@ def test_call_bounds2a(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-    )
-    # Source: LLL
-    # {   (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffff 0xffffffff 0xffffffff 0xffffffff)  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x7FFFFFFFFFFFFFF,
-                address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                value=0x0,
-                args_offset=0xFFFFFFFF,
-                args_size=0xFFFFFFFF,
-                ret_offset=0xFFFFFFFF,
-                ret_size=0xFFFFFFFF,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 (ADD 1 (SLOAD 0))) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6c184e7e792470e474b189a511b48f06f0643d4b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0))) + Op.STOP
-        ),
+    # Source: lll
+    # {   (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffff 0xffffffff 0xffffffff 0xffffffff)  }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x7FFFFFFFFFFFFFF,
+            address=addr,
+            value=0x0,
+            args_offset=0xFFFFFFFF,
+            args_size=0xFFFFFFFF,
+            ret_offset=0xFFFFFFFF,
+            ret_size=0xFFFFFFFF,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x849f53126ade5f72469029537296f2b6644d4d41"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        target: Account(balance=0),
+        addr: Account(storage={0: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_call_bounds3.py b/tests/ported_static/stMemoryStressTest/test_call_bounds3.py
index c588d78ab9d..81ccd53caf4 100644
--- a/tests/ported_static/stMemoryStressTest/test_call_bounds3.py
+++ b/tests/ported_static/stMemoryStressTest/test_call_bounds3.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_call_bounds3.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/CALL_Bounds3Filler.json
+state_tests/stMemoryStressTest/CALL_Bounds3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +23,45 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/CALL_Bounds3Filler.json"],
+    ["state_tests/stMemoryStressTest/CALL_Bounds3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (1000000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="-g2",
+        ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_call_bounds3(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xEF111BBDAB3A1622936AFDFC9BBEC4B5BC05B4FA4B1EF0CE2A55CEF552F7650E
+    """Test_call_bounds3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
     )
 
     env = Environment(
@@ -56,108 +73,112 @@ def test_call_bounds3(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+    # Source: lll
+    # { (SSTORE 0 (ADD 1 (SLOAD 0))) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.STOP,
+        nonce=0,
     )
-    # Source: LLL
+    # Source: lll
     # { (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0xffffffffffffffff 0 0xffffffffffffffff)  (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff)  (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffff 0xffffffff 0xffffffff 0xffffffff) (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFFFFFFFFFFF,
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFFFFFFFFFFF,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xFFFFFFFFFFFFFFFF,
+                ret_offset=0x0,
+                ret_size=0xFFFFFFFFFFFFFFFF,
             )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                ret_offset=0x0,
+                ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
             )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0xFFFFFFFF,
-                    args_size=0xFFFFFFFF,
-                    ret_offset=0xFFFFFFFF,
-                    ret_size=0xFFFFFFFF,
-                ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ret_offset=0x0,
+                ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0xFFFFFFFFFFFFFFFF,
-                    args_size=0xFFFFFFFFFFFFFFFF,
-                    ret_offset=0xFFFFFFFFFFFFFFFF,
-                    ret_size=0xFFFFFFFFFFFFFFFF,
-                ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0xFFFFFFFF,
+                args_size=0xFFFFFFFF,
+                ret_offset=0xFFFFFFFF,
+                ret_size=0xFFFFFFFF,
             )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0xFFFFFFFFFFFFFFFF,
+                args_size=0xFFFFFFFFFFFFFFFF,
+                ret_offset=0xFFFFFFFFFFFFFFFF,
+                ret_size=0xFFFFFFFFFFFFFFFF,
             )
-            + Op.CALL(
+        )
+        + Op.POP(
+            Op.CALL(
                 gas=0x7FFFFFFFFFFFFFF,
-                address=0x849F53126ADE5F72469029537296F2B6644D4D41,
+                address=addr,
                 value=0x0,
-                args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
             )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x82475c10fea2425b322d1f97fcef265c5dc7c8c9"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0))) + Op.STOP
-        ),
+        )
+        + Op.CALL(
+            gas=0x7FFFFFFFFFFFFFF,
+            address=addr,
+            value=0x0,
+            args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x849f53126ade5f72469029537296f2b6644d4d41"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 1000000, 16777216]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        target: Account(balance=0),
+        addr: Account(storage={0: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_callcode_bounds.py b/tests/ported_static/stMemoryStressTest/test_callcode_bounds.py
index 05774af6151..3a7a1cd03ea 100644
--- a/tests/ported_static/stMemoryStressTest/test_callcode_bounds.py
+++ b/tests/ported_static/stMemoryStressTest/test_callcode_bounds.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_callcode_bounds.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/CALLCODE_BoundsFiller.json
+state_tests/stMemoryStressTest/CALLCODE_BoundsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,28 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/CALLCODE_BoundsFiller.json"],
+    ["state_tests/stMemoryStressTest/CALLCODE_BoundsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_callcode_bounds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x50EADFB1030587AB3A993A6ECC073041FC3B45E119DAA31A13D78C7E209631A5
+    """Test_callcode_bounds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
 
     env = Environment(
@@ -55,119 +67,120 @@ def test_callcode_bounds(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
+    # { (SSTORE 0 (ADD 1 (SLOAD 0))) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.STOP,
+        nonce=0,
+    )
+    # Source: lll
     # {  (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0 0 0) (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0xfffffff 0 0xfffffff) (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0xffffffff 0 0xffffffff)  (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xfffffff 0 0xfffffff 0) (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffff 0 0xffffffff 0) (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffff 0 0xffffffffffffffff 0) (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff 0) (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0)  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFF,
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFF,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFFF,
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFFF,
-                ),
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xFFFFFFF,
+                ret_offset=0x0,
+                ret_size=0xFFFFFFF,
             )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0xFFFFFFF,
-                    args_size=0x0,
-                    ret_offset=0xFFFFFFF,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xFFFFFFFF,
+                ret_offset=0x0,
+                ret_size=0xFFFFFFFF,
             )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0xFFFFFFFF,
-                    args_size=0x0,
-                    ret_offset=0xFFFFFFFF,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0xFFFFFFF,
+                args_size=0x0,
+                ret_offset=0xFFFFFFF,
+                ret_size=0x0,
             )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0xFFFFFFFFFFFFFFFF,
-                    args_size=0x0,
-                    ret_offset=0xFFFFFFFFFFFFFFFF,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0xFFFFFFFF,
+                args_size=0x0,
+                ret_offset=0xFFFFFFFF,
+                ret_size=0x0,
             )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    args_size=0x0,
-                    ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0xFFFFFFFFFFFFFFFF,
+                args_size=0x0,
+                ret_offset=0xFFFFFFFFFFFFFFFF,
+                ret_size=0x0,
             )
-            + Op.CALLCODE(
+        )
+        + Op.POP(
+            Op.CALLCODE(
                 gas=0x7FFFFFFFFFFFFFF,
-                address=0x849F53126ADE5F72469029537296F2B6644D4D41,
+                address=addr,
                 value=0x0,
-                args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
                 args_size=0x0,
-                ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.CALLCODE(
+            gas=0x7FFFFFFFFFFFFFF,
+            address=addr,
+            value=0x0,
+            args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            args_size=0x0,
+            ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3f4ed7c54cd8a44e2d6b4d967e8e070a8c4a4f34"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0))) + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x849f53126ade5f72469029537296f2b6644d4d41"),  # noqa: E501
-    )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 0}, balance=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_callcode_bounds2.py b/tests/ported_static/stMemoryStressTest/test_callcode_bounds2.py
index 5552ddc8ad4..5496732ba6d 100644
--- a/tests/ported_static/stMemoryStressTest/test_callcode_bounds2.py
+++ b/tests/ported_static/stMemoryStressTest/test_callcode_bounds2.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_callcode_bounds2.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds2Filler.json
+state_tests/stMemoryStressTest/CALLCODE_Bounds2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,30 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stMemoryStressTest/CALLCODE_Bounds2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_callcode_bounds2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x50EADFB1030587AB3A993A6ECC073041FC3B45E119DAA31A13D78C7E209631A5
+    """Test_callcode_bounds2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
 
     env = Environment(
@@ -57,42 +67,43 @@ def test_callcode_bounds2(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
-    # { (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xfffffff 0xfffffff 0xfffffff 0xfffffff)  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x7FFFFFFFFFFFFFF,
-                address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                value=0x0,
-                args_offset=0xFFFFFFF,
-                args_size=0xFFFFFFF,
-                ret_offset=0xFFFFFFF,
-                ret_size=0xFFFFFFF,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 (ADD 1 (SLOAD 0))) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x814cc86eb9caa0e43cfea934fbb77c7917f5cc0e"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0))) + Op.STOP
-        ),
+    # Source: lll
+    # { (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xfffffff 0xfffffff 0xfffffff 0xfffffff)  }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x7FFFFFFFFFFFFFF,
+            address=addr,
+            value=0x0,
+            args_offset=0xFFFFFFF,
+            args_size=0xFFFFFFF,
+            ret_offset=0xFFFFFFF,
+            ret_size=0xFFFFFFF,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x849f53126ade5f72469029537296f2b6644d4d41"),  # noqa: E501
-    )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 0}, balance=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_callcode_bounds3.py b/tests/ported_static/stMemoryStressTest/test_callcode_bounds3.py
index 59083761670..9bddda9e3be 100644
--- a/tests/ported_static/stMemoryStressTest/test_callcode_bounds3.py
+++ b/tests/ported_static/stMemoryStressTest/test_callcode_bounds3.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_callcode_bounds3.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds3Filler.json
+state_tests/stMemoryStressTest/CALLCODE_Bounds3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,30 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stMemoryStressTest/CALLCODE_Bounds3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_callcode_bounds3(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x50EADFB1030587AB3A993A6ECC073041FC3B45E119DAA31A13D78C7E209631A5
+    """Test_callcode_bounds3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
 
     env = Environment(
@@ -57,42 +67,43 @@ def test_callcode_bounds3(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
-    # {  (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffff 0xffffffff 0xffffffff 0xffffffff)  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x7FFFFFFFFFFFFFF,
-                address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                value=0x0,
-                args_offset=0xFFFFFFFF,
-                args_size=0xFFFFFFFF,
-                ret_offset=0xFFFFFFFF,
-                ret_size=0xFFFFFFFF,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 (ADD 1 (SLOAD 0))) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x206c40e47a57c530785338bcd7f38a6197bee97b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0))) + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffff 0xffffffff 0xffffffff 0xffffffff)  }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x7FFFFFFFFFFFFFF,
+            address=addr,
+            value=0x0,
+            args_offset=0xFFFFFFFF,
+            args_size=0xFFFFFFFF,
+            ret_offset=0xFFFFFFFF,
+            ret_size=0xFFFFFFFF,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x849f53126ade5f72469029537296f2b6644d4d41"),  # noqa: E501
-    )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 0}, balance=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_callcode_bounds4.py b/tests/ported_static/stMemoryStressTest/test_callcode_bounds4.py
index 5f0e02adaf3..fc8373060be 100644
--- a/tests/ported_static/stMemoryStressTest/test_callcode_bounds4.py
+++ b/tests/ported_static/stMemoryStressTest/test_callcode_bounds4.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_callcode_bounds4.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds4Filler.json
+state_tests/stMemoryStressTest/CALLCODE_Bounds4Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +23,45 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stMemoryStressTest/CALLCODE_Bounds4Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stMemoryStressTest/CALLCODE_Bounds4Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (1000000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="-g2",
+        ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_callcode_bounds4(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x50EADFB1030587AB3A993A6ECC073041FC3B45E119DAA31A13D78C7E209631A5
+    """Test_callcode_bounds4."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
 
     env = Environment(
@@ -58,108 +73,99 @@ def test_callcode_bounds4(
         gas_limit=9223372036854775807,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0))) + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 (ADD 1 (SLOAD 0))) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x849f53126ade5f72469029537296f2b6644d4d41"),  # noqa: E501
     )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-    )
-    # Source: LLL
+    # Source: lll
     # { (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0xffffffffffffffff 0 0xffffffffffffffff) (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff) (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (CALLCODE 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFFFFFFFFFFF,
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFFFFFFFFFFF,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xFFFFFFFFFFFFFFFF,
+                ret_offset=0x0,
+                ret_size=0xFFFFFFFFFFFFFFFF,
             )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0xFFFFFFFFFFFFFFFF,
-                    args_size=0xFFFFFFFFFFFFFFFF,
-                    ret_offset=0xFFFFFFFFFFFFFFFF,
-                    ret_size=0xFFFFFFFFFFFFFFFF,
-                ),
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                ret_offset=0x0,
+                ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
             )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0xFFFFFFFFFFFFFFFF,
-                    args_size=0xFFFFFFFFFFFFFFFF,
-                    ret_offset=0xFFFFFFFFFFFFFFFF,
-                    ret_size=0xFFFFFFFFFFFFFFFF,
-                ),
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ret_offset=0x0,
+                ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    value=0x0,
-                    args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0xFFFFFFFFFFFFFFFF,
+                args_size=0xFFFFFFFFFFFFFFFF,
+                ret_offset=0xFFFFFFFFFFFFFFFF,
+                ret_size=0xFFFFFFFFFFFFFFFF,
             )
-            + Op.CALLCODE(
+        )
+        * 2
+        + Op.POP(
+            Op.CALLCODE(
                 gas=0x7FFFFFFFFFFFFFF,
-                address=0x849F53126ADE5F72469029537296F2B6644D4D41,
+                address=addr,
                 value=0x0,
-                args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             )
-            + Op.STOP
-        ),
+        )
+        + Op.CALLCODE(
+            gas=0x7FFFFFFFFFFFFFF,
+            address=addr,
+            value=0x0,
+            args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+            args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+            ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+            ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc0479fbac15cb575e66ded014fd60ceb98749b04"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 1000000, 16777216]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 0}, balance=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_create_bounds.py b/tests/ported_static/stMemoryStressTest/test_create_bounds.py
index a643a926708..992a097d01c 100644
--- a/tests/ported_static/stMemoryStressTest/test_create_bounds.py
+++ b/tests/ported_static/stMemoryStressTest/test_create_bounds.py
@@ -1,20 +1,22 @@
 """
-Test ported from static filler.
+Test_create_bounds.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/CREATE_BoundsFiller.json
+state_tests/stMemoryStressTest/CREATE_BoundsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,28 +24,40 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/CREATE_BoundsFiller.json"],
+    ["state_tests/stMemoryStressTest/CREATE_BoundsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_bounds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    """Test_create_bounds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
     )
 
     env = Environment(
@@ -55,34 +69,42 @@ def test_create_bounds(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  (MSTORE 0 0x6001600155601080600c6000396000f3006000355415600957005b6020356000 )  (MSTORE8 32 0x35) (MSTORE8 33 0x55) (CREATE 1 0 0) (CREATE 1 0 0xfffffff) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x6001600155601080600C6000396000F3006000355415600957005B6020356000,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0x20, value=0x35)
-            + Op.MSTORE8(offset=0x21, value=0x55)
-            + Op.POP(Op.CREATE(value=0x1, offset=0x0, size=0x0))
-            + Op.CREATE(value=0x1, offset=0x0, size=0xFFFFFFF)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x6001600155601080600C6000396000F3006000355415600957005B6020356000,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0x20, value=0x35)
+        + Op.MSTORE8(offset=0x21, value=0x55)
+        + Op.POP(Op.CREATE(value=0x1, offset=0x0, size=0x0))
+        + Op.CREATE(value=0x1, offset=0x0, size=0xFFFFFFF)
+        + Op.STOP,
         balance=100,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {
+        contract_0: Account(balance=100),
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
+        compute_create_address(
+            address=contract_0, nonce=1
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_create_bounds2.py b/tests/ported_static/stMemoryStressTest/test_create_bounds2.py
index 2555d72306a..d136a0b2ed3 100644
--- a/tests/ported_static/stMemoryStressTest/test_create_bounds2.py
+++ b/tests/ported_static/stMemoryStressTest/test_create_bounds2.py
@@ -1,20 +1,22 @@
 """
-Test ported from static filler.
+Test_create_bounds2.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/CREATE_Bounds2Filler.json
+state_tests/stMemoryStressTest/CREATE_Bounds2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,28 +24,40 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/CREATE_Bounds2Filler.json"],
+    ["state_tests/stMemoryStressTest/CREATE_Bounds2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_bounds2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    """Test_create_bounds2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
     )
 
     env = Environment(
@@ -55,33 +69,38 @@ def test_create_bounds2(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  (MSTORE 0 0x6001600155601080600c6000396000f3006000355415600957005b6020356000 )  (MSTORE8 32 0x35) (MSTORE8 33 0x55) (CREATE 1 0 0xffffffff) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x6001600155601080600C6000396000F3006000355415600957005B6020356000,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0x20, value=0x35)
-            + Op.MSTORE8(offset=0x21, value=0x55)
-            + Op.CREATE(value=0x1, offset=0x0, size=0xFFFFFFFF)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x6001600155601080600C6000396000F3006000355415600957005B6020356000,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0x20, value=0x35)
+        + Op.MSTORE8(offset=0x21, value=0x55)
+        + Op.CREATE(value=0x1, offset=0x0, size=0xFFFFFFFF)
+        + Op.STOP,
         balance=100,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {
+        contract_0: Account(balance=100),
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_create_bounds3.py b/tests/ported_static/stMemoryStressTest/test_create_bounds3.py
index 9b2d1f9107d..d78ccc430d7 100644
--- a/tests/ported_static/stMemoryStressTest/test_create_bounds3.py
+++ b/tests/ported_static/stMemoryStressTest/test_create_bounds3.py
@@ -1,20 +1,22 @@
 """
-Test ported from static filler.
+Test_create_bounds3.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/CREATE_Bounds3Filler.json
+state_tests/stMemoryStressTest/CREATE_Bounds3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +24,46 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/CREATE_Bounds3Filler.json"],
+    ["state_tests/stMemoryStressTest/CREATE_Bounds3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (1000000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="-g2",
+        ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_create_bounds3(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    """Test_create_bounds3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
     )
 
     env = Environment(
@@ -56,85 +75,84 @@ def test_create_bounds3(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  (MSTORE 0 0x6001600155601080600c6000396000f3006000355415600957005b6020356000 )  (MSTORE8 32 0x35) (MSTORE8 33 0x55) (CREATE 1 0 0xffffffffffffffff) (CREATE 1 0 0xffffffffffffffffffffffffffffffff) (CREATE 1 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (CREATE 1 0xfffffff 0) (CREATE 1 0xffffffff 0) (CREATE 1 0xffffffffffffffff 0) (CREATE 1 0xffffffffffffffffffffffffffffffff 0) (CREATE 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) (CREATE 1 0xfffffff 0xfffffff) (CREATE 1 0xffffffff 0xffffffff) (CREATE 1 0xffffffffffffffff 0xffffffffffffffff) (CREATE 1 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (CREATE 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x6001600155601080600C6000396000F3006000355415600957005B6020356000,  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x6001600155601080600C6000396000F3006000355415600957005B6020356000,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0x20, value=0x35)
+        + Op.MSTORE8(offset=0x21, value=0x55)
+        + Op.POP(Op.CREATE(value=0x1, offset=0x0, size=0xFFFFFFFFFFFFFFFF))
+        + Op.POP(
+            Op.CREATE(
+                value=0x1, offset=0x0, size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
             )
-            + Op.MSTORE8(offset=0x20, value=0x35)
-            + Op.MSTORE8(offset=0x21, value=0x55)
-            + Op.POP(Op.CREATE(value=0x1, offset=0x0, size=0xFFFFFFFFFFFFFFFF))
-            + Op.POP(
-                Op.CREATE(
-                    value=0x1,
-                    offset=0x0,
-                    size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                ),
-            )
-            + Op.POP(
-                Op.CREATE(
-                    value=0x1,
-                    offset=0x0,
-                    size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.POP(Op.CREATE(value=0x1, offset=0xFFFFFFF, size=0x0))
-            + Op.POP(Op.CREATE(value=0x1, offset=0xFFFFFFFF, size=0x0))
-            + Op.POP(Op.CREATE(value=0x1, offset=0xFFFFFFFFFFFFFFFF, size=0x0))
-            + Op.POP(
-                Op.CREATE(
-                    value=0x1,
-                    offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.CREATE(
+                value=0x1,
+                offset=0x0,
+                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             )
-            + Op.POP(
-                Op.CREATE(
-                    value=0x1,
-                    offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    size=0x0,
-                ),
+        )
+        + Op.POP(Op.CREATE(value=0x1, offset=0xFFFFFFF, size=0x0))
+        + Op.POP(Op.CREATE(value=0x1, offset=0xFFFFFFFF, size=0x0))
+        + Op.POP(Op.CREATE(value=0x1, offset=0xFFFFFFFFFFFFFFFF, size=0x0))
+        + Op.POP(
+            Op.CREATE(
+                value=0x1, offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, size=0x0
             )
-            + Op.POP(Op.CREATE(value=0x1, offset=0xFFFFFFF, size=0xFFFFFFF))
-            + Op.POP(Op.CREATE(value=0x1, offset=0xFFFFFFFF, size=0xFFFFFFFF))
-            + Op.POP(
-                Op.CREATE(
-                    value=0x1,
-                    offset=0xFFFFFFFFFFFFFFFF,
-                    size=0xFFFFFFFFFFFFFFFF,
-                ),
+        )
+        + Op.POP(
+            Op.CREATE(
+                value=0x1,
+                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                size=0x0,
             )
-            + Op.POP(
-                Op.CREATE(
-                    value=0x1,
-                    offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                ),
+        )
+        + Op.POP(Op.CREATE(value=0x1, offset=0xFFFFFFF, size=0xFFFFFFF))
+        + Op.POP(Op.CREATE(value=0x1, offset=0xFFFFFFFF, size=0xFFFFFFFF))
+        + Op.POP(
+            Op.CREATE(
+                value=0x1, offset=0xFFFFFFFFFFFFFFFF, size=0xFFFFFFFFFFFFFFFF
             )
-            + Op.CREATE(
+        )
+        + Op.POP(
+            Op.CREATE(
                 value=0x1,
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.CREATE(
+            value=0x1,
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         balance=100,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 1000000, 16777216]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {
+        contract_0: Account(balance=100),
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_delegatecall_bounds.py b/tests/ported_static/stMemoryStressTest/test_delegatecall_bounds.py
index bf9f0fbb822..bdc3e3a6b0d 100644
--- a/tests/ported_static/stMemoryStressTest/test_delegatecall_bounds.py
+++ b/tests/ported_static/stMemoryStressTest/test_delegatecall_bounds.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_delegatecall_bounds.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/DELEGATECALL_BoundsFiller.json
+state_tests/stMemoryStressTest/DELEGATECALL_BoundsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,30 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stMemoryStressTest/DELEGATECALL_BoundsFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stMemoryStressTest/DELEGATECALL_BoundsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_delegatecall_bounds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x50EADFB1030587AB3A993A6ECC073041FC3B45E119DAA31A13D78C7E209631A5
+    """Test_delegatecall_bounds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
 
     env = Environment(
@@ -57,121 +67,122 @@ def test_delegatecall_bounds(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
+    # { (SSTORE 0 (ADD 1 (SLOAD 0))) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.STOP,
+        nonce=0,
+    )
+    # Source: lll
     # {(DELEGATECALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0 0) (DELEGATECALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xfffffff 0 0xfffffff) (DELEGATECALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffff 0 0xffffffff) (DELEGATECALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xfffffff 0 0xfffffff 0) (DELEGATECALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffff 0 0xffffffff 0)  (DELEGATECALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffffffffffff 0 0xffffffffffffffff 0) (DELEGATECALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff 0) (DELEGATECALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) (DELEGATECALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xfffffff 0xfffffff 0xfffffff 0xfffffff)  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFF,
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFF,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFFF,
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFFF,
-                ),
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0x0,
+                args_size=0xFFFFFFF,
+                ret_offset=0x0,
+                ret_size=0xFFFFFFF,
             )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    args_offset=0xFFFFFFF,
-                    args_size=0x0,
-                    ret_offset=0xFFFFFFF,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0x0,
+                args_size=0xFFFFFFFF,
+                ret_offset=0x0,
+                ret_size=0xFFFFFFFF,
             )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    args_offset=0xFFFFFFFF,
-                    args_size=0x0,
-                    ret_offset=0xFFFFFFFF,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0xFFFFFFF,
+                args_size=0x0,
+                ret_offset=0xFFFFFFF,
+                ret_size=0x0,
             )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    args_offset=0xFFFFFFFFFFFFFFFF,
-                    args_size=0x0,
-                    ret_offset=0xFFFFFFFFFFFFFFFF,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0xFFFFFFFF,
+                args_size=0x0,
+                ret_offset=0xFFFFFFFF,
+                ret_size=0x0,
             )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    args_size=0x0,
-                    ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0xFFFFFFFFFFFFFFFF,
+                args_size=0x0,
+                ret_offset=0xFFFFFFFFFFFFFFFF,
+                ret_size=0x0,
             )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    args_size=0x0,
-                    ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                args_size=0x0,
+                ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                ret_size=0x0,
             )
-            + Op.DELEGATECALL(
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
                 gas=0x7FFFFFFFFFFFFFF,
-                address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                args_offset=0xFFFFFFF,
-                args_size=0xFFFFFFF,
-                ret_offset=0xFFFFFFF,
-                ret_size=0xFFFFFFF,
+                address=addr,
+                args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                args_size=0x0,
+                ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.DELEGATECALL(
+            gas=0x7FFFFFFFFFFFFFF,
+            address=addr,
+            args_offset=0xFFFFFFF,
+            args_size=0xFFFFFFF,
+            ret_offset=0xFFFFFFF,
+            ret_size=0xFFFFFFF,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x75bc6dcef9bdda4e2eb511e92ed4815699f32b4f"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0))) + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x849f53126ade5f72469029537296f2b6644d4d41"),  # noqa: E501
-    )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 0}, balance=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_delegatecall_bounds2.py b/tests/ported_static/stMemoryStressTest/test_delegatecall_bounds2.py
index 5641612a4b4..4dde13d2569 100644
--- a/tests/ported_static/stMemoryStressTest/test_delegatecall_bounds2.py
+++ b/tests/ported_static/stMemoryStressTest/test_delegatecall_bounds2.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_delegatecall_bounds2.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/DELEGATECALL_Bounds2Filler.json
+state_tests/stMemoryStressTest/DELEGATECALL_Bounds2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,30 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stMemoryStressTest/DELEGATECALL_Bounds2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stMemoryStressTest/DELEGATECALL_Bounds2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_delegatecall_bounds2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x50EADFB1030587AB3A993A6ECC073041FC3B45E119DAA31A13D78C7E209631A5
+    """Test_delegatecall_bounds2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
 
     env = Environment(
@@ -57,41 +67,42 @@ def test_delegatecall_bounds2(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
-    # { (DELEGATECALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffff 0xffffffff 0xffffffff 0xffffffff) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x7FFFFFFFFFFFFFF,
-                address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                args_offset=0xFFFFFFFF,
-                args_size=0xFFFFFFFF,
-                ret_offset=0xFFFFFFFF,
-                ret_size=0xFFFFFFFF,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 (ADD 1 (SLOAD 0))) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x7b7e1fed40d6cb2420c7f2718725badb76616d4d"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0))) + Op.STOP
-        ),
+    # Source: lll
+    # { (DELEGATECALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffff 0xffffffff 0xffffffff 0xffffffff) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x7FFFFFFFFFFFFFF,
+            address=addr,
+            args_offset=0xFFFFFFFF,
+            args_size=0xFFFFFFFF,
+            ret_offset=0xFFFFFFFF,
+            ret_size=0xFFFFFFFF,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x849f53126ade5f72469029537296f2b6644d4d41"),  # noqa: E501
-    )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={}, balance=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_delegatecall_bounds3.py b/tests/ported_static/stMemoryStressTest/test_delegatecall_bounds3.py
index 77526007a45..804fc02744b 100644
--- a/tests/ported_static/stMemoryStressTest/test_delegatecall_bounds3.py
+++ b/tests/ported_static/stMemoryStressTest/test_delegatecall_bounds3.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_delegatecall_bounds3.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/DELEGATECALL_Bounds3Filler.json
+state_tests/stMemoryStressTest/DELEGATECALL_Bounds3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +23,45 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stMemoryStressTest/DELEGATECALL_Bounds3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stMemoryStressTest/DELEGATECALL_Bounds3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (1000000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="-g2",
+        ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_delegatecall_bounds3(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x50EADFB1030587AB3A993A6ECC073041FC3B45E119DAA31A13D78C7E209631A5
+    """Test_delegatecall_bounds3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
 
     env = Environment(
@@ -58,91 +73,92 @@ def test_delegatecall_bounds3(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
+    # { (SSTORE 0 (ADD 1 (SLOAD 0))) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.STOP,
+        nonce=0,
+    )
+    # Source: lll
     # { (DELEGATECALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffff 0 0xffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFFFFFFFFFFF,
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFFFFFFFFFFF,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    args_offset=0xFFFFFFFFFFFFFFFF,
-                    args_size=0xFFFFFFFFFFFFFFFF,
-                    ret_offset=0xFFFFFFFFFFFFFFFF,
-                    ret_size=0xFFFFFFFFFFFFFFFF,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0x0,
+                args_size=0xFFFFFFFFFFFFFFFF,
+                ret_offset=0x0,
+                ret_size=0xFFFFFFFFFFFFFFFF,
             )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                    args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                ),
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0x0,
+                args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                ret_offset=0x0,
+                ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
             )
-            + Op.DELEGATECALL(
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
                 gas=0x7FFFFFFFFFFFFFF,
-                address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                address=addr,
+                args_offset=0x0,
                 args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ret_offset=0x0,
                 ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x5a6cc254b318bb5f7539fcc10cfb01c517154c5c"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0))) + Op.STOP
-        ),
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0xFFFFFFFFFFFFFFFF,
+                args_size=0xFFFFFFFFFFFFFFFF,
+                ret_offset=0xFFFFFFFFFFFFFFFF,
+                ret_size=0xFFFFFFFFFFFFFFFF,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+            )
+        )
+        + Op.DELEGATECALL(
+            gas=0x7FFFFFFFFFFFFFF,
+            address=addr,
+            args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x849f53126ade5f72469029537296f2b6644d4d41"),  # noqa: E501
-    )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 1000000, 16777216]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 0}, balance=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_dup_bounds.py b/tests/ported_static/stMemoryStressTest/test_dup_bounds.py
index 1e47ba7cc36..8f413ec636b 100644
--- a/tests/ported_static/stMemoryStressTest/test_dup_bounds.py
+++ b/tests/ported_static/stMemoryStressTest/test_dup_bounds.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_dup_bounds.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/DUP_BoundsFiller.json
+state_tests/stMemoryStressTest/DUP_BoundsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +23,44 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/DUP_BoundsFiller.json"],
+    ["state_tests/stMemoryStressTest/DUP_BoundsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit",
+    "d, g, v",
     [
-        150000,
-        1000000,
-        16777216,
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="-g2",
+        ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_dup_bounds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x31B5AF02B012484AE954B3A43943242EDE546A2E76FC0A6ACC17435107C385EB
-    )
+    """Test_dup_bounds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x7FFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,486 +71,168 @@ def test_dup_bounds(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.POP(Op.DUP1)
-            + Op.POP
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.POP(Op.DUP1)
-            + Op.POP
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.POP(Op.DUP1)
-            + Op.POP
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.POP(Op.DUP1)
-            + Op.POP
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.POP(Op.DUP1)
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.DUP2)
-            + Op.POP
-            + Op.POP
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.POP(Op.DUP2)
-            + Op.POP
-            + Op.POP
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.POP(Op.DUP2)
-            + Op.POP
-            + Op.POP
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.POP(Op.DUP2)
-            + Op.POP
-            + Op.POP
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.POP(Op.DUP2)
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.DUP3)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.POP(Op.DUP3)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.POP(Op.DUP3)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.POP(Op.DUP3)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.POP(Op.DUP3)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.DUP4)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.POP(Op.DUP4)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.POP(Op.DUP4)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.POP(Op.DUP4)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.POP(Op.DUP4)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.DUP5)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.POP(Op.DUP5)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.POP(Op.DUP5)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.POP(Op.DUP5)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.POP(Op.DUP5)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.DUP6)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.POP(Op.DUP6)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.POP(Op.DUP6)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.POP(Op.DUP6)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.POP(Op.DUP6)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.DUP7)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.POP(Op.DUP7)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.POP(Op.DUP7)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.POP(Op.DUP7)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.POP(Op.DUP7)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.DUP8)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.POP(Op.DUP8)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.POP(Op.DUP8)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.POP(Op.DUP8)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.DUP8
-        ),
+    # Source: raw
+    # 0x600080505063ffffffff80505067ffffffffffffffff8050506fffffffffffffffffffffffffffffffff8050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff805050600060008150505063ffffffff63ffffffff8150505067ffffffffffffffff67ffffffffffffffff815050506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff815050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81505050600060006000825050505063ffffffff63ffffffff63ffffffff825050505067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff82505050506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff82505050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8250505050600060006000600083505050505063ffffffff63ffffffff63ffffffff63ffffffff83505050505067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff8350505050506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff8350505050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff835050505050600060006000600060008450505050505063ffffffff63ffffffff63ffffffff63ffffffff63ffffffff8450505050505067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff845050505050506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff845050505050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff84505050505050600060006000600060006000855050505050505063ffffffff63ffffffff63ffffffff63ffffffff63ffffffff63ffffffff855050505050505067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff85505050505050506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff85505050505050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8550505050505050600060006000600060006000600086505050505050505063ffffffff63ffffffff63ffffffff63ffffffff63ffffffff63ffffffff63ffffffff86505050505050505067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff8650505050505050506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff8650505050505050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff865050505050505050600060006000600060006000600060008750505050505050505063ffffffff63ffffffff63ffffffff63ffffffff63ffffffff63ffffffff63ffffffff63ffffffff8750505050505050505067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff875050505050505050506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff875050505050505050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff87  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.POP(Op.DUP1)
+        + Op.POP
+        + Op.PUSH4[0xFFFFFFFF]
+        + Op.POP(Op.DUP1)
+        + Op.POP
+        + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
+        + Op.POP(Op.DUP1)
+        + Op.POP
+        + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.POP(Op.DUP1)
+        + Op.POP
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.POP(Op.DUP1)
+        + Op.POP
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.DUP2)
+        + Op.POP * 2
+        + Op.PUSH4[0xFFFFFFFF] * 2
+        + Op.POP(Op.DUP2)
+        + Op.POP * 2
+        + Op.PUSH8[0xFFFFFFFFFFFFFFFF] * 2
+        + Op.POP(Op.DUP2)
+        + Op.POP * 2
+        + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.POP(Op.DUP2)
+        + Op.POP * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.POP(Op.DUP2)
+        + Op.POP * 2
+        + Op.PUSH1[0x0] * 3
+        + Op.POP(Op.DUP3)
+        + Op.POP * 3
+        + Op.PUSH4[0xFFFFFFFF] * 3
+        + Op.POP(Op.DUP3)
+        + Op.POP * 3
+        + Op.PUSH8[0xFFFFFFFFFFFFFFFF] * 3
+        + Op.POP(Op.DUP3)
+        + Op.POP * 3
+        + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 3
+        + Op.POP(Op.DUP3)
+        + Op.POP * 3
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 3
+        + Op.POP(Op.DUP3)
+        + Op.POP * 3
+        + Op.PUSH1[0x0] * 4
+        + Op.POP(Op.DUP4)
+        + Op.POP * 4
+        + Op.PUSH4[0xFFFFFFFF] * 4
+        + Op.POP(Op.DUP4)
+        + Op.POP * 4
+        + Op.PUSH8[0xFFFFFFFFFFFFFFFF] * 4
+        + Op.POP(Op.DUP4)
+        + Op.POP * 4
+        + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 4
+        + Op.POP(Op.DUP4)
+        + Op.POP * 4
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 4
+        + Op.POP(Op.DUP4)
+        + Op.POP * 4
+        + Op.PUSH1[0x0] * 5
+        + Op.POP(Op.DUP5)
+        + Op.POP * 5
+        + Op.PUSH4[0xFFFFFFFF] * 5
+        + Op.POP(Op.DUP5)
+        + Op.POP * 5
+        + Op.PUSH8[0xFFFFFFFFFFFFFFFF] * 5
+        + Op.POP(Op.DUP5)
+        + Op.POP * 5
+        + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 5
+        + Op.POP(Op.DUP5)
+        + Op.POP * 5
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 5
+        + Op.POP(Op.DUP5)
+        + Op.POP * 5
+        + Op.PUSH1[0x0] * 6
+        + Op.POP(Op.DUP6)
+        + Op.POP * 6
+        + Op.PUSH4[0xFFFFFFFF] * 6
+        + Op.POP(Op.DUP6)
+        + Op.POP * 6
+        + Op.PUSH8[0xFFFFFFFFFFFFFFFF] * 6
+        + Op.POP(Op.DUP6)
+        + Op.POP * 6
+        + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 6
+        + Op.POP(Op.DUP6)
+        + Op.POP * 6
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 6
+        + Op.POP(Op.DUP6)
+        + Op.POP * 6
+        + Op.PUSH1[0x0] * 7
+        + Op.POP(Op.DUP7)
+        + Op.POP * 7
+        + Op.PUSH4[0xFFFFFFFF] * 7
+        + Op.POP(Op.DUP7)
+        + Op.POP * 7
+        + Op.PUSH8[0xFFFFFFFFFFFFFFFF] * 7
+        + Op.POP(Op.DUP7)
+        + Op.POP * 7
+        + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 7
+        + Op.POP(Op.DUP7)
+        + Op.POP * 7
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 7
+        + Op.POP(Op.DUP7)
+        + Op.POP * 7
+        + Op.PUSH1[0x0] * 8
+        + Op.POP(Op.DUP8)
+        + Op.POP * 8
+        + Op.PUSH4[0xFFFFFFFF] * 8
+        + Op.POP(Op.DUP8)
+        + Op.POP * 8
+        + Op.PUSH8[0xFFFFFFFFFFFFFFFF] * 8
+        + Op.POP(Op.DUP8)
+        + Op.POP * 8
+        + Op.PUSH16[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 8
+        + Op.POP(Op.DUP8)
+        + Op.POP * 8
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 8
+        + Op.DUP8,
         nonce=0,
-        address=Address("0xe860bd7bf0474923e526cbe86fa5b5f76aee36ed"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x7FFFFFFFFFFFFFFF)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 1000000, 16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post: dict = {}
+    post = {target: Account(balance=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_fill_stack.py b/tests/ported_static/stMemoryStressTest/test_fill_stack.py
index 5ea3d5e0bb4..ecb5ba40c04 100644
--- a/tests/ported_static/stMemoryStressTest/test_fill_stack.py
+++ b/tests/ported_static/stMemoryStressTest/test_fill_stack.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_fill_stack.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/FillStackFiller.json
+state_tests/stMemoryStressTest/FillStackFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/FillStackFiller.json"],
+    ["state_tests/stMemoryStressTest/FillStackFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (3141592, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_fill_stack(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0x23000FE3D08CDEBA75EB2E2E2909F842DBF48AA0C566F49101E8285C8DEC62D6
-    )
+    """Test_fill_stack."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0x152D02C7E14AF6800000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,67 +68,108 @@ def test_fill_stack(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x5b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3504357155320803a975560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.GASLIMIT
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x1]
+        + Op.JUMPI(pc=Op.NUMBER, condition=Op.PUSH32[0xC350])
+        + Op.ISZERO
+        + Op.MSTORE8
+        + Op.SHA3
+        + Op.DUP1
+        + Op.GASPRICE
+        + Op.SWAP8
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.GASLIMIT
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.JUMPI(pc=Op.NUMBER, condition=Op.PUSH32[0xC350])
-            + Op.ISZERO
-            + Op.MSTORE8
-            + Op.SHA3
-            + Op.DUP1
-            + Op.GASPRICE
-            + Op.SWAP8
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x709ee68118ab00ce0bab659c9aa89744b35703fa"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x152D02C7E14AF6800000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "5b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3504357155320803a975560005155"  # noqa: E501
+                    ),
+                    balance=0,
+                    nonce=0,
+                ),
+                coinbase: Account(
+                    storage={},
+                    code=bytes.fromhex("6000355415600957005b60203560003555"),
+                    nonce=0,
+                ),
+                sender: Account(storage={}, code=b"", nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "5b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3504357155320803a975560005155"  # noqa: E501
+                    ),
+                    balance=0,
+                    nonce=0,
+                ),
+                coinbase: Account(
+                    storage={},
+                    code=bytes.fromhex("6000355415600957005b60203560003555"),
+                    nonce=0,
+                ),
+                sender: Account(storage={}, code=b"", nonce=1),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(
+            "5b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3504357155320803a97"  # noqa: E501
+        ),
+    ]
+    tx_gas = [3141592, 16777216]
+    tx_value = [264050067]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "5b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f000000"  # noqa: E501
-            "00000000000000000100000000000000000000000000000000000000007f000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000017f000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000c3504357155320803a97"
-        ),
-        gas_limit=tx_gas_limit,
-        value=264050067,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_jump_bounds.py b/tests/ported_static/stMemoryStressTest/test_jump_bounds.py
index f8e8615ec3f..2a1a55e636a 100644
--- a/tests/ported_static/stMemoryStressTest/test_jump_bounds.py
+++ b/tests/ported_static/stMemoryStressTest/test_jump_bounds.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_jump_bounds.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/JUMP_BoundsFiller.json
+state_tests/stMemoryStressTest/JUMP_BoundsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +23,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/JUMP_BoundsFiller.json"],
+    ["state_tests/stMemoryStressTest/JUMP_BoundsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_jump_bounds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x31B5AF02B012484AE954B3A43943242EDE546A2E76FC0A6ACC17435107C385EB
-    )
+    """Test_jump_bounds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x7FFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,22 +65,27 @@ def test_jump_bounds(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (JUMP 0) }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.JUMP(pc=0x0) + Op.STOP,
         nonce=0,
-        address=Address("0xb2448deb71e9fd31ed854e3b856f729adbc0c288"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x7FFFFFFFFFFFFFFF)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(balance=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_jump_bounds2.py b/tests/ported_static/stMemoryStressTest/test_jump_bounds2.py
index 6280e26c56c..eaaebf34d20 100644
--- a/tests/ported_static/stMemoryStressTest/test_jump_bounds2.py
+++ b/tests/ported_static/stMemoryStressTest/test_jump_bounds2.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_jump_bounds2.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/JUMP_Bounds2Filler.json
+state_tests/stMemoryStressTest/JUMP_Bounds2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +23,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/JUMP_Bounds2Filler.json"],
+    ["state_tests/stMemoryStressTest/JUMP_Bounds2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_jump_bounds2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x31B5AF02B012484AE954B3A43943242EDE546A2E76FC0A6ACC17435107C385EB
-    )
+    """Test_jump_bounds2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x7FFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,28 +65,39 @@ def test_jump_bounds2(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMP(pc=0xFFFFFFFF)
-            + Op.JUMP(pc=0xFFFFFFFFFFFFFFFF)
-            + Op.JUMP(pc=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.JUMP(
-                pc=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
+    # Source: raw
+    # 0x63ffffffff5667ffffffffffffffff566fffffffffffffffffffffffffffffffff567fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff56  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMP(pc=0xFFFFFFFF)
+        + Op.JUMP(pc=0xFFFFFFFFFFFFFFFF)
+        + Op.JUMP(pc=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.JUMP(
+            pc=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xde573d26b8c4a55fd9daa17e8f93347c269ee4f6"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x7FFFFFFFFFFFFFFF)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        target: Account(
+            code=bytes.fromhex(
+                "63ffffffff5667ffffffffffffffff566fffffffffffffffffffffffffffffffff567fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff56"  # noqa: E501
+            ),
+            balance=0,
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_jumpi_bounds.py b/tests/ported_static/stMemoryStressTest/test_jumpi_bounds.py
index 516e8c8d190..fcb17d5633e 100644
--- a/tests/ported_static/stMemoryStressTest/test_jumpi_bounds.py
+++ b/tests/ported_static/stMemoryStressTest/test_jumpi_bounds.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_jumpi_bounds.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/JUMPI_BoundsFiller.json
+state_tests/stMemoryStressTest/JUMPI_BoundsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +23,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/JUMPI_BoundsFiller.json"],
+    ["state_tests/stMemoryStressTest/JUMPI_BoundsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_jumpi_bounds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x31B5AF02B012484AE954B3A43943242EDE546A2E76FC0A6ACC17435107C385EB
-    )
+    """Test_jumpi_bounds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x7FFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,31 +65,41 @@ def test_jumpi_bounds(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (JUMPI 0xffffffff 1) (JUMPI 0xffffffffffffffff 1) (JUMPI 0xffffffffffffffffffffffffffffffff 1) (JUMPI 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0xFFFFFFFF, condition=0x1)
-            + Op.JUMPI(pc=0xFFFFFFFFFFFFFFFF, condition=0x1)
-            + Op.JUMPI(pc=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, condition=0x1)
-            + Op.JUMPI(
-                pc=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                condition=0x1,
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0xFFFFFFFF, condition=0x1)
+        + Op.JUMPI(pc=0xFFFFFFFFFFFFFFFF, condition=0x1)
+        + Op.JUMPI(pc=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, condition=0x1)
+        + Op.JUMPI(
+            pc=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            condition=0x1,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x147f3300e29f2f09880e97b81f7b3ebcf78863e9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x7FFFFFFFFFFFFFFF)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        target: Account(
+            code=bytes.fromhex(
+                "600163ffffffff57600167ffffffffffffffff5760016fffffffffffffffffffffffffffffffff5760017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5700"  # noqa: E501
+            ),
+            balance=0,
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_mload32bit_bound.py b/tests/ported_static/stMemoryStressTest/test_mload32bit_bound.py
index 7a3d29a32c2..5763dad5154 100644
--- a/tests/ported_static/stMemoryStressTest/test_mload32bit_bound.py
+++ b/tests/ported_static/stMemoryStressTest/test_mload32bit_bound.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_mload32bit_bound.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/mload32bitBoundFiller.json
+state_tests/stMemoryStressTest/mload32bitBoundFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/mload32bitBoundFiller.json"],
+    ["state_tests/stMemoryStressTest/mload32bitBoundFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_mload32bit_bound(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA3A3360EDACC183E5D6D28657FC0A09CD4819B2C73A02881B04471F81BE35A5A
-    )
+    """Test_mload32bit_bound."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3E801F4FA93760)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,23 +68,56 @@ def test_mload32bit_bound(
         gas_limit=17592320524892,
     )
 
-    pre[sender] = Account(balance=0x3E801F4FA93760)
-    # Source: LLL
+    # Source: lll
     # { [[ 1 ]] (MLOAD 4294967296) }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x100000000)) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x74639acdfe345f749d595381961dac48c3c5e56a"),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex("6401000000005160015500"),
+                    nonce=0,
+                ),
+                sender: Account(storage={}, code=b"", nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex("6401000000005160015500"),
+                    nonce=0,
+                ),
+                sender: Account(storage={}, code=b"", nonce=1),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [10]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_mload32bit_bound2.py b/tests/ported_static/stMemoryStressTest/test_mload32bit_bound2.py
index a64fa5fc6e6..322e11428e8 100644
--- a/tests/ported_static/stMemoryStressTest/test_mload32bit_bound2.py
+++ b/tests/ported_static/stMemoryStressTest/test_mload32bit_bound2.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_mload32bit_bound2.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/mload32bitBound2Filler.json
+state_tests/stMemoryStressTest/mload32bitBound2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stMemoryStressTest/mload32bitBound2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stMemoryStressTest/mload32bitBound2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_mload32bit_bound2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xD566533F0CCAB46749AC8725E15DA8CE513758257002A8B481F6F5F96484C5ED
-    )
+    """Test_mload32bit_bound2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x157B5373E07CA)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,23 +68,56 @@ def test_mload32bit_bound2(
         gas_limit=37791080412587,
     )
 
-    pre[sender] = Account(balance=0x157B5373E07CA)
-    # Source: LLL
+    # Source: lll
     # { [[ 1 ]] (MLOAD 6294967296) }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x177359400)) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc287e277d2163771e55d630bdd96c6405a6fe251"),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex("6401773594005160015500"),
+                    nonce=0,
+                ),
+                sender: Account(storage={}, code=b"", nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex("6401773594005160015500"),
+                    nonce=0,
+                ),
+                sender: Account(storage={}, code=b"", nonce=1),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [10]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_mload32bit_bound_msize.py b/tests/ported_static/stMemoryStressTest/test_mload32bit_bound_msize.py
index 560259ff6ba..ccff8e7bdf2 100644
--- a/tests/ported_static/stMemoryStressTest/test_mload32bit_bound_msize.py
+++ b/tests/ported_static/stMemoryStressTest/test_mload32bit_bound_msize.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_mload32bit_bound_msize.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/mload32bitBound_MsizeFiller.json
+state_tests/stMemoryStressTest/mload32bitBound_MsizeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stMemoryStressTest/mload32bitBound_MsizeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stMemoryStressTest/mload32bitBound_MsizeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_mload32bit_bound_msize(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7DD14755C573E37C1F649B0C53B9815F76AEBD636DF7CCFA97F4579F33BA59A0
-    )
+    """Test_mload32bit_bound_msize."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x186A0C3B1E19A180)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,26 +68,56 @@ def test_mload32bit_bound_msize(
         gas_limit=175923205248920000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [4294967295] 1 [[ 0 ]] (MSIZE)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0xFFFFFFFF, value=0x1)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0xFFFFFFFF, value=0x1)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x15d5a32351458ff3dca214bd202c21f066031ae1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x186A0C3B1E19A180)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={0: 0},
+                    code=bytes.fromhex("600163ffffffff525960005500"),
+                    nonce=0,
+                ),
+                sender: Account(storage={}, code=b"", nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={0: 0},
+                    code=bytes.fromhex("600163ffffffff525960005500"),
+                    nonce=0,
+                ),
+                sender: Account(storage={}, code=b"", nonce=1),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_mload32bit_bound_return.py b/tests/ported_static/stMemoryStressTest/test_mload32bit_bound_return.py
index e80435e785f..26035b812b3 100644
--- a/tests/ported_static/stMemoryStressTest/test_mload32bit_bound_return.py
+++ b/tests/ported_static/stMemoryStressTest/test_mload32bit_bound_return.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_mload32bit_bound_return.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/mload32bitBound_returnFiller.json
+state_tests/stMemoryStressTest/mload32bitBound_returnFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +23,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stMemoryStressTest/mload32bitBound_returnFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stMemoryStressTest/mload32bitBound_returnFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_mload32bit_bound_return(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7DD14755C573E37C1F649B0C53B9815F76AEBD636DF7CCFA97F4579F33BA59A0
-    )
+    """Test_mload32bit_bound_return."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x186A0C3B1E19A180)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,22 +65,26 @@ def test_mload32bit_bound_return(
         gas_limit=17592320524892,
     )
 
-    pre[sender] = Account(balance=0x186A0C3B1E19A180)
-    # Source: LLL
+    # Source: lll
     # { (RETURN 0 4294967295) }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.RETURN(offset=0x0, size=0xFFFFFFFF) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd9cba08b7a9695800f57e226045176cf420ca0c1"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_mload32bit_bound_return2.py b/tests/ported_static/stMemoryStressTest/test_mload32bit_bound_return2.py
index 27278373a8a..a6ff16bdf72 100644
--- a/tests/ported_static/stMemoryStressTest/test_mload32bit_bound_return2.py
+++ b/tests/ported_static/stMemoryStressTest/test_mload32bit_bound_return2.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_mload32bit_bound_return2.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/mload32bitBound_return2Filler.json
+state_tests/stMemoryStressTest/mload32bitBound_return2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +23,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stMemoryStressTest/mload32bitBound_return2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stMemoryStressTest/mload32bitBound_return2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_mload32bit_bound_return2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7DD14755C573E37C1F649B0C53B9815F76AEBD636DF7CCFA97F4579F33BA59A0
-    )
+    """Test_mload32bit_bound_return2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x186A0C3B1E19A180)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,26 +65,28 @@ def test_mload32bit_bound_return2(
         gas_limit=175923205248920000,
     )
 
-    pre[sender] = Account(balance=0x186A0C3B1E19A180)
-    # Source: LLL
+    # Source: lll
     # { [ 0 ] 1 (RETURN 0 4294967295) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x1)
-            + Op.RETURN(offset=0x0, size=0xFFFFFFFF)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x1)
+        + Op.RETURN(offset=0x0, size=0xFFFFFFFF)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x48c46c265c6883f765eea264f561fe7637968b4e"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_mload_bounds.py b/tests/ported_static/stMemoryStressTest/test_mload_bounds.py
index 3f5d21262ed..4a0eff0c7e6 100644
--- a/tests/ported_static/stMemoryStressTest/test_mload_bounds.py
+++ b/tests/ported_static/stMemoryStressTest/test_mload_bounds.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_mload_bounds.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/MLOAD_BoundsFiller.json
+state_tests/stMemoryStressTest/MLOAD_BoundsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +23,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/MLOAD_BoundsFiller.json"],
+    ["state_tests/stMemoryStressTest/MLOAD_BoundsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_mload_bounds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xFE5BE118AD5955E30E0FFC4E1F1BBDCAA7F5A67CB1426C4AC19E32C80ECCDC06
-    )
+    """Test_mload_bounds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x7FFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,26 +65,29 @@ def test_mload_bounds(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MLOAD 0) (MLOAD 0xffffffff) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(Op.MLOAD(offset=0x0))
-            + Op.MLOAD(offset=0xFFFFFFFF)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.MLOAD(offset=0x0))
+        + Op.MLOAD(offset=0xFFFFFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8b0647e983082e6923f7b20e38972690fce91e9b"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x7FFFFFFFFFFFFFFFFFF)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(balance=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_mload_bounds2.py b/tests/ported_static/stMemoryStressTest/test_mload_bounds2.py
index d1ff7ab931e..e35d61df04c 100644
--- a/tests/ported_static/stMemoryStressTest/test_mload_bounds2.py
+++ b/tests/ported_static/stMemoryStressTest/test_mload_bounds2.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_mload_bounds2.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/MLOAD_Bounds2Filler.json
+state_tests/stMemoryStressTest/MLOAD_Bounds2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +23,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/MLOAD_Bounds2Filler.json"],
+    ["state_tests/stMemoryStressTest/MLOAD_Bounds2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_mload_bounds2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xFE5BE118AD5955E30E0FFC4E1F1BBDCAA7F5A67CB1426C4AC19E32C80ECCDC06
-    )
+    """Test_mload_bounds2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x7FFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,29 +65,32 @@ def test_mload_bounds2(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MLOAD 0xffffffffffffffff) (MLOAD 0xffffffffffffffffffffffffffffffff) (MLOAD 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(Op.MLOAD(offset=0xFFFFFFFFFFFFFFFF))
-            + Op.POP(Op.MLOAD(offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF))
-            + Op.MLOAD(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.MLOAD(offset=0xFFFFFFFFFFFFFFFF))
+        + Op.POP(Op.MLOAD(offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF))
+        + Op.MLOAD(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb581f1a0f5810ad50a1f96713df63eb8cb0ebf8a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x7FFFFFFFFFFFFFFFFFF)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(balance=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_mload_bounds3.py b/tests/ported_static/stMemoryStressTest/test_mload_bounds3.py
index ed5ac7a00ed..adef7836ab7 100644
--- a/tests/ported_static/stMemoryStressTest/test_mload_bounds3.py
+++ b/tests/ported_static/stMemoryStressTest/test_mload_bounds3.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_mload_bounds3.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/MLOAD_Bounds3Filler.json
+state_tests/stMemoryStressTest/MLOAD_Bounds3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/MLOAD_Bounds3Filler.json"],
+    ["state_tests/stMemoryStressTest/MLOAD_Bounds3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
 @pytest.mark.parametrize(
-    "tx_gas_limit",
+    "d, g, v",
     [
-        35000000,
-        250000000,
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_mload_bounds3(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xFE5BE118AD5955E30E0FFC4E1F1BBDCAA7F5A67CB1426C4AC19E32C80ECCDC06
-    )
+    """Test_mload_bounds3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x7FFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,22 +66,27 @@ def test_mload_bounds3(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  (MLOAD 0x400000) }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.MLOAD(offset=0x400000) + Op.STOP,
         nonce=0,
-        address=Address("0xb4b66eef4a593bfd61289ec192af659c68266259"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x7FFFFFFFFFFFFFFFFFF)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [35000000, 250000000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post: dict = {}
+    post = {target: Account(balance=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_mstore_bounds.py b/tests/ported_static/stMemoryStressTest/test_mstore_bounds.py
index cb006ee3323..49713f67bc8 100644
--- a/tests/ported_static/stMemoryStressTest/test_mstore_bounds.py
+++ b/tests/ported_static/stMemoryStressTest/test_mstore_bounds.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_mstore_bounds.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/MSTORE_BoundsFiller.json
+state_tests/stMemoryStressTest/MSTORE_BoundsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,28 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/MSTORE_BoundsFiller.json"],
+    ["state_tests/stMemoryStressTest/MSTORE_BoundsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_mstore_bounds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x50EADFB1030587AB3A993A6ECC073041FC3B45E119DAA31A13D78C7E209631A5
+    """Test_mstore_bounds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
 
     env = Environment(
@@ -55,24 +67,27 @@ def test_mstore_bounds(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  (MSTORE 0xffffffffffffffff 1)}
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0xFFFFFFFFFFFFFFFF, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x3634c48093587d5dab61c69ee815d8e8752e9312"),  # noqa: E501
-    )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(balance=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_mstore_bounds2.py b/tests/ported_static/stMemoryStressTest/test_mstore_bounds2.py
index 7b933dd4b27..93358c7451f 100644
--- a/tests/ported_static/stMemoryStressTest/test_mstore_bounds2.py
+++ b/tests/ported_static/stMemoryStressTest/test_mstore_bounds2.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_mstore_bounds2.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/MSTORE_Bounds2Filler.json
+state_tests/stMemoryStressTest/MSTORE_Bounds2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,28 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/MSTORE_Bounds2Filler.json"],
+    ["state_tests/stMemoryStressTest/MSTORE_Bounds2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_mstore_bounds2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x50EADFB1030587AB3A993A6ECC073041FC3B45E119DAA31A13D78C7E209631A5
+    """Test_mstore_bounds2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
 
     env = Environment(
@@ -55,24 +67,27 @@ def test_mstore_bounds2(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-    )
-    # Source: LLL
+    # Source: lll
     # {  (MSTORE 0xffffffffff 1)}
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0xFFFFFFFFFF, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0xdd1868b8341812c23c84da08446bc70919a815df"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(balance=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_mstore_bounds2a.py b/tests/ported_static/stMemoryStressTest/test_mstore_bounds2a.py
index 189c46c2e4f..82cbcebb094 100644
--- a/tests/ported_static/stMemoryStressTest/test_mstore_bounds2a.py
+++ b/tests/ported_static/stMemoryStressTest/test_mstore_bounds2a.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_mstore_bounds2a.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/MSTORE_Bounds2aFiller.json
+state_tests/stMemoryStressTest/MSTORE_Bounds2aFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/MSTORE_Bounds2aFiller.json"],
+    ["state_tests/stMemoryStressTest/MSTORE_Bounds2aFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (250000000, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_mstore_bounds2a(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x50EADFB1030587AB3A993A6ECC073041FC3B45E119DAA31A13D78C7E209631A5
+    """Test_mstore_bounds2a."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
 
     env = Environment(
@@ -56,24 +71,41 @@ def test_mstore_bounds2a(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  (MSTORE 0x3fffff 1)}
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3FFFFF, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x10da52cbd00939aebe8218a1dd2eda0bffe93f30"),  # noqa: E501
-    )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(balance=1)},
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(balance=0)},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 250000000]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_pop_bounds.py b/tests/ported_static/stMemoryStressTest/test_pop_bounds.py
index fb717dbd08a..70870df24b0 100644
--- a/tests/ported_static/stMemoryStressTest/test_pop_bounds.py
+++ b/tests/ported_static/stMemoryStressTest/test_pop_bounds.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_pop_bounds.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/POP_BoundsFiller.json
+state_tests/stMemoryStressTest/POP_BoundsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,28 +23,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/POP_BoundsFiller.json"],
+    ["state_tests/stMemoryStressTest/POP_BoundsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit",
+    "d, g, v",
     [
-        150000,
-        16777216,
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_pop_bounds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xFE5BE118AD5955E30E0FFC4E1F1BBDCAA7F5A67CB1426C4AC19E32C80ECCDC06
-    )
+    """Test_pop_bounds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x7FFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -54,31 +65,34 @@ def test_pop_bounds(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (POP 0) (POP 0xffffffff) (POP 0xffffffffffffffff) (POP 0xffffffffffffffffffffffffffffffff) (POP 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(0x0)
-            + Op.POP(0xFFFFFFFF)
-            + Op.POP(0xFFFFFFFFFFFFFFFF)
-            + Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.POP(
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(0x0)
+        + Op.POP(0xFFFFFFFF)
+        + Op.POP(0xFFFFFFFFFFFFFFFF)
+        + Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.POP(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x5bd3610afcec3b0c20466ca011b505497b0009f0"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x7FFFFFFFFFFFFFFFFFF)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post: dict = {}
+    post = {target: Account(balance=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_return_bounds.py b/tests/ported_static/stMemoryStressTest/test_return_bounds.py
index 7fbf88a4244..8014fe56cb0 100644
--- a/tests/ported_static/stMemoryStressTest/test_return_bounds.py
+++ b/tests/ported_static/stMemoryStressTest/test_return_bounds.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_return_bounds.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/RETURN_BoundsFiller.json
+state_tests/stMemoryStressTest/RETURN_BoundsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,77 +26,45 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/RETURN_BoundsFiller.json"],
+    ["state_tests/stMemoryStressTest/RETURN_BoundsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (
-            500000,
-            {
-                Address("0xd66a0237ee5d25106fc05bc767734bddba1fab35"): Account(
-                    storage={
-                        1: 1,
-                        2: 1,
-                        3: 1,
-                        4: 1,
-                        5: 1,
-                        6: 1,
-                        7: 1,
-                        8: 1,
-                        9: 1,
-                        10: 1,
-                        11: 1,
-                        12: 1,
-                        13: 1,
-                        14: 1,
-                        15: 1,
-                        16: 1,
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
         ),
-        (
-            15000000,
-            {
-                Address("0xd66a0237ee5d25106fc05bc767734bddba1fab35"): Account(
-                    storage={
-                        1: 1,
-                        2: 1,
-                        3: 1,
-                        4: 1,
-                        5: 1,
-                        6: 1,
-                        7: 1,
-                        8: 1,
-                        9: 1,
-                        10: 1,
-                        11: 1,
-                        12: 1,
-                        13: 1,
-                        14: 1,
-                        15: 1,
-                        16: 1,
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="-g2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_return_bounds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x50EADFB1030587AB3A993A6ECC073041FC3B45E119DAA31A13D78C7E209631A5
+    """Test_return_bounds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
 
     env = Environment(
@@ -104,329 +76,370 @@ def test_return_bounds(
         gas_limit=9223372036854775807,
     )
 
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0xFFFFFFF, size=0xFFFFFFF) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0 0) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0x0, size=0x0) + Op.STOP,
         nonce=0,
-        address=Address("0x07084994c5891b1467d74bedb0477da4909e4c0e"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0x0, size=0xFFFFFFFFFFFFFFFF) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0xfffffff 0) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFF, size=0x0) + Op.STOP,
         nonce=0,
-        address=Address("0x0b09ca4308585f026b8d02be147fea0739ec463a"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (RETURN 0xffffffff 0)  }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFFF, size=0x0) + Op.STOP,
         nonce=0,
-        address=Address("0x2548bda95a3831abcd613f4d24e4634615a71cca"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(
-                offset=0x0,
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0xffffffffffffffff 0) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFFFFFFFFFFF, size=0x0) + Op.STOP,
         nonce=0,
-        address=Address("0x28463490948d21efc49949b4d394989bf52c57f1"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0x0, size=0xFFFFFFFF) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0xfffffffffffffffffffffffffff 0) }
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF, size=0x0)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2ceb88d6c420e5c65593d9ebed9a25600ab9e113"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(offset=0xFFFFFFFFFFFFFFFF, size=0xFFFFFFFFFFFFFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0)  }  # noqa: E501
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x416408c1d7fda274ddeb45ffe4817068808121ca"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0 0xfffffff) }
+    addr_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0x0, size=0xFFFFFFF) + Op.STOP,
         nonce=0,
-        address=Address("0x4912bc7b66a3bf27adfa54ab049e90e8c9c4dc63"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0x0, size=0x0) + Op.STOP,
+    # Source: lll
+    # {  (RETURN 0 0xffffffff)  }
+    addr_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0x0, size=0xFFFFFFFF) + Op.STOP,
         nonce=0,
-        address=Address("0x5efbf04d8e1cc5b6b3719b16b5744a09bacfc18b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0x0, size=0xFFFFFFF) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0 0xffffffffffffffff) }
+    addr_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0x0, size=0xFFFFFFFFFFFFFFFF) + Op.STOP,
         nonce=0,
-        address=Address("0x7266f1c07958d55ce36de0592604f1a915bdf1c2"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0 0xfffffffffffffffffffffffffff) }
+    addr_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0x0, size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x76006c948f3a0529479c6d18a6f95908426e8092"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF, size=0x0) + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  }  # noqa: E501
+    addr_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(
+            offset=0x0,
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x7a4461ac9f9cd13f40f9514a7c60e23a71c1dff3"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0xFFFFFFFFFFFFFFFF, size=0x0) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0xfffffff 0xfffffff) }
+    addr_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFF, size=0xFFFFFFF) + Op.STOP,
         nonce=0,
-        address=Address("0x7bbcf24c83493c4e733cb54079b51873d3211ad2"),  # noqa: E501
-    )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (RETURN 0xffffffff 0xffffffff)  }
+    addr_13 = pre.deploy_contract(  # noqa: F841
         code=Op.RETURN(offset=0xFFFFFFFF, size=0xFFFFFFFF) + Op.STOP,
         nonce=0,
-        address=Address("0xad7754a8a56cc5ad4e319fa94194e435628dee67"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0xFFFFFFF, size=0x0) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0xffffffffffffffff 0xffffffffffffffff) }
+    addr_14 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFFFFFFFFFFF, size=0xFFFFFFFFFFFFFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc7aa750fe05c7e38475a49fe98a301024d0c1d54"),  # noqa: E501
     )
-    # Source: LLL
-    # { [[1]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0 0 0) [[2]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000002> 0 0 0 0 0) [[3]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000003> 0 0 0 0 0) [[4]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000004> 0 0 0 0 0) [[5]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000005> 0 0 0 0 0) [[6]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[7]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[8]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[9]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[10]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[11]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[12]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[13]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[14]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[15]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[16]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x5EFBF04D8E1CC5B6B3719B16B5744A09BACFC18B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xC7AA750FE05C7E38475A49FE98A301024D0C1D54,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xFF6B6D23BE161344E86EB7B174ACEDD4B1DC6DC7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x4,
-                value=Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x7BBCF24C83493C4E733CB54079B51873D3211AD2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x5,
-                value=Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x7A4461AC9F9CD13F40F9514A7C60E23A71C1DFF3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x6,
-                value=Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x7,
-                value=Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x8,
-                value=Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xA,
-                value=Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xB,
-                value=Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xC,
-                value=Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xD,
-                value=Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xE,
-                value=Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xF,
-                value=Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x10,
-                value=Op.CALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0xfffffffffffffffffffffffffff 0xfffffffffffffffffffffffffff) }
+    addr_15 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xd66a0237ee5d25106fc05bc767734bddba1fab35"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(offset=0x0, size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF) + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  }  # noqa: E501
+    addr_16 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf519de4dcb9aaa53f8f0db9b18c715c928caade8"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0xFFFFFFFF, size=0x0) + Op.STOP,
+    # Source: lll
+    # { [[1]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0 0 0) [[2]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000002> 0 0 0 0 0) [[3]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000003> 0 0 0 0 0) [[4]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000004> 0 0 0 0 0) [[5]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000005> 0 0 0 0 0) [[6]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[7]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[8]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[9]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[10]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[11]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[12]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[13]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[14]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[15]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0) [[16]] (CALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0 0)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x4,
+            value=Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_4,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x5,
+            value=Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_5,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x6,
+            value=Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x7,
+            value=Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x8,
+            value=Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xA,
+            value=Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xB,
+            value=Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xC,
+            value=Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xD,
+            value=Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xE,
+            value=Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xF,
+            value=Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x10,
+            value=Op.CALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xff6b6d23be161344e86eb7b174acedd4b1dc6dc7"),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={}, balance=0)},
+        },
+        {
+            "indexes": {"data": -1, "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        1: 1,
+                        2: 1,
+                        3: 1,
+                        4: 1,
+                        5: 1,
+                        6: 1,
+                        7: 1,
+                        8: 1,
+                        9: 1,
+                        10: 1,
+                        11: 1,
+                        12: 1,
+                        13: 1,
+                        14: 1,
+                        15: 1,
+                        16: 1,
+                    },
+                    balance=1,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 500000, 15000000]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_sload_bounds.py b/tests/ported_static/stMemoryStressTest/test_sload_bounds.py
index ad4d4e5ea11..1c04ca420b1 100644
--- a/tests/ported_static/stMemoryStressTest/test_sload_bounds.py
+++ b/tests/ported_static/stMemoryStressTest/test_sload_bounds.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_sload_bounds.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/SLOAD_BoundsFiller.json
+state_tests/stMemoryStressTest/SLOAD_BoundsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,28 +23,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/SLOAD_BoundsFiller.json"],
+    ["state_tests/stMemoryStressTest/SLOAD_BoundsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit",
+    "d, g, v",
     [
-        150000,
-        16777216,
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sload_bounds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xFE5BE118AD5955E30E0FFC4E1F1BBDCAA7F5A67CB1426C4AC19E32C80ECCDC06
-    )
+    """Test_sload_bounds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x7FFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -54,31 +65,34 @@ def test_sload_bounds(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (SLOAD 0) (SLOAD 0xffffffff) (SLOAD 0xffffffffffffffff) (SLOAD 0xffffffffffffffffffffffffffffffff) (SLOAD 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(Op.SLOAD(key=0x0))
-            + Op.POP(Op.SLOAD(key=0xFFFFFFFF))
-            + Op.POP(Op.SLOAD(key=0xFFFFFFFFFFFFFFFF))
-            + Op.POP(Op.SLOAD(key=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF))
-            + Op.SLOAD(
-                key=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SLOAD(key=0x0))
+        + Op.POP(Op.SLOAD(key=0xFFFFFFFF))
+        + Op.POP(Op.SLOAD(key=0xFFFFFFFFFFFFFFFF))
+        + Op.POP(Op.SLOAD(key=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF))
+        + Op.SLOAD(
+            key=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1b71c198ea09541afb8301905a0a80d026ebfa17"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x7FFFFFFFFFFFFFFFFFF)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post: dict = {}
+    post = {target: Account(balance=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_sstore_bounds.py b/tests/ported_static/stMemoryStressTest/test_sstore_bounds.py
index 7965ba0d7da..3aee2e858ab 100644
--- a/tests/ported_static/stMemoryStressTest/test_sstore_bounds.py
+++ b/tests/ported_static/stMemoryStressTest/test_sstore_bounds.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_sstore_bounds.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/SSTORE_BoundsFiller.json
+state_tests/stMemoryStressTest/SSTORE_BoundsFiller.json
 """
 
 import pytest
@@ -11,10 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,42 +27,37 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryStressTest/SSTORE_BoundsFiller.json"],
+    ["state_tests/stMemoryStressTest/SSTORE_BoundsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (
-            16777216,
-            {
-                Address("0x1f2aee312c3c47bdeb27ff5275fddb33c543e394"): Account(
-                    storage={
-                        32: 0xFFFFFFFF,
-                        64: 0xFFFFFFFFFFFFFFFF,
-                        128: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                        256: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                        0xFFFFFFFF: 1,
-                        0xFFFFFFFFFFFFFFFF: 1,
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 1,
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 1,  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_bounds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_sstore_bounds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xFE5BE118AD5955E30E0FFC4E1F1BBDCAA7F5A67CB1426C4AC19E32C80ECCDC06
     )
@@ -71,38 +71,71 @@ def test_sstore_bounds(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0x7FFFFFFFFFFFFFFFFFF)
+    # Source: lll
     # { (SSTORE 0xffffffff 1) (SSTORE 0xffffffffffffffff 1) (SSTORE 0xffffffffffffffffffffffffffffffff 1) (SSTORE 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1) (SSTORE 32 0xffffffff) (SSTORE 64 0xffffffffffffffff) (SSTORE 128 0xffffffffffffffffffffffffffffffff) (SSTORE 256 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0xFFFFFFFF, value=0x1)
-            + Op.SSTORE(key=0xFFFFFFFFFFFFFFFF, value=0x1)
-            + Op.SSTORE(key=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, value=0x1)
-            + Op.SSTORE(
-                key=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                value=0x1,
-            )
-            + Op.SSTORE(key=0x20, value=0xFFFFFFFF)
-            + Op.SSTORE(key=0x40, value=0xFFFFFFFFFFFFFFFF)
-            + Op.SSTORE(key=0x80, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.SSTORE(
-                key=0x100,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0xFFFFFFFF, value=0x1)
+        + Op.SSTORE(key=0xFFFFFFFFFFFFFFFF, value=0x1)
+        + Op.SSTORE(key=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, value=0x1)
+        + Op.SSTORE(
+            key=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            value=0x1,
+        )
+        + Op.SSTORE(key=0x20, value=0xFFFFFFFF)
+        + Op.SSTORE(key=0x40, value=0xFFFFFFFFFFFFFFFF)
+        + Op.SSTORE(key=0x80, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.SSTORE(
+            key=0x100,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1f2aee312c3c47bdeb27ff5275fddb33c543e394"),  # noqa: E501
+        address=Address(0x1F2AEE312C3C47BDEB27FF5275FDDB33C543E394),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x7FFFFFFFFFFFFFFFFFF)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        32: 0xFFFFFFFF,
+                        64: 0xFFFFFFFFFFFFFFFF,
+                        128: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                        256: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                        0xFFFFFFFF: 1,
+                        0xFFFFFFFFFFFFFFFF: 1,
+                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 1,
+                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 1,  # noqa: E501
+                    },
+                    balance=1,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={}, balance=0)},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_static_call_bounds.py b/tests/ported_static/stMemoryStressTest/test_static_call_bounds.py
index d305b26fa37..c6a2e86cb91 100644
--- a/tests/ported_static/stMemoryStressTest/test_static_call_bounds.py
+++ b/tests/ported_static/stMemoryStressTest/test_static_call_bounds.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_static_call_bounds.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/static_CALL_BoundsFiller.json
+state_tests/stMemoryStressTest/static_CALL_BoundsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,30 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stMemoryStressTest/static_CALL_BoundsFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stMemoryStressTest/static_CALL_BoundsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_static_call_bounds(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xEF111BBDAB3A1622936AFDFC9BBEC4B5BC05B4FA4B1EF0CE2A55CEF552F7650E
+    """Test_static_call_bounds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
     )
 
     env = Environment(
@@ -57,112 +67,115 @@ def test_static_call_bounds(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+    # Source: lll
+    # { (MSTORE 0 (ADD 1 (SLOAD 0))) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.STOP,
+        nonce=0,
     )
-    # Source: LLL
+    # Source: lll
     # {  (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0 0) (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xfffffff 0 0xfffffff) (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffff 0 0xffffffff) (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xfffffff 0 0xfffffff 0) (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffff 0 0xffffffff 0) (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffffffffffff 0 0xffffffffffffffff 0) (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff 0) (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0)  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xCC704D60C46B9C08AAB4D15281184441AC7ED35C,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xCC704D60C46B9C08AAB4D15281184441AC7ED35C,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFF,
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFF,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xCC704D60C46B9C08AAB4D15281184441AC7ED35C,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFFF,
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFFF,
-                ),
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0x0,
+                args_size=0xFFFFFFF,
+                ret_offset=0x0,
+                ret_size=0xFFFFFFF,
             )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xCC704D60C46B9C08AAB4D15281184441AC7ED35C,
-                    args_offset=0xFFFFFFF,
-                    args_size=0x0,
-                    ret_offset=0xFFFFFFF,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0x0,
+                args_size=0xFFFFFFFF,
+                ret_offset=0x0,
+                ret_size=0xFFFFFFFF,
             )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xCC704D60C46B9C08AAB4D15281184441AC7ED35C,
-                    args_offset=0xFFFFFFFF,
-                    args_size=0x0,
-                    ret_offset=0xFFFFFFFF,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0xFFFFFFF,
+                args_size=0x0,
+                ret_offset=0xFFFFFFF,
+                ret_size=0x0,
             )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xCC704D60C46B9C08AAB4D15281184441AC7ED35C,
-                    args_offset=0xFFFFFFFFFFFFFFFF,
-                    args_size=0x0,
-                    ret_offset=0xFFFFFFFFFFFFFFFF,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0xFFFFFFFF,
+                args_size=0x0,
+                ret_offset=0xFFFFFFFF,
+                ret_size=0x0,
             )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xCC704D60C46B9C08AAB4D15281184441AC7ED35C,
-                    args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    args_size=0x0,
-                    ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0xFFFFFFFFFFFFFFFF,
+                args_size=0x0,
+                ret_offset=0xFFFFFFFFFFFFFFFF,
+                ret_size=0x0,
             )
-            + Op.STATICCALL(
+        )
+        + Op.POP(
+            Op.STATICCALL(
                 gas=0x7FFFFFFFFFFFFFF,
-                address=0xCC704D60C46B9C08AAB4D15281184441AC7ED35C,
-                args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                address=addr,
+                args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
                 args_size=0x0,
-                ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x7f91c742985ac295da40f3771a1be98f99f6a357"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+        )
+        + Op.STATICCALL(
+            gas=0x7FFFFFFFFFFFFFF,
+            address=addr,
+            args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            args_size=0x0,
+            ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xcc704d60c46b9c08aab4d15281184441ac7ed35c"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        target: Account(balance=0),
+        addr: Account(storage={0: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_static_call_bounds2.py b/tests/ported_static/stMemoryStressTest/test_static_call_bounds2.py
index 83dc6bc1538..b4d70c3de24 100644
--- a/tests/ported_static/stMemoryStressTest/test_static_call_bounds2.py
+++ b/tests/ported_static/stMemoryStressTest/test_static_call_bounds2.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_static_call_bounds2.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds2Filler.json
+state_tests/stMemoryStressTest/static_CALL_Bounds2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,30 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stMemoryStressTest/static_CALL_Bounds2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_static_call_bounds2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xEF111BBDAB3A1622936AFDFC9BBEC4B5BC05B4FA4B1EF0CE2A55CEF552F7650E
+    """Test_static_call_bounds2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
     )
 
     env = Environment(
@@ -57,41 +67,45 @@ def test_static_call_bounds2(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0))) + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 (ADD 1 (SLOAD 0))) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x849f53126ade5f72469029537296f2b6644d4d41"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {   (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xfffffff 0xfffffff 0xfffffff 0xfffffff)   }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x7FFFFFFFFFFFFFF,
-                address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                args_offset=0xFFFFFFF,
-                args_size=0xFFFFFFF,
-                ret_offset=0xFFFFFFF,
-                ret_size=0xFFFFFFF,
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x7FFFFFFFFFFFFFF,
+            address=addr,
+            args_offset=0xFFFFFFF,
+            args_size=0xFFFFFFF,
+            ret_offset=0xFFFFFFF,
+            ret_size=0xFFFFFFF,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x897c36dffce5cc08eb13170a6c308ab09fa72e65"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        target: Account(balance=0),
+        addr: Account(storage={0: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_static_call_bounds2a.py b/tests/ported_static/stMemoryStressTest/test_static_call_bounds2a.py
index 7f3efd0ef29..c27269691ae 100644
--- a/tests/ported_static/stMemoryStressTest/test_static_call_bounds2a.py
+++ b/tests/ported_static/stMemoryStressTest/test_static_call_bounds2a.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_static_call_bounds2a.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds2aFiller.json
+state_tests/stMemoryStressTest/static_CALL_Bounds2aFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,30 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds2aFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stMemoryStressTest/static_CALL_Bounds2aFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_static_call_bounds2a(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xEF111BBDAB3A1622936AFDFC9BBEC4B5BC05B4FA4B1EF0CE2A55CEF552F7650E
+    """Test_static_call_bounds2a."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
     )
 
     env = Environment(
@@ -57,41 +67,45 @@ def test_static_call_bounds2a(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0))) + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 (ADD 1 (SLOAD 0))) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x849f53126ade5f72469029537296f2b6644d4d41"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {   (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffff 0xffffffff 0xffffffff 0xffffffff)  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x7FFFFFFFFFFFFFF,
-                address=0x849F53126ADE5F72469029537296F2B6644D4D41,
-                args_offset=0xFFFFFFFF,
-                args_size=0xFFFFFFFF,
-                ret_offset=0xFFFFFFFF,
-                ret_size=0xFFFFFFFF,
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x7FFFFFFFFFFFFFF,
+            address=addr,
+            args_offset=0xFFFFFFFF,
+            args_size=0xFFFFFFFF,
+            ret_offset=0xFFFFFFFF,
+            ret_size=0xFFFFFFFF,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9edf5834c8b457164c7d203e17df72d92d384dba"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        target: Account(balance=0),
+        addr: Account(storage={}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryStressTest/test_static_call_bounds3.py b/tests/ported_static/stMemoryStressTest/test_static_call_bounds3.py
index ded52d83dd4..fe5980fd434 100644
--- a/tests/ported_static/stMemoryStressTest/test_static_call_bounds3.py
+++ b/tests/ported_static/stMemoryStressTest/test_static_call_bounds3.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_static_call_bounds3.
 
 Ported from:
-tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds3Filler.json
+state_tests/stMemoryStressTest/static_CALL_Bounds3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,30 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stMemoryStressTest/static_CALL_Bounds3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stMemoryStressTest/static_CALL_Bounds3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (16777216, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_static_call_bounds3(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xEF111BBDAB3A1622936AFDFC9BBEC4B5BC05B4FA4B1EF0CE2A55CEF552F7650E
+    """Test_static_call_bounds3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
     )
 
     env = Environment(
@@ -57,102 +67,105 @@ def test_static_call_bounds3(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+    # Source: lll
+    # { (MSTORE 0 (ADD 1 (SLOAD 0))) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.STOP,
+        nonce=0,
     )
-    # Source: LLL
+    # Source: lll
     # { (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffff 0 0xffffffffffffffff)  (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff)  (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffff 0xffffffff 0xffffffff 0xffffffff) (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xCC704D60C46B9C08AAB4D15281184441AC7ED35C,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFFFFFFFFFFF,
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFFFFFFFFFFF,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xCC704D60C46B9C08AAB4D15281184441AC7ED35C,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0x0,
+                args_size=0xFFFFFFFFFFFFFFFF,
+                ret_offset=0x0,
+                ret_size=0xFFFFFFFFFFFFFFFF,
             )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xCC704D60C46B9C08AAB4D15281184441AC7ED35C,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ret_offset=0x0,
-                    ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0x0,
+                args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                ret_offset=0x0,
+                ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
             )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xCC704D60C46B9C08AAB4D15281184441AC7ED35C,
-                    args_offset=0xFFFFFFFF,
-                    args_size=0xFFFFFFFF,
-                    ret_offset=0xFFFFFFFF,
-                    ret_size=0xFFFFFFFF,
-                ),
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0x0,
+                args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ret_offset=0x0,
+                ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xCC704D60C46B9C08AAB4D15281184441AC7ED35C,
-                    args_offset=0xFFFFFFFFFFFFFFFF,
-                    args_size=0xFFFFFFFFFFFFFFFF,
-                    ret_offset=0xFFFFFFFFFFFFFFFF,
-                    ret_size=0xFFFFFFFFFFFFFFFF,
-                ),
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0xFFFFFFFF,
+                args_size=0xFFFFFFFF,
+                ret_offset=0xFFFFFFFF,
+                ret_size=0xFFFFFFFF,
             )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xCC704D60C46B9C08AAB4D15281184441AC7ED35C,
-                    args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                ),
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0xFFFFFFFFFFFFFFFF,
+                args_size=0xFFFFFFFFFFFFFFFF,
+                ret_offset=0xFFFFFFFFFFFFFFFF,
+                ret_size=0xFFFFFFFFFFFFFFFF,
             )
-            + Op.STATICCALL(
+        )
+        + Op.POP(
+            Op.STATICCALL(
                 gas=0x7FFFFFFFFFFFFFF,
-                address=0xCC704D60C46B9C08AAB4D15281184441AC7ED35C,
-                args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                address=addr,
+                args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.STATICCALL(
+            gas=0x7FFFFFFFFFFFFFF,
+            address=addr,
+            args_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            args_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ret_size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x83143406093d1f3560dd269416596d3406f1c991"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xcc704d60c46b9c08aab4d15281184441ac7ed35c"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16777216]
+    tx_value = [1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        target: Account(balance=0),
+        addr: Account(storage={0: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/__init__.py b/tests/ported_static/stMemoryTest/__init__.py
index 80462934f5d..0e288c7aa24 100644
--- a/tests/ported_static/stMemoryTest/__init__.py
+++ b/tests/ported_static/stMemoryTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stMemoryTest."""
+"""Ported static tests: stMemoryTest."""  # noqa: N999
diff --git a/tests/ported_static/stMemoryTest/test_buffer.py b/tests/ported_static/stMemoryTest/test_buffer.py
index d37fe34ae4f..e8eb1086eaf 100644
--- a/tests/ported_static/stMemoryTest/test_buffer.py
+++ b/tests/ported_static/stMemoryTest/test_buffer.py
@@ -2,3875 +2,2143 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/bufferFiller.yml
+state_tests/stMemoryTest/bufferFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/bufferFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a30000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a3000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a30000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a30000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a30000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a30000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a30000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a30000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a3000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a3000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a3000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a40000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a4000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a40000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a40000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a40000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a40000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a40000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a40000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a4000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a4000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a4000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f10000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f10000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000037000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f10000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f10000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f10000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f10000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f10000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f10000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f1000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f10000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f10000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f10000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f10000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f10000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f10000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f1000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f1000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f1000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f20000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f20000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f20000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f20000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f20000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f20000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f20000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f20000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f2000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f20000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f20000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f20000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f20000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f20000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f20000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f2000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f2000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f2000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f40000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f40000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f40000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f40000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f40000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f40000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f40000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f40000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f4000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f40000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f40000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f40000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f40000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f40000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f40000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f4000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f4000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f4000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f50000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f50000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f50000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f50000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f50000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f50000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000037000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f50000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa0000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa0000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa0000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa0000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000037000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa0000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa0000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001fa0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001fa000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001fa0000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001fa0000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001fa0000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000037000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001fa0000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001fa0000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001fa0000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001fa000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001fa000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001fa000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000039000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000039000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000039000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000039000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003c0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003c0000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003c0000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003c0000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003c0000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003c0000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003c0000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000013e0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000013e000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000013e0000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000013e0000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000013e0000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000013e0000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000013e0000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000013e0000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000013e000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000013e000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000013e000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000013e0000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000013e000000000000000000000000000000000000000000000000000000000000000d",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a10000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a1000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a10000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a10000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a10000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a10000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a10000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a10000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a1000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a1000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a1000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f3000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f3000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f3000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f30000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f30000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f30000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f30000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f30000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f30000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f3000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f30000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ff000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ff0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                ),
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 10}
-                ),
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ff0000000000000000000000000000000000000000000000000000000000000019",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ff000000000000000000000000000000000000000000000000000000000000001a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ff000000000000000000000000000000000000000000000000000000000000001b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ff000000000000000000000000000000000000000000000000000000000000001c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ff0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ff000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ff000000000000000000000000000000000000000000000000000000000000000c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ff0000000000000000000000000000000000000000000000000000000000000014",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ff0000000000000000000000000000000000000000000000000000000000000015",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ff0000000000000000000000000000000000000000000000000000000000000016",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ff0000000000000000000000000000000000000000000000000000000000000017",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ff0000000000000000000000000000000000000000000000000000000000000018",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000ff0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000039000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000039000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003c0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003c0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000013e0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000013e0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000013e000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000013e000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a10000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a10000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a1000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a1000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a20000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a30000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a30000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a3000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a3000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a40000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a40000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a4000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a4000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f10000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f10000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f10000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f10000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f1000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f1000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f20000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f20000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000d",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f20000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f20000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f2000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f2000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f40000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f40000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f40000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f40000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f4000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001f4000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f50000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f50000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001fa0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001fa0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001fa000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000001fa000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000037000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000037000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f30000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f3000000000000000000000000000000000000000000000000000000000000000a",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f3000000000000000000000000000000000000000000000000000000000000000b",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f30000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000f30c0de"): Account(
-                    storage={0: 24743}
-                )
-            },
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/stMemoryTest/bufferFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            38,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            39,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            40,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            41,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            42,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            43,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            44,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            45,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            46,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            47,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            48,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            49,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            50,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            51,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            52,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            53,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            54,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            55,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            56,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            57,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            58,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            59,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            60,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            61,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            62,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            63,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            64,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            65,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            66,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            67,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            68,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            69,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            70,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            71,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            72,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            73,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            74,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            75,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            76,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            77,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            78,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            79,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            80,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            81,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            82,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            83,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            84,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            85,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            86,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            87,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            88,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            89,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            90,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            91,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            92,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            93,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            94,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            95,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            96,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            97,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            98,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            99,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            100,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            101,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            102,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            103,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            104,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            105,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            106,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            107,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            108,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            109,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            110,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            111,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            112,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            113,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            114,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            115,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            116,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            117,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            118,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            119,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            120,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            121,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            122,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            123,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            124,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            125,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            126,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            127,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            128,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            129,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            130,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            131,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            132,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            133,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            134,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            135,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            136,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            137,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            138,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            139,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            140,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            141,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            142,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            143,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            144,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            145,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            146,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            147,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            148,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            149,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            150,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            151,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            152,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            153,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            154,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            155,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            156,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            157,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            158,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            159,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            160,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            161,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            162,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            163,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            164,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            165,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            166,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            167,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            168,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            169,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            170,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            171,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            172,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            173,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            174,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            175,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            176,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            177,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            178,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            179,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            180,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            181,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            182,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            183,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            184,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            185,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            186,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            187,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            188,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            189,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            190,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            191,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            192,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            193,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            194,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            195,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            196,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            197,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            198,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            199,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            200,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            201,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            202,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            203,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            204,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            205,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            206,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            207,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            208,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            209,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            210,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            211,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            212,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            213,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            214,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            215,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            216,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            217,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            218,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            219,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            220,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            221,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            222,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            223,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            224,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            225,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            226,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            227,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            228,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            229,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            230,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            231,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            232,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            233,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            234,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            235,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            236,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            237,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            238,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            239,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            240,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            241,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            242,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            243,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            244,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            245,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            246,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            247,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            248,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            249,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            250,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            251,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            252,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            253,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            254,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            255,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            256,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            257,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            258,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            259,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            260,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            261,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            262,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            263,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            264,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            265,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            266,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            267,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            268,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            269,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            270,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            271,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            272,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            273,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            274,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            275,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            276,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            277,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            278,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            279,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            280,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            281,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            282,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            283,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            284,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            285,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            286,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            287,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            288,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            289,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            290,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            291,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            292,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            293,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            294,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            295,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            296,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            297,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            298,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            299,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            300,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            301,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            302,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            303,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            304,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            305,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            306,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            307,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            308,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            309,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            310,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            311,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            312,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            313,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            314,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            315,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            316,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            317,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            318,
+            0,
+            0,
+            id="ok-f3",
+        ),
+        pytest.param(
+            319,
+            0,
+            0,
+            id="ok-f3",
+        ),
+        pytest.param(
+            320,
+            0,
+            0,
+            id="fail-f3",
+        ),
+        pytest.param(
+            321,
+            0,
+            0,
+            id="ok-f3",
+        ),
+        pytest.param(
+            322,
+            0,
+            0,
+            id="ok-f3",
+        ),
+        pytest.param(
+            323,
+            0,
+            0,
+            id="fail-f3",
+        ),
+        pytest.param(
+            324,
+            0,
+            0,
+            id="fail-f3",
+        ),
+        pytest.param(
+            325,
+            0,
+            0,
+            id="fail-f3",
+        ),
+        pytest.param(
+            326,
+            0,
+            0,
+            id="fail-f3",
+        ),
+        pytest.param(
+            327,
+            0,
+            0,
+            id="fail-f3",
+        ),
+        pytest.param(
+            328,
+            0,
+            0,
+            id="fail-f3",
+        ),
+        pytest.param(
+            329,
+            0,
+            0,
+            id="fail-f3",
+        ),
+        pytest.param(
+            330,
+            0,
+            0,
+            id="fail-f3",
+        ),
+        pytest.param(
+            331,
+            0,
+            0,
+            id="fail-f3",
+        ),
+        pytest.param(
+            332,
+            0,
+            0,
+            id="fail-f3",
+        ),
+        pytest.param(
+            333,
+            0,
+            0,
+            id="ff-valid",
+        ),
+        pytest.param(
+            334,
+            0,
+            0,
+            id="ff-zero",
+        ),
+        pytest.param(
+            335,
+            0,
+            0,
+            id="ff-zero",
+        ),
+        pytest.param(
+            336,
+            0,
+            0,
+            id="ff-valid",
+        ),
+        pytest.param(
+            337,
+            0,
+            0,
+            id="ff-zero",
+        ),
+        pytest.param(
+            338,
+            0,
+            0,
+            id="ff-zero",
+        ),
+        pytest.param(
+            339,
+            0,
+            0,
+            id="ff-zero",
+        ),
+        pytest.param(
+            340,
+            0,
+            0,
+            id="ff-zero",
+        ),
+        pytest.param(
+            341,
+            0,
+            0,
+            id="ff-zero",
+        ),
+        pytest.param(
+            342,
+            0,
+            0,
+            id="ff-zero",
+        ),
+        pytest.param(
+            343,
+            0,
+            0,
+            id="ff-zero",
+        ),
+        pytest.param(
+            344,
+            0,
+            0,
+            id="ff-zero",
+        ),
+        pytest.param(
+            345,
+            0,
+            0,
+            id="ff-zero",
+        ),
+        pytest.param(
+            346,
+            0,
+            0,
+            id="ff-zero",
+        ),
+        pytest.param(
+            347,
+            0,
+            0,
+            id="ff-zero",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-        "case166",
-        "case167",
-        "case168",
-        "case169",
-        "case170",
-        "case171",
-        "case172",
-        "case173",
-        "case174",
-        "case175",
-        "case176",
-        "case177",
-        "case178",
-        "case179",
-        "case180",
-        "case181",
-        "case182",
-        "case183",
-        "case184",
-        "case185",
-        "case186",
-        "case187",
-        "case188",
-        "case189",
-        "case190",
-        "case191",
-        "case192",
-        "case193",
-        "case194",
-        "case195",
-        "case196",
-        "case197",
-        "case198",
-        "case199",
-        "case200",
-        "case201",
-        "case202",
-        "case203",
-        "case204",
-        "case205",
-        "case206",
-        "case207",
-        "case208",
-        "case209",
-        "case210",
-        "case211",
-        "case212",
-        "case213",
-        "case214",
-        "case215",
-        "case216",
-        "case217",
-        "case218",
-        "case219",
-        "case220",
-        "case221",
-        "case222",
-        "case223",
-        "case224",
-        "case225",
-        "case226",
-        "case227",
-        "case228",
-        "case229",
-        "case230",
-        "case231",
-        "case232",
-        "case233",
-        "case234",
-        "case235",
-        "case236",
-        "case237",
-        "case238",
-        "case239",
-        "case240",
-        "case241",
-        "case242",
-        "case243",
-        "case244",
-        "case245",
-        "case246",
-        "case247",
-        "case248",
-        "case249",
-        "case250",
-        "case251",
-        "case252",
-        "case253",
-        "case254",
-        "case255",
-        "case256",
-        "case257",
-        "case258",
-        "case259",
-        "case260",
-        "case261",
-        "case262",
-        "case263",
-        "case264",
-        "case265",
-        "case266",
-        "case267",
-        "case268",
-        "case269",
-        "case270",
-        "case271",
-        "case272",
-        "case273",
-        "case274",
-        "case275",
-        "case276",
-        "case277",
-        "case278",
-        "case279",
-        "case280",
-        "case281",
-        "case282",
-        "case283",
-        "case284",
-        "case285",
-        "case286",
-        "case287",
-        "case288",
-        "case289",
-        "case290",
-        "case291",
-        "case292",
-        "case293",
-        "case294",
-        "case295",
-        "case296",
-        "case297",
-        "case298",
-        "case299",
-        "case300",
-        "case301",
-        "case302",
-        "case303",
-        "case304",
-        "case305",
-        "case306",
-        "case307",
-        "case308",
-        "case309",
-        "case310",
-        "case311",
-        "case312",
-        "case313",
-        "case314",
-        "case315",
-        "case316",
-        "case317",
-        "case318",
-        "case319",
-        "case320",
-        "case321",
-        "case322",
-        "case323",
-        "case324",
-        "case325",
-        "case326",
-        "case327",
-        "case328",
-        "case329",
-        "case330",
-        "case331",
-        "case332",
-        "case333",
-        "case334",
-        "case335",
-        "case336",
-        "case337",
-        "case338",
-        "case339",
-        "case340",
-        "case341",
-        "case342",
-        "case343",
-        "case344",
-        "case345",
-        "case346",
-        "case347",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_buffer(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x000000000000000000000000000000000000C0DE)
+    contract_1 = Address(0x000000000000000000000000000000000F30C0DE)
+    contract_2 = Address(0x000000000000000000000000000000000FF0C0DE)
+    contract_3 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -3881,17 +2149,17 @@ def test_buffer(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {
     #       (return 0 0x120)
     # }
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.RETURN(offset=0x0, size=0x120) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000c0de"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000C0DE),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
     #        ; We get length from the caller
     #        (def 'length $0)
@@ -3900,21 +2168,19 @@ def test_buffer(
     #        [[0]] 0    ; capricide
     #        (return offset length)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.RETURN(
-                offset=Op.CALLDATALOAD(offset=0x20),
-                size=Op.CALLDATALOAD(offset=0x0),
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x0)
+        + Op.RETURN(
+            offset=Op.CALLDATALOAD(offset=0x20),
+            size=Op.CALLDATALOAD(offset=0x0),
+        )
+        + Op.STOP,
+        storage={0: 24743},
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000f30c0de"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000F30C0DE),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
     #        ; We get length from the caller
     #        (def 'length $0)
@@ -3922,20 +2188,17 @@ def test_buffer(
     #
     #        (revert offset length)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.REVERT(
-                offset=Op.CALLDATALOAD(offset=0x20),
-                size=Op.CALLDATALOAD(offset=0x0),
-            )
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.REVERT(
+            offset=Op.CALLDATALOAD(offset=0x20),
+            size=Op.CALLDATALOAD(offset=0x0),
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000ff0c0de"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000FF0C0DE),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
+    # Source: lll
     # {
     #    (def 'opcode $4)
     #    (def 'bufferType $36)
@@ -3967,562 +2230,1270 @@ def test_buffer(
     #            [length] 0
     #            [offset] 0x100
     # ... (113 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=Op.PUSH2[0x11],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x0),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x1F])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0xA)
-            + Op.MSTORE(offset=0x2040, value=0x100)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x31],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x3F])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(offset=0x2040, value=0x100)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x51],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x2),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x62])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=Op.SUB(0x0, 0xA))
-            + Op.MSTORE(offset=0x2040, value=0x100)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x74],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x3),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x83])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x1000)
-            + Op.MSTORE(offset=0x2040, value=0x100)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x95],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0xA),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xA2])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0xA)
-            + Op.MSTORE(offset=0x2040, value=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xB4],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0xB),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xC1])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(offset=0x2040, value=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xD3],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0xC),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xE3])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=Op.SUB(0x0, 0xA))
-            + Op.MSTORE(offset=0x2040, value=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xF5],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0xD),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x103)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x1000)
-            + Op.MSTORE(offset=0x2040, value=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x115,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x14),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x125)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x5)
-            + Op.MSTORE(offset=0x2040, value=Op.SUB(0x0, 0xA))
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x137,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x15),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x147)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x5)
-            + Op.MSTORE(offset=0x2040, value=0x7FFFFFFF)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x159,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x16),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x169)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x5)
-            + Op.MSTORE(offset=0x2040, value=0x80000000)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x17B,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x17),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x18B)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x5)
-            + Op.MSTORE(offset=0x2040, value=0xFFFFFFFF)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x19D,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x18),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x1AE)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x5)
-            + Op.MSTORE(offset=0x2040, value=0x100000000)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C0,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x19),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x1D4)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x5)
-            + Op.MSTORE(offset=0x2040, value=0x7FFFFFFFFFFFFFFF)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1E6,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1A),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x1FA)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x5)
-            + Op.MSTORE(offset=0x2040, value=0x8000000000000000)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x20C,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1B),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x220)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x5)
-            + Op.MSTORE(offset=0x2040, value=0xFFFFFFFFFFFFFFFF)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x232,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1C),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x247)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x5)
-            + Op.MSTORE(offset=0x2040, value=0x10000000000000000)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x258,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x20),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x262)
-            + Op.JUMPDEST
-            + Op.SHA3(
-                offset=Op.MLOAD(offset=0x2040), size=Op.MLOAD(offset=0x2020)
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x275,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x37),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x281)
-            + Op.JUMPDEST
-            + Op.CALLDATACOPY(
-                dest_offset=Op.MLOAD(offset=0x2040),
-                offset=0x0,
-                size=Op.MLOAD(offset=0x2020),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x293,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x39),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x29F)
-            + Op.JUMPDEST
-            + Op.CODECOPY(
-                dest_offset=Op.MLOAD(offset=0x2040),
-                offset=0x0,
-                size=Op.MLOAD(offset=0x2020),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2B1,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3C),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x2C0)
-            + Op.JUMPDEST
-            + Op.EXTCODECOPY(
-                address=0xC0DE,
-                dest_offset=Op.MLOAD(offset=0x2040),
-                offset=0x0,
-                size=Op.MLOAD(offset=0x2020),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2D2,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3E),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x2DE)
-            + Op.JUMPDEST
-            + Op.RETURNDATACOPY(
-                dest_offset=Op.MLOAD(offset=0x2040),
-                offset=0x0,
-                size=Op.MLOAD(offset=0x2020),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2F0,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA0),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x2FA)
-            + Op.JUMPDEST
-            + Op.LOG0(
-                offset=Op.MLOAD(offset=0x2040), size=Op.MLOAD(offset=0x2020)
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x30C,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA1),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x318)
-            + Op.JUMPDEST
-            + Op.LOG1(
-                offset=Op.MLOAD(offset=0x2040),
-                size=Op.MLOAD(offset=0x2020),
-                topic_1=0x1,
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x32A,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA2),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x338)
-            + Op.JUMPDEST
-            + Op.LOG2(
-                offset=Op.MLOAD(offset=0x2040),
-                size=Op.MLOAD(offset=0x2020),
-                topic_1=0x1,
-                topic_2=0x2,
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x34A,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA3),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x35A)
-            + Op.JUMPDEST
-            + Op.LOG3(
-                offset=Op.MLOAD(offset=0x2040),
-                size=Op.MLOAD(offset=0x2020),
-                topic_1=0x1,
-                topic_2=0x2,
-                topic_3=0x3,
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x36C,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA4),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x37E)
-            + Op.JUMPDEST
-            + Op.LOG4(
-                offset=Op.MLOAD(offset=0x2040),
-                size=Op.MLOAD(offset=0x2020),
-                topic_1=0x1,
-                topic_2=0x2,
-                topic_3=0x3,
-                topic_4=0x4,
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x38F,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF0),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x39B)
-            + Op.JUMPDEST
-            + Op.CREATE(
-                value=0x0,
-                offset=Op.MLOAD(offset=0x2040),
-                size=Op.MLOAD(offset=0x2020),
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x3AD,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF1),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x3C3)
-            + Op.JUMPDEST
-            + Op.CALL(
-                gas=0x1000,
-                address=0xC0DE,
-                value=0x0,
-                args_offset=Op.MLOAD(offset=0x2040),
-                args_size=Op.MLOAD(offset=0x2020),
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x3D6,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x1F1),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x3EC)
-            + Op.JUMPDEST
-            + Op.CALL(
-                gas=0x1000,
-                address=0xC0DE,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=Op.MLOAD(offset=0x2040),
-                ret_size=Op.MLOAD(offset=0x2020),
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x3FE,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF2),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x414)
-            + Op.JUMPDEST
-            + Op.CALLCODE(
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=Op.PUSH2[0x11],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x0),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x1F])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0xA)
+        + Op.MSTORE(offset=0x2040, value=0x100)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x31],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x3F])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(offset=0x2040, value=0x100)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x51],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x2),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x62])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=Op.SUB(0x0, 0xA))
+        + Op.MSTORE(offset=0x2040, value=0x100)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x74],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x3),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x83])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x1000)
+        + Op.MSTORE(offset=0x2040, value=0x100)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x95],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0xA),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xA2])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0xA)
+        + Op.MSTORE(offset=0x2040, value=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xB4],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0xB),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xC1])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(offset=0x2040, value=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xD3],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0xC),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xE3])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=Op.SUB(0x0, 0xA))
+        + Op.MSTORE(offset=0x2040, value=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xF5],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0xD),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x103)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x1000)
+        + Op.MSTORE(offset=0x2040, value=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x115, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x14)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x125)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x5)
+        + Op.MSTORE(offset=0x2040, value=Op.SUB(0x0, 0xA))
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x137, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x15)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x147)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x5)
+        + Op.MSTORE(offset=0x2040, value=0x7FFFFFFF)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x159, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x16)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x169)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x5)
+        + Op.MSTORE(offset=0x2040, value=0x80000000)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x17B, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x17)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x18B)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x5)
+        + Op.MSTORE(offset=0x2040, value=0xFFFFFFFF)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x19D, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x18)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x1AE)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x5)
+        + Op.MSTORE(offset=0x2040, value=0x100000000)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C0, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x19)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x1D4)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x5)
+        + Op.MSTORE(offset=0x2040, value=0x7FFFFFFFFFFFFFFF)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1E6, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1A)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x1FA)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x5)
+        + Op.MSTORE(offset=0x2040, value=0x8000000000000000)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x20C, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1B)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x220)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x5)
+        + Op.MSTORE(offset=0x2040, value=0xFFFFFFFFFFFFFFFF)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x232, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1C)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x247)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x5)
+        + Op.MSTORE(offset=0x2040, value=0x10000000000000000)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x258, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x20)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x262)
+        + Op.JUMPDEST
+        + Op.SHA3(offset=Op.MLOAD(offset=0x2040), size=Op.MLOAD(offset=0x2020))
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x275, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x37)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x281)
+        + Op.JUMPDEST
+        + Op.CALLDATACOPY(
+            dest_offset=Op.MLOAD(offset=0x2040),
+            offset=0x0,
+            size=Op.MLOAD(offset=0x2020),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x293, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x39)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x29F)
+        + Op.JUMPDEST
+        + Op.CODECOPY(
+            dest_offset=Op.MLOAD(offset=0x2040),
+            offset=0x0,
+            size=Op.MLOAD(offset=0x2020),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2B1, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3C)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x2C0)
+        + Op.JUMPDEST
+        + Op.EXTCODECOPY(
+            address=contract_0,
+            dest_offset=Op.MLOAD(offset=0x2040),
+            offset=0x0,
+            size=Op.MLOAD(offset=0x2020),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2D2, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3E)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x2DE)
+        + Op.JUMPDEST
+        + Op.RETURNDATACOPY(
+            dest_offset=Op.MLOAD(offset=0x2040),
+            offset=0x0,
+            size=Op.MLOAD(offset=0x2020),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2F0, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA0)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x2FA)
+        + Op.JUMPDEST
+        + Op.LOG0(offset=Op.MLOAD(offset=0x2040), size=Op.MLOAD(offset=0x2020))
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x30C, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA1)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x318)
+        + Op.JUMPDEST
+        + Op.LOG1(
+            offset=Op.MLOAD(offset=0x2040),
+            size=Op.MLOAD(offset=0x2020),
+            topic_1=0x1,
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x32A, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA2)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x338)
+        + Op.JUMPDEST
+        + Op.LOG2(
+            offset=Op.MLOAD(offset=0x2040),
+            size=Op.MLOAD(offset=0x2020),
+            topic_1=0x1,
+            topic_2=0x2,
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x34A, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA3)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x35A)
+        + Op.JUMPDEST
+        + Op.LOG3(
+            offset=Op.MLOAD(offset=0x2040),
+            size=Op.MLOAD(offset=0x2020),
+            topic_1=0x1,
+            topic_2=0x2,
+            topic_3=0x3,
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x36C, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xA4)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x37E)
+        + Op.JUMPDEST
+        + Op.LOG4(
+            offset=Op.MLOAD(offset=0x2040),
+            size=Op.MLOAD(offset=0x2020),
+            topic_1=0x1,
+            topic_2=0x2,
+            topic_3=0x3,
+            topic_4=0x4,
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x38F, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF0)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x39B)
+        + Op.JUMPDEST
+        + Op.CREATE(
+            value=0x0,
+            offset=Op.MLOAD(offset=0x2040),
+            size=Op.MLOAD(offset=0x2020),
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x3AD, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF1)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x3C3)
+        + Op.JUMPDEST
+        + Op.CALL(
+            gas=0x1000,
+            address=contract_0,
+            value=0x0,
+            args_offset=Op.MLOAD(offset=0x2040),
+            args_size=Op.MLOAD(offset=0x2020),
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x3D6, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x1F1)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x3EC)
+        + Op.JUMPDEST
+        + Op.CALL(
+            gas=0x1000,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=Op.MLOAD(offset=0x2040),
+            ret_size=Op.MLOAD(offset=0x2020),
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x3FE, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF2)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x414)
+        + Op.JUMPDEST
+        + Op.CALLCODE(
+            gas=0x1000,
+            address=contract_0,
+            value=0x0,
+            args_offset=Op.MLOAD(offset=0x2040),
+            args_size=Op.MLOAD(offset=0x2020),
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x427, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x1F2)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x43D)
+        + Op.JUMPDEST
+        + Op.CALLCODE(
+            gas=0x1000,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=Op.MLOAD(offset=0x2040),
+            ret_size=Op.MLOAD(offset=0x2020),
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x44F, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF4)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x464)
+        + Op.JUMPDEST
+        + Op.DELEGATECALL(
+            gas=0x100000,
+            address=contract_0,
+            args_offset=Op.MLOAD(offset=0x2040),
+            args_size=Op.MLOAD(offset=0x2020),
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x477, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x1F4)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x48C)
+        + Op.JUMPDEST
+        + Op.DELEGATECALL(
+            gas=0x100000,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=Op.MLOAD(offset=0x2040),
+            ret_size=Op.MLOAD(offset=0x2020),
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x49E, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF5)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x4AD)
+        + Op.JUMPDEST
+        + Op.CREATE2(
+            value=0x0,
+            offset=Op.MLOAD(offset=0x2040),
+            size=Op.MLOAD(offset=0x2020),
+            salt=0x5A17,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x4BF, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xFA)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x4D4)
+        + Op.JUMPDEST
+        + Op.STATICCALL(
+            gas=0x100000,
+            address=contract_0,
+            args_offset=Op.MLOAD(offset=0x2040),
+            args_size=Op.MLOAD(offset=0x2020),
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x4E7, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x1FA)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x4FC)
+        + Op.JUMPDEST
+        + Op.STATICCALL(
+            gas=0x100000,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=Op.MLOAD(offset=0x2040),
+            ret_size=Op.MLOAD(offset=0x2020),
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x510, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x13E)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x530)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.CALL(
                 gas=0x1000,
-                address=0xC0DE,
-                value=0x0,
-                args_offset=Op.MLOAD(offset=0x2040),
-                args_size=Op.MLOAD(offset=0x2020),
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x427,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x1F2),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x43D)
-            + Op.JUMPDEST
-            + Op.CALLCODE(
-                gas=0x1000,
-                address=0xC0DE,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=Op.MLOAD(offset=0x2040),
-                ret_size=Op.MLOAD(offset=0x2020),
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x44F,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF4),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x464)
-            + Op.JUMPDEST
-            + Op.DELEGATECALL(
-                gas=0x100000,
-                address=0xC0DE,
-                args_offset=Op.MLOAD(offset=0x2040),
-                args_size=Op.MLOAD(offset=0x2020),
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x477,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x1F4),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x48C)
-            + Op.JUMPDEST
-            + Op.DELEGATECALL(
-                gas=0x100000,
-                address=0xC0DE,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=Op.MLOAD(offset=0x2040),
-                ret_size=Op.MLOAD(offset=0x2020),
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x49E,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF5),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x4AD)
-            + Op.JUMPDEST
-            + Op.CREATE2(
+                address=contract_0,
                 value=0x0,
-                offset=Op.MLOAD(offset=0x2040),
-                size=Op.MLOAD(offset=0x2020),
-                salt=0x5A17,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x4BF,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xFA),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x4D4)
-            + Op.JUMPDEST
-            + Op.STATICCALL(
-                gas=0x100000,
-                address=0xC0DE,
-                args_offset=Op.MLOAD(offset=0x2040),
-                args_size=Op.MLOAD(offset=0x2020),
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x4E7,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x1FA),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x4FC)
-            + Op.JUMPDEST
-            + Op.STATICCALL(
-                gas=0x100000,
-                address=0xC0DE,
                 args_offset=0x0,
                 args_size=0x0,
-                ret_offset=Op.MLOAD(offset=0x2040),
-                ret_size=Op.MLOAD(offset=0x2020),
-            )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x510,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x13E),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x530)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.CALL(
-                    gas=0x1000,
-                    address=0xC0DE,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x100,
-                    ret_size=0x100,
-                ),
-            )
-            + Op.RETURNDATACOPY(
-                dest_offset=Op.MLOAD(offset=0x2040),
-                offset=0x0,
-                size=Op.MLOAD(offset=0x2020),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x541,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF3),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x557)
-            + Op.JUMPDEST
-            + Op.CALL(
+                ret_offset=0x100,
+                ret_size=0x100,
+            )
+        )
+        + Op.RETURNDATACOPY(
+            dest_offset=Op.MLOAD(offset=0x2040),
+            offset=0x0,
+            size=Op.MLOAD(offset=0x2020),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x541, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF3)
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x557)
+        + Op.JUMPDEST
+        + Op.CALL(
+            gas=0x100000,
+            address=contract_1,
+            value=0x0,
+            args_offset=0x2020,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x56A, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xFF)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x585)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.CALL(
                 gas=0x100000,
-                address=0xF30C0DE,
+                address=contract_2,
                 value=0x0,
                 args_offset=0x2020,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x56A,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xFF),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x585)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=0xFF0C0DE,
-                    value=0x0,
-                    args_offset=0x2020,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x100, value=0x0)
-            + Op.STOP
-        ),
-        storage={0x100: 0x60A7},
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x100, value=0x0)
+        + Op.STOP,
+        storage={256: 24743},
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [
+                    0,
+                    1,
+                    3,
+                    4,
+                    6,
+                    16,
+                    17,
+                    19,
+                    20,
+                    31,
+                    32,
+                    34,
+                    35,
+                    46,
+                    47,
+                    49,
+                    50,
+                    62,
+                    65,
+                    76,
+                    77,
+                    79,
+                    80,
+                    93,
+                    94,
+                    96,
+                    97,
+                    108,
+                    109,
+                    111,
+                    112,
+                    123,
+                    124,
+                    126,
+                    127,
+                    138,
+                    139,
+                    141,
+                    142,
+                    153,
+                    154,
+                    156,
+                    157,
+                    168,
+                    169,
+                    171,
+                    172,
+                    183,
+                    184,
+                    186,
+                    187,
+                    198,
+                    199,
+                    201,
+                    202,
+                    213,
+                    214,
+                    216,
+                    217,
+                    228,
+                    229,
+                    231,
+                    232,
+                    243,
+                    244,
+                    246,
+                    247,
+                    258,
+                    259,
+                    261,
+                    262,
+                    273,
+                    274,
+                    276,
+                    277,
+                    288,
+                    289,
+                    291,
+                    292,
+                    303,
+                    304,
+                    306,
+                    307,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={256: 0})},
+        },
+        {
+            "indexes": {
+                "data": [
+                    2,
+                    5,
+                    7,
+                    8,
+                    9,
+                    10,
+                    11,
+                    12,
+                    13,
+                    14,
+                    15,
+                    18,
+                    21,
+                    22,
+                    23,
+                    24,
+                    25,
+                    26,
+                    27,
+                    28,
+                    29,
+                    30,
+                    33,
+                    36,
+                    37,
+                    38,
+                    39,
+                    40,
+                    41,
+                    42,
+                    43,
+                    44,
+                    45,
+                    48,
+                    51,
+                    52,
+                    53,
+                    54,
+                    55,
+                    56,
+                    57,
+                    58,
+                    59,
+                    60,
+                    61,
+                    63,
+                    64,
+                    66,
+                    67,
+                    68,
+                    69,
+                    70,
+                    71,
+                    72,
+                    73,
+                    74,
+                    75,
+                    78,
+                    81,
+                    82,
+                    83,
+                    84,
+                    85,
+                    86,
+                    87,
+                    88,
+                    89,
+                    90,
+                    91,
+                    92,
+                    95,
+                    98,
+                    99,
+                    100,
+                    101,
+                    102,
+                    103,
+                    104,
+                    105,
+                    106,
+                    107,
+                    110,
+                    113,
+                    114,
+                    115,
+                    116,
+                    117,
+                    118,
+                    119,
+                    120,
+                    121,
+                    122,
+                    125,
+                    128,
+                    129,
+                    130,
+                    131,
+                    132,
+                    133,
+                    134,
+                    135,
+                    136,
+                    137,
+                    140,
+                    143,
+                    144,
+                    145,
+                    146,
+                    147,
+                    148,
+                    149,
+                    150,
+                    151,
+                    152,
+                    155,
+                    158,
+                    159,
+                    160,
+                    161,
+                    162,
+                    163,
+                    164,
+                    165,
+                    166,
+                    167,
+                    170,
+                    173,
+                    174,
+                    175,
+                    176,
+                    177,
+                    178,
+                    179,
+                    180,
+                    181,
+                    182,
+                    185,
+                    188,
+                    189,
+                    190,
+                    191,
+                    192,
+                    193,
+                    194,
+                    195,
+                    196,
+                    197,
+                    200,
+                    203,
+                    204,
+                    205,
+                    206,
+                    207,
+                    208,
+                    209,
+                    210,
+                    211,
+                    212,
+                    215,
+                    218,
+                    219,
+                    220,
+                    221,
+                    222,
+                    223,
+                    224,
+                    225,
+                    226,
+                    227,
+                    230,
+                    233,
+                    234,
+                    235,
+                    236,
+                    237,
+                    238,
+                    239,
+                    240,
+                    241,
+                    242,
+                    245,
+                    248,
+                    249,
+                    250,
+                    251,
+                    252,
+                    253,
+                    254,
+                    255,
+                    256,
+                    257,
+                    260,
+                    263,
+                    264,
+                    265,
+                    266,
+                    267,
+                    268,
+                    269,
+                    270,
+                    271,
+                    272,
+                    275,
+                    278,
+                    279,
+                    280,
+                    281,
+                    282,
+                    283,
+                    284,
+                    285,
+                    286,
+                    287,
+                    290,
+                    293,
+                    294,
+                    295,
+                    296,
+                    297,
+                    298,
+                    299,
+                    300,
+                    301,
+                    302,
+                    305,
+                    308,
+                    309,
+                    310,
+                    311,
+                    312,
+                    313,
+                    314,
+                    315,
+                    316,
+                    317,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={256: 24743})},
+        },
+        {
+            "indexes": {"data": [318, 319, 321, 322], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {
+                "data": [
+                    320,
+                    323,
+                    324,
+                    325,
+                    326,
+                    327,
+                    328,
+                    329,
+                    330,
+                    331,
+                    332,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 24743})},
+        },
+        {
+            "indexes": {"data": [333, 336], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 10})},
+        },
+        {
+            "indexes": {
+                "data": [
+                    334,
+                    335,
+                    337,
+                    338,
+                    339,
+                    340,
+                    341,
+                    342,
+                    343,
+                    344,
+                    345,
+                    346,
+                    347,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0xD),
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0x37) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x37) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x37) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x37) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0x37) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0x37) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0x37) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0x37) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0x37) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0x37) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0x37) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0x37) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0x37) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0x37) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0x37) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0x39) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x39) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x39) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x39) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0x39) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0x39) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0x39) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0x39) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0x39) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0x39) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0x39) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0x39) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0x39) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0x39) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0x39) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0x3C) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x3C) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x3C) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x3C) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0x3C) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0x3C) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0x3C) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0x3C) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0x3C) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0x3C) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0x3C) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0x3C) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0x3C) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0x3C) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0x3C) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0x13E) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x13E) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x13E) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x13E) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0x13E) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0x13E) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0x13E) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0x13E) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0x13E) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0x13E) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0x13E) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0x13E) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0x13E) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0x13E) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0x13E) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0x13E) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(0x13E) + Hash(0xD),
+        Bytes("1a8451e6") + Hash(0xA0) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xA0) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0xA0) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0xA0) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0xA0) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0xA0) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0xA0) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0xA0) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0xA0) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0xA0) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0xA0) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0xA0) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0xA0) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0xA0) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0xA0) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0xA1) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xA1) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0xA1) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0xA1) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0xA1) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0xA1) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0xA1) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0xA1) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0xA1) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0xA1) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0xA1) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0xA1) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0xA1) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0xA1) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0xA1) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0xA2) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xA2) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0xA2) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0xA2) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0xA2) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0xA2) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0xA2) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0xA2) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0xA2) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0xA2) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0xA2) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0xA2) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0xA2) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0xA2) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0xA2) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0xA3) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xA3) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0xA3) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0xA3) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0xA3) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0xA3) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0xA3) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0xA3) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0xA3) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0xA3) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0xA3) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0xA3) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0xA3) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0xA3) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0xA3) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0xA4) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xA4) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0xA4) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0xA4) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0xA4) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0xA4) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0xA4) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0xA4) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0xA4) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0xA4) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0xA4) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0xA4) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0xA4) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0xA4) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0xA4) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0x1F1) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x1F1) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x1F1) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x1F1) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0x1F1) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0x1F1) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0x1F1) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0x1F1) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0x1F1) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0x1F1) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0x1F1) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0x1F1) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0x1F1) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0x1F1) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0x1F1) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0x1F2) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x1F2) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x1F2) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x1F2) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0x1F2) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0x1F2) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0x1F2) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0x1F2) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0x1F2) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0x1F2) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0x1F2) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0x1F2) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0x1F2) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0x1F2) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0x1F2) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0x1F4) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x1F4) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x1F4) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x1F4) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0x1F4) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0x1F4) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0x1F4) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0x1F4) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0x1F4) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0x1F4) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0x1F4) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0x1F4) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0x1F4) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0x1F4) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0x1F4) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0x1FA) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0x1FA) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x1FA) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x1FA) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0x1FA) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0x1FA) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0x1FA) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0x1FA) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0x1FA) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0x1FA) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0x1FA) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0x1FA) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0x1FA) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0x1FA) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0x1FA) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0xF3) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xF3) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0xF3) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0xF3) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0xF3) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0xF3) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0xF3) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0xF3) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0xF3) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0xF3) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0xF3) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0xF3) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0xF3) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0xF3) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0xF3) + Hash(0x1C),
+        Bytes("1a8451e6") + Hash(0xFF) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xFF) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0xFF) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0xFF) + Hash(0xA),
+        Bytes("1a8451e6") + Hash(0xFF) + Hash(0xB),
+        Bytes("1a8451e6") + Hash(0xFF) + Hash(0xC),
+        Bytes("1a8451e6") + Hash(0xFF) + Hash(0x14),
+        Bytes("1a8451e6") + Hash(0xFF) + Hash(0x15),
+        Bytes("1a8451e6") + Hash(0xFF) + Hash(0x16),
+        Bytes("1a8451e6") + Hash(0xFF) + Hash(0x17),
+        Bytes("1a8451e6") + Hash(0xFF) + Hash(0x18),
+        Bytes("1a8451e6") + Hash(0xFF) + Hash(0x19),
+        Bytes("1a8451e6") + Hash(0xFF) + Hash(0x1A),
+        Bytes("1a8451e6") + Hash(0xFF) + Hash(0x1B),
+        Bytes("1a8451e6") + Hash(0xFF) + Hash(0x1C),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
+        to=contract_3,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_buffer_src_offset.py b/tests/ported_static/stMemoryTest/test_buffer_src_offset.py
index 7d8a1efaf76..1a644f966f1 100644
--- a/tests/ported_static/stMemoryTest/test_buffer_src_offset.py
+++ b/tests/ported_static/stMemoryTest/test_buffer_src_offset.py
@@ -2,19 +2,24 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/bufferSrcOffsetFiller.yml
+state_tests/stMemoryTest/bufferSrcOffsetFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,848 +27,748 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/bufferSrcOffsetFiller.yml"],
+    ["state_tests/stMemoryTest/bufferSrcOffsetFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            38,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            39,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            40,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            41,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            42,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            43,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            44,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            45,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            46,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            47,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            48,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            49,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            50,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            51,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            52,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            53,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            54,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            55,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            56,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            57,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            58,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            59,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            60,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            61,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            62,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            63,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            64,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            65,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            66,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            67,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            68,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            69,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            70,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            71,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            72,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            73,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            74,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            75,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            76,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            77,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            78,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            79,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            80,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            81,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            82,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            83,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            84,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            85,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            86,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            87,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            88,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            89,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            90,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            91,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            92,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            93,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            94,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            95,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            96,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            97,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            98,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            99,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            100,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            101,
+            0,
+            0,
+            id="ok",
+        ),
+        pytest.param(
+            102,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            103,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            104,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            105,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            106,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            107,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            108,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            109,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            110,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            111,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            112,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            113,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            114,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            115,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            116,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            117,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            118,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            119,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={256: 24743}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000037000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000037000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003900000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000039000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000039000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {},
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_buffer_src_offset(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x000000000000000000000000000000000000C0DE)
+    contract_1 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -874,18 +779,17 @@ def test_buffer_src_offset(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {
     #       (return 0 0x120)
     # }
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.RETURN(offset=0x0, size=0x120) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x000000000000000000000000000000000000c0de"),  # noqa: E501
+        address=Address(0x000000000000000000000000000000000000C0DE),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
+    # Source: lll
     # {
     #    (def 'opcode $4)
     #    (def 'bufferType $36)
@@ -917,259 +821,511 @@ def test_buffer_src_offset(
     #    (if (= bufferType 3)  [srcOffset] (- 0 0x10) NOP)
     #    (if (= bufferType 4)  [srcOffset] 0x7FFFFFFF NOP)
     # ... (40 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x2040, value=0x0)
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x17],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x0),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x1E])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x30],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x37])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x10)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x49],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x2),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x51])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x8000)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x63],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x3),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x6D])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=Op.SUB(0x0, 0x10))
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x7F],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x4),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x89])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x7FFFFFFF)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x9B],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x5),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xA5])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x80000000)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xB7],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x6),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x2040, value=0x0)
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x17],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x0),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x1E])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x30],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x37])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x10)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x49],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x2),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x51])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x8000)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x63],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x3),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x6D])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=Op.SUB(0x0, 0x10))
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x7F],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x4),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x89])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x7FFFFFFF)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x9B],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x5),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xA5])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x80000000)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xB7],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x6),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xC1])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0xFFFFFFFF)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xD3],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x7),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xDE])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x100000000)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xF0],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x8),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xFE])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x7FFFFFFFFFFFFFFF)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x110, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x9)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x11E)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x8000000000000000)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x130, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0xA)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x13E)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0xFFFFFFFFFFFFFFFF)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x150, condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0xB)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x15F)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2020, value=0x10000000000000000)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x171, condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x0)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x178)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2060, value=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x18A, condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x1)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x191)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2060, value=0x10)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1A3, condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x2)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x1AB)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2060, value=0x8000)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1BD, condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x3)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x1C7)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2060, value=Op.SUB(0x0, 0x10))
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1D9, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x37)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x1E7)
+        + Op.JUMPDEST
+        + Op.CALLDATACOPY(
+            dest_offset=Op.MLOAD(offset=0x2040),
+            offset=Op.MLOAD(offset=0x2020),
+            size=Op.MLOAD(offset=0x2060),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1F9, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x39)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x207)
+        + Op.JUMPDEST
+        + Op.CODECOPY(
+            dest_offset=Op.MLOAD(offset=0x2040),
+            offset=Op.MLOAD(offset=0x2020),
+            size=Op.MLOAD(offset=0x2060),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x219, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3C)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x22A)
+        + Op.JUMPDEST
+        + Op.EXTCODECOPY(
+            address=contract_0,
+            dest_offset=Op.MLOAD(offset=0x2040),
+            offset=Op.MLOAD(offset=0x2020),
+            size=Op.MLOAD(offset=0x2060),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x23C, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3E)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x24A)
+        + Op.JUMPDEST
+        + Op.RETURNDATACOPY(
+            dest_offset=Op.MLOAD(offset=0x2040),
+            offset=Op.MLOAD(offset=0x2020),
+            size=Op.MLOAD(offset=0x2060),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x25D, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x13E)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x27F)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.CALL(
+                gas=0x1000,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x100,
+                ret_size=0x100,
             )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xC1])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0xFFFFFFFF)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xD3],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x7),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xDE])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x100000000)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xF0],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x8),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xFE])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x7FFFFFFFFFFFFFFF)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x110,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x9),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x11E)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x8000000000000000)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x130,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0xA),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x13E)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0xFFFFFFFFFFFFFFFF)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x150,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0xB),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x15F)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2020, value=0x10000000000000000)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x171,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x0),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x178)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2060, value=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x18A,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x1),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x191)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2060, value=0x10)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1A3,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x2),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x1AB)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2060, value=0x8000)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1BD,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x44), 0x3),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x1C7)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2060, value=Op.SUB(0x0, 0x10))
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1D9,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x37),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x1E7)
-            + Op.JUMPDEST
-            + Op.CALLDATACOPY(
-                dest_offset=Op.MLOAD(offset=0x2040),
-                offset=Op.MLOAD(offset=0x2020),
-                size=Op.MLOAD(offset=0x2060),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1F9,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x39),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x207)
-            + Op.JUMPDEST
-            + Op.CODECOPY(
-                dest_offset=Op.MLOAD(offset=0x2040),
-                offset=Op.MLOAD(offset=0x2020),
-                size=Op.MLOAD(offset=0x2060),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x219,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3C),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x22A)
-            + Op.JUMPDEST
-            + Op.EXTCODECOPY(
-                address=0xC0DE,
-                dest_offset=Op.MLOAD(offset=0x2040),
-                offset=Op.MLOAD(offset=0x2020),
-                size=Op.MLOAD(offset=0x2060),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x23C,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x3E),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x24A)
-            + Op.JUMPDEST
-            + Op.RETURNDATACOPY(
-                dest_offset=Op.MLOAD(offset=0x2040),
-                offset=Op.MLOAD(offset=0x2020),
-                size=Op.MLOAD(offset=0x2060),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x25D,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x13E),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x27F)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.CALL(
-                    gas=0x1000,
-                    address=0xC0DE,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x100,
-                    ret_size=0x100,
-                ),
-            )
-            + Op.RETURNDATACOPY(
-                dest_offset=Op.MLOAD(offset=0x2040),
-                offset=Op.MLOAD(offset=0x2020),
-                size=Op.MLOAD(offset=0x2060),
-            )
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x100, value=0x0)
-            + Op.JUMPI(
-                pc=0x298,
-                condition=Op.ISZERO(Op.LT(Op.CALLDATALOAD(offset=0x24), 0x3)),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x2A5)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        storage={0x100: 0x60A7},
+        )
+        + Op.RETURNDATACOPY(
+            dest_offset=Op.MLOAD(offset=0x2040),
+            offset=Op.MLOAD(offset=0x2020),
+            size=Op.MLOAD(offset=0x2060),
+        )
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x100, value=0x0)
+        + Op.JUMPI(
+            pc=0x298,
+            condition=Op.ISZERO(Op.LT(Op.CALLDATALOAD(offset=0x24), 0x3)),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x2A5)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
+        + Op.JUMPDEST
+        + Op.STOP,
+        storage={256: 24743},
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [
+                    0,
+                    1,
+                    2,
+                    4,
+                    5,
+                    6,
+                    8,
+                    9,
+                    10,
+                    12,
+                    13,
+                    14,
+                    16,
+                    17,
+                    18,
+                    19,
+                    20,
+                    21,
+                    22,
+                    23,
+                    24,
+                    25,
+                    26,
+                    28,
+                    29,
+                    30,
+                    32,
+                    33,
+                    34,
+                    36,
+                    37,
+                    38,
+                    40,
+                    41,
+                    42,
+                    43,
+                    44,
+                    45,
+                    46,
+                    47,
+                    48,
+                    49,
+                    50,
+                    52,
+                    53,
+                    54,
+                    56,
+                    57,
+                    58,
+                    60,
+                    61,
+                    62,
+                    64,
+                    65,
+                    66,
+                    67,
+                    68,
+                    69,
+                    70,
+                    71,
+                    72,
+                    96,
+                    97,
+                    100,
+                    101,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 0, 1: 0, 256: 0})},
+        },
+        {
+            "indexes": {
+                "data": [
+                    3,
+                    7,
+                    11,
+                    15,
+                    27,
+                    31,
+                    35,
+                    39,
+                    51,
+                    55,
+                    59,
+                    63,
+                    73,
+                    74,
+                    75,
+                    76,
+                    77,
+                    78,
+                    79,
+                    80,
+                    81,
+                    82,
+                    83,
+                    84,
+                    85,
+                    86,
+                    87,
+                    88,
+                    89,
+                    90,
+                    91,
+                    92,
+                    93,
+                    94,
+                    95,
+                    98,
+                    99,
+                    102,
+                    103,
+                    104,
+                    105,
+                    106,
+                    107,
+                    108,
+                    109,
+                    110,
+                    111,
+                    112,
+                    113,
+                    114,
+                    115,
+                    116,
+                    117,
+                    118,
+                    119,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={256: 24743})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("048071d3") + Hash(0x37) + Hash(0x0) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x0) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x0) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x0) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x1) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x2) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x3) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x3) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x3) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x3) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x4) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x5) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x6) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x7) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x8) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x37) + Hash(0x9) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x37) + Hash(0xA) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x37) + Hash(0xB) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x0) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x0) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x0) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x0) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x1) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x2) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x3) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x3) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x3) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x3) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x4) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x5) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x6) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x7) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x8) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x39) + Hash(0x9) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x39) + Hash(0xA) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x39) + Hash(0xB) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x0) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x0) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x0) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x0) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x1) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x2) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x3) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x3) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x3) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x3) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x4) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x5) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x6) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x7) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x8) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0x9) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0xA) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3C) + Hash(0xB) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x0) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x0) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x0) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x0) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x1) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x2) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x3) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x3) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x3) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x3) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x4) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x5) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x6) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x7) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x8) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0x9) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0xA) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x3E) + Hash(0xB) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x0) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x0) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x0) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x0) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x1) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x2) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x3) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x3) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x3) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x3) + Hash(0x3),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x4) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x5) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x6) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x7) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x8) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0x9) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0xA) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x13E) + Hash(0xB) + Hash(0x1),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
+        to=contract_1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_call_data_copy_offset.py b/tests/ported_static/stMemoryTest/test_call_data_copy_offset.py
index 938647019f1..2cd7a467e4b 100644
--- a/tests/ported_static/stMemoryTest/test_call_data_copy_offset.py
+++ b/tests/ported_static/stMemoryTest/test_call_data_copy_offset.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_data_copy_offset.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/callDataCopyOffsetFiller.json
+state_tests/stMemoryTest/callDataCopyOffsetFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/callDataCopyOffsetFiller.json"],
+    ["state_tests/stMemoryTest/callDataCopyOffsetFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,10 @@ def test_call_data_copy_offset(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_data_copy_offset."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE)
+    contract_1 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,51 +48,50 @@ def test_call_data_copy_offset(
         gas_limit=1000000,
     )
 
-    # Source: Yul
-    # { mstore(0, 0x0123456789abcdef) pop(call(0xffff,0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,0, 0,0x0f, 0,0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x123456789ABCDEF)
-            + Op.CALL(
-                gas=0xFFFF,
-                address=0xEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE,
-                value=Op.DUP1,
-                args_offset=Op.DUP2,
-                args_size=0xF,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0x00 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (CALLDATACOPY 0x00 0xffff  0x10) (SSTORE 0x00 (MLOAD 0x00)) }  # noqa: E501
-    callee = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.CALLDATACOPY(dest_offset=0x0, offset=0xFFFF, size=0x10)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.CALLDATACOPY(dest_offset=0x0, offset=0xFFFF, size=0x10)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0xEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE),  # noqa: E501
+    )
+    # Source: yul
+    # berlin { mstore(0, 0x0123456789abcdef) pop(call(0xffff,0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,0, 0,0x0f, 0,0))  }  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x123456789ABCDEF)
+        + Op.CALL(
+            gas=0xFFFF,
+            address=contract_0,
+            value=Op.DUP1,
+            args_offset=Op.DUP2,
+            args_size=0xF,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
-        address=Address("0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"),  # noqa: E501
+        nonce=1,
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_1,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        callee: Account(storage={0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF}),
+        contract_0: Account(storage={0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF})
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_calldatacopy_dejavu.py b/tests/ported_static/stMemoryTest/test_calldatacopy_dejavu.py
index d47fd1f4cea..362489d30fb 100644
--- a/tests/ported_static/stMemoryTest/test_calldatacopy_dejavu.py
+++ b/tests/ported_static/stMemoryTest/test_calldatacopy_dejavu.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_calldatacopy_dejavu.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/calldatacopy_dejavuFiller.json
+state_tests/stMemoryTest/calldatacopy_dejavuFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/calldatacopy_dejavuFiller.json"],
+    ["state_tests/stMemoryTest/calldatacopy_dejavuFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_calldatacopy_dejavu(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7DD1D0EC78FE936B0E88F8C21226F51F048579915C7BAFF1C5D7FD84B2139BF1
-    )
+    """Test_calldatacopy_dejavu."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x271000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,27 +43,26 @@ def test_calldatacopy_dejavu(
         gas_limit=52949672960,
     )
 
-    pre[sender] = Account(balance=0x271000000000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0xFF]
-            + Op.CALLDATACOPY(
-                dest_offset=0xFFFFFFF, offset=0xFFFFFFF, size=0xFF
-            )
-        ),
+    # Source: raw
+    # 0x60FF60FF630FFFFFFF630FFFFFFF37
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0xFF]
+        + Op.CALLDATACOPY(dest_offset=0xFFFFFFF, offset=0xFFFFFFF, size=0xFF),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xcb76ef53a4eb6ccf604daed675e91df8a0b544f8"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_calldatacopy_dejavu2.py b/tests/ported_static/stMemoryTest/test_calldatacopy_dejavu2.py
index 074c69ab933..f1b4ce171f7 100644
--- a/tests/ported_static/stMemoryTest/test_calldatacopy_dejavu2.py
+++ b/tests/ported_static/stMemoryTest/test_calldatacopy_dejavu2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_calldatacopy_dejavu2.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/calldatacopy_dejavu2Filler.json
+state_tests/stMemoryTest/calldatacopy_dejavu2Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/calldatacopy_dejavu2Filler.json"],
+    ["state_tests/stMemoryTest/calldatacopy_dejavu2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_calldatacopy_dejavu2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_calldatacopy_dejavu2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x7DD1D0EC78FE936B0E88F8C21226F51F048579915C7BAFF1C5D7FD84B2139BF1
     )
@@ -46,32 +47,31 @@ def test_calldatacopy_dejavu2(
     )
 
     pre[sender] = Account(balance=0x271000000000)
-    # Source: Yul
-    # { mstore8(0x1f, 0x42) calldatacopy(0x1f, 0, 0x0103) let mem := mload(0) if eq(mem,0x60) { stop() }  sstore(0xff, 0x0badc0ffee) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x1F, value=0x42)
-            + Op.CALLDATACOPY(dest_offset=0x1F, offset=0x0, size=0x103)
-            + Op.JUMPI(pc=0x20, condition=Op.EQ(Op.MLOAD(offset=0x0), 0x60))
-            + Op.SSTORE(key=0xFF, value=0xBADC0FFEE)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: yul
+    # berlin { mstore8(0x1f, 0x42) calldatacopy(0x1f, 0, 0x0103) let mem := mload(0) if eq(mem,0x60) { stop() }  sstore(0xff, 0x0badc0ffee) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x1F, value=0x42)
+        + Op.CALLDATACOPY(dest_offset=0x1F, offset=0x0, size=0x103)
+        + Op.JUMPI(pc=0x1F, condition=Op.EQ(Op.MLOAD(offset=0x0), 0x60))
+        + Op.SSTORE(key=0xFF, value=0xBADC0FFEE)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd6a7f80046f7576fa76ee5198426097f149e60ff"),  # noqa: E501
+        address=Address(0xD6A7F80046F7576FA76EE5198426097F149E60FF),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={255: 0xBADC0FFEE}),
+        target: Account(storage={255: 0xBADC0FFEE}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_code_copy_offset.py b/tests/ported_static/stMemoryTest/test_code_copy_offset.py
index c3cbe689ba4..36b096523aa 100644
--- a/tests/ported_static/stMemoryTest/test_code_copy_offset.py
+++ b/tests/ported_static/stMemoryTest/test_code_copy_offset.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_code_copy_offset.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/codeCopyOffsetFiller.json
+state_tests/stMemoryTest/codeCopyOffsetFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/codeCopyOffsetFiller.json"],
+    ["state_tests/stMemoryTest/codeCopyOffsetFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_code_copy_offset(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_code_copy_offset."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,49 +46,48 @@ def test_code_copy_offset(
         gas_limit=1000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.CODECOPY(dest_offset=0x0, offset=0xFFFF, size=0x10)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
+    # { (MSTORE 0x00 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (CODECOPY 0x00 0xffff  0x10) (SSTORE 0x00 (MLOAD 0x00)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.CODECOPY(dest_offset=0x0, offset=0xFFFF, size=0x10)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
-        address=Address("0x27d16e1d3cc862149f1e7162e612635fcaef9ff4"),  # noqa: E501
+        nonce=1,
+        address=Address(0x27D16E1D3CC862149F1E7162E612635FCAEF9FF4),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: Yul
-    # { mstore(0, 0x0123456789abcdef)  pop(call(0xffff, <contract:0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee>, 0, 0, 0x0f, 0, 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x123456789ABCDEF)
-            + Op.CALL(
-                gas=0xFFFF,
-                address=0x27D16E1D3CC862149F1E7162E612635FCAEF9FF4,
-                value=Op.DUP1,
-                args_offset=Op.DUP2,
-                args_size=0xF,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: yul
+    # berlin { mstore(0, 0x0123456789abcdef)  pop(call(0xffff, <contract:0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee>, 0, 0, 0x0f, 0, 0))  }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x123456789ABCDEF)
+        + Op.CALL(
+            gas=0xFFFF,
+            address=addr,
+            value=Op.DUP1,
+            args_offset=Op.DUP2,
+            args_size=0xF,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
-        address=Address("0xaf89a7504341a87e1cfdffd483a00a4688469b3d"),  # noqa: E501
+        nonce=1,
+        address=Address(0xAF89A7504341A87E1CFDFFD483A00A4688469B3D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        callee: Account(storage={0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF}),
-    }
+    post = {addr: Account(storage={0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_codecopy_dejavu.py b/tests/ported_static/stMemoryTest/test_codecopy_dejavu.py
index 6e4b0dcd96c..0d5a8167151 100644
--- a/tests/ported_static/stMemoryTest/test_codecopy_dejavu.py
+++ b/tests/ported_static/stMemoryTest/test_codecopy_dejavu.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_codecopy_dejavu.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/codecopy_dejavuFiller.json
+state_tests/stMemoryTest/codecopy_dejavuFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/codecopy_dejavuFiller.json"],
+    ["state_tests/stMemoryTest/codecopy_dejavuFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_codecopy_dejavu(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7DD1D0EC78FE936B0E88F8C21226F51F048579915C7BAFF1C5D7FD84B2139BF1
-    )
+    """Test_codecopy_dejavu."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x271000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,25 +43,26 @@ def test_codecopy_dejavu(
         gas_limit=52949672960,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0xFF]
-            + Op.CODECOPY(dest_offset=0xFFFFFFF, offset=0xFFFFFFF, size=0xFF)
-        ),
+    # Source: raw
+    # 0x60FF60FF630FFFFFFF630FFFFFFF39
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0xFF]
+        + Op.CODECOPY(dest_offset=0xFFFFFFF, offset=0xFFFFFFF, size=0xFF),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x8719757d888e6b73b95b8873672380186ff72d55"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x271000000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_codecopy_dejavu2.py b/tests/ported_static/stMemoryTest/test_codecopy_dejavu2.py
index 10ab885e738..0899770f06b 100644
--- a/tests/ported_static/stMemoryTest/test_codecopy_dejavu2.py
+++ b/tests/ported_static/stMemoryTest/test_codecopy_dejavu2.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_codecopy_dejavu2.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/codecopy_dejavu2Filler.json
+state_tests/stMemoryTest/codecopy_dejavu2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/codecopy_dejavu2Filler.json"],
+    ["state_tests/stMemoryTest/codecopy_dejavu2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_codecopy_dejavu2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7DD1D0EC78FE936B0E88F8C21226F51F048579915C7BAFF1C5D7FD84B2139BF1
-    )
+    """Test_codecopy_dejavu2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x271000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,28 @@ def test_codecopy_dejavu2(
         gas_limit=52949672960,
     )
 
-    pre[sender] = Account(balance=0x271000000000)
-    # Source: Yul
-    # { codecopy(0x1f, 0x010000000000000001, 0x0a) let mem := mload(0) if eq(mem, 0) {stop()} }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CODECOPY(dest_offset=0x1F, offset=0x10000000000000001, size=0xA)
-            + Op.JUMPI(pc=0x17, condition=Op.ISZERO(Op.MLOAD(offset=0x0)))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: yul
+    # berlin { codecopy(0x1f, 0x010000000000000001, 0x0a) let mem := mload(0) if eq(mem, 0) {stop()} }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CODECOPY(
+            dest_offset=0x1F, offset=0x10000000000000001, size=0xA
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc165257d26f9435cbd00d8e2825ff173393d3b31"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_extcodecopy_dejavu.py b/tests/ported_static/stMemoryTest/test_extcodecopy_dejavu.py
index 596f22b303f..2b3503f4af9 100644
--- a/tests/ported_static/stMemoryTest/test_extcodecopy_dejavu.py
+++ b/tests/ported_static/stMemoryTest/test_extcodecopy_dejavu.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_extcodecopy_dejavu.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/extcodecopy_dejavuFiller.json
+state_tests/stMemoryTest/extcodecopy_dejavuFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/extcodecopy_dejavuFiller.json"],
+    ["state_tests/stMemoryTest/extcodecopy_dejavuFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_extcodecopy_dejavu(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7DD1D0EC78FE936B0E88F8C21226F51F048579915C7BAFF1C5D7FD84B2139BF1
-    )
+    """Test_extcodecopy_dejavu."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x271000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_extcodecopy_dejavu(
         gas_limit=52949672960,
     )
 
-    pre[sender] = Account(balance=0x271000000000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.EXTCODECOPY(
-                address=0xFFFFFFF,
-                dest_offset=0xFFFFFFF,
-                offset=0xFF,
-                size=0xFF,
-            )
+    # Source: raw
+    # 0x60FF60FF630FFFFFFF630FFFFFFF3C
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.EXTCODECOPY(
+            address=0xFFFFFFF, dest_offset=0xFFFFFFF, offset=0xFF, size=0xFF
         ),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe15245403ddc4d3674436cf955358a73d67e226a"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_log1_dejavu.py b/tests/ported_static/stMemoryTest/test_log1_dejavu.py
index 7b91eeaad4a..179a5c1a3ca 100644
--- a/tests/ported_static/stMemoryTest/test_log1_dejavu.py
+++ b/tests/ported_static/stMemoryTest/test_log1_dejavu.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log1_dejavu.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/log1_dejavuFiller.json
+state_tests/stMemoryTest/log1_dejavuFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/log1_dejavuFiller.json"],
+    ["state_tests/stMemoryTest/log1_dejavuFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log1_dejavu(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7DD1D0EC78FE936B0E88F8C21226F51F048579915C7BAFF1C5D7FD84B2139BF1
-    )
+    """Test_log1_dejavu."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x271000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,22 +43,25 @@ def test_log1_dejavu(
         gas_limit=52949672960,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x60FF60FF630FFFFFFFA1
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.LOG1(offset=0xFFFFFFF, size=0xFF, topic_1=0xFF),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2e5dd28ace62cb4fc05fc800ded494a6275107ac"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x271000000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_log2_dejavu.py b/tests/ported_static/stMemoryTest/test_log2_dejavu.py
index 9abf5f9f751..5d6f925646d 100644
--- a/tests/ported_static/stMemoryTest/test_log2_dejavu.py
+++ b/tests/ported_static/stMemoryTest/test_log2_dejavu.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log2_dejavu.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/log2_dejavuFiller.json
+state_tests/stMemoryTest/log2_dejavuFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/log2_dejavuFiller.json"],
+    ["state_tests/stMemoryTest/log2_dejavuFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log2_dejavu(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7DD1D0EC78FE936B0E88F8C21226F51F048579915C7BAFF1C5D7FD84B2139BF1
-    )
+    """Test_log2_dejavu."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x271000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,22 +43,25 @@ def test_log2_dejavu(
         gas_limit=52949672960,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=Op.PUSH1[0xFF] + Op.PUSH1[0xFF] + Op.PUSH4[0xFFFFFFF] + Op.LOG2,
+    # Source: raw
+    # 0x60FF60FF630FFFFFFFA2
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0xFF] * 2 + Op.PUSH4[0xFFFFFFF] + Op.LOG2,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x38ac6ccffb48040475cf67e7040adebb1dd11dec"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x271000000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_log3_dejavu.py b/tests/ported_static/stMemoryTest/test_log3_dejavu.py
index 7b2de846778..c51230ca359 100644
--- a/tests/ported_static/stMemoryTest/test_log3_dejavu.py
+++ b/tests/ported_static/stMemoryTest/test_log3_dejavu.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log3_dejavu.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/log3_dejavuFiller.json
+state_tests/stMemoryTest/log3_dejavuFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/log3_dejavuFiller.json"],
+    ["state_tests/stMemoryTest/log3_dejavuFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log3_dejavu(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7DD1D0EC78FE936B0E88F8C21226F51F048579915C7BAFF1C5D7FD84B2139BF1
-    )
+    """Test_log3_dejavu."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x271000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,22 +43,25 @@ def test_log3_dejavu(
         gas_limit=52949672960,
     )
 
-    pre[sender] = Account(balance=0x271000000000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x60FF60FF60FF630FFFFFFFA2
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.LOG2(offset=0xFFFFFFF, size=0xFF, topic_1=0xFF, topic_2=0xFF),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd1d57042b5af54c18e8ad98b2756c1c30c08d5c1"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_log4_dejavu.py b/tests/ported_static/stMemoryTest/test_log4_dejavu.py
index 3d23f1558d5..8b6757fc42b 100644
--- a/tests/ported_static/stMemoryTest/test_log4_dejavu.py
+++ b/tests/ported_static/stMemoryTest/test_log4_dejavu.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_log4_dejavu.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/log4_dejavuFiller.json
+state_tests/stMemoryTest/log4_dejavuFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/log4_dejavuFiller.json"],
+    ["state_tests/stMemoryTest/log4_dejavuFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_log4_dejavu(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7DD1D0EC78FE936B0E88F8C21226F51F048579915C7BAFF1C5D7FD84B2139BF1
-    )
+    """Test_log4_dejavu."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x271000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,22 +43,25 @@ def test_log4_dejavu(
         gas_limit=52949672960,
     )
 
-    pre[sender] = Account(balance=0x271000000000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x60FF60FF60FF630FFFFFFFA2
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.LOG2(offset=0xFFFFFFF, size=0xFF, topic_1=0xFF, topic_2=0xFF),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd1d57042b5af54c18e8ad98b2756c1c30c08d5c1"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem0b_single_byte.py b/tests/ported_static/stMemoryTest/test_mem0b_single_byte.py
index 6fcd5173d9b..843515cd61a 100644
--- a/tests/ported_static/stMemoryTest/test_mem0b_single_byte.py
+++ b/tests/ported_static/stMemoryTest/test_mem0b_single_byte.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem0b_single_byte.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem0b_singleByteFiller.json
+state_tests/stMemoryTest/mem0b_singleByteFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem0b_singleByteFiller.json"],
+    ["state_tests/stMemoryTest/mem0b_singleByteFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem0b_single_byte(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem0b_single_byte."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem0b_single_byte(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 0 42) [[ 0 ]] (MSIZE)  }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1c10357a4309c879b65e6a761586a2d2762f4510"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 32}),
+        target: Account(storage={0: 32}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem31b_single_byte.py b/tests/ported_static/stMemoryTest/test_mem31b_single_byte.py
index 9697d7a0478..bfcb48d6313 100644
--- a/tests/ported_static/stMemoryTest/test_mem31b_single_byte.py
+++ b/tests/ported_static/stMemoryTest/test_mem31b_single_byte.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem31b_single_byte.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem31b_singleByteFiller.json
+state_tests/stMemoryTest/mem31b_singleByteFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem31b_singleByteFiller.json"],
+    ["state_tests/stMemoryTest/mem31b_singleByteFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem31b_single_byte(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem31b_single_byte."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem31b_single_byte(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 30 42) [[ 0 ]] (MSIZE)  }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x1E, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x1E, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xab348fdb607ae2689a4738d1161dde14f01b206b"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 32}),
+        target: Account(storage={0: 32}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32b_single_byte.py b/tests/ported_static/stMemoryTest/test_mem32b_single_byte.py
index 4e9c58ba7ff..10a1a44be41 100644
--- a/tests/ported_static/stMemoryTest/test_mem32b_single_byte.py
+++ b/tests/ported_static/stMemoryTest/test_mem32b_single_byte.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32b_single_byte.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32b_singleByteFiller.json
+state_tests/stMemoryTest/mem32b_singleByteFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32b_singleByteFiller.json"],
+    ["state_tests/stMemoryTest/mem32b_singleByteFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32b_single_byte(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32b_single_byte."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem32b_single_byte(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 31 42) [[ 0 ]] (MSIZE)  }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x1F, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x1F, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x5f920d21d87930a31d9f34e893e46f9d24ae98bf"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 32}),
+        target: Account(storage={0: 32}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb.py b/tests/ported_static/stMemoryTest/test_mem32kb.py
index 53415fb2a62..6abb8684567 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kbFiller.json
+state_tests/stMemoryTest/mem32kbFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kbFiller.json"],
+    ["state_tests/stMemoryTest/mem32kbFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem32kb(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 31968 42) [[ 1 ]] (MLOAD 31968) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x7CE0, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7CE0))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x7CE0, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7CE0))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x61ee8fdb26ddfd9f99f1089a4196985009f1c2b5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 32000, 1: 42}),
+        target: Account(storage={0: 32000, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_minus_1.py b/tests/ported_static/stMemoryTest/test_mem32kb_minus_1.py
index 7d2768afce5..d33ac793bf9 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb_minus_1.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb_minus_1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb_minus_1.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kb-1Filler.json
+state_tests/stMemoryTest/mem32kb-1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kb-1Filler.json"],
+    ["state_tests/stMemoryTest/mem32kb-1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb_minus_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb_minus_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem32kb_minus_1(
         gas_limit=42949672960,
     )
 
-    pre[sender] = Account(balance=0x6400000000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 31967 42) [[ 1 ]] (MLOAD 31967) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x7CDF, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7CDF))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x7CDF, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7CDF))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xcdb6a2db045d5f57d702f7f2b31b763a48e93012"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 32000, 1: 42}),
+        target: Account(storage={0: 32000, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_minus_31.py b/tests/ported_static/stMemoryTest/test_mem32kb_minus_31.py
index 99065bf0573..d02c97eac67 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb_minus_31.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb_minus_31.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb_minus_31.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kb-31Filler.json
+state_tests/stMemoryTest/mem32kb-31Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kb-31Filler.json"],
+    ["state_tests/stMemoryTest/mem32kb-31Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb_minus_31(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb_minus_31."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem32kb_minus_31(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 31937 42) [[ 1 ]] (MLOAD 31937) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x7CC1, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7CC1))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x7CC1, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7CC1))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb46476112be03a9d0ea0e5c2d87fd734ee2c2687"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 32000, 1: 42}),
+        target: Account(storage={0: 32000, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_minus_32.py b/tests/ported_static/stMemoryTest/test_mem32kb_minus_32.py
index 5c9ea50b8ec..1093a4f54f6 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb_minus_32.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb_minus_32.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb_minus_32.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kb-32Filler.json
+state_tests/stMemoryTest/mem32kb-32Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kb-32Filler.json"],
+    ["state_tests/stMemoryTest/mem32kb-32Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb_minus_32(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb_minus_32."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem32kb_minus_32(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 31936 42) [[ 1 ]] (MLOAD 31936) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x7CC0, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7CC0))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x7CC0, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7CC0))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6486aa041ff3591199ac99568935ecaee0b3acfa"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 31968, 1: 42}),
+        target: Account(storage={0: 31968, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_minus_33.py b/tests/ported_static/stMemoryTest/test_mem32kb_minus_33.py
index d9f48e98c5e..64cbdd9afc7 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb_minus_33.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb_minus_33.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb_minus_33.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kb-33Filler.json
+state_tests/stMemoryTest/mem32kb-33Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kb-33Filler.json"],
+    ["state_tests/stMemoryTest/mem32kb-33Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb_minus_33(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb_minus_33."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem32kb_minus_33(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 31935 42) [[ 1 ]] (MLOAD 31935) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x7CBF, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7CBF))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x7CBF, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7CBF))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4fd3d54f0b8734358798f93f9206e3d2ca5642a5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 31968, 1: 42}),
+        target: Account(storage={0: 31968, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_plus_1.py b/tests/ported_static/stMemoryTest/test_mem32kb_plus_1.py
index ac4e5bcabf5..dafcda655e8 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb_plus_1.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb_plus_1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb_plus_1.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kb+1Filler.json
+state_tests/stMemoryTest/mem32kb+1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kb+1Filler.json"],
+    ["state_tests/stMemoryTest/mem32kb+1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb_plus_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb_plus_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem32kb_plus_1(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 31969 42) [[ 1 ]] (MLOAD 31969) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x7CE1, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7CE1))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x7CE1, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7CE1))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x458bb38ff5220db011d56827c1346b799c1c409d"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 32032, 1: 42}),
+        target: Account(storage={0: 32032, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_plus_31.py b/tests/ported_static/stMemoryTest/test_mem32kb_plus_31.py
index 977b3d45285..e7485db550c 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb_plus_31.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb_plus_31.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb_plus_31.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kb+31Filler.json
+state_tests/stMemoryTest/mem32kb+31Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kb+31Filler.json"],
+    ["state_tests/stMemoryTest/mem32kb+31Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb_plus_31(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb_plus_31."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem32kb_plus_31(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 31999 42) [[ 1 ]] (MLOAD 31999) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x7CFF, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7CFF))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x7CFF, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7CFF))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xac6d4cb03fbb766035268aaf36604a5bf6eb5d04"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 32032, 1: 42}),
+        target: Account(storage={0: 32032, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_plus_32.py b/tests/ported_static/stMemoryTest/test_mem32kb_plus_32.py
index 7f82ba3fb3e..729337fa8ea 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb_plus_32.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb_plus_32.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb_plus_32.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kb+32Filler.json
+state_tests/stMemoryTest/mem32kb+32Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kb+32Filler.json"],
+    ["state_tests/stMemoryTest/mem32kb+32Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb_plus_32(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb_plus_32."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem32kb_plus_32(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 32000 42) [[ 1 ]] (MLOAD 32000) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x7D00, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7D00))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x7D00, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7D00))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb73f7199ef3863783b117a38dbd30d67e44f29e7"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 32032, 1: 42}),
+        target: Account(storage={0: 32032, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_plus_33.py b/tests/ported_static/stMemoryTest/test_mem32kb_plus_33.py
index 9b457071aaf..f571510af1e 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb_plus_33.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb_plus_33.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb_plus_33.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kb+33Filler.json
+state_tests/stMemoryTest/mem32kb+33Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kb+33Filler.json"],
+    ["state_tests/stMemoryTest/mem32kb+33Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb_plus_33(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb_plus_33."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem32kb_plus_33(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 32001 42) [[ 1 ]] (MLOAD 32001) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x7D01, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7D01))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x7D01, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x7D01))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x06b8c6bbda80245d64a2d903e0d864a6ee862270"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 32064, 1: 42}),
+        target: Account(storage={0: 32064, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte.py
index 0a59c684be3..c44e45cc506 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb_single_byte.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kb_singleByteFiller.json
+state_tests/stMemoryTest/mem32kb_singleByteFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kb_singleByteFiller.json"],
+    ["state_tests/stMemoryTest/mem32kb_singleByteFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb_single_byte(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb_single_byte."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem32kb_single_byte(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 31999 42) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x7CFF, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x7CFF, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x341d86929d1b27823501662866e6233246f72ecc"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 32000}),
+        target: Account(storage={0: 32000}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_1.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_1.py
index 65a271b2e3c..27b8314fe8a 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_1.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb_single_byte_minus_1.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kb_singleByte-1Filler.json
+state_tests/stMemoryTest/mem32kb_singleByte-1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kb_singleByte-1Filler.json"],
+    ["state_tests/stMemoryTest/mem32kb_singleByte-1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb_single_byte_minus_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb_single_byte_minus_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem32kb_single_byte_minus_1(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 31998 42) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x7CFE, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x7CFE, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4310553bbfdf1433d24739581d21601557c480f6"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 32000}),
+        target: Account(storage={0: 32000}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_31.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_31.py
index c3d47512d93..f66669a5a5c 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_31.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_31.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb_single_byte_minus_31.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kb_singleByte-31Filler.json
+state_tests/stMemoryTest/mem32kb_singleByte-31Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kb_singleByte-31Filler.json"],
+    ["state_tests/stMemoryTest/mem32kb_singleByte-31Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb_single_byte_minus_31(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb_single_byte_minus_31."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem32kb_single_byte_minus_31(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 31968 42) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x7CE0, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x7CE0, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa66b4a1cc854f0b1ac130e79071ca4d277abb87d"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 32000}),
+        target: Account(storage={0: 32000}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_32.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_32.py
index 7f5b23c48fe..8750a2af20d 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_32.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_32.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb_single_byte_minus_32.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kb_singleByte-32Filler.json
+state_tests/stMemoryTest/mem32kb_singleByte-32Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kb_singleByte-32Filler.json"],
+    ["state_tests/stMemoryTest/mem32kb_singleByte-32Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb_single_byte_minus_32(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb_single_byte_minus_32."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem32kb_single_byte_minus_32(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 31967 42) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x7CDF, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x7CDF, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3efc5cdd351cc21217fa684a05526f34b6d79729"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 31968}),
+        target: Account(storage={0: 31968}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_33.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_33.py
index 70a254ff69c..da15d33663d 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_33.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_minus_33.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb_single_byte_minus_33.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kb_singleByte-33Filler.json
+state_tests/stMemoryTest/mem32kb_singleByte-33Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kb_singleByte-33Filler.json"],
+    ["state_tests/stMemoryTest/mem32kb_singleByte-33Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb_single_byte_minus_33(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb_single_byte_minus_33."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem32kb_single_byte_minus_33(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 31966 42) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x7CDE, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x7CDE, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6d7e35221d9d5f6e4a2b09ed59e10f64ca3c2257"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 31968}),
+        target: Account(storage={0: 31968}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_1.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_1.py
index 73a8021dbd2..34345e79be7 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_1.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb_single_byte_plus_1.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kb_singleByte+1Filler.json
+state_tests/stMemoryTest/mem32kb_singleByte+1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kb_singleByte+1Filler.json"],
+    ["state_tests/stMemoryTest/mem32kb_singleByte+1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb_single_byte_plus_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb_single_byte_plus_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem32kb_single_byte_plus_1(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 32000 42) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x7D00, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x7D00, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa6d38bb472a2b1a04cbcbd484ee16edc3f4062de"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 32032}),
+        target: Account(storage={0: 32032}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_31.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_31.py
index 0a4b52aa58e..583fc5f103a 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_31.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_31.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb_single_byte_plus_31.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kb_singleByte+31Filler.json
+state_tests/stMemoryTest/mem32kb_singleByte+31Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kb_singleByte+31Filler.json"],
+    ["state_tests/stMemoryTest/mem32kb_singleByte+31Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb_single_byte_plus_31(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb_single_byte_plus_31."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem32kb_single_byte_plus_31(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 32030 42) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x7D1E, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x7D1E, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x924a0400505752c6dac9f040c259a232d60e5bb4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 32032}),
+        target: Account(storage={0: 32032}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_32.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_32.py
index 7229f833b0c..a2bd740ed36 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_32.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_32.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb_single_byte_plus_32.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kb_singleByte+32Filler.json
+state_tests/stMemoryTest/mem32kb_singleByte+32Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kb_singleByte+32Filler.json"],
+    ["state_tests/stMemoryTest/mem32kb_singleByte+32Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb_single_byte_plus_32(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb_single_byte_plus_32."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem32kb_single_byte_plus_32(
         gas_limit=42949672960,
     )
 
-    pre[sender] = Account(balance=0x6400000000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 32031 42) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x7D1F, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x7D1F, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc7da3537800028df78d2869d4db3100e84387ed4"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 32032}),
+        target: Account(storage={0: 32032}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_33.py b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_33.py
index f83975fcde4..556f398db04 100644
--- a/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_33.py
+++ b/tests/ported_static/stMemoryTest/test_mem32kb_single_byte_plus_33.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem32kb_single_byte_plus_33.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem32kb_singleByte+33Filler.json
+state_tests/stMemoryTest/mem32kb_singleByte+33Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem32kb_singleByte+33Filler.json"],
+    ["state_tests/stMemoryTest/mem32kb_singleByte+33Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem32kb_single_byte_plus_33(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem32kb_single_byte_plus_33."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem32kb_single_byte_plus_33(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 32032 42) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x7D20, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x7D20, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x8c60eae101b125f477522d98de262b98ac2786f9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 32064}),
+        target: Account(storage={0: 32064}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem33b_single_byte.py b/tests/ported_static/stMemoryTest/test_mem33b_single_byte.py
index e9ae956c016..46c75434094 100644
--- a/tests/ported_static/stMemoryTest/test_mem33b_single_byte.py
+++ b/tests/ported_static/stMemoryTest/test_mem33b_single_byte.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem33b_single_byte.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem33b_singleByteFiller.json
+state_tests/stMemoryTest/mem33b_singleByteFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem33b_singleByteFiller.json"],
+    ["state_tests/stMemoryTest/mem33b_singleByteFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem33b_single_byte(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem33b_single_byte."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem33b_single_byte(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 32 42) [[ 0 ]] (MSIZE)  }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x20, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x20, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3f4d3abb658b6063faae1d1515cff8a434104677"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 64}),
+        target: Account(storage={0: 64}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb.py b/tests/ported_static/stMemoryTest/test_mem64kb.py
index 8b30897acac..e21071e1249 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kbFiller.json
+state_tests/stMemoryTest/mem64kbFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kbFiller.json"],
+    ["state_tests/stMemoryTest/mem64kbFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem64kb(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 63968 42) [[ 1 ]] (MLOAD 63968) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0xF9E0, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xF9E0))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0xF9E0, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xF9E0))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x723656b1f4a75e4c7e382335e836d393d8a9e8cf"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 64000, 1: 42}),
+        target: Account(storage={0: 64000, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_minus_1.py b/tests/ported_static/stMemoryTest/test_mem64kb_minus_1.py
index 53037b75169..22383d2a177 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb_minus_1.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb_minus_1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb_minus_1.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kb-1Filler.json
+state_tests/stMemoryTest/mem64kb-1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kb-1Filler.json"],
+    ["state_tests/stMemoryTest/mem64kb-1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb_minus_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb_minus_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem64kb_minus_1(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 63967 42) [[ 1 ]] (MLOAD 63967) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0xF9DF, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xF9DF))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0xF9DF, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xF9DF))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1aadc0c1dbda9e85f5829fdca5fda372982164b0"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 64000, 1: 42}),
+        target: Account(storage={0: 64000, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_minus_31.py b/tests/ported_static/stMemoryTest/test_mem64kb_minus_31.py
index 806de66127b..98293337bae 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb_minus_31.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb_minus_31.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb_minus_31.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kb-31Filler.json
+state_tests/stMemoryTest/mem64kb-31Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kb-31Filler.json"],
+    ["state_tests/stMemoryTest/mem64kb-31Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb_minus_31(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb_minus_31."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem64kb_minus_31(
         gas_limit=42949672960,
     )
 
-    pre[sender] = Account(balance=0x6400000000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 63937 42) [[ 1 ]] (MLOAD 63937) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0xF9C1, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xF9C1))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0xF9C1, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xF9C1))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc500d8b6a0ac6a677dbb818b03d5d596da40c315"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 64000, 1: 42}),
+        target: Account(storage={0: 64000, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_minus_32.py b/tests/ported_static/stMemoryTest/test_mem64kb_minus_32.py
index 6279e89953c..2b119c33641 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb_minus_32.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb_minus_32.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb_minus_32.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kb-32Filler.json
+state_tests/stMemoryTest/mem64kb-32Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kb-32Filler.json"],
+    ["state_tests/stMemoryTest/mem64kb-32Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb_minus_32(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb_minus_32."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem64kb_minus_32(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 63936 42) [[ 1 ]] (MLOAD 63936) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0xF9C0, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xF9C0))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0xF9C0, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xF9C0))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x243cb187ea7a138cc5a6344c376d789c066a89c8"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 63968, 1: 42}),
+        target: Account(storage={0: 63968, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_minus_33.py b/tests/ported_static/stMemoryTest/test_mem64kb_minus_33.py
index 2dce9fc7d6e..67241de1f79 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb_minus_33.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb_minus_33.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb_minus_33.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kb-33Filler.json
+state_tests/stMemoryTest/mem64kb-33Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kb-33Filler.json"],
+    ["state_tests/stMemoryTest/mem64kb-33Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb_minus_33(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb_minus_33."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem64kb_minus_33(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 63935 42) [[ 1 ]] (MLOAD 63935) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0xF9BF, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xF9BF))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0xF9BF, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xF9BF))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3d7b73d4373952117fd84e96937007f34f914dad"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 63968, 1: 42}),
+        target: Account(storage={0: 63968, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_plus_1.py b/tests/ported_static/stMemoryTest/test_mem64kb_plus_1.py
index 8332c78c63a..5991bb0989d 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb_plus_1.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb_plus_1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb_plus_1.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kb+1Filler.json
+state_tests/stMemoryTest/mem64kb+1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kb+1Filler.json"],
+    ["state_tests/stMemoryTest/mem64kb+1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb_plus_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb_plus_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem64kb_plus_1(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 63969 42) [[ 1 ]] (MLOAD 63969) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0xF9E1, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xF9E1))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0xF9E1, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xF9E1))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x079111606e69dd3101ac45527bcde41fb2c251e2"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 64032, 1: 42}),
+        target: Account(storage={0: 64032, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_plus_31.py b/tests/ported_static/stMemoryTest/test_mem64kb_plus_31.py
index b017c606bb7..8d556ff6c7f 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb_plus_31.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb_plus_31.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb_plus_31.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kb+31Filler.json
+state_tests/stMemoryTest/mem64kb+31Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kb+31Filler.json"],
+    ["state_tests/stMemoryTest/mem64kb+31Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb_plus_31(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb_plus_31."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem64kb_plus_31(
         gas_limit=42949672960,
     )
 
-    pre[sender] = Account(balance=0x6400000000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 63999 42) [[ 1 ]] (MLOAD 63999) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0xF9FF, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xF9FF))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0xF9FF, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xF9FF))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf3c68586ee37cb1c2d59da9ba004dbeef51f5ca6"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 64032, 1: 42}),
+        target: Account(storage={0: 64032, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_plus_32.py b/tests/ported_static/stMemoryTest/test_mem64kb_plus_32.py
index 9d033407fc0..465babad461 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb_plus_32.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb_plus_32.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb_plus_32.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kb+32Filler.json
+state_tests/stMemoryTest/mem64kb+32Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kb+32Filler.json"],
+    ["state_tests/stMemoryTest/mem64kb+32Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb_plus_32(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb_plus_32."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem64kb_plus_32(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 64000 42) [[ 1 ]] (MLOAD 64000) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0xFA00, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xFA00))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0xFA00, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xFA00))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x72a9ffc9e1ea4e32148240ccb6816ec75795c3e2"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 64032, 1: 42}),
+        target: Account(storage={0: 64032, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_plus_33.py b/tests/ported_static/stMemoryTest/test_mem64kb_plus_33.py
index 1664f363e54..4c63e0333b9 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb_plus_33.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb_plus_33.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb_plus_33.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kb+33Filler.json
+state_tests/stMemoryTest/mem64kb+33Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kb+33Filler.json"],
+    ["state_tests/stMemoryTest/mem64kb+33Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb_plus_33(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb_plus_33."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,28 @@ def test_mem64kb_plus_33(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 64001 42) [[ 1 ]] (MLOAD 64001) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0xFA01, value=0x2A)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xFA01))
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0xFA01, value=0x2A)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xFA01))
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6dff7c00a64065ef56eb10f2e51ea77eafc75ba3"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 64064, 1: 42}),
+        target: Account(storage={0: 64064, 1: 42}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte.py
index fa212e550ea..e095fa5ded9 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb_single_byte.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kb_singleByteFiller.json
+state_tests/stMemoryTest/mem64kb_singleByteFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kb_singleByteFiller.json"],
+    ["state_tests/stMemoryTest/mem64kb_singleByteFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb_single_byte(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb_single_byte."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem64kb_single_byte(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 63999 42) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0xF9FF, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0xF9FF, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6c0cf9e7fba0563117dbf01f9126777d60bc54b4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 64000}),
+        target: Account(storage={0: 64000}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_1.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_1.py
index fde4d639a46..6bf456d288f 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_1.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb_single_byte_minus_1.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kb_singleByte-1Filler.json
+state_tests/stMemoryTest/mem64kb_singleByte-1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kb_singleByte-1Filler.json"],
+    ["state_tests/stMemoryTest/mem64kb_singleByte-1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb_single_byte_minus_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb_single_byte_minus_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem64kb_single_byte_minus_1(
         gas_limit=42949672960,
     )
 
-    pre[sender] = Account(balance=0x6400000000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 63998 42) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0xF9FE, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0xF9FE, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe6e541eed2e0e281fcd02d4130c5fbeb077e1147"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 64000}),
+        target: Account(storage={0: 64000}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_31.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_31.py
index 5af3366609d..b211c18b6f7 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_31.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_31.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb_single_byte_minus_31.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kb_singleByte-31Filler.json
+state_tests/stMemoryTest/mem64kb_singleByte-31Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kb_singleByte-31Filler.json"],
+    ["state_tests/stMemoryTest/mem64kb_singleByte-31Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb_single_byte_minus_31(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb_single_byte_minus_31."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem64kb_single_byte_minus_31(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 63968 42) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0xF9E0, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0xF9E0, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4926e43cce3c8681c244e6e6768d3e74995a5faf"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 64000}),
+        target: Account(storage={0: 64000}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_32.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_32.py
index 6295867638f..e79769c8d96 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_32.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_32.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb_single_byte_minus_32.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kb_singleByte-32Filler.json
+state_tests/stMemoryTest/mem64kb_singleByte-32Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kb_singleByte-32Filler.json"],
+    ["state_tests/stMemoryTest/mem64kb_singleByte-32Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb_single_byte_minus_32(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb_single_byte_minus_32."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem64kb_single_byte_minus_32(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 63967 42) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0xF9DF, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0xF9DF, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x901876228e9ba4f968788b6e9eba80e7ec7d91f9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 63968}),
+        target: Account(storage={0: 63968}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_33.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_33.py
index dad3c1e8dbb..00a4b9e6adf 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_33.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_minus_33.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb_single_byte_minus_33.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kb_singleByte-33Filler.json
+state_tests/stMemoryTest/mem64kb_singleByte-33Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kb_singleByte-33Filler.json"],
+    ["state_tests/stMemoryTest/mem64kb_singleByte-33Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb_single_byte_minus_33(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb_single_byte_minus_33."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem64kb_single_byte_minus_33(
         gas_limit=42949672960,
     )
 
-    pre[sender] = Account(balance=0x6400000000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 63966 42) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0xF9DE, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0xF9DE, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfb3508c998cc4f73516f89af816422663ee3c87a"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 63968}),
+        target: Account(storage={0: 63968}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_1.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_1.py
index 3c6dcd8f6f3..9f92d0fea32 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_1.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb_single_byte_plus_1.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kb_singleByte+1Filler.json
+state_tests/stMemoryTest/mem64kb_singleByte+1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kb_singleByte+1Filler.json"],
+    ["state_tests/stMemoryTest/mem64kb_singleByte+1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb_single_byte_plus_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb_single_byte_plus_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem64kb_single_byte_plus_1(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 64000 42) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0xFA00, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0xFA00, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9c7b05f885f77026b10380ea29d2214b1a0daddb"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 64032}),
+        target: Account(storage={0: 64032}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_31.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_31.py
index e7feaa3bae5..434a6dda64e 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_31.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_31.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb_single_byte_plus_31.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kb_singleByte+31Filler.json
+state_tests/stMemoryTest/mem64kb_singleByte+31Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kb_singleByte+31Filler.json"],
+    ["state_tests/stMemoryTest/mem64kb_singleByte+31Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb_single_byte_plus_31(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb_single_byte_plus_31."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem64kb_single_byte_plus_31(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 64030 42) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0xFA1E, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0xFA1E, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xae623ecfafd38d21b0994049c19f434543c942c7"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 64032}),
+        target: Account(storage={0: 64032}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_32.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_32.py
index 7e8a8600f09..f8b36bbe824 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_32.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_32.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb_single_byte_plus_32.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kb_singleByte+32Filler.json
+state_tests/stMemoryTest/mem64kb_singleByte+32Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kb_singleByte+32Filler.json"],
+    ["state_tests/stMemoryTest/mem64kb_singleByte+32Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb_single_byte_plus_32(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb_single_byte_plus_32."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem64kb_single_byte_plus_32(
         gas_limit=42949672960,
     )
 
-    pre[sender] = Account(balance=0x6400000000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 64031 42) [[ 0 ]] (MSIZE) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0xFA1F, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0xFA1F, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdb97d5421507f0363f22c3e3f307d51d0d6d0db0"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 64032}),
+        target: Account(storage={0: 64032}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_33.py b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_33.py
index da91a0894d8..89d78adcb29 100644
--- a/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_33.py
+++ b/tests/ported_static/stMemoryTest/test_mem64kb_single_byte_plus_33.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem64kb_single_byte_plus_33.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mem64kb_singleByte+33Filler.json
+state_tests/stMemoryTest/mem64kb_singleByte+33Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mem64kb_singleByte+33Filler.json"],
+    ["state_tests/stMemoryTest/mem64kb_singleByte+33Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mem64kb_single_byte_plus_33(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem64kb_single_byte_plus_33."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +43,27 @@ def test_mem64kb_single_byte_plus_33(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 64032 42) [[ 0 ]] (MSIZE)  }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0xFA20, value=0x2A)
-            + Op.SSTORE(key=0x0, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0xFA20, value=0x2A)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa251d3c4b8e301cc8690335bfb85c771220191c6"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 64064}),
+        target: Account(storage={0: 64064}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mem_copy_self.py b/tests/ported_static/stMemoryTest/test_mem_copy_self.py
index c32b3bf9989..6db803aed00 100644
--- a/tests/ported_static/stMemoryTest/test_mem_copy_self.py
+++ b/tests/ported_static/stMemoryTest/test_mem_copy_self.py
@@ -2,7 +2,7 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/memCopySelfFiller.yml
+state_tests/stMemoryTest/memCopySelfFiller.yml
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/memCopySelfFiller.yml"],
+    ["state_tests/stMemoryTest/memCopySelfFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_mem_copy_self(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x48DC5A9F099CAAAA557742CA3A990A94BE45B9969126A1BC74E5E8BE5A2B5B47
     )
@@ -46,7 +47,8 @@ def test_mem_copy_self(
     )
 
     pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    let idPrecomp := 0x04
     #
@@ -71,50 +73,50 @@ def test_mem_copy_self(
     #    returndatacopy(0x20, 0, 10)
     #    sstore(2, mload(0x20))
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x4]
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x30, condition=Op.LT(Op.DUP2, 0xF))
-            + Op.PUSH1[0xA]
-            + Op.PUSH1[0x2]
-            + Op.DUP2
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.DUP7
-            + Op.SSTORE(key=Op.DUP3, value=Op.MLOAD(offset=Op.DUP2))
-            + Op.GAS
-            + Op.POP(Op.CALL)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.RETURNDATACOPY(dest_offset=0x20, offset=0x0, size=0xA)
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x20))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.DUP1
-            + Op.PUSH1[0x11]
-            + Op.PUSH1[0x1]
-            + Op.DUP1
-            + Op.SWAP4
-            + Op.ADD
-            + Op.MSTORE8(offset=Op.DUP2, value=Op.MUL)
-            + Op.ADD
-            + Op.JUMP(pc=0x4)
-        ),
-        storage={0x0: 0x60A7},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x4]
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x30, condition=Op.LT(Op.DUP2, 0xF))
+        + Op.PUSH1[0xA]
+        + Op.PUSH1[0x2]
+        + Op.DUP2
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.DUP7
+        + Op.SSTORE(key=Op.DUP3, value=Op.MLOAD(offset=Op.DUP2))
+        + Op.GAS
+        + Op.POP(Op.CALL)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.RETURNDATACOPY(dest_offset=0x20, offset=0x0, size=0xA)
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x20))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.DUP1
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x1]
+        + Op.DUP1
+        + Op.SWAP4
+        + Op.ADD
+        + Op.MSTORE8(offset=Op.DUP2, value=Op.MUL)
+        + Op.ADD
+        + Op.JUMP(pc=0x4),
+        storage={0: 24743},
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0xb595300ac049b84c5277c7ca68a96d74ae377b85"),  # noqa: E501
+        nonce=1,
+        address=Address(0xB595300AC049B84C5277C7CA68A96D74AE377B85),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=16777216,
         nonce=1,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x112233445566778899AABBCCDDEEFF0000000000000000000000000000000000,  # noqa: E501
                 1: 0x1122112233445566778899AADDEEFF0000000000000000000000000000000000,  # noqa: E501
diff --git a/tests/ported_static/stMemoryTest/test_mem_return.py b/tests/ported_static/stMemoryTest/test_mem_return.py
index f1f84ca9dfe..458c2148704 100644
--- a/tests/ported_static/stMemoryTest/test_mem_return.py
+++ b/tests/ported_static/stMemoryTest/test_mem_return.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mem_return.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/memReturnFiller.json
+state_tests/stMemoryTest/memReturnFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,75 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/memReturnFiller.json"],
+    ["state_tests/stMemoryTest/memReturnFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_mem_return(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=42949672960,
-    )
-
-    # Source: LLL
-    # { (CALLDATACOPY 0 0 (CALLDATASIZE)) (RETURN 0 (MSIZE))  }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATACOPY(dest_offset=0x0, offset=0x0, size=Op.CALLDATASIZE)
-            + Op.RETURN(offset=0x0, size=Op.MSIZE)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x80349881d6a01127ffe2a32d172ee0599d94c87e"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x6400000000)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "ff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"  # noqa: E501
-            "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"  # noqa: E501
-            "aaaaaaaaaaaaaaaa"
-        ),
-        gas_limit=100000,
-        value=10,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/memReturnFiller.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_mem_return_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mem_return."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -101,32 +43,29 @@ def test_mem_return_from_prague(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (CALLDATACOPY 0 0 (CALLDATASIZE)) (RETURN 0 (MSIZE))  }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATACOPY(dest_offset=0x0, offset=0x0, size=Op.CALLDATASIZE)
-            + Op.RETURN(offset=0x0, size=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATACOPY(dest_offset=0x0, offset=0x0, size=Op.CALLDATASIZE)
+        + Op.RETURN(offset=0x0, size=Op.MSIZE)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x80349881d6a01127ffe2a32d172ee0599d94c87e"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "ff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"  # noqa: E501
-            "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"  # noqa: E501
-            "aaaaaaaaaaaaaaaa"
+        to=target,
+        data=Bytes(
+            "ff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"  # noqa: E501
         ),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mload16bit_bound.py b/tests/ported_static/stMemoryTest/test_mload16bit_bound.py
index a4045a8a551..fb8e930d5df 100644
--- a/tests/ported_static/stMemoryTest/test_mload16bit_bound.py
+++ b/tests/ported_static/stMemoryTest/test_mload16bit_bound.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mload16bit_bound.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mload16bitBoundFiller.json
+state_tests/stMemoryTest/mload16bitBoundFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mload16bitBoundFiller.json"],
+    ["state_tests/stMemoryTest/mload16bitBoundFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mload16bit_bound(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA9DF11BD92FC8535FFCA3AE0A2133C80D5F4ECC5D31D100B94FF03E63F7E74FF
-    )
+    """Test_mload16bit_bound."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xA00050281798)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,23 +43,25 @@ def test_mload16bit_bound(
         gas_limit=17592320524892,
     )
 
-    pre[sender] = Account(balance=0xA00050281798)
-    # Source: LLL
+    # Source: lll
     # { [[ 1 ]] (MLOAD 65536) }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x10000)) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x85eaa01ac6288c06360d431d62cd865c92b74a28"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mload8bit_bound.py b/tests/ported_static/stMemoryTest/test_mload8bit_bound.py
index 988362ee4ff..8c3f579959f 100644
--- a/tests/ported_static/stMemoryTest/test_mload8bit_bound.py
+++ b/tests/ported_static/stMemoryTest/test_mload8bit_bound.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mload8bit_bound.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mload8bitBoundFiller.json
+state_tests/stMemoryTest/mload8bitBoundFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mload8bitBoundFiller.json"],
+    ["state_tests/stMemoryTest/mload8bitBoundFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mload8bit_bound(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_mload8bit_bound."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,23 +43,25 @@ def test_mload8bit_bound(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 1 ]] (MLOAD 256) }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x100)) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xadea3cdf2c1f0efd3db876810aa68cbcd58d7693"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=220000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mload_dejavu.py b/tests/ported_static/stMemoryTest/test_mload_dejavu.py
index 9caa66e5711..ae1d9c0d283 100644
--- a/tests/ported_static/stMemoryTest/test_mload_dejavu.py
+++ b/tests/ported_static/stMemoryTest/test_mload_dejavu.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mload_dejavu.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mload_dejavuFiller.json
+state_tests/stMemoryTest/mload_dejavuFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mload_dejavuFiller.json"],
+    ["state_tests/stMemoryTest/mload_dejavuFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mload_dejavu(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7DD1D0EC78FE936B0E88F8C21226F51F048579915C7BAFF1C5D7FD84B2139BF1
-    )
+    """Test_mload_dejavu."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x271000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,22 +43,25 @@ def test_mload_dejavu(
         gas_limit=52949672960,
     )
 
-    pre[sender] = Account(balance=0x271000000000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x630FFFFFFF51
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.MLOAD(offset=0xFFFFFFF),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xea3899b6a7db8734111af8b25f6d873e1d14870d"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mstore_dejavu.py b/tests/ported_static/stMemoryTest/test_mstore_dejavu.py
index 8c2469d1f54..4c99760786c 100644
--- a/tests/ported_static/stMemoryTest/test_mstore_dejavu.py
+++ b/tests/ported_static/stMemoryTest/test_mstore_dejavu.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mstore_dejavu.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mstore_dejavuFiller.json
+state_tests/stMemoryTest/mstore_dejavuFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mstore_dejavuFiller.json"],
+    ["state_tests/stMemoryTest/mstore_dejavuFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mstore_dejavu(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7DD1D0EC78FE936B0E88F8C21226F51F048579915C7BAFF1C5D7FD84B2139BF1
-    )
+    """Test_mstore_dejavu."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x271000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,22 +43,25 @@ def test_mstore_dejavu(
         gas_limit=52949672960,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x60F1630FFFFFFF52
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0xFFFFFFF, value=0xF1),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x31fe53a538f8d289fa848c04edc3664468340362"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x271000000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_mstroe8_dejavu.py b/tests/ported_static/stMemoryTest/test_mstroe8_dejavu.py
index 24dd0aee53c..98f8977abc4 100644
--- a/tests/ported_static/stMemoryTest/test_mstroe8_dejavu.py
+++ b/tests/ported_static/stMemoryTest/test_mstroe8_dejavu.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_mstroe8_dejavu.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/mstroe8_dejavuFiller.json
+state_tests/stMemoryTest/mstroe8_dejavuFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/mstroe8_dejavuFiller.json"],
+    ["state_tests/stMemoryTest/mstroe8_dejavuFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_mstroe8_dejavu(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7DD1D0EC78FE936B0E88F8C21226F51F048579915C7BAFF1C5D7FD84B2139BF1
-    )
+    """Test_mstroe8_dejavu."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x271000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,22 +43,25 @@ def test_mstroe8_dejavu(
         gas_limit=52949672960,
     )
 
-    pre[sender] = Account(balance=0x271000000000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x60F1630FFFFFFF53
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE8(offset=0xFFFFFFF, value=0xF1),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xabf77e5b1365493306a9a197d08677715b84ca69"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_oog.py b/tests/ported_static/stMemoryTest/test_oog.py
index 23ec9424937..5c2f1cc4f01 100644
--- a/tests/ported_static/stMemoryTest/test_oog.py
+++ b/tests/ported_static/stMemoryTest/test_oog.py
@@ -2,19 +2,24 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/oogFiller.yml
+state_tests/stMemoryTest/oogFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,322 +27,301 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/oogFiller.yml"],
+    ["state_tests/stMemoryTest/oogFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000039d0",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a100000000000000000000000000000000000000000000000000000000000039d0",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000039d0",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a300000000000000000000000000000000000000000000000000000000000039d0",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000039d0",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000007d00",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f50000000000000000000000000000000000000000000000000000000000007d00",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f300000000000000000000000000000000000000000000000000000000000036b0",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f100000000000000000000000000000000000000000000000000000000000002bc",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000002bc",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f400000000000000000000000000000000000000000000000000000000000002bc",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa00000000000000000000000000000000000000000000000000000000000002bc",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000037000000000000000000000000000000000000000000000000000000000000032a",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000039000000000000000000000000000000000000000000000000000000000000032a",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003c00000000000000000000000000000000000000000000000000000000000002bc",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000007d0",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000c01",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000510000000000000000000000000000000000000000000000000000000000000190",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000520000000000000000000000000000000000000000000000000000000000000190",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000530000000000000000000000000000000000000000000000000000000000000190",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004ba",  # noqa: E501
-            {},
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a1000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            38,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            39,
+            0,
+            0,
+            id="failure",
+        ),
+        pytest.param(
+            40,
+            0,
+            0,
+            id="success",
+        ),
+        pytest.param(
+            41,
+            0,
+            0,
+            id="failure",
         ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a3000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000a4000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f3000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000037000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000039000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000c02",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000051000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000052000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000053000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000ffff",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000010020)
+    contract_1 = Address(0x0000000000000000000000000000000000010037)
+    contract_2 = Address(0x0000000000000000000000000000000000010039)
+    contract_3 = Address(0x000000000000000000000000000000000001003C)
+    contract_4 = Address(0x000000000000000000000000000000000001003E)
+    contract_5 = Address(0x000000000000000000000000000000000001113E)
+    contract_6 = Address(0x0000000000000000000000000000000000010051)
+    contract_7 = Address(0x0000000000000000000000000000000000010052)
+    contract_8 = Address(0x0000000000000000000000000000000000010053)
+    contract_9 = Address(0x00000000000000000000000000000000000100A0)
+    contract_10 = Address(0x00000000000000000000000000000000000100A1)
+    contract_11 = Address(0x00000000000000000000000000000000000100A2)
+    contract_12 = Address(0x00000000000000000000000000000000000100A3)
+    contract_13 = Address(0x00000000000000000000000000000000000100A4)
+    contract_14 = Address(0x00000000000000000000000000000000000100F0)
+    contract_15 = Address(0x00000000000000000000000000000000000100F5)
+    contract_16 = Address(0x00000000000000000000000000000000000100F3)
+    contract_17 = Address(0x00000000000000000000000000000000000100F1)
+    contract_18 = Address(0x00000000000000000000000000000000000100F2)
+    contract_19 = Address(0x00000000000000000000000000000000000100F4)
+    contract_20 = Address(0x00000000000000000000000000000000000100FA)
+    contract_21 = Address(0x00000000000000000000000000000000000111F1)
+    contract_22 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -348,327 +332,470 @@ def test_oog(
         gas_limit=100000000,
     )
 
-    pre.deploy_contract(
+    # Source: yul
+    # berlin
+    # {
+    #     // Instead of keccak256, which seems to be optimized into
+    #     // not happening
+    #     pop(verbatim_2i_1o(hex"20", 0, 0x1000))
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SHA3(offset=0x0, size=0x1000) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000010020"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000010020),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLDATACOPY(dest_offset=Op.DUP1, offset=0x0, size=0x1000)
-            + Op.STOP
-        ),
+    # Source: yul
+    # berlin
+    # {
+    #    calldatacopy(0,0,0x1000)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATACOPY(dest_offset=Op.DUP1, offset=0x0, size=0x1000)
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000010037"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000010037),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    codecopy(0,0,0x1000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.CODECOPY(dest_offset=Op.DUP1, offset=0x0, size=0x1000) + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.CODECOPY(dest_offset=Op.DUP1, offset=0x0, size=0x1000)
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000010039"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000010039),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    extcodecopy(address(),0,0,0x1000)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.EXTCODECOPY(
-                address=Op.ADDRESS,
-                dest_offset=Op.DUP1,
-                offset=0x0,
-                size=0x1000,
-            )
-            + Op.STOP
-        ),
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.EXTCODECOPY(
+            address=Op.ADDRESS, dest_offset=Op.DUP1, offset=0x0, size=0x1000
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x000000000000000000000000000000000001003c"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000001003C),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
-    #    // Make sure there is return data to be copied
-    #    pop(call(gas(), 0x1113e, 0, 0, 0x20, 0, 0x20))
-    #
-    #    returndatacopy(0x1000,0,0x10)
+    #    mstore(0, 0x0102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20)  # noqa: E501
+    #    return(0,0x20)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0x1113E,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=Op.DUP2,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.RETURNDATACOPY(dest_offset=0x1000, offset=0x0, size=0x10)
-            + Op.STOP
-        ),
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20,  # noqa: E501
+        )
+        + Op.RETURN(offset=0x0, size=0x20),
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x000000000000000000000000000000000001003e"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000001113E),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: yul
+    # berlin
+    # {
+    #     pop(verbatim_1i_1o(hex"51", 0x1000))
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
         code=Op.MLOAD(offset=0x1000) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000010051"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000010051),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: yul
+    # berlin
+    # {
+    #     mstore(0x1000, 0xFF)
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1000, value=0xFF) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000010052"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000010052),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: yul
+    # berlin
+    # {
+    #     mstore8(0x1000, 0xFF)
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE8(offset=0x1000, value=0xFF) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0000000000000000000000000000000000010053"),  # noqa: E501
+        nonce=1,
+        address=Address(0x0000000000000000000000000000000000010053),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    log0(0x10000, 0x20)
     # }
-    pre.deploy_contract(
+    contract_9 = pre.deploy_contract(  # noqa: F841
         code=Op.LOG0(offset=0x10000, size=0x20) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x00000000000000000000000000000000000100a0"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000100A0),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    log1(0x10000, 0x20, 0x1)
     # }
-    pre.deploy_contract(
+    contract_10 = pre.deploy_contract(  # noqa: F841
         code=Op.LOG1(offset=0x10000, size=0x20, topic_1=0x1) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x00000000000000000000000000000000000100a1"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000100A1),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    log2(0x10000, 0x20, 0x1, 0x2)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.LOG2(offset=0x10000, size=0x20, topic_1=0x1, topic_2=0x2)
-            + Op.STOP
-        ),
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG2(offset=0x10000, size=0x20, topic_1=0x1, topic_2=0x2)
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x00000000000000000000000000000000000100a2"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000100A2),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    log3(0x10000, 0x20, 0x1, 0x2, 0x3)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.LOG3(
-                offset=0x10000,
-                size=0x20,
-                topic_1=0x1,
-                topic_2=0x2,
-                topic_3=0x3,
-            )
-            + Op.STOP
-        ),
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG3(
+            offset=0x10000, size=0x20, topic_1=0x1, topic_2=0x2, topic_3=0x3
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x00000000000000000000000000000000000100a3"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000100A3),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    log4(0x10000, 0x20, 0x1, 0x2, 0x3, 0x4)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.LOG4(
-                offset=0x10000,
-                size=0x20,
-                topic_1=0x1,
-                topic_2=0x2,
-                topic_3=0x3,
-                topic_4=0x4,
-            )
-            + Op.STOP
-        ),
+    contract_13 = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG4(
+            offset=0x10000,
+            size=0x20,
+            topic_1=0x1,
+            topic_2=0x2,
+            topic_3=0x3,
+            topic_4=0x4,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x00000000000000000000000000000000000100a4"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000100A4),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    pop(create(0, 0x10000, 0x20))
     # }
-    pre.deploy_contract(
+    contract_14 = pre.deploy_contract(  # noqa: F841
         code=Op.CREATE(value=0x0, offset=0x10000, size=0x20) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x00000000000000000000000000000000000100f0"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000100F0),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
-    #    pop(call(gas(), 0x111f1, 0, 0x10000, 0, 0, 0))
+    #    pop(create2(0, 0x10000, 0x20, 0x5a17))
     # }
-    pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=Op.GAS,
-                address=0x111F1,
-                value=Op.DUP2,
-                args_offset=0x10000,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    contract_15 = pre.deploy_contract(  # noqa: F841
+        code=Op.CREATE2(value=0x0, offset=0x10000, size=0x20, salt=0x5A17)
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x00000000000000000000000000000000000100f1"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000100F5),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
-    #    pop(callcode(gas(), 0x111f1, 0, 0x10000, 0, 0, 0))
+    #    return(0x10000, 0x20)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=Op.GAS,
-                address=0x111F1,
-                value=Op.DUP2,
-                args_offset=0x10000,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    contract_16 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0x10000, size=0x20),
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x00000000000000000000000000000000000100f2"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000100F3),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
-    #    return(0x10000, 0x20)
+    #    stop()
     # }
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0x10000, size=0x20),
+    contract_21 = pre.deploy_contract(  # noqa: F841
+        code=Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x00000000000000000000000000000000000100f3"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000111F1),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
-    #    pop(delegatecall(gas(), 0x111f1, 0x10000, 0, 0, 0))
+    #    let op     := calldataload(0x04)
+    #    let gasAmt := calldataload(0x24)
+    #
+    #    // Call the function that actually goes OOG (or not)
+    #    sstore(0, call(gasAmt, add(0x10000,op), 0, 0, 0, 0, 0))
     # }
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0x111F1,
-                args_offset=0x10000,
+    contract_22 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.CALLDATALOAD(offset=0x24),
+                address=Op.ADD(Op.CALLDATALOAD(offset=0x4), 0x10000),
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
                 args_size=Op.DUP1,
                 ret_offset=Op.DUP1,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x00000000000000000000000000000000000100f4"),  # noqa: E501
+        nonce=1,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
-    #    pop(create2(0, 0x10000, 0x20, 0x5a17))
+    #    // Make sure there is return data to be copied
+    #    pop(call(gas(), 0x1113e, 0, 0, 0x20, 0, 0x20))
+    #
+    #    returndatacopy(0x1000,0,0x10)
     # }
-    pre.deploy_contract(
-        code=(
-            Op.CREATE2(value=0x0, offset=0x10000, size=0x20, salt=0x5A17)
-            + Op.STOP
-        ),
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0x1113E,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=Op.DUP2,
+                ret_offset=0x0,
+                ret_size=0x20,
+            )
+        )
+        + Op.RETURNDATACOPY(dest_offset=0x1000, offset=0x0, size=0x10)
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x00000000000000000000000000000000000100f5"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000001003E),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
-    #    pop(staticcall(gas(), 0x111f1, 0x10000, 0, 0, 0))
+    #    pop(call(gas(), 0x111f1, 0, 0x10000, 0, 0, 0))
     # }
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=Op.GAS,
-                address=0x111F1,
-                args_offset=0x10000,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    contract_17 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=Op.GAS,
+            address=0x111F1,
+            value=Op.DUP2,
+            args_offset=0x10000,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x00000000000000000000000000000000000100fa"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000100F1),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
-    #    mstore(0, 0x0102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20)  # noqa: E501
-    #    return(0,0x20)
+    #    pop(staticcall(gas(), 0x111f1, 0x10000, 0, 0, 0))
     # }
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20,  # noqa: E501
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-        ),
+    contract_20 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=Op.GAS,
+            address=0x111F1,
+            args_offset=0x10000,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x000000000000000000000000000000000001113e"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000100FA),  # noqa: E501
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
-    #    stop()
+    #    pop(delegatecall(gas(), 0x111f1, 0x10000, 0, 0, 0))
     # }
-    pre.deploy_contract(
-        code=bytes.fromhex("00"),
+    contract_19 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0x111F1,
+            args_offset=0x10000,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x00000000000000000000000000000000000111f1"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000100F4),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
-    #    let op     := calldataload(0x04)
-    #    let gasAmt := calldataload(0x24)
-    #
-    #    // Call the function that actually goes OOG (or not)
-    #    sstore(0, call(gasAmt, add(0x10000,op), 0, 0, 0, 0, 0))
+    #    pop(callcode(gas(), 0x111f1, 0, 0x10000, 0, 0, 0))
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.CALLDATALOAD(offset=0x24),
-                    address=Op.ADD(Op.CALLDATALOAD(offset=0x4), 0x10000),
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_18 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=Op.GAS,
+            address=0x111F1,
+            value=Op.DUP2,
+            args_offset=0x10000,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        nonce=1,
+        address=Address(0x00000000000000000000000000000000000100F2),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [
+                    0,
+                    2,
+                    4,
+                    6,
+                    8,
+                    9,
+                    12,
+                    14,
+                    16,
+                    18,
+                    20,
+                    22,
+                    24,
+                    26,
+                    28,
+                    30,
+                    32,
+                    34,
+                    36,
+                    38,
+                    40,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_22: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {
+                "data": [
+                    1,
+                    3,
+                    5,
+                    7,
+                    10,
+                    11,
+                    13,
+                    15,
+                    17,
+                    19,
+                    21,
+                    23,
+                    25,
+                    27,
+                    29,
+                    31,
+                    33,
+                    35,
+                    37,
+                    39,
+                    41,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_22: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0x20) + Hash(0x4BA),
+        Bytes("1a8451e6") + Hash(0x37) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0x37) + Hash(0x32A),
+        Bytes("1a8451e6") + Hash(0x39) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0x39) + Hash(0x32A),
+        Bytes("1a8451e6") + Hash(0x3C) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0x3C) + Hash(0x2BC),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0xC02),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0x7D0),
+        Bytes("1a8451e6") + Hash(0x3E) + Hash(0xC01),
+        Bytes("1a8451e6") + Hash(0x51) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0x51) + Hash(0x190),
+        Bytes("1a8451e6") + Hash(0x52) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0x52) + Hash(0x190),
+        Bytes("1a8451e6") + Hash(0x53) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0x53) + Hash(0x190),
+        Bytes("1a8451e6") + Hash(0xA0) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0xA0) + Hash(0x39D0),
+        Bytes("1a8451e6") + Hash(0xA1) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0xA1) + Hash(0x39D0),
+        Bytes("1a8451e6") + Hash(0xA2) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0xA2) + Hash(0x39D0),
+        Bytes("1a8451e6") + Hash(0xA3) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0xA3) + Hash(0x39D0),
+        Bytes("1a8451e6") + Hash(0xA4) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0xA4) + Hash(0x39D0),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0x7D00),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0x7D00),
+        Bytes("1a8451e6") + Hash(0xF3) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0xF3) + Hash(0x36B0),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0x2BC),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0x2BC),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0x2BC),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0xFFFF),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0x2BC),
+    ]
+    tx_gas = [16777216]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
+        to=contract_22,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_sha3_dejavu.py b/tests/ported_static/stMemoryTest/test_sha3_dejavu.py
index 884e9d4a6f0..71ea3d8f864 100644
--- a/tests/ported_static/stMemoryTest/test_sha3_dejavu.py
+++ b/tests/ported_static/stMemoryTest/test_sha3_dejavu.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_sha3_dejavu.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/sha3_dejavuFiller.json
+state_tests/stMemoryTest/sha3_dejavuFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/sha3_dejavuFiller.json"],
+    ["state_tests/stMemoryTest/sha3_dejavuFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_sha3_dejavu(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x7DD1D0EC78FE936B0E88F8C21226F51F048579915C7BAFF1C5D7FD84B2139BF1
-    )
+    """Test_sha3_dejavu."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x271000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,22 +43,25 @@ def test_sha3_dejavu(
         gas_limit=52949672960,
     )
 
-    pre[sender] = Account(balance=0x271000000000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x60FF630FFFFFFF20
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SHA3(offset=0xFFFFFFF, size=0xFF),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa9b85b894d15d75175ce20cc2d6810154894110c"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_stack_limit_gas_1023.py b/tests/ported_static/stMemoryTest/test_stack_limit_gas_1023.py
index 04c2ce333e3..b00ed4ee67b 100644
--- a/tests/ported_static/stMemoryTest/test_stack_limit_gas_1023.py
+++ b/tests/ported_static/stMemoryTest/test_stack_limit_gas_1023.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_stack_limit_gas_1023.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/stackLimitGas_1023Filler.json
+state_tests/stMemoryTest/stackLimitGas_1023Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/stackLimitGas_1023Filler.json"],
+    ["state_tests/stMemoryTest/stackLimitGas_1023Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_stack_limit_gas_1023(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_stack_limit_gas_1023."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,31 +43,30 @@ def test_stack_limit_gas_1023(
         gas_limit=42949672960,
     )
 
-    pre[sender] = Account(balance=0x6400000000)
-    # Source: asm
+    # Source: lll
     # (asm 1021 0x00 MSTORE JUMPDEST GAS 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x3FD)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
-            + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x3FD)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
+        + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
+        + Op.STOP * 2,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xee5de953f398cd2615e0067f1071541730357ebf"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_stack_limit_gas_1024.py b/tests/ported_static/stMemoryTest/test_stack_limit_gas_1024.py
index ae9ff08542d..7ce6abe11e0 100644
--- a/tests/ported_static/stMemoryTest/test_stack_limit_gas_1024.py
+++ b/tests/ported_static/stMemoryTest/test_stack_limit_gas_1024.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_stack_limit_gas_1024.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/stackLimitGas_1024Filler.json
+state_tests/stMemoryTest/stackLimitGas_1024Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/stackLimitGas_1024Filler.json"],
+    ["state_tests/stMemoryTest/stackLimitGas_1024Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_stack_limit_gas_1024(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_stack_limit_gas_1024."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,31 +43,36 @@ def test_stack_limit_gas_1024(
         gas_limit=42949672960,
     )
 
-    # Source: asm
+    # Source: lll
     # (asm 1022 0x00 MSTORE JUMPDEST GAS 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x3FE)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
-            + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x3FE)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
+        + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
+        + Op.STOP * 2,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb2b4442b80edd3930f9d8a8696794672fbeebfd0"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={},
+            code=bytes.fromhex(
+                "6103fe6000525b5a6001600051036000526000516006570000"
+            ),
+            nonce=0,
+        ),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_stack_limit_gas_1025.py b/tests/ported_static/stMemoryTest/test_stack_limit_gas_1025.py
index b669c66ffb5..29ee60d63d2 100644
--- a/tests/ported_static/stMemoryTest/test_stack_limit_gas_1025.py
+++ b/tests/ported_static/stMemoryTest/test_stack_limit_gas_1025.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_stack_limit_gas_1025.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/stackLimitGas_1025Filler.json
+state_tests/stMemoryTest/stackLimitGas_1025Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/stackLimitGas_1025Filler.json"],
+    ["state_tests/stMemoryTest/stackLimitGas_1025Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_stack_limit_gas_1025(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_stack_limit_gas_1025."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,31 +43,36 @@ def test_stack_limit_gas_1025(
         gas_limit=42949672960,
     )
 
-    # Source: asm
+    # Source: lll
     # (asm 1023 0x00 MSTORE JUMPDEST GAS 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x3FF)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
-            + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x3FF)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
+        + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
+        + Op.STOP * 2,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6498d2da4fc198b991f2214160a3ce0e5438f3e4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={},
+            code=bytes.fromhex(
+                "6103ff6000525b5a6001600051036000526000516006570000"
+            ),
+            nonce=0,
+        ),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_stack_limit_push31_1023.py b/tests/ported_static/stMemoryTest/test_stack_limit_push31_1023.py
index cec4555f6c2..c021f1a041e 100644
--- a/tests/ported_static/stMemoryTest/test_stack_limit_push31_1023.py
+++ b/tests/ported_static/stMemoryTest/test_stack_limit_push31_1023.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_stack_limit_push31_1023.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/stackLimitPush31_1023Filler.json
+state_tests/stMemoryTest/stackLimitPush31_1023Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/stackLimitPush31_1023Filler.json"],
+    ["state_tests/stMemoryTest/stackLimitPush31_1023Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_stack_limit_push31_1023(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_stack_limit_push31_1023."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,33 +43,38 @@ def test_stack_limit_push31_1023(
         gas_limit=42949672960,
     )
 
-    # Source: asm
+    # Source: lll
     # (asm 1021 0x00 MSTORE JUMPDEST 0x0102030405060708090a0102030405060708090a0102030405060708090a01 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x3FD)
-            + Op.JUMPDEST
-            + Op.PUSH31[
-                0x102030405060708090A0102030405060708090A0102030405060708090A01
-            ]
-            + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
-            + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x3FD)
+        + Op.JUMPDEST
+        + Op.PUSH31[
+            0x102030405060708090A0102030405060708090A0102030405060708090A01
+        ]
+        + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
+        + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
+        + Op.STOP * 2,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x887fe5a55a7be422caf5816b6721c8bb9f8abbcb"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={},
+            code=bytes.fromhex(
+                "6103fd6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a016001600051036000526000516006570000"  # noqa: E501
+            ),
+            nonce=0,
+        ),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_stack_limit_push31_1024.py b/tests/ported_static/stMemoryTest/test_stack_limit_push31_1024.py
index 80d8bab6126..e3b1790cc4e 100644
--- a/tests/ported_static/stMemoryTest/test_stack_limit_push31_1024.py
+++ b/tests/ported_static/stMemoryTest/test_stack_limit_push31_1024.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_stack_limit_push31_1024.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/stackLimitPush31_1024Filler.json
+state_tests/stMemoryTest/stackLimitPush31_1024Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/stackLimitPush31_1024Filler.json"],
+    ["state_tests/stMemoryTest/stackLimitPush31_1024Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_stack_limit_push31_1024(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_stack_limit_push31_1024."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,33 +43,38 @@ def test_stack_limit_push31_1024(
         gas_limit=42949672960,
     )
 
-    # Source: asm
+    # Source: lll
     # (asm 1022 0x00 MSTORE JUMPDEST 0x0102030405060708090a0102030405060708090a0102030405060708090a01 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x3FE)
-            + Op.JUMPDEST
-            + Op.PUSH31[
-                0x102030405060708090A0102030405060708090A0102030405060708090A01
-            ]
-            + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
-            + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x3FE)
+        + Op.JUMPDEST
+        + Op.PUSH31[
+            0x102030405060708090A0102030405060708090A0102030405060708090A01
+        ]
+        + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
+        + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
+        + Op.STOP * 2,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc7ff917e8edb8dcb3f445b38e466370c684661"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={},
+            code=bytes.fromhex(
+                "6103fe6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a016001600051036000526000516006570000"  # noqa: E501
+            ),
+            nonce=0,
+        ),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_stack_limit_push31_1025.py b/tests/ported_static/stMemoryTest/test_stack_limit_push31_1025.py
index 675e01cd07f..e1927888e80 100644
--- a/tests/ported_static/stMemoryTest/test_stack_limit_push31_1025.py
+++ b/tests/ported_static/stMemoryTest/test_stack_limit_push31_1025.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_stack_limit_push31_1025.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/stackLimitPush31_1025Filler.json
+state_tests/stMemoryTest/stackLimitPush31_1025Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/stackLimitPush31_1025Filler.json"],
+    ["state_tests/stMemoryTest/stackLimitPush31_1025Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_stack_limit_push31_1025(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_stack_limit_push31_1025."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,33 +43,38 @@ def test_stack_limit_push31_1025(
         gas_limit=42949672960,
     )
 
-    # Source: asm
+    # Source: lll
     # (asm 1023 0x00 MSTORE JUMPDEST 0x0102030405060708090a0102030405060708090a0102030405060708090a01 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x3FF)
-            + Op.JUMPDEST
-            + Op.PUSH31[
-                0x102030405060708090A0102030405060708090A0102030405060708090A01
-            ]
-            + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
-            + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x3FF)
+        + Op.JUMPDEST
+        + Op.PUSH31[
+            0x102030405060708090A0102030405060708090A0102030405060708090A01
+        ]
+        + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
+        + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
+        + Op.STOP * 2,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x176570409b578ecdac49079aae3f1c743fe50853"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={},
+            code=bytes.fromhex(
+                "6103ff6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a016001600051036000526000516006570000"  # noqa: E501
+            ),
+            nonce=0,
+        ),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_stack_limit_push32_1023.py b/tests/ported_static/stMemoryTest/test_stack_limit_push32_1023.py
index c538d720dc3..64916cb0e05 100644
--- a/tests/ported_static/stMemoryTest/test_stack_limit_push32_1023.py
+++ b/tests/ported_static/stMemoryTest/test_stack_limit_push32_1023.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_stack_limit_push32_1023.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/stackLimitPush32_1023Filler.json
+state_tests/stMemoryTest/stackLimitPush32_1023Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/stackLimitPush32_1023Filler.json"],
+    ["state_tests/stMemoryTest/stackLimitPush32_1023Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_stack_limit_push32_1023(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_stack_limit_push32_1023."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,33 +43,38 @@ def test_stack_limit_push32_1023(
         gas_limit=42949672960,
     )
 
-    # Source: asm
+    # Source: lll
     # (asm 1021 0x00 MSTORE JUMPDEST 0x0102030405060708090a0102030405060708090a0102030405060708090a0102 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x3FD)
-            + Op.JUMPDEST
-            + Op.PUSH32[
-                0x102030405060708090A0102030405060708090A0102030405060708090A0102  # noqa: E501
-            ]
-            + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
-            + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x3FD)
+        + Op.JUMPDEST
+        + Op.PUSH32[
+            0x102030405060708090A0102030405060708090A0102030405060708090A0102
+        ]
+        + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
+        + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
+        + Op.STOP * 2,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x34b65badf9efca4febc588c255dcfbf8d256e1f0"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={},
+            code=bytes.fromhex(
+                "6103fd6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a01026001600051036000526000516006570000"  # noqa: E501
+            ),
+            nonce=0,
+        ),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_stack_limit_push32_1024.py b/tests/ported_static/stMemoryTest/test_stack_limit_push32_1024.py
index aa362874387..c75f16d85e3 100644
--- a/tests/ported_static/stMemoryTest/test_stack_limit_push32_1024.py
+++ b/tests/ported_static/stMemoryTest/test_stack_limit_push32_1024.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_stack_limit_push32_1024.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/stackLimitPush32_1024Filler.json
+state_tests/stMemoryTest/stackLimitPush32_1024Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/stackLimitPush32_1024Filler.json"],
+    ["state_tests/stMemoryTest/stackLimitPush32_1024Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_stack_limit_push32_1024(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_stack_limit_push32_1024."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,33 +43,32 @@ def test_stack_limit_push32_1024(
         gas_limit=42949672960,
     )
 
-    # Source: asm
+    # Source: lll
     # (asm 1022 0x00 MSTORE JUMPDEST 0x0102030405060708090a0102030405060708090a0102030405060708090a0102 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x3FE)
-            + Op.JUMPDEST
-            + Op.PUSH32[
-                0x102030405060708090A0102030405060708090A0102030405060708090A0102  # noqa: E501
-            ]
-            + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
-            + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x3FE)
+        + Op.JUMPDEST
+        + Op.PUSH32[
+            0x102030405060708090A0102030405060708090A0102030405060708090A0102
+        ]
+        + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
+        + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
+        + Op.STOP * 2,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6acb6452d5c01d94259fcc0138d1cb14977b5e7e"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stMemoryTest/test_stack_limit_push32_1025.py b/tests/ported_static/stMemoryTest/test_stack_limit_push32_1025.py
index f3a65ae10a8..5d72f2a638c 100644
--- a/tests/ported_static/stMemoryTest/test_stack_limit_push32_1025.py
+++ b/tests/ported_static/stMemoryTest/test_stack_limit_push32_1025.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_stack_limit_push32_1025.
 
 Ported from:
-tests/static/state_tests/stMemoryTest/stackLimitPush32_1025Filler.json
+state_tests/stMemoryTest/stackLimitPush32_1025Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stMemoryTest/stackLimitPush32_1025Filler.json"],
+    ["state_tests/stMemoryTest/stackLimitPush32_1025Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_stack_limit_push32_1025(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_stack_limit_push32_1025."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,33 +43,38 @@ def test_stack_limit_push32_1025(
         gas_limit=42949672960,
     )
 
-    # Source: asm
+    # Source: lll
     # (asm 1023 0x00 MSTORE JUMPDEST 0x0102030405060708090a0102030405060708090a0102030405060708090a0102 0x01 0x00 MLOAD SUB 0x00 MSTORE 0x00 MLOAD 0x06 JUMPI STOP )  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x3FF)
-            + Op.JUMPDEST
-            + Op.PUSH32[
-                0x102030405060708090A0102030405060708090A0102030405060708090A0102  # noqa: E501
-            ]
-            + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
-            + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x3FF)
+        + Op.JUMPDEST
+        + Op.PUSH32[
+            0x102030405060708090A0102030405060708090A0102030405060708090A0102
+        ]
+        + Op.MSTORE(offset=0x0, value=Op.SUB(Op.MLOAD(offset=0x0), 0x1))
+        + Op.JUMPI(pc=0x6, condition=Op.MLOAD(offset=0x0))
+        + Op.STOP * 2,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3a584dfb85485c7da4f7f6203d4aa78e8c40295a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={},
+            code=bytes.fromhex(
+                "6103ff6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a01026001600051036000526000516006570000"  # noqa: E501
+            ),
+            nonce=0,
+        ),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/__init__.py b/tests/ported_static/stNonZeroCallsTest/__init__.py
index a9394f4be9b..0f61e59e2bb 100644
--- a/tests/ported_static/stNonZeroCallsTest/__init__.py
+++ b/tests/ported_static/stNonZeroCallsTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stNonZeroCallsTest."""
+"""Ported static tests: stNonZeroCallsTest."""  # noqa: N999
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_call.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_call.py
index a43576a39d3..aae4b4903c5 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_call.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_call.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_non_zero_value_call.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_CALLFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_CALLFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_CALLFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stNonZeroCallsTest/NonZeroValue_CALLFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,9 @@ def test_non_zero_value_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_non_zero_value_call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,39 +48,41 @@ def test_non_zero_value_call(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [0](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         balance=100,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={1: 1, 100: 56435}),
+        contract_0: Account(storage={1: 1, 100: 56435}, balance=99),
+        Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B): Account(
+            balance=1
+        ),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_call_to_empty_paris.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_call_to_empty_paris.py
index 38e919f9622..fcfb431e5b8 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_call_to_empty_paris.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_call_to_empty_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_non_zero_value_call_to_empty_paris.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_CALL_ToEmpty_ParisFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty_ParisFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_non_zero_value_call_to_empty_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_non_zero_value_call_to_empty_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,41 +45,39 @@ def test_non_zero_value_call_to_empty_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
     # { [0](GAS) [[1]] (CALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 0 0 0) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0xf6029618cf51ca5236afc14ead1fbe0739573c23"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={1: 1, 100: 31435}),
+        addr: Account(balance=11),
+        target: Account(storage={1: 1, 100: 31435}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_call_to_non_non_zero_balance.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_call_to_non_non_zero_balance.py
index dec7342ef53..462c93ae2ae 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_call_to_non_non_zero_balance.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_call_to_non_non_zero_balance.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_non_zero_value_call_to_non_non_zero_balance.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_non_zero_value_call_to_non_non_zero_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
+    """Test_non_zero_value_call_to_non_non_zero_balance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,40 +45,38 @@ def test_non_zero_value_call_to_non_non_zero_balance(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    addr = pre.fund_eoa(amount=100)  # noqa: F841
+    # Source: lll
     # { [0](GAS) [[1]] (CALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 0 0 0) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=0x9089DA66E8BBC08846842A301905501BC8525DC4,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x4abd26a4e64c75f89ef76de6649d66b4929919ec"),  # noqa: E501
     )
-    pre[callee] = Account(balance=100, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={100: 11535}),
+        addr: Account(balance=100),
+        target: Account(storage={100: 11535}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_call_to_one_storage_key_paris.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_call_to_one_storage_key_paris.py
index 4d40654ad81..76dd7cdb2ba 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_call_to_one_storage_key_paris.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_call_to_one_storage_key_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_non_zero_value_call_to_one_storage_key_paris.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_CALL_ToOneStorageKey_ParisFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey_ParisFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey_ParisFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_non_zero_value_call_to_one_storage_key_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_non_zero_value_call_to_one_storage_key_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    callee = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,42 +49,41 @@ def test_non_zero_value_call_to_one_storage_key_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=10, storage={0: 1})
+    # Source: lll
     # { [0](GAS) [[1]] (CALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 0 0 0) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0xf6029618cf51ca5236afc14ead1fbe0739573c23"),  # noqa: E501
+        address=Address(0xF6029618CF51CA5236AFC14EAD1FBE0739573C23),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        callee: Account(storage={0: 1}),
-        contract: Account(storage={1: 1, 100: 31435}),
+        addr: Account(storage={0: 1}, balance=11),
+        target: Account(storage={1: 1, 100: 31435}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_callcode.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_callcode.py
index 6c6ef7cc850..55b2e219e75 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_callcode.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_callcode.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_non_zero_value_callcode.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_CALLCODEFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_CALLCODEFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_CALLCODEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stNonZeroCallsTest/NonZeroValue_CALLCODEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,9 @@ def test_non_zero_value_callcode(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_non_zero_value_callcode."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,39 +48,41 @@ def test_non_zero_value_callcode(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [0](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xEA60,
-                    address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xEA60,
+                address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         balance=100,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={1: 1, 100: 31435}),
+        contract_0: Account(storage={1: 1, 100: 31435}),
+        Address(
+            0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_callcode_to_empty_paris.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_callcode_to_empty_paris.py
index 0f0acabd1cb..36f7f5f9c28 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_callcode_to_empty_paris.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_callcode_to_empty_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_non_zero_value_callcode_to_empty_paris.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_CALLCODE_ToEmpty_ParisFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty_ParisFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_non_zero_value_callcode_to_empty_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x85b89db0e2aef2a23f50801209a3de4c65c58d9d")
+    """Test_non_zero_value_callcode_to_empty_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,41 +45,39 @@ def test_non_zero_value_callcode_to_empty_paris(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
     # { [0](GAS) [[1]] (CALLCODE 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 0 0 0) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xEA60,
-                    address=0x85B89DB0E2AEF2A23F50801209A3DE4C65C58D9D,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xEA60,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         balance=100,
         nonce=0,
-        address=Address("0x6dcda83ca878dec588c8cc2adf0defbff1c589b9"),  # noqa: E501
     )
-    pre[callee] = Account(balance=10, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={1: 1, 100: 31435}),
+        addr: Account(storage={}, code=b"", balance=10, nonce=0),
+        target: Account(storage={1: 1, 100: 31435}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_callcode_to_non_non_zero_balance.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_callcode_to_non_non_zero_balance.py
index fe9b896b684..20ecf378e6b 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_callcode_to_non_non_zero_balance.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_callcode_to_non_non_zero_balance.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_non_zero_value_callcode_to_non_non_zero_balance.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_CALLCODE_ToNonNonZeroBalanceFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalanceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalanceFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalanceFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_non_zero_value_callcode_to_non_non_zero_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
+    """Test_non_zero_value_callcode_to_non_non_zero_balance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,40 +45,38 @@ def test_non_zero_value_callcode_to_non_non_zero_balance(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    addr = pre.fund_eoa(amount=100)  # noqa: F841
+    # Source: lll
     # { [0](GAS) [[1]] (CALLCODE 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 0 0 0) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xEA60,
-                    address=0x9089DA66E8BBC08846842A301905501BC8525DC4,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xEA60,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x082a0810da3f7a5b41a2d8291511fe800d7a021c"),  # noqa: E501
     )
-    pre[callee] = Account(balance=100, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={100: 11535}),
+        addr: Account(balance=100),
+        target: Account(storage={100: 11535}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_callcode_to_one_storage_key_paris.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_callcode_to_one_storage_key_paris.py
index 89282588cb6..24406f1746d 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_callcode_to_one_storage_key_paris.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_callcode_to_one_storage_key_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_non_zero_value_callcode_to_one_storage_key_paris.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_CALLCODE_ToOneStorageKey_ParisFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey_ParisFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey_ParisFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_non_zero_value_callcode_to_one_storage_key_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_non_zero_value_callcode_to_one_storage_key_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    callee = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,42 +49,41 @@ def test_non_zero_value_callcode_to_one_storage_key_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=10, storage={0: 1})
+    # Source: lll
     # { [0](GAS) [[1]] (CALLCODE 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 0 0 0) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xEA60,
-                    address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xEA60,
+                address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0xb7bb61c75be691459cef9a8fd7ec074933fa1d1f"),  # noqa: E501
+        address=Address(0xB7BB61C75BE691459CEF9A8FD7EC074933FA1D1F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        callee: Account(storage={0: 1}),
-        contract: Account(storage={1: 1, 100: 31435}),
+        addr: Account(storage={0: 1}, balance=10),
+        target: Account(storage={1: 1, 100: 31435}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_delegatecall.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_delegatecall.py
index a9285c52b50..ca0b9e66a79 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_delegatecall.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_delegatecall.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_non_zero_value_delegatecall.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_DELEGATECALLFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_DELEGATECALLFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_DELEGATECALLFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stNonZeroCallsTest/NonZeroValue_DELEGATECALLFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,8 +31,9 @@ def test_non_zero_value_delegatecall(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_non_zero_value_delegatecall."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -49,38 +48,40 @@ def test_non_zero_value_delegatecall(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [0](GAS) [[1]] (DELEGATECALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xEA60,
-                    address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xEA60,
+                address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={1: 1, 100: 24732}),
+        contract_0: Account(storage={1: 1, 100: 24732}),
+        Address(
+            0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        ): Account.NONEXISTENT,
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_delegatecall_to_empty_paris.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_delegatecall_to_empty_paris.py
index 337f5f6961e..1c2a832d499 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_delegatecall_to_empty_paris.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_delegatecall_to_empty_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_non_zero_value_delegatecall_to_empty_paris.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_DELEGATECALL_ToEmpty_ParisFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty_ParisFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_non_zero_value_delegatecall_to_empty_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_non_zero_value_delegatecall_to_empty_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,39 +45,37 @@ def test_non_zero_value_delegatecall_to_empty_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
     # { [0](GAS) [[1]] (DELEGATECALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xEA60,
-                    address=0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xEA60,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9c1470e9f035f5d8f34d7c0ff2650f9f89de43fe"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={1: 1, 100: 24732}),
+        addr: Account(storage={}, code=b"", balance=10, nonce=0),
+        target: Account(storage={1: 1, 100: 24732}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_delegatecall_to_non_non_zero_balance.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_delegatecall_to_non_non_zero_balance.py
index bd07bbd5ff4..f4716bb2707 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_delegatecall_to_non_non_zero_balance.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_delegatecall_to_non_non_zero_balance.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_non_zero_value_delegatecall_to_non_non_zero_balance.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_DELEGATECALL_ToNonNonZeroBalanceFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalanceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalanceFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalanceFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_non_zero_value_delegatecall_to_non_non_zero_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
+    """Test_non_zero_value_delegatecall_to_non_non_zero_balance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,39 +45,37 @@ def test_non_zero_value_delegatecall_to_non_non_zero_balance(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=100, nonce=0)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=100)  # noqa: F841
+    # Source: lll
     # { [0](GAS) [[1]] (DELEGATECALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xEA60,
-                    address=0x9089DA66E8BBC08846842A301905501BC8525DC4,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xEA60,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9c1470e9f035f5d8f34d7c0ff2650f9f89de43fe"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={1: 1, 100: 24732}),
+        addr: Account(balance=100),
+        target: Account(storage={1: 1, 100: 24732}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_delegatecall_to_one_storage_key_paris.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_delegatecall_to_one_storage_key_paris.py
index 0795f3ced65..59f545e4ace 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_delegatecall_to_one_storage_key_paris.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_delegatecall_to_one_storage_key_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_non_zero_value_delegatecall_to_one_storage_key_paris.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_DELEGATECALL_ToOneStorageKey_ParisFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey_ParisFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey_ParisFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_non_zero_value_delegatecall_to_one_storage_key_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_non_zero_value_delegatecall_to_one_storage_key_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    callee = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,40 +49,39 @@ def test_non_zero_value_delegatecall_to_one_storage_key_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=10, storage={0: 1})
+    # Source: lll
     # { [0](GAS) [[1]] (DELEGATECALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[100]] (SUB @0 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xEA60,
-                    address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xEA60,
+                address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.SUB(Op.MLOAD(offset=0x0), Op.GAS))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9c1470e9f035f5d8f34d7c0ff2650f9f89de43fe"),  # noqa: E501
+        address=Address(0x9C1470E9F035F5D8F34D7C0FF2650F9F89DE43FE),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        callee: Account(storage={0: 1}),
-        contract: Account(storage={1: 1, 100: 24732}),
+        addr: Account(storage={0: 1}, balance=10),
+        target: Account(storage={1: 1, 100: 24732}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_suicide.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_suicide.py
index 76ba30d2208..56fd5989444 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_suicide.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_suicide.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_non_zero_value_suicide.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,9 @@ def test_non_zero_value_suicide(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_non_zero_value_suicide."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,24 +48,37 @@ def test_non_zero_value_suicide(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        )
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post: dict = {}
+    post = {
+        contract_0: Account(
+            storage={},
+            code=bytes.fromhex(
+                "73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff00"
+            ),
+            balance=0,
+            nonce=0,
+        ),
+        Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B): Account(
+            balance=1
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_suicide_to_empty_paris.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_suicide_to_empty_paris.py
index 9526b754b0b..10199a820db 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_suicide_to_empty_paris.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_suicide_to_empty_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_non_zero_value_suicide_to_empty_paris.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_SUICIDE_ToEmpty_ParisFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty_ParisFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty_ParisFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_non_zero_value_suicide_to_empty_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_non_zero_value_suicide_to_empty_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x76FAE819612A29489A1A43208613D8F8557B8898)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,26 +49,37 @@ def test_non_zero_value_suicide_to_empty_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0)
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=10)
+    # Source: lll
     # { (SELFDESTRUCT <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b>) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x76FAE819612A29489A1A43208613D8F8557B8898)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x76FAE819612A29489A1A43208613D8F8557B8898
+        )
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xeb9a4c7a191790631d13fc4927446f5ef9d201fc"),  # noqa: E501
+        address=Address(0xEB9A4C7A191790631D13FC4927446F5EF9D201FC),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={},
+            code=bytes.fromhex(
+                "7376fae819612a29489a1a43208613d8f8557b8898ff00"
+            ),
+            balance=0,
+            nonce=0,
+        ),
+        addr: Account(balance=11),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_suicide_to_non_non_zero_balance.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_suicide_to_non_non_zero_balance.py
index f352cef2245..3ba10da6dfc 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_suicide_to_non_non_zero_balance.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_suicide_to_non_non_zero_balance.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_non_zero_value_suicide_to_non_non_zero_balance.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_non_zero_value_suicide_to_non_non_zero_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_non_zero_value_suicide_to_non_non_zero_balance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x9089DA66E8BBC08846842A301905501BC8525DC4)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    callee = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,26 +49,37 @@ def test_non_zero_value_suicide_to_non_non_zero_balance(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=100, nonce=0)
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=100)
+    # Source: lll
     # { (SELFDESTRUCT <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b>) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x9089DA66E8BBC08846842A301905501BC8525DC4)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x9089DA66E8BBC08846842A301905501BC8525DC4
+        )
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xeb9a4c7a191790631d13fc4927446f5ef9d201fc"),  # noqa: E501
+        address=Address(0xEB9A4C7A191790631D13FC4927446F5EF9D201FC),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={},
+            code=bytes.fromhex(
+                "739089da66e8bbc08846842a301905501bc8525dc4ff00"
+            ),
+            balance=0,
+            nonce=0,
+        ),
+        addr: Account(balance=101),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_suicide_to_one_storage_key_paris.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_suicide_to_one_storage_key_paris.py
index ab3dd4e13dc..ee3e06ea5e1 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_suicide_to_one_storage_key_paris.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_suicide_to_one_storage_key_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_non_zero_value_suicide_to_one_storage_key_paris.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_SUICIDE_ToOneStorageKey_ParisFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey_ParisFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey_ParisFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_non_zero_value_suicide_to_one_storage_key_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_non_zero_value_suicide_to_one_storage_key_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    callee = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,30 +49,38 @@ def test_non_zero_value_suicide_to_one_storage_key_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=10, storage={0: 1})
+    # Source: lll
     # { (SELFDESTRUCT <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b>) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x4757608F18B70777AE788DD4056EEED52F7AA68F)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x4757608F18B70777AE788DD4056EEED52F7AA68F
+        )
+        + Op.STOP,
+        storage={0: 1},
         balance=1,
         nonce=0,
-        address=Address("0xcf0486ce2acf393729249ba0f9b3cfbe450df9c3"),  # noqa: E501
+        address=Address(0xCF0486CE2ACF393729249BA0F9B3CFBE450DF9C3),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        callee: Account(storage={0: 1}),
-        contract: Account(storage={0: 1}),
+        target: Account(
+            storage={0: 1},
+            code=bytes.fromhex(
+                "734757608f18b70777ae788dd4056eeed52f7aa68fff00"
+            ),
+            balance=0,
+            nonce=0,
+        ),
+        addr: Account(storage={0: 1}, balance=11),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_cal_lwith_data.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_cal_lwith_data.py
index 112590d2140..2718e3be688 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_cal_lwith_data.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_cal_lwith_data.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_non_zero_value_transaction_cal_lwith_data.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_TransactionCALLwithDataFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithDataFiller.json
 """
 
 import pytest
@@ -23,22 +22,20 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithDataFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithDataFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_non_zero_value_transaction_cal_lwith_data(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_non_zero_value_transaction_cal_lwith_data."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -53,54 +50,16 @@ def test_non_zero_value_transaction_cal_lwith_data(
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("1122334455667788991011121314151617181920"),
+        to=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),
+        data=Address(0x1122334455667788991011121314151617181920),
         gas_limit=600000,
         value=1,
     )
 
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithDataFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_non_zero_value_transaction_cal_lwith_data_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    pre[sender] = Account(balance=0xE8D4A51000)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("1122334455667788991011121314151617181920"),
-        gas_limit=600000,
-        value=1,
-    )
-
-    post: dict = {}
+    post = {
+        Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B): Account(
+            storage={}, balance=1
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_cal_lwith_data_to_empty_paris.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_cal_lwith_data_to_empty_paris.py
index 82d77de31e7..14ca33fffcf 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_cal_lwith_data_to_empty_paris.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_cal_lwith_data_to_empty_paris.py
@@ -1,14 +1,12 @@
 """
-Test ported from static filler.
+Test_non_zero_value_transaction_cal_lwith_data_to_empty_paris.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_TransactionCALLwithData_ToEmpty_ParisFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
@@ -23,65 +21,17 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty_ParisFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_non_zero_value_transaction_cal_lwith_data_to_empty_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    contract = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    pre[contract] = Account(balance=10, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("1122334455667788991011121314151617181920"),
-        gas_limit=600000,
-        value=1,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_non_zero_value_transaction_cal_lwith_data_to_empty_paris_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    contract = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_non_zero_value_transaction_cal_lwith_data_to_empty_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -92,17 +42,16 @@ def test_non_zero_value_transaction_cal_lwith_data_to_empty_paris_from_prague(
         gas_limit=10000000,
     )
 
-    pre[contract] = Account(balance=10, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("1122334455667788991011121314151617181920"),
+        to=addr,
+        data=Address(0x1122334455667788991011121314151617181920),
         gas_limit=600000,
         value=1,
     )
 
-    post: dict = {}
+    post = {addr: Account(balance=11)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_cal_lwith_data_to_non_non_zero_balance.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_cal_lwith_data_to_non_non_zero_balance.py
index 92e072310e3..cb790534638 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_cal_lwith_data_to_non_non_zero_balance.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_cal_lwith_data_to_non_non_zero_balance.py
@@ -1,14 +1,12 @@
 """
-Test ported from static filler.
+Test_non_zero_value_transaction_cal_lwith_data_to_non_non_zero_balance.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalanceFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalanceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
@@ -23,65 +21,17 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalanceFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalanceFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_non_zero_value_transaction_cal_lwith_data_to_non_non_zero_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    contract = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    pre[contract] = Account(balance=100, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("1122334455667788991011121314151617181920"),
-        gas_limit=600000,
-        value=1,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalanceFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_non_zero_value_transaction_cal_lwith_data_to_non_non_zero_balance_from_prague(  # noqa: E501
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    contract = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
+    """Test_non_zero_value_transaction_cal_lwith_data_to_non_non_zero_balance."""  # noqa: E501
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -92,17 +42,16 @@ def test_non_zero_value_transaction_cal_lwith_data_to_non_non_zero_balance_from_
         gas_limit=10000000,
     )
 
-    pre[contract] = Account(balance=100, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
+    addr = pre.fund_eoa(amount=100)  # noqa: F841
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("1122334455667788991011121314151617181920"),
+        to=addr,
+        data=Address(0x1122334455667788991011121314151617181920),
         gas_limit=600000,
         value=1,
     )
 
-    post: dict = {}
+    post = {addr: Account(balance=101)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris.py
index 408b245c11d..5542a8c8745 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_non_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_TransactionCALLwithData_ToOneStorageKey_ParisFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey_ParisFiller.json
 """
 
 import pytest
@@ -23,22 +22,21 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey_ParisFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_non_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_non_zero_value_transaction_cal_lwith_data_to_one_storage_key_p..."""  # noqa: E501
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    contract = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,64 +47,17 @@ def test_non_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris(
         gas_limit=10000000,
     )
 
-    pre[contract] = Account(balance=10, nonce=0, storage={0x0: 0x1})
     pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=10, storage={0: 1})
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("1122334455667788991011121314151617181920"),
+        to=addr,
+        data=Address(0x1122334455667788991011121314151617181920),
         gas_limit=600000,
         value=1,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_non_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris_from_prague(  # noqa: E501
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    contract = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    pre[contract] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    pre[sender] = Account(balance=0xE8D4A51000)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("1122334455667788991011121314151617181920"),
-        gas_limit=600000,
-        value=1,
-    )
-
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {addr: Account(storage={0: 1}, balance=11)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_call.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_call.py
index d689787ad7e..d5f296b30ae 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_call.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_call.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_non_zero_value_transaction_call.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_TransactionCALLFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALLFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,12 +30,11 @@ def test_non_zero_value_transaction_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_non_zero_value_transaction_call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -52,11 +49,16 @@ def test_non_zero_value_transaction_call(
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),
+        data=Bytes(""),
         gas_limit=600000,
         value=1,
     )
 
-    post: dict = {}
+    post = {
+        Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B): Account(
+            storage={}, balance=1
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_call_to_empty_paris.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_call_to_empty_paris.py
index 7d05901e7cd..66d1d845ec1 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_call_to_empty_paris.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_call_to_empty_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_non_zero_value_transaction_call_to_empty_paris.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_TransactionCALL_ToEmpty_ParisFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,21 +22,17 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty_ParisFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_non_zero_value_transaction_call_to_empty_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    contract = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_non_zero_value_transaction_call_to_empty_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,16 +43,16 @@ def test_non_zero_value_transaction_call_to_empty_paris(
         gas_limit=10000000,
     )
 
-    pre[contract] = Account(balance=10, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=addr,
+        data=Bytes(""),
         gas_limit=600000,
         value=1,
     )
 
-    post: dict = {}
+    post = {addr: Account(balance=11)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_call_to_non_non_zero_balance.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_call_to_non_non_zero_balance.py
index 3497c95f3bf..91d139dce97 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_call_to_non_non_zero_balance.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_call_to_non_non_zero_balance.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_non_zero_value_transaction_call_to_non_non_zero_balance.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_TransactionCALL_ToNonNonZeroBalanceFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalanceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,21 +22,17 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalanceFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalanceFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_non_zero_value_transaction_call_to_non_non_zero_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    contract = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
+    """Test_non_zero_value_transaction_call_to_non_non_zero_balance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,16 +43,16 @@ def test_non_zero_value_transaction_call_to_non_non_zero_balance(
         gas_limit=10000000,
     )
 
-    pre[contract] = Account(balance=100, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
+    addr = pre.fund_eoa(amount=100)  # noqa: F841
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=addr,
+        data=Bytes(""),
         gas_limit=600000,
         value=1,
     )
 
-    post: dict = {}
+    post = {addr: Account(balance=101)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_call_to_one_storage_key_paris.py b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_call_to_one_storage_key_paris.py
index 5983fe829d7..8041fa0b6a2 100644
--- a/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_call_to_one_storage_key_paris.py
+++ b/tests/ported_static/stNonZeroCallsTest/test_non_zero_value_transaction_call_to_one_storage_key_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_non_zero_value_transaction_call_to_one_storage_key_paris.
 
 Ported from:
-tests/static/state_tests/stNonZeroCallsTest
-NonZeroValue_TransactionCALL_ToOneStorageKey_ParisFiller.json
+state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey_ParisFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey_ParisFiller.json",  # noqa: E501
+        "state_tests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -32,12 +32,12 @@ def test_non_zero_value_transaction_call_to_one_storage_key_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_non_zero_value_transaction_call_to_one_storage_key_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    contract = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,18 +48,17 @@ def test_non_zero_value_transaction_call_to_one_storage_key_paris(
         gas_limit=10000000,
     )
 
-    pre[contract] = Account(balance=10, nonce=0, storage={0x0: 0x1})
     pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=10, storage={0: 1})
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=addr,
+        data=Bytes(""),
         gas_limit=600000,
         value=1,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {addr: Account(storage={0: 1}, balance=11)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts/__init__.py b/tests/ported_static/stPreCompiledContracts/__init__.py
index e73d01e02cc..166ea0d484a 100644
--- a/tests/ported_static/stPreCompiledContracts/__init__.py
+++ b/tests/ported_static/stPreCompiledContracts/__init__.py
@@ -1 +1 @@
-"""Tests ported from stPreCompiledContracts."""
+"""Ported static tests: stPreCompiledContracts."""  # noqa: N999
diff --git a/tests/ported_static/stPreCompiledContracts/test_modexp.py b/tests/ported_static/stPreCompiledContracts/test_modexp.py
index 9b8f9b3a2df..982a98231e2 100644
--- a/tests/ported_static/stPreCompiledContracts/test_modexp.py
+++ b/tests/ported_static/stPreCompiledContracts/test_modexp.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_modexp.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts/modexpFiller.json
+state_tests/stPreCompiledContracts/modexpFiller.json
 """
 
 import pytest
@@ -11,10 +11,16 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,1674 +28,1277 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stPreCompiledContracts/modexpFiller.json"],
+    ["state_tests/stPreCompiledContracts/modexpFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="d0-g2",
+        ),
+        pytest.param(
+            0,
+            3,
+            0,
+            id="d0-g3",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
+        ),
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
+        ),
+        pytest.param(
+            1,
+            2,
+            0,
+            id="d1-g2",
+        ),
+        pytest.param(
+            1,
+            3,
+            0,
+            id="d1-g3",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
+        ),
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
+        ),
+        pytest.param(
+            2,
+            2,
+            0,
+            id="d2-g2",
+        ),
+        pytest.param(
+            2,
+            3,
+            0,
+            id="d2-g3",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
+        ),
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
+        ),
+        pytest.param(
+            3,
+            2,
+            0,
+            id="d3-g2",
+        ),
+        pytest.param(
+            3,
+            3,
+            0,
+            id="d3-g3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
+        ),
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
+        ),
+        pytest.param(
+            4,
+            2,
+            0,
+            id="d4-g2",
+        ),
+        pytest.param(
+            4,
+            3,
+            0,
+            id="d4-g3",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
+        ),
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
+        ),
+        pytest.param(
+            5,
+            2,
+            0,
+            id="d5-g2",
+        ),
+        pytest.param(
+            5,
+            3,
+            0,
+            id="d5-g3",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
+        ),
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
+        ),
+        pytest.param(
+            6,
+            2,
+            0,
+            id="d6-g2",
+        ),
+        pytest.param(
+            6,
+            3,
+            0,
+            id="d6-g3",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
+        ),
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
+        ),
+        pytest.param(
+            7,
+            2,
+            0,
+            id="d7-g2",
+        ),
+        pytest.param(
+            7,
+            3,
+            0,
+            id="d7-g3",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
+        ),
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
+        ),
+        pytest.param(
+            8,
+            2,
+            0,
+            id="d8-g2",
+        ),
+        pytest.param(
+            8,
+            3,
+            0,
+            id="d8-g3",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
+        ),
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
+        ),
+        pytest.param(
+            9,
+            2,
+            0,
+            id="d9-g2",
+        ),
+        pytest.param(
+            9,
+            3,
+            0,
+            id="d9-g3",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10-g0",
+        ),
+        pytest.param(
+            10,
+            1,
+            0,
+            id="d10-g1",
+        ),
+        pytest.param(
+            10,
+            2,
+            0,
+            id="d10-g2",
+        ),
+        pytest.param(
+            10,
+            3,
+            0,
+            id="d10-g3",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11-g0",
+        ),
+        pytest.param(
+            11,
+            1,
+            0,
+            id="d11-g1",
+        ),
+        pytest.param(
+            11,
+            2,
+            0,
+            id="d11-g2",
+        ),
+        pytest.param(
+            11,
+            3,
+            0,
+            id="d11-g3",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12-g0",
+        ),
+        pytest.param(
+            12,
+            1,
+            0,
+            id="d12-g1",
+        ),
+        pytest.param(
+            12,
+            2,
+            0,
+            id="d12-g2",
+        ),
+        pytest.param(
+            12,
+            3,
+            0,
+            id="d12-g3",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13-g0",
+        ),
+        pytest.param(
+            13,
+            1,
+            0,
+            id="d13-g1",
+        ),
+        pytest.param(
+            13,
+            2,
+            0,
+            id="d13-g2",
+        ),
+        pytest.param(
+            13,
+            3,
+            0,
+            id="d13-g3",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14-g0",
+        ),
+        pytest.param(
+            14,
+            1,
+            0,
+            id="d14-g1",
+        ),
+        pytest.param(
+            14,
+            2,
+            0,
+            id="d14-g2",
+        ),
+        pytest.param(
+            14,
+            3,
+            0,
+            id="d14-g3",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15-g0",
+        ),
+        pytest.param(
+            15,
+            1,
+            0,
+            id="d15-g1",
+        ),
+        pytest.param(
+            15,
+            2,
+            0,
+            id="d15-g2",
+        ),
+        pytest.param(
+            15,
+            3,
+            0,
+            id="d15-g3",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="d16-g0",
+        ),
+        pytest.param(
+            16,
+            1,
+            0,
+            id="d16-g1",
+        ),
+        pytest.param(
+            16,
+            2,
+            0,
+            id="d16-g2",
+        ),
+        pytest.param(
+            16,
+            3,
+            0,
+            id="d16-g3",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="d17-g0",
+        ),
+        pytest.param(
+            17,
+            1,
+            0,
+            id="d17-g1",
+        ),
+        pytest.param(
+            17,
+            2,
+            0,
+            id="d17-g2",
+        ),
+        pytest.param(
+            17,
+            3,
+            0,
+            id="d17-g3",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="d18-g0",
+        ),
+        pytest.param(
+            18,
+            1,
+            0,
+            id="d18-g1",
+        ),
+        pytest.param(
+            18,
+            2,
+            0,
+            id="d18-g2",
+        ),
+        pytest.param(
+            18,
+            3,
+            0,
+            id="d18-g3",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="d19-g0",
+        ),
+        pytest.param(
+            19,
+            1,
+            0,
+            id="d19-g1",
+        ),
+        pytest.param(
+            19,
+            2,
+            0,
+            id="d19-g2",
+        ),
+        pytest.param(
+            19,
+            3,
+            0,
+            id="d19-g3",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="d20-g0",
+        ),
+        pytest.param(
+            20,
+            1,
+            0,
+            id="d20-g1",
+        ),
+        pytest.param(
+            20,
+            2,
+            0,
+            id="d20-g2",
+        ),
+        pytest.param(
+            20,
+            3,
+            0,
+            id="d20-g3",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="d21-g0",
+        ),
+        pytest.param(
+            21,
+            1,
+            0,
+            id="d21-g1",
+        ),
+        pytest.param(
+            21,
+            2,
+            0,
+            id="d21-g2",
+        ),
+        pytest.param(
+            21,
+            3,
+            0,
+            id="d21-g3",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="d22-g0",
+        ),
+        pytest.param(
+            22,
+            1,
+            0,
+            id="d22-g1",
+        ),
+        pytest.param(
+            22,
+            2,
+            0,
+            id="d22-g2",
+        ),
+        pytest.param(
+            22,
+            3,
+            0,
+            id="d22-g3",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="d23-g0",
+        ),
+        pytest.param(
+            23,
+            1,
+            0,
+            id="d23-g1",
+        ),
+        pytest.param(
+            23,
+            2,
+            0,
+            id="d23-g2",
+        ),
+        pytest.param(
+            23,
+            3,
+            0,
+            id="d23-g3",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="d24-g0",
+        ),
+        pytest.param(
+            24,
+            1,
+            0,
+            id="d24-g1",
+        ),
+        pytest.param(
+            24,
+            2,
+            0,
+            id="d24-g2",
+        ),
+        pytest.param(
+            24,
+            3,
+            0,
+            id="d24-g3",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="d25-g0",
+        ),
+        pytest.param(
+            25,
+            1,
+            0,
+            id="d25-g1",
+        ),
+        pytest.param(
+            25,
+            2,
+            0,
+            id="d25-g2",
+        ),
+        pytest.param(
+            25,
+            3,
+            0,
+            id="d25-g3",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="d26-g0",
+        ),
+        pytest.param(
+            26,
+            1,
+            0,
+            id="d26-g1",
+        ),
+        pytest.param(
+            26,
+            2,
+            0,
+            id="d26-g2",
+        ),
+        pytest.param(
+            26,
+            3,
+            0,
+            id="d26-g3",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="d27-g0",
+        ),
+        pytest.param(
+            27,
+            1,
+            0,
+            id="d27-g1",
+        ),
+        pytest.param(
+            27,
+            2,
+            0,
+            id="d27-g2",
+        ),
+        pytest.param(
+            27,
+            3,
+            0,
+            id="d27-g3",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="d28-g0",
+        ),
+        pytest.param(
+            28,
+            1,
+            0,
+            id="d28-g1",
+        ),
+        pytest.param(
+            28,
+            2,
+            0,
+            id="d28-g2",
+        ),
+        pytest.param(
+            28,
+            3,
+            0,
+            id="d28-g3",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="d29-g0",
+        ),
+        pytest.param(
+            29,
+            1,
+            0,
+            id="d29-g1",
+        ),
+        pytest.param(
+            29,
+            2,
+            0,
+            id="d29-g2",
+        ),
+        pytest.param(
+            29,
+            3,
+            0,
+            id="d29-g3",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="d30-g0",
+        ),
+        pytest.param(
+            30,
+            1,
+            0,
+            id="d30-g1",
+        ),
+        pytest.param(
+            30,
+            2,
+            0,
+            id="d30-g2",
+        ),
+        pytest.param(
+            30,
+            3,
+            0,
+            id="d30-g3",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="d31-g0",
+        ),
+        pytest.param(
+            31,
+            1,
+            0,
+            id="d31-g1",
+        ),
+        pytest.param(
+            31,
+            2,
+            0,
+            id="d31-g2",
+        ),
+        pytest.param(
+            31,
+            3,
+            0,
+            id="d31-g3",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="d32-g0",
+        ),
+        pytest.param(
+            32,
+            1,
+            0,
+            id="d32-g1",
+        ),
+        pytest.param(
+            32,
+            2,
+            0,
+            id="d32-g2",
+        ),
+        pytest.param(
+            32,
+            3,
+            0,
+            id="d32-g3",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="d33-g0",
+        ),
+        pytest.param(
+            33,
+            1,
+            0,
+            id="d33-g1",
+        ),
+        pytest.param(
+            33,
+            2,
+            0,
+            id="d33-g2",
+        ),
+        pytest.param(
+            33,
+            3,
+            0,
+            id="d33-g3",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="d34-g0",
+        ),
+        pytest.param(
+            34,
+            1,
+            0,
+            id="d34-g1",
+        ),
+        pytest.param(
+            34,
+            2,
+            0,
+            id="d34-g2",
+        ),
+        pytest.param(
+            34,
+            3,
+            0,
+            id="d34-g3",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="d35-g0",
+        ),
+        pytest.param(
+            35,
+            1,
+            0,
+            id="d35-g1",
+        ),
+        pytest.param(
+            35,
+            2,
+            0,
+            id="d35-g2",
+        ),
+        pytest.param(
+            35,
+            3,
+            0,
+            id="d35-g3",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="d36-g0",
+        ),
+        pytest.param(
+            36,
+            1,
+            0,
+            id="d36-g1",
+        ),
+        pytest.param(
+            36,
+            2,
+            0,
+            id="d36-g2",
+        ),
+        pytest.param(
+            36,
+            3,
+            0,
+            id="d36-g3",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="d37-g0",
+        ),
+        pytest.param(
+            37,
+            1,
+            0,
+            id="d37-g1",
+        ),
+        pytest.param(
+            37,
+            2,
+            0,
+            id="d37-g2",
+        ),
+        pytest.param(
+            37,
+            3,
+            0,
+            id="d37-g3",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_modexp(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Test_modexp."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = EOA(
+        key=0x897B12D02D588D8A4FE16FF831CBD4459C6F62F8C845B0CCDD31CAF068C84A26
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=10000000000,
+    )
+
+    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
+    # Source: lll
+    # { (CALLDATACOPY 0 0 (CALLDATASIZE)) [[1]] (CALLCODE (GAS) 5 0 0 (CALLDATASIZE) 1000 32) [[2]](MLOAD 1000) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATACOPY(dest_offset=0x0, offset=0x0, size=Op.CALLDATASIZE)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x5,
+                value=0x0,
+                args_offset=0x0,
+                args_size=Op.CALLDATASIZE,
+                ret_offset=0x3E8,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x3E8))
+        + Op.STOP,
+        nonce=0,
+        address=Address(0x2D06AD61919840E4E00F80782DEDCE12ADA1E859),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 6, 7], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={1: 1, 2: 1})},
+        },
+        {
+            "indexes": {"data": [29], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={1: 1, 2: 0})},
+        },
+        {
+            "indexes": {
+                "data": [
+                    1,
+                    5,
+                    8,
+                    9,
+                    10,
+                    12,
+                    13,
+                    15,
+                    18,
+                    19,
+                    20,
+                    21,
+                    22,
+                    23,
+                    24,
+                    30,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={1: 1, 2: 0})},
+        },
+        {
+            "indexes": {"data": [2, 28], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={1: 0, 2: 0})},
+        },
+        {
+            "indexes": {"data": [31], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                target: Account(
+                    storage={1: 1, 2: 0x100000000000000000000000000000000},
+                ),
             },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
+        },
+        {
+            "indexes": {"data": [32], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                target: Account(
                     storage={
                         1: 1,
-                        2: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
+                        2: 0x10000000000000000000000000000000000000000,
+                    },
+                ),
             },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
+        },
+        {
+            "indexes": {"data": [33], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                target: Account(
                     storage={
                         1: 1,
-                        2: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
+                        2: 0x10000000000000000000000000000000000000000000000000000,  # noqa: E501
+                    },
+                ),
             },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
+        },
+        {
+            "indexes": {"data": [34], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                target: Account(
                     storage={
                         1: 1,
-                        2: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
+                        2: 0x100000000000000000000000000000000000000,
+                    },
+                ),
             },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
+        },
+        {
+            "indexes": {"data": [35], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                target: Account(
+                    storage={1: 1, 2: 0x10000000000000000000000000000}
                 )
             },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
+        },
+        {
+            "indexes": {"data": [3, 4], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                target: Account(
                     storage={
                         1: 1,
-                        2: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
+                        2: 0x3B01B01AC41F2D6E917C6D6A221CE793802469026D9AB7578FA2E79E4DA6AAAB,  # noqa: E501
+                    },
+                ),
             },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
+        },
+        {
+            "indexes": {"data": [25, 26, 11, 14], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                target: Account(
                     storage={
                         1: 1,
                         2: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x2000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x2000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x2000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
+        },
+        {
+            "indexes": {"data": [16, 27], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                target: Account(
                     storage={
                         1: 1,
                         2: 0x2000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x200000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x200000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x200000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
+        },
+        {
+            "indexes": {"data": [17], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                target: Account(
                     storage={
                         1: 1,
                         2: 0x200000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030000",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",  # noqa: E501
-            100000000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd",  # noqa: E501
-            200000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x2000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x2000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x2000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x2000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            100000000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            200000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x3B01B01AC41F2D6E917C6D6A221CE793802469026D9AB7578FA2E79E4DA6AAAB,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x3B01B01AC41F2D6E917C6D6A221CE793802469026D9AB7578FA2E79E4DA6AAAB,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x3B01B01AC41F2D6E917C6D6A221CE793802469026D9AB7578FA2E79E4DA6AAAB,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff800000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x3B01B01AC41F2D6E917C6D6A221CE793802469026D9AB7578FA2E79E4DA6AAAB,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 0x100000000000000000000000000000000}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 0x100000000000000000000000000000000}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 0x100000000000000000000000000000000}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 0x100000000000000000000000000000000}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x10000000000000000000000000000000000000000,
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x10000000000000000000000000000000000000000,
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x10000000000000000000000000000000000000000,
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x10000000000000000000000000000000000000000,
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x10000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x10000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x10000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x10000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x100000000000000000000000000000000000000,
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x100000000000000000000000000000000000000,
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x100000000000000000000000000000000000000,
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x100000000000000000000000000000000000000,
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 0x10000000000000000000000000000}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 0x10000000000000000000000000000}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 0x10000000000000000000000000000}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 0x10000000000000000000000000000}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            100000000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            200000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010001",  # noqa: E501
-            100000000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010001",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010001",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010001",  # noqa: E501
-            200000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x3B01B01AC41F2D6E917C6D6A221CE793802469026D9AB7578FA2E79E4DA6AAAB,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x3B01B01AC41F2D6E917C6D6A221CE793802469026D9AB7578FA2E79E4DA6AAAB,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x3B01B01AC41F2D6E917C6D6A221CE793802469026D9AB7578FA2E79E4DA6AAAB,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003ffff80",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={
-                        1: 1,
-                        2: 0x3B01B01AC41F2D6E917C6D6A221CE793802469026D9AB7578FA2E79E4DA6AAAB,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",  # noqa: E501
-            100000000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",  # noqa: E501
-            90000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",  # noqa: E501
-            110000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",  # noqa: E501
-            200000,
-            {
-                Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_modexp(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x897B12D02D588D8A4FE16FF831CBD4459C6F62F8C845B0CCDD31CAF068C84A26
-    )
+        },
+        {
+            "indexes": {"data": [36, 37], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={1: 0})},
+        },
+    ]
 
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000000,
-    )
-
-    # Source: LLL
-    # { (CALLDATACOPY 0 0 (CALLDATASIZE)) [[1]] (CALLCODE (GAS) 5 0 0 (CALLDATASIZE) 1000 32) [[2]](MLOAD 1000) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATACOPY(dest_offset=0x0, offset=0x0, size=Op.CALLDATASIZE)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=Op.CALLDATASIZE,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x3E8))
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2d06ad61919840e4e00f80782dedce12ada1e859"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Bytes(
+            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f"  # noqa: E501
+        ),
+        Hash(0x0)
+        + Hash(0x20)
+        + Hash(0x20)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2E
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F
+        ),
+        Hash(0x0)
+        + Hash(0x20)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD
+        ),
+        Bytes("00000000")
+        + Hash(0x100000000)
+        + Hash(0x200000000)
+        + Hash(0x2003FFFF80)
+        + Hash(0x7),
+        Bytes("00000000")
+        + Hash(0x100000000)
+        + Hash(0x200000000)
+        + Hash(0x2003FFFF80),
+        Bytes(
+            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002003"  # noqa: E501
+        ),
+        Bytes(
+            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020038000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+        ),
+        Bytes(
+            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000080"  # noqa: E501
+        ),
+        Bytes(
+            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000"  # noqa: E501
+        ),
+        Bytes(
+            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101"  # noqa: E501
+        ),
+        Bytes(
+            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000304"  # noqa: E501
+        ),
+        Bytes(
+            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020004"  # noqa: E501
+        ),
+        Bytes(
+            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020300"  # noqa: E501
+        ),
+        Bytes(
+            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010304"  # noqa: E501
+        ),
+        Bytes(
+            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010204"  # noqa: E501
+        ),
+        Bytes(
+            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000203"  # noqa: E501
+        ),
+        Bytes("00000000")
+        + Hash(0x100000000)
+        + Hash(0x100000000)
+        + Hash(0x202030006),
+        Bytes(
+            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001020306"  # noqa: E501
+        ),
+        Bytes(
+            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002020300"  # noqa: E501
+        ),
+        Bytes("00000000")
+        + Hash(0x100000000)
+        + Hash(0x100000000)
+        + Hash(0x202030000),
+        Bytes(
+            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020203"  # noqa: E501
+        ),
+        Bytes(
+            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002023003"  # noqa: E501
+        ),
+        Bytes(
+            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020230"  # noqa: E501
+        ),
+        Bytes(
+            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202"  # noqa: E501
+        ),
+        Hash(0x1) + Hash(0x2) + Hash(0x2),
+        Bytes(
+            "000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001001001010010"  # noqa: E501
+        ),
+        Bytes(
+            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000064"  # noqa: E501
+        ),
+        Bytes("00000000")
+        + Hash(0x100000000)
+        + Hash(0x10100000000)
+        + Hash(0x202000000)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x30006),
+        Hash(0x40000000000) + Hash(0x0),
+        Hash(0x0) + Hash(0x40000000000),
+        Hash(0x0)
+        + Hash(
+            0x8000000000000000000000000000000000000000000000000000000000000000
+        )
+        + Hash(0x0),
+        Bytes(
+            "000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351"  # noqa: E501
+        ),
+        Bytes(
+            "0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb"  # noqa: E501
+        ),
+        Bytes(
+            "0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63"  # noqa: E501
+        ),
+        Bytes(
+            "0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f"  # noqa: E501
+        ),
+        Bytes(
+            "0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d"  # noqa: E501
+        ),
+        Hash(0xFF)
+        + Hash(
+            0x2A1E530000000000000000000000000000000000000000000000000000000000
+        )
+        + Hash(0x0),
+        Bytes(
+            "0000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010001"  # noqa: E501
+        ),
+    ]
+    tx_gas = [100000000, 90000, 110000, 200000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts/test_modexp_tests.py b/tests/ported_static/stPreCompiledContracts/test_modexp_tests.py
index d9a5dc13bbc..487eb639575 100644
--- a/tests/ported_static/stPreCompiledContracts/test_modexp_tests.py
+++ b/tests/ported_static/stPreCompiledContracts/test_modexp_tests.py
@@ -2,19 +2,24 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts/modexpTestsFiller.yml
+state_tests/stPreCompiledContracts/modexpTestsFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,1172 +27,789 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stPreCompiledContracts/modexpTestsFiller.yml"],
+    ["state_tests/stPreCompiledContracts/modexpTestsFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100002",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000004",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000008",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001001",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000100002",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000010000004",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000001000000008",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000ffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000ffffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000ffffffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000040",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000080",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000001001",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000100002",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000010000004",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="0_0_n",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="0_0_n",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="0_0_n",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="0_0_n",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="0_0_n",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="0_0_n",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="0_0_n",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="0_0_n",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="0_0_n",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="0_0_n",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="0_0_n",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="0_0_n",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="0_0_n",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="0_0_n",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="0_0_n",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            38,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            39,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            40,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            41,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            42,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            43,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            44,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            45,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            46,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            47,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            48,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            49,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            50,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            51,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            52,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            53,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            54,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            55,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            56,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            57,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            58,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            59,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            60,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            61,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            62,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            63,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            64,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            65,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            66,
+            0,
+            0,
+            id="0_m_n",
+        ),
+        pytest.param(
+            67,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            68,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            69,
+            0,
+            0,
+            id="1_0_n",
+        ),
+        pytest.param(
+            70,
+            0,
+            0,
+            id="1_0_n",
+        ),
+        pytest.param(
+            71,
+            0,
+            0,
+            id="1_0_n",
+        ),
+        pytest.param(
+            72,
+            0,
+            0,
+            id="1_0_n",
+        ),
+        pytest.param(
+            73,
+            0,
+            0,
+            id="1_0_n",
+        ),
+        pytest.param(
+            74,
+            0,
+            0,
+            id="1_0_n",
+        ),
+        pytest.param(
+            75,
+            0,
+            0,
+            id="1_0_n",
+        ),
+        pytest.param(
+            76,
+            0,
+            0,
+            id="1_0_n",
+        ),
+        pytest.param(
+            77,
+            0,
+            0,
+            id="1_0_n",
+        ),
+        pytest.param(
+            78,
+            0,
+            0,
+            id="1_0_n",
+        ),
+        pytest.param(
+            79,
+            0,
+            0,
+            id="1_0_n",
+        ),
+        pytest.param(
+            80,
+            0,
+            0,
+            id="1_0_n",
+        ),
+        pytest.param(
+            81,
+            0,
+            0,
+            id="1_0_n",
+        ),
+        pytest.param(
+            82,
+            0,
+            0,
+            id="1_0_n",
+        ),
+        pytest.param(
+            83,
+            0,
+            0,
+            id="1_0_n",
+        ),
+        pytest.param(
+            84,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            85,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            86,
+            0,
+            0,
+            id="1_m_n",
+        ),
+        pytest.param(
+            87,
+            0,
+            0,
+            id="1_m_n",
+        ),
+        pytest.param(
+            88,
+            0,
+            0,
+            id="1_m_n",
+        ),
+        pytest.param(
+            89,
+            0,
+            0,
+            id="1_m_n",
+        ),
+        pytest.param(
+            90,
+            0,
+            0,
+            id="1_m_n",
+        ),
+        pytest.param(
+            91,
+            0,
+            0,
+            id="1_m_n",
+        ),
+        pytest.param(
+            92,
+            0,
+            0,
+            id="1_m_n",
+        ),
+        pytest.param(
+            93,
+            0,
+            0,
+            id="1_m_n",
+        ),
+        pytest.param(
+            94,
+            0,
+            0,
+            id="1_m_n",
+        ),
+        pytest.param(
+            95,
+            0,
+            0,
+            id="1_m_n",
+        ),
+        pytest.param(
+            96,
+            0,
+            0,
+            id="1_m_n",
+        ),
+        pytest.param(
+            97,
+            0,
+            0,
+            id="1_m_n",
+        ),
+        pytest.param(
+            98,
+            0,
+            0,
+            id="1_m_n",
+        ),
+        pytest.param(
+            99,
+            0,
+            0,
+            id="1_m_n",
+        ),
+        pytest.param(
+            100,
+            0,
+            0,
+            id="1_m_n",
+        ),
+        pytest.param(
+            101,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            102,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            103,
+            0,
+            0,
+            id="1_m_n",
+        ),
+        pytest.param(
+            104,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            105,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            106,
+            0,
+            0,
+            id="2_0_2",
+        ),
+        pytest.param(
+            107,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            108,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            109,
+            0,
+            0,
+            id="2_n_2",
+        ),
+        pytest.param(
+            110,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            111,
+            0,
+            0,
+            id="m_n_01",
+        ),
+        pytest.param(
+            112,
+            0,
+            0,
+            id="2_n_2",
+        ),
+        pytest.param(
+            113,
+            0,
+            0,
+            id="3_5_100",
+        ),
+        pytest.param(
+            114,
+            0,
+            0,
+            id="3_9984_39936",
+        ),
+        pytest.param(
+            115,
+            0,
+            0,
+            id="3_28948_11579",
+        ),
+        pytest.param(
+            116,
+            0,
+            0,
+            id="9_37111_37111",
+        ),
+        pytest.param(
+            117,
+            0,
+            0,
+            id="9_3711_37111",
+        ),
+        pytest.param(
+            118,
+            0,
+            0,
+            id="49_2401_2401",
+        ),
+        pytest.param(
+            119,
+            0,
+            0,
+            id="37120_22411_22000",
+        ),
+        pytest.param(
+            120,
+            0,
+            0,
+            id="37120_37111_0",
+        ),
+        pytest.param(
+            121,
+            0,
+            0,
+            id="37120_37111_1",
+        ),
+        pytest.param(
+            122,
+            0,
+            0,
+            id="37120_37111_37111",
+        ),
+        pytest.param(
+            123,
+            0,
+            0,
+            id="7120_37111_97",
+        ),
+        pytest.param(
+            124,
+            0,
+            0,
+            id="37120_37111_97",
+        ),
+        pytest.param(
+            125,
+            0,
+            0,
+            id="39936_1_55201",
+        ),
+        pytest.param(
+            126,
+            0,
+            0,
+            id="55190_55190_42965",
         ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000001000000008",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000ffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000ffffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000ffffffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffff0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffff0000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffff0000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffff0000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffff0000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffff0000000000000000000000000000000000000000000000000000000000000040",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffff0000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffff0000000000000000000000000000000000000000000000000000000000000080",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffff0000000000000000000000000000000000000000000000000000000000001001",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffff0000000000000000000000000000000000000000000000000000000000100002",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffff0000000000000000000000000000000000000000000000000000000010000004",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffff0000000000000000000000000000000000000000000000000000001000000008",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffff0000000000000000000000000000000000000000000000000000ffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffff00000000000000000000000000000000000000000000000000ffffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffff000000000000000000000000000000000000000000000000ffffffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000001001",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100002",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000004",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000008",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001001",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000100002",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000010000004",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000001000000008",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000ffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000ffffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000ffffffffffffffff",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000001001",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000009100000000000000000000000000000000000000000000000000000000000000578b00000000000000000000000000000000000000000000000000000000000055f0",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 16000, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000910000000000000000000000000000000000000000000000000000000000000090f70000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000910000000000000000000000000000000000000000000000000000000000000090f70000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000910000000000000000000000000000000000000000000000000000000000000090f700000000000000000000000000000000000000000000000000000000000090f7",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 7227, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000910000000000000000000000000000000000000000000000000000000000000090f70000000000000000000000000000000000000000000000000000000000000061",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 95, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000009c000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000d7a1",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 39936, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000071140000000000000000000000000000000000000000000000000000000000002d3b",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 27, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000064",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 43, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000027000000000000000000000000000000000000000000000000000000000000009c00",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 26625, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000003100000000000000000000000000000000000000000000000000000000000009610000000000000000000000000000000000000000000000000000000000000961",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000d796000000000000000000000000000000000000000000000000000000000000d796000000000000000000000000000000000000000000000000000000000000a7d5",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 34410, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d30000000000000000000000000000000000000000000000000000000000001bd000000000000000000000000000000000000000000000000000000000000090f70000000000000000000000000000000000000000000000000000000000000061",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 80, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000090f700000000000000000000000000000000000000000000000000000000000090f7",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 7227, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000e7f00000000000000000000000000000000000000000000000000000000000090f7",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={0: 34325, 1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "048071d3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_modexp_tests(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x48DC5A9F099CAAAA557742CA3A990A94BE45B9969126A1BC74E5E8BE5A2B5B47
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -1198,8 +820,8 @@ def test_modexp_tests(
         gas_limit=100000000,
     )
 
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    // Our input values, 20 bytes each
     #    // This is not the most efficient use of gas, but
@@ -1222,55 +844,390 @@ def test_modexp_tests(
     #    sstore(0, mload(0x100))
     #    sstore(1, sub(sub(gas0, gas1), 0x14c))
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x4)
-            + Op.CALLDATALOAD(offset=0x24)
-            + Op.CALLDATALOAD(offset=0x44)
-            + Op.SWAP2
-            + Op.MSTORE(offset=0x0, value=0x20)
-            + Op.MSTORE(offset=Op.DUP1, value=0x20)
-            + Op.MSTORE(offset=0x40, value=0x20)
-            + Op.PUSH1[0x60]
-            + Op.MSTORE
-            + Op.PUSH1[0x80]
-            + Op.MSTORE
-            + Op.PUSH1[0xA0]
-            + Op.MSTORE
-            + Op.PUSH2[0x14C]
-            + Op.GAS
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0x5,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=0xC0,
-                    ret_offset=0x100,
-                    ret_size=0x20,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x4)
+        + Op.CALLDATALOAD(offset=0x24)
+        + Op.CALLDATALOAD(offset=0x44)
+        + Op.SWAP2
+        + Op.MSTORE(offset=0x0, value=0x20)
+        + Op.MSTORE(offset=Op.DUP1, value=0x20)
+        + Op.MSTORE(offset=0x40, value=0x20)
+        + Op.PUSH1[0x60]
+        + Op.MSTORE
+        + Op.PUSH1[0x80]
+        + Op.MSTORE
+        + Op.PUSH1[0xA0]
+        + Op.MSTORE
+        + Op.PUSH2[0x14C]
+        + Op.GAS
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0x5,
+                value=Op.DUP1,
+                args_offset=0x0,
+                args_size=0xC0,
+                ret_offset=0x100,
+                ret_size=0x20,
             )
-            + Op.GAS
-            + Op.SWAP1
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x100))
-            + Op.SUB
-            + Op.SSTORE(key=0x1, value=Op.SUB)
-            + Op.STOP
-        ),
+        )
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x100))
+        + Op.SUB
+        + Op.SSTORE(key=0x1, value=Op.SUB)
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x6082a22dbf403b1af4fe03a0ccbd9bb78defb44a"),  # noqa: E501
+        nonce=1,
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [
+                    0,
+                    1,
+                    17,
+                    18,
+                    19,
+                    20,
+                    21,
+                    22,
+                    23,
+                    24,
+                    25,
+                    26,
+                    27,
+                    28,
+                    29,
+                    30,
+                    31,
+                    32,
+                    33,
+                    34,
+                    35,
+                    36,
+                    37,
+                    38,
+                    39,
+                    40,
+                    41,
+                    42,
+                    43,
+                    44,
+                    45,
+                    46,
+                    47,
+                    48,
+                    49,
+                    50,
+                    51,
+                    52,
+                    53,
+                    54,
+                    55,
+                    56,
+                    57,
+                    58,
+                    59,
+                    60,
+                    61,
+                    62,
+                    63,
+                    64,
+                    65,
+                    66,
+                    67,
+                    68,
+                    84,
+                    85,
+                    101,
+                    102,
+                    104,
+                    105,
+                    107,
+                    108,
+                    109,
+                    110,
+                    111,
+                    112,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 0, 1: 1})},
+        },
+        {
+            "indexes": {
+                "data": [
+                    2,
+                    3,
+                    4,
+                    5,
+                    6,
+                    7,
+                    8,
+                    9,
+                    10,
+                    11,
+                    12,
+                    13,
+                    14,
+                    15,
+                    16,
+                    69,
+                    70,
+                    71,
+                    72,
+                    73,
+                    74,
+                    75,
+                    76,
+                    77,
+                    78,
+                    79,
+                    80,
+                    81,
+                    82,
+                    83,
+                    86,
+                    87,
+                    88,
+                    89,
+                    90,
+                    91,
+                    92,
+                    93,
+                    94,
+                    95,
+                    96,
+                    97,
+                    98,
+                    99,
+                    100,
+                    103,
+                    106,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 1, 1: 1})},
+        },
+        {
+            "indexes": {"data": [113], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 43, 1: 1})},
+        },
+        {
+            "indexes": {"data": [114], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 26625, 1: 1})},
+        },
+        {
+            "indexes": {"data": [115], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 27, 1: 1})},
+        },
+        {
+            "indexes": {"data": [117], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 34325, 1: 1})},
+        },
+        {
+            "indexes": {"data": [116], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 7227, 1: 1})},
+        },
+        {
+            "indexes": {"data": [118], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 0, 1: 1})},
+        },
+        {
+            "indexes": {"data": [119], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 16000, 1: 1})},
+        },
+        {
+            "indexes": {"data": [120, 121], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 0, 1: 1})},
+        },
+        {
+            "indexes": {"data": [122], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 7227, 1: 1})},
+        },
+        {
+            "indexes": {"data": [123], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 80, 1: 1})},
+        },
+        {
+            "indexes": {"data": [124], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 95, 1: 1})},
+        },
+        {
+            "indexes": {"data": [125], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 39936, 1: 1})},
+        },
+        {
+            "indexes": {"data": [126], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {target: Account(storage={0: 34410, 1: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0x8),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0x40),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0x64),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0x80),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0x1001),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0x100002),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0x10000004),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0x1000000008),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0xFFFFFFFFFFFF),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0xFFFFFFFFFFFFFF),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x0) + Hash(0xFFFFFFFFFFFFFFFF),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x1) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x1) + Hash(0x8),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x1) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x1) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x1) + Hash(0x40),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x1) + Hash(0x64),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x1) + Hash(0x80),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x1) + Hash(0x1001),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x1) + Hash(0x100002),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x1) + Hash(0x10000004),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x1) + Hash(0x1000000008),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x1) + Hash(0xFFFFFFFFFFFF),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x1) + Hash(0xFFFFFFFFFFFFFF),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x1) + Hash(0xFFFFFFFFFFFFFFFF),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x3) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x3) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x3) + Hash(0x8),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x3) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x3) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x3) + Hash(0x40),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x3) + Hash(0x64),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x3) + Hash(0x80),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x3) + Hash(0x1001),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x3) + Hash(0x100002),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x3) + Hash(0x10000004),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x3) + Hash(0x1000000008),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x3) + Hash(0xFFFFFFFFFFFF),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x3) + Hash(0xFFFFFFFFFFFFFF),
+        Bytes("048071d3") + Hash(0x0) + Hash(0x3) + Hash(0xFFFFFFFFFFFFFFFF),
+        Bytes("048071d3") + Hash(0x0) + Hash(0xFFFFFF) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x0) + Hash(0xFFFFFF) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x0) + Hash(0xFFFFFF) + Hash(0x8),
+        Bytes("048071d3") + Hash(0x0) + Hash(0xFFFFFF) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x0) + Hash(0xFFFFFF) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x0) + Hash(0xFFFFFF) + Hash(0x40),
+        Bytes("048071d3") + Hash(0x0) + Hash(0xFFFFFF) + Hash(0x64),
+        Bytes("048071d3") + Hash(0x0) + Hash(0xFFFFFF) + Hash(0x80),
+        Bytes("048071d3") + Hash(0x0) + Hash(0xFFFFFF) + Hash(0x1001),
+        Bytes("048071d3") + Hash(0x0) + Hash(0xFFFFFF) + Hash(0x100002),
+        Bytes("048071d3") + Hash(0x0) + Hash(0xFFFFFF) + Hash(0x10000004),
+        Bytes("048071d3") + Hash(0x0) + Hash(0xFFFFFF) + Hash(0x1000000008),
+        Bytes("048071d3") + Hash(0x0) + Hash(0xFFFFFF) + Hash(0xFFFFFFFFFFFF),
+        Bytes("048071d3")
+        + Hash(0x0)
+        + Hash(0xFFFFFF)
+        + Hash(0xFFFFFFFFFFFFFF),
+        Bytes("048071d3")
+        + Hash(0x0)
+        + Hash(0xFFFFFF)
+        + Hash(0xFFFFFFFFFFFFFFFF),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x8),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x40),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x64),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x80),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x1001),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x100002),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x10000004),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0x1000000008),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0xFFFFFFFFFFFF),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0xFFFFFFFFFFFFFF),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x0) + Hash(0xFFFFFFFFFFFFFFFF),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0x4),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0x8),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0x40),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0x64),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0x80),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0x1001),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0x100002),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0x10000004),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0x1000000008),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0xFFFFFFFFFFFF),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0xFFFFFFFFFFFFFF),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x1) + Hash(0xFFFFFFFFFFFFFFFF),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x1) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x0) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x0) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x0) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x2) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x3) + Hash(0x5) + Hash(0x64),
+        Bytes("048071d3") + Hash(0x3) + Hash(0x2700) + Hash(0x9C00),
+        Bytes("048071d3") + Hash(0x3) + Hash(0x7114) + Hash(0x2D3B),
+        Bytes("048071d3") + Hash(0x9) + Hash(0x90F7) + Hash(0x90F7),
+        Bytes("048071d3") + Hash(0x9) + Hash(0xE7F) + Hash(0x90F7),
+        Bytes("048071d3") + Hash(0x31) + Hash(0x961) + Hash(0x961),
+        Bytes("048071d3") + Hash(0x9100) + Hash(0x578B) + Hash(0x55F0),
+        Bytes("048071d3") + Hash(0x9100) + Hash(0x90F7) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x9100) + Hash(0x90F7) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x9100) + Hash(0x90F7) + Hash(0x90F7),
+        Bytes("048071d3") + Hash(0x1BD0) + Hash(0x90F7) + Hash(0x61),
+        Bytes("048071d3") + Hash(0x9100) + Hash(0x90F7) + Hash(0x61),
+        Bytes("048071d3") + Hash(0x9C00) + Hash(0x1) + Hash(0xD7A1),
+        Bytes("048071d3") + Hash(0xD796) + Hash(0xD796) + Hash(0xA7D5),
+    ]
+    tx_gas = [16777216]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts/test_precomps_eip2929_cancun.py b/tests/ported_static/stPreCompiledContracts/test_precomps_eip2929_cancun.py
index 82803692f28..6bc03947432 100644
--- a/tests/ported_static/stPreCompiledContracts/test_precomps_eip2929_cancun.py
+++ b/tests/ported_static/stPreCompiledContracts/test_precomps_eip2929_cancun.py
@@ -2,14148 +2,2822 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts/precompsEIP2929CancunFiller.yml
+state_tests/stPreCompiledContracts/precompsEIP2929CancunFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts/precompsEIP2929CancunFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c00000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b790000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-        "case166",
-        "case167",
-        "case168",
-        "case169",
-        "case170",
-        "case171",
-        "case172",
-        "case173",
-        "case174",
-        "case175",
-        "case176",
-        "case177",
-        "case178",
-        "case179",
-        "case180",
-        "case181",
-        "case182",
-        "case183",
-        "case184",
-        "case185",
-        "case186",
-        "case187",
-        "case188",
-        "case189",
-        "case190",
-        "case191",
-        "case192",
-        "case193",
-        "case194",
-        "case195",
-        "case196",
-        "case197",
-        "case198",
-        "case199",
-        "case200",
-        "case201",
-        "case202",
-        "case203",
-        "case204",
-        "case205",
-        "case206",
-        "case207",
-        "case208",
-        "case209",
-        "case210",
-        "case211",
-        "case212",
-        "case213",
-        "case214",
-        "case215",
-        "case216",
-        "case217",
-        "case218",
-        "case219",
-        "case220",
-        "case221",
-        "case222",
-        "case223",
-        "case224",
-        "case225",
-        "case226",
-        "case227",
-        "case228",
-        "case229",
-        "case230",
-        "case231",
-        "case232",
-        "case233",
-        "case234",
-        "case235",
-        "case236",
-        "case237",
-        "case238",
-        "case239",
-        "case240",
-        "case241",
-        "case242",
-        "case243",
-        "case244",
-        "case245",
-        "case246",
-        "case247",
-        "case248",
-        "case249",
-        "case250",
-        "case251",
-        "case252",
-        "case253",
-        "case254",
-        "case255",
-        "case256",
-        "case257",
-        "case258",
-        "case259",
-        "case260",
-        "case261",
-        "case262",
-        "case263",
-        "case264",
-        "case265",
-        "case266",
-        "case267",
-        "case268",
-        "case269",
-        "case270",
-        "case271",
-        "case272",
-        "case273",
-        "case274",
-        "case275",
-        "case276",
-        "case277",
-        "case278",
-        "case279",
-        "case280",
-        "case281",
-        "case282",
-        "case283",
-        "case284",
-        "case285",
-        "case286",
-        "case287",
-        "case288",
-        "case289",
-        "case290",
-        "case291",
-        "case292",
-        "case293",
-        "case294",
-        "case295",
-        "case296",
-        "case297",
-        "case298",
-        "case299",
-        "case300",
-        "case301",
-        "case302",
-        "case303",
-        "case304",
-        "case305",
-        "case306",
-        "case307",
-        "case308",
-        "case309",
-        "case310",
-        "case311",
-        "case312",
-        "case313",
-        "case314",
-        "case315",
-        "case316",
-        "case317",
-        "case318",
-        "case319",
-        "case320",
-        "case321",
-        "case322",
-        "case323",
-        "case324",
-        "case325",
-        "case326",
-        "case327",
-        "case328",
-        "case329",
-        "case330",
-        "case331",
-        "case332",
-        "case333",
-        "case334",
-        "case335",
-        "case336",
-        "case337",
-        "case338",
-        "case339",
-        "case340",
-        "case341",
-        "case342",
-        "case343",
-        "case344",
-        "case345",
-        "case346",
-        "case347",
-        "case348",
-        "case349",
-        "case350",
-        "case351",
-        "case352",
-        "case353",
-        "case354",
-        "case355",
-        "case356",
-        "case357",
-        "case358",
-        "case359",
-        "case360",
-        "case361",
-        "case362",
-        "case363",
-        "case364",
-        "case365",
-        "case366",
-        "case367",
-        "case368",
-        "case369",
-        "case370",
-        "case371",
-        "case372",
-        "case373",
-        "case374",
-        "case375",
-        "case376",
-        "case377",
-        "case378",
-        "case379",
-        "case380",
-        "case381",
-        "case382",
-        "case383",
-        "case384",
-        "case385",
-        "case386",
-        "case387",
-        "case388",
-        "case389",
-        "case390",
-        "case391",
-        "case392",
-        "case393",
-        "case394",
-        "case395",
-        "case396",
-        "case397",
-        "case398",
-        "case399",
-        "case400",
-        "case401",
-        "case402",
-        "case403",
-        "case404",
-        "case405",
-        "case406",
-        "case407",
-        "case408",
-        "case409",
-        "case410",
-        "case411",
-        "case412",
-        "case413",
-        "case414",
-        "case415",
-        "case416",
-        "case417",
-        "case418",
-        "case419",
-        "case420",
-        "case421",
-        "case422",
-        "case423",
-        "case424",
-        "case425",
-        "case426",
-        "case427",
-        "case428",
-        "case429",
-        "case430",
-        "case431",
-        "case432",
-        "case433",
-        "case434",
-        "case435",
-        "case436",
-        "case437",
-        "case438",
-        "case439",
-        "case440",
-        "case441",
-        "case442",
-        "case443",
-        "case444",
-        "case445",
-        "case446",
-        "case447",
-        "case448",
-        "case449",
-        "case450",
-        "case451",
-        "case452",
-        "case453",
-        "case454",
-        "case455",
-        "case456",
-        "case457",
-        "case458",
-        "case459",
-        "case460",
-        "case461",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_precomps_eip2929_cancun(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=71794957647893862,
-    )
-
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x0, value=0x3) + Op.STOP,
-        address=Address("0x1338f76642a7a19cc50bdff45172cb6c2a7d20c0"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x0, value=0x3) + Op.STOP,
-        address=Address("0x7be86ffab69b0af1ed862ae6d8e1efa3e8438b79"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #   let addrTest   := calldataload(0x04)
-    #   let action     := calldataload(0x24)
-    #   let gas0, gas1, gas2
-    #
-    #   // Not really needed, but otherwise Yul optimizes and
-    #   // skips operations we need
-    #   let useless0, useless1
-    #
-    #   // Touch the first word of memory here, so it
-    #   // won't confuse the gas measurement
-    #   mstore(0x100, 0xDEADBEEF)
-    #
-    #   // Access <contract:0x0000000000000000000000000000000000101157> (so it becomes warm and send it wei)  # noqa: E501
-    #   pop(call(0x100000, <contract:0x0000000000000000000000000000000000101157>, 1, 0, 0, 0, 0))  # noqa: E501
-    #
-    #   // Switch before measuring, so it won't affect
-    #   // the gas costs
-    #   switch action
-    #   case 0xf100 {
-    #       gas0 := gas()
-    #       pop(call(0x100000, addrTest, 0, 0, 0, 0, 0))
-    #       gas1 := gas()
-    #       pop(call(0x100000, addrTest, 0, 0, 0, 0, 0))
-    #       gas2 := gas()
-    #   }
-    #   case 0xf101 {
-    #       gas0 := gas()
-    #       pop(call(0x100000, addrTest, 1, 0, 0, 0, 0))
-    #       gas1 := gas()
-    # ... (155 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x4)
-            + Op.CALLDATALOAD(offset=0x24)
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=0x100, value=0xDEADBEEF)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=0x7BE86FFAB69B0AF1ED862AE6D8E1EFA3E8438B79,
-                    value=0x1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.DUP6
-            + Op.JUMPI(pc=0x101, condition=Op.EQ(Op.DUP2, 0xF100))
-            + Op.JUMPI(pc=0x12D, condition=Op.EQ(Op.DUP2, 0xF101))
-            + Op.JUMPI(pc=0x159, condition=Op.EQ(Op.DUP2, 0xF102))
-            + Op.JUMPI(pc=0x185, condition=Op.EQ(Op.DUP2, 0xF103))
-            + Op.JUMPI(pc=0x1B3, condition=Op.EQ(Op.DUP2, 0xF104))
-            + Op.JUMPI(pc=0x1DF, condition=Op.EQ(Op.DUP2, 0xF105))
-            + Op.JUMPI(pc=0x20D, condition=Op.EQ(Op.DUP2, 0xF200))
-            + Op.JUMPI(pc=0x239, condition=Op.EQ(Op.DUP2, 0xF201))
-            + Op.JUMPI(pc=0x265, condition=Op.EQ(Op.DUP2, 0xF202))
-            + Op.JUMPI(pc=0x291, condition=Op.EQ(Op.DUP2, 0xF203))
-            + Op.JUMPI(pc=0x2BF, condition=Op.EQ(Op.DUP2, 0xF204))
-            + Op.JUMPI(pc=0x2EB, condition=Op.EQ(Op.DUP2, 0xF205))
-            + Op.JUMPI(pc=0x319, condition=Op.EQ(Op.DUP2, 0xF400))
-            + Op.JUMPI(pc=0x341, condition=Op.EQ(Op.DUP2, 0xF402))
-            + Op.JUMPI(pc=0x36B, condition=Op.EQ(Op.DUP2, 0xF404))
-            + Op.JUMPI(pc=0x395, condition=Op.EQ(Op.DUP2, 0xFA00))
-            + Op.JUMPI(pc=0x3BD, condition=Op.EQ(Op.DUP2, 0xFA02))
-            + Op.JUMPI(pc=0x3E7, condition=Op.EQ(Op.DUP2, 0xFA04))
-            + Op.JUMPI(pc=0x411, condition=Op.EQ(Op.DUP2, 0x31))
-            + Op.JUMPI(pc=0x427, condition=Op.EQ(Op.DUP2, 0x3B))
-            + Op.JUMPI(pc=0x43D, condition=Op.EQ(Op.DUP2, 0x3C))
-            + Op.JUMPI(pc=0x45B, condition=Op.EQ(Op.DUP2, 0x3F))
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x0,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x0,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x0,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x0,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.BALANCE(address=Op.DUP8)
-            + Op.SWAP3
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.BALANCE(address=Op.DUP8)
-            + Op.SWAP2
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.EXTCODESIZE(address=Op.DUP8)
-            + Op.SWAP3
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.EXTCODESIZE(address=Op.DUP8)
-            + Op.SWAP2
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.EXTCODECOPY(
-                address=Op.DUP11,
-                dest_offset=Op.DUP1,
-                offset=0x0,
-                size=0x100,
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.EXTCODECOPY(
-                address=Op.DUP11,
-                dest_offset=Op.DUP1,
-                offset=0x0,
-                size=0x100,
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.EXTCODEHASH(address=Op.DUP8)
-            + Op.SWAP3
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.EXTCODEHASH(address=Op.DUP8)
-            + Op.SWAP2
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.SUB(Op.DUP6, Op.DUP4)
-            + Op.SUB(Op.DUP6, Op.DUP4)
-            + Op.SSTORE(key=0x0, value=Op.EQ(Op.DUP3, Op.DUP1))
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.DUP3, Op.DUP1))
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-        ),
-        storage={0x0: 0x60A7, 0x1: 0x60A7},
-        address=Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=100000,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts/precompsEIP2929CancunFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.valid_until("Prague")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c00000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b790000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-        "case166",
-        "case167",
-        "case168",
-        "case169",
-        "case170",
-        "case171",
-        "case172",
-        "case173",
-        "case174",
-        "case175",
-        "case176",
-        "case177",
-        "case178",
-        "case179",
-        "case180",
-        "case181",
-        "case182",
-        "case183",
-        "case184",
-        "case185",
-        "case186",
-        "case187",
-        "case188",
-        "case189",
-        "case190",
-        "case191",
-        "case192",
-        "case193",
-        "case194",
-        "case195",
-        "case196",
-        "case197",
-        "case198",
-        "case199",
-        "case200",
-        "case201",
-        "case202",
-        "case203",
-        "case204",
-        "case205",
-        "case206",
-        "case207",
-        "case208",
-        "case209",
-        "case210",
-        "case211",
-        "case212",
-        "case213",
-        "case214",
-        "case215",
-        "case216",
-        "case217",
-        "case218",
-        "case219",
-        "case220",
-        "case221",
-        "case222",
-        "case223",
-        "case224",
-        "case225",
-        "case226",
-        "case227",
-        "case228",
-        "case229",
-        "case230",
-        "case231",
-        "case232",
-        "case233",
-        "case234",
-        "case235",
-        "case236",
-        "case237",
-        "case238",
-        "case239",
-        "case240",
-        "case241",
-        "case242",
-        "case243",
-        "case244",
-        "case245",
-        "case246",
-        "case247",
-        "case248",
-        "case249",
-        "case250",
-        "case251",
-        "case252",
-        "case253",
-        "case254",
-        "case255",
-        "case256",
-        "case257",
-        "case258",
-        "case259",
-        "case260",
-        "case261",
-        "case262",
-        "case263",
-        "case264",
-        "case265",
-        "case266",
-        "case267",
-        "case268",
-        "case269",
-        "case270",
-        "case271",
-        "case272",
-        "case273",
-        "case274",
-        "case275",
-        "case276",
-        "case277",
-        "case278",
-        "case279",
-        "case280",
-        "case281",
-        "case282",
-        "case283",
-        "case284",
-        "case285",
-        "case286",
-        "case287",
-        "case288",
-        "case289",
-        "case290",
-        "case291",
-        "case292",
-        "case293",
-        "case294",
-        "case295",
-        "case296",
-        "case297",
-        "case298",
-        "case299",
-        "case300",
-        "case301",
-        "case302",
-        "case303",
-        "case304",
-        "case305",
-        "case306",
-        "case307",
-        "case308",
-        "case309",
-        "case310",
-        "case311",
-        "case312",
-        "case313",
-        "case314",
-        "case315",
-        "case316",
-        "case317",
-        "case318",
-        "case319",
-        "case320",
-        "case321",
-        "case322",
-        "case323",
-        "case324",
-        "case325",
-        "case326",
-        "case327",
-        "case328",
-        "case329",
-        "case330",
-        "case331",
-        "case332",
-        "case333",
-        "case334",
-        "case335",
-        "case336",
-        "case337",
-        "case338",
-        "case339",
-        "case340",
-        "case341",
-        "case342",
-        "case343",
-        "case344",
-        "case345",
-        "case346",
-        "case347",
-        "case348",
-        "case349",
-        "case350",
-        "case351",
-        "case352",
-        "case353",
-        "case354",
-        "case355",
-        "case356",
-        "case357",
-        "case358",
-        "case359",
-        "case360",
-        "case361",
-        "case362",
-        "case363",
-        "case364",
-        "case365",
-        "case366",
-        "case367",
-        "case368",
-        "case369",
-        "case370",
-        "case371",
-        "case372",
-        "case373",
-        "case374",
-        "case375",
-        "case376",
-        "case377",
-        "case378",
-        "case379",
-        "case380",
-        "case381",
-        "case382",
-        "case383",
-        "case384",
-        "case385",
-        "case386",
-        "case387",
-        "case388",
-        "case389",
-        "case390",
-        "case391",
-        "case392",
-        "case393",
-        "case394",
-        "case395",
-        "case396",
-        "case397",
-        "case398",
-        "case399",
-        "case400",
-        "case401",
-        "case402",
-        "case403",
-        "case404",
-        "case405",
-        "case406",
-        "case407",
-        "case408",
-        "case409",
-        "case410",
-        "case411",
-        "case412",
-        "case413",
-        "case414",
-        "case415",
-        "case416",
-        "case417",
-        "case418",
-        "case419",
-        "case420",
-        "case421",
-        "case422",
-        "case423",
-        "case424",
-        "case425",
-        "case426",
-        "case427",
-        "case428",
-        "case429",
-        "case430",
-        "case431",
-        "case432",
-        "case433",
-        "case434",
-        "case435",
-        "case436",
-        "case437",
-        "case438",
-        "case439",
-        "case440",
-        "case441",
-        "case442",
-        "case443",
-        "case444",
-        "case445",
-        "case446",
-        "case447",
-        "case448",
-        "case449",
-        "case450",
-        "case451",
-        "case452",
-        "case453",
-        "case454",
-        "case455",
-        "case456",
-        "case457",
-        "case458",
-        "case459",
-        "case460",
-        "case461",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_precomps_eip2929_cancun_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=71794957647893862,
-    )
-
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x0, value=0x3) + Op.STOP,
-        address=Address("0x1338f76642a7a19cc50bdff45172cb6c2a7d20c0"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x0, value=0x3) + Op.STOP,
-        address=Address("0x7be86ffab69b0af1ed862ae6d8e1efa3e8438b79"),  # noqa: E501
-    )
-    # Source: Yul
-    # {
-    #   let addrTest   := calldataload(0x04)
-    #   let action     := calldataload(0x24)
-    #   let gas0, gas1, gas2
-    #
-    #   // Not really needed, but otherwise Yul optimizes and
-    #   // skips operations we need
-    #   let useless0, useless1
-    #
-    #   // Touch the first word of memory here, so it
-    #   // won't confuse the gas measurement
-    #   mstore(0x100, 0xDEADBEEF)
-    #
-    #   // Access <contract:0x0000000000000000000000000000000000101157> (so it becomes warm and send it wei)  # noqa: E501
-    #   pop(call(0x100000, <contract:0x0000000000000000000000000000000000101157>, 1, 0, 0, 0, 0))  # noqa: E501
-    #
-    #   // Switch before measuring, so it won't affect
-    #   // the gas costs
-    #   switch action
-    #   case 0xf100 {
-    #       gas0 := gas()
-    #       pop(call(0x100000, addrTest, 0, 0, 0, 0, 0))
-    #       gas1 := gas()
-    #       pop(call(0x100000, addrTest, 0, 0, 0, 0, 0))
-    #       gas2 := gas()
-    #   }
-    #   case 0xf101 {
-    #       gas0 := gas()
-    #       pop(call(0x100000, addrTest, 1, 0, 0, 0, 0))
-    #       gas1 := gas()
-    # ... (155 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x4)
-            + Op.CALLDATALOAD(offset=0x24)
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=0x100, value=0xDEADBEEF)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=0x7BE86FFAB69B0AF1ED862AE6D8E1EFA3E8438B79,
-                    value=0x1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.DUP6
-            + Op.JUMPI(pc=0x101, condition=Op.EQ(Op.DUP2, 0xF100))
-            + Op.JUMPI(pc=0x12D, condition=Op.EQ(Op.DUP2, 0xF101))
-            + Op.JUMPI(pc=0x159, condition=Op.EQ(Op.DUP2, 0xF102))
-            + Op.JUMPI(pc=0x185, condition=Op.EQ(Op.DUP2, 0xF103))
-            + Op.JUMPI(pc=0x1B3, condition=Op.EQ(Op.DUP2, 0xF104))
-            + Op.JUMPI(pc=0x1DF, condition=Op.EQ(Op.DUP2, 0xF105))
-            + Op.JUMPI(pc=0x20D, condition=Op.EQ(Op.DUP2, 0xF200))
-            + Op.JUMPI(pc=0x239, condition=Op.EQ(Op.DUP2, 0xF201))
-            + Op.JUMPI(pc=0x265, condition=Op.EQ(Op.DUP2, 0xF202))
-            + Op.JUMPI(pc=0x291, condition=Op.EQ(Op.DUP2, 0xF203))
-            + Op.JUMPI(pc=0x2BF, condition=Op.EQ(Op.DUP2, 0xF204))
-            + Op.JUMPI(pc=0x2EB, condition=Op.EQ(Op.DUP2, 0xF205))
-            + Op.JUMPI(pc=0x319, condition=Op.EQ(Op.DUP2, 0xF400))
-            + Op.JUMPI(pc=0x341, condition=Op.EQ(Op.DUP2, 0xF402))
-            + Op.JUMPI(pc=0x36B, condition=Op.EQ(Op.DUP2, 0xF404))
-            + Op.JUMPI(pc=0x395, condition=Op.EQ(Op.DUP2, 0xFA00))
-            + Op.JUMPI(pc=0x3BD, condition=Op.EQ(Op.DUP2, 0xFA02))
-            + Op.JUMPI(pc=0x3E7, condition=Op.EQ(Op.DUP2, 0xFA04))
-            + Op.JUMPI(pc=0x411, condition=Op.EQ(Op.DUP2, 0x31))
-            + Op.JUMPI(pc=0x427, condition=Op.EQ(Op.DUP2, 0x3B))
-            + Op.JUMPI(pc=0x43D, condition=Op.EQ(Op.DUP2, 0x3C))
-            + Op.JUMPI(pc=0x45B, condition=Op.EQ(Op.DUP2, 0x3F))
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x0,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x0,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x0,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x0,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.BALANCE(address=Op.DUP8)
-            + Op.SWAP3
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.BALANCE(address=Op.DUP8)
-            + Op.SWAP2
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.EXTCODESIZE(address=Op.DUP8)
-            + Op.SWAP3
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.EXTCODESIZE(address=Op.DUP8)
-            + Op.SWAP2
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.EXTCODECOPY(
-                address=Op.DUP11,
-                dest_offset=Op.DUP1,
-                offset=0x0,
-                size=0x100,
-            )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.EXTCODECOPY(
-                address=Op.DUP11,
-                dest_offset=Op.DUP1,
-                offset=0x0,
-                size=0x100,
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.EXTCODEHASH(address=Op.DUP8)
-            + Op.SWAP3
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.EXTCODEHASH(address=Op.DUP8)
-            + Op.SWAP2
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.SUB(Op.DUP6, Op.DUP4)
-            + Op.SUB(Op.DUP6, Op.DUP4)
-            + Op.SSTORE(key=0x0, value=Op.EQ(Op.DUP3, Op.DUP1))
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.DUP3, Op.DUP1))
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-        ),
-        storage={0x0: 0x60A7, 0x1: 0x60A7},
-        address=Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=100000,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts/precompsEIP2929CancunFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 27500}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 25000}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c00000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000001338f76642a7a19cc50bdff45172cb6c2a7d20c0000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={1: 2500}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f101",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b790000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f103",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f105",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000007be86ffab69b0af1ed862ae6d8e1efa3e8438b79000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000031",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000003f",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000003c",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000003b",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f104",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f200",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f201",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f202",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f203",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f204",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f205",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f400",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f402",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000f404",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000fa00",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e60000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000fa02",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000fa04",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000f102",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "1a8451e6000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000f100",  # noqa: E501
-            {
-                Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"): Account(
-                    storage={0: 1}
-                )
-            },
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/stPreCompiledContracts/precompsEIP2929CancunFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            38,
+            0,
+            0,
+            id="all",
+        ),
+        pytest.param(
+            39,
+            0,
+            0,
+            id="all",
+        ),
+        pytest.param(
+            40,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            41,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            42,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            43,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            44,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            45,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            46,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            47,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            48,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            49,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            50,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            51,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            52,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            53,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            54,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            55,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            56,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            57,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            58,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            59,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            60,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            61,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            62,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            63,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            64,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            65,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            66,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            67,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            68,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            69,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            70,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            71,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            72,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            73,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            74,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            75,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            76,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            77,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            78,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            79,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            80,
+            0,
+            0,
+            id="all",
+        ),
+        pytest.param(
+            81,
+            0,
+            0,
+            id="all",
+        ),
+        pytest.param(
+            82,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            83,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            84,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            85,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            86,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            87,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            88,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            89,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            90,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            91,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            92,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            93,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            94,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            95,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            96,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            97,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            98,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            99,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            100,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            101,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            102,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            103,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            104,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            105,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            106,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            107,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            108,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            109,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            110,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            111,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            112,
+            0,
+            0,
+            id="new",
+        ),
+        pytest.param(
+            113,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            114,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            115,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            116,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            117,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            118,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            119,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            120,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            121,
+            0,
+            0,
+            id="all_then_yes_from_prague",
+        ),
+        pytest.param(
+            122,
+            0,
+            0,
+            id="all",
+        ),
+        pytest.param(
+            123,
+            0,
+            0,
+            id="all",
+        ),
+        pytest.param(
+            124,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            125,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            126,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            127,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            128,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            129,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            130,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            131,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            132,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            133,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            134,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            135,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            136,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            137,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            138,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            139,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            140,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            141,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            142,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            143,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            144,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            145,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            146,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            147,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            148,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            149,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            150,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            151,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            152,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            153,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            154,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            155,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            156,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            157,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            158,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            159,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            160,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            161,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            162,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            163,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            164,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            165,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            166,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            167,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            168,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            169,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            170,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            171,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            172,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            173,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            174,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            175,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            176,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            177,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            178,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            179,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            180,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            181,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            182,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            183,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            184,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            185,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            186,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            187,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            188,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            189,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            190,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            191,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            192,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            193,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            194,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            195,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            196,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            197,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            198,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            199,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            200,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            201,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            202,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            203,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            204,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            205,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            206,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            207,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            208,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            209,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            210,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            211,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            212,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            213,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            214,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            215,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            216,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            217,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            218,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            219,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            220,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            221,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            222,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            223,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            224,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            225,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            226,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            227,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            228,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            229,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            230,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            231,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            232,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            233,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            234,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            235,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            236,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            237,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            238,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            239,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            240,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            241,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            242,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            243,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            244,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            245,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            246,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            247,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            248,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            249,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            250,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            251,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            252,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            253,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            254,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            255,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            256,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            257,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            258,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            259,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            260,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            261,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            262,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            263,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            264,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            265,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            266,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            267,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            268,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            269,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            270,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            271,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            272,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            273,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            274,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            275,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            276,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            277,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            278,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            279,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            280,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            281,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            282,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            283,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            284,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            285,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            286,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            287,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            288,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            289,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            290,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            291,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            292,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            293,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            294,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            295,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            296,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            297,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            298,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            299,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            300,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            301,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            302,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            303,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            304,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            305,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            306,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            307,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            308,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            309,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            310,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            311,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            312,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            313,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            314,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            315,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            316,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            317,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            318,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            319,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            320,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            321,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            322,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            323,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            324,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            325,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            326,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            327,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            328,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            329,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            330,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            331,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            332,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            333,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            334,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            335,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            336,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            337,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            338,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            339,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            340,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            341,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            342,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            343,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            344,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            345,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            346,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            347,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            348,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            349,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            350,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            351,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            352,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            353,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            354,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            355,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            356,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            357,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            358,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            359,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            360,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            361,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            362,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            363,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            364,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            365,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            366,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            367,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            368,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            369,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            370,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            371,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            372,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            373,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            374,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            375,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            376,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            377,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            378,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            379,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            380,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            381,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            382,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            383,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            384,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            385,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            386,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            387,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            388,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            389,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            390,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            391,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            392,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            393,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            394,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            395,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            396,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            397,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            398,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            399,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            400,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            401,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            402,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            403,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            404,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            405,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            406,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            407,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            408,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            409,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            410,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            411,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            412,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            413,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            414,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            415,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            416,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            417,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            418,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            419,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            420,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            421,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            422,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            423,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            424,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            425,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            426,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            427,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            428,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            429,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            430,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            431,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            432,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            433,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            434,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            435,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            436,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            437,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            438,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            439,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            440,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            441,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            442,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            443,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            444,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            445,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            446,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            447,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            448,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            449,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            450,
+            0,
+            0,
+            id="yes",
+        ),
+        pytest.param(
+            451,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            452,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            453,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            454,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            455,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            456,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            457,
+            0,
+            0,
+            id="yes_from_prague",
+        ),
+        pytest.param(
+            458,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            459,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            460,
+            0,
+            0,
+            id="no",
+        ),
+        pytest.param(
+            461,
+            0,
+            0,
+            id="yes",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-        "case166",
-        "case167",
-        "case168",
-        "case169",
-        "case170",
-        "case171",
-        "case172",
-        "case173",
-        "case174",
-        "case175",
-        "case176",
-        "case177",
-        "case178",
-        "case179",
-        "case180",
-        "case181",
-        "case182",
-        "case183",
-        "case184",
-        "case185",
-        "case186",
-        "case187",
-        "case188",
-        "case189",
-        "case190",
-        "case191",
-        "case192",
-        "case193",
-        "case194",
-        "case195",
-        "case196",
-        "case197",
-        "case198",
-        "case199",
-        "case200",
-        "case201",
-        "case202",
-        "case203",
-        "case204",
-        "case205",
-        "case206",
-        "case207",
-        "case208",
-        "case209",
-        "case210",
-        "case211",
-        "case212",
-        "case213",
-        "case214",
-        "case215",
-        "case216",
-        "case217",
-        "case218",
-        "case219",
-        "case220",
-        "case221",
-        "case222",
-        "case223",
-        "case224",
-        "case225",
-        "case226",
-        "case227",
-        "case228",
-        "case229",
-        "case230",
-        "case231",
-        "case232",
-        "case233",
-        "case234",
-        "case235",
-        "case236",
-        "case237",
-        "case238",
-        "case239",
-        "case240",
-        "case241",
-        "case242",
-        "case243",
-        "case244",
-        "case245",
-        "case246",
-        "case247",
-        "case248",
-        "case249",
-        "case250",
-        "case251",
-        "case252",
-        "case253",
-        "case254",
-        "case255",
-        "case256",
-        "case257",
-        "case258",
-        "case259",
-        "case260",
-        "case261",
-        "case262",
-        "case263",
-        "case264",
-        "case265",
-        "case266",
-        "case267",
-        "case268",
-        "case269",
-        "case270",
-        "case271",
-        "case272",
-        "case273",
-        "case274",
-        "case275",
-        "case276",
-        "case277",
-        "case278",
-        "case279",
-        "case280",
-        "case281",
-        "case282",
-        "case283",
-        "case284",
-        "case285",
-        "case286",
-        "case287",
-        "case288",
-        "case289",
-        "case290",
-        "case291",
-        "case292",
-        "case293",
-        "case294",
-        "case295",
-        "case296",
-        "case297",
-        "case298",
-        "case299",
-        "case300",
-        "case301",
-        "case302",
-        "case303",
-        "case304",
-        "case305",
-        "case306",
-        "case307",
-        "case308",
-        "case309",
-        "case310",
-        "case311",
-        "case312",
-        "case313",
-        "case314",
-        "case315",
-        "case316",
-        "case317",
-        "case318",
-        "case319",
-        "case320",
-        "case321",
-        "case322",
-        "case323",
-        "case324",
-        "case325",
-        "case326",
-        "case327",
-        "case328",
-        "case329",
-        "case330",
-        "case331",
-        "case332",
-        "case333",
-        "case334",
-        "case335",
-        "case336",
-        "case337",
-        "case338",
-        "case339",
-        "case340",
-        "case341",
-        "case342",
-        "case343",
-        "case344",
-        "case345",
-        "case346",
-        "case347",
-        "case348",
-        "case349",
-        "case350",
-        "case351",
-        "case352",
-        "case353",
-        "case354",
-        "case355",
-        "case356",
-        "case357",
-        "case358",
-        "case359",
-        "case360",
-        "case361",
-        "case362",
-        "case363",
-        "case364",
-        "case365",
-        "case366",
-        "case367",
-        "case368",
-        "case369",
-        "case370",
-        "case371",
-        "case372",
-        "case373",
-        "case374",
-        "case375",
-        "case376",
-        "case377",
-        "case378",
-        "case379",
-        "case380",
-        "case381",
-        "case382",
-        "case383",
-        "case384",
-        "case385",
-        "case386",
-        "case387",
-        "case388",
-        "case389",
-        "case390",
-        "case391",
-        "case392",
-        "case393",
-        "case394",
-        "case395",
-        "case396",
-        "case397",
-        "case398",
-        "case399",
-        "case400",
-        "case401",
-        "case402",
-        "case403",
-        "case404",
-        "case405",
-        "case406",
-        "case407",
-        "case408",
-        "case409",
-        "case410",
-        "case411",
-        "case412",
-        "case413",
-        "case414",
-        "case415",
-        "case416",
-        "case417",
-        "case418",
-        "case419",
-        "case420",
-        "case421",
-        "case422",
-        "case423",
-        "case424",
-        "case425",
-        "case426",
-        "case427",
-        "case428",
-        "case429",
-        "case430",
-        "case431",
-        "case432",
-        "case433",
-        "case434",
-        "case435",
-        "case436",
-        "case437",
-        "case438",
-        "case439",
-        "case440",
-        "case441",
-        "case442",
-        "case443",
-        "case444",
-        "case445",
-        "case446",
-        "case447",
-        "case448",
-        "case449",
-        "case450",
-        "case451",
-        "case452",
-        "case453",
-        "case454",
-        "case455",
-        "case456",
-        "case457",
-        "case458",
-        "case459",
-        "case460",
-        "case461",
-    ],
 )
-@pytest.mark.pre_alloc_mutable
-def test_precomps_eip2929_cancun_from_osaka(
+def test_precomps_eip2929_cancun(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -14154,16 +2828,26 @@ def test_precomps_eip2929_cancun_from_osaka(
         gas_limit=71794957647893862,
     )
 
-    pre.deploy_contract(
+    # Source: yul
+    # berlin
+    # {
+    #    mstore(0,add(1,2))
+    # }
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x0, value=0x3) + Op.STOP,
-        address=Address("0x1338f76642a7a19cc50bdff45172cb6c2a7d20c0"),  # noqa: E501
+        nonce=1,
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
+    # Source: yul
+    # berlin
+    # {
+    #    mstore(0,add(1,2))
+    # }
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x0, value=0x3) + Op.STOP,
-        address=Address("0x7be86ffab69b0af1ed862ae6d8e1efa3e8438b79"),  # noqa: E501
+        nonce=1,
     )
-    # Source: Yul
+    # Source: yul
+    # berlin optimise
     # {
     #   let addrTest   := calldataload(0x04)
     #   let action     := calldataload(0x24)
@@ -14193,738 +2877,1868 @@ def test_precomps_eip2929_cancun_from_osaka(
     #   case 0xf101 {
     #       gas0 := gas()
     #       pop(call(0x100000, addrTest, 1, 0, 0, 0, 0))
-    #       gas1 := gas()
-    # ... (155 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x4)
-            + Op.CALLDATALOAD(offset=0x24)
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=0x100, value=0xDEADBEEF)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=0x7BE86FFAB69B0AF1ED862AE6D8E1EFA3E8438B79,
-                    value=0x1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.DUP6
-            + Op.JUMPI(pc=0x101, condition=Op.EQ(Op.DUP2, 0xF100))
-            + Op.JUMPI(pc=0x12D, condition=Op.EQ(Op.DUP2, 0xF101))
-            + Op.JUMPI(pc=0x159, condition=Op.EQ(Op.DUP2, 0xF102))
-            + Op.JUMPI(pc=0x185, condition=Op.EQ(Op.DUP2, 0xF103))
-            + Op.JUMPI(pc=0x1B3, condition=Op.EQ(Op.DUP2, 0xF104))
-            + Op.JUMPI(pc=0x1DF, condition=Op.EQ(Op.DUP2, 0xF105))
-            + Op.JUMPI(pc=0x20D, condition=Op.EQ(Op.DUP2, 0xF200))
-            + Op.JUMPI(pc=0x239, condition=Op.EQ(Op.DUP2, 0xF201))
-            + Op.JUMPI(pc=0x265, condition=Op.EQ(Op.DUP2, 0xF202))
-            + Op.JUMPI(pc=0x291, condition=Op.EQ(Op.DUP2, 0xF203))
-            + Op.JUMPI(pc=0x2BF, condition=Op.EQ(Op.DUP2, 0xF204))
-            + Op.JUMPI(pc=0x2EB, condition=Op.EQ(Op.DUP2, 0xF205))
-            + Op.JUMPI(pc=0x319, condition=Op.EQ(Op.DUP2, 0xF400))
-            + Op.JUMPI(pc=0x341, condition=Op.EQ(Op.DUP2, 0xF402))
-            + Op.JUMPI(pc=0x36B, condition=Op.EQ(Op.DUP2, 0xF404))
-            + Op.JUMPI(pc=0x395, condition=Op.EQ(Op.DUP2, 0xFA00))
-            + Op.JUMPI(pc=0x3BD, condition=Op.EQ(Op.DUP2, 0xFA02))
-            + Op.JUMPI(pc=0x3E7, condition=Op.EQ(Op.DUP2, 0xFA04))
-            + Op.JUMPI(pc=0x411, condition=Op.EQ(Op.DUP2, 0x31))
-            + Op.JUMPI(pc=0x427, condition=Op.EQ(Op.DUP2, 0x3B))
-            + Op.JUMPI(pc=0x43D, condition=Op.EQ(Op.DUP2, 0x3C))
-            + Op.JUMPI(pc=0x45B, condition=Op.EQ(Op.DUP2, 0x3F))
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x0,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+    # ... (156 more lines)
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x4)
+        + Op.CALLDATALOAD(offset=0x24)
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=0x100, value=0xDEADBEEF)
+        + Op.POP(
+            Op.CALL(
+                gas=0x100000,
+                address=addr_2,
+                value=0x1,
+                args_offset=Op.DUP1,
+                args_size=0x0,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x0,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.DUP6
+        + Op.JUMPI(pc=0x101, condition=Op.EQ(Op.DUP2, 0xF100))
+        + Op.JUMPI(pc=0x12D, condition=Op.EQ(Op.DUP2, 0xF101))
+        + Op.JUMPI(pc=0x159, condition=Op.EQ(Op.DUP2, 0xF102))
+        + Op.JUMPI(pc=0x185, condition=Op.EQ(Op.DUP2, 0xF103))
+        + Op.JUMPI(pc=0x1B3, condition=Op.EQ(Op.DUP2, 0xF104))
+        + Op.JUMPI(pc=0x1DF, condition=Op.EQ(Op.DUP2, 0xF105))
+        + Op.JUMPI(pc=0x20D, condition=Op.EQ(Op.DUP2, 0xF200))
+        + Op.JUMPI(pc=0x239, condition=Op.EQ(Op.DUP2, 0xF201))
+        + Op.JUMPI(pc=0x265, condition=Op.EQ(Op.DUP2, 0xF202))
+        + Op.JUMPI(pc=0x291, condition=Op.EQ(Op.DUP2, 0xF203))
+        + Op.JUMPI(pc=0x2BF, condition=Op.EQ(Op.DUP2, 0xF204))
+        + Op.JUMPI(pc=0x2EB, condition=Op.EQ(Op.DUP2, 0xF205))
+        + Op.JUMPI(pc=0x319, condition=Op.EQ(Op.DUP2, 0xF400))
+        + Op.JUMPI(pc=0x341, condition=Op.EQ(Op.DUP2, 0xF402))
+        + Op.JUMPI(pc=0x36B, condition=Op.EQ(Op.DUP2, 0xF404))
+        + Op.JUMPI(pc=0x395, condition=Op.EQ(Op.DUP2, 0xFA00))
+        + Op.JUMPI(pc=0x3BD, condition=Op.EQ(Op.DUP2, 0xFA02))
+        + Op.JUMPI(pc=0x3E7, condition=Op.EQ(Op.DUP2, 0xFA04))
+        + Op.JUMPI(pc=0x411, condition=Op.EQ(Op.DUP2, 0x31))
+        + Op.JUMPI(pc=0x427, condition=Op.EQ(Op.DUP2, 0x3B))
+        + Op.JUMPI(pc=0x43D, condition=Op.EQ(Op.DUP2, 0x3C))
+        + Op.JUMPI(pc=0x45B, condition=Op.EQ(Op.DUP2, 0x3F))
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.CALL(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=0x0,
+                args_offset=Op.DUP1,
+                args_size=0x0,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.CALL(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=0x0,
+                args_offset=Op.DUP1,
+                args_size=0x0,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.CALL(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=0x1,
+                args_offset=Op.DUP1,
+                args_size=0x0,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.CALL(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=0x1,
+                args_offset=Op.DUP1,
+                args_size=0x0,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.CALL(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=Op.DUP1,
+                args_offset=0x0,
+                args_size=0x1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.CALL(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=Op.DUP1,
+                args_offset=0x0,
+                args_size=0x1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.CALL(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.CALL(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.CALL(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=Op.DUP1,
+                args_offset=0x0,
+                args_size=Op.DUP1,
+                ret_offset=0x0,
+                ret_size=0x1,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.CALL(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=Op.DUP1,
+                args_offset=0x0,
+                args_size=Op.DUP1,
+                ret_offset=0x0,
+                ret_size=0x1,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALL(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.CALL(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=0x1,
+                args_offset=0x0,
+                args_size=Op.DUP1,
+                ret_offset=0x0,
+                ret_size=0x1,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x0,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.CALL(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=0x1,
+                args_offset=0x0,
+                args_size=Op.DUP1,
+                ret_offset=0x0,
+                ret_size=0x1,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x0,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=0x0,
+                args_offset=Op.DUP1,
+                args_size=0x0,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=0x0,
+                args_offset=Op.DUP1,
+                args_size=0x0,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=0x1,
+                args_offset=Op.DUP1,
+                args_size=0x0,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=0x1,
+                args_offset=Op.DUP1,
+                args_size=0x0,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=Op.DUP1,
+                args_offset=0x0,
+                args_size=0x1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=Op.DUP1,
+                args_offset=0x0,
+                args_size=0x1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=Op.DUP1,
+                args_offset=0x0,
+                args_size=Op.DUP1,
+                ret_offset=0x0,
+                ret_size=0x1,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=Op.DUP1,
+                args_offset=0x0,
+                args_size=Op.DUP1,
+                ret_offset=0x0,
+                ret_size=0x1,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x100000,
-                    address=Op.DUP13,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=0x1,
+                args_offset=0x0,
+                args_size=Op.DUP1,
+                ret_offset=0x0,
+                ret_size=0x1,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x100000,
+                address=Op.DUP13,
+                value=0x1,
+                args_offset=0x0,
+                args_size=Op.DUP1,
+                ret_offset=0x0,
+                ret_size=0x1,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x100000,
+                address=Op.DUP12,
+                args_offset=Op.DUP1,
+                args_size=0x0,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x100000,
+                address=Op.DUP12,
+                args_offset=Op.DUP1,
+                args_size=0x0,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x100000,
+                address=Op.DUP12,
+                args_offset=0x0,
+                args_size=0x1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x100000,
+                address=Op.DUP12,
+                args_offset=0x0,
+                args_size=0x1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x100000,
+                address=Op.DUP12,
+                args_offset=0x0,
+                args_size=Op.DUP1,
+                ret_offset=0x0,
+                ret_size=0x1,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x100000,
+                address=Op.DUP12,
+                args_offset=0x0,
+                args_size=Op.DUP1,
+                ret_offset=0x0,
+                ret_size=0x1,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=Op.DUP1,
-                    args_size=0x0,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x100000,
+                address=Op.DUP12,
+                args_offset=Op.DUP1,
+                args_size=0x0,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x100000,
+                address=Op.DUP12,
+                args_offset=Op.DUP1,
+                args_size=0x0,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=0x1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x100000,
+                address=Op.DUP12,
+                args_offset=0x0,
+                args_size=0x1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x100000,
+                address=Op.DUP12,
+                args_offset=0x0,
+                args_size=0x1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x100000,
-                    address=Op.DUP12,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x0,
-                    ret_size=0x1,
-                ),
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x100000,
+                address=Op.DUP12,
+                args_offset=0x0,
+                args_size=Op.DUP1,
+                ret_offset=0x0,
+                ret_size=0x1,
             )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.BALANCE(address=Op.DUP8)
-            + Op.SWAP3
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.BALANCE(address=Op.DUP8)
-            + Op.SWAP2
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.EXTCODESIZE(address=Op.DUP8)
-            + Op.SWAP3
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.EXTCODESIZE(address=Op.DUP8)
-            + Op.SWAP2
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.EXTCODECOPY(
-                address=Op.DUP11,
-                dest_offset=Op.DUP1,
-                offset=0x0,
-                size=0x100,
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x100000,
+                address=Op.DUP12,
+                args_offset=0x0,
+                args_size=Op.DUP1,
+                ret_offset=0x0,
+                ret_size=0x1,
             )
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.EXTCODECOPY(
-                address=Op.DUP11,
-                dest_offset=Op.DUP1,
-                offset=0x0,
-                size=0x100,
-            )
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x46D)
-            + Op.JUMPDEST
-            + Op.GAS
-            + Op.SWAP6
-            + Op.POP
-            + Op.EXTCODEHASH(address=Op.DUP8)
-            + Op.SWAP3
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP5
-            + Op.POP
-            + Op.EXTCODEHASH(address=Op.DUP8)
-            + Op.SWAP2
-            + Op.POP
-            + Op.GAS
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.SUB(Op.DUP6, Op.DUP4)
-            + Op.SUB(Op.DUP6, Op.DUP4)
-            + Op.SSTORE(key=0x0, value=Op.EQ(Op.DUP3, Op.DUP1))
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.DUP3, Op.DUP1))
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-        ),
-        storage={0x0: 0x60A7, 0x1: 0x60A7},
-        address=Address("0x858295015aff9cfdb96c3c2ec19f7ac654871b6c"),  # noqa: E501
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.BALANCE(address=Op.DUP8)
+        + Op.SWAP3
+        + Op.POP
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.BALANCE(address=Op.DUP8)
+        + Op.SWAP2
+        + Op.POP
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.EXTCODESIZE(address=Op.DUP8)
+        + Op.SWAP3
+        + Op.POP
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.EXTCODESIZE(address=Op.DUP8)
+        + Op.SWAP2
+        + Op.POP
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.EXTCODECOPY(
+            address=Op.DUP11, dest_offset=Op.DUP1, offset=0x0, size=0x100
+        )
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.EXTCODECOPY(
+            address=Op.DUP11, dest_offset=Op.DUP1, offset=0x0, size=0x100
+        )
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x46D)
+        + Op.JUMPDEST
+        + Op.GAS
+        + Op.SWAP6
+        + Op.POP
+        + Op.EXTCODEHASH(address=Op.DUP8)
+        + Op.SWAP3
+        + Op.POP
+        + Op.GAS
+        + Op.SWAP5
+        + Op.POP
+        + Op.EXTCODEHASH(address=Op.DUP8)
+        + Op.SWAP2
+        + Op.POP
+        + Op.GAS
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.SUB(Op.DUP6, Op.DUP4) * 2
+        + Op.SSTORE(key=0x0, value=Op.EQ(Op.DUP3, Op.DUP1))
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.DUP3, Op.DUP1))
+        + Op.POP * 9,
+        storage={0: 24743, 1: 24743},
+        nonce=1,
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [
+                    2,
+                    3,
+                    4,
+                    5,
+                    6,
+                    7,
+                    8,
+                    9,
+                    10,
+                    11,
+                    12,
+                    29,
+                    30,
+                    41,
+                    42,
+                    43,
+                    44,
+                    45,
+                    46,
+                    47,
+                    48,
+                    49,
+                    50,
+                    51,
+                    62,
+                    70,
+                    71,
+                    72,
+                    83,
+                    84,
+                    85,
+                    86,
+                    87,
+                    88,
+                    89,
+                    90,
+                    91,
+                    92,
+                    93,
+                    104,
+                    113,
+                    114,
+                    125,
+                    126,
+                    127,
+                    128,
+                    129,
+                    130,
+                    131,
+                    132,
+                    133,
+                    134,
+                    135,
+                    146,
+                    147,
+                    148,
+                    149,
+                    150,
+                    151,
+                    152,
+                    153,
+                    154,
+                    155,
+                    156,
+                    167,
+                    168,
+                    169,
+                    170,
+                    171,
+                    172,
+                    173,
+                    174,
+                    175,
+                    176,
+                    177,
+                    188,
+                    189,
+                    190,
+                    191,
+                    192,
+                    193,
+                    194,
+                    195,
+                    196,
+                    197,
+                    198,
+                    209,
+                    210,
+                    211,
+                    212,
+                    213,
+                    214,
+                    215,
+                    216,
+                    217,
+                    218,
+                    219,
+                    230,
+                    231,
+                    232,
+                    233,
+                    234,
+                    235,
+                    236,
+                    237,
+                    238,
+                    239,
+                    240,
+                    251,
+                    252,
+                    253,
+                    254,
+                    255,
+                    256,
+                    257,
+                    258,
+                    259,
+                    260,
+                    261,
+                    272,
+                    273,
+                    274,
+                    275,
+                    276,
+                    277,
+                    278,
+                    279,
+                    280,
+                    281,
+                    282,
+                    293,
+                    294,
+                    295,
+                    296,
+                    297,
+                    298,
+                    299,
+                    300,
+                    301,
+                    302,
+                    303,
+                    314,
+                    315,
+                    316,
+                    317,
+                    318,
+                    319,
+                    320,
+                    321,
+                    322,
+                    323,
+                    324,
+                    335,
+                    336,
+                    337,
+                    338,
+                    339,
+                    340,
+                    341,
+                    342,
+                    343,
+                    344,
+                    345,
+                    356,
+                    357,
+                    358,
+                    359,
+                    360,
+                    361,
+                    362,
+                    363,
+                    364,
+                    365,
+                    366,
+                    377,
+                    378,
+                    379,
+                    380,
+                    381,
+                    382,
+                    383,
+                    384,
+                    385,
+                    386,
+                    387,
+                    398,
+                    399,
+                    400,
+                    401,
+                    402,
+                    403,
+                    404,
+                    405,
+                    406,
+                    407,
+                    408,
+                    419,
+                    420,
+                    421,
+                    422,
+                    423,
+                    424,
+                    425,
+                    426,
+                    427,
+                    428,
+                    429,
+                    440,
+                    441,
+                    442,
+                    443,
+                    444,
+                    445,
+                    446,
+                    447,
+                    448,
+                    449,
+                    450,
+                    461,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 0})},
+        },
+        {
+            "indexes": {
+                "data": [
+                    13,
+                    14,
+                    15,
+                    16,
+                    17,
+                    18,
+                    19,
+                    31,
+                    32,
+                    33,
+                    34,
+                    35,
+                    36,
+                    37,
+                    52,
+                    53,
+                    54,
+                    55,
+                    56,
+                    57,
+                    58,
+                    73,
+                    74,
+                    75,
+                    76,
+                    77,
+                    78,
+                    79,
+                    94,
+                    95,
+                    96,
+                    97,
+                    98,
+                    99,
+                    100,
+                    115,
+                    116,
+                    117,
+                    118,
+                    119,
+                    120,
+                    121,
+                    136,
+                    137,
+                    138,
+                    139,
+                    140,
+                    141,
+                    142,
+                    157,
+                    158,
+                    159,
+                    160,
+                    161,
+                    162,
+                    163,
+                    178,
+                    179,
+                    180,
+                    181,
+                    182,
+                    183,
+                    184,
+                    199,
+                    200,
+                    201,
+                    202,
+                    203,
+                    204,
+                    205,
+                    220,
+                    221,
+                    222,
+                    223,
+                    224,
+                    225,
+                    226,
+                    241,
+                    242,
+                    243,
+                    244,
+                    245,
+                    246,
+                    247,
+                    262,
+                    263,
+                    264,
+                    265,
+                    266,
+                    267,
+                    268,
+                    283,
+                    284,
+                    285,
+                    286,
+                    287,
+                    288,
+                    289,
+                    304,
+                    305,
+                    306,
+                    307,
+                    308,
+                    309,
+                    310,
+                    325,
+                    326,
+                    327,
+                    328,
+                    329,
+                    330,
+                    331,
+                    346,
+                    347,
+                    348,
+                    349,
+                    350,
+                    351,
+                    352,
+                    367,
+                    368,
+                    369,
+                    370,
+                    371,
+                    372,
+                    373,
+                    388,
+                    389,
+                    390,
+                    391,
+                    392,
+                    393,
+                    394,
+                    409,
+                    410,
+                    411,
+                    412,
+                    413,
+                    414,
+                    415,
+                    430,
+                    431,
+                    432,
+                    433,
+                    434,
+                    435,
+                    436,
+                    451,
+                    452,
+                    453,
+                    454,
+                    455,
+                    456,
+                    457,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Prague"],
+            "result": {target: Account(storage={0: 1, 1: 0})},
+        },
+        {
+            "indexes": {
+                "data": [
+                    0,
+                    1,
+                    395,
+                    396,
+                    269,
+                    270,
+                    143,
+                    144,
+                    145,
+                    271,
+                    397,
+                    20,
+                    416,
+                    417,
+                    290,
+                    291,
+                    164,
+                    165,
+                    166,
+                    292,
+                    40,
+                    418,
+                    437,
+                    438,
+                    311,
+                    312,
+                    185,
+                    186,
+                    59,
+                    60,
+                    61,
+                    187,
+                    313,
+                    439,
+                    458,
+                    459,
+                    332,
+                    333,
+                    206,
+                    207,
+                    208,
+                    334,
+                    82,
+                    460,
+                    353,
+                    354,
+                    227,
+                    228,
+                    101,
+                    102,
+                    103,
+                    229,
+                    355,
+                    376,
+                    374,
+                    375,
+                    248,
+                    249,
+                    250,
+                    124,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0, 1: 2500})},
+        },
+        {
+            "indexes": {
+                "data": [
+                    13,
+                    14,
+                    15,
+                    16,
+                    17,
+                    18,
+                    19,
+                    52,
+                    53,
+                    54,
+                    55,
+                    56,
+                    57,
+                    58,
+                    94,
+                    95,
+                    96,
+                    97,
+                    98,
+                    99,
+                    100,
+                    136,
+                    137,
+                    138,
+                    139,
+                    140,
+                    141,
+                    142,
+                    157,
+                    158,
+                    159,
+                    160,
+                    161,
+                    162,
+                    163,
+                    178,
+                    179,
+                    180,
+                    181,
+                    182,
+                    183,
+                    184,
+                    199,
+                    200,
+                    201,
+                    202,
+                    203,
+                    204,
+                    205,
+                    220,
+                    221,
+                    222,
+                    223,
+                    224,
+                    225,
+                    226,
+                    241,
+                    242,
+                    243,
+                    244,
+                    245,
+                    246,
+                    247,
+                    262,
+                    263,
+                    264,
+                    265,
+                    266,
+                    267,
+                    268,
+                    283,
+                    284,
+                    285,
+                    286,
+                    287,
+                    288,
+                    289,
+                    304,
+                    305,
+                    306,
+                    307,
+                    308,
+                    309,
+                    310,
+                    325,
+                    326,
+                    327,
+                    328,
+                    329,
+                    330,
+                    331,
+                    346,
+                    347,
+                    348,
+                    349,
+                    350,
+                    351,
+                    352,
+                    367,
+                    368,
+                    369,
+                    370,
+                    371,
+                    372,
+                    373,
+                    388,
+                    389,
+                    390,
+                    391,
+                    392,
+                    393,
+                    394,
+                    409,
+                    410,
+                    411,
+                    412,
+                    413,
+                    414,
+                    415,
+                    430,
+                    431,
+                    432,
+                    433,
+                    434,
+                    435,
+                    436,
+                    451,
+                    452,
+                    453,
+                    454,
+                    455,
+                    456,
+                    457,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": ["Cancun"],
+            "result": {target: Account(storage={0: 0, 1: 2500})},
+        },
+        {
+            "indexes": {
+                "data": [
+                    21,
+                    22,
+                    23,
+                    24,
+                    25,
+                    26,
+                    27,
+                    28,
+                    63,
+                    64,
+                    65,
+                    66,
+                    67,
+                    68,
+                    69,
+                    105,
+                    106,
+                    107,
+                    108,
+                    109,
+                    110,
+                    111,
+                    112,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0, 1: 25000})},
+        },
+        {
+            "indexes": {
+                "data": [38, 39, 80, 81, 122, 123],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0, 1: 27500})},
+        },
+        {
+            "indexes": {
+                "data": [
+                    31,
+                    32,
+                    33,
+                    34,
+                    35,
+                    36,
+                    37,
+                    73,
+                    74,
+                    75,
+                    76,
+                    77,
+                    78,
+                    79,
+                    115,
+                    116,
+                    117,
+                    118,
+                    119,
+                    120,
+                    121,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": ["Cancun"],
+            "result": {target: Account(storage={0: 0, 1: 27500})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xF100),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xF101),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xF102),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xF103),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xF104),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xF105),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xF200),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xF201),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xF202),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xF203),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xF204),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xF205),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xF400),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xF402),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xF404),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xFA00),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xFA02),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0xFA04),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0x31),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0x3F),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0x3C),
+        Bytes("1a8451e6") + Hash(0x1) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0x2) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0x3) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0x8) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0x9) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0xA) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0xB) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0xC) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0xD) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0xE) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0xF) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0x10) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0x11) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0x12) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(0x100000) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(addr, left_padding=True) + Hash(0x3B),
+        Bytes("1a8451e6") + Hash(addr_2, left_padding=True) + Hash(0x3B),
+    ]
+    tx_gas = [16777216]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts/test_sec80.py b/tests/ported_static/stPreCompiledContracts/test_sec80.py
index e3635a52885..7f08f0420c8 100644
--- a/tests/ported_static/stPreCompiledContracts/test_sec80.py
+++ b/tests/ported_static/stPreCompiledContracts/test_sec80.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_sec80.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts/sec80Filler.json
+state_tests/stPreCompiledContracts/sec80Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stPreCompiledContracts/sec80Filler.json"],
+    ["state_tests/stPreCompiledContracts/sec80Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_sec80(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_sec80."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,69 +43,65 @@ def test_sec80(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMP(pc=0x1B)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH4[0xBADF00D]
-            + Op.JUMP(pc=0x3)
-            + Op.JUMPDEST
-            + Op.PUSH4[0xC001F00D]
-            + Op.JUMP(pc=0x3)
-            + Op.JUMPDEST
-            + Op.PUSH20[0x19E7E376E7C213B7E7E7E46CC70A5DD086DAFF2A]
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x22AE6DA6B482F9B1B19B0B897C3FD43884180A1C5EE361E1107A1BC635649DDA,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0x3F, value=0x1B)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x16433DCE375CE6DC8151D3F0A22728BC4A1D9FD6ED39DFD18B4609331937367F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x306964C0CF5D74F04129FDC60B54D35B596DDE1BF89AD92CB4123318F4C0E400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x7,
-                condition=Op.ISZERO(
-                    Op.CALLCODE(
-                        gas=0xFFFF,
-                        address=0x1,
-                        value=0x0,
-                        args_offset=0x0,
-                        args_size=0x7F,
-                        ret_offset=0x80,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MLOAD(offset=0x80)
-            + Op.JUMPI(pc=0x12, condition=Op.EQ)
-            + Op.JUMP(pc=0x9)
-        ),
+    # Source: raw
+    # 0x601b565b6000555b005b630badf00d6003565b63c001f00d6003565b7319e7e376e7c213b7e7e7e46cc70a5dd086daff2a7f22ae6da6b482f9b1b19b0b897c3fd43884180a1c5ee361e1107a1bc635649dda600052601b603f537f16433dce375ce6dc8151d3f0a22728bc4a1d9fd6ed39dfd18b4609331937367f6040527f306964c0cf5d74f04129fdc60b54d35b596dde1bf89ad92cb4123318f4c0e40060605260206080607f60006000600161fffff21560075760805114601257600956  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMP(pc=0x1B)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SSTORE
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH4[0xBADF00D]
+        + Op.JUMP(pc=0x3)
+        + Op.JUMPDEST
+        + Op.PUSH4[0xC001F00D]
+        + Op.JUMP(pc=0x3)
+        + Op.JUMPDEST
+        + Op.PUSH20[0x19E7E376E7C213B7E7E7E46CC70A5DD086DAFF2A]
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x22AE6DA6B482F9B1B19B0B897C3FD43884180A1C5EE361E1107A1BC635649DDA,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0x3F, value=0x1B)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x16433DCE375CE6DC8151D3F0A22728BC4A1D9FD6ED39DFD18B4609331937367F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x306964C0CF5D74F04129FDC60B54D35B596DDE1BF89AD92CB4123318F4C0E400,  # noqa: E501
+        )
+        + Op.JUMPI(
+            pc=0x7,
+            condition=Op.ISZERO(
+                Op.CALLCODE(
+                    gas=0xFFFF,
+                    address=0x1,
+                    value=0x0,
+                    args_offset=0x0,
+                    args_size=0x7F,
+                    ret_offset=0x80,
+                    ret_size=0x20,
+                )
+            ),
+        )
+        + Op.MLOAD(offset=0x80)
+        + Op.JUMPI(pc=0x12, condition=Op.EQ)
+        + Op.JUMP(pc=0x9),
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x39c2fbd2d4e46fa75775649472ddb79e836160b0"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 0xC001F00D}),
-    }
+    post = {target: Account(storage={0: 0xC001F00D})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/__init__.py b/tests/ported_static/stPreCompiledContracts2/__init__.py
index 81317f37d2a..8778acc4c4e 100644
--- a/tests/ported_static/stPreCompiledContracts2/__init__.py
+++ b/tests/ported_static/stPreCompiledContracts2/__init__.py
@@ -1 +1 @@
-"""Tests ported from stPreCompiledContracts2."""
+"""Ported static tests: stPreCompiledContracts2."""  # noqa: N999
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0.py
index 282127f8b7d..96a35affc1a 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ecrecover0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CallEcrecover0Filler.json
+state_tests/stPreCompiledContracts2/CallEcrecover0Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecover0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallEcrecover0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,9 @@ def test_call_ecrecover0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ecrecover0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -47,63 +47,53 @@ def test_call_ecrecover0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                1: 1,
-                2: 1,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={0: sender, 1: 1, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_0input.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_0input.py
index 9de3178ff8d..5116b30b570 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_0input.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_0input.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_ecrecover0_0input.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallEcrecover0_0inputFiller.json
+state_tests/stPreCompiledContracts2/CallEcrecover0_0inputFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecover0_0inputFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallEcrecover0_0inputFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_call_ecrecover0_0input(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_ecrecover0_0input."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,43 +43,37 @@ def test_call_ecrecover0_0input(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x6988d3cd2c65677341d1e302439627344dfb1c82"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_complete_return_value.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_complete_return_value.py
index 8852cea76b7..6f44a02596c 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_complete_return_value.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_complete_return_value.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ecrecover0_complete_return_value.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallEcrecover0_completeReturnValueFiller.json
+state_tests/stPreCompiledContracts2/CallEcrecover0_completeReturnValueFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecover0_completeReturnValueFiller.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CallEcrecover0_completeReturnValueFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,9 @@ def test_call_ecrecover0_complete_return_value(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ecrecover0_complete_return_value."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,58 +49,50 @@ def test_call_ecrecover0_complete_return_value(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 3000 1 0 0 128 128 32) [[ 0 ]] (MLOAD 128) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xBB8,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xBB8,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                2: 1,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={0: sender, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_gas2999.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_gas2999.py
index e533107143a..7252f2e85fb 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_gas2999.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_gas2999.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_ecrecover0_gas2999.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallEcrecover0_Gas2999Filler.json
+state_tests/stPreCompiledContracts2/CallEcrecover0_Gas2999Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecover0_Gas2999Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallEcrecover0_Gas2999Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_call_ecrecover0_gas2999(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_ecrecover0_gas2999."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,55 +43,51 @@ def test_call_ecrecover0_gas2999(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 2999 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xBB7,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xBB7,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x34bc8d999c6ffd2df1999d36424d37aa91286fa3"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={2: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_gas3000.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_gas3000.py
index 0ef1acfb1ad..d030a8f189e 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_gas3000.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_gas3000.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ecrecover0_gas3000.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallEcrecover0_gas3000Filler.json
+state_tests/stPreCompiledContracts2/CallEcrecover0_gas3000Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecover0_gas3000Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallEcrecover0_gas3000Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,8 +31,9 @@ def test_call_ecrecover0_gas3000(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ecrecover0_gas3000."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,63 +47,53 @@ def test_call_ecrecover0_gas3000(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 3000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0xBB8,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0xBB8,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                1: 1,
-                2: 1,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={0: sender, 1: 1, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_no_gas.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_no_gas.py
index 8390bead2a5..148ce74a70a 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_no_gas.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_no_gas.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_ecrecover0_no_gas.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallEcrecover0_NoGasFiller.json
+state_tests/stPreCompiledContracts2/CallEcrecover0_NoGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecover0_NoGasFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallEcrecover0_NoGasFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_call_ecrecover0_no_gas(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_ecrecover0_no_gas."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,56 +43,52 @@ def test_call_ecrecover0_no_gas(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 0 1 1 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x0,
-                    address=0x1,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
-        storage={0x0: 0xC, 0x1: 0xC, 0x2: 0xC},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x0,
+                address=0x1,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
+        storage={0: 12, 1: 12, 2: 12},
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x9f2e40fca484bdcf92b52e622eed58d6a3df731f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_overlapping_input_output.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_overlapping_input_output.py
index db9d2bdd4eb..38dc572832a 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_overlapping_input_output.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover0_overlapping_input_output.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ecrecover0_overlapping_input_output.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallEcrecover0_overlappingInputOutputFiller.json
+state_tests/stPreCompiledContracts2/CallEcrecover0_overlappingInputOutputFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecover0_overlappingInputOutputFiller.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CallEcrecover0_overlappingInputOutputFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,9 @@ def test_call_ecrecover0_overlapping_input_output(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ecrecover0_overlapping_input_output."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,63 +49,53 @@ def test_call_ecrecover0_overlapping_input_output(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 64 32) [[ 0 ]] (MOD (MLOAD 64) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x40,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x40), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x40,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x40), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                1: 1,
-                2: 1,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={0: sender, 1: 1, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover1.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover1.py
index f89bf0434fc..e2c3b6511c7 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover1.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_ecrecover1.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CallEcrecover1Filler.json
+state_tests/stPreCompiledContracts2/CallEcrecover1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecover1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallEcrecover1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_call_ecrecover1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_ecrecover1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,57 +43,51 @@ def test_call_ecrecover1(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 1) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 100000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x62549a73a158b67fdc175b0d94fc2826963fc3c2"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover2.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover2.py
index 1ad8f84b976..e39aeb54a4f 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover2.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover2.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_ecrecover2.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CallEcrecover2Filler.json
+state_tests/stPreCompiledContracts2/CallEcrecover2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecover2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallEcrecover2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_call_ecrecover2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_ecrecover2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,57 +43,51 @@ def test_call_ecrecover2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 33 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 65 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 100000 1 0 0 97 97 32) [[ 0 ]] (MOD (MLOAD 97) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x21,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x41,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x61,
-                    ret_offset=0x61,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x61), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x21,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x41,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x61,
+                ret_offset=0x61,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x61), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x42aa64fdfc0af7140da38474659ae0ab48aba824"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover3.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover3.py
index 693b8d94e26..fcae7ed32af 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover3.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover3.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ecrecover3.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CallEcrecover3Filler.json
+state_tests/stPreCompiledContracts2/CallEcrecover3Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecover3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallEcrecover3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_call_ecrecover3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ecrecover3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,57 +46,55 @@ def test_call_ecrecover3(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9) (MSTORE 32 27) (MSTORE 64 0x6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a) (MSTORE 96 0x37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4) [[ 2 ]] (CALL 100000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x2F380A2DEA7E778D81AFFC2443403B8FE4644DB442AE4862FF5BB3732829CDB9,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1B)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x6B65CCB0558806E9B097F27A396D08F964E37B8B7AF6CEEB516FF86739FBEA0A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x37CBC8D883E129A4B1EF9D5F1DF53C4F21A3EF147CF2A50A4EDE0EB06CE092D4,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x2F380A2DEA7E778D81AFFC2443403B8FE4644DB442AE4862FF5BB3732829CDB9,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1B)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x6B65CCB0558806E9B097F27A396D08F964E37B8B7AF6CEEB516FF86739FBEA0A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x37CBC8D883E129A4B1EF9D5F1DF53C4F21A3EF147CF2A50A4EDE0EB06CE092D4,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x28d98d7cc227972a80fa4a16964272bf8738d792"),  # noqa: E501
+        address=Address(0x28D98D7CC227972A80FA4A16964272BF8738D792),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xE4319F4B631C6D0FCFC84045DBCB676865FE5E13,
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover80.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover80.py
index 2c281693aac..a24e67e9c17 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover80.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover80.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_ecrecover80.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CallEcrecover80Filler.json
+state_tests/stPreCompiledContracts2/CallEcrecover80Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecover80Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallEcrecover80Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_call_ecrecover80(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_ecrecover80."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,57 +43,51 @@ def test_call_ecrecover80(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x00c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x00b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0x00b940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xC547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xB1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xC547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xB1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xf5e90f13aa1637ba33175ea73221dd55443a6d5b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 0, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_check_length.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_check_length.py
index 0593a2ed626..adb6a64af72 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_check_length.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_check_length.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ecrecover_check_length.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallEcrecoverCheckLengthFiller.json
+state_tests/stPreCompiledContracts2/CallEcrecoverCheckLengthFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecoverCheckLengthFiller.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CallEcrecoverCheckLengthFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,9 @@ def test_call_ecrecover_check_length(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ecrecover_check_length."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,64 +49,55 @@ def test_call_ecrecover_check_length(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 128 0x1122334455667788990011223344556677889900112233445566778899001122) (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MLOAD 128) [[ 1 ]] (MSIZE) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x80,
-                value=0x1122334455667788990011223344556677889900112233445566778899001122,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
-            + Op.SSTORE(key=0x1, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x80,
+            value=0x1122334455667788990011223344556677889900112233445566778899001122,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
+        + Op.SSTORE(key=0x1, value=Op.MSIZE)
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                1: 160,
-                2: 1,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={0: sender, 1: 160, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_check_length_wrong_v.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_check_length_wrong_v.py
index e185361ca90..6c31f8f8d4f 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_check_length_wrong_v.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_check_length_wrong_v.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ecrecover_check_length_wrong_v.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallEcrecoverCheckLengthWrongVFiller.json
+state_tests/stPreCompiledContracts2/CallEcrecoverCheckLengthWrongVFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecoverCheckLengthWrongVFiller.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CallEcrecoverCheckLengthWrongVFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_call_ecrecover_check_length_wrong_v(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ecrecover_check_length_wrong_v."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,58 +48,57 @@ def test_call_ecrecover_check_length_wrong_v(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 128 0x1122334455667788990011223344556677889900112233445566778899001122) (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 29) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MLOAD 128) [[ 1 ]] (MSIZE) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x80,
-                value=0x1122334455667788990011223344556677889900112233445566778899001122,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1D)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
-            + Op.SSTORE(key=0x1, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x80,
+            value=0x1122334455667788990011223344556677889900112233445566778899001122,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1D)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
+        + Op.SSTORE(key=0x1, value=Op.MSIZE)
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x5cc93303c292c9573fa7de40ff6281b18dbf491e"),  # noqa: E501
+        address=Address(0x5CC93303C292C9573FA7DE40FF6281B18DBF491E),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x1122334455667788990011223344556677889900112233445566778899001122,  # noqa: E501
                 1: 160,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_h_prefixed0.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_h_prefixed0.py
index 7c71c584c2c..40d765e1dcc 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_h_prefixed0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_h_prefixed0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ecrecover_h_prefixed0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallEcrecoverH_prefixed0Filler.json
+state_tests/stPreCompiledContracts2/CallEcrecoverH_prefixed0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecoverH_prefixed0Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CallEcrecoverH_prefixed0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_call_ecrecover_h_prefixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ecrecover_h_prefixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,59 +48,58 @@ def test_call_ecrecover_h_prefixed0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x00c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xC547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xC547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x7b80a19cd6f97e5150a04b81956a57115c477c33"),  # noqa: E501
+        address=Address(0x7B80A19CD6F97E5150A04B81956A57115C477C33),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xA0B29AF6A56D6CFEF6415CB195CCBE540E006D0A,
+                1: 0,
                 2: 1,
             },
         ),
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_invalid_signature.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_invalid_signature.py
index dbfa8651e41..8aeba668b39 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_invalid_signature.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_invalid_signature.py
@@ -1,9 +1,8 @@
 """
-CALL to ECREC precompile with input which is a completely invalid signature...
+CALL to ECREC precompile with input which is a completely invalid...
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallEcrecoverInvalidSignatureFiller.json
+state_tests/stPreCompiledContracts2/CallEcrecoverInvalidSignatureFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecoverInvalidSignatureFiller.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CallEcrecoverInvalidSignatureFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,7 +34,7 @@ def test_call_ecrecover_invalid_signature(
     pre: Alloc,
 ) -> None:
     """CALL to ECREC precompile with input which is a completely invalid..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,43 +48,42 @@ def test_call_ecrecover_invalid_signature(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 128 0x1122334455667788991011121314151617181920212223242526272829303132) (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MLOAD 128) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x80,
-                value=0x1122334455667788991011121314151617181920212223242526272829303132,  # noqa: E501
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x80,
+            value=0x1122334455667788991011121314151617181920212223242526272829303132,  # noqa: E501
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
             )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x2b8fd4adb0602fe9ee5823b0576f619daefbd369"),  # noqa: E501
+        address=Address(0x2B8FD4ADB0602FE9EE5823B0576F619DAEFBD369),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x1122334455667788991011121314151617181920212223242526272829303132,  # noqa: E501
             },
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_overflow.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_overflow.py
index b3f9d4f3f1a..a2eaac17506 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_overflow.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_overflow.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ecrecover_overflow.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallEcrecover_OverflowFiller.yml
+state_tests/stPreCompiledContracts2/CallEcrecover_OverflowFiller.yml
 """
 
 import pytest
@@ -12,10 +11,16 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,108 +28,73 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecover_OverflowFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallEcrecover_OverflowFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "917694f918c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c000000000000000000000000000000000000000000000000000000000000001cfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd03641421fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804",  # noqa: E501
-            {
-                Address("0xdb8963071feae3b63e19d9d7af8ee89a92e99356"): Account(
-                    storage={0: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f918c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c000000000000000000000000000000000000000000000000000000000000001cfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804",  # noqa: E501
-            {
-                Address("0xdb8963071feae3b63e19d9d7af8ee89a92e99356"): Account(
-                    storage={0: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f918c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c000000000000000000000000000000000000000000000000000000000000001c48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141",  # noqa: E501
-            {
-                Address("0xdb8963071feae3b63e19d9d7af8ee89a92e99356"): Account(
-                    storage={0: 1}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f918c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c000000000000000000000000000000000000000000000000000000000000001c48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364142",  # noqa: E501
-            {
-                Address("0xdb8963071feae3b63e19d9d7af8ee89a92e99356"): Account(
-                    storage={0: 1}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="pass01",
         ),
-        (
-            "917694f918c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c000000000000000000000000000000000000000000000000000000000000001cfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd03641411fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804",  # noqa: E501
-            {
-                Address("0xdb8963071feae3b63e19d9d7af8ee89a92e99356"): Account(
-                    storage={0: 1}
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f918c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c000000000000000000000000000000000000000000000000000000000000001cfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd036413fefffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804",  # noqa: E501
-            {
-                Address("0xdb8963071feae3b63e19d9d7af8ee89a92e99356"): Account(
-                    storage={
-                        0: 1,
-                        1: 0x2182DA748249A933BF737586B80212DF19B8F829,
-                    }
-                )
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f918c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c000000000000000000000000000000000000000000000000000000000000001c48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140",  # noqa: E501
-            {
-                Address("0xdb8963071feae3b63e19d9d7af8ee89a92e99356"): Account(
-                    storage={
-                        0: 1,
-                        1: 0x1B85AC3C9B09DE43659C5D04A2D9C75457D9ABF4,
-                    }
-                )
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="pass02",
         ),
-        (
-            "917694f918c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c000000000000000000000000000000000000000000000000000000000000001c48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd036413f",  # noqa: E501
-            {
-                Address("0xdb8963071feae3b63e19d9d7af8ee89a92e99356"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xD0277C8A3ECCD462A313FC60161BAC36B16E8699,
-                    }
-                )
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="pass03",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_call_ecrecover_overflow(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ecrecover_overflow."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -139,7 +109,8 @@ def test_call_ecrecover_overflow(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #  // Copy Hash, V, R, S values
     #  calldatacopy(0x00, 0x04, 0x80)
@@ -148,38 +119,172 @@ def test_call_ecrecover_overflow(
     #  sstore(0, call(3000, 1, 0, 0, 0x80, 0x80, 0x20))
     #  sstore(1, mload(0x80))
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATACOPY(dest_offset=0x0, offset=0x4, size=0x80)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xBB8,
-                    address=0x1,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=Op.DUP1,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATACOPY(dest_offset=0x0, offset=0x4, size=0x80)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xBB8,
+                address=0x1,
+                value=Op.DUP1,
+                args_offset=0x0,
+                args_size=Op.DUP1,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdb8963071feae3b63e19d9d7af8ee89a92e99356"),  # noqa: E501
+        address=Address(0xDB8963071FEAE3B63E19D9D7AF8EE89A92E99356),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 1, 2, 4, 5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 0})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 1,
+                        1: 0x2182DA748249A933BF737586B80212DF19B8F829,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 1,
+                        1: 0x1B85AC3C9B09DE43659C5D04A2D9C75457D9ABF4,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 1,
+                        1: 0xD0277C8A3ECCD462A313FC60161BAC36B16E8699,
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("917694f9")
+        + Hash(
+            0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C
+        )
+        + Hash(0x1C)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141
+        )
+        + Hash(
+            0x1FFFD310AC743F371DE3B9F7F9CB56C0B28AD43601B4AB949F53FAA07BD2C804
+        ),
+        Bytes("917694f9")
+        + Hash(
+            0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C
+        )
+        + Hash(0x1C)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364142
+        )
+        + Hash(
+            0x1FFFD310AC743F371DE3B9F7F9CB56C0B28AD43601B4AB949F53FAA07BD2C804
+        ),
+        Bytes("917694f9")
+        + Hash(
+            0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C
+        )
+        + Hash(0x1C)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364140
+        )
+        + Hash(
+            0xEFFFD310AC743F371DE3B9F7F9CB56C0B28AD43601B4AB949F53FAA07BD2C804
+        ),
+        Bytes("917694f9")
+        + Hash(
+            0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C
+        )
+        + Hash(0x1C)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD036413F
+        )
+        + Hash(
+            0xEFFFD310AC743F371DE3B9F7F9CB56C0B28AD43601B4AB949F53FAA07BD2C804
+        ),
+        Bytes("917694f9")
+        + Hash(
+            0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C
+        )
+        + Hash(0x1C)
+        + Hash(
+            0x48B55BFA915AC795C431978D8A6A992B628D557DA5FF759B307D495A36649353
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141
+        ),
+        Bytes("917694f9")
+        + Hash(
+            0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C
+        )
+        + Hash(0x1C)
+        + Hash(
+            0x48B55BFA915AC795C431978D8A6A992B628D557DA5FF759B307D495A36649353
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364142
+        ),
+        Bytes("917694f9")
+        + Hash(
+            0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C
+        )
+        + Hash(0x1C)
+        + Hash(
+            0x48B55BFA915AC795C431978D8A6A992B628D557DA5FF759B307D495A36649353
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364140
+        ),
+        Bytes("917694f9")
+        + Hash(
+            0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C
+        )
+        + Hash(0x1C)
+        + Hash(
+            0x48B55BFA915AC795C431978D8A6A992B628D557DA5FF759B307D495A36649353
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD036413F
+        ),
+    ]
+    tx_gas = [100000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=100000,
-        value=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_r_prefixed0.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_r_prefixed0.py
index 3b1574515b0..4410f66b67d 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_r_prefixed0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_r_prefixed0.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_ecrecover_r_prefixed0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallEcrecoverR_prefixed0Filler.json
+state_tests/stPreCompiledContracts2/CallEcrecoverR_prefixed0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecoverR_prefixed0Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CallEcrecoverR_prefixed0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_ecrecover_r_prefixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_ecrecover_r_prefixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,57 +45,51 @@ def test_call_ecrecover_r_prefixed0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x00b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xB1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xB1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x0453735a25df75808cceb79d037904a5007c2058"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 0, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_s_prefixed0.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_s_prefixed0.py
index 3f7ede43ba1..66b679f89f9 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_s_prefixed0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_s_prefixed0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ecrecover_s_prefixed0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallEcrecoverS_prefixed0Filler.json
+state_tests/stPreCompiledContracts2/CallEcrecoverS_prefixed0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecoverS_prefixed0Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CallEcrecoverS_prefixed0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_call_ecrecover_s_prefixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ecrecover_s_prefixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -49,58 +49,57 @@ def test_call_ecrecover_s_prefixed0(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0x00b940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xf292ec7b1106fbd3df874a754f8c99155b961f92"),  # noqa: E501
+        address=Address(0xF292EC7B1106FBD3DF874A754F8C99155B961F92),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xB4950A7FAD428434B11C357FA6D4B4BCD3096A5D,
+                1: 0,
                 2: 1,
             },
         ),
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_unrecoverable_key.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_unrecoverable_key.py
index 137275a18ed..961c7e7c940 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_unrecoverable_key.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_unrecoverable_key.py
@@ -1,9 +1,8 @@
 """
-CALL to ECREC precompile with input that has a valid signature structure...
+CALL to ECREC precompile with input that has a valid signature...
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallEcrecoverUnrecoverableKeyFiller.json
+state_tests/stPreCompiledContracts2/CallEcrecoverUnrecoverableKeyFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecoverUnrecoverableKeyFiller.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CallEcrecoverUnrecoverableKeyFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,7 +34,7 @@ def test_call_ecrecover_unrecoverable_key(
     pre: Alloc,
 ) -> None:
     """CALL to ECREC precompile with input that has a valid signature..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,56 +48,55 @@ def test_call_ecrecover_unrecoverable_key(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xa8b53bdf3306a35a7103ab5504a0c9b492295564b6202b1942a84ef300107281) (MSTORE 32 0x000000000000000000000000000000000000000000000000000000000000001b) (MSTORE 64 0x3078356531653033663533636531386237373263636230303933666637316633) (MSTORE 96 0x6635336635633735623734646362333161383561613862383839326234653862) (MSTORE 128 0x1122334455667788991011121314151617181920212223242526272829303132) (CALL 300000 1 0 0 128 128 32) (SSTORE 0 (MLOAD 128)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xA8B53BDF3306A35A7103AB5504A0C9B492295564B6202B1942A84EF300107281,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1B)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x3078356531653033663533636531386237373263636230303933666637316633,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x6635336635633735623734646362333161383561613862383839326234653862,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x1122334455667788991011121314151617181920212223242526272829303132,  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xA8B53BDF3306A35A7103AB5504A0C9B492295564B6202B1942A84EF300107281,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1B)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x3078356531653033663533636531386237373263636230303933666637316633,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x6635336635633735623734646362333161383561613862383839326234653862,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x1122334455667788991011121314151617181920212223242526272829303132,  # noqa: E501
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
             )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x85c44d846ed50ac9e384c1b575fd96f3edf5751f"),  # noqa: E501
+        address=Address(0x85C44D846ED50AC9E384C1B575FD96F3EDF5751F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x1122334455667788991011121314151617181920212223242526272829303132,  # noqa: E501
             },
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_v_prefixed0.py b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_v_prefixed0.py
index 15a9eb28687..3ed45721580 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_v_prefixed0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ecrecover_v_prefixed0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ecrecover_v_prefixed0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallEcrecoverV_prefixed0Filler.json
+state_tests/stPreCompiledContracts2/CallEcrecoverV_prefixed0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CallEcrecoverV_prefixed0Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CallEcrecoverV_prefixed0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,9 @@ def test_call_ecrecover_v_prefixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ecrecover_v_prefixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,63 +49,53 @@ def test_call_ecrecover_v_prefixed0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 0x001c) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                1: 1,
-                2: 1,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={0: sender, 1: 1, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_1.py b/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_1.py
index a7afda0d763..9db95d1b505 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_1.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ripemd160_1.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CallRipemd160_1Filler.json
+state_tests/stPreCompiledContracts2/CallRipemd160_1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallRipemd160_1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallRipemd160_1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_call_ripemd160_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ripemd160_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,40 +46,39 @@ def test_call_ripemd160_1(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { [[ 2 ]] (CALL 600 3 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x258,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x258,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xbb0a46f4d8842e6949fa40f7d4f5567213240bde"),  # noqa: E501
+        address=Address(0xBB0A46F4D8842E6949FA40F7D4F5567213240BDE),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x9C1185A5C5E9FC54612808977EE8F548B2258D31,
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_2.py b/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_2.py
index 2cf6e538baa..a92de2d9538 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_2.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ripemd160_2.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CallRipemd160_2Filler.json
+state_tests/stPreCompiledContracts2/CallRipemd160_2Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallRipemd160_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallRipemd160_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_call_ripemd160_2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ripemd160_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,41 +46,40 @@ def test_call_ripemd160_2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 5 0xf34578907f) [[ 2 ]] (CALL 6000 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x5, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x1770,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x5, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x1770,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x5da48ffd1587258fb609acec343481bb238e2064"),  # noqa: E501
+        address=Address(0x5DA48FFD1587258FB609ACEC343481BB238E2064),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xDBC100F916BFBC53535573D98CF0CBB3A5B36124,
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_3.py b/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_3.py
index ede8834ed6c..08cc37fed3f 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_3.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_3.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ripemd160_3.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CallRipemd160_3Filler.json
+state_tests/stPreCompiledContracts2/CallRipemd160_3Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallRipemd160_3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallRipemd160_3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_call_ripemd160_3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ripemd160_3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,41 +46,40 @@ def test_call_ripemd160_3(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xf34578907f) [[ 2 ]] (CALL 6000 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x1770,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x1770,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x37120c525aaed676a19d7786c9296b708c0981e5"),  # noqa: E501
+        address=Address(0x37120C525AAED676A19D7786C9296B708C0981E5),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x316750573F9BE26BC17727B47CACEDBD0AB3E6CA,
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_3_postfixed0.py b/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_3_postfixed0.py
index 846fc62ef28..d62b7ae7132 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_3_postfixed0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_3_postfixed0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ripemd160_3_postfixed0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallRipemd160_3_postfixed0Filler.json
+state_tests/stPreCompiledContracts2/CallRipemd160_3_postfixed0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CallRipemd160_3_postfixed0Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CallRipemd160_3_postfixed0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_call_ripemd160_3_postfixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ripemd160_3_postfixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,41 +48,40 @@ def test_call_ripemd160_3_postfixed0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xf34578907f00) [[ 2 ]] (CALL 6000 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F00)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x1770,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F00)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x1770,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x0a7939b337794bf9784ca2edbaccf4c289d2bd69"),  # noqa: E501
+        address=Address(0x0A7939B337794BF9784CA2EDBACCF4C289D2BD69),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x7730B4642169B0F16752696DA8DA830A4B429C9D,
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_3_prefixed0.py b/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_3_prefixed0.py
index 936a6e32cef..b457fd43897 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_3_prefixed0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_3_prefixed0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ripemd160_3_prefixed0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallRipemd160_3_prefixed0Filler.json
+state_tests/stPreCompiledContracts2/CallRipemd160_3_prefixed0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CallRipemd160_3_prefixed0Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CallRipemd160_3_prefixed0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_call_ripemd160_3_prefixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ripemd160_3_prefixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,41 +48,40 @@ def test_call_ripemd160_3_prefixed0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x00f34578907f) [[ 2 ]] (CALL 6000 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x1770,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x1770,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x58fbc34303e81cfadd7d347e87e46b2d6ce7548f"),  # noqa: E501
+        address=Address(0x58FBC34303E81CFADD7D347E87E46B2D6CE7548F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x316750573F9BE26BC17727B47CACEDBD0AB3E6CA,
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_4.py b/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_4.py
index 93333cc9468..ef89dddca53 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_4.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_4.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ripemd160_4.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CallRipemd160_4Filler.json
+state_tests/stPreCompiledContracts2/CallRipemd160_4Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallRipemd160_4Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallRipemd160_4Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_call_ripemd160_4(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ripemd160_4."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,44 +46,43 @@ def test_call_ripemd160_4(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 720 3 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x2D0,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x2D0,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x93e74099c6b1cf5e73a1cdd021c6942f9a814d9b"),  # noqa: E501
+        address=Address(0x93E74099C6B1CF5E73A1CDD021C6942F9A814D9B),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x1CF4E77F5966E13E109703CD8A0DF7CEDA7F3DC3,
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_4_gas719.py b/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_4_gas719.py
index e79cca6f70c..2a5f10f0b84 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_4_gas719.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_4_gas719.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ripemd160_4_gas719.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallRipemd160_4_gas719Filler.json
+state_tests/stPreCompiledContracts2/CallRipemd160_4_gas719Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallRipemd160_4_gas719Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallRipemd160_4_gas719Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,8 +31,8 @@ def test_call_ripemd160_4_gas719(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ripemd160_4_gas719."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,44 +46,43 @@ def test_call_ripemd160_4_gas719(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 719 3 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x2CF,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x2CF,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x061c5d0417a8b11331fad2817630996289b925bf"),  # noqa: E501
+        address=Address(0x061C5D0417A8B11331FAD2817630996289B925BF),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_5.py b/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_5.py
index 81564338455..42b92783dca 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_5.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_ripemd160_5.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_ripemd160_5.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CallRipemd160_5Filler.json
+state_tests/stPreCompiledContracts2/CallRipemd160_5Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallRipemd160_5Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallRipemd160_5Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_call_ripemd160_5(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_ripemd160_5."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,44 +46,43 @@ def test_call_ripemd160_5(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 6000 3 0 0 1000000 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x1770,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xF4240,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x1770,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xF4240,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x51998b731842f87dad142bfcc66310c3dc92c4fd"),  # noqa: E501
+        address=Address(0x51998B731842F87DAD142BFCC66310C3DC92C4FD),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_0.py b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_0.py
index 2487e8ad846..9e87cccdb89 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_0.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_sha256_0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CallSha256_0Filler.json
+state_tests/stPreCompiledContracts2/CallSha256_0Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallSha256_0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallSha256_0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_call_sha256_0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_sha256_0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,36 +46,36 @@ def test_call_sha256_0(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x1)
-            + Op.CALL(
-                gas=0xFF,
-                address=0x2,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x20,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-        ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: hex
+    # 0x600160005260206000602060006000600260fff1600051600055
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x1)
+        + Op.CALL(
+            gas=0xFF,
+            address=0x2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x20,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0)),
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xdcddac785b7920159cf9aa510ecd630640710567"),  # noqa: E501
+        address=Address(0xDCDDAC785B7920159CF9AA510ECD630640710567),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xEC4916DD28FC4C10D78E287CA5D9CC51EE1AE73CBFDE08C6B37324CBFAAC8BC5,  # noqa: E501
             },
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_1.py b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_1.py
index 873ce7cd36c..c36e97e91eb 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_1.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_sha256_1.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CallSha256_1Filler.json
+state_tests/stPreCompiledContracts2/CallSha256_1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallSha256_1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallSha256_1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_call_sha256_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_sha256_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,40 +46,39 @@ def test_call_sha256_1(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { [[ 2 ]] (CALL 500 2 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x1F4,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x1F4,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x1e79f0fd2bb702c9fd72905da2a5b109025fa4a6"),  # noqa: E501
+        address=Address(0x1E79F0FD2BB702C9FD72905DA2A5B109025FA4A6),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xE3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_1_nonzero_value.py b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_1_nonzero_value.py
index 08c6a960f2f..9acde20fa83 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_1_nonzero_value.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_1_nonzero_value.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_sha256_1_nonzero_value.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallSha256_1_nonzeroValueFiller.json
+state_tests/stPreCompiledContracts2/CallSha256_1_nonzeroValueFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CallSha256_1_nonzeroValueFiller.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CallSha256_1_nonzeroValueFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_call_sha256_1_nonzero_value(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_sha256_1_nonzero_value."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,40 +48,42 @@ def test_call_sha256_1_nonzero_value(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { [[ 2 ]] (CALL 200000 2 0x13 0 0 0 32) [[ 0 ]] (MLOAD 0)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x30D40,
-                    address=0x2,
-                    value=0x13,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x30D40,
+                address=0x2,
+                value=0x13,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xBEBC200,
         nonce=0,
-        address=Address("0x39baf944bd1b21e643d8d207a7073ee34a5d2116"),  # noqa: E501
+        address=Address(0x39BAF944BD1B21E643D8D207A7073EE34A5D2116),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        Address(0x0000000000000000000000000000000000000002): Account(
+            balance=19
+        ),
+        target: Account(
             storage={
                 0: 0xE3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_2.py b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_2.py
index 9d37ed6864e..e4fb44b8a0a 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_2.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_sha256_2.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CallSha256_2Filler.json
+state_tests/stPreCompiledContracts2/CallSha256_2Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallSha256_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallSha256_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_call_sha256_2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_sha256_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,41 +46,40 @@ def test_call_sha256_2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 5 0xf34578907f) [[ 2 ]] (CALL 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x5, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x1F4,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x5, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x1F4,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x2558c91e1ca37007e96544e37e5348c5c209ae3d"),  # noqa: E501
+        address=Address(0x2558C91E1CA37007E96544E37E5348C5C209AE3D),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xCB39B3BDE22925B2F931111130C774761D8895E0E08437C9B396C1E97D10F34D,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_3.py b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_3.py
index 034a2d16edf..0a8e95a99c9 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_3.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_3.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_sha256_3.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CallSha256_3Filler.json
+state_tests/stPreCompiledContracts2/CallSha256_3Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallSha256_3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallSha256_3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_call_sha256_3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_sha256_3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,41 +46,40 @@ def test_call_sha256_3(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xf34578907f) [[ 2 ]] (CALL 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x1F4,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x1F4,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x5ef7a23f9baea93bd729fd89fdce63578c13a01e"),  # noqa: E501
+        address=Address(0x5EF7A23F9BAEA93BD729FD89FDCE63578C13A01E),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x7392925565D67BE8E9620AACBCFAECD8CB6EC58D709D25DA9ECCF1D08A41CE35,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_3_postfix0.py b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_3_postfix0.py
index 00f5346479e..8874981dc47 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_3_postfix0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_3_postfix0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_sha256_3_postfix0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallSha256_3_postfix0Filler.json
+state_tests/stPreCompiledContracts2/CallSha256_3_postfix0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallSha256_3_postfix0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallSha256_3_postfix0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,8 +31,8 @@ def test_call_sha256_3_postfix0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_sha256_3_postfix0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,41 +46,40 @@ def test_call_sha256_3_postfix0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xf34578907f00) [[ 2 ]] (CALL 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F00)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x1F4,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F00)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x1F4,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xdb90d5cd1bd42ce94a38b9d293ac7a1be96adef9"),  # noqa: E501
+        address=Address(0xDB90D5CD1BD42CE94A38B9D293AC7A1BE96ADEF9),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x3B745A1C00D035C334F358D007A430E4CF0AE63AA0556FB05529706DE546464D,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_3_prefix0.py b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_3_prefix0.py
index 705b3bdeb98..23809f4456a 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_3_prefix0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_3_prefix0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_call_sha256_3_prefix0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CallSha256_3_prefix0Filler.json
+state_tests/stPreCompiledContracts2/CallSha256_3_prefix0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallSha256_3_prefix0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallSha256_3_prefix0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,8 +31,8 @@ def test_call_sha256_3_prefix0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_sha256_3_prefix0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,41 +46,40 @@ def test_call_sha256_3_prefix0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x00f34578907f) [[ 2 ]] (CALL 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x1F4,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x1F4,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x5d4b89a232555bc139aa244672611edf28d276c7"),  # noqa: E501
+        address=Address(0x5D4B89A232555BC139AA244672611EDF28D276C7),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x7392925565D67BE8E9620AACBCFAECD8CB6EC58D709D25DA9ECCF1D08A41CE35,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_4.py b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_4.py
index b579594cc24..ec364d74c5c 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_4.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_4.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_sha256_4.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CallSha256_4Filler.json
+state_tests/stPreCompiledContracts2/CallSha256_4Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallSha256_4Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallSha256_4Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_call_sha256_4(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_sha256_4."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,44 +46,43 @@ def test_call_sha256_4(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 100 2 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x64,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x64,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x6eaf78b8968e1ad784f281cc9ffc2ed8bdb61fbe"),  # noqa: E501
+        address=Address(0x6EAF78B8968E1AD784F281CC9FFC2ED8BDB61FBE),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xAF9613760F72635FBDB44A5A0A63C39F12AF30F950A6EE5C971BE188E89C4051,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_4_gas99.py b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_4_gas99.py
index afef34aa045..fa8d6d5dbde 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_4_gas99.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_4_gas99.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_sha256_4_gas99.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CallSha256_4_gas99Filler.json
+state_tests/stPreCompiledContracts2/CallSha256_4_gas99Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallSha256_4_gas99Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallSha256_4_gas99Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_call_sha256_4_gas99(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_sha256_4_gas99."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,44 +46,43 @@ def test_call_sha256_4_gas99(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 99 2 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x63,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x63,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x1b0415178117104203e61be499a69ba4a5b2a3b9"),  # noqa: E501
+        address=Address(0x1B0415178117104203E61BE499A69BA4A5B2A3B9),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xAF9613760F72635FBDB44A5A0A63C39F12AF30F950A6EE5C971BE188E89C4051,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_5.py b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_5.py
index e0691578e7d..20914f28990 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_call_sha256_5.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_call_sha256_5.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call_sha256_5.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CallSha256_5Filler.json
+state_tests/stPreCompiledContracts2/CallSha256_5Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CallSha256_5Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CallSha256_5Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_call_sha256_5(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_call_sha256_5."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,44 +46,43 @@ def test_call_sha256_5(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 600 2 0 0 1000000 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x258,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xF4240,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x258,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xF4240,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x66088f99c73ae9e87363561b19c69011205344d0"),  # noqa: E501
+        address=Address(0x66088F99C73AE9E87363561B19C69011205344D0),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0.py
index 5107a804db6..b80fc3a6fa8 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_ecrecover0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecover0Filler.json
+state_tests/stPreCompiledContracts2/CALLCODEEcrecover0Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecover0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODEEcrecover0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,9 @@ def test_callcode_ecrecover0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_ecrecover0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -47,63 +47,53 @@ def test_callcode_ecrecover0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                1: 1,
-                2: 1,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={0: sender, 1: 1, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_0input.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_0input.py
index e4e1b5ef3ca..0d540cb1ae4 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_0input.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_0input.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcode_ecrecover0_0input.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODEEcrecover0_0inputFiller.json
+state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_0inputFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_0inputFiller.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_0inputFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcode_ecrecover0_0input(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcode_ecrecover0_0input."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,43 +45,37 @@ def test_callcode_ecrecover0_0input(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 2 ]] (CALLCODE 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xd87aadfe05df880bc4c678f75154215cc6692d81"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_complete_return_value.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_complete_return_value.py
index 8bdce67e798..41cbfc0a954 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_complete_return_value.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_complete_return_value.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_ecrecover0_complete_return_value.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODEEcrecover0_completeReturnValueFiller.json
+state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_completeReturnValueFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_completeReturnValueFiller.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_completeReturnValueFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,9 @@ def test_callcode_ecrecover0_complete_return_value(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_ecrecover0_complete_return_value."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,58 +49,50 @@ def test_callcode_ecrecover0_complete_return_value(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 3000 1 0 0 128 128 32) [[ 0 ]] (MLOAD 128) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xBB8,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xBB8,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                2: 1,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={0: sender, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_gas2999.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_gas2999.py
index 43299beef19..8dc74be0591 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_gas2999.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_gas2999.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcode_ecrecover0_gas2999.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODEEcrecover0_Gas2999Filler.json
+state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_Gas2999Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_Gas2999Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_Gas2999Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcode_ecrecover0_gas2999(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcode_ecrecover0_gas2999."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,55 +45,51 @@ def test_callcode_ecrecover0_gas2999(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 2999 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xBB7,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xBB7,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xe70dcf2a2964db146b6cb171326705f77b924943"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={2: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_gas3000.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_gas3000.py
index 87bd1a6231b..d5d73e659d1 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_gas3000.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_gas3000.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_ecrecover0_gas3000.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODEEcrecover0_gas3000Filler.json
+state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_gas3000Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_gas3000Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_gas3000Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,9 @@ def test_callcode_ecrecover0_gas3000(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_ecrecover0_gas3000."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,63 +49,53 @@ def test_callcode_ecrecover0_gas3000(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 3000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0xBB8,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0xBB8,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                1: 1,
-                2: 1,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={0: sender, 1: 1, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_no_gas.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_no_gas.py
index 9f77ae5d6bd..3c520af25f1 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_no_gas.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_no_gas.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcode_ecrecover0_no_gas.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODEEcrecover0_NoGasFiller.json
+state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_NoGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_NoGasFiller.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_NoGasFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcode_ecrecover0_no_gas(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcode_ecrecover0_no_gas."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,56 +45,52 @@ def test_callcode_ecrecover0_no_gas(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 0 1 1 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x0,
-                    address=0x1,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
-        storage={0x0: 0xC, 0x1: 0xC, 0x2: 0xC},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x0,
+                address=0x1,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
+        storage={0: 12, 1: 12, 2: 12},
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x642b4bc6fe2e1633caaf1ad06e473299adb5cfd2"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_overlapping_input_output.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_overlapping_input_output.py
index 77934387e5d..86850680e68 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_overlapping_input_output.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover0_overlapping_input_output.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_ecrecover0_overlapping_input_output.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODEEcrecover0_overlappingInputOutputFiller.json
+state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_overlappingInputOutputFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_overlappingInputOutputFiller.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CALLCODEEcrecover0_overlappingInputOutputFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,9 @@ def test_callcode_ecrecover0_overlapping_input_output(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_ecrecover0_overlapping_input_output."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,63 +49,53 @@ def test_callcode_ecrecover0_overlapping_input_output(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 300000 1 0 0 128 64 32) [[ 0 ]] (MOD (MLOAD 64) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x40,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x40), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x40,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x40), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                1: 1,
-                2: 1,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={0: sender, 1: 1, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover1.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover1.py
index 19504c47813..e69d97a4675 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover1.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_callcode_ecrecover1.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecover1Filler.json
+state_tests/stPreCompiledContracts2/CALLCODEEcrecover1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecover1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODEEcrecover1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_callcode_ecrecover1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcode_ecrecover1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,57 +43,51 @@ def test_callcode_ecrecover1(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 1) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 100000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xc305c830833ccb72817f7b8b8d9c6d5645fc9e5f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover2.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover2.py
index 949bc32d8f3..750675ab593 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover2.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover2.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_callcode_ecrecover2.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecover2Filler.json
+state_tests/stPreCompiledContracts2/CALLCODEEcrecover2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecover2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODEEcrecover2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_callcode_ecrecover2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcode_ecrecover2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,57 +43,51 @@ def test_callcode_ecrecover2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 33 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 65 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 100000 1 0 0 97 97 32) [[ 0 ]] (MOD (MLOAD 97) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x21,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x41,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x61,
-                    ret_offset=0x61,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x61), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x21,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x41,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x61,
+                ret_offset=0x61,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x61), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x82fed9e1d9833bfed4d0dfab03d1e35dbffa4243"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover3.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover3.py
index c9f03ad2352..7281641e7aa 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover3.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover3.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_ecrecover3.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecover3Filler.json
+state_tests/stPreCompiledContracts2/CALLCODEEcrecover3Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecover3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODEEcrecover3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_callcode_ecrecover3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_ecrecover3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,56 +47,54 @@ def test_callcode_ecrecover3(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9) (MSTORE 32 27) (MSTORE 64 0x6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a) (MSTORE 96 0x37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4) [[ 2 ]] (CALLCODE 100000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x2F380A2DEA7E778D81AFFC2443403B8FE4644DB442AE4862FF5BB3732829CDB9,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1B)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x6B65CCB0558806E9B097F27A396D08F964E37B8B7AF6CEEB516FF86739FBEA0A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x37CBC8D883E129A4B1EF9D5F1DF53C4F21A3EF147CF2A50A4EDE0EB06CE092D4,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x2F380A2DEA7E778D81AFFC2443403B8FE4644DB442AE4862FF5BB3732829CDB9,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1B)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x6B65CCB0558806E9B097F27A396D08F964E37B8B7AF6CEEB516FF86739FBEA0A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x37CBC8D883E129A4B1EF9D5F1DF53C4F21A3EF147CF2A50A4EDE0EB06CE092D4,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xfbedf77edb387c8e6d9b016f522d38201f4de408"),  # noqa: E501
+        address=Address(0xFBEDF77EDB387C8E6D9B016F522D38201F4DE408),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xE4319F4B631C6D0FCFC84045DBCB676865FE5E13,
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover80.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover80.py
index 2f18141709c..b65664bed6a 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover80.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover80.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_callcode_ecrecover80.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecover80Filler.json
+state_tests/stPreCompiledContracts2/CALLCODEEcrecover80Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecover80Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODEEcrecover80Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_callcode_ecrecover80(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcode_ecrecover80."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,57 +43,51 @@ def test_callcode_ecrecover80(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x00c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x00b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0x00b940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xC547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xB1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xC547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xB1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xd5c4ea8faa1028d8d10aa6bf9133e678d695b349"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 0, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_h_prefixed0.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_h_prefixed0.py
index bdf101421a6..5af67bca2ee 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_h_prefixed0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_h_prefixed0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_ecrecover_h_prefixed0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODEEcrecoverH_prefixed0Filler.json
+state_tests/stPreCompiledContracts2/CALLCODEEcrecoverH_prefixed0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecoverH_prefixed0Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CALLCODEEcrecoverH_prefixed0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_callcode_ecrecover_h_prefixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_ecrecover_h_prefixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,59 +48,58 @@ def test_callcode_ecrecover_h_prefixed0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x00c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xC547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xC547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x0e408d340f5cc7cb2602ad82d377dc8d849480bc"),  # noqa: E501
+        address=Address(0x0E408D340F5CC7CB2602AD82D377DC8D849480BC),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xA0B29AF6A56D6CFEF6415CB195CCBE540E006D0A,
+                1: 0,
                 2: 1,
             },
         ),
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_r_prefixed0.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_r_prefixed0.py
index 33b53f402fc..4cf23a30a26 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_r_prefixed0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_r_prefixed0.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcode_ecrecover_r_prefixed0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODEEcrecoverR_prefixed0Filler.json
+state_tests/stPreCompiledContracts2/CALLCODEEcrecoverR_prefixed0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecoverR_prefixed0Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CALLCODEEcrecoverR_prefixed0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcode_ecrecover_r_prefixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcode_ecrecover_r_prefixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,57 +45,51 @@ def test_callcode_ecrecover_r_prefixed0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x00b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xB1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xB1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xb5ef5e7a96b20d5519b730bca2e026bd49a95f3e"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 0, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_s_prefixed0.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_s_prefixed0.py
index 7f82a876056..db3f82c5169 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_s_prefixed0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_s_prefixed0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_ecrecover_s_prefixed0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODEEcrecoverS_prefixed0Filler.json
+state_tests/stPreCompiledContracts2/CALLCODEEcrecoverS_prefixed0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecoverS_prefixed0Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CALLCODEEcrecoverS_prefixed0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_callcode_ecrecover_s_prefixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_ecrecover_s_prefixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,59 +48,58 @@ def test_callcode_ecrecover_s_prefixed0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0x00b940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xea150f7a83dc3c344efb50fca8fd1526b5d48935"),  # noqa: E501
+        address=Address(0xEA150F7A83DC3C344EFB50FCA8FD1526B5D48935),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xB4950A7FAD428434B11C357FA6D4B4BCD3096A5D,
+                1: 0,
                 2: 1,
             },
         ),
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_v_prefixed0.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_v_prefixed0.py
index 2792f1602a3..74faea77487 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_v_prefixed0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_v_prefixed0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_ecrecover_v_prefixed0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODEEcrecoverV_prefixed0Filler.json
+state_tests/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixed0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixed0Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixed0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,9 @@ def test_callcode_ecrecover_v_prefixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_ecrecover_v_prefixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,63 +49,53 @@ def test_callcode_ecrecover_v_prefixed0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 0x001c) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                1: 1,
-                2: 1,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={0: sender, 1: 1, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_v_prefixedf0.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_v_prefixedf0.py
index d851e9a5c2d..faa4869ed6c 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_v_prefixedf0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ecrecover_v_prefixedf0.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_callcode_ecrecover_v_prefixedf0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODEEcrecoverV_prefixedf0Filler.json
+state_tests/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixedf0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,29 +24,39 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixedf0Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixedf0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000000000000000000000000000000000000000f01c",
-        "00000000000000000000000000000000f000000000000000000000000000001c",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_callcode_ecrecover_v_prefixedf0(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcode_ecrecover_v_prefixedf0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,60 +67,58 @@ def test_callcode_ecrecover_v_prefixedf0(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 (CALLDATALOAD 0)) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x493E0,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x493E0,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xebcdd28b5479dbde3e8317ebac82a6e019e256e4"),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(0xF01C),
+        Hash(0xF000000000000000000000000000001C),
+    ]
+    tx_gas = [3652240]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=3652240,
-        value=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 0, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_0.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_0.py
index 22812568663..68d973a0d35 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_0.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_callcode_ripemd160_0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CALLCODERipemd160_0Filler.json
+state_tests/stPreCompiledContracts2/CALLCODERipemd160_0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODERipemd160_0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODERipemd160_0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_callcode_ripemd160_0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcode_ripemd160_0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,36 +43,32 @@ def test_callcode_ripemd160_0(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x1)
-            + Op.CALLCODE(
-                gas=0xFF,
-                address=0x3,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x20,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-        ),
+    # Source: hex
+    # 0x600160005260206000602060006000600360fff2600051600055
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x1)
+        + Op.CALLCODE(
+            gas=0xFF,
+            address=0x3,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x20,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0)),
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x21c1ad575033f5efbb9d40b78c24b18809902665"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_1.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_1.py
index a97630edab5..e4d89acbc75 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_1.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_ripemd160_1.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CALLCODERipemd160_1Filler.json
+state_tests/stPreCompiledContracts2/CALLCODERipemd160_1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODERipemd160_1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODERipemd160_1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_callcode_ripemd160_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_ripemd160_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,40 +46,39 @@ def test_callcode_ripemd160_1(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { [[ 2 ]] (CALLCODE 600 3 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x258,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x258,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xc2568ee355f0f71aa13fa54f6b01882d79a078c4"),  # noqa: E501
+        address=Address(0xC2568EE355F0F71AA13FA54F6B01882D79A078C4),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x9C1185A5C5E9FC54612808977EE8F548B2258D31,
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_2.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_2.py
index d8bc6377f4d..3eb132c2ce1 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_2.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_ripemd160_2.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CALLCODERipemd160_2Filler.json
+state_tests/stPreCompiledContracts2/CALLCODERipemd160_2Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODERipemd160_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODERipemd160_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_callcode_ripemd160_2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_ripemd160_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,41 +46,40 @@ def test_callcode_ripemd160_2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 5 0xf34578907f) [[ 2 ]] (CALLCODE 6000 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x5, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x1770,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x5, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x1770,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xb5505a4e16c6dc9a8f57a35f11d7a11fe0c62652"),  # noqa: E501
+        address=Address(0xB5505A4E16C6DC9A8F57A35F11D7A11FE0C62652),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xDBC100F916BFBC53535573D98CF0CBB3A5B36124,
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_3.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_3.py
index 28674c96f62..dfb5918c38a 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_3.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_3.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_ripemd160_3.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CALLCODERipemd160_3Filler.json
+state_tests/stPreCompiledContracts2/CALLCODERipemd160_3Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODERipemd160_3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODERipemd160_3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_callcode_ripemd160_3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_ripemd160_3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,41 +46,40 @@ def test_callcode_ripemd160_3(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xf34578907f) [[ 2 ]] (CALLCODE 6000 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x1770,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x1770,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x8976b14fe4cde9954494ec41aa275f87e2e13d0a"),  # noqa: E501
+        address=Address(0x8976B14FE4CDE9954494EC41AA275F87E2E13D0A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x316750573F9BE26BC17727B47CACEDBD0AB3E6CA,
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_3_postfixed0.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_3_postfixed0.py
index 5864877e463..c9ae41cdee4 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_3_postfixed0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_3_postfixed0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_ripemd160_3_postfixed0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODERipemd160_3_postfixed0Filler.json
+state_tests/stPreCompiledContracts2/CALLCODERipemd160_3_postfixed0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODERipemd160_3_postfixed0Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CALLCODERipemd160_3_postfixed0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_callcode_ripemd160_3_postfixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_ripemd160_3_postfixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,41 +48,40 @@ def test_callcode_ripemd160_3_postfixed0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xf34578907f00) [[ 2 ]] (CALLCODE 6000 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F00)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x1770,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F00)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x1770,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x4ae7f0a2d9ebede8e424c882c869da67ac881deb"),  # noqa: E501
+        address=Address(0x4AE7F0A2D9EBEDE8E424C882C869DA67AC881DEB),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x7730B4642169B0F16752696DA8DA830A4B429C9D,
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_3_prefixed0.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_3_prefixed0.py
index 16de0e264a9..2880463f03b 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_3_prefixed0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_3_prefixed0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_ripemd160_3_prefixed0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODERipemd160_3_prefixed0Filler.json
+state_tests/stPreCompiledContracts2/CALLCODERipemd160_3_prefixed0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODERipemd160_3_prefixed0Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CALLCODERipemd160_3_prefixed0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_callcode_ripemd160_3_prefixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_ripemd160_3_prefixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,41 +48,40 @@ def test_callcode_ripemd160_3_prefixed0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x00f34578907f) [[ 2 ]] (CALLCODE 6000 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x1770,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x1770,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x063102841b53cea1be51eba298d1b86b90f7c071"),  # noqa: E501
+        address=Address(0x063102841B53CEA1BE51EBA298D1B86B90F7C071),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x316750573F9BE26BC17727B47CACEDBD0AB3E6CA,
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_4.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_4.py
index c1b864a44a6..1a1f003383b 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_4.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_4.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_ripemd160_4.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CALLCODERipemd160_4Filler.json
+state_tests/stPreCompiledContracts2/CALLCODERipemd160_4Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODERipemd160_4Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODERipemd160_4Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_callcode_ripemd160_4(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_ripemd160_4."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,44 +46,43 @@ def test_callcode_ripemd160_4(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALLCODE 720 3 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x2D0,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x2D0,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x6e9a87c7b4f3d629df2f099546d9250f1ccd92af"),  # noqa: E501
+        address=Address(0x6E9A87C7B4F3D629DF2F099546D9250F1CCD92AF),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x1CF4E77F5966E13E109703CD8A0DF7CEDA7F3DC3,
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_4_gas719.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_4_gas719.py
index fd850f33f9f..ccfc5a27418 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_4_gas719.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_4_gas719.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_ripemd160_4_gas719.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODERipemd160_4_gas719Filler.json
+state_tests/stPreCompiledContracts2/CALLCODERipemd160_4_gas719Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODERipemd160_4_gas719Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CALLCODERipemd160_4_gas719Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_callcode_ripemd160_4_gas719(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_ripemd160_4_gas719."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,44 +48,43 @@ def test_callcode_ripemd160_4_gas719(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALLCODE 719 3 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x2CF,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x2CF,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xe54144e08b2faa0fb551d5df635711386fd3e8f2"),  # noqa: E501
+        address=Address(0xE54144E08B2FAA0FB551D5DF635711386FD3E8F2),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_5.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_5.py
index 54d53512024..4c0721cfd12 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_5.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_ripemd160_5.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_ripemd160_5.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CALLCODERipemd160_5Filler.json
+state_tests/stPreCompiledContracts2/CALLCODERipemd160_5Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODERipemd160_5Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODERipemd160_5Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_callcode_ripemd160_5(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_ripemd160_5."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,44 +46,43 @@ def test_callcode_ripemd160_5(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALLCODE 6000 3 0 0 1000000 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x1770,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xF4240,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x1770,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xF4240,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x445f6977e8026d56e8b9a36b4ce7591ef0b9493a"),  # noqa: E501
+        address=Address(0x445F6977E8026D56E8B9A36B4CE7591EF0B9493A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_0.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_0.py
index 6603709f380..b1a4cf62997 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_0.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_sha256_0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CALLCODESha256_0Filler.json
+state_tests/stPreCompiledContracts2/CALLCODESha256_0Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODESha256_0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODESha256_0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_callcode_sha256_0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_sha256_0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,35 +47,35 @@ def test_callcode_sha256_0(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x1)
-            + Op.CALLCODE(
-                gas=0xFF,
-                address=0x2,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x20,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-        ),
+    # Source: hex
+    # 0x600160005260206000602060006000600260fff2600051600055
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x1)
+        + Op.CALLCODE(
+            gas=0xFF,
+            address=0x2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x20,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0)),
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xfac135cdecd64b72cda12c2b4764e9d4e474de3e"),  # noqa: E501
+        address=Address(0xFAC135CDECD64B72CDA12C2B4764E9D4E474DE3E),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xEC4916DD28FC4C10D78E287CA5D9CC51EE1AE73CBFDE08C6B37324CBFAAC8BC5,  # noqa: E501
             },
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_1.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_1.py
index e4d7d90dd94..3aca9583c81 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_1.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_sha256_1.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CALLCODESha256_1Filler.json
+state_tests/stPreCompiledContracts2/CALLCODESha256_1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODESha256_1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODESha256_1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_callcode_sha256_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_sha256_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,40 +46,39 @@ def test_callcode_sha256_1(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { [[ 2 ]] (CALLCODE 500 2 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x1F4,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x1F4,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xc4009bc3b312ce413bfb8734800aa7b54261856d"),  # noqa: E501
+        address=Address(0xC4009BC3B312CE413BFB8734800AA7B54261856D),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xE3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_1_nonzero_value.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_1_nonzero_value.py
index 5ffd5bed632..88e216e0abd 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_1_nonzero_value.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_1_nonzero_value.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_sha256_1_nonzero_value.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODESha256_1_nonzeroValueFiller.json
+state_tests/stPreCompiledContracts2/CALLCODESha256_1_nonzeroValueFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODESha256_1_nonzeroValueFiller.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CALLCODESha256_1_nonzeroValueFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_callcode_sha256_1_nonzero_value(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_sha256_1_nonzero_value."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,40 +48,39 @@ def test_callcode_sha256_1_nonzero_value(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { [[ 2 ]] (CALLCODE 200000 2 0x13 0 0 0 32) [[ 0 ]] (MLOAD 0)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x30D40,
-                    address=0x2,
-                    value=0x13,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x30D40,
+                address=0x2,
+                value=0x13,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xBEBC200,
         nonce=0,
-        address=Address("0xa32d9ac4a5ba456f9e539ac5c756230eebc72f85"),  # noqa: E501
+        address=Address(0xA32D9AC4A5BA456F9E539AC5C756230EEBC72F85),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xE3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_2.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_2.py
index d3bd5d575aa..83fb69530c9 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_2.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_sha256_2.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CALLCODESha256_2Filler.json
+state_tests/stPreCompiledContracts2/CALLCODESha256_2Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODESha256_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODESha256_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_callcode_sha256_2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_sha256_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,41 +46,40 @@ def test_callcode_sha256_2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 5 0xf34578907f) [[ 2 ]] (CALLCODE 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x5, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x1F4,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x5, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x1F4,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x49edfd0547a55d03ffb882894166fb4e19bce699"),  # noqa: E501
+        address=Address(0x49EDFD0547A55D03FFB882894166FB4E19BCE699),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xCB39B3BDE22925B2F931111130C774761D8895E0E08437C9B396C1E97D10F34D,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_3.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_3.py
index 8264867b622..79347e7dbfb 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_3.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_3.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_sha256_3.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CALLCODESha256_3Filler.json
+state_tests/stPreCompiledContracts2/CALLCODESha256_3Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODESha256_3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODESha256_3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_callcode_sha256_3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_sha256_3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,41 +46,40 @@ def test_callcode_sha256_3(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xf34578907f) [[ 2 ]] (CALLCODE 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x1F4,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x1F4,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x66add49a7d6964132dee6f9c01a7ce445976d7f1"),  # noqa: E501
+        address=Address(0x66ADD49A7D6964132DEE6F9C01A7CE445976D7F1),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x7392925565D67BE8E9620AACBCFAECD8CB6EC58D709D25DA9ECCF1D08A41CE35,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_3_postfix0.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_3_postfix0.py
index 5a67925acf2..c924cc8ed2b 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_3_postfix0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_3_postfix0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_sha256_3_postfix0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODESha256_3_postfix0Filler.json
+state_tests/stPreCompiledContracts2/CALLCODESha256_3_postfix0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODESha256_3_postfix0Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CALLCODESha256_3_postfix0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_callcode_sha256_3_postfix0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_sha256_3_postfix0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,41 +48,40 @@ def test_callcode_sha256_3_postfix0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xf34578907f00) [[ 2 ]] (CALLCODE 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F00)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x1F4,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F00)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x1F4,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x47623157953751c765b038fea97f26122ee130ca"),  # noqa: E501
+        address=Address(0x47623157953751C765B038FEA97F26122EE130CA),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x3B745A1C00D035C334F358D007A430E4CF0AE63AA0556FB05529706DE546464D,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_3_prefix0.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_3_prefix0.py
index 2a56d5c0414..b052e6d0650 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_3_prefix0.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_3_prefix0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_sha256_3_prefix0.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODESha256_3_prefix0Filler.json
+state_tests/stPreCompiledContracts2/CALLCODESha256_3_prefix0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODESha256_3_prefix0Filler.json",  # noqa: E501
+        "state_tests/stPreCompiledContracts2/CALLCODESha256_3_prefix0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_callcode_sha256_3_prefix0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_sha256_3_prefix0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,41 +48,40 @@ def test_callcode_sha256_3_prefix0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x00f34578907f) [[ 2 ]] (CALLCODE 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x1F4,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x1F4,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x350856cb8740c7a9f14de1d4901111246cdba0b5"),  # noqa: E501
+        address=Address(0x350856CB8740C7A9F14DE1D4901111246CDBA0B5),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x7392925565D67BE8E9620AACBCFAECD8CB6EC58D709D25DA9ECCF1D08A41CE35,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_4.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_4.py
index 563763ae184..d69405bd039 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_4.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_4.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_sha256_4.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CALLCODESha256_4Filler.json
+state_tests/stPreCompiledContracts2/CALLCODESha256_4Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODESha256_4Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODESha256_4Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_callcode_sha256_4(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_sha256_4."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,44 +46,43 @@ def test_callcode_sha256_4(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALLCODE 100 2 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x64,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x64,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x081eb2e67904436211eeef7b37055d5a08bf76b1"),  # noqa: E501
+        address=Address(0x081EB2E67904436211EEEF7B37055D5A08BF76B1),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xAF9613760F72635FBDB44A5A0A63C39F12AF30F950A6EE5C971BE188E89C4051,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_4_gas99.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_4_gas99.py
index 42090a34551..07205685dff 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_4_gas99.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_4_gas99.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_sha256_4_gas99.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2
-CALLCODESha256_4_gas99Filler.json
+state_tests/stPreCompiledContracts2/CALLCODESha256_4_gas99Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODESha256_4_gas99Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODESha256_4_gas99Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,8 +31,8 @@ def test_callcode_sha256_4_gas99(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_sha256_4_gas99."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,44 +46,43 @@ def test_callcode_sha256_4_gas99(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALLCODE 99 2 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x63,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x63,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xbdc43a81e62f216d623d3e91f1f5fe1e3730a068"),  # noqa: E501
+        address=Address(0xBDC43A81E62F216D623D3E91F1F5FE1E3730A068),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xAF9613760F72635FBDB44A5A0A63C39F12AF30F950A6EE5C971BE188E89C4051,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_5.py b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_5.py
index 5d23aa925af..9f4fb5580b6 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_5.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_callcode_sha256_5.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_callcode_sha256_5.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/CALLCODESha256_5Filler.json
+state_tests/stPreCompiledContracts2/CALLCODESha256_5Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/CALLCODESha256_5Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/CALLCODESha256_5Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_callcode_sha256_5(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_callcode_sha256_5."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,44 +46,43 @@ def test_callcode_sha256_5(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALLCODE 600 2 0 0 1000000 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x258,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xF4240,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x258,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xF4240,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x12d19aa9c20419bf0656fc7a93642f9cafc744f4"),  # noqa: E501
+        address=Address(0x12D19AA9C20419BF0656FC7A93642F9CAFC744F4),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
diff --git a/tests/ported_static/stPreCompiledContracts2/test_ecrecover_short_buff.py b/tests/ported_static/stPreCompiledContracts2/test_ecrecover_short_buff.py
index 0051a63ed20..cffcc678170 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_ecrecover_short_buff.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_ecrecover_short_buff.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_ecrecover_short_buff.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/ecrecoverShortBuffFiller.yml
+state_tests/stPreCompiledContracts2/ecrecoverShortBuffFiller.yml
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/ecrecoverShortBuffFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/ecrecoverShortBuffFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,9 @@ def test_ecrecover_short_buff(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_ecrecover_short_buff."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,7 +48,8 @@ def test_ecrecover_short_buff(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   let maxLength := 0xA0
     #
@@ -78,94 +79,97 @@ def test_ecrecover_short_buff(
     #      // The expected retval is one, so to avoid specifying every length
     #      // in the expect: section we subtract one.
     #      sstore(len, sub(sload(len), 1))
-    #
-    # ... (4 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0xA0]
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.LT(Op.DUP2, Op.DUP2))
-            + Op.POP
-            + Op.MSTORE(offset=Op.DUP1, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x1B)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x184870A8E4FAA6065DDF65C873935D3E48E3D1C7B7853F25CD79B8247F771910,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x226140B6B66554C7FCFA38589E433CC148EBE5C8482EB3093AB1D9A932C96F58,  # noqa: E501
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x67, condition=Op.LT(Op.DUP2, Op.DUP2))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.DUP1
-            + Op.PUSH1[0x20]
-            + Op.PUSH2[0x100]
-            + Op.PUSH1[0x1]
-            + Op.SWAP4
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.DUP7
-            + Op.GAS
-            + Op.CALL
-            + Op.DUP3
-            + Op.SWAP1
-            + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, 0x1000), value=Op.MLOAD(offset=0x100)
-            )
-            + Op.ADD
-            + Op.JUMP(pc=0x5F)
-            + Op.JUMPDEST
-            + Op.PUSH4[0xDEAD60A7]
-            + Op.SSTORE(key=Op.DUP3, value=Op.DUP1)
-            + Op.ADD(Op.DUP3, 0x1000)
-            + Op.SSTORE
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.JUMP(pc=0x4)
-        ),
+    # ... (5 more lines)
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0xA0]
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.LT(Op.DUP2, Op.DUP2))
+        + Op.POP
+        + Op.MSTORE(offset=Op.DUP1, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x1B)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x184870A8E4FAA6065DDF65C873935D3E48E3D1C7B7853F25CD79B8247F771910,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x226140B6B66554C7FCFA38589E433CC148EBE5C8482EB3093AB1D9A932C96F58,  # noqa: E501
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x67, condition=Op.LT(Op.DUP2, Op.DUP2))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.DUP1
+        + Op.PUSH1[0x20]
+        + Op.PUSH2[0x100]
+        + Op.PUSH1[0x1]
+        + Op.SWAP4
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.DUP7
+        + Op.GAS
+        + Op.CALL
+        + Op.DUP3
+        + Op.SWAP1
+        + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
+        + Op.SSTORE(key=Op.ADD(Op.DUP3, 0x1000), value=Op.MLOAD(offset=0x100))
+        + Op.ADD
+        + Op.JUMP(pc=0x5F)
+        + Op.JUMPDEST
+        + Op.PUSH4[0xDEAD60A7]
+        + Op.SSTORE(key=Op.DUP3, value=Op.DUP1)
+        + Op.ADD(Op.DUP3, 0x1000)
+        + Op.SSTORE
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.JUMP(pc=0x4),
         storage={
-            0x0: 0x60A7,
-            0x11: 0x60A7,
-            0x22: 0x60A7,
-            0x33: 0x60A7,
-            0x44: 0x60A7,
-            0x55: 0x60A7,
-            0x66: 0x60A7,
-            0x77: 0x60A7,
-            0x80: 0x60A7,
-            0x99: 0x60A7,
-            0x1000: 0x60A7,
-            0x1011: 0x60A7,
-            0x1022: 0x60A7,
-            0x1033: 0x60A7,
-            0x1044: 0x60A7,
-            0x1055: 0x60A7,
-            0x1066: 0x60A7,
-            0x1077: 0x60A7,
-            0x1080: 0x60A7,
-            0x1099: 0x60A7,
+            0: 24743,
+            17: 24743,
+            34: 24743,
+            51: 24743,
+            68: 24743,
+            85: 24743,
+            102: 24743,
+            119: 24743,
+            128: 24743,
+            153: 24743,
+            4096: 24743,
+            4113: 24743,
+            4130: 24743,
+            4147: 24743,
+            4164: 24743,
+            4181: 24743,
+            4198: 24743,
+            4215: 24743,
+            4224: 24743,
+            4249: 24743,
         },
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        nonce=1,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=contract_0,
+        data=Bytes("00"),
         gas_limit=7400000,
+        value=0x186A0,
         nonce=1,
-        value=100000,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
+                0: 0,
+                1: 0,
+                159: 0,
+                4096: 0,
+                4112: 0,
+                4144: 0,
+                4192: 0,
                 4193: 0x8E5817968F74FFB0255AE41EEFA6F89DD0183FA1,
                 4194: 0xB7529ED60A10291754A635ED9FD67C1723F4D83B,
                 4195: 0x669457CE81442F235FFC4123662BA14A72B3D68,
diff --git a/tests/ported_static/stPreCompiledContracts2/test_ecrecover_weird_v.py b/tests/ported_static/stPreCompiledContracts2/test_ecrecover_weird_v.py
index 7dc9cb8b71b..3a607960508 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_ecrecover_weird_v.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_ecrecover_weird_v.py
@@ -2,7 +2,7 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/ecrecoverWeirdVFiller.yml
+state_tests/stPreCompiledContracts2/ecrecoverWeirdVFiller.yml
 """
 
 import pytest
@@ -11,10 +11,16 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,360 +28,241 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/ecrecoverWeirdVFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/ecrecoverWeirdVFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004e541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000023ce354e1b07ba96e325aa4851999f07aabcb4471e49f0a0daafed98caab963f0379d9f3993cdd509f1bfba63dbd23dbdff879fb95203a5049f348a95ce8249f3b",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000024541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ebce354e1b07ba96e325aa4851999f07aabcb4471e49f0a0daafed98caab963f0379d9f3993cdd509f1bfba63dbd23dbdff879fb95203a5049f348a95ce8249f3b",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f9000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000ec541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ce354e1b07ba96e325aa4851999f07aabcb4471e49f0a0daafed98caab963f0379d9f3993cdd509f1bfba63dbd23dbdff879fb95203a5049f348a95ce8249f3b",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003ce354e1b07ba96e325aa4851999f07aabcb4471e49f0a0daafed98caab963f0379d9f3993cdd509f1bfba63dbd23dbdff879fb95203a5049f348a95ce8249f3b",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005ce354e1b07ba96e325aa4851999f07aabcb4471e49f0a0daafed98caab963f0379d9f3993cdd509f1bfba63dbd23dbdff879fb95203a5049f348a95ce8249f3b",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000006541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007ce354e1b07ba96e325aa4851999f07aabcb4471e49f0a0daafed98caab963f0379d9f3993cdd509f1bfba63dbd23dbdff879fb95203a5049f348a95ce8249f3b",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000008541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffce354e1b07ba96e325aa4851999f07aabcb4471e49f0a0daafed98caab963f0379d9f3993cdd509f1bfba63dbd23dbdff879fb95203a5049f348a95ce8249f3b",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000100541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010ffce354e1b07ba96e325aa4851999f07aabcb4471e49f0a0daafed98caab963f0379d9f3993cdd509f1bfba63dbd23dbdff879fb95203a5049f348a95ce8249f3b",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000001100541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100ffce354e1b07ba96e325aa4851999f07aabcb4471e49f0a0daafed98caab963f0379d9f3993cdd509f1bfba63dbd23dbdff879fb95203a5049f348a95ce8249f3b",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000010100541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f9daf5a779ae972f972197303d7b574746c7ef83eadac0f2791ad23db92e4c8e53000000000000000000000000000000000000000000000000000000000000002528ef61340bd939bc2195fe537567866003e1a15d3c71ff63e1590620aa63627667cbe9d8997f761aecb703304b3800ccf555c9f3dc64214b297fb1966a3b6d83",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000123456ffce354e1b07ba96e325aa4851999f07aabcb4471e49f0a0daafed98caab963f0379d9f3993cdd509f1bfba63dbd23dbdff879fb95203a5049f348a95ce8249f3b",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000012345700541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000deadbeef00ffce354e1b07ba96e325aa4851999f07aabcb4471e49f0a0daafed98caab963f0379d9f3993cdd509f1bfba63dbd23dbdff879fb95203a5049f348a95ce8249f3b",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000deadbeef0100541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000025ce354e1b07ba96e325aa4851999f07aabcb4471e49f0a0daafed98caab963f0379d9f3993cdd509f1bfba63dbd23dbdff879fb95203a5049f348a95ce8249f3b",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000026541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002fce354e1b07ba96e325aa4851999f07aabcb4471e49f0a0daafed98caab963f0379d9f3993cdd509f1bfba63dbd23dbdff879fb95203a5049f348a95ce8249f3b",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000030541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000039ce354e1b07ba96e325aa4851999f07aabcb4471e49f0a0daafed98caab963f0379d9f3993cdd509f1bfba63dbd23dbdff879fb95203a5049f348a95ce8249f3b",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000003a541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004dce354e1b07ba96e325aa4851999f07aabcb4471e49f0a0daafed98caab963f0379d9f3993cdd509f1bfba63dbd23dbdff879fb95203a5049f348a95ce8249f3b",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000007e570000000000000000000000000000000000000000000000000000000000007e570000000000000000000000000000000000000000000000000000000000007e570000000000000000000000000000000000000000000000000000000000007e57",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001c541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xB957B0DA344F6A17F0081D63BE7345A860E5B7A2,
-                    }
-                )
-            },
-        ),
-        (
-            "917694f9deaf0dead0600d0f00d00000000000000060a70000000000000f0ad0bad0beef000000000000000000000000000000000000000000000000000000000000001b8a41a35dfd03f28615dc64b7754457691c66bd73f630c7423280282fa431a5be2d40decf11713d564fa2df10dea5eb2adf45455ed309b4c8cc6853e2498323f5",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xB957B0DA344F6A17F0081D63BE7345A860E5B7A2,
-                    }
-                )
-            },
-        ),
-        (
-            "917694f90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001bce354e1b07ba96e325aa4851999f07aabcb4471e49f0a0daafed98caab963f0379d9f3993cdd509f1bfba63dbd23dbdff879fb95203a5049f348a95ce8249f3b",  # noqa: E501
-            {
-                Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xB957B0DA344F6A17F0081D63BE7345A860E5B7A2,
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="good",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="good",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="good",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="fail",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="fail",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_ecrecover_weird_v(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
     sender = EOA(
         key=0xDE0C95357363DA5C1C5A73BD7C2781CA5C9FECC1014103B5E1D1E990AE8208EC
     )
@@ -389,8 +276,10 @@ def test_ecrecover_weird_v(
         gas_limit=71794957647893862,
     )
 
+    pre[coinbase] = Account(balance=0, nonce=1)
     pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    let ecRecoverAddr := 1
     #
@@ -408,38 +297,422 @@ def test_ecrecover_weird_v(
     #    sstore(1, mload(0x100))
     #    sstore(2, mload(0x120))
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH2[0x100]
-            + Op.DUP1
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x1]
-            + Op.MSTORE(offset=Op.DUP3, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x64))
-            + Op.GAS
-            + Op.SSTORE(key=0x0, value=Op.STATICCALL)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x100))
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x120))
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7, 0x1: 0x60A7, 0x2: 0x60A7},
-        address=Address("0x9121bb12ade6bf12796e6007b21a204e05b1bd49"),  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH2[0x100]
+        + Op.DUP1
+        + Op.PUSH1[0x80]
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x1]
+        + Op.MSTORE(offset=Op.DUP3, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x64))
+        + Op.GAS
+        + Op.SSTORE(key=0x0, value=Op.STATICCALL)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x100))
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x120))
+        + Op.STOP,
+        storage={0: 24743, 1: 24743, 2: 24743},
+        nonce=1,
+        address=Address(0x9121BB12ADE6BF12796E6007B21A204E05B1BD49),  # noqa: E501
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [
+                    0,
+                    4,
+                    5,
+                    6,
+                    7,
+                    8,
+                    9,
+                    10,
+                    11,
+                    12,
+                    13,
+                    14,
+                    15,
+                    16,
+                    17,
+                    18,
+                    19,
+                    20,
+                    21,
+                    22,
+                    23,
+                    24,
+                    25,
+                    26,
+                    27,
+                    28,
+                    29,
+                    30,
+                    31,
+                    32,
+                    33,
+                    34,
+                    35,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 0, 2: 0})},
+        },
+        {
+            "indexes": {"data": [1, 2, 3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: 1,
+                        1: 0xB957B0DA344F6A17F0081D63BE7345A860E5B7A2,
+                        2: 0,
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("917694f9")
+        + Hash(0x7E57)
+        + Hash(0x7E57)
+        + Hash(0x7E57)
+        + Hash(0x7E57),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0x1B)
+        + Hash(
+            0xCE354E1B07BA96E325AA4851999F07AABCB4471E49F0A0DAAFED98CAAB963F03
+        )
+        + Hash(
+            0x79D9F3993CDD509F1BFBA63DBD23DBDFF879FB95203A5049F348A95CE8249F3B
+        ),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0x1C)
+        + Hash(
+            0x541C4CE1565A646DDDE26E1B483A88A6500CE15BD24622492F05CDD18B97161D
+        )
+        + Hash(
+            0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5
+        ),
+        Bytes("917694f9")
+        + Hash(
+            0xDEAF0DEAD0600D0F00D00000000000000060A70000000000000F0AD0BAD0BEEF
+        )
+        + Hash(0x1B)
+        + Hash(
+            0x8A41A35DFD03F28615DC64B7754457691C66BD73F630C7423280282FA431A5BE
+        )
+        + Hash(
+            0x2D40DECF11713D564FA2DF10DEA5EB2ADF45455ED309B4C8CC6853E2498323F5
+        ),
+        Bytes("917694f9")
+        + Hash(
+            0xDAF5A779AE972F972197303D7B574746C7EF83EADAC0F2791AD23DB92E4C8E53
+        )
+        + Hash(0x25)
+        + Hash(
+            0x28EF61340BD939BC2195FE537567866003E1A15D3C71FF63E1590620AA636276
+        )
+        + Hash(
+            0x67CBE9D8997F761AECB703304B3800CCF555C9F3DC64214B297FB1966A3B6D83
+        ),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0x25)
+        + Hash(
+            0xCE354E1B07BA96E325AA4851999F07AABCB4471E49F0A0DAAFED98CAAB963F03
+        )
+        + Hash(
+            0x79D9F3993CDD509F1BFBA63DBD23DBDFF879FB95203A5049F348A95CE8249F3B
+        ),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0x26)
+        + Hash(
+            0x541C4CE1565A646DDDE26E1B483A88A6500CE15BD24622492F05CDD18B97161D
+        )
+        + Hash(
+            0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5
+        ),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0x2F)
+        + Hash(
+            0xCE354E1B07BA96E325AA4851999F07AABCB4471E49F0A0DAAFED98CAAB963F03
+        )
+        + Hash(
+            0x79D9F3993CDD509F1BFBA63DBD23DBDFF879FB95203A5049F348A95CE8249F3B
+        ),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0x30)
+        + Hash(
+            0x541C4CE1565A646DDDE26E1B483A88A6500CE15BD24622492F05CDD18B97161D
+        )
+        + Hash(
+            0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5
+        ),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0x39)
+        + Hash(
+            0xCE354E1B07BA96E325AA4851999F07AABCB4471E49F0A0DAAFED98CAAB963F03
+        )
+        + Hash(
+            0x79D9F3993CDD509F1BFBA63DBD23DBDFF879FB95203A5049F348A95CE8249F3B
+        ),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0x3A)
+        + Hash(
+            0x541C4CE1565A646DDDE26E1B483A88A6500CE15BD24622492F05CDD18B97161D
+        )
+        + Hash(
+            0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5
+        ),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0x4D)
+        + Hash(
+            0xCE354E1B07BA96E325AA4851999F07AABCB4471E49F0A0DAAFED98CAAB963F03
+        )
+        + Hash(
+            0x79D9F3993CDD509F1BFBA63DBD23DBDFF879FB95203A5049F348A95CE8249F3B
+        ),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0x4E)
+        + Hash(
+            0x541C4CE1565A646DDDE26E1B483A88A6500CE15BD24622492F05CDD18B97161D
+        )
+        + Hash(
+            0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5
+        ),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0x23)
+        + Hash(
+            0xCE354E1B07BA96E325AA4851999F07AABCB4471E49F0A0DAAFED98CAAB963F03
+        )
+        + Hash(
+            0x79D9F3993CDD509F1BFBA63DBD23DBDFF879FB95203A5049F348A95CE8249F3B
+        ),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0x24)
+        + Hash(
+            0x541C4CE1565A646DDDE26E1B483A88A6500CE15BD24622492F05CDD18B97161D
+        )
+        + Hash(
+            0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5
+        ),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0xEB)
+        + Hash(
+            0xCE354E1B07BA96E325AA4851999F07AABCB4471E49F0A0DAAFED98CAAB963F03
+        )
+        + Hash(
+            0x79D9F3993CDD509F1BFBA63DBD23DBDFF879FB95203A5049F348A95CE8249F3B
+        ),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0xEC)
+        + Hash(
+            0x541C4CE1565A646DDDE26E1B483A88A6500CE15BD24622492F05CDD18B97161D
+        )
+        + Hash(
+            0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5
+        ),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0x0)
+        + Hash(
+            0x541C4CE1565A646DDDE26E1B483A88A6500CE15BD24622492F05CDD18B97161D
+        )
+        + Hash(
+            0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5
+        ),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0x1)
+        + Hash(
+            0xCE354E1B07BA96E325AA4851999F07AABCB4471E49F0A0DAAFED98CAAB963F03
+        )
+        + Hash(
+            0x79D9F3993CDD509F1BFBA63DBD23DBDFF879FB95203A5049F348A95CE8249F3B
+        ),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(
+            0x541C4CE1565A646DDDE26E1B483A88A6500CE15BD24622492F05CDD18B97161D
+        )
+        + Hash(
+            0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5
+        ),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0x3)
+        + Hash(
+            0xCE354E1B07BA96E325AA4851999F07AABCB4471E49F0A0DAAFED98CAAB963F03
+        )
+        + Hash(
+            0x79D9F3993CDD509F1BFBA63DBD23DBDFF879FB95203A5049F348A95CE8249F3B
+        ),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0x4)
+        + Hash(
+            0x541C4CE1565A646DDDE26E1B483A88A6500CE15BD24622492F05CDD18B97161D
+        )
+        + Hash(
+            0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5
+        ),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0x5)
+        + Hash(
+            0xCE354E1B07BA96E325AA4851999F07AABCB4471E49F0A0DAAFED98CAAB963F03
+        )
+        + Hash(
+            0x79D9F3993CDD509F1BFBA63DBD23DBDFF879FB95203A5049F348A95CE8249F3B
+        ),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0x6)
+        + Hash(
+            0x541C4CE1565A646DDDE26E1B483A88A6500CE15BD24622492F05CDD18B97161D
+        )
+        + Hash(
+            0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5
+        ),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0x7)
+        + Hash(
+            0xCE354E1B07BA96E325AA4851999F07AABCB4471E49F0A0DAAFED98CAAB963F03
+        )
+        + Hash(
+            0x79D9F3993CDD509F1BFBA63DBD23DBDFF879FB95203A5049F348A95CE8249F3B
+        ),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0x8)
+        + Hash(
+            0x541C4CE1565A646DDDE26E1B483A88A6500CE15BD24622492F05CDD18B97161D
+        )
+        + Hash(
+            0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5
+        ),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0xFF)
+        + Hash(
+            0xCE354E1B07BA96E325AA4851999F07AABCB4471E49F0A0DAAFED98CAAB963F03
+        )
+        + Hash(
+            0x79D9F3993CDD509F1BFBA63DBD23DBDFF879FB95203A5049F348A95CE8249F3B
+        ),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0x100)
+        + Hash(
+            0x541C4CE1565A646DDDE26E1B483A88A6500CE15BD24622492F05CDD18B97161D
+        )
+        + Hash(
+            0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5
+        ),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0x10FF)
+        + Hash(
+            0xCE354E1B07BA96E325AA4851999F07AABCB4471E49F0A0DAAFED98CAAB963F03
+        )
+        + Hash(
+            0x79D9F3993CDD509F1BFBA63DBD23DBDFF879FB95203A5049F348A95CE8249F3B
+        ),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0x1100)
+        + Hash(
+            0x541C4CE1565A646DDDE26E1B483A88A6500CE15BD24622492F05CDD18B97161D
+        )
+        + Hash(
+            0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5
+        ),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0x100FF)
+        + Hash(
+            0xCE354E1B07BA96E325AA4851999F07AABCB4471E49F0A0DAAFED98CAAB963F03
+        )
+        + Hash(
+            0x79D9F3993CDD509F1BFBA63DBD23DBDFF879FB95203A5049F348A95CE8249F3B
+        ),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0x10100)
+        + Hash(
+            0x541C4CE1565A646DDDE26E1B483A88A6500CE15BD24622492F05CDD18B97161D
+        )
+        + Hash(
+            0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5
+        ),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0x123456FF)
+        + Hash(
+            0xCE354E1B07BA96E325AA4851999F07AABCB4471E49F0A0DAAFED98CAAB963F03
+        )
+        + Hash(
+            0x79D9F3993CDD509F1BFBA63DBD23DBDFF879FB95203A5049F348A95CE8249F3B
+        ),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0x12345700)
+        + Hash(
+            0x541C4CE1565A646DDDE26E1B483A88A6500CE15BD24622492F05CDD18B97161D
+        )
+        + Hash(
+            0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5
+        ),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0xDEADBEEF00FF)
+        + Hash(
+            0xCE354E1B07BA96E325AA4851999F07AABCB4471E49F0A0DAAFED98CAAB963F03
+        )
+        + Hash(
+            0x79D9F3993CDD509F1BFBA63DBD23DBDFF879FB95203A5049F348A95CE8249F3B
+        ),
+        Bytes("917694f9")
+        + Hash(0x1)
+        + Hash(0xDEADBEEF0100)
+        + Hash(
+            0x541C4CE1565A646DDDE26E1B483A88A6500CE15BD24622492F05CDD18B97161D
+        )
+        + Hash(
+            0x1827E364C15CFA61DAB02339904B1E542F3939C6E8D6367D352026E71FFD6AF5
+        ),
+    ]
+    tx_gas = [16777216]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_20500.py b/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_20500.py
index dec21464b01..59e3af2c647 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_20500.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_20500.py
@@ -1,8 +1,8 @@
 """
-Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile, saves...
+Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile,...
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/modexp_0_0_0_20500Filler.json
+state_tests/stPreCompiledContracts2/modexp_0_0_0_20500Filler.json
 """
 
 import pytest
@@ -11,10 +11,16 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,69 +28,61 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/modexp_0_0_0_20500Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/modexp_0_0_0_20500Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (42540, {}),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
         ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
-        (
-            200000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            2,
+            0,
+            id="-g2",
+        ),
+        pytest.param(
+            0,
+            3,
+            0,
+            id="-g3",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_modexp_0_0_0_20500(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Puts the base 0, exponent 0 and modulus 0 into the MODEXP..."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
+    coinbase = Address(0x3535353535353535353535353535353535353535)
+    contract_0 = Address(0xC305C901078781C232A2A521C2AF7980F8385EE9)
+    contract_1 = Address(0x0000000000000000000000000000000000000001)
+    contract_2 = Address(0x0000000000000000000000000000000000000005)
+    contract_3 = Address(0x0000000000000000000000000000000000000008)
+    contract_4 = Address(0x0000000000000000000000000000000000000003)
+    contract_5 = Address(0x0000000000000000000000000000000000000006)
+    contract_6 = Address(0x0000000000000000000000000000000000000007)
+    contract_7 = Address(0x0000000000000000000000000000000000000004)
+    contract_8 = Address(0x0000000000000000000000000000000000000002)
     sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
+        key=0x44852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
     )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -95,338 +93,247 @@ def test_modexp_0_0_0_20500(
         gas_limit=100000000,
     )
 
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[coinbase] = Account(balance=0x201EE, nonce=0)
     pre[sender] = Account(balance=0xDE0B6B3A761FE12, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12B,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x84,
+    # Source: hex
+    # 0x
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=0x201EE,
+        nonce=0,
+        address=Address(0x3535353535353535353535353535353535353535),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000001),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000005),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000008),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000003),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000006),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000007),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000004),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000002),  # noqa: E501
+    )
+    # Source: hex
+    # 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.MSTORE(
+            offset=0x20, value=0x10000000000000000000000000000000000000000
+        )
+        + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80, value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
+        )
+        + Op.JUMPI(
+            pc=0x12B,
+            condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
+        )
+        + Op.JUMPI(
+            pc=Op.PC,
+            condition=Op.ISZERO(
+                Op.ISZERO(
+                    Op.GT(
+                        Op.CALLDATALOAD(
+                            offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4))
                         ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x5,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x240,
-                        ret_size=0x1,
-                    ),
+                        0x84,
+                    )
+                )
+            ),
+        )
+        + Op.CALLDATACOPY(
+            dest_offset=0x140,
+            offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
+            size=Op.ADD(
+                0x20,
+                Op.CALLDATALOAD(
+                    offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4))
                 ),
-            )
-            + Op.MSTORE(offset=0x220, value=0x1)
-            + Op.PUSH2[0x220]
-            + Op.PUSH1[0x21]
-            + Op.POP(
+            ),
+        )
+        + Op.JUMPI(
+            pc=Op.PC,
+            condition=Op.ISZERO(
                 Op.CALL(
-                    gas=0x15,
-                    address=0x4,
+                    gas=0x5F5E0FF,
+                    address=0x5,
                     value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x280,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x280]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
+                    args_offset=0x160,
+                    args_size=Op.MLOAD(offset=0x140),
+                    ret_offset=0x240,
+                    ret_size=0x1,
+                )
+            ),
+        )
+        + Op.MSTORE(offset=0x220, value=0x1)
+        + Op.PUSH2[0x220]
+        + Op.PUSH1[0x21]
+        + Op.POP(
+            Op.CALL(
+                gas=0x15,
+                address=0x4,
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=Op.DUP3,
+                ret_offset=0x280,
+                ret_size=Op.DUP1,
             )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x280]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000006000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000"
-        ),
-        gas_limit=tx_gas_limit,
+        )
+        + Op.POP * 2
+        + Op.PUSH2[0x280]
+        + Op.SHA3(offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1))
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SSTORE
+        + Op.PUSH2[0x280]
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
+        + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
+        + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
+        + Op.SWAP1
+        + Op.POP
+        + Op.SUB(Op.DUP3, 0x20)
+        + Op.RETURN
+        + Op.POP
+        + Op.STOP
+        + Op.JUMPDEST,
         nonce=1,
+        address=Address(0xC305C901078781C232A2A521C2AF7980F8385EE9),  # noqa: E501
     )
 
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/modexp_0_0_0_20500Filler.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (42540, {}),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A  # noqa: E501
-                    }
-                )
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": 0, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(storage={}, code=b"", balance=1, nonce=0),
+                contract_0: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b"  # noqa: E501
+                    ),
+                    balance=0,
+                    nonce=1,
+                ),
+                contract_2: Account(storage={}, code=b"", balance=1, nonce=0),
+                contract_3: Account(storage={}, code=b"", balance=1, nonce=0),
+                contract_4: Account(storage={}, code=b"", balance=1, nonce=0),
+                sender: Account(storage={}, code=b"", nonce=2),
+                contract_5: Account(storage={}, code=b"", balance=1, nonce=0),
+                contract_6: Account(storage={}, code=b"", balance=1, nonce=0),
+                contract_7: Account(storage={}, code=b"", balance=1, nonce=0),
+                coinbase: Account(storage={}, code=b"", nonce=0),
+                contract_8: Account(storage={}, code=b"", balance=1, nonce=0),
             },
-        ),
-        (
-            200000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
+        },
+        {
+            "indexes": {"data": 0, "gas": [1, 2, 3], "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(storage={}, code=b"", balance=1, nonce=0),
+                contract_0: Account(
                     storage={
-                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A  # noqa: E501
-                    }
-                )
+                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A,  # noqa: E501
+                    },
+                    code=bytes.fromhex(
+                        "600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b"  # noqa: E501
+                    ),
+                    balance=0,
+                    nonce=1,
+                ),
+                contract_2: Account(storage={}, code=b"", balance=1, nonce=0),
+                contract_3: Account(storage={}, code=b"", balance=1, nonce=0),
+                contract_4: Account(storage={}, code=b"", balance=1, nonce=0),
+                sender: Account(storage={}, code=b"", nonce=2),
+                contract_5: Account(storage={}, code=b"", balance=1, nonce=0),
+                contract_6: Account(storage={}, code=b"", balance=1, nonce=0),
+                contract_7: Account(storage={}, code=b"", balance=1, nonce=0),
+                coinbase: Account(storage={}, code=b"", nonce=0),
+                contract_8: Account(storage={}, code=b"", balance=1, nonce=0),
             },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_modexp_0_0_0_20500_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the base 0, exponent 0 and modulus 0 into the MODEXP..."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
+        },
+    ]
 
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
 
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[coinbase] = Account(balance=0x201EE, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A761FE12, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12B,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x84,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x5,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x240,
-                        ret_size=0x1,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x220, value=0x1)
-            + Op.PUSH2[0x220]
-            + Op.PUSH1[0x21]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x15,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x280,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x280]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x280]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
+    tx_data = [
+        Bytes("30c8d1da")
+        + Hash(0x20)
+        + Hash(0x60)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0),
+    ]
+    tx_gas = [42540, 90000, 110000, 200000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000006000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000"
-        ),
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_22000.py b/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_22000.py
index d5b10b8deaa..9390b7eb00c 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_22000.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_22000.py
@@ -1,8 +1,8 @@
 """
-Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile, saves...
+Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile,...
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/modexp_0_0_0_22000Filler.json
+state_tests/stPreCompiledContracts2/modexp_0_0_0_22000Filler.json
 """
 
 import pytest
@@ -11,10 +11,13 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,41 +25,61 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/modexp_0_0_0_22000Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/modexp_0_0_0_22000Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
 @pytest.mark.parametrize(
-    "tx_gas_limit",
+    "d, g, v",
     [
-        48136,
-        90000,
-        110000,
-        200000,
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="-g2",
+        ),
+        pytest.param(
+            0,
+            3,
+            0,
+            id="-g3",
+        ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_modexp_0_0_0_22000(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Puts the base 0, exponent 0 and modulus 0 into the MODEXP..."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
+    coinbase = Address(0x3535353535353535353535353535353535353535)
+    contract_0 = Address(0xC305C901078781C232A2A521C2AF7980F8385EE9)
+    contract_1 = Address(0x0000000000000000000000000000000000000001)
+    contract_2 = Address(0x0000000000000000000000000000000000000005)
+    contract_3 = Address(0x0000000000000000000000000000000000000008)
+    contract_4 = Address(0x0000000000000000000000000000000000000003)
+    contract_5 = Address(0x0000000000000000000000000000000000000006)
+    contract_6 = Address(0x0000000000000000000000000000000000000007)
+    contract_7 = Address(0x0000000000000000000000000000000000000004)
+    contract_8 = Address(0x0000000000000000000000000000000000000002)
     sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
+        key=0x44852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
     )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -67,322 +90,210 @@ def test_modexp_0_0_0_22000(
         gas_limit=100000000,
     )
 
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[coinbase] = Account(balance=0x201EE, nonce=0)
     pre[sender] = Account(balance=0xDE0B6B3A761FE12, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12B,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x84,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x5,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x240,
-                        ret_size=0x1,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x220, value=0x1)
-            + Op.PUSH2[0x220]
-            + Op.PUSH1[0x21]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x15,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x280,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x280]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x280]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
+    # Source: hex
+    # 0x
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=0x201EE,
+        nonce=0,
+        address=Address(0x3535353535353535353535353535353535353535),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000006000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=1,
+    # Source: hex
+    # 0x
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000001),  # noqa: E501
     )
-
-    post = {
-        contract: Account(
-            storage={
-                0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A,  # noqa: E501
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/modexp_0_0_0_22000Filler.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.parametrize(
-    "tx_gas_limit",
-    [
-        48136,
-        90000,
-        110000,
-        200000,
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_modexp_0_0_0_22000_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-) -> None:
-    """Puts the base 0, exponent 0 and modulus 0 into the MODEXP..."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
+    # Source: hex
+    # 0x
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000005),  # noqa: E501
     )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
+    # Source: hex
+    # 0x
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000008),  # noqa: E501
     )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[coinbase] = Account(balance=0x201EE, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A761FE12, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12B,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x84,
+    # Source: hex
+    # 0x
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000003),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000006),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000007),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000004),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000002),  # noqa: E501
+    )
+    # Source: hex
+    # 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.MSTORE(
+            offset=0x20, value=0x10000000000000000000000000000000000000000
+        )
+        + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80, value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
+        )
+        + Op.JUMPI(
+            pc=0x12B,
+            condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
+        )
+        + Op.JUMPI(
+            pc=Op.PC,
+            condition=Op.ISZERO(
+                Op.ISZERO(
+                    Op.GT(
+                        Op.CALLDATALOAD(
+                            offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4))
                         ),
-                    ),
+                        0x84,
+                    )
+                )
+            ),
+        )
+        + Op.CALLDATACOPY(
+            dest_offset=0x140,
+            offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
+            size=Op.ADD(
+                0x20,
+                Op.CALLDATALOAD(
+                    offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4))
                 ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x5,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x240,
-                        ret_size=0x1,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x220, value=0x1)
-            + Op.PUSH2[0x220]
-            + Op.PUSH1[0x21]
-            + Op.POP(
+            ),
+        )
+        + Op.JUMPI(
+            pc=Op.PC,
+            condition=Op.ISZERO(
                 Op.CALL(
-                    gas=0x15,
-                    address=0x4,
+                    gas=0x5F5E0FF,
+                    address=0x5,
                     value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x280,
-                    ret_size=Op.DUP1,
-                ),
+                    args_offset=0x160,
+                    args_size=Op.MLOAD(offset=0x140),
+                    ret_offset=0x240,
+                    ret_size=0x1,
+                )
+            ),
+        )
+        + Op.MSTORE(offset=0x220, value=0x1)
+        + Op.PUSH2[0x220]
+        + Op.PUSH1[0x21]
+        + Op.POP(
+            Op.CALL(
+                gas=0x15,
+                address=0x4,
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=Op.DUP3,
+                ret_offset=0x280,
+                ret_size=Op.DUP1,
             )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x280]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x280]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
+        )
+        + Op.POP * 2
+        + Op.PUSH2[0x280]
+        + Op.SHA3(offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1))
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SSTORE
+        + Op.PUSH2[0x280]
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
+        + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
+        + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
+        + Op.SWAP1
+        + Op.POP
+        + Op.SUB(Op.DUP3, 0x20)
+        + Op.RETURN
+        + Op.POP
+        + Op.STOP
+        + Op.JUMPDEST,
+        nonce=1,
+        address=Address(0xC305C901078781C232A2A521C2AF7980F8385EE9),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes("30c8d1da")
+        + Hash(0x20)
+        + Hash(0x60)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0),
+    ]
+    tx_gas = [48136, 90000, 110000, 200000]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000006000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000"
-        ),
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_1: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_0: Account(
             storage={
                 0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A,  # noqa: E501
             },
+            balance=0,
+            nonce=1,
         ),
+        contract_2: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_3: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_4: Account(storage={}, code=b"", balance=1, nonce=0),
+        sender: Account(nonce=2),
+        contract_5: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_6: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_7: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_8: Account(storage={}, code=b"", balance=1, nonce=0),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_25000.py b/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_25000.py
index a216340bb3e..9ae5ef9d781 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_25000.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_25000.py
@@ -1,8 +1,8 @@
 """
-Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile, saves...
+Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile,...
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/modexp_0_0_0_25000Filler.json
+state_tests/stPreCompiledContracts2/modexp_0_0_0_25000Filler.json
 """
 
 import pytest
@@ -11,10 +11,13 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,41 +25,61 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/modexp_0_0_0_25000Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/modexp_0_0_0_25000Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
 @pytest.mark.parametrize(
-    "tx_gas_limit",
+    "d, g, v",
     [
-        47040,
-        90000,
-        110000,
-        200000,
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="-g2",
+        ),
+        pytest.param(
+            0,
+            3,
+            0,
+            id="-g3",
+        ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_modexp_0_0_0_25000(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Puts the base 0, exponent 0 and modulus 0 into the MODEXP..."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
+    coinbase = Address(0x3535353535353535353535353535353535353535)
+    contract_0 = Address(0xC305C901078781C232A2A521C2AF7980F8385EE9)
+    contract_1 = Address(0x0000000000000000000000000000000000000001)
+    contract_2 = Address(0x0000000000000000000000000000000000000005)
+    contract_3 = Address(0x0000000000000000000000000000000000000008)
+    contract_4 = Address(0x0000000000000000000000000000000000000003)
+    contract_5 = Address(0x0000000000000000000000000000000000000006)
+    contract_6 = Address(0x0000000000000000000000000000000000000007)
+    contract_7 = Address(0x0000000000000000000000000000000000000004)
+    contract_8 = Address(0x0000000000000000000000000000000000000002)
     sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
+        key=0x44852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
     )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -67,322 +90,210 @@ def test_modexp_0_0_0_25000(
         gas_limit=100000000,
     )
 
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[coinbase] = Account(balance=0x201EE, nonce=0)
     pre[sender] = Account(balance=0xDE0B6B3A761FE12, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12B,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x84,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x5,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x240,
-                        ret_size=0x1,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x220, value=0x1)
-            + Op.PUSH2[0x220]
-            + Op.PUSH1[0x21]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x15,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x280,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x280]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x280]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
+    # Source: hex
+    # 0x
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=0x201EE,
+        nonce=0,
+        address=Address(0x3535353535353535353535353535353535353535),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000006000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=1,
+    # Source: hex
+    # 0x
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000001),  # noqa: E501
     )
-
-    post = {
-        contract: Account(
-            storage={
-                0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A,  # noqa: E501
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/modexp_0_0_0_25000Filler.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.parametrize(
-    "tx_gas_limit",
-    [
-        47040,
-        90000,
-        110000,
-        200000,
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_modexp_0_0_0_25000_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-) -> None:
-    """Puts the base 0, exponent 0 and modulus 0 into the MODEXP..."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
+    # Source: hex
+    # 0x
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000005),  # noqa: E501
     )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
+    # Source: hex
+    # 0x
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000008),  # noqa: E501
     )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[coinbase] = Account(balance=0x201EE, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A761FE12, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12B,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x84,
+    # Source: hex
+    # 0x
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000003),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000006),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000007),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000004),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000002),  # noqa: E501
+    )
+    # Source: hex
+    # 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.MSTORE(
+            offset=0x20, value=0x10000000000000000000000000000000000000000
+        )
+        + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80, value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
+        )
+        + Op.JUMPI(
+            pc=0x12B,
+            condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
+        )
+        + Op.JUMPI(
+            pc=Op.PC,
+            condition=Op.ISZERO(
+                Op.ISZERO(
+                    Op.GT(
+                        Op.CALLDATALOAD(
+                            offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4))
                         ),
-                    ),
+                        0x84,
+                    )
+                )
+            ),
+        )
+        + Op.CALLDATACOPY(
+            dest_offset=0x140,
+            offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
+            size=Op.ADD(
+                0x20,
+                Op.CALLDATALOAD(
+                    offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4))
                 ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x5,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x240,
-                        ret_size=0x1,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x220, value=0x1)
-            + Op.PUSH2[0x220]
-            + Op.PUSH1[0x21]
-            + Op.POP(
+            ),
+        )
+        + Op.JUMPI(
+            pc=Op.PC,
+            condition=Op.ISZERO(
                 Op.CALL(
-                    gas=0x15,
-                    address=0x4,
+                    gas=0x5F5E0FF,
+                    address=0x5,
                     value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x280,
-                    ret_size=Op.DUP1,
-                ),
+                    args_offset=0x160,
+                    args_size=Op.MLOAD(offset=0x140),
+                    ret_offset=0x240,
+                    ret_size=0x1,
+                )
+            ),
+        )
+        + Op.MSTORE(offset=0x220, value=0x1)
+        + Op.PUSH2[0x220]
+        + Op.PUSH1[0x21]
+        + Op.POP(
+            Op.CALL(
+                gas=0x15,
+                address=0x4,
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=Op.DUP3,
+                ret_offset=0x280,
+                ret_size=Op.DUP1,
             )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x280]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x280]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
+        )
+        + Op.POP * 2
+        + Op.PUSH2[0x280]
+        + Op.SHA3(offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1))
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SSTORE
+        + Op.PUSH2[0x280]
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
+        + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
+        + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
+        + Op.SWAP1
+        + Op.POP
+        + Op.SUB(Op.DUP3, 0x20)
+        + Op.RETURN
+        + Op.POP
+        + Op.STOP
+        + Op.JUMPDEST,
+        nonce=1,
+        address=Address(0xC305C901078781C232A2A521C2AF7980F8385EE9),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes("30c8d1da")
+        + Hash(0x20)
+        + Hash(0x60)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0),
+    ]
+    tx_gas = [47040, 90000, 110000, 200000]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000006000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000"
-        ),
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_1: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_0: Account(
             storage={
                 0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A,  # noqa: E501
             },
+            balance=0,
+            nonce=1,
         ),
+        contract_2: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_3: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_4: Account(storage={}, code=b"", balance=1, nonce=0),
+        sender: Account(nonce=2),
+        contract_5: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_6: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_7: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_8: Account(storage={}, code=b"", balance=1, nonce=0),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_35000.py b/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_35000.py
index 99559e6a161..89b4b07c0e8 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_35000.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_modexp_0_0_0_35000.py
@@ -1,8 +1,8 @@
 """
-Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile, saves...
+Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile,...
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/modexp_0_0_0_35000Filler.json
+state_tests/stPreCompiledContracts2/modexp_0_0_0_35000Filler.json
 """
 
 import pytest
@@ -11,10 +11,13 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,41 +25,61 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/modexp_0_0_0_35000Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/modexp_0_0_0_35000Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
 @pytest.mark.parametrize(
-    "tx_gas_limit",
+    "d, g, v",
     [
-        57040,
-        90000,
-        110000,
-        200000,
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="-g2",
+        ),
+        pytest.param(
+            0,
+            3,
+            0,
+            id="-g3",
+        ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_modexp_0_0_0_35000(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Puts the base 0, exponent 0 and modulus 0 into the MODEXP..."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
+    coinbase = Address(0x3535353535353535353535353535353535353535)
+    contract_0 = Address(0xC305C901078781C232A2A521C2AF7980F8385EE9)
+    contract_1 = Address(0x0000000000000000000000000000000000000001)
+    contract_2 = Address(0x0000000000000000000000000000000000000005)
+    contract_3 = Address(0x0000000000000000000000000000000000000008)
+    contract_4 = Address(0x0000000000000000000000000000000000000003)
+    contract_5 = Address(0x0000000000000000000000000000000000000006)
+    contract_6 = Address(0x0000000000000000000000000000000000000007)
+    contract_7 = Address(0x0000000000000000000000000000000000000004)
+    contract_8 = Address(0x0000000000000000000000000000000000000002)
     sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
+        key=0x44852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
     )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -67,322 +90,210 @@ def test_modexp_0_0_0_35000(
         gas_limit=100000000,
     )
 
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[coinbase] = Account(balance=0x201EE, nonce=0)
     pre[sender] = Account(balance=0xDE0B6B3A761FE12, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12B,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x84,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x5,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x240,
-                        ret_size=0x1,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x220, value=0x1)
-            + Op.PUSH2[0x220]
-            + Op.PUSH1[0x21]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x15,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x280,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x280]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x280]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
+    # Source: hex
+    # 0x
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=0x201EE,
+        nonce=0,
+        address=Address(0x3535353535353535353535353535353535353535),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000006000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=1,
+    # Source: hex
+    # 0x
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000001),  # noqa: E501
     )
-
-    post = {
-        contract: Account(
-            storage={
-                0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A,  # noqa: E501
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/modexp_0_0_0_35000Filler.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.parametrize(
-    "tx_gas_limit",
-    [
-        57040,
-        90000,
-        110000,
-        200000,
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_modexp_0_0_0_35000_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-) -> None:
-    """Puts the base 0, exponent 0 and modulus 0 into the MODEXP..."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
+    # Source: hex
+    # 0x
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000005),  # noqa: E501
     )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
+    # Source: hex
+    # 0x
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000008),  # noqa: E501
     )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[coinbase] = Account(balance=0x201EE, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A761FE12, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12B,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x84,
+    # Source: hex
+    # 0x
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000003),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000006),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000007),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000004),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000002),  # noqa: E501
+    )
+    # Source: hex
+    # 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.MSTORE(
+            offset=0x20, value=0x10000000000000000000000000000000000000000
+        )
+        + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80, value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
+        )
+        + Op.JUMPI(
+            pc=0x12B,
+            condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
+        )
+        + Op.JUMPI(
+            pc=Op.PC,
+            condition=Op.ISZERO(
+                Op.ISZERO(
+                    Op.GT(
+                        Op.CALLDATALOAD(
+                            offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4))
                         ),
-                    ),
+                        0x84,
+                    )
+                )
+            ),
+        )
+        + Op.CALLDATACOPY(
+            dest_offset=0x140,
+            offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
+            size=Op.ADD(
+                0x20,
+                Op.CALLDATALOAD(
+                    offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4))
                 ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x5,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x240,
-                        ret_size=0x1,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x220, value=0x1)
-            + Op.PUSH2[0x220]
-            + Op.PUSH1[0x21]
-            + Op.POP(
+            ),
+        )
+        + Op.JUMPI(
+            pc=Op.PC,
+            condition=Op.ISZERO(
                 Op.CALL(
-                    gas=0x15,
-                    address=0x4,
+                    gas=0x5F5E0FF,
+                    address=0x5,
                     value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x280,
-                    ret_size=Op.DUP1,
-                ),
+                    args_offset=0x160,
+                    args_size=Op.MLOAD(offset=0x140),
+                    ret_offset=0x240,
+                    ret_size=0x1,
+                )
+            ),
+        )
+        + Op.MSTORE(offset=0x220, value=0x1)
+        + Op.PUSH2[0x220]
+        + Op.PUSH1[0x21]
+        + Op.POP(
+            Op.CALL(
+                gas=0x15,
+                address=0x4,
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=Op.DUP3,
+                ret_offset=0x280,
+                ret_size=Op.DUP1,
             )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x280]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x280]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
+        )
+        + Op.POP * 2
+        + Op.PUSH2[0x280]
+        + Op.SHA3(offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1))
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.SSTORE
+        + Op.PUSH2[0x280]
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
+        + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
+        + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
+        + Op.SWAP1
+        + Op.POP
+        + Op.SUB(Op.DUP3, 0x20)
+        + Op.RETURN
+        + Op.POP
+        + Op.STOP
+        + Op.JUMPDEST,
+        nonce=1,
+        address=Address(0xC305C901078781C232A2A521C2AF7980F8385EE9),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes("30c8d1da")
+        + Hash(0x20)
+        + Hash(0x60)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0),
+    ]
+    tx_gas = [57040, 90000, 110000, 200000]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000006000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000"
-        ),
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_1: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_0: Account(
             storage={
                 0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A,  # noqa: E501
             },
+            balance=0,
+            nonce=1,
         ),
+        contract_2: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_3: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_4: Account(storage={}, code=b"", balance=1, nonce=0),
+        sender: Account(nonce=2),
+        contract_5: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_6: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_7: Account(storage={}, code=b"", balance=1, nonce=0),
+        contract_8: Account(storage={}, code=b"", balance=1, nonce=0),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stPreCompiledContracts2/test_modexp_random_input.py b/tests/ported_static/stPreCompiledContracts2/test_modexp_random_input.py
index 51e728bf222..beb5e9d3a55 100644
--- a/tests/ported_static/stPreCompiledContracts2/test_modexp_random_input.py
+++ b/tests/ported_static/stPreCompiledContracts2/test_modexp_random_input.py
@@ -2,81 +2,82 @@
 Fuzzed input discovered by Guido.
 
 Ported from:
-tests/static/state_tests/stPreCompiledContracts2/modexpRandomInputFiller.json
+state_tests/stPreCompiledContracts2/modexpRandomInputFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/modexpRandomInputFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stPreCompiledContracts2/modexpRandomInputFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "00000000000000000000000000000000000000000000000000000000000000e300000000000000000000000000000000000000000000000000",  # noqa: E501
-            710000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000e300000000000000000000000000000000000000000000000000",  # noqa: E501
-            7000000,
-            {},
-        ),
-        (
-            "00000000008000000000000000000000000000000000000000000000000000000000000400000000000000000000000a",  # noqa: E501
-            710000,
-            {},
-        ),
-        (
-            "00000000008000000000000000000000000000000000000000000000000000000000000400000000000000000000000a",  # noqa: E501
-            7000000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001147000000000000000000000000000000000000000000000000000000000061660350000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            710000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001147000000000000000000000000000000000000000000000000000000000061660350000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            7000000,
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
+        ),
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
+        ),
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3", "case4", "case5"],
 )
-@pytest.mark.pre_alloc_mutable
 def test_modexp_random_input(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Fuzzed input discovered by Guido."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x897B12D02D588D8A4FE16FF831CBD4459C6F62F8C845B0CCDD31CAF068C84A26
-    )
-    contract = Address("0x0000000000000000000000000000000000000005")
+    coinbase = Address(0x3535353535353535353535353535353535353535)
+    sender = pre.fund_eoa(amount=0x3635C9ADC5DEA00000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -87,182 +88,24 @@ def test_modexp_random_input(
         gas_limit=100000000,
     )
 
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/modexpRandomInputFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.valid_until("Prague")
-@pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
-    [
-        (
-            "00000000000000000000000000000000000000000000000000000000000000e300000000000000000000000000000000000000000000000000",  # noqa: E501
-            710000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000e300000000000000000000000000000000000000000000000000",  # noqa: E501
-            7000000,
-            {},
-        ),
-        (
-            "00000000008000000000000000000000000000000000000000000000000000000000000400000000000000000000000a",  # noqa: E501
-            710000,
-            {},
-        ),
-        (
-            "00000000008000000000000000000000000000000000000000000000000000000000000400000000000000000000000a",  # noqa: E501
-            7000000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001147000000000000000000000000000000000000000000000000000000000061660350000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            710000,
-            {},
+    tx_data = [
+        Bytes(
+            "00000000000000000000000000000000000000000000000000000000000000e300000000000000000000000000000000000000000000000000"  # noqa: E501
         ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001147000000000000000000000000000000000000000000000000000000000061660350000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            7000000,
-            {},
+        Bytes(
+            "00000000008000000000000000000000000000000000000000000000000000000000000400000000000000000000000a"  # noqa: E501
         ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4", "case5"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_modexp_random_input_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Fuzzed input discovered by Guido."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x897B12D02D588D8A4FE16FF831CBD4459C6F62F8C845B0CCDD31CAF068C84A26
-    )
-    contract = Address("0x0000000000000000000000000000000000000005")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stPreCompiledContracts2/modexpRandomInputFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
-    [
-        (
-            "00000000000000000000000000000000000000000000000000000000000000e300000000000000000000000000000000000000000000000000",  # noqa: E501
-            710000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000e300000000000000000000000000000000000000000000000000",  # noqa: E501
-            7000000,
-            {},
-        ),
-        (
-            "00000000008000000000000000000000000000000000000000000000000000000000000400000000000000000000000a",  # noqa: E501
-            710000,
-            {},
-        ),
-        (
-            "00000000008000000000000000000000000000000000000000000000000000000000000400000000000000000000000a",  # noqa: E501
-            7000000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001147000000000000000000000000000000000000000000000000000000000061660350000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            710000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001147000000000000000000000000000000000000000000000000000000000061660350000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            7000000,
-            {},
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4", "case5"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_modexp_random_input_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Fuzzed input discovered by Guido."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x897B12D02D588D8A4FE16FF831CBD4459C6F62F8C845B0CCDD31CAF068C84A26
-    )
-    contract = Address("0x0000000000000000000000000000000000000005")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+        Hash(0x0) + Hash(0x11470) + Hash(0x6166035) + Hash(0x8),
+    ]
+    tx_gas = [710000, 7000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
+        to=Address(0x0000000000000000000000000000000000000005),
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stQuadraticComplexityTest/__init__.py b/tests/ported_static/stQuadraticComplexityTest/__init__.py
index 9603d216632..c256c448d7d 100644
--- a/tests/ported_static/stQuadraticComplexityTest/__init__.py
+++ b/tests/ported_static/stQuadraticComplexityTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stQuadraticComplexityTest."""
+"""Ported static tests: stQuadraticComplexityTest."""  # noqa: N999
diff --git a/tests/ported_static/stQuadraticComplexityTest/test_call1_mb1024_calldepth.py b/tests/ported_static/stQuadraticComplexityTest/test_call1_mb1024_calldepth.py
index 243298bae72..228828eea8c 100644
--- a/tests/ported_static/stQuadraticComplexityTest/test_call1_mb1024_calldepth.py
+++ b/tests/ported_static/stQuadraticComplexityTest/test_call1_mb1024_calldepth.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_call1_mb1024_calldepth.
 
 Ported from:
-tests/static/state_tests/stQuadraticComplexityTest
-Call1MB1024CalldepthFiller.json
+state_tests/stQuadraticComplexityTest/Call1MB1024CalldepthFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,41 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stQuadraticComplexityTest/Call1MB1024CalldepthFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stQuadraticComplexityTest/Call1MB1024CalldepthFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (
-            250000000,
-            {
-                Address("0x9d15232f6851f9f3a88f88a3b358ed1579977a5a"): Account(
-                    storage={0: 69, 1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_call1_mb1024_calldepth(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0x2ab8257767339461506c0c67824cf17bc77b52ca")
+    """Test_call1_mb1024_calldepth."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -68,44 +70,70 @@ def test_call1_mb1024_calldepth(
         gas_limit=882500000000,
     )
 
-    pre[callee] = Account(balance=0xFFFFFFFFFFFFF, nonce=0)
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=0xFFFFFFFFFFFFF)  # noqa: F841
+    # Source: lll
     # { (def 'i 0x80) [[ 0 ]] (+ @@0 1) (if (LT @@0 1024) [[ 1 ]] (CALL (- (GAS) 1005000) <contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 1000000 0 0) [[ 2 ]] 1 )  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.JUMPI(pc=0x1B, condition=Op.LT(Op.SLOAD(key=0x0), 0x400))
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.JUMP(pc=0x47)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0xF55C8),
-                    address=0x9D15232F6851F9F3A88F88A3B358ED1579977A5A,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xF4240,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.JUMPI(pc=0x1B, condition=Op.LT(Op.SLOAD(key=0x0), 0x400))
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.JUMP(pc=0x47)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.SUB(Op.GAS, 0xF55C8),
+                address=0x9D15232F6851F9F3A88F88A3B358ED1579977A5A,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xF4240,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0x9d15232f6851f9f3a88f88a3b358ed1579977a5a"),  # noqa: E501
+        address=Address(0x9D15232F6851F9F3A88F88A3B358ED1579977A5A),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={}, code=b"", nonce=0),
+                target: Account(storage={0: 69, 1: 1}, nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={}, code=b"", nonce=0),
+                target: Account(storage={}, nonce=0),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 250000000]
+    tx_value = [10]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stQuadraticComplexityTest/test_call20_kbytes_contract50_1.py b/tests/ported_static/stQuadraticComplexityTest/test_call20_kbytes_contract50_1.py
index 0a0ca1d17d5..8d7d15a89d2 100644
--- a/tests/ported_static/stQuadraticComplexityTest/test_call20_kbytes_contract50_1.py
+++ b/tests/ported_static/stQuadraticComplexityTest/test_call20_kbytes_contract50_1.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_call20_kbytes_contract50_1.
 
 Ported from:
-tests/static/state_tests/stQuadraticComplexityTest
-Call20KbytesContract50_1Filler.json
+state_tests/stQuadraticComplexityTest/Call20KbytesContract50_1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,41 +27,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stQuadraticComplexityTest/Call20KbytesContract50_1Filler.json",
+        "state_tests/stQuadraticComplexityTest/Call20KbytesContract50_1Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (
-            12500000,
-            {
-                Address("0x8c9ec19d542269495230087c08602e5d70572fd5"): Account(
-                    storage={0: 1, 1: 50}
-                ),
-                Address("0xae9c63d43225738de8070ce25e1be54f429da182"): Account(
-                    storage={0: 3728}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_call20_kbytes_contract50_1(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
+    """Test_call20_kbytes_contract50_1."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -69,56 +71,79 @@ def test_call20_kbytes_contract50_1(
         gas_limit=882500000000,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
-    # { (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 <contract:0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) ) [[ 1 ]] @i }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x40,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x148C1C2280,
-                    address=0xAE9C63D43225738DE8070CE25E1BE54F429DA182,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
+    # Source: raw
+    # 0x6001600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600055  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "6001600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600055"  # noqa: E501
         ),
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0x8c9ec19d542269495230087c08602e5d70572fd5"),
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.PUSH1[1]
-        + (Op.PUSH1[1] + Op.ADD) * 3727
-        + Op.PUSH1[0]
-        + Op.SSTORE,
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 <contract:0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) ) [[ 1 ]] @i }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x40, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x148C1C2280,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xae9c63d43225738de8070ce25e1be54f429da182"),
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={0: 3728}, nonce=0),
+                target: Account(storage={0: 1, 1: 50}, nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={}, nonce=0),
+                target: Account(storage={}, nonce=0),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 12500000]
+    tx_value = [10]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stQuadraticComplexityTest/test_call20_kbytes_contract50_2.py b/tests/ported_static/stQuadraticComplexityTest/test_call20_kbytes_contract50_2.py
index a0c066e5d3c..00f12488c0a 100644
--- a/tests/ported_static/stQuadraticComplexityTest/test_call20_kbytes_contract50_2.py
+++ b/tests/ported_static/stQuadraticComplexityTest/test_call20_kbytes_contract50_2.py
@@ -1,21 +1,27 @@
 """
-Test ported from static filler.
+Test_call20_kbytes_contract50_2.
 
 Ported from:
-tests/static/state_tests/stQuadraticComplexityTest
-Call20KbytesContract50_2Filler.json
+state_tests/stQuadraticComplexityTest/Call20KbytesContract50_2Filler.json
+
+@manually-enhanced: Do not overwrite. Post-state expectations corrected
+manually (see PR #2784).
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,42 +30,41 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stQuadraticComplexityTest/Call20KbytesContract50_2Filler.json",
+        "state_tests/stQuadraticComplexityTest/Call20KbytesContract50_2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (
-            250000000,
-            {
-                Address("0x8c9ec19d542269495230087c08602e5d70572fd5"): Account(
-                    storage={0: 1, 1: 50}
-                ),
-                Address("0xe7ebafa0fea97a99a72b7f0996c07477e54df0c2"): Account(
-                    storage={0: 2}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_call20_kbytes_contract50_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
+    """Test_call20_kbytes_contract50_2."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -70,56 +75,87 @@ def test_call20_kbytes_contract50_2(
         gas_limit=882500000000,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
-    # { (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 <contract:0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) ) [[ 1 ]] @i }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x40,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x148C1C2280,
-                    address=0xE7EBAFA0FEA97A99A72B7F0996C07477E54DF0C2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
-        balance=0xFFFFFFFFFFFFF,
-        nonce=0,
-        address=Address("0x8c9ec19d542269495230087c08602e5d70572fd5"),
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x60015b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b600101600055  # noqa: E501
+    addr = pre.deploy_contract(
         code=Op.PUSH1[0x1]
         + Op.JUMPDEST * 22237
         + Op.PUSH1[0x1]
         + Op.SSTORE(key=0x0, value=Op.ADD),
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xe7ebafa0fea97a99a72b7f0996c07477e54df0c2"),
+    )
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 <contract:0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) ) [[ 1 ]] @i }  # noqa: E501
+    target_code = (
+        Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x40, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x148C1C2280,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP
+    )
+    target = pre.deploy_contract(
+        code=target_code,
+        balance=0xFFFFFFFFFFFFF,
+        nonce=0,
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={0: 2}, nonce=0),
+                target: Account(storage={0: 1, 1: 50}, nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={}, nonce=0),
+                target: Account(
+                    storage={},
+                    code=bytes(target_code),
+                    nonce=0,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 250000000]
+    tx_value = [10]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stQuadraticComplexityTest/test_call20_kbytes_contract50_3.py b/tests/ported_static/stQuadraticComplexityTest/test_call20_kbytes_contract50_3.py
index e58362e1b93..172093e2818 100644
--- a/tests/ported_static/stQuadraticComplexityTest/test_call20_kbytes_contract50_3.py
+++ b/tests/ported_static/stQuadraticComplexityTest/test_call20_kbytes_contract50_3.py
@@ -1,21 +1,24 @@
 """
-Potentially broken test: gas optimization shows that we can go as low as...
+Potentially broken test: gas optimization shows that we can go as low...
 
 Ported from:
-tests/static/state_tests/stQuadraticComplexityTest
-Call20KbytesContract50_3Filler.json
+state_tests/stQuadraticComplexityTest/Call20KbytesContract50_3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,42 +27,41 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stQuadraticComplexityTest/Call20KbytesContract50_3Filler.json",
+        "state_tests/stQuadraticComplexityTest/Call20KbytesContract50_3Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (
-            250000000,
-            {
-                Address("0x2c496c63f4e9f426bfd41214147cdd3dcd2de1c3"): Account(
-                    storage={0: 2}
-                ),
-                Address("0x8c9ec19d542269495230087c08602e5d70572fd5"): Account(
-                    storage={0: 1, 1: 50}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_call20_kbytes_contract50_3(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Potentially broken test: gas optimization shows that we can go as..."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -70,8 +72,9 @@ def test_call20_kbytes_contract50_3(
         gas_limit=882500000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x6001614a8e565b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b600101600055  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.PUSH1[0x1]
         + Op.JUMP(pc=0x4A8E)
         + Op.JUMPDEST * 21125
@@ -79,48 +82,71 @@ def test_call20_kbytes_contract50_3(
         + Op.SSTORE(key=0x0, value=Op.ADD),
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0x2c496c63f4e9f426bfd41214147cdd3dcd2de1c3"),
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    # Source: lll
     # { (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 <contract:0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) ) [[ 1 ]] @i }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x40,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x148C1C2280,
-                    address=0x2C496C63F4E9F426BFD41214147CDD3DCD2DE1C3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x40, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x148C1C2280,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0x8c9ec19d542269495230087c08602e5d70572fd5"),
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={0: 2}, nonce=0),
+                target: Account(storage={0: 1, 1: 50}, nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={}, nonce=0),
+                target: Account(storage={}, nonce=0),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 250000000]
+    tx_value = [10]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stQuadraticComplexityTest/test_call50000.py b/tests/ported_static/stQuadraticComplexityTest/test_call50000.py
index c3895a65326..b250e191052 100644
--- a/tests/ported_static/stQuadraticComplexityTest/test_call50000.py
+++ b/tests/ported_static/stQuadraticComplexityTest/test_call50000.py
@@ -1,20 +1,27 @@
 """
-Test ported from static filler.
+Test_call50000.
 
 Ported from:
-tests/static/state_tests/stQuadraticComplexityTest/Call50000Filler.json
+state_tests/stQuadraticComplexityTest/Call50000Filler.json
+
+@manually-enhanced: Do not overwrite. Post-state expectations corrected
+manually (see PR #2784).
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,34 +29,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stQuadraticComplexityTest/Call50000Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stQuadraticComplexityTest/Call50000Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (250000000, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_call50000(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    """Test_call50000."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -60,47 +73,82 @@ def test_call50000(
         gas_limit=860000000,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)
+    # Source: lll
     # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1600 <eoa:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 50000 0 0) ) [[ 1 ]] @i}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3F,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x640,
-                    address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    target_code = (
+        Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3F, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x640,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP
+    )
+    target = pre.deploy_contract(
+        code=target_code,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0x968a2606110ef719ed66f5e3688f6fb82d606ffa"),  # noqa: E501
     )
-    pre[callee] = Account(balance=7000, nonce=0)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={}, code=b"", nonce=0),
+                target: Account(
+                    storage={},
+                    code=bytes(target_code),
+                    nonce=0,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={}, code=b"", nonce=0),
+                target: Account(
+                    storage={},
+                    code=bytes(target_code),
+                    nonce=0,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 250000000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stQuadraticComplexityTest/test_call50000_ecrec.py b/tests/ported_static/stQuadraticComplexityTest/test_call50000_ecrec.py
index 3aff144aad2..5ef0eba7901 100644
--- a/tests/ported_static/stQuadraticComplexityTest/test_call50000_ecrec.py
+++ b/tests/ported_static/stQuadraticComplexityTest/test_call50000_ecrec.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_call50000_ecrec.
 
 Ported from:
-tests/static/state_tests/stQuadraticComplexityTest/Call50000_ecrecFiller.json
+state_tests/stQuadraticComplexityTest/Call50000_ecrecFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,33 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stQuadraticComplexityTest/Call50000_ecrecFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stQuadraticComplexityTest/Call50000_ecrecFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (250000000, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_call50000_ecrec(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
+    """Test_call50000_ecrec."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -59,46 +70,80 @@ def test_call50000_ecrec(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 500 1 1 0 50000 0 0) ) [[ 1 ]] @i}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x1F4,
-                    address=0x1,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x1F4,
+                address=0x1,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0x1c5bef085b43f11a8a19ae08a0c20019e6d15236"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "5b61c3506080511015602c576000600061c3506000600160016101f4f16000556001608051016080526000565b60805160015500"  # noqa: E501
+                    ),
+                    nonce=0,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "5b61c3506080511015602c576000600061c3506000600160016101f4f16000556001608051016080526000565b60805160015500"  # noqa: E501
+                    ),
+                    nonce=0,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 250000000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stQuadraticComplexityTest/test_call50000_identity.py b/tests/ported_static/stQuadraticComplexityTest/test_call50000_identity.py
index 67935565571..6d52d835c00 100644
--- a/tests/ported_static/stQuadraticComplexityTest/test_call50000_identity.py
+++ b/tests/ported_static/stQuadraticComplexityTest/test_call50000_identity.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_call50000_identity.
 
 Ported from:
-tests/static/state_tests/stQuadraticComplexityTest
-Call50000_identityFiller.json
+state_tests/stQuadraticComplexityTest/Call50000_identityFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,33 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stQuadraticComplexityTest/Call50000_identityFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stQuadraticComplexityTest/Call50000_identityFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (250000000, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_call50000_identity(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
+    """Test_call50000_identity."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -60,46 +70,80 @@ def test_call50000_identity(
         gas_limit=882500000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 4 1 0 50000 0 0) ) [[ 1 ]] @i}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x61C,
-                    address=0x4,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x61C,
+                address=0x4,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0x25d58a9d3632eea7b6146cdaa0b4d323a83a814e"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "5b61c3506080511015602c576000600061c35060006001600461061cf16000556001608051016080526000565b60805160015500"  # noqa: E501
+                    ),
+                    nonce=0,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "5b61c3506080511015602c576000600061c35060006001600461061cf16000556001608051016080526000565b60805160015500"  # noqa: E501
+                    ),
+                    nonce=0,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 250000000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stQuadraticComplexityTest/test_call50000_identity2.py b/tests/ported_static/stQuadraticComplexityTest/test_call50000_identity2.py
index c98d4a8943f..f2d27a68845 100644
--- a/tests/ported_static/stQuadraticComplexityTest/test_call50000_identity2.py
+++ b/tests/ported_static/stQuadraticComplexityTest/test_call50000_identity2.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_call50000_identity2.
 
 Ported from:
-tests/static/state_tests/stQuadraticComplexityTest
-Call50000_identity2Filler.json
+state_tests/stQuadraticComplexityTest/Call50000_identity2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,33 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stQuadraticComplexityTest/Call50000_identity2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stQuadraticComplexityTest/Call50000_identity2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (250000000, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_call50000_identity2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
+    """Test_call50000_identity2."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -60,48 +70,82 @@ def test_call50000_identity2(
         gas_limit=882500000,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    # Source: lll
     # { (def 'i 0x80) [ 1 ] 42 (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 4 1 0 50000 1 50000) ) [[ 1 ]] @i [[ 2 ]] @1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x2A)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x32,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x61C,
-                    address=0x4,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x1,
-                    ret_size=0xC350,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x5)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x1))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x2A)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x32, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x61C,
+                address=0x4,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x1,
+                ret_size=0xC350,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x5)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x1))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0x6dc17565113358633923f732d8c32382345d2d6f"),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "602a6001525b61c350608051101560325761c350600161c35060006001600461061cf16000556001608051016080526005565b60805160015560015160025500"  # noqa: E501
+                    ),
+                    nonce=0,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "602a6001525b61c350608051101560325761c350600161c35060006001600461061cf16000556001608051016080526005565b60805160015560015160025500"  # noqa: E501
+                    ),
+                    nonce=0,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 250000000]
+    tx_value = [10]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stQuadraticComplexityTest/test_call50000_rip160.py b/tests/ported_static/stQuadraticComplexityTest/test_call50000_rip160.py
index 99d611cf269..143a678a724 100644
--- a/tests/ported_static/stQuadraticComplexityTest/test_call50000_rip160.py
+++ b/tests/ported_static/stQuadraticComplexityTest/test_call50000_rip160.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_call50000_rip160.
 
 Ported from:
-tests/static/state_tests/stQuadraticComplexityTest/Call50000_rip160Filler.json
+state_tests/stQuadraticComplexityTest/Call50000_rip160Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,33 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stQuadraticComplexityTest/Call50000_rip160Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stQuadraticComplexityTest/Call50000_rip160Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (250000000, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_call50000_rip160(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
+    """Test_call50000_rip160."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -59,46 +70,80 @@ def test_call50000_rip160(
         gas_limit=3925000000,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    # Source: lll
     # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 78200 3 1 0 50000 0 0) ) [[ 1 ]] @i}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2D,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x13178,
-                    address=0x3,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2D, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x13178,
+                address=0x3,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xc10d84baa3a4bb4e45c856ebe1ef386bfed327db"),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "5b61c3506080511015602d576000600061c35060006001600362013178f16000556001608051016080526000565b60805160015500"  # noqa: E501
+                    ),
+                    nonce=0,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "5b61c3506080511015602d576000600061c35060006001600362013178f16000556001608051016080526000565b60805160015500"  # noqa: E501
+                    ),
+                    nonce=0,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 250000000]
+    tx_value = [10]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stQuadraticComplexityTest/test_call50000_sha256.py b/tests/ported_static/stQuadraticComplexityTest/test_call50000_sha256.py
index 3bdf0141bf0..21b44470ceb 100644
--- a/tests/ported_static/stQuadraticComplexityTest/test_call50000_sha256.py
+++ b/tests/ported_static/stQuadraticComplexityTest/test_call50000_sha256.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_call50000_sha256.
 
 Ported from:
-tests/static/state_tests/stQuadraticComplexityTest/Call50000_sha256Filler.json
+state_tests/stQuadraticComplexityTest/Call50000_sha256Filler.json
 """
 
 import pytest
@@ -11,10 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,30 +27,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stQuadraticComplexityTest/Call50000_sha256Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stQuadraticComplexityTest/Call50000_sha256Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (250000000, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_call50000_sha256(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    """Test_call50000_sha256."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_0 = Address(0xBBBF5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -60,45 +75,87 @@ def test_call50000_sha256(
     )
 
     pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    # Source: lll
     # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 78200 2 1 0 50000 0 0) ) [[ 1 ]] @i}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2D,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x13178,
-                    address=0x2,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2D, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x13178,
+                address=0x2,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xBBBF5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                Address(
+                    0x0000000000000000000000000000000000000002
+                ): Account.NONEXISTENT,
+                sender: Account(storage={}, code=b"", nonce=1),
+                contract_0: Account(
+                    storage={0: 0, 1: 0},
+                    code=bytes.fromhex(
+                        "5b61c3506080511015602d576000600061c35060006001600262013178f16000556001608051016080526000565b60805160015500"  # noqa: E501
+                    ),
+                    nonce=0,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                Address(
+                    0x0000000000000000000000000000000000000002
+                ): Account.NONEXISTENT,
+                sender: Account(storage={}, code=b"", nonce=1),
+                contract_0: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "5b61c3506080511015602d576000600061c35060006001600262013178f16000556001608051016080526000565b60805160015500"  # noqa: E501
+                    ),
+                    nonce=0,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 250000000]
+    tx_value = [10]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stQuadraticComplexityTest/test_callcode50000.py b/tests/ported_static/stQuadraticComplexityTest/test_callcode50000.py
index b72e3815d2f..ad6b43a3b19 100644
--- a/tests/ported_static/stQuadraticComplexityTest/test_callcode50000.py
+++ b/tests/ported_static/stQuadraticComplexityTest/test_callcode50000.py
@@ -1,20 +1,27 @@
 """
-Test ported from static filler.
+Test_callcode50000.
 
 Ported from:
-tests/static/state_tests/stQuadraticComplexityTest/Callcode50000Filler.json
+state_tests/stQuadraticComplexityTest/Callcode50000Filler.json
+
+@manually-enhanced: Do not overwrite. Post-state expectations corrected
+manually (see PR #2784).
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,34 +29,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stQuadraticComplexityTest/Callcode50000Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stQuadraticComplexityTest/Callcode50000Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (250000000, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_callcode50000(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    """Test_callcode50000."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -60,47 +73,82 @@ def test_callcode50000(
         gas_limit=8600000000,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)
+    # Source: lll
     # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALLCODE 1600 <eoa:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 50000 0 0) ) [[ 1 ]] @i}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3F,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x640,
-                    address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    target_code = (
+        Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3F, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x640,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP
+    )
+    target = pre.deploy_contract(
+        code=target_code,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0x7fc89545bed7af26b6ef809b53e9a93fd0718468"),  # noqa: E501
     )
-    pre[callee] = Account(balance=7000, nonce=0)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={}, code=b"", nonce=0),
+                target: Account(
+                    storage={},
+                    code=bytes(target_code),
+                    nonce=0,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={}, code=b"", nonce=0),
+                target: Account(
+                    storage={},
+                    code=bytes(target_code),
+                    nonce=0,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 250000000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stQuadraticComplexityTest/test_create1000.py b/tests/ported_static/stQuadraticComplexityTest/test_create1000.py
index d03d9f0f63c..74c1e0f1112 100644
--- a/tests/ported_static/stQuadraticComplexityTest/test_create1000.py
+++ b/tests/ported_static/stQuadraticComplexityTest/test_create1000.py
@@ -1,19 +1,24 @@
 """
-Gas analysis showed this test's gas can go as low as 21053, and still yield...
+Gas analysis showed this test's gas can go as low as 21053, and still...
 
 Ported from:
-tests/static/state_tests/stQuadraticComplexityTest/Create1000Filler.json
+state_tests/stQuadraticComplexityTest/Create1000Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,33 +27,41 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stQuadraticComplexityTest/Create1000Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stQuadraticComplexityTest/Create1000Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (250000000, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_create1000(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Gas analysis showed this test's gas can go as low as 21053, and..."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_0 = Address(0xBBBF5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -59,38 +72,105 @@ def test_create1000(
         gas_limit=8600000000,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    # Source: lll
     # { (def 'i 0x80) (for {} (< @i 1000) [i](+ @i 1) [[ 0 ]] (CREATE 1 0 50000) ) [[ 1 ]] @i}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x23,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x3E8)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(value=0x1, offset=0x0, size=0xC350),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x23, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x3E8))
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.CREATE(value=0x1, offset=0x0, size=0xC350)
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                compute_create_address(
+                    address=contract_0, nonce=866
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=780
+                ): Account.NONEXISTENT,
+                contract_0: Account(storage={0: 0, 1: 0}, nonce=0),
+                compute_create_address(
+                    address=contract_0, nonce=959
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=393
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=499
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=19
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=327
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=493
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                compute_create_address(
+                    address=contract_0, nonce=866
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=780
+                ): Account.NONEXISTENT,
+                contract_0: Account(storage={0: 0, 1: 0}, nonce=0),
+                compute_create_address(
+                    address=contract_0, nonce=959
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=393
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=499
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=19
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=327
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=493
+                ): Account.NONEXISTENT,
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 250000000]
+    tx_value = [10]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stQuadraticComplexityTest/test_create1000_byzantium.py b/tests/ported_static/stQuadraticComplexityTest/test_create1000_byzantium.py
index 7f0694cc7bb..b870a81d657 100644
--- a/tests/ported_static/stQuadraticComplexityTest/test_create1000_byzantium.py
+++ b/tests/ported_static/stQuadraticComplexityTest/test_create1000_byzantium.py
@@ -1,21 +1,22 @@
 """
-Gas analysis showed this test's gas can go as low as 21053, and still yield...
+Gas analysis showed this test's gas can go as low as 21053, and still...
 
 Ported from:
-tests/static/state_tests/stQuadraticComplexityTest
-Create1000ByzantiumFiller.json
+state_tests/stQuadraticComplexityTest/Create1000ByzantiumFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,33 +24,41 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stQuadraticComplexityTest/Create1000ByzantiumFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stQuadraticComplexityTest/Create1000ByzantiumFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (250000000, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_create1000_byzantium(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Gas analysis showed this test's gas can go as low as 21053, and..."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_0 = Address(0xBBBF5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -60,38 +69,43 @@ def test_create1000_byzantium(
         gas_limit=8600000000,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    # Source: lll
     # { (def 'i 0x80) (for {} (< @i 1000) [i](+ @i 1) [[ 0 ]] (CREATE 1 0 50000) ) [[ 1 ]] @i}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x23,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x3E8)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(value=0x1, offset=0x0, size=0xC350),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x23, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x3E8))
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.CREATE(value=0x1, offset=0x0, size=0xC350)
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 250000000]
+    tx_value = [10]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        compute_create_address(
+            address=contract_0, nonce=866
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stQuadraticComplexityTest/test_create1000_shnghai.py b/tests/ported_static/stQuadraticComplexityTest/test_create1000_shnghai.py
index 9940abe027c..81abf9ec742 100644
--- a/tests/ported_static/stQuadraticComplexityTest/test_create1000_shnghai.py
+++ b/tests/ported_static/stQuadraticComplexityTest/test_create1000_shnghai.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_create1000_shnghai.
 
 Ported from:
-tests/static/state_tests/stQuadraticComplexityTest/Create1000ShnghaiFiller.json
+state_tests/stQuadraticComplexityTest/Create1000ShnghaiFiller.json
 """
 
 import pytest
@@ -11,9 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,40 +28,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stQuadraticComplexityTest/Create1000ShnghaiFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stQuadraticComplexityTest/Create1000ShnghaiFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (
-            250000000,
-            {
-                Address("0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 0x7981FA24B134DEB51D71D250D7B0D9E33C8C5457,
-                        1: 1000,
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_create1000_shnghai(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    """Test_create1000_shnghai."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_0 = Address(0xBBBF5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -70,36 +76,132 @@ def test_create1000_shnghai(
     )
 
     pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    # Source: lll
     # { (def 'i 0x80) (for {} (< @i 1000) [i](+ @i 1) [[ 0 ]] (CREATE 1 0 10) ) [[ 1 ]] @i}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x22,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x3E8)),
-            )
-            + Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x1, offset=0x0, size=0xA)
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x22, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x3E8))
+        )
+        + Op.SSTORE(key=0x0, value=Op.CREATE(value=0x1, offset=0x0, size=0xA))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xBBBF5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                compute_create_address(
+                    address=contract_0, nonce=866
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=780
+                ): Account.NONEXISTENT,
+                contract_0: Account(storage={0: 0, 1: 0}, nonce=0),
+                compute_create_address(
+                    address=contract_0, nonce=959
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=393
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=499
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=19
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=327
+                ): Account.NONEXISTENT,
+                compute_create_address(
+                    address=contract_0, nonce=493
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                compute_create_address(address=contract_0, nonce=866): Account(
+                    storage={}, code=b"", balance=1, nonce=1
+                ),
+                compute_create_address(address=contract_0, nonce=780): Account(
+                    storage={}, code=b"", balance=1, nonce=1
+                ),
+                contract_0: Account(
+                    storage={
+                        0: 0x7981FA24B134DEB51D71D250D7B0D9E33C8C5457,
+                        1: 1000,
+                    },
+                    balance=0xFFFFFFFFFFC21,
+                    nonce=1000,
+                ),
+                compute_create_address(address=contract_0, nonce=733): Account(
+                    storage={}, code=b"", balance=1, nonce=1
+                ),
+                compute_create_address(address=contract_0, nonce=959): Account(
+                    storage={}, code=b"", balance=1, nonce=1
+                ),
+                compute_create_address(address=contract_0, nonce=393): Account(
+                    storage={}, code=b"", balance=1, nonce=1
+                ),
+                compute_create_address(address=contract_0, nonce=499): Account(
+                    storage={}, code=b"", balance=1, nonce=1
+                ),
+                compute_create_address(address=contract_0, nonce=36): Account(
+                    storage={}, code=b"", balance=1, nonce=1
+                ),
+                compute_create_address(address=contract_0, nonce=568): Account(
+                    storage={}, code=b"", balance=1, nonce=1
+                ),
+                compute_create_address(address=contract_0, nonce=66): Account(
+                    storage={}, code=b"", balance=1, nonce=1
+                ),
+                compute_create_address(address=contract_0, nonce=981): Account(
+                    storage={}, code=b"", balance=1, nonce=1
+                ),
+                compute_create_address(address=contract_0, nonce=693): Account(
+                    storage={}, code=b"", balance=1, nonce=1
+                ),
+                compute_create_address(address=contract_0, nonce=390): Account(
+                    storage={}, code=b"", balance=1, nonce=1
+                ),
+                compute_create_address(address=contract_0, nonce=19): Account(
+                    storage={}, code=b"", balance=1, nonce=1
+                ),
+                compute_create_address(address=contract_0, nonce=327): Account(
+                    storage={}, code=b"", balance=1, nonce=1
+                ),
+                compute_create_address(address=contract_0, nonce=493): Account(
+                    storage={}, code=b"", balance=1, nonce=1
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 250000000]
+    tx_value = [10]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stQuadraticComplexityTest/test_quadratic_complexity_solidity_call_data_copy.py b/tests/ported_static/stQuadraticComplexityTest/test_quadratic_complexity_solidity_call_data_copy.py
index d65db6ea167..d9145437597 100644
--- a/tests/ported_static/stQuadraticComplexityTest/test_quadratic_complexity_solidity_call_data_copy.py
+++ b/tests/ported_static/stQuadraticComplexityTest/test_quadratic_complexity_solidity_call_data_copy.py
@@ -1,21 +1,25 @@
 """
-Test ported from static filler.
+Test_quadratic_complexity_solidity_call_data_copy.
 
 Ported from:
-tests/static/state_tests/stQuadraticComplexityTest
-QuadraticComplexitySolidity_CallDataCopyFiller.json
+state_tests/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopyFiller.json
+
+@manually-enhanced: Do not overwrite. Post-state expectations corrected
+manually (see PR #2784).
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,32 +28,43 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopyFiller.json",  # noqa: E501
+        "state_tests/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopyFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (250000000, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_quadratic_complexity_solidity_call_data_copy(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x6A7EEAC5F12B409D42028F66B0B2132535EE158CFDA439E3BFDD4558E8F4BF6C
-    )
+    """Test_quadratic_complexity_solidity_call_data_copy."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x11C37937E08000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -60,91 +75,104 @@ def test_quadratic_complexity_solidity_call_data_copy(
         gas_limit=350000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.EXP(0x2, 0xE0)
-            + Op.SWAP1
-            + Op.DIV
-            + Op.JUMPI(pc=0x15, condition=Op.EQ(0x61A47706, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1E]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.JUMP(pc=0x24)
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.DUP2
-            + Op.PUSH1[0x0]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.PUSH20[0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B]
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0xBF, condition=Op.ISZERO(Op.SGT(Op.DUP3, 0x0)))
-            + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=0x6A75737400000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.PUSH1[0x4]
-            + Op.ADD
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=0x63616C6C00000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.DUP6
-            + Op.SUB(Op.GAS, 0x15)
-            + Op.POP(Op.CALL)
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x1)
-            + Op.SWAP2
-            + Op.POP
-            + Op.JUMP(pc=0x45)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.JUMP
-        ),
-        balance=0x11C37937E08000,
-        nonce=0,
-        address=Address("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-    # Source: LLL
+    # Source: lll
     # { (CALLDATACOPY 0 0 50000) }
-    pre.deploy_contract(
-        code=(
-            Op.CALLDATACOPY(dest_offset=0x0, offset=0x0, size=0xC350) + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATACOPY(dest_offset=0x0, offset=0x0, size=0xC350)
+        + Op.STOP,
         balance=0x4C4B40,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x11C37937E08000)
+    # Source: raw
+    # 0x60003560e060020a9004806361a4770614601557005b601e6004356024565b60006000f35b60008160008190555073b94f5374fce5edbc8e2a8697c15331677e6ebf0b90505b600082131560bf5780600160a060020a03166000600060007f6a7573740000000000000000000000000000000000000000000000000000000081526004017f63616c6c000000000000000000000000000000000000000000000000000000008152602001600060008560155a03f150506001820391506045565b505056  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.EXP(0x2, 0xE0)
+        + Op.SWAP1
+        + Op.DIV
+        + Op.JUMPI(pc=0x15, condition=Op.EQ(0x61A47706, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1E]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.JUMP(pc=0x24)
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.DUP2
+        + Op.PUSH1[0x0]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.PUSH20[0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B]
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xBF, condition=Op.ISZERO(Op.SGT(Op.DUP3, 0x0)))
+        + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP1)
+        + Op.PUSH1[0x0] * 3
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=0x6A75737400000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.PUSH1[0x4]
+        + Op.ADD
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=0x63616C6C00000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.PUSH1[0x0] * 2
+        + Op.DUP6
+        + Op.SUB(Op.GAS, 0x15)
+        + Op.POP(Op.CALL)
+        + Op.POP
+        + Op.SUB(Op.DUP3, 0x1)
+        + Op.SWAP2
+        + Op.POP
+        + Op.JUMP(pc=0x45)
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.JUMP,
+        balance=0x11C37937E08000,
+        nonce=0,
+    )
+
+    tx_data = [
+        Bytes("61a47706") + Hash(0xC350),
+    ]
+    tx_gas = [150000, 250000000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "61a47706000000000000000000000000000000000000000000000000000000000000c350"  # noqa: E501
-        ),
-        gas_limit=tx_gas_limit,
-        value=1,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    # With `g=1` the tx completes the inner CALL loop and the
+    # leading `SSTORE(0, 50000)` (the loop-counter snapshot taken
+    # before entering the loop body) commits. With `g=0` the tx
+    # OOGs and rolls everything back, leaving storage empty.
+    contract_0_storage = {0: 0xC350} if g == 1 else {}
+    post = {
+        contract_0: Account(
+            storage=contract_0_storage,
+            code=bytes.fromhex(
+                "60003560e060020a9004806361a4770614601557005b601e6004356024565b60006000f35b60008160008190555073b94f5374fce5edbc8e2a8697c15331677e6ebf0b90505b600082131560bf5780600160a060020a03166000600060007f6a7573740000000000000000000000000000000000000000000000000000000081526004017f63616c6c000000000000000000000000000000000000000000000000000000008152602001600060008560155a03f150506001820391506045565b505056"  # noqa: E501
+            ),
+            nonce=0,
+        ),
+        contract_1: Account(
+            storage={},
+            code=bytes.fromhex("61c350600060003700"),
+            nonce=0,
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stQuadraticComplexityTest/test_return50000.py b/tests/ported_static/stQuadraticComplexityTest/test_return50000.py
index 612473ef270..db6a155085d 100644
--- a/tests/ported_static/stQuadraticComplexityTest/test_return50000.py
+++ b/tests/ported_static/stQuadraticComplexityTest/test_return50000.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_return50000.
 
 Ported from:
-tests/static/state_tests/stQuadraticComplexityTest/Return50000Filler.json
+state_tests/stQuadraticComplexityTest/Return50000Filler.json
 """
 
 import pytest
@@ -11,10 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,36 +27,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stQuadraticComplexityTest/Return50000Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stQuadraticComplexityTest/Return50000Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (
-            16000000,
-            {
-                Address("0x6123b8b3e245b90f39ed7418d320a60abb365b9f"): Account(
-                    storage={0: 1, 1: 50000}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_return50000(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    """Test_return50000."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
     )
@@ -66,54 +73,94 @@ def test_return50000(
     )
 
     pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
-    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 <contract:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 50000 0 0) ) [[ 1 ]] @i }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3F,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x61C,
-                    address=0xAAB87D565DD96E58089E1DFF410FBDAC45290658,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN (CALLDATALOAD 49999) 1) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=Op.CALLDATALOAD(offset=0xC34F), size=0x1)
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0x6123b8b3e245b90f39ed7418d320a60abb365b9f"),  # noqa: E501
+        address=Address(0xAAB87D565DD96E58089E1DFF410FBDAC45290658),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(offset=Op.CALLDATALOAD(offset=0xC34F), size=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 <contract:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 50000 0 0) ) [[ 1 ]] @i }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3F, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x61C,
+                address=0xAAB87D565DD96E58089E1DFF410FBDAC45290658,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xaab87d565dd96e58089e1dff410fbdac45290658"),  # noqa: E501
+        address=Address(0x6123B8B3E245B90F39ED7418D320A60ABB365B9F),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(
+                    storage={},
+                    code=bytes.fromhex("600161c34f35f300"),
+                    nonce=0,
+                ),
+                target: Account(storage={0: 1, 1: 50000}, nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(
+                    storage={},
+                    code=bytes.fromhex("600161c34f35f300"),
+                    nonce=0,
+                ),
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "5b61c3506080511015603f576000600061c3506000600073aab87d565dd96e58089e1dff410fbdac4529065861061cf16000556001608051016080526000565b60805160015500"  # noqa: E501
+                    ),
+                    nonce=0,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16000000]
+    tx_value = [10]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stQuadraticComplexityTest/test_return50000_2.py b/tests/ported_static/stQuadraticComplexityTest/test_return50000_2.py
index 4a839e84453..2f1ea8906eb 100644
--- a/tests/ported_static/stQuadraticComplexityTest/test_return50000_2.py
+++ b/tests/ported_static/stQuadraticComplexityTest/test_return50000_2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_return50000_2.
 
 Ported from:
-tests/static/state_tests/stQuadraticComplexityTest/Return50000_2Filler.json
+state_tests/stQuadraticComplexityTest/Return50000_2Filler.json
 """
 
 import pytest
@@ -11,10 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,36 +27,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stQuadraticComplexityTest/Return50000_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stQuadraticComplexityTest/Return50000_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (150000, {}),
-        (
-            16000000,
-            {
-                Address("0x6123b8b3e245b90f39ed7418d320a60abb365b9f"): Account(
-                    storage={0: 1, 1: 50000}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_return50000_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    """Test_return50000_2."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
     )
@@ -66,55 +73,101 @@ def test_return50000_2(
     )
 
     pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
-    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 <contract:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 50000 0 0) ) [[ 1 ]] @i }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3F,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x61C,
-                    address=0xF2C82CA2413A9F3F06781DB577400DDB6C76767D,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [ 0 ] (CALLDATALOAD 49999) (RETURN @0 1) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0xC34F))
+        + Op.RETURN(offset=Op.MLOAD(offset=0x0), size=0x1)
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0x6123b8b3e245b90f39ed7418d320a60abb365b9f"),  # noqa: E501
+        address=Address(0xF2C82CA2413A9F3F06781DB577400DDB6C76767D),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0xC34F))
-            + Op.RETURN(offset=Op.MLOAD(offset=0x0), size=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 <contract:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 50000 0 0) ) [[ 1 ]] @i }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3F, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x61C,
+                address=0xF2C82CA2413A9F3F06781DB577400DDB6C76767D,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xf2c82ca2413a9f3f06781db577400ddb6c76767d"),  # noqa: E501
+        address=Address(0x6123B8B3E245B90F39ED7418D320A60ABB365B9F),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(
+                    storage={},
+                    code=bytes.fromhex("61c34f356000526001600051f300"),
+                    nonce=0,
+                ),
+                target: Account(
+                    storage={0: 1, 1: 50000},
+                    code=bytes.fromhex(
+                        "5b61c3506080511015603f576000600061c3506000600073f2c82ca2413a9f3f06781db577400ddb6c76767d61061cf16000556001608051016080526000565b60805160015500"  # noqa: E501
+                    ),
+                    nonce=0,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(
+                    storage={},
+                    code=bytes.fromhex("61c34f356000526001600051f300"),
+                    nonce=0,
+                ),
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "5b61c3506080511015603f576000600061c3506000600073f2c82ca2413a9f3f06781db577400ddb6c76767d61061cf16000556001608051016080526000565b60805160015500"  # noqa: E501
+                    ),
+                    nonce=0,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [150000, 16000000]
+    tx_value = [10]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/__init__.py b/tests/ported_static/stRandom/__init__.py
index a8afd4a5476..afa95bc44cb 100644
--- a/tests/ported_static/stRandom/__init__.py
+++ b/tests/ported_static/stRandom/__init__.py
@@ -1 +1 @@
-"""Tests ported from stRandom."""
+"""Ported static tests: stRandom."""  # noqa: N999
diff --git a/tests/ported_static/stRandom/test_random_statetest0.py b/tests/ported_static/stRandom/test_random_statetest0.py
index 8386a2e1a16..8e5705dca3c 100644
--- a/tests/ported_static/stRandom/test_random_statetest0.py
+++ b/tests/ported_static/stRandom/test_random_statetest0.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest0.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest0Filler.json
+state_tests/stRandom/randomStatetest0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,99 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest0Filler.json"],
+    ["state_tests/stRandom/randomStatetest0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000007fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff857fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe1302056f60005155"
-        ),
-        nonce=0,
-        address=Address("0x3c2c1d569d955ee8d26ced4adcd452c462a972ad"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000007fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff857fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe1302056f"
-        ),
-        gas_limit=100000,
-        value=1631233707,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest0Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest0_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest0."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -125,56 +43,45 @@ def test_random_statetest0_from_prague(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff857ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1302056f60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000007fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff857fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe1302056f60005155"
+            "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff857ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1302056f60005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x3c2c1d569d955ee8d26ced4adcd452c462a972ad"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000007fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff857fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe1302056f"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff857ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1302056f"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1631233707,
+        value=0x613AA6AB,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest1.py b/tests/ported_static/stRandom/test_random_statetest1.py
index 4482c23de77..2d43d88fe21 100644
--- a/tests/ported_static/stRandom/test_random_statetest1.py
+++ b/tests/ported_static/stRandom/test_random_statetest1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest1.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest1Filler.json
+state_tests/stRandom/randomStatetest1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest1Filler.json"],
+    ["state_tests/stRandom/randomStatetest1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,10 @@ def test_random_statetest1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_random_statetest1."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,53 +44,51 @@ def test_random_statetest1(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GASLIMIT
-            + Op.GASLIMIT
-            + Op.CALLCODE(
-                gas=Op.MSIZE,
-                address=Op.TIMESTAMP,
-                value=Op.PREVRANDAO,
-                args_offset=Op.COINBASE,
-                args_size=Op.NUMBER,
-                ret_offset=Op.COINBASE,
-                ret_size=Op.NUMBER,
-            )
+    # Source: raw
+    # 0x454543414341444259f2
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.GASLIMIT * 2
+        + Op.CALLCODE(
+            gas=Op.MSIZE,
+            address=Op.TIMESTAMP,
+            value=Op.PREVRANDAO,
+            args_offset=Op.COINBASE,
+            args_size=Op.NUMBER,
+            ret_offset=Op.COINBASE,
+            ret_size=Op.NUMBER,
         ),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=contract_0,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        contract_0: Account(storage={}, balance=0xDE0B6B3A7640000, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest10.py b/tests/ported_static/stRandom/test_random_statetest10.py
index 35283cde784..f5c895545db 100644
--- a/tests/ported_static/stRandom/test_random_statetest10.py
+++ b/tests/ported_static/stRandom/test_random_statetest10.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest10.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest10Filler.json
+state_tests/stRandom/randomStatetest10Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest10Filler.json"],
+    ["state_tests/stRandom/randomStatetest10Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest10(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest10."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,45 @@ def test_random_statetest10(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000000120417f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3508859a1740a0528f26a635216cd980a9a9255  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000000120417f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3508859a1740a0528f26a635216cd980a9a9255"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000120417f000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000c3507f000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000c3508859a1740a0528f26a635216cd"  # noqa: E501
-            "980a9a9255"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xa1941ae61e22d0850914d85e19b1bd7234265c66"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000120417f000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000c3507f000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000c3508859a1740a0528f26a635216cd"  # noqa: E501
-            "980a9a92"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000000120417f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3508859a1740a0528f26a635216cd980a9a92"  # noqa: E501
         ),
         gas_limit=100000,
-        value=364185236,
+        value=0x15B50694,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest100.py b/tests/ported_static/stRandom/test_random_statetest100.py
index 5d67f216273..4a17e601da9 100644
--- a/tests/ported_static/stRandom/test_random_statetest100.py
+++ b/tests/ported_static/stRandom/test_random_statetest100.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest100.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest100Filler.json
+state_tests/stRandom/randomStatetest100Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest100Filler.json"],
+    ["state_tests/stRandom/randomStatetest100Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest100(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest100."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,58 +43,60 @@ def test_random_statetest100(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x414243444342444283f24455
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.COINBASE
+        + Op.TIMESTAMP
+        + Op.SSTORE(
+            key=Op.PREVRANDAO,
+            value=Op.CALLCODE(
+                gas=Op.DUP4,
+                address=Op.TIMESTAMP,
+                value=Op.PREVRANDAO,
+                args_offset=Op.TIMESTAMP,
+                args_size=Op.NUMBER,
+                ret_offset=Op.PREVRANDAO,
+                ret_size=Op.NUMBER,
+            ),
         ),
-        balance=46,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.COINBASE
-            + Op.TIMESTAMP
-            + Op.SSTORE(
-                key=Op.PREVRANDAO,
-                value=Op.CALLCODE(
-                    gas=Op.DUP4,
-                    address=Op.TIMESTAMP,
-                    value=Op.PREVRANDAO,
-                    args_offset=Op.TIMESTAMP,
-                    args_size=Op.NUMBER,
-                    ret_offset=Op.PREVRANDAO,
-                    ret_size=Op.NUMBER,
-                ),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=46,
         nonce=0,
-        address=Address("0xac7af608fdd0c1e915c85a0dded54637285b93b0"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={0x20000: 1}),
+        target: Account(
+            storage={0x20000: 1},
+            code=bytes.fromhex("414243444342444283f24455"),
+            balance=0xDE0B6B3A76586A0,
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest102.py b/tests/ported_static/stRandom/test_random_statetest102.py
index 822d1381885..8301be48642 100644
--- a/tests/ported_static/stRandom/test_random_statetest102.py
+++ b/tests/ported_static/stRandom/test_random_statetest102.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest102.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest102Filler.json
+state_tests/stRandom/randomStatetest102Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest102Filler.json"],
+    ["state_tests/stRandom/randomStatetest102Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest102(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest102."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,57 @@ def test_random_statetest102(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GASLIMIT
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PREVRANDAO
-            + Op.PREVRANDAO
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x157094FFFF1A04893A9CF3858B857655,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x467dcdbf737c1ea416e75d9bc88e09533838889f"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x457f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>44447f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f157094ffff1a04893a9cf3858b85765560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.GASLIMIT
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PREVRANDAO * 2
+        + Op.PUSH32[0x0] * 2
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x157094FFFF1A04893A9CF3858B857655
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x467DCDBF737C1EA416E75D9BC88E09533838889F),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "457f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e794444"  # noqa: E501
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe6f157094ffff1a04893a9cf3"  # noqa: E501
-            "858b8576"
+        to=target,
+        data=Bytes(
+            "457f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7944447f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f157094ffff1a04893a9cf3858b8576"  # noqa: E501
         ),
         gas_limit=100000,
-        value=634395362,
+        value=0x25D01AE2,
     )
 
     post = {
-        contract: Account(storage={0: 0x157094FFFF1A04893A9CF3858B857655}),
+        target: Account(
+            storage={0: 0x157094FFFF1A04893A9CF3858B857655},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest103.py b/tests/ported_static/stRandom/test_random_statetest103.py
index 6d859ced084..40b67225a2c 100644
--- a/tests/ported_static/stRandom/test_random_statetest103.py
+++ b/tests/ported_static/stRandom/test_random_statetest103.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest103.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest103Filler.json
+state_tests/stRandom/randomStatetest103Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest103Filler.json"],
+    ["state_tests/stRandom/randomStatetest103Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest103(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest103."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,45 @@ def test_random_statetest103(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe92357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff597f00000000000000000000000000000000000000000000000000000000000000019385a39988160a205a93196d336428  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe92357fffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffff597f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000019385a39988160a205a93196d"  # noqa: E501
-            "336428"
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe92357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff597f00000000000000000000000000000000000000000000000000000000000000019385a39988160a205a93196d336428"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x7284c101c23e4af67251beeaaafa61d3ac764b99"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe92357fffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffff597f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000019385a39988160a205a93196d"  # noqa: E501
-            "336428"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe92357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff597f00000000000000000000000000000000000000000000000000000000000000019385a39988160a205a93196d336428"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1592853550,
+        value=0x5EF1042E,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest104.py b/tests/ported_static/stRandom/test_random_statetest104.py
index c608688bd27..afe9dcba48b 100644
--- a/tests/ported_static/stRandom/test_random_statetest104.py
+++ b/tests/ported_static/stRandom/test_random_statetest104.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest104.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest104Filler.json
+state_tests/stRandom/randomStatetest104Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest104Filler.json"],
+    ["state_tests/stRandom/randomStatetest104Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest104(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest104."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,71 +47,65 @@ def test_random_statetest104(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f147d6b978c780a82619772417d5b6a5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x147D6B978C780A82619772417D5B6A55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xB61574BCDB93BE7004C2854E6F644AC5B40F9A42),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x147D6B978C780A82619772417D5B6A55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xb61574bcdb93be7004c2854e6f644ac5b40f9a42"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000007fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe6f147d6b978c780a82619772417d5b6a"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f147d6b978c780a82619772417d5b6a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=977250261,
+        value=0x3A3FA7D5,
     )
 
     post = {
-        contract: Account(storage={0: 0x147D6B978C780A82619772417D5B6A55}),
+        target: Account(
+            storage={0: 0x147D6B978C780A82619772417D5B6A55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest105.py b/tests/ported_static/stRandom/test_random_statetest105.py
index 98d2bfa57e8..90f64842584 100644
--- a/tests/ported_static/stRandom/test_random_statetest105.py
+++ b/tests/ported_static/stRandom/test_random_statetest105.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest105.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest105Filler.json
+state_tests/stRandom/randomStatetest105Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest105Filler.json"],
+    ["state_tests/stRandom/randomStatetest105Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest105(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest105."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,59 @@ def test_random_statetest105(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.NUMBER
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x9914639111156D1759FF65039A02926C,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f9914639111156d1759ff65039a02926c60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.NUMBER
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x9914639111156D1759FF65039A02926C
         ),
         nonce=0,
-        address=Address("0x63cf59ffaac800568afbd0eef9b295cf57a579ec"),  # noqa: E501
+        address=Address(0x63CF59FFAAC800568AFBD0EEF9B295CF57A579EC),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff437f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff6f9914639111156d1759ff65039a"  # noqa: E501
-            "02926c"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f9914639111156d1759ff65039a02926c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1449730295,
+        value=0x566920F7,
     )
 
     post = {
-        contract: Account(storage={0: 0x9914639111156D1759FF65039A02926C}),
+        target: Account(
+            storage={0: 0x9914639111156D1759FF65039A02926C},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest106.py b/tests/ported_static/stRandom/test_random_statetest106.py
index b406e0ce095..5ad21bb902b 100644
--- a/tests/ported_static/stRandom/test_random_statetest106.py
+++ b/tests/ported_static/stRandom/test_random_statetest106.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest106.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest106Filler.json
+state_tests/stRandom/randomStatetest106Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest106Filler.json"],
+    ["state_tests/stRandom/randomStatetest106Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest106(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest106."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,62 @@ def test_random_statetest106(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f327043726481f25094828e211557795560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x327043726481F25094828E2115577955
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xBB5627060FD93B15984B68905719BEC910F7299A),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x327043726481F25094828E2115577955,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xbb5627060fd93b15984b68905719bec910f7299a"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000007f0000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff6f327043726481f25094828e21155779"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f327043726481f25094828e21155779"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1107240556,
+        value=0x41FF266C,
     )
 
     post = {
-        contract: Account(storage={0: 0x327043726481F25094828E2115577955}),
+        target: Account(
+            storage={0: 0x327043726481F25094828E2115577955},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest107.py b/tests/ported_static/stRandom/test_random_statetest107.py
index c913c437036..2f1309ef117 100644
--- a/tests/ported_static/stRandom/test_random_statetest107.py
+++ b/tests/ported_static/stRandom/test_random_statetest107.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest107.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest107Filler.json
+state_tests/stRandom/randomStatetest107Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest107Filler.json"],
+    ["state_tests/stRandom/randomStatetest107Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest107(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest107."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,70 +47,65 @@ def test_random_statetest107(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.GASLIMIT
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MULMOD(
-                    Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b50960005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.GASLIMIT
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MULMOD(
+                Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000094"  # noqa: E501
-            "5304eb96065b2a98b57a48a06ae28d285a71b509"
+        to=contract_0,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b509"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1335641355,
+        value=0x4F9C450B,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFF6BACFB1469F9A4D5674A85B75F951D72D7A58E4A,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest108.py b/tests/ported_static/stRandom/test_random_statetest108.py
index c8d03cdb715..27eb868b255 100644
--- a/tests/ported_static/stRandom/test_random_statetest108.py
+++ b/tests/ported_static/stRandom/test_random_statetest108.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest108.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest108Filler.json
+state_tests/stRandom/randomStatetest108Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest108Filler.json"],
+    ["state_tests/stRandom/randomStatetest108Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest108(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest108."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,47 +43,46 @@ def test_random_statetest108(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x41443442f34241
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.COINBASE
+        + Op.PREVRANDAO
+        + Op.RETURN(offset=Op.TIMESTAMP, size=Op.CALLVALUE)
+        + Op.TIMESTAMP
+        + Op.COINBASE,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.COINBASE
-            + Op.PREVRANDAO
-            + Op.RETURN(offset=Op.TIMESTAMP, size=Op.CALLVALUE)
-            + Op.TIMESTAMP
-            + Op.COINBASE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=46,
         nonce=0,
-        address=Address("0xf3c8d5ea3ce820d6b26253d4d1d9106008c757db"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0xDE0B6B3A76586A0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest11.py b/tests/ported_static/stRandom/test_random_statetest11.py
index d619e41eb91..72d45df370e 100644
--- a/tests/ported_static/stRandom/test_random_statetest11.py
+++ b/tests/ported_static/stRandom/test_random_statetest11.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest11.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest11Filler.json
+state_tests/stRandom/randomStatetest11Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest11Filler.json"],
+    ["state_tests/stRandom/randomStatetest11Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest11(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest11."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,58 @@ def test_random_statetest11(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0xA093F3408A6E531735960A7617127A55,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3506fa093f3408a6e531735960a7617127a5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1] * 2
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0xA093F3408A6E531735960A7617127A55
         ),
         nonce=0,
-        address=Address("0x5b43c2b5e72deee35add94ad33df0d4a4c5c443e"),  # noqa: E501
+        address=Address(0x5B43C2B5E72DEEE35ADD94AD33DF0D4A4C5C443E),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000007f0000000000000000000000004f3f701464"  # noqa: E501
-            "972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c3506fa093f3408a6e531735960a7617127a"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3506fa093f3408a6e531735960a7617127a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1762251756,
+        value=0x6909D3EC,
     )
 
     post = {
-        contract: Account(storage={0: 0xA093F3408A6E531735960A7617127A55}),
+        target: Account(
+            storage={0: 0xA093F3408A6E531735960A7617127A55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest110.py b/tests/ported_static/stRandom/test_random_statetest110.py
index 2478f9c34cf..d1979dc473f 100644
--- a/tests/ported_static/stRandom/test_random_statetest110.py
+++ b/tests/ported_static/stRandom/test_random_statetest110.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest110.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest110Filler.json
+state_tests/stRandom/randomStatetest110Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest110Filler.json"],
+    ["state_tests/stRandom/randomStatetest110Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest110(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest110."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,67 +46,58 @@ def test_random_statetest110(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.COINBASE
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x97543C343476CB7C8C84066217F10255,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000016f97543c343476cb7c8c84066217f1025560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[0x0] * 3
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.COINBASE
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x97543C343476CB7C8C84066217F10255
         ),
         nonce=0,
-        address=Address("0x1aaf68323ab1e37cd74284092e2c0ece9e2b0513"),  # noqa: E501
+        address=Address(0x1AAF68323AB1E37CD74284092E2C0ECE9E2B0513),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000016f97543c343476cb7c8c84066217f102"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000016f97543c343476cb7c8c84066217f102"  # noqa: E501
         ),
         gas_limit=100000,
-        value=736834619,
+        value=0x2BEB343B,
     )
 
     post = {
-        contract: Account(storage={0: 0x97543C343476CB7C8C84066217F10255}),
+        target: Account(
+            storage={0: 0x97543C343476CB7C8C84066217F10255},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest111.py b/tests/ported_static/stRandom/test_random_statetest111.py
index f2fb46190f8..e9926c99608 100644
--- a/tests/ported_static/stRandom/test_random_statetest111.py
+++ b/tests/ported_static/stRandom/test_random_statetest111.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest111.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest111Filler.json
+state_tests/stRandom/randomStatetest111Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest111Filler.json"],
+    ["state_tests/stRandom/randomStatetest111Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest111(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest111."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,52 +43,45 @@ def test_random_statetest111(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c35059a17f0000000000000000000000000000000000000000000000000000000000000001f38f07bf60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c35059a17f0000000000000000000000000000000000000000000000000000000000000001f38f07bf60005155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c35059a17f000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000001f38f07bf60005155"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xc9edd4cf792e9feffee7968e9a49a0bd81a7ba40"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c35059a17f000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000001f38f07bf"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c35059a17f0000000000000000000000000000000000000000000000000000000000000001f38f07bf"  # noqa: E501
         ),
         gas_limit=500000,
-        value=50481116,
+        value=0x30247DC,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest112.py b/tests/ported_static/stRandom/test_random_statetest112.py
index 712aa5586f7..a9b2faece89 100644
--- a/tests/ported_static/stRandom/test_random_statetest112.py
+++ b/tests/ported_static/stRandom/test_random_statetest112.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest112.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest112Filler.json
+state_tests/stRandom/randomStatetest112Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest112Filler.json"],
+    ["state_tests/stRandom/randomStatetest112Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest112(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest112."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,63 @@ def test_random_statetest112(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff45447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f549c5779398a848c353075146505415560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.GASLIMIT
+        + Op.PREVRANDAO
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x549C5779398A848C3530751465054155
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x9A19E4295E01223B405262F9564425D5C46BF988),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.GASLIMIT
-            + Op.PREVRANDAO
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x549C5779398A848C3530751465054155,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x9a19e4295e01223b405262f9564425d5c46bf988"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff45447fffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000006f549c5779398a848c35307514650541"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff45447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f549c5779398a848c35307514650541"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2006825126,
+        value=0x779DB8A6,
     )
 
     post = {
-        contract: Account(storage={0: 0x549C5779398A848C3530751465054155}),
+        target: Account(
+            storage={0: 0x549C5779398A848C3530751465054155},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest114.py b/tests/ported_static/stRandom/test_random_statetest114.py
index 72928a4e873..f47ea665ee4 100644
--- a/tests/ported_static/stRandom/test_random_statetest114.py
+++ b/tests/ported_static/stRandom/test_random_statetest114.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest114.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest114Filler.json
+state_tests/stRandom/randomStatetest114Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest114Filler.json"],
+    ["state_tests/stRandom/randomStatetest114Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest114(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest114."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,70 +47,64 @@ def test_random_statetest114(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3584357ea388725483637d4471727f5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.COINBASE
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x3584357EA388725483637D4471727F55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xF35D522489CA508D66A53CE9804C3B67E665ABE4),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.COINBASE
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x3584357EA388725483637D4471727F55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xf35d522489ca508d66a53ce9804c3b67e665abe4"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000"  # noqa: E501
-            "0000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff6f3584357ea388725483637d4471727f"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3584357ea388725483637d4471727f"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1067998899,
+        value=0x3FA85EB3,
     )
 
     post = {
-        contract: Account(storage={0: 0x3584357EA388725483637D4471727F55}),
+        target: Account(
+            storage={0: 0x3584357EA388725483637D4471727F55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest115.py b/tests/ported_static/stRandom/test_random_statetest115.py
index c5961e0b19e..de2cae7b5b0 100644
--- a/tests/ported_static/stRandom/test_random_statetest115.py
+++ b/tests/ported_static/stRandom/test_random_statetest115.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest115.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest115Filler.json
+state_tests/stRandom/randomStatetest115Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest115Filler.json"],
+    ["state_tests/stRandom/randomStatetest115Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest115(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest115."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,58 @@ def test_random_statetest115(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x15448E363302150A6F56518AA0053155,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506f15448e363302150a6f56518aa005315560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xC350] * 2
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x15448E363302150A6F56518AA0053155
         ),
         nonce=0,
-        address=Address("0xb3287f1884b2a2955d0a6fba5c8f9ad74d939e4e"),  # noqa: E501
+        address=Address(0xB3287F1884B2A2955D0A6FBA5C8F9AD74D939E4E),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000007fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c3506f15448e363302150a6f56518aa00531"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506f15448e363302150a6f56518aa00531"  # noqa: E501
         ),
         gas_limit=3202574,
-        value=1948713091,
+        value=0x74270083,
     )
 
     post = {
-        contract: Account(storage={0: 0x15448E363302150A6F56518AA0053155}),
+        target: Account(
+            storage={0: 0x15448E363302150A6F56518AA0053155},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest116.py b/tests/ported_static/stRandom/test_random_statetest116.py
index fdb42d8ea8c..7a2db95bd91 100644
--- a/tests/ported_static/stRandom/test_random_statetest116.py
+++ b/tests/ported_static/stRandom/test_random_statetest116.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest116.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest116Filler.json
+state_tests/stRandom/randomStatetest116Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest116Filler.json"],
+    ["state_tests/stRandom/randomStatetest116Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest116(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest116."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,70 +47,64 @@ def test_random_statetest116(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.MSTORE8(
-                offset=Op.SMOD(
-                    Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-                value=Op.GASLIMIT,
-            )
-            + Op.SWAP4
-            + Op.CALLDATACOPY
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>0753933760005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.MSTORE8(
+            offset=Op.SMOD(
+                Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+            value=Op.GASLIMIT,
+        )
+        + Op.SWAP4
+        + Op.CALLDATACOPY
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x78f8b360c7bdd3b4dda493e8eea4590ed562a6c3"),  # noqa: E501
+        address=Address(0x78F8B360C7BDD3B4DDA493E8EEA4590ED562A6C3),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe457fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f7014"  # noqa: E501
-            "64972e74606d6ea82d4d3080599a0e7907539337"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7907539337"  # noqa: E501
         ),
         gas_limit=100000,
-        value=372067975,
+        value=0x162D4E87,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={0: 0x10000000000000000000000000000000000000000},
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest117.py b/tests/ported_static/stRandom/test_random_statetest117.py
index 6c97718c77d..4dd85d25fc1 100644
--- a/tests/ported_static/stRandom/test_random_statetest117.py
+++ b/tests/ported_static/stRandom/test_random_statetest117.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest117.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest117Filler.json
+state_tests/stRandom/randomStatetest117Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest117Filler.json"],
+    ["state_tests/stRandom/randomStatetest117Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest117(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest117."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,58 +47,55 @@ def test_random_statetest117(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PREVRANDAO
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x8AA4A4980274F18C6158368D41571455,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x3374b8f7389a6ecd92dc42cbc9bb4e7cc0dce3ff"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x447f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f8aa4a4980274f18c6158368d4157145560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PREVRANDAO
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x8AA4A4980274F18C6158368D41571455
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x3374B8F7389A6ECD92DC42CBC9BB4E7CC0DCE3FF),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "447f00000000000000000000000000000000000000000000000000000000000000017f00"  # noqa: E501
-            "00000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79427f000000"  # noqa: E501
-            "000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000"  # noqa: E501
-            "00000000000100000000000000000000000000000000000000006f8aa4a4980274f18c61"  # noqa: E501
-            "58368d415714"
+        to=target,
+        data=Bytes(
+            "447f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f8aa4a4980274f18c6158368d415714"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1763362724,
+        value=0x691AC7A4,
     )
 
     post = {
-        contract: Account(storage={0: 0x8AA4A4980274F18C6158368D41571455}),
+        target: Account(
+            storage={0: 0x8AA4A4980274F18C6158368D41571455},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest118.py b/tests/ported_static/stRandom/test_random_statetest118.py
index b73af708c1b..07766a98ece 100644
--- a/tests/ported_static/stRandom/test_random_statetest118.py
+++ b/tests/ported_static/stRandom/test_random_statetest118.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest118.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest118Filler.json
+state_tests/stRandom/randomStatetest118Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest118Filler.json"],
+    ["state_tests/stRandom/randomStatetest118Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest118(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest118."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,68 +47,62 @@ def test_random_statetest118(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GASLIMIT
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x55817C037FA45BF3850320309A8F0255,
-            )
+    # Source: raw
+    # 0x457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000006f55817c037fa45bf3850320309a8f025560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.GASLIMIT
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x55817C037FA45BF3850320309A8F0255
         ),
         nonce=0,
-        address=Address("0xc35874f463b793094544a6de8c6bd10baa69e812"),  # noqa: E501
+        address=Address(0xC35874F463B793094544A6DE8C6BD10BAA69E812),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000"  # noqa: E501
-            "00004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000006f55817c037fa45bf3850320309a8f02"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000006f55817c037fa45bf3850320309a8f02"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1190213224,
+        value=0x46F13668,
     )
 
     post = {
-        contract: Account(storage={0: 0x55817C037FA45BF3850320309A8F0255}),
+        target: Account(
+            storage={0: 0x55817C037FA45BF3850320309A8F0255},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest119.py b/tests/ported_static/stRandom/test_random_statetest119.py
index 33bad6185de..1b61ded5c5c 100644
--- a/tests/ported_static/stRandom/test_random_statetest119.py
+++ b/tests/ported_static/stRandom/test_random_statetest119.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest119.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest119Filler.json
+state_tests/stRandom/randomStatetest119Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest119Filler.json"],
+    ["state_tests/stRandom/randomStatetest119Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest119(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest119."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,61 +47,56 @@ def test_random_statetest119(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x4559437f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006f52503b127c115a9673a431379095665560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.GASLIMIT
+        + Op.MSIZE
+        + Op.NUMBER
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x52503B127C115A9673A4313790956655
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xB49CE71DF6647BAF4BA00DB0F0579CDBDE684010),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GASLIMIT
-            + Op.MSIZE
-            + Op.NUMBER
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x52503B127C115A9673A4313790956655,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xb49ce71df6647baf4ba00db0f0579cdbde684010"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "4559437f0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000006f52503b127c115a9673a431"  # noqa: E501
-            "37909566"
+        to=target,
+        data=Bytes(
+            "4559437f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006f52503b127c115a9673a43137909566"  # noqa: E501
         ),
         gas_limit=100000,
-        value=412561866,
+        value=0x189731CA,
     )
 
     post = {
-        contract: Account(storage={0: 0x52503B127C115A9673A4313790956655}),
+        target: Account(
+            storage={0: 0x52503B127C115A9673A4313790956655},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest12.py b/tests/ported_static/stRandom/test_random_statetest12.py
index d4221d501fc..86f7a58f916 100644
--- a/tests/ported_static/stRandom/test_random_statetest12.py
+++ b/tests/ported_static/stRandom/test_random_statetest12.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest12.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest12Filler.json
+state_tests/stRandom/randomStatetest12Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest12Filler.json"],
+    ["state_tests/stRandom/randomStatetest12Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest12(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest12."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,64 +47,60 @@ def test_random_statetest12(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.GASLIMIT
-            + Op.MUL(
-                Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-            )
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x165490A41215369EF276037941163355,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>027f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f165490a41215369ef27603794116335560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.GASLIMIT
+        + Op.MUL(
+            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,
+        )
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x165490A41215369EF276037941163355
         ),
         nonce=0,
-        address=Address("0xd52a7895f47045dacf362bbfd74ab386c9b62156"),  # noqa: E501
+        address=Address(0xD52A7895F47045DACF362BBFD74AB386C9B62156),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff457fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000"  # noqa: E501
-            "00004f3f701464972e74606d6ea82d4d3080599a0e79027f000000000000000000000000"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff6f165490a41215369ef2760379411633"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79027f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f165490a41215369ef2760379411633"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1165421411,
+        value=0x4576EB63,
     )
 
     post = {
-        contract: Account(storage={0: 0x165490A41215369EF276037941163355}),
+        target: Account(
+            storage={0: 0x165490A41215369EF276037941163355},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest120.py b/tests/ported_static/stRandom/test_random_statetest120.py
index 10876de57d1..af3ef063276 100644
--- a/tests/ported_static/stRandom/test_random_statetest120.py
+++ b/tests/ported_static/stRandom/test_random_statetest120.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest120.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest120Filler.json
+state_tests/stRandom/randomStatetest120Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest120Filler.json"],
+    ["state_tests/stRandom/randomStatetest120Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest120(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest120."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,75 +47,64 @@ def test_random_statetest120(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe820860005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 3
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.ADDMOD(
+                Op.DUP3,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xDADC3C24C519D790BF883B869E84E4ECF30808AE),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.ADDMOD(
-                    Op.DUP3,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xdadc3c24c519d790bf883b869e84e4ecf30808ae"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe8208"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8208"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1887172074,
+        value=0x707BF5EA,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest121.py b/tests/ported_static/stRandom/test_random_statetest121.py
index 19e3ba3c0c0..f8b577b6d51 100644
--- a/tests/ported_static/stRandom/test_random_statetest121.py
+++ b/tests/ported_static/stRandom/test_random_statetest121.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest121.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest121Filler.json
+state_tests/stRandom/randomStatetest121Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest121Filler.json"],
+    ["state_tests/stRandom/randomStatetest121Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest121(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest121."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,68 +47,61 @@ def test_random_statetest121(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.GASLIMIT
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x305842321509108C689F7CA3195A9D55,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350456f305842321509108c689f7ca3195a9d5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[0xC350]
+        + Op.GASLIMIT
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x305842321509108C689F7CA3195A9D55
         ),
         nonce=0,
-        address=Address("0xed5527e2a67bd5a393ddaee03f7e2367c171b6c7"),  # noqa: E501
+        address=Address(0xED5527E2A67BD5A393DDAEE03F7E2367C171B6C7),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c350456f305842321509108c689f7ca3195a9d"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350456f305842321509108c689f7ca3195a9d"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1227523279,
+        value=0x492A84CF,
     )
 
     post = {
-        contract: Account(storage={0: 0x305842321509108C689F7CA3195A9D55}),
+        target: Account(
+            storage={0: 0x305842321509108C689F7CA3195A9D55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest122.py b/tests/ported_static/stRandom/test_random_statetest122.py
index 1500b35b8e2..6cc5f6b8caf 100644
--- a/tests/ported_static/stRandom/test_random_statetest122.py
+++ b/tests/ported_static/stRandom/test_random_statetest122.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest122.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest122Filler.json
+state_tests/stRandom/randomStatetest122Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest122Filler.json"],
+    ["state_tests/stRandom/randomStatetest122Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest122(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest122."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,61 @@ def test_random_statetest122(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0xA2825B6C338F8D717156560AF045136B,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6fa2825b6c338f8d717156560af045136b60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0xA2825B6C338F8D717156560AF045136B
         ),
         nonce=0,
-        address=Address("0x5ad019811a4034583d362b1619d74027a576b6e4"),  # noqa: E501
+        address=Address(0x5AD019811A4034583D362B1619D74027A576B6E4),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff6fa2825b6c338f8d717156560af045136b"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6fa2825b6c338f8d717156560af045136b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=538407333,
+        value=0x201771A5,
     )
 
     post = {
-        contract: Account(storage={0: 0xA2825B6C338F8D717156560AF045136B}),
+        target: Account(
+            storage={0: 0xA2825B6C338F8D717156560AF045136B},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest124.py b/tests/ported_static/stRandom/test_random_statetest124.py
index 23d95e0dd9b..78e7b5a37e5 100644
--- a/tests/ported_static/stRandom/test_random_statetest124.py
+++ b/tests/ported_static/stRandom/test_random_statetest124.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest124.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest124Filler.json
+state_tests/stRandom/randomStatetest124Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest124Filler.json"],
+    ["state_tests/stRandom/randomStatetest124Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest124(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest124."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,61 +47,51 @@ def test_random_statetest124(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08125580355b17457f7463587b9a7a435560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08125580355b17457f7463587b9a7a435560005155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xC4CBACC101A51D79B3AFA8C6C5CBA772D1BD4E4A),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe08125580355b17457f7463587b9a7a435560005155"  # noqa: E501
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xc4cbacc101a51d79b3afa8c6c5cba772d1bd4e4a"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe08125580355b17457f7463587b9a7a43"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08125580355b17457f7463587b9a7a43"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1751381635,
+        value=0x6863F683,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 1: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest125.py b/tests/ported_static/stRandom/test_random_statetest125.py
index 229b8a57495..eb54ea5851d 100644
--- a/tests/ported_static/stRandom/test_random_statetest125.py
+++ b/tests/ported_static/stRandom/test_random_statetest125.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest125.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest125Filler.json
+state_tests/stRandom/randomStatetest125Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest125Filler.json"],
+    ["state_tests/stRandom/randomStatetest125Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest125(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest125."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,52 +43,45 @@ def test_random_statetest125(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f0000000000000000000000000000000000000000000000000000000000000001207f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe406f  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000001207f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3507fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe406f"
+            "7f0000000000000000000000000000000000000000000000000000000000000001207f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe406f"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x1b0e1dbc498c84f90c7fd8527d4769745ef1b402"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000001207f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3507fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe406f"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000000000000000000000000000000000000000000001207f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe406f"  # noqa: E501
         ),
         gas_limit=100000,
-        value=781711523,
+        value=0x2E97F8A3,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest126.py b/tests/ported_static/stRandom/test_random_statetest126.py
index c0264bdc521..579c4fea63a 100644
--- a/tests/ported_static/stRandom/test_random_statetest126.py
+++ b/tests/ported_static/stRandom/test_random_statetest126.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest126.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest126Filler.json
+state_tests/stRandom/randomStatetest126Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest126Filler.json"],
+    ["state_tests/stRandom/randomStatetest126Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest126(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest126."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,105 +43,47 @@ def test_random_statetest126(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x4142
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.COINBASE + Op.TIMESTAMP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x14d62b5f3407c5252cf14978b30aa72f1d70c9b7"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest126Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest126_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
+        value=0x186A0,
     )
 
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=Op.COINBASE + Op.TIMESTAMP,
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x14d62b5f3407c5252cf14978b30aa72f1d70c9b7"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    post = {
+        target: Account(
+            storage={},
+            code=bytes.fromhex("4142"),
+            balance=0xDE0B6B3A76586A0,
+            nonce=0,
         ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
-        gas_limit=400000,
-        value=100000,
-    )
-
-    post: dict = {}
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest129.py b/tests/ported_static/stRandom/test_random_statetest129.py
index 35c9e49c4d2..4d1bdf56d05 100644
--- a/tests/ported_static/stRandom/test_random_statetest129.py
+++ b/tests/ported_static/stRandom/test_random_statetest129.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest129.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest129Filler.json
+state_tests/stRandom/randomStatetest129Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest129Filler.json"],
+    ["state_tests/stRandom/randomStatetest129Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest129(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest129."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,59 @@ def test_random_statetest129(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x166E733343093A31A33B8E025A027055,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f166e733343093a31a33b8e025a02705560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x166E733343093A31A33B8E025A027055
         ),
         nonce=0,
-        address=Address("0xafc41179eb323ca01eb2d38b409233edd0bbfd84"),  # noqa: E501
+        address=Address(0xAFC41179EB323CA01EB2D38B409233EDD0BBFD84),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff6f166e733343093a31a33b8e025a0270"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f166e733343093a31a33b8e025a0270"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1110233548,
+        value=0x422CD1CC,
     )
 
     post = {
-        contract: Account(storage={0: 0x166E733343093A31A33B8E025A027055}),
+        target: Account(
+            storage={0: 0x166E733343093A31A33B8E025A027055},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest13.py b/tests/ported_static/stRandom/test_random_statetest13.py
index c40576855de..69cbf6a3159 100644
--- a/tests/ported_static/stRandom/test_random_statetest13.py
+++ b/tests/ported_static/stRandom/test_random_statetest13.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest13.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest13Filler.json
+state_tests/stRandom/randomStatetest13Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest13Filler.json"],
+    ["state_tests/stRandom/randomStatetest13Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest13(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest13."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,62 +43,56 @@ def test_random_statetest13(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.MUL(
-                Op.PUSH32[0x0],
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.ADDRESS
-            + Op.MSTORE(
-                offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
-                value=Op.PUSH32[0x10000000000000000000000000000000000000000],
-            )
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000027ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe307f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000005255  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.MUL(
+            Op.PUSH32[0x0],
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+        )
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.ADDRESS
+        + Op.MSTORE(
+            offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
+            value=Op.PUSH32[0x10000000000000000000000000000000000000000],
+        )
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0xd9c946d2f4e706fbe9fb6f91b4034bd946606105"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000027fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe307f000000000000000000"  # noqa: E501
-            "00000100000000000000000000000000000000000000007f000000000000000000000001"  # noqa: E501
-            "000000000000000000000000000000000000000052"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000027ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe307f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000052"  # noqa: E501
         ),
         gas_limit=100000,
-        value=936808044,
+        value=0x37D68E6C,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest130.py b/tests/ported_static/stRandom/test_random_statetest130.py
index f86a05123c8..b4d4e79efde 100644
--- a/tests/ported_static/stRandom/test_random_statetest130.py
+++ b/tests/ported_static/stRandom/test_random_statetest130.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest130.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest130Filler.json
+state_tests/stRandom/randomStatetest130Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest130Filler.json"],
+    ["state_tests/stRandom/randomStatetest130Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest130(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest130."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,68 +47,60 @@ def test_random_statetest130(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.COINBASE
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x368A668B76306D181A39361198831755,
-            )
+    # Source: raw
+    # 0x417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016f368a668b76306d181a3936119883175560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.COINBASE
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x368A668B76306D181A39361198831755
         ),
         nonce=0,
-        address=Address("0x778a9e494c0c5bc6a3648b651752adcde32af9fc"),  # noqa: E501
+        address=Address(0x778A9E494C0C5BC6A3648B651752ADCDE32AF9FC),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "00000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000"  # noqa: E501
-            "00004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000016f368a668b76306d181a393611988317"
+        to=target,
+        data=Bytes(
+            "417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016f368a668b76306d181a393611988317"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1912800960,
+        value=0x720306C0,
     )
 
     post = {
-        contract: Account(storage={0: 0x368A668B76306D181A39361198831755}),
+        target: Account(
+            storage={0: 0x368A668B76306D181A39361198831755},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest131.py b/tests/ported_static/stRandom/test_random_statetest131.py
index fd3f46d74e0..839150249a4 100644
--- a/tests/ported_static/stRandom/test_random_statetest131.py
+++ b/tests/ported_static/stRandom/test_random_statetest131.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest131.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest131Filler.json
+state_tests/stRandom/randomStatetest131Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest131Filler.json"],
+    ["state_tests/stRandom/randomStatetest131Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest131(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest131."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,59 @@ def test_random_statetest131(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000014416f36ff85758270710168547a977788609660005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.EQ(
+            Op.PUSH32[0x10000000000000000000000000000000000000000],
+            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+        )
+        + Op.COINBASE
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x36FF85758270710168547A9777886096
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x938A9916F93AFD04F1E2A70E00DC813C8DF3DDB8),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.EQ(
-                Op.PUSH32[0x10000000000000000000000000000000000000000],
-                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.COINBASE
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x36FF85758270710168547A9777886096,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x938a9916f93afd04f1e2a70e00dc813c8df3ddb8"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "01000000000000000000000000000000000000000014416f36ff85758270710168547a97"  # noqa: E501
-            "77886096"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000014416f36ff85758270710168547a9777886096"  # noqa: E501
         ),
         gas_limit=100000,
-        value=474455952,
+        value=0x1C479F90,
     )
 
     post = {
-        contract: Account(storage={0: 0x36FF85758270710168547A9777886096}),
+        target: Account(
+            storage={0: 0x36FF85758270710168547A9777886096},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest133.py b/tests/ported_static/stRandom/test_random_statetest133.py
index a0195ea3601..632885666d4 100644
--- a/tests/ported_static/stRandom/test_random_statetest133.py
+++ b/tests/ported_static/stRandom/test_random_statetest133.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest133.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest133Filler.json
+state_tests/stRandom/randomStatetest133Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest133Filler.json"],
+    ["state_tests/stRandom/randomStatetest133Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest133(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest133."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,45 @@ def test_random_statetest133(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000001357f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000017f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000035830b503516a46d0b03"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x329bc91a29577639030b3d2025ecfa2ab0fc3ba8"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001357f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000000035830b503516a46d0b03  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001357f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000000035830b503516a46d0b03"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000001357f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000017f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000035830b503516a46d0b03"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001357f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000000035830b503516a46d0b03"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1524251084,
+        value=0x5ADA39CC,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest134.py b/tests/ported_static/stRandom/test_random_statetest134.py
index d7569038141..cc6196657b8 100644
--- a/tests/ported_static/stRandom/test_random_statetest134.py
+++ b/tests/ported_static/stRandom/test_random_statetest134.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest134.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest134Filler.json
+state_tests/stRandom/randomStatetest134Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest134Filler.json"],
+    ["state_tests/stRandom/randomStatetest134Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest134(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest134."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,63 +43,57 @@ def test_random_statetest134(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.COINBASE
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                value=Op.PUSH32[0x0],
-            )
-            + Op.DUP4
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0), value=0x636C9C395A07320145334055
-            )
+    # Source: raw
+    # 0x417f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff557f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff55836b636c9c395a0732014533405560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.COINBASE
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+        )
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            value=Op.PUSH32[0x0],
+        )
+        + Op.DUP4
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x636C9C395A07320145334055
         ),
         nonce=0,
-        address=Address("0x955495cf3dc6d8b98b51e7c3f09c27a30c0e87f0"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "417f00000000000000000000000000000000000000000000000000000000000000007f00"  # noqa: E501
-            "0000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff557f000000000000"  # noqa: E501
-            "0000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000007f000000000000000000000000"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff55836b636c9c395a073201453340"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "417f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff557f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff55836b636c9c395a073201453340"  # noqa: E501
         ),
         gas_limit=100000,
-        value=65268053,
+        value=0x3E3E955,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest135.py b/tests/ported_static/stRandom/test_random_statetest135.py
index 3773f3e409d..6d91f04aee8 100644
--- a/tests/ported_static/stRandom/test_random_statetest135.py
+++ b/tests/ported_static/stRandom/test_random_statetest135.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest135.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest135Filler.json
+state_tests/stRandom/randomStatetest135Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest135Filler.json"],
+    ["state_tests/stRandom/randomStatetest135Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest135(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest135."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,76 +43,69 @@ def test_random_statetest135(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.COINBASE
-            + Op.SSTORE(
-                key=Op.DIV(
-                    Op.DUP8,
-                    Op.AND(
-                        0x3192186630,
-                        Op.SIGNEXTEND(
-                            Op.GAS,
-                            Op.SMOD(
-                                Op.CREATE(
-                                    value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                                    offset=Op.PUSH32[
-                                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-                                    ],
-                                    size=Op.PUSH32[0x0],
-                                ),
-                                Op.PUSH32[
-                                    0x4F3F701464972E74606D6EA82D4D3080599A0E79
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0075a0b64319218663016870455  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.COINBASE
+        + Op.SSTORE(
+            key=Op.DIV(
+                Op.DUP8,
+                Op.AND(
+                    0x3192186630,
+                    Op.SIGNEXTEND(
+                        Op.GAS,
+                        Op.SMOD(
+                            Op.CREATE(
+                                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                                offset=Op.PUSH32[
+                                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
                                 ],
+                                size=Op.PUSH32[0x0],
                             ),
+                            Op.PUSH32[
+                                0x4F3F701464972E74606D6EA82D4D3080599A0E79
+                            ],
                         ),
                     ),
                 ),
-                value=Op.PUSH32[0x0],
-            )
+            ),
+            value=Op.PUSH32[0x0],
         ),
         nonce=0,
-        address=Address("0x8be71dfba7b6d76d26a281635b0d1a85d947c1e5"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "000000000000000000010000000000000000000000000000000000000000417f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000007f00000000000000"  # noqa: E501
-            "00000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000007f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffff0075a0b643192186630168704"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0075a0b643192186630168704"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1650167023,
+        value=0x625B8CEF,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest137.py b/tests/ported_static/stRandom/test_random_statetest137.py
index c4394a33185..fb64a290214 100644
--- a/tests/ported_static/stRandom/test_random_statetest137.py
+++ b/tests/ported_static/stRandom/test_random_statetest137.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest137.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest137Filler.json
+state_tests/stRandom/randomStatetest137Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest137Filler.json"],
+    ["state_tests/stRandom/randomStatetest137Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest137(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest137."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,65 +47,60 @@ def test_random_statetest137(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.ADDMOD(
-                Op.PUSH32[0x0],
-                Op.PUSH32[0x0],
-                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=0xB5A130E86CA17390989355F092A255600051,
-                value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000087f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5a130e86ca17390989355f092a25560005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.ADDMOD(
+            Op.PUSH32[0x0],
+            Op.PUSH32[0x0],
+            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+        )
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=0xB5A130E86CA17390989355F092A255600051,
+            value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000087f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017e7f000000000000000000000000"  # noqa: E501
-            "945304eb96065b2a98b57a48a06ae28d285a71b5a130e86ca17390989355f092a2"  # noqa: E501
+        to=contract_0,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000087f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5a130e86ca17390989355f092a2"  # noqa: E501
         ),
         gas_limit=100000,
-        value=866944487,
+        value=0x33AC85E7,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0xB5A130E86CA17390989355F092A255600051: 0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest138.py b/tests/ported_static/stRandom/test_random_statetest138.py
index f64773d294e..6f2086dd8ed 100644
--- a/tests/ported_static/stRandom/test_random_statetest138.py
+++ b/tests/ported_static/stRandom/test_random_statetest138.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest138.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest138Filler.json
+state_tests/stRandom/randomStatetest138Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest138Filler.json"],
+    ["state_tests/stRandom/randomStatetest138Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest138(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest138."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,61 +47,57 @@ def test_random_statetest138(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350447f0000000000000000000000000000000000000000000000000000000000000001f1595160005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.CALL(
+            gas=Op.PUSH32[0x1],
+            address=Op.PREVRANDAO,
+            value=Op.PUSH32[0xC350],
+            args_offset=Op.PUSH32[0xC350],
+            args_size=Op.PUSH32[0xC350],
+            ret_offset=Op.PUSH32[0x1],
+            ret_size=Op.PUSH32[0xC350],
+        )
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.MLOAD(offset=Op.MSIZE)),
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x8AF98DC438CC4E9B27789D187A550DF8E85599DE),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.CALL(
-                gas=Op.PUSH32[0x1],
-                address=Op.PREVRANDAO,
-                value=Op.PUSH32[0xC350],
-                args_offset=Op.PUSH32[0xC350],
-                args_size=Op.PUSH32[0xC350],
-                ret_offset=Op.PUSH32[0x1],
-                ret_size=Op.PUSH32[0xC350],
-            )
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0), value=Op.MLOAD(offset=Op.MSIZE)
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x8af98dc438cc4e9b27789d187a550df8e85599de"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507f0000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000c350447f00000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000001f15951"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350447f0000000000000000000000000000000000000000000000000000000000000001f15951"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1998228906,
+        value=0x771A8DAA,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x0000000000000000000000000000000000020000): Account(
+            storage={}, code=b"", balance=50000, nonce=0
+        ),
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest139.py b/tests/ported_static/stRandom/test_random_statetest139.py
index 5865c80ea51..eeded5a3fb6 100644
--- a/tests/ported_static/stRandom/test_random_statetest139.py
+++ b/tests/ported_static/stRandom/test_random_statetest139.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest139.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest139Filler.json
+state_tests/stRandom/randomStatetest139Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest139Filler.json"],
+    ["state_tests/stRandom/randomStatetest139Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest139(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest139."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,61 +43,55 @@ def test_random_statetest139(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x33447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff434461334515455560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLER
+        + Op.PREVRANDAO
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.NUMBER
+        + Op.PREVRANDAO
+        + Op.SSTORE(key=Op.GASLIMIT, value=Op.ISZERO(0x3345))
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLER
-            + Op.PREVRANDAO
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.NUMBER
-            + Op.PREVRANDAO
-            + Op.SSTORE(key=Op.GASLIMIT, value=Op.ISZERO(0x3345))
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x5b857b55e25462b8a882575cb794ad3fed2a8785"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "33447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000c3507fffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000"  # noqa: E501
-            "000000000000ffffffffffffffffffffffffffffffffffffffff43446133451545"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "33447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff43446133451545"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1084026867,
+        value=0x409CEFF3,
     )
 
     post = {
-        contract: Account(storage={0: 0x20000}),
+        target: Account(storage={0: 0x20000}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest14.py b/tests/ported_static/stRandom/test_random_statetest14.py
index 3791c8dcbf3..8c06ccf6ca2 100644
--- a/tests/ported_static/stRandom/test_random_statetest14.py
+++ b/tests/ported_static/stRandom/test_random_statetest14.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest14.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest14Filler.json
+state_tests/stRandom/randomStatetest14Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest14Filler.json"],
+    ["state_tests/stRandom/randomStatetest14Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest14(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest14."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,53 +47,48 @@ def test_random_statetest14(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff20547f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeff61853634f06b907f899d7455  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff20547f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeff61853634f06b907f899d7455"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xB7A03DFBE844D08CBF10C74EADE7E3041F3453F5),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff20547f000000000000"  # noqa: E501
-            "000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000c3507fffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffeff61853634f06b907f899d7455"  # noqa: E501
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xb7a03dfbe844d08cbf10c74eade7e3041f3453f5"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff20547f000000000000"  # noqa: E501
-            "000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000c3507fffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffeff61853634f06b907f899d74"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff20547f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeff61853634f06b907f899d74"  # noqa: E501
         ),
         gas_limit=100000,
-        value=308810775,
+        value=0x12681417,
     )
 
-    post: dict = {}
+    post = {
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+        Address(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE): Account(
+            storage={}, code=b"", nonce=0
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest142.py b/tests/ported_static/stRandom/test_random_statetest142.py
index 087927e8086..fa2332d513d 100644
--- a/tests/ported_static/stRandom/test_random_statetest142.py
+++ b/tests/ported_static/stRandom/test_random_statetest142.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest142.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest142Filler.json
+state_tests/stRandom/randomStatetest142Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest142Filler.json"],
+    ["state_tests/stRandom/randomStatetest142Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest142(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest142."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,77 +47,68 @@ def test_random_statetest142(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SWAP6
-            + Op.SWAP2
-            + Op.CALLDATACOPY
-            + Op.PUSH4[0x364087E]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.ADD(0x431107C88, Op.BYTE),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff959137630364087e1a640431107c880160005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x1] * 2
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SWAP6
+        + Op.SWAP2
+        + Op.CALLDATACOPY
+        + Op.PUSH4[0x364087E]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=Op.ADD(0x431107C88, Op.BYTE)
         ),
         nonce=0,
-        address=Address("0x61f5c948887569a5488e7b6b31a0e46e8e9e0c7e"),  # noqa: E501
+        address=Address(0x61F5C948887569A5488E7B6B31A0E46E8E9E0C7E),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff959137630364087e1a640431107c8801"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff959137630364087e1a640431107c8801"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1842485664,
+        value=0x6DD219A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 0x431107C88,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest143.py b/tests/ported_static/stRandom/test_random_statetest143.py
index 2c968c7b1d7..b702e0e691e 100644
--- a/tests/ported_static/stRandom/test_random_statetest143.py
+++ b/tests/ported_static/stRandom/test_random_statetest143.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest143.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest143Filler.json
+state_tests/stRandom/randomStatetest143Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest143Filler.json"],
+    ["state_tests/stRandom/randomStatetest143Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest143(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest143."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,58 +43,56 @@ def test_random_statetest143(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x414341414243421a2055
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.COINBASE
+        + Op.NUMBER
+        + Op.COINBASE
+        + Op.SSTORE(
+            key=Op.SHA3(
+                offset=Op.BYTE(Op.TIMESTAMP, Op.NUMBER), size=Op.TIMESTAMP
+            ),
+            value=Op.COINBASE,
         ),
-        balance=46,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.COINBASE
-            + Op.NUMBER
-            + Op.COINBASE
-            + Op.SSTORE(
-                key=Op.SHA3(
-                    offset=Op.BYTE(Op.TIMESTAMP, Op.NUMBER),
-                    size=Op.TIMESTAMP,
-                ),
-                value=Op.COINBASE,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=46,
         nonce=0,
-        address=Address("0xfcc847f31e7e75eaec0b29ceae4e989c97f49fb7"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
-                0xAE72E2BF2302EBCD309E003E5BE58830F96DEDDAF87BB89EEEA159388BFE3EC1: 0x4F3F701464972E74606D6EA82D4D3080599A0E79,  # noqa: E501
+                0xAE72E2BF2302EBCD309E003E5BE58830F96DEDDAF87BB89EEEA159388BFE3EC1: coinbase,  # noqa: E501
             },
+            balance=0xDE0B6B3A76586A0,
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest144.py b/tests/ported_static/stRandom/test_random_statetest144.py
index 6719fd46142..4f09a5cfc6b 100644
--- a/tests/ported_static/stRandom/test_random_statetest144.py
+++ b/tests/ported_static/stRandom/test_random_statetest144.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest144.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest144Filler.json
+state_tests/stRandom/randomStatetest144Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,21 +23,20 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest144Filler.json"],
+    ["state_tests/stRandom/randomStatetest144Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest144(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb0085a57673c8f7d78fb870418f622e42fd686e4")
+    """Test_random_statetest144."""
+    coinbase = Address(0xB0085A57673C8F7D78FB870418F622E42FD686E4)
+    addr = Address(0x19BCDBCD094C63DF253C825B4B8E6DFFC45C21A4)
     sender = EOA(
         key=0x102DA5C19454BAF64E4F417E04AC2551245F3F217FFE9197F0C1D80FC2B16CFF
     )
-    callee = Address("0x19bcdbcd094c63df253c825b4b8e6dffc45c21a4")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,188 +47,82 @@ def test_random_statetest144(
         gas_limit=1545160903,
     )
 
+    pre[addr] = Account(balance=0x2401AC5958344E85, nonce=53)
     pre[sender] = Account(balance=0x71E90493E6EB4C59)
-    pre[callee] = Account(balance=0x2401AC5958344E85, nonce=53)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH3[0x1DA825]
-            + Op.PUSH22[0xE942E4FD977ABDB407069CF700116E02B4F9B25D866B]
-            + Op.PUSH14[0x13163FFF2B8EF03CF8AB5D662AFB]
-            + Op.PUSH28[
-                0xB5C9E68462741090BC0976C9705B40411EFE39E80C20B572C5E3D75F
-            ]
-            + Op.PUSH25[0x8F9BE2F0981672B8DE37F9E2D1515046CB77CC3EE74646FB09]
-            + Op.PUSH15[0xADCE98908499B6FD54725F3C6A7259]
-            + Op.PUSH9[0x761BA50494D1ECAF1E]
-            + Op.PUSH25[0x7DB9A052952427C4F271C28D3E25728B2B76439A3166CD0ED3]
-            + Op.PUSH32[
-                0x30EC2421ED38EBD3B00B89BA9208391DC274E4EEFA69161A37DFFF7111756DD7  # noqa: E501
-            ]
-            + Op.SWAP8
-            + Op.LT
-            + Op.PUSH6[0xF05AA9DE4867]
-            + Op.PUSH1[0x9E]
-            + Op.PUSH30[
-                0x847A290D0EEB08CDE2FF294AE11DD16F8A3E32494D943FA0622CC04CD747
-            ]
-            + Op.PUSH12[0x6D2A1008E4AD1E2C33E2928E]
-            + Op.PUSH17[0x7C797F2A1A586BBF78658189BF58172FF7]
-            + Op.PUSH18[0x30BE2FFC9BBF7F171939BE260B30EB65B46A]
-            + Op.PUSH13[0xF107BE1C9ED5C92C99D69FE055]
-            + Op.SWAP4
-            + Op.DUP10
-            + Op.PUSH1[0xE]
-            + Op.PUSH1[0x13]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x9]
-            + Op.PUSH1[0x16]
-            + Op.PUSH1[0x12]
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x1]
-            + Op.ADD(0x17, 0xC)
-            + Op.DIV(0xB518D025727BDC6E, 0x200351654B9773409608AAA7DB1F)
-            + Op.PUSH4[0xB2BC334B]
-            + Op.PUSH6[0x8536D84DADC4]
-            + Op.SMOD(
-                0x29D728B6F5EE,
-                0x2288DA62C36B9A35BF8934E3781A4C44E91637CE5C6B2F916D7670,
-            )
-            + Op.PUSH1[0x13]
-            + Op.PUSH1[0x1E]
-            + Op.PUSH1[0x19]
-            + Op.PUSH1[0x8]
-            + Op.PUSH1[0x5]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x13]
-            + Op.PUSH1[0x1D]
-            + Op.SWAP7
-            + Op.CALLDATALOAD(offset=Op.TIMESTAMP)
-            + Op.PUSH9[0xCE21A850C04A77CEB9]
-        ),
-        balance=0x3255F99DE856501,
-        nonce=89,
-        address=Address("0xea1cd1b117b10ac33fd7bbf18889624625ede7d4"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "166e31b12700cdefa7a0591398d415023175d1e5a1eca036986533972cab6625e976572e"  # noqa: E501
-            "e91c150c"
-        ),
-        gas_limit=100000,
-        gas_price=232,
-        value=1022194925,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest144Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest144_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb0085a57673c8f7d78fb870418f622e42fd686e4")
-    sender = EOA(
-        key=0x102DA5C19454BAF64E4F417E04AC2551245F3F217FFE9197F0C1D80FC2B16CFF
-    )
-    callee = Address("0x19bcdbcd094c63df253c825b4b8e6dffc45c21a4")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=1545160903,
-    )
-
-    pre[sender] = Account(balance=0x71E90493E6EB4C59)
-    pre[callee] = Account(balance=0x2401AC5958344E85, nonce=53)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH3[0x1DA825]
-            + Op.PUSH22[0xE942E4FD977ABDB407069CF700116E02B4F9B25D866B]
-            + Op.PUSH14[0x13163FFF2B8EF03CF8AB5D662AFB]
-            + Op.PUSH28[
-                0xB5C9E68462741090BC0976C9705B40411EFE39E80C20B572C5E3D75F
-            ]
-            + Op.PUSH25[0x8F9BE2F0981672B8DE37F9E2D1515046CB77CC3EE74646FB09]
-            + Op.PUSH15[0xADCE98908499B6FD54725F3C6A7259]
-            + Op.PUSH9[0x761BA50494D1ECAF1E]
-            + Op.PUSH25[0x7DB9A052952427C4F271C28D3E25728B2B76439A3166CD0ED3]
-            + Op.PUSH32[
-                0x30EC2421ED38EBD3B00B89BA9208391DC274E4EEFA69161A37DFFF7111756DD7  # noqa: E501
-            ]
-            + Op.SWAP8
-            + Op.LT
-            + Op.PUSH6[0xF05AA9DE4867]
-            + Op.PUSH1[0x9E]
-            + Op.PUSH30[
-                0x847A290D0EEB08CDE2FF294AE11DD16F8A3E32494D943FA0622CC04CD747
-            ]
-            + Op.PUSH12[0x6D2A1008E4AD1E2C33E2928E]
-            + Op.PUSH17[0x7C797F2A1A586BBF78658189BF58172FF7]
-            + Op.PUSH18[0x30BE2FFC9BBF7F171939BE260B30EB65B46A]
-            + Op.PUSH13[0xF107BE1C9ED5C92C99D69FE055]
-            + Op.SWAP4
-            + Op.DUP10
-            + Op.PUSH1[0xE]
-            + Op.PUSH1[0x13]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x9]
-            + Op.PUSH1[0x16]
-            + Op.PUSH1[0x12]
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x1]
-            + Op.ADD(0x17, 0xC)
-            + Op.DIV(0xB518D025727BDC6E, 0x200351654B9773409608AAA7DB1F)
-            + Op.PUSH4[0xB2BC334B]
-            + Op.PUSH6[0x8536D84DADC4]
-            + Op.SMOD(
-                0x29D728B6F5EE,
-                0x2288DA62C36B9A35BF8934E3781A4C44E91637CE5C6B2F916D7670,
-            )
-            + Op.PUSH1[0x13]
-            + Op.PUSH1[0x1E]
-            + Op.PUSH1[0x19]
-            + Op.PUSH1[0x8]
-            + Op.PUSH1[0x5]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x13]
-            + Op.PUSH1[0x1D]
-            + Op.SWAP7
-            + Op.CALLDATALOAD(offset=Op.TIMESTAMP)
-            + Op.PUSH9[0xCE21A850C04A77CEB9]
-        ),
+    # Source: raw
+    # 0x621da82575e942e4fd977abdb407069cf700116e02b4f9b25d866b6d13163fff2b8ef03cf8ab5d662afb7bb5c9e68462741090bc0976c9705b40411efe39e80c20b572c5e3d75f788f9be2f0981672b8de37f9e2d1515046cb77cc3ee74646fb096eadce98908499b6fd54725f3c6a725968761ba50494d1ecaf1e787db9a052952427c4f271c28d3e25728b2b76439a3166cd0ed37f30ec2421ed38ebd3b00b89ba9208391dc274e4eefa69161a37dfff7111756dd7971065f05aa9de4867609e7d847a290d0eeb08cde2ff294ae11dd16f8a3e32494d943fa0622cc04cd7476b6d2a1008e4ad1e2c33e2928e707c797f2a1a586bbf78658189bf58172ff77130be2ffc9bbf7f171939be260b30eb65b46a6cf107be1c9ed5c92c99d69fe0559389600e6013601c60096016601260016001600c6017016d200351654b9773409608aaa7db1f67b518d025727bdc6e0463b2bc334b658536d84dadc47a2288da62c36b9a35bf8934e3781a4c44e91637ce5c6b2f916d76706529d728b6f5ee076013601e601960086005601c6013601d96423568ce21a850c04a77ceb9  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH3[0x1DA825]
+        + Op.PUSH22[0xE942E4FD977ABDB407069CF700116E02B4F9B25D866B]
+        + Op.PUSH14[0x13163FFF2B8EF03CF8AB5D662AFB]
+        + Op.PUSH28[0xB5C9E68462741090BC0976C9705B40411EFE39E80C20B572C5E3D75F]
+        + Op.PUSH25[0x8F9BE2F0981672B8DE37F9E2D1515046CB77CC3EE74646FB09]
+        + Op.PUSH15[0xADCE98908499B6FD54725F3C6A7259]
+        + Op.PUSH9[0x761BA50494D1ECAF1E]
+        + Op.PUSH25[0x7DB9A052952427C4F271C28D3E25728B2B76439A3166CD0ED3]
+        + Op.PUSH32[
+            0x30EC2421ED38EBD3B00B89BA9208391DC274E4EEFA69161A37DFFF7111756DD7
+        ]
+        + Op.SWAP8
+        + Op.LT
+        + Op.PUSH6[0xF05AA9DE4867]
+        + Op.PUSH1[0x9E]
+        + Op.PUSH30[
+            0x847A290D0EEB08CDE2FF294AE11DD16F8A3E32494D943FA0622CC04CD747
+        ]
+        + Op.PUSH12[0x6D2A1008E4AD1E2C33E2928E]
+        + Op.PUSH17[0x7C797F2A1A586BBF78658189BF58172FF7]
+        + Op.PUSH18[0x30BE2FFC9BBF7F171939BE260B30EB65B46A]
+        + Op.PUSH13[0xF107BE1C9ED5C92C99D69FE055]
+        + Op.SWAP4
+        + Op.DUP10
+        + Op.PUSH1[0xE]
+        + Op.PUSH1[0x13]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x16]
+        + Op.PUSH1[0x12]
+        + Op.PUSH1[0x1] * 2
+        + Op.ADD(0x17, 0xC)
+        + Op.DIV(0xB518D025727BDC6E, 0x200351654B9773409608AAA7DB1F)
+        + Op.PUSH4[0xB2BC334B]
+        + Op.PUSH6[0x8536D84DADC4]
+        + Op.SMOD(
+            0x29D728B6F5EE,
+            0x2288DA62C36B9A35BF8934E3781A4C44E91637CE5C6B2F916D7670,
+        )
+        + Op.PUSH1[0x13]
+        + Op.PUSH1[0x1E]
+        + Op.PUSH1[0x19]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x13]
+        + Op.PUSH1[0x1D]
+        + Op.SWAP7
+        + Op.CALLDATALOAD(offset=Op.TIMESTAMP)
+        + Op.PUSH9[0xCE21A850C04A77CEB9],
         balance=0x3255F99DE856501,
         nonce=89,
-        address=Address("0xea1cd1b117b10ac33fd7bbf18889624625ede7d4"),  # noqa: E501
+        address=Address(0xEA1CD1B117B10AC33FD7BBF18889624625EDE7D4),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "166e31b12700cdefa7a0591398d415023175d1e5a1eca036986533972cab6625e976572e"  # noqa: E501
-            "e91c150c"
+        to=target,
+        data=Bytes(
+            "166e31b12700cdefa7a0591398d415023175d1e5a1eca036986533972cab6625e976572ee91c150c"  # noqa: E501
         ),
         gas_limit=100000,
+        value=0x3CED74ED,
         gas_price=232,
-        value=1022194925,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=89),
+        addr: Account(storage={}, code=b"", nonce=53),
+        sender: Account(storage={}, code=b"", nonce=1),
+        coinbase: Account(storage={}, code=b"", nonce=0),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest145.py b/tests/ported_static/stRandom/test_random_statetest145.py
index 4336cd74875..05baefb8eb7 100644
--- a/tests/ported_static/stRandom/test_random_statetest145.py
+++ b/tests/ported_static/stRandom/test_random_statetest145.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest145.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest145Filler.json
+state_tests/stRandom/randomStatetest145Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest145Filler.json"],
+    ["state_tests/stRandom/randomStatetest145Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest145(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest145."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,67 +43,56 @@ def test_random_statetest145(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.CODECOPY(
-                dest_offset=Op.PUSH32[0x1],
-                offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
-                size=Op.PUSH32[0x1],
-            )
-            + Op.SGT
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.CALLER)
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000139133360005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.CODECOPY(
+            dest_offset=Op.PUSH32[0x1],
+            offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
+            size=Op.PUSH32[0x1],
+        )
+        + Op.SGT
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.CALLER),
         nonce=0,
-        address=Address("0x924d71d0675bbce56965ca41556fa545da2135a0"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000427f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f00000000000000000000000100"  # noqa: E501
-            "000000000000000000000000000000000000007f00000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000001391333"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001391333"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2115970778,
+        value=0x7E1F26DA,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0x2E3D0156D2B99A6EACBA540C55F423C8F5A33143},
-        ),
+        target: Account(storage={0: sender}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest146.py b/tests/ported_static/stRandom/test_random_statetest146.py
index 6654be30b57..09586cd9e74 100644
--- a/tests/ported_static/stRandom/test_random_statetest146.py
+++ b/tests/ported_static/stRandom/test_random_statetest146.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest146.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest146Filler.json
+state_tests/stRandom/randomStatetest146Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest146Filler.json"],
+    ["state_tests/stRandom/randomStatetest146Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest146(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest146."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,51 +43,48 @@ def test_random_statetest146(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x434243434444424350303614f20a
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.NUMBER
+        + Op.TIMESTAMP
+        + Op.NUMBER * 2
+        + Op.PREVRANDAO * 2
+        + Op.TIMESTAMP
+        + Op.POP(Op.NUMBER)
+        + Op.EXP(Op.CALLCODE, Op.EQ(Op.CALLDATASIZE, Op.ADDRESS)),
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.NUMBER
-            + Op.TIMESTAMP
-            + Op.NUMBER
-            + Op.NUMBER
-            + Op.PREVRANDAO
-            + Op.PREVRANDAO
-            + Op.TIMESTAMP
-            + Op.POP(Op.NUMBER)
-            + Op.EXP(Op.CALLCODE, Op.EQ(Op.CALLDATASIZE, Op.ADDRESS))
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=46,
         nonce=0,
-        address=Address("0xde14e9d6c6f9145c355fdf3100fe961632d4cf85"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0xDE0B6B3A76586A0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest147.py b/tests/ported_static/stRandom/test_random_statetest147.py
index 325d74ad863..476ca4fc8e8 100644
--- a/tests/ported_static/stRandom/test_random_statetest147.py
+++ b/tests/ported_static/stRandom/test_random_statetest147.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest147.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest147Filler.json
+state_tests/stRandom/randomStatetest147Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest147Filler.json"],
+    ["state_tests/stRandom/randomStatetest147Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest147(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest147."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,56 +46,49 @@ def test_random_statetest147(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x657ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe43659a936055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "657ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00"  # noqa: E501
-            "0000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000017fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe43659a936055"
+            "657ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe43659a936055"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x146428f541d089ec1fcb2bec166b0bd6115e0bcd"),  # noqa: E501
+        address=Address(0x146428F541D089EC1FCB2BEC166B0BD6115E0BCD),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "657ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00"  # noqa: E501
-            "0000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000017fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe43659a9360"
+        to=target,
+        data=Bytes(
+            "657ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe43659a9360"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1090344298,
+        value=0x40FD556A,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x00000000000000000000000000007FFFFFFFFFFF): Account(
+            storage={}, code=b"", nonce=0
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest148.py b/tests/ported_static/stRandom/test_random_statetest148.py
index 4b6f3961018..87290b860ac 100644
--- a/tests/ported_static/stRandom/test_random_statetest148.py
+++ b/tests/ported_static/stRandom/test_random_statetest148.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest148.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest148Filler.json
+state_tests/stRandom/randomStatetest148Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest148Filler.json"],
+    ["state_tests/stRandom/randomStatetest148Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest148(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest148."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,62 +47,55 @@ def test_random_statetest148(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.MSTORE8(offset=Op.PUSH32[0x1], value=Op.PUSH32[0xC350])
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x34847E390773919B1655907716447255,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001537f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f34847e390773919b165590771644725560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.MSTORE8(offset=Op.PUSH32[0x1], value=Op.PUSH32[0xC350])
+        + Op.PUSH32[0x0] * 2
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x34847E390773919B1655907716447255
         ),
         nonce=0,
-        address=Address("0xa795b1de6184bcfa49d6ea7929439c5ca3a6b4bb"),  # noqa: E501
+        address=Address(0xA795B1DE6184BCFA49D6EA7929439C5CA3A6B4BB),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000001537f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000007f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e796f34847e390773919b16559077164472"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001537f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f34847e390773919b16559077164472"  # noqa: E501
         ),
         gas_limit=100000,
-        value=811630515,
+        value=0x30607FB3,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x50000000000000000000000000000000000000000000000000000000000000: 0x34847E390773919B1655907716447255,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest149.py b/tests/ported_static/stRandom/test_random_statetest149.py
index 7a02e8b29c9..8227cf138fc 100644
--- a/tests/ported_static/stRandom/test_random_statetest149.py
+++ b/tests/ported_static/stRandom/test_random_statetest149.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest149.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest149Filler.json
+state_tests/stRandom/randomStatetest149Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest149Filler.json"],
+    ["state_tests/stRandom/randomStatetest149Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest149(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest149."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,66 +43,58 @@ def test_random_statetest149(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.MULMOD(
-                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.MLOAD
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.SMOD)
-        ),
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff099055510760005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.MULMOD(
+            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,
+            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+        )
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.MLOAD
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.SMOD),
         nonce=0,
-        address=Address("0xee2a67362d09420884ae26dc5c2f1c69ec03c027"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000007f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff0990555107"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0990555107"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1968716197,
+        value=0x755839A5,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest15.py b/tests/ported_static/stRandom/test_random_statetest15.py
index 63025fdb70c..7587f7cac55 100644
--- a/tests/ported_static/stRandom/test_random_statetest15.py
+++ b/tests/ported_static/stRandom/test_random_statetest15.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest15.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest15Filler.json
+state_tests/stRandom/randomStatetest15Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest15Filler.json"],
+    ["state_tests/stRandom/randomStatetest15Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest15(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest15."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,61 +47,57 @@ def test_random_statetest15(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x436AF043189B6197733280A2F1F03855,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f436af043189b6197733280a2f1f0385560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x436AF043189B6197733280A2F1F03855
         ),
         nonce=0,
-        address=Address("0x9938a1cd42df5ba9e9677fa018875c8dc2deb317"),  # noqa: E501
+        address=Address(0x9938A1CD42DF5BA9E9677FA018875C8DC2DEB317),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000007f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000016f436af043189b6197733280a2f1f038"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f436af043189b6197733280a2f1f038"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1501832876,
+        value=0x598426AC,
     )
 
     post = {
-        contract: Account(storage={0: 0x436AF043189B6197733280A2F1F03855}),
+        target: Account(
+            storage={0: 0x436AF043189B6197733280A2F1F03855},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest150.py b/tests/ported_static/stRandom/test_random_statetest150.py
index a329d6b4a9f..6f9cc75c228 100644
--- a/tests/ported_static/stRandom/test_random_statetest150.py
+++ b/tests/ported_static/stRandom/test_random_statetest150.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest150.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest150Filler.json
+state_tests/stRandom/randomStatetest150Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest150Filler.json"],
+    ["state_tests/stRandom/randomStatetest150Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest150(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest150."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,138 +44,124 @@ def test_random_statetest150(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH7[0x8254D76C6F24D4]
-            + Op.DUP1
-            + Op.LOG2(
-                offset=0x62,
-                size=0x3E,
-                topic_1=0x20AE2688CF4B75842AC7265966F5F5CA,
-                topic_2=0x77D83F3A46A1A6,
-            )
-            + Op.PUSH9[0xABA89067DC278E1F86]
-            + Op.PUSH18[0x462DAE624AC683889038D26894AF02617C0]
-            + Op.PUSH12[0x39C4988A5A60A12C0D9AD0CA]
-            + Op.PUSH6[0x839C92F7C75C]
-            + Op.PUSH11[0xD3D6A7B617AC7FBD41F5A2]
-            + Op.SWAP4
-            + Op.CALLDATALOAD(
-                offset=0xCA6AD48748A94E31302254147FB3B5857568E516CB6E8AA2,
-            )
-            + Op.PUSH24[0xAF85D0E508DC17DC50E246130BE577CB59826ADC86AF6C10]
-            + Op.PUSH32[
-                0xD8A98F47CCCD9D22A867A43CD8AD77BBE8BB737AF5ACC0BE67FD7B054F7281E7  # noqa: E501
-            ]
-            + Op.PUSH18[0x891DC4AAD180996B9CB71C6016D0F6A9148C]
-            + Op.PUSH24[0x5E57AC8456A883EEDC3182623898F32B5C83760465A2061C]
-            + Op.PUSH23[0x52E785E7EEF7A97B0AA6D6C15B5C296BCF05EE2E9B87AA]
-            + Op.PUSH1[0xB5]
-            + Op.PUSH21[0x1B3F7D69A1DF03DF117B848B3A75F81C12DEE2244F]
-            + Op.PUSH23[0xE56BB261E9C75FB5CCC769DB72BFAEADEE3F68CF22BBCA]
-            + Op.PUSH7[0x5B0647AC74C140]
-            + Op.SWAP8
-            + Op.PUSH25[0xC71B73ED4ADAA2C6BA1C181B0747C27506478C403B3943129E]
-            + Op.PUSH26[0x223E788BF8B81F60ABECB73BE035D03A8BBDFA112CD8CB2F7A10]
-            + Op.PUSH6[0x250292740D2D]
-            + Op.PUSH19[0x259B4D7E3EF844783DA8118B72912B9F96A61F]
-            + Op.PUSH2[0x68F1]
-            + Op.PUSH1[0xEF]
-            + Op.PUSH10[0xD7DD3DFC7E4EF204766F]
-            + Op.PUSH25[0x9CBAF2ABECEADCF5BDD8DDDFEF773F0A628AFDF3988861662B]
-            + Op.PUSH24[0x882A5CEBFFC61E75F11835B109E81F7C915A91C13B09097B]
-            + Op.PUSH26[0x2D3D59DE0EF5B0F00F95EA49860917656263925DA2FD6685359C]
-            + Op.PUSH14[0x7E4C3C4D2001A30111DE14C56503]
-            + Op.PUSH25[0x8453DF98A29B8715561B2C2021CF78E0CCC4701B192EBF67BB]
-            + Op.PUSH16[0x522656788B3D21428B50A2FA16224D92]
-            + Op.PUSH13[0xE2EA5944760D501BFA0774238C]
-            + Op.PUSH4[0x51DD224B]
-            + Op.PUSH21[0x3D3FC4D5A309166016A71B1C230FE9AFD647932471]
-            + Op.PUSH15[0x71E3B27BDD3FB18CCCC42F6EC97312]
-            + Op.SWAP16
-            + Op.ISZERO(0x58435F45DA181AEB1608ED31713C33330AB4D2D4AF54DD92D1DF)
-            + Op.CALL(
-                gas=0x2AEC0540,
-                address=0xA00C267DA6E57A9318A096C6333C4BCED51306DA,
-                value=0x6B1D9A35,
-                args_offset=0x1F,
-                args_size=0x1D,
-                ret_offset=0x14,
-                ret_size=0x8,
-            )
-            + Op.PUSH13[0xFB040C16BD7C3761BDB86DD6BE]
-            + Op.PUSH6[0x8D2AEFE15739]
-            + Op.PUSH3[0x173936]
-            + Op.PUSH4[0x769965A6]
-            + Op.PUSH5[0x79176D702E]
-            + Op.PUSH31[
-                0x2D5697681AAC1BECCC55825241CD77551F39526CFA77838FAA9C4759AAFA5C  # noqa: E501
-            ]
-            + Op.PUSH5[0xDF5E919997]
-            + Op.PUSH16[0x35F8298ACD398D1913C1FD2DDACBBEAC]
-            + Op.PUSH29[
-                0xC29DAEE12C057385808F19D07110F30CFD900A130B0A713468BCEAF423
-            ]
-            + Op.PUSH2[0x53AB]
-            + Op.PUSH13[0x7BDC39CF86D0A5B03684624D18]
-            + Op.PUSH21[0x73B42A2968F1128872724B3D42218DBAC11F5A9492]
-            + Op.PUSH6[0x1F09A866F61A]
-            + Op.PUSH19[0x535C373274618D5914163ABC7481BB7789394E]
-            + Op.PUSH3[0xF247E7]
-            + Op.DUP15
-            + Op.OR(
-                0x629B20A108E1CFBA0DB03FCDEE497EE2F8BCF78EF143,
-                0x83AF55A5686926972AF7C6519658AEE40A564E3C2950F874DEF7A2110AF0526F,  # noqa: E501
-            )
+    # Source: raw
+    # 0x668254d76c6f24d4806677d83f3a46a1a66f20ae2688cf4b75842ac7265966f5f5ca603e6062a268aba89067dc278e1f86710462dae624ac683889038d26894af02617c06b39c4988a5a60a12c0d9ad0ca65839c92f7c75c6ad3d6a7b617ac7fbd41f5a29377ca6ad48748a94e31302254147fb3b5857568e516cb6e8aa23577af85d0e508dc17dc50e246130be577cb59826adc86af6c107fd8a98f47cccd9d22a867a43cd8ad77bbe8bb737af5acc0be67fd7b054f7281e771891dc4aad180996b9cb71c6016d0f6a9148c775e57ac8456a883eedc3182623898f32b5c83760465a2061c7652e785e7eef7a97b0aa6d6c15b5c296bcf05ee2e9b87aa60b5741b3f7d69a1df03df117b848b3a75f81c12dee2244f76e56bb261e9c75fb5ccc769db72bfaeadee3f68cf22bbca665b0647ac74c1409778c71b73ed4adaa2c6ba1c181b0747c27506478c403b3943129e79223e788bf8b81f60abecb73be035d03a8bbdfa112cd8cb2f7a1065250292740d2d72259b4d7e3ef844783da8118b72912b9f96a61f6168f160ef69d7dd3dfc7e4ef204766f789cbaf2abeceadcf5bdd8dddfef773f0a628afdf3988861662b77882a5cebffc61e75f11835b109e81f7c915a91c13b09097b792d3d59de0ef5b0f00f95ea49860917656263925da2fd6685359c6d7e4c3c4d2001a30111de14c56503788453df98a29b8715561b2c2021cf78e0ccc4701b192ebf67bb6f522656788b3d21428b50a2fa16224d926ce2ea5944760d501bfa0774238c6351dd224b743d3fc4d5a309166016a71b1c230fe9afd6479324716e71e3b27bdd3fb18cccc42f6ec973129f7958435f45da181aeb1608ed31713c33330ab4d2d4af54dd92d1df1560086014601d601f636b1d9a3573<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>632aec0540f16cfb040c16bd7c3761bdb86dd6be658d2aefe157396217393663769965a66479176d702e7e2d5697681aac1beccc55825241cd77551f39526cfa77838faa9c4759aafa5c64df5e9199976f35f8298acd398d1913c1fd2ddacbbeac7cc29daee12c057385808f19d07110f30cfd900a130b0a713468bceaf4236153ab6c7bdc39cf86d0a5b03684624d187473b42a2968f1128872724b3d42218dbac11f5a9492651f09a866f61a72535c373274618d5914163abc7481bb7789394e62f247e78e7f83af55a5686926972af7c6519658aee40a564e3c2950f874def7a2110af0526f75629b20a108e1cfba0db03fcdee497ee2f8bcf78ef14317  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH7[0x8254D76C6F24D4]
+        + Op.DUP1
+        + Op.LOG2(
+            offset=0x62,
+            size=0x3E,
+            topic_1=0x20AE2688CF4B75842AC7265966F5F5CA,
+            topic_2=0x77D83F3A46A1A6,
+        )
+        + Op.PUSH9[0xABA89067DC278E1F86]
+        + Op.PUSH18[0x462DAE624AC683889038D26894AF02617C0]
+        + Op.PUSH12[0x39C4988A5A60A12C0D9AD0CA]
+        + Op.PUSH6[0x839C92F7C75C]
+        + Op.PUSH11[0xD3D6A7B617AC7FBD41F5A2]
+        + Op.SWAP4
+        + Op.CALLDATALOAD(
+            offset=0xCA6AD48748A94E31302254147FB3B5857568E516CB6E8AA2
+        )
+        + Op.PUSH24[0xAF85D0E508DC17DC50E246130BE577CB59826ADC86AF6C10]
+        + Op.PUSH32[
+            0xD8A98F47CCCD9D22A867A43CD8AD77BBE8BB737AF5ACC0BE67FD7B054F7281E7
+        ]
+        + Op.PUSH18[0x891DC4AAD180996B9CB71C6016D0F6A9148C]
+        + Op.PUSH24[0x5E57AC8456A883EEDC3182623898F32B5C83760465A2061C]
+        + Op.PUSH23[0x52E785E7EEF7A97B0AA6D6C15B5C296BCF05EE2E9B87AA]
+        + Op.PUSH1[0xB5]
+        + Op.PUSH21[0x1B3F7D69A1DF03DF117B848B3A75F81C12DEE2244F]
+        + Op.PUSH23[0xE56BB261E9C75FB5CCC769DB72BFAEADEE3F68CF22BBCA]
+        + Op.PUSH7[0x5B0647AC74C140]
+        + Op.SWAP8
+        + Op.PUSH25[0xC71B73ED4ADAA2C6BA1C181B0747C27506478C403B3943129E]
+        + Op.PUSH26[0x223E788BF8B81F60ABECB73BE035D03A8BBDFA112CD8CB2F7A10]
+        + Op.PUSH6[0x250292740D2D]
+        + Op.PUSH19[0x259B4D7E3EF844783DA8118B72912B9F96A61F]
+        + Op.PUSH2[0x68F1]
+        + Op.PUSH1[0xEF]
+        + Op.PUSH10[0xD7DD3DFC7E4EF204766F]
+        + Op.PUSH25[0x9CBAF2ABECEADCF5BDD8DDDFEF773F0A628AFDF3988861662B]
+        + Op.PUSH24[0x882A5CEBFFC61E75F11835B109E81F7C915A91C13B09097B]
+        + Op.PUSH26[0x2D3D59DE0EF5B0F00F95EA49860917656263925DA2FD6685359C]
+        + Op.PUSH14[0x7E4C3C4D2001A30111DE14C56503]
+        + Op.PUSH25[0x8453DF98A29B8715561B2C2021CF78E0CCC4701B192EBF67BB]
+        + Op.PUSH16[0x522656788B3D21428B50A2FA16224D92]
+        + Op.PUSH13[0xE2EA5944760D501BFA0774238C]
+        + Op.PUSH4[0x51DD224B]
+        + Op.PUSH21[0x3D3FC4D5A309166016A71B1C230FE9AFD647932471]
+        + Op.PUSH15[0x71E3B27BDD3FB18CCCC42F6EC97312]
+        + Op.SWAP16
+        + Op.ISZERO(0x58435F45DA181AEB1608ED31713C33330AB4D2D4AF54DD92D1DF)
+        + Op.CALL(
+            gas=0x2AEC0540,
+            address=0xA00C267DA6E57A9318A096C6333C4BCED51306DA,
+            value=0x6B1D9A35,
+            args_offset=0x1F,
+            args_size=0x1D,
+            ret_offset=0x14,
+            ret_size=0x8,
+        )
+        + Op.PUSH13[0xFB040C16BD7C3761BDB86DD6BE]
+        + Op.PUSH6[0x8D2AEFE15739]
+        + Op.PUSH3[0x173936]
+        + Op.PUSH4[0x769965A6]
+        + Op.PUSH5[0x79176D702E]
+        + Op.PUSH31[
+            0x2D5697681AAC1BECCC55825241CD77551F39526CFA77838FAA9C4759AAFA5C
+        ]
+        + Op.PUSH5[0xDF5E919997]
+        + Op.PUSH16[0x35F8298ACD398D1913C1FD2DDACBBEAC]
+        + Op.PUSH29[
+            0xC29DAEE12C057385808F19D07110F30CFD900A130B0A713468BCEAF423
+        ]
+        + Op.PUSH2[0x53AB]
+        + Op.PUSH13[0x7BDC39CF86D0A5B03684624D18]
+        + Op.PUSH21[0x73B42A2968F1128872724B3D42218DBAC11F5A9492]
+        + Op.PUSH6[0x1F09A866F61A]
+        + Op.PUSH19[0x535C373274618D5914163ABC7481BB7789394E]
+        + Op.PUSH3[0xF247E7]
+        + Op.DUP15
+        + Op.OR(
+            0x629B20A108E1CFBA0DB03FCDEE497EE2F8BCF78EF143,
+            0x83AF55A5686926972AF7C6519658AEE40A564E3C2950F874DEF7A2110AF0526F,
         ),
         nonce=0,
-        address=Address("0xa00c267da6e57a9318a096c6333c4bced51306da"),  # noqa: E501
+        address=Address(0xA00C267DA6E57A9318A096C6333C4BCED51306DA),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "70afe04f9b9074d39383f0718bb0b14ecdb6680c54b4c20ae65044c572a5c832c15f55e8"  # noqa: E501
-            "c1b63ffbb7da41d4c8faa43f087b1960b54938bbdb14f35e3552723ad2053a3c74b98d03"  # noqa: E501
-            "20f74bbe4ff06630f30e1caa6e13797a14d07bb94ae4972ce38da7aefa2ab07aedb81397"  # noqa: E501
-            "137b698a63675aa8895c5b1207be9262507b0866acfa180cfbbdff5572fb9a74b245d118"  # noqa: E501
-            "0e80a93b2dc5bcf891e1b84d6c66ab13b03e937d4268f4e9be0381417c1db9b7341c9912"  # noqa: E501
-            "e685e38ee499f1fb82b027b84e01ef235f18b95b0bf567fcfcc5181f51c6dd0465d063d0"  # noqa: E501
-            "f11f267ccd81aa8d4fda65e7e213e5ae4a6da0c6493209753a089323c5bfdde091556681"  # noqa: E501
-            "b0648f59b8b2684d82a240f7d5b8eefd645e6320270660e960467877a8561129b7114a61"  # noqa: E501
-            "7d36423905813b7dc594d88b0eb751ba946f54595f624b07da116f0971fc6e540a966364"  # noqa: E501
-            "c8a1df698688b1ba91f9ac7a74f878a61c87ad3240d656c9ee80fd90d4f8c01ca89c8bc5"  # noqa: E501
-            "37380df079ba8a2e6f2a3cbeb6bfb9687a7cc323f2a9eafd81789ae783355764b23354ba"  # noqa: E501
-            "3f693c4d774ed6ab89da8846604172ad96ab938a4beff64adf9594812f491a0ba98e6f77"  # noqa: E501
-            "d4c40454047c20cfb2625c43608dc26d032e6f8b53bfc1243fbd23a14c077e2071997635"  # noqa: E501
-            "fdb2ffb317cd0e116f1ea7649dcf80ead9dea010cc4e456893f16d7c534f980d27c3312f"  # noqa: E501
-            "34fbf5c8ba9b"
+        to=target,
+        data=Bytes(
+            "70afe04f9b9074d39383f0718bb0b14ecdb6680c54b4c20ae65044c572a5c832c15f55e8c1b63ffbb7da41d4c8faa43f087b1960b54938bbdb14f35e3552723ad2053a3c74b98d0320f74bbe4ff06630f30e1caa6e13797a14d07bb94ae4972ce38da7aefa2ab07aedb81397137b698a63675aa8895c5b1207be9262507b0866acfa180cfbbdff5572fb9a74b245d1180e80a93b2dc5bcf891e1b84d6c66ab13b03e937d4268f4e9be0381417c1db9b7341c9912e685e38ee499f1fb82b027b84e01ef235f18b95b0bf567fcfcc5181f51c6dd0465d063d0f11f267ccd81aa8d4fda65e7e213e5ae4a6da0c6493209753a089323c5bfdde091556681b0648f59b8b2684d82a240f7d5b8eefd645e6320270660e960467877a8561129b7114a617d36423905813b7dc594d88b0eb751ba946f54595f624b07da116f0971fc6e540a966364c8a1df698688b1ba91f9ac7a74f878a61c87ad3240d656c9ee80fd90d4f8c01ca89c8bc537380df079ba8a2e6f2a3cbeb6bfb9687a7cc323f2a9eafd81789ae783355764b23354ba3f693c4d774ed6ab89da8846604172ad96ab938a4beff64adf9594812f491a0ba98e6f77d4c40454047c20cfb2625c43608dc26d032e6f8b53bfc1243fbd23a14c077e2071997635fdb2ffb317cd0e116f1ea7649dcf80ead9dea010cc4e456893f16d7c534f980d27c3312f34fbf5c8ba9b"  # noqa: E501
         ),
         gas_limit=2042667010,
-        value=1816460087,
+        value=0x6C44FB37,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest151.py b/tests/ported_static/stRandom/test_random_statetest151.py
index c3f3860b17d..192a0f7c215 100644
--- a/tests/ported_static/stRandom/test_random_statetest151.py
+++ b/tests/ported_static/stRandom/test_random_statetest151.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest151.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest151Filler.json
+state_tests/stRandom/randomStatetest151Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest151Filler.json"],
+    ["state_tests/stRandom/randomStatetest151Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest151(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest151."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,41 +43,42 @@ def test_random_statetest151(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x41424143445a42f35b10773574016c9f
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex("41424143445a42f35b10773574016c9f"),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x832214236b4dc7829a505afafb05b91d152f9ff4"),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
+        ),
+        balance=46,
+        nonce=0,
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0xDE0B6B3A76586A0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest153.py b/tests/ported_static/stRandom/test_random_statetest153.py
index 28209654611..242b2d246d1 100644
--- a/tests/ported_static/stRandom/test_random_statetest153.py
+++ b/tests/ported_static/stRandom/test_random_statetest153.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest153.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest153Filler.json
+state_tests/stRandom/randomStatetest153Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest153Filler.json"],
+    ["state_tests/stRandom/randomStatetest153Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest153(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest153."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,53 +43,53 @@ def test_random_statetest153(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x44420b4442432055
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SIGNEXTEND(Op.TIMESTAMP, Op.PREVRANDAO)
+        + Op.SSTORE(
+            key=Op.SHA3(offset=Op.NUMBER, size=Op.TIMESTAMP),
+            value=Op.PREVRANDAO,
         ),
-        balance=46,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SIGNEXTEND(Op.TIMESTAMP, Op.PREVRANDAO)
-            + Op.SSTORE(
-                key=Op.SHA3(offset=Op.NUMBER, size=Op.TIMESTAMP),
-                value=Op.PREVRANDAO,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=46,
         nonce=0,
-        address=Address("0x973aa64afc19eaeb66865746fc4938231bcf3312"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0xAE72E2BF2302EBCD309E003E5BE58830F96DEDDAF87BB89EEEA159388BFE3EC1: 0x20000,  # noqa: E501
+                0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A: 0,  # noqa: E501
             },
+            balance=0xDE0B6B3A76586A0,
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest154.py b/tests/ported_static/stRandom/test_random_statetest154.py
index 06ef350a45c..0bad5e9b660 100644
--- a/tests/ported_static/stRandom/test_random_statetest154.py
+++ b/tests/ported_static/stRandom/test_random_statetest154.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest154.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest154Filler.json
+state_tests/stRandom/randomStatetest154Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest154Filler.json"],
+    ["state_tests/stRandom/randomStatetest154Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest154(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest154."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,71 +44,59 @@ def test_random_statetest154(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.LOG2(
-                offset=0x1BA1,
-                size=0x9D,
-                topic_1=0xB7D0E2328333E94698E0D570DB9B316CBA0ADBAE,
-                topic_2=0xB1267C8BBA268D1408F7B3E269AFEE3FEA86C5BC8AEC8108FD6AAA954F51,  # noqa: E501
-            )
-            + Op.ORIGIN
-            + Op.CALL(
-                gas=0x5C2491EE,
-                address=0xF8E70C18DB2BF1444417C2820AF74D3AB1D6A06F,
-                value=0x2DE40A27,
-                args_offset=0xF,
-                args_size=0x5,
-                ret_offset=0xD,
-                ret_size=0x4,
-            )
+    # Source: raw
+    # 0x7db1267c8bba268d1408f7b3e269afee3fea86c5bc8aec8108fd6aaa954f5173b7d0e2328333e94698e0d570db9b316cba0adbae609d611ba1a2326004600d6005600f632de40a2773<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>635c2491eef1  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG2(
+            offset=0x1BA1,
+            size=0x9D,
+            topic_1=0xB7D0E2328333E94698E0D570DB9B316CBA0ADBAE,
+            topic_2=0xB1267C8BBA268D1408F7B3E269AFEE3FEA86C5BC8AEC8108FD6AAA954F51,  # noqa: E501
+        )
+        + Op.ORIGIN
+        + Op.CALL(
+            gas=0x5C2491EE,
+            address=0xF8E70C18DB2BF1444417C2820AF74D3AB1D6A06F,
+            value=0x2DE40A27,
+            args_offset=0xF,
+            args_size=0x5,
+            ret_offset=0xD,
+            ret_size=0x4,
         ),
         nonce=0,
-        address=Address("0xf8e70c18db2bf1444417c2820af74d3ab1d6a06f"),  # noqa: E501
+        address=Address(0xF8E70C18DB2BF1444417C2820AF74D3AB1D6A06F),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7767cc78eeac8d9db5297bde12b635c487b138a0dd4601a9236656945997db45a668500a"  # noqa: E501
-            "3ba6eac5489fca6a1a60998fdd14d1f8b6df2f71d56852c0f085c7c3ba826a746e9dce43"  # noqa: E501
-            "35b97488b092df3db7c8097366963ffc1f51e7f4740935567fc404dab22917cbb1e5cf62"  # noqa: E501
-            "52d6e99952a889ec687e6bcdb9b3358f2b287d5d38793a6e6105063e96947760c35c317e"  # noqa: E501
-            "5798e9a5f3cfef9030ea32917ec50268953856b1eae69744b4815f4808e2bcceaa482030"  # noqa: E501
-            "b32689f51807af6e6840942dae7592985e688975e0ee12dbdc39eedbf43aabc2563df850"  # noqa: E501
-            "d6781ed002fe78bd48083bb42742ee243eea1ecd201eef18f00f330fee8836df1234700f"  # noqa: E501
-            "5824b76290232dd1863a69ca84d2786e74eed98d42b740cc037b156dd261441220cfaf15"  # noqa: E501
-            "857c6e8b6f5e1eb9aee8d63ad473477df11660ac765fa5eebfccfed05bacf2809818d01d"  # noqa: E501
-            "b511686cde018f146e78fee9bff3ffe90a1b54cdc57ec52b6fda22f7f81fc1d9724b375c"  # noqa: E501
-            "e206d29176797f9e42c2ec1ef6b468f7f8fbdb5011c4ddcddd72a6adde7d3d077cf96f9d"  # noqa: E501
-            "13893a46aaaf5acc241eabd8712b6a2deea63f6f91cf162e2d6d65579257a17d7c66e075"  # noqa: E501
-            "70d11280dc99"
+        to=target,
+        data=Bytes(
+            "7767cc78eeac8d9db5297bde12b635c487b138a0dd4601a9236656945997db45a668500a3ba6eac5489fca6a1a60998fdd14d1f8b6df2f71d56852c0f085c7c3ba826a746e9dce4335b97488b092df3db7c8097366963ffc1f51e7f4740935567fc404dab22917cbb1e5cf6252d6e99952a889ec687e6bcdb9b3358f2b287d5d38793a6e6105063e96947760c35c317e5798e9a5f3cfef9030ea32917ec50268953856b1eae69744b4815f4808e2bcceaa482030b32689f51807af6e6840942dae7592985e688975e0ee12dbdc39eedbf43aabc2563df850d6781ed002fe78bd48083bb42742ee243eea1ecd201eef18f00f330fee8836df1234700f5824b76290232dd1863a69ca84d2786e74eed98d42b740cc037b156dd261441220cfaf15857c6e8b6f5e1eb9aee8d63ad473477df11660ac765fa5eebfccfed05bacf2809818d01db511686cde018f146e78fee9bff3ffe90a1b54cdc57ec52b6fda22f7f81fc1d9724b375ce206d29176797f9e42c2ec1ef6b468f7f8fbdb5011c4ddcddd72a6adde7d3d077cf96f9d13893a46aaaf5acc241eabd8712b6a2deea63f6f91cf162e2d6d65579257a17d7c66e07570d11280dc99"  # noqa: E501
         ),
         gas_limit=1617280826,
-        value=1696344411,
+        value=0x651C295B,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest155.py b/tests/ported_static/stRandom/test_random_statetest155.py
index 873e52614bf..e0b64cbff1a 100644
--- a/tests/ported_static/stRandom/test_random_statetest155.py
+++ b/tests/ported_static/stRandom/test_random_statetest155.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest155.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest155Filler.json
+state_tests/stRandom/randomStatetest155Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest155Filler.json"],
+    ["state_tests/stRandom/randomStatetest155Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest155(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest155."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,66 +47,60 @@ def test_random_statetest155(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GASLIMIT
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x3494F39B6CA29473A199580308910155,
-            )
+    # Source: raw
+    # 0x457f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000006f3494f39b6ca29473a19958030891015560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.GASLIMIT
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x3494F39B6CA29473A199580308910155
         ),
         nonce=0,
-        address=Address("0xa8b18ae8f1784b75923dbc884c39419340a580ef"),  # noqa: E501
+        address=Address(0xA8B18AE8F1784B75923DBC884C39419340A580EF),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "457f00000000000000000000000000000000000000000000000000000000000000007fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "0000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000006f3494f39b6ca29473a1995803089101"
+        to=target,
+        data=Bytes(
+            "457f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000006f3494f39b6ca29473a1995803089101"  # noqa: E501
         ),
         gas_limit=100000,
-        value=579536172,
+        value=0x228B052C,
     )
 
     post = {
-        contract: Account(storage={0: 0x3494F39B6CA29473A199580308910155}),
+        target: Account(
+            storage={0: 0x3494F39B6CA29473A199580308910155},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest156.py b/tests/ported_static/stRandom/test_random_statetest156.py
index 6b130e9fd1e..ac350f1bd3f 100644
--- a/tests/ported_static/stRandom/test_random_statetest156.py
+++ b/tests/ported_static/stRandom/test_random_statetest156.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest156.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest156Filler.json
+state_tests/stRandom/randomStatetest156Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest156Filler.json"],
+    ["state_tests/stRandom/randomStatetest156Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest156(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest156."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,60 +46,55 @@ def test_random_statetest156(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x813982583141966B389C159AA48B3A88,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f813982583141966b389c159aa48b3a8860005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x813982583141966B389C159AA48B3A88
         ),
         nonce=0,
-        address=Address("0x181438ff6f2785998200480624815db9facc748d"),  # noqa: E501
+        address=Address(0x181438FF6F2785998200480624815DB9FACC748D),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000007f0000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000c3506f813982583141966b389c159aa48b3a88"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f813982583141966b389c159aa48b3a88"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2147378193,
+        value=0x7FFE6411,
     )
 
     post = {
-        contract: Account(storage={0: 0x813982583141966B389C159AA48B3A88}),
+        target: Account(
+            storage={0: 0x813982583141966B389C159AA48B3A88},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest157.py b/tests/ported_static/stRandom/test_random_statetest157.py
index d46fe6af9f2..b7faca09a73 100644
--- a/tests/ported_static/stRandom/test_random_statetest157.py
+++ b/tests/ported_static/stRandom/test_random_statetest157.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest157.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest157Filler.json
+state_tests/stRandom/randomStatetest157Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest157Filler.json"],
+    ["state_tests/stRandom/randomStatetest157Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest157(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest157."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,135 +43,45 @@ def test_random_statetest157(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0966ff351691689162f371a38d9b789e4360005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff0966ff351691689162f371a38d9b789e4360005155"  # noqa: E501
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0966ff351691689162f371a38d9b789e4360005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xd86e1f5504d3579a67db179f0ce158d0e8b252d9"),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff0966ff351691689162f371a38d9b789e43"
-        ),
-        gas_limit=100000,
-        value=391059071,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest157Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest157_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff0966ff351691689162f371a38d9b789e4360005155"  # noqa: E501
-        ),
-        nonce=0,
-        address=Address("0xd86e1f5504d3579a67db179f0ce158d0e8b252d9"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff0966ff351691689162f371a38d9b789e43"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0966ff351691689162f371a38d9b789e43"  # noqa: E501
         ),
         gas_limit=100000,
-        value=391059071,
+        value=0x174F167F,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest158.py b/tests/ported_static/stRandom/test_random_statetest158.py
index 99fcacba8f5..a5ab51e59a3 100644
--- a/tests/ported_static/stRandom/test_random_statetest158.py
+++ b/tests/ported_static/stRandom/test_random_statetest158.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest158.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest158Filler.json
+state_tests/stRandom/randomStatetest158Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest158Filler.json"],
+    ["state_tests/stRandom/randomStatetest158Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest158(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest158."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,70 +47,62 @@ def test_random_statetest158(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.POP(Op.NUMBER)
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe435060005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1] * 2
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.POP(Op.NUMBER)
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0xfa9512ffc9c4019c1680c63c1285d623d6579c46"),  # noqa: E501
+        address=Address(0xFA9512FFC9C4019C1680C63C1285D623D6579C46),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017f0000000000000000000000010000000000"  # noqa: E501
-            "0000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe4350"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe4350"  # noqa: E501
         ),
         gas_limit=100000,
-        value=943455350,
+        value=0x383BFC76,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest159.py b/tests/ported_static/stRandom/test_random_statetest159.py
index 89c22041842..cf7ad9cc324 100644
--- a/tests/ported_static/stRandom/test_random_statetest159.py
+++ b/tests/ported_static/stRandom/test_random_statetest159.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest159.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest159Filler.json
+state_tests/stRandom/randomStatetest159Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest159Filler.json"],
+    ["state_tests/stRandom/randomStatetest159Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,8 +32,8 @@ def test_random_statetest159(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest159."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -47,129 +48,96 @@ def test_random_statetest159(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.ORIGIN
-            + Op.TIMESTAMP
-            + Op.PUSH1[0xE1]
-            + Op.PUSH19[0xACF6051580FF4E3BA75DA449E7AB2B705CF758]
-            + Op.PUSH20[0xB252CAF4B51DEF86CF4988747E4B77D541C09D31]
-            + Op.PUSH11[0xCFEBF3871D3A1944A5B975]
-            + Op.PUSH8[0xF11D63A7D9C9B49]
-            + Op.PUSH22[0xA0734D7313F746BA5FBA6F3FF04148F4F39E4A28CC2]
-            + Op.PUSH18[0xE1AE0B89F2AD1413AF2317C6A9628006D415]
-            + Op.PUSH29[
-                0xDF7A3F30103F20611FE88431B16A79BE995278AEC271B56BC32543196C
-            ]
-            + Op.PUSH6[0x621B66F1BFC]
-            + Op.PUSH18[0x8C0D9360CFB17A079AECA76A0B08CB4F0E57]
-            + Op.DUP10
-            + Op.TIMESTAMP
-            + Op.LOG1(
-                offset=0x76, size=0x35F2, topic_1=0x6A26C3BEF3710BE80E4D64
-            )
-            + Op.PUSH25[0xE17952F1667FA85F3B72FFA4C95BDA9DB87E2B8409A9B1C9E2]
-            + Op.PUSH20[0x46E5B9A49FD3689F943925EB4618577675ACF6BF]
-            + Op.PUSH28[
-                0x1B665940C32EF9086A95914496BC8BB76245FA2DC9CD3E29618E5689
-            ]
-            + Op.PUSH7[0xB2893ECD2E8476]
-            + Op.PUSH11[0x8CF184A772E70B3E042B95]
-            + Op.DUP5
-            + Op.CALL(
-                gas=0x39570738,
-                address=0xBADAB8EC78E07CDBB4B25F913769FEA51E5A9C2A,
-                value=0x4B1E2F2,
-                args_offset=0x13,
-                args_size=0x7,
-                ret_offset=0xB,
-                ret_size=0x1E,
-            )
-            + Op.SSTORE(
-                key=0xCBD00120239DF2D03DB2FDD9C233DF848EAD9D3C84D4,
-                value=0xF327F570C11AA84A7A5480B98C51,
-            )
-            + Op.PUSH16[0x6030A17E0F41DFCE8BE36A92B0D5E0D6]
-            + Op.PUSH27[
-                0x71C146187EDEFC7923A8AAD22CA228ECEE824C2D7C237ACE7E52FD
-            ]
-            + Op.PUSH3[0xBD6496]
-            + Op.PUSH3[0xA4FE5F]
-            + Op.PUSH25[0xA0B34D84A28C14C9FEA0F18D1D55870173546B3B99E17CAE46]
-            + Op.PUSH31[
-                0x2F1667B7C9445B11382BF9D7FF632D1CCDC973BA913D9EBBB219AC7AA0F3B5  # noqa: E501
-            ]
-            + Op.PUSH26[0xCAA81065E433D2B8CF8CBFB998EC52FE1EAEA6D87BC7728315CC]
-            + Op.PUSH6[0x3CCF90494891]
-            + Op.DUP8
-            + Op.COINBASE
-        ),
+    # Source: raw
+    # 0x324260e172acf6051580ff4e3ba75da449e7ab2b705cf75873b252caf4b51def86cf4988747e4b77d541c09d316acfebf3871d3a1944a5b975670f11d63a7d9c9b49750a0734d7313f746ba5fba6f3ff04148f4f39e4a28cc271e1ae0b89f2ad1413af2317c6a9628006d4157cdf7a3f30103f20611fe88431b16a79be995278aec271b56bc32543196c650621b66f1bfc718c0d9360cfb17a079aeca76a0b08cb4f0e5789426a6a26c3bef3710be80e4d646135f26076a178e17952f1667fa85f3b72ffa4c95bda9db87e2b8409a9b1c9e27346e5b9a49fd3689f943925eb4618577675acf6bf7b1b665940c32ef9086a95914496bc8bb76245fa2dc9cd3e29618e568966b2893ecd2e84766a8cf184a772e70b3e042b9584601e600b600760136304b1e2f273<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>6339570738f16df327f570c11aa84a7a5480b98c5175cbd00120239df2d03db2fdd9c233df848ead9d3c84d4556f6030a17e0f41dfce8be36a92b0d5e0d67a71c146187edefc7923a8aad22ca228ecee824c2d7c237ace7e52fd62bd649662a4fe5f78a0b34d84a28c14c9fea0f18d1d55870173546b3b99e17cae467e2f1667b7c9445b11382bf9d7ff632d1ccdc973ba913d9ebbb219ac7aa0f3b579caa81065e433d2b8cf8cbfb998ec52fe1eaea6d87bc7728315cc653ccf904948918741  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.ORIGIN
+        + Op.TIMESTAMP
+        + Op.PUSH1[0xE1]
+        + Op.PUSH19[0xACF6051580FF4E3BA75DA449E7AB2B705CF758]
+        + Op.PUSH20[0xB252CAF4B51DEF86CF4988747E4B77D541C09D31]
+        + Op.PUSH11[0xCFEBF3871D3A1944A5B975]
+        + Op.PUSH8[0xF11D63A7D9C9B49]
+        + Op.PUSH22[0xA0734D7313F746BA5FBA6F3FF04148F4F39E4A28CC2]
+        + Op.PUSH18[0xE1AE0B89F2AD1413AF2317C6A9628006D415]
+        + Op.PUSH29[
+            0xDF7A3F30103F20611FE88431B16A79BE995278AEC271B56BC32543196C
+        ]
+        + Op.PUSH6[0x621B66F1BFC]
+        + Op.PUSH18[0x8C0D9360CFB17A079AECA76A0B08CB4F0E57]
+        + Op.DUP10
+        + Op.TIMESTAMP
+        + Op.LOG1(offset=0x76, size=0x35F2, topic_1=0x6A26C3BEF3710BE80E4D64)
+        + Op.PUSH25[0xE17952F1667FA85F3B72FFA4C95BDA9DB87E2B8409A9B1C9E2]
+        + Op.PUSH20[0x46E5B9A49FD3689F943925EB4618577675ACF6BF]
+        + Op.PUSH28[0x1B665940C32EF9086A95914496BC8BB76245FA2DC9CD3E29618E5689]
+        + Op.PUSH7[0xB2893ECD2E8476]
+        + Op.PUSH11[0x8CF184A772E70B3E042B95]
+        + Op.DUP5
+        + Op.CALL(
+            gas=0x39570738,
+            address=0xBADAB8EC78E07CDBB4B25F913769FEA51E5A9C2A,
+            value=0x4B1E2F2,
+            args_offset=0x13,
+            args_size=0x7,
+            ret_offset=0xB,
+            ret_size=0x1E,
+        )
+        + Op.SSTORE(
+            key=0xCBD00120239DF2D03DB2FDD9C233DF848EAD9D3C84D4,
+            value=0xF327F570C11AA84A7A5480B98C51,
+        )
+        + Op.PUSH16[0x6030A17E0F41DFCE8BE36A92B0D5E0D6]
+        + Op.PUSH27[0x71C146187EDEFC7923A8AAD22CA228ECEE824C2D7C237ACE7E52FD]
+        + Op.PUSH3[0xBD6496]
+        + Op.PUSH3[0xA4FE5F]
+        + Op.PUSH25[0xA0B34D84A28C14C9FEA0F18D1D55870173546B3B99E17CAE46]
+        + Op.PUSH31[
+            0x2F1667B7C9445B11382BF9D7FF632D1CCDC973BA913D9EBBB219AC7AA0F3B5
+        ]
+        + Op.PUSH26[0xCAA81065E433D2B8CF8CBFB998EC52FE1EAEA6D87BC7728315CC]
+        + Op.PUSH6[0x3CCF90494891]
+        + Op.DUP8
+        + Op.COINBASE,
         nonce=0,
-        address=Address("0xbadab8ec78e07cdbb4b25f913769fea51e5a9c2a"),  # noqa: E501
+        address=Address(0xBADAB8EC78E07CDBB4B25F913769FEA51E5A9C2A),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "712b835f3d9d2bd711b82bc3789135c9552a3962223b777f55a33e73998ad2f06a4ed6f2"  # noqa: E501
-            "5fc8856c8a525749b27c6ad568ed749589e17633797a16e71f79b4ef7d8aaf5252de3ab7"  # noqa: E501
-            "71d75b7888230935e2229a77019eb0de19bf8ce156f43713d4e7fc7c8e4a05eb7055bfcc"  # noqa: E501
-            "74d63886a235d3195ec4ffb5b8d0e2981d360ab96470716c3480ed32bf1d810d463fee63"  # noqa: E501
-            "f646c5d23572f2e778741514e9d2ddcda7c7311236f8fc564c6459f2044db767566340f1"  # noqa: E501
-            "15b2161c6c58dca4273276ab7dba59a8f7837bf38e2015040e0729abbead0f19b1cdc778"  # noqa: E501
-            "a8e61745a96c3e4f4597566f4597629c6bfddff7c6b18ba01f163a6b65a66bbfa71fb76a"  # noqa: E501
-            "ccc5decebf659df24d36b38e70fe2db90ba399950f4d2d3d08f96436f19563b113bc7920"  # noqa: E501
-            "6663747a4f9f4bbf7319ef422e02dc9d5b8a0aa64e2e5b106c5417559c69c67bd576141c"  # noqa: E501
-            "2a77da9a695bc048023ce2e47da6a3a27314e6991ebcc4fa88351f556caea7aeacbe4b85"  # noqa: E501
-            "8d7c11d1ff9c90ce3ee7a294a8413e8a5b2b1ccc42328418739d2df3584249817040e86e"  # noqa: E501
-            "243c89afb2608b9b32380916ca3d656a1d839af675f3768808b0d0c6811c472a67e9be5d"  # noqa: E501
-            "fbee8a030e5bbcf28c327338b6bd2dd7e091d3d38d9de8e3bddab3afa5f2137180693f02"  # noqa: E501
-            "159392a9ed8ce9213f4ee0908279692e61162f1e9695507c8f6aa90dc83ee13fbd09ed79"  # noqa: E501
-            "dc7b1c7d54d52e4a0c4e4bf10760f3c845556086393fa12177a43230b0fc7994cdf997c3"  # noqa: E501
-            "43261e41c8a45ae19aa4ece5f45bc15dcb82c2bc436a9619e2eb92ae524b6df5ad7cc653"  # noqa: E501
-            "40247d3475a2201d93c64bfb9a1e40d5610f512588865e49183ff9617d21896e1be033b4"  # noqa: E501
-            "2b4f21d5ecb6fea5f9fbed7d1554d470c21e1608c1a10ab043396c4076460fb57a54e9f9"  # noqa: E501
-            "f708b5ee060c65e9c9ebed92d33960cf6bfa527276b5263aa69f84387464e0318ce3bd82"  # noqa: E501
-            "632ca685ac74e4f0b09a9f8e6d7b40bfb9d53bddefd5bad10f40b972dd05b8617f4e892e"  # noqa: E501
-            "f5a7f911a891213690d15f69429e9601dae799c9fd8a6c4c562cd8adfed3855eb4e661a6"  # noqa: E501
-            "63d96255a76b91d63a23edfc368d558c89287d0b88c712797e6fb21f4a84c6407a61a713"  # noqa: E501
-            "c1ba9d957622fe80be46092751640e498de7687a828b2ff6b864fb279ea72f1e53c3b584"  # noqa: E501
-            "8c1fd8b9533fc2772829b26881802082d00eb7ca786f7446a0f860299c628bc20e5deefd"  # noqa: E501
-            "8b8360897931a41e6ff3d9f9554552fa142eb6c03a1683933c3f0cdcd9b7dc73410aee35"  # noqa: E501
-            "eecfe12e2ae69036a27ae906232544439d735b8a404c30cae29e5fa56924e7b036f8b66b"  # noqa: E501
-            "8e9970dd8113a8188b654f1cb648d8300f20b08869b0625d10dbb1d8db409d64e141c19b"  # noqa: E501
-            "2f83"
+        to=target,
+        data=Bytes(
+            "712b835f3d9d2bd711b82bc3789135c9552a3962223b777f55a33e73998ad2f06a4ed6f25fc8856c8a525749b27c6ad568ed749589e17633797a16e71f79b4ef7d8aaf5252de3ab771d75b7888230935e2229a77019eb0de19bf8ce156f43713d4e7fc7c8e4a05eb7055bfcc74d63886a235d3195ec4ffb5b8d0e2981d360ab96470716c3480ed32bf1d810d463fee63f646c5d23572f2e778741514e9d2ddcda7c7311236f8fc564c6459f2044db767566340f115b2161c6c58dca4273276ab7dba59a8f7837bf38e2015040e0729abbead0f19b1cdc778a8e61745a96c3e4f4597566f4597629c6bfddff7c6b18ba01f163a6b65a66bbfa71fb76accc5decebf659df24d36b38e70fe2db90ba399950f4d2d3d08f96436f19563b113bc79206663747a4f9f4bbf7319ef422e02dc9d5b8a0aa64e2e5b106c5417559c69c67bd576141c2a77da9a695bc048023ce2e47da6a3a27314e6991ebcc4fa88351f556caea7aeacbe4b858d7c11d1ff9c90ce3ee7a294a8413e8a5b2b1ccc42328418739d2df3584249817040e86e243c89afb2608b9b32380916ca3d656a1d839af675f3768808b0d0c6811c472a67e9be5dfbee8a030e5bbcf28c327338b6bd2dd7e091d3d38d9de8e3bddab3afa5f2137180693f02159392a9ed8ce9213f4ee0908279692e61162f1e9695507c8f6aa90dc83ee13fbd09ed79dc7b1c7d54d52e4a0c4e4bf10760f3c845556086393fa12177a43230b0fc7994cdf997c343261e41c8a45ae19aa4ece5f45bc15dcb82c2bc436a9619e2eb92ae524b6df5ad7cc65340247d3475a2201d93c64bfb9a1e40d5610f512588865e49183ff9617d21896e1be033b42b4f21d5ecb6fea5f9fbed7d1554d470c21e1608c1a10ab043396c4076460fb57a54e9f9f708b5ee060c65e9c9ebed92d33960cf6bfa527276b5263aa69f84387464e0318ce3bd82632ca685ac74e4f0b09a9f8e6d7b40bfb9d53bddefd5bad10f40b972dd05b8617f4e892ef5a7f911a891213690d15f69429e9601dae799c9fd8a6c4c562cd8adfed3855eb4e661a663d96255a76b91d63a23edfc368d558c89287d0b88c712797e6fb21f4a84c6407a61a713c1ba9d957622fe80be46092751640e498de7687a828b2ff6b864fb279ea72f1e53c3b5848c1fd8b9533fc2772829b26881802082d00eb7ca786f7446a0f860299c628bc20e5deefd8b8360897931a41e6ff3d9f9554552fa142eb6c03a1683933c3f0cdcd9b7dc73410aee35eecfe12e2ae69036a27ae906232544439d735b8a404c30cae29e5fa56924e7b036f8b66b8e9970dd8113a8188b654f1cb648d8300f20b08869b0625d10dbb1d8db409d64e141c19b2f83"  # noqa: E501
         ),
         gas_limit=1661465041,
-        value=614929711,
+        value=0x24A7152F,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0xCBD00120239DF2D03DB2FDD9C233DF848EAD9D3C84D4: 0xF327F570C11AA84A7A5480B98C51,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest16.py b/tests/ported_static/stRandom/test_random_statetest16.py
index b3ae1a81db2..9fd19a54c5c 100644
--- a/tests/ported_static/stRandom/test_random_statetest16.py
+++ b/tests/ported_static/stRandom/test_random_statetest16.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest16.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest16Filler.json
+state_tests/stRandom/randomStatetest16Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest16Filler.json"],
+    ["state_tests/stRandom/randomStatetest16Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest16(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest16."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,45 @@ def test_random_statetest16(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f0000000000000000000000000000000000000000000000000000000000000000557f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000005531848f7aa4516d7d7578797e  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000557f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000007f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000005531848f7aa4516d7d7578797e"
+            "7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000000000000000000000000000000000557f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000005531848f7aa4516d7d7578797e"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xafbf96f4e8a345cc862021d826a7cae52adccde9"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000557f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000007f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000005531848f7aa4516d7d7578797e"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000000000000000000000000000000000557f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000005531848f7aa4516d7d7578797e"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1047145130,
+        value=0x3E6A2AAA,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest161.py b/tests/ported_static/stRandom/test_random_statetest161.py
index cbe2faa1518..39c6b218f9f 100644
--- a/tests/ported_static/stRandom/test_random_statetest161.py
+++ b/tests/ported_static/stRandom/test_random_statetest161.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest161.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest161Filler.json
+state_tests/stRandom/randomStatetest161Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest161Filler.json"],
+    ["state_tests/stRandom/randomStatetest161Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest161(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest161."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,58 +47,55 @@ def test_random_statetest161(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001416f458a458076526052650a418c9b40863c60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.NUMBER
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.COINBASE
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x458A458076526052650A418C9B40863C
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x92DC542F486DA68EAFA3DB73723551927D3FDBA7),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.NUMBER
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.COINBASE
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x458A458076526052650A418C9B40863C,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x92dc542f486da68eafa3db73723551927d3fdba7"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c350437f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000007f00000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000001416f458a45807652605265"  # noqa: E501
-            "0a418c9b40863c"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001416f458a458076526052650a418c9b40863c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=757362865,
+        value=0x2D2470B1,
     )
 
     post = {
-        contract: Account(storage={0: 0x458A458076526052650A418C9B40863C}),
+        target: Account(
+            storage={0: 0x458A458076526052650A418C9B40863C},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest162.py b/tests/ported_static/stRandom/test_random_statetest162.py
index 0d3e232aa93..963bdf0a924 100644
--- a/tests/ported_static/stRandom/test_random_statetest162.py
+++ b/tests/ported_static/stRandom/test_random_statetest162.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest162.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest162Filler.json
+state_tests/stRandom/randomStatetest162Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest162Filler.json"],
+    ["state_tests/stRandom/randomStatetest162Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest162(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest162."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,59 @@ def test_random_statetest162(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f355a7f614497339e3b63878b3698045560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000] * 3
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x355A7F614497339E3B63878B36980455
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xCF6897A51DE8B055E06EC2C645386B34CE31B9A3),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x355A7F614497339E3B63878B36980455,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xcf6897a51de8b055e06ec2c645386b34ce31b9a3"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507f000000000000000000000000ffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff6f355a7f614497339e3b63878b369804"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f355a7f614497339e3b63878b369804"  # noqa: E501
         ),
         gas_limit=100000,
-        value=725006509,
+        value=0x2B36B8AD,
     )
 
     post = {
-        contract: Account(storage={0: 0x355A7F614497339E3B63878B36980455}),
+        target: Account(
+            storage={0: 0x355A7F614497339E3B63878B36980455},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest163.py b/tests/ported_static/stRandom/test_random_statetest163.py
index 743ca97478f..e09dae5e866 100644
--- a/tests/ported_static/stRandom/test_random_statetest163.py
+++ b/tests/ported_static/stRandom/test_random_statetest163.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest163.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest163Filler.json
+state_tests/stRandom/randomStatetest163Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest163Filler.json"],
+    ["state_tests/stRandom/randomStatetest163Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest163(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest163."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,54 +44,45 @@ def test_random_statetest163(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000000034577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000426259cb6142a1196e3168c986758aa4  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f000000000000000000000000000000000000000000000000000000000000000034577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000426259cb6142a1196e3168c986758aa4"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000000034577f"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000"  # noqa: E501
-            "00000100000000000000000000000000000000000000007f000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000426259cb6142a1196e3168c986758aa4"  # noqa: E501
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xe9a32a9ad98c02fa9521b9ab066bcc683a8ab126"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000000034577f"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000"  # noqa: E501
-            "00000100000000000000000000000000000000000000007f000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000426259cb6142a1196e3168c986758aa4"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000000034577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000426259cb6142a1196e3168c986758aa4"  # noqa: E501
         ),
         gas_limit=381441932,
-        value=1579124913,
+        value=0x5E1F88B1,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest164.py b/tests/ported_static/stRandom/test_random_statetest164.py
index 1be469ee1ac..2bd27133fea 100644
--- a/tests/ported_static/stRandom/test_random_statetest164.py
+++ b/tests/ported_static/stRandom/test_random_statetest164.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest164.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest164Filler.json
+state_tests/stRandom/randomStatetest164Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest164Filler.json"],
+    ["state_tests/stRandom/randomStatetest164Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest164(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest164."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,75 +47,69 @@ def test_random_statetest164(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.COINBASE
-            + Op.CODECOPY(
-                dest_offset=Op.SDIV(
-                    Op.SGT(
-                        Op.DUP4,
-                        Op.PUSH32[0x10000000000000000000000000000000000000000],
-                    ),
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000831305395560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.COINBASE
+        + Op.CODECOPY(
+            dest_offset=Op.SDIV(
+                Op.SGT(
+                    Op.DUP4,
+                    Op.PUSH32[0x10000000000000000000000000000000000000000],
                 ),
-                offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
-                size=Op.PUSH32[0x1],
-            )
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+            offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
+            size=Op.PUSH32[0x1],
+        )
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x5c044383d81700714d9b211b8af71746e4ba3ec6"),  # noqa: E501
+        address=Address(0x5C044383D81700714D9B211B8AF71746E4BA3EC6),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000017f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000"  # noqa: E501
-            "0000000000000000000000000000000083130539"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000083130539"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1836140782,
+        value=0x6D7148EE,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
-                0: 0x4F3F701464972E74606D6EA82D4D3080599A0E79,
+                0: coinbase,
                 0x4F3F701464972E74606D6EA82D4D3080599A0E79: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest166.py b/tests/ported_static/stRandom/test_random_statetest166.py
index cd8e65af15d..8dfb02fb2e1 100644
--- a/tests/ported_static/stRandom/test_random_statetest166.py
+++ b/tests/ported_static/stRandom/test_random_statetest166.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest166.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest166Filler.json
+state_tests/stRandom/randomStatetest166Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest166Filler.json"],
+    ["state_tests/stRandom/randomStatetest166Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest166(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest166."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,61 +47,57 @@ def test_random_statetest166(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.DUP2
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.COINBASE
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.GASLIMIT
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x8EB7099D9F160532785143C5937E1855,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff817f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350456f8eb7099d9f160532785143c5937e185560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.DUP2
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.COINBASE
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.GASLIMIT
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x8EB7099D9F160532785143C5937E1855
         ),
         nonce=0,
-        address=Address("0x2f20efb4edc7dd07322d9c24d64c9ffdab363ccb"),  # noqa: E501
+        address=Address(0x2F20EFB4EDC7DD07322D9C24D64C9FFDAB363CCB),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff817f00000000"  # noqa: E501
-            "00000000000000010000000000000000000000000000000000000000417f000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000017f000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000c350456f8eb7099d9f160532785143"  # noqa: E501
-            "c5937e18"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff817f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350456f8eb7099d9f160532785143c5937e18"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1614644579,
+        value=0x603D8563,
     )
 
     post = {
-        contract: Account(storage={0: 0x8EB7099D9F160532785143C5937E1855}),
+        target: Account(
+            storage={0: 0x8EB7099D9F160532785143C5937E1855},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest167.py b/tests/ported_static/stRandom/test_random_statetest167.py
index a64a7487e2a..75073e2980f 100644
--- a/tests/ported_static/stRandom/test_random_statetest167.py
+++ b/tests/ported_static/stRandom/test_random_statetest167.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest167.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest167Filler.json
+state_tests/stRandom/randomStatetest167Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest167Filler.json"],
+    ["state_tests/stRandom/randomStatetest167Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest167(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest167."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,59 @@ def test_random_statetest167(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.MUL(Op.PUSH32[0x1], Op.NUMBER)
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0xA00B875630178A439384941395369E55,
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001437f0000000000000000000000000000000000000000000000000000000000000001027f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6fa00b875630178a439384941395369e5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.PUSH32[0x1]
+        + Op.MUL(Op.PUSH32[0x1], Op.NUMBER)
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0xA00B875630178A439384941395369E55
         ),
         nonce=0,
-        address=Address("0x7deb9d5a0ab7cc3cc567ca833c7da186f1519963"),  # noqa: E501
+        address=Address(0x7DEB9D5A0AB7CC3CC567CA833C7DA186F1519963),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000001437f00000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000001027f000000000000000000"  # noqa: E501
-            "0000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff6fa00b875630178a439384941395369e"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001437f0000000000000000000000000000000000000000000000000000000000000001027f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6fa00b875630178a439384941395369e"  # noqa: E501
         ),
         gas_limit=100000,
-        value=428826795,
+        value=0x198F60AB,
     )
 
     post = {
-        contract: Account(storage={0: 0xA00B875630178A439384941395369E55}),
+        target: Account(
+            storage={0: 0xA00B875630178A439384941395369E55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest169.py b/tests/ported_static/stRandom/test_random_statetest169.py
index ce1d8f30d86..77f4c6a16c0 100644
--- a/tests/ported_static/stRandom/test_random_statetest169.py
+++ b/tests/ported_static/stRandom/test_random_statetest169.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest169.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest169Filler.json
+state_tests/stRandom/randomStatetest169Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest169Filler.json"],
+    ["state_tests/stRandom/randomStatetest169Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest169(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest169."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,63 @@ def test_random_statetest169(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PREVRANDAO
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PREVRANDAO
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xe3b775c5c06f3099b1b090e27c2f79356e8d4e9f"),  # noqa: E501
+        address=Address(0xE3B775C5C06F3099B1B090E27C2F79356E8D4E9F),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000000000"  # noqa: E501
-            "00004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000017fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"  # noqa: E501
         ),
         gas_limit=100000,
-        value=868614475,
+        value=0x33C6014B,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest17.py b/tests/ported_static/stRandom/test_random_statetest17.py
index d558379eaf4..34d7b4762fa 100644
--- a/tests/ported_static/stRandom/test_random_statetest17.py
+++ b/tests/ported_static/stRandom/test_random_statetest17.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest17.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest17Filler.json
+state_tests/stRandom/randomStatetest17Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest17Filler.json"],
+    ["state_tests/stRandom/randomStatetest17Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest17(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest17."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,67 +43,60 @@ def test_random_statetest17(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001430a7f000000000000000000000000000000000000000000000000000000000000000106813b375560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[0x1]
+        + Op.TIMESTAMP
+        + Op.CALLDATACOPY(
+            dest_offset=Op.EXTCODESIZE(address=Op.DUP2),
+            offset=Op.MOD(Op.PUSH32[0x1], Op.EXP(Op.NUMBER, Op.PUSH32[0x1])),
+            size=Op.PUSH32[0xC350],
+        )
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0x1]
-            + Op.TIMESTAMP
-            + Op.CALLDATACOPY(
-                dest_offset=Op.EXTCODESIZE(address=Op.DUP2),
-                offset=Op.MOD(
-                    Op.PUSH32[0x1], Op.EXP(Op.NUMBER, Op.PUSH32[0x1])
-                ),
-                size=Op.PUSH32[0xC350],
-            )
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xe9d0379fa7cc1436c525c501b9538a9797140fbf"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000001427f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c3507f00000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000001430a7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000106813b37"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001430a7f000000000000000000000000000000000000000000000000000000000000000106813b37"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1639312514,
+        value=0x61B5EC82,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
+                1: 0,
                 1000: 1,
                 0x7F000000000000000000000000000000000000000000000000000000000000C3: 50000,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest171.py b/tests/ported_static/stRandom/test_random_statetest171.py
index a4ebbb792e8..085db9770a6 100644
--- a/tests/ported_static/stRandom/test_random_statetest171.py
+++ b/tests/ported_static/stRandom/test_random_statetest171.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest171.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest171Filler.json
+state_tests/stRandom/randomStatetest171Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest171Filler.json"],
+    ["state_tests/stRandom/randomStatetest171Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest171(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest171."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,63 +43,55 @@ def test_random_statetest171(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.NUMBER
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    Op.NOT(
-                        Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-                    ),
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-                value=Op.PUSH32[0x1],
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>197ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe095560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.NUMBER
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MULMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                Op.NOT(Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]),
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
+            value=Op.PUSH32[0x1],
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x698791d8a7c355091fa7bc3a0171cd426dbe2f51"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c350437f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000007f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000017fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000"  # noqa: E501
-            "00004f3f701464972e74606d6ea82d4d3080599a0e79197fffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffe09"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79197ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1726364132,
+        value=0x66E639E4,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest172.py b/tests/ported_static/stRandom/test_random_statetest172.py
index 00f2d8cf761..69d3fbbe19d 100644
--- a/tests/ported_static/stRandom/test_random_statetest172.py
+++ b/tests/ported_static/stRandom/test_random_statetest172.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest172.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest172Filler.json
+state_tests/stRandom/randomStatetest172Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest172Filler.json"],
+    ["state_tests/stRandom/randomStatetest172Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest172(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest172."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,161 +43,55 @@ def test_random_statetest172(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 3
+        + Op.PUSH32[0xC350] * 2
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MULMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
         nonce=0,
-        address=Address("0xf279f9f41a3a6ecf391d89aac2e62fd83d4488b7"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff09"
-        ),
-        gas_limit=100000,
-        value=354059144,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest172Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest172_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
     )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-        ),
-        nonce=0,
-        address=Address("0xf279f9f41a3a6ecf391d89aac2e62fd83d4488b7"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff09"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=354059144,
+        value=0x151A8388,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest173.py b/tests/ported_static/stRandom/test_random_statetest173.py
index 1cf03300132..bef3489d6d2 100644
--- a/tests/ported_static/stRandom/test_random_statetest173.py
+++ b/tests/ported_static/stRandom/test_random_statetest173.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest173.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest173Filler.json
+state_tests/stRandom/randomStatetest173Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest173Filler.json"],
+    ["state_tests/stRandom/randomStatetest173Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest173(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest173."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,56 +47,49 @@ def test_random_statetest173(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000001447fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb"  # noqa: E501
-            "96065b2a98b57a48a06ae28d285a71b509ff979443703ca35560005155"
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b509ff979443703ca35560005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b509ff979443703ca35560005155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000001447fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb"  # noqa: E501
-            "96065b2a98b57a48a06ae28d285a71b509ff979443703ca3"
+        to=contract_0,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b509ff979443703ca3"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1285346393,
+        value=0x4C9CD459,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x6BACFB1469F9A4D5674A85B75F951D72D7A58E4A): Account(
+            storage={}, code=b"", nonce=0
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest174.py b/tests/ported_static/stRandom/test_random_statetest174.py
index 45516fb0a4e..331cdc37ee6 100644
--- a/tests/ported_static/stRandom/test_random_statetest174.py
+++ b/tests/ported_static/stRandom/test_random_statetest174.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest174.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest174Filler.json
+state_tests/stRandom/randomStatetest174Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest174Filler.json"],
+    ["state_tests/stRandom/randomStatetest174Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest174(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest174."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,45 +43,45 @@ def test_random_statetest174(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x434155
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=Op.COINBASE, value=Op.NUMBER),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x35a69854a524bb9fa20f350526f2cef147e6789b"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={0x4F3F701464972E74606D6EA82D4D3080599A0E79: 1},
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest175.py b/tests/ported_static/stRandom/test_random_statetest175.py
index 8dddaf6335e..9b87f8d928d 100644
--- a/tests/ported_static/stRandom/test_random_statetest175.py
+++ b/tests/ported_static/stRandom/test_random_statetest175.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest175.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest175Filler.json
+state_tests/stRandom/randomStatetest175Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest175Filler.json"],
+    ["state_tests/stRandom/randomStatetest175Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest175(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest175."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,57 @@ def test_random_statetest175(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f6985f2837e09689844171a0235833c5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x6985F2837E09689844171A0235833C55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xF1EAEBA4F6EFE85FE0199B29EBFFCC944EDD1853),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x6985F2837E09689844171A0235833C55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xf1eaeba4f6efe85fe0199b29ebffcc944edd1853"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000007f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c3506f6985f2837e09689844171a0235833c"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f6985f2837e09689844171a0235833c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2139752886,
+        value=0x7F8A09B6,
     )
 
     post = {
-        contract: Account(storage={0: 0x6985F2837E09689844171A0235833C55}),
+        target: Account(
+            storage={0: 0x6985F2837E09689844171A0235833C55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest176.py b/tests/ported_static/stRandom/test_random_statetest176.py
index 045f23073fa..b38024b1239 100644
--- a/tests/ported_static/stRandom/test_random_statetest176.py
+++ b/tests/ported_static/stRandom/test_random_statetest176.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest176.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest176Filler.json
+state_tests/stRandom/randomStatetest176Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,98 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest176Filler.json"],
+    ["state_tests/stRandom/randomStatetest176Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest176(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "327fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c350427f000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000c3507f000000000000"  # noqa: E501
-            "0000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000017fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff041469988517f6889d92799e74664160"  # noqa: E501
-            "005155"
-        ),
-        nonce=0,
-        address=Address("0x6520f3aed37c7b3960ec53119d5b0cedd39fe2f6"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "327fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c350427f000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000c3507f000000000000"  # noqa: E501
-            "0000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000017fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff041469988517f6889d92799e746641"  # noqa: E501
-        ),
-        gas_limit=100000,
-        value=242920391,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest176Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest176_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest176."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -124,55 +43,45 @@ def test_random_statetest176_from_prague(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x327fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff041469988517f6889d92799e74664160005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "327fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c350427f000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000c3507f000000000000"  # noqa: E501
-            "0000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000017fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff041469988517f6889d92799e74664160"  # noqa: E501
-            "005155"
+            "327fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff041469988517f6889d92799e74664160005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x6520f3aed37c7b3960ec53119d5b0cedd39fe2f6"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "327fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c350427f000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000c3507f000000000000"  # noqa: E501
-            "0000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000017fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff041469988517f6889d92799e746641"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "327fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff041469988517f6889d92799e746641"  # noqa: E501
         ),
         gas_limit=100000,
-        value=242920391,
+        value=0xE7AABC7,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest177.py b/tests/ported_static/stRandom/test_random_statetest177.py
index 32235d1385f..074d36783cc 100644
--- a/tests/ported_static/stRandom/test_random_statetest177.py
+++ b/tests/ported_static/stRandom/test_random_statetest177.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest177.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest177Filler.json
+state_tests/stRandom/randomStatetest177Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest177Filler.json"],
+    ["state_tests/stRandom/randomStatetest177Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest177(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest177."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,157 +43,146 @@ def test_random_statetest177(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7e24654d920bee1c2af8b3225f6035ea04b87e1d3f2486057268ed05d8d6e5a67f3da4409848b450c9ab9713bf10ec5124e50fda175accc13d0db75bbc03a25a066d85332a97eae6e7219bc62ce53f23690f1df7f7b11c1659165b7c438533bc1f73a59ae2c28e633d8c971763576dd25386518678a15c64a2682c68bf3c1a7433af2e6dd0276f494254235fe7b28b1f997661eba4767c05f37a8b9b7980106e2bbe8744bed6d0f782ac6a99e07d9486451ab20e48c9e99f083973d5a10a57f4c3e7e3fa3bfd63a39006f35f7325ae8b67348d74c87e78d6dc699541fdf8d085697e58b02f9fef3f78554901cc888449b92fe07e74fb3069f7be725f408005886e73e720275f04f63284f6f10b6df25694b3a55936d06ed8c18d03d868d30b7766bd0d6a111f734650113a9f6b31ef3be38904ccd66a304bbf877e9d6ccc3e98fa65a685b0bf181c6dd67c9db728914ff2977b8c19193f67b9053f72c819b5bc5542945bd6a9079965d91f47a11f3862d346cb6b70d29eca71b0d12d01996b89763f13059617d671ddc626d93a3e3fda99999484470e34277f9ac904a6be6b8b9f0a91e98e2759a946222e419d34089491db069bbeeea7d19868e6fef55cd7440fbbdd7bf7cab153de2f407fc2c1f51952d5d5388159f73c98deb0a3f75d04eb70cee4f3dd886b6ba2ab3d1e110db841c50767a4e0ed4abca1bd1d6688861c4bb169fa8b63d253f1a4636a3979396965ae9c16c2197c57851d68f1ee6fff3c92e794d07cc6d2f5b964448fee1c3f52921cd138bfe26f57a3ce26ae8e622c80fcfb7f414b5750048e67dd2c715bdf907a881ef7a77dc8b166b413ebb4261bda628c26666d7ec3d2d20bdc7e117960da38d995574327fc1b63764875b839f395793a937b5f2793db93b23b7160bb44cf7bf515a85769d5f51851260f073969b185817c3e5b658753947f6ae534b0e68afa57a476ff52028737e7d342c1ddc7c5dc786fe6216838882c6f6e8519b16b2d9451ea2f048765576af461aab462031f6a64f0ae07fa9a64d4772252eb9e6aa14429a7e2a1d43482699065e44695fbea176d63d01d22231d221b6f8dfda47f5164a47454ab396f17257ddec269f67ed7c6d17ffac1c61372aaf587427eee43772c5f28fde9d395b65bf2d77e4eaa635bea61396414a53508797e2506ed2f921f29bf2fda1796f4396c4edb6f6ecc6d79fd82d9838a512df1454ce72268d8a32e0971c718b6836e4bcb788766f266a3edfdd24686274f684c4b0a7fd7082159766f4670a09a9e231bf61fe5f955a75b8870744ec89c81940d46be921c40917862e1c186679f354a704fd5537ceb310616acf9779c43c8f585c064fafa775d279d62aec380625fc16d601ef067eddffdf0f1359f386970fe2eb95c063421601a7a5f9256a6398651be88998deb83d16edd603992a27f758bda8c1bf974e49a52cf19c9bc32a79db4778535677e3caeae7f2f6ac54f147d2729c30d694bcb622c13106c3382d4c27bc4ee55eadb4921d97965e605bd3daa1c233230119dce876049813474dc4b3ec1d0ea8d73d182beb19cd3c8f198578d863907a60fd633a65872d93e47dc134fc815d9800bad3f2d58bb97b5776f42800f1f182951ba5aced03a7c3abd859969483189606297788fbf5565010d13f07077752867293dbfe29b7346020ef70d18cacd7508ccb3731b39  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH31[
+            0x24654D920BEE1C2AF8B3225F6035EA04B87E1D3F2486057268ED05D8D6E5A6
+        ]
+        + Op.PUSH32[
+            0x3DA4409848B450C9AB9713BF10EC5124E50FDA175ACCC13D0DB75BBC03A25A06
+        ]
+        + Op.PUSH14[0x85332A97EAE6E7219BC62CE53F23]
+        + Op.PUSH10[0xF1DF7F7B11C1659165B]
+        + Op.PUSH29[
+            0x438533BC1F73A59AE2C28E633D8C971763576DD25386518678A15C64A2
+        ]
+        + Op.PUSH9[0x2C68BF3C1A7433AF2E]
+        + Op.PUSH14[0xD0276F494254235FE7B28B1F9976]
+        + Op.PUSH2[0xEBA4]
+        + Op.PUSH23[0x7C05F37A8B9B7980106E2BBE8744BED6D0F782AC6A99E0]
+        + Op.PUSH30[
+            0x9486451AB20E48C9E99F083973D5A10A57F4C3E7E3FA3BFD63A39006F35F
+        ]
+        + Op.PUSH20[0x25AE8B67348D74C87E78D6DC699541FDF8D08569]
+        + Op.PUSH31[
+            0x58B02F9FEF3F78554901CC888449B92FE07E74FB3069F7BE725F408005886E
+        ]
+        + Op.PUSH20[0xE720275F04F63284F6F10B6DF25694B3A55936D0]
+        + Op.PUSH15[0xD8C18D03D868D30B7766BD0D6A111F]
+        + Op.PUSH20[0x4650113A9F6B31EF3BE38904CCD66A304BBF877E]
+        + Op.SWAP14
+        + Op.PUSH13[0xCC3E98FA65A685B0BF181C6DD6]
+        + Op.PUSH29[
+            0x9DB728914FF2977B8C19193F67B9053F72C819B5BC5542945BD6A90799
+        ]
+        + Op.PUSH6[0xD91F47A11F38]
+        + Op.PUSH3[0xD346CB]
+        + Op.PUSH12[0x70D29ECA71B0D12D01996B89]
+        + Op.PUSH23[0x3F13059617D671DDC626D93A3E3FDA99999484470E3427]
+        + Op.PUSH32[
+            0x9AC904A6BE6B8B9F0A91E98E2759A946222E419D34089491DB069BBEEEA7D198
+        ]
+        + Op.PUSH9[0xE6FEF55CD7440FBBDD]
+        + Op.PUSH28[0xF7CAB153DE2F407FC2C1F51952D5D5388159F73C98DEB0A3F75D04EB]
+        + Op.PUSH17[0xCEE4F3DD886B6BA2AB3D1E110DB841C507]
+        + Op.PUSH8[0xA4E0ED4ABCA1BD1D]
+        + Op.PUSH7[0x88861C4BB169FA]
+        + Op.DUP12
+        + Op.PUSH4[0xD253F1A4]
+        + Op.PUSH4[0x6A397939]
+        + Op.PUSH10[0x65AE9C16C2197C57851D]
+        + Op.PUSH9[0xF1EE6FFF3C92E794D0]
+        + Op.PUSH29[
+            0xC6D2F5B964448FEE1C3F52921CD138BFE26F57A3CE26AE8E622C80FCFB
+        ]
+        + Op.PUSH32[
+            0x414B5750048E67DD2C715BDF907A881EF7A77DC8B166B413EBB4261BDA628C26
+        ]
+        + Op.PUSH7[0x6D7EC3D2D20BDC]
+        + Op.PUSH31[
+            0x117960DA38D995574327FC1B63764875B839F395793A937B5F2793DB93B23B
+        ]
+        + Op.PUSH18[0x60BB44CF7BF515A85769D5F51851260F0739]
+        + Op.PUSH10[0xB185817C3E5B65875394]
+        + Op.PUSH32[
+            0x6AE534B0E68AFA57A476FF52028737E7D342C1DDC7C5DC786FE6216838882C6F
+        ]
+        + Op.PUSH15[0x8519B16B2D9451EA2F048765576AF4]
+        + Op.PUSH2[0xAAB4]
+        + Op.PUSH3[0x31F6A]
+        + Op.PUSH5[0xF0AE07FA9A]
+        + Op.PUSH5[0xD4772252EB]
+        + Op.SWAP15
+        + Op.PUSH11[0xA14429A7E2A1D434826990]
+        + Op.PUSH6[0xE44695FBEA17]
+        + Op.PUSH14[0x63D01D22231D221B6F8DFDA47F51]
+        + Op.PUSH5[0xA47454AB39]
+        + Op.PUSH16[0x17257DDEC269F67ED7C6D17FFAC1C613]
+        + Op.PUSH19[0xAAF587427EEE43772C5F28FDE9D395B65BF2D7]
+        + Op.PUSH31[
+            0x4EAA635BEA61396414A53508797E2506ED2F921F29BF2FDA1796F4396C4EDB
+        ]
+        + Op.PUSH16[0x6ECC6D79FD82D9838A512DF1454CE722]
+        + Op.PUSH9[0xD8A32E0971C718B683]
+        + Op.PUSH15[0x4BCB788766F266A3EDFDD24686274F]
+        + Op.PUSH9[0x4C4B0A7FD708215976]
+        + Op.PUSH16[0x4670A09A9E231BF61FE5F955A75B8870]
+        + Op.PUSH21[0x4EC89C81940D46BE921C40917862E1C186679F354A]
+        + Op.PUSH17[0x4FD5537CEB310616ACF9779C43C8F585C0]
+        + Op.PUSH5[0xFAFA775D27]
+        + Op.SWAP14
+        + Op.CREATE(value=0x1E, offset=0x5FC16D, size=0xAEC380)
+        + Op.PUSH8[0xEDDFFDF0F1359F38]
+        + Op.PUSH10[0x70FE2EB95C063421601A]
+        + Op.PUSH27[0x5F9256A6398651BE88998DEB83D16EDD603992A27F758BDA8C1BF9]
+        + Op.PUSH21[0xE49A52CF19C9BC32A79DB4778535677E3CAEAE7F2F]
+        + Op.PUSH11[0xC54F147D2729C30D694BCB]
+        + Op.PUSH3[0x2C1310]
+        + Op.PUSH13[0x3382D4C27BC4EE55EADB4921D9]
+        + Op.PUSH26[0x65E605BD3DAA1C233230119DCE876049813474DC4B3EC1D0EA8D]
+        + Op.PUSH20[0xD182BEB19CD3C8F198578D863907A60FD633A658]
+        + Op.PUSH19[0xD93E47DC134FC815D9800BAD3F2D58BB97B577]
+        + Op.PUSH16[0x42800F1F182951BA5ACED03A7C3ABD85]
+        + Op.SWAP10
+        + Op.CODECOPY(
+            dest_offset=0x2867293DBFE29B7346020EF70D18CACD7508CCB3731B,
+            offset=0x10D13F07077,
+            size=0x483189606297788FBF55,
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH31[
-                0x24654D920BEE1C2AF8B3225F6035EA04B87E1D3F2486057268ED05D8D6E5A6  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0x3DA4409848B450C9AB9713BF10EC5124E50FDA175ACCC13D0DB75BBC03A25A06  # noqa: E501
-            ]
-            + Op.PUSH14[0x85332A97EAE6E7219BC62CE53F23]
-            + Op.PUSH10[0xF1DF7F7B11C1659165B]
-            + Op.PUSH29[
-                0x438533BC1F73A59AE2C28E633D8C971763576DD25386518678A15C64A2
-            ]
-            + Op.PUSH9[0x2C68BF3C1A7433AF2E]
-            + Op.PUSH14[0xD0276F494254235FE7B28B1F9976]
-            + Op.PUSH2[0xEBA4]
-            + Op.PUSH23[0x7C05F37A8B9B7980106E2BBE8744BED6D0F782AC6A99E0]
-            + Op.PUSH30[
-                0x9486451AB20E48C9E99F083973D5A10A57F4C3E7E3FA3BFD63A39006F35F
-            ]
-            + Op.PUSH20[0x25AE8B67348D74C87E78D6DC699541FDF8D08569]
-            + Op.PUSH31[
-                0x58B02F9FEF3F78554901CC888449B92FE07E74FB3069F7BE725F408005886E  # noqa: E501
-            ]
-            + Op.PUSH20[0xE720275F04F63284F6F10B6DF25694B3A55936D0]
-            + Op.PUSH15[0xD8C18D03D868D30B7766BD0D6A111F]
-            + Op.PUSH20[0x4650113A9F6B31EF3BE38904CCD66A304BBF877E]
-            + Op.SWAP14
-            + Op.PUSH13[0xCC3E98FA65A685B0BF181C6DD6]
-            + Op.PUSH29[
-                0x9DB728914FF2977B8C19193F67B9053F72C819B5BC5542945BD6A90799
-            ]
-            + Op.PUSH6[0xD91F47A11F38]
-            + Op.PUSH3[0xD346CB]
-            + Op.PUSH12[0x70D29ECA71B0D12D01996B89]
-            + Op.PUSH23[0x3F13059617D671DDC626D93A3E3FDA99999484470E3427]
-            + Op.PUSH32[
-                0x9AC904A6BE6B8B9F0A91E98E2759A946222E419D34089491DB069BBEEEA7D198  # noqa: E501
-            ]
-            + Op.PUSH9[0xE6FEF55CD7440FBBDD]
-            + Op.PUSH28[
-                0xF7CAB153DE2F407FC2C1F51952D5D5388159F73C98DEB0A3F75D04EB
-            ]
-            + Op.PUSH17[0xCEE4F3DD886B6BA2AB3D1E110DB841C507]
-            + Op.PUSH8[0xA4E0ED4ABCA1BD1D]
-            + Op.PUSH7[0x88861C4BB169FA]
-            + Op.DUP12
-            + Op.PUSH4[0xD253F1A4]
-            + Op.PUSH4[0x6A397939]
-            + Op.PUSH10[0x65AE9C16C2197C57851D]
-            + Op.PUSH9[0xF1EE6FFF3C92E794D0]
-            + Op.PUSH29[
-                0xC6D2F5B964448FEE1C3F52921CD138BFE26F57A3CE26AE8E622C80FCFB
-            ]
-            + Op.PUSH32[
-                0x414B5750048E67DD2C715BDF907A881EF7A77DC8B166B413EBB4261BDA628C26  # noqa: E501
-            ]
-            + Op.PUSH7[0x6D7EC3D2D20BDC]
-            + Op.PUSH31[
-                0x117960DA38D995574327FC1B63764875B839F395793A937B5F2793DB93B23B  # noqa: E501
-            ]
-            + Op.PUSH18[0x60BB44CF7BF515A85769D5F51851260F0739]
-            + Op.PUSH10[0xB185817C3E5B65875394]
-            + Op.PUSH32[
-                0x6AE534B0E68AFA57A476FF52028737E7D342C1DDC7C5DC786FE6216838882C6F  # noqa: E501
-            ]
-            + Op.PUSH15[0x8519B16B2D9451EA2F048765576AF4]
-            + Op.PUSH2[0xAAB4]
-            + Op.PUSH3[0x31F6A]
-            + Op.PUSH5[0xF0AE07FA9A]
-            + Op.PUSH5[0xD4772252EB]
-            + Op.SWAP15
-            + Op.PUSH11[0xA14429A7E2A1D434826990]
-            + Op.PUSH6[0xE44695FBEA17]
-            + Op.PUSH14[0x63D01D22231D221B6F8DFDA47F51]
-            + Op.PUSH5[0xA47454AB39]
-            + Op.PUSH16[0x17257DDEC269F67ED7C6D17FFAC1C613]
-            + Op.PUSH19[0xAAF587427EEE43772C5F28FDE9D395B65BF2D7]
-            + Op.PUSH31[
-                0x4EAA635BEA61396414A53508797E2506ED2F921F29BF2FDA1796F4396C4EDB  # noqa: E501
-            ]
-            + Op.PUSH16[0x6ECC6D79FD82D9838A512DF1454CE722]
-            + Op.PUSH9[0xD8A32E0971C718B683]
-            + Op.PUSH15[0x4BCB788766F266A3EDFDD24686274F]
-            + Op.PUSH9[0x4C4B0A7FD708215976]
-            + Op.PUSH16[0x4670A09A9E231BF61FE5F955A75B8870]
-            + Op.PUSH21[0x4EC89C81940D46BE921C40917862E1C186679F354A]
-            + Op.PUSH17[0x4FD5537CEB310616ACF9779C43C8F585C0]
-            + Op.PUSH5[0xFAFA775D27]
-            + Op.SWAP14
-            + Op.CREATE(value=0x1E, offset=0x5FC16D, size=0xAEC380)
-            + Op.PUSH8[0xEDDFFDF0F1359F38]
-            + Op.PUSH10[0x70FE2EB95C063421601A]
-            + Op.PUSH27[
-                0x5F9256A6398651BE88998DEB83D16EDD603992A27F758BDA8C1BF9
-            ]
-            + Op.PUSH21[0xE49A52CF19C9BC32A79DB4778535677E3CAEAE7F2F]
-            + Op.PUSH11[0xC54F147D2729C30D694BCB]
-            + Op.PUSH3[0x2C1310]
-            + Op.PUSH13[0x3382D4C27BC4EE55EADB4921D9]
-            + Op.PUSH26[0x65E605BD3DAA1C233230119DCE876049813474DC4B3EC1D0EA8D]
-            + Op.PUSH20[0xD182BEB19CD3C8F198578D863907A60FD633A658]
-            + Op.PUSH19[0xD93E47DC134FC815D9800BAD3F2D58BB97B577]
-            + Op.PUSH16[0x42800F1F182951BA5ACED03A7C3ABD85]
-            + Op.SWAP10
-            + Op.CODECOPY(
-                dest_offset=0x2867293DBFE29B7346020EF70D18CACD7508CCB3731B,
-                offset=0x10D13F07077,
-                size=0x483189606297788FBF55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xd18174aba5b877bd17dc67a4272d8a567cfa8925"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "387814bf0652a6f3aefce6ef7be00599328bbf7e802e1ea22644a96fbf319d273c0e7150"  # noqa: E501
-            "67e4e5e74ecfc3ae60fd917b9224a4bbaa6db919506fc9e3cd4792dbecb1427e907653a3"  # noqa: E501
-            "e359acf57c1e4afae77816fdc406706133e14efc6fe3ed1dc01f663f8e79c5fb6a32685e"  # noqa: E501
-            "c748da76ab766d20766430b1775afa280f1c02e5617230d3b68fa16d4d73a1b27ae07b10"  # noqa: E501
-            "96d44b02414374765d0907504a2f25e45aee4fdbb17b244e93714f36d9c035346d67ce3c"  # noqa: E501
-            "18bf3d3af42f3b5f807689e8f429c0070a5812d602d25c4664cccfa7ddff8188f174c046"  # noqa: E501
-            "eef00dcd5355c37d900a2ce940246fcaada0526acdd4eaf98a420bae34e22b37"
+        to=target,
+        data=Bytes(
+            "387814bf0652a6f3aefce6ef7be00599328bbf7e802e1ea22644a96fbf319d273c0e715067e4e5e74ecfc3ae60fd917b9224a4bbaa6db919506fc9e3cd4792dbecb1427e907653a3e359acf57c1e4afae77816fdc406706133e14efc6fe3ed1dc01f663f8e79c5fb6a32685ec748da76ab766d20766430b1775afa280f1c02e5617230d3b68fa16d4d73a1b27ae07b1096d44b02414374765d0907504a2f25e45aee4fdbb17b244e93714f36d9c035346d67ce3c18bf3d3af42f3b5f807689e8f429c0070a5812d602d25c4664cccfa7ddff8188f174c046eef00dcd5355c37d900a2ce940246fcaada0526acdd4eaf98a420bae34e22b37"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1928806571,
+        value=0x72F740AB,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest178.py b/tests/ported_static/stRandom/test_random_statetest178.py
index 4552008bd5e..db292922da6 100644
--- a/tests/ported_static/stRandom/test_random_statetest178.py
+++ b/tests/ported_static/stRandom/test_random_statetest178.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest178.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest178Filler.json
+state_tests/stRandom/randomStatetest178Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest178Filler.json"],
+    ["state_tests/stRandom/randomStatetest178Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest178(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest178."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,98 +44,75 @@ def test_random_statetest178(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(
-                offset=0x342BEABE599E4BC177FD97D36DF48D50650BA6129A9A83D4CF809EC21452,  # noqa: E501
-            )
-            + Op.PUSH29[
-                0x620167F530C3265BE9887F6E5B8186DECDC00A6A801E5F56DD8D9D36A4
-            ]
-            + Op.DUP1
-            + Op.PUSH14[0xBCCC299E4BBF46AD577E25B5B1FC]
-            + Op.PUSH23[0xB6999CB23A6A03C4035E36B8494135EE170647395DA00B]
-            + Op.PUSH15[0xA64C43F3358B8BDCF593C89FB70B8]
-            + Op.PUSH6[0xEF153B5195C7]
-            + Op.PUSH26[0x59256BEB4F932095EB8AC80BC2C050F6F550A362AAC77F5C4B19]
-            + Op.PUSH18[0x51DF039D64B77DCA22EB8FD4B8CF50FB85A3]
-            + Op.PUSH16[0x1D909D1919A47FE97DE5526726B4A47B]
-            + Op.DUP7
-            + Op.LOG3(
-                offset=0x6291,
-                size=0x3E,
-                topic_1=0x56FF5DD24A1F49E50B9F5924F473B2DC5306D67054CA575D0,
-                topic_2=0xD9,
-                topic_3=0x7B13471056439457CD7CBC50,
-            )
-            + Op.CALL(
-                gas=0xE3319C8,
-                address=0x1B0A78BDF6595742D34BF13386BCC01EFADDF68C,
-                value=0x38A57DDC,
-                args_offset=0x1F,
-                args_size=0x9,
-                ret_offset=0x10,
-                ret_size=0x14,
-            )
-            + Op.CALLER
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x1b0a78bdf6595742d34bf13386bcc01efaddf68c"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7d342beabe599e4bc177fd97d36df48d50650ba6129a9a83d4cf809ec21452357c620167f530c3265be9887f6e5b8186decdc00a6a801e5f56dd8d9d36a4806dbccc299e4bbf46ad577e25b5b1fc76b6999cb23a6a03c4035e36b8494135ee170647395da00b6e0a64c43f3358b8bdcf593c89fb70b865ef153b5195c77959256beb4f932095eb8ac80bc2c050f6f550a362aac77f5c4b197151df039d64b77dca22eb8fd4b8cf50fb85a36f1d909d1919a47fe97de5526726b4a47b866b7b13471056439457cd7cbc5060d978056ff5dd24a1f49e50b9f5924f473b2dc5306d67054ca575d0603e616291a3601460106009601f6338a57ddc73<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>630e3319c8f133  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(
+            offset=0x342BEABE599E4BC177FD97D36DF48D50650BA6129A9A83D4CF809EC21452  # noqa: E501
+        )
+        + Op.PUSH29[
+            0x620167F530C3265BE9887F6E5B8186DECDC00A6A801E5F56DD8D9D36A4
+        ]
+        + Op.DUP1
+        + Op.PUSH14[0xBCCC299E4BBF46AD577E25B5B1FC]
+        + Op.PUSH23[0xB6999CB23A6A03C4035E36B8494135EE170647395DA00B]
+        + Op.PUSH15[0xA64C43F3358B8BDCF593C89FB70B8]
+        + Op.PUSH6[0xEF153B5195C7]
+        + Op.PUSH26[0x59256BEB4F932095EB8AC80BC2C050F6F550A362AAC77F5C4B19]
+        + Op.PUSH18[0x51DF039D64B77DCA22EB8FD4B8CF50FB85A3]
+        + Op.PUSH16[0x1D909D1919A47FE97DE5526726B4A47B]
+        + Op.DUP7
+        + Op.LOG3(
+            offset=0x6291,
+            size=0x3E,
+            topic_1=0x56FF5DD24A1F49E50B9F5924F473B2DC5306D67054CA575D0,
+            topic_2=0xD9,
+            topic_3=0x7B13471056439457CD7CBC50,
+        )
+        + Op.CALL(
+            gas=0xE3319C8,
+            address=0x1B0A78BDF6595742D34BF13386BCC01EFADDF68C,
+            value=0x38A57DDC,
+            args_offset=0x1F,
+            args_size=0x9,
+            ret_offset=0x10,
+            ret_size=0x14,
+        )
+        + Op.CALLER,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x1B0A78BDF6595742D34BF13386BCC01EFADDF68C),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "66fd78520a4acd897a6e29cf1b15f576b05a2bc0c18bb93a759d3f5e1ac5d34ba1e261c7"  # noqa: E501
-            "0b7afd59945da98cc373eac6aa543bae2e6726e3ff03ad2e788dc33f3b736ef736637d8a"  # noqa: E501
-            "c680281bb29884e641473063e58e7318f5f4cbade311c02eed1c323c19bba7df47294064"  # noqa: E501
-            "64b42ed0cb6d0189be83857fb09713ae69e7d2d472e6d85d23920625c84c39489fc80d27"  # noqa: E501
-            "2868f40c64cc6cb93ea5741d1918dfc8f61086b1b0637390a1934b637c37ec94877d3ea7"  # noqa: E501
-            "63b20b9e04fa589f30da18f1565bcf15ad38bc735b9d45b5d963cadd77e9e3db27853e74"  # noqa: E501
-            "62a6417a4ac9af38f967a198c6f50deb53634bcbbe9c6a83a7357847acc4f6360fa46e43"  # noqa: E501
-            "595a8936969798890170a6874b4e67391c228e9d0a754f68635d505c3f9a8c2555728626"  # noqa: E501
-            "e286db52177c2228fb04d4b702bea78df3747d6fa1079394222b8d2a0dfc34ce6d9e5664"  # noqa: E501
-            "062fa8977526ced3516147e12a7b9e36f6628dd9efe320bef809146e8fad97d5aedf559b"  # noqa: E501
-            "cc15442b1fd347758332cb1d4bb96471a01de009dc175e3eae40d189755a7c1f46c55d33"  # noqa: E501
-            "53af6fd0ee638735594b4bb2e6aa99fdbc96508431f421dd770b6379f9b5cbee55423a23"  # noqa: E501
-            "c5538390612dc07c752c39f1c87a02777b0fa261dd883d49b2ae5c02c6e81bd0a53ba5d5"  # noqa: E501
-            "3e12530485664f77811ffaca4c688d18d6122f3a564151676f40f70e45da4fe562355ba1"  # noqa: E501
-            "7d36458de5f760c8148a11b1fece135e184d2dbf9ecf019d634d8498ae6c6862431f356e"  # noqa: E501
-            "1940bc7bb1a252ece1b1605e467f328c79bb45440e29a9444f1948f3737dc02ec2c10862"  # noqa: E501
-            "323af3bae0db487768f3aa49fb0967d7eb138302bcb9cedb6b327f4d35a39cf561f1ee73"  # noqa: E501
-            "c294825a5de76bd6bf707c5a660e3a417b6ac0586e80ecb6300ea61a618b628d8fcc6c80"  # noqa: E501
-            "a37fbfda4e162006259f39441a81fd310c9a323be96b826199149ebdb88ea3e87df96d06"  # noqa: E501
-            "c71959b65c4a3e73b50da0a67590625ad154729d9a0a585ba3fc028fc342115f2308566e"  # noqa: E501
-            "69cd557f7a7a73474bae3846016f5281b41609a85ee1b4244652d5c1360c9d30fe27dd2d"  # noqa: E501
-            "62b415d06a278aafd0816e734b76a3500869747b893809a7c2a185836da26ef253e0a0de"  # noqa: E501
-            "429e617a82f8f17f055b1b67fe7366d9a5a491fb47f997937d38e7e8d4cbe8fa227c8b70"  # noqa: E501
-            "f8a70e7b667883e393d677c86a9c8ec7144c61cf62e2403893"
+        to=target,
+        data=Bytes(
+            "66fd78520a4acd897a6e29cf1b15f576b05a2bc0c18bb93a759d3f5e1ac5d34ba1e261c70b7afd59945da98cc373eac6aa543bae2e6726e3ff03ad2e788dc33f3b736ef736637d8ac680281bb29884e641473063e58e7318f5f4cbade311c02eed1c323c19bba7df4729406464b42ed0cb6d0189be83857fb09713ae69e7d2d472e6d85d23920625c84c39489fc80d272868f40c64cc6cb93ea5741d1918dfc8f61086b1b0637390a1934b637c37ec94877d3ea763b20b9e04fa589f30da18f1565bcf15ad38bc735b9d45b5d963cadd77e9e3db27853e7462a6417a4ac9af38f967a198c6f50deb53634bcbbe9c6a83a7357847acc4f6360fa46e43595a8936969798890170a6874b4e67391c228e9d0a754f68635d505c3f9a8c2555728626e286db52177c2228fb04d4b702bea78df3747d6fa1079394222b8d2a0dfc34ce6d9e5664062fa8977526ced3516147e12a7b9e36f6628dd9efe320bef809146e8fad97d5aedf559bcc15442b1fd347758332cb1d4bb96471a01de009dc175e3eae40d189755a7c1f46c55d3353af6fd0ee638735594b4bb2e6aa99fdbc96508431f421dd770b6379f9b5cbee55423a23c5538390612dc07c752c39f1c87a02777b0fa261dd883d49b2ae5c02c6e81bd0a53ba5d53e12530485664f77811ffaca4c688d18d6122f3a564151676f40f70e45da4fe562355ba17d36458de5f760c8148a11b1fece135e184d2dbf9ecf019d634d8498ae6c6862431f356e1940bc7bb1a252ece1b1605e467f328c79bb45440e29a9444f1948f3737dc02ec2c10862323af3bae0db487768f3aa49fb0967d7eb138302bcb9cedb6b327f4d35a39cf561f1ee73c294825a5de76bd6bf707c5a660e3a417b6ac0586e80ecb6300ea61a618b628d8fcc6c80a37fbfda4e162006259f39441a81fd310c9a323be96b826199149ebdb88ea3e87df96d06c71959b65c4a3e73b50da0a67590625ad154729d9a0a585ba3fc028fc342115f2308566e69cd557f7a7a73474bae3846016f5281b41609a85ee1b4244652d5c1360c9d30fe27dd2d62b415d06a278aafd0816e734b76a3500869747b893809a7c2a185836da26ef253e0a0de429e617a82f8f17f055b1b67fe7366d9a5a491fb47f997937d38e7e8d4cbe8fa227c8b70f8a70e7b667883e393d677c86a9c8ec7144c61cf62e2403893"  # noqa: E501
         ),
         gas_limit=952280955,
-        value=1865661229,
+        value=0x6F33BB2D,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest179.py b/tests/ported_static/stRandom/test_random_statetest179.py
index 430bfdf5abf..77fea7abbff 100644
--- a/tests/ported_static/stRandom/test_random_statetest179.py
+++ b/tests/ported_static/stRandom/test_random_statetest179.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest179.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest179Filler.json
+state_tests/stRandom/randomStatetest179Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest179Filler.json"],
+    ["state_tests/stRandom/randomStatetest179Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest179(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest179."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,71 +47,63 @@ def test_random_statetest179(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x515480126A50A173506E066762129255,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f515480126a50a173506e06676212925560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x515480126A50A173506E066762129255
         ),
         nonce=0,
-        address=Address("0xb4749744885eb1b84835f2745a646f4ab9e60fd2"),  # noqa: E501
+        address=Address(0xB4749744885EB1B84835F2745A646F4AB9E60FD2),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c3506f515480126a50a173506e0667621292"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f515480126a50a173506e0667621292"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1584198892,
+        value=0x5E6CF4EC,
     )
 
     post = {
-        contract: Account(storage={0: 0x515480126A50A173506E066762129255}),
+        target: Account(
+            storage={0: 0x515480126A50A173506E066762129255},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest18.py b/tests/ported_static/stRandom/test_random_statetest18.py
index 14438c27de2..ad0ccda235e 100644
--- a/tests/ported_static/stRandom/test_random_statetest18.py
+++ b/tests/ported_static/stRandom/test_random_statetest18.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest18.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest18Filler.json
+state_tests/stRandom/randomStatetest18Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest18Filler.json"],
+    ["state_tests/stRandom/randomStatetest18Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest18(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest18."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,45 @@ def test_random_statetest18(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001077f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504419860b9754998d503105a033436e67133a60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000001077f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3504419860b9754998d503105a03343"  # noqa: E501
-            "6e67133a60005155"
+            "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001077f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504419860b9754998d503105a033436e67133a60005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x199e67129322e9ea96e433131d5ce947ef8b4892"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000001077f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3504419860b9754998d503105a03343"  # noqa: E501
-            "6e67133a"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001077f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504419860b9754998d503105a033436e67133a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1858297540,
+        value=0x6EC35EC4,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest180.py b/tests/ported_static/stRandom/test_random_statetest180.py
index d74f21a87ab..a52580d90f4 100644
--- a/tests/ported_static/stRandom/test_random_statetest180.py
+++ b/tests/ported_static/stRandom/test_random_statetest180.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest180.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest180Filler.json
+state_tests/stRandom/randomStatetest180Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest180Filler.json"],
+    ["state_tests/stRandom/randomStatetest180Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest180(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest180."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,61 +46,57 @@ def test_random_statetest180(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.PREVRANDAO
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x11576B693C128A9E0820609C050A219D,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x1d834e4f60db574a868a27e275f1460fe1888f96"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001447f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f11576b693c128a9e0820609c050a219d60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x1]
+        + Op.PREVRANDAO
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x11576B693C128A9E0820609C050A219D
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x1D834E4F60DB574A868A27E275F1460FE1888F96),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000001447f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c3507f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e796f11576b693c128a9e0820609c050a219d"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001447f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f11576b693c128a9e0820609c050a219d"  # noqa: E501
         ),
         gas_limit=100000,
-        value=566466109,
+        value=0x21C3963D,
     )
 
     post = {
-        contract: Account(storage={0: 0x11576B693C128A9E0820609C050A219D}),
+        target: Account(
+            storage={0: 0x11576B693C128A9E0820609C050A219D},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest183.py b/tests/ported_static/stRandom/test_random_statetest183.py
index 8158866385a..945168e9838 100644
--- a/tests/ported_static/stRandom/test_random_statetest183.py
+++ b/tests/ported_static/stRandom/test_random_statetest183.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest183.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest183Filler.json
+state_tests/stRandom/randomStatetest183Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest183Filler.json"],
+    ["state_tests/stRandom/randomStatetest183Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest183(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest183."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,61 +47,55 @@ def test_random_statetest183(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.NUMBER
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x4134547075687854849D7B6465863055,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x2ec56a4059cc67195985735e8a72bb5a07301eb3"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>436f4134547075687854849d7b646586305560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350] * 3
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.NUMBER
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x4134547075687854849D7B6465863055
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x2EC56A4059CC67195985735E8A72BB5A07301EB3),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e79436f4134547075687854849d7b6465"  # noqa: E501
-            "8630"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79436f4134547075687854849d7b64658630"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1159080385,
+        value=0x451629C1,
     )
 
     post = {
-        contract: Account(storage={0: 0x4134547075687854849D7B6465863055}),
+        target: Account(
+            storage={0: 0x4134547075687854849D7B6465863055},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest184.py b/tests/ported_static/stRandom/test_random_statetest184.py
index dcae5a3af1b..6abaa548ff1 100644
--- a/tests/ported_static/stRandom/test_random_statetest184.py
+++ b/tests/ported_static/stRandom/test_random_statetest184.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest184.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest184Filler.json
+state_tests/stRandom/randomStatetest184Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest184Filler.json"],
+    ["state_tests/stRandom/randomStatetest184Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,12 +31,12 @@ def test_random_statetest184(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x6d6e40885310545835a5b582dbc23ef026404bda")
+    """Test_random_statetest184."""
+    coinbase = Address(0x6D6E40885310545835A5B582DBC23EF026404BDA)
+    addr = Address(0xF377657E450772B703A269E12BB487FF421A5C6D)
     sender = EOA(
         key=0x382ACD382CC7A37BB6A57C4A171F216EF77EF04EBD5E6C0744EE5C90B0D962EF
     )
-    callee = Address("0xf377657e450772b703a269e12bb487ff421a5c6d")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,43 +47,47 @@ def test_random_statetest184(
         gas_limit=69449279085,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8C, value=0x823A02877CEF7C1AFB60663009DEF564)
-            + Op.SUB(
-                0xE130184B64F2507582C502D450349FF24FB8AEB2A46146687B666BD7BD,
-                0xAD2AE05769B991313726EDBFA0881D9CC955B0F5154751DA315696EA,
-            )
-            + Op.PUSH5[0x946CB720C7]
-            + Op.PUSH14[0x483F5AFEA0049251FD9793C4B037]
-            + Op.PUSH11[0xFBB4EBCDC42FDD42EDCD4B]
-            + Op.PUSH2[0x9CEC]
-            + Op.PUSH25[0x7638009CEA26A1ABE570E3186AB790B7DC7DB36E4CDA2570B0]
-            + Op.DUP5
-            + Op.DIV(
-                0xD34A4B816B80,
-                0xDF6E39579C7C43A4AC976CD507D493CDFAEBE09936078E31C71C46,
-            )
+    pre[addr] = Account(balance=0x9740421FF0FF3AE3, nonce=29)
+    pre[sender] = Account(balance=0x10C1142F2B8E8EB058)
+    # Source: raw
+    # 0x6f823a02877cef7c1afb60663009def564608c557bad2ae05769b991313726edbfa0881d9cc955b0f5154751da315696ea7ce130184b64f2507582c502d450349ff24fb8aeb2a46146687b666bd7bd0364946cb720c76d483f5afea0049251fd9793c4b0376afbb4ebcdc42fdd42edcd4b619cec787638009cea26a1abe570e3186ab790b7dc7db36e4cda2570b0847adf6e39579c7c43a4ac976cd507d493cdfaebe09936078e31c71c4665d34a4b816b8004  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8C, value=0x823A02877CEF7C1AFB60663009DEF564)
+        + Op.SUB(
+            0xE130184B64F2507582C502D450349FF24FB8AEB2A46146687B666BD7BD,
+            0xAD2AE05769B991313726EDBFA0881D9CC955B0F5154751DA315696EA,
+        )
+        + Op.PUSH5[0x946CB720C7]
+        + Op.PUSH14[0x483F5AFEA0049251FD9793C4B037]
+        + Op.PUSH11[0xFBB4EBCDC42FDD42EDCD4B]
+        + Op.PUSH2[0x9CEC]
+        + Op.PUSH25[0x7638009CEA26A1ABE570E3186AB790B7DC7DB36E4CDA2570B0]
+        + Op.DUP5
+        + Op.DIV(
+            0xD34A4B816B80,
+            0xDF6E39579C7C43A4AC976CD507D493CDFAEBE09936078E31C71C46,
         ),
         balance=0x70A217C02C8F2D4,
         nonce=117,
-        address=Address("0x898207f2d9b9fb11cec9647a70e9390711732daa"),  # noqa: E501
+        address=Address(0x898207F2D9B9FB11CEC9647A70E9390711732DAA),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x10C1142F2B8E8EB058)
-    pre[callee] = Account(balance=0x9740421FF0FF3AE3, nonce=29)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("64dd3e4e84676723342c1dfaf9af4ef3"),
+        to=target,
+        data=Bytes("64dd3e4e84676723342c1dfaf9af4ef3"),
         gas_limit=100000,
+        value=0x6D1DD024,
         gas_price=28,
-        value=1830670372,
     )
 
     post = {
-        contract: Account(storage={140: 0x823A02877CEF7C1AFB60663009DEF564}),
+        target: Account(
+            storage={140: 0x823A02877CEF7C1AFB60663009DEF564},
+            nonce=117,
+        ),
+        addr: Account(storage={}, code=b"", nonce=29),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest185.py b/tests/ported_static/stRandom/test_random_statetest185.py
index 5f99aac00aa..21863df133c 100644
--- a/tests/ported_static/stRandom/test_random_statetest185.py
+++ b/tests/ported_static/stRandom/test_random_statetest185.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest185.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest185Filler.json
+state_tests/stRandom/randomStatetest185Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest185Filler.json"],
+    ["state_tests/stRandom/randomStatetest185Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest185(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest185."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,61 +44,54 @@ def test_random_statetest185(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.BYTE(
-                Op.COINBASE,
-                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.LOG3(
-                offset=Op.GASPRICE,
-                size=0x805A8D,
-                topic_1=Op.PUSH32[0x1],
-                topic_2=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                topic_3=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff411a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000162805a8d3aa3  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.BYTE(
+            Op.COINBASE, Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        )
+        + Op.LOG3(
+            offset=Op.GASPRICE,
+            size=0x805A8D,
+            topic_1=Op.PUSH32[0x1],
+            topic_2=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            topic_3=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
         ),
         nonce=0,
-        address=Address("0x065ab564766a44260b57175a6f14db1478ff080f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff411a7f000000000000"  # noqa: E501
-            "000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000"  # noqa: E501
-            "000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000162805a8d3aa3"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff411a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000162805a8d3aa3"  # noqa: E501
         ),
         gas_limit=1789972511,
-        value=1159525186,
+        value=0x451CF342,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest187.py b/tests/ported_static/stRandom/test_random_statetest187.py
index 050143fa819..47699fda71c 100644
--- a/tests/ported_static/stRandom/test_random_statetest187.py
+++ b/tests/ported_static/stRandom/test_random_statetest187.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest187.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest187Filler.json
+state_tests/stRandom/randomStatetest187Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest187Filler.json"],
+    ["state_tests/stRandom/randomStatetest187Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest187(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest187."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,59 +47,55 @@ def test_random_statetest187(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.GASLIMIT
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x75988036A0562096036B04518877199D,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f75988036a0562096036b04518877199d60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.GASLIMIT
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x75988036A0562096036B04518877199D
         ),
         nonce=0,
-        address=Address("0x38bb0524963d132fe05d36cc3c4ae298ba06ee83"),  # noqa: E501
+        address=Address(0x38BB0524963D132FE05D36CC3C4AE298BA06EE83),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000007f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000017f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000006f75988036a0562096036b045188"  # noqa: E501
-            "77199d"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f75988036a0562096036b04518877199d"  # noqa: E501
         ),
         gas_limit=100000,
-        value=925780098,
+        value=0x372E4882,
     )
 
     post = {
-        contract: Account(storage={0: 0x75988036A0562096036B04518877199D}),
+        target: Account(
+            storage={0: 0x75988036A0562096036B04518877199D},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest188.py b/tests/ported_static/stRandom/test_random_statetest188.py
index 3d888c1ea12..b06c894e7e1 100644
--- a/tests/ported_static/stRandom/test_random_statetest188.py
+++ b/tests/ported_static/stRandom/test_random_statetest188.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest188.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest188Filler.json
+state_tests/stRandom/randomStatetest188Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest188Filler.json"],
+    ["state_tests/stRandom/randomStatetest188Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest188(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest188."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,57 @@ def test_random_statetest188(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff817f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4286687859f383797187945560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.DUP2
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.TIMESTAMP
+        + Op.DUP7
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x7859F3837971879455),
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xD2F6EFED4689F4A1EEFDAC8CEB4C7B05A47BF560),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.DUP2
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.TIMESTAMP
-            + Op.DUP7
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x7859F3837971879455)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xd2f6efed4689f4a1eefdac8ceb4c7b05a47bf560"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff817f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff4286687859f38379718794"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff817f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4286687859f38379718794"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1226396004,
+        value=0x49195164,
     )
 
     post = {
-        contract: Account(storage={0: 0x7859F3837971879455}),
+        target: Account(storage={0: 0x7859F3837971879455}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest189.py b/tests/ported_static/stRandom/test_random_statetest189.py
index 1a73f45549f..4a6149f73b4 100644
--- a/tests/ported_static/stRandom/test_random_statetest189.py
+++ b/tests/ported_static/stRandom/test_random_statetest189.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest189.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest189Filler.json
+state_tests/stRandom/randomStatetest189Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest189Filler.json"],
+    ["state_tests/stRandom/randomStatetest189Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest189(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest189."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,58 +43,45 @@ def test_random_statetest189(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000035900bf3740474765060005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000035900bf3740474765060005155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017f0000000000000000000000010000"  # noqa: E501
-            "0000000000000000000000000000000000007f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000007f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000035900bf3740474765060005155"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x8979909f9cfe09c20d8b0d21ac5fb398b01b8df1"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017f0000000000000000000000010000"  # noqa: E501
-            "0000000000000000000000000000000000007f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000007f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000035900bf37404747650"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000035900bf37404747650"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1090808233,
+        value=0x410469A9,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest19.py b/tests/ported_static/stRandom/test_random_statetest19.py
index 3c34df0822e..dbac44602d3 100644
--- a/tests/ported_static/stRandom/test_random_statetest19.py
+++ b/tests/ported_static/stRandom/test_random_statetest19.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest19.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest19Filler.json
+state_tests/stRandom/randomStatetest19Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest19Filler.json"],
+    ["state_tests/stRandom/randomStatetest19Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest19(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest19."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,61 @@ def test_random_statetest19(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe3a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f0000000000000000000000000000000000000000000000000000000000000001587f000000000000000000000000000000000000000000000000000000000000c3506fff59876660063b7c8df1ff088a84145560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.GASPRICE
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.COINBASE
+        + Op.PUSH32[0x1]
+        + Op.PC
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0xFF59876660063B7C8DF1FF088A841455
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x5316820609D951011B15E53834F242081ED021C2),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.GASPRICE
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.COINBASE
-            + Op.PUSH32[0x1]
-            + Op.PC
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0xFF59876660063B7C8DF1FF088A841455,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x5316820609d951011b15e53834f242081ed021c2"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe3a7f00"  # noqa: E501
-            "0000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000001587f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3506fff59876660063b7c8df1ff"  # noqa: E501
-            "088a8414"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe3a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f0000000000000000000000000000000000000000000000000000000000000001587f000000000000000000000000000000000000000000000000000000000000c3506fff59876660063b7c8df1ff088a8414"  # noqa: E501
         ),
         gas_limit=100000,
-        value=500004062,
+        value=0x1DCD74DE,
     )
 
     post = {
-        contract: Account(storage={0: 0xFF59876660063B7C8DF1FF088A841455}),
+        target: Account(
+            storage={0: 0xFF59876660063B7C8DF1FF088A841455},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest190.py b/tests/ported_static/stRandom/test_random_statetest190.py
index aae5b02dac2..08b54fdd625 100644
--- a/tests/ported_static/stRandom/test_random_statetest190.py
+++ b/tests/ported_static/stRandom/test_random_statetest190.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest190.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest190Filler.json
+state_tests/stRandom/randomStatetest190Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest190Filler.json"],
+    ["state_tests/stRandom/randomStatetest190Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest190(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest190."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,153 +43,57 @@ def test_random_statetest190(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                ),
-            )
-        ),
-        nonce=0,
-        address=Address("0x2bf1e46c1ec71ac6066d16a4400ce88ae6ade599"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff09"
-        ),
-        gas_limit=100000,
-        value=94912880,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest190Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest190_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                ),
-            )
-        ),
-        nonce=0,
-        address=Address("0x2bf1e46c1ec71ac6066d16a4400ce88ae6ade599"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MULMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff09"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=94912880,
+        value=0x5A84170,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest191.py b/tests/ported_static/stRandom/test_random_statetest191.py
index 43612347a66..f1044347324 100644
--- a/tests/ported_static/stRandom/test_random_statetest191.py
+++ b/tests/ported_static/stRandom/test_random_statetest191.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest191.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest191Filler.json
+state_tests/stRandom/randomStatetest191Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest191Filler.json"],
+    ["state_tests/stRandom/randomStatetest191Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest191(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest191."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,68 +47,63 @@ def test_random_statetest191(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PREVRANDAO
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x678F0443457084700B645760018A1055,
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f678f0443457084700b645760018a105560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PREVRANDAO
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x678F0443457084700B645760018A1055
         ),
         nonce=0,
-        address=Address("0x7823d6d4b3e7f30899cfb9dc7a825c19032ffd44"),  # noqa: E501
+        address=Address(0x7823D6D4B3E7F30899CFB9DC7A825C19032FFD44),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "010000000000000000000000000000000000000000447fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff6f678f0443457084700b645760018a10"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f678f0443457084700b645760018a10"  # noqa: E501
         ),
         gas_limit=100000,
-        value=385910599,
+        value=0x17008747,
     )
 
     post = {
-        contract: Account(storage={0: 0x678F0443457084700B645760018A1055}),
+        target: Account(
+            storage={0: 0x678F0443457084700B645760018A1055},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest192.py b/tests/ported_static/stRandom/test_random_statetest192.py
index ed26141001d..04ed5961ba6 100644
--- a/tests/ported_static/stRandom/test_random_statetest192.py
+++ b/tests/ported_static/stRandom/test_random_statetest192.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest192.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest192Filler.json
+state_tests/stRandom/randomStatetest192Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest192Filler.json"],
+    ["state_tests/stRandom/randomStatetest192Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest192(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest192."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,64 @@ def test_random_statetest192(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff347f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0460005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.CALLVALUE
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.DIV(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                Op.PUSH32[0xC350],
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xEC7E974E7E9D269AF680963F12A50B644A5EB8ED),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.CALLVALUE
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.DIV(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    Op.PUSH32[0xC350],
-                ),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xec7e974e7e9d269af680963f12a50b644a5eb8ed"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff347f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe04"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff347f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe04"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1168450397,
+        value=0x45A5235D,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x14F8B588E368F08461F9F01B866E43AA79BBADC0980B242070B8CFBFC6540,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest194.py b/tests/ported_static/stRandom/test_random_statetest194.py
index 17ae0e8a18c..bf41a6bf262 100644
--- a/tests/ported_static/stRandom/test_random_statetest194.py
+++ b/tests/ported_static/stRandom/test_random_statetest194.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest194.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest194Filler.json
+state_tests/stRandom/randomStatetest194Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest194Filler.json"],
+    ["state_tests/stRandom/randomStatetest194Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest194(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest194."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,64 +43,55 @@ def test_random_statetest194(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-                value=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                ),
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+            value=Op.MULMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            ),
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0xd53f0ec62568cdbc447c9967c97db408d33ece9a"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff097f0000000000000000000000004f3f7014"  # noqa: E501
-            "64972e74606d6ea82d4d3080599a0e79"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79"  # noqa: E501
         ),
         gas_limit=100000,
-        value=827862267,
+        value=0x31582CFB,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest195.py b/tests/ported_static/stRandom/test_random_statetest195.py
index 331252f3015..f2ac8f1690d 100644
--- a/tests/ported_static/stRandom/test_random_statetest195.py
+++ b/tests/ported_static/stRandom/test_random_statetest195.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest195.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest195Filler.json
+state_tests/stRandom/randomStatetest195Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest195Filler.json"],
+    ["state_tests/stRandom/randomStatetest195Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest195(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest195."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,64 +47,58 @@ def test_random_statetest195(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f000000000000000000000001000000000000000000000000000000000000000055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350] * 2
+        + Op.COINBASE
+        + Op.SSTORE(
+            key=Op.PUSH32[0x10000000000000000000000000000000000000000],
+            value=Op.MULMOD(
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xDCC17F922F302DF332310EB0931F83D016DC3F1B),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0xC350]
-            + Op.COINBASE
-            + Op.SSTORE(
-                key=Op.PUSH32[0x10000000000000000000000000000000000000000],
-                value=Op.MULMOD(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xdcc17f922f302df332310eb0931f83d016dc3f1b"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c350417fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "0000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff097f000000000000000000000001"  # noqa: E501
-            "0000000000000000000000000000000000000000"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000010000000000000000000000000000000000000000"  # noqa: E501
         ),
         gas_limit=100000,
-        value=307405855,
+        value=0x1252A41F,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x10000000000000000000000000000000000000000: 0xFFFFFFFFFFFFFFFFFFFFFFFE0000000000000000000000010000000000000000,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest196.py b/tests/ported_static/stRandom/test_random_statetest196.py
index 6ea582bf3c0..a4d7bf36c81 100644
--- a/tests/ported_static/stRandom/test_random_statetest196.py
+++ b/tests/ported_static/stRandom/test_random_statetest196.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest196.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest196Filler.json
+state_tests/stRandom/randomStatetest196Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest196Filler.json"],
+    ["state_tests/stRandom/randomStatetest196Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest196(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest196."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,68 +43,59 @@ def test_random_statetest196(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PREVRANDAO
-            + Op.CALLDATACOPY(
-                dest_offset=Op.PUSH32[0x0],
-                offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
-                size=Op.PUSH32[0x1],
-            )
-            + Op.SUB
-            + Op.PUSH6[0x9C5B3A6D7B9A]
-            + Op.SWAP4
-            + Op.SLOAD
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.CALLDATASIZE)
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000003703659c5b3a6d7b9a93543660005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PREVRANDAO
+        + Op.CALLDATACOPY(
+            dest_offset=Op.PUSH32[0x0],
+            offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
+            size=Op.PUSH32[0x1],
+        )
+        + Op.SUB
+        + Op.PUSH6[0x9C5B3A6D7B9A]
+        + Op.SWAP4
+        + Op.SLOAD
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.CALLDATASIZE),
         nonce=0,
-        address=Address("0x6e796014bf8f0f2c291f15ddb2ebf203b1477144"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f00000000000000000000000100"  # noqa: E501
-            "000000000000000000000000000000000000007f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000003703659c5b3a6d7b9a935436"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000003703659c5b3a6d7b9a935436"  # noqa: E501
         ),
         gas_limit=100000,
-        value=672785598,
+        value=0x2819E4BE,
     )
 
     post = {
-        contract: Account(storage={0: 244}),
+        target: Account(storage={0: 244}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest197.py b/tests/ported_static/stRandom/test_random_statetest197.py
index eeb214fddb3..97a84e3878a 100644
--- a/tests/ported_static/stRandom/test_random_statetest197.py
+++ b/tests/ported_static/stRandom/test_random_statetest197.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest197.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest197Filler.json
+state_tests/stRandom/randomStatetest197Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest197Filler.json"],
+    ["state_tests/stRandom/randomStatetest197Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest197(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest197."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,135 +43,45 @@ def test_random_statetest197(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000016e6a078e5652549f57423955  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000c350437f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000016e6a078e5652549f57423955"
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000016e6a078e5652549f57423955"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x71102826ff0f31fb54ce1f4b51c4f72e17bd2312"),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000c350437f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000016e6a078e5652549f574239"
-        ),
-        gas_limit=100000,
-        value=1542389267,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest197Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest197_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000c350437f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000016e6a078e5652549f57423955"
-        ),
-        nonce=0,
-        address=Address("0x71102826ff0f31fb54ce1f4b51c4f72e17bd2312"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000c350437f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000016e6a078e5652549f574239"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000016e6a078e5652549f574239"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1542389267,
+        value=0x5BEEFE13,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest198.py b/tests/ported_static/stRandom/test_random_statetest198.py
index ffbfe91ba8d..04cad03d209 100644
--- a/tests/ported_static/stRandom/test_random_statetest198.py
+++ b/tests/ported_static/stRandom/test_random_statetest198.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest198.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest198Filler.json
+state_tests/stRandom/randomStatetest198Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest198Filler.json"],
+    ["state_tests/stRandom/randomStatetest198Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest198(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest198."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,53 +47,48 @@ def test_random_statetest198(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x42417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09ff614044129a0169a2689415  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "42417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000017fffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000"  # noqa: E501
-            "000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000"  # noqa: E501
-            "000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff09ff614044129a0169a2689415"  # noqa: E501
+            "42417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09ff614044129a0169a2689415"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x2feb8271d411aedfea1e004c22736fae2bf174ca"),  # noqa: E501
+        address=Address(0x2FEB8271D411AEDFEA1E004C22736FAE2BF174CA),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "42417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000017fffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000"  # noqa: E501
-            "000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000"  # noqa: E501
-            "000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff09ff614044129a0169a2689415"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "42417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09ff614044129a0169a2689415"  # noqa: E501
         ),
         gas_limit=100000,
-        value=968197125,
+        value=0x39B58405,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x0000000000000000000000000000000000000000): Account(
+            storage={}, code=b"", nonce=0
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest199.py b/tests/ported_static/stRandom/test_random_statetest199.py
index 7d8c85d1351..ed83e6f0733 100644
--- a/tests/ported_static/stRandom/test_random_statetest199.py
+++ b/tests/ported_static/stRandom/test_random_statetest199.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest199.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest199Filler.json
+state_tests/stRandom/randomStatetest199Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest199Filler.json"],
+    ["state_tests/stRandom/randomStatetest199Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest199(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest199."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,51 +43,50 @@ def test_random_statetest199(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x30424543074242413155
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.ADDRESS
+        + Op.TIMESTAMP
+        + Op.SMOD(Op.NUMBER, Op.GASLIMIT)
+        + Op.TIMESTAMP
+        + Op.SSTORE(key=Op.BALANCE(address=Op.COINBASE), value=Op.TIMESTAMP),
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.ADDRESS
-            + Op.TIMESTAMP
-            + Op.SMOD(Op.NUMBER, Op.GASLIMIT)
-            + Op.TIMESTAMP
-            + Op.SSTORE(
-                key=Op.BALANCE(address=Op.COINBASE), value=Op.TIMESTAMP
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=46,
         nonce=0,
-        address=Address("0x961ce95e83ad7816d5fec439ea9847ca3a5543c5"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={46: 1000}),
+        target: Account(
+            storage={46: 1000},
+            balance=0xDE0B6B3A76586A0,
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest2.py b/tests/ported_static/stRandom/test_random_statetest2.py
index ad091bc8ae5..792dac6965e 100644
--- a/tests/ported_static/stRandom/test_random_statetest2.py
+++ b/tests/ported_static/stRandom/test_random_statetest2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest2.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest2Filler.json
+state_tests/stRandom/randomStatetest2Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest2Filler.json"],
+    ["state_tests/stRandom/randomStatetest2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest2."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,57 @@ def test_random_statetest2(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PC
-            + Op.NUMBER
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x3412A47C889E8DA06A04049F04988855,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x3c7b3e95899724c1f97c98de3f67b2e41d785f69"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>58437f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f3412a47c889e8da06a04049f0498885560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79] * 2
+        + Op.PC
+        + Op.NUMBER
+        + Op.PUSH32[0x1] * 2
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x3412A47C889E8DA06A04049F04988855
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x3C7B3E95899724C1F97C98DE3F67B2E41D785F69),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e7958437f000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000017f000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000016f3412a47c889e8da06a04049f049888"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7958437f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f3412a47c889e8da06a04049f049888"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2083830597,
+        value=0x7C34BB45,
     )
 
     post = {
-        contract: Account(storage={0: 0x3412A47C889E8DA06A04049F04988855}),
+        target: Account(
+            storage={0: 0x3412A47C889E8DA06A04049F04988855},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest20.py b/tests/ported_static/stRandom/test_random_statetest20.py
index eab8cc978f1..c6b30221733 100644
--- a/tests/ported_static/stRandom/test_random_statetest20.py
+++ b/tests/ported_static/stRandom/test_random_statetest20.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest20.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest20Filler.json
+state_tests/stRandom/randomStatetest20Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest20Filler.json"],
+    ["state_tests/stRandom/randomStatetest20Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest20(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest20."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,67 +43,61 @@ def test_random_statetest20(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.BALANCE
-            + Op.COINBASE
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SHA3(
-                offset=Op.ISZERO(
-                    Op.SUB(
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                        Op.PUSH32[0x1],
-                    ),
-                ),
-                size=Op.PUSH32[0x10000000000000000000000000000000000000000],
-            )
-            + Op.DIV(Op.NOT(0x5944747F74306615), Op.DUP11)
-            + Op.SWAP11
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x31417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0315208a675944747f7430661519049a55  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.BALANCE
+        + Op.COINBASE
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SHA3(
+            offset=Op.ISZERO(
+                Op.SUB(
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    Op.PUSH32[0x1],
+                )
+            ),
+            size=Op.PUSH32[0x10000000000000000000000000000000000000000],
+        )
+        + Op.DIV(Op.NOT(0x5944747F74306615), Op.DUP11)
+        + Op.SWAP11
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x14aae767bfb5a29ee9b0f5b449eb48366103601c"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "31417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000c3507fffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000"  # noqa: E501
-            "00000000000100000000000000000000000000000000000000007f000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000017fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff0315208a675944747f7430661519049a"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "31417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0315208a675944747f7430661519049a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1758540724,
+        value=0x68D133B4,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest200.py b/tests/ported_static/stRandom/test_random_statetest200.py
index dba196eab6c..2739268e301 100644
--- a/tests/ported_static/stRandom/test_random_statetest200.py
+++ b/tests/ported_static/stRandom/test_random_statetest200.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest200.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest200Filler.json
+state_tests/stRandom/randomStatetest200Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest200Filler.json"],
+    ["state_tests/stRandom/randomStatetest200Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest200(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest200."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,60 +46,56 @@ def test_random_statetest200(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.NUMBER
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.CALLVALUE
-            + Op.SSTORE(key=Op.DUP1, value=0x42051AF2A24050039E9D3A678B028A0A)
-        ),
-        nonce=0,
-        address=Address("0x16c2d1c5a69fa047f6c8f529ee8d728246515fa9"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
+    )
+    # Source: raw
+    # 0x437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>346f42051af2a24050039e9d3a678b028a0a8055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.NUMBER
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.CALLVALUE
+        + Op.SSTORE(key=Op.DUP1, value=0x42051AF2A24050039E9D3A678B028A0A),
+        nonce=0,
+        address=Address(0x16C2D1C5A69FA047F6C8F529EE8D728246515FA9),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "437f000000000000000000000000000000000000000000000000000000000000c3507f00"  # noqa: E501
-            "0000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "000000000000000100000000000000000000000000000000000000007f00000000000000"  # noqa: E501
-            "00000000004f3f701464972e74606d6ea82d4d3080599a0e79346f42051af2a24050039e"  # noqa: E501
-            "9d3a678b028a0a80"
+        to=target,
+        data=Bytes(
+            "437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79346f42051af2a24050039e9d3a678b028a0a80"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1062273821,
+        value=0x3F51031D,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x42051AF2A24050039E9D3A678B028A0A: 0x42051AF2A24050039E9D3A678B028A0A,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest201.py b/tests/ported_static/stRandom/test_random_statetest201.py
index 69cc2c0978e..f38c3d0e026 100644
--- a/tests/ported_static/stRandom/test_random_statetest201.py
+++ b/tests/ported_static/stRandom/test_random_statetest201.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest201.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest201Filler.json
+state_tests/stRandom/randomStatetest201Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest201Filler.json"],
+    ["state_tests/stRandom/randomStatetest201Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest201(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest201."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,54 +47,48 @@ def test_random_statetest201(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09ff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff8b8263974074da449e6861039960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff09ff7f000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000017f000000000000000000000000"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff8b8263974074da449e68610399600051"  # noqa: E501
-            "55"
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09ff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff8b8263974074da449e6861039960005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x3d068bacd9155d630ad1636b586827a5bc9acc9d"),  # noqa: E501
+        address=Address(0x3D068BACD9155D630AD1636B586827A5BC9ACC9D),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff09ff7f000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000017f000000000000000000000000"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff8b8263974074da449e68610399"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09ff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff8b8263974074da449e68610399"  # noqa: E501
         ),
         gas_limit=100000,
-        value=953592918,
+        value=0x38D6AC56,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x0000000000000000000000000000000000000000): Account(
+            storage={}, code=b"", nonce=0
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest202.py b/tests/ported_static/stRandom/test_random_statetest202.py
index 2e987f57710..f3a36977176 100644
--- a/tests/ported_static/stRandom/test_random_statetest202.py
+++ b/tests/ported_static/stRandom/test_random_statetest202.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest202.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest202Filler.json
+state_tests/stRandom/randomStatetest202Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest202Filler.json"],
+    ["state_tests/stRandom/randomStatetest202Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest202(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest202."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,58 +43,45 @@ def test_random_statetest202(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000557f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6750a3190486f0  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000557f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000007f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507f000000000000000000000000ffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff6750a3190486f0"
+            "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000557f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6750a3190486f0"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x1099229c5d84d6bc6a189e2189357e91c30c6f6a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000557f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000007f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507f000000000000000000000000ffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff6750a3190486f0"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000557f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6750a3190486f0"  # noqa: E501
         ),
         gas_limit=100000,
-        value=827910093,
+        value=0x3158E7CD,
     )
 
     post = {
-        contract: Account(storage={0: 50000}),
+        target: Account(storage={0: 50000}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest204.py b/tests/ported_static/stRandom/test_random_statetest204.py
index 18ca7acb804..56c6d9a85cd 100644
--- a/tests/ported_static/stRandom/test_random_statetest204.py
+++ b/tests/ported_static/stRandom/test_random_statetest204.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest204.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest204Filler.json
+state_tests/stRandom/randomStatetest204Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest204Filler.json"],
+    ["state_tests/stRandom/randomStatetest204Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest204(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest204."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,68 +47,61 @@ def test_random_statetest204(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.DUP3,
-                value=Op.MULMOD(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    Op.PUSH32[0x10000000000000000000000000000000000000000],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff098255  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.DUP3,
+            value=Op.MULMOD(
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                Op.PUSH32[0x10000000000000000000000000000000000000000],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
         nonce=0,
-        address=Address("0xb8147a5aaed0750fdd9ac0d29f0a0e668fa3d30c"),  # noqa: E501
+        address=Address(0xB8147A5AAED0750FDD9AC0D29F0A0E668FA3D30C),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000"  # noqa: E501
-            "0000000000000000000000000000007f000000000000000000000000ffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff0982"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0982"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1983843477,
+        value=0x763F0C95,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000FFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest205.py b/tests/ported_static/stRandom/test_random_statetest205.py
index 50777946550..a4e283aab9a 100644
--- a/tests/ported_static/stRandom/test_random_statetest205.py
+++ b/tests/ported_static/stRandom/test_random_statetest205.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest205.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest205Filler.json
+state_tests/stRandom/randomStatetest205Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest205Filler.json"],
+    ["state_tests/stRandom/randomStatetest205Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest205(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest205."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,125 +43,110 @@ def test_random_statetest205(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLER
-            + Op.LOG0(offset=0xEDEF, size=0xB2)
-            + Op.ORIGIN
-            + Op.PUSH16[0xDC74D570982966277B49CDB30A453FA0]
-            + Op.PUSH13[0x34A7423DA44BA2D04341AF08C4]
-            + Op.PUSH25[0xB17A57318AB10AB43B3744333B0AA8864AC27B3FD022E38005]
-            + Op.PUSH8[0x35A5FCDA3E9FDC25]
-            + Op.PUSH10[0x5972A076884DE6D6B6B0]
-            + Op.PUSH14[0xD45416C8110BAE3C70576B433A46]
-            + Op.PUSH19[0x777847E81823024DDD1292B929AD28E64A732B]
-            + Op.PUSH21[0xC0AE1941D5936ECD35738E2F279273788F4AAF1990]
-            + Op.PUSH27[
-                0x532A6B0F117C32B6CB967AAE8BDFCF86E2D4D64599986ABCF65A20
-            ]
-            + Op.PUSH22[0x4F5A816C58ED669138F6A0448670B906BBF1EB145CED]
-            + Op.DUP10
-            + Op.PUSH13[0x578DE5AA27769006B1A784E84B]
-            + Op.PUSH4[0x16D4E60C]
-            + Op.PUSH17[0x53B0B6550C70A177CB7A3E88D4E83FB189]
-            + Op.PUSH27[
-                0x9C2161FF6CC2679C178292687137854DA672E316C66EF03DC9AC3
-            ]
-            + Op.PUSH31[
-                0x8E430B7C64D1939BF67383C4BAFEB2F0471FE896B7C0E114BF6F152B266CC7  # noqa: E501
-            ]
-            + Op.PUSH10[0xAE4D38F3DF618F5EEB90]
-            + Op.DUP6
-            + Op.CALL(
-                gas=0x6B8A0E,
-                address=0xD6C9D572B7645ECAE86A7BDB66C7AE1FB04B0321,
-                value=0x2C019E2E,
-                args_offset=0x16,
-                args_size=0x8,
-                ret_offset=0x10,
-                ret_size=0x1F,
-            )
-            + Op.PUSH26[0xE6B62E86237845E9605D61219D97C1D0145516F5355FE73384E8]
-            + Op.PUSH27[
-                0x6A87CC6D2378C81797AC3746BC562E2FD1145E14781307BC4ADA39
-            ]
-            + Op.PUSH20[0x2E9D0E8725FDE75C5ABC313C11E3238C7CD9B718]
-            + Op.PUSH11[0x6A14F8D5C3CAD9DA533944]
-            + Op.PUSH11[0xD1311CCC67A0691559157A]
-            + Op.PUSH8[0x4825358B301AC42D]
-            + Op.PUSH28[
-                0xCAE31BEB8B0849903402175CA3740F3FD690AD66287D6BF67A98C09E
-            ]
-            + Op.PUSH14[0xE5717596052D30F4B9BB8046A6B6]
-            + Op.PUSH31[
-                0xF51B1B13C496E97BF9A2E67AECA97FA10A266F8CF22C10CC0375B514B25DE4  # noqa: E501
-            ]
-            + Op.PUSH7[0xA146576B2CB565]
-            + Op.PUSH22[0x4EFC80D4B8AA5497AA0FB4CBAB90EE57298D322474D2]
-            + Op.PUSH23[0x366E04EAB856C9F6070C80701FA30596DD0B6EA5BC38BA]
-            + Op.PUSH5[0xE1D16AFF1B]
-            + Op.DUP13
-            + Op.PUSH2[0xCAA3]
-            + Op.PUSH26[0x64465A9308DBB1465294DDCB5FA32833E4FFB049C71761ED934]
-            + Op.PUSH19[0xC7E58F171C6C8B51E2EC704D34897B80466E82]
-            + Op.PUSH12[0xC1CE2488511CBB1AAAD26B0]
-            + Op.PUSH22[0xED5EBF070BE6E14EAA6B973423BCB2E0541307D88FF6]
-            + Op.PUSH14[0x1B7E29FFFB10218CA75BF3F9957D]
-            + Op.PUSH15[0xE27A0945278D5F9303B3E3F28A325A]
-            + Op.PUSH32[
-                0x17905F7467C4AFCBB3A43DBBD37E9591E3F5A82841EE9CB8B23F68B4572E8CD9  # noqa: E501
-            ]
-            + Op.PUSH14[0xF7DAACBD3AB3BD5A8F427BAF6EA]
-            + Op.PUSH27[
-                0xE70D98D3948EAFB74E2E4A158AC116C5219403C9073A457409C6E4
-            ]
-            + Op.PUSH5[0xBAE32B2C85]
-            + Op.PUSH12[0x15BDA1B2176295FD1CECFE7D]
-            + Op.PUSH26[0x4AB2692061AA79387004112272204198437FC78D1DBE0E8932CE]
-            + Op.PUSH16[0x47828A2BF4DF47446291B99D92A90DE3]
-            + Op.PUSH3[0x395458]
-            + Op.SWAP14
-            + Op.CALLDATASIZE
-        ),
+    # Source: raw
+    # 0x3360b261edefa0326fdc74d570982966277b49cdb30a453fa06c34a7423da44ba2d04341af08c478b17a57318ab10ab43b3744333b0aa8864ac27b3fd022e380056735a5fcda3e9fdc25695972a076884de6d6b6b06dd45416c8110bae3c70576b433a4672777847e81823024ddd1292b929ad28e64a732b74c0ae1941d5936ecd35738e2f279273788f4aaf19907a532a6b0f117c32b6cb967aae8bdfcf86e2d4d64599986abcf65a20754f5a816c58ed669138f6a0448670b906bbf1eb145ced896c578de5aa27769006b1a784e84b6316d4e60c7053b0b6550c70a177cb7a3e88d4e83fb1897a09c2161ff6cc2679c178292687137854da672e316c66ef03dc9ac37e8e430b7c64d1939bf67383c4bafeb2f0471fe896b7c0e114bf6f152b266cc769ae4d38f3df618f5eeb9085601f601060086016632c019e2e73<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>626b8a0ef179e6b62e86237845e9605d61219d97c1d0145516f5355fe73384e87a6a87cc6d2378c81797ac3746bc562e2fd1145e14781307bc4ada39732e9d0e8725fde75c5abc313c11e3238c7cd9b7186a6a14f8d5c3cad9da5339446ad1311ccc67a0691559157a674825358b301ac42d7bcae31beb8b0849903402175ca3740f3fd690ad66287d6bf67a98c09e6de5717596052d30f4b9bb8046a6b67ef51b1b13c496e97bf9a2e67aeca97fa10a266f8cf22c10cc0375b514b25de466a146576b2cb565754efc80d4b8aa5497aa0fb4cbab90ee57298d322474d276366e04eab856c9f6070c80701fa30596dd0b6ea5bc38ba64e1d16aff1b8c61caa379064465a9308dbb1465294ddcb5fa32833e4ffb049c71761ed93472c7e58f171c6c8b51e2ec704d34897b80466e826b0c1ce2488511cbb1aaad26b075ed5ebf070be6e14eaa6b973423bcb2e0541307d88ff66d1b7e29fffb10218ca75bf3f9957d6ee27a0945278d5f9303b3e3f28a325a7f17905f7467c4afcbb3a43dbbd37e9591e3f5a82841ee9cb8b23f68b4572e8cd96d0f7daacbd3ab3bd5a8f427baf6ea7ae70d98d3948eafb74e2e4a158ac116c5219403c9073a457409c6e464bae32b2c856b15bda1b2176295fd1cecfe7d794ab2692061aa79387004112272204198437fc78d1dbe0e8932ce6f47828a2bf4df47446291b99d92a90de3623954589d36  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLER
+        + Op.LOG0(offset=0xEDEF, size=0xB2)
+        + Op.ORIGIN
+        + Op.PUSH16[0xDC74D570982966277B49CDB30A453FA0]
+        + Op.PUSH13[0x34A7423DA44BA2D04341AF08C4]
+        + Op.PUSH25[0xB17A57318AB10AB43B3744333B0AA8864AC27B3FD022E38005]
+        + Op.PUSH8[0x35A5FCDA3E9FDC25]
+        + Op.PUSH10[0x5972A076884DE6D6B6B0]
+        + Op.PUSH14[0xD45416C8110BAE3C70576B433A46]
+        + Op.PUSH19[0x777847E81823024DDD1292B929AD28E64A732B]
+        + Op.PUSH21[0xC0AE1941D5936ECD35738E2F279273788F4AAF1990]
+        + Op.PUSH27[0x532A6B0F117C32B6CB967AAE8BDFCF86E2D4D64599986ABCF65A20]
+        + Op.PUSH22[0x4F5A816C58ED669138F6A0448670B906BBF1EB145CED]
+        + Op.DUP10
+        + Op.PUSH13[0x578DE5AA27769006B1A784E84B]
+        + Op.PUSH4[0x16D4E60C]
+        + Op.PUSH17[0x53B0B6550C70A177CB7A3E88D4E83FB189]
+        + Op.PUSH27[0x9C2161FF6CC2679C178292687137854DA672E316C66EF03DC9AC3]
+        + Op.PUSH31[
+            0x8E430B7C64D1939BF67383C4BAFEB2F0471FE896B7C0E114BF6F152B266CC7
+        ]
+        + Op.PUSH10[0xAE4D38F3DF618F5EEB90]
+        + Op.DUP6
+        + Op.CALL(
+            gas=0x6B8A0E,
+            address=0xD6C9D572B7645ECAE86A7BDB66C7AE1FB04B0321,
+            value=0x2C019E2E,
+            args_offset=0x16,
+            args_size=0x8,
+            ret_offset=0x10,
+            ret_size=0x1F,
+        )
+        + Op.PUSH26[0xE6B62E86237845E9605D61219D97C1D0145516F5355FE73384E8]
+        + Op.PUSH27[0x6A87CC6D2378C81797AC3746BC562E2FD1145E14781307BC4ADA39]
+        + Op.PUSH20[0x2E9D0E8725FDE75C5ABC313C11E3238C7CD9B718]
+        + Op.PUSH11[0x6A14F8D5C3CAD9DA533944]
+        + Op.PUSH11[0xD1311CCC67A0691559157A]
+        + Op.PUSH8[0x4825358B301AC42D]
+        + Op.PUSH28[0xCAE31BEB8B0849903402175CA3740F3FD690AD66287D6BF67A98C09E]
+        + Op.PUSH14[0xE5717596052D30F4B9BB8046A6B6]
+        + Op.PUSH31[
+            0xF51B1B13C496E97BF9A2E67AECA97FA10A266F8CF22C10CC0375B514B25DE4
+        ]
+        + Op.PUSH7[0xA146576B2CB565]
+        + Op.PUSH22[0x4EFC80D4B8AA5497AA0FB4CBAB90EE57298D322474D2]
+        + Op.PUSH23[0x366E04EAB856C9F6070C80701FA30596DD0B6EA5BC38BA]
+        + Op.PUSH5[0xE1D16AFF1B]
+        + Op.DUP13
+        + Op.PUSH2[0xCAA3]
+        + Op.PUSH26[0x64465A9308DBB1465294DDCB5FA32833E4FFB049C71761ED934]
+        + Op.PUSH19[0xC7E58F171C6C8B51E2EC704D34897B80466E82]
+        + Op.PUSH12[0xC1CE2488511CBB1AAAD26B0]
+        + Op.PUSH22[0xED5EBF070BE6E14EAA6B973423BCB2E0541307D88FF6]
+        + Op.PUSH14[0x1B7E29FFFB10218CA75BF3F9957D]
+        + Op.PUSH15[0xE27A0945278D5F9303B3E3F28A325A]
+        + Op.PUSH32[
+            0x17905F7467C4AFCBB3A43DBBD37E9591E3F5A82841EE9CB8B23F68B4572E8CD9
+        ]
+        + Op.PUSH14[0xF7DAACBD3AB3BD5A8F427BAF6EA]
+        + Op.PUSH27[0xE70D98D3948EAFB74E2E4A158AC116C5219403C9073A457409C6E4]
+        + Op.PUSH5[0xBAE32B2C85]
+        + Op.PUSH12[0x15BDA1B2176295FD1CECFE7D]
+        + Op.PUSH26[0x4AB2692061AA79387004112272204198437FC78D1DBE0E8932CE]
+        + Op.PUSH16[0x47828A2BF4DF47446291B99D92A90DE3]
+        + Op.PUSH3[0x395458]
+        + Op.SWAP14
+        + Op.CALLDATASIZE,
         nonce=0,
-        address=Address("0xd6c9d572b7645ecae86a7bdb66c7ae1fb04b0321"),  # noqa: E501
+        address=Address(0xD6C9D572B7645ECAE86A7BDB66C7AE1FB04B0321),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "74ac5e422199cb842b1fdcdef502d4142d033387c6d17fe1f03f0fc4a3c05daadf323f3b"  # noqa: E501
-            "b04b7e33dbad9b32f058aa6df6d54c8d7ac95568ba4a6b33a2b0ce8d8c7480ab9e818cf8"  # noqa: E501
-            "998564e6d38b92aa1ecd76aa8aff266dd266c96af419778c16a109cba6976922093e50bd"  # noqa: E501
-            "a96ac1333a946574ad748ad839546ff861257bb6a41cab34045ea7335e1c9667c67424f9"  # noqa: E501
-            "baf8781e79e002a233a622f41f2744c21b6baed43543e0dfb9aa81fd1050326b0ebad84f"  # noqa: E501
-            "da176f3438d3a7f083"
+        to=target,
+        data=Bytes(
+            "74ac5e422199cb842b1fdcdef502d4142d033387c6d17fe1f03f0fc4a3c05daadf323f3bb04b7e33dbad9b32f058aa6df6d54c8d7ac95568ba4a6b33a2b0ce8d8c7480ab9e818cf8998564e6d38b92aa1ecd76aa8aff266dd266c96af419778c16a109cba6976922093e50bda96ac1333a946574ad748ad839546ff861257bb6a41cab34045ea7335e1c9667c67424f9baf8781e79e002a233a622f41f2744c21b6baed43543e0dfb9aa81fd1050326b0ebad84fda176f3438d3a7f083"  # noqa: E501
         ),
         gas_limit=7300000,
-        value=1305713546,
+        value=0x4DD39B8A,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest206.py b/tests/ported_static/stRandom/test_random_statetest206.py
index 30ca8f35ddb..f5cd2080539 100644
--- a/tests/ported_static/stRandom/test_random_statetest206.py
+++ b/tests/ported_static/stRandom/test_random_statetest206.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest206.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest206Filler.json
+state_tests/stRandom/randomStatetest206Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest206Filler.json"],
+    ["state_tests/stRandom/randomStatetest206Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest206(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest206."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,59 @@ def test_random_statetest206(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0x1]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x45736D8E806138378D62087320313C55,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>427f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f45736d8e806138378d62087320313c5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0x1]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x45736D8E806138378D62087320313C55
         ),
         nonce=0,
-        address=Address("0xf62dc30a46d8736ff6c1cf524897b9ec5bcb62d7"),  # noqa: E501
+        address=Address(0xF62DC30A46D8736FF6C1CF524897B9EC5BCB62D7),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e79427f00000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000001427f000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000c3507f000000000000000000000000"  # noqa: E501
-            "4f3f701464972e74606d6ea82d4d3080599a0e796f45736d8e806138378d62087320313c"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79427f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f45736d8e806138378d62087320313c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2091011439,
+        value=0x7CA24D6F,
     )
 
     post = {
-        contract: Account(storage={0: 0x45736D8E806138378D62087320313C55}),
+        target: Account(
+            storage={0: 0x45736D8E806138378D62087320313C55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest207.py b/tests/ported_static/stRandom/test_random_statetest207.py
index fc65a39d7dd..586808a044e 100644
--- a/tests/ported_static/stRandom/test_random_statetest207.py
+++ b/tests/ported_static/stRandom/test_random_statetest207.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest207.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest207Filler.json
+state_tests/stRandom/randomStatetest207Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest207Filler.json"],
+    ["state_tests/stRandom/randomStatetest207Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest207(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest207."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,49 +43,46 @@ def test_random_statetest207(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x43413160439155
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.NUMBER
+        + Op.BALANCE(address=Op.COINBASE)
+        + Op.PUSH1[0x43]
+        + Op.SWAP2
+        + Op.SSTORE,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.NUMBER
-            + Op.BALANCE(address=Op.COINBASE)
-            + Op.PUSH1[0x43]
-            + Op.SWAP2
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=46,
         nonce=0,
-        address=Address("0x91d304e462c8cd746ca0a735a4e921b10cc49fe1"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={1: 46}),
+        target: Account(storage={1: 46}, balance=0xDE0B6B3A76586A0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest208.py b/tests/ported_static/stRandom/test_random_statetest208.py
index 8e999788ce2..414e164a59f 100644
--- a/tests/ported_static/stRandom/test_random_statetest208.py
+++ b/tests/ported_static/stRandom/test_random_statetest208.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest208.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest208Filler.json
+state_tests/stRandom/randomStatetest208Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest208Filler.json"],
+    ["state_tests/stRandom/randomStatetest208Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest208(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest208."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,68 +47,61 @@ def test_random_statetest208(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MULMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x79386B399BEFD67B3A9B0A141837216FAA653A30),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                ),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x79386b399befd67b3a9b0a141837216faa653a30"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000007f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff09"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2144690611,
+        value=0x7FD561B3,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={0: 0xFFFFFFFFFFFFFFFD000000000000000100000001},
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest209.py b/tests/ported_static/stRandom/test_random_statetest209.py
index 8e29e654fb3..95ff6abc047 100644
--- a/tests/ported_static/stRandom/test_random_statetest209.py
+++ b/tests/ported_static/stRandom/test_random_statetest209.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest209.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest209Filler.json
+state_tests/stRandom/randomStatetest209Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest209Filler.json"],
+    ["state_tests/stRandom/randomStatetest209Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest209(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest209."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,127 +43,45 @@ def test_random_statetest209(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0951537d3c6474623b781181a355  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff0951537d3c6474623b781181a355"  # noqa: E501
+            "7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0951537d3c6474623b781181a355"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x8bcae160c58323e76f465e719b7f38a0049b17c9"),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff0951537d3c6474623b781181a3"  # noqa: E501
-        ),
-        gas_limit=100000,
-        value=833511346,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest209Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest209_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff0951537d3c6474623b781181a355"  # noqa: E501
-        ),
-        nonce=0,
-        address=Address("0x8bcae160c58323e76f465e719b7f38a0049b17c9"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff0951537d3c6474623b781181a3"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0951537d3c6474623b781181a3"  # noqa: E501
         ),
         gas_limit=100000,
-        value=833511346,
+        value=0x31AE5FB2,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest210.py b/tests/ported_static/stRandom/test_random_statetest210.py
index fc8a360b524..aebd883f914 100644
--- a/tests/ported_static/stRandom/test_random_statetest210.py
+++ b/tests/ported_static/stRandom/test_random_statetest210.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest210.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest210Filler.json
+state_tests/stRandom/randomStatetest210Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest210Filler.json"],
+    ["state_tests/stRandom/randomStatetest210Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest210(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest210."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,66 +47,61 @@ def test_random_statetest210(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.GASLIMIT
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.TIMESTAMP
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MULMOD(
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                Op.PUSH32[0x10000000000000000000000000000000000000000],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xE7A77796D6A62EA342EC1AC61448395DA7B90CA8),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GASLIMIT
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.TIMESTAMP
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MULMOD(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    Op.PUSH32[0x10000000000000000000000000000000000000000],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xe7a77796d6a62ea342ec1ac61448395da7b90ca8"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000007f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff427fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000"  # noqa: E501
-            "00000100000000000000000000000000000000000000007f000000000000000000000000"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff09"
+        to=target,
+        data=Bytes(
+            "457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1780157802,
+        value=0x6A1B0D6A,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001FFFFFFFFFFFFFFFE,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest211.py b/tests/ported_static/stRandom/test_random_statetest211.py
index 887d191d3d9..33bad535f67 100644
--- a/tests/ported_static/stRandom/test_random_statetest211.py
+++ b/tests/ported_static/stRandom/test_random_statetest211.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest211.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest211Filler.json
+state_tests/stRandom/randomStatetest211Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest211Filler.json"],
+    ["state_tests/stRandom/randomStatetest211Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest211(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest211."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,101 +43,69 @@ def test_random_statetest211(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7e7a980b5b1c50ebb63d8e2211d3a79e841ee5e5946b7969dfb6ca1309c99e8f68d4ee9a50996902ee4e6937e1d07ad872cf04eb2a61fc336025a3648d5818a6457dc24f19f38d3deebb09968c812740339c6df46af95b7b0283acb1944a8ca37fbaaafeac115b9ec5adc16fea5a3a828d3483e495506a790ca75d8238ebbed6477c213d0177c10b33b6cf9362273973809ac39f11dffee928f3fb18e975186fb4a74e56142d4431bfa392dd5f71d32b6c40a2bd0beb6a8b24fc592b25f0680306f11e049124ec396ea3858d3339145af8c1c16747bea056639a7faf446cd9c7bf446ed2de67f1665adc479874053c2c53f0fc53a12af3c1951fdc7a5d20aee8f96874f392a4aa2a84a99c9390ab4bd4c39f521a2b91c2ea90  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG3(
+            offset=0x25,
+            size=0xFC33,
+            topic_1=0x37E1D07AD872CF04EB2A,
+            topic_2=0xD4EE9A50996902EE4E,
+            topic_3=0x7A980B5B1C50EBB63D8E2211D3A79E841EE5E5946B7969DFB6CA1309C99E8F,  # noqa: E501
+        )
+        + Op.PUSH5[0x8D5818A645]
+        + Op.PUSH30[
+            0xC24F19F38D3DEEBB09968C812740339C6DF46AF95B7B0283ACB1944A8CA3
+        ]
+        + Op.PUSH32[
+            0xBAAAFEAC115B9EC5ADC16FEA5A3A828D3483E495506A790CA75D8238EBBED647
+        ]
+        + Op.PUSH29[
+            0x213D0177C10B33B6CF9362273973809AC39F11DFFEE928F3FB18E97518
+        ]
+        + Op.PUSH16[0xB4A74E56142D4431BFA392DD5F71D32B]
+        + Op.PUSH13[0x40A2BD0BEB6A8B24FC592B25F0]
+        + Op.PUSH9[0x306F11E049124EC39]
+        + Op.PUSH15[0xA3858D3339145AF8C1C16747BEA056]
+        + Op.PUSH4[0x9A7FAF44]
+        + Op.PUSH13[0xD9C7BF446ED2DE67F1665ADC47]
+        + Op.SWAP9
+        + Op.PUSH21[0x53C2C53F0FC53A12AF3C1951FDC7A5D20AEE8F968]
+        + Op.PUSH21[0xF392A4AA2A84A99C9390AB4BD4C39F521A2B91C2EA]
+        + Op.SWAP1,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.LOG3(
-                offset=0x25,
-                size=0xFC33,
-                topic_1=0x37E1D07AD872CF04EB2A,
-                topic_2=0xD4EE9A50996902EE4E,
-                topic_3=0x7A980B5B1C50EBB63D8E2211D3A79E841EE5E5946B7969DFB6CA1309C99E8F,  # noqa: E501
-            )
-            + Op.PUSH5[0x8D5818A645]
-            + Op.PUSH30[
-                0xC24F19F38D3DEEBB09968C812740339C6DF46AF95B7B0283ACB1944A8CA3
-            ]
-            + Op.PUSH32[
-                0xBAAAFEAC115B9EC5ADC16FEA5A3A828D3483E495506A790CA75D8238EBBED647  # noqa: E501
-            ]
-            + Op.PUSH29[
-                0x213D0177C10B33B6CF9362273973809AC39F11DFFEE928F3FB18E97518
-            ]
-            + Op.PUSH16[0xB4A74E56142D4431BFA392DD5F71D32B]
-            + Op.PUSH13[0x40A2BD0BEB6A8B24FC592B25F0]
-            + Op.PUSH9[0x306F11E049124EC39]
-            + Op.PUSH15[0xA3858D3339145AF8C1C16747BEA056]
-            + Op.PUSH4[0x9A7FAF44]
-            + Op.PUSH13[0xD9C7BF446ED2DE67F1665ADC47]
-            + Op.SWAP9
-            + Op.PUSH21[0x53C2C53F0FC53A12AF3C1951FDC7A5D20AEE8F968]
-            + Op.PUSH21[0xF392A4AA2A84A99C9390AB4BD4C39F521A2B91C2EA]
-            + Op.SWAP1
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xd7eb1ddc2f83f5620bd387bc6409be3cc2d2422f"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7205d6a65458a0cdecda703b9d5440616f95b179076dfa7631cbf765dab81235497f97dd"  # noqa: E501
-            "b6e8d399d5294ea49cfd736cdfa49a08a76dc08eff97542b54399a1b5f86b168d33cd083"  # noqa: E501
-            "ac41074aa37e2f3f77a248d5db21a54d72c5053f2a79b2048d142fd588c56c48e39fa86b"  # noqa: E501
-            "d16645ae7e31281c806dc847b38aba609fb88b5a3c6ce02d711bc1cb89419d740c65fcd7"  # noqa: E501
-            "cd9abc94d8aaf97bfb874ed35e242cee6a462cac825efc8b53b43f7687a32b635c969cb7"  # noqa: E501
-            "79fecda8dcbd0dd35ef6ab482083a8b91f6199bb8050971caa227ac9ad77edf44708d99a"  # noqa: E501
-            "c08e92c8c1ff6e536a3eb4625c2d8c514c8a799391a90cb528870e725560136162fb2632"  # noqa: E501
-            "b2485e26d9604de562740ee89a2a5b4b1976272d046167f2151feea60ecc547dc9dc31b9"  # noqa: E501
-            "1ee0a712579874ebef218c4f015cbd8e76040f19d828eed7f9c070a127ce6067ad983136"  # noqa: E501
-            "3977e2846559c8b97cfb3b0e8502cd54779657ab8571534f06e34b0d78259338706fac01"  # noqa: E501
-            "057e66310e07ef4017629f7bf12ca747aafe8d7ccfcb78b5535dd267e3b445028e40113e"  # noqa: E501
-            "1b9ccb7174b36264cfc5606cc1b4815c744393665f0a1c2ce78ff3679513083c95496a68"  # noqa: E501
-            "69fe735535b8751fc5455769b44d7c9689576f2b76cb63bae9b5a47f8afd0c0466e798bf"  # noqa: E501
-            "78d10b0efecc7e30695891cdc85e5f7a2827dc0b2ad41f92666faa9578ad77aa79aef036"  # noqa: E501
-            "3cf4c69574bdfb74601f99ca8df4fbb481dd921b4b580a789e59c7557f305a1804f30d08"  # noqa: E501
-            "c10394bc281772eef178800e0f79161010fdff6e028d5be7c0dfc295520e9b5f7fb781fb"  # noqa: E501
-            "23ebd9657a42d8623d58350d43a9031a8b7e23c72ea3af0b137386987549539d695dd3e1"  # noqa: E501
-            "9c2cac0855644773b40cae7e824e3912190e7a6aec7bb06e5c923de8750674988f11efac"  # noqa: E501
-            "6aabfc209262900167c7c18e7826b18c6e65696c94c79ed8f574d69ffb0de2046a602f2e"  # noqa: E501
-            "9eeb57a764e01cae63fc0e6c11703a61af60fd0c2a6af1e06d545b5ed713146d8b98783d"  # noqa: E501
-            "a81f50ff3aa0e244e15e73dc099f2266d4ee2fc130375a1cf3341167c5c0586d179a0d6f"  # noqa: E501
-            "622951a8e0fc895e4edf64bb1ec825496d2d85c826a263045936448e65d6608d729e8aeb"  # noqa: E501
-            "3f8cf65a8addee9da3fe2b2ba4a0e6de6576a5221a372b64abb962d43a76c4519471d55c"  # noqa: E501
-            "4425b57b3fef0f46bc07b1e1b4126cab307a91392cedd4fab180e6a943c648703e5058ea"  # noqa: E501
-            "2aaa6aa3c1b019a9538e604a7581ea0f2b78b7ad3673313b8d926ab9ad21f10f2c305573"  # noqa: E501
-            "2cf0b787838b61e5b85a079913a88cff7819d4066d551729495f62f0f4710cb0962d2460"  # noqa: E501
-            "b57e5a5d09a316f7bdd937dd7f809b72c2e4b898648da7f7aea76ec34a016ab863705ad6"  # noqa: E501
-            "7458a497014e10e75f7d7710fc7784743cc30aa920ad10d24a82a074fa0db118dd5887c4"  # noqa: E501
-            "346712f22b6d2e55e99769224338e00cd62030907f6df46f4b14bbd57d01102d02153fb5"  # noqa: E501
-            "69e432111eaafdd9bb68ff7d35f7590dff5a35eeea2bf69beae63c3e4e6fcbdc19d79f7b"  # noqa: E501
-            "b919b2165aab76ce9cc9882ea258d9fd497168b5e9ed5ea3f323f94d5c6a6de663222b59"  # noqa: E501
-            "71a8238121faeed83a8e"
+        to=target,
+        data=Bytes(
+            "7205d6a65458a0cdecda703b9d5440616f95b179076dfa7631cbf765dab81235497f97ddb6e8d399d5294ea49cfd736cdfa49a08a76dc08eff97542b54399a1b5f86b168d33cd083ac41074aa37e2f3f77a248d5db21a54d72c5053f2a79b2048d142fd588c56c48e39fa86bd16645ae7e31281c806dc847b38aba609fb88b5a3c6ce02d711bc1cb89419d740c65fcd7cd9abc94d8aaf97bfb874ed35e242cee6a462cac825efc8b53b43f7687a32b635c969cb779fecda8dcbd0dd35ef6ab482083a8b91f6199bb8050971caa227ac9ad77edf44708d99ac08e92c8c1ff6e536a3eb4625c2d8c514c8a799391a90cb528870e725560136162fb2632b2485e26d9604de562740ee89a2a5b4b1976272d046167f2151feea60ecc547dc9dc31b91ee0a712579874ebef218c4f015cbd8e76040f19d828eed7f9c070a127ce6067ad9831363977e2846559c8b97cfb3b0e8502cd54779657ab8571534f06e34b0d78259338706fac01057e66310e07ef4017629f7bf12ca747aafe8d7ccfcb78b5535dd267e3b445028e40113e1b9ccb7174b36264cfc5606cc1b4815c744393665f0a1c2ce78ff3679513083c95496a6869fe735535b8751fc5455769b44d7c9689576f2b76cb63bae9b5a47f8afd0c0466e798bf78d10b0efecc7e30695891cdc85e5f7a2827dc0b2ad41f92666faa9578ad77aa79aef0363cf4c69574bdfb74601f99ca8df4fbb481dd921b4b580a789e59c7557f305a1804f30d08c10394bc281772eef178800e0f79161010fdff6e028d5be7c0dfc295520e9b5f7fb781fb23ebd9657a42d8623d58350d43a9031a8b7e23c72ea3af0b137386987549539d695dd3e19c2cac0855644773b40cae7e824e3912190e7a6aec7bb06e5c923de8750674988f11efac6aabfc209262900167c7c18e7826b18c6e65696c94c79ed8f574d69ffb0de2046a602f2e9eeb57a764e01cae63fc0e6c11703a61af60fd0c2a6af1e06d545b5ed713146d8b98783da81f50ff3aa0e244e15e73dc099f2266d4ee2fc130375a1cf3341167c5c0586d179a0d6f622951a8e0fc895e4edf64bb1ec825496d2d85c826a263045936448e65d6608d729e8aeb3f8cf65a8addee9da3fe2b2ba4a0e6de6576a5221a372b64abb962d43a76c4519471d55c4425b57b3fef0f46bc07b1e1b4126cab307a91392cedd4fab180e6a943c648703e5058ea2aaa6aa3c1b019a9538e604a7581ea0f2b78b7ad3673313b8d926ab9ad21f10f2c3055732cf0b787838b61e5b85a079913a88cff7819d4066d551729495f62f0f4710cb0962d2460b57e5a5d09a316f7bdd937dd7f809b72c2e4b898648da7f7aea76ec34a016ab863705ad67458a497014e10e75f7d7710fc7784743cc30aa920ad10d24a82a074fa0db118dd5887c4346712f22b6d2e55e99769224338e00cd62030907f6df46f4b14bbd57d01102d02153fb569e432111eaafdd9bb68ff7d35f7590dff5a35eeea2bf69beae63c3e4e6fcbdc19d79f7bb919b2165aab76ce9cc9882ea258d9fd497168b5e9ed5ea3f323f94d5c6a6de663222b5971a8238121faeed83a8e"  # noqa: E501
         ),
         gas_limit=600000,
-        value=1548974135,
+        value=0x5C537837,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest212.py b/tests/ported_static/stRandom/test_random_statetest212.py
index d9e874048eb..6b6ed928909 100644
--- a/tests/ported_static/stRandom/test_random_statetest212.py
+++ b/tests/ported_static/stRandom/test_random_statetest212.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest212.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest212Filler.json
+state_tests/stRandom/randomStatetest212Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest212Filler.json"],
+    ["state_tests/stRandom/randomStatetest212Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest212(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest212."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,75 +47,70 @@ def test_random_statetest212(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SELFDESTRUCT(
-                address=Op.ADDMOD(
-                    Op.MULMOD(
-                        Op.XOR(
-                            Op.MOD(
-                                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                                Op.PUSH32[
-                                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-                                ],
-                            ),
-                            Op.PUSH32[0x1],
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe06180908ff3a68f28e61990a525560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SELFDESTRUCT(
+            address=Op.ADDMOD(
+                Op.MULMOD(
+                    Op.XOR(
+                        Op.MOD(
+                            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                            Op.PUSH32[
+                                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+                            ],
                         ),
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                        Op.PUSH32[0x1],
                     ),
-                    Op.PUSH32[0x1],
-                    Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
                 ),
+                Op.PUSH32[0x1],
+                Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
             )
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0xF28E61990A52556000),
-                value=Op.GASPRICE,
-            )
+        )
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0xF28E61990A52556000), value=Op.GASPRICE
         ),
         nonce=0,
-        address=Address("0x4fcdeb59ea62ab23fbabb8475cc6b4d9a7b4ef10"),  # noqa: E501
+        address=Address(0x4FCDEB59EA62AB23FBABB8475CC6B4D9A7B4EF10),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe06180908ff3a68f28e61990a52"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe06180908ff3a68f28e61990a52"  # noqa: E501
         ),
         gas_limit=100000,
-        value=49732651,
+        value=0x2F6DC2B,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x0000000000000000000000000000000000000001): Account(
+            storage={}, code=b"", nonce=0
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest214.py b/tests/ported_static/stRandom/test_random_statetest214.py
index a6755101034..bed7fed40ef 100644
--- a/tests/ported_static/stRandom/test_random_statetest214.py
+++ b/tests/ported_static/stRandom/test_random_statetest214.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest214.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest214Filler.json
+state_tests/stRandom/randomStatetest214Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest214Filler.json"],
+    ["state_tests/stRandom/randomStatetest214Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest214(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest214."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,64 +47,58 @@ def test_random_statetest214(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.EXP(
-                Op.ISZERO(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-                ),
-                Op.PUSH32[0x1],
-            )
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x7B056B335A15A48D7B8841163A503963,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff150a6f7b056b335a15a48d7b8841163a50396360005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.EXP(
+            Op.ISZERO(Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]),
+            Op.PUSH32[0x1],
+        )
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x7B056B335A15A48D7B8841163A503963
         ),
         nonce=0,
-        address=Address("0xd1cac1ed3eff0ed4ea40ea82dddcd79058f1bd25"),  # noqa: E501
+        address=Address(0xD1CAC1ED3EFF0ED4EA40EA82DDDCD79058F1BD25),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff150a6f7b056b335a15a48d7b884116"  # noqa: E501
-            "3a503963"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff150a6f7b056b335a15a48d7b8841163a503963"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2101620901,
+        value=0x7D4430A5,
     )
 
     post = {
-        contract: Account(storage={0: 0x7B056B335A15A48D7B8841163A503963}),
+        target: Account(
+            storage={0: 0x7B056B335A15A48D7B8841163A503963},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest215.py b/tests/ported_static/stRandom/test_random_statetest215.py
index 6cdb41e406f..8b60689e9e6 100644
--- a/tests/ported_static/stRandom/test_random_statetest215.py
+++ b/tests/ported_static/stRandom/test_random_statetest215.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest215.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest215Filler.json
+state_tests/stRandom/randomStatetest215Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest215Filler.json"],
+    ["state_tests/stRandom/randomStatetest215Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest215(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest215."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,60 +47,54 @@ def test_random_statetest215(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PREVRANDAO
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x728F4F1065583139780A981510173B9C,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff446f728f4f1065583139780a981510173b9c60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 3
+        + Op.PREVRANDAO
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x728F4F1065583139780A981510173B9C
         ),
         nonce=0,
-        address=Address("0xbe34df8c26e53dbcad75702212def7cc965ba9c4"),  # noqa: E501
+        address=Address(0xBE34DF8C26E53DBCAD75702212DEF7CC965BA9C4),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff446f728f4f1065583139780a981510173b9c"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff446f728f4f1065583139780a981510173b9c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=812357921,
+        value=0x306B9921,
     )
 
     post = {
-        contract: Account(storage={0: 0x728F4F1065583139780A981510173B9C}),
+        target: Account(
+            storage={0: 0x728F4F1065583139780A981510173B9C},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest216.py b/tests/ported_static/stRandom/test_random_statetest216.py
index 51f2d4d215c..46b7748dc64 100644
--- a/tests/ported_static/stRandom/test_random_statetest216.py
+++ b/tests/ported_static/stRandom/test_random_statetest216.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest216.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest216Filler.json
+state_tests/stRandom/randomStatetest216Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest216Filler.json"],
+    ["state_tests/stRandom/randomStatetest216Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest216(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest216."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,64 +47,58 @@ def test_random_statetest216(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xC350]
-            + Op.PREVRANDAO
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x766D67FE07853208991306449455,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350447f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506d766d67fe0785320899130644945560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350] * 2
+        + Op.PREVRANDAO
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x766D67FE07853208991306449455
         ),
         nonce=0,
-        address=Address("0x858b3a0bf7fdb672b31d89535881528c2214eb35"),  # noqa: E501
+        address=Address(0x858B3A0BF7FDB672B31D89535881528C2214EB35),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c350447f00000000000000"  # noqa: E501
-            "00000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000c3506d766d67fe078532089913064494"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350447f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506d766d67fe078532089913064494"  # noqa: E501
         ),
         gas_limit=100000,
-        value=679576029,
+        value=0x288181DD,
     )
 
     post = {
-        contract: Account(storage={0: 0x766D67FE07853208991306449455}),
+        target: Account(
+            storage={0: 0x766D67FE07853208991306449455},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest217.py b/tests/ported_static/stRandom/test_random_statetest217.py
index 4295cd34bc3..6ac0a1b7147 100644
--- a/tests/ported_static/stRandom/test_random_statetest217.py
+++ b/tests/ported_static/stRandom/test_random_statetest217.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest217.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest217Filler.json
+state_tests/stRandom/randomStatetest217Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest217Filler.json"],
+    ["state_tests/stRandom/randomStatetest217Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest217(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest217."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,64 +43,56 @@ def test_random_statetest217(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001377f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c35060005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.CALLDATACOPY(
+            dest_offset=Op.PUSH32[0x1],
+            offset=Op.PUSH32[0x0],
+            size=Op.PUSH32[0xC350],
+        )
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.PUSH32[0xC350]),
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.CALLDATACOPY(
-                dest_offset=Op.PUSH32[0x1],
-                offset=Op.PUSH32[0x0],
-                size=Op.PUSH32[0xC350],
-            )
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.PUSH32[0xC350])
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x83be70f91f13b0d82fe2ea7d0551e807a7425f52"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000001377f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000007f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000c350"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001377f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350"  # noqa: E501
         ),
         gas_limit=100000,
-        value=473066872,
+        value=0x1C326D78,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x7F000000000000000000000000000000000000000000000000000000000000: 50000,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest219.py b/tests/ported_static/stRandom/test_random_statetest219.py
index 9302fb77558..11619b3a35e 100644
--- a/tests/ported_static/stRandom/test_random_statetest219.py
+++ b/tests/ported_static/stRandom/test_random_statetest219.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest219.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest219Filler.json
+state_tests/stRandom/randomStatetest219Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest219Filler.json"],
+    ["state_tests/stRandom/randomStatetest219Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest219(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest219."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,62 +47,56 @@ def test_random_statetest219(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3506f6253443a4104027144577f339983205560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0] * 2
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.NUMBER
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x6253443A4104027144577F3399832055
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x586C7074A620DDD5D8040DBC1FD08E9089BC66DB),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.NUMBER
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x6253443A4104027144577F3399832055,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x586c7074a620ddd5d8040dbc1fd08e9089bc66db"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff437f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000017f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000c3506f6253443a4104027144577f33998320"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3506f6253443a4104027144577f33998320"  # noqa: E501
         ),
         gas_limit=100000,
-        value=73663722,
+        value=0x46404EA,
     )
 
     post = {
-        contract: Account(storage={0: 0x6253443A4104027144577F3399832055}),
+        target: Account(
+            storage={0: 0x6253443A4104027144577F3399832055},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest22.py b/tests/ported_static/stRandom/test_random_statetest22.py
index 9ed92f98f19..07d72306d51 100644
--- a/tests/ported_static/stRandom/test_random_statetest22.py
+++ b/tests/ported_static/stRandom/test_random_statetest22.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest22.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest22Filler.json
+state_tests/stRandom/randomStatetest22Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest22Filler.json"],
+    ["state_tests/stRandom/randomStatetest22Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest22(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest22."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,53 +47,48 @@ def test_random_statetest22(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x6d417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7e969f926084143c7960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "6d417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000017fffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000c3507f000000000000000000"  # noqa: E501
-            "00000100000000000000000000000000000000000000007fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff7e969f926084143c7960005155"  # noqa: E501
+            "6d417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7e969f926084143c7960005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x411702501fcb254d6aac803fdd6bd34c57564ea1"),  # noqa: E501
+        address=Address(0x411702501FCB254D6AAC803FDD6BD34C57564EA1),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "6d417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000017fffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000c3507f000000000000000000"  # noqa: E501
-            "00000100000000000000000000000000000000000000007fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff7e969f926084143c79"
+        to=target,
+        data=Bytes(
+            "6d417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7e969f926084143c79"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1814313700,
+        value=0x6C243AE4,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x000000000000417FFFFFFFFFFFFFFFFFFFFFFFFF): Account(
+            storage={}, code=b"", nonce=0
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest220.py b/tests/ported_static/stRandom/test_random_statetest220.py
index 361a5c2c5b9..322eb005f67 100644
--- a/tests/ported_static/stRandom/test_random_statetest220.py
+++ b/tests/ported_static/stRandom/test_random_statetest220.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest220.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest220Filler.json
+state_tests/stRandom/randomStatetest220Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest220Filler.json"],
+    ["state_tests/stRandom/randomStatetest220Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest220(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest220."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,61 +47,55 @@ def test_random_statetest220(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x420380A03C4282A3540A1A333A843A55,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f420380a03c4282a3540a1a333a843a5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1] * 2
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x420380A03C4282A3540A1A333A843A55
         ),
         nonce=0,
-        address=Address("0xe245f75b111648e88b574dcc3bac41a9665b655b"),  # noqa: E501
+        address=Address(0xE245F75B111648E88B574DCC3BAC41A9665B655B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000016f420380a03c4282a3540a1a333a843a"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f420380a03c4282a3540a1a333a843a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=207355039,
+        value=0xC5BFC9F,
     )
 
     post = {
-        contract: Account(storage={0: 0x420380A03C4282A3540A1A333A843A55}),
+        target: Account(
+            storage={0: 0x420380A03C4282A3540A1A333A843A55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest221.py b/tests/ported_static/stRandom/test_random_statetest221.py
index 46890f61533..6008fe23e11 100644
--- a/tests/ported_static/stRandom/test_random_statetest221.py
+++ b/tests/ported_static/stRandom/test_random_statetest221.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest221.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest221Filler.json
+state_tests/stRandom/randomStatetest221Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest221Filler.json"],
+    ["state_tests/stRandom/randomStatetest221Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest221(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest221."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,62 +47,57 @@ def test_random_statetest221(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GASLIMIT
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x977789947E197F828151867A73771A55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x3dbb751081b1fb6b89523a708c6f333707aff200"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x457f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f977789947e197f828151867a73771a5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.GASLIMIT
+        + Op.PUSH32[0xC350] * 2
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x977789947E197F828151867A73771A55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x3DBB751081B1FB6B89523A708C6F333707AFF200),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "457f000000000000000000000000000000000000000000000000000000000000c3507f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3507f00000000"  # noqa: E501
-            "000000000000000100000000000000000000000000000000000000007f00000000000000"  # noqa: E501
-            "00000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e796f977789947e197f828151867a73771a"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "457f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f977789947e197f828151867a73771a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1862685167,
+        value=0x6F0651EF,
     )
 
     post = {
-        contract: Account(storage={0: 0x977789947E197F828151867A73771A55}),
+        target: Account(
+            storage={0: 0x977789947E197F828151867A73771A55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest222.py b/tests/ported_static/stRandom/test_random_statetest222.py
index 7a54c31a447..afc7ae14c53 100644
--- a/tests/ported_static/stRandom/test_random_statetest222.py
+++ b/tests/ported_static/stRandom/test_random_statetest222.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest222.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest222Filler.json
+state_tests/stRandom/randomStatetest222Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest222Filler.json"],
+    ["state_tests/stRandom/randomStatetest222Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest222(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest222."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,61 +47,56 @@ def test_random_statetest222(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000001000000000000000000000000000000000000000043397f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3508160005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.CODECOPY(
+            dest_offset=Op.NUMBER,
+            offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
+            size=Op.PUSH32[0xC350],
+        )
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.DUP2),
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x941EC79F0A2A731E1851DC4D0D6D60DE70EBA4FB),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.CODECOPY(
-                dest_offset=Op.NUMBER,
-                offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
-                size=Op.PUSH32[0xC350],
-            )
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.DUP2)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x941ec79f0a2a731e1851dc4d0d6d60de70eba4fb"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000001000000000000000000000000000000000000000043397f000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000017f000000000000000000"  # noqa: E501
-            "00000100000000000000000000000000000000000000007f000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000c35081"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000001000000000000000000000000000000000000000043397f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c35081"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1727622047,
+        value=0x66F96B9F,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={0: 0x10000000000000000000000000000000000000000},
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest225.py b/tests/ported_static/stRandom/test_random_statetest225.py
index 00d5f7a8981..edb243054c4 100644
--- a/tests/ported_static/stRandom/test_random_statetest225.py
+++ b/tests/ported_static/stRandom/test_random_statetest225.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest225.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest225Filler.json
+state_tests/stRandom/randomStatetest225Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest225Filler.json"],
+    ["state_tests/stRandom/randomStatetest225Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest225(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest225."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,65 @@ def test_random_statetest225(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff506f69786c858e0703566f95f8993111901960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.POP(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x69786C858E0703566F95F89931119019
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x7710ED909A7E2687E90F9A930D0DC0E7FA96932F),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.POP(
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x69786C858E0703566F95F89931119019,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x7710ed909a7e2687e90f9a930d0dc0e7fa96932f"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff506f69786c858e0703566f95f89931119019"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff506f69786c858e0703566f95f89931119019"  # noqa: E501
         ),
         gas_limit=100000,
-        value=159749189,
+        value=0x9859445,
     )
 
     post = {
-        contract: Account(storage={0: 0x69786C858E0703566F95F89931119019}),
+        target: Account(
+            storage={0: 0x69786C858E0703566F95F89931119019},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest226.py b/tests/ported_static/stRandom/test_random_statetest226.py
index 2db48253ffc..e8efcbb0224 100644
--- a/tests/ported_static/stRandom/test_random_statetest226.py
+++ b/tests/ported_static/stRandom/test_random_statetest226.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest226.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest226Filler.json
+state_tests/stRandom/randomStatetest226Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest226Filler.json"],
+    ["state_tests/stRandom/randomStatetest226Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest226(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest226."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,64 +44,54 @@ def test_random_statetest226(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=Op.PUSH32[0xC350])
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.GAS
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x55)
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c350357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe5a605560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=Op.PUSH32[0xC350])
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.GAS
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x55),
         nonce=0,
-        address=Address("0xc5676aeab3d49c7e165b0f09b63906f533bc6232"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c350357fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe5a60"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c350357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe5a60"  # noqa: E501
         ),
         gas_limit=1791222632,
-        value=479312336,
+        value=0x1C91B9D0,
     )
 
     post = {
-        contract: Account(storage={0: 85}),
+        target: Account(storage={0: 85}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest227.py b/tests/ported_static/stRandom/test_random_statetest227.py
index a7ba5a36896..a7e4eb1926d 100644
--- a/tests/ported_static/stRandom/test_random_statetest227.py
+++ b/tests/ported_static/stRandom/test_random_statetest227.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest227.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest227Filler.json
+state_tests/stRandom/randomStatetest227Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest227Filler.json"],
+    ["state_tests/stRandom/randomStatetest227Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest227(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest227."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,59 +46,56 @@ def test_random_statetest227(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(key=Op.MSIZE, value=0x108FA27475689E44993A528752A15233)
-        ),
-        nonce=0,
-        address=Address("0x2347a5c06fdb86220847afad360a945504752f3f"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
+    )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f108fa27475689e44993a528752a152335955  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(key=Op.MSIZE, value=0x108FA27475689E44993A528752A15233),
+        nonce=0,
+        address=Address(0x2347A5C06FDB86220847AFAD360A945504752F3F),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e796f108fa27475689e44993a528752a1523359"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f108fa27475689e44993a528752a1523359"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1176634565,
+        value=0x462204C5,
     )
 
     post = {
-        contract: Account(storage={0: 0x108FA27475689E44993A528752A15233}),
+        target: Account(
+            storage={0: 0x108FA27475689E44993A528752A15233},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest228.py b/tests/ported_static/stRandom/test_random_statetest228.py
index 042f91e0011..076b957a330 100644
--- a/tests/ported_static/stRandom/test_random_statetest228.py
+++ b/tests/ported_static/stRandom/test_random_statetest228.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest228.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest228Filler.json
+state_tests/stRandom/randomStatetest228Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest228Filler.json"],
+    ["state_tests/stRandom/randomStatetest228Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest228(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest228."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,50 @@ def test_random_statetest228(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x41434543454541443b5455
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.COINBASE
+        + Op.NUMBER
+        + Op.GASLIMIT
+        + Op.NUMBER
+        + Op.GASLIMIT * 2
+        + Op.SSTORE(
+            key=Op.SLOAD(key=Op.EXTCODESIZE(address=Op.PREVRANDAO)),
+            value=Op.COINBASE,
         ),
-        balance=46,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.COINBASE
-            + Op.NUMBER
-            + Op.GASLIMIT
-            + Op.NUMBER
-            + Op.GASLIMIT
-            + Op.GASLIMIT
-            + Op.SSTORE(
-                key=Op.SLOAD(key=Op.EXTCODESIZE(address=Op.PREVRANDAO)),
-                value=Op.COINBASE,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=46,
         nonce=0,
-        address=Address("0x5e86c1990271c79e1f71c1a16ae327a81ec9c863"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0x4F3F701464972E74606D6EA82D4D3080599A0E79},
-        ),
+        target: Account(storage={0: coinbase}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest23.py b/tests/ported_static/stRandom/test_random_statetest23.py
index 2a993315073..58b93c80c3f 100644
--- a/tests/ported_static/stRandom/test_random_statetest23.py
+++ b/tests/ported_static/stRandom/test_random_statetest23.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest23.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest23Filler.json
+state_tests/stRandom/randomStatetest23Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest23Filler.json"],
+    ["state_tests/stRandom/randomStatetest23Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest23(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest23."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,61 +47,56 @@ def test_random_statetest23(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x89418C1076F1544315601489386C9155,
-            )
+    # Source: raw
+    # 0x7f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f89418c1076f1544315601489386c915560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x89418C1076F1544315601489386C9155
         ),
         nonce=0,
-        address=Address("0xfc68069945ce60d6c215f7c22117d2fad4a21cf4"),  # noqa: E501
+        address=Address(0xFC68069945CE60D6C215F7C22117D2FAD4A21CF4),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000001427f00"  # noqa: E501
-            "00000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff6f89418c1076f154431560"  # noqa: E501
-            "1489386c91"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000000000000000000000000000000000000000000001427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f89418c1076f1544315601489386c91"  # noqa: E501
         ),
         gas_limit=100000,
-        value=667758155,
+        value=0x27CD2E4B,
     )
 
     post = {
-        contract: Account(storage={0: 0x89418C1076F1544315601489386C9155}),
+        target: Account(
+            storage={0: 0x89418C1076F1544315601489386C9155},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest230.py b/tests/ported_static/stRandom/test_random_statetest230.py
index b21a8bd4fd3..b197ea59848 100644
--- a/tests/ported_static/stRandom/test_random_statetest230.py
+++ b/tests/ported_static/stRandom/test_random_statetest230.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest230.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest230Filler.json
+state_tests/stRandom/randomStatetest230Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest230Filler.json"],
+    ["state_tests/stRandom/randomStatetest230Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest230(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest230."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,147 +43,56 @@ def test_random_statetest230(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MULMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
         ),
         nonce=0,
-        address=Address("0xf2d051c4061de9bb62f3c8b53170ac76caf27862"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c350427f00"  # noqa: E501
-            "000000000000000000000100000000000000000000000000000000000000007fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe09"
-        ),
-        gas_limit=100000,
-        value=856911811,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest230Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest230_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
     )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-            )
-        ),
-        nonce=0,
-        address=Address("0xf2d051c4061de9bb62f3c8b53170ac76caf27862"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c350427f00"  # noqa: E501
-            "000000000000000000000100000000000000000000000000000000000000007fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe09"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=856911811,
+        value=0x33136FC3,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest231.py b/tests/ported_static/stRandom/test_random_statetest231.py
index 343090acb3d..c80184d684b 100644
--- a/tests/ported_static/stRandom/test_random_statetest231.py
+++ b/tests/ported_static/stRandom/test_random_statetest231.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest231.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest231Filler.json
+state_tests/stRandom/randomStatetest231Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest231Filler.json"],
+    ["state_tests/stRandom/randomStatetest231Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest231(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest231."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,57 @@ def test_random_statetest231(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x7B98A491727A089DF3365353329E8055,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f7b98a491727a089df3365353329e805560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350] * 2
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x7B98A491727A089DF3365353329E8055
         ),
         nonce=0,
-        address=Address("0x5ee95c2c0db97541c35f0afd60a2654ad805a5a6"),  # noqa: E501
+        address=Address(0x5EE95C2C0DB97541C35F0AFD60A2654AD805A5A6),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000c3507f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507f0000000000000000000000004f3f701464972e74"  # noqa: E501
-            "606d6ea82d4d3080599a0e796f7b98a491727a089df3365353329e80"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f7b98a491727a089df3365353329e80"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1271549054,
+        value=0x4BCA4C7E,
     )
 
     post = {
-        contract: Account(storage={0: 0x7B98A491727A089DF3365353329E8055}),
+        target: Account(
+            storage={0: 0x7B98A491727A089DF3365353329E8055},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest232.py b/tests/ported_static/stRandom/test_random_statetest232.py
index a6f59e260ed..06d59d92bbc 100644
--- a/tests/ported_static/stRandom/test_random_statetest232.py
+++ b/tests/ported_static/stRandom/test_random_statetest232.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest232.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest232Filler.json
+state_tests/stRandom/randomStatetest232Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest232Filler.json"],
+    ["state_tests/stRandom/randomStatetest232Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest232(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest232."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,52 +46,49 @@ def test_random_statetest232(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff0945415883ff9d7760005155"  # noqa: E501
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x037642ea84fc8808f2a16af0efeff08b1649fadf"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0945415883ff9d7760005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0945415883ff9d7760005155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x037642EA84FC8808F2A16AF0EFEFF08B1649FADF),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff0945415883ff9d77"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0945415883ff9d77"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2122038787,
+        value=0x7E7BBE03,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x0000000000000000000000000000000000000000): Account(
+            storage={}, code=b"", nonce=0
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest233.py b/tests/ported_static/stRandom/test_random_statetest233.py
index 6aeed0cc974..023c0f438b0 100644
--- a/tests/ported_static/stRandom/test_random_statetest233.py
+++ b/tests/ported_static/stRandom/test_random_statetest233.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest233.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest233Filler.json
+state_tests/stRandom/randomStatetest233Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest233Filler.json"],
+    ["state_tests/stRandom/randomStatetest233Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest233(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest233."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,59 +43,55 @@ def test_random_statetest233(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.DUP2
-            + Op.SDIV(
-                Op.TIMESTAMP,
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MLOAD(
-                offset=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH6[0x715460005155]
-        ),
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff42057f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff517f000000000000000000000001000000000000000000000000000000000000000065715460005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.DUP2
+        + Op.SDIV(
+            Op.TIMESTAMP,
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+        )
+        + Op.MLOAD(
+            offset=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        )
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH6[0x715460005155],
         nonce=0,
-        address=Address("0x05c62926921e990c1b91cb104c481076ff52b217"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe817fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff42057f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff517f00000000"  # noqa: E501
-            "00000000000000010000000000000000000000000000000000000000657154"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff42057f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff517f0000000000000000000000010000000000000000000000000000000000000000657154"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2008364606,
+        value=0x77B5363E,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest236.py b/tests/ported_static/stRandom/test_random_statetest236.py
index b20b7f65323..6c905d7f42e 100644
--- a/tests/ported_static/stRandom/test_random_statetest236.py
+++ b/tests/ported_static/stRandom/test_random_statetest236.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest236.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest236Filler.json
+state_tests/stRandom/randomStatetest236Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest236Filler.json"],
+    ["state_tests/stRandom/randomStatetest236Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest236(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest236."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,72 +47,65 @@ def test_random_statetest236(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000004339185560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.COINBASE
+        + Op.PUSH32[0x0]
+        + Op.CODECOPY(
+            dest_offset=Op.NUMBER,
+            offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
+            size=Op.PUSH32[0x1],
+        )
+        + Op.XOR
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x509A0509A644852AD3512A289A52AEFE17523943),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.COINBASE
-            + Op.PUSH32[0x0]
-            + Op.CODECOPY(
-                dest_offset=Op.NUMBER,
-                offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
-                size=Op.PUSH32[0x1],
-            )
-            + Op.XOR
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x509a0509a644852ad3512a289a52aefe17523943"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f00000000000000000000000100"  # noqa: E501
-            "00000000000000000000000000000000000000433918"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000433918"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1566255112,
+        value=0x5D5B2808,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
                 0x4F3F701464972E74606D6EA82D4D3080599A0E79: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest237.py b/tests/ported_static/stRandom/test_random_statetest237.py
index ca87b9e14d0..121d80b893e 100644
--- a/tests/ported_static/stRandom/test_random_statetest237.py
+++ b/tests/ported_static/stRandom/test_random_statetest237.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest237.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest237Filler.json
+state_tests/stRandom/randomStatetest237Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest237Filler.json"],
+    ["state_tests/stRandom/randomStatetest237Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest237(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest237."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,70 +47,64 @@ def test_random_statetest237(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(
-                offset=Op.PUSH32[0x1],
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-            )
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.CODECOPY(
-                dest_offset=Op.PUSH32[0x0],
-                offset=Op.PUSH32[0xC350],
-                size=Op.PUSH32[0xC350],
-            )
-            + Op.CODESIZE
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001537f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000000039385560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(
+            offset=Op.PUSH32[0x1],
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+        )
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.CODECOPY(
+            dest_offset=Op.PUSH32[0x0],
+            offset=Op.PUSH32[0xC350],
+            size=Op.PUSH32[0xC350],
+        )
+        + Op.CODESIZE
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0xa5ab738681916d81130b09494a5e20288722b913"),  # noqa: E501
+        address=Address(0xA5AB738681916D81130B09494A5E20288722B913),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000001537f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000003938"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001537f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000003938"  # noqa: E501
         ),
         gas_limit=100000,
-        value=978542004,
+        value=0x3A535DB4,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
-                0: 0x4F3F701464972E74606D6EA82D4D3080599A0E79,
+                0: coinbase,
                 239: 0x10000000000000000000000000000000000000000,
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest238.py b/tests/ported_static/stRandom/test_random_statetest238.py
index 1b34c641f4e..0eefbdba085 100644
--- a/tests/ported_static/stRandom/test_random_statetest238.py
+++ b/tests/ported_static/stRandom/test_random_statetest238.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest238.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest238Filler.json
+state_tests/stRandom/randomStatetest238Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest238Filler.json"],
+    ["state_tests/stRandom/randomStatetest238Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest238(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest238."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,64 +46,60 @@ def test_random_statetest238(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.ADDRESS
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x7C748813587E990566719934F342316C,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff307fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f7c748813587e990566719934f342316c60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.ADDRESS
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x7C748813587E990566719934F342316C
         ),
         nonce=0,
-        address=Address("0x2d271120ee93064f9f76e5911c8af9be02c7b691"),  # noqa: E501
+        address=Address(0x2D271120EE93064F9F76E5911C8AF9BE02C7B691),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff307fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000017f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff6f7c748813587e990566719934f3"  # noqa: E501
-            "42316c"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff307fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f7c748813587e990566719934f342316c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=267928924,
+        value=0xFF8455C,
     )
 
     post = {
-        contract: Account(storage={0: 0x7C748813587E990566719934F342316C}),
+        target: Account(
+            storage={0: 0x7C748813587E990566719934F342316C},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest24.py b/tests/ported_static/stRandom/test_random_statetest24.py
index 29385577eac..944d0513f3e 100644
--- a/tests/ported_static/stRandom/test_random_statetest24.py
+++ b/tests/ported_static/stRandom/test_random_statetest24.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest24.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest24Filler.json
+state_tests/stRandom/randomStatetest24Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest24Filler.json"],
+    ["state_tests/stRandom/randomStatetest24Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest24(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest24."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,50 +43,45 @@ def test_random_statetest24(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x41417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff459d7f0000000000000000000000000000000000000000000000000000000000000001817f000000000000000000000000000000000000000000000000000000000000c35095418211337b0530435560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "41417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff45"  # noqa: E501
-            "9d7f0000000000000000000000000000000000000000000000000000000000000001817f"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000c35095418211"  # noqa: E501
-            "337b0530435560005155"
+            "41417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff459d7f0000000000000000000000000000000000000000000000000000000000000001817f000000000000000000000000000000000000000000000000000000000000c35095418211337b0530435560005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x0ec19bd4e8d4c09bccc0edd6ecd58dd99b7b3212"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "41417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff45"  # noqa: E501
-            "9d7f0000000000000000000000000000000000000000000000000000000000000001817f"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000c35095418211"  # noqa: E501
-            "337b053043"
+        to=target,
+        data=Bytes(
+            "41417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff459d7f0000000000000000000000000000000000000000000000000000000000000001817f000000000000000000000000000000000000000000000000000000000000c35095418211337b053043"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1715561909,
+        value=0x664165B5,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest242.py b/tests/ported_static/stRandom/test_random_statetest242.py
index 27121e2b6ad..c4ef8e01baf 100644
--- a/tests/ported_static/stRandom/test_random_statetest242.py
+++ b/tests/ported_static/stRandom/test_random_statetest242.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest242.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest242Filler.json
+state_tests/stRandom/randomStatetest242Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest242Filler.json"],
+    ["state_tests/stRandom/randomStatetest242Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest242(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest242."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,62 @@ def test_random_statetest242(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.ADDMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0860005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.ADDMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
         nonce=0,
-        address=Address("0xd7d4d253c278cbe720f14dc00abe3da337b583a1"),  # noqa: E501
+        address=Address(0xD7D4D253C278CBE720F14DC00ABE3DA337B583A1),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe08"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2110467172,
+        value=0x7DCB2C64,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest243.py b/tests/ported_static/stRandom/test_random_statetest243.py
index 6cb52709413..a7b3ff70602 100644
--- a/tests/ported_static/stRandom/test_random_statetest243.py
+++ b/tests/ported_static/stRandom/test_random_statetest243.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest243.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest243Filler.json
+state_tests/stRandom/randomStatetest243Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest243Filler.json"],
+    ["state_tests/stRandom/randomStatetest243Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest243(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest243."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,52 +47,51 @@ def test_random_statetest243(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x42454466407640686255455866849055,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f4245446640764068625545586684905560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x42454466407640686255455866849055
         ),
         nonce=0,
-        address=Address("0x303760fe80edf15150dec62e90341fab4ac7dde5"),  # noqa: E501
+        address=Address(0x303760FE80EDF15150DEC62E90341FAB4AC7DDE5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3506f4245446640"  # noqa: E501
-            "76406862554558668490"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f424544664076406862554558668490"  # noqa: E501
         ),
         gas_limit=100000,
-        value=77136812,
+        value=0x49903AC,
     )
 
     post = {
-        contract: Account(storage={0: 0x42454466407640686255455866849055}),
+        target: Account(
+            storage={0: 0x42454466407640686255455866849055},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest244.py b/tests/ported_static/stRandom/test_random_statetest244.py
index 78fb50398c0..528343eb2da 100644
--- a/tests/ported_static/stRandom/test_random_statetest244.py
+++ b/tests/ported_static/stRandom/test_random_statetest244.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest244.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest244Filler.json
+state_tests/stRandom/randomStatetest244Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest244Filler.json"],
+    ["state_tests/stRandom/randomStatetest244Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest244(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest244."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,48 @@ def test_random_statetest244(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x4542074343424141315155
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SMOD(Op.TIMESTAMP, Op.GASLIMIT)
+        + Op.NUMBER * 2
+        + Op.TIMESTAMP
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=Op.BALANCE(address=Op.COINBASE)),
+            value=Op.COINBASE,
         ),
-        balance=46,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SMOD(Op.TIMESTAMP, Op.GASLIMIT)
-            + Op.NUMBER
-            + Op.NUMBER
-            + Op.TIMESTAMP
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=Op.BALANCE(address=Op.COINBASE)),
-                value=Op.COINBASE,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=46,
         nonce=0,
-        address=Address("0xf02cc5c5e85bb5e8da6bdc897cc5da6e3aade8ae"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0x4F3F701464972E74606D6EA82D4D3080599A0E79},
-        ),
+        target: Account(storage={0: coinbase}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest245.py b/tests/ported_static/stRandom/test_random_statetest245.py
index f8af62015f4..36710ecc6df 100644
--- a/tests/ported_static/stRandom/test_random_statetest245.py
+++ b/tests/ported_static/stRandom/test_random_statetest245.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest245.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest245Filler.json
+state_tests/stRandom/randomStatetest245Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest245Filler.json"],
+    ["state_tests/stRandom/randomStatetest245Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest245(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest245."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,73 +47,67 @@ def test_random_statetest245(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.ISZERO(
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=0x877C3914165043458789,
-                value=Op.DIV(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    Op.PUSH32[0xC350],
-                ),
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x4f0f0d7e6642d0ec0c5afff326bd601d261562e1"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff157f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0469877c39141650434587895560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.ISZERO(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=0x877C3914165043458789,
+            value=Op.DIV(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                Op.PUSH32[0xC350],
+            ),
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F0F0D7E6642D0EC0C5AFFF326BD601D261562E1),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff157f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000007f00000000000000"  # noqa: E501
-            "00000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe0469877c3914165043458789"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff157f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0469877c3914165043458789"  # noqa: E501
         ),
         gas_limit=100000,
-        value=278621847,
+        value=0x109B6E97,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
                 0x877C3914165043458789: 0x14F8B588E368F08461F9F01B866E43AA79BBADC0980B242070B8CFBFC6540,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest246.py b/tests/ported_static/stRandom/test_random_statetest246.py
index 42e0e5ec418..9faf3c0ea75 100644
--- a/tests/ported_static/stRandom/test_random_statetest246.py
+++ b/tests/ported_static/stRandom/test_random_statetest246.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest246.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest246Filler.json
+state_tests/stRandom/randomStatetest246Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest246Filler.json"],
+    ["state_tests/stRandom/randomStatetest246Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,10 @@ def test_random_statetest246(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_random_statetest246."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,53 +44,50 @@ def test_random_statetest246(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.NUMBER
-            + Op.TIMESTAMP
-            + Op.BALANCE(address=Op.COINBASE)
-            + Op.PREVRANDAO
-            + Op.COINBASE
-            + Op.NUMBER
-            + Op.TIMESTAMP
-            + Op.SWAP4
-            + Op.SSTORE(key=Op.MULMOD, value=Op.OR)
-        ),
+    # Source: raw
+    # 0x434241314441434293170955
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.NUMBER
+        + Op.TIMESTAMP
+        + Op.BALANCE(address=Op.COINBASE)
+        + Op.PREVRANDAO
+        + Op.COINBASE
+        + Op.NUMBER
+        + Op.TIMESTAMP
+        + Op.SWAP4
+        + Op.SSTORE(key=Op.MULMOD, value=Op.OR),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=contract_0,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={57403: 1000}),
+        contract_0: Account(storage={57403: 1000, 0xD9250A4F8C: 0}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest247.py b/tests/ported_static/stRandom/test_random_statetest247.py
index 8d0f0ce7d04..c60df68ff8d 100644
--- a/tests/ported_static/stRandom/test_random_statetest247.py
+++ b/tests/ported_static/stRandom/test_random_statetest247.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest247.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest247Filler.json
+state_tests/stRandom/randomStatetest247Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest247Filler.json"],
+    ["state_tests/stRandom/randomStatetest247Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest247(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest247."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,74 +47,62 @@ def test_random_statetest247(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0460005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 3
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.DIV(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                Op.PUSH32[0xC350],
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x740EE9EF0E712991D2C790720D0EA65B7E4F6FE9),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.DIV(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    Op.PUSH32[0xC350],
-                ),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x740ee9ef0e712991d2c790720d0ea65b7e4f6fe9"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017f0000000000000000000000010000"  # noqa: E501
-            "0000000000000000000000000000000000007f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe04"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe04"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1135930745,
+        value=0x43B4ED79,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x14F8B588E368F08461F9F01B866E43AA79BBADC0980B242070B8CFBFC6540,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest248.py b/tests/ported_static/stRandom/test_random_statetest248.py
index 948f84a1f98..ab1cb29ee75 100644
--- a/tests/ported_static/stRandom/test_random_statetest248.py
+++ b/tests/ported_static/stRandom/test_random_statetest248.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest248.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest248Filler.json
+state_tests/stRandom/randomStatetest248Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest248Filler.json"],
+    ["state_tests/stRandom/randomStatetest248Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest248(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest248."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,70 +43,61 @@ def test_random_statetest248(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8636f2599055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.CALLCODE(
+            gas=Op.CALLDATASIZE,
+            address=Op.DUP7,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            args_offset=Op.PUSH32[0x0],
+            args_size=Op.PUSH32[0xC350],
+            ret_offset=Op.TIMESTAMP,
+            ret_size=Op.PUSH32[0x1],
+        )
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.CALLCODE(
-                gas=Op.CALLDATASIZE,
-                address=Op.DUP7,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                args_offset=Op.PUSH32[0x0],
-                args_size=Op.PUSH32[0xC350],
-                ret_offset=Op.TIMESTAMP,
-                ret_size=Op.PUSH32[0x1],
-            )
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x6131276e33583c2356c9ac9b9eb5eec9999ef591"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000001427f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000007fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff8636f25990"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8636f25990"  # noqa: E501
         ),
         gas_limit=100000,
-        value=549769638,
+        value=0x20C4D1A6,
     )
 
     post = {
-        contract: Account(storage={0: 50016}),
+        target: Account(storage={0: 50016}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest249.py b/tests/ported_static/stRandom/test_random_statetest249.py
index f96a33c29aa..7ab3fa90762 100644
--- a/tests/ported_static/stRandom/test_random_statetest249.py
+++ b/tests/ported_static/stRandom/test_random_statetest249.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest249.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest249Filler.json
+state_tests/stRandom/randomStatetest249Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest249Filler.json"],
+    ["state_tests/stRandom/randomStatetest249Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest249(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest249."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,63 +43,55 @@ def test_random_statetest249(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SLT(
-                Op.PUSH32[0x0],
-                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.DUP1
-            + Op.CODECOPY(
-                dest_offset=Op.PUSH32[0x0],
-                offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
-                size=Op.PUSH32[0x1],
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000012807f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000003960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SLT(
+            Op.PUSH32[0x0],
+            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+        )
+        + Op.DUP1
+        + Op.CODECOPY(
+            dest_offset=Op.PUSH32[0x0],
+            offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
+            size=Op.PUSH32[0x1],
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x315a0a977eade1395b4c6a0b078c1ef3cfaf03b9"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000012807f000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000017f000000000000000000"  # noqa: E501
-            "00000100000000000000000000000000000000000000007f000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000039"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000012807f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000039"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1871659531,
+        value=0x6F8F420B,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest25.py b/tests/ported_static/stRandom/test_random_statetest25.py
index 1e73e99f8a8..0d6cbc6c271 100644
--- a/tests/ported_static/stRandom/test_random_statetest25.py
+++ b/tests/ported_static/stRandom/test_random_statetest25.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest25.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest25Filler.json
+state_tests/stRandom/randomStatetest25Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest25Filler.json"],
+    ["state_tests/stRandom/randomStatetest25Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest25(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest25."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,131 +43,45 @@ def test_random_statetest25(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x427f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000010000000000000000000000000000000000000000437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff807f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6844f1389163a444405b123678749c55  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "427f00000000000000000000000000000000000000000000000000000000000000007f00"  # noqa: E501
-            "00000000000000000000010000000000000000000000000000000000000000437f000000"  # noqa: E501
-            "000000000000000000ffffffffffffffffffffffffffffffffffffffff807f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe6844f1389163a444405b1236"  # noqa: E501
-            "78749c55"
+            "427f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000010000000000000000000000000000000000000000437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff807f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6844f1389163a444405b123678749c55"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xa4ba89aea3bba17580e93a80135f218628a68101"),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "427f00000000000000000000000000000000000000000000000000000000000000007f00"  # noqa: E501
-            "00000000000000000000010000000000000000000000000000000000000000437f000000"  # noqa: E501
-            "000000000000000000ffffffffffffffffffffffffffffffffffffffff807f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe6844f1389163a444405b1236"  # noqa: E501
-            "78749c"
-        ),
-        gas_limit=100000,
-        value=1931404496,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest25Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest25_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "427f00000000000000000000000000000000000000000000000000000000000000007f00"  # noqa: E501
-            "00000000000000000000010000000000000000000000000000000000000000437f000000"  # noqa: E501
-            "000000000000000000ffffffffffffffffffffffffffffffffffffffff807f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe6844f1389163a444405b1236"  # noqa: E501
-            "78749c55"
-        ),
-        nonce=0,
-        address=Address("0xa4ba89aea3bba17580e93a80135f218628a68101"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "427f00000000000000000000000000000000000000000000000000000000000000007f00"  # noqa: E501
-            "00000000000000000000010000000000000000000000000000000000000000437f000000"  # noqa: E501
-            "000000000000000000ffffffffffffffffffffffffffffffffffffffff807f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe6844f1389163a444405b1236"  # noqa: E501
-            "78749c"
+        to=target,
+        data=Bytes(
+            "427f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000010000000000000000000000000000000000000000437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff807f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6844f1389163a444405b123678749c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1931404496,
+        value=0x731EE4D0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest250.py b/tests/ported_static/stRandom/test_random_statetest250.py
index b732261e16e..49410929b7f 100644
--- a/tests/ported_static/stRandom/test_random_statetest250.py
+++ b/tests/ported_static/stRandom/test_random_statetest250.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest250.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest250Filler.json
+state_tests/stRandom/randomStatetest250Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest250Filler.json"],
+    ["state_tests/stRandom/randomStatetest250Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest250(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest250."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,94 +43,61 @@ def test_random_statetest250(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH3[0x7F0000]
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.ADD
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.MUL(
-                0x328B186E166407917C7AF1,
-                Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-            )
-            + Op.SWAP3
-            + Op.POP
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x089927daf7e20b167e29c7dc686d18639371e6bf"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x557ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>627f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6a328b186e166407917c7af102925060005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH3[0x7F0000]
+        + Op.STOP * 9
+        + Op.ADD
+        + Op.STOP * 20
+        + Op.MUL(
+            0x328B186E166407917C7AF1,
+            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+        )
+        + Op.SWAP3
+        + Op.POP
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "557ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000017f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c3507f00000000000000"  # noqa: E501
-            "00000000004f3f701464972e74606d6ea82d4d3080599a0e79627f000000000000000000"  # noqa: E501
-            "00000100000000000000000000000000000000000000007f000000000000000000000000"  # noqa: E501
-            "4f3f701464972e74606d6ea82d4d3080599a0e796a328b186e166407917c7af1029250"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "557ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79627f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796a328b186e166407917c7af1029250"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1535680761,
+        value=0x5B88A0F9,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest251.py b/tests/ported_static/stRandom/test_random_statetest251.py
index 9e85cdaba41..194201527c7 100644
--- a/tests/ported_static/stRandom/test_random_statetest251.py
+++ b/tests/ported_static/stRandom/test_random_statetest251.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest251.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest251Filler.json
+state_tests/stRandom/randomStatetest251Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest251Filler.json"],
+    ["state_tests/stRandom/randomStatetest251Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest251(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest251."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,127 +43,45 @@ def test_random_statetest251(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c3505b7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000006867f1  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000000447f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3505b7f000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000c3507fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe417f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000006867f1"
+            "7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c3505b7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000006867f1"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x75a7d42b361ca2ff027b1cbc1418d431d3c31f27"),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000000447f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3505b7f000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000c3507fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe417f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000006867f1"
-        ),
-        gas_limit=100000,
-        value=395877699,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest251Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest251_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000000447f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3505b7f000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000c3507fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe417f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000006867f1"
-        ),
-        nonce=0,
-        address=Address("0x75a7d42b361ca2ff027b1cbc1418d431d3c31f27"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000000447f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3505b7f000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000c3507fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe417f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000006867f1"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c3505b7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000006867f1"  # noqa: E501
         ),
         gas_limit=100000,
-        value=395877699,
+        value=0x17989D43,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest252.py b/tests/ported_static/stRandom/test_random_statetest252.py
index 462cfdf0ec6..092b4e019a5 100644
--- a/tests/ported_static/stRandom/test_random_statetest252.py
+++ b/tests/ported_static/stRandom/test_random_statetest252.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest252.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest252Filler.json
+state_tests/stRandom/randomStatetest252Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest252Filler.json"],
+    ["state_tests/stRandom/randomStatetest252Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest252(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest252."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,105 +43,42 @@ def test_random_statetest252(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x387b414543444043899e863a628b55
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex("387b414543444043899e863a628b55"),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xcb10591583644b914d53d1d9538866320d00bad3"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
-        gas_limit=400000,
-        value=100000,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest252Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest252_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
     )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex("387b414543444043899e863a628b55"),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xcb10591583644b914d53d1d9538866320d00bad3"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0xDE0B6B3A76586A0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest254.py b/tests/ported_static/stRandom/test_random_statetest254.py
index ae60d4e753c..0833e0aedfc 100644
--- a/tests/ported_static/stRandom/test_random_statetest254.py
+++ b/tests/ported_static/stRandom/test_random_statetest254.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest254.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest254Filler.json
+state_tests/stRandom/randomStatetest254Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest254Filler.json"],
+    ["state_tests/stRandom/randomStatetest254Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest254(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest254."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,66 +46,61 @@ def test_random_statetest254(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.COINBASE
-            + Op.COINBASE
-            + Op.PUSH32[0x1]
-            + Op.PREVRANDAO
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x59B6B83F294740688598C52195A9255,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7f000000000000000000000001000000000000000000000000000000000000000041417f0000000000000000000000000000000000000000000000000000000000000001447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506f059b6b83f294740688598c52195a925560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.COINBASE * 2
+        + Op.PUSH32[0x1]
+        + Op.PREVRANDAO
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x59B6B83F294740688598C52195A9255
         ),
         nonce=0,
-        address=Address("0x1a010369492af6ebbef28866f232f3f2649a86e3"),  # noqa: E501
+        address=Address(0x1A010369492AF6EBBEF28866F232F3F2649A86E3),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000001000000000000000000000000000000000000000041417f"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000000001447fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3506f059b6b83f294740688598c"  # noqa: E501
-            "52195a92"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000001000000000000000000000000000000000000000041417f0000000000000000000000000000000000000000000000000000000000000001447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506f059b6b83f294740688598c52195a92"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1544798975,
+        value=0x5C13C2FF,
     )
 
     post = {
-        contract: Account(storage={0: 0x59B6B83F294740688598C52195A9255}),
+        target: Account(
+            storage={0: 0x59B6B83F294740688598C52195A9255},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest257.py b/tests/ported_static/stRandom/test_random_statetest257.py
index e0b6925ba9c..336a5e4d62e 100644
--- a/tests/ported_static/stRandom/test_random_statetest257.py
+++ b/tests/ported_static/stRandom/test_random_statetest257.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest257.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest257Filler.json
+state_tests/stRandom/randomStatetest257Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest257Filler.json"],
+    ["state_tests/stRandom/randomStatetest257Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest257(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest257."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,52 +43,45 @@ def test_random_statetest257(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff337f000000000000000000000000000000000000000000000000000000000000000099447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350735b9f81208b6f526655  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff337f000000000000000000000000000000000000000000000000000000000000000099447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350735b9f81208b6f526655"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff337f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000099447fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c350735b9f81208b6f526655"  # noqa: E501
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x85004625c8c4eaaafed36a6ecb4835fdea0f2b6b"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff337f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000099447fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c350735b9f81208b6f5266"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff337f000000000000000000000000000000000000000000000000000000000000000099447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350735b9f81208b6f5266"  # noqa: E501
         ),
         gas_limit=100000,
-        value=519689383,
+        value=0x1EF9D4A7,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest259.py b/tests/ported_static/stRandom/test_random_statetest259.py
index b8e6ee5a2f2..741bf622b88 100644
--- a/tests/ported_static/stRandom/test_random_statetest259.py
+++ b/tests/ported_static/stRandom/test_random_statetest259.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest259.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest259Filler.json
+state_tests/stRandom/randomStatetest259Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest259Filler.json"],
+    ["state_tests/stRandom/randomStatetest259Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest259(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest259."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,62 +47,58 @@ def test_random_statetest259(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.PC
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x4831ADC0812F0954492740790070955,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001587fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f04831adc0812f095449274079007095560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x1]
+        + Op.PC
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x4831ADC0812F0954492740790070955
         ),
         nonce=0,
-        address=Address("0x55c5e809a00f9bd86d7e2f6edae5d54b76b881ff"),  # noqa: E501
+        address=Address(0x55C5E809A00F9BD86D7E2F6EDAE5D54B76B881FF),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000001587fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3506f04831adc0812f09544927407900709"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001587fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f04831adc0812f09544927407900709"  # noqa: E501
         ),
         gas_limit=100000,
-        value=250917223,
+        value=0xEF4B167,
     )
 
     post = {
-        contract: Account(storage={0: 0x4831ADC0812F0954492740790070955}),
+        target: Account(
+            storage={0: 0x4831ADC0812F0954492740790070955},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest26.py b/tests/ported_static/stRandom/test_random_statetest26.py
index ee60c9779a1..aaba1ac0402 100644
--- a/tests/ported_static/stRandom/test_random_statetest26.py
+++ b/tests/ported_static/stRandom/test_random_statetest26.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest26.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest26Filler.json
+state_tests/stRandom/randomStatetest26Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest26Filler.json"],
+    ["state_tests/stRandom/randomStatetest26Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest26(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest26."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,50 +43,50 @@ def test_random_statetest26(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.NUMBER
-            + Op.TIMESTAMP
-            + Op.TIMESTAMP
-            + Op.PREVRANDAO
-            + Op.JUMPDEST
-            + Op.SSTORE(key=Op.SMOD, value=Op.BALANCE(address=Op.COINBASE))
-        ),
+    # Source: raw
+    # 0x434242445b41310755
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.NUMBER
+        + Op.TIMESTAMP * 2
+        + Op.PREVRANDAO
+        + Op.JUMPDEST
+        + Op.SSTORE(key=Op.SMOD, value=Op.BALANCE(address=Op.COINBASE)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x40c94440235e91bd2d3e4555b8663698dc80d6ca"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={46: 1000}),
+        target: Account(
+            storage={46: 1000},
+            balance=0xDE0B6B3A76586A0,
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest260.py b/tests/ported_static/stRandom/test_random_statetest260.py
index 3be09743b20..1890f239eb6 100644
--- a/tests/ported_static/stRandom/test_random_statetest260.py
+++ b/tests/ported_static/stRandom/test_random_statetest260.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest260.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest260Filler.json
+state_tests/stRandom/randomStatetest260Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest260Filler.json"],
+    ["state_tests/stRandom/randomStatetest260Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest260(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest260."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,59 +43,52 @@ def test_random_statetest260(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001a07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350f36409156a6aa261413b56f20855  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG0(offset=Op.PUSH32[0x1], size=Op.PUSH32[0xC350])
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0xC350]
+        + Op.RETURN(offset=Op.PUSH32[0xC350], size=Op.PUSH32[0xC350])
+        + Op.PUSH5[0x9156A6AA2]
+        + Op.JUMP(pc=0x413B)
+        + Op.SSTORE(key=Op.ADDMOD, value=Op.CALLCODE),
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.LOG0(offset=Op.PUSH32[0x1], size=Op.PUSH32[0xC350])
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.RETURN(offset=Op.PUSH32[0xC350], size=Op.PUSH32[0xC350])
-            + Op.PUSH5[0x9156A6AA2]
-            + Op.JUMP(pc=0x413B)
-            + Op.SSTORE(key=Op.ADDMOD, value=Op.CALLCODE)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x912e90647207810a8fa1f685d7cd4a5baa06e85d"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000001a07fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000"  # noqa: E501
-            "0000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000c350f36409156a6aa261413b56f208"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001a07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350f36409156a6aa261413b56f208"  # noqa: E501
         ),
         gas_limit=500000,
-        value=1762323696,
+        value=0x690AECF0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest261.py b/tests/ported_static/stRandom/test_random_statetest261.py
index 2a1e54d04ac..bd3d7c0e6ae 100644
--- a/tests/ported_static/stRandom/test_random_statetest261.py
+++ b/tests/ported_static/stRandom/test_random_statetest261.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest261.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest261Filler.json
+state_tests/stRandom/randomStatetest261Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest261Filler.json"],
+    ["state_tests/stRandom/randomStatetest261Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest261(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest261."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,45 @@ def test_random_statetest261(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000000447fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000017f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000017f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000007f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000"  # noqa: E501
-            "000000000000000000000000000000001231b61993"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x439f60d09ba1d7e67458e16721b402ea66bb69ef"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f0000000000000000000000000000000000000000000000000000000000000000447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000001231b61993  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f0000000000000000000000000000000000000000000000000000000000000000447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000001231b61993"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000000447fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000017f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000017f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000007f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000"  # noqa: E501
-            "000000000000000000000000000000001231b61993"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000000000000000000000000000000000000000000000447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000001231b61993"  # noqa: E501
         ),
         gas_limit=100000,
-        value=352016044,
+        value=0x14FB56AC,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest263.py b/tests/ported_static/stRandom/test_random_statetest263.py
index 5e26b98e4e4..002ca645f8f 100644
--- a/tests/ported_static/stRandom/test_random_statetest263.py
+++ b/tests/ported_static/stRandom/test_random_statetest263.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest263.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest263Filler.json
+state_tests/stRandom/randomStatetest263Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest263Filler.json"],
+    ["state_tests/stRandom/randomStatetest263Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,8 +32,9 @@ def test_random_statetest263(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest263."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -46,72 +48,66 @@ def test_random_statetest263(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.DUP1
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x556000),
-                value=Op.XOR(
-                    Op.DIV(
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                        Op.PUSH32[0xC350],
-                    ),
-                    Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
-                ),
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5807f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0418625560005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.DUP1
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x556000),
+            value=Op.XOR(
+                Op.DIV(
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                    Op.PUSH32[0xC350],
+                ),
+                Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5807f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3507fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "0000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe041862"
+        to=contract_0,
+        data=Bytes(
+            "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5807f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe041862"  # noqa: E501
         ),
         gas_limit=2038963641,
-        value=767067244,
+        value=0x2DB8846C,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 0x14F8B588E368F08461F9F95EB620FACA1C09044BCFAFAE26DE901D3A614F5,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest264.py b/tests/ported_static/stRandom/test_random_statetest264.py
index d75d7c4c867..ff0a9191e40 100644
--- a/tests/ported_static/stRandom/test_random_statetest264.py
+++ b/tests/ported_static/stRandom/test_random_statetest264.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest264.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest264Filler.json
+state_tests/stRandom/randomStatetest264Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest264Filler.json"],
+    ["state_tests/stRandom/randomStatetest264Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest264(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest264."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,65 +43,56 @@ def test_random_statetest264(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.MULMOD(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                ),
-                value=Op.PUSH32[0x1],
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0955  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.MULMOD(
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            ),
+            value=Op.PUSH32[0x1],
         ),
         nonce=0,
-        address=Address("0xc3fdd8cba888f2c918ddc3b417aa58966e99b219"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000017f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff09"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1165785335,
+        value=0x457C78F7,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest265.py b/tests/ported_static/stRandom/test_random_statetest265.py
index 4f947aa77e4..3d6e9b7db7a 100644
--- a/tests/ported_static/stRandom/test_random_statetest265.py
+++ b/tests/ported_static/stRandom/test_random_statetest265.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest265.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest265Filler.json
+state_tests/stRandom/randomStatetest265Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest265Filler.json"],
+    ["state_tests/stRandom/randomStatetest265Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest265(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest265."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,45 @@ def test_random_statetest265(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3503b7f000000000000000000000000000000000000000000000000000000000000c3506a7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000745b9b824070397f921960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3503b7f000000000000000000000000000000000000000000000000000000000000c3506a7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000745b9b824070397f921960005155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3503b7f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c3506a7f000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000017f000000000000000000"  # noqa: E501
-            "000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001"  # noqa: E501
-            "0000000000000000000000000000000000000000745b9b824070397f921960005155"  # noqa: E501
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x897196687e79db7a21310478e9ba6cc9d6c1209e"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3503b7f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c3506a7f000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000017f000000000000000000"  # noqa: E501
-            "000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001"  # noqa: E501
-            "0000000000000000000000000000000000000000745b9b824070397f9219"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3503b7f000000000000000000000000000000000000000000000000000000000000c3506a7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000745b9b824070397f9219"  # noqa: E501
         ),
         gas_limit=100000,
-        value=571967067,
+        value=0x2217865B,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest266.py b/tests/ported_static/stRandom/test_random_statetest266.py
index 1181525588d..99e4fe62d6a 100644
--- a/tests/ported_static/stRandom/test_random_statetest266.py
+++ b/tests/ported_static/stRandom/test_random_statetest266.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest266.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest266Filler.json
+state_tests/stRandom/randomStatetest266Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest266Filler.json"],
+    ["state_tests/stRandom/randomStatetest266Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest266(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest266."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,61 +43,55 @@ def test_random_statetest266(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.DIV(Op.COINBASE, Op.ADDRESS)
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.PUSH32[0x0],
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-            )
-            + Op.SSTORE
-            + Op.SWAP5
-            + Op.JUMP
-            + Op.PUSH8[0x793459633C993060]
-            + Op.STOP
-            + Op.MLOAD
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x3041047f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000005555945667793459633c993060005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.DIV(Op.COINBASE, Op.ADDRESS)
+        + Op.PUSH32[0x0] * 2
+        + Op.SSTORE(
+            key=Op.PUSH32[0x0],
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+        )
+        + Op.SSTORE
+        + Op.SWAP5
+        + Op.JUMP
+        + Op.PUSH8[0x793459633C993060]
+        + Op.STOP
+        + Op.MLOAD
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x118b2fa6cfab667c42ccb5c5eeee4dc3af2cae15"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "3041047f0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "7f00000000000000000000000000000000000000000000000000000000000000007fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000555594566779345963"  # noqa: E501
-            "3c9930"
+        to=target,
+        data=Bytes(
+            "3041047f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000005555945667793459633c9930"  # noqa: E501
         ),
         gas_limit=100000,
-        value=249765705,
+        value=0xEE31F49,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest267.py b/tests/ported_static/stRandom/test_random_statetest267.py
index 224a099f38b..8e738d330bb 100644
--- a/tests/ported_static/stRandom/test_random_statetest267.py
+++ b/tests/ported_static/stRandom/test_random_statetest267.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest267.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest267Filler.json
+state_tests/stRandom/randomStatetest267Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest267Filler.json"],
+    ["state_tests/stRandom/randomStatetest267Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest267(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest267."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,66 +47,61 @@ def test_random_statetest267(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PREVRANDAO
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=0xB5A132776D398E3B7C14686A07346F600051,
-                value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x447f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5a132776d398e3b7c14686a07346f60005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PREVRANDAO
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=0xB5A132776D398E3B7C14686A07346F600051,
+            value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "447f000000000000000000000000000000000000000000000000000000000000c3507fff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000"  # noqa: E501
-            "000000000000000100000000000000000000000000000000000000007f00000000000000"  # noqa: E501
-            "0000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000007e7f000000000000000000000000"  # noqa: E501
-            "945304eb96065b2a98b57a48a06ae28d285a71b5a132776d398e3b7c14686a07346f"  # noqa: E501
+        to=contract_0,
+        data=Bytes(
+            "447f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5a132776d398e3b7c14686a07346f"  # noqa: E501
         ),
         gas_limit=100000,
-        value=256968366,
+        value=0xF5106AE,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0xB5A132776D398E3B7C14686A07346F600051: 0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest268.py b/tests/ported_static/stRandom/test_random_statetest268.py
index e9d7378252f..f6c95ccca4c 100644
--- a/tests/ported_static/stRandom/test_random_statetest268.py
+++ b/tests/ported_static/stRandom/test_random_statetest268.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest268.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest268Filler.json
+state_tests/stRandom/randomStatetest268Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest268Filler.json"],
+    ["state_tests/stRandom/randomStatetest268Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest268(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest268."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,61 @@ def test_random_statetest268(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x7466F0A0733D86326393406340944255,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016f7466f0a0733d8632639340634094425560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x7466F0A0733D86326393406340944255
         ),
         nonce=0,
-        address=Address("0xd08041e77ce5a71ef2702ec933dc4f4377406a27"),  # noqa: E501
+        address=Address(0xD08041E77CE5A71EF2702EC933DC4F4377406A27),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000016f7466f0a0733d863263934063409442"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016f7466f0a0733d863263934063409442"  # noqa: E501
         ),
         gas_limit=100000,
-        value=593549642,
+        value=0x2360D94A,
     )
 
     post = {
-        contract: Account(storage={0: 0x7466F0A0733D86326393406340944255}),
+        target: Account(
+            storage={0: 0x7466F0A0733D86326393406340944255},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest269.py b/tests/ported_static/stRandom/test_random_statetest269.py
index bbd301fc153..208ba09f6da 100644
--- a/tests/ported_static/stRandom/test_random_statetest269.py
+++ b/tests/ported_static/stRandom/test_random_statetest269.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest269.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest269Filler.json
+state_tests/stRandom/randomStatetest269Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest269Filler.json"],
+    ["state_tests/stRandom/randomStatetest269Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest269(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest269."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,68 +47,61 @@ def test_random_statetest269(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.DIV(
-                    0x76029968FFA27D,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-                value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x406aae16e0d6f5cbb11d327d208f8ebc342a7d5b"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6676029968ffa27d0455  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.DIV(
+                0x76029968FFA27D,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
+            value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x406AAE16E0D6F5CBB11D327D208F8EBC342A7D5B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000007f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe6676029968ffa27d04"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6676029968ffa27d04"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1239417538,
+        value=0x49E002C2,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF},
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest27.py b/tests/ported_static/stRandom/test_random_statetest27.py
index f325ca4c7d2..c45f829d231 100644
--- a/tests/ported_static/stRandom/test_random_statetest27.py
+++ b/tests/ported_static/stRandom/test_random_statetest27.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest27.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest27Filler.json
+state_tests/stRandom/randomStatetest27Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest27Filler.json"],
+    ["state_tests/stRandom/randomStatetest27Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest27(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest27."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,68 +47,61 @@ def test_random_statetest27(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MULMOD(
-                    Op.PUSH32[0x10000000000000000000000000000000000000000],
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000000960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MULMOD(
+                Op.PUSH32[0x10000000000000000000000000000000000000000],
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
         ),
         nonce=0,
-        address=Address("0x7474a32fa320e72dfe3023106276e5d2b810d1f4"),  # noqa: E501
+        address=Address(0x7474A32FA320E72DFE3023106276E5D2B810D1F4),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000"  # noqa: E501
-            "00000000000000000000000009"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000009"  # noqa: E501
         ),
         gas_limit=100000,
-        value=541933198,
+        value=0x204D3E8E,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001FFFFFFFFFFFFFFFE,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest270.py b/tests/ported_static/stRandom/test_random_statetest270.py
index 9875032773f..1331693dee1 100644
--- a/tests/ported_static/stRandom/test_random_statetest270.py
+++ b/tests/ported_static/stRandom/test_random_statetest270.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest270.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest270Filler.json
+state_tests/stRandom/randomStatetest270Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest270Filler.json"],
+    ["state_tests/stRandom/randomStatetest270Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest270(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest270."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,70 +47,64 @@ def test_random_statetest270(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.TIMESTAMP
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.CODECOPY(
-                dest_offset=Op.PUSH32[0x1],
-                offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
-                size=Op.PUSH32[0xC350],
-            )
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x2ef12d7c660739849fa667bc47e3800325185541"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001395560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.TIMESTAMP
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0xC350]
+        + Op.CODECOPY(
+            dest_offset=Op.PUSH32[0x1],
+            offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
+            size=Op.PUSH32[0xC350],
+        )
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x2EF12D7C660739849FA667BC47E3800325185541),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507f00000000000000000000000100"  # noqa: E501
-            "000000000000000000000000000000000000007f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000139"
+        to=target,
+        data=Bytes(
+            "427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000139"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1633146389,
+        value=0x6157D615,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
                 50000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest271.py b/tests/ported_static/stRandom/test_random_statetest271.py
index 914f8f34e5d..3d33887fec9 100644
--- a/tests/ported_static/stRandom/test_random_statetest271.py
+++ b/tests/ported_static/stRandom/test_random_statetest271.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest271.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest271Filler.json
+state_tests/stRandom/randomStatetest271Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,96 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest271Filler.json"],
+    ["state_tests/stRandom/randomStatetest271Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest271(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000001457f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c350417f000000"  # noqa: E501
-            "0000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000357f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000b6d7d958a02699955600051"  # noqa: E501
-            "55"
-        ),
-        nonce=0,
-        address=Address("0xb45f31dd95616972767dd62e9b996e22566aaec1"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000001457f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c350417f000000"  # noqa: E501
-            "0000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000357f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000b6d7d958a026999"
-        ),
-        gas_limit=100000,
-        value=193990328,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest271Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest271_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest271."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -122,53 +43,45 @@ def test_random_statetest271_from_prague(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f0000000000000000000000000000000000000000000000000000000000000001457f000000000000000000000000000000000000000000000000000000000000c350417f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f0000000000000000000000000000000000000000000000000000000000000000357f00000000000000000000000000000000000000000000000000000000000000000b6d7d958a0269995560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000001457f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c350417f000000"  # noqa: E501
-            "0000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000357f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000b6d7d958a02699955600051"  # noqa: E501
-            "55"
+            "7f0000000000000000000000000000000000000000000000000000000000000001457f000000000000000000000000000000000000000000000000000000000000c350417f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000000000000000000000000000000000357f00000000000000000000000000000000000000000000000000000000000000000b6d7d958a0269995560005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xb45f31dd95616972767dd62e9b996e22566aaec1"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000001457f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c350417f000000"  # noqa: E501
-            "0000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000357f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000b6d7d958a026999"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000000000000000000000000000000000000000000001457f000000000000000000000000000000000000000000000000000000000000c350417f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000000000000000000000000000000000357f00000000000000000000000000000000000000000000000000000000000000000b6d7d958a026999"  # noqa: E501
         ),
         gas_limit=100000,
-        value=193990328,
+        value=0xB900EB8,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest273.py b/tests/ported_static/stRandom/test_random_statetest273.py
index 0a30577e622..d7d77f8c1bc 100644
--- a/tests/ported_static/stRandom/test_random_statetest273.py
+++ b/tests/ported_static/stRandom/test_random_statetest273.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest273.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest273Filler.json
+state_tests/stRandom/randomStatetest273Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest273Filler.json"],
+    ["state_tests/stRandom/randomStatetest273Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest273(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest273."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,54 +47,58 @@ def test_random_statetest273(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x4342424343425b4495fff04285609955
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.NUMBER
+        + Op.TIMESTAMP * 2
+        + Op.NUMBER * 2
+        + Op.TIMESTAMP
+        + Op.JUMPDEST
+        + Op.PREVRANDAO
+        + Op.SWAP6
+        + Op.SELFDESTRUCT
+        + Op.CREATE
+        + Op.TIMESTAMP
+        + Op.SSTORE(key=0x99, value=Op.DUP6),
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x5F82DA708C6F5A1F5C2E84CD0239DAD1EDB623AA),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.NUMBER
-            + Op.TIMESTAMP
-            + Op.TIMESTAMP
-            + Op.NUMBER
-            + Op.NUMBER
-            + Op.TIMESTAMP
-            + Op.JUMPDEST
-            + Op.PREVRANDAO
-            + Op.SWAP6
-            + Op.SELFDESTRUCT
-            + Op.CREATE
-            + Op.TIMESTAMP
-            + Op.SSTORE(key=0x99, value=Op.DUP6)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=46,
         nonce=0,
-        address=Address("0x5f82da708c6f5a1f5c2e84cd0239dad1edb623aa"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x0000000000000000000000000000000000000001): Account(
+            storage={},
+            code=b"",
+            balance=0xDE0B6B3A76586A0,
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest274.py b/tests/ported_static/stRandom/test_random_statetest274.py
index 6f97e1d7ac7..b095ed1ebcb 100644
--- a/tests/ported_static/stRandom/test_random_statetest274.py
+++ b/tests/ported_static/stRandom/test_random_statetest274.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest274.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest274Filler.json
+state_tests/stRandom/randomStatetest274Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest274Filler.json"],
+    ["state_tests/stRandom/randomStatetest274Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest274(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest274."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,64 +43,59 @@ def test_random_statetest274(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.LOG4
-            + Op.SDIV
-            + Op.GASLIMIT
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.ADD(
-                Op.DUP9,
-                Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-            )
-            + Op.GAS
-            + Op.SWAP11
-            + Op.SDIV
-            + Op.TIMESTAMP
-            + Op.LOG1
-            + Op.EQ(Op.SDIV, Op.GASPRICE)
-            + Op.SWAP8
-            + Op.MLOAD
-            + Op.ISZERO(Op.TIMESTAMP)
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffffa405457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>88015a9a0542a13a051497514215  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.LOG4
+        + Op.SDIV
+        + Op.GASLIMIT
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.ADD(
+            Op.DUP9, Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        )
+        + Op.GAS
+        + Op.SWAP11
+        + Op.SDIV
+        + Op.TIMESTAMP
+        + Op.LOG1
+        + Op.EQ(Op.SDIV, Op.GASPRICE)
+        + Op.SWAP8
+        + Op.MLOAD
+        + Op.ISZERO(Op.TIMESTAMP),
         nonce=0,
-        address=Address("0x89cd1261ad57a9678ac21adb1c06750567d685f4"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffffa40545"  # noqa: E501
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7988015a9a0542"  # noqa: E501
-            "a13a051497514215"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffffa405457f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7988015a9a0542a13a051497514215"  # noqa: E501
         ),
         gas_limit=100000,
-        value=191496672,
+        value=0xB6A01E0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest275.py b/tests/ported_static/stRandom/test_random_statetest275.py
index a23960961bf..72f1dadc0e8 100644
--- a/tests/ported_static/stRandom/test_random_statetest275.py
+++ b/tests/ported_static/stRandom/test_random_statetest275.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest275.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest275Filler.json
+state_tests/stRandom/randomStatetest275Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest275Filler.json"],
+    ["state_tests/stRandom/randomStatetest275Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest275(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest275."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,143 +43,55 @@ def test_random_statetest275(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.NUMBER
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=0x6756323C5974,
-                value=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    Op.NOT(Op.PUSH32[0x0]),
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x437f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000197ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09656756323c597455  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.NUMBER
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=0x6756323C5974,
+            value=Op.MULMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                Op.NOT(Op.PUSH32[0x0]),
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
         nonce=0,
-        address=Address("0x69d3e12fb87d7effeb9ded3d46879ebe02925b4e"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "437f000000000000000000000000000000000000000000000000000000000000c3507fff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000197fffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffe09656756323c5974"
-        ),
-        gas_limit=100000,
-        value=4157391,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest275Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest275_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
     )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.NUMBER
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=0x6756323C5974,
-                value=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    Op.NOT(Op.PUSH32[0x0]),
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-        ),
-        nonce=0,
-        address=Address("0x69d3e12fb87d7effeb9ded3d46879ebe02925b4e"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "437f000000000000000000000000000000000000000000000000000000000000c3507fff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000197fffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffe09656756323c5974"
+        to=target,
+        data=Bytes(
+            "437f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000197ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09656756323c5974"  # noqa: E501
         ),
         gas_limit=100000,
-        value=4157391,
+        value=0x3F6FCF,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest276.py b/tests/ported_static/stRandom/test_random_statetest276.py
index 43270802721..8815e7bf241 100644
--- a/tests/ported_static/stRandom/test_random_statetest276.py
+++ b/tests/ported_static/stRandom/test_random_statetest276.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest276.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest276Filler.json
+state_tests/stRandom/randomStatetest276Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest276Filler.json"],
+    ["state_tests/stRandom/randomStatetest276Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest276(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest276."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,66 +46,61 @@ def test_random_statetest276(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x4382349F7B370589141A31F39741A4F2,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f4382349f7b370589141a31f39741a4f260005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x4382349F7B370589141A31F39741A4F2
         ),
         nonce=0,
-        address=Address("0x1f9cca33c13444772d26e92e73e175c370115899"),  # noqa: E501
+        address=Address(0x1F9CCA33C13444772D26E92E73E175C370115899),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff6f4382349f7b370589141a31f39741a4f2"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f4382349f7b370589141a31f39741a4f2"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1026778874,
+        value=0x3D3366FA,
     )
 
     post = {
-        contract: Account(storage={0: 0x4382349F7B370589141A31F39741A4F2}),
+        target: Account(
+            storage={0: 0x4382349F7B370589141A31F39741A4F2},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest278.py b/tests/ported_static/stRandom/test_random_statetest278.py
index ced86845b4f..b659b93237d 100644
--- a/tests/ported_static/stRandom/test_random_statetest278.py
+++ b/tests/ported_static/stRandom/test_random_statetest278.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest278.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest278Filler.json
+state_tests/stRandom/randomStatetest278Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest278Filler.json"],
+    ["state_tests/stRandom/randomStatetest278Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest278(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest278."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,67 +46,61 @@ def test_random_statetest278(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.CALLDATACOPY(
-                dest_offset=Op.PUSH32[0x1],
-                offset=Op.PUSH32[0x0],
-                size=Op.PUSH32[0xC350],
-            )
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001377f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.CALLDATACOPY(
+            dest_offset=Op.PUSH32[0x1],
+            offset=Op.PUSH32[0x0],
+            size=Op.PUSH32[0xC350],
+        )
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
         ),
         nonce=0,
-        address=Address("0x1d936f55367466335bc4ab5780632a25a82a23ad"),  # noqa: E501
+        address=Address(0x1D936F55367466335BC4AB5780632A25A82A23AD),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000001377f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001377f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1577249919,
+        value=0x5E02EC7F,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x7F000000000000000000000000000000000000000000000000000000000000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest279.py b/tests/ported_static/stRandom/test_random_statetest279.py
index 28581d39e9c..2420986fd76 100644
--- a/tests/ported_static/stRandom/test_random_statetest279.py
+++ b/tests/ported_static/stRandom/test_random_statetest279.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest279.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest279Filler.json
+state_tests/stRandom/randomStatetest279Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest279Filler.json"],
+    ["state_tests/stRandom/randomStatetest279Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest279(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest279."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,68 +43,57 @@ def test_random_statetest279(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SWAP5
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x35596aa142f6fc0097b6fbe0d02a4e1cb3b7b043"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000947f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SWAP5
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000"  # noqa: E501
-            "000000000000000000000000000000000000947f0000000000000000000000004f3f7014"  # noqa: E501
-            "64972e74606d6ea82d4d3080599a0e79"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000947f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1318170680,
+        value=0x4E91B038,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0x4F3F701464972E74606D6EA82D4D3080599A0E79},
-        ),
+        target: Account(storage={0: coinbase}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest28.py b/tests/ported_static/stRandom/test_random_statetest28.py
index 124740da8f9..fd926360efa 100644
--- a/tests/ported_static/stRandom/test_random_statetest28.py
+++ b/tests/ported_static/stRandom/test_random_statetest28.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest28.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest28Filler.json
+state_tests/stRandom/randomStatetest28Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest28Filler.json"],
+    ["state_tests/stRandom/randomStatetest28Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest28(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest28."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,68 +47,59 @@ def test_random_statetest28(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.COINBASE
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.ADDRESS, value=0x38129D68939A19A2697172926F6A6736
-            )
-        ),
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f38129d68939a19a2697172926f6a67363055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.COINBASE
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(key=Op.ADDRESS, value=0x38129D68939A19A2697172926F6A6736),
         nonce=0,
-        address=Address("0xdf2d980d762338e0da723885b33558d435309a78"),  # noqa: E501
+        address=Address(0xDF2D980D762338E0DA723885B33558D435309A78),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff417f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "00004f3f701464972e74606d6ea82d4d3080599a0e796f38129d68939a19a2697172926f"  # noqa: E501
-            "6a673630"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f38129d68939a19a2697172926f6a673630"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1370440167,
+        value=0x51AF41E7,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0xDF2D980D762338E0DA723885B33558D435309A78: 0x38129D68939A19A2697172926F6A6736,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest280.py b/tests/ported_static/stRandom/test_random_statetest280.py
index f168f87ff53..40474d5a42d 100644
--- a/tests/ported_static/stRandom/test_random_statetest280.py
+++ b/tests/ported_static/stRandom/test_random_statetest280.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest280.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest280Filler.json
+state_tests/stRandom/randomStatetest280Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest280Filler.json"],
+    ["state_tests/stRandom/randomStatetest280Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest280(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest280."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,56 +47,54 @@ def test_random_statetest280(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000000143507f000000000000000000000000000000000000000000000000000000000000c350417f00000000000000000000000000000000000000000000000000000000000000006f423b3c407e7c6f16718668738d193cf260005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.POP(Op.NUMBER)
+        + Op.PUSH32[0xC350]
+        + Op.COINBASE
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x423B3C407E7C6F16718668738D193CF2
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xA96044D2D730E6D718D80ADDB209C5DE24D8FBA4),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.POP(Op.NUMBER)
-            + Op.PUSH32[0xC350]
-            + Op.COINBASE
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x423B3C407E7C6F16718668738D193CF2,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xa96044d2d730e6d718d80addb209c5de24d8fba4"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000000143507f"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000c350417f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000006f423b3c407e"  # noqa: E501
-            "7c6f16718668738d193cf2"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000000143507f000000000000000000000000000000000000000000000000000000000000c350417f00000000000000000000000000000000000000000000000000000000000000006f423b3c407e7c6f16718668738d193cf2"  # noqa: E501
         ),
         gas_limit=100000,
-        value=809294938,
+        value=0x303CDC5A,
     )
 
     post = {
-        contract: Account(storage={0: 0x423B3C407E7C6F16718668738D193CF2}),
+        target: Account(
+            storage={0: 0x423B3C407E7C6F16718668738D193CF2},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest281.py b/tests/ported_static/stRandom/test_random_statetest281.py
index feb55bcab0e..eb2fffccff2 100644
--- a/tests/ported_static/stRandom/test_random_statetest281.py
+++ b/tests/ported_static/stRandom/test_random_statetest281.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest281.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest281Filler.json
+state_tests/stRandom/randomStatetest281Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest281Filler.json"],
+    ["state_tests/stRandom/randomStatetest281Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest281(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest281."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,58 +47,54 @@ def test_random_statetest281(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.GASLIMIT
-            + Op.PUSH32[0xC350]
-            + Op.COINBASE
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x649A7A3457645670A27FA170639718A2,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>457f000000000000000000000000000000000000000000000000000000000000c350417f00000000000000000000000000000000000000000000000000000000000000016f649a7a3457645670a27fa170639718a260005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79] * 2
+        + Op.GASLIMIT
+        + Op.PUSH32[0xC350]
+        + Op.COINBASE
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x649A7A3457645670A27FA170639718A2
         ),
         nonce=0,
-        address=Address("0xed3690010055eab6a7103a13e1e74492e67fd00f"),  # noqa: E501
+        address=Address(0xED3690010055EAB6A7103A13E1E74492E67FD00F),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79457f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c350417f000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000016f649a7a3457645670a2"  # noqa: E501
-            "7fa170639718a2"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79457f000000000000000000000000000000000000000000000000000000000000c350417f00000000000000000000000000000000000000000000000000000000000000016f649a7a3457645670a27fa170639718a2"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1714316412,
+        value=0x662E647C,
     )
 
     post = {
-        contract: Account(storage={0: 0x649A7A3457645670A27FA170639718A2}),
+        target: Account(
+            storage={0: 0x649A7A3457645670A27FA170639718A2},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest282.py b/tests/ported_static/stRandom/test_random_statetest282.py
index 0986087dd3c..490fe3bac97 100644
--- a/tests/ported_static/stRandom/test_random_statetest282.py
+++ b/tests/ported_static/stRandom/test_random_statetest282.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest282.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest282Filler.json
+state_tests/stRandom/randomStatetest282Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest282Filler.json"],
+    ["state_tests/stRandom/randomStatetest282Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest282(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest282."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,59 +46,57 @@ def test_random_statetest282(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SELFDESTRUCT(
-                address=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-            )
-            + Op.PREVRANDAO
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.TIMESTAMP
-            + Op.SWAP14
-            + Op.COINBASE
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
-        nonce=0,
-        address=Address("0x14209e1c3d86dec137a40e23ca3ceec80421da46"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
+    )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>ff447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff429d415560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SELFDESTRUCT(
+            address=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        )
+        + Op.PREVRANDAO
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.TIMESTAMP
+        + Op.SWAP14
+        + Op.COINBASE
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
+        nonce=0,
+        address=Address(0x14209E1C3D86DEC137A40E23CA3CEEC80421DA46),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79ff447f000000"  # noqa: E501
-            "000000000000000000ffffffffffffffffffffffffffffffffffffffff429d41"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79ff447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff429d41"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2067523496,
+        value=0x7B3BE7A8,
     )
 
-    post: dict = {}
+    post = {
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest283.py b/tests/ported_static/stRandom/test_random_statetest283.py
index d58b666e944..b0f7f17ceff 100644
--- a/tests/ported_static/stRandom/test_random_statetest283.py
+++ b/tests/ported_static/stRandom/test_random_statetest283.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest283.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest283Filler.json
+state_tests/stRandom/randomStatetest283Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest283Filler.json"],
+    ["state_tests/stRandom/randomStatetest283Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest283(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest283."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,70 +47,64 @@ def test_random_statetest283(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000013960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.GASLIMIT
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.CODECOPY(
+            dest_offset=Op.PUSH32[0x1],
+            offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
+            size=Op.PUSH32[0xC350],
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xB0FED7C51FFD374EEDCE2AD9257312A169A19E51),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.GASLIMIT
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.CODECOPY(
-                dest_offset=Op.PUSH32[0x1],
-                offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
-                size=Op.PUSH32[0xC350],
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xb0fed7c51ffd374eedce2ad9257312a169a19e51"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff457fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507f00000000000000000000000100"  # noqa: E501
-            "000000000000000000000000000000000000007f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000139"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000139"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1602431327,
+        value=0x5F83295F,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest285.py b/tests/ported_static/stRandom/test_random_statetest285.py
index a39d277ecd0..c2e21d35bd7 100644
--- a/tests/ported_static/stRandom/test_random_statetest285.py
+++ b/tests/ported_static/stRandom/test_random_statetest285.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest285.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest285Filler.json
+state_tests/stRandom/randomStatetest285Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest285Filler.json"],
+    ["state_tests/stRandom/randomStatetest285Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest285(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest285."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,41 +43,42 @@ def test_random_statetest285(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x413443f3404242433389ff723810
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex("413443f3404242433389ff723810"),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x42c6df39abd3d7de1c64c50b0d8bb0e6085fb6af"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest286.py b/tests/ported_static/stRandom/test_random_statetest286.py
index 58eca8cb95c..0c4d5538e24 100644
--- a/tests/ported_static/stRandom/test_random_statetest286.py
+++ b/tests/ported_static/stRandom/test_random_statetest286.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest286.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest286Filler.json
+state_tests/stRandom/randomStatetest286Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest286Filler.json"],
+    ["state_tests/stRandom/randomStatetest286Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,8 +32,8 @@ def test_random_statetest286(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest286."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -47,70 +48,61 @@ def test_random_statetest286(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GAS
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.SWAP6
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0), value=Op.DIV(Op.DUP7, Op.DUP3)
-            )
-        ),
+    # Source: raw
+    # 0x5a7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000009582860460005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.GAS
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xC350] * 2
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0]
+        + Op.SWAP6
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.DIV(Op.DUP7, Op.DUP3)),
         nonce=0,
-        address=Address("0xf72e559dbb45a1b06cefdb38d53632f23795ec0e"),  # noqa: E501
+        address=Address(0xF72E559DBB45A1B06CEFDB38D53632F23795EC0E),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "5a7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000095828604"
+        to=target,
+        data=Bytes(
+            "5a7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000000095828604"  # noqa: E501
         ),
         gas_limit=2065759166,
-        value=1522313647,
+        value=0x5ABCA9AF,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x14F8B588E368F08461F9F01B866E43AA79BBADC0980B242070B8CFBFC6540,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest287.py b/tests/ported_static/stRandom/test_random_statetest287.py
index 432a024bc63..88ee08e38b4 100644
--- a/tests/ported_static/stRandom/test_random_statetest287.py
+++ b/tests/ported_static/stRandom/test_random_statetest287.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest287.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest287Filler.json
+state_tests/stRandom/randomStatetest287Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest287Filler.json"],
+    ["state_tests/stRandom/randomStatetest287Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest287(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest287."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,57 @@ def test_random_statetest287(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SELFDESTRUCT(
-                address=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-            )
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SMOD
-            + Op.MSIZE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x31c15a33d833b7c1a49e3f28e6d2b2d975f578bd"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>ff7f00000000000000000000000100000000000000000000000000000000000000000759  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SELFDESTRUCT(
+            address=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        )
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SMOD
+        + Op.MSIZE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x31C15A33D833B7C1A49E3F28E6D2B2D975F578BD),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e79ff7f00000000000000000000000100000000"  # noqa: E501
-            "000000000000000000000000000000000759"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79ff7f00000000000000000000000100000000000000000000000000000000000000000759"  # noqa: E501
         ),
         gas_limit=15653489,
-        value=1406933351,
+        value=0x53DC1967,
     )
 
-    post: dict = {}
+    post = {
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest288.py b/tests/ported_static/stRandom/test_random_statetest288.py
index 802cff8d406..9b7cf063be2 100644
--- a/tests/ported_static/stRandom/test_random_statetest288.py
+++ b/tests/ported_static/stRandom/test_random_statetest288.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest288.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest288Filler.json
+state_tests/stRandom/randomStatetest288Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,84 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest288Filler.json"],
+    ["state_tests/stRandom/randomStatetest288Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest288(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex("76404140424242458c1f11410b"),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x491ec6b2f8ec53c669db820e13f80f4987cdd1e4"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
-        gas_limit=400000,
-        value=100000,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest288Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest288_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest288."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -110,41 +43,42 @@ def test_random_statetest288_from_prague(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x76404140424242458c1f11410b
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex("76404140424242458c1f11410b"),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x491ec6b2f8ec53c669db820e13f80f4987cdd1e4"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest29.py b/tests/ported_static/stRandom/test_random_statetest29.py
index f7983a1d37c..348e55ad7d8 100644
--- a/tests/ported_static/stRandom/test_random_statetest29.py
+++ b/tests/ported_static/stRandom/test_random_statetest29.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest29.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest29Filler.json
+state_tests/stRandom/randomStatetest29Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest29Filler.json"],
+    ["state_tests/stRandom/randomStatetest29Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest29(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest29."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,59 @@ def test_random_statetest29(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff087fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0955  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MULMOD(
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                Op.ADDMOD(
+                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                    Op.PUSH32[0x0],
+                    Op.PUSH32[0x10000000000000000000000000000000000000000],
+                ),
+            ),
+            value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xF5781CFAE8099794B4983A68AFEF46BFCE6AB51C),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MULMOD(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    Op.ADDMOD(
-                        Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                        Op.PUSH32[0x0],
-                        Op.PUSH32[0x10000000000000000000000000000000000000000],
-                    ),
-                ),
-                value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xf5781cfae8099794b4983a68afef46bfce6ab51c"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff087fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff09"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff087fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=558543347,
+        value=0x214AB1F3,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF},
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest290.py b/tests/ported_static/stRandom/test_random_statetest290.py
index a02de79c2d8..34a94a78a58 100644
--- a/tests/ported_static/stRandom/test_random_statetest290.py
+++ b/tests/ported_static/stRandom/test_random_statetest290.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest290.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest290Filler.json
+state_tests/stRandom/randomStatetest290Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest290Filler.json"],
+    ["state_tests/stRandom/randomStatetest290Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest290(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest290."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,62 @@ def test_random_statetest290(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MULMOD(
-                    Op.DUP4,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe830960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MULMOD(
+                Op.DUP4,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
         nonce=0,
-        address=Address("0xbbae1a0c728b648c79d5ad774502558645162573"),  # noqa: E501
+        address=Address(0xBBAE1A0C728B648C79D5AD774502558645162573),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe8309"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8309"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1834111958,
+        value=0x6D5253D6,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest291.py b/tests/ported_static/stRandom/test_random_statetest291.py
index 33e3651583a..6fae04c441a 100644
--- a/tests/ported_static/stRandom/test_random_statetest291.py
+++ b/tests/ported_static/stRandom/test_random_statetest291.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest291.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest291Filler.json
+state_tests/stRandom/randomStatetest291Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest291Filler.json"],
+    ["state_tests/stRandom/randomStatetest291Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest291(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest291."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,60 @@ def test_random_statetest291(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000015560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(key=Op.PUSH32[0x1], value=Op.PUSH32[0x1])
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xA8CBFEAF9A78D390BADA18771F29715B4B54C94E),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(key=Op.PUSH32[0x1], value=Op.PUSH32[0x1])
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xa8cbfeaf9a78d390bada18771f29715b4b54c94e"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000017f0000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000001"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1065015882,
+        value=0x3F7ADA4A,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
                 1: 1,
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest292.py b/tests/ported_static/stRandom/test_random_statetest292.py
index 96bc078604c..33dd50d35a6 100644
--- a/tests/ported_static/stRandom/test_random_statetest292.py
+++ b/tests/ported_static/stRandom/test_random_statetest292.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest292.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest292Filler.json
+state_tests/stRandom/randomStatetest292Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest292Filler.json"],
+    ["state_tests/stRandom/randomStatetest292Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest292(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest292."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,65 +43,58 @@ def test_random_statetest292(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.COINBASE
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.ADDRESS
-            + Op.PUSH4[0xA09C825A]
-            + Op.CALLER
-            + Op.DUP15
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>417f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000013063a09c825a338e  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.COINBASE
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x1]
+        + Op.ADDRESS
+        + Op.PUSH4[0xA09C825A]
+        + Op.CALLER
+        + Op.DUP15,
         nonce=0,
-        address=Address("0x6f333ed29ba1f098ba2b1f681f8e6131c7f3d2c2"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e79417f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000013063a09c825a338e"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79417f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000013063a09c825a338e"  # noqa: E501
         ),
         gas_limit=100000,
-        value=828199880,
+        value=0x315D53C8,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest293.py b/tests/ported_static/stRandom/test_random_statetest293.py
index f87bc244d73..735739a25eb 100644
--- a/tests/ported_static/stRandom/test_random_statetest293.py
+++ b/tests/ported_static/stRandom/test_random_statetest293.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest293.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest293Filler.json
+state_tests/stRandom/randomStatetest293Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest293Filler.json"],
+    ["state_tests/stRandom/randomStatetest293Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest293(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest293."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,61 @@ def test_random_statetest293(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f458962699489837460090897f3056682845560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.COINBASE
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(key=Op.DUP5, value=0x458962699489837460090897F3056682)
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x7819C78E9547588CDCD915080881E4CCEF857C8D),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.COINBASE
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(key=Op.DUP5, value=0x458962699489837460090897F3056682)
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x7819c78e9547588cdcd915080881e4ccef857c8d"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000007fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe6f45896269948983746009"  # noqa: E501
-            "0897f305668284"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f458962699489837460090897f305668284"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1022808999,
+        value=0x3CF6D3A7,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE: 0x458962699489837460090897F3056682,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest294.py b/tests/ported_static/stRandom/test_random_statetest294.py
index 632831e0d65..e1ac3b28387 100644
--- a/tests/ported_static/stRandom/test_random_statetest294.py
+++ b/tests/ported_static/stRandom/test_random_statetest294.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest294.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest294Filler.json
+state_tests/stRandom/randomStatetest294Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest294Filler.json"],
+    ["state_tests/stRandom/randomStatetest294Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest294(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest294."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,45 @@ def test_random_statetest294(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x057fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe3c7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9d0718f377825843028dfa02158878  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "057fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe3c7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9d0718f377825843028dfa02158878"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "057fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00"  # noqa: E501
-            "0000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe3c7fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff9d0718f377825843028dfa02158878"  # noqa: E501
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xeaf8f32047c68f3092d0c23d440c8f5e910865b0"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "057fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00"  # noqa: E501
-            "0000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe3c7fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff9d0718f377825843028dfa02158878"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "057fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe3c7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9d0718f377825843028dfa02158878"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1741399653,
+        value=0x67CBA665,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest295.py b/tests/ported_static/stRandom/test_random_statetest295.py
index ca933de0818..2bfdf406f3e 100644
--- a/tests/ported_static/stRandom/test_random_statetest295.py
+++ b/tests/ported_static/stRandom/test_random_statetest295.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest295.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest295Filler.json
+state_tests/stRandom/randomStatetest295Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest295Filler.json"],
+    ["state_tests/stRandom/randomStatetest295Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest295(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest295."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,58 +43,45 @@ def test_random_statetest295(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>31353a0b3c8b17eb55  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507f0000000000000000000000004f3f701464972e74"  # noqa: E501
-            "606d6ea82d4d3080599a0e7931353a0b3c8b17eb55"
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7931353a0b3c8b17eb55"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x8b2cf534e72a2af416b63fae177d57dedaeec9e9"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507f0000000000000000000000004f3f701464972e74"  # noqa: E501
-            "606d6ea82d4d3080599a0e7931353a0b3c8b17eb"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7931353a0b3c8b17eb"  # noqa: E501
         ),
         gas_limit=100000,
-        value=587483939,
+        value=0x23044B23,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest296.py b/tests/ported_static/stRandom/test_random_statetest296.py
index 3a54050f41e..5a61d0e00b1 100644
--- a/tests/ported_static/stRandom/test_random_statetest296.py
+++ b/tests/ported_static/stRandom/test_random_statetest296.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest296.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest296Filler.json
+state_tests/stRandom/randomStatetest296Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest296Filler.json"],
+    ["state_tests/stRandom/randomStatetest296Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest296(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest296."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,45 @@ def test_random_statetest296(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>385b9655558f510a6c73  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff417f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000007fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f7014"  # noqa: E501
-            "64972e74606d6ea82d4d3080599a0e79385b9655558f510a6c73"
+            "7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79385b9655558f510a6c73"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xc2006fd0f9c78c5404b143c53d5e4e7aa4b20324"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff417f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000007fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f7014"  # noqa: E501
-            "64972e74606d6ea82d4d3080599a0e79385b9655558f510a6c73"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79385b9655558f510a6c73"  # noqa: E501
         ),
         gas_limit=100000,
-        value=185739865,
+        value=0xB122A59,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest297.py b/tests/ported_static/stRandom/test_random_statetest297.py
index e20baa6aff1..88f9ae81fcd 100644
--- a/tests/ported_static/stRandom/test_random_statetest297.py
+++ b/tests/ported_static/stRandom/test_random_statetest297.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest297.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest297Filler.json
+state_tests/stRandom/randomStatetest297Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest297Filler.json"],
+    ["state_tests/stRandom/randomStatetest297Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest297(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest297."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,60 @@ def test_random_statetest297(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.NUMBER
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.TIMESTAMP
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x91085661509214157D9C8A7775851855,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>437f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe426f91085661509214157d9c8a777585185560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.NUMBER
+        + Op.PUSH32[0x0] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.TIMESTAMP
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x91085661509214157D9C8A7775851855
         ),
         nonce=0,
-        address=Address("0x63b282b5df9618a0f5c8b782f7286eb615a43b27"),  # noqa: E501
+        address=Address(0x63B282B5DF9618A0F5C8B782F7286EB615A43B27),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000007f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000007fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000"  # noqa: E501
-            "00004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe426f91085661509214157d9c8a77758518"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe426f91085661509214157d9c8a77758518"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2086766474,
+        value=0x7C61878A,
     )
 
     post = {
-        contract: Account(storage={0: 0x91085661509214157D9C8A7775851855}),
+        target: Account(
+            storage={0: 0x91085661509214157D9C8A7775851855},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest298.py b/tests/ported_static/stRandom/test_random_statetest298.py
index 1b9d7e3e7ae..05af899ef1a 100644
--- a/tests/ported_static/stRandom/test_random_statetest298.py
+++ b/tests/ported_static/stRandom/test_random_statetest298.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest298.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest298Filler.json
+state_tests/stRandom/randomStatetest298Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest298Filler.json"],
+    ["state_tests/stRandom/randomStatetest298Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest298(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest298."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,60 +47,55 @@ def test_random_statetest298(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.EXP(Op.PUSH32[0xC350], Op.PUSH32[0x0])
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x7C542006528B69FF3A7A3A0401613C55,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3500a6f7c542006528b69ff3a7a3a0401613c5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0]
+        + Op.EXP(Op.PUSH32[0xC350], Op.PUSH32[0x0])
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x7C542006528B69FF3A7A3A0401613C55
         ),
         nonce=0,
-        address=Address("0xf6d0d02e9e0bf01606955313230d637e54e8525a"),  # noqa: E501
+        address=Address(0xF6D0D02E9E0BF01606955313230D637E54E8525A),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000007f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000007f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3500a6f7c542006528b69ff3a7a3a0401613c"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3500a6f7c542006528b69ff3a7a3a0401613c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2114938379,
+        value=0x7E0F660B,
     )
 
     post = {
-        contract: Account(storage={0: 0x7C542006528B69FF3A7A3A0401613C55}),
+        target: Account(
+            storage={0: 0x7C542006528B69FF3A7A3A0401613C55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest299.py b/tests/ported_static/stRandom/test_random_statetest299.py
index 999bc7076c0..bc153c40fd5 100644
--- a/tests/ported_static/stRandom/test_random_statetest299.py
+++ b/tests/ported_static/stRandom/test_random_statetest299.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest299.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest299Filler.json
+state_tests/stRandom/randomStatetest299Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest299Filler.json"],
+    ["state_tests/stRandom/randomStatetest299Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest299(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest299."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,73 +47,65 @@ def test_random_statetest299(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f540813697adf70f20906389d128bf05560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x540813697ADF70F20906389D128BF055
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x8C1998585A7F5C41F6BCAB2BEE57E3E6AB5350B3),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x540813697ADF70F20906389D128BF055,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x8c1998585a7f5c41f6bcab2bee57e3e6ab5350b3"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe6f540813697adf70f20906389d128bf0"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f540813697adf70f20906389d128bf0"  # noqa: E501
         ),
         gas_limit=100000,
-        value=440906036,
+        value=0x1A47B134,
     )
 
     post = {
-        contract: Account(storage={0: 0x540813697ADF70F20906389D128BF055}),
+        target: Account(
+            storage={0: 0x540813697ADF70F20906389D128BF055},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest3.py b/tests/ported_static/stRandom/test_random_statetest3.py
index 88ff0b37219..c29a08bfa7f 100644
--- a/tests/ported_static/stRandom/test_random_statetest3.py
+++ b/tests/ported_static/stRandom/test_random_statetest3.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest3.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest3Filler.json
+state_tests/stRandom/randomStatetest3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest3Filler.json"],
+    ["state_tests/stRandom/randomStatetest3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest3."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,62 +43,51 @@ def test_random_statetest3(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.COINBASE)
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000000000000000000000000000000000000000c3504160005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.COINBASE),
         nonce=0,
-        address=Address("0xa2f0e94715a4d0e22c705690f7cacbf1d4eef1f6"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe427f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c35041"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000000000000000000000000000000000000000c35041"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1588208191,
+        value=0x5EAA223F,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0x4F3F701464972E74606D6EA82D4D3080599A0E79},
-        ),
+        target: Account(storage={0: coinbase}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest30.py b/tests/ported_static/stRandom/test_random_statetest30.py
index adfa76d6d1d..261a71122b7 100644
--- a/tests/ported_static/stRandom/test_random_statetest30.py
+++ b/tests/ported_static/stRandom/test_random_statetest30.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest30.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest30Filler.json
+state_tests/stRandom/randomStatetest30Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest30Filler.json"],
+    ["state_tests/stRandom/randomStatetest30Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest30(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest30."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,45 +43,45 @@ def test_random_statetest30(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x41314155
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=Op.COINBASE, value=Op.BALANCE(address=Op.COINBASE)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7801abe412e60e0e8ecd8c01f4e464732476b1f8"),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
+        ),
+        balance=46,
+        nonce=0,
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={0x4F3F701464972E74606D6EA82D4D3080599A0E79: 46},
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest300.py b/tests/ported_static/stRandom/test_random_statetest300.py
index a233db0892a..66861dbcf29 100644
--- a/tests/ported_static/stRandom/test_random_statetest300.py
+++ b/tests/ported_static/stRandom/test_random_statetest300.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest300.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest300Filler.json
+state_tests/stRandom/randomStatetest300Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest300Filler.json"],
+    ["state_tests/stRandom/randomStatetest300Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest300(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest300."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,159 +43,53 @@ def test_random_statetest300(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PREVRANDAO
-            + Op.PUSH32[0xC350]
-            + Op.PUSH22[0x7F000000000000000000000000000000000000000000]
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.ADD
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.PUSH32[0xC350])
-        ),
+    # Source: raw
+    # 0x7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c350757f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c35060005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PREVRANDAO
+        + Op.PUSH32[0xC350]
+        + Op.PUSH22[0x7F000000000000000000000000000000000000000000]
+        + Op.STOP * 10
+        + Op.ADD
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.PUSH32[0xC350]),
         nonce=0,
-        address=Address("0xc4e0b0ee0ef1c851e1ff17d15c1e0ec5318b2a07"),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000000447f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c350757f000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000017f000000000000"  # noqa: E501
-            "000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000c350"
-        ),
-        gas_limit=100000,
-        value=1430892634,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest300Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest300_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PREVRANDAO
-            + Op.PUSH32[0xC350]
-            + Op.PUSH22[0x7F000000000000000000000000000000000000000000]
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.ADD
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.PUSH32[0xC350])
-        ),
-        nonce=0,
-        address=Address("0xc4e0b0ee0ef1c851e1ff17d15c1e0ec5318b2a07"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000000447f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c350757f000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000017f000000000000"  # noqa: E501
-            "000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000c350"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c350757f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1430892634,
+        value=0x5549B05A,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest301.py b/tests/ported_static/stRandom/test_random_statetest301.py
index 9d528b234b4..c7b65ce2bf7 100644
--- a/tests/ported_static/stRandom/test_random_statetest301.py
+++ b/tests/ported_static/stRandom/test_random_statetest301.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest301.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest301Filler.json
+state_tests/stRandom/randomStatetest301Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest301Filler.json"],
+    ["state_tests/stRandom/randomStatetest301Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest301(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest301."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,77 +46,66 @@ def test_random_statetest301(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.CALLDATACOPY(
-                dest_offset=Op.PUSH32[0x0],
-                offset=Op.PUSH32[0x0],
-                size=Op.PUSH32[0xC350],
-            )
-            + Op.DUP5
-            + Op.SWAP5
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0), value=0x737AA092F1975664518A55
-            )
-        ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000003784946a737aa092f1975664518a5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.CALLDATACOPY(
+            dest_offset=Op.PUSH32[0x0],
+            offset=Op.PUSH32[0x0],
+            size=Op.PUSH32[0xC350],
+        )
+        + Op.DUP5
+        + Op.SWAP5
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x737AA092F1975664518A55),
         nonce=0,
-        address=Address("0x19ceb648fbb686d03a2d42bde75adea15302bc8a"),  # noqa: E501
+        address=Address(0x19CEB648FBB686D03A2D42BDE75ADEA15302BC8A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507f0000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000c3507f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000007f0000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000003784946a737aa092f1975664518a"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000003784946a737aa092f1975664518a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=323025358,
+        value=0x1340F9CE,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 0x737AA092F1975664518A55,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest302.py b/tests/ported_static/stRandom/test_random_statetest302.py
index 8c3ebc0c74a..b1efad7461a 100644
--- a/tests/ported_static/stRandom/test_random_statetest302.py
+++ b/tests/ported_static/stRandom/test_random_statetest302.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest302.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest302Filler.json
+state_tests/stRandom/randomStatetest302Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest302Filler.json"],
+    ["state_tests/stRandom/randomStatetest302Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest302(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest302."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,58 +43,53 @@ def test_random_statetest302(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SWAP8
-            + Op.BYTE
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PREVRANDAO
-            + Op.PUSH32[0x0]
-            + Op.PUSH10[0x89206C0B8A01867BF155]
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000971a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff447f00000000000000000000000000000000000000000000000000000000000000006989206c0b8a01867bf155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SWAP8
+        + Op.BYTE
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PREVRANDAO
+        + Op.PUSH32[0x0]
+        + Op.PUSH10[0x89206C0B8A01867BF155],
         nonce=0,
-        address=Address("0xfcbcba7cba75059c569be5870ca9b87a68da093a"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "000000000000010000000000000000000000000000000000000000971a7f000000000000"  # noqa: E501
-            "000000000000ffffffffffffffffffffffffffffffffffffffff447f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000006989206c0b8a01867bf1"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000971a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff447f00000000000000000000000000000000000000000000000000000000000000006989206c0b8a01867bf1"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2001617020,
+        value=0x774E407C,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest303.py b/tests/ported_static/stRandom/test_random_statetest303.py
index 3851898efe7..cf1d7bebbec 100644
--- a/tests/ported_static/stRandom/test_random_statetest303.py
+++ b/tests/ported_static/stRandom/test_random_statetest303.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest303.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest303Filler.json
+state_tests/stRandom/randomStatetest303Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest303Filler.json"],
+    ["state_tests/stRandom/randomStatetest303Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest303(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest303."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,45 @@ def test_random_statetest303(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff441a35803a0ba46699913755  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e79457f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff441a35803a0ba46699913755"
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79457f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff441a35803a0ba46699913755"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xbdfd7b81900bfd715187bfa71345114f62fb7494"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e79457f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff441a35803a0ba466999137"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79457f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff441a35803a0ba466999137"  # noqa: E501
         ),
         gas_limit=100000,
-        value=931000532,
+        value=0x377DF0D4,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest304.py b/tests/ported_static/stRandom/test_random_statetest304.py
index eab9525a69e..b1e7d637b36 100644
--- a/tests/ported_static/stRandom/test_random_statetest304.py
+++ b/tests/ported_static/stRandom/test_random_statetest304.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest304.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest304Filler.json
+state_tests/stRandom/randomStatetest304Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest304Filler.json"],
+    ["state_tests/stRandom/randomStatetest304Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest304(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest304."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,73 +43,65 @@ def test_random_statetest304(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.LOG2
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.AND
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.CALL,
-                value=Op.SIGNEXTEND(
-                    Op.SMOD(Op.ADDRESS, Op.SLOAD(key=Op.DUP13)),
-                    Op.SIGNEXTEND(
-                        Op.SMOD(
-                            Op.TIMESTAMP,
-                            Op.PUSH32[
-                                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-                            ],
-                        ),
+    # Source: raw
+    # 0x7f0000000000000000000000010000000000000000000000000000000000000000a27f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff167ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff42070b8c5430070bf15560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.LOG2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.AND
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.CALL,
+            value=Op.SIGNEXTEND(
+                Op.SMOD(Op.ADDRESS, Op.SLOAD(key=Op.DUP13)),
+                Op.SIGNEXTEND(
+                    Op.SMOD(
+                        Op.TIMESTAMP,
                         Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
                     ),
+                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
                 ),
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+            ),
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
+        nonce=0,
+    )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xeed16ab98d10ee33a19828f9fd044b86553a6f06"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000010000000000000000000000000000000000000000a27f00"  # noqa: E501
-            "0000000000000000000000ffffffffffffffffffffffffffffffffffffffff167fffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000"  # noqa: E501
-            "00000000000100000000000000000000000000000000000000007f000000000000000000"  # noqa: E501
-            "000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff42070b8c5430070bf1"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000010000000000000000000000000000000000000000a27f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff167ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff42070b8c5430070bf1"  # noqa: E501
         ),
         gas_limit=100000,
-        value=691881103,
+        value=0x293D448F,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest305.py b/tests/ported_static/stRandom/test_random_statetest305.py
index 2db5e739200..d9093d48f46 100644
--- a/tests/ported_static/stRandom/test_random_statetest305.py
+++ b/tests/ported_static/stRandom/test_random_statetest305.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest305.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest305Filler.json
+state_tests/stRandom/randomStatetest305Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest305Filler.json"],
+    ["state_tests/stRandom/randomStatetest305Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest305(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest305."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,59 @@ def test_random_statetest305(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x606E048240069C409313318736200B55,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000006f606e048240069c409313318736200b5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x606E048240069C409313318736200B55
         ),
         nonce=0,
-        address=Address("0xb84cace13bd713234f804bd202ef20ec6360c36c"),  # noqa: E501
+        address=Address(0xB84CACE13BD713234F804BD202EF20EC6360C36C),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464"  # noqa: E501
-            "972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000006f606e048240069c409313318736200b"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000006f606e048240069c409313318736200b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=218159006,
+        value=0xD00D79E,
     )
 
     post = {
-        contract: Account(storage={0: 0x606E048240069C409313318736200B55}),
+        target: Account(
+            storage={0: 0x606E048240069C409313318736200B55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest306.py b/tests/ported_static/stRandom/test_random_statetest306.py
index 624147c7dfe..17f34a3a28f 100644
--- a/tests/ported_static/stRandom/test_random_statetest306.py
+++ b/tests/ported_static/stRandom/test_random_statetest306.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest306.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest306Filler.json
+state_tests/stRandom/randomStatetest306Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest306Filler.json"],
+    ["state_tests/stRandom/randomStatetest306Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest306(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest306."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,146 +44,112 @@ def test_random_statetest306(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SIGNEXTEND(0x84517B3285B0867CD4144FF5F688D6, 0xD3)
-            + Op.LOG3(
-                offset=0x7DF7,
-                size=0x19,
-                topic_1=0xD169CDA4FC3C11E9A6F0B4CEC2F5,
-                topic_2=0x78C9FA9E4B5E5DB5A4B6AC4CED,
-                topic_3=0x7592395D95E37246C0673,
-            )
-            + Op.SGT(0x412582D556F06C6D5864CF4BE6A2D1318B8E40BA, 0x788C1554)
-            + Op.SDIV(
-                0x2B9D3E28F05FAF2587C4465094,
-                0x454CC8D0510823591DEE680D7DDDC8C149BFCC24C65C69E6,
-            )
-            + Op.SGT(
-                0x71A29FBE89F77C340DCBD7D67AEDF852,
-                0x9901EC0946BF3D786827225FAF5DA81E158CD9B2B466,
-            )
-            + Op.PUSH12[0x6C76AFFB38BEB802E0AF269E]
-            + Op.PUSH6[0xC22F52807C67]
-            + Op.PUSH28[
-                0x5E2C7D8C473AFF18FE912C7ED21AB60FE5D4916A76C93539332C6AB1
-            ]
-            + Op.PUSH12[0x3F81B990F4B34B0228C7F5B1]
-            + Op.PUSH6[0x6BDD21D45871]
-            + Op.PUSH20[0x30E4BE7D7BB91CC95818140EEF086CD82D2D6F0D]
-            + Op.PUSH7[0xC92A7FFB27125A]
-            + Op.PUSH3[0x5C77A8]
-            + Op.SWAP7
-            + Op.SDIV(
-                0x2460EC0DCB4BA3B84A4DB899C29F08EF1B0F506B4F3C,
-                0x68F212339508D6F60D9C93A9E201F2AE883CB9,
-            )
-            + Op.CALL(
-                gas=0xA4EB375,
-                address=0xCE8D3E84F685B2EED55366547289AC4D314DE277,
-                value=0x28B0EB5F,
-                args_offset=0x11,
-                args_size=0x10,
-                ret_offset=0x1,
-                ret_size=0x1F,
-            )
-            + Op.PUSH30[
-                0xF238E15D7D51240301521F173D628E7A68D01354FAAF406CE541F753DB89
-            ]
-            + Op.PUSH8[0x1F6AEDCF261F632E]
-            + Op.PUSH3[0x44E8C3]
-            + Op.PUSH26[0x9A2DE002F15BA4681FD3C609C0F522DFD964F95DEF9926F81232]
-            + Op.PUSH24[0x81B2DE33196CC22776E9B26D8A0D65C57BDAC987D0B3E0DB]
-            + Op.PUSH7[0xC0F1232C7ADD33]
-            + Op.PUSH6[0xF209CC53592F]
-            + Op.PUSH20[0x502D0C5889B1BBF131F8BB6A6B5E2E067B9EF676]
-            + Op.PUSH23[0x8D48B3F5790C3304E046F0A9C8A838A0596583D6258F19]
-            + Op.PUSH14[0xCF982A9DE5CEC4F871470E7A6C92]
-            + Op.DUP10
-            + Op.PUSH2[0x5E1E]
-            + Op.PUSH30[
-                0x140FDC038972916223FB8012E29350295F3919CB28A36411845930D5E91B
-            ]
-            + Op.PUSH9[0x510FAAC5E067795346]
-            + Op.PUSH29[
-                0xEDB653F73818749E8CBAF15A5D64BA7EE5CABC98137167B924A2AAC914
-            ]
-            + Op.PUSH32[
-                0x159713D115E0225A84A54D6471DC7A01A7E4E814145305C9D04D2880C5BE42FC  # noqa: E501
-            ]
-            + Op.PUSH13[0x52CED3E983D91A580A4142021B]
-            + Op.PUSH20[0xE99C3180117914B9AD03C580A8DAC862BE9B599A]
-            + Op.PUSH20[0xCCFCFB230BCFFC425C13C265F3B06B8C9F104C10]
-            + Op.PUSH22[0x2740765567374C211601A5F51501D18C48081998FF7B]
-            + Op.PUSH27[
-                0x8BFDF0BEC9EB4385B554870A996E0CAB662D991D0E5F9357F2F99F
-            ]
-            + Op.SWAP9
-        ),
+    # Source: raw
+    # 0x60d36e84517b3285b0867cd4144ff5f688d60b6a07592395d95e37246c06736c78c9fa9e4b5e5db5a4b6ac4ced6dd169cda4fc3c11e9a6f0b4cec2f56019617df7a363788c155473412582d556f06c6d5864cf4be6a2d1318b8e40ba1377454cc8d0510823591dee680d7dddc8c149bfcc24c65c69e66c2b9d3e28f05faf2587c446509405759901ec0946bf3d786827225faf5da81e158cd9b2b4666f71a29fbe89f77c340dcbd7d67aedf852136b6c76affb38beb802e0af269e65c22f52807c677b5e2c7d8c473aff18fe912c7ed21ab60fe5d4916a76c93539332c6ab16b3f81b990f4b34b0228c7f5b1656bdd21d458717330e4be7d7bb91cc95818140eef086cd82d2d6f0d66c92a7ffb27125a625c77a8967268f212339508d6f60d9c93a9e201f2ae883cb9752460ec0dcb4ba3b84a4db899c29f08ef1b0f506b4f3c05601f6001601060116328b0eb5f73<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>630a4eb375f17df238e15d7d51240301521f173d628e7a68d01354faaf406ce541f753db89671f6aedcf261f632e6244e8c3799a2de002f15ba4681fd3c609c0f522dfd964f95def9926f812327781b2de33196cc22776e9b26d8a0d65c57bdac987d0b3e0db66c0f1232c7add3365f209cc53592f73502d0c5889b1bbf131f8bb6a6b5e2e067b9ef676768d48b3f5790c3304e046f0a9c8a838a0596583d6258f196dcf982a9de5cec4f871470e7a6c9289615e1e7d140fdc038972916223fb8012e29350295f3919cb28a36411845930d5e91b68510faac5e0677953467cedb653f73818749e8cbaf15a5d64ba7ee5cabc98137167b924a2aac9147f159713d115e0225a84a54d6471dc7a01a7e4e814145305c9d04d2880c5be42fc6c52ced3e983d91a580a4142021b73e99c3180117914b9ad03c580a8dac862be9b599a73ccfcfb230bcffc425c13c265f3b06b8c9f104c10752740765567374c211601a5f51501d18c48081998ff7b7a8bfdf0bec9eb4385b554870a996e0cab662d991d0e5f9357f2f99f98  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SIGNEXTEND(0x84517B3285B0867CD4144FF5F688D6, 0xD3)
+        + Op.LOG3(
+            offset=0x7DF7,
+            size=0x19,
+            topic_1=0xD169CDA4FC3C11E9A6F0B4CEC2F5,
+            topic_2=0x78C9FA9E4B5E5DB5A4B6AC4CED,
+            topic_3=0x7592395D95E37246C0673,
+        )
+        + Op.SGT(0x412582D556F06C6D5864CF4BE6A2D1318B8E40BA, 0x788C1554)
+        + Op.SDIV(
+            0x2B9D3E28F05FAF2587C4465094,
+            0x454CC8D0510823591DEE680D7DDDC8C149BFCC24C65C69E6,
+        )
+        + Op.SGT(
+            0x71A29FBE89F77C340DCBD7D67AEDF852,
+            0x9901EC0946BF3D786827225FAF5DA81E158CD9B2B466,
+        )
+        + Op.PUSH12[0x6C76AFFB38BEB802E0AF269E]
+        + Op.PUSH6[0xC22F52807C67]
+        + Op.PUSH28[0x5E2C7D8C473AFF18FE912C7ED21AB60FE5D4916A76C93539332C6AB1]
+        + Op.PUSH12[0x3F81B990F4B34B0228C7F5B1]
+        + Op.PUSH6[0x6BDD21D45871]
+        + Op.PUSH20[0x30E4BE7D7BB91CC95818140EEF086CD82D2D6F0D]
+        + Op.PUSH7[0xC92A7FFB27125A]
+        + Op.PUSH3[0x5C77A8]
+        + Op.SWAP7
+        + Op.SDIV(
+            0x2460EC0DCB4BA3B84A4DB899C29F08EF1B0F506B4F3C,
+            0x68F212339508D6F60D9C93A9E201F2AE883CB9,
+        )
+        + Op.CALL(
+            gas=0xA4EB375,
+            address=0xCE8D3E84F685B2EED55366547289AC4D314DE277,
+            value=0x28B0EB5F,
+            args_offset=0x11,
+            args_size=0x10,
+            ret_offset=0x1,
+            ret_size=0x1F,
+        )
+        + Op.PUSH30[
+            0xF238E15D7D51240301521F173D628E7A68D01354FAAF406CE541F753DB89
+        ]
+        + Op.PUSH8[0x1F6AEDCF261F632E]
+        + Op.PUSH3[0x44E8C3]
+        + Op.PUSH26[0x9A2DE002F15BA4681FD3C609C0F522DFD964F95DEF9926F81232]
+        + Op.PUSH24[0x81B2DE33196CC22776E9B26D8A0D65C57BDAC987D0B3E0DB]
+        + Op.PUSH7[0xC0F1232C7ADD33]
+        + Op.PUSH6[0xF209CC53592F]
+        + Op.PUSH20[0x502D0C5889B1BBF131F8BB6A6B5E2E067B9EF676]
+        + Op.PUSH23[0x8D48B3F5790C3304E046F0A9C8A838A0596583D6258F19]
+        + Op.PUSH14[0xCF982A9DE5CEC4F871470E7A6C92]
+        + Op.DUP10
+        + Op.PUSH2[0x5E1E]
+        + Op.PUSH30[
+            0x140FDC038972916223FB8012E29350295F3919CB28A36411845930D5E91B
+        ]
+        + Op.PUSH9[0x510FAAC5E067795346]
+        + Op.PUSH29[
+            0xEDB653F73818749E8CBAF15A5D64BA7EE5CABC98137167B924A2AAC914
+        ]
+        + Op.PUSH32[
+            0x159713D115E0225A84A54D6471DC7A01A7E4E814145305C9D04D2880C5BE42FC
+        ]
+        + Op.PUSH13[0x52CED3E983D91A580A4142021B]
+        + Op.PUSH20[0xE99C3180117914B9AD03C580A8DAC862BE9B599A]
+        + Op.PUSH20[0xCCFCFB230BCFFC425C13C265F3B06B8C9F104C10]
+        + Op.PUSH22[0x2740765567374C211601A5F51501D18C48081998FF7B]
+        + Op.PUSH27[0x8BFDF0BEC9EB4385B554870A996E0CAB662D991D0E5F9357F2F99F]
+        + Op.SWAP9,
         nonce=0,
-        address=Address("0xce8d3e84f685b2eed55366547289ac4d314de277"),  # noqa: E501
+        address=Address(0xCE8D3E84F685B2EED55366547289AC4D314DE277),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "79f7441ed5bec692c84f9c7783152d38908fea76de8a06eca5ebcf7e81423a68b78d5f1a"  # noqa: E501
-            "84706bdb516f17a29dd779ee16374163c1ab2a85a2097e7b6235aecf7cc509b9d184688f"  # noqa: E501
-            "56ccfe8638c51ee70858f690e71b338261fd2b72db56f2a0923a6d1bc51dd15ff9aae183"  # noqa: E501
-            "48213d68fc8e120c307a7490f46b2d528d86e503a251fd188764646dd3b8bc3c7066a32d"  # noqa: E501
-            "caa91da430f61aed0466338f17d9703f1c8648d0b19db4fcdcd0893f0f6f21c789306b8f"  # noqa: E501
-            "8d110fbd563111fd088de367b9f001758786ced578880bb55e224855b0293f9277dc7201"  # noqa: E501
-            "e63845a8d8eae7dc8e3e642820b61315716544e2fd297f018fe1df86427052e3a85c0c77"  # noqa: E501
-            "48f6fa89b890be2a3b916794ecfff1e87a87582c991b0c61687637866981d0819020714f"  # noqa: E501
-            "baee296a9ac19ac255226d4d2cf967104b669a622e77fc4c7469aee1553e5cf5cb2a7972"  # noqa: E501
-            "6f07829adfa8a988fb07479add89c1a8947d88a9b361493025a66fd49776d7304a036894"  # noqa: E501
-            "ecda2e148f7f87270cdd52727667c09ee625c7a37ac99ab8a195cd0a97fa9e7247f9d0f1"  # noqa: E501
-            "7888132eb3f44d24d3d49c0a2e6d4850ee413c36893d04dfa9826f7236a10c77f7da3d31"  # noqa: E501
-            "db8eae3070972c9d722347d4a95604d40ba66a2f53710451be8f1994756471ba4d09257f"  # noqa: E501
-            "6abe619cc850f123d4715bacc2b9cf167be82e629cf36521b290bab47b9597664c0890a5"  # noqa: E501
-            "d6242211d344805a3d75460c21ca9ad05dec187ddecc44c9b1c0b4c0d34c66926db22974"  # noqa: E501
-            "c0bc059a6aa6354a43bf26f06e7dfa7f0e07f4f3607a8bc1227b7f0d65d660aa3c1eb773"  # noqa: E501
-            "1850729f5dc3285b398806dd4b54aecbe7cb367573a1aa8f062b33e27db1e2fdef478ac3"  # noqa: E501
-            "06ec57be3b6b0fd0fbbe558507ead60ce60a61eade67afdd8ba512300ecc686d51131057"  # noqa: E501
-            "8908f49660d163e372ddd2636dbf1c1b6d39292b97dbd48fee420c354d341365e64505ae"  # noqa: E501
-            "ffc89b6e764afc7f97200924ff8d68846e387f6bca4c4ea3f4e04ac8061efd5260577aa6"  # noqa: E501
-            "9c34a7287609d2448bb32d2687a46d54c893ba21520ec26e792c836ebb8c9c1005ab55d9"  # noqa: E501
-            "9c62150413fb7a7f8e2ec4766471e2452ee833fa10995e94d2c1cf89c64260836aab9b3c"  # noqa: E501
-            "6a1f699776b5900f48b7c1f97dba13656a85fea0cc2d4fe85aa7a9766d767cfd6a3314ac"  # noqa: E501
-            "c32eea93e15c3077fa26a3917a48af0765b5690af372219af6c2e7e5b194e6db7f76ca0b"  # noqa: E501
-            "28647c5066bfbf142ac3eb1361b77953e328106b1e817e8649a9bdf4f27834bd25279dc2"  # noqa: E501
-            "b7a6fab4d4e4830602f84d298f5d2682183a226118fc6c452c99ead827293548afcfeaf9"  # noqa: E501
-            "655e76240e57846151bb7b1c1cc5971f0ad83dc7b02c05c2bc0a3adeb65bf608eb5c0aaf"  # noqa: E501
-            "186a887a4357e31bdd83940e443289727a6e36bfc974bc20e97fa8983f18137be520500b"  # noqa: E501
-            "388fe2f63185c5c66bcc71a48c7fc9c210f73a4a73c4561f62adb5ed9d7ae9a0e4833f19"  # noqa: E501
-            "8dd3faa1af3ad59c282f3277fac135659e7eb7c9926fd5e954f6f42a9cd2cb6498da0767"  # noqa: E501
-            "958716"
+        to=target,
+        data=Bytes(
+            "79f7441ed5bec692c84f9c7783152d38908fea76de8a06eca5ebcf7e81423a68b78d5f1a84706bdb516f17a29dd779ee16374163c1ab2a85a2097e7b6235aecf7cc509b9d184688f56ccfe8638c51ee70858f690e71b338261fd2b72db56f2a0923a6d1bc51dd15ff9aae18348213d68fc8e120c307a7490f46b2d528d86e503a251fd188764646dd3b8bc3c7066a32dcaa91da430f61aed0466338f17d9703f1c8648d0b19db4fcdcd0893f0f6f21c789306b8f8d110fbd563111fd088de367b9f001758786ced578880bb55e224855b0293f9277dc7201e63845a8d8eae7dc8e3e642820b61315716544e2fd297f018fe1df86427052e3a85c0c7748f6fa89b890be2a3b916794ecfff1e87a87582c991b0c61687637866981d0819020714fbaee296a9ac19ac255226d4d2cf967104b669a622e77fc4c7469aee1553e5cf5cb2a79726f07829adfa8a988fb07479add89c1a8947d88a9b361493025a66fd49776d7304a036894ecda2e148f7f87270cdd52727667c09ee625c7a37ac99ab8a195cd0a97fa9e7247f9d0f17888132eb3f44d24d3d49c0a2e6d4850ee413c36893d04dfa9826f7236a10c77f7da3d31db8eae3070972c9d722347d4a95604d40ba66a2f53710451be8f1994756471ba4d09257f6abe619cc850f123d4715bacc2b9cf167be82e629cf36521b290bab47b9597664c0890a5d6242211d344805a3d75460c21ca9ad05dec187ddecc44c9b1c0b4c0d34c66926db22974c0bc059a6aa6354a43bf26f06e7dfa7f0e07f4f3607a8bc1227b7f0d65d660aa3c1eb7731850729f5dc3285b398806dd4b54aecbe7cb367573a1aa8f062b33e27db1e2fdef478ac306ec57be3b6b0fd0fbbe558507ead60ce60a61eade67afdd8ba512300ecc686d511310578908f49660d163e372ddd2636dbf1c1b6d39292b97dbd48fee420c354d341365e64505aeffc89b6e764afc7f97200924ff8d68846e387f6bca4c4ea3f4e04ac8061efd5260577aa69c34a7287609d2448bb32d2687a46d54c893ba21520ec26e792c836ebb8c9c1005ab55d99c62150413fb7a7f8e2ec4766471e2452ee833fa10995e94d2c1cf89c64260836aab9b3c6a1f699776b5900f48b7c1f97dba13656a85fea0cc2d4fe85aa7a9766d767cfd6a3314acc32eea93e15c3077fa26a3917a48af0765b5690af372219af6c2e7e5b194e6db7f76ca0b28647c5066bfbf142ac3eb1361b77953e328106b1e817e8649a9bdf4f27834bd25279dc2b7a6fab4d4e4830602f84d298f5d2682183a226118fc6c452c99ead827293548afcfeaf9655e76240e57846151bb7b1c1cc5971f0ad83dc7b02c05c2bc0a3adeb65bf608eb5c0aaf186a887a4357e31bdd83940e443289727a6e36bfc974bc20e97fa8983f18137be520500b388fe2f63185c5c66bcc71a48c7fc9c210f73a4a73c4561f62adb5ed9d7ae9a0e4833f198dd3faa1af3ad59c282f3277fac135659e7eb7c9926fd5e954f6f42a9cd2cb6498da0767958716"  # noqa: E501
         ),
         gas_limit=1970726856,
-        value=1525687154,
+        value=0x5AF02372,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest307.py b/tests/ported_static/stRandom/test_random_statetest307.py
index f489a92651a..b2a8f51c93f 100644
--- a/tests/ported_static/stRandom/test_random_statetest307.py
+++ b/tests/ported_static/stRandom/test_random_statetest307.py
@@ -1,19 +1,20 @@
 """
-Test ported from static filler.
+Test_random_statetest307.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest307Filler.json
+state_tests/stRandom/randomStatetest307Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest307Filler.json"],
+    ["state_tests/stRandom/randomStatetest307Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +31,10 @@ def test_random_statetest307(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_random_statetest307."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,62 +45,63 @@ def test_random_statetest307(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.PUSH32[0xC350]
-            + Op.SLOAD(
-                key=Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            )
-            + Op.PUSH32[0xC350]
-            + Op.CALLDATACOPY(
-                dest_offset=Op.PUSH32[0x0],
-                offset=Op.PUSH32[0x0],
-                size=Op.PUSH32[0xC350],
-            )
-            + Op.CREATE
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5547f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000037f055  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.PUSH32[0xC350]
+        + Op.SLOAD(key=Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5])
+        + Op.PUSH32[0xC350]
+        + Op.CALLDATACOPY(
+            dest_offset=Op.PUSH32[0x0],
+            offset=Op.PUSH32[0x0],
+            size=Op.PUSH32[0xC350],
+        )
+        + Op.CREATE
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000945304eb96065b2a98b57a48a06ae28d285a71b5547f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000007f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000037f0"
+        to=contract_0,
+        data=Bytes(
+            "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5547f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000037f0"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1254784781,
+        value=0x4ACA7F0D,
     )
 
-    post: dict = {}
+    post = {
+        contract_0: Account(storage={}, nonce=0),
+        compute_create_address(
+            address=compute_create_address(address=contract_0, nonce=0),
+            nonce=0,
+        ): Account.NONEXISTENT,
+        compute_create_address(
+            address=compute_create_address(address=contract_0, nonce=0),
+            nonce=1,
+        ): Account.NONEXISTENT,
+        coinbase: Account(storage={}, nonce=0),
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest308.py b/tests/ported_static/stRandom/test_random_statetest308.py
index c0bc7ea2a32..9dde60983e7 100644
--- a/tests/ported_static/stRandom/test_random_statetest308.py
+++ b/tests/ported_static/stRandom/test_random_statetest308.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest308.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest308Filler.json
+state_tests/stRandom/randomStatetest308Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest308Filler.json"],
+    ["state_tests/stRandom/randomStatetest308Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,8 +32,9 @@ def test_random_statetest308(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest308."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -46,75 +48,68 @@ def test_random_statetest308(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.CALLDATALOAD(
-                offset=Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
-            )
-            + Op.SSTORE(
-                key=0x30F38C9A600051,
-                value=Op.MULMOD(
-                    Op.ADD(
-                        Op.GAS,
-                        Op.ADDMOD(
-                            Op.PUSH32[
-                                0x10000000000000000000000000000000000000000
-                            ],
-                            Op.PUSH32[0xC350],
-                            Op.TIMESTAMP,
-                        ),
-                    ),
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                ),
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5357f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000085a01096630f38c9a60005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.CALLDATALOAD(
+            offset=Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        )
+        + Op.SSTORE(
+            key=0x30F38C9A600051,
+            value=Op.MULMOD(
+                Op.ADD(
+                    Op.GAS,
+                    Op.ADDMOD(
+                        Op.PUSH32[0x10000000000000000000000000000000000000000],
+                        Op.PUSH32[0xC350],
+                        Op.TIMESTAMP,
+                    ),
+                ),
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000"  # noqa: E501
-            "00000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5357f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000c3507f000000000000000000000001"  # noqa: E501
-            "0000000000000000000000000000000000000000085a01096630f38c9a"
+        to=contract_0,
+        data=Bytes(
+            "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5357f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000085a01096630f38c9a"  # noqa: E501
         ),
         gas_limit=1559407972,
-        value=23682877,
+        value=0x1695F3D,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0x30F38C9A600051: 0x5CF25686FFFFFFFFFFFFFFFF461B52F2,
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest309.py b/tests/ported_static/stRandom/test_random_statetest309.py
index 446963cbca7..114d8e3352a 100644
--- a/tests/ported_static/stRandom/test_random_statetest309.py
+++ b/tests/ported_static/stRandom/test_random_statetest309.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest309.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest309Filler.json
+state_tests/stRandom/randomStatetest309Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest309Filler.json"],
+    ["state_tests/stRandom/randomStatetest309Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest309(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest309."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,47 +43,45 @@ def test_random_statetest309(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x43454545085a55
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.NUMBER
+        + Op.SSTORE(
+            key=Op.GAS, value=Op.ADDMOD(Op.GASLIMIT, Op.GASLIMIT, Op.GASLIMIT)
         ),
-        balance=46,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.NUMBER
-            + Op.SSTORE(
-                key=Op.GAS,
-                value=Op.ADDMOD(Op.GASLIMIT, Op.GASLIMIT, Op.GASLIMIT),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=46,
         nonce=0,
-        address=Address("0x80f26bf6ea7e69c54687beb66d90438e7f0286b4"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest31.py b/tests/ported_static/stRandom/test_random_statetest31.py
index 0469158b4cf..0e99e6b5a26 100644
--- a/tests/ported_static/stRandom/test_random_statetest31.py
+++ b/tests/ported_static/stRandom/test_random_statetest31.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest31.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest31Filler.json
+state_tests/stRandom/randomStatetest31Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest31Filler.json"],
+    ["state_tests/stRandom/randomStatetest31Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest31(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest31."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,69 +43,59 @@ def test_random_statetest31(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x387f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000090375560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CODESIZE
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xC350] * 2
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0] * 2
+        + Op.SWAP1
+        + Op.CALLDATACOPY
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CODESIZE
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x0]
-            + Op.SWAP1
-            + Op.CALLDATACOPY
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xf96aa31000bb2a6b92f34b6a9f626a5da00bf714"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "387f00000000000000000000000100000000000000000000000000000000000000007f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3507f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c3507f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000007f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000009037"
+        to=target,
+        data=Bytes(
+            "387f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000009037"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1344810912,
+        value=0x50282FA0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x10000000000000000000000000000000000000000: 50000,
                 0x387F000000000000000000000001000000000000000000000000000000000000: 50000,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest310.py b/tests/ported_static/stRandom/test_random_statetest310.py
index 151fd0bb649..86dfb9f61bc 100644
--- a/tests/ported_static/stRandom/test_random_statetest310.py
+++ b/tests/ported_static/stRandom/test_random_statetest310.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest310.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest310Filler.json
+state_tests/stRandom/randomStatetest310Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest310Filler.json"],
+    ["state_tests/stRandom/randomStatetest310Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest310(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest310."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,71 +47,65 @@ def test_random_statetest310(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x44587fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff59907fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1a37160b6a650645597c796e9c97955560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PREVRANDAO
+        + Op.PC
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.BYTE
+        + Op.CALLDATACOPY
+        + Op.AND
+        + Op.SIGNEXTEND
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x650645597C796E9C979555),
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x6ABA73F1D891C72C1B5730AC84067C1286BA693B),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PREVRANDAO
-            + Op.PC
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.BYTE
-            + Op.CALLDATACOPY
-            + Op.AND
-            + Op.SIGNEXTEND
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0), value=0x650645597C796E9C979555
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x6aba73f1d891c72c1b5730ac84067c1286ba693b"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "44587fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000c3507f000000"  # noqa: E501
-            "000000000000000000ffffffffffffffffffffffffffffffffffffffff59907fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff1a37160b6a650645"  # noqa: E501
-            "597c796e9c9795"
+        to=target,
+        data=Bytes(
+            "44587fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff59907fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1a37160b6a650645597c796e9c9795"  # noqa: E501
         ),
         gas_limit=100000,
-        value=460778909,
+        value=0x1B76ED9D,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x44587FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 0x650645597C796E9C979555,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest311.py b/tests/ported_static/stRandom/test_random_statetest311.py
index 1ccdead55f2..e4a48c3787b 100644
--- a/tests/ported_static/stRandom/test_random_statetest311.py
+++ b/tests/ported_static/stRandom/test_random_statetest311.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest311.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest311Filler.json
+state_tests/stRandom/randomStatetest311Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest311Filler.json"],
+    ["state_tests/stRandom/randomStatetest311Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest311(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest311."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,62 +47,58 @@ def test_random_statetest311(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PREVRANDAO
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x13971264A1197D72FF18971902387B55,
-            )
+    # Source: raw
+    # 0x447f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f13971264a1197d72ff18971902387b5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PREVRANDAO
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x13971264A1197D72FF18971902387B55
         ),
         nonce=0,
-        address=Address("0xcf4f4827d44bfacb993f9ef6499444f992a60e2e"),  # noqa: E501
+        address=Address(0xCF4F4827D44BFACB993F9EF6499444F992A60E2E),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "447f00000000000000000000000000000000000000000000000000000000000000007f00"  # noqa: E501
-            "00000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000007f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3506f13971264a1197d72ff18971902387b"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "447f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f13971264a1197d72ff18971902387b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=97322261,
+        value=0x5CD0515,
     )
 
     post = {
-        contract: Account(storage={0: 0x13971264A1197D72FF18971902387B55}),
+        target: Account(
+            storage={0: 0x13971264A1197D72FF18971902387B55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest312.py b/tests/ported_static/stRandom/test_random_statetest312.py
index 23843f822cb..7b559d0f92a 100644
--- a/tests/ported_static/stRandom/test_random_statetest312.py
+++ b/tests/ported_static/stRandom/test_random_statetest312.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest312.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest312Filler.json
+state_tests/stRandom/randomStatetest312Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,97 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest312Filler.json"],
+    ["state_tests/stRandom/randomStatetest312Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest312(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff427f00000000000000000000"  # noqa: E501
-            "00004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000187b55"
-        ),
-        nonce=0,
-        address=Address("0xa7a903566abeab1b0a9eb4f54909e6b00848a2a6"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff427f00000000000000000000"  # noqa: E501
-            "00004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000187b"
-        ),
-        gas_limit=100000,
-        value=992438124,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest312Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest312_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest312."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -123,54 +43,45 @@ def test_random_statetest312_from_prague(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f0000000000000000000000000000000000000000000000000000000000000000187b55  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff427f00000000000000000000"  # noqa: E501
-            "00004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000187b55"
+            "7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000000000000000000000000000000000187b55"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xa7a903566abeab1b0a9eb4f54909e6b00848a2a6"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff427f00000000000000000000"  # noqa: E501
-            "00004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000187b"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000000000000000000000000000000000187b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=992438124,
+        value=0x3B27676C,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest313.py b/tests/ported_static/stRandom/test_random_statetest313.py
index 538cd9ddc13..ae122af2e4b 100644
--- a/tests/ported_static/stRandom/test_random_statetest313.py
+++ b/tests/ported_static/stRandom/test_random_statetest313.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest313.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest313Filler.json
+state_tests/stRandom/randomStatetest313Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest313Filler.json"],
+    ["state_tests/stRandom/randomStatetest313Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest313(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest313."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,62 +43,57 @@ def test_random_statetest313(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x0b7f00000000000000000000000000000000000000000000000000000000000000013c7f000000000000000000000000000000000000000000000000000000000000c350a345457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8287a3208c8c5a60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SIGNEXTEND
+        + Op.PUSH32[0x1]
+        + Op.EXTCODECOPY
+        + Op.PUSH32[0xC350]
+        + Op.LOG3
+        + Op.LOG3(
+            offset=Op.DUP8,
+            size=Op.DUP3,
+            topic_1=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            topic_2=Op.GASLIMIT,
+            topic_3=Op.GASLIMIT,
+        )
+        + Op.SHA3
+        + Op.DUP13 * 2
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.GAS),
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SIGNEXTEND
-            + Op.PUSH32[0x1]
-            + Op.EXTCODECOPY
-            + Op.PUSH32[0xC350]
-            + Op.LOG3
-            + Op.LOG3(
-                offset=Op.DUP8,
-                size=Op.DUP3,
-                topic_1=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                topic_2=Op.GASLIMIT,
-                topic_3=Op.GASLIMIT,
-            )
-            + Op.SHA3
-            + Op.DUP13
-            + Op.DUP13
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.GAS)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x9f0b64fb000394e77826ea5ee94fe9cf30284bf2"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "0b7f00000000000000000000000000000000000000000000000000000000000000013c7f"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000c350a345457f"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8287a320"  # noqa: E501
-            "8c8c5a"
+        to=target,
+        data=Bytes(
+            "0b7f00000000000000000000000000000000000000000000000000000000000000013c7f000000000000000000000000000000000000000000000000000000000000c350a345457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8287a3208c8c5a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=827973881,
+        value=0x3159E0F9,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest315.py b/tests/ported_static/stRandom/test_random_statetest315.py
index 45397cbeff3..0c49be25102 100644
--- a/tests/ported_static/stRandom/test_random_statetest315.py
+++ b/tests/ported_static/stRandom/test_random_statetest315.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest315.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest315Filler.json
+state_tests/stRandom/randomStatetest315Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest315Filler.json"],
+    ["state_tests/stRandom/randomStatetest315Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest315(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest315."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,64 @@ def test_random_statetest315(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.MOD(
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-            )
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x98516A388683755669892B8B37195755,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f98516a388683755669892b8b3719575560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.MOD(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+        )
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x98516A388683755669892B8B37195755
         ),
         nonce=0,
-        address=Address("0xbe5726dd998ff7f8a8acdc8172db5c692c934199"),  # noqa: E501
+        address=Address(0xBE5726DD998FF7F8A8ACDC8172DB5C692C934199),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff067f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe6f98516a388683755669892b8b371957"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f98516a388683755669892b8b371957"  # noqa: E501
         ),
         gas_limit=100000,
-        value=332964958,
+        value=0x13D8A45E,
     )
 
     post = {
-        contract: Account(storage={0: 0x98516A388683755669892B8B37195755}),
+        target: Account(
+            storage={0: 0x98516A388683755669892B8B37195755},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest316.py b/tests/ported_static/stRandom/test_random_statetest316.py
index 9a4e0bf8c4f..efa655732af 100644
--- a/tests/ported_static/stRandom/test_random_statetest316.py
+++ b/tests/ported_static/stRandom/test_random_statetest316.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest316.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest316Filler.json
+state_tests/stRandom/randomStatetest316Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest316Filler.json"],
+    ["state_tests/stRandom/randomStatetest316Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest316(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest316."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,72 +43,63 @@ def test_random_statetest316(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0855  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.ADDMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+            value=Op.PUSH32[0x1],
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.ADDMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-                value=Op.PUSH32[0x1],
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xce903785f0831bd0d5e00a4629399383ef7ed516"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe08"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08"  # noqa: E501
         ),
         gas_limit=100000,
-        value=973933687,
+        value=0x3A0D0C77,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE: 1,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest318.py b/tests/ported_static/stRandom/test_random_statetest318.py
index 1a24a4b5197..4dbe1f506c2 100644
--- a/tests/ported_static/stRandom/test_random_statetest318.py
+++ b/tests/ported_static/stRandom/test_random_statetest318.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest318.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest318Filler.json
+state_tests/stRandom/randomStatetest318Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest318Filler.json"],
+    ["state_tests/stRandom/randomStatetest318Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest318(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest318."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,68 +47,61 @@ def test_random_statetest318(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.GASLIMIT
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x8206A30A83887E5A3164667796308D55,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506f8206a30a83887e5a3164667796308d5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350]
+        + Op.GASLIMIT
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x8206A30A83887E5A3164667796308D55
         ),
         nonce=0,
-        address=Address("0x93c49734a285572e734bba592627bbf22815f95f"),  # noqa: E501
+        address=Address(0x93C49734A285572E734BBA592627BBF22815F95F),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c350457f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000c3506f8206a30a83887e5a3164667796308d"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350457f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506f8206a30a83887e5a3164667796308d"  # noqa: E501
         ),
         gas_limit=100000,
-        value=603571959,
+        value=0x23F9C6F7,
     )
 
     post = {
-        contract: Account(storage={0: 0x8206A30A83887E5A3164667796308D55}),
+        target: Account(
+            storage={0: 0x8206A30A83887E5A3164667796308D55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest320.py b/tests/ported_static/stRandom/test_random_statetest320.py
index 485d90cffcc..7e08ad0c477 100644
--- a/tests/ported_static/stRandom/test_random_statetest320.py
+++ b/tests/ported_static/stRandom/test_random_statetest320.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest320.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest320Filler.json
+state_tests/stRandom/randomStatetest320Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest320Filler.json"],
+    ["state_tests/stRandom/randomStatetest320Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest320(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest320."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,45 @@ def test_random_statetest320(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff45457f000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000c3507f000000000000000000"  # noqa: E501
-            "0000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000c3505b0a36095511805131558f14fc3b"  # noqa: E501
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x10450e65dfde8718b82d012b8b2a6005e1a164dd"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff45457f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3505b0a36095511805131558f14fc3b  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff45457f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3505b0a36095511805131558f14fc3b"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff45457f000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000c3507f000000000000000000"  # noqa: E501
-            "0000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000c3505b0a36095511805131558f14fc3b"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff45457f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3505b0a36095511805131558f14fc3b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=831662408,
+        value=0x31922948,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest321.py b/tests/ported_static/stRandom/test_random_statetest321.py
index ac0b85be1ff..43ef478e72e 100644
--- a/tests/ported_static/stRandom/test_random_statetest321.py
+++ b/tests/ported_static/stRandom/test_random_statetest321.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest321.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest321Filler.json
+state_tests/stRandom/randomStatetest321Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest321Filler.json"],
+    ["state_tests/stRandom/randomStatetest321Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest321(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest321."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,205 +43,64 @@ def test_random_statetest321(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.PUSH11[0x7F00000000000000000000]
-            + Op.STOP
-            + Op.STOP
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.MOD(
-                Op.GASPRICE,
-                Op.SUB(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                ),
-            )
-            + Op.DUP7
-            + Op.SWAP9
-            + Op.PUSH8[0x986202413A537C60]
-            + Op.STOP
-            + Op.MLOAD
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff033a06869867986202413a537c60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x0]
+        + Op.PUSH11[0x7F00000000000000000000]
+        + Op.STOP * 2
+        + Op.SELFDESTRUCT * 20
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.MOD(
+            Op.GASPRICE,
+            Op.SUB(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            ),
+        )
+        + Op.DUP7
+        + Op.SWAP9
+        + Op.PUSH8[0x986202413A537C60]
+        + Op.STOP
+        + Op.MLOAD
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x4f557114709bbdb63366da99f52fae471c987703"),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000006a7f00000000000000"  # noqa: E501
-            "0000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff033a06869867986202413a537c"
-        ),
-        gas_limit=100000,
-        value=1664390209,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest321Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest321_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.PUSH11[0x7F00000000000000000000]
-            + Op.STOP
-            + Op.STOP
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.MOD(
-                Op.GASPRICE,
-                Op.SUB(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                ),
-            )
-            + Op.DUP7
-            + Op.SWAP9
-            + Op.PUSH8[0x986202413A537C60]
-            + Op.STOP
-            + Op.MLOAD
-            + Op.SSTORE
-        ),
-        nonce=0,
-        address=Address("0x4f557114709bbdb63366da99f52fae471c987703"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000006a7f00000000000000"  # noqa: E501
-            "0000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff033a06869867986202413a537c"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff033a06869867986202413a537c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1664390209,
+        value=0x63349441,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest322.py b/tests/ported_static/stRandom/test_random_statetest322.py
index 215684e63cb..28424aecc18 100644
--- a/tests/ported_static/stRandom/test_random_statetest322.py
+++ b/tests/ported_static/stRandom/test_random_statetest322.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest322.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest322Filler.json
+state_tests/stRandom/randomStatetest322Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest322Filler.json"],
+    ["state_tests/stRandom/randomStatetest322Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest322(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest322."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,64 +47,58 @@ def test_random_statetest322(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x1206060508840294304101A3128F3455,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000000000000000000000000000000000000000c3506f1206060508840294304101a3128f345560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x0]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x1206060508840294304101A3128F3455
         ),
         nonce=0,
-        address=Address("0x35ae931707f4cd4ce0135870553491750a0a9d52"),  # noqa: E501
+        address=Address(0x35AE931707F4CD4CE0135870553491750A0A9D52),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000007f0000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000427f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000c3506f1206060508840294304101a3128f34"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000000000000000000000000000000000000000c3506f1206060508840294304101a3128f34"  # noqa: E501
         ),
         gas_limit=100000,
-        value=824326372,
+        value=0x312238E4,
     )
 
     post = {
-        contract: Account(storage={0: 0x1206060508840294304101A3128F3455}),
+        target: Account(
+            storage={0: 0x1206060508840294304101A3128F3455},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest323.py b/tests/ported_static/stRandom/test_random_statetest323.py
index e36853ea87e..8a9ebfa5ddf 100644
--- a/tests/ported_static/stRandom/test_random_statetest323.py
+++ b/tests/ported_static/stRandom/test_random_statetest323.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest323.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest323Filler.json
+state_tests/stRandom/randomStatetest323Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,96 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest323Filler.json"],
+    ["state_tests/stRandom/randomStatetest323Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest323(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "6f7f00000000000000000000000000000000000000000000000000000000000000007f00"  # noqa: E501
-            "0000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe74977f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3506f6b79361811363920600051"  # noqa: E501
-            "55"
-        ),
-        nonce=0,
-        address=Address("0x70da9b48406e4b67e6cc0458d7376116d08eb806"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "6f7f00000000000000000000000000000000000000000000000000000000000000007f00"  # noqa: E501
-            "0000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe74977f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3506f6b79361811363920"  # noqa: E501
-        ),
-        gas_limit=100000,
-        value=1955628831,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest323Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest323_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest323."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -122,53 +43,45 @@ def test_random_statetest323_from_prague(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x6f7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe74977f000000000000000000000000000000000000000000000000000000000000c3506f6b7936181136392060005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "6f7f00000000000000000000000000000000000000000000000000000000000000007f00"  # noqa: E501
-            "0000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe74977f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3506f6b79361811363920600051"  # noqa: E501
-            "55"
+            "6f7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe74977f000000000000000000000000000000000000000000000000000000000000c3506f6b7936181136392060005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x70da9b48406e4b67e6cc0458d7376116d08eb806"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "6f7f00000000000000000000000000000000000000000000000000000000000000007f00"  # noqa: E501
-            "0000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe74977f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3506f6b79361811363920"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "6f7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe74977f000000000000000000000000000000000000000000000000000000000000c3506f6b79361811363920"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1955628831,
+        value=0x7490871F,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest325.py b/tests/ported_static/stRandom/test_random_statetest325.py
index 84fca06db70..b72f02566ec 100644
--- a/tests/ported_static/stRandom/test_random_statetest325.py
+++ b/tests/ported_static/stRandom/test_random_statetest325.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest325.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest325Filler.json
+state_tests/stRandom/randomStatetest325Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest325Filler.json"],
+    ["state_tests/stRandom/randomStatetest325Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest325(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest325."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,70 +47,66 @@ def test_random_statetest325(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe81090360005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.NUMBER
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.SUB(
+                Op.MULMOD(
+                    Op.DUP2,
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ),
+                Op.TIMESTAMP,
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xF9856EC4B9DFC068E27DDFCBAB0E76A0A53BF613),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.NUMBER
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.SUB(
-                    Op.MULMOD(
-                        Op.DUP2,
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ),
-                    Op.TIMESTAMP,
-                ),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xf9856ec4b9dfc068e27ddfcbab0e76a0a53bf613"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00"  # noqa: E501
-            "0000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f000000"  # noqa: E501
-            "000000000000000000ffffffffffffffffffffffffffffffffffffffff427fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe810903"
+        to=target,
+        data=Bytes(
+            "437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810903"  # noqa: E501
         ),
         gas_limit=100000,
-        value=457480517,
+        value=0x1B449945,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC18,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest326.py b/tests/ported_static/stRandom/test_random_statetest326.py
index 2358aa590cc..d5cc7e9155e 100644
--- a/tests/ported_static/stRandom/test_random_statetest326.py
+++ b/tests/ported_static/stRandom/test_random_statetest326.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest326.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest326Filler.json
+state_tests/stRandom/randomStatetest326Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest326Filler.json"],
+    ["state_tests/stRandom/randomStatetest326Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest326(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest326."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,54 +44,45 @@ def test_random_statetest326(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000000034577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000426259cb6142a1196e3168c986758aa4  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f000000000000000000000000000000000000000000000000000000000000000034577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000426259cb6142a1196e3168c986758aa4"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000000034577f"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000"  # noqa: E501
-            "00000100000000000000000000000000000000000000007f000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000426259cb6142a1196e3168c986758aa4"  # noqa: E501
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xe9a32a9ad98c02fa9521b9ab066bcc683a8ab126"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000000034577f"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000"  # noqa: E501
-            "00000100000000000000000000000000000000000000007f000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000426259cb6142a1196e3168c986758aa4"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000000034577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000426259cb6142a1196e3168c986758aa4"  # noqa: E501
         ),
         gas_limit=381441932,
-        value=1579124913,
+        value=0x5E1F88B1,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest327.py b/tests/ported_static/stRandom/test_random_statetest327.py
index 971b61e9473..69a0ef27e4b 100644
--- a/tests/ported_static/stRandom/test_random_statetest327.py
+++ b/tests/ported_static/stRandom/test_random_statetest327.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest327.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest327Filler.json
+state_tests/stRandom/randomStatetest327Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest327Filler.json"],
+    ["state_tests/stRandom/randomStatetest327Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest327(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest327."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,45 @@ def test_random_statetest327(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001458b5554397513  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001458b5554397513"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000007f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000007fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000007f00000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000001458b5554397513"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x85f19e026a6f76db9583e20941653f5e029c9671"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000007f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000007fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000007f00000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000001458b5554397513"
+        to=target,
+        data=Bytes(
+            "457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001458b5554397513"  # noqa: E501
         ),
         gas_limit=100000,
-        value=592296179,
+        value=0x234DB8F3,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest329.py b/tests/ported_static/stRandom/test_random_statetest329.py
index c6f5e06f065..a7c487bdc86 100644
--- a/tests/ported_static/stRandom/test_random_statetest329.py
+++ b/tests/ported_static/stRandom/test_random_statetest329.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest329.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest329Filler.json
+state_tests/stRandom/randomStatetest329Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest329Filler.json"],
+    ["state_tests/stRandom/randomStatetest329Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest329(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest329."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,65 +46,60 @@ def test_random_statetest329(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.TIMESTAMP
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0xA48D775458574133769C8B750207FF55,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x06d608c689f673f068b91332000854260a1fd3e0"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff426fa48d775458574133769c8b750207ff5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.TIMESTAMP
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0xA48D775458574133769C8B750207FF55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x06D608C689F673F068B91332000854260A1FD3E0),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000007f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff426fa48d775458574133769c8b750207ff"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff426fa48d775458574133769c8b750207ff"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1532627820,
+        value=0x5B5A0B6C,
     )
 
     post = {
-        contract: Account(storage={0: 0xA48D775458574133769C8B750207FF55}),
+        target: Account(
+            storage={0: 0xA48D775458574133769C8B750207FF55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest33.py b/tests/ported_static/stRandom/test_random_statetest33.py
index 8aee1bff56b..ef3cfc91ce3 100644
--- a/tests/ported_static/stRandom/test_random_statetest33.py
+++ b/tests/ported_static/stRandom/test_random_statetest33.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest33.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest33Filler.json
+state_tests/stRandom/randomStatetest33Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest33Filler.json"],
+    ["state_tests/stRandom/randomStatetest33Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,8 +32,8 @@ def test_random_statetest33(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest33."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -47,68 +48,61 @@ def test_random_statetest33(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000015a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3506f6940566279386017a362876372698f5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[0x1]
+        + Op.GAS
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x6940566279386017A362876372698F55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xB756A5043F896D6B6062EA5790FB5E601F04F71C),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0x1]
-            + Op.GAS
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x6940566279386017A362876372698F55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xb756a5043f896d6b6062ea5790fb5e601f04f71c"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000015a7fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000017f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000c3506f6940566279386017a362876372698f"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000015a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3506f6940566279386017a362876372698f"  # noqa: E501
         ),
         gas_limit=2108117627,
-        value=123424954,
+        value=0x75B50BA,
     )
 
     post = {
-        contract: Account(storage={0: 0x6940566279386017A362876372698F55}),
+        target: Account(
+            storage={0: 0x6940566279386017A362876372698F55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest332.py b/tests/ported_static/stRandom/test_random_statetest332.py
index 9f38fdfe6ee..af3acdd68fc 100644
--- a/tests/ported_static/stRandom/test_random_statetest332.py
+++ b/tests/ported_static/stRandom/test_random_statetest332.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest332.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest332Filler.json
+state_tests/stRandom/randomStatetest332Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest332Filler.json"],
+    ["state_tests/stRandom/randomStatetest332Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest332(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest332."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,60 @@ def test_random_statetest332(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x7C098E7D625A64319D9E514BF3507555,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f7c098e7d625a64319d9e514bf350755560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x7C098E7D625A64319D9E514BF3507555
         ),
         nonce=0,
-        address=Address("0x30a444a96aa2e8678de375891517a99e0e71dafb"),  # noqa: E501
+        address=Address(0x30A444A96AA2E8678DE375891517A99E0E71DAFB),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3506f7c098e7d625a64319d9e514bf35075"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f7c098e7d625a64319d9e514bf35075"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1406473566,
+        value=0x53D5155E,
     )
 
     post = {
-        contract: Account(storage={0: 0x7C098E7D625A64319D9E514BF3507555}),
+        target: Account(
+            storage={0: 0x7C098E7D625A64319D9E514BF3507555},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest333.py b/tests/ported_static/stRandom/test_random_statetest333.py
index 6185a8bbc69..07a193ba630 100644
--- a/tests/ported_static/stRandom/test_random_statetest333.py
+++ b/tests/ported_static/stRandom/test_random_statetest333.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest333.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest333Filler.json
+state_tests/stRandom/randomStatetest333Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest333Filler.json"],
+    ["state_tests/stRandom/randomStatetest333Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest333(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest333."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,58 @@ def test_random_statetest333(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.GASLIMIT
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x410263F305963310856C15FF5037A055,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f410263f305963310856c15ff5037a05560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.GASLIMIT
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x410263F305963310856C15FF5037A055
         ),
         nonce=0,
-        address=Address("0x608f842c00417d627feb0f72d9abae6cc478e7f1"),  # noqa: E501
+        address=Address(0x608F842C00417D627FEB0F72D9ABAE6CC478E7F1),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e79457fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff6f410263f305963310856c15ff50"  # noqa: E501
-            "37a0"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f410263f305963310856c15ff5037a0"  # noqa: E501
         ),
         gas_limit=100000,
-        value=807710883,
+        value=0x3024B0A3,
     )
 
     post = {
-        contract: Account(storage={0: 0x410263F305963310856C15FF5037A055}),
+        target: Account(
+            storage={0: 0x410263F305963310856C15FF5037A055},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest334.py b/tests/ported_static/stRandom/test_random_statetest334.py
index 91fb9521c9c..7d50a34d622 100644
--- a/tests/ported_static/stRandom/test_random_statetest334.py
+++ b/tests/ported_static/stRandom/test_random_statetest334.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest334.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest334Filler.json
+state_tests/stRandom/randomStatetest334Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest334Filler.json"],
+    ["state_tests/stRandom/randomStatetest334Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest334(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest334."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,59 +47,57 @@ def test_random_statetest334(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000013a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f424468208e181851308b7c7a776863a160005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.GASPRICE
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x424468208E181851308B7C7A776863A1
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x5DA550B28023EDC67D18171FB55048B2FD74CBE3),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.GASPRICE
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x424468208E181851308B7C7A776863A1,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x5da550b28023edc67d18171fb55048b2fd74cbe3"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000013a7fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f424468208e1818"  # noqa: E501
-            "51308b7c7a776863a1"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000013a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f424468208e181851308b7c7a776863a1"  # noqa: E501
         ),
         gas_limit=100000,
-        value=916012823,
+        value=0x36993F17,
     )
 
     post = {
-        contract: Account(storage={0: 0x424468208E181851308B7C7A776863A1}),
+        target: Account(
+            storage={0: 0x424468208E181851308B7C7A776863A1},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest335.py b/tests/ported_static/stRandom/test_random_statetest335.py
index 0a57d6c2f3f..7196d9db3ec 100644
--- a/tests/ported_static/stRandom/test_random_statetest335.py
+++ b/tests/ported_static/stRandom/test_random_statetest335.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest335.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest335Filler.json
+state_tests/stRandom/randomStatetest335Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest335Filler.json"],
+    ["state_tests/stRandom/randomStatetest335Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest335(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest335."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,58 +43,45 @@ def test_random_statetest335(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350617e7608617c95f3ff584076e07b5a4460005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350617e7608617c95f3ff584076e07b5a4460005155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000"  # noqa: E501
-            "0000000000000000000000000000000000007f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c350617e7608617c95f3ff584076e07b5a4460005155"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xa3a709fece04184d06401d32d39f133ea3b800a8"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000"  # noqa: E501
-            "0000000000000000000000000000000000007f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c350617e7608617c95f3ff584076e07b5a44"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350617e7608617c95f3ff584076e07b5a44"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1650737351,
+        value=0x626440C7,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest336.py b/tests/ported_static/stRandom/test_random_statetest336.py
index d1a403a062b..408d267cf3b 100644
--- a/tests/ported_static/stRandom/test_random_statetest336.py
+++ b/tests/ported_static/stRandom/test_random_statetest336.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest336.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest336Filler.json
+state_tests/stRandom/randomStatetest336Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest336Filler.json"],
+    ["state_tests/stRandom/randomStatetest336Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest336(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest336."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,47 +43,51 @@ def test_random_statetest336(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x41443442f34241
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.COINBASE
+        + Op.PREVRANDAO
+        + Op.RETURN(offset=Op.TIMESTAMP, size=Op.CALLVALUE)
+        + Op.TIMESTAMP
+        + Op.COINBASE,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.COINBASE
-            + Op.PREVRANDAO
-            + Op.RETURN(offset=Op.TIMESTAMP, size=Op.CALLVALUE)
-            + Op.TIMESTAMP
-            + Op.COINBASE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=46,
         nonce=0,
-        address=Address("0xf3c8d5ea3ce820d6b26253d4d1d9106008c757db"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={},
+            code=bytes.fromhex("41443442f34241"),
+            balance=0xDE0B6B3A76586A0,
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest337.py b/tests/ported_static/stRandom/test_random_statetest337.py
index 48fb2b2642b..f8b1422cbe0 100644
--- a/tests/ported_static/stRandom/test_random_statetest337.py
+++ b/tests/ported_static/stRandom/test_random_statetest337.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest337.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest337Filler.json
+state_tests/stRandom/randomStatetest337Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest337Filler.json"],
+    ["state_tests/stRandom/randomStatetest337Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest337(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest337."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,64 +43,55 @@ def test_random_statetest337(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350670b9af27e9a6468a15560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x1] * 3
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(key=0xB9AF27E9A6468A1, value=Op.PUSH32[0xC350])
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(key=0xB9AF27E9A6468A1, value=Op.PUSH32[0xC350])
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xc91de65c756caaa7d9edbc50ac7494254a4e2cf6"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c350670b9af27e9a6468a1"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350670b9af27e9a6468a1"  # noqa: E501
         ),
         gas_limit=100000,
-        value=333069461,
+        value=0x13DA3C95,
     )
 
     post = {
-        contract: Account(storage={0: 50000, 0xB9AF27E9A6468A1: 50000}),
+        target: Account(
+            storage={0: 50000, 0xB9AF27E9A6468A1: 50000},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest338.py b/tests/ported_static/stRandom/test_random_statetest338.py
index 15c1c06d302..d623ef7d74d 100644
--- a/tests/ported_static/stRandom/test_random_statetest338.py
+++ b/tests/ported_static/stRandom/test_random_statetest338.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest338.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest338Filler.json
+state_tests/stRandom/randomStatetest338Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest338Filler.json"],
+    ["state_tests/stRandom/randomStatetest338Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest338(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest338."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,82 +46,72 @@ def test_random_statetest338(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MOD(
-                    Op.NOT(
-                        Op.ADD(
-                            0x7A9DF32E6851606C,
-                            Op.PUSH32[
-                                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-                            ],
-                        ),
-                    ),
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                ),
-                value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
-        nonce=0,
-        address=Address("0x271814042945813b1628eb698bf09c4ae384485f"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
+    )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff677a9df32e6851606c0119065560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MOD(
+                Op.NOT(
+                    Op.ADD(
+                        0x7A9DF32E6851606C,
+                        Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                    )
+                ),
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            ),
+            value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
+        nonce=0,
+        address=Address(0x271814042945813B1628EB698BF09C4AE384485F),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff677a9df32e6851606c011906"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff677a9df32e6851606c011906"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1766886327,
+        value=0x69508BB7,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
                 0xFFFFFFFF85620CD197AE9F93: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest339.py b/tests/ported_static/stRandom/test_random_statetest339.py
index f7eb2c76c7d..6437037b241 100644
--- a/tests/ported_static/stRandom/test_random_statetest339.py
+++ b/tests/ported_static/stRandom/test_random_statetest339.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest339.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest339Filler.json
+state_tests/stRandom/randomStatetest339Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest339Filler.json"],
+    ["state_tests/stRandom/randomStatetest339Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest339(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest339."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,57 @@ def test_random_statetest339(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x89029E850708A293905668F1A367A255,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f89029e850708a293905668f1a367a25560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x89029E850708A293905668F1A367A255
         ),
         nonce=0,
-        address=Address("0x978dd1566835c8ad84120731b668015399eabe79"),  # noqa: E501
+        address=Address(0x978DD1566835C8AD84120731B668015399EABE79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000010000"  # noqa: E501
-            "0000000000000000000000000000000000007f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000007f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c3506f89029e850708a293905668f1a367a2"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f89029e850708a293905668f1a367a2"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1064880298,
+        value=0x3F78C8AA,
     )
 
     post = {
-        contract: Account(storage={0: 0x89029E850708A293905668F1A367A255}),
+        target: Account(
+            storage={0: 0x89029E850708A293905668F1A367A255},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest340.py b/tests/ported_static/stRandom/test_random_statetest340.py
index faeb8a75b92..4fd262687f8 100644
--- a/tests/ported_static/stRandom/test_random_statetest340.py
+++ b/tests/ported_static/stRandom/test_random_statetest340.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest340.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest340Filler.json
+state_tests/stRandom/randomStatetest340Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest340Filler.json"],
+    ["state_tests/stRandom/randomStatetest340Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest340(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest340."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,66 +43,57 @@ def test_random_statetest340(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.SLOAD(
-                key=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            )
-            + Op.SSTORE(
-                key=Op.MULMOD(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                ),
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff095560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.SLOAD(key=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79])
+        + Op.SSTORE(
+            key=Op.MULMOD(
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            ),
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0xe55b3d86c30351b3b3c173c83c73acedea2578ae"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e79547fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff09"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=39040167,
+        value=0x253B4A7,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest341.py b/tests/ported_static/stRandom/test_random_statetest341.py
index 52c68a365b0..0a99e3f670b 100644
--- a/tests/ported_static/stRandom/test_random_statetest341.py
+++ b/tests/ported_static/stRandom/test_random_statetest341.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest341.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest341Filler.json
+state_tests/stRandom/randomStatetest341Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest341Filler.json"],
+    ["state_tests/stRandom/randomStatetest341Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest341(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest341."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,62 +43,53 @@ def test_random_statetest341(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.TIMESTAMP
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PC
-            + Op.RETURN(offset=Op.DUP2, size=Op.CALLVALUE)
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0), value=0x85646D53671639175B9408
-            )
-        ),
+    # Source: raw
+    # 0x427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b940860005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.TIMESTAMP
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PC
+        + Op.RETURN(offset=Op.DUP2, size=Op.CALLVALUE)
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x85646D53671639175B9408),
         nonce=0,
-        address=Address("0xb2da1f608a7e0626e721677fa30fc46d2d99c655"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "427f00000000000000000000000000000000000000000000000000000000000000007f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000017f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b9408"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b9408"  # noqa: E501
         ),
         gas_limit=4400000,
-        value=1485632,
+        value=0x16AB40,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest342.py b/tests/ported_static/stRandom/test_random_statetest342.py
index 5152b66bf27..9bad4431ff6 100644
--- a/tests/ported_static/stRandom/test_random_statetest342.py
+++ b/tests/ported_static/stRandom/test_random_statetest342.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest342.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest342Filler.json
+state_tests/stRandom/randomStatetest342Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest342Filler.json"],
+    ["state_tests/stRandom/randomStatetest342Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest342(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest342."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,59 @@ def test_random_statetest342(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000041147fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f36314297399455797b42569e8f05565560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x1]
+        + Op.EQ(Op.COINBASE, Op.PUSH32[0x0])
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x36314297399455797B42569E8F055655
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x5DC5015F1706F727BAD88CE5EBC5459898B0EE4F),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.EQ(Op.COINBASE, Op.PUSH32[0x0])
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x36314297399455797B42569E8F055655,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x5dc5015f1706f727bad88ce5ebc5459898b0ee4f"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000041147fffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000007fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff6f36314297399455797b42569e8f0556"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000041147fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f36314297399455797b42569e8f0556"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1662167236,
+        value=0x6312A8C4,
     )
 
     post = {
-        contract: Account(storage={0: 0x36314297399455797B42569E8F055655}),
+        target: Account(
+            storage={0: 0x36314297399455797B42569E8F055655},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest343.py b/tests/ported_static/stRandom/test_random_statetest343.py
index 62add07d5a8..2127a424e0e 100644
--- a/tests/ported_static/stRandom/test_random_statetest343.py
+++ b/tests/ported_static/stRandom/test_random_statetest343.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest343.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest343Filler.json
+state_tests/stRandom/randomStatetest343Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest343Filler.json"],
+    ["state_tests/stRandom/randomStatetest343Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest343(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest343."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,81 +43,68 @@ def test_random_statetest343(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.CALLDATACOPY(
-                dest_offset=Op.LT(
-                    Op.LT(
-                        Op.GT(
-                            Op.PUSH32[
-                                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-                            ],
-                            Op.PUSH32[
-                                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-                            ],
-                        ),
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff1110103741355560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.CALLDATACOPY(
+            dest_offset=Op.LT(
+                Op.LT(
+                    Op.GT(
+                        Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
                         Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
                     ),
                     Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
                 ),
-                offset=Op.PUSH32[0x0],
-                size=Op.PUSH32[0xC350],
-            )
-            + Op.CALLDATALOAD(offset=Op.COINBASE)
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            ),
+            offset=Op.PUSH32[0x0],
+            size=Op.PUSH32[0xC350],
+        )
+        + Op.CALLDATALOAD(offset=Op.COINBASE)
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x0c6077c4b33cd05c78d87cb0c0186bb869d3c773"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff111010374135"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff111010374135"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1301366640,
+        value=0x4D914770,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 50000,
                 0x7F000000000000000000000000000000000000000000000000000000000000: 1,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest345.py b/tests/ported_static/stRandom/test_random_statetest345.py
index 4465eac9699..9959a5d94ba 100644
--- a/tests/ported_static/stRandom/test_random_statetest345.py
+++ b/tests/ported_static/stRandom/test_random_statetest345.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest345.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest345Filler.json
+state_tests/stRandom/randomStatetest345Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest345Filler.json"],
+    ["state_tests/stRandom/randomStatetest345Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest345(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest345."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,127 +43,45 @@ def test_random_statetest345(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x417f0000000000000000000000000000000000000000000000000000000000000001447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000000035420b417f056699168fa16d8d94113b60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "417f0000000000000000000000000000000000000000000000000000000000000001447f"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000035420b417f056699168f"  # noqa: E501
-            "a16d8d94113b60005155"
+            "417f0000000000000000000000000000000000000000000000000000000000000001447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000000035420b417f056699168fa16d8d94113b60005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xc4b87d307584985fc7448651ecda800b709d96a2"),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "417f0000000000000000000000000000000000000000000000000000000000000001447f"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000035420b417f056699168f"  # noqa: E501
-            "a16d8d94113b"
-        ),
-        gas_limit=100000,
-        value=12028215,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest345Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest345_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "417f0000000000000000000000000000000000000000000000000000000000000001447f"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000035420b417f056699168f"  # noqa: E501
-            "a16d8d94113b60005155"
-        ),
-        nonce=0,
-        address=Address("0xc4b87d307584985fc7448651ecda800b709d96a2"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "417f0000000000000000000000000000000000000000000000000000000000000001447f"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000035420b417f056699168f"  # noqa: E501
-            "a16d8d94113b"
+        to=target,
+        data=Bytes(
+            "417f0000000000000000000000000000000000000000000000000000000000000001447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000000035420b417f056699168fa16d8d94113b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=12028215,
+        value=0xB78937,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest346.py b/tests/ported_static/stRandom/test_random_statetest346.py
index 77b93b78b3b..3adafb84a38 100644
--- a/tests/ported_static/stRandom/test_random_statetest346.py
+++ b/tests/ported_static/stRandom/test_random_statetest346.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest346.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest346Filler.json
+state_tests/stRandom/randomStatetest346Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest346Filler.json"],
+    ["state_tests/stRandom/randomStatetest346Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest346(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest346."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,68 +43,60 @@ def test_random_statetest346(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe095560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MULMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
+            value=Op.PUSH32[0x1],
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-                value=Op.PUSH32[0x1],
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xf27d15cbabf0ee5ff4e3c4f9f754aed2efb556c6"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe09"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=87977970,
+        value=0x53E6FF2,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest347.py b/tests/ported_static/stRandom/test_random_statetest347.py
index 8cecf2feb0a..c4ad3281d1e 100644
--- a/tests/ported_static/stRandom/test_random_statetest347.py
+++ b/tests/ported_static/stRandom/test_random_statetest347.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest347.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest347Filler.json
+state_tests/stRandom/randomStatetest347Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +22,16 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest347Filler.json"],
+    ["state_tests/stRandom/randomStatetest347Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_random_statetest347(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xa7f7c8ef9bbbcfb0f7e81c1fd46bb732fba60592")
-    sender = EOA(
-        key=0x1F2F6944F70460E655546D414267BD3491A2DD9DAFB2280605404C858990D053
-    )
+    """Test_random_statetest347."""
+    coinbase = Address(0xA7F7C8EF9BBBCFB0F7E81C1FD46BB732FBA60592)
+    sender = pre.fund_eoa(amount=0x1024D289465FA51769)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,167 +42,143 @@ def test_random_statetest347(
         gas_limit=188473852,
     )
 
-    pre[sender] = Account(balance=0x1024D289465FA51769)
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x64d552603c577e9a3805d8c55157a82b7660ef2a049cfbf79c15fa8e3261f121d213590fa3917d7d442a5e8734af2aaa4c859b452eed7860c2f7e051580427b6c3cc6d7fee617a0d64ef63e192256de5d2ea2689decfd971c7478effb06aa9e792747ce0492abde8c2f270e93d5ed0b213fed7ae59294537d4864c0e68bbe30ec5d1e6b854027862cfcbea15e8367dfaa080ee0da2b0d2ca892f5a764354370466ccddd03115ec8a7ad2e6c62c29425a45ec842fb74c369fb15a42e4b4e48b3eb70be2a0847469987980e6eaa539365a491d2366334f78f03acb177809e7525add39a234d3d2ef1cf8544a52389411ef846d3cd7f36d0d1db7f414860020171f07598cfb620e15a9681c843d60aee9fb8a4e7e37713afbf6ef9d1667513975c76f26ac35ce209b1e0a3bb7c19821368931537b4095ea42b32baf1ba596b9af5cce961ae705f8c9c5465e349633529871f64351169e7fe48ccbb866952fabbfcf40df723c564e109dbd4c9c15ee9ad625e96a5765f6f56ee0601677961da7ebad5f583f6eb6da7c8348425fe784f532f288963ccdbf9de3ac3ebc38b75a806b40e51b895c662d0bcab255a04b723f1e500517d17eb720e02f445cb046bd0fe7d2759438c79aa2dfcaef1cf57e4eb9c832f7ef449a9c32f673728f4b0dccdfa8fb1d447e2f681076ac51a98f76600a66b4692ca7e1e9c89f64cdf879cb0c625514977ebca28f2ec8bb3a092bd0c30849558fe16a4b7070cb05aec329c0286c26fff57795ce4ac7601160ea2d6656c8f2a554b43e263cc3a60e9fd0a26c0a5f7202f02888a731e84ab326610c77771f85025eb8c552943d2da5de48786015f5b8b5921d26c1e277d5a4cda5f1f77ec5f3a83e6ed6821ff025370e2fad05a0f364f58f3705c8761904d63e0f2e5bdbe2b0b1ddf82bb441c547634e8c1864737333e845ffa373c102303f727bfa14f4c445711f6f9695c36f3627df02a1fe2d7eca55faed6984000ab2a99545148bbe7369a47367bc24256acd6a3a22d5fb32434b1998297ae6b2edf08b72dc4598aa600e16707699a84e55ef611ea0e6da482f6c6e9d05d54bbb4ad06cd62622e469fbcd3e637a8f0d2ac9149b7076cce991cb5d4b4de1229e3decbcf46a3c7e46aa1fdc218d936e56f55b5a38bbd798361040e1badb1ab06adc38a723badfa07a95f78553de4df879855274a1904a31276d7938818021e69d8f5b9279478808a236deefd761df6bc151fded80bbe4ba725e7db7b9fc507f0b8121a009384c7bc4443747bd1ac9dc7682b32bec0937c7fb27ba3926acd0d67b41ba6c951788f1bb1b1168229d15cafdc63209c95df646566024013d766a01d6b8051c357243c9f464f423a2ae8efa4f9efd95777099eac9b0825d18018a5afcb6cecd9ab9a9655ae262db08a271d8adedbc3e7eb6acfd2d576ec297c09c4bd47a80dacd2b123e4e4e6232ef6d70acb10f2f44a62bbcef65a72576506ea119b051880b515f4414920badcd6f726c04e821516f6123c9c52f29e19bfe0fb10fab76536535cc0e01115c83369d4083db2d669654c2fe8c00e37bd78f663a2ce2425d2ce358e213d6c601208bb644fa656678de7633147fbd152c2ae682dec269245f07ba3c79f4e6e1978d40f42a494d44eba128b9d0228d637900cbab73455423156417fae331d26494d1ed4d06ecf206736f04292d5470d5091c48a80ba737372c35729c829af30db3625785ba0b3cfc4240d002276760f2770ead609b52db934a53063ec1c05488188fb37ce61059909b6c975c0e9401ef3b71b6d0ddae39867f3f0878bd172851a98a233fcafae289fc634c36c8b3064926d92deda3d8c5074d6a56daa511e7e693aab3d4347cebdd5b63238acdeedc3d8eb8f69ea18cb429ee8f09c26845507ba28eba916c74fd62cd9e587a8f013122d93579b6b7da091527251a4b70051be4f0f96f61e5dc4ab713c473174c7e2ebb463615b03c4787b74e8c204975399439fa553838f186ae028a47f3ccd46c5fcc46c11a36219f3ba1d34def7bee989fa61e60a2abd3652df9f8e5a1b53d9608e3bb04f5e852333d9c7d761836ef5761178bd07fde9a0ded16e1659a6c80281c259ce42e3fdbe23664ce783b58d595  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0xA9E792747CE0492ABDE8C2,
+            address=0xE5D2EA2689DECFD971C7478EFFB0,
+            value=0xEF63E19225,
+            args_offset=0x7A0D,
+            args_size=0x7D442A5E8734AF2AAA4C859B452EED7860C2F7E051580427B6C3CC6D7FEE,  # noqa: E501
+            ret_offset=0x9A3805D8C55157A82B7660EF2A049CFBF79C15FA8E3261F121D213590FA391,  # noqa: E501
+            ret_size=0xD552603C57,
+        )
+        + Op.PUSH17[0xE93D5ED0B213FED7AE59294537D4864C0E]
+        + Op.PUSH9[0xBBE30EC5D1E6B85402]
+        + Op.PUSH25[0x62CFCBEA15E8367DFAA080EE0DA2B0D2CA892F5A7643543704]
+        + Op.PUSH7[0xCCDDD03115EC8A]
+        + Op.PUSH27[0xD2E6C62C29425A45EC842FB74C369FB15A42E4B4E48B3EB70BE2A0]
+        + Op.DUP5
+        + Op.PUSH21[0x69987980E6EAA539365A491D2366334F78F03ACB17]
+        + Op.PUSH25[0x9E7525ADD39A234D3D2EF1CF8544A52389411EF846D3CD7F3]
+        + Op.PUSH14[0xD1DB7F414860020171F07598CFB]
+        + Op.PUSH3[0xE15A9]
+        + Op.PUSH9[0x1C843D60AEE9FB8A4E]
+        + Op.PUSH31[
+            0x37713AFBF6EF9D1667513975C76F26AC35CE209B1E0A3BB7C1982136893153
+        ]
+        + Op.PUSH28[0x4095EA42B32BAF1BA596B9AF5CCE961AE705F8C9C5465E3496335298]
+        + Op.PUSH18[0xF64351169E7FE48CCBB866952FABBFCF40DF]
+        + Op.PUSH19[0x3C564E109DBD4C9C15EE9AD625E96A5765F6F5]
+        + Op.PUSH15[0xE0601677961DA7EBAD5F583F6EB6DA]
+        + Op.PUSH29[
+            0x8348425FE784F532F288963CCDBF9DE3AC3EBC38B75A806B40E51B895C
+        ]
+        + Op.PUSH7[0x2D0BCAB255A04B]
+        + Op.PUSH19[0x3F1E500517D17EB720E02F445CB046BD0FE7D2]
+        + Op.PUSH22[0x9438C79AA2DFCAEF1CF57E4EB9C832F7EF449A9C32F6]
+        + Op.PUSH20[0x728F4B0DCCDFA8FB1D447E2F681076AC51A98F76]
+        + Op.PUSH1[0xA]
+        + Op.PUSH7[0xB4692CA7E1E9C8]
+        + Op.SWAP16
+        + Op.LOG2(
+            offset=0x95CE4AC7601160EA2D6656C8F2A554B43E263CC3A60E9FD0,
+            size=0xBCA28F2EC8BB3A092BD0C30849558FE16A4B7070CB05AEC329C0286C26FFF5,  # noqa: E501
+            topic_1=0x551497,
+            topic_2=0xCDF879CB0C,
+        )
+        + Op.PUSH13[0xA5F7202F02888A731E84AB326]
+        + Op.PUSH2[0xC77]
+        + Op.PUSH24[0x1F85025EB8C552943D2DA5DE48786015F5B8B5921D26C1E2]
+        + Op.PUSH24[0xD5A4CDA5F1F77EC5F3A83E6ED6821FF025370E2FAD05A0F3]
+        + Op.PUSH5[0xF58F3705C8]
+        + Op.PUSH23[0x1904D63E0F2E5BDBE2B0B1DDF82BB441C547634E8C1864]
+        + Op.PUSH20[0x7333E845FFA373C102303F727BFA14F4C445711F]
+        + Op.PUSH16[0x9695C36F3627DF02A1FE2D7ECA55FAED]
+        + Op.PUSH10[0x84000AB2A99545148BBE]
+        + Op.PUSH20[0x69A47367BC24256ACD6A3A22D5FB32434B199829]
+        + Op.PUSH27[0xE6B2EDF08B72DC4598AA600E16707699A84E55EF611EA0E6DA482F]
+        + Op.PUSH13[0x6E9D05D54BBB4AD06CD62622E4]
+        + Op.PUSH10[0xFBCD3E637A8F0D2AC914]
+        + Op.SWAP12
+        + Op.LOG0(
+            offset=0x46AA1FDC218D936E56F55B5A38BBD798361040E1BADB1AB06ADC38A723BADF,  # noqa: E501
+            size=0x76CCE991CB5D4B4DE1229E3DECBCF46A3C,
+        )
+        + Op.PUSH27[0x95F78553DE4DF879855274A1904A31276D7938818021E69D8F5B92]
+        + Op.PUSH26[0x478808A236DEEFD761DF6BC151FDED80BBE4BA725E7DB7B9FC50]
+        + Op.PUSH32[
+            0xB8121A009384C7BC4443747BD1AC9DC7682B32BEC0937C7FB27BA3926ACD0D6
+        ]
+        + Op.PUSH28[0x41BA6C951788F1BB1B1168229D15CAFDC63209C95DF646566024013D]
+        + Op.PUSH23[0x6A01D6B8051C357243C9F464F423A2AE8EFA4F9EFD9577]
+        + Op.PUSH17[0x99EAC9B0825D18018A5AFCB6CECD9AB9A9]
+        + Op.PUSH6[0x5AE262DB08A2]
+        + Op.PUSH18[0xD8ADEDBC3E7EB6ACFD2D576EC297C09C4BD4]
+        + Op.PUSH27[0x80DACD2B123E4E4E6232EF6D70ACB10F2F44A62BBCEF65A7257650]
+        + Op.PUSH15[0xA119B051880B515F4414920BADCD6F]
+        + Op.PUSH19[0x6C04E821516F6123C9C52F29E19BFE0FB10FAB]
+        + Op.PUSH23[0x536535CC0E01115C83369D4083DB2D669654C2FE8C00E3]
+        + Op.PUSH28[0xD78F663A2CE2425D2CE358E213D6C601208BB644FA656678DE763314]
+        + Op.PUSH32[
+            0xBD152C2AE682DEC269245F07BA3C79F4E6E1978D40F42A494D44EBA128B9D022
+        ]
+        + Op.DUP14
+        + Op.PUSH4[0x7900CBAB]
+        + Op.PUSH20[0x455423156417FAE331D26494D1ED4D06ECF20673]
+        + Op.PUSH16[0x4292D5470D5091C48A80BA737372C35]
+        + Op.PUSH19[0x9C829AF30DB3625785BA0B3CFC4240D0022767]
+        + Op.PUSH1[0xF2]
+        + Op.PUSH24[0xEAD609B52DB934A53063EC1C05488188FB37CE61059909B]
+        + Op.PUSH13[0x975C0E9401EF3B71B6D0DDAE39]
+        + Op.DUP7
+        + Op.PUSH32[
+            0x3F0878BD172851A98A233FCAFAE289FC634C36C8B3064926D92DEDA3D8C5074D
+        ]
+        + Op.PUSH11[0x56DAA511E7E693AAB3D434]
+        + Op.PUSH29[
+            0xEBDD5B63238ACDEEDC3D8EB8F69EA18CB429EE8F09C26845507BA28EBA
+        ]
+        + Op.SWAP2
+        + Op.PUSH13[0x74FD62CD9E587A8F013122D935]
+        + Op.PUSH26[0xB6B7DA091527251A4B70051BE4F0F96F61E5DC4AB713C473174C]
+        + Op.PUSH31[
+            0x2EBB463615B03C4787B74E8C204975399439FA553838F186AE028A47F3CCD4
+        ]
+        + Op.PUSH13[0x5FCC46C11A36219F3BA1D34DEF]
+        + Op.PUSH28[0xEE989FA61E60A2ABD3652DF9F8E5A1B53D9608E3BB04F5E852333D9C]
+        + Op.PUSH30[
+            0x761836EF5761178BD07FDE9A0DED16E1659A6C80281C259CE42E3FDBE236
+        ]
+        + Op.PUSH5[0xCE783B58D5]
+        + Op.SWAP6,
+        balance=0x33498455,
+        nonce=233,
+    )
+    # Source: raw
+    # 0x36
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.CALLDATASIZE,
         balance=0x4EA91708,
         nonce=89,
-        address=Address("0x79d9fbe6ac70917cb2e16ec4cd32968ce19c724d"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0xA9E792747CE0492ABDE8C2,
-                address=0xE5D2EA2689DECFD971C7478EFFB0,
-                value=0xEF63E19225,
-                args_offset=0x7A0D,
-                args_size=0x7D442A5E8734AF2AAA4C859B452EED7860C2F7E051580427B6C3CC6D7FEE,  # noqa: E501
-                ret_offset=0x9A3805D8C55157A82B7660EF2A049CFBF79C15FA8E3261F121D213590FA391,  # noqa: E501
-                ret_size=0xD552603C57,
-            )
-            + Op.PUSH17[0xE93D5ED0B213FED7AE59294537D4864C0E]
-            + Op.PUSH9[0xBBE30EC5D1E6B85402]
-            + Op.PUSH25[0x62CFCBEA15E8367DFAA080EE0DA2B0D2CA892F5A7643543704]
-            + Op.PUSH7[0xCCDDD03115EC8A]
-            + Op.PUSH27[
-                0xD2E6C62C29425A45EC842FB74C369FB15A42E4B4E48B3EB70BE2A0
-            ]
-            + Op.DUP5
-            + Op.PUSH21[0x69987980E6EAA539365A491D2366334F78F03ACB17]
-            + Op.PUSH25[0x9E7525ADD39A234D3D2EF1CF8544A52389411EF846D3CD7F3]
-            + Op.PUSH14[0xD1DB7F414860020171F07598CFB]
-            + Op.PUSH3[0xE15A9]
-            + Op.PUSH9[0x1C843D60AEE9FB8A4E]
-            + Op.PUSH31[
-                0x37713AFBF6EF9D1667513975C76F26AC35CE209B1E0A3BB7C1982136893153  # noqa: E501
-            ]
-            + Op.PUSH28[
-                0x4095EA42B32BAF1BA596B9AF5CCE961AE705F8C9C5465E3496335298
-            ]
-            + Op.PUSH18[0xF64351169E7FE48CCBB866952FABBFCF40DF]
-            + Op.PUSH19[0x3C564E109DBD4C9C15EE9AD625E96A5765F6F5]
-            + Op.PUSH15[0xE0601677961DA7EBAD5F583F6EB6DA]
-            + Op.PUSH29[
-                0x8348425FE784F532F288963CCDBF9DE3AC3EBC38B75A806B40E51B895C
-            ]
-            + Op.PUSH7[0x2D0BCAB255A04B]
-            + Op.PUSH19[0x3F1E500517D17EB720E02F445CB046BD0FE7D2]
-            + Op.PUSH22[0x9438C79AA2DFCAEF1CF57E4EB9C832F7EF449A9C32F6]
-            + Op.PUSH20[0x728F4B0DCCDFA8FB1D447E2F681076AC51A98F76]
-            + Op.PUSH1[0xA]
-            + Op.PUSH7[0xB4692CA7E1E9C8]
-            + Op.SWAP16
-            + Op.LOG2(
-                offset=0x95CE4AC7601160EA2D6656C8F2A554B43E263CC3A60E9FD0,
-                size=0xBCA28F2EC8BB3A092BD0C30849558FE16A4B7070CB05AEC329C0286C26FFF5,  # noqa: E501
-                topic_1=0x551497,
-                topic_2=0xCDF879CB0C,
-            )
-            + Op.PUSH13[0xA5F7202F02888A731E84AB326]
-            + Op.PUSH2[0xC77]
-            + Op.PUSH24[0x1F85025EB8C552943D2DA5DE48786015F5B8B5921D26C1E2]
-            + Op.PUSH24[0xD5A4CDA5F1F77EC5F3A83E6ED6821FF025370E2FAD05A0F3]
-            + Op.PUSH5[0xF58F3705C8]
-            + Op.PUSH23[0x1904D63E0F2E5BDBE2B0B1DDF82BB441C547634E8C1864]
-            + Op.PUSH20[0x7333E845FFA373C102303F727BFA14F4C445711F]
-            + Op.PUSH16[0x9695C36F3627DF02A1FE2D7ECA55FAED]
-            + Op.PUSH10[0x84000AB2A99545148BBE]
-            + Op.PUSH20[0x69A47367BC24256ACD6A3A22D5FB32434B199829]
-            + Op.PUSH27[
-                0xE6B2EDF08B72DC4598AA600E16707699A84E55EF611EA0E6DA482F
-            ]
-            + Op.PUSH13[0x6E9D05D54BBB4AD06CD62622E4]
-            + Op.PUSH10[0xFBCD3E637A8F0D2AC914]
-            + Op.SWAP12
-            + Op.LOG0(
-                offset=0x46AA1FDC218D936E56F55B5A38BBD798361040E1BADB1AB06ADC38A723BADF,  # noqa: E501
-                size=0x76CCE991CB5D4B4DE1229E3DECBCF46A3C,
-            )
-            + Op.PUSH27[
-                0x95F78553DE4DF879855274A1904A31276D7938818021E69D8F5B92
-            ]
-            + Op.PUSH26[0x478808A236DEEFD761DF6BC151FDED80BBE4BA725E7DB7B9FC50]
-            + Op.PUSH32[
-                0xB8121A009384C7BC4443747BD1AC9DC7682B32BEC0937C7FB27BA3926ACD0D6  # noqa: E501
-            ]
-            + Op.PUSH28[
-                0x41BA6C951788F1BB1B1168229D15CAFDC63209C95DF646566024013D
-            ]
-            + Op.PUSH23[0x6A01D6B8051C357243C9F464F423A2AE8EFA4F9EFD9577]
-            + Op.PUSH17[0x99EAC9B0825D18018A5AFCB6CECD9AB9A9]
-            + Op.PUSH6[0x5AE262DB08A2]
-            + Op.PUSH18[0xD8ADEDBC3E7EB6ACFD2D576EC297C09C4BD4]
-            + Op.PUSH27[
-                0x80DACD2B123E4E4E6232EF6D70ACB10F2F44A62BBCEF65A7257650
-            ]
-            + Op.PUSH15[0xA119B051880B515F4414920BADCD6F]
-            + Op.PUSH19[0x6C04E821516F6123C9C52F29E19BFE0FB10FAB]
-            + Op.PUSH23[0x536535CC0E01115C83369D4083DB2D669654C2FE8C00E3]
-            + Op.PUSH28[
-                0xD78F663A2CE2425D2CE358E213D6C601208BB644FA656678DE763314
-            ]
-            + Op.PUSH32[
-                0xBD152C2AE682DEC269245F07BA3C79F4E6E1978D40F42A494D44EBA128B9D022  # noqa: E501
-            ]
-            + Op.DUP14
-            + Op.PUSH4[0x7900CBAB]
-            + Op.PUSH20[0x455423156417FAE331D26494D1ED4D06ECF20673]
-            + Op.PUSH16[0x4292D5470D5091C48A80BA737372C35]
-            + Op.PUSH19[0x9C829AF30DB3625785BA0B3CFC4240D0022767]
-            + Op.PUSH1[0xF2]
-            + Op.PUSH24[0xEAD609B52DB934A53063EC1C05488188FB37CE61059909B]
-            + Op.PUSH13[0x975C0E9401EF3B71B6D0DDAE39]
-            + Op.DUP7
-            + Op.PUSH32[
-                0x3F0878BD172851A98A233FCAFAE289FC634C36C8B3064926D92DEDA3D8C5074D  # noqa: E501
-            ]
-            + Op.PUSH11[0x56DAA511E7E693AAB3D434]
-            + Op.PUSH29[
-                0xEBDD5B63238ACDEEDC3D8EB8F69EA18CB429EE8F09C26845507BA28EBA
-            ]
-            + Op.SWAP2
-            + Op.PUSH13[0x74FD62CD9E587A8F013122D935]
-            + Op.PUSH26[0xB6B7DA091527251A4B70051BE4F0F96F61E5DC4AB713C473174C]
-            + Op.PUSH31[
-                0x2EBB463615B03C4787B74E8C204975399439FA553838F186AE028A47F3CCD4  # noqa: E501
-            ]
-            + Op.PUSH13[0x5FCC46C11A36219F3BA1D34DEF]
-            + Op.PUSH28[
-                0xEE989FA61E60A2ABD3652DF9F8E5A1B53D9608E3BB04F5E852333D9C
-            ]
-            + Op.PUSH30[
-                0x761836EF5761178BD07FDE9A0DED16E1659A6C80281C259CE42E3FDBE236
-            ]
-            + Op.PUSH5[0xCE783B58D5]
-            + Op.SWAP6
-        ),
-        balance=0x33498455,
-        nonce=233,
-        address=Address("0x97bc67b6ee773e59e516d02edb13b971c3cbd856"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "73151af76abac2a99afe60eff5cfd8f68daf1b35e0608a690494ef4b1d043bf90e00916a"  # noqa: E501
-            "cf5f0332c3ef3aa972eba960aa557dc165d1a3c726953fc637fe643a60543de4159f3bc0"  # noqa: E501
-            "9673cd054235ddb44769fa2d6edb61b6e71feff2662043418ac9d2337bce1df4b842fbf8"  # noqa: E501
-            "f07395b44bb506e8955d22a12176e2fb8e25bc546d77a6f5049a09f3126c915f14979d8c"  # noqa: E501
-            "7c0cf88425567c6b8a6865b78e6d76208a641cb0d0651a758d9afdd5e36b2dcf740a8a1e"  # noqa: E501
-            "2b19ebb0bc8ad6ac032577f3b5d483e40d0c9a40aaf32cebc478c0962e1ac5f6c648f476"  # noqa: E501
-            "65f0850054ab4caab6eca1a24242087387c96452ad72e76a42a175db6c69a2d8cbcd7075"  # noqa: E501
-            "9249b040a797894765385557e947875851cfe9734edc8b613cbb6bf40b41b762fa3bcbc6"  # noqa: E501
-            "b59ecc66971fef9e8ed16d691702b224f0e2f8ad12577a943401f57334d3207b884a40ed"  # noqa: E501
-            "472960f03e4cab61c98268b5a73b6372ab45a7a4"
+        to=target,
+        data=Bytes(
+            "73151af76abac2a99afe60eff5cfd8f68daf1b35e0608a690494ef4b1d043bf90e00916acf5f0332c3ef3aa972eba960aa557dc165d1a3c726953fc637fe643a60543de4159f3bc09673cd054235ddb44769fa2d6edb61b6e71feff2662043418ac9d2337bce1df4b842fbf8f07395b44bb506e8955d22a12176e2fb8e25bc546d77a6f5049a09f3126c915f14979d8c7c0cf88425567c6b8a6865b78e6d76208a641cb0d0651a758d9afdd5e36b2dcf740a8a1e2b19ebb0bc8ad6ac032577f3b5d483e40d0c9a40aaf32cebc478c0962e1ac5f6c648f47665f0850054ab4caab6eca1a24242087387c96452ad72e76a42a175db6c69a2d8cbcd70759249b040a797894765385557e947875851cfe9734edc8b613cbb6bf40b41b762fa3bcbc6b59ecc66971fef9e8ed16d691702b224f0e2f8ad12577a943401f57334d3207b884a40ed472960f03e4cab61c98268b5a73b6372ab45a7a4"  # noqa: E501
         ),
         gas_limit=8653299,
+        value=0x7F3E3A6AC8834E68,
         gas_price=29,
-        value=9168830121677901416,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=233),
+        addr: Account(storage={}, code=bytes.fromhex("36"), nonce=89),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest348.py b/tests/ported_static/stRandom/test_random_statetest348.py
index cdda5f2bb1e..b4fff8ac8d8 100644
--- a/tests/ported_static/stRandom/test_random_statetest348.py
+++ b/tests/ported_static/stRandom/test_random_statetest348.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest348.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest348Filler.json
+state_tests/stRandom/randomStatetest348Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest348Filler.json"],
+    ["state_tests/stRandom/randomStatetest348Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest348(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest348."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,68 +46,64 @@ def test_random_statetest348(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.XOR(Op.TIMESTAMP, Op.PUSH32[0x1])
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x18208119191509036365739735608A55,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x1ac875748792954a75c59986bae7851bdc422122"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000142186f18208119191509036365739735608a5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.XOR(Op.TIMESTAMP, Op.PUSH32[0x1])
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x18208119191509036365739735608A55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x1AC875748792954A75C59986BAE7851BDC422122),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000142186f18208119191509036365739735608a"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000142186f18208119191509036365739735608a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1329276634,
+        value=0x4F3B26DA,
     )
 
     post = {
-        contract: Account(storage={0: 0x18208119191509036365739735608A55}),
+        target: Account(
+            storage={0: 0x18208119191509036365739735608A55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest349.py b/tests/ported_static/stRandom/test_random_statetest349.py
index 1ed1b347fc0..5f1aedfc476 100644
--- a/tests/ported_static/stRandom/test_random_statetest349.py
+++ b/tests/ported_static/stRandom/test_random_statetest349.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest349.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest349Filler.json
+state_tests/stRandom/randomStatetest349Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest349Filler.json"],
+    ["state_tests/stRandom/randomStatetest349Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest349(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest349."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,64 @@ def test_random_statetest349(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe04425560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.TIMESTAMP,
+            value=Op.DIV(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                Op.PUSH32[0xC350],
+            ),
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x7AE95F23F4E7F70699A603A5B4CAC5CDC841F96D),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.TIMESTAMP,
-                value=Op.DIV(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    Op.PUSH32[0xC350],
-                ),
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x7ae95f23f4e7f70699a603a5b4cac5cdc841f96d"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe0442"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0442"  # noqa: E501
         ),
         gas_limit=100000,
-        value=201035010,
+        value=0xBFB8D02,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                1: 0,
                 1000: 0x14F8B588E368F08461F9F01B866E43AA79BBADC0980B242070B8CFBFC6540,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest350.py b/tests/ported_static/stRandom/test_random_statetest350.py
index cd4117ade70..42f404eea9c 100644
--- a/tests/ported_static/stRandom/test_random_statetest350.py
+++ b/tests/ported_static/stRandom/test_random_statetest350.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest350.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest350Filler.json
+state_tests/stRandom/randomStatetest350Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest350Filler.json"],
+    ["state_tests/stRandom/randomStatetest350Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest350(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest350."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,155 +43,59 @@ def test_random_statetest350(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.ADDMOD(
-                    Op.MULMOD(
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                        Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    ),
-                    Op.PUSH32[0x0],
-                    Op.PREVRANDAO,
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff090860005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.ADDMOD(
+                Op.MULMOD(
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
                 ),
-            )
+                Op.PUSH32[0x0],
+                Op.PREVRANDAO,
+            ),
         ),
         nonce=0,
-        address=Address("0xe81d688b7d2e6264deec5b61c7e8e02426c7256f"),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff0908"
-        ),
-        gas_limit=100000,
-        value=1634268072,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest350Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest350_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.ADDMOD(
-                    Op.MULMOD(
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                        Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    ),
-                    Op.PUSH32[0x0],
-                    Op.PREVRANDAO,
-                ),
-            )
-        ),
-        nonce=0,
-        address=Address("0xe81d688b7d2e6264deec5b61c7e8e02426c7256f"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff0908"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0908"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1634268072,
+        value=0x6168F3A8,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={0: 0}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest351.py b/tests/ported_static/stRandom/test_random_statetest351.py
index 7fc7df07616..63abf6c95d8 100644
--- a/tests/ported_static/stRandom/test_random_statetest351.py
+++ b/tests/ported_static/stRandom/test_random_statetest351.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest351.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest351Filler.json
+state_tests/stRandom/randomStatetest351Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest351Filler.json"],
+    ["state_tests/stRandom/randomStatetest351Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest351(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest351."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,61 +47,51 @@ def test_random_statetest351(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0509355534707785320175fca41455  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0509355534707785320175fca41455"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xB3E70B8B43ACA022897DEC6729EBB6E4355E00F1),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe0509355534707785320175fca41455"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xb3e70b8b43aca022897dec6729ebb6e4355e00f1"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe0509355534707785320175fca414"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0509355534707785320175fca414"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1215186094,
+        value=0x486E44AE,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x7F00000000000000000000000000000000000000000000000000000000000000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest352.py b/tests/ported_static/stRandom/test_random_statetest352.py
index e81011db6de..c375ac9de31 100644
--- a/tests/ported_static/stRandom/test_random_statetest352.py
+++ b/tests/ported_static/stRandom/test_random_statetest352.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest352.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest352Filler.json
+state_tests/stRandom/randomStatetest352Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest352Filler.json"],
+    ["state_tests/stRandom/randomStatetest352Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest352(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest352."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,76 +43,68 @@ def test_random_statetest352(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.GASPRICE
-            + Op.CALLCODE(
-                gas=Op.DUP5,
-                address=Op.DUP3,
-                value=Op.TIMESTAMP,
-                args_offset=Op.SGT(
-                    Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-                    Op.PUSH32[0x0],
-                ),
-                args_size=Op.PUSH32[
-                    0x4F3F701464972E74606D6EA82D4D3080599A0E79
-                ],
-                ret_offset=Op.PUSH32[0xC350],
-                ret_size=Op.GASLIMIT,
-            )
-            + Op.DUP11
-            + Op.SWAP9
-            + Op.SIGNEXTEND
-            + Op.GASLIMIT
-            + Op.CODECOPY
-            + Op.LOG3
-            + Op.SWAP14
-            + Op.EQ
-            + Op.ADDMOD
-        ),
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000003a457f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>13428284f28a980b4539a39d1408  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.GASPRICE
+        + Op.CALLCODE(
+            gas=Op.DUP5,
+            address=Op.DUP3,
+            value=Op.TIMESTAMP,
+            args_offset=Op.SGT(
+                Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+                Op.PUSH32[0x0],
+            ),
+            args_size=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+            ret_offset=Op.PUSH32[0xC350],
+            ret_size=Op.GASLIMIT,
+        )
+        + Op.DUP11
+        + Op.SWAP9
+        + Op.SIGNEXTEND
+        + Op.GASLIMIT
+        + Op.CODECOPY
+        + Op.LOG3
+        + Op.SWAP14
+        + Op.EQ
+        + Op.ADDMOD,
         nonce=0,
-        address=Address("0x936cfc08bee110b939b632fe581fdc10e3484e0f"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000003a457f000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000c3507f000000000000"  # noqa: E501
-            "0000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000007f000000000000000000000000"  # noqa: E501
-            "4f3f701464972e74606d6ea82d4d3080599a0e7913428284f28a980b4539a39d1408"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000003a457f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7913428284f28a980b4539a39d1408"  # noqa: E501
         ),
         gas_limit=100000,
-        value=21936558,
+        value=0x14EB9AE,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest353.py b/tests/ported_static/stRandom/test_random_statetest353.py
index b5e3907a2d2..23459f796bc 100644
--- a/tests/ported_static/stRandom/test_random_statetest353.py
+++ b/tests/ported_static/stRandom/test_random_statetest353.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest353.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest353Filler.json
+state_tests/stRandom/randomStatetest353Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest353Filler.json"],
+    ["state_tests/stRandom/randomStatetest353Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest353(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest353."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,45 @@ def test_random_statetest353(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000120ba49036880f86529655  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000357fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000"  # noqa: E501
-            "00000000000000000000000000000000120ba49036880f86529655"
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000120ba49036880f86529655"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xdfb2de0e2dc6bcf9941a4b2040af9a9cd6cc8ca7"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000357fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000"  # noqa: E501
-            "00000000000000000000000000000000120ba49036880f865296"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000120ba49036880f865296"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1727538107,
+        value=0x66F823BB,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest354.py b/tests/ported_static/stRandom/test_random_statetest354.py
index 28501ceee40..53d7e262a47 100644
--- a/tests/ported_static/stRandom/test_random_statetest354.py
+++ b/tests/ported_static/stRandom/test_random_statetest354.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest354.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest354Filler.json
+state_tests/stRandom/randomStatetest354Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest354Filler.json"],
+    ["state_tests/stRandom/randomStatetest354Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest354(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest354."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,79 +47,72 @@ def test_random_statetest354(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.CALLDATALOAD(offset=0x3B)
-            + Op.PUSH5[0x1A8E739F86]
-            + Op.SWAP9
-            + Op.EXP
-            + Op.NUMBER
-            + Op.CALLDATACOPY
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350603b35641a8e739f86980a433760005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.CALLDATALOAD(offset=0x3B)
+        + Op.PUSH5[0x1A8E739F86]
+        + Op.SWAP9
+        + Op.EXP
+        + Op.NUMBER
+        + Op.CALLDATACOPY
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0xf5128d151d2b28eab17b340c1bd00e96683b90d6"),  # noqa: E501
+        address=Address(0xF5128D151D2B28EAB17B340C1BD00E96683B90D6),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000007fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c350603b35641a8e739f86980a4337"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350603b35641a8e739f86980a4337"  # noqa: E501
         ),
         gas_limit=100000,
-        value=615164662,
+        value=0x24AAAAF6,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest355.py b/tests/ported_static/stRandom/test_random_statetest355.py
index 355fb4e99d3..b33a0979d45 100644
--- a/tests/ported_static/stRandom/test_random_statetest355.py
+++ b/tests/ported_static/stRandom/test_random_statetest355.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest355.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest355Filler.json
+state_tests/stRandom/randomStatetest355Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest355Filler.json"],
+    ["state_tests/stRandom/randomStatetest355Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest355(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest355."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,45 @@ def test_random_statetest355(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>457f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001666b56e87c5a499d5389306e55  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e79457f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507f00000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000001666b56e87c5a499d5389306e55"
+            "7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79457f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001666b56e87c5a499d5389306e55"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xcecd2ae07d64d406743f25363af5c2cd6e8ffc2a"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e79457f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507f00000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000001666b56e87c5a499d5389306e"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79457f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001666b56e87c5a499d5389306e"  # noqa: E501
         ),
         gas_limit=100000,
-        value=659556805,
+        value=0x275009C5,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest356.py b/tests/ported_static/stRandom/test_random_statetest356.py
index a71049fdbcb..9c8ed826c38 100644
--- a/tests/ported_static/stRandom/test_random_statetest356.py
+++ b/tests/ported_static/stRandom/test_random_statetest356.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest356.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest356Filler.json
+state_tests/stRandom/randomStatetest356Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest356Filler.json"],
+    ["state_tests/stRandom/randomStatetest356Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest356(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest356."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,63 @@ def test_random_statetest356(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.DUP3
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.DIV(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    Op.PUSH32[0xC350],
-                ),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>827f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0460005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.DUP3
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.DIV(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                Op.PUSH32[0xC350],
+            ),
         ),
         nonce=0,
-        address=Address("0x744cd72ca97273b1a4c6495db482d22141b79c36"),  # noqa: E501
+        address=Address(0x744CD72CA97273B1A4C6495DB482D22141B79C36),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e79827f00000000000000000000"  # noqa: E501
-            "00004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe04"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79827f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe04"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1329095939,
+        value=0x4F386503,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x14F8B588E368F08461F9F01B866E43AA79BBADC0980B242070B8CFBFC6540,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest357.py b/tests/ported_static/stRandom/test_random_statetest357.py
index b680bbc50f9..6a473f03531 100644
--- a/tests/ported_static/stRandom/test_random_statetest357.py
+++ b/tests/ported_static/stRandom/test_random_statetest357.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest357.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest357Filler.json
+state_tests/stRandom/randomStatetest357Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest357Filler.json"],
+    ["state_tests/stRandom/randomStatetest357Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest357(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest357."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,45 @@ def test_random_statetest357(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09377c5380715560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09377c5380715560005155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c350427fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff09377c5380715560005155"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x625c4c0c1932d06a13b656f82b55acaf57689dda"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c350427fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff09377c538071"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09377c538071"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1516457170,
+        value=0x5A634CD2,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest358.py b/tests/ported_static/stRandom/test_random_statetest358.py
index 9af9f446a93..32035f4e334 100644
--- a/tests/ported_static/stRandom/test_random_statetest358.py
+++ b/tests/ported_static/stRandom/test_random_statetest358.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest358.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest358Filler.json
+state_tests/stRandom/randomStatetest358Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest358Filler.json"],
+    ["state_tests/stRandom/randomStatetest358Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest358(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest358."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,64 +46,59 @@ def test_random_statetest358(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.COINBASE
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.NUMBER
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x679B82A092078F136B5541888C057A55,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x009c8651ca2d7c8dfbf9e9db5c57a213e25f0aac"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000c3506f679b82a092078f136b5541888c057a5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79] * 2
+        + Op.COINBASE
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.NUMBER
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x679B82A092078F136B5541888C057A55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x009C8651CA2D7C8DFBF9E9DB5C57A213E25F0AAC),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e79417fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000c3506f679b82a092078f136b5541888c057a"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000c3506f679b82a092078f136b5541888c057a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=623856537,
+        value=0x252F4B99,
     )
 
     post = {
-        contract: Account(storage={0: 0x679B82A092078F136B5541888C057A55}),
+        target: Account(
+            storage={0: 0x679B82A092078F136B5541888C057A55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest359.py b/tests/ported_static/stRandom/test_random_statetest359.py
index d2854b77e65..64a5342d6fa 100644
--- a/tests/ported_static/stRandom/test_random_statetest359.py
+++ b/tests/ported_static/stRandom/test_random_statetest359.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest359.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest359Filler.json
+state_tests/stRandom/randomStatetest359Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest359Filler.json"],
+    ["state_tests/stRandom/randomStatetest359Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest359(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest359."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,45 @@ def test_random_statetest359(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff428d06809e75f26764867d853b0555  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000007f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff428d06809e75f26764867d853b0555"  # noqa: E501
+            "7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff428d06809e75f26764867d853b0555"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x2e42fa9e3e939bc1af51a19d6e8d3d80cd923842"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000007f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff428d06809e75f26764867d853b05"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff428d06809e75f26764867d853b05"  # noqa: E501
         ),
         gas_limit=100000,
-        value=801407730,
+        value=0x2FC482F2,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest36.py b/tests/ported_static/stRandom/test_random_statetest36.py
index 4c77a35e9f8..1a31f763bf3 100644
--- a/tests/ported_static/stRandom/test_random_statetest36.py
+++ b/tests/ported_static/stRandom/test_random_statetest36.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest36.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest36Filler.json
+state_tests/stRandom/randomStatetest36Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest36Filler.json"],
+    ["state_tests/stRandom/randomStatetest36Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest36(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest36."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,74 +44,63 @@ def test_random_statetest36(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000448243628c0970843ba460005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PREVRANDAO
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x1]
+        + Op.LOG4(
+            offset=Op.EXTCODESIZE(address=Op.DUP5),
+            size=0x8C0970,
+            topic_1=Op.NUMBER,
+            topic_2=Op.DUP3,
+            topic_3=Op.PREVRANDAO,
+            topic_4=Op.PUSH32[0x10000000000000000000000000000000000000000],
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PREVRANDAO
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.LOG4(
-                offset=Op.EXTCODESIZE(address=Op.DUP5),
-                size=0x8C0970,
-                topic_1=Op.NUMBER,
-                topic_2=Op.DUP3,
-                topic_3=Op.PREVRANDAO,
-                topic_4=Op.PUSH32[0x10000000000000000000000000000000000000000],
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xad6fffed2e41e6d57f10debdf91b1dc35758b7ad"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000017fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000017f00000000000000000000000100000000"  # noqa: E501
-            "00000000000000000000000000000000448243628c0970843ba4"
+        to=target,
+        data=Bytes(
+            "447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000448243628c0970843ba4"  # noqa: E501
         ),
         gas_limit=1518298975,
-        value=2098819291,
+        value=0x7D1970DB,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest360.py b/tests/ported_static/stRandom/test_random_statetest360.py
index 4c069ae366a..97a0128ab69 100644
--- a/tests/ported_static/stRandom/test_random_statetest360.py
+++ b/tests/ported_static/stRandom/test_random_statetest360.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest360.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest360Filler.json
+state_tests/stRandom/randomStatetest360Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest360Filler.json"],
+    ["state_tests/stRandom/randomStatetest360Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest360(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest360."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,61 @@ def test_random_statetest360(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x441548AF30803135562840563829C55,
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016f0441548af30803135562840563829c5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x441548AF30803135562840563829C55
         ),
         nonce=0,
-        address=Address("0xee7c7c19ef09791c7b863ccbee181fefd5ebdcae"),  # noqa: E501
+        address=Address(0xEE7C7C19EF09791C7B863CCBEE181FEFD5EBDCAE),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000007f0000000000000000000000010000"  # noqa: E501
-            "0000000000000000000000000000000000007fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000016f0441548af30803135562840563829c"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016f0441548af30803135562840563829c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=991329291,
+        value=0x3B167C0B,
     )
 
     post = {
-        contract: Account(storage={0: 0x441548AF30803135562840563829C55}),
+        target: Account(
+            storage={0: 0x441548AF30803135562840563829C55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest361.py b/tests/ported_static/stRandom/test_random_statetest361.py
index d0d3906c6f1..ffefa4de78a 100644
--- a/tests/ported_static/stRandom/test_random_statetest361.py
+++ b/tests/ported_static/stRandom/test_random_statetest361.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest361.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest361Filler.json
+state_tests/stRandom/randomStatetest361Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest361Filler.json"],
+    ["state_tests/stRandom/randomStatetest361Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest361(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest361."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,66 +47,61 @@ def test_random_statetest361(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.COINBASE
-            + Op.COINBASE
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.MOD(
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                Op.PUSH32[0x10000000000000000000000000000000000000000],
-            )
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x9E9092673A8F430B6BA1152090181655,
-            )
+    # Source: raw
+    # 0x41417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff066f9e9092673a8f430b6ba115209018165560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.COINBASE * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.MOD(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+            Op.PUSH32[0x10000000000000000000000000000000000000000],
+        )
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x9E9092673A8F430B6BA1152090181655
         ),
         nonce=0,
-        address=Address("0x340510d159871ca56b7b6ba9b4fc8bf6c6a5a535"),  # noqa: E501
+        address=Address(0x340510D159871CA56B7B6BA9B4FC8BF6C6A5A535),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "41417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f"  # noqa: E501
-            "00000000000000000000000100000000000000000000000000000000000000007fffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000"  # noqa: E501
-            "00000000000100000000000000000000000000000000000000007fffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffff066f9e9092673a8f430b6ba115"  # noqa: E501
-            "20901816"
+        to=target,
+        data=Bytes(
+            "41417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff066f9e9092673a8f430b6ba11520901816"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1958353085,
+        value=0x74BA18BD,
     )
 
     post = {
-        contract: Account(storage={0: 0x9E9092673A8F430B6BA1152090181655}),
+        target: Account(
+            storage={0: 0x9E9092673A8F430B6BA1152090181655},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest362.py b/tests/ported_static/stRandom/test_random_statetest362.py
index 61b23675f72..d0dc5cdacf9 100644
--- a/tests/ported_static/stRandom/test_random_statetest362.py
+++ b/tests/ported_static/stRandom/test_random_statetest362.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest362.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest362Filler.json
+state_tests/stRandom/randomStatetest362Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest362Filler.json"],
+    ["state_tests/stRandom/randomStatetest362Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest362(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest362."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,72 +47,63 @@ def test_random_statetest362(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MULMOD(
-                    Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b50955  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.SSTORE(
+            key=Op.MULMOD(
+                Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a"  # noqa: E501
-            "98b57a48a06ae28d285a71b509"
+        to=contract_0,
+        data=Bytes(
+            "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b509"  # noqa: E501
         ),
         gas_limit=100000,
-        value=822238394,
+        value=0x31025CBA,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0xFFFFFFFFFFFFFFFFFFFFFFFF6BACFB1469F9A4D5674A85B75F951D72D7A58E4A: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest363.py b/tests/ported_static/stRandom/test_random_statetest363.py
index 167b64fe704..e5ca12e8a91 100644
--- a/tests/ported_static/stRandom/test_random_statetest363.py
+++ b/tests/ported_static/stRandom/test_random_statetest363.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest363.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest363Filler.json
+state_tests/stRandom/randomStatetest363Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest363Filler.json"],
+    ["state_tests/stRandom/randomStatetest363Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest363(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest363."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,64 @@ def test_random_statetest363(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.GT(
-                Op.PUSH32[0xC350],
-                Op.PUSH32[0x10000000000000000000000000000000000000000],
-            )
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x7B20937D953695F369719F9A44790555,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350117ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f7b20937d953695f369719f9a4479055560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.GT(
+            Op.PUSH32[0xC350],
+            Op.PUSH32[0x10000000000000000000000000000000000000000],
+        )
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x7B20937D953695F369719F9A44790555
         ),
         nonce=0,
-        address=Address("0xcaf50c7efed9c2ac1920749b5b1da29c765dcdd7"),  # noqa: E501
+        address=Address(0xCAF50C7EFED9C2AC1920749B5B1DA29C765DCDD7),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c350117fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe6f7b20937d953695f369719f9a447905"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350117ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f7b20937d953695f369719f9a447905"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1276687966,
+        value=0x4C18B65E,
     )
 
     post = {
-        contract: Account(storage={0: 0x7B20937D953695F369719F9A44790555}),
+        target: Account(
+            storage={0: 0x7B20937D953695F369719F9A44790555},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest364.py b/tests/ported_static/stRandom/test_random_statetest364.py
index 38bfad9795b..50baeaa3a88 100644
--- a/tests/ported_static/stRandom/test_random_statetest364.py
+++ b/tests/ported_static/stRandom/test_random_statetest364.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest364.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest364Filler.json
+state_tests/stRandom/randomStatetest364Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest364Filler.json"],
+    ["state_tests/stRandom/randomStatetest364Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest364(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest364."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,61 @@ def test_random_statetest364(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SMOD(
-                Op.PUSH32[0xC350],
-                Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-            )
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x7332988D746694918859185920446D55,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c350076f7332988d746694918859185920446d5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SMOD(
+            Op.PUSH32[0xC350],
+            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+        )
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x7332988D746694918859185920446D55
         ),
         nonce=0,
-        address=Address("0x81c6b6d0445898d97501d83d77947b4365ea2533"),  # noqa: E501
+        address=Address(0x81C6B6D0445898D97501D83D77947B4365EA2533),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c350076f7332988d746694918859185920446d"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c350076f7332988d746694918859185920446d"  # noqa: E501
         ),
         gas_limit=100000,
-        value=630230945,
+        value=0x25908FA1,
     )
 
     post = {
-        contract: Account(storage={0: 0x7332988D746694918859185920446D55}),
+        target: Account(
+            storage={0: 0x7332988D746694918859185920446D55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest365.py b/tests/ported_static/stRandom/test_random_statetest365.py
index 9631caab804..2e722acb713 100644
--- a/tests/ported_static/stRandom/test_random_statetest365.py
+++ b/tests/ported_static/stRandom/test_random_statetest365.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest365.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest365Filler.json
+state_tests/stRandom/randomStatetest365Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest365Filler.json"],
+    ["state_tests/stRandom/randomStatetest365Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest365(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest365."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,75 +43,71 @@ def test_random_statetest365(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff42417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000143b420785375560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.TIMESTAMP
+        + Op.COINBASE
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x0]
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP6,
+            offset=Op.SMOD(
+                Op.TIMESTAMP,
+                Op.EXTCODESIZE(
+                    address=Op.EQ(
+                        Op.PUSH32[0x0],
+                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                    )
+                ),
+            ),
+            size=Op.PUSH32[0xC350],
+        )
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.TIMESTAMP
-            + Op.COINBASE
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x0]
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP6,
-                offset=Op.SMOD(
-                    Op.TIMESTAMP,
-                    Op.EXTCODESIZE(
-                        address=Op.EQ(
-                            Op.PUSH32[0x0],
-                            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                        ),
-                    ),
-                ),
-                size=Op.PUSH32[0xC350],
-            )
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x51d8e96d50235f1ecb7b408b657349b038e7a135"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff42417f"  # noqa: E501
-            "000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000007f000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000c3507fffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000143b42078537"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff42417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000143b42078537"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1219277154,
+        value=0x48ACB162,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0x4F3F701464972E74606D6EA82D4D3080599A0E79},
+        target: Account(
+            storage={
+                0: coinbase,
+                0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 0,  # noqa: E501
+            },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest366.py b/tests/ported_static/stRandom/test_random_statetest366.py
index 5fd0db4c240..2c03fd159a0 100644
--- a/tests/ported_static/stRandom/test_random_statetest366.py
+++ b/tests/ported_static/stRandom/test_random_statetest366.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest366.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest366Filler.json
+state_tests/stRandom/randomStatetest366Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest366Filler.json"],
+    ["state_tests/stRandom/randomStatetest366Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest366(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest366."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,69 +46,64 @@ def test_random_statetest366(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PREVRANDAO
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x516F0395F57433725580758F32F19455,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x0bc2ce358220862eda2ba9b6a96ba6e93692593d"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff446f516f0395f57433725580758f32f1945560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PREVRANDAO
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x516F0395F57433725580758F32F19455
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x0BC2CE358220862EDA2BA9B6A96BA6E93692593D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff446f516f0395f57433725580758f32f194"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff446f516f0395f57433725580758f32f194"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2102558524,
+        value=0x7D527F3C,
     )
 
     post = {
-        contract: Account(storage={0: 0x516F0395F57433725580758F32F19455}),
+        target: Account(
+            storage={0: 0x516F0395F57433725580758F32F19455},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest367.py b/tests/ported_static/stRandom/test_random_statetest367.py
index ea17b0ce196..b0bf5dfc335 100644
--- a/tests/ported_static/stRandom/test_random_statetest367.py
+++ b/tests/ported_static/stRandom/test_random_statetest367.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest367.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest367Filler.json
+state_tests/stRandom/randomStatetest367Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest367Filler.json"],
+    ["state_tests/stRandom/randomStatetest367Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest367(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest367."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,74 +47,67 @@ def test_random_statetest367(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x0]
-            + Op.PREVRANDAO
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.SSTORE(
-                key=0x7A5959339F3342838B55600051,
-                value=Op.EXP(
-                    Op.DUP2,
-                    Op.SDIV(
-                        Op.NOT(
-                            Op.PUSH32[
-                                0x945304EB96065B2A98B57A48A06AE28D285A71B5
-                            ],
-                        ),
-                        Op.PREVRANDAO,
-                    ),
-                ),
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5447f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b51905810a6c7a5959339f3342838b5560005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x0]
+        + Op.PREVRANDAO
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.SSTORE(
+            key=0x7A5959339F3342838B55600051,
+            value=Op.EXP(
+                Op.DUP2,
+                Op.SDIV(
+                    Op.NOT(
+                        Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+                    ),
+                    Op.PREVRANDAO,
+                ),
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000447f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507f00000000000000000000"  # noqa: E501
-            "0000945304eb96065b2a98b57a48a06ae28d285a71b5447f000000000000000000000000"  # noqa: E501
-            "945304eb96065b2a98b57a48a06ae28d285a71b51905810a6c7a5959339f3342838b"  # noqa: E501
+        to=contract_0,
+        data=Bytes(
+            "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5447f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b51905810a6c7a5959339f3342838b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=734254896,
+        value=0x2BC3D730,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0x7A5959339F3342838B55600051: 0x880AD67C991058B3847EC9F491F7A8D6ECBB1DFF5C2326E7E8E9EB560CA29ECD,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest368.py b/tests/ported_static/stRandom/test_random_statetest368.py
index 1713ee2ac29..931daeccdaf 100644
--- a/tests/ported_static/stRandom/test_random_statetest368.py
+++ b/tests/ported_static/stRandom/test_random_statetest368.py
@@ -1,19 +1,20 @@
 """
-Test ported from static filler.
+Test_random_statetest368.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest368Filler.json
+state_tests/stRandom/randomStatetest368Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest368Filler.json"],
+    ["state_tests/stRandom/randomStatetest368Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +31,10 @@ def test_random_statetest368(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_random_statetest368."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +45,48 @@ def test_random_statetest368(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe097f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000007f000000000000000000000000945304eb"  # noqa: E501
-            "96065b2a98b57a48a06ae28d285a71b54206f06d870339356057907760005155"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b54206f06d870339356057907760005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b54206f06d870339356057907760005155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe097f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000007f000000000000000000000000945304eb"  # noqa: E501
-            "96065b2a98b57a48a06ae28d285a71b54206f06d8703393560579077"
+        to=contract_0,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b54206f06d8703393560579077"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1135359124,
+        value=0x43AC3494,
     )
 
-    post: dict = {}
+    post = {
+        contract_0: Account(storage={}, nonce=1),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={}, code=b"", balance=1000, nonce=1
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest369.py b/tests/ported_static/stRandom/test_random_statetest369.py
index 6ed51e2fe53..dc7b6e31a3b 100644
--- a/tests/ported_static/stRandom/test_random_statetest369.py
+++ b/tests/ported_static/stRandom/test_random_statetest369.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest369.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest369Filler.json
+state_tests/stRandom/randomStatetest369Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest369Filler.json"],
+    ["state_tests/stRandom/randomStatetest369Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest369(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest369."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,60 @@ def test_random_statetest369(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000001000000000000000000000000000000000000000060005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000] * 2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.NUMBER
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.PUSH32[0x10000000000000000000000000000000000000000],
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xB9338612BBB668A632DB855BFD2E9B1695BD24C1),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.NUMBER
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.PUSH32[0x10000000000000000000000000000000000000000],
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xb9338612bbb668a632db855bfd2e9b1695bd24c1"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff437f00000000000000000000000100000000"  # noqa: E501
-            "00000000000000000000000000000000"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f0000000000000000000000010000000000000000000000000000000000000000"  # noqa: E501
         ),
         gas_limit=100000,
-        value=471893354,
+        value=0x1C20856A,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={0: 0x10000000000000000000000000000000000000000},
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest37.py b/tests/ported_static/stRandom/test_random_statetest37.py
index d098a607702..d12c00792ca 100644
--- a/tests/ported_static/stRandom/test_random_statetest37.py
+++ b/tests/ported_static/stRandom/test_random_statetest37.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest37.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest37Filler.json
+state_tests/stRandom/randomStatetest37Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest37Filler.json"],
+    ["state_tests/stRandom/randomStatetest37Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest37(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest37."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,61 @@ def test_random_statetest37(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000016fa49835863514f0f29b930b97f116935560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0xA49835863514F0F29B930B97F1169355
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xD09F2B0C98E1C848F2183A3ADF639542A1D15550),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0xA49835863514F0F29B930B97F1169355,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xd09f2b0c98e1c848f2183a3adf639542a1d15550"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000007fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507f0000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000016fa49835863514f0f29b930b97f11693"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000016fa49835863514f0f29b930b97f11693"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1992729901,
+        value=0x76C6A52D,
     )
 
     post = {
-        contract: Account(storage={0: 0xA49835863514F0F29B930B97F1169355}),
+        target: Account(
+            storage={0: 0xA49835863514F0F29B930B97F1169355},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest370.py b/tests/ported_static/stRandom/test_random_statetest370.py
index 8da01346c0f..118b5f29d62 100644
--- a/tests/ported_static/stRandom/test_random_statetest370.py
+++ b/tests/ported_static/stRandom/test_random_statetest370.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest370.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest370Filler.json
+state_tests/stRandom/randomStatetest370Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest370Filler.json"],
+    ["state_tests/stRandom/randomStatetest370Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest370(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest370."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,64 +43,58 @@ def test_random_statetest370(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PREVRANDAO
-            + Op.SHA3
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.MSTORE8(
-                offset=Op.EQ(
-                    Op.PUSH32[0x1],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-                value=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-            )
-            + Op.PREVRANDAO
-            + Op.SSTORE(key=0x4627F55600051, value=Op.DUP5)
-        ),
+    # Source: raw
+    # 0x44207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001145344846604627f5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PREVRANDAO
+        + Op.SHA3
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x0]
+        + Op.MSTORE8(
+            offset=Op.EQ(
+                Op.PUSH32[0x1],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+            value=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+        )
+        + Op.PREVRANDAO
+        + Op.SSTORE(key=0x4627F55600051, value=Op.DUP5),
         nonce=0,
-        address=Address("0xe73096ede5f7c095146a2b72c29b48a70f2dc518"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "44207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f"  # noqa: E501
-            "00000000000000000000000100000000000000000000000000000000000000007f000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000007f000000000000"  # noqa: E501
-            "0000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000001145344846604627f"
+        to=target,
+        data=Bytes(
+            "44207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001145344846604627f"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1561176030,
+        value=0x5D0DA7DE,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest371.py b/tests/ported_static/stRandom/test_random_statetest371.py
index 43ecfbd4fa9..a2a302b67b4 100644
--- a/tests/ported_static/stRandom/test_random_statetest371.py
+++ b/tests/ported_static/stRandom/test_random_statetest371.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest371.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest371Filler.json
+state_tests/stRandom/randomStatetest371Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest371Filler.json"],
+    ["state_tests/stRandom/randomStatetest371Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest371(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest371."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,70 +47,66 @@ def test_random_statetest371(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.CODECOPY(
-                dest_offset=Op.LT(Op.GAS, Op.NUMBER),
-                offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
-                size=Op.PUSH32[0xC350],
-            )
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000435a10395560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.CODECOPY(
+            dest_offset=Op.LT(Op.GAS, Op.NUMBER),
+            offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
+            size=Op.PUSH32[0xC350],
+        )
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x47409fd2bcee15d0a7048561060814d302d97dbd"),  # noqa: E501
+        address=Address(0x47409FD2BCEE15D0A7048561060814D302D97DBD),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507f0000000000000000000000010000"  # noqa: E501
-            "000000000000000000000000000000000000435a1039"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000435a1039"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2118132562,
+        value=0x7E402352,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 50000,
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 0x10000000000000000000000000000000000000000,  # noqa: E501
             },
+            balance=0x7E402352,
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest372.py b/tests/ported_static/stRandom/test_random_statetest372.py
index daf4c34481f..8db67f5e1f8 100644
--- a/tests/ported_static/stRandom/test_random_statetest372.py
+++ b/tests/ported_static/stRandom/test_random_statetest372.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest372.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest372Filler.json
+state_tests/stRandom/randomStatetest372Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest372Filler.json"],
+    ["state_tests/stRandom/randomStatetest372Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest372(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest372."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,71 +47,63 @@ def test_random_statetest372(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.ADDMOD(
-                    Op.XOR(
-                        Op.PUSH32[0x1],
-                        Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
-                    ),
-                    Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
-                    Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
-                ),
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001180860005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000] * 2
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.ADDMOD(
+                Op.XOR(
+                    Op.PUSH32[0x1],
+                    Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
+                ),
+                Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
+                Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000009453"  # noqa: E501
-            "04eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96"  # noqa: E501
-            "065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000011808"
+        to=contract_0,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000011808"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1833691657,
+        value=0x6D4BEA09,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={0: 0x945304EB96065B2A98B57A48A06AE28D285A71B4},
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest376.py b/tests/ported_static/stRandom/test_random_statetest376.py
index ff99e41cf0b..9a25b9ccd87 100644
--- a/tests/ported_static/stRandom/test_random_statetest376.py
+++ b/tests/ported_static/stRandom/test_random_statetest376.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest376.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest376Filler.json
+state_tests/stRandom/randomStatetest376Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest376Filler.json"],
+    ["state_tests/stRandom/randomStatetest376Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest376(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest376."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,55 +47,48 @@ def test_random_statetest376(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09ff8c316460005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09ff8c316460005155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x916DB3A57FDC41EB46F3D4F00A9248F593F166DF),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff427fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe09ff8c316460005155"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x916db3a57fdc41eb46f3d4f00a9248f593f166df"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff427fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe09ff8c3164"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09ff8c3164"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1872596219,
+        value=0x6F9D8CFB,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x0000000000000000000000000000000000000001): Account(
+            storage={}, code=b"", nonce=0
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest378.py b/tests/ported_static/stRandom/test_random_statetest378.py
index f9e1a62ff0e..580339d4db8 100644
--- a/tests/ported_static/stRandom/test_random_statetest378.py
+++ b/tests/ported_static/stRandom/test_random_statetest378.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest378.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest378Filler.json
+state_tests/stRandom/randomStatetest378Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest378Filler.json"],
+    ["state_tests/stRandom/randomStatetest378Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,8 +32,8 @@ def test_random_statetest378(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest378."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -47,60 +48,59 @@ def test_random_statetest378(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff547f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000005a7f00000000000000000000000000000000000000000000000000000000000000016f855b445834721a5706f2891711f0025560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SLOAD(
+            key=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        )
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.GAS
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x855B445834721A5706F2891711F00255
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x9716081CE3858124F07E1313AA0D2BC5A6F6DDD2),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SLOAD(key=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF])
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.GAS
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x855B445834721A5706F2891711F00255,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x9716081ce3858124f07e1313aa0d2bc5a6f6ddd2"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff547f00"  # noqa: E501
-            "0000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000017f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000005a7f000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000016f855b445834721a5706f2891711f002"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff547f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000005a7f00000000000000000000000000000000000000000000000000000000000000016f855b445834721a5706f2891711f002"  # noqa: E501
         ),
         gas_limit=1231102875,
-        value=1675637682,
+        value=0x63E033B2,
     )
 
     post = {
-        contract: Account(storage={0: 0x855B445834721A5706F2891711F00255}),
+        target: Account(
+            storage={0: 0x855B445834721A5706F2891711F00255},
+            balance=0x63E033B2,
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest379.py b/tests/ported_static/stRandom/test_random_statetest379.py
index dafaa45bfbd..eb39731d420 100644
--- a/tests/ported_static/stRandom/test_random_statetest379.py
+++ b/tests/ported_static/stRandom/test_random_statetest379.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest379.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest379Filler.json
+state_tests/stRandom/randomStatetest379Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest379Filler.json"],
+    ["state_tests/stRandom/randomStatetest379Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest379(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest379."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,43 +43,47 @@ def test_random_statetest379(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x424255
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=Op.TIMESTAMP, value=Op.TIMESTAMP),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2295ef51f8519c010ab5c25f25866bc0ab5ec2ee"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={1000: 1000}),
+        target: Account(
+            storage={1: 0, 1000: 1000},
+            code=bytes.fromhex("424255"),
+            balance=0xDE0B6B3A76586A0,
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest380.py b/tests/ported_static/stRandom/test_random_statetest380.py
index a8d380d6dd6..3f78aad3b7e 100644
--- a/tests/ported_static/stRandom/test_random_statetest380.py
+++ b/tests/ported_static/stRandom/test_random_statetest380.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest380.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest380Filler.json
+state_tests/stRandom/randomStatetest380Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest380Filler.json"],
+    ["state_tests/stRandom/randomStatetest380Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest380(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest380."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,66 @@ def test_random_statetest380(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x967737653485593C63408B3994397555,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f967737653485593c63408b399439755560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x967737653485593C63408B3994397555
         ),
         nonce=0,
-        address=Address("0x40de5d47e4303b1687bedbc9a92064d4a45ba779"),  # noqa: E501
+        address=Address(0x40DE5D47E4303B1687BEDBC9A92064D4A45BA779),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000007fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe6f967737653485593c63408b39943975"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f967737653485593c63408b39943975"  # noqa: E501
         ),
         gas_limit=100000,
-        value=628563350,
+        value=0x25771D96,
     )
 
     post = {
-        contract: Account(storage={0: 0x967737653485593C63408B3994397555}),
+        target: Account(
+            storage={0: 0x967737653485593C63408B3994397555},
+            balance=0x25771D96,
+            nonce=0,
+        ),
+        coinbase: Account(
+            storage={},
+            code=bytes.fromhex("6000355415600957005b60203560003555"),
+            nonce=0,
+        ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest381.py b/tests/ported_static/stRandom/test_random_statetest381.py
index d294deca4eb..ea94c2e026e 100644
--- a/tests/ported_static/stRandom/test_random_statetest381.py
+++ b/tests/ported_static/stRandom/test_random_statetest381.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest381.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest381Filler.json
+state_tests/stRandom/randomStatetest381Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest381Filler.json"],
+    ["state_tests/stRandom/randomStatetest381Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest381(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest381."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,64 +47,59 @@ def test_random_statetest381(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.COINBASE
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x98BA088881A64904570927A86183555,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff417f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f098ba088881a64904570927a8618355560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.COINBASE
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79] * 2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x98BA088881A64904570927A86183555
         ),
         nonce=0,
-        address=Address("0xa8cab300c7463531929f671107d559cc4c6dcea7"),  # noqa: E501
+        address=Address(0xA8CAB300C7463531929F671107D559CC4C6DCEA7),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff417f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "00004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff6f098ba088881a64904570927a861835"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff417f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f098ba088881a64904570927a861835"  # noqa: E501
         ),
         gas_limit=100000,
-        value=756682627,
+        value=0x2D1A0F83,
     )
 
     post = {
-        contract: Account(storage={0: 0x98BA088881A64904570927A86183555}),
+        target: Account(
+            storage={0: 0x98BA088881A64904570927A86183555},
+            balance=0x2D1A0F83,
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest382.py b/tests/ported_static/stRandom/test_random_statetest382.py
index 8b1695679ed..bf176290fca 100644
--- a/tests/ported_static/stRandom/test_random_statetest382.py
+++ b/tests/ported_static/stRandom/test_random_statetest382.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest382.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest382Filler.json
+state_tests/stRandom/randomStatetest382Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest382Filler.json"],
+    ["state_tests/stRandom/randomStatetest382Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest382(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest382."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,60 @@ def test_random_statetest382(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.ADDMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0855  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0] * 2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.ADDMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xf4845cac94e57781e8b85c32dbd16efc1ee54ee6"),  # noqa: E501
+        address=Address(0xF4845CAC94E57781E8B85C32DBD16EFC1EE54EE6),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe08"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08"  # noqa: E501
         ),
         gas_limit=100000,
-        value=883821556,
+        value=0x34AE0BF4,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
             },
+            balance=0x34AE0BF4,
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest383.py b/tests/ported_static/stRandom/test_random_statetest383.py
index 7d20d03118e..6ea6cfd8913 100644
--- a/tests/ported_static/stRandom/test_random_statetest383.py
+++ b/tests/ported_static/stRandom/test_random_statetest383.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest383.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest383Filler.json
+state_tests/stRandom/randomStatetest383Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest383Filler.json"],
+    ["state_tests/stRandom/randomStatetest383Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest383(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest383."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,52 @@ def test_random_statetest383(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09150255436c75107e  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff09150255436c75107e"
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09150255436c75107e"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x9306b5e9e12f8e3524cb929c05e3f817fd403029"),  # noqa: E501
+        address=Address(0x9306B5E9E12F8E3524CB929C05E3F817FD403029),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff09150255436c75107e"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09150255436c75107e"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1668923511,
+        value=0x6379C077,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x4F3F701464972E74606D6EA82D4D3080599A0E79: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            balance=0x6379C077,
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest384.py b/tests/ported_static/stRandom/test_random_statetest384.py
index 62a01147c35..4e5808ba262 100644
--- a/tests/ported_static/stRandom/test_random_statetest384.py
+++ b/tests/ported_static/stRandom/test_random_statetest384.py
@@ -2,7 +2,7 @@
 Ori Pomerantz   qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest384Filler.yml
+state_tests/stRandom/randomStatetest384Filler.yml
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest384Filler.yml"],
+    ["state_tests/stRandom/randomStatetest384Filler.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,10 +31,10 @@ def test_random_statetest384(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Ori Pomerantz   qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Ori Pomerantz   qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
-        key=0x04DC42D61413D4DED993826AC4D6ED7A4A970C60335D2B285C60A4274E792FF1
+        key=0x4DC42D61413D4DED993826AC4D6ED7A4A970C60335D2B285C60A4274E792FF1
     )
 
     env = Environment(
@@ -45,276 +46,244 @@ def test_random_statetest384(
         gas_limit=71794957647893862,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.EXTCODESIZE(
-                address=0x6675A4758D443DBFF535F034A4EDA729A6FFC1E59F674E0C55,
-            )
-            + Op.PUSH6[0x5D7974272AC7]
-            + Op.AND(0xFFFF, 0x18CE2014249172572ED5EAC0B9D2E4)
-            + Op.SWAP1
-            + Op.LOG0(offset=Op.AND, size=0xFFFF)
-            + Op.CALLER
-            + Op.GT
-            + Op.BASEFEE
-            + Op.EXTCODESIZE(
-                address=Op.EQ(
-                    0x513376BC288AA1FDB973C149CD,
-                    Op.DELEGATECALL(
-                        gas=Op.GAS,
-                        address=0x4D84673D975D1811374A239EF14EE26532D643CC4DD6E9115E28815562C2EB94,  # noqa: E501
-                        args_offset=0xAD13,
-                        args_size=0xA9BB,
-                        ret_offset=0x9FE1,
-                        ret_size=0xC0CD,
-                    ),
-                ),
-            )
-            + Op.PUSH25[0x89CC6512F8D604E5D0656C17F2D45B916DF6816A1999719F2B]
-            + Op.JUMPI(
-                pc=Op.ADD(0x8, Op.PC),
-                condition=Op.AND(0x1, 0xD521394F07100138B341F1DEBC06C3FB3CBC),
-            )
-            + Op.POP(0xCB)
-            + Op.JUMPDEST
-            + Op.PUSH19[0x27E1DC4C54400E52AB133F162C6DF107151D11]
-            + Op.GASLIMIT
-            + Op.SWAP4
-            + Op.SWAP5
-            + Op.GASLIMIT
-            + Op.DUP1
-            + Op.PUSH31[
-                0x5153417E8FF00D138F0DFFC0CD79CED2ECECD6F0DCE826302E4129CB6C37AB  # noqa: E501
-            ]
-            + Op.NUMBER
-            + Op.COINBASE
-            + Op.JUMPDEST
-            + Op.AND(
-                0xFFFF,
+    pre[sender] = Account(balance=0x3635C9ADC5DEA00000, nonce=1)
+    # Source: raw
+    # 0x786675A4758D443DBFF535F034A4EDA729A6FFC1E59F674E0C553b655D7974272AC76e18CE2014249172572ED5EAC0B9D2E461FFFF169061FFFF16a033114861C0CD619FE161A9BB61AD137F4D84673D975D1811374A239EF14EE26532D643CC4DD6E9115E28815562C2EB945AF46c513376BC288AA1FDB973C149CD143b7889CC6512F8D604E5D0656C17F2D45B916DF6816A1999719F2B71D521394F07100138B341F1DEBC06C3FB3CBC600116586008015760CB505B7227E1DC4C54400E52AB133F162C6DF107151D1145939445807e5153417E8FF00D138F0DFFC0CD79CED2ECECD6F0DCE826302E4129CB6C37AB43415B6145C16173CE6152A9610C307FA5D352916626FE6BE4AA6EF0E7634DB7909FD79752E5BCB504B358D36AF708495AF461FFFF169061FFFF16a26cE900F727806828F5EE6088EBF861FFFF165170015C1269FA9F5387AB7387A81F5190564098601F9471B46EB2F2D66EE0B4C6845455E9C5EEFF021875BAE1D66F6CB6213C6CE69859F1046AE4CB5E5B743AB76d66120B1A7A97C93A6A04BD493F4A07963d0b69471B70DEC306FA6142CE9c60FF164303406aA04EA7E0BD9D9CDA29962B05067246CE83AB26762D5E2CFB614AA2394AD1D70EA938856b938D5C3FF280BF7EFDA95E668a70149AFA7A18BF9C2D796DE03773E0D35C9A7e8E0E968BA16F3AD59D6442DDBDB9E537908DB1F791BB3F17B33A14333401071961A1689c7b413ED4A9B16E7D66A17B07730188A08FA9E6148100F0311EA269ECC588607D7fCBFFF9F42E22612E938809AF2674B0CEDC8548F47EE642097C0C4ABC9BF7C76B9678996410D0BF28E5E3E1B35B37FFCE70E346E013D5345494D47690334261771761ABAE6174FD61F1957F1396B439A0049676213FD1FF8B75232DBD2117C0C5DCC184D76E2534EA9628AC5AF4863a9761FFFF169061FFFF16a07e486085A7047BD1ACAB7C048C2AE5A07A9E25934021CFAF0651EFBD393B72141461FFFF165361FFFF169061FFFF16a16a84ED962562151D0B903FB2863004140473380357280D5DBC434298AC45559FC2855C0D2A045a66AF59655ED483A0583160FF16430340795F1536B1893659FBB9FFA023722BEB2F24B5693BE6B572737FED1b9d0a646F7A2658B58b5B417220E684F471111724A4F72553B4FDC9593AE22C96959961A631615AD461199161F3F6618FE07F39DBE091B64B8BE6A557A93BF2C25DD042E8C8FEA4DB3BD8EE5BE3EABDE2835E5AF105600055600155600255600355600455600555600655600755600855600955600a55600b55600c55600d55600e55600f55601055601155601255601355601455601555601655601755601855601955601a55601b55601c55601d55601e5561273961C065F3  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.EXTCODESIZE(
+            address=0x6675A4758D443DBFF535F034A4EDA729A6FFC1E59F674E0C55
+        )
+        + Op.PUSH6[0x5D7974272AC7]
+        + Op.AND(0xFFFF, 0x18CE2014249172572ED5EAC0B9D2E4)
+        + Op.SWAP1
+        + Op.LOG0(offset=Op.AND, size=0xFFFF)
+        + Op.CALLER
+        + Op.GT
+        + Op.BASEFEE
+        + Op.EXTCODESIZE(
+            address=Op.EQ(
+                0x513376BC288AA1FDB973C149CD,
                 Op.DELEGATECALL(
                     gas=Op.GAS,
-                    address=0xA5D352916626FE6BE4AA6EF0E7634DB7909FD79752E5BCB504B358D36AF70849,  # noqa: E501
-                    args_offset=0xC30,
-                    args_size=0x52A9,
-                    ret_offset=0x73CE,
-                    ret_size=0x45C1,
+                    address=0x4D84673D975D1811374A239EF14EE26532D643CC4DD6E9115E28815562C2EB94,  # noqa: E501
+                    args_offset=0xAD13,
+                    args_size=0xA9BB,
+                    ret_offset=0x9FE1,
+                    ret_size=0xC0CD,
                 ),
             )
-            + Op.SWAP1
-            + Op.PUSH2[0xFFFF]
-            + Op.AND
-            + Op.LOG2
-            + Op.MLOAD(offset=Op.AND(0xFFFF, 0xE900F727806828F5EE6088EBF8))
-            + Op.PUSH17[0x15C1269FA9F5387AB7387A81F51905640]
-            + Op.SWAP9
-            + Op.PUSH1[0x1F]
-            + Op.SWAP5
-            + Op.PUSH18[0xB46EB2F2D66EE0B4C6845455E9C5EEFF0218]
-            + Op.SMOD(
-                0x66120B1A7A97C93A6A04BD493F4A,
-                0xBAE1D66F6CB6213C6CE69859F1046AE4CB5E5B743AB7,
-            )
-            + Op.SWAP7
-            + Op.RETURNDATASIZE
-            + Op.SIGNEXTEND
-            + Op.PUSH10[0x471B70DEC306FA6142CE]
-            + Op.SWAP13
-            + Op.MOD(
-                Op.SDIV(
-                    0xA04EA7E0BD9D9CDA29962B,
-                    Op.BLOCKHASH(block_number=Op.SUB(Op.NUMBER, Op.AND)),
-                ),
-                0xFF,
-            )
-            + Op.PUSH19[0x46CE83AB26762D5E2CFB614AA2394AD1D70EA9]
-            + Op.CODESIZE
-            + Op.DUP6
-            + Op.PUSH12[0x938D5C3FF280BF7EFDA95E66]
-            + Op.DUP11
-            + Op.PUSH17[0x149AFA7A18BF9C2D796DE03773E0D35C9A]
-            + Op.NOT(
-                0x8E0E968BA16F3AD59D6442DDBDB9E537908DB1F791BB3F17B33A1433340107,  # noqa: E501
-            )
-            + Op.PUSH2[0xA168]
-            + Op.SWAP13
-            + Op.PUSH28[
-                0x413ED4A9B16E7D66A17B07730188A08FA9E6148100F0311EA269ECC5
-            ]
-            + Op.DUP9
-            + Op.PUSH1[0x7D]
-            + Op.PUSH32[
-                0xCBFFF9F42E22612E938809AF2674B0CEDC8548F47EE642097C0C4ABC9BF7C76B  # noqa: E501
-            ]
-            + Op.SWAP7
-            + Op.PUSH25[0x996410D0BF28E5E3E1B35B37FFCE70E346E013D5345494D476]
-            + Op.SWAP1
-            + Op.CALLER
-            + Op.TIMESTAMP
-            + Op.DELEGATECALL(
+        )
+        + Op.PUSH25[0x89CC6512F8D604E5D0656C17F2D45B916DF6816A1999719F2B]
+        + Op.JUMPI(
+            pc=Op.ADD(0x8, Op.PC),
+            condition=Op.AND(0x1, 0xD521394F07100138B341F1DEBC06C3FB3CBC),
+        )
+        + Op.POP(0xCB)
+        + Op.JUMPDEST
+        + Op.PUSH19[0x27E1DC4C54400E52AB133F162C6DF107151D11]
+        + Op.GASLIMIT
+        + Op.SWAP4
+        + Op.SWAP5
+        + Op.GASLIMIT
+        + Op.DUP1
+        + Op.PUSH31[
+            0x5153417E8FF00D138F0DFFC0CD79CED2ECECD6F0DCE826302E4129CB6C37AB
+        ]
+        + Op.NUMBER
+        + Op.COINBASE
+        + Op.JUMPDEST
+        + Op.AND(
+            0xFFFF,
+            Op.DELEGATECALL(
                 gas=Op.GAS,
-                address=0x1396B439A0049676213FD1FF8B75232DBD2117C0C5DCC184D76E2534EA9628AC,  # noqa: E501
-                args_offset=0xF195,
-                args_size=0x74FD,
-                ret_offset=0xABAE,
-                ret_size=0x7717,
-            )
-            + Op.DUP7
-            + Op.GASPRICE
-            + Op.SWAP8
-            + Op.PUSH2[0xFFFF]
-            + Op.AND
-            + Op.SWAP1
-            + Op.LOG0(offset=Op.AND, size=0xFFFF)
-            + Op.MSTORE8(
-                offset=Op.AND(0xFFFF, Op.EQ),
-                value=0x486085A7047BD1ACAB7C048C2AE5A07A9E25934021CFAF0651EFBD393B7214,  # noqa: E501
-            )
-            + Op.PUSH2[0xFFFF]
-            + Op.AND
-            + Op.SWAP1
-            + Op.PUSH2[0xFFFF]
-            + Op.AND
-            + Op.LOG1
-            + Op.EQ(Op.DIV(Op.ADDRESS, Op.DUP7), 0x84ED962562151D0B903FB2)
-            + Op.DIV
-            + Op.PUSH20[0x380357280D5DBC434298AC45559FC2855C0D2A04]
-            + Op.GAS
-            + Op.PUSH7[0xAF59655ED483A0]
-            + Op.SHL(
-                0x5F1536B1893659FBB9FFA023722BEB2F24B5693BE6B572737FED,
-                Op.BLOCKHASH(
-                    block_number=Op.SUB(
-                        Op.NUMBER,
-                        Op.AND(0xFF, Op.BALANCE(address=Op.PC)),
-                    ),
-                ),
-            )
-            + Op.SWAP14
-            + Op.EXP
-            + Op.PUSH5[0x6F7A2658B5]
-            + Op.DUP12
-            + Op.JUMPDEST
-            + Op.COINBASE
-            + Op.PUSH19[0x20E684F471111724A4F72553B4FDC9593AE22C]
-            + Op.SWAP7
-            + Op.SWAP6
-            + Op.SWAP10
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0x39DBE091B64B8BE6A557A93BF2C25DD042E8C8FEA4DB3BD8EE5BE3EABDE2835E,  # noqa: E501
-                value=0x8FE0,
-                args_offset=0xF3F6,
-                args_size=0x1991,
-                ret_offset=0x5AD4,
-                ret_size=0xA631,
-            )
-            + Op.SSTORE(key=0x0, value=Op.SDIV)
-            + Op.PUSH1[0x1]
-            + Op.SSTORE
-            + Op.PUSH1[0x2]
-            + Op.SSTORE
-            + Op.PUSH1[0x3]
-            + Op.SSTORE
-            + Op.PUSH1[0x4]
-            + Op.SSTORE
-            + Op.PUSH1[0x5]
-            + Op.SSTORE
-            + Op.PUSH1[0x6]
-            + Op.SSTORE
-            + Op.PUSH1[0x7]
-            + Op.SSTORE
-            + Op.PUSH1[0x8]
-            + Op.SSTORE
-            + Op.PUSH1[0x9]
-            + Op.SSTORE
-            + Op.PUSH1[0xA]
-            + Op.SSTORE
-            + Op.PUSH1[0xB]
-            + Op.SSTORE
-            + Op.PUSH1[0xC]
-            + Op.SSTORE
-            + Op.PUSH1[0xD]
-            + Op.SSTORE
-            + Op.PUSH1[0xE]
-            + Op.SSTORE
-            + Op.PUSH1[0xF]
-            + Op.SSTORE
-            + Op.PUSH1[0x10]
-            + Op.SSTORE
-            + Op.PUSH1[0x11]
-            + Op.SSTORE
-            + Op.PUSH1[0x12]
-            + Op.SSTORE
-            + Op.PUSH1[0x13]
-            + Op.SSTORE
-            + Op.PUSH1[0x14]
-            + Op.SSTORE
-            + Op.PUSH1[0x15]
-            + Op.SSTORE
-            + Op.PUSH1[0x16]
-            + Op.SSTORE
-            + Op.PUSH1[0x17]
-            + Op.SSTORE
-            + Op.PUSH1[0x18]
-            + Op.SSTORE
-            + Op.PUSH1[0x19]
-            + Op.SSTORE
-            + Op.PUSH1[0x1A]
-            + Op.SSTORE
-            + Op.PUSH1[0x1B]
-            + Op.SSTORE
-            + Op.PUSH1[0x1C]
-            + Op.SSTORE
-            + Op.PUSH1[0x1D]
-            + Op.SSTORE
-            + Op.PUSH1[0x1E]
-            + Op.SSTORE
-            + Op.RETURN(offset=0xC065, size=0x2739)
-        ),
+                address=0xA5D352916626FE6BE4AA6EF0E7634DB7909FD79752E5BCB504B358D36AF70849,  # noqa: E501
+                args_offset=0xC30,
+                args_size=0x52A9,
+                ret_offset=0x73CE,
+                ret_size=0x45C1,
+            ),
+        )
+        + Op.SWAP1
+        + Op.PUSH2[0xFFFF]
+        + Op.AND
+        + Op.LOG2
+        + Op.MLOAD(offset=Op.AND(0xFFFF, 0xE900F727806828F5EE6088EBF8))
+        + Op.PUSH17[0x15C1269FA9F5387AB7387A81F51905640]
+        + Op.SWAP9
+        + Op.PUSH1[0x1F]
+        + Op.SWAP5
+        + Op.PUSH18[0xB46EB2F2D66EE0B4C6845455E9C5EEFF0218]
+        + Op.SMOD(
+            0x66120B1A7A97C93A6A04BD493F4A,
+            0xBAE1D66F6CB6213C6CE69859F1046AE4CB5E5B743AB7,
+        )
+        + Op.SWAP7
+        + Op.RETURNDATASIZE
+        + Op.SIGNEXTEND
+        + Op.PUSH10[0x471B70DEC306FA6142CE]
+        + Op.SWAP13
+        + Op.MOD(
+            Op.SDIV(
+                0xA04EA7E0BD9D9CDA29962B,
+                Op.BLOCKHASH(block_number=Op.SUB(Op.NUMBER, Op.AND)),
+            ),
+            0xFF,
+        )
+        + Op.PUSH19[0x46CE83AB26762D5E2CFB614AA2394AD1D70EA9]
+        + Op.CODESIZE
+        + Op.DUP6
+        + Op.PUSH12[0x938D5C3FF280BF7EFDA95E66]
+        + Op.DUP11
+        + Op.PUSH17[0x149AFA7A18BF9C2D796DE03773E0D35C9A]
+        + Op.NOT(
+            0x8E0E968BA16F3AD59D6442DDBDB9E537908DB1F791BB3F17B33A1433340107
+        )
+        + Op.PUSH2[0xA168]
+        + Op.SWAP13
+        + Op.PUSH28[0x413ED4A9B16E7D66A17B07730188A08FA9E6148100F0311EA269ECC5]
+        + Op.DUP9
+        + Op.PUSH1[0x7D]
+        + Op.PUSH32[
+            0xCBFFF9F42E22612E938809AF2674B0CEDC8548F47EE642097C0C4ABC9BF7C76B
+        ]
+        + Op.SWAP7
+        + Op.PUSH25[0x996410D0BF28E5E3E1B35B37FFCE70E346E013D5345494D476]
+        + Op.SWAP1
+        + Op.CALLER
+        + Op.TIMESTAMP
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0x1396B439A0049676213FD1FF8B75232DBD2117C0C5DCC184D76E2534EA9628AC,  # noqa: E501
+            args_offset=0xF195,
+            args_size=0x74FD,
+            ret_offset=0xABAE,
+            ret_size=0x7717,
+        )
+        + Op.DUP7
+        + Op.GASPRICE
+        + Op.SWAP8
+        + Op.PUSH2[0xFFFF]
+        + Op.AND
+        + Op.SWAP1
+        + Op.LOG0(offset=Op.AND, size=0xFFFF)
+        + Op.MSTORE8(
+            offset=Op.AND(0xFFFF, Op.EQ),
+            value=0x486085A7047BD1ACAB7C048C2AE5A07A9E25934021CFAF0651EFBD393B7214,  # noqa: E501
+        )
+        + Op.PUSH2[0xFFFF]
+        + Op.AND
+        + Op.SWAP1
+        + Op.PUSH2[0xFFFF]
+        + Op.AND
+        + Op.LOG1
+        + Op.EQ(Op.DIV(Op.ADDRESS, Op.DUP7), 0x84ED962562151D0B903FB2)
+        + Op.DIV
+        + Op.PUSH20[0x380357280D5DBC434298AC45559FC2855C0D2A04]
+        + Op.GAS
+        + Op.PUSH7[0xAF59655ED483A0]
+        + Op.SHL(
+            0x5F1536B1893659FBB9FFA023722BEB2F24B5693BE6B572737FED,
+            Op.BLOCKHASH(
+                block_number=Op.SUB(
+                    Op.NUMBER, Op.AND(0xFF, Op.BALANCE(address=Op.PC))
+                )
+            ),
+        )
+        + Op.SWAP14
+        + Op.EXP
+        + Op.PUSH5[0x6F7A2658B5]
+        + Op.DUP12
+        + Op.JUMPDEST
+        + Op.COINBASE
+        + Op.PUSH19[0x20E684F471111724A4F72553B4FDC9593AE22C]
+        + Op.SWAP7
+        + Op.SWAP6
+        + Op.SWAP10
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0x39DBE091B64B8BE6A557A93BF2C25DD042E8C8FEA4DB3BD8EE5BE3EABDE2835E,  # noqa: E501
+            value=0x8FE0,
+            args_offset=0xF3F6,
+            args_size=0x1991,
+            ret_offset=0x5AD4,
+            ret_size=0xA631,
+        )
+        + Op.SSTORE(key=0x0, value=Op.SDIV)
+        + Op.PUSH1[0x1]
+        + Op.SSTORE
+        + Op.PUSH1[0x2]
+        + Op.SSTORE
+        + Op.PUSH1[0x3]
+        + Op.SSTORE
+        + Op.PUSH1[0x4]
+        + Op.SSTORE
+        + Op.PUSH1[0x5]
+        + Op.SSTORE
+        + Op.PUSH1[0x6]
+        + Op.SSTORE
+        + Op.PUSH1[0x7]
+        + Op.SSTORE
+        + Op.PUSH1[0x8]
+        + Op.SSTORE
+        + Op.PUSH1[0x9]
+        + Op.SSTORE
+        + Op.PUSH1[0xA]
+        + Op.SSTORE
+        + Op.PUSH1[0xB]
+        + Op.SSTORE
+        + Op.PUSH1[0xC]
+        + Op.SSTORE
+        + Op.PUSH1[0xD]
+        + Op.SSTORE
+        + Op.PUSH1[0xE]
+        + Op.SSTORE
+        + Op.PUSH1[0xF]
+        + Op.SSTORE
+        + Op.PUSH1[0x10]
+        + Op.SSTORE
+        + Op.PUSH1[0x11]
+        + Op.SSTORE
+        + Op.PUSH1[0x12]
+        + Op.SSTORE
+        + Op.PUSH1[0x13]
+        + Op.SSTORE
+        + Op.PUSH1[0x14]
+        + Op.SSTORE
+        + Op.PUSH1[0x15]
+        + Op.SSTORE
+        + Op.PUSH1[0x16]
+        + Op.SSTORE
+        + Op.PUSH1[0x17]
+        + Op.SSTORE
+        + Op.PUSH1[0x18]
+        + Op.SSTORE
+        + Op.PUSH1[0x19]
+        + Op.SSTORE
+        + Op.PUSH1[0x1A]
+        + Op.SSTORE
+        + Op.PUSH1[0x1B]
+        + Op.SSTORE
+        + Op.PUSH1[0x1C]
+        + Op.SSTORE
+        + Op.PUSH1[0x1D]
+        + Op.SSTORE
+        + Op.PUSH1[0x1E]
+        + Op.SSTORE
+        + Op.RETURN(offset=0xC065, size=0x2739),
         balance=0xDE0B6B3A7640000,
-        address=Address("0x14ceed78f6e86eead0a39e3f5c3481c7c233e8ea"),  # noqa: E501
+        nonce=1,
+        address=Address(0x14CEED78F6E86EEAD0A39E3F5C3481C7C233E8EA),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=16777216,
-        gas_price=100,
         nonce=1,
+        gas_price=100,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                1: 0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA,
-                2: 0x938D5C3FF280BF7EFDA95E66,
-                3: 0x6F7A2658B5,
-                4: 0x9582CED6097AE8D75CB9CAC205753DD88202D5D36541F1B1BB9C1446739E0D01,  # noqa: E501
-                5: 0xF400CA,
-                7: 0x20E684F471111724A4F72553B4FDC9593AE22C,
-                8: 100,
-                9: 0x413ED4A9B16E7D66A17B07730188A08FA9E6148100F0311EA269ECC5,
-                10: 0x380357280D5DBC434298AC45559FC2855C0D2A04,
-                11: 0xFF71F169745E90C52A629BBD2242461AC86F724E086E44C0E84CC5EBCCCBFEF8,  # noqa: E501
-                12: 0x149AFA7A18BF9C2D796DE03773E0D35C9A,
-                13: 0xCBFFF9F42E22612E938809AF2674B0CEDC8548F47EE642097C0C4ABC9BF7C76B,  # noqa: E501
-                14: 0x938D5C3FF280BF7EFDA95E66,
-                15: 10,
-                16: 996,
-                19: 0xB46EB2F2D66EE0B4C6845455E9C5EEFF0218,
-                20: 1,
-                21: 10,
-                23: 41320,
-                24: 0xFF112233445566,
-                25: 0x66120B1A7A97C93A6A04BD493F4A,
-                26: 0x27E1DC4C54400E52AB133F162C6DF107151D11,
-                27: 0x89CC6512F8D604E5D0656C17F2D45B916DF6816A1999719F2B,
-                29: 0xFF112233445566,
-                30: 0x471B70DEC306FA6142CE,
-            },
-        ),
-    }
+    post: dict = {}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest39.py b/tests/ported_static/stRandom/test_random_statetest39.py
index e9fb65a6a1d..9ad4e952cad 100644
--- a/tests/ported_static/stRandom/test_random_statetest39.py
+++ b/tests/ported_static/stRandom/test_random_statetest39.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest39.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest39Filler.json
+state_tests/stRandom/randomStatetest39Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest39Filler.json"],
+    ["state_tests/stRandom/randomStatetest39Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest39(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest39."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,74 +46,68 @@ def test_random_statetest39(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SWAP7
-            + Op.SSTORE(key=Op.SUB(Op.PC, 0x8EA2179A), value=Op.DIV)
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff427f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9604638ea2179a58035560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SWAP7
+        + Op.SSTORE(key=Op.SUB(Op.PC, 0x8EA2179A), value=Op.DIV)
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x1321a8bef07739a53dc17cdbe4e7da245ab5e3cb"),  # noqa: E501
+        address=Address(0x1321A8BEF07739A53DC17CDBE4E7DA245AB5E3CB),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff427f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000017f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe9604638ea2179a5803"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff427f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9604638ea2179a5803"  # noqa: E501
         ),
         gas_limit=100000,
-        value=272686139,
+        value=0x1040DC3B,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x10000000000000000000000000000000000000000,
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF715DE955: 0x14F8B588E368F08461F9F01B866E43AA79BBADC0980B242070B8CFBFC6540,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest4.py b/tests/ported_static/stRandom/test_random_statetest4.py
index 7240ce45c2d..55bfd614278 100644
--- a/tests/ported_static/stRandom/test_random_statetest4.py
+++ b/tests/ported_static/stRandom/test_random_statetest4.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest4.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest4Filler.json
+state_tests/stRandom/randomStatetest4Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest4Filler.json"],
+    ["state_tests/stRandom/randomStatetest4Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest4(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest4."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,58 +43,45 @@ def test_random_statetest4(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350617e7608617c95f3ff584076e07b5a4460005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350617e7608617c95f3ff584076e07b5a4460005155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000"  # noqa: E501
-            "0000000000000000000000000000000000007f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c350617e7608617c95f3ff584076e07b5a4460005155"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xa3a709fece04184d06401d32d39f133ea3b800a8"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000"  # noqa: E501
-            "0000000000000000000000000000000000007f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c350617e7608617c95f3ff584076e07b5a44"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350617e7608617c95f3ff584076e07b5a44"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1650737351,
+        value=0x626440C7,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest41.py b/tests/ported_static/stRandom/test_random_statetest41.py
index 59400ff2be4..6b633b051ff 100644
--- a/tests/ported_static/stRandom/test_random_statetest41.py
+++ b/tests/ported_static/stRandom/test_random_statetest41.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest41.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest41Filler.json
+state_tests/stRandom/randomStatetest41Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest41Filler.json"],
+    ["state_tests/stRandom/randomStatetest41Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest41(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest41."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,67 +47,61 @@ def test_random_statetest41(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.MLOAD(offset=Op.PUSH32[0xC350])
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.COINBASE
-            + Op.SSTORE(
-                key=Op.DUP3,
-                value=Op.MUL(
-                    0x84A10719A1786A6510349B,
-                    Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
-                ),
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350517f0000000000000000000000010000000000000000000000000000000000000000417f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56a84a10719a1786a6510349b028255  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5] * 2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.MLOAD(offset=Op.PUSH32[0xC350])
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.COINBASE
+        + Op.SSTORE(
+            key=Op.DUP3,
+            value=Op.MUL(
+                0x84A10719A1786A6510349B,
+                Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000"  # noqa: E501
-            "00000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c350517f00000000000000000000"  # noqa: E501
-            "00010000000000000000000000000000000000000000417f000000000000000000000000"  # noqa: E501
-            "945304eb96065b2a98b57a48a06ae28d285a71b56a84a10719a1786a6510349b0282"  # noqa: E501
+        to=contract_0,
+        data=Bytes(
+            "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350517f0000000000000000000000010000000000000000000000000000000000000000417f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56a84a10719a1786a6510349b0282"  # noqa: E501
         ),
         gas_limit=100000,
-        value=78505988,
+        value=0x4ADE804,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0x10000000000000000000000000000000000000000: 0x4CD81ADCB05087C4859B28E08FEDC25944C5E206071CEAFB0EF91F522B9C97,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest42.py b/tests/ported_static/stRandom/test_random_statetest42.py
index 77f291b8826..7e67db9f820 100644
--- a/tests/ported_static/stRandom/test_random_statetest42.py
+++ b/tests/ported_static/stRandom/test_random_statetest42.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest42.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest42Filler.json
+state_tests/stRandom/randomStatetest42Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest42Filler.json"],
+    ["state_tests/stRandom/randomStatetest42Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,8 +32,8 @@ def test_random_statetest42(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest42."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,70 +47,62 @@ def test_random_statetest42(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.GAS
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.BYTE(
-                    0x36F0F11901,
-                    Op.CALLDATALOAD(offset=Op.PUSH32[0xC350]),
-                ),
-                value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3505a7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350356436f0f119011a5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.GAS
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.BYTE(
+                0x36F0F11901, Op.CALLDATALOAD(offset=Op.PUSH32[0xC350])
+            ),
+            value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x2713c7383b21b6e2441f7769d6925146b081a952"),  # noqa: E501
+        address=Address(0x2713C7383B21B6E2441F7769D6925146B081A952),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3505a7f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000c350356436f0f119011a"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3505a7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350356436f0f119011a"  # noqa: E501
         ),
         gas_limit=221233021,
-        value=1639565987,
+        value=0x61B9CAA3,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={0: 0x10000000000000000000000000000000000000000},
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest43.py b/tests/ported_static/stRandom/test_random_statetest43.py
index c40e2dc4f00..e0061e13bbe 100644
--- a/tests/ported_static/stRandom/test_random_statetest43.py
+++ b/tests/ported_static/stRandom/test_random_statetest43.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest43.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest43Filler.json
+state_tests/stRandom/randomStatetest43Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest43Filler.json"],
+    ["state_tests/stRandom/randomStatetest43Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest43(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest43."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,78 +43,64 @@ def test_random_statetest43(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.EXP(
-                    Op.EXTCODESIZE(
-                        address=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ),
-                    Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-                ),
-                value=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-            )
-            + Op.SSTORE(key=0x41861A3755A196F259A1, value=Op.MULMOD)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x32dddb92acb638eede178ae680d1c7362bd89fd5"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3b0a55096941861a3755a196f259a155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.SSTORE(
+            key=Op.EXP(
+                Op.EXTCODESIZE(
+                    address=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
+                ),
+                Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+            ),
+            value=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+        )
+        + Op.SSTORE(key=0x41861A3755A196F259A1, value=Op.MULMOD),
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464"  # noqa: E501
-            "972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff3b0a55096941861a3755a196f259a1"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3b0a55096941861a3755a196f259a1"  # noqa: E501
         ),
         gas_limit=100000,
-        value=580684794,
+        value=0x229C8BFA,
     )
 
     post = {
-        contract: Account(
-            storage={
-                0: 0x4F3F701464972E74606D6EA82D4D3080599A0E79,
-                0x41861A3755A196F259A1: 1,
-            },
+        target: Account(
+            storage={0: coinbase, 0x41861A3755A196F259A1: 1},
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest45.py b/tests/ported_static/stRandom/test_random_statetest45.py
index 3f3ffb8656e..c3e26575f14 100644
--- a/tests/ported_static/stRandom/test_random_statetest45.py
+++ b/tests/ported_static/stRandom/test_random_statetest45.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest45.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest45Filler.json
+state_tests/stRandom/randomStatetest45Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,93 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest45Filler.json"],
+    ["state_tests/stRandom/randomStatetest45Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest45(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79317fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "00000000000000010000000000000000000000000000000000000000417fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe43147256a3130255"  # noqa: E501
-        ),
-        nonce=0,
-        address=Address("0x868a35cb88c48251a7470e4fb638c4cb395ba4da"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79317fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "00000000000000010000000000000000000000000000000000000000417fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe43147256a31302"  # noqa: E501
-        ),
-        gas_limit=100000,
-        value=1998384914,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest45Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest45_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest45."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -119,50 +43,45 @@ def test_random_statetest45_from_prague(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>317fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe43147256a3130255  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79317fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "00000000000000010000000000000000000000000000000000000000417fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe43147256a3130255"  # noqa: E501
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79317fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe43147256a3130255"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x868a35cb88c48251a7470e4fb638c4cb395ba4da"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79317fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "00000000000000010000000000000000000000000000000000000000417fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe43147256a31302"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79317fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe43147256a31302"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1998384914,
+        value=0x771CEF12,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest47.py b/tests/ported_static/stRandom/test_random_statetest47.py
index 7e84bfc40e8..b3ad3b7862b 100644
--- a/tests/ported_static/stRandom/test_random_statetest47.py
+++ b/tests/ported_static/stRandom/test_random_statetest47.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest47.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest47Filler.json
+state_tests/stRandom/randomStatetest47Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest47Filler.json"],
+    ["state_tests/stRandom/randomStatetest47Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest47(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest47."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,60 @@ def test_random_statetest47(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.NUMBER
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.NUMBER
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x1544898B167C6A6F6D5B953714457E55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x44038e40b466d5b343b7dc04756087ab122af57a"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350437f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f1544898b167c6a6f6d5b953714457e5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.NUMBER
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.NUMBER
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x1544898B167C6A6F6D5B953714457E55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x44038E40B466D5B343B7DC04756087AB122AF57A),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00"  # noqa: E501
-            "0000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c350437f000000000000000000"  # noqa: E501
-            "0000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff6f1544898b167c6a6f6d5b953714457e"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350437f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f1544898b167c6a6f6d5b953714457e"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2007082101,
+        value=0x77A1A475,
     )
 
     post = {
-        contract: Account(storage={0: 0x1544898B167C6A6F6D5B953714457E55}),
+        target: Account(
+            storage={0: 0x1544898B167C6A6F6D5B953714457E55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest48.py b/tests/ported_static/stRandom/test_random_statetest48.py
index e7c7b2e478a..f6dbb6131eb 100644
--- a/tests/ported_static/stRandom/test_random_statetest48.py
+++ b/tests/ported_static/stRandom/test_random_statetest48.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest48.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest48Filler.json
+state_tests/stRandom/randomStatetest48Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest48Filler.json"],
+    ["state_tests/stRandom/randomStatetest48Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest48(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest48."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,82 +44,70 @@ def test_random_statetest48(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CODESIZE
-            + Op.LOG3(
-                offset=0xA73B,
-                size=0x2F05,
-                topic_1=0x698FC0E9CED2F6A0087344559C43,
-                topic_2=0x6060B6D9,
-                topic_3=0x5231D8E75DB11D6DA7040CEE1A12EBF739E5022CAA60F92D51,
-            )
-            + Op.CALL(
-                gas=0x70F82D9F,
-                address=0x292E762689B448DEBE7899ADE7ACB27A84A85C44,
-                value=0x186262C1,
-                args_offset=0x9,
-                args_size=0x14,
-                ret_offset=0xD,
-                ret_size=0xA,
-            )
-            + Op.PUSH1[0x41]
-            + Op.PUSH7[0xF49EF1FEA120AF]
-            + Op.PUSH24[0xBA4CCE3F35BC52CA5C40BF14C77E95EA92E69520143FF9C7]
-            + Op.DUP3
-            + Op.PUSH28[
-                0xCFE760AEE06D241E31A0773476DA22F7CE8131475838C23B59F7A3C4
-            ]
-            + Op.PUSH12[0x2B99C0955E169EE3527CA9F7]
-            + Op.PUSH8[0x4467BDF2C0EEBF6F]
-            + Op.PUSH1[0x12]
-            + Op.SWAP3
-            + Op.ORIGIN
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x292e762689b448debe7899ade7acb27a84a85c44"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x38785231d8e75db11d6da7040cee1a12ebf739e5022caa60f92d51636060b6d96d698fc0e9ced2f6a0087344559c43612f0561a73ba3600a600d6014600963186262c173<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>6370f82d9ff1604166f49ef1fea120af77ba4cce3f35bc52ca5c40bf14c77e95ea92e69520143ff9c7827bcfe760aee06d241e31a0773476da22f7ce8131475838c23b59f7a3c46b2b99c0955e169ee3527ca9f7674467bdf2c0eebf6f60129232  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CODESIZE
+        + Op.LOG3(
+            offset=0xA73B,
+            size=0x2F05,
+            topic_1=0x698FC0E9CED2F6A0087344559C43,
+            topic_2=0x6060B6D9,
+            topic_3=0x5231D8E75DB11D6DA7040CEE1A12EBF739E5022CAA60F92D51,
+        )
+        + Op.CALL(
+            gas=0x70F82D9F,
+            address=0x292E762689B448DEBE7899ADE7ACB27A84A85C44,
+            value=0x186262C1,
+            args_offset=0x9,
+            args_size=0x14,
+            ret_offset=0xD,
+            ret_size=0xA,
+        )
+        + Op.PUSH1[0x41]
+        + Op.PUSH7[0xF49EF1FEA120AF]
+        + Op.PUSH24[0xBA4CCE3F35BC52CA5C40BF14C77E95EA92E69520143FF9C7]
+        + Op.DUP3
+        + Op.PUSH28[0xCFE760AEE06D241E31A0773476DA22F7CE8131475838C23B59F7A3C4]
+        + Op.PUSH12[0x2B99C0955E169EE3527CA9F7]
+        + Op.PUSH8[0x4467BDF2C0EEBF6F]
+        + Op.PUSH1[0x12]
+        + Op.SWAP3
+        + Op.ORIGIN,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x292E762689B448DEBE7899ADE7ACB27A84A85C44),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "76dd12f3185b84dfc71eb93f4df4ca30dcf34446f25793016424a5e33b6a65fb5d64a939"  # noqa: E501
-            "4d7ebefb1c15de971a2d2f53377765d50c698d4e26adea05dd2f6a1688f60eb8b172d796"  # noqa: E501
-            "a45c6f79596bfb719df5a571ce8c339e9d7e9b3905324643a2b9fd541956552fc258e688"  # noqa: E501
-            "303ecb25082776fde7334cdf046f70c8669a6a05c36909038278e925f0156be9ddb9b837"  # noqa: E501
-            "86de8a325ab28e61d18397714bcda0fd5ca879c870d383721c638733b1f78074cc1079e7"  # noqa: E501
-            "2e0bbbad262348a8976eaaf313a261dccb69dbaf283beebcac7ac3b8166a4deb1fe5099a"  # noqa: E501
-            "1c7f3ef595357e76ca260a703bec4848a3cc9804d6de6e5b853b54dd65979292f596ee13"  # noqa: E501
-            "2edf67eb948e4e4d22f9cb7629bf8b642cb921b2ed9b13e47cb06d6c6f4384c7b372ee7c"  # noqa: E501
-            "b61f76a363f8fa68309e3d308179ad3e15fd752d6586e9030c8c1f274878bf7fbe1b5699"  # noqa: E501
-            "44fdda166c47411878f3702bbe1bbabbce8b10701076e0338bfa289d424c13f4f438474a"  # noqa: E501
-            "fd71abc18290e0a3c853537a13ce9869d3942c7b6802bfb0f345a9af828b96"
+        to=target,
+        data=Bytes(
+            "76dd12f3185b84dfc71eb93f4df4ca30dcf34446f25793016424a5e33b6a65fb5d64a9394d7ebefb1c15de971a2d2f53377765d50c698d4e26adea05dd2f6a1688f60eb8b172d796a45c6f79596bfb719df5a571ce8c339e9d7e9b3905324643a2b9fd541956552fc258e688303ecb25082776fde7334cdf046f70c8669a6a05c36909038278e925f0156be9ddb9b83786de8a325ab28e61d18397714bcda0fd5ca879c870d383721c638733b1f78074cc1079e72e0bbbad262348a8976eaaf313a261dccb69dbaf283beebcac7ac3b8166a4deb1fe5099a1c7f3ef595357e76ca260a703bec4848a3cc9804d6de6e5b853b54dd65979292f596ee132edf67eb948e4e4d22f9cb7629bf8b642cb921b2ed9b13e47cb06d6c6f4384c7b372ee7cb61f76a363f8fa68309e3d308179ad3e15fd752d6586e9030c8c1f274878bf7fbe1b569944fdda166c47411878f3702bbe1bbabbce8b10701076e0338bfa289d424c13f4f438474afd71abc18290e0a3c853537a13ce9869d3942c7b6802bfb0f345a9af828b96"  # noqa: E501
         ),
         gas_limit=2120993272,
-        value=1548512824,
+        value=0x5C4C6E38,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest49.py b/tests/ported_static/stRandom/test_random_statetest49.py
index d144d8cc54b..9544cdc81ab 100644
--- a/tests/ported_static/stRandom/test_random_statetest49.py
+++ b/tests/ported_static/stRandom/test_random_statetest49.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest49.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest49Filler.json
+state_tests/stRandom/randomStatetest49Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest49Filler.json"],
+    ["state_tests/stRandom/randomStatetest49Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest49(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest49."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,68 +43,55 @@ def test_random_statetest49(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.DUP1
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=0x859C,
-                value=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000807f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>61859c55  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.DUP1
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=0x859C,
+            value=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
         ),
         nonce=0,
-        address=Address("0xcaa0686603c881f386878ddb79d8f293bf095d80"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000010000000000000000000000000000000000000000807f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000017f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f7014"  # noqa: E501
-            "64972e74606d6ea82d4d3080599a0e7961859c"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000807f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7961859c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1775656779,
+        value=0x69D65F4B,
     )
 
     post = {
-        contract: Account(
-            storage={
-                34204: 0x4F3F701464972E74606D6EA82D4D3080599A0E79,
-            },
-        ),
+        target: Account(storage={34204: coinbase}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest5.py b/tests/ported_static/stRandom/test_random_statetest5.py
index 7cdfe4d12fb..8d3e1597827 100644
--- a/tests/ported_static/stRandom/test_random_statetest5.py
+++ b/tests/ported_static/stRandom/test_random_statetest5.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest5.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest5Filler.json
+state_tests/stRandom/randomStatetest5Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,107 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest5Filler.json"],
+    ["state_tests/stRandom/randomStatetest5Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest5(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.TIMESTAMP
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MULMOD(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-            )
-        ),
-        nonce=0,
-        address=Address("0x5a9f935f66941ec08a862f860b76b49e4a9d90ec"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "427f00000000000000000000000000000000000000000000000000000000000000007fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff09"
-        ),
-        gas_limit=100000,
-        value=1016957738,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest5Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest5_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest5."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -133,64 +43,57 @@ def test_random_statetest5_from_prague(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.TIMESTAMP
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MULMOD(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x427f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.TIMESTAMP
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MULMOD(
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
         ),
         nonce=0,
-        address=Address("0x5a9f935f66941ec08a862f860b76b49e4a9d90ec"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "427f00000000000000000000000000000000000000000000000000000000000000007fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff09"
+        to=target,
+        data=Bytes(
+            "427f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1016957738,
+        value=0x3C9D8B2A,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest51.py b/tests/ported_static/stRandom/test_random_statetest51.py
index 59808305cf4..bde53ad9ac1 100644
--- a/tests/ported_static/stRandom/test_random_statetest51.py
+++ b/tests/ported_static/stRandom/test_random_statetest51.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest51.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest51Filler.json
+state_tests/stRandom/randomStatetest51Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest51Filler.json"],
+    ["state_tests/stRandom/randomStatetest51Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest51(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest51."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,52 +43,45 @@ def test_random_statetest51(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f0000000000000000000000000000000000000000000000000000000000000001757f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe83189b60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f0000000000000000000000000000000000000000000000000000000000000001757f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe83189b60005155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000001757f00"  # noqa: E501
-            "0000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57a7f000000"  # noqa: E501
-            "000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000"  # noqa: E501
-            "000000000000945304eb96065b2a98b57a48a06ae28d285a71b5447fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe83189b60005155"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x53af81e2a686427de42e7b8b55a0c6c66c8c6051"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000001757f00"  # noqa: E501
-            "0000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57a7f000000"  # noqa: E501
-            "000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000"  # noqa: E501
-            "000000000000945304eb96065b2a98b57a48a06ae28d285a71b5447fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe83189b"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000000000000000000000000000000000000000000001757f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe83189b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1062041617,
+        value=0x3F4D7811,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest52.py b/tests/ported_static/stRandom/test_random_statetest52.py
index 85eef1dbd23..3f22f5cc80d 100644
--- a/tests/ported_static/stRandom/test_random_statetest52.py
+++ b/tests/ported_static/stRandom/test_random_statetest52.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest52.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest52Filler.json
+state_tests/stRandom/randomStatetest52Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest52Filler.json"],
+    ["state_tests/stRandom/randomStatetest52Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest52(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest52."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,61 +47,58 @@ def test_random_statetest52(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe410a81437f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f59a130a10a189fc653057a185b886c5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.EXP(
+            Op.COINBASE,
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,
+        )
+        + Op.DUP2
+        + Op.NUMBER
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x59A130A10A189FC653057A185B886C55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x6ACCF97B1F5B58927BD45F0914F7CD75F01F3222),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.EXP(
-                Op.COINBASE,
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-            )
-            + Op.DUP2
-            + Op.NUMBER
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x59A130A10A189FC653057A185B886C55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x6accf97b1f5b58927bd45f0914f7cd75f01f3222"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe410a81437f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3507f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000006f59a130a10a189f"  # noqa: E501
-            "c653057a185b886c"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe410a81437f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f59a130a10a189fc653057a185b886c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=667679116,
+        value=0x27CBF98C,
     )
 
     post = {
-        contract: Account(storage={0: 0x59A130A10A189FC653057A185B886C55}),
+        target: Account(
+            storage={0: 0x59A130A10A189FC653057A185B886C55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest53.py b/tests/ported_static/stRandom/test_random_statetest53.py
index 9810d3712e8..c943d93f166 100644
--- a/tests/ported_static/stRandom/test_random_statetest53.py
+++ b/tests/ported_static/stRandom/test_random_statetest53.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest53.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest53Filler.json
+state_tests/stRandom/randomStatetest53Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest53Filler.json"],
+    ["state_tests/stRandom/randomStatetest53Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest53(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest53."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,62 +43,53 @@ def test_random_statetest53(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.TIMESTAMP
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PC
-            + Op.RETURN(offset=Op.DUP2, size=Op.CALLVALUE)
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0), value=0x85646D53671639175B9408
-            )
-        ),
+    # Source: raw
+    # 0x427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b940860005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.TIMESTAMP
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PC
+        + Op.RETURN(offset=Op.DUP2, size=Op.CALLVALUE)
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x85646D53671639175B9408),
         nonce=0,
-        address=Address("0xb2da1f608a7e0626e721677fa30fc46d2d99c655"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "427f00000000000000000000000000000000000000000000000000000000000000007f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000017f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b9408"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b9408"  # noqa: E501
         ),
         gas_limit=4400000,
-        value=1485632,
+        value=0x16AB40,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest54.py b/tests/ported_static/stRandom/test_random_statetest54.py
index 942197ac840..0a34d31110b 100644
--- a/tests/ported_static/stRandom/test_random_statetest54.py
+++ b/tests/ported_static/stRandom/test_random_statetest54.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest54.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest54Filler.json
+state_tests/stRandom/randomStatetest54Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest54Filler.json"],
+    ["state_tests/stRandom/randomStatetest54Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest54(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest54."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,58 +43,45 @@ def test_random_statetest54(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001c9206e3b8f9d858f438a  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000001c9206e3b8f9d858f438a"
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001c9206e3b8f9d858f438a"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x9d6de455be29a83c61e3e6e4b8895b579bbb938b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000001c9206e3b8f9d858f438a"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001c9206e3b8f9d858f438a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1174580620,
+        value=0x4602AD8C,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest55.py b/tests/ported_static/stRandom/test_random_statetest55.py
index 72eb3397b84..32bfe5576e6 100644
--- a/tests/ported_static/stRandom/test_random_statetest55.py
+++ b/tests/ported_static/stRandom/test_random_statetest55.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest55.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest55Filler.json
+state_tests/stRandom/randomStatetest55Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest55Filler.json"],
+    ["state_tests/stRandom/randomStatetest55Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest55(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest55."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,45 @@ def test_random_statetest55(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000000084967f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff137ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016f3a5b594088a2f238089b71  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000084967f000000000000"  # noqa: E501
-            "000000000000ffffffffffffffffffffffffffffffffffffffff137fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe016f3a5b594088a2f238089b"  # noqa: E501
-            "71"
+            "7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000000084967f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff137ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016f3a5b594088a2f238089b71"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xb5111bfe81b8d7566e584c3d02429543652dd051"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000084967f000000000000"  # noqa: E501
-            "000000000000ffffffffffffffffffffffffffffffffffffffff137fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe016f3a5b594088a2f238089b"  # noqa: E501
-            "71"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000000084967f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff137ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016f3a5b594088a2f238089b71"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1086316137,
+        value=0x40BFDE69,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest57.py b/tests/ported_static/stRandom/test_random_statetest57.py
index 0ce5cc7858c..98e81b8ccb1 100644
--- a/tests/ported_static/stRandom/test_random_statetest57.py
+++ b/tests/ported_static/stRandom/test_random_statetest57.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest57.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest57Filler.json
+state_tests/stRandom/randomStatetest57Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest57Filler.json"],
+    ["state_tests/stRandom/randomStatetest57Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest57(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest57."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,143 +43,54 @@ def test_random_statetest57(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.COINBASE
-            + Op.MULMOD(
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-            )
-            + Op.PUSH32[0xC350]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f000000000000000000000000000000000000000000000000000000000000c350819055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.COINBASE
+        + Op.MULMOD(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,
+        )
+        + Op.PUSH32[0xC350]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x8eaedcbe884499a7f8d284384c1df38aa6ed68ad"),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c350417fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe097f000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000c3508190"
-        ),
-        gas_limit=100000,
-        value=277972730,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest57Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest57_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.COINBASE
-            + Op.MULMOD(
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-            )
-            + Op.PUSH32[0xC350]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-        ),
-        nonce=0,
-        address=Address("0x8eaedcbe884499a7f8d284384c1df38aa6ed68ad"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c350417fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe097f000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000c3508190"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f000000000000000000000000000000000000000000000000000000000000c3508190"  # noqa: E501
         ),
         gas_limit=100000,
-        value=277972730,
+        value=0x109186FA,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest58.py b/tests/ported_static/stRandom/test_random_statetest58.py
index c3e4871235a..09e405888d9 100644
--- a/tests/ported_static/stRandom/test_random_statetest58.py
+++ b/tests/ported_static/stRandom/test_random_statetest58.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest58.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest58Filler.json
+state_tests/stRandom/randomStatetest58Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest58Filler.json"],
+    ["state_tests/stRandom/randomStatetest58Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest58(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest58."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,63 @@ def test_random_statetest58(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe096902947d567838719e97f30160005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.COINBASE
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.CALLDATASIZE
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.ADD(
+                0x2947D567838719E97F3,
+                Op.MULMOD(
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                ),
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xC00390ED67EA33352A020F6BE6D255AA3A57F09B),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.COINBASE
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.CALLDATASIZE
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.ADD(
-                    0x2947D567838719E97F3,
-                    Op.MULMOD(
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                        Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    ),
-                ),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xc00390ed67ea33352a020f6be6d255aa3a57f09b"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c350367fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000"  # noqa: E501
-            "000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffe096902947d567838719e97f301"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe096902947d567838719e97f301"  # noqa: E501
         ),
         gas_limit=100000,
-        value=520154270,
+        value=0x1F00EC9E,
     )
 
     post = {
-        contract: Account(storage={0: 0x2947D567838719E97F3}),
+        target: Account(storage={0: 0x2947D567838719E97F3}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest59.py b/tests/ported_static/stRandom/test_random_statetest59.py
index b1a492539a6..ae2df70abd0 100644
--- a/tests/ported_static/stRandom/test_random_statetest59.py
+++ b/tests/ported_static/stRandom/test_random_statetest59.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest59.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest59Filler.json
+state_tests/stRandom/randomStatetest59Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest59Filler.json"],
+    ["state_tests/stRandom/randomStatetest59Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest59(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest59."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,74 +47,67 @@ def test_random_statetest59(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0208673a06756406548b9955  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=0x3A06756406548B99,
+            value=Op.ADDMOD(
+                Op.MUL(
+                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ),
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x819695593912E3C55CDAE6AE7FA84DCE409C7817),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=0x3A06756406548B99,
-                value=Op.ADDMOD(
-                    Op.MUL(
-                        Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ),
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x819695593912e3c55cdae6ae7fa84dce409c7817"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff0208673a06756406548b99"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0208673a06756406548b99"  # noqa: E501
         ),
         gas_limit=100000,
-        value=630320886,
+        value=0x2591EEF6,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x3A06756406548B99: 0xFFFFFFFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000002,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest6.py b/tests/ported_static/stRandom/test_random_statetest6.py
index e8bc8a36b88..39c3c2d8d13 100644
--- a/tests/ported_static/stRandom/test_random_statetest6.py
+++ b/tests/ported_static/stRandom/test_random_statetest6.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest6.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest6Filler.json
+state_tests/stRandom/randomStatetest6Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest6Filler.json"],
+    ["state_tests/stRandom/randomStatetest6Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest6(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest6."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,61 @@ def test_random_statetest6(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.COINBASE
-            + Op.NUMBER
-            + Op.COINBASE
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x1732797105F237768FE506871AC85355,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>4143416f1732797105f237768fe506871ac8535560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.COINBASE
+        + Op.NUMBER
+        + Op.COINBASE
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x1732797105F237768FE506871AC85355
         ),
         nonce=0,
-        address=Address("0xe5db1b85799b6a617aecd2562b23b6f957b67e36"),  # noqa: E501
+        address=Address(0xE5DB1B85799B6A617AECD2562B23B6F957B67E36),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e794143416f1732797105f237768fe506"  # noqa: E501
-            "871ac853"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e794143416f1732797105f237768fe506871ac853"  # noqa: E501
         ),
         gas_limit=100000,
-        value=841471566,
+        value=0x3227D64E,
     )
 
     post = {
-        contract: Account(storage={0: 0x1732797105F237768FE506871AC85355}),
+        target: Account(
+            storage={0: 0x1732797105F237768FE506871AC85355},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest60.py b/tests/ported_static/stRandom/test_random_statetest60.py
index 234ac6fefeb..fe8731cdbe4 100644
--- a/tests/ported_static/stRandom/test_random_statetest60.py
+++ b/tests/ported_static/stRandom/test_random_statetest60.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest60.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest60Filler.json
+state_tests/stRandom/randomStatetest60Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest60Filler.json"],
+    ["state_tests/stRandom/randomStatetest60Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest60(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest60."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,61 +47,58 @@ def test_random_statetest60(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x427f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f969001091aa15b8b9b75459d015a045560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.TIMESTAMP
+        + Op.PUSH32[0x0]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.NUMBER
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x969001091AA15B8B9B75459D015A0455
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x97D4DB1514B37DF70E337F6511EF8CD55950821A),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.TIMESTAMP
-            + Op.PUSH32[0x0]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.NUMBER
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x969001091AA15B8B9B75459D015A0455,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x97d4db1514b37df70e337f6511ef8cd55950821a"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "427f0000000000000000000000000000000000000000000000000000000000000000427f"  # noqa: E501
-            "000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe6f969001091aa15b8b"  # noqa: E501
-            "9b75459d015a04"
+        to=target,
+        data=Bytes(
+            "427f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f969001091aa15b8b9b75459d015a04"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1423842991,
+        value=0x54DE1EAF,
     )
 
     post = {
-        contract: Account(storage={0: 0x969001091AA15B8B9B75459D015A0455}),
+        target: Account(
+            storage={0: 0x969001091AA15B8B9B75459D015A0455},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest62.py b/tests/ported_static/stRandom/test_random_statetest62.py
index 4750bb875d2..cda4ae7bfe4 100644
--- a/tests/ported_static/stRandom/test_random_statetest62.py
+++ b/tests/ported_static/stRandom/test_random_statetest62.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest62.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest62Filler.json
+state_tests/stRandom/randomStatetest62Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest62Filler.json"],
+    ["state_tests/stRandom/randomStatetest62Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest62(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest62."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,66 +47,61 @@ def test_random_statetest62(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.NUMBER
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x7268713013964A96AC57580433250155,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000016f7268713013964a96ac5758043325015560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.NUMBER
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x7268713013964A96AC57580433250155
         ),
         nonce=0,
-        address=Address("0x972b86541005a9b0855de262a308c53797030ed5"),  # noqa: E501
+        address=Address(0x972B86541005A9B0855DE262A308C53797030ED5),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000016f7268713013964a96ac575804332501"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000016f7268713013964a96ac575804332501"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1228914584,
+        value=0x493FBF98,
     )
 
     post = {
-        contract: Account(storage={0: 0x7268713013964A96AC57580433250155}),
+        target: Account(
+            storage={0: 0x7268713013964A96AC57580433250155},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest63.py b/tests/ported_static/stRandom/test_random_statetest63.py
index 84ef0d2f71e..b2ee59d3ab3 100644
--- a/tests/ported_static/stRandom/test_random_statetest63.py
+++ b/tests/ported_static/stRandom/test_random_statetest63.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest63.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest63Filler.json
+state_tests/stRandom/randomStatetest63Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest63Filler.json"],
+    ["state_tests/stRandom/randomStatetest63Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest63(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest63."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,68 +46,60 @@ def test_random_statetest63(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x977F157E088003767A86928E82529655,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f977f157e088003767a86928e8252965560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x977F157E088003767A86928E82529655
         ),
         nonce=0,
-        address=Address("0x19e066e85d0f64c26f11bd131b229f05fd340e68"),  # noqa: E501
+        address=Address(0x19E066E85D0F64C26F11BD131B229F05FD340E68),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507f0000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000006f977f157e088003767a86928e825296"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f977f157e088003767a86928e825296"  # noqa: E501
         ),
         gas_limit=100000,
-        value=833723715,
+        value=0x31B19D43,
     )
 
     post = {
-        contract: Account(storage={0: 0x977F157E088003767A86928E82529655}),
+        target: Account(
+            storage={0: 0x977F157E088003767A86928E82529655},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest64.py b/tests/ported_static/stRandom/test_random_statetest64.py
index 6e4ec759d45..1a7f95a3d07 100644
--- a/tests/ported_static/stRandom/test_random_statetest64.py
+++ b/tests/ported_static/stRandom/test_random_statetest64.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest64.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest64Filler.json
+state_tests/stRandom/randomStatetest64Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest64Filler.json"],
+    ["state_tests/stRandom/randomStatetest64Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest64(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest64."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,70 +47,65 @@ def test_random_statetest64(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.TIMESTAMP
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.EXP(
-                    Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
-                    Op.ADDMOD(
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ),
-                ),
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x427f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe087f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b50a5560005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.TIMESTAMP
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.EXP(
+                Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
+                Op.ADDMOD(
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ),
+            ),
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "427f00000000000000000000000000000000000000000000000000000000000000017fff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe087f000000000000000000000000"  # noqa: E501
-            "945304eb96065b2a98b57a48a06ae28d285a71b50a"
+        to=contract_0,
+        data=Bytes(
+            "427f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe087f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b50a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=873959833,
+        value=0x34179199,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 1,
                 0x82FA967FBA85F07810930C28609BB009D805556C23CF249922CCA1350E4008C5: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest66.py b/tests/ported_static/stRandom/test_random_statetest66.py
index 330067e95d9..7bdcae93402 100644
--- a/tests/ported_static/stRandom/test_random_statetest66.py
+++ b/tests/ported_static/stRandom/test_random_statetest66.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest66.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest66Filler.json
+state_tests/stRandom/randomStatetest66Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest66Filler.json"],
+    ["state_tests/stRandom/randomStatetest66Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest66(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest66."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,66 +47,62 @@ def test_random_statetest66(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GASLIMIT
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.COINBASE
-            + Op.SSTORE(
-                key=Op.PUSH32[0x10000000000000000000000000000000000000000],
-                value=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f000000000000000000000001000000000000000000000000000000000000000055  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.GASLIMIT
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.COINBASE
+        + Op.SSTORE(
+            key=Op.PUSH32[0x10000000000000000000000000000000000000000],
+            value=Op.MULMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417f"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000"  # noqa: E501
-            "000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe097f0000000000000000"  # noqa: E501
-            "000000010000000000000000000000000000000000000000"
+        to=contract_0,
+        data=Bytes(
+            "457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f0000000000000000000000010000000000000000000000000000000000000000"  # noqa: E501
         ),
         gas_limit=100000,
-        value=794190030,
+        value=0x2F5660CE,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0x10000000000000000000000000000000000000000: 0xFFFFFFFFFFFFFFFFFFFFFFFF6BACFB1469F9A4D5674A85B75F951D72D7A58E4A,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest67.py b/tests/ported_static/stRandom/test_random_statetest67.py
index 0fff8feb00d..fd4c0352f86 100644
--- a/tests/ported_static/stRandom/test_random_statetest67.py
+++ b/tests/ported_static/stRandom/test_random_statetest67.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest67.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest67Filler.json
+state_tests/stRandom/randomStatetest67Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest67Filler.json"],
+    ["state_tests/stRandom/randomStatetest67Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest67(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest67."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,59 @@ def test_random_statetest67(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f699776659a06a27607a2166d5373315560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x699776659A06A27607A2166D53733155
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x685A55E52C8F02C38DEBE94EF377E3D3AE195BFF),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x699776659A06A27607A2166D53733155,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x685a55e52c8f02c38debe94ef377e3d3ae195bff"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000007f0000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000c3507f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000007f0000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000016f699776659a06a27607a2166d537331"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f699776659a06a27607a2166d537331"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2113087573,
+        value=0x7DF32855,
     )
 
     post = {
-        contract: Account(storage={0: 0x699776659A06A27607A2166D53733155}),
+        target: Account(
+            storage={0: 0x699776659A06A27607A2166D53733155},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest69.py b/tests/ported_static/stRandom/test_random_statetest69.py
index d5a1c8d03a4..eaadb4756a1 100644
--- a/tests/ported_static/stRandom/test_random_statetest69.py
+++ b/tests/ported_static/stRandom/test_random_statetest69.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest69.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest69Filler.json
+state_tests/stRandom/randomStatetest69Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest69Filler.json"],
+    ["state_tests/stRandom/randomStatetest69Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest69(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest69."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,60 @@ def test_random_statetest69(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe43596f15a0770a7676611a6595057b768b645560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 3
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.NUMBER
+        + Op.MSIZE
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x15A0770A7676611A6595057B768B6455
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x50B424C9633E670BA9AC1941DBC9ECACE36CE608),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.NUMBER
-            + Op.MSIZE
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x15A0770A7676611A6595057B768B6455,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x50b424c9633e670ba9ac1941dbc9ecace36ce608"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe43596f15a0770a7676611a6595057b768b64"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe43596f15a0770a7676611a6595057b768b64"  # noqa: E501
         ),
         gas_limit=100000,
-        value=795619675,
+        value=0x2F6C315B,
     )
 
     post = {
-        contract: Account(storage={0: 0x15A0770A7676611A6595057B768B6455}),
+        target: Account(
+            storage={0: 0x15A0770A7676611A6595057B768B6455},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest72.py b/tests/ported_static/stRandom/test_random_statetest72.py
index 4ef463adec9..60430872c5f 100644
--- a/tests/ported_static/stRandom/test_random_statetest72.py
+++ b/tests/ported_static/stRandom/test_random_statetest72.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest72.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest72Filler.json
+state_tests/stRandom/randomStatetest72Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,107 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest72Filler.json"],
+    ["state_tests/stRandom/randomStatetest72Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest72(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.DIV(
-                Op.SGT(
-                    Op.MULMOD(
-                        0x688DFF579830,
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                        Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    ),
-                    Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-                ),
-                Op.COINBASE,
-            )
-        ),
-        nonce=0,
-        address=Address("0xd8ae0334e34ce6256b4c50a0e7d74ffe2fcab7e8"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff417f00000000000000"  # noqa: E501
-            "00000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe65688dff579830091304"
-        ),
-        gas_limit=100000,
-        value=1575824584,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest72Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest72_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest72."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -133,64 +43,57 @@ def test_random_statetest72_from_prague(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.DIV(
-                Op.SGT(
-                    Op.MULMOD(
-                        0x688DFF579830,
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                        Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    ),
-                    Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff417f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe65688dff579830091304  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.DIV(
+            Op.SGT(
+                Op.MULMOD(
+                    0x688DFF579830,
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
                 ),
-                Op.COINBASE,
-            )
+                Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+            ),
+            Op.COINBASE,
         ),
         nonce=0,
-        address=Address("0xd8ae0334e34ce6256b4c50a0e7d74ffe2fcab7e8"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff417f00000000000000"  # noqa: E501
-            "00000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe65688dff579830091304"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff417f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe65688dff579830091304"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1575824584,
+        value=0x5DED2CC8,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest73.py b/tests/ported_static/stRandom/test_random_statetest73.py
index 759966f4b41..8f39446b096 100644
--- a/tests/ported_static/stRandom/test_random_statetest73.py
+++ b/tests/ported_static/stRandom/test_random_statetest73.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest73.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest73Filler.json
+state_tests/stRandom/randomStatetest73Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest73Filler.json"],
+    ["state_tests/stRandom/randomStatetest73Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest73(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest73."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,65 +47,60 @@ def test_random_statetest73(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.SSTORE(
-                key=0xB5B573198D729B711671056E0A0555346138,
-                value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5b573198d729b711671056e0a055534613855  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.SSTORE(
+            key=0xB5B573198D729B711671056E0A0555346138,
+            value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017f0000000000000000000000"  # noqa: E501
-            "00945304eb96065b2a98b57a48a06ae28d285a71b57e7f00000000000000000000000094"  # noqa: E501
-            "5304eb96065b2a98b57a48a06ae28d285a71b5b573198d729b711671056e0a0555346138"  # noqa: E501
+        to=contract_0,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5b573198d729b711671056e0a0555346138"  # noqa: E501
         ),
         gas_limit=100000,
-        value=84268071,
+        value=0x505D427,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0xB5B573198D729B711671056E0A0555346138: 0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest74.py b/tests/ported_static/stRandom/test_random_statetest74.py
index 262fd71da46..ab71e17db0d 100644
--- a/tests/ported_static/stRandom/test_random_statetest74.py
+++ b/tests/ported_static/stRandom/test_random_statetest74.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest74.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest74Filler.json
+state_tests/stRandom/randomStatetest74Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest74Filler.json"],
+    ["state_tests/stRandom/randomStatetest74Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest74(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest74."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,63 +46,59 @@ def test_random_statetest74(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.TIMESTAMP
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.GASPRICE
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x141097788A7B5A72139C07076F184255,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x1388416097405b5998a7b07d85a1aaadf337e5da"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3a7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000006f141097788a7b5a72139c07076f18425560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.TIMESTAMP
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.GASPRICE
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x141097788A7B5A72139C07076F184255
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x1388416097405B5998A7B07D85A1AAADF337E5DA),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000017f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff3a7f000000000000"  # noqa: E501
-            "0000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000006f141097788a7b5a72139c0707"  # noqa: E501
-            "6f1842"
+        to=target,
+        data=Bytes(
+            "427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3a7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000006f141097788a7b5a72139c07076f1842"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1223108496,
+        value=0x48E72790,
     )
 
     post = {
-        contract: Account(storage={0: 0x141097788A7B5A72139C07076F184255}),
+        target: Account(
+            storage={0: 0x141097788A7B5A72139C07076F184255},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest75.py b/tests/ported_static/stRandom/test_random_statetest75.py
index 26f4f660b5a..c342198fc47 100644
--- a/tests/ported_static/stRandom/test_random_statetest75.py
+++ b/tests/ported_static/stRandom/test_random_statetest75.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest75.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest75Filler.json
+state_tests/stRandom/randomStatetest75Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest75Filler.json"],
+    ["state_tests/stRandom/randomStatetest75Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest75(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest75."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,68 +47,63 @@ def test_random_statetest75(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GASLIMIT
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x5893504553386C7D1540017792877655,
-            )
+    # Source: raw
+    # 0x457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000006f5893504553386c7d154001779287765560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.GASLIMIT
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x5893504553386C7D1540017792877655
         ),
         nonce=0,
-        address=Address("0x6ea6bbac1c9c438b7854633dcf8d299f4004a0d5"),  # noqa: E501
+        address=Address(0x6EA6BBAC1C9C438B7854633DCF8D299F4004A0D5),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000007f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000"  # noqa: E501
-            "000000000000000000000000000000006f5893504553386c7d15400177928776"
+        to=target,
+        data=Bytes(
+            "457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000006f5893504553386c7d15400177928776"  # noqa: E501
         ),
         gas_limit=100000,
-        value=180160312,
+        value=0xABD0738,
     )
 
     post = {
-        contract: Account(storage={0: 0x5893504553386C7D1540017792877655}),
+        target: Account(
+            storage={0: 0x5893504553386C7D1540017792877655},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest77.py b/tests/ported_static/stRandom/test_random_statetest77.py
index f0b0f2478c0..8dfd8020d48 100644
--- a/tests/ported_static/stRandom/test_random_statetest77.py
+++ b/tests/ported_static/stRandom/test_random_statetest77.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest77.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest77Filler.json
+state_tests/stRandom/randomStatetest77Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest77Filler.json"],
+    ["state_tests/stRandom/randomStatetest77Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest77(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest77."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,61 +47,56 @@ def test_random_statetest77(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.COINBASE
-            + Op.SWAP4
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x79A06DF1A08D05373216D37219034155,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000141937f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f79a06df1a08d05373216d3721903415560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1] * 2
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.COINBASE
+        + Op.SWAP4
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x79A06DF1A08D05373216D37219034155
         ),
         nonce=0,
-        address=Address("0x37f7e5268a5789947dca44e08340dc3c59dc0b97"),  # noqa: E501
+        address=Address(0x37F7E5268A5789947DCA44E08340DC3C59DC0B97),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000141937f000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000007f000000000000000000000001"  # noqa: E501
-            "00000000000000000000000000000000000000006f79a06df1a08d05373216d372190341"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000141937f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f79a06df1a08d05373216d372190341"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1249250523,
+        value=0x4A760CDB,
     )
 
     post = {
-        contract: Account(storage={0: 0x79A06DF1A08D05373216D37219034155}),
+        target: Account(
+            storage={0: 0x79A06DF1A08D05373216D37219034155},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest78.py b/tests/ported_static/stRandom/test_random_statetest78.py
index dd96486fabf..cb714aeed87 100644
--- a/tests/ported_static/stRandom/test_random_statetest78.py
+++ b/tests/ported_static/stRandom/test_random_statetest78.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest78.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest78Filler.json
+state_tests/stRandom/randomStatetest78Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,99 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest78Filler.json"],
+    ["state_tests/stRandom/randomStatetest78Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest78(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c3507f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff1174648789aa349e0915aa5911"
-        ),
-        nonce=0,
-        address=Address("0xc0cf981b416db73110aac9d4dbe6d1358cf4e6db"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c3507f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff1174648789aa349e0915aa5911"
-        ),
-        gas_limit=100000,
-        value=181540957,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest78Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest78_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest78."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -125,56 +43,45 @@ def test_random_statetest78_from_prague(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>437f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1174648789aa349e0915aa5911  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c3507f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff1174648789aa349e0915aa5911"
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1174648789aa349e0915aa5911"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xc0cf981b416db73110aac9d4dbe6d1358cf4e6db"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c3507f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff1174648789aa349e0915aa5911"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1174648789aa349e0915aa5911"  # noqa: E501
         ),
         gas_limit=100000,
-        value=181540957,
+        value=0xAD2185D,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest80.py b/tests/ported_static/stRandom/test_random_statetest80.py
index 5da803accaf..b294ed4588b 100644
--- a/tests/ported_static/stRandom/test_random_statetest80.py
+++ b/tests/ported_static/stRandom/test_random_statetest80.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest80.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest80Filler.json
+state_tests/stRandom/randomStatetest80Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest80Filler.json"],
+    ["state_tests/stRandom/randomStatetest80Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest80(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest80."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,67 +47,62 @@ def test_random_statetest80(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.PUSH32[0xC350]
-            + Op.GT(
-                Op.PUSH32[0x10000000000000000000000000000000000000000],
-                Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
-            )
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=0xB5681069127B3B9C877D6F6169FF36600051,
-                value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000010000000000000000000000000000000000000000117fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5681069127b3b9c877d6f6169ff3660005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.PUSH32[0xC350]
+        + Op.GT(
+            Op.PUSH32[0x10000000000000000000000000000000000000000],
+            Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
+        )
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=0xB5681069127B3B9C877D6F6169FF36600051,
+            value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000"  # noqa: E501
-            "000000010000000000000000000000000000000000000000117fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000"  # noqa: E501
-            "945304eb96065b2a98b57a48a06ae28d285a71b5681069127b3b9c877d6f6169ff36"  # noqa: E501
+        to=contract_0,
+        data=Bytes(
+            "7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000010000000000000000000000000000000000000000117fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5681069127b3b9c877d6f6169ff36"  # noqa: E501
         ),
         gas_limit=100000,
-        value=517580214,
+        value=0x1ED9A5B6,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0xB5681069127B3B9C877D6F6169FF36600051: 0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest81.py b/tests/ported_static/stRandom/test_random_statetest81.py
index 90c2534357e..ae48614266f 100644
--- a/tests/ported_static/stRandom/test_random_statetest81.py
+++ b/tests/ported_static/stRandom/test_random_statetest81.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest81.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest81Filler.json
+state_tests/stRandom/randomStatetest81Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest81Filler.json"],
+    ["state_tests/stRandom/randomStatetest81Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest81(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest81."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,60 @@ def test_random_statetest81(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff436f616c327e0435743c515b078453a03c5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.NUMBER
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.NUMBER
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x616C327E0435743C515B078453A03C55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x97FBF90A1B8CCAEB7FA3A74A5C8BDF3DC10AAFD4),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.NUMBER
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.NUMBER
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x616C327E0435743C515B078453A03C55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x97fbf90a1b8ccaeb7fa3a74a5c8bdf3dc10aafd4"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff436f616c327e0435743c515b078453a03c"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff436f616c327e0435743c515b078453a03c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=898282209,
+        value=0x358AB2E1,
     )
 
     post = {
-        contract: Account(storage={0: 0x616C327E0435743C515B078453A03C55}),
+        target: Account(
+            storage={0: 0x616C327E0435743C515B078453A03C55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest82.py b/tests/ported_static/stRandom/test_random_statetest82.py
index 531ea35f07b..f91cbb5aacb 100644
--- a/tests/ported_static/stRandom/test_random_statetest82.py
+++ b/tests/ported_static/stRandom/test_random_statetest82.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest82.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest82Filler.json
+state_tests/stRandom/randomStatetest82Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,107 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest82Filler.json"],
+    ["state_tests/stRandom/randomStatetest82Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest82(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MOD(
-                    Op.PUSH32[0x0],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-                value=Op.MULMOD(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-            )
-        ),
-        nonce=0,
-        address=Address("0x3d8eef1923018c3cae225f836ab9821321d39496"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff097fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000006"
-        ),
-        gas_limit=100000,
-        value=1676520806,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest82Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest82_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest82."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -133,64 +43,57 @@ def test_random_statetest82_from_prague(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MOD(
-                    Op.PUSH32[0x0],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-                value=Op.MULMOD(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000000655  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MOD(
+                Op.PUSH32[0x0],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
+            value=Op.MULMOD(
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
         ),
         nonce=0,
-        address=Address("0x3d8eef1923018c3cae225f836ab9821321d39496"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff097fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000006"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000000006"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1676520806,
+        value=0x63EDAD66,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest83.py b/tests/ported_static/stRandom/test_random_statetest83.py
index c248c937957..adb1b9f4b2a 100644
--- a/tests/ported_static/stRandom/test_random_statetest83.py
+++ b/tests/ported_static/stRandom/test_random_statetest83.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest83.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest83Filler.json
+state_tests/stRandom/randomStatetest83Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest83Filler.json"],
+    ["state_tests/stRandom/randomStatetest83Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest83(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest83."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,59 @@ def test_random_statetest83(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000307ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6fa1109af20740728e72150a7a9c09595560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x0]
+        + Op.ADDRESS
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0xA1109AF20740728E72150A7A9C095955
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x9A835E4C65AEFD446FC94197FF59DAAD95C34E88),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x0]
-            + Op.ADDRESS
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0xA1109AF20740728E72150A7A9C095955,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x9a835e4c65aefd446fc94197ff59daad95c34e88"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff427f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000017f00000000000000"  # noqa: E501
-            "0000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000307fffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffe6fa1109af20740728e72150a7a9c0959"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000307ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6fa1109af20740728e72150a7a9c0959"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1015118220,
+        value=0x3C81798C,
     )
 
     post = {
-        contract: Account(storage={0: 0xA1109AF20740728E72150A7A9C095955}),
+        target: Account(
+            storage={0: 0xA1109AF20740728E72150A7A9C095955},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest84.py b/tests/ported_static/stRandom/test_random_statetest84.py
index 7a68c99fb57..8a7e5edfb71 100644
--- a/tests/ported_static/stRandom/test_random_statetest84.py
+++ b/tests/ported_static/stRandom/test_random_statetest84.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest84.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest84Filler.json
+state_tests/stRandom/randomStatetest84Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest84Filler.json"],
+    ["state_tests/stRandom/randomStatetest84Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest84(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest84."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,58 +43,53 @@ def test_random_statetest84(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PREVRANDAO
-            + Op.XOR(Op.PUSH32[0x1], Op.GASLIMIT)
-            + Op.MSTORE(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                value=Op.PUSH32[0x1],
-            )
-            + Op.SSTORE(key=Op.MSIZE, value=Op.ISZERO)
-        ),
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000001000000000000000000000000000000000000000044457f0000000000000000000000000000000000000000000000000000000000000001187f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff52155955  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PREVRANDAO
+        + Op.XOR(Op.PUSH32[0x1], Op.GASLIMIT)
+        + Op.MSTORE(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            value=Op.PUSH32[0x1],
+        )
+        + Op.SSTORE(key=Op.MSIZE, value=Op.ISZERO),
         nonce=0,
-        address=Address("0x08e8be5786db8a32df25c732dea4a9f3e1b16e1b"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "00000000000000000001000000000000000000000000000000000000000044457f000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000001187f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff521559"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000001000000000000000000000000000000000000000044457f0000000000000000000000000000000000000000000000000000000000000001187f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff521559"  # noqa: E501
         ),
         gas_limit=100000,
-        value=679746513,
+        value=0x28841BD1,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest85.py b/tests/ported_static/stRandom/test_random_statetest85.py
index e3a5f9ef9ea..85d9941e15e 100644
--- a/tests/ported_static/stRandom/test_random_statetest85.py
+++ b/tests/ported_static/stRandom/test_random_statetest85.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest85.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest85Filler.json
+state_tests/stRandom/randomStatetest85Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest85Filler.json"],
+    ["state_tests/stRandom/randomStatetest85Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest85(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest85."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,60 +43,45 @@ def test_random_statetest85(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350f25b557e348ff374819d123109539b55  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000017f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c350f25b557e348ff374819d123109539b55"
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350f25b557e348ff374819d123109539b55"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xd2fd98d49a70f7c4b524b8e53c8e5fc695555554"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000017f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c350f25b557e348ff374819d123109539b"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350f25b557e348ff374819d123109539b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=994504369,
+        value=0x3B46EEB1,
     )
 
     post = {
-        contract: Account(storage={1: 50000}),
+        target: Account(storage={1: 50000}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest87.py b/tests/ported_static/stRandom/test_random_statetest87.py
index bb409874b37..50a064810eb 100644
--- a/tests/ported_static/stRandom/test_random_statetest87.py
+++ b/tests/ported_static/stRandom/test_random_statetest87.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest87.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest87Filler.json
+state_tests/stRandom/randomStatetest87Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest87Filler.json"],
+    ["state_tests/stRandom/randomStatetest87Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest87(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest87."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,65 +46,59 @@ def test_random_statetest87(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.JUMPDEST
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x446E638E7E16736C030393727D748174,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000005b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f446e638e7e16736c030393727d74817460005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0] * 2
+        + Op.PUSH32[0x10000000000000000000000000000000000000000] * 2
+        + Op.JUMPDEST
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x446E638E7E16736C030393727D748174
         ),
         nonce=0,
-        address=Address("0x2d5075f9729770c4dcf91f9dd6635f9b4dcdccf8"),  # noqa: E501
+        address=Address(0x2D5075F9729770C4DCF91F9DD6635F9B4DCDCCF8),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000005b7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe6f446e638e7e16736c030393727d748174"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000005b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f446e638e7e16736c030393727d748174"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2065587657,
+        value=0x7B1E5DC9,
     )
 
     post = {
-        contract: Account(storage={0: 0x446E638E7E16736C030393727D748174}),
+        target: Account(
+            storage={0: 0x446E638E7E16736C030393727D748174},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest88.py b/tests/ported_static/stRandom/test_random_statetest88.py
index 318fee67d90..c6b24419222 100644
--- a/tests/ported_static/stRandom/test_random_statetest88.py
+++ b/tests/ported_static/stRandom/test_random_statetest88.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest88.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest88Filler.json
+state_tests/stRandom/randomStatetest88Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest88Filler.json"],
+    ["state_tests/stRandom/randomStatetest88Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest88(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest88."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,64 +47,60 @@ def test_random_statetest88(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.MSTORE8(offset=Op.NUMBER, value=Op.NUMBER)
-            + Op.PUSH32[0xC350]
-            + Op.GT
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x34F06A7014541167033909103620F355,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x4150a4f366c525b471e788d777bfd0d118ce5b23"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>4343537f000000000000000000000000000000000000000000000000000000000000c350117fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000016f34f06a7014541167033909103620f35560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.MSTORE8(offset=Op.NUMBER, value=Op.NUMBER)
+        + Op.PUSH32[0xC350]
+        + Op.GT
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x34F06A7014541167033909103620F355
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4150A4F366C525B471E788D777BFD0D118CE5B23),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79434353"  # noqa: E501
-            "7f000000000000000000000000000000000000000000000000000000000000c350117fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000016f34f06a70145411"  # noqa: E501
-            "67033909103620f3"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e794343537f000000000000000000000000000000000000000000000000000000000000c350117fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000016f34f06a7014541167033909103620f3"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1050242229,
+        value=0x3E996CB5,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
+                1: 0,
                 0x1000000000000000000000000000000000000000000000000000000000000: 0x34F06A7014541167033909103620F355,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest89.py b/tests/ported_static/stRandom/test_random_statetest89.py
index 3fe0cedd9a5..37bb4e367c3 100644
--- a/tests/ported_static/stRandom/test_random_statetest89.py
+++ b/tests/ported_static/stRandom/test_random_statetest89.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest89.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest89Filler.json
+state_tests/stRandom/randomStatetest89Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest89Filler.json"],
+    ["state_tests/stRandom/randomStatetest89Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest89(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest89."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,60 +46,55 @@ def test_random_statetest89(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x5648CE0AD106B7A6F3483379E62876B,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f05648ce0ad106b7a6f3483379e62876b60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000] * 2
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x5648CE0AD106B7A6F3483379E62876B
         ),
         nonce=0,
-        address=Address("0x1719f88aeea1dcfeb5ac48fe64d270ab05723c94"),  # noqa: E501
+        address=Address(0x1719F88AEEA1DCFEB5AC48FE64D270AB05723C94),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000007f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000016f05648ce0ad106b7a6f3483379e62876b"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f05648ce0ad106b7a6f3483379e62876b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1090727739,
+        value=0x41032F3B,
     )
 
     post = {
-        contract: Account(storage={0: 0x5648CE0AD106B7A6F3483379E62876B}),
+        target: Account(
+            storage={0: 0x5648CE0AD106B7A6F3483379E62876B},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest9.py b/tests/ported_static/stRandom/test_random_statetest9.py
index 0cae15efc5a..9fd7f121cad 100644
--- a/tests/ported_static/stRandom/test_random_statetest9.py
+++ b/tests/ported_static/stRandom/test_random_statetest9.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest9.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest9Filler.json
+state_tests/stRandom/randomStatetest9Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest9Filler.json"],
+    ["state_tests/stRandom/randomStatetest9Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest9(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest9."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,57 @@ def test_random_statetest9(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f757fb845405bf1ff959ba03a9c336b5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1] * 3
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x757FB845405BF1FF959BA03A9C336B55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xE4B1E633C823D5BFDE55301AAF1D5AD28816F1EF),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x757FB845405BF1FF959BA03A9C336B55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xe4b1e633c823d5bfde55301aaf1d5ad28816f1ef"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000017f0000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000016f757fb845405bf1ff959ba03a9c336b"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f757fb845405bf1ff959ba03a9c336b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=217035801,
+        value=0xCEFB419,
     )
 
     post = {
-        contract: Account(storage={0: 0x757FB845405BF1FF959BA03A9C336B55}),
+        target: Account(
+            storage={0: 0x757FB845405BF1FF959BA03A9C336B55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest90.py b/tests/ported_static/stRandom/test_random_statetest90.py
index 2b5edc7f432..b6c9a96b8d3 100644
--- a/tests/ported_static/stRandom/test_random_statetest90.py
+++ b/tests/ported_static/stRandom/test_random_statetest90.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest90.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest90Filler.json
+state_tests/stRandom/randomStatetest90Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest90Filler.json"],
+    ["state_tests/stRandom/randomStatetest90Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest90(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest90."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,60 +47,56 @@ def test_random_statetest90(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.ISZERO(Op.GASLIMIT)
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x116B4177F25178D7048212877E956855,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff45157f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000016f116b4177f25178d7048212877e95685560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.ISZERO(Op.GASLIMIT)
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x116B4177F25178D7048212877E956855
         ),
         nonce=0,
-        address=Address("0xc826d0d6d0cd47cc972a44a7b4e8e76759e5e07e"),  # noqa: E501
+        address=Address(0xC826D0D6D0CD47CC972A44A7B4E8E76759E5E07E),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff45157f"  # noqa: E501
-            "0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000"  # noqa: E501
-            "000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000017f000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000c3507f000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000016f116b4177f25178d7048212877e9568"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff45157f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000016f116b4177f25178d7048212877e9568"  # noqa: E501
         ),
         gas_limit=100000,
-        value=168858958,
+        value=0xA10954E,
     )
 
     post = {
-        contract: Account(storage={0: 0x116B4177F25178D7048212877E956855}),
+        target: Account(
+            storage={0: 0x116B4177F25178D7048212877E956855},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest92.py b/tests/ported_static/stRandom/test_random_statetest92.py
index 816931f05e0..15f258e054a 100644
--- a/tests/ported_static/stRandom/test_random_statetest92.py
+++ b/tests/ported_static/stRandom/test_random_statetest92.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest92.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest92Filler.json
+state_tests/stRandom/randomStatetest92Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest92Filler.json"],
+    ["state_tests/stRandom/randomStatetest92Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest92(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest92."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,60 @@ def test_random_statetest92(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x59640C655956799087168F0658A11A55,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f59640c655956799087168f0658a11a5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x59640C655956799087168F0658A11A55
         ),
         nonce=0,
-        address=Address("0xeba81e870fd988a7ca5504d2ce5972bd0e094df8"),  # noqa: E501
+        address=Address(0xEBA81E870FD988A7CA5504D2CE5972BD0E094DF8),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000"  # noqa: E501
-            "0000000000000000000000006f59640c655956799087168f0658a11a"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f59640c655956799087168f0658a11a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=472110012,
+        value=0x1C23D3BC,
     )
 
     post = {
-        contract: Account(storage={0: 0x59640C655956799087168F0658A11A55}),
+        target: Account(
+            storage={0: 0x59640C655956799087168F0658A11A55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest95.py b/tests/ported_static/stRandom/test_random_statetest95.py
index fb0ad6f4824..572f85c4f68 100644
--- a/tests/ported_static/stRandom/test_random_statetest95.py
+++ b/tests/ported_static/stRandom/test_random_statetest95.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest95.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest95Filler.json
+state_tests/stRandom/randomStatetest95Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest95Filler.json"],
+    ["state_tests/stRandom/randomStatetest95Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest95(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest95."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,63 @@ def test_random_statetest95(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff14447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.EQ(
+            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+        )
+        + Op.PREVRANDAO
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.JUMPDEST
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x8AC8EA09297A4D9043501BF2AFE59C630C47D75F),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.EQ(
-                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.PREVRANDAO
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.JUMPDEST
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x8ac8ea09297a4d9043501bf2afe59c630c47d75f"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff14447fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffff5b"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff14447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2122578548,
+        value=0x7E83FA74,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest96.py b/tests/ported_static/stRandom/test_random_statetest96.py
index f0f94fc3456..f957c3f1d60 100644
--- a/tests/ported_static/stRandom/test_random_statetest96.py
+++ b/tests/ported_static/stRandom/test_random_statetest96.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest96.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest96Filler.json
+state_tests/stRandom/randomStatetest96Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest96Filler.json"],
+    ["state_tests/stRandom/randomStatetest96Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest96(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest96."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,66 +46,60 @@ def test_random_statetest96(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x183B68A09B08953085A854A39D921255,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x1116e19be1b4c4fc96b618a6a6c487b587572be9"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006f183b68a09b08953085a854a39d92125560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x183B68A09B08953085A854A39D921255
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x1116E19BE1B4C4FC96B618A6A6C487B587572BE9),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017f0000000000000000000000010000000000"  # noqa: E501
-            "0000000000000000000000000000007f0000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000006f183b68a09b08953085a854a39d9212"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006f183b68a09b08953085a854a39d9212"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1246597060,
+        value=0x4A4D8FC4,
     )
 
     post = {
-        contract: Account(storage={0: 0x183B68A09B08953085A854A39D921255}),
+        target: Account(
+            storage={0: 0x183B68A09B08953085A854A39D921255},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest97.py b/tests/ported_static/stRandom/test_random_statetest97.py
index 71dab25146f..ba81619ccf4 100644
--- a/tests/ported_static/stRandom/test_random_statetest97.py
+++ b/tests/ported_static/stRandom/test_random_statetest97.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest97.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest97Filler.json
+state_tests/stRandom/randomStatetest97Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest97Filler.json"],
+    ["state_tests/stRandom/randomStatetest97Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest97(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest97."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,65 +43,65 @@ def test_random_statetest97(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PC
-            + Op.PUSH32[0x1]
-            + Op.SWAP6
-            + Op.BLOCKHASH(block_number=Op.PUSH32[0x0])
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.SWAP8
-            + Op.LOG1(
-                offset=Op.DUP8,
-                size=Op.XOR(
-                    Op.SMOD(Op.CALLDATALOAD(offset=Op.DUP12), Op.CALLER),
-                    Op.SMOD,
-                ),
-                topic_1=Op.ADD(Op.DIV, Op.DUP2),
-            )
-            + Op.DUP7
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>587f0000000000000000000000000000000000000000000000000000000000000001957f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3509781040107338b35071887a186  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PC
+        + Op.PUSH32[0x1]
+        + Op.SWAP6
+        + Op.BLOCKHASH(block_number=Op.PUSH32[0x0])
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.SWAP8
+        + Op.LOG1(
+            offset=Op.DUP8,
+            size=Op.XOR(
+                Op.SMOD(Op.CALLDATALOAD(offset=Op.DUP12), Op.CALLER), Op.SMOD
+            ),
+            topic_1=Op.ADD(Op.DIV, Op.DUP2),
+        )
+        + Op.DUP7,
         nonce=0,
-        address=Address("0x987a2bce4eb6b8b9b42b371c1229b8bc73f029fc"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79587f00"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000001957f000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000407f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3509781040107338b35071887a1"  # noqa: E501
-            "86"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79587f0000000000000000000000000000000000000000000000000000000000000001957f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3509781040107338b35071887a186"  # noqa: E501
         ),
         gas_limit=100000,
-        value=335580338,
+        value=0x14008CB2,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={},
+            code=bytes.fromhex(
+                "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79587f0000000000000000000000000000000000000000000000000000000000000001957f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3509781040107338b35071887a186"  # noqa: E501
+            ),
+            balance=0,
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom/test_random_statetest98.py b/tests/ported_static/stRandom/test_random_statetest98.py
index f43f09ba087..9ab7e9bac2e 100644
--- a/tests/ported_static/stRandom/test_random_statetest98.py
+++ b/tests/ported_static/stRandom/test_random_statetest98.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest98.
 
 Ported from:
-tests/static/state_tests/stRandom/randomStatetest98Filler.json
+state_tests/stRandom/randomStatetest98Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom/randomStatetest98Filler.json"],
+    ["state_tests/stRandom/randomStatetest98Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest98(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest98."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,71 +47,65 @@ def test_random_statetest98(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.COINBASE
-            + Op.SSTORE(
-                key=Op.ADDMOD(
-                    Op.SIGNEXTEND(
-                        Op.PUSH32[0x0],
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ),
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x471b3ef5770a3fdbdbf9dbcde26dfee32181a61b"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000000b085560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.COINBASE
+        + Op.SSTORE(
+            key=Op.ADDMOD(
+                Op.SIGNEXTEND(
+                    Op.PUSH32[0x0],
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ),
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x471B3EF5770A3FDBDBF9DBCDE26DFEE32181A61B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79417fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000b08"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000000b08"  # noqa: E501
         ),
         gas_limit=100000,
-        value=588937108,
+        value=0x231A7794,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
-                0: 0x4F3F701464972E74606D6EA82D4D3080599A0E79,
+                0: coinbase,
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/__init__.py b/tests/ported_static/stRandom2/__init__.py
index 7dc122d99f1..d19f2eea0d0 100644
--- a/tests/ported_static/stRandom2/__init__.py
+++ b/tests/ported_static/stRandom2/__init__.py
@@ -1 +1 @@
-"""Tests ported from stRandom2."""
+"""Ported static tests: stRandom2."""  # noqa: N999
diff --git a/tests/ported_static/stRandom2/test_random_statetest.py b/tests/ported_static/stRandom2/test_random_statetest.py
index 0ba1ffc5eb0..9efe1661320 100644
--- a/tests/ported_static/stRandom2/test_random_statetest.py
+++ b/tests/ported_static/stRandom2/test_random_statetest.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetestFiller.json
+state_tests/stRandom2/randomStatetestFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetestFiller.json"],
+    ["state_tests/stRandom2/randomStatetestFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,61 @@ def test_random_statetest(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x29199C9AA4054170F1A15A55056F9655,
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f29199c9aa4054170f1a15a55056f965560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x29199C9AA4054170F1A15A55056F9655
         ),
         nonce=0,
-        address=Address("0xa482d90f6cda557c1e8e41c3755c25821c27bb9d"),  # noqa: E501
+        address=Address(0xA482D90F6CDA557C1E8E41C3755C25821C27BB9D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000007f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe6f29199c9aa4054170f1a15a55056f96"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f29199c9aa4054170f1a15a55056f96"  # noqa: E501
         ),
         gas_limit=100000,
-        value=252246116,
+        value=0xF08F864,
     )
 
     post = {
-        contract: Account(storage={0: 0x29199C9AA4054170F1A15A55056F9655}),
+        target: Account(
+            storage={0: 0x29199C9AA4054170F1A15A55056F9655},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest384.py b/tests/ported_static/stRandom2/test_random_statetest384.py
index fcd9829b03c..a6ffddfd636 100644
--- a/tests/ported_static/stRandom2/test_random_statetest384.py
+++ b/tests/ported_static/stRandom2/test_random_statetest384.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest384.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest384Filler.json
+state_tests/stRandom2/randomStatetest384Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest384Filler.json"],
+    ["state_tests/stRandom2/randomStatetest384Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest384(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest384."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,59 @@ def test_random_statetest384(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f16133502727c0a7f679b456df093576360005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x16133502727C0A7F679B456DF0935763
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xCE79579821C4A0738C7B42FD178FF0192B4A276F),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x16133502727C0A7F679B456DF0935763,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xce79579821c4a0738c7b42fd178ff0192b4a276f"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff6f16133502727c0a7f679b456df0935763"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f16133502727c0a7f679b456df0935763"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2066470732,
+        value=0x7B2BD74C,
     )
 
     post = {
-        contract: Account(storage={0: 0x16133502727C0A7F679B456DF0935763}),
+        target: Account(
+            storage={0: 0x16133502727C0A7F679B456DF0935763},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest385.py b/tests/ported_static/stRandom2/test_random_statetest385.py
index 50f25c87677..da8d8a10539 100644
--- a/tests/ported_static/stRandom2/test_random_statetest385.py
+++ b/tests/ported_static/stRandom2/test_random_statetest385.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest385.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest385Filler.json
+state_tests/stRandom2/randomStatetest385Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest385Filler.json"],
+    ["state_tests/stRandom2/randomStatetest385Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest385(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest385."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,61 +47,55 @@ def test_random_statetest385(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.SLOAD(
-                key=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            )
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x785188182063156955631A7A85093A55,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>547f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f785188182063156955631a7a85093a5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0]
+        + Op.SLOAD(key=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79])
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x785188182063156955631A7A85093A55
         ),
         nonce=0,
-        address=Address("0x72e025a11fde515931ba4af263005c4a19385a5b"),  # noqa: E501
+        address=Address(0x72E025A11FDE515931BA4AF263005C4A19385A5B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e79547f00000000000000"  # noqa: E501
-            "00000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff6f785188182063156955631a7a85093a"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79547f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f785188182063156955631a7a85093a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=768381138,
+        value=0x2DCC90D2,
     )
 
     post = {
-        contract: Account(storage={0: 0x785188182063156955631A7A85093A55}),
+        target: Account(
+            storage={0: 0x785188182063156955631A7A85093A55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest386.py b/tests/ported_static/stRandom2/test_random_statetest386.py
index d7c8d23ff83..a27676913c5 100644
--- a/tests/ported_static/stRandom2/test_random_statetest386.py
+++ b/tests/ported_static/stRandom2/test_random_statetest386.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest386.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest386Filler.json
+state_tests/stRandom2/randomStatetest386Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest386Filler.json"],
+    ["state_tests/stRandom2/randomStatetest386Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest386(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest386."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,73 +43,63 @@ def test_random_statetest386(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.GT(
-                    Op.DUP2,
-                    Op.SIGNEXTEND(
-                        Op.ADD(Op.COINBASE, Op.CALLDATASIZE),
-                        Op.SGT(
-                            Op.SDIV(
-                                Op.PUSH32[0x1],
-                                Op.DIV(
-                                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                                ),
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff047f000000000000000000000000000000000000000000000000000000000000000105133641010b811160005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0] * 2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.GT(
+                Op.DUP2,
+                Op.SIGNEXTEND(
+                    Op.ADD(Op.COINBASE, Op.CALLDATASIZE),
+                    Op.SGT(
+                        Op.SDIV(
+                            Op.PUSH32[0x1],
+                            Op.DIV(
+                                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
                             ),
-                            Op.PUSH32[0x0],
                         ),
+                        Op.PUSH32[0x0],
                     ),
                 ),
-            )
+            ),
         ),
         nonce=0,
-        address=Address("0xc36f24a2628ca6bf3d13fb8e6090844962dfbb86"),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
+        ),
+        balance=46,
+        nonce=0,
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff047f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000105133641010b8111"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff047f000000000000000000000000000000000000000000000000000000000000000105133641010b8111"  # noqa: E501
         ),
         gas_limit=100000,
-        value=433564740,
+        value=0x19D7AC44,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest387.py b/tests/ported_static/stRandom2/test_random_statetest387.py
index 5f53244e3aa..6e5ca17b57a 100644
--- a/tests/ported_static/stRandom2/test_random_statetest387.py
+++ b/tests/ported_static/stRandom2/test_random_statetest387.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest387.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest387Filler.json
+state_tests/stRandom2/randomStatetest387Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest387Filler.json"],
+    ["state_tests/stRandom2/randomStatetest387Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest387(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest387."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,58 +43,45 @@ def test_random_statetest387(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350617e7608617c95f3ff584076e07b5a4460005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350617e7608617c95f3ff584076e07b5a4460005155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000"  # noqa: E501
-            "0000000000000000000000000000000000007f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c350617e7608617c95f3ff584076e07b5a4460005155"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xa3a709fece04184d06401d32d39f133ea3b800a8"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000"  # noqa: E501
-            "0000000000000000000000000000000000007f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c350617e7608617c95f3ff584076e07b5a44"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350617e7608617c95f3ff584076e07b5a44"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1650737351,
+        value=0x626440C7,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest388.py b/tests/ported_static/stRandom2/test_random_statetest388.py
index c08b7e07ba2..075141dd621 100644
--- a/tests/ported_static/stRandom2/test_random_statetest388.py
+++ b/tests/ported_static/stRandom2/test_random_statetest388.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest388.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest388Filler.json
+state_tests/stRandom2/randomStatetest388Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest388Filler.json"],
+    ["state_tests/stRandom2/randomStatetest388Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest388(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest388."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,67 +47,61 @@ def test_random_statetest388(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=0xB5765B8F743B9979A0905B6A189165600051,
-                value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5765b8f743b9979a0905b6a18916560005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=0xB5765B8F743B9979A0905B6A189165600051,
+            value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "00945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000945304eb"  # noqa: E501
-            "96065b2a98b57a48a06ae28d285a71b5765b8f743b9979a0905b6a189165"
+        to=contract_0,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5765b8f743b9979a0905b6a189165"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1175166777,
+        value=0x460B9F39,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0xB5765B8F743B9979A0905B6A189165600051: 0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest389.py b/tests/ported_static/stRandom2/test_random_statetest389.py
index a13243a485d..43e4d648db8 100644
--- a/tests/ported_static/stRandom2/test_random_statetest389.py
+++ b/tests/ported_static/stRandom2/test_random_statetest389.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest389.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest389Filler.json
+state_tests/stRandom2/randomStatetest389Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest389Filler.json"],
+    ["state_tests/stRandom2/randomStatetest389Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest389(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest389."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,69 +43,61 @@ def test_random_statetest389(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GASLIMIT
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.CALLDATACOPY(
-                dest_offset=Op.SLT(Op.PC, Op.SLOAD(key=Op.CODESIZE)),
-                offset=Op.DUP7,
-                size=Op.GASPRICE,
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3503a86385458123760005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.GASLIMIT
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x0]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.CALLDATACOPY(
+            dest_offset=Op.SLT(Op.PC, Op.SLOAD(key=Op.CODESIZE)),
+            offset=Op.DUP7,
+            size=Op.GASPRICE,
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x6442010fd6c7d107410fd0589b8059df1c45f0d0"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00"  # noqa: E501
-            "000000000000000000000100000000000000000000000000000000000000007f00000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000427f000000000000"  # noqa: E501
-            "0000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000c3503a863854581237"
+        to=target,
+        data=Bytes(
+            "457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3503a863854581237"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1542544795,
+        value=0x5BF15D9B,
     )
 
     post = {
-        contract: Account(storage={0: 50000}),
+        target: Account(storage={0: 50000}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest393.py b/tests/ported_static/stRandom2/test_random_statetest393.py
index f35874a1bd0..ce1924283af 100644
--- a/tests/ported_static/stRandom2/test_random_statetest393.py
+++ b/tests/ported_static/stRandom2/test_random_statetest393.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest393.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest393Filler.json
+state_tests/stRandom2/randomStatetest393Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest393Filler.json"],
+    ["state_tests/stRandom2/randomStatetest393Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest393(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest393."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,58 +43,45 @@ def test_random_statetest393(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff20b39838f628b96846cff0455  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffff20b39838f628b96846cff0455"
+            "7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff20b39838f628b96846cff0455"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x64114b073f76abebb752b7a08bbd288bce55a63b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffff20b39838f628b96846cff04"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff20b39838f628b96846cff04"  # noqa: E501
         ),
         gas_limit=100000,
-        value=490453529,
+        value=0x1D3BBA19,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest395.py b/tests/ported_static/stRandom2/test_random_statetest395.py
index effc58898d6..7f637d20858 100644
--- a/tests/ported_static/stRandom2/test_random_statetest395.py
+++ b/tests/ported_static/stRandom2/test_random_statetest395.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest395.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest395Filler.json
+state_tests/stRandom2/randomStatetest395Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest395Filler.json"],
+    ["state_tests/stRandom2/randomStatetest395Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest395(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest395."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,59 @@ def test_random_statetest395(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PREVRANDAO
-            + Op.PUSH32[0x1]
-            + Op.COINBASE
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x823140710BF13990E4500136726D8B55,
-            )
+    # Source: raw
+    # 0x447f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f823140710bf13990e4500136726d8b5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PREVRANDAO
+        + Op.PUSH32[0x1]
+        + Op.COINBASE
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x823140710BF13990E4500136726D8B55
         ),
         nonce=0,
-        address=Address("0x4818acccc87480c8210bcf678df99d4b8bcafac8"),  # noqa: E501
+        address=Address(0x4818ACCCC87480C8210BCF678DF99D4B8BCAFAC8),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "447f0000000000000000000000000000000000000000000000000000000000000001417f"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000017f000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000007f000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000c3507f000000000000000000"  # noqa: E501
-            "000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff6f823140710bf13990e4500136726d8b"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "447f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f823140710bf13990e4500136726d8b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1520198127,
+        value=0x5A9C61EF,
     )
 
     post = {
-        contract: Account(storage={0: 0x823140710BF13990E4500136726D8B55}),
+        target: Account(
+            storage={0: 0x823140710BF13990E4500136726D8B55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest396.py b/tests/ported_static/stRandom2/test_random_statetest396.py
index aeb263d171b..8a1b2677128 100644
--- a/tests/ported_static/stRandom2/test_random_statetest396.py
+++ b/tests/ported_static/stRandom2/test_random_statetest396.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest396.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest396Filler.json
+state_tests/stRandom2/randomStatetest396Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,101 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest396Filler.json"],
+    ["state_tests/stRandom2/randomStatetest396Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest396(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507f0000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000001719f197c5560005155"
-        ),
-        nonce=0,
-        address=Address("0x69a358c1f8b2f5139037e6e391189e45334cccc4"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507f0000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000001719f197c"
-        ),
-        gas_limit=100000,
-        value=1285869955,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest396Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest396_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest396."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -127,58 +43,45 @@ def test_random_statetest396_from_prague(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001719f197c5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507f0000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000001719f197c5560005155"
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001719f197c5560005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x69a358c1f8b2f5139037e6e391189e45334cccc4"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507f0000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000001719f197c"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001719f197c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1285869955,
+        value=0x4CA4D183,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest397.py b/tests/ported_static/stRandom2/test_random_statetest397.py
index c561d7cf5dd..8b4aec81bd5 100644
--- a/tests/ported_static/stRandom2/test_random_statetest397.py
+++ b/tests/ported_static/stRandom2/test_random_statetest397.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest397.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest397Filler.json
+state_tests/stRandom2/randomStatetest397Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest397Filler.json"],
+    ["state_tests/stRandom2/randomStatetest397Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest397(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest397."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,41 +43,42 @@ def test_random_statetest397(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x413443f3404242433389ff723810
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex("413443f3404242433389ff723810"),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x42c6df39abd3d7de1c64c50b0d8bb0e6085fb6af"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0xDE0B6B3A76586A0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest398.py b/tests/ported_static/stRandom2/test_random_statetest398.py
index 172f9a5f513..8d291f4499d 100644
--- a/tests/ported_static/stRandom2/test_random_statetest398.py
+++ b/tests/ported_static/stRandom2/test_random_statetest398.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest398.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest398Filler.json
+state_tests/stRandom2/randomStatetest398Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest398Filler.json"],
+    ["state_tests/stRandom2/randomStatetest398Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest398(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest398."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,62 +46,57 @@ def test_random_statetest398(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x3781413B695A69079D7F510582920755,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x08e74992e0868e4133c1164234a6064d6f708a5b"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f3781413b695a69079d7f51058292075560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79] * 2
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x3781413B695A69079D7F510582920755
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x08E74992E0868E4133C1164234A6064D6F708A5B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e796f3781413b695a69079d7f5105829207"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f3781413b695a69079d7f5105829207"  # noqa: E501
         ),
         gas_limit=100000,
-        value=110765790,
+        value=0x69A26DE,
     )
 
     post = {
-        contract: Account(storage={0: 0x3781413B695A69079D7F510582920755}),
+        target: Account(
+            storage={0: 0x3781413B695A69079D7F510582920755},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest399.py b/tests/ported_static/stRandom2/test_random_statetest399.py
index db187debd9f..28398ba81ae 100644
--- a/tests/ported_static/stRandom2/test_random_statetest399.py
+++ b/tests/ported_static/stRandom2/test_random_statetest399.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest399.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest399Filler.json
+state_tests/stRandom2/randomStatetest399Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest399Filler.json"],
+    ["state_tests/stRandom2/randomStatetest399Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest399(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest399."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,63 @@ def test_random_statetest399(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe4544437f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f98324016076d428a9898129b16849a5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.GASLIMIT
+        + Op.PREVRANDAO
+        + Op.NUMBER
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x98324016076D428A9898129B16849A55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xADC7243877FC6DD362B874238D7E02ABD01D15C7),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.GASLIMIT
-            + Op.PREVRANDAO
-            + Op.NUMBER
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x98324016076D428A9898129B16849A55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xadc7243877fc6dd362b874238d7e02abd01d15c7"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe4544437f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff6f98324016076d428a989812"  # noqa: E501
-            "9b16849a"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe4544437f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f98324016076d428a9898129b16849a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=546942842,
+        value=0x2099AF7A,
     )
 
     post = {
-        contract: Account(storage={0: 0x98324016076D428A9898129B16849A55}),
+        target: Account(
+            storage={0: 0x98324016076D428A9898129B16849A55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest401.py b/tests/ported_static/stRandom2/test_random_statetest401.py
index 65430c81b63..97cd69f2b1f 100644
--- a/tests/ported_static/stRandom2/test_random_statetest401.py
+++ b/tests/ported_static/stRandom2/test_random_statetest401.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest401.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest401Filler.json
+state_tests/stRandom2/randomStatetest401Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest401Filler.json"],
+    ["state_tests/stRandom2/randomStatetest401Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest401(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest401."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,59 +47,54 @@ def test_random_statetest401(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xC350]
-            + Op.PREVRANDAO
-            + Op.TIMESTAMP
-            + Op.SELFDESTRUCT(
-                address=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c35044427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>ff60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xC350]
+        + Op.PREVRANDAO
+        + Op.TIMESTAMP
+        + Op.SELFDESTRUCT(
+            address=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x88643bc22681e376675775eaaa381d0ba45054de"),  # noqa: E501
+        address=Address(0x88643BC22681E376675775EAAA381D0BA45054DE),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c35044427f000000000000000000000000"  # noqa: E501
-            "4f3f701464972e74606d6ea82d4d3080599a0e79ff"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c35044427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79ff"  # noqa: E501
         ),
         gas_limit=100000,
-        value=588192910,
+        value=0x230F1C8E,
     )
 
-    post: dict = {}
+    post = {
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest402.py b/tests/ported_static/stRandom2/test_random_statetest402.py
index 3968dfc495b..8f64d20bf31 100644
--- a/tests/ported_static/stRandom2/test_random_statetest402.py
+++ b/tests/ported_static/stRandom2/test_random_statetest402.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest402.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest402Filler.json
+state_tests/stRandom2/randomStatetest402Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest402Filler.json"],
+    ["state_tests/stRandom2/randomStatetest402Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest402(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest402."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,64 +47,59 @@ def test_random_statetest402(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f62138c87028162ea32a2db7e3010045560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.NUMBER
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x62138C87028162EA32A2DB7E30100455
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x983D676185618AC712EA4086A01C7A6A466B35B2),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.NUMBER
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x62138C87028162EA32A2DB7E30100455,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x983d676185618ac712ea4086a01c7a6a466b35b2"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000007f00000000000000000000000100000000"  # noqa: E501
-            "000000000000000000000000000000006f62138c87028162ea32a2db7e301004"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f62138c87028162ea32a2db7e301004"  # noqa: E501
         ),
         gas_limit=100000,
-        value=938198850,
+        value=0x37EBC742,
     )
 
     post = {
-        contract: Account(storage={0: 0x62138C87028162EA32A2DB7E30100455}),
+        target: Account(
+            storage={0: 0x62138C87028162EA32A2DB7E30100455},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest404.py b/tests/ported_static/stRandom2/test_random_statetest404.py
index 551b6785b3b..b9caca651f7 100644
--- a/tests/ported_static/stRandom2/test_random_statetest404.py
+++ b/tests/ported_static/stRandom2/test_random_statetest404.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest404.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest404Filler.json
+state_tests/stRandom2/randomStatetest404Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest404Filler.json"],
+    ["state_tests/stRandom2/randomStatetest404Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest404(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest404."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,131 +43,45 @@ def test_random_statetest404(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6a7f0000000000000000000000000000000000000000000000000000000000000000907f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff906606425655  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6a7f00"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000907f000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000017fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff906606425655"
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6a7f0000000000000000000000000000000000000000000000000000000000000000907f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff906606425655"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xfd0cf74e622c5c2b33c88cdf3a3e12ff25d0e090"),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6a7f00"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000907f000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000017fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff9066064256"
-        ),
-        gas_limit=100000,
-        value=108687806,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest404Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest404_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6a7f00"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000907f000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000017fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff906606425655"
-        ),
-        nonce=0,
-        address=Address("0xfd0cf74e622c5c2b33c88cdf3a3e12ff25d0e090"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6a7f00"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000907f000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000017fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff9066064256"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6a7f0000000000000000000000000000000000000000000000000000000000000000907f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9066064256"  # noqa: E501
         ),
         gas_limit=100000,
-        value=108687806,
+        value=0x67A71BE,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest405.py b/tests/ported_static/stRandom2/test_random_statetest405.py
index fdc9aee8453..1ef48d84f27 100644
--- a/tests/ported_static/stRandom2/test_random_statetest405.py
+++ b/tests/ported_static/stRandom2/test_random_statetest405.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest405.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest405Filler.json
+state_tests/stRandom2/randomStatetest405Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest405Filler.json"],
+    ["state_tests/stRandom2/randomStatetest405Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest405(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest405."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,70 +47,63 @@ def test_random_statetest405(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff44457f0000000000000000000000010000000000000000000000000000000000000000037ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f318d0707977199361171756f6d458e5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.PREVRANDAO
+        + Op.SUB(
+            Op.PUSH32[0x10000000000000000000000000000000000000000], Op.GASLIMIT
+        )
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x318D0707977199361171756F6D458E55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x7C7F33C2E8538464D27219E4A7581A2667BC7242),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PREVRANDAO
-            + Op.SUB(
-                Op.PUSH32[0x10000000000000000000000000000000000000000],
-                Op.GASLIMIT,
-            )
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x318D0707977199361171756F6D458E55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x7c7f33c2e8538464d27219e4a7581a2667bc7242"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff44457f000000"  # noqa: E501
-            "0000000000000000010000000000000000000000000000000000000000037fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff6f318d070797719936117175"  # noqa: E501
-            "6f6d458e"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff44457f0000000000000000000000010000000000000000000000000000000000000000037ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f318d0707977199361171756f6d458e"  # noqa: E501
         ),
         gas_limit=100000,
-        value=274296751,
+        value=0x10596FAF,
     )
 
     post = {
-        contract: Account(storage={0: 0x318D0707977199361171756F6D458E55}),
+        target: Account(
+            storage={0: 0x318D0707977199361171756F6D458E55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest406.py b/tests/ported_static/stRandom2/test_random_statetest406.py
index cc2c5e36adf..5dbbc156458 100644
--- a/tests/ported_static/stRandom2/test_random_statetest406.py
+++ b/tests/ported_static/stRandom2/test_random_statetest406.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest406.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest406Filler.json
+state_tests/stRandom2/randomStatetest406Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest406Filler.json"],
+    ["state_tests/stRandom2/randomStatetest406Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest406(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest406."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,70 +47,69 @@ def test_random_statetest406(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=0xB58B8E99F33C647165337E389F7B9C909CBA,
-                value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b58b8e99f33c647165337e389f7b9c909cba5560005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=0xB58B8E99F33C647165337E389F7B9C909CBA,
+            value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7e7f00000000000000000000000094"  # noqa: E501
-            "5304eb96065b2a98b57a48a06ae28d285a71b58b8e99f33c647165337e389f7b9c909cba"  # noqa: E501
+        to=contract_0,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b58b8e99f33c647165337e389f7b9c909cba"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1160230573,
+        value=0x4527B6AD,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
                 0xB58B8E99F33C647165337E389F7B9C909CBA: 0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
             },
+            nonce=0,
+        ),
+        coinbase: Account(
+            storage={},
+            code=bytes.fromhex("6000355415600957005b60203560003555"),
+            nonce=0,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest407.py b/tests/ported_static/stRandom2/test_random_statetest407.py
index 43595979b0b..6590ba5af0e 100644
--- a/tests/ported_static/stRandom2/test_random_statetest407.py
+++ b/tests/ported_static/stRandom2/test_random_statetest407.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest407.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest407Filler.json
+state_tests/stRandom2/randomStatetest407Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest407Filler.json"],
+    ["state_tests/stRandom2/randomStatetest407Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest407(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest407."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,59 @@ def test_random_statetest407(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.NUMBER
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.NUMBER
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x6D71656F054471181163037902615B55,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f6d71656f054471181163037902615b5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.NUMBER
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[0xC350]
+        + Op.NUMBER
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x6D71656F054471181163037902615B55
         ),
         nonce=0,
-        address=Address("0x819ee19601ad27edaeeead744e0bbf165fdfb9f1"),  # noqa: E501
+        address=Address(0x819EE19601AD27EDAEEEAD744E0BBF165FDFB9F1),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437fff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c350437f000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000007f000000000000000000000000"  # noqa: E501
-            "4f3f701464972e74606d6ea82d4d3080599a0e796f6d71656f054471181163037902615b"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f6d71656f054471181163037902615b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=825575416,
+        value=0x313547F8,
     )
 
     post = {
-        contract: Account(storage={0: 0x6D71656F054471181163037902615B55}),
+        target: Account(
+            storage={0: 0x6D71656F054471181163037902615B55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest408.py b/tests/ported_static/stRandom2/test_random_statetest408.py
index a069296118f..72ea03a898e 100644
--- a/tests/ported_static/stRandom2/test_random_statetest408.py
+++ b/tests/ported_static/stRandom2/test_random_statetest408.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest408.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest408Filler.json
+state_tests/stRandom2/randomStatetest408Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest408Filler.json"],
+    ["state_tests/stRandom2/randomStatetest408Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest408(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest408."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,69 +46,64 @@ def test_random_statetest408(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PREVRANDAO
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x80656E8E6478946A323482135A8BF755,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x2672c88394a86f962d51444ff8b8047f130d4df5"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f80656e8e6478946a323482135a8bf75560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PREVRANDAO
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x80656E8E6478946A323482135A8BF755
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x2672C88394A86F962D51444FF8B8047F130D4DF5),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f00"  # noqa: E501
-            "00000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000017f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff6f80656e8e6478946a323482135a8bf7"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f80656e8e6478946a323482135a8bf7"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1672298879,
+        value=0x63AD417F,
     )
 
     post = {
-        contract: Account(storage={0: 0x80656E8E6478946A323482135A8BF755}),
+        target: Account(
+            storage={0: 0x80656E8E6478946A323482135A8BF755},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest409.py b/tests/ported_static/stRandom2/test_random_statetest409.py
index 244ebefa27c..4852316345a 100644
--- a/tests/ported_static/stRandom2/test_random_statetest409.py
+++ b/tests/ported_static/stRandom2/test_random_statetest409.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest409.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest409Filler.json
+state_tests/stRandom2/randomStatetest409Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest409Filler.json"],
+    ["state_tests/stRandom2/randomStatetest409Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest409(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest409."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,75 +47,72 @@ def test_random_statetest409(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SELFDESTRUCT(
-                address=Op.MULMOD(
-                    Op.PUSH32[0x10000000000000000000000000000000000000000],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.MLOAD
-            + Op.LOG3(
-                offset=Op.GASPRICE,
-                size=Op.MOD(Op.CALLER, Op.DUP9),
-                topic_1=Op.DUP7,
-                topic_2=Op.DUP8,
-                topic_3=Op.SLT,
+    # Source: raw
+    # 0x5b7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000001000000000000000000000000000000000000000009ff511287868833063aa3579d8e585560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SELFDESTRUCT(
+            address=Op.MULMOD(
+                Op.PUSH32[0x10000000000000000000000000000000000000000],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             )
-            + Op.JUMPI
-            + Op.SWAP14
-            + Op.SSTORE(key=Op.PC, value=Op.DUP15)
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+        )
+        + Op.MLOAD
+        + Op.LOG3(
+            offset=Op.GASPRICE,
+            size=Op.MOD(Op.CALLER, Op.DUP9),
+            topic_1=Op.DUP7,
+            topic_2=Op.DUP8,
+            topic_3=Op.SLT,
+        )
+        + Op.JUMPI
+        + Op.SWAP14
+        + Op.SSTORE(key=Op.PC, value=Op.DUP15)
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x68076cf2c7430bb5e7cbaa157debe1c7cc9b30ae"),  # noqa: E501
+        address=Address(0x68076CF2C7430BB5E7CBAA157DEBE1C7CC9B30AE),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "5b7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00"  # noqa: E501
-            "000000000000000000000100000000000000000000000000000000000000007f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000"  # noqa: E501
-            "0000000000000000000000000000000009ff511287868833063aa3579d8e58"
+        to=target,
+        data=Bytes(
+            "5b7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000001000000000000000000000000000000000000000009ff511287868833063aa3579d8e58"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1090686083,
+        value=0x41028C83,
     )
 
-    post: dict = {}
+    post = {
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+        Address(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF): Account(
+            storage={}, code=b"", balance=0x41028C83, nonce=0
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest410.py b/tests/ported_static/stRandom2/test_random_statetest410.py
index 9eb6eea8371..5c931cd5883 100644
--- a/tests/ported_static/stRandom2/test_random_statetest410.py
+++ b/tests/ported_static/stRandom2/test_random_statetest410.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest410.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest410Filler.json
+state_tests/stRandom2/randomStatetest410Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest410Filler.json"],
+    ["state_tests/stRandom2/randomStatetest410Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest410(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest410."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,64 +43,55 @@ def test_random_statetest410(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.COINBASE
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.ADDMOD(Op.GASLIMIT, Op.PUSH32[0x0], Op.PUSH32[0x0])
-            + Op.RETURN(offset=Op.DUP1, size=0x17718)
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000045086201771880f35560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.COINBASE
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[0xC350]
+        + Op.ADDMOD(Op.GASLIMIT, Op.PUSH32[0x0], Op.PUSH32[0x0])
+        + Op.RETURN(offset=Op.DUP1, size=0x17718)
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x99e6f87cba9c1737f49965828c1badec51a91dfd"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79417f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000007fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000007f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000045086201771880f3"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000045086201771880f3"  # noqa: E501
         ),
         gas_limit=200000,
-        value=1969973721,
+        value=0x756B69D9,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest411.py b/tests/ported_static/stRandom2/test_random_statetest411.py
index 04783a43a8b..8e07e657fa8 100644
--- a/tests/ported_static/stRandom2/test_random_statetest411.py
+++ b/tests/ported_static/stRandom2/test_random_statetest411.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest411.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest411Filler.json
+state_tests/stRandom2/randomStatetest411Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest411Filler.json"],
+    ["state_tests/stRandom2/randomStatetest411Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest411(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest411."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,61 @@ def test_random_statetest411(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x44A17892738B6895619D7A93507D649D,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f44a17892738b6895619d7a93507d649d60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x44A17892738B6895619D7A93507D649D
         ),
         nonce=0,
-        address=Address("0x4bbc77bf39c9954db74937aaf8f8d70507dcb00a"),  # noqa: E501
+        address=Address(0x4BBC77BF39C9954DB74937AAF8F8D70507DCB00A),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000"  # noqa: E501
-            "0000000000000000000000000000000000006f44a17892738b6895619d7a93507d649d"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f44a17892738b6895619d7a93507d649d"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2119897718,
+        value=0x7E5B1276,
     )
 
     post = {
-        contract: Account(storage={0: 0x44A17892738B6895619D7A93507D649D}),
+        target: Account(
+            storage={0: 0x44A17892738B6895619D7A93507D649D},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest412.py b/tests/ported_static/stRandom2/test_random_statetest412.py
index 2821f69dafc..9d8f554e677 100644
--- a/tests/ported_static/stRandom2/test_random_statetest412.py
+++ b/tests/ported_static/stRandom2/test_random_statetest412.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest412.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest412Filler.json
+state_tests/stRandom2/randomStatetest412Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest412Filler.json"],
+    ["state_tests/stRandom2/randomStatetest412Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest412(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest412."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,66 +46,62 @@ def test_random_statetest412(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0xA46EF06A5A858B9742198A37E1153C55,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x1c3b1b9bcb79a7bcd1ca94d88d06e4f798a35538"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6fa46ef06a5a858b9742198a37e1153c5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79] * 2
+        + Op.PUSH32[0x1] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0xA46EF06A5A858B9742198A37E1153C55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x1C3B1B9BCB79A7BCD1CA94D88D06E4F798A35538),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff6fa46ef06a5a858b9742198a37e1153c"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6fa46ef06a5a858b9742198a37e1153c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=123532973,
+        value=0x75CF6AD,
     )
 
     post = {
-        contract: Account(storage={0: 0xA46EF06A5A858B9742198A37E1153C55}),
+        target: Account(
+            storage={0: 0xA46EF06A5A858B9742198A37E1153C55},
+            nonce=0,
+        ),
+        coinbase: Account(
+            storage={},
+            code=bytes.fromhex("6000355415600957005b60203560003555"),
+            nonce=0,
+        ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest413.py b/tests/ported_static/stRandom2/test_random_statetest413.py
index 3cee9ceb347..f919d7767e6 100644
--- a/tests/ported_static/stRandom2/test_random_statetest413.py
+++ b/tests/ported_static/stRandom2/test_random_statetest413.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest413.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest413Filler.json
+state_tests/stRandom2/randomStatetest413Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest413Filler.json"],
+    ["state_tests/stRandom2/randomStatetest413Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest413(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest413."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,59 @@ def test_random_statetest413(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe037f00000000000000000000000000000000000000000000000000000000000000016f086e2055149345ad1a018b063708145560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SUB(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,
+            Op.DUP2,
+        )
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x86E2055149345AD1A018B0637081455
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xD12E4B0D8A18BC4697A51C4FBF03383837AD3398),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SUB(
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                Op.DUP2,
-            )
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x86E2055149345AD1A018B0637081455,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xd12e4b0d8a18bc4697a51c4fbf03383837ad3398"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "000000000000010000000000000000000000000000000000000000817fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe037f000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000016f086e2055149345ad1a018b06"  # noqa: E501
-            "370814"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe037f00000000000000000000000000000000000000000000000000000000000000016f086e2055149345ad1a018b06370814"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1206033425,
+        value=0x47E29C11,
     )
 
     post = {
-        contract: Account(storage={0: 0x86E2055149345AD1A018B0637081455}),
+        target: Account(
+            storage={0: 0x86E2055149345AD1A018B0637081455},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest414.py b/tests/ported_static/stRandom2/test_random_statetest414.py
index 50dadbdf175..40ef090a01c 100644
--- a/tests/ported_static/stRandom2/test_random_statetest414.py
+++ b/tests/ported_static/stRandom2/test_random_statetest414.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest414.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest414Filler.json
+state_tests/stRandom2/randomStatetest414Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,132 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest414Filler.json"],
+    ["state_tests/stRandom2/randomStatetest414Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest414(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH3[0x51437F]
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.ADD
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.NUMBER
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.EQ(
-                    Op.CALL,
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                ),
-            )
-        ),
-        nonce=0,
-        address=Address("0x16000b6b36a20d3093a8b71a9fd8292c8a641002"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff625143"  # noqa: E501
-            "7f0000000000000000000000010000000000000000000000000000000000000000437f00"  # noqa: E501
-            "0000000000000000000000fffffffffffffffffffffffffffffffffffffffff114"  # noqa: E501
-        ),
-        gas_limit=100000,
-        value=1088932905,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest414Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest414_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest414."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -158,89 +43,56 @@ def test_random_statetest414_from_prague(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH3[0x51437F]
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.ADD
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.STOP
-            + Op.NUMBER
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.EQ(
-                    Op.CALL,
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                ),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6251437f0000000000000000000000010000000000000000000000000000000000000000437f000000000000000000000000fffffffffffffffffffffffffffffffffffffffff11460005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH3[0x51437F]
+        + Op.STOP * 11
+        + Op.ADD
+        + Op.STOP * 20
+        + Op.NUMBER
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.EQ(
+                Op.CALL, Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+            ),
         ),
         nonce=0,
-        address=Address("0x16000b6b36a20d3093a8b71a9fd8292c8a641002"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff625143"  # noqa: E501
-            "7f0000000000000000000000010000000000000000000000000000000000000000437f00"  # noqa: E501
-            "0000000000000000000000fffffffffffffffffffffffffffffffffffffffff114"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6251437f0000000000000000000000010000000000000000000000000000000000000000437f000000000000000000000000fffffffffffffffffffffffffffffffffffffffff114"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1088932905,
+        value=0x40E7CC29,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest415.py b/tests/ported_static/stRandom2/test_random_statetest415.py
index b6fba5cfd27..5a4d886f054 100644
--- a/tests/ported_static/stRandom2/test_random_statetest415.py
+++ b/tests/ported_static/stRandom2/test_random_statetest415.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest415.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest415Filler.json
+state_tests/stRandom2/randomStatetest415Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest415Filler.json"],
+    ["state_tests/stRandom2/randomStatetest415Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest415(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest415."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,52 +43,45 @@ def test_random_statetest415(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000000142427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>357f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff62010a8c8794a17e8ea4f260005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000000142427f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79357f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff62010a8c8794a17e"  # noqa: E501
-            "8ea4f260005155"
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000000142427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79357f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff62010a8c8794a17e8ea4f260005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xcfeb1138e487c3084750a899713b20307d5b4217"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000000142427f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79357f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff62010a8c8794a17e"  # noqa: E501
-            "8ea4f2"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000000142427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79357f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff62010a8c8794a17e8ea4f2"  # noqa: E501
         ),
         gas_limit=600000,
-        value=1235296517,
+        value=0x49A12105,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest416.py b/tests/ported_static/stRandom2/test_random_statetest416.py
index 43654504c2e..853a3e034d1 100644
--- a/tests/ported_static/stRandom2/test_random_statetest416.py
+++ b/tests/ported_static/stRandom2/test_random_statetest416.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest416.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest416Filler.json
+state_tests/stRandom2/randomStatetest416Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest416Filler.json"],
+    ["state_tests/stRandom2/randomStatetest416Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest416(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest416."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,62 +43,52 @@ def test_random_statetest416(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.TIMESTAMP
-            + Op.SSTORE(
-                key=Op.NUMBER,
-                value=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>4355  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.TIMESTAMP
+        + Op.SSTORE(
+            key=Op.NUMBER,
+            value=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
         ),
         nonce=0,
-        address=Address("0xd57defd369a62e5099d173d42772d3345138bede"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff427f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e7943"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7943"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1331831824,
+        value=0x4F622410,
     )
 
     post = {
-        contract: Account(
-            storage={1: 0x4F3F701464972E74606D6EA82D4D3080599A0E79},
-        ),
+        target: Account(storage={1: coinbase}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest417.py b/tests/ported_static/stRandom2/test_random_statetest417.py
index 43cbbe08ab9..5f93c560673 100644
--- a/tests/ported_static/stRandom2/test_random_statetest417.py
+++ b/tests/ported_static/stRandom2/test_random_statetest417.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest417.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest417Filler.json
+state_tests/stRandom2/randomStatetest417Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest417Filler.json"],
+    ["state_tests/stRandom2/randomStatetest417Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest417(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest417."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,41 +43,42 @@ def test_random_statetest417(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x4343424344444242f26d69
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex("4343424344444242f26d69"),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x632ad35d6e1a733fbbcf49749fd63d526ebdaea1"),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
+        ),
+        balance=46,
+        nonce=0,
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0xDE0B6B3A76586A0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest418.py b/tests/ported_static/stRandom2/test_random_statetest418.py
index 02e0da3922c..d9365524831 100644
--- a/tests/ported_static/stRandom2/test_random_statetest418.py
+++ b/tests/ported_static/stRandom2/test_random_statetest418.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest418.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest418Filler.json
+state_tests/stRandom2/randomStatetest418Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest418Filler.json"],
+    ["state_tests/stRandom2/randomStatetest418Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest418(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest418."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,62 +44,56 @@ def test_random_statetest418(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.NUMBER
-            + Op.LOG3(
-                offset=Op.SLT(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    Op.COINBASE,
-                ),
-                size=Op.PUSH32[0x0],
-                topic_1=Op.PUSH32[0xC350],
-                topic_2=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-                topic_3=Op.PUSH32[0x1],
-            )
-            + Op.LOG0(offset=Op.PC, size=0x349706)
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.BALANCE)
-        ),
+    # Source: raw
+    # 0x7f0000000000000000000000000000000000000000000000000000000000000000437f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff12a36234970658a03160005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.NUMBER
+        + Op.LOG3(
+            offset=Op.SLT(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                Op.COINBASE,
+            ),
+            size=Op.PUSH32[0x0],
+            topic_1=Op.PUSH32[0xC350],
+            topic_2=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+            topic_3=Op.PUSH32[0x1],
+        )
+        + Op.LOG0(offset=Op.PC, size=0x349706)
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.BALANCE),
         nonce=0,
-        address=Address("0xb3ceb9e1ce94d2e429039525e57315f4bd255f06"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000000437f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000017f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507f00000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000417fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff12a36234970658a031"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000000000000000000000000000000000000000000000437f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff12a36234970658a031"  # noqa: E501
         ),
         gas_limit=392462029,
-        value=1705540168,
+        value=0x65A87A48,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest419.py b/tests/ported_static/stRandom2/test_random_statetest419.py
index 9500610c322..bc87d278efa 100644
--- a/tests/ported_static/stRandom2/test_random_statetest419.py
+++ b/tests/ported_static/stRandom2/test_random_statetest419.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest419.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest419Filler.json
+state_tests/stRandom2/randomStatetest419Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest419Filler.json"],
+    ["state_tests/stRandom2/randomStatetest419Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest419(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest419."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,65 @@ def test_random_statetest419(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f73095b7ee211595a6b80a311900a785560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.NUMBER
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x1]
+        + Op.COINBASE
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x73095B7EE211595A6B80A311900A7855
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xE229840EE049FAFB7411624DA7941DB4ED465023),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.NUMBER
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x1]
-            + Op.COINBASE
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x73095B7EE211595A6B80A311900A7855,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xe229840ee049fafb7411624da7941db4ed465023"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507f00000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000001417fffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffe6f73095b7ee211595a6b80a311900a78"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f73095b7ee211595a6b80a311900a78"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1783425972,
+        value=0x6A4CEBB4,
     )
 
     post = {
-        contract: Account(storage={0: 0x73095B7EE211595A6B80A311900A7855}),
+        target: Account(
+            storage={0: 0x73095B7EE211595A6B80A311900A7855},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest420.py b/tests/ported_static/stRandom2/test_random_statetest420.py
index cd4809ada75..7dce7d0ee0a 100644
--- a/tests/ported_static/stRandom2/test_random_statetest420.py
+++ b/tests/ported_static/stRandom2/test_random_statetest420.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest420.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest420Filler.json
+state_tests/stRandom2/randomStatetest420Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest420Filler.json"],
+    ["state_tests/stRandom2/randomStatetest420Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest420(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest420."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,133 +43,45 @@ def test_random_statetest420(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e793a7f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000017fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f00000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000001817d7b8956970660129f5015fe0a355560"  # noqa: E501
-            "005155"
-        ),
-        nonce=0,
-        address=Address("0x0f48fa271d166c58e40759be208471b6bc233332"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e793a7f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000017fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f00000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000001817d7b8956970660129f5015fe0a35"  # noqa: E501
-        ),
-        gas_limit=100000,
-        value=1657754250,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest420Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest420_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>3a7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001817d7b8956970660129f5015fe0a355560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e793a7f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000017fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f00000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000001817d7b8956970660129f5015fe0a355560"  # noqa: E501
-            "005155"
+            "7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e793a7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001817d7b8956970660129f5015fe0a355560005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x0f48fa271d166c58e40759be208471b6bc233332"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e793a7f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000017fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f00000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000001817d7b8956970660129f5015fe0a35"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e793a7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001817d7b8956970660129f5015fe0a35"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1657754250,
+        value=0x62CF528A,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest421.py b/tests/ported_static/stRandom2/test_random_statetest421.py
index b6ce1863142..0ae5687e6cc 100644
--- a/tests/ported_static/stRandom2/test_random_statetest421.py
+++ b/tests/ported_static/stRandom2/test_random_statetest421.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest421.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest421Filler.json
+state_tests/stRandom2/randomStatetest421Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest421Filler.json"],
+    ["state_tests/stRandom2/randomStatetest421Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest421(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest421."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,59 +47,57 @@ def test_random_statetest421(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x437f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f38454051968ff184a47d50091231971760005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.NUMBER
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x38454051968FF184A47D500912319717
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x68FD2BFC7B98810F5364B4ED51D4C701815D7580),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.NUMBER
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x38454051968FF184A47D500912319717,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x68fd2bfc7b98810f5364b4ed51d4c701815d7580"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "437f00000000000000000000000000000000000000000000000000000000000000007fff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f38454051968ff1"  # noqa: E501
-            "84a47d500912319717"
+        to=target,
+        data=Bytes(
+            "437f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f38454051968ff184a47d500912319717"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1389450591,
+        value=0x52D1555F,
     )
 
     post = {
-        contract: Account(storage={0: 0x38454051968FF184A47D500912319717}),
+        target: Account(
+            storage={0: 0x38454051968FF184A47D500912319717},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest422.py b/tests/ported_static/stRandom2/test_random_statetest422.py
index 0de5cae2731..b8c339de059 100644
--- a/tests/ported_static/stRandom2/test_random_statetest422.py
+++ b/tests/ported_static/stRandom2/test_random_statetest422.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest422.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest422Filler.json
+state_tests/stRandom2/randomStatetest422Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest422Filler.json"],
+    ["state_tests/stRandom2/randomStatetest422Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest422(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest422."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,60 +43,53 @@ def test_random_statetest422(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.MSTORE(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                value=Op.PUSH32[0x10000000000000000000000000000000000000000],
-            )
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x3d1b9833beb5e086aacd5155322683351c26af63"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe527f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.MSTORE(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            value=Op.PUSH32[0x10000000000000000000000000000000000000000],
+        )
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe527f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f7014"  # noqa: E501
-            "64972e74606d6ea82d4d3080599a0e79"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe527f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1285310456,
+        value=0x4C9C47F8,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest424.py b/tests/ported_static/stRandom2/test_random_statetest424.py
index 704d6c19882..306991317fe 100644
--- a/tests/ported_static/stRandom2/test_random_statetest424.py
+++ b/tests/ported_static/stRandom2/test_random_statetest424.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest424.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest424Filler.json
+state_tests/stRandom2/randomStatetest424Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest424Filler.json"],
+    ["state_tests/stRandom2/randomStatetest424Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest424(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest424."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,59 @@ def test_random_statetest424(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.NUMBER
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.NUMBER
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x18116552626186825096665471140A55,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>437f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000436f18116552626186825096665471140a5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.NUMBER
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.NUMBER
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x18116552626186825096665471140A55
         ),
         nonce=0,
-        address=Address("0xacdc215bc90eeac81bc6cb817c78e5a65a8abcce"),  # noqa: E501
+        address=Address(0xACDC215BC90EEAC81BC6CB817C78E5A65A8ABCCE),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000007f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c3507f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000436f18116552626186825096665471140a"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000436f18116552626186825096665471140a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1271738191,
+        value=0x4BCD2F4F,
     )
 
     post = {
-        contract: Account(storage={0: 0x18116552626186825096665471140A55}),
+        target: Account(
+            storage={0: 0x18116552626186825096665471140A55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest425.py b/tests/ported_static/stRandom2/test_random_statetest425.py
index abdeeb01d32..46142661c25 100644
--- a/tests/ported_static/stRandom2/test_random_statetest425.py
+++ b/tests/ported_static/stRandom2/test_random_statetest425.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest425.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest425Filler.json
+state_tests/stRandom2/randomStatetest425Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest425Filler.json"],
+    ["state_tests/stRandom2/randomStatetest425Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest425(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest425."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,57 +47,54 @@ def test_random_statetest425(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f885707818b889a89975552f01284425560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.COINBASE
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x885707818B889A89975552F012844255
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xEB68F6349F807BCAC96D6C9571C26D8A47EEF786),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.COINBASE
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x885707818B889A89975552F012844255,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xeb68f6349f807bcac96d6c9571c26d8a47eef786"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000010000000000000000000000000000000000000000417f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000017f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c3507f00000000000000"  # noqa: E501
-            "0000000000ffffffffffffffffffffffffffffffffffffffff6f885707818b889a899755"  # noqa: E501
-            "52f0128442"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f885707818b889a89975552f0128442"  # noqa: E501
         ),
         gas_limit=100000,
-        value=574036597,
+        value=0x22371A75,
     )
 
     post = {
-        contract: Account(storage={0: 0x885707818B889A89975552F012844255}),
+        target: Account(
+            storage={0: 0x885707818B889A89975552F012844255},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest426.py b/tests/ported_static/stRandom2/test_random_statetest426.py
index d0084d0423d..ed5c86a7885 100644
--- a/tests/ported_static/stRandom2/test_random_statetest426.py
+++ b/tests/ported_static/stRandom2/test_random_statetest426.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest426.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest426Filler.json
+state_tests/stRandom2/randomStatetest426Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest426Filler.json"],
+    ["state_tests/stRandom2/randomStatetest426Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest426(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest426."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,68 +47,61 @@ def test_random_statetest426(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.COINBASE
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x456D1687795A95938B0139976099F055,
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f456d1687795a95938b0139976099f05560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.COINBASE
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x456D1687795A95938B0139976099F055
         ),
         nonce=0,
-        address=Address("0xc5d2c6e130510d2cf47922cfc2e517e235268490"),  # noqa: E501
+        address=Address(0xC5D2C6E130510D2CF47922CFC2E517E235268490),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e79417fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000006f456d1687795a95938b0139976099f0"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f456d1687795a95938b0139976099f0"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1631269834,
+        value=0x613B33CA,
     )
 
     post = {
-        contract: Account(storage={0: 0x456D1687795A95938B0139976099F055}),
+        target: Account(
+            storage={0: 0x456D1687795A95938B0139976099F055},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest428.py b/tests/ported_static/stRandom2/test_random_statetest428.py
index 1f71a147175..5cf0d72ce61 100644
--- a/tests/ported_static/stRandom2/test_random_statetest428.py
+++ b/tests/ported_static/stRandom2/test_random_statetest428.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest428.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest428Filler.json
+state_tests/stRandom2/randomStatetest428Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest428Filler.json"],
+    ["state_tests/stRandom2/randomStatetest428Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest428(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest428."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,105 +43,42 @@ def test_random_statetest428(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x4244417b4542404409523b200283
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex("4244417b4542404409523b200283"),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x8c822b21830b172651bcd2c2fec3016423769afa"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
-        gas_limit=400000,
-        value=100000,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest428Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest428_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
     )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex("4244417b4542404409523b200283"),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x8c822b21830b172651bcd2c2fec3016423769afa"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0xDE0B6B3A76586A0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest429.py b/tests/ported_static/stRandom2/test_random_statetest429.py
index c3cff627876..72b994a345e 100644
--- a/tests/ported_static/stRandom2/test_random_statetest429.py
+++ b/tests/ported_static/stRandom2/test_random_statetest429.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest429.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest429Filler.json
+state_tests/stRandom2/randomStatetest429Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest429Filler.json"],
+    ["state_tests/stRandom2/randomStatetest429Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest429(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest429."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,67 +46,62 @@ def test_random_statetest429(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.COINBASE
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x98121F38878672908777347633136655,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x1f3c76fed529a06c56374004d1a3822d2d621062"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f98121f3887867290877734763313665560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.COINBASE
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x98121F38878672908777347633136655
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x1F3C76FED529A06C56374004D1A3822D2D621062),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79417fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000"  # noqa: E501
-            "00000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f00000000000000000000000100"  # noqa: E501
-            "000000000000000000000000000000000000007fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff6f98121f388786729087773476331366"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f98121f388786729087773476331366"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1412476335,
+        value=0x5430ADAF,
     )
 
     post = {
-        contract: Account(storage={0: 0x98121F38878672908777347633136655}),
+        target: Account(
+            storage={0: 0x98121F38878672908777347633136655},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest430.py b/tests/ported_static/stRandom2/test_random_statetest430.py
index 3d05a4bf7a9..5eb40ab0a04 100644
--- a/tests/ported_static/stRandom2/test_random_statetest430.py
+++ b/tests/ported_static/stRandom2/test_random_statetest430.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest430.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest430Filler.json
+state_tests/stRandom2/randomStatetest430Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest430Filler.json"],
+    ["state_tests/stRandom2/randomStatetest430Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest430(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest430."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,66 +47,61 @@ def test_random_statetest430(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x7D41A29934035B748E96A3135B696455,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x477526f193cfa214f3d2bcbb76ac3612b1dad747"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000006f7d41a29934035b748e96a3135b69645560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x7D41A29934035B748E96A3135B696455
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x477526F193CFA214F3D2BCBB76AC3612B1DAD747),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3507fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507f00000000000000000000"  # noqa: E501
-            "00004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000017f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000006f7d41a29934035b748e96a3135b6964"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000006f7d41a29934035b748e96a3135b6964"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1811277343,
+        value=0x6BF5E61F,
     )
 
     post = {
-        contract: Account(storage={0: 0x7D41A29934035B748E96A3135B696455}),
+        target: Account(
+            storage={0: 0x7D41A29934035B748E96A3135B696455},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest433.py b/tests/ported_static/stRandom2/test_random_statetest433.py
index 6afa2fb5ccb..3b4a65f8041 100644
--- a/tests/ported_static/stRandom2/test_random_statetest433.py
+++ b/tests/ported_static/stRandom2/test_random_statetest433.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest433.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest433Filler.json
+state_tests/stRandom2/randomStatetest433Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest433Filler.json"],
+    ["state_tests/stRandom2/randomStatetest433Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest433(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest433."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,58 +43,45 @@ def test_random_statetest433(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350a3f305205bf156207259573055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c350a3f305205bf156207259573055"
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350a3f305205bf156207259573055"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x76ad89792a42a92b922c9be589a0c02b14e7e928"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c350a3f305205bf1562072595730"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350a3f305205bf1562072595730"  # noqa: E501
         ),
         gas_limit=500000,
-        value=630948579,
+        value=0x259B82E3,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest435.py b/tests/ported_static/stRandom2/test_random_statetest435.py
index 94fe8c99aa0..22fc8ca14e9 100644
--- a/tests/ported_static/stRandom2/test_random_statetest435.py
+++ b/tests/ported_static/stRandom2/test_random_statetest435.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest435.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest435Filler.json
+state_tests/stRandom2/randomStatetest435Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest435Filler.json"],
+    ["state_tests/stRandom2/randomStatetest435Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest435(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest435."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,68 +46,63 @@ def test_random_statetest435(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.PREVRANDAO
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(key=0x33797F, value=Op.SMOD(0x3488, Op.TIMESTAMP))
-            + Op.CODECOPY
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000000447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000042613488076233797f553960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[0x0]
+        + Op.PREVRANDAO
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(key=0x33797F, value=Op.SMOD(0x3488, Op.TIMESTAMP))
+        + Op.CODECOPY
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x225950bce6c496d611bafc023a38b5452b852955"),  # noqa: E501
+        address=Address(0x225950BCE6C496D611BAFC023A38B5452B852955),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000447fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000042613488076233797f5539"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000000447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000042613488076233797f5539"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1256168470,
+        value=0x4ADF9C16,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
                 0x33797F: 448,
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest436.py b/tests/ported_static/stRandom2/test_random_statetest436.py
index 40e3d531f21..187a7c4ac79 100644
--- a/tests/ported_static/stRandom2/test_random_statetest436.py
+++ b/tests/ported_static/stRandom2/test_random_statetest436.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest436.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest436Filler.json
+state_tests/stRandom2/randomStatetest436Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest436Filler.json"],
+    ["state_tests/stRandom2/randomStatetest436Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest436(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest436."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,60 @@ def test_random_statetest436(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATASIZE
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.COINBASE
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.GASLIMIT
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x8108067A345B7A76A20A835A0A0B6C10,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x39542c1f6d75aa2f9065be137d36d26e222e8814"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x367f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>456f8108067a345b7a76a20a835a0a0b6c1060005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATASIZE
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.COINBASE
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.GASLIMIT
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x8108067A345B7A76A20A835A0A0B6C10
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x39542C1F6D75AA2F9065BE137D36D26E222E8814),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "367f00000000000000000000000000000000000000000000000000000000000000017fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417fffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000"  # noqa: E501
-            "0000000000004f3f701464972e74606d6ea82d4d3080599a0e79456f8108067a345b7a76"  # noqa: E501
-            "a20a835a0a0b6c10"
+        to=target,
+        data=Bytes(
+            "367f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79456f8108067a345b7a76a20a835a0a0b6c10"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1464160030,
+        value=0x57454F1E,
     )
 
     post = {
-        contract: Account(storage={0: 0x8108067A345B7A76A20A835A0A0B6C10}),
+        target: Account(
+            storage={0: 0x8108067A345B7A76A20A835A0A0B6C10},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest437.py b/tests/ported_static/stRandom2/test_random_statetest437.py
index 99b7122f2bb..81f5042bee2 100644
--- a/tests/ported_static/stRandom2/test_random_statetest437.py
+++ b/tests/ported_static/stRandom2/test_random_statetest437.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest437.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest437Filler.json
+state_tests/stRandom2/randomStatetest437Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest437Filler.json"],
+    ["state_tests/stRandom2/randomStatetest437Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest437(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest437."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,72 +47,66 @@ def test_random_statetest437(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.NUMBER
-            + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.CODECOPY(
-                dest_offset=Op.SGT(Op.GASPRICE, Op.PUSH32[0x1]),
-                offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
-                size=Op.PUSH32[0x1],
-            )
-            + Op.ADDMOD
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000013a1339085560005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.NUMBER
+        + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.CODECOPY(
+            dest_offset=Op.SGT(Op.GASPRICE, Op.PUSH32[0x1]),
+            offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
+            size=Op.PUSH32[0x1],
+        )
+        + Op.ADDMOD
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f00"  # noqa: E501
-            "0000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000007f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f00000000000000000000000100"  # noqa: E501
-            "000000000000000000000000000000000000007f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000013a133908"
+        to=contract_0,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000013a133908"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1752414467,
+        value=0x6873B903,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
                 0x6BACFB1469F9A4D5674A85B75F951D72D7A58E4B: 1,
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest438.py b/tests/ported_static/stRandom2/test_random_statetest438.py
index 9fbcf5d81ff..c91b9a70a5c 100644
--- a/tests/ported_static/stRandom2/test_random_statetest438.py
+++ b/tests/ported_static/stRandom2/test_random_statetest438.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest438.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest438Filler.json
+state_tests/stRandom2/randomStatetest438Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest438Filler.json"],
+    ["state_tests/stRandom2/randomStatetest438Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest438(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest438."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,66 +43,57 @@ def test_random_statetest438(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            value=Op.MULMOD(
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            ),
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                value=Op.MULMOD(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                ),
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x5494eb40ef20819e957fdd263677ced0c6f9cb72"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff097fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1071528892,
+        value=0x3FDE3BBC,
     )
 
     post = {
-        contract: Account(storage={0: 50000}),
+        target: Account(storage={0: 50000}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest439.py b/tests/ported_static/stRandom2/test_random_statetest439.py
index 613cfb3398c..fc18736d3e1 100644
--- a/tests/ported_static/stRandom2/test_random_statetest439.py
+++ b/tests/ported_static/stRandom2/test_random_statetest439.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest439.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest439Filler.json
+state_tests/stRandom2/randomStatetest439Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest439Filler.json"],
+    ["state_tests/stRandom2/randomStatetest439Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest439(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest439."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,61 @@ def test_random_statetest439(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x5B1609653438813340097C53A4931655,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f5b1609653438813340097c53a493165560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x5B1609653438813340097C53A4931655
         ),
         nonce=0,
-        address=Address("0xea249997dd278a186516cb58c5999e0f51983d1c"),  # noqa: E501
+        address=Address(0xEA249997DD278A186516CB58C5999E0F51983D1C),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000c3507f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff6f5b1609653438813340097c53a49316"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f5b1609653438813340097c53a49316"  # noqa: E501
         ),
         gas_limit=100000,
-        value=398066515,
+        value=0x17BA0353,
     )
 
     post = {
-        contract: Account(storage={0: 0x5B1609653438813340097C53A4931655}),
+        target: Account(
+            storage={0: 0x5B1609653438813340097C53A4931655},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest440.py b/tests/ported_static/stRandom2/test_random_statetest440.py
index 70e2c25e9c9..873e5515793 100644
--- a/tests/ported_static/stRandom2/test_random_statetest440.py
+++ b/tests/ported_static/stRandom2/test_random_statetest440.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest440.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest440Filler.json
+state_tests/stRandom2/randomStatetest440Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest440Filler.json"],
+    ["state_tests/stRandom2/randomStatetest440Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest440(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest440."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,61 +47,55 @@ def test_random_statetest440(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.GASLIMIT
-            + Op.GASLIMIT
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.COINBASE
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x1513A9B8216816F74F3676E9EA26155,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x411175e7899ea90ac5011543380d9c09a8ee199f"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>45457f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff416f01513a9b8216816f74f3676e9ea2615560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.GASLIMIT * 2
+        + Op.PUSH32[0x1] * 2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.COINBASE
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x1513A9B8216816F74F3676E9EA26155
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x411175E7899EA90AC5011543380D9C09A8EE199F),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7945457f000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000017f000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000017f000000000000000000"  # noqa: E501
-            "000000ffffffffffffffffffffffffffffffffffffffff416f01513a9b8216816f74f367"  # noqa: E501
-            "6e9ea261"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7945457f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff416f01513a9b8216816f74f3676e9ea261"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1245697846,
+        value=0x4A3FD736,
     )
 
     post = {
-        contract: Account(storage={0: 0x1513A9B8216816F74F3676E9EA26155}),
+        target: Account(
+            storage={0: 0x1513A9B8216816F74F3676E9EA26155},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest442.py b/tests/ported_static/stRandom2/test_random_statetest442.py
index e432d67572c..7959e6b1ef6 100644
--- a/tests/ported_static/stRandom2/test_random_statetest442.py
+++ b/tests/ported_static/stRandom2/test_random_statetest442.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest442.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest442Filler.json
+state_tests/stRandom2/randomStatetest442Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest442Filler.json"],
+    ["state_tests/stRandom2/randomStatetest442Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest442(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest442."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,74 +47,63 @@ def test_random_statetest442(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff917f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3501833815560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 3
+        + Op.SWAP2
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x0]
+        + Op.XOR(
+            Op.PUSH32[0xC350],
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,
+        )
+        + Op.SSTORE(key=Op.DUP2, value=Op.CALLER)
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xBB86DC9ED299945BD5EAD395C71E0B135D338C1E),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SWAP2
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.XOR(
-                Op.PUSH32[0xC350],
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-            )
-            + Op.SSTORE(key=Op.DUP2, value=Op.CALLER)
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xbb86dc9ed299945bd5ead395c71e0b135d338c1e"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff917f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000007fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000c350183381"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff917f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350183381"  # noqa: E501
         ),
         gas_limit=100000,
-        value=794450594,
+        value=0x2F5A5AA2,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3CAE,  # noqa: E501
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3CAE: 0x2E3D0156D2B99A6EACBA540C55F423C8F5A33143,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3CAE: sender,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest443.py b/tests/ported_static/stRandom2/test_random_statetest443.py
index fe5720e1ea1..12dca394e25 100644
--- a/tests/ported_static/stRandom2/test_random_statetest443.py
+++ b/tests/ported_static/stRandom2/test_random_statetest443.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest443.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest443Filler.json
+state_tests/stRandom2/randomStatetest443Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest443Filler.json"],
+    ["state_tests/stRandom2/randomStatetest443Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest443(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest443."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,67 +43,59 @@ def test_random_statetest443(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.GT(
-                    Op.PUSH32[0x0],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-                value=Op.PUSH32[0x1],
-            )
-            + Op.SWAP4
-            + Op.CALLDATACOPY
-            + Op.DIV
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001155933704  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.GT(
+                Op.PUSH32[0x0],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+            value=Op.PUSH32[0x1],
+        )
+        + Op.SWAP4
+        + Op.CALLDATACOPY
+        + Op.DIV,
         nonce=0,
-        address=Address("0x692a3c1272ca7ff11550af64d7c6cafffbe467f8"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000001155933704"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001155933704"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1499936335,
+        value=0x5967364F,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest444.py b/tests/ported_static/stRandom2/test_random_statetest444.py
index 6b4ceda0adb..65c27cc519b 100644
--- a/tests/ported_static/stRandom2/test_random_statetest444.py
+++ b/tests/ported_static/stRandom2/test_random_statetest444.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest444.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest444Filler.json
+state_tests/stRandom2/randomStatetest444Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,99 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest444Filler.json"],
+    ["state_tests/stRandom2/randomStatetest444Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest444(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f0000000000000000000000010000000000000000000000000000000000000000607f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3507fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff661392843555"
-        ),
-        nonce=0,
-        address=Address("0x3630f8ac14310e923a9b6f57148a873829b27144"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000010000000000000000000000000000000000000000607f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3507fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff6613928435"
-        ),
-        gas_limit=100000,
-        value=1481275721,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest444Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest444_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest444."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -125,56 +43,45 @@ def test_random_statetest444_from_prague(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f0000000000000000000000010000000000000000000000000000000000000000607f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff661392843555  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f0000000000000000000000010000000000000000000000000000000000000000607f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3507fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff661392843555"
+            "7f0000000000000000000000010000000000000000000000000000000000000000607f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff661392843555"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x3630f8ac14310e923a9b6f57148a873829b27144"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000010000000000000000000000000000000000000000607f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3507fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff6613928435"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000010000000000000000000000000000000000000000607f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6613928435"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1481275721,
+        value=0x584A7949,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest445.py b/tests/ported_static/stRandom2/test_random_statetest445.py
index 7b9c52af8df..1e429145745 100644
--- a/tests/ported_static/stRandom2/test_random_statetest445.py
+++ b/tests/ported_static/stRandom2/test_random_statetest445.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest445.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest445Filler.json
+state_tests/stRandom2/randomStatetest445Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest445Filler.json"],
+    ["state_tests/stRandom2/randomStatetest445Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest445(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest445."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,58 +43,45 @@ def test_random_statetest445(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000008756993365a1376155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000008756993365a1376155"
+            "7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000008756993365a1376155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xdf00487753fafb7d8ac061b9f2fbe3488f0d83d7"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000008756993365a13761"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000008756993365a13761"  # noqa: E501
         ),
         gas_limit=100000,
-        value=340638033,
+        value=0x144DB951,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest446.py b/tests/ported_static/stRandom2/test_random_statetest446.py
index 0d10491df62..29fe4b0606d 100644
--- a/tests/ported_static/stRandom2/test_random_statetest446.py
+++ b/tests/ported_static/stRandom2/test_random_statetest446.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest446.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest446Filler.json
+state_tests/stRandom2/randomStatetest446Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest446Filler.json"],
+    ["state_tests/stRandom2/randomStatetest446Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest446(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest446."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,71 +47,62 @@ def test_random_statetest446(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0955  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.MULMOD(
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
+            value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x96AFBEF3471549B91FD7D4B57ACC0C10F822914C),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.MULMOD(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-                value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x96afbef3471549b91fd7d4b57acc0c10f822914c"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff09"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=141749433,
+        value=0x872ECB9,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0xFFFFFFFFFFFFFFFFFFFFFFFE000000000000000000000001FFFFFFFFFFFFFFFF: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest447.py b/tests/ported_static/stRandom2/test_random_statetest447.py
index c065d057a64..d1240b7a71a 100644
--- a/tests/ported_static/stRandom2/test_random_statetest447.py
+++ b/tests/ported_static/stRandom2/test_random_statetest447.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest447.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest447Filler.json
+state_tests/stRandom2/randomStatetest447Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest447Filler.json"],
+    ["state_tests/stRandom2/randomStatetest447Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest447(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest447."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,70 +47,64 @@ def test_random_statetest447(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.ADDMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    Op.NUMBER,
-                ),
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff085560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.ADDMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                Op.NUMBER,
+            ),
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0xe1655b4f3e5f4fd17126a28f5cc273efeb1c89b3"),  # noqa: E501
+        address=Address(0xE1655B4F3E5F4FD17126A28F5CC273EFEB1C89B3),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff08"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff08"  # noqa: E501
         ),
         gas_limit=100000,
-        value=359263144,
+        value=0x1569EBA8,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={0: 0x10000000000000000000000000000000000000000},
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest448.py b/tests/ported_static/stRandom2/test_random_statetest448.py
index f9c200b0c14..84cf86ec705 100644
--- a/tests/ported_static/stRandom2/test_random_statetest448.py
+++ b/tests/ported_static/stRandom2/test_random_statetest448.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest448.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest448Filler.json
+state_tests/stRandom2/randomStatetest448Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest448Filler.json"],
+    ["state_tests/stRandom2/randomStatetest448Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest448(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest448."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,62 +43,53 @@ def test_random_statetest448(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.TIMESTAMP
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PC
-            + Op.RETURN(offset=Op.DUP2, size=Op.CALLVALUE)
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0), value=0x85646D53671639175B9408
-            )
-        ),
+    # Source: raw
+    # 0x427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b940860005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.TIMESTAMP
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PC
+        + Op.RETURN(offset=Op.DUP2, size=Op.CALLVALUE)
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x85646D53671639175B9408),
         nonce=0,
-        address=Address("0xb2da1f608a7e0626e721677fa30fc46d2d99c655"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "427f00000000000000000000000000000000000000000000000000000000000000007f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000017f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b9408"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b9408"  # noqa: E501
         ),
         gas_limit=4400000,
-        value=1485632,
+        value=0x16AB40,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest449.py b/tests/ported_static/stRandom2/test_random_statetest449.py
index f4dfdb18a65..d098fe1bf57 100644
--- a/tests/ported_static/stRandom2/test_random_statetest449.py
+++ b/tests/ported_static/stRandom2/test_random_statetest449.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest449.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest449Filler.json
+state_tests/stRandom2/randomStatetest449Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest449Filler.json"],
+    ["state_tests/stRandom2/randomStatetest449Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest449(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest449."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,63 +43,56 @@ def test_random_statetest449(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.NOT
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.MSTORE(offset=0xE4FF65A056F39B, value=Op.DUP12)
-            + Op.SWAP16
-        ),
+    # Source: raw
+    # 0x197f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>8b66e4ff65a056f39b529f  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.NOT
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.MSTORE(offset=0xE4FF65A056F39B, value=Op.DUP12)
+        + Op.SWAP16,
         nonce=0,
-        address=Address("0xa744e6fa67e6f6717d1af2356f4679ae961cad1e"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "197f000000000000000000000000000000000000000000000000000000000000c3507fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f7014"  # noqa: E501
-            "64972e74606d6ea82d4d3080599a0e798b66e4ff65a056f39b529f"
+        to=target,
+        data=Bytes(
+            "197f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e798b66e4ff65a056f39b529f"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1857649905,
+        value=0x6EB97CF1,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest450.py b/tests/ported_static/stRandom2/test_random_statetest450.py
index 29443b96893..f19bbc92f7c 100644
--- a/tests/ported_static/stRandom2/test_random_statetest450.py
+++ b/tests/ported_static/stRandom2/test_random_statetest450.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest450.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest450Filler.json
+state_tests/stRandom2/randomStatetest450Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest450Filler.json"],
+    ["state_tests/stRandom2/randomStatetest450Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest450(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xEC7C2DE039694D1868A1956B3126454E8E17448344A219E03D859B64831B6AF8
-    )
+    """Test_random_statetest450."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A764000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,68 +43,59 @@ def test_random_statetest450(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.CALLDATALOAD(
-                offset=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-            )
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SUB(
-                Op.PUSH32[0x10000000000000000000000000000000000000000],
-                Op.PUSH32[0xC350],
-            )
-            + Op.GASPRICE
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.DUP1)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x4cda9e76f4ec620ca74c0321e2393998b84f4b99"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000033a8060005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.CALLDATALOAD(
+            offset=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        )
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SUB(
+            Op.PUSH32[0x10000000000000000000000000000000000000000],
+            Op.PUSH32[0xC350],
+        )
+        + Op.GASPRICE
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.DUP1),
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A764000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e79357fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507f00000000000000000000000100000000"  # noqa: E501
-            "00000000000000000000000000000000033a80"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000033a80"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1357943190,
+        value=0x50F09196,
     )
 
     post = {
-        contract: Account(storage={0: 10}),
+        target: Account(storage={0: 10}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest451.py b/tests/ported_static/stRandom2/test_random_statetest451.py
index 8d8fe540507..f8c29c42d22 100644
--- a/tests/ported_static/stRandom2/test_random_statetest451.py
+++ b/tests/ported_static/stRandom2/test_random_statetest451.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest451.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest451Filler.json
+state_tests/stRandom2/randomStatetest451Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest451Filler.json"],
+    ["state_tests/stRandom2/randomStatetest451Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest451(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest451."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,60 @@ def test_random_statetest451(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0xED05989A0659453076573A8704117455,
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000006fed05989a0659453076573a870411745560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000] * 2
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0xED05989A0659453076573A8704117455
         ),
         nonce=0,
-        address=Address("0xd3d2709429a6489e16c9cbcd44a7bbf746eeb5f2"),  # noqa: E501
+        address=Address(0xD3D2709429A6489E16C9CBCD44A7BBF746EEB5F2),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000017f0000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000006fed05989a0659453076573a87041174"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000006fed05989a0659453076573a87041174"  # noqa: E501
         ),
         gas_limit=100000,
-        value=812425754,
+        value=0x306CA21A,
     )
 
     post = {
-        contract: Account(storage={0: 0xED05989A0659453076573A8704117455}),
+        target: Account(
+            storage={0: 0xED05989A0659453076573A8704117455},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest452.py b/tests/ported_static/stRandom2/test_random_statetest452.py
index 8dd80770210..f293656b762 100644
--- a/tests/ported_static/stRandom2/test_random_statetest452.py
+++ b/tests/ported_static/stRandom2/test_random_statetest452.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest452.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest452Filler.json
+state_tests/stRandom2/randomStatetest452Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest452Filler.json"],
+    ["state_tests/stRandom2/randomStatetest452Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest452(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest452."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,60 @@ def test_random_statetest452(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0xA3289746806163630047DFF98310555,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f0a3289746806163630047dff9831055560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0xA3289746806163630047DFF98310555
         ),
         nonce=0,
-        address=Address("0xf0ff5931ad08530e3d77980d2f2de3d8a81a5ab4"),  # noqa: E501
+        address=Address(0xF0FF5931AD08530E3D77980D2F2DE3D8A81A5AB4),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000007fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74"  # noqa: E501
-            "606d6ea82d4d3080599a0e796f0a3289746806163630047dff983105"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f0a3289746806163630047dff983105"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1492613506,
+        value=0x58F77982,
     )
 
     post = {
-        contract: Account(storage={0: 0xA3289746806163630047DFF98310555}),
+        target: Account(
+            storage={0: 0xA3289746806163630047DFF98310555},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest454.py b/tests/ported_static/stRandom2/test_random_statetest454.py
index ac6839cb3b7..8602d2c5dc3 100644
--- a/tests/ported_static/stRandom2/test_random_statetest454.py
+++ b/tests/ported_static/stRandom2/test_random_statetest454.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest454.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest454Filler.json
+state_tests/stRandom2/randomStatetest454Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest454Filler.json"],
+    ["state_tests/stRandom2/randomStatetest454Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest454(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest454."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,60 +43,54 @@ def test_random_statetest454(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=Op.PUSH32[0x0],
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-            )
-            + Op.SSTORE(key=Op.PUSH32[0x0], value=Op.PUSH32[0x0])
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.EXP
-            + Op.DUP5
-            + Op.CALLER
-            + Op.SWAP2
-            + Op.LOG0(offset=0x6595668352, size=Op.DUP9)
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x8555)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x0089d9313f6c18f62805e3a145739544ee1459a7"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000557f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000557f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>0a84339188646595668352a061855560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=Op.PUSH32[0x0],
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+        )
+        + Op.SSTORE(key=Op.PUSH32[0x0], value=Op.PUSH32[0x0])
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.EXP
+        + Op.DUP5
+        + Op.CALLER
+        + Op.SWAP2
+        + Op.LOG0(offset=0x6595668352, size=Op.DUP9)
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x8555),
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000557f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000007f00000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000557f000000000000000000"  # noqa: E501
-            "0000004f3f701464972e74606d6ea82d4d3080599a0e790a84339188646595668352a061"  # noqa: E501
-            "85"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000557f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000557f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e790a84339188646595668352a06185"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1431310051,
+        value=0x55500EE3,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest455.py b/tests/ported_static/stRandom2/test_random_statetest455.py
index 8a790ac2ec0..29f79d69583 100644
--- a/tests/ported_static/stRandom2/test_random_statetest455.py
+++ b/tests/ported_static/stRandom2/test_random_statetest455.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest455.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest455Filler.json
+state_tests/stRandom2/randomStatetest455Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest455Filler.json"],
+    ["state_tests/stRandom2/randomStatetest455Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest455(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest455."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,59 @@ def test_random_statetest455(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x858B1411F218693CA2245B918274F355,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f858b1411f218693ca2245b918274f35560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x858B1411F218693CA2245B918274F355
         ),
         nonce=0,
-        address=Address("0xffbfd097bce347e41311bed3648aaffc63840dd6"),  # noqa: E501
+        address=Address(0xFFBFD097BCE347E41311BED3648AAFFC63840DD6),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000017f0000000000000000000000004f3f701464972e74"  # noqa: E501
-            "606d6ea82d4d3080599a0e796f858b1411f218693ca2245b918274f3"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f858b1411f218693ca2245b918274f3"  # noqa: E501
         ),
         gas_limit=100000,
-        value=737734735,
+        value=0x2BF8F04F,
     )
 
     post = {
-        contract: Account(storage={0: 0x858B1411F218693CA2245B918274F355}),
+        target: Account(
+            storage={0: 0x858B1411F218693CA2245B918274F355},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest456.py b/tests/ported_static/stRandom2/test_random_statetest456.py
index 3ea06d13fb5..c280a649e02 100644
--- a/tests/ported_static/stRandom2/test_random_statetest456.py
+++ b/tests/ported_static/stRandom2/test_random_statetest456.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest456.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest456Filler.json
+state_tests/stRandom2/randomStatetest456Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest456Filler.json"],
+    ["state_tests/stRandom2/randomStatetest456Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest456(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest456."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,41 +43,42 @@ def test_random_statetest456(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x41424143445a42f35b10773574016c9f
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex("41424143445a42f35b10773574016c9f"),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x832214236b4dc7829a505afafb05b91d152f9ff4"),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
+        ),
+        balance=46,
+        nonce=0,
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0xDE0B6B3A76586A0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest457.py b/tests/ported_static/stRandom2/test_random_statetest457.py
index fe4b63708d6..f8fca23bc05 100644
--- a/tests/ported_static/stRandom2/test_random_statetest457.py
+++ b/tests/ported_static/stRandom2/test_random_statetest457.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest457.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest457Filler.json
+state_tests/stRandom2/randomStatetest457Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest457Filler.json"],
+    ["state_tests/stRandom2/randomStatetest457Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest457(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest457."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,60 +47,57 @@ def test_random_statetest457(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x44417f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f949fa28af308a37a136c626218927d5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PREVRANDAO
+        + Op.COINBASE
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x949FA28AF308A37A136C626218927D55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x90C8AB55A939C61C361F2183F9057CCBDF966B43),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PREVRANDAO
-            + Op.COINBASE
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x949FA28AF308A37A136C626218927D55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x90c8ab55a939c61c361f2183f9057ccbdf966b43"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "44417f00000000000000000000000000000000000000000000000000000000000000017f"  # noqa: E501
-            "00000000000000000000000100000000000000000000000000000000000000007f000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000007fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe6f949fa28af308a37a13"  # noqa: E501
-            "6c626218927d"
+        to=target,
+        data=Bytes(
+            "44417f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f949fa28af308a37a136c626218927d"  # noqa: E501
         ),
         gas_limit=100000,
-        value=316557712,
+        value=0x12DE4990,
     )
 
     post = {
-        contract: Account(storage={0: 0x949FA28AF308A37A136C626218927D55}),
+        target: Account(
+            storage={0: 0x949FA28AF308A37A136C626218927D55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest458.py b/tests/ported_static/stRandom2/test_random_statetest458.py
index 79643a5b963..04a0977cb90 100644
--- a/tests/ported_static/stRandom2/test_random_statetest458.py
+++ b/tests/ported_static/stRandom2/test_random_statetest458.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest458.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest458Filler.json
+state_tests/stRandom2/randomStatetest458Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest458Filler.json"],
+    ["state_tests/stRandom2/randomStatetest458Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest458(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest458."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,165 +44,141 @@ def test_random_statetest458(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH23[0x89747FB3520231748BBE5EB9617666E630019E3E84CE71]
-            + Op.PUSH26[0xC5D83B7E36050E5C05623956E599F54EB56213E4F96F69F402CD]
-            + Op.PUSH20[0xE13C366095A3FE56BDD6A815D9BA23F3A9729BC4]
-            + Op.PUSH3[0x385C69]
-            + Op.PUSH31[
-                0xD9F24192C949E33FF7ED256C84979D70148B8FD8A62438CA053DE264227145  # noqa: E501
-            ]
-            + Op.PUSH14[0xDE46CE78CF7C6D1D2CC48EEE658A]
-            + Op.PUSH20[0xAD9F9CA1E550720490E2D0769E0A429773E42FC9]
-            + Op.PUSH6[0xEA1030F6C078]
-            + Op.PUSH28[
-                0x4E7BC4915150A99FC758D3373561D8917C4C7D605F0CD8D2203F4D69
-            ]
-            + Op.PUSH1[0x61]
-            + Op.SWAP9
-            + Op.NUMBER
-            + Op.PUSH21[0x29E2F2D2BF742B28760A9C0AB51203D0C5D5B9E16D]
-            + Op.PUSH21[0xCE0428945AAFF2D0F99240A901D3233BD04E366C36]
-            + Op.PUSH27[
-                0xB93ECEA0C206FBF01084254636DF9C1F308C7D6875D5D5D37F3CE2
-            ]
-            + Op.PUSH26[0x89E39048F175F0D2DC49EAA86530DEF7AB70553F5D3904C843B5]
-            + Op.PUSH20[0x6025E321E7E2AB92AF570E5B3BEF4014C54E6531]
-            + Op.PUSH12[0xB546EB8906F155F7B9405326]
-            + Op.PUSH21[0x104D8F5D98DC97AC374AD0C58F4385E086891B9B2]
-            + Op.PUSH6[0x7E982EB15A36]
-            + Op.PUSH31[
-                0xAB6683B51EA9F219ABAE5CA39F669A1A88A82E14EFD4192A3EDBE04A12D356  # noqa: E501
-            ]
-            + Op.PUSH26[0xCF6338130D67F37C324464D16CC866BE846B0304EF9FD3C6611E]
-            + Op.PUSH13[0xDF1277D65F6B2A58FFB61BA979]
-            + Op.PUSH21[0xB8DF72816602071E979E6029C9307D718FFDC70F3]
-            + Op.PUSH31[
-                0xA0019353C06B0FB56D8E3738DFDB18418E952092E8625B51749F276CC6AE41  # noqa: E501
-            ]
-            + Op.PUSH11[0x85BD070C61E65240D8C271]
-            + Op.SWAP13
-            + Op.PUSH23[0xB0420F84ECE41C9BE0F93D4F30581C28F6976839516393]
-            + Op.PUSH32[
-                0x95B86DA30FA76B6937870245D9250E06B6E07DFFEA8F849A37647378DD59AC83  # noqa: E501
-            ]
-            + Op.PUSH6[0xA37DD908EEA2]
-            + Op.PUSH12[0xE2F53375E1DBEE32ECAA7E95]
-            + Op.PUSH31[
-                0xACE8C6F0883E4EF830485BD43B2B7851A0B11497F752D3EE4560E312A7A91B  # noqa: E501
-            ]
-            + Op.PUSH28[
-                0x2A88C109737C92FEB7807D481AC3FD823F038C4BA82DF40A60982A7C
-            ]
-            + Op.PUSH27[
-                0x6F6BA2CB95233C257B30E1C9D3C84AA37B6F4268FEC34FB9EEF1F8
-            ]
-            + Op.PUSH1[0x2E]
-            + Op.PUSH11[0x7BF1EBFA162680B57AF09F]
-            + Op.PUSH27[
-                0x7FC584055FF32D68A92E59DDAF20BCAAAA70D5970FD71C04CDBAB4
-            ]
-            + Op.PUSH13[0xF86E566E870664B6DF2C686134]
-            + Op.PUSH28[
-                0x2A3886788BBEBBD03CBB51ED29357F699C8B974C61528A0423F67A83
-            ]
-            + Op.PUSH28[
-                0xFAB83AFA78A0BFF70A653EA0F398F73632D5E3BEA0A31115D65486FB
-            ]
-            + Op.PUSH14[0x667110448E0208264A3F76F35972]
-            + Op.PUSH7[0x6E7AA7339F23B0]
-            + Op.DUP15
-            + Op.LOG0(offset=0x6337, size=0x28)
-            + Op.CALLDATASIZE
-            + Op.CALL(
-                gas=0x5706352B,
-                address=0x4F391713BDCA6E610DEA121DF82FF743D96D33B6,
-                value=0xE6DB38E,
-                args_offset=0xB,
-                args_size=0x14,
-                ret_offset=0x1D,
-                ret_size=0x16,
-            )
-            + Op.PUSH10[0x5BB9E53D5AD3BA1191EA]
-            + Op.PUSH6[0xAE1880D46C68]
-            + Op.PUSH23[0x5148E427A09D40172DBDD5FC72FFFB1443080A39A0EE7]
-            + Op.PUSH32[
-                0xEED9DDC9050AFFCE41D68C34AD97C484F204A987BCFAF46B9FA4A9ED2DAD3738  # noqa: E501
-            ]
-            + Op.PUSH24[0x1A3CF86B43F303A8DB8CDE3ED8A40AE35574B9084F4CAB88]
-            + Op.PUSH17[0x1D150E628D9B2A33E71C8F9FB0CE9E7286]
-            + Op.PUSH3[0x576917]
-            + Op.PUSH23[0xF999B7DDF64F22532351BD34743E08FACD1ACC94B0D6B5]
-            + Op.PUSH12[0xF97491D5ED9D726AF684D1A4]
-            + Op.PUSH27[
-                0xBCB243B7C29D12A315E939F70AF8D2617DF63567C3BC56C16609A2
-            ]
-            + Op.PUSH25[0x71AF77631FE1CCAA0D15F8DA9BD9A712A544ABB92B925B1D75]
-            + Op.PUSH2[0xFCED]
-            + Op.PUSH1[0xB0]
-            + Op.SWAP12
-            + Op.PUSH12[0x22F2121B105A65A209E151B7]
-            + Op.PUSH12[0x31BE481D57353D10A1D968CA]
-            + Op.PUSH27[
-                0x185495A8A2935571A0D17443A327BF11CB421BACA9064BC4E4497C
-            ]
-            + Op.PUSH30[
-                0x4C486C40082CC2D01B3F6023B726DE95AC2AD53AE0B731D741676338181E
-            ]
-            + Op.PUSH7[0xC8AC8DAF0D5477]
-            + Op.PUSH9[0x27987E79D9F617C51F]
-            + Op.PUSH16[0x4B87CF8FEE734C99E5E3FC2E37F17E62]
-            + Op.PUSH13[0xBFD1195157215D10FA39B4B094]
-            + Op.PUSH29[
-                0x3339139B280C0B042DA7EC93A24416D5C52E0BA21EC9D39D6FBCD3D742
-            ]
-            + Op.PUSH7[0x580EEF6CA9BB9D]
-            + Op.PUSH23[0xBB4DC441F3D6D0CF38307B505251DEEA82AB39F9CCD17A]
-            + Op.PUSH6[0x7BF16B38640]
-            + Op.PUSH8[0x9C22F2134E8258F7]
-            + Op.SWAP12
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x4f391713bdca6e610dea121df82ff743d96d33b6"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7689747fb3520231748bbe5eb9617666e630019e3e84ce7179c5d83b7e36050e5c05623956e599f54eb56213e4f96f69f402cd73e13c366095a3fe56bdd6a815d9ba23f3a9729bc462385c697ed9f24192c949e33ff7ed256c84979d70148b8fd8a62438ca053de2642271456dde46ce78cf7c6d1d2cc48eee658a73ad9f9ca1e550720490e2d0769e0a429773e42fc965ea1030f6c0787b4e7bc4915150a99fc758d3373561d8917c4c7d605f0cd8d2203f4d69606198437429e2f2d2bf742b28760a9c0ab51203d0c5d5b9e16d74ce0428945aaff2d0f99240a901d3233bd04e366c367ab93ecea0c206fbf01084254636df9c1f308c7d6875d5d5d37f3ce27989e39048f175f0d2dc49eaa86530def7ab70553f5d3904c843b5736025e321e7e2ab92af570e5b3bef4014c54e65316bb546eb8906f155f7b9405326740104d8f5d98dc97ac374ad0c58f4385e086891b9b2657e982eb15a367eab6683b51ea9f219abae5ca39f669a1a88a82e14efd4192a3edbe04a12d35679cf6338130d67f37c324464d16cc866be846b0304ef9fd3c6611e6cdf1277d65f6b2a58ffb61ba979740b8df72816602071e979e6029c9307d718ffdc70f37ea0019353c06b0fb56d8e3738dfdb18418e952092e8625b51749f276cc6ae416a85bd070c61e65240d8c2719c76b0420f84ece41c9be0f93d4f30581c28f69768395163937f95b86da30fa76b6937870245d9250e06b6e07dffea8f849a37647378dd59ac8365a37dd908eea26be2f53375e1dbee32ecaa7e957eace8c6f0883e4ef830485bd43b2b7851a0b11497f752d3ee4560e312a7a91b7b2a88c109737c92feb7807d481ac3fd823f038c4ba82df40a60982a7c7a6f6ba2cb95233c257b30e1c9d3c84aa37b6f4268fec34fb9eef1f8602e6a7bf1ebfa162680b57af09f7a7fc584055ff32d68a92e59ddaf20bcaaaa70d5970fd71c04cdbab46cf86e566e870664b6df2c6861347b2a3886788bbebbd03cbb51ed29357f699c8b974c61528a0423f67a837bfab83afa78a0bff70a653ea0f398f73632d5e3bea0a31115d65486fb6d667110448e0208264a3f76f35972666e7aa7339f23b08e6028616337a0366016601d6014600b630e6db38e73<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>635706352bf1695bb9e53d5ad3ba1191ea65ae1880d46c687605148e427a09d40172dbdd5fc72fffb1443080a39a0ee77feed9ddc9050affce41d68c34ad97c484f204a987bcfaf46b9fa4a9ed2dad3738771a3cf86b43f303a8db8cde3ed8a40ae35574b9084f4cab88701d150e628d9b2a33e71c8f9fb0ce9e72866257691776f999b7ddf64f22532351bd34743e08facd1acc94b0d6b56bf97491d5ed9d726af684d1a47abcb243b7c29d12a315e939f70af8d2617df63567c3bc56c16609a27871af77631fe1ccaa0d15f8da9bd9a712a544abb92b925b1d7561fced60b09b6b22f2121b105a65a209e151b76b31be481d57353d10a1d968ca7a185495a8a2935571a0d17443a327bf11cb421baca9064bc4e4497c7d4c486c40082cc2d01b3f6023b726de95ac2ad53ae0b731d741676338181e66c8ac8daf0d54776827987e79d9f617c51f6f4b87cf8fee734c99e5e3fc2e37f17e626cbfd1195157215d10fa39b4b0947c3339139b280c0b042da7ec93a24416d5c52e0ba21ec9d39d6fbcd3d74266580eef6ca9bb9d76bb4dc441f3d6d0cf38307b505251deea82ab39f9ccd17a6507bf16b38640679c22f2134e8258f79b  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH23[0x89747FB3520231748BBE5EB9617666E630019E3E84CE71]
+        + Op.PUSH26[0xC5D83B7E36050E5C05623956E599F54EB56213E4F96F69F402CD]
+        + Op.PUSH20[0xE13C366095A3FE56BDD6A815D9BA23F3A9729BC4]
+        + Op.PUSH3[0x385C69]
+        + Op.PUSH31[
+            0xD9F24192C949E33FF7ED256C84979D70148B8FD8A62438CA053DE264227145
+        ]
+        + Op.PUSH14[0xDE46CE78CF7C6D1D2CC48EEE658A]
+        + Op.PUSH20[0xAD9F9CA1E550720490E2D0769E0A429773E42FC9]
+        + Op.PUSH6[0xEA1030F6C078]
+        + Op.PUSH28[0x4E7BC4915150A99FC758D3373561D8917C4C7D605F0CD8D2203F4D69]
+        + Op.PUSH1[0x61]
+        + Op.SWAP9
+        + Op.NUMBER
+        + Op.PUSH21[0x29E2F2D2BF742B28760A9C0AB51203D0C5D5B9E16D]
+        + Op.PUSH21[0xCE0428945AAFF2D0F99240A901D3233BD04E366C36]
+        + Op.PUSH27[0xB93ECEA0C206FBF01084254636DF9C1F308C7D6875D5D5D37F3CE2]
+        + Op.PUSH26[0x89E39048F175F0D2DC49EAA86530DEF7AB70553F5D3904C843B5]
+        + Op.PUSH20[0x6025E321E7E2AB92AF570E5B3BEF4014C54E6531]
+        + Op.PUSH12[0xB546EB8906F155F7B9405326]
+        + Op.PUSH21[0x104D8F5D98DC97AC374AD0C58F4385E086891B9B2]
+        + Op.PUSH6[0x7E982EB15A36]
+        + Op.PUSH31[
+            0xAB6683B51EA9F219ABAE5CA39F669A1A88A82E14EFD4192A3EDBE04A12D356
+        ]
+        + Op.PUSH26[0xCF6338130D67F37C324464D16CC866BE846B0304EF9FD3C6611E]
+        + Op.PUSH13[0xDF1277D65F6B2A58FFB61BA979]
+        + Op.PUSH21[0xB8DF72816602071E979E6029C9307D718FFDC70F3]
+        + Op.PUSH31[
+            0xA0019353C06B0FB56D8E3738DFDB18418E952092E8625B51749F276CC6AE41
+        ]
+        + Op.PUSH11[0x85BD070C61E65240D8C271]
+        + Op.SWAP13
+        + Op.PUSH23[0xB0420F84ECE41C9BE0F93D4F30581C28F6976839516393]
+        + Op.PUSH32[
+            0x95B86DA30FA76B6937870245D9250E06B6E07DFFEA8F849A37647378DD59AC83
+        ]
+        + Op.PUSH6[0xA37DD908EEA2]
+        + Op.PUSH12[0xE2F53375E1DBEE32ECAA7E95]
+        + Op.PUSH31[
+            0xACE8C6F0883E4EF830485BD43B2B7851A0B11497F752D3EE4560E312A7A91B
+        ]
+        + Op.PUSH28[0x2A88C109737C92FEB7807D481AC3FD823F038C4BA82DF40A60982A7C]
+        + Op.PUSH27[0x6F6BA2CB95233C257B30E1C9D3C84AA37B6F4268FEC34FB9EEF1F8]
+        + Op.PUSH1[0x2E]
+        + Op.PUSH11[0x7BF1EBFA162680B57AF09F]
+        + Op.PUSH27[0x7FC584055FF32D68A92E59DDAF20BCAAAA70D5970FD71C04CDBAB4]
+        + Op.PUSH13[0xF86E566E870664B6DF2C686134]
+        + Op.PUSH28[0x2A3886788BBEBBD03CBB51ED29357F699C8B974C61528A0423F67A83]
+        + Op.PUSH28[0xFAB83AFA78A0BFF70A653EA0F398F73632D5E3BEA0A31115D65486FB]
+        + Op.PUSH14[0x667110448E0208264A3F76F35972]
+        + Op.PUSH7[0x6E7AA7339F23B0]
+        + Op.DUP15
+        + Op.LOG0(offset=0x6337, size=0x28)
+        + Op.CALLDATASIZE
+        + Op.CALL(
+            gas=0x5706352B,
+            address=0x4F391713BDCA6E610DEA121DF82FF743D96D33B6,
+            value=0xE6DB38E,
+            args_offset=0xB,
+            args_size=0x14,
+            ret_offset=0x1D,
+            ret_size=0x16,
+        )
+        + Op.PUSH10[0x5BB9E53D5AD3BA1191EA]
+        + Op.PUSH6[0xAE1880D46C68]
+        + Op.PUSH23[0x5148E427A09D40172DBDD5FC72FFFB1443080A39A0EE7]
+        + Op.PUSH32[
+            0xEED9DDC9050AFFCE41D68C34AD97C484F204A987BCFAF46B9FA4A9ED2DAD3738
+        ]
+        + Op.PUSH24[0x1A3CF86B43F303A8DB8CDE3ED8A40AE35574B9084F4CAB88]
+        + Op.PUSH17[0x1D150E628D9B2A33E71C8F9FB0CE9E7286]
+        + Op.PUSH3[0x576917]
+        + Op.PUSH23[0xF999B7DDF64F22532351BD34743E08FACD1ACC94B0D6B5]
+        + Op.PUSH12[0xF97491D5ED9D726AF684D1A4]
+        + Op.PUSH27[0xBCB243B7C29D12A315E939F70AF8D2617DF63567C3BC56C16609A2]
+        + Op.PUSH25[0x71AF77631FE1CCAA0D15F8DA9BD9A712A544ABB92B925B1D75]
+        + Op.PUSH2[0xFCED]
+        + Op.PUSH1[0xB0]
+        + Op.SWAP12
+        + Op.PUSH12[0x22F2121B105A65A209E151B7]
+        + Op.PUSH12[0x31BE481D57353D10A1D968CA]
+        + Op.PUSH27[0x185495A8A2935571A0D17443A327BF11CB421BACA9064BC4E4497C]
+        + Op.PUSH30[
+            0x4C486C40082CC2D01B3F6023B726DE95AC2AD53AE0B731D741676338181E
+        ]
+        + Op.PUSH7[0xC8AC8DAF0D5477]
+        + Op.PUSH9[0x27987E79D9F617C51F]
+        + Op.PUSH16[0x4B87CF8FEE734C99E5E3FC2E37F17E62]
+        + Op.PUSH13[0xBFD1195157215D10FA39B4B094]
+        + Op.PUSH29[
+            0x3339139B280C0B042DA7EC93A24416D5C52E0BA21EC9D39D6FBCD3D742
+        ]
+        + Op.PUSH7[0x580EEF6CA9BB9D]
+        + Op.PUSH23[0xBB4DC441F3D6D0CF38307B505251DEEA82AB39F9CCD17A]
+        + Op.PUSH6[0x7BF16B38640]
+        + Op.PUSH8[0x9C22F2134E8258F7]
+        + Op.SWAP12,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F391713BDCA6E610DEA121DF82FF743D96D33B6),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "6cff89fd2305930f9a427748410969e86bfeabd7748df8c60e9075e32f95abb7b73e260f"  # noqa: E501
-            "c345efb09ac919b22eb90402ff6b737a79722d83372adc70ef947e3a28e6dda50601f52f"  # noqa: E501
-            "ea5b45a7294d90ea73bb64de313534dce604ebc4a22c7519bd1a15bc91aca303759ffdfc"  # noqa: E501
-            "849b53ca82e03b1df66d1ede5b09b519084802396f8849817328c82f591c11d4b40c0653"  # noqa: E501
-            "e1ec91398ca9a1a6b872165aac3c0567020253bc3f5221edb93cbbd87c7486136d4f5649"  # noqa: E501
-            "a5f1ad8808013f373cbffc6c40c8707f2e0449a9ce33beba84b4974ed62803f8dd900ba3"  # noqa: E501
-            "b47d3cc55ba503f903701f1188"
+        to=target,
+        data=Bytes(
+            "6cff89fd2305930f9a427748410969e86bfeabd7748df8c60e9075e32f95abb7b73e260fc345efb09ac919b22eb90402ff6b737a79722d83372adc70ef947e3a28e6dda50601f52fea5b45a7294d90ea73bb64de313534dce604ebc4a22c7519bd1a15bc91aca303759ffdfc849b53ca82e03b1df66d1ede5b09b519084802396f8849817328c82f591c11d4b40c0653e1ec91398ca9a1a6b872165aac3c0567020253bc3f5221edb93cbbd87c7486136d4f5649a5f1ad8808013f373cbffc6c40c8707f2e0449a9ce33beba84b4974ed62803f8dd900ba3b47d3cc55ba503f903701f1188"  # noqa: E501
         ),
         gas_limit=1630523086,
-        value=2131886598,
+        value=0x7F120206,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest460.py b/tests/ported_static/stRandom2/test_random_statetest460.py
index 35641973fde..d710b0a6ea2 100644
--- a/tests/ported_static/stRandom2/test_random_statetest460.py
+++ b/tests/ported_static/stRandom2/test_random_statetest460.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest460.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest460Filler.json
+state_tests/stRandom2/randomStatetest460Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest460Filler.json"],
+    ["state_tests/stRandom2/randomStatetest460Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest460(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest460."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,66 +47,62 @@ def test_random_statetest460(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000003a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350046f16a23c6c90739ba201697b4315778a5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.GASPRICE
+        + Op.DIV(
+            Op.PUSH32[0xC350],
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+        )
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x16A23C6C90739BA201697B4315778A55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xF25F4FEAE71940EBCA3222EBA62E73951DC4C72C),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.GASPRICE
-            + Op.DIV(
-                Op.PUSH32[0xC350],
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x16A23C6C90739BA201697B4315778A55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xf25f4feae71940ebca3222eba62e73951dc4c72c"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000003a7fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c350046f16a23c6c90739ba201697b4315778a"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000003a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350046f16a23c6c90739ba201697b4315778a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1518569663,
+        value=0x5A8388BF,
     )
 
     post = {
-        contract: Account(storage={0: 0x16A23C6C90739BA201697B4315778A55}),
+        target: Account(
+            storage={0: 0x16A23C6C90739BA201697B4315778A55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest461.py b/tests/ported_static/stRandom2/test_random_statetest461.py
index 7d7b37a4beb..2a9d8c2284d 100644
--- a/tests/ported_static/stRandom2/test_random_statetest461.py
+++ b/tests/ported_static/stRandom2/test_random_statetest461.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest461.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest461Filler.json
+state_tests/stRandom2/randomStatetest461Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest461Filler.json"],
+    ["state_tests/stRandom2/randomStatetest461Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest461(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest461."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,68 +43,59 @@ def test_random_statetest461(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c350517f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4251525960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MLOAD(offset=Op.PUSH32[0xC350])
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.MSTORE(
+            offset=Op.MLOAD(offset=Op.TIMESTAMP),
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.MSIZE),
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MLOAD(offset=Op.PUSH32[0xC350])
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.MSTORE(
-                offset=Op.MLOAD(offset=Op.TIMESTAMP),
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.MSIZE)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x65331d87609c6ecd5a695b8af79603e6f023fc3d"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c350517f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3507f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff42515259"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c350517f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff42515259"  # noqa: E501
         ),
         gas_limit=100000,
-        value=548509958,
+        value=0x20B19906,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 50048,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest462.py b/tests/ported_static/stRandom2/test_random_statetest462.py
index 00f5fb3af86..64e66e327df 100644
--- a/tests/ported_static/stRandom2/test_random_statetest462.py
+++ b/tests/ported_static/stRandom2/test_random_statetest462.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest462.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest462Filler.json
+state_tests/stRandom2/randomStatetest462Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest462Filler.json"],
+    ["state_tests/stRandom2/randomStatetest462Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest462(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest462."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,54 @@ def test_random_statetest462(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x8E0186019D029D1354681482826F3755,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000006f8e0186019d029d1354681482826f375560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79] * 2
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79] * 3
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x8E0186019D029D1354681482826F3755
         ),
         nonce=0,
-        address=Address("0xedef025388ca5b473f7f8a4f3ff29633328064c6"),  # noqa: E501
+        address=Address(0xEDEF025388CA5B473F7F8A4F3FF29633328064C6),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464"  # noqa: E501
-            "972e74606d6ea82d4d3080599a0e797f0000000000000000000000010000000000000000"  # noqa: E501
-            "0000000000000000000000006f8e0186019d029d1354681482826f37"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000006f8e0186019d029d1354681482826f37"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1447977690,
+        value=0x564E62DA,
     )
 
     post = {
-        contract: Account(storage={0: 0x8E0186019D029D1354681482826F3755}),
+        target: Account(
+            storage={0: 0x8E0186019D029D1354681482826F3755},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest464.py b/tests/ported_static/stRandom2/test_random_statetest464.py
index 4e1210b006a..fd502ab1fac 100644
--- a/tests/ported_static/stRandom2/test_random_statetest464.py
+++ b/tests/ported_static/stRandom2/test_random_statetest464.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest464.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest464Filler.json
+state_tests/stRandom2/randomStatetest464Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest464Filler.json"],
+    ["state_tests/stRandom2/randomStatetest464Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest464(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest464."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,62 @@ def test_random_statetest464(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x447f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82095560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PREVRANDAO
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0] * 2
+        + Op.SSTORE(
+            key=Op.MULMOD(
+                Op.DUP3,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
+            value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xDFEE2907D42610306F0012BFD671EC142C1E78DA),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PREVRANDAO
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MULMOD(
-                    Op.DUP3,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-                value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xdfee2907d42610306f0012bfd671ec142c1e78da"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "447f00000000000000000000000000000000000000000000000000000000000000007f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3507f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000007f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff8209"
+        to=target,
+        data=Bytes(
+            "447f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8209"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2396601,
+        value=0x2491B9,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest465.py b/tests/ported_static/stRandom2/test_random_statetest465.py
index a4f7164ea09..d1ceeac89e2 100644
--- a/tests/ported_static/stRandom2/test_random_statetest465.py
+++ b/tests/ported_static/stRandom2/test_random_statetest465.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest465.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest465Filler.json
+state_tests/stRandom2/randomStatetest465Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest465Filler.json"],
+    ["state_tests/stRandom2/randomStatetest465Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest465(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest465."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,65 +43,54 @@ def test_random_statetest465(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.NUMBER
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.PUSH32[0x1])
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x39c49de6b1821e4bf091113386607cc5533ab190"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>437f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000160005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.NUMBER
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.PUSH32[0x1]),
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e79437f00000000000000000000"  # noqa: E501
-            "00004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000001"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1575037991,
+        value=0x5DE12C27,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest466.py b/tests/ported_static/stRandom2/test_random_statetest466.py
index 9591d296cb5..d538ce72f00 100644
--- a/tests/ported_static/stRandom2/test_random_statetest466.py
+++ b/tests/ported_static/stRandom2/test_random_statetest466.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest466.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest466Filler.json
+state_tests/stRandom2/randomStatetest466Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest466Filler.json"],
+    ["state_tests/stRandom2/randomStatetest466Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest466(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest466."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,61 +43,54 @@ def test_random_statetest466(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.TIMESTAMP
-            + Op.PREVRANDAO
-            + Op.SWAP1
-            + Op.DIV(Op.PREVRANDAO, Op.TIMESTAMP)
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4244904244045560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.TIMESTAMP
+        + Op.PREVRANDAO
+        + Op.SWAP1
+        + Op.DIV(Op.PREVRANDAO, Op.TIMESTAMP)
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x01b1e973a4d051cfbb5acde495eccdf5ad34a422"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff424490424404"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff424490424404"  # noqa: E501
         ),
         gas_limit=14265563,
-        value=1790975802,
+        value=0x6AC01F3A,
     )
 
     post = {
-        contract: Account(storage={0: 0x20000, 131: 1000}),
+        target: Account(storage={0: 0x20000, 131: 1000}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest467.py b/tests/ported_static/stRandom2/test_random_statetest467.py
index 95edd8bb2af..14eb143ce07 100644
--- a/tests/ported_static/stRandom2/test_random_statetest467.py
+++ b/tests/ported_static/stRandom2/test_random_statetest467.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest467.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest467Filler.json
+state_tests/stRandom2/randomStatetest467Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest467Filler.json"],
+    ["state_tests/stRandom2/randomStatetest467Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest467(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest467."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,113 +44,96 @@ def test_random_statetest467(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SLOAD(key=0xAB6605E03171122AEEBD20B63699A72D4)
-            + Op.PUSH3[0x863934]
-            + Op.PUSH16[0xFAF92BCD1855C6DDE5C90BA78A966A25]
-            + Op.PUSH13[0x777CE8880C23F90F4A2ECC999A]
-            + Op.PUSH13[0xD42DA7121D5E1FDE1C9C340F96]
-            + Op.PUSH1[0xB5]
-            + Op.PUSH18[0xA71E20A5753BC4E291ADBD41A228289A0BE1]
-            + Op.PUSH22[0xA606BC44DD2079ECE46A2CBA498BEE0D80A41673D801]
-            + Op.PUSH15[0x7232F97A66B29954364570F6E2D08B]
-            + Op.PUSH14[0x429C6A75F737C594ACA21580BC0D]
-            + Op.PUSH1[0xE6]
-            + Op.PUSH29[
-                0x38A50CE1DDF0CE9963FD79DA8A590429F5FCFB6E7FD9EE2D27201F9570
-            ]
-            + Op.PUSH19[0x35CE3DBC5997E44BAA174111977F51DC6B333A]
-            + Op.SWAP11
-            + Op.PUSH4[0x483E6A3D]
-            + Op.PUSH16[0x423ED5778057702664B65D4AF9AAB14D]
-            + Op.PUSH24[0x3A787D60BD24C439B29533C6B172278B6A78E64F8E319FBD]
-            + Op.PUSH12[0x45EECA466AFD1EB2EECBAEED]
-            + Op.PUSH24[0x3DA8711C4C65787E0A0A1297F525B7418F49FBC1B2446A84]
-            + Op.PUSH30[
-                0x74BB0A66E3B06EF70D8A8AA09A910A6BE623C6A8239960381512DA962EB8
-            ]
-            + Op.PUSH9[0xA21F99D90741128FCB]
-            + Op.PUSH18[0x1E029CFF42F4F8F5D35947C4A7B39CFF7FD4]
-            + Op.PUSH16[0x916CC8612B146BBF52DB1CD36E6C2FCE]
-            + Op.PUSH29[
-                0xD9ED232E21946081D78D87E61BC42FCE313FA32B458D1E898E52CC2E60
-            ]
-            + Op.PUSH22[0x70A7E1D2AE3B5B7D58E0A70396BCFAAE0789CD920287]
-            + Op.PUSH5[0x88BB595D45]
-            + Op.PUSH27[
-                0x45BC48E190F5D56B34BE6D244070FFE02107CEAF9313DB08D9A180
-            ]
-            + Op.SWAP12
-            + Op.CALLDATASIZE
-            + Op.LOG3(
-                offset=0xEF2F,
-                size=0xC0,
-                topic_1=0x66225CB464667BD081C949847A95E2821F589DAD,
-                topic_2=0x68B512,
-                topic_3=0xC956E6C5567DA1D8A656406871EB0DD4,
-            )
-            + Op.SMOD(0x34CA1A8A0C86C26D, 0x9E17C2B3A94181A8F8A89B48)
-            + Op.CALL(
-                gas=0x6158E2E1,
-                address=0x79940E2F1225EBA4FAB3405B111535075C733270,
-                value=0x5E0D7386,
-                args_offset=0x12,
-                args_size=0x6,
-                ret_offset=0x11,
-                ret_size=0x4,
-            )
-            + Op.CALLDATALOAD(offset=0xE10DE5D5905723)
-        ),
+    # Source: raw
+    # 0x700ab6605e03171122aeebd20b63699a72d454628639346ffaf92bcd1855c6dde5c90ba78a966a256c777ce8880c23f90f4a2ecc999a6cd42da7121d5e1fde1c9c340f9660b571a71e20a5753bc4e291adbd41a228289a0be175a606bc44dd2079ece46a2cba498bee0d80a41673d8016e7232f97a66b29954364570f6e2d08b6d429c6a75f737c594aca21580bc0d60e67c38a50ce1ddf0ce9963fd79da8a590429f5fcfb6e7fd9ee2d27201f95707235ce3dbc5997e44baa174111977f51dc6b333a9a63483e6a3d6f423ed5778057702664b65d4af9aab14d773a787d60bd24c439b29533c6b172278b6a78e64f8e319fbd6b45eeca466afd1eb2eecbaeed773da8711c4c65787e0a0a1297f525b7418f49fbc1b2446a847d74bb0a66e3b06ef70d8a8aa09a910a6be623c6a8239960381512da962eb868a21f99d90741128fcb711e029cff42f4f8f5d35947c4a7b39cff7fd46f916cc8612b146bbf52db1cd36e6c2fce7cd9ed232e21946081d78d87e61bc42fce313fa32b458d1e898e52cc2e607570a7e1d2ae3b5b7d58e0a70396bcfaae0789cd9202876488bb595d457a45bc48e190f5d56b34be6d244070ffe02107ceaf9313db08d9a1809b366fc956e6c5567da1d8a656406871eb0dd46268b5127366225cb464667bd081c949847a95e2821f589dad60c061ef2fa36b9e17c2b3a94181a8f8a89b486734ca1a8a0c86c26d076004601160066012635e0d738673<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>636158e2e1f166e10de5d590572335  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SLOAD(key=0xAB6605E03171122AEEBD20B63699A72D4)
+        + Op.PUSH3[0x863934]
+        + Op.PUSH16[0xFAF92BCD1855C6DDE5C90BA78A966A25]
+        + Op.PUSH13[0x777CE8880C23F90F4A2ECC999A]
+        + Op.PUSH13[0xD42DA7121D5E1FDE1C9C340F96]
+        + Op.PUSH1[0xB5]
+        + Op.PUSH18[0xA71E20A5753BC4E291ADBD41A228289A0BE1]
+        + Op.PUSH22[0xA606BC44DD2079ECE46A2CBA498BEE0D80A41673D801]
+        + Op.PUSH15[0x7232F97A66B29954364570F6E2D08B]
+        + Op.PUSH14[0x429C6A75F737C594ACA21580BC0D]
+        + Op.PUSH1[0xE6]
+        + Op.PUSH29[
+            0x38A50CE1DDF0CE9963FD79DA8A590429F5FCFB6E7FD9EE2D27201F9570
+        ]
+        + Op.PUSH19[0x35CE3DBC5997E44BAA174111977F51DC6B333A]
+        + Op.SWAP11
+        + Op.PUSH4[0x483E6A3D]
+        + Op.PUSH16[0x423ED5778057702664B65D4AF9AAB14D]
+        + Op.PUSH24[0x3A787D60BD24C439B29533C6B172278B6A78E64F8E319FBD]
+        + Op.PUSH12[0x45EECA466AFD1EB2EECBAEED]
+        + Op.PUSH24[0x3DA8711C4C65787E0A0A1297F525B7418F49FBC1B2446A84]
+        + Op.PUSH30[
+            0x74BB0A66E3B06EF70D8A8AA09A910A6BE623C6A8239960381512DA962EB8
+        ]
+        + Op.PUSH9[0xA21F99D90741128FCB]
+        + Op.PUSH18[0x1E029CFF42F4F8F5D35947C4A7B39CFF7FD4]
+        + Op.PUSH16[0x916CC8612B146BBF52DB1CD36E6C2FCE]
+        + Op.PUSH29[
+            0xD9ED232E21946081D78D87E61BC42FCE313FA32B458D1E898E52CC2E60
+        ]
+        + Op.PUSH22[0x70A7E1D2AE3B5B7D58E0A70396BCFAAE0789CD920287]
+        + Op.PUSH5[0x88BB595D45]
+        + Op.PUSH27[0x45BC48E190F5D56B34BE6D244070FFE02107CEAF9313DB08D9A180]
+        + Op.SWAP12
+        + Op.CALLDATASIZE
+        + Op.LOG3(
+            offset=0xEF2F,
+            size=0xC0,
+            topic_1=0x66225CB464667BD081C949847A95E2821F589DAD,
+            topic_2=0x68B512,
+            topic_3=0xC956E6C5567DA1D8A656406871EB0DD4,
+        )
+        + Op.SMOD(0x34CA1A8A0C86C26D, 0x9E17C2B3A94181A8F8A89B48)
+        + Op.CALL(
+            gas=0x6158E2E1,
+            address=0x79940E2F1225EBA4FAB3405B111535075C733270,
+            value=0x5E0D7386,
+            args_offset=0x12,
+            args_size=0x6,
+            ret_offset=0x11,
+            ret_size=0x4,
+        )
+        + Op.CALLDATALOAD(offset=0xE10DE5D5905723),
         nonce=0,
-        address=Address("0x79940e2f1225eba4fab3405b111535075c733270"),  # noqa: E501
+        address=Address(0x79940E2F1225EBA4FAB3405B111535075C733270),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "6f42af68ebb8fbfe65896d2993c75a18b06dbf26336197db938986312c4ea88b7aab8c2c"  # noqa: E501
-            "d436a05c5b765989d8ad6c97257fe7c4f1f33d9644b8e03c6898c8946d19a4dfed187482"  # noqa: E501
-            "dd95f88ea4f0c43f39f4ab261808bf1b1f658f0979b867eeb00baeadab37700449f87952"  # noqa: E501
-            "2b0bba9c6f2d87d2541b0b943275c57530b3790b225dd318baeca448b045ccf1477837e4"  # noqa: E501
-            "156d992ad881869b91a5f7f71de5884a703c659316ab330af945c7fd906936c695fe7913"  # noqa: E501
-            "4e48e46153702e81da6d3da14e05b90ae63b037d7b9e4fb17367c1e737162043aa587f4b"  # noqa: E501
-            "b580e87cfaad897bc8e3152e3741f1ba345cc4c762c99caede0c3c0de9f33e7c89de1511"  # noqa: E501
-            "64142941ef1cc6b81f618255c88f3e04316de6ff3f8b87fb187d3661e8d861b8134d518c"  # noqa: E501
-            "fe5123377034be1a24c27e19133f7fdcbddcadd272d4eb1f5205b897290ed5b28741f1d1"  # noqa: E501
-            "3f595f15604097426e31e5a64a6665f31f2ebca84c5be5d27a8632d85d7e123bac508bf4"  # noqa: E501
-            "7f6274f38f9f580ad68134f4d4e654d56693448be12412a37275c071ba6b6b017df1ec3d"  # noqa: E501
-            "04f5b5fe7af2c0aa65ed17249093e9601064716ca4d232779ee3cf649bff458fb2a37fd5"  # noqa: E501
-            "34556a505f3dbc4f9afd77cb7e2e37e0a6a739404993d8f68975614f1988a7130cadc924"  # noqa: E501
-            "5f9616c4776a3bfe77f48bb80ed67553de915c99302d13cc7ab0253d6f415cb1499866f3"  # noqa: E501
-            "a0512a188aa35477c52c8b4cce48dd291dc9fabd99de813a0e0db12447a11917353860c0"  # noqa: E501
-            "6efdf1c9532e0cf08a7c0a3185ab81d417"
+        to=target,
+        data=Bytes(
+            "6f42af68ebb8fbfe65896d2993c75a18b06dbf26336197db938986312c4ea88b7aab8c2cd436a05c5b765989d8ad6c97257fe7c4f1f33d9644b8e03c6898c8946d19a4dfed187482dd95f88ea4f0c43f39f4ab261808bf1b1f658f0979b867eeb00baeadab37700449f879522b0bba9c6f2d87d2541b0b943275c57530b3790b225dd318baeca448b045ccf1477837e4156d992ad881869b91a5f7f71de5884a703c659316ab330af945c7fd906936c695fe79134e48e46153702e81da6d3da14e05b90ae63b037d7b9e4fb17367c1e737162043aa587f4bb580e87cfaad897bc8e3152e3741f1ba345cc4c762c99caede0c3c0de9f33e7c89de151164142941ef1cc6b81f618255c88f3e04316de6ff3f8b87fb187d3661e8d861b8134d518cfe5123377034be1a24c27e19133f7fdcbddcadd272d4eb1f5205b897290ed5b28741f1d13f595f15604097426e31e5a64a6665f31f2ebca84c5be5d27a8632d85d7e123bac508bf47f6274f38f9f580ad68134f4d4e654d56693448be12412a37275c071ba6b6b017df1ec3d04f5b5fe7af2c0aa65ed17249093e9601064716ca4d232779ee3cf649bff458fb2a37fd534556a505f3dbc4f9afd77cb7e2e37e0a6a739404993d8f68975614f1988a7130cadc9245f9616c4776a3bfe77f48bb80ed67553de915c99302d13cc7ab0253d6f415cb1499866f3a0512a188aa35477c52c8b4cce48dd291dc9fabd99de813a0e0db12447a11917353860c06efdf1c9532e0cf08a7c0a3185ab81d417"  # noqa: E501
         ),
         gas_limit=1762815149,
-        value=1848680675,
+        value=0x6E30A0E3,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest469.py b/tests/ported_static/stRandom2/test_random_statetest469.py
index 8e829e7d76d..5a99fa3f9b4 100644
--- a/tests/ported_static/stRandom2/test_random_statetest469.py
+++ b/tests/ported_static/stRandom2/test_random_statetest469.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest469.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest469Filler.json
+state_tests/stRandom2/randomStatetest469Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest469Filler.json"],
+    ["state_tests/stRandom2/randomStatetest469Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest469(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest469."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,59 +43,52 @@ def test_random_statetest469(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001a07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350f36409156a6aa261413b56f20855  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG0(offset=Op.PUSH32[0x1], size=Op.PUSH32[0xC350])
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0xC350]
+        + Op.RETURN(offset=Op.PUSH32[0xC350], size=Op.PUSH32[0xC350])
+        + Op.PUSH5[0x9156A6AA2]
+        + Op.JUMP(pc=0x413B)
+        + Op.SSTORE(key=Op.ADDMOD, value=Op.CALLCODE),
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.LOG0(offset=Op.PUSH32[0x1], size=Op.PUSH32[0xC350])
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.RETURN(offset=Op.PUSH32[0xC350], size=Op.PUSH32[0xC350])
-            + Op.PUSH5[0x9156A6AA2]
-            + Op.JUMP(pc=0x413B)
-            + Op.SSTORE(key=Op.ADDMOD, value=Op.CALLCODE)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x912e90647207810a8fa1f685d7cd4a5baa06e85d"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000001a07fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000"  # noqa: E501
-            "0000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000c350f36409156a6aa261413b56f208"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001a07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350f36409156a6aa261413b56f208"  # noqa: E501
         ),
         gas_limit=500000,
-        value=1762323696,
+        value=0x690AECF0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest470.py b/tests/ported_static/stRandom2/test_random_statetest470.py
index 54b1147be2a..61e748904b7 100644
--- a/tests/ported_static/stRandom2/test_random_statetest470.py
+++ b/tests/ported_static/stRandom2/test_random_statetest470.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest470.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest470Filler.json
+state_tests/stRandom2/randomStatetest470Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest470Filler.json"],
+    ["state_tests/stRandom2/randomStatetest470Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest470(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest470."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,58 @@ def test_random_statetest470(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GASLIMIT
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.SIGNEXTEND(
-                    Op.PUSH32[0x0],
-                    Op.CALLDATALOAD(offset=Op.PUSH32[0x1]),
-                ),
-            )
+    # Source: raw
+    # 0x457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001357f00000000000000000000000000000000000000000000000000000000000000000b60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.GASLIMIT
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0xC350] * 2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.SIGNEXTEND(
+                Op.PUSH32[0x0], Op.CALLDATALOAD(offset=Op.PUSH32[0x1])
+            ),
         ),
         nonce=0,
-        address=Address("0x396527ef051c114a21d96eafe1f9316aa34def16"),  # noqa: E501
+        address=Address(0x396527EF051C114A21D96EAFE1F9316AA34DEF16),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3507f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c3507f00000000000000"  # noqa: E501
-            "0000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000001357f000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000b"
+        to=target,
+        data=Bytes(
+            "457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001357f00000000000000000000000000000000000000000000000000000000000000000b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1740863815,
+        value=0x67C37947,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest471.py b/tests/ported_static/stRandom2/test_random_statetest471.py
index 2fd3ba8263c..ee806426281 100644
--- a/tests/ported_static/stRandom2/test_random_statetest471.py
+++ b/tests/ported_static/stRandom2/test_random_statetest471.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest471.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest471Filler.json
+state_tests/stRandom2/randomStatetest471Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest471Filler.json"],
+    ["state_tests/stRandom2/randomStatetest471Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest471(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest471."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,51 @@ def test_random_statetest471(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09650618701355040655183a51377d8260005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09650618701355040655183a51377d8260005155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xA715E7DC86705B05E7A17A3D508149070BA35E0A),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000"  # noqa: E501
-            "0000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe09650618701355040655183a51377d8260005155"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xa715e7dc86705b05e7a17a3d508149070ba35e0a"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000"  # noqa: E501
-            "0000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe09650618701355040655183a51377d82"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09650618701355040655183a51377d82"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1662521271,
+        value=0x63180FB7,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x61870135504: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest472.py b/tests/ported_static/stRandom2/test_random_statetest472.py
index f78cbdc8e39..a2790261184 100644
--- a/tests/ported_static/stRandom2/test_random_statetest472.py
+++ b/tests/ported_static/stRandom2/test_random_statetest472.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest472.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest472Filler.json
+state_tests/stRandom2/randomStatetest472Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest472Filler.json"],
+    ["state_tests/stRandom2/randomStatetest472Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest472(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest472."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,63 +43,57 @@ def test_random_statetest472(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.COINBASE
-            + Op.NUMBER
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.EXP(
-                    Op.MULMOD(
-                        Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                        Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    ),
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>41437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff090a60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.COINBASE
+        + Op.NUMBER
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.EXP(
+                Op.MULMOD(
+                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
                     0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
                 ),
-            )
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
         ),
         nonce=0,
-        address=Address("0x5b9efb31b8be05e6e52f6921f9ee79769a6792d0"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7941437fffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000"  # noqa: E501
-            "000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff090a"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7941437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff090a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1691421230,
+        value=0x64D10A2E,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest473.py b/tests/ported_static/stRandom2/test_random_statetest473.py
index a414bea6aba..77696035ad1 100644
--- a/tests/ported_static/stRandom2/test_random_statetest473.py
+++ b/tests/ported_static/stRandom2/test_random_statetest473.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest473.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest473Filler.json
+state_tests/stRandom2/randomStatetest473Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest473Filler.json"],
+    ["state_tests/stRandom2/randomStatetest473Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,10 @@ def test_random_statetest473(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_random_statetest473."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,74 +44,66 @@ def test_random_statetest473(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.BALANCE(
-                address=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.SWAP2
-            + Op.SSTORE(key=Op.MULMOD, value=Op.MUL)
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff317f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b59102095560005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.BALANCE(
+            address=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        )
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.SWAP2
+        + Op.SSTORE(key=Op.MULMOD, value=Op.MUL)
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff317f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c3507fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb"  # noqa: E501
-            "96065b2a98b57a48a06ae28d285a71b5910209"
+        to=contract_0,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff317f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5910209"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1147652673,
+        value=0x4467CA41,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0xFFFFFFFFFFFFFFFFFFFFFFFF6BACFB1469F9A4D5674A85B75F951D72D7A58E4A: 50000,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest474.py b/tests/ported_static/stRandom2/test_random_statetest474.py
index 6c6fbd236b9..897f4e4170c 100644
--- a/tests/ported_static/stRandom2/test_random_statetest474.py
+++ b/tests/ported_static/stRandom2/test_random_statetest474.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest474.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest474Filler.json
+state_tests/stRandom2/randomStatetest474Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest474Filler.json"],
+    ["state_tests/stRandom2/randomStatetest474Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest474(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest474."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,62 +47,58 @@ def test_random_statetest474(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe027f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f7d6f6b1051778ea1670387810b58055560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.MUL(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,
+            Op.PUSH32[0x10000000000000000000000000000000000000000],
+        )
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x7D6F6B1051778EA1670387810B580555
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x6581D000C652313B1574BDB42B3CA918D2106814),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.MUL(
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                Op.PUSH32[0x10000000000000000000000000000000000000000],
-            )
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x7D6F6B1051778EA1670387810B580555,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x6581d000c652313b1574bdb42b3ca918d2106814"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe027f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff6f7d6f6b1051778ea1670387810b"  # noqa: E501
-            "5805"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe027f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f7d6f6b1051778ea1670387810b5805"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2065350381,
+        value=0x7B1ABEED,
     )
 
     post = {
-        contract: Account(storage={0: 0x7D6F6B1051778EA1670387810B580555}),
+        target: Account(
+            storage={0: 0x7D6F6B1051778EA1670387810B580555},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest475.py b/tests/ported_static/stRandom2/test_random_statetest475.py
index d658f8499d7..2cdd0f7836b 100644
--- a/tests/ported_static/stRandom2/test_random_statetest475.py
+++ b/tests/ported_static/stRandom2/test_random_statetest475.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest475.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest475Filler.json
+state_tests/stRandom2/randomStatetest475Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest475Filler.json"],
+    ["state_tests/stRandom2/randomStatetest475Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest475(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest475."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,70 +43,61 @@ def test_random_statetest475(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MULMOD(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-                value=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x4992e682e800cd8e1379eabf4279ff7afec36cc6"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0955  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MULMOD(
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
+            value=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff09"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=428358692,
+        value=0x19883C24,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
-                0xFFFFFFFFFFFFFFFFFFFFFFFE000000000000000000000001FFFFFFFFFFFFFFFF: 0x4F3F701464972E74606D6EA82D4D3080599A0E79,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFE000000000000000000000001FFFFFFFFFFFFFFFF: coinbase,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest476.py b/tests/ported_static/stRandom2/test_random_statetest476.py
index fc25ab61a59..4478cded4e6 100644
--- a/tests/ported_static/stRandom2/test_random_statetest476.py
+++ b/tests/ported_static/stRandom2/test_random_statetest476.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest476.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest476Filler.json
+state_tests/stRandom2/randomStatetest476Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest476Filler.json"],
+    ["state_tests/stRandom2/randomStatetest476Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest476(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest476."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,74 +44,63 @@ def test_random_statetest476(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000448243628c0970843ba460005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PREVRANDAO
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x1]
+        + Op.LOG4(
+            offset=Op.EXTCODESIZE(address=Op.DUP5),
+            size=0x8C0970,
+            topic_1=Op.NUMBER,
+            topic_2=Op.DUP3,
+            topic_3=Op.PREVRANDAO,
+            topic_4=Op.PUSH32[0x10000000000000000000000000000000000000000],
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PREVRANDAO
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.LOG4(
-                offset=Op.EXTCODESIZE(address=Op.DUP5),
-                size=0x8C0970,
-                topic_1=Op.NUMBER,
-                topic_2=Op.DUP3,
-                topic_3=Op.PREVRANDAO,
-                topic_4=Op.PUSH32[0x10000000000000000000000000000000000000000],
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xad6fffed2e41e6d57f10debdf91b1dc35758b7ad"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000017fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000017f00000000000000000000000100000000"  # noqa: E501
-            "00000000000000000000000000000000448243628c0970843ba4"
+        to=target,
+        data=Bytes(
+            "447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000448243628c0970843ba4"  # noqa: E501
         ),
         gas_limit=1518298975,
-        value=2098819291,
+        value=0x7D1970DB,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest477.py b/tests/ported_static/stRandom2/test_random_statetest477.py
index d9bd107b86c..17c6da2359e 100644
--- a/tests/ported_static/stRandom2/test_random_statetest477.py
+++ b/tests/ported_static/stRandom2/test_random_statetest477.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest477.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest477Filler.json
+state_tests/stRandom2/randomStatetest477Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest477Filler.json"],
+    ["state_tests/stRandom2/randomStatetest477Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest477(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest477."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,66 +47,60 @@ def test_random_statetest477(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.COINBASE
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x9084A3758D3456763AA4F09C8B735B55,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f9084a3758d3456763aa4f09c8b735b5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1] * 2
+        + Op.COINBASE
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x9084A3758D3456763AA4F09C8B735B55
         ),
         nonce=0,
-        address=Address("0x50235d3527b930d9031704aa08e62b9d72a7cfba"),  # noqa: E501
+        address=Address(0x50235D3527B930D9031704AA08E62B9D72A7CFBA),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017f0000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000001417fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe6f9084a3758d3456763aa4f09c8b735b"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f9084a3758d3456763aa4f09c8b735b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=11119317,
+        value=0xA9AAD5,
     )
 
     post = {
-        contract: Account(storage={0: 0x9084A3758D3456763AA4F09C8B735B55}),
+        target: Account(
+            storage={0: 0x9084A3758D3456763AA4F09C8B735B55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest478.py b/tests/ported_static/stRandom2/test_random_statetest478.py
index 02eef02834c..6780cc9c185 100644
--- a/tests/ported_static/stRandom2/test_random_statetest478.py
+++ b/tests/ported_static/stRandom2/test_random_statetest478.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest478.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest478Filler.json
+state_tests/stRandom2/randomStatetest478Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest478Filler.json"],
+    ["state_tests/stRandom2/randomStatetest478Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest478(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest478."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,135 +43,45 @@ def test_random_statetest478(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001447f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f1606588a909558021569  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000001447f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000c3507f1606588a909558021569"
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001447f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f1606588a909558021569"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xcfbded6c35b6aeffc2afe1c21fc42d489ad4e002"),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000001447f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000c3507f1606588a909558021569"
-        ),
-        gas_limit=100000,
-        value=844312201,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest478Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest478_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000001447f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000c3507f1606588a909558021569"
-        ),
-        nonce=0,
-        address=Address("0xcfbded6c35b6aeffc2afe1c21fc42d489ad4e002"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000001447f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000c3507f1606588a909558021569"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001447f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f1606588a909558021569"  # noqa: E501
         ),
         gas_limit=100000,
-        value=844312201,
+        value=0x32532E89,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest480.py b/tests/ported_static/stRandom2/test_random_statetest480.py
index e527794abbc..c9504c8e817 100644
--- a/tests/ported_static/stRandom2/test_random_statetest480.py
+++ b/tests/ported_static/stRandom2/test_random_statetest480.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest480.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest480Filler.json
+state_tests/stRandom2/randomStatetest480Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest480Filler.json"],
+    ["state_tests/stRandom2/randomStatetest480Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest480(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest480."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,66 +46,62 @@ def test_random_statetest480(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SUB(
-                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.PUSH32[0x0]
-            + Op.TIMESTAMP
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x5AF3A474FF64F3A37D51F36A6A607F55,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff037f0000000000000000000000000000000000000000000000000000000000000000427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f5af3a474ff64f3a37d51f36a6a607f5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SUB(
+            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+        )
+        + Op.PUSH32[0x0]
+        + Op.TIMESTAMP
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x5AF3A474FF64F3A37D51F36A6A607F55
         ),
         nonce=0,
-        address=Address("0x0085349f22c7c8692fcee4f900382152fc914ffd"),  # noqa: E501
+        address=Address(0x0085349F22C7C8692FCEE4F900382152FC914FFD),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff037f00000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000427fffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffe6f5af3a474ff64f3a37d51f36a"  # noqa: E501
-            "6a607f"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff037f0000000000000000000000000000000000000000000000000000000000000000427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f5af3a474ff64f3a37d51f36a6a607f"  # noqa: E501
         ),
         gas_limit=100000,
-        value=745095931,
+        value=0x2C6942FB,
     )
 
     post = {
-        contract: Account(storage={0: 0x5AF3A474FF64F3A37D51F36A6A607F55}),
+        target: Account(
+            storage={0: 0x5AF3A474FF64F3A37D51F36A6A607F55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest481.py b/tests/ported_static/stRandom2/test_random_statetest481.py
index 383470c886b..f63abbb04b3 100644
--- a/tests/ported_static/stRandom2/test_random_statetest481.py
+++ b/tests/ported_static/stRandom2/test_random_statetest481.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest481.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest481Filler.json
+state_tests/stRandom2/randomStatetest481Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest481Filler.json"],
+    ["state_tests/stRandom2/randomStatetest481Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest481(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest481."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,52 +43,45 @@ def test_random_statetest481(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x447f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09437f0000000000000000000000010000000000000000000000000000000000000000a2695a7d52064361127350  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "447f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09437f0000000000000000000000010000000000000000000000000000000000000000a2695a7d52064361127350"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "447f00000000000000000000000000000000000000000000000000000000000000017f00"  # noqa: E501
-            "0000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "0000000000ffffffffffffffffffffffffffffffffffffffff09437f0000000000000000"  # noqa: E501
-            "000000010000000000000000000000000000000000000000a2695a7d52064361127350"  # noqa: E501
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x6566eb05c057cad2fd88c1fec362190264dde517"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "447f00000000000000000000000000000000000000000000000000000000000000017f00"  # noqa: E501
-            "0000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "0000000000ffffffffffffffffffffffffffffffffffffffff09437f0000000000000000"  # noqa: E501
-            "000000010000000000000000000000000000000000000000a2695a7d52064361127350"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "447f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09437f0000000000000000000000010000000000000000000000000000000000000000a2695a7d52064361127350"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1124860809,
+        value=0x430C0389,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest482.py b/tests/ported_static/stRandom2/test_random_statetest482.py
index 5af316c7135..7f0b462f558 100644
--- a/tests/ported_static/stRandom2/test_random_statetest482.py
+++ b/tests/ported_static/stRandom2/test_random_statetest482.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest482.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest482Filler.json
+state_tests/stRandom2/randomStatetest482Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest482Filler.json"],
+    ["state_tests/stRandom2/randomStatetest482Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest482(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest482."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,69 +46,64 @@ def test_random_statetest482(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.NUMBER
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x27C9D313D9B09376505927C8E715655,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x10bbdcd5333caca2b44aa07addc53e8ed2654b3c"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f027c9d313d9b09376505927c8e71565560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.NUMBER
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x27C9D313D9B09376505927C8E715655
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x10BBDCD5333CACA2B44AA07ADDC53E8ED2654B3C),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e79437fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000017f000000000000000000000000ffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff6f027c9d313d9b09376505927c8e7156"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f027c9d313d9b09376505927c8e7156"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1668252863,
+        value=0x636F84BF,
     )
 
     post = {
-        contract: Account(storage={0: 0x27C9D313D9B09376505927C8E715655}),
+        target: Account(
+            storage={0: 0x27C9D313D9B09376505927C8E715655},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest483.py b/tests/ported_static/stRandom2/test_random_statetest483.py
index 4578002488d..e337fc6a653 100644
--- a/tests/ported_static/stRandom2/test_random_statetest483.py
+++ b/tests/ported_static/stRandom2/test_random_statetest483.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest483.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest483Filler.json
+state_tests/stRandom2/randomStatetest483Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest483Filler.json"],
+    ["state_tests/stRandom2/randomStatetest483Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest483(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest483."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,65 +43,53 @@ def test_random_statetest483(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MULMOD(
-                    Op.DUP5,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-                value=Op.PUSH32[0x1],
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe840955  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0] * 2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.SSTORE(
+            key=Op.MULMOD(
+                Op.DUP5,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
+            value=Op.PUSH32[0x1],
         ),
         nonce=0,
-        address=Address("0xb86af9dc2bdcc686ffab19d6cac02521fd762055"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe8409"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8409"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2129514006,
+        value=0x7EEDCE16,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest484.py b/tests/ported_static/stRandom2/test_random_statetest484.py
index baf0ebcd103..2c67f679087 100644
--- a/tests/ported_static/stRandom2/test_random_statetest484.py
+++ b/tests/ported_static/stRandom2/test_random_statetest484.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest484.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest484Filler.json
+state_tests/stRandom2/randomStatetest484Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest484Filler.json"],
+    ["state_tests/stRandom2/randomStatetest484Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest484(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest484."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,45 @@ def test_random_statetest484(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff35427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>595584a2558493a25b5a6a60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff35427fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000c3507f000000000000000000000000"  # noqa: E501
-            "4f3f701464972e74606d6ea82d4d3080599a0e79595584a2558493a25b5a6a60005155"  # noqa: E501
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff35427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79595584a2558493a25b5a6a60005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x55cff4f5475d77a24015ab0f01029b182814b37b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff35427fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000c3507f000000000000000000000000"  # noqa: E501
-            "4f3f701464972e74606d6ea82d4d3080599a0e79595584a2558493a25b5a6a"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff35427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79595584a2558493a25b5a6a"  # noqa: E501
         ),
         gas_limit=500000,
-        value=465395296,
+        value=0x1BBD5E60,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest485.py b/tests/ported_static/stRandom2/test_random_statetest485.py
index 6dfe459b92b..8a8a0cceb40 100644
--- a/tests/ported_static/stRandom2/test_random_statetest485.py
+++ b/tests/ported_static/stRandom2/test_random_statetest485.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest485.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest485Filler.json
+state_tests/stRandom2/randomStatetest485Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest485Filler.json"],
+    ["state_tests/stRandom2/randomStatetest485Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest485(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest485."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,45 @@ def test_random_statetest485(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000008e447f00000000000000000000000100000000000000000000000000000000000000003a1a7e  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000008e447f00000000000000000000000100000000000000000000000000000000000000003a1a7e"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000008e447f000000000000000000000001"  # noqa: E501
-            "00000000000000000000000000000000000000003a1a7e"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x91a7cc63f8bb623d64fe789d8cc49c06427bb9c2"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000008e447f000000000000000000000001"  # noqa: E501
-            "00000000000000000000000000000000000000003a1a7e"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000008e447f00000000000000000000000100000000000000000000000000000000000000003a1a7e"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1573164058,
+        value=0x5DC4941A,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest487.py b/tests/ported_static/stRandom2/test_random_statetest487.py
index ea989762802..5e3e4ff58ee 100644
--- a/tests/ported_static/stRandom2/test_random_statetest487.py
+++ b/tests/ported_static/stRandom2/test_random_statetest487.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest487.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest487Filler.json
+state_tests/stRandom2/randomStatetest487Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest487Filler.json"],
+    ["state_tests/stRandom2/randomStatetest487Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest487(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest487."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,55 +47,48 @@ def test_random_statetest487(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe337fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0308ff9f708d1710086a73a0766a6b55  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe337fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0308ff9f708d1710086a73a0766a6b55"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x62B2D76B6B68B324F9869058ECD93A807B45812B),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe337fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff0308ff9f708d1710086a73a0766a6b55"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x62b2d76b6b68b324f9869058ecd93a807b45812b"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe337fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff0308ff9f708d1710086a73a0766a6b"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe337fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0308ff9f708d1710086a73a0766a6b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=841051523,
+        value=0x32216D83,
     )
 
-    post: dict = {}
+    post = {
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, nonce=1),
+        Address(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3CAE): Account(
+            storage={}, code=b"", nonce=0
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest488.py b/tests/ported_static/stRandom2/test_random_statetest488.py
index e54445405ea..e0a3e2346b5 100644
--- a/tests/ported_static/stRandom2/test_random_statetest488.py
+++ b/tests/ported_static/stRandom2/test_random_statetest488.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest488.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest488Filler.json
+state_tests/stRandom2/randomStatetest488Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest488Filler.json"],
+    ["state_tests/stRandom2/randomStatetest488Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest488(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest488."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,64 +47,59 @@ def test_random_statetest488(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x3250648093577F6364A218F0907E7D55,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>427f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f3250648093577f6364a218f0907e7d5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79] * 2
+        + Op.TIMESTAMP
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x3250648093577F6364A218F0907E7D55
         ),
         nonce=0,
-        address=Address("0xdfd379ab9052fd0504226c54a761237ff69333b4"),  # noqa: E501
+        address=Address(0xDFD379AB9052FD0504226C54A761237FF69333B4),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e79427f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe6f3250648093577f6364a218f0907e7d"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79427f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f3250648093577f6364a218f0907e7d"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1401176215,
+        value=0x53844097,
     )
 
     post = {
-        contract: Account(storage={0: 0x3250648093577F6364A218F0907E7D55}),
+        target: Account(
+            storage={0: 0x3250648093577F6364A218F0907E7D55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest489.py b/tests/ported_static/stRandom2/test_random_statetest489.py
index 81d68193e49..2371883ee4f 100644
--- a/tests/ported_static/stRandom2/test_random_statetest489.py
+++ b/tests/ported_static/stRandom2/test_random_statetest489.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest489.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest489Filler.json
+state_tests/stRandom2/randomStatetest489Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest489Filler.json"],
+    ["state_tests/stRandom2/randomStatetest489Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest489(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest489."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,66 +47,56 @@ def test_random_statetest489(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x0]
-            + Op.GASLIMIT
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x2B8E846B91987417705A126E77076455,
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000456f2b8e846b91987417705a126e7707645560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 3
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0] * 2
+        + Op.GASLIMIT
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x2B8E846B91987417705A126E77076455
         ),
         nonce=0,
-        address=Address("0x92e909c60772d315706b32f2a3271091eadd78ed"),  # noqa: E501
+        address=Address(0x92E909C60772D315706B32F2A3271091EADD78ED),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000007f0000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000456f2b8e846b91987417705a126e770764"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000456f2b8e846b91987417705a126e770764"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1856101458,
+        value=0x6EA1DC52,
     )
 
     post = {
-        contract: Account(storage={0: 0x2B8E846B91987417705A126E77076455}),
+        target: Account(
+            storage={0: 0x2B8E846B91987417705A126E77076455},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest491.py b/tests/ported_static/stRandom2/test_random_statetest491.py
index 5cd97cc1a13..13bcc9e74bb 100644
--- a/tests/ported_static/stRandom2/test_random_statetest491.py
+++ b/tests/ported_static/stRandom2/test_random_statetest491.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest491.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest491Filler.json
+state_tests/stRandom2/randomStatetest491Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest491Filler.json"],
+    ["state_tests/stRandom2/randomStatetest491Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest491(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest491."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,68 +46,63 @@ def test_random_statetest491(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0xA0F670645A778C71127D3B5598308B17,
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000006fa0f670645a778c71127d3b5598308b1760005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0xA0F670645A778C71127D3B5598308B17
         ),
         nonce=0,
-        address=Address("0x1716a97a6dbe8c31a23b2bcab7de7077d48be880"),  # noqa: E501
+        address=Address(0x1716A97A6DBE8C31A23B2BCAB7DE7077D48BE880),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000007fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000006fa0f670645a778c71127d3b5598308b17"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000006fa0f670645a778c71127d3b5598308b17"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1805810722,
+        value=0x6BA27C22,
     )
 
     post = {
-        contract: Account(storage={0: 0xA0F670645A778C71127D3B5598308B17}),
+        target: Account(
+            storage={0: 0xA0F670645A778C71127D3B5598308B17},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest493.py b/tests/ported_static/stRandom2/test_random_statetest493.py
index eb04a4fbad2..84bd05560e1 100644
--- a/tests/ported_static/stRandom2/test_random_statetest493.py
+++ b/tests/ported_static/stRandom2/test_random_statetest493.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest493.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest493Filler.json
+state_tests/stRandom2/randomStatetest493Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest493Filler.json"],
+    ["state_tests/stRandom2/randomStatetest493Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest493(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest493."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,63 @@ def test_random_statetest493(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.NUMBER
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-                value=Op.PUSH32[0x1],
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff095560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.NUMBER
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MULMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
+            value=Op.PUSH32[0x1],
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0xb48bf563d8d32f5c2632d374277b74f85810617d"),  # noqa: E501
+        address=Address(0xB48BF563D8D32F5C2632D374277B74F85810617D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000017fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff09"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1422979897,
+        value=0x54D0F339,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 1,
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest494.py b/tests/ported_static/stRandom2/test_random_statetest494.py
index 9dcafffaf54..e4f6950cd24 100644
--- a/tests/ported_static/stRandom2/test_random_statetest494.py
+++ b/tests/ported_static/stRandom2/test_random_statetest494.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest494.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest494Filler.json
+state_tests/stRandom2/randomStatetest494Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest494Filler.json"],
+    ["state_tests/stRandom2/randomStatetest494Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest494(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest494."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,50 +43,45 @@ def test_random_statetest494(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x847f000000000000000000000000000000000000000000000000000000000000c35043657f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4362f03c897f50f073f219105455  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "847f000000000000000000000000000000000000000000000000000000000000c3504365"  # noqa: E501
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4362f03c897f"  # noqa: E501
-            "50f073f219105455"
+            "847f000000000000000000000000000000000000000000000000000000000000c35043657f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4362f03c897f50f073f219105455"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x38b239ab7d6aaf0165c4ad27921248d64f77a368"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "847f000000000000000000000000000000000000000000000000000000000000c3504365"  # noqa: E501
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4362f03c897f"  # noqa: E501
-            "50f073f2191054"
+        to=target,
+        data=Bytes(
+            "847f000000000000000000000000000000000000000000000000000000000000c35043657f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4362f03c897f50f073f2191054"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1741426477,
+        value=0x67CC0F2D,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest495.py b/tests/ported_static/stRandom2/test_random_statetest495.py
index 1d291f073d7..9813c87ffcf 100644
--- a/tests/ported_static/stRandom2/test_random_statetest495.py
+++ b/tests/ported_static/stRandom2/test_random_statetest495.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest495.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest495Filler.json
+state_tests/stRandom2/randomStatetest495Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest495Filler.json"],
+    ["state_tests/stRandom2/randomStatetest495Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest495(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest495."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,54 +47,48 @@ def test_random_statetest495(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000006f427fffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffe7e6410f26f519c538ea2070a6c600051"  # noqa: E501
-            "55"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x3960d00f7af05f0183ba04d1db89bfe241a50926"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000006f427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7e6410f26f519c538ea2070a6c60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000006f427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7e6410f26f519c538ea2070a6c60005155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x3960D00F7AF05F0183BA04D1DB89BFE241A50926),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000006f427fffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffe7e6410f26f519c538ea2070a6c"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000006f427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7e6410f26f519c538ea2070a6c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=211829998,
+        value=0xCA044EE,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x00000000427FFFFFFFFFFFFFFFFFFFFFFFFFFFFF): Account(
+            storage={}, code=b"", nonce=0
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest496.py b/tests/ported_static/stRandom2/test_random_statetest496.py
index a28b38fc959..6026a342b94 100644
--- a/tests/ported_static/stRandom2/test_random_statetest496.py
+++ b/tests/ported_static/stRandom2/test_random_statetest496.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest496.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest496Filler.json
+state_tests/stRandom2/randomStatetest496Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest496Filler.json"],
+    ["state_tests/stRandom2/randomStatetest496Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest496(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest496."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,59 +43,54 @@ def test_random_statetest496(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.GASLIMIT
-            + Op.CALLDATALOAD(offset=Op.PUSH32[0x0])
-            + Op.JUMPDEST
-            + Op.MUL(
-                Op.SIGNEXTEND,
-                Op.SIGNEXTEND(Op.PUSH32[0xC350], Op.PUSH32[0x1]),
-            )
-            + Op.SMOD
-            + Op.SWAP7
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f0000000000000000000000000000000000000000000000000000000000000000355b7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3500b0b0207965560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.GASLIMIT
+        + Op.CALLDATALOAD(offset=Op.PUSH32[0x0])
+        + Op.JUMPDEST
+        + Op.MUL(
+            Op.SIGNEXTEND, Op.SIGNEXTEND(Op.PUSH32[0xC350], Op.PUSH32[0x1])
+        )
+        + Op.SMOD
+        + Op.SWAP7
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x3cd8f98e1691532041c91df7d39ebf449b04cb9d"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000355b7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3500b0b020796"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f0000000000000000000000000000000000000000000000000000000000000000355b7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3500b0b020796"  # noqa: E501
         ),
         gas_limit=100000,
-        value=256677208,
+        value=0xF4C9558,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest497.py b/tests/ported_static/stRandom2/test_random_statetest497.py
index 1b8b7c2694f..74327c70b2d 100644
--- a/tests/ported_static/stRandom2/test_random_statetest497.py
+++ b/tests/ported_static/stRandom2/test_random_statetest497.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest497.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest497Filler.json
+state_tests/stRandom2/randomStatetest497Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest497Filler.json"],
+    ["state_tests/stRandom2/randomStatetest497Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest497(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest497."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,64 +43,55 @@ def test_random_statetest497(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff090455  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.DIV(
+                Op.MULMOD(
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                ),
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            ),
+            value=Op.PUSH32[0xC350],
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.DIV(
-                    Op.MULMOD(
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    ),
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                ),
-                value=Op.PUSH32[0xC350],
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xfcd27debf054614355478e0ff6c51d24676987c6"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff0904"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0904"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1143211377,
+        value=0x44240571,
     )
 
     post = {
-        contract: Account(storage={0: 50000}),
+        target: Account(storage={0: 50000}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest498.py b/tests/ported_static/stRandom2/test_random_statetest498.py
index 40f78ffbed3..97cfbdbd7ac 100644
--- a/tests/ported_static/stRandom2/test_random_statetest498.py
+++ b/tests/ported_static/stRandom2/test_random_statetest498.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest498.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest498Filler.json
+state_tests/stRandom2/randomStatetest498Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest498Filler.json"],
+    ["state_tests/stRandom2/randomStatetest498Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,8 +32,8 @@ def test_random_statetest498(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest498."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,154 +47,127 @@ def test_random_statetest498(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.ISZERO(0xD243DBCFDC6982733E4CD626)
-            + Op.PUSH21[0xFC6CDEC93282FF50EF24D8BE05D58BE29301DDB00D]
-            + Op.PUSH22[0x47F6B65997E73D232B76D6484C11EB15C87B01F89E27]
-            + Op.PUSH26[0xC427711BA193E4E163967EFD1B9315187C3227F67B9282FC7524]
-            + Op.PUSH10[0x2FBF851CB370D396D53F]
-            + Op.PUSH27[
-                0x86353AACECC5C1EADEDDBB3925522F935FC5ED03568FBF40261C05
-            ]
-            + Op.PUSH11[0x124F1334CC9FA8EEA2BDBF]
-            + Op.PUSH9[0xF04C10CC08B6BABCBB]
-            + Op.PUSH15[0xE8D3FB88DD42D06D445B5EAB34CB5D]
-            + Op.PUSH5[0x408CF652FD]
-            + Op.PUSH22[0x68ACAA81B573F66FA8781E83185438E42796631AE9A9]
-            + Op.SWAP9
-            + Op.LOG4(
-                offset=0xB52EFE,
-                size=0xF1,
-                topic_1=0x85A2C56B21A53C0E612AE0A8D78D,
-                topic_2=0x9A5213C33778AF679417D77733645F87B6042BE92C553DBB,
-                topic_3=0x6F9F495B0AC9E37FBE5F23014C68D8D032BFAE,
-                topic_4=0x714D986F94FC6354921A9367BB6B9E555F24107CB814557F8BD87547AD612C3E,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x94198CDB286CD2F21F06659320130750E7AA2C83CEB28015,
-                value=0xEBB0472B3E,
-            )
-            + Op.PUSH25[0x5C9F02455252560846587006E90CBFFC955445D9EF1F55EEB0]
-            + Op.PUSH17[0x11C02CEE02DF12DC35B36702539873E4B7]
-            + Op.PUSH7[0xE4AE9E829A4424]
-            + Op.PUSH1[0xDD]
-            + Op.PUSH32[
-                0x845CD37DC08F93BEF98A4D5B53ECD4CF4DD1A5C416F92116160F0FB673C30B78  # noqa: E501
-            ]
-            + Op.PUSH20[0xB85A2FF6331A5D371F3D109F5794D712E03493B1]
-            + Op.PUSH32[
-                0xC562AC7589411127E654CE32D273F8300CC8544E7BD782AA7828B543958DADF8  # noqa: E501
-            ]
-            + Op.PUSH19[0xD7F13401A51B13835CC8A36BE87CC7347CDF0F]
-            + Op.PUSH27[
-                0xA2DF420BB03E925C117D4BEFBC7E69472FD75F01F3F6C966DE8181
-            ]
-            + Op.PUSH21[0xABA3B7A43014C3DD39414FB3D239D72E06852AE48E]
-            + Op.PUSH3[0x3C60A]
-            + Op.PUSH31[
-                0x844D6FD61C5B519D43780D383D103989F9BFCE5ED122804CBA183C188F5CE4  # noqa: E501
-            ]
-            + Op.PUSH29[
-                0x348A96973ECA904F096AED4FB77D40CA9139447527F267A028EAE5E370
-            ]
-            + Op.PUSH15[0x1975FC3E38327505E81D0E8C9FAB1F]
-            + Op.PUSH1[0xEC]
-            + Op.PUSH31[
-                0xCE71CC87510F308984EBDCB8AB84E1905DFDC0A19EE3C5F37E88DC3A9F2649  # noqa: E501
-            ]
-            + Op.PUSH29[
-                0x51427DA28F6D777D9585B4EC790722BACAA179B1DC5B086D945623F9D2
-            ]
-            + Op.SWAP16
-            + Op.CALL(
-                gas=0x1AC754FA,
-                address=0x1A819DD2E8CEC87D7E886DF4843E21775F6672A4,
-                value=0x4F4421EB,
-                args_offset=0x19,
-                args_size=0x9,
-                ret_offset=0xC,
-                ret_size=0x13,
-            )
-            + Op.PUSH22[0x6F9CC63229E7FE309B7A2F1ACF074A43AA4DD2B75BF]
-            + Op.PUSH14[0xADF21AADB9A3E239A9592F576C92]
-            + Op.PUSH6[0xEEBD2420E262]
-            + Op.PUSH14[0x2B2F1F7EE7A56725D7D4FE23DA45]
-            + Op.PUSH19[0x5E8B709D2976703147EF66A8FC9A6C1225DF7B]
-            + Op.PUSH26[0xEEC95DDDA5E91C6E19BBC55BAF9D6C440CC805F0D229738D17A7]
-            + Op.PUSH16[0x95E329F94D5BC48CC5964933F9597FB5]
-            + Op.PUSH27[
-                0x6F7290649722D68A72FA2D081C4547943B3BBCA2EDC5F4032C5C91
-            ]
-            + Op.PUSH15[0x585FA6ABD1B209E2B6FB64498A37B9]
-            + Op.PUSH26[0x6C95DA3FDB8013C13EF99ED49B29282AE55458C651FDB8598B52]
-            + Op.PUSH17[0x24D2DA1E8A7015F65EE4AB0178B68AB8C8]
-            + Op.PUSH24[0xD55F3C89A7F1F7BC6C0D86BC69688CBCC252972693993BF7]
-            + Op.PUSH7[0xAAC4EFB2B65B21]
-            + Op.PUSH13[0xCA2E721DEA3F3B3DF3ABBBFB7B]
-            + Op.DUP14
-        ),
-        nonce=0,
-        address=Address("0x1a819dd2e8cec87d7e886df4843e21775f6672a4"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6bd243dbcfdc6982733e4cd6261574fc6cdec93282ff50ef24d8be05d58be29301ddb00d7547f6b65997e73d232b76d6484c11eb15c87b01f89e2779c427711ba193e4e163967efd1b9315187c3227f67b9282fc7524692fbf851cb370d396d53f7a86353aacecc5c1eadeddbb3925522f935fc5ed03568fbf40261c056a124f1334cc9fa8eea2bdbf68f04c10cc08b6babcbb6ee8d3fb88dd42d06d445b5eab34cb5d64408cf652fd7568acaa81b573f66fa8781e83185438e42796631ae9a9987f714d986f94fc6354921a9367bb6b9e555f24107cb814557f8bd87547ad612c3e726f9f495b0ac9e37fbe5f23014c68d8d032bfae779a5213c33778af679417d77733645f87b6042be92c553dbb6d85a2c56b21a53c0e612ae0a8d78d60f162b52efea464ebb0472b3e7794198cdb286cd2f21f06659320130750e7aa2c83ceb2801555785c9f02455252560846587006e90cbffc955445d9ef1f55eeb07011c02cee02df12dc35b36702539873e4b766e4ae9e829a442460dd7f845cd37dc08f93bef98a4d5b53ecd4cf4dd1a5c416f92116160f0fb673c30b7873b85a2ff6331a5d371f3d109f5794d712e03493b17fc562ac7589411127e654ce32d273f8300cc8544e7bd782aa7828b543958dadf872d7f13401a51b13835cc8a36be87cc7347cdf0f7aa2df420bb03e925c117d4befbc7e69472fd75f01f3f6c966de818174aba3b7a43014c3dd39414fb3d239d72e06852ae48e6203c60a7e844d6fd61c5b519d43780d383d103989f9bfce5ed122804cba183c188f5ce47c348a96973eca904f096aed4fb77d40ca9139447527f267a028eae5e3706e1975fc3e38327505e81d0e8c9fab1f60ec7ece71cc87510f308984ebdcb8ab84e1905dfdc0a19ee3c5f37e88dc3a9f26497c51427da28f6d777d9585b4ec790722bacaa179b1dc5b086d945623f9d29f6013600c60096019634f4421eb73<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>631ac754faf17506f9cc63229e7fe309b7a2f1acf074a43aa4dd2b75bf6dadf21aadb9a3e239a9592f576c9265eebd2420e2626d2b2f1f7ee7a56725d7d4fe23da45725e8b709d2976703147ef66a8fc9a6c1225df7b79eec95ddda5e91c6e19bbc55baf9d6c440cc805f0d229738d17a76f95e329f94d5bc48cc5964933f9597fb57a6f7290649722d68a72fa2d081c4547943b3bbca2edc5f4032c5c916e585fa6abd1b209e2b6fb64498a37b9796c95da3fdb8013c13ef99ed49b29282ae55458c651fdb8598b527024d2da1e8a7015f65ee4ab0178b68ab8c877d55f3c89a7f1f7bc6c0d86bc69688cbcc252972693993bf766aac4efb2b65b216cca2e721dea3f3b3df3abbbfb7b8d  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.ISZERO(0xD243DBCFDC6982733E4CD626)
+        + Op.PUSH21[0xFC6CDEC93282FF50EF24D8BE05D58BE29301DDB00D]
+        + Op.PUSH22[0x47F6B65997E73D232B76D6484C11EB15C87B01F89E27]
+        + Op.PUSH26[0xC427711BA193E4E163967EFD1B9315187C3227F67B9282FC7524]
+        + Op.PUSH10[0x2FBF851CB370D396D53F]
+        + Op.PUSH27[0x86353AACECC5C1EADEDDBB3925522F935FC5ED03568FBF40261C05]
+        + Op.PUSH11[0x124F1334CC9FA8EEA2BDBF]
+        + Op.PUSH9[0xF04C10CC08B6BABCBB]
+        + Op.PUSH15[0xE8D3FB88DD42D06D445B5EAB34CB5D]
+        + Op.PUSH5[0x408CF652FD]
+        + Op.PUSH22[0x68ACAA81B573F66FA8781E83185438E42796631AE9A9]
+        + Op.SWAP9
+        + Op.LOG4(
+            offset=0xB52EFE,
+            size=0xF1,
+            topic_1=0x85A2C56B21A53C0E612AE0A8D78D,
+            topic_2=0x9A5213C33778AF679417D77733645F87B6042BE92C553DBB,
+            topic_3=0x6F9F495B0AC9E37FBE5F23014C68D8D032BFAE,
+            topic_4=0x714D986F94FC6354921A9367BB6B9E555F24107CB814557F8BD87547AD612C3E,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x94198CDB286CD2F21F06659320130750E7AA2C83CEB28015,
+            value=0xEBB0472B3E,
+        )
+        + Op.PUSH25[0x5C9F02455252560846587006E90CBFFC955445D9EF1F55EEB0]
+        + Op.PUSH17[0x11C02CEE02DF12DC35B36702539873E4B7]
+        + Op.PUSH7[0xE4AE9E829A4424]
+        + Op.PUSH1[0xDD]
+        + Op.PUSH32[
+            0x845CD37DC08F93BEF98A4D5B53ECD4CF4DD1A5C416F92116160F0FB673C30B78
+        ]
+        + Op.PUSH20[0xB85A2FF6331A5D371F3D109F5794D712E03493B1]
+        + Op.PUSH32[
+            0xC562AC7589411127E654CE32D273F8300CC8544E7BD782AA7828B543958DADF8
+        ]
+        + Op.PUSH19[0xD7F13401A51B13835CC8A36BE87CC7347CDF0F]
+        + Op.PUSH27[0xA2DF420BB03E925C117D4BEFBC7E69472FD75F01F3F6C966DE8181]
+        + Op.PUSH21[0xABA3B7A43014C3DD39414FB3D239D72E06852AE48E]
+        + Op.PUSH3[0x3C60A]
+        + Op.PUSH31[
+            0x844D6FD61C5B519D43780D383D103989F9BFCE5ED122804CBA183C188F5CE4
+        ]
+        + Op.PUSH29[
+            0x348A96973ECA904F096AED4FB77D40CA9139447527F267A028EAE5E370
+        ]
+        + Op.PUSH15[0x1975FC3E38327505E81D0E8C9FAB1F]
+        + Op.PUSH1[0xEC]
+        + Op.PUSH31[
+            0xCE71CC87510F308984EBDCB8AB84E1905DFDC0A19EE3C5F37E88DC3A9F2649
+        ]
+        + Op.PUSH29[
+            0x51427DA28F6D777D9585B4EC790722BACAA179B1DC5B086D945623F9D2
+        ]
+        + Op.SWAP16
+        + Op.CALL(
+            gas=0x1AC754FA,
+            address=0x1A819DD2E8CEC87D7E886DF4843E21775F6672A4,
+            value=0x4F4421EB,
+            args_offset=0x19,
+            args_size=0x9,
+            ret_offset=0xC,
+            ret_size=0x13,
+        )
+        + Op.PUSH22[0x6F9CC63229E7FE309B7A2F1ACF074A43AA4DD2B75BF]
+        + Op.PUSH14[0xADF21AADB9A3E239A9592F576C92]
+        + Op.PUSH6[0xEEBD2420E262]
+        + Op.PUSH14[0x2B2F1F7EE7A56725D7D4FE23DA45]
+        + Op.PUSH19[0x5E8B709D2976703147EF66A8FC9A6C1225DF7B]
+        + Op.PUSH26[0xEEC95DDDA5E91C6E19BBC55BAF9D6C440CC805F0D229738D17A7]
+        + Op.PUSH16[0x95E329F94D5BC48CC5964933F9597FB5]
+        + Op.PUSH27[0x6F7290649722D68A72FA2D081C4547943B3BBCA2EDC5F4032C5C91]
+        + Op.PUSH15[0x585FA6ABD1B209E2B6FB64498A37B9]
+        + Op.PUSH26[0x6C95DA3FDB8013C13EF99ED49B29282AE55458C651FDB8598B52]
+        + Op.PUSH17[0x24D2DA1E8A7015F65EE4AB0178B68AB8C8]
+        + Op.PUSH24[0xD55F3C89A7F1F7BC6C0D86BC69688CBCC252972693993BF7]
+        + Op.PUSH7[0xAAC4EFB2B65B21]
+        + Op.PUSH13[0xCA2E721DEA3F3B3DF3ABBBFB7B]
+        + Op.DUP14,
+        nonce=0,
+        address=Address(0x1A819DD2E8CEC87D7E886DF4843E21775F6672A4),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7349d4fb4fa5c26263087f9f9885a7033ed1f85282806175626c7aff6e85d032f987501c"  # noqa: E501
-            "7f07e672602eea9a752c14f2fea044cbadb4acbbbece186bfae0ddfa5c3a4f602e867451"  # noqa: E501
-            "6e7ead3a1b9f0c321f53474588f38a996f7512fbdf364372a2f5b5329a5866cb8867c095"  # noqa: E501
-            "26eabd04524486650cba94b9d20e8079263be537932206f67f64915b81ac1ea4b1f3723b"  # noqa: E501
-            "aa86b2d9ad667f11ff36b05f0ec27d14051ce250c5c524eaa31472f153582c9aafa7a0b3"  # noqa: E501
-            "17230863944f1b5e7444ad06685190a6f9ff72b7af0f52a4619591d022037c3bd19aa01d"  # noqa: E501
-            "358a540c4ec6e43870dc653bab5c707f953b919477ed89448472e11b10e241ad82a32be0"  # noqa: E501
-            "2adf21cd183ae47f2776bce3701b75afea9a175cd04e616f3a1913f3be49294c5e633b4d"  # noqa: E501
-            "01cf719e06325d1f498e74d5a153c41ba83f49339f6d7f4711edfa5370e2ee9c7986401c"  # noqa: E501
-            "6b27b5cb4f46435c84c8f0239876415740df4646423c790ce1917c3e178e3f0117f07b8a"  # noqa: E501
-            "e37a6353868f7ca9313379cd727ae9732fb0a56da2b8a4cb682eb38ca47df0353f6b9322"  # noqa: E501
-            "ac474740ac5b14488677765f48677e720ed20e2c76b94ca77acdd3e9e54f2230a0c2d120"  # noqa: E501
-            "3130ebbf95aeb6212d52393d33efa63f79c2feba7168b770a3cd3fa97b8b515fd38a1995"  # noqa: E501
-            "8fccde6ec198be7d2f780422a69c9047ab7474d8f1c3272b9836bca4050a856a916e9bb3"  # noqa: E501
-            "0724727d1ba26058199098d65ad54d5580e51dcb2bd077db415b0ff41457c68f61d0f86d"  # noqa: E501
-            "8c4c549388abf78a75cc9163016c7e988e60e97b95f1d253b52168cbb01407c8ebca87f9"  # noqa: E501
-            "50ca4049e12ac76cbe3e374065a3c7703bcd5f7af279a1c12425c93ef8e74a12b699f4a9"  # noqa: E501
-            "c651db15561be1d91ca95575636dad39636bea70b5309b3354a73bb1b83ba72ff63f6918"  # noqa: E501
-            "2888e8f17d3e1ec0367173eb3831614e653fc63989af65bc9b676645638915ede2603666"  # noqa: E501
-            "ccff0c03af0fda7ad7b7e846076158daad3df7ad07e1cfe8ce41757c4d77f02d65bee264"  # noqa: E501
-            "fe0a98374a61532e797167af5719a427a267234fa27697f1a3f47a1453ea150821da1c66"  # noqa: E501
-            "5de7878ac0e5e26fc78911427cc1d8d0b029ee09bf9322446635d50de718ecb79f"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7349d4fb4fa5c26263087f9f9885a7033ed1f85282806175626c7aff6e85d032f987501c7f07e672602eea9a752c14f2fea044cbadb4acbbbece186bfae0ddfa5c3a4f602e8674516e7ead3a1b9f0c321f53474588f38a996f7512fbdf364372a2f5b5329a5866cb8867c09526eabd04524486650cba94b9d20e8079263be537932206f67f64915b81ac1ea4b1f3723baa86b2d9ad667f11ff36b05f0ec27d14051ce250c5c524eaa31472f153582c9aafa7a0b317230863944f1b5e7444ad06685190a6f9ff72b7af0f52a4619591d022037c3bd19aa01d358a540c4ec6e43870dc653bab5c707f953b919477ed89448472e11b10e241ad82a32be02adf21cd183ae47f2776bce3701b75afea9a175cd04e616f3a1913f3be49294c5e633b4d01cf719e06325d1f498e74d5a153c41ba83f49339f6d7f4711edfa5370e2ee9c7986401c6b27b5cb4f46435c84c8f0239876415740df4646423c790ce1917c3e178e3f0117f07b8ae37a6353868f7ca9313379cd727ae9732fb0a56da2b8a4cb682eb38ca47df0353f6b9322ac474740ac5b14488677765f48677e720ed20e2c76b94ca77acdd3e9e54f2230a0c2d1203130ebbf95aeb6212d52393d33efa63f79c2feba7168b770a3cd3fa97b8b515fd38a19958fccde6ec198be7d2f780422a69c9047ab7474d8f1c3272b9836bca4050a856a916e9bb30724727d1ba26058199098d65ad54d5580e51dcb2bd077db415b0ff41457c68f61d0f86d8c4c549388abf78a75cc9163016c7e988e60e97b95f1d253b52168cbb01407c8ebca87f950ca4049e12ac76cbe3e374065a3c7703bcd5f7af279a1c12425c93ef8e74a12b699f4a9c651db15561be1d91ca95575636dad39636bea70b5309b3354a73bb1b83ba72ff63f69182888e8f17d3e1ec0367173eb3831614e653fc63989af65bc9b676645638915ede2603666ccff0c03af0fda7ad7b7e846076158daad3df7ad07e1cfe8ce41757c4d77f02d65bee264fe0a98374a61532e797167af5719a427a267234fa27697f1a3f47a1453ea150821da1c665de7878ac0e5e26fc78911427cc1d8d0b029ee09bf9322446635d50de718ecb79f"  # noqa: E501
         ),
         gas_limit=824267821,
-        value=1958828689,
+        value=0x74C15A91,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x94198CDB286CD2F21F06659320130750E7AA2C83CEB28015: 0xEBB0472B3E,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest499.py b/tests/ported_static/stRandom2/test_random_statetest499.py
index ae158835853..ef12fccaec7 100644
--- a/tests/ported_static/stRandom2/test_random_statetest499.py
+++ b/tests/ported_static/stRandom2/test_random_statetest499.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest499.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest499Filler.json
+state_tests/stRandom2/randomStatetest499Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest499Filler.json"],
+    ["state_tests/stRandom2/randomStatetest499Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest499(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest499."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,68 +43,60 @@ def test_random_statetest499(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.CODECOPY(
-                dest_offset=Op.PUSH32[0x0],
-                offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SWAP16
-            + Op.DUP7
-            + Op.SWAP11
-            + Op.SELFDESTRUCT
-            + Op.EXTCODESIZE
-            + Op.MOD
-            + Op.CALLER
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.CODESIZE)
-        ),
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000399f869aff3b06333860005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350]
+        + Op.CODECOPY(
+            dest_offset=Op.PUSH32[0x0],
+            offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SWAP16
+        + Op.DUP7
+        + Op.SWAP11
+        + Op.SELFDESTRUCT
+        + Op.EXTCODESIZE
+        + Op.MOD
+        + Op.CALLER
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.CODESIZE),
         nonce=0,
-        address=Address("0x3e92e47a39045fb9403ee960c8567d343dd24997"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000"  # noqa: E501
-            "0000000000000000000000000000007f0000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000399f869aff3b063338"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000399f869aff3b063338"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2058040485,
+        value=0x7AAB34A5,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest500.py b/tests/ported_static/stRandom2/test_random_statetest500.py
index 45136463f20..6033b4afb37 100644
--- a/tests/ported_static/stRandom2/test_random_statetest500.py
+++ b/tests/ported_static/stRandom2/test_random_statetest500.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest500.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest500Filler.json
+state_tests/stRandom2/randomStatetest500Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest500Filler.json"],
+    ["state_tests/stRandom2/randomStatetest500Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest500(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest500."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,64 +47,59 @@ def test_random_statetest500(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.DUP2
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x87196584968A97046C67919931148255,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f87196584968a97046c6791993114825560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.DUP2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x87196584968A97046C67919931148255
         ),
         nonce=0,
-        address=Address("0x869efa3f6679d21d5a02396162d019dc6646b502"),  # noqa: E501
+        address=Address(0x869EFA3F6679D21D5A02396162D019DC6646B502),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff817fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff6f87196584968a97046c679199311482"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f87196584968a97046c679199311482"  # noqa: E501
         ),
         gas_limit=100000,
-        value=34424143,
+        value=0x20D454F,
     )
 
     post = {
-        contract: Account(storage={0: 0x87196584968A97046C67919931148255}),
+        target: Account(
+            storage={0: 0x87196584968A97046C67919931148255},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest501.py b/tests/ported_static/stRandom2/test_random_statetest501.py
index e5c191c058c..a33fb39f1db 100644
--- a/tests/ported_static/stRandom2/test_random_statetest501.py
+++ b/tests/ported_static/stRandom2/test_random_statetest501.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest501.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest501Filler.json
+state_tests/stRandom2/randomStatetest501Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest501Filler.json"],
+    ["state_tests/stRandom2/randomStatetest501Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest501(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest501."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,76 +47,69 @@ def test_random_statetest501(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff095560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MULMOD(
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+            value=Op.PUSH32[0xC350],
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x8DCBDF86469AD8B7711977CE5C41CFAC654EA87A),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MULMOD(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-                value=Op.PUSH32[0xC350],
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x8dcbdf86469ad8b7711977ce5c41cfac654ea87a"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff0955"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0955"  # noqa: E501
         ),
         gas_limit=100000,
-        value=156676500,
+        value=0x956B194,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
                 0xFFFFFFFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000000: 50000,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest502.py b/tests/ported_static/stRandom2/test_random_statetest502.py
index 8bbc58876a8..9e1ab6746df 100644
--- a/tests/ported_static/stRandom2/test_random_statetest502.py
+++ b/tests/ported_static/stRandom2/test_random_statetest502.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest502.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest502Filler.json
+state_tests/stRandom2/randomStatetest502Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest502Filler.json"],
+    ["state_tests/stRandom2/randomStatetest502Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest502(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest502."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,66 +47,61 @@ def test_random_statetest502(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.DUP1
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.SSTORE(
-                key=0xB59C66369A85A46DA1821861586378600051,
-                value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c350807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b59c66369a85a46da182186158637860005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.DUP1
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.SSTORE(
+            key=0xB59C66369A85A46DA1821861586378600051,
+            value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c350807fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507f00000000000000000000"  # noqa: E501
-            "0000945304eb96065b2a98b57a48a06ae28d285a71b57e7f000000000000000000000000"  # noqa: E501
-            "945304eb96065b2a98b57a48a06ae28d285a71b59c66369a85a46da1821861586378"  # noqa: E501
+        to=contract_0,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c350807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b59c66369a85a46da1821861586378"  # noqa: E501
         ),
         gas_limit=100000,
-        value=345377880,
+        value=0x14960C58,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0xB59C66369A85A46DA1821861586378600051: 0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest503.py b/tests/ported_static/stRandom2/test_random_statetest503.py
index f6dc3de0d31..5a92ce9d5c8 100644
--- a/tests/ported_static/stRandom2/test_random_statetest503.py
+++ b/tests/ported_static/stRandom2/test_random_statetest503.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest503.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest503Filler.json
+state_tests/stRandom2/randomStatetest503Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest503Filler.json"],
+    ["state_tests/stRandom2/randomStatetest503Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest503(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest503."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,57 @@ def test_random_statetest503(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f0886a83c66553c9889528d8f1294ff5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350] * 2
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x886A83C66553C9889528D8F1294FF55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xDE66163071CCA81175C48E89C536F856AE404946),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x886A83C66553C9889528D8F1294FF55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xde66163071cca81175c48e89c536f856ae404946"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000007fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507f0000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000006f0886a83c66553c9889528d8f1294ff"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f0886a83c66553c9889528d8f1294ff"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2071462314,
+        value=0x7B7801AA,
     )
 
     post = {
-        contract: Account(storage={0: 0x886A83C66553C9889528D8F1294FF55}),
+        target: Account(
+            storage={0: 0x886A83C66553C9889528D8F1294FF55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest504.py b/tests/ported_static/stRandom2/test_random_statetest504.py
index a1a42c94fe4..6fed29c3e1c 100644
--- a/tests/ported_static/stRandom2/test_random_statetest504.py
+++ b/tests/ported_static/stRandom2/test_random_statetest504.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest504.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest504Filler.json
+state_tests/stRandom2/randomStatetest504Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest504Filler.json"],
+    ["state_tests/stRandom2/randomStatetest504Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest504(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest504."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,45 @@ def test_random_statetest504(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000001e37f000000000000000000"  # noqa: E501
-            "0000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000c35001589a84106d9c60005155"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x2505f255caec67dd060d15a5d7a77efb5612b8b2"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f0000000000000000000000000000000000000000000000000000000000000001e37f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c35001589a84106d9c60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f0000000000000000000000000000000000000000000000000000000000000001e37f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c35001589a84106d9c60005155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000001e37f000000000000000000"  # noqa: E501
-            "0000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000c35001589a84106d9c"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f0000000000000000000000000000000000000000000000000000000000000001e37f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c35001589a84106d9c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1095126158,
+        value=0x41464C8E,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest505.py b/tests/ported_static/stRandom2/test_random_statetest505.py
index 16216d36de8..7b8c09a831b 100644
--- a/tests/ported_static/stRandom2/test_random_statetest505.py
+++ b/tests/ported_static/stRandom2/test_random_statetest505.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest505.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest505Filler.json
+state_tests/stRandom2/randomStatetest505Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest505Filler.json"],
+    ["state_tests/stRandom2/randomStatetest505Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest505(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest505."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,61 @@ def test_random_statetest505(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f44a06f550371317376738c539984375560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.GASLIMIT
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x44A06F550371317376738C5399843755
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x7AA0FC7F8AA86925083A8FE4388167A152409E49),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.GASLIMIT
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x44A06F550371317376738C5399843755,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x7aa0fc7f8aa86925083a8fe4388167a152409e49"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000017f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000007fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe457f000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000007f000000000000000000000001"  # noqa: E501
-            "00000000000000000000000000000000000000006f44a06f550371317376738c53998437"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f44a06f550371317376738c53998437"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1075033443,
+        value=0x4013B563,
     )
 
     post = {
-        contract: Account(storage={0: 0x44A06F550371317376738C5399843755}),
+        target: Account(
+            storage={0: 0x44A06F550371317376738C5399843755},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest506.py b/tests/ported_static/stRandom2/test_random_statetest506.py
index c16299db33e..f80b3b175e9 100644
--- a/tests/ported_static/stRandom2/test_random_statetest506.py
+++ b/tests/ported_static/stRandom2/test_random_statetest506.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest506.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest506Filler.json
+state_tests/stRandom2/randomStatetest506Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest506Filler.json"],
+    ["state_tests/stRandom2/randomStatetest506Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest506(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest506."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,63 @@ def test_random_statetest506(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.CALLDATACOPY(
-                dest_offset=Op.TIMESTAMP,
-                offset=Op.PUSH32[0x0],
-                size=Op.PUSH32[0xC350],
-            )
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0), value=0xA218F370862059149E3CFF20
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000000042377f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006ba218f370862059149e3cff2060005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.CALLDATACOPY(
+            dest_offset=Op.TIMESTAMP,
+            offset=Op.PUSH32[0x0],
+            size=Op.PUSH32[0xC350],
+        )
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0xA218F370862059149E3CFF20
         ),
         nonce=0,
-        address=Address("0xf1812415dd5cf70796f6ff36f7be5bd8acd52a9b"),  # noqa: E501
+        address=Address(0xF1812415DD5CF70796F6FF36F7BE5BD8ACD52A9B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000042377f000000000000000000"  # noqa: E501
-            "000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001"  # noqa: E501
-            "00000000000000000000000000000000000000006ba218f370862059149e3cff20"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000000042377f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006ba218f370862059149e3cff20"  # noqa: E501
         ),
         gas_limit=100000,
-        value=947509958,
+        value=0x3879DAC6,
     )
 
     post = {
-        contract: Account(storage={0: 0xA218F370862059149E3CFF20}),
+        target: Account(
+            storage={
+                0: 0xA218F370862059149E3CFF20,
+                0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 0,  # noqa: E501
+            },
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest507.py b/tests/ported_static/stRandom2/test_random_statetest507.py
index 38e723e3524..a2b16f06bd5 100644
--- a/tests/ported_static/stRandom2/test_random_statetest507.py
+++ b/tests/ported_static/stRandom2/test_random_statetest507.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest507.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest507Filler.json
+state_tests/stRandom2/randomStatetest507Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest507Filler.json"],
+    ["state_tests/stRandom2/randomStatetest507Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,8 +32,8 @@ def test_random_statetest507(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest507."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -47,62 +48,58 @@ def test_random_statetest507(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GAS
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.ORIGIN
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x99A4527612A199A06D1A348B02563A9B,
-            )
+    # Source: raw
+    # 0x5a7f0000000000000000000000010000000000000000000000000000000000000000327f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f99a4527612a199a06d1a348b02563a9b60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.GAS
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.ORIGIN
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x99A4527612A199A06D1A348B02563A9B
         ),
         nonce=0,
-        address=Address("0xda04e91dae336f3095911ce42a208d591605593e"),  # noqa: E501
+        address=Address(0xDA04E91DAE336F3095911CE42A208D591605593E),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "5a7f0000000000000000000000010000000000000000000000000000000000000000327f"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000017f000000"  # noqa: E501
-            "000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000"  # noqa: E501
-            "0000004f3f701464972e74606d6ea82d4d3080599a0e796f99a4527612a199a06d1a348b"  # noqa: E501
-            "02563a9b"
+        to=target,
+        data=Bytes(
+            "5a7f0000000000000000000000010000000000000000000000000000000000000000327f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f99a4527612a199a06d1a348b02563a9b"  # noqa: E501
         ),
         gas_limit=1868758461,
-        value=696746762,
+        value=0x2987830A,
     )
 
     post = {
-        contract: Account(storage={0: 0x99A4527612A199A06D1A348B02563A9B}),
+        target: Account(
+            storage={0: 0x99A4527612A199A06D1A348B02563A9B},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest508.py b/tests/ported_static/stRandom2/test_random_statetest508.py
index aefe7d54094..526b840b681 100644
--- a/tests/ported_static/stRandom2/test_random_statetest508.py
+++ b/tests/ported_static/stRandom2/test_random_statetest508.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest508.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest508Filler.json
+state_tests/stRandom2/randomStatetest508Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest508Filler.json"],
+    ["state_tests/stRandom2/randomStatetest508Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest508(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest508."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,40 +47,43 @@ def test_random_statetest508(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x41414444424143448231537241317f55
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex("41414444424143448231537241317f55"),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x803d872dc9ff2fb294aedd7722eec3c197776ebc"),  # noqa: E501
+        address=Address(0x803D872DC9FF2FB294AEDD7722EEC3C197776EBC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
+        ),
+        balance=46,
+        nonce=0,
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0xDE0B6B3A76586A0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest509.py b/tests/ported_static/stRandom2/test_random_statetest509.py
index 7a34bac808d..ddc305bab70 100644
--- a/tests/ported_static/stRandom2/test_random_statetest509.py
+++ b/tests/ported_static/stRandom2/test_random_statetest509.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest509.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest509Filler.json
+state_tests/stRandom2/randomStatetest509Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest509Filler.json"],
+    ["state_tests/stRandom2/randomStatetest509Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest509(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest509."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,105 +43,47 @@ def test_random_statetest509(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x4542
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.GASLIMIT + Op.TIMESTAMP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbe28cde0901eda46d09a636150c7577a6cba7d0f"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
-        gas_limit=400000,
-        value=100000,
     )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest509Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest509_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=Op.GASLIMIT + Op.TIMESTAMP,
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xbe28cde0901eda46d09a636150c7577a6cba7d0f"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={},
+            code=bytes.fromhex("4542"),
+            balance=0xDE0B6B3A76586A0,
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest510.py b/tests/ported_static/stRandom2/test_random_statetest510.py
index 5bd03bf4768..38e7ac14b97 100644
--- a/tests/ported_static/stRandom2/test_random_statetest510.py
+++ b/tests/ported_static/stRandom2/test_random_statetest510.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest510.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest510Filler.json
+state_tests/stRandom2/randomStatetest510Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest510Filler.json"],
+    ["state_tests/stRandom2/randomStatetest510Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,8 +32,8 @@ def test_random_statetest510(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest510."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -47,61 +48,57 @@ def test_random_statetest510(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PREVRANDAO
-            + Op.PUSH32[0x0]
-            + Op.GAS
-            + Op.GASLIMIT
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0xF23A88535564545969F162615B933255,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>447f00000000000000000000000000000000000000000000000000000000000000005a456ff23a88535564545969f162615b93325560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PREVRANDAO
+        + Op.PUSH32[0x0]
+        + Op.GAS
+        + Op.GASLIMIT
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0xF23A88535564545969F162615B933255
         ),
         nonce=0,
-        address=Address("0xabdd1dd76e15ae75ff51bd7f2b12571004cdd8ba"),  # noqa: E501
+        address=Address(0xABDD1DD76E15AE75FF51BD7F2B12571004CDD8BA),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "0000000000000100000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e79447f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000005a456ff23a88535564545969f162"  # noqa: E501
-            "615b9332"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79447f00000000000000000000000000000000000000000000000000000000000000005a456ff23a88535564545969f162615b9332"  # noqa: E501
         ),
         gas_limit=1442721045,
-        value=1913364794,
+        value=0x720BA13A,
     )
 
     post = {
-        contract: Account(storage={0: 0xF23A88535564545969F162615B933255}),
+        target: Account(
+            storage={0: 0xF23A88535564545969F162615B933255},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest511.py b/tests/ported_static/stRandom2/test_random_statetest511.py
index 92b98e88b13..41a7c01c3d0 100644
--- a/tests/ported_static/stRandom2/test_random_statetest511.py
+++ b/tests/ported_static/stRandom2/test_random_statetest511.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest511.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest511Filler.json
+state_tests/stRandom2/randomStatetest511Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest511Filler.json"],
+    ["state_tests/stRandom2/randomStatetest511Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest511(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest511."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,62 +47,58 @@ def test_random_statetest511(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.COINBASE
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x6A52027F41F267453843630A66444145,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff416f6a52027f41f267453843630a6644414560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.COINBASE
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x6A52027F41F267453843630A66444145
         ),
         nonce=0,
-        address=Address("0x5918a547a35780bd0961433f6b0a8ab1158e16f2"),  # noqa: E501
+        address=Address(0x5918A547A35780BD0961433F6B0A8AB1158E16F2),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff416f6a52027f41f267453843630a66444145"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff416f6a52027f41f267453843630a66444145"  # noqa: E501
         ),
         gas_limit=100000,
-        value=462006051,
+        value=0x1B89A723,
     )
 
     post = {
-        contract: Account(storage={0: 0x6A52027F41F267453843630A66444145}),
+        target: Account(
+            storage={0: 0x6A52027F41F267453843630A66444145},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest512.py b/tests/ported_static/stRandom2/test_random_statetest512.py
index 05cae7fec6f..f870798e489 100644
--- a/tests/ported_static/stRandom2/test_random_statetest512.py
+++ b/tests/ported_static/stRandom2/test_random_statetest512.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest512.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest512Filler.json
+state_tests/stRandom2/randomStatetest512Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest512Filler.json"],
+    ["state_tests/stRandom2/randomStatetest512Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest512(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest512."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,68 +47,61 @@ def test_random_statetest512(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.NUMBER
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x3B5BFF40567097749951500263449255,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b5bff4056709774995150026344925560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350]
+        + Op.NUMBER
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x3B5BFF40567097749951500263449255
         ),
         nonce=0,
-        address=Address("0xe3cc9753fc23e1570c7cde7b9c7d2253ce100254"),  # noqa: E501
+        address=Address(0xE3CC9753FC23E1570C7CDE7B9C7D2253CE100254),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000007f0000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000c350437fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff6f3b5bff405670977499515002634492"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b5bff405670977499515002634492"  # noqa: E501
         ),
         gas_limit=100000,
-        value=871411208,
+        value=0x33F0AE08,
     )
 
     post = {
-        contract: Account(storage={0: 0x3B5BFF40567097749951500263449255}),
+        target: Account(
+            storage={0: 0x3B5BFF40567097749951500263449255},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest513.py b/tests/ported_static/stRandom2/test_random_statetest513.py
index 295709bc716..fb1baafd951 100644
--- a/tests/ported_static/stRandom2/test_random_statetest513.py
+++ b/tests/ported_static/stRandom2/test_random_statetest513.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest513.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest513Filler.json
+state_tests/stRandom2/randomStatetest513Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest513Filler.json"],
+    ["state_tests/stRandom2/randomStatetest513Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest513(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest513."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,45 @@ def test_random_statetest513(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001982046817382a13afa3760088d55  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001982046817382a13afa3760088d55"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff3b437fffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000001982046817382a13afa3760088d55"  # noqa: E501
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x7254b47942e53d7beb2e156f9239a7690af65736"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff3b437fffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000001982046817382a13afa3760088d"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001982046817382a13afa3760088d"  # noqa: E501
         ),
         gas_limit=100000,
-        value=406473464,
+        value=0x183A4AF8,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest514.py b/tests/ported_static/stRandom2/test_random_statetest514.py
index 80d3e2d01c1..dd6bb60d822 100644
--- a/tests/ported_static/stRandom2/test_random_statetest514.py
+++ b/tests/ported_static/stRandom2/test_random_statetest514.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest514.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest514Filler.json
+state_tests/stRandom2/randomStatetest514Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest514Filler.json"],
+    ["state_tests/stRandom2/randomStatetest514Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest514(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest514."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,57 @@ def test_random_statetest514(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44447f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506c8ea356796d65546d3883768f5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PREVRANDAO * 2
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x8EA356796D65546D3883768F55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xBE3897120C02CF547BD00C022D454CF657A04217),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PREVRANDAO
-            + Op.PREVRANDAO
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x8EA356796D65546D3883768F55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xbe3897120c02cf547bd00c022d454cf657a04217"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44447f"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000c3507f000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000017fffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000c3506c8ea356796d65546d3883768f"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44447f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506c8ea356796d65546d3883768f"  # noqa: E501
         ),
         gas_limit=100000,
-        value=274563245,
+        value=0x105D80AD,
     )
 
     post = {
-        contract: Account(storage={0: 0x8EA356796D65546D3883768F55}),
+        target: Account(storage={0: 0x8EA356796D65546D3883768F55}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest516.py b/tests/ported_static/stRandom2/test_random_statetest516.py
index d73fe50f722..12d4b1a5f6f 100644
--- a/tests/ported_static/stRandom2/test_random_statetest516.py
+++ b/tests/ported_static/stRandom2/test_random_statetest516.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest516.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest516Filler.json
+state_tests/stRandom2/randomStatetest516Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest516Filler.json"],
+    ["state_tests/stRandom2/randomStatetest516Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest516(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest516."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,76 +46,69 @@ def test_random_statetest516(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MULMOD(
-                    0x32787358019B3918686194,
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6a32787358019b39186861940960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MULMOD(
+                0x32787358019B3918686194,
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
         nonce=0,
-        address=Address("0x1853a343dcc27331d135d00368c976e01a147522"),  # noqa: E501
+        address=Address(0x1853A343DCC27331D135D00368C976E01A147522),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000"  # noqa: E501
-            "0000000000000000000000000000000000007fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff6a32787358019b391868619409"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6a32787358019b391868619409"  # noqa: E501
         ),
         gas_limit=100000,
-        value=46630890,
+        value=0x2C787EA,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x32787358019B3918686193FFFFFFFFFFFFFFFFFFCD878CA7FE64C6E7979E6C,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest517.py b/tests/ported_static/stRandom2/test_random_statetest517.py
index c7c4d65ce9b..b0fb58a9a2e 100644
--- a/tests/ported_static/stRandom2/test_random_statetest517.py
+++ b/tests/ported_static/stRandom2/test_random_statetest517.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest517.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest517Filler.json
+state_tests/stRandom2/randomStatetest517Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest517Filler.json"],
+    ["state_tests/stRandom2/randomStatetest517Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest517(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest517."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,68 +46,63 @@ def test_random_statetest517(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.GASPRICE
-            + Op.PUSH16[0x450831A46A867F32569596F0099F7B8C]
-            + Op.SWAP2
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3a6f450831a46a867f32569596f0099f7b8c915560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.GASPRICE
+        + Op.PUSH16[0x450831A46A867F32569596F0099F7B8C]
+        + Op.SWAP2
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x0fe6decc565c9f9247255d874ddb1b4d613d2b47"),  # noqa: E501
+        address=Address(0x0FE6DECC565C9F9247255D874DDB1B4D613D2B47),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff3a6f450831a46a867f32569596f009"  # noqa: E501
-            "9f7b8c91"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3a6f450831a46a867f32569596f0099f7b8c91"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1922148943,
+        value=0x7291AA4F,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x450831A46A867F32569596F0099F7B8C,
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 10,
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest518.py b/tests/ported_static/stRandom2/test_random_statetest518.py
index b1c26b5e0ec..45a3b2ba671 100644
--- a/tests/ported_static/stRandom2/test_random_statetest518.py
+++ b/tests/ported_static/stRandom2/test_random_statetest518.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest518.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest518Filler.json
+state_tests/stRandom2/randomStatetest518Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest518Filler.json"],
+    ["state_tests/stRandom2/randomStatetest518Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest518(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest518."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,59 @@ def test_random_statetest518(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x3C589F416D947A5134F268515B6C9255,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x47e68acdbfc1ed42dca998d584eab31897f4d6a7"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f3c589f416d947a5134f268515b6c925560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x3C589F416D947A5134F268515B6C9255
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x47E68ACDBFC1ED42DCA998D584EAB31897F4D6A7),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000007f0000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000c3507f0000000000000000000000004f3f701464"  # noqa: E501
-            "972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff6f3c589f416d947a5134f268515b6c92"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f3c589f416d947a5134f268515b6c92"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1096593865,
+        value=0x415CB1C9,
     )
 
     post = {
-        contract: Account(storage={0: 0x3C589F416D947A5134F268515B6C9255}),
+        target: Account(
+            storage={0: 0x3C589F416D947A5134F268515B6C9255},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest519.py b/tests/ported_static/stRandom2/test_random_statetest519.py
index bd8f5f0a23f..6d76d819710 100644
--- a/tests/ported_static/stRandom2/test_random_statetest519.py
+++ b/tests/ported_static/stRandom2/test_random_statetest519.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest519.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest519Filler.json
+state_tests/stRandom2/randomStatetest519Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest519Filler.json"],
+    ["state_tests/stRandom2/randomStatetest519Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest519(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest519."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,60 +46,52 @@ def test_random_statetest519(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000001000000000000000000000000000000000000000009457f000000000000000000"  # noqa: E501
-            "00000100000000000000000000000000000000000000007f000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000c3501a02556b85a4531155"
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x085d89dcbf18eb3da2e46582049e75a78b4b3667"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000001000000000000000000000000000000000000000009457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3501a02556b85a4531155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000001000000000000000000000000000000000000000009457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3501a02556b85a4531155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x085D89DCBF18EB3DA2E46582049E75A78B4B3667),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000001000000000000000000000000000000000000000009457f000000000000000000"  # noqa: E501
-            "00000100000000000000000000000000000000000000007f000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000c3501a02556b85a45311"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000001000000000000000000000000000000000000000009457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3501a02556b85a45311"  # noqa: E501
         ),
         gas_limit=100000,
-        value=245898175,
+        value=0xEA81BBF,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest520.py b/tests/ported_static/stRandom2/test_random_statetest520.py
index 1bdcb1a225f..c51999e59c8 100644
--- a/tests/ported_static/stRandom2/test_random_statetest520.py
+++ b/tests/ported_static/stRandom2/test_random_statetest520.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest520.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest520Filler.json
+state_tests/stRandom2/randomStatetest520Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest520Filler.json"],
+    ["state_tests/stRandom2/randomStatetest520Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest520(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest520."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,78 +47,69 @@ def test_random_statetest520(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff19030860005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.ADDMOD(
+                Op.SUB(
+                    Op.NOT(
+                        Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+                    ),
+                    Op.PUSH32[0x1],
+                ),
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xCADE5765CAC2E02A18BC236E1F6AA68271F2F26C),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.ADDMOD(
-                    Op.SUB(
-                        Op.NOT(
-                            Op.PUSH32[
-                                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-                            ],
-                        ),
-                        Op.PUSH32[0x1],
-                    ),
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xcade5765cac2e02a18bc236e1f6aa68271f2f26c"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000017f000000000000000000000000ffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff190308"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff190308"  # noqa: E501
         ),
         gas_limit=100000,
-        value=333039523,
+        value=0x13D9C7A3,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000000,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest521.py b/tests/ported_static/stRandom2/test_random_statetest521.py
index 3d6d8cef42c..c361b820dab 100644
--- a/tests/ported_static/stRandom2/test_random_statetest521.py
+++ b/tests/ported_static/stRandom2/test_random_statetest521.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest521.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest521Filler.json
+state_tests/stRandom2/randomStatetest521Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest521Filler.json"],
+    ["state_tests/stRandom2/randomStatetest521Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest521(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest521."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,72 +47,65 @@ def test_random_statetest521(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.CALLER,
-                value=Op.MULMOD(
-                    0x73905597946A57769A6D92,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6a73905597946a57769a6d9209335560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.CALLER,
+            value=Op.MULMOD(
+                0x73905597946A57769A6D92,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x8f8604cf78869e976e9002b80cbff3995443ae17"),  # noqa: E501
+        address=Address(0x8F8604CF78869E976E9002B80CBFF3995443AE17),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017f0000000000000000000000010000"  # noqa: E501
-            "0000000000000000000000000000000000007fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe6a73905597946a57769a6d920933"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6a73905597946a57769a6d920933"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2095633379,
+        value=0x7CE8D3E3,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x10000000000000000000000000000000000000000,
                 0x2E3D0156D2B99A6EACBA540C55F423C8F5A33143: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8C6FAA686B95A88965926D,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest523.py b/tests/ported_static/stRandom2/test_random_statetest523.py
index 5f3581b087f..5873c25cd21 100644
--- a/tests/ported_static/stRandom2/test_random_statetest523.py
+++ b/tests/ported_static/stRandom2/test_random_statetest523.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest523.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest523Filler.json
+state_tests/stRandom2/randomStatetest523Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest523Filler.json"],
+    ["state_tests/stRandom2/randomStatetest523Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest523(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest523."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,58 +43,54 @@ def test_random_statetest523(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x417f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe4450427f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000003560080b348d5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.COINBASE
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.POP(Op.PREVRANDAO)
+        + Op.TIMESTAMP
+        + Op.PUSH32[0x1]
+        + Op.SIGNEXTEND(0x8, Op.CALLDATALOAD(offset=Op.PUSH32[0x0]))
+        + Op.SSTORE(key=Op.DUP14, value=Op.CALLVALUE)
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.COINBASE
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.POP(Op.PREVRANDAO)
-            + Op.TIMESTAMP
-            + Op.PUSH32[0x1]
-            + Op.SIGNEXTEND(0x8, Op.CALLDATALOAD(offset=Op.PUSH32[0x0]))
-            + Op.SSTORE(key=Op.DUP14, value=Op.CALLVALUE)
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x78e06dd6f641c103ceef456e564348a48a6f0bef"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "417f00000000000000000000000000000000000000000000000000000000000000017fff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe4450427f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000017f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000003560080b348d"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "417f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe4450427f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000003560080b348d"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1463926659,
+        value=0x5741BF83,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest524.py b/tests/ported_static/stRandom2/test_random_statetest524.py
index e8d2c49edf0..39bd39c5f56 100644
--- a/tests/ported_static/stRandom2/test_random_statetest524.py
+++ b/tests/ported_static/stRandom2/test_random_statetest524.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest524.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest524Filler.json
+state_tests/stRandom2/randomStatetest524Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest524Filler.json"],
+    ["state_tests/stRandom2/randomStatetest524Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest524(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest524."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,63 +43,58 @@ def test_random_statetest524(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff357f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000034208a340a9e5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.GASLIMIT
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.TIMESTAMP
+        + Op.CALLDATALOAD(
+            offset=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        )
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x0]
+        + Op.SHA3(offset=Op.CALLVALUE, size=Op.PUSH32[0x0])
+        + Op.EXP(Op.CALLVALUE, Op.DUP11)
+        + Op.SWAP15
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GASLIMIT
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.TIMESTAMP
-            + Op.CALLDATALOAD(
-                offset=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x0]
-            + Op.SHA3(offset=Op.CALLVALUE, size=Op.PUSH32[0x0])
-            + Op.EXP(Op.CALLVALUE, Op.DUP11)
-            + Op.SWAP15
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xaa56ee356b0dd8022ad49a794fb5a37c554b32aa"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f"  # noqa: E501
-            "000000000000000000000000ffffffffffffffffffffffffffffffffffffffff357f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000034208a340a9e"
+        to=target,
+        data=Bytes(
+            "457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff357f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000034208a340a9e"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1968091255,
+        value=0x754EB077,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest525.py b/tests/ported_static/stRandom2/test_random_statetest525.py
index 03c8e4bb864..7e84b7db303 100644
--- a/tests/ported_static/stRandom2/test_random_statetest525.py
+++ b/tests/ported_static/stRandom2/test_random_statetest525.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest525.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest525Filler.json
+state_tests/stRandom2/randomStatetest525Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest525Filler.json"],
+    ["state_tests/stRandom2/randomStatetest525Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest525(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest525."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,45 @@ def test_random_statetest525(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe02207160005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff097fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe02207160005155"
+            "7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe02207160005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x2a83e67b69429cfb983b8ed79b7e8a53e6824092"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff097fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe022071"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe022071"  # noqa: E501
         ),
         gas_limit=100000,
-        value=177899732,
+        value=0xA9A88D4,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest526.py b/tests/ported_static/stRandom2/test_random_statetest526.py
index ea771ac0e54..783e1d35401 100644
--- a/tests/ported_static/stRandom2/test_random_statetest526.py
+++ b/tests/ported_static/stRandom2/test_random_statetest526.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest526.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest526Filler.json
+state_tests/stRandom2/randomStatetest526Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest526Filler.json"],
+    ["state_tests/stRandom2/randomStatetest526Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest526(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest526."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,62 +47,57 @@ def test_random_statetest526(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.COINBASE
-            + Op.SSTORE(
-                key=0xB5419E01950777810975058C746F55600051,
-                value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5417e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5419e01950777810975058c746f5560005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000] * 2
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.COINBASE
+        + Op.SSTORE(
+            key=0xB5419E01950777810975058C746F55600051,
+            value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000945304eb96065b2a98b57a48a06ae28d285a71b5417e7f000000000000000000"  # noqa: E501
-            "000000945304eb96065b2a98b57a48a06ae28d285a71b5419e01950777810975058c746f"  # noqa: E501
+        to=contract_0,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5417e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5419e01950777810975058c746f"  # noqa: E501
         ),
         gas_limit=100000,
-        value=984138850,
+        value=0x3AA8C462,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0xB5419E01950777810975058C746F55600051: 0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest527.py b/tests/ported_static/stRandom2/test_random_statetest527.py
index a683cba1ca8..13bf5da4e70 100644
--- a/tests/ported_static/stRandom2/test_random_statetest527.py
+++ b/tests/ported_static/stRandom2/test_random_statetest527.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest527.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest527Filler.json
+state_tests/stRandom2/randomStatetest527Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest527Filler.json"],
+    ["state_tests/stRandom2/randomStatetest527Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest527(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest527."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,61 +43,55 @@ def test_random_statetest527(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLVALUE
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PREVRANDAO
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.LOG1(
-                offset=Op.DUP1,
-                size=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                topic_1=Op.PUSH32[0xC350],
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x490584e08e20ca97487089106b76679f5986d234"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x347f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff80a160005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLVALUE
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PREVRANDAO
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.LOG1(
+            offset=Op.DUP1,
+            size=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            topic_1=Op.PUSH32[0xC350],
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "347f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff447f"  # noqa: E501
-            "000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000017f000000000000"  # noqa: E501
-            "0000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000c3507f000000000000000000000000"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff80a1"
+        to=target,
+        data=Bytes(
+            "347f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff80a1"  # noqa: E501
         ),
         gas_limit=100000,
-        value=179309326,
+        value=0xAB00B0E,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest528.py b/tests/ported_static/stRandom2/test_random_statetest528.py
index 397b32d7498..fb7c2eed010 100644
--- a/tests/ported_static/stRandom2/test_random_statetest528.py
+++ b/tests/ported_static/stRandom2/test_random_statetest528.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest528.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest528Filler.json
+state_tests/stRandom2/randomStatetest528Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest528Filler.json"],
+    ["state_tests/stRandom2/randomStatetest528Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest528(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest528."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,68 +43,62 @@ def test_random_statetest528(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x457f000000000000000000000000000000000000000000000000000000000000c350397ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0a9d30390b8c858455  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.GASLIMIT
+        + Op.PUSH32[0xC350]
+        + Op.CODECOPY
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.EXP(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+        )
+        + Op.SWAP14
+        + Op.ADDRESS
+        + Op.CODECOPY
+        + Op.SIGNEXTEND
+        + Op.DUP13
+        + Op.SSTORE(key=Op.DUP5, value=Op.DUP6),
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GASLIMIT
-            + Op.PUSH32[0xC350]
-            + Op.CODECOPY
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.EXP(
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SWAP14
-            + Op.ADDRESS
-            + Op.CODECOPY
-            + Op.SIGNEXTEND
-            + Op.DUP13
-            + Op.SSTORE(key=Op.DUP5, value=Op.DUP6)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xe95bb71003200148e7e9559ec3ecf538802c42bf"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "457f000000000000000000000000000000000000000000000000000000000000c350397f"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000007fffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff0a9d30390b8c8584"
+        to=target,
+        data=Bytes(
+            "457f000000000000000000000000000000000000000000000000000000000000c350397ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0a9d30390b8c8584"  # noqa: E501
         ),
         gas_limit=100000,
-        value=532918830,
+        value=0x1FC3B22E,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest531.py b/tests/ported_static/stRandom2/test_random_statetest531.py
index af889a58c54..0b97e16c02a 100644
--- a/tests/ported_static/stRandom2/test_random_statetest531.py
+++ b/tests/ported_static/stRandom2/test_random_statetest531.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest531.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest531Filler.json
+state_tests/stRandom2/randomStatetest531Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest531Filler.json"],
+    ["state_tests/stRandom2/randomStatetest531Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest531(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest531."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,105 +43,42 @@ def test_random_statetest531(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x41414143434344456a12c140f3933655
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex("41414143434344456a12c140f3933655"),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x83c3fd438bec2a4bb605ae688641469341532d9f"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
-        gas_limit=400000,
-        value=100000,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest531Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest531_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
     )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex("41414143434344456a12c140f3933655"),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x83c3fd438bec2a4bb605ae688641469341532d9f"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0xDE0B6B3A76586A0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest532.py b/tests/ported_static/stRandom2/test_random_statetest532.py
index 75b89d0ecf5..a8750d93096 100644
--- a/tests/ported_static/stRandom2/test_random_statetest532.py
+++ b/tests/ported_static/stRandom2/test_random_statetest532.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest532.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest532Filler.json
+state_tests/stRandom2/randomStatetest532Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest532Filler.json"],
+    ["state_tests/stRandom2/randomStatetest532Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest532(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest532."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,66 +47,62 @@ def test_random_statetest532(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe54447f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f78297ba08ba478507f413b3597109c5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1]
+        + Op.SLOAD(
+            key=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
+        )
+        + Op.PREVRANDAO
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x78297BA08BA478507F413B3597109C55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x5D6F57A08139951A1B3A0FB5A68138F569E70EBA),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.SLOAD(
-                key=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-            )
-            + Op.PREVRANDAO
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x78297BA08BA478507F413B3597109C55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x5d6f57a08139951a1b3a0fb5a68138f569e70eba"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe54447f000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000c3507fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff6f78297ba08ba478507f413b3597109c"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe54447f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f78297ba08ba478507f413b3597109c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1139122760,
+        value=0x43E5A248,
     )
 
     post = {
-        contract: Account(storage={0: 0x78297BA08BA478507F413B3597109C55}),
+        target: Account(
+            storage={0: 0x78297BA08BA478507F413B3597109C55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest533.py b/tests/ported_static/stRandom2/test_random_statetest533.py
index b1318bfcb43..1661aa8af34 100644
--- a/tests/ported_static/stRandom2/test_random_statetest533.py
+++ b/tests/ported_static/stRandom2/test_random_statetest533.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest533.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest533Filler.json
+state_tests/stRandom2/randomStatetest533Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest533Filler.json"],
+    ["state_tests/stRandom2/randomStatetest533Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest533(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest533."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,65 +43,54 @@ def test_random_statetest533(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.DUP5
-            + Op.SMOD(
-                Op.GASPRICE,
-                Op.PUSH32[0x10000000000000000000000000000000000000000],
-            )
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x5255)
-        ),
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001847f00000000000000000000000100000000000000000000000000000000000000003a0761525560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PUSH32[0x1]
+        + Op.DUP5
+        + Op.SMOD(
+            Op.GASPRICE, Op.PUSH32[0x10000000000000000000000000000000000000000]
+        )
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x5255),
         nonce=0,
-        address=Address("0x6905ebd1d92150c8abd7e0edc3ca2e570143a674"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000001847f00000000000000000000000100000000"  # noqa: E501
-            "000000000000000000000000000000003a076152"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001847f00000000000000000000000100000000000000000000000000000000000000003a076152"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1893110004,
+        value=0x70D690F4,
     )
 
     post = {
-        contract: Account(storage={0: 21077}),
+        target: Account(storage={0: 21077}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest534.py b/tests/ported_static/stRandom2/test_random_statetest534.py
index 4740d574567..e68f56aceb9 100644
--- a/tests/ported_static/stRandom2/test_random_statetest534.py
+++ b/tests/ported_static/stRandom2/test_random_statetest534.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest534.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest534Filler.json
+state_tests/stRandom2/randomStatetest534Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest534Filler.json"],
+    ["state_tests/stRandom2/randomStatetest534Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest534(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest534."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,62 +47,59 @@ def test_random_statetest534(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.GASLIMIT
-            + Op.NUMBER
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.GASLIMIT
-            + Op.PUSH32[0x0]
-            + Op.NUMBER
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0xF3075243846D88747B6A9E7FF28C6155,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000001000000000000000000000000000000000000000045437f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff457f0000000000000000000000000000000000000000000000000000000000000000436ff3075243846d88747b6a9e7ff28c615560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.GASLIMIT
+        + Op.NUMBER
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.GASLIMIT
+        + Op.PUSH32[0x0]
+        + Op.NUMBER
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0xF3075243846D88747B6A9E7FF28C6155
         ),
         nonce=0,
-        address=Address("0x9114c469b911cb7089fe6b881f7e6f10c2109681"),  # noqa: E501
+        address=Address(0x9114C469B911CB7089FE6B881F7E6F10C2109681),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000001000000000000000000000000000000000000000045437f"  # noqa: E501
-            "0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff457f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000436ff3075243846d88"  # noqa: E501
-            "747b6a9e7ff28c61"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000001000000000000000000000000000000000000000045437f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff457f0000000000000000000000000000000000000000000000000000000000000000436ff3075243846d88747b6a9e7ff28c61"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1440446145,
+        value=0x55DB76C1,
     )
 
     post = {
-        contract: Account(storage={0: 0xF3075243846D88747B6A9E7FF28C6155}),
+        target: Account(
+            storage={0: 0xF3075243846D88747B6A9E7FF28C6155},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest535.py b/tests/ported_static/stRandom2/test_random_statetest535.py
index 6e361b1d4df..7c769fc3896 100644
--- a/tests/ported_static/stRandom2/test_random_statetest535.py
+++ b/tests/ported_static/stRandom2/test_random_statetest535.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest535.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest535Filler.json
+state_tests/stRandom2/randomStatetest535Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest535Filler.json"],
+    ["state_tests/stRandom2/randomStatetest535Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest535(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest535."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,57 @@ def test_random_statetest535(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.PUSH32[0x0],
-                value=Op.PUSH32[0x10000000000000000000000000000000000000000],
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[0x1] * 2
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.PUSH32[0x0],
+            value=Op.PUSH32[0x10000000000000000000000000000000000000000],
         ),
         nonce=0,
-        address=Address("0xfb33a18f5315642fac0f83122a6c44c9fb6f4f4d"),  # noqa: E501
+        address=Address(0xFB33A18F5315642FAC0F83122A6C44C9FB6F4F4D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000010000000000"  # noqa: E501
-            "0000000000000000000000000000007f0000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1289018416,
+        value=0x4CD4DC30,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={0: 0x10000000000000000000000000000000000000000},
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest536.py b/tests/ported_static/stRandom2/test_random_statetest536.py
index 845a262c61e..99167111ed0 100644
--- a/tests/ported_static/stRandom2/test_random_statetest536.py
+++ b/tests/ported_static/stRandom2/test_random_statetest536.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest536.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest536Filler.json
+state_tests/stRandom2/randomStatetest536Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest536Filler.json"],
+    ["state_tests/stRandom2/randomStatetest536Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest536(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest536."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,45 @@ def test_random_statetest536(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350537f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9309f3999c7d92795a947a6f317f55  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350537f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9309f3999c7d92795a947a6f317f55"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c350537f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff9309f3999c7d92795a947a6f317f55"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x85e66f40eb86a2d63df2dc248b3d6f4fc138b003"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c350537f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff9309f3999c7d92795a947a6f317f"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350537f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9309f3999c7d92795a947a6f317f"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1392179737,
+        value=0x52FAFA19,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest537.py b/tests/ported_static/stRandom2/test_random_statetest537.py
index 80757d47b44..416ba260478 100644
--- a/tests/ported_static/stRandom2/test_random_statetest537.py
+++ b/tests/ported_static/stRandom2/test_random_statetest537.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest537.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest537Filler.json
+state_tests/stRandom2/randomStatetest537Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest537Filler.json"],
+    ["state_tests/stRandom2/randomStatetest537Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest537(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest537."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,67 +47,60 @@ def test_random_statetest537(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=0xB5688068515A6A996A540A03686D6D600051,
-                value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5688068515a6a996a540a03686d6d60005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000] * 2
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=0xB5688068515A6A996A540A03686D6D600051,
+            value=0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000945304eb"  # noqa: E501
-            "96065b2a98b57a48a06ae28d285a71b5688068515a6a996a540a03686d6d"
+        to=contract_0,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5688068515a6a996a540a03686d6d"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1910780625,
+        value=0x71E432D1,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0xB5688068515A6A996A540A03686D6D600051: 0x7F000000000000000000000000945304EB96065B2A98B57A48A06AE28D285A,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest539.py b/tests/ported_static/stRandom2/test_random_statetest539.py
index a3a6d105236..c6711af7f16 100644
--- a/tests/ported_static/stRandom2/test_random_statetest539.py
+++ b/tests/ported_static/stRandom2/test_random_statetest539.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest539.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest539Filler.json
+state_tests/stRandom2/randomStatetest539Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest539Filler.json"],
+    ["state_tests/stRandom2/randomStatetest539Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest539(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest539."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,61 @@ def test_random_statetest539(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff096794200bf18b0b316e415560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.GASLIMIT
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.MULMOD(
+            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,
+            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+        )
+        + Op.SSTORE(key=Op.COINBASE, value=0x94200BF18B0B316E)
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xAC5AC5347CEB5432A5E7D78E439E0E9AFC7503AB),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.GASLIMIT
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.MULMOD(
-                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.SSTORE(key=Op.COINBASE, value=0x94200BF18B0B316E)
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xac5ac5347ceb5432a5e7d78e439e0e9afc7503ab"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000017f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff096794200bf18b0b316e41"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff096794200bf18b0b316e41"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1428708105,
+        value=0x55285B09,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x4F3F701464972E74606D6EA82D4D3080599A0E79: 0x94200BF18B0B316E,
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest541.py b/tests/ported_static/stRandom2/test_random_statetest541.py
index a5a0e241371..5e168521b8b 100644
--- a/tests/ported_static/stRandom2/test_random_statetest541.py
+++ b/tests/ported_static/stRandom2/test_random_statetest541.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest541.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest541Filler.json
+state_tests/stRandom2/randomStatetest541Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest541Filler.json"],
+    ["state_tests/stRandom2/randomStatetest541Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest541(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest541."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,66 +43,58 @@ def test_random_statetest541(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000004335696e089257368d07897d57350b105560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.GASLIMIT
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.LT(
+                Op.SIGNEXTEND(
+                    Op.CALLDATALOAD(offset=0x6E089257368D07897D57),
+                    Op.CALLDATALOAD(offset=Op.NUMBER),
+                ),
+                Op.PUSH32[0x10000000000000000000000000000000000000000],
+            ),
+            value=Op.PUSH32[0x0],
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.GASLIMIT
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.LT(
-                    Op.SIGNEXTEND(
-                        Op.CALLDATALOAD(offset=0x6E089257368D07897D57),
-                        Op.CALLDATALOAD(offset=Op.NUMBER),
-                    ),
-                    Op.PUSH32[0x10000000000000000000000000000000000000000],
-                ),
-                value=Op.PUSH32[0x0],
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x854f4406999b8bb46770d32ca10f059498717bfc"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3507f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000017f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000004335696e089257368d07897d5735"  # noqa: E501
-            "0b10"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000004335696e089257368d07897d57350b10"  # noqa: E501
         ),
         gas_limit=100000,
-        value=525505301,
+        value=0x1F529315,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest542.py b/tests/ported_static/stRandom2/test_random_statetest542.py
index d46ff594eae..1d68c75d6ca 100644
--- a/tests/ported_static/stRandom2/test_random_statetest542.py
+++ b/tests/ported_static/stRandom2/test_random_statetest542.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest542.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest542Filler.json
+state_tests/stRandom2/randomStatetest542Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest542Filler.json"],
+    ["state_tests/stRandom2/randomStatetest542Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest542(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest542."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,70 +46,65 @@ def test_random_statetest542(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CODECOPY(
-                dest_offset=Op.PUSH32[0x0],
-                offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
-                size=Op.TIMESTAMP,
-            )
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SWAP3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
-        nonce=0,
-        address=Address("0x0173c63bef6ff158e671bd806ede19a25095e723"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
+    )
+    # Source: raw
+    # 0x427f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000397f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>925560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CODECOPY(
+            dest_offset=Op.PUSH32[0x0],
+            offset=Op.PUSH32[0x10000000000000000000000000000000000000000],
+            size=Op.TIMESTAMP,
+        )
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SWAP3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
+        nonce=0,
+        address=Address(0x0173C63BEF6FF158E671BD806EDE19A25095E723),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "427f00000000000000000000000100000000000000000000000000000000000000007f00"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000397f000000"  # noqa: E501
-            "000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000"  # noqa: E501
-            "00000100000000000000000000000000000000000000007f000000000000000000000000"  # noqa: E501
-            "4f3f701464972e74606d6ea82d4d3080599a0e7992"
+        to=target,
+        data=Bytes(
+            "427f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000397f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7992"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2111491039,
+        value=0x7DDACBDF,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 0x10000000000000000000000000000000000000000,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest543.py b/tests/ported_static/stRandom2/test_random_statetest543.py
index 524a955f93c..da90447e74e 100644
--- a/tests/ported_static/stRandom2/test_random_statetest543.py
+++ b/tests/ported_static/stRandom2/test_random_statetest543.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest543.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest543Filler.json
+state_tests/stRandom2/randomStatetest543Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest543Filler.json"],
+    ["state_tests/stRandom2/randomStatetest543Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest543(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest543."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,147 +43,54 @@ def test_random_statetest543(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.GASLIMIT
-            + Op.DUP7
-        ),
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000004586  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x0] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.GASLIMIT
+        + Op.DUP7,
         nonce=0,
-        address=Address("0xb04d75cc292c99077da7bc4149ceafb239447f01"),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000004586"
-        ),
-        gas_limit=100000,
-        value=39701770,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest543Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest543_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.GASLIMIT
-            + Op.DUP7
-        ),
-        nonce=0,
-        address=Address("0xb04d75cc292c99077da7bc4149ceafb239447f01"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000004586"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000004586"  # noqa: E501
         ),
         gas_limit=100000,
-        value=39701770,
+        value=0x25DCD0A,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest544.py b/tests/ported_static/stRandom2/test_random_statetest544.py
index 6dc169178c1..028aaf69bea 100644
--- a/tests/ported_static/stRandom2/test_random_statetest544.py
+++ b/tests/ported_static/stRandom2/test_random_statetest544.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest544.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest544Filler.json
+state_tests/stRandom2/randomStatetest544Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest544Filler.json"],
+    ["state_tests/stRandom2/randomStatetest544Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest544(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest544."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,59 +47,55 @@ def test_random_statetest544(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3503b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000000000000000000000000000000000000000000055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.EXTCODESIZE(address=Op.PUSH32[0xC350])
+        + Op.SSTORE(
+            key=Op.PUSH32[0x0],
+            value=Op.MULMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x7B05834538844EF8AFC51C81F98133359A02F745),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.EXTCODESIZE(address=Op.PUSH32[0xC350])
-            + Op.SSTORE(
-                key=Op.PUSH32[0x0],
-                value=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x7b05834538844ef8afc51c81f98133359a02f745"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3503b7fff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3503b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1348206974,
+        value=0x505C017E,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF},
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest545.py b/tests/ported_static/stRandom2/test_random_statetest545.py
index dd9a6ae5973..f54ba8d7035 100644
--- a/tests/ported_static/stRandom2/test_random_statetest545.py
+++ b/tests/ported_static/stRandom2/test_random_statetest545.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest545.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest545Filler.json
+state_tests/stRandom2/randomStatetest545Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest545Filler.json"],
+    ["state_tests/stRandom2/randomStatetest545Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest545(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest545."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,68 +47,61 @@ def test_random_statetest545(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.SDIV(Op.ADDRESS, 0x7C9C8213),
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350637c9c8213300560005155  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=Op.SDIV(Op.ADDRESS, 0x7C9C8213)
         ),
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c350637c9c82133005"
+        to=contract_0,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350637c9c82133005"  # noqa: E501
         ),
         gas_limit=100000,
-        value=321021476,
+        value=0x13226624,
     )
 
     post = {
-        contract: Account(storage={0: 0x133F69D3ADDBD85DAA8B17484BED8731}),
+        contract_0: Account(
+            storage={0: 0x133F69D3ADDBD85DAA8B17484BED8731},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest546.py b/tests/ported_static/stRandom2/test_random_statetest546.py
index 0fbb1e89545..f4e83ed8904 100644
--- a/tests/ported_static/stRandom2/test_random_statetest546.py
+++ b/tests/ported_static/stRandom2/test_random_statetest546.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest546.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest546Filler.json
+state_tests/stRandom2/randomStatetest546Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest546Filler.json"],
+    ["state_tests/stRandom2/randomStatetest546Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest546(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest546."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,57 @@ def test_random_statetest546(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PREVRANDAO
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SWAP6
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x895258826C3557659220867173150155,
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f0000000000000000000000010000000000000000000000000000000000000000956f895258826c355765922086717315015560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PREVRANDAO
+        + Op.PUSH32[0x10000000000000000000000000000000000000000] * 3
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SWAP6
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x895258826C3557659220867173150155
         ),
         nonce=0,
-        address=Address("0x6caa66514a7adf4757188ed6466a7ff7b1d3fe88"),  # noqa: E501
+        address=Address(0x6CAA66514A7ADF4757188ED6466A7FF7B1D3FE88),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff447f00"  # noqa: E501
-            "000000000000000000000100000000000000000000000000000000000000007f00000000"  # noqa: E501
-            "000000000000000100000000000000000000000000000000000000007f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "00004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100"  # noqa: E501
-            "00000000000000000000000000000000000000956f895258826c35576592208671731501"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000010000000000000000000000000000000000000000956f895258826c35576592208671731501"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1796553007,
+        value=0x6B15392F,
     )
 
     post = {
-        contract: Account(storage={0: 0x895258826C3557659220867173150155}),
+        target: Account(
+            storage={0: 0x895258826C3557659220867173150155},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest547.py b/tests/ported_static/stRandom2/test_random_statetest547.py
index 4932b12db25..162adbf1b50 100644
--- a/tests/ported_static/stRandom2/test_random_statetest547.py
+++ b/tests/ported_static/stRandom2/test_random_statetest547.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest547.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest547Filler.json
+state_tests/stRandom2/randomStatetest547Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest547Filler.json"],
+    ["state_tests/stRandom2/randomStatetest547Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest547(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest547."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,54 +44,45 @@ def test_random_statetest547(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c35014623971943854a009768255  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c35014623971943854a009768255"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000001417fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c35014623971943854a009768255"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x63d5e8a1c6e9bb983f0c2249adb82c045a7510a7"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000001417fffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c35014623971943854a0097682"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c35014623971943854a0097682"  # noqa: E501
         ),
         gas_limit=1616347587,
-        value=1980806241,
+        value=0x7610B461,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest548.py b/tests/ported_static/stRandom2/test_random_statetest548.py
index 99f7738d541..3b095a329e6 100644
--- a/tests/ported_static/stRandom2/test_random_statetest548.py
+++ b/tests/ported_static/stRandom2/test_random_statetest548.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest548.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest548Filler.json
+state_tests/stRandom2/randomStatetest548Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest548Filler.json"],
+    ["state_tests/stRandom2/randomStatetest548Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest548(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest548."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,64 +47,60 @@ def test_random_statetest548(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f0000000000000000000000010000000000000000000000000000000000000000417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000019417f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f777a349a646633977da01a315a3c035560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.COINBASE
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.NOT(Op.PUSH32[0x10000000000000000000000000000000000000000])
+        + Op.COINBASE
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x777A349A646633977DA01A315A3C0355
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xE55284E4ED0F3E7100A11671FD4751A3F174C90F),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.COINBASE
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.NOT(Op.PUSH32[0x10000000000000000000000000000000000000000])
-            + Op.COINBASE
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x777A349A646633977DA01A315A3C0355,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xe55284e4ed0f3e7100a11671fd4751a3f174c90f"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000010000000000000000000000000000000000000000417fff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000"  # noqa: E501
-            "0000000000000001000000000000000000000000000000000000000019417f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff6f777a349a646633977da01a"  # noqa: E501
-            "315a3c03"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000010000000000000000000000000000000000000000417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000019417f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f777a349a646633977da01a315a3c03"  # noqa: E501
         ),
         gas_limit=100000,
-        value=715419522,
+        value=0x2AA46F82,
     )
 
     post = {
-        contract: Account(storage={0: 0x777A349A646633977DA01A315A3C0355}),
+        target: Account(
+            storage={0: 0x777A349A646633977DA01A315A3C0355},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest550.py b/tests/ported_static/stRandom2/test_random_statetest550.py
index 1f007210f99..f43654e5852 100644
--- a/tests/ported_static/stRandom2/test_random_statetest550.py
+++ b/tests/ported_static/stRandom2/test_random_statetest550.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest550.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest550Filler.json
+state_tests/stRandom2/randomStatetest550Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest550Filler.json"],
+    ["state_tests/stRandom2/randomStatetest550Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest550(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest550."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,62 @@ def test_random_statetest550(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f4472a17829659c94a29041419564313a60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x4472A17829659C94A29041419564313A
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xFC0143D7F90756F7D88B105354C1062BA849BDA5),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x4472A17829659C94A29041419564313A,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xfc0143d7f90756f7d88b105354c1062ba849bda5"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000006f4472a17829659c94a29041419564313a"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f4472a17829659c94a29041419564313a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1391193544,
+        value=0x52EBEDC8,
     )
 
     post = {
-        contract: Account(storage={0: 0x4472A17829659C94A29041419564313A}),
+        target: Account(
+            storage={0: 0x4472A17829659C94A29041419564313A},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest552.py b/tests/ported_static/stRandom2/test_random_statetest552.py
index 66031ee4be7..3ac771d3ecb 100644
--- a/tests/ported_static/stRandom2/test_random_statetest552.py
+++ b/tests/ported_static/stRandom2/test_random_statetest552.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest552.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest552Filler.json
+state_tests/stRandom2/randomStatetest552Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest552Filler.json"],
+    ["state_tests/stRandom2/randomStatetest552Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest552(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest552."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,60 @@ def test_random_statetest552(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.EQ(
-                Op.TIMESTAMP,
-                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.SLOAD(
-                key=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-            )
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x6A72A37B5219F089416D4336A08E8255,
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff42147ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe547f00000000000000000000000000000000000000000000000000000000000000006f6a72a37b5219f089416d4336a08e825560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.EQ(
+            Op.TIMESTAMP, Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        )
+        + Op.SLOAD(
+            key=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
+        )
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x6A72A37B5219F089416D4336A08E8255
         ),
         nonce=0,
-        address=Address("0x43eb3631bab06952a00a4b8076033bacbf958089"),  # noqa: E501
+        address=Address(0x43EB3631BAB06952A00A4B8076033BACBF958089),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff42147fffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffe547f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000006f6a72a37b5219f089416d43"  # noqa: E501
-            "36a08e82"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff42147ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe547f00000000000000000000000000000000000000000000000000000000000000006f6a72a37b5219f089416d4336a08e82"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1809429900,
+        value=0x6BD9B58C,
     )
 
     post = {
-        contract: Account(storage={0: 0x6A72A37B5219F089416D4336A08E8255}),
+        target: Account(
+            storage={0: 0x6A72A37B5219F089416D4336A08E8255},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest553.py b/tests/ported_static/stRandom2/test_random_statetest553.py
index 39fd77d3c08..94406603337 100644
--- a/tests/ported_static/stRandom2/test_random_statetest553.py
+++ b/tests/ported_static/stRandom2/test_random_statetest553.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest553.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest553Filler.json
+state_tests/stRandom2/randomStatetest553Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest553Filler.json"],
+    ["state_tests/stRandom2/randomStatetest553Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest553(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest553."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,57 @@ def test_random_statetest553(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x94819C780585376DA073368C45828CA0,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x4dc764749fdeab4feffb6d542712ebd2465eadde"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000016f94819c780585376da073368c45828ca060005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x94819C780585376DA073368C45828CA0
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4DC764749FDEAB4FEFFB6D542712EBD2465EADDE),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000016f94819c780585376da073368c45828ca0"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000016f94819c780585376da073368c45828ca0"  # noqa: E501
         ),
         gas_limit=100000,
-        value=143286,
+        value=0x22FB6,
     )
 
     post = {
-        contract: Account(storage={0: 0x94819C780585376DA073368C45828CA0}),
+        target: Account(
+            storage={0: 0x94819C780585376DA073368C45828CA0},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest554.py b/tests/ported_static/stRandom2/test_random_statetest554.py
index c715a15385c..5a4435ea941 100644
--- a/tests/ported_static/stRandom2/test_random_statetest554.py
+++ b/tests/ported_static/stRandom2/test_random_statetest554.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest554.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest554Filler.json
+state_tests/stRandom2/randomStatetest554Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest554Filler.json"],
+    ["state_tests/stRandom2/randomStatetest554Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest554(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest554."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,131 +44,104 @@ def test_random_statetest554(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.LOG0(offset=0xDC, size=0x14)
-            + Op.PUSH1[0x29]
-            + Op.PUSH19[0x8B67BA4C2FC8C63C46F19BB45A4BE3F678B306]
-            + Op.PUSH10[0xBA571E944074C21B140A]
-            + Op.PUSH27[
-                0x65D14A921EC804A45ECF4D952AA923FB23A0574ACD8EF9F82C7DB1
-            ]
-            + Op.PUSH31[
-                0x157F651BBEB520203BD398160345137B0419A395630FCE1A7ED24C0CCCFD91  # noqa: E501
-            ]
-            + Op.PUSH23[0x6140E0682F6BD571DB701B4616B567F215FAF42FB37D2A]
-            + Op.PUSH29[
-                0x43C05A634612322EDA99F09CC2907A6CBA01BB6869B7D24B897EC43B9B
-            ]
-            + Op.PUSH4[0xA8747A89]
-            + Op.PUSH27[
-                0xF14C1F4C0B186C6311D36DE86B8C8172AA43C3DFE3EA1650338087
-            ]
-            + Op.PUSH32[
-                0xA7F32DEB9F60254D124338105942B4B5B88C443351DE5EBF14C2380F4A91327D  # noqa: E501
-            ]
-            + Op.PUSH9[0xA0DA66ABD627DB7573]
-            + Op.SWAP10
-            + Op.TIMESTAMP
-            + Op.LT(0xAFEC536E37D0DA8122CF8681BC, 0x5F5855728FD67764)
-            + Op.CALL(
-                gas=0x176FE819,
-                address=0xD4932C914A13BD1791675290FDD56965C3FCBD03,
-                value=0x7EFE33A,
-                args_offset=0x8,
-                args_size=0x3,
-                ret_offset=0x1B,
-                ret_size=0x13,
-            )
-            + Op.PUSH6[0x66B603CCCF38]
-            + Op.PUSH29[
-                0x5F10E5CDB2BA1B456D2A0386EE72DDF3FF65B33A551AFA423F8AF05E34
-            ]
-            + Op.PUSH28[
-                0x5C50B6FE69C77F0682EF890D8ED8AB3833F128389F6407911FB20590
-            ]
-            + Op.PUSH5[0x2C9765E97C]
-            + Op.PUSH32[
-                0x31DFA251377A47CA45B72CE5C1896A697990D60A01CABAF5E4D8F55F11FD3742  # noqa: E501
-            ]
-            + Op.PUSH20[0x51D1F8E89810C7AEEC6482FD03D7E7CA58FBAAE3]
-            + Op.PUSH2[0xE393]
-            + Op.PUSH10[0x36543D6DACB1F97F19C3]
-            + Op.PUSH19[0x1866491BAD73F32FAEA37B4A8C273668E04DFF]
-            + Op.DUP9
-            + Op.PUSH4[0xA542E117]
-            + Op.PUSH22[0xA693C3B4BCD4FC1A87DDB6450F8F6C2F1BA807AAFFB6]
-            + Op.PUSH31[
-                0x62AF22CD93175B5FFB428EE9116DAD4A695AA514B8CA4D615FD728A61C124C  # noqa: E501
-            ]
-            + Op.PUSH26[0x6554A98241320AC2D6B9F16EE1C203DBBA537A211142DF4C2E62]
-            + Op.PUSH15[0x4108F87AB6D5B8E9CE86F92ABA50A4]
-            + Op.PUSH27[
-                0xCC60D734E7A066131D99DAD149451B386120EED210723BD8304CAA
-            ]
-            + Op.PUSH2[0x48C]
-            + Op.PUSH8[0x512CA417AE8857A4]
-            + Op.PUSH11[0xD24CA1F2CB75F75EF86A92]
-            + Op.PUSH18[0x52BD86981A216D8147F49EAD4BE46967DD10]
-            + Op.PUSH22[0x1491F9F1AC2F50FD5DAD394B7838A9EB89B372698362]
-            + Op.PUSH5[0x7BDDBB9058]
-            + Op.PUSH15[0x4E921A8CC96EA0C50D07DA472B3E63]
-            + Op.PUSH1[0xA3]
-            + Op.SWAP13
-        ),
+    # Source: raw
+    # 0x601460dca06029728b67ba4c2fc8c63c46f19bb45a4be3f678b30669ba571e944074c21b140a7a65d14a921ec804a45ecf4d952aa923fb23a0574acd8ef9f82c7db17e157f651bbeb520203bd398160345137b0419a395630fce1a7ed24c0cccfd91766140e0682f6bd571db701b4616b567f215faf42fb37d2a7c43c05a634612322eda99f09cc2907a6cba01bb6869b7d24b897ec43b9b63a8747a897af14c1f4c0b186c6311d36de86b8c8172aa43c3dfe3ea16503380877fa7f32deb9f60254d124338105942b4b5b88c443351de5ebf14c2380f4a91327d68a0da66abd627db75739942675f5855728fd677646cafec536e37d0da8122cf8681bc106013601b600360086307efe33a73<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>63176fe819f16566b603cccf387c5f10e5cdb2ba1b456d2a0386ee72ddf3ff65b33a551afa423f8af05e347b5c50b6fe69c77f0682ef890d8ed8ab3833f128389f6407911fb20590642c9765e97c7f31dfa251377a47ca45b72ce5c1896a697990d60a01cabaf5e4d8f55f11fd37427351d1f8e89810c7aeec6482fd03d7e7ca58fbaae361e3936936543d6dacb1f97f19c3721866491bad73f32faea37b4a8c273668e04dff8863a542e11775a693c3b4bcd4fc1a87ddb6450f8f6c2f1ba807aaffb67e62af22cd93175b5ffb428ee9116dad4a695aa514b8ca4d615fd728a61c124c796554a98241320ac2d6b9f16ee1c203dbba537a211142df4c2e626e4108f87ab6d5b8e9ce86f92aba50a47acc60d734e7a066131d99dad149451b386120eed210723bd8304caa61048c67512ca417ae8857a46ad24ca1f2cb75f75ef86a927152bd86981a216d8147f49ead4be46967dd10751491f9f1ac2f50fd5dad394b7838a9eb89b372698362647bddbb90586e4e921a8cc96ea0c50d07da472b3e6360a39c  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG0(offset=0xDC, size=0x14)
+        + Op.PUSH1[0x29]
+        + Op.PUSH19[0x8B67BA4C2FC8C63C46F19BB45A4BE3F678B306]
+        + Op.PUSH10[0xBA571E944074C21B140A]
+        + Op.PUSH27[0x65D14A921EC804A45ECF4D952AA923FB23A0574ACD8EF9F82C7DB1]
+        + Op.PUSH31[
+            0x157F651BBEB520203BD398160345137B0419A395630FCE1A7ED24C0CCCFD91
+        ]
+        + Op.PUSH23[0x6140E0682F6BD571DB701B4616B567F215FAF42FB37D2A]
+        + Op.PUSH29[
+            0x43C05A634612322EDA99F09CC2907A6CBA01BB6869B7D24B897EC43B9B
+        ]
+        + Op.PUSH4[0xA8747A89]
+        + Op.PUSH27[0xF14C1F4C0B186C6311D36DE86B8C8172AA43C3DFE3EA1650338087]
+        + Op.PUSH32[
+            0xA7F32DEB9F60254D124338105942B4B5B88C443351DE5EBF14C2380F4A91327D
+        ]
+        + Op.PUSH9[0xA0DA66ABD627DB7573]
+        + Op.SWAP10
+        + Op.TIMESTAMP
+        + Op.LT(0xAFEC536E37D0DA8122CF8681BC, 0x5F5855728FD67764)
+        + Op.CALL(
+            gas=0x176FE819,
+            address=0xD4932C914A13BD1791675290FDD56965C3FCBD03,
+            value=0x7EFE33A,
+            args_offset=0x8,
+            args_size=0x3,
+            ret_offset=0x1B,
+            ret_size=0x13,
+        )
+        + Op.PUSH6[0x66B603CCCF38]
+        + Op.PUSH29[
+            0x5F10E5CDB2BA1B456D2A0386EE72DDF3FF65B33A551AFA423F8AF05E34
+        ]
+        + Op.PUSH28[0x5C50B6FE69C77F0682EF890D8ED8AB3833F128389F6407911FB20590]
+        + Op.PUSH5[0x2C9765E97C]
+        + Op.PUSH32[
+            0x31DFA251377A47CA45B72CE5C1896A697990D60A01CABAF5E4D8F55F11FD3742
+        ]
+        + Op.PUSH20[0x51D1F8E89810C7AEEC6482FD03D7E7CA58FBAAE3]
+        + Op.PUSH2[0xE393]
+        + Op.PUSH10[0x36543D6DACB1F97F19C3]
+        + Op.PUSH19[0x1866491BAD73F32FAEA37B4A8C273668E04DFF]
+        + Op.DUP9
+        + Op.PUSH4[0xA542E117]
+        + Op.PUSH22[0xA693C3B4BCD4FC1A87DDB6450F8F6C2F1BA807AAFFB6]
+        + Op.PUSH31[
+            0x62AF22CD93175B5FFB428EE9116DAD4A695AA514B8CA4D615FD728A61C124C
+        ]
+        + Op.PUSH26[0x6554A98241320AC2D6B9F16EE1C203DBBA537A211142DF4C2E62]
+        + Op.PUSH15[0x4108F87AB6D5B8E9CE86F92ABA50A4]
+        + Op.PUSH27[0xCC60D734E7A066131D99DAD149451B386120EED210723BD8304CAA]
+        + Op.PUSH2[0x48C]
+        + Op.PUSH8[0x512CA417AE8857A4]
+        + Op.PUSH11[0xD24CA1F2CB75F75EF86A92]
+        + Op.PUSH18[0x52BD86981A216D8147F49EAD4BE46967DD10]
+        + Op.PUSH22[0x1491F9F1AC2F50FD5DAD394B7838A9EB89B372698362]
+        + Op.PUSH5[0x7BDDBB9058]
+        + Op.PUSH15[0x4E921A8CC96EA0C50D07DA472B3E63]
+        + Op.PUSH1[0xA3]
+        + Op.SWAP13,
         nonce=0,
-        address=Address("0xd4932c914a13bd1791675290fdd56965c3fcbd03"),  # noqa: E501
+        address=Address(0xD4932C914A13BD1791675290FDD56965C3FCBD03),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "336e88fae59ccc17cac0ec3a4a984fcdc77c2ba8961cb09c97e4f874f69667ea58bce674"  # noqa: E501
-            "fe4d474c8898fff5b73e6a7e25d7d5e25ccea0601ea15066d5497deee377fccbfcf7d46f"  # noqa: E501
-            "462eb9d2fe6a3782658a9ffd73aa457677100ca7d35d68df5ee8465c2ca2af480e6e3cb2"  # noqa: E501
-            "04021b6ae2234a9f3462784bb45c4f087003c9352268b7e9890647fba7f034faad2663bf"  # noqa: E501
-            "b15f1e0b7381d4fe5d7ba9c59455e62fe93c8cca7dd3f20d81644c2494b098686d466eb0"  # noqa: E501
-            "fec9f497f163bdf627d76f49e3d1b74b142996652c0d53f709553560656e36e89deb34f3"  # noqa: E501
-            "2a7b7b5dfb3b309d57704dfa8c0ec20f2c0f70e1761c949c14c6fd619d947e42f23136ff"  # noqa: E501
-            "517ac0b92f6df9d2989eb6828d7213a0b9a20959957ade2b1c1f6222920664c7ddf31a03"  # noqa: E501
-            "7c866146cabefec6c2f9f02d050c2ec8ef5da91eb65cc7d0b0d7eb3654407e7cb3eae4ea"  # noqa: E501
-            "612eb678374b229c0e0fcc178293fd5d500210352eea769ccafa6c7a7e444322c60c241a"  # noqa: E501
-            "937bbcf365ba988cb9f0628f7a33e43ba75bc44c38707ca76e02d3ff70e772c56dc9b9bc"  # noqa: E501
-            "fd8116b972e66b6a28583e9f272065e9b7f112858c5f71c66dd37755c458bd56109d4dec"  # noqa: E501
-            "2015b23774fa549dd52567557117d2fbda2a4f53cbd065fc9b907736d432b2730969562c"  # noqa: E501
-            "e445fd6f9dcf91e092390173406e5b047944eafa8607c63c7e79aa872e5ce29de18e48ed"  # noqa: E501
-            "9a62f440a0d4d4651d624ff767ac7fc52281bc7fec896a501952622f30e718b484e56e8c"  # noqa: E501
-            "a7ab57c2ef2a6d37944e14759a52961dda795af1e984eea7d2689937b0a76ab8494b7acf"  # noqa: E501
-            "579c90a0eb949199c0f87e566759722c0799c2c03a027b51a87372e64f7a1fb661d72eac"  # noqa: E501
-            "23f2dc691d34981660bf7cfa421c5bf5e3225a4653ae7e0e43bfe4af206d4e69635b55c2"  # noqa: E501
-            "4537fe20705e010f348d477b1aef6aeb2388b508a44e640353e169a37221ba3dcf805c6a"  # noqa: E501
-            "9ebe283a53e9dcbaee4081a098"
+        to=target,
+        data=Bytes(
+            "336e88fae59ccc17cac0ec3a4a984fcdc77c2ba8961cb09c97e4f874f69667ea58bce674fe4d474c8898fff5b73e6a7e25d7d5e25ccea0601ea15066d5497deee377fccbfcf7d46f462eb9d2fe6a3782658a9ffd73aa457677100ca7d35d68df5ee8465c2ca2af480e6e3cb204021b6ae2234a9f3462784bb45c4f087003c9352268b7e9890647fba7f034faad2663bfb15f1e0b7381d4fe5d7ba9c59455e62fe93c8cca7dd3f20d81644c2494b098686d466eb0fec9f497f163bdf627d76f49e3d1b74b142996652c0d53f709553560656e36e89deb34f32a7b7b5dfb3b309d57704dfa8c0ec20f2c0f70e1761c949c14c6fd619d947e42f23136ff517ac0b92f6df9d2989eb6828d7213a0b9a20959957ade2b1c1f6222920664c7ddf31a037c866146cabefec6c2f9f02d050c2ec8ef5da91eb65cc7d0b0d7eb3654407e7cb3eae4ea612eb678374b229c0e0fcc178293fd5d500210352eea769ccafa6c7a7e444322c60c241a937bbcf365ba988cb9f0628f7a33e43ba75bc44c38707ca76e02d3ff70e772c56dc9b9bcfd8116b972e66b6a28583e9f272065e9b7f112858c5f71c66dd37755c458bd56109d4dec2015b23774fa549dd52567557117d2fbda2a4f53cbd065fc9b907736d432b2730969562ce445fd6f9dcf91e092390173406e5b047944eafa8607c63c7e79aa872e5ce29de18e48ed9a62f440a0d4d4651d624ff767ac7fc52281bc7fec896a501952622f30e718b484e56e8ca7ab57c2ef2a6d37944e14759a52961dda795af1e984eea7d2689937b0a76ab8494b7acf579c90a0eb949199c0f87e566759722c0799c2c03a027b51a87372e64f7a1fb661d72eac23f2dc691d34981660bf7cfa421c5bf5e3225a4653ae7e0e43bfe4af206d4e69635b55c24537fe20705e010f348d477b1aef6aeb2388b508a44e640353e169a37221ba3dcf805c6a9ebe283a53e9dcbaee4081a098"  # noqa: E501
         ),
         gas_limit=1845353713,
-        value=1213415884,
+        value=0x485341CC,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest555.py b/tests/ported_static/stRandom2/test_random_statetest555.py
index 35d8d793ea9..64260d4b894 100644
--- a/tests/ported_static/stRandom2/test_random_statetest555.py
+++ b/tests/ported_static/stRandom2/test_random_statetest555.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest555.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest555Filler.json
+state_tests/stRandom2/randomStatetest555Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest555Filler.json"],
+    ["state_tests/stRandom2/randomStatetest555Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest555(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest555."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,62 +47,58 @@ def test_random_statetest555(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.NUMBER
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.NUMBER
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x3B8F936E6F3874603C59120707E3588C,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000c3506f3b8f936e6f3874603c59120707e3588c60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.NUMBER
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.NUMBER
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x3B8F936E6F3874603C59120707E3588C
         ),
         nonce=0,
-        address=Address("0x7178694ada9132cc970358f783090308d849dfae"),  # noqa: E501
+        address=Address(0x7178694ADA9132CC970358F783090308D849DFAE),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe437f00000000000000"  # noqa: E501
-            "0000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000c3506f3b8f936e6f3874603c591207"  # noqa: E501
-            "07e3588c"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000c3506f3b8f936e6f3874603c59120707e3588c"  # noqa: E501
         ),
         gas_limit=100000,
-        value=119135864,
+        value=0x719DE78,
     )
 
     post = {
-        contract: Account(storage={0: 0x3B8F936E6F3874603C59120707E3588C}),
+        target: Account(
+            storage={0: 0x3B8F936E6F3874603C59120707E3588C},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest556.py b/tests/ported_static/stRandom2/test_random_statetest556.py
index 65904780a9e..52be5dae51c 100644
--- a/tests/ported_static/stRandom2/test_random_statetest556.py
+++ b/tests/ported_static/stRandom2/test_random_statetest556.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest556.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest556Filler.json
+state_tests/stRandom2/randomStatetest556Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest556Filler.json"],
+    ["state_tests/stRandom2/randomStatetest556Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest556(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest556."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,64 +47,59 @@ def test_random_statetest556(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f726e757692a2ad96526b9e8b77a33a5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.NUMBER
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x726E757692A2AD96526B9E8B77A33A55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xFC0F78D9E0F19FC8E78CAA6A31AEE7CC3D523B5C),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.NUMBER
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x726E757692A2AD96526B9E8B77A33A55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xfc0f78d9e0f19fc8e78caa6a31aee7cc3d523b5c"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000010000000000000000000000000000000000000000437f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000017f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000007f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000006f726e757692a2ad96526b9e8b77a33a"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f726e757692a2ad96526b9e8b77a33a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1156625804,
+        value=0x44F0B58C,
     )
 
     post = {
-        contract: Account(storage={0: 0x726E757692A2AD96526B9E8B77A33A55}),
+        target: Account(
+            storage={0: 0x726E757692A2AD96526B9E8B77A33A55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest558.py b/tests/ported_static/stRandom2/test_random_statetest558.py
index 06d85be1119..d3ada857876 100644
--- a/tests/ported_static/stRandom2/test_random_statetest558.py
+++ b/tests/ported_static/stRandom2/test_random_statetest558.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest558.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest558Filler.json
+state_tests/stRandom2/randomStatetest558Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest558Filler.json"],
+    ["state_tests/stRandom2/randomStatetest558Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest558(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest558."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,105 +43,42 @@ def test_random_statetest558(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x43767855
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex("43767855"),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfea0fd6f8e6416af47ab5057d310ed005855772a"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
-        gas_limit=400000,
-        value=100000,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest558Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest558_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
     )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex("43767855"),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xfea0fd6f8e6416af47ab5057d310ed005855772a"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0xDE0B6B3A76586A0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest559.py b/tests/ported_static/stRandom2/test_random_statetest559.py
index 6299bb8871c..3b3ae3ead1f 100644
--- a/tests/ported_static/stRandom2/test_random_statetest559.py
+++ b/tests/ported_static/stRandom2/test_random_statetest559.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest559.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest559Filler.json
+state_tests/stRandom2/randomStatetest559Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest559Filler.json"],
+    ["state_tests/stRandom2/randomStatetest559Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest559(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest559."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,69 +46,64 @@ def test_random_statetest559(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.SELFDESTRUCT(
-                address=Op.MULMOD(
-                    Op.DUP6,
-                    Op.PUSH32[0x10000000000000000000000000000000000000000],
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000008509ff1555  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.SELFDESTRUCT(
+            address=Op.MULMOD(
+                Op.DUP6,
+                Op.PUSH32[0x10000000000000000000000000000000000000000],
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
             )
-            + Op.ISZERO
-            + Op.SSTORE
-        ),
+        )
+        + Op.ISZERO
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x1e5faef71e88302d7aaed005a206baddc12897dc"),  # noqa: E501
+        address=Address(0x1E5FAEF71E88302D7AAED005A206BADDC12897DC),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000007f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000"  # noqa: E501
-            "0000000000000000000000008509ff15"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000008509ff15"  # noqa: E501
         ),
         gas_limit=100000,
-        value=312647948,
+        value=0x12A2A10C,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x0000000000000000FFFFFFFFFFFFFFFFFFFFFFFF): Account(
+            storage={}, code=b"", nonce=0
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest560.py b/tests/ported_static/stRandom2/test_random_statetest560.py
index 06225549ca5..cb807ff1815 100644
--- a/tests/ported_static/stRandom2/test_random_statetest560.py
+++ b/tests/ported_static/stRandom2/test_random_statetest560.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest560.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest560Filler.json
+state_tests/stRandom2/randomStatetest560Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest560Filler.json"],
+    ["state_tests/stRandom2/randomStatetest560Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest560(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest560."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,52 +43,45 @@ def test_random_statetest560(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c35059a17f0000000000000000000000000000000000000000000000000000000000000001f38f07bf60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c35059a17f0000000000000000000000000000000000000000000000000000000000000001f38f07bf60005155"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c35059a17f000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000001f38f07bf60005155"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xc9edd4cf792e9feffee7968e9a49a0bd81a7ba40"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c35059a17f000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000001f38f07bf"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c35059a17f0000000000000000000000000000000000000000000000000000000000000001f38f07bf"  # noqa: E501
         ),
         gas_limit=500000,
-        value=50481116,
+        value=0x30247DC,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest562.py b/tests/ported_static/stRandom2/test_random_statetest562.py
index e92bbabc1cb..fdecc6b3f61 100644
--- a/tests/ported_static/stRandom2/test_random_statetest562.py
+++ b/tests/ported_static/stRandom2/test_random_statetest562.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest562.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest562Filler.json
+state_tests/stRandom2/randomStatetest562Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest562Filler.json"],
+    ["state_tests/stRandom2/randomStatetest562Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest562(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest562."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,65 +43,59 @@ def test_random_statetest562(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001937fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350a094448744  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x1]
+        + Op.SWAP4
+        + Op.LOG0(
+            offset=Op.PUSH32[0xC350],
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SWAP5
+        + Op.PREVRANDAO
+        + Op.DUP8
+        + Op.PREVRANDAO,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.SWAP4
-            + Op.LOG0(
-                offset=Op.PUSH32[0xC350],
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SWAP5
-            + Op.PREVRANDAO
-            + Op.DUP8
-            + Op.PREVRANDAO
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x86e63b3928d89817589609c1e2180e22939d6a62"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000001937fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c350a094448744"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001937fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350a094448744"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1494991145,
+        value=0x591BC129,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest563.py b/tests/ported_static/stRandom2/test_random_statetest563.py
index 912937ca37b..48692f9193b 100644
--- a/tests/ported_static/stRandom2/test_random_statetest563.py
+++ b/tests/ported_static/stRandom2/test_random_statetest563.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest563.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest563Filler.json
+state_tests/stRandom2/randomStatetest563Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest563Filler.json"],
+    ["state_tests/stRandom2/randomStatetest563Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest563(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest563."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,45 @@ def test_random_statetest563(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe418b7f000000000000000000"  # noqa: E501
-            "000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000"  # noqa: E501
-            "4f3f701464972e74606d6ea82d4d3080599a0e790461098038315ba267"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x2f5f042c5d61da63b8afa98d3502ff4b4950c22b"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe418b7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>0461098038315ba267  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe418b7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e790461098038315ba267"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe418b7f000000000000000000"  # noqa: E501
-            "000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000"  # noqa: E501
-            "4f3f701464972e74606d6ea82d4d3080599a0e790461098038315ba267"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe418b7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e790461098038315ba267"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1283542119,
+        value=0x4C814C67,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest564.py b/tests/ported_static/stRandom2/test_random_statetest564.py
index 6f551a80aed..039a19f683f 100644
--- a/tests/ported_static/stRandom2/test_random_statetest564.py
+++ b/tests/ported_static/stRandom2/test_random_statetest564.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest564.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest564Filler.json
+state_tests/stRandom2/randomStatetest564Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest564Filler.json"],
+    ["state_tests/stRandom2/randomStatetest564Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_random_statetest564(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5")
+    """Test_random_statetest564."""
+    coinbase = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,71 +47,62 @@ def test_random_statetest564(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.POP(Op.GASLIMIT)
-            + Op.SSTORE(key=Op.AND, value=Op.ADDMOD)
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x5b7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe4550081655  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.PUSH32[0x10000000000000000000000000000000000000000] * 2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.POP(Op.GASLIMIT)
+        + Op.SSTORE(key=Op.AND, value=Op.ADDMOD),
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "5b7f00000000000000000000000100000000000000000000000000000000000000007f00"  # noqa: E501
-            "000000000000000000000100000000000000000000000000000000000000007f00000000"  # noqa: E501
-            "0000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000"  # noqa: E501
-            "0000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe45500816"
+        to=contract_0,
+        data=Bytes(
+            "5b7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe45500816"  # noqa: E501
         ),
         gas_limit=100000,
-        value=286796184,
+        value=0x11182998,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0x945304EB96065B2A98B57A48A06AE28D285A71B5: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest565.py b/tests/ported_static/stRandom2/test_random_statetest565.py
index 60d9dbd4640..322caed6750 100644
--- a/tests/ported_static/stRandom2/test_random_statetest565.py
+++ b/tests/ported_static/stRandom2/test_random_statetest565.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest565.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest565Filler.json
+state_tests/stRandom2/randomStatetest565Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest565Filler.json"],
+    ["state_tests/stRandom2/randomStatetest565Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest565(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest565."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,60 @@ def test_random_statetest565(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SGT(
-                Op.PUSH32[0xC350],
-                Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
-            )
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SWAP3
-            + Op.CALLDATACOPY
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350137f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000010000000000000000000000000000000000000000923760005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SGT(
+            Op.PUSH32[0xC350],
+            Op.PUSH32[0x945304EB96065B2A98B57A48A06AE28D285A71B5],
+        )
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SWAP3
+        + Op.CALLDATACOPY
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x3abd4b5fbca81075bf801f6cd4ad691531705e97"),  # noqa: E501
+        address=Address(0x3ABD4B5FBCA81075BF801F6CD4AD691531705E97),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c350137f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000007f00000000000000000000000100"  # noqa: E501
-            "000000000000000000000000000000000000009237"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350137f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000009237"  # noqa: E501
         ),
         gas_limit=100000,
-        value=684525926,
+        value=0x28CD0966,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x7F00000000000000000000000100000000000000000000000000000000000000: 0x10000000000000000000000000000000000000000,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest566.py b/tests/ported_static/stRandom2/test_random_statetest566.py
index 5d191565dd7..88158c925a3 100644
--- a/tests/ported_static/stRandom2/test_random_statetest566.py
+++ b/tests/ported_static/stRandom2/test_random_statetest566.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest566.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest566Filler.json
+state_tests/stRandom2/randomStatetest566Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest566Filler.json"],
+    ["state_tests/stRandom2/randomStatetest566Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest566(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest566."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,60 +43,55 @@ def test_random_statetest566(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SWAP11
-            + Op.GT(Op.PUSH32[0x0], Op.PUSH32[0xC350])
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SWAP4
-            + Op.SWAP7
-            + Op.JUMPI(pc=Op.ORIGIN, condition=Op.CALLER)
-            + Op.DUP7
-            + Op.PUSH6[0x734360005155]
-        ),
+    # Source: raw
+    # 0x9a7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000117f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>93963332578665734360005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SWAP11
+        + Op.GT(Op.PUSH32[0x0], Op.PUSH32[0xC350])
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SWAP4
+        + Op.SWAP7
+        + Op.JUMPI(pc=Op.ORIGIN, condition=Op.CALLER)
+        + Op.DUP7
+        + Op.PUSH6[0x734360005155],
         nonce=0,
-        address=Address("0xe8fda25222733f9c226c2e5b6dca729eb71076fd"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "9a7f000000000000000000000000000000000000000000000000000000000000c3507f00"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000117f000000"  # noqa: E501
-            "00000000000000000100000000000000000000000000000000000000007fffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffff427f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e79939633325786657343"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "9a7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000117f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79939633325786657343"  # noqa: E501
         ),
         gas_limit=100000,
-        value=565778672,
+        value=0x21B918F0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest567.py b/tests/ported_static/stRandom2/test_random_statetest567.py
index 1b7d414f659..0359dcba008 100644
--- a/tests/ported_static/stRandom2/test_random_statetest567.py
+++ b/tests/ported_static/stRandom2/test_random_statetest567.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest567.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest567Filler.json
+state_tests/stRandom2/randomStatetest567Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,99 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest567Filler.json"],
+    ["state_tests/stRandom2/randomStatetest567Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest567(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017e7f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000017fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe906697998df1160b"
-        ),
-        nonce=0,
-        address=Address("0x4860849f881f7ecbb6a4c146eef8f95f52f462bb"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017e7f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000017fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe906697998df1160b"
-        ),
-        gas_limit=100000,
-        value=600472398,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest567Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest567_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest567."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -125,56 +43,45 @@ def test_random_statetest567_from_prague(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017e7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe906697998df1160b  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017e7f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000017fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe906697998df1160b"
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017e7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe906697998df1160b"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x4860849f881f7ecbb6a4c146eef8f95f52f462bb"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507fffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017e7f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000017fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffe906697998df1160b"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017e7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe906697998df1160b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=600472398,
+        value=0x23CA7B4E,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest569.py b/tests/ported_static/stRandom2/test_random_statetest569.py
index 14faeec2839..22705f10709 100644
--- a/tests/ported_static/stRandom2/test_random_statetest569.py
+++ b/tests/ported_static/stRandom2/test_random_statetest569.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest569.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest569Filler.json
+state_tests/stRandom2/randomStatetest569Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest569Filler.json"],
+    ["state_tests/stRandom2/randomStatetest569Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest569(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest569."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,55 +43,45 @@ def test_random_statetest569(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>097f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8e0781816fff31986c0a773c9b014460005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e79097f000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000017fffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffe8e0781816fff31986c0a773c9b014460"  # noqa: E501
-            "005155"
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79097f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8e0781816fff31986c0a773c9b014460005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xa3fc9abf6758b048bb28cee4c8f4f9722c90afe2"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e79097f000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000017fffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffe8e0781816fff31986c0a773c9b0144"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79097f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8e0781816fff31986c0a773c9b0144"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1737878734,
+        value=0x6795ECCE,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest571.py b/tests/ported_static/stRandom2/test_random_statetest571.py
index 898fc1623cf..92a3b7df336 100644
--- a/tests/ported_static/stRandom2/test_random_statetest571.py
+++ b/tests/ported_static/stRandom2/test_random_statetest571.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest571.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest571Filler.json
+state_tests/stRandom2/randomStatetest571Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest571Filler.json"],
+    ["state_tests/stRandom2/randomStatetest571Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest571(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest571."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,66 +43,55 @@ def test_random_statetest571(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.JUMPDEST
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.EXTCODECOPY
-            + Op.PUSH6[0x8766C8B6B40]
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.GASPRICE)
-        ),
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000015b7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>3c6508766c8b6b403a60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.JUMPDEST
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.EXTCODECOPY
+        + Op.PUSH6[0x8766C8B6B40]
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=Op.GASPRICE),
         nonce=0,
-        address=Address("0xc983bd5257b89d1c32d59e0251c5456bc7397124"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000015b7f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000017f0000000000000000000000004f3f7014"  # noqa: E501
-            "64972e74606d6ea82d4d3080599a0e793c6508766c8b6b403a"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000015b7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e793c6508766c8b6b403a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1402161028,
+        value=0x53934784,
     )
 
     post = {
-        contract: Account(storage={0: 10}),
+        target: Account(storage={0: 10}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest572.py b/tests/ported_static/stRandom2/test_random_statetest572.py
index 108d111b9c7..0cc16d4916d 100644
--- a/tests/ported_static/stRandom2/test_random_statetest572.py
+++ b/tests/ported_static/stRandom2/test_random_statetest572.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest572.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest572Filler.json
+state_tests/stRandom2/randomStatetest572Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest572Filler.json"],
+    ["state_tests/stRandom2/randomStatetest572Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest572(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest572."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,147 +43,57 @@ def test_random_statetest572(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GASLIMIT
-            + Op.LOG1(
-                offset=Op.SIGNEXTEND(
-                    Op.PREVRANDAO,
-                    Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-                ),
-                size=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-                topic_1=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.EXTCODESIZE
-            + Op.CODESIZE
-        ),
-        nonce=0,
-        address=Address("0x78f04949eef09fc73b40744730be09013e89f197"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe097f000000000000000000"  # noqa: E501
-            "0000004f3f701464972e74606d6ea82d4d3080599a0e79440ba13b38"
-        ),
-        gas_limit=100000,
-        value=1943383964,
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest572Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest572_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GASLIMIT
-            + Op.LOG1(
-                offset=Op.SIGNEXTEND(
-                    Op.PREVRANDAO,
-                    Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-                ),
-                size=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-                topic_1=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.EXTCODESIZE
-            + Op.CODESIZE
-        ),
+    # Source: raw
+    # 0x457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>440ba13b38  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.GASLIMIT
+        + Op.LOG1(
+            offset=Op.SIGNEXTEND(
+                Op.PREVRANDAO,
+                Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+            ),
+            size=Op.MULMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
+            topic_1=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+        )
+        + Op.EXTCODESIZE
+        + Op.CODESIZE,
         nonce=0,
-        address=Address("0x78f04949eef09fc73b40744730be09013e89f197"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe097f000000000000000000"  # noqa: E501
-            "0000004f3f701464972e74606d6ea82d4d3080599a0e79440ba13b38"
+        to=target,
+        data=Bytes(
+            "457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79440ba13b38"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1943383964,
+        value=0x73D5AF9C,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest574.py b/tests/ported_static/stRandom2/test_random_statetest574.py
index 08bd73990fe..941ad48d67e 100644
--- a/tests/ported_static/stRandom2/test_random_statetest574.py
+++ b/tests/ported_static/stRandom2/test_random_statetest574.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest574.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest574Filler.json
+state_tests/stRandom2/randomStatetest574Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest574Filler.json"],
+    ["state_tests/stRandom2/randomStatetest574Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest574(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest574."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,61 @@ def test_random_statetest574(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001047f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff046d369354827d7433a335af5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.DIV(Op.PUSH32[0x1], Op.PUSH32[0xC350])
+        + Op.PUSH32[0x1]
+        + Op.SSTORE(
+            key=0x369354827D7433A335AF55600051,
+            value=Op.DIV(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                Op.PUSH32[0xC350],
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x9D24EE5545ABDCCF759A8A1BE28DB858416FA3E7),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.DIV(Op.PUSH32[0x1], Op.PUSH32[0xC350])
-            + Op.PUSH32[0x1]
-            + Op.SSTORE(
-                key=0x369354827D7433A335AF55600051,
-                value=Op.DIV(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    Op.PUSH32[0xC350],
-                ),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x9d24ee5545abdccf759a8a1be28db858416fa3e7"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000001047f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff046d369354827d7433a335af"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001047f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff046d369354827d7433a335af"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1595303022,
+        value=0x5F16646E,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0x369354827D7433A335AF55600051: 0x14F8B588E368F08461F9F01B866E43AA79BBADC0980B242070B8CFBFC6540,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest575.py b/tests/ported_static/stRandom2/test_random_statetest575.py
index b81d11970ff..a741736b223 100644
--- a/tests/ported_static/stRandom2/test_random_statetest575.py
+++ b/tests/ported_static/stRandom2/test_random_statetest575.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest575.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest575Filler.json
+state_tests/stRandom2/randomStatetest575Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest575Filler.json"],
+    ["state_tests/stRandom2/randomStatetest575Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest575(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest575."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,69 +43,60 @@ def test_random_statetest575(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SWAP6
-            + Op.SWAP5
-            + Op.SWAP7
-            + Op.SSTORE
-            + Op.SSTORE
-            + Op.DUP16
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x71C7798D047D7B55)
-        ),
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>95949655558f6771c7798d047d7b5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SWAP6
+        + Op.SWAP5
+        + Op.SWAP7
+        + Op.SSTORE * 2
+        + Op.DUP16
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x71C7798D047D7B55),
         nonce=0,
-        address=Address("0xb14048581095a497d29abd14ea870a27e1bcdc77"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000007f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74"  # noqa: E501
-            "606d6ea82d4d3080599a0e7995949655558f6771c7798d047d7b"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e7995949655558f6771c7798d047d7b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=181388892,
+        value=0xACFC65C,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest576.py b/tests/ported_static/stRandom2/test_random_statetest576.py
index 1ce3e274a6e..c1b5f771703 100644
--- a/tests/ported_static/stRandom2/test_random_statetest576.py
+++ b/tests/ported_static/stRandom2/test_random_statetest576.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest576.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest576Filler.json
+state_tests/stRandom2/randomStatetest576Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest576Filler.json"],
+    ["state_tests/stRandom2/randomStatetest576Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest576(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest576."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,45 @@ def test_random_statetest576(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000000447f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3507f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000017f00000000000000"  # noqa: E501
-            "0000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000086053a0b43890710810651116e1555"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x447d08abed1518b3b0d1adee769af4e010f53737"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000000086053a0b43890710810651116e1555  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000000086053a0b43890710810651116e1555"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000000000000000000000000000000000000000000000447f00"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000c3507f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000017f00000000000000"  # noqa: E501
-            "0000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000086053a0b43890710810651116e15"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000000086053a0b43890710810651116e15"  # noqa: E501
         ),
         gas_limit=100000,
-        value=768288943,
+        value=0x2DCB28AF,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest577.py b/tests/ported_static/stRandom2/test_random_statetest577.py
index f03ad16351b..6196d40cf1d 100644
--- a/tests/ported_static/stRandom2/test_random_statetest577.py
+++ b/tests/ported_static/stRandom2/test_random_statetest577.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest577.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest577Filler.json
+state_tests/stRandom2/randomStatetest577Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest577Filler.json"],
+    ["state_tests/stRandom2/randomStatetest577Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest577(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest577."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,53 +43,52 @@ def test_random_statetest577(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x45414344434244413155
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.GASLIMIT
+        + Op.COINBASE
+        + Op.NUMBER
+        + Op.PREVRANDAO
+        + Op.NUMBER
+        + Op.TIMESTAMP
+        + Op.SSTORE(key=Op.BALANCE(address=Op.COINBASE), value=Op.PREVRANDAO),
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.GASLIMIT
-            + Op.COINBASE
-            + Op.NUMBER
-            + Op.PREVRANDAO
-            + Op.NUMBER
-            + Op.TIMESTAMP
-            + Op.SSTORE(
-                key=Op.BALANCE(address=Op.COINBASE), value=Op.PREVRANDAO
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=46,
         nonce=0,
-        address=Address("0xe2a7c7de420afc2cd4066e4b3782ad5bbae7260c"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={46: 0x20000}),
+        target: Account(
+            storage={46: 0x20000},
+            balance=0xDE0B6B3A76586A0,
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest578.py b/tests/ported_static/stRandom2/test_random_statetest578.py
index af19a7ecc32..5cf34b9d666 100644
--- a/tests/ported_static/stRandom2/test_random_statetest578.py
+++ b/tests/ported_static/stRandom2/test_random_statetest578.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest578.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest578Filler.json
+state_tests/stRandom2/randomStatetest578Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest578Filler.json"],
+    ["state_tests/stRandom2/randomStatetest578Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest578(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest578."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,61 @@ def test_random_statetest578(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c350457f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4255  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.GASLIMIT
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.TIMESTAMP,
+            value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x9582D1A71DC779D62264389F2BBAF2B8196034C5),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.GASLIMIT
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.TIMESTAMP,
-                value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x9582d1a71dc779d62264389f2bbaf2b8196034c5"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c350457f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000007fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff42"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c350457f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff42"  # noqa: E501
         ),
         gas_limit=100000,
-        value=399078357,
+        value=0x17C973D5,
     )
 
     post = {
-        contract: Account(
-            storage={1000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF},
+        target: Account(
+            storage={
+                1: 0,
+                1000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+            },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest579.py b/tests/ported_static/stRandom2/test_random_statetest579.py
index 30c59045d2e..7ab0ddf9106 100644
--- a/tests/ported_static/stRandom2/test_random_statetest579.py
+++ b/tests/ported_static/stRandom2/test_random_statetest579.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest579.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest579Filler.json
+state_tests/stRandom2/randomStatetest579Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest579Filler.json"],
+    ["state_tests/stRandom2/randomStatetest579Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest579(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest579."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,58 +43,45 @@ def test_random_statetest579(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350f2075b67c755  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350f2075b67c755"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000007f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000017f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c350f2075b67c755"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x78442c2f07f963337c3cef742d2a1ba66986a918"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000007f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000017f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c350f2075b67c7"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350f2075b67c7"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1929468879,
+        value=0x73015BCF,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest580.py b/tests/ported_static/stRandom2/test_random_statetest580.py
index 86fbdefa0b2..48f1d7352d7 100644
--- a/tests/ported_static/stRandom2/test_random_statetest580.py
+++ b/tests/ported_static/stRandom2/test_random_statetest580.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest580.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest580Filler.json
+state_tests/stRandom2/randomStatetest580Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest580Filler.json"],
+    ["state_tests/stRandom2/randomStatetest580Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest580(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest580."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,64 +47,59 @@ def test_random_statetest580(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000457f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f4640879d18777b953a209836379a305560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.GASLIMIT
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x4640879D18777B953A209836379A3055
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xA5BF46323464D6F1AD991DCB5D725E28FD5B267D),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.GASLIMIT
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x4640879D18777B953A209836379A3055,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xa5bf46323464d6f1ad991dcb5d725e28fd5b267d"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000457f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000007f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000006f4640879d18777b953a209836379a30"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000457f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f4640879d18777b953a209836379a30"  # noqa: E501
         ),
         gas_limit=100000,
-        value=741737505,
+        value=0x2C360421,
     )
 
     post = {
-        contract: Account(storage={0: 0x4640879D18777B953A209836379A3055}),
+        target: Account(
+            storage={0: 0x4640879D18777B953A209836379A3055},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest581.py b/tests/ported_static/stRandom2/test_random_statetest581.py
index b04e0a235f3..62ed09442c4 100644
--- a/tests/ported_static/stRandom2/test_random_statetest581.py
+++ b/tests/ported_static/stRandom2/test_random_statetest581.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest581.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest581Filler.json
+state_tests/stRandom2/randomStatetest581Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest581Filler.json"],
+    ["state_tests/stRandom2/randomStatetest581Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest581(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest581."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,53 +47,48 @@ def test_random_statetest581(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001037f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff44920907ff7e7d701260005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000001037f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000007f00000000000000"  # noqa: E501
-            "0000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff44920907ff7e7d701260005155"
+            "7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001037f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff44920907ff7e7d701260005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x2e41249a09bb2414d41641bd9cd9a15393d41e76"),  # noqa: E501
+        address=Address(0x2E41249A09BB2414D41641BD9CD9A15393D41E76),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017f0000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000001037f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000007f00000000000000"  # noqa: E501
-            "0000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff44920907ff7e7d7012"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001037f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff44920907ff7e7d7012"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1563515411,
+        value=0x5D315A13,
     )
 
-    post: dict = {}
+    post = {
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+        Address(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF): Account(
+            storage={}, code=b"", nonce=0
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest582.py b/tests/ported_static/stRandom2/test_random_statetest582.py
index 158ff91d864..62bc7a401ca 100644
--- a/tests/ported_static/stRandom2/test_random_statetest582.py
+++ b/tests/ported_static/stRandom2/test_random_statetest582.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest582.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest582Filler.json
+state_tests/stRandom2/randomStatetest582Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest582Filler.json"],
+    ["state_tests/stRandom2/randomStatetest582Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest582(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest582."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,64 +43,55 @@ def test_random_statetest582(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.COINBASE
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.ADDMOD(Op.GASLIMIT, Op.PUSH32[0x0], Op.PUSH32[0x0])
-            + Op.RETURN(offset=Op.DUP1, size=0x17718)
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000045086201771880f35560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.COINBASE
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[0xC350]
+        + Op.ADDMOD(Op.GASLIMIT, Op.PUSH32[0x0], Op.PUSH32[0x0])
+        + Op.RETURN(offset=Op.DUP1, size=0x17718)
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x99e6f87cba9c1737f49965828c1badec51a91dfd"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79417f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000007fffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c3507f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000007f00000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000045086201771880f3"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000045086201771880f3"  # noqa: E501
         ),
         gas_limit=200000,
-        value=1969973721,
+        value=0x756B69D9,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest583.py b/tests/ported_static/stRandom2/test_random_statetest583.py
index 245ff0771a2..b564ad40a77 100644
--- a/tests/ported_static/stRandom2/test_random_statetest583.py
+++ b/tests/ported_static/stRandom2/test_random_statetest583.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest583.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest583Filler.json
+state_tests/stRandom2/randomStatetest583Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest583Filler.json"],
+    ["state_tests/stRandom2/randomStatetest583Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest583(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest583."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,66 +44,59 @@ def test_random_statetest583(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.LOG3(
-                offset=Op.CALLDATASIZE,
-                size=0x327C55,
-                topic_1=Op.MLOAD(offset=Op.TIMESTAMP),
-                topic_2=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-                topic_3=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-            )
-            + Op.PUSH11[0xF3809C3A8F396660005155]
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>425162327c5536a36af3809c3a8f396660005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.LOG3(
+            offset=Op.CALLDATASIZE,
+            size=0x327C55,
+            topic_1=Op.MLOAD(offset=Op.TIMESTAMP),
+            topic_2=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+            topic_3=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+        )
+        + Op.PUSH11[0xF3809C3A8F396660005155],
         nonce=0,
-        address=Address("0x5ed77238cfac99cedf0d4438ddadfe34ed439d7f"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464"  # noqa: E501
-            "972e74606d6ea82d4d3080599a0e79425162327c5536a36af3809c3a8f3966"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79425162327c5536a36af3809c3a8f3966"  # noqa: E501
         ),
         gas_limit=1655377476,
-        value=1472402212,
+        value=0x57C31324,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest584.py b/tests/ported_static/stRandom2/test_random_statetest584.py
index 21c8b8b8b05..0d4ed6bebc1 100644
--- a/tests/ported_static/stRandom2/test_random_statetest584.py
+++ b/tests/ported_static/stRandom2/test_random_statetest584.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest584.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest584Filler.json
+state_tests/stRandom2/randomStatetest584Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest584Filler.json"],
+    ["state_tests/stRandom2/randomStatetest584Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest584(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest584."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,74 +47,67 @@ def test_random_statetest584(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SWAP7
-            + Op.SWAP3
-            + Op.NOT
-            + Op.SSTORE(key=Op.CALLER, value=Op.MULMOD)
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe96921909335560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SWAP7
+        + Op.SWAP3
+        + Op.NOT
+        + Op.SSTORE(key=Op.CALLER, value=Op.MULMOD)
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0xa6eb2c6959a0b259080ff4156a01c2b5ccad2e29"),  # noqa: E501
+        address=Address(0xA6EB2C6959A0B259080FF4156A01C2B5CCAD2E29),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000017fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe9692190933"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9692190933"  # noqa: E501
         ),
         gas_limit=100000,
-        value=352685837,
+        value=0x15058F0D,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
                 0x2E3D0156D2B99A6EACBA540C55F423C8F5A33143: 0xFFFFFFFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000000,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest585.py b/tests/ported_static/stRandom2/test_random_statetest585.py
index cc72c2ef1ab..e103f51782c 100644
--- a/tests/ported_static/stRandom2/test_random_statetest585.py
+++ b/tests/ported_static/stRandom2/test_random_statetest585.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest585.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest585Filler.json
+state_tests/stRandom2/randomStatetest585Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest585Filler.json"],
+    ["state_tests/stRandom2/randomStatetest585Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest585(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest585."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,62 @@ def test_random_statetest585(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe55  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xac0f5185babc3f1b583c2b31429e4f4b5f843ac3"),  # noqa: E501
+        address=Address(0xAC0F5185BABC3F1B583C2B31429E4F4B5F843AC3),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "0100000000000000000000000000000000000000007fffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"  # noqa: E501
         ),
         gas_limit=100000,
-        value=380785530,
+        value=0x16B2537A,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest586.py b/tests/ported_static/stRandom2/test_random_statetest586.py
index 04b5f3c3786..6dfec8e8411 100644
--- a/tests/ported_static/stRandom2/test_random_statetest586.py
+++ b/tests/ported_static/stRandom2/test_random_statetest586.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest586.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest586Filler.json
+state_tests/stRandom2/randomStatetest586Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest586Filler.json"],
+    ["state_tests/stRandom2/randomStatetest586Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest586(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest586."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,70 +43,59 @@ def test_random_statetest586(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000013760005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x1] * 3
+        + Op.PUSH32[0xC350]
+        + Op.CALLDATACOPY(
+            dest_offset=Op.PUSH32[0x1],
+            offset=Op.PUSH32[0x1],
+            size=Op.PUSH32[0xC350],
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.CALLDATACOPY(
-                dest_offset=Op.PUSH32[0x1],
-                offset=Op.PUSH32[0x1],
-                size=Op.PUSH32[0xC350],
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x92cf87191dd055f997ca7b4479b54f4345467ba9"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507f0000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000c3507f0000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000017f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000137"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000137"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1708929612,
+        value=0x65DC324C,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 50000,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest587.py b/tests/ported_static/stRandom2/test_random_statetest587.py
index b86fde493d0..037dc6d5095 100644
--- a/tests/ported_static/stRandom2/test_random_statetest587.py
+++ b/tests/ported_static/stRandom2/test_random_statetest587.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest587.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest587Filler.json
+state_tests/stRandom2/randomStatetest587Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest587Filler.json"],
+    ["state_tests/stRandom2/randomStatetest587Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest587(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest587."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,61 +47,57 @@ def test_random_statetest587(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.GT(Op.PUSH32[0xC350], Op.PUSH32[0x0])
-            + Op.PUSH32[0x1]
-            + Op.GASLIMIT
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x8B7152A3958A923C1665B27557089A55,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350117f0000000000000000000000000000000000000000000000000000000000000001457f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f8b7152a3958a923c1665b27557089a5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.GT(Op.PUSH32[0xC350], Op.PUSH32[0x0])
+        + Op.PUSH32[0x1]
+        + Op.GASLIMIT
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x8B7152A3958A923C1665B27557089A55
         ),
         nonce=0,
-        address=Address("0x5a19607cf239e82e6c621692577eef772162d139"),  # noqa: E501
+        address=Address(0x5A19607CF239E82E6C621692577EEF772162D139),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c350117f00000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000001457f000000000000000000000000"  # noqa: E501
-            "4f3f701464972e74606d6ea82d4d3080599a0e796f8b7152a3958a923c1665b27557089a"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350117f0000000000000000000000000000000000000000000000000000000000000001457f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f8b7152a3958a923c1665b27557089a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=291521552,
+        value=0x11604410,
     )
 
     post = {
-        contract: Account(storage={0: 0x8B7152A3958A923C1665B27557089A55}),
+        target: Account(
+            storage={0: 0x8B7152A3958A923C1665B27557089A55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest588.py b/tests/ported_static/stRandom2/test_random_statetest588.py
index c53f1d71016..d7d56fc223f 100644
--- a/tests/ported_static/stRandom2/test_random_statetest588.py
+++ b/tests/ported_static/stRandom2/test_random_statetest588.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest588.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest588Filler.json
+state_tests/stRandom2/randomStatetest588Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest588Filler.json"],
+    ["state_tests/stRandom2/randomStatetest588Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest588(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest588."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,69 +43,64 @@ def test_random_statetest588(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.COINBASE
-            + Op.NUMBER
-            + Op.PUSH32[0x1]
-            + Op.CALLDATACOPY(
-                dest_offset=Op.MOD(
-                    Op.NUMBER,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-                offset=Op.PUSH32[0x1],
-                size=Op.PUSH32[0xC350],
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff41437f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff43063760005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.COINBASE
+        + Op.NUMBER
+        + Op.PUSH32[0x1]
+        + Op.CALLDATACOPY(
+            dest_offset=Op.MOD(
+                Op.NUMBER,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+            offset=Op.PUSH32[0x1],
+            size=Op.PUSH32[0xC350],
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x2c3d41995b7f3d32e08c6575e2ddaa1ae5cf2067"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff41437f"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000017f000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000c3507f000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000017fffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffff430637"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff41437f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff430637"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1725348983,
+        value=0x66D6BC77,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 1,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 0,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest589.py b/tests/ported_static/stRandom2/test_random_statetest589.py
index e195026b0f9..9843c5030ad 100644
--- a/tests/ported_static/stRandom2/test_random_statetest589.py
+++ b/tests/ported_static/stRandom2/test_random_statetest589.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest589.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest589Filler.json
+state_tests/stRandom2/randomStatetest589Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest589Filler.json"],
+    ["state_tests/stRandom2/randomStatetest589Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest589(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest589."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,62 +43,53 @@ def test_random_statetest589(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.TIMESTAMP
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PC
-            + Op.RETURN(offset=Op.DUP2, size=Op.CALLVALUE)
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0), value=0x85646D53671639175B9408
-            )
-        ),
+    # Source: raw
+    # 0x427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b940860005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.TIMESTAMP
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PC
+        + Op.RETURN(offset=Op.DUP2, size=Op.CALLVALUE)
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x85646D53671639175B9408),
         nonce=0,
-        address=Address("0xb2da1f608a7e0626e721677fa30fc46d2d99c655"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "427f00000000000000000000000000000000000000000000000000000000000000007f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000017f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000"  # noqa: E501
-            "0000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b9408"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b9408"  # noqa: E501
         ),
         gas_limit=4400000,
-        value=1485632,
+        value=0x16AB40,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest592.py b/tests/ported_static/stRandom2/test_random_statetest592.py
index fb48c787595..8fcb0a5fbbf 100644
--- a/tests/ported_static/stRandom2/test_random_statetest592.py
+++ b/tests/ported_static/stRandom2/test_random_statetest592.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest592.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest592Filler.json
+state_tests/stRandom2/randomStatetest592Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest592Filler.json"],
+    ["state_tests/stRandom2/randomStatetest592Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest592(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest592."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,66 +46,61 @@ def test_random_statetest592(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.GASLIMIT
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MULMOD(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    Op.PUSH32[0x10000000000000000000000000000000000000000],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x19cc73462c6b04d360707355ac19146db67eb609"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.GASLIMIT
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MULMOD(
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                Op.PUSH32[0x10000000000000000000000000000000000000000],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x19CC73462C6B04D360707355AC19146DB67EB609),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e79457fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff09"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1664737509,
+        value=0x6339E0E5,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000FFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest596.py b/tests/ported_static/stRandom2/test_random_statetest596.py
index 85270aba81d..378a0feb172 100644
--- a/tests/ported_static/stRandom2/test_random_statetest596.py
+++ b/tests/ported_static/stRandom2/test_random_statetest596.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest596.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest596Filler.json
+state_tests/stRandom2/randomStatetest596Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest596Filler.json"],
+    ["state_tests/stRandom2/randomStatetest596Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest596(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest596."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,61 +47,55 @@ def test_random_statetest596(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001317f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f7066a3507f6e0906539456383065205560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.BALANCE(address=Op.PUSH32[0x1])
+        + Op.PUSH32[0x10000000000000000000000000000000000000000] * 2
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x7066A3507F6E09065394563830652055
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x7DA4E942D745C3AA5378B0D785AABC77D03EBF58),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.BALANCE(address=Op.PUSH32[0x1])
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x7066A3507F6E09065394563830652055,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x7da4e942d745c3aa5378b0d785aabc77d03ebf58"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000001317f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000006f7066a3507f6e090653945638306520"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001317f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f7066a3507f6e090653945638306520"  # noqa: E501
         ),
         gas_limit=100000,
-        value=765064321,
+        value=0x2D99F481,
     )
 
     post = {
-        contract: Account(storage={0: 0x7066A3507F6E09065394563830652055}),
+        target: Account(
+            storage={0: 0x7066A3507F6E09065394563830652055},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest597.py b/tests/ported_static/stRandom2/test_random_statetest597.py
index 7c25e626801..56d8fd21a72 100644
--- a/tests/ported_static/stRandom2/test_random_statetest597.py
+++ b/tests/ported_static/stRandom2/test_random_statetest597.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest597.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest597Filler.json
+state_tests/stRandom2/randomStatetest597Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest597Filler.json"],
+    ["state_tests/stRandom2/randomStatetest597Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest597(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest597."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,45 @@ def test_random_statetest597(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79967f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff3a7e737d40070a156482930a0875"
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x2f021da657fb4d77fbcc8556101f287ddc7e44db"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>967f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3a7e737d40070a156482930a0875  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79967f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3a7e737d40070a156482930a0875"  # noqa: E501
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79967f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff3a7e737d40070a156482930a0875"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79967f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3a7e737d40070a156482930a0875"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1879452952,
+        value=0x70062D18,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest599.py b/tests/ported_static/stRandom2/test_random_statetest599.py
index fe10b029a72..4c95373662d 100644
--- a/tests/ported_static/stRandom2/test_random_statetest599.py
+++ b/tests/ported_static/stRandom2/test_random_statetest599.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest599.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest599Filler.json
+state_tests/stRandom2/randomStatetest599Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest599Filler.json"],
+    ["state_tests/stRandom2/randomStatetest599Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest599(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest599."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,71 +47,63 @@ def test_random_statetest599(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x8D6C60440A44449372068A976A838255,
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f8d6c60440a44449372068a976a83825560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        * 2
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x8D6C60440A44449372068A976A838255
         ),
         nonce=0,
-        address=Address("0xdf8466089bd5913066f6d053ac12c5cf376be1ec"),  # noqa: E501
+        address=Address(0xDF8466089BD5913066F6D053AC12C5CF376BE1EC),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000017fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff6f8d6c60440a44449372068a976a8382"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f8d6c60440a44449372068a976a8382"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1108427958,
+        value=0x421144B6,
     )
 
     post = {
-        contract: Account(storage={0: 0x8D6C60440A44449372068A976A838255}),
+        target: Account(
+            storage={0: 0x8D6C60440A44449372068A976A838255},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest600.py b/tests/ported_static/stRandom2/test_random_statetest600.py
index 8daf4db5cb7..a1aaa216c67 100644
--- a/tests/ported_static/stRandom2/test_random_statetest600.py
+++ b/tests/ported_static/stRandom2/test_random_statetest600.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest600.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest600Filler.json
+state_tests/stRandom2/randomStatetest600Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest600Filler.json"],
+    ["state_tests/stRandom2/randomStatetest600Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest600(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest600."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,64 +47,59 @@ def test_random_statetest600(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35043457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f0b6f37208e76a402927039198c96990760005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xC350] * 2
+        + Op.NUMBER
+        + Op.GASLIMIT
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0xB6F37208E76A402927039198C969907
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xEBCAA36388652F22565C63FD8945D8B9326018BA),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0xC350]
-            + Op.NUMBER
-            + Op.GASLIMIT
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0xB6F37208E76A402927039198C969907,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xebcaa36388652f22565c63fd8945d8b9326018ba"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c3507f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c35043457fffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffe6f0b6f37208e76a40292703919"  # noqa: E501
-            "8c969907"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35043457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f0b6f37208e76a402927039198c969907"  # noqa: E501
         ),
         gas_limit=100000,
-        value=181662108,
+        value=0xAD3F19C,
     )
 
     post = {
-        contract: Account(storage={0: 0xB6F37208E76A402927039198C969907}),
+        target: Account(
+            storage={0: 0xB6F37208E76A402927039198C969907},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest601.py b/tests/ported_static/stRandom2/test_random_statetest601.py
index 53272f15613..045e18c7ec7 100644
--- a/tests/ported_static/stRandom2/test_random_statetest601.py
+++ b/tests/ported_static/stRandom2/test_random_statetest601.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest601.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest601Filler.json
+state_tests/stRandom2/randomStatetest601Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest601Filler.json"],
+    ["state_tests/stRandom2/randomStatetest601Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest601(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest601."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,56 +43,45 @@ def test_random_statetest601(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350377f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000000b3a09785b1084418866100af0868a3455  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "00000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c350377f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507f00000000000000000000000100000000"  # noqa: E501
-            "000000000000000000000000000000000b3a09785b1084418866100af0868a3455"  # noqa: E501
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350377f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000000b3a09785b1084418866100af0868a3455"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0x287d3f26febb148710a503235ebf7ac1f1b75838"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "00000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c350377f00000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000c3507f00000000000000000000000100000000"  # noqa: E501
-            "000000000000000000000000000000000b3a09785b1084418866100af0868a34"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350377f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000000b3a09785b1084418866100af0868a34"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2056709657,
+        value=0x7A96E619,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest602.py b/tests/ported_static/stRandom2/test_random_statetest602.py
index 7fbeb15b5d2..79e37586ce8 100644
--- a/tests/ported_static/stRandom2/test_random_statetest602.py
+++ b/tests/ported_static/stRandom2/test_random_statetest602.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest602.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest602Filler.json
+state_tests/stRandom2/randomStatetest602Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest602Filler.json"],
+    ["state_tests/stRandom2/randomStatetest602Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest602(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest602."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,65 +46,57 @@ def test_random_statetest602(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x1a15031b3876144e7362ee8e8e2ddfbe56e0cb51"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x1A15031B3876144E7362EE8E8E2DDFBE56E0CB51),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017f0000000000000000"  # noqa: E501
-            "00000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017f0000000000000000000000010000000000"  # noqa: E501
-            "0000000000000000000000000000007f000000000000000000000000ffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffff"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
         ),
         gas_limit=100000,
-        value=634394404,
+        value=0x25D01724,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF},
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest603.py b/tests/ported_static/stRandom2/test_random_statetest603.py
index 27c385e5c55..cac980e3f24 100644
--- a/tests/ported_static/stRandom2/test_random_statetest603.py
+++ b/tests/ported_static/stRandom2/test_random_statetest603.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest603.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest603Filler.json
+state_tests/stRandom2/randomStatetest603Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest603Filler.json"],
+    ["state_tests/stRandom2/randomStatetest603Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest603(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest603."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,62 +47,58 @@ def test_random_statetest603(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.ADDMOD(
-                Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                Op.PUSH32[0x10000000000000000000000000000000000000000],
-            )
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x655860560745326476A03CDC36063455,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>427f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>086f655860560745326476a03cdc3606345560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.ADDMOD(
+            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,
+            Op.PUSH32[0x10000000000000000000000000000000000000000],
+        )
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x655860560745326476A03CDC36063455
         ),
         nonce=0,
-        address=Address("0x503333f6d5ddc17e393a7a209db4cf7842ce6d94"),  # noqa: E501
+        address=Address(0x503333F6D5DDC17E393A7A209DB4CF7842CE6D94),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79427f00000000"  # noqa: E501
-            "00000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e79086f655860560745326476a03cdc360634"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79427f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79086f655860560745326476a03cdc360634"  # noqa: E501
         ),
         gas_limit=100000,
-        value=603781106,
+        value=0x23FCF7F2,
     )
 
     post = {
-        contract: Account(storage={0: 0x655860560745326476A03CDC36063455}),
+        target: Account(
+            storage={0: 0x655860560745326476A03CDC36063455},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest604.py b/tests/ported_static/stRandom2/test_random_statetest604.py
index aa8fb93d43d..389d4667196 100644
--- a/tests/ported_static/stRandom2/test_random_statetest604.py
+++ b/tests/ported_static/stRandom2/test_random_statetest604.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest604.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest604Filler.json
+state_tests/stRandom2/randomStatetest604Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest604Filler.json"],
+    ["state_tests/stRandom2/randomStatetest604Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest604(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest604."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,66 +43,61 @@ def test_random_statetest604(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000437f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44a4418a83039c0587363b0518204006065a06  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG4(
+            offset=Op.PREVRANDAO,
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            topic_1=Op.PUSH32[0x0],
+            topic_2=Op.NUMBER,
+            topic_3=Op.PUSH32[0x10000000000000000000000000000000000000000],
+            topic_4=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+        )
+        + Op.COINBASE
+        + Op.SUB(Op.DUP4, Op.DUP11)
+        + Op.SWAP13
+        + Op.MOD(
+            Op.BLOCKHASH(block_number=Op.SHA3),
+            Op.XOR(
+                Op.SDIV(Op.EXTCODESIZE(address=Op.CALLDATASIZE), Op.DUP8),
+                Op.SDIV,
+            ),
+        )
+        + Op.MOD(Op.GAS, Op.MOD),
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.LOG4(
-                offset=Op.PREVRANDAO,
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                topic_1=Op.PUSH32[0x0],
-                topic_2=Op.NUMBER,
-                topic_3=Op.PUSH32[0x10000000000000000000000000000000000000000],
-                topic_4=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-            )
-            + Op.COINBASE
-            + Op.SUB(Op.DUP4, Op.DUP11)
-            + Op.SWAP13
-            + Op.MOD(
-                Op.BLOCKHASH(block_number=Op.SHA3),
-                Op.XOR(
-                    Op.SDIV(Op.EXTCODESIZE(address=Op.CALLDATASIZE), Op.DUP8),
-                    Op.SDIV,
-                ),
-            )
-            + Op.MOD(Op.GAS, Op.MOD)
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x7619f7a13ba66bb3e74b1d609bc4c979fdfda283"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000010000000000000000000000000000000000000000437f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000007fffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffe44a4418a83039c0587363b"  # noqa: E501
-            "0518204006065a06"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000437f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44a4418a83039c0587363b0518204006065a06"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1287981996,
+        value=0x4CC50BAC,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest605.py b/tests/ported_static/stRandom2/test_random_statetest605.py
index a925ba20dc0..49d73144b9e 100644
--- a/tests/ported_static/stRandom2/test_random_statetest605.py
+++ b/tests/ported_static/stRandom2/test_random_statetest605.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest605.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest605Filler.json
+state_tests/stRandom2/randomStatetest605Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest605Filler.json"],
+    ["state_tests/stRandom2/randomStatetest605Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest605(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest605."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,63 @@ def test_random_statetest605(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.NUMBER
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SWAP1
-            + Op.ADDMOD(Op.DUP6, Op.SUB, Op.PC)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x389ee64ba69526fd0e3f1c8a92544cb4b24b7a23"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff905803850855  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.NUMBER
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SWAP1
+        + Op.ADDMOD(Op.DUP6, Op.SUB, Op.PC)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x389EE64BA69526FD0E3F1C8A92544CB4B24B7A23),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c350437f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff9058038508"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9058038508"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1694516474,
+        value=0x650044FA,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0xFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000000000000E9: 0x10000000000000000000000000000000000000000,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest607.py b/tests/ported_static/stRandom2/test_random_statetest607.py
index ffec687c121..25d34d7fb5d 100644
--- a/tests/ported_static/stRandom2/test_random_statetest607.py
+++ b/tests/ported_static/stRandom2/test_random_statetest607.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest607.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest607Filler.json
+state_tests/stRandom2/randomStatetest607Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest607Filler.json"],
+    ["state_tests/stRandom2/randomStatetest607Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest607(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest607."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,56 @@ def test_random_statetest607(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MULMOD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-                value=Op.PUSH32[0x10000000000000000000000000000000000000000],
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0955  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF] * 2
+        + Op.SSTORE(
+            key=Op.MULMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+            value=Op.PUSH32[0x10000000000000000000000000000000000000000],
         ),
         nonce=0,
-        address=Address("0xc89ae2a04dec1d7aef4b220588d9a25ff766dbe1"),  # noqa: E501
+        address=Address(0xC89AE2A04DEC1D7AEF4B220588D9A25FF766DBE1),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff09"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=275642360,
+        value=0x106DF7F8,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={0: 0x10000000000000000000000000000000000000000},
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest608.py b/tests/ported_static/stRandom2/test_random_statetest608.py
index 69dff0bf57f..c2e3f263a97 100644
--- a/tests/ported_static/stRandom2/test_random_statetest608.py
+++ b/tests/ported_static/stRandom2/test_random_statetest608.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest608.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest608Filler.json
+state_tests/stRandom2/randomStatetest608Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest608Filler.json"],
+    ["state_tests/stRandom2/randomStatetest608Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest608(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest608."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,63 +47,58 @@ def test_random_statetest608(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350537fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0855  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.MSTORE8(offset=Op.PUSH32[0xC350], value=Op.PUSH32[0x1])
+        + Op.ADDMOD(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+        )
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x743B4F9865E7D749E3DD1949963C890B0AF079BC),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.MSTORE8(offset=Op.PUSH32[0xC350], value=Op.PUSH32[0x1])
-            + Op.ADDMOD(
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x743b4f9865e7d749e3dd1949963c890b0af079bc"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000c350537fffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffe08"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350537fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08"  # noqa: E501
         ),
         gas_limit=100000,
-        value=514995498,
+        value=0x1EB2352A,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest609.py b/tests/ported_static/stRandom2/test_random_statetest609.py
index f1459989484..a47e6b355e1 100644
--- a/tests/ported_static/stRandom2/test_random_statetest609.py
+++ b/tests/ported_static/stRandom2/test_random_statetest609.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest609.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest609Filler.json
+state_tests/stRandom2/randomStatetest609Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest609Filler.json"],
+    ["state_tests/stRandom2/randomStatetest609Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest609(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest609."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,131 +43,45 @@ def test_random_statetest609(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000001a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000001a736e628f796436739660005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000001a7fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100"  # noqa: E501
-            "000000000000000000000000000000000000001a736e628f796436739660005155"  # noqa: E501
+            "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000001a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000001a736e628f796436739660005155"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xd9b6a1d9a0741c62dc96e8d37a972be5adb708e8"),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000001a7fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100"  # noqa: E501
-            "000000000000000000000000000000000000001a736e628f7964367396"
-        ),
-        gas_limit=100000,
-        value=1675392723,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest609Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest609_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000001a7fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100"  # noqa: E501
-            "000000000000000000000000000000000000001a736e628f796436739660005155"  # noqa: E501
-        ),
-        nonce=0,
-        address=Address("0xd9b6a1d9a0741c62dc96e8d37a972be5adb708e8"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000001a7fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100"  # noqa: E501
-            "000000000000000000000000000000000000001a736e628f7964367396"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000001a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000001a736e628f7964367396"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1675392723,
+        value=0x63DC76D3,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest610.py b/tests/ported_static/stRandom2/test_random_statetest610.py
index 44356fce411..cf244576c52 100644
--- a/tests/ported_static/stRandom2/test_random_statetest610.py
+++ b/tests/ported_static/stRandom2/test_random_statetest610.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest610.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest610Filler.json
+state_tests/stRandom2/randomStatetest610Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest610Filler.json"],
+    ["state_tests/stRandom2/randomStatetest610Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest610(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest610."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,64 +47,59 @@ def test_random_statetest610(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.COINBASE
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x1F353A2437E4384726497587B855655,
-            )
+    # Source: raw
+    # 0x417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f01f353a2437e4384726497587b85565560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.COINBASE
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x1F353A2437E4384726497587B855655
         ),
         nonce=0,
-        address=Address("0xb31c72b16a9c3c9684628b4f39b4aafdafa85c1e"),  # noqa: E501
+        address=Address(0xB31C72B16A9C3C9684628B4F39B4AAFDAFA85C1E),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000017f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c3507f00000000000000"  # noqa: E501
-            "00000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000007f000000000000000000000000ffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff6f01f353a2437e4384726497587b8556"
+        to=target,
+        data=Bytes(
+            "417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f01f353a2437e4384726497587b8556"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2145229980,
+        value=0x7FDD9C9C,
     )
 
     post = {
-        contract: Account(storage={0: 0x1F353A2437E4384726497587B855655}),
+        target: Account(
+            storage={0: 0x1F353A2437E4384726497587B855655},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest611.py b/tests/ported_static/stRandom2/test_random_statetest611.py
index a59dab38152..9ae93c6cade 100644
--- a/tests/ported_static/stRandom2/test_random_statetest611.py
+++ b/tests/ported_static/stRandom2/test_random_statetest611.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest611.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest611Filler.json
+state_tests/stRandom2/randomStatetest611Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest611Filler.json"],
+    ["state_tests/stRandom2/randomStatetest611Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest611(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest611."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,60 +43,53 @@ def test_random_statetest611(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c350417f0000000000000000000000000000000000000000000000000000000000000001437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001357f00000000000000000000000000000000000000000000000000000000000000000b9b84a360005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.COINBASE
+        + Op.PUSH32[0x1]
+        + Op.NUMBER
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SIGNEXTEND(Op.PUSH32[0x0], Op.CALLDATALOAD(offset=Op.PUSH32[0x1]))
+        + Op.SWAP12
+        + Op.DUP5
+        + Op.LOG3
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.COINBASE
-            + Op.PUSH32[0x1]
-            + Op.NUMBER
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SIGNEXTEND(
-                Op.PUSH32[0x0], Op.CALLDATALOAD(offset=Op.PUSH32[0x1])
-            )
-            + Op.SWAP12
-            + Op.DUP5
-            + Op.LOG3
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x54f36e7e44ceab6d23e4d7ebd547858553649b64"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c350417f00"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000001437f000000"  # noqa: E501
-            "000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000001357f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000b9b84a3"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c350417f0000000000000000000000000000000000000000000000000000000000000001437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001357f00000000000000000000000000000000000000000000000000000000000000000b9b84a3"  # noqa: E501
         ),
         gas_limit=100000,
-        value=40953114,
+        value=0x270E51A,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest612.py b/tests/ported_static/stRandom2/test_random_statetest612.py
index c4289fa693a..2bef95ebe43 100644
--- a/tests/ported_static/stRandom2/test_random_statetest612.py
+++ b/tests/ported_static/stRandom2/test_random_statetest612.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest612.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest612Filler.json
+state_tests/stRandom2/randomStatetest612Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest612Filler.json"],
+    ["state_tests/stRandom2/randomStatetest612Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest612(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest612."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,71 +47,65 @@ def test_random_statetest612(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff095560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.NUMBER
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.SSTORE(
+            key=Op.MULMOD(
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
+            value=Op.PUSH32[0x10000000000000000000000000000000000000000],
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x93497AB2BBAF6BDDEC1226312F92598309CD1443),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.NUMBER
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.SSTORE(
-                key=Op.MULMOD(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                ),
-                value=Op.PUSH32[0x10000000000000000000000000000000000000000],
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x93497ab2bbaf6bddec1226312f92598309cd1443"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000017f00000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000c3507f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007fffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff09"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=721306946,
+        value=0x2AFE4542,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 50000,
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 0x10000000000000000000000000000000000000000,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest615.py b/tests/ported_static/stRandom2/test_random_statetest615.py
index c06eb7dcbf5..db257da65f6 100644
--- a/tests/ported_static/stRandom2/test_random_statetest615.py
+++ b/tests/ported_static/stRandom2/test_random_statetest615.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest615.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest615Filler.json
+state_tests/stRandom2/randomStatetest615Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest615Filler.json"],
+    ["state_tests/stRandom2/randomStatetest615Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest615(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest615."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,73 +46,67 @@ def test_random_statetest615(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MULMOD(
-                    Op.PUSH32[0x10000000000000000000000000000000000000000],
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    Op.DUP4,
-                ),
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-            )
-            + Op.PUSH13[0x6F390A3054D7368A9A55600051]
-            + Op.SSTORE
-        ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe837f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000009556c6f390a3054d7368a9a5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MULMOD(
+                Op.PUSH32[0x10000000000000000000000000000000000000000],
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                Op.DUP4,
+            ),
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+        )
+        + Op.PUSH13[0x6F390A3054D7368A9A55600051]
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x1c92f41f022def89bbb572a504b90f3ba61b9e9a"),  # noqa: E501
+        address=Address(0x1C92F41F022DEF89BBB572A504B90F3BA61B9E9A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000007fffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffe837f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000"  # noqa: E501
-            "0000000000000000000000000000000009556c6f390a3054d7368a9a"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe837f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000009556c6f390a3054d7368a9a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2076977514,
+        value=0x7BCC296A,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0xFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000FFFFFFFFFFFFFFFF: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest616.py b/tests/ported_static/stRandom2/test_random_statetest616.py
index 2aa52a09669..7e1333d043e 100644
--- a/tests/ported_static/stRandom2/test_random_statetest616.py
+++ b/tests/ported_static/stRandom2/test_random_statetest616.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest616.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest616Filler.json
+state_tests/stRandom2/randomStatetest616Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest616Filler.json"],
+    ["state_tests/stRandom2/randomStatetest616Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest616(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest616."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,58 @@ def test_random_statetest616(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f86a2409b991539f0423c0342363c3b5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000] * 2
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x86A2409B991539F0423C0342363C3B55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x9725412A40F7E97D9D2E302200D69C3463F50E62),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x86A2409B991539F0423C0342363C3B55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x9725412a40f7e97d9d2e302200d69c3463f50e62"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000007f0000000000000000"  # noqa: E501
-            "0000000100000000000000000000000000000000000000007f0000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000c3507f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000007fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000006f86a2409b991539f0423c0342363c3b"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f86a2409b991539f0423c0342363c3b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1167366767,
+        value=0x45949A6F,
     )
 
     post = {
-        contract: Account(storage={0: 0x86A2409B991539F0423C0342363C3B55}),
+        target: Account(
+            storage={0: 0x86A2409B991539F0423C0342363C3B55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest618.py b/tests/ported_static/stRandom2/test_random_statetest618.py
index a7f62d5930e..1db1b9752e6 100644
--- a/tests/ported_static/stRandom2/test_random_statetest618.py
+++ b/tests/ported_static/stRandom2/test_random_statetest618.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest618.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest618Filler.json
+state_tests/stRandom2/randomStatetest618Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest618Filler.json"],
+    ["state_tests/stRandom2/randomStatetest618Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest618(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest618."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,67 +44,61 @@ def test_random_statetest618(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SGT(
-                Op.CALL(
-                    gas=Op.EXTCODESIZE(
-                        address=Op.PUSH32[
-                            0x10000000000000000000000000000000000000000
-                        ],
-                    ),
-                    address=Op.NUMBER,
-                    value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    args_offset=Op.PUSH32[0xC350],
-                    args_size=Op.TIMESTAMP,
-                    ret_offset=Op.PUSH32[0x0],
-                    ret_size=Op.PUSH32[0xC350],
+    # Source: raw
+    # 0x7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000100000000000000000000000000000000000000003bf1135a3a58  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SGT(
+            Op.CALL(
+                gas=Op.EXTCODESIZE(
+                    address=Op.PUSH32[
+                        0x10000000000000000000000000000000000000000
+                    ]
                 ),
-                Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-            )
-            + Op.GAS
-            + Op.GASPRICE
-            + Op.PC
-        ),
+                address=Op.NUMBER,
+                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                args_offset=Op.PUSH32[0xC350],
+                args_size=Op.TIMESTAMP,
+                ret_offset=Op.PUSH32[0x0],
+                ret_size=Op.PUSH32[0xC350],
+            ),
+            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+        )
+        + Op.GAS
+        + Op.GASPRICE
+        + Op.PC,
         nonce=0,
-        address=Address("0xce2de07f0af237ed58f6f7e008c3a9d82eb1769a"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000427f00000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000c3507fffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000001"  # noqa: E501
-            "00000000000000000000000000000000000000003bf1135a3a58"
+        to=target,
+        data=Bytes(
+            "7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000100000000000000000000000000000000000000003bf1135a3a58"  # noqa: E501
         ),
         gas_limit=1024268380,
-        value=1398079665,
+        value=0x535500B1,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest620.py b/tests/ported_static/stRandom2/test_random_statetest620.py
index 634b508633a..1cee588f78d 100644
--- a/tests/ported_static/stRandom2/test_random_statetest620.py
+++ b/tests/ported_static/stRandom2/test_random_statetest620.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest620.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest620Filler.json
+state_tests/stRandom2/randomStatetest620Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest620Filler.json"],
+    ["state_tests/stRandom2/randomStatetest620Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest620(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest620."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,65 +47,61 @@ def test_random_statetest620(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.GASLIMIT
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x6C54A420327D73727D9D1A667BF38955,
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6c54a420327d73727d9d1a667bf3895560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.GASLIMIT
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x6C54A420327D73727D9D1A667BF38955
         ),
         nonce=0,
-        address=Address("0x388b9f8645907d4c06dee4ebab70d61e76fa253c"),  # noqa: E501
+        address=Address(0x388B9F8645907D4C06DEE4EBAB70D61E76FA253C),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f00"  # noqa: E501
-            "00000000000000000000010000000000000000000000000000000000000000457fffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000c3507f000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000007fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffff6f6c54a420327d73727d9d1a667bf389"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6c54a420327d73727d9d1a667bf389"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1643601446,
+        value=0x61F75E26,
     )
 
     post = {
-        contract: Account(storage={0: 0x6C54A420327D73727D9D1A667BF38955}),
+        target: Account(
+            storage={0: 0x6C54A420327D73727D9D1A667BF38955},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest621.py b/tests/ported_static/stRandom2/test_random_statetest621.py
index db22974898c..5e4e914e873 100644
--- a/tests/ported_static/stRandom2/test_random_statetest621.py
+++ b/tests/ported_static/stRandom2/test_random_statetest621.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest621.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest621Filler.json
+state_tests/stRandom2/randomStatetest621Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest621Filler.json"],
+    ["state_tests/stRandom2/randomStatetest621Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest621(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest621."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,58 +47,53 @@ def test_random_statetest621(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.BYTE(Op.PREVRANDAO, Op.PUSH32[0x0])
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x3BA187A19366899E595220741232905B,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x3e00ab7141473834e4482f5650561879feeb3e7b"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f0000000000000000000000000000000000000000000000000000000000000000441a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f3ba187a19366899e595220741232905b60005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79] * 2
+        + Op.BYTE(Op.PREVRANDAO, Op.PUSH32[0x0])
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x3BA187A19366899E595220741232905B
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x3E00AB7141473834E4482F5650561879FEEB3E7B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000441a7f000000000000000000"  # noqa: E501
-            "000000ffffffffffffffffffffffffffffffffffffffff6f3ba187a19366899e59522074"  # noqa: E501
-            "1232905b"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000000000000000000000000000000000441a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f3ba187a19366899e595220741232905b"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2143896087,
+        value=0x7FC94217,
     )
 
     post = {
-        contract: Account(storage={0: 0x3BA187A19366899E595220741232905B}),
+        target: Account(
+            storage={0: 0x3BA187A19366899E595220741232905B},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest624.py b/tests/ported_static/stRandom2/test_random_statetest624.py
index eaff217dbfa..0354e149a84 100644
--- a/tests/ported_static/stRandom2/test_random_statetest624.py
+++ b/tests/ported_static/stRandom2/test_random_statetest624.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest624.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest624Filler.json
+state_tests/stRandom2/randomStatetest624Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest624Filler.json"],
+    ["state_tests/stRandom2/randomStatetest624Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest624(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest624."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,105 +43,42 @@ def test_random_statetest624(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x43424244457943455409635939
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex("43424244457943455409635939"),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x5ed2ae8463a1745023951e424fa0bf024f04fa55"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
-        gas_limit=400000,
-        value=100000,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest624Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest624_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
     )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex("43424244457943455409635939"),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x5ed2ae8463a1745023951e424fa0bf024f04fa55"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0xDE0B6B3A76586A0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest625.py b/tests/ported_static/stRandom2/test_random_statetest625.py
index bfe4f33d4e6..9bf9d9ad615 100644
--- a/tests/ported_static/stRandom2/test_random_statetest625.py
+++ b/tests/ported_static/stRandom2/test_random_statetest625.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest625.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest625Filler.json
+state_tests/stRandom2/randomStatetest625Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest625Filler.json"],
+    ["state_tests/stRandom2/randomStatetest625Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest625(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest625."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,62 +43,56 @@ def test_random_statetest625(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.DUP9
-            + Op.LOG3(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=Op.GASLIMIT,
-                topic_1=Op.PUSH32[0xC350],
-                topic_2=Op.PUSH32[0x0],
-                topic_3=Op.PUSH32[0x0],
-            )
-            + Op.ADD
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000887f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa3015560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.DUP9
+        + Op.LOG3(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=Op.GASLIMIT,
+            topic_1=Op.PUSH32[0xC350],
+            topic_2=Op.PUSH32[0x0],
+            topic_3=Op.PUSH32[0x0],
+        )
+        + Op.ADD
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0x2c7c249fd8a5bf9d65b5f5e62e5f093202f0e4ac"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "000000000000000000010000000000000000000000000000000000000000887f00000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000007f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000c350457fffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffa301"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000887f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa301"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1618548956,
+        value=0x607918DC,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest626.py b/tests/ported_static/stRandom2/test_random_statetest626.py
index a34015e7917..b482213562f 100644
--- a/tests/ported_static/stRandom2/test_random_statetest626.py
+++ b/tests/ported_static/stRandom2/test_random_statetest626.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest626.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest626Filler.json
+state_tests/stRandom2/randomStatetest626Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest626Filler.json"],
+    ["state_tests/stRandom2/randomStatetest626Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest626(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest626."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,68 +43,58 @@ def test_random_statetest626(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.REVERT(
-                offset=Op.DELEGATECALL(
-                    gas=Op.PUSH32[0xC350],
-                    address=Op.PUSH32[
-                        0x4F3F701464972E74606D6EA82D4D3080599A0E79
-                    ],
-                    args_offset=Op.PUSH32[0x1],
-                    args_size=Op.PUSH32[0x0],
-                    ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    ret_size=Op.PUSH32[0x1],
-                ),
-                size=Op.PUSH32[0xC350],
-            )
-            + Op.SWAP5
-            + Op.MOD(Op.DUP16, Op.SDIV)
-            + Op.LOG2
-            + Op.SSTORE
-        ),
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c350f4fd94058f06a255  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.REVERT(
+            offset=Op.DELEGATECALL(
+                gas=Op.PUSH32[0xC350],
+                address=Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
+                args_offset=Op.PUSH32[0x1],
+                args_size=Op.PUSH32[0x0],
+                ret_offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ret_size=Op.PUSH32[0x1],
+            ),
+            size=Op.PUSH32[0xC350],
+        )
+        + Op.SWAP5
+        + Op.MOD(Op.DUP16, Op.SDIV)
+        + Op.LOG2
+        + Op.SSTORE,
         nonce=0,
-        address=Address("0xf55f25b074cbf8502ed5a9d1e2aab4d351b67af2"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000c3507f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017fffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000007f0000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000017f0000000000000000000000004f3f701464"  # noqa: E501
-            "972e74606d6ea82d4d3080599a0e797f0000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000c350f4fd94058f06a2"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c350f4fd94058f06a2"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1996511098,
+        value=0x7700577A,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest627.py b/tests/ported_static/stRandom2/test_random_statetest627.py
index 73340738bf3..8d8c8380c38 100644
--- a/tests/ported_static/stRandom2/test_random_statetest627.py
+++ b/tests/ported_static/stRandom2/test_random_statetest627.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest627.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest627Filler.json
+state_tests/stRandom2/randomStatetest627Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest627Filler.json"],
+    ["state_tests/stRandom2/randomStatetest627Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest627(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest627."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,57 +43,58 @@ def test_random_statetest627(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x424243434442424254f262707f3b55
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.TIMESTAMP
+        + Op.SSTORE(
+            key=0x707F3B,
+            value=Op.CALLCODE(
+                gas=Op.SLOAD(key=Op.TIMESTAMP),
+                address=Op.TIMESTAMP,
+                value=Op.TIMESTAMP,
+                args_offset=Op.PREVRANDAO,
+                args_size=Op.NUMBER,
+                ret_offset=Op.NUMBER,
+                ret_size=Op.TIMESTAMP,
+            ),
         ),
-        balance=46,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.TIMESTAMP
-            + Op.SSTORE(
-                key=0x707F3B,
-                value=Op.CALLCODE(
-                    gas=Op.SLOAD(key=Op.TIMESTAMP),
-                    address=Op.TIMESTAMP,
-                    value=Op.TIMESTAMP,
-                    args_offset=Op.PREVRANDAO,
-                    args_size=Op.NUMBER,
-                    ret_offset=Op.NUMBER,
-                    ret_size=Op.TIMESTAMP,
-                ),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=46,
         nonce=0,
-        address=Address("0xade7de10d61d1ac88700ada2a18cb4d070d34f9e"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={0x707F3B: 1}),
+        target: Account(
+            storage={0x707F3B: 1},
+            balance=0xDE0B6B3A76586A0,
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest628.py b/tests/ported_static/stRandom2/test_random_statetest628.py
index 822bb5ed440..c005e0c17c6 100644
--- a/tests/ported_static/stRandom2/test_random_statetest628.py
+++ b/tests/ported_static/stRandom2/test_random_statetest628.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest628.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest628Filler.json
+state_tests/stRandom2/randomStatetest628Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest628Filler.json"],
+    ["state_tests/stRandom2/randomStatetest628Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest628(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest628."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,45 +43,46 @@ def test_random_statetest628(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
-        nonce=0,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x41413155
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=Op.BALANCE(address=Op.COINBASE), value=Op.COINBASE),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc897a0296abef0cc2b8e1cf7f133dd171d665337"),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
+        ),
+        balance=46,
+        nonce=0,
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
-            storage={46: 0x4F3F701464972E74606D6EA82D4D3080599A0E79},
+        target: Account(
+            storage={46: coinbase},
+            balance=0xDE0B6B3A76586A0,
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest629.py b/tests/ported_static/stRandom2/test_random_statetest629.py
index 93123cd0569..93bf1f10e4d 100644
--- a/tests/ported_static/stRandom2/test_random_statetest629.py
+++ b/tests/ported_static/stRandom2/test_random_statetest629.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest629.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest629Filler.json
+state_tests/stRandom2/randomStatetest629Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest629Filler.json"],
+    ["state_tests/stRandom2/randomStatetest629Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest629(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest629."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,66 +47,61 @@ def test_random_statetest629(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.GT(
-                Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79],
-                Op.CALLVALUE,
-            )
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x427277147C617F4354A35A1A47977A55,
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>347f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>116f427277147c617f4354a35a1a47977a5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.GT(
+            Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79], Op.CALLVALUE
+        )
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x427277147C617F4354A35A1A47977A55
         ),
         nonce=0,
-        address=Address("0xd4302fbf760860b03f9b86b05d19f7f41567dc69"),  # noqa: E501
+        address=Address(0xD4302FBF760860B03F9B86B05D19F7F41567DC69),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "004f3f701464972e74606d6ea82d4d3080599a0e79347f0000000000000000000000004f"  # noqa: E501
-            "3f701464972e74606d6ea82d4d3080599a0e79116f427277147c617f4354a35a1a47977a"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79347f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e79116f427277147c617f4354a35a1a47977a"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1003338368,
+        value=0x3BCDBA80,
     )
 
     post = {
-        contract: Account(storage={0: 0x427277147C617F4354A35A1A47977A55}),
+        target: Account(
+            storage={0: 0x427277147C617F4354A35A1A47977A55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest630.py b/tests/ported_static/stRandom2/test_random_statetest630.py
index 99e09e50924..6718fbb3a99 100644
--- a/tests/ported_static/stRandom2/test_random_statetest630.py
+++ b/tests/ported_static/stRandom2/test_random_statetest630.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest630.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest630Filler.json
+state_tests/stRandom2/randomStatetest630Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest630Filler.json"],
+    ["state_tests/stRandom2/randomStatetest630Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest630(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest630."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,68 +47,60 @@ def test_random_statetest630(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001427f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9461a46e61507a1206917b17137e7e5560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x1]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x1]
+        + Op.TIMESTAMP
+        + Op.PUSH32[0x10000000000000000000000000000000000000000] * 2
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        * 2
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x9461A46E61507A1206917B17137E7E55
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x9D1AE3F0CE71AFC95B61A0F1071AF3D10AD1F7CD),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x1]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.TIMESTAMP
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x9461A46E61507A1206917B17137E7E55,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x9d1ae3f0ce71afc95b61a0f1071af3d10ad1f7cd"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000017fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000001427f00000000000000"  # noqa: E501
-            "000000000100000000000000000000000000000000000000007f00000000000000000000"  # noqa: E501
-            "000100000000000000000000000000000000000000007fffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffff6f9461a46e61507a1206917b17137e7e"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001427f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9461a46e61507a1206917b17137e7e"  # noqa: E501
         ),
         gas_limit=100000,
-        value=411786818,
+        value=0x188B5E42,
     )
 
     post = {
-        contract: Account(storage={0: 0x9461A46E61507A1206917B17137E7E55}),
+        target: Account(
+            storage={0: 0x9461A46E61507A1206917B17137E7E55},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest632.py b/tests/ported_static/stRandom2/test_random_statetest632.py
index 22c507fe6db..b79f0ab6d8f 100644
--- a/tests/ported_static/stRandom2/test_random_statetest632.py
+++ b/tests/ported_static/stRandom2/test_random_statetest632.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest632.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest632Filler.json
+state_tests/stRandom2/randomStatetest632Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest632Filler.json"],
+    ["state_tests/stRandom2/randomStatetest632Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest632(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest632."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,51 +43,48 @@ def test_random_statetest632(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x434243434444424350303614f20a
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.NUMBER
+        + Op.TIMESTAMP
+        + Op.NUMBER * 2
+        + Op.PREVRANDAO * 2
+        + Op.TIMESTAMP
+        + Op.POP(Op.NUMBER)
+        + Op.EXP(Op.CALLCODE, Op.EQ(Op.CALLDATASIZE, Op.ADDRESS)),
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.NUMBER
-            + Op.TIMESTAMP
-            + Op.NUMBER
-            + Op.NUMBER
-            + Op.PREVRANDAO
-            + Op.PREVRANDAO
-            + Op.TIMESTAMP
-            + Op.POP(Op.NUMBER)
-            + Op.EXP(Op.CALLCODE, Op.EQ(Op.CALLDATASIZE, Op.ADDRESS))
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=46,
         nonce=0,
-        address=Address("0xde14e9d6c6f9145c355fdf3100fe961632d4cf85"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("42"),
+        to=target,
+        data=Bytes("42"),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0xDE0B6B3A76586A0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest633.py b/tests/ported_static/stRandom2/test_random_statetest633.py
index ce12ece5f2a..983500bac3d 100644
--- a/tests/ported_static/stRandom2/test_random_statetest633.py
+++ b/tests/ported_static/stRandom2/test_random_statetest633.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest633.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest633Filler.json
+state_tests/stRandom2/randomStatetest633Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest633Filler.json"],
+    ["state_tests/stRandom2/randomStatetest633Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest633(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest633."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,69 +47,63 @@ def test_random_statetest633(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x82941340756317567250F1573A897655,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x3b397829d56c4555587f2c995a886cf28d35d63d"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6f82941340756317567250f1573a89765560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x82941340756317567250F1573A897655
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x3B397829D56C4555587F2C995A886CF28D35D63D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000100000000000000000000000000000000000000007f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74"  # noqa: E501
-            "606d6ea82d4d3080599a0e796f82941340756317567250f1573a8976"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e796f82941340756317567250f1573a8976"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1358306105,
+        value=0x50F61B39,
     )
 
     post = {
-        contract: Account(storage={0: 0x82941340756317567250F1573A897655}),
+        target: Account(
+            storage={0: 0x82941340756317567250F1573A897655},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest635.py b/tests/ported_static/stRandom2/test_random_statetest635.py
index aff6c4de53b..a7e209f191f 100644
--- a/tests/ported_static/stRandom2/test_random_statetest635.py
+++ b/tests/ported_static/stRandom2/test_random_statetest635.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest635.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest635Filler.json
+state_tests/stRandom2/randomStatetest635Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest635Filler.json"],
+    ["state_tests/stRandom2/randomStatetest635Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest635(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest635."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,79 +47,57 @@ def test_random_statetest635(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6a5b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe66f2707d83713b6b8f320855  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xC350]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.SELFDESTRUCT(address=0x5B7FFFFFFFFFFFFFFFFFFF)
+        + Op.SELFDESTRUCT * 21
+        + Op.INVALID
+        + Op.ADDMOD(Op.ORIGIN, Op.DUP16, 0xF2707D83713B6B)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xF7AEB24A99F1A55F6F033E85566D05393F214CEF),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xC350]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.SELFDESTRUCT(address=0x5B7FFFFFFFFFFFFFFFFFFF)
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.SELFDESTRUCT
-            + Op.INVALID
-            + Op.ADDMOD(Op.ORIGIN, Op.DUP16, 0xF2707D83713B6B)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xf7aeb24a99f1a55f6f033e85566d05393f214cef"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000000000000000000000000000000000000000c3507f0000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000017f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000"  # noqa: E501
-            "00ffffffffffffffffffffffffffffffffffffffff6a5b7fffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffe66f2707d83713b6b8f3208"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6a5b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe66f2707d83713b6b8f3208"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1615246365,
+        value=0x6046B41D,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x0000000000000000005B7FFFFFFFFFFFFFFFFFFF): Account(
+            storage={}, code=b"", nonce=0
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest636.py b/tests/ported_static/stRandom2/test_random_statetest636.py
index da93d531b0f..28817f7fd00 100644
--- a/tests/ported_static/stRandom2/test_random_statetest636.py
+++ b/tests/ported_static/stRandom2/test_random_statetest636.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest636.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest636Filler.json
+state_tests/stRandom2/randomStatetest636Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest636Filler.json"],
+    ["state_tests/stRandom2/randomStatetest636Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,8 +32,8 @@ def test_random_statetest636(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest636."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -47,125 +48,100 @@ def test_random_statetest636(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.LOG1(
-                offset=0xAF1C,
-                size=0x75,
-                topic_1=0x619921C0750AC3268E7A6703CA2BF6C43308E6FC36,
-            )
-            + Op.PUSH14[0xB843F7A2E05BFC2E46AFC179930B]
-            + Op.PUSH27[
-                0x8724A04F9F561BDC65BBA0AD5797DDE0A28D5E8ACA56E1510B724F
-            ]
-            + Op.PUSH8[0x6A6D33DEE473D746]
-            + Op.PUSH5[0x561E49E3D8]
-            + Op.PUSH4[0x38C8DCF2]
-            + Op.PUSH1[0xF0]
-            + Op.PUSH13[0xBFA6283966D2D0F2591F54088E]
-            + Op.PUSH16[0x36545C0D90FCDEA10D5629629FFB1B16]
-            + Op.PUSH3[0x6C339F]
-            + Op.PUSH5[0x90829F1B16]
-            + Op.PUSH22[0xF0F2F62B0B7C9D3F070FAFD53F99F90F31E19E81D3DB]
-            + Op.PUSH9[0x8929213E34AFFC4111]
-            + Op.PUSH15[0x6AE6F54AD5C2062B27A9FBEC78A52F]
-            + Op.PUSH27[
-                0x26C6347408631A6C0EFCF33FE576953A4043E846B686471403F38A
-            ]
-            + Op.PUSH2[0x5A0A]
-            + Op.DUP15
-            + Op.CALL(
-                gas=0x314BC0FE,
-                address=0xBDC4B8AF0F40B0EC2256166F7145B81CD824A868,
-                value=0x1019A51,
-                args_offset=0x14,
-                args_size=0xE,
-                ret_offset=0xA,
-                ret_size=0x1D,
-            )
-            + Op.PUSH1[0xC]
-            + Op.PUSH31[
-                0xB69785D3593D3A8552018A4FABA5B591975E8B8056EBC01F5CE5F5F7C04ECA  # noqa: E501
-            ]
-            + Op.SWAP1
-            + Op.CALLDATALOAD(offset=0xB458A8)
-            + Op.SSTORE(
-                key=0x3C4D8F92F8C27517F0ADDD45E050BFCF, value=0x9BE8FBAA90
-            )
-            + Op.PUSH26[0x2D8BF87C39D39ED9B1EF6C8C070D8DA4A624CE548B37D03AE810]
-            + Op.PUSH29[
-                0xA6DA49BE4ADFFC9F5AE896C52B936A18BED4BD9FCBAE531274706E9E9B
-            ]
-            + Op.SWAP1
-            + Op.ADDRESS
-            + Op.PUSH2[0x9A40]
-            + Op.PUSH18[0x4BB4B22E7BEF8CF7B01551327188EE4BB624]
-            + Op.PUSH18[0x18D0E95549A92F7DD9305484CC054E5F206D]
-            + Op.PUSH17[0xD008699A85896061427B05AE2A7F16230F]
-            + Op.PUSH7[0xAB4DD548E03B09]
-            + Op.PUSH19[0x10F5AFFF39A4F9A90E55E91584E86629F3E87]
-            + Op.PUSH22[0xF53DA16FCEEDD834103A50DBE72A6634E4DBF374C70E]
-            + Op.PUSH12[0xD041628DC8B30DE3C3D7AA0E]
-            + Op.PUSH28[
-                0xB48DF927C78ED30B286E249C2CBE79FB55956F492E413E771D0CD63F
-            ]
-            + Op.PUSH20[0x57AB1E9A38026A4BA9278427812728699A2C7471]
-            + Op.DUP10
-        ),
+    # Source: raw
+    # 0x74619921c0750ac3268e7a6703ca2bf6c43308e6fc36607561af1ca16db843f7a2e05bfc2e46afc179930b7a8724a04f9f561bdc65bba0ad5797dde0a28d5e8aca56e1510b724f676a6d33dee473d74664561e49e3d86338c8dcf260f06cbfa6283966d2d0f2591f54088e6f36545c0d90fcdea10d5629629ffb1b16626c339f6490829f1b1675f0f2f62b0b7c9d3f070fafd53f99f90f31e19e81d3db688929213e34affc41116e6ae6f54ad5c2062b27a9fbec78a52f7a26c6347408631a6c0efcf33fe576953a4043e846b686471403f38a615a0a8e601d600a600e60146301019a5173<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>63314bc0fef1600c7eb69785d3593d3a8552018a4faba5b591975e8b8056ebc01f5ce5f5f7c04eca9062b458a835649be8fbaa906f3c4d8f92f8c27517f0addd45e050bfcf55792d8bf87c39d39ed9b1ef6c8c070d8da4a624ce548b37d03ae8107ca6da49be4adffc9f5ae896c52b936a18bed4bd9fcbae531274706e9e9b9030619a40714bb4b22e7bef8cf7b01551327188ee4bb6247118d0e95549a92f7dd9305484cc054e5f206d70d008699a85896061427b05ae2a7f16230f66ab4dd548e03b0972010f5afff39a4f9a90e55e91584e86629f3e8775f53da16fceedd834103a50dbe72a6634e4dbf374c70e6bd041628dc8b30de3c3d7aa0e7bb48df927c78ed30b286e249c2cbe79fb55956f492e413e771d0cd63f7357ab1e9a38026a4ba9278427812728699a2c747189  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG1(
+            offset=0xAF1C,
+            size=0x75,
+            topic_1=0x619921C0750AC3268E7A6703CA2BF6C43308E6FC36,
+        )
+        + Op.PUSH14[0xB843F7A2E05BFC2E46AFC179930B]
+        + Op.PUSH27[0x8724A04F9F561BDC65BBA0AD5797DDE0A28D5E8ACA56E1510B724F]
+        + Op.PUSH8[0x6A6D33DEE473D746]
+        + Op.PUSH5[0x561E49E3D8]
+        + Op.PUSH4[0x38C8DCF2]
+        + Op.PUSH1[0xF0]
+        + Op.PUSH13[0xBFA6283966D2D0F2591F54088E]
+        + Op.PUSH16[0x36545C0D90FCDEA10D5629629FFB1B16]
+        + Op.PUSH3[0x6C339F]
+        + Op.PUSH5[0x90829F1B16]
+        + Op.PUSH22[0xF0F2F62B0B7C9D3F070FAFD53F99F90F31E19E81D3DB]
+        + Op.PUSH9[0x8929213E34AFFC4111]
+        + Op.PUSH15[0x6AE6F54AD5C2062B27A9FBEC78A52F]
+        + Op.PUSH27[0x26C6347408631A6C0EFCF33FE576953A4043E846B686471403F38A]
+        + Op.PUSH2[0x5A0A]
+        + Op.DUP15
+        + Op.CALL(
+            gas=0x314BC0FE,
+            address=0xBDC4B8AF0F40B0EC2256166F7145B81CD824A868,
+            value=0x1019A51,
+            args_offset=0x14,
+            args_size=0xE,
+            ret_offset=0xA,
+            ret_size=0x1D,
+        )
+        + Op.PUSH1[0xC]
+        + Op.PUSH31[
+            0xB69785D3593D3A8552018A4FABA5B591975E8B8056EBC01F5CE5F5F7C04ECA
+        ]
+        + Op.SWAP1
+        + Op.CALLDATALOAD(offset=0xB458A8)
+        + Op.SSTORE(key=0x3C4D8F92F8C27517F0ADDD45E050BFCF, value=0x9BE8FBAA90)
+        + Op.PUSH26[0x2D8BF87C39D39ED9B1EF6C8C070D8DA4A624CE548B37D03AE810]
+        + Op.PUSH29[
+            0xA6DA49BE4ADFFC9F5AE896C52B936A18BED4BD9FCBAE531274706E9E9B
+        ]
+        + Op.SWAP1
+        + Op.ADDRESS
+        + Op.PUSH2[0x9A40]
+        + Op.PUSH18[0x4BB4B22E7BEF8CF7B01551327188EE4BB624]
+        + Op.PUSH18[0x18D0E95549A92F7DD9305484CC054E5F206D]
+        + Op.PUSH17[0xD008699A85896061427B05AE2A7F16230F]
+        + Op.PUSH7[0xAB4DD548E03B09]
+        + Op.PUSH19[0x10F5AFFF39A4F9A90E55E91584E86629F3E87]
+        + Op.PUSH22[0xF53DA16FCEEDD834103A50DBE72A6634E4DBF374C70E]
+        + Op.PUSH12[0xD041628DC8B30DE3C3D7AA0E]
+        + Op.PUSH28[0xB48DF927C78ED30B286E249C2CBE79FB55956F492E413E771D0CD63F]
+        + Op.PUSH20[0x57AB1E9A38026A4BA9278427812728699A2C7471]
+        + Op.DUP10,
         nonce=0,
-        address=Address("0xbdc4b8af0f40b0ec2256166f7145b81cd824a868"),  # noqa: E501
+        address=Address(0xBDC4B8AF0F40B0EC2256166F7145B81CD824A868),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "648ae7baf084600e60746edc292e4f932e5d92d41f0bef49fc6b696d03a44c705cb4daaf"  # noqa: E501
-            "5160107d58356b0c4e1a7d81fb0b606143c7db58d8147776c02745b7de14b2c388e49568"  # noqa: E501
-            "e963334e695b39de93766519c9912b2dccb22bb3bd486cdf043cbc5c0cd3b4a35f6addc0"  # noqa: E501
-            "1cb4ad9b448c0c60ff6c78c1acc568b086c8181a90b01f613e5e6116e776e8d170f52005"  # noqa: E501
-            "efeb96d06594b7477815ea249e6143aaee6798a00d9dbba0552a73cd878ec8872e0e494d"  # noqa: E501
-            "f0325b92e8c7753a084c6b9763c56059eb608978797530a734a7ced61643b84aece9a393"  # noqa: E501
-            "44fab3c6363d62631369ff8d931e17c50dcadb1f72256d2bcfd07e62b68627374ae05b8f"  # noqa: E501
-            "f70a238f6b8717aebdaa6cd0696889d903742f20f313a8e4bcb5efae0edcbb74f41e2027"  # noqa: E501
-            "dc90b56ee50a7c151872c3f01c0746579073c26c78e58ca65d93cd6c945401024b70fae5"  # noqa: E501
-            "f6e17c1bc9636bd85c6c721b77f39c71e417a9bc43cf7288a2888f33b863c22e5e606ef7"  # noqa: E501
-            "03db601f52cf73b09b88fe1772d6693064e95ea20aa3da12c76fc929d6982f7ae98c7195"  # noqa: E501
-            "8c5fdd80f52a8d673027f0fa96116b85636464219d046962e9e728f947cc66e8a5806111"  # noqa: E501
-            "1b752dbc3bbd70bf3fa2e463969371f089c8226cb217fcf86fed7c5c87ada364a13ca107"  # noqa: E501
-            "785a1e76d56edd7b1f02caac7915e522478f790322601868ed8a345ba615388b5d77d405"  # noqa: E501
-            "d62f0abd72ed81f218f27c6ee6a6cde612b9c528d4107c25f6d842f8d91a37f4f098e3f5"  # noqa: E501
-            "52a5ce3c14d301fd1a0c7711f831c8c07197a419447c10662351b792bb34eef76c6f5d66"  # noqa: E501
-            "414b182911d942896b1bb156c0ba37a9bfe4420bc17ddfe7be8daeabb37222d4ae081dd8"  # noqa: E501
-            "89cb787c9bf801b07e186f274a70549a04"
+        to=target,
+        data=Bytes(
+            "648ae7baf084600e60746edc292e4f932e5d92d41f0bef49fc6b696d03a44c705cb4daaf5160107d58356b0c4e1a7d81fb0b606143c7db58d8147776c02745b7de14b2c388e49568e963334e695b39de93766519c9912b2dccb22bb3bd486cdf043cbc5c0cd3b4a35f6addc01cb4ad9b448c0c60ff6c78c1acc568b086c8181a90b01f613e5e6116e776e8d170f52005efeb96d06594b7477815ea249e6143aaee6798a00d9dbba0552a73cd878ec8872e0e494df0325b92e8c7753a084c6b9763c56059eb608978797530a734a7ced61643b84aece9a39344fab3c6363d62631369ff8d931e17c50dcadb1f72256d2bcfd07e62b68627374ae05b8ff70a238f6b8717aebdaa6cd0696889d903742f20f313a8e4bcb5efae0edcbb74f41e2027dc90b56ee50a7c151872c3f01c0746579073c26c78e58ca65d93cd6c945401024b70fae5f6e17c1bc9636bd85c6c721b77f39c71e417a9bc43cf7288a2888f33b863c22e5e606ef703db601f52cf73b09b88fe1772d6693064e95ea20aa3da12c76fc929d6982f7ae98c71958c5fdd80f52a8d673027f0fa96116b85636464219d046962e9e728f947cc66e8a58061111b752dbc3bbd70bf3fa2e463969371f089c8226cb217fcf86fed7c5c87ada364a13ca107785a1e76d56edd7b1f02caac7915e522478f790322601868ed8a345ba615388b5d77d405d62f0abd72ed81f218f27c6ee6a6cde612b9c528d4107c25f6d842f8d91a37f4f098e3f552a5ce3c14d301fd1a0c7711f831c8c07197a419447c10662351b792bb34eef76c6f5d66414b182911d942896b1bb156c0ba37a9bfe4420bc17ddfe7be8daeabb37222d4ae081dd889cb787c9bf801b07e186f274a70549a04"  # noqa: E501
         ),
         gas_limit=1635935265,
-        value=1962905609,
+        value=0x74FF9009,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={0x3C4D8F92F8C27517F0ADDD45E050BFCF: 0x9BE8FBAA90},
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest637.py b/tests/ported_static/stRandom2/test_random_statetest637.py
index d94878ebde0..93704fddf5f 100644
--- a/tests/ported_static/stRandom2/test_random_statetest637.py
+++ b/tests/ported_static/stRandom2/test_random_statetest637.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest637.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest637Filler.json
+state_tests/stRandom2/randomStatetest637Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest637Filler.json"],
+    ["state_tests/stRandom2/randomStatetest637Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest637(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest637."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,62 +47,58 @@ def test_random_statetest637(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f44931064138e9df1768334028c20147160005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0x0]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x44931064138E9DF1768334028C201471
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xFA7818308F562AC2BA41C5CCF0FED1D1EA327C0F),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0x0]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x44931064138E9DF1768334028C201471,
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xfa7818308f562ac2ba41c5ccf0fed1d1ea327c0f"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f00000000000000000000000000000000000000000000000000000000000000007fffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff6f44931064138e9df1768334028c20"  # noqa: E501
-            "1471"
+        to=target,
+        data=Bytes(
+            "7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f44931064138e9df1768334028c201471"  # noqa: E501
         ),
         gas_limit=100000,
-        value=1479766116,
+        value=0x58337064,
     )
 
     post = {
-        contract: Account(storage={0: 0x44931064138E9DF1768334028C201471}),
+        target: Account(
+            storage={0: 0x44931064138E9DF1768334028C201471},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest638.py b/tests/ported_static/stRandom2/test_random_statetest638.py
index 117dc74b244..1d1fee7b18a 100644
--- a/tests/ported_static/stRandom2/test_random_statetest638.py
+++ b/tests/ported_static/stRandom2/test_random_statetest638.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest638.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest638Filler.json
+state_tests/stRandom2/randomStatetest638Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest638Filler.json"],
+    ["state_tests/stRandom2/randomStatetest638Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest638(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest638."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,68 +47,62 @@ def test_random_statetest638(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0960005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MULMOD(
+                Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xA4C61764109BF9617D10D1FB8856928BE9BE5686),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MULMOD(
-                    Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF],
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0xa4c61764109bf9617d10d1fb8856928be9be5686"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "0000000000000000000100000000000000000000000000000000000000007f0000000000"  # noqa: E501
-            "00000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff09"
+        to=target,
+        data=Bytes(
+            "7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09"  # noqa: E501
         ),
         gas_limit=100000,
-        value=2032022422,
+        value=0x791E3396,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000000,  # noqa: E501
             },
+            nonce=0,
         ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest639.py b/tests/ported_static/stRandom2/test_random_statetest639.py
index f9ec54356a9..65239f95c60 100644
--- a/tests/ported_static/stRandom2/test_random_statetest639.py
+++ b/tests/ported_static/stRandom2/test_random_statetest639.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest639.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest639Filler.json
+state_tests/stRandom2/randomStatetest639Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest639Filler.json"],
+    ["state_tests/stRandom2/randomStatetest639Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_random_statetest639(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest639."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,123 +44,120 @@ def test_random_statetest639(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SGT(
-                0xAB95E6F8772A548229700E2DCC612AC9CEEB898AF8436680A2E1074DF8CED0,  # noqa: E501
-                0x993D78E80807A0D34BDBFA4E0AFA9D,
-            )
-            + Op.LOG1(
-                offset=0xB1F5,
-                size=0xC1,
-                topic_1=0x64D71C8FE8A10FB58F8706EA3EE1B54A0848E742CA357E3D0234,
-            )
-            + Op.ISZERO(
-                0x48DA2AE1E6987C52223414746FAB0E39130693D15A48D39B5130096A7C,
-            )
-            + Op.PUSH17[0xC4FB89343EF5D10E912DECBA682BF205DE]
-            + Op.PUSH26[0xE84C573C9E2B0FFBD4D6117E40046B4C2D77156ADA28960D9BB9]
-            + Op.PUSH32[
-                0x56D243429AA245C32E1F800A686EBE298DD08349D864486D7A1569B5AAE49577  # noqa: E501
-            ]
-            + Op.PUSH12[0xB5E71206CD09F54D1CD71396]
-            + Op.PUSH6[0x57567542184C]
-            + Op.PUSH21[0xB95CC0D8AC3D0E05D0264B8D42A3563826123FC0D9]
-            + Op.PUSH5[0x521B61B863]
-            + Op.PUSH21[0x591A821818672EF0DEA05D259BC4F98C34418D9E7A]
-            + Op.PUSH8[0x7173B211649C07DF]
-            + Op.PUSH23[0x70ACA688053842DE6157C4FB5E678ADC0611FCC20A1D83]
-            + Op.PUSH15[0xC69B9370D09B83F1B0293A1B102D6D]
-            + Op.PUSH20[0x978584B14FB2AB517001867E6545DD2DC3438F9C]
-            + Op.PUSH25[0x28F6D3C6E4DA98113CE2486C1AD028DC9947B28590071B977E]
-            + Op.PUSH6[0x1D352B078CB9]
-            + Op.PUSH12[0x27F9FF7252C9F3CE9E5151AE]
-            + Op.PUSH27[
-                0xF1064AB8A5D92ED543B9D59C341F85BB22AA2FA7D7EE7310AC8F51
-            ]
-            + Op.SWAP15
-            + Op.PUSH7[0xDA165B9EFE3663]
-            + Op.PUSH6[0x7B1E28F4EB3E]
-            + Op.PUSH20[0x38391339AF5346D12C14BBC0863C26D7E999776C]
-            + Op.PUSH26[0x39CEFAC542ED69F518BBEF5461C0DF385004F5411C3FAAA65C7B]
-            + Op.PUSH11[0xBF900CA1EF1F40BB938F72]
-            + Op.PUSH23[0x95A1CA14012BA07CC01548F3DF75544B11BB52B7693BED]
-            + Op.PUSH31[
-                0x2FC1537B2F8D63C4DB4C3D8FC72B6F5F7E7B4D1EC8C1AC89230936975D1962  # noqa: E501
-            ]
-            + Op.PUSH8[0x88F03504A8C9ACF6]
-            + Op.PUSH5[0x37D6D88560]
-            + Op.PUSH24[0x78BEE6FE54742DDC9A7D8373DBFE2E21AACF8816944C02EF]
-            + Op.SWAP9
-            + Op.ORIGIN
-            + Op.CALL(
-                gas=0x56837182,
-                address=0x9FECB32D9AE49C08DA1E2551BA9257BE9A181E76,
-                value=0x29EC801E,
-                args_offset=0x18,
-                args_size=0x9,
-                ret_offset=0x9,
-                ret_size=0x15,
-            )
-            + Op.PUSH22[0x259FC2EA2DF7D720FB0914ED44BCB12B8FF15E712EF6]
-            + Op.PUSH30[
-                0x868FE7FBA6B46FAC671A45BCACE82FA83B87B8744835AC63D2B6CF3D157D
-            ]
-            + Op.PUSH22[0x26909F9C4D1EFBF68D780AF1C0F2DABBFC53D2C71DC4]
-            + Op.PUSH2[0xBF7F]
-            + Op.PUSH25[0x8E3A9C48CD1DF8D146A7DF97125985162ECD37B059204323D0]
-            + Op.PUSH7[0xCB4709A3A1715F]
-            + Op.PUSH29[
-                0x4A9FB905C26BA87933EF2499D3447D5CD4DF27A6205C8A1CE06719C3E0
-            ]
-            + Op.PUSH6[0xE66AB80222FF]
-            + Op.PUSH31[
-                0xD1F72F533A1160330DBD8DCD0489EC2DAC84D7522A4D8732C5AE9E08D9A251  # noqa: E501
-            ]
-            + Op.PUSH9[0x2FB33FA08ECC05197D]
-            + Op.DUP10
-            + Op.PUSH27[
-                0x1D5F28328CAA78CA6CD6B86FD08A1748FA959665861D18C25A3CAE
-            ]
-            + Op.PUSH26[0x732FE4FB3AD8B48C17C8EFEEB5EC22BE8B20EC4EAE2955D65B9A]
-            + Op.PUSH13[0x1415C23047AA8F2C29AEDDD787]
-            + Op.PUSH6[0xC1BC3EDA6341]
-            + Op.PUSH14[0x84CDB9B8D7942020DB3B1ED861A9]
-            + Op.PUSH7[0x475EB6EF9F9920]
-            + Op.PUSH10[0x2A879EE6BF9D0A1DD9D3]
-            + Op.DUP7
-        ),
+    # Source: raw
+    # 0x6e993d78e80807a0d34bdbfa4e0afa9d7eab95e6f8772a548229700e2dcc612ac9ceeb898af8436680a2e1074df8ced0137964d71c8fe8a10fb58f8706ea3ee1b54a0848e742ca357e3d023460c161b1f5a17c48da2ae1e6987c52223414746fab0e39130693d15a48d39b5130096a7c1570c4fb89343ef5d10e912decba682bf205de79e84c573c9e2b0ffbd4d6117e40046b4c2d77156ada28960d9bb97f56d243429aa245c32e1f800a686ebe298dd08349d864486d7a1569b5aae495776bb5e71206cd09f54d1cd713966557567542184c74b95cc0d8ac3d0e05d0264b8d42a3563826123fc0d964521b61b86374591a821818672ef0dea05d259bc4f98c34418d9e7a677173b211649c07df7670aca688053842de6157c4fb5e678adc0611fcc20a1d836ec69b9370d09b83f1b0293a1b102d6d73978584b14fb2ab517001867e6545dd2dc3438f9c7828f6d3c6e4da98113ce2486c1ad028dc9947b28590071b977e651d352b078cb96b27f9ff7252c9f3ce9e5151ae7af1064ab8a5d92ed543b9d59c341f85bb22aa2fa7d7ee7310ac8f519e66da165b9efe3663657b1e28f4eb3e7338391339af5346d12c14bbc0863c26d7e999776c7939cefac542ed69f518bbef5461c0df385004f5411c3faaa65c7b6abf900ca1ef1f40bb938f727695a1ca14012ba07cc01548f3df75544b11bb52b7693bed7e2fc1537b2f8d63c4db4c3d8fc72b6f5f7e7b4d1ec8c1ac89230936975d19626788f03504a8c9acf66437d6d885607778bee6fe54742ddc9a7d8373dbfe2e21aacf8816944c02ef983260156009600960186329ec801e73<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>6356837182f175259fc2ea2df7d720fb0914ed44bcb12b8ff15e712ef67d868fe7fba6b46fac671a45bcace82fa83b87b8744835ac63d2b6cf3d157d7526909f9c4d1efbf68d780af1c0f2dabbfc53d2c71dc461bf7f788e3a9c48cd1df8d146a7df97125985162ecd37b059204323d066cb4709a3a1715f7c4a9fb905c26ba87933ef2499d3447d5cd4df27a6205c8a1ce06719c3e065e66ab80222ff7ed1f72f533a1160330dbd8dcd0489ec2dac84d7522a4d8732c5ae9e08d9a251682fb33fa08ecc05197d897a1d5f28328caa78ca6cd6b86fd08a1748fa959665861d18c25a3cae79732fe4fb3ad8b48c17c8efeeb5ec22be8b20ec4eae2955d65b9a6c1415c23047aa8f2c29aeddd78765c1bc3eda63416d84cdb9b8d7942020db3b1ed861a966475eb6ef9f9920692a879ee6bf9d0a1dd9d386  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SGT(
+            0xAB95E6F8772A548229700E2DCC612AC9CEEB898AF8436680A2E1074DF8CED0,
+            0x993D78E80807A0D34BDBFA4E0AFA9D,
+        )
+        + Op.LOG1(
+            offset=0xB1F5,
+            size=0xC1,
+            topic_1=0x64D71C8FE8A10FB58F8706EA3EE1B54A0848E742CA357E3D0234,
+        )
+        + Op.ISZERO(
+            0x48DA2AE1E6987C52223414746FAB0E39130693D15A48D39B5130096A7C
+        )
+        + Op.PUSH17[0xC4FB89343EF5D10E912DECBA682BF205DE]
+        + Op.PUSH26[0xE84C573C9E2B0FFBD4D6117E40046B4C2D77156ADA28960D9BB9]
+        + Op.PUSH32[
+            0x56D243429AA245C32E1F800A686EBE298DD08349D864486D7A1569B5AAE49577
+        ]
+        + Op.PUSH12[0xB5E71206CD09F54D1CD71396]
+        + Op.PUSH6[0x57567542184C]
+        + Op.PUSH21[0xB95CC0D8AC3D0E05D0264B8D42A3563826123FC0D9]
+        + Op.PUSH5[0x521B61B863]
+        + Op.PUSH21[0x591A821818672EF0DEA05D259BC4F98C34418D9E7A]
+        + Op.PUSH8[0x7173B211649C07DF]
+        + Op.PUSH23[0x70ACA688053842DE6157C4FB5E678ADC0611FCC20A1D83]
+        + Op.PUSH15[0xC69B9370D09B83F1B0293A1B102D6D]
+        + Op.PUSH20[0x978584B14FB2AB517001867E6545DD2DC3438F9C]
+        + Op.PUSH25[0x28F6D3C6E4DA98113CE2486C1AD028DC9947B28590071B977E]
+        + Op.PUSH6[0x1D352B078CB9]
+        + Op.PUSH12[0x27F9FF7252C9F3CE9E5151AE]
+        + Op.PUSH27[0xF1064AB8A5D92ED543B9D59C341F85BB22AA2FA7D7EE7310AC8F51]
+        + Op.SWAP15
+        + Op.PUSH7[0xDA165B9EFE3663]
+        + Op.PUSH6[0x7B1E28F4EB3E]
+        + Op.PUSH20[0x38391339AF5346D12C14BBC0863C26D7E999776C]
+        + Op.PUSH26[0x39CEFAC542ED69F518BBEF5461C0DF385004F5411C3FAAA65C7B]
+        + Op.PUSH11[0xBF900CA1EF1F40BB938F72]
+        + Op.PUSH23[0x95A1CA14012BA07CC01548F3DF75544B11BB52B7693BED]
+        + Op.PUSH31[
+            0x2FC1537B2F8D63C4DB4C3D8FC72B6F5F7E7B4D1EC8C1AC89230936975D1962
+        ]
+        + Op.PUSH8[0x88F03504A8C9ACF6]
+        + Op.PUSH5[0x37D6D88560]
+        + Op.PUSH24[0x78BEE6FE54742DDC9A7D8373DBFE2E21AACF8816944C02EF]
+        + Op.SWAP9
+        + Op.ORIGIN
+        + Op.CALL(
+            gas=0x56837182,
+            address=0x9FECB32D9AE49C08DA1E2551BA9257BE9A181E76,
+            value=0x29EC801E,
+            args_offset=0x18,
+            args_size=0x9,
+            ret_offset=0x9,
+            ret_size=0x15,
+        )
+        + Op.PUSH22[0x259FC2EA2DF7D720FB0914ED44BCB12B8FF15E712EF6]
+        + Op.PUSH30[
+            0x868FE7FBA6B46FAC671A45BCACE82FA83B87B8744835AC63D2B6CF3D157D
+        ]
+        + Op.PUSH22[0x26909F9C4D1EFBF68D780AF1C0F2DABBFC53D2C71DC4]
+        + Op.PUSH2[0xBF7F]
+        + Op.PUSH25[0x8E3A9C48CD1DF8D146A7DF97125985162ECD37B059204323D0]
+        + Op.PUSH7[0xCB4709A3A1715F]
+        + Op.PUSH29[
+            0x4A9FB905C26BA87933EF2499D3447D5CD4DF27A6205C8A1CE06719C3E0
+        ]
+        + Op.PUSH6[0xE66AB80222FF]
+        + Op.PUSH31[
+            0xD1F72F533A1160330DBD8DCD0489EC2DAC84D7522A4D8732C5AE9E08D9A251
+        ]
+        + Op.PUSH9[0x2FB33FA08ECC05197D]
+        + Op.DUP10
+        + Op.PUSH27[0x1D5F28328CAA78CA6CD6B86FD08A1748FA959665861D18C25A3CAE]
+        + Op.PUSH26[0x732FE4FB3AD8B48C17C8EFEEB5EC22BE8B20EC4EAE2955D65B9A]
+        + Op.PUSH13[0x1415C23047AA8F2C29AEDDD787]
+        + Op.PUSH6[0xC1BC3EDA6341]
+        + Op.PUSH14[0x84CDB9B8D7942020DB3B1ED861A9]
+        + Op.PUSH7[0x475EB6EF9F9920]
+        + Op.PUSH10[0x2A879EE6BF9D0A1DD9D3]
+        + Op.DUP7,
         nonce=0,
-        address=Address("0x9fecb32d9ae49c08da1e2551ba9257be9a181e76"),  # noqa: E501
+        address=Address(0x9FECB32D9AE49C08DA1E2551BA9257BE9A181E76),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1612042127,
-        value=1237321880,
+        value=0x49C00898,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest640.py b/tests/ported_static/stRandom2/test_random_statetest640.py
index f7b340fd58a..fa10463591f 100644
--- a/tests/ported_static/stRandom2/test_random_statetest640.py
+++ b/tests/ported_static/stRandom2/test_random_statetest640.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_random_statetest640.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest640Filler.json
+state_tests/stRandom2/randomStatetest640Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest640Filler.json"],
+    ["state_tests/stRandom2/randomStatetest640Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_random_statetest640(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_random_statetest640."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,61 +43,54 @@ def test_random_statetest640(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=46,
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000807f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff50885560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x10000000000000000000000000000000000000000]
+        + Op.DUP1
+        + Op.PUSH32[0x1] * 2
+        + Op.POP(Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF])
+        + Op.DUP9
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x0)
+        + Op.SSTORE,
         nonce=0,
-        address=coinbase,  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x10000000000000000000000000000000000000000]
-            + Op.DUP1
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0x1]
-            + Op.POP(Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF])
-            + Op.DUP9
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x0)
-            + Op.SSTORE
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
+        balance=46,
         nonce=0,
-        address=Address("0x63ea2aa7fcd26f2c76102be53bcb49affe48aeda"),  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "000000000000010000000000000000000000000000000000000000807f00000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000017f00000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000017f000000000000000000000000ff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffffff5088"
+        to=target,
+        data=Bytes(
+            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000807f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff5088"  # noqa: E501
         ),
         gas_limit=100000,
-        value=6954369,
+        value=0x6A1D81,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0, nonce=0),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest641.py b/tests/ported_static/stRandom2/test_random_statetest641.py
index 77c02a1d8c2..83cb0c21f18 100644
--- a/tests/ported_static/stRandom2/test_random_statetest641.py
+++ b/tests/ported_static/stRandom2/test_random_statetest641.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest641.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest641Filler.json
+state_tests/stRandom2/randomStatetest641Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest641Filler.json"],
+    ["state_tests/stRandom2/randomStatetest641Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_random_statetest641(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x4f3f701464972e74606d6ea82d4d3080599a0e79")
+    """Test_random_statetest641."""
+    coinbase = Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,67 +47,61 @@ def test_random_statetest641(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=46,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0x4F3F701464972E74606D6EA82D4D3080599A0E79),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[0x1]
-            + Op.PUSH32[0xC350]
-            + Op.PUSH32[0x0]
-            + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
-            + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE  # noqa: E501
-            ]
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=0x29199C9AA4054170F1A15A55056F9655,
-            )
+    # Source: raw
+    # 0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f29199c9aa4054170f1a15a55056f965560005155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[0x1]
+        + Op.PUSH32[0xC350]
+        + Op.PUSH32[0x0]
+        + Op.PUSH32[0x4F3F701464972E74606D6EA82D4D3080599A0E79]
+        + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ]
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0), value=0x29199C9AA4054170F1A15A55056F9655
         ),
         nonce=0,
-        address=Address("0xa482d90f6cda557c1e8e41c3755c25821c27bb9d"),  # noqa: E501
+        address=Address(0xA482D90F6CDA557C1E8E41C3755C25821C27BB9D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000"  # noqa: E501
-            "00000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000017f0000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000c3507f0000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000007f0000000000000000000000004f3f"  # noqa: E501
-            "701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffffffffffffffffe6f29199c9aa4054170f1a15a55056f96"
+        to=target,
+        data=Bytes(
+            "7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000004f3f701464972e74606d6ea82d4d3080599a0e797f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f29199c9aa4054170f1a15a55056f96"  # noqa: E501
         ),
         gas_limit=100000,
-        value=252246116,
+        value=0xF08F864,
     )
 
     post = {
-        contract: Account(storage={0: 0x29199C9AA4054170F1A15A55056F9655}),
+        target: Account(
+            storage={0: 0x29199C9AA4054170F1A15A55056F9655},
+            nonce=0,
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest642.py b/tests/ported_static/stRandom2/test_random_statetest642.py
index 3e492231eb1..64930192d13 100644
--- a/tests/ported_static/stRandom2/test_random_statetest642.py
+++ b/tests/ported_static/stRandom2/test_random_statetest642.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_random_statetest642.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest642Filler.json
+state_tests/stRandom2/randomStatetest642Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest642Filler.json"],
+    ["state_tests/stRandom2/randomStatetest642Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,16 +31,14 @@ def test_random_statetest642(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb537d4a9cf2245238c2829345453a70dfd7a592")
+    """Test_random_statetest642."""
+    addr_2 = Address(0x78D51368C50ED27350D847254125276522CF9DAC)
     sender = EOA(
         key=0x776D5E84B9AA14EAE66D436166D11BE9B04516CA480E3E2C7936A647DA1BE721
     )
-    contract = Address("0x0000000000000000000000000000000000000007")
-    callee = Address("0x78d51368c50ed27350d847254125276522cf9dac")
 
     env = Environment(
-        fee_recipient=coinbase,
+        fee_recipient=sender,
         number=1,
         timestamp=1000,
         prev_randao=0x20000,
@@ -47,48 +46,41 @@ def test_random_statetest642(
         gas_limit=18137262409615484,
     )
 
-    pre[callee] = Account(balance=0x11BAE0BB79D6A164, nonce=163)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SLOAD(key=0xF46A4F)
-            + Op.JUMPI(
-                pc=0x4C4F0FBF6DE0659784434FB240652FF52D08,
-                condition=0x169C9EDF92F4B39273FE47ACCC75D1209AE58463C2585607CE051FF6,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0x51F765A4788A05, value=0x8F168A43A)
-            + Op.PUSH17[0x86290691D5A3239DB43EEFEA96B0012EA2]
-            + Op.MSTORE8(
-                offset=0x92F37FA731707F800683BAFB70815757D861AD8CC6804154CE5B9DE3146B58CD,  # noqa: E501
-                value=0x34E99E4BA9EE,
-            )
+    pre[sender] = Account(balance=0x26551A696CACB206)
+    pre[addr_2] = Account(balance=0x11BAE0BB79D6A164, nonce=163)
+    # Source: raw
+    # 0x62f46a4f547b169c9edf92f4b39273fe47accc75d1209ae58463c2585607ce051ff6714c4f0fbf6de0659784434fb240652ff52d08576408f168a43a6651f765a4788a05537086290691d5a3239db43eefea96b0012ea26534e99e4ba9ee7f92f37fa731707f800683bafb70815757d861ad8cc6804154ce5b9de3146b58cd53  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SLOAD(key=0xF46A4F)
+        + Op.JUMPI(
+            pc=0x4C4F0FBF6DE0659784434FB240652FF52D08,
+            condition=0x169C9EDF92F4B39273FE47ACCC75D1209AE58463C2585607CE051FF6,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0x51F765A4788A05, value=0x8F168A43A)
+        + Op.PUSH17[0x86290691D5A3239DB43EEFEA96B0012EA2]
+        + Op.MSTORE8(
+            offset=0x92F37FA731707F800683BAFB70815757D861AD8CC6804154CE5B9DE3146B58CD,  # noqa: E501
+            value=0x34E99E4BA9EE,
         ),
         balance=0x577686E8D1344340,
         nonce=112,
-        address=Address("0x88f8bb676eb054b4f4788abf1200cb51361038cf"),  # noqa: E501
+        address=Address(0x88F8BB676EB054B4F4788ABF1200CB51361038CF),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x26551A696CACB206)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "73ac858c3531a0d29ea7a15dfca264e244056b35816eb2fa5e8b941bb7e03e269017ca7b"  # noqa: E501
-            "29556e2c50a4525c68460af5ba912653059274ec9907faed7f4ceacf55ed7b50228e7e26"  # noqa: E501
-            "e7113d6751750964de40c9f5bb9f378e19edc3fd6ffd6af7ee7710107f382df318b8e1c7"  # noqa: E501
-            "07719add3db4b00892ddfba9f3e970c8aa9b41f208c53bf041556585635e6534916c5ec0"  # noqa: E501
-            "ba7162ea7979164bb27d007c198e1e50cb945b54a4dca4ac110de1a1d47f43fa61c9a6e9"  # noqa: E501
-            "16d30c3e89695e77cb0da0bcea3bd98260927c609b5782488c5d7e06f07fc67aa5f1cb3c"  # noqa: E501
-            "2d7ee74a4054d94e0108b3c962a00fb567a505e96a974f83567a74b898ddd6136e1e6634"  # noqa: E501
-            "e4c85cb37db14f98d0080ac548e092928b6eee8d6863592d990f9298d7040cfa486e4e88"  # noqa: E501
-            "1b0f19eb06892d2185cc0b295d7f2669f00ac67c30de107cd324610a5af8bb29d1135478"  # noqa: E501
-            "3888e7b8ba5ab533f959729b6e25886d426bbf4cd00626cffbc0ec6beb6a62ae0d9e7166"  # noqa: E501
-            "a6303d22036c2b3d45e88057940ada00938e"
+        to=Address(0x0000000000000000000000000000000000000007),
+        data=Bytes(
+            "73ac858c3531a0d29ea7a15dfca264e244056b35816eb2fa5e8b941bb7e03e269017ca7b29556e2c50a4525c68460af5ba912653059274ec9907faed7f4ceacf55ed7b50228e7e26e7113d6751750964de40c9f5bb9f378e19edc3fd6ffd6af7ee7710107f382df318b8e1c707719add3db4b00892ddfba9f3e970c8aa9b41f208c53bf041556585635e6534916c5ec0ba7162ea7979164bb27d007c198e1e50cb945b54a4dca4ac110de1a1d47f43fa61c9a6e916d30c3e89695e77cb0da0bcea3bd98260927c609b5782488c5d7e06f07fc67aa5f1cb3c2d7ee74a4054d94e0108b3c962a00fb567a505e96a974f83567a74b898ddd6136e1e6634e4c85cb37db14f98d0080ac548e092928b6eee8d6863592d990f9298d7040cfa486e4e881b0f19eb06892d2185cc0b295d7f2669f00ac67c30de107cd324610a5af8bb29d11354783888e7b8ba5ab533f959729b6e25886d426bbf4cd00626cffbc0ec6beb6a62ae0d9e7166a6303d22036c2b3d45e88057940ada00938e"  # noqa: E501
         ),
         gas_limit=4901005,
-        value=4125477963,
+        value=0xF5E5CC4B,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(storage={}, code=b"", nonce=1),
+        addr: Account(storage={}, nonce=112),
+        addr_2: Account(storage={}, code=b"", nonce=163),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest643.py b/tests/ported_static/stRandom2/test_random_statetest643.py
index 3a565ba4969..8de4eb0b70c 100644
--- a/tests/ported_static/stRandom2/test_random_statetest643.py
+++ b/tests/ported_static/stRandom2/test_random_statetest643.py
@@ -1,13 +1,12 @@
 """
-Return ~1 MB out of bounds of the init code. should throw codesize error...
+Return ~1 MB out of bounds of the init code. should throw codesize...
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest643Filler.json
+state_tests/stRandom2/randomStatetest643Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
@@ -22,7 +21,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest643Filler.json"],
+    ["state_tests/stRandom2/randomStatetest643Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,14 +29,11 @@ def test_random_statetest643(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Return ~1 MB out of bounds of the init code. should throw..."""
-    coinbase = Address("0x02a81f3b6340ef03047f2e09f2126aa8334233bd")
-    sender = EOA(
-        key=0x2C6BEC15D915620A88056CC6BFB70707AFA902ABD52C7DFEAB0864BE472CB8AF
-    )
+    """Return ~1 MB out of bounds of the init code."""
+    sender = pre.fund_eoa(amount=0xA015CDDAB7107B04)
 
     env = Environment(
-        fee_recipient=coinbase,
+        fee_recipient=sender,
         number=1,
         timestamp=1000,
         prev_randao=0x20000,
@@ -45,76 +41,93 @@ def test_random_statetest643(
         gas_limit=35761922600709271,
     )
 
-    pre[sender] = Account(balance=0xA015CDDAB7107B04)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.PUSH26[0xECFECF2AB84463F738FC85B069590FCFF0334FB1A7108861A444]
-            + Op.SIGNEXTEND(
-                0xF893A1A95C84AFBECC79E1EE4ACC8FCA826DF1AB268BDFD9E712AD0D261F5EDE,  # noqa: E501
-                0xA26237BC8329,
-            )
-            + Op.SMOD(0x39EB0AC5B4C3EF35F0B4E6D9E05F, 0x45E6A7D46282)
-            + Op.LOG2(
-                offset=0x98BD15DA63A8614AA455DC593FA70386,
-                size=0xB57969CAA2F2493998537AD0ECBA9400EBAE911DAD,
-                topic_1=0x65C1E55EC0E2128768030E4EB0DE,
-                topic_2=0xFC63BE0C082847F6F9F7728764E142FCD95702C3,
-            )
-            + Op.MSTORE(offset=0x70F1D7, value=0xC6)
-            + Op.MLOAD(
-                offset=0x75F1BF8A683B5D1721F7DD57755BD6A9BED9F874E3876CFCAC6762EA,  # noqa: E501
-            )
+    # Source: raw
+    # 0x79ecfecf2ab84463f738fc85b069590fcff0334fb1a7108861a44465a26237bc83297ff893a1a95c84afbecc79e1ee4acc8fca826df1ab268bdfd9e712ad0d261f5ede0b6545e6a7d462826d39eb0ac5b4c3ef35f0b4e6d9e05f0773fc63be0c082847f6f9f7728764e142fcd95702c36d65c1e55ec0e2128768030e4eb0de74b57969caa2f2493998537ad0ecba9400ebae911dad6f98bd15da63a8614aa455dc593fa70386a260c66270f1d7527b75f1bf8a683b5d1721f7dd57755bd6a9bed9f874e3876cfcac6762ea51  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH26[0xECFECF2AB84463F738FC85B069590FCFF0334FB1A7108861A444]
+        + Op.SIGNEXTEND(
+            0xF893A1A95C84AFBECC79E1EE4ACC8FCA826DF1AB268BDFD9E712AD0D261F5EDE,
+            0xA26237BC8329,
+        )
+        + Op.SMOD(0x39EB0AC5B4C3EF35F0B4E6D9E05F, 0x45E6A7D46282)
+        + Op.LOG2(
+            offset=0x98BD15DA63A8614AA455DC593FA70386,
+            size=0xB57969CAA2F2493998537AD0ECBA9400EBAE911DAD,
+            topic_1=0x65C1E55EC0E2128768030E4EB0DE,
+            topic_2=0xFC63BE0C082847F6F9F7728764E142FCD95702C3,
+        )
+        + Op.MSTORE(offset=0x70F1D7, value=0xC6)
+        + Op.MLOAD(
+            offset=0x75F1BF8A683B5D1721F7DD57755BD6A9BED9F874E3876CFCAC6762EA
         ),
         balance=0x3F91B25C1601534B,
         nonce=210,
-        address=Address("0x6e40c70f8be9a7633e8a31580c85f275b86362ef"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.NUMBER
-            + Op.PUSH14[0xEBC3912504EDED08F73B9FF9490D]
-            + Op.PUSH20[0xFC4F820A0890B7E8417FA97940713AEB870E59A7]
-            + Op.SWAP1
-            + Op.MSTORE8(offset=0x3D5649E57458EA8692DA3232, value=0x7F)
-            + Op.SIGNEXTEND(
-                0x1EB441440620426B3485AB683D44FF8D5544EB7F7FB3E1F4C3006364,
-                0x5967657E3FC6E02F6DE1C0FF6CC18E051BDD52AD,
-            )
-            + Op.GAS
-            + Op.DELEGATECALL(
-                gas=0x38F86B9A,
-                address=0x971AB94B9C20484B37B157476A9F106F639779ED,
-                args_offset=0x84319,
-                args_size=0x120847,
-                ret_offset=0x71DD59,
-                ret_size=0x6F341B,
-            )
+    # Source: raw
+    # 0x436debc3912504eded08f73b9ff9490d73fc4f820a0890b7e8417fa97940713aeb870e59a790607f6b3d5649e57458ea8692da323253735967657e3fc6e02f6de1c0ff6cc18e051bdd52ad7b1eb441440620426b3485ab683d44ff8d5544eb7f7fb3e1f4c30063640b5a626f341b6271dd59621208476208431973<contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b>6338f86b9af4  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.NUMBER
+        + Op.PUSH14[0xEBC3912504EDED08F73B9FF9490D]
+        + Op.PUSH20[0xFC4F820A0890B7E8417FA97940713AEB870E59A7]
+        + Op.SWAP1
+        + Op.MSTORE8(offset=0x3D5649E57458EA8692DA3232, value=0x7F)
+        + Op.SIGNEXTEND(
+            0x1EB441440620426B3485AB683D44FF8D5544EB7F7FB3E1F4C3006364,
+            0x5967657E3FC6E02F6DE1C0FF6CC18E051BDD52AD,
+        )
+        + Op.GAS
+        + Op.DELEGATECALL(
+            gas=0x38F86B9A,
+            address=0x971AB94B9C20484B37B157476A9F106F639779ED,
+            args_offset=0x84319,
+            args_size=0x120847,
+            ret_offset=0x71DD59,
+            ret_size=0x6F341B,
         ),
         balance=0x262E8DE142312A2D,
         nonce=243,
-        address=Address("0x971ab94b9c20484b37b157476a9f106f639779ed"),  # noqa: E501
+        address=Address(0x971AB94B9C20484B37B157476A9F106F639779ED),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "620d15bc62074ac2f3789b4ff89d27fb5018b60a3730731819c16c8a1e6513c3c2703e63"  # noqa: E501
-            "f82ce3617b9c5bdd435cc4e8eaffa5d05d45aef99b6726757bbe89b4ae0e5b9b6062855c"  # noqa: E501
-            "2d525b6ca347c35412d0ab99dbc839a14f619a34621beef752635999fd987437da3edb75"  # noqa: E501
-            "b58f986d9b62ffc1e6dae25c7e0c019f73922a0ab96d77aef70627e71d0a63d38d2d09af"  # noqa: E501
-            "ec6a9f6dd36fff38e99a634e506f29060c4e3c3371d213d31078939857877d1780bc984b"  # noqa: E501
-            "1ae1225b8dc7cc534cd080ba4b324f436d2c211b3c30889cf66d57b8f669c1be7711d782"  # noqa: E501
-            "54d859636790551a4a0f6e0c06664680c8fadd1d7e7b3e887ea3cff5077d014551ed36a7"  # noqa: E501
-            "2977742f6dcee4113c33297428527783529e675399ca43d5df7d9a4151fcac7093585bb8"  # noqa: E501
-            "c6df7d6563faafe035226b81786f72b243bfdbc99e8fd67571df50e0ed7a8e1aaca76fcc"  # noqa: E501
-            "65151e7730dee525a07c75d1b3855ae0bfbe0d79ff4905974c837e30a06fb163d89d"  # noqa: E501
-        ),
+        data=Op.RETURN(offset=0x74AC2, size=0xD15BC)
+        + Op.PUSH25[0x9B4FF89D27FB5018B60A3730731819C16C8A1E6513C3C2703E]
+        + Op.PUSH4[0xF82CE361]
+        + Op.MSTORE(
+            offset=0x855C2D,
+            value=0x9C5BDD435CC4E8EAFFA5D05D45AEF99B6726757BBE89B4AE0E5B9B60,
+        )
+        + Op.JUMPDEST
+        + Op.PUSH13[0xA347C35412D0AB99DBC839A14F]
+        + Op.MSTORE(offset=0x1BEEF7, value=0x9A34)
+        + Op.PUSH4[0x5999FD98]
+        + Op.PUSH21[0x37DA3EDB75B58F986D9B62FFC1E6DAE25C7E0C019F]
+        + Op.PUSH20[0x922A0AB96D77AEF70627E71D0A63D38D2D09AFEC]
+        + Op.PUSH11[0x9F6DD36FFF38E99A634E50]
+        + Op.PUSH16[0x29060C4E3C3371D213D3107893985787]
+        + Op.PUSH30[
+            0x1780BC984B1AE1225B8DC7CC534CD080BA4B324F436D2C211B3C30889CF6
+        ]
+        + Op.PUSH14[0x57B8F669C1BE7711D78254D85963]
+        + Op.PUSH8[0x90551A4A0F6E0C06]
+        + Op.PUSH7[0x4680C8FADD1D7E]
+        + Op.PUSH28[0x3E887EA3CFF5077D014551ED36A72977742F6DCEE4113C3329742852]
+        + Op.PUSH24[0x83529E675399CA43D5DF7D9A4151FCAC7093585BB8C6DF7D]
+        + Op.PUSH6[0x63FAAFE03522]
+        + Op.PUSH12[0x81786F72B243BFDBC99E8FD6]
+        + Op.PUSH22[0x71DF50E0ED7A8E1AACA76FCC65151E7730DEE525A07C]
+        + Op.PUSH22[0xD1B3855AE0BFBE0D79FF4905974C837E30A06FB163D8]
+        + Op.SWAP14,
         gas_limit=9840869,
-        value=4042009829,
+        value=0xF0EC2CE5,
     )
 
-    post: dict = {}
+    post = {
+        addr: Account(storage={}, nonce=210),
+        sender: Account(storage={}, code=b"", nonce=1),
+        addr_2: Account(storage={}, nonce=243),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest644.py b/tests/ported_static/stRandom2/test_random_statetest644.py
index 1b1f3856e1b..79e94782a18 100644
--- a/tests/ported_static/stRandom2/test_random_statetest644.py
+++ b/tests/ported_static/stRandom2/test_random_statetest644.py
@@ -2,19 +2,20 @@
 Geth Failed this test on Frontier and Homestead.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest644Filler.json
+state_tests/stRandom2/randomStatetest644Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,21 +23,18 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest644Filler.json"],
+    ["state_tests/stRandom2/randomStatetest644Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest644(
     state_test: StateTestFiller,
     pre: Alloc,
+    fork: Fork,
 ) -> None:
     """Geth Failed this test on Frontier and Homestead."""
-    coinbase = Address("0x02ebba385bd7f6dde6c57e2d3929a11a1ea0da7e")
-    sender = EOA(
-        key=0x0A10C9449493A34FD272F4BF6FC827C5B46ECE7D0253518E71286F47EC3AE23A
-    )
-    contract = Address("0x0000000000000000000000000000000000000001")
+    coinbase = Address(0x02EBBA385BD7F6DDE6C57E2D3929A11A1EA0DA7E)
+    sender = pre.fund_eoa(amount=0x236D08FE524712CB)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,294 +45,121 @@ def test_random_statetest644(
         gas_limit=27244094167015944,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.PUSH24[0x351C4C5A02C8F13FA7C7F5800FA5C9BA2F3B971C13764F9B]
-            + Op.PUSH2[0xC2DB]
-            + Op.PUSH7[0xC3F909C17E434A]
-            + Op.PUSH9[0xD685402956CC341DBF]
-            + Op.PUSH8[0x79516900ED0A1E26]
-            + Op.PUSH7[0xDFA40E70F3BCEE]
-            + Op.PUSH24[0x3C2BFFD5B5422A2CF32B19E541F15AE2B6FBE16FD19BBD56]
-            + Op.PUSH24[0x28190F83569F036DCCD3886AA69C1E685736DA06152E3B24]
-            + Op.PUSH19[0x8B13546EA1ABD48EE47B1B2E1EC70B37FA14CC]
-            + Op.PUSH17[0x9D35FCE7380230F426455385DA80771FFC]
-            + Op.PUSH15[0x261F3BFE7BFE7F1827D17B0CF49A7D]
-            + Op.PUSH32[
-                0xF8CEB60B6A86EBBB762EB3E4DD1A8A09EAA9A500BC65CBEFD4251865B70CA7E2  # noqa: E501
-            ]
-            + Op.PUSH7[0x82F1A2BAD52A4A]
-            + Op.PUSH10[0x7AA0BAF4EBE05130EC6A]
-            + Op.PUSH3[0xE66E71]
-            + Op.SWAP14
-            + Op.LT(0x682DCA6786082A55EDA4D65F21E9, 0xB753654F0FF08533F6D088E1)
-            + Op.LOG0(
-                offset=0xF77E3D07CC9DAA30A1B2941C17F9039FFA3BADDF70DCE808,
-                size=0x345D12B775CE0F47447731E5EEEFF44CA0A946E1DF,
-            )
-            + Op.SLOAD(key=0xACB22D3FE0B1ECEA101F659FD3FCFE7D9F16)
-            + Op.EXTCODECOPY(
-                address=0x2EBBA385BD7F6DDE6C57E2D3929A11A1EA0DA7E,
-                dest_offset=0x118942,
-                offset=0x32B792,
-                size=0x73B023,
-            )
-            + Op.CALL(
-                gas=0xB2DF5D6,
-                address=0x2EBBA385BD7F6DDE6C57E2D3929A11A1EA0DA7E,
-                value=0x6BD26962,
-                args_offset=0x5B60D5,
-                args_size=0x1ACB67,
-                ret_offset=0x6AB8DE,
-                ret_size=0x47F037,
-            )
-            + Op.CREATE(value=0x17EF5652, offset=0x958980, size=0x3402AF)
-            + Op.ORIGIN
-        ),
-        balance=0x532F42C819FA5BED,
-        nonce=28,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.EXTCODESIZE(address=0xA66737FDCC16CD591384A0B12FB650CE85011E55)
-            + Op.PUSH30[
-                0x85CC6995D8948AC88F5726F16627D809C92DBA32D01471809AD1C5046B53
-            ]
-            + Op.PUSH9[0x7D1FF18BCA5A755A0C]
-            + Op.PUSH13[0xD7CE36E1DC18C7C2A909F6BC00]
-            + Op.PUSH20[0xD53F4C10A2121E6B4F0AEADC71B441C331B19EC5]
-            + Op.PUSH25[0x22835269748AE558697A082470ABAA3595D4B8256F8954C7ED]
-            + Op.PUSH6[0x5896EB04017A]
-            + Op.PUSH32[
-                0x522BE50FD88E38EE27DE7EBD20794466F490BCB43162328A337A6E42FD88CACF  # noqa: E501
-            ]
-            + Op.PUSH11[0x8ECB264FE21836CF31D0AE]
-            + Op.PUSH28[
-                0xE53DA5FE2CAC802905640C0A18B2CCFD806FED6D7CBAF1FC19C6931D
-            ]
-            + Op.PUSH13[0x37B9320599CA5061121076A654]
-            + Op.PUSH16[0xC888F04E94C09ADCC8A3CC9D00244883]
-            + Op.DUP10
-            + Op.PUSH24[0xC1010C1CDEF7438B3D1E99CF6D78B9D4F55962B04476323F]
-            + Op.CALLVALUE
-            + Op.COINBASE
-        ),
+    # Source: raw
+    # 0x73a66737fdcc16cd591384a0b12fb650ce85011e553b7d85cc6995d8948ac88f5726f16627d809c92dba32d01471809ad1c5046b53687d1ff18bca5a755a0c6cd7ce36e1dc18c7c2a909f6bc0073d53f4c10a2121e6b4f0aeadc71b441c331b19ec57822835269748ae558697a082470abaa3595d4b8256f8954c7ed655896eb04017a7f522be50fd88e38ee27de7ebd20794466f490bcb43162328a337a6e42fd88cacf6a8ecb264fe21836cf31d0ae7be53da5fe2cac802905640c0a18b2ccfd806fed6d7cbaf1fc19c6931d6c37b9320599ca5061121076a6546fc888f04e94c09adcc8a3cc9d002448838977c1010c1cdef7438b3d1e99cf6d78b9d4f55962b04476323f3441  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.EXTCODESIZE(address=0xA66737FDCC16CD591384A0B12FB650CE85011E55)
+        + Op.PUSH30[
+            0x85CC6995D8948AC88F5726F16627D809C92DBA32D01471809AD1C5046B53
+        ]
+        + Op.PUSH9[0x7D1FF18BCA5A755A0C]
+        + Op.PUSH13[0xD7CE36E1DC18C7C2A909F6BC00]
+        + Op.PUSH20[0xD53F4C10A2121E6B4F0AEADC71B441C331B19EC5]
+        + Op.PUSH25[0x22835269748AE558697A082470ABAA3595D4B8256F8954C7ED]
+        + Op.PUSH6[0x5896EB04017A]
+        + Op.PUSH32[
+            0x522BE50FD88E38EE27DE7EBD20794466F490BCB43162328A337A6E42FD88CACF
+        ]
+        + Op.PUSH11[0x8ECB264FE21836CF31D0AE]
+        + Op.PUSH28[0xE53DA5FE2CAC802905640C0A18B2CCFD806FED6D7CBAF1FC19C6931D]
+        + Op.PUSH13[0x37B9320599CA5061121076A654]
+        + Op.PUSH16[0xC888F04E94C09ADCC8A3CC9D00244883]
+        + Op.DUP10
+        + Op.PUSH24[0xC1010C1CDEF7438B3D1E99CF6D78B9D4F55962B04476323F]
+        + Op.CALLVALUE
+        + Op.COINBASE,
         balance=0x23C22AEB4961B17E,
         nonce=148,
-        address=Address("0x0346ad0b28ea31b7c3d398881dc11ebc97869461"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x236D08FE524712CB)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.PUSH21[0x357A5ADE2DA3B4A5F5459FAFF84E5EA9B714B60ED2]
-            + Op.PUSH3[0x57EF59]
-            + Op.PUSH30[
-                0x9AA2E6D9316426366FE24FB9ED56C4A9E5DCF06AF08C42368FDAA12B7147
-            ]
-            + Op.PUSH3[0x83C5BD]
-            + Op.PUSH2[0x47ED]
-            + Op.SWAP4
-            + Op.DELEGATECALL(
-                gas=0xC30A604,
-                address=Op.PUSH20[0x5],
-                args_offset=0x28EC1A,
-                args_size=0x4971D8,
-                ret_offset=0x52D373,
-                ret_size=0x5663AE,
-            )
-            + Op.SLOAD(
-                key=0xFE44ADD6669B247CAD0F00251697572FA913A16C98038931DF
-            )
-        ),
+    # Source: raw
+    # 0x74357a5ade2da3b4a5f5459faff84e5ea9b714b60ed26257ef597d9aa2e6d9316426366fe24fb9ed56c4a9e5dcf06af08c42368fdaa12b71476283c5bd6147ed93625663ae6252d373624971d86228ec1a730000000000000000000000000000000000000005630c30a604f478fe44add6669b247cad0f00251697572fa913a16c98038931df54  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH21[0x357A5ADE2DA3B4A5F5459FAFF84E5EA9B714B60ED2]
+        + Op.PUSH3[0x57EF59]
+        + Op.PUSH30[
+            0x9AA2E6D9316426366FE24FB9ED56C4A9E5DCF06AF08C42368FDAA12B7147
+        ]
+        + Op.PUSH3[0x83C5BD]
+        + Op.PUSH2[0x47ED]
+        + Op.SWAP4
+        + Op.DELEGATECALL(
+            gas=0xC30A604,
+            address=Op.PUSH20[0x5],
+            args_offset=0x28EC1A,
+            args_size=0x4971D8,
+            ret_offset=0x52D373,
+            ret_size=0x5663AE,
+        )
+        + Op.SLOAD(key=0xFE44ADD6669B247CAD0F00251697572FA913A16C98038931DF),
         balance=0x9183FD5B40D86E03,
         nonce=28,
-        address=Address("0xe4882ba8527df19159e6536f4aee12c298d28f33"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7300000000000000000000000000000000000000013b7ea30da9ff11bd5f11e4529c93ce"  # noqa: E501
-            "4b37d5a256d61e1f1a0ecccb5fbb21fec97f6b3d456b8caaaa84ef30a44fd8779fae5a48"  # noqa: E501
-            "354b937835d82d57999d194d4edfbaf0a8dd026d727e3315a53e907b0e1873b4dcb7f806"  # noqa: E501
-            "014bc23164e8cc0560256f0c6a8c09c0df2f0f8208ff622bb459d46ffab16ce9d64bcf9c"  # noqa: E501
-            "ec668338ebbc7f9e64656ae99c617d0dd709c1f78f96bea46e2df76db8418e2b657fc77f"  # noqa: E501
-            "f2f979952911a73b767a6ce270c7392d2ff340648610fe0219aaf24df2b26e97e2761497"  # noqa: E501
-            "bc6b97dea1269de3aca3b69ec7098a7257114a4a2e22c401ec6319bc2deb70980ebef372"  # noqa: E501
-            "a327809b3c2473ab86578d2fccd458e6b99a277c4a1d3e96351fbebe62fe63d300444afd"  # noqa: E501
-            "3a9077c20905d2a92b5b2945de6bf9b28d1d42795ca74b029dce6934312994a31fed72e4"  # noqa: E501
-            "5da26c73c636b40b1f6d529f35488625624a9dfd0b62309f286277b5ab6259b2fd621447"  # noqa: E501
-            "22631c4722737300000000000000000000000000000000000000056317345497f13368b2"  # noqa: E501
-            "a96595a00933d8dd6dc111a13b90768f330898544a443407620316d3625614816282f1e9"  # noqa: E501
-            "622e741d730346ad0b28ea31b7c3d398881dc11ebc97869461631d791a38fa"
-        ),
-        gas_limit=48887,
-        value=4077944035,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest644Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest644_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Geth Failed this test on Frontier and Homestead."""
-    coinbase = Address("0x02ebba385bd7f6dde6c57e2d3929a11a1ea0da7e")
-    sender = EOA(
-        key=0x0A10C9449493A34FD272F4BF6FC827C5B46ECE7D0253518E71286F47EC3AE23A
     )
-    contract = Address("0x0000000000000000000000000000000000000001")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=27244094167015944,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.PUSH24[0x351C4C5A02C8F13FA7C7F5800FA5C9BA2F3B971C13764F9B]
-            + Op.PUSH2[0xC2DB]
-            + Op.PUSH7[0xC3F909C17E434A]
-            + Op.PUSH9[0xD685402956CC341DBF]
-            + Op.PUSH8[0x79516900ED0A1E26]
-            + Op.PUSH7[0xDFA40E70F3BCEE]
-            + Op.PUSH24[0x3C2BFFD5B5422A2CF32B19E541F15AE2B6FBE16FD19BBD56]
-            + Op.PUSH24[0x28190F83569F036DCCD3886AA69C1E685736DA06152E3B24]
-            + Op.PUSH19[0x8B13546EA1ABD48EE47B1B2E1EC70B37FA14CC]
-            + Op.PUSH17[0x9D35FCE7380230F426455385DA80771FFC]
-            + Op.PUSH15[0x261F3BFE7BFE7F1827D17B0CF49A7D]
-            + Op.PUSH32[
-                0xF8CEB60B6A86EBBB762EB3E4DD1A8A09EAA9A500BC65CBEFD4251865B70CA7E2  # noqa: E501
-            ]
-            + Op.PUSH7[0x82F1A2BAD52A4A]
-            + Op.PUSH10[0x7AA0BAF4EBE05130EC6A]
-            + Op.PUSH3[0xE66E71]
-            + Op.SWAP14
-            + Op.LT(0x682DCA6786082A55EDA4D65F21E9, 0xB753654F0FF08533F6D088E1)
-            + Op.LOG0(
-                offset=0xF77E3D07CC9DAA30A1B2941C17F9039FFA3BADDF70DCE808,
-                size=0x345D12B775CE0F47447731E5EEEFF44CA0A946E1DF,
-            )
-            + Op.SLOAD(key=0xACB22D3FE0B1ECEA101F659FD3FCFE7D9F16)
-            + Op.EXTCODECOPY(
-                address=0x2EBBA385BD7F6DDE6C57E2D3929A11A1EA0DA7E,
-                dest_offset=0x118942,
-                offset=0x32B792,
-                size=0x73B023,
-            )
-            + Op.CALL(
-                gas=0xB2DF5D6,
-                address=0x2EBBA385BD7F6DDE6C57E2D3929A11A1EA0DA7E,
-                value=0x6BD26962,
-                args_offset=0x5B60D5,
-                args_size=0x1ACB67,
-                ret_offset=0x6AB8DE,
-                ret_size=0x47F037,
-            )
-            + Op.CREATE(value=0x17EF5652, offset=0x958980, size=0x3402AF)
-            + Op.ORIGIN
-        ),
+    # Source: raw
+    # 0x77351c4c5a02c8f13fa7c7f5800fa5c9ba2f3b971c13764f9b61c2db66c3f909c17e434a68d685402956cc341dbf6779516900ed0a1e2666dfa40e70f3bcee773c2bffd5b5422a2cf32b19e541f15ae2b6fbe16fd19bbd567728190f83569f036dccd3886aa69c1e685736da06152e3b24728b13546ea1abd48ee47b1b2e1ec70b37fa14cc709d35fce7380230f426455385da80771ffc6e261f3bfe7bfe7f1827d17b0cf49a7d7ff8ceb60b6a86ebbb762eb3e4dd1a8a09eaa9a500bc65cbefd4251865b70ca7e26682f1a2bad52a4a697aa0baf4ebe05130ec6a62e66e719d6bb753654f0ff08533f6d088e16d682dca6786082a55eda4d65f21e91074345d12b775ce0f47447731e5eeeff44ca0a946e1df77f77e3d07cc9daa30a1b2941c17f9039ffa3baddf70dce808a071acb22d3fe0b1ecea101f659fd3fcfe7d9f16546273b0236232b7926211894273<contract:0xffffffffffffffffffffffffffffffffffffffff>3c6247f037626ab8de621acb67625b60d5636bd2696273<contract:0xffffffffffffffffffffffffffffffffffffffff>630b2df5d6f1623402af629589806317ef5652f032  # noqa: E501
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH24[0x351C4C5A02C8F13FA7C7F5800FA5C9BA2F3B971C13764F9B]
+        + Op.PUSH2[0xC2DB]
+        + Op.PUSH7[0xC3F909C17E434A]
+        + Op.PUSH9[0xD685402956CC341DBF]
+        + Op.PUSH8[0x79516900ED0A1E26]
+        + Op.PUSH7[0xDFA40E70F3BCEE]
+        + Op.PUSH24[0x3C2BFFD5B5422A2CF32B19E541F15AE2B6FBE16FD19BBD56]
+        + Op.PUSH24[0x28190F83569F036DCCD3886AA69C1E685736DA06152E3B24]
+        + Op.PUSH19[0x8B13546EA1ABD48EE47B1B2E1EC70B37FA14CC]
+        + Op.PUSH17[0x9D35FCE7380230F426455385DA80771FFC]
+        + Op.PUSH15[0x261F3BFE7BFE7F1827D17B0CF49A7D]
+        + Op.PUSH32[
+            0xF8CEB60B6A86EBBB762EB3E4DD1A8A09EAA9A500BC65CBEFD4251865B70CA7E2
+        ]
+        + Op.PUSH7[0x82F1A2BAD52A4A]
+        + Op.PUSH10[0x7AA0BAF4EBE05130EC6A]
+        + Op.PUSH3[0xE66E71]
+        + Op.SWAP14
+        + Op.LT(0x682DCA6786082A55EDA4D65F21E9, 0xB753654F0FF08533F6D088E1)
+        + Op.LOG0(
+            offset=0xF77E3D07CC9DAA30A1B2941C17F9039FFA3BADDF70DCE808,
+            size=0x345D12B775CE0F47447731E5EEEFF44CA0A946E1DF,
+        )
+        + Op.SLOAD(key=0xACB22D3FE0B1ECEA101F659FD3FCFE7D9F16)
+        + Op.EXTCODECOPY(
+            address=0x2EBBA385BD7F6DDE6C57E2D3929A11A1EA0DA7E,
+            dest_offset=0x118942,
+            offset=0x32B792,
+            size=0x73B023,
+        )
+        + Op.CALL(
+            gas=0xB2DF5D6,
+            address=0x2EBBA385BD7F6DDE6C57E2D3929A11A1EA0DA7E,
+            value=0x6BD26962,
+            args_offset=0x5B60D5,
+            args_size=0x1ACB67,
+            ret_offset=0x6AB8DE,
+            ret_size=0x47F037,
+        )
+        + Op.CREATE(value=0x17EF5652, offset=0x958980, size=0x3402AF)
+        + Op.ORIGIN,
         balance=0x532F42C819FA5BED,
         nonce=28,
-        address=coinbase,  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.EXTCODESIZE(address=0xA66737FDCC16CD591384A0B12FB650CE85011E55)
-            + Op.PUSH30[
-                0x85CC6995D8948AC88F5726F16627D809C92DBA32D01471809AD1C5046B53
-            ]
-            + Op.PUSH9[0x7D1FF18BCA5A755A0C]
-            + Op.PUSH13[0xD7CE36E1DC18C7C2A909F6BC00]
-            + Op.PUSH20[0xD53F4C10A2121E6B4F0AEADC71B441C331B19EC5]
-            + Op.PUSH25[0x22835269748AE558697A082470ABAA3595D4B8256F8954C7ED]
-            + Op.PUSH6[0x5896EB04017A]
-            + Op.PUSH32[
-                0x522BE50FD88E38EE27DE7EBD20794466F490BCB43162328A337A6E42FD88CACF  # noqa: E501
-            ]
-            + Op.PUSH11[0x8ECB264FE21836CF31D0AE]
-            + Op.PUSH28[
-                0xE53DA5FE2CAC802905640C0A18B2CCFD806FED6D7CBAF1FC19C6931D
-            ]
-            + Op.PUSH13[0x37B9320599CA5061121076A654]
-            + Op.PUSH16[0xC888F04E94C09ADCC8A3CC9D00244883]
-            + Op.DUP10
-            + Op.PUSH24[0xC1010C1CDEF7438B3D1E99CF6D78B9D4F55962B04476323F]
-            + Op.CALLVALUE
-            + Op.COINBASE
-        ),
-        balance=0x23C22AEB4961B17E,
-        nonce=148,
-        address=Address("0x0346ad0b28ea31b7c3d398881dc11ebc97869461"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x236D08FE524712CB)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.PUSH21[0x357A5ADE2DA3B4A5F5459FAFF84E5EA9B714B60ED2]
-            + Op.PUSH3[0x57EF59]
-            + Op.PUSH30[
-                0x9AA2E6D9316426366FE24FB9ED56C4A9E5DCF06AF08C42368FDAA12B7147
-            ]
-            + Op.PUSH3[0x83C5BD]
-            + Op.PUSH2[0x47ED]
-            + Op.SWAP4
-            + Op.DELEGATECALL(
-                gas=0xC30A604,
-                address=Op.PUSH20[0x5],
-                args_offset=0x28EC1A,
-                args_size=0x4971D8,
-                ret_offset=0x52D373,
-                ret_size=0x5663AE,
-            )
-            + Op.SLOAD(
-                key=0xFE44ADD6669B247CAD0F00251697572FA913A16C98038931DF
-            )
-        ),
-        balance=0x9183FD5B40D86E03,
-        nonce=28,
-        address=Address("0xe4882ba8527df19159e6536f4aee12c298d28f33"),  # noqa: E501
+        address=Address(0x02EBBA385BD7F6DDE6C57E2D3929A11A1EA0DA7E),  # noqa: E501
     )
 
+    tx_data = Bytes(
+        "7300000000000000000000000000000000000000013b7ea30da9ff11bd5f11e4529c93ce4b37d5a256d61e1f1a0ecccb5fbb21fec97f6b3d456b8caaaa84ef30a44fd8779fae5a48354b937835d82d57999d194d4edfbaf0a8dd026d727e3315a53e907b0e1873b4dcb7f806014bc23164e8cc0560256f0c6a8c09c0df2f0f8208ff622bb459d46ffab16ce9d64bcf9cec668338ebbc7f9e64656ae99c617d0dd709c1f78f96bea46e2df76db8418e2b657fc77ff2f979952911a73b767a6ce270c7392d2ff340648610fe0219aaf24df2b26e97e2761497bc6b97dea1269de3aca3b69ec7098a7257114a4a2e22c401ec6319bc2deb70980ebef372a327809b3c2473ab86578d2fccd458e6b99a277c4a1d3e96351fbebe62fe63d300444afd3a9077c20905d2a92b5b2945de6bf9b28d1d42795ca74b029dce6934312994a31fed72e45da26c73c636b40b1f6d529f35488625624a9dfd0b62309f286277b5ab6259b2fd62144722631c4722737300000000000000000000000000000000000000056317345497f13368b2a96595a00933d8dd6dc111a13b90768f330898544a443407620316d3625614816282f1e9622e741d730346ad0b28ea31b7c3d398881dc11ebc97869461631d791a38fa"  # noqa: E501
+    )
+    floor_cost = fork.transaction_data_floor_cost_calculator()(data=tx_data)
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7300000000000000000000000000000000000000013b7ea30da9ff11bd5f11e4529c93ce"  # noqa: E501
-            "4b37d5a256d61e1f1a0ecccb5fbb21fec97f6b3d456b8caaaa84ef30a44fd8779fae5a48"  # noqa: E501
-            "354b937835d82d57999d194d4edfbaf0a8dd026d727e3315a53e907b0e1873b4dcb7f806"  # noqa: E501
-            "014bc23164e8cc0560256f0c6a8c09c0df2f0f8208ff622bb459d46ffab16ce9d64bcf9c"  # noqa: E501
-            "ec668338ebbc7f9e64656ae99c617d0dd709c1f78f96bea46e2df76db8418e2b657fc77f"  # noqa: E501
-            "f2f979952911a73b767a6ce270c7392d2ff340648610fe0219aaf24df2b26e97e2761497"  # noqa: E501
-            "bc6b97dea1269de3aca3b69ec7098a7257114a4a2e22c401ec6319bc2deb70980ebef372"  # noqa: E501
-            "a327809b3c2473ab86578d2fccd458e6b99a277c4a1d3e96351fbebe62fe63d300444afd"  # noqa: E501
-            "3a9077c20905d2a92b5b2945de6bf9b28d1d42795ca74b029dce6934312994a31fed72e4"  # noqa: E501
-            "5da26c73c636b40b1f6d529f35488625624a9dfd0b62309f286277b5ab6259b2fd621447"  # noqa: E501
-            "22631c4722737300000000000000000000000000000000000000056317345497f13368b2"  # noqa: E501
-            "a96595a00933d8dd6dc111a13b90768f330898544a443407620316d3625614816282f1e9"  # noqa: E501
-            "622e741d730346ad0b28ea31b7c3d398881dc11ebc97869461631d791a38fa"
-        ),
-        gas_limit=48887,
-        value=4077944035,
+        to=Address(0x0000000000000000000000000000000000000001),
+        data=tx_data,
+        gas_limit=max(48887, floor_cost),
+        value=0xF3107CE3,
     )
 
-    post: dict = {}
+    post = {
+        addr: Account(storage={}, nonce=148),
+        sender: Account(storage={}, code=b"", nonce=1),
+        addr_2: Account(storage={}, nonce=28),
+        coinbase: Account(storage={}, nonce=28),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest645.py b/tests/ported_static/stRandom2/test_random_statetest645.py
index 4039e71a055..fb3fae390ae 100644
--- a/tests/ported_static/stRandom2/test_random_statetest645.py
+++ b/tests/ported_static/stRandom2/test_random_statetest645.py
@@ -2,7 +2,7 @@
 Geth Failed this test on Frontier and Homestead.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest645Filler.json
+state_tests/stRandom2/randomStatetest645Filler.json
 """
 
 import pytest
@@ -11,10 +11,12 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,32 +24,41 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest645Filler.json"],
+    ["state_tests/stRandom2/randomStatetest645Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (4074160023, {}),
-        (0, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest645(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Geth Failed this test on Frontier and Homestead."""
-    coinbase = Address("0xaa0103980a7c3113d3a8f81478b0281492eb3d38")
+    coinbase = Address(0xAA0103980A7C3113D3A8F81478B0281492EB3D38)
+    addr_2 = Address(0x9E9C03F8F885C32813DB5207FD04870F08327F30)
     sender = EOA(
-        key=0x0E5FB93861A38E5458E9D2FF0203D01D1D8167FA9C0DB762CC5CA50EB43B3376
+        key=0xE5FB93861A38E5458E9D2FF0203D01D1D8167FA9C0DB762CC5CA50EB43B3376
     )
-    contract = Address("0x0000000000000000000000000000000000000003")
-    callee_1 = Address("0x9e9c03f8f885c32813db5207fd04870f08327f30")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,135 +69,57 @@ def test_random_statetest645(
         gas_limit=13175566155172316,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.PC
-            + Op.PUSH8[0x9B8E24022D8C28F3]
-            + Op.SGT(0x84BC2F83, 0xB55A0)
-            + Op.EQ(
-                0xEA3E9D28799D45AA77BF1FC1A84EDF0193DEA2D610209EAAF9C8,
-                0x15B61916F0F5,
-            )
+    pre[sender] = Account(balance=0x6F1F70FEA641F30A)
+    pre[addr_2] = Account(balance=0xB3508C0F8A22F8A1, nonce=28)
+    # Source: raw
+    # 0x58679b8e24022d8c28f3620b55a06384bc2f83136515b61916f0f579ea3e9d28799d45aa77bf1fc1a84edf0193dea2d610209eaaf9c814  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.PC
+        + Op.PUSH8[0x9B8E24022D8C28F3]
+        + Op.SGT(0x84BC2F83, 0xB55A0)
+        + Op.EQ(
+            0xEA3E9D28799D45AA77BF1FC1A84EDF0193DEA2D610209EAAF9C8,
+            0x15B61916F0F5,
         ),
         balance=0xBCBAF5A33577F162,
         nonce=29,
-        address=Address("0x322c72dedad1a81092ab9ba908fbec8779ce1c32"),  # noqa: E501
+        address=Address(0x322C72DEDAD1A81092AB9BA908FBEC8779CE1C32),  # noqa: E501
     )
-    pre[callee_1] = Account(balance=0xB3508C0F8A22F8A1, nonce=28)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1D72DE, value=0xCBB01282)
-            + Op.LOG1(
-                offset=0xC396EB18074F148D96FD766DDA35B6CC250661B5F83F0ED625BA68A5FF49A,  # noqa: E501
-                size=0x1EF17F23ED237D9F3262C4EB1B95112820595B127C516074DF06223DB,  # noqa: E501
-                topic_1=0x22948F746C938A0CB,
-            )
+    # Source: raw
+    # 0x63cbb01282621d72de5268022948f746c938a0cb7c01ef17f23ed237d9f3262c4eb1b95112820595b127c516074df06223db7e0c396eb18074f148d96fd766dda35b6cc250661b5f83f0ed625ba68a5ff49aa1  # noqa: E501
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1D72DE, value=0xCBB01282)
+        + Op.LOG1(
+            offset=0xC396EB18074F148D96FD766DDA35B6CC250661B5F83F0ED625BA68A5FF49A,  # noqa: E501
+            size=0x1EF17F23ED237D9F3262C4EB1B95112820595B127C516074DF06223DB,
+            topic_1=0x22948F746C938A0CB,
         ),
         balance=0x2BE1CFD5D6D6B0B7,
         nonce=175,
-        address=coinbase,  # noqa: E501
+        address=Address(0xAA0103980A7C3113D3A8F81478B0281492EB3D38),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6F1F70FEA641F30A)
 
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "326e3696ffc10e3e95c67d29784a35ba967d416feb1e1712098bcbb4d20454c1681694f5"  # noqa: E501
-            "1d8591ff7b80f0e4da50c89a0a777fa7666abccfbd600e213bd71da4925c2a2115799e9c"  # noqa: E501
-            "3bb1622f075452"
+    tx_data = [
+        Bytes(
+            "326e3696ffc10e3e95c67d29784a35ba967d416feb1e1712098bcbb4d20454c1681694f51d8591ff7b80f0e4da50c89a0a777fa7666abccfbd600e213bd71da4925c2a2115799e9c3bb1622f075452"  # noqa: E501
         ),
-        gas_limit=26970,
-        value=tx_value,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest645Filler.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.parametrize(
-    "tx_value, expected_post",
-    [
-        (4074160023, {}),
-        (0, {}),
-    ],
-    ids=["case0", "case1"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest645_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
-) -> None:
-    """Geth Failed this test on Frontier and Homestead."""
-    coinbase = Address("0xaa0103980a7c3113d3a8f81478b0281492eb3d38")
-    sender = EOA(
-        key=0x0E5FB93861A38E5458E9D2FF0203D01D1D8167FA9C0DB762CC5CA50EB43B3376
-    )
-    contract = Address("0x0000000000000000000000000000000000000003")
-    callee_1 = Address("0x9e9c03f8f885c32813db5207fd04870f08327f30")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=13175566155172316,
-    )
-
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.PC
-            + Op.PUSH8[0x9B8E24022D8C28F3]
-            + Op.SGT(0x84BC2F83, 0xB55A0)
-            + Op.EQ(
-                0xEA3E9D28799D45AA77BF1FC1A84EDF0193DEA2D610209EAAF9C8,
-                0x15B61916F0F5,
-            )
-        ),
-        balance=0xBCBAF5A33577F162,
-        nonce=29,
-        address=Address("0x322c72dedad1a81092ab9ba908fbec8779ce1c32"),  # noqa: E501
-    )
-    pre[callee_1] = Account(balance=0xB3508C0F8A22F8A1, nonce=28)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1D72DE, value=0xCBB01282)
-            + Op.LOG1(
-                offset=0xC396EB18074F148D96FD766DDA35B6CC250661B5F83F0ED625BA68A5FF49A,  # noqa: E501
-                size=0x1EF17F23ED237D9F3262C4EB1B95112820595B127C516074DF06223DB,  # noqa: E501
-                topic_1=0x22948F746C938A0CB,
-            )
-        ),
-        balance=0x2BE1CFD5D6D6B0B7,
-        nonce=175,
-        address=coinbase,  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x6F1F70FEA641F30A)
+    ]
+    tx_gas = [26970]
+    tx_value = [4074160023, 0]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "326e3696ffc10e3e95c67d29784a35ba967d416feb1e1712098bcbb4d20454c1681694f5"  # noqa: E501
-            "1d8591ff7b80f0e4da50c89a0a777fa7666abccfbd600e213bd71da4925c2a2115799e9c"  # noqa: E501
-            "3bb1622f075452"
-        ),
-        gas_limit=26970,
-        value=tx_value,
+        to=Address(0x0000000000000000000000000000000000000003),
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        addr: Account(storage={}, nonce=29),
+        sender: Account(storage={}, code=b"", nonce=1),
+        coinbase: Account(storage={}, nonce=175),
+        addr_2: Account(storage={}, code=b"", nonce=28),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest646.py b/tests/ported_static/stRandom2/test_random_statetest646.py
index 71cced32aba..112c3e9e5ee 100644
--- a/tests/ported_static/stRandom2/test_random_statetest646.py
+++ b/tests/ported_static/stRandom2/test_random_statetest646.py
@@ -2,7 +2,7 @@
 Geth Failed this test on all networks.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest646Filler.json
+state_tests/stRandom2/randomStatetest646Filler.json
 """
 
 import pytest
@@ -11,9 +11,12 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,7 +25,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest646Filler.json"],
+    ["state_tests/stRandom2/randomStatetest646Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,11 +34,12 @@ def test_random_statetest646(
     pre: Alloc,
 ) -> None:
     """Geth Failed this test on all networks."""
-    coinbase = Address("0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    coinbase = Address(0xD94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_0 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
-    callee = Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,41 +51,58 @@ def test_random_statetest646(
     )
 
     pre[sender] = Account(balance=0x54465EF1C769628B)
-    pre[callee] = Account(balance=0x33888D4CE6B934, nonce=7)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SLOAD(key=0xBA8B878E01)
-            + Op.PUSH9[0x9B908F27ACB42E5269]
-            + Op.SSTORE(
-                key=0x609834BF9A7E578E45609242172907DD75A925, value=0x39
-            )
-            + Op.PUSH6[0x6C5AA6E92481]
-            + Op.CREATE(value=0x446D325D, offset=0x38648, size=0x13FFA)
-            + Op.CALLER
-            + Op.NOT(0x2C38CFA2F1CDF8CB623C05919874)
-        ),
+    pre[contract_0] = Account(balance=0x33888D4CE6B934, nonce=7)
+    # Source: raw
+    # 0x64ba8b878e0154689b908f27acb42e5269603972609834bf9a7e578e45609242172907dd75a92555656c5aa6e9248162013ffa6203864863446d325df0336d2c38cfa2f1cdf8cb623c0591987419  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SLOAD(key=0xBA8B878E01)
+        + Op.PUSH9[0x9B908F27ACB42E5269]
+        + Op.SSTORE(key=0x609834BF9A7E578E45609242172907DD75A925, value=0x39)
+        + Op.PUSH6[0x6C5AA6E92481]
+        + Op.CREATE(value=0x446D325D, offset=0x38648, size=0x13FFA)
+        + Op.CALLER
+        + Op.NOT(0x2C38CFA2F1CDF8CB623C05919874),
         balance=0xD61773F0C27B842F,
         nonce=28,
-        address=Address("0xffffffffffffffffffffffffffffffffffffffff"),  # noqa: E501
+        address=Address(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "785196fdcb5d7e54c4b381e68c7eaeae2735e5537830130057f554672e70a6b867385ea2"  # noqa: E501
-            "714ea3185b854bf0b4f9617fb47e6afe9ed4ed68f94b50776420fa24010960ce6b65e2a1"  # noqa: E501
-            "ebdce518181d6c69a678989d767fc3d28b6c524f52a87d05519cb32e38fbdc5f801f7569"  # noqa: E501
-            "22b90c0e2e5bc848bb9c6a5d08ee65470af4fbbeacf87a65c90dc57babd8cdc9819f8985"  # noqa: E501
-            "51925828bfd360e8a1f1616619d171c23004b0045424cc962e09d8a65d9fd94af9863d61"  # noqa: E501
-            "eba97d76dc150e19d991ff1b5fd340dd4fd7e522a659ddf69bcbc729599667aa30536cd8"  # noqa: E501
-            "5576cc3477495dae10c85b56"
+        to=contract_1,
+        data=Bytes("785196fd")
+        + Hash(
+            0xCB5D7E54C4B381E68C7EAEAE2735E5537830130057F554672E70A6B867385EA2
+        )
+        + Hash(
+            0x714EA3185B854BF0B4F9617FB47E6AFE9ED4ED68F94B50776420FA24010960CE
+        )
+        + Hash(
+            0x6B65E2A1EBDCE518181D6C69A678989D767FC3D28B6C524F52A87D05519CB32E
+        )
+        + Hash(
+            0x38FBDC5F801F756922B90C0E2E5BC848BB9C6A5D08EE65470AF4FBBEACF87A65
+        )
+        + Hash(
+            0xC90DC57BABD8CDC9819F898551925828BFD360E8A1F1616619D171C23004B004
+        )
+        + Hash(
+            0x5424CC962E09D8A65D9FD94AF9863D61EBA97D76DC150E19D991FF1B5FD340DD
+        )
+        + Hash(
+            0x4FD7E522A659DDF69BCBC729599667AA30536CD85576CC3477495DAE10C85B56
         ),
         gas_limit=5786929,
-        value=1451538698,
+        value=0x5684B90A,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(storage={}, code=b"", nonce=1),
+        compute_create_address(
+            address=contract_1, nonce=28
+        ): Account.NONEXISTENT,
+        contract_0: Account(storage={}, code=b"", nonce=7),
+        contract_1: Account(storage={}, nonce=28),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest647.py b/tests/ported_static/stRandom2/test_random_statetest647.py
index 0e18e9f40a3..04b997bddbd 100644
--- a/tests/ported_static/stRandom2/test_random_statetest647.py
+++ b/tests/ported_static/stRandom2/test_random_statetest647.py
@@ -2,15 +2,15 @@
 Malicious bytecode found by fuzztest tool: returndatacopy(0,-1).
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest647Filler.json
+state_tests/stRandom2/randomStatetest647Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +22,16 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest647Filler.json"],
+    ["state_tests/stRandom2/randomStatetest647Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_random_statetest647(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """Malicious bytecode found by fuzztest tool: returndatacopy(0,-1)."""
-    coinbase = Address("0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0x5B7B8EFB6D003CD481E408D8759A25ADC79955092F1A380D8F8B57346C1D1342
-    )
+    coinbase = Address(0xD94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x174876E800)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,25 +42,23 @@ def test_random_statetest647(
         gas_limit=18857228215205537,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.RETURNDATACOPY(
-                dest_offset=0x0, offset=Op.SUB(0x0, 0x1), size=0x1
-            )
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x6001600160000360003e00
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURNDATACOPY(
+            dest_offset=0x0, offset=Op.SUB(0x0, 0x1), size=0x1
+        )
+        + Op.STOP,
         nonce=7,
-        address=Address("0x782b7c65205e1c08192df7357e2fe778c81256a9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x174876E800)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=5786929,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest648.py b/tests/ported_static/stRandom2/test_random_statetest648.py
index e5c49447c3c..e08661220fa 100644
--- a/tests/ported_static/stRandom2/test_random_statetest648.py
+++ b/tests/ported_static/stRandom2/test_random_statetest648.py
@@ -2,15 +2,15 @@
 Consensus issue test produced by fuzz testing team 00000005-storagefuzz-1.
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest648Filler.json
+state_tests/stRandom2/randomStatetest648Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest648Filler.json"],
+    ["state_tests/stRandom2/randomStatetest648Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,10 +31,8 @@ def test_random_statetest648(
     pre: Alloc,
 ) -> None:
     """Consensus issue test produced by fuzz testing team..."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xFF348633B687EC0F553647F4DDEED7590E90C7EA65B87C5BD399F4C869B9C9FC
-    )
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,47 +43,42 @@ def test_random_statetest648(
         gas_limit=10944489199640098,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFF)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.POP(0x0),
+    # Source: raw
+    # 0x600060006000600060f15af450600060005060f5fffd
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0xF1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x0]
+        + Op.POP(0x0)
+        + Op.SELFDESTRUCT(address=0xF5)
+        + Op.REVERT,
         nonce=0,
-        address=Address("0xa828265d4b2db08e65a1c68d2878f15368b5ae75"),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0xF1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x0]
-            + Op.POP(0x0)
-            + Op.SELFDESTRUCT(address=0xF5)
-            + Op.REVERT
-        ),
+    # Source: raw
+    # 0x600050
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(0x0),
         nonce=0,
-        address=Address("0xca5c69fa03b9dff4d059971ac17edac7ef758725"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "384c289327fda733f319011b605929b98b6cc52e4915c942369264c71a3ca70ebce56fef"  # noqa: E501
-            "7e41103f1acc71e91f299bf6c5730b265d6f9d475936735ea60c58b9bb125a7817817178"  # noqa: E501
-            "4759606d696e98f8522b52fe213edee397b3df6ca9f0c6"
+        to=target,
+        data=Bytes(
+            "384c289327fda733f319011b605929b98b6cc52e4915c942369264c71a3ca70ebce56fef7e41103f1acc71e91f299bf6c5730b265d6f9d475936735ea60c58b9bb125a78178171784759606d696e98f8522b52fe213edee397b3df6ca9f0c6"  # noqa: E501
         ),
         gas_limit=343469,
-        value=14361094,
+        value=0xDB2206,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest649.py b/tests/ported_static/stRandom2/test_random_statetest649.py
index 57c4741eddf..72333b88ceb 100644
--- a/tests/ported_static/stRandom2/test_random_statetest649.py
+++ b/tests/ported_static/stRandom2/test_random_statetest649.py
@@ -2,16 +2,17 @@
 Consensus issue test produced by fuzz testing team...
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest649Filler.json
+state_tests/stRandom2/randomStatetest649Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest649Filler.json"],
+    ["state_tests/stRandom2/randomStatetest649Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,10 +32,8 @@ def test_random_statetest649(
     pre: Alloc,
 ) -> None:
     """Consensus issue test produced by fuzz testing team..."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0x61EC5E5029A151E121E39AE4D7546D549EA4B130F645F6F650CEEC0416FE27F4
-    )
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x3FFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,133 +44,130 @@ def test_random_statetest649(
         gas_limit=10944489199640098,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x6C756DBF65726963616E207F9439303733373936353331363631303037345A05,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x7265737582673075742074650041030A000000EFBF7125E86C756DBF65726963,  # noqa: E501
-            )
-            + Op.PUSH32[
-                0x616E207F9439303733373936353331363631303037345A057265737582673075  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0x742074650041030A000000EFBF7125E86C756DBF65726963616E207F94393037  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0x33373936353331363631303037345A057265737582673075742074650041030A  # noqa: E501
-            ]
-            + Op.PUSH29[
-                0xEFBF7125E86C756DBF65726963616E207F943930373337393635333136
-            ]
-            + Op.PUSH32[
-                0x3631303037345A057265737582673075742074650041030A000000EFBF7125E8  # noqa: E501
-            ]
-            + Op.MSTORE8(offset=0xE0, value=0x6C)
-            + Op.MSTORE8(offset=0xE1, value=0x75)
-            + Op.MSTORE8(offset=0xE2, value=0x6D)
-            + Op.MSTORE8(offset=0xE3, value=0xBF)
-            + Op.MSTORE8(offset=0xE4, value=0x65)
-            + Op.MSTORE8(offset=0xE5, value=0x72)
-            + Op.MSTORE8(offset=0xE6, value=0x69)
-            + Op.MSTORE8(offset=0xE7, value=0x63)
-            + Op.CREATE(value=0x0, offset=0x0, size=0xE8)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.CODECOPY(
-                dest_offset=0x50507F7F943930373337,
-                offset=Op.GAS,
-                size=Op.DUP5,
-            )
-            + Op.CALLDATALOAD(offset=Op.CALLDATASIZE)
-            + Op.BALANCE(address=Op.CALLER)
-            + Op.CALLDATASIZE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.ADDRESS,
-                offset=Op.ADDRESS,
-                size=Op.BALANCE(address=Op.CALLDATASIZE),
-            )
-            + Op.SDIV(Op.GAS, Op.CALLVALUE)
-            + Op.PUSH19[0x6573758267307574207460005260206000F35B]
-            + Op.COINBASE
-            + Op.STOP
-            + Op.CALL(
-                gas=0x12B9BBF,
-                address=0x5,
-                value=0x6572,
-                args_offset=0x6963,
-                args_size=0x616E,
-                ret_offset=0x207F,
-                ret_size=0x9439,
-            )
-            + Op.JUMP(pc=Op.PUSH8[0x15F])
-            + Op.JUMPDEST
-            + Op.JUMP(pc=Op.PUSH8[0x4CA6])
-            + Op.SSTORE(key=0x3636, value=Op.MLOAD(offset=0x3635))
-            + Op.SSTORE(key=0x3637, value=Op.MLOAD(offset=0x3655))
-            + Op.SSTORE(key=0x3638, value=Op.MLOAD(offset=0x3675))
-            + Op.SSTORE(key=0x3639, value=Op.MLOAD(offset=0x3695))
-            + Op.SSTORE(key=0x363A, value=Op.MLOAD(offset=0x36B5))
-            + Op.SSTORE(key=0x363B, value=Op.MLOAD(offset=0x36D5))
-            + Op.SSTORE(key=0x363C, value=Op.MLOAD(offset=0x36F5))
-            + Op.SSTORE(key=0x363D, value=Op.MLOAD(offset=0x3715))
-            + Op.SSTORE(key=0x363E, value=Op.MLOAD(offset=0x3735))
-            + Op.SSTORE(key=0x363F, value=Op.MLOAD(offset=0x3755))
-            + Op.SSTORE(key=0x3640, value=Op.MLOAD(offset=0x3775))
-            + Op.SSTORE(key=0x3641, value=Op.MLOAD(offset=0x3795))
-            + Op.SSTORE(key=0x3642, value=Op.MLOAD(offset=0x37B5))
-            + Op.SSTORE(key=0x3643, value=Op.MLOAD(offset=0x37D5))
-            + Op.SSTORE(key=0x3644, value=Op.MLOAD(offset=0x37F5))
-            + Op.SSTORE(key=0x3645, value=Op.MLOAD(offset=0x3815))
-            + Op.SSTORE(key=0x3646, value=Op.MLOAD(offset=0x3835))
-            + Op.SSTORE(key=0x3647, value=Op.MLOAD(offset=0x3855))
-            + Op.SSTORE(key=0x3648, value=Op.MLOAD(offset=0x3875))
-            + Op.SSTORE(key=0x3649, value=Op.MLOAD(offset=0x3895))
-            + Op.SSTORE(key=0x364A, value=Op.MLOAD(offset=0x38B5))
-            + Op.SSTORE(key=0x364B, value=Op.MLOAD(offset=0x38D5))
-            + Op.SSTORE(key=0x364C, value=Op.MLOAD(offset=0x38F5))
-            + Op.SSTORE(key=0x364D, value=Op.MLOAD(offset=0x3915))
-            + Op.SSTORE(key=0x364E, value=Op.MLOAD(offset=0x3935))
-            + Op.SSTORE(key=0x364F, value=Op.MLOAD(offset=0x3955))
-            + Op.SSTORE(key=0x3650, value=Op.MLOAD(offset=0x3975))
-            + Op.SSTORE(key=0x3651, value=Op.MLOAD(offset=0x3995))
-            + Op.SSTORE(key=0x3652, value=Op.MLOAD(offset=0x39B5))
-            + Op.SSTORE(key=0x3653, value=Op.MLOAD(offset=0x39D5))
-            + Op.SSTORE(key=0x3654, value=Op.MLOAD(offset=0x39F5))
-            + Op.SSTORE(key=0x3655, value=Op.MLOAD(offset=0x3A15))
-            + Op.SSTORE(key=0x3656, value=Op.MLOAD(offset=0x3A35))
-            + Op.SSTORE(key=0x3657, value=Op.MLOAD(offset=0x3A55))
-            + Op.SSTORE(key=0x3658, value=Op.MLOAD(offset=0x3A75))
-            + Op.SSTORE(key=0x3659, value=Op.MLOAD(offset=0x3A95))
-            + Op.SSTORE(key=0x365A, value=Op.MLOAD(offset=0x3AB5))
-            + Op.SSTORE(key=0x365B, value=Op.MLOAD(offset=0x3AD5))
-            + Op.MLOAD(offset=0x3AF5)
-            + Op.PUSH2[0x365C]
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x7f6c756dbf65726963616e207f9439303733373936353331363631303037345a056000527f7265737582673075742074650041030a000000efbf7125e86c756dbf657269636020527f616e207f9439303733373936353331363631303037345a0572657375826730757f742074650041030a000000efbf7125e86c756dbf65726963616e207f943930377f33373936353331363631303037345a057265737582673075742074650041030a7cefbf7125e86c756dbf65726963616e207f9439303733373936353331367f3631303037345a057265737582673075742074650041030a000000efbf7125e8606c60e053607560e153606d60e25360bf60e353606560e453607260e553606960e653606360e75360e860006000f06000600060006000845a6950507f7f9439303733373936353331363631303037345a05726573758267307574207460005260206000f35b410061943961207f61616e616963616572600563012b9bbff167000000000000015f565b670000000000004ca65661363551613636556136555161363755613675516136385561369551613639556136b55161363a556136d55161363b556136f55161363c556137155161363d556137355161363e556137555161363f55613775516136405561379551613641556137b551613642556137d551613643556137f55161364455613815516136455561383551613646556138555161364755613875516136485561389551613649556138b55161364a556138d55161364b556138f55161364c556139155161364d556139355161364e556139555161364f55613975516136505561399551613651556139b551613652556139d551613653556139f55161365455613a155161365555613a355161365655613a555161365755613a755161365855613a955161365955613ab55161365a55613ad55161365b55613af55161365c00  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x6C756DBF65726963616E207F9439303733373936353331363631303037345A05,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x7265737582673075742074650041030A000000EFBF7125E86C756DBF65726963,  # noqa: E501
+        )
+        + Op.PUSH32[
+            0x616E207F9439303733373936353331363631303037345A057265737582673075
+        ]
+        + Op.PUSH32[
+            0x742074650041030A000000EFBF7125E86C756DBF65726963616E207F94393037
+        ]
+        + Op.PUSH32[
+            0x33373936353331363631303037345A057265737582673075742074650041030A
+        ]
+        + Op.PUSH29[
+            0xEFBF7125E86C756DBF65726963616E207F943930373337393635333136
+        ]
+        + Op.PUSH32[
+            0x3631303037345A057265737582673075742074650041030A000000EFBF7125E8
+        ]
+        + Op.MSTORE8(offset=0xE0, value=0x6C)
+        + Op.MSTORE8(offset=0xE1, value=0x75)
+        + Op.MSTORE8(offset=0xE2, value=0x6D)
+        + Op.MSTORE8(offset=0xE3, value=0xBF)
+        + Op.MSTORE8(offset=0xE4, value=0x65)
+        + Op.MSTORE8(offset=0xE5, value=0x72)
+        + Op.MSTORE8(offset=0xE6, value=0x69)
+        + Op.MSTORE8(offset=0xE7, value=0x63)
+        + Op.CREATE(value=0x0, offset=0x0, size=0xE8)
+        + Op.PUSH1[0x0] * 4
+        + Op.CODECOPY(
+            dest_offset=0x50507F7F943930373337, offset=Op.GAS, size=Op.DUP5
+        )
+        + Op.CALLDATALOAD(offset=Op.CALLDATASIZE)
+        + Op.BALANCE(address=Op.CALLER)
+        + Op.CALLDATASIZE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.ADDRESS,
+            offset=Op.ADDRESS,
+            size=Op.BALANCE(address=Op.CALLDATASIZE),
+        )
+        + Op.SDIV(Op.GAS, Op.CALLVALUE)
+        + Op.PUSH19[0x6573758267307574207460005260206000F35B]
+        + Op.COINBASE
+        + Op.STOP
+        + Op.CALL(
+            gas=0x12B9BBF,
+            address=0x5,
+            value=0x6572,
+            args_offset=0x6963,
+            args_size=0x616E,
+            ret_offset=0x207F,
+            ret_size=0x9439,
+        )
+        + Op.JUMP(pc=Op.PUSH8[0x15F])
+        + Op.JUMPDEST
+        + Op.JUMP(pc=Op.PUSH8[0x4CA6])
+        + Op.SSTORE(key=0x3636, value=Op.MLOAD(offset=0x3635))
+        + Op.SSTORE(key=0x3637, value=Op.MLOAD(offset=0x3655))
+        + Op.SSTORE(key=0x3638, value=Op.MLOAD(offset=0x3675))
+        + Op.SSTORE(key=0x3639, value=Op.MLOAD(offset=0x3695))
+        + Op.SSTORE(key=0x363A, value=Op.MLOAD(offset=0x36B5))
+        + Op.SSTORE(key=0x363B, value=Op.MLOAD(offset=0x36D5))
+        + Op.SSTORE(key=0x363C, value=Op.MLOAD(offset=0x36F5))
+        + Op.SSTORE(key=0x363D, value=Op.MLOAD(offset=0x3715))
+        + Op.SSTORE(key=0x363E, value=Op.MLOAD(offset=0x3735))
+        + Op.SSTORE(key=0x363F, value=Op.MLOAD(offset=0x3755))
+        + Op.SSTORE(key=0x3640, value=Op.MLOAD(offset=0x3775))
+        + Op.SSTORE(key=0x3641, value=Op.MLOAD(offset=0x3795))
+        + Op.SSTORE(key=0x3642, value=Op.MLOAD(offset=0x37B5))
+        + Op.SSTORE(key=0x3643, value=Op.MLOAD(offset=0x37D5))
+        + Op.SSTORE(key=0x3644, value=Op.MLOAD(offset=0x37F5))
+        + Op.SSTORE(key=0x3645, value=Op.MLOAD(offset=0x3815))
+        + Op.SSTORE(key=0x3646, value=Op.MLOAD(offset=0x3835))
+        + Op.SSTORE(key=0x3647, value=Op.MLOAD(offset=0x3855))
+        + Op.SSTORE(key=0x3648, value=Op.MLOAD(offset=0x3875))
+        + Op.SSTORE(key=0x3649, value=Op.MLOAD(offset=0x3895))
+        + Op.SSTORE(key=0x364A, value=Op.MLOAD(offset=0x38B5))
+        + Op.SSTORE(key=0x364B, value=Op.MLOAD(offset=0x38D5))
+        + Op.SSTORE(key=0x364C, value=Op.MLOAD(offset=0x38F5))
+        + Op.SSTORE(key=0x364D, value=Op.MLOAD(offset=0x3915))
+        + Op.SSTORE(key=0x364E, value=Op.MLOAD(offset=0x3935))
+        + Op.SSTORE(key=0x364F, value=Op.MLOAD(offset=0x3955))
+        + Op.SSTORE(key=0x3650, value=Op.MLOAD(offset=0x3975))
+        + Op.SSTORE(key=0x3651, value=Op.MLOAD(offset=0x3995))
+        + Op.SSTORE(key=0x3652, value=Op.MLOAD(offset=0x39B5))
+        + Op.SSTORE(key=0x3653, value=Op.MLOAD(offset=0x39D5))
+        + Op.SSTORE(key=0x3654, value=Op.MLOAD(offset=0x39F5))
+        + Op.SSTORE(key=0x3655, value=Op.MLOAD(offset=0x3A15))
+        + Op.SSTORE(key=0x3656, value=Op.MLOAD(offset=0x3A35))
+        + Op.SSTORE(key=0x3657, value=Op.MLOAD(offset=0x3A55))
+        + Op.SSTORE(key=0x3658, value=Op.MLOAD(offset=0x3A75))
+        + Op.SSTORE(key=0x3659, value=Op.MLOAD(offset=0x3A95))
+        + Op.SSTORE(key=0x365A, value=Op.MLOAD(offset=0x3AB5))
+        + Op.SSTORE(key=0x365B, value=Op.MLOAD(offset=0x3AD5))
+        + Op.MLOAD(offset=0x3AF5)
+        + Op.PUSH2[0x365C]
+        + Op.STOP,
         nonce=0,
-        address=Address("0x39ab27391d04d35cae13dcdf2facaba711f0588f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3FFFFFFFFFFFFFFF)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "756dbf65726963616e207f9439303733373936353331363631303037345a057265737582"  # noqa: E501
-            "673075742074650041030a000000efbf7125e86c756dbf65726963616e207f9439303733"  # noqa: E501
-            "373936353331363631303037345a0572657375826730757420746500"
+        to=target,
+        data=Bytes("756dbf65")
+        + Hash(
+            0x726963616E207F9439303733373936353331363631303037345A057265737582
+        )
+        + Hash(
+            0x673075742074650041030A000000EFBF7125E86C756DBF65726963616E207F94
+        )
+        + Hash(
+            0x39303733373936353331363631303037345A0572657375826730757420746500
         ),
         gas_limit=147828,
-        value=4022300965,
+        value=0xEFBF7125,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRandom2/test_random_statetest650.py b/tests/ported_static/stRandom2/test_random_statetest650.py
index a8c027edab1..383d82978cc 100644
--- a/tests/ported_static/stRandom2/test_random_statetest650.py
+++ b/tests/ported_static/stRandom2/test_random_statetest650.py
@@ -2,16 +2,17 @@
 Consensus issue test produced by fuzz testing team...
 
 Ported from:
-tests/static/state_tests/stRandom2/randomStatetest650Filler.json
+state_tests/stRandom2/randomStatetest650Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -22,3322 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest650Filler.json"],
+    ["state_tests/stRandom2/randomStatetest650Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
 @pytest.mark.pre_alloc_mutable
 def test_random_statetest650(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """Consensus issue test produced by fuzz testing team..."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0x61EC5E5029A151E121E39AE4D7546D549EA4B130F645F6F650CEEC0416FE27F4
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10944489199640098,
-    )
-
-    pre[sender] = Account(balance=0x3FFFFFFFFFFFFFFF)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x10000000)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE8(offset=0x60, value=0xF6)
-            + Op.MSTORE8(offset=0x61, value=0x73)
-            + Op.MSTORE8(offset=0x62, value=0xA)
-            + Op.MSTORE8(offset=0x63, value=0xEF)
-            + Op.MSTORE8(offset=0x64, value=0xBF)
-            + Op.MSTORE8(offset=0x65, value=0xBD)
-            + Op.MSTORE8(offset=0x66, value=0xEF)
-            + Op.MSTORE8(offset=0x67, value=0xBF)
-            + Op.MSTORE8(offset=0x68, value=0xBD)
-            + Op.MSTORE8(offset=0x69, value=0xEF)
-            + Op.MSTORE8(offset=0x6A, value=0xBF)
-            + Op.MSTORE8(offset=0x6B, value=0xBD)
-            + Op.MSTORE8(offset=0x6C, value=0xEF)
-            + Op.MSTORE8(offset=0x6D, value=0xBF)
-            + Op.MSTORE8(offset=0x6E, value=0xBD)
-            + Op.MSTORE8(offset=0x6F, value=0x3)
-            + Op.STATICCALL(
-                gas=0xD51402,
-                address=0x5,
-                args_offset=0x0,
-                args_size=0x70,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.SSTORE(key=0x5A430010, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-        ),
-        nonce=0,
-        address=Address("0x9d258197de5279a844b4be3d23547ca4233a70bc"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "000000d514029599b459ce6d7f5a430010f6730aefbfbdefbfbdefbfbdefbfbd03000000"  # noqa: E501
-            "d514029599b459ce6d7f5a430010f6730aefbfbdefbfbdefbfbdefbfbd03000000d51402"  # noqa: E501
-            "9599b459ce6d7f5a430010f6730aefbfbdefbfbdefbfbdefbfbd0300"
-        ),
-        gas_limit=1200000,
-        value=4022320387,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stRandom2/randomStatetest650Filler.json"],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.pre_alloc_mutable
-def test_random_statetest650_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Consensus issue test produced by fuzz testing team..."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0x61EC5E5029A151E121E39AE4D7546D549EA4B130F645F6F650CEEC0416FE27F4
-    )
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x3FFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -3348,3279 +44,3281 @@ def test_random_statetest650_from_osaka(
         gas_limit=10944489199640098,
     )
 
-    pre[sender] = Account(balance=0x3FFFFFFFFFFFFFFF)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x10000000)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE8(offset=0x60, value=0xF6)
-            + Op.MSTORE8(offset=0x61, value=0x73)
-            + Op.MSTORE8(offset=0x62, value=0xA)
-            + Op.MSTORE8(offset=0x63, value=0xEF)
-            + Op.MSTORE8(offset=0x64, value=0xBF)
-            + Op.MSTORE8(offset=0x65, value=0xBD)
-            + Op.MSTORE8(offset=0x66, value=0xEF)
-            + Op.MSTORE8(offset=0x67, value=0xBF)
-            + Op.MSTORE8(offset=0x68, value=0xBD)
-            + Op.MSTORE8(offset=0x69, value=0xEF)
-            + Op.MSTORE8(offset=0x6A, value=0xBF)
-            + Op.MSTORE8(offset=0x6B, value=0xBD)
-            + Op.MSTORE8(offset=0x6C, value=0xEF)
-            + Op.MSTORE8(offset=0x6D, value=0xBF)
-            + Op.MSTORE8(offset=0x6E, value=0xBD)
-            + Op.MSTORE8(offset=0x6F, value=0x3)
-            + Op.STATICCALL(
-                gas=0xD51402,
-                address=0x5,
-                args_offset=0x0,
-                args_size=0x70,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.SSTORE(key=0x5A430010, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
-            + Op.CALL(
-                gas=0xD514,
-                address=0x7,
-                value=0x295,
-                args_offset=0x99B4,
-                args_size=0x59CE,
-                ret_offset=0x5A43,
-                ret_size=0x10,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
-            )
-            + Op.MSTORE8(offset=0xE0, value=0x43)
-            + Op.MSTORE8(offset=0xE1, value=0x0)
-            + Op.MSTORE8(offset=0xE2, value=0x10)
-            + Op.MSTORE8(offset=0xE3, value=0xF6)
-            + Op.MSTORE8(offset=0xE4, value=0x73)
-            + Op.MSTORE8(offset=0xE5, value=0xA)
-            + Op.MSTORE8(offset=0xE6, value=0xEF)
-            + Op.MSTORE8(offset=0xE7, value=0xBF)
-            + Op.MSTORE8(offset=0xE8, value=0xBD)
-            + Op.MSTORE8(offset=0xE9, value=0xEF)
-            + Op.MSTORE8(offset=0xEA, value=0xBF)
-            + Op.MSTORE8(offset=0xEB, value=0xBD)
-            + Op.MSTORE8(offset=0xEC, value=0xEF)
-            + Op.MSTORE8(offset=0xED, value=0xBF)
-            + Op.MSTORE8(offset=0xEE, value=0xBD)
-            + Op.CALL(
-                gas=0x2368EF,
-                address=0x2,
-                value=0xBFBDEFBF,
-                args_offset=0x0,
-                args_size=0xEF,
-                ret_offset=0x0,
-                ret_size=0x20,
-            )
+    # Source: raw
+    # 0x60006000526310000000602052600060405260f66060536073606153600a60625360ef60635360bf60645360bd60655360ef60665360bf60675360bd60685360ef60695360bf606a5360bd606b5360ef606c5360bf606d5360bd606e536003606f536040600060706000600562d51402fa6000635a430010557fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff16010615a436159ce6199b4610295600761d514f17fbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6730a6000527fefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f6736020527f0aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a430010f66040527f730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4300106060527ff6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a43006080527f10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a4360a0527e10f6730aefbfbdefbfbdefbfbdefbfbd03000000d514029599b459ce6d7f5a60c052604360e053600060e153601060e25360f660e353607360e453600a60e55360ef60e65360bf60e75360bd60e85360ef60e95360bf60ea5360bd60eb5360ef60ec5360bf60ed5360bd60ee536020600060ef600063bfbdefbf6002622368eff1  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x10000000)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE8(offset=0x60, value=0xF6)
+        + Op.MSTORE8(offset=0x61, value=0x73)
+        + Op.MSTORE8(offset=0x62, value=0xA)
+        + Op.MSTORE8(offset=0x63, value=0xEF)
+        + Op.MSTORE8(offset=0x64, value=0xBF)
+        + Op.MSTORE8(offset=0x65, value=0xBD)
+        + Op.MSTORE8(offset=0x66, value=0xEF)
+        + Op.MSTORE8(offset=0x67, value=0xBF)
+        + Op.MSTORE8(offset=0x68, value=0xBD)
+        + Op.MSTORE8(offset=0x69, value=0xEF)
+        + Op.MSTORE8(offset=0x6A, value=0xBF)
+        + Op.MSTORE8(offset=0x6B, value=0xBD)
+        + Op.MSTORE8(offset=0x6C, value=0xEF)
+        + Op.MSTORE8(offset=0x6D, value=0xBF)
+        + Op.MSTORE8(offset=0x6E, value=0xBD)
+        + Op.MSTORE8(offset=0x6F, value=0x3)
+        + Op.STATICCALL(
+            gas=0xD51402,
+            address=0x5,
+            args_offset=0x0,
+            args_size=0x70,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.SSTORE(key=0x5A430010, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
+        )
+        + Op.CALL(
+            gas=0xD514,
+            address=0x7,
+            value=0x295,
+            args_offset=0x99B4,
+            args_size=0x59CE,
+            ret_offset=0x5A43,
+            ret_size=0x10,
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6730A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F673,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xAEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010F6,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A430010,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0xF6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A4300,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A43,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x10F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000D514029599B459CE6D7F5A,  # noqa: E501
+        )
+        + Op.MSTORE8(offset=0xE0, value=0x43)
+        + Op.MSTORE8(offset=0xE1, value=0x0)
+        + Op.MSTORE8(offset=0xE2, value=0x10)
+        + Op.MSTORE8(offset=0xE3, value=0xF6)
+        + Op.MSTORE8(offset=0xE4, value=0x73)
+        + Op.MSTORE8(offset=0xE5, value=0xA)
+        + Op.MSTORE8(offset=0xE6, value=0xEF)
+        + Op.MSTORE8(offset=0xE7, value=0xBF)
+        + Op.MSTORE8(offset=0xE8, value=0xBD)
+        + Op.MSTORE8(offset=0xE9, value=0xEF)
+        + Op.MSTORE8(offset=0xEA, value=0xBF)
+        + Op.MSTORE8(offset=0xEB, value=0xBD)
+        + Op.MSTORE8(offset=0xEC, value=0xEF)
+        + Op.MSTORE8(offset=0xED, value=0xBF)
+        + Op.MSTORE8(offset=0xEE, value=0xBD)
+        + Op.CALL(
+            gas=0x2368EF,
+            address=0x2,
+            value=0xBFBDEFBF,
+            args_offset=0x0,
+            args_size=0xEF,
+            ret_offset=0x0,
+            ret_size=0x20,
         ),
         nonce=0,
-        address=Address("0x9d258197de5279a844b4be3d23547ca4233a70bc"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "000000d514029599b459ce6d7f5a430010f6730aefbfbdefbfbdefbfbdefbfbd03000000"  # noqa: E501
-            "d514029599b459ce6d7f5a430010f6730aefbfbdefbfbdefbfbdefbfbd03000000d51402"  # noqa: E501
-            "9599b459ce6d7f5a430010f6730aefbfbdefbfbdefbfbdefbfbd0300"
+        to=target,
+        data=Bytes("000000d5")
+        + Hash(
+            0x14029599B459CE6D7F5A430010F6730AEFBFBDEFBFBDEFBFBDEFBFBD03000000
+        )
+        + Hash(
+            0xD514029599B459CE6D7F5A430010F6730AEFBFBDEFBFBDEFBFBDEFBFBD030000
+        )
+        + Hash(
+            0xD514029599B459CE6D7F5A430010F6730AEFBFBDEFBFBDEFBFBDEFBFBD0300
         ),
         gas_limit=1200000,
-        value=4022320387,
+        value=0xEFBFBD03,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRecursiveCreate/__init__.py b/tests/ported_static/stRecursiveCreate/__init__.py
index 0ec73d0fe80..cc994bb98ae 100644
--- a/tests/ported_static/stRecursiveCreate/__init__.py
+++ b/tests/ported_static/stRecursiveCreate/__init__.py
@@ -1 +1 @@
-"""Tests ported from stRecursiveCreate."""
+"""Ported static tests: stRecursiveCreate."""  # noqa: N999
diff --git a/tests/ported_static/stRecursiveCreate/test_recursive_create.py b/tests/ported_static/stRecursiveCreate/test_recursive_create.py
index f365b211ee0..80d5901bc12 100644
--- a/tests/ported_static/stRecursiveCreate/test_recursive_create.py
+++ b/tests/ported_static/stRecursiveCreate/test_recursive_create.py
@@ -1,19 +1,20 @@
 """
-Test ported from static filler.
+Test_recursive_create.
 
 Ported from:
-tests/static/state_tests/stRecursiveCreate/recursiveCreateFiller.json
+state_tests/stRecursiveCreate/recursiveCreateFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRecursiveCreate/recursiveCreateFiller.json"],
+    ["state_tests/stRecursiveCreate/recursiveCreateFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +31,10 @@ def test_recursive_create(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_recursive_create."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,27 +45,26 @@ def test_recursive_create(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(CODECOPY 0 0 32)(CREATE 0 0 32)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.CREATE(value=0x0, offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.CREATE(value=0x0, offset=0x0, size=0x20)
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=465224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=contract_0, nonce=0): Account(nonce=2),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRecursiveCreate/test_recursive_create_return_value.py b/tests/ported_static/stRecursiveCreate/test_recursive_create_return_value.py
index ebe67c52b63..041f86ff498 100644
--- a/tests/ported_static/stRecursiveCreate/test_recursive_create_return_value.py
+++ b/tests/ported_static/stRecursiveCreate/test_recursive_create_return_value.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_recursive_create_return_value.
 
 Ported from:
-tests/static/state_tests/stRecursiveCreate
-recursiveCreateReturnValueFiller.json
+state_tests/stRecursiveCreate/recursiveCreateReturnValueFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRecursiveCreate/recursiveCreateReturnValueFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRecursiveCreate/recursiveCreateReturnValueFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -34,11 +32,10 @@ def test_recursive_create_return_value(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_recursive_create_return_value."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,1111 +46,29 @@ def test_recursive_create_return_value(
         gas_limit=10000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(CODECOPY 0 0 32) [[ 0 ]] (ADD (CREATE 0 0 32) 1) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.ADD(Op.CREATE(value=0x0, offset=0x0, size=0x20), 0x1),
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.ADD(Op.CREATE(value=0x0, offset=0x0, size=0x20), 0x1),
+        )
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=1000000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        Address("0x0124ac36deebf89244c22bedfcb6e05fb2f62f3b"): Account(
-            storage={0: 0xBBC2AEA32A7763BF59EA9157274F20E73C47210E},
-        ),
-        Address("0x0153629ea98627274192fa275a6a9ad20191ab03"): Account(
-            storage={0: 0x953FE148ABF5E5D1B957446919F7D460FB8E0E05},
-        ),
-        Address("0x015fc611579b182f9eddaf3662514c999974bed2"): Account(
-            storage={0: 0xE178AB0C8C219833CB17090483147B44AF97EA74},
-        ),
-        Address("0x02660b1fc1d262f440733e8787f6ca21fb55bcd4"): Account(
-            storage={0: 0x73714E7E266D879BAFD2CB37528E2169CB508514},
-        ),
-        Address("0x03b30e6dcce89e39590901b797c16935f14cfe7d"): Account(
-            storage={0: 0x4AEA3BD98CCC05D8B80D0225A47258FD9EAD31B4},
-        ),
-        Address("0x03cd9f61e105543325910d9d7f8427235a29e850"): Account(
-            storage={0: 0x502E8922FFF35256C92F22F970802241C85A875B},
-        ),
-        Address("0x0563ece055f8043c2fa7eae79f85a5974e2459ad"): Account(
-            storage={0: 0x2A5AFAB4B1B210196E2F8D6DDB24D7D1A3E8A365},
-        ),
-        Address("0x05f76726986912c1fbda22db3aafdd295dc833aa"): Account(
-            storage={0: 0x5553AF7FAAA8EB68DE8787E8022DDA0C58BED06E},
-        ),
-        Address("0x061b1ef6ec7572d0837a557a5d673d95d645cb8a"): Account(
-            storage={0: 0x21E2E15B2AF6454AD91E1B36E3830238CF755B49},
-        ),
-        Address("0x078fcf5f2a71a260b50b04efe2feede4a4155f42"): Account(
-            storage={0: 0x38CDBB61FC5323DD5F6F4AA599D4F36406B766FF},
-        ),
-        Address("0x07d4c830ba3d7b13dd3435b6a9de7f2bdcf90bc7"): Account(
-            storage={0: 0xF610A2A3A281686A9D78073EEB0A5F6A4619213C},
-        ),
-        Address("0x089a70486f0cc448c7e5ac2ba11a9f71b970808e"): Account(
-            storage={0: 0x69AD22B81F58D128A7736328FDAC92D7DFD63CEF},
-        ),
-        Address("0x08e3ffdc8d29af262542744f4d400983fe31c590"): Account(
-            storage={0: 0x52AEA75E06E98440B2DAA28313D03C31129ACEF7},
-        ),
-        Address("0x094439b76fdd228f193958d098d2c8bf6238de1c"): Account(
-            storage={0: 0xB83F1B5B2F0FB059368E680B040B1DC118DB2587},
-        ),
-        contract: Account(
-            storage={0: 0xD2571607E241ECF590ED94B12D87C94BABE36DB7},
-        ),
-        Address("0x09a35a6f6607eebc286c6b5194a213370bcadb30"): Account(
-            storage={0: 0x18205DF1C43E9E29920725E96A362260AA5D3242},
-        ),
-        Address("0x0a3fdfc866b2404c1ed78d478482c0f5107ce776"): Account(
-            storage={0: 0xE8849B2D422C4231AF55A706BCF7572F38F7A01A},
-        ),
-        Address("0x0b057f3d7be9b4be7edf09b66f0a154da6a46ae4"): Account(
-            storage={0: 0x350A4186374A87DC45CADA137C2EED0022E23F0E},
-        ),
-        Address("0x0b7cdb850b37437912005a1b54b1306452425679"): Account(
-            storage={0: 0x33C0B6CB54994491D359AF637DFB34E3065C98C7},
-        ),
-        Address("0x0b9ee042a78ff660da0c6bd6fee0b2e22b414c03"): Account(
-            storage={0: 0x26A1838800D9131A3E7D3EE0A43D2F0122746FB5},
-        ),
-        Address("0x0d3bc01519ee0a1216a632b99c19a06df8017c6b"): Account(
-            storage={0: 0x9A35A6F6607EEBC286C6B5194A213370BCADB31},
-        ),
-        Address("0x0e0f3dc21b49a768b9933909a09531de8198f0a9"): Account(
-            storage={0: 0x81CD35AC42BC6C520C5C41640DEC4C9A3A9DE9D2},
-        ),
-        Address("0x0f4f5cf7567448a171b08d58c9fcfc8c1acc0aa9"): Account(
-            storage={0: 0xD4F5A4A0A9770C53E8A43E80DFDDFE30DDC67A2B},
-        ),
-        Address("0x10b3a8c098467317d86d530931b7424dd8a74f3c"): Account(
-            storage={0: 0x8FA40127106DBF70F7931DDD510E2F0211DFD15E},
-        ),
-        Address("0x11802a2c1f85a5da238086378dc4820ccd19134f"): Account(
-            storage={0: 0x9AAE8B11A923F49FCAB42904F8C6759FCBAD37FA},
-        ),
-        Address("0x135dde330f78ca8bdf3c694ea49d08065d49bdfd"): Account(
-            storage={0: 0xD454705BBB4750FF5D62CBF2A5134D02B272DB17},
-        ),
-        Address("0x138de55ad30a7e72b8d19a27048203c0297a7750"): Account(
-            storage={0: 0xDF1050BDF2C8617339324E68A1E6E0E102E3CA32},
-        ),
-        Address("0x13e0f4c536fc64dc3b82fa9055f717783566a99e"): Account(
-            storage={0: 0x230DD0589ED6366C0C89DC257ED902FC4E6648E4},
-        ),
-        Address("0x14a6985982a43b5fcc2046c3d5ba3622e5ca00d2"): Account(
-            storage={0: 0x4132BAF092924FCB4B3185213462643A64E00670},
-        ),
-        Address("0x14aef68e79d441e5d9fa6a397c8ea11fdaa111c8"): Account(
-            storage={0: 0x7E641E26DFAC957EDE0A2B9CA358EA9082150052},
-        ),
-        Address("0x15533643df9a543582de7d814e1cd06c8d93ce73"): Account(
-            storage={0: 0xA95ABF1F117EC9CBA5DA9412AB5776299F19C9CD},
-        ),
-        Address("0x18205df1c43e9e29920725e96a362260aa5d3241"): Account(
-            storage={0: 0x29133526942F54E611D0DEE32BBB3386CF1C891C},
-        ),
-        Address("0x1902813a7606ced9e69222e4d756bd81bde3eff5"): Account(
-            storage={0: 0x812F8F7534D22508B43FC38E7679A3C5756D8E43},
-        ),
-        Address("0x19a0689c7c59dbbe8a569b594572abdc7bd5c77c"): Account(
-            storage={0: 0xE0F3DC21B49A768B9933909A09531DE8198F0AA},
-        ),
-        Address("0x1a21d699163a7f697a68977ce1fb21887d59cd7c"): Account(
-            storage={0: 0xB651A1E8312709EAE2DC95103BBE7FCA9E6E3574},
-        ),
-        Address("0x1c38fae029602412d3789f348541577249bee123"): Account(
-            storage={0: 0xBA80321B067A71FC689104A602A589634A5F76CD},
-        ),
-        Address("0x1cf9918897600e9c9e17f7c6e2797ed8fdd8af10"): Account(
-            storage={0: 0x90F83FCE5FB9BBECB55981C96F223F044786C40E},
-        ),
-        Address("0x1d9cb40fa087e41cb84a4d56ad104226e3d6f018"): Account(
-            storage={0: 0xDC963C747DDED8C966CCA2E13C10A65CF04CEFC5},
-        ),
-        Address("0x1e22452e40c125d338ca6b53c49773da2e3760eb"): Account(
-            storage={0: 0x4E2634D8427A529403ECDD1D44AA6DD137DA4625},
-        ),
-        Address("0x1ec3bf52d870e0226044c2c0e84f0cd2883bbd92"): Account(
-            storage={0: 0x58675E090154B7E827E68883B3B9ECAF1C8BB8D5},
-        ),
-        Address("0x1f1af23e708f4720910cb4ca9f83ef0188a23f0a"): Account(
-            storage={0: 0x3206FB12E53A9EEA5A1D4501394042FC9333AEEB},
-        ),
-        Address("0x1fd0c0883bd94f7a6a87a7a216359f1dbfab7f51"): Account(
-            storage={0: 0x68610B9DB9EA182FF1921FAB9863150D1849C5F6},
-        ),
-        Address("0x21e2e15b2af6454ad91e1b36e3830238cf755b48"): Account(
-            storage={0: 0xF9A151D133C315854462C5653437E34656CFDC38},
-        ),
-        Address("0x22f1aff96e05248331ec9f15270c5552d665f41e"): Account(
-            storage={0: 0x2460590BF5FCC3D6E76CF72004944265B8ECDC14},
-        ),
-        Address("0x230dd0589ed6366c0c89dc257ed902fc4e6648e3"): Account(
-            storage={0: 0x4F7B7C8E24BF233866A0FAD0AC657226DE940B64},
-        ),
-        Address("0x23192662f87a4ab3db2759748c755d819e59cd2a"): Account(
-            storage={0: 0x4A53EAA64B683D0C95B5BA0B681B64CFD95E5E40},
-        ),
-        Address("0x2460590bf5fcc3d6e76cf72004944265b8ecdc13"): Account(
-            storage={0: 0x683013D2114CAE8B41473CA318267C7DB219B8A0},
-        ),
-        Address("0x24a18b9ffe06edc928eb9037ef40c9b24349d9ea"): Account(
-            storage={0: 0xE53A708ED6F6EF523576E12DDF568C79D25B79F8},
-        ),
-        Address("0x24aafb1cf6510457d2a4aa39512393b490b24c61"): Account(
-            storage={0: 0x854C4F512B9ECC17467E602F6512496A89D5705D},
-        ),
-        Address("0x2566a11ad8ac081e7c26ba1afff8d1c208642f5d"): Account(
-            storage={0: 0x2852018B3CE85CB2D700B9FB8699A2ECDAD0DC0B},
-        ),
-        Address("0x25d8caa13d191aefbbc4a6b2f60ac679a2a56e00"): Account(
-            storage={0: 0x4BD7B245F707B5FDB259C3FE61DAC9255CB8BB25},
-        ),
-        Address("0x26963175b50e69c2400aa12887cad973aa275ff0"): Account(
-            storage={0: 0x923945F4390EE06A73A80C1F56F979F7959755E0},
-        ),
-        Address("0x26a1838800d9131a3e7d3ee0a43d2f0122746fb4"): Account(
-            storage={0: 0x5EE8A44AC78E6C8E2DB3297DBA0E4E0E61B08DE5},
-        ),
-        Address("0x270fb896f474137cc0a51ac5cfa01e01994da981"): Account(
-            storage={0: 0xAA0A91BE8C06C9BA16CE1CE5836941E920CA9AFA},
-        ),
-        Address("0x283b585ba5bc85d64a99cb5ecb9a8495ac944948"): Account(
-            storage={0: 0x4326E4B5AA29095A293F86C51E4776BEEEB13C9C},
-        ),
-        Address("0x2852018b3ce85cb2d700b9fb8699a2ecdad0dc0a"): Account(
-            storage={0: 0x3CA9B7FADDD261997977E206A2F288B4B8374666},
-        ),
-        Address("0x28cc863e08832ad7b9c1b28bfa2fbff5a1611745"): Account(
-            storage={0: 0x3CD9F61E105543325910D9D7F8427235A29E851},
-        ),
-        Address("0x29133526942f54e611d0dee32bbb3386cf1c891b"): Account(
-            storage={0: 0xB0F2564F0A4CB0D593A648D256B69B4ECDAA036B},
-        ),
-        Address("0x295cac445bfac8cb2244bc70cdb32d99594d47e3"): Account(
-            storage={0: 0xAE3FE33DC09C697BFB635C9AB4BF8F0BF4264680},
-        ),
-        Address("0x29ba5a51398ab1b9a6e68f9afe8a08c301e098f0"): Account(
-            storage={0: 0x6473F78CE5E4E31A7057EF32B70DCB9E3AFD1D87},
-        ),
-        Address("0x2a5afab4b1b210196e2f8d6ddb24d7d1a3e8a364"): Account(
-            storage={0: 0xBD5649FAF8BCC002DC4A58E3A58DC0FF4413E20E},
-        ),
-        Address("0x2a8c62782a9ac9ad37ceed561522cf5279e80fed"): Account(
-            storage={0: 0x23192662F87A4AB3DB2759748C755D819E59CD2B},
-        ),
-        Address("0x2b26fac300d8a9bab12c79d8374726af0e2eec13"): Account(
-            storage={0: 0x632465EED4E41F3AAAAAC5BB576838CB3F0EA943},
-        ),
-        Address("0x2c0b3f7eba30e844978dd6a58127cca7fa9dd329"): Account(
-            storage={0: 0x94F69C9E63CF82C2F3A04943B4C57909D99397E6},
-        ),
-        Address("0x2ccf72ae225fbeddf894606c87629c42f685ea77"): Account(
-            storage={0: 0x687DCCB33DC4DFA5E5DEA197C151095A4E19FDD3},
-        ),
-        Address("0x2cec8e078d4f0b40547db5134af753177afb7157"): Account(
-            storage={0: 0xBABBD30645C383315B3F157D518AB54F22465AB3},
-        ),
-        Address("0x2ea5d28deea6fd475333f03590fadb6a29514936"): Account(
-            storage={0: 0x2660B1FC1D262F440733E8787F6CA21FB55BCD5},
-        ),
-        Address("0x2eccfda404dee5308012197c894b86789921ca30"): Account(
-            storage={0: 0x4E11236C11EBDEC00068C3C1997937935290A1EE},
-        ),
-        Address("0x2fa655ac7839b95773bb43a5ca5bdd636c1c3f42"): Account(
-            storage={0: 0x94439B76FDD228F193958D098D2C8BF6238DE1D},
-        ),
-        Address("0x3043fe71ffbc8cc57fc0e4373b9a2106dfa64402"): Account(
-            storage={0: 0xADCC47CD626CC70A6326F9858E889932AEC7487D},
-        ),
-        Address("0x3206fb12e53a9eea5a1d4501394042fc9333aeea"): Account(
-            storage={0: 0xD85FDFF87CF6D94195CF56B5E9AD410E936AC125},
-        ),
-        Address("0x33c0b6cb54994491d359af637dfb34e3065c98c6"): Account(
-            storage={0: 0x1A21D699163A7F697A68977CE1FB21887D59CD7D},
-        ),
-        Address("0x3435a3a9c7a82796be5c2bf306e39132482b146a"): Account(
-            storage={0: 0x41871652222884569A03B4F357441DEC29DD4C04},
-        ),
-        Address("0x350a4186374a87dc45cada137c2eed0022e23f0d"): Account(
-            storage={0: 0x3C3EFEB193BE9BDCC59A190BA343B7AA51AB3418},
-        ),
-        Address("0x3515873bc24d6721857b331afbb9d2e18099e79f"): Account(
-            storage={0: 0xAEEC6641CB72FB4F1839CF9DF13FA59B80D91E34},
-        ),
-        Address("0x359d51cf93b31de8b40707b6c1b22f8f1b70a336"): Account(
-            storage={0: 0x49D4EF28805E87178CAFC25B34E0F4FA720A7A57},
-        ),
-        Address("0x35e9444cc45b5659787356b9a03a82789e5f6c37"): Account(
-            storage={0: 0x5718E750D8554E12E6AA9F5EAAD8F9858B4049DF},
-        ),
-        Address("0x35ed71279933c3412f3277b383d1f8ed491d0196"): Account(
-            storage={0: 0xCBAF2598FC92602BA5DEBAC6782965149D2D371F},
-        ),
-        Address("0x3846f21bbb8c38b4cccce0236b1f0c9e3c0d7ed2"): Account(
-            storage={0: 0x9B5B0F5D4E3EBC57965B4BB63D9FFCA825EB8CC7},
-        ),
-        Address("0x38a10d085030b351f1e4522bd42c789e2718ff9a"): Account(
-            storage={0: 0x25D8CAA13D191AEFBBC4A6B2F60AC679A2A56E01},
-        ),
-        Address("0x38cdbb61fc5323dd5f6f4aa599d4f36406b766fe"): Account(
-            storage={0: 0x6E6AB35A1C5454676D10E4E1F462030BB4DC00D8},
-        ),
-        Address("0x39670caa919437d736560edef3f698ed952a836c"): Account(
-            storage={0: 0xD41572CAB02800C2DC729A8D03332F572DE96277},
-        ),
-        Address("0x39bcb9056a944f0955dba921096bbc2ef4025942"): Account(
-            storage={0: 0xA2998816BC7B076AE2573878D1D8E599223652A6},
-        ),
-        Address("0x3b1d2e5cb2f280a25afddefb35cbce1754421341"): Account(
-            storage={0: 0xAC2D104F5688A6D5C4498132F916602E4AF9254C},
-        ),
-        Address("0x3bd18e0f7e4d743565dacc89d36faa37c70bbb41"): Account(
-            storage={0: 0x4889EBF7ECB03869EC2F481276F46F8C02DC0EC5},
-        ),
-        Address("0x3c3efeb193be9bdcc59a190ba343b7aa51ab3417"): Account(
-            storage={0: 0x124AC36DEEBF89244C22BEDFCB6E05FB2F62F3C},
-        ),
-        Address("0x3ca9b7faddd261997977e206a2f288b4b8374665"): Account(
-            storage={0: 0x7360E396473716A4FB94022E3B5FE49AC5EFD989},
-        ),
-        Address("0x3dc54aa1f5987de1e630798ab223bd724f2eafeb"): Account(
-            storage={0: 0x24AAFB1CF6510457D2A4AA39512393B490B24C62},
-        ),
-        Address("0x3e705425914e5043a7fe28a422494fbddd1fa0b7"): Account(
-            storage={0: 0x5E370CB559F97E00C4CCFF71324FCFC1D0F4F52B},
-        ),
-        Address("0x4132baf092924fcb4b3185213462643a64e0066f"): Account(
-            storage={0: 0x80BF7CC16403098D8DB95EF9F802B168337AFF8C},
-        ),
-        Address("0x4163459a50d3f33505101c03a67798d9aaff86a7"): Account(
-            storage={0: 0x9E9C39C1F8F48A4C7D92D2BEAD877287715D3EF2},
-        ),
-        Address("0x41871652222884569a03b4f357441dec29dd4c03"): Account(
-            storage={0: 0x3515873BC24D6721857B331AFBB9D2E18099E7A0},
-        ),
-        Address("0x41c744f06610636c5f3a78acf7019671046bbb17"): Account(
-            storage={0: 0x1902813A7606CED9E69222E4D756BD81BDE3EFF6},
-        ),
-        Address("0x420d3ebd21ac77b879ff7d60d91a4178d88da386"): Account(
-            storage={0: 0x2CCF72AE225FBEDDF894606C87629C42F685EA78},
-        ),
-        Address("0x4326e4b5aa29095a293f86c51e4776beeeb13c9b"): Account(
-            storage={0: 0x26963175B50E69C2400AA12887CAD973AA275FF1},
-        ),
-        Address("0x44392aa670f14348e65eaace495fe52fb1f0276c"): Account(
-            storage={0: 0xEE2618F6774250978C45B19DE72DC9568EB06A14},
-        ),
-        Address("0x4889ebf7ecb03869ec2f481276f46f8c02dc0ec4"): Account(
-            storage={0: 0xDA27862CFDE315DD4DB961AE77D0E70EAF09C36B},
-        ),
-        Address("0x49d4ef28805e87178cafc25b34e0f4fa720a7a56"): Account(
-            storage={0: 0xF0F5BE7CFBE4ED7E2EE8C2949FDBDEE6BC283621},
-        ),
-        Address("0x4a53eaa64b683d0c95b5ba0b681b64cfd95e5e3f"): Account(
-            storage={0: 0x7F16B98DE9DE619A80A6CBD8721896F9870B01CB},
-        ),
-        Address("0x4aea3bd98ccc05d8b80d0225a47258fd9ead31b3"): Account(
-            storage={0: 0x4C6CF3CD7E2089B5624A20FEB57BD012E9337188},
-        ),
-        Address("0x4b503c8ea51caa8f3617973b8068c89f787e3f36"): Account(
-            storage={0: 0xF89EEC0743BAC4CEE8EE6AD04A821E09232A2FB6},
-        ),
-        Address("0x4bd7b245f707b5fdb259c3fe61dac9255cb8bb24"): Account(
-            storage={0: 0xC928A97A6E85C0A06E6D7BC17AEA51059ACC533C},
-        ),
-        Address("0x4bdd7ba923660706078f4f1b5f11b3ef68267f8c"): Account(
-            storage={0: 0x5D72A22E4D2F63E5ADCF14699CC9306FBA181AB8},
-        ),
-        Address("0x4be74ed02236365b2796309e9725fb380ca539eb"): Account(
-            storage={0: 0x8A26224559EA93F4EB25C5D7A9DF4CA7BCADEBBD},
-        ),
-        Address("0x4c356bcbb80f0903fb14144a2040ffb35fc15fbc"): Account(
-            storage={0: 0xC50549CD84F0F605F2787C3861C80DB90AF82E96},
-        ),
-        Address("0x4c6cf3cd7e2089b5624a20feb57bd012e9337187"): Account(
-            storage={0: 0xA563D05CDF426B6DCC4353EBAE2ACD475B854C8C},
-        ),
-        Address("0x4d439e47505b6556114b968a9eb09a09c8074198"): Account(
-            storage={0: 0xACFD156153124AFDBC8A9404D3AA431E6621E59F},
-        ),
-        Address("0x4e11236c11ebdec00068c3c1997937935290a1ed"): Account(
-            storage={0: 0x51C2F19B94B6EC398D71FD6B748B1D4F04D0696C},
-        ),
-        Address("0x4e2634d8427a529403ecdd1d44aa6dd137da4624"): Account(
-            storage={0: 0x11802A2C1F85A5DA238086378DC4820CCD191350},
-        ),
-        Address("0x4f7b7c8e24bf233866a0fad0ac657226de940b63"): Account(
-            storage={0: 0xE6B02F114BE963FC082526163D31BD78B9E906F8},
-        ),
-        Address("0x502e8922fff35256c92f22f970802241c85a875a"): Account(
-            storage={0: 0x90F7031246D07C171C746CA8D0B5AC0C4A3B8BD2},
-        ),
-        Address("0x504ee43710737cf77785cfa9774c812584c40979"): Account(
-            storage={0: 0xB4BD0B1EB4EA1C0730A80A3C635C2CA2995D83D0},
-        ),
-        Address("0x51c2f19b94b6ec398d71fd6b748b1d4f04d0696b"): Account(
-            storage={0: 0x91A66CB6EA7854CA76CA6BCB6441E801DD046580},
-        ),
-        Address("0x528648dcb94ec4db2a1adc469cc6e4aeecab70f1"): Account(
-            storage={0: 0x86F8AC4309C8386F45DF0FB9658EE6C0ABE59155},
-        ),
-        Address("0x52aea75e06e98440b2daa28313d03c31129acef6"): Account(
-            storage={0: 0x782CC3FF4FD6BE97ECA0737E6772F96731CB75B3},
-        ),
-        Address("0x53652ad6f344eec5e2b9e33b816ad9163998d0aa"): Account(
-            storage={0: 0xF0C49BEEA4B33147FD5D8940E30349C739B97626},
-        ),
-        Address("0x551b0315698442787a7791ccfaee559fa18480a5"): Account(
-            storage={0: 0xD28566158CFA53F25EF6228228A227A8700B6883},
-        ),
-        Address("0x551cc3090c98d0e0a07c34e7f7219d1139fede7e"): Account(
-            storage={0: 0xB057F3D7BE9B4BE7EDF09B66F0A154DA6A46AE5},
-        ),
-        Address("0x552cb7ef312124663550f57d159fe2d03a05ef69"): Account(
-            storage={0: 0x28CC863E08832AD7B9C1B28BFA2FBFF5A1611746},
-        ),
-        Address("0x5553af7faaa8eb68de8787e8022dda0c58bed06d"): Account(
-            storage={0: 0x35E9444CC45B5659787356B9A03A82789E5F6C38},
-        ),
-        Address("0x56aaf858af96546df92985645d7f456c530bc0d1"): Account(
-            storage={0: 0xF8FF2045B963A3DCFBCC41F79F930A96AF8BECC1},
-        ),
-        Address("0x5718e750d8554e12e6aa9f5eaad8f9858b4049de"): Account(
-            storage={0: 0xB16DD4F11693F1157AEC4A982DE406463BB2B715},
-        ),
-        Address("0x576cfefd063104a0e03717593a425e69863b1736"): Account(
-            storage={0: 0x22F1AFF96E05248331EC9F15270C5552D665F41F},
-        ),
-        Address("0x57906c3c5ec33e754f23ddefe0cf9e80e9170dbc"): Account(
-            storage={0: 0x39670CAA919437D736560EDEF3F698ED952A836D},
-        ),
-        Address("0x58660d7c9e7b1d306dbf86fa4c975eb9e9a25452"): Account(
-            storage={0: 0x53652AD6F344EEC5E2B9E33B816AD9163998D0AB},
-        ),
-        Address("0x58675e090154b7e827e68883b3b9ecaf1c8bb8d4"): Account(
-            storage={0: 0xECF592D553A78EA9EB580651A22D34F635A36011},
-        ),
-        Address("0x5d72a22e4d2f63e5adcf14699cc9306fba181ab7"): Account(
-            storage={0: 0x38A10D085030B351F1E4522BD42C789E2718FF9B},
-        ),
-        Address("0x5e370cb559f97e00c4ccff71324fcfc1d0f4f52a"): Account(
-            storage={0: 0xB5CD7C146EADD4DD6788A453C8EA2DB89DF35B07},
-        ),
-        Address("0x5ee8a44ac78e6c8e2db3297dba0e4e0e61b08de4"): Account(
-            storage={0: 0x3DC54AA1F5987DE1E630798AB223BD724F2EAFEC},
-        ),
-        Address("0x5f630aa382bd9cd2e33754130a500db2dc0109f2"): Account(
-            storage={0: 0xF22FD55AC64A4B6F96BEE3771818C73341CD4D05},
-        ),
-        Address("0x606ab504d721676914e421c96c9c9907fa329386"): Account(
-            storage={0: 0x75A2A617B94F78ECFFF896FC7D7A55C8A000B149},
-        ),
-        Address("0x60a9bf51b795423799851fdd8671858554886415"): Account(
-            storage={0: 0x135DDE330F78CA8BDF3C694EA49D08065D49BDFE},
-        ),
-        Address("0x6224dfbaf1cccbe1f486789567ec41b633fe7562"): Account(
-            storage={0: 0x872D846F9CFD4E4A80106A89F75A79105B8A18E1},
-        ),
-        Address("0x6252860664c6175b92453fbc567a66251f764853"): Account(
-            storage={0: 0xDC2B1F4F871B90B2232E02BB7A114F88831338A3},
-        ),
-        Address("0x632465eed4e41f3aaaaac5bb576838cb3f0ea942"): Account(
-            storage={0: 0xD0204ECEAA9950CAEA0162FE07FD1DC84D1244E9},
-        ),
-        Address("0x63c0e98de8f3816f46eaefe7f8797dbcdaa01ff8"): Account(
-            storage={0: 0xE2D49548EF5ACACE79D3AA334FBDA460A0662EFC},
-        ),
-        Address("0x63c7a6d6988214080daca01dd8fa02ba7143e86c"): Account(
-            storage={0: 0xE60264D9EC4D7C93F8CFB6B1F47ECAE4C099A3C2},
-        ),
-        Address("0x63db02c046296069b0c31419b1549f4e27e59cac"): Account(
-            storage={0: 0x678E131646361F7722BE1D0CDFD0A4E79767F2F8},
-        ),
-        Address("0x647123dbfb8f16b4dd98fac0e86d8e780f4aefe8"): Account(
-            storage={0: 0x9B6263A8F6B9C8EB400EA447AD7F66102047D500},
-        ),
-        Address("0x6473f78ce5e4e31a7057ef32b70dcb9e3afd1d86"): Account(
-            storage={0: 0x24A18B9FFE06EDC928EB9037EF40C9B24349D9EB},
-        ),
-        Address("0x64a3e2a2ea958c6647add08ad95b9ab6972fb558"): Account(
-            storage={0: 0xA6CA5F3180992A52CA65843E9922BAA1E715A14B},
-        ),
-        Address("0x6559462bb07df725d804c6c3eb11f86488cb8f34"): Account(
-            storage={0: 0x2B26FAC300D8A9BAB12C79D8374726AF0E2EEC14},
-        ),
-        Address("0x66e84b7af7d89cf1e05b902eb34fa4a75fb4371b"): Account(
-            storage={0: 0x1F1AF23E708F4720910CB4CA9F83EF0188A23F0B},
-        ),
-        Address("0x66fddf0c330ee5edcb4854883d27e9e01213de2c"): Account(
-            storage={0: 0xBC15FCEA3ABF3EDD959316D68EF6C6C01611869F},
-        ),
-        Address("0x678e131646361f7722be1d0cdfd0a4e79767f2f7"): Account(
-            storage={0: 0xF41ADF0227F6556206527E96F729CF6260FBEBE0},
-        ),
-        Address("0x683013d2114cae8b41473ca318267c7db219b89f"): Account(
-            storage={0: 0xCCC2223346B6FF188191B5AB747E75AC90388A37},
-        ),
-        Address("0x68610b9db9ea182ff1921fab9863150d1849c5f5"): Account(
-            storage={0: 0x93321908D7923818D3CAEDBA4FE206138DC9C322},
-        ),
-        Address("0x687dccb33dc4dfa5e5dea197c151095a4e19fdd2"): Account(
-            storage={0: 0xE53E22D617F23DA57FB232DEE4F8AFA03B5960A2},
-        ),
-        Address("0x6965235e025001fb620d441803fedb005f7ac710"): Account(
-            storage={0: 0x283B585BA5BC85D64A99CB5ECB9A8495AC944949},
-        ),
-        Address("0x69ad22b81f58d128a7736328fdac92d7dfd63cee"): Account(
-            storage={0: 0x13E0F4C536FC64DC3B82FA9055F717783566A99F},
-        ),
-        Address("0x6a49ef58af93afcda6eb267bb7f082b36868771a"): Account(
-            storage={0: 0xDF71363D94E67DE4BC54EBAE9A5DDCADFB4BE71B},
-        ),
-        Address("0x6b61d79d8680a739ac957dc2309a722b8d587d86"): Account(
-            storage={0: 0x138DE55AD30A7E72B8D19A27048203C0297A7751},
-        ),
-        Address("0x6b6856673ca8777e1e08b9448f3dcc902c7656e4"): Account(
-            storage={0: 0x2CEC8E078D4F0B40547DB5134AF753177AFB7158},
-        ),
-        Address("0x6c36ae21a70aecc27860c44f7424dfc409d56a44"): Account(
-            storage={0: 0x15533643DF9A543582DE7D814E1CD06C8D93CE74},
-        ),
-        Address("0x6e6ab35a1c5454676d10e4e1f462030bb4dc00d7"): Account(
-            storage={0: 0xFB2413A3EBE46BEEB6CE7350F7A0110AED31FAFA},
-        ),
-        Address("0x6e6ed53d9520671e00646b51160cc7ba65dc7ae3"): Account(
-            storage={0: 0x15FC611579B182F9EDDAF3662514C999974BED3},
-        ),
-        Address("0x705055cea2b5eead57e7f2b2451bd151f692259a"): Account(
-            storage={0: 0xE878AD7340C78CA7A62AD9FC0CA05A00368D5705},
-        ),
-        Address("0x7262c537e8b7c65f5fb1183478d802c05e847c89"): Account(
-            storage={0: 0x8142D2FE5B473E4819D9477F93D137C4FC03ACB9},
-        ),
-        Address("0x72a2277942502b64d1b9d7273f3e0bf70c9959af"): Account(
-            storage={0: 0x8AA608FF16F8B19413561959D8C221BD2C13408B},
-        ),
-        Address("0x72d03f30e5e592eba13e4f38a578e7bb37001ac3"): Account(
-            storage={0: 0x78FCF5F2A71A260B50B04EFE2FEEDE4A4155F43},
-        ),
-        Address("0x7360e396473716a4fb94022e3b5fe49ac5efd988"): Account(
-            storage={0: 0xE24B78E82B9F3052FAE947427821B8BFC9E58181},
-        ),
-        Address("0x73714e7e266d879bafd2cb37528e2169cb508513"): Account(
-            storage={0: 0x66FDDF0C330EE5EDCB4854883D27E9E01213DE2D},
-        ),
-        Address("0x74298cb3d811abc2a7cabee9aaf9e32d1f0dda46"): Account(
-            storage={0: 0x8600FB81735E28330DD83B581F8FD160C4C7F7E6},
-        ),
-        Address("0x74ace49be181f5733c773d34e1f0a4a651cb4c87"): Account(
-            storage={0: 0x8BE0154A131C2E2296748939688B11C3A9330A5E},
-        ),
-        Address("0x74db82093ec212c48163e5cc87c62842d4f0298f"): Account(
-            storage={0: 0xA0A40E0CE528A8924656630E2C85FAAD3B20E763},
-        ),
-        Address("0x74e34b17132ede1d8c0f02b06954a19d0bda0a00"): Account(
-            storage={0: 0x9B0FB1E205C2C42F0BFE448FFE62CF16959EEDE1},
-        ),
-        Address("0x759101d9f01353039f5785449cf3eaf8c5f2b50b"): Account(
-            storage={0: 0x910C972A81E9A2D07EA2D582103703FA5C1E6E64},
-        ),
-        Address("0x75a2a617b94f78ecfff896fc7d7a55c8a000b148"): Account(
-            storage={0: 0xAB9BBC26A4438D3C46652F51CC78516CC875790A},
-        ),
-        Address("0x782cc3ff4fd6be97eca0737e6772f96731cb75b2"): Account(
-            storage={0: 0x9E4E90382B3D41CD05242850AB52F2066E944FCC},
-        ),
-        Address("0x7840b2c702362fd49bed617e921503950a1dce07"): Account(
-            storage={0: 0x74298CB3D811ABC2A7CABEE9AAF9E32D1F0DDA47},
-        ),
-        Address("0x788be3440d2c6fd3d071c54c503cfa485813924f"): Account(
-            storage={0: 0xCC78E0755E700914CC0082D847836FE20FBABACD},
-        ),
-        Address("0x78e4c25b1965b3027e42c8be47c912bcf7343dca"): Account(
-            storage={0: 0x7840B2C702362FD49BED617E921503950A1DCE08},
-        ),
-        Address("0x7960e69b2bfda2f03bacdacdd87e3042223eb9db"): Account(
-            storage={0: 0xDB7A5D82B82F7FE75AF931F626740BD651B1713D},
-        ),
-        Address("0x799be994d950d06c04996073ea4494dd2a0a438e"): Account(
-            storage={0: 0xAD8FC1A395DB2C84E5B943C19D9977CF29F2BA05},
-        ),
-        Address("0x79f1fdc03b73036a99412bf37dc7bb535ca65002"): Account(
-            storage={0: 0xF4F5CF7567448A171B08D58C9FCFC8C1ACC0AAA},
-        ),
-        Address("0x7a5601bc727e42164cab285c9f7cab96d434e14a"): Account(
-            storage={0: 0x88F2ABF6A3FB18F836F2B69D368162244331A036},
-        ),
-        Address("0x7aca2ed7a1e6f7b82f47a6b20607819f15007ebf"): Account(
-            storage={0: 0x4D439E47505B6556114B968A9EB09A09C8074199},
-        ),
-        Address("0x7b43a066271d7ef10f66f8c652064db040c8fa8c"): Account(
-            storage={0: 0x3BD18E0F7E4D743565DACC89D36FAA37C70BBB42},
-        ),
-        Address("0x7bbde03011a48d70bcc79c120c28177d1c7667d5"): Account(
-            storage={0: 0x3B1D2E5CB2F280A25AFDDEFB35CBCE1754421342},
-        ),
-        Address("0x7e495061f514448f3dd51bb0cf909eef3c3f4712"): Account(
-            storage={0: 0xB1FE911ACF07CC8107D984408A443C5AF42389E1},
-        ),
-        Address("0x7e641e26dfac957ede0a2b9ca358ea9082150051"): Account(
-            storage={0: 0xB3A36932E89006258CD41594A66FD217465AA0FB},
-        ),
-        Address("0x7f16b98de9de619a80a6cbd8721896f9870b01ca"): Account(
-            storage={0: 0x551B0315698442787A7791CCFAEE559FA18480A6},
-        ),
-        Address("0x80bf7cc16403098d8db95ef9f802b168337aff8b"): Account(
-            storage={0: 0xA60EBC9287019330B003770EC548FB7F38D3A021},
-        ),
-        Address("0x812f8f7534d22508b43fc38e7679a3c5756d8e42"): Account(
-            storage={0: 0x8EC4B51809EB738F7BBBAC138F5F33FBF9CA46D9},
-        ),
-        Address("0x8142d2fe5b473e4819d9477f93d137c4fc03acb8"): Account(
-            storage={0: 0xB90320DE803C40F7A1EE25482C4758C908872250},
-        ),
-        Address("0x81b7c9ad8bf567196485da9d114dfc8eb77cd426"): Account(
-            storage={0: 0x552CB7EF312124663550F57D159FE2D03A05EF6A},
-        ),
-        Address("0x81cd35ac42bc6c520c5c41640dec4c9a3a9de9d1"): Account(
-            storage={0: 0x705055CEA2B5EEAD57E7F2B2451BD151F692259B},
-        ),
-        Address("0x8200a1966873be093601ab0ed1b06d7297307834"): Account(
-            storage={0: 0xDD03B49D9974CA4EEE27114F78463675BA13CE3D},
-        ),
-        Address("0x825ffa59b7cd20192e871732df014067950a339c"): Account(
-            storage={0: 0xC8CBD95130A1E15BD93C9BF678FDFE4E4B04C147},
-        ),
-        Address("0x84dd24d594f6d2d7991b7fcc96cb3dbe15396aaf"): Account(
-            storage={0: 0xA63723E01E6BD3D3CFB739EBB745E5BE82571D3C},
-        ),
-        Address("0x854a2da430c3b5657ff41b9c3cbd5fc72525d31f"): Account(
-            storage={0: 0x60A9BF51B795423799851FDD8671858554886416},
-        ),
-        Address("0x854c4f512b9ecc17467e602f6512496a89d5705c"): Account(
-            storage={0: 0x8A1137C56E3E63637336431B883D5AE8008A4FBF},
-        ),
-        Address("0x8600fb81735e28330dd83b581f8fd160c4c7f7e5"): Account(
-            storage={0: 0x5F630AA382BD9CD2E33754130A500DB2DC0109F3},
-        ),
-        Address("0x86f8ac4309c8386f45df0fb9658ee6c0abe59154"): Account(
-            storage={0: 0x295CAC445BFAC8CB2244BC70CDB32D99594D47E4},
-        ),
-        Address("0x870080f904af2582e08624580c2e0b69f261ff21"): Account(
-            storage={0: 0xF1F45715A43FEF3AD11AAF60910E0FD0ED2B3FEB},
-        ),
-        Address("0x872d846f9cfd4e4a80106a89f75a79105b8a18e0"): Account(
-            storage={0: 0x4C356BCBB80F0903FB14144A2040FFB35FC15FBD},
-        ),
-        Address("0x88f2abf6a3fb18f836f2b69d368162244331a035"): Account(
-            storage={0: 0x29BA5A51398AB1B9A6E68F9AFE8A08C301E098F1},
-        ),
-        Address("0x8a1137c56e3e63637336431b883d5ae8008a4fbe"): Account(
-            storage={0: 0xEEE14F748174F224761D6BE0A65DD4CB4CFB8FEE},
-        ),
-        Address("0x8a26224559ea93f4eb25c5d7a9df4ca7bcadebbc"): Account(
-            storage={0: 0x1EC3BF52D870E0226044C2C0E84F0CD2883BBD93},
-        ),
-        Address("0x8a59b09be87866145ecf0506298de203b1d10cb9"): Account(
-            storage={0: 0xE3DF7661083A3BCC1F459826AA8936831A90B985},
-        ),
-        Address("0x8aa608ff16f8b19413561959d8c221bd2c13408a"): Account(
-            storage={0: 0xBA6933CEFFD2FB8D9DEA6B18817108E44F32AE95},
-        ),
-        Address("0x8ae3c9da496eea395020df847f542f9d6af31310"): Account(
-            storage={0: 0xB22C14D45949E3B53947B6C7FCC5132C8B041381},
-        ),
-        Address("0x8be0154a131c2e2296748939688b11c3a9330a5d"): Account(
-            storage={0: 0x79F1FDC03B73036A99412BF37DC7BB535CA65003},
-        ),
-        Address("0x8cf4d1a905bb50ffbaaf359e63fb7cdf0dc33428"): Account(
-            storage={0: 0xD27CAF5F748DC645C35BFB970494E3DA492BF97D},
-        ),
-        Address("0x8ec4b51809eb738f7bbbac138f5f33fbf9ca46d8"): Account(
-            storage={0: 0xFB79E8D788245FDF3328E3B74FAD52EFF821481E},
-        ),
-        Address("0x8ed58354ec6fd381d608771c3eeff99b1422b840"): Account(
-            storage={0: 0xC3F7AB15F0973E66575BC8B987435B78E541442D},
-        ),
-        Address("0x8fa40127106dbf70f7931ddd510e2f0211dfd15d"): Account(
-            storage={0: 0x61B1EF6EC7572D0837A557A5D673D95D645CB8B},
-        ),
-        Address("0x8fd38e52d47dcb6cf8252e3ceb99ab2fa983cb1d"): Account(
-            storage={0: 0x5F76726986912C1FBDA22DB3AAFDD295DC833AB},
-        ),
-        Address("0x8fe5d9c1ce55fb9d72ad33d25d46758ecbd9f806"): Account(
-            storage={0: 0x3435A3A9C7A82796BE5C2BF306E39132482B146B},
-        ),
-        Address("0x90f7031246d07c171c746ca8d0b5ac0c4a3b8bd1"): Account(
-            storage={0: 0xDAF24907563344E025B30BAA8AA25E4B4C37EAF5},
-        ),
-        Address("0x90f83fce5fb9bbecb55981c96f223f044786c40d"): Account(
-            storage={0: 0xB08FE65DB809F8EFA5BB5CF2FD2D2A1F45F7C453},
-        ),
-        Address("0x910c972a81e9a2d07ea2d582103703fa5c1e6e63"): Account(
-            storage={0: 0x1C38FAE029602412D3789F348541577249BEE124},
-        ),
-        Address("0x91a66cb6ea7854ca76ca6bcb6441e801dd04657f"): Account(
-            storage={0: 0x153629EA98627274192FA275A6A9AD20191AB04},
-        ),
-        Address("0x91ed00a0a906270d466af043c4e111dadca970a3"): Account(
-            storage={0: 0xB679828FA6040990410B3282E916BFBD6C74F891},
-        ),
-        Address("0x9212a0150ffaecc685aff0e94d15e75d8079c527"): Account(
-            storage={0: 0x14A6985982A43B5FCC2046C3D5BA3622E5CA00D3},
-        ),
-        Address("0x923945f4390ee06a73a80c1f56f979f7959755df"): Account(
-            storage={0: 0xEC51D36BE1C8FD3FF3C74210E408A8710163CEB9},
-        ),
-        Address("0x93321908d7923818d3caedba4fe206138dc9c321"): Account(
-            storage={0: 0x7A5601BC727E42164CAB285C9F7CAB96D434E14B},
-        ),
-        Address("0x94f69c9e63cf82c2f3a04943b4c57909d99397e5"): Account(
-            storage={0: 0xD5A313463930D740250C19F53D6EA3FE596D18AA},
-        ),
-        Address("0x953fe148abf5e5d1b957446919f7d460fb8e0e04"): Account(
-            storage={0: 0xAFB048240716CB7C59AA3322A6845AB7250080A8},
-        ),
-        Address("0x9586ce20c98a913a4ce397ff5d9443de21df9f04"): Account(
-            storage={0: 0x8E3FFDC8D29AF262542744F4D400983FE31C591},
-        ),
-        Address("0x964b8be9139d7c7100e34018979d17d83005748b"): Account(
-            storage={0: 0xD25F4F651D67B188B5AD87D9976B02585C2F3116},
-        ),
-        Address("0x98f02c7f4f6f0c1ad8bff7411e07af88404ccfa2"): Account(
-            storage={0: 0x4163459A50D3F33505101C03A67798D9AAFF86A8},
-        ),
-        Address("0x996d22e0533ff751ab345656c14a5159df187211"): Account(
-            storage={0: 0x6B61D79D8680A739AC957DC2309A722B8D587D87},
-        ),
-        Address("0x9aae8b11a923f49fcab42904f8c6759fcbad37f9"): Account(
-            storage={0: 0xB650ECFE63D1F0CD6FA262334621F60B09EF1598},
-        ),
-        Address("0x9b0fb1e205c2c42f0bfe448ffe62cf16959eede0"): Account(
-            storage={0: 0x8200A1966873BE093601AB0ED1B06D7297307835},
-        ),
-        Address("0x9b5b0f5d4e3ebc57965b4bb63d9ffca825eb8cc6"): Account(
-            storage={0: 0xC11AC6E735399CCC13F277B7E0D14ACCFCBDFD5D},
-        ),
-        Address("0x9b6263a8f6b9c8eb400ea447ad7f66102047d4ff"): Account(
-            storage={0: 0xB9EE042A78FF660DA0C6BD6FEE0B2E22B414C04},
-        ),
-        Address("0x9bcc019a0001b920dbf169c44d1fb6896e223254"): Account(
-            storage={0: 0xE9A9082E1EEE305D59B35C5D0A4FBECCDEDFD9BD},
-        ),
-        Address("0x9e4e90382b3d41cd05242850ab52f2066e944fcb"): Account(
-            storage={0: 0xF0350F749F60C4700F1BB72E4757D424137DBCE7},
-        ),
-        Address("0x9e9c39c1f8f48a4c7d92d2bead877287715d3ef1"): Account(
-            storage={0: 0xD8C4C59E7CC8FDE66A855D1FC636F8DF05E38103},
-        ),
-        Address("0x9f21fb734cd0e961d27de46f5fd806e7fb8e96cd"): Account(
-            storage={0: 0x72D03F30E5E592EBA13E4F38A578E7BB37001AC4},
-        ),
-        Address("0xa0a40e0ce528a8924656630e2c85faad3b20e762"): Account(
-            storage={0: 0x6252860664C6175B92453FBC567A66251F764854},
-        ),
-        Address("0xa2998816bc7b076ae2573878d1d8e599223652a5"): Account(
-            storage={0: 0x6E6ED53D9520671E00646B51160CC7BA65DC7AE4},
-        ),
-        Address("0xa563d05cdf426b6dcc4353ebae2acd475b854c8b"): Account(
-            storage={0: 0xC0427BDC9EC7678C5BFD7A55C2E71F084E02016E},
-        ),
-        Address("0xa60ebc9287019330b003770ec548fb7f38d3a020"): Account(
-            storage={0: 0x6224DFBAF1CCCBE1F486789567EC41B633FE7563},
-        ),
-        Address("0xa63723e01e6bd3d3cfb739ebb745e5be82571d3b"): Account(
-            storage={0: 0x57906C3C5EC33E754F23DDEFE0CF9E80E9170DBD},
-        ),
-        Address("0xa6ca5f3180992a52ca65843e9922baa1e715a14a"): Account(
-            storage={0: 0x606AB504D721676914E421C96C9C9907FA329387},
-        ),
-        Address("0xa9150d0b2a6611206daab64ef804dcec594ef5f9"): Account(
-            storage={0: 0x359D51CF93B31DE8B40707B6C1B22F8F1B70A337},
-        ),
-        Address("0xa95abf1f117ec9cba5da9412ab5776299f19c9cc"): Account(
-            storage={0: 0x9F21FB734CD0E961D27DE46F5FD806E7FB8E96CE},
-        ),
-        Address("0xaa0a91be8c06c9ba16ce1ce5836941e920ca9af9"): Account(
-            storage={0: 0x759101D9F01353039F5785449CF3EAF8C5F2B50C},
-        ),
-        Address("0xab9bbc26a4438d3c46652f51cc78516cc8757909"): Account(
-            storage={0: 0x6B6856673CA8777E1E08B9448F3DCC902C7656E5},
-        ),
-        Address("0xac2d104f5688a6d5c4498132f916602e4af9254b"): Account(
-            storage={0: 0x44392AA670F14348E65EAACE495FE52FB1F0276D},
-        ),
-        Address("0xaca4bb8422d054c48dc6b614cd712eb7cb25fb8d"): Account(
-            storage={0: 0x9BCC019A0001B920DBF169C44D1FB6896E223255},
-        ),
-        Address("0xacfd156153124afdbc8a9404d3aa431e6621e59e"): Account(
-            storage={0: 0x647123DBFB8F16B4DD98FAC0E86D8E780F4AEFE9},
-        ),
-        Address("0xad8fc1a395db2c84e5b943c19d9977cf29f2ba04"): Account(
-            storage={0: 0xD2261C1645CBBD7422CC42C8F317BFE74053A495},
-        ),
-        Address("0xadcc47cd626cc70a6326f9858e889932aec7487c"): Account(
-            storage={0: 0x14AEF68E79D441E5D9FA6A397C8EA11FDAA111C9},
-        ),
-        Address("0xae3fe33dc09c697bfb635c9ab4bf8f0bf426467f"): Account(
-            storage={0: 0x8A59B09BE87866145ECF0506298DE203B1D10CBA},
-        ),
-        Address("0xaeec6641cb72fb4f1839cf9df13fa59b80d91e33"): Account(
-            storage={0: 0x7ACA2ED7A1E6F7B82F47A6B20607819F15007EC0},
-        ),
-        Address("0xafb048240716cb7c59aa3322a6845ab7250080a7"): Account(
-            storage={0: 0x10B3A8C098467317D86D530931B7424DD8A74F3D},
-        ),
-        Address("0xb0117629d3e337ac0f2937b29d4c913bda81d962"): Account(
-            storage={0: 0x72A2277942502B64D1B9D7273F3E0BF70C9959B0},
-        ),
-        Address("0xb08fe65db809f8efa5bb5cf2fd2d2a1f45f7c452"): Account(
-            storage={0: 0x576CFEFD063104A0E03717593A425E69863B1737},
-        ),
-        Address("0xb0e9e2634bfacae0505f803d5507d5afaeb78d84"): Account(
-            storage={0: 0x3E705425914E5043A7FE28A422494FBDDD1FA0B8},
-        ),
-        Address("0xb0f2564f0a4cb0d593a648d256b69b4ecdaa036a"): Account(
-            storage={0: 0xE18C58DD8E5F9A3E0711112D5393563586E63320},
-        ),
-        Address("0xb16dd4f11693f1157aec4a982de406463bb2b714"): Account(
-            storage={0: 0x63DB02C046296069B0C31419B1549F4E27E59CAD},
-        ),
-        Address("0xb1aa49d81f87a70ead4809b17ebbc7c8ac43089c"): Account(
-            storage={0: 0x8CF4D1A905BB50FFBAAF359E63FB7CDF0DC33429},
-        ),
-        Address("0xb1fe911acf07cc8107d984408a443c5af42389e0"): Account(
-            storage={0: 0xFA39C0440BDB586AB891B5B0A2DB29D81C2068FA},
-        ),
-        Address("0xb22c14d45949e3b53947b6c7fcc5132c8b041380"): Account(
-            storage={0: 0x41C744F06610636C5F3A78ACF7019671046BBB18},
-        ),
-        Address("0xb3a36932e89006258cd41594a66fd217465aa0fa"): Account(
-            storage={0: 0x58660D7C9E7B1D306DBF86FA4C975EB9E9A25453},
-        ),
-        Address("0xb4bd0b1eb4ea1c0730a80a3c635c2ca2995d83cf"): Account(
-            storage={0: 0x81B7C9AD8BF567196485DA9D114DFC8EB77CD427},
-        ),
-        Address("0xb52eaef155fa7e16b29c6d65342567f71d6501f3"): Account(
-            storage={0: 0x2ECCFDA404DEE5308012197C894B86789921CA31},
-        ),
-        Address("0xb5cb668cdf8a1bf46fd5baadfb7ae5e0271879c0"): Account(
-            storage={0: 0xB0E9E2634BFACAE0505F803D5507D5AFAEB78D85},
-        ),
-        Address("0xb5cd7c146eadd4dd6788a453c8ea2db89df35b06"): Account(
-            storage={0: 0xCD1B84945F85266BC3EAF65C3C2D6FE47521353A},
-        ),
-        Address("0xb650ecfe63d1f0cd6fa262334621f60b09ef1597"): Account(
-            storage={0: 0x2EA5D28DEEA6FD475333F03590FADB6A29514937},
-        ),
-        Address("0xb651a1e8312709eae2dc95103bbe7fca9e6e3573"): Account(
-            storage={0: 0x420D3EBD21AC77B879FF7D60D91A4178D88DA387},
-        ),
-        Address("0xb679828fa6040990410b3282e916bfbd6c74f890"): Account(
-            storage={0: 0x6965235E025001FB620D441803FEDB005F7AC711},
-        ),
-        Address("0xb83f1b5b2f0fb059368e680b040b1dc118db2586"): Account(
-            storage={0: 0xB52EAEF155FA7E16B29C6D65342567F71D6501F4},
-        ),
-        Address("0xb90320de803c40f7a1ee25482c4758c90887224f"): Account(
-            storage={0: 0x35ED71279933C3412F3277B383D1F8ED491D0197},
-        ),
-        Address("0xb94539ff043ed6f9e56e2a06ca170f05013d23a8"): Account(
-            storage={0: 0xF64C3EF1B6468D63C6119D7BA03E10196B8585A9},
-        ),
-        Address("0xba6933ceffd2fb8d9dea6b18817108e44f32ae94"): Account(
-            storage={0: 0x7960E69B2BFDA2F03BACDACDD87E3042223EB9DC},
-        ),
-        Address("0xba80321b067a71fc689104a602a589634a5f76cc"): Account(
-            storage={0: 0xCCF9F53823C1162DF56358DB1B8389C5DF3D2119},
-        ),
-        Address("0xbabbd30645c383315b3f157d518ab54f22465ab2"): Account(
-            storage={0: 0x7BBDE03011A48D70BCC79C120C28177D1C7667D6},
-        ),
-        Address("0xbad86da28de3a7d068479aa21c26bd0cef848adf"): Account(
-            storage={0: 0xFAD1CC360B83E277C5DF214536A634CBEC266A1C},
-        ),
-        Address("0xbbc2aea32a7763bf59ea9157274f20e73c47210d"): Account(
-            storage={0: 0x2C0B3F7EBA30E844978DD6A58127CCA7FA9DD32A},
-        ),
-        Address("0xbc15fcea3abf3edd959316d68ef6c6c01611869e"): Account(
-            storage={0: 0x996D22E0533FF751AB345656C14A5159DF187212},
-        ),
-        Address("0xbc1ad174b38e4a427dcf903c04c1db5862bd1130"): Account(
-            storage={0: 0x4BDD7BA923660706078F4F1B5F11B3EF68267F8D},
-        ),
-        Address("0xbd5649faf8bcc002dc4a58e3a58dc0ff4413e20d"): Account(
-            storage={0: 0x6559462BB07DF725D804C6C3EB11F86488CB8F35},
-        ),
-        Address("0xc0427bdc9ec7678c5bfd7a55c2e71f084e02016d"): Account(
-            storage={0: 0x89A70486F0CC448C7E5AC2BA11A9F71B970808F},
-        ),
-        Address("0xc11ac6e735399ccc13f277b7e0d14accfcbdfd5c"): Account(
-            storage={0: 0x3043FE71FFBC8CC57FC0E4373B9A2106DFA64403},
-        ),
-        Address("0xc1c10fad7c38dca307a3623fb8a78b8c191d7bd8"): Account(
-            storage={0: 0xFECCDB40B5DBCD1993AA688E95A183B40ED76A06},
-        ),
-        Address("0xc3e5e4000ed488092bd820cf94d0a52e7a072e37"): Account(
-            storage={0: 0xACA4BB8422D054C48DC6B614CD712EB7CB25FB8E},
-        ),
-        Address("0xc3f7ab15f0973e66575bc8b987435b78e541442c"): Account(
-            storage={0: 0x504EE43710737CF77785CFA9774C812584C4097A},
-        ),
-        Address("0xc50549cd84f0f605f2787c3861c80db90af82e95"): Account(
-            storage={0: 0x84DD24D594F6D2D7991B7FCC96CB3DBE15396AB0},
-        ),
-        Address("0xc514bbdbe823fe790b5fadbafd713452c4664051"): Account(
-            storage={0: 0xF46269856DA75AE565825A9795CE581DE90047DB},
-        ),
-        Address("0xc54066516aee09a32006c21475dfe31b6c06b41c"): Account(
-            storage={0: 0xB94539FF043ED6F9E56E2A06CA170F05013D23A9},
-        ),
-        Address("0xc750f2459a31030bc412e28d6b8ac9920bd5af5e"): Account(
-            storage={0: 0x8ED58354EC6FD381D608771C3EEFF99B1422B841},
-        ),
-        Address("0xc77a90da618a4b5066b130e6ba2934e70f78183c"): Account(
-            storage={0: 0xC750F2459A31030BC412E28D6B8AC9920BD5AF5F},
-        ),
-        Address("0xc8cbd95130a1e15bd93c9bf678fdfe4e4b04c146"): Account(
-            storage={0: 0xFD6287DEB8F1D10BDB5CA199AF8F8129A6443894},
-        ),
-        Address("0xc928a97a6e85c0a06e6d7bc17aea51059acc533b"): Account(
-            storage={0: 0xC77A90DA618A4B5066B130E6BA2934E70F78183D},
-        ),
-        Address("0xcbaf2598fc92602ba5debac6782965149d2d371e"): Account(
-            storage={0: 0x270FB896F474137CC0A51AC5CFA01E01994DA982},
-        ),
-        Address("0xcc78e0755e700914cc0082d847836fe20fbabacc"): Account(
-            storage={0: 0x6A49EF58AF93AFCDA6EB267BB7F082B36868771B},
-        ),
-        Address("0xcc7da81f5f8612dc269b8acc1db3327100597646"): Account(
-            storage={0: 0x74ACE49BE181F5733C773D34E1F0A4A651CB4C88},
-        ),
-        Address("0xccc2223346b6ff188191b5ab747e75ac90388a36"): Account(
-            storage={0: 0x1D9CB40FA087E41CB84A4D56AD104226E3D6F019},
-        ),
-        Address("0xccee3bdd325f22421d250412d7d6edff7c1b9ceb"): Account(
-            storage={0: 0x63C7A6D6988214080DACA01DD8FA02BA7143E86D},
-        ),
-        Address("0xccf9f53823c1162df56358db1b8389c5df3d2118"): Account(
-            storage={0: 0x7D4C830BA3D7B13DD3435B6A9DE7F2BDCF90BC8},
-        ),
-        Address("0xcd1b84945f85266bc3eaf65c3c2d6fe475213539"): Account(
-            storage={0: 0x7262C537E8B7C65F5FB1183478D802C05E847C8A},
-        ),
-        Address("0xd0204eceaa9950caea0162fe07fd1dc84d1244e8"): Account(
-            storage={0: 0x63C0E98DE8F3816F46EAEFE7F8797DBCDAA01FF9},
-        ),
-        Address("0xd2261c1645cbbd7422cc42c8f317bfe74053a494"): Account(
-            storage={0: 0xD3A7D8EBC95C90CC78DE4BA3D795AAA2FE444D5C},
-        ),
-        Address("0xd2571607e241ecf590ed94b12d87c94babe36db6"): Account(
-            storage={0: 0x91ED00A0A906270D466AF043C4E111DADCA970A4},
-        ),
-        Address("0xd25f4f651d67b188b5ad87d9976b02585c2f3115"): Account(
-            storage={0: 0xCCEE3BDD325F22421D250412D7D6EDFF7C1B9CEC},
-        ),
-        Address("0xd27caf5f748dc645c35bfb970494e3da492bf97c"): Account(
-            storage={0: 0xE33483CADE7BA1732161F33EDF083CB797B576B2},
-        ),
-        Address("0xd28566158cfa53f25ef6228228a227a8700b6882"): Account(
-            storage={0: 0xF66EF7EC17F226C5AF3AF4F6DED9C6A9539F1FBD},
-        ),
-        Address("0xd3a7d8ebc95c90cc78de4ba3d795aaa2fe444d5b"): Account(
-            storage={0: 1},
-        ),
-        Address("0xd41572cab02800c2dc729a8d03332f572de96276"): Account(
-            storage={0: 0xC3E5E4000ED488092BD820CF94D0A52E7A072E38},
-        ),
-        Address("0xd454705bbb4750ff5d62cbf2a5134d02b272db16"): Account(
-            storage={0: 0x6C36AE21A70AECC27860C44F7424DFC409D56A45},
-        ),
-        Address("0xd4c40012e56397cf9ee6f19e278ab28fabd9ad9b"): Account(
-            storage={0: 0x9212A0150FFAECC685AFF0E94D15E75D8079C528},
-        ),
-        Address("0xd4f5a4a0a9770c53e8a43e80dfddfe30ddc67a2a"): Account(
-            storage={0: 0x3B30E6DCCE89E39590901B797C16935F14CFE7E},
-        ),
-        Address("0xd5a313463930d740250c19f53d6ea3fe596d18a9"): Account(
-            storage={0: 0x1E22452E40C125D338CA6B53C49773DA2E3760EC},
-        ),
-        Address("0xd85fdff87cf6d94195cf56b5e9ad410e936ac124"): Account(
-            storage={0: 0x563ECE055F8043C2FA7EAE79F85A5974E2459AE},
-        ),
-        Address("0xd8c4c59e7cc8fde66a855d1fc636f8df05e38102"): Account(
-            storage={0: 0xFF10977181344B4AF1385688B8E9A4FB6848D0D0},
-        ),
-        Address("0xda27862cfde315dd4db961ae77d0e70eaf09c36a"): Account(
-            storage={0: 0x3846F21BBB8C38B4CCCCE0236B1F0C9E3C0D7ED3},
-        ),
-        Address("0xda3864f09aba17cd282a26dface1e193f1611801"): Account(
-            storage={0: 0x98F02C7F4F6F0C1AD8BFF7411E07AF88404CCFA3},
-        ),
-        Address("0xdaf24907563344e025b30baa8aa25e4b4c37eaf4"): Account(
-            storage={0: 0xEF3FB25BD47C023518E9427E300B142698B4D650},
-        ),
-        Address("0xdb7a5d82b82f7fe75af931f626740bd651b1713c"): Account(
-            storage={0: 0x8AE3C9DA496EEA395020DF847F542F9D6AF31311},
-        ),
-        Address("0xdc2b1f4f871b90b2232e02bb7a114f88831338a2"): Account(
-            storage={0: 0x4B503C8EA51CAA8F3617973B8068C89F787E3F37},
-        ),
-        Address("0xdc963c747dded8c966cca2e13c10a65cf04cefc4"): Account(
-            storage={0: 0x8FE5D9C1CE55FB9D72AD33D25D46758ECBD9F807},
-        ),
-        Address("0xdd03b49d9974ca4eee27114f78463675ba13ce3c"): Account(
-            storage={0: 0x56AAF858AF96546DF92985645D7F456C530BC0D2},
-        ),
-        Address("0xdf1050bdf2c8617339324e68a1e6e0e102e3ca31"): Account(
-            storage={0: 0x39BCB9056A944F0955DBA921096BBC2EF4025943},
-        ),
-        Address("0xdf71363d94e67de4bc54ebae9a5ddcadfb4be71a"): Account(
-            storage={0: 0x9586CE20C98A913A4CE397FF5D9443DE21DF9F05},
-        ),
-        Address("0xe178ab0c8c219833cb17090483147b44af97ea73"): Account(
-            storage={0: 0x64A3E2A2EA958C6647ADD08AD95B9AB6972FB559},
-        ),
-        Address("0xe18c58dd8e5f9a3e0711112d5393563586e6331f"): Account(
-            storage={0: 0x964B8BE9139D7C7100E34018979D17D83005748C},
-        ),
-        Address("0xe24b78e82b9f3052fae947427821b8bfc9e58180"): Account(
-            storage={0: 0x78E4C25B1965B3027E42C8BE47C912BCF7343DCB},
-        ),
-        Address("0xe2d49548ef5acace79d3aa334fbda460a0662efb"): Account(
-            storage={0: 0x2A8C62782A9AC9AD37CEED561522CF5279E80FEE},
-        ),
-        Address("0xe33483cade7ba1732161f33edf083cb797b576b1"): Account(
-            storage={0: 0xF2680E26D01ED858391494603D73DCDA518B999E},
-        ),
-        Address("0xe3df7661083a3bcc1f459826aa8936831a90b984"): Account(
-            storage={0: 0xB7CDB850B37437912005A1B54B130645242567A},
-        ),
-        Address("0xe3e9fd3c13583a0afe10d63a0d4a83e3469dfe3d"): Account(
-            storage={0: 0x4BE74ED02236365B2796309E9725FB380CA539EC},
-        ),
-        Address("0xe53a708ed6f6ef523576e12ddf568c79d25b79f7"): Account(
-            storage={0: 0xB0117629D3E337AC0F2937B29D4C913BDA81D963},
-        ),
-        Address("0xe53e22d617f23da57fb232dee4f8afa03b5960a1"): Account(
-            storage={0: 0x870080F904AF2582E08624580C2E0B69F261FF22},
-        ),
-        Address("0xe60264d9ec4d7c93f8cfb6b1f47ecae4c099a3c1"): Account(
-            storage={0: 0xE3E9FD3C13583A0AFE10D63A0D4A83E3469DFE3E},
-        ),
-        Address("0xe66f534f19722097ca4296330805aa61c330a0b2"): Account(
-            storage={0: 0x19A0689C7C59DBBE8A569B594572ABDC7BD5C77D},
-        ),
-        Address("0xe6b02f114be963fc082526163d31bd78b9e906f7"): Account(
-            storage={0: 0x799BE994D950D06C04996073EA4494DD2A0A438F},
-        ),
-        Address("0xe878ad7340c78ca7a62ad9fc0ca05a00368d5704"): Account(
-            storage={0: 0x74E34B17132EDE1D8C0F02B06954A19D0BDA0A01},
-        ),
-        Address("0xe8849b2d422c4231af55a706bcf7572f38f7a019"): Account(
-            storage={0: 0x1FD0C0883BD94F7A6A87A7A216359F1DBFAB7F52},
-        ),
-        Address("0xe9a9082e1eee305d59b35c5d0a4fbeccdedfd9bc"): Account(
-            storage={0: 0xCC7DA81F5F8612DC269B8ACC1DB3327100597647},
-        ),
-        Address("0xec51d36be1c8fd3ff3c74210e408a8710163ceb8"): Account(
-            storage={0: 0x7E495061F514448F3DD51BB0CF909EEF3C3F4713},
-        ),
-        Address("0xecf592d553a78ea9eb580651a22d34f635a36010"): Account(
-            storage={0: 0x2566A11AD8AC081E7C26BA1AFFF8D1C208642F5E},
-        ),
-        Address("0xee2618f6774250978c45b19de72dc9568eb06a13"): Account(
-            storage={0: 0xDA3864F09ABA17CD282A26DFACE1E193F1611802},
-        ),
-        Address("0xeee14f748174f224761d6be0a65dd4cb4cfb8fed"): Account(
-            storage={0: 0x66E84B7AF7D89CF1E05B902EB34FA4A75FB4371C},
-        ),
-        Address("0xef3fb25bd47c023518e9427e300b142698b4d64f"): Account(
-            storage={0: 0x74DB82093EC212C48163E5CC87C62842D4F02990},
-        ),
-        Address("0xf0350f749f60c4700f1bb72e4757d424137dbce6"): Account(
-            storage={0: 0xB1AA49D81F87A70EAD4809B17EBBC7C8AC43089D},
-        ),
-        Address("0xf05ba15908d728019c3e10a8e6f3da341ae34963"): Account(
-            storage={0: 0x1CF9918897600E9C9E17F7C6E2797ED8FDD8AF11},
-        ),
-        Address("0xf0c49beea4b33147fd5d8940e30349c739b97625"): Account(
-            storage={0: 0x788BE3440D2C6FD3D071C54C503CFA4858139250},
-        ),
-        Address("0xf0f5be7cfbe4ed7e2ee8c2949fdbdee6bc283620"): Account(
-            storage={0: 0x8FD38E52D47DCB6CF8252E3CEB99AB2FA983CB1E},
-        ),
-        Address("0xf1f45715a43fef3ad11aaf60910e0fd0ed2b3fea"): Account(
-            storage={0: 0xF05BA15908D728019C3E10A8E6F3DA341AE34964},
-        ),
-        Address("0xf22fd55ac64a4b6f96bee3771818c73341cd4d04"): Account(
-            storage={0: 0x854A2DA430C3B5657FF41B9C3CBD5FC72525D320},
-        ),
-        Address("0xf2680e26d01ed858391494603d73dcda518b999d"): Account(
-            storage={0: 0xC514BBDBE823FE790B5FADBAFD713452C4664052},
-        ),
-        Address("0xf41adf0227f6556206527e96f729cf6260fbebdf"): Account(
-            storage={0: 0xD3BC01519EE0A1216A632B99C19A06DF8017C6C},
-        ),
-        Address("0xf46269856da75ae565825a9795ce581de90047da"): Account(
-            storage={0: 0xBC1AD174B38E4A427DCF903C04C1DB5862BD1131},
-        ),
-        Address("0xf610a2a3a281686a9d78073eeb0a5f6a4619213b"): Account(
-            storage={0: 0xD4C40012E56397CF9EE6F19E278AB28FABD9AD9C},
-        ),
-        Address("0xf64c3ef1b6468d63c6119d7ba03e10196b8585a8"): Account(
-            storage={0: 0x2FA655AC7839B95773BB43A5CA5BDD636C1C3F43},
-        ),
-        Address("0xf66ef7ec17f226c5af3af4f6ded9c6a9539f1fbc"): Account(
-            storage={0: 0xB5CB668CDF8A1BF46FD5BAADFB7AE5E0271879C1},
-        ),
-        Address("0xf89eec0743bac4cee8ee6ad04a821e09232a2fb5"): Account(
-            storage={0: 0x825FFA59B7CD20192E871732DF014067950A339D},
-        ),
-        Address("0xf8ff2045b963a3dcfbcc41f79f930a96af8becc0"): Account(
-            storage={0: 0xC1C10FAD7C38DCA307A3623FB8A78B8C191D7BD9},
-        ),
-        Address("0xf9a151d133c315854462c5653437e34656cfdc37"): Account(
-            storage={0: 0xBAD86DA28DE3A7D068479AA21C26BD0CEF848AE0},
-        ),
-        Address("0xfa39c0440bdb586ab891b5b0a2db29d81c2068f9"): Account(
-            storage={0: 0x551CC3090C98D0E0A07C34E7F7219D1139FEDE7F},
-        ),
-        Address("0xfad1cc360b83e277c5df214536a634cbec266a1b"): Account(
-            storage={0: 0xA3FDFC866B2404C1ED78D478482C0F5107CE777},
-        ),
-        Address("0xfb2413a3ebe46beeb6ce7350f7a0110aed31faf9"): Account(
-            storage={0: 0xC54066516AEE09A32006C21475DFE31B6C06B41D},
-        ),
-        Address("0xfb79e8d788245fdf3328e3b74fad52eff821481d"): Account(
-            storage={0: 0xE66F534F19722097CA4296330805AA61C330A0B3},
-        ),
-        Address("0xfd6287deb8f1d10bdb5ca199af8f8129a6443893"): Account(
-            storage={0: 0x528648DCB94EC4DB2A1ADC469CC6E4AEECAB70F2},
-        ),
-        Address("0xfeccdb40b5dbcd1993aa688e95a183b40ed76a05"): Account(
-            storage={0: 0x7B43A066271D7EF10F66F8C652064DB040C8FA8D},
-        ),
-        Address("0xff10977181344b4af1385688b8e9a4fb6848d0cf"): Account(
-            storage={0: 0xA9150D0B2A6611206DAAB64EF804DCEC594EF5FA},
-        ),
+        compute_create_address(address=contract_0, nonce=0): Account(nonce=2),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/__init__.py b/tests/ported_static/stRefundTest/__init__.py
index d93b5ad01cb..ed5367d5d71 100644
--- a/tests/ported_static/stRefundTest/__init__.py
+++ b/tests/ported_static/stRefundTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stRefundTest."""
+"""Ported static tests: stRefundTest."""  # noqa: N999
diff --git a/tests/ported_static/stRefundTest/test_refund50_1.py b/tests/ported_static/stRefundTest/test_refund50_1.py
index 28ef2808314..1135b777d09 100644
--- a/tests/ported_static/stRefundTest/test_refund50_1.py
+++ b/tests/ported_static/stRefundTest/test_refund50_1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_refund50_1.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refund50_1Filler.json
+state_tests/stRefundTest/refund50_1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRefundTest/refund50_1Filler.json"],
+    ["state_tests/stRefundTest/refund50_1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_refund50_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0xDC4EFA209AECDD4C2D5201A419EA27506151B4EC687F14A613229E310932491B
-    )
+    """Test_refund50_1."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0x989680)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,31 +43,32 @@ def test_refund50_1(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    pre[coinbase] = Account(balance=0, nonce=1)
+    # Source: lll
     # { [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1, 0x2: 0x1, 0x3: 0x1, 0x4: 0x1, 0x5: 0x1},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.STOP,
+        storage={1: 1, 2: 1, 3: 1, 4: 1, 5: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6737eac10f0b6ff19a1c903cafc30b26752a5af4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x989680)
-    pre[coinbase] = Account(balance=0, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}),
+        coinbase: Account(balance=0),
+        sender: Account(balance=0x92F810, nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund50_2.py b/tests/ported_static/stRefundTest/test_refund50_2.py
index 5ff6a8fd661..4d471f24074 100644
--- a/tests/ported_static/stRefundTest/test_refund50_2.py
+++ b/tests/ported_static/stRefundTest/test_refund50_2.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_refund50_2.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refund50_2Filler.json
+state_tests/stRefundTest/refund50_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRefundTest/refund50_2Filler.json"],
+    ["state_tests/stRefundTest/refund50_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_refund50_2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0xDC4EFA209AECDD4C2D5201A419EA27506151B4EC687F14A613229E310932491B
-    )
+    """Test_refund50_2."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0x989680)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,35 +43,34 @@ def test_refund50_2(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0x989680)
-    # Source: LLL
+    pre[coinbase] = Account(balance=0, nonce=1)
+    # Source: lll
     # { [[ 10 ]] 1 [[ 11 ]] 1 [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1, 0x2: 0x1, 0x3: 0x1, 0x4: 0x1, 0x5: 0x1},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.STOP,
+        storage={1: 1, 2: 1, 3: 1, 4: 1, 5: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdd9bc2aec4f69625b8f1d9d0facb81c72e9a4d59"),  # noqa: E501
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
     post = {
-        contract: Account(storage={10: 1, 11: 1}),
+        target: Account(storage={10: 1, 11: 1}),
+        coinbase: Account(balance=0),
+        sender: Account(balance=0x8D926C, nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund50percent_cap.py b/tests/ported_static/stRefundTest/test_refund50percent_cap.py
index 8469382c35e..d92a991123c 100644
--- a/tests/ported_static/stRefundTest/test_refund50percent_cap.py
+++ b/tests/ported_static/stRefundTest/test_refund50percent_cap.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_refund50percent_cap.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refund50percentCapFiller.json
+state_tests/stRefundTest/refund50percentCapFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRefundTest/refund50percentCapFiller.json"],
+    ["state_tests/stRefundTest/refund50percentCapFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_refund50percent_cap(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
+    """Test_refund50percent_cap."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
     sender = EOA(
         key=0xDC4EFA209AECDD4C2D5201A419EA27506151B4EC687F14A613229E310932491B
     )
@@ -45,50 +46,44 @@ def test_refund50percent_cap(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0x989680)
     pre[coinbase] = Account(balance=0, nonce=1)
-    # Source: LLL
+    pre[sender] = Account(balance=0x989680)
+    # Source: lll
     # { @@1 @@2 [[ 10 ]] (EXP 2 0xff) [[ 11 ]] (BALANCE (ADDRESS)) [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 [[ 6 ]] 0 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(Op.SLOAD(key=0x1))
-            + Op.POP(Op.SLOAD(key=0x2))
-            + Op.SSTORE(key=0xA, value=Op.EXP(0x2, 0xFF))
-            + Op.SSTORE(key=0xB, value=Op.BALANCE(address=Op.ADDRESS))
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.STOP
-        ),
-        storage={
-            0x1: 0x1,
-            0x2: 0x1,
-            0x3: 0x1,
-            0x4: 0x1,
-            0x5: 0x1,
-            0x6: 0x1,
-        },
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SLOAD(key=0x1))
+        + Op.POP(Op.SLOAD(key=0x2))
+        + Op.SSTORE(key=0xA, value=Op.EXP(0x2, 0xFF))
+        + Op.SSTORE(key=0xB, value=Op.BALANCE(address=Op.ADDRESS))
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.STOP,
+        storage={1: 1, 2: 1, 3: 1, 4: 1, 5: 1, 6: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xef67f354c8505e1056889970c3d9b5e0fe65d1e2"),  # noqa: E501
+        address=Address(0xEF67F354C8505E1056889970C3D9B5E0FE65D1E2),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 10: 0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
                 11: 0xDE0B6B3A7640000,
             },
         ),
+        coinbase: Account(balance=0),
+        sender: Account(balance=0x8CF0A0),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund600.py b/tests/ported_static/stRefundTest/test_refund600.py
index fdbee817b7b..cce448a08c4 100644
--- a/tests/ported_static/stRefundTest/test_refund600.py
+++ b/tests/ported_static/stRefundTest/test_refund600.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_refund600.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refund600Filler.json
+state_tests/stRefundTest/refund600Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRefundTest/refund600Filler.json"],
+    ["state_tests/stRefundTest/refund600Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_refund600(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
+    """Test_refund600."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
     sender = EOA(
         key=0xDC4EFA209AECDD4C2D5201A419EA27506151B4EC687F14A613229E310932491B
     )
@@ -45,45 +46,39 @@ def test_refund600(
         gas_limit=1000000,
     )
 
+    pre[coinbase] = Account(balance=0, nonce=1)
     pre[sender] = Account(balance=0x989680)
-    # Source: LLL
+    # Source: lll
     # { @@1 @@2 [[ 10 ]] (EXP 2 0xffff) [[ 11 ]] (BALANCE (ADDRESS)) [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 [[ 6 ]] 0 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(Op.SLOAD(key=0x1))
-            + Op.POP(Op.SLOAD(key=0x2))
-            + Op.SSTORE(key=0xA, value=Op.EXP(0x2, 0xFFFF))
-            + Op.SSTORE(key=0xB, value=Op.BALANCE(address=Op.ADDRESS))
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.STOP
-        ),
-        storage={
-            0x1: 0x1,
-            0x2: 0x1,
-            0x3: 0x1,
-            0x4: 0x1,
-            0x5: 0x1,
-            0x6: 0x1,
-        },
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.SLOAD(key=0x1))
+        + Op.POP(Op.SLOAD(key=0x2))
+        + Op.SSTORE(key=0xA, value=Op.EXP(0x2, 0xFFFF))
+        + Op.SSTORE(key=0xB, value=Op.BALANCE(address=Op.ADDRESS))
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.STOP,
+        storage={1: 1, 2: 1, 3: 1, 4: 1, 5: 1, 6: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc09923e2275e4ee7822a1feb5eee1c18143575c7"),  # noqa: E501
+        address=Address(0xC09923E2275E4EE7822A1FEB5EEE1C18143575C7),  # noqa: E501
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
     post = {
-        contract: Account(storage={11: 0xDE0B6B3A7640000}),
+        target: Account(storage={11: 0xDE0B6B3A7640000}),
+        coinbase: Account(balance=0),
+        sender: Account(balance=0x8F5CF0),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_call_a.py b/tests/ported_static/stRefundTest/test_refund_call_a.py
index 4239a4d6aff..bc745f449be 100644
--- a/tests/ported_static/stRefundTest/test_refund_call_a.py
+++ b/tests/ported_static/stRefundTest/test_refund_call_a.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_refund_call_a.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refund_CallAFiller.json
+state_tests/stRefundTest/refund_CallAFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRefundTest/refund_CallAFiller.json"],
+    ["state_tests/stRefundTest/refund_CallAFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_refund_call_a(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0x752660E61324E901F7231DFAE39984F4D433A241D533838E4700925F477814FD
-    )
+    """Test_refund_call_a."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0x1312D00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,48 +43,49 @@ def test_refund_call_a(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 5500 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 0 )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x157C,
-                    address=0xF4C9FC42FAEDA49049E3B8E2B97A17CC2FE95718,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    pre[coinbase] = Account(balance=0, nonce=1)
+    # Source: lll
+    # { [[ 1 ]] 0 }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3d72f604b4d56320853a5ece45772dbbf419f315"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x1312D00)
-    pre[coinbase] = Account(balance=0, nonce=1)
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
-        storage={0x1: 0x1},
+    # Source: lll
+    # { [[ 0 ]] (CALL 5500 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 0 )}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x157C,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf4c9fc42faeda49049e3b8e2b97a17cc2fe95718"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=200000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}, balance=0xDE0B6B3A764000A),
+        coinbase: Account(balance=0),
+        sender: Account(balance=0x12A2AD2, nonce=1),
+        addr: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_call_a_not_enough_gas_in_call.py b/tests/ported_static/stRefundTest/test_refund_call_a_not_enough_gas_in_call.py
index a7af069bc15..def38bc9f7b 100644
--- a/tests/ported_static/stRefundTest/test_refund_call_a_not_enough_gas_in_call.py
+++ b/tests/ported_static/stRefundTest/test_refund_call_a_not_enough_gas_in_call.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_refund_call_a_not_enough_gas_in_call.
 
 Ported from:
-tests/static/state_tests/stRefundTest
-refund_CallA_notEnoughGasInCallFiller.json
+state_tests/stRefundTest/refund_CallA_notEnoughGasInCallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRefundTest/refund_CallA_notEnoughGasInCallFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRefundTest/refund_CallA_notEnoughGasInCallFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_refund_call_a_not_enough_gas_in_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0x07C857D62C76CE09F2E8EC3FA9277578C67B69C6547364568FDDB841071E5BD7
-    )
+    """Test_refund_call_a_not_enough_gas_in_call."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0xF4240)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,49 +43,49 @@ def test_refund_call_a_not_enough_gas_in_call(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (CALL 5005 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 0 )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x138D,
-                    address=0xF4C9FC42FAEDA49049E3B8E2B97A17CC2FE95718,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    pre[coinbase] = Account(balance=0, nonce=1)
+    # Source: lll
+    # { [[ 1 ]] 0 }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x8329332ccfb6ae9df0412e842619fb1c989fbf48"),  # noqa: E501
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
-    pre[sender] = Account(balance=0xF4240)
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
-        storage={0x1: 0x1},
+    # Source: lll
+    # { [[ 0 ]] (CALL 5005 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 0 )}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x138D,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf4c9fc42faeda49049e3b8e2b97a17cc2fe95718"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=85000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 1}),
-        callee: Account(storage={1: 1}),
+        target: Account(storage={1: 1}, balance=0xDE0B6B3A764000A),
+        coinbase: Account(balance=0),
+        sender: Account(balance=0xA8DF4, nonce=1),
+        addr: Account(storage={1: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_call_a_oog.py b/tests/ported_static/stRefundTest/test_refund_call_a_oog.py
index 0190091b99c..b9b0bda841c 100644
--- a/tests/ported_static/stRefundTest/test_refund_call_a_oog.py
+++ b/tests/ported_static/stRefundTest/test_refund_call_a_oog.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_refund_call_a_oog.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refund_CallA_OOGFiller.json
+state_tests/stRefundTest/refund_CallA_OOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRefundTest/refund_CallA_OOGFiller.json"],
+    ["state_tests/stRefundTest/refund_CallA_OOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_refund_call_a_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0x27B48AAA30A609C11C7ABA1CB67FC191B5B59F9FF876930F0085D5FAEF4A4824
-    )
+    """Test_refund_call_a_oog."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0x2DC6C0)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,49 +43,49 @@ def test_refund_call_a_oog(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0x2DC6C0)
-    # Source: LLL
-    # { [[ 0 ]] (CALL 6000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 0 )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x1770,
-                    address=0xF4C9FC42FAEDA49049E3B8E2B97A17CC2FE95718,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    pre[coinbase] = Account(balance=0, nonce=1)
+    # Source: lll
+    # { [[ 1 ]] 0 }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1b98d6b82e06b90c71c779925ae5b84e28401256"),  # noqa: E501
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
-        storage={0x1: 0x1},
+    # Source: lll
+    # { [[ 0 ]] (CALL 6000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 0 )}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x1770,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf4c9fc42faeda49049e3b8e2b97a17cc2fe95718"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=31069,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 1}),
-        callee: Account(storage={1: 1}),
+        target: Account(storage={1: 1}, balance=0xDE0B6B3A7640000),
+        coinbase: Account(balance=0),
+        sender: Account(balance=0x29091E, nonce=1),
+        addr: Account(storage={1: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_call_to_suicide_no_storage.py b/tests/ported_static/stRefundTest/test_refund_call_to_suicide_no_storage.py
index 2b8b01f03d1..a374d190c0b 100644
--- a/tests/ported_static/stRefundTest/test_refund_call_to_suicide_no_storage.py
+++ b/tests/ported_static/stRefundTest/test_refund_call_to_suicide_no_storage.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_refund_call_to_suicide_no_storage.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refund_CallToSuicideNoStorageFiller.json
+state_tests/stRefundTest/refund_CallToSuicideNoStorageFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,45 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRefundTest/refund_CallToSuicideNoStorageFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRefundTest/refund_CallToSuicideNoStorageFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "00000000000000000000000000000000000000000000000000000000000001f4",
-            {
-                Address("0x5be4b33890f720eff72be0019b122e0ff75cb937"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000010000",
-            {
-                Address("0x5be4b33890f720eff72be0019b122e0ff75cb937"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_refund_call_to_suicide_no_storage(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x6F0117D3E9C684C7D6E1E6B79DC3880DA2BEBE77C765B171C062FDFFD38A673F
-    )
+    """Test_refund_call_to_suicide_no_storage."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x2540BE400)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -71,50 +68,78 @@ def test_refund_call_to_suicide_no_storage(
         gas_limit=100000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x5BE4B33890F720EFF72BE0019B122E0FF75CB937)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL (CALLDATALOAD 0) <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 0 )}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.CALLDATALOAD(offset=0x0),
+                address=0x4FF65047CE9C85F968689E4369C10003026A41A9,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4ff65047ce9c85f968689e4369c10003026a41a9"),  # noqa: E501
+        address=Address(0x5BE4B33890F720EFF72BE0019B122E0FF75CB937),  # noqa: E501
     )
-    # Source: LLL
-    # { [[ 0 ]] (CALL (CALLDATALOAD 0) <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 0 )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.CALLDATALOAD(offset=0x0),
-                    address=0x4FF65047CE9C85F968689E4369C10003026A41A9,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x5BE4B33890F720EFF72BE0019B122E0FF75CB937
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x5be4b33890f720eff72be0019b122e0ff75cb937"),  # noqa: E501
+        address=Address(0x4FF65047CE9C85F968689E4369C10003026A41A9),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2540BE400)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={0: 0, 1: 1}, balance=0xDE0B6B3A764000A
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={0: 1, 1: 1}, balance=0x1BC16D674EC8000A
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0x1F4),
+        Hash(0x10000),
+    ]
+    tx_gas = [10000000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=10000000,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_call_to_suicide_storage.py b/tests/ported_static/stRefundTest/test_refund_call_to_suicide_storage.py
index 729c88b9580..ebc41bce622 100644
--- a/tests/ported_static/stRefundTest/test_refund_call_to_suicide_storage.py
+++ b/tests/ported_static/stRefundTest/test_refund_call_to_suicide_storage.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_refund_call_to_suicide_storage.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refund_CallToSuicideStorageFiller.json
+state_tests/stRefundTest/refund_CallToSuicideStorageFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,51 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRefundTest/refund_CallToSuicideStorageFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRefundTest/refund_CallToSuicideStorageFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "00000000000000000000000000000000000000000000000000000000000001f4",
-            {
-                Address("0x5be4b33890f720eff72be0019b122e0ff75cb937"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x9dea1ad5123f3d8b91cfc830b1c602597883e97c"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000010000",
-            {
-                Address("0x5be4b33890f720eff72be0019b122e0ff75cb937"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0x9dea1ad5123f3d8b91cfc830b1c602597883e97c"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_refund_call_to_suicide_storage(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x6F0117D3E9C684C7D6E1E6B79DC3880DA2BEBE77C765B171C062FDFFD38A673F
-    )
+    """Test_refund_call_to_suicide_storage."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x2540BE400)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -77,51 +68,81 @@ def test_refund_call_to_suicide_storage(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (CALL (CALLDATALOAD 0) <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 0 )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.CALLDATALOAD(offset=0x0),
-                    address=0x9DEA1AD5123F3D8B91CFC830B1C602597883E97C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.CALLDATALOAD(offset=0x0),
+                address=0x9DEA1AD5123F3D8B91CFC830B1C602597883E97C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x5be4b33890f720eff72be0019b122e0ff75cb937"),  # noqa: E501
+        address=Address(0x5BE4B33890F720EFF72BE0019B122E0FF75CB937),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x5BE4B33890F720EFF72BE0019B122E0FF75CB937)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x5BE4B33890F720EFF72BE0019B122E0FF75CB937
+        )
+        + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9dea1ad5123f3d8b91cfc830b1c602597883e97c"),  # noqa: E501
+        address=Address(0x9DEA1AD5123F3D8B91CFC830B1C602597883E97C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2540BE400)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={0: 0, 1: 1}, balance=0xDE0B6B3A764000A
+                ),
+                sender: Account(nonce=1),
+                addr: Account(storage={0: 0, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={0: 1, 1: 1}, balance=0x1BC16D674EC8000A
+                ),
+                sender: Account(nonce=1),
+                addr: Account(storage={1: 1}, balance=0, nonce=0),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0x1F4),
+        Hash(0x10000),
+    ]
+    tx_gas = [10000000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=10000000,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_call_to_suicide_twice.py b/tests/ported_static/stRefundTest/test_refund_call_to_suicide_twice.py
index 991842a4db2..bbcce3a6ed0 100644
--- a/tests/ported_static/stRefundTest/test_refund_call_to_suicide_twice.py
+++ b/tests/ported_static/stRefundTest/test_refund_call_to_suicide_twice.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_refund_call_to_suicide_twice.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refund_CallToSuicideTwiceFiller.json
+state_tests/stRefundTest/refund_CallToSuicideTwiceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,51 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRefundTest/refund_CallToSuicideTwiceFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRefundTest/refund_CallToSuicideTwiceFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "00000000000000000000000000000000000000000000000000000000000001f4",
-            {
-                Address("0x81bdbaa560b5ad52b0f9857cf4ca40b74d4b6996"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x9dea1ad5123f3d8b91cfc830b1c602597883e97c"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000010000",
-            {
-                Address("0x81bdbaa560b5ad52b0f9857cf4ca40b74d4b6996"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0x9dea1ad5123f3d8b91cfc830b1c602597883e97c"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_refund_call_to_suicide_twice(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x6F0117D3E9C684C7D6E1E6B79DC3880DA2BEBE77C765B171C062FDFFD38A673F
-    )
+    """Test_refund_call_to_suicide_twice."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x2540BE400)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -77,23 +68,12 @@ def test_refund_call_to_suicide_twice(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (CALL (CALLDATALOAD 0) <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 0 ) (CALL (CALLDATALOAD 0) <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 0 )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.CALLDATALOAD(offset=0x0),
-                    address=0x9DEA1AD5123F3D8B91CFC830B1C602597883E97C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.CALL(
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
                 gas=Op.CALLDATALOAD(offset=0x0),
                 address=0x9DEA1AD5123F3D8B91CFC830B1C602597883E97C,
                 value=0x0,
@@ -101,36 +81,77 @@ def test_refund_call_to_suicide_twice(
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+            ),
+        )
+        + Op.CALL(
+            gas=Op.CALLDATALOAD(offset=0x0),
+            address=0x9DEA1AD5123F3D8B91CFC830B1C602597883E97C,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x81bdbaa560b5ad52b0f9857cf4ca40b74d4b6996"),  # noqa: E501
+        address=Address(0x81BDBAA560B5AD52B0F9857CF4CA40B74D4B6996),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x81BDBAA560B5AD52B0F9857CF4CA40B74D4B6996)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x81BDBAA560B5AD52B0F9857CF4CA40B74D4B6996
+        )
+        + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9dea1ad5123f3d8b91cfc830b1c602597883e97c"),  # noqa: E501
+        address=Address(0x9DEA1AD5123F3D8B91CFC830B1C602597883E97C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2540BE400)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={0: 0, 1: 1}, balance=0xDE0B6B3A764000A
+                ),
+                sender: Account(nonce=1),
+                addr: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={0: 1, 1: 1}, balance=0x1BC16D674EC8000A
+                ),
+                sender: Account(nonce=1),
+                addr: Account(storage={1: 1}, balance=0, nonce=0),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0x1F4),
+        Hash(0x10000),
+    ]
+    tx_gas = [10000000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=10000000,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_change_non_zero_storage.py b/tests/ported_static/stRefundTest/test_refund_change_non_zero_storage.py
index 47f64724da9..b82dcefae41 100644
--- a/tests/ported_static/stRefundTest/test_refund_change_non_zero_storage.py
+++ b/tests/ported_static/stRefundTest/test_refund_change_non_zero_storage.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_refund_change_non_zero_storage.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refund_changeNonZeroStorageFiller.json
+state_tests/stRefundTest/refund_changeNonZeroStorageFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRefundTest/refund_changeNonZeroStorageFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRefundTest/refund_changeNonZeroStorageFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_refund_change_non_zero_storage(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0x4D9FC6FDF95098986741EE78843AC52BEED77C8C801DC87BD3F04CD6BBF1A3EB
-    )
+    """Test_refund_change_non_zero_storage."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0x3C336080)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,27 +43,28 @@ def test_refund_change_non_zero_storage(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0x3C336080)
-    # Source: LLL
+    pre[coinbase] = Account(balance=0, nonce=1)
+    # Source: lll
     # { [[ 1 ]] 23 }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x17) + Op.STOP,
-        storage={0x1: 0x1},
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x904261b07d3a5f213bbd6fb9f3bb66f4fb65c7eb"),  # noqa: E501
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=228500,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 23}),
+        target: Account(storage={1: 23}, balance=0xDE0B6B3A764000A),
+        coinbase: Account(balance=0),
+        sender: Account(balance=0x3C2F689A, nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_ff.py b/tests/ported_static/stRefundTest/test_refund_ff.py
index a601a50bb3d..06c1e9435f2 100644
--- a/tests/ported_static/stRefundTest/test_refund_ff.py
+++ b/tests/ported_static/stRefundTest/test_refund_ff.py
@@ -2,15 +2,15 @@
 Ori Pomerantz   qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refundFFFiller.yml
+state_tests/stRefundTest/refundFFFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRefundTest/refundFFFiller.yml"],
+    ["state_tests/stRefundTest/refundFFFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,12 +30,9 @@ def test_refund_ff(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Ori Pomerantz   qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xD6B0676AFDE099A078F9D00F24D2C1CB4278546E1734927015023DB0980A92C5
-    )
-    callee = Address("0x7704d8a022a1ba8f3539fc82c7d7fb065abc0df3")
+    """Ori Pomerantz   qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D6599218, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,28 +43,27 @@ def test_refund_ff(
         gas_limit=16777216,
     )
 
-    pre[sender] = Account(balance=0xE8D6599218, nonce=1)
-    pre[callee] = Account(balance=0, nonce=1)
-    # Source: Yul
+    addr = pre.fund_eoa(amount=0)  # noqa: F841
+    # Source: yul
+    # berlin
     # {
     #    selfdestruct(<eoa:0xdddddddddddddddddddddddddddddddddddddddd>)
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x7704D8A022A1BA8F3539FC82C7D7FB065ABC0DF3)
-        ),
-        address=Address("0xa45b53c7b70adf8ea2e910d0e826df8d895b2b49"),  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=addr),
+        nonce=1,
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=target,
+        data=Bytes("00"),
         gas_limit=2601000,
-        gas_price=1000,
         nonce=1,
+        gas_price=1000,
+        access_list=[],
     )
 
-    post: dict = {}
+    post = {sender: Account(balance=0xE8D4A51000)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_get_ether_back.py b/tests/ported_static/stRefundTest/test_refund_get_ether_back.py
index 3be85021b96..81633765711 100644
--- a/tests/ported_static/stRefundTest/test_refund_get_ether_back.py
+++ b/tests/ported_static/stRefundTest/test_refund_get_ether_back.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_refund_get_ether_back.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refund_getEtherBackFiller.json
+state_tests/stRefundTest/refund_getEtherBackFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRefundTest/refund_getEtherBackFiller.json"],
+    ["state_tests/stRefundTest/refund_getEtherBackFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_refund_get_ether_back(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0x29268B0C3308094249E9A06C02739F688D492D6325CA24B36EF949E5FC20AF27
-    )
+    """Test_refund_get_ether_back."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0x3CF773D0)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,25 +43,28 @@ def test_refund_get_ether_back(
         gas_limit=228500,
     )
 
-    pre[sender] = Account(balance=0x3CF773D0)
     pre[coinbase] = Account(balance=0, nonce=1)
-    # Source: LLL
+    # Source: lll
     # { [[ 1 ]] 0 }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
-        storage={0x1: 0x1},
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf4c9fc42faeda49049e3b8e2b97a17cc2fe95718"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=228500,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, balance=0xDE0B6B3A764000A),
+        coinbase: Account(balance=0),
+        sender: Account(balance=0x3CF4376A, nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_max.py b/tests/ported_static/stRefundTest/test_refund_max.py
index 2d0b388c1fd..4924bc77fa2 100644
--- a/tests/ported_static/stRefundTest/test_refund_max.py
+++ b/tests/ported_static/stRefundTest/test_refund_max.py
@@ -2,15 +2,15 @@
 Ori Pomerantz   qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refundMaxFiller.yml
+state_tests/stRefundTest/refundMaxFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRefundTest/refundMaxFiller.yml"],
+    ["state_tests/stRefundTest/refundMaxFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_refund_max(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Ori Pomerantz   qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB5555C6F8171A6EB3C0A84ED8F01AF5CE65A85A096A824A60EE5E2C2C2E076D1
-    )
+    """Ori Pomerantz   qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D848C3A0, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,7 +43,8 @@ def test_refund_max(
         gas_limit=16777216,
     )
 
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    let newVal := 0
     #    sstore(0x00,newVal)
@@ -60,44 +59,42 @@ def test_refund_max(
     #    // Get rid of Yul optimizations
     #    newVal := msize()
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.SSTORE(key=0x0, value=Op.DUP1)
-            + Op.SSTORE(key=0x1, value=Op.DUP1)
-            + Op.SSTORE(key=0x2, value=Op.DUP1)
-            + Op.SSTORE(key=0x3, value=Op.DUP1)
-            + Op.SSTORE(key=0x4, value=Op.DUP1)
-            + Op.SSTORE(key=0x5, value=Op.DUP1)
-            + Op.SSTORE(key=0x6, value=Op.DUP1)
-            + Op.PUSH1[0x7]
-            + Op.SSTORE
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.SSTORE(key=0x0, value=Op.DUP1)
+        + Op.SSTORE(key=0x1, value=Op.DUP1)
+        + Op.SSTORE(key=0x2, value=Op.DUP1)
+        + Op.SSTORE(key=0x3, value=Op.DUP1)
+        + Op.SSTORE(key=0x4, value=Op.DUP1)
+        + Op.SSTORE(key=0x5, value=Op.DUP1)
+        + Op.SSTORE(key=0x6, value=Op.DUP1)
+        + Op.PUSH1[0x7]
+        + Op.SSTORE
+        + Op.STOP,
         storage={
-            0x0: 0x60A7,
-            0x1: 0x60A7,
-            0x2: 0x60A7,
-            0x3: 0x60A7,
-            0x4: 0x60A7,
-            0x5: 0x60A7,
-            0x6: 0x60A7,
-            0x7: 0x60A7,
+            0: 24743,
+            1: 24743,
+            2: 24743,
+            3: 24743,
+            4: 24743,
+            5: 24743,
+            6: 24743,
+            7: 24743,
         },
         balance=0xDE0B6B3A7640000,
-        address=Address("0x7e9d1ff50f8eb9591a0434abfe3230054a934124"),  # noqa: E501
+        nonce=1,
     )
-    pre[sender] = Account(balance=0xE8D848C3A0, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=target,
+        data=Bytes("00"),
         gas_limit=2601000,
-        gas_price=1000,
         nonce=1,
+        gas_price=1000,
+        access_list=[],
     )
 
-    post: dict = {}
+    post = {sender: Account(balance=0xE8D55F7E90)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_multimple_suicide.py b/tests/ported_static/stRefundTest/test_refund_multimple_suicide.py
index af82e2e6523..015e02e5d2a 100644
--- a/tests/ported_static/stRefundTest/test_refund_multimple_suicide.py
+++ b/tests/ported_static/stRefundTest/test_refund_multimple_suicide.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_refund_multimple_suicide.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refund_multimpleSuicideFiller.json
+state_tests/stRefundTest/refund_multimpleSuicideFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRefundTest/refund_multimpleSuicideFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRefundTest/refund_multimpleSuicideFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_refund_multimple_suicide(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0xC69694690A07D1418B0AADFD424A00EA9F25D84B94FECEF12943DE9CD38EDE14
-    )
+    """Test_refund_multimple_suicide."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0x623A7C0)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,123 +43,118 @@ def test_refund_multimple_suicide(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0x623A7C0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x40, value=0x60)
-            + Op.DIV(Op.CALLDATALOAD(offset=0x0), Op.EXP(0x2, 0xE0))
-            + Op.JUMPI(pc=Op.PUSH2[0x31], condition=Op.EQ(Op.DUP2, 0x9E587A5))
-            + Op.JUMPI(pc=Op.PUSH2[0x4D], condition=Op.EQ(0xC0406226, Op.DUP1))
-            + Op.JUMPI(pc=Op.PUSH2[0x5A], condition=Op.EQ(0xDD4F1F2A, Op.DUP1))
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH2[0x2F]
-            + Op.SELFDESTRUCT(
-                address=Op.AND(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    Op.CALLER,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.PUSH2[0xF5]
-            + Op.PUSH1[0x0]
-            + Op.PUSH2[0x109]
-            + Op.JUMP(pc=Op.PUSH2[0x5E])
-            + Op.JUMPDEST
-            + Op.PUSH2[0x2F]
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.ADDRESS
-            + Op.SWAP1
-            + Op.POP
-            + Op.AND(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.DUP1)
-            + Op.PUSH4[0x9E587A5]
-            + Op.MLOAD(offset=0x40)
-            + Op.MSTORE(
-                offset=Op.DUP2, value=Op.MUL(Op.EXP(0x2, 0xE0), Op.DUP2)
-            )
-            + Op.PUSH1[0x4]
-            + Op.ADD
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x2],
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=Op.SUB(Op.GAS, 0x61DA),
-                        address=Op.DUP8,
-                        value=0x0,
-                        args_offset=Op.DUP2,
-                        args_size=Op.SUB(Op.DUP4, Op.DUP1),
-                        ret_offset=Op.MLOAD(offset=0x40),
-                        ret_size=0x0,
-                    ),
-                ),
-            )
-            + Op.POP
-            + Op.PUSH1[0x40]
-            + Op.MLOAD(offset=Op.DUP1)
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=0x9E587A500000000000000000000000000000000000000000000000000000000,  # noqa: E501
+    pre[coinbase] = Account(balance=0, nonce=1)
+    # Source: raw
+    # 0x606060405260e060020a600035046309e587a58114610031578063c04062261461004d578063dd4f1f2a1461005a575b005b61002f3373ffffffffffffffffffffffffffffffffffffffff16ff5b6100f5600061010961005e565b61002f5b60003090508073ffffffffffffffffffffffffffffffffffffffff166309e587a56040518160e060020a0281526004018090506000604051808303816000876161da5a03f1156100025750604080517f09e587a500000000000000000000000000000000000000000000000000000000815290516004828101926000929190829003018183876161da5a03f1156100025750505050565b604080519115158252519081900360200190f35b5060019056  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x40, value=0x60)
+        + Op.DIV(Op.CALLDATALOAD(offset=0x0), Op.EXP(0x2, 0xE0))
+        + Op.JUMPI(pc=Op.PUSH2[0x31], condition=Op.EQ(Op.DUP2, 0x9E587A5))
+        + Op.JUMPI(pc=Op.PUSH2[0x4D], condition=Op.EQ(0xC0406226, Op.DUP1))
+        + Op.JUMPI(pc=Op.PUSH2[0x5A], condition=Op.EQ(0xDD4F1F2A, Op.DUP1))
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH2[0x2F]
+        + Op.SELFDESTRUCT(
+            address=Op.AND(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.CALLER
             )
-            + Op.SWAP1
-            + Op.MLOAD
-            + Op.PUSH1[0x4]
-            + Op.ADD(Op.DUP2, Op.DUP3)
-            + Op.SWAP3
-            + Op.PUSH1[0x0]
-            + Op.SWAP3
-            + Op.SWAP2
-            + Op.SWAP1
-            + Op.DUP3
-            + Op.SWAP1
-            + Op.SUB
-            + Op.ADD
-            + Op.DUP2
-            + Op.DUP4
-            + Op.DUP8
-            + Op.SUB(Op.GAS, 0x61DA)
-            + Op.JUMPI(pc=Op.PUSH2[0x2], condition=Op.ISZERO(Op.CALL))
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x40]
-            + Op.MLOAD(offset=Op.DUP1)
-            + Op.SWAP2
-            + Op.MSTORE(offset=Op.DUP3, value=Op.ISZERO(Op.ISZERO))
-            + Op.MLOAD
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.ADD(0x20, Op.SUB)
-            + Op.SWAP1
-            + Op.RETURN
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x1]
-            + Op.SWAP1
-            + Op.JUMP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.PUSH2[0xF5]
+        + Op.PUSH1[0x0]
+        + Op.PUSH2[0x109]
+        + Op.JUMP(pc=Op.PUSH2[0x5E])
+        + Op.JUMPDEST
+        + Op.PUSH2[0x2F]
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.ADDRESS
+        + Op.SWAP1
+        + Op.POP
+        + Op.AND(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.DUP1)
+        + Op.PUSH4[0x9E587A5]
+        + Op.MLOAD(offset=0x40)
+        + Op.MSTORE(offset=Op.DUP2, value=Op.MUL(Op.EXP(0x2, 0xE0), Op.DUP2))
+        + Op.PUSH1[0x4]
+        + Op.ADD
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x2],
+            condition=Op.ISZERO(
+                Op.CALL(
+                    gas=Op.SUB(Op.GAS, 0x61DA),
+                    address=Op.DUP8,
+                    value=0x0,
+                    args_offset=Op.DUP2,
+                    args_size=Op.SUB(Op.DUP4, Op.DUP1),
+                    ret_offset=Op.MLOAD(offset=0x40),
+                    ret_size=0x0,
+                )
+            ),
+        )
+        + Op.POP
+        + Op.PUSH1[0x40]
+        + Op.MLOAD(offset=Op.DUP1)
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=0x9E587A500000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.SWAP1
+        + Op.MLOAD
+        + Op.PUSH1[0x4]
+        + Op.ADD(Op.DUP2, Op.DUP3)
+        + Op.SWAP3
+        + Op.PUSH1[0x0]
+        + Op.SWAP3
+        + Op.SWAP2
+        + Op.SWAP1
+        + Op.DUP3
+        + Op.SWAP1
+        + Op.SUB
+        + Op.ADD
+        + Op.DUP2
+        + Op.DUP4
+        + Op.DUP8
+        + Op.SUB(Op.GAS, 0x61DA)
+        + Op.JUMPI(pc=Op.PUSH2[0x2], condition=Op.ISZERO(Op.CALL))
+        + Op.POP * 4
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x40]
+        + Op.MLOAD(offset=Op.DUP1)
+        + Op.SWAP2
+        + Op.MSTORE(offset=Op.DUP3, value=Op.ISZERO(Op.ISZERO))
+        + Op.MLOAD
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.ADD(0x20, Op.SUB)
+        + Op.SWAP1
+        + Op.RETURN
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x1]
+        + Op.SWAP1
+        + Op.JUMP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x8b9574e5049501f581886404adf7037002276e78"),  # noqa: E501
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("c0406226"),
+        to=target,
+        data=Bytes("c0406226"),
         gas_limit=300000,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(balance=0xDE0B6B3A7640000),
+        coinbase: Account(balance=0),
+        sender: Account(balance=0x61EC43A, nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_no_oog_1.py b/tests/ported_static/stRefundTest/test_refund_no_oog_1.py
index 07689ebffb1..79eb43dc804 100644
--- a/tests/ported_static/stRefundTest/test_refund_no_oog_1.py
+++ b/tests/ported_static/stRefundTest/test_refund_no_oog_1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_refund_no_oog_1.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refund_NoOOG_1Filler.json
+state_tests/stRefundTest/refund_NoOOG_1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRefundTest/refund_NoOOG_1Filler.json"],
+    ["state_tests/stRefundTest/refund_NoOOG_1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_refund_no_oog_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0x791307ECE6DFD40DF62DC66EFBC482096DD34650382AEB5D46DBEEDED66508F7
-    )
+    """Test_refund_no_oog_1."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0xA03F70)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,24 +43,27 @@ def test_refund_no_oog_1(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xA03F70)
     pre[coinbase] = Account(balance=0, nonce=1)
-    # Source: LLL
+    # Source: lll
     # { [[ 1 ]] 0 }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
-        storage={0x1: 0x1},
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf4c9fc42faeda49049e3b8e2b97a17cc2fe95718"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=26006,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}),
+        coinbase: Account(balance=0),
+        sender: Account(balance=0x9D0314, nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_oog.py b/tests/ported_static/stRefundTest/test_refund_oog.py
index 93de7fa41f8..1054df57c65 100644
--- a/tests/ported_static/stRefundTest/test_refund_oog.py
+++ b/tests/ported_static/stRefundTest/test_refund_oog.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_refund_oog.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refund_OOGFiller.json
+state_tests/stRefundTest/refund_OOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRefundTest/refund_OOGFiller.json"],
+    ["state_tests/stRefundTest/refund_OOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_refund_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0x8518C6B13163F88376ADBDE956B3D6C1E4E027E25E20994C1AD0D78B8FD7FAC9
-    )
+    """Test_refund_oog."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0x7A120)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,27 +43,28 @@ def test_refund_oog(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0x7A120)
     pre[coinbase] = Account(balance=0, nonce=1)
-    # Source: LLL
+    # Source: lll
     # { [[ 1 ]] 0 }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
-        storage={0x1: 0x1},
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf4c9fc42faeda49049e3b8e2b97a17cc2fe95718"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=26005,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 1}),
+        target: Account(storage={1: 1}, balance=0xDE0B6B3A7640000),
+        coinbase: Account(balance=0),
+        sender: Account(balance=0x3A94E, nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_single_suicide.py b/tests/ported_static/stRefundTest/test_refund_single_suicide.py
index 863ce973f8b..4cee829af0d 100644
--- a/tests/ported_static/stRefundTest/test_refund_single_suicide.py
+++ b/tests/ported_static/stRefundTest/test_refund_single_suicide.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_refund_single_suicide.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refund_singleSuicideFiller.json
+state_tests/stRefundTest/refund_singleSuicideFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRefundTest/refund_singleSuicideFiller.json"],
+    ["state_tests/stRefundTest/refund_singleSuicideFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_refund_single_suicide(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0x2B75D0C814EB07C075FCCBDD9A036FAF651D9C46D7477D6C4F30772CFCA90D38
-    )
+    """Test_refund_single_suicide."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0x1C9C380)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,98 +43,93 @@ def test_refund_single_suicide(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0x1C9C380)
     pre[coinbase] = Account(balance=0, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x40, value=0x60)
-            + Op.DIV(Op.CALLDATALOAD(offset=0x0), Op.EXP(0x2, 0xE0))
-            + Op.JUMPI(pc=0x2E, condition=Op.EQ(Op.DUP2, 0x9E587A5))
-            + Op.JUMPI(pc=0x49, condition=Op.EQ(0x2E4699ED, Op.DUP1))
-            + Op.JUMPI(pc=0x9B, condition=Op.EQ(0xC0406226, Op.DUP1))
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x2C]
-            + Op.SELFDESTRUCT(
-                address=Op.AND(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    Op.CALLER,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.PUSH1[0x2C]
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.ADDRESS
-            + Op.SWAP1
-            + Op.POP
-            + Op.AND(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.DUP1)
-            + Op.PUSH4[0x9E587A5]
-            + Op.MLOAD(offset=0x40)
-            + Op.MSTORE(
-                offset=Op.DUP2, value=Op.MUL(Op.EXP(0x2, 0xE0), Op.DUP2)
-            )
-            + Op.PUSH1[0x4]
-            + Op.ADD
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x2,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=Op.SUB(Op.GAS, 0x61DA),
-                        address=Op.DUP8,
-                        value=0x0,
-                        args_offset=Op.DUP2,
-                        args_size=Op.SUB(Op.DUP4, Op.DUP1),
-                        ret_offset=Op.MLOAD(offset=0x40),
-                        ret_size=0x0,
-                    ),
-                ),
+    # Source: raw
+    # 0x606060405260e060020a600035046309e587a58114602e5780632e4699ed146049578063c040622614609b575b005b602c3373ffffffffffffffffffffffffffffffffffffffff16ff5b602c5b60003090508073ffffffffffffffffffffffffffffffffffffffff166309e587a56040518160e060020a0281526004018090506000604051808303816000876161da5a03f11560025750505050565b60a5600060b9604c565b604080519115158252519081900360200190f35b5060019056  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x40, value=0x60)
+        + Op.DIV(Op.CALLDATALOAD(offset=0x0), Op.EXP(0x2, 0xE0))
+        + Op.JUMPI(pc=0x2E, condition=Op.EQ(Op.DUP2, 0x9E587A5))
+        + Op.JUMPI(pc=0x49, condition=Op.EQ(0x2E4699ED, Op.DUP1))
+        + Op.JUMPI(pc=0x9B, condition=Op.EQ(0xC0406226, Op.DUP1))
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x2C]
+        + Op.SELFDESTRUCT(
+            address=Op.AND(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.CALLER
             )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0xA5]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xB9]
-            + Op.JUMP(pc=0x4C)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x40]
-            + Op.MLOAD(offset=Op.DUP1)
-            + Op.SWAP2
-            + Op.MSTORE(offset=Op.DUP3, value=Op.ISZERO(Op.ISZERO))
-            + Op.MLOAD
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.ADD(0x20, Op.SUB)
-            + Op.SWAP1
-            + Op.RETURN
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x1]
-            + Op.SWAP1
-            + Op.JUMP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.PUSH1[0x2C]
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.ADDRESS
+        + Op.SWAP1
+        + Op.POP
+        + Op.AND(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.DUP1)
+        + Op.PUSH4[0x9E587A5]
+        + Op.MLOAD(offset=0x40)
+        + Op.MSTORE(offset=Op.DUP2, value=Op.MUL(Op.EXP(0x2, 0xE0), Op.DUP2))
+        + Op.PUSH1[0x4]
+        + Op.ADD
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x2,
+            condition=Op.ISZERO(
+                Op.CALL(
+                    gas=Op.SUB(Op.GAS, 0x61DA),
+                    address=Op.DUP8,
+                    value=0x0,
+                    args_offset=Op.DUP2,
+                    args_size=Op.SUB(Op.DUP4, Op.DUP1),
+                    ret_offset=Op.MLOAD(offset=0x40),
+                    ret_size=0x0,
+                )
+            ),
+        )
+        + Op.POP * 4
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0xA5]
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xB9]
+        + Op.JUMP(pc=0x4C)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x40]
+        + Op.MLOAD(offset=Op.DUP1)
+        + Op.SWAP2
+        + Op.MSTORE(offset=Op.DUP3, value=Op.ISZERO(Op.ISZERO))
+        + Op.MLOAD
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.ADD(0x20, Op.SUB)
+        + Op.SWAP1
+        + Op.RETURN
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x1]
+        + Op.SWAP1
+        + Op.JUMP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfc2c9403120f755b844fd30d99c231483e701631"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("c0406226"),
+        to=target,
+        data=Bytes("c0406226"),
         gas_limit=300000,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(balance=0xDE0B6B3A7640000),
+        coinbase: Account(balance=0),
+        sender: Account(balance=0x1C5AF34, nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_sstore.py b/tests/ported_static/stRefundTest/test_refund_sstore.py
index 659808d92da..9a8cd6f7ddc 100644
--- a/tests/ported_static/stRefundTest/test_refund_sstore.py
+++ b/tests/ported_static/stRefundTest/test_refund_sstore.py
@@ -2,15 +2,15 @@
 Ori Pomerantz   qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refundSSTOREFiller.yml
+state_tests/stRefundTest/refundSSTOREFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRefundTest/refundSSTOREFiller.yml"],
+    ["state_tests/stRefundTest/refundSSTOREFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_refund_sstore(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Ori Pomerantz   qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x8C45B94DCA330650C0392398FB2097BB64764E973720A845EE67605FFABF0C7C
-    )
+    """Ori Pomerantz   qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D631F190, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,27 +43,28 @@ def test_refund_sstore(
         gas_limit=16777216,
     )
 
-    pre[sender] = Account(balance=0xE8D631F190, nonce=1)
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    sstore(0,0x0)
     # }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=Op.DUP1, value=0x0) + Op.STOP,
-        storage={0x0: 0x60A7},
+        storage={0: 24743},
         balance=0xDE0B6B3A7640000,
-        address=Address("0xf5f86b947fc07a75e19106a6b7e4953d431ad57f"),  # noqa: E501
+        nonce=1,
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
+        to=target,
+        data=Bytes("00"),
         gas_limit=2601000,
-        gas_price=1000,
         nonce=1,
+        gas_price=1000,
+        access_list=[],
     )
 
-    post: dict = {}
+    post = {sender: Account(balance=0xE8D4EE4E00)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_suicide50procent_cap.py b/tests/ported_static/stRefundTest/test_refund_suicide50procent_cap.py
index dc7f5ba438d..2fc32dac534 100644
--- a/tests/ported_static/stRefundTest/test_refund_suicide50procent_cap.py
+++ b/tests/ported_static/stRefundTest/test_refund_suicide50procent_cap.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_refund_suicide50procent_cap.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refundSuicide50procentCapFiller.json
+state_tests/stRefundTest/refundSuicide50procentCapFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,45 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRefundTest/refundSuicide50procentCapFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRefundTest/refundSuicide50procentCapFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "00000000000000000000000000000000000000000000000000000000000001f4",
-            {
-                Address("0xa6cc2ca5611255d50118601aa8ece6f124fc4c45"): Account(
-                    storage={10: 1, 23: 0x107A7}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000010000",
-            {
-                Address("0xa6cc2ca5611255d50118601aa8ece6f124fc4c45"): Account(
-                    storage={10: 1, 11: 1, 23: 0x166FA}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_refund_suicide50procent_cap(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
-    )
+    """Test_refund_suicide50procent_cap."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0x3B9ACA00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -71,70 +68,90 @@ def test_refund_suicide50procent_cap(
         gas_limit=100000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xA6CC2CA5611255D50118601AA8ECE6F124FC4C45)
-            + Op.STOP
-        ),
+    pre[coinbase] = Account(balance=0, nonce=1)
+    # Source: lll
+    # { [22] (GAS) [[ 10 ]] 1 [[ 11 ]] (CALL (CALLDATALOAD 0) <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 0 ) [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 [[ 6 ]] 0 [[ 7 ]] 0 [[ 8 ]] 0 [[ 23 ]] (SUB @22 (GAS)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x16, value=Op.GAS)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(
+            key=0xB,
+            value=Op.CALL(
+                gas=Op.CALLDATALOAD(offset=0x0),
+                address=0x4FF65047CE9C85F968689E4369C10003026A41A9,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x17, value=Op.SUB(Op.MLOAD(offset=0x16), Op.GAS))
+        + Op.STOP,
+        storage={1: 1, 2: 1, 3: 1, 4: 1, 5: 1, 6: 1, 7: 1, 8: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4ff65047ce9c85f968689e4369c10003026a41a9"),  # noqa: E501
+        address=Address(0xA6CC2CA5611255D50118601AA8ECE6F124FC4C45),  # noqa: E501
     )
-    # Source: LLL
-    # { [22] (GAS) [[ 10 ]] 1 [[ 11 ]] (CALL (CALLDATALOAD 0) <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 0 ) [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 [[ 6 ]] 0 [[ 7 ]] 0 [[ 8 ]] 0 [[ 23 ]] (SUB @22 (GAS)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x16, value=Op.GAS)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(
-                key=0xB,
-                value=Op.CALL(
-                    gas=Op.CALLDATALOAD(offset=0x0),
-                    address=0x4FF65047CE9C85F968689E4369C10003026A41A9,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x17, value=Op.SUB(Op.MLOAD(offset=0x16), Op.GAS))
-            + Op.STOP
-        ),
-        storage={
-            0x1: 0x1,
-            0x2: 0x1,
-            0x3: 0x1,
-            0x4: 0x1,
-            0x5: 0x1,
-            0x6: 0x1,
-            0x7: 0x1,
-            0x8: 0x1,
-        },
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xA6CC2CA5611255D50118601AA8ECE6F124FC4C45
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa6cc2ca5611255d50118601aa8ece6f124fc4c45"),  # noqa: E501
+        address=Address(0x4FF65047CE9C85F968689E4369C10003026A41A9),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3B9ACA00)
-    pre[coinbase] = Account(balance=0, nonce=1)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={10: 1, 11: 0, 23: 0x107A7},
+                    balance=0xDE0B6B3A7640000,
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={10: 1, 11: 1, 23: 0x166FA},
+                    balance=0x1BC16D674EC80000,
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0x1F4),
+        Hash(0x10000),
+    ]
+    tx_gas = [10000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=10000000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_tx_to_suicide.py b/tests/ported_static/stRefundTest/test_refund_tx_to_suicide.py
index c9403e6923f..ab754657c75 100644
--- a/tests/ported_static/stRefundTest/test_refund_tx_to_suicide.py
+++ b/tests/ported_static/stRefundTest/test_refund_tx_to_suicide.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_refund_tx_to_suicide.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refund_TxToSuicideFiller.json
+state_tests/stRefundTest/refund_TxToSuicideFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRefundTest/refund_TxToSuicideFiller.json"],
+    ["state_tests/stRefundTest/refund_TxToSuicideFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_refund_tx_to_suicide(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
+    """Test_refund_tx_to_suicide."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
     sender = EOA(
         key=0xA2333EEF5630066B928DEA5FD85A239F511B5B067D1441EE7AC290D0122B917B
     )
@@ -45,30 +46,34 @@ def test_refund_tx_to_suicide(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[coinbase] = Account(balance=0, nonce=1)
+    pre[sender] = Account(balance=0x5F5E100)
+    # Source: lll
     # { (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+        + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2bc33a472f0fba1e30bf2317d07910367908c7f6"),  # noqa: E501
+        address=Address(0x2BC33A472F0FBA1E30BF2317D07910367908C7F6),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
-    pre[coinbase] = Account(balance=0, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=61003,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 1}),
+        Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87): Account(
+            storage={}, balance=0xDE0B6B3A764000A
+        ),
+        coinbase: Account(balance=0),
+        sender: Account(balance=0x5EDB318, nonce=1),
+        target: Account(storage={1: 1}, balance=0, nonce=0),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRefundTest/test_refund_tx_to_suicide_oog.py b/tests/ported_static/stRefundTest/test_refund_tx_to_suicide_oog.py
index 977ff8e4a20..a1bc150ca20 100644
--- a/tests/ported_static/stRefundTest/test_refund_tx_to_suicide_oog.py
+++ b/tests/ported_static/stRefundTest/test_refund_tx_to_suicide_oog.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_refund_tx_to_suicide_oog.
 
 Ported from:
-tests/static/state_tests/stRefundTest/refund_TxToSuicideOOGFiller.json
+state_tests/stRefundTest/refund_TxToSuicideOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRefundTest/refund_TxToSuicideOOGFiller.json"],
+    ["state_tests/stRefundTest/refund_TxToSuicideOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_refund_tx_to_suicide_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0xA2333EEF5630066B928DEA5FD85A239F511B5B067D1441EE7AC290D0122B917B
-    )
+    """Test_refund_tx_to_suicide_oog."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,30 +43,29 @@ def test_refund_tx_to_suicide_oog(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[coinbase] = Account(balance=0, nonce=1)
+    # Source: lll
     # { (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+        + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2bc33a472f0fba1e30bf2317d07910367908c7f6"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
-    pre[coinbase] = Account(balance=0, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=21002,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 1}),
+        coinbase: Account(balance=0),
+        sender: Account(balance=0x5F2AC9C, nonce=1),
+        target: Account(storage={1: 1}, balance=0xDE0B6B3A7640000),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/__init__.py b/tests/ported_static/stReturnDataTest/__init__.py
index 8329187ab9d..22f53724d59 100644
--- a/tests/ported_static/stReturnDataTest/__init__.py
+++ b/tests/ported_static/stReturnDataTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stReturnDataTest."""
+"""Ported static tests: stReturnDataTest."""  # noqa: N999
diff --git a/tests/ported_static/stReturnDataTest/test_call_ecrec_success_empty_then_returndatasize.py b/tests/ported_static/stReturnDataTest/test_call_ecrec_success_empty_then_returndatasize.py
index 806247b2d89..d08d9d790c3 100644
--- a/tests/ported_static/stReturnDataTest/test_call_ecrec_success_empty_then_returndatasize.py
+++ b/tests/ported_static/stReturnDataTest/test_call_ecrec_success_empty_then_returndatasize.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_ecrec_success_empty_then_returndatasize.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-call_ecrec_success_empty_then_returndatasizeFiller.json
+state_tests/stReturnDataTest/call_ecrec_success_empty_then_returndatasizeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/call_ecrec_success_empty_then_returndatasizeFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/call_ecrec_success_empty_then_returndatasizeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_ecrec_success_empty_then_returndatasize(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_call_ecrec_success_empty_then_returndatasize."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,36 +45,33 @@ def test_call_ecrec_success_empty_then_returndatasize(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (seq (CALL 0x9000 0x1 0 0 0 0 0xaa) (SSTORE 0 (RETURNDATASIZE)) )}
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x9000,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0xAA,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x9000,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0xAA,
             )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP,
+        storage={0: 24743},
         nonce=0,
-        address=Address("0x77e2f61794bcfd86b1c2380c34aab5fb7c25e95e"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_call_outsize_then_create_successful_then_returndatasize.py b/tests/ported_static/stReturnDataTest/test_call_outsize_then_create_successful_then_returndatasize.py
index cdd21c46419..51835c7831d 100644
--- a/tests/ported_static/stReturnDataTest/test_call_outsize_then_create_successful_then_returndatasize.py
+++ b/tests/ported_static/stReturnDataTest/test_call_outsize_then_create_successful_then_returndatasize.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_outsize_then_create_successful_then_returndatasize.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-call_outsize_then_create_successful_then_returndatasizeFiller.json
+state_tests/stReturnDataTest/call_outsize_then_create_successful_then_returndatasizeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/call_outsize_then_create_successful_then_returndatasizeFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/call_outsize_then_create_successful_then_returndatasizeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_outsize_then_create_successful_then_returndatasize(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_call_outsize_then_create_successful_then_returndatasize."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,60 +45,52 @@ def test_call_outsize_then_create_successful_then_returndatasize(
         gas_limit=111669149696,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32) (STOP) ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP * 2,
         nonce=0,
-        address=Address("0x24b406508240d6f2783499d1fd65fedd0feeef37"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (seq (CALL 0x0900000000 <contract:0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0 0x20) (CREATE 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32)  (STOP) ) 0)) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x900000000,
-                    address=0x24B406508240D6F2783499D1FD65FEDD0FEEEF37,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x900000000,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
             )
-            + Op.PUSH1[0xE]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x3C, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE)
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(offset=0x0, value=0x112233)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+        )
+        + Op.PUSH1[0xE]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3C, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE)
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=0x112233)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP * 2,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x3875f9536b829cb75f84cdcb2f72b000b5a41855"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_call_then_call_value_fail_then_returndatasize.py b/tests/ported_static/stReturnDataTest/test_call_then_call_value_fail_then_returndatasize.py
index 0be66eb80a9..884719f7a4d 100644
--- a/tests/ported_static/stReturnDataTest/test_call_then_call_value_fail_then_returndatasize.py
+++ b/tests/ported_static/stReturnDataTest/test_call_then_call_value_fail_then_returndatasize.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_then_call_value_fail_then_returndatasize.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-call_then_call_value_fail_then_returndatasizeFiller.json
+state_tests/stReturnDataTest/call_then_call_value_fail_then_returndatasizeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/call_then_call_value_fail_then_returndatasizeFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/call_then_call_value_fail_then_returndatasizeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_then_call_value_fail_then_returndatasize(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_call_then_call_value_fail_then_returndatasize."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,59 +45,55 @@ def test_call_then_call_value_fail_then_returndatasize(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
-    # { (seq (CALL 0x0900000000 <contract:0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0 0x20) (CALL 0x0900000000 <contract:0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6> 0xffffffffffff 0 0 0 0x20) (SSTORE 0 (RETURNDATASIZE)) )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x900000000,
-                    address=0x9898DD5E5C526B55EC49B1047E298705C13279F1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x900000000,
-                    address=0x9898DD5E5C526B55EC49B1047E298705C13279F1,
-                    value=0xFFFFFFFFFFFF,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    # Source: lll
+    # { (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0e496b29ad2f0e55adf292c08a6a9289cb163835"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+    # Source: lll
+    # { (seq (CALL 0x0900000000 <contract:0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0 0x20) (CALL 0x0900000000 <contract:0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6> 0xffffffffffff 0 0 0 0x20) (SSTORE 0 (RETURNDATASIZE)) )}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x900000000,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x900000000,
+                address=addr,
+                value=0xFFFFFFFFFFFF,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
             )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x9898dd5e5c526b55ec49b1047e298705c13279f1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_call_then_create_successful_then_returndatasize.py b/tests/ported_static/stReturnDataTest/test_call_then_create_successful_then_returndatasize.py
index 02e4065a486..d4206eef60c 100644
--- a/tests/ported_static/stReturnDataTest/test_call_then_create_successful_then_returndatasize.py
+++ b/tests/ported_static/stReturnDataTest/test_call_then_create_successful_then_returndatasize.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_then_create_successful_then_returndatasize.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-call_then_create_successful_then_returndatasizeFiller.json
+state_tests/stReturnDataTest/call_then_create_successful_then_returndatasizeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/call_then_create_successful_then_returndatasizeFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/call_then_create_successful_then_returndatasizeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_then_create_successful_then_returndatasize(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_call_then_create_successful_then_returndatasize."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,60 +45,52 @@ def test_call_then_create_successful_then_returndatasize(
         gas_limit=111669149696,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32) (STOP) ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP * 2,
         nonce=0,
-        address=Address("0x24b406508240d6f2783499d1fd65fedd0feeef37"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
-    # Source: LLL
+    # Source: lll
     # { (seq (CALL 0x0900000000 <contract:0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0 0) (CREATE 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32) (STOP) ) 0)) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x900000000,
-                    address=0x24B406508240D6F2783499D1FD65FEDD0FEEEF37,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x900000000,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.PUSH1[0xE]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x3C, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE)
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(offset=0x0, value=0x112233)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+        )
+        + Op.PUSH1[0xE]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3C, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE)
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=0x112233)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP * 2,
+        storage={0: 1},
         nonce=0,
-        address=Address("0xcc5fbabb1e86f7744ed4840b4153736d3c0ae2a2"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_clear_return_buffer.py b/tests/ported_static/stReturnDataTest/test_clear_return_buffer.py
index 734b49798d1..dbe6e759b27 100644
--- a/tests/ported_static/stReturnDataTest/test_clear_return_buffer.py
+++ b/tests/ported_static/stReturnDataTest/test_clear_return_buffer.py
@@ -2,1672 +2,1065 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest/clearReturnBufferFiller.yml
+state_tests/stReturnDataTest/clearReturnBufferFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
+    Storage,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
+def _storage_with_any(base: dict, any_keys: list) -> Storage:
+    """Create Storage with set_expect_any for specified keys."""
+    s = Storage(base)
+    for k in any_keys:
+        s.set_expect_any(k)
+    return s
+
+
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stReturnDataTest/clearReturnBufferFiller.yml"],
+    ["state_tests/stReturnDataTest/clearReturnBufferFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f0000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f2000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f2000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f2000000000000000000000000000000000000000000000000000000000000f3f300000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f2000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f2000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f2000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f2000000000000000000000000000000000000000000000000000000000000f3fd0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62461}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f2000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f2000000000000000000000000000000000000000000000000000000000000fdfd00000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f2000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000fdfd00000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f2000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f2000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f4000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f4000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f4000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f4000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f4000000000000000000000000000000000000000000000000000000000000f3f300000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f4000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f4000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f4000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000001  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f4000000000000000000000000000000000000000000000000000000000000f3fd0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62461}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f4000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f4000000000000000000000000000000000000000000000000000000000000fdfd00000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f4000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f4000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f4000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011fa000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011fa000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011fa000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011fa000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F0000000000000000000000000000000000000000000000000000000000000F  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011fa000000000000000000000000000000000000000000000000000000000000f3f300000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011fa000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011fa000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011fa000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011fa000000000000000000000000000000000000000000000000000000000000f3fd0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62461}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011fa000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011fa000000000000000000000000000000000000000000000000000000000000fdfd00000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011fa000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011fa000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011fa000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000010  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f0000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f0000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f0000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f0000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f0000000000000000000000000000000000000000000000000000000000000f3f300000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f0000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000001  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f0000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F0000000000000000000000000000000000000000000000000000000000000F  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f0000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000010  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f0000000000000000000000000000000000000000000000000000000000000f3fd0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f0000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f0000000000000000000000000000000000000000000000000000000000000fdfd00000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f0000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000001  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f0000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F0000000000000000000000000000000000000000000000000000000000000F  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f0000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000010  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f5000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f5000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f5000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f5000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f5000000000000000000000000000000000000000000000000000000000000f3f300000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f5000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000001  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f5000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F0000000000000000000000000000000000000000000000000000000000000F  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f5000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000010  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f5000000000000000000000000000000000000000000000000000000000000f3fd0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f5000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f5000000000000000000000000000000000000000000000000000000000000fdfd00000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f5000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000001  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f5000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F0000000000000000000000000000000000000000000000000000000000000F  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f5000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000010  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000f3f300000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000001  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F0000000000000000000000000000000000000000000000000000000000000F  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000010  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000f3fd0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000fdfd00000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000001  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F0000000000000000000000000000000000000000000000000000000000000F  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000010  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000f3f300000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000f3fd0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62461}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000fdfd00000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000f3f300000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000f3f300000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000f3fd0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62461}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000fdfd00000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000001  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000f3f300000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000f3fd0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62461}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000fdfd00000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F0000000000000000000000000000000000000000000000000000000000000F  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000f3f300000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000f3fd0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62461}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000010  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000fdfd00000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f1000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f1000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f1000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f1000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f1000000000000000000000000000000000000000000000000000000000000f3f300000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f1000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000f3fd0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f1000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f1000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f1000000000000000000000000000000000000000000000000000000000000f3fd0000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62461}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f1000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f1000000000000000000000000000000000000000000000000000000000000fdfd00000000000000000000000000000000000000000000000000000000000000ff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f1000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000100",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f1000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000fff",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f1000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000001000",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f2000000000000000000000000000000000000000000000000000000000000f3f30000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 62451}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000011f2000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000020",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={1: 65021}
-                )
-            },
-        ),
-        (
-            "048071d300000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000fdfd0000000000000000000000000000000000000000000000000000000000000010",  # noqa: E501
-            {
-                Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"): Account(
-                    storage={
-                        1: 0x7F00000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="d16",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="d17",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="d18",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="d19",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="d20",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="d21",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="d22",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="d23",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="d24",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="d25",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="d26",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="d27",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="d28",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="d29",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="d30",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="d31",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="d32",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="d33",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="d34",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="d35",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="d36",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="d37",
+        ),
+        pytest.param(
+            38,
+            0,
+            0,
+            id="d38",
+        ),
+        pytest.param(
+            39,
+            0,
+            0,
+            id="d39",
+        ),
+        pytest.param(
+            40,
+            0,
+            0,
+            id="d40",
+        ),
+        pytest.param(
+            41,
+            0,
+            0,
+            id="d41",
+        ),
+        pytest.param(
+            42,
+            0,
+            0,
+            id="d42",
+        ),
+        pytest.param(
+            43,
+            0,
+            0,
+            id="d43",
+        ),
+        pytest.param(
+            44,
+            0,
+            0,
+            id="d44",
+        ),
+        pytest.param(
+            45,
+            0,
+            0,
+            id="d45",
+        ),
+        pytest.param(
+            46,
+            0,
+            0,
+            id="d46",
+        ),
+        pytest.param(
+            47,
+            0,
+            0,
+            id="d47",
+        ),
+        pytest.param(
+            48,
+            0,
+            0,
+            id="d48",
+        ),
+        pytest.param(
+            49,
+            0,
+            0,
+            id="d49",
+        ),
+        pytest.param(
+            50,
+            0,
+            0,
+            id="d50",
+        ),
+        pytest.param(
+            51,
+            0,
+            0,
+            id="d51",
+        ),
+        pytest.param(
+            52,
+            0,
+            0,
+            id="d52",
+        ),
+        pytest.param(
+            53,
+            0,
+            0,
+            id="d53",
+        ),
+        pytest.param(
+            54,
+            0,
+            0,
+            id="d54",
+        ),
+        pytest.param(
+            55,
+            0,
+            0,
+            id="d55",
+        ),
+        pytest.param(
+            56,
+            0,
+            0,
+            id="d56",
+        ),
+        pytest.param(
+            57,
+            0,
+            0,
+            id="d57",
+        ),
+        pytest.param(
+            58,
+            0,
+            0,
+            id="d58",
+        ),
+        pytest.param(
+            59,
+            0,
+            0,
+            id="d59",
+        ),
+        pytest.param(
+            60,
+            0,
+            0,
+            id="d60",
+        ),
+        pytest.param(
+            61,
+            0,
+            0,
+            id="d61",
+        ),
+        pytest.param(
+            62,
+            0,
+            0,
+            id="d62",
+        ),
+        pytest.param(
+            63,
+            0,
+            0,
+            id="d63",
+        ),
+        pytest.param(
+            64,
+            0,
+            0,
+            id="d64",
+        ),
+        pytest.param(
+            65,
+            0,
+            0,
+            id="d65",
+        ),
+        pytest.param(
+            66,
+            0,
+            0,
+            id="d66",
+        ),
+        pytest.param(
+            67,
+            0,
+            0,
+            id="d67",
+        ),
+        pytest.param(
+            68,
+            0,
+            0,
+            id="d68",
+        ),
+        pytest.param(
+            69,
+            0,
+            0,
+            id="d69",
+        ),
+        pytest.param(
+            70,
+            0,
+            0,
+            id="d70",
+        ),
+        pytest.param(
+            71,
+            0,
+            0,
+            id="d71",
+        ),
+        pytest.param(
+            72,
+            0,
+            0,
+            id="d72",
+        ),
+        pytest.param(
+            73,
+            0,
+            0,
+            id="d73",
+        ),
+        pytest.param(
+            74,
+            0,
+            0,
+            id="d74",
+        ),
+        pytest.param(
+            75,
+            0,
+            0,
+            id="d75",
+        ),
+        pytest.param(
+            76,
+            0,
+            0,
+            id="d76",
+        ),
+        pytest.param(
+            77,
+            0,
+            0,
+            id="d77",
+        ),
+        pytest.param(
+            78,
+            0,
+            0,
+            id="d78",
+        ),
+        pytest.param(
+            79,
+            0,
+            0,
+            id="d79",
+        ),
+        pytest.param(
+            80,
+            0,
+            0,
+            id="d80",
+        ),
+        pytest.param(
+            81,
+            0,
+            0,
+            id="d81",
+        ),
+        pytest.param(
+            82,
+            0,
+            0,
+            id="d82",
+        ),
+        pytest.param(
+            83,
+            0,
+            0,
+            id="d83",
+        ),
+        pytest.param(
+            84,
+            0,
+            0,
+            id="d84",
+        ),
+        pytest.param(
+            85,
+            0,
+            0,
+            id="d85",
+        ),
+        pytest.param(
+            86,
+            0,
+            0,
+            id="d86",
+        ),
+        pytest.param(
+            87,
+            0,
+            0,
+            id="d87",
+        ),
+        pytest.param(
+            88,
+            0,
+            0,
+            id="d88",
+        ),
+        pytest.param(
+            89,
+            0,
+            0,
+            id="d89",
+        ),
+        pytest.param(
+            90,
+            0,
+            0,
+            id="d90",
+        ),
+        pytest.param(
+            91,
+            0,
+            0,
+            id="d91",
+        ),
+        pytest.param(
+            92,
+            0,
+            0,
+            id="d92",
+        ),
+        pytest.param(
+            93,
+            0,
+            0,
+            id="d93",
+        ),
+        pytest.param(
+            94,
+            0,
+            0,
+            id="d94",
+        ),
+        pytest.param(
+            95,
+            0,
+            0,
+            id="d95",
+        ),
+        pytest.param(
+            96,
+            0,
+            0,
+            id="d96",
+        ),
+        pytest.param(
+            97,
+            0,
+            0,
+            id="d97",
+        ),
+        pytest.param(
+            98,
+            0,
+            0,
+            id="d98",
+        ),
+        pytest.param(
+            99,
+            0,
+            0,
+            id="d99",
+        ),
+        pytest.param(
+            100,
+            0,
+            0,
+            id="d100",
+        ),
+        pytest.param(
+            101,
+            0,
+            0,
+            id="d101",
+        ),
+        pytest.param(
+            102,
+            0,
+            0,
+            id="d102",
+        ),
+        pytest.param(
+            103,
+            0,
+            0,
+            id="d103",
+        ),
+        pytest.param(
+            104,
+            0,
+            0,
+            id="d104",
+        ),
+        pytest.param(
+            105,
+            0,
+            0,
+            id="d105",
+        ),
+        pytest.param(
+            106,
+            0,
+            0,
+            id="d106",
+        ),
+        pytest.param(
+            107,
+            0,
+            0,
+            id="d107",
+        ),
+        pytest.param(
+            108,
+            0,
+            0,
+            id="d108",
+        ),
+        pytest.param(
+            109,
+            0,
+            0,
+            id="d109",
+        ),
+        pytest.param(
+            110,
+            0,
+            0,
+            id="d110",
+        ),
+        pytest.param(
+            111,
+            0,
+            0,
+            id="d111",
+        ),
+        pytest.param(
+            112,
+            0,
+            0,
+            id="d112",
+        ),
+        pytest.param(
+            113,
+            0,
+            0,
+            id="d113",
+        ),
+        pytest.param(
+            114,
+            0,
+            0,
+            id="d114",
+        ),
+        pytest.param(
+            115,
+            0,
+            0,
+            id="d115",
+        ),
+        pytest.param(
+            116,
+            0,
+            0,
+            id="d116",
+        ),
+        pytest.param(
+            117,
+            0,
+            0,
+            id="d117",
+        ),
+        pytest.param(
+            118,
+            0,
+            0,
+            id="d118",
+        ),
+        pytest.param(
+            119,
+            0,
+            0,
+            id="d119",
+        ),
+        pytest.param(
+            120,
+            0,
+            0,
+            id="d120",
+        ),
+        pytest.param(
+            121,
+            0,
+            0,
+            id="d121",
+        ),
+        pytest.param(
+            122,
+            0,
+            0,
+            id="d122",
+        ),
+        pytest.param(
+            123,
+            0,
+            0,
+            id="d123",
+        ),
+        pytest.param(
+            124,
+            0,
+            0,
+            id="d124",
+        ),
+        pytest.param(
+            125,
+            0,
+            0,
+            id="d125",
+        ),
+        pytest.param(
+            126,
+            0,
+            0,
+            id="d126",
+        ),
+        pytest.param(
+            127,
+            0,
+            0,
+            id="d127",
+        ),
+        pytest.param(
+            128,
+            0,
+            0,
+            id="d128",
+        ),
+        pytest.param(
+            129,
+            0,
+            0,
+            id="d129",
+        ),
+        pytest.param(
+            130,
+            0,
+            0,
+            id="d130",
+        ),
+        pytest.param(
+            131,
+            0,
+            0,
+            id="d131",
+        ),
+        pytest.param(
+            132,
+            0,
+            0,
+            id="d132",
+        ),
+        pytest.param(
+            133,
+            0,
+            0,
+            id="d133",
+        ),
+        pytest.param(
+            134,
+            0,
+            0,
+            id="d134",
+        ),
+        pytest.param(
+            135,
+            0,
+            0,
+            id="d135",
+        ),
+        pytest.param(
+            136,
+            0,
+            0,
+            id="d136",
+        ),
+        pytest.param(
+            137,
+            0,
+            0,
+            id="d137",
+        ),
+        pytest.param(
+            138,
+            0,
+            0,
+            id="d138",
+        ),
+        pytest.param(
+            139,
+            0,
+            0,
+            id="d139",
+        ),
+        pytest.param(
+            140,
+            0,
+            0,
+            id="d140",
+        ),
+        pytest.param(
+            141,
+            0,
+            0,
+            id="d141",
+        ),
+        pytest.param(
+            142,
+            0,
+            0,
+            id="d142",
+        ),
+        pytest.param(
+            143,
+            0,
+            0,
+            id="d143",
+        ),
+        pytest.param(
+            144,
+            0,
+            0,
+            id="d144",
+        ),
+        pytest.param(
+            145,
+            0,
+            0,
+            id="d145",
+        ),
+        pytest.param(
+            146,
+            0,
+            0,
+            id="d146",
+        ),
+        pytest.param(
+            147,
+            0,
+            0,
+            id="d147",
+        ),
+        pytest.param(
+            148,
+            0,
+            0,
+            id="d148",
+        ),
+        pytest.param(
+            149,
+            0,
+            0,
+            id="d149",
+        ),
+        pytest.param(
+            150,
+            0,
+            0,
+            id="d150",
+        ),
+        pytest.param(
+            151,
+            0,
+            0,
+            id="d151",
+        ),
+        pytest.param(
+            152,
+            0,
+            0,
+            id="d152",
+        ),
+        pytest.param(
+            153,
+            0,
+            0,
+            id="d153",
+        ),
+        pytest.param(
+            154,
+            0,
+            0,
+            id="d154",
+        ),
+        pytest.param(
+            155,
+            0,
+            0,
+            id="d155",
+        ),
+        pytest.param(
+            156,
+            0,
+            0,
+            id="d156",
+        ),
+        pytest.param(
+            157,
+            0,
+            0,
+            id="d157",
+        ),
+        pytest.param(
+            158,
+            0,
+            0,
+            id="d158",
+        ),
+        pytest.param(
+            159,
+            0,
+            0,
+            id="d159",
+        ),
+        pytest.param(
+            160,
+            0,
+            0,
+            id="d160",
+        ),
+        pytest.param(
+            161,
+            0,
+            0,
+            id="d161",
+        ),
+        pytest.param(
+            162,
+            0,
+            0,
+            id="d162",
+        ),
+        pytest.param(
+            163,
+            0,
+            0,
+            id="d163",
+        ),
+        pytest.param(
+            164,
+            0,
+            0,
+            id="d164",
+        ),
+        pytest.param(
+            165,
+            0,
+            0,
+            id="d165",
+        ),
+        pytest.param(
+            166,
+            0,
+            0,
+            id="d166",
+        ),
+        pytest.param(
+            167,
+            0,
+            0,
+            id="d167",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-        "case166",
-        "case167",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_clear_return_buffer(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x48DC5A9F099CAAAA557742CA3A990A94BE45B9969126A1BC74E5E8BE5A2B5B47
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -1678,31 +1071,113 @@ def test_clear_return_buffer(
         gas_limit=100000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x20]
-            + Op.PUSH1[0x0]
-            + Op.DUP2
-            + Op.DUP2
-            + Op.DUP1
-            + Op.CALLDATALOAD(offset=Op.DUP1)
-            + Op.MSTORE(offset=Op.DUP3, value=Op.CALLDATALOAD(offset=Op.DUP4))
-            + Op.GAS
-            + Op.POP(Op.CALL)
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.SSTORE(key=0x1, value=Op.ADDRESS)
-            + Op.STOP
-        ),
+    # Source: yul
+    # berlin
+    # {
+    #    // no need to complicate things with an ABI
+    #    let bufLen := calldataload(0)
+    #    mstore(0, 0x60A7)
+    #    return(0, bufLen)
+    # }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.MSTORE(offset=0x0, value=0x60A7)
+        + Op.PUSH1[0x0]
+        + Op.RETURN,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=1,
+    )
+    # Source: yul
+    # berlin
+    # {
+    #    // no need to complicate things with an ABI
+    #    let bufLen := calldataload(0)
+    #    mstore(0, 0x60A7)
+    #    revert(0, bufLen)
+    # }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.MSTORE(offset=0x0, value=0x60A7)
+        + Op.PUSH1[0x0]
+        + Op.REVERT,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=1,
+    )
+    # Source: yul
+    # berlin
+    # {
+    #    // no need to complicate things with an ABI
+    #    let addr   := calldataload(0x00)
+    #    let bufLen := calldataload(0x20)
+    #    let static := calldataload(0x40)
+    #    mstore(0, bufLen)
+    #    pop(call(gas(), addr, 0, 0, 0x20, 0, 0x20))
+    #    sstore(0, returndatasize())
+    #    sstore(1, address())
+    #    stop()
+    # }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x20]
+        + Op.PUSH1[0x0]
+        + Op.DUP2 * 2
+        + Op.DUP1
+        + Op.CALLDATALOAD(offset=Op.DUP1)
+        + Op.MSTORE(offset=Op.DUP3, value=Op.CALLDATALOAD(offset=Op.DUP4))
+        + Op.GAS
+        + Op.POP(Op.CALL)
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.SSTORE(key=0x1, value=Op.ADDRESS)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=1,
+    )
+    # Source: yul
+    # berlin
+    # {
+    #    // no need to complicate things with an ABI
+    #    let addr   := calldataload(0x00)
+    #    let bufLen := calldataload(0x20)
+    #    let static := calldataload(0x40)
+    #    mstore(0, bufLen)
+    #    pop(call(gas(), addr, 0, 0, 0x20, 0, 0x20))
+    #    sstore(0, returndatasize())
+    #    sstore(1, address())
+    #    stop()
+    # }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x20]
+        + Op.PUSH1[0x0]
+        + Op.DUP2 * 2
+        + Op.DUP1
+        + Op.CALLDATALOAD(offset=Op.DUP1)
+        + Op.MSTORE(offset=Op.DUP3, value=Op.CALLDATALOAD(offset=Op.DUP4))
+        + Op.GAS
+        + Op.POP(Op.CALL)
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.SSTORE(key=0x1, value=Op.ADDRESS)
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x0fabe6f4dfa10093ecd1c05df08ee0b199f2f36d"),  # noqa: E501
+        nonce=1,
     )
-    pre.deploy_contract(
+    # Source: yul
+    # berlin
+    # {
+    #    // no need to complicate things with an ABI
+    #    let addr   := calldataload(0x00)
+    #    let bufLen := calldataload(0x20)
+    #    mstore(0, bufLen)
+    #    pop(call(gas(), addr, 0, 0, 0x20, 0, 0x20))
+    #
+    #    // Crash with an illegal opcode
+    #    verbatim_0i_0o("0xFE")
+    # }
+    addr_5 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex("602060008181808035833582525af1503078464500"),
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x421ab4bf2ff9bd61e45075062aec737a6f1b726d"),  # noqa: E501
+        nonce=1,
     )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    // The operation that we ran and that after which we're supposed
     #    // to have an empty buffer
@@ -1732,305 +1207,435 @@ def test_clear_return_buffer(
     #      //
     #      // Write the buffer length to memory (so we can send it)
     #      //    0x0 PUSH32 <bufLen>
-    #      mstore8(0x0, 0x7F)
-    # ... (154 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x44)
-            + Op.CALLDATALOAD(offset=0x24)
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.JUMPI(pc=0x19F, condition=Op.EQ(Op.DUP2, 0xF0))
-            + Op.JUMPI(pc=0x18A, condition=Op.EQ(0x11F0, Op.DUP1))
-            + Op.JUMPI(pc=0x17C, condition=Op.EQ(0xF5, Op.DUP1))
-            + Op.JUMPI(pc=0x164, condition=Op.EQ(0x11F5, Op.DUP1))
-            + Op.JUMPI(pc=0x147, condition=Op.EQ(0xF1, Op.DUP1))
-            + Op.JUMPI(pc=0x129, condition=Op.EQ(0x11F1, Op.DUP1))
-            + Op.JUMPI(pc=0x10C, condition=Op.EQ(0xF2, Op.DUP1))
-            + Op.JUMPI(pc=Op.PUSH2[0xEE], condition=Op.EQ(0x11F2, Op.DUP1))
-            + Op.JUMPI(pc=Op.PUSH2[0xD2], condition=Op.EQ(0xF4, Op.DUP1))
-            + Op.JUMPI(pc=Op.PUSH2[0xB5], condition=Op.EQ(0x11F4, Op.DUP1))
-            + Op.JUMPI(pc=Op.PUSH2[0x96], condition=Op.EQ(0xFA, Op.DUP1))
-            + Op.PUSH2[0x11FA]
-            + Op.JUMPI(pc=Op.PUSH2[0x72], condition=Op.EQ)
-            + Op.REVERT(offset=Op.DUP1, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.MSTORE
-            + Op.PUSH1[0x20]
-            + Op.MSTORE
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0xBAD0CA11,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x100,
-                    ret_size=0x20,
-                ),
+    # ... (155 more lines)
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x44)
+        + Op.CALLDATALOAD(offset=0x24)
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.JUMPI(pc=0x19F, condition=Op.EQ(Op.DUP2, 0xF0))
+        + Op.JUMPI(pc=0x18A, condition=Op.EQ(0x11F0, Op.DUP1))
+        + Op.JUMPI(pc=0x17C, condition=Op.EQ(0xF5, Op.DUP1))
+        + Op.JUMPI(pc=0x164, condition=Op.EQ(0x11F5, Op.DUP1))
+        + Op.JUMPI(pc=0x147, condition=Op.EQ(0xF1, Op.DUP1))
+        + Op.JUMPI(pc=0x129, condition=Op.EQ(0x11F1, Op.DUP1))
+        + Op.JUMPI(pc=0x10C, condition=Op.EQ(0xF2, Op.DUP1))
+        + Op.JUMPI(pc=Op.PUSH2[0xEE], condition=Op.EQ(0x11F2, Op.DUP1))
+        + Op.JUMPI(pc=Op.PUSH2[0xD2], condition=Op.EQ(0xF4, Op.DUP1))
+        + Op.JUMPI(pc=Op.PUSH2[0xB5], condition=Op.EQ(0x11F4, Op.DUP1))
+        + Op.JUMPI(pc=Op.PUSH2[0x96], condition=Op.EQ(0xFA, Op.DUP1))
+        + Op.PUSH2[0x11FA]
+        + Op.JUMPI(pc=Op.PUSH2[0x72], condition=Op.EQ)
+        + Op.REVERT(offset=Op.DUP1, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.MSTORE
+        + Op.PUSH1[0x20]
+        + Op.MSTORE
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=0xBAD0CA11,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x100,
+                ret_size=0x20,
             )
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.MSTORE
-            + Op.PUSH1[0x20]
-            + Op.MSTORE
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x57A700CA11ED,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x100,
-                    ret_size=0x20,
-                ),
+        )
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.MSTORE
+        + Op.PUSH1[0x20]
+        + Op.MSTORE
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x57A700CA11ED,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x100,
+                ret_size=0x20,
             )
-            + Op.JUMP(pc=Op.PUSH2[0x8A])
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.MSTORE
-            + Op.PUSH1[0x20]
-            + Op.MSTORE
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0xBAD0CA11,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x100,
-                    ret_size=0x20,
-                ),
+        )
+        + Op.JUMP(pc=Op.PUSH2[0x8A])
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.MSTORE
+        + Op.PUSH1[0x20]
+        + Op.MSTORE
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0xBAD0CA11,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x100,
+                ret_size=0x20,
             )
-            + Op.JUMP(pc=Op.PUSH2[0x8A])
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.MSTORE
-            + Op.PUSH1[0x20]
-            + Op.MSTORE
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0xCA11ED,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x100,
-                    ret_size=0x20,
-                ),
+        )
+        + Op.JUMP(pc=Op.PUSH2[0x8A])
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.MSTORE
+        + Op.PUSH1[0x20]
+        + Op.MSTORE
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0xCA11ED,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x100,
+                ret_size=0x20,
             )
-            + Op.JUMP(pc=Op.PUSH2[0x8A])
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.MSTORE
-            + Op.PUSH1[0x20]
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0xBAD0CA11,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x100,
-                    ret_size=0x20,
-                ),
+        )
+        + Op.JUMP(pc=Op.PUSH2[0x8A])
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.MSTORE
+        + Op.PUSH1[0x20]
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALLCODE(
+                gas=Op.GAS,
+                address=0xBAD0CA11,
+                value=Op.DUP1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x100,
+                ret_size=0x20,
             )
-            + Op.JUMP(pc=Op.PUSH2[0x8A])
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.MSTORE
-            + Op.PUSH1[0x20]
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0xCA11ED,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x100,
-                    ret_size=0x20,
-                ),
+        )
+        + Op.JUMP(pc=Op.PUSH2[0x8A])
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.MSTORE
+        + Op.PUSH1[0x20]
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALLCODE(
+                gas=Op.GAS,
+                address=0xCA11ED,
+                value=Op.DUP1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x100,
+                ret_size=0x20,
             )
-            + Op.JUMP(pc=Op.PUSH2[0x8A])
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.MSTORE
-            + Op.PUSH1[0x20]
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xBAD0CA11,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x100,
-                    ret_size=0x20,
-                ),
+        )
+        + Op.JUMP(pc=Op.PUSH2[0x8A])
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.MSTORE
+        + Op.PUSH1[0x20]
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xBAD0CA11,
+                value=Op.DUP1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x100,
+                ret_size=0x20,
             )
-            + Op.JUMP(pc=Op.PUSH2[0x8A])
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.MSTORE
-            + Op.PUSH1[0x20]
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xCA11ED,
-                    value=Op.DUP1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x100,
-                    ret_size=0x20,
-                ),
+        )
+        + Op.JUMP(pc=Op.PUSH2[0x8A])
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.MSTORE
+        + Op.PUSH1[0x20]
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xCA11ED,
+                value=Op.DUP1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x100,
+                ret_size=0x20,
             )
-            + Op.JUMP(pc=Op.PUSH2[0x8A])
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH2[0x5A17]
-            + Op.SWAP2
-            + Op.PUSH2[0x172]
-            + Op.SWAP2
-            + Op.JUMP(pc=0x23E)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.POP(Op.CREATE2)
-            + Op.JUMP(pc=Op.PUSH2[0x8A])
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH2[0x5A17]
-            + Op.SWAP2
-            + Op.PUSH2[0x172]
-            + Op.SWAP2
-            + Op.JUMP(pc=0x1A6)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.SWAP1
-            + Op.PUSH2[0x195]
-            + Op.SWAP2
-            + Op.JUMP(pc=0x23E)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.POP(Op.CREATE)
-            + Op.JUMP(pc=Op.PUSH2[0x8A])
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.SWAP1
-            + Op.PUSH2[0x195]
-            + Op.SWAP2
-            + Op.JUMPDEST
-            + Op.SWAP1
-            + Op.MSTORE8(offset=0x0, value=0x7F)
-            + Op.PUSH1[0x1]
-            + Op.MSTORE
-            + Op.MSTORE8(offset=0x21, value=0x60)
-            + Op.MSTORE8(offset=0x22, value=0x0)
-            + Op.MSTORE8(offset=0x23, value=0x52)
-            + Op.MSTORE8(offset=0x24, value=0x60)
-            + Op.MSTORE8(offset=0x25, value=0xFF)
-            + Op.MSTORE8(offset=0x26, value=0x60)
-            + Op.MSTORE8(offset=0x27, value=0x20)
-            + Op.MSTORE8(offset=0x28, value=0x60)
-            + Op.MSTORE8(offset=0x29, value=0x20)
-            + Op.MSTORE8(offset=0x2A, value=0x60)
-            + Op.MSTORE8(offset=0x2B, value=0x0)
-            + Op.MSTORE8(offset=0x2C, value=0x60)
-            + Op.MSTORE8(offset=0x2D, value=0x0)
-            + Op.MSTORE8(offset=0x2E, value=0x7F)
-            + Op.PUSH1[0x2F]
-            + Op.MSTORE
-            + Op.MSTORE8(offset=0x4F, value=0x5A)
-            + Op.MSTORE8(offset=0x50, value=0xF1)
-            + Op.MSTORE8(offset=0x51, value=0x60)
-            + Op.MSTORE8(offset=0x52, value=0x20)
-            + Op.MSTORE8(offset=0x53, value=0x51)
-            + Op.MSTORE8(offset=0x54, value=0x60)
-            + Op.MSTORE8(offset=0x55, value=0x0)
-            + Op.MSTORE8(offset=0x56, value=0x55)
-            + Op.MSTORE8(offset=0x57, value=0x3D)
-            + Op.MSTORE8(offset=0x58, value=0x60)
-            + Op.MSTORE8(offset=0x59, value=0x1)
-            + Op.MSTORE8(offset=0x5A, value=0x55)
-            + Op.MSTORE8(offset=0x5B, value=0x0)
-            + Op.PUSH1[0x5C]
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.SWAP1
-            + Op.PUSH2[0x248]
-            + Op.SWAP2
-            + Op.JUMP(pc=0x1A6)
-            + Op.JUMPDEST
-            + Op.MSTORE8(offset=Op.SUB(Op.DUP3, 0x1), value=0xFE)
-            + Op.SWAP1
-            + Op.JUMP
-        ),
-        storage={0x0: 0x60A7},
-        balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x48db33b0a06dd1e98df44d8bef0da3f1d948571d"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x20]
-            + Op.PUSH1[0x0]
-            + Op.DUP2
-            + Op.DUP2
-            + Op.DUP1
-            + Op.CALLDATALOAD(offset=Op.DUP1)
-            + Op.MSTORE(offset=Op.DUP3, value=Op.CALLDATALOAD(offset=Op.DUP4))
-            + Op.GAS
-            + Op.POP(Op.CALL)
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.SSTORE(key=0x1, value=Op.ADDRESS)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x4940bb1de279f6b55dc0bf40ed1fdef517d8c2e9"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.MSTORE(offset=0x0, value=0x60A7)
-            + Op.PUSH1[0x0]
-            + Op.REVERT
-        ),
+        )
+        + Op.JUMP(pc=Op.PUSH2[0x8A])
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP2
+        + Op.PUSH2[0x172]
+        + Op.SWAP2
+        + Op.JUMP(pc=0x23E)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.POP(Op.CREATE2)
+        + Op.JUMP(pc=Op.PUSH2[0x8A])
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH2[0x5A17]
+        + Op.SWAP2
+        + Op.PUSH2[0x172]
+        + Op.SWAP2
+        + Op.JUMP(pc=0x1A6)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.SWAP1
+        + Op.PUSH2[0x195]
+        + Op.SWAP2
+        + Op.JUMP(pc=0x23E)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.POP(Op.CREATE)
+        + Op.JUMP(pc=Op.PUSH2[0x8A])
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.SWAP1
+        + Op.PUSH2[0x195]
+        + Op.SWAP2
+        + Op.JUMPDEST
+        + Op.SWAP1
+        + Op.MSTORE8(offset=0x0, value=0x7F)
+        + Op.PUSH1[0x1]
+        + Op.MSTORE
+        + Op.MSTORE8(offset=0x21, value=0x60)
+        + Op.MSTORE8(offset=0x22, value=0x0)
+        + Op.MSTORE8(offset=0x23, value=0x52)
+        + Op.MSTORE8(offset=0x24, value=0x60)
+        + Op.MSTORE8(offset=0x25, value=0xFF)
+        + Op.MSTORE8(offset=0x26, value=0x60)
+        + Op.MSTORE8(offset=0x27, value=0x20)
+        + Op.MSTORE8(offset=0x28, value=0x60)
+        + Op.MSTORE8(offset=0x29, value=0x20)
+        + Op.MSTORE8(offset=0x2A, value=0x60)
+        + Op.MSTORE8(offset=0x2B, value=0x0)
+        + Op.MSTORE8(offset=0x2C, value=0x60)
+        + Op.MSTORE8(offset=0x2D, value=0x0)
+        + Op.MSTORE8(offset=0x2E, value=0x7F)
+        + Op.PUSH1[0x2F]
+        + Op.MSTORE
+        + Op.MSTORE8(offset=0x4F, value=0x5A)
+        + Op.MSTORE8(offset=0x50, value=0xF1)
+        + Op.MSTORE8(offset=0x51, value=0x60)
+        + Op.MSTORE8(offset=0x52, value=0x20)
+        + Op.MSTORE8(offset=0x53, value=0x51)
+        + Op.MSTORE8(offset=0x54, value=0x60)
+        + Op.MSTORE8(offset=0x55, value=0x0)
+        + Op.MSTORE8(offset=0x56, value=0x55)
+        + Op.MSTORE8(offset=0x57, value=0x3D)
+        + Op.MSTORE8(offset=0x58, value=0x60)
+        + Op.MSTORE8(offset=0x59, value=0x1)
+        + Op.MSTORE8(offset=0x5A, value=0x55)
+        + Op.MSTORE8(offset=0x5B, value=0x0)
+        + Op.PUSH1[0x5C]
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.SWAP1
+        + Op.PUSH2[0x248]
+        + Op.SWAP2
+        + Op.JUMP(pc=0x1A6)
+        + Op.JUMPDEST
+        + Op.MSTORE8(offset=Op.SUB(Op.DUP3, 0x1), value=0xFE)
+        + Op.SWAP1
+        + Op.JUMP,
+        storage={0: 24743},
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x4c24d17e84f86907f0a33776f83c754d52e46d13"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.MSTORE(offset=0x0, value=0x60A7)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0xbd0bb2600f59acdee19a917db4f3f7b00c9c9759"),  # noqa: E501
+        nonce=1,
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Bytes("048071d3") + Hash(0x11F0) + Hash(0xF3F3) + Hash(0x20),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xFDFD) + Hash(0x20),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xF3F3) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xF3F3) + Hash(0x10),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xF3F3) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xF3F3) + Hash(0x100),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xF3F3) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xF3F3) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xF3FD) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xFDFD) + Hash(0x10),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xFDFD) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xFDFD) + Hash(0x100),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xFDFD) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0xF0) + Hash(0xFDFD) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xF3F3) + Hash(0x20),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xFDFD) + Hash(0x20),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xF3F3) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xF3F3) + Hash(0x10),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xF3F3) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xF3F3) + Hash(0x100),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xF3F3) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xF3F3) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xF3FD) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xFDFD) + Hash(0x10),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xFDFD) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xFDFD) + Hash(0x100),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xFDFD) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0xF5) + Hash(0xFDFD) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0xF3F3) + Hash(0x20),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0xFDFD) + Hash(0x20),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0xF3F3) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0xF3F3) + Hash(0x10),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0xF3F3) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0xF3F3) + Hash(0x100),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0xF3F3) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0xF3F3) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0xF3FD) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0xFDFD) + Hash(0x10),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0xFDFD) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0xFDFD) + Hash(0x100),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0xFDFD) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0xF1) + Hash(0xFDFD) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0xF3F3) + Hash(0x20),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0xFDFD) + Hash(0x20),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0xF3F3) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0xF3F3) + Hash(0x10),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0xF3F3) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0xF3F3) + Hash(0x100),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0xF3F3) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0xF3F3) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0xF3FD) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0xFDFD) + Hash(0x10),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0xFDFD) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0xFDFD) + Hash(0x100),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0xFDFD) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0xF2) + Hash(0xFDFD) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0xF3F3) + Hash(0x20),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0xFDFD) + Hash(0x20),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0xF3F3) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0xF3F3) + Hash(0x10),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0xF3F3) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0xF3F3) + Hash(0x100),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0xF3F3) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0xF3F3) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0xF3FD) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0xFDFD) + Hash(0x10),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0xFDFD) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0xFDFD) + Hash(0x100),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0xFDFD) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0xF4) + Hash(0xFDFD) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0xF3F3) + Hash(0x20),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0xFDFD) + Hash(0x20),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0xF3F3) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0xF3F3) + Hash(0x10),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0xF3F3) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0xF3F3) + Hash(0x100),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0xF3F3) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0xF3F3) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0xF3FD) + Hash(0x1),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0xFDFD) + Hash(0x10),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0xFDFD) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0xFDFD) + Hash(0x100),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0xFDFD) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0xFA) + Hash(0xFDFD) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0x11F1) + Hash(0xF3F3) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x11F1) + Hash(0xFDFD) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x11F1) + Hash(0xF3F3) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x11F1) + Hash(0xF3F3) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x11F1) + Hash(0xF3F3) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0x11F1) + Hash(0xF3F3) + Hash(0x100),
+        Bytes("048071d3") + Hash(0x11F1) + Hash(0xF3F3) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0x11F1) + Hash(0xF3F3) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0x11F1) + Hash(0xF3FD) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x11F1) + Hash(0xFDFD) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x11F1) + Hash(0xFDFD) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0x11F1) + Hash(0xFDFD) + Hash(0x100),
+        Bytes("048071d3") + Hash(0x11F1) + Hash(0xFDFD) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0x11F1) + Hash(0xFDFD) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0x11F2) + Hash(0xF3F3) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x11F2) + Hash(0xFDFD) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x11F2) + Hash(0xF3F3) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x11F2) + Hash(0xF3F3) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x11F2) + Hash(0xF3F3) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0x11F2) + Hash(0xF3F3) + Hash(0x100),
+        Bytes("048071d3") + Hash(0x11F2) + Hash(0xF3F3) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0x11F2) + Hash(0xF3F3) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0x11F2) + Hash(0xF3FD) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x11F2) + Hash(0xFDFD) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x11F2) + Hash(0xFDFD) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0x11F2) + Hash(0xFDFD) + Hash(0x100),
+        Bytes("048071d3") + Hash(0x11F2) + Hash(0xFDFD) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0x11F2) + Hash(0xFDFD) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0x11F4) + Hash(0xF3F3) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x11F4) + Hash(0xFDFD) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x11F4) + Hash(0xF3F3) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x11F4) + Hash(0xF3F3) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x11F4) + Hash(0xF3F3) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0x11F4) + Hash(0xF3F3) + Hash(0x100),
+        Bytes("048071d3") + Hash(0x11F4) + Hash(0xF3F3) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0x11F4) + Hash(0xF3F3) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0x11F4) + Hash(0xF3FD) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x11F4) + Hash(0xFDFD) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x11F4) + Hash(0xFDFD) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0x11F4) + Hash(0xFDFD) + Hash(0x100),
+        Bytes("048071d3") + Hash(0x11F4) + Hash(0xFDFD) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0x11F4) + Hash(0xFDFD) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0x11FA) + Hash(0xF3F3) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x11FA) + Hash(0xFDFD) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x11FA) + Hash(0xF3F3) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x11FA) + Hash(0xF3F3) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x11FA) + Hash(0xF3F3) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0x11FA) + Hash(0xF3F3) + Hash(0x100),
+        Bytes("048071d3") + Hash(0x11FA) + Hash(0xF3F3) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0x11FA) + Hash(0xF3F3) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0x11FA) + Hash(0xF3FD) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x11FA) + Hash(0xFDFD) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x11FA) + Hash(0xFDFD) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0x11FA) + Hash(0xFDFD) + Hash(0x100),
+        Bytes("048071d3") + Hash(0x11FA) + Hash(0xFDFD) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0x11FA) + Hash(0xFDFD) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0x11F0) + Hash(0xF3F3) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x11F0) + Hash(0xFDFD) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x11F0) + Hash(0xF3F3) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x11F0) + Hash(0xF3F3) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x11F0) + Hash(0xF3F3) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0x11F0) + Hash(0xF3F3) + Hash(0x100),
+        Bytes("048071d3") + Hash(0x11F0) + Hash(0xF3F3) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0x11F0) + Hash(0xF3F3) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0x11F0) + Hash(0xF3FD) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x11F0) + Hash(0xFDFD) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x11F0) + Hash(0xFDFD) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0x11F0) + Hash(0xFDFD) + Hash(0x100),
+        Bytes("048071d3") + Hash(0x11F0) + Hash(0xFDFD) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0x11F0) + Hash(0xFDFD) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0x11F5) + Hash(0xF3F3) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x11F5) + Hash(0xFDFD) + Hash(0x20),
+        Bytes("048071d3") + Hash(0x11F5) + Hash(0xF3F3) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x11F5) + Hash(0xF3F3) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x11F5) + Hash(0xF3F3) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0x11F5) + Hash(0xF3F3) + Hash(0x100),
+        Bytes("048071d3") + Hash(0x11F5) + Hash(0xF3F3) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0x11F5) + Hash(0xF3F3) + Hash(0x1000),
+        Bytes("048071d3") + Hash(0x11F5) + Hash(0xF3FD) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x11F5) + Hash(0xFDFD) + Hash(0x10),
+        Bytes("048071d3") + Hash(0x11F5) + Hash(0xFDFD) + Hash(0xFF),
+        Bytes("048071d3") + Hash(0x11F5) + Hash(0xFDFD) + Hash(0x100),
+        Bytes("048071d3") + Hash(0x11F5) + Hash(0xFDFD) + Hash(0xFFF),
+        Bytes("048071d3") + Hash(0x11F5) + Hash(0xFDFD) + Hash(0x1000),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
         nonce=1,
-        value=1,
     )
 
-    post = expected_post
+    post = {target: Account(storage=_storage_with_any({0: 0}, [1]))}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_create_callprecompile_returndatasize.py b/tests/ported_static/stReturnDataTest/test_create_callprecompile_returndatasize.py
index ed334002301..b220fda28c6 100644
--- a/tests/ported_static/stReturnDataTest/test_create_callprecompile_returndatasize.py
+++ b/tests/ported_static/stReturnDataTest/test_create_callprecompile_returndatasize.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_create_callprecompile_returndatasize.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-create_callprecompile_returndatasizeFiller.json
+state_tests/stReturnDataTest/create_callprecompile_returndatasizeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/create_callprecompile_returndatasizeFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/create_callprecompile_returndatasizeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_create_callprecompile_returndatasize(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_create_callprecompile_returndatasize."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,64 +45,53 @@ def test_create_callprecompile_returndatasize(
         gas_limit=111669149696,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9898dd5e5c526b55ec49b1047e298705c13279f1"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (seq (CREATE 0 0 (lll (seq (mstore 0 0x112233) (CALL 0x9000 4 0 0 32 0 32) (SSTORE 0 (RETURNDATASIZE)) (RETURN 0 32) (STOP) ) 0)) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x23]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x15, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE)
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(offset=0x0, value=0x112233)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x9000,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x23]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x15, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE)
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=0x112233)
+        + Op.POP(
+            Op.CALL(
+                gas=0x9000,
+                address=0x4,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
             )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP * 2,
+        storage={0: 1},
         nonce=0,
-        address=Address("0xa2412b1e2a1e23e8fd87f52566c8a89f48682676"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        Address("0xf234137fe508cc371f3da359ab482e4138d0b0c9"): Account(
-            storage={0: 32},
-        ),
-    }
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_modexp_modsize0_returndatasize.py b/tests/ported_static/stReturnDataTest/test_modexp_modsize0_returndatasize.py
index 0d3573a8561..b5f159459d4 100644
--- a/tests/ported_static/stReturnDataTest/test_modexp_modsize0_returndatasize.py
+++ b/tests/ported_static/stReturnDataTest/test_modexp_modsize0_returndatasize.py
@@ -1,21 +1,25 @@
 """
-Test ported from static filler.
+Test_modexp_modsize0_returndatasize.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-modexp_modsize0_returndatasizeFiller.json
+state_tests/stReturnDataTest/modexp_modsize0_returndatasizeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,66 +27,56 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stReturnDataTest/modexp_modsize0_returndatasizeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stReturnDataTest/modexp_modsize0_returndatasizeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",  # noqa: E501
-            {
-                Address("0x4263c26963e4c1dd1cb69c116009e749f9e4eec2"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001010101",  # noqa: E501
-            {
-                Address("0x4263c26963e4c1dd1cb69c116009e749f9e4eec2"): Account(
-                    storage={1: 1, 3: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000064000000000000000000000000000000000000000000000000000000000000006400000000000000000000000000000000000000000000000000000000000000645442ddc2b70f66c1f6d2b296c0a875be7eddd0a80958cbc7425f1899ccf90511a5c318226e48ee23f130b44dc17a691ce66be5da18b85ed7943535b205aa125e9f59294a00f05155c23e97dac6b3a00b0c63c8411bf815fc183b420b4d9dc5f715040d5c60957f52d334b843197adec58c131c907cd96059fc5adce9dda351b5df3d666fcf3eb63c46851c1816e323f2119ebdf5ef35",  # noqa: E501
-            {
-                Address("0x4263c26963e4c1dd1cb69c116009e749f9e4eec2"): Account(
-                    storage={1: 1, 3: 100}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100f536269e59acdb356459b59f1ea6acc924650f8f05dae101a3b463d33342dcc6265d1ba9465fd0f1106b3f03a4af0a0b553e8b6ba8682584ba19c3835430ff310904a717282064031bcf9185dd172dad65305ee0e61d0c638b0a0ef0f4e51653996020c2723faea116881e25fb3d554dbc51b180052c981fc79ca93567eb6ff0e619deeb2984ae3ca232523aa5bd21ea4f8caa12cb8cd90dbafb9bd6951dcaef0fc4a74d195f5341bc6c3d7217df82597b84c4e1bbef4f2ce8c32aedbd99430f4e1a59b886c4ceb9bf7a00a415c207f3a4ccf95d5483642f95a9b240806c508c29bb48de38c8e1229257d5d807229fb3708ad6ac619b133fd7c1fe3c375f90ce55689018465a8a3d7c08097d415c702e7f57fcd6de6ea55cca75c49b835c6c90172753948fbd5dee5a74a422e3169d0cf5665ffc9198dc7f3fa502da817f1c81af0843ef5bec2ca2e8f3e24a76ac7322dab5a5bda802b247f1cf5282936cd1cb115f40e71db8d62b58c7d6c0ae7c78888987c22ff6afae345ade859a9beb127d",  # noqa: E501
-            {
-                Address("0x4263c26963e4c1dd1cb69c116009e749f9e4eec2"): Account(
-                    storage={1: 1, 3: 256}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000f3f14010101",  # noqa: E501
-            {},
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3", "case4"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_modexp_modsize0_returndatasize(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x897B12D02D588D8A4FE16FF831CBD4459C6F62F8C845B0CCDD31CAF068C84A26
-    )
+    """Test_modexp_modsize0_returndatasize."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3635C9ADC5DEA00000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -93,153 +87,120 @@ def test_modexp_modsize0_returndatasize(
         gas_limit=100000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (CALLDATACOPY 0 0 (CALLDATASIZE)) [[1]] (CALLCODE (GAS) 5 0 0 (CALLDATASIZE) 1000 32) [[2]](MLOAD 1000) [[3]](RETURNDATASIZE) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATACOPY(dest_offset=0x0, offset=0x0, size=Op.CALLDATASIZE)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=Op.CALLDATASIZE,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x3E8))
-            + Op.SSTORE(key=0x3, value=Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
-        storage={0x3: 0xFFFFFFFF},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATACOPY(dest_offset=0x0, offset=0x0, size=Op.CALLDATASIZE)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x5,
+                value=0x0,
+                args_offset=0x0,
+                args_size=Op.CALLDATASIZE,
+                ret_offset=0x3E8,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x3E8))
+        + Op.SSTORE(key=0x3, value=Op.RETURNDATASIZE)
+        + Op.STOP,
+        storage={3: 0xFFFFFFFF},
         nonce=0,
-        address=Address("0x4263c26963e4c1dd1cb69c116009e749f9e4eec2"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=10000000,
-    )
-
-    post = expected_post
 
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stReturnDataTest/modexp_modsize0_returndatasizeFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",  # noqa: E501
-            {
-                Address("0x4263c26963e4c1dd1cb69c116009e749f9e4eec2"): Account(
-                    storage={1: 1}
-                )
-            },
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={1: 1, 2: 0, 3: 0})},
+        },
+        {
+            "indexes": {"data": 1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={1: 1, 2: 0, 3: 1})},
+        },
+        {
+            "indexes": {"data": 2, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={1: 1, 2: 0, 3: 100})},
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={1: 1, 2: 0, 3: 256})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(
+            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101"  # noqa: E501
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001010101",  # noqa: E501
-            {
-                Address("0x4263c26963e4c1dd1cb69c116009e749f9e4eec2"): Account(
-                    storage={1: 1, 3: 1}
-                )
-            },
+        Bytes(
+            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001010101"  # noqa: E501
         ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000064000000000000000000000000000000000000000000000000000000000000006400000000000000000000000000000000000000000000000000000000000000645442ddc2b70f66c1f6d2b296c0a875be7eddd0a80958cbc7425f1899ccf90511a5c318226e48ee23f130b44dc17a691ce66be5da18b85ed7943535b205aa125e9f59294a00f05155c23e97dac6b3a00b0c63c8411bf815fc183b420b4d9dc5f715040d5c60957f52d334b843197adec58c131c907cd96059fc5adce9dda351b5df3d666fcf3eb63c46851c1816e323f2119ebdf5ef35",  # noqa: E501
-            {
-                Address("0x4263c26963e4c1dd1cb69c116009e749f9e4eec2"): Account(
-                    storage={1: 1, 3: 100}
-                )
-            },
+        Bytes(
+            "0000000000000000000000000000000000000000000000000000000000000064000000000000000000000000000000000000000000000000000000000000006400000000000000000000000000000000000000000000000000000000000000645442ddc2b70f66c1f6d2b296c0a875be7eddd0a80958cbc7425f1899ccf90511a5c318226e48ee23f130b44dc17a691ce66be5da18b85ed7943535b205aa125e9f59294a00f05155c23e97dac6b3a00b0c63c8411bf815fc183b420b4d9dc5f715040d5c60957f52d334b843197adec58c131c907cd96059fc5adce9dda351b5df3d666fcf3eb63c46851c1816e323f2119ebdf5ef35"  # noqa: E501
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100f536269e59acdb356459b59f1ea6acc924650f8f05dae101a3b463d33342dcc6265d1ba9465fd0f1106b3f03a4af0a0b553e8b6ba8682584ba19c3835430ff310904a717282064031bcf9185dd172dad65305ee0e61d0c638b0a0ef0f4e51653996020c2723faea116881e25fb3d554dbc51b180052c981fc79ca93567eb6ff0e619deeb2984ae3ca232523aa5bd21ea4f8caa12cb8cd90dbafb9bd6951dcaef0fc4a74d195f5341bc6c3d7217df82597b84c4e1bbef4f2ce8c32aedbd99430f4e1a59b886c4ceb9bf7a00a415c207f3a4ccf95d5483642f95a9b240806c508c29bb48de38c8e1229257d5d807229fb3708ad6ac619b133fd7c1fe3c375f90ce55689018465a8a3d7c08097d415c702e7f57fcd6de6ea55cca75c49b835c6c90172753948fbd5dee5a74a422e3169d0cf5665ffc9198dc7f3fa502da817f1c81af0843ef5bec2ca2e8f3e24a76ac7322dab5a5bda802b247f1cf5282936cd1cb115f40e71db8d62b58c7d6c0ae7c78888987c22ff6afae345ade859a9beb127d",  # noqa: E501
-            {
-                Address("0x4263c26963e4c1dd1cb69c116009e749f9e4eec2"): Account(
-                    storage={1: 1, 3: 256}
-                )
-            },
+        Hash(0x100)
+        + Hash(0x100)
+        + Hash(0x100)
+        + Hash(
+            0xF536269E59ACDB356459B59F1EA6ACC924650F8F05DAE101A3B463D33342DCC6
+        )
+        + Hash(
+            0x265D1BA9465FD0F1106B3F03A4AF0A0B553E8B6BA8682584BA19C3835430FF31
+        )
+        + Hash(
+            0x904A717282064031BCF9185DD172DAD65305EE0E61D0C638B0A0EF0F4E51653
+        )
+        + Hash(
+            0x996020C2723FAEA116881E25FB3D554DBC51B180052C981FC79CA93567EB6FF0
+        )
+        + Hash(
+            0xE619DEEB2984AE3CA232523AA5BD21EA4F8CAA12CB8CD90DBAFB9BD6951DCAEF
+        )
+        + Hash(
+            0xFC4A74D195F5341BC6C3D7217DF82597B84C4E1BBEF4F2CE8C32AEDBD99430F
+        )
+        + Hash(
+            0x4E1A59B886C4CEB9BF7A00A415C207F3A4CCF95D5483642F95A9B240806C508C
+        )
+        + Hash(
+            0x29BB48DE38C8E1229257D5D807229FB3708AD6AC619B133FD7C1FE3C375F90CE
+        )
+        + Hash(
+            0x55689018465A8A3D7C08097D415C702E7F57FCD6DE6EA55CCA75C49B835C6C90
+        )
+        + Hash(
+            0x172753948FBD5DEE5A74A422E3169D0CF5665FFC9198DC7F3FA502DA817F1C81
+        )
+        + Hash(
+            0xAF0843EF5BEC2CA2E8F3E24A76AC7322DAB5A5BDA802B247F1CF5282936CD1CB
+        )
+        + Hash(
+            0x115F40E71DB8D62B58C7D6C0AE7C78888987C22FF6AFAE345ADE859A9BEB127D
         ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000f3f14010101",  # noqa: E501
-            {},
+        Bytes(
+            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000f3f14010101"  # noqa: E501
         ),
-    ],
-    ids=["case0", "case1", "case2", "case3", "case4"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_modexp_modsize0_returndatasize_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x897B12D02D588D8A4FE16FF831CBD4459C6F62F8C845B0CCDD31CAF068C84A26
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000000,
-    )
-
-    # Source: LLL
-    # { (CALLDATACOPY 0 0 (CALLDATASIZE)) [[1]] (CALLCODE (GAS) 5 0 0 (CALLDATASIZE) 1000 32) [[2]](MLOAD 1000) [[3]](RETURNDATASIZE) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATACOPY(dest_offset=0x0, offset=0x0, size=Op.CALLDATASIZE)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=Op.CALLDATASIZE,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x3E8))
-            + Op.SSTORE(key=0x3, value=Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
-        storage={0x3: 0xFFFFFFFF},
-        nonce=0,
-        address=Address("0x4263c26963e4c1dd1cb69c116009e749f9e4eec2"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    ]
+    tx_gas = [10000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=10000000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_0_0_following_successful_create.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_0_0_following_successful_create.py
index 947f9555070..c964d6505be 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_0_0_following_successful_create.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_0_0_following_successful_create.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_returndatacopy_0_0_following_successful_create.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatacopy_0_0_following_successful_createFiller.json
+state_tests/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_returndatacopy_0_0_following_successful_create(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_returndatacopy_0_0_following_successful_create."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,39 +47,34 @@ def test_returndatacopy_0_0_following_successful_create(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (CREATE 0 0 (lll (seq (SSTORE 0 1) (STOP)) 0)) (RETURNDATACOPY 0 0 0) (SSTORE 0 0) (STOP) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x7]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x1D, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE)
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x0)
-            + Op.SSTORE(key=0x0, value=0x0)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.SSTORE(key=0x0, value=0x1)
-            + Op.STOP
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x7]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x1D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE)
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x0)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.STOP * 2,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
     post = {
-        Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5"): Account(
-            storage={0: 1},
+        contract_0: Account(storage={0: 0}),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={0: 1}
         ),
     }
 
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_after_failing_callcode.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_after_failing_callcode.py
index 0da6b3c4d66..cc1baaf8c72 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_after_failing_callcode.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_after_failing_callcode.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_returndatacopy_after_failing_callcode.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatacopy_after_failing_callcodeFiller.json
+state_tests/stReturnDataTest/returndatacopy_after_failing_callcodeFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_after_failing_callcodeFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatacopy_after_failing_callcodeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_returndatacopy_after_failing_callcode(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_returndatacopy_after_failing_callcode."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x285D0814904BEBB3B4ADD3B531A07647C2D08F59)
     sender = EOA(
         key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
     )
-    callee = Address("0x285d0814904bebb3b4add3b531a07647c2d08f59")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,47 +49,45 @@ def test_returndatacopy_after_failing_callcode(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
-    # {  (CALLCODE 0 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0 0) (RETURNDATACOPY 0x0 0x0 32) (SSTORE 0 (MLOAD 0))}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x0,
-                    address=0x665521FD750490FD880EE369C267FCA44ED8A078,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0xFFFFFFFFFFFF},
-        nonce=0,
-        address=Address("0x24878b81dd27c2d76258b421acddf26835bc1484"),  # noqa: E501
-    )
-    pre[callee] = Account(balance=0x10000000, nonce=0)
-    # Source: raw bytecode
-    pre.deploy_contract(
+    pre[addr] = Account(balance=0x10000000)
+    pre[sender] = Account(balance=0x6400000000)
+    # Source: raw
+    # 0xfd
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.REVERT,
         balance=0x6400000000,
         nonce=0,
-        address=Address("0x665521fd750490fd880ee369c267fca44ed8a078"),  # noqa: E501
+        address=Address(0x665521FD750490FD880EE369C267FCA44ED8A078),  # noqa: E501
+    )
+    # Source: lll
+    # {  (CALLCODE 0 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0 0) (RETURNDATACOPY 0x0 0x0 32) (SSTORE 0 (MLOAD 0))}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0x0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 0xFFFFFFFFFFFF},
+        nonce=0,
+        address=Address(0x24878B81DD27C2D76258B421ACDDF26835BC1484),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 0xFFFFFFFFFFFF}),
-    }
+    post = {target: Account(storage={0: 0xFFFFFFFFFFFF})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_after_failing_create.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_after_failing_create.py
index 7b5ddc311b0..027801052a2 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_after_failing_create.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_after_failing_create.py
@@ -2,16 +2,15 @@
 Returndatacopy after failing create case due to 0xfd code.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatacopy_afterFailing_createFiller.json
+state_tests/stReturnDataTest/returndatacopy_afterFailing_createFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_afterFailing_createFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatacopy_afterFailing_createFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,10 +33,8 @@ def test_returndatacopy_after_failing_create(
     pre: Alloc,
 ) -> None:
     """Returndatacopy after failing create case due to 0xfd code."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,31 +45,26 @@ def test_returndatacopy_after_failing_create(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x600260005260206000fd) (create 0 22 10) (SSTORE 0 (RETURNDATASIZE)) (RETURNDATACOPY 0 0 32) (SSTORE 1 (MLOAD 0)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x600260005260206000FD)
-            + Op.POP(Op.CREATE(value=0x0, offset=0x16, size=0xA))
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x600260005260206000FD)
+        + Op.POP(Op.CREATE(value=0x0, offset=0x16, size=0xA))
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x1f2642dd423c1bac7e318ee8df07608c3216d725"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 32, 1: 2}),
-    }
+    post = {target: Account(storage={0: 32, 1: 2})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_after_failing_delegatecall.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_after_failing_delegatecall.py
index 0f44a12853b..0ae7ed51e33 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_after_failing_delegatecall.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_after_failing_delegatecall.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_returndatacopy_after_failing_delegatecall.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatacopy_after_failing_delegatecallFiller.json
+state_tests/stReturnDataTest/returndatacopy_after_failing_delegatecallFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_after_failing_delegatecallFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatacopy_after_failing_delegatecallFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_returndatacopy_after_failing_delegatecall(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_returndatacopy_after_failing_delegatecall."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x905C744ACAF4D8F5436C9C5E91E0626D44ADD821)
     sender = EOA(
         key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
     )
-    contract = Address("0x905c744acaf4d8f5436c9c5e91e0626d44add821")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,46 +49,48 @@ def test_returndatacopy_after_failing_delegatecall(
         gas_limit=111669149696,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x2710,
-                    address=0x665521FD750490FD880EE369C267FCA44ED8A078,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    pre[addr] = Account(balance=0x100000)
+    pre[sender] = Account(balance=0x6400000000)
+    # Source: raw
+    # 0xfd
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.REVERT,
+        balance=0x6400000000,
+        nonce=0,
+        address=Address(0x665521FD750490FD880EE369C267FCA44ED8A078),  # noqa: E501
+    )
+    # Source: lll
+    # { (DELEGATECALL 10000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0) (RETURNDATACOPY 0x0 0x0 32) ( SSTORE 0 (MLOAD 0))}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0x2710,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         storage={
-            0x0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
         },
         nonce=0,
-        address=Address("0x5242f2ad00427020024f504ae629e0576ca6a01a"),  # noqa: E501
+        address=Address(0x5242F2AD00427020024F504AE629E0576CA6A01A),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.REVERT,
-        balance=0x6400000000,
-        nonce=0,
-        address=Address("0x665521fd750490fd880ee369c267fca44ed8a078"),  # noqa: E501
-    )
-    pre[contract] = Account(balance=0x100000, nonce=0)
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=addr,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
     post = {
-        callee: Account(
+        addr_2: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_after_failing_staticcall.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_after_failing_staticcall.py
index 7a42110f985..909dbeba72b 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_after_failing_staticcall.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_after_failing_staticcall.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_returndatacopy_after_failing_staticcall.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatacopy_after_failing_staticcallFiller.json
+state_tests/stReturnDataTest/returndatacopy_after_failing_staticcallFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_after_failing_staticcallFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatacopy_after_failing_staticcallFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_returndatacopy_after_failing_staticcall(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_returndatacopy_after_failing_staticcall."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x905C744ACAF4D8F5436C9C5E91E0626D44ADD821)
     sender = EOA(
         key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
     )
-    callee_1 = Address("0x905c744acaf4d8f5436c9c5e91e0626d44add821")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,51 +49,50 @@ def test_returndatacopy_after_failing_staticcall(
         gas_limit=111669149696,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLER)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    pre[addr] = Account(balance=0x100000)
+    pre[sender] = Account(balance=0x6400000000)
+    # Source: lll
+    # { (MSTORE 0x0 (CALLER)) (RETURN 0 32) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLER)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
         balance=0x6400000000,
         nonce=0,
-        address=Address("0x52fd0cbc013ee33577eec035031dbc4489a1e0bd"),  # noqa: E501
+        address=Address(0x52FD0CBC013EE33577EEC035031DBC4489A1E0BD),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (STATICCALL 0 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0) (RETURNDATACOPY 0x0 0x0 32) ( SSTORE 0 (MLOAD 0))}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x0,
-                    address=0x52FD0CBC013EE33577EEC035031DBC4489A1E0BD,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         storage={
-            0x0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
         },
         nonce=0,
-        address=Address("0x7acae812141b61313bea3d8b33b2f9c69f4e6720"),  # noqa: E501
+        address=Address(0x7ACAE812141B61313BEA3D8B33B2F9C69F4E6720),  # noqa: E501
     )
-    pre[callee_1] = Account(balance=0x100000, nonce=0)
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_after_revert_in_staticcall.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_after_revert_in_staticcall.py
index 8536e4234d1..ef29d6c7990 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_after_revert_in_staticcall.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_after_revert_in_staticcall.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_returndatacopy_after_revert_in_staticcall.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatacopy_after_revert_in_staticcallFiller.json
+state_tests/stReturnDataTest/returndatacopy_after_revert_in_staticcallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_after_revert_in_staticcallFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatacopy_after_revert_in_staticcallFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_returndatacopy_after_revert_in_staticcall(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
-    callee_1 = Address("0x6c7410da158fa432392fcad5989e1b28280f99d8")
+    """Test_returndatacopy_after_revert_in_staticcall."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,53 +45,45 @@ def test_returndatacopy_after_revert_in_staticcall(
         gas_limit=111669149696,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLER)
-            + Op.REVERT(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    addr = pre.fund_eoa(amount=0x1000000)  # noqa: F841
+    # Source: lll
+    # { (MSTORE 0x0 (CALLER)) (REVERT 0 32) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLER)
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
         balance=0x6400000000,
         nonce=0,
-        address=Address("0x3706580d60f246111e3848ffba4f4ab76c9a01e8"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (STATICCALL 60000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0) (RETURNDATACOPY 0x0 0x0 32) ( SSTORE 0 (MLOAD 0))}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xEA60,
-                    address=0x3706580D60F246111E3848FFBA4F4AB76C9A01E8,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xEA60,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         storage={
-            0x0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
         },
         nonce=0,
-        address=Address("0x4bedf636cb41e5dcf09d038de843004824dfbb3a"),  # noqa: E501
     )
-    pre[callee_1] = Account(balance=0x1000000, nonce=0)
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(
-            storage={0: 0x4BEDF636CB41E5DCF09D038DE843004824DFBB3A},
-        ),
-    }
+    post = {target: Account(storage={0: target})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_after_successful_callcode.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_after_successful_callcode.py
index c349211cbcd..513523a49f7 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_after_successful_callcode.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_after_successful_callcode.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_returndatacopy_after_successful_callcode.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatacopy_after_successful_callcodeFiller.json
+state_tests/stReturnDataTest/returndatacopy_after_successful_callcodeFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_after_successful_callcodeFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatacopy_after_successful_callcodeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_returndatacopy_after_successful_callcode(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_returndatacopy_after_successful_callcode."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
     )
@@ -48,52 +48,51 @@ def test_returndatacopy_after_successful_callcode(
         gas_limit=111669149696,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0x6400000000)
+    # Source: lll
+    # { (MSTORE 0x0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (RETURN 0 32) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
         balance=0x6400000000,
         nonce=0,
-        address=Address("0x53b272d553d8179d017aae6f3badf0570743593a"),  # noqa: E501
+        address=Address(0x53B272D553D8179D017AAE6F3BADF0570743593A),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  (CALLCODE 60000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0 0) (RETURNDATACOPY 0x0 0x0 32) (SSTORE 0 (MLOAD 0))}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0xEA60,
-                    address=0x53B272D553D8179D017AAE6F3BADF0570743593A,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0xEA60,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0xFFFFFFFFFFFF},
+        )
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 0xFFFFFFFFFFFF},
         nonce=0,
-        address=Address("0x7e319028b16c006ecc1b068cce1a1c9b0b457b0d"),  # noqa: E501
+        address=Address(0x7E319028B16C006ECC1B068CCE1A1C9B0B457B0D),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_after_successful_delegatecall.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_after_successful_delegatecall.py
index d6e104d0314..15043eaf87a 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_after_successful_delegatecall.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_after_successful_delegatecall.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_returndatacopy_after_successful_delegatecall.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatacopy_after_successful_delegatecallFiller.json
+state_tests/stReturnDataTest/returndatacopy_after_successful_delegatecallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_after_successful_delegatecallFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatacopy_after_successful_delegatecallFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_returndatacopy_after_successful_delegatecall(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_returndatacopy_after_successful_delegatecall."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,52 +45,44 @@ def test_returndatacopy_after_successful_delegatecall(
         gas_limit=111669149696,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLER)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0x0 (CALLER)) (RETURN 0 32) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLER)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
         balance=0x6400000000,
         nonce=0,
-        address=Address("0x52fd0cbc013ee33577eec035031dbc4489a1e0bd"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (DELEGATECALL 60000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0) (RETURNDATACOPY 0x0 0x0 32) ( SSTORE 0 (MLOAD 0))}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xEA60,
-                    address=0x52FD0CBC013EE33577EEC035031DBC4489A1E0BD,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0xEA60,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         storage={
-            0x0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
         },
         nonce=0,
-        address=Address("0xb669c96e9e7ccfd69d0fd0ffcf9260e9d1e6f5c4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(
-            storage={0: 0xC102734F6A1E4747310179C0A0FC16E674AA901D},
-        ),
-    }
+    post = {target: Account(storage={0: sender})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_after_successful_staticcall.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_after_successful_staticcall.py
index 520666038a4..95a483a7e4a 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_after_successful_staticcall.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_after_successful_staticcall.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_returndatacopy_after_successful_staticcall.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatacopy_after_successful_staticcallFiller.json
+state_tests/stReturnDataTest/returndatacopy_after_successful_staticcallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_after_successful_staticcallFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatacopy_after_successful_staticcallFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_returndatacopy_after_successful_staticcall(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
-    callee_1 = Address("0x6c7410da158fa432392fcad5989e1b28280f99d8")
+    """Test_returndatacopy_after_successful_staticcall."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,53 +45,45 @@ def test_returndatacopy_after_successful_staticcall(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
+    addr = pre.fund_eoa(amount=0x1000000)  # noqa: F841
+    # Source: lll
+    # { (MSTORE 0x0 (CALLER)) (RETURN 0 32) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLER)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
+        balance=0x6400000000,
+        nonce=0,
+    )
+    # Source: lll
     # { (STATICCALL 60000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0) (RETURNDATACOPY 0x0 0x0 32) ( SSTORE 0 (MLOAD 0))}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xEA60,
-                    address=0x52FD0CBC013EE33577EEC035031DBC4489A1E0BD,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xEA60,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         storage={
-            0x0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
         },
         nonce=0,
-        address=Address("0x4bedf636cb41e5dcf09d038de843004824dfbb3a"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLER)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
-        balance=0x6400000000,
-        nonce=0,
-        address=Address("0x52fd0cbc013ee33577eec035031dbc4489a1e0bd"),  # noqa: E501
     )
-    pre[callee_1] = Account(balance=0x1000000, nonce=0)
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(
-            storage={0: 0x4BEDF636CB41E5DCF09D038DE843004824DFBB3A},
-        ),
-    }
+    post = {target: Account(storage={0: target})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_following_call.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_following_call.py
index a0e150d6bb2..68bd5870c13 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_following_call.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_following_call.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_returndatacopy_following_call.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatacopy_following_callFiller.json
+state_tests/stReturnDataTest/returndatacopy_following_callFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_following_callFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stReturnDataTest/returndatacopy_following_callFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,8 +31,8 @@ def test_returndatacopy_following_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_returndatacopy_following_call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
     )
@@ -48,51 +46,50 @@ def test_returndatacopy_following_call(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
-    # { (seq (CALL 0x0900000000 <contract:0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0 0) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x900000000,
-                    address=0x9898DD5E5C526B55EC49B1047E298705C13279F1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    pre[sender] = Account(balance=0x6400000000)
+    # Source: lll
+    # { (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2faf9d2a81304665c9a06a42935ddc42b24f488b"),  # noqa: E501
+        address=Address(0x9898DD5E5C526B55EC49B1047E298705C13279F1),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+    # Source: lll
+    # { (seq (CALL 0x0900000000 <contract:0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0 0) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) )}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x900000000,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+        )
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x9898dd5e5c526b55ec49b1047e298705c13279f1"),  # noqa: E501
+        address=Address(0x2FAF9D2A81304665C9A06A42935DDC42B24F488B),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
             },
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_following_create.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_following_create.py
index bdb34d60c10..80fa6443230 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_following_create.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_following_create.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_returndatacopy_following_create.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatacopy_following_createFiller.json
+state_tests/stReturnDataTest/returndatacopy_following_createFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_following_createFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatacopy_following_createFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_returndatacopy_following_create(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_returndatacopy_following_create."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,54 +45,45 @@ def test_returndatacopy_following_create(
         gas_limit=111669149696,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
-            )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9898dd5e5c526b55ec49b1047e298705c13279f1"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (seq (create (STOP)) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) )}
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x0, value=Op.MSIZE)
-            + Op.PUSH1[0x2]
-            + Op.CODECOPY(
-                dest_offset=Op.MLOAD(offset=0x0),
-                offset=0x28,
-                size=Op.DUP1,
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE)
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.INVALID
-            + Op.STOP
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x0, value=Op.MSIZE)
+        + Op.PUSH1[0x2]
+        + Op.CODECOPY(
+            dest_offset=Op.MLOAD(offset=0x0), offset=0x28, size=Op.DUP1
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.PUSH1[0x0]
+        + Op.POP(Op.CREATE)
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP
+        + Op.INVALID
+        + Op.STOP * 2,
+        storage={0: 1},
         nonce=0,
-        address=Address("0xb2f12f3b77dad19c11029cb8ee4eecb144e05ad3"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_following_failing_call.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_following_failing_call.py
index 9e2bd76e78c..81196af2f6b 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_following_failing_call.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_following_failing_call.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_returndatacopy_following_failing_call.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatacopy_following_failing_callFiller.json
+state_tests/stReturnDataTest/returndatacopy_following_failing_callFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_following_failing_callFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatacopy_following_failing_callFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_returndatacopy_following_failing_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_returndatacopy_following_failing_call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,45 +45,40 @@ def test_returndatacopy_following_failing_call(
         gas_limit=111669149696,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0xfd
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.REVERT,
         nonce=0,
-        address=Address("0x3141bb954e8294e47a14ebd08229f30e6294ba83"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (CALL 0x0900000000 <contract:0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0 0) (RETURNDATACOPY 0 1 32) (SSTORE 0 (MLOAD 0)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x900000000,
-                    address=0x3141BB954E8294E47A14EBD08229F30E6294BA83,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x900000000,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x1, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+        )
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x1, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x71a277f82c43ff98682eb8d6db4a3ecd680407eb"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_following_revert.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_following_revert.py
index 683e2ec1014..d9dfc787585 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_following_revert.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_following_revert.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_returndatacopy_following_revert.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatacopy_following_revertFiller.json
+state_tests/stReturnDataTest/returndatacopy_following_revertFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_following_revertFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatacopy_following_revertFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_returndatacopy_following_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_returndatacopy_following_revert."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
     )
@@ -48,51 +48,50 @@ def test_returndatacopy_following_revert(
         gas_limit=111669149696,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
-            )
-            + Op.REVERT(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0x6400000000)
+    # Source: lll
+    # { (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (REVERT 0 32)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2159735ba26480adc67f0ee9d4a05e5405a5cf83"),  # noqa: E501
+        address=Address(0x2159735BA26480ADC67F0EE9D4A05E5405A5CF83),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (seq (CALL 0x0900000000 <contract:0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0 0) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x900000000,
-                    address=0x2159735BA26480ADC67F0EE9D4A05E5405A5CF83,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x900000000,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+        )
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x2faf9d2a81304665c9a06a42935ddc42b24f488b"),  # noqa: E501
+        address=Address(0x2FAF9D2A81304665C9A06A42935DDC42B24F488B),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
             },
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_following_revert_in_create.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_following_revert_in_create.py
index 4ca2c1a63e1..868ae13c14e 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_following_revert_in_create.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_following_revert_in_create.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_returndatacopy_following_revert_in_create.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatacopy_following_revert_in_createFiller.json
+state_tests/stReturnDataTest/returndatacopy_following_revert_in_createFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_following_revert_in_createFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatacopy_following_revert_in_createFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_returndatacopy_following_revert_in_create(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_returndatacopy_following_revert_in_create."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
     )
@@ -48,42 +48,38 @@ def test_returndatacopy_following_revert_in_create(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0x6400000000)
+    # Source: lll
     # { (seq (CREATE 0 0 (lll (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (REVERT 0 32) (STOP) ) 0)) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) (STOP) )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x29]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x1E, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE)
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
-            )
-            + Op.REVERT(offset=0x0, size=0x20)
-            + Op.STOP
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x29]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x1E, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE)
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x70b8403604734d52990000d1503d165b056dc00a"),  # noqa: E501
+        address=Address(0x70B8403604734D52990000D1503D165B056DC00A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
             },
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_following_successful_create.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_following_successful_create.py
index e26e8357441..997d56258ec 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_following_successful_create.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_following_successful_create.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_returndatacopy_following_successful_create.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatacopy_following_successful_createFiller.json
+state_tests/stReturnDataTest/returndatacopy_following_successful_createFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_following_successful_createFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatacopy_following_successful_createFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_returndatacopy_following_successful_create(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_returndatacopy_following_successful_create."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,42 +45,34 @@ def test_returndatacopy_following_successful_create(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (create (STOP)) (RETURNDATACOPY 0 1 32) (SSTORE 0 (MLOAD 0)) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x0, value=Op.MSIZE)
-            + Op.PUSH1[0x2]
-            + Op.CODECOPY(
-                dest_offset=Op.MLOAD(offset=0x0),
-                offset=0x28,
-                size=Op.DUP1,
-            )
-            + Op.MLOAD(offset=0x0)
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE)
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x1, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-            + Op.INVALID
-            + Op.STOP
-            + Op.STOP
-        ),
-        storage={0x0: 0x2},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x0, value=Op.MSIZE)
+        + Op.PUSH1[0x2]
+        + Op.CODECOPY(
+            dest_offset=Op.MLOAD(offset=0x0), offset=0x28, size=Op.DUP1
+        )
+        + Op.MLOAD(offset=0x0)
+        + Op.PUSH1[0x0]
+        + Op.POP(Op.CREATE)
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x1, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP
+        + Op.INVALID
+        + Op.STOP * 2,
+        storage={0: 2},
         nonce=0,
-        address=Address("0xbabe109963095efa4c742d15426f841a7033d6aa"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 2}),
-    }
+    post = {target: Account(storage={0: 2})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_following_too_big_transfer.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_following_too_big_transfer.py
index 7a3cadfacdc..e3dd5b68dbb 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_following_too_big_transfer.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_following_too_big_transfer.py
@@ -1,17 +1,16 @@
 """
-Test tries RETURNDATACOPY with a non-zero size after a CALL that fails...
+Test: this test tries RETURNDATACOPY with a non-zero size after a CALL...
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatacopy_following_too_big_transferFiller.json
+state_tests/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_returndatacopy_following_too_big_transfer(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test tries RETURNDATACOPY with a non-zero size after a CALL that..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test: tis test tries RETURNDATACOPY with a non-zero size after a CALL..."""  # noqa: E501
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,51 +45,45 @@ def test_returndatacopy_following_too_big_transfer(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
-    # { (seq (CALL 0x0900000000 <contract:0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6> 10000000 0 0 0 0) (RETURNDATACOPY 0 0 32) (SSTORE 0 200) )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x900000000,
-                    address=0x9898DD5E5C526B55EC49B1047E298705C13279F1,
-                    value=0x989680,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=0xC8)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    # Source: lll
+    # { (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x386e9fc96c1e60f449c2df320f37545cca30f58d"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+    # Source: lll
+    # { (seq (CALL 0x0900000000 <contract:0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6> 10000000 0 0 0 0) (RETURNDATACOPY 0 0 32) (SSTORE 0 200) )}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x900000000,
+                address=addr,
+                value=0x989680,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+        )
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=0xC8)
+        + Op.STOP,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x9898dd5e5c526b55ec49b1047e298705c13279f1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_initial.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_initial.py
index 463d7d68db5..57f9089b05f 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_initial.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_initial.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_returndatacopy_initial.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest/returndatacopy_initialFiller.json
+state_tests/stReturnDataTest/returndatacopy_initialFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_initialFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stReturnDataTest/returndatacopy_initialFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_returndatacopy_initial(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_returndatacopy_initial."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,30 +43,25 @@ def test_returndatacopy_initial(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x112233445566778899aabbccddeeff) (RETURNDATACOPY 0 0 32) (SSTORE 0 (MLOAD 0)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x112233445566778899AABBCCDDEEFF)
-            + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x112233445566778899AABBCCDDEEFF)
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7d970b9ad2e5f64518ff774031441f22b78be4c7"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_initial_256.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_initial_256.py
index a3daf44e38a..30e351e733b 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_initial_256.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_initial_256.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_returndatacopy_initial_256.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest/returndatacopy_initial_256Filler.json
+state_tests/stReturnDataTest/returndatacopy_initial_256Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +23,44 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_initial_256Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stReturnDataTest/returndatacopy_initial_256Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "0000000000000000000000000000000000000000000000000000000000000064",
-        "0000000000000000000000000000000000000000000000000000000000000063",
-        "0000000000000000000000000000000000000000000000000000000000000065",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_returndatacopy_initial_256(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_returndatacopy_initial_256."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,37 +71,36 @@ def test_returndatacopy_initial_256(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (RETURNDATACOPY (- 0 (CALLDATALOAD 0)) 0 0x64) (MSTORE 0 0x112233445566778899aabbccddeeff) (SSTORE 0 (MLOAD 0)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.RETURNDATACOPY(
-                dest_offset=Op.SUB(0x0, Op.CALLDATALOAD(offset=0x0)),
-                offset=0x0,
-                size=0x64,
-            )
-            + Op.MSTORE(offset=0x0, value=0x112233445566778899AABBCCDDEEFF)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURNDATACOPY(
+            dest_offset=Op.SUB(0x0, Op.CALLDATALOAD(offset=0x0)),
+            offset=0x0,
+            size=0x64,
+        )
+        + Op.MSTORE(offset=0x0, value=0x112233445566778899AABBCCDDEEFF)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x28f194b678152b435b5910dbdf69c091fa056347"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(0x64),
+        Hash(0x63),
+        Hash(0x65),
+    ]
+    tx_gas = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_initial_big_sum.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_initial_big_sum.py
index a8680cd6470..02be12ee8d9 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_initial_big_sum.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_initial_big_sum.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_returndatacopy_initial_big_sum.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatacopy_initial_big_sumFiller.json
+state_tests/stReturnDataTest/returndatacopy_initial_big_sumFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_initial_big_sumFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stReturnDataTest/returndatacopy_initial_big_sumFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_returndatacopy_initial_big_sum(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_returndatacopy_initial_big_sum."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,34 +43,27 @@ def test_returndatacopy_initial_big_sum(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x112233445566778899aabbccddeeff) (RETURNDATACOPY 0 (EXP 2 63) (EXP 2 63)) (SSTORE 0 (MLOAD 0)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x112233445566778899AABBCCDDEEFF)
-            + Op.RETURNDATACOPY(
-                dest_offset=0x0,
-                offset=Op.EXP(0x2, 0x3F),
-                size=Op.EXP(0x2, 0x3F),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x112233445566778899AABBCCDDEEFF)
+        + Op.RETURNDATACOPY(
+            dest_offset=0x0, offset=Op.EXP(0x2, 0x3F), size=Op.EXP(0x2, 0x3F)
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3c975790c6cbb489ae5eaf7af45202f98dffccdf"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatacopy_overrun.py b/tests/ported_static/stReturnDataTest/test_returndatacopy_overrun.py
index 09b6a7ab02a..3ba3a5f8f16 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatacopy_overrun.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatacopy_overrun.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_returndatacopy_overrun.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest/returndatacopy_overrunFiller.json
+state_tests/stReturnDataTest/returndatacopy_overrunFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stReturnDataTest/returndatacopy_overrunFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stReturnDataTest/returndatacopy_overrunFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_returndatacopy_overrun(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_returndatacopy_overrun."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,55 +43,49 @@ def test_returndatacopy_overrun(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
-    # { (seq (CALL 0x0900000000 <contract:0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0 0) (RETURNDATACOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc 100) (SSTORE 0 (MLOAD 0)) )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x900000000,
-                    address=0x9898DD5E5C526B55EC49B1047E298705C13279F1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.RETURNDATACOPY(
-                dest_offset=0x0,
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
-                size=0x64,
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    # Source: lll
+    # { (seq (MSTORE 0 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff) (RETURN 0 32)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x36e328acf112f37630c605bb27c130c5646d2915"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+    # Source: lll
+    # { (seq (CALL 0x0900000000 <contract:0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0 0) (RETURNDATACOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc 100) (SSTORE 0 (MLOAD 0)) )}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x900000000,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+        )
+        + Op.RETURNDATACOPY(
+            dest_offset=0x0,
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
+            size=0x64,
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x9898dd5e5c526b55ec49b1047e298705c13279f1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatasize_after_failing_callcode.py b/tests/ported_static/stReturnDataTest/test_returndatasize_after_failing_callcode.py
index 9f98d8813aa..de632358bed 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatasize_after_failing_callcode.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatasize_after_failing_callcode.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_returndatasize_after_failing_callcode.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatasize_after_failing_callcodeFiller.json
+state_tests/stReturnDataTest/returndatasize_after_failing_callcodeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatasize_after_failing_callcodeFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatasize_after_failing_callcodeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_returndatasize_after_failing_callcode(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
-    callee = Address("0x285d0814904bebb3b4add3b531a07647c2d08f59")
+    """Test_returndatasize_after_failing_callcode."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,44 +45,41 @@ def test_returndatasize_after_failing_callcode(
         gas_limit=111669149696,
     )
 
-    pre[callee] = Account(balance=0x10000000, nonce=0)
-    # Source: raw bytecode
-    pre.deploy_contract(
+    addr = pre.fund_eoa(amount=0x10000000)  # noqa: F841
+    # Source: raw
+    # 0xfd
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.REVERT,
         balance=0x6400000000,
         nonce=0,
-        address=Address("0x665521fd750490fd880ee369c267fca44ed8a078"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (seq (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0 0) (SSTORE 0 (RETURNDATASIZE)))}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0x665521FD750490FD880EE369C267FCA44ED8A078,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0x186A0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
-        storage={0x0: 0xFFFFFFFF},
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP,
+        storage={0: 0xFFFFFFFF},
         nonce=0,
-        address=Address("0x716e4812f69c442687f8917638e10bbe6eb00592"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=200000,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatasize_after_failing_delegatecall.py b/tests/ported_static/stReturnDataTest/test_returndatasize_after_failing_delegatecall.py
index 82938b77e38..0a551cfeadc 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatasize_after_failing_delegatecall.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatasize_after_failing_delegatecall.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_returndatasize_after_failing_delegatecall.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatasize_after_failing_delegatecallFiller.json
+state_tests/stReturnDataTest/returndatasize_after_failing_delegatecallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatasize_after_failing_delegatecallFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatasize_after_failing_delegatecallFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_returndatasize_after_failing_delegatecall(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
-    callee_1 = Address("0x6c7410da158fa432392fcad5989e1b28280f99d8")
+    """Test_returndatasize_after_failing_delegatecall."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,45 +45,42 @@ def test_returndatasize_after_failing_delegatecall(
         gas_limit=111669149696,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
+    addr = pre.fund_eoa(amount=0x1000000)  # noqa: F841
+    # Source: raw
+    # 0xfd
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.REVERT,
         balance=0x6400000000,
         nonce=0,
-        address=Address("0x665521fd750490fd880ee369c267fca44ed8a078"),  # noqa: E501
     )
-    pre[callee_1] = Account(balance=0x1000000, nonce=0)
-    # Source: LLL
+    # Source: lll
     # { (seq (DELEGATECALL 10000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0) (SSTORE 0 (RETURNDATASIZE)))}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x2710,
-                    address=0x665521FD750490FD880EE369C267FCA44ED8A078,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0x2710,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP,
         storage={
-            0x0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
         },
         nonce=0,
-        address=Address("0xacb6ad74f94ea8c5a482f1e89d1c0946600a9888"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatasize_after_failing_staticcall.py b/tests/ported_static/stReturnDataTest/test_returndatasize_after_failing_staticcall.py
index 025a0e104f7..9b36f269ef6 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatasize_after_failing_staticcall.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatasize_after_failing_staticcall.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_returndatasize_after_failing_staticcall.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatasize_after_failing_staticcallFiller.json
+state_tests/stReturnDataTest/returndatasize_after_failing_staticcallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatasize_after_failing_staticcallFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatasize_after_failing_staticcallFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_returndatasize_after_failing_staticcall(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
-    callee_1 = Address("0x905c744acaf4d8f5436c9c5e91e0626d44add821")
+    """Test_returndatasize_after_failing_staticcall."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,45 +45,42 @@ def test_returndatasize_after_failing_staticcall(
         gas_limit=111669149696,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
+    addr = pre.fund_eoa(amount=0x100000)  # noqa: F841
+    # Source: raw
+    # 0xfd
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.REVERT,
         balance=0x6400000000,
         nonce=0,
-        address=Address("0x665521fd750490fd880ee369c267fca44ed8a078"),  # noqa: E501
     )
-    pre[callee_1] = Account(balance=0x100000, nonce=0)
-    # Source: LLL
+    # Source: lll
     # { (seq (STATICCALL 60000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0) (SSTORE 0 (RETURNDATASIZE)))}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xEA60,
-                    address=0x665521FD750490FD880EE369C267FCA44ED8A078,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xEA60,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP,
         storage={
-            0x0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
         },
         nonce=0,
-        address=Address("0xb59b41f3a1359dd85455601db8e79f621d7e63f6"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatasize_after_oog_after_deeper.py b/tests/ported_static/stReturnDataTest/test_returndatasize_after_oog_after_deeper.py
index 5c03d0bc7f3..ef7389b390c 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatasize_after_oog_after_deeper.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatasize_after_oog_after_deeper.py
@@ -1,17 +1,16 @@
 """
-transaction calls A (CALL B(CALL C(RETURN) OOG) 'check buffers').
+Transaction calls A (CALL B(CALL C(RETURN) OOG) 'check buffers').
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatasize_after_oog_after_deeperFiller.json
+state_tests/stReturnDataTest/returndatasize_after_oog_after_deeperFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatasize_after_oog_after_deeperFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatasize_after_oog_after_deeperFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,11 +33,8 @@ def test_returndatasize_after_oog_after_deeper(
     pre: Alloc,
 ) -> None:
     """Transaction calls A (CALL B(CALL C(RETURN) OOG) 'check buffers')."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x987C63506890B18862BD2304513F21B726A7E35961C9214954326694141FDB46
-    )
-    callee_1 = Address("0xbda572e15071b6ab42cfec01423f1fbb1de68703")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x100000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,76 +45,67 @@ def test_returndatasize_after_oog_after_deeper(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
-    # { (seq (SSTORE 2 (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0 32)) (SSTORE 0 (RETURNDATASIZE))) (SSTORE 1 (MLOAD 0))}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0xCB33B9A773995316746A40201081D054635D02DA,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={
-            0x0: 0xFFFFFFFF,
-            0x1: 0xFFFFFFFF,
-            0x2: 0xFFFFFFFF,
-        },
-        nonce=0,
-        address=Address("0x58eaa3041ad52c24e38e485222953f1cc19c7484"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x100000000000)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xFF)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    addr = pre.fund_eoa(amount=0x1000000000)  # noqa: F841
+    # Source: lll
+    # { (seq (MSTORE 0 255) (RETURN 0 32) )}
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xFF)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8e0c75135225713d8c9acbb889abba5a5f598920"),  # noqa: E501
     )
-    pre[callee_1] = Account(balance=0x1000000000, nonce=0)
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x186A0,
-                    address=0x8E0C75135225713D8C9ACBB889ABBA5A5F598920,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # { (seq (CALL 100000 <contract:0xbb00000000000000000000000000000000000000> 0 0 0 0 0) (while 1 (SSTORE 0 1)) )}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x186A0,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x34, condition=Op.ISZERO(0x1))
-            + Op.SSTORE(key=0x0, value=0x1)
-            + Op.JUMP(pc=0x25)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x34, condition=Op.ISZERO(0x1))
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x25)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0x6400000000,
         nonce=0,
-        address=Address("0xcb33b9a773995316746a40201081d054635d02da"),  # noqa: E501
+    )
+    # Source: lll
+    # { (seq (SSTORE 2 (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0 32)) (SSTORE 0 (RETURNDATASIZE))) (SSTORE 1 (MLOAD 0))}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 0xFFFFFFFF, 1: 0xFFFFFFFF, 2: 0xFFFFFFFF},
+        nonce=0,
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=200000,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0, 1: 0, 2: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatasize_after_successful_callcode.py b/tests/ported_static/stReturnDataTest/test_returndatasize_after_successful_callcode.py
index 67f619b558a..e862fa26864 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatasize_after_successful_callcode.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatasize_after_successful_callcode.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_returndatasize_after_successful_callcode.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatasize_after_successful_callcodeFiller.json
+state_tests/stReturnDataTest/returndatasize_after_successful_callcodeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatasize_after_successful_callcodeFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatasize_after_successful_callcodeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_returndatasize_after_successful_callcode(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_returndatasize_after_successful_callcode."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,51 +45,45 @@ def test_returndatasize_after_successful_callcode(
         gas_limit=111669149696,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.RETURN(offset=0x0, size=0x6)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0x0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (RETURN 0 6) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.RETURN(offset=0x0, size=0x6)
+        + Op.STOP,
         balance=0x6400000000,
         nonce=0,
-        address=Address("0x0c6426ee9b84ce08176d8d295613a7d10c48576b"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
-    # Source: LLL
+    # Source: lll
     # { (seq (CALLCODE 60000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0 0) (SSTORE 0 (RETURNDATASIZE)))}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0xEA60,
-                    address=0xC6426EE9B84CE08176D8D295613A7D10C48576B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0xEA60,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
-        storage={0x0: 0x0},
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP,
+        storage={0: 0},
         nonce=0,
-        address=Address("0xc8005fec752ab6f5f4691bb1a54dcce7ee3d1eb9"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 6}),
-    }
+    post = {target: Account(storage={0: 6})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatasize_after_successful_delegatecall.py b/tests/ported_static/stReturnDataTest/test_returndatasize_after_successful_delegatecall.py
index 2cce09adbfa..fe1909c48d1 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatasize_after_successful_delegatecall.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatasize_after_successful_delegatecall.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_returndatasize_after_successful_delegatecall.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatasize_after_successful_delegatecallFiller.json
+state_tests/stReturnDataTest/returndatasize_after_successful_delegatecallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatasize_after_successful_delegatecallFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatasize_after_successful_delegatecallFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_returndatasize_after_successful_delegatecall(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_returndatasize_after_successful_delegatecall."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,49 +45,43 @@ def test_returndatasize_after_successful_delegatecall(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
+    # Source: lll
+    # { (MSTORE 0x0 (CALLER)) (RETURN 0 20) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLER)
+        + Op.RETURN(offset=0x0, size=0x14)
+        + Op.STOP,
+        balance=0x6400000000,
+        nonce=0,
+    )
+    # Source: lll
     # { (seq (DELEGATECALL 60000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0) (SSTORE 0 (RETURNDATASIZE)))}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xEA60,
-                    address=0x7C17DBBFA29DC8391BFA19022ECB4FDA54FC826A,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0xEA60,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP,
         storage={
-            0x0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
         },
         nonce=0,
-        address=Address("0x1c7cce7753e67952a031524e6505e53f170520be"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLER)
-            + Op.RETURN(offset=0x0, size=0x14)
-            + Op.STOP
-        ),
-        balance=0x6400000000,
-        nonce=0,
-        address=Address("0x7c17dbbfa29dc8391bfa19022ecb4fda54fc826a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 20}),
-    }
+    post = {target: Account(storage={0: 20})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatasize_after_successful_staticcall.py b/tests/ported_static/stReturnDataTest/test_returndatasize_after_successful_staticcall.py
index d043164ac1f..1725dba694e 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatasize_after_successful_staticcall.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatasize_after_successful_staticcall.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_returndatasize_after_successful_staticcall.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatasize_after_successful_staticcallFiller.json
+state_tests/stReturnDataTest/returndatasize_after_successful_staticcallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatasize_after_successful_staticcallFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatasize_after_successful_staticcallFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_returndatasize_after_successful_staticcall(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_returndatasize_after_successful_staticcall."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,52 +45,46 @@ def test_returndatasize_after_successful_staticcall(
         gas_limit=111669149696,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.RETURN(offset=0x0, size=0x6)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0x0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (RETURN 0 6) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.RETURN(offset=0x0, size=0x6)
+        + Op.STOP,
         balance=0x6400000000,
         nonce=0,
-        address=Address("0x0c6426ee9b84ce08176d8d295613a7d10c48576b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (seq (STATICCALL 60000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0) (SSTORE 0 (RETURNDATASIZE)))}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xEA60,
-                    address=0xC6426EE9B84CE08176D8D295613A7D10C48576B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xEA60,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP,
         storage={
-            0x0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
         },
         nonce=0,
-        address=Address("0xb59b41f3a1359dd85455601db8e79f621d7e63f6"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 6}),
-    }
+    post = {target: Account(storage={0: 6})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatasize_bug.py b/tests/ported_static/stReturnDataTest/test_returndatasize_bug.py
index 5bd2ce5f107..d19f6656947 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatasize_bug.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatasize_bug.py
@@ -1,16 +1,16 @@
 """
-RETURNDATASIZE after a failing CALL (due to insufficient balance) should...
+RETURNDATASIZE after a failing CALL (due to insufficient balance)...
 
 Ported from:
-tests/static/state_tests/stReturnDataTest/returndatasize_bugFiller.json
+state_tests/stReturnDataTest/returndatasize_bugFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stReturnDataTest/returndatasize_bugFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stReturnDataTest/returndatasize_bugFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,10 +31,8 @@ def test_returndatasize_bug(
     pre: Alloc,
 ) -> None:
     """RETURNDATASIZE after a failing CALL (due to insufficient balance)..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,56 +43,55 @@ def test_returndatasize_bug(
         gas_limit=111669149696,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0xA,
-                    address=0x1,
-                    value=0xC350,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # { (CALL 10 1 50000 0 0 0 0) (SSTORE 1 1) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0xA,
+                address=0x1,
+                value=0xC350,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0a6de4978faa392285cc6411dfe442872304deb1"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (CALL 1 <contract:0x1f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 50000 0 0 0 0) (SSTORE 0 (RETURNDATASIZE)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x1,
-                    address=0xA6DE4978FAA392285CC6411DFE442872304DEB1,
-                    value=0xC350,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x1,
+                address=addr,
+                value=0xC350,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP,
+        storage={0: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0d7bc2fbd330f7d4ec71764551a8b9cfb11619f5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={0: 0}),
+        addr: Account(storage={1: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatasize_following_successful_create.py b/tests/ported_static/stReturnDataTest/test_returndatasize_following_successful_create.py
index 92428a8186a..0fe11d444fb 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatasize_following_successful_create.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatasize_following_successful_create.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_returndatasize_following_successful_create.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatasize_following_successful_createFiller.json
+state_tests/stReturnDataTest/returndatasize_following_successful_createFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatasize_following_successful_createFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatasize_following_successful_createFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_returndatasize_following_successful_create(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_returndatasize_following_successful_create."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,36 +45,30 @@ def test_returndatasize_following_successful_create(
         gas_limit=111669149696,
     )
 
-    pre[sender] = Account(balance=0x6400000000)
-    # Source: LLL
+    # Source: lll
     # { (seq (CREATE 0 0 (lll (seq (mstore 0 0x112233) (RETURN 0 32) (STOP) ) 0)) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0xE]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x15, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE)
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(offset=0x0, value=0x112233)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0xE]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x15, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE)
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=0x112233)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP * 2,
+        storage={0: 1},
         nonce=0,
-        address=Address("0xe7e262ca8ef9761acca450874326b1f3f483a73f"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatasize_initial.py b/tests/ported_static/stReturnDataTest/test_returndatasize_initial.py
index 7f2bce3cde5..b347d992e05 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatasize_initial.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatasize_initial.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_returndatasize_initial.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest/returndatasize_initialFiller.json
+state_tests/stReturnDataTest/returndatasize_initialFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stReturnDataTest/returndatasize_initialFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stReturnDataTest/returndatasize_initialFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_returndatasize_initial(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_returndatasize_initial."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,23 +43,22 @@ def test_returndatasize_initial(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (SSTORE 0 (RETURNDATASIZE)) }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE) + Op.STOP,
-        storage={0x0: 0x1},
+        storage={0: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3a939fcca7da8b1332893bcca91690406f4b7a82"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_returndatasize_initial_zero_read.py b/tests/ported_static/stReturnDataTest/test_returndatasize_initial_zero_read.py
index 7ff1bd17242..13248ea8d42 100644
--- a/tests/ported_static/stReturnDataTest/test_returndatasize_initial_zero_read.py
+++ b/tests/ported_static/stReturnDataTest/test_returndatasize_initial_zero_read.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_returndatasize_initial_zero_read.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-returndatasize_initial_zero_readFiller.json
+state_tests/stReturnDataTest/returndatasize_initial_zero_readFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,39 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stReturnDataTest/returndatasize_initial_zero_readFiller.json",  # noqa: E501
+        "state_tests/stReturnDataTest/returndatasize_initial_zero_readFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        ("", {}),
-        ("992919aa", {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_returndatasize_initial_zero_read(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_returndatasize_initial_zero_read."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,30 +67,30 @@ def test_returndatasize_initial_zero_read(
         gas_limit=111669149696,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (RETURNDATACOPY 0 0 0) (SSTORE 0 (MLOAD 0)) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x0)
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x0)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x537cd1744af41c3a74d5aa5ae93958d1160ca98f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Bytes(""),
+        Bytes("992919aa"),
+    ]
+    tx_gas = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_revert_ret_data_size.py b/tests/ported_static/stReturnDataTest/test_revert_ret_data_size.py
index 4be4b2e40c6..d5094abc709 100644
--- a/tests/ported_static/stReturnDataTest/test_revert_ret_data_size.py
+++ b/tests/ported_static/stReturnDataTest/test_revert_ret_data_size.py
@@ -2,19 +2,21 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest/revertRetDataSizeFiller.yml
+state_tests/stReturnDataTest/revertRetDataSizeFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,352 +24,248 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stReturnDataTest/revertRetDataSizeFiller.yml"],
+    ["state_tests/stReturnDataTest/revertRetDataSizeFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f10000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000000200",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f50000000000000000000000000000000000000000000000000000000000000200",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f10000000000000000000000000000000000000000000000000000000000000300",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f20000000000000000000000000000000000000000000000000000000000000300",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f40000000000000000000000000000000000000000000000000000000000000300",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa0000000000000000000000000000000000000000000000000000000000000300",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000000300",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f50000000000000000000000000000000000000000000000000000000000000300",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f10000000000000000000000000000000000000000000000000000000000000400",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f20000000000000000000000000000000000000000000000000000000000000400",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f20000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f40000000000000000000000000000000000000000000000000000000000000400",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa0000000000000000000000000000000000000000000000000000000000000400",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000000400",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f50000000000000000000000000000000000000000000000000000000000000400",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f10000000000000000000000000000000000000000000000000000000000000500",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f20000000000000000000000000000000000000000000000000000000000000500",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f40000000000000000000000000000000000000000000000000000000000000500",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa0000000000000000000000000000000000000000000000000000000000000500",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000000500",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f50000000000000000000000000000000000000000000000000000000000000500",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f40000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f1000000000000000000000000000000000000000000000000000000000000ff00",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f2000000000000000000000000000000000000000000000000000000000000ff00",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f4000000000000000000000000000000000000000000000000000000000000ff00",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa000000000000000000000000000000000000000000000000000000000000ff00",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000ff00",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f5000000000000000000000000000000000000000000000000000000000000ff00",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f50000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f10000000000000000000000000000000000000000000000000000000000000200",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f20000000000000000000000000000000000000000000000000000000000000200",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000f40000000000000000000000000000000000000000000000000000000000000200",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000000fa0000000000000000000000000000000000000000000000000000000000000200",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 64, 2: 24743}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="d16",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="d17",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="d18",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="d19",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="d20",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="d21",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="d22",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="d23",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="d24",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="d25",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="d26",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="d27",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="d28",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="d29",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="d30",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="d31",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="d32",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="d33",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="d34",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="d35",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_ret_data_size(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    contract_1 = Address(0x0000000000000000000000000000000000001000)
+    contract_2 = Address(0x0000000000000000000000000000000000000200)
+    contract_3 = Address(0x0000000000000000000000000000000000000300)
+    contract_4 = Address(0x0000000000000000000000000000000000000400)
+    contract_5 = Address(0x0000000000000000000000000000000000000500)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -378,47 +276,55 @@ def test_revert_ret_data_size(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: lll
+    # {
+    #    [0x00] (/ (- 0 1) 2)
+    #    [0x20] (+ @0x00 1)
+    #
+    #    (return 0 0x40)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.DIV(Op.SUB(0x0, 0x1), 0x2))
+        + Op.MSTORE(offset=0x20, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
+        + Op.RETURN(offset=0x0, size=0x40)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: raw
+    # 0x5000
+    contract_2 = pre.deploy_contract(  # noqa: F841
         code=Op.POP + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000000200"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000000200),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x600056
+    contract_3 = pre.deploy_contract(  # noqa: F841
         code=Op.JUMP(pc=0x0),
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000000300"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000000300),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x6001600157
+    contract_4 = pre.deploy_contract(  # noqa: F841
         code=Op.JUMPI(pc=0x1, condition=0x1),
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000000400"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000000400),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0xFE00
+    contract_5 = pre.deploy_contract(  # noqa: F841
         code=Op.INVALID + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000000500"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000000500),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.DIV(Op.SUB(0x0, 0x1), 0x2))
-            + Op.MSTORE(offset=0x20, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
-            + Op.RETURN(offset=0x0, size=0x40)
-            + Op.STOP
-        ),
-        balance=0xBA1A9CE0BA1A9CE,
-        nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
+    # Source: lll
     # {   ;  $4 is the type of thing that fails
     #     ; $36 is the failure itself
     #
@@ -450,437 +356,467 @@ def test_revert_ret_data_size(
     #     (if (= failureType oog)
     #        [codeLength] (lll (sha3 0 (- 0 1)) codeLoc)
     # ... (170 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=Op.PUSH2[0x11],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x0),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x1F])
-            + Op.JUMPDEST
-            + Op.PUSH1[0x9]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x391, size=Op.DUP1)
-            + Op.PUSH2[0x100]
-            + Op.MSTORE
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x32],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0xFF00),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x46])
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x100,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=0xFF00,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x59],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x200),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x6D])
-            + Op.JUMPDEST
-            + Op.MSTORE8(offset=0x0, value=0x50)
-            + Op.MSTORE8(offset=Op.ADD(0x0, 0x1), value=0x0)
-            + Op.MSTORE(offset=0x100, value=0x2)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x80],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x300),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xA4])
-            + Op.JUMPDEST
-            + Op.MSTORE8(offset=0x0, value=0x60)
-            + Op.MSTORE8(offset=Op.ADD(0x0, 0x1), value=0x0)
-            + Op.MSTORE8(offset=Op.ADD(0x0, 0x2), value=0x56)
-            + Op.MSTORE8(offset=Op.ADD(0x0, 0x2), value=0x0)
-            + Op.MSTORE(offset=0x100, value=0x4)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xB7],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x400),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xEB])
-            + Op.JUMPDEST
-            + Op.MSTORE8(offset=0x0, value=0x60)
-            + Op.MSTORE8(offset=Op.ADD(0x0, 0x1), value=0x1)
-            + Op.MSTORE8(offset=Op.ADD(0x0, 0x2), value=0x60)
-            + Op.MSTORE8(offset=Op.ADD(0x0, 0x3), value=0x1)
-            + Op.MSTORE8(offset=Op.ADD(0x0, 0x4), value=0x57)
-            + Op.MSTORE8(offset=Op.ADD(0x0, 0x5), value=0x0)
-            + Op.MSTORE(offset=0x100, value=0x6)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xFE],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x500),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x112)
-            + Op.JUMPDEST
-            + Op.MSTORE8(offset=0x0, value=0xFE)
-            + Op.MSTORE8(offset=Op.ADD(0x0, 0x1), value=0x0)
-            + Op.MSTORE(offset=0x100, value=0x2)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x12B,
-                condition=Op.AND(
-                    Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF1),
-                    Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x0),
-                ),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x155)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0x1000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=0x1000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x16E,
-                condition=Op.AND(
-                    Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF1),
-                    Op.GT(Op.CALLDATALOAD(offset=0x24), 0x0),
-                ),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x19C)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0x1000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0xF0000),
-                    address=Op.CALLDATALOAD(offset=0x24),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1B5,
-                condition=Op.AND(
-                    Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF2),
-                    Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x0),
-                ),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x1DF)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x1000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x0,
-                    address=0x1000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1F8,
-                condition=Op.AND(
-                    Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF2),
-                    Op.GT(Op.CALLDATALOAD(offset=0x24), 0x0),
-                ),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x221)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0x1000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x24),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x23A,
-                condition=Op.AND(
-                    Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF4),
-                    Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x0),
-                ),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x260)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x1000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x0,
-                    address=0x1000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x279,
-                condition=Op.AND(
-                    Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF4),
-                    Op.GT(Op.CALLDATALOAD(offset=0x24), 0x0),
-                ),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x2A0)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0x1000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x24),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2B9,
-                condition=Op.AND(
-                    Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xFA),
-                    Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x0),
-                ),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x2DF)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x1000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x0,
-                    address=0x1000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2F8,
-                condition=Op.AND(
-                    Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xFA),
-                    Op.GT(Op.CALLDATALOAD(offset=0x24), 0x0),
-                ),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x31F)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0x1000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x24),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x331,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF0),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x352)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x1000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.POP(
-                Op.CREATE(value=0x0, offset=0x0, size=Op.MLOAD(offset=0x100))
-            )
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x364,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF5),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=0x388)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x1000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.POP(
-                Op.CREATE2(
-                    value=0x5A17,
-                    offset=0x0,
-                    size=0x0,
-                    salt=Op.MLOAD(offset=0x100),
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x2, value=0x60A7)
-            + Op.STOP
-            + Op.INVALID
-            + Op.SHA3(offset=0x0, size=Op.SUB(0x0, 0x1))
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7, 0x1: 0x60A7},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=Op.PUSH2[0x11],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x0),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x1F])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x9]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x391, size=Op.DUP1)
+        + Op.PUSH2[0x100]
+        + Op.MSTORE
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x32],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0xFF00),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x46])
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x100,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=0xFF00,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x59],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x200),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x6D])
+        + Op.JUMPDEST
+        + Op.MSTORE8(offset=0x0, value=0x50)
+        + Op.MSTORE8(offset=Op.ADD(0x0, 0x1), value=0x0)
+        + Op.MSTORE(offset=0x100, value=0x2)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x80],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x300),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xA4])
+        + Op.JUMPDEST
+        + Op.MSTORE8(offset=0x0, value=0x60)
+        + Op.MSTORE8(offset=Op.ADD(0x0, 0x1), value=0x0)
+        + Op.MSTORE8(offset=Op.ADD(0x0, 0x2), value=0x56)
+        + Op.MSTORE8(offset=Op.ADD(0x0, 0x2), value=0x0)
+        + Op.MSTORE(offset=0x100, value=0x4)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xB7],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x400),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xEB])
+        + Op.JUMPDEST
+        + Op.MSTORE8(offset=0x0, value=0x60)
+        + Op.MSTORE8(offset=Op.ADD(0x0, 0x1), value=0x1)
+        + Op.MSTORE8(offset=Op.ADD(0x0, 0x2), value=0x60)
+        + Op.MSTORE8(offset=Op.ADD(0x0, 0x3), value=0x1)
+        + Op.MSTORE8(offset=Op.ADD(0x0, 0x4), value=0x57)
+        + Op.MSTORE8(offset=Op.ADD(0x0, 0x5), value=0x0)
+        + Op.MSTORE(offset=0x100, value=0x6)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xFE],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x500),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x112)
+        + Op.JUMPDEST
+        + Op.MSTORE8(offset=0x0, value=0xFE)
+        + Op.MSTORE8(offset=Op.ADD(0x0, 0x1), value=0x0)
+        + Op.MSTORE(offset=0x100, value=0x2)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x12B,
+            condition=Op.AND(
+                Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF1),
+                Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x0),
+            ),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x155)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0x1000,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.POP(
+            Op.CALL(
+                gas=0x0,
+                address=0x1000,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x16E,
+            condition=Op.AND(
+                Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF1),
+                Op.GT(Op.CALLDATALOAD(offset=0x24), 0x0),
+            ),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x19C)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0x1000,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0xF0000),
+                address=Op.CALLDATALOAD(offset=0x24),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1B5,
+            condition=Op.AND(
+                Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF2),
+                Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x0),
+            ),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x1DF)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x1000,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x0,
+                address=0x1000,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1F8,
+            condition=Op.AND(
+                Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF2),
+                Op.GT(Op.CALLDATALOAD(offset=0x24), 0x0),
+            ),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x221)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0x1000,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x24),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x23A,
+            condition=Op.AND(
+                Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF4),
+                Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x0),
+            ),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x260)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x1000,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x0,
+                address=0x1000,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x279,
+            condition=Op.AND(
+                Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF4),
+                Op.GT(Op.CALLDATALOAD(offset=0x24), 0x0),
+            ),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x2A0)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0x1000,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x24),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2B9,
+            condition=Op.AND(
+                Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xFA),
+                Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x0),
+            ),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x2DF)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x1000,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x0,
+                address=0x1000,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2F8,
+            condition=Op.AND(
+                Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xFA),
+                Op.GT(Op.CALLDATALOAD(offset=0x24), 0x0),
+            ),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x31F)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0x1000,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x24),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x331, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF0)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x352)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x1000,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.POP(Op.CREATE(value=0x0, offset=0x0, size=Op.MLOAD(offset=0x100)))
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x364, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0xF5)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x388)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x1000,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.POP(
+            Op.CREATE2(
+                value=0x5A17, offset=0x0, size=0x0, salt=Op.MLOAD(offset=0x100)
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x2, value=0x60A7)
+        + Op.STOP
+        + Op.INVALID
+        + Op.SHA3(offset=0x0, size=Op.SUB(0x0, 0x1))
+        + Op.STOP,
+        storage={0: 24743, 1: 24743},
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(contract_2, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(contract_2, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(contract_2, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(contract_2, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(contract_2, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(contract_2, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(contract_3, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(contract_3, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(contract_3, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(contract_3, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(contract_3, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(contract_3, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(contract_4, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(contract_4, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(contract_4, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(contract_4, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(contract_4, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(contract_4, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(contract_5, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(contract_5, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(contract_5, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(contract_5, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(contract_5, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(contract_5, left_padding=True),
+        Bytes("1a8451e6") + Hash(0xF1) + Hash(0xFF00),
+        Bytes("1a8451e6") + Hash(0xF2) + Hash(0xFF00),
+        Bytes("1a8451e6") + Hash(0xF4) + Hash(0xFF00),
+        Bytes("1a8451e6") + Hash(0xFA) + Hash(0xFF00),
+        Bytes("1a8451e6") + Hash(0xF0) + Hash(0xFF00),
+        Bytes("1a8451e6") + Hash(0xF5) + Hash(0xFF00),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {contract_0: Account(storage={0: 64, 1: 0, 2: 24743})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stReturnDataTest/test_subcall_return_more_then_expected.py b/tests/ported_static/stReturnDataTest/test_subcall_return_more_then_expected.py
index 8e4861bb369..1f2141adffe 100644
--- a/tests/ported_static/stReturnDataTest/test_subcall_return_more_then_expected.py
+++ b/tests/ported_static/stReturnDataTest/test_subcall_return_more_then_expected.py
@@ -1,9 +1,8 @@
 """
-https://github.com/ethereum/tests/issues/558 (subcall/opcode return more...
+Https://github.com/ethereum/tests/issues/558 (subcall/opcode return...
 
 Ported from:
-tests/static/state_tests/stReturnDataTest
-subcallReturnMoreThenExpectedFiller.yml
+state_tests/stReturnDataTest/subcallReturnMoreThenExpectedFiller.yml
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stReturnDataTest/subcallReturnMoreThenExpectedFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stReturnDataTest/subcallReturnMoreThenExpectedFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,8 +31,8 @@ def test_subcall_return_more_then_expected(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Https://github.com/ethereum/tests/issues/558 (subcall/opcode..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Https://github."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,41 +46,50 @@ def test_subcall_return_more_then_expected(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x1122334455667788991011121314151617181920212223242526272829303132,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3334353637383940414243444546474849505152535455565758596061626364,  # noqa: E501
-            )
-            + Op.REVERT(offset=0x0, size=0x40)
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
+    # {
+    #   (MSTORE 0  0x1122334455667788991011121314151617181920212223242526272829303132)  # noqa: E501
+    #   (MSTORE 32 0x3334353637383940414243444546474849505152535455565758596061626364)  # noqa: E501
+    #   (RETURN 0 64)
+    # }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x1122334455667788991011121314151617181920212223242526272829303132,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x3334353637383940414243444546474849505152535455565758596061626364,  # noqa: E501
+        )
+        + Op.RETURN(offset=0x0, size=0x40)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x028cdafc3d5d27d006ffb88e1ecf2fa4b412ee4f"),  # noqa: E501
+        address=Address(0xA8592F39B32943F9F464090497722B4F9C15F598),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x1122334455667788991011121314151617181920212223242526272829303132,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3334353637383940414243444546474849505152535455565758596061626364,  # noqa: E501
-            )
-            + Op.RETURN(offset=0x0, size=0x40)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {
+    #   (MSTORE 0  0x1122334455667788991011121314151617181920212223242526272829303132)  # noqa: E501
+    #   (MSTORE 32 0x3334353637383940414243444546474849505152535455565758596061626364)  # noqa: E501
+    #   (REVERT 0 64)
+    # }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x1122334455667788991011121314151617181920212223242526272829303132,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x3334353637383940414243444546474849505152535455565758596061626364,  # noqa: E501
+        )
+        + Op.REVERT(offset=0x0, size=0x40)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa8592f39b32943f9f464090497722b4f9c15f598"),  # noqa: E501
+        address=Address(0x028CDAFC3D5D27D006FFB88E1ECF2FA4B412EE4F),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
     #   ;; Get returndata from a subcall
     #   (CALL 200000 <contract:0x194f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 12)  # noqa: E501
@@ -111,124 +118,122 @@ def test_subcall_return_more_then_expected(
     #   (CALLCODE 200000 <contract:0x294f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 12)  # noqa: E501
     #   [[7]] (MLOAD 0)
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x30D40,
-                    address=0xA8592F39B32943F9F464090497722B4F9C15F598,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0xC,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x30D40,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0xC,
             )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x30D40,
-                    address=0xA8592F39B32943F9F464090497722B4F9C15F598,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0xC,
-                ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x30D40,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0xC,
             )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x30D40,
-                    address=0xA8592F39B32943F9F464090497722B4F9C15F598,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0xC,
-                ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x30D40,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0xC,
             )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x30D40,
-                    address=0xA8592F39B32943F9F464090497722B4F9C15F598,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0xC,
-                ),
+        )
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x30D40,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0xC,
             )
-            + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x30D40,
-                    address=0x28CDAFC3D5D27D006FFB88E1ECF2FA4B412EE4F,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0xC,
-                ),
+        )
+        + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.POP(
+            Op.CALL(
+                gas=0x30D40,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0xC,
             )
-            + Op.SSTORE(key=0x4, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x30D40,
-                    address=0x28CDAFC3D5D27D006FFB88E1ECF2FA4B412EE4F,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0xC,
-                ),
+        )
+        + Op.SSTORE(key=0x4, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x30D40,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0xC,
             )
-            + Op.SSTORE(key=0x5, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x30D40,
-                    address=0x28CDAFC3D5D27D006FFB88E1ECF2FA4B412EE4F,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0xC,
-                ),
+        )
+        + Op.SSTORE(key=0x5, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x30D40,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0xC,
             )
-            + Op.SSTORE(key=0x6, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x30D40,
-                    address=0x28CDAFC3D5D27D006FFB88E1ECF2FA4B412EE4F,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0xC,
-                ),
+        )
+        + Op.SSTORE(key=0x6, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x30D40,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0xC,
             )
-            + Op.SSTORE(key=0x7, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x7, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xca70835d5e9b8c8e139a9693ab05705d291f86bb"),  # noqa: E501
+        address=Address(0xCA70835D5E9B8C8E139A9693AB05705D291F86BB),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
         value=1,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x1122334455667788991011120000000000000000000000000000000000000000,  # noqa: E501
                 1: 0x1122334455667788991011120000000000000000000000000000000000000000,  # noqa: E501
@@ -239,6 +244,7 @@ def test_subcall_return_more_then_expected(
                 6: 0x1122334455667788991011120000000000000000000000000000000000000000,  # noqa: E501
                 7: 0x1122334455667788991011120000000000000000000000000000000000000000,  # noqa: E501
             },
+            balance=0xDE0B6B3A7640001,
         ),
     }
 
diff --git a/tests/ported_static/stReturnDataTest/test_too_long_return_data_copy.py b/tests/ported_static/stReturnDataTest/test_too_long_return_data_copy.py
index f3b987a8645..ee261f186bc 100644
--- a/tests/ported_static/stReturnDataTest/test_too_long_return_data_copy.py
+++ b/tests/ported_static/stReturnDataTest/test_too_long_return_data_copy.py
@@ -2,19 +2,24 @@
 Ori Pomerantz   qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stReturnDataTest/tooLongReturnDataCopyFiller.yml
+state_tests/stReturnDataTest/tooLongReturnDataCopyFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,258 +27,170 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stReturnDataTest/tooLongReturnDataCopyFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stReturnDataTest/tooLongReturnDataCopyFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000001000000000000000000000000023eef957bcfb3738417aee7fdf4294cf110d7881",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="success",
         ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000000800000000000000000000000023eef957bcfb3738417aee7fdf4294cf110d7881",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000800000000000000000000000023eef957bcfb3738417aee7fdf4294cf110d7881",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="success",
         ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000023eef957bcfb3738417aee7fdf4294cf110d7881",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="success",
         ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000023eef957bcfb3738417aee7fdf4294cf110d7881",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f9000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011000000000000000000000000a6e4f86617d6ab14d857f9115c2ab9f2787157ba",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="success",
         ),
-        (
-            "917694f9000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000010000000000000000000000000a6e4f86617d6ab14d857f9115c2ab9f2787157ba",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f9000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000008000000000000000000000000a6e4f86617d6ab14d857f9115c2ab9f2787157ba",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="success",
         ),
-        (
-            "917694f9000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000008000000000000000000000000a6e4f86617d6ab14d857f9115c2ab9f2787157ba",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f9000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000a6e4f86617d6ab14d857f9115c2ab9f2787157ba",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f9000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000a6e4f86617d6ab14d857f9115c2ab9f2787157ba",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            10,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000023eef957bcfb3738417aee7fdf4294cf110d7881",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            11,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001100000000000000000000000023eef957bcfb3738417aee7fdf4294cf110d7881",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            12,
+            0,
+            0,
+            id="success",
         ),
-        (
-            "917694f9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000a6e4f86617d6ab14d857f9115c2ab9f2787157ba",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            13,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000023eef957bcfb3738417aee7fdf4294cf110d7881",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 57005}
-                )
-            },
+        pytest.param(
+            14,
+            0,
+            0,
+            id="success",
         ),
-        (
-            "917694f9000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000a6e4f86617d6ab14d857f9115c2ab9f2787157ba",  # noqa: E501
-            {
-                Address("0xa6e4f86617d6ab14d857f9115c2ab9f2787157ba"): Account(
-                    storage={0: 16}
-                ),
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 57005}
-                ),
-            },
+        pytest.param(
+            15,
+            0,
+            0,
+            id="success",
         ),
-        (
-            "917694f9000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000a6e4f86617d6ab14d857f9115c2ab9f2787157ba",  # noqa: E501
-            {
-                Address("0xa6e4f86617d6ab14d857f9115c2ab9f2787157ba"): Account(
-                    storage={0: 16}
-                ),
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 57005}
-                ),
-            },
+        pytest.param(
+            16,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000f000000000000000000000000a6e4f86617d6ab14d857f9115c2ab9f2787157ba",  # noqa: E501
-            {
-                Address("0xa6e4f86617d6ab14d857f9115c2ab9f2787157ba"): Account(
-                    storage={0: 16}
-                ),
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 57005}
-                ),
-            },
+        pytest.param(
+            17,
+            0,
+            0,
+            id="success",
         ),
-        (
-            "917694f9000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008000000000000000000000000a6e4f86617d6ab14d857f9115c2ab9f2787157ba",  # noqa: E501
-            {
-                Address("0xa6e4f86617d6ab14d857f9115c2ab9f2787157ba"): Account(
-                    storage={0: 16}
-                ),
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 57005}
-                ),
-            },
+        pytest.param(
+            18,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000023eef957bcfb3738417aee7fdf4294cf110d7881",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 57005}
-                )
-            },
+        pytest.param(
+            19,
+            0,
+            0,
+            id="success",
         ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000023eef957bcfb3738417aee7fdf4294cf110d7881",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 57005}
-                )
-            },
+        pytest.param(
+            20,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000023eef957bcfb3738417aee7fdf4294cf110d7881",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 57005}
-                )
-            },
+        pytest.param(
+            21,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f900000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000f00000000000000000000000023eef957bcfb3738417aee7fdf4294cf110d7881",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 57005}
-                )
-            },
+        pytest.param(
+            22,
+            0,
+            0,
+            id="fail",
         ),
-        (
-            "917694f9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a6e4f86617d6ab14d857f9115c2ab9f2787157ba",  # noqa: E501
-            {
-                Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"): Account(
-                    storage={0: 57005}
-                )
-            },
+        pytest.param(
+            23,
+            0,
+            0,
+            id="fail",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_too_long_return_data_copy(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz   qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x04DC42D61413D4DED993826AC4D6ED7A4A970C60335D2B285C60A4274E792FF1
-    )
+    """Ori Pomerantz   qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3635C9ADC5DEA00000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -284,34 +201,58 @@ def test_too_long_return_data_copy(
         gas_limit=4503599627370496,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1F1E1D1C1B1A191817161514131211100F0E0D0C0B0A090807060504030201FF,  # noqa: E501
-            )
-            + Op.SSTORE(key=0x0, value=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.REVERT
-        ),
-        address=Address("0x23eef957bcfb3738417aee7fdf4294cf110d7881"),  # noqa: E501
+    # Source: yul
+    # berlin
+    # {
+    #    // How many bytes to return
+    #    let byteCount := calldataload(0)
+    #
+    #    // Some junk data
+    #    mstore(0, 0x1F1E1D1C1B1A191817161514131211100F0E0D0C0B0A090807060504030201FF)  # noqa: E501
+    #
+    #    sstore(0, byteCount)
+    #
+    #    // Return the result
+    #    return(0x00, byteCount)
+    # }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x1F1E1D1C1B1A191817161514131211100F0E0D0C0B0A090807060504030201FF,  # noqa: E501
+        )
+        + Op.SSTORE(key=0x0, value=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN,
+        nonce=1,
     )
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000, nonce=1)
-    pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1F1E1D1C1B1A191817161514131211100F0E0D0C0B0A090807060504030201FF,  # noqa: E501
-            )
-            + Op.SSTORE(key=0x0, value=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-        ),
-        address=Address("0xa6e4f86617d6ab14d857f9115c2ab9f2787157ba"),  # noqa: E501
+    # Source: yul
+    # berlin
+    # {
+    #    // How many bytes to return
+    #    let byteCount := calldataload(0)
+    #
+    #    // Some junk data
+    #    mstore(0, 0x1F1E1D1C1B1A191817161514131211100F0E0D0C0B0A090807060504030201FF)  # noqa: E501
+    #
+    #    sstore(0, byteCount)
+    #
+    #    // Return the result
+    #    revert(0x00, byteCount)
+    # }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x1F1E1D1C1B1A191817161514131211100F0E0D0C0B0A090807060504030201FF,  # noqa: E501
+        )
+        + Op.SSTORE(key=0x0, value=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.REVERT,
+        nonce=1,
     )
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    let lengthReturned := calldataload(0x04)
     #    let offsetCopied   := calldataload(0x24)
@@ -341,66 +282,199 @@ def test_too_long_return_data_copy(
     #
     #    // If we get here, kill the goat to show success
     #    sstore(0, 0xDEAD)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x4)
-            + Op.CALLDATALOAD(offset=0x24)
-            + Op.PUSH2[0x100]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x20]
-            + Op.DUP2
-            + Op.DUP1
-            + Op.CALLDATALOAD(offset=0x44)
-            + Op.SWAP7
-            + Op.CALLDATALOAD(offset=0x64)
-            + Op.SWAP1
-            + Op.DUP3
-            + Op.MSTORE
-            + Op.GAS
-            + Op.POP(Op.CALL)
-            + Op.PUSH2[0x100]
-            + Op.RETURNDATACOPY
-            + Op.EXTCODECOPY(
-                address=0xA6E4F86617D6AB14D857F9115C2AB9F2787157BA,
-                dest_offset=Op.DUP1,
-                offset=0x0,
-                size=Op.ADD(
-                    0x20,
-                    Op.EXTCODESIZE(
-                        address=0xA6E4F86617D6AB14D857F9115C2AB9F2787157BA,
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP1,
-                offset=0x0,
-                size=Op.ADD(0x20, Op.CALLDATASIZE),
-            )
-            + Op.CODECOPY(
-                dest_offset=Op.DUP1,
-                offset=0x0,
-                size=Op.ADD(0x20, Op.CODESIZE),
-            )
-            + Op.SSTORE(key=0x0, value=0xDEAD)
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7},
+    # ... (1 more lines)
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x4)
+        + Op.CALLDATALOAD(offset=0x24)
+        + Op.PUSH2[0x100]
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x20]
+        + Op.DUP2
+        + Op.DUP1
+        + Op.CALLDATALOAD(offset=0x44)
+        + Op.SWAP7
+        + Op.CALLDATALOAD(offset=0x64)
+        + Op.SWAP1
+        + Op.DUP3
+        + Op.MSTORE
+        + Op.GAS
+        + Op.POP(Op.CALL)
+        + Op.PUSH2[0x100]
+        + Op.RETURNDATACOPY
+        + Op.EXTCODECOPY(
+            address=addr,
+            dest_offset=Op.DUP1,
+            offset=0x0,
+            size=Op.ADD(0x20, Op.EXTCODESIZE(address=addr)),
+        )
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP1, offset=0x0, size=Op.ADD(0x20, Op.CALLDATASIZE)
+        )
+        + Op.CODECOPY(
+            dest_offset=Op.DUP1, offset=0x0, size=Op.ADD(0x20, Op.CODESIZE)
+        )
+        + Op.SSTORE(key=0x0, value=0xDEAD)
+        + Op.STOP,
+        storage={0: 24743},
         balance=0xDE0B6B3A7640000,
-        address=Address("0xe4592ed5b9c3a9302d66798e39bfb7dfd44fafc1"),  # noqa: E501
+        nonce=1,
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [1, 4, 6, 8, 9, 10, 11, 13, 16, 18, 20, 21, 22, 23],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 24743})},
+        },
+        {
+            "indexes": {
+                "data": [0, 2, 3, 5, 7, 12, 14, 15, 17, 19],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 57005})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(addr, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x1)
+        + Hash(addr, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x0)
+        + Hash(0x8)
+        + Hash(addr, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x0)
+        + Hash(0x10)
+        + Hash(addr, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x0)
+        + Hash(0x11)
+        + Hash(addr, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x1)
+        + Hash(0xF)
+        + Hash(addr, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x1)
+        + Hash(0x10)
+        + Hash(addr, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x8)
+        + Hash(0x8)
+        + Hash(addr, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x9)
+        + Hash(0x8)
+        + Hash(addr, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x10)
+        + Hash(0x8)
+        + Hash(addr, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x10)
+        + Hash(0x10)
+        + Hash(addr, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x20)
+        + Hash(0x10)
+        + Hash(addr, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(addr_2, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x1)
+        + Hash(addr_2, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x0)
+        + Hash(0x8)
+        + Hash(addr_2, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x0)
+        + Hash(0x10)
+        + Hash(addr_2, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x0)
+        + Hash(0x11)
+        + Hash(addr_2, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x1)
+        + Hash(0xF)
+        + Hash(addr_2, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x1)
+        + Hash(0x10)
+        + Hash(addr_2, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x8)
+        + Hash(0x8)
+        + Hash(addr_2, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x9)
+        + Hash(0x8)
+        + Hash(addr_2, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x10)
+        + Hash(0x8)
+        + Hash(addr_2, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x10)
+        + Hash(0x10)
+        + Hash(addr_2, left_padding=True),
+        Bytes("917694f9")
+        + Hash(0x10)
+        + Hash(0x20)
+        + Hash(0x10)
+        + Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [16777216]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        gas_price=100,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        gas_price=100,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/__init__.py b/tests/ported_static/stRevertTest/__init__.py
index 07e5b318406..f8639ee4a2d 100644
--- a/tests/ported_static/stRevertTest/__init__.py
+++ b/tests/ported_static/stRevertTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stRevertTest."""
+"""Ported static tests: stRevertTest."""  # noqa: N999
diff --git a/tests/ported_static/stRevertTest/test_cost_revert.py b/tests/ported_static/stRevertTest/test_cost_revert.py
index 8839428934e..7c6fddec42c 100644
--- a/tests/ported_static/stRevertTest/test_cost_revert.py
+++ b/tests/ported_static/stRevertTest/test_cost_revert.py
@@ -2,7 +2,7 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stRevertTest/costRevertFiller.yml
+state_tests/stRevertTest/costRevertFiller.yml
 """
 
 import pytest
@@ -11,10 +11,16 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,278 +28,202 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/costRevertFiller.yml"],
+    ["state_tests/stRevertTest/costRevertFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010030000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010030000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010030000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010030000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010040000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010040000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010040000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010040000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010010000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010010000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010010000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2609}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2609}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2609}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 2609}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010060000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010060000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010060000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010060000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010050000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010050000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010050000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010050000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
-        ),
-        (
-            "1a8451e600000000000000000000000000000000000000000000000000000000000010020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 0xFFFFFF}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="revert",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="outOfGas",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="xtremeOOG",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="badOpcode",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="jumpBadly",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="stackUnder",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="stackOver",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="revert",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="outOfGas",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="xtremeOOG",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="badOpcode",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="jumpBadly",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="stackUnder",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="stackOver",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="revert",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="outOfGas",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="xtremeOOG",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="badOpcode",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="jumpBadly",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="stackUnder",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="stackOver",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="revert",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="outOfGas",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="xtremeOOG",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="badOpcode",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="jumpBadly",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="stackUnder",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="stackOver",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_cost_revert(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -307,76 +237,88 @@ def test_cost_revert(
         gas_limit=100000000,
     )
 
-    pre.deploy_contract(
+    pre[sender] = Account(balance=0x100000000000)
+    # Source: lll
+    # {
+    #     (revert 0 0x10)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.REVERT(offset=0x0, size=0x10) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(pc=0x13, condition=Op.ISZERO(0x1))
-            + Op.POP(Op.SHA3(offset=0x0, size=0x1000000))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {
+    #     (while 1 (sha3 0 0x1000000))
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(pc=0x13, condition=Op.ISZERO(0x1))
+        + Op.POP(Op.SHA3(offset=0x0, size=0x1000000))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001001"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {
+    #     (sha3 0 (- 0 1))
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SHA3(offset=0x0, size=Op.SUB(0x0, 0x1)) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001002"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x610103600155600060006000600061dead6175305a03f450BA
+    contract_3 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
             "610103600155600060006000600061dead6175305a03f450ba"
         ),
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001003"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x104)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.SUB(Op.GAS, 0x7530),
-                    address=0xDEAD,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: raw
+    # 0x610104600155600060006000600061dead6175305a03f450600056
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x104)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=Op.SUB(Op.GAS, 0x7530),
+                address=0xDEAD,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.JUMP(pc=0x0)
-        ),
+        )
+        + Op.JUMP(pc=0x0),
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001004"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x1000
+    contract_5 = pre.deploy_contract(  # noqa: F841
         code=Op.LT + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001005"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x5b586004580356
+    contract_6 = pre.deploy_contract(  # noqa: F841
         code=Op.JUMPDEST + Op.PC + Op.JUMP(pc=Op.SUB(Op.PC, 0x4)),
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001006"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x100000000000)
-    # Source: LLL
+    # Source: lll
     # {
     #     (if (= $36 0) {     ; CALL
     #        [0x00] (gas)
@@ -408,143 +350,211 @@ def test_cost_revert(
     #       ; 17-1            POP         2     24761  79954047
     #
     # ... (59 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=Op.PUSH2[0x11],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x0),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x3B])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x7530),
-                    address=Op.CALLDATALOAD(offset=0x4),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)),
-                    0x2A,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x4D],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0x75])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.SUB(Op.GAS, 0x7530),
-                    address=Op.CALLDATALOAD(offset=0x4),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=Op.PUSH2[0x11],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x0),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x3B])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x7530),
+                address=Op.CALLDATALOAD(offset=0x4),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)),
-                    0x27,
-                ),
+        )
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)), 0x2A
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x4D],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x1),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0x75])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=Op.SUB(Op.GAS, 0x7530),
+                address=Op.CALLDATALOAD(offset=0x4),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x87],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x2),
+        )
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)), 0x27
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x87],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x2),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xAF])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.SUB(Op.GAS, 0x7530),
+                address=Op.CALLDATALOAD(offset=0x4),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xAF])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.SUB(Op.GAS, 0x7530),
-                    address=Op.CALLDATALOAD(offset=0x4),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)), 0x27
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xC1],
+            condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x3),
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=Op.PUSH2[0xEB])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=Op.SUB(Op.GAS, 0x7530),
+                address=Op.CALLDATALOAD(offset=0x4),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)),
-                    0x27,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xC1],
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x24), 0x3),
-            )
-            + Op.POP(0x0)
-            + Op.JUMP(pc=Op.PUSH2[0xEB])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=Op.SUB(Op.GAS, 0x7530),
-                    address=Op.CALLDATALOAD(offset=0x4),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.SUB(
-                    Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)),
-                    0x2A,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x100, condition=Op.GT(Op.SLOAD(key=0x0), 0x4000000))
-            + Op.SLOAD(key=0x0)
-            + Op.JUMP(pc=0x105)
-            + Op.JUMPDEST
-            + Op.PUSH3[0xFFFFFF]
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                Op.SUB(Op.MLOAD(offset=0x0), Op.MLOAD(offset=0x20)), 0x2A
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x100, condition=Op.GT(Op.SLOAD(key=0x0), 0x4000000))
+        + Op.SLOAD(key=0x0)
+        + Op.JUMP(pc=0x105)
+        + Op.JUMPDEST
+        + Op.PUSH3[0xFFFFFF]
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SSTORE
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 21, 14, 7], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {contract_7: Account(storage={0: 2609})},
+        },
+        {
+            "indexes": {
+                "data": [
+                    1,
+                    2,
+                    3,
+                    4,
+                    5,
+                    6,
+                    8,
+                    9,
+                    10,
+                    11,
+                    12,
+                    13,
+                    15,
+                    16,
+                    17,
+                    18,
+                    19,
+                    20,
+                    22,
+                    23,
+                    24,
+                    25,
+                    26,
+                    27,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun<Osaka"],
+            "result": {contract_7: Account(storage={0: 0xFFFFFF})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("1a8451e6") + Hash(contract_0, left_padding=True) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(contract_1, left_padding=True) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(contract_2, left_padding=True) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(contract_3, left_padding=True) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(contract_4, left_padding=True) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(contract_5, left_padding=True) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(contract_6, left_padding=True) + Hash(0x0),
+        Bytes("1a8451e6") + Hash(contract_0, left_padding=True) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(contract_1, left_padding=True) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(contract_2, left_padding=True) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(contract_3, left_padding=True) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(contract_4, left_padding=True) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(contract_5, left_padding=True) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(contract_6, left_padding=True) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(contract_0, left_padding=True) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(contract_1, left_padding=True) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(contract_2, left_padding=True) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(contract_3, left_padding=True) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(contract_4, left_padding=True) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(contract_5, left_padding=True) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(contract_6, left_padding=True) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(contract_0, left_padding=True) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(contract_1, left_padding=True) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(contract_2, left_padding=True) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(contract_3, left_padding=True) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(contract_4, left_padding=True) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(contract_5, left_padding=True) + Hash(0x3),
+        Bytes("1a8451e6") + Hash(contract_6, left_padding=True) + Hash(0x3),
+    ]
+    tx_gas = [80000000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=80000000,
-        value=1,
+        to=contract_7,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_loop_calls_depth_then_revert.py b/tests/ported_static/stRevertTest/test_loop_calls_depth_then_revert.py
index 1d8d9ea6358..fc4b0089a75 100644
--- a/tests/ported_static/stRevertTest/test_loop_calls_depth_then_revert.py
+++ b/tests/ported_static/stRevertTest/test_loop_calls_depth_then_revert.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_loop_calls_depth_then_revert.
 
 Ported from:
-tests/static/state_tests/stRevertTest/LoopCallsDepthThenRevertFiller.json
+state_tests/stRevertTest/LoopCallsDepthThenRevertFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/LoopCallsDepthThenRevertFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/LoopCallsDepthThenRevertFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_loop_calls_depth_then_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_loop_calls_depth_then_revert."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,53 +43,51 @@ def test_loop_calls_depth_then_revert(
         gas_limit=100000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xF59FD1C021541704A4A52C067454304566717666,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[0]] (+ (SLOAD 0) 1) (CALL (GAS) <contract:0xb000000000000000000000000000000000000000> 0 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0x80D46FA47B41AB46A227915AE4F63559C0D4DFE2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x80d46fa47b41ab46a227915ae4f63559c0d4dfe2"),  # noqa: E501
+        address=Address(0xF59FD1C021541704A4A52C067454304566717666),  # noqa: E501
     )
-    # Source: LLL
-    # { [[0]] (+ (SLOAD 0) 1) (CALL (GAS) <contract:0xb000000000000000000000000000000000000000> 0 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0x80D46FA47B41AB46A227915AE4F63559C0D4DFE2,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[0]] (+ (SLOAD 0) 1) (CALL (GAS) <contract:target:0xa000000000000000000000000000000000000000> 0 0 0 0 0)  }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.CALL(
+            gas=Op.GAS,
+            address=0xF59FD1C021541704A4A52C067454304566717666,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf59fd1c021541704a4a52c067454304566717666"),  # noqa: E501
+        address=Address(0x80D46FA47B41AB46A227915AE4F63559C0D4DFE2),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
     )
 
     post = {
-        callee: Account(storage={0: 192}),
-        contract: Account(storage={0: 193}),
+        target: Account(storage={0: 193}),
+        addr: Account(storage={0: 192}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_loop_calls_depth_then_revert2.py b/tests/ported_static/stRevertTest/test_loop_calls_depth_then_revert2.py
index ee70b4a7159..3a2f95fdd05 100644
--- a/tests/ported_static/stRevertTest/test_loop_calls_depth_then_revert2.py
+++ b/tests/ported_static/stRevertTest/test_loop_calls_depth_then_revert2.py
@@ -1,19 +1,20 @@
 """
-Test ported from static filler.
+Test_loop_calls_depth_then_revert2.
 
 Ported from:
-tests/static/state_tests/stRevertTest/LoopCallsDepthThenRevert2Filler.json
+state_tests/stRevertTest/LoopCallsDepthThenRevert2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/LoopCallsDepthThenRevert2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/LoopCallsDepthThenRevert2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -33,11 +32,10 @@ def test_loop_calls_depth_then_revert2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_loop_calls_depth_then_revert2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xA000000000000000000000000000000000000000)
+    sender = pre.fund_eoa(amount=0x13426172C74D822B878FE800000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,42 +46,43 @@ def test_loop_calls_depth_then_revert2(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x3F, condition=Op.EQ(Op.SLOAD(key=0x0), 0x3FF))
-            + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xA000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: raw
+    # 0x6103ff60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x3F, condition=Op.EQ(Op.SLOAD(key=0x0), 0x3FF))
+        + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xA000000000000000000000000000000000000000,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.JUMPI(pc=0x53, condition=Op.LT(Op.SLOAD(key=0x0), 0x41A))
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=0x600060006002F0)
-            + Op.POP(Op.CREATE(value=0x3, offset=0x19, size=0x7))
-            + Op.JUMPDEST
-        ),
+        )
+        + Op.JUMPI(pc=0x53, condition=Op.LT(Op.SLOAD(key=0x0), 0x41A))
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=0x600060006002F0)
+        + Op.POP(Op.CREATE(value=0x3, offset=0x19, size=0x7))
+        + Op.JUMPDEST,
         balance=10,
         nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x13426172C74D822B878FE800000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=9214364837600034817,
     )
 
     post = {
-        contract: Account(storage={0: 1023}),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            balance=3, nonce=1
+        ),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_loop_calls_depth_then_revert3.py b/tests/ported_static/stRevertTest/test_loop_calls_depth_then_revert3.py
index 4e52b22b7e5..2ebd7d4cec4 100644
--- a/tests/ported_static/stRevertTest/test_loop_calls_depth_then_revert3.py
+++ b/tests/ported_static/stRevertTest/test_loop_calls_depth_then_revert3.py
@@ -1,19 +1,20 @@
 """
-Test ported from static filler.
+Test_loop_calls_depth_then_revert3.
 
 Ported from:
-tests/static/state_tests/stRevertTest/LoopCallsDepthThenRevert3Filler.json
+state_tests/stRevertTest/LoopCallsDepthThenRevert3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/LoopCallsDepthThenRevert3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/LoopCallsDepthThenRevert3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -33,11 +32,10 @@ def test_loop_calls_depth_then_revert3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_loop_calls_depth_then_revert3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xA000000000000000000000000000000000000000)
+    sender = pre.fund_eoa(amount=0x13426172C74D822B878FE800000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,42 +46,47 @@ def test_loop_calls_depth_then_revert3(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x3F, condition=Op.EQ(Op.SLOAD(key=0x0), 0x3FE))
-            + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xA000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: raw
+    # 0x6103fe60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x3F, condition=Op.EQ(Op.SLOAD(key=0x0), 0x3FE))
+        + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xA000000000000000000000000000000000000000,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.JUMPI(pc=0x53, condition=Op.LT(Op.SLOAD(key=0x0), 0x41A))
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=0x600060006002F0)
-            + Op.POP(Op.CREATE(value=0x3, offset=0x19, size=0x7))
-            + Op.JUMPDEST
-        ),
+        )
+        + Op.JUMPI(pc=0x53, condition=Op.LT(Op.SLOAD(key=0x0), 0x41A))
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=0x600060006002F0)
+        + Op.POP(Op.CREATE(value=0x3, offset=0x19, size=0x7))
+        + Op.JUMPDEST,
         balance=10,
         nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x13426172C74D822B878FE800000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=9214364837600034817,
     )
 
     post = {
-        contract: Account(storage={0: 1022}),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            balance=1, nonce=2
+        ),
+        compute_create_address(
+            address=compute_create_address(address=contract_0, nonce=0),
+            nonce=1,
+        ): Account(balance=2, nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_loop_calls_then_revert.py b/tests/ported_static/stRevertTest/test_loop_calls_then_revert.py
index b6fb29390cc..c64f15352a7 100644
--- a/tests/ported_static/stRevertTest/test_loop_calls_then_revert.py
+++ b/tests/ported_static/stRevertTest/test_loop_calls_then_revert.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_loop_calls_then_revert.
 
 Ported from:
-tests/static/state_tests/stRevertTest/LoopCallsThenRevertFiller.json
+state_tests/stRevertTest/LoopCallsThenRevertFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/LoopCallsThenRevertFiller.json"],
+    ["state_tests/stRevertTest/LoopCallsThenRevertFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_loop_calls_then_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_loop_calls_then_revert."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,45 +43,44 @@ def test_loop_calls_then_revert(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.SSTORE(key=0x0, value=Op.SUB(Op.SLOAD(key=0x0), 0x1))
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0xC47BCBF49DD735566CFDE927821E938D5B33014C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(pc=0x0, condition=Op.SLOAD(key=0x0))
-        ),
-        storage={0x0: 0x352},
+    # Source: lll
+    # { [[0]] (ADD 1 (SLOAD 0)) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0347aff20d9d3c574e18f3b17dc267ddcd2d75ca"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0))) + Op.STOP
-        ),
+    # Source: raw
+    # 0x5b6001600054036000556000600060006000600073<contract:0xb000000000000000000000000000000000000000>61c350f150600054600057  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=Op.SUB(Op.SLOAD(key=0x0), 0x1))
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPI(pc=0x0, condition=Op.SLOAD(key=0x0)),
+        storage={0: 850},
         nonce=0,
-        address=Address("0xc47bcbf49dd735566cfde927821e938d5b33014c"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
     )
 
     post = {
-        callee: Account(storage={0: 850}),
+        target: Account(storage={0: 0}),
+        addr: Account(storage={0: 850}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_loop_delegate_calls_depth_then_revert.py b/tests/ported_static/stRevertTest/test_loop_delegate_calls_depth_then_revert.py
index 2a65f2c557e..1be3fb70d90 100644
--- a/tests/ported_static/stRevertTest/test_loop_delegate_calls_depth_then_revert.py
+++ b/tests/ported_static/stRevertTest/test_loop_delegate_calls_depth_then_revert.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_loop_delegate_calls_depth_then_revert.
 
 Ported from:
-tests/static/state_tests/stRevertTest
-LoopDelegateCallsDepthThenRevertFiller.json
+state_tests/stRevertTest/LoopDelegateCallsDepthThenRevertFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/LoopDelegateCallsDepthThenRevertFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/LoopDelegateCallsDepthThenRevertFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_loop_delegate_calls_depth_then_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_loop_delegate_calls_depth_then_revert."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,50 +43,49 @@ def test_loop_delegate_calls_depth_then_revert(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[0]] (+ (SLOAD 0) 1) (DELEGATECALL (GAS) <contract:0xb000000000000000000000000000000000000000> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0xF798CB78490DA31DFACDCD1F2B3FB1948BB2B228,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xF798CB78490DA31DFACDCD1F2B3FB1948BB2B228,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb0923c4a632de291fcdac653e6c6cc2b4e4cdfa8"),  # noqa: E501
+        address=Address(0xB0923C4A632DE291FCDAC653E6C6CC2B4E4CDFA8),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=0xB0923C4A632DE291FCDAC653E6C6CC2B4E4CDFA8,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[0]] (+ (SLOAD 0) 1) (DELEGATECALL (GAS) <contract:target:0xa000000000000000000000000000000000000000> 0 0 0 0)  }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=0xB0923C4A632DE291FCDAC653E6C6CC2B4E4CDFA8,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf798cb78490da31dfacdcd1f2b3fb1948bb2b228"),  # noqa: E501
+        address=Address(0xF798CB78490DA31DFACDCD1F2B3FB1948BB2B228),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
     )
 
     post = {
-        contract: Account(storage={0: 386}),
+        target: Account(storage={0: 386}),
+        addr: Account(storage={}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_nashatyrev_suicide_revert.py b/tests/ported_static/stRevertTest/test_nashatyrev_suicide_revert.py
index 69b57517f79..64f7fb297d5 100644
--- a/tests/ported_static/stRevertTest/test_nashatyrev_suicide_revert.py
+++ b/tests/ported_static/stRevertTest/test_nashatyrev_suicide_revert.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_nashatyrev_suicide_revert.
 
 Ported from:
-tests/static/state_tests/stRevertTest/NashatyrevSuicideRevertFiller.json
+state_tests/stRevertTest/NashatyrevSuicideRevertFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -21,9 +21,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/NashatyrevSuicideRevertFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/NashatyrevSuicideRevertFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,11 +29,9 @@ def test_nashatyrev_suicide_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_nashatyrev_suicide_revert."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,43 +42,25 @@ def test_nashatyrev_suicide_revert(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680639c3674fc14610049578063c040622614610058575b610000565b3461000057610056610067565b005b3461000057610065610147565b005b600060405160a680610200833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff1660405180807f6628290000000000000000000000000000000000000000000000000000000000815250600301905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f19250505050610000565b50565b3073ffffffffffffffffffffffffffffffffffffffff1660405180807f6261642829000000000000000000000000000000000000000000000000000000815250600501905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b56006060604052346000575b608f806100176000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806326121ff014603c575b6000565b3460005760466048565b005b3373ffffffffffffffffffffffffffffffffffffffff16ff5b5600a165627a7a723058203d1a897befde21eff26abc325fb3da2f526bbc99de1c5c857d1835f673744ebd0029a165627a7a72305820850a52b31ec4745b7af15ba3bffdb1ba17f5d9a00a5f263ee287a92b568f534c0029  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "60606040526000357c010000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "0000900463ffffffff1680639c3674fc14610049578063c040622614610058575b610000"  # noqa: E501
-            "565b3461000057610056610067565b005b3461000057610065610147565b005b60006040"  # noqa: E501
-            "5160a680610200833901809050604051809103906000f080156100005790508073ffffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffff1660405180807f662829000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000081525060030190506040518091039020"  # noqa: E501
-            "7c0100000000000000000000000000000000000000000000000000000000900460405181"  # noqa: E501
-            "63ffffffff167c0100000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "0281526004018090506000604051808303816000876161da5a03f1925050505061000056"  # noqa: E501
-            "5b50565b3073ffffffffffffffffffffffffffffffffffffffff1660405180807f626164"  # noqa: E501
-            "282900000000000000000000000000000000000000000000000000000081525060050190"  # noqa: E501
-            "5060405180910390207c0100000000000000000000000000000000000000000000000000"  # noqa: E501
-            "00000090046040518163ffffffff167c0100000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000281526004018090506000604051808303816000876161da5a03f1"  # noqa: E501
-            "92505050505b56006060604052346000575b608f806100176000396000f3006060604052"  # noqa: E501
-            "6000357c0100000000000000000000000000000000000000000000000000000000900463"  # noqa: E501
-            "ffffffff16806326121ff014603c575b6000565b3460005760466048565b005b3373ffff"  # noqa: E501
-            "ffffffffffffffffffffffffffffffffffff16ff5b5600a165627a7a723058203d1a897b"  # noqa: E501
-            "efde21eff26abc325fb3da2f526bbc99de1c5c857d1835f673744ebd0029a165627a7a72"  # noqa: E501
-            "305820850a52b31ec4745b7af15ba3bffdb1ba17f5d9a00a5f263ee287a92b568f534c00"  # noqa: E501
-            "29"
+            "60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680639c3674fc14610049578063c040622614610058575b610000565b3461000057610056610067565b005b3461000057610065610147565b005b600060405160a680610200833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff1660405180807f6628290000000000000000000000000000000000000000000000000000000000815250600301905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f19250505050610000565b50565b3073ffffffffffffffffffffffffffffffffffffffff1660405180807f6261642829000000000000000000000000000000000000000000000000000000815250600501905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b56006060604052346000575b608f806100176000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806326121ff014603c575b6000565b3460005760466048565b005b3373ffffffffffffffffffffffffffffffffffffffff16ff5b5600a165627a7a723058203d1a897befde21eff26abc325fb3da2f526bbc99de1c5c857d1835f673744ebd0029a165627a7a72305820850a52b31ec4745b7af15ba3bffdb1ba17f5d9a00a5f263ee287a92b568f534c0029"  # noqa: E501
         ),
         nonce=0,
-        address=Address("0xd926bbc3745f0070528fc04cbfd3a2c9f9ca6a19"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("c0406226"),
+        to=target,
+        data=Bytes("c0406226"),
         gas_limit=500000,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}, nonce=0),
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_python_revert_test_tue201814_minus_1430.py b/tests/ported_static/stRevertTest/test_python_revert_test_tue201814_minus_1430.py
index 2e3eeb98329..f387b5eeabb 100644
--- a/tests/ported_static/stRevertTest/test_python_revert_test_tue201814_minus_1430.py
+++ b/tests/ported_static/stRevertTest/test_python_revert_test_tue201814_minus_1430.py
@@ -2,15 +2,15 @@
 A random test that had failed in Python ethereum implementation.
 
 Ported from:
-tests/static/state_tests/stRevertTest/PythonRevertTestTue201814-1430Filler.json
+state_tests/stRevertTest/PythonRevertTestTue201814-1430Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/PythonRevertTestTue201814-1430Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/PythonRevertTestTue201814-1430Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_python_revert_test_tue201814_minus_1430(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """A random test that had failed in Python ethereum implementation."""
-    coinbase = Address("0xf7b2e80637a148b5e46945e29388928dafd5aa25")
-    sender = EOA(
-        key=0x3E297DF41E49C542F54718BBEE92D449778686880729C852F6D2C3C40D135341
-    )
+    coinbase = Address(0xF7B2E80637A148B5E46945E29388928DAFD5AA25)
+    sender = pre.fund_eoa(amount=0xAB56295C9D120548)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,911 +43,399 @@ def test_python_revert_test_tue201814_minus_1430(
         gas_limit=5805800386153628,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x1F,
-                value=0xBEE2A270429ABBD3FF3B9945F72F58DCF4F8B344417A87DFA1EBD7,
-            )
-            + Op.ORIGIN
-            + Op.CALLCODE(
-                gas=0x2C1E2816,
-                address=0x69859649E8A52DE717592B881508371F8A8ED6B9,
-                value=0x42A46F50,
-                args_offset=0x132,
-                args_size=0x27B,
-                ret_offset=0x3EE,
-                ret_size=0x9B,
-            )
-            + Op.STATICCALL(
-                gas=0x2318D76F,
-                address=0x843E0B83D4D70DEDE90D9A4D93FA3F10BB5011C7,
-                args_offset=0x124,
-                args_size=0x131,
-                ret_offset=0x1EC,
-                ret_size=0x172,
-            )
-            + Op.PUSH19[0x1A0FF381BB40BB828D7781D2EF7C0FD8695F7]
-            + Op.PUSH29[
-                0x5465FBADF99FDFFEF2AFD94B0E76531B6EA0D23D2332D13C20368A072
-            ]
-            + Op.MSTORE8(
-                offset=0xA6B1EBC3464527E34C26A4379F9DFE4F8E57981A9FC08558C90D,
-                value=0x4E41BC1130,
-            )
-            + Op.JUMPI(
-                pc=0xCF72F489A4,
-                condition=0x38079F1921B60FE6FA448171FEC55C4C63E811712211,
-            )
-            + Op.SLOAD(key=0xE83A2F5427EAB647B075A910929DE0A6554FC1426B49)
-            + Op.MSTORE8(
-                offset=0x3BD089A6663F6DFF488574195B848FBB357EB7BE1FFF076E997770D03B7028,  # noqa: E501
-                value=0xCD8E2C770339616CE9C501FB746715DD4A20219229D0673AC05599,
-            )
-            + Op.DELEGATECALL(
-                gas=0x47CFE65D,
-                address=0x69859649E8A52DE717592B881508371F8A8ED6B9,
-                args_offset=0x2DB,
-                args_size=0x305,
-                ret_offset=0x284,
-                ret_size=0x3B3,
-            )
-            + Op.TIMESTAMP
-            + Op.GASPRICE
-            + Op.PUSH12[0x8679871DC28AA5A1399B21C8]
-            + Op.STATICCALL(
-                gas=0x11ECD01B,
-                address=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                args_offset=0x5B,
-                args_size=0x1F3,
-                ret_offset=0x47,
-                ret_size=0x2E4,
-            )
-            + Op.PUSH23[0xAFA8155ECD75DD05F9D7EB42FA3E79C6A2109DFF2A1E53]
-            + Op.REVERT(offset=0x1B2, size=0x30A)
-            + Op.CALLCODE(
-                gas=0x42CE224D,
-                address=Op.PUSH20[0x5],
-                value=0x459D135B,
-                args_offset=0x27F,
-                args_size=0x117,
-                ret_offset=0x58,
-                ret_size=0x263,
-            )
-            + Op.MSTORE(
-                offset=0xE3,
-                value=0xE612FBE000BED18EEC8345F005F537C72820D8B973,
-            )
-            + Op.PUSH12[0x50AE523A8F7467AE14A8BD9A]
-            + Op.PUSH11[0xAEE55862B685E32476CC67]
-            + Op.PUSH3[0xAE2C40]
-            + Op.PUSH9[0xCF55729540D111F44C]
-            + Op.SWAP3
-            + Op.RETURNDATACOPY(dest_offset=0x3F3, offset=0x1BC, size=0xE7)
-            + Op.LT(0x9ED3BB, 0x639458DAE7AD2A9B38)
-            + Op.REVERT(offset=0x36A, size=0xD8)
-            + Op.CREATE(value=0x6DB4B55B, offset=0x359, size=0x123)
-            + Op.MSTORE(offset=0x177, value=0x602169)
-            + Op.BYTE(0x1BCF921919, 0xEA8A7B3A)
-            + Op.RETURNDATACOPY(dest_offset=0x1F7, offset=0x371, size=0x3BE)
-            + Op.MSTORE8(
-                offset=0xA0B67479A345D1E70065,
-                value=0xC0413CB5D609CA9A51645238E4F1F8268F973C3A01,
-            )
-            + Op.CALL(
-                gas=0x35ADEABD,
-                address=Op.PUSH20[0x6],
-                value=0x3FF89B31,
-                args_offset=0x214,
-                args_size=0x2F2,
-                ret_offset=0x173,
-                ret_size=0x16,
-            )
-            + Op.RETURNDATASIZE
-            + Op.SLOAD(
-                key=0xE6D218AF54C3D8045447D06C726801695CFA26FDFAA6460A8685CD662855A5,  # noqa: E501
-            )
-            + Op.MLOAD(
-                offset=0x5716140AE0B1E25AEAF04AE7CF54E8AA7A22206DA5A6E52BDD3EF82AD40A4681,  # noqa: E501
-            )
-            + Op.PUSH24[0xD25811167B0A3F66A727652592924DC1291A6085D537C5DA]
-            + Op.RETURNDATACOPY(dest_offset=0x3A3, offset=0x1D, size=0x1B1)
-            + Op.PUSH22[0x2D6272A54F882460BC76407D6361C40CC56BC88A8BC9]
-            + Op.DELEGATECALL(
-                gas=0x5F449586,
-                address=0xE7E620C9CF6045209EDCAD4D6EF43413BEDF0949,
-                args_offset=0x1F3,
-                args_size=0x2C1,
-                ret_offset=0x3EC,
-                ret_size=0x72,
-            )
-        ),
-        balance=0x882FD85BC18C9F00,
-        nonce=29,
-        address=Address("0x69859649e8a52de717592b881508371f8a8ed6b9"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xAB56295C9D120548)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x277795A,
-                address=0xF7B2E80637A148B5E46945E29388928DAFD5AA25,
-                args_offset=0x148,
-                args_size=0xF5,
-                ret_offset=0xFF,
-                ret_size=0x2FA,
-            )
-            + Op.PUSH9[0x9497EDB6A665EAE52F]
-            + Op.RETURNDATASIZE
-            + Op.MSTORE(offset=0x3A5, value=0x524975)
-            + Op.RETURNDATACOPY(dest_offset=0xCB, offset=0xFB, size=0xA8)
-            + Op.REVERT(offset=0x3E0, size=0x2DD)
-            + Op.PUSH16[0x568A159C0CAE9044D258C55B10F4D100]
-            + Op.PUSH3[0x8D29AB]
-            + Op.PUSH25[0x1DF7FCEBB789E2A8CDBAA9C67C42CD1EBE81716EAD0E94C721]
-            + Op.PUSH14[0x279DD3A0B3DE311596D547292878]
-            + Op.PUSH20[0x449CCCE511E6991B3DC636A178159A3D9A062274]
-            + Op.PUSH3[0xCD9A67]
-            + Op.PUSH9[0xCCBA17C2CB06DE468E]
-            + Op.SWAP6
-            + Op.PUSH20[0xBF78E55AF17E19973F2C3F5D4C21C169890B9A9]
-            + Op.PUSH8[0x2491F91AA1E71426]
-            + Op.PUSH8[0x60D385ED594E21B]
-            + Op.PUSH14[0x2B23A6C4C50E7AB6A3EF66F83A2]
-            + Op.SWAP3
-            + Op.DIV(
-                0x906C348472B7CB,
-                0x9845B4BA85C4FDFBD0054A0123AD93EFF4B525B0F4B08D285F36F3BCAC6A985B,  # noqa: E501
-            )
-            + Op.LOG3(
-                offset=0x61BE606EF617322E6448E3E4124DBE061257A8F486529DE397F08CE92502,  # noqa: E501
-                size=0x3BFDFA7683AE0DF68BBCB534,
-                topic_1=0x44C0173C10F1806BA284F9C9C7C13670005DE594DEC538CD56C274,  # noqa: E501
-                topic_2=0xF536A04D436AD418A1CA,
-                topic_3=0xC5A02E618666F0C50EECDC11F20FC1DC41C2FD957752E55EDE4E56F4,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x314,
-                value=0x957F855818082B5B5B49E36DE5A83E8A270663088571BF2FDF8F5F29,  # noqa: E501
-            )
-            + Op.ORIGIN
-            + Op.SSTORE(key=0x43, value=0xB9499741E3859928A237F5E5DF84C13C)
-            + Op.SIGNEXTEND(
-                0x74D84835800999791ABC41260472D96F604D07198E859ADC,
-                0x1E82328F9093E64DEFBDD07D,
-            )
-            + Op.MSTORE8(
-                offset=0x900E69A68B0F0E9E4F1299872881,
-                value=0x806BEAE7200CF116D2B55E89DDD564ABC3,
-            )
-            + Op.LOG3(
-                offset=0xC0F49ABE102CD44E474AB71C0237247865FA2ADD74C8B2,
-                size=0x6ECF21D3A41AD554F79584DCAB761D4C8437774CAD4BB13B2BECE140358DF93E,  # noqa: E501
-                topic_1=0xD270ECE7,
-                topic_2=0x1C42F3B109ED2BD72A6CF13500241C2A5E5C4E17EA9ED9B05BA9B57D70D,  # noqa: E501
-                topic_3=0x5D,
-            )
-            + Op.RETURNDATASIZE
-            + Op.PUSH16[0x7041C5718A2554A72662720296DFF5B3]
-            + Op.PUSH24[0xB559DF4558B8A5B2C9E7D15EB3947A70064F935C8FDF0A4E]
-            + Op.PUSH19[0x6F644AA31B42C10280E50EA92A366C3D060C12]
-            + Op.PUSH17[0xC6A16A75522FBEB3D7CCA702807F521781]
-            + Op.PUSH15[0xAB9CCEB9E237EE8FDE4ED3A23D3EC8]
-            + Op.PUSH27[
-                0xDB334AC1CAA7E06523B0132DD615CF3FC16140D34C191617823C3A
-            ]
-            + Op.PUSH28[
-                0xF47C42BC36B69CB4385463595C7F6F9EA451E05303603E0CD401E13D
-            ]
-            + Op.PUSH16[0xF744E2A673824D943941551704FF14DF]
-            + Op.PUSH32[
-                0xA8646EFBB2D8ABC4AC6E258E9924924B8001F8F0650D66B37411D484B18F41E7  # noqa: E501
-            ]
-            + Op.PUSH29[
-                0x792BD1C169FA52BBFC8AF4A45F20ACB0EF95DB2ECBC0D4EADBBBF6732F
-            ]
-            + Op.PUSH5[0x8BD33B3633]
-            + Op.PUSH14[0xC0FAF0CF1970BCD38093A50A44FD]
-            + Op.PUSH12[0x253B0E74F2706239C499217B]
-            + Op.DUP13
-            + Op.ORIGIN
-            + Op.SLOAD(key=0xDAE332E2)
-            + Op.CALLDATALOAD(offset=0x1D5D5E7E795C998CCEED14CF46977E7D3CBB)
-            + Op.CALLDATALOAD(
-                offset=0x3C79EF0530C3A8AC3FD8D49F10BB0AE919FA149ADEAD67DAE0,
-            )
-            + Op.EXTCODECOPY(
-                address=0x69859649E8A52DE717592B881508371F8A8ED6B9,
-                dest_offset=0x71B518,
-                offset=0x2813AC,
-                size=0x7DE430,
-            )
-            + Op.PUSH32[
-                0xB9BA628E056E0E87E029B8E5F42821D775338E6774301ECB428B3938236EE22B  # noqa: E501
-            ]
-            + Op.PUSH30[
-                0xB5EDF2AD6997869F427BA0672A7168614233E85F61DAE5ED4283A53F605
-            ]
-            + Op.PUSH17[0x116DAD586DCE62833A62CA8C914C641F86]
-            + Op.DELEGATECALL(
-                gas=0x33D3D55F,
-                address=0xF7B2E80637A148B5E46945E29388928DAFD5AA25,
-                args_offset=0x31C,
-                args_size=0x107,
-                ret_offset=0x1D7,
-                ret_size=0x52,
-            )
-            + Op.PUSH2[0x1A5B]
-            + Op.PUSH4[0x1C4EA729]
-            + Op.DUP2
-            + Op.DELEGATECALL(
-                gas=0x202B2EA8,
-                address=Op.PUSH20[0x6],
-                args_offset=0x14A,
-                args_size=0x1C1,
-                ret_offset=0x3CE,
-                ret_size=0x256,
-            )
-            + Op.RETURNDATACOPY(dest_offset=0x2E, offset=0x106, size=0x221)
-            + Op.PUSH5[0x8A95029ECB]
-            + Op.DIV(
-                0xB8F2B53E55FE01A152C8496CBCC6997447062B734CEBDE,
-                0x849FE0943CB9D854C7D50AD04CFDFE648E2868,
-            )
-            + Op.PUSH26[0x6C6452E9EFC4ABA5BF071CBFF56208A525A8EF5F52399B4F3369]
-            + Op.PUSH28[
-                0xD988884F58166D734881774EFF46D77BB189C89C55B1C6591F178D2D
-            ]
-            + Op.PUSH29[
-                0x21BF2B023ADF9BC5B8621235E3346D98D56047A3F71241FD5A24ABBB0C
-            ]
-            + Op.PUSH20[0xFC463FB8A5E67E32055696FE51258DD07526EBD8]
-            + Op.PUSH31[
-                0x439BCEBB514AE26DC12D653A5C1263705109097EC5DCDB3918AB114985F709  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xD3003B50E58FBA91007825A6B800F644EAA306051808460FC3B2D8E276B2187C  # noqa: E501
-            ]
-            + Op.PUSH28[
-                0x583FF29EE0B0C34F9EE57BAC9EBB996402E3300DDF06C760FC5F531F
-            ]
-            + Op.PUSH21[0x6B1E2BEDA7A15C07F90F92422822E8D33C5D2409EA]
-            + Op.PUSH20[0x75197F7CD6D61770EDDB078206CFC7C5006CD0E9]
-            + Op.PUSH30[
-                0xA9EC65FA4FC683DA22CFAF6DFC995FEB5F8386A052851FC502F32E7EF934
-            ]
-            + Op.PUSH15[0x3D4633DEF4C0A4B9BE12F2CD7C6460]
-            + Op.PUSH3[0xE14CA3]
-            + Op.PUSH29[
-                0xFB977524F677714C3D994EA05F1997A2462FC0AB20ED2A5958F3712602
-            ]
-            + Op.SWAP12
-            + Op.DELEGATECALL(
-                gas=0x2E83DBE,
-                address=0x69859649E8A52DE717592B881508371F8A8ED6B9,
-                args_offset=0x3A1,
-                args_size=0x5D,
-                ret_offset=0x2C9,
-                ret_size=0x205,
-            )
-        ),
-        balance=0x845252B8509DC215,
-        nonce=29,
-        address=Address("0x843e0b83d4d70dede90d9a4d93fa3f10bb5011c7"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.RETURNDATACOPY(dest_offset=0x101, offset=0x19F, size=0x13)
-            + Op.PUSH16[0x338DB2B1165B4918F178852663192A95]
-            + Op.PUSH14[0x79A68B50EEFDC639CA0B62AB4D52]
-            + Op.PUSH24[0x1DB054CCC801C0666B34B3C6242BBFC5E98F20C14FB95E01]
-            + Op.PUSH8[0x18BE9AD033D50E21]
-            + Op.PUSH8[0x5FF59297861847EA]
-            + Op.PUSH11[0x911A6A9D135E2F826DC603]
-            + Op.PUSH30[
-                0x850E0DB21D105B8732A34B873C7D943050B8659794F0BD3E841D35A2231E
-            ]
-            + Op.PUSH6[0xF697F8CDE117]
-            + Op.PUSH8[0x28FA2051E87933CF]
-            + Op.PUSH7[0x858E4E5E91BAA7]
-            + Op.PUSH23[0x4FC1E9FFE4C7B15BA600E88F095989DC68F47ED704BE2B]
-            + Op.SWAP10
-            + Op.CREATE(value=0x200FBD63, offset=0x215, size=0x17)
-            + Op.RETURNDATACOPY(
-                dest_offset=0x99C91C,
-                offset=0x93AFAA8CE1769C96CD0751AA76A98C8196FA8C92E70D7BDA17,
-                size=0x41C7F86732F4D5419B41E6887CCA98E0943F141A5C66DF98BD0C6D6C4CEC65,  # noqa: E501
-            )
-            + Op.PUSH27[
-                0x7F05DE3181109B8194387746F9EC15A6E0233F759E43360BD4E0A0
-            ]
-            + Op.MSTORE(offset=0x161, value=0x4E9F395117AFCD072774CE12D13DC7)
-            + Op.ADDRESS
-            + Op.GASPRICE
-            + Op.PUSH9[0x3305858002A92140B6]
-            + Op.PUSH25[0x508E3A3BE377D4825DBF618A393C7C061E75A8A496A33AFE0F]
-            + Op.PUSH19[0x17F2E33549E321838B083D48893F23DCED459]
-            + Op.PUSH31[
-                0x2E9EA08FE3F80970D6334B6C6F1FDE8BCC81D03A7CCC244231CB6606DBA6D0  # noqa: E501
-            ]
-            + Op.PUSH15[0xC1C5158EF0DB6994192ACBD4CAC6AB]
-            + Op.PUSH11[0xC8449D80FC2C32471946E0]
-            + Op.PUSH18[0xD9606BD390266D7F712766F4765076283AD6]
-            + Op.PUSH9[0x7450D7AB4DF6F3F6EE]
-            + Op.SWAP7
-            + Op.MSTORE8(
-                offset=0xB802EC9D7ED96DC0B9CE7BD14B193DC1F0, value=0x14A
-            )
-            + Op.PUSH23[0xD11CE19283C7F651D4D2E7C180715FF7FCBC995EA8B276]
-            + Op.PUSH3[0x13CC51]
-            + Op.PUSH30[
-                0x6DAD16D17F29A93220CE0DDB0A65D3D474DBC39CBA5BCB3D4FCF9FEF1910
-            ]
-            + Op.PUSH1[0x7D]
-            + Op.PUSH5[0xC04511DF27]
-            + Op.PUSH32[
-                0x522AB2475FBB2BA0720711A903DBECFA0429BF11E6E90CBB0F13D4EE050C52C8  # noqa: E501
-            ]
-            + Op.PUSH20[0x65E0216B4096186FC604FB563FA59F1263EE91D5]
-            + Op.PUSH10[0x5E407FDFFE82CA1558F7]
-            + Op.DUP8
-            + Op.PUSH11[0x93F3A218DD9BA6901FDEA9]
-            + Op.RETURNDATASIZE
-            + Op.PUSH12[0xE498F0B0E1874331115E31AA]
-            + Op.PUSH16[0xAD4D87227362A9EC3E1C1BE11CDB2309]
-            + Op.PUSH10[0x7BBC0C692EEADFA91616]
-            + Op.PUSH10[0xB8AEC24564487DC74F8E]
-            + Op.PUSH30[
-                0x17E6A133B5DBE576838697DE73F856197203EF1A3A54F7EDB0DBD60F9D52
-            ]
-            + Op.PUSH21[0xDB6B5C1477169B77F0D817ED731A20DB4B9E5B83D2]
-            + Op.PUSH25[0x6BFFEFAB084A31C4AFDA168156612F281DA0BE688E5BDB1F31]
-            + Op.PUSH23[0xED78BC62343A7665ABAD6573482449E68B3ACFE820993D]
-            + Op.PUSH24[0xDF5785384D51AAA0612DAB5DDBF2A9BF550736AD42293387]
-            + Op.DUP9
-            + Op.REVERT(offset=0x23F, size=0x119)
-            + Op.CALL(
-                gas=0x792C6916,
-                address=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                value=0x5AF7465B,
-                args_offset=0x36E,
-                args_size=0x216,
-                ret_offset=0x22D,
-                ret_size=0x8F,
-            )
-            + Op.PUSH15[0xD70693587DF6CCFAE5218D01559BAC]
-            + Op.PUSH1[0x15]
-            + Op.REVERT(offset=0x1AD, size=0x200)
-        ),
+    # Source: raw
+    # 0x601361019f6101013e6f338db2b1165b4918f178852663192a956d79a68b50eefdc639ca0b62ab4d52771db054ccc801c0666b34b3c6242bbfc5e98f20c14fb95e016718be9ad033d50e21675ff59297861847ea6a911a6a9d135e2f826dc6037d850e0db21d105b8732a34b873c7d943050b8659794f0bd3e841d35a2231e65f697f8cde1176728fa2051e87933cf66858e4e5e91baa7764fc1e9ffe4c7b15ba600e88f095989dc68f47ed704be2b99601761021563200fbd63f07e41c7f86732f4d5419b41e6887cca98e0943f141a5c66df98bd0c6d6c4cec657893afaa8ce1769c96cd0751aa76a98c8196fa8c92e70d7bda176299c91c3e7a7f05de3181109b8194387746f9ec15a6e0233f759e43360bd4e0a06e4e9f395117afcd072774ce12d13dc761016152303a683305858002a92140b678508e3a3be377d4825dbf618a393c7c061e75a8a496a33afe0f72017f2e33549e321838b083d48893f23dced4597e2e9ea08fe3f80970d6334b6c6f1fde8bcc81d03a7ccc244231cb6606dba6d06ec1c5158ef0db6994192acbd4cac6ab6ac8449d80fc2c32471946e071d9606bd390266d7f712766f4765076283ad6687450d7ab4df6f3f6ee9661014a70b802ec9d7ed96dc0b9ce7bd14b193dc1f05376d11ce19283c7f651d4d2e7c180715ff7fcbc995ea8b2766213cc517d6dad16d17f29a93220ce0ddb0a65d3d474dbc39cba5bcb3d4fcf9fef1910607d64c04511df277f522ab2475fbb2ba0720711a903dbecfa0429bf11e6e90cbb0f13d4ee050c52c87365e0216b4096186fc604fb563fa59f1263ee91d5695e407fdffe82ca1558f7876a93f3a218dd9ba6901fdea93d6be498f0b0e1874331115e31aa6fad4d87227362a9ec3e1c1be11cdb2309697bbc0c692eeadfa9161669b8aec24564487dc74f8e7d17e6a133b5dbe576838697de73f856197203ef1a3a54f7edb0dbd60f9d5274db6b5c1477169b77f0d817ed731a20db4b9e5b83d2786bffefab084a31c4afda168156612f281da0be688e5bdb1f3176ed78bc62343a7665abad6573482449e68b3acfe820993d77df5785384d51aaa0612dab5ddbf2a9bf550736ad422933878861011961023ffd608f61022d61021661036e635af7465b73ffffffffffffffffffffffffffffffffffffffff63792c6916f16ed70693587df6ccfae5218d01559bac60156102006101adfd  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURNDATACOPY(dest_offset=0x101, offset=0x19F, size=0x13)
+        + Op.PUSH16[0x338DB2B1165B4918F178852663192A95]
+        + Op.PUSH14[0x79A68B50EEFDC639CA0B62AB4D52]
+        + Op.PUSH24[0x1DB054CCC801C0666B34B3C6242BBFC5E98F20C14FB95E01]
+        + Op.PUSH8[0x18BE9AD033D50E21]
+        + Op.PUSH8[0x5FF59297861847EA]
+        + Op.PUSH11[0x911A6A9D135E2F826DC603]
+        + Op.PUSH30[
+            0x850E0DB21D105B8732A34B873C7D943050B8659794F0BD3E841D35A2231E
+        ]
+        + Op.PUSH6[0xF697F8CDE117]
+        + Op.PUSH8[0x28FA2051E87933CF]
+        + Op.PUSH7[0x858E4E5E91BAA7]
+        + Op.PUSH23[0x4FC1E9FFE4C7B15BA600E88F095989DC68F47ED704BE2B]
+        + Op.SWAP10
+        + Op.CREATE(value=0x200FBD63, offset=0x215, size=0x17)
+        + Op.RETURNDATACOPY(
+            dest_offset=0x99C91C,
+            offset=0x93AFAA8CE1769C96CD0751AA76A98C8196FA8C92E70D7BDA17,
+            size=0x41C7F86732F4D5419B41E6887CCA98E0943F141A5C66DF98BD0C6D6C4CEC65,  # noqa: E501
+        )
+        + Op.PUSH27[0x7F05DE3181109B8194387746F9EC15A6E0233F759E43360BD4E0A0]
+        + Op.MSTORE(offset=0x161, value=0x4E9F395117AFCD072774CE12D13DC7)
+        + Op.ADDRESS
+        + Op.GASPRICE
+        + Op.PUSH9[0x3305858002A92140B6]
+        + Op.PUSH25[0x508E3A3BE377D4825DBF618A393C7C061E75A8A496A33AFE0F]
+        + Op.PUSH19[0x17F2E33549E321838B083D48893F23DCED459]
+        + Op.PUSH31[
+            0x2E9EA08FE3F80970D6334B6C6F1FDE8BCC81D03A7CCC244231CB6606DBA6D0
+        ]
+        + Op.PUSH15[0xC1C5158EF0DB6994192ACBD4CAC6AB]
+        + Op.PUSH11[0xC8449D80FC2C32471946E0]
+        + Op.PUSH18[0xD9606BD390266D7F712766F4765076283AD6]
+        + Op.PUSH9[0x7450D7AB4DF6F3F6EE]
+        + Op.SWAP7
+        + Op.MSTORE8(offset=0xB802EC9D7ED96DC0B9CE7BD14B193DC1F0, value=0x14A)
+        + Op.PUSH23[0xD11CE19283C7F651D4D2E7C180715FF7FCBC995EA8B276]
+        + Op.PUSH3[0x13CC51]
+        + Op.PUSH30[
+            0x6DAD16D17F29A93220CE0DDB0A65D3D474DBC39CBA5BCB3D4FCF9FEF1910
+        ]
+        + Op.PUSH1[0x7D]
+        + Op.PUSH5[0xC04511DF27]
+        + Op.PUSH32[
+            0x522AB2475FBB2BA0720711A903DBECFA0429BF11E6E90CBB0F13D4EE050C52C8
+        ]
+        + Op.PUSH20[0x65E0216B4096186FC604FB563FA59F1263EE91D5]
+        + Op.PUSH10[0x5E407FDFFE82CA1558F7]
+        + Op.DUP8
+        + Op.PUSH11[0x93F3A218DD9BA6901FDEA9]
+        + Op.RETURNDATASIZE
+        + Op.PUSH12[0xE498F0B0E1874331115E31AA]
+        + Op.PUSH16[0xAD4D87227362A9EC3E1C1BE11CDB2309]
+        + Op.PUSH10[0x7BBC0C692EEADFA91616]
+        + Op.PUSH10[0xB8AEC24564487DC74F8E]
+        + Op.PUSH30[
+            0x17E6A133B5DBE576838697DE73F856197203EF1A3A54F7EDB0DBD60F9D52
+        ]
+        + Op.PUSH21[0xDB6B5C1477169B77F0D817ED731A20DB4B9E5B83D2]
+        + Op.PUSH25[0x6BFFEFAB084A31C4AFDA168156612F281DA0BE688E5BDB1F31]
+        + Op.PUSH23[0xED78BC62343A7665ABAD6573482449E68B3ACFE820993D]
+        + Op.PUSH24[0xDF5785384D51AAA0612DAB5DDBF2A9BF550736AD42293387]
+        + Op.DUP9
+        + Op.REVERT(offset=0x23F, size=0x119)
+        + Op.CALL(
+            gas=0x792C6916,
+            address=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+            value=0x5AF7465B,
+            args_offset=0x36E,
+            args_size=0x216,
+            ret_offset=0x22D,
+            ret_size=0x8F,
+        )
+        + Op.PUSH15[0xD70693587DF6CCFAE5218D01559BAC]
+        + Op.PUSH1[0x15]
+        + Op.REVERT(offset=0x1AD, size=0x200),
         balance=0x5B1936A53E6E440F,
         nonce=21,
-        address=Address("0xe7e620c9cf6045209edcad4d6ef43413bedf0949"),  # noqa: E501
+        address=Address(0xE7E620C9CF6045209EDCAD4D6EF43413BEDF0949),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x610326610100f379c940b5f2046740058558468f238b85db7f6bbe3f3d51e92a3e3268b7f7c4147541c695f376705288410b81b217e80726fb9e4c5c7b4c49eca0c1b6b97e117c16c26c9816459f38396ffc36da48d65defdc7d055cbc846c07e81cfab0fb607c6cbc968774d4de7df8e3236f581e688cc2081a96b1cad9e0609b70f4fddda49ae97714e7d325ceab23acd5f46ba15b5210474116121921a04f68f3f933b9ad91b735bf71bfe41da706499c5d47b6de1fe398cb91fdf66481cbb8661d71d457cf3cef75dabf5ea496d7012f4c56b9fe70e6c4204720e3ce66874cead08499d57a547b97d37744ce205e051f296fb116fc9e5f3c280919aff3c93c5d5cefff9a6102d86103ca6364b68c8ef07d  # noqa: E501
+    coinbase = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "610326610100f379c940b5f2046740058558468f238b85db7f6bbe3f3d51e92a3e3268b7"  # noqa: E501
-            "f7c4147541c695f376705288410b81b217e80726fb9e4c5c7b4c49eca0c1b6b97e117c16"  # noqa: E501
-            "c26c9816459f38396ffc36da48d65defdc7d055cbc846c07e81cfab0fb607c6cbc968774"  # noqa: E501
-            "d4de7df8e3236f581e688cc2081a96b1cad9e0609b70f4fddda49ae97714e7d325ceab23"  # noqa: E501
-            "acd5f46ba15b5210474116121921a04f68f3f933b9ad91b735bf71bfe41da706499c5d47"  # noqa: E501
-            "b6de1fe398cb91fdf66481cbb8661d71d457cf3cef75dabf5ea496d7012f4c56b9fe70e6"  # noqa: E501
-            "c4204720e3ce66874cead08499d57a547b97d37744ce205e051f296fb116fc9e5f3c2809"  # noqa: E501
-            "19aff3c93c5d5cefff9a6102d86103ca6364b68c8ef07d"
+            "610326610100f379c940b5f2046740058558468f238b85db7f6bbe3f3d51e92a3e3268b7f7c4147541c695f376705288410b81b217e80726fb9e4c5c7b4c49eca0c1b6b97e117c16c26c9816459f38396ffc36da48d65defdc7d055cbc846c07e81cfab0fb607c6cbc968774d4de7df8e3236f581e688cc2081a96b1cad9e0609b70f4fddda49ae97714e7d325ceab23acd5f46ba15b5210474116121921a04f68f3f933b9ad91b735bf71bfe41da706499c5d47b6de1fe398cb91fdf66481cbb8661d71d457cf3cef75dabf5ea496d7012f4c56b9fe70e6c4204720e3ce66874cead08499d57a547b97d37744ce205e051f296fb116fc9e5f3c280919aff3c93c5d5cefff9a6102d86103ca6364b68c8ef07d"  # noqa: E501
         ),
         balance=0x54C814F188394C8,
         nonce=29,
-        address=coinbase,  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "66a9b45d44c78cfe774333fe0c49418dd61f183d41132f5340e48ababb825a26eb0a75c0"  # noqa: E501
-            "ca693a8b465121200fd21a7b4c365a65a3255278f672705e5ca0f6146fccd36a6e5b9dec"  # noqa: E501
-            "fb6e5096887651e829313a2cc9d5b518e25861c31ba04ed3f5a3310bd966993aa534b007"  # noqa: E501
-            "85778d9545342410ce8c156d780a8cb4a65efed30aa9d6bd63c4778a134c9cb0c677ecda"  # noqa: E501
-            "48aacef0c191de37e3cfdae69153747c2406995ea81bbae6a201663b9b37a6a9f597ae4f"  # noqa: E501
-            "40e44e74ea92616bc2956328ced0d77412c265c2925470320e5f285d15a08a263b0a4445"  # noqa: E501
-            "16817c266bd51fe726677144df3c080d07dd47c4eb9e44a87541ddc5a697163260a06921"  # noqa: E501
-            "033eb3542b375cd0d073dfb48f6acde07152794b5539563efff1afed3b0a6b1516652617"  # noqa: E501
-            "5e7184b83cc2de68df61ec5d65d1eee66ea376fcb84f2c73335db9fba49e3d40638cd7f4"  # noqa: E501
-            "62f1d3b315f17b8dc1f692a68b2431b166ee71a4ba159dd322b9fa5f3237dfb85d259405"  # noqa: E501
-            "6102f261025b61021d6101d3631fe4bdc373ffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffff631ea09dc6f263edd580947c8177bd72d2244f7652371e3428d28bc6356c553b18d0"  # noqa: E501
-            "0e6b3cf60206c273abbd7763059f61940b0d19fde33f7b5a96080d25791e9ae89c718dd4"  # noqa: E501
-            "1c3f57b0c304fbb83978de28d23499bdd19c0472301ff527ccc9f7ed74a8dbd906b468d4"  # noqa: E501
-            "48fba77f38f193e3047b02e40beb08b4f11707681ef103ec1b00585a85f27227a179f15e"  # noqa: E501
-            "7e97a359268b06ff34bcee23a869974fbca6e201cb16179743ac0f8c9f8603d570e26a5a"  # noqa: E501
-            "ad5217ebfff3140716923723efaa79b6cd87fbc9fd408d4ac5a048e43fb4e7a2b94053bf"  # noqa: E501
-            "1fb7257562977725cde415738a99e1a7690cbe409744b737367dedc82e3063516c5bc57e"  # noqa: E501
-            "35fcb2038306d9a3a6e46103515279ddcb9d30879e470f5dd81e1148184f62bd61ae9708"  # noqa: E501
-            "ff61cee25c63694a73437a42be5043b1fde117ba383682ba0d91e0db8b29c882a044d0c8"  # noqa: E501
-            "bb49056a25a66d8480df1b1ccc2564791df94f43d5802aa8f44bf70a6817ed784e5725bd"  # noqa: E501
-            "c7718a54d6a567234286085240ba847d575dac25d7fc32c59999a9d38fee0d25e7c23986"  # noqa: E501
-            "009c5bb022f7d28a2cab6e01a4bb37dd42ea42d5141d55f5730c7bd82bf08bff3928aea7"  # noqa: E501
-            "7e7153bcc4a3a53996be367ec98cb6fe85797e771d020284d4d302c8b4ebe6b28a9c64a9"  # noqa: E501
-            "ae2ad6894716732f6b245e7fdc5243f79a0ae9b8d874900caa1c5796a2854ceddb00a82b"  # noqa: E501
-            "4ec01b513ed61c72ce89400a06fe90a109bad6d5e028143e7552937a0136347eb71a49db"  # noqa: E501
-            "0072c87bd437b9cd7b2f7e6e9f3a85875c9ede6036650f9d06d4c2e8692caf2e87043c0b"  # noqa: E501
-            "f5a2359c66431acbb35dcbfc6a7b86074b99c9e6f959d8417784e5e40c854c280218c0cd"  # noqa: E501
-            "4e98dc3bc44f7d651d7191ead455"
-        ),
-        gas_limit=2643883,
-        value=625999040,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/PythonRevertTestTue201814-1430Filler.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_python_revert_test_tue201814_minus_1430_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """A random test that had failed in Python ethereum implementation."""
-    coinbase = Address("0xf7b2e80637a148b5e46945e29388928dafd5aa25")
-    sender = EOA(
-        key=0x3E297DF41E49C542F54718BBEE92D449778686880729C852F6D2C3C40D135341
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=5805800386153628,
-    )
-
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x1F,
-                value=0xBEE2A270429ABBD3FF3B9945F72F58DCF4F8B344417A87DFA1EBD7,
-            )
-            + Op.ORIGIN
-            + Op.CALLCODE(
-                gas=0x2C1E2816,
-                address=0x69859649E8A52DE717592B881508371F8A8ED6B9,
-                value=0x42A46F50,
-                args_offset=0x132,
-                args_size=0x27B,
-                ret_offset=0x3EE,
-                ret_size=0x9B,
-            )
-            + Op.STATICCALL(
-                gas=0x2318D76F,
-                address=0x843E0B83D4D70DEDE90D9A4D93FA3F10BB5011C7,
-                args_offset=0x124,
-                args_size=0x131,
-                ret_offset=0x1EC,
-                ret_size=0x172,
-            )
-            + Op.PUSH19[0x1A0FF381BB40BB828D7781D2EF7C0FD8695F7]
-            + Op.PUSH29[
-                0x5465FBADF99FDFFEF2AFD94B0E76531B6EA0D23D2332D13C20368A072
-            ]
-            + Op.MSTORE8(
-                offset=0xA6B1EBC3464527E34C26A4379F9DFE4F8E57981A9FC08558C90D,
-                value=0x4E41BC1130,
-            )
-            + Op.JUMPI(
-                pc=0xCF72F489A4,
-                condition=0x38079F1921B60FE6FA448171FEC55C4C63E811712211,
-            )
-            + Op.SLOAD(key=0xE83A2F5427EAB647B075A910929DE0A6554FC1426B49)
-            + Op.MSTORE8(
-                offset=0x3BD089A6663F6DFF488574195B848FBB357EB7BE1FFF076E997770D03B7028,  # noqa: E501
-                value=0xCD8E2C770339616CE9C501FB746715DD4A20219229D0673AC05599,
-            )
-            + Op.DELEGATECALL(
-                gas=0x47CFE65D,
-                address=0x69859649E8A52DE717592B881508371F8A8ED6B9,
-                args_offset=0x2DB,
-                args_size=0x305,
-                ret_offset=0x284,
-                ret_size=0x3B3,
-            )
-            + Op.TIMESTAMP
-            + Op.GASPRICE
-            + Op.PUSH12[0x8679871DC28AA5A1399B21C8]
-            + Op.STATICCALL(
-                gas=0x11ECD01B,
-                address=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                args_offset=0x5B,
-                args_size=0x1F3,
-                ret_offset=0x47,
-                ret_size=0x2E4,
-            )
-            + Op.PUSH23[0xAFA8155ECD75DD05F9D7EB42FA3E79C6A2109DFF2A1E53]
-            + Op.REVERT(offset=0x1B2, size=0x30A)
-            + Op.CALLCODE(
-                gas=0x42CE224D,
-                address=Op.PUSH20[0x5],
-                value=0x459D135B,
-                args_offset=0x27F,
-                args_size=0x117,
-                ret_offset=0x58,
-                ret_size=0x263,
-            )
-            + Op.MSTORE(
-                offset=0xE3,
-                value=0xE612FBE000BED18EEC8345F005F537C72820D8B973,
-            )
-            + Op.PUSH12[0x50AE523A8F7467AE14A8BD9A]
-            + Op.PUSH11[0xAEE55862B685E32476CC67]
-            + Op.PUSH3[0xAE2C40]
-            + Op.PUSH9[0xCF55729540D111F44C]
-            + Op.SWAP3
-            + Op.RETURNDATACOPY(dest_offset=0x3F3, offset=0x1BC, size=0xE7)
-            + Op.LT(0x9ED3BB, 0x639458DAE7AD2A9B38)
-            + Op.REVERT(offset=0x36A, size=0xD8)
-            + Op.CREATE(value=0x6DB4B55B, offset=0x359, size=0x123)
-            + Op.MSTORE(offset=0x177, value=0x602169)
-            + Op.BYTE(0x1BCF921919, 0xEA8A7B3A)
-            + Op.RETURNDATACOPY(dest_offset=0x1F7, offset=0x371, size=0x3BE)
-            + Op.MSTORE8(
-                offset=0xA0B67479A345D1E70065,
-                value=0xC0413CB5D609CA9A51645238E4F1F8268F973C3A01,
-            )
-            + Op.CALL(
-                gas=0x35ADEABD,
-                address=Op.PUSH20[0x6],
-                value=0x3FF89B31,
-                args_offset=0x214,
-                args_size=0x2F2,
-                ret_offset=0x173,
-                ret_size=0x16,
-            )
-            + Op.RETURNDATASIZE
-            + Op.SLOAD(
-                key=0xE6D218AF54C3D8045447D06C726801695CFA26FDFAA6460A8685CD662855A5,  # noqa: E501
-            )
-            + Op.MLOAD(
-                offset=0x5716140AE0B1E25AEAF04AE7CF54E8AA7A22206DA5A6E52BDD3EF82AD40A4681,  # noqa: E501
-            )
-            + Op.PUSH24[0xD25811167B0A3F66A727652592924DC1291A6085D537C5DA]
-            + Op.RETURNDATACOPY(dest_offset=0x3A3, offset=0x1D, size=0x1B1)
-            + Op.PUSH22[0x2D6272A54F882460BC76407D6361C40CC56BC88A8BC9]
-            + Op.DELEGATECALL(
-                gas=0x5F449586,
-                address=0xE7E620C9CF6045209EDCAD4D6EF43413BEDF0949,
-                args_offset=0x1F3,
-                args_size=0x2C1,
-                ret_offset=0x3EC,
-                ret_size=0x72,
-            )
-        ),
-        balance=0x882FD85BC18C9F00,
-        nonce=29,
-        address=Address("0x69859649e8a52de717592b881508371f8a8ed6b9"),  # noqa: E501
+        address=Address(0xF7B2E80637A148B5E46945E29388928DAFD5AA25),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xAB56295C9D120548)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x277795A,
-                address=0xF7B2E80637A148B5E46945E29388928DAFD5AA25,
-                args_offset=0x148,
-                args_size=0xF5,
-                ret_offset=0xFF,
-                ret_size=0x2FA,
-            )
-            + Op.PUSH9[0x9497EDB6A665EAE52F]
-            + Op.RETURNDATASIZE
-            + Op.MSTORE(offset=0x3A5, value=0x524975)
-            + Op.RETURNDATACOPY(dest_offset=0xCB, offset=0xFB, size=0xA8)
-            + Op.REVERT(offset=0x3E0, size=0x2DD)
-            + Op.PUSH16[0x568A159C0CAE9044D258C55B10F4D100]
-            + Op.PUSH3[0x8D29AB]
-            + Op.PUSH25[0x1DF7FCEBB789E2A8CDBAA9C67C42CD1EBE81716EAD0E94C721]
-            + Op.PUSH14[0x279DD3A0B3DE311596D547292878]
-            + Op.PUSH20[0x449CCCE511E6991B3DC636A178159A3D9A062274]
-            + Op.PUSH3[0xCD9A67]
-            + Op.PUSH9[0xCCBA17C2CB06DE468E]
-            + Op.SWAP6
-            + Op.PUSH20[0xBF78E55AF17E19973F2C3F5D4C21C169890B9A9]
-            + Op.PUSH8[0x2491F91AA1E71426]
-            + Op.PUSH8[0x60D385ED594E21B]
-            + Op.PUSH14[0x2B23A6C4C50E7AB6A3EF66F83A2]
-            + Op.SWAP3
-            + Op.DIV(
-                0x906C348472B7CB,
-                0x9845B4BA85C4FDFBD0054A0123AD93EFF4B525B0F4B08D285F36F3BCAC6A985B,  # noqa: E501
-            )
-            + Op.LOG3(
-                offset=0x61BE606EF617322E6448E3E4124DBE061257A8F486529DE397F08CE92502,  # noqa: E501
-                size=0x3BFDFA7683AE0DF68BBCB534,
-                topic_1=0x44C0173C10F1806BA284F9C9C7C13670005DE594DEC538CD56C274,  # noqa: E501
-                topic_2=0xF536A04D436AD418A1CA,
-                topic_3=0xC5A02E618666F0C50EECDC11F20FC1DC41C2FD957752E55EDE4E56F4,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x314,
-                value=0x957F855818082B5B5B49E36DE5A83E8A270663088571BF2FDF8F5F29,  # noqa: E501
-            )
-            + Op.ORIGIN
-            + Op.SSTORE(key=0x43, value=0xB9499741E3859928A237F5E5DF84C13C)
-            + Op.SIGNEXTEND(
-                0x74D84835800999791ABC41260472D96F604D07198E859ADC,
-                0x1E82328F9093E64DEFBDD07D,
-            )
-            + Op.MSTORE8(
-                offset=0x900E69A68B0F0E9E4F1299872881,
-                value=0x806BEAE7200CF116D2B55E89DDD564ABC3,
-            )
-            + Op.LOG3(
-                offset=0xC0F49ABE102CD44E474AB71C0237247865FA2ADD74C8B2,
-                size=0x6ECF21D3A41AD554F79584DCAB761D4C8437774CAD4BB13B2BECE140358DF93E,  # noqa: E501
-                topic_1=0xD270ECE7,
-                topic_2=0x1C42F3B109ED2BD72A6CF13500241C2A5E5C4E17EA9ED9B05BA9B57D70D,  # noqa: E501
-                topic_3=0x5D,
-            )
-            + Op.RETURNDATASIZE
-            + Op.PUSH16[0x7041C5718A2554A72662720296DFF5B3]
-            + Op.PUSH24[0xB559DF4558B8A5B2C9E7D15EB3947A70064F935C8FDF0A4E]
-            + Op.PUSH19[0x6F644AA31B42C10280E50EA92A366C3D060C12]
-            + Op.PUSH17[0xC6A16A75522FBEB3D7CCA702807F521781]
-            + Op.PUSH15[0xAB9CCEB9E237EE8FDE4ED3A23D3EC8]
-            + Op.PUSH27[
-                0xDB334AC1CAA7E06523B0132DD615CF3FC16140D34C191617823C3A
-            ]
-            + Op.PUSH28[
-                0xF47C42BC36B69CB4385463595C7F6F9EA451E05303603E0CD401E13D
-            ]
-            + Op.PUSH16[0xF744E2A673824D943941551704FF14DF]
-            + Op.PUSH32[
-                0xA8646EFBB2D8ABC4AC6E258E9924924B8001F8F0650D66B37411D484B18F41E7  # noqa: E501
-            ]
-            + Op.PUSH29[
-                0x792BD1C169FA52BBFC8AF4A45F20ACB0EF95DB2ECBC0D4EADBBBF6732F
-            ]
-            + Op.PUSH5[0x8BD33B3633]
-            + Op.PUSH14[0xC0FAF0CF1970BCD38093A50A44FD]
-            + Op.PUSH12[0x253B0E74F2706239C499217B]
-            + Op.DUP13
-            + Op.ORIGIN
-            + Op.SLOAD(key=0xDAE332E2)
-            + Op.CALLDATALOAD(offset=0x1D5D5E7E795C998CCEED14CF46977E7D3CBB)
-            + Op.CALLDATALOAD(
-                offset=0x3C79EF0530C3A8AC3FD8D49F10BB0AE919FA149ADEAD67DAE0,
-            )
-            + Op.EXTCODECOPY(
-                address=0x69859649E8A52DE717592B881508371F8A8ED6B9,
-                dest_offset=0x71B518,
-                offset=0x2813AC,
-                size=0x7DE430,
-            )
-            + Op.PUSH32[
-                0xB9BA628E056E0E87E029B8E5F42821D775338E6774301ECB428B3938236EE22B  # noqa: E501
-            ]
-            + Op.PUSH30[
-                0xB5EDF2AD6997869F427BA0672A7168614233E85F61DAE5ED4283A53F605
-            ]
-            + Op.PUSH17[0x116DAD586DCE62833A62CA8C914C641F86]
-            + Op.DELEGATECALL(
-                gas=0x33D3D55F,
-                address=0xF7B2E80637A148B5E46945E29388928DAFD5AA25,
-                args_offset=0x31C,
-                args_size=0x107,
-                ret_offset=0x1D7,
-                ret_size=0x52,
-            )
-            + Op.PUSH2[0x1A5B]
-            + Op.PUSH4[0x1C4EA729]
-            + Op.DUP2
-            + Op.DELEGATECALL(
-                gas=0x202B2EA8,
-                address=Op.PUSH20[0x6],
-                args_offset=0x14A,
-                args_size=0x1C1,
-                ret_offset=0x3CE,
-                ret_size=0x256,
-            )
-            + Op.RETURNDATACOPY(dest_offset=0x2E, offset=0x106, size=0x221)
-            + Op.PUSH5[0x8A95029ECB]
-            + Op.DIV(
-                0xB8F2B53E55FE01A152C8496CBCC6997447062B734CEBDE,
-                0x849FE0943CB9D854C7D50AD04CFDFE648E2868,
-            )
-            + Op.PUSH26[0x6C6452E9EFC4ABA5BF071CBFF56208A525A8EF5F52399B4F3369]
-            + Op.PUSH28[
-                0xD988884F58166D734881774EFF46D77BB189C89C55B1C6591F178D2D
-            ]
-            + Op.PUSH29[
-                0x21BF2B023ADF9BC5B8621235E3346D98D56047A3F71241FD5A24ABBB0C
-            ]
-            + Op.PUSH20[0xFC463FB8A5E67E32055696FE51258DD07526EBD8]
-            + Op.PUSH31[
-                0x439BCEBB514AE26DC12D653A5C1263705109097EC5DCDB3918AB114985F709  # noqa: E501
-            ]
-            + Op.PUSH32[
-                0xD3003B50E58FBA91007825A6B800F644EAA306051808460FC3B2D8E276B2187C  # noqa: E501
-            ]
-            + Op.PUSH28[
-                0x583FF29EE0B0C34F9EE57BAC9EBB996402E3300DDF06C760FC5F531F
-            ]
-            + Op.PUSH21[0x6B1E2BEDA7A15C07F90F92422822E8D33C5D2409EA]
-            + Op.PUSH20[0x75197F7CD6D61770EDDB078206CFC7C5006CD0E9]
-            + Op.PUSH30[
-                0xA9EC65FA4FC683DA22CFAF6DFC995FEB5F8386A052851FC502F32E7EF934
-            ]
-            + Op.PUSH15[0x3D4633DEF4C0A4B9BE12F2CD7C6460]
-            + Op.PUSH3[0xE14CA3]
-            + Op.PUSH29[
-                0xFB977524F677714C3D994EA05F1997A2462FC0AB20ED2A5958F3712602
-            ]
-            + Op.SWAP12
-            + Op.DELEGATECALL(
-                gas=0x2E83DBE,
-                address=0x69859649E8A52DE717592B881508371F8A8ED6B9,
-                args_offset=0x3A1,
-                args_size=0x5D,
-                ret_offset=0x2C9,
-                ret_size=0x205,
-            )
+    # Source: raw
+    # 0x6102fa60ff60f561014873<contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b>630277795afa689497edb6a665eae52f3d625249756103a55260a860fb60cb3e6102dd6103e0fd6f568a159c0cae9044d258c55b10f4d100628d29ab781df7fcebb789e2a8cdbaa9c67c42cd1ebe81716ead0e94c7216d279dd3a0b3de311596d54729287873449ccce511e6991b3dc636a178159a3d9a06227462cd9a6768ccba17c2cb06de468e95730bf78e55af17e19973f2c3f5d4c21c169890b9a9672491f91aa1e7142667060d385ed594e21b6d02b23a6c4c50e7ab6a3ef66f83a2927f9845b4ba85c4fdfbd0054a0123ad93eff4b525b0f4b08d285f36f3bcac6a985b66906c348472b7cb047bc5a02e618666f0c50eecdc11f20fc1dc41c2fd957752e55ede4e56f469f536a04d436ad418a1ca7a44c0173c10f1806ba284f9c9c7c13670005de594dec538cd56c2746b3bfdfa7683ae0df68bbcb5347d61be606ef617322e6448e3e4124dbe061257a8f486529de397f08ce92502a37b957f855818082b5b5b49e36de5a83e8a270663088571bf2fdf8f5f2961031452326fb9499741e3859928a237f5e5df84c13c6043556b1e82328f9093e64defbdd07d7774d84835800999791abc41260472d96f604d07198e859adc0b70806beae7200cf116d2b55e89ddd564abc36d900e69a68b0f0e9e4f129987288153605d7d01c42f3b109ed2bd72a6cf13500241c2a5e5c4e17ea9ed9b05ba9b57d70d63d270ece77f6ecf21d3a41ad554f79584dcab761d4c8437774cad4bb13b2bece140358df93e76c0f49abe102cd44e474ab71c0237247865fa2add74c8b2a33d6f7041c5718a2554a72662720296dff5b377b559df4558b8a5b2c9e7d15eb3947a70064f935c8fdf0a4e726f644aa31b42c10280e50ea92a366c3d060c1270c6a16a75522fbeb3d7cca702807f5217816eab9cceb9e237ee8fde4ed3a23d3ec87adb334ac1caa7e06523b0132dd615cf3fc16140d34c191617823c3a7bf47c42bc36b69cb4385463595c7f6f9ea451e05303603e0cd401e13d6ff744e2a673824d943941551704ff14df7fa8646efbb2d8abc4ac6e258e9924924b8001f8f0650d66b37411d484b18f41e77c792bd1c169fa52bbfc8af4a45f20acb0ef95db2ecbc0d4eadbbbf6732f648bd33b36336dc0faf0cf1970bcd38093a50a44fd6b253b0e74f2706239c499217b8c3263dae332e254711d5d5e7e795c998cceed14cf46977e7d3cbb35783c79ef0530c3a8ac3fd8d49f10bb0ae919fa149adead67dae035627de430622813ac6271b51873<contract:0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b>3c7fb9ba628e056e0e87e029b8e5f42821d775338e6774301ecb428b3938236ee22b7d0b5edf2ad6997869f427ba0672a7168614233e85f61dae5ed4283a53f60570116dad586dce62833a62ca8c914c641f8660526101d761010761031c73<contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b>6333d3d55ff4611a5b631c4ea729816102566103ce6101c161014a73000000000000000000000000000000000000000663202b2ea8f4610221610106602e3e648a95029ecb72849fe0943cb9d854c7d50ad04cfdfe648e286876b8f2b53e55fe01a152c8496cbcc6997447062b734cebde04796c6452e9efc4aba5bf071cbff56208a525a8ef5f52399b4f33697bd988884f58166d734881774eff46d77bb189c89c55b1c6591f178d2d7c21bf2b023adf9bc5b8621235e3346d98d56047a3f71241fd5a24abbb0c73fc463fb8a5e67e32055696fe51258dd07526ebd87e439bcebb514ae26dc12d653a5c1263705109097ec5dcdb3918ab114985f7097fd3003b50e58fba91007825a6b800f644eaa306051808460fc3b2d8e276b2187c7b583ff29ee0b0c34f9ee57bac9ebb996402e3300ddf06c760fc5f531f746b1e2beda7a15c07f90f92422822e8d33c5d2409ea7375197f7cd6d61770eddb078206cfc7c5006cd0e97da9ec65fa4fc683da22cfaf6dfc995feb5f8386a052851fc502f32e7ef9346e3d4633def4c0a4b9be12f2cd7c646062e14ca37cfb977524f677714c3d994ea05f1997a2462fc0ab20ed2a5958f37126029b6102056102c9605d6103a173<contract:0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b>6302e83dbef4  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x277795A,
+            address=0xF7B2E80637A148B5E46945E29388928DAFD5AA25,
+            args_offset=0x148,
+            args_size=0xF5,
+            ret_offset=0xFF,
+            ret_size=0x2FA,
+        )
+        + Op.PUSH9[0x9497EDB6A665EAE52F]
+        + Op.RETURNDATASIZE
+        + Op.MSTORE(offset=0x3A5, value=0x524975)
+        + Op.RETURNDATACOPY(dest_offset=0xCB, offset=0xFB, size=0xA8)
+        + Op.REVERT(offset=0x3E0, size=0x2DD)
+        + Op.PUSH16[0x568A159C0CAE9044D258C55B10F4D100]
+        + Op.PUSH3[0x8D29AB]
+        + Op.PUSH25[0x1DF7FCEBB789E2A8CDBAA9C67C42CD1EBE81716EAD0E94C721]
+        + Op.PUSH14[0x279DD3A0B3DE311596D547292878]
+        + Op.PUSH20[0x449CCCE511E6991B3DC636A178159A3D9A062274]
+        + Op.PUSH3[0xCD9A67]
+        + Op.PUSH9[0xCCBA17C2CB06DE468E]
+        + Op.SWAP6
+        + Op.PUSH20[0xBF78E55AF17E19973F2C3F5D4C21C169890B9A9]
+        + Op.PUSH8[0x2491F91AA1E71426]
+        + Op.PUSH8[0x60D385ED594E21B]
+        + Op.PUSH14[0x2B23A6C4C50E7AB6A3EF66F83A2]
+        + Op.SWAP3
+        + Op.DIV(
+            0x906C348472B7CB,
+            0x9845B4BA85C4FDFBD0054A0123AD93EFF4B525B0F4B08D285F36F3BCAC6A985B,
+        )
+        + Op.LOG3(
+            offset=0x61BE606EF617322E6448E3E4124DBE061257A8F486529DE397F08CE92502,  # noqa: E501
+            size=0x3BFDFA7683AE0DF68BBCB534,
+            topic_1=0x44C0173C10F1806BA284F9C9C7C13670005DE594DEC538CD56C274,
+            topic_2=0xF536A04D436AD418A1CA,
+            topic_3=0xC5A02E618666F0C50EECDC11F20FC1DC41C2FD957752E55EDE4E56F4,
+        )
+        + Op.MSTORE(
+            offset=0x314,
+            value=0x957F855818082B5B5B49E36DE5A83E8A270663088571BF2FDF8F5F29,
+        )
+        + Op.ORIGIN
+        + Op.SSTORE(key=0x43, value=0xB9499741E3859928A237F5E5DF84C13C)
+        + Op.SIGNEXTEND(
+            0x74D84835800999791ABC41260472D96F604D07198E859ADC,
+            0x1E82328F9093E64DEFBDD07D,
+        )
+        + Op.MSTORE8(
+            offset=0x900E69A68B0F0E9E4F1299872881,
+            value=0x806BEAE7200CF116D2B55E89DDD564ABC3,
+        )
+        + Op.LOG3(
+            offset=0xC0F49ABE102CD44E474AB71C0237247865FA2ADD74C8B2,
+            size=0x6ECF21D3A41AD554F79584DCAB761D4C8437774CAD4BB13B2BECE140358DF93E,  # noqa: E501
+            topic_1=0xD270ECE7,
+            topic_2=0x1C42F3B109ED2BD72A6CF13500241C2A5E5C4E17EA9ED9B05BA9B57D70D,  # noqa: E501
+            topic_3=0x5D,
+        )
+        + Op.RETURNDATASIZE
+        + Op.PUSH16[0x7041C5718A2554A72662720296DFF5B3]
+        + Op.PUSH24[0xB559DF4558B8A5B2C9E7D15EB3947A70064F935C8FDF0A4E]
+        + Op.PUSH19[0x6F644AA31B42C10280E50EA92A366C3D060C12]
+        + Op.PUSH17[0xC6A16A75522FBEB3D7CCA702807F521781]
+        + Op.PUSH15[0xAB9CCEB9E237EE8FDE4ED3A23D3EC8]
+        + Op.PUSH27[0xDB334AC1CAA7E06523B0132DD615CF3FC16140D34C191617823C3A]
+        + Op.PUSH28[0xF47C42BC36B69CB4385463595C7F6F9EA451E05303603E0CD401E13D]
+        + Op.PUSH16[0xF744E2A673824D943941551704FF14DF]
+        + Op.PUSH32[
+            0xA8646EFBB2D8ABC4AC6E258E9924924B8001F8F0650D66B37411D484B18F41E7
+        ]
+        + Op.PUSH29[
+            0x792BD1C169FA52BBFC8AF4A45F20ACB0EF95DB2ECBC0D4EADBBBF6732F
+        ]
+        + Op.PUSH5[0x8BD33B3633]
+        + Op.PUSH14[0xC0FAF0CF1970BCD38093A50A44FD]
+        + Op.PUSH12[0x253B0E74F2706239C499217B]
+        + Op.DUP13
+        + Op.ORIGIN
+        + Op.SLOAD(key=0xDAE332E2)
+        + Op.CALLDATALOAD(offset=0x1D5D5E7E795C998CCEED14CF46977E7D3CBB)
+        + Op.CALLDATALOAD(
+            offset=0x3C79EF0530C3A8AC3FD8D49F10BB0AE919FA149ADEAD67DAE0
+        )
+        + Op.EXTCODECOPY(
+            address=0x69859649E8A52DE717592B881508371F8A8ED6B9,
+            dest_offset=0x71B518,
+            offset=0x2813AC,
+            size=0x7DE430,
+        )
+        + Op.PUSH32[
+            0xB9BA628E056E0E87E029B8E5F42821D775338E6774301ECB428B3938236EE22B
+        ]
+        + Op.PUSH30[
+            0xB5EDF2AD6997869F427BA0672A7168614233E85F61DAE5ED4283A53F605
+        ]
+        + Op.PUSH17[0x116DAD586DCE62833A62CA8C914C641F86]
+        + Op.DELEGATECALL(
+            gas=0x33D3D55F,
+            address=0xF7B2E80637A148B5E46945E29388928DAFD5AA25,
+            args_offset=0x31C,
+            args_size=0x107,
+            ret_offset=0x1D7,
+            ret_size=0x52,
+        )
+        + Op.PUSH2[0x1A5B]
+        + Op.PUSH4[0x1C4EA729]
+        + Op.DUP2
+        + Op.DELEGATECALL(
+            gas=0x202B2EA8,
+            address=Op.PUSH20[0x6],
+            args_offset=0x14A,
+            args_size=0x1C1,
+            ret_offset=0x3CE,
+            ret_size=0x256,
+        )
+        + Op.RETURNDATACOPY(dest_offset=0x2E, offset=0x106, size=0x221)
+        + Op.PUSH5[0x8A95029ECB]
+        + Op.DIV(
+            0xB8F2B53E55FE01A152C8496CBCC6997447062B734CEBDE,
+            0x849FE0943CB9D854C7D50AD04CFDFE648E2868,
+        )
+        + Op.PUSH26[0x6C6452E9EFC4ABA5BF071CBFF56208A525A8EF5F52399B4F3369]
+        + Op.PUSH28[0xD988884F58166D734881774EFF46D77BB189C89C55B1C6591F178D2D]
+        + Op.PUSH29[
+            0x21BF2B023ADF9BC5B8621235E3346D98D56047A3F71241FD5A24ABBB0C
+        ]
+        + Op.PUSH20[0xFC463FB8A5E67E32055696FE51258DD07526EBD8]
+        + Op.PUSH31[
+            0x439BCEBB514AE26DC12D653A5C1263705109097EC5DCDB3918AB114985F709
+        ]
+        + Op.PUSH32[
+            0xD3003B50E58FBA91007825A6B800F644EAA306051808460FC3B2D8E276B2187C
+        ]
+        + Op.PUSH28[0x583FF29EE0B0C34F9EE57BAC9EBB996402E3300DDF06C760FC5F531F]
+        + Op.PUSH21[0x6B1E2BEDA7A15C07F90F92422822E8D33C5D2409EA]
+        + Op.PUSH20[0x75197F7CD6D61770EDDB078206CFC7C5006CD0E9]
+        + Op.PUSH30[
+            0xA9EC65FA4FC683DA22CFAF6DFC995FEB5F8386A052851FC502F32E7EF934
+        ]
+        + Op.PUSH15[0x3D4633DEF4C0A4B9BE12F2CD7C6460]
+        + Op.PUSH3[0xE14CA3]
+        + Op.PUSH29[
+            0xFB977524F677714C3D994EA05F1997A2462FC0AB20ED2A5958F3712602
+        ]
+        + Op.SWAP12
+        + Op.DELEGATECALL(
+            gas=0x2E83DBE,
+            address=0x69859649E8A52DE717592B881508371F8A8ED6B9,
+            args_offset=0x3A1,
+            args_size=0x5D,
+            ret_offset=0x2C9,
+            ret_size=0x205,
         ),
         balance=0x845252B8509DC215,
         nonce=29,
-        address=Address("0x843e0b83d4d70dede90d9a4d93fa3f10bb5011c7"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.RETURNDATACOPY(dest_offset=0x101, offset=0x19F, size=0x13)
-            + Op.PUSH16[0x338DB2B1165B4918F178852663192A95]
-            + Op.PUSH14[0x79A68B50EEFDC639CA0B62AB4D52]
-            + Op.PUSH24[0x1DB054CCC801C0666B34B3C6242BBFC5E98F20C14FB95E01]
-            + Op.PUSH8[0x18BE9AD033D50E21]
-            + Op.PUSH8[0x5FF59297861847EA]
-            + Op.PUSH11[0x911A6A9D135E2F826DC603]
-            + Op.PUSH30[
-                0x850E0DB21D105B8732A34B873C7D943050B8659794F0BD3E841D35A2231E
-            ]
-            + Op.PUSH6[0xF697F8CDE117]
-            + Op.PUSH8[0x28FA2051E87933CF]
-            + Op.PUSH7[0x858E4E5E91BAA7]
-            + Op.PUSH23[0x4FC1E9FFE4C7B15BA600E88F095989DC68F47ED704BE2B]
-            + Op.SWAP10
-            + Op.CREATE(value=0x200FBD63, offset=0x215, size=0x17)
-            + Op.RETURNDATACOPY(
-                dest_offset=0x99C91C,
-                offset=0x93AFAA8CE1769C96CD0751AA76A98C8196FA8C92E70D7BDA17,
-                size=0x41C7F86732F4D5419B41E6887CCA98E0943F141A5C66DF98BD0C6D6C4CEC65,  # noqa: E501
-            )
-            + Op.PUSH27[
-                0x7F05DE3181109B8194387746F9EC15A6E0233F759E43360BD4E0A0
-            ]
-            + Op.MSTORE(offset=0x161, value=0x4E9F395117AFCD072774CE12D13DC7)
-            + Op.ADDRESS
-            + Op.GASPRICE
-            + Op.PUSH9[0x3305858002A92140B6]
-            + Op.PUSH25[0x508E3A3BE377D4825DBF618A393C7C061E75A8A496A33AFE0F]
-            + Op.PUSH19[0x17F2E33549E321838B083D48893F23DCED459]
-            + Op.PUSH31[
-                0x2E9EA08FE3F80970D6334B6C6F1FDE8BCC81D03A7CCC244231CB6606DBA6D0  # noqa: E501
-            ]
-            + Op.PUSH15[0xC1C5158EF0DB6994192ACBD4CAC6AB]
-            + Op.PUSH11[0xC8449D80FC2C32471946E0]
-            + Op.PUSH18[0xD9606BD390266D7F712766F4765076283AD6]
-            + Op.PUSH9[0x7450D7AB4DF6F3F6EE]
-            + Op.SWAP7
-            + Op.MSTORE8(
-                offset=0xB802EC9D7ED96DC0B9CE7BD14B193DC1F0, value=0x14A
-            )
-            + Op.PUSH23[0xD11CE19283C7F651D4D2E7C180715FF7FCBC995EA8B276]
-            + Op.PUSH3[0x13CC51]
-            + Op.PUSH30[
-                0x6DAD16D17F29A93220CE0DDB0A65D3D474DBC39CBA5BCB3D4FCF9FEF1910
-            ]
-            + Op.PUSH1[0x7D]
-            + Op.PUSH5[0xC04511DF27]
-            + Op.PUSH32[
-                0x522AB2475FBB2BA0720711A903DBECFA0429BF11E6E90CBB0F13D4EE050C52C8  # noqa: E501
-            ]
-            + Op.PUSH20[0x65E0216B4096186FC604FB563FA59F1263EE91D5]
-            + Op.PUSH10[0x5E407FDFFE82CA1558F7]
-            + Op.DUP8
-            + Op.PUSH11[0x93F3A218DD9BA6901FDEA9]
-            + Op.RETURNDATASIZE
-            + Op.PUSH12[0xE498F0B0E1874331115E31AA]
-            + Op.PUSH16[0xAD4D87227362A9EC3E1C1BE11CDB2309]
-            + Op.PUSH10[0x7BBC0C692EEADFA91616]
-            + Op.PUSH10[0xB8AEC24564487DC74F8E]
-            + Op.PUSH30[
-                0x17E6A133B5DBE576838697DE73F856197203EF1A3A54F7EDB0DBD60F9D52
-            ]
-            + Op.PUSH21[0xDB6B5C1477169B77F0D817ED731A20DB4B9E5B83D2]
-            + Op.PUSH25[0x6BFFEFAB084A31C4AFDA168156612F281DA0BE688E5BDB1F31]
-            + Op.PUSH23[0xED78BC62343A7665ABAD6573482449E68B3ACFE820993D]
-            + Op.PUSH24[0xDF5785384D51AAA0612DAB5DDBF2A9BF550736AD42293387]
-            + Op.DUP9
-            + Op.REVERT(offset=0x23F, size=0x119)
-            + Op.CALL(
-                gas=0x792C6916,
-                address=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                value=0x5AF7465B,
-                args_offset=0x36E,
-                args_size=0x216,
-                ret_offset=0x22D,
-                ret_size=0x8F,
-            )
-            + Op.PUSH15[0xD70693587DF6CCFAE5218D01559BAC]
-            + Op.PUSH1[0x15]
-            + Op.REVERT(offset=0x1AD, size=0x200)
-        ),
-        balance=0x5B1936A53E6E440F,
-        nonce=21,
-        address=Address("0xe7e620c9cf6045209edcad4d6ef43413bedf0949"),  # noqa: E501
+        address=Address(0x843E0B83D4D70DEDE90D9A4D93FA3F10BB5011C7),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=bytes.fromhex(
-            "610326610100f379c940b5f2046740058558468f238b85db7f6bbe3f3d51e92a3e3268b7"  # noqa: E501
-            "f7c4147541c695f376705288410b81b217e80726fb9e4c5c7b4c49eca0c1b6b97e117c16"  # noqa: E501
-            "c26c9816459f38396ffc36da48d65defdc7d055cbc846c07e81cfab0fb607c6cbc968774"  # noqa: E501
-            "d4de7df8e3236f581e688cc2081a96b1cad9e0609b70f4fddda49ae97714e7d325ceab23"  # noqa: E501
-            "acd5f46ba15b5210474116121921a04f68f3f933b9ad91b735bf71bfe41da706499c5d47"  # noqa: E501
-            "b6de1fe398cb91fdf66481cbb8661d71d457cf3cef75dabf5ea496d7012f4c56b9fe70e6"  # noqa: E501
-            "c4204720e3ce66874cead08499d57a547b97d37744ce205e051f296fb116fc9e5f3c2809"  # noqa: E501
-            "19aff3c93c5d5cefff9a6102d86103ca6364b68c8ef07d"
+    # Source: raw
+    # 0x7abee2a270429abbd3ff3b9945f72f58dcf4f8b344417a87dfa1ebd7601f5232609b6103ee61027b6101326342a46f5073<contract:0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b>632c1e2816f26101726101ec61013161012473<contract:target:0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b>632318d76ffa7201a0ff381bb40bb828d7781d2ef7c0fd8695f77c05465fbadf99fdffef2afd94b0e76531b6ea0d23d2332d13c20368a072644e41bc113079a6b1ebc3464527e34c26a4379f9dfe4f8e57981a9fc08558c90d537538079f1921b60fe6fa448171fec55c4c63e81171221164cf72f489a45775e83a2f5427eab647b075a910929de0a6554fc1426b49547acd8e2c770339616ce9c501fb746715dd4a20219229d0673ac055997e3bd089a6663f6dff488574195b848fbb357eb7be1fff076e997770d03b7028536103b36102846103056102db73<contract:0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b>6347cfe65df4423a6b8679871dc28aa5a1399b21c86102e460476101f3605b73ffffffffffffffffffffffffffffffffffffffff6311ecd01bfa76afa8155ecd75dd05f9d7eb42fa3e79c6a2109dff2a1e5361030a6101b2fd610263605861011761027f63459d135b7300000000000000000000000000000000000000056342ce224df274e612fbe000bed18eec8345f005f537c72820d8b97360e3526b50ae523a8f7467ae14a8bd9a6aaee55862b685e32476cc6762ae2c4068cf55729540d111f44c9260e76101bc6103f33e68639458dae7ad2a9b38629ed3bb1060d861036afd610123610359636db4b55bf0626021696101775263ea8a7b3a641bcf9219191a6103be6103716101f73e74c0413cb5d609ca9a51645238e4f1f8268f973c3a0169a0b67479a345d1e700655360166101736102f2610214633ff89b317300000000000000000000000000000000000000066335adeabdf13d7ee6d218af54c3d8045447d06c726801695cfa26fdfaa6460a8685cd662855a5547f5716140ae0b1e25aeaf04ae7cf54e8aa7a22206da5a6e52bdd3ef82ad40a46815177d25811167b0a3f66a727652592924dc1291a6085d537c5da6101b1601d6103a33e752d6272a54f882460bc76407d6361c40cc56bc88a8bc960726103ec6102c16101f373<contract:0x1000000000000000000000000000000000000000>635f449586f4  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x1F,
+            value=0xBEE2A270429ABBD3FF3B9945F72F58DCF4F8B344417A87DFA1EBD7,
+        )
+        + Op.ORIGIN
+        + Op.CALLCODE(
+            gas=0x2C1E2816,
+            address=0x69859649E8A52DE717592B881508371F8A8ED6B9,
+            value=0x42A46F50,
+            args_offset=0x132,
+            args_size=0x27B,
+            ret_offset=0x3EE,
+            ret_size=0x9B,
+        )
+        + Op.STATICCALL(
+            gas=0x2318D76F,
+            address=0x843E0B83D4D70DEDE90D9A4D93FA3F10BB5011C7,
+            args_offset=0x124,
+            args_size=0x131,
+            ret_offset=0x1EC,
+            ret_size=0x172,
+        )
+        + Op.PUSH19[0x1A0FF381BB40BB828D7781D2EF7C0FD8695F7]
+        + Op.PUSH29[
+            0x5465FBADF99FDFFEF2AFD94B0E76531B6EA0D23D2332D13C20368A072
+        ]
+        + Op.MSTORE8(
+            offset=0xA6B1EBC3464527E34C26A4379F9DFE4F8E57981A9FC08558C90D,
+            value=0x4E41BC1130,
+        )
+        + Op.JUMPI(
+            pc=0xCF72F489A4,
+            condition=0x38079F1921B60FE6FA448171FEC55C4C63E811712211,
+        )
+        + Op.SLOAD(key=0xE83A2F5427EAB647B075A910929DE0A6554FC1426B49)
+        + Op.MSTORE8(
+            offset=0x3BD089A6663F6DFF488574195B848FBB357EB7BE1FFF076E997770D03B7028,  # noqa: E501
+            value=0xCD8E2C770339616CE9C501FB746715DD4A20219229D0673AC05599,
+        )
+        + Op.DELEGATECALL(
+            gas=0x47CFE65D,
+            address=0x69859649E8A52DE717592B881508371F8A8ED6B9,
+            args_offset=0x2DB,
+            args_size=0x305,
+            ret_offset=0x284,
+            ret_size=0x3B3,
+        )
+        + Op.TIMESTAMP
+        + Op.GASPRICE
+        + Op.PUSH12[0x8679871DC28AA5A1399B21C8]
+        + Op.STATICCALL(
+            gas=0x11ECD01B,
+            address=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+            args_offset=0x5B,
+            args_size=0x1F3,
+            ret_offset=0x47,
+            ret_size=0x2E4,
+        )
+        + Op.PUSH23[0xAFA8155ECD75DD05F9D7EB42FA3E79C6A2109DFF2A1E53]
+        + Op.REVERT(offset=0x1B2, size=0x30A)
+        + Op.CALLCODE(
+            gas=0x42CE224D,
+            address=Op.PUSH20[0x5],
+            value=0x459D135B,
+            args_offset=0x27F,
+            args_size=0x117,
+            ret_offset=0x58,
+            ret_size=0x263,
+        )
+        + Op.MSTORE(
+            offset=0xE3, value=0xE612FBE000BED18EEC8345F005F537C72820D8B973
+        )
+        + Op.PUSH12[0x50AE523A8F7467AE14A8BD9A]
+        + Op.PUSH11[0xAEE55862B685E32476CC67]
+        + Op.PUSH3[0xAE2C40]
+        + Op.PUSH9[0xCF55729540D111F44C]
+        + Op.SWAP3
+        + Op.RETURNDATACOPY(dest_offset=0x3F3, offset=0x1BC, size=0xE7)
+        + Op.LT(0x9ED3BB, 0x639458DAE7AD2A9B38)
+        + Op.REVERT(offset=0x36A, size=0xD8)
+        + Op.CREATE(value=0x6DB4B55B, offset=0x359, size=0x123)
+        + Op.MSTORE(offset=0x177, value=0x602169)
+        + Op.BYTE(0x1BCF921919, 0xEA8A7B3A)
+        + Op.RETURNDATACOPY(dest_offset=0x1F7, offset=0x371, size=0x3BE)
+        + Op.MSTORE8(
+            offset=0xA0B67479A345D1E70065,
+            value=0xC0413CB5D609CA9A51645238E4F1F8268F973C3A01,
+        )
+        + Op.CALL(
+            gas=0x35ADEABD,
+            address=Op.PUSH20[0x6],
+            value=0x3FF89B31,
+            args_offset=0x214,
+            args_size=0x2F2,
+            ret_offset=0x173,
+            ret_size=0x16,
+        )
+        + Op.RETURNDATASIZE
+        + Op.SLOAD(
+            key=0xE6D218AF54C3D8045447D06C726801695CFA26FDFAA6460A8685CD662855A5  # noqa: E501
+        )
+        + Op.MLOAD(
+            offset=0x5716140AE0B1E25AEAF04AE7CF54E8AA7A22206DA5A6E52BDD3EF82AD40A4681  # noqa: E501
+        )
+        + Op.PUSH24[0xD25811167B0A3F66A727652592924DC1291A6085D537C5DA]
+        + Op.RETURNDATACOPY(dest_offset=0x3A3, offset=0x1D, size=0x1B1)
+        + Op.PUSH22[0x2D6272A54F882460BC76407D6361C40CC56BC88A8BC9]
+        + Op.DELEGATECALL(
+            gas=0x5F449586,
+            address=0xE7E620C9CF6045209EDCAD4D6EF43413BEDF0949,
+            args_offset=0x1F3,
+            args_size=0x2C1,
+            ret_offset=0x3EC,
+            ret_size=0x72,
         ),
-        balance=0x54C814F188394C8,
+        balance=0x882FD85BC18C9F00,
         nonce=29,
-        address=coinbase,  # noqa: E501
+        address=Address(0x69859649E8A52DE717592B881508371F8A8ED6B9),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "66a9b45d44c78cfe774333fe0c49418dd61f183d41132f5340e48ababb825a26eb0a75c0"  # noqa: E501
-            "ca693a8b465121200fd21a7b4c365a65a3255278f672705e5ca0f6146fccd36a6e5b9dec"  # noqa: E501
-            "fb6e5096887651e829313a2cc9d5b518e25861c31ba04ed3f5a3310bd966993aa534b007"  # noqa: E501
-            "85778d9545342410ce8c156d780a8cb4a65efed30aa9d6bd63c4778a134c9cb0c677ecda"  # noqa: E501
-            "48aacef0c191de37e3cfdae69153747c2406995ea81bbae6a201663b9b37a6a9f597ae4f"  # noqa: E501
-            "40e44e74ea92616bc2956328ced0d77412c265c2925470320e5f285d15a08a263b0a4445"  # noqa: E501
-            "16817c266bd51fe726677144df3c080d07dd47c4eb9e44a87541ddc5a697163260a06921"  # noqa: E501
-            "033eb3542b375cd0d073dfb48f6acde07152794b5539563efff1afed3b0a6b1516652617"  # noqa: E501
-            "5e7184b83cc2de68df61ec5d65d1eee66ea376fcb84f2c73335db9fba49e3d40638cd7f4"  # noqa: E501
-            "62f1d3b315f17b8dc1f692a68b2431b166ee71a4ba159dd322b9fa5f3237dfb85d259405"  # noqa: E501
-            "6102f261025b61021d6101d3631fe4bdc373ffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "ffff631ea09dc6f263edd580947c8177bd72d2244f7652371e3428d28bc6356c553b18d0"  # noqa: E501
-            "0e6b3cf60206c273abbd7763059f61940b0d19fde33f7b5a96080d25791e9ae89c718dd4"  # noqa: E501
-            "1c3f57b0c304fbb83978de28d23499bdd19c0472301ff527ccc9f7ed74a8dbd906b468d4"  # noqa: E501
-            "48fba77f38f193e3047b02e40beb08b4f11707681ef103ec1b00585a85f27227a179f15e"  # noqa: E501
-            "7e97a359268b06ff34bcee23a869974fbca6e201cb16179743ac0f8c9f8603d570e26a5a"  # noqa: E501
-            "ad5217ebfff3140716923723efaa79b6cd87fbc9fd408d4ac5a048e43fb4e7a2b94053bf"  # noqa: E501
-            "1fb7257562977725cde415738a99e1a7690cbe409744b737367dedc82e3063516c5bc57e"  # noqa: E501
-            "35fcb2038306d9a3a6e46103515279ddcb9d30879e470f5dd81e1148184f62bd61ae9708"  # noqa: E501
-            "ff61cee25c63694a73437a42be5043b1fde117ba383682ba0d91e0db8b29c882a044d0c8"  # noqa: E501
-            "bb49056a25a66d8480df1b1ccc2564791df94f43d5802aa8f44bf70a6817ed784e5725bd"  # noqa: E501
-            "c7718a54d6a567234286085240ba847d575dac25d7fc32c59999a9d38fee0d25e7c23986"  # noqa: E501
-            "009c5bb022f7d28a2cab6e01a4bb37dd42ea42d5141d55f5730c7bd82bf08bff3928aea7"  # noqa: E501
-            "7e7153bcc4a3a53996be367ec98cb6fe85797e771d020284d4d302c8b4ebe6b28a9c64a9"  # noqa: E501
-            "ae2ad6894716732f6b245e7fdc5243f79a0ae9b8d874900caa1c5796a2854ceddb00a82b"  # noqa: E501
-            "4ec01b513ed61c72ce89400a06fe90a109bad6d5e028143e7552937a0136347eb71a49db"  # noqa: E501
-            "0072c87bd437b9cd7b2f7e6e9f3a85875c9ede6036650f9d06d4c2e8692caf2e87043c0b"  # noqa: E501
-            "f5a2359c66431acbb35dcbfc6a7b86074b99c9e6f959d8417784e5e40c854c280218c0cd"  # noqa: E501
-            "4e98dc3bc44f7d651d7191ead455"
+        to=target,
+        data=Bytes(
+            "66a9b45d44c78cfe774333fe0c49418dd61f183d41132f5340e48ababb825a26eb0a75c0ca693a8b465121200fd21a7b4c365a65a3255278f672705e5ca0f6146fccd36a6e5b9decfb6e5096887651e829313a2cc9d5b518e25861c31ba04ed3f5a3310bd966993aa534b00785778d9545342410ce8c156d780a8cb4a65efed30aa9d6bd63c4778a134c9cb0c677ecda48aacef0c191de37e3cfdae69153747c2406995ea81bbae6a201663b9b37a6a9f597ae4f40e44e74ea92616bc2956328ced0d77412c265c2925470320e5f285d15a08a263b0a444516817c266bd51fe726677144df3c080d07dd47c4eb9e44a87541ddc5a697163260a06921033eb3542b375cd0d073dfb48f6acde07152794b5539563efff1afed3b0a6b15166526175e7184b83cc2de68df61ec5d65d1eee66ea376fcb84f2c73335db9fba49e3d40638cd7f462f1d3b315f17b8dc1f692a68b2431b166ee71a4ba159dd322b9fa5f3237dfb85d2594056102f261025b61021d6101d3631fe4bdc373ffffffffffffffffffffffffffffffffffffffff631ea09dc6f263edd580947c8177bd72d2244f7652371e3428d28bc6356c553b18d00e6b3cf60206c273abbd7763059f61940b0d19fde33f7b5a96080d25791e9ae89c718dd41c3f57b0c304fbb83978de28d23499bdd19c0472301ff527ccc9f7ed74a8dbd906b468d448fba77f38f193e3047b02e40beb08b4f11707681ef103ec1b00585a85f27227a179f15e7e97a359268b06ff34bcee23a869974fbca6e201cb16179743ac0f8c9f8603d570e26a5aad5217ebfff3140716923723efaa79b6cd87fbc9fd408d4ac5a048e43fb4e7a2b94053bf1fb7257562977725cde415738a99e1a7690cbe409744b737367dedc82e3063516c5bc57e35fcb2038306d9a3a6e46103515279ddcb9d30879e470f5dd81e1148184f62bd61ae9708ff61cee25c63694a73437a42be5043b1fde117ba383682ba0d91e0db8b29c882a044d0c8bb49056a25a66d8480df1b1ccc2564791df94f43d5802aa8f44bf70a6817ed784e5725bdc7718a54d6a567234286085240ba847d575dac25d7fc32c59999a9d38fee0d25e7c23986009c5bb022f7d28a2cab6e01a4bb37dd42ea42d5141d55f5730c7bd82bf08bff3928aea77e7153bcc4a3a53996be367ec98cb6fe85797e771d020284d4d302c8b4ebe6b28a9c64a9ae2ad6894716732f6b245e7fdc5243f79a0ae9b8d874900caa1c5796a2854ceddb00a82b4ec01b513ed61c72ce89400a06fe90a109bad6d5e028143e7552937a0136347eb71a49db0072c87bd437b9cd7b2f7e6e9f3a85875c9ede6036650f9d06d4c2e8692caf2e87043c0bf5a2359c66431acbb35dcbfc6a7b86074b99c9e6f959d8417784e5e40c854c280218c0cd4e98dc3bc44f7d651d7191ead455"  # noqa: E501
         ),
         gas_limit=2643883,
-        value=625999040,
+        value=0x254FFCC0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}),
+        addr: Account(storage={}),
+        sender: Account(storage={}),
+        addr_2: Account(storage={}),
+        coinbase: Account(storage={}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_depth2.py b/tests/ported_static/stRevertTest/test_revert_depth2.py
index 1cdf656807f..672da622c5c 100644
--- a/tests/ported_static/stRevertTest/test_revert_depth2.py
+++ b/tests/ported_static/stRevertTest/test_revert_depth2.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_revert_depth2.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertDepth2Filler.json
+state_tests/stRevertTest/RevertDepth2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,29 +23,38 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/RevertDepth2Filler.json"],
+    ["state_tests/stRevertTest/RevertDepth2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (170685, {}),
-        (136685, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_depth2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_revert_depth2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,96 +65,102 @@ def test_revert_depth2(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0xC47BCBF49DD735566CFDE927821E938D5B33014C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[0]] (ADD 1 (SLOAD 0)) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0707f29673f05e46feeb7c4766419a222010ae45"),  # noqa: E501
     )
-    # Source: LLL
-    # { [[0]] (ADD 1 (SLOAD 0)) [[1]] (CALL 150000 <contract:0xb000000000000000000000000000000000000000> 0 0 0 0 0) [[2]] (CALL 150000 <contract:0xd000000000000000000000000000000000000000> 0 0 0 0 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0x707F29673F05E46FEEB7C4766419A222010AE45,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=0x78ED2EB0809CD080C7837DC83AFC388A2B98D200,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[0]] (ADD 1 (SLOAD 0)) [[1]] (CALL 50000 <contract:0xc000000000000000000000000000000000000000> 0 0 0 0 0) [[2]] (GAS)}  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xC350,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x68ea09e164a8b66de117a2c306b3966e6d71ca93"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0xC47BCBF49DD735566CFDE927821E938D5B33014C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[0]] (ADD 1 (SLOAD 0)) [[1]] (CALL 50000 <contract:0xc000000000000000000000000000000000000000> 0 0 0 0 0)}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xC350,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x78ed2eb0809cd080c7837dc83afc388a2b98d200"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0))) + Op.STOP
-        ),
+    # Source: lll
+    # { [[0]] (ADD 1 (SLOAD 0)) [[1]] (CALL 150000 <contract:0xb000000000000000000000000000000000000000> 0 0 0 0 0) [[2]] (CALL 150000 <contract:0xd000000000000000000000000000000000000000> 0 0 0 0 0)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc47bcbf49dd735566cfde927821e938d5b33014c"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [170685, 136685]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {
+        target: Account(storage={0: 0, 1: 0, 2: 0}),
+        addr: Account(storage={0: 0, 1: 0}),
+        addr_2: Account(storage={0: 0}),
+        addr_3: Account(storage={0: 0, 1: 0, 2: 0}),
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_depth_create_address_collision.py b/tests/ported_static/stRevertTest/test_revert_depth_create_address_collision.py
index 98f53438fca..21dfadc052b 100644
--- a/tests/ported_static/stRevertTest/test_revert_depth_create_address_collision.py
+++ b/tests/ported_static/stRevertTest/test_revert_depth_create_address_collision.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_revert_depth_create_address_collision.
 
 Ported from:
-tests/static/state_tests/stRevertTest
-RevertDepthCreateAddressCollisionFiller.json
+state_tests/stRevertTest/RevertDepthCreateAddressCollisionFiller.json
 """
 
 import pytest
@@ -13,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,93 +27,73 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/RevertDepthCreateAddressCollisionFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/RevertDepthCreateAddressCollisionFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            110000,
-            1,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            110000,
+        pytest.param(
+            0,
             0,
-            {},
+            0,
+            id="d0-g0-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            160000,
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x97e33a176b7c8d61b356d1c170ac2119d28867df"): Account(
-                    storage={0: 1, 4: 12}
-                )
-            },
+            id="d0-g0-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            160000,
+        pytest.param(
             0,
-            {
-                Address("0x97e33a176b7c8d61b356d1c170ac2119d28867df"): Account(
-                    storage={0: 1, 4: 12}
-                )
-            },
+            1,
+            0,
+            id="d0-g1-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            110000,
+        pytest.param(
+            0,
+            1,
             1,
-            {},
+            id="d0-g1-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            110000,
+        pytest.param(
+            1,
+            0,
             0,
-            {},
+            id="d1-g0-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            160000,
+        pytest.param(
             1,
-            {},
+            0,
+            1,
+            id="d1-g0-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            160000,
+        pytest.param(
+            1,
+            1,
             0,
-            {},
+            id="d1-g1-v0",
+        ),
+        pytest.param(
+            1,
+            1,
+            1,
+            id="d1-g1-v1",
         ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_depth_create_address_collision(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_revert_depth_create_address_collision."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
@@ -123,52 +107,116 @@ def test_revert_depth_create_address_collision(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    # Source: lll
+    # { [[2]] 8 (CREATE 0 0 0) [[3]] 12}
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x8)
+        + Op.POP(Op.CREATE(value=0x0, offset=0x0, size=0x0))
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xB1B49241A4ECF7860872E686090781C906B1B437),  # noqa: E501
+    )
+    # Source: lll
     # { [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) <contract:0xb000000000000000000000000000000000000000> 0 0 0 0 0) [[4]] 12 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.CALLDATALOAD(offset=0x0),
-                    address=0xB1B49241A4ECF7860872E686090781C906B1B437,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.CALLDATALOAD(offset=0x0),
+                address=0xB1B49241A4ECF7860872E686090781C906B1B437,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.STOP,
         balance=5,
         nonce=54,
-        address=Address("0x97e33a176b7c8d61b356d1c170ac2119d28867df"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x8)
-            + Op.POP(Op.CREATE(value=0x0, offset=0x0, size=0x0))
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb1b49241a4ecf7860872e686090781c906b1b437"),  # noqa: E501
+        address=Address(0x97E33A176B7C8D61B356D1C170AC2119D28867DF),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "60016000556000600060006000600073b1b49241a4ecf7860872e686090781c906b1b437600035f1600155600c60045500"  # noqa: E501
+                    ),
+                    nonce=54,
+                ),
+                addr: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={0: 1, 4: 12},
+                    code=bytes.fromhex(
+                        "60016000556000600060006000600073b1b49241a4ecf7860872e686090781c906b1b437600035f1600155600c60045500"  # noqa: E501
+                    ),
+                    nonce=54,
+                ),
+                addr: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "60016000556000600060006000600073b1b49241a4ecf7860872e686090781c906b1b437600035f1600155600c60045500"  # noqa: E501
+                    ),
+                    balance=5,
+                    nonce=54,
+                ),
+                addr: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={},
+                    code=bytes.fromhex(
+                        "60016000556000600060006000600073b1b49241a4ecf7860872e686090781c906b1b437600035f1600155600c60045500"  # noqa: E501
+                    ),
+                    nonce=54,
+                ),
+                addr: Account(storage={}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0xEA60),
+        Hash(0x1EA60),
+    ]
+    tx_gas = [110000, 160000]
+    tx_value = [1, 0]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_depth_create_oog.py b/tests/ported_static/stRevertTest/test_revert_depth_create_oog.py
index 980fb73a5a5..12dadbe7ce4 100644
--- a/tests/ported_static/stRevertTest/test_revert_depth_create_oog.py
+++ b/tests/ported_static/stRevertTest/test_revert_depth_create_oog.py
@@ -1,19 +1,24 @@
 """
-Test ported from static filler.
+Test_revert_depth_create_oog.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertDepthCreateOOGFiller.json
+state_tests/stRevertTest/RevertDepthCreateOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,108 +27,76 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/RevertDepthCreateOOGFiller.json"],
+    ["state_tests/stRevertTest/RevertDepthCreateOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            110000,
-            1,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            110000,
+        pytest.param(
             0,
-            {},
+            0,
+            0,
+            id="d0-g0-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            180000,
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0xa000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 4: 12}
-                )
-            },
+            id="d0-g0-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000ea60",
-            180000,
+        pytest.param(
             0,
-            {
-                Address("0xa000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 4: 12}
-                )
-            },
+            1,
+            0,
+            id="d0-g1-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            110000,
+        pytest.param(
+            0,
             1,
-            {},
+            1,
+            id="d0-g1-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            110000,
+        pytest.param(
+            1,
+            0,
             0,
-            {},
+            id="d1-g0-v0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            180000,
+        pytest.param(
             1,
-            {
-                Address("0xa000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 4: 12}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={2: 8, 3: 12}
-                ),
-            },
+            0,
+            1,
+            id="d1-g0-v1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000001ea60",
-            180000,
+        pytest.param(
+            1,
+            1,
             0,
-            {
-                Address("0xa000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 4: 12}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={2: 8, 3: 12}
-                ),
-            },
+            id="d1-g1-v0",
+        ),
+        pytest.param(
+            1,
+            1,
+            1,
+            id="d1-g1-v1",
         ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_depth_create_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_revert_depth_create_oog."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xA000000000000000000000000000000000000000)
+    contract_1 = Address(0xB000000000000000000000000000000000000000)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -134,54 +107,89 @@ def test_revert_depth_create_oog(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
+    # { [[2]] 8 (CREATE 0 0 0) [[3]] 12}
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x8)
+        + Op.POP(Op.CREATE(value=0x0, offset=0x0, size=0x0))
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.STOP,
+        nonce=0,
+    )
+    # Source: lll
     # { [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.CALLDATALOAD(offset=0x0),
-                    address=0xB000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.CALLDATALOAD(offset=0x0),
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.STOP,
         balance=5,
         nonce=54,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
-    # { [[2]] 8 (CREATE 0 0 0) [[3]] 12}
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x8)
-            + Op.POP(Op.CREATE(value=0x0, offset=0x0, size=0x0))
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=contract_1, nonce=0): Account(
+                    nonce=1
+                ),
+                contract_0: Account(storage={0: 1, 1: 1, 4: 12}),
+                contract_1: Account(storage={2: 8, 3: 12}),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(
+                    address=contract_1, nonce=0
+                ): Account.NONEXISTENT,
+                contract_0: Account(storage={0: 1, 4: 12}),
+                contract_1: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": [0, 1], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(
+                    address=contract_1, nonce=0
+                ): Account.NONEXISTENT,
+                contract_0: Account(storage={}),
+                contract_1: Account(storage={}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0xEA60),
+        Hash(0x1EA60),
+    ]
+    tx_gas = [110000, 180000]
+    tx_value = [1, 0]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_in_call_code.py b/tests/ported_static/stRevertTest/test_revert_in_call_code.py
index 10806fddaf9..77e8cdafda8 100644
--- a/tests/ported_static/stRevertTest/test_revert_in_call_code.py
+++ b/tests/ported_static/stRevertTest/test_revert_in_call_code.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_revert_in_call_code.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertInCallCodeFiller.json
+state_tests/stRevertTest/RevertInCallCodeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/RevertInCallCodeFiller.json"],
+    ["state_tests/stRevertTest/RevertInCallCodeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_revert_in_call_code(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA2333EEF5630066B928DEA5FD85A239F511B5B067D1441EE7AC290D0122B917B
-    )
+    """Test_revert_in_call_code."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,50 +43,44 @@ def test_revert_in_call_code(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x2232)
-            + Op.REVERT(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0x2232) (REVERT 0 32) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x2232)
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x26bc42b8191ccb142cb8cbc3490bd3bdce465591"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (CALLCODE 50000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 1000 0 64 0 64 ) [[ 1 ]] (RETURNDATASIZE) (RETURNDATACOPY 64 0 32) [[ 2 ]] (MLOAD 64) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x26BC42B8191CCB142CB8CBC3490BD3BDCE465591,
-                    value=0x3E8,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.RETURNDATACOPY(dest_offset=0x40, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x40))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=addr,
+                value=0x3E8,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.RETURNDATACOPY(dest_offset=0x40, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x40))
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0x5e1d76d7badbad41710e47410dba9226c255d229"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=105044,
     )
 
-    post = {
-        contract: Account(storage={1: 32, 2: 8754}),
-    }
+    post = {target: Account(storage={1: 32, 2: 8754})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_in_create_in_init_paris.py b/tests/ported_static/stRevertTest/test_revert_in_create_in_init_paris.py
index dd611ffd93c..e1f2206890f 100644
--- a/tests/ported_static/stRevertTest/test_revert_in_create_in_init_paris.py
+++ b/tests/ported_static/stRevertTest/test_revert_in_create_in_init_paris.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_revert_in_create_in_init_paris.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertInCreateInInit_ParisFiller.json
+state_tests/stRevertTest/RevertInCreateInInit_ParisFiller.json
 """
 
 import pytest
@@ -15,15 +15,14 @@
     StateTestFiller,
     Transaction,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/RevertInCreateInInit_ParisFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/RevertInCreateInInit_ParisFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,12 +30,12 @@ def test_revert_in_create_in_init_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_revert_in_create_in_init_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
     )
-    contract = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,24 +46,28 @@ def test_revert_in_create_in_init_paris(
         gas_limit=42949672960,
     )
 
-    pre[contract] = Account(balance=10, nonce=0, storage={0x0: 0x1})
+    pre[addr] = Account(balance=10, storage={0: 1})
     pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "3050600d80602460003960006000f0503d6000556020600060003e6000516001550000fe"  # noqa: E501
-            "6211223360005260206000fd00"
-        ),
+        data=Op.POP(Op.ADDRESS)
+        + Op.PUSH1[0xD]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x24, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE)
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=0x112233)
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
         gas_limit=200000,
     )
 
-    post = {
-        Address("0x1775da0b19ad27f26c9de9e2b1e61a91cf8134cc"): Account(
-            storage={0: 32, 1: 0x112233},
-        ),
-        contract: Account(storage={0: 1}),
-    }
+    post = {addr: Account(storage={0: 1}, balance=10)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_in_delegate_call.py b/tests/ported_static/stRevertTest/test_revert_in_delegate_call.py
index 2c1adcecad8..85992148486 100644
--- a/tests/ported_static/stRevertTest/test_revert_in_delegate_call.py
+++ b/tests/ported_static/stRevertTest/test_revert_in_delegate_call.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_revert_in_delegate_call.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertInDelegateCallFiller.json
+state_tests/stRevertTest/RevertInDelegateCallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/RevertInDelegateCallFiller.json"],
+    ["state_tests/stRevertTest/RevertInDelegateCallFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_revert_in_delegate_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA2333EEF5630066B928DEA5FD85A239F511B5B067D1441EE7AC290D0122B917B
-    )
+    """Test_revert_in_delegate_call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,49 +43,43 @@ def test_revert_in_delegate_call(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (DELEGATECALL 50000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 64 ) [[ 1 ]] (RETURNDATASIZE) (RETURNDATACOPY 63 0 32) [[2]](MLOAD 63)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0xC3ECFE24C185AD3C946EBFF4624131E8AF5220A2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.RETURNDATACOPY(dest_offset=0x3F, offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x3F))
-            + Op.STOP
-        ),
-        balance=1000,
+    # Source: lll
+    # { (MSTORE 32 10) (REVERT 32 32) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x20, value=0xA)
+        + Op.REVERT(offset=0x20, size=0x20)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x23ea33dc3aa11f5a1da3643bb13956382b9b6767"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x20, value=0xA)
-            + Op.REVERT(offset=0x20, size=0x20)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (DELEGATECALL 50000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 64 ) [[ 1 ]] (RETURNDATASIZE) (RETURNDATACOPY 63 0 32) [[2]](MLOAD 63)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.RETURNDATACOPY(dest_offset=0x3F, offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x3F))
+        + Op.STOP,
+        balance=1000,
         nonce=0,
-        address=Address("0xc3ecfe24c185ad3c946ebff4624131e8af5220a2"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=105044,
     )
 
-    post = {
-        contract: Account(storage={1: 32, 2: 10}),
-    }
+    post = {target: Account(storage={1: 32, 2: 10})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_in_static_call.py b/tests/ported_static/stRevertTest/test_revert_in_static_call.py
index d8c3010b45b..929e0272517 100644
--- a/tests/ported_static/stRevertTest/test_revert_in_static_call.py
+++ b/tests/ported_static/stRevertTest/test_revert_in_static_call.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_revert_in_static_call.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertInStaticCallFiller.json
+state_tests/stRevertTest/RevertInStaticCallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/RevertInStaticCallFiller.json"],
+    ["state_tests/stRevertTest/RevertInStaticCallFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_revert_in_static_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA2333EEF5630066B928DEA5FD85A239F511B5B067D1441EE7AC290D0122B917B
-    )
+    """Test_revert_in_static_call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,40 +43,38 @@ def test_revert_in_static_call(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (STATICCALL 50000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 64 )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x33FCF0576AB8B4527C9426094E2E355A7FFC7E71,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=1000,
+    # Source: lll
+    # { (REVERT 0 0) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.REVERT(offset=0x0, size=0x0) + Op.STOP,
         nonce=0,
-        address=Address("0x30f7398d20afe518491069c036185caf69d5aae9"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.REVERT(offset=0x0, size=0x0) + Op.STOP,
+    # Source: lll
+    # { [[ 0 ]] (STATICCALL 50000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 64 )}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xC350,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=1000,
         nonce=0,
-        address=Address("0x33fcf0576ab8b4527c9426094e2e355a7ffc7e71"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=105044,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_on_empty_stack.py b/tests/ported_static/stRevertTest/test_revert_on_empty_stack.py
index c2a4cd826d7..6809ead9e64 100644
--- a/tests/ported_static/stRevertTest/test_revert_on_empty_stack.py
+++ b/tests/ported_static/stRevertTest/test_revert_on_empty_stack.py
@@ -1,16 +1,16 @@
 """
-Calling a runtime code that contains only a single `REVERT` should consume...
+Calling a runtime code that contains only a single `REVERT` should...
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertOnEmptyStackFiller.json
+state_tests/stRevertTest/RevertOnEmptyStackFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/RevertOnEmptyStackFiller.json"],
+    ["state_tests/stRevertTest/RevertOnEmptyStackFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_revert_on_empty_stack(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Calling a runtime code that contains only a single `REVERT`..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x3327048BBC0B8C348A6352BE62994144E64B8FF2CEC68D9FF4CA4E911ECD5D22
-    )
+    """Calling a runtime code that contains only a single `REVERT` should..."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5AF3107A4000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,20 +43,20 @@ def test_revert_on_empty_stack(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0xfd
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.REVERT,
         nonce=0,
-        address=Address("0x3141bb954e8294e47a14ebd08229f30e6294ba83"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5AF3107A4000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=2000000,
     )
 
-    post: dict = {}
+    post = {sender: Account(balance=0x5AF30F491300, nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_opcode.py b/tests/ported_static/stRevertTest/test_revert_opcode.py
index fba32638328..e76a7ee25f2 100644
--- a/tests/ported_static/stRevertTest/test_revert_opcode.py
+++ b/tests/ported_static/stRevertTest/test_revert_opcode.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_revert_opcode.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertOpcodeFiller.json
+state_tests/stRevertTest/RevertOpcodeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,32 +26,50 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/RevertOpcodeFiller.json"],
+    ["state_tests/stRevertTest/RevertOpcodeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (800000, 0, {}),
-        (800000, 10, {}),
-        (30000, 0, {}),
-        (30000, 10, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-g0-v1",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1-v0",
+        ),
+        pytest.param(
+            0,
+            1,
+            1,
+            id="-g1-v1",
+        ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_opcode(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_revert_opcode."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,25 +80,49 @@ def test_revert_opcode(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x1)
-            + Op.REVERT(offset=0x0, size=0x1)
-            + Op.SSTORE(key=0x1, value=0x11)
-        ),
+    # Source: raw
+    # 0x600160005560016000fd6011600155
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.REVERT(offset=0x0, size=0x1)
+        + Op.SSTORE(key=0x1, value=0x11),
         nonce=0,
-        address=Address("0xf5eaf70f313ab7c223ded96f5a804abc49bf804a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                target: Account(storage={}, balance=0),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                target: Account(storage={}, balance=0),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [800000, 30000]
+    tx_value = [0, 10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_opcode_calls.py b/tests/ported_static/stRevertTest/test_revert_opcode_calls.py
index 2686fa96bf6..1ac94a6d4f7 100644
--- a/tests/ported_static/stRevertTest/test_revert_opcode_calls.py
+++ b/tests/ported_static/stRevertTest/test_revert_opcode_calls.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_revert_opcode_calls.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertOpcodeCallsFiller.json
+state_tests/stRevertTest/RevertOpcodeCallsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,108 +26,74 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/RevertOpcodeCallsFiller.json"],
+    ["state_tests/stRevertTest/RevertOpcodeCallsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000ceb48d108c874b5b014acdd1a2466d65a3d01de6",
-            460000,
-            {
-                Address("0x1ada72179309fd8a562e308928e38763a543ed6c"): Account(
-                    storage={10: 1}
-                ),
-                Address("0xceb48d108c874b5b014acdd1a2466d65a3d01de6"): Account(
-                    storage={2: 14}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "000000000000000000000000ceb48d108c874b5b014acdd1a2466d65a3d01de6",
-            83622,
-            {},
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "000000000000000000000000737f82ed94146e759790d925492df5a8ced35885",
-            460000,
-            {
-                Address("0x1ada72179309fd8a562e308928e38763a543ed6c"): Account(
-                    storage={10: 1}
-                ),
-                Address("0x737f82ed94146e759790d925492df5a8ced35885"): Account(
-                    storage={2: 14}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "000000000000000000000000737f82ed94146e759790d925492df5a8ced35885",
-            83622,
-            {},
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "0000000000000000000000006b8268ac8921e6a6e59a4b1d51a76f4e807e17af",
-            460000,
-            {
-                Address("0x1ada72179309fd8a562e308928e38763a543ed6c"): Account(
-                    storage={10: 1}
-                ),
-                Address("0x6b8268ac8921e6a6e59a4b1d51a76f4e807e17af"): Account(
-                    storage={2: 14}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "0000000000000000000000006b8268ac8921e6a6e59a4b1d51a76f4e807e17af",
-            83622,
-            {},
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "000000000000000000000000bf3fc188d9c8d699ffa12f0369e3b2bcf8428f7c",
-            460000,
-            {
-                Address("0x1ada72179309fd8a562e308928e38763a543ed6c"): Account(
-                    storage={10: 1}
-                ),
-                Address("0x652761b88018ea027f6f27e456fe55c2dc5d6a91"): Account(
-                    storage={5: 14}
-                ),
-                Address("0xbf3fc188d9c8d699ffa12f0369e3b2bcf8428f7c"): Account(
-                    storage={0: 1, 2: 14}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "000000000000000000000000bf3fc188d9c8d699ffa12f0369e3b2bcf8428f7c",
-            83622,
-            {},
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_opcode_calls(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_revert_opcode_calls."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -134,154 +104,232 @@ def test_revert_opcode_calls(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[10]] (CALL 260000 (CALLDATALOAD 0) 0 0 0 0 0)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0xA,
-                value=Op.CALL(
-                    gas=0x3F7A0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0xA,
+            value=Op.CALL(
+                gas=0x3F7A0,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x1ada72179309fd8a562e308928e38763a543ed6c"),  # noqa: E501
+        address=Address(0x1ADA72179309FD8A562E308928E38763A543ED6C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x4,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x5, value=0xE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[1]] 12 (REVERT 0 1) [[3]] 13 }
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0xC)
+        + Op.REVERT(offset=0x0, size=0x1)
+        + Op.SSTORE(key=0x3, value=0xD)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x652761b88018ea027f6f27e456fe55c2dc5d6a91"),  # noqa: E501
+        address=Address(0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[4]] (CALL 50000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[5]] 14 }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x4,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x5, value=0xE)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x6b8268ac8921e6a6e59a4b1d51a76f4e807e17af"),  # noqa: E501
+        address=Address(0x652761B88018EA027F6F27E456FE55C2DC5D6A91),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[0]] (CALL 50000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]] 14 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0xE)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x737f82ed94146e759790d925492df5a8ced35885"),  # noqa: E501
+        address=Address(0xCEB48D108C874B5B014ACDD1A2466D65A3D01DE6),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0xC)
-            + Op.REVERT(offset=0x0, size=0x1)
-            + Op.SSTORE(key=0x3, value=0xD)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[0]] (DELEGATECALL 50000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[2]] 14 }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0xE)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x93a599bde9a3b6390afdb06952aa5ec0b8c44f3b"),  # noqa: E501
+        address=Address(0x6B8268AC8921E6A6E59A4B1D51A76F4E807E17AF),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x652761B88018EA027F6F27E456FE55C2DC5D6A91,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[0]] (CALLCODE 50000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]] 14 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0xE)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xbf3fc188d9c8d699ffa12f0369e3b2bcf8428f7c"),  # noqa: E501
+        address=Address(0x737F82ED94146E759790D925492DF5A8CED35885),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[0]] (CALL 100000 <contract:0xb3305374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]] 14 }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0x652761B88018EA027F6F27E456FE55C2DC5D6A91,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0xE)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xceb48d108c874b5b014acdd1a2466d65a3d01de6"),  # noqa: E501
+        address=Address(0xBF3FC188D9C8D699FFA12F0369E3B2BCF8428F7C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_6: Account(storage={}),
+                target: Account(storage={10: 1}),
+                addr: Account(storage={0: 0, 2: 14}, nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_6: Account(storage={}),
+                addr: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_6: Account(storage={}),
+                target: Account(storage={10: 1}),
+                addr_2: Account(storage={0: 0, 2: 14}, nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_6: Account(storage={}),
+                addr_2: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": 2, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_6: Account(storage={}),
+                target: Account(storage={10: 1}),
+                addr_3: Account(storage={0: 0, 2: 14}, nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": 2, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_6: Account(storage={}),
+                addr_3: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": [0], "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_6: Account(storage={}),
+                target: Account(storage={10: 1}),
+                addr_4: Account(storage={0: 1, 2: 14}, nonce=0),
+                addr_5: Account(storage={4: 0, 5: 14}, nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": [1], "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_6: Account(storage={}),
+                target: Account(storage={10: 0}),
+                addr_4: Account(storage={0: 0, 2: 0}, nonce=0),
+                addr_5: Account(storage={4: 0, 5: 0}, nonce=0),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [460000, 83622]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_opcode_create.py b/tests/ported_static/stRevertTest/test_revert_opcode_create.py
index d15c4078816..2672aa489e8 100644
--- a/tests/ported_static/stRevertTest/test_revert_opcode_create.py
+++ b/tests/ported_static/stRevertTest/test_revert_opcode_create.py
@@ -1,19 +1,24 @@
 """
-Test ported from static filler.
+Test_revert_opcode_create.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertOpcodeCreateFiller.json
+state_tests/stRevertTest/RevertOpcodeCreateFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,36 +27,39 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/RevertOpcodeCreateFiller.json"],
+    ["state_tests/stRevertTest/RevertOpcodeCreateFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            460000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 12}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
-        (70000, {}),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_opcode_create(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_revert_opcode_create."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -62,30 +70,53 @@ def test_revert_opcode_create(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x600160005560016000fd6011600155 ) [[1]](CREATE 1 17 15) [[0]] 12 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x600160005560016000FD6011600155)
-            + Op.SSTORE(
-                key=0x1, value=Op.CREATE(value=0x1, offset=0x11, size=0xF)
-            )
-            + Op.SSTORE(key=0x0, value=0xC)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x600160005560016000FD6011600155)
+        + Op.SSTORE(key=0x1, value=Op.CREATE(value=0x1, offset=0x11, size=0xF))
+        + Op.SSTORE(key=0x0, value=0xC)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(
+                    address=contract_0, nonce=0
+                ): Account.NONEXISTENT,
+                contract_0: Account(storage={0: 12, 1: 0}, nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(
+                    address=contract_0, nonce=0
+                ): Account.NONEXISTENT,
+                contract_0: Account(nonce=0),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("600160005560016000fe6011600155"),
+    ]
+    tx_gas = [460000, 70000]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("600160005560016000fe6011600155"),
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_opcode_direct_call.py b/tests/ported_static/stRevertTest/test_revert_opcode_direct_call.py
index 389e83c3e8e..76b0eb62908 100644
--- a/tests/ported_static/stRevertTest/test_revert_opcode_direct_call.py
+++ b/tests/ported_static/stRevertTest/test_revert_opcode_direct_call.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_revert_opcode_direct_call.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertOpcodeDirectCallFiller.json
+state_tests/stRevertTest/RevertOpcodeDirectCallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,38 +26,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/RevertOpcodeDirectCallFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/RevertOpcodeDirectCallFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            460000,
-            {
-                Address("0xceb48d108c874b5b014acdd1a2466d65a3d01de6"): Account(
-                    storage={2: 14}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
-        (62912, {}),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_opcode_direct_call(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_revert_opcode_direct_call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -64,71 +68,91 @@ def test_revert_opcode_direct_call(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0xC)
-            + Op.REVERT(offset=0x0, size=0x1)
-            + Op.SSTORE(key=0x3, value=0xD)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[10]] (CALL 60000 (CALLDATALOAD 0) 0 0 0 0 0)}
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0xA,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x93a599bde9a3b6390afdb06952aa5ec0b8c44f3b"),  # noqa: E501
+        address=Address(0xF94D87FAF19D8C731E70E1B0A25F9668718F6E17),  # noqa: E501
     )
-    # Source: LLL
-    # { [[0]] (CALL 50000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]] 14 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[1]] 12 (REVERT 0 1) [[3]] 13 }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0xC)
+        + Op.REVERT(offset=0x0, size=0x1)
+        + Op.SSTORE(key=0x3, value=0xD)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xceb48d108c874b5b014acdd1a2466d65a3d01de6"),  # noqa: E501
+        address=Address(0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0xA,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[0]] (CALL 50000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]] 14 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0xE)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xf94d87faf19d8c731e70e1b0a25f9668718f6e17"),  # noqa: E501
+        address=Address(0xCEB48D108C874B5B014ACDD1A2466D65A3D01DE6),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_2: Account(storage={}),
+                target: Account(storage={0: 0, 2: 14}, nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_2: Account(storage={}),
+                target: Account(storage={}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(target, left_padding=True),
+    ]
+    tx_gas = [460000, 62912]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "000000000000000000000000ceb48d108c874b5b014acdd1a2466d65a3d01de6"
-        ),
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_opcode_in_calls_on_non_empty_return_data.py b/tests/ported_static/stRevertTest/test_revert_opcode_in_calls_on_non_empty_return_data.py
index eb90cfe5a72..83e34b96b21 100644
--- a/tests/ported_static/stRevertTest/test_revert_opcode_in_calls_on_non_empty_return_data.py
+++ b/tests/ported_static/stRevertTest/test_revert_opcode_in_calls_on_non_empty_return_data.py
@@ -1,9 +1,8 @@
 """
-Test checks that the returndata buffer is changed when a subcall REVERTs. ...
+Test: this test checks that the returndata buffer is changed when a...
 
 Ported from:
-tests/static/state_tests/stRevertTest
-RevertOpcodeInCallsOnNonEmptyReturnDataFiller.json
+state_tests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnDataFiller.json
 """
 
 import pytest
@@ -13,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,122 +28,74 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnDataFiller.json",  # noqa: E501
+        "state_tests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnDataFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000e73611b5b479b30c93ac377aeb3bfb199764f3c3",
-            860000,
-            {
-                Address("0x172a8f572404293aa810685dfdc6f740c300cc4b"): Account(
-                    storage={10: 1}
-                ),
-                Address("0xe73611b5b479b30c93ac377aeb3bfb199764f3c3"): Account(
-                    storage={2: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "000000000000000000000000e73611b5b479b30c93ac377aeb3bfb199764f3c3",
-            28000,
-            {
-                Address("0x172a8f572404293aa810685dfdc6f740c300cc4b"): Account(
-                    storage={10: 255}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "000000000000000000000000c9da6cd8413f64323f12cd44c99671f280f15e1c",
-            860000,
-            {
-                Address("0x172a8f572404293aa810685dfdc6f740c300cc4b"): Account(
-                    storage={10: 1}
-                ),
-                Address("0xc9da6cd8413f64323f12cd44c99671f280f15e1c"): Account(
-                    storage={2: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "000000000000000000000000c9da6cd8413f64323f12cd44c99671f280f15e1c",
-            28000,
-            {
-                Address("0x172a8f572404293aa810685dfdc6f740c300cc4b"): Account(
-                    storage={10: 255}
-                )
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "000000000000000000000000f20ccaf271beaa36e7cf4c9ced2867fac9558f14",
-            860000,
-            {
-                Address("0x172a8f572404293aa810685dfdc6f740c300cc4b"): Account(
-                    storage={10: 1}
-                ),
-                Address("0xf20ccaf271beaa36e7cf4c9ced2867fac9558f14"): Account(
-                    storage={2: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "000000000000000000000000f20ccaf271beaa36e7cf4c9ced2867fac9558f14",
-            28000,
-            {
-                Address("0x172a8f572404293aa810685dfdc6f740c300cc4b"): Account(
-                    storage={10: 255}
-                )
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "0000000000000000000000006bacdfa8216dbb2a09819f8739e57ae3574c9fff",
-            860000,
-            {
-                Address("0x172a8f572404293aa810685dfdc6f740c300cc4b"): Account(
-                    storage={10: 1}
-                ),
-                Address("0x6bacdfa8216dbb2a09819f8739e57ae3574c9fff"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xea519c47889074e6378b0d83747f2c3ea0b9cbc9"): Account(
-                    storage={5: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "0000000000000000000000006bacdfa8216dbb2a09819f8739e57ae3574c9fff",
-            28000,
-            {
-                Address("0x172a8f572404293aa810685dfdc6f740c300cc4b"): Account(
-                    storage={10: 255}
-                )
-            },
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_opcode_in_calls_on_non_empty_return_data(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test checks that the returndata buffer is changed when a subcall..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test: tis test checks that the returndata buffer is changed when a..."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
@@ -153,231 +109,310 @@ def test_revert_opcode_in_calls_on_non_empty_return_data(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0xC)
-            + Op.RETURN(offset=0x0, size=0x40)
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0xE8D4A51000)
+    # Source: lll
+    # { [[1]] 12 (REVERT 0 1) [[3]] 13 }
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0xC)
+        + Op.REVERT(offset=0x0, size=0x1)
+        + Op.SSTORE(key=0x3, value=0xD)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x127eaf7e31d691a8393b7a2f84a6e94372190c01"),  # noqa: E501
+        address=Address(0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B),  # noqa: E501
     )
-    # Source: LLL
-    # { (CALL 0 <contract:0xffff5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[10]] (CALL 260000 (CALLDATALOAD 0) 0 0 0 0 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=0x127EAF7E31D691A8393B7A2F84A6E94372190C01,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xA,
-                value=Op.CALL(
-                    gas=0x3F7A0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0xA: 0xFF},
+    # Source: lll
+    # { [1] 12 (RETURN 0 64) }
+    addr_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0xC)
+        + Op.RETURN(offset=0x0, size=0x40)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x172a8f572404293aa810685dfdc6f740c300cc4b"),  # noqa: E501
+        address=Address(0x127EAF7E31D691A8393B7A2F84A6E94372190C01),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=0x127EAF7E31D691A8393B7A2F84A6E94372190C01,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # { (CALL 0 <contract:0xffff5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[0]] (DELEGATECALL 50000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[2]] (RETURNDATASIZE) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x0,
+                address=0x127EAF7E31D691A8393B7A2F84A6E94372190C01,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0xEA519C47889074E6378B0D83747F2C3EA0B9CBC9,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=Op.RETURNDATASIZE)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x6bacdfa8216dbb2a09819f8739e57ae3574c9fff"),  # noqa: E501
+        address=Address(0xF20CCAF271BEAA36E7CF4C9CED2867FAC9558F14),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0xC)
-            + Op.REVERT(offset=0x0, size=0x1)
-            + Op.SSTORE(key=0x3, value=0xD)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (CALL 0 <contract:0xffff5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[0]] (CALLCODE 50000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]] (RETURNDATASIZE) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x0,
+                address=0x127EAF7E31D691A8393B7A2F84A6E94372190C01,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=Op.RETURNDATASIZE)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x93a599bde9a3b6390afdb06952aa5ec0b8c44f3b"),  # noqa: E501
+        address=Address(0xC9DA6CD8413F64323F12CD44C99671F280F15E1C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=0x127EAF7E31D691A8393B7A2F84A6E94372190C01,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # { (CALL 0 <contract:0xffff5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[4]] (CALL 50000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[5]] (RETURNDATASIZE) }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x0,
+                address=0x127EAF7E31D691A8393B7A2F84A6E94372190C01,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x2, value=Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(
+            key=0x4,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x5, value=Op.RETURNDATASIZE)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xc9da6cd8413f64323f12cd44c99671f280f15e1c"),  # noqa: E501
+        address=Address(0xEA519C47889074E6378B0D83747F2C3EA0B9CBC9),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=0x127EAF7E31D691A8393B7A2F84A6E94372190C01,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # { (CALL 0 <contract:0xffff5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[0]] (CALL 50000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]] (RETURNDATASIZE) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x0,
+                address=0x127EAF7E31D691A8393B7A2F84A6E94372190C01,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x2, value=Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=Op.RETURNDATASIZE)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xe73611b5b479b30c93ac377aeb3bfb199764f3c3"),  # noqa: E501
+        address=Address(0xE73611B5B479B30C93AC377AEB3BFB199764F3C3),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=0x127EAF7E31D691A8393B7A2F84A6E94372190C01,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x4,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # { (CALL 0 <contract:0xffff5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[10]] (CALL 260000 (CALLDATALOAD 0) 0 0 0 0 0)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x0,
+                address=0x127EAF7E31D691A8393B7A2F84A6E94372190C01,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x5, value=Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(
+            key=0xA,
+            value=Op.CALL(
+                gas=0x3F7A0,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        storage={10: 255},
         balance=1,
         nonce=0,
-        address=Address("0xea519c47889074e6378b0d83747f2c3ea0b9cbc9"),  # noqa: E501
+        address=Address(0x172A8F572404293AA810685DFDC6F740C300CC4B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=0x127EAF7E31D691A8393B7A2F84A6E94372190C01,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x93A599BDE9A3B6390AFDB06952AA5EC0B8C44F3B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # { (CALL 0 <contract:0xffff5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[0]] (CALL 100000 <contract:0xb3305374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]] (RETURNDATASIZE) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x0,
+                address=0x127EAF7E31D691A8393B7A2F84A6E94372190C01,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x2, value=Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0xEA519C47889074E6378B0D83747F2C3EA0B9CBC9,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=Op.RETURNDATASIZE)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xf20ccaf271beaa36e7cf4c9ced2867fac9558f14"),  # noqa: E501
+        address=Address(0x6BACDFA8216DBB2A09819F8739E57AE3574C9FFF),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_6: Account(storage={}),
+                target: Account(storage={10: 1}),
+                addr: Account(storage={2: 1}, nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_6: Account(storage={}),
+                addr: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_6: Account(storage={}),
+                target: Account(storage={10: 1}),
+                addr_2: Account(storage={2: 1}, nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_6: Account(storage={}),
+                addr_2: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": 2, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_6: Account(storage={}),
+                target: Account(storage={10: 1}),
+                addr_3: Account(storage={2: 1}, nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": 2, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_6: Account(storage={}),
+                addr_3: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_6: Account(storage={}),
+                target: Account(storage={10: 1}),
+                addr_4: Account(storage={0: 1}, nonce=0),
+                addr_5: Account(storage={5: 1}, nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_6: Account(storage={}),
+                target: Account(storage={10: 255}),
+                addr_4: Account(storage={0: 0}, nonce=0),
+                addr_5: Account(storage={5: 0}, nonce=0),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [860000, 28000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_opcode_in_create_returns.py b/tests/ported_static/stRevertTest/test_revert_opcode_in_create_returns.py
index 58d248a92d0..8a64f8f6529 100644
--- a/tests/ported_static/stRevertTest/test_revert_opcode_in_create_returns.py
+++ b/tests/ported_static/stRevertTest/test_revert_opcode_in_create_returns.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_revert_opcode_in_create_returns.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertOpcodeInCreateReturnsFiller.json
+state_tests/stRevertTest/RevertOpcodeInCreateReturnsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/RevertOpcodeInCreateReturnsFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/RevertOpcodeInCreateReturnsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_revert_opcode_in_create_returns(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
-    )
+    """Test_revert_opcode_in_create_returns."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x6400000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,37 +43,30 @@ def test_revert_opcode_in_create_returns(
         gas_limit=42949672960,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (seq (CREATE 0 0 (lll (seq (mstore 0 0x112233) (revert 0 32)) 0)) (SSTORE 0 (RETURNDATASIZE)) (STOP) )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0xD]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x15, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.POP(Op.CREATE)
-            + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
-            + Op.STOP
-            + Op.STOP
-            + Op.INVALID
-            + Op.MSTORE(offset=0x0, value=0x112233)
-            + Op.REVERT(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0xD]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x15, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE)
+        + Op.SSTORE(key=0x0, value=Op.RETURNDATASIZE)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=0x112233)
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x910073ceed5c2372dc67ffd941b0f148dc4ebaf5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 32}),
-    }
+    post = {target: Account(storage={0: 32})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_opcode_in_init.py b/tests/ported_static/stRevertTest/test_revert_opcode_in_init.py
index f097754e703..c5c7e8af07d 100644
--- a/tests/ported_static/stRevertTest/test_revert_opcode_in_init.py
+++ b/tests/ported_static/stRevertTest/test_revert_opcode_in_init.py
@@ -2,47 +2,58 @@
 TODO revertOpcodeInInit followed by OOG.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertOpcodeInInitFiller.json
+state_tests/stRevertTest/RevertOpcodeInInitFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/RevertOpcodeInInitFiller.json"],
+    ["state_tests/stRevertTest/RevertOpcodeInInitFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value",
+    "d, g, v",
     [
-        0,
-        10,
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
-@pytest.mark.pre_alloc_mutable
 def test_revert_opcode_in_init(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """TODO revertOpcodeInInit followed by OOG."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -53,16 +64,25 @@ def test_revert_opcode_in_init(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
+    tx_data = [
+        Op.SSTORE(key=0x0, value=0x1)
+        + Op.REVERT(offset=0x0, size=0x1)
+        + Op.SSTORE(key=0x1, value=0x11),
+    ]
+    tx_gas = [160000]
+    tx_value = [0, 10]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex("600160005560016000fd6011600155"),
-        gas_limit=160000,
-        value=tx_value,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=sender, nonce=0): Account.NONEXISTENT,
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_opcode_multiple_sub_calls.py b/tests/ported_static/stRevertTest/test_revert_opcode_multiple_sub_calls.py
index d43c327fc33..4cb54d7251c 100644
--- a/tests/ported_static/stRevertTest/test_revert_opcode_multiple_sub_calls.py
+++ b/tests/ported_static/stRevertTest/test_revert_opcode_multiple_sub_calls.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_revert_opcode_multiple_sub_calls.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json
+state_tests/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json
 """
 
 import pytest
@@ -12,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,317 +27,217 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000d7e294f032a5cc430e9e6c4148220867e9704dcd",
-            800000,
-            0,
-            {
-                Address("0xd7e294f032a5cc430e9e6c4148220867e9704dcd"): Account(
-                    storage={4: 12, 5: 12}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0-v0",
         ),
-        (
-            "000000000000000000000000d7e294f032a5cc430e9e6c4148220867e9704dcd",
-            800000,
-            10,
-            {
-                Address("0xd7e294f032a5cc430e9e6c4148220867e9704dcd"): Account(
-                    storage={4: 12, 5: 12}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            1,
+            id="d0-g0-v1",
         ),
-        (
-            "000000000000000000000000d7e294f032a5cc430e9e6c4148220867e9704dcd",
-            126200,
+        pytest.param(
             0,
-            {},
+            1,
+            0,
+            id="d0-g1-v0",
         ),
-        (
-            "000000000000000000000000d7e294f032a5cc430e9e6c4148220867e9704dcd",
-            126200,
-            10,
-            {},
+        pytest.param(
+            0,
+            1,
+            1,
+            id="d0-g1-v1",
         ),
-        (
-            "000000000000000000000000d7e294f032a5cc430e9e6c4148220867e9704dcd",
-            160000,
+        pytest.param(
             0,
-            {
-                Address("0xd7e294f032a5cc430e9e6c4148220867e9704dcd"): Account(
-                    storage={4: 12, 5: 12}
-                )
-            },
+            2,
+            0,
+            id="d0-g2-v0",
         ),
-        (
-            "000000000000000000000000d7e294f032a5cc430e9e6c4148220867e9704dcd",
-            160000,
-            10,
-            {
-                Address("0xd7e294f032a5cc430e9e6c4148220867e9704dcd"): Account(
-                    storage={4: 12, 5: 12}
-                )
-            },
+        pytest.param(
+            0,
+            2,
+            1,
+            id="d0-g2-v1",
         ),
-        (
-            "000000000000000000000000d7e294f032a5cc430e9e6c4148220867e9704dcd",
-            50000,
+        pytest.param(
+            0,
+            3,
             0,
-            {},
+            id="d0-g3-v0",
         ),
-        (
-            "000000000000000000000000d7e294f032a5cc430e9e6c4148220867e9704dcd",
-            50000,
-            10,
-            {},
+        pytest.param(
+            0,
+            3,
+            1,
+            id="d0-g3-v1",
         ),
-        (
-            "000000000000000000000000ee88dfd8455d7d9d6d33231f3daf6d9a4526d5cf",
-            800000,
+        pytest.param(
+            1,
             0,
-            {
-                Address("0xee88dfd8455d7d9d6d33231f3daf6d9a4526d5cf"): Account(
-                    storage={4: 12, 5: 12}
-                )
-            },
+            0,
+            id="d1-g0-v0",
         ),
-        (
-            "000000000000000000000000ee88dfd8455d7d9d6d33231f3daf6d9a4526d5cf",
-            800000,
-            10,
-            {
-                Address("0xee88dfd8455d7d9d6d33231f3daf6d9a4526d5cf"): Account(
-                    storage={4: 12, 5: 12}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            1,
+            id="d1-g0-v1",
         ),
-        (
-            "000000000000000000000000ee88dfd8455d7d9d6d33231f3daf6d9a4526d5cf",
-            126200,
+        pytest.param(
+            1,
+            1,
             0,
-            {},
+            id="d1-g1-v0",
         ),
-        (
-            "000000000000000000000000ee88dfd8455d7d9d6d33231f3daf6d9a4526d5cf",
-            126200,
-            10,
-            {},
+        pytest.param(
+            1,
+            1,
+            1,
+            id="d1-g1-v1",
         ),
-        (
-            "000000000000000000000000ee88dfd8455d7d9d6d33231f3daf6d9a4526d5cf",
-            160000,
+        pytest.param(
+            1,
+            2,
             0,
-            {
-                Address("0xee88dfd8455d7d9d6d33231f3daf6d9a4526d5cf"): Account(
-                    storage={4: 12, 5: 12}
-                )
-            },
+            id="d1-g2-v0",
         ),
-        (
-            "000000000000000000000000ee88dfd8455d7d9d6d33231f3daf6d9a4526d5cf",
-            160000,
-            10,
-            {
-                Address("0xee88dfd8455d7d9d6d33231f3daf6d9a4526d5cf"): Account(
-                    storage={4: 12, 5: 12}
-                )
-            },
+        pytest.param(
+            1,
+            2,
+            1,
+            id="d1-g2-v1",
         ),
-        (
-            "000000000000000000000000ee88dfd8455d7d9d6d33231f3daf6d9a4526d5cf",
-            50000,
+        pytest.param(
+            1,
+            3,
             0,
-            {},
+            id="d1-g3-v0",
         ),
-        (
-            "000000000000000000000000ee88dfd8455d7d9d6d33231f3daf6d9a4526d5cf",
-            50000,
-            10,
-            {},
+        pytest.param(
+            1,
+            3,
+            1,
+            id="d1-g3-v1",
         ),
-        (
-            "00000000000000000000000068cf97c6ca41ecfc5623d8a7e9b6f72068213e95",
-            800000,
+        pytest.param(
+            2,
             0,
-            {
-                Address("0x68cf97c6ca41ecfc5623d8a7e9b6f72068213e95"): Account(
-                    storage={4: 12, 5: 12}
-                )
-            },
+            0,
+            id="d2-g0-v0",
         ),
-        (
-            "00000000000000000000000068cf97c6ca41ecfc5623d8a7e9b6f72068213e95",
-            800000,
-            10,
-            {
-                Address("0x68cf97c6ca41ecfc5623d8a7e9b6f72068213e95"): Account(
-                    storage={4: 12, 5: 12}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            1,
+            id="d2-g0-v1",
         ),
-        (
-            "00000000000000000000000068cf97c6ca41ecfc5623d8a7e9b6f72068213e95",
-            126200,
+        pytest.param(
+            2,
+            1,
             0,
-            {},
+            id="d2-g1-v0",
         ),
-        (
-            "00000000000000000000000068cf97c6ca41ecfc5623d8a7e9b6f72068213e95",
-            126200,
-            10,
-            {},
+        pytest.param(
+            2,
+            1,
+            1,
+            id="d2-g1-v1",
         ),
-        (
-            "00000000000000000000000068cf97c6ca41ecfc5623d8a7e9b6f72068213e95",
-            160000,
+        pytest.param(
+            2,
+            2,
             0,
-            {
-                Address("0x68cf97c6ca41ecfc5623d8a7e9b6f72068213e95"): Account(
-                    storage={4: 12, 5: 12}
-                )
-            },
+            id="d2-g2-v0",
         ),
-        (
-            "00000000000000000000000068cf97c6ca41ecfc5623d8a7e9b6f72068213e95",
-            160000,
-            10,
-            {
-                Address("0x68cf97c6ca41ecfc5623d8a7e9b6f72068213e95"): Account(
-                    storage={4: 12, 5: 12}
-                )
-            },
+        pytest.param(
+            2,
+            2,
+            1,
+            id="d2-g2-v1",
         ),
-        (
-            "00000000000000000000000068cf97c6ca41ecfc5623d8a7e9b6f72068213e95",
-            50000,
+        pytest.param(
+            2,
+            3,
             0,
-            {},
+            id="d2-g3-v0",
         ),
-        (
-            "00000000000000000000000068cf97c6ca41ecfc5623d8a7e9b6f72068213e95",
-            50000,
-            10,
-            {},
+        pytest.param(
+            2,
+            3,
+            1,
+            id="d2-g3-v1",
         ),
-        (
-            "0000000000000000000000001302fd3b212e7e634f82ed6d00ac14544e8b1cab",
-            800000,
+        pytest.param(
+            3,
             0,
-            {
-                Address("0x1302fd3b212e7e634f82ed6d00ac14544e8b1cab"): Account(
-                    storage={4: 12, 5: 12}
-                )
-            },
+            0,
+            id="d3-g0-v0",
         ),
-        (
-            "0000000000000000000000001302fd3b212e7e634f82ed6d00ac14544e8b1cab",
-            800000,
-            10,
-            {
-                Address("0x1302fd3b212e7e634f82ed6d00ac14544e8b1cab"): Account(
-                    storage={4: 12, 5: 12}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            1,
+            id="d3-g0-v1",
         ),
-        (
-            "0000000000000000000000001302fd3b212e7e634f82ed6d00ac14544e8b1cab",
-            126200,
+        pytest.param(
+            3,
+            1,
             0,
-            {},
+            id="d3-g1-v0",
         ),
-        (
-            "0000000000000000000000001302fd3b212e7e634f82ed6d00ac14544e8b1cab",
-            126200,
-            10,
-            {},
+        pytest.param(
+            3,
+            1,
+            1,
+            id="d3-g1-v1",
         ),
-        (
-            "0000000000000000000000001302fd3b212e7e634f82ed6d00ac14544e8b1cab",
-            160000,
+        pytest.param(
+            3,
+            2,
             0,
-            {
-                Address("0x1302fd3b212e7e634f82ed6d00ac14544e8b1cab"): Account(
-                    storage={4: 12, 5: 12}
-                )
-            },
+            id="d3-g2-v0",
         ),
-        (
-            "0000000000000000000000001302fd3b212e7e634f82ed6d00ac14544e8b1cab",
-            160000,
-            10,
-            {
-                Address("0x1302fd3b212e7e634f82ed6d00ac14544e8b1cab"): Account(
-                    storage={4: 12, 5: 12}
-                )
-            },
+        pytest.param(
+            3,
+            2,
+            1,
+            id="d3-g2-v1",
         ),
-        (
-            "0000000000000000000000001302fd3b212e7e634f82ed6d00ac14544e8b1cab",
-            50000,
+        pytest.param(
+            3,
+            3,
             0,
-            {},
+            id="d3-g3-v0",
         ),
-        (
-            "0000000000000000000000001302fd3b212e7e634f82ed6d00ac14544e8b1cab",
-            50000,
-            10,
-            {},
+        pytest.param(
+            3,
+            3,
+            1,
+            id="d3-g3-v1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_opcode_multiple_sub_calls(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_revert_opcode_multiple_sub_calls."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
@@ -346,239 +251,350 @@ def test_revert_opcode_multiple_sub_calls(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0xA,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x86C575F296A8A021A2A64972E57A20B06FE8B897,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xB,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x3D2496D905CF0E9C77473CBFB6E100062B5AF57F,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xC,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x83BAC26DD305C061381C042D0BAC07B08D15BBCE,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.SSTORE(key=0x5, value=0xC)
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0xE8D4A51000)
+    # Source: lll
+    # { (CALL 260000 (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x3F7A0,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=Op.CALLVALUE,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1302fd3b212e7e634f82ed6d00ac14544e8b1cab"),  # noqa: E501
+        address=Address(0x89AB420962193A25593B5663462B75C083D56148),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0xC)
-            + Op.REVERT(offset=0x0, size=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[1]] 12 (REVERT 0 1) }
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0xC)
+        + Op.REVERT(offset=0x0, size=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3d2496d905cf0e9c77473cbfb6e100062b5af57f"),  # noqa: E501
+        address=Address(0x86C575F296A8A021A2A64972E57A20B06FE8B897),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0xA,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x86C575F296A8A021A2A64972E57A20B06FE8B897,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xB,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x3D2496D905CF0E9C77473CBFB6E100062B5AF57F,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xC,
-                value=Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x83BAC26DD305C061381C042D0BAC07B08D15BBCE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.SSTORE(key=0x5, value=0xC)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]] 12 (REVERT 0 1) }
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0xC)
+        + Op.REVERT(offset=0x0, size=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x68cf97c6ca41ecfc5623d8a7e9b6f72068213e95"),  # noqa: E501
+        address=Address(0x3D2496D905CF0E9C77473CBFB6E100062B5AF57F),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0xC)
-            + Op.REVERT(offset=0x0, size=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[3]] 12 (REVERT 0 1) }
+    addr_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0xC)
+        + Op.REVERT(offset=0x0, size=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x83bac26dd305c061381c042d0bac07b08d15bbce"),  # noqa: E501
+        address=Address(0x83BAC26DD305C061381C042D0BAC07B08D15BBCE),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0xC)
-            + Op.REVERT(offset=0x0, size=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[10]](CALLCODE 50000 <contract:0xb000000000000000000000000000000000000000> 0 0 0 0 0) [[11]](CALLCODE 50000 <contract:0xc000000000000000000000000000000000000000> 0 0 0 0 0) [[12]](CALLCODE 50000 <contract:0xd000000000000000000000000000000000000000> 0 0 0 0 0) [[4]]12 [[5]]12 }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0xA,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x86C575F296A8A021A2A64972E57A20B06FE8B897,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xB,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x3D2496D905CF0E9C77473CBFB6E100062B5AF57F,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xC,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x83BAC26DD305C061381C042D0BAC07B08D15BBCE,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.SSTORE(key=0x5, value=0xC)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x86c575f296a8a021a2a64972e57a20b06fe8b897"),  # noqa: E501
+        address=Address(0xEE88DFD8455D7D9D6D33231F3DAF6D9A4526D5CF),  # noqa: E501
     )
-    # Source: LLL
-    # { (CALL 260000 (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x3F7A0,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLVALUE,
+    # Source: lll
+    # { [[10]](CALL 50000 <contract:0xb000000000000000000000000000000000000000> 0 0 0 0 0) [[11]](DELEGATECALL 50000 <contract:0xc000000000000000000000000000000000000000> 0 0 0 0) [[12]](CALLCODE 50000 <contract:0xd000000000000000000000000000000000000000> 0 0 0 0 0) [[4]]12 [[5]]12 }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0xA,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x86C575F296A8A021A2A64972E57A20B06FE8B897,
+                value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(
+            key=0xB,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x3D2496D905CF0E9C77473CBFB6E100062B5AF57F,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xC,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x83BAC26DD305C061381C042D0BAC07B08D15BBCE,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.SSTORE(key=0x5, value=0xC)
+        + Op.STOP,
+        nonce=0,
+        address=Address(0x1302FD3B212E7E634F82ED6D00AC14544E8B1CAB),  # noqa: E501
+    )
+    # Source: lll
+    # { [[10]](DELEGATECALL 50000 <contract:0xb000000000000000000000000000000000000000> 0 0 0 0) [[11]](DELEGATECALL 50000 <contract:0xc000000000000000000000000000000000000000> 0 0 0 0) [[12]](DELEGATECALL 50000 <contract:0xd000000000000000000000000000000000000000> 0 0 0 0) [[4]]12 [[5]]12 }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0xA,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x86C575F296A8A021A2A64972E57A20B06FE8B897,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xB,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x3D2496D905CF0E9C77473CBFB6E100062B5AF57F,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xC,
+            value=Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x83BAC26DD305C061381C042D0BAC07B08D15BBCE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.SSTORE(key=0x5, value=0xC)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x89ab420962193a25593b5663462b75c083d56148"),  # noqa: E501
+        address=Address(0x68CF97C6CA41ECFC5623D8A7E9B6F72068213E95),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0xA,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x86C575F296A8A021A2A64972E57A20B06FE8B897,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
+    # Source: lll
+    # { [[10]](CALL 50000 <contract:0xb000000000000000000000000000000000000000> 0 0 0 0 0) [[11]](CALL 50000 <contract:0xc000000000000000000000000000000000000000> 0 0 0 0 0) [[12]](CALL 50000 <contract:0xd000000000000000000000000000000000000000> 0 0 0 0 0) [[4]]12 [[5]]12 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0xA,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x86C575F296A8A021A2A64972E57A20B06FE8B897,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xB,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x3D2496D905CF0E9C77473CBFB6E100062B5AF57F,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xC,
+            value=Op.CALL(
+                gas=0xC350,
+                address=0x83BAC26DD305C061381C042D0BAC07B08D15BBCE,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.SSTORE(key=0x5, value=0xC)
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xD7E294F032A5CC430E9E6C4148220867E9704DCD),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                addr: Account(
+                    storage={4: 12, 5: 12, 10: 0, 11: 0, 12: 0},
+                    nonce=0,
                 ),
-            )
-            + Op.SSTORE(
-                key=0xB,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x3D2496D905CF0E9C77473CBFB6E100062B5AF57F,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
+                addr_5: Account(storage={1: 0, 2: 0, 3: 0}),
+                addr_6: Account(storage={1: 0, 2: 0, 3: 0}),
+                addr_7: Account(storage={1: 0, 2: 0, 3: 0}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                addr_2: Account(
+                    storage={4: 12, 5: 12, 10: 0, 11: 0, 12: 0},
+                    nonce=0,
                 ),
-            )
-            + Op.SSTORE(
-                key=0xC,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x83BAC26DD305C061381C042D0BAC07B08D15BBCE,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
+                addr_5: Account(storage={1: 0, 2: 0, 3: 0}),
+                addr_6: Account(storage={1: 0, 2: 0, 3: 0}),
+                addr_7: Account(storage={1: 0, 2: 0, 3: 0}),
+            },
+        },
+        {
+            "indexes": {"data": 2, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                addr_3: Account(
+                    storage={4: 12, 5: 12, 10: 0, 11: 0, 12: 0},
+                    nonce=0,
                 ),
-            )
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.SSTORE(key=0x5, value=0xC)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xd7e294f032a5cc430e9e6c4148220867e9704dcd"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0xA,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x86C575F296A8A021A2A64972E57A20B06FE8B897,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
+                addr_5: Account(storage={1: 0, 2: 0, 3: 0}),
+                addr_6: Account(storage={1: 0, 2: 0, 3: 0}),
+                addr_7: Account(storage={1: 0, 2: 0, 3: 0}),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": [0, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                addr_4: Account(
+                    storage={4: 12, 5: 12, 10: 0, 11: 0, 12: 0},
+                    nonce=0,
                 ),
-            )
-            + Op.SSTORE(
-                key=0xB,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x3D2496D905CF0E9C77473CBFB6E100062B5AF57F,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
+                addr_5: Account(storage={1: 0, 2: 0, 3: 0}),
+                addr_6: Account(storage={1: 0, 2: 0, 3: 0}),
+                addr_7: Account(storage={1: 0, 2: 0, 3: 0}),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 2, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                addr_4: Account(
+                    storage={4: 0, 5: 0, 10: 0, 11: 0, 12: 0}, nonce=0
                 ),
-            )
-            + Op.SSTORE(
-                key=0xC,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x83BAC26DD305C061381C042D0BAC07B08D15BBCE,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
+                addr_5: Account(storage={1: 0, 2: 0, 3: 0}),
+                addr_6: Account(storage={1: 0, 2: 0, 3: 0}),
+                addr_7: Account(storage={1: 0, 2: 0, 3: 0}),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": [2], "value": [0, 1]},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                addr: Account(
+                    storage={4: 12, 5: 12, 10: 0, 11: 0, 12: 0},
+                    nonce=0,
                 ),
-            )
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.SSTORE(key=0x5, value=0xC)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xee88dfd8455d7d9d6d33231f3daf6d9a4526d5cf"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xE8D4A51000)
+                addr_2: Account(storage={}, nonce=0),
+                addr_3: Account(storage={}, nonce=0),
+                addr_4: Account(storage={}, nonce=0),
+                addr_5: Account(storage={1: 0, 2: 0, 3: 0}),
+                addr_6: Account(storage={1: 0, 2: 0, 3: 0}),
+                addr_7: Account(storage={1: 0, 2: 0, 3: 0}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": [1, 3], "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                addr: Account(
+                    storage={4: 0, 5: 0, 10: 0, 11: 0, 12: 0}, nonce=0
+                ),
+                addr_2: Account(storage={}, nonce=0),
+                addr_3: Account(storage={}, nonce=0),
+                addr_4: Account(storage={}, nonce=0),
+                addr_5: Account(storage={1: 0, 2: 0, 3: 0}),
+                addr_6: Account(storage={1: 0, 2: 0, 3: 0}),
+                addr_7: Account(storage={1: 0, 2: 0, 3: 0}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [800000, 126200, 160000, 50000]
+    tx_value = [0, 10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_opcode_return.py b/tests/ported_static/stRevertTest/test_revert_opcode_return.py
index 21eb486a29c..4cd809a728e 100644
--- a/tests/ported_static/stRevertTest/test_revert_opcode_return.py
+++ b/tests/ported_static/stRevertTest/test_revert_opcode_return.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_revert_opcode_return.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertOpcodeReturnFiller.json
+state_tests/stRevertTest/RevertOpcodeReturnFiller.json
 """
 
 import pytest
@@ -12,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,106 +27,97 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/RevertOpcodeReturnFiller.json"],
+    ["state_tests/stRevertTest/RevertOpcodeReturnFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000001963fd2c717f5b4b9fa3d6baf38d66241e1ec005",
-            800000,
-            {
-                Address("0x1fc98371f1a058f1a6042e30a141aa8bb67dd1bc"): Account(
-                    storage={2: 0x726576657274206D657373616765}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "0000000000000000000000001963fd2c717f5b4b9fa3d6baf38d66241e1ec005",
-            80000,
-            {
-                Address("0x1fc98371f1a058f1a6042e30a141aa8bb67dd1bc"): Account(
-                    storage={2: 0x726576657274206D657373616765}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "000000000000000000000000745e52346d8549444323699e9fc383ae89bdd24f",
-            800000,
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "000000000000000000000000745e52346d8549444323699e9fc383ae89bdd24f",
-            80000,
-            {},
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "00000000000000000000000050eaca0a040ac6242d0c01cc1ff82f5b95cc10e4",
-            800000,
-            {},
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "00000000000000000000000050eaca0a040ac6242d0c01cc1ff82f5b95cc10e4",
-            80000,
-            {},
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "000000000000000000000000f933d2374d5875de033a8ed9d9c1ce5dea25c78b",
-            800000,
-            {},
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "000000000000000000000000f933d2374d5875de033a8ed9d9c1ce5dea25c78b",
-            80000,
-            {},
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "000000000000000000000000e5b2dfe7f932f2d5eaa7c8fb2e1e9a8b6a846fd7",
-            800000,
-            {},
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "000000000000000000000000e5b2dfe7f932f2d5eaa7c8fb2e1e9a8b6a846fd7",
-            80000,
-            {},
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "000000000000000000000000858f82bbfd84fc9eb91291458511df77311dbd0d",
-            800000,
-            {},
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "000000000000000000000000858f82bbfd84fc9eb91291458511df77311dbd0d",
-            80000,
-            {},
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_opcode_return(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_revert_opcode_return."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
@@ -135,99 +131,129 @@ def test_revert_opcode_return(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x72657665727465642064617461)
-            + Op.MSTORE(offset=0x0, value=0x726576657274206D657373616765)
-            + Op.REVERT(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0xE8D4A51000)
+    # Source: lll
+    # { [[1]](CALL 150000 (CALLDATALOAD 0) 0 0 0 0 32) [[2]] (MLOAD 0) }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x249F0,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1963fd2c717f5b4b9fa3d6baf38d66241e1ec005"),  # noqa: E501
+        address=Address(0x1FC98371F1A058F1A6042E30A141AA8BB67DD1BC),  # noqa: E501
     )
-    # Source: LLL
-    # { [[1]](CALL 150000 (CALLDATALOAD 0) 0 0 0 0 32) [[2]] (MLOAD 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x249F0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 0x72657665727465642064617461) (MSTORE 0 0x726576657274206d657373616765) (REVERT 0 32) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x72657665727465642064617461)
+        + Op.MSTORE(offset=0x0, value=0x726576657274206D657373616765)
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1fc98371f1a058f1a6042e30a141aa8bb67dd1bc"),  # noqa: E501
+        address=Address(0x1963FD2C717F5B4B9FA3D6BAF38D66241E1EC005),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x72657665727465642064617461)
-            + Op.MSTORE(offset=0x0, value=0x726576657274206D657373616765)
-            + Op.REVERT(offset=0x0, size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 0x72657665727465642064617461) (MSTORE 0 0x726576657274206d657373616765) (REVERT 0 0) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x72657665727465642064617461)
+        + Op.MSTORE(offset=0x0, value=0x726576657274206D657373616765)
+        + Op.REVERT(offset=0x0, size=0x0)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x50eaca0a040ac6242d0c01cc1ff82f5b95cc10e4"),  # noqa: E501
+        address=Address(0x745E52346D8549444323699E9FC383AE89BDD24F),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x72657665727465642064617461)
-            + Op.MSTORE(offset=0x0, value=0x726576657274206D657373616765)
-            + Op.REVERT(offset=0x0, size=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 0x72657665727465642064617461) (MSTORE 0 0x726576657274206d657373616765) (REVERT 0 0xfffffffffffffffffffffffffffff) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x72657665727465642064617461)
+        + Op.MSTORE(offset=0x0, value=0x726576657274206D657373616765)
+        + Op.REVERT(offset=0x0, size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x745e52346d8549444323699e9fc383ae89bdd24f"),  # noqa: E501
+        address=Address(0x50EACA0A040AC6242D0C01CC1FF82F5B95CC10E4),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x72657665727465642064617461)
-            + Op.MSTORE(offset=0x0, value=0x726576657274206D657373616765)
-            + Op.REVERT(offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, size=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 0x72657665727465642064617461) (MSTORE 0 0x726576657274206d657373616765) (REVERT 0x0100 0x00) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x72657665727465642064617461)
+        + Op.MSTORE(offset=0x0, value=0x726576657274206D657373616765)
+        + Op.REVERT(offset=0x100, size=0x0)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x858f82bbfd84fc9eb91291458511df77311dbd0d"),  # noqa: E501
+        address=Address(0xF933D2374D5875DE033A8ED9D9C1CE5DEA25C78B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x72657665727465642064617461)
-            + Op.MSTORE(offset=0x0, value=0x726576657274206D657373616765)
-            + Op.REVERT(offset=0x1, size=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 0x72657665727465642064617461) (MSTORE 0 0x726576657274206d657373616765) (REVERT 0x01 0x00) }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x72657665727465642064617461)
+        + Op.MSTORE(offset=0x0, value=0x726576657274206D657373616765)
+        + Op.REVERT(offset=0x1, size=0x0)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe5b2dfe7f932f2d5eaa7c8fb2e1e9a8b6a846fd7"),  # noqa: E501
+        address=Address(0xE5B2DFE7F932F2D5EAA7C8FB2E1E9A8B6A846FD7),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x72657665727465642064617461)
-            + Op.MSTORE(offset=0x0, value=0x726576657274206D657373616765)
-            + Op.REVERT(offset=0x100, size=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 0x72657665727465642064617461) (MSTORE 0 0x726576657274206d657373616765) (REVERT 0xfffffffffffffffffffffffffffff 0x00) }  # noqa: E501
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x72657665727465642064617461)
+        + Op.MSTORE(offset=0x0, value=0x726576657274206D657373616765)
+        + Op.REVERT(offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, size=0x0)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf933d2374d5875de033a8ed9d9c1ce5dea25c78b"),  # noqa: E501
+        address=Address(0x858F82BBFD84FC9EB91291458511DF77311DBD0D),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                target: Account(
+                    storage={1: 0, 2: 0x726576657274206D657373616765}
+                ),
+                addr: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2, 3, 4, 5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                target: Account(storage={1: 0, 2: 0}),
+                addr: Account(storage={}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+        Hash(addr_5, left_padding=True),
+        Hash(addr_6, left_padding=True),
+    ]
+    tx_gas = [800000, 80000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_opcode_with_big_output_in_init.py b/tests/ported_static/stRevertTest/test_revert_opcode_with_big_output_in_init.py
index bb1263bb06f..a50d18f316a 100644
--- a/tests/ported_static/stRevertTest/test_revert_opcode_with_big_output_in_init.py
+++ b/tests/ported_static/stRevertTest/test_revert_opcode_with_big_output_in_init.py
@@ -2,50 +2,58 @@
 A REVERT with a big output should not be confused with a big code...
 
 Ported from:
-tests/static/state_tests/stRevertTest
-RevertOpcodeWithBigOutputInInitFiller.json
+state_tests/stRevertTest/RevertOpcodeWithBigOutputInInitFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/RevertOpcodeWithBigOutputInInitFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/RevertOpcodeWithBigOutputInInitFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value",
+    "d, g, v",
     [
-        0,
-        10,
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-v1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
-@pytest.mark.pre_alloc_mutable
 def test_revert_opcode_with_big_output_in_init(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """A REVERT with a big output should not be confused with a big code..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -56,16 +64,25 @@ def test_revert_opcode_with_big_output_in_init(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
+    tx_data = [
+        Op.SSTORE(key=0x0, value=0x1)
+        + Op.REVERT(offset=0x0, size=0x1)
+        + Op.SSTORE(key=0x1, value=0x11),
+    ]
+    tx_gas = [1600000]
+    tx_value = [0, 10]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex("600160005560016000fd6011600155"),
-        gas_limit=1600000,
-        value=tx_value,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=sender, nonce=0): Account.NONEXISTENT,
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_precompiled_touch_exact_oog_paris.py b/tests/ported_static/stRevertTest/test_revert_precompiled_touch_exact_oog_paris.py
index 8654c9b6c48..ef19a867f29 100644
--- a/tests/ported_static/stRevertTest/test_revert_precompiled_touch_exact_oog_paris.py
+++ b/tests/ported_static/stRevertTest/test_revert_precompiled_touch_exact_oog_paris.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_revert_precompiled_touch_exact_oog_paris.
 
 Ported from:
-tests/static/state_tests/stRevertTest
-RevertPrecompiledTouchExactOOG_ParisFiller.json
+state_tests/stRevertTest/RevertPrecompiledTouchExactOOG_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,614 +27,611 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stRevertTest/RevertPrecompiledTouchExactOOG_ParisFiller.json",  # noqa: E501
+        "state_tests/stRevertTest/RevertPrecompiledTouchExactOOG_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            69000,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            22500,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            120000,
-            {},
-        ),
-        (
-            "00000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            69000,
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="d0-g2",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
+        ),
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
+        ),
+        pytest.param(
+            1,
+            2,
+            0,
+            id="d1-g2",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
+        ),
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
+        ),
+        pytest.param(
+            2,
+            2,
+            0,
+            id="d2-g2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
+        ),
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
+        ),
+        pytest.param(
+            3,
+            2,
+            0,
+            id="d3-g2",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
+        ),
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
+        ),
+        pytest.param(
+            4,
+            2,
+            0,
+            id="d4-g2",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
+        ),
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
+        ),
+        pytest.param(
+            5,
+            2,
+            0,
+            id="d5-g2",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
+        ),
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
+        ),
+        pytest.param(
+            6,
+            2,
+            0,
+            id="d6-g2",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
+        ),
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
+        ),
+        pytest.param(
+            7,
+            2,
+            0,
+            id="d7-g2",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
+        ),
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
+        ),
+        pytest.param(
+            8,
+            2,
+            0,
+            id="d8-g2",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
+        ),
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
+        ),
+        pytest.param(
+            9,
+            2,
+            0,
+            id="d9-g2",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10-g0",
+        ),
+        pytest.param(
+            10,
+            1,
+            0,
+            id="d10-g1",
+        ),
+        pytest.param(
+            10,
+            2,
+            0,
+            id="d10-g2",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11-g0",
+        ),
+        pytest.param(
+            11,
+            1,
+            0,
+            id="d11-g1",
+        ),
+        pytest.param(
+            11,
+            2,
+            0,
+            id="d11-g2",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12-g0",
+        ),
+        pytest.param(
+            12,
+            1,
+            0,
+            id="d12-g1",
+        ),
+        pytest.param(
+            12,
+            2,
+            0,
+            id="d12-g2",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13-g0",
+        ),
+        pytest.param(
+            13,
+            1,
+            0,
+            id="d13-g1",
+        ),
+        pytest.param(
+            13,
+            2,
+            0,
+            id="d13-g2",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14-g0",
+        ),
+        pytest.param(
+            14,
+            1,
+            0,
+            id="d14-g1",
+        ),
+        pytest.param(
+            14,
+            2,
+            0,
+            id="d14-g2",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15-g0",
+        ),
+        pytest.param(
+            15,
+            1,
+            0,
+            id="d15-g1",
+        ),
+        pytest.param(
+            15,
+            2,
+            0,
+            id="d15-g2",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="d16-g0",
+        ),
+        pytest.param(
+            16,
+            1,
+            0,
+            id="d16-g1",
+        ),
+        pytest.param(
+            16,
+            2,
+            0,
+            id="d16-g2",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="d17-g0",
+        ),
+        pytest.param(
+            17,
+            1,
+            0,
+            id="d17-g1",
+        ),
+        pytest.param(
+            17,
+            2,
+            0,
+            id="d17-g2",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="d18-g0",
+        ),
+        pytest.param(
+            18,
+            1,
+            0,
+            id="d18-g1",
+        ),
+        pytest.param(
+            18,
+            2,
+            0,
+            id="d18-g2",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="d19-g0",
+        ),
+        pytest.param(
+            19,
+            1,
+            0,
+            id="d19-g1",
+        ),
+        pytest.param(
+            19,
+            2,
+            0,
+            id="d19-g2",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="d20-g0",
+        ),
+        pytest.param(
+            20,
+            1,
+            0,
+            id="d20-g1",
+        ),
+        pytest.param(
+            20,
+            2,
+            0,
+            id="d20-g2",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="d21-g0",
+        ),
+        pytest.param(
+            21,
+            1,
+            0,
+            id="d21-g1",
+        ),
+        pytest.param(
+            21,
+            2,
+            0,
+            id="d21-g2",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="d22-g0",
+        ),
+        pytest.param(
+            22,
+            1,
+            0,
+            id="d22-g1",
+        ),
+        pytest.param(
+            22,
+            2,
+            0,
+            id="d22-g2",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="d23-g0",
+        ),
+        pytest.param(
+            23,
+            1,
+            0,
+            id="d23-g1",
+        ),
+        pytest.param(
+            23,
+            2,
+            0,
+            id="d23-g2",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="d24-g0",
+        ),
+        pytest.param(
+            24,
+            1,
+            0,
+            id="d24-g1",
+        ),
+        pytest.param(
+            24,
+            2,
+            0,
+            id="d24-g2",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="d25-g0",
+        ),
+        pytest.param(
+            25,
+            1,
+            0,
+            id="d25-g1",
+        ),
+        pytest.param(
+            25,
+            2,
+            0,
+            id="d25-g2",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="d26-g0",
+        ),
+        pytest.param(
+            26,
+            1,
+            0,
+            id="d26-g1",
+        ),
+        pytest.param(
+            26,
+            2,
+            0,
+            id="d26-g2",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="d27-g0",
+        ),
+        pytest.param(
+            27,
+            1,
+            0,
+            id="d27-g1",
+        ),
+        pytest.param(
+            27,
+            2,
+            0,
+            id="d27-g2",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="d28-g0",
+        ),
+        pytest.param(
+            28,
+            1,
+            0,
+            id="d28-g1",
+        ),
+        pytest.param(
+            28,
+            2,
+            0,
+            id="d28-g2",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="d29-g0",
+        ),
+        pytest.param(
+            29,
+            1,
+            0,
+            id="d29-g1",
+        ),
+        pytest.param(
+            29,
+            2,
+            0,
+            id="d29-g2",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="d30-g0",
+        ),
+        pytest.param(
+            30,
+            1,
+            0,
+            id="d30-g1",
+        ),
+        pytest.param(
+            30,
+            2,
+            0,
+            id="d30-g2",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="d31-g0",
+        ),
+        pytest.param(
+            31,
+            1,
+            0,
+            id="d31-g1",
+        ),
+        pytest.param(
+            31,
+            2,
+            0,
+            id="d31-g2",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_precompiled_touch_exact_oog_paris(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da")
-    sender = EOA(
-        key=0x0FF8D58222F34F6890DDAA468C023B77D6691ED7D3C4DCDDAE38336212FAF54B
-    )
-    callee = Address("0x1688023d9ae9e25ea02a2447a77b9cc9d22ce57b")
-    callee_2 = Address("0x6eb9afcb5d985b12549b7ac2e65c093f7113a0c7")
-    callee_4 = Address("0x85fdde91fd0ce22a2968e1f1b2ebb9f9e5a180ba")
-    callee_5 = Address("0x9e6c35deced6e05eb21d3465b5bbbb57b9cd57d6")
-    callee_7 = Address("0xad3df2901b7c6642e397c35e0e9f3dea5d098238")
-    callee_8 = Address("0xbe44b82021b08cfecc33a2e57ff5adcb7fe3b049")
-    callee_10 = Address("0xd085ab47bc36d1238fc092679b21b10792746640")
-    callee_11 = Address("0xf07a794e0f8aab4242b86368503d3c1de15481f8")
+    """Test_revert_precompiled_touch_exact_oog_paris."""
+    coinbase = Address(0x68795C4AA09D6F4ED3E5DEDDF8C2AD3049A601DA)
+    addr_5 = Address(0x0000000000000000000000000000000000000001)
+    addr_6 = Address(0x0000000000000000000000000000000000000002)
+    addr_7 = Address(0x0000000000000000000000000000000000000003)
+    addr_8 = Address(0x0000000000000000000000000000000000000004)
+    addr_9 = Address(0x0000000000000000000000000000000000000005)
+    addr_10 = Address(0x0000000000000000000000000000000000000006)
+    addr_11 = Address(0x0000000000000000000000000000000000000007)
+    addr_12 = Address(0x0000000000000000000000000000000000000008)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -642,106 +642,299 @@ def test_revert_precompiled_touch_exact_oog_paris(
         gas_limit=4012015,
     )
 
-    pre[callee] = Account(balance=1, nonce=0)
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=Op.GAS,
-                address=Op.CALLDATASIZE,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    pre[addr_5] = Account(balance=1)
+    pre[addr_6] = Account(balance=1)
+    pre[addr_7] = Account(balance=1)
+    pre[addr_8] = Account(balance=1)
+    pre[addr_9] = Account(balance=1)
+    pre[addr_10] = Account(balance=1)
+    pre[addr_11] = Account(balance=1)
+    pre[addr_12] = Account(balance=1)
+    # Source: lll
+    # {  (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 (CALLDATALOAD 32) 0 0) }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=Op.GAS,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=Op.CALLDATALOAD(offset=0x20),
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x33506407e929a3834ea7bfa65f86b41c7b7e57b9"),  # noqa: E501
+        address=Address(0x6C7FAC59C79986689878E37545DF629F68278098),  # noqa: E501
     )
-    # Source: LLL
-    # {  (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 (CALLDATALOAD 32) 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=Op.GAS,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=0x0,
-                args_offset=0x0,
-                args_size=Op.CALLDATALOAD(offset=0x20),
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (CALL (GAS) (CALLDATASIZE) 0 0 0 0 0) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=Op.GAS,
+            address=Op.CALLDATASIZE,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6c7fac59c79986689878e37545df629f68278098"),  # noqa: E501
+        address=Address(0xA2F144D2206204D88E039B31BB7DB14A28A06FED),  # noqa: E501
     )
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.CALLDATASIZE,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (DELEGATECALL (GAS) (CALLDATASIZE) 0 0 0 0) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.CALLDATASIZE,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x81f666fdc784482530048e74cee651ea98a0733d"),  # noqa: E501
+        address=Address(0x81F666FDC784482530048E74CEE651EA98A0733D),  # noqa: E501
     )
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=Op.GAS,
-                address=Op.CALLDATASIZE,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (CALLCODE (GAS) (CALLDATASIZE) 0 0 0 0 0) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=Op.GAS,
+            address=Op.CALLDATASIZE,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa2f144d2206204d88e039b31bb7db14a28a06fed"),  # noqa: E501
+        address=Address(0x33506407E929A3834EA7BFA65F86B41C7B7E57B9),  # noqa: E501
     )
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    pre[callee_8] = Account(balance=1, nonce=0)
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=Op.GAS,
-                address=Op.CALLDATASIZE,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (STATICCALL (GAS) (CALLDATASIZE) 0 0 0 0)  }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=Op.GAS,
+            address=Op.CALLDATASIZE,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc02fff115e5eee4ff4420eba1cb7cb8772e0598e"),  # noqa: E501
+        address=Address(0xC02FFF115E5EEE4FF4420EBA1CB7CB8772E0598E),  # noqa: E501
     )
-    pre[callee_10] = Account(balance=1, nonce=0)
-    pre[callee_11] = Account(balance=1, nonce=0)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 8, 16, 24], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_5: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [1, 25, 9, 17], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_6: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [18, 26, 2, 10], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_7: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [11, 19, 3, 27], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_8: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [20, 28, 4, 12], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_9: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [29, 13, 21, 5], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_10: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [22, 30, 6, 14], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_11: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [31, 15, 23, 7], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_12: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [8, 16], "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_5: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [0, 24], "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_5: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [9, 17], "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_6: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [1, 25], "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_6: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [10, 18], "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_7: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [2, 26], "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_7: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [19, 11], "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_8: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [27, 3], "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_8: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [12, 20], "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_9: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [4, 28], "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_9: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [21, 13], "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_10: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [29, 5], "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_10: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [14, 22], "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_11: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [6, 30], "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_11: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [23, 15], "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_12: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [31, 7], "gas": 2, "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_12: Account(nonce=0)},
+        },
+        {
+            "indexes": {"data": [31, 7], "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_12: Account(nonce=0)},
+        },
+    ]
 
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0x1000000000000000000000000000000000000000)
+        + Hash(addr_5, left_padding=True),
+        Hash(0x1000000000000000000000000000000000000000)
+        + Hash(addr_6, left_padding=True),
+        Hash(0x1000000000000000000000000000000000000000)
+        + Hash(addr_7, left_padding=True),
+        Hash(0x1000000000000000000000000000000000000000)
+        + Hash(addr_8, left_padding=True),
+        Hash(0x1000000000000000000000000000000000000000)
+        + Hash(addr_9, left_padding=True),
+        Hash(0x1000000000000000000000000000000000000000)
+        + Hash(addr_10, left_padding=True),
+        Hash(0x1000000000000000000000000000000000000000)
+        + Hash(addr_11, left_padding=True),
+        Hash(0x1000000000000000000000000000000000000000)
+        + Hash(addr_12, left_padding=True),
+        Hash(0x2000000000000000000000000000000000000000)
+        + Hash(addr_5, left_padding=True),
+        Hash(0x2000000000000000000000000000000000000000)
+        + Hash(addr_6, left_padding=True),
+        Hash(0x2000000000000000000000000000000000000000)
+        + Hash(addr_7, left_padding=True),
+        Hash(0x2000000000000000000000000000000000000000)
+        + Hash(addr_8, left_padding=True),
+        Hash(0x2000000000000000000000000000000000000000)
+        + Hash(addr_9, left_padding=True),
+        Hash(0x2000000000000000000000000000000000000000)
+        + Hash(addr_10, left_padding=True),
+        Hash(0x2000000000000000000000000000000000000000)
+        + Hash(addr_11, left_padding=True),
+        Hash(0x2000000000000000000000000000000000000000)
+        + Hash(addr_12, left_padding=True),
+        Hash(0x3000000000000000000000000000000000000000)
+        + Hash(addr_5, left_padding=True),
+        Hash(0x3000000000000000000000000000000000000000)
+        + Hash(addr_6, left_padding=True),
+        Hash(0x3000000000000000000000000000000000000000)
+        + Hash(addr_7, left_padding=True),
+        Hash(0x3000000000000000000000000000000000000000)
+        + Hash(addr_8, left_padding=True),
+        Hash(0x3000000000000000000000000000000000000000)
+        + Hash(addr_9, left_padding=True),
+        Hash(0x3000000000000000000000000000000000000000)
+        + Hash(addr_10, left_padding=True),
+        Hash(0x3000000000000000000000000000000000000000)
+        + Hash(addr_11, left_padding=True),
+        Hash(0x3000000000000000000000000000000000000000)
+        + Hash(addr_12, left_padding=True),
+        Hash(0x4000000000000000000000000000000000000000)
+        + Hash(addr_5, left_padding=True),
+        Hash(0x4000000000000000000000000000000000000000)
+        + Hash(addr_6, left_padding=True),
+        Hash(0x4000000000000000000000000000000000000000)
+        + Hash(addr_7, left_padding=True),
+        Hash(0x4000000000000000000000000000000000000000)
+        + Hash(addr_8, left_padding=True),
+        Hash(0x4000000000000000000000000000000000000000)
+        + Hash(addr_9, left_padding=True),
+        Hash(0x4000000000000000000000000000000000000000)
+        + Hash(addr_10, left_padding=True),
+        Hash(0x4000000000000000000000000000000000000000)
+        + Hash(addr_11, left_padding=True),
+        Hash(0x4000000000000000000000000000000000000000)
+        + Hash(addr_12, left_padding=True),
+    ]
+    tx_gas = [22500, 120000, 69000]
+
+    floor_cost = fork.transaction_data_floor_cost_calculator()(data=tx_data[d])
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=max(tx_gas[g], floor_cost),
         nonce=1,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_precompiled_touch_nonce.py b/tests/ported_static/stRevertTest/test_revert_precompiled_touch_nonce.py
index b8b06027f7a..56cc3c019bf 100644
--- a/tests/ported_static/stRevertTest/test_revert_precompiled_touch_nonce.py
+++ b/tests/ported_static/stRevertTest/test_revert_precompiled_touch_nonce.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_revert_precompiled_touch_nonce.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertPrecompiledTouch_nonceFiller.json
+state_tests/stRevertTest/RevertPrecompiledTouch_nonceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,40 +23,58 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/RevertPrecompiledTouch_nonceFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/RevertPrecompiledTouch_nonceFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "00000000000000000000000087aaeb9e422487283b0b008ef445e32acb9dd1ae",
-        "00000000000000000000000031f52a66cf9d94c60f089a2ca9c4e784261c57fa",
-        "000000000000000000000000de1200b7ecaea2d15b57d0f331ad5ade8e924255",
-        "00000000000000000000000010ef6d6218ada53728683cec4d5160c8c72159bd",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_precompiled_touch_nonce(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da")
-    sender = EOA(
-        key=0x0FF8D58222F34F6890DDAA468C023B77D6691ED7D3C4DCDDAE38336212FAF54B
-    )
-    callee = Address("0x05a4faf1ede8e96aae92ae51915074e42787f868")
-    callee_3 = Address("0x4ba6259bb96e9d7822a5fb3a1f8037bc68a08d43")
-    callee_4 = Address("0x6a22458e937f487e2daffa193b9c5fb610dc4789")
-    callee_6 = Address("0x8d1d883976df004b96c383782a828dc5bc82ef9d")
-    callee_7 = Address("0xb478e245708be95c33c6c35dea161c0429d02dd2")
-    callee_8 = Address("0xbeb47e021a70649b079c4bdf150108c0d8c6accb")
-    callee_10 = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    callee_11 = Address("0xf8f0aec70f4bbdadce829783a0afff43f384c640")
+    """Test_revert_precompiled_touch_nonce."""
+    coinbase = Address(0x68795C4AA09D6F4ED3E5DEDDF8C2AD3049A601DA)
+    addr_5 = Address(0x0000000000000000000000000000000000000001)
+    addr_6 = Address(0x0000000000000000000000000000000000000002)
+    addr_7 = Address(0x0000000000000000000000000000000000000003)
+    addr_8 = Address(0x0000000000000000000000000000000000000004)
+    addr_9 = Address(0x0000000000000000000000000000000000000005)
+    addr_10 = Address(0x0000000000000000000000000000000000000006)
+    addr_11 = Address(0x0000000000000000000000000000000000000007)
+    addr_12 = Address(0x0000000000000000000000000000000000000008)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -66,420 +85,432 @@ def test_revert_precompiled_touch_nonce(
         gas_limit=4012015,
     )
 
-    pre[callee] = Account(balance=0, nonce=1)
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(key=0x3, value=Op.GAS)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x10ef6d6218ada53728683cec4d5160c8c72159bd"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(key=0x3, value=Op.GAS)
-            + Op.STOP
-        ),
+    pre[addr_5] = Account(balance=0, nonce=1)
+    pre[addr_6] = Account(balance=0, nonce=1)
+    pre[addr_7] = Account(balance=0, nonce=1)
+    pre[addr_8] = Account(balance=0, nonce=1)
+    pre[addr_9] = Account(balance=0, nonce=1)
+    pre[addr_10] = Account(balance=0, nonce=1)
+    pre[addr_11] = Account(balance=0, nonce=1)
+    pre[addr_12] = Account(balance=0, nonce=1)
+    # Source: lll
+    # {  (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 0 0 0) }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=Op.GAS,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x31f52a66cf9d94c60f089a2ca9c4e784261c57fa"),  # noqa: E501
+        address=Address(0xE7C596DE24CCC387DAA5C017066AEB25EA8D2F3F),  # noqa: E501
     )
-    pre[callee_3] = Account(balance=0, nonce=1)
-    pre[callee_4] = Account(balance=0, nonce=1)
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(key=0x3, value=Op.GAS)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (CALL 50000 1 0 0 0 0 0) (CALL 50000 2 0 0 0 0 0) (CALL 50000 3 0 0 0 0 0) (CALL 50000 4 0 0 0 0 0) (CALL 50000 5 0 0 0 0 0) (CALL 50000 6 0 0 0 0 0) (CALL 50000 7 0 0 0 0 0) (CALL 50000 8 0 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x4,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x5,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x7,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(key=0x3, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x87aaeb9e422487283b0b008ef445e32acb9dd1ae"),  # noqa: E501
+        address=Address(0x87AAEB9E422487283B0B008EF445E32ACB9DD1AE),  # noqa: E501
     )
-    pre[callee_6] = Account(balance=0, nonce=1)
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    pre[callee_7] = Account(balance=0, nonce=1)
-    pre[callee_8] = Account(balance=0, nonce=1)
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(key=0x3, value=Op.GAS)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (DELEGATECALL 50000 1 0 0 0 0) (DELEGATECALL 50000 2 0 0 0 0) (DELEGATECALL 50000 3 0 0 0 0) (DELEGATECALL 50000 4 0 0 0 0) (DELEGATECALL 50000 5 0 0 0 0) (DELEGATECALL 50000 6 0 0 0 0) (DELEGATECALL 50000 7 0 0 0 0) (DELEGATECALL 50000 8 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x7,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x8,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(key=0x3, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xde1200b7ecaea2d15b57d0f331ad5ade8e924255"),  # noqa: E501
+        address=Address(0x31F52A66CF9D94C60F089A2CA9C4E784261C57FA),  # noqa: E501
     )
-    # Source: LLL
-    # {  (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
+    # Source: lll
+    # { (CALLCODE 50000 1 0 0 0 0 0) (CALLCODE 50000 2 0 0 0 0 0) (CALLCODE 50000 3 0 0 0 0 0) (CALLCODE 50000 4 0 0 0 0 0) (CALLCODE 50000 5 0 0 0 0 0) (CALLCODE 50000 6 0 0 0 0 0) (CALLCODE 50000 7 0 0 0 0 0) (CALLCODE 50000 8 0 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
             Op.CALLCODE(
-                gas=Op.GAS,
-                address=Op.CALLDATALOAD(offset=0x0),
+                gas=0xC350,
+                address=0x1,
                 value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x4,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x5,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x7,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(key=0x3, value=Op.GAS)
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xDE1200B7ECAEA2D15B57D0F331AD5ADE8E924255),  # noqa: E501
+    )
+    # Source: lll
+    # { (STATICCALL 50000 1 0 0 0 0) (STATICCALL 50000 2 0 0 0 0) (STATICCALL 50000 3 0 0 0 0) (STATICCALL 50000 4 0 0 0 0) (STATICCALL 50000 5 0 0 0 0) (STATICCALL 50000 6 0 0 0 0) (STATICCALL 50000 7 0 0 0 0) (STATICCALL 50000 8 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x7,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x8,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(key=0x3, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe7c596de24ccc387daa5c017066aeb25ea8d2f3f"),  # noqa: E501
+        address=Address(0x10EF6D6218ADA53728683CEC4D5160C8C72159BD),  # noqa: E501
     )
-    pre[callee_10] = Account(balance=0, nonce=1)
-    pre[callee_11] = Account(balance=0, nonce=1)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
     )
 
-    post: dict = {}
+    post = {
+        addr_5: Account(balance=0, nonce=1),
+        addr_6: Account(balance=0, nonce=1),
+        addr_7: Account(balance=0, nonce=1),
+        addr_8: Account(balance=0, nonce=1),
+        addr_9: Account(balance=0, nonce=1),
+        addr_10: Account(balance=0, nonce=1),
+        addr_11: Account(balance=0, nonce=1),
+        addr_12: Account(balance=0, nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_precompiled_touch_noncestorage.py b/tests/ported_static/stRevertTest/test_revert_precompiled_touch_noncestorage.py
index cd50daa0a2a..749bb8a785d 100644
--- a/tests/ported_static/stRevertTest/test_revert_precompiled_touch_noncestorage.py
+++ b/tests/ported_static/stRevertTest/test_revert_precompiled_touch_noncestorage.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_revert_precompiled_touch_noncestorage.
 
 Ported from:
-tests/static/state_tests/stRevertTest
-RevertPrecompiledTouch_noncestorageFiller.json
+state_tests/stRevertTest/RevertPrecompiledTouch_noncestorageFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,39 +24,59 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stRevertTest/RevertPrecompiledTouch_noncestorageFiller.json",  # noqa: E501
+        "state_tests/stRevertTest/RevertPrecompiledTouch_noncestorageFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "00000000000000000000000087aaeb9e422487283b0b008ef445e32acb9dd1ae",
-        "00000000000000000000000031f52a66cf9d94c60f089a2ca9c4e784261c57fa",
-        "000000000000000000000000de1200b7ecaea2d15b57d0f331ad5ade8e924255",
-        "00000000000000000000000010ef6d6218ada53728683cec4d5160c8c72159bd",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_precompiled_touch_noncestorage(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da")
-    sender = EOA(
-        key=0x0FF8D58222F34F6890DDAA468C023B77D6691ED7D3C4DCDDAE38336212FAF54B
-    )
-    callee = Address("0x0d6d2da01a9da2c336e2affe3e6a9d0787069b56")
-    callee_1 = Address("0x0e145edea519e730a2c24124733e22e8b8de1202")
-    callee_3 = Address("0x1e28db5341d617cce6178f0bbccb352c51c5909d")
-    callee_6 = Address("0x9bce9e56a0a95f42d0b6a7b550e26604d7c5299f")
-    callee_7 = Address("0xae321ab38d9488985a884ed293f2c1466d2c806b")
-    callee_8 = Address("0xb0a7b7b80bc0f95f8890e6e2070ddc906bbfdbcd")
-    callee_10 = Address("0xe2041123687b446e6f4ba274bfed4ce0206d4c8e")
-    callee_11 = Address("0xf6165bb84beb5028557005861faa9b085c1381d9")
+    """Test_revert_precompiled_touch_noncestorage."""
+    coinbase = Address(0x68795C4AA09D6F4ED3E5DEDDF8C2AD3049A601DA)
+    addr_5 = Address(0x0000000000000000000000000000000000000001)
+    addr_6 = Address(0x0000000000000000000000000000000000000002)
+    addr_7 = Address(0x0000000000000000000000000000000000000003)
+    addr_8 = Address(0x0000000000000000000000000000000000000004)
+    addr_9 = Address(0x0000000000000000000000000000000000000005)
+    addr_10 = Address(0x0000000000000000000000000000000000000006)
+    addr_11 = Address(0x0000000000000000000000000000000000000007)
+    addr_12 = Address(0x0000000000000000000000000000000000000008)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -67,429 +87,432 @@ def test_revert_precompiled_touch_noncestorage(
         gas_limit=4012015,
     )
 
-    pre[callee] = Account(balance=0, nonce=1, storage={0x0: 0x1})
-    pre[callee_1] = Account(balance=0, nonce=1, storage={0x0: 0x1})
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(key=0x3, value=Op.GAS)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x10ef6d6218ada53728683cec4d5160c8c72159bd"),  # noqa: E501
-    )
-    pre[callee_3] = Account(balance=0, nonce=1, storage={0x0: 0x1})
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(key=0x3, value=Op.GAS)
-            + Op.STOP
-        ),
+    pre[addr_5] = Account(balance=0, nonce=1, storage={0: addr_5})
+    pre[addr_6] = Account(balance=0, nonce=1, storage={0: addr_5})
+    pre[addr_7] = Account(balance=0, nonce=1, storage={0: addr_5})
+    pre[addr_8] = Account(balance=0, nonce=1, storage={0: addr_5})
+    pre[addr_9] = Account(balance=0, nonce=1, storage={0: addr_5})
+    pre[addr_10] = Account(balance=0, nonce=1, storage={0: addr_5})
+    pre[addr_11] = Account(balance=0, nonce=1, storage={0: addr_5})
+    pre[addr_12] = Account(balance=0, nonce=1, storage={0: addr_5})
+    # Source: lll
+    # {  (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 0 0 0) }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=Op.GAS,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x31f52a66cf9d94c60f089a2ca9c4e784261c57fa"),  # noqa: E501
+        address=Address(0xE7C596DE24CCC387DAA5C017066AEB25EA8D2F3F),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(key=0x3, value=Op.GAS)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (CALL 50000 1 0 0 0 0 0) (CALL 50000 2 0 0 0 0 0) (CALL 50000 3 0 0 0 0 0) (CALL 50000 4 0 0 0 0 0) (CALL 50000 5 0 0 0 0 0) (CALL 50000 6 0 0 0 0 0) (CALL 50000 7 0 0 0 0 0) (CALL 50000 8 0 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x4,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x5,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x7,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(key=0x3, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x87aaeb9e422487283b0b008ef445e32acb9dd1ae"),  # noqa: E501
+        address=Address(0x87AAEB9E422487283B0B008EF445E32ACB9DD1AE),  # noqa: E501
     )
-    pre[callee_6] = Account(balance=0, nonce=1, storage={0x0: 0x1})
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    pre[callee_7] = Account(balance=0, nonce=1, storage={0x0: 0x1})
-    pre[callee_8] = Account(balance=0, nonce=1, storage={0x0: 0x1})
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(key=0x3, value=Op.GAS)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (DELEGATECALL 50000 1 0 0 0 0) (DELEGATECALL 50000 2 0 0 0 0) (DELEGATECALL 50000 3 0 0 0 0) (DELEGATECALL 50000 4 0 0 0 0) (DELEGATECALL 50000 5 0 0 0 0) (DELEGATECALL 50000 6 0 0 0 0) (DELEGATECALL 50000 7 0 0 0 0) (DELEGATECALL 50000 8 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x7,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x8,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(key=0x3, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xde1200b7ecaea2d15b57d0f331ad5ade8e924255"),  # noqa: E501
+        address=Address(0x31F52A66CF9D94C60F089A2CA9C4E784261C57FA),  # noqa: E501
     )
-    pre[callee_10] = Account(balance=0, nonce=1, storage={0x0: 0x1})
-    # Source: LLL
-    # {  (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
+    # Source: lll
+    # { (CALLCODE 50000 1 0 0 0 0 0) (CALLCODE 50000 2 0 0 0 0 0) (CALLCODE 50000 3 0 0 0 0 0) (CALLCODE 50000 4 0 0 0 0 0) (CALLCODE 50000 5 0 0 0 0 0) (CALLCODE 50000 6 0 0 0 0 0) (CALLCODE 50000 7 0 0 0 0 0) (CALLCODE 50000 8 0 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
             Op.CALLCODE(
-                gas=Op.GAS,
-                address=Op.CALLDATALOAD(offset=0x0),
+                gas=0xC350,
+                address=0x1,
                 value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x4,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x5,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x7,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(key=0x3, value=Op.GAS)
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xDE1200B7ECAEA2D15B57D0F331AD5ADE8E924255),  # noqa: E501
+    )
+    # Source: lll
+    # { (STATICCALL 50000 1 0 0 0 0) (STATICCALL 50000 2 0 0 0 0) (STATICCALL 50000 3 0 0 0 0) (STATICCALL 50000 4 0 0 0 0) (STATICCALL 50000 5 0 0 0 0) (STATICCALL 50000 6 0 0 0 0) (STATICCALL 50000 7 0 0 0 0) (STATICCALL 50000 8 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x7,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x8,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(key=0x3, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe7c596de24ccc387daa5c017066aeb25ea8d2f3f"),  # noqa: E501
+        address=Address(0x10EF6D6218ADA53728683CEC4D5160C8C72159BD),  # noqa: E501
     )
-    pre[callee_11] = Account(balance=0, nonce=1, storage={0x0: 0x1})
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
     )
 
     post = {
-        callee: Account(storage={0: 1}),
-        callee_1: Account(storage={0: 1}),
-        callee_3: Account(storage={0: 1}),
-        callee_6: Account(storage={0: 1}),
-        callee_7: Account(storage={0: 1}),
-        callee_8: Account(storage={0: 1}),
-        callee_10: Account(storage={0: 1}),
-        callee_11: Account(storage={0: 1}),
+        addr_5: Account(storage={0: addr_5}, nonce=1),
+        addr_6: Account(storage={0: addr_5}, nonce=1),
+        addr_7: Account(storage={0: addr_5}, nonce=1),
+        addr_8: Account(storage={0: addr_5}, nonce=1),
+        addr_9: Account(storage={0: addr_5}, nonce=1),
+        addr_10: Account(storage={0: addr_5}, nonce=1),
+        addr_11: Account(storage={0: addr_5}, nonce=1),
+        addr_12: Account(storage={0: addr_5}, nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_precompiled_touch_paris.py b/tests/ported_static/stRevertTest/test_revert_precompiled_touch_paris.py
index c739e4fb640..5e3ebc1ede5 100644
--- a/tests/ported_static/stRevertTest/test_revert_precompiled_touch_paris.py
+++ b/tests/ported_static/stRevertTest/test_revert_precompiled_touch_paris.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_revert_precompiled_touch_paris.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertPrecompiledTouch_ParisFiller.json
+state_tests/stRevertTest/RevertPrecompiledTouch_ParisFiller.json
 """
 
 import pytest
@@ -12,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,40 +27,60 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/RevertPrecompiledTouch_ParisFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/RevertPrecompiledTouch_ParisFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "00000000000000000000000087aaeb9e422487283b0b008ef445e32acb9dd1ae",
-        "00000000000000000000000031f52a66cf9d94c60f089a2ca9c4e784261c57fa",
-        "000000000000000000000000de1200b7ecaea2d15b57d0f331ad5ade8e924255",
-        "00000000000000000000000010ef6d6218ada53728683cec4d5160c8c72159bd",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_precompiled_touch_paris(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da")
+    """Test_revert_precompiled_touch_paris."""
+    coinbase = Address(0x68795C4AA09D6F4ED3E5DEDDF8C2AD3049A601DA)
+    addr_5 = Address(0x0000000000000000000000000000000000000001)
+    addr_6 = Address(0x0000000000000000000000000000000000000002)
+    addr_7 = Address(0x0000000000000000000000000000000000000003)
+    addr_8 = Address(0x0000000000000000000000000000000000000004)
+    addr_9 = Address(0x0000000000000000000000000000000000000005)
+    addr_10 = Address(0x0000000000000000000000000000000000000006)
+    addr_11 = Address(0x0000000000000000000000000000000000000007)
+    addr_12 = Address(0x0000000000000000000000000000000000000008)
     sender = EOA(
-        key=0x0FF8D58222F34F6890DDAA468C023B77D6691ED7D3C4DCDDAE38336212FAF54B
+        key=0xFF8D58222F34F6890DDAA468C023B77D6691ED7D3C4DCDDAE38336212FAF54B
     )
-    callee_1 = Address("0x1688023d9ae9e25ea02a2447a77b9cc9d22ce57b")
-    callee_3 = Address("0x6eb9afcb5d985b12549b7ac2e65c093f7113a0c7")
-    callee_4 = Address("0x85fdde91fd0ce22a2968e1f1b2ebb9f9e5a180ba")
-    callee_6 = Address("0x9e6c35deced6e05eb21d3465b5bbbb57b9cd57d6")
-    callee_7 = Address("0xad3df2901b7c6642e397c35e0e9f3dea5d098238")
-    callee_8 = Address("0xbe44b82021b08cfecc33a2e57ff5adcb7fe3b049")
-    callee_9 = Address("0xd085ab47bc36d1238fc092679b21b10792746640")
-    callee_11 = Address("0xf07a794e0f8aab4242b86368503d3c1de15481f8")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -66,420 +91,456 @@ def test_revert_precompiled_touch_paris(
         gas_limit=4012015,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(key=0x3, value=Op.GAS)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x10ef6d6218ada53728683cec4d5160c8c72159bd"),  # noqa: E501
-    )
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(key=0x3, value=Op.GAS)
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
+    pre[addr_5] = Account(balance=1)
+    pre[addr_6] = Account(balance=1)
+    pre[addr_7] = Account(balance=1)
+    pre[addr_8] = Account(balance=1)
+    pre[addr_9] = Account(balance=1)
+    pre[addr_10] = Account(balance=1)
+    pre[addr_11] = Account(balance=1)
+    pre[addr_12] = Account(balance=1)
+    # Source: lll
+    # {  (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 0 0 0) }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=Op.GAS,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x31f52a66cf9d94c60f089a2ca9c4e784261c57fa"),  # noqa: E501
+        address=Address(0xE7C596DE24CCC387DAA5C017066AEB25EA8D2F3F),  # noqa: E501
     )
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(key=0x3, value=Op.GAS)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (CALL 50000 1 0 0 0 0 0) (CALL 50000 2 0 0 0 0 0) (CALL 50000 3 0 0 0 0 0) (CALL 50000 4 0 0 0 0 0) (CALL 50000 5 0 0 0 0 0) (CALL 50000 6 0 0 0 0 0) (CALL 50000 7 0 0 0 0 0) (CALL 50000 8 0 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x4,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x5,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x7,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(key=0x3, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x87aaeb9e422487283b0b008ef445e32acb9dd1ae"),  # noqa: E501
+        address=Address(0x87AAEB9E422487283B0B008EF445E32ACB9DD1AE),  # noqa: E501
     )
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    pre[callee_8] = Account(balance=1, nonce=0)
-    pre[callee_9] = Account(balance=1, nonce=0)
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(key=0x3, value=Op.GAS)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (DELEGATECALL 50000 1 0 0 0 0) (DELEGATECALL 50000 2 0 0 0 0) (DELEGATECALL 50000 3 0 0 0 0) (DELEGATECALL 50000 4 0 0 0 0) (DELEGATECALL 50000 5 0 0 0 0) (DELEGATECALL 50000 6 0 0 0 0) (DELEGATECALL 50000 7 0 0 0 0) (DELEGATECALL 50000 8 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x7,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x8,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(key=0x3, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xde1200b7ecaea2d15b57d0f331ad5ade8e924255"),  # noqa: E501
+        address=Address(0x31F52A66CF9D94C60F089A2CA9C4E784261C57FA),  # noqa: E501
     )
-    # Source: LLL
-    # {  (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
+    # Source: lll
+    # { (CALLCODE 50000 1 0 0 0 0 0) (CALLCODE 50000 2 0 0 0 0 0) (CALLCODE 50000 3 0 0 0 0 0) (CALLCODE 50000 4 0 0 0 0 0) (CALLCODE 50000 5 0 0 0 0 0) (CALLCODE 50000 6 0 0 0 0 0) (CALLCODE 50000 7 0 0 0 0 0) (CALLCODE 50000 8 0 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
             Op.CALLCODE(
-                gas=Op.GAS,
-                address=Op.CALLDATALOAD(offset=0x0),
+                gas=0xC350,
+                address=0x1,
                 value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x4,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x5,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x7,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(key=0x3, value=Op.GAS)
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xDE1200B7ECAEA2D15B57D0F331AD5ADE8E924255),  # noqa: E501
+    )
+    # Source: lll
+    # { (STATICCALL 50000 1 0 0 0 0) (STATICCALL 50000 2 0 0 0 0) (STATICCALL 50000 3 0 0 0 0) (STATICCALL 50000 4 0 0 0 0) (STATICCALL 50000 5 0 0 0 0) (STATICCALL 50000 6 0 0 0 0) (STATICCALL 50000 7 0 0 0 0) (STATICCALL 50000 8 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x7,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x8,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(key=0x3, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe7c596de24ccc387daa5c017066aeb25ea8d2f3f"),  # noqa: E501
+        address=Address(0x10EF6D6218ADA53728683CEC4D5160C8C72159BD),  # noqa: E501
     )
-    pre[callee_11] = Account(balance=1, nonce=0)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_5: Account(nonce=0),
+                addr_6: Account(nonce=0),
+                addr_7: Account(nonce=0),
+                addr_8: Account(nonce=0),
+                addr_9: Account(nonce=0),
+                addr_10: Account(nonce=0),
+                addr_11: Account(nonce=0),
+                addr_12: Account(nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_5: Account(nonce=0),
+                addr_6: Account(nonce=0),
+                addr_7: Account(nonce=0),
+                addr_8: Account(nonce=0),
+                addr_9: Account(nonce=0),
+                addr_10: Account(nonce=0),
+                addr_11: Account(nonce=0),
+                addr_12: Account(nonce=0),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        error=_exc,
     )
 
-    post: dict = {}
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_precompiled_touch_storage_paris.py b/tests/ported_static/stRevertTest/test_revert_precompiled_touch_storage_paris.py
index 970698f98a8..25d6fe6394e 100644
--- a/tests/ported_static/stRevertTest/test_revert_precompiled_touch_storage_paris.py
+++ b/tests/ported_static/stRevertTest/test_revert_precompiled_touch_storage_paris.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_revert_precompiled_touch_storage_paris.
 
 Ported from:
-tests/static/state_tests/stRevertTest
-RevertPrecompiledTouch_storage_ParisFiller.json
+state_tests/stRevertTest/RevertPrecompiledTouch_storage_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,39 +27,59 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stRevertTest/RevertPrecompiledTouch_storage_ParisFiller.json",  # noqa: E501
+        "state_tests/stRevertTest/RevertPrecompiledTouch_storage_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "00000000000000000000000087aaeb9e422487283b0b008ef445e32acb9dd1ae",
-        "00000000000000000000000031f52a66cf9d94c60f089a2ca9c4e784261c57fa",
-        "000000000000000000000000de1200b7ecaea2d15b57d0f331ad5ade8e924255",
-        "00000000000000000000000010ef6d6218ada53728683cec4d5160c8c72159bd",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_precompiled_touch_storage_paris(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da")
-    sender = EOA(
-        key=0x0FF8D58222F34F6890DDAA468C023B77D6691ED7D3C4DCDDAE38336212FAF54B
-    )
-    callee = Address("0x0dc4b229346287fe9fa441960081a9886b71c42d")
-    callee_3 = Address("0x3a3eee808c401a574f92824dc64d89edb05fafe4")
-    callee_4 = Address("0x46ac2e7e1550d911e5a72fbc51c15ca817dbb1d5")
-    callee_5 = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
-    callee_6 = Address("0x6d15138ce372d9b89ee38fc3973b715477426f11")
-    callee_8 = Address("0x9deb46a3b3e955bd56ecc4072da4b42bd9b5db2c")
-    callee_9 = Address("0xa8fd4cb9c2c538ed7ff94c3b711b2e08a08c7fb8")
-    callee_10 = Address("0xda7f8add6896b7e58f28331a97b315dde5fb8cd1")
+    """Test_revert_precompiled_touch_storage_paris."""
+    coinbase = Address(0x68795C4AA09D6F4ED3E5DEDDF8C2AD3049A601DA)
+    addr_5 = Address(0x0000000000000000000000000000000000000001)
+    addr_6 = Address(0x0000000000000000000000000000000000000002)
+    addr_7 = Address(0x0000000000000000000000000000000000000003)
+    addr_8 = Address(0x0000000000000000000000000000000000000004)
+    addr_9 = Address(0x0000000000000000000000000000000000000005)
+    addr_10 = Address(0x0000000000000000000000000000000000000006)
+    addr_11 = Address(0x0000000000000000000000000000000000000007)
+    addr_12 = Address(0x0000000000000000000000000000000000000008)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -67,429 +90,455 @@ def test_revert_precompiled_touch_storage_paris(
         gas_limit=4012015,
     )
 
-    pre[callee] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(key=0x3, value=Op.GAS)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x10ef6d6218ada53728683cec4d5160c8c72159bd"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(key=0x3, value=Op.GAS)
-            + Op.STOP
-        ),
+    pre[addr_5] = Account(balance=10, storage={0: addr_5})
+    pre[addr_6] = Account(balance=10, storage={0: addr_5})
+    pre[addr_7] = Account(balance=10, storage={0: addr_5})
+    pre[addr_8] = Account(balance=10, storage={0: addr_5})
+    pre[addr_9] = Account(balance=10, storage={0: addr_5})
+    pre[addr_10] = Account(balance=10, storage={0: addr_5})
+    pre[addr_11] = Account(balance=10, storage={0: addr_5})
+    pre[addr_12] = Account(balance=10, storage={0: addr_5})
+    # Source: lll
+    # {  (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 0 0 0) }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=Op.GAS,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x31f52a66cf9d94c60f089a2ca9c4e784261c57fa"),  # noqa: E501
+        address=Address(0xE7C596DE24CCC387DAA5C017066AEB25EA8D2F3F),  # noqa: E501
     )
-    pre[callee_3] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    pre[callee_4] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    pre[callee_5] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    pre[callee_6] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(key=0x3, value=Op.GAS)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (CALL 50000 1 0 0 0 0 0) (CALL 50000 2 0 0 0 0 0) (CALL 50000 3 0 0 0 0 0) (CALL 50000 4 0 0 0 0 0) (CALL 50000 5 0 0 0 0 0) (CALL 50000 6 0 0 0 0 0) (CALL 50000 7 0 0 0 0 0) (CALL 50000 8 0 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x4,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x5,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x7,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(key=0x3, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x87aaeb9e422487283b0b008ef445e32acb9dd1ae"),  # noqa: E501
+        address=Address(0x87AAEB9E422487283B0B008EF445E32ACB9DD1AE),  # noqa: E501
     )
-    pre[callee_8] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    pre[callee_9] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    pre[callee_10] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(key=0x3, value=Op.GAS)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (DELEGATECALL 50000 1 0 0 0 0) (DELEGATECALL 50000 2 0 0 0 0) (DELEGATECALL 50000 3 0 0 0 0) (DELEGATECALL 50000 4 0 0 0 0) (DELEGATECALL 50000 5 0 0 0 0) (DELEGATECALL 50000 6 0 0 0 0) (DELEGATECALL 50000 7 0 0 0 0) (DELEGATECALL 50000 8 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x7,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x8,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(key=0x3, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xde1200b7ecaea2d15b57d0f331ad5ade8e924255"),  # noqa: E501
+        address=Address(0x31F52A66CF9D94C60F089A2CA9C4E784261C57FA),  # noqa: E501
     )
-    # Source: LLL
-    # {  (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
+    # Source: lll
+    # { (CALLCODE 50000 1 0 0 0 0 0) (CALLCODE 50000 2 0 0 0 0 0) (CALLCODE 50000 3 0 0 0 0 0) (CALLCODE 50000 4 0 0 0 0 0) (CALLCODE 50000 5 0 0 0 0 0) (CALLCODE 50000 6 0 0 0 0 0) (CALLCODE 50000 7 0 0 0 0 0) (CALLCODE 50000 8 0 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
             Op.CALLCODE(
-                gas=Op.GAS,
-                address=Op.CALLDATALOAD(offset=0x0),
+                gas=0xC350,
+                address=0x1,
                 value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x4,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x5,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x7,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(key=0x3, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe7c596de24ccc387daa5c017066aeb25ea8d2f3f"),  # noqa: E501
+        address=Address(0xDE1200B7ECAEA2D15B57D0F331AD5ADE8E924255),  # noqa: E501
+    )
+    # Source: lll
+    # { (STATICCALL 50000 1 0 0 0 0) (STATICCALL 50000 2 0 0 0 0) (STATICCALL 50000 3 0 0 0 0) (STATICCALL 50000 4 0 0 0 0) (STATICCALL 50000 5 0 0 0 0) (STATICCALL 50000 6 0 0 0 0) (STATICCALL 50000 7 0 0 0 0) (STATICCALL 50000 8 0 0 0 0) [[1]] (GAS) [[2]] (GAS) [[3]] (GAS) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x7,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x8,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(key=0x3, value=Op.GAS)
+        + Op.STOP,
+        nonce=0,
+        address=Address(0x10EF6D6218ADA53728683CEC4D5160C8C72159BD),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_5: Account(storage={0: addr_5}),
+                addr_6: Account(storage={0: addr_5}),
+                addr_7: Account(balance=10),
+                addr_8: Account(storage={0: addr_5}),
+                addr_9: Account(storage={0: addr_5}),
+                addr_10: Account(storage={0: addr_5}),
+                addr_11: Account(storage={0: addr_5}),
+                addr_12: Account(storage={0: addr_5}),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_5: Account(storage={0: addr_5}),
+                addr_6: Account(storage={0: addr_5}),
+                addr_7: Account(storage={0: addr_5}),
+                addr_8: Account(storage={0: addr_5}),
+                addr_9: Account(storage={0: addr_5}),
+                addr_10: Account(storage={0: addr_5}),
+                addr_11: Account(storage={0: addr_5}),
+                addr_12: Account(storage={0: addr_5}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        error=_exc,
     )
 
-    post = {
-        callee: Account(storage={0: 1}),
-        callee_3: Account(storage={0: 1}),
-        callee_4: Account(storage={0: 1}),
-        callee_5: Account(storage={0: 1}),
-        callee_6: Account(storage={0: 1}),
-        callee_8: Account(storage={0: 1}),
-        callee_9: Account(storage={0: 1}),
-        callee_10: Account(storage={0: 1}),
-    }
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_prefound.py b/tests/ported_static/stRevertTest/test_revert_prefound.py
index 8b2b9950e4e..c1537da38d0 100644
--- a/tests/ported_static/stRevertTest/test_revert_prefound.py
+++ b/tests/ported_static/stRevertTest/test_revert_prefound.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_revert_prefound.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertPrefoundFiller.json
+state_tests/stRevertTest/RevertPrefoundFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/RevertPrefoundFiller.json"],
+    ["state_tests/stRevertTest/RevertPrefoundFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,12 +31,13 @@ def test_revert_prefound(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_revert_prefound."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x7DB299E0885C85039F56FA504A13DD8CE8A56AA7)
+    contract_1 = Address(0xA000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
-    callee = Address("0x7db299e0885c85039f56fa504a13dd8ce8a56aa7")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,36 +48,28 @@ def test_revert_prefound(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=1, nonce=0)
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[contract_0] = Account(balance=1)
+    # Source: lll
     # { [[0]] (CREATE 0 0 32) [[1]]12}
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x0, offset=0x0, size=0x20)
-            )
-            + Op.SSTORE(key=0x1, value=0xC)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.CREATE(value=0x0, offset=0x0, size=0x20)
+        )
+        + Op.SSTORE(key=0x1, value=0xC)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_1,
+        data=Bytes(""),
         gas_limit=1040000,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0x7DB299E0885C85039F56FA504A13DD8CE8A56AA7,
-                1: 12,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={}, code=b"", balance=1, nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_prefound_call.py b/tests/ported_static/stRevertTest/test_revert_prefound_call.py
index ff0006773ec..6a0f2e314e3 100644
--- a/tests/ported_static/stRevertTest/test_revert_prefound_call.py
+++ b/tests/ported_static/stRevertTest/test_revert_prefound_call.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_revert_prefound_call.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertPrefoundCallFiller.json
+state_tests/stRevertTest/RevertPrefoundCallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/RevertPrefoundCallFiller.json"],
+    ["state_tests/stRevertTest/RevertPrefoundCallFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,12 +30,9 @@ def test_revert_prefound_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x85fdde91fd0ce22a2968e1f1b2ebb9f9e5a180ba")
+    """Test_revert_prefound_call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,40 +43,35 @@ def test_revert_prefound_call(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    addr = pre.fund_eoa(amount=1)  # noqa: F841
+    # Source: lll
     # { [[0]] (CALL 50000 <eoa:0x7db299e0885c85039f56fa504a13dd8ce8a56aa7> 0 0 32 0 32) [[1]]12 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x85FDDE91FD0CE22A2968E1F1B2EBB9F9E5A180BA,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0xC)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC350,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0xC)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x10e193907aa28773cc8f835c3b27bb02d064ce8c"),  # noqa: E501
     )
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=94000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 12}),
-    }
+    post = {addr: Account(storage={}, code=b"", balance=1, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_prefound_call_oog.py b/tests/ported_static/stRevertTest/test_revert_prefound_call_oog.py
index f1a6f17b7a4..dfceed27321 100644
--- a/tests/ported_static/stRevertTest/test_revert_prefound_call_oog.py
+++ b/tests/ported_static/stRevertTest/test_revert_prefound_call_oog.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_revert_prefound_call_oog.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertPrefoundCallOOGFiller.json
+state_tests/stRevertTest/RevertPrefoundCallOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/RevertPrefoundCallOOGFiller.json"],
+    ["state_tests/stRevertTest/RevertPrefoundCallOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,12 +30,9 @@ def test_revert_prefound_call_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x85fdde91fd0ce22a2968e1f1b2ebb9f9e5a180ba")
+    """Test_revert_prefound_call_oog."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,39 +43,36 @@ def test_revert_prefound_call_oog(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=1, nonce=0)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=1)  # noqa: F841
+    # Source: lll
     # { [[0]] (CALL 50000 <eoa:0x7db299e0885c85039f56fa504a13dd8ce8a56aa7> 0 0 32 0 32) [[1]]12 [[2]]12 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x85FDDE91FD0CE22A2968E1F1B2EBB9F9E5A180BA,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0xC)
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC350,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0xC)
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xf679bfe5f61e7640b9a66db191d5d86abc7b5c0a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=63000,
     )
 
-    post: dict = {}
+    post = {addr: Account(storage={}, code=b"", balance=1, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_prefound_empty_call_oog_paris.py b/tests/ported_static/stRevertTest/test_revert_prefound_empty_call_oog_paris.py
index 69356d1eaa7..53b3b0a41b2 100644
--- a/tests/ported_static/stRevertTest/test_revert_prefound_empty_call_oog_paris.py
+++ b/tests/ported_static/stRevertTest/test_revert_prefound_empty_call_oog_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_revert_prefound_empty_call_oog_paris.
 
 Ported from:
-tests/static/state_tests/stRevertTest
-RevertPrefoundEmptyCallOOG_ParisFiller.json
+state_tests/stRevertTest/RevertPrefoundEmptyCallOOG_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/RevertPrefoundEmptyCallOOG_ParisFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/RevertPrefoundEmptyCallOOG_ParisFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,12 +30,9 @@ def test_revert_prefound_empty_call_oog_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_revert_prefound_empty_call_oog_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,39 +43,36 @@ def test_revert_prefound_empty_call_oog_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
     # { [[0]] (CALL 50000 <eoa:0x7db299e0885c85039f56fa504a13dd8ce8a56aa7> 0 0 32 0 32) [[1]]12 [[2]]12 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0xC)
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC350,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0xC)
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xf679bfe5f61e7640b9a66db191d5d86abc7b5c0a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=63000,
     )
 
-    post: dict = {}
+    post = {addr: Account(storage={}, code=b"", balance=10, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_prefound_empty_call_paris.py b/tests/ported_static/stRevertTest/test_revert_prefound_empty_call_paris.py
index 4a815605885..83e7110f8cf 100644
--- a/tests/ported_static/stRevertTest/test_revert_prefound_empty_call_paris.py
+++ b/tests/ported_static/stRevertTest/test_revert_prefound_empty_call_paris.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_revert_prefound_empty_call_paris.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertPrefoundEmptyCall_ParisFiller.json
+state_tests/stRevertTest/RevertPrefoundEmptyCall_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/RevertPrefoundEmptyCall_ParisFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/RevertPrefoundEmptyCall_ParisFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,12 +30,9 @@ def test_revert_prefound_empty_call_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_revert_prefound_empty_call_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,40 +43,35 @@ def test_revert_prefound_empty_call_paris(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
     # { [[0]] (CALL 50000 <eoa:0x7db299e0885c85039f56fa504a13dd8ce8a56aa7> 0 0 32 0 32) [[1]]12 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xC350,
-                    address=0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0xC)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xC350,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0xC)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x10e193907aa28773cc8f835c3b27bb02d064ce8c"),  # noqa: E501
     )
-    pre[callee] = Account(balance=10, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=94000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 12}),
-    }
+    post = {addr: Account(balance=10, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_prefound_empty_oog_paris.py b/tests/ported_static/stRevertTest/test_revert_prefound_empty_oog_paris.py
index d827cf3004f..230847cde3b 100644
--- a/tests/ported_static/stRevertTest/test_revert_prefound_empty_oog_paris.py
+++ b/tests/ported_static/stRevertTest/test_revert_prefound_empty_oog_paris.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_revert_prefound_empty_oog_paris.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertPrefoundEmptyOOG_ParisFiller.json
+state_tests/stRevertTest/RevertPrefoundEmptyOOG_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/RevertPrefoundEmptyOOG_ParisFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/RevertPrefoundEmptyOOG_ParisFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,12 +30,9 @@ def test_revert_prefound_empty_oog_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_revert_prefound_empty_oog_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,29 +43,26 @@ def test_revert_prefound_empty_oog_paris(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
     # { [[0]] (CREATE 0 0 32) (KECCAK256 0x00 0x2fffff) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x0, offset=0x0, size=0x20)
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.CREATE(value=0x0, offset=0x0, size=0x20)
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x35b3f8ca79c46f2cbc3db596a2162ade570b0add"),  # noqa: E501
     )
-    pre[callee] = Account(balance=10, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=930000,
     )
 
-    post: dict = {}
+    post = {addr: Account(storage={}, code=b"", balance=10, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_prefound_empty_paris.py b/tests/ported_static/stRevertTest/test_revert_prefound_empty_paris.py
index 899a6f19c74..278e7f6f008 100644
--- a/tests/ported_static/stRevertTest/test_revert_prefound_empty_paris.py
+++ b/tests/ported_static/stRevertTest/test_revert_prefound_empty_paris.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_revert_prefound_empty_paris.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertPrefoundEmpty_ParisFiller.json
+state_tests/stRevertTest/RevertPrefoundEmpty_ParisFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/RevertPrefoundEmpty_ParisFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/RevertPrefoundEmpty_ParisFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,12 +31,13 @@ def test_revert_prefound_empty_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_revert_prefound_empty_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x7DB299E0885C85039F56FA504A13DD8CE8A56AA7)
+    contract_1 = Address(0xA000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
-    callee = Address("0x7db299e0885c85039f56fa504a13dd8ce8a56aa7")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,36 +48,28 @@ def test_revert_prefound_empty_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0)
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[contract_0] = Account(balance=10)
+    # Source: lll
     # { [[0]] (CREATE 0 0 32) [[1]]12 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x0, offset=0x0, size=0x20)
-            )
-            + Op.SSTORE(key=0x1, value=0xC)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.CREATE(value=0x0, offset=0x0, size=0x20)
+        )
+        + Op.SSTORE(key=0x1, value=0xC)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_1,
+        data=Bytes(""),
         gas_limit=940000,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0x7DB299E0885C85039F56FA504A13DD8CE8A56AA7,
-                1: 12,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={}, code=b"", balance=10, nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_prefound_oog.py b/tests/ported_static/stRevertTest/test_revert_prefound_oog.py
index 547da24ff43..7f1e1984a35 100644
--- a/tests/ported_static/stRevertTest/test_revert_prefound_oog.py
+++ b/tests/ported_static/stRevertTest/test_revert_prefound_oog.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_revert_prefound_oog.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertPrefoundOOGFiller.json
+state_tests/stRevertTest/RevertPrefoundOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/RevertPrefoundOOGFiller.json"],
+    ["state_tests/stRevertTest/RevertPrefoundOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,12 +30,9 @@ def test_revert_prefound_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x85fdde91fd0ce22a2968e1f1b2ebb9f9e5a180ba")
+    """Test_revert_prefound_oog."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,29 +43,26 @@ def test_revert_prefound_oog(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    addr = pre.fund_eoa(amount=1)  # noqa: F841
+    # Source: lll
     # { [[0]] (CREATE 0 0 32) (KECCAK256 0x00 0x2fffff) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x0, offset=0x0, size=0x20)
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.CREATE(value=0x0, offset=0x0, size=0x20)
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x35b3f8ca79c46f2cbc3db596a2162ade570b0add"),  # noqa: E501
     )
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=930000,
     )
 
-    post: dict = {}
+    post = {addr: Account(storage={}, code=b"", balance=1, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_sub_call_storage_oog.py b/tests/ported_static/stRevertTest/test_revert_sub_call_storage_oog.py
index e738186dfe2..db8c009d780 100644
--- a/tests/ported_static/stRevertTest/test_revert_sub_call_storage_oog.py
+++ b/tests/ported_static/stRevertTest/test_revert_sub_call_storage_oog.py
@@ -1,62 +1,74 @@
 """
-Test ported from static filler.
+Test_revert_sub_call_storage_oog.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertSubCallStorageOOGFiller.json
+state_tests/stRevertTest/RevertSubCallStorageOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/RevertSubCallStorageOOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/RevertSubCallStorageOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (81000, 0, {}),
-        (81000, 1, {}),
-        (
-            181000,
+        pytest.param(
             0,
-            {
-                Address("0xdfa0378009e95c6b0e668db83477627c9b1e5d01"): Account(
-                    storage={0: 12, 1: 13, 2: 14}
-                )
-            },
+            0,
+            0,
+            id="-g0-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-g0-v1",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1-v0",
+        ),
+        pytest.param(
+            0,
+            1,
+            1,
+            id="-g1-v1",
         ),
-        (181000, 1, {}),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_sub_call_storage_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_revert_sub_call_storage_oog."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -67,30 +79,53 @@ def test_revert_sub_call_storage_oog(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "60606040526000357c010000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "0000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b34"  # noqa: E501
-            "60005760506076565b005b34600057605c6081565b604051808215151515815260200191"  # noqa: E501
-            "505060405180910390f35b600c6000819055505b565b600060896076565b600d60018190"  # noqa: E501
-            "5550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9"  # noqa: E501
-            "042fb18b283daa90b999a11ddec892f548732235342eb60029"
+            "60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029"  # noqa: E501
         ),
         balance=1,
         nonce=0,
-        address=Address("0xdfa0378009e95c6b0e668db83477627c9b1e5d01"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={}, balance=1, nonce=0)},
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={0: 12, 1: 13, 2: 14}, balance=1, nonce=0
+                )
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": [0, 1], "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={}, balance=1, nonce=0)},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("c0406226"),
+    ]
+    tx_gas = [81000, 181000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("c0406226"),
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_revert_sub_call_storage_oog2.py b/tests/ported_static/stRevertTest/test_revert_sub_call_storage_oog2.py
index 9e34ecd0a95..6b5bf707e63 100644
--- a/tests/ported_static/stRevertTest/test_revert_sub_call_storage_oog2.py
+++ b/tests/ported_static/stRevertTest/test_revert_sub_call_storage_oog2.py
@@ -1,62 +1,74 @@
 """
-Test ported from static filler.
+Test_revert_sub_call_storage_oog2.
 
 Ported from:
-tests/static/state_tests/stRevertTest/RevertSubCallStorageOOG2Filler.json
+state_tests/stRevertTest/RevertSubCallStorageOOG2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/RevertSubCallStorageOOG2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/RevertSubCallStorageOOG2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (61500, 0, {}),
-        (61500, 1, {}),
-        (
-            181000,
+        pytest.param(
             0,
-            {
-                Address("0x48bc00be37fe77bd0f7b7b8009f908fc534a028b"): Account(
-                    storage={0: 13, 1: 14}
-                )
-            },
+            0,
+            0,
+            id="-g0-v0",
+        ),
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-g0-v1",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1-v0",
+        ),
+        pytest.param(
+            0,
+            1,
+            1,
+            id="-g1-v1",
         ),
-        (181000, 1, {}),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_revert_sub_call_storage_oog2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_revert_sub_call_storage_oog2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -67,30 +79,51 @@ def test_revert_sub_call_storage_oog2(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "60606040526000357c010000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "0000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b34"  # noqa: E501
-            "60005760506076565b005b34600057605c6081565b604051808215151515815260200191"  # noqa: E501
-            "505060405180910390f35b600c6000819055505b565b600060896076565b600d60008190"  # noqa: E501
-            "5550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d89955"  # noqa: E501
-            "7744a3be8d3fda191ce0f56cf261d6b860f6b40029"
+            "60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029"  # noqa: E501
         ),
         balance=1,
         nonce=0,
-        address=Address("0x48bc00be37fe77bd0f7b7b8009f908fc534a028b"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={}, balance=1, nonce=0)},
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 13, 1: 14}, balance=1, nonce=0)
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={}, balance=1, nonce=0)},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("c0406226"),
+    ]
+    tx_gas = [61500, 181000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("c0406226"),
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_state_revert.py b/tests/ported_static/stRevertTest/test_state_revert.py
index 59b4b5017d7..85f9817b996 100644
--- a/tests/ported_static/stRevertTest/test_state_revert.py
+++ b/tests/ported_static/stRevertTest/test_state_revert.py
@@ -2,19 +2,21 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stRevertTest/stateRevertFiller.yml
+state_tests/stRevertTest/stateRevertFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,83 +24,68 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stRevertTest/stateRevertFiller.yml"],
+    ["state_tests/stRevertTest/stateRevertFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            {
-                Address("0x3559afe49654b532b7e67e6acd87deb8c569e7ad"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="revert",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000004",  # noqa: E501
-            {
-                Address("0x3559afe49654b532b7e67e6acd87deb8c569e7ad"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="outOfGas",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            {
-                Address("0x3559afe49654b532b7e67e6acd87deb8c569e7ad"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="xtremeOOG",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x3559afe49654b532b7e67e6acd87deb8c569e7ad"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="badOpcode",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000006",  # noqa: E501
-            {
-                Address("0x3559afe49654b532b7e67e6acd87deb8c569e7ad"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="jumpBadly",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000005",  # noqa: E501
-            {
-                Address("0x3559afe49654b532b7e67e6acd87deb8c569e7ad"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="stackUnder",
         ),
-        (
-            "693c61390000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            {
-                Address("0x3559afe49654b532b7e67e6acd87deb8c569e7ad"): Account(
-                    storage={0: 24743}
-                )
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="stackOver",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3", "case4", "case5", "case6"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_state_revert(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA62D63F95900B04CCD3FEE13360DE78966F24695945E8B2C09E646352BC5AF94
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x100000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -109,181 +96,202 @@ def test_state_revert(
         gas_limit=100000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1001)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.SUB(Op.GAS, 0x7530),
-                    address=0xDEAD,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x2B, condition=Op.ISZERO(0x1))
-            + Op.POP(Op.SHA3(offset=0x0, size=0x1000000))
-            + Op.JUMP(pc=0x18)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {
+    #     [[2]] 0x60A7
+    # }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x60A7) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x16d83da4c22c26f92c5a8d4cedf367e171f60977"),  # noqa: E501
+        address=Address(0x4EDC28FF01C9F8731EDE6D0FD953DA91F749A659),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=bytes.fromhex(
-            "610103600155600060006000600061dead6175305a03f450ba"
-        ),
+    # Source: lll
+    # {
+    #     [[1]] 0x1000
+    #     (delegatecall (- (gas) 30000) 0xDEAD 0 0 0 0)
+    #     (revert 0 0x10)
+    # }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1000)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=Op.SUB(Op.GAS, 0x7530),
+                address=0xDEAD,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x10)
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x1985064d96baaf3305fee248de22965fbf7fbab6"),  # noqa: E501
+        address=Address(0x71A06D553F1AC38B5E568CE5A1B5DF253AD08D73),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
-    #     [[0]] 0x60A7
-    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
+    #     [[1]] 0x1001
+    #     (delegatecall (- (gas) 30000) 0xDEAD 0 0 0 0)
+    #     (while 1 (sha3 0 0x1000000))
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x60A7)
-            + Op.DELEGATECALL(
-                gas=Op.GAS,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1001)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=Op.SUB(Op.GAS, 0x7530),
+                address=0xDEAD,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x2B, condition=Op.ISZERO(0x1))
+        + Op.POP(Op.SHA3(offset=0x0, size=0x1000000))
+        + Op.JUMP(pc=0x18)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x3559afe49654b532b7e67e6acd87deb8c569e7ad"),  # noqa: E501
+        address=Address(0x16D83DA4C22C26F92C5A8D4CEDF367E171F60977),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x2, value=0x60A7) + Op.STOP,
+    # Source: lll
+    # {
+    #     [[1]] 0x1002
+    #     (delegatecall (- (gas) 30000) 0xDEAD 0 0 0 0)
+    #     (sha3 0 (- 0 1))
+    # }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1002)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=Op.SUB(Op.GAS, 0x7530),
+                address=0xDEAD,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SHA3(offset=0x0, size=Op.SUB(0x0, 0x1))
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x4edc28ff01c9f8731ede6d0fd953da91f749a659"),  # noqa: E501
+        address=Address(0xEBE3A4514FECA3EB2819BF83EBD926C5E4143739),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x100000000000)
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1000)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.SUB(Op.GAS, 0x7530),
-                    address=0xDEAD,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.REVERT(offset=0x0, size=0x10)
-            + Op.STOP
+    # Source: raw
+    # 0x610103600155600060006000600061dead6175305a03f450BA
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex(
+            "610103600155600060006000600061dead6175305a03f450ba"
         ),
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x71a06d553f1ac38b5e568ce5a1b5df253ad08d73"),  # noqa: E501
+        address=Address(0x1985064D96BAAF3305FEE248DE22965FBF7FBAB6),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x105)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.SUB(Op.GAS, 0x7530),
-                    address=0xDEAD,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: raw
+    # 0x610104600155600060006000600061dead6175305a03f450600056
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x104)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=Op.SUB(Op.GAS, 0x7530),
+                address=0xDEAD,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.ADD(Op.ADD, Op.ADD)
-        ),
+        )
+        + Op.JUMP(pc=0x0),
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xbf0fc73e06f3b2eca8cb8094bdb81d4d2aa2f9b0"),  # noqa: E501
+        address=Address(0xDD77382F06BFEEA4258E6F7BFFC6D9D31B885815),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x104)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.SUB(Op.GAS, 0x7530),
-                    address=0xDEAD,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: raw
+    # 0x610105600155600060006000600061dead6175305a03f450010101
+    addr_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x105)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=Op.SUB(Op.GAS, 0x7530),
+                address=0xDEAD,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.JUMP(pc=0x0)
-        ),
+        )
+        + Op.ADD(Op.ADD, Op.ADD),
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xdd77382f06bfeea4258e6f7bffc6d9d31b885815"),  # noqa: E501
+        address=Address(0xBF0FC73E06F3B2ECA8CB8094BDB81D4D2AA2F9B0),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x106)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.SUB(Op.GAS, 0x7530),
-                    address=0xDEAD,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: raw
+    # 0x610106600155600060006000600061dead6175305a03f4505b586004580356
+    addr_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x106)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=Op.SUB(Op.GAS, 0x7530),
+                address=0xDEAD,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.JUMPDEST
-            + Op.PC
-            + Op.JUMP(pc=Op.SUB(Op.PC, 0x4))
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.PC
+        + Op.JUMP(pc=Op.SUB(Op.PC, 0x4)),
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xe08a8de27b3798640d504f1431a360f276b9f2ae"),  # noqa: E501
+        address=Address(0xE08A8DE27B3798640D504F1431A360F276B9F2AE),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1002)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.SUB(Op.GAS, 0x7530),
-                    address=0xDEAD,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=Op.SUB(0x0, 0x1))
-            + Op.STOP
-        ),
+    # Source: lll
+    # {
+    #     [[0]] 0x60A7
+    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
+    # }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x60A7)
+        + Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xebe3a4514feca3eb2819bf83ebd926c5e4143739"),  # noqa: E501
+        address=Address(0x3559AFE49654B532B7E67E6ACD87DEB8C569E7AD),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 24743, 1: 0, 2: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_touch_to_empty_account_revert2_paris.py b/tests/ported_static/stRevertTest/test_touch_to_empty_account_revert2_paris.py
index 5f327079310..29bd0114ae8 100644
--- a/tests/ported_static/stRevertTest/test_touch_to_empty_account_revert2_paris.py
+++ b/tests/ported_static/stRevertTest/test_touch_to_empty_account_revert2_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_touch_to_empty_account_revert2_paris.
 
 Ported from:
-tests/static/state_tests/stRevertTest
-TouchToEmptyAccountRevert2_ParisFiller.json
+state_tests/stRevertTest/TouchToEmptyAccountRevert2_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/TouchToEmptyAccountRevert2_ParisFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/TouchToEmptyAccountRevert2_ParisFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,12 +30,9 @@ def test_touch_to_empty_account_revert2_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_touch_to_empty_account_revert2_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,70 +43,64 @@ def test_touch_to_empty_account_revert2_paris(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [[0]](CALL 130000 <eoa:0x1000000000000000000000000000000000000000> 0 0 0 0 0) [[1]](CALL 130000 <contract:0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x1FBD0,
-                    address=0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x1FBD0,
-                    address=0xFC4D79463BC948EB3FE54196270DE2B78C201506,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
+    # { [[2]](CALL 130000 <eoa:0x1000000000000000000000000000000000000000> 0 0 0 0 0) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x1FBD0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0982de98d43928669ec4ed9fea05f2b852bbec41"),  # noqa: E501
     )
-    pre[callee] = Account(balance=10, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x1FBD0,
-                    address=0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[0]](CALL 130000 <eoa:0x1000000000000000000000000000000000000000> 0 0 0 0 0) [[1]](CALL 130000 <contract:0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x1FBD0,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x1FBD0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xfc4d79463bc948eb3fe54196270de2b78c201506"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {addr: Account(balance=10)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_touch_to_empty_account_revert3_paris.py b/tests/ported_static/stRevertTest/test_touch_to_empty_account_revert3_paris.py
index 6cc71eeed92..842d8334f4b 100644
--- a/tests/ported_static/stRevertTest/test_touch_to_empty_account_revert3_paris.py
+++ b/tests/ported_static/stRevertTest/test_touch_to_empty_account_revert3_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_touch_to_empty_account_revert3_paris.
 
 Ported from:
-tests/static/state_tests/stRevertTest
-TouchToEmptyAccountRevert3_ParisFiller.json
+state_tests/stRevertTest/TouchToEmptyAccountRevert3_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/TouchToEmptyAccountRevert3_ParisFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/TouchToEmptyAccountRevert3_ParisFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,12 +30,9 @@ def test_touch_to_empty_account_revert3_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee_3 = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_touch_to_empty_account_revert3_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,86 +43,76 @@ def test_touch_to_empty_account_revert3_paris(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x28207E524CCB9DBC79BB3044819ACD87D630F27A,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
+    # { (SELFDESTRUCT <eoa:0x1000000000000000000000000000000000000000>) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=addr) + Op.STOP,
         nonce=0,
-        address=Address("0x2620916b2f3d6b185f4d9dd1ecee4a1f665d5c36"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x76FAE819612A29489A1A43208613D8F8557B8898)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SELFDESTRUCT <eoa:0x1000000000000000000000000000000000000000>) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=addr) + Op.STOP,
         nonce=0,
-        address=Address("0x28207e524ccb9dbc79bb3044819acd87d630f27a"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x76FAE819612A29489A1A43208613D8F8557B8898)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[2]](CALL 100000 <contract:0xe94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=addr_4,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x51cd6399de7e11930d3aa146d45a2e327b5894b9"),  # noqa: E501
     )
-    pre[callee_3] = Account(balance=10, nonce=0)
-    # Source: LLL
+    # Source: lll
     # { [[0]](CALL 130000 <contract:0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[1]](CALL 130000 <contract:0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x1FBD0,
-                    address=0x51CD6399DE7E11930D3AA146D45A2E327B5894B9,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x1FBD0,
-                    address=0x2620916B2F3D6B185F4D9DD1ECEE4A1F665D5C36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x1FBD0,
+                address=addr_3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x1FBD0,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xcd48e0c45933cfa7aa1345807cf2d6b02875f627"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=200000,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {addr: Account(balance=10)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stRevertTest/test_touch_to_empty_account_revert_paris.py b/tests/ported_static/stRevertTest/test_touch_to_empty_account_revert_paris.py
index 1027f823788..8f01e8ee6c1 100644
--- a/tests/ported_static/stRevertTest/test_touch_to_empty_account_revert_paris.py
+++ b/tests/ported_static/stRevertTest/test_touch_to_empty_account_revert_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_touch_to_empty_account_revert_paris.
 
 Ported from:
-tests/static/state_tests/stRevertTest
-TouchToEmptyAccountRevert_ParisFiller.json
+state_tests/stRevertTest/TouchToEmptyAccountRevert_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stRevertTest/TouchToEmptyAccountRevert_ParisFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stRevertTest/TouchToEmptyAccountRevert_ParisFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,12 +30,9 @@ def test_touch_to_empty_account_revert_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_touch_to_empty_account_revert_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,56 +43,52 @@ def test_touch_to_empty_account_revert_paris(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [[0]](CALL 30000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x7530,
-                    address=0xBA4D09EB64FDDCEC11D7587E1F51AC0B07C5069C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.STOP
-        ),
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
+    # { [[1]](CALL 30000 <eoa:0x1000000000000000000000000000000000000000> 0 0 0 0 0) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x7530,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x68b5e303da0ad3dfba8b2134bab64274de666f37"),  # noqa: E501
     )
-    pre[callee] = Account(balance=10, nonce=0)
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x7530,
-                    address=0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[0]](CALL 30000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x7530,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xba4d09eb64fddcec11d7587e1f51ac0b07c5069c"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=70000,
     )
 
-    post: dict = {}
+    post = {addr: Account(storage={}, code=b"", balance=10, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSLoadTest/__init__.py b/tests/ported_static/stSLoadTest/__init__.py
deleted file mode 100644
index b2a37a493bf..00000000000
--- a/tests/ported_static/stSLoadTest/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests ported from stSLoadTest."""
diff --git a/tests/ported_static/stSLoadTest/test_sload_gas_cost.py b/tests/ported_static/stSLoadTest/test_sload_gas_cost.py
deleted file mode 100644
index e669cc86a83..00000000000
--- a/tests/ported_static/stSLoadTest/test_sload_gas_cost.py
+++ /dev/null
@@ -1,79 +0,0 @@
-"""
-Test ported from static filler.
-
-Ported from:
-tests/static/state_tests/stSLoadTest/sloadGasCostFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stSLoadTest/sloadGasCostFiller.json"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
-def test_sload_gas_cost(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x897B12D02D588D8A4FE16FF831CBD4459C6F62F8C845B0CCDD31CAF068C84A26
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000000,
-    )
-
-    # Source: asm
-    # (asm GAS DUP1 SLOAD GAS SWAP1 POP SWAP1 SUB 5 SWAP1 SUB 0x01 SSTORE)
-    contract = pre.deploy_contract(
-        code=(
-            Op.GAS
-            + Op.SLOAD(key=Op.DUP1)
-            + Op.GAS
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.SUB
-            + Op.PUSH1[0x5]
-            + Op.SWAP1
-            + Op.SSTORE(key=0x1, value=Op.SUB)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x31da7b7c048ed4b134f1fa2128871ee628d05237"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        gas_limit=100000,
-    )
-
-    post = {
-        contract: Account(storage={1: 2100}),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/__init__.py b/tests/ported_static/stSStoreTest/__init__.py
index f19c32c46b3..9b8069feca9 100644
--- a/tests/ported_static/stSStoreTest/__init__.py
+++ b/tests/ported_static/stSStoreTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stSStoreTest."""
+"""Ported static tests: stSStoreTest."""  # noqa: N999
diff --git a/tests/ported_static/stSStoreTest/test_sstore_0to0.py b/tests/ported_static/stSStoreTest/test_sstore_0to0.py
index fea7ac7f2f7..9b3b0321a91 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_0to0.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_0to0.py
@@ -1,8 +1,8 @@
 """
-change 0 -> 0.
+Change 0 -> 0.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_0to0Filler.json
+state_tests/stSStoreTest/sstore_0to0Filler.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,173 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_0to0Filler.json"],
+    ["state_tests/stSStoreTest/sstore_0to0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000600b80603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe6000600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xcd47252107ce09ad27592121f5b5e3e30c4ce2db"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000600b80603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe6000600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xcd47252107ce09ad27592121f5b5e3e30c4ce2db"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000600b80603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe6000600055600160015500",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000600b80603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe6000600055600160015500",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_0to0(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change 0 -> 0."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -203,73 +183,344 @@ def test_sstore_0to0(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 0 }
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 0 }
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xCD47252107CE09AD27592121F5B5E3E30C4CE2DB): Account(
+                    storage={1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0xB]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0xB]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_0to0to0.py b/tests/ported_static/stSStoreTest/test_sstore_0to0to0.py
index b12b8143af9..a0764f16d91 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_0to0to0.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_0to0to0.py
@@ -1,8 +1,8 @@
 """
-change 0 -> 0 -> 0.
+Change 0 -> 0 -> 0.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_0to0to0Filler.json
+state_tests/stSStoreTest/sstore_0to0to0Filler.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,173 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_0to0to0Filler.json"],
+    ["state_tests/stSStoreTest/sstore_0to0to0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601080603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe60006000556000600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0x0bdfb5bb25de41df5ef3e68904843c7a7b92d35f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601080603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe60006000556000600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0x0bdfb5bb25de41df5ef3e68904843c7a7b92d35f"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601080603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe60006000556000600055600160015500",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601080603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe60006000556000600055600160015500",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_0to0to0(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change 0 -> 0 -> 0."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -203,81 +183,344 @@ def test_sstore_0to0to0(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 0 [[1]] 0 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0) * 2 + Op.STOP,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 0 [[1]] 0 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0) * 2 + Op.STOP,
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x0BDFB5BB25DE41DF5EF3E68904843C7A7B92D35F): Account(
+                    storage={1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x0) * 2
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x0) * 2
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_0to0to_x.py b/tests/ported_static/stSStoreTest/test_sstore_0to0to_x.py
index b2b587779f5..6fa2b1d32a3 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_0to0to_x.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_0to0to_x.py
@@ -1,8 +1,8 @@
 """
-change 0 -> 0 -> X.
+Change 0 -> 0 -> X.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_0to0toXFiller.json
+state_tests/stSStoreTest/sstore_0to0toXFiller.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,194 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_0to0toXFiller.json"],
+    ["state_tests/stSStoreTest/sstore_0to0toXFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601080603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe60006000556001600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0x4b7e4a91b95b23146401605d2adce6ab6ffd64e1"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601080603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe60006000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0x4b7e4a91b95b23146401605d2adce6ab6ffd64e1"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601080603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe60006000556001600055600160015500",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601080603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe60006000556001600055600160015500",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_0to0to_x(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change 0 -> 0 -> X."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -224,81 +183,350 @@ def test_sstore_0to0to_x(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 0 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 0 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={1: 1}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x4B7E4A91B95B23146401605D2ADCE6AB6FFD64E1): Account(
+                    storage={0: 1, 1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_0to_x.py b/tests/ported_static/stSStoreTest/test_sstore_0to_x.py
index 3a43253cbc5..616a7058319 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_0to_x.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_0to_x.py
@@ -1,8 +1,8 @@
 """
-change 0 -> X.
+Change 0 -> X.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_0toXFiller.json
+state_tests/stSStoreTest/sstore_0toXFiller.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,194 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_0toXFiller.json"],
+    ["state_tests/stSStoreTest/sstore_0toXFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000600b80603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe6000600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xcd47252107ce09ad27592121f5b5e3e30c4ce2db"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000600b80603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe6000600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xcd47252107ce09ad27592121f5b5e3e30c4ce2db"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000600b80603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe6000600055600160015500",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000600b80603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe6000600055600160015500",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_0to_x(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change 0 -> X."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -224,73 +183,344 @@ def test_sstore_0to_x(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 }
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 }
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={1: 1}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xCD47252107CE09AD27592121F5B5E3E30C4CE2DB): Account(
+                    storage={1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0xB]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0xB]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_0to_xto0.py b/tests/ported_static/stSStoreTest/test_sstore_0to_xto0.py
index 5b3eb5c1e1c..03b3c3bf134 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_0to_xto0.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_0to_xto0.py
@@ -1,8 +1,8 @@
 """
-change 0 -> X -> 0.
+Change 0 -> X -> 0.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_0toXto0Filler.json
+state_tests/stSStoreTest/sstore_0toXto0Filler.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,173 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_0toXto0Filler.json"],
+    ["state_tests/stSStoreTest/sstore_0toXto0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601080603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe60016000556000600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0x7564c2d690ab324d8fa20707f2bbdcff4367bb92"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601080603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe60016000556000600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0x7564c2d690ab324d8fa20707f2bbdcff4367bb92"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601080603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe60016000556000600055600160015500",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601080603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe60016000556000600055600160015500",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_0to_xto0(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change 0 -> X -> 0."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -203,81 +183,350 @@ def test_sstore_0to_xto0(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x7564C2D690AB324D8FA20707F2BBDCFF4367BB92): Account(
+                    storage={1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_0to_xto0to_x.py b/tests/ported_static/stSStoreTest/test_sstore_0to_xto0to_x.py
index 872c12e7242..14c8adefa63 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_0to_xto0to_x.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_0to_xto0to_x.py
@@ -1,8 +1,8 @@
 """
-change 0 -> X -> 0 -> X.
+Change 0 -> X -> 0 -> X.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_0toXto0toXFiller.json
+state_tests/stSStoreTest/sstore_0toXto0toXFiller.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,194 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_0toXto0toXFiller.json"],
+    ["state_tests/stSStoreTest/sstore_0toXto0toXFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601a80603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe6000600055600160005560006000556001600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xcacdb18e817dcdf3677f6f905a75474af3b8693c"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601a80603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe6000600055600160005560006000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xcacdb18e817dcdf3677f6f905a75474af3b8693c"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601a80603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe6000600055600160005560006000556001600055600160015500",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601a80603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe6000600055600160005560006000556001600055600160015500",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_0to_xto0to_x(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change 0 -> X -> 0 -> X."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -224,83 +183,356 @@ def test_sstore_0to_xto0to_x(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={1: 1}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xCACDB18E817DCDF3677F6F905A75474AF3B8693C): Account(
+                    storage={0: 1, 1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x1A]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x1A]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_0to_xto_x.py b/tests/ported_static/stSStoreTest/test_sstore_0to_xto_x.py
index db333a83c1c..5ba077ae378 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_0to_xto_x.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_0to_xto_x.py
@@ -1,8 +1,8 @@
 """
-change 0 -> X -> X.
+Change 0 -> X -> X.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_0toXtoXFiller.json
+state_tests/stSStoreTest/sstore_0toXtoXFiller.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,194 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_0toXtoXFiller.json"],
+    ["state_tests/stSStoreTest/sstore_0toXtoXFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601080603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe60016000556001600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xf797d87eb948007fd777404ef459196b099d3ebe"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601080603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe60016000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xf797d87eb948007fd777404ef459196b099d3ebe"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601080603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe60016000556001600055600160015500",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601080603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe60016000556001600055600160015500",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_0to_xto_x(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change 0 -> X -> X."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -224,81 +183,344 @@ def test_sstore_0to_xto_x(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) * 2 + Op.STOP,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) * 2 + Op.STOP,
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={1: 1}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xF797D87EB948007FD777404EF459196B099D3EBE): Account(
+                    storage={0: 1, 1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1) * 2
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1) * 2
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_0to_xto_y.py b/tests/ported_static/stSStoreTest/test_sstore_0to_xto_y.py
index 81d19b089f0..e1930122ced 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_0to_xto_y.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_0to_xto_y.py
@@ -1,8 +1,8 @@
 """
-change 0 -> X -> Y.
+Change 0 -> X -> Y.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_0toXtoYFiller.json
+state_tests/stSStoreTest/sstore_0toXtoYFiller.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,194 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_0toXtoYFiller.json"],
+    ["state_tests/stSStoreTest/sstore_0toXtoYFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601080603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe60026000556001600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xef24be216c6eaaade3b2496281d7b66fc2669f03"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601080603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe60026000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xef24be216c6eaaade3b2496281d7b66fc2669f03"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601080603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe60026000556001600055600160015500",  # noqa: E501
-            1000000,
-            {},
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601080603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe60026000556001600055600160015500",  # noqa: E501
-            400000,
-            {},
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_0to_xto_y(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change 0 -> X -> Y."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -224,81 +183,350 @@ def test_sstore_0to_xto_y(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 2 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x2)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x2)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 2 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x2)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x2)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={1: 1}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xEF24BE216C6EAAADE3B2496281D7B66FC2669F03): Account(
+                    storage={0: 1, 1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_call_to_self_sub_refund_below_zero.py b/tests/ported_static/stSStoreTest/test_sstore_call_to_self_sub_refund_below_zero.py
index 3168edc90f3..71052640eb1 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_call_to_self_sub_refund_below_zero.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_call_to_self_sub_refund_below_zero.py
@@ -1,17 +1,16 @@
 """
-Test where accnt has slot 1 value of '2', is cleared, then calls itself and...
+Test where accnt has slot 1 value of '2', is cleared, then calls itself...
 
 Ported from:
-tests/static/state_tests/stSStoreTest
-SstoreCallToSelfSubRefundBelowZeroFiller.json
+state_tests/stSStoreTest/SstoreCallToSelfSubRefundBelowZeroFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSStoreTest/SstoreCallToSelfSubRefundBelowZeroFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSStoreTest/SstoreCallToSelfSubRefundBelowZeroFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -34,10 +31,8 @@ def test_sstore_call_to_self_sub_refund_below_zero(
     pre: Alloc,
 ) -> None:
     """Test where accnt has slot 1 value of '2', is cleared, then calls..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xAF50993BA9FD52F2A61FCD1DC6D59A44E7AF39F4289201CC19EA7D30E8E27E83
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,39 +43,38 @@ def test_sstore_call_to_self_sub_refund_below_zero(
         gas_limit=68719476736,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFF)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x15, condition=Op.EQ(Op.ADDRESS, Op.CALLER))
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.CALL(
-                gas=Op.GAS,
-                address=Op.ADDRESS,
-                value=Op.DUP1,
-                args_offset=Op.DUP1,
-                args_size=Op.DUP1,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=0x3)
-            + Op.STOP
-        ),
-        storage={0x1: 0x2},
+    # Source: raw
+    # 0x3330146015576000600155600080808080305af1005b600360015500
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x15, condition=Op.EQ(Op.ADDRESS, Op.CALLER))
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=Op.ADDRESS,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=0x3)
+        + Op.STOP,
+        storage={1: 2},
         nonce=0,
-        address=Address("0xb48023055b6c3d565a6f5488459d64efab79b6c7"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=2367154,
     )
 
     post = {
-        contract: Account(storage={1: 3}),
+        sender: Account(nonce=1),
+        target: Account(storage={1: 3}, balance=0, nonce=0),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_change_from_external_call_in_init_code.py b/tests/ported_static/stSStoreTest/test_sstore_change_from_external_call_in_init_code.py
index ff47258210b..f2cd4f56ff1 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_change_from_external_call_in_init_code.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_change_from_external_call_in_init_code.py
@@ -1,9 +1,8 @@
 """
-account already has storage X. create -> in init code change that account's...
+Account already has storage X. create -> in init code change that...
 
 Ported from:
-tests/static/state_tests/stSStoreTest
-sstore_changeFromExternalCallInInitCodeFiller.json
+state_tests/stSStoreTest/sstore_changeFromExternalCallInInitCodeFiller.json
 """
 
 import pytest
@@ -15,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -24,188 +28,124 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSStoreTest/sstore_changeFromExternalCallInInitCodeFiller.json",  # noqa: E501
+        "state_tests/stSStoreTest/sstore_changeFromExternalCallInInitCodeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073bea0000000000000000000000000000000000000620186a0f100",  # noqa: E501
-            {
-                Address("0xbea0000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "6000602380601860003960006000f55060006000fd0000fe600060006000600073bea0000000000000000000000000000000000000620186a0f400",  # noqa: E501
-            {
-                Address("0xbea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "6000602380603860003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f1500000fe600060006000600073bea0000000000000000000000000000000000000620186a0f400",  # noqa: E501
-            {
-                Address("0xbea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc07f1349a887643be65b34e234e1b3161f62dc30"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "600060006000600073bea0000000000000000000000000000000000000620186a0fa00",  # noqa: E501
-            {
-                Address("0xbea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
-        (
-            "6000602380601360003960006000f5500000fe600060006000600073bea0000000000000000000000000000000000000620186a0fa00",  # noqa: E501
-            {
-                Address("0xbea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
         ),
-        (
-            "6000602380601860003960006000f55060006000fd0000fe600060006000600073bea0000000000000000000000000000000000000620186a0fa00",  # noqa: E501
-            {
-                Address("0xbea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
         ),
-        (
-            "6000602380603860003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f1500000fe600060006000600073bea0000000000000000000000000000000000000620186a0fa00",  # noqa: E501
-            {
-                Address("0xbea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
         ),
-        (
-            "6000602580601360003960006000f5500000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f100",  # noqa: E501
-            {
-                Address("0xbea0000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
         ),
-        (
-            "6000602580601860003960006000f55060006000fd0000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f100",  # noqa: E501
-            {
-                Address("0xbea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
         ),
-        (
-            "6000602580603860003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f1500000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f100",  # noqa: E501
-            {
-                Address("0xbea0000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
         ),
-        (
-            "6000600060006000600073bea0000000000000000000000000000000000000620186a0f200",  # noqa: E501
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xbea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
         ),
-        (
-            "6000602580601360003960006000f5500000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f200",  # noqa: E501
-            {
-                Address("0x0f446e1bd7a5da68b5e3a305c7030e3aa8efc293"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xbea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
         ),
-        (
-            "6000602580601860003960006000f55060006000fd0000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f200",  # noqa: E501
-            {
-                Address("0xbea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
         ),
-        (
-            "6000602580603860003960006000f5506000600060006000600073dea000000000000000000000000000000000000062030d40f1500000fe6000600060006000600073bea0000000000000000000000000000000000000620186a0f200",  # noqa: E501
-            {
-                Address("0x0f446e1bd7a5da68b5e3a305c7030e3aa8efc293"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xbea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
         ),
-        (
-            "600060006000600073bea0000000000000000000000000000000000000620186a0f400",  # noqa: E501
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xbea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
         ),
-        (
-            "6000602380601360003960006000f5500000fe600060006000600073bea0000000000000000000000000000000000000620186a0f400",  # noqa: E501
-            {
-                Address("0xbea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc07f1349a887643be65b34e234e1b3161f62dc30"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_change_from_external_call_in_init_code(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Account already has storage X. create -> in init code change that..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Account already has storage X."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xBEA0000000000000000000000000000000000000)
+    contract_1 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -220,71 +160,396 @@ def test_sstore_change_from_external_call_in_init_code(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (SSTORE 1 0) (SSTORE 1 1) (SSTORE 0 1) }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x0, value=0x1)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xbea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xBEA0000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 1, 3], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 1, 1: 1}, nonce=0)},
+        },
+        {
+            "indexes": {
+                "data": [2, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16],
+                "gas": 0,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={0: 0, 1: 1}, nonce=0),
+                Address(
+                    0x6602CFC925BE62BF18470598A98F72812A1EBEF2
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={0: 0, 1: 1}, nonce=0),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={0: 1, 1: 1}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [5, 7], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={0: 0, 1: 1}, nonce=0),
+                Address(0x0F446E1BD7A5DA68B5E3A305C7030E3AA8EFC293): Account(
+                    storage={0: 1, 1: 1}, nonce=1
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.CALL(
+            gas=0x186A0,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x25]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.CALL(
+            gas=0x186A0,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x25]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x18, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.REVERT(offset=0x0, size=0x0)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.CALL(
+            gas=0x186A0,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x25]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x30D40,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.CALL(
+            gas=0x186A0,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.CALLCODE(
+            gas=0x186A0,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x25]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.CALLCODE(
+            gas=0x186A0,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x25]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x18, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.REVERT(offset=0x0, size=0x0)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.CALLCODE(
+            gas=0x186A0,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x25]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x30D40,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.CALLCODE(
+            gas=0x186A0,
+            address=contract_0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.DELEGATECALL(
+            gas=0x186A0,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x23]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.DELEGATECALL(
+            gas=0x186A0,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x23]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x18, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.REVERT(offset=0x0, size=0x0)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.DELEGATECALL(
+            gas=0x186A0,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x23]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x30D40,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.DELEGATECALL(
+            gas=0x186A0,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.STATICCALL(
+            gas=0x186A0,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x23]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.STATICCALL(
+            gas=0x186A0,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x23]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x18, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.REVERT(offset=0x0, size=0x0)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.STATICCALL(
+            gas=0x186A0,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x23]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x30D40,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.STATICCALL(
+            gas=0x186A0,
+            address=contract_0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+    ]
+    tx_gas = [200000]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=200000,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_gas.py b/tests/ported_static/stSStoreTest/test_sstore_gas.py
index fe91efb515d..975d3765c56 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_gas.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_gas.py
@@ -2,15 +2,15 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstoreGasFiller.yml
+state_tests/stSStoreTest/sstoreGasFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstoreGasFiller.yml"],
+    ["state_tests/stSStoreTest/sstoreGasFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_sstore_gas(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x48DC5A9F099CAAAA557742CA3A990A94BE45B9969126A1BC74E5E8BE5A2B5B47
-    )
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,8 +43,8 @@ def test_sstore_gas(
         gas_limit=100000000,
     )
 
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE, nonce=1)
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    // Use storage of 0x1000 and above for gas figures
     #    let storageLoc := 0x1000
@@ -76,114 +74,105 @@ def test_sstore_gas(
     #    sstore(0, 0)
     #    gas1 := gas()
     #    sstore(storageLoc, sub(sub(gas0, gas1), measureGas))
-    #    storageLoc := add(storageLoc, 1)
-    # ... (49 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x1]
-            + Op.PUSH1[0x8]
-            + Op.DUP2
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.PUSH2[0x1000]
-            + Op.DUP10
-            + Op.GAS
-            + Op.SSTORE(key=0x0, value=0xBEEF)
-            + Op.GAS
-            + Op.SWAP1
-            + Op.SUB
-            + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
-            + Op.ADD
-            + Op.DUP9
-            + Op.GAS
-            + Op.SSTORE(key=0x0, value=0xDEADBEEF)
-            + Op.GAS
-            + Op.SWAP1
-            + Op.SUB
-            + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
-            + Op.ADD
-            + Op.DUP8
-            + Op.GAS
-            + Op.SSTORE(key=Op.DUP1, value=0x0)
-            + Op.GAS
-            + Op.SWAP1
-            + Op.SUB
-            + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
-            + Op.ADD
-            + Op.DUP7
-            + Op.GAS
-            + Op.SSTORE(key=Op.DUP1, value=0x0)
-            + Op.GAS
-            + Op.SWAP1
-            + Op.SUB
-            + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
-            + Op.ADD
-            + Op.DUP6
-            + Op.GAS
-            + Op.SSTORE(key=0x0, value=0x1234)
-            + Op.GAS
-            + Op.SWAP1
-            + Op.SUB
-            + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
-            + Op.ADD
-            + Op.DUP5
-            + Op.GAS
-            + Op.SSTORE(key=Op.DUP5, value=0x0)
-            + Op.GAS
-            + Op.SWAP1
-            + Op.SUB
-            + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
-            + Op.ADD
-            + Op.DUP4
-            + Op.GAS
-            + Op.SSTORE(key=0x2, value=0x60A7)
-            + Op.GAS
-            + Op.SWAP1
-            + Op.SUB
-            + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
-            + Op.ADD
-            + Op.DUP3
-            + Op.GAS
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.GAS
-            + Op.SWAP1
-            + Op.SUB
-            + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
-            + Op.ADD
-            + Op.SWAP1
-            + Op.GAS
-            + Op.SSTORE(key=0x3, value=0x60A7)
-            + Op.GAS
-            + Op.SWAP1
-            + Op.SUB
-            + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
-            + Op.POP
-            + Op.POP
-            + Op.SSTORE(key=Op.DUP1, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.STOP
-        ),
-        storage={0x0: 0x60A7, 0x1: 0x60A7},
+    # ... (50 more lines)
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x1]
+        + Op.PUSH1[0x8]
+        + Op.DUP2
+        + Op.DUP1 * 7
+        + Op.PUSH2[0x1000]
+        + Op.DUP10
+        + Op.GAS
+        + Op.SSTORE(key=0x0, value=0xBEEF)
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SUB
+        + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
+        + Op.ADD
+        + Op.DUP9
+        + Op.GAS
+        + Op.SSTORE(key=0x0, value=0xDEADBEEF)
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SUB
+        + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
+        + Op.ADD
+        + Op.DUP8
+        + Op.GAS
+        + Op.SSTORE(key=Op.DUP1, value=0x0)
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SUB
+        + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
+        + Op.ADD
+        + Op.DUP7
+        + Op.GAS
+        + Op.SSTORE(key=Op.DUP1, value=0x0)
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SUB
+        + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
+        + Op.ADD
+        + Op.DUP6
+        + Op.GAS
+        + Op.SSTORE(key=0x0, value=0x1234)
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SUB
+        + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
+        + Op.ADD
+        + Op.DUP5
+        + Op.GAS
+        + Op.SSTORE(key=Op.DUP5, value=0x0)
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SUB
+        + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
+        + Op.ADD
+        + Op.DUP4
+        + Op.GAS
+        + Op.SSTORE(key=0x2, value=0x60A7)
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SUB
+        + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
+        + Op.ADD
+        + Op.DUP3
+        + Op.GAS
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SUB
+        + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
+        + Op.ADD
+        + Op.SWAP1
+        + Op.GAS
+        + Op.SSTORE(key=0x3, value=0x60A7)
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SUB
+        + Op.SSTORE(key=Op.DUP2, value=Op.SUB)
+        + Op.POP * 2
+        + Op.SSTORE(key=Op.DUP1, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.STOP,
+        storage={0: 24743, 1: 24743},
         balance=0xBA1A9CE0BA1A9CE,
-        address=Address("0x84e1dc6705b8b9b7ffaca256c9266792bdd0943b"),  # noqa: E501
+        nonce=1,
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=16777216,
         nonce=1,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 4096: 5000,
                 4097: 100,
diff --git a/tests/ported_static/stSStoreTest/test_sstore_gas_left.py b/tests/ported_static/stSStoreTest/test_sstore_gas_left.py
index e698bc414b1..caa81fb185e 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_gas_left.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_gas_left.py
@@ -2,7 +2,7 @@
 Checks EIP-1706/EIP-2200 out of gas requirement for non-mutating SSTOREs.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_gasLeftFiller.json
+state_tests/stSStoreTest/sstore_gasLeftFiller.json
 """
 
 import pytest
@@ -15,6 +15,10 @@
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,133 +26,79 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_gasLeftFiller.json"],
+    ["state_tests/stSStoreTest/sstore_gasLeftFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b0409d84ab61455cb8bec14b94f635146ab55613610901f115604b5760006000600060006000734092b3905cfea2485ea53222f41eb26e67587802617530f1505b00",  # noqa: E501
-            {
-                Address("0xb0409d84ab61455cb8bec14b94f635146ab55613"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "6000600060006000600073b0409d84ab61455cb8bec14b94f635146ab55613610902f115604b5760006000600060006000734092b3905cfea2485ea53222f41eb26e67587802617530f1505b00",  # noqa: E501
-            {
-                Address("0xb0409d84ab61455cb8bec14b94f635146ab55613"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "6000600060006000600073b0409d84ab61455cb8bec14b94f635146ab55613610903f115604b5760006000600060006000734092b3905cfea2485ea53222f41eb26e67587802617530f1505b00",  # noqa: E501
-            {
-                Address("0x4092b3905cfea2485ea53222f41eb26e67587802"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb0409d84ab61455cb8bec14b94f635146ab55613"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "60016001556000600060006000600073b0409d84ab61455cb8bec14b94f635146ab55613610901f21560505760006000600060006000734092b3905cfea2485ea53222f41eb26e67587802617530f1505b00",  # noqa: E501
-            {
-                Address("0x21b8a1d7e6f995ece38f302d2981ac0793c37fbd"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb0409d84ab61455cb8bec14b94f635146ab55613"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
-        (
-            "60016001556000600060006000600073b0409d84ab61455cb8bec14b94f635146ab55613610902f21560505760006000600060006000734092b3905cfea2485ea53222f41eb26e67587802617530f1505b00",  # noqa: E501
-            {
-                Address("0x21b8a1d7e6f995ece38f302d2981ac0793c37fbd"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb0409d84ab61455cb8bec14b94f635146ab55613"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
         ),
-        (
-            "60016001556000600060006000600073b0409d84ab61455cb8bec14b94f635146ab55613610903f21560505760006000600060006000734092b3905cfea2485ea53222f41eb26e67587802617530f1505b00",  # noqa: E501
-            {
-                Address("0x21b8a1d7e6f995ece38f302d2981ac0793c37fbd"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x4092b3905cfea2485ea53222f41eb26e67587802"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb0409d84ab61455cb8bec14b94f635146ab55613"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
         ),
-        (
-            "6001600155600060006000600073b0409d84ab61455cb8bec14b94f635146ab55613610901f415604e5760006000600060006000734092b3905cfea2485ea53222f41eb26e67587802617530f1505b00",  # noqa: E501
-            {
-                Address("0x21b8a1d7e6f995ece38f302d2981ac0793c37fbd"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb0409d84ab61455cb8bec14b94f635146ab55613"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
         ),
-        (
-            "6001600155600060006000600073b0409d84ab61455cb8bec14b94f635146ab55613610902f415604e5760006000600060006000734092b3905cfea2485ea53222f41eb26e67587802617530f1505b00",  # noqa: E501
-            {
-                Address("0x21b8a1d7e6f995ece38f302d2981ac0793c37fbd"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb0409d84ab61455cb8bec14b94f635146ab55613"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
         ),
-        (
-            "6001600155600060006000600073b0409d84ab61455cb8bec14b94f635146ab55613610903f415604e5760006000600060006000734092b3905cfea2485ea53222f41eb26e67587802617530f1505b00",  # noqa: E501
-            {
-                Address("0x21b8a1d7e6f995ece38f302d2981ac0793c37fbd"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x4092b3905cfea2485ea53222f41eb26e67587802"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb0409d84ab61455cb8bec14b94f635146ab55613"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_gas_left(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Checks EIP-1706/EIP-2200 out of gas requirement for non-mutating..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
@@ -162,29 +112,296 @@ def test_sstore_gas_left(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
+    pre[sender] = Account(balance=0xE8D4A51000)
+    # Source: lll
+    # { [[1]] 1 }
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x1) + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0x4092b3905cfea2485ea53222f41eb26e67587802"),  # noqa: E501
+        address=Address(0xB0409D84AB61455CB8BEC14B94F635146AB55613),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # { [[1]] 1 }
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x1) + Op.STOP,
-        storage={0x1: 0x1},
         nonce=0,
-        address=Address("0xb0409d84ab61455cb8bec14b94f635146ab55613"),  # noqa: E501
+        address=Address(0x4092B3905CFEA2485EA53222F41EB26E67587802),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 1, 3, 4, 6, 7], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [8, 2, 5], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_2: Account(storage={1: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.JUMPI(
+            pc=0x4B,
+            condition=Op.ISZERO(
+                Op.CALL(
+                    gas=0x901,
+                    address=addr,
+                    value=0x0,
+                    args_offset=0x0,
+                    args_size=0x0,
+                    ret_offset=0x0,
+                    ret_size=0x0,
+                )
+            ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7530,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
+        Op.JUMPI(
+            pc=0x4B,
+            condition=Op.ISZERO(
+                Op.CALL(
+                    gas=0x902,
+                    address=addr,
+                    value=0x0,
+                    args_offset=0x0,
+                    args_size=0x0,
+                    ret_offset=0x0,
+                    ret_size=0x0,
+                )
+            ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7530,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
+        Op.JUMPI(
+            pc=0x4B,
+            condition=Op.ISZERO(
+                Op.CALL(
+                    gas=0x903,
+                    address=addr,
+                    value=0x0,
+                    args_offset=0x0,
+                    args_size=0x0,
+                    ret_offset=0x0,
+                    ret_size=0x0,
+                )
+            ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7530,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
+        Op.SSTORE(key=0x1, value=0x1)
+        + Op.JUMPI(
+            pc=0x50,
+            condition=Op.ISZERO(
+                Op.CALLCODE(
+                    gas=0x901,
+                    address=addr,
+                    value=0x0,
+                    args_offset=0x0,
+                    args_size=0x0,
+                    ret_offset=0x0,
+                    ret_size=0x0,
+                )
+            ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7530,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
+        Op.SSTORE(key=0x1, value=0x1)
+        + Op.JUMPI(
+            pc=0x50,
+            condition=Op.ISZERO(
+                Op.CALLCODE(
+                    gas=0x902,
+                    address=addr,
+                    value=0x0,
+                    args_offset=0x0,
+                    args_size=0x0,
+                    ret_offset=0x0,
+                    ret_size=0x0,
+                )
+            ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7530,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
+        Op.SSTORE(key=0x1, value=0x1)
+        + Op.JUMPI(
+            pc=0x50,
+            condition=Op.ISZERO(
+                Op.CALLCODE(
+                    gas=0x903,
+                    address=addr,
+                    value=0x0,
+                    args_offset=0x0,
+                    args_size=0x0,
+                    ret_offset=0x0,
+                    ret_size=0x0,
+                )
+            ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7530,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
+        Op.SSTORE(key=0x1, value=0x1)
+        + Op.JUMPI(
+            pc=0x4E,
+            condition=Op.ISZERO(
+                Op.DELEGATECALL(
+                    gas=0x901,
+                    address=addr,
+                    args_offset=0x0,
+                    args_size=0x0,
+                    ret_offset=0x0,
+                    ret_size=0x0,
+                )
+            ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7530,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
+        Op.SSTORE(key=0x1, value=0x1)
+        + Op.JUMPI(
+            pc=0x4E,
+            condition=Op.ISZERO(
+                Op.DELEGATECALL(
+                    gas=0x902,
+                    address=addr,
+                    args_offset=0x0,
+                    args_size=0x0,
+                    ret_offset=0x0,
+                    ret_size=0x0,
+                )
+            ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7530,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
+        Op.SSTORE(key=0x1, value=0x1)
+        + Op.JUMPI(
+            pc=0x4E,
+            condition=Op.ISZERO(
+                Op.DELEGATECALL(
+                    gas=0x903,
+                    address=addr,
+                    args_offset=0x0,
+                    args_size=0x0,
+                    ret_offset=0x0,
+                    ret_size=0x0,
+                )
+            ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x7530,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
+    ]
+    tx_gas = [200000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=200000,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_xto0.py b/tests/ported_static/stSStoreTest/test_sstore_xto0.py
index 7fbe6cce25c..5f6bcb9a9af 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_xto0.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_xto0.py
@@ -1,8 +1,8 @@
 """
-change X -> 0.
+Change X -> 0.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_Xto0Filler.json
+state_tests/stSStoreTest/sstore_Xto0Filler.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,301 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_Xto0Filler.json"],
+    ["state_tests/stSStoreTest/sstore_Xto0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            3000000,
-            {
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601080603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe60016000556000600055600160015500",  # noqa: E501
-            3000000,
-            {
-                Address("0x7564c2d690ab324d8fa20707f2bbdcff4367bb92"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601080603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe60016000556000600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0x7564c2d690ab324d8fa20707f2bbdcff4367bb92"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601080603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe60016000556000600055600160015500",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601080603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe60016000556000600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_xto0(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change X -> 0."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -331,75 +183,348 @@ def test_sstore_xto0(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 0 }
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
-        storage={0x1: 0x1},
+        storage={1: 1},
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 0 }
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
-        storage={0x1: 0x1},
+        storage={1: 1},
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 0}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={1: 0}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x7564C2D690AB324D8FA20707F2BBDCFF4367BB92): Account(
+                    storage={0: 0, 1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [3000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_xto0to0.py b/tests/ported_static/stSStoreTest/test_sstore_xto0to0.py
index 45ff41b5b68..e78926d2c21 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_xto0to0.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_xto0to0.py
@@ -1,8 +1,8 @@
 """
-change X -> 0 -> 0.
+Change X -> 0 -> 0.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_Xto0to0Filler.json
+state_tests/stSStoreTest/sstore_Xto0to0Filler.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,301 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_Xto0to0Filler.json"],
+    ["state_tests/stSStoreTest/sstore_Xto0to0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600160005560006000556000600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xa3febbc9c8c7e91ba2c2bc7cd8b426240c8d6d95"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600160005560006000556000600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xa3febbc9c8c7e91ba2c2bc7cd8b426240c8d6d95"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600160005560006000556000600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600160005560006000556000600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_xto0to0(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change X -> 0 -> 0."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -331,83 +183,348 @@ def test_sstore_xto0to0(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 0 [[1]] 0 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0) * 2 + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 0 [[1]] 0 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0) * 2 + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xA3FEBBC9C8C7E91BA2C2BC7CD8B426240C8D6D95): Account(
+                    storage={1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x0) * 2
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x0) * 2
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_xto0to_x.py b/tests/ported_static/stSStoreTest/test_sstore_xto0to_x.py
index 113415470be..1f26059f935 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_xto0to_x.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_xto0to_x.py
@@ -1,8 +1,8 @@
 """
-change X -> 0 -> X.
+Change X -> 0 -> X.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_Xto0toXFiller.json
+state_tests/stSStoreTest/sstore_Xto0toXFiller.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,319 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_Xto0toXFiller.json"],
+    ["state_tests/stSStoreTest/sstore_Xto0toXFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600160005560006000556001600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xeedfcf2cf4289ff428de4801d7cb0554e27809f3"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600160005560006000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xeedfcf2cf4289ff428de4801d7cb0554e27809f3"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600160005560006000556001600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600160005560006000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_xto0to_x(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change X -> 0 -> X."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -349,83 +183,354 @@ def test_sstore_xto0to_x(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 0 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 0 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={1: 1}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xEEDFCF2CF4289FF428DE4801D7CB0554E27809F3): Account(
+                    storage={0: 1, 1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_xto0to_xto0.py b/tests/ported_static/stSStoreTest/test_sstore_xto0to_xto0.py
index 5069a46d7e7..c65fa6c8539 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_xto0to_xto0.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_xto0to_xto0.py
@@ -1,8 +1,8 @@
 """
-change X -> 0 -> X -> 0.
+Change X -> 0 -> X -> 0.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_Xto0toXto0Filler.json
+state_tests/stSStoreTest/sstore_Xto0toXto0Filler.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,301 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_Xto0toXto0Filler.json"],
+    ["state_tests/stSStoreTest/sstore_Xto0toXto0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601a80603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe6001600055600060005560016000556000600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xa26b643c4ba8272d24f60806a37b20f255620586"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601a80603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe6001600055600060005560016000556000600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xa26b643c4ba8272d24f60806a37b20f255620586"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601a80603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe6001600055600060005560016000556000600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601a80603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe6001600055600060005560016000556000600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_xto0to_xto0(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change X -> 0 -> X -> 0."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -331,85 +183,358 @@ def test_sstore_xto0to_xto0(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 0 [[1]] 1 [[1]] 0 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 0 [[1]] 1 [[1]] 0 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 0}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={1: 0}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xA26B643C4BA8272D24F60806A37B20F255620586): Account(
+                    storage={0: 0, 1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x1A]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x1A]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_xto0to_y.py b/tests/ported_static/stSStoreTest/test_sstore_xto0to_y.py
index e2ee31d21e2..0152a4437bd 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_xto0to_y.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_xto0to_y.py
@@ -1,8 +1,8 @@
 """
-change X -> 0 -> Y.
+Change X -> 0 -> Y.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_Xto0toYFiller.json
+state_tests/stSStoreTest/sstore_Xto0toYFiller.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,319 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_Xto0toYFiller.json"],
+    ["state_tests/stSStoreTest/sstore_Xto0toYFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600260005560006000556001600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0x7123afcd1c327c946e05b4fb8aea10ad0f85cb52"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600260005560006000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0x7123afcd1c327c946e05b4fb8aea10ad0f85cb52"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600260005560006000556001600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600260005560006000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_xto0to_y(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change X -> 0 -> Y."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -349,83 +183,354 @@ def test_sstore_xto0to_y(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 0 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        storage={0x1: 0x2},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        storage={1: 2},
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 0 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        storage={0x1: 0x2},
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        storage={1: 2},
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 2}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={1: 1}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x7123AFCD1C327C946E05B4FB8AEA10AD0F85CB52): Account(
+                    storage={0: 1, 1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_xto_x.py b/tests/ported_static/stSStoreTest/test_sstore_xto_x.py
index 4ed15e4a589..624f8477042 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_xto_x.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_xto_x.py
@@ -1,8 +1,8 @@
 """
-change X -> X.
+Change X -> X.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_XtoXFiller.json
+state_tests/stSStoreTest/sstore_XtoXFiller.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,319 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_XtoXFiller.json"],
+    ["state_tests/stSStoreTest/sstore_XtoXFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            3000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            3000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601080603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe60016000556001600055600160015500",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xf797d87eb948007fd777404ef459196b099d3ebe"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601080603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe60016000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xf797d87eb948007fd777404ef459196b099d3ebe"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601080603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe60016000556001600055600160015500",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601080603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe60016000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_xto_x(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change X -> X."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -349,75 +183,346 @@ def test_sstore_xto_x(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 }
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x1) + Op.STOP,
-        storage={0x1: 0x1},
+        storage={1: 1},
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 }
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x1) + Op.STOP,
-        storage={0x1: 0x1},
+        storage={1: 1},
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={1: 1}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xF797D87EB948007FD777404EF459196B099D3EBE): Account(
+                    storage={0: 1, 1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1) * 2
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1) * 2
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [3000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_xto_xto0.py b/tests/ported_static/stSStoreTest/test_sstore_xto_xto0.py
index 69ca3422eb1..f8cceff2e08 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_xto_xto0.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_xto_xto0.py
@@ -1,8 +1,8 @@
 """
-change X -> X -> 0.
+Change X -> X -> 0.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_XtoXto0Filler.json
+state_tests/stSStoreTest/sstore_XtoXto0Filler.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,301 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_XtoXto0Filler.json"],
+    ["state_tests/stSStoreTest/sstore_XtoXto0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600160005560016000556000600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0x01b59db2b74b93797420b1a86a28fe35f1e7d0dd"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600160005560016000556000600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0x01b59db2b74b93797420b1a86a28fe35f1e7d0dd"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600160005560016000556000600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600160005560016000556000600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_xto_xto0(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change X -> X -> 0."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -331,83 +183,352 @@ def test_sstore_xto_xto0(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x01B59DB2B74B93797420B1A86A28FE35F1E7D0DD): Account(
+                    storage={1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1) * 2
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1) * 2
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_xto_xto_x.py b/tests/ported_static/stSStoreTest/test_sstore_xto_xto_x.py
index 36ee983a08d..d35b0f6152b 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_xto_xto_x.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_xto_xto_x.py
@@ -1,8 +1,8 @@
 """
-change X -> X -> X.
+Change X -> X -> X.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_XtoXtoXFiller.json
+state_tests/stSStoreTest/sstore_XtoXtoXFiller.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,319 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_XtoXtoXFiller.json"],
+    ["state_tests/stSStoreTest/sstore_XtoXtoXFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600160005560016000556001600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xba3394a0586b8419b4cf72c7d0f7e75a55a703f8"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600160005560016000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xba3394a0586b8419b4cf72c7d0f7e75a55a703f8"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600160005560016000556001600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600160005560016000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_xto_xto_x(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change X -> X -> X."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -349,83 +183,346 @@ def test_sstore_xto_xto_x(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) * 2 + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) * 2 + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={1: 1}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xBA3394A0586B8419B4CF72C7D0F7E75A55A703F8): Account(
+                    storage={0: 1, 1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1) * 3
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1) * 3
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_xto_xto_y.py b/tests/ported_static/stSStoreTest/test_sstore_xto_xto_y.py
index 71f9008532a..dbddb17fed5 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_xto_xto_y.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_xto_xto_y.py
@@ -1,8 +1,8 @@
 """
-change X -> X -> Y.
+Change X -> X -> Y.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_XtoXtoYFiller.json
+state_tests/stSStoreTest/sstore_XtoXtoYFiller.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,319 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_XtoXtoYFiller.json"],
+    ["state_tests/stSStoreTest/sstore_XtoXtoYFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600260005560026000556001600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0x6ab22377d181d9f2d8b5bffc62ac497abbd7cfc5"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600260005560026000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0x6ab22377d181d9f2d8b5bffc62ac497abbd7cfc5"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600260005560026000556001600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600260005560026000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_xto_xto_y(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change X -> X -> Y."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -349,83 +183,352 @@ def test_sstore_xto_xto_y(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 2 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x2)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        storage={0x1: 0x2},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x2)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        storage={1: 2},
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 2 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x2)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        storage={0x1: 0x2},
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x2)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        storage={1: 2},
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 2}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={1: 1}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x6AB22377D181D9F2D8B5BFFC62AC497ABBD7CFC5): Account(
+                    storage={0: 1, 1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x2) * 2
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x2) * 2
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_xto_y.py b/tests/ported_static/stSStoreTest/test_sstore_xto_y.py
index c8ab1afa785..58220a6d3ea 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_xto_y.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_xto_y.py
@@ -1,8 +1,8 @@
 """
-change X -> Y.
+Change X -> Y.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_XtoYFiller.json
+state_tests/stSStoreTest/sstore_XtoYFiller.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,319 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_XtoYFiller.json"],
+    ["state_tests/stSStoreTest/sstore_XtoYFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            3000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            3000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601080603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe60016000556002600055600160015500",  # noqa: E501
-            3000000,
-            {
-                Address("0x7e6ef1efbe92ad9adcfd8c92ba7932c904d03735"): Account(
-                    storage={0: 2, 1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601080603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe60016000556002600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0x7e6ef1efbe92ad9adcfd8c92ba7932c904d03735"): Account(
-                    storage={0: 2, 1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601080603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe60016000556002600055600160015500",  # noqa: E501
-            3000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601080603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe60016000556002600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_xto_y(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change X -> Y."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -349,75 +183,348 @@ def test_sstore_xto_y(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 2 }
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x2) + Op.STOP,
-        storage={0x1: 0x1},
+        storage={1: 1},
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 2 }
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x2) + Op.STOP,
-        storage={0x1: 0x1},
+        storage={1: 1},
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 2}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={1: 2}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x7E6EF1EFBE92AD9ADCFD8C92BA7932C904D03735): Account(
+                    storage={0: 2, 1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [3000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_xto_yto0.py b/tests/ported_static/stSStoreTest/test_sstore_xto_yto0.py
index 71273b4561e..84a664f84cd 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_xto_yto0.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_xto_yto0.py
@@ -1,8 +1,8 @@
 """
-change X -> Y -> 0.
+Change X -> Y -> 0.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_XtoYto0Filler.json
+state_tests/stSStoreTest/sstore_XtoYto0Filler.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,301 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_XtoYto0Filler.json"],
+    ["state_tests/stSStoreTest/sstore_XtoYto0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600160005560026000556000600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0x96606e69ee07f3ba565d1f25edea6c691a780e71"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600160005560026000556000600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0x96606e69ee07f3ba565d1f25edea6c691a780e71"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600160005560026000556000600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600160005560026000556000600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_xto_yto0(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change X -> Y -> 0."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -331,83 +183,354 @@ def test_sstore_xto_yto0(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 2 [[1]] 0 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x2)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x2)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 2 [[1]] 0 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x2)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x2)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x96606E69EE07F3BA565D1F25EDEA6C691A780E71): Account(
+                    storage={1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_xto_yto_x.py b/tests/ported_static/stSStoreTest/test_sstore_xto_yto_x.py
index e439c9a19b2..2d393c8df0f 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_xto_yto_x.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_xto_yto_x.py
@@ -1,8 +1,8 @@
 """
-change X -> Y -> X.
+Change X -> Y -> X.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_XtoYtoXFiller.json
+state_tests/stSStoreTest/sstore_XtoYtoXFiller.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,319 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_XtoYtoXFiller.json"],
+    ["state_tests/stSStoreTest/sstore_XtoYtoXFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600160005560026000556001600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0x90b7d8d4bc39664e30be0c2380e2b04aa15c6518"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600160005560026000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0x90b7d8d4bc39664e30be0c2380e2b04aa15c6518"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600160005560026000556001600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600160005560026000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_xto_yto_x(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change X -> Y -> X."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -349,83 +183,354 @@ def test_sstore_xto_yto_x(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 2 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x2)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x2)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 2 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x2)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x2)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={1: 1}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x90B7D8D4BC39664E30BE0C2380E2B04AA15C6518): Account(
+                    storage={0: 1, 1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_xto_yto_y.py b/tests/ported_static/stSStoreTest/test_sstore_xto_yto_y.py
index 3d0bd48c79c..f1a39c8dc91 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_xto_yto_y.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_xto_yto_y.py
@@ -1,8 +1,8 @@
 """
-change X -> Y -> Y.
+Change X -> Y -> Y.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_XtoYtoYFiller.json
+state_tests/stSStoreTest/sstore_XtoYtoYFiller.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,319 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_XtoYtoYFiller.json"],
+    ["state_tests/stSStoreTest/sstore_XtoYtoYFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600260005560016000556001600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xa84440891ddec0f3a6fa2423d55e437383ad272b"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600260005560016000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xa84440891ddec0f3a6fa2423d55e437383ad272b"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600260005560016000556001600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600260005560016000556001600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 2}
-                ),
-            },
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_xto_yto_y(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change X -> Y -> Y."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -349,83 +183,348 @@ def test_sstore_xto_yto_y(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        storage={0x1: 0x2},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) * 2 + Op.STOP,
+        storage={1: 2},
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 1 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        storage={0x1: 0x2},
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) * 2 + Op.STOP,
+        storage={1: 2},
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 2}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={1: 1}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xA84440891DDEC0F3A6FA2423D55E437383AD272B): Account(
+                    storage={0: 1, 1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.SSTORE(key=0x0, value=0x1) * 2
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.SSTORE(key=0x0, value=0x1) * 2
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSStoreTest/test_sstore_xto_yto_z.py b/tests/ported_static/stSStoreTest/test_sstore_xto_yto_z.py
index 5057aef8438..4e4d7d8f0dc 100644
--- a/tests/ported_static/stSStoreTest/test_sstore_xto_yto_z.py
+++ b/tests/ported_static/stSStoreTest/test_sstore_xto_yto_z.py
@@ -1,8 +1,8 @@
 """
-change X -> Y -> Z.
+Change X -> Y -> Z.
 
 Ported from:
-tests/static/state_tests/stSStoreTest/sstore_XtoYtoZFiller.json
+state_tests/stSStoreTest/sstore_XtoYtoZFiller.json
 """
 
 import pytest
@@ -14,6 +14,11 @@
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,319 +27,148 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSStoreTest/sstore_XtoYtoZFiller.json"],
+    ["state_tests/stSStoreTest/sstore_XtoYtoZFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 3}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 3}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 3}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 3}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 3}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 3}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600160005560026000556003600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xde59ca290fa8b9e3db697325d153c540ac08321d"): Account(
-                    storage={0: 3, 1: 1}
-                ),
-                Address("0xdea0000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "6000601580603860003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f1500000fe600160005560026000556003600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xde59ca290fa8b9e3db697325d153c540ac08321d"): Account(
-                    storage={0: 3, 1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f1506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
         ),
-        (
-            "6000600060006000600073b000000000000000000000000000000000000000620493e0f2506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
         ),
-        (
-            "600060006000600073b000000000000000000000000000000000000000620493e0f4506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
         ),
-        (
-            "600060006000600073c000000000000000000000000000000000000000620493e0fa506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd00",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600160005560026000556003600055600160015500",  # noqa: E501
-            1000000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
         ),
-        (
-            "6000601580603d60003960006000f5506000600060006000600073dea0000000000000000000000000000000000000620927c0f15060206000fd0000fe600160005560026000556003600055600160015500",  # noqa: E501
-            400000,
-            {
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_sstore_xto_yto_z(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Change X -> Y -> Z."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xC000000000000000000000000000000000000000)
+    contract_2 = Address(0xDEA0000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -349,83 +183,354 @@ def test_sstore_xto_yto_z(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[1]] 2 [[1]] 3 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x2)
-            + Op.SSTORE(key=0x1, value=0x3)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x2)
+        + Op.SSTORE(key=0x1, value=0x3)
+        + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 2 [[1]] 3 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x2)
-            + Op.SSTORE(key=0x1, value=0x3)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x2)
+        + Op.SSTORE(key=0x1, value=0x3)
+        + Op.STOP,
+        storage={1: 1},
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x1)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x1)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x1)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x1)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x1)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.SSTORE(key=0xA, value=0x1)
+        + Op.SSTORE(key=0xA, value=0x0)
+        + Op.SSTORE(key=0xB, value=0x1)
+        + Op.SSTORE(key=0xB, value=0x0)
+        + Op.SSTORE(key=0xC, value=0x1)
+        + Op.SSTORE(key=0xC, value=0x0)
+        + Op.SSTORE(key=0xD, value=0x1)
+        + Op.SSTORE(key=0xD, value=0x0)
+        + Op.SSTORE(key=0xE, value=0x1)
+        + Op.SSTORE(key=0xE, value=0x0)
+        + Op.SSTORE(key=0xF, value=0x1)
+        + Op.SSTORE(key=0xF, value=0x0)
+        + Op.SSTORE(key=0x10, value=0x1)
+        + Op.SSTORE(key=0x10, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdea0000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xDEA0000000000000000000000000000000000000),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 3}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={1: 1}),
+                contract_2: Account(storage={1: 1}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={1: 3}, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0xDE59CA290FA8B9E3DB697325D153C540AC08321D): Account(
+                    storage={0: 3, 1: 1}
+                ),
+                contract_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [5, 6, 7, 8, 9], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.CALL(
+            gas=0x927C0,
+            address=contract_2,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x38, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.SSTORE(key=0x0, value=0x3)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=contract_0,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0x15]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x3D, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE2)
+        + Op.POP(
+            Op.CALL(
+                gas=0x927C0,
+                address=contract_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP * 2
+        + Op.INVALID
+        + Op.SSTORE(key=0x0, value=0x1)
+        + Op.SSTORE(key=0x0, value=0x2)
+        + Op.SSTORE(key=0x0, value=0x3)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+    ]
+    tx_gas = [1000000, 400000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSelfBalance/__init__.py b/tests/ported_static/stSelfBalance/__init__.py
index 09662f5e3b5..2ef7a568553 100644
--- a/tests/ported_static/stSelfBalance/__init__.py
+++ b/tests/ported_static/stSelfBalance/__init__.py
@@ -1 +1 @@
-"""Tests ported from stSelfBalance."""
+"""Ported static tests: stSelfBalance."""  # noqa: N999
diff --git a/tests/ported_static/stSelfBalance/test_self_balance.py b/tests/ported_static/stSelfBalance/test_self_balance.py
index de8e1596a64..af929bf08c8 100644
--- a/tests/ported_static/stSelfBalance/test_self_balance.py
+++ b/tests/ported_static/stSelfBalance/test_self_balance.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_self_balance.
 
 Ported from:
-tests/static/state_tests/stSelfBalance/selfBalanceFiller.json
+state_tests/stSelfBalance/selfBalanceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSelfBalance/selfBalanceFiller.json"],
+    ["state_tests/stSelfBalance/selfBalanceFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_self_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x897B12D02D588D8A4FE16FF831CBD4459C6F62F8C845B0CCDD31CAF068C84A26
-    )
+    """Test_self_balance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3635C9ADC5DEA00000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,24 +43,21 @@ def test_self_balance(
         gas_limit=10000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 1 ]] (SELFBALANCE) }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=Op.SELFBALANCE) + Op.STOP,
         balance=500,
         nonce=0,
-        address=Address("0xc4686d898faa85a20d23378b84956c9e10295db5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={1: 500}),
-    }
+    post = {target: Account(storage={1: 500})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSelfBalance/test_self_balance_call_types.py b/tests/ported_static/stSelfBalance/test_self_balance_call_types.py
index b920ac7e243..fb8f5d29929 100644
--- a/tests/ported_static/stSelfBalance/test_self_balance_call_types.py
+++ b/tests/ported_static/stSelfBalance/test_self_balance_call_types.py
@@ -2,19 +2,23 @@
 SELFBALANCE tests inside CALL, DELEGATECALL, and CALLCODE.
 
 Ported from:
-tests/static/state_tests/stSelfBalance/selfBalanceCallTypesFiller.json
+state_tests/stSelfBalance/selfBalanceCallTypesFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,90 +26,44 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSelfBalance/selfBalanceCallTypesFiller.json"],
+    ["state_tests/stSelfBalance/selfBalanceCallTypesFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001",
-            {
-                Address("0x76bac61ee2056f42f6cc29f5400adae3e5705237"): Account(
-                    storage={33: 4352}
-                ),
-                Address("0x84bf87fbef135afea15330fdf5847eb504cff901"): Account(
-                    storage={
-                        0: 0xA590BBF1B07B00FED987724E1DB1BF206C2BC37C,
-                        1: 0x76BAC61EE2056F42F6CC29F5400ADAE3E5705237,
-                        2: 0x8537CE29429EA557E3903C255EE6554DD8D21D26,
-                        3: 0xE1CE93B3251FB38AE74D41AF9F865978C572CF63,
-                    }
-                ),
-                Address("0x8537ce29429ea557e3903c255ee6554dd8d21d26"): Account(
-                    storage={49: 5}
-                ),
-                Address("0xa590bbf1b07b00fed987724e1db1bf206c2bc37c"): Account(
-                    storage={17: 1}
-                ),
-                Address("0xe1ce93b3251fb38ae74d41af9f865978c572cf63"): Account(
-                    storage={65: 4864, 66: 4863, 67: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000002",
-            {
-                Address("0x84bf87fbef135afea15330fdf5847eb504cff901"): Account(
-                    storage={
-                        0: 0xA590BBF1B07B00FED987724E1DB1BF206C2BC37C,
-                        1: 0x76BAC61EE2056F42F6CC29F5400ADAE3E5705237,
-                        2: 0x8537CE29429EA557E3903C255EE6554DD8D21D26,
-                        3: 0xE1CE93B3251FB38AE74D41AF9F865978C572CF63,
-                        17: 1,
-                        33: 8192,
-                        49: 5,
-                        65: 8192,
-                        66: 8191,
-                        67: 1,
-                    }
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000003",
-            {
-                Address("0x84bf87fbef135afea15330fdf5847eb504cff901"): Account(
-                    storage={
-                        0: 0xA590BBF1B07B00FED987724E1DB1BF206C2BC37C,
-                        1: 0x76BAC61EE2056F42F6CC29F5400ADAE3E5705237,
-                        2: 0x8537CE29429EA557E3903C255EE6554DD8D21D26,
-                        3: 0xE1CE93B3251FB38AE74D41AF9F865978C572CF63,
-                        17: 1,
-                        33: 8192,
-                        49: 5,
-                        65: 8192,
-                        66: 8191,
-                        67: 1,
-                    }
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_self_balance_call_types(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """SELFBALANCE tests inside CALL, DELEGATECALL, and CALLCODE."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x897B12D02D588D8A4FE16FF831CBD4459C6F62F8C845B0CCDD31CAF068C84A26
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3635C9ADC5DEA00000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -116,150 +74,182 @@ def test_self_balance_call_types(
         gas_limit=10000000000,
     )
 
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x21, value=Op.SELFBALANCE) + Op.STOP,
-        balance=4352,
+    # Source: lll
+    # { [[ 0x11 ]] (EQ (SELFBALANCE) (BALANCE (ADDRESS))) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x11,
+            value=Op.EQ(Op.SELFBALANCE, Op.BALANCE(address=Op.ADDRESS)),
+        )
+        + Op.STOP,
+        balance=4096,
         nonce=0,
-        address=Address("0x76bac61ee2056f42f6cc29f5400adae3e5705237"),  # noqa: E501
+        address=Address(0xA590BBF1B07B00FED987724E1DB1BF206C2BC37C),  # noqa: E501
     )
-    # Source: LLL
-    # {(set 'i 0) (while @@ @i {(when (eq 0x01 $0x0) (call allgas @@ @i 0 0 0 0 0)) (when (eq 0x02 $0x0) (delegatecall allgas @@ @i 0 0 0 0)) (when (eq 0x03 $0x0) (callcode allgas @@ @i 0 0 0 0 0)) [i]:(+ @i 1)})}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x80, value=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x75,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.MLOAD(offset=0x80))),
-            )
-            + Op.JUMPI(
-                pc=0x2C,
-                condition=Op.ISZERO(Op.EQ(0x1, Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x15),
-                    address=Op.SLOAD(key=Op.MLOAD(offset=0x80)),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x49,
-                condition=Op.ISZERO(Op.EQ(0x2, Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.SUB(Op.GAS, 0x15),
-                    address=Op.SLOAD(key=Op.MLOAD(offset=0x80)),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x68,
-                condition=Op.ISZERO(Op.EQ(0x3, Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=Op.SUB(Op.GAS, 0x15),
-                    address=Op.SLOAD(key=Op.MLOAD(offset=0x80)),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x5)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        storage={
-            0x0: 0xA590BBF1B07B00FED987724E1DB1BF206C2BC37C,
-            0x1: 0x76BAC61EE2056F42F6CC29F5400ADAE3E5705237,
-            0x2: 0x8537CE29429EA557E3903C255EE6554DD8D21D26,
-            0x3: 0xE1CE93B3251FB38AE74D41AF9F865978C572CF63,
-        },
-        balance=8192,
+    # Source: lll
+    # { [[ 0x21 ]] (SELFBALANCE) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x21, value=Op.SELFBALANCE) + Op.STOP,
+        balance=4352,
         nonce=0,
-        address=Address("0x84bf87fbef135afea15330fdf5847eb504cff901"),  # noqa: E501
+        address=Address(0x76BAC61EE2056F42F6CC29F5400ADAE3E5705237),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.GAS
-            + Op.SELFBALANCE
-            + Op.GAS
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.SUB
-            + Op.PUSH1[0x2]
-            + Op.SWAP1
-            + Op.SSTORE(key=0x31, value=Op.SUB)
-            + Op.STOP
-        ),
+    # Source: lll
+    # (asm GAS SELFBALANCE GAS SWAP1 POP SWAP1 SUB 2 SWAP1 SUB 0x31 SSTORE)
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.GAS
+        + Op.SELFBALANCE
+        + Op.GAS
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.SUB
+        + Op.PUSH1[0x2]
+        + Op.SWAP1
+        + Op.SSTORE(key=0x31, value=Op.SUB)
+        + Op.STOP,
         balance=4608,
         nonce=0,
-        address=Address("0x8537ce29429ea557e3903c255ee6554dd8d21d26"),  # noqa: E501
+        address=Address(0x8537CE29429EA557E3903C255EE6554DD8D21D26),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x11,
-                value=Op.EQ(Op.SELFBALANCE, Op.BALANCE(address=Op.ADDRESS)),
+    # Source: lll
+    # (asm SELFBALANCE DUP1 0x41 SSTORE 0 0 0 0 1 0 0 CALL POP SELFBALANCE DUP1 0x42 SSTORE SWAP1 SUB 0x43 SSTORE)  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFBALANCE
+        + Op.SSTORE(key=0x41, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x0,
+                address=0x0,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.STOP
-        ),
-        balance=4096,
+        )
+        + Op.SELFBALANCE
+        + Op.SSTORE(key=0x42, value=Op.DUP1)
+        + Op.SWAP1
+        + Op.SSTORE(key=0x43, value=Op.SUB)
+        + Op.STOP,
+        balance=4864,
         nonce=0,
-        address=Address("0xa590bbf1b07b00fed987724e1db1bf206c2bc37c"),  # noqa: E501
+        address=Address(0xE1CE93B3251FB38AE74D41AF9F865978C572CF63),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
-    pre.deploy_contract(
-        code=(
-            Op.SELFBALANCE
-            + Op.SSTORE(key=0x41, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=0x0,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # {(set 'i 0) (while @@ @i {(when (eq 0x01 $0x0) (call allgas @@ @i 0 0 0 0 0)) (when (eq 0x02 $0x0) (delegatecall allgas @@ @i 0 0 0 0)) (when (eq 0x03 $0x0) (callcode allgas @@ @i 0 0 0 0 0)) [i]:(+ @i 1)})}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x80, value=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x75, condition=Op.ISZERO(Op.SLOAD(key=Op.MLOAD(offset=0x80)))
+        )
+        + Op.JUMPI(
+            pc=0x2C,
+            condition=Op.ISZERO(Op.EQ(0x1, Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x15),
+                address=Op.SLOAD(key=Op.MLOAD(offset=0x80)),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SELFBALANCE
-            + Op.SSTORE(key=0x42, value=Op.DUP1)
-            + Op.SWAP1
-            + Op.SSTORE(key=0x43, value=Op.SUB)
-            + Op.STOP
-        ),
-        balance=4864,
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x49,
+            condition=Op.ISZERO(Op.EQ(0x2, Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=Op.SUB(Op.GAS, 0x15),
+                address=Op.SLOAD(key=Op.MLOAD(offset=0x80)),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x68,
+            condition=Op.ISZERO(Op.EQ(0x3, Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=Op.SUB(Op.GAS, 0x15),
+                address=Op.SLOAD(key=Op.MLOAD(offset=0x80)),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x5)
+        + Op.JUMPDEST
+        + Op.STOP,
+        storage={0: addr, 1: addr_2, 2: addr_3, 3: addr_4},
+        balance=8192,
         nonce=0,
-        address=Address("0xe1ce93b3251fb38ae74d41af9f865978c572cf63"),  # noqa: E501
+        address=Address(0x84BF87FBEF135AFEA15330FDF5847EB504CFF901),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr: Account(storage={17: 1}),
+                addr_2: Account(storage={33: 4352}),
+                addr_3: Account(storage={49: 5}),
+                addr_4: Account(storage={65: 4864, 66: 4863, 67: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        0: addr,
+                        1: addr_2,
+                        2: addr_3,
+                        3: addr_4,
+                        17: 1,
+                        33: 8192,
+                        49: 5,
+                        65: 8192,
+                        66: 8191,
+                        67: 1,
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0x1),
+        Hash(0x2),
+        Hash(0x3),
+    ]
+    tx_gas = [1000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1000000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSelfBalance/test_self_balance_equals_balance.py b/tests/ported_static/stSelfBalance/test_self_balance_equals_balance.py
index 2f6a64e368a..c4e11a686d2 100644
--- a/tests/ported_static/stSelfBalance/test_self_balance_equals_balance.py
+++ b/tests/ported_static/stSelfBalance/test_self_balance_equals_balance.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_self_balance_equals_balance.
 
 Ported from:
-tests/static/state_tests/stSelfBalance/selfBalanceEqualsBalanceFiller.json
+state_tests/stSelfBalance/selfBalanceEqualsBalanceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSelfBalance/selfBalanceEqualsBalanceFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSelfBalance/selfBalanceEqualsBalanceFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_self_balance_equals_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x897B12D02D588D8A4FE16FF831CBD4459C6F62F8C845B0CCDD31CAF068C84A26
-    )
+    """Test_self_balance_equals_balance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3635C9ADC5DEA00000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,30 +43,25 @@ def test_self_balance_equals_balance(
         gas_limit=10000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 1 ]] (EQ (SELFBALANCE) (BALANCE (ADDRESS))) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.EQ(Op.SELFBALANCE, Op.BALANCE(address=Op.ADDRESS)),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.EQ(Op.SELFBALANCE, Op.BALANCE(address=Op.ADDRESS)),
+        )
+        + Op.STOP,
         balance=500,
         nonce=0,
-        address=Address("0x2f9dc2c2519cfd4ff8f7f296575c59dbe303d452"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSelfBalance/test_self_balance_gas_cost.py b/tests/ported_static/stSelfBalance/test_self_balance_gas_cost.py
index 7dcf9e53999..7d45e07fe17 100644
--- a/tests/ported_static/stSelfBalance/test_self_balance_gas_cost.py
+++ b/tests/ported_static/stSelfBalance/test_self_balance_gas_cost.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_self_balance_gas_cost.
 
 Ported from:
-tests/static/state_tests/stSelfBalance/selfBalanceGasCostFiller.json
+state_tests/stSelfBalance/selfBalanceGasCostFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSelfBalance/selfBalanceGasCostFiller.json"],
+    ["state_tests/stSelfBalance/selfBalanceGasCostFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_self_balance_gas_cost(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x897B12D02D588D8A4FE16FF831CBD4459C6F62F8C845B0CCDD31CAF068C84A26
-    )
+    """Test_self_balance_gas_cost."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3635C9ADC5DEA00000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,35 +43,30 @@ def test_self_balance_gas_cost(
         gas_limit=10000000000,
     )
 
-    # Source: asm
+    # Source: lll
     # (asm GAS SELFBALANCE GAS SWAP1 POP SWAP1 SUB 2 SWAP1 SUB 0x01 SSTORE)
-    contract = pre.deploy_contract(
-        code=(
-            Op.GAS
-            + Op.SELFBALANCE
-            + Op.GAS
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.SUB
-            + Op.PUSH1[0x2]
-            + Op.SWAP1
-            + Op.SSTORE(key=0x1, value=Op.SUB)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.GAS
+        + Op.SELFBALANCE
+        + Op.GAS
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.SUB
+        + Op.PUSH1[0x2]
+        + Op.SWAP1
+        + Op.SSTORE(key=0x1, value=Op.SUB)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x20005b9a765d12c8f6ac08c2673b00fa6be00486"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={1: 5}),
-    }
+    post = {target: Account(storage={1: 5})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSelfBalance/test_self_balance_update.py b/tests/ported_static/stSelfBalance/test_self_balance_update.py
index 15c05b217d2..549903be9d1 100644
--- a/tests/ported_static/stSelfBalance/test_self_balance_update.py
+++ b/tests/ported_static/stSelfBalance/test_self_balance_update.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_self_balance_update.
 
 Ported from:
-tests/static/state_tests/stSelfBalance/selfBalanceUpdateFiller.json
+state_tests/stSelfBalance/selfBalanceUpdateFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSelfBalance/selfBalanceUpdateFiller.json"],
+    ["state_tests/stSelfBalance/selfBalanceUpdateFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_self_balance_update(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x897B12D02D588D8A4FE16FF831CBD4459C6F62F8C845B0CCDD31CAF068C84A26
-    )
+    """Test_self_balance_update."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3635C9ADC5DEA00000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,43 +43,38 @@ def test_self_balance_update(
         gas_limit=10000000000,
     )
 
-    pre[sender] = Account(balance=0x3635C9ADC5DEA00000)
-    # Source: asm
+    # Source: lll
     # (asm SELFBALANCE DUP1 1 SSTORE 0 0 0 0 1 0 0 CALL POP SELFBALANCE DUP1 2 SSTORE SWAP1 SUB 3 SSTORE)  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SELFBALANCE
-            + Op.SSTORE(key=0x1, value=Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=0x0,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFBALANCE
+        + Op.SSTORE(key=0x1, value=Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=0x0,
+                address=0x0,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SELFBALANCE
-            + Op.SSTORE(key=0x2, value=Op.DUP1)
-            + Op.SWAP1
-            + Op.SSTORE(key=0x3, value=Op.SUB)
-            + Op.STOP
-        ),
+        )
+        + Op.SELFBALANCE
+        + Op.SSTORE(key=0x2, value=Op.DUP1)
+        + Op.SWAP1
+        + Op.SSTORE(key=0x3, value=Op.SUB)
+        + Op.STOP,
         balance=500,
         nonce=0,
-        address=Address("0xff44472f5ffdd079c61153f097871f57c1f689ca"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=200000,
     )
 
-    post = {
-        contract: Account(storage={1: 500, 2: 499, 3: 1}),
-    }
+    post = {target: Account(storage={1: 500, 2: 499, 3: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/__init__.py b/tests/ported_static/stShift/__init__.py
index 7215c937efb..053ce95e4ae 100644
--- a/tests/ported_static/stShift/__init__.py
+++ b/tests/ported_static/stShift/__init__.py
@@ -1 +1 @@
-"""Tests ported from stShift."""
+"""Ported static tests: stShift."""  # noqa: N999
diff --git a/tests/ported_static/stShift/test_sar00.py b/tests/ported_static/stShift/test_sar00.py
index 4806b999ff8..14480fdf678 100644
--- a/tests/ported_static/stShift/test_sar00.py
+++ b/tests/ported_static/stShift/test_sar00.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_sar00.
 
 Ported from:
-tests/static/state_tests/stShift/sar00Filler.json
+state_tests/stShift/sar00Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar00Filler.json"],
+    ["state_tests/stShift/sar00Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_sar00(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_sar00."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,23 +43,26 @@ def test_sar00(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x600060001d600055
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.SAR(0x0, 0x0)),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9ad94489822593b54793e82913f291c9207d1310"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={0: 0}, balance=0xDE0B6B3A76586A0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_sar01.py b/tests/ported_static/stShift/test_sar01.py
index 3844c0dfc8a..a80bacfb039 100644
--- a/tests/ported_static/stShift/test_sar01.py
+++ b/tests/ported_static/stShift/test_sar01.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_sar01.
 
 Ported from:
-tests/static/state_tests/stShift/sar01Filler.json
+state_tests/stShift/sar01Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar01Filler.json"],
+    ["state_tests/stShift/sar01Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_sar01(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_sar01."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,23 +43,26 @@ def test_sar01(
         gas_limit=1000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x600060011d600055
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.SAR(0x1, 0x0)),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2dde5f71c0d0ecc67a9ae94c2cafa14fbb93b84c"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={0: 0}, balance=0xDE0B6B3A76586A0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_sar10.py b/tests/ported_static/stShift/test_sar10.py
index acec8ea3cbc..8073e9ba4a0 100644
--- a/tests/ported_static/stShift/test_sar10.py
+++ b/tests/ported_static/stShift/test_sar10.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_sar10.
 
 Ported from:
-tests/static/state_tests/stShift/sar10Filler.json
+state_tests/stShift/sar10Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar10Filler.json"],
+    ["state_tests/stShift/sar10Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_sar10(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_sar10."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,25 +43,26 @@ def test_sar10(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x600160001d600055
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.SAR(0x0, 0x1)),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa3460b99a5bcb7697befbfff895f60bdf7984363"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}, balance=0xDE0B6B3A76586A0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_sar11.py b/tests/ported_static/stShift/test_sar11.py
index 166f147e42a..3663b7b651d 100644
--- a/tests/ported_static/stShift/test_sar11.py
+++ b/tests/ported_static/stShift/test_sar11.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_sar11.
 
 Ported from:
-tests/static/state_tests/stShift/sar11Filler.json
+state_tests/stShift/sar11Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar11Filler.json"],
+    ["state_tests/stShift/sar11Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_sar11(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_sar11."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,23 +43,26 @@ def test_sar11(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x600160011d600055
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.SAR(0x1, 0x1)),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7362d25017f41b7d56bc5878cbb1fb9b03c39e26"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={0: 0}, balance=0xDE0B6B3A76586A0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_sar_0_256_minus_1.py b/tests/ported_static/stShift/test_sar_0_256_minus_1.py
index 17b167571cd..5d4794477c7 100644
--- a/tests/ported_static/stShift/test_sar_0_256_minus_1.py
+++ b/tests/ported_static/stShift/test_sar_0_256_minus_1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_sar_0_256_minus_1.
 
 Ported from:
-tests/static/state_tests/stShift/sar_0_256-1Filler.json
+state_tests/stShift/sar_0_256-1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar_0_256-1Filler.json"],
+    ["state_tests/stShift/sar_0_256-1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_sar_0_256_minus_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_sar_0_256_minus_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,38 +47,39 @@ def test_sar_0_256_minus_1(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (SSTORE 0 (SAR 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SAR(
-                    0x0,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0x3},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SAR(
+                0x0,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd1e074895679e6afb7a9f3cb1ac3ffa300d2a5e8"),  # noqa: E501
+        address=Address(0xD1E074895679E6AFB7A9F3CB1AC3FFA300D2A5E8),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            balance=0xDE0B6B3A76586A0,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_sar_2_254_254.py b/tests/ported_static/stShift/test_sar_2_254_254.py
index 72aa8673fcf..1e56f56b8cf 100644
--- a/tests/ported_static/stShift/test_sar_2_254_254.py
+++ b/tests/ported_static/stShift/test_sar_2_254_254.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_sar_2_254_254.
 
 Ported from:
-tests/static/state_tests/stShift/sar_2^254_254Filler.json
+state_tests/stShift/sar_2^254_254Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar_2^254_254Filler.json"],
+    ["state_tests/stShift/sar_2^254_254Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_sar_2_254_254(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_sar_2_254_254."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,33 +43,32 @@ def test_sar_2_254_254(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SAR(
-                    0xFE,
-                    0x4000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f400000000000000000000000000000000000000000000000000000000000000060fe1d600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SAR(
+                0xFE,
+                0x4000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6f6a7e06c68b63202842c646a7eb4f01880d8af0"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}, balance=0xDE0B6B3A76586A0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_sar_2_255_1.py b/tests/ported_static/stShift/test_sar_2_255_1.py
index ad0d95fcaa6..c6903037aee 100644
--- a/tests/ported_static/stShift/test_sar_2_255_1.py
+++ b/tests/ported_static/stShift/test_sar_2_255_1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_sar_2_255_1.
 
 Ported from:
-tests/static/state_tests/stShift/sar_2^255_1Filler.json
+state_tests/stShift/sar_2^255_1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar_2^255_1Filler.json"],
+    ["state_tests/stShift/sar_2^255_1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_sar_2_255_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_sar_2_255_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,36 +47,38 @@ def test_sar_2_255_1(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SAR(
-                    0x1,
-                    0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f800000000000000000000000000000000000000000000000000000000000000060011d600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SAR(
+                0x1,
+                0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb6587b163f780eaaa5c216dd3ddf2e381feaa96c"),  # noqa: E501
+        address=Address(0xB6587B163F780EAAA5C216DD3DDF2E381FEAA96C),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xC000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
             },
+            balance=0xDE0B6B3A76586A0,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_sar_2_255_255.py b/tests/ported_static/stShift/test_sar_2_255_255.py
index 6d1c9742e7a..b250ba79a06 100644
--- a/tests/ported_static/stShift/test_sar_2_255_255.py
+++ b/tests/ported_static/stShift/test_sar_2_255_255.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_sar_2_255_255.
 
 Ported from:
-tests/static/state_tests/stShift/sar_2^255_255Filler.json
+state_tests/stShift/sar_2^255_255Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar_2^255_255Filler.json"],
+    ["state_tests/stShift/sar_2^255_255Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_sar_2_255_255(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_sar_2_255_255."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,36 +47,38 @@ def test_sar_2_255_255(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SAR(
-                    0xFF,
-                    0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f800000000000000000000000000000000000000000000000000000000000000060ff1d600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SAR(
+                0xFF,
+                0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xed3a766218e6436fd80f97075b08df750f226f0d"),  # noqa: E501
+        address=Address(0xED3A766218E6436FD80F97075B08DF750F226F0D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            balance=0xDE0B6B3A76586A0,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_sar_2_255_256.py b/tests/ported_static/stShift/test_sar_2_255_256.py
index b3672af6292..1939c68afef 100644
--- a/tests/ported_static/stShift/test_sar_2_255_256.py
+++ b/tests/ported_static/stShift/test_sar_2_255_256.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_sar_2_255_256.
 
 Ported from:
-tests/static/state_tests/stShift/sar_2^255_256Filler.json
+state_tests/stShift/sar_2^255_256Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar_2^255_256Filler.json"],
+    ["state_tests/stShift/sar_2^255_256Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_sar_2_255_256(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_sar_2_255_256."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,36 +47,38 @@ def test_sar_2_255_256(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SAR(
-                    0x100,
-                    0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f80000000000000000000000000000000000000000000000000000000000000006101001d600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SAR(
+                0x100,
+                0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xaf9b43858d7f35038aea2acf1fffea3df1ab4bcc"),  # noqa: E501
+        address=Address(0xAF9B43858D7F35038AEA2ACF1FFFEA3DF1AB4BCC),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            balance=0xDE0B6B3A76586A0,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_sar_2_255_257.py b/tests/ported_static/stShift/test_sar_2_255_257.py
index c4a70b70563..be83634889e 100644
--- a/tests/ported_static/stShift/test_sar_2_255_257.py
+++ b/tests/ported_static/stShift/test_sar_2_255_257.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_sar_2_255_257.
 
 Ported from:
-tests/static/state_tests/stShift/sar_2^255_257Filler.json
+state_tests/stShift/sar_2^255_257Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar_2^255_257Filler.json"],
+    ["state_tests/stShift/sar_2^255_257Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_sar_2_255_257(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_sar_2_255_257."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,36 +47,38 @@ def test_sar_2_255_257(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SAR(
-                    0x101,
-                    0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f80000000000000000000000000000000000000000000000000000000000000006101011d600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SAR(
+                0x101,
+                0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf1b108eb4de4c7a4c0b2258442c550d23df640a0"),  # noqa: E501
+        address=Address(0xF1B108EB4DE4C7A4C0B2258442C550D23DF640A0),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            balance=0xDE0B6B3A76586A0,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_sar_2_255_minus_1_248.py b/tests/ported_static/stShift/test_sar_2_255_minus_1_248.py
index 3c5e22bddc6..6b17e228638 100644
--- a/tests/ported_static/stShift/test_sar_2_255_minus_1_248.py
+++ b/tests/ported_static/stShift/test_sar_2_255_minus_1_248.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_sar_2_255_minus_1_248.
 
 Ported from:
-tests/static/state_tests/stShift/sar_2^255-1_248Filler.json
+state_tests/stShift/sar_2^255-1_248Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar_2^255-1_248Filler.json"],
+    ["state_tests/stShift/sar_2^255-1_248Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_sar_2_255_minus_1_248(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_sar_2_255_minus_1_248."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,33 +43,32 @@ def test_sar_2_255_minus_1_248(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SAR(
-                    0xF8,
-                    0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60f81d600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SAR(
+                0xF8,
+                0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xaca270ca7f9e766b84a13de48f52dafc92b80f8e"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={0: 127}),
+        target: Account(storage={0: 127}, balance=0xDE0B6B3A76586A0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_sar_2_255_minus_1_254.py b/tests/ported_static/stShift/test_sar_2_255_minus_1_254.py
index 06967040d7b..8c5b0743ac9 100644
--- a/tests/ported_static/stShift/test_sar_2_255_minus_1_254.py
+++ b/tests/ported_static/stShift/test_sar_2_255_minus_1_254.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_sar_2_255_minus_1_254.
 
 Ported from:
-tests/static/state_tests/stShift/sar_2^255-1_254Filler.json
+state_tests/stShift/sar_2^255-1_254Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar_2^255-1_254Filler.json"],
+    ["state_tests/stShift/sar_2^255-1_254Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_sar_2_255_minus_1_254(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_sar_2_255_minus_1_254."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,33 +43,32 @@ def test_sar_2_255_minus_1_254(
         gas_limit=1000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SAR(
-                    0xFE,
-                    0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60fe1d600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SAR(
+                0xFE,
+                0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x21f937f03a969139cfd6a0c20959317d0a4ae6ba"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}, balance=0xDE0B6B3A76586A0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_sar_2_255_minus_1_255.py b/tests/ported_static/stShift/test_sar_2_255_minus_1_255.py
index c2c68b1517b..d6b7bee6ae0 100644
--- a/tests/ported_static/stShift/test_sar_2_255_minus_1_255.py
+++ b/tests/ported_static/stShift/test_sar_2_255_minus_1_255.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_sar_2_255_minus_1_255.
 
 Ported from:
-tests/static/state_tests/stShift/sar_2^255-1_255Filler.json
+state_tests/stShift/sar_2^255-1_255Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar_2^255-1_255Filler.json"],
+    ["state_tests/stShift/sar_2^255-1_255Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_sar_2_255_minus_1_255(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_sar_2_255_minus_1_255."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,31 +43,32 @@ def test_sar_2_255_minus_1_255(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SAR(
-                    0xFF,
-                    0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60ff1d600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SAR(
+                0xFF,
+                0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x38ef04946eafcf6e172cc1ab51f731a7df62ae9c"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={0: 0}, balance=0xDE0B6B3A76586A0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_sar_2_255_minus_1_256.py b/tests/ported_static/stShift/test_sar_2_255_minus_1_256.py
index a127a870b0e..fcf388e727d 100644
--- a/tests/ported_static/stShift/test_sar_2_255_minus_1_256.py
+++ b/tests/ported_static/stShift/test_sar_2_255_minus_1_256.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_sar_2_255_minus_1_256.
 
 Ported from:
-tests/static/state_tests/stShift/sar_2^255-1_256Filler.json
+state_tests/stShift/sar_2^255-1_256Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar_2^255-1_256Filler.json"],
+    ["state_tests/stShift/sar_2^255-1_256Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_sar_2_255_minus_1_256(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_sar_2_255_minus_1_256."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,31 +43,32 @@ def test_sar_2_255_minus_1_256(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SAR(
-                    0x100,
-                    0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6101001d600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SAR(
+                0x100,
+                0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2fc6cb11c70cd31a1bb03c5149f434d6c9c553aa"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={0: 0}, balance=0xDE0B6B3A76586A0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_sar_2_256_minus_1_0.py b/tests/ported_static/stShift/test_sar_2_256_minus_1_0.py
index a00853a78ca..76f07ec032e 100644
--- a/tests/ported_static/stShift/test_sar_2_256_minus_1_0.py
+++ b/tests/ported_static/stShift/test_sar_2_256_minus_1_0.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_sar_2_256_minus_1_0.
 
 Ported from:
-tests/static/state_tests/stShift/sar_2^256-1_0Filler.json
+state_tests/stShift/sar_2^256-1_0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar_2^256-1_0Filler.json"],
+    ["state_tests/stShift/sar_2^256-1_0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_sar_2_256_minus_1_0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_sar_2_256_minus_1_0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,33 +43,39 @@ def test_sar_2_256_minus_1_0(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (SSTORE 0 (SAR 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SAR(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0x3},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SAR(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x0,
+            ),
+        )
+        + Op.STOP,
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x488de231f3302a744e2d40ecc611a66f21b4db06"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={0: 0},
+            code=bytes.fromhex(
+                "60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1d60005500"  # noqa: E501
+            ),
+            balance=0xDE0B6B3A76586A0,
+        ),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_sar_2_256_minus_1_1.py b/tests/ported_static/stShift/test_sar_2_256_minus_1_1.py
index 5c233e7dc87..6956a3d508b 100644
--- a/tests/ported_static/stShift/test_sar_2_256_minus_1_1.py
+++ b/tests/ported_static/stShift/test_sar_2_256_minus_1_1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_sar_2_256_minus_1_1.
 
 Ported from:
-tests/static/state_tests/stShift/sar_2^256-1_1Filler.json
+state_tests/stShift/sar_2^256-1_1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar_2^256-1_1Filler.json"],
+    ["state_tests/stShift/sar_2^256-1_1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_sar_2_256_minus_1_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_sar_2_256_minus_1_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,36 +47,38 @@ def test_sar_2_256_minus_1_1(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SAR(
-                    0x1,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60011d600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SAR(
+                0x1,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x37a6df595c7ae4907cf940ce2ed9301836379be0"),  # noqa: E501
+        address=Address(0x37A6DF595C7AE4907CF940CE2ED9301836379BE0),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            balance=0xDE0B6B3A76586A0,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_sar_2_256_minus_1_255.py b/tests/ported_static/stShift/test_sar_2_256_minus_1_255.py
index 5d904dee2a2..bf1335a9f18 100644
--- a/tests/ported_static/stShift/test_sar_2_256_minus_1_255.py
+++ b/tests/ported_static/stShift/test_sar_2_256_minus_1_255.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_sar_2_256_minus_1_255.
 
 Ported from:
-tests/static/state_tests/stShift/sar_2^256-1_255Filler.json
+state_tests/stShift/sar_2^256-1_255Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar_2^256-1_255Filler.json"],
+    ["state_tests/stShift/sar_2^256-1_255Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_sar_2_256_minus_1_255(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_sar_2_256_minus_1_255."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,36 +47,38 @@ def test_sar_2_256_minus_1_255(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SAR(
-                    0xFF,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60ff1d600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SAR(
+                0xFF,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd7953aa3795f1835ac719193b028850319f530eb"),  # noqa: E501
+        address=Address(0xD7953AA3795F1835AC719193B028850319F530EB),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            balance=0xDE0B6B3A76586A0,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_sar_2_256_minus_1_256.py b/tests/ported_static/stShift/test_sar_2_256_minus_1_256.py
index 86c2830b603..fac94aaf67a 100644
--- a/tests/ported_static/stShift/test_sar_2_256_minus_1_256.py
+++ b/tests/ported_static/stShift/test_sar_2_256_minus_1_256.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_sar_2_256_minus_1_256.
 
 Ported from:
-tests/static/state_tests/stShift/sar_2^256-1_256Filler.json
+state_tests/stShift/sar_2^256-1_256Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/sar_2^256-1_256Filler.json"],
+    ["state_tests/stShift/sar_2^256-1_256Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_sar_2_256_minus_1_256(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_sar_2_256_minus_1_256."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,36 +47,38 @@ def test_sar_2_256_minus_1_256(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SAR(
-                    0x100,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6101001d600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SAR(
+                0x100,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3e8cc6a056c48edce9e2abb7f1857f69318add34"),  # noqa: E501
+        address=Address(0x3E8CC6A056C48EDCE9E2ABB7F1857F69318ADD34),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            balance=0xDE0B6B3A76586A0,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shift_signed_combinations.py b/tests/ported_static/stShift/test_shift_signed_combinations.py
index 303d70f5971..20e54feebf5 100644
--- a/tests/ported_static/stShift/test_shift_signed_combinations.py
+++ b/tests/ported_static/stShift/test_shift_signed_combinations.py
@@ -1,8 +1,8 @@
 """
-https://github.com/ethereum/tests/issues/564.
+Https://github.com/ethereum/tests/issues/564.
 
 Ported from:
-tests/static/state_tests/stShift/shiftSignedCombinationsFiller.yml
+state_tests/stShift/shiftSignedCombinationsFiller.yml
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shiftSignedCombinationsFiller.yml"],
+    ["state_tests/stShift/shiftSignedCombinationsFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,8 +32,8 @@ def test_shift_signed_combinations(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Https://github.com/ethereum/tests/issues/564."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Https://github."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -46,7 +47,8 @@ def test_shift_signed_combinations(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # {
     #   (def 'sstore_n 0)
     #   (MSTORE sstore_n 0x0ff)
@@ -78,280 +80,248 @@ def test_shift_signed_combinations(
     #   (MSTORE (ADD data_jstart (MUL 32 5)) 0x00000000000000000000000000000000000000000000000000000000000000ff)  # noqa: E501
     #   (MSTORE (ADD data_jstart (MUL 32 6)) 0x0000000000000000000000000000000000000000000000000000000000000100)  # noqa: E501
     # ... (99 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xFF)
-            + Op.MSTORE(offset=Op.ADD(0x2774, Op.MUL(0x20, 0x0)), value=0x80)
-            + Op.MSTORE(offset=Op.ADD(0x2774, Op.MUL(0x20, 0x1)), value=0x8000)
-            + Op.MSTORE(
-                offset=Op.ADD(0x2774, Op.MUL(0x20, 0x2)), value=0x80000000
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x2774, Op.MUL(0x20, 0x3)),
-                value=0x8000000000000000,
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x2774, Op.MUL(0x20, 0x4)),
-                value=0x80000000000000000000000000000000,
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x2774, Op.MUL(0x20, 0x5)),
-                value=0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.MSTORE(offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x0)), value=0x0)
-            + Op.MSTORE(offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x1)), value=0x1)
-            + Op.MSTORE(offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x2)), value=0x2)
-            + Op.MSTORE(offset=Op.ADD(0x2774, Op.MUL(0x20, 0x3)), value=0x5)
-            + Op.MSTORE(offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x4)), value=0xFE)
-            + Op.MSTORE(offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x5)), value=0xFF)
-            + Op.MSTORE(offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x6)), value=0x100)
-            + Op.MSTORE(offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x7)), value=0x101)
-            + Op.MSTORE(
-                offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x8)),
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x9)),
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x4E84, Op.MUL(0x20, 0xA)),
-                value=0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x4E84, Op.MUL(0x20, 0xB)),
-                value=0xA000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x4E84, Op.MUL(0x20, 0xC)),
-                value=0x5555555555555555555555555555555555555555555555555555555555555555,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x4E84, Op.MUL(0x20, 0xD)),
-                value=0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x40D,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x20), 0x6)),
-            )
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3FF,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x40), 0xE)),
-            )
-            + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x1000001D)
-            + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
-            + Op.JUMPI(
-                pc=0x24C,
-                condition=Op.EQ(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20))
-                        ),
-                    ),
-                    0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MLOAD(
-                    offset=Op.ADD(0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20))),
-                ),
-            )
-            + Op.JUMP(pc=0x253)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x80)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
-            + Op.JUMPI(
-                pc=0x282,
-                condition=Op.EQ(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40))
-                        ),
-                    ),
-                    0x0,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xFF)
+        + Op.MSTORE(offset=Op.ADD(0x2774, Op.MUL(0x20, 0x0)), value=0x80)
+        + Op.MSTORE(offset=Op.ADD(0x2774, Op.MUL(0x20, 0x1)), value=0x8000)
+        + Op.MSTORE(offset=Op.ADD(0x2774, Op.MUL(0x20, 0x2)), value=0x80000000)
+        + Op.MSTORE(
+            offset=Op.ADD(0x2774, Op.MUL(0x20, 0x3)), value=0x8000000000000000
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(0x2774, Op.MUL(0x20, 0x4)),
+            value=0x80000000000000000000000000000000,
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(0x2774, Op.MUL(0x20, 0x5)),
+            value=0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.MSTORE(offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x0)), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x1)), value=0x1)
+        + Op.MSTORE(offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x2)), value=0x2)
+        + Op.MSTORE(offset=Op.ADD(0x2774, Op.MUL(0x20, 0x3)), value=0x5)
+        + Op.MSTORE(offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x4)), value=0xFE)
+        + Op.MSTORE(offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x5)), value=0xFF)
+        + Op.MSTORE(offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x6)), value=0x100)
+        + Op.MSTORE(offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x7)), value=0x101)
+        + Op.MSTORE(
+            offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x8)),
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(0x4E84, Op.MUL(0x20, 0x9)),
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(0x4E84, Op.MUL(0x20, 0xA)),
+            value=0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(0x4E84, Op.MUL(0x20, 0xB)),
+            value=0xA000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(0x4E84, Op.MUL(0x20, 0xC)),
+            value=0x5555555555555555555555555555555555555555555555555555555555555555,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(0x4E84, Op.MUL(0x20, 0xD)),
+            value=0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x40D, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x20), 0x6))
+        )
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3FF, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x40), 0xE))
+        )
+        + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x1000001D)
+        + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
+        + Op.JUMPI(
+            pc=0x24C,
+            condition=Op.EQ(
+                Op.MLOAD(
+                    offset=Op.ADD(0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20)))
                 ),
-            )
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MLOAD(
-                    offset=Op.ADD(0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40))),
+                0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MLOAD(
+                offset=Op.ADD(0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20)))
+            ),
+        )
+        + Op.JUMP(pc=0x253)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x80)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
+        + Op.JUMPI(
+            pc=0x282,
+            condition=Op.EQ(
+                Op.MLOAD(
+                    offset=Op.ADD(0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40)))
                 ),
-            )
-            + Op.JUMP(pc=0x289)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x80)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.SAR(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20))
-                        ),
-                    ),
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40))
-                        ),
-                    ),
+                0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MLOAD(
+                offset=Op.ADD(0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40)))
+            ),
+        )
+        + Op.JUMP(pc=0x289)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x80)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.SAR(
+                Op.MLOAD(
+                    offset=Op.ADD(0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20)))
                 ),
-            )
-            + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x1000001B)
-            + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
-            + Op.JUMPI(
-                pc=0x2EE,
-                condition=Op.EQ(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20))
-                        ),
-                    ),
-                    0x0,
+                Op.MLOAD(
+                    offset=Op.ADD(0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40)))
                 ),
-            )
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MLOAD(
-                    offset=Op.ADD(0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20))),
+            ),
+        )
+        + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x1000001B)
+        + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
+        + Op.JUMPI(
+            pc=0x2EE,
+            condition=Op.EQ(
+                Op.MLOAD(
+                    offset=Op.ADD(0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20)))
                 ),
-            )
-            + Op.JUMP(pc=0x2F5)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x80)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
-            + Op.JUMPI(
-                pc=0x324,
-                condition=Op.EQ(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40))
-                        ),
-                    ),
-                    0x0,
+                0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MLOAD(
+                offset=Op.ADD(0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20)))
+            ),
+        )
+        + Op.JUMP(pc=0x2F5)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x80)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
+        + Op.JUMPI(
+            pc=0x324,
+            condition=Op.EQ(
+                Op.MLOAD(
+                    offset=Op.ADD(0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40)))
                 ),
-            )
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MLOAD(
-                    offset=Op.ADD(0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40))),
+                0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MLOAD(
+                offset=Op.ADD(0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40)))
+            ),
+        )
+        + Op.JUMP(pc=0x32B)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x80)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.SHL(
+                Op.MLOAD(
+                    offset=Op.ADD(0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20)))
                 ),
-            )
-            + Op.JUMP(pc=0x32B)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x80)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.SHL(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20))
-                        ),
-                    ),
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40))
-                        ),
-                    ),
+                Op.MLOAD(
+                    offset=Op.ADD(0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40)))
                 ),
-            )
-            + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x1000001C)
-            + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
-            + Op.JUMPI(
-                pc=0x390,
-                condition=Op.EQ(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20))
-                        ),
-                    ),
-                    0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x1000001C)
+        + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
+        + Op.JUMPI(
+            pc=0x390,
+            condition=Op.EQ(
+                Op.MLOAD(
+                    offset=Op.ADD(0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20)))
                 ),
-            )
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MLOAD(
-                    offset=Op.ADD(0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20))),
+                0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MLOAD(
+                offset=Op.ADD(0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20)))
+            ),
+        )
+        + Op.JUMP(pc=0x397)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x80)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
+        + Op.JUMPI(
+            pc=0x3C6,
+            condition=Op.EQ(
+                Op.MLOAD(
+                    offset=Op.ADD(0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40)))
                 ),
-            )
-            + Op.JUMP(pc=0x397)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x80)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
-            + Op.JUMPI(
-                pc=0x3C6,
-                condition=Op.EQ(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40))
-                        ),
-                    ),
-                    0x0,
+                0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.MLOAD(
+                offset=Op.ADD(0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40)))
+            ),
+        )
+        + Op.JUMP(pc=0x3CD)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x80)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x0),
+            value=Op.SHR(
+                Op.MLOAD(
+                    offset=Op.ADD(0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20)))
                 ),
-            )
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.MLOAD(
-                    offset=Op.ADD(0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40))),
+                Op.MLOAD(
+                    offset=Op.ADD(0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40)))
                 ),
-            )
-            + Op.JUMP(pc=0x3CD)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=Op.MLOAD(offset=0x0), value=0x80)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(
-                key=Op.MLOAD(offset=0x0),
-                value=Op.SHR(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            0x2774, Op.MUL(0x20, Op.MLOAD(offset=0x20))
-                        ),
-                    ),
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            0x4E84, Op.MUL(0x20, Op.MLOAD(offset=0x40))
-                        ),
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x40, value=Op.ADD(0x1, Op.MLOAD(offset=0x40)))
-            + Op.JUMP(pc=0x200)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x20, value=Op.ADD(0x1, Op.MLOAD(offset=0x20)))
-            + Op.JUMP(pc=0x1EF)
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.MSTORE(offset=0x40, value=Op.ADD(0x1, Op.MLOAD(offset=0x40)))
+        + Op.JUMP(pc=0x200)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x20, value=Op.ADD(0x1, Op.MLOAD(offset=0x20)))
+        + Op.JUMP(pc=0x1EF)
+        + Op.JUMPDEST
+        + Op.STOP * 2,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6c08b7236ee4784e5499b9a576902679d8f863d5"),  # noqa: E501
+        address=Address(0x6C08B7236EE4784E5499B9A576902679D8F863D5),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=80000000,
         value=1,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 256: 0x1000001D,
                 257: 128,
@@ -1182,6 +1152,7 @@ def test_shift_signed_combinations(
                 1261: 0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
                 1262: 0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,  # noqa: E501
             },
+            balance=0xDE0B6B3A7640001,
         ),
     }
 
diff --git a/tests/ported_static/stShift/test_shl01.py b/tests/ported_static/stShift/test_shl01.py
index 07eefbe11ca..01f8cfd4069 100644
--- a/tests/ported_static/stShift/test_shl01.py
+++ b/tests/ported_static/stShift/test_shl01.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_shl01.
 
 Ported from:
-tests/static/state_tests/stShift/shl01Filler.json
+state_tests/stShift/shl01Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shl01Filler.json"],
+    ["state_tests/stShift/shl01Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_shl01(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_shl01."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,23 +43,30 @@ def test_shl01(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x600060011b600055
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.SHL(0x1, 0x0)),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd968e3655cbd1fa49753b38af57f8f335062470f"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={0: 0},
+            code=bytes.fromhex("600060011b600055"),
+            balance=0xDE0B6B3A76586A0,
+        ),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shl01_minus_0100.py b/tests/ported_static/stShift/test_shl01_minus_0100.py
index 6ecf7b9731f..d269b6d435c 100644
--- a/tests/ported_static/stShift/test_shl01_minus_0100.py
+++ b/tests/ported_static/stShift/test_shl01_minus_0100.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_shl01_minus_0100.
 
 Ported from:
-tests/static/state_tests/stShift/shl01-0100Filler.json
+state_tests/stShift/shl01-0100Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shl01-0100Filler.json"],
+    ["state_tests/stShift/shl01-0100Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_shl01_minus_0100(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_shl01_minus_0100."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,23 +43,30 @@ def test_shl01_minus_0100(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x60016101001b600055
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.SHL(0x100, 0x1)),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa90096f3ceee40e87ec1afc1052bbbc98616e3e9"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={0: 0},
+            code=bytes.fromhex("60016101001b600055"),
+            balance=0xDE0B6B3A76586A0,
+        ),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shl01_minus_0101.py b/tests/ported_static/stShift/test_shl01_minus_0101.py
index e60f2c374f4..039c045a6f3 100644
--- a/tests/ported_static/stShift/test_shl01_minus_0101.py
+++ b/tests/ported_static/stShift/test_shl01_minus_0101.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_shl01_minus_0101.
 
 Ported from:
-tests/static/state_tests/stShift/shl01-0101Filler.json
+state_tests/stShift/shl01-0101Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shl01-0101Filler.json"],
+    ["state_tests/stShift/shl01-0101Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_shl01_minus_0101(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_shl01_minus_0101."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,23 +43,30 @@ def test_shl01_minus_0101(
         gas_limit=1000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x60016101011b600055
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.SHL(0x101, 0x1)),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0ad09d9167b6fd7013f4a95e9a67daa83fbdf6fe"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={0: 0},
+            code=bytes.fromhex("60016101011b600055"),
+            balance=0xDE0B6B3A76586A0,
+        ),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shl01_minus_ff.py b/tests/ported_static/stShift/test_shl01_minus_ff.py
index ba2665339c2..278d2f2ac8d 100644
--- a/tests/ported_static/stShift/test_shl01_minus_ff.py
+++ b/tests/ported_static/stShift/test_shl01_minus_ff.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_shl01_minus_ff.
 
 Ported from:
-tests/static/state_tests/stShift/shl01-ffFiller.json
+state_tests/stShift/shl01-ffFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shl01-ffFiller.json"],
+    ["state_tests/stShift/shl01-ffFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_shl01_minus_ff(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_shl01_minus_ff."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,28 +47,33 @@ def test_shl01_minus_ff(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x600160ff1b600055
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.SHL(0xFF, 0x1)),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6750ccb18bd2d092093f25bf1eaebe77f4ecb9a2"),  # noqa: E501
+        address=Address(0x6750CCB18BD2D092093F25BF1EAEBE77F4ECB9A2),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
             },
+            code=bytes.fromhex("600160ff1b600055"),
+            balance=0xDE0B6B3A76586A0,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shl10.py b/tests/ported_static/stShift/test_shl10.py
index cfcb1b0cdbd..dc3ff71839e 100644
--- a/tests/ported_static/stShift/test_shl10.py
+++ b/tests/ported_static/stShift/test_shl10.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_shl10.
 
 Ported from:
-tests/static/state_tests/stShift/shl10Filler.json
+state_tests/stShift/shl10Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shl10Filler.json"],
+    ["state_tests/stShift/shl10Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_shl10(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_shl10."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,25 +43,30 @@ def test_shl10(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x600160001b600055
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.SHL(0x0, 0x1)),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x8162885eed8441d008aaec61134e7b159360a9cb"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(
+            storage={0: 1},
+            code=bytes.fromhex("600160001b600055"),
+            balance=0xDE0B6B3A76586A0,
+        ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shl11.py b/tests/ported_static/stShift/test_shl11.py
index 84409f39129..330c5034512 100644
--- a/tests/ported_static/stShift/test_shl11.py
+++ b/tests/ported_static/stShift/test_shl11.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_shl11.
 
 Ported from:
-tests/static/state_tests/stShift/shl11Filler.json
+state_tests/stShift/shl11Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shl11Filler.json"],
+    ["state_tests/stShift/shl11Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_shl11(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_shl11."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,25 +43,30 @@ def test_shl11(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x600160011b600055
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.SHL(0x1, 0x1)),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x470af4e9738d2348bf28d09f712bb06a118f6146"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={0: 2}),
+        target: Account(
+            storage={0: 2},
+            code=bytes.fromhex("600160011b600055"),
+            balance=0xDE0B6B3A76586A0,
+        ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shl_2_255_minus_1_1.py b/tests/ported_static/stShift/test_shl_2_255_minus_1_1.py
index b6dc2d1be02..dcae03b38f5 100644
--- a/tests/ported_static/stShift/test_shl_2_255_minus_1_1.py
+++ b/tests/ported_static/stShift/test_shl_2_255_minus_1_1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_shl_2_255_minus_1_1.
 
 Ported from:
-tests/static/state_tests/stShift/shl_2^255-1_1Filler.json
+state_tests/stShift/shl_2^255-1_1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shl_2^255-1_1Filler.json"],
+    ["state_tests/stShift/shl_2^255-1_1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_shl_2_255_minus_1_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_shl_2_255_minus_1_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,36 +47,38 @@ def test_shl_2_255_minus_1_1(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SHL(
-                    0x1,
-                    0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60011b600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SHL(
+                0x1,
+                0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3ce647dc9f67841b40df3ddd90fef6fa3c44ccbc"),  # noqa: E501
+        address=Address(0x3CE647DC9F67841B40DF3DDD90FEF6FA3C44CCBC),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
             },
+            balance=0xDE0B6B3A76586A0,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shl_minus_1_0.py b/tests/ported_static/stShift/test_shl_minus_1_0.py
index a0ec90aa0c0..1ed996b4e72 100644
--- a/tests/ported_static/stShift/test_shl_minus_1_0.py
+++ b/tests/ported_static/stShift/test_shl_minus_1_0.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_shl_minus_1_0.
 
 Ported from:
-tests/static/state_tests/stShift/shl_-1_0Filler.json
+state_tests/stShift/shl_-1_0Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shl_-1_0Filler.json"],
+    ["state_tests/stShift/shl_-1_0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_shl_minus_1_0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_shl_minus_1_0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,37 +46,42 @@ def test_shl_minus_1_0(
         gas_limit=1000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SHL(
-                    0x0,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60001b600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SHL(
+                0x0,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0630e2ac09069a9263d8d96bcb426b35d3e29a6a"),  # noqa: E501
+        address=Address(0x0630E2AC09069A9263D8D96BCB426B35D3E29A6A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60001b600055"  # noqa: E501
+            ),
+            balance=0xDE0B6B3A76586A0,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shl_minus_1_1.py b/tests/ported_static/stShift/test_shl_minus_1_1.py
index 295feaffc04..455e23e905a 100644
--- a/tests/ported_static/stShift/test_shl_minus_1_1.py
+++ b/tests/ported_static/stShift/test_shl_minus_1_1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_shl_minus_1_1.
 
 Ported from:
-tests/static/state_tests/stShift/shl_-1_1Filler.json
+state_tests/stShift/shl_-1_1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shl_-1_1Filler.json"],
+    ["state_tests/stShift/shl_-1_1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_shl_minus_1_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_shl_minus_1_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,36 +47,41 @@ def test_shl_minus_1_1(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SHL(
-                    0x1,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60011b600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SHL(
+                0x1,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbca8d83175fb98faae32481a974bbfee99b931f3"),  # noqa: E501
+        address=Address(0xBCA8D83175FB98FAAE32481A974BBFEE99B931F3),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60011b600055"  # noqa: E501
+            ),
+            balance=0xDE0B6B3A76586A0,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shl_minus_1_255.py b/tests/ported_static/stShift/test_shl_minus_1_255.py
index d83e720918a..403433f6bc1 100644
--- a/tests/ported_static/stShift/test_shl_minus_1_255.py
+++ b/tests/ported_static/stShift/test_shl_minus_1_255.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_shl_minus_1_255.
 
 Ported from:
-tests/static/state_tests/stShift/shl_-1_255Filler.json
+state_tests/stShift/shl_-1_255Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shl_-1_255Filler.json"],
+    ["state_tests/stShift/shl_-1_255Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_shl_minus_1_255(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_shl_minus_1_255."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -45,37 +46,42 @@ def test_shl_minus_1_255(
         gas_limit=1000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SHL(
-                    0xFF,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60ff1b600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SHL(
+                0xFF,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x09718bd7395aafdc3e1af2b747902980b036bea8"),  # noqa: E501
+        address=Address(0x09718BD7395AAFDC3E1AF2B747902980B036BEA8),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60ff1b600055"  # noqa: E501
+            ),
+            balance=0xDE0B6B3A76586A0,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shl_minus_1_256.py b/tests/ported_static/stShift/test_shl_minus_1_256.py
index 4ebf44a8a63..75c679ab014 100644
--- a/tests/ported_static/stShift/test_shl_minus_1_256.py
+++ b/tests/ported_static/stShift/test_shl_minus_1_256.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_shl_minus_1_256.
 
 Ported from:
-tests/static/state_tests/stShift/shl_-1_256Filler.json
+state_tests/stShift/shl_-1_256Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shl_-1_256Filler.json"],
+    ["state_tests/stShift/shl_-1_256Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_shl_minus_1_256(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_shl_minus_1_256."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,31 +43,38 @@ def test_shl_minus_1_256(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SHL(
-                    0x100,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6101001b600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SHL(
+                0x100,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfc4f633f1e963e8685a1e9f4a70ab46901b51fb3"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={0: 0},
+            code=bytes.fromhex(
+                "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6101001b600055"  # noqa: E501
+            ),
+            balance=0xDE0B6B3A76586A0,
+        ),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shr01.py b/tests/ported_static/stShift/test_shr01.py
index 51b5dda82c2..440b1720d94 100644
--- a/tests/ported_static/stShift/test_shr01.py
+++ b/tests/ported_static/stShift/test_shr01.py
@@ -2,15 +2,15 @@
 Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md.
 
 Ported from:
-tests/static/state_tests/stShift/shr01Filler.json
+state_tests/stShift/shr01Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shr01Filler.json"],
+    ["state_tests/stShift/shr01Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_shr01(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Taken from..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Taken from https://github."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,23 +43,26 @@ def test_shr01(
         gas_limit=1000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x600060011c600055
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.SHR(0x1, 0x0)),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x16408314e05c2677e2ac6a3a832d740aa9e1e99f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={0: 0}, balance=0xDE0B6B3A76586A0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shr10.py b/tests/ported_static/stShift/test_shr10.py
index c9c85ff21b1..f530f482917 100644
--- a/tests/ported_static/stShift/test_shr10.py
+++ b/tests/ported_static/stShift/test_shr10.py
@@ -2,15 +2,15 @@
 Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md.
 
 Ported from:
-tests/static/state_tests/stShift/shr10Filler.json
+state_tests/stShift/shr10Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shr10Filler.json"],
+    ["state_tests/stShift/shr10Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_shr10(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Taken from..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Taken from https://github."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,25 +43,26 @@ def test_shr10(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x600160001c600055
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.SHR(0x0, 0x1)),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xebfe51d0bd88b6eff720c820fb552e868f78c681"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}, balance=0xDE0B6B3A76586A0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shr11.py b/tests/ported_static/stShift/test_shr11.py
index b7578ad4fbb..f63d0c0da5f 100644
--- a/tests/ported_static/stShift/test_shr11.py
+++ b/tests/ported_static/stShift/test_shr11.py
@@ -2,15 +2,15 @@
 Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md.
 
 Ported from:
-tests/static/state_tests/stShift/shr11Filler.json
+state_tests/stShift/shr11Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shr11Filler.json"],
+    ["state_tests/stShift/shr11Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_shr11(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Taken from..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Taken from https://github."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,23 +43,26 @@ def test_shr11(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x600160011c600055
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.SHR(0x1, 0x1)),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xcd5c8d543415ccd7ac98c6fb1e8a64e2bb9ef8ac"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={0: 0}, balance=0xDE0B6B3A76586A0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shr_2_255_1.py b/tests/ported_static/stShift/test_shr_2_255_1.py
index 503c573895d..e5098e15523 100644
--- a/tests/ported_static/stShift/test_shr_2_255_1.py
+++ b/tests/ported_static/stShift/test_shr_2_255_1.py
@@ -2,7 +2,7 @@
 Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md.
 
 Ported from:
-tests/static/state_tests/stShift/shr_2^255_1Filler.json
+state_tests/stShift/shr_2^255_1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shr_2^255_1Filler.json"],
+    ["state_tests/stShift/shr_2^255_1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_shr_2_255_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Taken from..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Taken from https://github."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,36 +47,38 @@ def test_shr_2_255_1(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SHR(
-                    0x1,
-                    0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f800000000000000000000000000000000000000000000000000000000000000060011c600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SHR(
+                0x1,
+                0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa389b98748a90663fa4e2b16d2ae848ebc2069d2"),  # noqa: E501
+        address=Address(0xA389B98748A90663FA4E2B16D2AE848EBC2069D2),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x4000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
             },
+            balance=0xDE0B6B3A76586A0,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shr_2_255_255.py b/tests/ported_static/stShift/test_shr_2_255_255.py
index 667faa5ad42..32b6c243015 100644
--- a/tests/ported_static/stShift/test_shr_2_255_255.py
+++ b/tests/ported_static/stShift/test_shr_2_255_255.py
@@ -2,15 +2,15 @@
 Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md.
 
 Ported from:
-tests/static/state_tests/stShift/shr_2^255_255Filler.json
+state_tests/stShift/shr_2^255_255Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shr_2^255_255Filler.json"],
+    ["state_tests/stShift/shr_2^255_255Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_shr_2_255_255(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Taken from..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Taken from https://github."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,33 +43,32 @@ def test_shr_2_255_255(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SHR(
-                    0xFF,
-                    0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f800000000000000000000000000000000000000000000000000000000000000060ff1c600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SHR(
+                0xFF,
+                0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xad48c928474b5d7bc2ad4c8e769133bcd5988894"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}, balance=0xDE0B6B3A76586A0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shr_2_255_256.py b/tests/ported_static/stShift/test_shr_2_255_256.py
index 101bf5c7909..e94dd6b51b0 100644
--- a/tests/ported_static/stShift/test_shr_2_255_256.py
+++ b/tests/ported_static/stShift/test_shr_2_255_256.py
@@ -2,15 +2,15 @@
 Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md.
 
 Ported from:
-tests/static/state_tests/stShift/shr_2^255_256Filler.json
+state_tests/stShift/shr_2^255_256Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shr_2^255_256Filler.json"],
+    ["state_tests/stShift/shr_2^255_256Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_shr_2_255_256(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Taken from..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Taken from https://github."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,31 +43,32 @@ def test_shr_2_255_256(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SHR(
-                    0x100,
-                    0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f80000000000000000000000000000000000000000000000000000000000000006101001c600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SHR(
+                0x100,
+                0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x634045b2e9ef0249256f6c175beddb252ccdcc65"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={0: 0}, balance=0xDE0B6B3A76586A0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shr_2_255_257.py b/tests/ported_static/stShift/test_shr_2_255_257.py
index be3421b1749..eb5e71253f3 100644
--- a/tests/ported_static/stShift/test_shr_2_255_257.py
+++ b/tests/ported_static/stShift/test_shr_2_255_257.py
@@ -2,15 +2,15 @@
 Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md.
 
 Ported from:
-tests/static/state_tests/stShift/shr_2^255_257Filler.json
+state_tests/stShift/shr_2^255_257Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shr_2^255_257Filler.json"],
+    ["state_tests/stShift/shr_2^255_257Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_shr_2_255_257(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Taken from..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Taken from https://github."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,31 +43,32 @@ def test_shr_2_255_257(
         gas_limit=1000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SHR(
-                    0x101,
-                    0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7f80000000000000000000000000000000000000000000000000000000000000006101011c600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SHR(
+                0x101,
+                0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x00fe70b13953d2dab2d13ce453cc42c47e3ab8ca"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={0: 0}, balance=0xDE0B6B3A76586A0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shr_minus_1_0.py b/tests/ported_static/stShift/test_shr_minus_1_0.py
index 5a25d7440f2..340c476af04 100644
--- a/tests/ported_static/stShift/test_shr_minus_1_0.py
+++ b/tests/ported_static/stShift/test_shr_minus_1_0.py
@@ -2,7 +2,7 @@
 Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md.
 
 Ported from:
-tests/static/state_tests/stShift/shr_-1_0Filler.json
+state_tests/stShift/shr_-1_0Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shr_-1_0Filler.json"],
+    ["state_tests/stShift/shr_-1_0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_shr_minus_1_0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Taken from..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Taken from https://github."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,36 +47,38 @@ def test_shr_minus_1_0(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SHR(
-                    0x0,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60001c600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SHR(
+                0x0,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xcb148bf8df8a38a6478678824eeb7eadd61e3e59"),  # noqa: E501
+        address=Address(0xCB148BF8DF8A38A6478678824EEB7EADD61E3E59),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            balance=0xDE0B6B3A76586A0,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shr_minus_1_1.py b/tests/ported_static/stShift/test_shr_minus_1_1.py
index e9083ad4df9..aff1657f6c4 100644
--- a/tests/ported_static/stShift/test_shr_minus_1_1.py
+++ b/tests/ported_static/stShift/test_shr_minus_1_1.py
@@ -2,7 +2,7 @@
 Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md.
 
 Ported from:
-tests/static/state_tests/stShift/shr_-1_1Filler.json
+state_tests/stShift/shr_-1_1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shr_-1_1Filler.json"],
+    ["state_tests/stShift/shr_-1_1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,8 @@ def test_shr_minus_1_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Taken from..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Taken from https://github."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,36 +47,38 @@ def test_shr_minus_1_1(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SHR(
-                    0x1,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60011c600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SHR(
+                0x1,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3610b43ff3bab81bd5772e01915ac9cbb67782b9"),  # noqa: E501
+        address=Address(0x3610B43FF3BAB81BD5772E01915AC9CBB67782B9),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            balance=0xDE0B6B3A76586A0,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shr_minus_1_255.py b/tests/ported_static/stShift/test_shr_minus_1_255.py
index 34935d2ea15..7bba31f619b 100644
--- a/tests/ported_static/stShift/test_shr_minus_1_255.py
+++ b/tests/ported_static/stShift/test_shr_minus_1_255.py
@@ -2,15 +2,15 @@
 Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md.
 
 Ported from:
-tests/static/state_tests/stShift/shr_-1_255Filler.json
+state_tests/stShift/shr_-1_255Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shr_-1_255Filler.json"],
+    ["state_tests/stShift/shr_-1_255Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_shr_minus_1_255(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Taken from..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Taken from https://github."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,33 +43,32 @@ def test_shr_minus_1_255(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SHR(
-                    0xFF,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60ff1c600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SHR(
+                0xFF,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xcba06af5af94be2ecf98fce20d1d965296d6fa02"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1}, balance=0xDE0B6B3A76586A0),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stShift/test_shr_minus_1_256.py b/tests/ported_static/stShift/test_shr_minus_1_256.py
index 756336d56f1..4d519360577 100644
--- a/tests/ported_static/stShift/test_shr_minus_1_256.py
+++ b/tests/ported_static/stShift/test_shr_minus_1_256.py
@@ -2,15 +2,15 @@
 Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md.
 
 Ported from:
-tests/static/state_tests/stShift/shr_-1_256Filler.json
+state_tests/stShift/shr_-1_256Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stShift/shr_-1_256Filler.json"],
+    ["state_tests/stShift/shr_-1_256Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_shr_minus_1_256(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Taken from..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Taken from https://github."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,31 +43,32 @@ def test_shr_minus_1_256(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.SHR(
-                    0x100,
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                ),
-            )
+    # Source: raw
+    # 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6101001c600055  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SHR(
+                0x100,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
         ),
-        storage={0x0: 0x3},
+        storage={0: 3},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf703bf410c7f3337c04f281f6eb8e44d83323f55"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=400000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={0: 0}, balance=0xDE0B6B3A76586A0),
+        sender: Account(storage={}, code=b"", nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSolidityTest/__init__.py b/tests/ported_static/stSolidityTest/__init__.py
index ab831f7ea10..397d5e80cae 100644
--- a/tests/ported_static/stSolidityTest/__init__.py
+++ b/tests/ported_static/stSolidityTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stSolidityTest."""
+"""Ported static tests: stSolidityTest."""  # noqa: N999
diff --git a/tests/ported_static/stSolidityTest/test_ambiguous_method.py b/tests/ported_static/stSolidityTest/test_ambiguous_method.py
index 77a9416b693..fa6f1e8de36 100644
--- a/tests/ported_static/stSolidityTest/test_ambiguous_method.py
+++ b/tests/ported_static/stSolidityTest/test_ambiguous_method.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_ambiguous_method.
 
 Ported from:
-tests/static/state_tests/stSolidityTest/AmbiguousMethodFiller.json
+state_tests/stSolidityTest/AmbiguousMethodFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSolidityTest/AmbiguousMethodFiller.json"],
+    ["state_tests/stSolidityTest/AmbiguousMethodFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_ambiguous_method(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA9AE12CB2700C0214F86B9796881BC03A1FD5605D0E76D2DA2CA592E62D53E52
-    )
+    """Test_ambiguous_method."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x12A05F200)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,45 +43,40 @@ def test_ambiguous_method(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.EXP(0x2, 0xE0)
-            + Op.SWAP1
-            + Op.DIV
-            + Op.JUMPI(pc=0x15, condition=Op.EQ(0xC0406226, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1B]
-            + Op.JUMP(pc=0x21)
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x14F]
-            + Op.PUSH1[0x0]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.JUMP
-        ),
+    # Source: raw
+    # 0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.EXP(0x2, 0xE0)
+        + Op.SWAP1
+        + Op.DIV
+        + Op.JUMPI(pc=0x15, condition=Op.EQ(0xC0406226, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1B]
+        + Op.JUMP(pc=0x21)
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x14F]
+        + Op.PUSH1[0x0]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.JUMP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x235c9320b0f4d30204334c1ddb008dfe1d75b1b9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x12A05F200)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("c0406226"),
+        to=target,
+        data=Bytes("c0406226"),
         gas_limit=300000,
         value=1,
     )
 
-    post = {
-        contract: Account(storage={0: 335}),
-    }
+    post = {target: Account(storage={0: 335})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSolidityTest/test_by_zero.py b/tests/ported_static/stSolidityTest/test_by_zero.py
index f0fa29b4276..5fc45ecfe07 100644
--- a/tests/ported_static/stSolidityTest/test_by_zero.py
+++ b/tests/ported_static/stSolidityTest/test_by_zero.py
@@ -2,49 +2,70 @@
 DIV/SDIV/MOD/SMOD by zero tests.
 
 Ported from:
-tests/static/state_tests/stSolidityTest/ByZeroFiller.json
+state_tests/stSolidityTest/ByZeroFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSolidityTest/ByZeroFiller.json"],
+    ["state_tests/stSolidityTest/ByZeroFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "600160006001045500",
-        "600160006001055500",
-        "600160006001065500",
-        "600160006001075500",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
-@pytest.mark.pre_alloc_mutable
 def test_by_zero(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """DIV/SDIV/MOD/SMOD by zero tests."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x8AC7230489E80000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -55,21 +76,26 @@ def test_by_zero(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0x8AC7230489E80000)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.SSTORE(key=Op.DIV(0x1, 0x0), value=0x1) + Op.STOP,
+        Op.SSTORE(key=Op.SDIV(0x1, 0x0), value=0x1) + Op.STOP,
+        Op.SSTORE(key=Op.MOD(0x1, 0x0), value=0x1) + Op.STOP,
+        Op.SSTORE(key=Op.SMOD(0x1, 0x0), value=0x1) + Op.STOP,
+    ]
+    tx_gas = [400000]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=400000,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
     post = {
-        Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-            storage={0: 1},
+        compute_create_address(address=sender, nonce=0): Account(
+            storage={0: 1}, code=b"", balance=0
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSolidityTest/test_call_infinite_loop.py b/tests/ported_static/stSolidityTest/test_call_infinite_loop.py
index c71399197c7..a1a00522ae6 100644
--- a/tests/ported_static/stSolidityTest/test_call_infinite_loop.py
+++ b/tests/ported_static/stSolidityTest/test_call_infinite_loop.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_infinite_loop.
 
 Ported from:
-tests/static/state_tests/stSolidityTest/CallInfiniteLoopFiller.json
+state_tests/stSolidityTest/CallInfiniteLoopFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSolidityTest/CallInfiniteLoopFiller.json"],
+    ["state_tests/stSolidityTest/CallInfiniteLoopFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_call_infinite_loop(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0x96C07046493EC8728482079AB999D2994420D9CF4D3491DFD06871B106D9D87B
-    )
+    """Test_call_infinite_loop."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0x1DCD6500)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,64 +43,60 @@ def test_call_infinite_loop(
         gas_limit=100000000,
     )
 
-    pre[sender] = Account(balance=0x1DCD6500)
     pre[coinbase] = Account(balance=0, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.EXP(0x2, 0xE0)
-            + Op.SWAP1
-            + Op.DIV
-            + Op.JUMPI(pc=0x29, condition=Op.EQ(0x296DF0DF, Op.DUP1))
-            + Op.JUMPI(pc=0x35, condition=Op.EQ(0x4893D88A, Op.DUP1))
-            + Op.JUMPI(pc=0x41, condition=Op.EQ(0x981A3165, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x2F]
-            + Op.JUMP(pc=0x4D)
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x3B]
-            + Op.JUMP(pc=0x62)
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x47]
-            + Op.JUMP(pc=0x5A)
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x58, condition=Op.ISZERO(0x1))
-            + Op.JUMP(pc=0x4E)
-            + Op.JUMPDEST
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x60]
-            + Op.JUMP(pc=0x62)
-            + Op.JUMPDEST
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x68]
-            + Op.JUMP(pc=0x5A)
-            + Op.JUMPDEST
-            + Op.JUMP
-        ),
+    # Source: raw
+    # 0x60003560e060020a90048063296df0df1460295780634893d88a146035578063981a316514604157005b602f604d565b60006000f35b603b6062565b60006000f35b6047605a565b60006000f35b5b600115605857604e565b565b60606062565b565b6068605a565b56  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.EXP(0x2, 0xE0)
+        + Op.SWAP1
+        + Op.DIV
+        + Op.JUMPI(pc=0x29, condition=Op.EQ(0x296DF0DF, Op.DUP1))
+        + Op.JUMPI(pc=0x35, condition=Op.EQ(0x4893D88A, Op.DUP1))
+        + Op.JUMPI(pc=0x41, condition=Op.EQ(0x981A3165, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x2F]
+        + Op.JUMP(pc=0x4D)
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x3B]
+        + Op.JUMP(pc=0x62)
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x47]
+        + Op.JUMP(pc=0x5A)
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST * 2
+        + Op.JUMPI(pc=0x58, condition=Op.ISZERO(0x1))
+        + Op.JUMP(pc=0x4E)
+        + Op.JUMPDEST
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x60]
+        + Op.JUMP(pc=0x62)
+        + Op.JUMPDEST
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x68]
+        + Op.JUMP(pc=0x5A)
+        + Op.JUMPDEST
+        + Op.JUMP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0xf9b9ccb6160ce3574df5d096ca9fd12ba81d97ee"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("296df0df"),
+        to=target,
+        data=Bytes("296df0df"),
         gas_limit=300000,
         value=1,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSolidityTest/test_call_low_level_creates_solidity.py b/tests/ported_static/stSolidityTest/test_call_low_level_creates_solidity.py
index 72912ad72db..506bac4b786 100644
--- a/tests/ported_static/stSolidityTest/test_call_low_level_creates_solidity.py
+++ b/tests/ported_static/stSolidityTest/test_call_low_level_creates_solidity.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_low_level_creates_solidity.
 
 Ported from:
-tests/static/state_tests/stSolidityTest/CallLowLevelCreatesSolidityFiller.json
+state_tests/stSolidityTest/CallLowLevelCreatesSolidityFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSolidityTest/CallLowLevelCreatesSolidityFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSolidityTest/CallLowLevelCreatesSolidityFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_call_low_level_creates_solidity(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA2333EEF5630066B928DEA5FD85A239F511B5B067D1441EE7AC290D0122B917B
-    )
+    """Test_call_low_level_creates_solidity."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,146 +43,125 @@ def test_call_low_level_creates_solidity(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.EXP(0x2, 0xE0)
-            + Op.SWAP1
-            + Op.DIV
-            + Op.JUMPI(pc=Op.PUSH2[0x21], condition=Op.EQ(0x30DEBB42, Op.DUP1))
-            + Op.JUMPI(pc=Op.PUSH2[0x32], condition=Op.EQ(0xC0406226, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH2[0x2C]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.JUMP(pc=Op.PUSH2[0xC7])
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x3A]
-            + Op.JUMP(pc=Op.PUSH2[0x44])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x0]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.PUSH20[0x5DA6FBE439A0C3AB33F813671A4E7767EE0A263B]
-            + Op.PUSH1[0x1]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.CODECOPY(dest_offset=0x0, offset=Op.PUSH2[0xD2], size=0x6A)
-            + Op.CREATE(value=0x0, offset=0x0, size=0x6A)
-            + Op.SWAP1
-            + Op.POP
-            + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP1)
-            + Op.PUSH4[0x19AB453C]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=0x0, value=Op.MUL(Op.EXP(0x2, 0xE0), Op.DUP3))
-            + Op.PUSH1[0x4]
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=Op.AND(
-                    Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x1)
-                ),
-            )
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.DUP7
-            + Op.SUB(Op.GAS, 0x32)
-            + Op.JUMPI(pc=Op.PUSH2[0xBC], condition=Op.CALL)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.SLOAD(key=0x0)
-            + Op.SWAP2
-            + Op.POP
-            + Op.POP
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.DUP1
-            + Op.PUSH1[0x0]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.POP
-            + Op.JUMP
-            + Op.STOP
-            + Op.PUSH1[0x5E]
-            + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.CALLDATALOAD(offset=0x0)
-            + Op.EXP(0x2, 0xE0)
-            + Op.SWAP1
-            + Op.DIV
-            + Op.JUMPI(pc=0x15, condition=Op.EQ(0x19AB453C, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1E]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.JUMP(pc=0x24)
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP1)
-            + Op.PUSH4[0x30DEBB42]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=0x0, value=Op.MUL(Op.EXP(0x2, 0xE0), Op.DUP3))
-            + Op.PUSH1[0x4]
-            + Op.MSTORE(offset=Op.DUP2, value=0xE1)
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.DUP7
-            + Op.SUB(Op.GAS, 0x32)
-            + Op.JUMPI(pc=0x59, condition=Op.CALL)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMP
-        ),
+    # Source: raw
+    # 0x60003560e060020a9004806330debb4214610021578063c04062261461003257005b61002c6004356100c7565b60006000f35b61003a610044565b8060005260206000f35b60006000600160008190555073<contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>600181905550606a6100d2600039606a60006000f0905080600160a060020a03166319ab453c600060008260e060020a026000526004600154600160a060020a03168152602001600060008660325a03f16100bc57005b505060005491505090565b80600081905550505600605e80600c6000396000f30060003560e060020a9004806319ab453c14601557005b601e6004356024565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660325a03f1605957005b50505056  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.EXP(0x2, 0xE0)
+        + Op.SWAP1
+        + Op.DIV
+        + Op.JUMPI(pc=Op.PUSH2[0x21], condition=Op.EQ(0x30DEBB42, Op.DUP1))
+        + Op.JUMPI(pc=Op.PUSH2[0x32], condition=Op.EQ(0xC0406226, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH2[0x2C]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.JUMP(pc=Op.PUSH2[0xC7])
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x3A]
+        + Op.JUMP(pc=Op.PUSH2[0x44])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0] * 2
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.PUSH20[0x5DA6FBE439A0C3AB33F813671A4E7767EE0A263B]
+        + Op.PUSH1[0x1]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.CODECOPY(dest_offset=0x0, offset=Op.PUSH2[0xD2], size=0x6A)
+        + Op.CREATE(value=0x0, offset=0x0, size=0x6A)
+        + Op.SWAP1
+        + Op.POP
+        + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP1)
+        + Op.PUSH4[0x19AB453C]
+        + Op.PUSH1[0x0] * 2
+        + Op.MSTORE(offset=0x0, value=Op.MUL(Op.EXP(0x2, 0xE0), Op.DUP3))
+        + Op.PUSH1[0x4]
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x1)),
+        )
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.PUSH1[0x0] * 2
+        + Op.DUP7
+        + Op.SUB(Op.GAS, 0x32)
+        + Op.JUMPI(pc=Op.PUSH2[0xBC], condition=Op.CALL)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.SLOAD(key=0x0)
+        + Op.SWAP2
+        + Op.POP * 2
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.DUP1
+        + Op.PUSH1[0x0]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP * 2
+        + Op.JUMP
+        + Op.STOP
+        + Op.PUSH1[0x5E]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP
+        + Op.CALLDATALOAD(offset=0x0)
+        + Op.EXP(0x2, 0xE0)
+        + Op.SWAP1
+        + Op.DIV
+        + Op.JUMPI(pc=0x15, condition=Op.EQ(0x19AB453C, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1E]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.JUMP(pc=0x24)
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP1)
+        + Op.PUSH4[0x30DEBB42]
+        + Op.PUSH1[0x0] * 2
+        + Op.MSTORE(offset=0x0, value=Op.MUL(Op.EXP(0x2, 0xE0), Op.DUP3))
+        + Op.PUSH1[0x4]
+        + Op.MSTORE(offset=Op.DUP2, value=0xE1)
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.PUSH1[0x0] * 2
+        + Op.DUP7
+        + Op.SUB(Op.GAS, 0x32)
+        + Op.JUMPI(pc=0x59, condition=Op.CALL)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP * 3
+        + Op.JUMP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x5da6fbe439a0c3ab33f813671a4e7767ee0a263b"),  # noqa: E501
+        address=Address(0x5DA6FBE439A0C3AB33F813671A4E7767EE0A263B),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("c0406226"),
+        to=target,
+        data=Bytes("c0406226"),
         gas_limit=350000,
         value=1,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 225,
-                1: 0x5DA6FBE439A0C3AB33F813671A4E7767EE0A263B,
-            },
-        ),
-    }
+    post = {target: Account(storage={0: 225, 1: target}, nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSolidityTest/test_call_recursive_methods.py b/tests/ported_static/stSolidityTest/test_call_recursive_methods.py
index 9ce6a47f7ea..bb578a72397 100644
--- a/tests/ported_static/stSolidityTest/test_call_recursive_methods.py
+++ b/tests/ported_static/stSolidityTest/test_call_recursive_methods.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_recursive_methods.
 
 Ported from:
-tests/static/state_tests/stSolidityTest/CallRecursiveMethodsFiller.json
+state_tests/stSolidityTest/CallRecursiveMethodsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSolidityTest/CallRecursiveMethodsFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSolidityTest/CallRecursiveMethodsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_call_recursive_methods(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0xA9AE12CB2700C0214F86B9796881BC03A1FD5605D0E76D2DA2CA592E62D53E52
-    )
+    """Test_call_recursive_methods."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0x12A05F200)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,64 +43,60 @@ def test_call_recursive_methods(
         gas_limit=100000000,
     )
 
-    pre[sender] = Account(balance=0x12A05F200)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(pc=0x41, condition=Op.EQ(Op.DUP2, 0x296DF0DF))
-            + Op.JUMPI(pc=0x4D, condition=Op.EQ(0x4893D88A, Op.DUP1))
-            + Op.JUMPI(pc=0x59, condition=Op.EQ(0x981A3165, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x47]
-            + Op.JUMP(pc=0x65)
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x53]
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x5F]
-            + Op.JUMP(pc=0x72)
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x70, condition=Op.ISZERO(0x1))
-            + Op.JUMP(pc=0x66)
-            + Op.JUMPDEST
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x78]
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x80]
-            + Op.JUMP(pc=0x72)
-            + Op.JUMPDEST
-            + Op.JUMP
-        ),
+    pre[coinbase] = Account(balance=0, nonce=1)
+    # Source: raw
+    # 0x7c01000000000000000000000000000000000000000000000000000000006000350463296df0df811460415780634893d88a14604d578063981a316514605957005b60476065565b60006000f35b6053607a565b60006000f35b605f6072565b60006000f35b5b6001156070576066565b565b6078607a565b565b60806072565b56  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.JUMPI(pc=0x41, condition=Op.EQ(Op.DUP2, 0x296DF0DF))
+        + Op.JUMPI(pc=0x4D, condition=Op.EQ(0x4893D88A, Op.DUP1))
+        + Op.JUMPI(pc=0x59, condition=Op.EQ(0x981A3165, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x47]
+        + Op.JUMP(pc=0x65)
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x53]
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x5F]
+        + Op.JUMP(pc=0x72)
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST * 2
+        + Op.JUMPI(pc=0x70, condition=Op.ISZERO(0x1))
+        + Op.JUMP(pc=0x66)
+        + Op.JUMPDEST
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x78]
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x80]
+        + Op.JUMP(pc=0x72)
+        + Op.JUMPDEST
+        + Op.JUMP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0xc7c7851c7f3291bed1039bb4ffa166c290a605a9"),  # noqa: E501
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("981a3165"),
+        to=target,
+        data=Bytes("981a3165"),
         gas_limit=60000,
         value=1,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSolidityTest/test_contract_inheritance.py b/tests/ported_static/stSolidityTest/test_contract_inheritance.py
index 123bdea71a3..d0b8c2f3cd5 100644
--- a/tests/ported_static/stSolidityTest/test_contract_inheritance.py
+++ b/tests/ported_static/stSolidityTest/test_contract_inheritance.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_contract_inheritance.
 
 Ported from:
-tests/static/state_tests/stSolidityTest/ContractInheritanceFiller.json
+state_tests/stSolidityTest/ContractInheritanceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSolidityTest/ContractInheritanceFiller.json"],
+    ["state_tests/stSolidityTest/ContractInheritanceFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_contract_inheritance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA9AE12CB2700C0214F86B9796881BC03A1FD5605D0E76D2DA2CA592E62D53E52
-    )
+    """Test_contract_inheritance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x12A05F200)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,185 +44,174 @@ def test_contract_inheritance(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(pc=Op.PUSH2[0x39], condition=Op.EQ(Op.DUP2, 0x3E0BCA3B))
-            + Op.JUMPI(pc=Op.PUSH2[0xA8], condition=Op.EQ(0xC0406226, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH2[0xB5]
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.CODECOPY(dest_offset=Op.DUP4, offset=0x1EC, size=0x45)
-            + Op.CREATE(value=0x0, offset=0x0, size=0x45)
-            + Op.SWAP2
-            + Op.POP
-            + Op.AND(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.DUP2)
-            + Op.PUSH4[0x81BDA09B]
-            + Op.PUSH1[0x20]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.MUL(
-                    0x100000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    Op.DUP3,
-                ),
-            )
-            + Op.PUSH1[0x4]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.DUP7
-            + Op.SUB(Op.GAS, 0x61DA)
-            + Op.JUMPI(pc=0x119, condition=Op.CALL)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH2[0xBF]
-            + Op.PUSH1[0x0]
-            + Op.PUSH2[0xC9]
-            + Op.JUMP(pc=Op.PUSH2[0x3D])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.AND(
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00,  # noqa: E501
-                Op.SLOAD(key=Op.DUP1),
-            )
-            + Op.SWAP2
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.OR
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.PUSH1[0xFF]
-            + Op.AND
-            + Op.SWAP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x19D,
-                condition=Op.ISZERO(
-                    Op.EQ(0x2, Op.AND(0xFFFFFFFF, Op.MLOAD(offset=0x0))),
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x194,
-                condition=Op.ISZERO(
-                    Op.EQ(0x1, Op.AND(0xFFFFFFFF, Op.MLOAD(offset=0x0))),
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.CODECOPY(dest_offset=0x0, offset=0x1A7, size=0x45)
-            + Op.CREATE(value=0x0, offset=0x0, size=0x45)
-            + Op.SWAP1
-            + Op.POP
-            + Op.AND(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.DUP1)
-            + Op.PUSH4[0x81BDA09B]
-            + Op.PUSH1[0x20]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.MUL(
-                    0x100000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    Op.DUP3,
-                ),
-            )
-            + Op.PUSH1[0x4]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.DUP7
-            + Op.SUB(Op.GAS, 0x61DA)
-            + Op.JUMPI(pc=Op.PUSH2[0xFF], condition=Op.CALL)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP3
-            + Op.POP
-            + Op.JUMP(pc=0x114)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP3
-            + Op.POP
-            + Op.JUMP(pc=0x114)
-            + Op.STOP
-            + Op.PUSH1[0x39]
-            + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
+    # Source: raw
+    # 0x7c010000000000000000000000000000000000000000000000000000000060003504633e0bca3b8114610039578063c0406226146100a857005b6100b55b600160008060456101ec8339604560006000f091508173ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f161011957005b6100bf60006100c961003d565b8060005260206000f35b8060005260206000f35b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016919091179081905560ff16919050565b505060005163ffffffff166002141561019d575b5b505090565b505060005163ffffffff1660011415610194575b60456101a7600039604560006000f090508073ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f16100ff57005b60009250610114565b600092506101145600603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60026000818152602090f3603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60016000818152602090f3  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.JUMPI(pc=Op.PUSH2[0x39], condition=Op.EQ(Op.DUP2, 0x3E0BCA3B))
+        + Op.JUMPI(pc=Op.PUSH2[0xA8], condition=Op.EQ(0xC0406226, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH2[0xB5]
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.CODECOPY(dest_offset=Op.DUP4, offset=0x1EC, size=0x45)
+        + Op.CREATE(value=0x0, offset=0x0, size=0x45)
+        + Op.SWAP2
+        + Op.POP
+        + Op.AND(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.DUP2)
+        + Op.PUSH4[0x81BDA09B]
+        + Op.PUSH1[0x20]
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.MUL(
                 0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(pc=0x2D, condition=Op.EQ(Op.DUP2, 0x81BDA09B))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x2]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.PUSH1[0x20]
-            + Op.SWAP1
-            + Op.RETURN
-            + Op.PUSH1[0x39]
-            + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
+                Op.DUP3,
+            ),
+        )
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x0] * 2
+        + Op.DUP7
+        + Op.SUB(Op.GAS, 0x61DA)
+        + Op.JUMPI(pc=0x119, condition=Op.CALL)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH2[0xBF]
+        + Op.PUSH1[0x0]
+        + Op.PUSH2[0xC9]
+        + Op.JUMP(pc=Op.PUSH2[0x3D])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.AND(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00,
+            Op.SLOAD(key=Op.DUP1),
+        )
+        + Op.SWAP2
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.OR
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.PUSH1[0xFF]
+        + Op.AND
+        + Op.SWAP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.JUMPI(
+            pc=0x19D,
+            condition=Op.ISZERO(
+                Op.EQ(0x2, Op.AND(0xFFFFFFFF, Op.MLOAD(offset=0x0)))
+            ),
+        )
+        + Op.JUMPDEST * 2
+        + Op.POP * 2
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.JUMPI(
+            pc=0x194,
+            condition=Op.ISZERO(
+                Op.EQ(0x1, Op.AND(0xFFFFFFFF, Op.MLOAD(offset=0x0)))
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.CODECOPY(dest_offset=0x0, offset=0x1A7, size=0x45)
+        + Op.CREATE(value=0x0, offset=0x0, size=0x45)
+        + Op.SWAP1
+        + Op.POP
+        + Op.AND(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.DUP1)
+        + Op.PUSH4[0x81BDA09B]
+        + Op.PUSH1[0x20]
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.MUL(
                 0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(pc=0x2D, condition=Op.EQ(Op.DUP2, 0x81BDA09B))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.PUSH1[0x20]
-            + Op.SWAP1
-            + Op.RETURN
-        ),
+                Op.DUP3,
+            ),
+        )
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x0] * 2
+        + Op.DUP7
+        + Op.SUB(Op.GAS, 0x61DA)
+        + Op.JUMPI(pc=Op.PUSH2[0xFF], condition=Op.CALL)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP3
+        + Op.POP
+        + Op.JUMP(pc=0x114)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP3
+        + Op.POP
+        + Op.JUMP(pc=0x114)
+        + Op.STOP
+        + Op.PUSH1[0x39]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP
+        + Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.JUMPI(pc=0x2D, condition=Op.EQ(Op.DUP2, 0x81BDA09B))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.PUSH1[0x20]
+        + Op.SWAP1
+        + Op.RETURN
+        + Op.PUSH1[0x39]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP
+        + Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.JUMPI(pc=0x2D, condition=Op.EQ(Op.DUP2, 0x81BDA09B))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.PUSH1[0x20]
+        + Op.SWAP1
+        + Op.RETURN,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x3809b123c157b2d0d3b998255f35b5f8b8ae4789"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x12A05F200)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("c0406226"),
+        to=target,
+        data=Bytes("c0406226"),
         gas_limit=35000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSolidityTest/test_create_contract_from_method.py b/tests/ported_static/stSolidityTest/test_create_contract_from_method.py
index ceeec794dd9..c53bad1118b 100644
--- a/tests/ported_static/stSolidityTest/test_create_contract_from_method.py
+++ b/tests/ported_static/stSolidityTest/test_create_contract_from_method.py
@@ -1,19 +1,20 @@
 """
-Test ported from static filler.
+Test_create_contract_from_method.
 
 Ported from:
-tests/static/state_tests/stSolidityTest/CreateContractFromMethodFiller.json
+state_tests/stSolidityTest/CreateContractFromMethodFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSolidityTest/CreateContractFromMethodFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSolidityTest/CreateContractFromMethodFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +31,10 @@ def test_create_contract_from_method(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_contract_from_method."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,96 +45,103 @@ def test_create_contract_from_method(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.EXP(0x2, 0xE0)
-            + Op.SWAP1
-            + Op.DIV
-            + Op.JUMPI(pc=0x1F, condition=Op.EQ(0x7EE17E12, Op.DUP1))
-            + Op.JUMPI(pc=0x2B, condition=Op.EQ(0xC0406226, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x25]
-            + Op.JUMP(pc=0x47)
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x31]
-            + Op.JUMP(pc=0x3B)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x43]
-            + Op.JUMP(pc=0x47)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x5D, size=0x60)
-            + Op.CREATE(value=0x0, offset=0x0, size=0x60)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.STOP
-            + Op.PUSH1[0x54]
-            + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.CALLDATALOAD(offset=0x0)
-            + Op.EXP(0x2, 0xE0)
-            + Op.SWAP1
-            + Op.DIV
-            + Op.JUMPI(pc=0x1E, condition=Op.EQ(0xF55D9D, Op.DUP1))
-            + Op.JUMPI(pc=0x2D, condition=Op.EQ(0xB9C3D0A5, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x27]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.JUMP(pc=0x46)
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x33]
-            + Op.JUMP(pc=0x3D)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xE1]
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.SELFDESTRUCT(
-                address=Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP1),
-            )
-            + Op.POP
-            + Op.JUMP
-        ),
+    # Source: raw
+    # 0x60003560e060020a900480637ee17e1214601f578063c040622614602b57005b60256047565b60006000f35b6031603b565b8060005260206000f35b600060436047565b5090565b60006060605d600039606060006000f09050905600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.EXP(0x2, 0xE0)
+        + Op.SWAP1
+        + Op.DIV
+        + Op.JUMPI(pc=0x1F, condition=Op.EQ(0x7EE17E12, Op.DUP1))
+        + Op.JUMPI(pc=0x2B, condition=Op.EQ(0xC0406226, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x25]
+        + Op.JUMP(pc=0x47)
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x31]
+        + Op.JUMP(pc=0x3B)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x43]
+        + Op.JUMP(pc=0x47)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x5D, size=0x60)
+        + Op.CREATE(value=0x0, offset=0x0, size=0x60)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.STOP
+        + Op.PUSH1[0x54]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP
+        + Op.CALLDATALOAD(offset=0x0)
+        + Op.EXP(0x2, 0xE0)
+        + Op.SWAP1
+        + Op.DIV
+        + Op.JUMPI(pc=0x1E, condition=Op.EQ(0xF55D9D, Op.DUP1))
+        + Op.JUMPI(pc=0x2D, condition=Op.EQ(0xB9C3D0A5, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x27]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.JUMP(pc=0x46)
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x33]
+        + Op.JUMP(pc=0x3D)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xE1]
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.SELFDESTRUCT(
+            address=Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP1)
+        )
+        + Op.POP
+        + Op.JUMP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("c0406226"),
+        to=contract_0,
+        data=Bytes("c0406226"),
         gas_limit=350000,
         value=1,
     )
 
-    post: dict = {}
+    post = {
+        contract_0: Account(nonce=1),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={},
+            code=bytes.fromhex(
+                "60003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056"  # noqa: E501
+            ),
+            balance=0,
+            nonce=1,
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSolidityTest/test_recursive_create_contracts.py b/tests/ported_static/stSolidityTest/test_recursive_create_contracts.py
index 671b7d66e36..836f16024d1 100644
--- a/tests/ported_static/stSolidityTest/test_recursive_create_contracts.py
+++ b/tests/ported_static/stSolidityTest/test_recursive_create_contracts.py
@@ -1,19 +1,21 @@
 """
-Test ported from static filler.
+Test_recursive_create_contracts.
 
 Ported from:
-tests/static/state_tests/stSolidityTest/RecursiveCreateContractsFiller.json
+state_tests/stSolidityTest/RecursiveCreateContractsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,9 +24,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSolidityTest/RecursiveCreateContractsFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSolidityTest/RecursiveCreateContractsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +32,10 @@ def test_recursive_create_contracts(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_recursive_create_contracts."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0x1DCD6500)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,250 +46,223 @@ def test_recursive_create_contracts(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.EXP(0x2, 0xE0)
-            + Op.SWAP1
-            + Op.DIV
-            + Op.JUMPI(pc=Op.PUSH2[0x21], condition=Op.EQ(0x820B13F6, Op.DUP1))
-            + Op.JUMPI(pc=Op.PUSH2[0x32], condition=Op.EQ(0xA444F5E9, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH2[0x2C]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.JUMP(pc=Op.PUSH2[0x93])
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x3D]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.JUMP(pc=Op.PUSH2[0x43])
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH20[0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87]
-            + Op.PUSH1[0x0]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.DUP2
-            + Op.PUSH1[0x1]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.CODECOPY(dest_offset=0x0, offset=0x1AD, size=0x6B)
-            + Op.PUSH1[0x6B]
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=Op.AND(
-                    Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)
-                ),
-            )
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
-            + Op.PUSH1[0x20]
-            + Op.CREATE(value=0x0, offset=0x0, size=Op.ADD)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.CODECOPY(dest_offset=0x0, offset=Op.PUSH2[0xE5], size=0xC8)
-            + Op.PUSH1[0xC8]
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=Op.AND(
-                    Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)
-                ),
-            )
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
-            + Op.PUSH1[0x20]
-            + Op.CREATE(value=0x0, offset=0x0, size=Op.ADD)
-            + Op.SWAP1
-            + Op.POP
-            + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x2]
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xDD],
-                condition=Op.CALL(
-                    gas=Op.DUP8,
-                    address=Op.DUP8,
-                    value=Op.DUP5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMP
-            + Op.STOP
-            + Op.CODECOPY(dest_offset=0x4, offset=0xC8, size=0x40)
-            + Op.MLOAD(offset=0x4)
-            + Op.MLOAD(offset=0x24)
-            + Op.PUSH1[0x0]
-            + Op.SUB(Op.DUP3, 0x1)
-            + Op.SWAP2
-            + Op.POP
-            + Op.DUP2
-            + Op.PUSH1[0x0]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.JUMPI(pc=0x26, condition=Op.GT(Op.DUP3, 0x0))
-            + Op.JUMP(pc=0x4C)
-            + Op.JUMPDEST
-            + Op.CODECOPY(dest_offset=0x0, offset=0x5D, size=0x6B)
-            + Op.PUSH1[0x6B]
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP4),
-            )
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
-            + Op.PUSH1[0x20]
-            + Op.CREATE(value=0x0, offset=0x0, size=Op.ADD)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x1]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x5C, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.STOP
-            + Op.CODECOPY(dest_offset=0x4, offset=0x6B, size=0x40)
-            + Op.MLOAD(offset=0x4)
-            + Op.MLOAD(offset=0x24)
-            + Op.SUB(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.DUP1
-            + Op.PUSH1[0x0]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.JUMPI(pc=0x24, condition=Op.GT(Op.DUP2, 0x0))
-            + Op.JUMP(pc=0x5B)
-            + Op.JUMPDEST
-            + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP2)
-            + Op.PUSH4[0x820B13F6]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=0x0, value=Op.MUL(Op.EXP(0x2, 0xE0), Op.DUP3))
-            + Op.PUSH1[0x4]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP6)
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.DUP7
-            + Op.SUB(Op.GAS, 0x32)
-            + Op.JUMPI(pc=0x58, condition=Op.CALL)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x1]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x6A, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.STOP
-            + Op.CODECOPY(dest_offset=0x4, offset=0x6B, size=0x40)
-            + Op.MLOAD(offset=0x4)
-            + Op.MLOAD(offset=0x24)
-            + Op.SUB(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.DUP1
-            + Op.PUSH1[0x0]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.JUMPI(pc=0x24, condition=Op.GT(Op.DUP2, 0x0))
-            + Op.JUMP(pc=0x5B)
-            + Op.JUMPDEST
-            + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP2)
-            + Op.PUSH4[0x820B13F6]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=0x0, value=Op.MUL(Op.EXP(0x2, 0xE0), Op.DUP3))
-            + Op.PUSH1[0x4]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP6)
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.DUP7
-            + Op.SUB(Op.GAS, 0x32)
-            + Op.JUMPI(pc=0x58, condition=Op.CALL)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x1]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x6A, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.EXP(0x2, 0xE0)
+        + Op.SWAP1
+        + Op.DIV
+        + Op.JUMPI(pc=Op.PUSH2[0x21], condition=Op.EQ(0x820B13F6, Op.DUP1))
+        + Op.JUMPI(pc=Op.PUSH2[0x32], condition=Op.EQ(0xA444F5E9, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH2[0x2C]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.JUMP(pc=Op.PUSH2[0x93])
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x3D]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.JUMP(pc=Op.PUSH2[0x43])
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH20[0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87]
+        + Op.PUSH1[0x0]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.DUP2
+        + Op.PUSH1[0x1]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.CODECOPY(dest_offset=0x0, offset=0x1AD, size=0x6B)
+        + Op.PUSH1[0x6B]
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)),
+        )
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
+        + Op.PUSH1[0x20]
+        + Op.CREATE(value=0x0, offset=0x0, size=Op.ADD)
+        + Op.SWAP1
+        + Op.POP * 3
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.CODECOPY(dest_offset=0x0, offset=Op.PUSH2[0xE5], size=0xC8)
+        + Op.PUSH1[0xC8]
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)),
+        )
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
+        + Op.PUSH1[0x20]
+        + Op.CREATE(value=0x0, offset=0x0, size=Op.ADD)
+        + Op.SWAP1
+        + Op.POP
+        + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x2]
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xDD],
+            condition=Op.CALL(
+                gas=Op.DUP8,
+                address=Op.DUP8,
+                value=Op.DUP5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.JUMP
+        + Op.STOP
+        + Op.CODECOPY(dest_offset=0x4, offset=0xC8, size=0x40)
+        + Op.MLOAD(offset=0x4)
+        + Op.MLOAD(offset=0x24)
+        + Op.PUSH1[0x0]
+        + Op.SUB(Op.DUP3, 0x1)
+        + Op.SWAP2
+        + Op.POP
+        + Op.DUP2
+        + Op.PUSH1[0x0]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.JUMPI(pc=0x26, condition=Op.GT(Op.DUP3, 0x0))
+        + Op.JUMP(pc=0x4C)
+        + Op.JUMPDEST
+        + Op.CODECOPY(dest_offset=0x0, offset=0x5D, size=0x6B)
+        + Op.PUSH1[0x6B]
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP4),
+        )
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
+        + Op.PUSH1[0x20]
+        + Op.CREATE(value=0x0, offset=0x0, size=Op.ADD)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.POP * 3
+        + Op.PUSH1[0x1]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x5C, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP * 2
+        + Op.CODECOPY(dest_offset=0x4, offset=0x6B, size=0x40)
+        + Op.MLOAD(offset=0x4)
+        + Op.MLOAD(offset=0x24)
+        + Op.SUB(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.DUP1
+        + Op.PUSH1[0x0]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.JUMPI(pc=0x24, condition=Op.GT(Op.DUP2, 0x0))
+        + Op.JUMP(pc=0x5B)
+        + Op.JUMPDEST
+        + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP2)
+        + Op.PUSH4[0x820B13F6]
+        + Op.PUSH1[0x0] * 2
+        + Op.MSTORE(offset=0x0, value=Op.MUL(Op.EXP(0x2, 0xE0), Op.DUP3))
+        + Op.PUSH1[0x4]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP6)
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.PUSH1[0x0] * 2
+        + Op.DUP7
+        + Op.SUB(Op.GAS, 0x32)
+        + Op.JUMPI(pc=0x58, condition=Op.CALL)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.PUSH1[0x1]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x6A, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP * 2
+        + Op.CODECOPY(dest_offset=0x4, offset=0x6B, size=0x40)
+        + Op.MLOAD(offset=0x4)
+        + Op.MLOAD(offset=0x24)
+        + Op.SUB(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.DUP1
+        + Op.PUSH1[0x0]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.JUMPI(pc=0x24, condition=Op.GT(Op.DUP2, 0x0))
+        + Op.JUMP(pc=0x5B)
+        + Op.JUMPDEST
+        + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP2)
+        + Op.PUSH4[0x820B13F6]
+        + Op.PUSH1[0x0] * 2
+        + Op.MSTORE(offset=0x0, value=Op.MUL(Op.EXP(0x2, 0xE0), Op.DUP3))
+        + Op.PUSH1[0x4]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP6)
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.PUSH1[0x0] * 2
+        + Op.DUP7
+        + Op.SUB(Op.GAS, 0x32)
+        + Op.JUMPI(pc=0x58, condition=Op.CALL)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.PUSH1[0x1]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x6A, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP * 2,
         balance=0x314DC6448D9338C15B0A00000000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x1DCD6500)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "a444f5e90000000000000000000000000000000000000000000000000000000000000304"  # noqa: E501
-        ),
+        to=contract_0,
+        data=Bytes("a444f5e9") + Hash(0x304),
         gas_limit=300000,
         value=1,
     )
 
     post = {
-        contract: Account(
-            storage={
-                0: 0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87,
-                1: 772,
-            },
+        contract_0: Account(
+            storage={0: contract_0, 1: 772},
+            balance=0x314DC6448D9338C15B0A00000001,
+            nonce=1,
         ),
-        Address("0xd2571607e241ecf590ed94b12d87c94babe36db6"): Account(
-            storage={0: 771},
+        sender: Account(nonce=1),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={0: 771}, nonce=1
         ),
     }
 
diff --git a/tests/ported_static/stSolidityTest/test_recursive_create_contracts_create4_contracts.py b/tests/ported_static/stSolidityTest/test_recursive_create_contracts_create4_contracts.py
index 5ece96ff074..8c88bdf7583 100644
--- a/tests/ported_static/stSolidityTest/test_recursive_create_contracts_create4_contracts.py
+++ b/tests/ported_static/stSolidityTest/test_recursive_create_contracts_create4_contracts.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_recursive_create_contracts_create4_contracts.
 
 Ported from:
-tests/static/state_tests/stSolidityTest
-RecursiveCreateContractsCreate4ContractsFiller.json
+state_tests/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +25,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json",  # noqa: E501
+        "state_tests/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +34,10 @@ def test_recursive_create_contracts_create4_contracts(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_recursive_create_contracts_create4_contracts."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0x1DCD6500)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,256 +48,229 @@ def test_recursive_create_contracts_create4_contracts(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.EXP(0x2, 0xE0)
-            + Op.SWAP1
-            + Op.DIV
-            + Op.JUMPI(pc=Op.PUSH2[0x21], condition=Op.EQ(0x820B13F6, Op.DUP1))
-            + Op.JUMPI(pc=Op.PUSH2[0x32], condition=Op.EQ(0xA444F5E9, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH2[0x2C]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.JUMP(pc=Op.PUSH2[0x93])
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x3D]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.JUMP(pc=Op.PUSH2[0x43])
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH20[0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87]
-            + Op.PUSH1[0x0]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.DUP2
-            + Op.PUSH1[0x1]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.CODECOPY(dest_offset=0x0, offset=0x1AD, size=0x6B)
-            + Op.PUSH1[0x6B]
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=Op.AND(
-                    Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)
-                ),
-            )
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
-            + Op.PUSH1[0x20]
-            + Op.CREATE(value=0x0, offset=0x0, size=Op.ADD)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.CODECOPY(dest_offset=0x0, offset=Op.PUSH2[0xE5], size=0xC8)
-            + Op.PUSH1[0xC8]
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=Op.AND(
-                    Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)
-                ),
-            )
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
-            + Op.PUSH1[0x20]
-            + Op.CREATE(value=0x0, offset=0x0, size=Op.ADD)
-            + Op.SWAP1
-            + Op.POP
-            + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x2]
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xDD],
-                condition=Op.CALL(
-                    gas=Op.DUP8,
-                    address=Op.DUP8,
-                    value=Op.DUP5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMP
-            + Op.STOP
-            + Op.CODECOPY(dest_offset=0x4, offset=0xC8, size=0x40)
-            + Op.MLOAD(offset=0x4)
-            + Op.MLOAD(offset=0x24)
-            + Op.PUSH1[0x0]
-            + Op.SUB(Op.DUP3, 0x1)
-            + Op.SWAP2
-            + Op.POP
-            + Op.DUP2
-            + Op.PUSH1[0x0]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.JUMPI(pc=0x26, condition=Op.GT(Op.DUP3, 0x0))
-            + Op.JUMP(pc=0x4C)
-            + Op.JUMPDEST
-            + Op.CODECOPY(dest_offset=0x0, offset=0x5D, size=0x6B)
-            + Op.PUSH1[0x6B]
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP4),
-            )
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
-            + Op.PUSH1[0x20]
-            + Op.CREATE(value=0x0, offset=0x0, size=Op.ADD)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x1]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x5C, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.STOP
-            + Op.CODECOPY(dest_offset=0x4, offset=0x6B, size=0x40)
-            + Op.MLOAD(offset=0x4)
-            + Op.MLOAD(offset=0x24)
-            + Op.SUB(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.DUP1
-            + Op.PUSH1[0x0]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.JUMPI(pc=0x24, condition=Op.GT(Op.DUP2, 0x0))
-            + Op.JUMP(pc=0x5B)
-            + Op.JUMPDEST
-            + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP2)
-            + Op.PUSH4[0x820B13F6]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=0x0, value=Op.MUL(Op.EXP(0x2, 0xE0), Op.DUP3))
-            + Op.PUSH1[0x4]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP6)
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.DUP7
-            + Op.SUB(Op.GAS, 0x32)
-            + Op.JUMPI(pc=0x58, condition=Op.CALL)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x1]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x6A, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.STOP
-            + Op.CODECOPY(dest_offset=0x4, offset=0x6B, size=0x40)
-            + Op.MLOAD(offset=0x4)
-            + Op.MLOAD(offset=0x24)
-            + Op.SUB(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.DUP1
-            + Op.PUSH1[0x0]
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.JUMPI(pc=0x24, condition=Op.GT(Op.DUP2, 0x0))
-            + Op.JUMP(pc=0x5B)
-            + Op.JUMPDEST
-            + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP2)
-            + Op.PUSH4[0x820B13F6]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=0x0, value=Op.MUL(Op.EXP(0x2, 0xE0), Op.DUP3))
-            + Op.PUSH1[0x4]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP6)
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.DUP7
-            + Op.SUB(Op.GAS, 0x32)
-            + Op.JUMPI(pc=0x58, condition=Op.CALL)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x1]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x6A, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.EXP(0x2, 0xE0)
+        + Op.SWAP1
+        + Op.DIV
+        + Op.JUMPI(pc=Op.PUSH2[0x21], condition=Op.EQ(0x820B13F6, Op.DUP1))
+        + Op.JUMPI(pc=Op.PUSH2[0x32], condition=Op.EQ(0xA444F5E9, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH2[0x2C]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.JUMP(pc=Op.PUSH2[0x93])
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x3D]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.JUMP(pc=Op.PUSH2[0x43])
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH20[0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87]
+        + Op.PUSH1[0x0]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.DUP2
+        + Op.PUSH1[0x1]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.CODECOPY(dest_offset=0x0, offset=0x1AD, size=0x6B)
+        + Op.PUSH1[0x6B]
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)),
+        )
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
+        + Op.PUSH1[0x20]
+        + Op.CREATE(value=0x0, offset=0x0, size=Op.ADD)
+        + Op.SWAP1
+        + Op.POP * 3
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.CODECOPY(dest_offset=0x0, offset=Op.PUSH2[0xE5], size=0xC8)
+        + Op.PUSH1[0xC8]
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.SLOAD(key=0x0)),
+        )
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
+        + Op.PUSH1[0x20]
+        + Op.CREATE(value=0x0, offset=0x0, size=Op.ADD)
+        + Op.SWAP1
+        + Op.POP
+        + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x2]
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xDD],
+            condition=Op.CALL(
+                gas=Op.DUP8,
+                address=Op.DUP8,
+                value=Op.DUP5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.JUMP
+        + Op.STOP
+        + Op.CODECOPY(dest_offset=0x4, offset=0xC8, size=0x40)
+        + Op.MLOAD(offset=0x4)
+        + Op.MLOAD(offset=0x24)
+        + Op.PUSH1[0x0]
+        + Op.SUB(Op.DUP3, 0x1)
+        + Op.SWAP2
+        + Op.POP
+        + Op.DUP2
+        + Op.PUSH1[0x0]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.JUMPI(pc=0x26, condition=Op.GT(Op.DUP3, 0x0))
+        + Op.JUMP(pc=0x4C)
+        + Op.JUMPDEST
+        + Op.CODECOPY(dest_offset=0x0, offset=0x5D, size=0x6B)
+        + Op.PUSH1[0x6B]
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP4),
+        )
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
+        + Op.PUSH1[0x20]
+        + Op.CREATE(value=0x0, offset=0x0, size=Op.ADD)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.POP * 3
+        + Op.PUSH1[0x1]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x5C, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP * 2
+        + Op.CODECOPY(dest_offset=0x4, offset=0x6B, size=0x40)
+        + Op.MLOAD(offset=0x4)
+        + Op.MLOAD(offset=0x24)
+        + Op.SUB(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.DUP1
+        + Op.PUSH1[0x0]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.JUMPI(pc=0x24, condition=Op.GT(Op.DUP2, 0x0))
+        + Op.JUMP(pc=0x5B)
+        + Op.JUMPDEST
+        + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP2)
+        + Op.PUSH4[0x820B13F6]
+        + Op.PUSH1[0x0] * 2
+        + Op.MSTORE(offset=0x0, value=Op.MUL(Op.EXP(0x2, 0xE0), Op.DUP3))
+        + Op.PUSH1[0x4]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP6)
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.PUSH1[0x0] * 2
+        + Op.DUP7
+        + Op.SUB(Op.GAS, 0x32)
+        + Op.JUMPI(pc=0x58, condition=Op.CALL)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.PUSH1[0x1]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x6A, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP * 2
+        + Op.CODECOPY(dest_offset=0x4, offset=0x6B, size=0x40)
+        + Op.MLOAD(offset=0x4)
+        + Op.MLOAD(offset=0x24)
+        + Op.SUB(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.DUP1
+        + Op.PUSH1[0x0]
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.JUMPI(pc=0x24, condition=Op.GT(Op.DUP2, 0x0))
+        + Op.JUMP(pc=0x5B)
+        + Op.JUMPDEST
+        + Op.AND(Op.SUB(Op.EXP(0x2, 0xA0), 0x1), Op.DUP2)
+        + Op.PUSH4[0x820B13F6]
+        + Op.PUSH1[0x0] * 2
+        + Op.MSTORE(offset=0x0, value=Op.MUL(Op.EXP(0x2, 0xE0), Op.DUP3))
+        + Op.PUSH1[0x4]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP6)
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.PUSH1[0x0] * 2
+        + Op.DUP7
+        + Op.SUB(Op.GAS, 0x32)
+        + Op.JUMPI(pc=0x58, condition=Op.CALL)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.PUSH1[0x1]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x6A, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP * 2,
         balance=0x314DC6448D9338C15B0A00000000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x1DCD6500)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "a444f5e90000000000000000000000000000000000000000000000000000000000000004"  # noqa: E501
-        ),
+        to=contract_0,
+        data=Bytes("a444f5e9") + Hash(0x4),
         gas_limit=300000,
         value=1,
     )
 
     post = {
-        contract: Account(
-            storage={
-                0: 0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87,
-                1: 4,
-            },
-        ),
-        Address("0x2b25ae4b13cb6e06869f694d29de45e7614ebd97"): Account(
-            storage={0: 1},
+        contract_0: Account(storage={0: contract_0, 1: 4}, nonce=3),
+        compute_create_address(
+            address=compute_create_address(address=contract_0, nonce=1),
+            nonce=1,
+        ): Account(storage={0: 1}, nonce=1),
+        compute_create_address(address=contract_0, nonce=2): Account(
+            balance=2, nonce=1
         ),
-        Address("0xb88de88b35ecbf3c141e3caae2baf35834d18f63"): Account(
-            storage={0: 2},
+        sender: Account(nonce=1),
+        compute_create_address(address=contract_0, nonce=1): Account(
+            storage={0: 2}, balance=2, nonce=2
         ),
-        Address("0xd2571607e241ecf590ed94b12d87c94babe36db6"): Account(
-            storage={0: 3},
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={0: 3}, nonce=1
         ),
     }
 
diff --git a/tests/ported_static/stSolidityTest/test_test_block_and_transaction_properties.py b/tests/ported_static/stSolidityTest/test_test_block_and_transaction_properties.py
index 399e6d75932..0bcbd18e2f1 100644
--- a/tests/ported_static/stSolidityTest/test_test_block_and_transaction_properties.py
+++ b/tests/ported_static/stSolidityTest/test_test_block_and_transaction_properties.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_test_block_and_transaction_properties.
 
 Ported from:
-tests/static/state_tests/stSolidityTest
-TestBlockAndTransactionPropertiesFiller.json
+state_tests/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json",  # noqa: E501
+        "state_tests/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_test_block_and_transaction_properties(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA2333EEF5630066B928DEA5FD85A239F511B5B067D1441EE7AC290D0122B917B
-    )
+    """Test_test_block_and_transaction_properties."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,224 +45,212 @@ def test_test_block_and_transaction_properties(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0x5F5E100)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x40, value=0x60)
-            + Op.CALLDATALOAD(offset=0x0)
-            + Op.PUSH29[
-                0x100000000000000000000000000000000000000000000000000000000
-            ]
-            + Op.SWAP1
-            + Op.DIV
-            + Op.JUMPI(pc=Op.PUSH2[0x44], condition=Op.EQ(0xC0406226, Op.DUP1))
-            + Op.JUMPI(pc=Op.PUSH2[0x69], condition=Op.EQ(0xE97384DC, Op.DUP1))
-            + Op.JUMP(pc=Op.PUSH2[0x42])
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH2[0x51]
-            + Op.PUSH1[0x4]
-            + Op.POP(Op.DUP1)
-            + Op.POP
-            + Op.JUMP(pc=Op.PUSH2[0x8E])
-            + Op.JUMPDEST
-            + Op.MLOAD(offset=0x40)
-            + Op.DUP1
-            + Op.MSTORE(offset=Op.DUP2, value=Op.ISZERO(Op.ISZERO(Op.DUP3)))
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.SWAP2
-            + Op.POP
-            + Op.POP
-            + Op.MLOAD(offset=0x40)
-            + Op.DUP1
-            + Op.SWAP2
-            + Op.SUB
-            + Op.SWAP1
-            + Op.RETURN
-            + Op.JUMPDEST
-            + Op.PUSH2[0x76]
-            + Op.PUSH1[0x4]
-            + Op.POP(Op.DUP1)
-            + Op.POP
-            + Op.JUMP(pc=Op.PUSH2[0xC9])
-            + Op.JUMPDEST
-            + Op.MLOAD(offset=0x40)
-            + Op.DUP1
-            + Op.MSTORE(offset=Op.DUP2, value=Op.ISZERO(Op.ISZERO(Op.DUP3)))
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.SWAP2
-            + Op.POP
-            + Op.POP
-            + Op.MLOAD(offset=0x40)
-            + Op.DUP1
-            + Op.SWAP2
-            + Op.SUB
-            + Op.SWAP1
-            + Op.RETURN
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH2[0x98]
-            + Op.JUMP(pc=Op.PUSH2[0xC9])
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.EXP(0x100, 0x0)
-            + Op.AND(Op.NOT(Op.MUL(0xFF, Op.DUP2)), Op.SLOAD(key=Op.DUP2))
-            + Op.SWAP1
-            + Op.OR(Op.MUL, Op.DUP4)
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.SLOAD
-            + Op.SWAP1
-            + Op.PUSH2[0x100]
-            + Op.EXP
-            + Op.SWAP1
-            + Op.AND(0xFF, Op.DIV)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=Op.PUSH2[0xC6])
-            + Op.JUMPDEST
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x1]
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP(Op.DUP1)
-            + Op.JUMPI(
-                pc=0x10D,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.EQ(
-                            Op.AND(
-                                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                                Op.COINBASE,
-                            ),
-                            0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA,
+    # Source: raw
+    # 0x60606040526000357c010000000000000000000000000000000000000000000000000000000090048063c040622614610044578063e97384dc1461006957610042565b005b610051600480505061008e565b60405180821515815260200191505060405180910390f35b61007660048050506100c9565b60405180821515815260200191505060405180910390f35b60006100986100c9565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff1690506100c6565b90565b6000600190508050732adc25665018aa1fe0e6bc666dac8fc2697ff9ba4173ffffffffffffffffffffffffffffffffffffffff1614151561010d57600090506101f7565b6302b8feb04414151561012357600090506101f7565b677fffffffffffffff4514151561013d57600090506101f7565b60784314151561015057600090506101f7565b6078405042505a5073<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>3373ffffffffffffffffffffffffffffffffffffffff1614151561019457600090506101f7565b6064341415156101a757600090506101f7565b60013a1415156101ba57600090506101f7565b73<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>3273ffffffffffffffffffffffffffffffffffffffff161415156101f657600090506101f7565b5b9056  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x40, value=0x60)
+        + Op.CALLDATALOAD(offset=0x0)
+        + Op.PUSH29[
+            0x100000000000000000000000000000000000000000000000000000000
+        ]
+        + Op.SWAP1
+        + Op.DIV
+        + Op.JUMPI(pc=Op.PUSH2[0x44], condition=Op.EQ(0xC0406226, Op.DUP1))
+        + Op.JUMPI(pc=Op.PUSH2[0x69], condition=Op.EQ(0xE97384DC, Op.DUP1))
+        + Op.JUMP(pc=Op.PUSH2[0x42])
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH2[0x51]
+        + Op.PUSH1[0x4]
+        + Op.POP(Op.DUP1)
+        + Op.POP
+        + Op.JUMP(pc=Op.PUSH2[0x8E])
+        + Op.JUMPDEST
+        + Op.MLOAD(offset=0x40)
+        + Op.DUP1
+        + Op.MSTORE(offset=Op.DUP2, value=Op.ISZERO(Op.ISZERO(Op.DUP3)))
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.SWAP2
+        + Op.POP * 2
+        + Op.MLOAD(offset=0x40)
+        + Op.DUP1
+        + Op.SWAP2
+        + Op.SUB
+        + Op.SWAP1
+        + Op.RETURN
+        + Op.JUMPDEST
+        + Op.PUSH2[0x76]
+        + Op.PUSH1[0x4]
+        + Op.POP(Op.DUP1)
+        + Op.POP
+        + Op.JUMP(pc=Op.PUSH2[0xC9])
+        + Op.JUMPDEST
+        + Op.MLOAD(offset=0x40)
+        + Op.DUP1
+        + Op.MSTORE(offset=Op.DUP2, value=Op.ISZERO(Op.ISZERO(Op.DUP3)))
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.SWAP2
+        + Op.POP * 2
+        + Op.MLOAD(offset=0x40)
+        + Op.DUP1
+        + Op.SWAP2
+        + Op.SUB
+        + Op.SWAP1
+        + Op.RETURN
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH2[0x98]
+        + Op.JUMP(pc=Op.PUSH2[0xC9])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.EXP(0x100, 0x0)
+        + Op.AND(Op.NOT(Op.MUL(0xFF, Op.DUP2)), Op.SLOAD(key=Op.DUP2))
+        + Op.SWAP1
+        + Op.OR(Op.MUL, Op.DUP4)
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.PUSH1[0x0] * 2
+        + Op.SWAP1
+        + Op.SLOAD
+        + Op.SWAP1
+        + Op.PUSH2[0x100]
+        + Op.EXP
+        + Op.SWAP1
+        + Op.AND(0xFF, Op.DIV)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=Op.PUSH2[0xC6])
+        + Op.JUMPDEST
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x1]
+        + Op.SWAP1
+        + Op.POP
+        + Op.POP(Op.DUP1)
+        + Op.JUMPI(
+            pc=0x10D,
+            condition=Op.ISZERO(
+                Op.ISZERO(
+                    Op.EQ(
+                        Op.AND(
+                            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                            Op.COINBASE,
                         ),
-                    ),
-                ),
-            )
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1F7)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x123,
-                condition=Op.ISZERO(
-                    Op.ISZERO(Op.EQ(Op.PREVRANDAO, 0x2B8FEB0))
-                ),
-            )
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1F7)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x13D,
-                condition=Op.ISZERO(
-                    Op.ISZERO(Op.EQ(Op.GASLIMIT, 0x7FFFFFFFFFFFFFFF)),
-                ),
-            )
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1F7)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x150,
-                condition=Op.ISZERO(Op.ISZERO(Op.EQ(Op.NUMBER, 0x78))),
-            )
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1F7)
-            + Op.JUMPDEST
-            + Op.POP(Op.BLOCKHASH(block_number=0x78))
-            + Op.POP(Op.TIMESTAMP)
-            + Op.POP(Op.GAS)
-            + Op.JUMPI(
-                pc=0x194,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.EQ(
-                            Op.AND(
-                                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                                Op.CALLER,
-                            ),
-                            0x7F3F285918D9B5E764174551E10B7539B97BBB27,
+                        coinbase,
+                    )
+                )
+            ),
+        )
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1F7)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x123,
+            condition=Op.ISZERO(Op.ISZERO(Op.EQ(Op.PREVRANDAO, 0x2B8FEB0))),
+        )
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1F7)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x13D,
+            condition=Op.ISZERO(
+                Op.ISZERO(Op.EQ(Op.GASLIMIT, 0x7FFFFFFFFFFFFFFF))
+            ),
+        )
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1F7)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x150, condition=Op.ISZERO(Op.ISZERO(Op.EQ(Op.NUMBER, 0x78)))
+        )
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1F7)
+        + Op.JUMPDEST
+        + Op.POP(Op.BLOCKHASH(block_number=0x78))
+        + Op.POP(Op.TIMESTAMP)
+        + Op.POP(Op.GAS)
+        + Op.JUMPI(
+            pc=0x194,
+            condition=Op.ISZERO(
+                Op.ISZERO(
+                    Op.EQ(
+                        Op.AND(
+                            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                            Op.CALLER,
                         ),
-                    ),
-                ),
-            )
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1F7)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1A7,
-                condition=Op.ISZERO(Op.ISZERO(Op.EQ(Op.CALLVALUE, 0x64))),
-            )
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1F7)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1BA,
-                condition=Op.ISZERO(Op.ISZERO(Op.EQ(Op.GASPRICE, 0x1))),
-            )
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1F7)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1F6,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.EQ(
-                            Op.AND(
-                                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                                Op.ORIGIN,
-                            ),
-                            0x7F3F285918D9B5E764174551E10B7539B97BBB27,
+                        sender,
+                    )
+                )
+            ),
+        )
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1F7)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1A7, condition=Op.ISZERO(Op.ISZERO(Op.EQ(Op.CALLVALUE, 0x64)))
+        )
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1F7)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1BA, condition=Op.ISZERO(Op.ISZERO(Op.EQ(Op.GASPRICE, 0x1)))
+        )
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1F7)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1F6,
+            condition=Op.ISZERO(
+                Op.ISZERO(
+                    Op.EQ(
+                        Op.AND(
+                            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                            Op.ORIGIN,
                         ),
-                    ),
-                ),
-            )
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1F7)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.SWAP1
-            + Op.JUMP
-        ),
+                        sender,
+                    )
+                )
+            ),
+        )
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1F7)
+        + Op.JUMPDEST * 2
+        + Op.SWAP1
+        + Op.JUMP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0xad24d212286ab785efe98ab6f5a3ecde73054ee5"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("c0406226"),
+        to=target,
+        data=Bytes("c0406226"),
         gas_limit=350000,
         value=100,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSolidityTest/test_test_contract_interaction.py b/tests/ported_static/stSolidityTest/test_test_contract_interaction.py
index 57704d07598..0bcc63132a1 100644
--- a/tests/ported_static/stSolidityTest/test_test_contract_interaction.py
+++ b/tests/ported_static/stSolidityTest/test_test_contract_interaction.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_test_contract_interaction.
 
 Ported from:
-tests/static/state_tests/stSolidityTest/TestContractInteractionFiller.json
+state_tests/stSolidityTest/TestContractInteractionFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSolidityTest/TestContractInteractionFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSolidityTest/TestContractInteractionFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_test_contract_interaction(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA2333EEF5630066B928DEA5FD85A239F511B5B067D1441EE7AC290D0122B917B
-    )
+    """Test_test_contract_interaction."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,144 +43,132 @@ def test_test_contract_interaction(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(pc=Op.PUSH2[0x39], condition=Op.EQ(Op.DUP2, 0xC0406226))
-            + Op.JUMPI(pc=Op.PUSH2[0x4B], condition=Op.EQ(0xED973FE9, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH2[0x41]
-            + Op.JUMP(pc=Op.PUSH2[0xEA])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x53]
-            + Op.JUMP(pc=Op.PUSH2[0x5D])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x11A, size=0x81)
-            + Op.CREATE(value=0x0, offset=0x0, size=0x81)
-            + Op.SWAP1
-            + Op.POP
-            + Op.AND(Op.DUP2, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.PUSH4[0xB9C3D0A5]
-            + Op.PUSH1[0x20]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=0xB9C3D0A500000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.PUSH1[0x4]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.DUP7
-            + Op.SUB(Op.GAS, 0x32)
-            + Op.JUMPI(pc=Op.PUSH2[0xC7], condition=Op.CALL)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xD8],
-                condition=Op.EQ(0xE1, Op.MLOAD(offset=0x0)),
-            )
-            + Op.JUMP(pc=Op.PUSH2[0xE1])
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.SWAP2
-            + Op.POP
-            + Op.JUMP(pc=Op.PUSH2[0xE6])
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH2[0xF4]
-            + Op.JUMP(pc=Op.PUSH2[0x5D])
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.EXP(0x100, 0x0)
-            + Op.AND(Op.NOT(Op.MUL(0xFF, Op.DUP2)), Op.SLOAD(key=Op.DUP2))
-            + Op.SWAP1
-            + Op.OR(Op.MUL, Op.DUP4)
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.AND(Op.DIV(Op.SLOAD(key=0x0), 0x1), 0xFF)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.STOP
-            + Op.PUSH1[0x75]
-            + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(pc=0x36, condition=Op.EQ(Op.DUP2, 0xF55D9D))
-            + Op.JUMPI(pc=0x45, condition=Op.EQ(0xB9C3D0A5, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x3F]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.JUMP(pc=0x55)
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x4B]
-            + Op.JUMP(pc=0x70)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.SELFDESTRUCT(
-                address=Op.AND(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0xE1]
-            + Op.SWAP1
-            + Op.JUMP
-        ),
+    # Source: raw
+    # 0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114610039578063ed973fe91461004b57005b6100416100ea565b8060005260206000f35b61005361005d565b8060005260206000f35b60006000608161011a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f16100c757005b505060005160e1146100d8576100e1565b600191506100e6565b600091505b5090565b60006100f461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f6004356055565b60006000f35b604b6070565b8060005260206000f35b8073ffffffffffffffffffffffffffffffffffffffff16ff50565b60e19056  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.JUMPI(pc=Op.PUSH2[0x39], condition=Op.EQ(Op.DUP2, 0xC0406226))
+        + Op.JUMPI(pc=Op.PUSH2[0x4B], condition=Op.EQ(0xED973FE9, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH2[0x41]
+        + Op.JUMP(pc=Op.PUSH2[0xEA])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x53]
+        + Op.JUMP(pc=Op.PUSH2[0x5D])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0] * 2
+        + Op.CODECOPY(dest_offset=0x0, offset=0x11A, size=0x81)
+        + Op.CREATE(value=0x0, offset=0x0, size=0x81)
+        + Op.SWAP1
+        + Op.POP
+        + Op.AND(Op.DUP2, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.PUSH4[0xB9C3D0A5]
+        + Op.PUSH1[0x20]
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=0xB9C3D0A500000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x0] * 2
+        + Op.DUP7
+        + Op.SUB(Op.GAS, 0x32)
+        + Op.JUMPI(pc=Op.PUSH2[0xC7], condition=Op.CALL)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xD8], condition=Op.EQ(0xE1, Op.MLOAD(offset=0x0))
+        )
+        + Op.JUMP(pc=Op.PUSH2[0xE1])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.SWAP2
+        + Op.POP
+        + Op.JUMP(pc=Op.PUSH2[0xE6])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH2[0xF4]
+        + Op.JUMP(pc=Op.PUSH2[0x5D])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.EXP(0x100, 0x0)
+        + Op.AND(Op.NOT(Op.MUL(0xFF, Op.DUP2)), Op.SLOAD(key=Op.DUP2))
+        + Op.SWAP1
+        + Op.OR(Op.MUL, Op.DUP4)
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.AND(Op.DIV(Op.SLOAD(key=0x0), 0x1), 0xFF)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.STOP
+        + Op.PUSH1[0x75]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP
+        + Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.JUMPI(pc=0x36, condition=Op.EQ(Op.DUP2, 0xF55D9D))
+        + Op.JUMPI(pc=0x45, condition=Op.EQ(0xB9C3D0A5, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x3F]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.JUMP(pc=0x55)
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x4B]
+        + Op.JUMP(pc=0x70)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.SELFDESTRUCT(
+            address=Op.AND(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.DUP1)
+        )
+        + Op.POP
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0xE1]
+        + Op.SWAP1
+        + Op.JUMP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x087dfec56d6da95fd3a1bcf8ccf995ee51645950"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("c0406226"),
+        to=target,
+        data=Bytes("c0406226"),
         gas_limit=350000,
         value=1,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1}, nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSolidityTest/test_test_contract_suicide.py b/tests/ported_static/stSolidityTest/test_test_contract_suicide.py
index fe5253f7799..1dd26ffea76 100644
--- a/tests/ported_static/stSolidityTest/test_test_contract_suicide.py
+++ b/tests/ported_static/stSolidityTest/test_test_contract_suicide.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_test_contract_suicide.
 
 Ported from:
-tests/static/state_tests/stSolidityTest/TestContractSuicideFiller.json
+state_tests/stSolidityTest/TestContractSuicideFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSolidityTest/TestContractSuicideFiller.json"],
+    ["state_tests/stSolidityTest/TestContractSuicideFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_test_contract_suicide(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA2333EEF5630066B928DEA5FD85A239F511B5B067D1441EE7AC290D0122B917B
-    )
+    """Test_test_contract_suicide."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,168 +43,154 @@ def test_test_contract_suicide(
         gas_limit=100000000,
     )
 
-    pre[sender] = Account(balance=0x5F5E100)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(pc=Op.PUSH2[0x39], condition=Op.EQ(Op.DUP2, 0xA60EEDDA))
-            + Op.JUMPI(pc=Op.PUSH2[0x4B], condition=Op.EQ(0xC0406226, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH2[0x41]
-            + Op.JUMP(pc=Op.PUSH2[0x5D])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x53]
-            + Op.JUMP(pc=0x15A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.CODECOPY(dest_offset=0x0, offset=0x18A, size=0x81)
-            + Op.CREATE(value=0x0, offset=0x0, size=0x81)
-            + Op.SWAP1
-            + Op.POP
-            + Op.AND(Op.DUP2, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.PUSH3[0xF55D9D]
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.MSTORE(
-                offset=Op.DUP3,
-                value=0xF55D9D00000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.PUSH1[0x4]
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=Op.AND(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    Op.COINBASE,
-                ),
-            )
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.DUP7
-            + Op.SUB(Op.GAS, 0x32)
-            + Op.JUMPI(pc=Op.PUSH2[0xE0], condition=Op.CALL)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.AND(Op.DUP2, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.PUSH4[0xB9C3D0A5]
-            + Op.PUSH1[0x20]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=0xB9C3D0A500000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.PUSH1[0x4]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.DUP7
-            + Op.SUB(Op.GAS, 0x32)
-            + Op.JUMPI(pc=0x137, condition=Op.CALL)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.JUMPI(pc=0x148, condition=Op.EQ(0xE1, Op.MLOAD(offset=0x0)))
-            + Op.JUMP(pc=0x151)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.SWAP2
-            + Op.POP
-            + Op.JUMP(pc=0x156)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH2[0x164]
-            + Op.JUMP(pc=Op.PUSH2[0x5D])
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.EXP(0x100, 0x0)
-            + Op.AND(Op.NOT(Op.MUL(0xFF, Op.DUP2)), Op.SLOAD(key=Op.DUP2))
-            + Op.SWAP1
-            + Op.OR(Op.MUL, Op.DUP4)
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.AND(Op.DIV(Op.SLOAD(key=0x0), 0x1), 0xFF)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.STOP
-            + Op.PUSH1[0x75]
-            + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.RETURN
-            + Op.STOP
-            + Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(pc=0x36, condition=Op.EQ(Op.DUP2, 0xF55D9D))
-            + Op.JUMPI(pc=0x45, condition=Op.EQ(0xB9C3D0A5, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x3F]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.JUMP(pc=0x5A)
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x4B]
-            + Op.JUMP(pc=0x55)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0xE1]
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.SELFDESTRUCT(
-                address=Op.AND(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.JUMP
-        ),
+    # Source: raw
+    # 0x7c01000000000000000000000000000000000000000000000000000000006000350463a60eedda8114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361015a565b8060005260206000f35b60006000608161018a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811662f55d9d6000807ef55d9d00000000000000000000000000000000000000000000000000000000825260044173ffffffffffffffffffffffffffffffffffffffff168152602001600060008660325a03f16100e057005b505073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f161013757005b505060005160e11461014857610151565b60019150610156565b600091505b5090565b600061016461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f600435605a565b60006000f35b604b6055565b8060005260206000f35b60e190565b8073ffffffffffffffffffffffffffffffffffffffff16ff5056  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.JUMPI(pc=Op.PUSH2[0x39], condition=Op.EQ(Op.DUP2, 0xA60EEDDA))
+        + Op.JUMPI(pc=Op.PUSH2[0x4B], condition=Op.EQ(0xC0406226, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH2[0x41]
+        + Op.JUMP(pc=Op.PUSH2[0x5D])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x53]
+        + Op.JUMP(pc=0x15A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0] * 2
+        + Op.CODECOPY(dest_offset=0x0, offset=0x18A, size=0x81)
+        + Op.CREATE(value=0x0, offset=0x0, size=0x81)
+        + Op.SWAP1
+        + Op.POP
+        + Op.AND(Op.DUP2, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.PUSH3[0xF55D9D]
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.MSTORE(
+            offset=Op.DUP3,
+            value=0xF55D9D00000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.PUSH1[0x4]
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=Op.AND(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.COINBASE
+            ),
+        )
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.PUSH1[0x0] * 2
+        + Op.DUP7
+        + Op.SUB(Op.GAS, 0x32)
+        + Op.JUMPI(pc=Op.PUSH2[0xE0], condition=Op.CALL)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.AND(Op.DUP2, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.PUSH4[0xB9C3D0A5]
+        + Op.PUSH1[0x20]
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=0xB9C3D0A500000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x0] * 2
+        + Op.DUP7
+        + Op.SUB(Op.GAS, 0x32)
+        + Op.JUMPI(pc=0x137, condition=Op.CALL)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.JUMPI(pc=0x148, condition=Op.EQ(0xE1, Op.MLOAD(offset=0x0)))
+        + Op.JUMP(pc=0x151)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.SWAP2
+        + Op.POP
+        + Op.JUMP(pc=0x156)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH2[0x164]
+        + Op.JUMP(pc=Op.PUSH2[0x5D])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.EXP(0x100, 0x0)
+        + Op.AND(Op.NOT(Op.MUL(0xFF, Op.DUP2)), Op.SLOAD(key=Op.DUP2))
+        + Op.SWAP1
+        + Op.OR(Op.MUL, Op.DUP4)
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.AND(Op.DIV(Op.SLOAD(key=0x0), 0x1), 0xFF)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.STOP
+        + Op.PUSH1[0x75]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP
+        + Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.JUMPI(pc=0x36, condition=Op.EQ(Op.DUP2, 0xF55D9D))
+        + Op.JUMPI(pc=0x45, condition=Op.EQ(0xB9C3D0A5, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x3F]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.JUMP(pc=0x5A)
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x4B]
+        + Op.JUMP(pc=0x55)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0xE1]
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.SELFDESTRUCT(
+            address=Op.AND(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.DUP1)
+        )
+        + Op.POP
+        + Op.JUMP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0xfe34831df57f026afbfffd7e7b51b4adbfe135e1"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("c0406226"),
+        to=target,
+        data=Bytes("c0406226"),
         gas_limit=350000,
         value=1,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1}, nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSolidityTest/test_test_cryptographic_functions.py b/tests/ported_static/stSolidityTest/test_test_cryptographic_functions.py
index 4f2ddd648b1..deec53219f6 100644
--- a/tests/ported_static/stSolidityTest/test_test_cryptographic_functions.py
+++ b/tests/ported_static/stSolidityTest/test_test_cryptographic_functions.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_test_cryptographic_functions.
 
 Ported from:
-tests/static/state_tests/stSolidityTest/TestCryptographicFunctionsFiller.json
+state_tests/stSolidityTest/TestCryptographicFunctionsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSolidityTest/TestCryptographicFunctionsFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSolidityTest/TestCryptographicFunctionsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -33,11 +31,10 @@ def test_test_cryptographic_functions(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_test_cryptographic_functions."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0x12A05F200)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,223 +45,209 @@ def test_test_cryptographic_functions(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.PUSH29[
-                0x100000000000000000000000000000000000000000000000000000000
-            ]
-            + Op.SWAP1
-            + Op.DIV
-            + Op.JUMPI(pc=Op.PUSH2[0x3A], condition=Op.EQ(0xC0406226, Op.DUP1))
-            + Op.JUMPI(pc=Op.PUSH2[0x4C], condition=Op.EQ(0xE0A9FD28, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH2[0x42]
-            + Op.JUMP(pc=Op.PUSH2[0x5E])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x54]
-            + Op.JUMP(pc=Op.PUSH2[0x99])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH2[0x68]
-            + Op.JUMP(pc=Op.PUSH2[0x99])
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.EXP(0x100, 0x0)
-            + Op.AND(Op.NOT(Op.MUL(0xFF, Op.DUP2)), Op.SLOAD(key=Op.DUP2))
-            + Op.SWAP1
-            + Op.OR(Op.MUL, Op.DUP4)
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.SLOAD
-            + Op.SWAP1
-            + Op.PUSH2[0x100]
-            + Op.EXP
-            + Op.SWAP1
-            + Op.AND(0xFF, Op.DIV)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=Op.PUSH2[0x96])
-            + Op.JUMPDEST
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x1]
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP(Op.DUP1)
-            + Op.MUL(
+    # Source: raw
+    # 0x6000357c010000000000000000000000000000000000000000000000000000000090048063c04062261461003a578063e0a9fd281461004c57005b61004261005e565b8060005260206000f35b610054610099565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006001905080507f43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d60010260407f74657374737472696e67000000000000000000000000000000000000000000008152600a016040900360402014156100ff57610108565b600090506102ec565b7f3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d11160010260026020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f161016b57005b50600051141561017a57610183565b600090506102ec565b73cd566972b5e50104011a92b59fa8e0b1234851ae6c010000000000000000000000000260036020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f16101e657005b506000516c010000000000000000000000000214156102045761020d565b600090506102ec565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b60016020600060007f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6001028152602001601c81526020017f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f60010281526020017feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549600102815260200160006000856161da5a03f16102bd57005b5060005173ffffffffffffffffffffffffffffffffffffffff1614156102e2576102eb565b600090506102ec565b5b9056  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.PUSH29[
+            0x100000000000000000000000000000000000000000000000000000000
+        ]
+        + Op.SWAP1
+        + Op.DIV
+        + Op.JUMPI(pc=Op.PUSH2[0x3A], condition=Op.EQ(0xC0406226, Op.DUP1))
+        + Op.JUMPI(pc=Op.PUSH2[0x4C], condition=Op.EQ(0xE0A9FD28, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH2[0x42]
+        + Op.JUMP(pc=Op.PUSH2[0x5E])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x54]
+        + Op.JUMP(pc=Op.PUSH2[0x99])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH2[0x68]
+        + Op.JUMP(pc=Op.PUSH2[0x99])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.EXP(0x100, 0x0)
+        + Op.AND(Op.NOT(Op.MUL(0xFF, Op.DUP2)), Op.SLOAD(key=Op.DUP2))
+        + Op.SWAP1
+        + Op.OR(Op.MUL, Op.DUP4)
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.PUSH1[0x0] * 2
+        + Op.SWAP1
+        + Op.SLOAD
+        + Op.SWAP1
+        + Op.PUSH2[0x100]
+        + Op.EXP
+        + Op.SWAP1
+        + Op.AND(0xFF, Op.DIV)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=Op.PUSH2[0x96])
+        + Op.JUMPDEST
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x1]
+        + Op.SWAP1
+        + Op.POP
+        + Op.POP(Op.DUP1)
+        + Op.MUL(
+            0x1,
+            0x43C4B4524ADB81E4E9A5C4648A98E9D320E3908AC5B6C889144B642CD08AE16D,
+        )
+        + Op.PUSH1[0x40]
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=0x74657374737472696E6700000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.PUSH1[0xA]
+        + Op.ADD
+        + Op.PUSH1[0x40]
+        + Op.SWAP1
+        + Op.SHA3(offset=0x40, size=Op.SUB)
+        + Op.JUMPI(pc=Op.PUSH2[0xFF], condition=Op.ISZERO(Op.EQ))
+        + Op.JUMP(pc=0x108)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x2EC)
+        + Op.JUMPDEST
+        + Op.MUL(
+            0x1,
+            0x3C8727E019A42B444667A587B6001251BECADABBB36BFED8087A92C18882D111,
+        )
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x20]
+        + Op.PUSH1[0x0] * 2
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=0x74657374737472696E6700000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.PUSH1[0xA]
+        + Op.ADD
+        + Op.PUSH1[0x0] * 2
+        + Op.DUP6
+        + Op.SUB(Op.GAS, 0x61DA)
+        + Op.JUMPI(pc=0x16B, condition=Op.CALL)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.MLOAD(offset=0x0)
+        + Op.JUMPI(pc=0x17A, condition=Op.ISZERO(Op.EQ))
+        + Op.JUMP(pc=0x183)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x2EC)
+        + Op.JUMPDEST
+        + Op.MUL(
+            0x1000000000000000000000000,
+            0xCD566972B5E50104011A92B59FA8E0B1234851AE,
+        )
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x20]
+        + Op.PUSH1[0x0] * 2
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=0x74657374737472696E6700000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.PUSH1[0xA]
+        + Op.ADD
+        + Op.PUSH1[0x0] * 2
+        + Op.DUP6
+        + Op.SUB(Op.GAS, 0x61DA)
+        + Op.JUMPI(pc=0x1E6, condition=Op.CALL)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.MUL(0x1000000000000000000000000, Op.MLOAD(offset=0x0))
+        + Op.JUMPI(pc=0x204, condition=Op.ISZERO(Op.EQ))
+        + Op.JUMP(pc=0x20D)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x2EC)
+        + Op.JUMPDEST
+        + Op.PUSH20[0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B]
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x20]
+        + Op.PUSH1[0x0] * 2
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=Op.MUL(
+                0x1,
+                0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+            ),
+        )
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.MSTORE(offset=Op.DUP2, value=0x1C)
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=Op.MUL(
                 0x1,
-                0x43C4B4524ADB81E4E9A5C4648A98E9D320E3908AC5B6C889144B642CD08AE16D,  # noqa: E501
-            )
-            + Op.PUSH1[0x40]
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=0x74657374737472696E6700000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.PUSH1[0xA]
-            + Op.ADD
-            + Op.PUSH1[0x40]
-            + Op.SWAP1
-            + Op.SHA3(offset=0x40, size=Op.SUB)
-            + Op.JUMPI(pc=Op.PUSH2[0xFF], condition=Op.ISZERO(Op.EQ))
-            + Op.JUMP(pc=0x108)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x2EC)
-            + Op.JUMPDEST
-            + Op.MUL(
+                0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+            ),
+        )
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=Op.MUL(
                 0x1,
-                0x3C8727E019A42B444667A587B6001251BECADABBB36BFED8087A92C18882D111,  # noqa: E501
-            )
-            + Op.PUSH1[0x2]
-            + Op.PUSH1[0x20]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=0x74657374737472696E6700000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.PUSH1[0xA]
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.DUP6
-            + Op.SUB(Op.GAS, 0x61DA)
-            + Op.JUMPI(pc=0x16B, condition=Op.CALL)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.MLOAD(offset=0x0)
-            + Op.JUMPI(pc=0x17A, condition=Op.ISZERO(Op.EQ))
-            + Op.JUMP(pc=0x183)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x2EC)
-            + Op.JUMPDEST
-            + Op.MUL(
-                0x1000000000000000000000000,
-                0xCD566972B5E50104011A92B59FA8E0B1234851AE,
-            )
-            + Op.PUSH1[0x3]
-            + Op.PUSH1[0x20]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=0x74657374737472696E6700000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.PUSH1[0xA]
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.DUP6
-            + Op.SUB(Op.GAS, 0x61DA)
-            + Op.JUMPI(pc=0x1E6, condition=Op.CALL)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.MUL(0x1000000000000000000000000, Op.MLOAD(offset=0x0))
-            + Op.JUMPI(pc=0x204, condition=Op.ISZERO(Op.EQ))
-            + Op.JUMP(pc=0x20D)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x2EC)
-            + Op.JUMPDEST
-            + Op.PUSH20[0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B]
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x20]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=Op.MUL(
-                    0x1,
-                    0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-                ),
-            )
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.MSTORE(offset=Op.DUP2, value=0x1C)
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=Op.MUL(
-                    0x1,
-                    0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-                ),
-            )
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=Op.MUL(
-                    0x1,
-                    0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-                ),
-            )
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.DUP6
-            + Op.SUB(Op.GAS, 0x61DA)
-            + Op.JUMPI(pc=0x2BD, condition=Op.CALL)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.AND(
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                Op.MLOAD(offset=0x0),
-            )
-            + Op.JUMPI(pc=0x2E2, condition=Op.ISZERO(Op.EQ))
-            + Op.JUMP(pc=0x2EB)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x2EC)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.SWAP1
-            + Op.JUMP
-        ),
+                0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+            ),
+        )
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.PUSH1[0x0] * 2
+        + Op.DUP6
+        + Op.SUB(Op.GAS, 0x61DA)
+        + Op.JUMPI(pc=0x2BD, condition=Op.CALL)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.AND(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.MLOAD(offset=0x0)
+        )
+        + Op.JUMPI(pc=0x2E2, condition=Op.ISZERO(Op.EQ))
+        + Op.JUMP(pc=0x2EB)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x2EC)
+        + Op.JUMPDEST * 2
+        + Op.SWAP1
+        + Op.JUMP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x12A05F200)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("c0406226"),
+        to=contract_0,
+        data=Bytes("c0406226"),
         gas_limit=35000000,
         value=100,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {contract_0: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSolidityTest/test_test_keywords.py b/tests/ported_static/stSolidityTest/test_test_keywords.py
index 3784b21cc5e..5772cd6d269 100644
--- a/tests/ported_static/stSolidityTest/test_test_keywords.py
+++ b/tests/ported_static/stSolidityTest/test_test_keywords.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_test_keywords.
 
 Ported from:
-tests/static/state_tests/stSolidityTest/TestKeywordsFiller.json
+state_tests/stSolidityTest/TestKeywordsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSolidityTest/TestKeywordsFiller.json"],
+    ["state_tests/stSolidityTest/TestKeywordsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_test_keywords(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA2333EEF5630066B928DEA5FD85A239F511B5B067D1441EE7AC290D0122B917B
-    )
+    """Test_test_keywords."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,121 +43,113 @@ def test_test_keywords(
         gas_limit=100000000,
     )
 
-    pre[sender] = Account(balance=0x5F5E100)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(pc=0x37, condition=Op.EQ(Op.DUP2, 0x380E4396))
-            + Op.JUMPI(pc=0x47, condition=Op.EQ(0xC0406226, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x3D]
-            + Op.JUMP(pc=0x84)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x4D]
-            + Op.JUMP(pc=0x57)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x5F]
-            + Op.JUMP(pc=0x84)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.EXP(0x100, 0x0)
-            + Op.AND(Op.NOT(Op.MUL(0xFF, Op.DUP2)), Op.SLOAD(key=Op.DUP2))
-            + Op.SWAP1
-            + Op.OR(Op.MUL, Op.DUP4)
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.AND(Op.DIV(Op.SLOAD(key=0x0), 0x1), 0xFF)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.DUP2
-            + Op.JUMPI(pc=0xCD, condition=Op.ISZERO(0x1))
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0xA1, condition=Op.ISZERO(Op.SLT(Op.DUP3, 0xA)))
-            + Op.PUSH1[0x1]
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.ADD
-            + Op.SWAP1
-            + Op.JUMP(pc=0x8F)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0xAC, condition=Op.EQ(0xA, Op.DUP2))
-            + Op.JUMP(pc=0xC9)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0xA]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xC8,
-                condition=Op.ISZERO(Op.GT(Op.AND(0xFF, Op.DUP2), 0x0)),
-            )
-            + Op.PUSH1[0x1]
-            + Op.SWAP2
-            + Op.DUP3
-            + Op.SWAP1
-            + Op.SUB
-            + Op.SWAP2
-            + Op.SWAP1
-            + Op.SUB
-            + Op.JUMP(pc=0xB0)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMP(pc=0xD5)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP3
-            + Op.POP
-            + Op.JUMP(pc=0xED)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0xE0, condition=Op.EQ(0x0, Op.DUP2))
-            + Op.JUMP(pc=0xE8)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.SWAP3
-            + Op.POP
-            + Op.JUMP(pc=0xED)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP3
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.SWAP1
-            + Op.JUMP
-        ),
+    # Source: raw
+    # 0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.JUMPI(pc=0x37, condition=Op.EQ(Op.DUP2, 0x380E4396))
+        + Op.JUMPI(pc=0x47, condition=Op.EQ(0xC0406226, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x3D]
+        + Op.JUMP(pc=0x84)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x4D]
+        + Op.JUMP(pc=0x57)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x5F]
+        + Op.JUMP(pc=0x84)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.EXP(0x100, 0x0)
+        + Op.AND(Op.NOT(Op.MUL(0xFF, Op.DUP2)), Op.SLOAD(key=Op.DUP2))
+        + Op.SWAP1
+        + Op.OR(Op.MUL, Op.DUP4)
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.AND(Op.DIV(Op.SLOAD(key=0x0), 0x1), 0xFF)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.DUP1
+        + Op.DUP2
+        + Op.JUMPI(pc=0xCD, condition=Op.ISZERO(0x1))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xA1, condition=Op.ISZERO(Op.SLT(Op.DUP3, 0xA)))
+        + Op.PUSH1[0x1]
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.ADD
+        + Op.SWAP1
+        + Op.JUMP(pc=0x8F)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xAC, condition=Op.EQ(0xA, Op.DUP2))
+        + Op.JUMP(pc=0xC9)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0xA]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0xC8, condition=Op.ISZERO(Op.GT(Op.AND(0xFF, Op.DUP2), 0x0))
+        )
+        + Op.PUSH1[0x1]
+        + Op.SWAP2
+        + Op.DUP3
+        + Op.SWAP1
+        + Op.SUB
+        + Op.SWAP2
+        + Op.SWAP1
+        + Op.SUB
+        + Op.JUMP(pc=0xB0)
+        + Op.JUMPDEST * 2
+        + Op.JUMP(pc=0xD5)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP3
+        + Op.POP
+        + Op.JUMP(pc=0xED)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xE0, condition=Op.EQ(0x0, Op.DUP2))
+        + Op.JUMP(pc=0xE8)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.SWAP3
+        + Op.POP
+        + Op.JUMP(pc=0xED)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP3
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.SWAP1
+        + Op.JUMP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0xe7dcb339943a6db535ffe618ec32d1e4e5a50f37"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("c0406226"),
+        to=target,
+        data=Bytes("c0406226"),
         gas_limit=350000,
         value=1,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSolidityTest/test_test_overflow.py b/tests/ported_static/stSolidityTest/test_test_overflow.py
index 86de45efa71..dcfb038159d 100644
--- a/tests/ported_static/stSolidityTest/test_test_overflow.py
+++ b/tests/ported_static/stSolidityTest/test_test_overflow.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_test_overflow.
 
 Ported from:
-tests/static/state_tests/stSolidityTest/TestOverflowFiller.json
+state_tests/stSolidityTest/TestOverflowFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSolidityTest/TestOverflowFiller.json"],
+    ["state_tests/stSolidityTest/TestOverflowFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_test_overflow(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA9AE12CB2700C0214F86B9796881BC03A1FD5605D0E76D2DA2CA592E62D53E52
-    )
+    """Test_test_overflow."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x12A05F200)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,139 +43,125 @@ def test_test_overflow(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATALOAD(offset=0x0)
-            + Op.PUSH29[
-                0x100000000000000000000000000000000000000000000000000000000
-            ]
-            + Op.SWAP1
-            + Op.DIV
-            + Op.JUMPI(pc=Op.PUSH2[0x3A], condition=Op.EQ(0x8040CAC4, Op.DUP1))
-            + Op.JUMPI(pc=Op.PUSH2[0x4C], condition=Op.EQ(0xC0406226, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH2[0x42]
-            + Op.JUMP(pc=Op.PUSH2[0x99])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x54]
-            + Op.JUMP(pc=Op.PUSH2[0x5E])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH2[0x68]
-            + Op.JUMP(pc=Op.PUSH2[0x99])
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.EXP(0x100, 0x0)
-            + Op.AND(Op.NOT(Op.MUL(0xFF, Op.DUP2)), Op.SLOAD(key=Op.DUP2))
-            + Op.SWAP1
-            + Op.OR(Op.MUL, Op.DUP4)
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.SLOAD
-            + Op.SWAP1
-            + Op.PUSH2[0x100]
-            + Op.EXP
-            + Op.SWAP1
-            + Op.AND(0xFF, Op.DIV)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=Op.PUSH2[0x96])
-            + Op.JUMPDEST
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x1]
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP(Op.DUP4)
-            + Op.PUSH32[
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
-            ]
-            + Op.SWAP3
-            + Op.POP
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xDB],
-                condition=Op.ISZERO(Op.EQ(Op.ADD(Op.DUP5, 0x1), 0x0)),
-            )
-            + Op.JUMP(pc=Op.PUSH2[0xE4])
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x13B)
-            + Op.JUMPDEST
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.SWAP2
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x102,
-                condition=Op.ISZERO(
-                    Op.EQ(Op.AND(0xFFFFFFFF, Op.ADD(Op.DUP4, 0x1)), 0x0),
-                ),
-            )
-            + Op.JUMP(pc=0x10B)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x13B)
-            + Op.JUMPDEST
-            + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x131,
-                condition=Op.ISZERO(
-                    Op.EQ(
-                        Op.AND(0xFFFFFFFFFFFFFFFF, Op.ADD(Op.DUP3, 0x1)), 0x0
-                    ),
-                ),
-            )
-            + Op.JUMP(pc=0x13A)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP4
-            + Op.POP
-            + Op.JUMP(pc=0x13B)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.SWAP1
-            + Op.JUMP
-        ),
+    # Source: raw
+    # 0x6000357c0100000000000000000000000000000000000000000000000000000000900480638040cac41461003a578063c04062261461004c57005b610042610099565b8060005260206000f35b61005461005e565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006000600060006001935083507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff925060006001840114156100db576100e4565b6000935061013b565b63ffffffff915060006001830163ffffffff1614156101025761010b565b6000935061013b565b67ffffffffffffffff905060006001820167ffffffffffffffff1614156101315761013a565b6000935061013b565b5b5050509056  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATALOAD(offset=0x0)
+        + Op.PUSH29[
+            0x100000000000000000000000000000000000000000000000000000000
+        ]
+        + Op.SWAP1
+        + Op.DIV
+        + Op.JUMPI(pc=Op.PUSH2[0x3A], condition=Op.EQ(0x8040CAC4, Op.DUP1))
+        + Op.JUMPI(pc=Op.PUSH2[0x4C], condition=Op.EQ(0xC0406226, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH2[0x42]
+        + Op.JUMP(pc=Op.PUSH2[0x99])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x54]
+        + Op.JUMP(pc=Op.PUSH2[0x5E])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH2[0x68]
+        + Op.JUMP(pc=Op.PUSH2[0x99])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.EXP(0x100, 0x0)
+        + Op.AND(Op.NOT(Op.MUL(0xFF, Op.DUP2)), Op.SLOAD(key=Op.DUP2))
+        + Op.SWAP1
+        + Op.OR(Op.MUL, Op.DUP4)
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.PUSH1[0x0] * 2
+        + Op.SWAP1
+        + Op.SLOAD
+        + Op.SWAP1
+        + Op.PUSH2[0x100]
+        + Op.EXP
+        + Op.SWAP1
+        + Op.AND(0xFF, Op.DIV)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=Op.PUSH2[0x96])
+        + Op.JUMPDEST
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0] * 4
+        + Op.PUSH1[0x1]
+        + Op.SWAP4
+        + Op.POP
+        + Op.POP(Op.DUP4)
+        + Op.PUSH32[
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ]
+        + Op.SWAP3
+        + Op.POP
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xDB],
+            condition=Op.ISZERO(Op.EQ(Op.ADD(Op.DUP5, 0x1), 0x0)),
+        )
+        + Op.JUMP(pc=Op.PUSH2[0xE4])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x13B)
+        + Op.JUMPDEST
+        + Op.PUSH4[0xFFFFFFFF]
+        + Op.SWAP2
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x102,
+            condition=Op.ISZERO(
+                Op.EQ(Op.AND(0xFFFFFFFF, Op.ADD(Op.DUP4, 0x1)), 0x0)
+            ),
+        )
+        + Op.JUMP(pc=0x10B)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x13B)
+        + Op.JUMPDEST
+        + Op.PUSH8[0xFFFFFFFFFFFFFFFF]
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x131,
+            condition=Op.ISZERO(
+                Op.EQ(Op.AND(0xFFFFFFFFFFFFFFFF, Op.ADD(Op.DUP3, 0x1)), 0x0)
+            ),
+        )
+        + Op.JUMP(pc=0x13A)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP4
+        + Op.POP
+        + Op.JUMP(pc=0x13B)
+        + Op.JUMPDEST * 2
+        + Op.POP * 3
+        + Op.SWAP1
+        + Op.JUMP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x1a5a251a7e18ebc1a8ebfc47e3f36d9be03f1627"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x12A05F200)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("c0406226"),
+        to=target,
+        data=Bytes("c0406226"),
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSolidityTest/test_test_store_gas_prices.py b/tests/ported_static/stSolidityTest/test_test_store_gas_prices.py
index 3e0d47d0907..6cea8d54e29 100644
--- a/tests/ported_static/stSolidityTest/test_test_store_gas_prices.py
+++ b/tests/ported_static/stSolidityTest/test_test_store_gas_prices.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_test_store_gas_prices.
 
 Ported from:
-tests/static/state_tests/stSolidityTest/TestStoreGasPricesFiller.json
+state_tests/stSolidityTest/TestStoreGasPricesFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSolidityTest/TestStoreGasPricesFiller.json"],
+    ["state_tests/stSolidityTest/TestStoreGasPricesFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_test_store_gas_prices(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x185FBEA9F643C40E33475353B07FA51D0695CA94789492166B67D60FDB6EF7FB
-    )
+    """Test_test_store_gas_prices."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x746A528800)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,77 +44,72 @@ def test_test_store_gas_prices(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0x746A528800)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(pc=0x2D, condition=Op.EQ(Op.DUP2, 0xC0406226))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x33]
-            + Op.JUMP(pc=0x3D)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.GAS
-            + Op.SSTORE(key=0x20, value=0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SSTORE(key=0x0, value=Op.SUB(Op.DUP2, Op.GAS))
-            + Op.GAS
-            + Op.SSTORE(key=0x20, value=0x2)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SSTORE(key=0x1, value=Op.SUB(Op.DUP2, Op.GAS))
-            + Op.GAS
-            + Op.SSTORE(key=0x20, value=0x2)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SSTORE(key=0x2, value=Op.SUB(Op.DUP2, Op.GAS))
-            + Op.GAS
-            + Op.SSTORE(key=0x20, value=0x168AA8D53FE6)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SSTORE(key=0x3, value=Op.SUB(Op.DUP2, Op.GAS))
-            + Op.GAS
-            + Op.SSTORE(key=0x20, value=0x2)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SSTORE(key=0x4, value=Op.SUB(Op.DUP2, Op.GAS))
-            + Op.GAS
-            + Op.SSTORE(key=0x20, value=0x0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SSTORE(key=0x5, value=Op.SUB(Op.DUP2, Op.GAS))
-            + Op.POP(Op.GAS)
-            + Op.PUSH1[0x1]
-            + Op.SWAP3
-            + Op.SWAP2
-            + Op.POP
-            + Op.POP
-            + Op.JUMP
-        ),
+    # Source: raw
+    # 0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.JUMPI(pc=0x2D, condition=Op.EQ(Op.DUP2, 0xC0406226))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x33]
+        + Op.JUMP(pc=0x3D)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0] * 2
+        + Op.GAS
+        + Op.SSTORE(key=0x20, value=0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SSTORE(key=0x0, value=Op.SUB(Op.DUP2, Op.GAS))
+        + Op.GAS
+        + Op.SSTORE(key=0x20, value=0x2)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SSTORE(key=0x1, value=Op.SUB(Op.DUP2, Op.GAS))
+        + Op.GAS
+        + Op.SSTORE(key=0x20, value=0x2)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SSTORE(key=0x2, value=Op.SUB(Op.DUP2, Op.GAS))
+        + Op.GAS
+        + Op.SSTORE(key=0x20, value=0x168AA8D53FE6)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SSTORE(key=0x3, value=Op.SUB(Op.DUP2, Op.GAS))
+        + Op.GAS
+        + Op.SSTORE(key=0x20, value=0x2)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SSTORE(key=0x4, value=Op.SUB(Op.DUP2, Op.GAS))
+        + Op.GAS
+        + Op.SSTORE(key=0x20, value=0x0)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SSTORE(key=0x5, value=Op.SUB(Op.DUP2, Op.GAS))
+        + Op.POP(Op.GAS)
+        + Op.PUSH1[0x1]
+        + Op.SWAP3
+        + Op.SWAP2
+        + Op.POP * 2
+        + Op.JUMP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0xfe58f48415dcf9d527f770e3148b769a76ef83f1"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("c0406226"),
+        to=target,
+        data=Bytes("c0406226"),
         gas_limit=35000000,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={0: 22113, 1: 113, 2: 113, 3: 113, 4: 113, 5: 113},
         ),
     }
diff --git a/tests/ported_static/stSolidityTest/test_test_structures_and_variabless.py b/tests/ported_static/stSolidityTest/test_test_structures_and_variabless.py
index 7558687ac18..d60edc74363 100644
--- a/tests/ported_static/stSolidityTest/test_test_structures_and_variabless.py
+++ b/tests/ported_static/stSolidityTest/test_test_structures_and_variabless.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_test_structures_and_variabless.
 
 Ported from:
-tests/static/state_tests/stSolidityTest/TestStructuresAndVariablessFiller.json
+state_tests/stSolidityTest/TestStructuresAndVariablessFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSolidityTest/TestStructuresAndVariablessFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSolidityTest/TestStructuresAndVariablessFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_test_structures_and_variabless(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_test_structures_and_variabless."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x6F0117D3E9C684C7D6E1E6B79DC3880DA2BEBE77C765B171C062FDFFD38A673F
     )
@@ -47,212 +46,204 @@ def test_test_structures_and_variabless(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(pc=Op.PUSH2[0x39], condition=Op.EQ(Op.DUP2, 0x2A9AFB83))
-            + Op.JUMPI(pc=Op.PUSH2[0x4B], condition=Op.EQ(0xC0406226, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH2[0x41]
-            + Op.JUMP(pc=Op.PUSH2[0x5D])
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x53]
-            + Op.JUMP(pc=0x16C)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x6E],
-                condition=Op.ISZERO(Op.EQ(Op.SLOAD(key=Op.DUP2), 0xFF)),
-            )
-            + Op.JUMP(pc=Op.PUSH2[0x76])
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x169)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x87],
-                condition=Op.ISZERO(
-                    Op.EQ(Op.SLOAD(key=0x3), Op.SLOAD(key=0x1))
-                ),
-            )
-            + Op.JUMP(pc=Op.PUSH2[0x8F])
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x169)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xCD],
-                condition=Op.ISZERO(
-                    Op.EQ(
-                        Op.AND(
-                            Op.AND(Op.DUP2, Op.DIV(Op.SLOAD(key=0x2), 0x1)),
-                            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                        ),
-                        0xD96ED4431B417993AB4F4D4A656959D13C66E1DC,
-                    ),
-                ),
-            )
-            + Op.JUMP(pc=Op.PUSH2[0xD5])
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x169)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x104,
-                condition=Op.ISZERO(
-                    Op.EQ(
-                        Op.SLOAD(key=0x4),
-                        0x676C6F62616C2064617461203332206C656E67746820737472696E6700000000,  # noqa: E501
-                    ),
-                ),
-            )
-            + Op.JUMP(pc=0x10C)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x169)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x5]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP1)
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.PUSH1[0x20]
-            + Op.SHA3(offset=0x0, size=Op.ADD)
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.SLOAD
-            + Op.SWAP1
-            + Op.PUSH2[0x100]
-            + Op.EXP
-            + Op.SWAP1
-            + Op.JUMPI(
-                pc=0x160,
-                condition=Op.ISZERO(
-                    Op.EQ(
-                        0xD96ED4431B417993AB4F4D4A656959D13C66E1DC,
-                        Op.AND(
-                            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.DIV
-                        ),
-                    ),
-                ),
-            )
-            + Op.JUMP(pc=0x168)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMP(pc=0x169)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xFF]
-            + Op.SSTORE(key=0x1, value=Op.DUP1)
-            + Op.POP
-            + Op.PUSH20[0xD96ED4431B417993AB4F4D4A656959D13C66E1DC]
-            + Op.PUSH1[0x2]
-            + Op.OR(
-                Op.DUP3,
-                Op.AND(
-                    Op.NOT(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF),
-                    Op.SLOAD(key=Op.DUP1),
-                ),
-            )
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.PUSH1[0xFF]
-            + Op.SSTORE(key=0x3, value=Op.DUP1)
-            + Op.POP
-            + Op.PUSH32[
-                0x676C6F62616C2064617461203332206C656E67746820737472696E6700000000  # noqa: E501
-            ]
-            + Op.SSTORE(key=0x4, value=Op.DUP1)
-            + Op.POP
-            + Op.PUSH20[0xD96ED4431B417993AB4F4D4A656959D13C66E1DC]
-            + Op.PUSH1[0x5]
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP1)
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.PUSH1[0x20]
-            + Op.SHA3(offset=0x0, size=Op.ADD)
-            + Op.EXP(0x100, 0x0)
-            + Op.AND(
-                Op.NOT(
-                    Op.MUL(
-                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.DUP2
+    pre[sender] = Account(balance=0x2540BE400)
+    # Source: raw
+    # 0x7c010000000000000000000000000000000000000000000000000000000060003504632a9afb838114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361016c565b8060005260206000f35b600160ff8154141561006e57610076565b506000610169565b60015460035414156100875761008f565b506000610169565b73<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>73ffffffffffffffffffffffffffffffffffffffff60016002540481161614156100cd576100d5565b506000610169565b7f676c6f62616c2064617461203332206c656e67746820737472696e670000000060045414156101045761010c565b506000610169565b6005600080815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>141561016057610168565b506000610169565b5b90565b600060ff806001555073<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>6002805473ffffffffffffffffffffffffffffffffffffffff1916821790555060ff80600355507f676c6f62616c2064617461203332206c656e67746820737472696e6700000000806004555073<eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>6005600080815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff0219169083021790555061022f61005d565b600060006101000a81548160ff0219169083021790555060ff6001600054041690509056  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.JUMPI(pc=Op.PUSH2[0x39], condition=Op.EQ(Op.DUP2, 0x2A9AFB83))
+        + Op.JUMPI(pc=Op.PUSH2[0x4B], condition=Op.EQ(0xC0406226, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH2[0x41]
+        + Op.JUMP(pc=Op.PUSH2[0x5D])
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x53]
+        + Op.JUMP(pc=0x16C)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x6E],
+            condition=Op.ISZERO(Op.EQ(Op.SLOAD(key=Op.DUP2), 0xFF)),
+        )
+        + Op.JUMP(pc=Op.PUSH2[0x76])
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x169)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x87],
+            condition=Op.ISZERO(Op.EQ(Op.SLOAD(key=0x3), Op.SLOAD(key=0x1))),
+        )
+        + Op.JUMP(pc=Op.PUSH2[0x8F])
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x169)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xCD],
+            condition=Op.ISZERO(
+                Op.EQ(
+                    Op.AND(
+                        Op.AND(Op.DUP2, Op.DIV(Op.SLOAD(key=0x2), 0x1)),
+                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
                     ),
-                ),
-                Op.SLOAD(key=Op.DUP2),
-            )
-            + Op.SWAP1
-            + Op.OR(Op.MUL, Op.DUP4)
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.PUSH2[0x22F]
-            + Op.JUMP(pc=Op.PUSH2[0x5D])
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.EXP(0x100, 0x0)
-            + Op.AND(Op.NOT(Op.MUL(0xFF, Op.DUP2)), Op.SLOAD(key=Op.DUP2))
-            + Op.SWAP1
-            + Op.OR(Op.MUL, Op.DUP4)
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.POP
-            + Op.AND(Op.DIV(Op.SLOAD(key=0x0), 0x1), 0xFF)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.JUMP
-        ),
+                    sender,
+                )
+            ),
+        )
+        + Op.JUMP(pc=Op.PUSH2[0xD5])
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x169)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x104,
+            condition=Op.ISZERO(
+                Op.EQ(
+                    Op.SLOAD(key=0x4),
+                    0x676C6F62616C2064617461203332206C656E67746820737472696E6700000000,  # noqa: E501
+                )
+            ),
+        )
+        + Op.JUMP(pc=0x10C)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x169)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP1)
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.PUSH1[0x20]
+        + Op.SHA3(offset=0x0, size=Op.ADD)
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.SLOAD
+        + Op.SWAP1
+        + Op.PUSH2[0x100]
+        + Op.EXP
+        + Op.SWAP1
+        + Op.JUMPI(
+            pc=0x160,
+            condition=Op.ISZERO(
+                Op.EQ(
+                    sender,
+                    Op.AND(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.DIV),
+                )
+            ),
+        )
+        + Op.JUMP(pc=0x168)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMP(pc=0x169)
+        + Op.JUMPDEST * 2
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xFF]
+        + Op.SSTORE(key=0x1, value=Op.DUP1)
+        + Op.POP
+        + Op.PUSH20[0xD96ED4431B417993AB4F4D4A656959D13C66E1DC]
+        + Op.PUSH1[0x2]
+        + Op.OR(
+            Op.DUP3,
+            Op.AND(
+                Op.NOT(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF),
+                Op.SLOAD(key=Op.DUP1),
+            ),
+        )
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.PUSH1[0xFF]
+        + Op.SSTORE(key=0x3, value=Op.DUP1)
+        + Op.POP
+        + Op.PUSH32[
+            0x676C6F62616C2064617461203332206C656E67746820737472696E6700000000
+        ]
+        + Op.SSTORE(key=0x4, value=Op.DUP1)
+        + Op.POP
+        + Op.PUSH20[0xD96ED4431B417993AB4F4D4A656959D13C66E1DC]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP1)
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.PUSH1[0x20]
+        + Op.SHA3(offset=0x0, size=Op.ADD)
+        + Op.EXP(0x100, 0x0)
+        + Op.AND(
+            Op.NOT(
+                Op.MUL(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.DUP2)
+            ),
+            Op.SLOAD(key=Op.DUP2),
+        )
+        + Op.SWAP1
+        + Op.OR(Op.MUL, Op.DUP4)
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.PUSH2[0x22F]
+        + Op.JUMP(pc=Op.PUSH2[0x5D])
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.EXP(0x100, 0x0)
+        + Op.AND(Op.NOT(Op.MUL(0xFF, Op.DUP2)), Op.SLOAD(key=Op.DUP2))
+        + Op.SWAP1
+        + Op.OR(Op.MUL, Op.DUP4)
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.POP
+        + Op.AND(Op.DIV(Op.SLOAD(key=0x0), 0x1), 0xFF)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.JUMP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x53d3dbdfd3ae109712a4771f7f37a6b1cda7b864"),  # noqa: E501
+        address=Address(0x53D3DBDFD3AE109712A4771F7F37A6B1CDA7B864),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2540BE400)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("c0406226"),
+        to=target,
+        data=Bytes("c0406226"),
         gas_limit=350000,
         value=100,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 1,
                 1: 255,
-                2: 0xD96ED4431B417993AB4F4D4A656959D13C66E1DC,
+                2: sender,
                 3: 255,
                 4: 0x676C6F62616C2064617461203332206C656E67746820737472696E6700000000,  # noqa: E501
-                0x5B8CCBB9D4D8FB16EA74CE3C29A41F1B461FBDAFF4714A0D9A8EB05499746BC: 0xD96ED4431B417993AB4F4D4A656959D13C66E1DC,  # noqa: E501
+                0x5B8CCBB9D4D8FB16EA74CE3C29A41F1B461FBDAFF4714A0D9A8EB05499746BC: sender,  # noqa: E501
             },
         ),
     }
diff --git a/tests/ported_static/stSpecialTest/__init__.py b/tests/ported_static/stSpecialTest/__init__.py
index 022a06ceaf0..c197146c9b8 100644
--- a/tests/ported_static/stSpecialTest/__init__.py
+++ b/tests/ported_static/stSpecialTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stSpecialTest."""
+"""Ported static tests: stSpecialTest."""  # noqa: N999
diff --git a/tests/ported_static/stSpecialTest/test_block504980.py b/tests/ported_static/stSpecialTest/test_block504980.py
index 4a9097547a4..ecf3d159cfa 100644
--- a/tests/ported_static/stSpecialTest/test_block504980.py
+++ b/tests/ported_static/stSpecialTest/test_block504980.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_block504980.
 
 Ported from:
-tests/static/state_tests/stSpecialTest/block504980Filler.json
+state_tests/stSpecialTest/block504980Filler.json
 """
 
 import pytest
@@ -11,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -22,7 +24,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSpecialTest/block504980Filler.json"],
+    ["state_tests/stSpecialTest/block504980Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,16 +32,23 @@ def test_block504980(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x1cdc8315bdb1362de8b7b2fa9ee75dc873037179")
+    """Test_block504980."""
+    coinbase = Address(0x1CDC8315BDB1362DE8B7B2FA9EE75DC873037179)
+    contract_0 = Address(0x0000000000000000000000000000000000000000)
+    contract_1 = Address(0x0000000000000000000000000000000000000001)
+    contract_2 = Address(0x0000000000000000000000000000000000000002)
+    contract_3 = Address(0x0000000000000000000000000000000000000003)
+    contract_4 = Address(0x0000000000000000000000000000000000000004)
+    contract_5 = Address(0x0EA65418D7BF32680F55572C943A94B590804998)
+    contract_6 = Address(0x142A6927CF0060133187BA8A8E74D641438F0C1C)
+    contract_7 = Address(0x9761FECF88590592CF05CE545504D376D1693AB3)
+    contract_8 = Address(0xB03F030056DB7D467D778326658BAC0D1B35D8F7)
+    contract_9 = Address(0xC9AE5868651BF7B7DB6E360217DB49CE4E69C07E)
+    contract_10 = Address(0xE509E3A93BEB1EBA72F8CB8D25F93A85E2D54AFB)
+    contract_11 = Address(0xF1562E1C0D0BAA3EA746442BB7F11153FCF5CFDA)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
-    callee = Address("0x0000000000000000000000000000000000000000")
-    callee_1 = Address("0x0000000000000000000000000000000000000001")
-    callee_2 = Address("0x0000000000000000000000000000000000000002")
-    callee_3 = Address("0x0000000000000000000000000000000000000003")
-    callee_4 = Address("0x0000000000000000000000000000000000000004")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -50,10355 +59,210 @@ def test_block504980(
         gas_limit=3141592,
     )
 
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    # Source: raw bytecode
-    callee_5 = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x289F, value=0x0)
-            + Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xC9AE5868651BF7B7DB6E360217DB49CE4E69C07E,
-            )
-            + Op.JUMPI(
-                pc=0x127, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xC4982A85))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0xA0, value=Op.SLOAD(key=Op.SHA3))
-            + Op.MLOAD(offset=0xA0)
-            + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0xE0]
-            + Op.MSTORE
-            + Op.MSTORE(offset=0x140, value=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x10B,
-                condition=Op.ISZERO(
-                    Op.SLT(Op.MLOAD(offset=0x140), Op.MLOAD(offset=0xA0)),
-                ),
-            )
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
-            + Op.MSTORE(
-                offset=Op.ADD(0x80, Op.DUP2), value=Op.MLOAD(offset=0x140)
-            )
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(
-                offset=Op.ADD(
-                    Op.MLOAD(offset=0xE0),
-                    Op.MUL(0x20, Op.MLOAD(offset=0x140)),
-                ),
-                value=Op.SLOAD(key=Op.SHA3),
-            )
-            + Op.MSTORE(
-                offset=0x140, value=Op.ADD(Op.MLOAD(offset=0x140), 0x1)
-            )
-            + Op.JUMP(pc=Op.PUSH2[0xAD])
-            + Op.JUMPDEST
-            + Op.MLOAD(offset=0xE0)
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x176, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xCC1C944E))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x1A0, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0x1A0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1D5, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x95A405B9))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x1E0, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
-            + Op.MSTORE(
-                offset=Op.ADD(0x80, Op.DUP2), value=Op.MLOAD(offset=0x1E0)
-            )
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x200, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0x200, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x224, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x71EBB662))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x240, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0x240, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x325, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x7A57A3DB))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x280, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.PUSH1[0xC0]
-            + Op.PUSH1[0xC0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x3)
-            + Op.MSTORE(
-                offset=Op.ADD(0x80, Op.DUP2), value=Op.MLOAD(offset=0x280)
-            )
-            + Op.MSTORE(offset=Op.ADD(0xA0, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
-            + Op.DUP1
-            + Op.ADD(0x20, Op.DUP1)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2E9,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x2C8)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.AND(
-                    Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x394, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xF73DC690))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x3C0, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MSTORE(offset=0x3E0, value=Op.CALLDATALOAD(offset=0x64))
-            + Op.PUSH1[0xC0]
-            + Op.PUSH1[0xC0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x3)
-            + Op.MSTORE(
-                offset=Op.ADD(0x80, Op.DUP2), value=Op.MLOAD(offset=0x3C0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0xA0, Op.DUP2), value=Op.MLOAD(offset=0x3E0)
-            )
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x400, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0x400, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3F3, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x54CC6109))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x3C0, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x4)
-            + Op.MSTORE(
-                offset=Op.ADD(0x80, Op.DUP2), value=Op.MLOAD(offset=0x3C0)
-            )
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x440, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0x440, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x442, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xC63EF546))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x480, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0x480, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x533, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x9381779B))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x6)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
-            + Op.DUP1
-            + Op.ADD(0x20, Op.DUP1)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4F7,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x4D6)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.AND(
-                    Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x624, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x4F9C6EEB))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x7)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
-            + Op.DUP1
-            + Op.ADD(0x20, Op.DUP1)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x5E8,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x5C7)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.AND(
-                    Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x715, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x7DC12195))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x8)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
-            + Op.DUP1
-            + Op.ADD(0x20, Op.DUP1)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x6D9,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x6B8)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.AND(
-                    Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x806, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xFA9832D1))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x9)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
-            + Op.DUP1
-            + Op.ADD(0x20, Op.DUP1)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x7CA,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x7A9)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.AND(
-                    Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x8F7, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x2C5A40D5))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xA)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
-            + Op.DUP1
-            + Op.ADD(0x20, Op.DUP1)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x8BB,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x89A)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.AND(
-                    Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x9EB, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xE05DCB56))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xB)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.PUSH1[0x2]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
-            + Op.ADD
-            + Op.DUP1
-            + Op.ADD(0x20, Op.DUP1)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x9AF,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x98E)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.AND(
-                    Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xA3A, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x586B5BE0))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xC)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0xB80, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0xB80, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xB58, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xEB8AF5AA))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xD)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.MUL(0x20, Op.SDIV)
-            + Op.DUP1
-            + Op.ADD(0x20, Op.DUP1)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xB1C,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0xAFB)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.AND(
-                    Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xC76, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x7AB6EA8A))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xE)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.MUL(0x20, Op.SDIV)
-            + Op.DUP1
-            + Op.ADD(0x20, Op.DUP1)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xC3A,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0xC19)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.AND(
-                    Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xD94, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x2B810CB9))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xF)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.MUL(0x20, Op.SDIV)
-            + Op.DUP1
-            + Op.ADD(0x20, Op.DUP1)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xD58,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0xD37)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.AND(
-                    Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xE85, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x7FB42E46))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x10)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
-            + Op.DUP1
-            + Op.ADD(0x20, Op.DUP1)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xE49,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0xE28)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.AND(
-                    Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xF76, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x734FA727))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x11)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
-            + Op.DUP1
-            + Op.ADD(0x20, Op.DUP1)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xF3A,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0xF19)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.AND(
-                    Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1067, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xC67FA857))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x12)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
-            + Op.DUP1
-            + Op.ADD(0x20, Op.DUP1)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x102B,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x100A)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.AND(
-                    Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1185, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x5ED853E4))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x13)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.MUL(0x20, Op.SDIV)
-            + Op.DUP1
-            + Op.ADD(0x20, Op.DUP1)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1149,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1128)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.AND(
-                    Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x12A3, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xB86F5125))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x14)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.MUL(0x20, Op.SDIV)
-            + Op.DUP1
-            + Op.ADD(0x20, Op.DUP1)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1267,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1246)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.AND(
-                    Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1394, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xBC3D7D85))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x15)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
-            + Op.DUP1
-            + Op.ADD(0x20, Op.DUP1)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1358,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1337)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
-                value=Op.AND(
-                    Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1481, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xA2302F2F))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x1680, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x16A0, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MLOAD(offset=0x16A0)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2),
-                value=Op.MLOAD(offset=0x1680),
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2),
-                value=Op.MLOAD(offset=0x1680),
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(
-                offset=Op.ADD(0x80, Op.DUP2), value=Op.SLOAD(key=Op.SHA3)
-            )
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2),
-                value=Op.MLOAD(offset=0x1680),
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.ADD
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2),
-                value=Op.MLOAD(offset=0x1680),
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(offset=0x1740, value=0x1)
-            + Op.RETURN(offset=0x1740, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x14DD, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x58CA2BC))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x1760, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MLOAD(offset=0x1760)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(offset=0x17A0, value=0x1)
-            + Op.RETURN(offset=0x17A0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1617, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x5D3B965B))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x280, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MSTORE(
-                offset=0x17E0,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x64)
-                ),
-            )
-            + Op.MSTORE(offset=0x1800, value=Op.CALLDATALOAD(offset=0x84))
-            + Op.POP
-            + Op.PUSH1[0xC0]
-            + Op.PUSH1[0xC0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x3)
-            + Op.MSTORE(
-                offset=Op.ADD(0x80, Op.DUP2), value=Op.MLOAD(offset=0x280)
-            )
-            + Op.MSTORE(offset=Op.ADD(0xA0, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.MUL(
-                0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x17E0), 0x20))
-            )
-            + Op.DIV(Op.DUP2, 0x20)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x158C, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x17E0), Op.MUL(0x20, Op.DUP1)
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x156B)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.AND(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x17E0),
-                            Op.MUL(0x20, Op.DUP2),
-                        ),
-                    ),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MLOAD(offset=0x1800)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.ADD
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(offset=0x1900, value=0x1)
-            + Op.RETURN(offset=0x1900, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1673, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xB0E14F0F))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x1920, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MLOAD(offset=0x1920)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(offset=0x1960, value=0x1)
-            + Op.RETURN(offset=0x1960, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1739, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x6ACCCDBC))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(
-                offset=0x1980,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)
-                ),
-            )
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x6)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.MUL(
-                0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x1980), 0x20))
-            )
-            + Op.DIV(Op.DUP2, 0x20)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x170B, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x1980), Op.MUL(0x20, Op.DUP1)
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x16EA)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.AND(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x1980),
-                            Op.MUL(0x20, Op.DUP2),
-                        ),
-                    ),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x1A40, value=0x1)
-            + Op.RETURN(offset=0x1A40, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x17FF, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xA1FA51F9))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(
-                offset=0x1A60,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)
-                ),
-            )
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x7)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.MUL(
-                0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x1A60), 0x20))
-            )
-            + Op.DIV(Op.DUP2, 0x20)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x17D1, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x1A60), Op.MUL(0x20, Op.DUP1)
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x17B0)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.AND(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x1A60),
-                            Op.MUL(0x20, Op.DUP2),
-                        ),
-                    ),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x1B20, value=0x1)
-            + Op.RETURN(offset=0x1B20, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x18C5, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xCD87F43A))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(
-                offset=0x1B40,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)
-                ),
-            )
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x8)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.MUL(
-                0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x1B40), 0x20))
-            )
-            + Op.DIV(Op.DUP2, 0x20)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1897, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x1B40), Op.MUL(0x20, Op.DUP1)
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1876)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.AND(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x1B40),
-                            Op.MUL(0x20, Op.DUP2),
-                        ),
-                    ),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x1C00, value=0x1)
-            + Op.RETURN(offset=0x1C00, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x198B, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x222A8663))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(
-                offset=0x1C20,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)
-                ),
-            )
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x9)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.MUL(
-                0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x1C20), 0x20))
-            )
-            + Op.DIV(Op.DUP2, 0x20)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x195D, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x1C20), Op.MUL(0x20, Op.DUP1)
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x193C)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.AND(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x1C20),
-                            Op.MUL(0x20, Op.DUP2),
-                        ),
-                    ),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x1CE0, value=0x1)
-            + Op.RETURN(offset=0x1CE0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1A51, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xB39E1FAA))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(
-                offset=0x1D00,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)
-                ),
-            )
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xA)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.MUL(
-                0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x1D00), 0x20))
-            )
-            + Op.DIV(Op.DUP2, 0x20)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1A23, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x1D00), Op.MUL(0x20, Op.DUP1)
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1A02)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.AND(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x1D00),
-                            Op.MUL(0x20, Op.DUP2),
-                        ),
-                    ),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x1DC0, value=0x1)
-            + Op.RETURN(offset=0x1DC0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1B17, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xE365736B))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(
-                offset=0x1DE0,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)
-                ),
-            )
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xB)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.MUL(
-                0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x1DE0), 0x20))
-            )
-            + Op.DIV(Op.DUP2, 0x20)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1AE9, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x1DE0), Op.MUL(0x20, Op.DUP1)
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1AC8)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.AND(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x1DE0),
-                            Op.MUL(0x20, Op.DUP2),
-                        ),
-                    ),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x1EA0, value=0x1)
-            + Op.RETURN(offset=0x1EA0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1B73, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xAAD7D6E3))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x1EC0, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MLOAD(offset=0x1EC0)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xC)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(offset=0x1F00, value=0x1)
-            + Op.RETURN(offset=0x1F00, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C39, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x1112B27))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(
-                offset=0x1F20,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)
-                ),
-            )
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xD)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.MUL(
-                0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x1F20), 0x20))
-            )
-            + Op.DIV(Op.DUP2, 0x20)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C0B, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x1F20), Op.MUL(0x20, Op.DUP1)
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1BEA)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.AND(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x1F20),
-                            Op.MUL(0x20, Op.DUP2),
-                        ),
-                    ),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x1FE0, value=0x1)
-            + Op.RETURN(offset=0x1FE0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1CFF, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xBDBB239B))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(
-                offset=0x2000,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)
-                ),
-            )
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xE)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.MUL(
-                0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x2000), 0x20))
-            )
-            + Op.DIV(Op.DUP2, 0x20)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1CD1, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x2000), Op.MUL(0x20, Op.DUP1)
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1CB0)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.AND(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x2000),
-                            Op.MUL(0x20, Op.DUP2),
-                        ),
-                    ),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x20C0, value=0x1)
-            + Op.RETURN(offset=0x20C0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1DC5, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x5A0CD48))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(
-                offset=0x20E0,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)
-                ),
-            )
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xF)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.MUL(
-                0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x20E0), 0x20))
-            )
-            + Op.DIV(Op.DUP2, 0x20)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1D97, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x20E0), Op.MUL(0x20, Op.DUP1)
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1D76)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.AND(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x20E0),
-                            Op.MUL(0x20, Op.DUP2),
-                        ),
-                    ),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x21A0, value=0x1)
-            + Op.RETURN(offset=0x21A0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1E8B, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xAAA1FE35))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(
-                offset=0x21C0,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)
-                ),
-            )
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x10)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.MUL(
-                0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x21C0), 0x20))
-            )
-            + Op.DIV(Op.DUP2, 0x20)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1E5D, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x21C0), Op.MUL(0x20, Op.DUP1)
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1E3C)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.AND(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x21C0),
-                            Op.MUL(0x20, Op.DUP2),
-                        ),
-                    ),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x2280, value=0x1)
-            + Op.RETURN(offset=0x2280, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1F51, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x2BE4935D))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(
-                offset=0x22A0,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)
-                ),
-            )
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x11)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.MUL(
-                0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x22A0), 0x20))
-            )
-            + Op.DIV(Op.DUP2, 0x20)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1F23, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x22A0), Op.MUL(0x20, Op.DUP1)
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1F02)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.AND(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x22A0),
-                            Op.MUL(0x20, Op.DUP2),
-                        ),
-                    ),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x2360, value=0x1)
-            + Op.RETURN(offset=0x2360, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2017, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x13A8350D))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(
-                offset=0x2380,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)
-                ),
-            )
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x12)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.MUL(
-                0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x2380), 0x20))
-            )
-            + Op.DIV(Op.DUP2, 0x20)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1FE9, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x2380), Op.MUL(0x20, Op.DUP1)
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1FC8)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.AND(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x2380),
-                            Op.MUL(0x20, Op.DUP2),
-                        ),
-                    ),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x2440, value=0x1)
-            + Op.RETURN(offset=0x2440, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x20DD, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xCB540B45))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(
-                offset=0x2460,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)
-                ),
-            )
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x13)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.MUL(
-                0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x2460), 0x20))
-            )
-            + Op.DIV(Op.DUP2, 0x20)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x20AF, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x2460), Op.MUL(0x20, Op.DUP1)
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x208E)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.AND(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x2460),
-                            Op.MUL(0x20, Op.DUP2),
-                        ),
-                    ),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x2520, value=0x1)
-            + Op.RETURN(offset=0x2520, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x21A3, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xBE030627))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(
-                offset=0x2540,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)
-                ),
-            )
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x14)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.MUL(
-                0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x2540), 0x20))
-            )
-            + Op.DIV(Op.DUP2, 0x20)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2175, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x2540), Op.MUL(0x20, Op.DUP1)
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x2154)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.AND(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x2540),
-                            Op.MUL(0x20, Op.DUP2),
-                        ),
-                    ),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x2600, value=0x1)
-            + Op.RETURN(offset=0x2600, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2269, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x83FD77F0))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(
-                offset=0x2620,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)
-                ),
-            )
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x15)
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.MUL(
-                0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x2620), 0x20))
-            )
-            + Op.DIV(Op.DUP2, 0x20)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x223B, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2))
-            )
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x2620), Op.MUL(0x20, Op.DUP1)
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x221A)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(Op.DUP3, Op.DUP5),
-                value=Op.AND(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x2620),
-                            Op.MUL(0x20, Op.DUP2),
-                        ),
-                    ),
-                    Op.SUB(
-                        0x0,
-                        Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20))),
-                    ),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x26E0, value=0x1)
-            + Op.RETURN(offset=0x26E0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x22D5, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x59462205))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x3C0, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MSTORE(offset=0x2700, value=Op.CALLDATALOAD(offset=0x64))
-            + Op.MLOAD(offset=0x2700)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x4)
-            + Op.MSTORE(
-                offset=Op.ADD(0x80, Op.DUP2), value=Op.MLOAD(offset=0x3C0)
-            )
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(offset=0x2740, value=0x1)
-            + Op.RETURN(offset=0x2740, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2448, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xBB8E4196))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x2760, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x2780, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MSTORE(offset=0x27A0, value=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2),
-                value=Op.SUB(Op.MLOAD(offset=0x2760), 0x1),
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x243B,
-                condition=Op.ISZERO(
-                    Op.SLT(Op.MLOAD(offset=0x27A0), Op.SLOAD(key=Op.SHA3)),
-                ),
-            )
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2),
-                value=Op.SUB(Op.MLOAD(offset=0x2760), 0x1),
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
-            + Op.MSTORE(
-                offset=Op.ADD(0x80, Op.DUP2),
-                value=Op.MLOAD(offset=0x27A0),
-            )
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2),
-                value=Op.MLOAD(offset=0x2780),
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2),
-                value=Op.MLOAD(offset=0x2780),
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(
-                offset=Op.ADD(0x80, Op.DUP2), value=Op.SLOAD(key=Op.SHA3)
-            )
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2),
-                value=Op.MLOAD(offset=0x2780),
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.ADD
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2),
-                value=Op.MLOAD(offset=0x2780),
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(
-                offset=0x27A0, value=Op.ADD(Op.MLOAD(offset=0x27A0), 0x1)
-            )
-            + Op.JUMP(pc=0x22FC)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x2880, value=0x1)
-            + Op.RETURN(offset=0x2880, size=0x20)
-            + Op.JUMPDEST
-            + Op.POP
-        ),
-        storage={
-            0x65D5EFDFCC0FBA693DC9E467F633097FFDC97401901463AD0E28855486D1EDF: 0xB9D69098A6ACFE0C6411BCAAF430F78D363A9ADC32B78BC2E15CCD6E883E9784,  # noqa: E501
-            0x12643FF300762717D27EFB567B82C65560D7B43249D908504E5510863AB82AAC: 0x154CF60E137C594516A065149610B6A3989396A42581D5FD8919E711C55DA225,  # noqa: E501
-            0x1489023D18C5D10427C4AA8DC726E840EB5AE7F604A8E9243C61634FB009E4D7: 0x5,  # noqa: E501
-            0x1489023D18C5D10427C4AA8DC726E840EB5AE7F604A8E9243C61634FB009E4D8: 0x1,  # noqa: E501
-            0x19EFB13D6576359514ACE5211988A8D51379FA88CCD2B886B409F842B13D7932: 0xC849CC595B452D11C206D2EB8CDFA06DE211E3FF19EE0E0276DC857C05D4FE,  # noqa: E501
-            0x1B37E91BF8580C7C6BCF8CDFF25C7ED78180124A94AF6F30C40D476A3D079AD6: 0xABA4CD295118A482A0A62579E35E4BA5BDD76146CC9E4D96172FCE8BE8977AB4,  # noqa: E501
-            0x2BF9FD8FACDD6FD9C84657F5AD7381A5AECF670CDA68CB3C5829B6532C865506: 0x53098A1D111586DBCC0D051846284F5803C63C313E7F7E6D84430435D11D4C50,  # noqa: E501
-            0x3111BFD25728C0ADFAD0F8C1AD79CB1B91167267DECA98DE88F156ED25CAEEDC: 0xAD393086F30B49511B08FDD27AC78810B084C7CD7DE6AC354F614C18EA9E7DF4,  # noqa: E501
-            0x3379E7AE125C5C5D623D1D993C1459B61D6723B1C30D1AA026C48F6A6155B8EA: 0x8C4183732567A99A8A718E363391E102532F9A640E42968CF2354D9ACC908BB0,  # noqa: E501
-            0x34CABE0C7E64A2CAA93FD8D6A0DEFC07ACB9D44B13430FA3AE9282FFFD40DEE2: 0x1,  # noqa: E501
-            0x34CABE0C7E64A2CAA93FD8D6A0DEFC07ACB9D44B13430FA3AE9282FFFD40DEE3: 0x1,  # noqa: E501
-            0x34CABE0C7E64A2CAA93FD8D6A0DEFC07ACB9D44B13430FA3AE9282FFFD40DEE4: 0x1,  # noqa: E501
-            0x34CABE0C7E64A2CAA93FD8D6A0DEFC07ACB9D44B13430FA3AE9282FFFD40DEE5: 0x1,  # noqa: E501
-            0x39050607FE892059A6344AB0F594F382FB0B345CAB373497246DBE86FE7E14E7: 0x2B3BCA833E482737E7E47B1568E6F890F8E1666490D38FE130ABD6F0CCB109CF,  # noqa: E501
-            0x417BE8BC6791807372E0222A350BB8A5D67BBC8D7595C301D8A5A8372CFDCEF1: 0xABD4971B4605A7155802F70E08298B1CEB0E4E4EACCCCD348F77A77227F73A7F,  # noqa: E501
-            0x41E9A54B3EE0C276AA076BABB161DE12B0F8916B47F8F6FB85CC387CF34696DD: 0x22F2F444EBDA9D2913FFEF5059B039EC9B5876AA71821991C2515BF79F64935E,  # noqa: E501
-            0x45CEB8DA6FB8936592D3BCE4883F1A6A34D636F559E0A1070A5802A65AC39BD5: 0x57A5122FF3BF737B0DE0F9F08011A8648C19E43FF071FB7086234723C9383F1F,  # noqa: E501
-            0x4AA6B934608A45C8F53A945C05DDEE1814A3B9F63A048FC7AD3D47E67156F024: 0xD03862BECEDADA67B4825A0238F3E67495CCB595CD7D08F1BD5D3160644B9299,  # noqa: E501
-            0x4B8B58F0B0E326A5907D1A810E5FF31E05B4CAB45125B776DB8577E7DBC46BCE: 0x2F0000000000000000,  # noqa: E501
-            0x4C33460347337BFC7DF08BF182988301B7B426A27A67F1C6C634F637C60E87AC: 0xBAB4AB2AD4EAFE7C84EF6A8CD69157D9CE6B843793A2CD0877B8E91F63CB2D4D,  # noqa: E501
-            0x58DA0C0C256BBA101CE36FAD8BF838717A57E6AB850A191DC9C09DA9CE56BF1B: 0x5,  # noqa: E501
-            0x5CB38B16DB1D632086D4AF695DE7F5F242A6E40947067F96EDD566FE2AC438EF: 0x6D0BE832B2007EA28CDA705B73922CBF9794C5A25B89BD2F28B7347ED2B96C86,  # noqa: E501
-            0x64A9621CC4BA92BF738C55010C609DFAA3972A1138C30B5ADCEF1BA2363B360E: 0xD7953BFE8CB591F129FD0862A9E9C421151E2B5831560FF5215D23F751364B35,  # noqa: E501
-            0x696664A5F0AB5ACD9304A377FB684F2D3FE6BB60B8A95CB2BDBB57DB767E7A84: 0x154CF60E137C594516A065149610B6A3989396A42581D5FD8919E711C55DA225,  # noqa: E501
-            0x69AD1D19E617936ABDF05133BF268DC8CED6B518F22B249B5860967D07006487: 0x8C803B48B383DDABD1B3AFE858EFB48C203229B7317DD76149DDDAB4253B858A,  # noqa: E501
-            0x70B3BF53996FAC325EB67608A4EEB0CD0B55DEF6255D7ED42AD28EC07238B5D6: 0x45E9723E9232B37207ECAC1C97B8647D053625A578D450F7456280B2FF8EFC27,  # noqa: E501
-            0x7A9DCEE62E3E02CC8E020F372DF2EFDEB835F091C1EF1DBE221072D1095AABD2: 0x2F0000000000000000,  # noqa: E501
-            0x7E4D8C0F6D8ABB4CE1AE45B254046ACEEDABFA9548851B8B5D3E2C0637C985FD: 0xB,  # noqa: E501
-            0x7E95F3CC3315D289C52253BAABA29B1B00C86816E6B788D50795279A8BAA00DB: 0x45E9723E9232B37207ECAC1C97B8647D053625A578D450F7456280B2FF8EFC27,  # noqa: E501
-            0x8DA187157087529EE4E9C381F8E3149C56ACF3BDFDA29B8B9B4532F24B83F5FE: 0x8C4183732567A99A8A718E363391E102532F9A640E42968CF2354D9ACC908BB0,  # noqa: E501
-            0x9001F91DDAEF87BC067886E874C0749998C9B58B2EC8472CA014CA8B55F88578: 0xFB76974EEFCA01F33FB38646C2D3C1536F1A763D7AFF53AB7F877D4C5EA7FD0,  # noqa: E501
-            0x9ED0CEDD2A9A78D949F40019F53D10031AEF6ED342C97E01FC03B481EE56B3CB: 0x4,  # noqa: E501
-            0x9FDDF1DB29CAA5C1239EDD86E9E0835CDFE41F7253EC78F62D3DA8558D6F3CD7: 0x104EEF8FA35BF39F677D81855BC0B9F42317F32792E98E95E4DF441DEB634211,  # noqa: E501
-            0xA0953566119395C11186B334805FC1A16175ECAC0ECC93AE0322264F0DC2E40D: 0x10C5A00466AB7C0ADAE1E93537CC275EA8CF23FF509D5466A1FD6F56B0A61D1B,  # noqa: E501
-            0xAA0DBF8241EF3AE07C254E6869E84895BA2BE0779A7F261C8308A3114BE1C54A: 0x4,  # noqa: E501
-            0xAFFE808B495D13A14391CE5F27C211C36DA12826969CD7841EE0D81E5B900E2D: 0x1,  # noqa: E501
-            0xAFFE808B495D13A14391CE5F27C211C36DA12826969CD7841EE0D81E5B900E2E: 0x1,  # noqa: E501
-            0xB4A2B68C48EF78AEB641EE538FAD51781022FD23ED9D93D211017DB6A02376CE: 0xFBC06642245CF2FED7ED46EA0A18A7185830B6F2C4E0A4CA55246041E8BFA72,  # noqa: E501
-            0xBA8D79990898383919E437F2458B93B340072C89D963808D9E04F51858E3C5EC: 0x41D2CAC534D90A0DBD199117481A63E32CC11411DAB2EAA36C91C0EEC62823CF,  # noqa: E501
-            0xBB3BC1A2015123750DF57D4CEFF7E28CB847910B79B34841DE905B59A8BB177C: 0x734417EB19E1873427257F1EA1594748C16CFA866A7B7CF896E281F2EC774A40,  # noqa: E501
-            0xBF30CDCB83AB2BD5F5EEE691FFA4107B58B75BA6A5C2E6754D4C5C0437F2876C: 0x5,  # noqa: E501
-            0xC2A26B80067FC36B8268B0D5B31AFFF953FA91CEBEA39F191E2763D6E71259B9: 0x2A43C547FE8DE2400D2A141016550E8BAE058D41164247C099E787DDD40E789,  # noqa: E501
-            0xC98339D275EEF16E0562CA8521212CEF61AA0F39B12E2A27502AAA97A9E5E70F: 0x5A3DE2A5C268CDB75F4B01507AA80C4E4A1BC67BCB0DF265BBB00060774E5978,  # noqa: E501
-            0xCBD6AE6BD61BC9270EC836F1919B3268113ABE076C7FEBFDB8CF573B199CE9A9: 0xF402B17773C1F7534034EE58DC0D2A3421470A7A67DAF4FA790DC3B420EEF790,  # noqa: E501
-            0xD2C8CBB562FCCD0C9A3D0D491B7F65CC6A89856498F933427D9D21B745B9D50E: 0x3625A26FDB7B747501F1EE2500F98C49D9CD290383A21254587C3C49D2805321,  # noqa: E501
-            0xD66F52A4E24585238CCC03443B2FDB8B2B100259BC7260F39097C7C339211FFE: 0x1641851904381915C86B60DF7E288896FB5F8EBAD65D594829FB9F2B59CD1DA6,  # noqa: E501
-            0xD8F720C05A5526DD621D1831AE122ABDDD3DFECD8B63B0BA4C92FA7B2ADE44FF: 0xAD393086F30B49511B08FDD27AC78810B084C7CD7DE6AC354F614C18EA9E7DF4,  # noqa: E501
-            0xDC22D3171B82817C910BBEAC1F8B50C8DE99F8C524F172AEF3491981BD5ED4FB: 0x94B8CBA4EA090D1C392FBC94B82FB9EF9F468A15BBC537F4D051776F4D422B1D,  # noqa: E501
-            0xDCE8ADBDEFA929DBE60245F359446DB4174C62824B42E5D4D9E7B834B4D61DEB: 0x2C9069845B2E74C577FF1CD18DF6BC452805F527A9EE91FD4A059E0408B5DEA6,  # noqa: E501
-            0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D196: 0x1,  # noqa: E501
-            0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D197: 0x1,  # noqa: E501
-            0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D198: 0x1,  # noqa: E501
-            0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D199: 0x1,  # noqa: E501
-            0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D19A: 0x1,  # noqa: E501
-            0xE54F074C81BFA60B5BF413934C108086298B77291560EDFEEAD8AA1232E95236: 0xF40AAA24323C9E6983CCFFAFEEBE4B426509B901E8C98B8A40D881804804E6B,  # noqa: E501
-            0xE66C0F55F66C752EDF73027D45B7B1AE729AE15E1C67C362DBC6F25EDF8D76FF: 0x1,  # noqa: E501
-            0xE983D899F807BBCB5881F2DDF875B2EBB5CB8A7A4E77A8C98A40AAAE6A468735: 0x6D0BE832B2007EA28CDA705B73922CBF9794C5A25B89BD2F28B7347ED2B96C86,  # noqa: E501
-            0xED7D6E2D40FBD5046412FFAD1C45B63D87C6197182D6DBC66BB1E5C6E4DED5C7: 0xABA4CD295118A482A0A62579E35E4BA5BDD76146CC9E4D96172FCE8BE8977AB4,  # noqa: E501
-            0xF043B5A1952847579F233706A8F130889A484D2DA3E574FDD5859F05AAF52111: 0x2,  # noqa: E501
-            0xF40F4CFDACB62DD799F36B580349FAC1F4A4CAF8DD3383CC387C35ADB6574E21: 0x2F0000000000000000,  # noqa: E501
-            0xF60FA6E25E9028A6DC6B26BBC1EADAE3DA157DF0D1D6F6628BC33CAD68A7E455: 0x2D7D00618C059EBE40593B9497C633E1AC6E161DADBD5BB734C2663CD3E8A8E1,  # noqa: E501
-            0xFD280AC5182D5B2366122F38ACFA6DC471240FFDE9D5FEB985CE7A2325C960E7: 0x3,  # noqa: E501
-        },
-        nonce=0,
-        address=Address("0x0ea65418d7bf32680f55572c943a94b590804998"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x31F, value=0x0)
-            + Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xC9AE5868651BF7B7DB6E360217DB49CE4E69C07E,
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xEA65418D7BF32680F55572C943A94B590804998,
-            )
-            + Op.JUMPI(
-                pc=0x38D, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x27138BFB))
-            )
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x44]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x7A66D7CA)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x24,
-                    ret_offset=0xE0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0xE0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.MSTORE
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x44]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xC60409C6)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x24,
-                    ret_offset=0x120,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x120)
-            + Op.SWAP1
-            + Op.POP
-            + Op.NUMBER
-            + Op.MSTORE(offset=0x100, value=Op.SDIV)
-            + Op.MSTORE(offset=0x140, value=0x0)
-            + Op.MSTORE(offset=0x160, value=0x0)
-            + Op.MSTORE(offset=0x180, value=0x0)
-            + Op.JUMPI(
-                pc=0x10A,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.SLT(
-                            Op.MLOAD(offset=0x100),
-                            Op.ADD(Op.MLOAD(offset=0xA0), 0x2),
-                        ),
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x140, value=0x1)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1A0, value=0x0)
-            + Op.MSTORE(offset=0x1C0, value=Op.MLOAD(offset=0x100))
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x184,
-                condition=Op.ISZERO(
-                    Op.SLT(
-                        Op.MLOAD(offset=0x1C0),
-                        Op.ADD(Op.MLOAD(offset=0x100), 0x64),
-                    ),
-                ),
-            )
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xCC1C944E)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x40),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x44,
-                    ret_offset=0x1E0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x1E0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.MLOAD(offset=0x1A0)
-            + Op.MSTORE(offset=0x1A0, value=Op.ADD)
-            + Op.MSTORE(
-                offset=0x1C0, value=Op.ADD(Op.MLOAD(offset=0x1C0), 0x1)
-            )
-            + Op.JUMP(pc=0x119)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x5]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xCC1C944E)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xA0)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x40),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x44,
-                    ret_offset=0x200,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x200)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLT
-            + Op.JUMPI(pc=0x1D3, condition=Op.ISZERO(Op.DUP1))
-            + Op.DUP1
-            + Op.JUMP(pc=0x1DB)
-            + Op.JUMPDEST
-            + Op.SLT(Op.MLOAD(offset=0x1A0), 0xA)
-            + Op.JUMPDEST
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(pc=0x1EB, condition=Op.ISZERO)
-            + Op.MLOAD(offset=0x140)
-            + Op.JUMP(pc=0x1EE)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x336, condition=Op.ISZERO)
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x44]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xC5476EFE)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x24,
-                    ret_offset=0x240,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x240)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x7265802D)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=0x0)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x44,
-                    ret_offset=0x260,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x260)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xC286273A)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=0x0)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x44,
-                    ret_offset=0x280,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x280)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x44]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x7A66D7CA)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x24,
-                    ret_offset=0x2A0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x2A0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.MSTORE
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x84]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xBB8E4196)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xA0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x44), value=Op.MLOAD(offset=0x100)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x40),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x64,
-                    ret_offset=0x2C0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x2C0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.JUMP(pc=0x343)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x160, value=0x1)
-            + Op.MSTORE(offset=0x180, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x355, condition=Op.ISZERO(Op.MLOAD(offset=0x140)))
-            + Op.MLOAD(offset=0x160)
-            + Op.JUMP(pc=0x358)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x366, condition=Op.ISZERO)
-            + Op.MLOAD(offset=0x180)
-            + Op.JUMP(pc=0x369)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x37F, condition=Op.ISZERO)
-            + Op.MSTORE(offset=0x2E0, value=0x1)
-            + Op.RETURN(offset=0x2E0, size=0x20)
-            + Op.JUMP(pc=0x38C)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x300, value=0x0)
-            + Op.RETURN(offset=0x300, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.POP
-        ),
-        nonce=0,
-        address=Address("0x142a6927cf0060133187ba8a8e74d641438f0c1c"),  # noqa: E501
-    )
-    pre[coinbase] = Account(balance=1, nonce=0)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x5DF, value=0x0)
-            + Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xEA65418D7BF32680F55572C943A94B590804998,
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xE509E3A93BEB1EBA72F8CB8D25F93A85E2D54AFB,
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xC9AE5868651BF7B7DB6E360217DB49CE4E69C07E,
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xF1562E1C0D0BAA3EA746442BB7F11153FCF5CFDA,
-            )
-            + Op.JUMPI(
-                pc=0x38D, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x546FDEB3))
-            )
-            + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0xE0, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x100, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x64))
-            + Op.MSTORE(offset=0x140, value=Op.CALLDATALOAD(offset=0x84))
-            + Op.ADD(Op.MLOAD(offset=0x100), 0x2)
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE05DCB56)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.ADD(Op.MLOAD(offset=0x100), 0x2)
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP6,
-                    args_size=0x44,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x250,
-                condition=Op.ISZERO(
-                    Op.EQ(
-                        Op.MLOAD(
-                            offset=Op.ADD(
-                                Op.DUP3,
-                                Op.MUL(
-                                    0x20, Op.ADD(Op.MLOAD(offset=0x100), 0x1)
-                                ),
-                            ),
-                        ),
-                        0x0,
-                    ),
-                ),
-            )
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH2[0x14C]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE365736B)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x84]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x2F300BEE)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=0x2)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=0x5)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x44), value=Op.MLOAD(offset=0x100)
-            )
-            + Op.DUP5
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x80),
-                    value=0x0,
-                    args_offset=Op.DUP6,
-                    args_size=0x64,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.ADD(
-                0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20)))
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x44), value=Op.DUP4)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP5, 0xA4), value=Op.SUB(Op.DUP3, 0x20)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x108), value=Op.DUP1)
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.ADD(0x4, Op.DUP2)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=0x1FC,
-                condition=Op.CALL(
-                    gas=0x1C,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=0x64,
-                    ret_offset=Op.DUP2,
-                    ret_size=0x64,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.ADD(Op.DUP2, 0x64)
-            + Op.SWAP3
-            + Op.POP
-            + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x108))
-            + Op.DUP1
-            + Op.JUMPI(
-                pc=0x223,
-                condition=Op.CALL(
-                    gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xA4)),
-                    args_size=Op.DUP3,
-                    ret_offset=Op.DUP6,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.SUB(Op.DUP4, Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x280,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x280)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x37D)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH2[0x14C]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE365736B)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x84]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x2F300BEE)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4),
-                value=Op.SUB(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.DUP6,
-                            Op.MUL(0x20, Op.ADD(Op.MLOAD(offset=0x100), 0x1)),
-                        ),
-                    ),
-                    0x1,
-                ),
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=0x5)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x44), value=Op.MLOAD(offset=0x100)
-            )
-            + Op.DUP5
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x80),
-                    value=0x0,
-                    args_offset=Op.DUP6,
-                    args_size=0x64,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.ADD(
-                0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20)))
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x44), value=Op.DUP4)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP5, 0xA4), value=Op.SUB(Op.DUP3, 0x20)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x108), value=Op.DUP1)
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.ADD(0x4, Op.DUP2)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=0x32D,
-                condition=Op.CALL(
-                    gas=0x1C,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=0x64,
-                    ret_offset=Op.DUP2,
-                    ret_size=0x64,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.ADD(Op.DUP2, 0x64)
-            + Op.SWAP3
-            + Op.POP
-            + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x108))
-            + Op.DUP1
-            + Op.JUMPI(
-                pc=0x354,
-                condition=Op.CALL(
-                    gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xA4)),
-                    args_size=Op.DUP3,
-                    ret_offset=Op.DUP6,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.SUB(Op.DUP4, Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x2C0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x2C0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.MSTORE(offset=0x2E0, value=0x1)
-            + Op.RETURN(offset=0x2E0, size=0x20)
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x764, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xDE9080C8))
-            )
-            + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0xE0, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x100, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x64))
-            + Op.MSTORE(offset=0x140, value=Op.CALLDATALOAD(offset=0x84))
-            + Op.ADD(Op.MLOAD(offset=0x100), 0x2)
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE05DCB56)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.DUP2
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP6,
-                    args_size=0x44,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x2C5A40D5)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.MLOAD(offset=0x140)
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP6,
-                    args_size=0x44,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MLOAD(offset=0x120)
-            + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4EE,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x120))),
-            )
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x28C8B315)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP2)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x40),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x44,
-                    ret_offset=0x360,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x360)
-            + Op.SWAP1
-            + Op.POP
-            + Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2))
-            + Op.MSTORE
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x493)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH2[0x20C]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xA647A5B9)
-            + Op.DUP5
-            + Op.ADD(
-                0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20)))
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x4), value=Op.DUP4)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP5, 0xA4), value=Op.SUB(Op.DUP3, 0x20)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x148), value=Op.DUP1)
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.DUP4
-            + Op.ADD(
-                0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20)))
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x24), value=Op.DUP4)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP5, 0xC4), value=Op.SUB(Op.DUP3, 0x20)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x168), value=Op.DUP1)
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.DUP3
-            + Op.ADD(
-                0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20)))
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x44), value=Op.DUP4)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP5, 0xE4), value=Op.SUB(Op.DUP3, 0x20)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x188), value=Op.DUP1)
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x64), value=Op.MLOAD(offset=0x120)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x84), value=Op.MLOAD(offset=0x100)
-            )
-            + Op.ADD(0x4, Op.DUP2)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=0x5B5,
-                condition=Op.CALL(
-                    gas=0x22,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=0xA4,
-                    ret_offset=Op.DUP2,
-                    ret_size=0xA4,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.ADD(Op.DUP2, 0xA4)
-            + Op.SWAP3
-            + Op.POP
-            + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x148))
-            + Op.DUP1
-            + Op.JUMPI(
-                pc=0x5DC,
-                condition=Op.CALL(
-                    gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xA4)),
-                    args_size=Op.DUP3,
-                    ret_offset=Op.DUP6,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x168))
-            + Op.DUP1
-            + Op.JUMPI(
-                pc=0x604,
-                condition=Op.CALL(
-                    gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xC4)),
-                    args_size=Op.DUP3,
-                    ret_offset=Op.DUP6,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x188))
-            + Op.DUP1
-            + Op.JUMPI(
-                pc=0x62C,
-                condition=Op.CALL(
-                    gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xE4)),
-                    args_size=Op.DUP3,
-                    ret_offset=Op.DUP6,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.SUB(Op.DUP4, Op.DUP1)
-            + Op.DUP8
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x80),
-                    value=0x0,
-                    args_offset=Op.DUP7,
-                    args_size=Op.DUP5,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP3
-            + Op.POP
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH2[0x14C]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE365736B)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.DUP5
-            + Op.ADD(
-                0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20)))
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x44), value=Op.DUP4)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP5, 0xA4), value=Op.SUB(Op.DUP3, 0x20)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x108), value=Op.DUP1)
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.ADD(0x4, Op.DUP2)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=0x6DF,
-                condition=Op.CALL(
-                    gas=0x1C,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=0x64,
-                    ret_offset=Op.DUP2,
-                    ret_size=0x64,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.ADD(Op.DUP2, 0x64)
-            + Op.SWAP3
-            + Op.POP
-            + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x108))
-            + Op.DUP1
-            + Op.JUMPI(
-                pc=0x706,
-                condition=Op.CALL(
-                    gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xA4)),
-                    args_size=Op.DUP3,
-                    ret_offset=Op.DUP6,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.SUB(Op.DUP4, Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x3C0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x3C0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x752,
-                condition=Op.ISZERO(
-                    Op.EQ(
-                        Op.MLOAD(
-                            offset=Op.ADD(
-                                Op.DUP5,
-                                Op.MUL(0x20, Op.MLOAD(offset=0x100)),
-                            ),
-                        ),
-                        0x0,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x3E0, value=0x0)
-            + Op.RETURN(offset=0x3E0, size=0x20)
-            + Op.JUMP(pc=0x75F)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x400, value=0x1)
-            + Op.RETURN(offset=0x400, size=0x20)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xA66, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x384CA8DD))
-            )
-            + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0xE0, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x100, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x64))
-            + Op.MSTORE(offset=0x140, value=Op.CALLDATALOAD(offset=0x84))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE05DCB56)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.ADD(Op.MLOAD(offset=0x100), 0x2)
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP6,
-                    args_size=0x44,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xFA9832D1)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.MLOAD(offset=0x100)
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP6,
-                    args_size=0x44,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x84]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xAAD7D6E3)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH2[0x14C]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x5B180229)
-            + Op.DUP4
-            + Op.ADD(
-                0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20)))
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x4), value=Op.DUP4)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP5, 0x64), value=Op.SUB(Op.DUP3, 0x20)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0xC8), value=Op.DUP1)
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.DUP5
-            + Op.ADD(
-                0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20)))
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x24), value=Op.DUP4)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP5, 0x84), value=Op.SUB(Op.DUP3, 0x20)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0xE8), value=Op.DUP1)
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x44), value=Op.MLOAD(offset=0x100)
-            )
-            + Op.ADD(0x4, Op.DUP2)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=0x901,
-                condition=Op.CALL(
-                    gas=0x1C,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=0x64,
-                    ret_offset=Op.DUP2,
-                    ret_size=0x64,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.ADD(Op.DUP2, 0x64)
-            + Op.SWAP3
-            + Op.POP
-            + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0xC8))
-            + Op.DUP1
-            + Op.JUMPI(
-                pc=0x927,
-                condition=Op.CALL(
-                    gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0x64)),
-                    args_size=Op.DUP3,
-                    ret_offset=Op.DUP6,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0xE8))
-            + Op.DUP1
-            + Op.JUMPI(
-                pc=0x94E,
-                condition=Op.CALL(
-                    gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0x84)),
-                    args_size=Op.DUP3,
-                    ret_offset=Op.DUP6,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.SUB(Op.DUP4, Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x80),
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x440,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x440)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.ADD(Op.DUP3, 0x44)
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x64,
-                    ret_offset=0x460,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x460)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH2[0x14C]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x222A8663)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.DUP3
-            + Op.ADD(
-                0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20)))
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x44), value=Op.DUP4)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP5, 0xA4), value=Op.SUB(Op.DUP3, 0x20)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x108), value=Op.DUP1)
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.ADD(0x4, Op.DUP2)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=0xA07,
-                condition=Op.CALL(
-                    gas=0x1C,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=0x64,
-                    ret_offset=Op.DUP2,
-                    ret_size=0x64,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.ADD(Op.DUP2, 0x64)
-            + Op.SWAP3
-            + Op.POP
-            + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x108))
-            + Op.DUP1
-            + Op.JUMPI(
-                pc=0xA2E,
-                condition=Op.CALL(
-                    gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xA4)),
-                    args_size=Op.DUP3,
-                    ret_offset=Op.DUP6,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.SUB(Op.DUP4, Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x480,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x480)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x4A0, value=0x1)
-            + Op.RETURN(offset=0x4A0, size=0x20)
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xD4B, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xD5DC5AF1))
-            )
-            + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0xE0, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x100, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x64))
-            + Op.MSTORE(offset=0x140, value=Op.CALLDATALOAD(offset=0x84))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE05DCB56)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.ADD(Op.MLOAD(offset=0x100), 0x2)
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP6,
-                    args_size=0x44,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x2C5A40D5)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.MLOAD(offset=0x140)
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP6,
-                    args_size=0x44,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH2[0x1AC]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xF4CA7DC4)
-            + Op.DUP4
-            + Op.ADD(
-                0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20)))
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x4), value=Op.DUP4)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP5, 0x84), value=Op.SUB(Op.DUP3, 0x20)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x108), value=Op.DUP1)
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.DUP3
-            + Op.ADD(
-                0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20)))
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x24), value=Op.DUP4)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP5, 0xA4), value=Op.SUB(Op.DUP3, 0x20)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x128), value=Op.DUP1)
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x44), value=Op.MLOAD(offset=0x120)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x64), value=Op.MLOAD(offset=0x100)
-            )
-            + Op.ADD(0x4, Op.DUP2)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=0xBE7,
-                condition=Op.CALL(
-                    gas=0x1F,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=0x84,
-                    ret_offset=Op.DUP2,
-                    ret_size=0x84,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.ADD(Op.DUP2, 0x84)
-            + Op.SWAP3
-            + Op.POP
-            + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x108))
-            + Op.DUP1
-            + Op.JUMPI(
-                pc=0xC0E,
-                condition=Op.CALL(
-                    gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0x84)),
-                    args_size=Op.DUP3,
-                    ret_offset=Op.DUP6,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x128))
-            + Op.DUP1
-            + Op.JUMPI(
-                pc=0xC36,
-                condition=Op.CALL(
-                    gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xA4)),
-                    args_size=Op.DUP3,
-                    ret_offset=Op.DUP6,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.SUB(Op.DUP4, Op.DUP1)
-            + Op.MLOAD(offset=0x140)
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x80),
-                    value=0x0,
-                    args_offset=Op.DUP7,
-                    args_size=Op.DUP5,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH2[0x14C]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xB39E1FAA)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.DUP3
-            + Op.ADD(
-                0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20)))
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x44), value=Op.DUP4)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP5, 0xA4), value=Op.SUB(Op.DUP3, 0x20)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x108), value=Op.DUP1)
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.ADD(0x4, Op.DUP2)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=0xCEC,
-                condition=Op.CALL(
-                    gas=0x1C,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=0x64,
-                    ret_offset=Op.DUP2,
-                    ret_size=0x64,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.ADD(Op.DUP2, 0x64)
-            + Op.SWAP3
-            + Op.POP
-            + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x108))
-            + Op.DUP1
-            + Op.JUMPI(
-                pc=0xD13,
-                condition=Op.CALL(
-                    gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xA4)),
-                    args_size=Op.DUP3,
-                    ret_offset=Op.DUP6,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.SUB(Op.DUP4, Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x4C0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x4C0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x4E0, value=0x1)
-            + Op.RETURN(offset=0x4E0, size=0x20)
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x114C, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x939AA8C))
-            )
-            + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0xE0, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x100, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x64))
-            + Op.MSTORE(offset=0x140, value=Op.CALLDATALOAD(offset=0x84))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE05DCB56)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.ADD(Op.MLOAD(offset=0x100), 0x2)
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP6,
-                    args_size=0x44,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x7DC12195)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.MLOAD(offset=0x140)
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP6,
-                    args_size=0x44,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x586B5BE0)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x44,
-                    ret_offset=0x500,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x500)
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xEB8AF5AA)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.MLOAD(offset=0x120)
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP6,
-                    args_size=0x44,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0xC0]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH2[0x26C]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x232B2734)
-            + Op.DUP3
-            + Op.ADD(
-                0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20)))
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x4), value=Op.DUP4)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP5, 0xC4), value=Op.SUB(Op.DUP3, 0x20)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x188), value=Op.DUP1)
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.DUP6
-            + Op.ADD(
-                0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20)))
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x24), value=Op.DUP4)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP5, 0xE4), value=Op.SUB(Op.DUP3, 0x20)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x1A8), value=Op.DUP1)
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.DUP5
-            + Op.ADD(
-                0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20)))
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x44), value=Op.DUP4)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP5, 0x104), value=Op.SUB(Op.DUP3, 0x20)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x1C8), value=Op.DUP1)
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x84), value=Op.MLOAD(offset=0x120)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0xA4), value=Op.MLOAD(offset=0x100)
-            )
-            + Op.ADD(0x4, Op.DUP2)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=0xF96,
-                condition=Op.CALL(
-                    gas=0x25,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=0xC4,
-                    ret_offset=Op.DUP2,
-                    ret_size=0xC4,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.ADD(Op.DUP2, 0xC4)
-            + Op.SWAP3
-            + Op.POP
-            + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x188))
-            + Op.DUP1
-            + Op.JUMPI(
-                pc=0xFBD,
-                condition=Op.CALL(
-                    gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xC4)),
-                    args_size=Op.DUP3,
-                    ret_offset=Op.DUP6,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x1A8))
-            + Op.DUP1
-            + Op.JUMPI(
-                pc=0xFE5,
-                condition=Op.CALL(
-                    gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xE4)),
-                    args_size=Op.DUP3,
-                    ret_offset=Op.DUP6,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x1C8))
-            + Op.DUP1
-            + Op.JUMPI(
-                pc=0x100E,
-                condition=Op.CALL(
-                    gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0x104)),
-                    args_size=Op.DUP3,
-                    ret_offset=Op.DUP6,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.SUB(Op.DUP4, Op.DUP1)
-            + Op.MLOAD(offset=0x120)
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x80),
-                    value=0x0,
-                    args_offset=Op.DUP7,
-                    args_size=Op.DUP5,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH2[0x14C]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x1112B27)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0)
-            )
-            + Op.DUP3
-            + Op.ADD(
-                0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20)))
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x44), value=Op.DUP4)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP5, 0xA4), value=Op.SUB(Op.DUP3, 0x20)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x108), value=Op.DUP1)
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.ADD(0x4, Op.DUP2)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=0x10C4,
-                condition=Op.CALL(
-                    gas=0x1C,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=0x64,
-                    ret_offset=Op.DUP2,
-                    ret_size=0x64,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.ADD(Op.DUP2, 0x64)
-            + Op.SWAP3
-            + Op.POP
-            + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x108))
-            + Op.DUP1
-            + Op.JUMPI(
-                pc=0x10EB,
-                condition=Op.CALL(
-                    gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xA4)),
-                    args_size=Op.DUP3,
-                    ret_offset=Op.DUP6,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.INVALID
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.SUB(Op.DUP4, Op.DUP1)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x580,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x580)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x113A,
-                condition=Op.ISZERO(
-                    Op.EQ(
-                        Op.MLOAD(
-                            offset=Op.ADD(
-                                Op.DUP6,
-                                Op.MUL(
-                                    0x20, Op.ADD(Op.MLOAD(offset=0x100), 0x1)
-                                ),
-                            ),
-                        ),
-                        0x0,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x5A0, value=0x0)
-            + Op.RETURN(offset=0x5A0, size=0x20)
-            + Op.JUMP(pc=0x1147)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x5C0, value=0x1)
-            + Op.RETURN(offset=0x5C0, size=0x20)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-        ),
-        nonce=0,
-        address=Address("0x9761fecf88590592cf05ce545504d376d1693ab3"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xD8D726B7177A800000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x75F, value=0x0)
-            + Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x1E147037F0A63DF228FE6E7AEF730F1EA31C8CE3,
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xEA65418D7BF32680F55572C943A94B590804998,
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xE509E3A93BEB1EBA72F8CB8D25F93A85E2D54AFB,
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0xC9AE5868651BF7B7DB6E360217DB49CE4E69C07E,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x142A6927CF0060133187BA8A8E74D641438F0C1C,
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0xB163E767E4C1BA5AE88B2EE7594F3A3FEC2BB096,
-            )
-            + Op.MSTORE(
-                offset=0xE0,
-                value=0xBA7B277319128EF4C22635534D0F61DFFDAA13AB,
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=0x9761FECF88590592CF05CE545504D376D1693AB3,
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=0xF70BBC50F1468CECAE0761EF09386A87C1C696EA,
-            )
-            + Op.MSTORE(
-                offset=0x140,
-                value=0xA89D22F049AAA5BBFB5F1A1939FFF3AE7A26AE74,
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=0x174827F7E53E8CE13B047ADCAC0EB3F2CB0C3285,
-            )
-            + Op.JUMPI(
-                pc=0xA88, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x36A560BD))
-            )
-            + Op.MSTORE(offset=0x1A0, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x44]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x27138BFB)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0xA0),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x24,
-                    ret_offset=0x1E0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x1E0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(pc=0x195, condition=Op.ISZERO(Op.ISZERO))
-            + Op.MSTORE(offset=0x200, value=Op.SUB(0x0, 0x1))
-            + Op.RETURN(offset=0x200, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x44]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x7A66D7CA)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x80),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x24,
-                    ret_offset=0x220,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x220)
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xCC1C944E)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP2)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x280),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x44,
-                    ret_offset=0x260,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x260)
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x44]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x80B5E7BD)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x60),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x24,
-                    ret_offset=0x2A0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x2A0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.MUL(Op.DUP3, Op.DUP1)
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x44]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x18633576)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x80),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x24,
-                    ret_offset=0x300,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x300)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(pc=0x36D, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x9)))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xC4]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xAC44D71E)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x160),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0xA4,
-                    ret_offset=0x360,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x360)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x7265802D)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=0x0)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x80),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x44,
-                    ret_offset=0x380,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x380)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x44]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xC5476EFE)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x80),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x24,
-                    ret_offset=0x3A0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x3A0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x3C0, value=Op.ADD(Op.DUP6, 0x1))
-            + Op.RETURN(offset=0x3C0, size=0x20)
-            + Op.JUMP(pc=0xA3A)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x3CD, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x0)))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xC4]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xEF72638A)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0xC0),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0xA4,
-                    ret_offset=0x3E0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x3E0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.JUMP(pc=0xA39)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x42D, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x1)))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xC4]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xA63E976C)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0xE0),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0xA4,
-                    ret_offset=0x400,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x400)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.JUMP(pc=0xA38)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x48D, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x2)))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xC4]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x533EA0ED)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0xE0),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0xA4,
-                    ret_offset=0x420,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x420)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.JUMP(pc=0xA37)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x850, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x3)))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE05DCB56)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
-            + Op.ADD(Op.DUP6, 0x2)
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x280),
-                    value=0x0,
-                    args_offset=Op.DUP6,
-                    args_size=0x44,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x44]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x3D905045)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x80),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x24,
-                    ret_offset=0x480,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x480)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(pc=0x633, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x4)))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xC4]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x939AA8C)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP8)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP7)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP6)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP5)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x100),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0xA4,
-                    ret_offset=0x4E0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x4E0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x4C0]
-            + Op.MSTORE
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xC286273A)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=0x0)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x80),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x44,
-                    ret_offset=0x500,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x500)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x5E5,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x4C0), 0x1)),
-            )
-            + Op.MSTORE(offset=0x520, value=Op.DUP3)
-            + Op.RETURN(offset=0x520, size=0x20)
-            + Op.JUMP(pc=0x62E)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x44]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xAAC2FFB5)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x80),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x24,
-                    ret_offset=0x540,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x540)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x560, value=Op.ADD(Op.DUP4, 0x1))
-            + Op.RETURN(offset=0x560, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMP(pc=0x804)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x694, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x0)))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xC4]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x546FDEB3)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP8)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP7)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP6)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP5)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x100),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0xA4,
-                    ret_offset=0x580,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x580)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.JUMP(pc=0x803)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x742, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x1)))
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xC4]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xDE9080C8)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP9)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP8)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP7)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP6)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x100),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0xA4,
-                    ret_offset=0x5A0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x5A0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(pc=0x732, condition=Op.ISZERO(Op.EQ))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x44]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x1CDA01EF)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x80),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x24,
-                    ret_offset=0x5C0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x5C0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x5E0, value=Op.DUP3)
-            + Op.RETURN(offset=0x5E0, size=0x20)
-            + Op.JUMP(pc=0x802)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x7A3, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x2)))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xC4]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x384CA8DD)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP8)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP7)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP6)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP5)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x100),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0xA4,
-                    ret_offset=0x600,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x600)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.JUMP(pc=0x801)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x800, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x3)))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xC4]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xD5DC5AF1)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP8)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP7)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP6)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP5)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x100),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0xA4,
-                    ret_offset=0x620,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x620)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x44]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x1CDA01EF)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x80),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x24,
-                    ret_offset=0x640,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x640)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x660, value=Op.DUP3)
-            + Op.RETURN(offset=0x660, size=0x20)
-            + Op.POP
-            + Op.POP
-            + Op.JUMP(pc=0xA36)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8B1, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x4)))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xC4]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xF6559853)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x120),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0xA4,
-                    ret_offset=0x680,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x680)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.JUMP(pc=0xA35)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x912, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x5)))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xC4]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xD8E5473D)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x120),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0xA4,
-                    ret_offset=0x6A0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x6A0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.JUMP(pc=0xA34)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x973, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x6)))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xC4]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x90507EA)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x120),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0xA4,
-                    ret_offset=0x6C0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x6C0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.JUMP(pc=0xA33)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x9D4, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x7)))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xC4]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x5B911842)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x140),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0xA4,
-                    ret_offset=0x6E0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x6E0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.JUMP(pc=0xA32)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0xA31, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x8)))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xC4]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xABE22B84)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x140),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0xA4,
-                    ret_offset=0x700,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x700)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x44]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xAAC2FFB5)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x80),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x24,
-                    ret_offset=0x720,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x720)
-            + Op.SWAP1
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(offset=0x740, value=Op.ADD(Op.DUP2, 0x1))
-            + Op.RETURN(offset=0x740, size=0x20)
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-        ),
-        nonce=0,
-        address=Address("0xb03f030056db7d467d778326658bac0d1b35d8f7"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    callee_8 = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x83F, value=0x0)
-            + Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x66],
-                condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x7A66D7CA)),
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x60, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0x60, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xA5],
-                condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xC60409C6)),
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0xA0, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0xA0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xE4],
-                condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x18633576)),
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0xE0, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0xE0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1BC, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xB3903C8A))
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x5)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x120, value=Op.SLOAD(key=Op.SHA3))
-            + Op.MLOAD(offset=0x120)
-            + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x160]
-            + Op.MSTORE
-            + Op.MSTORE(offset=0x1C0, value=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x19F,
-                condition=Op.ISZERO(
-                    Op.SLT(Op.MLOAD(offset=0x1C0), Op.MLOAD(offset=0x120)),
-                ),
-            )
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x4)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(
-                offset=Op.ADD(
-                    Op.MLOAD(offset=0x160),
-                    Op.MUL(0x20, Op.MLOAD(offset=0x1C0)),
-                ),
-                value=Op.SLOAD(key=Op.SHA3),
-            )
-            + Op.MSTORE(
-                offset=0x1C0, value=Op.ADD(Op.MLOAD(offset=0x1C0), 0x1)
-            )
-            + Op.JUMP(pc=0x147)
-            + Op.JUMPDEST
-            + Op.MLOAD(offset=0x160)
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1FD, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x6824E0FB))
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x5)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x220, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0x220, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x23E, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x3DB16BE3))
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x6)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x260, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0x260, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2E0, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xC3387858))
-            )
-            + Op.MSTORE(offset=0x2A0, value=0x0)
-            + Op.MSTORE(offset=0x2C0, value=Op.SLOAD(key=0x0))
-            + Op.MLOAD(offset=0x2C0)
-            + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x2E0]
-            + Op.MSTORE
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2C3,
-                condition=Op.ISZERO(
-                    Op.SLT(Op.MLOAD(offset=0x2A0), Op.MLOAD(offset=0x2C0)),
-                ),
-            )
-            + Op.PUSH1[0x40]
-            + Op.PUSH1[0x40]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x1)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x2A0)
-            )
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(
-                offset=Op.ADD(
-                    Op.MLOAD(offset=0x2E0),
-                    Op.MUL(0x20, Op.MLOAD(offset=0x2A0)),
-                ),
-                value=Op.SLOAD(key=Op.SHA3),
-            )
-            + Op.MSTORE(
-                offset=0x2A0, value=Op.ADD(Op.MLOAD(offset=0x2A0), 0x1)
-            )
-            + Op.JUMP(pc=0x27A)
-            + Op.JUMPDEST
-            + Op.MLOAD(offset=0x2E0)
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2FA, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x175C6322))
-            )
-            + Op.MSTORE(offset=0x380, value=Op.SLOAD(key=0x0))
-            + Op.RETURN(offset=0x380, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x336, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xD861F2B4))
-            )
-            + Op.MSTORE(offset=0x3A0, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH1[0x40]
-            + Op.PUSH1[0x40]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x1)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x3A0)
-            )
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x3C0, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0x3C0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x44F, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xB0DAB01F))
-            )
-            + Op.MSTORE(offset=0x400, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x420, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x440, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MSTORE(offset=0x460, value=Op.CALLDATALOAD(offset=0x64))
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x400)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.JUMPI(pc=0x441, condition=Op.ISZERO(Op.EQ))
-            + Op.MLOAD(offset=0x420)
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x400)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x440)
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x400)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x460)
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x400)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x6)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x400)
-            + Op.PUSH1[0x40]
-            + Op.PUSH1[0x40]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x1)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.SLOAD(key=0x0))
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.MSTORE(offset=0x520, value=0x1)
-            + Op.RETURN(offset=0x520, size=0x20)
-            + Op.JUMP(pc=0x44E)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x540, value=0x0)
-            + Op.RETURN(offset=0x540, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B9, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xAAC2FFB5))
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.ADD
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(offset=0x5A0, value=0x1)
-            + Op.RETURN(offset=0x5A0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x507, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x7265802D))
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x5C0, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MLOAD(offset=0x5C0)
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(offset=0x600, value=0x1)
-            + Op.RETURN(offset=0x600, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x571, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xC5476EFE))
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.ADD
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(offset=0x660, value=0x1)
-            + Op.RETURN(offset=0x660, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x63B, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xC551E31E))
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x680, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x5)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x120, value=Op.SLOAD(key=Op.SHA3))
-            + Op.MLOAD(offset=0x680)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x4)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x120)
-            )
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x5)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.ADD
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x5)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(offset=0x720, value=0x1)
-            + Op.RETURN(offset=0x720, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x67C, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x3D905045))
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x3)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x740, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0x740, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x6E6, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x1CDA01EF))
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x3)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.ADD
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x3)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(offset=0x7C0, value=0x1)
-            + Op.RETURN(offset=0x7C0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x734, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xC286273A))
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x7E0, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MLOAD(offset=0x7E0)
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x3)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(offset=0x820, value=0x1)
-            + Op.RETURN(offset=0x820, size=0x20)
-            + Op.JUMPDEST
-            + Op.POP
-        ),
-        storage={
-            0x0: 0x1,
-            0xA4470E9D0419DF71F6257FCDFD2C0A3BAD96A23F5AB414BC10AAF1A31A536A7: 0xB4876148229C22BD2291F1A4F5468C8C789B23639370C4D447F270BA341DBBEC,  # noqa: E501
-            0x16EF4193A274568D283FF919C299729E07696D9ADA48187B81D68E12E7B962DE: 0xA103C04E7ECB9B3395F77C7B0CAD28E62C85F042DE4767CCC6C005E6F47F8D4,  # noqa: E501
-            0x1F1866E966F321B84535705846689749D34D5DC02994613E2931973C605D9E93: 0xC723D0AA4A60529FE42277C8094AA19263AFF36650136EFC5EDFD0785D457634,  # noqa: E501
-            0x252A4EC7133643FDDCDB22A86C415F78B2DD251F18D1EFCD6A44ACF590C4AE72: 0x9CAF94B82715869E71D3CEE986094EA612F0258570B7E5EF47B5D09E9515322B,  # noqa: E501
-            0x41B451E8D86D28ADD758CBD3F48A18FD04B11A80288C1DC434A5BF2D8FB1CA64: 0xB602498F12A8B4AF3A1FCA357CEA6B19BCD163DFEC1D845364CE1395F7C21FA7,  # noqa: E501
-            0x491D10658C1EC762152D8AD2D890AD59111B1EE7B4BC25736046923D3534D9A5: 0x629E,  # noqa: E501
-            0x5B0E8552EFD72A845E47318ABBBEF9DC9FCDFE0D1A06CDA44494401301581511: 0xFBC98F4017AE5C20459DAADAA6BEE519B6DE871D3DBAA9AB3F34340FEF4CB643,  # noqa: E501
-            0x5B672A107BA6FAB01CBDDF079042E9F6176A8E6F154584FC4DF4B15674C9456E: 0x1603DA41D610854D85536B37D000E5EB7CA09786C43F50E7441C0AFBFF1DE0A9,  # noqa: E501
-            0x605B934BD26C9ECDF7029A7DC062D3A6B87338511CFF96E0C5F13DE9EEA3462E: 0xF0D24F3D0EDA573FC5D43E3D0680993C51293752CD6DE205040D3197F412F475,  # noqa: E501
-            0x618355E25491DFE86175F9D9B3147E4D680AA561D98384E3621DC6A3088B0846: 0x6B2E6D2D5DEB27DFFEC973F23AF4CAF111E66D1397F467DBBEDF5AB2192FB6B6,  # noqa: E501
-            0x65112936BEC0F1E84FDA6623FB54E12BAADC8A4A208C8C4EB3ED5E79CBD7E85F: 0xA59AC24E3E0663413D0F87516BA8FB44C6C3E14DA8EAABBDE80F8EE285F65934,  # noqa: E501
-            0x687CB2122DE7BACF42B9CD380B04FF2A2CE92A0B63706A9A78263B3CE86F3313: 0x200000000000000,  # noqa: E501
-            0x72A539B064C98D29A514EE55694225E05FB41FE63E5FE710E4536BD9BA3591B4: 0x338ECFE6C523ED1184918B19584D97DD1095ECAADC49C7BA9DA62B8B513026E0,  # noqa: E501
-            0x7AEB0A0CE8882A12D853078382A2BC72F7A94AF6109F167DE37B36C0A7DEB828: 0x4C428400EA8A7BD7C46BA9895B508770EFA4551F0D793E1BEB1207DA01D9962F,  # noqa: E501
-            0x7C8F4A98E086F64E28C75F54712B5D44BEC3C29B5C70519E8880D3046A5618DC: 0xAAFC1F2601752B114D722070F75539BFEC7FAF49F0D48A48D27862F0C3B09903,  # noqa: E501
-            0x809C325F50ACF5787776E960985E72443B4330AD1E2F466557FFFEE16BA51D44: 0xB940A56E64B5B661D87919B8EF03640EC077A6D72DD0B524ADEDAA7DDC91FF7A,  # noqa: E501
-            0x84E4A80D33C5D2ABD2B0A5AEC0FDC5EAEED90AB31DB556E404A81718EA286E39: 0x1C,  # noqa: E501
-            0x877305412FA2486F563C457B744E5C8B1E4D0ECA73371DE5E771F2ABC263F4DC: 0x7088A36F67276D475AA62127CFDE9790CC802FDF3A54DF49461A25EB8BF15707,  # noqa: E501
-            0x922A8F2FC1CBE67C8ACC6A8A720983C366D71D3E2E78E3048949EBC913EA611A: 0x50FB9F913CA102534BB0A8EB8EBF19C68DFD16FFE5E207BCC580084CD4ECD8B4,  # noqa: E501
-            0x987CB9ECFD8CE499D9D0E9E6B7DA29617AA02774A34F4A8EA54442F44A1E1936: 0x5179F98F555F1E9F1D4A335D16F41154579A53E361E9859269B6FA74EA9C7D21,  # noqa: E501
-            0xADA5013122D395BA3C54772283FB069B10426056EF8CA54750CB9BB552A59E7D: 0xF69B5,  # noqa: E501
-            0xB16B117660F31197087F4D6FE50D3D4579152244956F753F9653CCF85F4B35C4: 0x830272E3BB35226B047244CBDC46F1B6B864A280461E7A592F70E0863F4F1D33,  # noqa: E501
-            0xB1F1AAEDFB83C7755A2BFFC9E2557F1723F9ABE5642397963E76248C9209AF57: 0xE9BE955C5FBFCD846D7425EAEA05CE897786AEFAD99665342CBF30761B352526,  # noqa: E501
-            0xB7BD50FDF7B043411C9AC33F0AF2CEBC69C393EB0B91F4976946F9C7B15AD0DA: 0xFCCCA0E7832BAE9AFE799A6D6177DC3869FA6C5B5105F8DF6F365DE5723820EC,  # noqa: E501
-            0xBC96058EB03504EE6F5C0A9582F8720D99A6E9738B171499507FACFF0B2C0B5B: 0x9DB6A4F2766B51013B8D2F9038131D1BB4AF725D019D111D7E26FF96C023B23F,  # noqa: E501
-            0xC186C4F377B7F13892ADE9656ACD1522AA1F8AC151AC4F62457B5073241D79FC: 0x7289738FEF00F1770EEB098DB9BD486C01AC12398D79CDF935514A128C585C51,  # noqa: E501
-            0xCAE57AE3017972D63EFFD8EAE44F5054402C3E890D154B905ED6B5B533327FA9: 0xD2E4BF465E61993D13089B940A7C55017A5117D8E43E4115550A139E1D4B3E3A,  # noqa: E501
-            0xCF569EE7BF3ACCC0F893DFFD04F1A757F373EFE80893EFF504FB3678F688EC1D: 0x3,  # noqa: E501
-            0xD69B7284545A9F5275DF64CE94848DC954FCB8A8B525E7AC801517C12A75AF84: 0x4202995350ABAE303B43E564AA79121A30B5F1AEA31F69CD25E07DD3FA64DCE7,  # noqa: E501
-            0xD8F6F90F51E657690EE28D1CC80D81BC1B89290065891FDD853D09CAAAF756AA: 0x1,  # noqa: E501
-            0xDE72F8EED43CC2A5A3EAA51483D14B17DC92BB26C154AE184CEE4B4895011EDC: 0x47CE2B6FDB72C3FABB9C74F82C1E3E522BCD42E614FD85C208AC3C4C840CEA72,  # noqa: E501
-            0xE0E687DDF317F3D2B209AE3884148EFF0F636E16827F82EDED14ADA8FC603009: 0xFA7C8939F9B033162CF8D75EA69671BB8A27041BD4CDC76594E61E99333CB041,  # noqa: E501
-            0xE8CDA339D72A1A350B62F1E3FA52E254C395CC9FDD9F60ADB21C7633FBDAB531: 0x128C4FDF4801A30EAE99DD58F0F3FF5CA65F71B66A9AC0F38DD450FB24B4AAAA,  # noqa: E501
-            0xEC5E7F54FA5E516E616B04F9D5A0EE433A80E09ED47D7E5269AFD76C05FF251E: 0x14,  # noqa: E501
-            0xF9A3BF5F2CCB903EE1A7644113B794DB0260DE404FB8F11203E75A7FFF151618: 0xBD94773C0D85C68240AE8DFD53D9D33CD137509BFC5D3433381299DF768C8377,  # noqa: E501
-        },
-        nonce=0,
-        address=Address("0xc9ae5868651bf7b7db6e360217db49ce4e69c07e"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    callee_9 = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0xB7F, value=0x0)
-            + Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xC9AE5868651BF7B7DB6E360217DB49CE4E69C07E,
-            )
-            + Op.JUMPI(
-                pc=0x245, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x8D3D587))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x80, value=Op.SLOAD(key=Op.SHA3))
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.ORIGIN)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.JUMPI(pc=0x14E, condition=Op.ISZERO(Op.ISZERO(Op.EQ)))
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.ORIGIN)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x80, value=Op.SLOAD(key=Op.SHA3))
-            + Op.PUSH9[0x2F0000000000000000]
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.ORIGIN
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.JUMP(pc=0x238)
-            + Op.JUMPDEST
-            + Op.MLOAD(offset=0x80)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.ORIGIN)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.PUSH9[0x2F0000000000000000]
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.ORIGIN
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.ADD
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1E0, value=0x1)
-            + Op.RETURN(offset=0x1E0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x29D, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x28C8B315))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x200, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x200)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x220, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0x220, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x386, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x74AF23EC))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x260, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x260)
-            )
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x200, value=Op.SLOAD(key=Op.SHA3))
-            + Op.JUMPI(
-                pc=0x332,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x200), 0x0)),
-            )
-            + Op.MLOAD(offset=0x260)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x200)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.ISZERO(Op.EQ)
-            + Op.JUMP(pc=0x335)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x347, condition=Op.ISZERO)
-            + Op.MSTORE(offset=0x2C0, value=0x0)
-            + Op.RETURN(offset=0x2C0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x200)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x2E0, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0x2E0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3DC, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x84D646EE))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x320, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0x320, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x6F4, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xF4229427))
-            )
-            + Op.MSTORE(offset=0x260, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x24]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x175C6322)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x4,
-                    ret_offset=0x3A0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x3A0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x360]
-            + Op.MSTORE
-            + Op.JUMPI(pc=0x581, condition=Op.ISZERO(Op.MLOAD(offset=0x260)))
-            + Op.MUL(0x2, Op.MLOAD(offset=0x360))
-            + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x3C0]
-            + Op.MSTORE
-            + Op.MLOAD(offset=0x360)
-            + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x420]
-            + Op.MSTORE
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x24]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xC3387858)
-            + Op.MLOAD(offset=0x360)
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP6,
-                    args_size=0x4,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x420]
-            + Op.MSTORE
-            + Op.MSTORE(offset=0x4C0, value=0x0)
-            + Op.MSTORE(offset=0x4E0, value=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x57C,
-                condition=Op.ISZERO(
-                    Op.SLT(Op.MLOAD(offset=0x4C0), Op.MLOAD(offset=0x360)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x420),
-                        Op.MUL(0x20, Op.MLOAD(offset=0x4C0)),
-                    ),
-                ),
-            )
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x74AF23EC)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0x260)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.ADDRESS,
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x44,
-                    ret_offset=0x520,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x520)
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x500]
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=0x56C,
-                condition=Op.ISZERO(
-                    Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x500), 0x0))
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(
-                    Op.MLOAD(offset=0x3C0),
-                    Op.MUL(0x20, Op.MLOAD(offset=0x4E0)),
-                ),
-                value=Op.MLOAD(offset=0x60),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(
-                    Op.MLOAD(offset=0x3C0),
-                    Op.MUL(0x20, Op.ADD(Op.MLOAD(offset=0x4E0), 0x1)),
-                ),
-                value=Op.MLOAD(offset=0x500),
-            )
-            + Op.MSTORE(
-                offset=0x4E0, value=Op.ADD(Op.MLOAD(offset=0x4E0), 0x2)
-            )
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x4C0, value=Op.ADD(Op.MLOAD(offset=0x4C0), 0x1)
-            )
-            + Op.JUMP(pc=0x4CE)
-            + Op.JUMPDEST
-            + Op.JUMP(pc=0x6D7)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x260, value=Op.ORIGIN)
-            + Op.MUL(0x2, Op.MLOAD(offset=0x360))
-            + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x3C0]
-            + Op.MSTORE
-            + Op.MLOAD(offset=0x360)
-            + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x420]
-            + Op.MSTORE
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x24]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xC3387858)
-            + Op.MLOAD(offset=0x360)
-            + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x20),
-                    value=0x0,
-                    args_offset=Op.DUP6,
-                    args_size=0x4,
-                    ret_offset=Op.DUP2,
-                    ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x420]
-            + Op.MSTORE
-            + Op.MSTORE(offset=0x4C0, value=0x0)
-            + Op.MSTORE(offset=0x4E0, value=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x6D6,
-                condition=Op.ISZERO(
-                    Op.SLT(Op.MLOAD(offset=0x4C0), Op.MLOAD(offset=0x360)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x420),
-                        Op.MUL(0x20, Op.MLOAD(offset=0x4C0)),
-                    ),
-                ),
-            )
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x74AF23EC)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0x260)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.ADDRESS,
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x44,
-                    ret_offset=0x5C0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x5C0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x500]
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=0x6C6,
-                condition=Op.ISZERO(
-                    Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x500), 0x0))
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(
-                    Op.MLOAD(offset=0x3C0),
-                    Op.MUL(0x20, Op.MLOAD(offset=0x4E0)),
-                ),
-                value=Op.MLOAD(offset=0x60),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(
-                    Op.MLOAD(offset=0x3C0),
-                    Op.MUL(0x20, Op.ADD(Op.MLOAD(offset=0x4E0), 0x1)),
-                ),
-                value=Op.MLOAD(offset=0x500),
-            )
-            + Op.MSTORE(
-                offset=0x4E0, value=Op.ADD(Op.MLOAD(offset=0x4E0), 0x2)
-            )
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x4C0, value=Op.ADD(Op.MLOAD(offset=0x4C0), 0x1)
-            )
-            + Op.JUMP(pc=0x628)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.MLOAD(offset=0x3C0)
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x735, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x80B5E7BD))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x600, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0x600, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x786, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x156F1C32))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x640, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x640)
-            )
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x660, value=Op.SLOAD(key=Op.SHA3))
-            + Op.RETURN(offset=0x660, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x878, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xB3A24FC0))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(
-                offset=0x6C0,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x4)
-                ),
-            )
-            + Op.MSTORE(offset=0x6E0, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.POP
-            + Op.ADD(
-                Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x6C0), 0x20)), 0x2
-            )
-            + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x700]
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.MLOAD(offset=0x700), value=Op.ORIGIN)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x700), 0x20),
-                value=Op.MLOAD(offset=0x6E0),
-            )
-            + Op.MSTORE(offset=0x4C0, value=0x2)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x838,
-                condition=Op.ISZERO(
-                    Op.SLT(
-                        Op.MLOAD(offset=0x4C0),
-                        Op.ADD(
-                            Op.MLOAD(
-                                offset=Op.SUB(Op.MLOAD(offset=0x6C0), 0x20)
-                            ),
-                            0x2,
-                        ),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(
-                    Op.MLOAD(offset=0x700),
-                    Op.MUL(0x20, Op.MLOAD(offset=0x4C0)),
-                ),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x6C0),
-                        Op.MUL(0x20, Op.SUB(Op.MLOAD(offset=0x4C0), 0x2)),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x4C0, value=Op.ADD(Op.MLOAD(offset=0x4C0), 0x1)
-            )
-            + Op.JUMP(pc=0x7F6)
-            + Op.JUMPDEST
-            + Op.MUL(
-                0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x700), 0x20))
-            )
-            + Op.PUSH1[0x20]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.ADD(0x48, Op.DUP8),
-                    address=0x2,
-                    value=0x0,
-                    args_offset=Op.MLOAD(offset=0x700),
-                    args_size=Op.DUP4,
-                    ret_offset=Op.DUP2,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=Op.DUP1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x760]
-            + Op.MSTORE
-            + Op.MSTORE(offset=0x7C0, value=Op.MLOAD(offset=0x760))
-            + Op.RETURN(offset=0x7C0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xA1C, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xE346F5FC))
-            )
-            + Op.MSTORE(offset=0x7E0, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x800, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x4C0, value=0x0)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x7E0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x9E6,
-                condition=Op.ISZERO(
-                    Op.SLT(Op.MLOAD(offset=0x4C0), Op.SLOAD(key=Op.SHA3)),
-                ),
-            )
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x7E0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x4C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x840, value=Op.SLOAD(key=Op.SHA3))
-            + Op.MLOAD(offset=0x840)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x800)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x4C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x7E0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x4C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x800)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x4C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x4C0)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x800)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x840)
-            )
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(
-                offset=0x4C0, value=Op.ADD(Op.MLOAD(offset=0x4C0), 0x1)
-            )
-            + Op.JUMP(pc=0x899)
-            + Op.JUMPDEST
-            + Op.MLOAD(offset=0x4C0)
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x800)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(offset=0x920, value=0x1)
-            + Op.RETURN(offset=0x920, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xB54, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x3FB57036))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x940, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x960, value=Op.SLOAD(key=Op.SHA3))
-            + Op.MLOAD(offset=0x960)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x940)
-            )
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x960)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x940)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x960)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.ADD
-            + Op.PUSH1[0x60]
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(offset=0xA40, value=0x1)
-            + Op.RETURN(offset=0xA40, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xBEB, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x12709A33))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0xA60, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MLOAD(offset=0xA60)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.ADD
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(offset=0xAC0, value=0x1)
-            + Op.RETURN(offset=0xAC0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xC82, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x3229CF6E))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0xA60, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MLOAD(offset=0xA60)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.SUB
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(offset=0xB20, value=0x1)
-            + Op.RETURN(offset=0xB20, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xCE5, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xA75F5C6A))
-            )
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0xA60, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MLOAD(offset=0xA60)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MSTORE(offset=0xB60, value=0x1)
-            + Op.RETURN(offset=0xB60, size=0x20)
-            + Op.JUMPDEST
-            + Op.POP
-        ),
-        storage={
-            0xF299DBBE3A7A5D949FE794E9A47B3106699C8110FF986EB84921C183E69E7F0: 0x2F0000000000000000,  # noqa: E501
-            0x1EDCD36F61CAE5DC6414157DFBADF9F11CA013AC763E27F8AF55FEAA8A239C89: 0x1,  # noqa: E501
-            0x689082D076EC3C02CBE4B99F6D9833E3C4A161072FD42FB7649EEE5189A67CCC: 0x63524E3FE4791AEFCE1E932BBFB3FDF375BFAD89,  # noqa: E501
-            0xAF1D6676BE3AB502A59D91F6F5C49BAFFC15B2CFC65A41C4D96857C0F535ADBA: 0x1D60000000000000000,  # noqa: E501
-            0xDF1A770F69D93D1719292F384FDB4DA22C0E88AEF2BA462BFF16674BC7848730: 0x1C11AA45C792E202E9FFDC2F12F99D0D209BEF70,  # noqa: E501
-            0xEC5E7F54FA5E516E616B04F9D5A0EE433A80E09ED47D7E5269AFD76C05FF251E: 0x2,  # noqa: E501
-        },
+    pre[sender] = Account(balance=0xD8D726B7177A800000)
+    # Source: hex
+    # 0x
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
         nonce=0,
-        address=Address("0xe509e3a93beb1eba72f8cb8d25f93a85e2d54afb"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x67F, value=0x0)
-            + Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xAC],
-                condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x2F300BEE)),
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.ADD(Op.MLOAD(offset=0x80), 0x2)
-            + Op.DUP1
-            + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.DUP2, value=0x10000000000000000)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, Op.MUL(0x20, Op.MLOAD(offset=0x80))),
-                value=Op.MLOAD(offset=0x60),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(
-                    Op.DUP3,
-                    Op.MUL(0x20, Op.ADD(Op.MLOAD(offset=0x80), 0x1)),
-                ),
-                value=Op.SUB(Op.MLOAD(offset=0x40), 0x1),
-            )
-            + Op.DUP1
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2C8, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xA647A5B9))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x4)
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x24)
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x180,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)
-                ),
-            )
-            + Op.MSTORE(offset=0x1A0, value=Op.CALLDATALOAD(offset=0x64))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x84))
-            + Op.POP
-            + Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x100), 0x20))
-            + Op.DUP1
-            + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1D5,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x1A0))),
-            )
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x162,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
-            )
-            + Op.ADD(
-                Op.DUP3,
-                Op.MUL(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x160),
-                            Op.MUL(
-                                0x20,
-                                Op.ADD(
-                                    Op.MUL(Op.DUP6, Op.MLOAD(offset=0x80)),
-                                    Op.DUP2,
-                                ),
-                            ),
-                        ),
-                    ),
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x100),
-                            Op.MUL(0x20, Op.DUP1),
-                        ),
-                    ),
-                ),
-            )
-            + Op.SWAP2
-            + Op.POP
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x12E)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.SDIV(Op.DUP2, 0x10000000000000000)
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C8,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP6, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SUB(
-                    Op.MLOAD(offset=Op.ADD(Op.DUP6, Op.MUL(0x20, Op.DUP2))),
-                    Op.SDIV(
-                        Op.MUL(
-                            Op.MUL(
-                                Op.DUP5,
-                                Op.MLOAD(
-                                    offset=Op.ADD(
-                                        Op.MLOAD(offset=0x160),
-                                        Op.MUL(
-                                            0x20,
-                                            Op.ADD(
-                                                Op.MUL(
-                                                    Op.DUP7,
-                                                    Op.MLOAD(offset=0x80),
-                                                ),
-                                                Op.DUP3,
-                                            ),
-                                        ),
-                                    ),
-                                ),
-                            ),
-                            Op.MLOAD(
-                                offset=Op.ADD(
-                                    Op.MLOAD(offset=0x180),
-                                    Op.MUL(0x20, Op.DUP4),
-                                ),
-                            ),
-                        ),
-                        0x100000000000000000000000000000000,
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x174)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x11E)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x203,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
-            )
-            + Op.ADD(
-                Op.DUP3,
-                Op.MUL(
-                    Op.MLOAD(offset=Op.ADD(Op.DUP5, Op.MUL(0x20, Op.DUP2))),
-                    Op.MLOAD(offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP1))),
-                ),
-            )
-            + Op.SWAP2
-            + Op.POP
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x1DB)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.SDIV(Op.DUP2, 0x10000000000000000)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SDIV(Op.DUP2, 0x2)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x242, condition=Op.ISZERO(Op.SLT(Op.DUP2, 0xB)))
-            + Op.SDIV(
-                Op.ADD(
-                    Op.DUP4,
-                    Op.SDIV(Op.MUL(Op.DUP6, 0x10000000000000000), Op.DUP3),
-                ),
-                0x2,
-            )
-            + Op.SWAP2
-            + Op.POP
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x219)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x276,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP6, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SDIV(
-                    Op.MUL(
-                        Op.MLOAD(
-                            offset=Op.ADD(Op.DUP7, Op.MUL(0x20, Op.DUP3))
-                        ),
-                        0x10000000000000000,
-                    ),
-                    Op.DUP2,
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x246)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, Op.MUL(0x20, Op.MLOAD(offset=0x80))),
-                value=Op.SUB(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x100),
-                            Op.MUL(0x20, Op.MLOAD(offset=0x80)),
-                        ),
-                    ),
-                    0x1,
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(
-                    Op.DUP3,
-                    Op.MUL(0x20, Op.ADD(Op.MLOAD(offset=0x80), 0x1)),
-                ),
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x100),
-                        Op.MUL(0x20, Op.ADD(Op.MLOAD(offset=0x80), 0x1)),
-                    ),
-                ),
-            )
-            + Op.DUP1
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x379, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x5B180229))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(
-                offset=0x300,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x4)
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x320,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x24)
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x33F,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
-            )
-            + Op.ADD(
-                Op.DUP3,
-                Op.SDIV(
-                    Op.MUL(
-                        Op.MLOAD(
-                            offset=Op.ADD(
-                                Op.MLOAD(offset=0x300),
-                                Op.MUL(0x20, Op.DUP3),
-                            ),
-                        ),
-                        Op.MLOAD(
-                            offset=Op.ADD(
-                                Op.MLOAD(offset=0x320),
-                                Op.MUL(0x20, Op.DUP2),
-                            ),
-                        ),
-                    ),
-                    0x10000000000000000,
-                ),
-            )
-            + Op.SWAP2
-            + Op.POP
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x306)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x366,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.EQ(Op.MLOAD(offset=Op.MLOAD(offset=0x320)), 0x0)
-                    ),
-                ),
-            )
-            + Op.SDIV(
-                Op.MUL(Op.DUP4, 0x10000000000000000),
-                Op.MLOAD(offset=Op.MLOAD(offset=0x320)),
-            )
-            + Op.SWAP2
-            + Op.POP
-            + Op.JUMP(pc=0x36B)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x380, value=Op.DUP2)
-            + Op.RETURN(offset=0x380, size=0x20)
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x571, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xF4CA7DC4))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(
-                offset=0x3A0,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x4)
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x3C0,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x24)
-                ),
-            )
-            + Op.MSTORE(offset=0x1A0, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x64))
-            + Op.POP
-            + Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x3C0), 0x20))
-            + Op.EXP(Op.MLOAD(offset=0x80), 0x2)
-            + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x44D,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x441,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(
-                    Op.DUP5,
-                    Op.MUL(
-                        0x20,
-                        Op.ADD(
-                            Op.MUL(Op.DUP5, Op.MLOAD(offset=0x80)), Op.DUP2
-                        ),
-                    ),
-                ),
-                value=Op.ADD(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.DUP5,
-                            Op.MUL(
-                                0x20,
-                                Op.ADD(
-                                    Op.MUL(Op.DUP5, Op.MLOAD(offset=0x80)),
-                                    Op.DUP2,
-                                ),
-                            ),
-                        ),
-                    ),
-                    Op.SDIV(
-                        Op.MUL(
-                            Op.MLOAD(
-                                offset=Op.ADD(
-                                    Op.MLOAD(offset=0x3A0),
-                                    Op.MUL(0x20, Op.DUP4),
-                                ),
-                            ),
-                            Op.MLOAD(
-                                offset=Op.ADD(
-                                    Op.MLOAD(offset=0x3A0),
-                                    Op.MUL(0x20, Op.DUP2),
-                                ),
-                            ),
-                        ),
-                        0x10000000000000000,
-                    ),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x3F1)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x3E4)
-            + Op.JUMPDEST
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.DUP2
-            + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.MUL(Op.MLOAD(offset=0x1A0), Op.MLOAD(offset=0x80))
-            + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x51E,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x1A0))),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x512,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x506,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(
-                    Op.DUP6,
-                    Op.MUL(
-                        0x20,
-                        Op.ADD(
-                            Op.MUL(Op.DUP6, Op.MLOAD(offset=0x80)), Op.DUP3
-                        ),
-                    ),
-                ),
-                value=Op.ADD(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.DUP6,
-                            Op.MUL(
-                                0x20,
-                                Op.ADD(
-                                    Op.MUL(Op.DUP6, Op.MLOAD(offset=0x80)),
-                                    Op.DUP3,
-                                ),
+    # Source: hex
+    # 0x
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000001),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000002),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000003),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000004),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x1CDC8315BDB1362DE8B7B2FA9EE75DC873037179),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600061067f537c010000000000000000000000000000000000000000000000000000000060003504632f300bee8114156100ac576004356040526024356060526044356080526002608051018080602002602001599059016000905281815260208101905090506801000000000000000081526060516080516020028201526001604051036001608051016020028201528060206040820352602060208203510260400160408203f35050505b63a647a5b98114156102c85736599059016000905236600482376004356020820101610100526024356020820101610160526044356020820101610180526064356101a05260843560805250602061010051035180806020026020015990590160009052818152602081019050905060005b6101a0518112156101d557600060005b608051811215610162578060200261010051015181608051850201602002610160510151028201915060018101905061012e565b50680100000000000000008105905060005b6080518112156101c857700100000000000000000000000000000000836020026101805101518260805186020160200261016051015184020205816020028501510381602002850152600181019050610174565b505060018101905061011e565b50600060005b60805181121561020357806020028301518160200284015102820191506001810190506101db565b5068010000000000000000810590506002810560005b600b81121561024257600282680100000000000000008502058301059150600181019050610219565b5060005b60805181121561027657816801000000000000000082602002860151020581602002850152600181019050610246565b5050506001608051602002610100510151036080516020028201526001608051016020026101005101516001608051016020028201528060206040820352602060208203510260400160408203f35050505b635b18022981141561037957365990590160009052366004823760043560208201016103005260243560208201016103205260443560805250600060005b60805181121561033f57680100000000000000008160200261032051015182602002610300510151020582019150600181019050610306565b6000610320515114151561036657610320515168010000000000000000830205915061036b565b600091505b81610380526020610380f350505b63f4ca7dc481141561057157365990590160009052366004823760043560208201016103a05260243560208201016103c0526044356101a0526064356080525060206103c051035160026080510a806020026020015990590160009052818152602081019050905060005b60805181121561044d5760005b6080518112156104415768010000000000000000816020026103a0510151836020026103a051015102058160805184020160200284015101816080518402016020028401526001810190506103f1565b506001810190506103e4565b81905090508180602002602001599059016000905281815260208101905090506080516101a05102806020026020015990590160009052818152602081019050905060005b6101a05181121561051e5760005b6080518112156105125760005b608051811215610506576801000000000000000082608051830201602002870151826080518602016020026103c051015102058260805185020160200285015101826080518502016020028501526001810190506104ad565b506001810190506104a0565b50600181019050610492565b819050905060005b848112156105525780602002820151816020026103c05101510381602002840152600181019050610526565b508160206040820352602060208203510260400160408203f350505050505b63232b273481141561069d57365990590160009052366004823760043560208201016106205260243560208201016102805260443560208201016103c052606435610640526084356101a05260a435608052506000610280515112156106025760005b6080518112156106005780602002610280510151600003816020026102805101526001810190506105d4565b505b60005b6101a05181121561067f5760005b60805181121561067357680100000000000000006801000000000000000082602002610280510151610640510205826080518502016020026103c05101510205826020026106205101510182602002610620510152600181019050610613565b50600181019050610605565b6106205160206040820352602060208203510260400160408203f350505b50  # noqa: E501
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x67F, value=0x0)
+        + Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xAC], condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x2F300BEE))
+        )
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.ADD(Op.MLOAD(offset=0x80), 0x2)
+        + Op.DUP1
+        + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.DUP2, value=0x10000000000000000)
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP3, Op.MUL(0x20, Op.MLOAD(offset=0x80))),
+            value=Op.MLOAD(offset=0x60),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(
+                Op.DUP3, Op.MUL(0x20, Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+            ),
+            value=Op.SUB(Op.MLOAD(offset=0x40), 0x1),
+        )
+        + Op.DUP1
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP * 3
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x2C8, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xA647A5B9)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(
+            offset=0x100,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x4)),
+        )
+        + Op.MSTORE(
+            offset=0x160,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x24)),
+        )
+        + Op.MSTORE(
+            offset=0x180,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)),
+        )
+        + Op.MSTORE(offset=0x1A0, value=Op.CALLDATALOAD(offset=0x64))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x84))
+        + Op.POP
+        + Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x100), 0x20))
+        + Op.DUP1
+        + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1D5,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x1A0))),
+        )
+        + Op.PUSH1[0x0] * 2
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x162,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
+        )
+        + Op.ADD(
+            Op.DUP3,
+            Op.MUL(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x160),
+                        Op.MUL(
+                            0x20,
+                            Op.ADD(
+                                Op.MUL(Op.DUP6, Op.MLOAD(offset=0x80)), Op.DUP2
                             ),
                         ),
-                    ),
-                    Op.SDIV(
+                    )
+                ),
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x100), Op.MUL(0x20, Op.DUP1)
+                    )
+                ),
+            ),
+        )
+        + Op.SWAP2
+        + Op.POP
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x12E)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.SDIV(Op.DUP2, 0x10000000000000000)
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C8,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP6, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SUB(
+                Op.MLOAD(offset=Op.ADD(Op.DUP6, Op.MUL(0x20, Op.DUP2))),
+                Op.SDIV(
+                    Op.MUL(
                         Op.MUL(
+                            Op.DUP5,
                             Op.MLOAD(
                                 offset=Op.ADD(
-                                    Op.MLOAD(offset=0x3C0),
+                                    Op.MLOAD(offset=0x160),
                                     Op.MUL(
                                         0x20,
                                         Op.ADD(
@@ -10408,263 +272,8867 @@ def test_block504980(
                                             Op.DUP3,
                                         ),
                                     ),
-                                ),
-                            ),
-                            Op.MLOAD(
-                                offset=Op.ADD(
-                                    Op.DUP8,
-                                    Op.MUL(
-                                        0x20,
-                                        Op.ADD(
-                                            Op.MUL(
-                                                Op.DUP4, Op.MLOAD(offset=0x80)
-                                            ),
-                                            Op.DUP3,
-                                        ),
-                                    ),
-                                ),
+                                )
                             ),
                         ),
-                        0x10000000000000000,
+                        Op.MLOAD(
+                            offset=Op.ADD(
+                                Op.MLOAD(offset=0x180), Op.MUL(0x20, Op.DUP4)
+                            )
+                        ),
                     ),
+                    0x100000000000000000000000000000000,
+                ),
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x174)
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x11E)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x0] * 2
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x203,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
+        )
+        + Op.ADD(
+            Op.DUP3,
+            Op.MUL(
+                Op.MLOAD(offset=Op.ADD(Op.DUP5, Op.MUL(0x20, Op.DUP2))),
+                Op.MLOAD(offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP1))),
+            ),
+        )
+        + Op.SWAP2
+        + Op.POP
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1DB)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.SDIV(Op.DUP2, 0x10000000000000000)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SDIV(Op.DUP2, 0x2)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x242, condition=Op.ISZERO(Op.SLT(Op.DUP2, 0xB)))
+        + Op.SDIV(
+            Op.ADD(
+                Op.DUP4, Op.SDIV(Op.MUL(Op.DUP6, 0x10000000000000000), Op.DUP3)
+            ),
+            0x2,
+        )
+        + Op.SWAP2
+        + Op.POP
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x219)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x276,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP6, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SDIV(
+                Op.MUL(
+                    Op.MLOAD(offset=Op.ADD(Op.DUP7, Op.MUL(0x20, Op.DUP3))),
+                    0x10000000000000000,
                 ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x4AD)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x4A0)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x492)
-            + Op.JUMPDEST
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x552, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP5)))
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP5, Op.MUL(0x20, Op.DUP2)),
-                value=Op.SUB(
+                Op.DUP2,
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x246)
+        + Op.JUMPDEST
+        + Op.POP * 3
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP3, Op.MUL(0x20, Op.MLOAD(offset=0x80))),
+            value=Op.SUB(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x100),
+                        Op.MUL(0x20, Op.MLOAD(offset=0x80)),
+                    )
+                ),
+                0x1,
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(
+                Op.DUP3, Op.MUL(0x20, Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+            ),
+            value=Op.MLOAD(
+                offset=Op.ADD(
+                    Op.MLOAD(offset=0x100),
+                    Op.MUL(0x20, Op.ADD(Op.MLOAD(offset=0x80), 0x1)),
+                )
+            ),
+        )
+        + Op.DUP1
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP * 3
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x379, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x5B180229)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(
+            offset=0x300,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x4)),
+        )
+        + Op.MSTORE(
+            offset=0x320,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x24)),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.POP
+        + Op.PUSH1[0x0] * 2
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x33F,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
+        )
+        + Op.ADD(
+            Op.DUP3,
+            Op.SDIV(
+                Op.MUL(
                     Op.MLOAD(
                         offset=Op.ADD(
-                            Op.MLOAD(offset=0x3C0),
-                            Op.MUL(0x20, Op.DUP2),
-                        ),
+                            Op.MLOAD(offset=0x300), Op.MUL(0x20, Op.DUP3)
+                        )
+                    ),
+                    Op.MLOAD(
+                        offset=Op.ADD(
+                            Op.MLOAD(offset=0x320), Op.MUL(0x20, Op.DUP2)
+                        )
                     ),
-                    Op.MLOAD(offset=Op.ADD(Op.DUP3, Op.MUL(0x20, Op.DUP1))),
-                ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x526)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.DUP2
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
                 ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x69D, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x232B2734))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(
-                offset=0x620,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x4)
+                0x10000000000000000,
+            ),
+        )
+        + Op.SWAP2
+        + Op.POP
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x306)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x366,
+            condition=Op.ISZERO(
+                Op.ISZERO(Op.EQ(Op.MLOAD(offset=Op.MLOAD(offset=0x320)), 0x0))
+            ),
+        )
+        + Op.SDIV(
+            Op.MUL(Op.DUP4, 0x10000000000000000),
+            Op.MLOAD(offset=Op.MLOAD(offset=0x320)),
+        )
+        + Op.SWAP2
+        + Op.POP
+        + Op.JUMP(pc=0x36B)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x380, value=Op.DUP2)
+        + Op.RETURN(offset=0x380, size=0x20)
+        + Op.POP * 2
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x571, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xF4CA7DC4)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(
+            offset=0x3A0,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x4)),
+        )
+        + Op.MSTORE(
+            offset=0x3C0,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x24)),
+        )
+        + Op.MSTORE(offset=0x1A0, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x64))
+        + Op.POP
+        + Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x3C0), 0x20))
+        + Op.EXP(Op.MLOAD(offset=0x80), 0x2)
+        + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x44D,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x441,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(
+                Op.DUP5,
+                Op.MUL(
+                    0x20,
+                    Op.ADD(Op.MUL(Op.DUP5, Op.MLOAD(offset=0x80)), Op.DUP2),
                 ),
-            )
-            + Op.MSTORE(
-                offset=0x280,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x24)
+            ),
+            value=Op.ADD(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.DUP5,
+                        Op.MUL(
+                            0x20,
+                            Op.ADD(
+                                Op.MUL(Op.DUP5, Op.MLOAD(offset=0x80)), Op.DUP2
+                            ),
+                        ),
+                    )
                 ),
-            )
-            + Op.MSTORE(
-                offset=0x3C0,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)
+                Op.SDIV(
+                    Op.MUL(
+                        Op.MLOAD(
+                            offset=Op.ADD(
+                                Op.MLOAD(offset=0x3A0), Op.MUL(0x20, Op.DUP4)
+                            )
+                        ),
+                        Op.MLOAD(
+                            offset=Op.ADD(
+                                Op.MLOAD(offset=0x3A0), Op.MUL(0x20, Op.DUP2)
+                            )
+                        ),
+                    ),
+                    0x10000000000000000,
                 ),
-            )
-            + Op.MSTORE(offset=0x640, value=Op.CALLDATALOAD(offset=0x64))
-            + Op.MSTORE(offset=0x1A0, value=Op.CALLDATALOAD(offset=0x84))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0xA4))
-            + Op.POP
-            + Op.JUMPI(
-                pc=0x602,
-                condition=Op.ISZERO(
-                    Op.SLT(Op.MLOAD(offset=Op.MLOAD(offset=0x280)), 0x0),
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x3F1)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x3E4)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.DUP2
+        + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MUL(Op.MLOAD(offset=0x1A0), Op.MLOAD(offset=0x80))
+        + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x51E,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x1A0))),
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x512,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x506,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(
+                Op.DUP6,
+                Op.MUL(
+                    0x20,
+                    Op.ADD(Op.MUL(Op.DUP6, Op.MLOAD(offset=0x80)), Op.DUP3),
                 ),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x600,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x280), Op.MUL(0x20, Op.DUP2)),
-                value=Op.SUB(
-                    0x0,
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x280),
-                            Op.MUL(0x20, Op.DUP1),
+            ),
+            value=Op.ADD(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.DUP6,
+                        Op.MUL(
+                            0x20,
+                            Op.ADD(
+                                Op.MUL(Op.DUP6, Op.MLOAD(offset=0x80)), Op.DUP3
+                            ),
                         ),
-                    ),
+                    )
                 ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x5D4)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x67F,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x1A0))),
-            )
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x673,
-                condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x620), Op.MUL(0x20, Op.DUP3)),
-                value=Op.ADD(
-                    Op.MLOAD(
-                        offset=Op.ADD(
-                            Op.MLOAD(offset=0x620),
-                            Op.MUL(0x20, Op.DUP3),
+                Op.SDIV(
+                    Op.MUL(
+                        Op.MLOAD(
+                            offset=Op.ADD(
+                                Op.MLOAD(offset=0x3C0),
+                                Op.MUL(
+                                    0x20,
+                                    Op.ADD(
+                                        Op.MUL(Op.DUP7, Op.MLOAD(offset=0x80)),
+                                        Op.DUP3,
+                                    ),
+                                ),
+                            )
                         ),
-                    ),
-                    Op.SDIV(
-                        Op.MUL(
-                            Op.MLOAD(
-                                offset=Op.ADD(
-                                    Op.MLOAD(offset=0x3C0),
-                                    Op.MUL(
-                                        0x20,
-                                        Op.ADD(
-                                            Op.MUL(
-                                                Op.DUP6, Op.MLOAD(offset=0x80)
-                                            ),
-                                            Op.DUP3,
-                                        ),
+                        Op.MLOAD(
+                            offset=Op.ADD(
+                                Op.DUP8,
+                                Op.MUL(
+                                    0x20,
+                                    Op.ADD(
+                                        Op.MUL(Op.DUP4, Op.MLOAD(offset=0x80)),
+                                        Op.DUP3,
                                     ),
                                 ),
-                            ),
-                            Op.SDIV(
+                            )
+                        ),
+                    ),
+                    0x10000000000000000,
+                ),
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x4AD)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x4A0)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x492)
+        + Op.JUMPDEST
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x552, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP5)))
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP5, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SUB(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x3C0), Op.MUL(0x20, Op.DUP2)
+                    )
+                ),
+                Op.MLOAD(offset=Op.ADD(Op.DUP3, Op.MUL(0x20, Op.DUP1))),
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x526)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.DUP2
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP * 5
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x69D, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x232B2734)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(
+            offset=0x620,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x4)),
+        )
+        + Op.MSTORE(
+            offset=0x280,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x24)),
+        )
+        + Op.MSTORE(
+            offset=0x3C0,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)),
+        )
+        + Op.MSTORE(offset=0x640, value=Op.CALLDATALOAD(offset=0x64))
+        + Op.MSTORE(offset=0x1A0, value=Op.CALLDATALOAD(offset=0x84))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0xA4))
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x602,
+            condition=Op.ISZERO(
+                Op.SLT(Op.MLOAD(offset=Op.MLOAD(offset=0x280)), 0x0)
+            ),
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x600,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x280), Op.MUL(0x20, Op.DUP2)),
+            value=Op.SUB(
+                0x0,
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x280), Op.MUL(0x20, Op.DUP1)
+                    )
+                ),
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x5D4)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x67F,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x1A0))),
+        )
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x673,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x80))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x620), Op.MUL(0x20, Op.DUP3)),
+            value=Op.ADD(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x620), Op.MUL(0x20, Op.DUP3)
+                    )
+                ),
+                Op.SDIV(
+                    Op.MUL(
+                        Op.MLOAD(
+                            offset=Op.ADD(
+                                Op.MLOAD(offset=0x3C0),
                                 Op.MUL(
-                                    Op.MLOAD(offset=0x640),
-                                    Op.MLOAD(
-                                        offset=Op.ADD(
-                                            Op.MLOAD(offset=0x280),
-                                            Op.MUL(0x20, Op.DUP3),
-                                        ),
+                                    0x20,
+                                    Op.ADD(
+                                        Op.MUL(Op.DUP6, Op.MLOAD(offset=0x80)),
+                                        Op.DUP3,
                                     ),
                                 ),
-                                0x10000000000000000,
+                            )
+                        ),
+                        Op.SDIV(
+                            Op.MUL(
+                                Op.MLOAD(offset=0x640),
+                                Op.MLOAD(
+                                    offset=Op.ADD(
+                                        Op.MLOAD(offset=0x280),
+                                        Op.MUL(0x20, Op.DUP3),
+                                    )
+                                ),
                             ),
+                            0x10000000000000000,
                         ),
-                        0x10000000000000000,
                     ),
+                    0x10000000000000000,
                 ),
-            )
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x613)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP(pc=0x605)
-            + Op.JUMPDEST
-            + Op.MLOAD(offset=0x620)
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-        ),
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x613)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x605)
+        + Op.JUMPDEST
+        + Op.MLOAD(offset=0x620)
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP * 2
+        + Op.JUMPDEST
+        + Op.POP,
+        nonce=0,
+        address=Address(0xF1562E1C0D0BAA3EA746442BB7F11153FCF5CFDA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600061083f537c010000000000000000000000000000000000000000000000000000000060003504637a66d7ca8114156100665760043560405260606060599059016000905260008152604051816020015260008160400152809050205460605260206060f35b63c60409c68114156100a55760043560405260606060599059016000905260008152604051816020015260018160400152809050205460a052602060a0f35b63186335768114156100e45760043560405260606060599059016000905260008152604051816020015260028160400152809050205460e052602060e0f35b63b3903c8a8114156101bc57600435604052606060605990590160009052600081526040518160200152600581604001528090502054610120526101205180602002602001599059016000905281815260208101905090506101605260006101c0525b610120516101c051121561019f57608060805990590160009052600081526040518160200152600481604001526101c051816060015280905020546101c05160200261016051015260016101c051016101c052610147565b6101605160206040820352602060208203510260400160408203f3505b636824e0fb8114156101fd57600435604052606060605990590160009052600081526040518160200152600581604001528090502054610220526020610220f35b633db16be381141561023e57600435604052606060605990590160009052600081526040518160200152600681604001528090502054610260526020610260f35b63c33878588114156102e05760006102a0526000546102c0526102c05180602002602001599059016000905281815260208101905090506102e0525b6102c0516102a05112156102c357604060405990590160009052600181526102a051816020015280905020546102a0516020026102e051015260016102a051016102a05261027a565b6102e05160206040820352602060208203510260400160408203f3505b63175c63228114156102fa57600054610380526020610380f35b63d861f2b4811415610336576004356103a052604060405990590160009052600181526103a051816020015280905020546103c05260206103c0f35b63b0dab01f81141561044f57600435610400526024356104205260443561044052606435610460526000606060605990590160009052600081526104005181602001526001816040015280905020541415610441576104205160606060599059016000905260008152610400518160200152600081604001528090502055610440516060606059905901600090526000815261040051816020015260018160400152809050205561046051606060605990590160009052600081526104005181602001526006816040015280905020556104005160406040599059016000905260018152600054816020015280905020556001600054016000556001610520526020610520f361044e565b6000610540526020610540f35b5b63aac2ffb58114156104b95760043560405260016060606059905901600090526000815260405181602001526002816040015280905020540160606060599059016000905260008152604051816020015260028160400152809050205560016105a05260206105a0f35b637265802d811415610507576004356040526024356105c0526105c0516060606059905901600090526000815260405181602001526002816040015280905020556001610600526020610600f35b63c5476efe811415610571576004356040526001606060605990590160009052600081526040518160200152600081604001528090502054016060606059905901600090526000815260405181602001526000816040015280905020556001610660526020610660f35b63c551e31e81141561063b576004356040526024356106805260606060599059016000905260008152604051816020015260058160400152809050205461012052610680516080608059905901600090526000815260405181602001526004816040015261012051816060015280905020556001606060605990590160009052600081526040518160200152600581604001528090502054016060606059905901600090526000815260405181602001526005816040015280905020556001610720526020610720f35b633d90504581141561067c57600435604052606060605990590160009052600081526040518160200152600381604001528090502054610740526020610740f35b631cda01ef8114156106e65760043560405260016060606059905901600090526000815260405181602001526003816040015280905020540160606060599059016000905260008152604051816020015260038160400152809050205560016107c05260206107c0f35b63c286273a811415610734576004356040526024356107e0526107e0516060606059905901600090526000815260405181602001526003816040015280905020556001610820526020610820f35b50  # noqa: E501
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x83F, value=0x0)
+        + Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x66], condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x7A66D7CA))
+        )
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x60, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0x60, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xA5], condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xC60409C6))
+        )
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0xA0, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0xA0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xE4], condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x18633576))
+        )
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0xE0, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0xE0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1BC, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xB3903C8A)))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x5)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x120, value=Op.SLOAD(key=Op.SHA3))
+        + Op.MLOAD(offset=0x120)
+        + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x160]
+        + Op.MSTORE
+        + Op.MSTORE(offset=0x1C0, value=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x19F,
+            condition=Op.ISZERO(
+                Op.SLT(Op.MLOAD(offset=0x1C0), Op.MLOAD(offset=0x120))
+            ),
+        )
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(
+            offset=Op.ADD(
+                Op.MLOAD(offset=0x160), Op.MUL(0x20, Op.MLOAD(offset=0x1C0))
+            ),
+            value=Op.SLOAD(key=Op.SHA3),
+        )
+        + Op.MSTORE(offset=0x1C0, value=Op.ADD(Op.MLOAD(offset=0x1C0), 0x1))
+        + Op.JUMP(pc=0x147)
+        + Op.JUMPDEST
+        + Op.MLOAD(offset=0x160)
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1FD, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x6824E0FB)))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x5)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x220, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0x220, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x23E, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x3DB16BE3)))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x6)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x260, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0x260, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x2E0, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xC3387858)))
+        + Op.MSTORE(offset=0x2A0, value=0x0)
+        + Op.MSTORE(offset=0x2C0, value=Op.SLOAD(key=0x0))
+        + Op.MLOAD(offset=0x2C0)
+        + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x2E0]
+        + Op.MSTORE
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2C3,
+            condition=Op.ISZERO(
+                Op.SLT(Op.MLOAD(offset=0x2A0), Op.MLOAD(offset=0x2C0))
+            ),
+        )
+        + Op.PUSH1[0x40] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x1)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x2A0))
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(
+            offset=Op.ADD(
+                Op.MLOAD(offset=0x2E0), Op.MUL(0x20, Op.MLOAD(offset=0x2A0))
+            ),
+            value=Op.SLOAD(key=Op.SHA3),
+        )
+        + Op.MSTORE(offset=0x2A0, value=Op.ADD(Op.MLOAD(offset=0x2A0), 0x1))
+        + Op.JUMP(pc=0x27A)
+        + Op.JUMPDEST
+        + Op.MLOAD(offset=0x2E0)
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x2FA, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x175C6322)))
+        + Op.MSTORE(offset=0x380, value=Op.SLOAD(key=0x0))
+        + Op.RETURN(offset=0x380, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x336, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xD861F2B4)))
+        + Op.MSTORE(offset=0x3A0, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH1[0x40] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x1)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x3A0))
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x3C0, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0x3C0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x44F, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xB0DAB01F)))
+        + Op.MSTORE(offset=0x400, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x420, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x440, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MSTORE(offset=0x460, value=Op.CALLDATALOAD(offset=0x64))
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x400))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.JUMPI(pc=0x441, condition=Op.ISZERO(Op.EQ))
+        + Op.MLOAD(offset=0x420)
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x400))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x440)
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x400))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x460)
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x400))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x6)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x400)
+        + Op.PUSH1[0x40] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x1)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.SLOAD(key=0x0))
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.MSTORE(offset=0x520, value=0x1)
+        + Op.RETURN(offset=0x520, size=0x20)
+        + Op.JUMP(pc=0x44E)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x540, value=0x0)
+        + Op.RETURN(offset=0x540, size=0x20)
+        + Op.JUMPDEST * 2
+        + Op.JUMPI(pc=0x4B9, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xAAC2FFB5)))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.ADD
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0x5A0, value=0x1)
+        + Op.RETURN(offset=0x5A0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x507, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x7265802D)))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x5C0, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MLOAD(offset=0x5C0)
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0x600, value=0x1)
+        + Op.RETURN(offset=0x600, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x571, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xC5476EFE)))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.ADD
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0x660, value=0x1)
+        + Op.RETURN(offset=0x660, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x63B, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xC551E31E)))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x680, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x5)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x120, value=Op.SLOAD(key=Op.SHA3))
+        + Op.MLOAD(offset=0x680)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x120))
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x5)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.ADD
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x5)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0x720, value=0x1)
+        + Op.RETURN(offset=0x720, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x67C, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x3D905045)))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x3)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x740, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0x740, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x6E6, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x1CDA01EF)))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x3)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.ADD
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x3)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0x7C0, value=0x1)
+        + Op.RETURN(offset=0x7C0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x734, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xC286273A)))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x7E0, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MLOAD(offset=0x7E0)
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x3)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0x820, value=0x1)
+        + Op.RETURN(offset=0x820, size=0x20)
+        + Op.JUMPDEST
+        + Op.POP,
+        storage={
+            0: contract_1,
+            0xA4470E9D0419DF71F6257FCDFD2C0A3BAD96A23F5AB414BC10AAF1A31A536A7: 0xB4876148229C22BD2291F1A4F5468C8C789B23639370C4D447F270BA341DBBEC,  # noqa: E501
+            0x16EF4193A274568D283FF919C299729E07696D9ADA48187B81D68E12E7B962DE: 0xA103C04E7ECB9B3395F77C7B0CAD28E62C85F042DE4767CCC6C005E6F47F8D4,  # noqa: E501
+            0x1F1866E966F321B84535705846689749D34D5DC02994613E2931973C605D9E93: 0xC723D0AA4A60529FE42277C8094AA19263AFF36650136EFC5EDFD0785D457634,  # noqa: E501
+            0x252A4EC7133643FDDCDB22A86C415F78B2DD251F18D1EFCD6A44ACF590C4AE72: 0x9CAF94B82715869E71D3CEE986094EA612F0258570B7E5EF47B5D09E9515322B,  # noqa: E501
+            0x41B451E8D86D28ADD758CBD3F48A18FD04B11A80288C1DC434A5BF2D8FB1CA64: 0xB602498F12A8B4AF3A1FCA357CEA6B19BCD163DFEC1D845364CE1395F7C21FA7,  # noqa: E501
+            0x491D10658C1EC762152D8AD2D890AD59111B1EE7B4BC25736046923D3534D9A5: 25246,  # noqa: E501
+            0x5B0E8552EFD72A845E47318ABBBEF9DC9FCDFE0D1A06CDA44494401301581511: 0xFBC98F4017AE5C20459DAADAA6BEE519B6DE871D3DBAA9AB3F34340FEF4CB643,  # noqa: E501
+            0x5B672A107BA6FAB01CBDDF079042E9F6176A8E6F154584FC4DF4B15674C9456E: 0x1603DA41D610854D85536B37D000E5EB7CA09786C43F50E7441C0AFBFF1DE0A9,  # noqa: E501
+            0x605B934BD26C9ECDF7029A7DC062D3A6B87338511CFF96E0C5F13DE9EEA3462E: 0xF0D24F3D0EDA573FC5D43E3D0680993C51293752CD6DE205040D3197F412F475,  # noqa: E501
+            0x618355E25491DFE86175F9D9B3147E4D680AA561D98384E3621DC6A3088B0846: 0x6B2E6D2D5DEB27DFFEC973F23AF4CAF111E66D1397F467DBBEDF5AB2192FB6B6,  # noqa: E501
+            0x65112936BEC0F1E84FDA6623FB54E12BAADC8A4A208C8C4EB3ED5E79CBD7E85F: 0xA59AC24E3E0663413D0F87516BA8FB44C6C3E14DA8EAABBDE80F8EE285F65934,  # noqa: E501
+            0x687CB2122DE7BACF42B9CD380B04FF2A2CE92A0B63706A9A78263B3CE86F3313: 0x200000000000000,  # noqa: E501
+            0x72A539B064C98D29A514EE55694225E05FB41FE63E5FE710E4536BD9BA3591B4: 0x338ECFE6C523ED1184918B19584D97DD1095ECAADC49C7BA9DA62B8B513026E0,  # noqa: E501
+            0x7AEB0A0CE8882A12D853078382A2BC72F7A94AF6109F167DE37B36C0A7DEB828: 0x4C428400EA8A7BD7C46BA9895B508770EFA4551F0D793E1BEB1207DA01D9962F,  # noqa: E501
+            0x7C8F4A98E086F64E28C75F54712B5D44BEC3C29B5C70519E8880D3046A5618DC: 0xAAFC1F2601752B114D722070F75539BFEC7FAF49F0D48A48D27862F0C3B09903,  # noqa: E501
+            0x809C325F50ACF5787776E960985E72443B4330AD1E2F466557FFFEE16BA51D44: 0xB940A56E64B5B661D87919B8EF03640EC077A6D72DD0B524ADEDAA7DDC91FF7A,  # noqa: E501
+            0x84E4A80D33C5D2ABD2B0A5AEC0FDC5EAEED90AB31DB556E404A81718EA286E39: 28,  # noqa: E501
+            0x877305412FA2486F563C457B744E5C8B1E4D0ECA73371DE5E771F2ABC263F4DC: 0x7088A36F67276D475AA62127CFDE9790CC802FDF3A54DF49461A25EB8BF15707,  # noqa: E501
+            0x922A8F2FC1CBE67C8ACC6A8A720983C366D71D3E2E78E3048949EBC913EA611A: 0x50FB9F913CA102534BB0A8EB8EBF19C68DFD16FFE5E207BCC580084CD4ECD8B4,  # noqa: E501
+            0x987CB9ECFD8CE499D9D0E9E6B7DA29617AA02774A34F4A8EA54442F44A1E1936: 0x5179F98F555F1E9F1D4A335D16F41154579A53E361E9859269B6FA74EA9C7D21,  # noqa: E501
+            0xADA5013122D395BA3C54772283FB069B10426056EF8CA54750CB9BB552A59E7D: 0xF69B5,  # noqa: E501
+            0xB16B117660F31197087F4D6FE50D3D4579152244956F753F9653CCF85F4B35C4: 0x830272E3BB35226B047244CBDC46F1B6B864A280461E7A592F70E0863F4F1D33,  # noqa: E501
+            0xB1F1AAEDFB83C7755A2BFFC9E2557F1723F9ABE5642397963E76248C9209AF57: 0xE9BE955C5FBFCD846D7425EAEA05CE897786AEFAD99665342CBF30761B352526,  # noqa: E501
+            0xB7BD50FDF7B043411C9AC33F0AF2CEBC69C393EB0B91F4976946F9C7B15AD0DA: 0xFCCCA0E7832BAE9AFE799A6D6177DC3869FA6C5B5105F8DF6F365DE5723820EC,  # noqa: E501
+            0xBC96058EB03504EE6F5C0A9582F8720D99A6E9738B171499507FACFF0B2C0B5B: 0x9DB6A4F2766B51013B8D2F9038131D1BB4AF725D019D111D7E26FF96C023B23F,  # noqa: E501
+            0xC186C4F377B7F13892ADE9656ACD1522AA1F8AC151AC4F62457B5073241D79FC: 0x7289738FEF00F1770EEB098DB9BD486C01AC12398D79CDF935514A128C585C51,  # noqa: E501
+            0xCAE57AE3017972D63EFFD8EAE44F5054402C3E890D154B905ED6B5B533327FA9: 0xD2E4BF465E61993D13089B940A7C55017A5117D8E43E4115550A139E1D4B3E3A,  # noqa: E501
+            0xCF569EE7BF3ACCC0F893DFFD04F1A757F373EFE80893EFF504FB3678F688EC1D: contract_3,  # noqa: E501
+            0xD69B7284545A9F5275DF64CE94848DC954FCB8A8B525E7AC801517C12A75AF84: 0x4202995350ABAE303B43E564AA79121A30B5F1AEA31F69CD25E07DD3FA64DCE7,  # noqa: E501
+            0xD8F6F90F51E657690EE28D1CC80D81BC1B89290065891FDD853D09CAAAF756AA: contract_1,  # noqa: E501
+            0xDE72F8EED43CC2A5A3EAA51483D14B17DC92BB26C154AE184CEE4B4895011EDC: 0x47CE2B6FDB72C3FABB9C74F82C1E3E522BCD42E614FD85C208AC3C4C840CEA72,  # noqa: E501
+            0xE0E687DDF317F3D2B209AE3884148EFF0F636E16827F82EDED14ADA8FC603009: 0xFA7C8939F9B033162CF8D75EA69671BB8A27041BD4CDC76594E61E99333CB041,  # noqa: E501
+            0xE8CDA339D72A1A350B62F1E3FA52E254C395CC9FDD9F60ADB21C7633FBDAB531: 0x128C4FDF4801A30EAE99DD58F0F3FF5CA65F71B66A9AC0F38DD450FB24B4AAAA,  # noqa: E501
+            0xEC5E7F54FA5E516E616B04F9D5A0EE433A80E09ED47D7E5269AFD76C05FF251E: 20,  # noqa: E501
+            0xF9A3BF5F2CCB903EE1A7644113B794DB0260DE404FB8F11203E75A7FFF151618: 0xBD94773C0D85C68240AE8DFD53D9D33CD137509BFC5D3433381299DF768C8377,  # noqa: E501
+        },
+        nonce=0,
+        address=Address(0xC9AE5868651BF7B7DB6E360217DB49CE4E69C07E),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6000610b7f537c01000000000000000000000000000000000000000000000000000000006000350473c9ae5868651bf7b7db6e360217db49ce4e69c07e6020526308d3d58781141561024557600435606052606060605990590160009052600081526060518160200152600181604001528090502054608052600060806080599059016000905260008152606051816020015260028160400152328160600152809050205414151561014e57608060805990590160009052600081526060518160200152600281604001523281606001528090502054608052682f000000000000000060a060a059905901600090526000815260605181602001526000816040015260805181606001526000816080015280905020553260a060a05990590160009052600081526060518160200152600081604001526080518160600152600181608001528090502055610238565b608051608060805990590160009052600081526060518160200152600281604001523281606001528090502055682f000000000000000060a060a059905901600090526000815260605181602001526000816040015260805181606001526000816080015280905020553260a060a059905901600090526000815260605181602001526000816040015260805181606001526001816080015280905020556001606060605990590160009052600081526060518160200152600181604001528090502054016060606059905901600090526000815260605181602001526001816040015280905020555b60016101e05260206101e0f35b6328c8b31581141561029d576004356060526024356102005260a060a0599059016000905260008152606051816020015260008160400152610200518160600152600081608001528090502054610220526020610220f35b6374af23ec8114156103865760043560605260243561026052608060805990590160009052600081526060518160200152600281604001526102605181606001528090502054610200526000610200511415610332576102605160a060a05990590160009052600081526060518160200152600081604001526102005181606001526001816080015280905020541415610335565b60005b156103475760006102c05260206102c0f35b60a060a05990590160009052600081526060518160200152600081604001526102005181606001526000816080015280905020546102e05260206102e0f35b6384d646ee8114156103dc5760043560605260243560805260a060a05990590160009052600081526060518160200152600081604001526080518160600152600181608001528090502054610320526020610320f35b63f42294278114156106f45760043561026052601c602459905901600090520163175c6322601c82035260206103a06004836000602051602d5a03f1506103a0519050610360526102605115610581576103605160020280602002602001599059016000905281815260208101905090506103c05261036051806020026020015990590160009052818152602081019050905061042052601c602459905901600090520163c3387858601c8203526103605160408160200201599059016000905281602002604001816004856000602051602d5a03f150604081019050905090506104205260006104c05260006104e0525b610360516104c051121561057c576104c051602002610420510151606052601c60645990590160009052016374af23ec601c82035260605160048201526102605160248201526020610520604483600030602d5a03f1506105205190506105005260006105005114151561056c576060516104e0516020026103c05101526105005160016104e051016020026103c051015260026104e051016104e0525b60016104c051016104c0526104ce565b6106d7565b32610260526103605160020280602002602001599059016000905281815260208101905090506103c05261036051806020026020015990590160009052818152602081019050905061042052601c602459905901600090520163c3387858601c8203526103605160408160200201599059016000905281602002604001816004856000602051602d5a03f150604081019050905090506104205260006104c05260006104e0525b610360516104c05112156106d6576104c051602002610420510151606052601c60645990590160009052016374af23ec601c820352606051600482015261026051602482015260206105c0604483600030602d5a03f1506105c0519050610500526000610500511415156106c6576060516104e0516020026103c05101526105005160016104e051016020026103c051015260026104e051016104e0525b60016104c051016104c052610628565b5b6103c05160206040820352602060208203510260400160408203f3505b6380b5e7bd81141561073557600435606052606060605990590160009052600081526060518160200152600181604001528090502054610600526020610600f35b63156f1c328114156107865760043560605260243561064052608060805990590160009052600081526060518160200152600281604001526106405181606001528090502054610660526020610660f35b63b3a24fc081141561087857365990590160009052366004823760043560208201016106c0526024356106e05250600260206106c0510351018060200260200159905901600090528181526020810190509050610700523261070051526106e051602061070051015260026104c0525b600260206106c0510351016104c05112156108385760026104c051036020026106c05101516104c05160200261070051015260016104c051016104c0526107f6565b60206107005103516020026020599059016000905260208183610700516000600287604801f15080519050905061076052610760516107c05260206107c0f35b63e346f5fc811415610a1c576004356107e0526024356108005260006104c0525b606060605990590160009052600081526107e05181602001526001816040015280905020546104c05112156109e65760a060a05990590160009052600081526107e0518160200152600081604001526104c0518160600152600181608001528090502054610840526108405160a060a0599059016000905260008152610800518160200152600081604001526104c051816060015260018160800152809050205560a060a05990590160009052600081526107e0518160200152600081604001526104c051816060015260008160800152809050205460a060a0599059016000905260008152610800518160200152600081604001526104c05181606001526000816080015280905020556104c0516080608059905901600090526000815261080051816020015260028160400152610840518160600152809050205560016104c051016104c052610899565b6104c051606060605990590160009052600081526108005181602001526001816040015280905020556001610920526020610920f35b633fb57036811415610b5457600435606052602435610940526060606059905901600090526000815260605181602001526001816040015280905020546109605261096051608060805990590160009052600081526060518160200152600281604001526109405181606001528090502055600060a060a05990590160009052600081526060518160200152600081604001526109605181606001526000816080015280905020556109405160a060a05990590160009052600081526060518160200152600081604001526109605181606001526001816080015280905020556001606060605990590160009052600081526060518160200152600181604001528090502054016060606059905901600090526000815260605181602001526001816040015280905020556001610a40526020610a40f35b6312709a33811415610beb57600435606052602435608052604435610a6052610a605160a060a059905901600090526000815260605181602001526000816040015260805181606001526000816080015280905020540160a060a059905901600090526000815260605181602001526000816040015260805181606001526000816080015280905020556001610ac0526020610ac0f35b633229cf6e811415610c8257600435606052602435608052604435610a6052610a605160a060a059905901600090526000815260605181602001526000816040015260805181606001526000816080015280905020540360a060a059905901600090526000815260605181602001526000816040015260805181606001526000816080015280905020556001610b20526020610b20f35b63a75f5c6a811415610ce557600435606052602435608052604435610a6052610a605160a060a059905901600090526000815260605181602001526000816040015260805181606001526000816080015280905020556001610b60526020610b60f35b50  # noqa: E501
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0xB7F, value=0x0)
+        + Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.MSTORE(
+            offset=0x20, value=0xC9AE5868651BF7B7DB6E360217DB49CE4E69C07E
+        )
+        + Op.JUMPI(pc=0x245, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x8D3D587)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x80, value=Op.SLOAD(key=Op.SHA3))
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.ORIGIN)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.JUMPI(pc=0x14E, condition=Op.ISZERO(Op.ISZERO(Op.EQ)))
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.ORIGIN)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x80, value=Op.SLOAD(key=Op.SHA3))
+        + Op.PUSH9[0x2F0000000000000000]
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.ORIGIN
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.JUMP(pc=0x238)
+        + Op.JUMPDEST
+        + Op.MLOAD(offset=0x80)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.ORIGIN)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.PUSH9[0x2F0000000000000000]
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.ORIGIN
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.ADD
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1E0, value=0x1)
+        + Op.RETURN(offset=0x1E0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x29D, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x28C8B315)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x200, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x200))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x220, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0x220, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x386, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x74AF23EC)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x260, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x260))
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x200, value=Op.SLOAD(key=Op.SHA3))
+        + Op.JUMPI(
+            pc=0x332, condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x200), 0x0))
+        )
+        + Op.MLOAD(offset=0x260)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x200))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.ISZERO(Op.EQ)
+        + Op.JUMP(pc=0x335)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x347, condition=Op.ISZERO)
+        + Op.MSTORE(offset=0x2C0, value=0x0)
+        + Op.RETURN(offset=0x2C0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x200))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x2E0, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0x2E0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x3DC, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x84D646EE)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x320, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0x320, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x6F4, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xF4229427)))
+        + Op.MSTORE(offset=0x260, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x24]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x175C6322)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x4,
+                ret_offset=0x3A0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x3A0)
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x360]
+        + Op.MSTORE
+        + Op.JUMPI(pc=0x581, condition=Op.ISZERO(Op.MLOAD(offset=0x260)))
+        + Op.MUL(0x2, Op.MLOAD(offset=0x360))
+        + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x3C0]
+        + Op.MSTORE
+        + Op.MLOAD(offset=0x360)
+        + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x420]
+        + Op.MSTORE
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x24]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xC3387858)
+        + Op.MLOAD(offset=0x360)
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP6,
+                args_size=0x4,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x420]
+        + Op.MSTORE
+        + Op.MSTORE(offset=0x4C0, value=0x0)
+        + Op.MSTORE(offset=0x4E0, value=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x57C,
+            condition=Op.ISZERO(
+                Op.SLT(Op.MLOAD(offset=0x4C0), Op.MLOAD(offset=0x360))
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=Op.MLOAD(
+                offset=Op.ADD(
+                    Op.MLOAD(offset=0x420),
+                    Op.MUL(0x20, Op.MLOAD(offset=0x4C0)),
+                )
+            ),
+        )
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x74AF23EC)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0x260))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.ADDRESS,
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x44,
+                ret_offset=0x520,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x520)
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x500]
+        + Op.MSTORE
+        + Op.JUMPI(
+            pc=0x56C,
+            condition=Op.ISZERO(Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x500), 0x0))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(
+                Op.MLOAD(offset=0x3C0), Op.MUL(0x20, Op.MLOAD(offset=0x4E0))
+            ),
+            value=Op.MLOAD(offset=0x60),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(
+                Op.MLOAD(offset=0x3C0),
+                Op.MUL(0x20, Op.ADD(Op.MLOAD(offset=0x4E0), 0x1)),
+            ),
+            value=Op.MLOAD(offset=0x500),
+        )
+        + Op.MSTORE(offset=0x4E0, value=Op.ADD(Op.MLOAD(offset=0x4E0), 0x2))
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x4C0, value=Op.ADD(Op.MLOAD(offset=0x4C0), 0x1))
+        + Op.JUMP(pc=0x4CE)
+        + Op.JUMPDEST
+        + Op.JUMP(pc=0x6D7)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x260, value=Op.ORIGIN)
+        + Op.MUL(0x2, Op.MLOAD(offset=0x360))
+        + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x3C0]
+        + Op.MSTORE
+        + Op.MLOAD(offset=0x360)
+        + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x420]
+        + Op.MSTORE
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x24]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xC3387858)
+        + Op.MLOAD(offset=0x360)
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP6,
+                args_size=0x4,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x420]
+        + Op.MSTORE
+        + Op.MSTORE(offset=0x4C0, value=0x0)
+        + Op.MSTORE(offset=0x4E0, value=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x6D6,
+            condition=Op.ISZERO(
+                Op.SLT(Op.MLOAD(offset=0x4C0), Op.MLOAD(offset=0x360))
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=Op.MLOAD(
+                offset=Op.ADD(
+                    Op.MLOAD(offset=0x420),
+                    Op.MUL(0x20, Op.MLOAD(offset=0x4C0)),
+                )
+            ),
+        )
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x74AF23EC)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0x260))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.ADDRESS,
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x44,
+                ret_offset=0x5C0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x5C0)
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x500]
+        + Op.MSTORE
+        + Op.JUMPI(
+            pc=0x6C6,
+            condition=Op.ISZERO(Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x500), 0x0))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(
+                Op.MLOAD(offset=0x3C0), Op.MUL(0x20, Op.MLOAD(offset=0x4E0))
+            ),
+            value=Op.MLOAD(offset=0x60),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(
+                Op.MLOAD(offset=0x3C0),
+                Op.MUL(0x20, Op.ADD(Op.MLOAD(offset=0x4E0), 0x1)),
+            ),
+            value=Op.MLOAD(offset=0x500),
+        )
+        + Op.MSTORE(offset=0x4E0, value=Op.ADD(Op.MLOAD(offset=0x4E0), 0x2))
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x4C0, value=Op.ADD(Op.MLOAD(offset=0x4C0), 0x1))
+        + Op.JUMP(pc=0x628)
+        + Op.JUMPDEST * 2
+        + Op.MLOAD(offset=0x3C0)
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x735, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x80B5E7BD)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x600, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0x600, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x786, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x156F1C32)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x640, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x640))
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x660, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0x660, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x878, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xB3A24FC0)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(
+            offset=0x6C0,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x4)),
+        )
+        + Op.MSTORE(offset=0x6E0, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.POP
+        + Op.ADD(Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x6C0), 0x20)), 0x2)
+        + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x700]
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.MLOAD(offset=0x700), value=Op.ORIGIN)
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x700), 0x20),
+            value=Op.MLOAD(offset=0x6E0),
+        )
+        + Op.MSTORE(offset=0x4C0, value=0x2)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x838,
+            condition=Op.ISZERO(
+                Op.SLT(
+                    Op.MLOAD(offset=0x4C0),
+                    Op.ADD(
+                        Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x6C0), 0x20)),
+                        0x2,
+                    ),
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(
+                Op.MLOAD(offset=0x700), Op.MUL(0x20, Op.MLOAD(offset=0x4C0))
+            ),
+            value=Op.MLOAD(
+                offset=Op.ADD(
+                    Op.MLOAD(offset=0x6C0),
+                    Op.MUL(0x20, Op.SUB(Op.MLOAD(offset=0x4C0), 0x2)),
+                )
+            ),
+        )
+        + Op.MSTORE(offset=0x4C0, value=Op.ADD(Op.MLOAD(offset=0x4C0), 0x1))
+        + Op.JUMP(pc=0x7F6)
+        + Op.JUMPDEST
+        + Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x700), 0x20)))
+        + Op.PUSH1[0x20]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.ADD(0x48, Op.DUP8),
+                address=0x2,
+                value=0x0,
+                args_offset=Op.MLOAD(offset=0x700),
+                args_size=Op.DUP4,
+                ret_offset=Op.DUP2,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=Op.DUP1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x760]
+        + Op.MSTORE
+        + Op.MSTORE(offset=0x7C0, value=Op.MLOAD(offset=0x760))
+        + Op.RETURN(offset=0x7C0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xA1C, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xE346F5FC)))
+        + Op.MSTORE(offset=0x7E0, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x800, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x4C0, value=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x7E0))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x9E6,
+            condition=Op.ISZERO(
+                Op.SLT(Op.MLOAD(offset=0x4C0), Op.SLOAD(key=Op.SHA3))
+            ),
+        )
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x7E0))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x4C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x840, value=Op.SLOAD(key=Op.SHA3))
+        + Op.MLOAD(offset=0x840)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x800))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x4C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x7E0))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x4C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x800))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x4C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x4C0)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x800))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x840))
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0x4C0, value=Op.ADD(Op.MLOAD(offset=0x4C0), 0x1))
+        + Op.JUMP(pc=0x899)
+        + Op.JUMPDEST
+        + Op.MLOAD(offset=0x4C0)
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x800))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0x920, value=0x1)
+        + Op.RETURN(offset=0x920, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xB54, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x3FB57036)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x940, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x960, value=Op.SLOAD(key=Op.SHA3))
+        + Op.MLOAD(offset=0x960)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x2)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x940))
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x960))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x940)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x960))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.ADD
+        + Op.PUSH1[0x60] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0xA40, value=0x1)
+        + Op.RETURN(offset=0xA40, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xBEB, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x12709A33)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0xA60, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MLOAD(offset=0xA60)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.ADD
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0xAC0, value=0x1)
+        + Op.RETURN(offset=0xAC0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xC82, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x3229CF6E)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0xA60, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MLOAD(offset=0xA60)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.SUB
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0xB20, value=0x1)
+        + Op.RETURN(offset=0xB20, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xCE5, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xA75F5C6A)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0xA60, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MLOAD(offset=0xA60)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0xB60, value=0x1)
+        + Op.RETURN(offset=0xB60, size=0x20)
+        + Op.JUMPDEST
+        + Op.POP,
+        storage={
+            0xF299DBBE3A7A5D949FE794E9A47B3106699C8110FF986EB84921C183E69E7F0: 0x2F0000000000000000,  # noqa: E501
+            0x1EDCD36F61CAE5DC6414157DFBADF9F11CA013AC763E27F8AF55FEAA8A239C89: contract_1,  # noqa: E501
+            0x689082D076EC3C02CBE4B99F6D9833E3C4A161072FD42FB7649EEE5189A67CCC: 0x63524E3FE4791AEFCE1E932BBFB3FDF375BFAD89,  # noqa: E501
+            0xAF1D6676BE3AB502A59D91F6F5C49BAFFC15B2CFC65A41C4D96857C0F535ADBA: 0x1D60000000000000000,  # noqa: E501
+            0xDF1A770F69D93D1719292F384FDB4DA22C0E88AEF2BA462BFF16674BC7848730: 0x1C11AA45C792E202E9FFDC2F12F99D0D209BEF70,  # noqa: E501
+            0xEC5E7F54FA5E516E616B04F9D5A0EE433A80E09ED47D7E5269AFD76C05FF251E: contract_2,  # noqa: E501
+        },
+        nonce=0,
+        address=Address(0xE509E3A93BEB1EBA72F8CB8D25F93A85E2D54AFB),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600061289f537c01000000000000000000000000000000000000000000000000000000006000350473c9ae5868651bf7b7db6e360217db49ce4e69c07e60205263c4982a8581141561012757600435606052602435608052608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460a05260a051806020026020015990590160009052818152602081019050905060e0526000610140525b60a05161014051121561010b5760a060a0599059016000905260008152606051816020015260805181604001526001816060015261014051816080015280905020546101405160200260e051015260016101405101610140526100ad565b60e05160206040820352602060208203510260400160408203f3505b63cc1c944e8114156101765760043560605260243560805260806080599059016000905260008152606051816020015260805181604001526000816060015280905020546101a05260206101a0f35b6395a405b98114156101d5576004356060526024356080526044356101e05260a060a059905901600090526000815260605181602001526080518160400152600181606001526101e05181608001528090502054610200526020610200f35b6371ebb662811415610224576004356060526024356080526080608059905901600090526000815260605181602001526080518160400152600281606001528090502054610240526020610240f35b637a57a3db811415610325576004356060526024356080526044356102805260c060c0599059016000905260008152606051816020015260805181604001526003816060015261028051816080015260008160a0015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460200280806020015990590160009052818152602081019050905060005b602083048112156102e95780840154816020028301526001810190506102c8565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63f73dc690811415610394576004356060526024356080526044356103c0526064356103e05260c060c059905901600090526000815260605181602001526080518160400152600381606001526103c05181608001526103e0518160a001528090502054610400526020610400f35b6354cc61098114156103f3576004356060526024356080526044356103c05260a060a059905901600090526000815260605181602001526080518160400152600481606001526103c05181608001528090502054610440526020610440f35b63c63ef546811415610442576004356060526024356080526080608059905901600090526000815260605181602001526080518160400152600581606001528090502054610480526020610480f35b639381779b8114156105335760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600681606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260058160600152809050205460200280806020015990590160009052818152602081019050905060005b602083048112156104f75780840154816020028301526001810190506104d6565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b634f9c6eeb8114156106245760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600781606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260058160600152809050205460200280806020015990590160009052818152602081019050905060005b602083048112156105e85780840154816020028301526001810190506105c7565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b637dc121958114156107155760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600881606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260058160600152809050205460200280806020015990590160009052818152602081019050905060005b602083048112156106d95780840154816020028301526001810190506106b8565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63fa9832d18114156108065760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600981606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460200280806020015990590160009052818152602081019050905060005b602083048112156107ca5780840154816020028301526001810190506107a9565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b632c5a40d58114156108f75760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600a81606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260058160600152809050205460200280806020015990590160009052818152602081019050905060005b602083048112156108bb57808401548160200283015260018101905061089a565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63e05dcb568114156109eb5760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600b81606001526000816080015280905020600260806080599059016000905260008152606051816020015260805181604001526000816060015280905020546020020180806020015990590160009052818152602081019050905060005b602083048112156109af57808401548160200283015260018101905061098e565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63586b5be0811415610a3a576004356060526024356080526080608059905901600090526000815260605181602001526080518160400152600c81606001528090502054610b80526020610b80f35b63eb8af5aa811415610b585760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600d81606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460806080599059016000905260008152606051816020015260805181604001526005816060015280905020540560200280806020015990590160009052818152602081019050905060005b60208304811215610b1c578084015481602002830152600181019050610afb565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b637ab6ea8a811415610c765760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600e81606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460806080599059016000905260008152606051816020015260805181604001526005816060015280905020540560200280806020015990590160009052818152602081019050905060005b60208304811215610c3a578084015481602002830152600181019050610c19565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b632b810cb9811415610d945760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600f81606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460806080599059016000905260008152606051816020015260805181604001526005816060015280905020540560200280806020015990590160009052818152602081019050905060005b60208304811215610d58578084015481602002830152600181019050610d37565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b637fb42e46811415610e855760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152601081606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460200280806020015990590160009052818152602081019050905060005b60208304811215610e49578084015481602002830152600181019050610e28565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63734fa727811415610f765760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152601181606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460200280806020015990590160009052818152602081019050905060005b60208304811215610f3a578084015481602002830152600181019050610f19565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63c67fa8578114156110675760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152601281606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460200280806020015990590160009052818152602081019050905060005b6020830481121561102b57808401548160200283015260018101905061100a565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b635ed853e48114156111855760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152601381606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460806080599059016000905260008152606051816020015260805181604001526005816060015280905020540560200280806020015990590160009052818152602081019050905060005b60208304811215611149578084015481602002830152600181019050611128565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63b86f51258114156112a35760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152601481606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460806080599059016000905260008152606051816020015260805181604001526005816060015280905020540560200280806020015990590160009052818152602081019050905060005b60208304811215611267578084015481602002830152600181019050611246565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63bc3d7d858114156113945760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152601581606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460200280806020015990590160009052818152602081019050905060005b60208304811215611358578084015481602002830152600181019050611337565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63a2302f2f81141561148157600435606052602435611680526044356116a0526116a05160a060a0599059016000905260008152606051816020015261168051816040015260018160600152608060805990590160009052600081526060518160200152611680518160400152600081606001528090502054816080015280905020556001608060805990590160009052600081526060518160200152611680518160400152600081606001528090502054016080608059905901600090526000815260605181602001526116805181604001526000816060015280905020556001611740526020611740f35b63058ca2bc8114156114dd576004356060526024356080526044356117605261176051608060805990590160009052600081526060518160200152608051816040015260028160600152809050205560016117a05260206117a0f35b635d3b965b8114156116175736599059016000905236600482376004356060526024356080526044356102805260643560208201016117e052608435611800525060c060c0599059016000905260008152606051816020015260805181604001526003816060015261028051816080015260008160a001528090502060206117e05103516020026020810460005b8181121561158c57806020026117e05101518482015560018101905061156b565b602083066020036101000a600003816020026117e05101511684820155505050506118005160806080599059016000905260008152606051816020015260805181604001526002816060015280905020540160806080599059016000905260008152606051816020015260805181604001526002816060015280905020556001611900526020611900f35b63b0e14f0f81141561167357600435606052602435608052604435611920526119205160806080599059016000905260008152606051816020015260805181604001526005816060015280905020556001611960526020611960f35b636acccdbc8114156117395736599059016000905236600482376004356060526024356080526044356020820101611980525060a060a05990590160009052600081526060518160200152608051816040015260068160600152600081608001528090502060206119805103516020026020810460005b8181121561170b5780602002611980510151848201556001810190506116ea565b602083066020036101000a600003816020026119805101511684820155505050506001611a40526020611a40f35b63a1fa51f98114156117ff5736599059016000905236600482376004356060526024356080526044356020820101611a60525060a060a0599059016000905260008152606051816020015260805181604001526007816060015260008160800152809050206020611a605103516020026020810460005b818112156117d15780602002611a60510151848201556001810190506117b0565b602083066020036101000a60000381602002611a605101511684820155505050506001611b20526020611b20f35b63cd87f43a8114156118c55736599059016000905236600482376004356060526024356080526044356020820101611b40525060a060a0599059016000905260008152606051816020015260805181604001526008816060015260008160800152809050206020611b405103516020026020810460005b818112156118975780602002611b4051015184820155600181019050611876565b602083066020036101000a60000381602002611b405101511684820155505050506001611c00526020611c00f35b63222a866381141561198b5736599059016000905236600482376004356060526024356080526044356020820101611c20525060a060a0599059016000905260008152606051816020015260805181604001526009816060015260008160800152809050206020611c205103516020026020810460005b8181121561195d5780602002611c205101518482015560018101905061193c565b602083066020036101000a60000381602002611c205101511684820155505050506001611ce0526020611ce0f35b63b39e1faa811415611a515736599059016000905236600482376004356060526024356080526044356020820101611d00525060a060a059905901600090526000815260605181602001526080518160400152600a816060015260008160800152809050206020611d005103516020026020810460005b81811215611a235780602002611d0051015184820155600181019050611a02565b602083066020036101000a60000381602002611d005101511684820155505050506001611dc0526020611dc0f35b63e365736b811415611b175736599059016000905236600482376004356060526024356080526044356020820101611de0525060a060a059905901600090526000815260605181602001526080518160400152600b816060015260008160800152809050206020611de05103516020026020810460005b81811215611ae95780602002611de051015184820155600181019050611ac8565b602083066020036101000a60000381602002611de05101511684820155505050506001611ea0526020611ea0f35b63aad7d6e3811415611b7357600435606052602435608052604435611ec052611ec0516080608059905901600090526000815260605181602001526080518160400152600c816060015280905020556001611f00526020611f00f35b6301112b27811415611c395736599059016000905236600482376004356060526024356080526044356020820101611f20525060a060a059905901600090526000815260605181602001526080518160400152600d816060015260008160800152809050206020611f205103516020026020810460005b81811215611c0b5780602002611f2051015184820155600181019050611bea565b602083066020036101000a60000381602002611f205101511684820155505050506001611fe0526020611fe0f35b63bdbb239b811415611cff5736599059016000905236600482376004356060526024356080526044356020820101612000525060a060a059905901600090526000815260605181602001526080518160400152600e8160600152600081608001528090502060206120005103516020026020810460005b81811215611cd1578060200261200051015184820155600181019050611cb0565b602083066020036101000a6000038160200261200051015116848201555050505060016120c05260206120c0f35b6305a0cd48811415611dc557365990590160009052366004823760043560605260243560805260443560208201016120e0525060a060a059905901600090526000815260605181602001526080518160400152600f8160600152600081608001528090502060206120e05103516020026020810460005b81811215611d9757806020026120e051015184820155600181019050611d76565b602083066020036101000a600003816020026120e051015116848201555050505060016121a05260206121a0f35b63aaa1fe35811415611e8b57365990590160009052366004823760043560605260243560805260443560208201016121c0525060a060a05990590160009052600081526060518160200152608051816040015260108160600152600081608001528090502060206121c05103516020026020810460005b81811215611e5d57806020026121c051015184820155600181019050611e3c565b602083066020036101000a600003816020026121c05101511684820155505050506001612280526020612280f35b632be4935d811415611f5157365990590160009052366004823760043560605260243560805260443560208201016122a0525060a060a05990590160009052600081526060518160200152608051816040015260118160600152600081608001528090502060206122a05103516020026020810460005b81811215611f2357806020026122a051015184820155600181019050611f02565b602083066020036101000a600003816020026122a05101511684820155505050506001612360526020612360f35b6313a8350d8114156120175736599059016000905236600482376004356060526024356080526044356020820101612380525060a060a05990590160009052600081526060518160200152608051816040015260128160600152600081608001528090502060206123805103516020026020810460005b81811215611fe9578060200261238051015184820155600181019050611fc8565b602083066020036101000a600003816020026123805101511684820155505050506001612440526020612440f35b63cb540b458114156120dd5736599059016000905236600482376004356060526024356080526044356020820101612460525060a060a05990590160009052600081526060518160200152608051816040015260138160600152600081608001528090502060206124605103516020026020810460005b818112156120af57806020026124605101518482015560018101905061208e565b602083066020036101000a600003816020026124605101511684820155505050506001612520526020612520f35b63be0306278114156121a35736599059016000905236600482376004356060526024356080526044356020820101612540525060a060a05990590160009052600081526060518160200152608051816040015260148160600152600081608001528090502060206125405103516020026020810460005b81811215612175578060200261254051015184820155600181019050612154565b602083066020036101000a600003816020026125405101511684820155505050506001612600526020612600f35b6383fd77f08114156122695736599059016000905236600482376004356060526024356080526044356020820101612620525060a060a05990590160009052600081526060518160200152608051816040015260158160600152600081608001528090502060206126205103516020026020810460005b8181121561223b57806020026126205101518482015560018101905061221a565b602083066020036101000a6000038160200261262051015116848201555050505060016126e05260206126e0f35b63594622058114156122d5576004356060526024356080526044356103c052606435612700526127005160a060a059905901600090526000815260605181602001526080518160400152600481606001526103c051816080015280905020556001612740526020612740f35b63bb8e419681141561244857600435606052602435612760526044356127805260006127a0525b6080608059905901600090526000815260605181602001526001612760510381604001526000816060015280905020546127a051121561243b5760a060a05990590160009052600081526060518160200152600161276051038160400152600181606001526127a0518160800152809050205460a060a05990590160009052600081526060518160200152612780518160400152600181606001526080608059905901600090526000815260605181602001526127805181604001526000816060015280905020548160800152809050205560016080608059905901600090526000815260605181602001526127805181604001526000816060015280905020540160806080599059016000905260008152606051816020015261278051816040015260008160600152809050205560016127a051016127a0526122fc565b6001612880526020612880f35b50  # noqa: E501
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x289F, value=0x0)
+        + Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.MSTORE(
+            offset=0x20, value=0xC9AE5868651BF7B7DB6E360217DB49CE4E69C07E
+        )
+        + Op.JUMPI(pc=0x127, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xC4982A85)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0xA0, value=Op.SLOAD(key=Op.SHA3))
+        + Op.MLOAD(offset=0xA0)
+        + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0xE0]
+        + Op.MSTORE
+        + Op.MSTORE(offset=0x140, value=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x10B,
+            condition=Op.ISZERO(
+                Op.SLT(Op.MLOAD(offset=0x140), Op.MLOAD(offset=0xA0))
+            ),
+        )
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=Op.MLOAD(offset=0x140))
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(
+            offset=Op.ADD(
+                Op.MLOAD(offset=0xE0), Op.MUL(0x20, Op.MLOAD(offset=0x140))
+            ),
+            value=Op.SLOAD(key=Op.SHA3),
+        )
+        + Op.MSTORE(offset=0x140, value=Op.ADD(Op.MLOAD(offset=0x140), 0x1))
+        + Op.JUMP(pc=Op.PUSH2[0xAD])
+        + Op.JUMPDEST
+        + Op.MLOAD(offset=0xE0)
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x176, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xCC1C944E)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x1A0, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0x1A0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1D5, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x95A405B9)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x1E0, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=Op.MLOAD(offset=0x1E0))
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x200, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0x200, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x224, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x71EBB662)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x240, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0x240, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x325, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x7A57A3DB)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x280, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.PUSH1[0xC0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x3)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=Op.MLOAD(offset=0x280))
+        + Op.MSTORE(offset=Op.ADD(0xA0, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
+        + Op.DUP1
+        + Op.ADD(0x20, Op.DUP1)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2E9,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x2C8)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.AND(
+                Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x394, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xF73DC690)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x3C0, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MSTORE(offset=0x3E0, value=Op.CALLDATALOAD(offset=0x64))
+        + Op.PUSH1[0xC0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x3)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=Op.MLOAD(offset=0x3C0))
+        + Op.MSTORE(offset=Op.ADD(0xA0, Op.DUP2), value=Op.MLOAD(offset=0x3E0))
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x400, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0x400, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x3F3, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x54CC6109)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x3C0, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=Op.MLOAD(offset=0x3C0))
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x440, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0x440, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x442, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xC63EF546)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x480, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0x480, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x533, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x9381779B)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x6)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
+        + Op.DUP1
+        + Op.ADD(0x20, Op.DUP1)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4F7,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x4D6)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.AND(
+                Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x624, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x4F9C6EEB)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x7)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
+        + Op.DUP1
+        + Op.ADD(0x20, Op.DUP1)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x5E8,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x5C7)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.AND(
+                Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x715, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x7DC12195)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x8)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
+        + Op.DUP1
+        + Op.ADD(0x20, Op.DUP1)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x6D9,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x6B8)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.AND(
+                Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x806, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xFA9832D1)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x9)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
+        + Op.DUP1
+        + Op.ADD(0x20, Op.DUP1)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x7CA,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x7A9)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.AND(
+                Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8F7, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x2C5A40D5)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xA)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
+        + Op.DUP1
+        + Op.ADD(0x20, Op.DUP1)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x8BB,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x89A)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.AND(
+                Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x9EB, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xE05DCB56)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xB)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
+        + Op.ADD
+        + Op.DUP1
+        + Op.ADD(0x20, Op.DUP1)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x9AF,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x98E)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.AND(
+                Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xA3A, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x586B5BE0)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xC)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0xB80, value=Op.SLOAD(key=Op.SHA3))
+        + Op.RETURN(offset=0xB80, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xB58, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xEB8AF5AA)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xD)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.MUL(0x20, Op.SDIV)
+        + Op.DUP1
+        + Op.ADD(0x20, Op.DUP1)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0xB1C,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0xAFB)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.AND(
+                Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xC76, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x7AB6EA8A)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xE)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.MUL(0x20, Op.SDIV)
+        + Op.DUP1
+        + Op.ADD(0x20, Op.DUP1)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0xC3A,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0xC19)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.AND(
+                Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xD94, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x2B810CB9)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xF)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.MUL(0x20, Op.SDIV)
+        + Op.DUP1
+        + Op.ADD(0x20, Op.DUP1)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0xD58,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0xD37)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.AND(
+                Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xE85, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x7FB42E46)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x10)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
+        + Op.DUP1
+        + Op.ADD(0x20, Op.DUP1)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0xE49,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0xE28)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.AND(
+                Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xF76, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x734FA727)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x11)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
+        + Op.DUP1
+        + Op.ADD(0x20, Op.DUP1)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0xF3A,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0xF19)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.AND(
+                Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1067, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xC67FA857)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x12)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
+        + Op.DUP1
+        + Op.ADD(0x20, Op.DUP1)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x102B,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x100A)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.AND(
+                Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1185, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x5ED853E4)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x13)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.MUL(0x20, Op.SDIV)
+        + Op.DUP1
+        + Op.ADD(0x20, Op.DUP1)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1149,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1128)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.AND(
+                Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x12A3, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xB86F5125)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x14)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.MUL(0x20, Op.SDIV)
+        + Op.DUP1
+        + Op.ADD(0x20, Op.DUP1)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1267,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1246)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.AND(
+                Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1394, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xBC3D7D85)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x15)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MUL(0x20, Op.SLOAD(key=Op.SHA3))
+        + Op.DUP1
+        + Op.ADD(0x20, Op.DUP1)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1358,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DIV(Op.DUP4, 0x20))),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.SLOAD(key=Op.ADD(Op.DUP5, Op.DUP1)),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1337)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2)),
+            value=Op.AND(
+                Op.SLOAD(key=Op.ADD(Op.DUP6, Op.DUP2)),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1481, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xA2302F2F)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x1680, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x16A0, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MLOAD(offset=0x16A0)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(
+            offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x1680)
+        )
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(
+            offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x1680)
+        )
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=Op.SLOAD(key=Op.SHA3))
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(
+            offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x1680)
+        )
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.ADD
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(
+            offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x1680)
+        )
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0x1740, value=0x1)
+        + Op.RETURN(offset=0x1740, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x14DD, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x58CA2BC)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x1760, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MLOAD(offset=0x1760)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0x17A0, value=0x1)
+        + Op.RETURN(offset=0x17A0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1617, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x5D3B965B)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x280, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MSTORE(
+            offset=0x17E0,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x64)),
+        )
+        + Op.MSTORE(offset=0x1800, value=Op.CALLDATALOAD(offset=0x84))
+        + Op.POP
+        + Op.PUSH1[0xC0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x3)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=Op.MLOAD(offset=0x280))
+        + Op.MSTORE(offset=Op.ADD(0xA0, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x17E0), 0x20)))
+        + Op.DIV(Op.DUP2, 0x20)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x158C, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.MLOAD(
+                offset=Op.ADD(Op.MLOAD(offset=0x17E0), Op.MUL(0x20, Op.DUP1))
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x156B)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.AND(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x17E0), Op.MUL(0x20, Op.DUP2)
+                    )
+                ),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.POP * 4
+        + Op.MLOAD(offset=0x1800)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.ADD
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0x1900, value=0x1)
+        + Op.RETURN(offset=0x1900, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1673, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xB0E14F0F)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x1920, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MLOAD(offset=0x1920)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x5)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0x1960, value=0x1)
+        + Op.RETURN(offset=0x1960, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1739, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x6ACCCDBC)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(
+            offset=0x1980,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)),
+        )
+        + Op.POP
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x6)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x1980), 0x20)))
+        + Op.DIV(Op.DUP2, 0x20)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x170B, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.MLOAD(
+                offset=Op.ADD(Op.MLOAD(offset=0x1980), Op.MUL(0x20, Op.DUP1))
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x16EA)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.AND(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x1980), Op.MUL(0x20, Op.DUP2)
+                    )
+                ),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x1A40, value=0x1)
+        + Op.RETURN(offset=0x1A40, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x17FF, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xA1FA51F9)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(
+            offset=0x1A60,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)),
+        )
+        + Op.POP
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x7)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x1A60), 0x20)))
+        + Op.DIV(Op.DUP2, 0x20)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x17D1, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.MLOAD(
+                offset=Op.ADD(Op.MLOAD(offset=0x1A60), Op.MUL(0x20, Op.DUP1))
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x17B0)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.AND(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x1A60), Op.MUL(0x20, Op.DUP2)
+                    )
+                ),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x1B20, value=0x1)
+        + Op.RETURN(offset=0x1B20, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x18C5, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xCD87F43A)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(
+            offset=0x1B40,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)),
+        )
+        + Op.POP
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x8)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x1B40), 0x20)))
+        + Op.DIV(Op.DUP2, 0x20)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1897, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.MLOAD(
+                offset=Op.ADD(Op.MLOAD(offset=0x1B40), Op.MUL(0x20, Op.DUP1))
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1876)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.AND(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x1B40), Op.MUL(0x20, Op.DUP2)
+                    )
+                ),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x1C00, value=0x1)
+        + Op.RETURN(offset=0x1C00, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x198B, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x222A8663)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(
+            offset=0x1C20,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)),
+        )
+        + Op.POP
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x9)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x1C20), 0x20)))
+        + Op.DIV(Op.DUP2, 0x20)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x195D, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.MLOAD(
+                offset=Op.ADD(Op.MLOAD(offset=0x1C20), Op.MUL(0x20, Op.DUP1))
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x193C)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.AND(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x1C20), Op.MUL(0x20, Op.DUP2)
+                    )
+                ),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x1CE0, value=0x1)
+        + Op.RETURN(offset=0x1CE0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1A51, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xB39E1FAA)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(
+            offset=0x1D00,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)),
+        )
+        + Op.POP
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xA)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x1D00), 0x20)))
+        + Op.DIV(Op.DUP2, 0x20)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1A23, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.MLOAD(
+                offset=Op.ADD(Op.MLOAD(offset=0x1D00), Op.MUL(0x20, Op.DUP1))
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1A02)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.AND(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x1D00), Op.MUL(0x20, Op.DUP2)
+                    )
+                ),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x1DC0, value=0x1)
+        + Op.RETURN(offset=0x1DC0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1B17, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xE365736B)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(
+            offset=0x1DE0,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)),
+        )
+        + Op.POP
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xB)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x1DE0), 0x20)))
+        + Op.DIV(Op.DUP2, 0x20)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1AE9, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.MLOAD(
+                offset=Op.ADD(Op.MLOAD(offset=0x1DE0), Op.MUL(0x20, Op.DUP1))
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1AC8)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.AND(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x1DE0), Op.MUL(0x20, Op.DUP2)
+                    )
+                ),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x1EA0, value=0x1)
+        + Op.RETURN(offset=0x1EA0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1B73, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xAAD7D6E3)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x1EC0, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MLOAD(offset=0x1EC0)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xC)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0x1F00, value=0x1)
+        + Op.RETURN(offset=0x1F00, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1C39, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x1112B27)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(
+            offset=0x1F20,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)),
+        )
+        + Op.POP
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xD)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x1F20), 0x20)))
+        + Op.DIV(Op.DUP2, 0x20)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1C0B, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.MLOAD(
+                offset=Op.ADD(Op.MLOAD(offset=0x1F20), Op.MUL(0x20, Op.DUP1))
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1BEA)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.AND(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x1F20), Op.MUL(0x20, Op.DUP2)
+                    )
+                ),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x1FE0, value=0x1)
+        + Op.RETURN(offset=0x1FE0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1CFF, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xBDBB239B)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(
+            offset=0x2000,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)),
+        )
+        + Op.POP
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xE)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x2000), 0x20)))
+        + Op.DIV(Op.DUP2, 0x20)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1CD1, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.MLOAD(
+                offset=Op.ADD(Op.MLOAD(offset=0x2000), Op.MUL(0x20, Op.DUP1))
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1CB0)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.AND(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x2000), Op.MUL(0x20, Op.DUP2)
+                    )
+                ),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x20C0, value=0x1)
+        + Op.RETURN(offset=0x20C0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1DC5, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x5A0CD48)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(
+            offset=0x20E0,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)),
+        )
+        + Op.POP
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0xF)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x20E0), 0x20)))
+        + Op.DIV(Op.DUP2, 0x20)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1D97, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.MLOAD(
+                offset=Op.ADD(Op.MLOAD(offset=0x20E0), Op.MUL(0x20, Op.DUP1))
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1D76)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.AND(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x20E0), Op.MUL(0x20, Op.DUP2)
+                    )
+                ),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x21A0, value=0x1)
+        + Op.RETURN(offset=0x21A0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1E8B, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xAAA1FE35)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(
+            offset=0x21C0,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)),
+        )
+        + Op.POP
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x10)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x21C0), 0x20)))
+        + Op.DIV(Op.DUP2, 0x20)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1E5D, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.MLOAD(
+                offset=Op.ADD(Op.MLOAD(offset=0x21C0), Op.MUL(0x20, Op.DUP1))
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1E3C)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.AND(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x21C0), Op.MUL(0x20, Op.DUP2)
+                    )
+                ),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x2280, value=0x1)
+        + Op.RETURN(offset=0x2280, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1F51, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x2BE4935D)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(
+            offset=0x22A0,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)),
+        )
+        + Op.POP
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x11)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x22A0), 0x20)))
+        + Op.DIV(Op.DUP2, 0x20)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1F23, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.MLOAD(
+                offset=Op.ADD(Op.MLOAD(offset=0x22A0), Op.MUL(0x20, Op.DUP1))
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1F02)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.AND(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x22A0), Op.MUL(0x20, Op.DUP2)
+                    )
+                ),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x2360, value=0x1)
+        + Op.RETURN(offset=0x2360, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x2017, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x13A8350D)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(
+            offset=0x2380,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)),
+        )
+        + Op.POP
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x12)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x2380), 0x20)))
+        + Op.DIV(Op.DUP2, 0x20)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1FE9, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.MLOAD(
+                offset=Op.ADD(Op.MLOAD(offset=0x2380), Op.MUL(0x20, Op.DUP1))
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x1FC8)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.AND(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x2380), Op.MUL(0x20, Op.DUP2)
+                    )
+                ),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x2440, value=0x1)
+        + Op.RETURN(offset=0x2440, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x20DD, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xCB540B45)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(
+            offset=0x2460,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)),
+        )
+        + Op.POP
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x13)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x2460), 0x20)))
+        + Op.DIV(Op.DUP2, 0x20)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x20AF, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.MLOAD(
+                offset=Op.ADD(Op.MLOAD(offset=0x2460), Op.MUL(0x20, Op.DUP1))
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x208E)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.AND(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x2460), Op.MUL(0x20, Op.DUP2)
+                    )
+                ),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x2520, value=0x1)
+        + Op.RETURN(offset=0x2520, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x21A3, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xBE030627)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(
+            offset=0x2540,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)),
+        )
+        + Op.POP
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x14)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x2540), 0x20)))
+        + Op.DIV(Op.DUP2, 0x20)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x2175, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.MLOAD(
+                offset=Op.ADD(Op.MLOAD(offset=0x2540), Op.MUL(0x20, Op.DUP1))
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x2154)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.AND(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x2540), Op.MUL(0x20, Op.DUP2)
+                    )
+                ),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x2600, value=0x1)
+        + Op.RETURN(offset=0x2600, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x2269, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x83FD77F0)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(
+            offset=0x2620,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x44)),
+        )
+        + Op.POP
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x15)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x2620), 0x20)))
+        + Op.DIV(Op.DUP2, 0x20)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x223B, condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.DUP2)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.MLOAD(
+                offset=Op.ADD(Op.MLOAD(offset=0x2620), Op.MUL(0x20, Op.DUP1))
+            ),
+        )
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x221A)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.ADD(Op.DUP3, Op.DUP5),
+            value=Op.AND(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.MLOAD(offset=0x2620), Op.MUL(0x20, Op.DUP2)
+                    )
+                ),
+                Op.SUB(
+                    0x0, Op.EXP(0x100, Op.SUB(0x20, Op.MOD(Op.DUP4, 0x20)))
+                ),
+            ),
+        )
+        + Op.POP * 4
+        + Op.MSTORE(offset=0x26E0, value=0x1)
+        + Op.RETURN(offset=0x26E0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x22D5, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x59462205)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x3C0, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MSTORE(offset=0x2700, value=Op.CALLDATALOAD(offset=0x64))
+        + Op.MLOAD(offset=0x2700)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=Op.MLOAD(offset=0x3C0))
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0x2740, value=0x1)
+        + Op.RETURN(offset=0x2740, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x2448, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xBB8E4196)))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x2760, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x2780, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MSTORE(offset=0x27A0, value=0x0)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(
+            offset=Op.ADD(0x40, Op.DUP2),
+            value=Op.SUB(Op.MLOAD(offset=0x2760), 0x1),
+        )
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x243B,
+            condition=Op.ISZERO(
+                Op.SLT(Op.MLOAD(offset=0x27A0), Op.SLOAD(key=Op.SHA3))
+            ),
+        )
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(
+            offset=Op.ADD(0x40, Op.DUP2),
+            value=Op.SUB(Op.MLOAD(offset=0x2760), 0x1),
+        )
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
+        + Op.MSTORE(
+            offset=Op.ADD(0x80, Op.DUP2), value=Op.MLOAD(offset=0x27A0)
+        )
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(
+            offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x2780)
+        )
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(
+            offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x2780)
+        )
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=Op.SLOAD(key=Op.SHA3))
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(
+            offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x2780)
+        )
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.ADD
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x60))
+        + Op.MSTORE(
+            offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x2780)
+        )
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MSTORE(offset=0x27A0, value=Op.ADD(Op.MLOAD(offset=0x27A0), 0x1))
+        + Op.JUMP(pc=0x22FC)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x2880, value=0x1)
+        + Op.RETURN(offset=0x2880, size=0x20)
+        + Op.JUMPDEST
+        + Op.POP,
+        storage={
+            0x65D5EFDFCC0FBA693DC9E467F633097FFDC97401901463AD0E28855486D1EDF: 0xB9D69098A6ACFE0C6411BCAAF430F78D363A9ADC32B78BC2E15CCD6E883E9784,  # noqa: E501
+            0x12643FF300762717D27EFB567B82C65560D7B43249D908504E5510863AB82AAC: 0x154CF60E137C594516A065149610B6A3989396A42581D5FD8919E711C55DA225,  # noqa: E501
+            0x1489023D18C5D10427C4AA8DC726E840EB5AE7F604A8E9243C61634FB009E4D7: 5,  # noqa: E501
+            0x1489023D18C5D10427C4AA8DC726E840EB5AE7F604A8E9243C61634FB009E4D8: contract_1,  # noqa: E501
+            0x19EFB13D6576359514ACE5211988A8D51379FA88CCD2B886B409F842B13D7932: 0xC849CC595B452D11C206D2EB8CDFA06DE211E3FF19EE0E0276DC857C05D4FE,  # noqa: E501
+            0x1B37E91BF8580C7C6BCF8CDFF25C7ED78180124A94AF6F30C40D476A3D079AD6: 0xABA4CD295118A482A0A62579E35E4BA5BDD76146CC9E4D96172FCE8BE8977AB4,  # noqa: E501
+            0x2BF9FD8FACDD6FD9C84657F5AD7381A5AECF670CDA68CB3C5829B6532C865506: 0x53098A1D111586DBCC0D051846284F5803C63C313E7F7E6D84430435D11D4C50,  # noqa: E501
+            0x3111BFD25728C0ADFAD0F8C1AD79CB1B91167267DECA98DE88F156ED25CAEEDC: 0xAD393086F30B49511B08FDD27AC78810B084C7CD7DE6AC354F614C18EA9E7DF4,  # noqa: E501
+            0x3379E7AE125C5C5D623D1D993C1459B61D6723B1C30D1AA026C48F6A6155B8EA: 0x8C4183732567A99A8A718E363391E102532F9A640E42968CF2354D9ACC908BB0,  # noqa: E501
+            0x34CABE0C7E64A2CAA93FD8D6A0DEFC07ACB9D44B13430FA3AE9282FFFD40DEE2: contract_1,  # noqa: E501
+            0x34CABE0C7E64A2CAA93FD8D6A0DEFC07ACB9D44B13430FA3AE9282FFFD40DEE3: contract_1,  # noqa: E501
+            0x34CABE0C7E64A2CAA93FD8D6A0DEFC07ACB9D44B13430FA3AE9282FFFD40DEE4: contract_1,  # noqa: E501
+            0x34CABE0C7E64A2CAA93FD8D6A0DEFC07ACB9D44B13430FA3AE9282FFFD40DEE5: contract_1,  # noqa: E501
+            0x39050607FE892059A6344AB0F594F382FB0B345CAB373497246DBE86FE7E14E7: 0x2B3BCA833E482737E7E47B1568E6F890F8E1666490D38FE130ABD6F0CCB109CF,  # noqa: E501
+            0x417BE8BC6791807372E0222A350BB8A5D67BBC8D7595C301D8A5A8372CFDCEF1: 0xABD4971B4605A7155802F70E08298B1CEB0E4E4EACCCCD348F77A77227F73A7F,  # noqa: E501
+            0x41E9A54B3EE0C276AA076BABB161DE12B0F8916B47F8F6FB85CC387CF34696DD: 0x22F2F444EBDA9D2913FFEF5059B039EC9B5876AA71821991C2515BF79F64935E,  # noqa: E501
+            0x45CEB8DA6FB8936592D3BCE4883F1A6A34D636F559E0A1070A5802A65AC39BD5: 0x57A5122FF3BF737B0DE0F9F08011A8648C19E43FF071FB7086234723C9383F1F,  # noqa: E501
+            0x4AA6B934608A45C8F53A945C05DDEE1814A3B9F63A048FC7AD3D47E67156F024: 0xD03862BECEDADA67B4825A0238F3E67495CCB595CD7D08F1BD5D3160644B9299,  # noqa: E501
+            0x4B8B58F0B0E326A5907D1A810E5FF31E05B4CAB45125B776DB8577E7DBC46BCE: 0x2F0000000000000000,  # noqa: E501
+            0x4C33460347337BFC7DF08BF182988301B7B426A27A67F1C6C634F637C60E87AC: 0xBAB4AB2AD4EAFE7C84EF6A8CD69157D9CE6B843793A2CD0877B8E91F63CB2D4D,  # noqa: E501
+            0x58DA0C0C256BBA101CE36FAD8BF838717A57E6AB850A191DC9C09DA9CE56BF1B: 5,  # noqa: E501
+            0x5CB38B16DB1D632086D4AF695DE7F5F242A6E40947067F96EDD566FE2AC438EF: 0x6D0BE832B2007EA28CDA705B73922CBF9794C5A25B89BD2F28B7347ED2B96C86,  # noqa: E501
+            0x64A9621CC4BA92BF738C55010C609DFAA3972A1138C30B5ADCEF1BA2363B360E: 0xD7953BFE8CB591F129FD0862A9E9C421151E2B5831560FF5215D23F751364B35,  # noqa: E501
+            0x696664A5F0AB5ACD9304A377FB684F2D3FE6BB60B8A95CB2BDBB57DB767E7A84: 0x154CF60E137C594516A065149610B6A3989396A42581D5FD8919E711C55DA225,  # noqa: E501
+            0x69AD1D19E617936ABDF05133BF268DC8CED6B518F22B249B5860967D07006487: 0x8C803B48B383DDABD1B3AFE858EFB48C203229B7317DD76149DDDAB4253B858A,  # noqa: E501
+            0x70B3BF53996FAC325EB67608A4EEB0CD0B55DEF6255D7ED42AD28EC07238B5D6: 0x45E9723E9232B37207ECAC1C97B8647D053625A578D450F7456280B2FF8EFC27,  # noqa: E501
+            0x7A9DCEE62E3E02CC8E020F372DF2EFDEB835F091C1EF1DBE221072D1095AABD2: 0x2F0000000000000000,  # noqa: E501
+            0x7E4D8C0F6D8ABB4CE1AE45B254046ACEEDABFA9548851B8B5D3E2C0637C985FD: 11,  # noqa: E501
+            0x7E95F3CC3315D289C52253BAABA29B1B00C86816E6B788D50795279A8BAA00DB: 0x45E9723E9232B37207ECAC1C97B8647D053625A578D450F7456280B2FF8EFC27,  # noqa: E501
+            0x8DA187157087529EE4E9C381F8E3149C56ACF3BDFDA29B8B9B4532F24B83F5FE: 0x8C4183732567A99A8A718E363391E102532F9A640E42968CF2354D9ACC908BB0,  # noqa: E501
+            0x9001F91DDAEF87BC067886E874C0749998C9B58B2EC8472CA014CA8B55F88578: 0xFB76974EEFCA01F33FB38646C2D3C1536F1A763D7AFF53AB7F877D4C5EA7FD0,  # noqa: E501
+            0x9ED0CEDD2A9A78D949F40019F53D10031AEF6ED342C97E01FC03B481EE56B3CB: contract_4,  # noqa: E501
+            0x9FDDF1DB29CAA5C1239EDD86E9E0835CDFE41F7253EC78F62D3DA8558D6F3CD7: 0x104EEF8FA35BF39F677D81855BC0B9F42317F32792E98E95E4DF441DEB634211,  # noqa: E501
+            0xA0953566119395C11186B334805FC1A16175ECAC0ECC93AE0322264F0DC2E40D: 0x10C5A00466AB7C0ADAE1E93537CC275EA8CF23FF509D5466A1FD6F56B0A61D1B,  # noqa: E501
+            0xAA0DBF8241EF3AE07C254E6869E84895BA2BE0779A7F261C8308A3114BE1C54A: contract_4,  # noqa: E501
+            0xAFFE808B495D13A14391CE5F27C211C36DA12826969CD7841EE0D81E5B900E2D: contract_1,  # noqa: E501
+            0xAFFE808B495D13A14391CE5F27C211C36DA12826969CD7841EE0D81E5B900E2E: contract_1,  # noqa: E501
+            0xB4A2B68C48EF78AEB641EE538FAD51781022FD23ED9D93D211017DB6A02376CE: 0xFBC06642245CF2FED7ED46EA0A18A7185830B6F2C4E0A4CA55246041E8BFA72,  # noqa: E501
+            0xBA8D79990898383919E437F2458B93B340072C89D963808D9E04F51858E3C5EC: 0x41D2CAC534D90A0DBD199117481A63E32CC11411DAB2EAA36C91C0EEC62823CF,  # noqa: E501
+            0xBB3BC1A2015123750DF57D4CEFF7E28CB847910B79B34841DE905B59A8BB177C: 0x734417EB19E1873427257F1EA1594748C16CFA866A7B7CF896E281F2EC774A40,  # noqa: E501
+            0xBF30CDCB83AB2BD5F5EEE691FFA4107B58B75BA6A5C2E6754D4C5C0437F2876C: 5,  # noqa: E501
+            0xC2A26B80067FC36B8268B0D5B31AFFF953FA91CEBEA39F191E2763D6E71259B9: 0x2A43C547FE8DE2400D2A141016550E8BAE058D41164247C099E787DDD40E789,  # noqa: E501
+            0xC98339D275EEF16E0562CA8521212CEF61AA0F39B12E2A27502AAA97A9E5E70F: 0x5A3DE2A5C268CDB75F4B01507AA80C4E4A1BC67BCB0DF265BBB00060774E5978,  # noqa: E501
+            0xCBD6AE6BD61BC9270EC836F1919B3268113ABE076C7FEBFDB8CF573B199CE9A9: 0xF402B17773C1F7534034EE58DC0D2A3421470A7A67DAF4FA790DC3B420EEF790,  # noqa: E501
+            0xD2C8CBB562FCCD0C9A3D0D491B7F65CC6A89856498F933427D9D21B745B9D50E: 0x3625A26FDB7B747501F1EE2500F98C49D9CD290383A21254587C3C49D2805321,  # noqa: E501
+            0xD66F52A4E24585238CCC03443B2FDB8B2B100259BC7260F39097C7C339211FFE: 0x1641851904381915C86B60DF7E288896FB5F8EBAD65D594829FB9F2B59CD1DA6,  # noqa: E501
+            0xD8F720C05A5526DD621D1831AE122ABDDD3DFECD8B63B0BA4C92FA7B2ADE44FF: 0xAD393086F30B49511B08FDD27AC78810B084C7CD7DE6AC354F614C18EA9E7DF4,  # noqa: E501
+            0xDC22D3171B82817C910BBEAC1F8B50C8DE99F8C524F172AEF3491981BD5ED4FB: 0x94B8CBA4EA090D1C392FBC94B82FB9EF9F468A15BBC537F4D051776F4D422B1D,  # noqa: E501
+            0xDCE8ADBDEFA929DBE60245F359446DB4174C62824B42E5D4D9E7B834B4D61DEB: 0x2C9069845B2E74C577FF1CD18DF6BC452805F527A9EE91FD4A059E0408B5DEA6,  # noqa: E501
+            0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D196: contract_1,  # noqa: E501
+            0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D197: contract_1,  # noqa: E501
+            0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D198: contract_1,  # noqa: E501
+            0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D199: contract_1,  # noqa: E501
+            0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D19A: contract_1,  # noqa: E501
+            0xE54F074C81BFA60B5BF413934C108086298B77291560EDFEEAD8AA1232E95236: 0xF40AAA24323C9E6983CCFFAFEEBE4B426509B901E8C98B8A40D881804804E6B,  # noqa: E501
+            0xE66C0F55F66C752EDF73027D45B7B1AE729AE15E1C67C362DBC6F25EDF8D76FF: contract_1,  # noqa: E501
+            0xE983D899F807BBCB5881F2DDF875B2EBB5CB8A7A4E77A8C98A40AAAE6A468735: 0x6D0BE832B2007EA28CDA705B73922CBF9794C5A25B89BD2F28B7347ED2B96C86,  # noqa: E501
+            0xED7D6E2D40FBD5046412FFAD1C45B63D87C6197182D6DBC66BB1E5C6E4DED5C7: 0xABA4CD295118A482A0A62579E35E4BA5BDD76146CC9E4D96172FCE8BE8977AB4,  # noqa: E501
+            0xF043B5A1952847579F233706A8F130889A484D2DA3E574FDD5859F05AAF52111: contract_2,  # noqa: E501
+            0xF40F4CFDACB62DD799F36B580349FAC1F4A4CAF8DD3383CC387C35ADB6574E21: 0x2F0000000000000000,  # noqa: E501
+            0xF60FA6E25E9028A6DC6B26BBC1EADAE3DA157DF0D1D6F6628BC33CAD68A7E455: 0x2D7D00618C059EBE40593B9497C633E1AC6E161DADBD5BB734C2663CD3E8A8E1,  # noqa: E501
+            0xFD280AC5182D5B2366122F38ACFA6DC471240FFDE9D5FEB985CE7A2325C960E7: contract_3,  # noqa: E501
+        },
+        nonce=0,
+        address=Address(0x0EA65418D7BF32680F55572C943A94B590804998),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600061031f537c01000000000000000000000000000000000000000000000000000000006000350473c9ae5868651bf7b7db6e360217db49ce4e69c07e602052730ea65418d7bf32680f55572c943a94b5908049986040526327138bfb81141561038d57600435608052601c6044599059016000905201637a66d7ca601c8203526080516004820152602060e06024836000602051602d5a03f15060e051905060a052601c604459905901600090520163c60409c6601c820352608051600482015260206101206024836000602051602d5a03f150610120519050430561010052600061014052600061016052600061018052600260a051016101005112151561010a576001610140525b60006101a052610100516101c0525b606461010051016101c051121561018457601c606459905901600090520163cc1c944e601c82035260805160048201526101c051602482015260206101e06044836000604051602d5a03f1506101e05190506101a051016101a05260016101c051016101c052610119565b6005601c606459905901600090520163cc1c944e601c820352608051600482015260a051602482015260206102006044836000604051602d5a03f1506102005190501280156101d357806101db565b600a6101a051125b9050156101eb57610140516101ee565b60005b1561033657601c604459905901600090520163c5476efe601c820352608051600482015260206102406024836000602051602d5a03f15061024051905050601c6064599059016000905201637265802d601c82035260805160048201526000602482015260206102606044836000602051602d5a03f15061026051905050601c606459905901600090520163c286273a601c82035260805160048201526000602482015260206102806044836000602051602d5a03f15061028051905050601c6044599059016000905201637a66d7ca601c820352608051600482015260206102a06024836000602051602d5a03f1506102a051905060a052601c608459905901600090520163bb8e4196601c820352608051600482015260a051602482015261010051604482015260206102c06064836000604051602d5a03f1506102c051905050610343565b6001610160526001610180525b61014051156103555761016051610358565b60005b156103665761018051610369565b60005b1561037f5760016102e05260206102e0f361038c565b6000610300526020610300f35b5b50  # noqa: E501
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x31F, value=0x0)
+        + Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.MSTORE(
+            offset=0x20, value=0xC9AE5868651BF7B7DB6E360217DB49CE4E69C07E
+        )
+        + Op.MSTORE(
+            offset=0x40, value=0xEA65418D7BF32680F55572C943A94B590804998
+        )
+        + Op.JUMPI(pc=0x38D, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x27138BFB)))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x44]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x7A66D7CA)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x24,
+                ret_offset=0xE0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0xE0)
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0xA0]
+        + Op.MSTORE
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x44]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xC60409C6)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x24,
+                ret_offset=0x120,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x120)
+        + Op.SWAP1
+        + Op.POP
+        + Op.NUMBER
+        + Op.MSTORE(offset=0x100, value=Op.SDIV)
+        + Op.MSTORE(offset=0x140, value=0x0)
+        + Op.MSTORE(offset=0x160, value=0x0)
+        + Op.MSTORE(offset=0x180, value=0x0)
+        + Op.JUMPI(
+            pc=0x10A,
+            condition=Op.ISZERO(
+                Op.ISZERO(
+                    Op.SLT(
+                        Op.MLOAD(offset=0x100),
+                        Op.ADD(Op.MLOAD(offset=0xA0), 0x2),
+                    )
+                )
+            ),
+        )
+        + Op.MSTORE(offset=0x140, value=0x1)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1A0, value=0x0)
+        + Op.MSTORE(offset=0x1C0, value=Op.MLOAD(offset=0x100))
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x184,
+            condition=Op.ISZERO(
+                Op.SLT(
+                    Op.MLOAD(offset=0x1C0),
+                    Op.ADD(Op.MLOAD(offset=0x100), 0x64),
+                )
+            ),
+        )
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xCC1C944E)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0x1C0))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x40),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x44,
+                ret_offset=0x1E0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x1E0)
+        + Op.SWAP1
+        + Op.POP
+        + Op.MLOAD(offset=0x1A0)
+        + Op.MSTORE(offset=0x1A0, value=Op.ADD)
+        + Op.MSTORE(offset=0x1C0, value=Op.ADD(Op.MLOAD(offset=0x1C0), 0x1))
+        + Op.JUMP(pc=0x119)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xCC1C944E)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xA0))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x40),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x44,
+                ret_offset=0x200,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x200)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLT
+        + Op.JUMPI(pc=0x1D3, condition=Op.ISZERO(Op.DUP1))
+        + Op.DUP1
+        + Op.JUMP(pc=0x1DB)
+        + Op.JUMPDEST
+        + Op.SLT(Op.MLOAD(offset=0x1A0), 0xA)
+        + Op.JUMPDEST
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(pc=0x1EB, condition=Op.ISZERO)
+        + Op.MLOAD(offset=0x140)
+        + Op.JUMP(pc=0x1EE)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x336, condition=Op.ISZERO)
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x44]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xC5476EFE)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x24,
+                ret_offset=0x240,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x240)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x7265802D)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=0x0)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x44,
+                ret_offset=0x260,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x260)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xC286273A)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=0x0)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x44,
+                ret_offset=0x280,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x280)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x44]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x7A66D7CA)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x24,
+                ret_offset=0x2A0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x2A0)
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0xA0]
+        + Op.MSTORE
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x84]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xBB8E4196)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xA0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.MLOAD(offset=0x100))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x40),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x64,
+                ret_offset=0x2C0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x2C0)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.JUMP(pc=0x343)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x160, value=0x1)
+        + Op.MSTORE(offset=0x180, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x355, condition=Op.ISZERO(Op.MLOAD(offset=0x140)))
+        + Op.MLOAD(offset=0x160)
+        + Op.JUMP(pc=0x358)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x366, condition=Op.ISZERO)
+        + Op.MLOAD(offset=0x180)
+        + Op.JUMP(pc=0x369)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x37F, condition=Op.ISZERO)
+        + Op.MSTORE(offset=0x2E0, value=0x1)
+        + Op.RETURN(offset=0x2E0, size=0x20)
+        + Op.JUMP(pc=0x38C)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x300, value=0x0)
+        + Op.RETURN(offset=0x300, size=0x20)
+        + Op.JUMPDEST * 2
+        + Op.POP,
+        nonce=0,
+        address=Address(0x142A6927CF0060133187BA8A8E74D641438F0C1C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60006105df537c010000000000000000000000000000000000000000000000000000000060003504730ea65418d7bf32680f55572c943a94b59080499860205273e509e3a93beb1eba72f8cb8d25f93a85e2d54afb60405273c9ae5868651bf7b7db6e360217db49ce4e69c07e60605273f1562e1c0d0baa3ea746442bb7f11153fcf5cfda60805263546fdeb381141561038d5760043560c05260243560e05260443561010052606435610120526084356101405260026101005101601c606459905901600090520163e05dcb56601c82035260c051600482015260e05160248201526002610100510160408160200201599059016000905281602002604001816044856000602051602d5a03f150604081019050905090506000600161010051016020028201511415610250576060601c61014c59905901600090520163e365736b601c82035260c051600482015260e0516024820152601c6084599059016000905201632f300bee601c82035260026004820152600560248201526101005160448201528460408160200201599059016000905281602002604001816064856000608051602d5a03f1506040810190509050905060208103516020026020018360448401526020820360a4840152806101088401528084019350505081600401599059016000905260648160648460006004601cf16101fc57fe5b6064810192506101088201518080858260a487015160006004600a8705601201f161022357fe5b50808401935050808303602061028082846000602051602d5a03f15061028051905090509050905061037d565b6060601c61014c59905901600090520163e365736b601c82035260c051600482015260e0516024820152601c6084599059016000905201632f300bee601c820352600160016101005101602002850151036004820152600560248201526101005160448201528460408160200201599059016000905281602002604001816064856000608051602d5a03f1506040810190509050905060208103516020026020018360448401526020820360a4840152806101088401528084019350505081600401599059016000905260648160648460006004601cf161032d57fe5b6064810192506101088201518080858260a487015160006004600a8705601201f161035457fe5b5080840193505080830360206102c082846000602051602d5a03f1506102c05190509050905090505b5060016102e05260206102e0f350505b63de9080c88114156107645760043560c05260243560e05260443561010052606435610120526084356101405260026101005101601c606459905901600090520163e05dcb56601c82035260c051600482015260e05160248201528160408160200201599059016000905281602002604001816044856000602051602d5a03f15060408101905090509050601c6064599059016000905201632c5a40d5601c82035260c051600482015260e05160248201526101405160408160200201599059016000905281602002604001816044856000602051602d5a03f1506040810190509050905061012051806020026020015990590160009052818152602081019050905060005b610120518112156104ee57601c60645990590160009052016328c8b315601c82035260c051600482015281602482015260206103606044836000604051602d5a03f15061036051905081602002830152600181019050610493565b5060a0601c61020c59905901600090520163a647a5b9601c8203528460208103516020026020018360048401526020820360a484015280610148840152808401935050508360208103516020026020018360248401526020820360c484015280610168840152808401935050508260208103516020026020018360448401526020820360e4840152806101888401528084019350505061012051606482015261010051608482015281600401599059016000905260a48160a484600060046022f16105b557fe5b60a4810192506101488201518080858260a487015160006004600a8705601201f16105dc57fe5b508084019350506101688201518080858260c487015160006004600a8705601201f161060457fe5b508084019350506101888201518080858260e487015160006004600a8705601201f161062c57fe5b5080840193505080830387604081602002015990590160009052816020026040018184866000608051602d5a03f1506040810190509050905090509050905092506060601c61014c59905901600090520163e365736b601c82035260c051600482015260e05160248201528460208103516020026020018360448401526020820360a4840152806101088401528084019350505081600401599059016000905260648160648460006004601cf16106df57fe5b6064810192506101088201518080858260a487015160006004600a8705601201f161070657fe5b5080840193505080830360206103c082846000602051602d5a03f1506103c05190509050905090505060006101005160200284015114156107525760006103e05260206103e0f361075f565b6001610400526020610400f35b505050505b63384ca8dd811415610a665760043560c05260243560e052604435610100526064356101205260843561014052601c606459905901600090520163e05dcb56601c82035260c051600482015260e05160248201526002610100510160408160200201599059016000905281602002604001816044856000602051602d5a03f15060408101905090509050601c606459905901600090520163fa9832d1601c82035260c051600482015260e05160248201526101005160408160200201599059016000905281602002604001816044856000602051602d5a03f15060408101905090509050601c608459905901600090520163aad7d6e3601c82035260c051600482015260e05160248201526060601c61014c599059016000905201635b180229601c8203528360208103516020026020018360048401526020820360648401528060c8840152808401935050508460208103516020026020018360248401526020820360848401528060e88401528084019350505061010051604482015281600401599059016000905260648160648460006004601cf161090157fe5b60648101925060c882015180808582606487015160006004600a8705601201f161092757fe5b5080840193505060e882015180808582608487015160006004600a8705601201f161094e57fe5b50808401935050808303602061044082846000608051602d5a03f150610440519050905090509050604482015260206104606064836000602051602d5a03f150610460519050506060601c61014c59905901600090520163222a8663601c82035260c051600482015260e05160248201528260208103516020026020018360448401526020820360a4840152806101088401528084019350505081600401599059016000905260648160648460006004601cf1610a0757fe5b6064810192506101088201518080858260a487015160006004600a8705601201f1610a2e57fe5b50808401935050808303602061048082846000602051602d5a03f1506104805190509050905090505060016104a05260206104a0f350505b63d5dc5af1811415610d4b5760043560c05260243560e052604435610100526064356101205260843561014052601c606459905901600090520163e05dcb56601c82035260c051600482015260e05160248201526002610100510160408160200201599059016000905281602002604001816044856000602051602d5a03f15060408101905090509050601c6064599059016000905201632c5a40d5601c82035260c051600482015260e05160248201526101405160408160200201599059016000905281602002604001816044856000602051602d5a03f150604081019050905090506080601c6101ac59905901600090520163f4ca7dc4601c82035283602081035160200260200183600484015260208203608484015280610108840152808401935050508260208103516020026020018360248401526020820360a4840152806101288401528084019350505061012051604482015261010051606482015281600401599059016000905260848160848460006004601ff1610be757fe5b60848101925061010882015180808582608487015160006004600a8705601201f1610c0e57fe5b508084019350506101288201518080858260a487015160006004600a8705601201f1610c3657fe5b5080840193505080830361014051604081602002015990590160009052816020026040018184866000608051602d5a03f1506040810190509050905090509050905090506060601c61014c59905901600090520163b39e1faa601c82035260c051600482015260e05160248201528260208103516020026020018360448401526020820360a4840152806101088401528084019350505081600401599059016000905260648160648460006004601cf1610cec57fe5b6064810192506101088201518080858260a487015160006004600a8705601201f1610d1357fe5b5080840193505080830360206104c082846000602051602d5a03f1506104c05190509050905090505060016104e05260206104e0f350505b630939aa8c81141561114c5760043560c05260243560e052604435610100526064356101205260843561014052601c606459905901600090520163e05dcb56601c82035260c051600482015260e05160248201526002610100510160408160200201599059016000905281602002604001816044856000602051602d5a03f15060408101905090509050601c6064599059016000905201637dc12195601c82035260c051600482015260e05160248201526101405160408160200201599059016000905281602002604001816044856000602051602d5a03f15060408101905090509050601c606459905901600090520163586b5be0601c82035260c051600482015260e051602482015260206105006044836000602051602d5a03f150610500519050601c606459905901600090520163eb8af5aa601c82035260c051600482015260e05160248201526101205160408160200201599059016000905281602002604001816044856000602051602d5a03f1506040810190509050905060c0601c61026c59905901600090520163232b2734601c8203528260208103516020026020018360048401526020820360c484015280610188840152808401935050508560208103516020026020018360248401526020820360e4840152806101a88401528084019350505084602081035160200260200183604484015260208203610104840152806101c8840152808401935050508360648201526101205160848201526101005160a482015281600401599059016000905260c48160c484600060046025f1610f9657fe5b60c4810192506101888201518080858260c487015160006004600a8705601201f1610fbd57fe5b508084019350506101a88201518080858260e487015160006004600a8705601201f1610fe557fe5b508084019350506101c88201518080858261010487015160006004600a8705601201f161100e57fe5b5080840193505080830361012051604081602002015990590160009052816020026040018184866000608051602d5a03f1506040810190509050905090509050905090506060601c61014c5990590160009052016301112b27601c82035260c051600482015260e05160248201528260208103516020026020018360448401526020820360a4840152806101088401528084019350505081600401599059016000905260648160648460006004601cf16110c457fe5b6064810192506101088201518080858260a487015160006004600a8705601201f16110eb57fe5b50808401935050808303602061058082846000602051602d5a03f15061058051905090509050905050600060016101005101602002850151141561113a5760006105a05260206105a0f3611147565b60016105c05260206105c0f35b505050505b50  # noqa: E501
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x5DF, value=0x0)
+        + Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.MSTORE(
+            offset=0x20, value=0xEA65418D7BF32680F55572C943A94B590804998
+        )
+        + Op.MSTORE(
+            offset=0x40, value=0xE509E3A93BEB1EBA72F8CB8D25F93A85E2D54AFB
+        )
+        + Op.MSTORE(
+            offset=0x60, value=0xC9AE5868651BF7B7DB6E360217DB49CE4E69C07E
+        )
+        + Op.MSTORE(
+            offset=0x80, value=0xF1562E1C0D0BAA3EA746442BB7F11153FCF5CFDA
+        )
+        + Op.JUMPI(pc=0x38D, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x546FDEB3)))
+        + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0xE0, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x100, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x64))
+        + Op.MSTORE(offset=0x140, value=Op.CALLDATALOAD(offset=0x84))
+        + Op.ADD(Op.MLOAD(offset=0x100), 0x2)
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE05DCB56)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.ADD(Op.MLOAD(offset=0x100), 0x2)
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP6,
+                args_size=0x44,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(
+            pc=0x250,
+            condition=Op.ISZERO(
+                Op.EQ(
+                    Op.MLOAD(
+                        offset=Op.ADD(
+                            Op.DUP3,
+                            Op.MUL(0x20, Op.ADD(Op.MLOAD(offset=0x100), 0x1)),
+                        )
+                    ),
+                    0x0,
+                )
+            ),
+        )
+        + Op.PUSH1[0x60]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH2[0x14C]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE365736B)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x84]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x2F300BEE)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=0x2)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=0x5)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.MLOAD(offset=0x100))
+        + Op.DUP5
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x80),
+                value=0x0,
+                args_offset=Op.DUP6,
+                args_size=0x64,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.ADD(0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20))))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x44), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0xA4), value=Op.SUB(Op.DUP3, 0x20))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x108), value=Op.DUP1)
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 3
+        + Op.ADD(0x4, Op.DUP2)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.JUMPI(
+            pc=0x1FC,
+            condition=Op.CALL(
+                gas=0x1C,
+                address=0x4,
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=0x64,
+                ret_offset=Op.DUP2,
+                ret_size=0x64,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.ADD(Op.DUP2, 0x64)
+        + Op.SWAP3
+        + Op.POP
+        + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x108))
+        + Op.DUP1
+        + Op.JUMPI(
+            pc=0x223,
+            condition=Op.CALL(
+                gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
+                address=0x4,
+                value=0x0,
+                args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xA4)),
+                args_size=Op.DUP3,
+                ret_offset=Op.DUP6,
+                ret_size=Op.DUP1,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 2
+        + Op.SUB(Op.DUP4, Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=Op.DUP3,
+                ret_offset=0x280,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x280)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x37D)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x60]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH2[0x14C]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE365736B)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x84]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x2F300BEE)
+        + Op.MSTORE(
+            offset=Op.ADD(Op.DUP3, 0x4),
+            value=Op.SUB(
+                Op.MLOAD(
+                    offset=Op.ADD(
+                        Op.DUP6,
+                        Op.MUL(0x20, Op.ADD(Op.MLOAD(offset=0x100), 0x1)),
+                    )
+                ),
+                0x1,
+            ),
+        )
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=0x5)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.MLOAD(offset=0x100))
+        + Op.DUP5
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x80),
+                value=0x0,
+                args_offset=Op.DUP6,
+                args_size=0x64,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.ADD(0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20))))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x44), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0xA4), value=Op.SUB(Op.DUP3, 0x20))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x108), value=Op.DUP1)
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 3
+        + Op.ADD(0x4, Op.DUP2)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.JUMPI(
+            pc=0x32D,
+            condition=Op.CALL(
+                gas=0x1C,
+                address=0x4,
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=0x64,
+                ret_offset=Op.DUP2,
+                ret_size=0x64,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.ADD(Op.DUP2, 0x64)
+        + Op.SWAP3
+        + Op.POP
+        + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x108))
+        + Op.DUP1
+        + Op.JUMPI(
+            pc=0x354,
+            condition=Op.CALL(
+                gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
+                address=0x4,
+                value=0x0,
+                args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xA4)),
+                args_size=Op.DUP3,
+                ret_offset=Op.DUP6,
+                ret_size=Op.DUP1,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 2
+        + Op.SUB(Op.DUP4, Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=Op.DUP3,
+                ret_offset=0x2C0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x2C0)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.MSTORE(offset=0x2E0, value=0x1)
+        + Op.RETURN(offset=0x2E0, size=0x20)
+        + Op.POP * 2
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x764, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xDE9080C8)))
+        + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0xE0, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x100, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x64))
+        + Op.MSTORE(offset=0x140, value=Op.CALLDATALOAD(offset=0x84))
+        + Op.ADD(Op.MLOAD(offset=0x100), 0x2)
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE05DCB56)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.DUP2
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP6,
+                args_size=0x44,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x2C5A40D5)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.MLOAD(offset=0x140)
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP6,
+                args_size=0x44,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.MLOAD(offset=0x120)
+        + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4EE,
+            condition=Op.ISZERO(Op.SLT(Op.DUP2, Op.MLOAD(offset=0x120))),
+        )
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x28C8B315)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP2)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x40),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x44,
+                ret_offset=0x360,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x360)
+        + Op.SWAP1
+        + Op.POP
+        + Op.ADD(Op.DUP4, Op.MUL(0x20, Op.DUP2))
+        + Op.MSTORE
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP(pc=0x493)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.PUSH1[0xA0]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH2[0x20C]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xA647A5B9)
+        + Op.DUP5
+        + Op.ADD(0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20))))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x4), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0xA4), value=Op.SUB(Op.DUP3, 0x20))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x148), value=Op.DUP1)
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 3
+        + Op.DUP4
+        + Op.ADD(0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20))))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x24), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0xC4), value=Op.SUB(Op.DUP3, 0x20))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x168), value=Op.DUP1)
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 3
+        + Op.DUP3
+        + Op.ADD(0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20))))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x44), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0xE4), value=Op.SUB(Op.DUP3, 0x20))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x188), value=Op.DUP1)
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 3
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.MLOAD(offset=0x120))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.MLOAD(offset=0x100))
+        + Op.ADD(0x4, Op.DUP2)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.JUMPI(
+            pc=0x5B5,
+            condition=Op.CALL(
+                gas=0x22,
+                address=0x4,
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=0xA4,
+                ret_offset=Op.DUP2,
+                ret_size=0xA4,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.ADD(Op.DUP2, 0xA4)
+        + Op.SWAP3
+        + Op.POP
+        + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x148))
+        + Op.DUP1
+        + Op.JUMPI(
+            pc=0x5DC,
+            condition=Op.CALL(
+                gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
+                address=0x4,
+                value=0x0,
+                args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xA4)),
+                args_size=Op.DUP3,
+                ret_offset=Op.DUP6,
+                ret_size=Op.DUP1,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 2
+        + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x168))
+        + Op.DUP1
+        + Op.JUMPI(
+            pc=0x604,
+            condition=Op.CALL(
+                gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
+                address=0x4,
+                value=0x0,
+                args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xC4)),
+                args_size=Op.DUP3,
+                ret_offset=Op.DUP6,
+                ret_size=Op.DUP1,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 2
+        + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x188))
+        + Op.DUP1
+        + Op.JUMPI(
+            pc=0x62C,
+            condition=Op.CALL(
+                gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
+                address=0x4,
+                value=0x0,
+                args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xE4)),
+                args_size=Op.DUP3,
+                ret_offset=Op.DUP6,
+                ret_size=Op.DUP1,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 2
+        + Op.SUB(Op.DUP4, Op.DUP1)
+        + Op.DUP8
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x80),
+                value=0x0,
+                args_offset=Op.DUP7,
+                args_size=Op.DUP5,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP3
+        + Op.POP
+        + Op.PUSH1[0x60]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH2[0x14C]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE365736B)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.DUP5
+        + Op.ADD(0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20))))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x44), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0xA4), value=Op.SUB(Op.DUP3, 0x20))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x108), value=Op.DUP1)
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 3
+        + Op.ADD(0x4, Op.DUP2)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.JUMPI(
+            pc=0x6DF,
+            condition=Op.CALL(
+                gas=0x1C,
+                address=0x4,
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=0x64,
+                ret_offset=Op.DUP2,
+                ret_size=0x64,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.ADD(Op.DUP2, 0x64)
+        + Op.SWAP3
+        + Op.POP
+        + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x108))
+        + Op.DUP1
+        + Op.JUMPI(
+            pc=0x706,
+            condition=Op.CALL(
+                gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
+                address=0x4,
+                value=0x0,
+                args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xA4)),
+                args_size=Op.DUP3,
+                ret_offset=Op.DUP6,
+                ret_size=Op.DUP1,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 2
+        + Op.SUB(Op.DUP4, Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=Op.DUP3,
+                ret_offset=0x3C0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x3C0)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.JUMPI(
+            pc=0x752,
+            condition=Op.ISZERO(
+                Op.EQ(
+                    Op.MLOAD(
+                        offset=Op.ADD(
+                            Op.DUP5, Op.MUL(0x20, Op.MLOAD(offset=0x100))
+                        )
+                    ),
+                    0x0,
+                )
+            ),
+        )
+        + Op.MSTORE(offset=0x3E0, value=0x0)
+        + Op.RETURN(offset=0x3E0, size=0x20)
+        + Op.JUMP(pc=0x75F)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x400, value=0x1)
+        + Op.RETURN(offset=0x400, size=0x20)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xA66, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x384CA8DD)))
+        + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0xE0, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x100, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x64))
+        + Op.MSTORE(offset=0x140, value=Op.CALLDATALOAD(offset=0x84))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE05DCB56)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.ADD(Op.MLOAD(offset=0x100), 0x2)
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP6,
+                args_size=0x44,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xFA9832D1)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.MLOAD(offset=0x100)
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP6,
+                args_size=0x44,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x84]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xAAD7D6E3)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.PUSH1[0x60]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH2[0x14C]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x5B180229)
+        + Op.DUP4
+        + Op.ADD(0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20))))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x4), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x64), value=Op.SUB(Op.DUP3, 0x20))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0xC8), value=Op.DUP1)
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 3
+        + Op.DUP5
+        + Op.ADD(0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20))))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x24), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x84), value=Op.SUB(Op.DUP3, 0x20))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0xE8), value=Op.DUP1)
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 3
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.MLOAD(offset=0x100))
+        + Op.ADD(0x4, Op.DUP2)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.JUMPI(
+            pc=0x901,
+            condition=Op.CALL(
+                gas=0x1C,
+                address=0x4,
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=0x64,
+                ret_offset=Op.DUP2,
+                ret_size=0x64,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.ADD(Op.DUP2, 0x64)
+        + Op.SWAP3
+        + Op.POP
+        + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0xC8))
+        + Op.DUP1
+        + Op.JUMPI(
+            pc=0x927,
+            condition=Op.CALL(
+                gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
+                address=0x4,
+                value=0x0,
+                args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0x64)),
+                args_size=Op.DUP3,
+                ret_offset=Op.DUP6,
+                ret_size=Op.DUP1,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 2
+        + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0xE8))
+        + Op.DUP1
+        + Op.JUMPI(
+            pc=0x94E,
+            condition=Op.CALL(
+                gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
+                address=0x4,
+                value=0x0,
+                args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0x84)),
+                args_size=Op.DUP3,
+                ret_offset=Op.DUP6,
+                ret_size=Op.DUP1,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 2
+        + Op.SUB(Op.DUP4, Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x80),
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=Op.DUP3,
+                ret_offset=0x440,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x440)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.ADD(Op.DUP3, 0x44)
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x64,
+                ret_offset=0x460,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x460)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.PUSH1[0x60]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH2[0x14C]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x222A8663)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.DUP3
+        + Op.ADD(0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20))))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x44), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0xA4), value=Op.SUB(Op.DUP3, 0x20))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x108), value=Op.DUP1)
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 3
+        + Op.ADD(0x4, Op.DUP2)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.JUMPI(
+            pc=0xA07,
+            condition=Op.CALL(
+                gas=0x1C,
+                address=0x4,
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=0x64,
+                ret_offset=Op.DUP2,
+                ret_size=0x64,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.ADD(Op.DUP2, 0x64)
+        + Op.SWAP3
+        + Op.POP
+        + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x108))
+        + Op.DUP1
+        + Op.JUMPI(
+            pc=0xA2E,
+            condition=Op.CALL(
+                gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
+                address=0x4,
+                value=0x0,
+                args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xA4)),
+                args_size=Op.DUP3,
+                ret_offset=Op.DUP6,
+                ret_size=Op.DUP1,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 2
+        + Op.SUB(Op.DUP4, Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=Op.DUP3,
+                ret_offset=0x480,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x480)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.MSTORE(offset=0x4A0, value=0x1)
+        + Op.RETURN(offset=0x4A0, size=0x20)
+        + Op.POP * 2
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xD4B, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xD5DC5AF1)))
+        + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0xE0, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x100, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x64))
+        + Op.MSTORE(offset=0x140, value=Op.CALLDATALOAD(offset=0x84))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE05DCB56)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.ADD(Op.MLOAD(offset=0x100), 0x2)
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP6,
+                args_size=0x44,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x2C5A40D5)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.MLOAD(offset=0x140)
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP6,
+                args_size=0x44,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x80]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH2[0x1AC]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xF4CA7DC4)
+        + Op.DUP4
+        + Op.ADD(0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20))))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x4), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x84), value=Op.SUB(Op.DUP3, 0x20))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x108), value=Op.DUP1)
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 3
+        + Op.DUP3
+        + Op.ADD(0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20))))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x24), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0xA4), value=Op.SUB(Op.DUP3, 0x20))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x128), value=Op.DUP1)
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 3
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.MLOAD(offset=0x120))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.MLOAD(offset=0x100))
+        + Op.ADD(0x4, Op.DUP2)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.JUMPI(
+            pc=0xBE7,
+            condition=Op.CALL(
+                gas=0x1F,
+                address=0x4,
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=0x84,
+                ret_offset=Op.DUP2,
+                ret_size=0x84,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.ADD(Op.DUP2, 0x84)
+        + Op.SWAP3
+        + Op.POP
+        + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x108))
+        + Op.DUP1
+        + Op.JUMPI(
+            pc=0xC0E,
+            condition=Op.CALL(
+                gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
+                address=0x4,
+                value=0x0,
+                args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0x84)),
+                args_size=Op.DUP3,
+                ret_offset=Op.DUP6,
+                ret_size=Op.DUP1,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 2
+        + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x128))
+        + Op.DUP1
+        + Op.JUMPI(
+            pc=0xC36,
+            condition=Op.CALL(
+                gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
+                address=0x4,
+                value=0x0,
+                args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xA4)),
+                args_size=Op.DUP3,
+                ret_offset=Op.DUP6,
+                ret_size=Op.DUP1,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 2
+        + Op.SUB(Op.DUP4, Op.DUP1)
+        + Op.MLOAD(offset=0x140)
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x80),
+                value=0x0,
+                args_offset=Op.DUP7,
+                args_size=Op.DUP5,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x60]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH2[0x14C]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xB39E1FAA)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.DUP3
+        + Op.ADD(0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20))))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x44), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0xA4), value=Op.SUB(Op.DUP3, 0x20))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x108), value=Op.DUP1)
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 3
+        + Op.ADD(0x4, Op.DUP2)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.JUMPI(
+            pc=0xCEC,
+            condition=Op.CALL(
+                gas=0x1C,
+                address=0x4,
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=0x64,
+                ret_offset=Op.DUP2,
+                ret_size=0x64,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.ADD(Op.DUP2, 0x64)
+        + Op.SWAP3
+        + Op.POP
+        + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x108))
+        + Op.DUP1
+        + Op.JUMPI(
+            pc=0xD13,
+            condition=Op.CALL(
+                gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
+                address=0x4,
+                value=0x0,
+                args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xA4)),
+                args_size=Op.DUP3,
+                ret_offset=Op.DUP6,
+                ret_size=Op.DUP1,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 2
+        + Op.SUB(Op.DUP4, Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=Op.DUP3,
+                ret_offset=0x4C0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x4C0)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.MSTORE(offset=0x4E0, value=0x1)
+        + Op.RETURN(offset=0x4E0, size=0x20)
+        + Op.POP * 2
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x114C, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x939AA8C)))
+        + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0xE0, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x100, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x64))
+        + Op.MSTORE(offset=0x140, value=Op.CALLDATALOAD(offset=0x84))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE05DCB56)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.ADD(Op.MLOAD(offset=0x100), 0x2)
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP6,
+                args_size=0x44,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x7DC12195)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.MLOAD(offset=0x140)
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP6,
+                args_size=0x44,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x586B5BE0)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x44,
+                ret_offset=0x500,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x500)
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xEB8AF5AA)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.MLOAD(offset=0x120)
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP6,
+                args_size=0x44,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0xC0]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH2[0x26C]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x232B2734)
+        + Op.DUP3
+        + Op.ADD(0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20))))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x4), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0xC4), value=Op.SUB(Op.DUP3, 0x20))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x188), value=Op.DUP1)
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 3
+        + Op.DUP6
+        + Op.ADD(0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20))))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x24), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0xE4), value=Op.SUB(Op.DUP3, 0x20))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x1A8), value=Op.DUP1)
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 3
+        + Op.DUP5
+        + Op.ADD(0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20))))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x44), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x104), value=Op.SUB(Op.DUP3, 0x20))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x1C8), value=Op.DUP1)
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 3
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.MLOAD(offset=0x120))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0xA4), value=Op.MLOAD(offset=0x100))
+        + Op.ADD(0x4, Op.DUP2)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.JUMPI(
+            pc=0xF96,
+            condition=Op.CALL(
+                gas=0x25,
+                address=0x4,
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=0xC4,
+                ret_offset=Op.DUP2,
+                ret_size=0xC4,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.ADD(Op.DUP2, 0xC4)
+        + Op.SWAP3
+        + Op.POP
+        + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x188))
+        + Op.DUP1
+        + Op.JUMPI(
+            pc=0xFBD,
+            condition=Op.CALL(
+                gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
+                address=0x4,
+                value=0x0,
+                args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xC4)),
+                args_size=Op.DUP3,
+                ret_offset=Op.DUP6,
+                ret_size=Op.DUP1,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 2
+        + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x1A8))
+        + Op.DUP1
+        + Op.JUMPI(
+            pc=0xFE5,
+            condition=Op.CALL(
+                gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
+                address=0x4,
+                value=0x0,
+                args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xE4)),
+                args_size=Op.DUP3,
+                ret_offset=Op.DUP6,
+                ret_size=Op.DUP1,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 2
+        + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x1C8))
+        + Op.DUP1
+        + Op.JUMPI(
+            pc=0x100E,
+            condition=Op.CALL(
+                gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
+                address=0x4,
+                value=0x0,
+                args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0x104)),
+                args_size=Op.DUP3,
+                ret_offset=Op.DUP6,
+                ret_size=Op.DUP1,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 2
+        + Op.SUB(Op.DUP4, Op.DUP1)
+        + Op.MLOAD(offset=0x120)
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x80),
+                value=0x0,
+                args_offset=Op.DUP7,
+                args_size=Op.DUP5,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x60]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH2[0x14C]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x1112B27)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0xC0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0xE0))
+        + Op.DUP3
+        + Op.ADD(0x20, Op.MUL(0x20, Op.MLOAD(offset=Op.SUB(Op.DUP2, 0x20))))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x44), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0xA4), value=Op.SUB(Op.DUP3, 0x20))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP5, 0x108), value=Op.DUP1)
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 3
+        + Op.ADD(0x4, Op.DUP2)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.JUMPI(
+            pc=0x10C4,
+            condition=Op.CALL(
+                gas=0x1C,
+                address=0x4,
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=0x64,
+                ret_offset=Op.DUP2,
+                ret_size=0x64,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.ADD(Op.DUP2, 0x64)
+        + Op.SWAP3
+        + Op.POP
+        + Op.MLOAD(offset=Op.ADD(Op.DUP3, 0x108))
+        + Op.DUP1
+        + Op.JUMPI(
+            pc=0x10EB,
+            condition=Op.CALL(
+                gas=Op.ADD(0x12, Op.SDIV(Op.DUP8, 0xA)),
+                address=0x4,
+                value=0x0,
+                args_offset=Op.MLOAD(offset=Op.ADD(Op.DUP8, 0xA4)),
+                args_size=Op.DUP3,
+                ret_offset=Op.DUP6,
+                ret_size=Op.DUP1,
+            ),
+        )
+        + Op.INVALID
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SWAP4
+        + Op.POP * 2
+        + Op.SUB(Op.DUP4, Op.DUP1)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x20),
+                value=0x0,
+                args_offset=Op.DUP5,
+                args_size=Op.DUP3,
+                ret_offset=0x580,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x580)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.JUMPI(
+            pc=0x113A,
+            condition=Op.ISZERO(
+                Op.EQ(
+                    Op.MLOAD(
+                        offset=Op.ADD(
+                            Op.DUP6,
+                            Op.MUL(0x20, Op.ADD(Op.MLOAD(offset=0x100), 0x1)),
+                        )
+                    ),
+                    0x0,
+                )
+            ),
+        )
+        + Op.MSTORE(offset=0x5A0, value=0x0)
+        + Op.RETURN(offset=0x5A0, size=0x20)
+        + Op.JUMP(pc=0x1147)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x5C0, value=0x1)
+        + Op.RETURN(offset=0x5C0, size=0x20)
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.JUMPDEST
+        + Op.POP,
+        nonce=0,
+        address=Address(0x9761FECF88590592CF05CE545504D376D1693AB3),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600061075f537c010000000000000000000000000000000000000000000000000000000060003504731e147037f0a63df228fe6e7aef730f1ea31c8ce3602052730ea65418d7bf32680f55572c943a94b59080499860405273e509e3a93beb1eba72f8cb8d25f93a85e2d54afb60605273c9ae5868651bf7b7db6e360217db49ce4e69c07e60805273142a6927cf0060133187ba8a8e74d641438f0c1c60a05273b163e767e4c1ba5ae88b2ee7594f3a3fec2bb09660c05273ba7b277319128ef4c22635534d0f61dffdaa13ab60e052739761fecf88590592cf05ce545504d376d1693ab36101005273f70bbc50f1468cecae0761ef09386a87c1c696ea6101205273a89d22f049aaa5bbfb5f1a1939fff3ae7a26ae746101405273174827f7e53e8ce13b047adcac0eb3f2cb0c3285610160526336a560bd811415610a88576004356101a052601c60445990590160009052016327138bfb601c8203526101a051600482015260206101e0602483600060a051602d5a03f1506101e05190501515610195576001600003610200526020610200f35b601c6044599059016000905201637a66d7ca601c8203526101a051600482015260206102206024836000608051602d5a03f150610220519050601c606459905901600090520163cc1c944e601c8203526101a05160048201528160248201526020610260604483600061028051602d5a03f150610260519050601c60445990590160009052016380b5e7bd601c8203526101a051600482015260206102a06024836000606051602d5a03f1506102a0519050808202601c60445990590160009052016318633576601c8203526101a051600482015260206103006024836000608051602d5a03f150610300519050600981141561036d57601c60c459905901600090520163ac44d71e601c8203526101a0516004820152856024820152846044820152836064820152826084820152602061036060a483600061016051602d5a03f15061036051905050601c6064599059016000905201637265802d601c8203526101a05160048201526000602482015260206103806044836000608051602d5a03f15061038051905050601c604459905901600090520163c5476efe601c8203526101a051600482015260206103a06024836000608051602d5a03f1506103a051905050600185016103c05260206103c0f3610a3a565b60008114156103cd57601c60c459905901600090520163ef72638a601c8203526101a051600482015285602482015284604482015283606482015282608482015260206103e060a483600060c051602d5a03f1506103e051905050610a39565b600181141561042d57601c60c459905901600090520163a63e976c601c8203526101a0516004820152856024820152846044820152836064820152826084820152602061040060a483600060e051602d5a03f15061040051905050610a38565b600281141561048d57601c60c459905901600090520163533ea0ed601c8203526101a0516004820152856024820152846044820152836064820152826084820152602061042060a483600060e051602d5a03f15061042051905050610a37565b600381141561085057601c606459905901600090520163e05dcb56601c8203526101a0516004820152856024820152600285016040816020020159905901600090528160200260400181604485600061028051602d5a03f15060408101905090509050601c6044599059016000905201633d905045601c8203526101a051600482015260206104806024836000608051602d5a03f150610480519050600481141561063357601c60c4599059016000905201630939aa8c601c8203526101a051600482015287602482015286604482015285606482015284608482015260206104e060a483600061010051602d5a03f1506104e05190506104c052601c606459905901600090520163c286273a601c8203526101a05160048201526000602482015260206105006044836000608051602d5a03f1506105005190505060016104c05114156105e55782610520526020610520f361062e565b601c604459905901600090520163aac2ffb5601c8203526101a051600482015260206105406024836000608051602d5a03f1506105405190505060018301610560526020610560f35b610804565b600081141561069457601c60c459905901600090520163546fdeb3601c8203526101a0516004820152876024820152866044820152856064820152846084820152602061058060a483600061010051602d5a03f15061058051905050610803565b6001811415610742576000601c60c459905901600090520163de9080c8601c8203526101a051600482015288602482015287604482015286606482015285608482015260206105a060a483600061010051602d5a03f1506105a0519050141561073257601c6044599059016000905201631cda01ef601c8203526101a051600482015260206105c06024836000608051602d5a03f1506105c0519050505b826105e05260206105e0f3610802565b60028114156107a357601c60c459905901600090520163384ca8dd601c8203526101a0516004820152876024820152866044820152856064820152846084820152602061060060a483600061010051602d5a03f15061060051905050610801565b600381141561080057601c60c459905901600090520163d5dc5af1601c8203526101a0516004820152876024820152866044820152856064820152846084820152602061062060a483600061010051602d5a03f150610620519050505b5b5b5b5b601c6044599059016000905201631cda01ef601c8203526101a051600482015260206106406024836000608051602d5a03f1506106405190505082610660526020610660f35050610a36565b60048114156108b157601c60c459905901600090520163f6559853601c8203526101a0516004820152856024820152846044820152836064820152826084820152602061068060a483600061012051602d5a03f15061068051905050610a35565b600581141561091257601c60c459905901600090520163d8e5473d601c8203526101a051600482015285602482015284604482015283606482015282608482015260206106a060a483600061012051602d5a03f1506106a051905050610a34565b600681141561097357601c60c459905901600090520163090507ea601c8203526101a051600482015285602482015284604482015283606482015282608482015260206106c060a483600061012051602d5a03f1506106c051905050610a33565b60078114156109d457601c60c4599059016000905201635b911842601c8203526101a051600482015285602482015284604482015283606482015282608482015260206106e060a483600061014051602d5a03f1506106e051905050610a32565b6008811415610a3157601c60c459905901600090520163abe22b84601c8203526101a0516004820152856024820152846044820152836064820152826084820152602061070060a483600061014051602d5a03f150610700519050505b5b5b5b5b5b5b5b5b5b601c604459905901600090520163aac2ffb5601c8203526101a051600482015260206107206024836000608051602d5a03f1506107205190505060018101610740526020610740f350505050505b50  # noqa: E501
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x75F, value=0x0)
+        + Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.MSTORE(
+            offset=0x20, value=0x1E147037F0A63DF228FE6E7AEF730F1EA31C8CE3
+        )
+        + Op.MSTORE(
+            offset=0x40, value=0xEA65418D7BF32680F55572C943A94B590804998
+        )
+        + Op.MSTORE(
+            offset=0x60, value=0xE509E3A93BEB1EBA72F8CB8D25F93A85E2D54AFB
+        )
+        + Op.MSTORE(
+            offset=0x80, value=0xC9AE5868651BF7B7DB6E360217DB49CE4E69C07E
+        )
+        + Op.MSTORE(
+            offset=0xA0, value=0x142A6927CF0060133187BA8A8E74D641438F0C1C
+        )
+        + Op.MSTORE(
+            offset=0xC0, value=0xB163E767E4C1BA5AE88B2EE7594F3A3FEC2BB096
+        )
+        + Op.MSTORE(
+            offset=0xE0, value=0xBA7B277319128EF4C22635534D0F61DFFDAA13AB
+        )
+        + Op.MSTORE(
+            offset=0x100, value=0x9761FECF88590592CF05CE545504D376D1693AB3
+        )
+        + Op.MSTORE(
+            offset=0x120, value=0xF70BBC50F1468CECAE0761EF09386A87C1C696EA
+        )
+        + Op.MSTORE(
+            offset=0x140, value=0xA89D22F049AAA5BBFB5F1A1939FFF3AE7A26AE74
+        )
+        + Op.MSTORE(
+            offset=0x160, value=0x174827F7E53E8CE13B047ADCAC0EB3F2CB0C3285
+        )
+        + Op.JUMPI(pc=0xA88, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x36A560BD)))
+        + Op.MSTORE(offset=0x1A0, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x44]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x27138BFB)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0xA0),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x24,
+                ret_offset=0x1E0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x1E0)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(pc=0x195, condition=Op.ISZERO(Op.ISZERO))
+        + Op.MSTORE(offset=0x200, value=Op.SUB(0x0, 0x1))
+        + Op.RETURN(offset=0x200, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x44]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x7A66D7CA)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x80),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x24,
+                ret_offset=0x220,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x220)
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xCC1C944E)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP2)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x280),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x44,
+                ret_offset=0x260,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x260)
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x44]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x80B5E7BD)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x60),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x24,
+                ret_offset=0x2A0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x2A0)
+        + Op.SWAP1
+        + Op.POP
+        + Op.MUL(Op.DUP3, Op.DUP1)
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x44]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x18633576)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x80),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x24,
+                ret_offset=0x300,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x300)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(pc=0x36D, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x9)))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xC4]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xAC44D71E)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x160),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0xA4,
+                ret_offset=0x360,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x360)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x7265802D)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=0x0)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x80),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x44,
+                ret_offset=0x380,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x380)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x44]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xC5476EFE)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x80),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x24,
+                ret_offset=0x3A0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x3A0)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.MSTORE(offset=0x3C0, value=Op.ADD(Op.DUP6, 0x1))
+        + Op.RETURN(offset=0x3C0, size=0x20)
+        + Op.JUMP(pc=0xA3A)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x3CD, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x0)))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xC4]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xEF72638A)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0xC0),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0xA4,
+                ret_offset=0x3E0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x3E0)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.JUMP(pc=0xA39)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x42D, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x1)))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xC4]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xA63E976C)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0xE0),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0xA4,
+                ret_offset=0x400,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x400)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.JUMP(pc=0xA38)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x48D, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x2)))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xC4]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x533EA0ED)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0xE0),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0xA4,
+                ret_offset=0x420,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x420)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.JUMP(pc=0xA37)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x850, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x3)))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xE05DCB56)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
+        + Op.ADD(Op.DUP6, 0x2)
+        + Op.ADD(Op.MUL(0x20, Op.DUP2), 0x40)
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x280),
+                value=0x0,
+                args_offset=Op.DUP6,
+                args_size=0x44,
+                ret_offset=Op.DUP2,
+                ret_size=Op.ADD(0x40, Op.MUL(0x20, Op.DUP2)),
+            )
+        )
+        + Op.ADD(Op.DUP2, 0x40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x44]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x3D905045)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x80),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x24,
+                ret_offset=0x480,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x480)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(pc=0x633, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x4)))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xC4]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x939AA8C)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP8)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP7)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP6)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP5)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x100),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0xA4,
+                ret_offset=0x4E0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x4E0)
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x4C0]
+        + Op.MSTORE
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xC286273A)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=0x0)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x80),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x44,
+                ret_offset=0x500,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x500)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.JUMPI(
+            pc=0x5E5, condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x4C0), 0x1))
+        )
+        + Op.MSTORE(offset=0x520, value=Op.DUP3)
+        + Op.RETURN(offset=0x520, size=0x20)
+        + Op.JUMP(pc=0x62E)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x44]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xAAC2FFB5)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x80),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x24,
+                ret_offset=0x540,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x540)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.MSTORE(offset=0x560, value=Op.ADD(Op.DUP4, 0x1))
+        + Op.RETURN(offset=0x560, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMP(pc=0x804)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x694, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x0)))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xC4]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x546FDEB3)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP8)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP7)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP6)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP5)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x100),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0xA4,
+                ret_offset=0x580,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x580)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.JUMP(pc=0x803)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x742, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x1)))
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xC4]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xDE9080C8)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP9)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP8)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP7)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP6)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x100),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0xA4,
+                ret_offset=0x5A0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x5A0)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(pc=0x732, condition=Op.ISZERO(Op.EQ))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x44]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x1CDA01EF)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x80),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x24,
+                ret_offset=0x5C0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x5C0)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x5E0, value=Op.DUP3)
+        + Op.RETURN(offset=0x5E0, size=0x20)
+        + Op.JUMP(pc=0x802)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x7A3, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x2)))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xC4]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x384CA8DD)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP8)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP7)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP6)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP5)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x100),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0xA4,
+                ret_offset=0x600,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x600)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.JUMP(pc=0x801)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x800, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x3)))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xC4]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xD5DC5AF1)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP8)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP7)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP6)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP5)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x100),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0xA4,
+                ret_offset=0x620,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x620)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.JUMPDEST * 5
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x44]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x1CDA01EF)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x80),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x24,
+                ret_offset=0x640,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x640)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.MSTORE(offset=0x660, value=Op.DUP3)
+        + Op.RETURN(offset=0x660, size=0x20)
+        + Op.POP * 2
+        + Op.JUMP(pc=0xA36)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8B1, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x4)))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xC4]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xF6559853)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x120),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0xA4,
+                ret_offset=0x680,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x680)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.JUMP(pc=0xA35)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x912, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x5)))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xC4]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xD8E5473D)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x120),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0xA4,
+                ret_offset=0x6A0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x6A0)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.JUMP(pc=0xA34)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x973, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x6)))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xC4]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x90507EA)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x120),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0xA4,
+                ret_offset=0x6C0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x6C0)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.JUMP(pc=0xA33)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x9D4, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x7)))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xC4]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x5B911842)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x140),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0xA4,
+                ret_offset=0x6E0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x6E0)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.JUMP(pc=0xA32)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xA31, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x8)))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xC4]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xABE22B84)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.DUP6)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.DUP5)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x64), value=Op.DUP4)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x84), value=Op.DUP3)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x140),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0xA4,
+                ret_offset=0x700,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x700)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.JUMPDEST * 10
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x44]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xAAC2FFB5)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.MLOAD(offset=0x1A0))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x80),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x24,
+                ret_offset=0x720,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x720)
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.MSTORE(offset=0x740, value=Op.ADD(Op.DUP2, 0x1))
+        + Op.RETURN(offset=0x740, size=0x20)
+        + Op.POP * 5
+        + Op.JUMPDEST
+        + Op.POP,
         nonce=0,
-        address=Address("0xf1562e1c0d0baa3ea746442bb7f11153fcf5cfda"),  # noqa: E501
+        address=Address(0xB03F030056DB7D467D778326658BAC0D1B35D8F7),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "36a560bd00000000000000000000000000000000000000000000000000000000000f69b5"  # noqa: E501
-        ),
+        to=contract_8,
+        data=Bytes("36a560bd") + Hash(0xF69B5),
         gas_limit=3000000,
         gas_price=10000000000000,
     )
 
     post = {
-        callee_5: Account(
+        contract_0: Account(balance=1),
+        contract_1: Account(balance=1),
+        contract_2: Account(balance=1),
+        contract_3: Account(balance=1),
+        contract_4: Account(balance=1),
+        contract_5: Account(
             storage={
                 0x65D5EFDFCC0FBA693DC9E467F633097FFDC97401901463AD0E28855486D1EDF: 0xB9D69098A6ACFE0C6411BCAAF430F78D363A9ADC32B78BC2E15CCD6E883E9784,  # noqa: E501
                 0x12643FF300762717D27EFB567B82C65560D7B43249D908504E5510863AB82AAC: 0x154CF60E137C594516A065149610B6A3989396A42581D5FD8919E711C55DA225,  # noqa: E501
                 0x1489023D18C5D10427C4AA8DC726E840EB5AE7F604A8E9243C61634FB009E4D7: 5,  # noqa: E501
-                0x1489023D18C5D10427C4AA8DC726E840EB5AE7F604A8E9243C61634FB009E4D8: 1,  # noqa: E501
+                0x1489023D18C5D10427C4AA8DC726E840EB5AE7F604A8E9243C61634FB009E4D8: contract_1,  # noqa: E501
                 0x19EFB13D6576359514ACE5211988A8D51379FA88CCD2B886B409F842B13D7932: 0xC849CC595B452D11C206D2EB8CDFA06DE211E3FF19EE0E0276DC857C05D4FE,  # noqa: E501
                 0x1B37E91BF8580C7C6BCF8CDFF25C7ED78180124A94AF6F30C40D476A3D079AD6: 0xABA4CD295118A482A0A62579E35E4BA5BDD76146CC9E4D96172FCE8BE8977AB4,  # noqa: E501
                 0x2BF9FD8FACDD6FD9C84657F5AD7381A5AECF670CDA68CB3C5829B6532C865506: 0x53098A1D111586DBCC0D051846284F5803C63C313E7F7E6D84430435D11D4C50,  # noqa: E501
                 0x3111BFD25728C0ADFAD0F8C1AD79CB1B91167267DECA98DE88F156ED25CAEEDC: 0xAD393086F30B49511B08FDD27AC78810B084C7CD7DE6AC354F614C18EA9E7DF4,  # noqa: E501
                 0x3379E7AE125C5C5D623D1D993C1459B61D6723B1C30D1AA026C48F6A6155B8EA: 0x8C4183732567A99A8A718E363391E102532F9A640E42968CF2354D9ACC908BB0,  # noqa: E501
-                0x34CABE0C7E64A2CAA93FD8D6A0DEFC07ACB9D44B13430FA3AE9282FFFD40DEE2: 1,  # noqa: E501
-                0x34CABE0C7E64A2CAA93FD8D6A0DEFC07ACB9D44B13430FA3AE9282FFFD40DEE3: 1,  # noqa: E501
-                0x34CABE0C7E64A2CAA93FD8D6A0DEFC07ACB9D44B13430FA3AE9282FFFD40DEE4: 1,  # noqa: E501
-                0x34CABE0C7E64A2CAA93FD8D6A0DEFC07ACB9D44B13430FA3AE9282FFFD40DEE5: 1,  # noqa: E501
+                0x34CABE0C7E64A2CAA93FD8D6A0DEFC07ACB9D44B13430FA3AE9282FFFD40DEE2: contract_1,  # noqa: E501
+                0x34CABE0C7E64A2CAA93FD8D6A0DEFC07ACB9D44B13430FA3AE9282FFFD40DEE3: contract_1,  # noqa: E501
+                0x34CABE0C7E64A2CAA93FD8D6A0DEFC07ACB9D44B13430FA3AE9282FFFD40DEE4: contract_1,  # noqa: E501
+                0x34CABE0C7E64A2CAA93FD8D6A0DEFC07ACB9D44B13430FA3AE9282FFFD40DEE5: contract_1,  # noqa: E501
                 0x39050607FE892059A6344AB0F594F382FB0B345CAB373497246DBE86FE7E14E7: 0x2B3BCA833E482737E7E47B1568E6F890F8E1666490D38FE130ABD6F0CCB109CF,  # noqa: E501
                 0x417BE8BC6791807372E0222A350BB8A5D67BBC8D7595C301D8A5A8372CFDCEF1: 0xABD4971B4605A7155802F70E08298B1CEB0E4E4EACCCCD348F77A77227F73A7F,  # noqa: E501
                 0x41E9A54B3EE0C276AA076BABB161DE12B0F8916B47F8F6FB85CC387CF34696DD: 0x22F2F444EBDA9D2913FFEF5059B039EC9B5876AA71821991C2515BF79F64935E,  # noqa: E501
@@ -10683,12 +9151,12 @@ def test_block504980(
                 0x7E95F3CC3315D289C52253BAABA29B1B00C86816E6B788D50795279A8BAA00DB: 0x45E9723E9232B37207ECAC1C97B8647D053625A578D450F7456280B2FF8EFC27,  # noqa: E501
                 0x8DA187157087529EE4E9C381F8E3149C56ACF3BDFDA29B8B9B4532F24B83F5FE: 0x8C4183732567A99A8A718E363391E102532F9A640E42968CF2354D9ACC908BB0,  # noqa: E501
                 0x9001F91DDAEF87BC067886E874C0749998C9B58B2EC8472CA014CA8B55F88578: 0xFB76974EEFCA01F33FB38646C2D3C1536F1A763D7AFF53AB7F877D4C5EA7FD0,  # noqa: E501
-                0x9ED0CEDD2A9A78D949F40019F53D10031AEF6ED342C97E01FC03B481EE56B3CB: 4,  # noqa: E501
+                0x9ED0CEDD2A9A78D949F40019F53D10031AEF6ED342C97E01FC03B481EE56B3CB: contract_4,  # noqa: E501
                 0x9FDDF1DB29CAA5C1239EDD86E9E0835CDFE41F7253EC78F62D3DA8558D6F3CD7: 0x104EEF8FA35BF39F677D81855BC0B9F42317F32792E98E95E4DF441DEB634211,  # noqa: E501
                 0xA0953566119395C11186B334805FC1A16175ECAC0ECC93AE0322264F0DC2E40D: 0x10C5A00466AB7C0ADAE1E93537CC275EA8CF23FF509D5466A1FD6F56B0A61D1B,  # noqa: E501
-                0xAA0DBF8241EF3AE07C254E6869E84895BA2BE0779A7F261C8308A3114BE1C54A: 4,  # noqa: E501
-                0xAFFE808B495D13A14391CE5F27C211C36DA12826969CD7841EE0D81E5B900E2D: 1,  # noqa: E501
-                0xAFFE808B495D13A14391CE5F27C211C36DA12826969CD7841EE0D81E5B900E2E: 1,  # noqa: E501
+                0xAA0DBF8241EF3AE07C254E6869E84895BA2BE0779A7F261C8308A3114BE1C54A: contract_4,  # noqa: E501
+                0xAFFE808B495D13A14391CE5F27C211C36DA12826969CD7841EE0D81E5B900E2D: contract_1,  # noqa: E501
+                0xAFFE808B495D13A14391CE5F27C211C36DA12826969CD7841EE0D81E5B900E2E: contract_1,  # noqa: E501
                 0xB4A2B68C48EF78AEB641EE538FAD51781022FD23ED9D93D211017DB6A02376CE: 0xFBC06642245CF2FED7ED46EA0A18A7185830B6F2C4E0A4CA55246041E8BFA72,  # noqa: E501
                 0xBA8D79990898383919E437F2458B93B340072C89D963808D9E04F51858E3C5EC: 0x41D2CAC534D90A0DBD199117481A63E32CC11411DAB2EAA36C91C0EEC62823CF,  # noqa: E501
                 0xBB3BC1A2015123750DF57D4CEFF7E28CB847910B79B34841DE905B59A8BB177C: 0x734417EB19E1873427257F1EA1594748C16CFA866A7B7CF896E281F2EC774A40,  # noqa: E501
@@ -10701,24 +9169,35 @@ def test_block504980(
                 0xD8F720C05A5526DD621D1831AE122ABDDD3DFECD8B63B0BA4C92FA7B2ADE44FF: 0xAD393086F30B49511B08FDD27AC78810B084C7CD7DE6AC354F614C18EA9E7DF4,  # noqa: E501
                 0xDC22D3171B82817C910BBEAC1F8B50C8DE99F8C524F172AEF3491981BD5ED4FB: 0x94B8CBA4EA090D1C392FBC94B82FB9EF9F468A15BBC537F4D051776F4D422B1D,  # noqa: E501
                 0xDCE8ADBDEFA929DBE60245F359446DB4174C62824B42E5D4D9E7B834B4D61DEB: 0x2C9069845B2E74C577FF1CD18DF6BC452805F527A9EE91FD4A059E0408B5DEA6,  # noqa: E501
-                0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D196: 1,  # noqa: E501
-                0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D197: 1,  # noqa: E501
-                0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D198: 1,  # noqa: E501
-                0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D199: 1,  # noqa: E501
-                0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D19A: 1,  # noqa: E501
+                0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D196: contract_1,  # noqa: E501
+                0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D197: contract_1,  # noqa: E501
+                0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D198: contract_1,  # noqa: E501
+                0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D199: contract_1,  # noqa: E501
+                0xDD9493073DB9E42FD955E834C89A74089F99196186EE0B2688124989BE00D19A: contract_1,  # noqa: E501
                 0xE54F074C81BFA60B5BF413934C108086298B77291560EDFEEAD8AA1232E95236: 0xF40AAA24323C9E6983CCFFAFEEBE4B426509B901E8C98B8A40D881804804E6B,  # noqa: E501
-                0xE66C0F55F66C752EDF73027D45B7B1AE729AE15E1C67C362DBC6F25EDF8D76FF: 1,  # noqa: E501
+                0xE66C0F55F66C752EDF73027D45B7B1AE729AE15E1C67C362DBC6F25EDF8D76FF: contract_1,  # noqa: E501
                 0xE983D899F807BBCB5881F2DDF875B2EBB5CB8A7A4E77A8C98A40AAAE6A468735: 0x6D0BE832B2007EA28CDA705B73922CBF9794C5A25B89BD2F28B7347ED2B96C86,  # noqa: E501
                 0xED7D6E2D40FBD5046412FFAD1C45B63D87C6197182D6DBC66BB1E5C6E4DED5C7: 0xABA4CD295118A482A0A62579E35E4BA5BDD76146CC9E4D96172FCE8BE8977AB4,  # noqa: E501
-                0xF043B5A1952847579F233706A8F130889A484D2DA3E574FDD5859F05AAF52111: 2,  # noqa: E501
+                0xF043B5A1952847579F233706A8F130889A484D2DA3E574FDD5859F05AAF52111: contract_2,  # noqa: E501
                 0xF40F4CFDACB62DD799F36B580349FAC1F4A4CAF8DD3383CC387C35ADB6574E21: 0x2F0000000000000000,  # noqa: E501
                 0xF60FA6E25E9028A6DC6B26BBC1EADAE3DA157DF0D1D6F6628BC33CAD68A7E455: 0x2D7D00618C059EBE40593B9497C633E1AC6E161DADBD5BB734C2663CD3E8A8E1,  # noqa: E501
-                0xFD280AC5182D5B2366122F38ACFA6DC471240FFDE9D5FEB985CE7A2325C960E7: 3,  # noqa: E501
+                0xFD280AC5182D5B2366122F38ACFA6DC471240FFDE9D5FEB985CE7A2325C960E7: contract_3,  # noqa: E501
             },
+            balance=0,
+            nonce=0,
         ),
-        callee_8: Account(
+        contract_6: Account(
+            storage={},
+            code=bytes.fromhex(
+                "600061031f537c01000000000000000000000000000000000000000000000000000000006000350473c9ae5868651bf7b7db6e360217db49ce4e69c07e602052730ea65418d7bf32680f55572c943a94b5908049986040526327138bfb81141561038d57600435608052601c6044599059016000905201637a66d7ca601c8203526080516004820152602060e06024836000602051602d5a03f15060e051905060a052601c604459905901600090520163c60409c6601c820352608051600482015260206101206024836000602051602d5a03f150610120519050430561010052600061014052600061016052600061018052600260a051016101005112151561010a576001610140525b60006101a052610100516101c0525b606461010051016101c051121561018457601c606459905901600090520163cc1c944e601c82035260805160048201526101c051602482015260206101e06044836000604051602d5a03f1506101e05190506101a051016101a05260016101c051016101c052610119565b6005601c606459905901600090520163cc1c944e601c820352608051600482015260a051602482015260206102006044836000604051602d5a03f1506102005190501280156101d357806101db565b600a6101a051125b9050156101eb57610140516101ee565b60005b1561033657601c604459905901600090520163c5476efe601c820352608051600482015260206102406024836000602051602d5a03f15061024051905050601c6064599059016000905201637265802d601c82035260805160048201526000602482015260206102606044836000602051602d5a03f15061026051905050601c606459905901600090520163c286273a601c82035260805160048201526000602482015260206102806044836000602051602d5a03f15061028051905050601c6044599059016000905201637a66d7ca601c820352608051600482015260206102a06024836000602051602d5a03f1506102a051905060a052601c608459905901600090520163bb8e4196601c820352608051600482015260a051602482015261010051604482015260206102c06064836000604051602d5a03f1506102c051905050610343565b6001610160526001610180525b61014051156103555761016051610358565b60005b156103665761018051610369565b60005b1561037f5760016102e05260206102e0f361038c565b6000610300526020610300f35b5b50"  # noqa: E501
+            ),
+            balance=0,
+            nonce=0,
+        ),
+        sender: Account(nonce=1),
+        contract_9: Account(
             storage={
-                0: 1,
+                0: contract_1,
                 0xA4470E9D0419DF71F6257FCDFD2C0A3BAD96A23F5AB414BC10AAF1A31A536A7: 0xB4876148229C22BD2291F1A4F5468C8C789B23639370C4D447F270BA341DBBEC,  # noqa: E501
                 0x16EF4193A274568D283FF919C299729E07696D9ADA48187B81D68E12E7B962DE: 0xA103C04E7ECB9B3395F77C7B0CAD28E62C85F042DE4767CCC6C005E6F47F8D4,  # noqa: E501
                 0x1F1866E966F321B84535705846689749D34D5DC02994613E2931973C605D9E93: 0xC723D0AA4A60529FE42277C8094AA19263AFF36650136EFC5EDFD0785D457634,  # noqa: E501
@@ -10746,25 +9225,38 @@ def test_block504980(
                 0xBC96058EB03504EE6F5C0A9582F8720D99A6E9738B171499507FACFF0B2C0B5B: 0x9DB6A4F2766B51013B8D2F9038131D1BB4AF725D019D111D7E26FF96C023B23F,  # noqa: E501
                 0xC186C4F377B7F13892ADE9656ACD1522AA1F8AC151AC4F62457B5073241D79FC: 0x7289738FEF00F1770EEB098DB9BD486C01AC12398D79CDF935514A128C585C51,  # noqa: E501
                 0xCAE57AE3017972D63EFFD8EAE44F5054402C3E890D154B905ED6B5B533327FA9: 0xD2E4BF465E61993D13089B940A7C55017A5117D8E43E4115550A139E1D4B3E3A,  # noqa: E501
-                0xCF569EE7BF3ACCC0F893DFFD04F1A757F373EFE80893EFF504FB3678F688EC1D: 3,  # noqa: E501
+                0xCF569EE7BF3ACCC0F893DFFD04F1A757F373EFE80893EFF504FB3678F688EC1D: contract_3,  # noqa: E501
                 0xD69B7284545A9F5275DF64CE94848DC954FCB8A8B525E7AC801517C12A75AF84: 0x4202995350ABAE303B43E564AA79121A30B5F1AEA31F69CD25E07DD3FA64DCE7,  # noqa: E501
-                0xD8F6F90F51E657690EE28D1CC80D81BC1B89290065891FDD853D09CAAAF756AA: 1,  # noqa: E501
+                0xD8F6F90F51E657690EE28D1CC80D81BC1B89290065891FDD853D09CAAAF756AA: contract_1,  # noqa: E501
                 0xDE72F8EED43CC2A5A3EAA51483D14B17DC92BB26C154AE184CEE4B4895011EDC: 0x47CE2B6FDB72C3FABB9C74F82C1E3E522BCD42E614FD85C208AC3C4C840CEA72,  # noqa: E501
                 0xE0E687DDF317F3D2B209AE3884148EFF0F636E16827F82EDED14ADA8FC603009: 0xFA7C8939F9B033162CF8D75EA69671BB8A27041BD4CDC76594E61E99333CB041,  # noqa: E501
                 0xE8CDA339D72A1A350B62F1E3FA52E254C395CC9FDD9F60ADB21C7633FBDAB531: 0x128C4FDF4801A30EAE99DD58F0F3FF5CA65F71B66A9AC0F38DD450FB24B4AAAA,  # noqa: E501
                 0xEC5E7F54FA5E516E616B04F9D5A0EE433A80E09ED47D7E5269AFD76C05FF251E: 20,  # noqa: E501
                 0xF9A3BF5F2CCB903EE1A7644113B794DB0260DE404FB8F11203E75A7FFF151618: 0xBD94773C0D85C68240AE8DFD53D9D33CD137509BFC5D3433381299DF768C8377,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "600061083f537c010000000000000000000000000000000000000000000000000000000060003504637a66d7ca8114156100665760043560405260606060599059016000905260008152604051816020015260008160400152809050205460605260206060f35b63c60409c68114156100a55760043560405260606060599059016000905260008152604051816020015260018160400152809050205460a052602060a0f35b63186335768114156100e45760043560405260606060599059016000905260008152604051816020015260028160400152809050205460e052602060e0f35b63b3903c8a8114156101bc57600435604052606060605990590160009052600081526040518160200152600581604001528090502054610120526101205180602002602001599059016000905281815260208101905090506101605260006101c0525b610120516101c051121561019f57608060805990590160009052600081526040518160200152600481604001526101c051816060015280905020546101c05160200261016051015260016101c051016101c052610147565b6101605160206040820352602060208203510260400160408203f3505b636824e0fb8114156101fd57600435604052606060605990590160009052600081526040518160200152600581604001528090502054610220526020610220f35b633db16be381141561023e57600435604052606060605990590160009052600081526040518160200152600681604001528090502054610260526020610260f35b63c33878588114156102e05760006102a0526000546102c0526102c05180602002602001599059016000905281815260208101905090506102e0525b6102c0516102a05112156102c357604060405990590160009052600181526102a051816020015280905020546102a0516020026102e051015260016102a051016102a05261027a565b6102e05160206040820352602060208203510260400160408203f3505b63175c63228114156102fa57600054610380526020610380f35b63d861f2b4811415610336576004356103a052604060405990590160009052600181526103a051816020015280905020546103c05260206103c0f35b63b0dab01f81141561044f57600435610400526024356104205260443561044052606435610460526000606060605990590160009052600081526104005181602001526001816040015280905020541415610441576104205160606060599059016000905260008152610400518160200152600081604001528090502055610440516060606059905901600090526000815261040051816020015260018160400152809050205561046051606060605990590160009052600081526104005181602001526006816040015280905020556104005160406040599059016000905260018152600054816020015280905020556001600054016000556001610520526020610520f361044e565b6000610540526020610540f35b5b63aac2ffb58114156104b95760043560405260016060606059905901600090526000815260405181602001526002816040015280905020540160606060599059016000905260008152604051816020015260028160400152809050205560016105a05260206105a0f35b637265802d811415610507576004356040526024356105c0526105c0516060606059905901600090526000815260405181602001526002816040015280905020556001610600526020610600f35b63c5476efe811415610571576004356040526001606060605990590160009052600081526040518160200152600081604001528090502054016060606059905901600090526000815260405181602001526000816040015280905020556001610660526020610660f35b63c551e31e81141561063b576004356040526024356106805260606060599059016000905260008152604051816020015260058160400152809050205461012052610680516080608059905901600090526000815260405181602001526004816040015261012051816060015280905020556001606060605990590160009052600081526040518160200152600581604001528090502054016060606059905901600090526000815260405181602001526005816040015280905020556001610720526020610720f35b633d90504581141561067c57600435604052606060605990590160009052600081526040518160200152600381604001528090502054610740526020610740f35b631cda01ef8114156106e65760043560405260016060606059905901600090526000815260405181602001526003816040015280905020540160606060599059016000905260008152604051816020015260038160400152809050205560016107c05260206107c0f35b63c286273a811415610734576004356040526024356107e0526107e0516060606059905901600090526000815260405181602001526003816040015280905020556001610820526020610820f35b50"  # noqa: E501
+            ),
+            balance=0,
+            nonce=0,
         ),
-        callee_9: Account(
+        contract_10: Account(
             storage={
                 0xF299DBBE3A7A5D949FE794E9A47B3106699C8110FF986EB84921C183E69E7F0: 0x2F0000000000000000,  # noqa: E501
-                0x1EDCD36F61CAE5DC6414157DFBADF9F11CA013AC763E27F8AF55FEAA8A239C89: 1,  # noqa: E501
+                0x1EDCD36F61CAE5DC6414157DFBADF9F11CA013AC763E27F8AF55FEAA8A239C89: contract_1,  # noqa: E501
                 0x689082D076EC3C02CBE4B99F6D9833E3C4A161072FD42FB7649EEE5189A67CCC: 0x63524E3FE4791AEFCE1E932BBFB3FDF375BFAD89,  # noqa: E501
                 0xAF1D6676BE3AB502A59D91F6F5C49BAFFC15B2CFC65A41C4D96857C0F535ADBA: 0x1D60000000000000000,  # noqa: E501
                 0xDF1A770F69D93D1719292F384FDB4DA22C0E88AEF2BA462BFF16674BC7848730: 0x1C11AA45C792E202E9FFDC2F12F99D0D209BEF70,  # noqa: E501
-                0xEC5E7F54FA5E516E616B04F9D5A0EE433A80E09ED47D7E5269AFD76C05FF251E: 2,  # noqa: E501
+                0xEC5E7F54FA5E516E616B04F9D5A0EE433A80E09ED47D7E5269AFD76C05FF251E: contract_2,  # noqa: E501
             },
+            nonce=0,
+        ),
+        contract_11: Account(
+            storage={},
+            code=bytes.fromhex(
+                "600061067f537c010000000000000000000000000000000000000000000000000000000060003504632f300bee8114156100ac576004356040526024356060526044356080526002608051018080602002602001599059016000905281815260208101905090506801000000000000000081526060516080516020028201526001604051036001608051016020028201528060206040820352602060208203510260400160408203f35050505b63a647a5b98114156102c85736599059016000905236600482376004356020820101610100526024356020820101610160526044356020820101610180526064356101a05260843560805250602061010051035180806020026020015990590160009052818152602081019050905060005b6101a0518112156101d557600060005b608051811215610162578060200261010051015181608051850201602002610160510151028201915060018101905061012e565b50680100000000000000008105905060005b6080518112156101c857700100000000000000000000000000000000836020026101805101518260805186020160200261016051015184020205816020028501510381602002850152600181019050610174565b505060018101905061011e565b50600060005b60805181121561020357806020028301518160200284015102820191506001810190506101db565b5068010000000000000000810590506002810560005b600b81121561024257600282680100000000000000008502058301059150600181019050610219565b5060005b60805181121561027657816801000000000000000082602002860151020581602002850152600181019050610246565b5050506001608051602002610100510151036080516020028201526001608051016020026101005101516001608051016020028201528060206040820352602060208203510260400160408203f35050505b635b18022981141561037957365990590160009052366004823760043560208201016103005260243560208201016103205260443560805250600060005b60805181121561033f57680100000000000000008160200261032051015182602002610300510151020582019150600181019050610306565b6000610320515114151561036657610320515168010000000000000000830205915061036b565b600091505b81610380526020610380f350505b63f4ca7dc481141561057157365990590160009052366004823760043560208201016103a05260243560208201016103c0526044356101a0526064356080525060206103c051035160026080510a806020026020015990590160009052818152602081019050905060005b60805181121561044d5760005b6080518112156104415768010000000000000000816020026103a0510151836020026103a051015102058160805184020160200284015101816080518402016020028401526001810190506103f1565b506001810190506103e4565b81905090508180602002602001599059016000905281815260208101905090506080516101a05102806020026020015990590160009052818152602081019050905060005b6101a05181121561051e5760005b6080518112156105125760005b608051811215610506576801000000000000000082608051830201602002870151826080518602016020026103c051015102058260805185020160200285015101826080518502016020028501526001810190506104ad565b506001810190506104a0565b50600181019050610492565b819050905060005b848112156105525780602002820151816020026103c05101510381602002840152600181019050610526565b508160206040820352602060208203510260400160408203f350505050505b63232b273481141561069d57365990590160009052366004823760043560208201016106205260243560208201016102805260443560208201016103c052606435610640526084356101a05260a435608052506000610280515112156106025760005b6080518112156106005780602002610280510151600003816020026102805101526001810190506105d4565b505b60005b6101a05181121561067f5760005b60805181121561067357680100000000000000006801000000000000000082602002610280510151610640510205826080518502016020026103c05101510205826020026106205101510182602002610620510152600181019050610613565b50600181019050610605565b6106205160206040820352602060208203510260400160408203f350505b50"  # noqa: E501
+            ),
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stSpecialTest/test_deployment_error.py b/tests/ported_static/stSpecialTest/test_deployment_error.py
index 87e9206ec50..9cc8a073ac7 100644
--- a/tests/ported_static/stSpecialTest/test_deployment_error.py
+++ b/tests/ported_static/stSpecialTest/test_deployment_error.py
@@ -1,19 +1,20 @@
 """
-Test ported from static filler.
+Test_deployment_error.
 
 Ported from:
-tests/static/state_tests/stSpecialTest/deploymentErrorFiller.json
+state_tests/stSpecialTest/deploymentErrorFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -21,19 +22,16 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSpecialTest/deploymentErrorFiller.json"],
+    ["state_tests/stSpecialTest/deploymentErrorFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_deployment_error(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_deployment_error."""
+    coinbase = Address(0x68795C4AA09D6F4ED3E5DEDDF8C2AD3049A601DA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -44,139 +42,20 @@ def test_deployment_error(
         gas_limit=314159200,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "606060405260405160608061100383395060c06040525160805160a05160028054600160"  # noqa: E501
-            "a060020a031916909317909255600355600455610fbf806100446000396000f360606040"  # noqa: E501
-            "5236156100a35760e060020a60003504630a19b14a81146100ab578063278b8c0e146100"  # noqa: E501
-            "e25780632e1a7d4d14610111578063338b5dea1461012557806357786394146101505780"  # noqa: E501
-            "6365e17c9d146101595780636c86888b1461016b57806393f0bb51146101da5780639e28"  # noqa: E501
-            "1a9814610207578063c281309e14610232578063d0e30db01461023b578063f7888aec14"  # noqa: E501
-            "610287578063fb6e155f146102bb575b6103e6610002565b6103e6600435602435604435"  # noqa: E501
-            "60643560843560a43560c43560e435610104356101243561014435600060003411156104"  # noqa: E501
-            "2b57610002565b6103e660043560243560443560643560843560a43560c43560e4356101"  # noqa: E501
-            "0435600060003411156108b457610002565b6103e66004356000341115610ab357610002"  # noqa: E501
-            "565b6103e66004356024356000341180610146575081600160a060020a03166000145b15"  # noqa: E501
-            "610b6157610002565b6103e860035481565b6103fa600254600160a060020a031681565b"  # noqa: E501
-            "61041760043560243560443560643560843560a43560c43560e435610104356101243561"  # noqa: E501
-            "01443561016435600160a060020a038c8116600090815260208181526040808320938516"  # noqa: E501
-            "835292905290812054839010801590610c96575082610c938e8e8e8e8e8e8e8e8e8e6102"  # noqa: E501
-            "df565b6103e660043560243560443560643560843560a43560c43560e435610104356000"  # noqa: E501
-            "341115610ca457610002565b6103e66004356024356000341180610228575081600160a0"  # noqa: E501
-            "60020a03166000145b15610d3057610002565b6103e860045481565b6103e633600160a0"  # noqa: E501
-            "60020a03166000908152600080516020610f9f8339815191526020526040902054610ea3"  # noqa: E501
-            "90345b6000828201610f8f8482108015906102825750838210155b610660565b6103e860"  # noqa: E501
-            "0435602435600160a060020a038281166000908152602081815260408083209385168352"  # noqa: E501
-            "92905220545b92915050565b6103e860043560243560443560643560843560a43560c435"  # noqa: E501
-            "60e43561010435610124355b600060006000600060028e8e8e8e8e8e6040518087600160"  # noqa: E501
-            "a060020a0316606060020a02815260140186815260200185600160a060020a0316606060"  # noqa: E501
-            "020a02815260140184815260200183815260200182815260200196505050505050506020"  # noqa: E501
-            "604051808303816000866161da5a03f11561000257505060408051805160008281526020"  # noqa: E501
-            "83810180865283905260ff8c1684860152606084018b9052608084018a90529351919650"  # noqa: E501
-            "600160a060020a038c169360019360a0808201949293601f198401939283900390910191"  # noqa: E501
-            "90866161da5a03f11561000257505060206040510351600160a060020a03161480156103"  # noqa: E501
-            "d75750894311155b1515610f295760009350610f18565b005b6040805191825251908190"  # noqa: E501
-            "0360200190f35b60408051600160a060020a03929092168252519081900360200190f35b"  # noqa: E501
-            "604080519115158252519081900360200190f35b60028c8c8c8c8c8c6040518087600160"  # noqa: E501
-            "a060020a0316606060020a02815260140186815260200185600160a060020a0316606060"  # noqa: E501
-            "020a02815260140184815260200183815260200182815260200196505050505050506020"  # noqa: E501
-            "604051808303816000866161da5a03f11561000257505060408051805160008281526020"  # noqa: E501
-            "83810180865283905260ff8a168486015260608401899052608084018890529351919450"  # noqa: E501
-            "600160a060020a038a169360019360a0818101949293601f198401939283900390910191"  # noqa: E501
-            "90866161da5a03f11561000257505060206040510351600160a060020a03161480156105"  # noqa: E501
-            "1b5750874311155b801561054057506000818152600160205260409020548b9061053d90"  # noqa: E501
-            "8461026a565b11155b80156105715750600160a060020a038c8116600090815260208181"  # noqa: E501
-            "5260408083203390941683529290522054829010155b80156105b457508a6105838a8461"  # noqa: E501
-            "060a565b811561000257600160a060020a038c8116600090815260208181526040808320"  # noqa: E501
-            "938c16835292905220549190049010155b151561062b57610002565b600160a060020a03"  # noqa: E501
-            "8d8116600090815260208181526040808320338516845290915280822093909355908816"  # noqa: E501
-            "8152205460035461066c9190670de0b6b3a7640000906106bc90869083035b6000828202"  # noqa: E501
-            "610f8f8483148061028257508385838115610002570414610660565b600160a060020a03"  # noqa: E501
-            "8c811660009081526020818152604080832033909416835292905220546105bf90835b60"  # noqa: E501
-            "00610f96838311155b801515610ab057610002565b600160a060020a038d811660009081"  # noqa: E501
-            "52602081815260408083208b851684529091528082209390935560025490911681522054"  # noqa: E501
-            "6003546106c89190670de0b6b3a7640000906106bc90869061060a565b81156100025704"  # noqa: E501
-            "61026a565b600160a060020a038d81166000908152602081815260408083206002548516"  # noqa: E501
-            "84528252808320949094558d83168252818152838220928a168252919091522054610717"  # noqa: E501
-            "908c61076c8c8661060a565b600160a060020a038b811660009081526020818152604080"  # noqa: E501
-            "83208b851684529091528082209390935533909116815220546004546107789190670de0"  # noqa: E501
-            "b6b3a7640000908e906107cd906107e09084038f61060a565b8115610002570461065656"  # noqa: E501
-            "5b600160a060020a038b8116600090815260208181526040808320338516845290915280"  # noqa: E501
-            "822093909355600254909116815220546004546107e69190670de0b6b3a7640000908e90"  # noqa: E501
-            "6107cd906107e0908f61060a565b811561000257048115610002570461026a565b876106"  # noqa: E501
-            "0a565b600160a060020a038b811660009081526020818152604080832060025490941683"  # noqa: E501
-            "52928152828220939093558381526001909252902054610827908361026a565b60008281"  # noqa: E501
-            "52600160205260409020557f6effdda786735d5033bfad5f53e5131abcced9e52be6c507"  # noqa: E501
-            "b62d639685fbed6d8c838c8e8d830281156100025760408051600160a060020a03968716"  # noqa: E501
-            "815260208101959095529285168484015204606083015289831660808301523390921660"  # noqa: E501
-            "a082015290519081900360c00190a1505050505050505050505050565b60028a8a8a8a8a"  # noqa: E501
-            "8a6040518087600160a060020a0316606060020a02815260140186815260200185600160"  # noqa: E501
-            "a060020a0316606060020a02815260140184815260200183815260200182815260200196"  # noqa: E501
-            "505050505050506020604051808303816000866161da5a03f11561000257505060408051"  # noqa: E501
-            "80516000828152602083810180865283905260ff89168486015260608401889052608084"  # noqa: E501
-            "01879052935191945033600160a060020a03169360019360a0818101949293601f198401"  # noqa: E501
-            "93928390039091019190866161da5a03f115610002575050604051601f190151600160a0"  # noqa: E501
-            "60020a0316146109a257610002565b6000818152600160209081526040918290208b9055"  # noqa: E501
-            "8151600160a060020a038d811682529181018c90528a821681840152606081018a905260"  # noqa: E501
-            "80810189905260a081018890523390911660c082015260ff861660e08201526101008101"  # noqa: E501
-            "859052610120810184905290517f1e0b760c386003e9cb9bcf4fcf3997886042859d9b6e"  # noqa: E501
-            "d6320e804597fcdb28b0918190036101400190a150505050505050505050565b33600160"  # noqa: E501
-            "a060020a03166000818152600080516020610f9f83398151915260209081526040808320"  # noqa: E501
-            "54815193845291830193909352818301849052606082015290517ff341246adaac6f497b"  # noqa: E501
-            "c2a656f546ab9e182111d630394f0c57c710a59a2cb5679181900360800190a15b50565b"  # noqa: E501
-            "33600160a060020a03166000908152600080516020610f9f833981519152602052604090"  # noqa: E501
-            "205481901015610ae657610002565b33600160a060020a03166000908152600080516020"  # noqa: E501
-            "610f9f8339815191526020526040902054610b169082610656565b33600160a060020a03"  # noqa: E501
-            "166000818152600080516020610f9f833981519152602052604080822093909355915190"  # noqa: E501
-            "9183919081818185876185025a03f1925050501515610a4357610002565b81600160a060"  # noqa: E501
-            "020a03166323b872dd3330846040518460e060020a0281526004018084600160a060020a"  # noqa: E501
-            "0316815260200183600160a060020a031681526020018281526020019350505050602060"  # noqa: E501
-            "405180830381600087803b15610002576161da5a03f11561000257505060405151151590"  # noqa: E501
-            "50610bdd57610002565b600160a060020a03828116600090815260208181526040808320"  # noqa: E501
-            "3390941683529290522054610c0c908261026a565b600160a060020a0383811660008181"  # noqa: E501
-            "526020818152604080832033909516808452948252918290208590558151928352820192"  # noqa: E501
-            "9092528082018490526060810192909252517fdcbc1c05240f31ff3ad067ef1ee35ce499"  # noqa: E501
-            "7762752e3a095284754544f4c709d79181900360800190a15050565b5060015b9c9b5050"  # noqa: E501
-            "50505050505050505050565b10155b1515610c7f57506000610c83565b60408051600160"  # noqa: E501
-            "a060020a038b81168252602082018b905289811682840152606082018990526080820188"  # noqa: E501
-            "905260a08201879052331660c082015260ff851660e08201526101008101849052610120"  # noqa: E501
-            "810183905290517f91daf02b6d1454acd74c097a67e389a9d9371da3ff51366947022dc3"  # noqa: E501
-            "6748ce4d918190036101400190a1505050505050505050565b600160a060020a03828116"  # noqa: E501
-            "600090815260208181526040808320339094168352929052205481901015610d62576100"  # noqa: E501
-            "02565b600160a060020a0382811660009081526020818152604080832033909416835292"  # noqa: E501
-            "90522054610d919082610656565b600160a060020a038381166000818152602081815260"  # noqa: E501
-            "40808320339095168084529482528083209590955584517fa9059cbb0000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000081526004810194909452602484018690"  # noqa: E501
-            "529351919363a9059cbb936044818101949293918390030190829087803b156100025761"  # noqa: E501
-            "61da5a03f1156100025750506040515115159050610e3057610002565b600160a060020a"  # noqa: E501
-            "038281166000818152602081815260408083203390951680845294825291829020548251"  # noqa: E501
-            "93845290830193909352818101849052606082019290925290517ff341246adaac6f497b"  # noqa: E501
-            "c2a656f546ab9e182111d630394f0c57c710a59a2cb5679181900360800190a15050565b"  # noqa: E501
-            "33600160a060020a03166000818152600080516020610f9f833981519152602090815260"  # noqa: E501
-            "4080832085905580519283529082019290925234818301526060810192909252517fdcbc"  # noqa: E501
-            "1c05240f31ff3ad067ef1ee35ce4997762752e3a095284754544f4c709d7918190036080"  # noqa: E501
-            "0190a1565b8093505b5050509a9950505050505050505050565b60008381526001602052"  # noqa: E501
-            "6040902054610f43908e90610656565b600160a060020a038d8116600090815260208181"  # noqa: E501
-            "526040808320938d16835292905220549092508b90610f76908f61060a565b8115610002"  # noqa: E501
-            "5704905080821015610f1457819350610f18565b9392505050565b508082036102b556ad"  # noqa: E501
-            "3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb50000000000"  # noqa: E501
-            "000000000000001ed014aec47fae44c9e55bac7662c0b78ae61798000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000aa87bee538000"
+        data=Bytes(
+            "606060405260405160608061100383395060c06040525160805160a05160028054600160a060020a031916909317909255600355600455610fbf806100446000396000f3606060405236156100a35760e060020a60003504630a19b14a81146100ab578063278b8c0e146100e25780632e1a7d4d14610111578063338b5dea14610125578063577863941461015057806365e17c9d146101595780636c86888b1461016b57806393f0bb51146101da5780639e281a9814610207578063c281309e14610232578063d0e30db01461023b578063f7888aec14610287578063fb6e155f146102bb575b6103e6610002565b6103e660043560243560443560643560843560a43560c43560e4356101043561012435610144356000600034111561042b57610002565b6103e660043560243560443560643560843560a43560c43560e43561010435600060003411156108b457610002565b6103e66004356000341115610ab357610002565b6103e66004356024356000341180610146575081600160a060020a03166000145b15610b6157610002565b6103e860035481565b6103fa600254600160a060020a031681565b61041760043560243560443560643560843560a43560c43560e43561010435610124356101443561016435600160a060020a038c8116600090815260208181526040808320938516835292905290812054839010801590610c96575082610c938e8e8e8e8e8e8e8e8e8e6102df565b6103e660043560243560443560643560843560a43560c43560e435610104356000341115610ca457610002565b6103e66004356024356000341180610228575081600160a060020a03166000145b15610d3057610002565b6103e860045481565b6103e633600160a060020a03166000908152600080516020610f9f8339815191526020526040902054610ea390345b6000828201610f8f8482108015906102825750838210155b610660565b6103e8600435602435600160a060020a03828116600090815260208181526040808320938516835292905220545b92915050565b6103e860043560243560443560643560843560a43560c43560e43561010435610124355b600060006000600060028e8e8e8e8e8e6040518087600160a060020a0316606060020a02815260140186815260200185600160a060020a0316606060020a02815260140184815260200183815260200182815260200196505050505050506020604051808303816000866161da5a03f1156100025750506040805180516000828152602083810180865283905260ff8c1684860152606084018b9052608084018a90529351919650600160a060020a038c169360019360a0808201949293601f19840193928390039091019190866161da5a03f11561000257505060206040510351600160a060020a03161480156103d75750894311155b1515610f295760009350610f18565b005b60408051918252519081900360200190f35b60408051600160a060020a03929092168252519081900360200190f35b604080519115158252519081900360200190f35b60028c8c8c8c8c8c6040518087600160a060020a0316606060020a02815260140186815260200185600160a060020a0316606060020a02815260140184815260200183815260200182815260200196505050505050506020604051808303816000866161da5a03f1156100025750506040805180516000828152602083810180865283905260ff8a168486015260608401899052608084018890529351919450600160a060020a038a169360019360a0818101949293601f19840193928390039091019190866161da5a03f11561000257505060206040510351600160a060020a031614801561051b5750874311155b801561054057506000818152600160205260409020548b9061053d908461026a565b11155b80156105715750600160a060020a038c81166000908152602081815260408083203390941683529290522054829010155b80156105b457508a6105838a8461060a565b811561000257600160a060020a038c8116600090815260208181526040808320938c16835292905220549190049010155b151561062b57610002565b600160a060020a038d81166000908152602081815260408083203385168452909152808220939093559088168152205460035461066c9190670de0b6b3a7640000906106bc90869083035b6000828202610f8f8483148061028257508385838115610002570414610660565b600160a060020a038c811660009081526020818152604080832033909416835292905220546105bf90835b6000610f96838311155b801515610ab057610002565b600160a060020a038d81166000908152602081815260408083208b8516845290915280822093909355600254909116815220546003546106c89190670de0b6b3a7640000906106bc90869061060a565b8115610002570461026a565b600160a060020a038d8116600090815260208181526040808320600254851684528252808320949094558d83168252818152838220928a168252919091522054610717908c61076c8c8661060a565b600160a060020a038b81166000908152602081815260408083208b851684529091528082209390935533909116815220546004546107789190670de0b6b3a7640000908e906107cd906107e09084038f61060a565b81156100025704610656565b600160a060020a038b8116600090815260208181526040808320338516845290915280822093909355600254909116815220546004546107e69190670de0b6b3a7640000908e906107cd906107e0908f61060a565b811561000257048115610002570461026a565b8761060a565b600160a060020a038b81166000908152602081815260408083206002549094168352928152828220939093558381526001909252902054610827908361026a565b6000828152600160205260409020557f6effdda786735d5033bfad5f53e5131abcced9e52be6c507b62d639685fbed6d8c838c8e8d830281156100025760408051600160a060020a03968716815260208101959095529285168484015204606083015289831660808301523390921660a082015290519081900360c00190a1505050505050505050505050565b60028a8a8a8a8a8a6040518087600160a060020a0316606060020a02815260140186815260200185600160a060020a0316606060020a02815260140184815260200183815260200182815260200196505050505050506020604051808303816000866161da5a03f1156100025750506040805180516000828152602083810180865283905260ff8916848601526060840188905260808401879052935191945033600160a060020a03169360019360a0818101949293601f19840193928390039091019190866161da5a03f115610002575050604051601f190151600160a060020a0316146109a257610002565b6000818152600160209081526040918290208b90558151600160a060020a038d811682529181018c90528a821681840152606081018a90526080810189905260a081018890523390911660c082015260ff861660e08201526101008101859052610120810184905290517f1e0b760c386003e9cb9bcf4fcf3997886042859d9b6ed6320e804597fcdb28b0918190036101400190a150505050505050505050565b33600160a060020a03166000818152600080516020610f9f8339815191526020908152604080832054815193845291830193909352818301849052606082015290517ff341246adaac6f497bc2a656f546ab9e182111d630394f0c57c710a59a2cb5679181900360800190a15b50565b33600160a060020a03166000908152600080516020610f9f833981519152602052604090205481901015610ae657610002565b33600160a060020a03166000908152600080516020610f9f8339815191526020526040902054610b169082610656565b33600160a060020a03166000818152600080516020610f9f8339815191526020526040808220939093559151909183919081818185876185025a03f1925050501515610a4357610002565b81600160a060020a03166323b872dd3330846040518460e060020a0281526004018084600160a060020a0316815260200183600160a060020a031681526020018281526020019350505050602060405180830381600087803b15610002576161da5a03f1156100025750506040515115159050610bdd57610002565b600160a060020a038281166000908152602081815260408083203390941683529290522054610c0c908261026a565b600160a060020a03838116600081815260208181526040808320339095168084529482529182902085905581519283528201929092528082018490526060810192909252517fdcbc1c05240f31ff3ad067ef1ee35ce4997762752e3a095284754544f4c709d79181900360800190a15050565b5060015b9c9b505050505050505050505050565b10155b1515610c7f57506000610c83565b60408051600160a060020a038b81168252602082018b905289811682840152606082018990526080820188905260a08201879052331660c082015260ff851660e08201526101008101849052610120810183905290517f91daf02b6d1454acd74c097a67e389a9d9371da3ff51366947022dc36748ce4d918190036101400190a1505050505050505050565b600160a060020a03828116600090815260208181526040808320339094168352929052205481901015610d6257610002565b600160a060020a038281166000908152602081815260408083203390941683529290522054610d919082610656565b600160a060020a03838116600081815260208181526040808320339095168084529482528083209590955584517fa9059cbb0000000000000000000000000000000000000000000000000000000081526004810194909452602484018690529351919363a9059cbb936044818101949293918390030190829087803b15610002576161da5a03f1156100025750506040515115159050610e3057610002565b600160a060020a03828116600081815260208181526040808320339095168084529482529182902054825193845290830193909352818101849052606082019290925290517ff341246adaac6f497bc2a656f546ab9e182111d630394f0c57c710a59a2cb5679181900360800190a15050565b33600160a060020a03166000818152600080516020610f9f8339815191526020908152604080832085905580519283529082019290925234818301526060810192909252517fdcbc1c05240f31ff3ad067ef1ee35ce4997762752e3a095284754544f4c709d79181900360800190a1565b8093505b5050509a9950505050505050505050565b600083815260016020526040902054610f43908e90610656565b600160a060020a038d8116600090815260208181526040808320938d16835292905220549092508b90610f76908f61060a565b81156100025704905080821015610f1457819350610f18565b9392505050565b508082036102b556ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb50000000000000000000000001ed014aec47fae44c9e55bac7662c0b78ae617980000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aa87bee538000"  # noqa: E501
         ),
         gas_limit=5000000,
     )
 
     post = {
-        Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-            storage={
-                2: 0x1ED014AEC47FAE44C9E55BAC7662C0B78AE61798,
-                4: 0xAA87BEE538000,
-            },
+        compute_create_address(address=sender, nonce=0): Account(
+            code=bytes.fromhex(
+                "606060405236156100a35760e060020a60003504630a19b14a81146100ab578063278b8c0e146100e25780632e1a7d4d14610111578063338b5dea14610125578063577863941461015057806365e17c9d146101595780636c86888b1461016b57806393f0bb51146101da5780639e281a9814610207578063c281309e14610232578063d0e30db01461023b578063f7888aec14610287578063fb6e155f146102bb575b6103e6610002565b6103e660043560243560443560643560843560a43560c43560e4356101043561012435610144356000600034111561042b57610002565b6103e660043560243560443560643560843560a43560c43560e43561010435600060003411156108b457610002565b6103e66004356000341115610ab357610002565b6103e66004356024356000341180610146575081600160a060020a03166000145b15610b6157610002565b6103e860035481565b6103fa600254600160a060020a031681565b61041760043560243560443560643560843560a43560c43560e43561010435610124356101443561016435600160a060020a038c8116600090815260208181526040808320938516835292905290812054839010801590610c96575082610c938e8e8e8e8e8e8e8e8e8e6102df565b6103e660043560243560443560643560843560a43560c43560e435610104356000341115610ca457610002565b6103e66004356024356000341180610228575081600160a060020a03166000145b15610d3057610002565b6103e860045481565b6103e633600160a060020a03166000908152600080516020610f9f8339815191526020526040902054610ea390345b6000828201610f8f8482108015906102825750838210155b610660565b6103e8600435602435600160a060020a03828116600090815260208181526040808320938516835292905220545b92915050565b6103e860043560243560443560643560843560a43560c43560e43561010435610124355b600060006000600060028e8e8e8e8e8e6040518087600160a060020a0316606060020a02815260140186815260200185600160a060020a0316606060020a02815260140184815260200183815260200182815260200196505050505050506020604051808303816000866161da5a03f1156100025750506040805180516000828152602083810180865283905260ff8c1684860152606084018b9052608084018a90529351919650600160a060020a038c169360019360a0808201949293601f19840193928390039091019190866161da5a03f11561000257505060206040510351600160a060020a03161480156103d75750894311155b1515610f295760009350610f18565b005b60408051918252519081900360200190f35b60408051600160a060020a03929092168252519081900360200190f35b604080519115158252519081900360200190f35b60028c8c8c8c8c8c6040518087600160a060020a0316606060020a02815260140186815260200185600160a060020a0316606060020a02815260140184815260200183815260200182815260200196505050505050506020604051808303816000866161da5a03f1156100025750506040805180516000828152602083810180865283905260ff8a168486015260608401899052608084018890529351919450600160a060020a038a169360019360a0818101949293601f19840193928390039091019190866161da5a03f11561000257505060206040510351600160a060020a031614801561051b5750874311155b801561054057506000818152600160205260409020548b9061053d908461026a565b11155b80156105715750600160a060020a038c81166000908152602081815260408083203390941683529290522054829010155b80156105b457508a6105838a8461060a565b811561000257600160a060020a038c8116600090815260208181526040808320938c16835292905220549190049010155b151561062b57610002565b600160a060020a038d81166000908152602081815260408083203385168452909152808220939093559088168152205460035461066c9190670de0b6b3a7640000906106bc90869083035b6000828202610f8f8483148061028257508385838115610002570414610660565b600160a060020a038c811660009081526020818152604080832033909416835292905220546105bf90835b6000610f96838311155b801515610ab057610002565b600160a060020a038d81166000908152602081815260408083208b8516845290915280822093909355600254909116815220546003546106c89190670de0b6b3a7640000906106bc90869061060a565b8115610002570461026a565b600160a060020a038d8116600090815260208181526040808320600254851684528252808320949094558d83168252818152838220928a168252919091522054610717908c61076c8c8661060a565b600160a060020a038b81166000908152602081815260408083208b851684529091528082209390935533909116815220546004546107789190670de0b6b3a7640000908e906107cd906107e09084038f61060a565b81156100025704610656565b600160a060020a038b8116600090815260208181526040808320338516845290915280822093909355600254909116815220546004546107e69190670de0b6b3a7640000908e906107cd906107e0908f61060a565b811561000257048115610002570461026a565b8761060a565b600160a060020a038b81166000908152602081815260408083206002549094168352928152828220939093558381526001909252902054610827908361026a565b6000828152600160205260409020557f6effdda786735d5033bfad5f53e5131abcced9e52be6c507b62d639685fbed6d8c838c8e8d830281156100025760408051600160a060020a03968716815260208101959095529285168484015204606083015289831660808301523390921660a082015290519081900360c00190a1505050505050505050505050565b60028a8a8a8a8a8a6040518087600160a060020a0316606060020a02815260140186815260200185600160a060020a0316606060020a02815260140184815260200183815260200182815260200196505050505050506020604051808303816000866161da5a03f1156100025750506040805180516000828152602083810180865283905260ff8916848601526060840188905260808401879052935191945033600160a060020a03169360019360a0818101949293601f19840193928390039091019190866161da5a03f115610002575050604051601f190151600160a060020a0316146109a257610002565b6000818152600160209081526040918290208b90558151600160a060020a038d811682529181018c90528a821681840152606081018a90526080810189905260a081018890523390911660c082015260ff861660e08201526101008101859052610120810184905290517f1e0b760c386003e9cb9bcf4fcf3997886042859d9b6ed6320e804597fcdb28b0918190036101400190a150505050505050505050565b33600160a060020a03166000818152600080516020610f9f8339815191526020908152604080832054815193845291830193909352818301849052606082015290517ff341246adaac6f497bc2a656f546ab9e182111d630394f0c57c710a59a2cb5679181900360800190a15b50565b33600160a060020a03166000908152600080516020610f9f833981519152602052604090205481901015610ae657610002565b33600160a060020a03166000908152600080516020610f9f8339815191526020526040902054610b169082610656565b33600160a060020a03166000818152600080516020610f9f8339815191526020526040808220939093559151909183919081818185876185025a03f1925050501515610a4357610002565b81600160a060020a03166323b872dd3330846040518460e060020a0281526004018084600160a060020a0316815260200183600160a060020a031681526020018281526020019350505050602060405180830381600087803b15610002576161da5a03f1156100025750506040515115159050610bdd57610002565b600160a060020a038281166000908152602081815260408083203390941683529290522054610c0c908261026a565b600160a060020a03838116600081815260208181526040808320339095168084529482529182902085905581519283528201929092528082018490526060810192909252517fdcbc1c05240f31ff3ad067ef1ee35ce4997762752e3a095284754544f4c709d79181900360800190a15050565b5060015b9c9b505050505050505050505050565b10155b1515610c7f57506000610c83565b60408051600160a060020a038b81168252602082018b905289811682840152606082018990526080820188905260a08201879052331660c082015260ff851660e08201526101008101849052610120810183905290517f91daf02b6d1454acd74c097a67e389a9d9371da3ff51366947022dc36748ce4d918190036101400190a1505050505050505050565b600160a060020a03828116600090815260208181526040808320339094168352929052205481901015610d6257610002565b600160a060020a038281166000908152602081815260408083203390941683529290522054610d919082610656565b600160a060020a03838116600081815260208181526040808320339095168084529482528083209590955584517fa9059cbb0000000000000000000000000000000000000000000000000000000081526004810194909452602484018690529351919363a9059cbb936044818101949293918390030190829087803b15610002576161da5a03f1156100025750506040515115159050610e3057610002565b600160a060020a03828116600081815260208181526040808320339095168084529482529182902054825193845290830193909352818101849052606082019290925290517ff341246adaac6f497bc2a656f546ab9e182111d630394f0c57c710a59a2cb5679181900360800190a15050565b33600160a060020a03166000818152600080516020610f9f8339815191526020908152604080832085905580519283529082019290925234818301526060810192909252517fdcbc1c05240f31ff3ad067ef1ee35ce4997762752e3a095284754544f4c709d79181900360800190a1565b8093505b5050509a9950505050505050505050565b600083815260016020526040902054610f43908e90610656565b600160a060020a038d8116600090815260208181526040808320938d16835292905220549092508b90610f76908f61060a565b81156100025704905080821015610f1457819350610f18565b9392505050565b508082036102b556ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5"  # noqa: E501
+            ),
         ),
     }
 
diff --git a/tests/ported_static/stSpecialTest/test_eoa_empty_paris.py b/tests/ported_static/stSpecialTest/test_eoa_empty_paris.py
index 1491418b02e..5c93c366823 100644
--- a/tests/ported_static/stSpecialTest/test_eoa_empty_paris.py
+++ b/tests/ported_static/stSpecialTest/test_eoa_empty_paris.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_eoa_empty_paris.
 
 Ported from:
-tests/static/state_tests/stSpecialTest/eoaEmptyParisFiller.yml
+state_tests/stSpecialTest/eoaEmptyParisFiller.yml
 """
 
 import pytest
@@ -11,11 +11,17 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
     TransactionException,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,183 +29,61 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSpecialTest/eoaEmptyParisFiller.yml"],
+    ["state_tests/stSpecialTest/eoaEmptyParisFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, tx_value, tx_error, expected_post",
+    "d, g, v",
     [
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            10000000,
             0,
-            None,
-            {
-                Address("0x000000000000000000000000000000000000bad4"): Account(
-                    storage={57005: 48879}
-                ),
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={
-                        0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        63: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        241: 118,
-                        255: 7626,
-                        47825: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47826: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47827: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47828: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                    }
-                ),
-            },
-            id="case0",
+            0,
+            0,
+            id="d0-g0-v0",
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            10000000,
-            100,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            {
-                Address("0x000000000000000000000000000000000000bad4"): Account(
-                    storage={57005: 48879}
-                )
-            },
-            id="case1",
+            0,
+            0,
+            1,
+            id="d0-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            9999999,
             0,
-            None,
-            {
-                Address("0x000000000000000000000000000000000000bad4"): Account(
-                    storage={57005: 48879}
-                ),
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={
-                        0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        49: 100,
-                        63: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        241: 118,
-                        255: 7626,
-                        47825: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47826: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47827: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47828: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                    }
-                ),
-            },
-            id="case2",
+            1,
+            0,
+            id="d0-g1-v0",
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            9999999,
-            100,
-            None,
-            {
-                Address("0x000000000000000000000000000000000000bad4"): Account(
-                    storage={57005: 48879}
-                ),
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={
-                        0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        63: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        241: 118,
-                        255: 7626,
-                        47825: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47826: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47827: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47828: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                    }
-                ),
-            },
-            id="case3",
+            0,
+            1,
+            1,
+            id="d0-g1-v1",
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            10000000,
+            1,
             0,
-            None,
-            {
-                Address("0x000000000000000000000000000000000000bad4"): Account(
-                    storage={57005: 48879}
-                ),
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={
-                        0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        63: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        241: 6818,
-                        255: 7626,
-                        47825: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47826: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47827: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47828: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                    }
-                ),
-            },
-            id="case4",
+            0,
+            id="d1-g0-v0",
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            10000000,
-            100,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            {
-                Address("0x000000000000000000000000000000000000bad4"): Account(
-                    storage={57005: 48879}
-                )
-            },
-            id="case5",
+            1,
+            0,
+            1,
+            id="d1-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            9999999,
+            1,
+            1,
             0,
-            None,
-            {
-                Address("0x000000000000000000000000000000000000bad4"): Account(
-                    storage={57005: 48879}
-                ),
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={
-                        0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        49: 100,
-                        63: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        241: 6818,
-                        255: 7626,
-                        47825: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47826: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47827: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47828: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                    }
-                ),
-            },
-            id="case6",
+            id="d1-g1-v0",
         ),
         pytest.param(
-            "693c61390000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            9999999,
-            100,
-            None,
-            {
-                Address("0x000000000000000000000000000000000000bad4"): Account(
-                    storage={57005: 48879}
-                ),
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={
-                        0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        63: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        241: 6818,
-                        255: 7626,
-                        47825: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47826: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47827: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                        47828: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
-                    }
-                ),
-            },
-            id="case7",
+            1,
+            1,
+            1,
+            id="d1-g1-v1",
         ),
     ],
 )
@@ -207,21 +91,22 @@
 def test_eoa_empty_paris(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    tx_value: int,
-    tx_error: object,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_eoa_empty_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x000000000000000000000000000000000000BAD1)
+    contract_1 = Address(0x000000000000000000000000000000000000BAD2)
+    contract_2 = Address(0x000000000000000000000000000000000000BAD3)
+    contract_3 = Address(0x000000000000000000000000000000000000BAD4)
+    contract_4 = Address(0x000000000000000000000000000000000000DEAD)
+    contract_5 = Address(0x000000000000000000000000000000000000C0DE)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
-    callee = Address("0x000000000000000000000000000000000000bad1")
-    callee_1 = Address("0x000000000000000000000000000000000000bad2")
-    callee_2 = Address("0x000000000000000000000000000000000000bad3")
-    callee_3 = Address("0x000000000000000000000000000000000000bad4")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -232,11 +117,52 @@ def test_eoa_empty_paris(
         gas_limit=89128960,
     )
 
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=0, nonce=1)
-    pre[callee_2] = Account(balance=1, nonce=1)
-    pre[callee_3] = Account(balance=10, nonce=0, storage={0xDEAD: 0xBEEF})
-    # Source: Yul
+    pre[sender] = Account(balance=0x3B9ACA00)
+    # Source: hex
+    # 0x
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000BAD1),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code="",
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000BAD2),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=1,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000BAD3),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code="",
+        storage={57005: 48879},
+        balance=10,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000BAD4),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
+    # {
+    #    selfdestruct(origin())
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=Op.ORIGIN),
+        balance=10000,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000DEAD),  # noqa: E501
+    )
+    # Source: yul
+    # berlin
     # {
     #    let eoa := origin()   // external owner account
     #    sstore(0, eoa)
@@ -260,77 +186,211 @@ def test_eoa_empty_paris(
     #    pop(call(gas(), 0xDEAD, 0, 0, 0, 0, 0))
     #    sstore(0xFF, sub(gas0, gas()))
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.ORIGIN
-            + Op.SSTORE(key=0x0, value=Op.DUP1)
-            + Op.SSTORE(key=0x31, value=Op.BALANCE(address=Op.DUP1))
-            + Op.SSTORE(key=0x3B, value=Op.EXTCODESIZE(address=Op.DUP1))
-            + Op.SSTORE(key=0x3F, value=Op.EXTCODEHASH(address=Op.DUP1))
-            + Op.SSTORE(
-                key=0x13F,
-                value=Op.EXTCODEHASH(address=Op.ADD(Op.DUP2, 0x1)),
-            )
-            + Op.SSTORE(key=0xBAD1, value=Op.EXTCODEHASH(address=0xBAD1))
-            + Op.SSTORE(key=0xBAD2, value=Op.EXTCODEHASH(address=0xBAD2))
-            + Op.SSTORE(key=0xBAD3, value=Op.EXTCODEHASH(address=0xBAD3))
-            + Op.SSTORE(key=0xBAD4, value=Op.EXTCODEHASH(address=0xBAD4))
-            + Op.SSTORE(key=0xBAD5, value=Op.EXTCODEHASH(address=0xBAD5))
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.GAS
-            + Op.SWAP5
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.SWAP1
-            + Op.GAS
-            + Op.POP(Op.CALL)
-            + Op.GAS
-            + Op.SWAP1
-            + Op.SSTORE(key=0xF1, value=Op.SUB)
-            + Op.GAS
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEAD,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.ORIGIN
+        + Op.SSTORE(key=0x0, value=Op.DUP1)
+        + Op.SSTORE(key=0x31, value=Op.BALANCE(address=Op.DUP1))
+        + Op.SSTORE(key=0x3B, value=Op.EXTCODESIZE(address=Op.DUP1))
+        + Op.SSTORE(key=0x3F, value=Op.EXTCODEHASH(address=Op.DUP1))
+        + Op.SSTORE(
+            key=0x13F, value=Op.EXTCODEHASH(address=Op.ADD(Op.DUP2, 0x1))
+        )
+        + Op.SSTORE(key=0xBAD1, value=Op.EXTCODEHASH(address=0xBAD1))
+        + Op.SSTORE(key=0xBAD2, value=Op.EXTCODEHASH(address=0xBAD2))
+        + Op.SSTORE(key=0xBAD3, value=Op.EXTCODEHASH(address=0xBAD3))
+        + Op.SSTORE(key=0xBAD4, value=Op.EXTCODEHASH(address=0xBAD4))
+        + Op.SSTORE(key=0xBAD5, value=Op.EXTCODEHASH(address=0xBAD5))
+        + Op.PUSH1[0x0]
+        + Op.DUP1 * 3
+        + Op.GAS
+        + Op.SWAP5
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.SWAP1
+        + Op.GAS
+        + Op.POP(Op.CALL)
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SSTORE(key=0xF1, value=Op.SUB)
+        + Op.GAS
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEAD,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.SWAP1
-            + Op.SSTORE(key=0xFF, value=Op.SUB)
-            + Op.STOP
-        ),
-        address=Address("0x000000000000000000000000000000000000c0de"),  # noqa: E501
+        )
+        + Op.GAS
+        + Op.SWAP1
+        + Op.SSTORE(key=0xFF, value=Op.SUB)
+        + Op.STOP,
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000C0DE),  # noqa: E501
     )
-    # Source: Yul
-    # {
-    #    selfdestruct(origin())
-    # }
-    pre.deploy_contract(
-        code=Op.SELFDESTRUCT(address=Op.ORIGIN),
-        balance=0x2710,
-        address=Address("0x000000000000000000000000000000000000dead"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x3B9ACA00)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": 0, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_5: Account(
+                    storage={
+                        0: sender,
+                        49: 0,
+                        59: 0,
+                        63: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        241: 118,
+                        255: 7626,
+                        319: 0,
+                        47825: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47826: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47827: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47828: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 0, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_5: Account(
+                    storage={
+                        0: sender,
+                        49: 0,
+                        59: 0,
+                        63: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        241: 6818,
+                        255: 7626,
+                        319: 0,
+                        47825: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47826: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47827: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47828: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": 1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INSUFFICIENT_ACCOUNT_FUNDS
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": 1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_5: Account(
+                    storage={
+                        0: sender,
+                        49: 100,
+                        59: 0,
+                        63: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        241: 118,
+                        255: 7626,
+                        319: 0,
+                        47825: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47826: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47827: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47828: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_5: Account(
+                    storage={
+                        0: sender,
+                        49: 100,
+                        59: 0,
+                        63: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        241: 6818,
+                        255: 7626,
+                        319: 0,
+                        47825: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47826: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47827: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47828: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": 1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_5: Account(
+                    storage={
+                        0: sender,
+                        49: 0,
+                        59: 0,
+                        63: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        241: 118,
+                        255: 7626,
+                        319: 0,
+                        47825: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47826: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47827: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47828: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_5: Account(
+                    storage={
+                        0: sender,
+                        49: 0,
+                        59: 0,
+                        63: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        241: 6818,
+                        255: 7626,
+                        319: 0,
+                        47825: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47826: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47827: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                        47828: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+    ]
+    tx_gas = [10000000, 9999999]
+    tx_value = [0, 100]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
+        to=contract_5,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
         gas_price=100,
-        value=tx_value,
-        error=tx_error,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSpecialTest/test_failed_create_reverts_deletion_paris.py b/tests/ported_static/stSpecialTest/test_failed_create_reverts_deletion_paris.py
index ce73a832a6a..cb4da7c841c 100644
--- a/tests/ported_static/stSpecialTest/test_failed_create_reverts_deletion_paris.py
+++ b/tests/ported_static/stSpecialTest/test_failed_create_reverts_deletion_paris.py
@@ -2,8 +2,7 @@
 A modification of stRevertTests/RevertInCreateInInit.  That test, for...
 
 Ported from:
-tests/static/state_tests/stSpecialTest
-FailedCreateRevertsDeletionParisFiller.json
+state_tests/stSpecialTest/FailedCreateRevertsDeletionParisFiller.json
 """
 
 import pytest
@@ -16,15 +15,14 @@
     StateTestFiller,
     Transaction,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSpecialTest/FailedCreateRevertsDeletionParisFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSpecialTest/FailedCreateRevertsDeletionParisFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,12 +30,12 @@ def test_failed_create_reverts_deletion_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """A modification of stRevertTests/RevertInCreateInInit.  That test,..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """A modification of stRevertTests/RevertInCreateInInit."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x834185262E53584684BF2B72C64E510013C235D0F45E462DB65900455DF45A35
     )
-    contract = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,20 +46,26 @@ def test_failed_create_reverts_deletion_paris(
         gas_limit=43218108416,
     )
 
-    pre[contract] = Account(balance=10, nonce=0, storage={0x0: 0x1})
+    pre[addr] = Account(balance=10, storage={0: 1})
     pre[sender] = Account(balance=0x6400000000)
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "3050600d80601360003960006000f050fe00fe6211223360005260206000fd00"
-        ),
+        data=Op.POP(Op.ADDRESS)
+        + Op.PUSH1[0xD]
+        + Op.CODECOPY(dest_offset=0x0, offset=0x13, size=Op.DUP1)
+        + Op.PUSH1[0x0] * 2
+        + Op.POP(Op.CREATE)
+        + Op.INVALID
+        + Op.STOP
+        + Op.INVALID
+        + Op.MSTORE(offset=0x0, value=0x112233)
+        + Op.REVERT(offset=0x0, size=0x20)
+        + Op.STOP,
         gas_limit=100000,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {addr: Account(storage={0: 1}, balance=10)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSpecialTest/test_failed_tx_xcf416c53_paris.py b/tests/ported_static/stSpecialTest/test_failed_tx_xcf416c53_paris.py
index 3460a4d9ce5..6eef9fc2104 100644
--- a/tests/ported_static/stSpecialTest/test_failed_tx_xcf416c53_paris.py
+++ b/tests/ported_static/stSpecialTest/test_failed_tx_xcf416c53_paris.py
@@ -1,17 +1,18 @@
 """
-Test ported from static filler.
+Test_failed_tx_xcf416c53_paris.
 
 Ported from:
-tests/static/state_tests/stSpecialTest/failed_tx_xcf416c53_ParisFiller.json
+state_tests/stSpecialTest/failed_tx_xcf416c53_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -22,204 +23,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSpecialTest/failed_tx_xcf416c53_ParisFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSpecialTest/failed_tx_xcf416c53_ParisFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_failed_tx_xcf416c53_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da")
-    sender = EOA(
-        key=0x0FF8D58222F34F6890DDAA468C023B77D6691ED7D3C4DCDDAE38336212FAF54B
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=200000000,
-    )
-
-    pre[callee] = Account(balance=10, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x65],
-                condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x97DD3054)),
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MLOAD(offset=0x40)
-            + Op.MLOAD(offset=0x60)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x62],
-                condition=Op.ISZERO(Op.SLT(Op.DUP3, Op.DUP1)),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=Op.DUP7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.ADD(Op.DUP3, 0x1)
-            + Op.SWAP2
-            + Op.POP
-            + Op.JUMP(pc=Op.PUSH2[0x40])
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-        ),
-        nonce=0,
-        address=Address("0x7e6e9b4ca1b88937abeaec23bc4b6986caf05188"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "97dd30540000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000002bc"
-        ),
-        gas_limit=16300000,
-        nonce=1,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSpecialTest/failed_tx_xcf416c53_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.valid_until("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_failed_tx_xcf416c53_paris_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da")
-    sender = EOA(
-        key=0x0FF8D58222F34F6890DDAA468C023B77D6691ED7D3C4DCDDAE38336212FAF54B
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=200000000,
-    )
-
-    pre[callee] = Account(balance=10, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x65],
-                condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x97DD3054)),
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MLOAD(offset=0x40)
-            + Op.MLOAD(offset=0x60)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x62],
-                condition=Op.ISZERO(Op.SLT(Op.DUP3, Op.DUP1)),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=Op.DUP7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.ADD(Op.DUP3, 0x1)
-            + Op.SWAP2
-            + Op.POP
-            + Op.JUMP(pc=Op.PUSH2[0x40])
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-        ),
-        nonce=0,
-        address=Address("0x7e6e9b4ca1b88937abeaec23bc4b6986caf05188"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "97dd30540000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000002bc"
-        ),
-        gas_limit=16300000,
-        nonce=1,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSpecialTest/failed_tx_xcf416c53_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.pre_alloc_mutable
-def test_failed_tx_xcf416c53_paris_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da")
-    sender = EOA(
-        key=0x0FF8D58222F34F6890DDAA468C023B77D6691ED7D3C4DCDDAE38336212FAF54B
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_failed_tx_xcf416c53_paris."""
+    coinbase = Address(0x68795C4AA09D6F4ED3E5DEDDF8C2AD3049A601DA)
+    addr = Address(0x0000000000000000000000000000000000000003)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -230,64 +45,58 @@ def test_failed_tx_xcf416c53_paris_from_osaka(
         gas_limit=200000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x65],
-                condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x97DD3054)),
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MLOAD(offset=0x40)
-            + Op.MLOAD(offset=0x60)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x62],
-                condition=Op.ISZERO(Op.SLT(Op.DUP3, Op.DUP1)),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=Op.DUP7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    pre[addr] = Account(balance=10)
+    # Source: raw
+    # 0x7c0100000000000000000000000000000000000000000000000000000000600035046397dd3054811415610065576004356040526024356060526040516060515b808212156100625760006000600060006000866000f150600182019150610040565b50505b50  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x65], condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x97DD3054))
+        )
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MLOAD(offset=0x40)
+        + Op.MLOAD(offset=0x60)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x62], condition=Op.ISZERO(Op.SLT(Op.DUP3, Op.DUP1))
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x0,
+                address=Op.DUP7,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.ADD(Op.DUP3, 0x1)
-            + Op.SWAP2
-            + Op.POP
-            + Op.JUMP(pc=Op.PUSH2[0x40])
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-        ),
+        )
+        + Op.ADD(Op.DUP3, 0x1)
+        + Op.SWAP2
+        + Op.POP
+        + Op.JUMP(pc=Op.PUSH2[0x40])
+        + Op.JUMPDEST
+        + Op.POP * 2
+        + Op.JUMPDEST
+        + Op.POP,
         nonce=0,
-        address=Address("0x7e6e9b4ca1b88937abeaec23bc4b6986caf05188"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "97dd30540000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000002bc"
-        ),
+        to=target,
+        data=Bytes("97dd3054") + Hash(0x0) + Hash(0x2BC),
         gas_limit=16300000,
         nonce=1,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=2),
+        addr: Account(balance=10),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSpecialTest/test_gas_price0.py b/tests/ported_static/stSpecialTest/test_gas_price0.py
index 3cf7b5a2bdc..4a0daeecfad 100644
--- a/tests/ported_static/stSpecialTest/test_gas_price0.py
+++ b/tests/ported_static/stSpecialTest/test_gas_price0.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_gas_price0.
 
 Ported from:
-tests/static/state_tests/stSpecialTest/gasPrice0Filler.json
+state_tests/stSpecialTest/gasPrice0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSpecialTest/gasPrice0Filler.json"],
+    ["state_tests/stSpecialTest/gasPrice0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_gas_price0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_gas_price0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,24 +43,22 @@ def test_gas_price0(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x6001600101600055
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=656192,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 2}),
-    }
+    post = {target: Account(storage={0: 2})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSpecialTest/test_jumpdest_attack.py b/tests/ported_static/stSpecialTest/test_jumpdest_attack.py
index 35f83a3b0e1..e57e316b083 100644
--- a/tests/ported_static/stSpecialTest/test_jumpdest_attack.py
+++ b/tests/ported_static/stSpecialTest/test_jumpdest_attack.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_jumpdest_attack.
 
 Ported from:
-tests/static/state_tests/stSpecialTest/JUMPDEST_AttackFiller.json
+state_tests/stSpecialTest/JUMPDEST_AttackFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSpecialTest/JUMPDEST_AttackFiller.json"],
+    ["state_tests/stSpecialTest/JUMPDEST_AttackFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_jumpdest_attack(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_jumpdest_attack."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,34 +44,32 @@ def test_jumpdest_attack(
         gas_limit=1000000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=Op.SUB(Op.GAS, 0xC350),
-                address=Op.ADDRESS,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-            + Op.JUMPDEST * 15000
-        ),
+    # Source: raw
+    # 0x600060006000600060003061c3505a03f1005b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=Op.SUB(Op.GAS, 0xC350),
+            address=Op.ADDRESS,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP
+        + Op.JUMPDEST * 15000,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbc04ef30ba9ea0f7ce4543bac777f6aad09a2096"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSpecialTest/test_jumpdest_attackwith_jump.py b/tests/ported_static/stSpecialTest/test_jumpdest_attackwith_jump.py
index 5f9b88a8fc5..e95a5175932 100644
--- a/tests/ported_static/stSpecialTest/test_jumpdest_attackwith_jump.py
+++ b/tests/ported_static/stSpecialTest/test_jumpdest_attackwith_jump.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_jumpdest_attackwith_jump.
 
 Ported from:
-tests/static/state_tests/stSpecialTest/JUMPDEST_AttackwithJumpFiller.json
+state_tests/stSpecialTest/JUMPDEST_AttackwithJumpFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSpecialTest/JUMPDEST_AttackwithJumpFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSpecialTest/JUMPDEST_AttackwithJumpFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -33,11 +31,9 @@ def test_jumpdest_attackwith_jump(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_jumpdest_attackwith_jump."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,36 +44,34 @@ def test_jumpdest_attackwith_jump(
         gas_limit=1000000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMP(pc=0x3)
-            + Op.JUMPDEST
-            + Op.CALL(
-                gas=Op.SUB(Op.GAS, 0xC350),
-                address=Op.ADDRESS,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-            + Op.JUMPDEST * 15000
-        ),
+    # Source: raw
+    # 0x6003565b600060006000600060003061c3505a03f1005b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMP(pc=0x3)
+        + Op.JUMPDEST
+        + Op.CALL(
+            gas=Op.SUB(Op.GAS, 0xC350),
+            address=Op.ADDRESS,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP
+        + Op.JUMPDEST * 15000,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3f9d62603c0d43765c8bc6ef623e68a4fc7d78eb"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSpecialTest/test_make_money.py b/tests/ported_static/stSpecialTest/test_make_money.py
index 332ea2194dd..9f0678d1dc0 100644
--- a/tests/ported_static/stSpecialTest/test_make_money.py
+++ b/tests/ported_static/stSpecialTest/test_make_money.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_make_money.
 
 Ported from:
-tests/static/state_tests/stSpecialTest/makeMoneyFiller.json
+state_tests/stSpecialTest/makeMoneyFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSpecialTest/makeMoneyFiller.json"],
+    ["state_tests/stSpecialTest/makeMoneyFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_make_money(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
-    )
+    """Test_make_money."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3B9ACA00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,54 +43,47 @@ def test_make_money(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { (MSTORE 0 0x601080600c6000396000f20060003554156009570060203560003555) (CALL 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffec <contract:0xaaaaaaaaace5edbc8e2a8697c15331677e6ebf0b> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x601080600C6000396000F20060003554156009570060203560003555,  # noqa: E501
-            )
-            + Op.CALL(
-                gas=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEC,  # noqa: E501
-                address=0x802EDCCF6CDE9162A05FD89CDFCD8DC4A230B978,
-                value=0x17,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x600160015532600255
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x2, value=Op.ORIGIN),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x56f6da36928bffd1fdb9eade8a5b8baffde0dea4"),  # noqa: E501
     )
-    # Source: raw bytecode
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1) + Op.SSTORE(key=0x2, value=Op.ORIGIN)
-        ),
+    # Source: lll
+    # { (MSTORE 0 0x601080600c6000396000f20060003554156009570060203560003555) (CALL 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffec <contract:0xaaaaaaaaace5edbc8e2a8697c15331677e6ebf0b> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x601080600C6000396000F20060003554156009570060203560003555,
+        )
+        + Op.CALL(
+            gas=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEC,  # noqa: E501
+            address=addr,
+            value=0x17,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x802edccf6cde9162a05fd89cdfcd8dc4a230b978"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3B9ACA00)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=228500,
         value=10,
     )
 
     post = {
-        callee: Account(
-            storage={
-                1: 1,
-                2: 0xC4A2CA1058DF329E5DA4755F9921DDAF05CBAA06,
-            },
-        ),
+        target: Account(balance=0xDE0B6B3A763FFF3),
+        sender: Account(balance=0x3B8F6A16),
+        addr: Account(balance=0xDE0B6B3A7640017),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSpecialTest/test_overflow_gas_make_money.py b/tests/ported_static/stSpecialTest/test_overflow_gas_make_money.py
index 6c3f2d0e918..8bdbfd8f863 100644
--- a/tests/ported_static/stSpecialTest/test_overflow_gas_make_money.py
+++ b/tests/ported_static/stSpecialTest/test_overflow_gas_make_money.py
@@ -2,15 +2,15 @@
 Apparently this test was testing theoretical issue occur when tr gas >...
 
 Ported from:
-tests/static/state_tests/stSpecialTest/OverflowGasMakeMoneyFiller.json
+state_tests/stSpecialTest/OverflowGasMakeMoneyFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -21,20 +21,16 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSpecialTest/OverflowGasMakeMoneyFiller.json"],
+    ["state_tests/stSpecialTest/OverflowGasMakeMoneyFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_overflow_gas_make_money(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """Apparently this test was testing theoretical issue occur when tr..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4C30106C229CD77A61E9EAB5FCEE11CC912BF94F785EE56F406817744BB6A074
-    )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x4FEC000000000139C)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,15 +41,14 @@ def test_overflow_gas_make_money(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0x4FEC000000000139C)
-
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),
+        data=Bytes(""),
         gas_limit=100000,
         value=501,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSpecialTest/test_push32without_byte.py b/tests/ported_static/stSpecialTest/test_push32without_byte.py
index b7e4e1c6472..86a780c0d8a 100644
--- a/tests/ported_static/stSpecialTest/test_push32without_byte.py
+++ b/tests/ported_static/stSpecialTest/test_push32without_byte.py
@@ -1,16 +1,16 @@
 """
-push expect 32 bytes. but we have only 10 byte.
+Push expect 32 bytes. but we have only 10 byte.
 
 Ported from:
-tests/static/state_tests/stSpecialTest/push32withoutByteFiller.json
+state_tests/stSpecialTest/push32withoutByteFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -21,7 +21,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSpecialTest/push32withoutByteFiller.json"],
+    ["state_tests/stSpecialTest/push32withoutByteFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -29,11 +29,9 @@ def test_push32without_byte(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Push expect 32 bytes. but we have only 10 byte."""
-    coinbase = Address("0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da")
-    sender = EOA(
-        key=0x043F683FF58B5310699989DD19A4E1439E5333E2E3445374F7BC1446BAEDDD80
-    )
+    """Push expect 32 bytes."""
+    coinbase = Address(0x68795C4AA09D6F4ED3E5DEDDF8C2AD3049A601DA)
+    sender = pre.fund_eoa(amount=0x8AC7230489E80000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -44,21 +42,21 @@ def test_push32without_byte(
         gas_limit=3141592,
     )
 
-    pre[sender] = Account(balance=0x8AC7230489E80000, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x7f11223344556677889910
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex("7f11223344556677889910"),
         nonce=0,
-        address=Address("0xc46ea1c1ad6c8ee63711d0377ef63e51c05d38a0"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=500000,
         nonce=1,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=2)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSpecialTest/test_selfdestruct_eip2929.py b/tests/ported_static/stSpecialTest/test_selfdestruct_eip2929.py
index d99e55dc96d..a899276c3c7 100644
--- a/tests/ported_static/stSpecialTest/test_selfdestruct_eip2929.py
+++ b/tests/ported_static/stSpecialTest/test_selfdestruct_eip2929.py
@@ -2,15 +2,15 @@
 Martin: @tkstanczak requested a state-test regarding selfdestructs in...
 
 Ported from:
-tests/static/state_tests/stSpecialTest/selfdestructEIP2929Filler.json
+state_tests/stSpecialTest/selfdestructEIP2929Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,21 +22,16 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSpecialTest/selfdestructEIP2929Filler.json"],
+    ["state_tests/stSpecialTest/selfdestructEIP2929Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_selfdestruct_eip2929(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Martin: @tkstanczak requested a state-test regarding..."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
-    callee = Address("0x7704d8a022a1ba8f3539fc82c7d7fb065abc0df3")
-    callee_1 = Address("0x9ecbdbdbd8448cdd955755cdd81d6918e436f68a")
+    """Martin: @tkstanczak requested a state-test regarding selfdestructs..."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,228 +42,224 @@ def test_selfdestruct_eip2929(
         gas_limit=10944489199640098,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre[callee] = Account(balance=0, nonce=1)
-    pre[callee_1] = Account(balance=0, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=0xCC,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    addr = pre.fund_eoa(amount=0)  # noqa: F841
+    addr_2 = pre.fund_eoa(amount=0)  # noqa: F841
+    # Source: raw
+    # 0x6000600060006000600060cc6000f1506000600060006000600060dd6000f1506000600060006000600060036000f15060aa6000526000600060206000600061dead5af15060aa6000526000600060206000600061dead5af15060bb6000526000600060206000600061dead5af15060bb6000526000600060206000600061dead5af15060cc6000526000600060206000600061dead5af15060cc6000526000600060206000600061dead5af15060dd6000526000600060206000600061dead5af15060dd6000526000600060206000600061dead5af15060016000526000600060206000600061dead5af15060016000526000600060206000600061dead5af15060026000526000600060206000600061dead5af15060026000526000600060206000600061dead5af15060036000526000600060206000600061dead5af1506001600155  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x0,
+                address=0xCC,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=0xDD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x0,
+                address=0xDD,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x0,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x0, value=0xAA)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEAD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x0, value=0xAA)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEAD,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x0, value=0xAA)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEAD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x0, value=0xAA)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEAD,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x0, value=0xBB)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEAD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x0, value=0xBB)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEAD,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x0, value=0xBB)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEAD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x0, value=0xBB)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEAD,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x0, value=0xCC)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEAD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x0, value=0xCC)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEAD,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x0, value=0xCC)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEAD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x0, value=0xCC)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEAD,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x0, value=0xDD)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEAD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x0, value=0xDD)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEAD,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x0, value=0xDD)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEAD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x0, value=0xDD)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEAD,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEAD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x0, value=0x1)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEAD,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEAD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x0, value=0x1)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEAD,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x0, value=0x2)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEAD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x0, value=0x2)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEAD,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x0, value=0x2)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEAD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x0, value=0x2)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEAD,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x0, value=0x3)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEAD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.MSTORE(offset=0x0, value=0x3)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xDEAD,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1),
         balance=1,
-        address=Address("0xb686be1a7a0f441fae9583884043ac034fe82089"),  # noqa: E501
+        nonce=1,
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(
-                address=Op.AND(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    Op.CALLDATALOAD(offset=0x0),
-                ),
+    # Source: raw
+    # 0x60003574ffffffffffffffffffffffffffffffffffffffffff16ff
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=Op.AND(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+                Op.CALLDATALOAD(offset=0x0),
             )
         ),
         balance=1,
-        address=Address("0xd2e5c26a2f035a63d0859e255621ed1e57148085"),  # noqa: E501
+        nonce=1,
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=8000000,
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSpecialTest/test_sha3_deja.py b/tests/ported_static/stSpecialTest/test_sha3_deja.py
index 1147765ba8f..5c7a8f4d997 100644
--- a/tests/ported_static/stSpecialTest/test_sha3_deja.py
+++ b/tests/ported_static/stSpecialTest/test_sha3_deja.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_sha3_deja.
 
 Ported from:
-tests/static/state_tests/stSpecialTest/sha3_dejaFiller.json
+state_tests/stSpecialTest/sha3_dejaFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSpecialTest/sha3_dejaFiller.json"],
+    ["state_tests/stSpecialTest/sha3_dejaFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_sha3_deja(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_sha3_deja."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,26 +43,24 @@ def test_sha3_deja(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x1F, value=0x42)
-            + Op.SHA3(offset=0xFFFFFFFFFF, size=0x0)
-            + Op.DUP1
-        ),
+    # Source: raw
+    # 0x6042601f53600064ffffffffff2080
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x1F, value=0x42)
+        + Op.SHA3(offset=0xFFFFFFFFFF, size=0x0)
+        + Op.DUP1,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xcc4cdc08ed5801a6c7d1d87efb229f9556d50ce6"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSpecialTest/test_stack_depth_limit_sec.py b/tests/ported_static/stSpecialTest/test_stack_depth_limit_sec.py
index ab54f2e249e..4bc84e2ae16 100644
--- a/tests/ported_static/stSpecialTest/test_stack_depth_limit_sec.py
+++ b/tests/ported_static/stSpecialTest/test_stack_depth_limit_sec.py
@@ -1,39 +1,37 @@
 """
-Test ported from static filler.
+Test_stack_depth_limit_sec.
 
 Ported from:
-tests/static/state_tests/stSpecialTest/StackDepthLimitSECFiller.json
+state_tests/stSpecialTest/StackDepthLimitSECFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSpecialTest/StackDepthLimitSECFiller.json"],
+    ["state_tests/stSpecialTest/StackDepthLimitSECFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_stack_depth_limit_sec(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_stack_depth_limit_sec."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x2540BE400)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -44,19 +42,27 @@ def test_stack_depth_limit_sec(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0x2540BE400)
-
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "305032503350600460006000396000515060046000600037600051506f60006000600060"  # noqa: E501
-            "0060003060405a03f160005260106010f3"
-        ),
+        data=Op.POP(Op.ADDRESS)
+        + Op.POP(Op.ORIGIN)
+        + Op.POP(Op.CALLER)
+        + Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x4)
+        + Op.POP(Op.MLOAD(offset=0x0))
+        + Op.CALLDATACOPY(dest_offset=0x0, offset=0x0, size=0x4)
+        + Op.POP(Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0x0, value=0x600060006000600060003060405A03F1)
+        + Op.RETURN(offset=0x10, size=0x10),
         gas_limit=1000000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=sender, nonce=0): Account(
+            code=bytes.fromhex("600060006000600060003060405a03f1"),
+            balance=10,
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSpecialTest/test_tx_e1c174e2.py b/tests/ported_static/stSpecialTest/test_tx_e1c174e2.py
index ebf0d3df0be..a42f5c81aa1 100644
--- a/tests/ported_static/stSpecialTest/test_tx_e1c174e2.py
+++ b/tests/ported_static/stSpecialTest/test_tx_e1c174e2.py
@@ -1,17 +1,18 @@
 """
-Test ported from static filler.
+Test_tx_e1c174e2.
 
 Ported from:
-tests/static/state_tests/stSpecialTest/tx_e1c174e2Filler.json
+state_tests/stSpecialTest/tx_e1c174e2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSpecialTest/tx_e1c174e2Filler.json"],
+    ["state_tests/stSpecialTest/tx_e1c174e2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +31,9 @@ def test_tx_e1c174e2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da")
-    sender = EOA(
-        key=0x98D5E7375843784F7EB2606A693BAB39EBAC533561559E372DC3017F30519535
-    )
+    """Test_tx_e1c174e2."""
+    coinbase = Address(0x68795C4AA09D6F4ED3E5DEDDF8C2AD3049A601DA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=24)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,3700 +44,3274 @@ def test_tx_e1c174e2(
         gas_limit=3141592,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=24)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x155F, value=0x0)
-            + Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x65],
-                condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x55F10AAF)),
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x52],
-                condition=Op.ISZERO(Op.SGT(Op.CALLVALUE, 0x0)),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x1388,
-                    address=Op.CALLER,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x60,
-                value=Op.SLOAD(
-                    key=Op.ADD(0x7, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                ),
-            )
-            + Op.RETURN(offset=0x60, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x53F, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x69E0998B))
-            )
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0xA0, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x9A],
-                condition=Op.ISZERO(
-                    Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x80), 0x0))
-                ),
-            )
-            + Op.MSTORE(offset=0xC0, value=0x2)
-            + Op.RETURN(offset=0xC0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xB1],
-                condition=Op.ISZERO(
-                    Op.ISZERO(Op.SGT(Op.MLOAD(offset=0xA0), 0x0))
-                ),
-            )
-            + Op.MSTORE(offset=0xE0, value=0x3)
-            + Op.RETURN(offset=0xE0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=Op.PUSH2[0xCA],
-                condition=Op.ISZERO(
-                    Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x40), 0x0))
-                ),
-            )
-            + Op.MSTORE(offset=0x100, value=0x4)
-            + Op.RETURN(offset=0x100, size=0x20)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x120,
-                value=Op.MUL(
-                    Op.SDIV(
-                        Op.MUL(Op.MLOAD(offset=0x80), Op.MLOAD(offset=0xA0)),
-                        Op.MUL(
+    # Source: raw
+    # 0x600061155f537c0100000000000000000000000000000000000000000000000000000000600035046355f10aaf8114156100655760043560405260003413156100525760006000600060003433611388f1505b600c604051026007015460605260206060f35b6369e0998b81141561053f5760043560805260243560a052604435604052600060805113151561009a57600260c052602060c0f35b600060a0511315156100b157600360e052602060e0f35b60006040511315156100ca576004610100526020610100f35b670de0b6b3a7640000600c6040510260030154600a0a600c60405102600401540260a05160805102050261012052600c604051026005015434121561012f5760003413156101225760006000600060003433611388f1505b600b610140526020610140f35b610120513412156101605760003413156101535760006000600060003433611388f1505b6014610160526020610160f35b6101205134131561018057600060006000600061012051340333611388f1505b60e0599059016000905260068152600160208201526040516040820152608051606082015260a05160808201523360a08201524360c082015260208101905061018052610180516020602082035102812090506101c05260086101c05102740e0000000000000000000000000000000000000000015415156104be576101c05160086101c05102740e00000000000000000000000000000000000000000155600160086101c05102740e0000000000000000000000000000000000000001015560405160086101c05102740e0000000000000000000000000000000000000002015560805160086101c05102740e0000000000000000000000000000000000000003015560a05160086101c05102740e000000000000000000000000000000000000000401553360086101c05102740e000000000000000000000000000000000000000501554360086101c05102740e0000000000000000000000000000000000000006015560086101c05102740e00000000000000000000000000000000000000000160086101c05102740e00000000000000000000000000000000000000070155600c60405102600b0154610200526101c05160a060a05990590160009052600081526040518160200152600c81604001526102005181606001526001816080015280905020556102005160a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020556101c05160a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526000816080015280905020556101c051600c60405102600b01556001600c60405102600a015401600c60405102600a01556002600114156104b95760805160806080599059016000905260048152338160200152604051816040015260008160600152809050205403608060805990590160009052600481523381602001526040518160400152600081606001528090502055608051608060805990590160009052600481523381602001526040518160400152600181606001528090502054016080608059905901600090526004815233816020015260405181604001526001816060015280905020555b6104cb565b6015610300526020610300f35b601c60c05990590160009052013381526001602082015260a051604082015260805160608201526101c05160808201526040517f9463d1cc4aa2db0dc624c996b1846f028d43c48cfc8b9f427f13336e4a73226460a083a2506101c051610340526020610340f36000610360526020610360f35b630909f073811415610a0c5760043560805260243560a0526044356040526000608051131515610576576002610380526020610380f35b600060a05113151561058f5760036103a05260206103a0f35b60006040511315156105a85760046103c05260206103c0f35b670de0b6b3a7640000600c6040510260030154600a0a600c60405102600401540260a05160805102050261012052600c60405102600501546101205112156106105760003413156106035760006000600060003433611388f1505b600b6103e05260206103e0f35b60806080599059016000905260048152338160200152604051816040015260008160600152809050205461040052608051610400511215156109ff5760e0599059016000905260068152600260208201526040516040820152608051606082015260a05160808201523360a08201524360c082015260208101905061018052610180516020602082035102812090506101c05260086101c05102740e00000000000000000000000000000000000000000154151561098a576101c05160086101c05102740e00000000000000000000000000000000000000000155600260086101c05102740e0000000000000000000000000000000000000001015560405160086101c05102740e0000000000000000000000000000000000000002015560805160086101c05102740e0000000000000000000000000000000000000003015560a05160086101c05102740e000000000000000000000000000000000000000401553360086101c05102740e000000000000000000000000000000000000000501554360086101c05102740e0000000000000000000000000000000000000006015560086101c05102740e00000000000000000000000000000000000000000160086101c05102740e00000000000000000000000000000000000000070155600c60405102600b0154610200526101c05160a060a05990590160009052600081526040518160200152600c81604001526102005181606001526001816080015280905020556102005160a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020556101c05160a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526000816080015280905020556101c051600c60405102600b01556001600c60405102600a015401600c60405102600a01556002600214156109855760805160806080599059016000905260048152338160200152604051816040015260008160600152809050205403608060805990590160009052600481523381602001526040518160400152600081606001528090502055608051608060805990590160009052600481523381602001526040518160400152600181606001528090502054016080608059905901600090526004815233816020015260405181604001526001816060015280905020555b610997565b6015610560526020610560f35b601c60c05990590160009052013381526002602082015260a051604082015260805160608201526101c05160808201526040517f9463d1cc4aa2db0dc624c996b1846f028d43c48cfc8b9f427f13336e4a73226460a083a2506101c051610580526020610580f35b60006105a05260206105a0f35b639998bd008114156117335736599059016000905236600482376004356105e0526024356020820101610600525034610620526000610640525b602061060051035161064051121561170a57610640516020026106005101516101c05260086101c05102740e0000000000000000000000000000000000000006015443131515610a9d576016610660526020610660f35b60086101c05102740e00000000000000000000000000000000000000020154604052600c604051026002015461068052600c60405102600301546106a052600c60405102600401546106c052600c60405102600501546106e05260086101c05102740e000000000000000000000000000000000000000101546107005260086101c05102740e0000000000000000000000000000000000000003015460805260086101c05102740e0000000000000000000000000000000000000004015460a05260086101c05102740e0000000000000000000000000000000000000005015461072052600161070051141561110e576080608059905901600090526004815233816020015260405181604001526000816060015280905020546104005260006104005113156110fc57608051610400516105e05180821215610be05781610be2565b805b9050905080821215610bf45781610bf6565b805b90509050610760526106a051600a0a6106c05102670de0b6b3a764000060a05161076051020205610120526106e051610120511215610c5b576000610620511315610c4e5760006000600060006106205133611388f1505b600c610800526020610800f35b608051610760511215610cb0576107605160086101c05102740e000000000000000000000000000000000000000301540360086101c05102740e00000000000000000000000000000000000000030155610fd4565b600060086101c05102740e00000000000000000000000000000000000000000155600060086101c05102740e00000000000000000000000000000000000000010155600060086101c05102740e00000000000000000000000000000000000000020155600060086101c05102740e00000000000000000000000000000000000000030155600060086101c05102740e00000000000000000000000000000000000000040155600060086101c05102740e00000000000000000000000000000000000000050155600060086101c05102740e00000000000000000000000000000000000000060155600060086101c05102740e0000000000000000000000000000000000000007015560a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020546108205260a060a05990590160009052600081526040518160200152600c81604001526101c0518160600152600181608001528090502054610860526108205115610e3a5761086051610e3d565b60005b15610eb7576108605160a060a05990590160009052600081526040518160200152600c81604001526108205181606001526001816080015280905020556108205160a060a05990590160009052600081526040518160200152600c8160400152610860518160600152600281608001528090502055610f06565b6108205115610f055761082051600c60405102600b0155600060a060a05990590160009052600081526040518160200152600c81604001526108205181606001526001816080015280905020555b5b6108605115610f4657600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526001816080015280905020555b6108205115610f8657600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020555b600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526000816080015280905020556001600c60405102600a015403600c60405102600a01555b6107605160806080599059016000905260048152338160200152604051816040015260008160600152809050205403608060805990590160009052600481523381602001526040518160400152600081606001528090502055610760516080608059905901600090526004815261072051816020015260405181604001526000816060015280905020540160806080599059016000905260048152610720518160200152604051816040015260008160600152809050205560006000600060006101205133611388f150601c60a05990590160009052016002815260a05160208201526107605160408201526101c051606082015261072051336040517f0f9fe89f83633cc2eca9b17e1f77422f037cb026eaca4e6a5337fa1595f50a81608085a450611109565b600a6109e05260206109e0f35b611680565b600261070051141561167f576000610620511315611671576106e0516106205112156111605760006106205113156111535760006000600060006106205133611388f1505b600c610a00526020610a00f35b6106a051600a0a6106c05102670de0b6b3a764000060a051608051020205610a205261062051610a205180821215611198578161119a565b805b9050905061012052610a205161012051121561121b57670de0b6b3a764000060a0516106a051600a0a6106c0510261012051020505610760526107605160086101c05102740e000000000000000000000000000000000000000301540360086101c05102740e00000000000000000000000000000000000000030155611546565b60805161076052600060086101c05102740e00000000000000000000000000000000000000000155600060086101c05102740e00000000000000000000000000000000000000010155600060086101c05102740e00000000000000000000000000000000000000020155600060086101c05102740e00000000000000000000000000000000000000030155600060086101c05102740e00000000000000000000000000000000000000040155600060086101c05102740e00000000000000000000000000000000000000050155600060086101c05102740e00000000000000000000000000000000000000060155600060086101c05102740e0000000000000000000000000000000000000007015560a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020546108205260a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526001816080015280905020546108605261082051156113ac57610860516113af565b60005b15611429576108605160a060a05990590160009052600081526040518160200152600c81604001526108205181606001526001816080015280905020556108205160a060a05990590160009052600081526040518160200152600c8160400152610860518160600152600281608001528090502055611478565b61082051156114775761082051600c60405102600b0155600060a060a05990590160009052600081526040518160200152600c81604001526108205181606001526001816080015280905020555b5b61086051156114b857600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526001816080015280905020555b61082051156114f857600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020555b600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526000816080015280905020556001600c60405102600a015403600c60405102600a01555b6107605160806080599059016000905260048152610720518160200152604051816040015260018160600152809050205403608060805990590160009052600481526107205181602001526040518160400152600181606001528090502055610760516080608059905901600090526004815233816020015260405181604001526000816060015280905020540160806080599059016000905260048152338160200152604051816040015260008160600152809050205560006000600060006101205161072051611388f150601c60a05990590160009052016001815260a05160208201526107605160408201526101c051606082015261072051336040517f0f9fe89f83633cc2eca9b17e1f77422f037cb026eaca4e6a5337fa1595f50a81608085a45061167e565b600a610c00526020610c00f35b5b5b60a051600c6040510260070155601c60a059905901600090520161070051815260a05160208201526107605160408201524260608201526040517f50944f09ce56f9f0e2cb67683c9b451049c39f60452b850b169148f3daa51ed6608083a250610760516105e051036105e052610120516106205103610620526001610640510161064052610a46565b61062051156117265760006000600060006106205133611388f1505b6001610c20526020610c20f35b6334a501c781141561185b57600435608052602435604052601c60845990590160009052016327f08b00601c82035233600482015230602482015260805160448201526020610c406064836000600c6040510260020154602d5a03f150610c405190501561184e57608060805990590160009052600481523381602001526040518160400152600081606001528090502054610400526080516104005101610c8052610c8051608060805990590160009052600481523381602001526040518160400152600081606001528090502055601c60405990590160009052016080518152336040517f301cd746dbb5e7f9ade2bcd9e8a849b968bfcc222de48d2086ba200184acc83d602084a350610c8051610cc0526020610cc0f35b6000610ce0526020610ce0f35b63e1ed3ad3811415611982576004356080526024356040526080608059905901600090526004815233816020015260405181604001526000816060015280905020546104005260805161040051121515611975576080516104005103608060805990590160009052600481523381602001526040518160400152600081606001528090502055601c60645990590160009052016386744558601c82035233600482015260805160248201526020610d606044836000600c6040510260020154602d5a03f150610d60519050610d4052601c60405990590160009052016080518152336040517ffa4460934f383b326d79dcd4f1e59a17ac8ee9a87312169933e7f68b85c1a8ce602084a350610d4051610d80526020610d80f35b6000610da0526020610da0f35b63327a22f1811415611f08576004356101c05260086101c05102740e000000000000000000000000000000000000000101546107005260086101c05102740e0000000000000000000000000000000000000003015460805260086101c05102740e0000000000000000000000000000000000000004015460a05260086101c05102740e000000000000000000000000000000000000000501546107205260086101c05102740e00000000000000000000000000000000000000020154604052600c604051026002015461068052600c60405102600301546106a052600c60405102600401546106c05261072051331415611efb57600060086101c05102740e00000000000000000000000000000000000000000155600060086101c05102740e00000000000000000000000000000000000000010155600060086101c05102740e00000000000000000000000000000000000000020155600060086101c05102740e00000000000000000000000000000000000000030155600060086101c05102740e00000000000000000000000000000000000000040155600060086101c05102740e00000000000000000000000000000000000000050155600060086101c05102740e00000000000000000000000000000000000000060155600060086101c05102740e0000000000000000000000000000000000000007015560a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020546108205260a060a05990590160009052600081526040518160200152600c81604001526101c0518160600152600181608001528090502054610860526108205115611c005761086051611c03565b60005b15611c7d576108605160a060a05990590160009052600081526040518160200152600c81604001526108205181606001526001816080015280905020556108205160a060a05990590160009052600081526040518160200152600c8160400152610860518160600152600281608001528090502055611ccc565b6108205115611ccb5761082051600c60405102600b0155600060a060a05990590160009052600081526040518160200152600c81604001526108205181606001526001816080015280905020555b5b6108605115611d0c57600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526001816080015280905020555b6108205115611d4c57600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020555b600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526000816080015280905020556001600c60405102600a015403600c60405102600a01556001610700511415611dde57670de0b6b3a76400006106a051600a0a6106c0510260a0516080510205026101205260006000600060006101205133611388f150611e9c565b6002610700511415611e9b5760805160806080599059016000905260048152338160200152604051816040015260018160600152809050205403608060805990590160009052600481523381602001526040518160400152600181606001528090502055608051608060805990590160009052600481523381602001526040518160400152600081606001528090502054016080608059905901600090526004815233816020015260405181604001526000816060015280905020555b5b601c60a059905901600090520133815260a051602082015260805160408201526101c05160608201526040517f0ac6333455d304288767a0f1039d666d16882d10b6ea83693d2556e4c8098001608083a2506001610f40526020610f40f35b6000610f60526020610f60f35b63d91e22f48114156122f057600435610f8052602435610680526044356106a0526064356106c0526084356106e05260a435610fa0526001741600000000000000000000000000000000000000005401610fc0526000610f8051131515611f7657601e610fe0526020610fe0f35b610f8051740d0000000000000000000000000000000000000000015415611fa457601f611000526020611000f35b600061068051131515611fbe576020611020526020611020f35b6000610fa0511215611fd7576021611040526020611040f35b60006106a0511215611ff0576022611060526020611060f35b60006106c0511215612009576023611080526020611080f35b60006106e05112156120225760246110a05260206110a0f35b6000601c606459905901600090520163c32d01a1601c82035233600482015230602482015260206110c0604483600061068051602d5a03f1506110c05190501415156120755760286110e05260206110e0f35b6001601c60645990590160009052016383b58638601c820352306004820152600060248201526020611100604483600061068051602d5a03f1506111005190501415156120c9576029611120526020611120f35b6000601c60445990590160009052016326690247601c8203523060048201526020611140602483600061068051602d5a03f15061114051905014151561211657602a611160526020611160f35b6000601c60645990590160009052016386744558601c820352336004820152600060248201526020611180604483600061068051602d5a03f15061118051905014151561216a57602b6111a05260206111a0f35b6000601c60845990590160009052016327f08b00601c8203523060048201523360248201526000604482015260206111c0606483600061068051602d5a03f1506111c05190501415156121c457602c6111e05260206111e0f35b610fc051600c610fc0510255610f8051600c610fc051026001015561068051600c610fc0510260020155610fa051600c610fc05102600601556106a051600c610fc05102600301556106c051600c610fc05102600401556106e051600c610fc05102600501556001600c610fc051026007015533600c610fc051026008015543600c610fc0510260090155610fc05161068051740c00000000000000000000000000000000000000000155610fc051610f8051740d00000000000000000000000000000000000000000155610fc0517416000000000000000000000000000000000000000055601c6040599059016000905201610fc05181527f1238fe6d44cf796960d61b74766b3a383110e472d849f5ca16ae50215bc05e58602082a1506001611200526020611200f35b634156966181141561232a576004356112205261122051740c00000000000000000000000000000000000000000154611240526020611240f35b63fcde9f7881141561236457600435610f8052610f8051740d00000000000000000000000000000000000000000154611260526020611260f35b636e5b4343811415612392577416000000000000000000000000000000000000000054611280526020611280f35b63fafa69c28114156124e657600435610fc0526101805990590160009052600b81526020810190506112a052600c610fc05102546112a05152600c610fc051026001015460206112a0510152600c610fc051026002015460406112a0510152600c610fc051026003015460606112a0510152600c610fc051026004015460806112a0510152600c610fc051026005015460a06112a0510152600c610fc051026007015460c06112a0510152600c610fc051026008015460e06112a0510152600c610fc05102600901546101006112a0510152600c610fc05102600a01546101206112a0510152600c610fc05102600601546101406112a05101526112a051156124b2576112a05160206040820352602060208203510260400160408203f3505b60405990590160009052600181526000602082015260208101905060206040820352602060208203510260400160408203f3505b639cfc153581141561262e57600435604052600c60405102600a015461134052600c60405102600b01546101c0526113405180602002602001599059016000905281815260208101905090506106005260006113a0525b611340516113a05112156125d45760a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526000816080015280905020546113a05160200261060051015260a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020546101c05260016113a051016113a05261253d565b61060051156125fa576106005160206040820352602060208203510260400160408203f3505b60405990590160009052600181526000602082015260208101905060206040820352602060208203510260400160408203f3505b630f7181908114156127e957600435610fc052610120599059016000905260088152602081019050610180526008610fc05102740e0000000000000000000000000000000000000000015461018051526008610fc05102740e0000000000000000000000000000000000000001015460206101805101526008610fc05102740e0000000000000000000000000000000000000002015460406101805101526008610fc05102740e0000000000000000000000000000000000000003015460606101805101526008610fc05102740e0000000000000000000000000000000000000004015460806101805101526008610fc05102740e0000000000000000000000000000000000000005015460a06101805101526008610fc05102740e0000000000000000000000000000000000000006015460c06101805101526008610fc05102740e0000000000000000000000000000000000000007015460e061018051015261018051156127b5576101805160206040820352602060208203510260400160408203f3505b60405990590160009052600181526000602082015260208101905060206040820352602060208203510260400160408203f3505b631c9aa4b6811415612893576004356112205260243560405260605990590160009052600281526080608059905901600090526004815261122051816020015260405181604001526000816060015280905020546020820152608060805990590160009052600481526112205181602001526040518160400152600181606001528090502054604082015260208101905060206040820352602060208203510260400160408203f3505b50  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x155F, value=0x0)
+        + Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x65], condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x55F10AAF))
+        )
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x52], condition=Op.ISZERO(Op.SGT(Op.CALLVALUE, 0x0))
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x1388,
+                address=Op.CALLER,
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x60,
+            value=Op.SLOAD(
+                key=Op.ADD(0x7, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
+            ),
+        )
+        + Op.RETURN(offset=0x60, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x53F, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x69E0998B)))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0xA0, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x9A],
+            condition=Op.ISZERO(Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x80), 0x0))),
+        )
+        + Op.MSTORE(offset=0xC0, value=0x2)
+        + Op.RETURN(offset=0xC0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xB1],
+            condition=Op.ISZERO(Op.ISZERO(Op.SGT(Op.MLOAD(offset=0xA0), 0x0))),
+        )
+        + Op.MSTORE(offset=0xE0, value=0x3)
+        + Op.RETURN(offset=0xE0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=Op.PUSH2[0xCA],
+            condition=Op.ISZERO(Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x40), 0x0))),
+        )
+        + Op.MSTORE(offset=0x100, value=0x4)
+        + Op.RETURN(offset=0x100, size=0x20)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x120,
+            value=Op.MUL(
+                Op.SDIV(
+                    Op.MUL(Op.MLOAD(offset=0x80), Op.MLOAD(offset=0xA0)),
+                    Op.MUL(
+                        Op.SLOAD(
+                            key=Op.ADD(0x4, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
+                        ),
+                        Op.EXP(
+                            0xA,
                             Op.SLOAD(
                                 key=Op.ADD(
-                                    0x4,
-                                    Op.MUL(Op.MLOAD(offset=0x40), 0xC),
-                                ),
-                            ),
-                            Op.EXP(
-                                0xA,
-                                Op.SLOAD(
-                                    key=Op.ADD(
-                                        0x3,
-                                        Op.MUL(Op.MLOAD(offset=0x40), 0xC),
-                                    ),
-                                ),
+                                    0x3, Op.MUL(Op.MLOAD(offset=0x40), 0xC)
+                                )
                             ),
                         ),
                     ),
-                    0xDE0B6B3A7640000,
                 ),
-            )
-            + Op.JUMPI(
-                pc=0x12F,
-                condition=Op.ISZERO(
-                    Op.SLT(
-                        Op.CALLVALUE,
+                0xDE0B6B3A7640000,
+            ),
+        )
+        + Op.JUMPI(
+            pc=0x12F,
+            condition=Op.ISZERO(
+                Op.SLT(
+                    Op.CALLVALUE,
+                    Op.SLOAD(
+                        key=Op.ADD(0x5, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
+                    ),
+                )
+            ),
+        )
+        + Op.JUMPI(pc=0x122, condition=Op.ISZERO(Op.SGT(Op.CALLVALUE, 0x0)))
+        + Op.POP(
+            Op.CALL(
+                gas=0x1388,
+                address=Op.CALLER,
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x140, value=0xB)
+        + Op.RETURN(offset=0x140, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x160,
+            condition=Op.ISZERO(Op.SLT(Op.CALLVALUE, Op.MLOAD(offset=0x120))),
+        )
+        + Op.JUMPI(pc=0x153, condition=Op.ISZERO(Op.SGT(Op.CALLVALUE, 0x0)))
+        + Op.POP(
+            Op.CALL(
+                gas=0x1388,
+                address=Op.CALLER,
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x160, value=0x14)
+        + Op.RETURN(offset=0x160, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x180,
+            condition=Op.ISZERO(Op.SGT(Op.CALLVALUE, Op.MLOAD(offset=0x120))),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x1388,
+                address=Op.CALLER,
+                value=Op.SUB(Op.CALLVALUE, Op.MLOAD(offset=0x120)),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.PUSH1[0xE0]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x6)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=0x1)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x40), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x60), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x80), value=Op.MLOAD(offset=0xA0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0xA0), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0xC0), value=Op.NUMBER)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x180]
+        + Op.MSTORE
+        + Op.MLOAD(offset=0x180)
+        + Op.SHA3(
+            offset=Op.DUP2,
+            size=Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
+        )
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x1C0]
+        + Op.MSTORE
+        + Op.JUMPI(
+            pc=0x4BE,
+            condition=Op.ISZERO(
+                Op.ISZERO(
+                    Op.SLOAD(
+                        key=Op.ADD(
+                            0xE0000000000000000000000000000000000000000,
+                            Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+                        )
+                    )
+                )
+            ),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000000,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=Op.MLOAD(offset=0x1C0),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000001,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x1,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000002,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=Op.MLOAD(offset=0x40),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000003,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=Op.MLOAD(offset=0x80),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000004,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=Op.MLOAD(offset=0xA0),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000005,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=Op.CALLER,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000006,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=Op.NUMBER,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000007,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=Op.ADD(
+                0xE0000000000000000000000000000000000000000,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x200,
+            value=Op.SLOAD(
+                key=Op.ADD(0xB, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
+            ),
+        )
+        + Op.MLOAD(offset=0x1C0)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x200))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x200)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x1C0)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.SSTORE(
+            key=Op.ADD(0xB, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
+            value=Op.MLOAD(offset=0x1C0),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
+            value=Op.ADD(
+                Op.SLOAD(key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC))),
+                0x1,
+            ),
+        )
+        + Op.JUMPI(pc=0x4B9, condition=Op.ISZERO(Op.EQ(0x1, 0x2)))
+        + Op.MLOAD(offset=0x80)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.SUB
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x80)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.ADD
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.JUMPDEST
+        + Op.JUMP(pc=0x4CB)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x300, value=0x15)
+        + Op.RETURN(offset=0x300, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xC0]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.DUP2, value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=0x1)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x40), value=Op.MLOAD(offset=0xA0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x60), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x80), value=Op.MLOAD(offset=0x1C0))
+        + Op.LOG2(
+            offset=Op.DUP4,
+            size=0xA0,
+            topic_1=0x9463D1CC4AA2DB0DC624C996B1846F028D43C48CFC8B9F427F13336E4A732264,  # noqa: E501
+            topic_2=Op.MLOAD(offset=0x40),
+        )
+        + Op.POP
+        + Op.MSTORE(offset=0x340, value=Op.MLOAD(offset=0x1C0))
+        + Op.RETURN(offset=0x340, size=0x20)
+        + Op.MSTORE(offset=0x360, value=0x0)
+        + Op.RETURN(offset=0x360, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xA0C, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x909F073)))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0xA0, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.JUMPI(
+            pc=0x576,
+            condition=Op.ISZERO(Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x80), 0x0))),
+        )
+        + Op.MSTORE(offset=0x380, value=0x2)
+        + Op.RETURN(offset=0x380, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x58F,
+            condition=Op.ISZERO(Op.ISZERO(Op.SGT(Op.MLOAD(offset=0xA0), 0x0))),
+        )
+        + Op.MSTORE(offset=0x3A0, value=0x3)
+        + Op.RETURN(offset=0x3A0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x5A8,
+            condition=Op.ISZERO(Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x40), 0x0))),
+        )
+        + Op.MSTORE(offset=0x3C0, value=0x4)
+        + Op.RETURN(offset=0x3C0, size=0x20)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x120,
+            value=Op.MUL(
+                Op.SDIV(
+                    Op.MUL(Op.MLOAD(offset=0x80), Op.MLOAD(offset=0xA0)),
+                    Op.MUL(
                         Op.SLOAD(
-                            key=Op.ADD(
-                                0x5, Op.MUL(Op.MLOAD(offset=0x40), 0xC)
+                            key=Op.ADD(0x4, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
+                        ),
+                        Op.EXP(
+                            0xA,
+                            Op.SLOAD(
+                                key=Op.ADD(
+                                    0x3, Op.MUL(Op.MLOAD(offset=0x40), 0xC)
+                                )
                             ),
                         ),
                     ),
                 ),
-            )
-            + Op.JUMPI(
-                pc=0x122, condition=Op.ISZERO(Op.SGT(Op.CALLVALUE, 0x0))
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x1388,
-                    address=Op.CALLER,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x140, value=0xB)
-            + Op.RETURN(offset=0x140, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x160,
-                condition=Op.ISZERO(
-                    Op.SLT(Op.CALLVALUE, Op.MLOAD(offset=0x120))
-                ),
-            )
-            + Op.JUMPI(
-                pc=0x153, condition=Op.ISZERO(Op.SGT(Op.CALLVALUE, 0x0))
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x1388,
-                    address=Op.CALLER,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x160, value=0x14)
-            + Op.RETURN(offset=0x160, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x180,
-                condition=Op.ISZERO(
-                    Op.SGT(Op.CALLVALUE, Op.MLOAD(offset=0x120))
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x1388,
-                    address=Op.CALLER,
-                    value=Op.SUB(Op.CALLVALUE, Op.MLOAD(offset=0x120)),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.PUSH1[0xE0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x6)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=0x1)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x40), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x60), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x80), value=Op.MLOAD(offset=0xA0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0xA0), value=Op.CALLER)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0xC0), value=Op.NUMBER)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x180]
-            + Op.MSTORE
-            + Op.MLOAD(offset=0x180)
-            + Op.SHA3(
-                offset=Op.DUP2,
-                size=Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x1C0]
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=0x4BE,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
+                0xDE0B6B3A7640000,
+            ),
+        )
+        + Op.JUMPI(
+            pc=0x610,
+            condition=Op.ISZERO(
+                Op.SLT(
+                    Op.MLOAD(offset=0x120),
+                    Op.SLOAD(
+                        key=Op.ADD(0x5, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
+                    ),
+                )
+            ),
+        )
+        + Op.JUMPI(pc=0x603, condition=Op.ISZERO(Op.SGT(Op.CALLVALUE, 0x0)))
+        + Op.POP(
+            Op.CALL(
+                gas=0x1388,
+                address=Op.CALLER,
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x3E0, value=0xB)
+        + Op.RETURN(offset=0x3E0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x400, value=Op.SLOAD(key=Op.SHA3))
+        + Op.JUMPI(
+            pc=0x9FF,
+            condition=Op.ISZERO(
+                Op.ISZERO(
+                    Op.SLT(Op.MLOAD(offset=0x400), Op.MLOAD(offset=0x80))
+                )
+            ),
+        )
+        + Op.PUSH1[0xE0]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x6)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=0x2)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x40), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x60), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x80), value=Op.MLOAD(offset=0xA0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0xA0), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0xC0), value=Op.NUMBER)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x180]
+        + Op.MSTORE
+        + Op.MLOAD(offset=0x180)
+        + Op.SHA3(
+            offset=Op.DUP2,
+            size=Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
+        )
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x1C0]
+        + Op.MSTORE
+        + Op.JUMPI(
+            pc=0x98A,
+            condition=Op.ISZERO(
+                Op.ISZERO(
+                    Op.SLOAD(
+                        key=Op.ADD(
+                            0xE0000000000000000000000000000000000000000,
+                            Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+                        )
+                    )
+                )
+            ),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000000,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=Op.MLOAD(offset=0x1C0),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000001,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x2,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000002,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=Op.MLOAD(offset=0x40),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000003,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=Op.MLOAD(offset=0x80),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000004,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=Op.MLOAD(offset=0xA0),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000005,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=Op.CALLER,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000006,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=Op.NUMBER,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000007,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=Op.ADD(
+                0xE0000000000000000000000000000000000000000,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x200,
+            value=Op.SLOAD(
+                key=Op.ADD(0xB, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
+            ),
+        )
+        + Op.MLOAD(offset=0x1C0)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x200))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x200)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x1C0)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.SSTORE(
+            key=Op.ADD(0xB, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
+            value=Op.MLOAD(offset=0x1C0),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
+            value=Op.ADD(
+                Op.SLOAD(key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC))),
+                0x1,
+            ),
+        )
+        + Op.JUMPI(pc=0x985, condition=Op.ISZERO(Op.EQ(0x2, 0x2)))
+        + Op.MLOAD(offset=0x80)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.SUB
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x80)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.ADD
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.JUMPDEST
+        + Op.JUMP(pc=0x997)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x560, value=0x15)
+        + Op.RETURN(offset=0x560, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xC0]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.DUP2, value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=0x2)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x40), value=Op.MLOAD(offset=0xA0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x60), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x80), value=Op.MLOAD(offset=0x1C0))
+        + Op.LOG2(
+            offset=Op.DUP4,
+            size=0xA0,
+            topic_1=0x9463D1CC4AA2DB0DC624C996B1846F028D43C48CFC8B9F427F13336E4A732264,  # noqa: E501
+            topic_2=Op.MLOAD(offset=0x40),
+        )
+        + Op.POP
+        + Op.MSTORE(offset=0x580, value=Op.MLOAD(offset=0x1C0))
+        + Op.RETURN(offset=0x580, size=0x20)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x5A0, value=0x0)
+        + Op.RETURN(offset=0x5A0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1733, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x9998BD00)))
+        + Op.CALLDATASIZE
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.CALLDATACOPY(
+            dest_offset=Op.DUP3, offset=0x4, size=Op.CALLDATASIZE
+        )
+        + Op.MSTORE(offset=0x5E0, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(
+            offset=0x600,
+            value=Op.ADD(Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x24)),
+        )
+        + Op.POP
+        + Op.MSTORE(offset=0x620, value=Op.CALLVALUE)
+        + Op.MSTORE(offset=0x640, value=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x170A,
+            condition=Op.ISZERO(
+                Op.SLT(
+                    Op.MLOAD(offset=0x640),
+                    Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x600), 0x20)),
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x1C0,
+            value=Op.MLOAD(
+                offset=Op.ADD(
+                    Op.MLOAD(offset=0x600),
+                    Op.MUL(0x20, Op.MLOAD(offset=0x640)),
+                )
+            ),
+        )
+        + Op.JUMPI(
+            pc=0xA9D,
+            condition=Op.ISZERO(
+                Op.ISZERO(
+                    Op.SGT(
+                        Op.NUMBER,
                         Op.SLOAD(
                             key=Op.ADD(
-                                0xE0000000000000000000000000000000000000000,
+                                0xE0000000000000000000000000000000000000006,
                                 Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                            ),
+                            )
                         ),
-                    ),
-                ),
-            )
-            + Op.SSTORE(
+                    )
+                )
+            ),
+        )
+        + Op.MSTORE(offset=0x660, value=0x16)
+        + Op.RETURN(offset=0x660, size=0x20)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x40,
+            value=Op.SLOAD(
                 key=Op.ADD(
-                    0xE0000000000000000000000000000000000000000,
+                    0xE0000000000000000000000000000000000000002,
                     Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=Op.MLOAD(offset=0x1C0),
-            )
-            + Op.SSTORE(
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x680,
+            value=Op.SLOAD(
+                key=Op.ADD(0x2, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x6A0,
+            value=Op.SLOAD(
+                key=Op.ADD(0x3, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x6C0,
+            value=Op.SLOAD(
+                key=Op.ADD(0x4, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x6E0,
+            value=Op.SLOAD(
+                key=Op.ADD(0x5, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x700,
+            value=Op.SLOAD(
                 key=Op.ADD(
                     0xE0000000000000000000000000000000000000001,
                     Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x1,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000002,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=Op.MLOAD(offset=0x40),
-            )
-            + Op.SSTORE(
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=Op.SLOAD(
                 key=Op.ADD(
                     0xE0000000000000000000000000000000000000003,
                     Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=Op.MLOAD(offset=0x80),
-            )
-            + Op.SSTORE(
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=Op.SLOAD(
                 key=Op.ADD(
                     0xE0000000000000000000000000000000000000004,
                     Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=Op.MLOAD(offset=0xA0),
-            )
-            + Op.SSTORE(
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x720,
+            value=Op.SLOAD(
                 key=Op.ADD(
                     0xE0000000000000000000000000000000000000005,
                     Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+                )
+            ),
+        )
+        + Op.JUMPI(
+            pc=0x110E, condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x700), 0x1))
+        )
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x400, value=Op.SLOAD(key=Op.SHA3))
+        + Op.JUMPI(
+            pc=0x10FC, condition=Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x400), 0x0))
+        )
+        + Op.MLOAD(offset=0x80)
+        + Op.MLOAD(offset=0x400)
+        + Op.MLOAD(offset=0x5E0)
+        + Op.JUMPI(pc=0xBE0, condition=Op.ISZERO(Op.SLT(Op.DUP3, Op.DUP1)))
+        + Op.DUP2
+        + Op.JUMP(pc=0xBE2)
+        + Op.JUMPDEST
+        + Op.DUP1
+        + Op.JUMPDEST
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(pc=0xBF4, condition=Op.ISZERO(Op.SLT(Op.DUP3, Op.DUP1)))
+        + Op.DUP2
+        + Op.JUMP(pc=0xBF6)
+        + Op.JUMPDEST
+        + Op.DUP1
+        + Op.JUMPDEST
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x760]
+        + Op.MSTORE
+        + Op.MSTORE(
+            offset=0x120,
+            value=Op.SDIV(
+                Op.MUL(
+                    Op.MUL(Op.MLOAD(offset=0x760), Op.MLOAD(offset=0xA0)),
+                    0xDE0B6B3A7640000,
                 ),
-                value=Op.CALLER,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000006,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=Op.NUMBER,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000007,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=Op.ADD(
-                    0xE0000000000000000000000000000000000000000,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x200,
-                value=Op.SLOAD(
-                    key=Op.ADD(0xB, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                ),
-            )
-            + Op.MLOAD(offset=0x1C0)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x200)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x200)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x1C0)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.SSTORE(
-                key=Op.ADD(0xB, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                value=Op.MLOAD(offset=0x1C0),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                value=Op.ADD(
-                    Op.SLOAD(
-                        key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
-                    ),
-                    0x1,
-                ),
-            )
-            + Op.JUMPI(pc=0x4B9, condition=Op.ISZERO(Op.EQ(0x1, 0x2)))
-            + Op.MLOAD(offset=0x80)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.SUB
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x80)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.ADD
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.JUMPDEST
-            + Op.JUMP(pc=0x4CB)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x300, value=0x15)
-            + Op.RETURN(offset=0x300, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xC0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.DUP2, value=Op.CALLER)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=0x1)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x40), value=Op.MLOAD(offset=0xA0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x60), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x80), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.LOG2(
-                offset=Op.DUP4,
-                size=0xA0,
-                topic_1=0x9463D1CC4AA2DB0DC624C996B1846F028D43C48CFC8B9F427F13336E4A732264,  # noqa: E501
-                topic_2=Op.MLOAD(offset=0x40),
-            )
-            + Op.POP
-            + Op.MSTORE(offset=0x340, value=Op.MLOAD(offset=0x1C0))
-            + Op.RETURN(offset=0x340, size=0x20)
-            + Op.MSTORE(offset=0x360, value=0x0)
-            + Op.RETURN(offset=0x360, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xA0C, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x909F073))
-            )
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0xA0, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.JUMPI(
-                pc=0x576,
-                condition=Op.ISZERO(
-                    Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x80), 0x0))
-                ),
-            )
-            + Op.MSTORE(offset=0x380, value=0x2)
-            + Op.RETURN(offset=0x380, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x58F,
-                condition=Op.ISZERO(
-                    Op.ISZERO(Op.SGT(Op.MLOAD(offset=0xA0), 0x0))
-                ),
-            )
-            + Op.MSTORE(offset=0x3A0, value=0x3)
-            + Op.RETURN(offset=0x3A0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x5A8,
-                condition=Op.ISZERO(
-                    Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x40), 0x0))
-                ),
-            )
-            + Op.MSTORE(offset=0x3C0, value=0x4)
-            + Op.RETURN(offset=0x3C0, size=0x20)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x120,
-                value=Op.MUL(
-                    Op.SDIV(
-                        Op.MUL(Op.MLOAD(offset=0x80), Op.MLOAD(offset=0xA0)),
-                        Op.MUL(
-                            Op.SLOAD(
-                                key=Op.ADD(
-                                    0x4,
-                                    Op.MUL(Op.MLOAD(offset=0x40), 0xC),
-                                ),
-                            ),
-                            Op.EXP(
-                                0xA,
-                                Op.SLOAD(
-                                    key=Op.ADD(
-                                        0x3,
-                                        Op.MUL(Op.MLOAD(offset=0x40), 0xC),
-                                    ),
-                                ),
-                            ),
-                        ),
-                    ),
+                Op.MUL(
+                    Op.MLOAD(offset=0x6C0), Op.EXP(0xA, Op.MLOAD(offset=0x6A0))
+                ),
+            ),
+        )
+        + Op.JUMPI(
+            pc=0xC5B,
+            condition=Op.ISZERO(
+                Op.SLT(Op.MLOAD(offset=0x120), Op.MLOAD(offset=0x6E0))
+            ),
+        )
+        + Op.JUMPI(
+            pc=0xC4E, condition=Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x620), 0x0))
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x1388,
+                address=Op.CALLER,
+                value=Op.MLOAD(offset=0x620),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x800, value=0xC)
+        + Op.RETURN(offset=0x800, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0xCB0,
+            condition=Op.ISZERO(
+                Op.SLT(Op.MLOAD(offset=0x760), Op.MLOAD(offset=0x80))
+            ),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000003,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=Op.SUB(
+                Op.SLOAD(
+                    key=Op.ADD(
+                        0xE0000000000000000000000000000000000000003,
+                        Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+                    )
+                ),
+                Op.MLOAD(offset=0x760),
+            ),
+        )
+        + Op.JUMP(pc=0xFD4)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000000,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000001,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000002,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000003,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000004,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000005,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000006,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000007,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x820, value=Op.SLOAD(key=Op.SHA3))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x860, value=Op.SLOAD(key=Op.SHA3))
+        + Op.JUMPI(pc=0xE3A, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
+        + Op.MLOAD(offset=0x860)
+        + Op.JUMP(pc=0xE3D)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xEB7, condition=Op.ISZERO)
+        + Op.MLOAD(offset=0x860)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x820))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x820)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x860))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.JUMP(pc=0xF06)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xF05, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
+        + Op.SSTORE(
+            key=Op.ADD(0xB, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
+            value=Op.MLOAD(offset=0x820),
+        )
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x820))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.JUMPDEST * 2
+        + Op.JUMPI(pc=0xF46, condition=Op.ISZERO(Op.MLOAD(offset=0x860)))
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0xF86, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.SSTORE(
+            key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
+            value=Op.SUB(
+                Op.SLOAD(key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC))),
+                0x1,
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.MLOAD(offset=0x760)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.SUB
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x760)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x720))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.ADD
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x720))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=0x1388,
+                address=Op.CALLER,
+                value=Op.MLOAD(offset=0x120),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xA0]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.DUP2, value=0x2)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=Op.MLOAD(offset=0xA0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x40), value=Op.MLOAD(offset=0x760))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x60), value=Op.MLOAD(offset=0x1C0))
+        + Op.LOG4(
+            offset=Op.DUP6,
+            size=0x80,
+            topic_1=0xF9FE89F83633CC2ECA9B17E1F77422F037CB026EACA4E6A5337FA1595F50A81,  # noqa: E501
+            topic_2=Op.MLOAD(offset=0x40),
+            topic_3=Op.CALLER,
+            topic_4=Op.MLOAD(offset=0x720),
+        )
+        + Op.POP
+        + Op.JUMP(pc=0x1109)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x9E0, value=0xA)
+        + Op.RETURN(offset=0x9E0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMP(pc=0x1680)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x167F, condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x700), 0x2))
+        )
+        + Op.JUMPI(
+            pc=0x1671, condition=Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x620), 0x0))
+        )
+        + Op.JUMPI(
+            pc=0x1160,
+            condition=Op.ISZERO(
+                Op.SLT(Op.MLOAD(offset=0x620), Op.MLOAD(offset=0x6E0))
+            ),
+        )
+        + Op.JUMPI(
+            pc=0x1153, condition=Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x620), 0x0))
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x1388,
+                address=Op.CALLER,
+                value=Op.MLOAD(offset=0x620),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0xA00, value=0xC)
+        + Op.RETURN(offset=0xA00, size=0x20)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0xA20,
+            value=Op.SDIV(
+                Op.MUL(
+                    Op.MUL(Op.MLOAD(offset=0x80), Op.MLOAD(offset=0xA0)),
                     0xDE0B6B3A7640000,
                 ),
-            )
-            + Op.JUMPI(
-                pc=0x610,
-                condition=Op.ISZERO(
-                    Op.SLT(
+                Op.MUL(
+                    Op.MLOAD(offset=0x6C0), Op.EXP(0xA, Op.MLOAD(offset=0x6A0))
+                ),
+            ),
+        )
+        + Op.MLOAD(offset=0x620)
+        + Op.MLOAD(offset=0xA20)
+        + Op.JUMPI(pc=0x1198, condition=Op.ISZERO(Op.SLT(Op.DUP3, Op.DUP1)))
+        + Op.DUP2
+        + Op.JUMP(pc=0x119A)
+        + Op.JUMPDEST
+        + Op.DUP1
+        + Op.JUMPDEST
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x120]
+        + Op.MSTORE
+        + Op.JUMPI(
+            pc=0x121B,
+            condition=Op.ISZERO(
+                Op.SLT(Op.MLOAD(offset=0x120), Op.MLOAD(offset=0xA20))
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x760,
+            value=Op.SDIV(
+                Op.SDIV(
+                    Op.MUL(
                         Op.MLOAD(offset=0x120),
-                        Op.SLOAD(
-                            key=Op.ADD(
-                                0x5, Op.MUL(Op.MLOAD(offset=0x40), 0xC)
-                            ),
+                        Op.MUL(
+                            Op.MLOAD(offset=0x6C0),
+                            Op.EXP(0xA, Op.MLOAD(offset=0x6A0)),
                         ),
                     ),
+                    Op.MLOAD(offset=0xA0),
+                ),
+                0xDE0B6B3A7640000,
+            ),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000003,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=Op.SUB(
+                Op.SLOAD(
+                    key=Op.ADD(
+                        0xE0000000000000000000000000000000000000003,
+                        Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+                    )
+                ),
+                Op.MLOAD(offset=0x760),
+            ),
+        )
+        + Op.JUMP(pc=0x1546)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x760, value=Op.MLOAD(offset=0x80))
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000000,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000001,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000002,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000003,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000004,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000005,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000006,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000007,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x820, value=Op.SLOAD(key=Op.SHA3))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x860, value=Op.SLOAD(key=Op.SHA3))
+        + Op.JUMPI(pc=0x13AC, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
+        + Op.MLOAD(offset=0x860)
+        + Op.JUMP(pc=0x13AF)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1429, condition=Op.ISZERO)
+        + Op.MLOAD(offset=0x860)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x820))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x820)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x860))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.JUMP(pc=0x1478)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1477, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
+        + Op.SSTORE(
+            key=Op.ADD(0xB, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
+            value=Op.MLOAD(offset=0x820),
+        )
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x820))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.JUMPDEST * 2
+        + Op.JUMPI(pc=0x14B8, condition=Op.ISZERO(Op.MLOAD(offset=0x860)))
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x14F8, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.SSTORE(
+            key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
+            value=Op.SUB(
+                Op.SLOAD(key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC))),
+                0x1,
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.MLOAD(offset=0x760)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x720))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.SUB
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x720))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x760)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.ADD
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.POP(
+            Op.CALL(
+                gas=0x1388,
+                address=Op.MLOAD(offset=0x720),
+                value=Op.MLOAD(offset=0x120),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xA0]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.DUP2, value=0x1)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=Op.MLOAD(offset=0xA0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x40), value=Op.MLOAD(offset=0x760))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x60), value=Op.MLOAD(offset=0x1C0))
+        + Op.LOG4(
+            offset=Op.DUP6,
+            size=0x80,
+            topic_1=0xF9FE89F83633CC2ECA9B17E1F77422F037CB026EACA4E6A5337FA1595F50A81,  # noqa: E501
+            topic_2=Op.MLOAD(offset=0x40),
+            topic_3=Op.CALLER,
+            topic_4=Op.MLOAD(offset=0x720),
+        )
+        + Op.POP
+        + Op.JUMP(pc=0x167E)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0xC00, value=0xA)
+        + Op.RETURN(offset=0xC00, size=0x20)
+        + Op.JUMPDEST * 3
+        + Op.SSTORE(
+            key=Op.ADD(0x7, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
+            value=Op.MLOAD(offset=0xA0),
+        )
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xA0]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.DUP2, value=Op.MLOAD(offset=0x700))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=Op.MLOAD(offset=0xA0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x40), value=Op.MLOAD(offset=0x760))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x60), value=Op.TIMESTAMP)
+        + Op.LOG2(
+            offset=Op.DUP4,
+            size=0x80,
+            topic_1=0x50944F09CE56F9F0E2CB67683C9B451049C39F60452B850B169148F3DAA51ED6,  # noqa: E501
+            topic_2=Op.MLOAD(offset=0x40),
+        )
+        + Op.POP
+        + Op.MSTORE(
+            offset=0x5E0,
+            value=Op.SUB(Op.MLOAD(offset=0x5E0), Op.MLOAD(offset=0x760)),
+        )
+        + Op.MSTORE(
+            offset=0x620,
+            value=Op.SUB(Op.MLOAD(offset=0x620), Op.MLOAD(offset=0x120)),
+        )
+        + Op.MSTORE(offset=0x640, value=Op.ADD(Op.MLOAD(offset=0x640), 0x1))
+        + Op.JUMP(pc=0xA46)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1726, condition=Op.ISZERO(Op.MLOAD(offset=0x620)))
+        + Op.POP(
+            Op.CALL(
+                gas=0x1388,
+                address=Op.CALLER,
+                value=Op.MLOAD(offset=0x620),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0xC20, value=0x1)
+        + Op.RETURN(offset=0xC20, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x185B, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x34A501C7)))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x84]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x27F08B00)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.ADDRESS)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=Op.MLOAD(offset=0x80))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.SLOAD(
+                    key=Op.ADD(0x2, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
                 ),
-            )
-            + Op.JUMPI(
-                pc=0x603, condition=Op.ISZERO(Op.SGT(Op.CALLVALUE, 0x0))
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x1388,
-                    address=Op.CALLER,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x3E0, value=0xB)
-            + Op.RETURN(offset=0x3E0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x400, value=Op.SLOAD(key=Op.SHA3))
-            + Op.JUMPI(
-                pc=0x9FF,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.SLT(Op.MLOAD(offset=0x400), Op.MLOAD(offset=0x80)),
-                    ),
-                ),
-            )
-            + Op.PUSH1[0xE0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x6)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=0x2)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x40), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x60), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x80), value=Op.MLOAD(offset=0xA0)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0xA0), value=Op.CALLER)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0xC0), value=Op.NUMBER)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x180]
-            + Op.MSTORE
-            + Op.MLOAD(offset=0x180)
-            + Op.SHA3(
-                offset=Op.DUP2,
-                size=Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x1C0]
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=0x98A,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.SLOAD(
-                            key=Op.ADD(
-                                0xE0000000000000000000000000000000000000000,
-                                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                            ),
-                        ),
-                    ),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x64,
+                ret_offset=0xC40,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0xC40)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(pc=0x184E, condition=Op.ISZERO)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x400, value=Op.SLOAD(key=Op.SHA3))
+        + Op.MSTORE(
+            offset=0xC80,
+            value=Op.ADD(Op.MLOAD(offset=0x400), Op.MLOAD(offset=0x80)),
+        )
+        + Op.MLOAD(offset=0xC80)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x40]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.DUP2, value=Op.MLOAD(offset=0x80))
+        + Op.LOG3(
+            offset=Op.DUP5,
+            size=0x20,
+            topic_1=0x301CD746DBB5E7F9ADE2BCD9E8A849B968BFCC222DE48D2086BA200184ACC83D,  # noqa: E501
+            topic_2=Op.MLOAD(offset=0x40),
+            topic_3=Op.CALLER,
+        )
+        + Op.POP
+        + Op.MSTORE(offset=0xCC0, value=Op.MLOAD(offset=0xC80))
+        + Op.RETURN(offset=0xCC0, size=0x20)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0xCE0, value=0x0)
+        + Op.RETURN(offset=0xCE0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1982, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xE1ED3AD3)))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x400, value=Op.SLOAD(key=Op.SHA3))
+        + Op.JUMPI(
+            pc=0x1975,
+            condition=Op.ISZERO(
+                Op.ISZERO(
+                    Op.SLT(Op.MLOAD(offset=0x400), Op.MLOAD(offset=0x80))
+                )
+            ),
+        )
+        + Op.SUB(Op.MLOAD(offset=0x400), Op.MLOAD(offset=0x80))
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x86744558)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0x80))
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.SLOAD(
+                    key=Op.ADD(0x2, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
                 ),
-            )
-            + Op.SSTORE(
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x44,
+                ret_offset=0xD60,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0xD60)
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0xD40]
+        + Op.MSTORE
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x40]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.DUP2, value=Op.MLOAD(offset=0x80))
+        + Op.LOG3(
+            offset=Op.DUP5,
+            size=0x20,
+            topic_1=0xFA4460934F383B326D79DCD4F1E59A17AC8EE9A87312169933E7F68B85C1A8CE,  # noqa: E501
+            topic_2=Op.MLOAD(offset=0x40),
+            topic_3=Op.CALLER,
+        )
+        + Op.POP
+        + Op.MSTORE(offset=0xD80, value=Op.MLOAD(offset=0xD40))
+        + Op.RETURN(offset=0xD80, size=0x20)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0xDA0, value=0x0)
+        + Op.RETURN(offset=0xDA0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1F08, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x327A22F1)))
+        + Op.MSTORE(offset=0x1C0, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(
+            offset=0x700,
+            value=Op.SLOAD(
                 key=Op.ADD(
-                    0xE0000000000000000000000000000000000000000,
+                    0xE0000000000000000000000000000000000000001,
                     Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=Op.MLOAD(offset=0x1C0),
-            )
-            + Op.SSTORE(
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=Op.SLOAD(
                 key=Op.ADD(
-                    0xE0000000000000000000000000000000000000001,
+                    0xE0000000000000000000000000000000000000003,
                     Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x2,
-            )
-            + Op.SSTORE(
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=Op.SLOAD(
+                key=Op.ADD(
+                    0xE0000000000000000000000000000000000000004,
+                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x720,
+            value=Op.SLOAD(
+                key=Op.ADD(
+                    0xE0000000000000000000000000000000000000005,
+                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=Op.SLOAD(
                 key=Op.ADD(
                     0xE0000000000000000000000000000000000000002,
                     Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x680,
+            value=Op.SLOAD(
+                key=Op.ADD(0x2, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x6A0,
+            value=Op.SLOAD(
+                key=Op.ADD(0x3, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x6C0,
+            value=Op.SLOAD(
+                key=Op.ADD(0x4, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
+            ),
+        )
+        + Op.JUMPI(
+            pc=0x1EFB,
+            condition=Op.ISZERO(Op.EQ(Op.CALLER, Op.MLOAD(offset=0x720))),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000000,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000001,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000002,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000003,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000004,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000005,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000006,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xE0000000000000000000000000000000000000007,
+                Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
+            ),
+            value=0x0,
+        )
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x820, value=Op.SLOAD(key=Op.SHA3))
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x860, value=Op.SLOAD(key=Op.SHA3))
+        + Op.JUMPI(pc=0x1C00, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
+        + Op.MLOAD(offset=0x860)
+        + Op.JUMP(pc=0x1C03)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1C7D, condition=Op.ISZERO)
+        + Op.MLOAD(offset=0x860)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x820))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x820)
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x860))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.JUMP(pc=0x1CCC)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1CCB, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
+        + Op.SSTORE(
+            key=Op.ADD(0xB, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
+            value=Op.MLOAD(offset=0x820),
+        )
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x820))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.JUMPDEST * 2
+        + Op.JUMPI(pc=0x1D0C, condition=Op.ISZERO(Op.MLOAD(offset=0x860)))
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x1D4C, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.SSTORE(
+            key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
+            value=Op.SUB(
+                Op.SLOAD(key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC))),
+                0x1,
+            ),
+        )
+        + Op.JUMPI(
+            pc=0x1DDE, condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x700), 0x1))
+        )
+        + Op.MSTORE(
+            offset=0x120,
+            value=Op.MUL(
+                Op.SDIV(
+                    Op.MUL(Op.MLOAD(offset=0x80), Op.MLOAD(offset=0xA0)),
+                    Op.MUL(
+                        Op.MLOAD(offset=0x6C0),
+                        Op.EXP(0xA, Op.MLOAD(offset=0x6A0)),
+                    ),
                 ),
-                value=Op.MLOAD(offset=0x40),
-            )
-            + Op.SSTORE(
+                0xDE0B6B3A7640000,
+            ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0x1388,
+                address=Op.CALLER,
+                value=Op.MLOAD(offset=0x120),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.JUMP(pc=0x1E9C)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1E9B, condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x700), 0x2))
+        )
+        + Op.MLOAD(offset=0x80)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.SUB
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.MLOAD(offset=0x80)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SLOAD(key=Op.SHA3)
+        + Op.ADD
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.SHA3
+        + Op.SSTORE
+        + Op.JUMPDEST * 2
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xA0]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.DUP2, value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=Op.MLOAD(offset=0xA0))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x40), value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x60), value=Op.MLOAD(offset=0x1C0))
+        + Op.LOG2(
+            offset=Op.DUP4,
+            size=0x80,
+            topic_1=0xAC6333455D304288767A0F1039D666D16882D10B6EA83693D2556E4C8098001,  # noqa: E501
+            topic_2=Op.MLOAD(offset=0x40),
+        )
+        + Op.POP
+        + Op.MSTORE(offset=0xF40, value=0x1)
+        + Op.RETURN(offset=0xF40, size=0x20)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0xF60, value=0x0)
+        + Op.RETURN(offset=0xF60, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x22F0, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xD91E22F4)))
+        + Op.MSTORE(offset=0xF80, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x680, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.MSTORE(offset=0x6A0, value=Op.CALLDATALOAD(offset=0x44))
+        + Op.MSTORE(offset=0x6C0, value=Op.CALLDATALOAD(offset=0x64))
+        + Op.MSTORE(offset=0x6E0, value=Op.CALLDATALOAD(offset=0x84))
+        + Op.MSTORE(offset=0xFA0, value=Op.CALLDATALOAD(offset=0xA4))
+        + Op.MSTORE(
+            offset=0xFC0,
+            value=Op.ADD(
+                Op.SLOAD(key=0x160000000000000000000000000000000000000000), 0x1
+            ),
+        )
+        + Op.JUMPI(
+            pc=0x1F76,
+            condition=Op.ISZERO(
+                Op.ISZERO(Op.SGT(Op.MLOAD(offset=0xF80), 0x0))
+            ),
+        )
+        + Op.MSTORE(offset=0xFE0, value=0x1E)
+        + Op.RETURN(offset=0xFE0, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1FA4,
+            condition=Op.ISZERO(
+                Op.SLOAD(
+                    key=Op.ADD(
+                        0xD0000000000000000000000000000000000000000,
+                        Op.MLOAD(offset=0xF80),
+                    )
+                )
+            ),
+        )
+        + Op.MSTORE(offset=0x1000, value=0x1F)
+        + Op.RETURN(offset=0x1000, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1FBE,
+            condition=Op.ISZERO(
+                Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x680), 0x0))
+            ),
+        )
+        + Op.MSTORE(offset=0x1020, value=0x20)
+        + Op.RETURN(offset=0x1020, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1FD7, condition=Op.ISZERO(Op.SLT(Op.MLOAD(offset=0xFA0), 0x0))
+        )
+        + Op.MSTORE(offset=0x1040, value=0x21)
+        + Op.RETURN(offset=0x1040, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1FF0, condition=Op.ISZERO(Op.SLT(Op.MLOAD(offset=0x6A0), 0x0))
+        )
+        + Op.MSTORE(offset=0x1060, value=0x22)
+        + Op.RETURN(offset=0x1060, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2009, condition=Op.ISZERO(Op.SLT(Op.MLOAD(offset=0x6C0), 0x0))
+        )
+        + Op.MSTORE(offset=0x1080, value=0x23)
+        + Op.RETURN(offset=0x1080, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2022, condition=Op.ISZERO(Op.SLT(Op.MLOAD(offset=0x6E0), 0x0))
+        )
+        + Op.MSTORE(offset=0x10A0, value=0x24)
+        + Op.RETURN(offset=0x10A0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xC32D01A1)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.ADDRESS)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x680),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x44,
+                ret_offset=0x10C0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x10C0)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(pc=0x2075, condition=Op.ISZERO(Op.ISZERO(Op.EQ)))
+        + Op.MSTORE(offset=0x10E0, value=0x28)
+        + Op.RETURN(offset=0x10E0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x83B58638)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.ADDRESS)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=0x0)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x680),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x44,
+                ret_offset=0x1100,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x1100)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(pc=0x20C9, condition=Op.ISZERO(Op.ISZERO(Op.EQ)))
+        + Op.MSTORE(offset=0x1120, value=0x29)
+        + Op.RETURN(offset=0x1120, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x44]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x26690247)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.ADDRESS)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x680),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x24,
+                ret_offset=0x1140,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x1140)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(pc=0x2116, condition=Op.ISZERO(Op.ISZERO(Op.EQ)))
+        + Op.MSTORE(offset=0x1160, value=0x2A)
+        + Op.RETURN(offset=0x1160, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x64]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x86744558)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=0x0)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x680),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x44,
+                ret_offset=0x1180,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x1180)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(pc=0x216A, condition=Op.ISZERO(Op.ISZERO(Op.EQ)))
+        + Op.MSTORE(offset=0x11A0, value=0x2B)
+        + Op.RETURN(offset=0x11A0, size=0x20)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x84]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x27F08B00)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.ADDRESS)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.CALLER)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=0x0)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2D),
+                address=Op.MLOAD(offset=0x680),
+                value=0x0,
+                args_offset=Op.DUP4,
+                args_size=0x64,
+                ret_offset=0x11C0,
+                ret_size=0x20,
+            )
+        )
+        + Op.MLOAD(offset=0x11C0)
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(pc=0x21C4, condition=Op.ISZERO(Op.ISZERO(Op.EQ)))
+        + Op.MSTORE(offset=0x11E0, value=0x2C)
+        + Op.RETURN(offset=0x11E0, size=0x20)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.MUL(Op.MLOAD(offset=0xFC0), 0xC),
+            value=Op.MLOAD(offset=0xFC0),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(0x1, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
+            value=Op.MLOAD(offset=0xF80),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(0x2, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
+            value=Op.MLOAD(offset=0x680),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(0x6, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
+            value=Op.MLOAD(offset=0xFA0),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(0x3, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
+            value=Op.MLOAD(offset=0x6A0),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(0x4, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
+            value=Op.MLOAD(offset=0x6C0),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(0x5, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
+            value=Op.MLOAD(offset=0x6E0),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(0x7, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)), value=0x1
+        )
+        + Op.SSTORE(
+            key=Op.ADD(0x8, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
+            value=Op.CALLER,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(0x9, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
+            value=Op.NUMBER,
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xC0000000000000000000000000000000000000000,
+                Op.MLOAD(offset=0x680),
+            ),
+            value=Op.MLOAD(offset=0xFC0),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(
+                0xD0000000000000000000000000000000000000000,
+                Op.MLOAD(offset=0xF80),
+            ),
+            value=Op.MLOAD(offset=0xFC0),
+        )
+        + Op.SSTORE(
+            key=0x160000000000000000000000000000000000000000,
+            value=Op.MLOAD(offset=0xFC0),
+        )
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0x40]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.ADD
+        + Op.MSTORE(offset=Op.DUP2, value=Op.MLOAD(offset=0xFC0))
+        + Op.LOG1(
+            offset=Op.DUP3,
+            size=0x20,
+            topic_1=0x1238FE6D44CF796960D61B74766B3A383110E472D849F5CA16AE50215BC05E58,  # noqa: E501
+        )
+        + Op.POP
+        + Op.MSTORE(offset=0x1200, value=0x1)
+        + Op.RETURN(offset=0x1200, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x232A, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x41569661)))
+        + Op.MSTORE(offset=0x1220, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(
+            offset=0x1240,
+            value=Op.SLOAD(
+                key=Op.ADD(
+                    0xC0000000000000000000000000000000000000000,
+                    Op.MLOAD(offset=0x1220),
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x1240, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x2364, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xFCDE9F78)))
+        + Op.MSTORE(offset=0xF80, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(
+            offset=0x1260,
+            value=Op.SLOAD(
+                key=Op.ADD(
+                    0xD0000000000000000000000000000000000000000,
+                    Op.MLOAD(offset=0xF80),
+                )
+            ),
+        )
+        + Op.RETURN(offset=0x1260, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x2392, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x6E5B4343)))
+        + Op.MSTORE(
+            offset=0x1280,
+            value=Op.SLOAD(key=0x160000000000000000000000000000000000000000),
+        )
+        + Op.RETURN(offset=0x1280, size=0x20)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x24E6, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xFAFA69C2)))
+        + Op.MSTORE(offset=0xFC0, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH2[0x180]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0xB)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x12A0]
+        + Op.MSTORE
+        + Op.MSTORE(
+            offset=Op.MLOAD(offset=0x12A0),
+            value=Op.SLOAD(key=Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0x20),
+            value=Op.SLOAD(
+                key=Op.ADD(0x1, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC))
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0x40),
+            value=Op.SLOAD(
+                key=Op.ADD(0x2, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC))
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0x60),
+            value=Op.SLOAD(
+                key=Op.ADD(0x3, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC))
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0x80),
+            value=Op.SLOAD(
+                key=Op.ADD(0x4, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC))
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0xA0),
+            value=Op.SLOAD(
+                key=Op.ADD(0x5, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC))
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0xC0),
+            value=Op.SLOAD(
+                key=Op.ADD(0x7, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC))
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0xE0),
+            value=Op.SLOAD(
+                key=Op.ADD(0x8, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC))
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0x100),
+            value=Op.SLOAD(
+                key=Op.ADD(0x9, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC))
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0x120),
+            value=Op.SLOAD(
+                key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC))
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0x140),
+            value=Op.SLOAD(
+                key=Op.ADD(0x6, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC))
+            ),
+        )
+        + Op.JUMPI(pc=0x24B2, condition=Op.ISZERO(Op.MLOAD(offset=0x12A0)))
+        + Op.MLOAD(offset=0x12A0)
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x40]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x1)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=0x0)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x262E, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x9CFC1535)))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(
+            offset=0x1340,
+            value=Op.SLOAD(
+                key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
+            ),
+        )
+        + Op.MSTORE(
+            offset=0x1C0,
+            value=Op.SLOAD(
+                key=Op.ADD(0xB, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
+            ),
+        )
+        + Op.MLOAD(offset=0x1340)
+        + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x600]
+        + Op.MSTORE
+        + Op.MSTORE(offset=0x13A0, value=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x25D4,
+            condition=Op.ISZERO(
+                Op.SLT(Op.MLOAD(offset=0x13A0), Op.MLOAD(offset=0x1340))
+            ),
+        )
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(
+            offset=Op.ADD(
+                Op.MLOAD(offset=0x600), Op.MUL(0x20, Op.MLOAD(offset=0x13A0))
+            ),
+            value=Op.SLOAD(key=Op.SHA3),
+        )
+        + Op.PUSH1[0xA0] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x0)
+        + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0))
+        + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=0x1C0, value=Op.SLOAD(key=Op.SHA3))
+        + Op.MSTORE(offset=0x13A0, value=Op.ADD(Op.MLOAD(offset=0x13A0), 0x1))
+        + Op.JUMP(pc=0x253D)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x25FA, condition=Op.ISZERO(Op.MLOAD(offset=0x600)))
+        + Op.MLOAD(offset=0x600)
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x40]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x1)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=0x0)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x27E9, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xF718190)))
+        + Op.MSTORE(offset=0xFC0, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.PUSH2[0x120]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x8)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x180]
+        + Op.MSTORE
+        + Op.MSTORE(
+            offset=Op.MLOAD(offset=0x180),
+            value=Op.SLOAD(
+                key=Op.ADD(
+                    0xE0000000000000000000000000000000000000000,
+                    Op.MUL(Op.MLOAD(offset=0xFC0), 0x8),
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x180), 0x20),
+            value=Op.SLOAD(
+                key=Op.ADD(
+                    0xE0000000000000000000000000000000000000001,
+                    Op.MUL(Op.MLOAD(offset=0xFC0), 0x8),
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x180), 0x40),
+            value=Op.SLOAD(
+                key=Op.ADD(
+                    0xE0000000000000000000000000000000000000002,
+                    Op.MUL(Op.MLOAD(offset=0xFC0), 0x8),
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x180), 0x60),
+            value=Op.SLOAD(
                 key=Op.ADD(
                     0xE0000000000000000000000000000000000000003,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=Op.MLOAD(offset=0x80),
-            )
-            + Op.SSTORE(
+                    Op.MUL(Op.MLOAD(offset=0xFC0), 0x8),
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x180), 0x80),
+            value=Op.SLOAD(
                 key=Op.ADD(
                     0xE0000000000000000000000000000000000000004,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=Op.MLOAD(offset=0xA0),
-            )
-            + Op.SSTORE(
+                    Op.MUL(Op.MLOAD(offset=0xFC0), 0x8),
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x180), 0xA0),
+            value=Op.SLOAD(
                 key=Op.ADD(
                     0xE0000000000000000000000000000000000000005,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=Op.CALLER,
-            )
-            + Op.SSTORE(
+                    Op.MUL(Op.MLOAD(offset=0xFC0), 0x8),
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x180), 0xC0),
+            value=Op.SLOAD(
                 key=Op.ADD(
                     0xE0000000000000000000000000000000000000006,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=Op.NUMBER,
-            )
-            + Op.SSTORE(
+                    Op.MUL(Op.MLOAD(offset=0xFC0), 0x8),
+                )
+            ),
+        )
+        + Op.MSTORE(
+            offset=Op.ADD(Op.MLOAD(offset=0x180), 0xE0),
+            value=Op.SLOAD(
                 key=Op.ADD(
                     0xE0000000000000000000000000000000000000007,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=Op.ADD(
-                    0xE0000000000000000000000000000000000000000,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x200,
-                value=Op.SLOAD(
-                    key=Op.ADD(0xB, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                ),
-            )
-            + Op.MLOAD(offset=0x1C0)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x200)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x200)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x1C0)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.SSTORE(
-                key=Op.ADD(0xB, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                value=Op.MLOAD(offset=0x1C0),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                value=Op.ADD(
-                    Op.SLOAD(
-                        key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
-                    ),
-                    0x1,
-                ),
-            )
-            + Op.JUMPI(pc=0x985, condition=Op.ISZERO(Op.EQ(0x2, 0x2)))
-            + Op.MLOAD(offset=0x80)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.SUB
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x80)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.ADD
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.JUMPDEST
-            + Op.JUMP(pc=0x997)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x560, value=0x15)
-            + Op.RETURN(offset=0x560, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xC0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.DUP2, value=Op.CALLER)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=0x2)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x40), value=Op.MLOAD(offset=0xA0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x60), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x80), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.LOG2(
-                offset=Op.DUP4,
-                size=0xA0,
-                topic_1=0x9463D1CC4AA2DB0DC624C996B1846F028D43C48CFC8B9F427F13336E4A732264,  # noqa: E501
-                topic_2=Op.MLOAD(offset=0x40),
-            )
-            + Op.POP
-            + Op.MSTORE(offset=0x580, value=Op.MLOAD(offset=0x1C0))
-            + Op.RETURN(offset=0x580, size=0x20)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x5A0, value=0x0)
-            + Op.RETURN(offset=0x5A0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1733, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x9998BD00))
-            )
-            + Op.CALLDATASIZE
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP3,
-                offset=0x4,
-                size=Op.CALLDATASIZE,
-            )
-            + Op.MSTORE(offset=0x5E0, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(
-                offset=0x600,
-                value=Op.ADD(
-                    Op.ADD(Op.DUP3, 0x20), Op.CALLDATALOAD(offset=0x24)
-                ),
-            )
-            + Op.POP
-            + Op.MSTORE(offset=0x620, value=Op.CALLVALUE)
-            + Op.MSTORE(offset=0x640, value=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x170A,
-                condition=Op.ISZERO(
-                    Op.SLT(
-                        Op.MLOAD(offset=0x640),
-                        Op.MLOAD(offset=Op.SUB(Op.MLOAD(offset=0x600), 0x20)),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x1C0,
-                value=Op.MLOAD(
-                    offset=Op.ADD(
-                        Op.MLOAD(offset=0x600),
-                        Op.MUL(0x20, Op.MLOAD(offset=0x640)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=0xA9D,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.SGT(
-                            Op.NUMBER,
-                            Op.SLOAD(
-                                key=Op.ADD(
-                                    0xE0000000000000000000000000000000000000006,  # noqa: E501
-                                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                                ),
-                            ),
-                        ),
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x660, value=0x16)
-            + Op.RETURN(offset=0x660, size=0x20)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x40,
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000002,
-                        Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x680,
-                value=Op.SLOAD(
-                    key=Op.ADD(0x2, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x6A0,
-                value=Op.SLOAD(
-                    key=Op.ADD(0x3, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x6C0,
-                value=Op.SLOAD(
-                    key=Op.ADD(0x4, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x6E0,
-                value=Op.SLOAD(
-                    key=Op.ADD(0x5, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x700,
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000001,
-                        Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000003,
-                        Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000004,
-                        Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x720,
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000005,
-                        Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=0x110E,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x700), 0x1)),
-            )
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x400, value=Op.SLOAD(key=Op.SHA3))
-            + Op.JUMPI(
-                pc=0x10FC,
-                condition=Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x400), 0x0)),
-            )
-            + Op.MLOAD(offset=0x80)
-            + Op.MLOAD(offset=0x400)
-            + Op.MLOAD(offset=0x5E0)
-            + Op.JUMPI(pc=0xBE0, condition=Op.ISZERO(Op.SLT(Op.DUP3, Op.DUP1)))
-            + Op.DUP2
-            + Op.JUMP(pc=0xBE2)
-            + Op.JUMPDEST
-            + Op.DUP1
-            + Op.JUMPDEST
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(pc=0xBF4, condition=Op.ISZERO(Op.SLT(Op.DUP3, Op.DUP1)))
-            + Op.DUP2
-            + Op.JUMP(pc=0xBF6)
-            + Op.JUMPDEST
-            + Op.DUP1
-            + Op.JUMPDEST
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x760]
-            + Op.MSTORE
-            + Op.MSTORE(
-                offset=0x120,
-                value=Op.SDIV(
-                    Op.MUL(
-                        Op.MUL(Op.MLOAD(offset=0x760), Op.MLOAD(offset=0xA0)),
-                        0xDE0B6B3A7640000,
-                    ),
-                    Op.MUL(
-                        Op.MLOAD(offset=0x6C0),
-                        Op.EXP(0xA, Op.MLOAD(offset=0x6A0)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=0xC5B,
-                condition=Op.ISZERO(
-                    Op.SLT(Op.MLOAD(offset=0x120), Op.MLOAD(offset=0x6E0)),
-                ),
-            )
-            + Op.JUMPI(
-                pc=0xC4E,
-                condition=Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x620), 0x0)),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x1388,
-                    address=Op.CALLER,
-                    value=Op.MLOAD(offset=0x620),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x800, value=0xC)
-            + Op.RETURN(offset=0x800, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0xCB0,
-                condition=Op.ISZERO(
-                    Op.SLT(Op.MLOAD(offset=0x760), Op.MLOAD(offset=0x80)),
-                ),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000003,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=Op.SUB(
-                    Op.SLOAD(
-                        key=Op.ADD(
-                            0xE0000000000000000000000000000000000000003,
-                            Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                        ),
-                    ),
-                    Op.MLOAD(offset=0x760),
-                ),
-            )
-            + Op.JUMP(pc=0xFD4)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000000,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000001,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000002,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000003,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000004,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000005,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000006,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000007,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x820, value=Op.SLOAD(key=Op.SHA3))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x860, value=Op.SLOAD(key=Op.SHA3))
-            + Op.JUMPI(pc=0xE3A, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
-            + Op.MLOAD(offset=0x860)
-            + Op.JUMP(pc=0xE3D)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0xEB7, condition=Op.ISZERO)
-            + Op.MLOAD(offset=0x860)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x820)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x820)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x860)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.JUMP(pc=0xF06)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0xF05, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
-            + Op.SSTORE(
-                key=Op.ADD(0xB, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                value=Op.MLOAD(offset=0x820),
-            )
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x820)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0xF46, condition=Op.ISZERO(Op.MLOAD(offset=0x860)))
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0xF86, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.SSTORE(
-                key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                value=Op.SUB(
-                    Op.SLOAD(
-                        key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
-                    ),
-                    0x1,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.MLOAD(offset=0x760)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.SUB
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x760)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x720)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.ADD
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x720)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=0x1388,
-                    address=Op.CALLER,
-                    value=Op.MLOAD(offset=0x120),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.DUP2, value=0x2)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x20), value=Op.MLOAD(offset=0xA0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x40), value=Op.MLOAD(offset=0x760)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x60), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.LOG4(
-                offset=Op.DUP6,
-                size=0x80,
-                topic_1=0xF9FE89F83633CC2ECA9B17E1F77422F037CB026EACA4E6A5337FA1595F50A81,  # noqa: E501
-                topic_2=Op.MLOAD(offset=0x40),
-                topic_3=Op.CALLER,
-                topic_4=Op.MLOAD(offset=0x720),
-            )
-            + Op.POP
-            + Op.JUMP(pc=0x1109)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x9E0, value=0xA)
-            + Op.RETURN(offset=0x9E0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMP(pc=0x1680)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x167F,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x700), 0x2)),
-            )
-            + Op.JUMPI(
-                pc=0x1671,
-                condition=Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x620), 0x0)),
-            )
-            + Op.JUMPI(
-                pc=0x1160,
-                condition=Op.ISZERO(
-                    Op.SLT(Op.MLOAD(offset=0x620), Op.MLOAD(offset=0x6E0)),
-                ),
-            )
-            + Op.JUMPI(
-                pc=0x1153,
-                condition=Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x620), 0x0)),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x1388,
-                    address=Op.CALLER,
-                    value=Op.MLOAD(offset=0x620),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0xA00, value=0xC)
-            + Op.RETURN(offset=0xA00, size=0x20)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0xA20,
-                value=Op.SDIV(
-                    Op.MUL(
-                        Op.MUL(Op.MLOAD(offset=0x80), Op.MLOAD(offset=0xA0)),
-                        0xDE0B6B3A7640000,
-                    ),
-                    Op.MUL(
-                        Op.MLOAD(offset=0x6C0),
-                        Op.EXP(0xA, Op.MLOAD(offset=0x6A0)),
-                    ),
-                ),
-            )
-            + Op.MLOAD(offset=0x620)
-            + Op.MLOAD(offset=0xA20)
-            + Op.JUMPI(
-                pc=0x1198, condition=Op.ISZERO(Op.SLT(Op.DUP3, Op.DUP1))
-            )
-            + Op.DUP2
-            + Op.JUMP(pc=0x119A)
-            + Op.JUMPDEST
-            + Op.DUP1
-            + Op.JUMPDEST
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x120]
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=0x121B,
-                condition=Op.ISZERO(
-                    Op.SLT(Op.MLOAD(offset=0x120), Op.MLOAD(offset=0xA20)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x760,
-                value=Op.SDIV(
-                    Op.SDIV(
-                        Op.MUL(
-                            Op.MLOAD(offset=0x120),
-                            Op.MUL(
-                                Op.MLOAD(offset=0x6C0),
-                                Op.EXP(0xA, Op.MLOAD(offset=0x6A0)),
-                            ),
-                        ),
-                        Op.MLOAD(offset=0xA0),
-                    ),
-                    0xDE0B6B3A7640000,
-                ),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000003,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=Op.SUB(
-                    Op.SLOAD(
-                        key=Op.ADD(
-                            0xE0000000000000000000000000000000000000003,
-                            Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                        ),
-                    ),
-                    Op.MLOAD(offset=0x760),
-                ),
-            )
-            + Op.JUMP(pc=0x1546)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x760, value=Op.MLOAD(offset=0x80))
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000000,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000001,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000002,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000003,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000004,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000005,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000006,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000007,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x820, value=Op.SLOAD(key=Op.SHA3))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x860, value=Op.SLOAD(key=Op.SHA3))
-            + Op.JUMPI(pc=0x13AC, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
-            + Op.MLOAD(offset=0x860)
-            + Op.JUMP(pc=0x13AF)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x1429, condition=Op.ISZERO)
-            + Op.MLOAD(offset=0x860)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x820)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x820)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x860)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.JUMP(pc=0x1478)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x1477, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
-            + Op.SSTORE(
-                key=Op.ADD(0xB, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                value=Op.MLOAD(offset=0x820),
-            )
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x820)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x14B8, condition=Op.ISZERO(Op.MLOAD(offset=0x860)))
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x14F8, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.SSTORE(
-                key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                value=Op.SUB(
-                    Op.SLOAD(
-                        key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
-                    ),
-                    0x1,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.MLOAD(offset=0x760)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x720)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.SUB
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x720)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x760)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.ADD
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.POP(
-                Op.CALL(
-                    gas=0x1388,
-                    address=Op.MLOAD(offset=0x720),
-                    value=Op.MLOAD(offset=0x120),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.DUP2, value=0x1)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x20), value=Op.MLOAD(offset=0xA0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x40), value=Op.MLOAD(offset=0x760)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x60), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.LOG4(
-                offset=Op.DUP6,
-                size=0x80,
-                topic_1=0xF9FE89F83633CC2ECA9B17E1F77422F037CB026EACA4E6A5337FA1595F50A81,  # noqa: E501
-                topic_2=Op.MLOAD(offset=0x40),
-                topic_3=Op.CALLER,
-                topic_4=Op.MLOAD(offset=0x720),
-            )
-            + Op.POP
-            + Op.JUMP(pc=0x167E)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0xC00, value=0xA)
-            + Op.RETURN(offset=0xC00, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.ADD(0x7, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                value=Op.MLOAD(offset=0xA0),
-            )
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.DUP2, value=Op.MLOAD(offset=0x700))
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x20), value=Op.MLOAD(offset=0xA0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x40), value=Op.MLOAD(offset=0x760)
-            )
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x60), value=Op.TIMESTAMP)
-            + Op.LOG2(
-                offset=Op.DUP4,
-                size=0x80,
-                topic_1=0x50944F09CE56F9F0E2CB67683C9B451049C39F60452B850B169148F3DAA51ED6,  # noqa: E501
-                topic_2=Op.MLOAD(offset=0x40),
-            )
-            + Op.POP
-            + Op.MSTORE(
-                offset=0x5E0,
-                value=Op.SUB(Op.MLOAD(offset=0x5E0), Op.MLOAD(offset=0x760)),
-            )
-            + Op.MSTORE(
-                offset=0x620,
-                value=Op.SUB(Op.MLOAD(offset=0x620), Op.MLOAD(offset=0x120)),
-            )
-            + Op.MSTORE(
-                offset=0x640, value=Op.ADD(Op.MLOAD(offset=0x640), 0x1)
-            )
-            + Op.JUMP(pc=0xA46)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x1726, condition=Op.ISZERO(Op.MLOAD(offset=0x620)))
-            + Op.POP(
-                Op.CALL(
-                    gas=0x1388,
-                    address=Op.CALLER,
-                    value=Op.MLOAD(offset=0x620),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0xC20, value=0x1)
-            + Op.RETURN(offset=0xC20, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x185B, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x34A501C7))
-            )
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x84]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x27F08B00)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.CALLER)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.ADDRESS)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x44), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.SLOAD(
-                        key=Op.ADD(0x2, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                    ),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x64,
-                    ret_offset=0xC40,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0xC40)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(pc=0x184E, condition=Op.ISZERO)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x400, value=Op.SLOAD(key=Op.SHA3))
-            + Op.MSTORE(
-                offset=0xC80,
-                value=Op.ADD(Op.MLOAD(offset=0x400), Op.MLOAD(offset=0x80)),
-            )
-            + Op.MLOAD(offset=0xC80)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x40]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.DUP2, value=Op.MLOAD(offset=0x80))
-            + Op.LOG3(
-                offset=Op.DUP5,
-                size=0x20,
-                topic_1=0x301CD746DBB5E7F9ADE2BCD9E8A849B968BFCC222DE48D2086BA200184ACC83D,  # noqa: E501
-                topic_2=Op.MLOAD(offset=0x40),
-                topic_3=Op.CALLER,
-            )
-            + Op.POP
-            + Op.MSTORE(offset=0xCC0, value=Op.MLOAD(offset=0xC80))
-            + Op.RETURN(offset=0xCC0, size=0x20)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0xCE0, value=0x0)
-            + Op.RETURN(offset=0xCE0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1982, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xE1ED3AD3))
-            )
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x400, value=Op.SLOAD(key=Op.SHA3))
-            + Op.JUMPI(
-                pc=0x1975,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.SLT(Op.MLOAD(offset=0x400), Op.MLOAD(offset=0x80)),
-                    ),
-                ),
-            )
-            + Op.SUB(Op.MLOAD(offset=0x400), Op.MLOAD(offset=0x80))
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x86744558)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x24), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.SLOAD(
-                        key=Op.ADD(0x2, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                    ),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x44,
-                    ret_offset=0xD60,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0xD60)
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0xD40]
-            + Op.MSTORE
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x40]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.DUP2, value=Op.MLOAD(offset=0x80))
-            + Op.LOG3(
-                offset=Op.DUP5,
-                size=0x20,
-                topic_1=0xFA4460934F383B326D79DCD4F1E59A17AC8EE9A87312169933E7F68B85C1A8CE,  # noqa: E501
-                topic_2=Op.MLOAD(offset=0x40),
-                topic_3=Op.CALLER,
-            )
-            + Op.POP
-            + Op.MSTORE(offset=0xD80, value=Op.MLOAD(offset=0xD40))
-            + Op.RETURN(offset=0xD80, size=0x20)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0xDA0, value=0x0)
-            + Op.RETURN(offset=0xDA0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1F08, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x327A22F1))
-            )
-            + Op.MSTORE(offset=0x1C0, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(
-                offset=0x700,
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000001,
-                        Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000003,
-                        Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000004,
-                        Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x720,
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000005,
-                        Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000002,
-                        Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x680,
-                value=Op.SLOAD(
-                    key=Op.ADD(0x2, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x6A0,
-                value=Op.SLOAD(
-                    key=Op.ADD(0x3, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x6C0,
-                value=Op.SLOAD(
-                    key=Op.ADD(0x4, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                ),
-            )
-            + Op.JUMPI(
-                pc=0x1EFB,
-                condition=Op.ISZERO(Op.EQ(Op.CALLER, Op.MLOAD(offset=0x720))),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000000,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000001,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000002,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000003,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000004,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000005,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000006,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xE0000000000000000000000000000000000000007,
-                    Op.MUL(Op.MLOAD(offset=0x1C0), 0x8),
-                ),
-                value=0x0,
-            )
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x820, value=Op.SLOAD(key=Op.SHA3))
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x860, value=Op.SLOAD(key=Op.SHA3))
-            + Op.JUMPI(pc=0x1C00, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
-            + Op.MLOAD(offset=0x860)
-            + Op.JUMP(pc=0x1C03)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x1C7D, condition=Op.ISZERO)
-            + Op.MLOAD(offset=0x860)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x820)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x820)
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x860)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.JUMP(pc=0x1CCC)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x1CCB, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
-            + Op.SSTORE(
-                key=Op.ADD(0xB, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                value=Op.MLOAD(offset=0x820),
-            )
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x820)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x1D0C, condition=Op.ISZERO(Op.MLOAD(offset=0x860)))
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x1D4C, condition=Op.ISZERO(Op.MLOAD(offset=0x820)))
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.SSTORE(
-                key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                value=Op.SUB(
-                    Op.SLOAD(
-                        key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC))
-                    ),
-                    0x1,
-                ),
-            )
-            + Op.JUMPI(
-                pc=0x1DDE,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x700), 0x1)),
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=Op.MUL(
-                    Op.SDIV(
-                        Op.MUL(Op.MLOAD(offset=0x80), Op.MLOAD(offset=0xA0)),
-                        Op.MUL(
-                            Op.MLOAD(offset=0x6C0),
-                            Op.EXP(0xA, Op.MLOAD(offset=0x6A0)),
-                        ),
-                    ),
-                    0xDE0B6B3A7640000,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0x1388,
-                    address=Op.CALLER,
-                    value=Op.MLOAD(offset=0x120),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMP(pc=0x1E9C)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1E9B,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x700), 0x2)),
-            )
-            + Op.MLOAD(offset=0x80)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.SUB
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.MLOAD(offset=0x80)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SLOAD(key=Op.SHA3)
-            + Op.ADD
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(offset=Op.ADD(0x20, Op.DUP2), value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.SHA3
-            + Op.SSTORE
-            + Op.JUMPDEST
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.DUP2, value=Op.CALLER)
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x20), value=Op.MLOAD(offset=0xA0)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x40), value=Op.MLOAD(offset=0x80)
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x60), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.LOG2(
-                offset=Op.DUP4,
-                size=0x80,
-                topic_1=0xAC6333455D304288767A0F1039D666D16882D10B6EA83693D2556E4C8098001,  # noqa: E501
-                topic_2=Op.MLOAD(offset=0x40),
-            )
-            + Op.POP
-            + Op.MSTORE(offset=0xF40, value=0x1)
-            + Op.RETURN(offset=0xF40, size=0x20)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0xF60, value=0x0)
-            + Op.RETURN(offset=0xF60, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x22F0, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xD91E22F4))
-            )
-            + Op.MSTORE(offset=0xF80, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x680, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.MSTORE(offset=0x6A0, value=Op.CALLDATALOAD(offset=0x44))
-            + Op.MSTORE(offset=0x6C0, value=Op.CALLDATALOAD(offset=0x64))
-            + Op.MSTORE(offset=0x6E0, value=Op.CALLDATALOAD(offset=0x84))
-            + Op.MSTORE(offset=0xFA0, value=Op.CALLDATALOAD(offset=0xA4))
-            + Op.MSTORE(
-                offset=0xFC0,
-                value=Op.ADD(
-                    Op.SLOAD(key=0x160000000000000000000000000000000000000000),
-                    0x1,
-                ),
-            )
-            + Op.JUMPI(
-                pc=0x1F76,
-                condition=Op.ISZERO(
-                    Op.ISZERO(Op.SGT(Op.MLOAD(offset=0xF80), 0x0)),
-                ),
-            )
-            + Op.MSTORE(offset=0xFE0, value=0x1E)
-            + Op.RETURN(offset=0xFE0, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1FA4,
-                condition=Op.ISZERO(
-                    Op.SLOAD(
-                        key=Op.ADD(
-                            0xD0000000000000000000000000000000000000000,
-                            Op.MLOAD(offset=0xF80),
-                        ),
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x1000, value=0x1F)
-            + Op.RETURN(offset=0x1000, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1FBE,
-                condition=Op.ISZERO(
-                    Op.ISZERO(Op.SGT(Op.MLOAD(offset=0x680), 0x0)),
-                ),
-            )
-            + Op.MSTORE(offset=0x1020, value=0x20)
-            + Op.RETURN(offset=0x1020, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1FD7,
-                condition=Op.ISZERO(Op.SLT(Op.MLOAD(offset=0xFA0), 0x0)),
-            )
-            + Op.MSTORE(offset=0x1040, value=0x21)
-            + Op.RETURN(offset=0x1040, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1FF0,
-                condition=Op.ISZERO(Op.SLT(Op.MLOAD(offset=0x6A0), 0x0)),
-            )
-            + Op.MSTORE(offset=0x1060, value=0x22)
-            + Op.RETURN(offset=0x1060, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2009,
-                condition=Op.ISZERO(Op.SLT(Op.MLOAD(offset=0x6C0), 0x0)),
-            )
-            + Op.MSTORE(offset=0x1080, value=0x23)
-            + Op.RETURN(offset=0x1080, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2022,
-                condition=Op.ISZERO(Op.SLT(Op.MLOAD(offset=0x6E0), 0x0)),
-            )
-            + Op.MSTORE(offset=0x10A0, value=0x24)
-            + Op.RETURN(offset=0x10A0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0xC32D01A1)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.CALLER)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.ADDRESS)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x680),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x44,
-                    ret_offset=0x10C0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x10C0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(pc=0x2075, condition=Op.ISZERO(Op.ISZERO(Op.EQ)))
-            + Op.MSTORE(offset=0x10E0, value=0x28)
-            + Op.RETURN(offset=0x10E0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x83B58638)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.ADDRESS)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=0x0)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x680),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x44,
-                    ret_offset=0x1100,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x1100)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(pc=0x20C9, condition=Op.ISZERO(Op.ISZERO(Op.EQ)))
-            + Op.MSTORE(offset=0x1120, value=0x29)
-            + Op.RETURN(offset=0x1120, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x44]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x26690247)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.ADDRESS)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x680),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x24,
-                    ret_offset=0x1140,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x1140)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(pc=0x2116, condition=Op.ISZERO(Op.ISZERO(Op.EQ)))
-            + Op.MSTORE(offset=0x1160, value=0x2A)
-            + Op.RETURN(offset=0x1160, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x64]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x86744558)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.CALLER)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=0x0)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x680),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x44,
-                    ret_offset=0x1180,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x1180)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(pc=0x216A, condition=Op.ISZERO(Op.ISZERO(Op.EQ)))
-            + Op.MSTORE(offset=0x11A0, value=0x2B)
-            + Op.RETURN(offset=0x11A0, size=0x20)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x84]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x1C), value=0x27F08B00)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x4), value=Op.ADDRESS)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x24), value=Op.CALLER)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x44), value=0x0)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2D),
-                    address=Op.MLOAD(offset=0x680),
-                    value=0x0,
-                    args_offset=Op.DUP4,
-                    args_size=0x64,
-                    ret_offset=0x11C0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MLOAD(offset=0x11C0)
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(pc=0x21C4, condition=Op.ISZERO(Op.ISZERO(Op.EQ)))
-            + Op.MSTORE(offset=0x11E0, value=0x2C)
-            + Op.RETURN(offset=0x11E0, size=0x20)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.MUL(Op.MLOAD(offset=0xFC0), 0xC),
-                value=Op.MLOAD(offset=0xFC0),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(0x1, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                value=Op.MLOAD(offset=0xF80),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(0x2, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                value=Op.MLOAD(offset=0x680),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(0x6, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                value=Op.MLOAD(offset=0xFA0),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(0x3, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                value=Op.MLOAD(offset=0x6A0),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(0x4, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                value=Op.MLOAD(offset=0x6C0),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(0x5, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                value=Op.MLOAD(offset=0x6E0),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(0x7, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                value=0x1,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(0x8, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                value=Op.CALLER,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(0x9, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                value=Op.NUMBER,
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xC0000000000000000000000000000000000000000,
-                    Op.MLOAD(offset=0x680),
-                ),
-                value=Op.MLOAD(offset=0xFC0),
-            )
-            + Op.SSTORE(
-                key=Op.ADD(
-                    0xD0000000000000000000000000000000000000000,
-                    Op.MLOAD(offset=0xF80),
-                ),
-                value=Op.MLOAD(offset=0xFC0),
-            )
-            + Op.SSTORE(
-                key=0x160000000000000000000000000000000000000000,
-                value=Op.MLOAD(offset=0xFC0),
-            )
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0x40]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.ADD
-            + Op.MSTORE(offset=Op.DUP2, value=Op.MLOAD(offset=0xFC0))
-            + Op.LOG1(
-                offset=Op.DUP3,
-                size=0x20,
-                topic_1=0x1238FE6D44CF796960D61B74766B3A383110E472D849F5CA16AE50215BC05E58,  # noqa: E501
-            )
-            + Op.POP
-            + Op.MSTORE(offset=0x1200, value=0x1)
-            + Op.RETURN(offset=0x1200, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x232A, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x41569661))
-            )
-            + Op.MSTORE(offset=0x1220, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(
-                offset=0x1240,
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xC0000000000000000000000000000000000000000,
-                        Op.MLOAD(offset=0x1220),
-                    ),
-                ),
-            )
-            + Op.RETURN(offset=0x1240, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2364, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xFCDE9F78))
-            )
-            + Op.MSTORE(offset=0xF80, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(
-                offset=0x1260,
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xD0000000000000000000000000000000000000000,
-                        Op.MLOAD(offset=0xF80),
-                    ),
-                ),
-            )
-            + Op.RETURN(offset=0x1260, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2392, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x6E5B4343))
-            )
-            + Op.MSTORE(
-                offset=0x1280,
-                value=Op.SLOAD(
-                    key=0x160000000000000000000000000000000000000000
-                ),
-            )
-            + Op.RETURN(offset=0x1280, size=0x20)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x24E6, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xFAFA69C2))
-            )
-            + Op.MSTORE(offset=0xFC0, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH2[0x180]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0xB)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x12A0]
-            + Op.MSTORE
-            + Op.MSTORE(
-                offset=Op.MLOAD(offset=0x12A0),
-                value=Op.SLOAD(key=Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0x20),
-                value=Op.SLOAD(
-                    key=Op.ADD(0x1, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0x40),
-                value=Op.SLOAD(
-                    key=Op.ADD(0x2, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0x60),
-                value=Op.SLOAD(
-                    key=Op.ADD(0x3, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0x80),
-                value=Op.SLOAD(
-                    key=Op.ADD(0x4, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0xA0),
-                value=Op.SLOAD(
-                    key=Op.ADD(0x5, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0xC0),
-                value=Op.SLOAD(
-                    key=Op.ADD(0x7, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0xE0),
-                value=Op.SLOAD(
-                    key=Op.ADD(0x8, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0x100),
-                value=Op.SLOAD(
-                    key=Op.ADD(0x9, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0x120),
-                value=Op.SLOAD(
-                    key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x12A0), 0x140),
-                value=Op.SLOAD(
-                    key=Op.ADD(0x6, Op.MUL(Op.MLOAD(offset=0xFC0), 0xC)),
-                ),
-            )
-            + Op.JUMPI(pc=0x24B2, condition=Op.ISZERO(Op.MLOAD(offset=0x12A0)))
-            + Op.MLOAD(offset=0x12A0)
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x40]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x1)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=0x0)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x262E, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x9CFC1535))
-            )
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(
-                offset=0x1340,
-                value=Op.SLOAD(
-                    key=Op.ADD(0xA, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x1C0,
-                value=Op.SLOAD(
-                    key=Op.ADD(0xB, Op.MUL(Op.MLOAD(offset=0x40), 0xC)),
-                ),
-            )
-            + Op.MLOAD(offset=0x1340)
-            + Op.ADD(0x20, Op.MUL(0x20, Op.DUP1))
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x600]
-            + Op.MSTORE
-            + Op.MSTORE(offset=0x13A0, value=0x0)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x25D4,
-                condition=Op.ISZERO(
-                    Op.SLT(Op.MLOAD(offset=0x13A0), Op.MLOAD(offset=0x1340)),
-                ),
-            )
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(
-                offset=Op.ADD(
-                    Op.MLOAD(offset=0x600),
-                    Op.MUL(0x20, Op.MLOAD(offset=0x13A0)),
-                ),
-                value=Op.SLOAD(key=Op.SHA3),
-            )
-            + Op.PUSH1[0xA0]
-            + Op.PUSH1[0xA0]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x0)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=0xC)
-            + Op.MSTORE(
-                offset=Op.ADD(0x60, Op.DUP2), value=Op.MLOAD(offset=0x1C0)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x80, Op.DUP2), value=0x2)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=0x1C0, value=Op.SLOAD(key=Op.SHA3))
-            + Op.MSTORE(
-                offset=0x13A0, value=Op.ADD(Op.MLOAD(offset=0x13A0), 0x1)
-            )
-            + Op.JUMP(pc=0x253D)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x25FA, condition=Op.ISZERO(Op.MLOAD(offset=0x600)))
-            + Op.MLOAD(offset=0x600)
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x40]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x1)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=0x0)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x27E9, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0xF718190))
-            )
-            + Op.MSTORE(offset=0xFC0, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.PUSH2[0x120]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x8)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x180]
-            + Op.MSTORE
-            + Op.MSTORE(
-                offset=Op.MLOAD(offset=0x180),
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000000,
-                        Op.MUL(Op.MLOAD(offset=0xFC0), 0x8),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x180), 0x20),
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000001,
-                        Op.MUL(Op.MLOAD(offset=0xFC0), 0x8),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x180), 0x40),
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000002,
-                        Op.MUL(Op.MLOAD(offset=0xFC0), 0x8),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x180), 0x60),
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000003,
-                        Op.MUL(Op.MLOAD(offset=0xFC0), 0x8),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x180), 0x80),
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000004,
-                        Op.MUL(Op.MLOAD(offset=0xFC0), 0x8),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x180), 0xA0),
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000005,
-                        Op.MUL(Op.MLOAD(offset=0xFC0), 0x8),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x180), 0xC0),
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000006,
-                        Op.MUL(Op.MLOAD(offset=0xFC0), 0x8),
-                    ),
-                ),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(Op.MLOAD(offset=0x180), 0xE0),
-                value=Op.SLOAD(
-                    key=Op.ADD(
-                        0xE0000000000000000000000000000000000000007,
-                        Op.MUL(Op.MLOAD(offset=0xFC0), 0x8),
-                    ),
-                ),
-            )
-            + Op.JUMPI(pc=0x27B5, condition=Op.ISZERO(Op.MLOAD(offset=0x180)))
-            + Op.MLOAD(offset=0x180)
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x40]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x1)
-            + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=0x0)
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2893, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x1C9AA4B6))
-            )
-            + Op.MSTORE(offset=0x1220, value=Op.CALLDATALOAD(offset=0x4))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x24))
-            + Op.PUSH1[0x60]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x2)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2),
-                value=Op.MLOAD(offset=0x1220),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x20), value=Op.SLOAD(key=Op.SHA3)
-            )
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MSIZE
-            + Op.SWAP1
-            + Op.MSIZE
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.MSTORE(offset=Op.DUP2, value=0x4)
-            + Op.MSTORE(
-                offset=Op.ADD(0x20, Op.DUP2),
-                value=Op.MLOAD(offset=0x1220),
-            )
-            + Op.MSTORE(
-                offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40)
-            )
-            + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(
-                offset=Op.ADD(Op.DUP3, 0x40), value=Op.SLOAD(key=Op.SHA3)
-            )
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP1
-            + Op.POP
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
-            + Op.RETURN(
-                offset=Op.SUB(Op.DUP3, 0x40),
-                size=Op.ADD(
-                    0x40,
-                    Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20),
-                ),
-            )
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-        ),
+                    Op.MUL(Op.MLOAD(offset=0xFC0), 0x8),
+                )
+            ),
+        )
+        + Op.JUMPI(pc=0x27B5, condition=Op.ISZERO(Op.MLOAD(offset=0x180)))
+        + Op.MLOAD(offset=0x180)
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x40]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x1)
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=0x0)
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x2893, condition=Op.ISZERO(Op.EQ(Op.DUP2, 0x1C9AA4B6)))
+        + Op.MSTORE(offset=0x1220, value=Op.CALLDATALOAD(offset=0x4))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x24))
+        + Op.PUSH1[0x60]
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x2)
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(
+            offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x1220)
+        )
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x0)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x20), value=Op.SLOAD(key=Op.SHA3))
+        + Op.PUSH1[0x80] * 2
+        + Op.MSIZE
+        + Op.SWAP1
+        + Op.MSIZE
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.MSTORE(offset=Op.DUP2, value=0x4)
+        + Op.MSTORE(
+            offset=Op.ADD(0x20, Op.DUP2), value=Op.MLOAD(offset=0x1220)
+        )
+        + Op.MSTORE(offset=Op.ADD(0x40, Op.DUP2), value=Op.MLOAD(offset=0x40))
+        + Op.MSTORE(offset=Op.ADD(0x60, Op.DUP2), value=0x1)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.ADD(Op.DUP3, 0x40), value=Op.SLOAD(key=Op.SHA3))
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP1
+        + Op.POP
+        + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x40), value=0x20)
+        + Op.RETURN(
+            offset=Op.SUB(Op.DUP3, 0x40),
+            size=Op.ADD(
+                0x40, Op.MUL(Op.MLOAD(offset=Op.SUB(Op.DUP3, 0x20)), 0x20)
+            ),
+        )
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.POP,
         storage={
-            0xD0000000000000000000000000000000000505347: 0x0,
-            0x160000000000000000000000000000000000000000: 0x1,
+            0xD0000000000000000000000000000000000505347: 0,
+            0x160000000000000000000000000000000000000000: 1,
         },
         nonce=0,
-        address=Address("0xf47bacb0d8f13fa44d31623c3d5ae72907d241c1"),  # noqa: E501
+        address=Address(0xF47BACB0D8F13FA44D31623C3D5AE72907D241C1),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "d91e22f40000000000000000000000000000000000000000000000000000000000505347"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000002450534700000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000010000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000005f5e100000000000000000000000000"  # noqa: E501
-            "000000000000000000000000002386f26fc1000000000000000000000000000000000000"  # noqa: E501
-            "00000000000000000000000000000001"
-        ),
+        to=target,
+        data=Bytes("d91e22f4")
+        + Hash(0x505347)
+        + Hash(0x24505347)
+        + Hash(0x1)
+        + Hash(0x5F5E100)
+        + Hash(0x2386F26FC10000)
+        + Hash(0x1),
         gas_limit=500000,
-        gas_price=52637211012,
         nonce=24,
+        gas_price=52637211012,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={0x160000000000000000000000000000000000000000: 1},
         ),
+        sender: Account(nonce=25),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStackTests/__init__.py b/tests/ported_static/stStackTests/__init__.py
index cbdd47764aa..3ee0d5d2ae0 100644
--- a/tests/ported_static/stStackTests/__init__.py
+++ b/tests/ported_static/stStackTests/__init__.py
@@ -1 +1 @@
-"""Tests ported from stStackTests."""
+"""Ported static tests: stStackTests."""  # noqa: N999
diff --git a/tests/ported_static/stStackTests/test_shallow_stack.py b/tests/ported_static/stStackTests/test_shallow_stack.py
index 2398d3bdc03..0ba5126b719 100644
--- a/tests/ported_static/stStackTests/test_shallow_stack.py
+++ b/tests/ported_static/stStackTests/test_shallow_stack.py
@@ -1,209 +1,533 @@
 """
-Test ported from static filler.
+Test_shallow_stack.
 
 Ported from:
-tests/static/state_tests/stStackTests/shallowStackFiller.json
+state_tests/stStackTests/shallowStackFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStackTests/shallowStackFiller.json"],
+    ["state_tests/stStackTests/shallowStackFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "600101600055",
-        "60010b600055",
-        "600110600055",
-        "600111600055",
-        "600112600055",
-        "600113600055",
-        "600114600055",
-        "15600055",
-        "600116600055",
-        "600117600055",
-        "600118600055",
-        "600102600055",
-        "19600055",
-        "60011a600055",
-        "600120600055",
-        "31600055",
-        "35600055",
-        "6001600237600055",
-        "6001600239600055",
-        "3b600055",
-        "6001600260033c600055",
-        "40600055",
-        "600103600055",
-        "50600055",
-        "51600055",
-        "600152600055",
-        "600153600055",
-        "54600055",
-        "600155600055",
-        "56600055",
-        "600157600055",
-        "80600055",
-        "600181600055",
-        "600104600055",
-        "6002600182600055",
-        "60036002600183600055",
-        "600460036002600184600055",
-        "6005600460036002600185600055",
-        "60066005600460036002600186600055",
-        "600760066005600460036002600187600055",
-        "6008600760066005600460036002600188600055",
-        "60096008600760066005600460036002600189600055",
-        "60106009600860076006600560046003600260018a600055",
-        "601160106009600860076006600560046003600260018b600055",
-        "600105600055",
-        "6012601160106009600860076006600560046003600260018c600055",
-        "60136012601160106009600860076006600560046003600260018d600055",
-        "601460136012601160106009600860076006600560046003600260018e600055",
-        "60136012601160106009600860076006600560046003600260018f600055",
-        "600190600055",
-        "6002600191600055",
-        "60036002600192600055",
-        "600460036002600193600055",
-        "6005600460036002600194600055",
-        "60066005600460036002600195600055",
-        "600106600055",
-        "600760066005600460036002600196600055",
-        "6008600760066005600460036002600197600055",
-        "60096008600760066005600460036002600198600055",
-        "601060096008600760066005600460036002600199600055",
-        "601160106009600860076006600560046003600260019a600055",
-        "6012601160106009600860076006600560046003600260019b600055",
-        "60136012601160106009600860076006600560046003600260019c600055",
-        "601460136012601160106009600860076006600560046003600260019d600055",
-        "6015601460136012601160106009600860076006600560046003600260019e600055",
-        "6012601160106009600860076006600560046003600260019f600055",
-        "600107600055",
-        "6001a0600055",
-        "60026001a1600055",
-        "600360026001a2600055",
-        "6004600360026001a3600055",
-        "60056004600360026001a4600055",
-        "60026001f0600055",
-        "600660056004600360026001f1600055",
-        "600660056004600360026001f2600055",
-        "6001f3600055",
-        "60056004600360026001f4600055",
-        "6002600108600055",
-        "ff600055",
-        "6002600109600055",
-        "60010a600055",
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="d16",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="d17",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="d18",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="d19",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="d20",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="d21",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="d22",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="d23",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="d24",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="d25",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="d26",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="d27",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="d28",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="d29",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="d30",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="d31",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="d32",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="d33",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="d34",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="d35",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="d36",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="d37",
+        ),
+        pytest.param(
+            38,
+            0,
+            0,
+            id="d38",
+        ),
+        pytest.param(
+            39,
+            0,
+            0,
+            id="d39",
+        ),
+        pytest.param(
+            40,
+            0,
+            0,
+            id="d40",
+        ),
+        pytest.param(
+            41,
+            0,
+            0,
+            id="d41",
+        ),
+        pytest.param(
+            42,
+            0,
+            0,
+            id="d42",
+        ),
+        pytest.param(
+            43,
+            0,
+            0,
+            id="d43",
+        ),
+        pytest.param(
+            44,
+            0,
+            0,
+            id="d44",
+        ),
+        pytest.param(
+            45,
+            0,
+            0,
+            id="d45",
+        ),
+        pytest.param(
+            46,
+            0,
+            0,
+            id="d46",
+        ),
+        pytest.param(
+            47,
+            0,
+            0,
+            id="d47",
+        ),
+        pytest.param(
+            48,
+            0,
+            0,
+            id="d48",
+        ),
+        pytest.param(
+            49,
+            0,
+            0,
+            id="d49",
+        ),
+        pytest.param(
+            50,
+            0,
+            0,
+            id="d50",
+        ),
+        pytest.param(
+            51,
+            0,
+            0,
+            id="d51",
+        ),
+        pytest.param(
+            52,
+            0,
+            0,
+            id="d52",
+        ),
+        pytest.param(
+            53,
+            0,
+            0,
+            id="d53",
+        ),
+        pytest.param(
+            54,
+            0,
+            0,
+            id="d54",
+        ),
+        pytest.param(
+            55,
+            0,
+            0,
+            id="d55",
+        ),
+        pytest.param(
+            56,
+            0,
+            0,
+            id="d56",
+        ),
+        pytest.param(
+            57,
+            0,
+            0,
+            id="d57",
+        ),
+        pytest.param(
+            58,
+            0,
+            0,
+            id="d58",
+        ),
+        pytest.param(
+            59,
+            0,
+            0,
+            id="d59",
+        ),
+        pytest.param(
+            60,
+            0,
+            0,
+            id="d60",
+        ),
+        pytest.param(
+            61,
+            0,
+            0,
+            id="d61",
+        ),
+        pytest.param(
+            62,
+            0,
+            0,
+            id="d62",
+        ),
+        pytest.param(
+            63,
+            0,
+            0,
+            id="d63",
+        ),
+        pytest.param(
+            64,
+            0,
+            0,
+            id="d64",
+        ),
+        pytest.param(
+            65,
+            0,
+            0,
+            id="d65",
+        ),
+        pytest.param(
+            66,
+            0,
+            0,
+            id="d66",
+        ),
+        pytest.param(
+            67,
+            0,
+            0,
+            id="d67",
+        ),
+        pytest.param(
+            68,
+            0,
+            0,
+            id="d68",
+        ),
+        pytest.param(
+            69,
+            0,
+            0,
+            id="d69",
+        ),
+        pytest.param(
+            70,
+            0,
+            0,
+            id="d70",
+        ),
+        pytest.param(
+            71,
+            0,
+            0,
+            id="d71",
+        ),
+        pytest.param(
+            72,
+            0,
+            0,
+            id="d72",
+        ),
+        pytest.param(
+            73,
+            0,
+            0,
+            id="d73",
+        ),
+        pytest.param(
+            74,
+            0,
+            0,
+            id="d74",
+        ),
+        pytest.param(
+            75,
+            0,
+            0,
+            id="d75",
+        ),
+        pytest.param(
+            76,
+            0,
+            0,
+            id="d76",
+        ),
+        pytest.param(
+            77,
+            0,
+            0,
+            id="d77",
+        ),
+        pytest.param(
+            78,
+            0,
+            0,
+            id="d78",
+        ),
+        pytest.param(
+            79,
+            0,
+            0,
+            id="d79",
+        ),
+        pytest.param(
+            80,
+            0,
+            0,
+            id="d80",
+        ),
     ],
 )
-@pytest.mark.pre_alloc_mutable
 def test_shallow_stack(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_shallow_stack."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x271000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -214,17 +538,420 @@ def test_shallow_stack(
         gas_limit=42949672960,
     )
 
-    pre[sender] = Account(balance=0x271000000000)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.ADD),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.MUL),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.SUB),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.DIV),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.SDIV),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.MOD),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.SMOD),
+        Op.PUSH1[0x2] + Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.ADDMOD),
+        Op.PUSH1[0x2] + Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.MULMOD),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.EXP),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.SIGNEXTEND),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.LT),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.GT),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.SLT),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.SGT),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.EQ),
+        Op.SSTORE(key=0x0, value=Op.ISZERO),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.AND),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.OR),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.XOR),
+        Op.SSTORE(key=0x0, value=Op.NOT),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.BYTE),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.SHA3),
+        Op.SSTORE(key=0x0, value=Op.BALANCE),
+        Op.SSTORE(key=0x0, value=Op.CALLDATALOAD),
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.CALLDATACOPY
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.CODECOPY
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.SSTORE(key=0x0, value=Op.EXTCODESIZE),
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.EXTCODECOPY
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.SSTORE(key=0x0, value=Op.BLOCKHASH),
+        Op.POP + Op.PUSH1[0x0] + Op.SSTORE,
+        Op.SSTORE(key=0x0, value=Op.MLOAD),
+        Op.PUSH1[0x1] + Op.MSTORE + Op.PUSH1[0x0] + Op.SSTORE,
+        Op.PUSH1[0x1] + Op.MSTORE8 + Op.PUSH1[0x0] + Op.SSTORE,
+        Op.SSTORE(key=0x0, value=Op.SLOAD),
+        Op.PUSH1[0x1] + Op.SSTORE + Op.PUSH1[0x0] + Op.SSTORE,
+        Op.JUMP + Op.PUSH1[0x0] + Op.SSTORE,
+        Op.PUSH1[0x1] + Op.JUMPI + Op.PUSH1[0x0] + Op.SSTORE,
+        Op.SSTORE(key=0x0, value=Op.DUP1),
+        Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.DUP2),
+        Op.PUSH1[0x2] + Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.DUP3),
+        Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=Op.DUP4),
+        Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=Op.DUP5),
+        Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=Op.DUP6),
+        Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=Op.DUP7),
+        Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=Op.DUP8),
+        Op.PUSH1[0x8]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=Op.DUP9),
+        Op.PUSH1[0x9]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=Op.DUP10),
+        Op.PUSH1[0x10]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=Op.DUP11),
+        Op.PUSH1[0x11]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=Op.DUP12),
+        Op.PUSH1[0x12]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=Op.DUP13),
+        Op.PUSH1[0x13]
+        + Op.PUSH1[0x12]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=Op.DUP14),
+        Op.PUSH1[0x14]
+        + Op.PUSH1[0x13]
+        + Op.PUSH1[0x12]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=Op.DUP15),
+        Op.PUSH1[0x13]
+        + Op.PUSH1[0x12]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=Op.DUP16),
+        Op.PUSH1[0x1] + Op.SWAP1 + Op.PUSH1[0x0] + Op.SSTORE,
+        Op.PUSH1[0x2] + Op.PUSH1[0x1] + Op.SWAP2 + Op.PUSH1[0x0] + Op.SSTORE,
+        Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SWAP3
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SWAP4
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SWAP5
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SWAP6
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SWAP7
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x8]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SWAP8
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x9]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SWAP9
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x10]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SWAP10
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x11]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SWAP11
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x12]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SWAP12
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x13]
+        + Op.PUSH1[0x12]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SWAP13
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x14]
+        + Op.PUSH1[0x13]
+        + Op.PUSH1[0x12]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SWAP14
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x15]
+        + Op.PUSH1[0x14]
+        + Op.PUSH1[0x13]
+        + Op.PUSH1[0x12]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SWAP15
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x12]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SWAP16
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x1] + Op.LOG0 + Op.PUSH1[0x0] + Op.SSTORE,
+        Op.PUSH1[0x2] + Op.PUSH1[0x1] + Op.LOG1 + Op.PUSH1[0x0] + Op.SSTORE,
+        Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.LOG2
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.LOG3
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.LOG4
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        Op.PUSH1[0x2] + Op.PUSH1[0x1] + Op.SSTORE(key=0x0, value=Op.CREATE),
+        Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=Op.CALL),
+        Op.PUSH1[0x6]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=Op.CALLCODE),
+        Op.PUSH1[0x1] + Op.RETURN + Op.PUSH1[0x0] + Op.SSTORE,
+        Op.PUSH1[0x5]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=Op.DELEGATECALL),
+        Op.SELFDESTRUCT + Op.PUSH1[0x0] + Op.SSTORE,
+    ]
+    tx_gas = [300000]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=300000,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=sender, nonce=0): Account.NONEXISTENT
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStackTests/test_stack_overflow.py b/tests/ported_static/stStackTests/test_stack_overflow.py
index 44918873b9c..d8e7f4d4596 100644
--- a/tests/ported_static/stStackTests/test_stack_overflow.py
+++ b/tests/ported_static/stStackTests/test_stack_overflow.py
@@ -1,80 +1,143 @@
 """
-Test ported from static filler.
+Test_stack_overflow.
 
 Ported from:
-tests/static/state_tests/stStackTests/stackOverflowFiller.json
+state_tests/stStackTests/stackOverflowFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStackTests/stackOverflowFiller.json"],
+    ["state_tests/stStackTests/stackOverflowFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "3030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030",  # noqa: E501
-        "4444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444",  # noqa: E501
-        "4545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545",  # noqa: E501
-        "5858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858",  # noqa: E501
-        "5959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959",  # noqa: E501
-        "5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a",  # noqa: E501
-        "60006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000",  # noqa: E501
-        "3232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232",  # noqa: E501
-        "3333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333",  # noqa: E501
-        "3434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434",  # noqa: E501
-        "3636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636",  # noqa: E501
-        "3838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838",  # noqa: E501
-        "3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a",  # noqa: E501
-        "4141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141",  # noqa: E501
-        "4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242",  # noqa: E501
-        "4343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343",  # noqa: E501
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
+        ),
     ],
 )
-@pytest.mark.pre_alloc_mutable
 def test_stack_overflow(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    """Test_stack_overflow."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A5100000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -85,18 +148,37 @@ def test_stack_overflow(
         gas_limit=42949672960,
     )
 
-    pre[sender] = Account(balance=0xE8D4A5100000000000)
-    pre[contract] = Account(balance=0xE8D4A5100000000000, nonce=0)
+    contract_0 = pre.fund_eoa(amount=0xE8D4A5100000000000)  # noqa: F841
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.ADDRESS * 1025,
+        Op.ORIGIN * 1025,
+        Op.CALLER * 1025,
+        Op.CALLVALUE * 1025,
+        Op.CALLDATASIZE * 1025,
+        Op.CODESIZE * 1025,
+        Op.GASPRICE * 1025,
+        Op.COINBASE * 1025,
+        Op.TIMESTAMP * 1025,
+        Op.NUMBER * 1025,
+        Op.PREVRANDAO * 1025,
+        Op.GASLIMIT * 1025,
+        Op.PC * 1025,
+        Op.MSIZE * 1025,
+        Op.GAS * 1025,
+        Op.PUSH1[0x0] * 1025,
+    ]
+    tx_gas = [6000000]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=6000000,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=sender, nonce=0): Account.NONEXISTENT
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStackTests/test_stack_overflow_dup.py b/tests/ported_static/stStackTests/test_stack_overflow_dup.py
index af3329d8965..2b935d280fa 100644
--- a/tests/ported_static/stStackTests/test_stack_overflow_dup.py
+++ b/tests/ported_static/stStackTests/test_stack_overflow_dup.py
@@ -1,80 +1,143 @@
 """
-Test ported from static filler.
+Test_stack_overflow_dup.
 
 Ported from:
-tests/static/state_tests/stStackTests/stackOverflowDUPFiller.json
+state_tests/stStackTests/stackOverflowDUPFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStackTests/stackOverflowDUPFiller.json"],
+    ["state_tests/stStackTests/stackOverflowDUPFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "600180808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080",  # noqa: E501
-        "600160026003600460056006600760086009601060118a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a",  # noqa: E501
-        "6001600260036004600560066007600860096010601160128b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b",  # noqa: E501
-        "60016002600360046005600660076008600960106011601260138c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c",  # noqa: E501
-        "600160026003600460056006600760086009601060116012601360148d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d",  # noqa: E501
-        "6001600260036004600560066007600860096010601160126013601460158e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e",  # noqa: E501
-        "60016002600360046005600660076008600960106011601260136014601560168f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f",  # noqa: E501
-        "60016002818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181",  # noqa: E501
-        "6001600260038282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282",  # noqa: E501
-        "600160026003600483838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383",  # noqa: E501
-        "60016002600360046005848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484",  # noqa: E501
-        "6001600260036004600560068585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585",  # noqa: E501
-        "600160026003600460056006600786868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686",  # noqa: E501
-        "60016002600360046005600660076008878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787",  # noqa: E501
-        "6001600260036004600560066007600860098888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888",  # noqa: E501
-        "600160026003600460056006600760086009601089898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989",  # noqa: E501
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
+        ),
     ],
 )
-@pytest.mark.pre_alloc_mutable
 def test_stack_overflow_dup(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    """Test_stack_overflow_dup."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A5100000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -85,18 +148,167 @@ def test_stack_overflow_dup(
         gas_limit=42949672960,
     )
 
-    pre[sender] = Account(balance=0xE8D4A5100000000000)
-    pre[contract] = Account(balance=0xE8D4A5100000000000, nonce=0)
+    contract_0 = pre.fund_eoa(amount=0xE8D4A5100000000000)  # noqa: F841
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.PUSH1[0x1] + Op.DUP1 * 1024,
+        Op.PUSH1[0x1] + Op.PUSH1[0x2] + Op.DUP2 * 1023,
+        Op.PUSH1[0x1] + Op.PUSH1[0x2] + Op.PUSH1[0x3] + Op.DUP3 * 1022,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.DUP4 * 1021,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.DUP5 * 1020,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.DUP6 * 1019,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.DUP7 * 1018,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.DUP8 * 1017,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x9]
+        + Op.DUP9 * 1016,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x10]
+        + Op.DUP10 * 1015,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x11]
+        + Op.DUP11 * 1014,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x12]
+        + Op.DUP12 * 1013,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x12]
+        + Op.PUSH1[0x13]
+        + Op.DUP13 * 1012,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x12]
+        + Op.PUSH1[0x13]
+        + Op.PUSH1[0x14]
+        + Op.DUP14 * 1011,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x12]
+        + Op.PUSH1[0x13]
+        + Op.PUSH1[0x14]
+        + Op.PUSH1[0x15]
+        + Op.DUP15 * 1010,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x12]
+        + Op.PUSH1[0x13]
+        + Op.PUSH1[0x14]
+        + Op.PUSH1[0x15]
+        + Op.PUSH1[0x16]
+        + Op.DUP16 * 1009,
+    ]
+    tx_gas = [6000000]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=6000000,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=sender, nonce=0): Account.NONEXISTENT
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStackTests/test_stack_overflow_m1.py b/tests/ported_static/stStackTests/test_stack_overflow_m1.py
index a45b8c7ba84..c4d6fc9ee97 100644
--- a/tests/ported_static/stStackTests/test_stack_overflow_m1.py
+++ b/tests/ported_static/stStackTests/test_stack_overflow_m1.py
@@ -1,129 +1,143 @@
 """
-Test ported from static filler.
+Test_stack_overflow_m1.
 
 Ported from:
-tests/static/state_tests/stStackTests/stackOverflowM1Filler.json
+state_tests/stStackTests/stackOverflowM1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStackTests/stackOverflowM1Filler.json"],
+    ["state_tests/stStackTests/stackOverflowM1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "30303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030",  # noqa: E501
-            {},
-        ),
-        (
-            "44444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444",  # noqa: E501
-            {},
-        ),
-        (
-            "45454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545",  # noqa: E501
-            {},
-        ),
-        (
-            "58585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858",  # noqa: E501
-            {},
-        ),
-        (
-            "59595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959595959",  # noqa: E501
-            {},
-        ),
-        (
-            "5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a",  # noqa: E501
-            {},
-        ),
-        (
-            "6000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000",  # noqa: E501
-            {},
-        ),
-        (
-            "32323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232",  # noqa: E501
-            {},
-        ),
-        (
-            "33333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333",  # noqa: E501
-            {},
-        ),
-        (
-            "34343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434",  # noqa: E501
-            {},
-        ),
-        (
-            "36363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636",  # noqa: E501
-            {},
-        ),
-        (
-            "38383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838",  # noqa: E501
-            {},
-        ),
-        (
-            "3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a3a",  # noqa: E501
-            {},
-        ),
-        (
-            "41414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141",  # noqa: E501
-            {},
-        ),
-        (
-            "42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242",  # noqa: E501
-            {},
-        ),
-        (
-            "43434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343",  # noqa: E501
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-    ],
 )
-@pytest.mark.pre_alloc_mutable
 def test_stack_overflow_m1(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    """Test_stack_overflow_m1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A5100000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -134,19 +148,39 @@ def test_stack_overflow_m1(
         gas_limit=42949672960,
     )
 
-    pre[sender] = Account(balance=0xE8D4A5100000000000)
-    pre[contract] = Account(balance=0xE8D4A5100000000000, nonce=0)
+    contract_0 = pre.fund_eoa(amount=0xE8D4A5100000000000)  # noqa: F841
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.ADDRESS * 1024,
+        Op.ORIGIN * 1024,
+        Op.CALLER * 1024,
+        Op.CALLVALUE * 1024,
+        Op.CALLDATASIZE * 1024,
+        Op.CODESIZE * 1024,
+        Op.GASPRICE * 1024,
+        Op.COINBASE * 1024,
+        Op.TIMESTAMP * 1024,
+        Op.NUMBER * 1024,
+        Op.PREVRANDAO * 1024,
+        Op.GASLIMIT * 1024,
+        Op.PC * 1024,
+        Op.MSIZE * 1024,
+        Op.GAS * 1024,
+        Op.PUSH1[0x0] * 1024,
+    ]
+    tx_gas = [6000000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=6000000,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        compute_create_address(address=sender, nonce=0): Account(balance=1)
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStackTests/test_stack_overflow_m1_dup.py b/tests/ported_static/stStackTests/test_stack_overflow_m1_dup.py
index dd4390fbe84..53569c363c8 100644
--- a/tests/ported_static/stStackTests/test_stack_overflow_m1_dup.py
+++ b/tests/ported_static/stStackTests/test_stack_overflow_m1_dup.py
@@ -1,129 +1,143 @@
 """
-Test ported from static filler.
+Test_stack_overflow_m1_dup.
 
 Ported from:
-tests/static/state_tests/stStackTests/stackOverflowM1DUPFiller.json
+state_tests/stStackTests/stackOverflowM1DUPFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStackTests/stackOverflowM1DUPFiller.json"],
+    ["state_tests/stStackTests/stackOverflowM1DUPFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "6001808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080",  # noqa: E501
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "600160026003600460056006600760086009601060118a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a",  # noqa: E501
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "6001600260036004600560066007600860096010601160128b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b8b",  # noqa: E501
-            {},
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "60016002600360046005600660076008600960106011601260138c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c",  # noqa: E501
-            {},
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
-        (
-            "600160026003600460056006600760086009601060116012601360148d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d8d",  # noqa: E501
-            {},
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
         ),
-        (
-            "6001600260036004600560066007600860096010601160126013601460158e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e8e",  # noqa: E501
-            {},
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
         ),
-        (
-            "60016002600360046005600660076008600960106011601260136014601560168f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f",  # noqa: E501
-            {},
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
         ),
-        (
-            "600160028181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181818181",  # noqa: E501
-            {},
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
         ),
-        (
-            "60016002600382828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282",  # noqa: E501
-            {},
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
         ),
-        (
-            "6001600260036004838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383838383",  # noqa: E501
-            {},
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
         ),
-        (
-            "600160026003600460058484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484848484",  # noqa: E501
-            {},
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
         ),
-        (
-            "60016002600360046005600685858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585",  # noqa: E501
-            {},
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
         ),
-        (
-            "6001600260036004600560066007868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686868686",  # noqa: E501
-            {},
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
         ),
-        (
-            "600160026003600460056006600760088787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787",  # noqa: E501
-            {},
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
         ),
-        (
-            "60016002600360046005600660076008600988888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888",  # noqa: E501
-            {},
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
         ),
-        (
-            "6001600260036004600560066007600860096010898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989",  # noqa: E501
-            {},
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-    ],
 )
-@pytest.mark.pre_alloc_mutable
 def test_stack_overflow_m1_dup(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    """Test_stack_overflow_m1_dup."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A5100000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -134,19 +148,169 @@ def test_stack_overflow_m1_dup(
         gas_limit=42949672960,
     )
 
-    pre[sender] = Account(balance=0xE8D4A5100000000000)
-    pre[contract] = Account(balance=0xE8D4A5100000000000, nonce=0)
+    contract_0 = pre.fund_eoa(amount=0xE8D4A5100000000000)  # noqa: F841
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.PUSH1[0x1] + Op.DUP1 * 1023,
+        Op.PUSH1[0x1] + Op.PUSH1[0x2] + Op.DUP2 * 1022,
+        Op.PUSH1[0x1] + Op.PUSH1[0x2] + Op.PUSH1[0x3] + Op.DUP3 * 1021,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.DUP4 * 1020,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.DUP5 * 1019,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.DUP6 * 1018,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.DUP7 * 1017,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.DUP8 * 1016,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x9]
+        + Op.DUP9 * 1015,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x10]
+        + Op.DUP10 * 1014,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x11]
+        + Op.DUP11 * 1013,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x12]
+        + Op.DUP12 * 1012,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x12]
+        + Op.PUSH1[0x13]
+        + Op.DUP13 * 1011,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x12]
+        + Op.PUSH1[0x13]
+        + Op.PUSH1[0x14]
+        + Op.DUP14 * 1010,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x12]
+        + Op.PUSH1[0x13]
+        + Op.PUSH1[0x14]
+        + Op.PUSH1[0x15]
+        + Op.DUP15 * 1009,
+        Op.PUSH1[0x1]
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x3]
+        + Op.PUSH1[0x4]
+        + Op.PUSH1[0x5]
+        + Op.PUSH1[0x6]
+        + Op.PUSH1[0x7]
+        + Op.PUSH1[0x8]
+        + Op.PUSH1[0x9]
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0x12]
+        + Op.PUSH1[0x13]
+        + Op.PUSH1[0x14]
+        + Op.PUSH1[0x15]
+        + Op.PUSH1[0x16]
+        + Op.DUP16 * 1008,
+    ]
+    tx_gas = [6000000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=6000000,
-        value=1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        compute_create_address(address=sender, nonce=0): Account(balance=1)
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStackTests/test_stack_overflow_m1_push.py b/tests/ported_static/stStackTests/test_stack_overflow_m1_push.py
index ea41cc2530d..09f934f2b9d 100644
--- a/tests/ported_static/stStackTests/test_stack_overflow_m1_push.py
+++ b/tests/ported_static/stStackTests/test_stack_overflow_m1_push.py
@@ -1,435 +1,95 @@
 """
-Test ported from static filler.
+Test_stack_overflow_m1_push.
 
 Ported from:
-tests/static/state_tests/stStackTests/stackOverflowM1PUSHFiller.json
+state_tests/stStackTests/stackOverflowM1PUSHFiller.json
+
+@manually-enhanced: Do not overwrite. This test has been manually reviewed and
+enhanced.
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
-    Address,
     Alloc,
-    Environment,
+    Fork,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStackTests/stackOverflowM1PUSHFiller.json"],
+    ["state_tests/stStackTests/stackOverflowM1PUSHFiller.json"],
 )
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "opcode",
     [
-        (
-            "610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000",  # noqa: E501
-            {},
-        ),
-        (
-            "6b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "6c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c00000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "6d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d0000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "6e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "6f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f00000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "71000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "74000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "62000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "77000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b00000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c0000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e00000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "6300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "65000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "6600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "68000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "6900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "6a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a0000000000000000000000",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
+        Op.PUSH1,
+        Op.PUSH2,
+        Op.PUSH3,
+        Op.PUSH4,
+        Op.PUSH5,
+        Op.PUSH6,
+        Op.PUSH7,
+        Op.PUSH8,
+        Op.PUSH9,
+        Op.PUSH10,
+        Op.PUSH11,
+        Op.PUSH12,
+        Op.PUSH13,
+        Op.PUSH14,
+        Op.PUSH15,
+        Op.PUSH16,
+        Op.PUSH17,
+        Op.PUSH18,
+        Op.PUSH19,
+        Op.PUSH20,
+        Op.PUSH21,
+        Op.PUSH22,
+        Op.PUSH23,
+        Op.PUSH24,
+        Op.PUSH25,
+        Op.PUSH26,
+        Op.PUSH27,
+        Op.PUSH28,
+        Op.PUSH29,
+        Op.PUSH30,
+        Op.PUSH31,
+        Op.PUSH32,
     ],
 )
-@pytest.mark.pre_alloc_mutable
 def test_stack_overflow_m1_push(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    opcode: Op,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=42949672960,
-    )
-
-    pre[sender] = Account(balance=0xE8D4A5100000000000)
-    pre[contract] = Account(balance=0xE8D4A5100000000000, nonce=0)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
+    """
+    Test pushing to the stack with all PUSH* opcodes until almost a stack
+    overflow occurs.
+    """
+    max_stack_height = fork.max_stack_height()
+    initcode = opcode[0x0] * max_stack_height
+    value = 1
+    sender = pre.fund_eoa()
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=6000000,
-        value=1,
+        data=initcode,
+        gas_limit=6_000_000,
+        value=value,
+        protected=fork.supports_protected_txs(),
     )
 
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stStackTests/stackOverflowM1PUSHFiller.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000",  # noqa: E501
-            {},
-        ),
-        (
-            "6b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b000000000000000000000000",  # noqa: E501
-            {},
+    post = {
+        compute_create_address(address=sender, nonce=0): Account(
+            balance=value
         ),
-        (
-            "6c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c00000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "6d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d0000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "6e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "6f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f00000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "71000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "74000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "62000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "77000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b00000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c0000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e00000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "6300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000",  # noqa: E501
-            {},
-        ),
-        (
-            "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "65000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "6600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "68000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "6900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000",  # noqa: E501
-            {},
-        ),
-        (
-            "6a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a0000000000000000000000",  # noqa: E501
-            {},
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_stack_overflow_m1_push_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=42949672960,
-    )
-
-    pre[sender] = Account(balance=0xE8D4A5100000000000)
-    pre[contract] = Account(balance=0xE8D4A5100000000000, nonce=0)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=6000000,
-        value=1,
-    )
-
-    post = expected_post
+    }
 
-    state_test(env=env, pre=pre, post=post, tx=tx)
+    state_test(pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStackTests/test_stack_overflow_push.py b/tests/ported_static/stStackTests/test_stack_overflow_push.py
index 3a87aa520ee..c4def65ef21 100644
--- a/tests/ported_static/stStackTests/test_stack_overflow_push.py
+++ b/tests/ported_static/stStackTests/test_stack_overflow_push.py
@@ -1,132 +1,92 @@
 """
-Test ported from static filler.
+Test_stack_overflow_push.
 
 Ported from:
-tests/static/state_tests/stStackTests/stackOverflowPUSHFiller.json
+state_tests/stStackTests/stackOverflowPUSHFiller.json
+
+@manually-enhanced: Do not overwrite. This test has been manually reviewed and
+enhanced.
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
-    Address,
     Alloc,
-    Environment,
+    Fork,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStackTests/stackOverflowPUSHFiller.json"],
+    ["state_tests/stStackTests/stackOverflowPUSHFiller.json"],
 )
-@pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "opcode",
     [
-        "610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000610000",  # noqa: E501
-        "6b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b0000000000000000000000006b000000000000000000000000",  # noqa: E501
-        "6c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c000000000000000000000000006c00000000000000000000000000",  # noqa: E501
-        "6d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d00000000000000000000000000006d0000000000000000000000000000",  # noqa: E501
-        "6e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e0000000000000000000000000000006e000000000000000000000000000000",  # noqa: E501
-        "6f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f000000000000000000000000000000006f00000000000000000000000000000000",  # noqa: E501
-        "700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000700000000000000000000000000000000000",  # noqa: E501
-        "7100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000710000000000000000000000000000000000007100000000000000000000000000000000000071000000000000000000000000000000000000",  # noqa: E501
-        "72000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000720000000000000000000000000000000000000072000000000000000000000000000000000000007200000000000000000000000000000000000000",  # noqa: E501
-        "730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000730000000000000000000000000000000000000000",  # noqa: E501
-        "7400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000740000000000000000000000000000000000000000007400000000000000000000000000000000000000000074000000000000000000000000000000000000000000",  # noqa: E501
-        "6200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000620000006200000062000000",  # noqa: E501
-        "75000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000750000000000000000000000000000000000000000000075000000000000000000000000000000000000000000007500000000000000000000000000000000000000000000",  # noqa: E501
-        "760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000760000000000000000000000000000000000000000000000",  # noqa: E501
-        "7700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000770000000000000000000000000000000000000000000000007700000000000000000000000000000000000000000000000077000000000000000000000000000000000000000000000000",  # noqa: E501
-        "78000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000780000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000007800000000000000000000000000000000000000000000000000",  # noqa: E501
-        "790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000790000000000000000000000000000000000000000000000000000",  # noqa: E501
-        "7a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a0000000000000000000000000000000000000000000000000000007a000000000000000000000000000000000000000000000000000000",  # noqa: E501
-        "7b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b000000000000000000000000000000000000000000000000000000007b00000000000000000000000000000000000000000000000000000000",  # noqa: E501
-        "7c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000007c0000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-        "7d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d0000000000000000000000000000000000000000000000000000000000007d000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-        "7e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e000000000000000000000000000000000000000000000000000000000000007e00000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-        "63000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000630000000063000000006300000000",  # noqa: E501
-        "7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-        "640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000640000000000",  # noqa: E501
-        "6500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000650000000000006500000000000065000000000000",  # noqa: E501
-        "66000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000660000000000000066000000000000006600000000000000",  # noqa: E501
-        "670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000670000000000000000",  # noqa: E501
-        "6800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000680000000000000000006800000000000000000068000000000000000000",  # noqa: E501
-        "69000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000690000000000000000000069000000000000000000006900000000000000000000",  # noqa: E501
-        "6a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a00000000000000000000006a0000000000000000000000",  # noqa: E501
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
+        Op.PUSH1,
+        Op.PUSH2,
+        Op.PUSH3,
+        Op.PUSH4,
+        Op.PUSH5,
+        Op.PUSH6,
+        Op.PUSH7,
+        Op.PUSH8,
+        Op.PUSH9,
+        Op.PUSH10,
+        Op.PUSH11,
+        Op.PUSH12,
+        Op.PUSH13,
+        Op.PUSH14,
+        Op.PUSH15,
+        Op.PUSH16,
+        Op.PUSH17,
+        Op.PUSH18,
+        Op.PUSH19,
+        Op.PUSH20,
+        Op.PUSH21,
+        Op.PUSH22,
+        Op.PUSH23,
+        Op.PUSH24,
+        Op.PUSH25,
+        Op.PUSH26,
+        Op.PUSH27,
+        Op.PUSH28,
+        Op.PUSH29,
+        Op.PUSH30,
+        Op.PUSH31,
+        Op.PUSH32,
     ],
 )
-@pytest.mark.pre_alloc_mutable
 def test_stack_overflow_push(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    opcode: Op,
+    fork: Fork,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=42949672960,
-    )
-
-    pre[sender] = Account(balance=0xE8D4A5100000000000)
-    pre[contract] = Account(balance=0xE8D4A5100000000000, nonce=0)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    """
+    Test pushing to the stack with all PUSH* opcodes until a stack overflow
+    occurs.
+    """
+    max_stack_height = fork.max_stack_height()
+    initcode = opcode[0x0] * (max_stack_height + 1)
 
+    sender = pre.fund_eoa()
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=6000000,
+        data=initcode,
+        gas_limit=6_000_000,
+        protected=fork.supports_protected_txs(),
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=sender, nonce=0): Account.NONEXISTENT
+    }
 
-    state_test(env=env, pre=pre, post=post, tx=tx)
+    state_test(pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStackTests/test_stack_overflow_swap.py b/tests/ported_static/stStackTests/test_stack_overflow_swap.py
index 89c1ee0a11f..8cdda0a7279 100644
--- a/tests/ported_static/stStackTests/test_stack_overflow_swap.py
+++ b/tests/ported_static/stStackTests/test_stack_overflow_swap.py
@@ -1,40 +1,37 @@
 """
-Test ported from static filler.
+Test_stack_overflow_swap.
 
 Ported from:
-tests/static/state_tests/stStackTests/stackOverflowSWAPFiller.json
+state_tests/stStackTests/stackOverflowSWAPFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStackTests/stackOverflowSWAPFiller.json"],
+    ["state_tests/stStackTests/stackOverflowSWAPFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_stack_overflow_swap(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    """Test_stack_overflow_swap."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A5100000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,75 +42,18 @@ def test_stack_overflow_swap(
         gas_limit=42949672960,
     )
 
-    pre[sender] = Account(balance=0xE8D4A5100000000000)
-    pre[contract] = Account(balance=0xE8D4A5100000000000, nonce=0)
+    contract_0 = pre.fund_eoa(amount=0xE8D4A5100000000000)  # noqa: F841
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600090"  # noqa: E501
-        ),
+        data=Op.PUSH1[0x0] * 1024 + Op.SWAP1,
         gas_limit=6000000,
         value=1,
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=sender, nonce=0): Account(balance=1)
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStackTests/test_stacksanity_swap.py b/tests/ported_static/stStackTests/test_stacksanity_swap.py
index f9daac68802..d37c14c48a5 100644
--- a/tests/ported_static/stStackTests/test_stacksanity_swap.py
+++ b/tests/ported_static/stStackTests/test_stacksanity_swap.py
@@ -1,40 +1,37 @@
 """
-checks stack usage for SWAP.
+Checks stack usage for SWAP.
 
 Ported from:
-tests/static/state_tests/stStackTests/stacksanitySWAPFiller.json
+state_tests/stStackTests/stacksanitySWAPFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStackTests/stacksanitySWAPFiller.json"],
+    ["state_tests/stStackTests/stacksanitySWAPFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_stacksanity_swap(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """Checks stack usage for SWAP."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A5100000000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,75 +42,18 @@ def test_stacksanity_swap(
         gas_limit=42949672960,
     )
 
-    pre[sender] = Account(balance=0xE8D4A5100000000000)
-    pre[contract] = Account(balance=0xE8D4A5100000000000, nonce=0)
+    contract_0 = pre.fund_eoa(amount=0xE8D4A5100000000000)  # noqa: F841
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600060006000"  # noqa: E501
-            "600060006000600060006000600060006000600060006000600060006000600090"  # noqa: E501
-        ),
+        data=Op.PUSH1[0x0] * 1024 + Op.SWAP1,
         gas_limit=6000000,
         value=1,
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=sender, nonce=0): Account(balance=1)
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStackTests/test_underflow_test.py b/tests/ported_static/stStackTests/test_underflow_test.py
index 2ede10365ba..92b79de5edb 100644
--- a/tests/ported_static/stStackTests/test_underflow_test.py
+++ b/tests/ported_static/stStackTests/test_underflow_test.py
@@ -2,7 +2,7 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/stStackTests/underflowTestFiller.yml
+state_tests/stStackTests/underflowTestFiller.yml
 """
 
 import pytest
@@ -11,86488 +11,4270 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stStackTests/underflowTestFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "693c61390000000000000000000000003aac251f428dcd7cb57e01c7dbb8bc3a76d5d628",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000cc44bebaeb76a6568aa26ae045f8516fa29b0f9c",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000c51017527cdd990d0c8e146ed36237694024021c",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000023d790b6f14975963ee30ff45cc4621c7e1eeaf7",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000001029b338aa781a64308000fa49515769618f176e",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000c8d2eb10090f9940b7e816e6a278ae2ec943d232",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000943b918e625b3ecb5d186d820a60c8eebd1c71ec",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000058a413dde8ddd92c793fca0b18ce89bd3dfba0e8",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000006f72794f9c9d8a693ff6c1134d611d353678fcf0",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000b8479583829f24d888a0493a9132845b3d6a5305",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000001be71f78fcfbc7e4002db615e7fc878e7f090c50",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000f04fe60ad6f92fa14a53a0882943a66ea4e49ef1",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000f465862e7bf5085fb692e16d3181afaba87550cc",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000008ce099e0d9e5e5153e578f7cbfa9fd071b714142",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000008e3ab300e3d93ac55727c65510ff8bd96ea76928",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000af6ead2e1a296b787d4b084d30b0733518fd2462",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000059f8c0328e432df7467313742e1effc9ee2bac4e",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000bc57a2f2490132b8f8980cd242f7dc76b4b3f1c3",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000c24790535cfea9781d66d59b81d9b92a576bb9ef",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000488a9b0f0e885b96f67c113f0979799f801d70d3",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000050a33da19f003aec73bc65754e12a7f94c9b1c34",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000866777eaddc2be0a50b3d3f76f2064876ea42802",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000016a80f6c0bbed421a0d6b392e891a52fca715213",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000009bd8e7c30198bd73a39e51d6866b72026272773e",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000933cb75e0e03a16aa3d3e7114d269a6fe4db46f9",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000f1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000799721e570bcd85be50c0d7a399af369be561fbe",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000009386c3cce8cab9f8c3bc1a89c82a0e55588ced9d",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000d54c502b5478a191e9a25bc0d1ba94669c5a5f4f",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000836d0c3ce82596908935c3cc794da4603e135b1c",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000008ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000005782c86be10d218c82d509f3257e9dfdbf6dead8",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000444a2203a30517f4a8becca90192b193a7b6ecf3",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000004da0082f56c3cae860eb6fb0fe36bc17cfba2c27",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000d5765c6e58b373df78d7311fe80a67de0ddf987e",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000742bf896d715c00eb77f340fcaa65bacaee2467c",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000c698050f674750bbcafa30c433633dee22b8a9d3",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000006ce1b9fedca232f6829f0831ed2c23bd9c2f99a2",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000091605658e9533e831c9f855874faa14c363dc795",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000f2578fadcdd5cd7b55f7046c88a7a77e195a7b17",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000034fb465a898787f7ed08bc2f5de86a896f8bc4da",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000f84f405591be4ab47ca2ca1841dcb57cc43f076f",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000002cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000000cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000175de68007e136237a4f26b6983dbce27a87fb5b",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000009c8fc002a1dcd0edcf93c20dc9d674031dc5a28d",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000e6d703c31f83bc617a62f78e3c3a615001d3dd2c",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000113855e9aa747f6ae6fd74667d7a288b2288caf6",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000002c2938555e004cbb0ce4481bad8a15857d983d06",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000063e21ad1535b95aaeed05e893b5b7947d6b0f15a",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000005bce589f39f0eff323bcbeac539dc9fd0f429bd2",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000008030a1eb20b388143f12fb547b5e53a4c164a621",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000005bb0e367bec7d734cb0fc9c27eb85af479b39673",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000e594a68387d42d18bb8e460cef74876f05985e3a",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000009a90a463d916b189eee17b331f27a54142b79961",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000029d8125096a81237be857845270ab34afab88ac",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000000d423fa4896aca0a02cba41462e754c3241427f0",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000ca098deb4ab81002cddbd3c93261d6d1cb5113b5",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000fbc09ac707fcca4ae8e348f01457ea18825bd139",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000662d9872215dde44ec296918a0fd96c45c97b332",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000aeec863f85b9a222ac1ffff774a881d46ec3ad37",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000005d4fa1456fbf03872b922dc0e8e48ec49f5faf9e",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000002b3bc02cabba968640fd86614f855a406b5c32e2",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000005029d082367aa4510d5a6e3b5cf83cd41e05c7f4",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000c36332f339266d7989b005864c48548883213125",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000973b5cc7e4678bcb85618b38c910f8adc68703a6",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000093d0507f681ba7de662d14ae8de922d161698c8e",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000bf337119d0b966cc500cd3ff5ab9f3c7fddaa91d",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000007142d01ed8802179659127719398fa679ac41292",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000a3d5aecbf6541cd2a0df5ae2e1294abc682180e6",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000664f23c7af786dc61b6a068b3f9bde0051716384",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000075a2a8afa2446ec88a716ef7074351accfaccadf",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000f9a965915f18a6108b842a40148dc5fd47ec7140",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000d60ab3d73fd71f071ede5eead527db298236b162",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000c744cf16cf5e2eb3c97e641e63801b8af3015def",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000be25986eb0ee281252e783918d867630e5119455",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000017f25a871ea2ea564cffe99d31dedcf1fcff0a63",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000fb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000c70e97b872035f925b07db55b85a3eac04e724d6",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000d051afb76160844eb32df55e052044de76250ebc",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000dac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000003fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000a7eec8574dbfc883575f2b20a80f14f335a809b6",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000022d7d32459b46a9b69542c31545cb3a0d887064c",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000715f213243cd7baeefd3a52434353015a4fc8de2",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000079d8aedd70f8a99a15e3083d3335a028d69af9fa",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000077225976113d69eee2fd870ea02d670badabdcab",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000002947a82b8aabd0f80c7e215bc066ea92bdd65b31",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000092bfb1aa73e92c1f591d8b6854514df6672bbb90",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000b2e76a6fdfc66a93a2354748ec2d107a818fe73c",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000005df0dd6d100e8dd03d211b55d4a8cc7c7657c038",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000004e985c32a0f53ab426fe2bcdea720f0f71a4c1d1",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000ec26e590a6f5da137088aee0c4d6b0f8870eb1ad",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000ac95d1d1c86af90f5a0cf44c104d0da04ab3a467",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000a1903db9aa9aa2665ca7da383db9291d93f1d576",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000891e304c4126f24bf762df079c7683420b16ff57",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000e383f3e5b45fa86d5b37cdfeb146cf903641c76c",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000da3ec48d60f1cf78ecc154fa0c6181cf833916aa",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000000824de5bb894849fcdd60634275d6bcb8157d4a0",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000da24ffd288756277e556671ae2306b7587ef0c63",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000010df9321d0355308a994d3709e30609bd72655b7",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000c52f28d6433f203eae23f5f2fc642938a25aafe7",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000007d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000e8565720ba47032e7b0edcb4bce06303f83ff450",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000005f750bad38b37c4ebcc5fee4eed5639283a09a38",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000014ed6c71ebccdf69007d79fe699d368102533929",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000084798b4fb35d09db14ecab9d65a4a280e483fe29",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000007d002cacbe954f4360fe634fbe23f5b67c686cbf",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000b37c41d445866ceb36edc4e6456cae78949c9f97",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000008e689eee6c7387a37612a42f8ee44dd7a823fb5c",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000c131d96e30386b63f89592008939dd517579f203",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000058cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000cc9ffede5b0d7f58002f852181d0b4b35c0dabee",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000000bdf35fc6c5c2a3e1e9711112ff7ef71e2419532",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000ec8b92806c1ad0f2dcf5b0207db7eddb464df0ca",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000011ffe11bb835b6ce89fc91d65b1f6c0919b07a1d",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000a7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000701a7d6aa6ef15a38fd8311e074a96c09b434a2a",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000c024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000a49e66f497a85d949d334a20724bc6b75da3d3ae",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000001e27cc27790c60dde31215bf2be1d9a66c41c8fa",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000001523b84a9fb4a0d32f070847190d34f912c04c4e",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000007aedaf23d4e9afb84baa67824cebfec01339afc1",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000005096db6b2ea6ace8e2aeb3610faaad183a51ca8d",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000e519ac21322361b960bed6ccbbf538840e85f76e",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000c74809261edc3edd91ec17dbf4b898233c42ddb4",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000009d8ea14af8d401208eb0687b8ae6f1e5ed6808d4",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000018c875e7eb21e50bad81e8940a2272fd6760e0dd",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000ee8790666225df6f97ae194e20853f2907bbaebc",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000045952ed2c957691ae4de05032b429a8a0f0ced5b",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000b50944b674eb20b0fe99a18bb764b45500c41144",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000fcc0a7ebcab4f6d8c91c9062f2cd1148073253d2",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 1}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000008b62b65db3bd1be727290b490c679c0e84585498",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000006c6bc4f9ccde5da559a3e5dddb6b60a8675c0076",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000002ac63027195da2ee9ce4cc1dff225ca97d3c2f0c",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000723a69480f074f5df2544cacf63347fb5f0f36d1",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000073f7599a216d98d9ff1559788a9771d78895a6a3",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000004289634ebf793179377faa7140610bb80db21b45",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000066a62a0af37886b9b057a1bad714665525e7687f",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000001bb096578fe2f1be79e03ea88551a8bdd0692bea",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000745a759f45602915eab7bdc87bc8d1c1675d4e29",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000bf99ad09fc2f72924cbe6da6020f985e65f78901",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000727fd27941dbe4d8f1e2e9daa0df70288fd73772",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000001eb3790937f47fe31a45f55bd82f50107e7a463a",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000cd63f547ee166a3feb23a945f488ccc5ee921eef",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000008fd69485a26470a721f6dd7e685da39ee2a3dc1c",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000006f631ae51ead55c8526aff13665fe5dd055e3561",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000001debd2afba875db8938ce64218b40fb210e1de0a",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000e98c1ab0ff23d5c5005c639781d1a635b9af887b",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000acda51eb0d678a0d52bfa44e4354d8f371f43438",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000009768a9bb367830f3331b0c09d7183c131e44a7fc",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000d6bb0ea7c7f60c967d3deeeaaba555daafbc52cb",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000019598106d1cede298b275523e64593c95d5c431c",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000b44c7350f24bb5482057b53911a1d3c91c263eaf",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000000d0e14670e6e8718377bc2fae6b6814d558d3dee",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000a15fe2669809ddc6640e94572907a53411b2aa6e",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000d435f13e92f7db306b9b32e1d61db6ecd9c135bd",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000c3fce336558080ef8b1a20a209b173e6d163e548",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000620d85c5acc41cbfa47a763bbb9e326054b1819d",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000009b9d04770c429114574c11780fc9658d3257e80b",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c613900000000000000000000000044c420a5b1a9071eb7ff6f1027c167c002c7f355",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000dcb6a7c9b64471effdd8bbf72d32d271deeec8c5",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c6139000000000000000000000000d9292de838cd8839d91b496d8a9d25ac102cd821",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000003ad6053af54d703f7e7229bd5bf120c908c8513d",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000004c47590ab3f1dfe486900d0ec41510f85545b182",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-        (
-            "693c61390000000000000000000000009b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8",  # noqa: E501
-            {
-                Address("0x029d8125096a81237be857845270ab34afab88ac"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1029b338aa781a64308000fa49515769618f176e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x10df9321d0355308a994d3709e30609bd72655b7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x14ed6c71ebccdf69007d79fe699d368102533929"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x19598106d1cede298b275523e64593c95d5c431c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4289634ebf793179377faa7140610bb80db21b45"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"): Account(
-                    storage={0: 24743, 1: 24743}
-                ),
-                Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x662d9872215dde44ec296918a0fd96c45c97b332"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x66a62a0af37886b9b057a1bad714665525e7687f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7142d01ed8802179659127719398fa679ac41292"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x77225976113d69eee2fd870ea02d670badabdcab"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x799721e570bcd85be50c0d7a399af369be561fbe"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x891e304c4126f24bf762df079c7683420b16ff57"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8b62b65db3bd1be727290b490c679c0e84585498"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x91605658e9533e831c9f855874faa14c363dc795"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9a90a463d916b189eee17b331f27a54142b79961"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x9b9d04770c429114574c11780fc9658d3257e80b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xb8479583829f24d888a0493a9132845b3d6a5305"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbe25986eb0ee281252e783918d867630e5119455"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc131d96e30386b63f89592008939dd517579f203"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc36332f339266d7989b005864c48548883213125"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc51017527cdd990d0c8e146ed36237694024021c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd051afb76160844eb32df55e052044de76250ebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd60ab3d73fd71f071ede5eead527db298236b162"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda24ffd288756277e556671ae2306b7587ef0c63"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xee8790666225df6f97ae194e20853f2907bbaebc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"): Account(
-                    storage={1: 24743}
-                ),
-                Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"): Account(
-                    storage={1: 24743}
-                ),
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_underflow_test(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP6
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x029d8125096a81237be857845270ab34afab88ac"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.MULMOD
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x0824de5bb894849fcdd60634275d6bcb8157d4a0"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.SGT(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x0bdf35fc6c5c2a3e1e9711112ff7ef71e2419532"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP15
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x0cd1b3e02e0bc556b0c7d4779c69a9a383c0c7cd"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP5
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x0d0e14670e6e8718377bc2fae6b6814d558d3dee"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP7
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x0d423fa4896aca0a02cba41462e754c3241427f0"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.AND + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x1029b338aa781a64308000fa49515769618f176e"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.NOT + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x10df9321d0355308a994d3709e30609bd72655b7"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP2
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x113855e9aa747f6ae6fd74667d7a288b2288caf6"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SHA3(offset=0x80, size=0x80)
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x11ffe11bb835b6ce89fc91d65b1f6c0919b07a1d"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.POP(0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x14ed6c71ebccdf69007d79fe699d368102533929"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1) + Op.SIGNEXTEND(0x80, 0x80) + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x1523b84a9fb4a0d32f070847190d34f912c04c4e"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.CREATE
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x16a80f6c0bbed421a0d6b392e891a52fca715213"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP16
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x175de68007e136237a4f26b6983dbce27a87fb5b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.LOG0 + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x17f25a871ea2ea564cffe99d31dedcf1fcff0a63"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.SMOD(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x18c875e7eb21e50bad81e8940a2272fd6760e0dd"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP4
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x19598106d1cede298b275523e64593c95d5c431c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP12
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x1bb096578fe2f1be79e03ea88551a8bdd0692bea"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.BYTE + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x1be71f78fcfbc7e4002db615e7fc878e7f090c50"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP16
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x1debd2afba875db8938ce64218b40fb210e1de0a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.SIGNEXTEND
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x1e27cc27790c60dde31215bf2be1d9a66c41c8fa"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP14
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x1eb3790937f47fe31a45f55bd82f50107e7a463a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.LOG3(
-                offset=0x80,
-                size=0x80,
-                topic_1=0x80,
-                topic_2=0x80,
-                topic_3=0x80,
-            )
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x22d7d32459b46a9b69542c31545cb3a0d887064c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.ADDMOD(0x80, 0x80, 0x80)
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x23d790b6f14975963ee30ff45cc4621c7e1eeaf7"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.LT(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x2947a82b8aabd0f80c7e215bc066ea92bdd65b31"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP10
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x2ac63027195da2ee9ce4cc1dff225ca97d3c2f0c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.EQ + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x2b3bc02cabba968640fd86614f855a406b5c32e2"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP3
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x2c2938555e004cbb0ce4481bad8a15857d983d06"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP15
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x2cd79f853ec648b7c3ec3fac7c7ce82d7d83ea1e"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP14
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x34fb465a898787f7ed08bc2f5de86a896f8bc4da"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.ADD + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x3aac251f428dcd7cb57e01c7dbb8bc3a76d5d628"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP9
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x3ad6053af54d703f7e7229bd5bf120c908c8513d"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.LOG2(offset=0x80, size=0x80, topic_1=0x80, topic_2=0x80)
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x3fd249e0be1d7bf6386b7dc90d92bf95f9f98bc4"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP11
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x4289634ebf793179377faa7140610bb80db21b45"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP10
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x444a2203a30517f4a8becca90192b193a7b6ecf3"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP8
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x44c420a5b1a9071eb7ff6f1027c167c002c7f355"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.STATICCALL(
-                gas=0x80,
-                address=0x80,
-                args_offset=0x80,
-                args_size=0x80,
-                ret_offset=0x80,
-                ret_size=0x80,
-            )
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x45952ed2c957691ae4de05032b429a8a0f0ced5b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.CALLDATALOAD(offset=0x80)
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x488a9b0f0e885b96f67c113f0979799f801d70d3"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.XOR + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x4c47590ab3f1dfe486900d0ec41510f85545b182"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #     [[0]] 0x60A7
-    #     (call (gas) $4 0 0 0 0 0)
-    #     [[1]] 0x60A7
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x60A7)
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x4),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x60A7)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x4c5f839d523e76fc3837e085a3e1538cd36e288a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP10
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x4da0082f56c3cae860eb6fb0fe36bc17cfba2c27"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.MOD(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x4e985c32a0f53ab426fe2bcdea720f0f71a4c1d1"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.EQ(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x5029d082367aa4510d5a6e3b5cf83cd41e05c7f4"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.SLOAD(key=0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x5096db6b2ea6ace8e2aeb3610faaad183a51ca8d"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.CODECOPY
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x50a33da19f003aec73bc65754e12a7f94c9b1c34"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.DUP1 + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x5782c86be10d218c82d509f3257e9dfdbf6dead8"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1) + Op.BALANCE(address=0x80) + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x58a413dde8ddd92c793fca0b18ce89bd3dfba0e8"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.SDIV(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x58cd7cc2b1b1cd459decc8ebbbd2fcbf9c68cef9"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.CALLDATACOPY
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x59f8c0328e432df7467313742e1effc9ee2bac4e"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP5
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x5bb0e367bec7d734cb0fc9c27eb85af479b39673"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP4
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x5bce589f39f0eff323bcbeac539dc9fd0f429bd2"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP9
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x5d4fa1456fbf03872b922dc0e8e48ec49f5faf9e"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.MOD + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x5df0dd6d100e8dd03d211b55d4a8cc7c7657c038"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.POP + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x5f750bad38b37c4ebcc5fee4eed5639283a09a38"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP7
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x620d85c5acc41cbfa47a763bbb9e326054b1819d"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP3
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x63e21ad1535b95aaeed05e893b5b7947d6b0f15a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP8
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x662d9872215dde44ec296918a0fd96c45c97b332"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.EXTCODESIZE + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x664f23c7af786dc61b6a068b3f9bde0051716384"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP12
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x66a62a0af37886b9b057a1bad714665525e7687f"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP1
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x6c6bc4f9ccde5da559a3e5dddb6b60a8675c0076"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP12
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x6ce1b9fedca232f6829f0831ed2c23bd9c2f99a2"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP16
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x6f631ae51ead55c8526aff13665fe5dd055e3561"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.BLOCKHASH + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x6f72794f9c9d8a693ff6c1134d611d353678fcf0"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.SHL(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x701a7d6aa6ef15a38fd8311e074a96c09b434a2a"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.EXTCODEHASH + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x7142d01ed8802179659127719398fa679ac41292"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.LOG4
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x715f213243cd7baeefd3a52434353015a4fc8de2"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP10
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x723a69480f074f5df2544cacf63347fb5f0f36d1"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP14
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x727fd27941dbe4d8f1e2e9daa0df70288fd73772"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP11
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x73f7599a216d98d9ff1559788a9771d78895a6a3"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP11
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x742bf896d715c00eb77f340fcaa65bacaee2467c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP13
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x745a759f45602915eab7bdc87bc8d1c1675d4e29"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.EXTCODESIZE(address=0x80)
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x75a2a8afa2446ec88a716ef7074351accfaccadf"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.LT + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x77225976113d69eee2fd870ea02d670badabdcab"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DELEGATECALL
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x799721e570bcd85be50c0d7a399af369be561fbe"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.LOG4(
-                offset=0x80,
-                size=0x80,
-                topic_1=0x80,
-                topic_2=0x80,
-                topic_3=0x80,
-                topic_4=0x80,
-            )
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x79d8aedd70f8a99a15e3083d3335a028d69af9fa"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.SLOAD + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x7aedaf23d4e9afb84baa67824cebfec01339afc1"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.RETURN(offset=0x80, size=0x80)
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x7d002cacbe954f4360fe634fbe23f5b67c686cbf"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.OR + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x7d00c3c2cbb3b64bbb4f0f518ef779f6df875f6e"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP4
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x8030a1eb20b388143f12fb547b5e53a4c164a621"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.DIV(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x836d0c3ce82596908935c3cc794da4603e135b1c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.RETURN
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x84798b4fb35d09db14ecab9d65a4a280e483fe29"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.CODECOPY(dest_offset=0x80, offset=0x80, size=0x80)
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x866777eaddc2be0a50b3d3f76f2064876ea42802"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MSTORE8(offset=0x80, value=0x80)
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x891e304c4126f24bf762df079c7683420b16ff57"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.SWAP1 + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x8b62b65db3bd1be727290b490c679c0e84585498"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.CALL(
-                gas=0x80,
-                address=0x80,
-                value=0x80,
-                args_offset=0x80,
-                args_size=0x80,
-                ret_offset=0x80,
-                ret_size=0x80,
-            )
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x8ce099e0d9e5e5153e578f7cbfa9fd071b714142"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.DUP1 + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x8ceb89e3037b7ac8b58e3765ea3eb65f1a9e4a7c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.CALLCODE
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x8e3ab300e3d93ac55727c65510ff8bd96ea76928"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.SAR(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x8e689eee6c7387a37612a42f8ee44dd7a823fb5c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP15
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x8fd69485a26470a721f6dd7e685da39ee2a3dc1c"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP13
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x91605658e9533e831c9f855874faa14c363dc795"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.MLOAD + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x92bfb1aa73e92c1f591d8b6854514df6672bbb90"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.CREATE2
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x933cb75e0e03a16aa3d3e7114d269a6fe4db46f9"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.DELEGATECALL(
-                gas=0x80,
-                address=0x80,
-                args_offset=0x80,
-                args_size=0x80,
-                ret_offset=0x80,
-                ret_size=0x80,
-            )
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x9386c3cce8cab9f8c3bc1a89c82a0e55588ced9d"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.EXTCODECOPY
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x93d0507f681ba7de662d14ae8de922d161698c8e"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.BALANCE + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x943b918e625b3ecb5d186d820a60c8eebd1c71ec"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.EXP(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x973b5cc7e4678bcb85618b38c910f8adc68703a6"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP3
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x9768a9bb367830f3331b0c09d7183c131e44a7fc"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP6
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x9a90a463d916b189eee17b331f27a54142b79961"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.XOR(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x9b0edd3cf5b6ccc09b3c9d15646ef629a7767ba8"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP7
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x9b9d04770c429114574c11780fc9658d3257e80b"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.CREATE(value=0x80, offset=0x80, size=0x80)
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x9bd8e7c30198bd73a39e51d6866b72026272773e"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP16
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x9c8fc002a1dcd0edcf93c20dc9d674031dc5a28d"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.SMOD + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0x9d8ea14af8d401208eb0687b8ae6f1e5ed6808d4"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP5
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0xa15fe2669809ddc6640e94572907a53411b2aa6e"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.MSTORE8
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0xa1903db9aa9aa2665ca7da383db9291d93f1d576"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.EXTCODEHASH(address=0x80)
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0xa3d5aecbf6541cd2a0df5ae2e1294abc682180e6"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.SHR(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0xa49e66f497a85d949d334a20724bc6b75da3d3ae"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.SHL + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0xa7b1cd72ebc0b8f3e353885ef17b04aa28d8f0fa"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.LOG3
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0xa7eec8574dbfc883575f2b20a80f14f335a809b6"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MSTORE(offset=0x80, value=0x80)
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0xac95d1d1c86af90f5a0cf44c104d0da04ab3a467"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP2
-            + Op.STOP
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/stStackTests/underflowTestFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="ADD-1",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="ADD-2",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="MUL-1",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="MUL-2",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="SUB-1",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="SUB-2",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="DIV-1",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="DIV-2",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="SDIV-1",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="SDIV-2",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="MOD-1",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="MOD-2",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="SMOD-1",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="SMOD-2",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="ADDMOD-2",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="ADDMOD-3",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="MULMOD-2",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="MULMOD-3",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="EXP-1",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="EXP-2",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="SIGNEXTEND-1",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="SIGNEXTEND-2",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="LT-1",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="LT-2",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="GT-1",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="GT-2",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="SLT-1",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="SLT-2",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="SGT-1",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="SGT-2",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="EQ-1",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="EQ-2",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="ISZERO-0",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="ISZERO-1",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="AND-1",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="AND-2",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="OR-1",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="OR-2",
+        ),
+        pytest.param(
+            38,
+            0,
+            0,
+            id="XOR-1",
+        ),
+        pytest.param(
+            39,
+            0,
+            0,
+            id="XOR-2",
+        ),
+        pytest.param(
+            40,
+            0,
+            0,
+            id="NOT-0",
+        ),
+        pytest.param(
+            41,
+            0,
+            0,
+            id="NOT-1",
+        ),
+        pytest.param(
+            42,
+            0,
+            0,
+            id="BYTE-1",
+        ),
+        pytest.param(
+            43,
+            0,
+            0,
+            id="BYTE-2",
+        ),
+        pytest.param(
+            44,
+            0,
+            0,
+            id="SHL-1",
+        ),
+        pytest.param(
+            45,
+            0,
+            0,
+            id="SHL-2",
+        ),
+        pytest.param(
+            46,
+            0,
+            0,
+            id="SHR-1",
+        ),
+        pytest.param(
+            47,
+            0,
+            0,
+            id="SHR-2",
+        ),
+        pytest.param(
+            48,
+            0,
+            0,
+            id="SAR-1",
+        ),
+        pytest.param(
+            49,
+            0,
+            0,
+            id="SAR-2",
+        ),
+        pytest.param(
+            50,
+            0,
+            0,
+            id="SHA3-1",
+        ),
+        pytest.param(
+            51,
+            0,
+            0,
+            id="SHA3-2",
+        ),
+        pytest.param(
+            52,
+            0,
+            0,
+            id="BALANCE-0",
+        ),
+        pytest.param(
+            53,
+            0,
+            0,
+            id="BALANCE-1",
+        ),
+        pytest.param(
+            54,
+            0,
+            0,
+            id="CALLDATALOAD-0",
+        ),
+        pytest.param(
+            55,
+            0,
+            0,
+            id="CALLDATALOAD-1",
+        ),
+        pytest.param(
+            56,
+            0,
+            0,
+            id="CALLDATACOPY-2",
+        ),
+        pytest.param(
+            57,
+            0,
+            0,
+            id="CALLDATACOPY-3",
+        ),
+        pytest.param(
+            58,
+            0,
+            0,
+            id="CODECOPY-2",
+        ),
+        pytest.param(
+            59,
+            0,
+            0,
+            id="CODECOPY-3",
+        ),
+        pytest.param(
+            60,
+            0,
+            0,
+            id="EXTCODESIZE-0",
+        ),
+        pytest.param(
+            61,
+            0,
+            0,
+            id="EXTCODESIZE-1",
+        ),
+        pytest.param(
+            62,
+            0,
+            0,
+            id="EXTCODECOPY-3",
+        ),
+        pytest.param(
+            63,
+            0,
+            0,
+            id="EXTCODECOPY-4",
+        ),
+        pytest.param(
+            64,
+            0,
+            0,
+            id="EXTCODEHASH-0",
+        ),
+        pytest.param(
+            65,
+            0,
+            0,
+            id="EXTCODEHASH-1",
+        ),
+        pytest.param(
+            66,
+            0,
+            0,
+            id="BLOCKHASH-0",
+        ),
+        pytest.param(
+            67,
+            0,
+            0,
+            id="BLOCKHASH-1",
+        ),
+        pytest.param(
+            68,
+            0,
+            0,
+            id="POP-0",
+        ),
+        pytest.param(
+            69,
+            0,
+            0,
+            id="POP-1",
+        ),
+        pytest.param(
+            70,
+            0,
+            0,
+            id="MLOAD-0",
+        ),
+        pytest.param(
+            71,
+            0,
+            0,
+            id="MLOAD-1",
+        ),
+        pytest.param(
+            72,
+            0,
+            0,
+            id="MSTORE-1",
+        ),
+        pytest.param(
+            73,
+            0,
+            0,
+            id="MSTORE-2",
+        ),
+        pytest.param(
+            74,
+            0,
+            0,
+            id="MSTORE8-1",
+        ),
+        pytest.param(
+            75,
+            0,
+            0,
+            id="MSTORE8-2",
+        ),
+        pytest.param(
+            76,
+            0,
+            0,
+            id="SLOAD-0",
+        ),
+        pytest.param(
+            77,
+            0,
+            0,
+            id="SLOAD-1",
+        ),
+        pytest.param(
+            78,
+            0,
+            0,
+            id="LOG0-1",
+        ),
+        pytest.param(
+            79,
+            0,
+            0,
+            id="LOG0-2",
+        ),
+        pytest.param(
+            80,
+            0,
+            0,
+            id="LOG1-2",
+        ),
+        pytest.param(
+            81,
+            0,
+            0,
+            id="LOG1-3",
+        ),
+        pytest.param(
+            82,
+            0,
+            0,
+            id="LOG2-3",
+        ),
+        pytest.param(
+            83,
+            0,
+            0,
+            id="LOG2-4",
+        ),
+        pytest.param(
+            84,
+            0,
+            0,
+            id="LOG3-4",
+        ),
+        pytest.param(
+            85,
+            0,
+            0,
+            id="LOG3-5",
+        ),
+        pytest.param(
+            86,
+            0,
+            0,
+            id="LOG4-5",
+        ),
+        pytest.param(
+            87,
+            0,
+            0,
+            id="LOG4-6",
+        ),
+        pytest.param(
+            88,
+            0,
+            0,
+            id="CREATE-2",
+        ),
+        pytest.param(
+            89,
+            0,
+            0,
+            id="CREATE-3",
+        ),
+        pytest.param(
+            90,
+            0,
+            0,
+            id="CALL-6",
+        ),
+        pytest.param(
+            91,
+            0,
+            0,
+            id="CALL-7",
+        ),
+        pytest.param(
+            92,
+            0,
+            0,
+            id="CALLCODE-6",
+        ),
+        pytest.param(
+            93,
+            0,
+            0,
+            id="CALLCODE-7",
+        ),
+        pytest.param(
+            94,
+            0,
+            0,
+            id="RETURN-1",
+        ),
+        pytest.param(
+            95,
+            0,
+            0,
+            id="RETURN-2",
+        ),
+        pytest.param(
+            96,
+            0,
+            0,
+            id="DELEGATECALL-5",
+        ),
+        pytest.param(
+            97,
+            0,
+            0,
+            id="DELEGATECALL-6",
+        ),
+        pytest.param(
+            98,
+            0,
+            0,
+            id="CREATE2-3",
+        ),
+        pytest.param(
+            99,
+            0,
+            0,
+            id="CREATE2-4",
+        ),
+        pytest.param(
+            100,
+            0,
+            0,
+            id="STATICCALL-5",
+        ),
+        pytest.param(
+            101,
+            0,
+            0,
+            id="STATICCALL-6",
+        ),
+        pytest.param(
+            102,
+            0,
+            0,
+            id="DUP1-0",
+        ),
+        pytest.param(
+            103,
+            0,
+            0,
+            id="DUP1-1",
+        ),
+        pytest.param(
+            104,
+            0,
+            0,
+            id="DUP2-1",
+        ),
+        pytest.param(
+            105,
+            0,
+            0,
+            id="DUP2-2",
+        ),
+        pytest.param(
+            106,
+            0,
+            0,
+            id="DUP3-2",
+        ),
+        pytest.param(
+            107,
+            0,
+            0,
+            id="DUP3-3",
+        ),
+        pytest.param(
+            108,
+            0,
+            0,
+            id="DUP4-3",
+        ),
+        pytest.param(
+            109,
+            0,
+            0,
+            id="DUP4-4",
+        ),
+        pytest.param(
+            110,
+            0,
+            0,
+            id="DUP5-4",
+        ),
+        pytest.param(
+            111,
+            0,
+            0,
+            id="DUP5-5",
+        ),
+        pytest.param(
+            112,
+            0,
+            0,
+            id="DUP6-5",
+        ),
+        pytest.param(
+            113,
+            0,
+            0,
+            id="DUP6-6",
+        ),
+        pytest.param(
+            114,
+            0,
+            0,
+            id="DUP7-6",
+        ),
+        pytest.param(
+            115,
+            0,
+            0,
+            id="DUP7-7",
+        ),
+        pytest.param(
+            116,
+            0,
+            0,
+            id="DUP8-7",
+        ),
+        pytest.param(
+            117,
+            0,
+            0,
+            id="DUP8-8",
+        ),
+        pytest.param(
+            118,
+            0,
+            0,
+            id="DUP9-8",
+        ),
+        pytest.param(
+            119,
+            0,
+            0,
+            id="DUP9-9",
+        ),
+        pytest.param(
+            120,
+            0,
+            0,
+            id="DUP10-9",
+        ),
+        pytest.param(
+            121,
+            0,
+            0,
+            id="DUP10-10",
+        ),
+        pytest.param(
+            122,
+            0,
+            0,
+            id="DUP11-10",
+        ),
+        pytest.param(
+            123,
+            0,
+            0,
+            id="DUP11-11",
+        ),
+        pytest.param(
+            124,
+            0,
+            0,
+            id="DUP12-11",
+        ),
+        pytest.param(
+            125,
+            0,
+            0,
+            id="DUP12-12",
+        ),
+        pytest.param(
+            126,
+            0,
+            0,
+            id="DUP13-12",
+        ),
+        pytest.param(
+            127,
+            0,
+            0,
+            id="DUP13-13",
+        ),
+        pytest.param(
+            128,
+            0,
+            0,
+            id="DUP14-13",
+        ),
+        pytest.param(
+            129,
+            0,
+            0,
+            id="DUP14-14",
+        ),
+        pytest.param(
+            130,
+            0,
+            0,
+            id="DUP15-14",
+        ),
+        pytest.param(
+            131,
+            0,
+            0,
+            id="DUP15-15",
+        ),
+        pytest.param(
+            132,
+            0,
+            0,
+            id="DUP16-15",
+        ),
+        pytest.param(
+            133,
+            0,
+            0,
+            id="DUP16-16",
+        ),
+        pytest.param(
+            134,
+            0,
+            0,
+            id="SWAP1-1",
+        ),
+        pytest.param(
+            135,
+            0,
+            0,
+            id="SWAP1-2",
+        ),
+        pytest.param(
+            136,
+            0,
+            0,
+            id="SWAP2-2",
+        ),
+        pytest.param(
+            137,
+            0,
+            0,
+            id="SWAP2-3",
+        ),
+        pytest.param(
+            138,
+            0,
+            0,
+            id="SWAP3-3",
+        ),
+        pytest.param(
+            139,
+            0,
+            0,
+            id="SWAP3-4",
+        ),
+        pytest.param(
+            140,
+            0,
+            0,
+            id="SWAP4-4",
+        ),
+        pytest.param(
+            141,
+            0,
+            0,
+            id="SWAP4-5",
+        ),
+        pytest.param(
+            142,
+            0,
+            0,
+            id="SWAP5-5",
+        ),
+        pytest.param(
+            143,
+            0,
+            0,
+            id="SWAP5-6",
+        ),
+        pytest.param(
+            144,
+            0,
+            0,
+            id="SWAP6-6",
+        ),
+        pytest.param(
+            145,
+            0,
+            0,
+            id="SWAP6-7",
+        ),
+        pytest.param(
+            146,
+            0,
+            0,
+            id="SWAP7-7",
+        ),
+        pytest.param(
+            147,
+            0,
+            0,
+            id="SWAP7-8",
+        ),
+        pytest.param(
+            148,
+            0,
+            0,
+            id="SWAP8-8",
+        ),
+        pytest.param(
+            149,
+            0,
+            0,
+            id="SWAP8-9",
+        ),
+        pytest.param(
+            150,
+            0,
+            0,
+            id="SWAP9-9",
+        ),
+        pytest.param(
+            151,
+            0,
+            0,
+            id="SWAP9-10",
+        ),
+        pytest.param(
+            152,
+            0,
+            0,
+            id="SWAP10-10",
+        ),
+        pytest.param(
+            153,
+            0,
+            0,
+            id="SWAP10-11",
+        ),
+        pytest.param(
+            154,
+            0,
+            0,
+            id="SWAP11-11",
+        ),
+        pytest.param(
+            155,
+            0,
+            0,
+            id="SWAP11-12",
+        ),
+        pytest.param(
+            156,
+            0,
+            0,
+            id="SWAP12-12",
+        ),
+        pytest.param(
+            157,
+            0,
+            0,
+            id="SWAP12-13",
+        ),
+        pytest.param(
+            158,
+            0,
+            0,
+            id="SWAP13-13",
+        ),
+        pytest.param(
+            159,
+            0,
+            0,
+            id="SWAP13-14",
+        ),
+        pytest.param(
+            160,
+            0,
+            0,
+            id="SWAP14-14",
+        ),
+        pytest.param(
+            161,
+            0,
+            0,
+            id="SWAP14-15",
+        ),
+        pytest.param(
+            162,
+            0,
+            0,
+            id="SWAP15-15",
+        ),
+        pytest.param(
+            163,
+            0,
+            0,
+            id="SWAP15-16",
+        ),
+        pytest.param(
+            164,
+            0,
+            0,
+            id="SWAP16-16",
+        ),
+        pytest.param(
+            165,
+            0,
+            0,
+            id="SWAP16-17",
         ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0xacda51eb0d678a0d52bfa44e4354d8f371f43438"),  # noqa: E501
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_underflow_test(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = EOA(
+        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP9
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0xaeec863f85b9a222ac1ffff774a881d46ec3ad37"),  # noqa: E501
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.CALLCODE(
-                gas=0x80,
-                address=0x80,
-                value=0x80,
-                args_offset=0x80,
-                args_size=0x80,
-                ret_offset=0x80,
-                ret_size=0x80,
-            )
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: raw
+    # 0x600160015560800100
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.ADD + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xaf6ead2e1a296b787d4b084d30b0733518fd2462"),  # noqa: E501
+        address=Address(0x3AAC251F428DCD7CB57E01C7DBB8BC3A76D5D628),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.MLOAD(offset=0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060800100
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.ADD(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xb2e76a6fdfc66a93a2354748ec2d107a818fe73c"),  # noqa: E501
+        address=Address(0xCC44BEBAEB76A6568AA26AE045F8516FA29B0F9C),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.SAR + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560800200
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.MUL + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xb37c41d445866ceb36edc4e6456cae78949c9f97"),  # noqa: E501
+        address=Address(0xE383F3E5B45FA86D5B37CDFEB146CF903641C76C),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP4
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060800200
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.MUL(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xb44c7350f24bb5482057b53911a1d3c91c263eaf"),  # noqa: E501
+        address=Address(0xDA3EC48D60F1CF78ECC154FA0C6181CF833916AA),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x600160015560800300
+    addr_5 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.SUB + Op.STOP,
-        storage={0x1: 0x60A7},
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xb50944b674eb20b0fe99a18bb764b45500c41144"),  # noqa: E501
+        address=Address(0xB50944B674EB20B0FE99A18BB764B45500C41144),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.BLOCKHASH(block_number=0x80)
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060800300
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.SUB(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xb8479583829f24d888a0493a9132845b3d6a5305"),  # noqa: E501
+        address=Address(0xFCC0A7EBCAB4F6D8C91C9062F2CD1148073253D2),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.CALLDATACOPY(dest_offset=0x80, offset=0x80, size=0x80)
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560800400
+    addr_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.DIV + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xbc57a2f2490132b8f8980cd242f7dc76b4b3f1c3"),  # noqa: E501
+        address=Address(0xD54C502B5478A191E9A25BC0D1BA94669C5A5F4F),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.ISZERO(0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060800400
+    addr_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.DIV(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xbe25986eb0ee281252e783918d867630e5119455"),  # noqa: E501
+        address=Address(0x836D0C3CE82596908935C3CC794DA4603E135B1C),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.EXTCODECOPY(
-                address=0x80,
-                dest_offset=0x80,
-                offset=0x80,
-                size=0x80,
-            )
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560800500
+    addr_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80]
+        + Op.SDIV
+        + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xbf337119d0b966cc500cd3ff5ab9f3c7fddaa91d"),  # noqa: E501
+        address=Address(0xC131D96E30386B63F89592008939DD517579F203),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP13
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060800500
+    addr_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.SDIV(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xbf99ad09fc2f72924cbe6da6020f985e65f78901"),  # noqa: E501
+        address=Address(0x58CD7CC2B1B1CD459DECC8EBBBD2FCBF9C68CEF9),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.SHR + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560800600
+    addr_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.MOD + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xc024f0f81b1c2c1ab6362e5ecf79a7be3de2f60e"),  # noqa: E501
+        address=Address(0x5DF0DD6D100E8DD03D211B55D4A8CC7C7657C038),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.SDIV + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060800600
+    addr_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.MOD(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xc131d96e30386b63f89592008939dd517579f203"),  # noqa: E501
+        address=Address(0x4E985C32A0F53AB426FE2BCDEA720F0F71A4C1D1),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.CALLDATALOAD + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560800700
+    addr_13 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80]
+        + Op.SMOD
+        + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xc24790535cfea9781d66d59b81d9b92a576bb9ef"),  # noqa: E501
+        address=Address(0x9D8EA14AF8D401208EB0687B8AE6F1E5ED6808D4),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x6001600155608060800700
+    addr_14 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.SMOD(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x18C875E7EB21E50BAD81E8940A2272FD6760E0DD),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060800800
+    addr_15 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 2
+        + Op.ADDMOD
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xC51017527CDD990D0C8E146ED36237694024021C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060800800
+    addr_16 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.ADDMOD(0x80, 0x80, 0x80)
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x23D790B6F14975963EE30FF45CC4621C7E1EEAF7),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060800900
+    addr_17 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 2
+        + Op.MULMOD
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x0824DE5BB894849FCDD60634275D6BCB8157D4A0),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060800900
+    addr_18 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MULMOD(0x80, 0x80, 0x80)
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xDA24FFD288756277E556671AE2306B7587EF0C63),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560800A00
+    addr_19 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.EXP + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0xc36332f339266d7989b005864c48548883213125"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP6
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xc3fce336558080ef8b1a20a209b173e6d163e548"),  # noqa: E501
+        address=Address(0xC36332F339266D7989B005864C48548883213125),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.ADDMOD
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060800A00
+    addr_20 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.EXP(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x973B5CC7E4678BCB85618B38C910F8ADC68703A6),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560800B00
+    addr_21 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80]
+        + Op.SIGNEXTEND
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x1E27CC27790C60DDE31215BF2BE1D9A66C41C8FA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060800B00
+    addr_22 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SIGNEXTEND(0x80, 0x80)
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x1523B84A9FB4A0D32F070847190D34F912C04C4E),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560801000
+    addr_23 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.LT + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xc51017527cdd990d0c8e146ed36237694024021c"),  # noqa: E501
+        address=Address(0x77225976113D69EEE2FD870EA02D670BADABDCAB),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.NOT(0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060801000
+    addr_24 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.LT(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xc52f28d6433f203eae23f5f2fc642938a25aafe7"),  # noqa: E501
+        address=Address(0x2947A82B8AABD0F80C7E215BC066EA92BDD65B31),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP12
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560801100
+    addr_25 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.GT + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xc698050f674750bbcafa30c433633dee22b8a9d3"),  # noqa: E501
+        address=Address(0xF9A965915F18A6108B842A40148DC5FD47EC7140),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.LOG1
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060801100
+    addr_26 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.GT(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xc70e97b872035f925b07db55b85a3eac04e724d6"),  # noqa: E501
+        address=Address(0xD60AB3D73FD71F071EDE5EEAD527DB298236B162),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.ISZERO + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560801200
+    addr_27 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.SLT + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xc744cf16cf5e2eb3c97e641e63801b8af3015def"),  # noqa: E501
+        address=Address(0xE519AC21322361B960BED6CCBBF538840E85F76E),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x6001600155608060801200
+    addr_28 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x1) + Op.SLT(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xc74809261edc3edd91ec17dbf4b898233c42ddb4"),  # noqa: E501
+        address=Address(0xC74809261EDC3EDD91EC17DBF4B898233C42DDB4),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.AND(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0xc8d2eb10090f9940b7e816e6a278ae2ec943d232"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP7
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
-        nonce=0,
-        address=Address("0xca098deb4ab81002cddbd3c93261d6d1cb5113b5"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.ADD(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560801300
+    addr_29 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.SGT + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xcc44bebaeb76a6568aa26ae045f8516fa29b0f9c"),  # noqa: E501
+        address=Address(0xCC9FFEDE5B0D7F58002F852181D0B4B35C0DABEE),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.SGT + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060801300
+    addr_30 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.SGT(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xcc9ffede5b0d7f58002f852181d0b4b35c0dabee"),  # noqa: E501
+        address=Address(0x0BDF35FC6C5C2A3E1E9711112FF7EF71E2419532),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP15
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560801400
+    addr_31 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.EQ + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xcd63f547ee166a3feb23a945f488ccc5ee921eef"),  # noqa: E501
+        address=Address(0x2B3BC02CABBA968640FD86614F855A406B5C32E2),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.LOG1(offset=0x80, size=0x80, topic_1=0x80)
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060801400
+    addr_32 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.EQ(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xd051afb76160844eb32df55e052044de76250ebc"),  # noqa: E501
+        address=Address(0x5029D082367AA4510D5A6E3B5CF83CD41E05C7F4),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP6
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x60016001551500
+    addr_33 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.ISZERO + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xd435f13e92f7db306b9b32e1d61db6ecd9c135bd"),  # noqa: E501
+        address=Address(0xC744CF16CF5E2EB3C97E641E63801B8AF3015DEF),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.DIV + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560801500
+    addr_34 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.ISZERO(0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xd54c502b5478a191e9a25bc0d1ba94669c5a5f4f"),  # noqa: E501
+        address=Address(0xBE25986EB0EE281252E783918D867630E5119455),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP11
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560801600
+    addr_35 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.AND + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xd5765c6e58b373df78d7311fe80a67de0ddf987e"),  # noqa: E501
+        address=Address(0x1029B338AA781A64308000FA49515769618F176E),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.GT(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060801600
+    addr_36 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.AND(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xd60ab3d73fd71f071ede5eead527db298236b162"),  # noqa: E501
+        address=Address(0xC8D2EB10090F9940B7E816E6A278AE2EC943D232),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP3
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560801700
+    addr_37 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.OR + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xd6bb0ea7c7f60c967d3deeeaaba555daafbc52cb"),  # noqa: E501
+        address=Address(0x7D00C3C2CBB3B64BBB4F0F518EF779F6DF875F6E),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP9
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060801700
+    addr_38 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.OR(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xd9292de838cd8839d91b496d8a9d25ac102cd821"),  # noqa: E501
+        address=Address(0xE8565720BA47032E7B0EDCB4BCE06303F83FF450),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MULMOD(0x80, 0x80, 0x80)
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560801800
+    addr_39 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.XOR + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xda24ffd288756277e556671ae2306b7587ef0c63"),  # noqa: E501
+        address=Address(0x4C47590AB3F1DFE486900D0EC41510F85545B182),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.MUL(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060801800
+    addr_40 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.XOR(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xda3ec48d60f1cf78ecc154fa0c6181cf833916aa"),  # noqa: E501
+        address=Address(0x9B0EDD3CF5B6CCC09B3C9D15646EF629A7767BA8),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.LOG2
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x60016001551900
+    addr_41 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.NOT + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xdac05b6fc9dc9c0b65ecc5032f2313f7a7dd2586"),  # noqa: E501
+        address=Address(0x10DF9321D0355308A994D3709E30609BD72655B7),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP8
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560801900
+    addr_42 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.NOT(0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xdcb6a7c9b64471effdd8bbf72d32d271deeec8c5"),  # noqa: E501
+        address=Address(0xC52F28D6433F203EAE23F5F2FC642938A25AAFE7),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.MUL + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560801A00
+    addr_43 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80]
+        + Op.BYTE
+        + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xe383f3e5b45fa86d5b37cdfeb146cf903641c76c"),  # noqa: E501
+        address=Address(0x1BE71F78FCFBC7E4002DB615E7FC878E7F090C50),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.SLT + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060801A00
+    addr_44 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.BYTE(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xe519ac21322361b960bed6ccbbf538840e85f76e"),  # noqa: E501
+        address=Address(0xF04FE60AD6F92FA14A53A0882943A66EA4E49EF1),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP5
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560801B00
+    addr_45 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.SHL + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xe594a68387d42d18bb8e460cef74876f05985e3a"),  # noqa: E501
+        address=Address(0xA7B1CD72EBC0B8F3E353885EF17B04AA28D8F0FA),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.DUP2 + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060801B00
+    addr_46 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.SHL(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xe6d703c31f83bc617a62f78e3c3a615001d3dd2c"),  # noqa: E501
+        address=Address(0x701A7D6AA6EF15A38FD8311E074A96C09B434A2A),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.OR(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560801C00
+    addr_47 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.SHR + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xe8565720ba47032e7b0edcb4bce06303f83ff450"),  # noqa: E501
+        address=Address(0xC024F0F81B1C2C1AB6362E5ECF79A7BE3DE2F60E),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.SWAP2
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060801C00
+    addr_48 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.SHR(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xe98c1ab0ff23d5c5005c639781d1a635b9af887b"),  # noqa: E501
+        address=Address(0xA49E66F497A85D949D334A20724BC6B75DA3D3AE),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.MSTORE
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560801D00
+    addr_49 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.SAR + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xec26e590a6f5da137088aee0c4d6b0f8870eb1ad"),  # noqa: E501
+        address=Address(0xB37C41D445866CEB36EDC4E6456CAE78949C9F97),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.SHA3 + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x6001600155608060801D00
+    addr_50 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.SAR(0x80, 0x80) + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x8E689EEE6C7387A37612A42F8EE44DD7A823FB5C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560802000
+    addr_51 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80]
+        + Op.SHA3
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xEC8B92806C1AD0F2DCF5B0207DB7EDDB464DF0CA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060802000
+    addr_52 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SHA3(offset=0x80, size=0x80)
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x11FFE11BB835B6CE89FC91D65B1F6C0919B07A1D),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001553100
+    addr_53 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.BALANCE + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xec8b92806c1ad0f2dcf5b0207db7eddb464df0ca"),  # noqa: E501
+        address=Address(0x943B918E625B3ECB5D186D820A60C8EEBD1C71EC),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.STATICCALL
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560803100
+    addr_54 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.BALANCE(address=0x80)
+        + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xee8790666225df6f97ae194e20853f2907bbaebc"),  # noqa: E501
+        address=Address(0x58A413DDE8DDD92C793FCA0B18CE89BD3DFBA0E8),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.BYTE(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x60016001553500
+    addr_55 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.CALLDATALOAD + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xC24790535CFEA9781D66D59B81D9B92A576BB9EF),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560803500
+    addr_56 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.CALLDATALOAD(offset=0x80)
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x488A9B0F0E885B96F67C113F0979799F801D70D3),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060803700
+    addr_57 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 2
+        + Op.CALLDATACOPY
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x59F8C0328E432DF7467313742E1EFFC9EE2BAC4E),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060803700
+    addr_58 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.CALLDATACOPY(dest_offset=0x80, offset=0x80, size=0x80)
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xBC57A2F2490132B8F8980CD242F7DC76B4B3F1C3),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060803900
+    addr_59 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 2
+        + Op.CODECOPY
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x50A33DA19F003AEC73BC65754E12A7F94C9B1C34),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060803900
+    addr_60 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.CODECOPY(dest_offset=0x80, offset=0x80, size=0x80)
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x866777EADDC2BE0A50B3D3F76F2064876EA42802),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001553B00
+    addr_61 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.EXTCODESIZE + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x664F23C7AF786DC61B6A068B3F9BDE0051716384),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560803B00
+    addr_62 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.EXTCODESIZE(address=0x80)
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x75A2A8AFA2446EC88A716EF7074351ACCFACCADF),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060803C00
+    addr_63 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 3
+        + Op.EXTCODECOPY
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x93D0507F681BA7DE662D14AE8DE922D161698C8E),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060803C00
+    addr_64 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.EXTCODECOPY(
+            address=0x80, dest_offset=0x80, offset=0x80, size=0x80
+        )
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xBF337119D0B966CC500CD3FF5AB9F3C7FDDAA91D),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001553F00
+    addr_65 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.EXTCODEHASH + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xf04fe60ad6f92fa14a53a0882943a66ea4e49ef1"),  # noqa: E501
+        address=Address(0x7142D01ED8802179659127719398FA679AC41292),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.CREATE2(value=0x80, offset=0x80, size=0x80, salt=0x80)
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560803F00
+    addr_66 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.EXTCODEHASH(address=0x80)
+        + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xf1cfc656c8d8e2bcfdfea0e0e9cabcc0b743dd19"),  # noqa: E501
+        address=Address(0xA3D5AECBF6541CD2A0DF5AE2E1294ABC682180E6),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP13
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x60016001554000
+    addr_67 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.BLOCKHASH + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xf2578fadcdd5cd7b55f7046c88a7a77e195a7b17"),  # noqa: E501
+        address=Address(0x6F72794F9C9D8A693FF6C1134D611D353678FCF0),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.CALL
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560804000
+    addr_68 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.BLOCKHASH(block_number=0x80)
+        + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xf465862e7bf5085fb692e16d3181afaba87550cc"),  # noqa: E501
+        address=Address(0xB8479583829F24D888A0493A9132845B3D6A5305),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP14
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x60016001555000
+    addr_69 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.POP + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xf84f405591be4ab47ca2ca1841dcb57cc43f076f"),  # noqa: E501
+        address=Address(0x5F750BAD38B37C4EBCC5FEE4EED5639283A09A38),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.PUSH1[0x80] + Op.GT + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560805000
+    addr_70 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.POP(0x80) + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xf9a965915f18a6108b842a40148dc5fd47ec7140"),  # noqa: E501
+        address=Address(0x14ED6C71EBCCDF69007D79FE699D368102533929),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.LOG0(offset=0x80, size=0x80)
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x60016001555100
+    addr_71 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.MLOAD + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xfb5dbfcd64b16ab0129b99278b9d5ccfb9b605b9"),  # noqa: E501
+        address=Address(0x92BFB1AA73E92C1F591D8B6854514DF6672BBB90),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.PUSH1[0x80]
-            + Op.DUP8
-            + Op.STOP
-        ),
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560805100
+    addr_72 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.MLOAD(offset=0x80) + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xB2E76A6FDFC66A93A2354748EC2D107A818FE73C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560805200
+    addr_73 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80]
+        + Op.MSTORE
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xEC26E590A6F5DA137088AEE0C4D6B0F8870EB1AD),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060805200
+    addr_74 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MSTORE(offset=0x80, value=0x80)
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xAC95D1D1C86AF90F5A0CF44C104D0DA04AB3A467),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560805300
+    addr_75 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80]
+        + Op.MSTORE8
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xA1903DB9AA9AA2665CA7DA383DB9291D93F1D576),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060805300
+    addr_76 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MSTORE8(offset=0x80, value=0x80)
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x891E304C4126F24BF762DF079C7683420B16FF57),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001555400
+    addr_77 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.SLOAD + Op.STOP,
+        storage={1: 24743},
         nonce=0,
-        address=Address("0xfbc09ac707fcca4ae8e348f01457ea18825bd139"),  # noqa: E501
+        address=Address(0x7AEDAF23D4E9AFB84BAA67824CEBFEC01339AFC1),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.SUB(0x80, 0x80) + Op.STOP,
-        storage={0x1: 0x60A7},
+    # Source: raw
+    # 0x600160015560805400
+    addr_78 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.SLOAD(key=0x80) + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x5096DB6B2EA6ACE8E2AEB3610FAAAD183A51CA8D),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080A000
+    addr_79 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80]
+        + Op.LOG0
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x17F25A871EA2EA564CFFE99D31DEDCF1FCFF0A63),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080A000
+    addr_80 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.LOG0(offset=0x80, size=0x80)
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xFB5DBFCD64B16AB0129B99278B9D5CCFB9B605B9),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080A100
+    addr_81 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 2
+        + Op.LOG1
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xC70E97B872035F925B07DB55B85A3EAC04E724D6),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080A100
+    addr_82 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.LOG1(offset=0x80, size=0x80, topic_1=0x80)
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xD051AFB76160844EB32DF55E052044DE76250EBC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080A200
+    addr_83 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 3
+        + Op.LOG2
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xDAC05B6FC9DC9C0B65ECC5032F2313F7A7DD2586),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080A200
+    addr_84 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.LOG2(offset=0x80, size=0x80, topic_1=0x80, topic_2=0x80)
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x3FD249E0BE1D7BF6386B7DC90D92BF95F9F98BC4),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080A300
+    addr_85 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 4
+        + Op.LOG3
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xA7EEC8574DBFC883575F2B20A80F14F335A809B6),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080A300
+    addr_86 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.LOG3(
+            offset=0x80, size=0x80, topic_1=0x80, topic_2=0x80, topic_3=0x80
+        )
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x22D7D32459B46A9B69542C31545CB3A0D887064C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080A400
+    addr_87 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 5
+        + Op.LOG4
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x715F213243CD7BAEEFD3A52434353015A4FC8DE2),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080A400
+    addr_88 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.LOG4(
+            offset=0x80,
+            size=0x80,
+            topic_1=0x80,
+            topic_2=0x80,
+            topic_3=0x80,
+            topic_4=0x80,
+        )
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x79D8AEDD70F8A99A15E3083D3335A028D69AF9FA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080F000
+    addr_89 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 2
+        + Op.CREATE
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x16A80F6C0BBED421A0D6B392E891A52FCA715213),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080F000
+    addr_90 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.CREATE(value=0x80, offset=0x80, size=0x80)
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x9BD8E7C30198BD73A39E51D6866B72026272773E),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080F100
+    addr_91 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 6
+        + Op.CALL
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xF465862E7BF5085FB692E16D3181AFABA87550CC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060806080F100
+    addr_92 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.CALL(
+            gas=0x80,
+            address=0x80,
+            value=0x80,
+            args_offset=0x80,
+            args_size=0x80,
+            ret_offset=0x80,
+            ret_size=0x80,
+        )
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x8CE099E0D9E5E5153E578F7CBFA9FD071B714142),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080F200
+    addr_93 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 6
+        + Op.CALLCODE
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x8E3AB300E3D93AC55727C65510FF8BD96EA76928),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060806080F200
+    addr_94 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.CALLCODE(
+            gas=0x80,
+            address=0x80,
+            value=0x80,
+            args_offset=0x80,
+            args_size=0x80,
+            ret_offset=0x80,
+            ret_size=0x80,
+        )
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xAF6EAD2E1A296B787D4B084D30B0733518FD2462),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080F300
+    addr_95 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80]
+        + Op.RETURN
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x84798B4FB35D09DB14ECAB9D65A4A280E483FE29),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080F300
+    addr_96 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.RETURN(offset=0x80, size=0x80)
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x7D002CACBE954F4360FE634FBE23F5B67C686CBF),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080F400
+    addr_97 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 5
+        + Op.DELEGATECALL
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x799721E570BCD85BE50C0D7A399AF369BE561FBE),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080F400
+    addr_98 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.DELEGATECALL(
+            gas=0x80,
+            address=0x80,
+            args_offset=0x80,
+            args_size=0x80,
+            ret_offset=0x80,
+            ret_size=0x80,
+        )
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x9386C3CCE8CAB9F8C3BC1A89C82A0E55588CED9D),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080F500
+    addr_99 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 3
+        + Op.CREATE2
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x933CB75E0E03A16AA3D3E7114D269A6FE4DB46F9),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080F500
+    addr_100 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.CREATE2(value=0x80, offset=0x80, size=0x80, salt=0x80)
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xF1CFC656C8D8E2BCFDFEA0E0E9CABCC0B743DD19),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080FA00
+    addr_101 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 5
+        + Op.STATICCALL
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xEE8790666225DF6F97AE194E20853F2907BBAEBC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080FA00
+    addr_102 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.STATICCALL(
+            gas=0x80,
+            address=0x80,
+            args_offset=0x80,
+            args_size=0x80,
+            ret_offset=0x80,
+            ret_size=0x80,
+        )
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x45952ED2C957691AE4DE05032B429A8A0F0CED5B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001558000
+    addr_103 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.DUP1 + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x8CEB89E3037B7AC8B58E3765EA3EB65F1A9E4A7C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560808000
+    addr_104 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80]
+        + Op.DUP1
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x5782C86BE10D218C82D509F3257E9DFDBF6DEAD8),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560808100
+    addr_105 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80]
+        + Op.DUP2
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xE6D703C31F83BC617A62F78E3C3A615001D3DD2C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060808100
+    addr_106 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 2
+        + Op.DUP2
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x113855E9AA747F6AE6FD74667D7A288B2288CAF6),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060808200
+    addr_107 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 2
+        + Op.DUP3
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x2C2938555E004CBB0CE4481BAD8A15857D983D06),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060808200
+    addr_108 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 3
+        + Op.DUP3
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x63E21AD1535B95AAEED05E893B5B7947D6B0F15A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060808300
+    addr_109 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 3
+        + Op.DUP4
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x5BCE589F39F0EFF323BCBEAC539DC9FD0F429BD2),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060808300
+    addr_110 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 4
+        + Op.DUP4
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x8030A1EB20B388143F12FB547B5E53A4C164A621),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060808400
+    addr_111 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 4
+        + Op.DUP5
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x5BB0E367BEC7D734CB0FC9C27EB85AF479B39673),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060808400
+    addr_112 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 5
+        + Op.DUP5
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xE594A68387D42D18BB8E460CEF74876F05985E3A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060808500
+    addr_113 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 5
+        + Op.DUP6
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x9A90A463D916B189EEE17B331F27A54142B79961),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060808500
+    addr_114 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 6
+        + Op.DUP6
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x029D8125096A81237BE857845270AB34AFAB88AC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060808600
+    addr_115 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 6
+        + Op.DUP7
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x0D423FA4896ACA0A02CBA41462E754C3241427F0),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080608060808600
+    addr_116 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 7
+        + Op.DUP7
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xCA098DEB4AB81002CDDBD3C93261D6D1CB5113B5),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080608060808700
+    addr_117 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 7
+        + Op.DUP8
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xFBC09AC707FCCA4AE8E348F01457EA18825BD139),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080608060808700
+    addr_118 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 8
+        + Op.DUP8
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x662D9872215DDE44EC296918A0FD96C45C97B332),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080608060808800
+    addr_119 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 8
+        + Op.DUP9
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xAEEC863F85B9A222AC1FFFF774A881D46EC3AD37),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060806080608060808800
+    addr_120 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 9
+        + Op.DUP9
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x5D4FA1456FBF03872B922DC0E8E48EC49F5FAF9E),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060806080608060808900
+    addr_121 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 9
+        + Op.DUP10
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x4DA0082F56C3CAE860EB6FB0FE36BC17CFBA2C27),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080608060806080608060808900
+    addr_122 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 10
+        + Op.DUP10
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x444A2203A30517F4A8BECCA90192B193A7B6ECF3),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080608060806080608060808a00
+    addr_123 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 10
+        + Op.DUP11
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xD5765C6E58B373DF78D7311FE80A67DE0DDF987E),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080608060806080608060808a00
+    addr_124 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 11
+        + Op.DUP11
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x742BF896D715C00EB77F340FCAA65BACAEE2467C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080608060806080608060808b00
+    addr_125 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 11
+        + Op.DUP12
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xC698050F674750BBCAFA30C433633DEE22B8A9D3),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060806080608060806080608060808b00
+    addr_126 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 12
+        + Op.DUP12
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x6CE1B9FEDCA232F6829F0831ED2C23BD9C2F99A2),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060806080608060806080608060808c00
+    addr_127 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 12
+        + Op.DUP13
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x91605658E9533E831C9F855874FAA14C363DC795),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080608060806080608060806080608060808c00
+    addr_128 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 13
+        + Op.DUP13
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xF2578FADCDD5CD7B55F7046C88A7A77E195A7B17),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080608060806080608060806080608060808d00
+    addr_129 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 13
+        + Op.DUP14
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x34FB465A898787F7ED08BC2F5DE86A896F8BC4DA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080608060806080608060806080608060808d00
+    addr_130 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 14
+        + Op.DUP14
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xF84F405591BE4AB47CA2CA1841DCB57CC43F076F),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080608060806080608060806080608060808e00
+    addr_131 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 14
+        + Op.DUP15
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x2CD79F853EC648B7C3EC3FAC7C7CE82D7D83EA1E),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060806080608060806080608060806080608060808e00  # noqa: E501
+    addr_132 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 15
+        + Op.DUP15
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x0CD1B3E02E0BC556B0C7D4779C69A9A383C0C7CD),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060806080608060806080608060806080608060808f00  # noqa: E501
+    addr_133 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 15
+        + Op.DUP16
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x175DE68007E136237A4F26B6983DBCE27A87FB5B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080608060806080608060806080608060806080608060808f00  # noqa: E501
+    addr_134 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 16
+        + Op.DUP16
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x9C8FC002A1DCD0EDCF93C20DC9D674031DC5A28D),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560809000
+    addr_135 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80]
+        + Op.SWAP1
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x8B62B65DB3BD1BE727290B490C679C0E84585498),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060809000
+    addr_136 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 2
+        + Op.SWAP1
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x6C6BC4F9CCDE5DA559A3E5DDDB6B60A8675C0076),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060809100
+    addr_137 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 2
+        + Op.SWAP2
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xE98C1AB0FF23D5C5005C639781D1A635B9AF887B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060809100
+    addr_138 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 3
+        + Op.SWAP2
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xACDA51EB0D678A0D52BFA44E4354D8F371F43438),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060809200
+    addr_139 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 3
+        + Op.SWAP3
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x9768A9BB367830F3331B0C09D7183C131E44A7FC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060809200
+    addr_140 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 4
+        + Op.SWAP3
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xD6BB0EA7C7F60C967D3DEEEAABA555DAAFBC52CB),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060809300
+    addr_141 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 4
+        + Op.SWAP4
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x19598106D1CEDE298B275523E64593C95D5C431C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060809300
+    addr_142 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 5
+        + Op.SWAP4
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xB44C7350F24BB5482057B53911A1D3C91C263EAF),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060809400
+    addr_143 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 5
+        + Op.SWAP5
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x0D0E14670E6E8718377BC2FAE6B6814D558D3DEE),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060809400
+    addr_144 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 6
+        + Op.SWAP5
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xA15FE2669809DDC6640E94572907A53411B2AA6E),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060809500
+    addr_145 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 6
+        + Op.SWAP6
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xD435F13E92F7DB306B9B32E1D61DB6ECD9C135BD),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080608060809500
+    addr_146 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 7
+        + Op.SWAP6
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xC3FCE336558080EF8B1A20A209B173E6D163E548),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080608060809600
+    addr_147 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 7
+        + Op.SWAP7
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x620D85C5ACC41CBFA47A763BBB9E326054B1819D),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080608060809600
+    addr_148 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 8
+        + Op.SWAP7
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x9B9D04770C429114574C11780FC9658D3257E80B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080608060809700
+    addr_149 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 8
+        + Op.SWAP8
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x44C420A5B1A9071EB7FF6F1027C167C002C7F355),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060806080608060809700
+    addr_150 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 9
+        + Op.SWAP8
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xDCB6A7C9B64471EFFDD8BBF72D32D271DEEEC8C5),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060806080608060809800
+    addr_151 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 9
+        + Op.SWAP9
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x3AD6053AF54D703F7E7229BD5BF120C908C8513D),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080608060806080608060809800
+    addr_152 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 10
+        + Op.SWAP9
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xD9292DE838CD8839D91B496D8A9D25AC102CD821),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080608060806080608060809900
+    addr_153 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 10
+        + Op.SWAP10
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x2AC63027195DA2EE9CE4CC1DFF225CA97D3C2F0C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080608060806080608060809900
+    addr_154 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 11
+        + Op.SWAP10
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x723A69480F074F5DF2544CACF63347FB5F0F36D1),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080608060806080608060809a00
+    addr_155 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 11
+        + Op.SWAP11
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x73F7599A216D98D9FF1559788A9771D78895A6A3),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060806080608060806080608060809a00
+    addr_156 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 12
+        + Op.SWAP11
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x4289634EBF793179377FAA7140610BB80DB21B45),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060806080608060806080608060809b00
+    addr_157 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 12
+        + Op.SWAP12
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x66A62A0AF37886B9B057A1BAD714665525E7687F),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080608060806080608060806080608060809b00
+    addr_158 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 13
+        + Op.SWAP12
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x1BB096578FE2F1BE79E03EA88551A8BDD0692BEA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080608060806080608060806080608060809c00
+    addr_159 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 13
+        + Op.SWAP13
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x745A759F45602915EAB7BDC87BC8D1C1675D4E29),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080608060806080608060806080608060809c00
+    addr_160 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 14
+        + Op.SWAP13
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xBF99AD09FC2F72924CBE6DA6020F985E65F78901),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080608060806080608060806080608060809d00
+    addr_161 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 14
+        + Op.SWAP14
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x727FD27941DBE4D8F1E2E9DAA0DF70288FD73772),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060806080608060806080608060806080608060809d00  # noqa: E501
+    addr_162 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 15
+        + Op.SWAP14
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x1EB3790937F47FE31A45F55BD82F50107E7A463A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016001556080608060806080608060806080608060806080608060806080608060809e00  # noqa: E501
+    addr_163 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 15
+        + Op.SWAP15
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0xCD63F547EE166A3FEB23A945F488CCC5EE921EEF),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080608060806080608060806080608060806080608060809e00  # noqa: E501
+    addr_164 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 16
+        + Op.SWAP15
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x8FD69485A26470A721F6DD7E685DA39EE2A3DC1C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160015560806080608060806080608060806080608060806080608060806080608060809f00  # noqa: E501
+    addr_165 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 16
+        + Op.SWAP16
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x6F631AE51EAD55C8526AFF13665FE5DD055E3561),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600155608060806080608060806080608060806080608060806080608060806080608060809f00  # noqa: E501
+    addr_166 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x80] * 17
+        + Op.SWAP16
+        + Op.STOP,
+        storage={1: 24743},
+        nonce=0,
+        address=Address(0x1DEBD2AFBA875DB8938CE64218B40FB210E1DE0A),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] 0x60A7
+    #     (call (gas) $4 0 0 0 0 0)
+    #     [[1]] 0x60A7
+    # }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x60A7)
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x4),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x1, value=0x60A7)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xfcc0a7ebcab4f6d8c91c9062f2cd1148073253d2"),  # noqa: E501
+        address=Address(0x4C5F839D523E76FC3837E085A3E1538CD36E288A),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_2: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_3: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_4: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_5: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_6: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_7: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_8: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [8], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_9: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [9], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_10: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [10], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_11: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [11], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_12: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [12], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_13: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [13], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_14: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [14], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_15: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [15], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_16: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [16], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_17: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [17], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_18: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [18], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_19: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [19], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_20: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [20], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_21: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [21], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_22: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [22], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_23: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [23], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_24: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [24], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_25: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [25], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_26: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [26], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_27: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [27], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_28: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [28], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_29: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [29], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_30: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [30], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_31: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [31], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_32: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [32], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_33: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [33], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_34: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [34], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_35: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [35], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_36: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [36], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_37: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [37], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_38: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [38], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_39: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [39], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_40: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [40], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_41: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [41], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_42: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [42], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_43: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [43], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_44: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [44], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_45: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [45], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_46: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [46], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_47: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [47], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_48: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [48], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_49: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [49], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_50: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [50], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_51: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [51], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_52: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [52], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_53: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [53], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_54: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [54], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_55: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [55], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_56: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [56], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_57: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [57], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_58: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [58], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_59: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [59], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_60: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [60], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_61: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [61], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_62: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [62], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_63: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [63], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_64: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [64], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_65: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [65], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_66: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [66], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_67: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [67], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_68: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [68], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_69: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [69], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_70: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [70], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_71: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [71], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_72: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [72], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_73: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [73], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_74: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [74], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_75: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [75], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_76: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [76], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_77: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [77], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_78: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [78], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_79: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [79], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_80: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [80], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_81: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [81], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_82: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [82], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_83: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [83], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_84: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [84], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_85: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [85], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_86: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [86], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_87: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [87], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_88: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [88], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_89: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [89], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_90: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [90], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_91: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [91], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_92: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [92], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_93: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [93], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_94: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [94], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_95: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [95], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_96: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [96], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_97: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [97], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_98: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [98], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_99: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [99], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_100: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [100], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_101: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [101], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_102: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [102], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_103: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [103], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_104: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [104], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_105: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [105], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_106: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [106], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_107: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [107], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_108: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [108], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_109: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [109], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_110: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [110], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_111: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [111], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_112: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [112], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_113: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [113], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_114: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [114], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_115: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [115], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_116: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [116], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_117: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [117], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_118: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [118], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_119: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [119], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_120: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [120], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_121: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [121], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_122: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [122], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_123: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [123], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_124: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [124], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_125: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [125], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_126: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [126], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_127: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [127], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_128: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [128], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_129: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [129], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_130: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [130], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_131: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [131], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_132: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [132], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_133: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [133], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_134: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [134], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_135: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [135], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_136: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [136], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_137: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [137], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_138: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [138], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_139: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [139], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_140: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [140], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_141: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [141], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_142: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [142], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_143: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [143], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_144: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [144], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_145: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [145], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_146: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [146], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_147: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [147], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_148: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [148], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_149: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [149], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_150: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [150], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_151: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [151], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_152: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [152], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_153: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [153], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_154: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [154], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_155: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [155], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_156: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [156], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_157: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [157], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_158: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [158], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_159: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [159], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_160: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [160], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_161: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [161], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_162: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [162], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_163: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [163], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_164: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [164], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_165: Account(storage={1: 24743}),
+            },
+        },
+        {
+            "indexes": {"data": [165], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 24743, 1: 24743}),
+                addr_166: Account(storage={1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(addr, left_padding=True),
+        Bytes("693c6139") + Hash(addr_2, left_padding=True),
+        Bytes("693c6139") + Hash(addr_3, left_padding=True),
+        Bytes("693c6139") + Hash(addr_4, left_padding=True),
+        Bytes("693c6139") + Hash(addr_5, left_padding=True),
+        Bytes("693c6139") + Hash(addr_6, left_padding=True),
+        Bytes("693c6139") + Hash(addr_7, left_padding=True),
+        Bytes("693c6139") + Hash(addr_8, left_padding=True),
+        Bytes("693c6139") + Hash(addr_9, left_padding=True),
+        Bytes("693c6139") + Hash(addr_10, left_padding=True),
+        Bytes("693c6139") + Hash(addr_11, left_padding=True),
+        Bytes("693c6139") + Hash(addr_12, left_padding=True),
+        Bytes("693c6139") + Hash(addr_13, left_padding=True),
+        Bytes("693c6139") + Hash(addr_14, left_padding=True),
+        Bytes("693c6139") + Hash(addr_15, left_padding=True),
+        Bytes("693c6139") + Hash(addr_16, left_padding=True),
+        Bytes("693c6139") + Hash(addr_17, left_padding=True),
+        Bytes("693c6139") + Hash(addr_18, left_padding=True),
+        Bytes("693c6139") + Hash(addr_19, left_padding=True),
+        Bytes("693c6139") + Hash(addr_20, left_padding=True),
+        Bytes("693c6139") + Hash(addr_21, left_padding=True),
+        Bytes("693c6139") + Hash(addr_22, left_padding=True),
+        Bytes("693c6139") + Hash(addr_23, left_padding=True),
+        Bytes("693c6139") + Hash(addr_24, left_padding=True),
+        Bytes("693c6139") + Hash(addr_25, left_padding=True),
+        Bytes("693c6139") + Hash(addr_26, left_padding=True),
+        Bytes("693c6139") + Hash(addr_27, left_padding=True),
+        Bytes("693c6139") + Hash(addr_28, left_padding=True),
+        Bytes("693c6139") + Hash(addr_29, left_padding=True),
+        Bytes("693c6139") + Hash(addr_30, left_padding=True),
+        Bytes("693c6139") + Hash(addr_31, left_padding=True),
+        Bytes("693c6139") + Hash(addr_32, left_padding=True),
+        Bytes("693c6139") + Hash(addr_33, left_padding=True),
+        Bytes("693c6139") + Hash(addr_34, left_padding=True),
+        Bytes("693c6139") + Hash(addr_35, left_padding=True),
+        Bytes("693c6139") + Hash(addr_36, left_padding=True),
+        Bytes("693c6139") + Hash(addr_37, left_padding=True),
+        Bytes("693c6139") + Hash(addr_38, left_padding=True),
+        Bytes("693c6139") + Hash(addr_39, left_padding=True),
+        Bytes("693c6139") + Hash(addr_40, left_padding=True),
+        Bytes("693c6139") + Hash(addr_41, left_padding=True),
+        Bytes("693c6139") + Hash(addr_42, left_padding=True),
+        Bytes("693c6139") + Hash(addr_43, left_padding=True),
+        Bytes("693c6139") + Hash(addr_44, left_padding=True),
+        Bytes("693c6139") + Hash(addr_45, left_padding=True),
+        Bytes("693c6139") + Hash(addr_46, left_padding=True),
+        Bytes("693c6139") + Hash(addr_47, left_padding=True),
+        Bytes("693c6139") + Hash(addr_48, left_padding=True),
+        Bytes("693c6139") + Hash(addr_49, left_padding=True),
+        Bytes("693c6139") + Hash(addr_50, left_padding=True),
+        Bytes("693c6139") + Hash(addr_51, left_padding=True),
+        Bytes("693c6139") + Hash(addr_52, left_padding=True),
+        Bytes("693c6139") + Hash(addr_53, left_padding=True),
+        Bytes("693c6139") + Hash(addr_54, left_padding=True),
+        Bytes("693c6139") + Hash(addr_55, left_padding=True),
+        Bytes("693c6139") + Hash(addr_56, left_padding=True),
+        Bytes("693c6139") + Hash(addr_57, left_padding=True),
+        Bytes("693c6139") + Hash(addr_58, left_padding=True),
+        Bytes("693c6139") + Hash(addr_59, left_padding=True),
+        Bytes("693c6139") + Hash(addr_60, left_padding=True),
+        Bytes("693c6139") + Hash(addr_61, left_padding=True),
+        Bytes("693c6139") + Hash(addr_62, left_padding=True),
+        Bytes("693c6139") + Hash(addr_63, left_padding=True),
+        Bytes("693c6139") + Hash(addr_64, left_padding=True),
+        Bytes("693c6139") + Hash(addr_65, left_padding=True),
+        Bytes("693c6139") + Hash(addr_66, left_padding=True),
+        Bytes("693c6139") + Hash(addr_67, left_padding=True),
+        Bytes("693c6139") + Hash(addr_68, left_padding=True),
+        Bytes("693c6139") + Hash(addr_69, left_padding=True),
+        Bytes("693c6139") + Hash(addr_70, left_padding=True),
+        Bytes("693c6139") + Hash(addr_71, left_padding=True),
+        Bytes("693c6139") + Hash(addr_72, left_padding=True),
+        Bytes("693c6139") + Hash(addr_73, left_padding=True),
+        Bytes("693c6139") + Hash(addr_74, left_padding=True),
+        Bytes("693c6139") + Hash(addr_75, left_padding=True),
+        Bytes("693c6139") + Hash(addr_76, left_padding=True),
+        Bytes("693c6139") + Hash(addr_77, left_padding=True),
+        Bytes("693c6139") + Hash(addr_78, left_padding=True),
+        Bytes("693c6139") + Hash(addr_79, left_padding=True),
+        Bytes("693c6139") + Hash(addr_80, left_padding=True),
+        Bytes("693c6139") + Hash(addr_81, left_padding=True),
+        Bytes("693c6139") + Hash(addr_82, left_padding=True),
+        Bytes("693c6139") + Hash(addr_83, left_padding=True),
+        Bytes("693c6139") + Hash(addr_84, left_padding=True),
+        Bytes("693c6139") + Hash(addr_85, left_padding=True),
+        Bytes("693c6139") + Hash(addr_86, left_padding=True),
+        Bytes("693c6139") + Hash(addr_87, left_padding=True),
+        Bytes("693c6139") + Hash(addr_88, left_padding=True),
+        Bytes("693c6139") + Hash(addr_89, left_padding=True),
+        Bytes("693c6139") + Hash(addr_90, left_padding=True),
+        Bytes("693c6139") + Hash(addr_91, left_padding=True),
+        Bytes("693c6139") + Hash(addr_92, left_padding=True),
+        Bytes("693c6139") + Hash(addr_93, left_padding=True),
+        Bytes("693c6139") + Hash(addr_94, left_padding=True),
+        Bytes("693c6139") + Hash(addr_95, left_padding=True),
+        Bytes("693c6139") + Hash(addr_96, left_padding=True),
+        Bytes("693c6139") + Hash(addr_97, left_padding=True),
+        Bytes("693c6139") + Hash(addr_98, left_padding=True),
+        Bytes("693c6139") + Hash(addr_99, left_padding=True),
+        Bytes("693c6139") + Hash(addr_100, left_padding=True),
+        Bytes("693c6139") + Hash(addr_101, left_padding=True),
+        Bytes("693c6139") + Hash(addr_102, left_padding=True),
+        Bytes("693c6139") + Hash(addr_103, left_padding=True),
+        Bytes("693c6139") + Hash(addr_104, left_padding=True),
+        Bytes("693c6139") + Hash(addr_105, left_padding=True),
+        Bytes("693c6139") + Hash(addr_106, left_padding=True),
+        Bytes("693c6139") + Hash(addr_107, left_padding=True),
+        Bytes("693c6139") + Hash(addr_108, left_padding=True),
+        Bytes("693c6139") + Hash(addr_109, left_padding=True),
+        Bytes("693c6139") + Hash(addr_110, left_padding=True),
+        Bytes("693c6139") + Hash(addr_111, left_padding=True),
+        Bytes("693c6139") + Hash(addr_112, left_padding=True),
+        Bytes("693c6139") + Hash(addr_113, left_padding=True),
+        Bytes("693c6139") + Hash(addr_114, left_padding=True),
+        Bytes("693c6139") + Hash(addr_115, left_padding=True),
+        Bytes("693c6139") + Hash(addr_116, left_padding=True),
+        Bytes("693c6139") + Hash(addr_117, left_padding=True),
+        Bytes("693c6139") + Hash(addr_118, left_padding=True),
+        Bytes("693c6139") + Hash(addr_119, left_padding=True),
+        Bytes("693c6139") + Hash(addr_120, left_padding=True),
+        Bytes("693c6139") + Hash(addr_121, left_padding=True),
+        Bytes("693c6139") + Hash(addr_122, left_padding=True),
+        Bytes("693c6139") + Hash(addr_123, left_padding=True),
+        Bytes("693c6139") + Hash(addr_124, left_padding=True),
+        Bytes("693c6139") + Hash(addr_125, left_padding=True),
+        Bytes("693c6139") + Hash(addr_126, left_padding=True),
+        Bytes("693c6139") + Hash(addr_127, left_padding=True),
+        Bytes("693c6139") + Hash(addr_128, left_padding=True),
+        Bytes("693c6139") + Hash(addr_129, left_padding=True),
+        Bytes("693c6139") + Hash(addr_130, left_padding=True),
+        Bytes("693c6139") + Hash(addr_131, left_padding=True),
+        Bytes("693c6139") + Hash(addr_132, left_padding=True),
+        Bytes("693c6139") + Hash(addr_133, left_padding=True),
+        Bytes("693c6139") + Hash(addr_134, left_padding=True),
+        Bytes("693c6139") + Hash(addr_135, left_padding=True),
+        Bytes("693c6139") + Hash(addr_136, left_padding=True),
+        Bytes("693c6139") + Hash(addr_137, left_padding=True),
+        Bytes("693c6139") + Hash(addr_138, left_padding=True),
+        Bytes("693c6139") + Hash(addr_139, left_padding=True),
+        Bytes("693c6139") + Hash(addr_140, left_padding=True),
+        Bytes("693c6139") + Hash(addr_141, left_padding=True),
+        Bytes("693c6139") + Hash(addr_142, left_padding=True),
+        Bytes("693c6139") + Hash(addr_143, left_padding=True),
+        Bytes("693c6139") + Hash(addr_144, left_padding=True),
+        Bytes("693c6139") + Hash(addr_145, left_padding=True),
+        Bytes("693c6139") + Hash(addr_146, left_padding=True),
+        Bytes("693c6139") + Hash(addr_147, left_padding=True),
+        Bytes("693c6139") + Hash(addr_148, left_padding=True),
+        Bytes("693c6139") + Hash(addr_149, left_padding=True),
+        Bytes("693c6139") + Hash(addr_150, left_padding=True),
+        Bytes("693c6139") + Hash(addr_151, left_padding=True),
+        Bytes("693c6139") + Hash(addr_152, left_padding=True),
+        Bytes("693c6139") + Hash(addr_153, left_padding=True),
+        Bytes("693c6139") + Hash(addr_154, left_padding=True),
+        Bytes("693c6139") + Hash(addr_155, left_padding=True),
+        Bytes("693c6139") + Hash(addr_156, left_padding=True),
+        Bytes("693c6139") + Hash(addr_157, left_padding=True),
+        Bytes("693c6139") + Hash(addr_158, left_padding=True),
+        Bytes("693c6139") + Hash(addr_159, left_padding=True),
+        Bytes("693c6139") + Hash(addr_160, left_padding=True),
+        Bytes("693c6139") + Hash(addr_161, left_padding=True),
+        Bytes("693c6139") + Hash(addr_162, left_padding=True),
+        Bytes("693c6139") + Hash(addr_163, left_padding=True),
+        Bytes("693c6139") + Hash(addr_164, left_padding=True),
+        Bytes("693c6139") + Hash(addr_165, left_padding=True),
+        Bytes("693c6139") + Hash(addr_166, left_padding=True),
+    ]
+    tx_gas = [8000000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=8000000,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/__init__.py b/tests/ported_static/stStaticCall/__init__.py
index abc4be341db..b2c50ed8d54 100644
--- a/tests/ported_static/stStaticCall/__init__.py
+++ b/tests/ported_static/stStaticCall/__init__.py
@@ -1 +1 @@
-"""Tests ported from stStaticCall."""
+"""Ported static tests: stStaticCall."""  # noqa: N999
diff --git a/tests/ported_static/stStaticCall/test_static_ab_acalls0.py b/tests/ported_static/stStaticCall/test_static_ab_acalls0.py
index a46417ba8ee..ca1b6965436 100644
--- a/tests/ported_static/stStaticCall/test_static_ab_acalls0.py
+++ b/tests/ported_static/stStaticCall/test_static_ab_acalls0.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_ab_acalls0.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_ABAcalls0Filler.json
+state_tests/stStaticCall/static_ABAcalls0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,44 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_ABAcalls0Filler.json"],
+    ["state_tests/stStaticCall/static_ABAcalls0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000c54c4be163add3cc0efe5268a599a308dab12c74",
-            {
-                Address("0xfddb268f64fd5a90f618bbee0bd38e0c24b0a945"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000007a365d98665a08e6ed6c1638c8ea6775fa649048",
-            {
-                Address("0xfddb268f64fd5a90f618bbee0bd38e0c24b0a945"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_ab_acalls0(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_ab_acalls0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -70,116 +69,140 @@ def test_static_ab_acalls0(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=Op.PC)
-            + Op.STATICCALL(
-                gas=0xC350,
-                address=0x7A365D98665A08E6ED6C1638C8EA6775FA649048,
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=23,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x718a83e869d6f4dea50a650b9825cbfe683bdf16"),  # noqa: E501
+        address=Address(0xFDDB268F64FD5A90F618BBEE0BD38E0C24B0A945),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=Op.PC)
-            + Op.STATICCALL(
+    # Source: lll
+    # {  [[ (PC) ]] (STATICCALL 100000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=Op.PC,
+            value=Op.STATICCALL(
                 gas=0x186A0,
-                address=0x718A83E869D6F4DEA50A650B9825CBFE683BDF16,
+                address=0x9A95017E0DBF52BB87DDFDA883B69D6188D574CA,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7a365d98665a08e6ed6c1638c8ea6775fa649048"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=Op.PC,
-                value=Op.ADD(
-                    0x1,
-                    Op.STATICCALL(
-                        gas=0xC350,
-                        address=0xC54C4BE163ADD3CC0EFE5268A599A308DAB12C74,
-                        args_offset=0x0,
-                        args_size=0x0,
-                        ret_offset=0x0,
-                        ret_size=0x0,
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=23,
-        nonce=0,
-        address=Address("0x9a95017e0dbf52bb87ddfda883b69d6188d574ca"),  # noqa: E501
+        address=Address(0xC54C4BE163ADD3CC0EFE5268A599A308DAB12C74),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=Op.PC,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x9A95017E0DBF52BB87DDFDA883B69D6188D574CA,
+    # Source: lll
+    # { [[ (PC) ]] (ADD 1 (STATICCALL 50000 <contract:0x095e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=Op.PC,
+            value=Op.ADD(
+                0x1,
+                Op.STATICCALL(
+                    gas=0xC350,
+                    address=0xC54C4BE163ADD3CC0EFE5268A599A308DAB12C74,
                     args_offset=0x0,
                     args_size=0x0,
                     ret_offset=0x0,
                     ret_size=0x0,
                 ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+            ),
+        )
+        + Op.STOP,
+        balance=23,
         nonce=0,
-        address=Address("0xc54c4be163add3cc0efe5268a599a308dab12c74"),  # noqa: E501
+        address=Address(0x9A95017E0DBF52BB87DDFDA883B69D6188D574CA),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 1 (PC)) (STATICCALL 100000 <contract:0x245304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=Op.PC)
+        + Op.STATICCALL(
+            gas=0x186A0,
+            address=0x718A83E869D6F4DEA50A650B9825CBFE683BDF16,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfddb268f64fd5a90f618bbee0bd38e0c24b0a945"),  # noqa: E501
+        address=Address(0x7A365D98665A08E6ED6C1638C8EA6775FA649048),  # noqa: E501
     )
+    # Source: lll
+    # { (MSTORE 1 (PC)) (STATICCALL 50000 <contract:0x195e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=Op.PC)
+        + Op.STATICCALL(
+            gas=0xC350,
+            address=0x7A365D98665A08E6ED6C1638C8EA6775FA649048,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=23,
+        nonce=0,
+        address=Address(0x718A83E869D6F4DEA50A650B9825CBFE683BDF16),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr: Account(storage={36: 0}, balance=0xDE0B6B3A76586A0),
+                addr_2: Account(storage={38: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_3: Account(storage={36: 0}, balance=0xDE0B6B3A76586A0),
+                addr_4: Account(storage={38: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [1000000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1000000,
-        value=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_ab_acalls1.py b/tests/ported_static/stStaticCall/test_static_ab_acalls1.py
index fe972dc73cd..7f4ceb8d318 100644
--- a/tests/ported_static/stStaticCall/test_static_ab_acalls1.py
+++ b/tests/ported_static/stStaticCall/test_static_ab_acalls1.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_ab_acalls1.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_ABAcalls1Filler.json
+state_tests/stStaticCall/static_ABAcalls1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,45 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_ABAcalls1Filler.json"],
+    ["state_tests/stStaticCall/static_ABAcalls1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000d0a73d84aa7112e8d5179cae211b268d16dafd73",
-            {
-                Address("0xe7fe01f115e85f0487086659fa9bbf09579b0e3a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000c1eb8f73f2e1e269acd146c961210b665078841b",
-            {
-                Address("0xe7fe01f115e85f0487086659fa9bbf09579b0e3a"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_ab_acalls1(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_ab_acalls1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -71,121 +70,145 @@ def test_static_ab_acalls1(
         gas_limit=10000000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=Op.PC,
-                value=Op.ADD(
-                    0x1,
-                    Op.STATICCALL(
-                        gas=Op.SUB(Op.GAS, 0x186A0),
-                        address=0xC1EB8F73F2E1E269ACD146C961210B665078841B,
-                        args_offset=0x0,
-                        args_size=0x0,
-                        ret_offset=0x0,
-                        ret_size=0x0,
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=23,
+    # Source: lll
+    # { [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) 0 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x5e75046384134a4554c3c7061d4637cb978d5699"),  # noqa: E501
+        address=Address(0xE7FE01F115E85F0487086659FA9BBF09579B0E3A),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=Op.PC)
-            + Op.STATICCALL(
+    # Source: lll
+    # {  [[ (PC) ]] (STATICCALL (- (GAS) 100000) <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=Op.PC,
+            value=Op.STATICCALL(
                 gas=Op.SUB(Op.GAS, 0x186A0),
-                address=0x5E75046384134A4554C3C7061D4637CB978D5699,
+                address=0xCC7901B70DCEC81D198AC6CF196EF14BCA9870BE,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc1eb8f73f2e1e269acd146c961210b665078841b"),  # noqa: E501
+        address=Address(0xD0A73D84AA7112E8D5179CAE211B268D16DAFD73),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=Op.PC,
-                value=Op.ADD(
-                    0x1,
-                    Op.STATICCALL(
-                        gas=Op.SUB(Op.GAS, 0x186A0),
-                        address=0xD0A73D84AA7112E8D5179CAE211B268D16DAFD73,
-                        args_offset=0x0,
-                        args_size=0x0,
-                        ret_offset=0x0,
-                        ret_size=0x0,
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=23,
-        nonce=0,
-        address=Address("0xcc7901b70dcec81d198ac6cf196ef14bca9870be"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=Op.PC,
-                value=Op.STATICCALL(
+    # Source: lll
+    # { [[ (PC) ]] (ADD 1 (STATICCALL (- (GAS) 100000) <contract:0x095e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=Op.PC,
+            value=Op.ADD(
+                0x1,
+                Op.STATICCALL(
                     gas=Op.SUB(Op.GAS, 0x186A0),
-                    address=0xCC7901B70DCEC81D198AC6CF196EF14BCA9870BE,
+                    address=0xD0A73D84AA7112E8D5179CAE211B268D16DAFD73,
                     args_offset=0x0,
                     args_size=0x0,
                     ret_offset=0x0,
                     ret_size=0x0,
                 ),
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
+        balance=23,
+        nonce=0,
+        address=Address(0xCC7901B70DCEC81D198AC6CF196EF14BCA9870BE),  # noqa: E501
+    )
+    # Source: lll
+    # {  (MSTORE 1 (PC)) (STATICCALL (- (GAS) 100000) <contract:0x245304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=Op.PC)
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0x186A0),
+            address=0x5E75046384134A4554C3C7061D4637CB978D5699,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd0a73d84aa7112e8d5179cae211b268d16dafd73"),  # noqa: E501
+        address=Address(0xC1EB8F73F2E1E269ACD146C961210B665078841B),  # noqa: E501
     )
-    # Source: LLL
-    # { [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) 0 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=0x0,
+    # Source: lll
+    # { (MSTORE (PC) (ADD 1 (STATICCALL (- (GAS) 100000) <contract:0x195e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0)) ) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=Op.PC,
+            value=Op.ADD(
+                0x1,
+                Op.STATICCALL(
+                    gas=Op.SUB(Op.GAS, 0x186A0),
+                    address=0xC1EB8F73F2E1E269ACD146C961210B665078841B,
                     args_offset=0x0,
                     args_size=0x0,
                     ret_offset=0x0,
                     ret_size=0x0,
                 ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+            ),
+        )
+        + Op.STOP,
+        balance=23,
         nonce=0,
-        address=Address("0xe7fe01f115e85f0487086659fa9bbf09579b0e3a"),  # noqa: E501
+        address=Address(0x5E75046384134A4554C3C7061D4637CB978D5699),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                target: Account(storage={0: 1, 1: 1}),
+                addr: Account(storage={38: 0}),
+                addr_2: Account(storage={41: 0}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                target: Account(storage={0: 1, 1: 1}),
+                addr: Account(storage={38: 0}),
+                addr_2: Account(storage={41: 0}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [1000000000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1000000000,
-        value=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_ab_acalls2.py b/tests/ported_static/stStaticCall/test_static_ab_acalls2.py
index df4b1e19eb1..df9f37353a3 100644
--- a/tests/ported_static/stStaticCall/test_static_ab_acalls2.py
+++ b/tests/ported_static/stStaticCall/test_static_ab_acalls2.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_ab_acalls2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_ABAcalls2Filler.json
+state_tests/stStaticCall/static_ABAcalls2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,48 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_ABAcalls2Filler.json"],
+    ["state_tests/stStaticCall/static_ABAcalls2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000cee890df61958e0d40fbbfc310af80b8c47d0dfe",
-            {
-                Address("0x2b0de1d059b61d3afbdbc6d7d59720fe04c1fff2"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xcee890df61958e0d40fbbfc310af80b8c47d0dfe"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000db486d3e181181d2063032b1250c07ca0185a446",
-            {
-                Address("0x2b0de1d059b61d3afbdbc6d7d59720fe04c1fff2"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_ab_acalls2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_ab_acalls2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -74,106 +70,130 @@ def test_static_ab_acalls2(
         gas_limit=10000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2b0de1d059b61d3afbdbc6d7d59720fe04c1fff2"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
-            + Op.STATICCALL(
-                gas=Op.SUB(Op.GAS, 0x186A0),
-                address=0xDB486D3E181181D2063032B1250C07CA0185A446,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x57efc7a25d8e40b0798fb4cbc2bcc3c124141cbb"),  # noqa: E501
+        address=Address(0x2B0DE1D059B61D3AFBDBC6D7D59720FE04C1FFF2),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.STATICCALL(
-                gas=Op.SUB(Op.GAS, 0x186A0),
-                address=0xE278F8058BEF1396C2B1DF4D1DC4B65233133C57,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (ADD (SLOAD 0) 1) (STATICCALL (- (GAS) 100000) <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0x186A0),
+            address=0xE278F8058BEF1396C2B1DF4D1DC4B65233133C57,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xcee890df61958e0d40fbbfc310af80b8c47d0dfe"),  # noqa: E501
+        address=Address(0xCEE890DF61958E0D40FBBFC310AF80B8C47D0DFE),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
-            + Op.STATICCALL(
-                gas=Op.SUB(Op.GAS, 0x186A0),
-                address=0x57EFC7A25D8E40B0798FB4CBC2BCC3C124141CBB,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (ADD (SLOAD 0) 1) (STATICCALL (- (GAS) 100000) <contract:0x095e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0x186A0),
+            address=0xCEE890DF61958E0D40FBBFC310AF80B8C47D0DFE,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xE278F8058BEF1396C2B1DF4D1DC4B65233133C57),  # noqa: E501
+    )
+    # Source: lll
+    # {  ( MSTORE 0 (ADD (MLOAD 0) 1)) (STATICCALL (- (GAS) 100000) <contract:0x245304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0x186A0),
+            address=0x57EFC7A25D8E40B0798FB4CBC2BCC3C124141CBB,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdb486d3e181181d2063032b1250c07ca0185a446"),  # noqa: E501
+        address=Address(0xDB486D3E181181D2063032B1250C07CA0185A446),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.STATICCALL(
-                gas=Op.SUB(Op.GAS, 0x186A0),
-                address=0xCEE890DF61958E0D40FBBFC310AF80B8C47D0DFE,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { ( MSTORE 0 (ADD (MLOAD 0) 1)) (STATICCALL (- (GAS) 100000) <contract:0x195e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0x186A0),
+            address=0xDB486D3E181181D2063032B1250C07CA0185A446,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe278f8058bef1396c2b1df4d1dc4b65233133c57"),  # noqa: E501
+        address=Address(0x57EFC7A25D8E40B0798FB4CBC2BCC3C124141CBB),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                target: Account(storage={0: 1, 1: 1}),
+                addr: Account(storage={0: 1}),
+                addr_2: Account(storage={0: 0}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                target: Account(storage={0: 1, 1: 1}),
+                addr: Account(storage={0: 0}),
+                addr_2: Account(storage={0: 0}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [1000000000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1000000000,
-        value=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_ab_acalls3.py b/tests/ported_static/stStaticCall/test_static_ab_acalls3.py
index 37b6011b569..7e32882c2b8 100644
--- a/tests/ported_static/stStaticCall/test_static_ab_acalls3.py
+++ b/tests/ported_static/stStaticCall/test_static_ab_acalls3.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_ab_acalls3.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_ABAcalls3Filler.json
+state_tests/stStaticCall/static_ABAcalls3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,47 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_ABAcalls3Filler.json"],
+    ["state_tests/stStaticCall/static_ABAcalls3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000407da20797d4e89c2f4e48c502385c1514d9fa52",
-            {
-                Address("0x407da20797d4e89c2f4e48c502385c1514d9fa52"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000e40c059876e334b99a5d199693978c39bedb690d",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_ab_acalls3(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_ab_acalls3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,106 +69,130 @@ def test_static_ab_acalls3(
         gas_limit=1000000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.STATICCALL(
-                gas=Op.SUB(Op.GAS, 0x186A0),
-                address=0xE40C059876E334B99A5D199693978C39BEDB690D,
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0b1f7380db647f1d85565b28978ba83861b99965"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.STATICCALL(
-                gas=Op.SUB(Op.GAS, 0x186A0),
-                address=0xE278F8058BEF1396C2B1DF4D1DC4B65233133C57,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (ADD (SLOAD 0) 1) (STATICCALL (- (GAS) 100000) <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0x186A0),
+            address=0xE278F8058BEF1396C2B1DF4D1DC4B65233133C57,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xFA3E8,
         nonce=0,
-        address=Address("0x407da20797d4e89c2f4e48c502385c1514d9fa52"),  # noqa: E501
+        address=Address(0x407DA20797D4E89C2F4E48C502385C1514D9FA52),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (ADD (SLOAD 0) 1) (STATICCALL (- (GAS) 100000) <contract:0x095e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0x186A0),
+            address=0x407DA20797D4E89C2F4E48C502385C1514D9FA52,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0xE278F8058BEF1396C2B1DF4D1DC4B65233133C57),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.STATICCALL(
-                gas=Op.SUB(Op.GAS, 0x186A0),
-                address=0x407DA20797D4E89C2F4E48C502385C1514D9FA52,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 (ADD (SLOAD 0) 1)) (STATICCALL (- (GAS) 100000) <contract:0x245304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0x186A0),
+            address=0xB1F7380DB647F1D85565B28978BA83861B99965,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xFA3E8,
         nonce=0,
-        address=Address("0xe278f8058bef1396c2b1df4d1dc4b65233133c57"),  # noqa: E501
+        address=Address(0xE40C059876E334B99A5D199693978C39BEDB690D),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.STATICCALL(
-                gas=Op.SUB(Op.GAS, 0x186A0),
-                address=0xB1F7380DB647F1D85565B28978BA83861B99965,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xFA3E8,
+    # Source: lll
+    # { (MSTORE 0 (ADD (SLOAD 0) 1)) (STATICCALL (- (GAS) 100000) <contract:0x195e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0x186A0),
+            address=0xE40C059876E334B99A5D199693978C39BEDB690D,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe40c059876e334b99a5d199693978c39bedb690d"),  # noqa: E501
+        address=Address(0x0B1F7380DB647F1D85565B28978BA83861B99965),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 1, 1: 1}),
+                addr: Account(storage={0: 1}),
+                addr_2: Account(storage={0: 0}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 1, 1: 1}),
+                addr_3: Account(storage={0: 0}),
+                addr_4: Account(storage={0: 0}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [10000000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=10000000,
-        value=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_ab_acalls_suicide0.py b/tests/ported_static/stStaticCall/test_static_ab_acalls_suicide0.py
index 0b6fc07f179..94fcf44f866 100644
--- a/tests/ported_static/stStaticCall/test_static_ab_acalls_suicide0.py
+++ b/tests/ported_static/stStaticCall/test_static_ab_acalls_suicide0.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_ab_acalls_suicide0.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_ABAcallsSuicide0Filler.json
+state_tests/stStaticCall/static_ABAcallsSuicide0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,46 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_ABAcallsSuicide0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_ABAcallsSuicide0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000195198c66c5e31767d41365ff8003c5fe4387110",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "00000000000000000000000015631f76b02193e5716cbd4b4d696f2f7a39f0a4",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_ab_acalls_suicide0(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_ab_acalls_suicide0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -72,128 +69,146 @@ def test_static_ab_acalls_suicide0(
         gas_limit=100000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=Op.PC,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x644AC2B24A9316ED4C55001E5EDA02D77F729C7B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xC20B4779ED25A1CCF1848F1CBCC84433FCB9D083
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ (PC) ]] (STATICCALL 100000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0) (SELFDESTRUCT <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>)  }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=Op.PC,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=0xC20B4779ED25A1CCF1848F1CBCC84433FCB9D083,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0xC20B4779ED25A1CCF1848F1CBCC84433FCB9D083)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x15631f76b02193e5716cbd4b4d696f2f7a39f0a4"),  # noqa: E501
+        address=Address(0x195198C66C5E31767D41365FF8003C5FE4387110),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=Op.PC,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0xC20B4779ED25A1CCF1848F1CBCC84433FCB9D083,
+    # Source: lll
+    # { [[ (PC) ]] (ADD 1 (STATICCALL 50000 <contract:0x095e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=Op.PC,
+            value=Op.ADD(
+                0x1,
+                Op.STATICCALL(
+                    gas=0xC350,
+                    address=0x195198C66C5E31767D41365FF8003C5FE4387110,
                     args_offset=0x0,
                     args_size=0x0,
                     ret_offset=0x0,
                     ret_size=0x0,
                 ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xC20B4779ED25A1CCF1848F1CBCC84433FCB9D083
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+            ),
+        )
+        + Op.STOP,
+        balance=23,
         nonce=0,
-        address=Address("0x195198c66c5e31767d41365ff8003c5fe4387110"),  # noqa: E501
+        address=Address(0xC20B4779ED25A1CCF1848F1CBCC84433FCB9D083),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=Op.PC,
-                value=Op.ADD(
-                    0x1,
-                    Op.STATICCALL(
-                        gas=0xC350,
-                        address=0x15631F76B02193E5716CBD4B4D696F2F7A39F0A4,
-                        args_offset=0x0,
-                        args_size=0x0,
-                        ret_offset=0x0,
-                        ret_size=0x0,
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=23,
+    # Source: lll
+    # {  (MSTORE (PC)  (STATICCALL 100000 <contract:0x245304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0)) (SELFDESTRUCT <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>)  }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=Op.PC,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=0x644AC2B24A9316ED4C55001E5EDA02D77F729C7B,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0xC20B4779ED25A1CCF1848F1CBCC84433FCB9D083)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x644ac2b24a9316ed4c55001e5eda02d77f729c7b"),  # noqa: E501
+        address=Address(0x15631F76B02193E5716CBD4B4D696F2F7A39F0A4),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
+    # Source: lll
+    # { (MSTORE (PC) (ADD 1 (STATICCALL 50000 <contract:0x195e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0)) ) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=Op.PC,
+            value=Op.ADD(
+                0x1,
+                Op.STATICCALL(
+                    gas=0xC350,
+                    address=0x15631F76B02193E5716CBD4B4D696F2F7A39F0A4,
                     args_offset=0x0,
                     args_size=0x0,
                     ret_offset=0x0,
                     ret_size=0x0,
                 ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=Op.PC,
-                value=Op.ADD(
-                    0x1,
-                    Op.STATICCALL(
-                        gas=0xC350,
-                        address=0x195198C66C5E31767D41365FF8003C5FE4387110,
-                        args_offset=0x0,
-                        args_size=0x0,
-                        ret_offset=0x0,
-                        ret_size=0x0,
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0xc20b4779ed25a1ccf1848f1cbcc84433fcb9d083"),  # noqa: E501
+        address=Address(0x644AC2B24A9316ED4C55001E5EDA02D77F729C7B),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_2: Account(storage={38: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 1, 1: 1}),
+                addr_2: Account(storage={38: 0}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [10000000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=10000000,
-        value=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_ab_acalls_suicide1.py b/tests/ported_static/stStaticCall/test_static_ab_acalls_suicide1.py
index bee9494637b..5119b012e3e 100644
--- a/tests/ported_static/stStaticCall/test_static_ab_acalls_suicide1.py
+++ b/tests/ported_static/stStaticCall/test_static_ab_acalls_suicide1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_ab_acalls_suicide1.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_ABAcallsSuicide1Filler.json
+state_tests/stStaticCall/static_ABAcallsSuicide1Filler.json
 """
 
 import pytest
@@ -12,9 +12,11 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,35 +24,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_ABAcallsSuicide1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_ABAcallsSuicide1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "00000000000000000000000000000000000000000000000000000000000186a0",
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000486a0",
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_ab_acalls_suicide1(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_ab_acalls_suicide1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    contract_1 = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -64,61 +71,67 @@ def test_static_ab_acalls_suicide1(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # {  (MSTORE 0 (CALLDATALOAD 0)) (STATICCALL (CALLDATALOAD 0) 0x945304eb96065b2a98b57a48a06ae28d285a71b5 0 32 0 0)   }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.STATICCALL(
-                gas=Op.CALLDATALOAD(offset=0x0),
-                address=0x945304EB96065B2A98B57A48A06AE28D285A71B5,
-                args_offset=0x0,
-                args_size=0x20,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.STATICCALL(
+            gas=Op.CALLDATALOAD(offset=0x0),
+            address=0x945304EB96065B2A98B57A48A06AE28D285A71B5,
+            args_offset=0x0,
+            args_size=0x20,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  (MSTORE 0 (CALLDATALOAD 0))  (STATICCALL (SUB (CALLDATALOAD 0) 50000) 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 0 32 0 0) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.SUB(Op.CALLDATALOAD(offset=0x0), 0xC350),
-                    address=0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xF572E5295C57F15886F9B263E2F6D2D6C7B5EC6
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.SUB(Op.CALLDATALOAD(offset=0x0), 0xC350),
+                address=0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=0xF572E5295C57F15886F9B263E2F6D2D6C7B5EC6)
+        + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(0x186A0),
+        Hash(0x486A0),
+    ]
+    tx_gas = [10000000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=10000000,
-        value=100000,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        contract_0: Account(storage={}),
+        Address(
+            0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6
+        ): Account.NONEXISTENT,
+        contract_1: Account(storage={}, balance=23),
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call10.py b/tests/ported_static/stStaticCall/test_static_call10.py
index 4d1ee19e18a..36c2f6bf4e0 100644
--- a/tests/ported_static/stStaticCall/test_static_call10.py
+++ b/tests/ported_static/stStaticCall/test_static_call10.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call10.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_Call10Filler.json
+state_tests/stStaticCall/static_Call10Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,48 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_Call10Filler.json"],
+    ["state_tests/stStaticCall/static_Call10Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000ba3d56e16f62d1c74689f260f80faeb7181fcf8f",
-            {
-                Address("0xba3d56e16f62d1c74689f260f80faeb7181fcf8f"): Account(
-                    storage={0: 1, 1: 10}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000689ef931c00f3b00de5dd2cf0e06f5409b0f26a4",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call10(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee_2 = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    """Test_static_call10."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -74,97 +69,117 @@ def test_static_call10(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x40,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xA)),
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.STATICCALL(
-                    gas=0xFFFFFFFFFFF,
-                    address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x20, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
-        balance=1000,
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x689ef931c00f3b00de5dd2cf0e06f5409b0f26a4"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x40,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xA)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xFFFFFFFFFFF,
-                    address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 10) [i](+ @i 1) [[ 0 ]](STATICCALL 0xfffffffffff <eoa:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 50000 0 0) ) [[ 1 ]] @i}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x40, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xA))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xFFFFFFFFFFF,
+                address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0xba3d56e16f62d1c74689f260f80faeb7181fcf8f"),  # noqa: E501
+        address=Address(0xBA3D56E16F62D1C74689F260F80FAEB7181FCF8F),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 10) [i](+ @i 1) (MSTORE 0 (STATICCALL 0xfffffffffff <eoa:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 50000 0 0)) ) (MSTORE 32 @i)}  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x40, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xA))
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.STATICCALL(
+                gas=0xFFFFFFFFFFF,
+                address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x20, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
+        balance=1000,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0x689EF931C00F3B00DE5DD2CF0E06F5409B0F26A4),  # noqa: E501
     )
-    pre[callee_2] = Account(balance=7000, nonce=0)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_2: Account(storage={0: 1, 1: 10}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_2: Account(storage={0: 0, 1: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [200000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=200000,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call1024_balance_too_low.py b/tests/ported_static/stStaticCall/test_static_call1024_balance_too_low.py
index 4c32b4a8b3d..c35d515be61 100644
--- a/tests/ported_static/stStaticCall/test_static_call1024_balance_too_low.py
+++ b/tests/ported_static/stStaticCall/test_static_call1024_balance_too_low.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call1024_balance_too_low.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_Call1024BalanceTooLowFiller.json
+state_tests/stStaticCall/static_Call1024BalanceTooLowFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,51 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_Call1024BalanceTooLowFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_Call1024BalanceTooLowFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000d395a2cb1cb7ef1b90e2edb71fc0a390ecc84fe8",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xd395a2cb1cb7ef1b90e2edb71fc0a390ecc84fe8"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000e8f28ee50521b0388cf0a623b1a89e43d022c039",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call1024_balance_too_low(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee_1 = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    """Test_static_call1024_balance_too_low."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -77,81 +70,103 @@ def test_static_call1024_balance_too_low(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
     # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0xFFFFFFFFFFF,
-                    address=0xD395A2CB1CB7EF1B90E2EDB71FC0A390ECC84FE8,
-                    args_offset=Op.SLOAD(key=0x0),
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (ADD @@0 1) [[ 1 ]] (STATICCALL 0xfffffffffff <contract:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> @@0 0 0 0) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0xFFFFFFFFFFF,
+                address=0xD395A2CB1CB7EF1B90E2EDB71FC0A390ECC84FE8,
+                args_offset=Op.SLOAD(key=0x0),
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0xd395a2cb1cb7ef1b90e2edb71fc0a390ecc84fe8"),  # noqa: E501
+        address=Address(0xD395A2CB1CB7EF1B90E2EDB71FC0A390ECC84FE8),  # noqa: E501
     )
-    pre[callee_1] = Account(balance=7000, nonce=0)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
-            + Op.MSTORE(
-                offset=0x20,
-                value=Op.STATICCALL(
-                    gas=0xFFFFFFFFFFF,
-                    address=0xE8F28EE50521B0388CF0A623B1A89E43D022C039,
-                    args_offset=Op.MLOAD(offset=0x0),
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 (ADD (MLOAD 0) 1)) (MSTORE 32 (STATICCALL 0xfffffffffff <contract:0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b> (MLOAD 0) 0 0 0)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
+        + Op.MSTORE(
+            offset=0x20,
+            value=Op.STATICCALL(
+                gas=0xFFFFFFFFFFF,
+                address=0xE8F28EE50521B0388CF0A623B1A89E43D022C039,
+                args_offset=Op.MLOAD(offset=0x0),
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0xe8f28ee50521b0388cf0a623b1a89e43d022c039"),  # noqa: E501
+        address=Address(0xE8F28EE50521B0388CF0A623B1A89E43D022C039),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                addr_2: Account(storage={0: 1, 1: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                addr_3: Account(storage={0: 0, 1: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [17592186099592]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=17592186099592,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call1024_balance_too_low2.py b/tests/ported_static/stStaticCall/test_static_call1024_balance_too_low2.py
index 5b1ae4bacb6..6b2a4856aee 100644
--- a/tests/ported_static/stStaticCall/test_static_call1024_balance_too_low2.py
+++ b/tests/ported_static/stStaticCall/test_static_call1024_balance_too_low2.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call1024_balance_too_low2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_Call1024BalanceTooLow2Filler.json
+state_tests/stStaticCall/static_Call1024BalanceTooLow2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,51 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_Call1024BalanceTooLow2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_Call1024BalanceTooLow2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000d395a2cb1cb7ef1b90e2edb71fc0a390ecc84fe8",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xd395a2cb1cb7ef1b90e2edb71fc0a390ecc84fe8"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000e8f28ee50521b0388cf0a623b1a89e43d022c039",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call1024_balance_too_low2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee_1 = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    """Test_static_call1024_balance_too_low2."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -77,81 +70,103 @@ def test_static_call1024_balance_too_low2(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
     # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0xFFFFFFFFFFF,
-                    address=0xD395A2CB1CB7EF1B90E2EDB71FC0A390ECC84FE8,
-                    args_offset=Op.SLOAD(key=0x0),
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (ADD @@0 1) [[ 1 ]] (STATICCALL 0xfffffffffff <contract:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> @@0 0 0 0) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0xFFFFFFFFFFF,
+                address=0xD395A2CB1CB7EF1B90E2EDB71FC0A390ECC84FE8,
+                args_offset=Op.SLOAD(key=0x0),
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0xd395a2cb1cb7ef1b90e2edb71fc0a390ecc84fe8"),  # noqa: E501
+        address=Address(0xD395A2CB1CB7EF1B90E2EDB71FC0A390ECC84FE8),  # noqa: E501
     )
-    pre[callee_1] = Account(balance=7000, nonce=0)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
-            + Op.MSTORE(
-                offset=0x20,
-                value=Op.STATICCALL(
-                    gas=0xFFFFFFFFFFF,
-                    address=0xE8F28EE50521B0388CF0A623B1A89E43D022C039,
-                    args_offset=Op.MLOAD(offset=0x0),
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 (ADD (MLOAD 0) 1)) (MSTORE 32 (STATICCALL 0xfffffffffff <contract:0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b> (MLOAD 0) 0 0 0)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
+        + Op.MSTORE(
+            offset=0x20,
+            value=Op.STATICCALL(
+                gas=0xFFFFFFFFFFF,
+                address=0xE8F28EE50521B0388CF0A623B1A89E43D022C039,
+                args_offset=Op.MLOAD(offset=0x0),
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0xe8f28ee50521b0388cf0a623b1a89e43d022c039"),  # noqa: E501
+        address=Address(0xE8F28EE50521B0388CF0A623B1A89E43D022C039),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                addr_2: Account(storage={0: 1, 1: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                addr_2: Account(storage={0: 0, 1: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [17592186099592]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=17592186099592,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call1024_oog.py b/tests/ported_static/stStaticCall/test_static_call1024_oog.py
index 3a2d9c0d466..bdb6507da01 100644
--- a/tests/ported_static/stStaticCall/test_static_call1024_oog.py
+++ b/tests/ported_static/stStaticCall/test_static_call1024_oog.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call1024_oog.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_Call1024OOGFiller.json
+state_tests/stStaticCall/static_Call1024OOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,48 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_Call1024OOGFiller.json"],
+    ["state_tests/stStaticCall/static_Call1024OOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000005eb006f1716196a0d072b390030a665386c48b9b",
-            {
-                Address("0x5eb006f1716196a0d072b390030a665386c48b9b"): Account(
-                    storage={0: 1, 2: 1001}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "00000000000000000000000042223ec7d9570a769becbe4beed7d885e01e6e37",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call1024_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee_2 = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    """Test_static_call1024_oog."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -74,94 +69,114 @@ def test_static_call1024_oog(
         gas_limit=9223372036854775807,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.MUL(
-                        Op.SUB(Op.GAS, 0x2710),
-                        Op.SUB(0x1, Op.DIV(Op.MLOAD(offset=0x0), 0x401)),
-                    ),
-                    address=0x42223EC7D9570A769BECBE4BEED7D885E01E6E37,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=Op.ADD(0x1, Op.MUL(Op.MLOAD(offset=0x0), 0x3E8)),
-            )
-            + Op.STOP
-        ),
-        balance=1024,
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x42223ec7d9570a769becbe4beed7d885e01e6e37"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=Op.MUL(
-                        Op.SUB(Op.GAS, 0x2710),
-                        Op.SUB(0x1, Op.DIV(Op.SLOAD(key=0x0), 0x401)),
-                    ),
-                    address=0x5EB006F1716196A0D072B390030A665386C48B9B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
+    # Source: lll
+    # { [[ 0 ]] (ADD @@0 1) [[ 1 ]] (STATICCALL (MUL (SUB (GAS) 10000) (SUB 1 (DIV @@0 1025))) <contract:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=Op.MUL(
+                    Op.SUB(Op.GAS, 0x2710),
+                    Op.SUB(0x1, Op.DIV(Op.SLOAD(key=0x0), 0x401)),
                 ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8)),
-            )
-            + Op.STOP
-        ),
+                address=0x5EB006F1716196A0D072B390030A665386C48B9B,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2, value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8))
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0x5eb006f1716196a0d072b390030a665386c48b9b"),  # noqa: E501
+        address=Address(0x5EB006F1716196A0D072B390030A665386C48B9B),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
+    # Source: lll
+    # { (MSTORE 0 (ADD (MLOAD 0) 1))  (STATICCALL (MUL (SUB (GAS) 10000) (SUB 1 (DIV (MLOAD 0) 1025))) <contract:0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) (MSTORE 32 (ADD 1(MUL (MLOAD 0) 1000))) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.MUL(
+                    Op.SUB(Op.GAS, 0x2710),
+                    Op.SUB(0x1, Op.DIV(Op.MLOAD(offset=0x0), 0x401)),
                 ),
+                address=0x42223EC7D9570A769BECBE4BEED7D885E01E6E37,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(
+            offset=0x20, value=Op.ADD(0x1, Op.MUL(Op.MLOAD(offset=0x0), 0x3E8))
+        )
+        + Op.STOP,
+        balance=1024,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0x42223EC7D9570A769BECBE4BEED7D885E01E6E37),  # noqa: E501
     )
-    pre[callee_2] = Account(balance=7000, nonce=0)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_2: Account(storage={0: 1, 1: 0, 2: 1001}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_2: Account(storage={0: 0, 1: 0, 2: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [15720826]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=15720826,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call1024_pre_calls.py b/tests/ported_static/stStaticCall/test_static_call1024_pre_calls.py
index 12350bb65fb..e0d260f263f 100644
--- a/tests/ported_static/stStaticCall/test_static_call1024_pre_calls.py
+++ b/tests/ported_static/stStaticCall/test_static_call1024_pre_calls.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call1024_pre_calls.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_Call1024PreCallsFiller.json
+state_tests/stStaticCall/static_Call1024PreCallsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,51 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_Call1024PreCallsFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_Call1024PreCallsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000002806e7553f3585d821f91d679a254abbf002f6f2",
-            {
-                Address("0x2806e7553f3585d821f91d679a254abbf002f6f2"): Account(
-                    storage={0: 1, 2: 1, 3: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000007c546b69d5bda111c03c8d7b51b41a8d55b843ca",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call1024_pre_calls(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xCC381C83857B17CA629268ED418E2915A0287B84EFE9CF2204C020302E83CDA0
-    )
-    callee_2 = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    """Test_static_call1024_pre_calls."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -77,120 +70,133 @@ def test_static_call1024_pre_calls(
         gas_limit=9223372036854775807,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0xFFFF,
-                    address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.STATICCALL(
-                    gas=0xFFFF,
-                    address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0xFFFFFFFFFFF,
-                    address=0x2806E7553F3585D821F91D679A254ABBF002F6F2,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=2024,
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2806e7553f3585d821f91d679a254abbf002f6f2"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xFFFF,
-                    address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xFFFF,
-                    address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
-            + Op.STATICCALL(
+    # Source: lll
+    # { [[ 2 ]] (STATICCALL 0xffff <eoa:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[ 3 ]] (STATICCALL 0xffff <eoa:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0)  [[ 0 ]] (ADD @@0 1) [[ 1 ]] (STATICCALL 0xfffffffffff <contract:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0xFFFF,
+                address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.STATICCALL(
+                gas=0xFFFF,
+                address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
                 gas=0xFFFFFFFFFFF,
-                address=0x7C546B69D5BDA111C03C8D7B51B41A8D55B843CA,
+                address=0x2806E7553F3585D821F91D679A254ABBF002F6F2,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
         balance=2024,
         nonce=0,
-        address=Address("0x7c546b69d5bda111c03c8d7b51b41a8d55b843ca"),  # noqa: E501
+        address=Address(0x2806E7553F3585D821F91D679A254ABBF002F6F2),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # { (STATICCALL 0xffff <eoa:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) (STATICCALL 0xffff <eoa:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0)  (MSTORE 0 (ADD (MLOAD 0) 1)) (STATICCALL 0xfffffffffff <contract:0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xFFFF,
+                address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        * 2
+        + Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
+        + Op.STATICCALL(
+            gas=0xFFFFFFFFFFF,
+            address=0x7C546B69D5BDA111C03C8D7B51B41A8D55B843CA,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=2024,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0x7C546B69D5BDA111C03C8D7B51B41A8D55B843CA),  # noqa: E501
     )
-    pre[callee_2] = Account(balance=7000, nonce=0)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                addr_2: Account(storage={0: 1, 1: 0, 2: 1, 3: 1}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                addr_3: Account(storage={0: 0, 1: 0, 2: 0, 3: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [9214364837600034817]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=9214364837600034817,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call1024_pre_calls2.py b/tests/ported_static/stStaticCall/test_static_call1024_pre_calls2.py
index 5a75d9dd048..8cf74830cb1 100644
--- a/tests/ported_static/stStaticCall/test_static_call1024_pre_calls2.py
+++ b/tests/ported_static/stStaticCall/test_static_call1024_pre_calls2.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call1024_pre_calls2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_Call1024PreCalls2Filler.json
+state_tests/stStaticCall/static_Call1024PreCalls2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,50 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_Call1024PreCalls2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_Call1024PreCalls2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000002455231c1be66d57981908f4ac3633dee2e242e0",
-            {
-                Address("0x2455231c1be66d57981908f4ac3633dee2e242e0"): Account(
-                    storage={0: 1024, 1: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000daf588778cbccf0d5636643dbc67b42246b52f4a",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call1024_pre_calls2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xCC381C83857B17CA629268ED418E2915A0287B84EFE9CF2204C020302E83CDA0
-    )
+    """Test_static_call1024_pre_calls2."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -76,125 +70,140 @@ def test_static_call1024_pre_calls2(
         gas_limit=9223372036854775807,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0xFFFF,
-                    address=0xEEB613E2A52609EE927BE8A5B80FF190F6B71A37,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.STATICCALL(
-                    gas=0xFFFF,
-                    address=0xEEB613E2A52609EE927BE8A5B80FF190F6B71A37,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xFFFFFFFFFFF,
-                    address=0x2455231C1BE66D57981908F4AC3633DEE2E242E0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=2024,
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2455231c1be66d57981908f4ac3633dee2e242e0"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 1)}
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x1) + Op.STOP,
+        balance=7000,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0xEEB613E2A52609EE927BE8A5B80FF190F6B71A37),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xFFFF,
-                    address=0xEEB613E2A52609EE927BE8A5B80FF190F6B71A37,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xFFFF,
-                    address=0xEEB613E2A52609EE927BE8A5B80FF190F6B71A37,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
-            + Op.DELEGATECALL(
+    # Source: lll
+    # { [[ 2 ]] (STATICCALL 0xffff <contract:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[ 3 ]] (STATICCALL 0xffff <contract:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0)  [[ 0 ]] (ADD @@0 1) [[ 1 ]] (DELEGATECALL 0xfffffffffff <contract:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0xFFFF,
+                address=0xEEB613E2A52609EE927BE8A5B80FF190F6B71A37,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.STATICCALL(
+                gas=0xFFFF,
+                address=0xEEB613E2A52609EE927BE8A5B80FF190F6B71A37,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
                 gas=0xFFFFFFFFFFF,
-                address=0xDAF588778CBCCF0D5636643DBC67B42246B52F4A,
+                address=0x2455231C1BE66D57981908F4AC3633DEE2E242E0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
         balance=2024,
         nonce=0,
-        address=Address("0xdaf588778cbccf0d5636643dbc67b42246b52f4a"),  # noqa: E501
+        address=Address(0x2455231C1BE66D57981908F4AC3633DEE2E242E0),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x0, value=0x1) + Op.STOP,
-        balance=7000,
+    # Source: lll
+    # { (STATICCALL 0xffff <contract:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) (STATICCALL 0xffff <contract:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0)  (MSTORE 0 (ADD (MLOAD 0) 1)) (DELEGATECALL 0xfffffffffff <contract:0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xFFFF,
+                address=0xEEB613E2A52609EE927BE8A5B80FF190F6B71A37,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        * 2
+        + Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
+        + Op.DELEGATECALL(
+            gas=0xFFFFFFFFFFF,
+            address=0xDAF588778CBCCF0D5636643DBC67B42246B52F4A,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=2024,
         nonce=0,
-        address=Address("0xeeb613e2a52609ee927be8a5b80ff190f6b71a37"),  # noqa: E501
+        address=Address(0xDAF588778CBCCF0D5636643DBC67B42246B52F4A),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                addr_2: Account(storage={0: 1024, 1: 1, 2: 0, 3: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                addr_2: Account(storage={0: 0, 1: 0, 2: 0, 3: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [9214364837600034817]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=9214364837600034817,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call1024_pre_calls3.py b/tests/ported_static/stStaticCall/test_static_call1024_pre_calls3.py
index 06ccba85792..6448a69f8f0 100644
--- a/tests/ported_static/stStaticCall/test_static_call1024_pre_calls3.py
+++ b/tests/ported_static/stStaticCall/test_static_call1024_pre_calls3.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call1024_pre_calls3.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_Call1024PreCalls3Filler.json
+state_tests/stStaticCall/static_Call1024PreCalls3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,51 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_Call1024PreCalls3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_Call1024PreCalls3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000002806e7553f3585d821f91d679a254abbf002f6f2",
-            {
-                Address("0x2806e7553f3585d821f91d679a254abbf002f6f2"): Account(
-                    storage={0: 1, 2: 1, 3: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000007c546b69d5bda111c03c8d7b51b41a8d55b843ca",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call1024_pre_calls3(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xCC381C83857B17CA629268ED418E2915A0287B84EFE9CF2204C020302E83CDA0
-    )
-    callee_2 = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    """Test_static_call1024_pre_calls3."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -77,120 +70,133 @@ def test_static_call1024_pre_calls3(
         gas_limit=9223372036854775807,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0xFFFF,
-                    address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.STATICCALL(
-                    gas=0xFFFF,
-                    address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0xFFFFFFFFFFF,
-                    address=0x2806E7553F3585D821F91D679A254ABBF002F6F2,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=2024,
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2806e7553f3585d821f91d679a254abbf002f6f2"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xFFFF,
-                    address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xFFFF,
-                    address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
-            + Op.STATICCALL(
+    # Source: lll
+    # { [[ 2 ]] (STATICCALL 0xffff <eoa:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[ 3 ]] (STATICCALL 0xffff <eoa:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0)  [[ 0 ]] (ADD @@0 1) [[ 1 ]] (STATICCALL 0xfffffffffff <contract:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0xFFFF,
+                address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.STATICCALL(
+                gas=0xFFFF,
+                address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
                 gas=0xFFFFFFFFFFF,
-                address=0x7C546B69D5BDA111C03C8D7B51B41A8D55B843CA,
+                address=0x2806E7553F3585D821F91D679A254ABBF002F6F2,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
         balance=2024,
         nonce=0,
-        address=Address("0x7c546b69d5bda111c03c8d7b51b41a8d55b843ca"),  # noqa: E501
+        address=Address(0x2806E7553F3585D821F91D679A254ABBF002F6F2),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # { (STATICCALL 0xffff <eoa:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) (STATICCALL 0xffff <eoa:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0)  (MSTORE 0 (ADD (MLOAD 0) 1)) (STATICCALL 0xfffffffffff <contract:0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xFFFF,
+                address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        * 2
+        + Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
+        + Op.STATICCALL(
+            gas=0xFFFFFFFFFFF,
+            address=0x7C546B69D5BDA111C03C8D7B51B41A8D55B843CA,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=2024,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0x7C546B69D5BDA111C03C8D7B51B41A8D55B843CA),  # noqa: E501
     )
-    pre[callee_2] = Account(balance=7000, nonce=0)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                addr_2: Account(storage={0: 1, 1: 0, 2: 1, 3: 1}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                addr_3: Account(storage={0: 0, 1: 0, 2: 0, 3: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [9214364837600034817]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=9214364837600034817,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call1_mb1024_calldepth.py b/tests/ported_static/stStaticCall/test_static_call1_mb1024_calldepth.py
index 3004fbc1dd9..09ad53cc867 100644
--- a/tests/ported_static/stStaticCall/test_static_call1_mb1024_calldepth.py
+++ b/tests/ported_static/stStaticCall/test_static_call1_mb1024_calldepth.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call1_mb1024_calldepth.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_Call1MB1024CalldepthFiller.json
+state_tests/stStaticCall/static_Call1MB1024CalldepthFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,51 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_Call1MB1024CalldepthFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_Call1MB1024CalldepthFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000a79ae640e38871970f579f62237dfe2705068825",
-            {
-                Address("0xa79ae640e38871970f579f62237dfe2705068825"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xb16dbbe237612935e6611c3f5fb7d80eb0046801"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000583aa587d7d852a5b8448cc4160537d9bd12c889",
-            {
-                Address("0xb16dbbe237612935e6611c3f5fb7d80eb0046801"): Account(
-                    storage={0: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call1_mb1024_calldepth(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0x2ab8257767339461506c0c67824cf17bc77b52ca")
+    """Test_static_call1_mb1024_calldepth."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -77,91 +70,113 @@ def test_static_call1_mb1024_calldepth(
         gas_limit=892500000000,
     )
 
-    pre[callee] = Account(balance=0xFFFFFFFFFFFFF, nonce=0)
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
-            + Op.JUMPI(pc=0x1B, condition=Op.LT(Op.MLOAD(offset=0x0), 0x400))
-            + Op.MSTORE(offset=0x40, value=0x1)
-            + Op.JUMP(pc=0x45)
-            + Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x20,
-                value=Op.STATICCALL(
-                    gas=Op.SUB(Op.GAS, 0xF55C8),
-                    address=0x583AA587D7D852A5B8448CC4160537D9BD12C889,
-                    args_offset=0x0,
-                    args_size=0xF4240,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    addr = pre.fund_eoa(amount=0xFFFFFFFFFFFFF)  # noqa: F841
+    # Source: lll
+    # { [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) 0 0 0 0 0)  }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0x583aa587d7d852a5b8448cc4160537d9bd12c889"),  # noqa: E501
+        address=Address(0xB16DBBE237612935E6611C3F5FB7D80EB0046801),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.JUMPI(pc=0x1B, condition=Op.LT(Op.SLOAD(key=0x0), 0x400))
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.JUMP(pc=0x45)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=Op.SUB(Op.GAS, 0xF55C8),
-                    address=0xA79AE640E38871970F579F62237DFE2705068825,
-                    args_offset=0x0,
-                    args_size=0xF4240,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) [[ 0 ]] (+ @@0 1) (if (LT @@0 1024) [[ 1 ]] (STATICCALL (- (GAS) 1005000) <contract:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 1000000 0 0) [[ 2 ]] 1 )  }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.JUMPI(pc=0x1B, condition=Op.LT(Op.SLOAD(key=0x0), 0x400))
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.JUMP(pc=0x45)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=Op.SUB(Op.GAS, 0xF55C8),
+                address=0xA79AE640E38871970F579F62237DFE2705068825,
+                args_offset=0x0,
+                args_size=0xF4240,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xa79ae640e38871970f579f62237dfe2705068825"),  # noqa: E501
+        address=Address(0xA79AE640E38871970F579F62237DFE2705068825),  # noqa: E501
     )
-    # Source: LLL
-    # { [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) 0 0 0 0 0)  }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (MSTORE 0 (+ (MLOAD 0) 1)) (if (LT (MLOAD 0) 1024) (MSTORE 32 (STATICCALL (- (GAS) 1005000) <contract:0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 1000000 0 0)) (MSTORE 64 1) )   }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
+        + Op.JUMPI(pc=0x1B, condition=Op.LT(Op.MLOAD(offset=0x0), 0x400))
+        + Op.MSTORE(offset=0x40, value=0x1)
+        + Op.JUMP(pc=0x45)
+        + Op.JUMPDEST
+        + Op.MSTORE(
+            offset=0x20,
+            value=Op.STATICCALL(
+                gas=Op.SUB(Op.GAS, 0xF55C8),
+                address=0x583AA587D7D852A5B8448CC4160537D9BD12C889,
+                args_offset=0x0,
+                args_size=0xF4240,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xb16dbbe237612935e6611c3f5fb7d80eb0046801"),  # noqa: E501
+        address=Address(0x583AA587D7D852A5B8448CC4160537D9BD12C889),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                target: Account(storage={0: 1}),
+                addr_2: Account(storage={0: 1, 1: 0}, nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                target: Account(storage={0: 1}),
+                addr_2: Account(storage={0: 0, 1: 0}, nonce=0),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [882500000000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=882500000000,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call50000.py b/tests/ported_static/stStaticCall/test_static_call50000.py
index 378c23cd6e2..00bf19407fd 100644
--- a/tests/ported_static/stStaticCall/test_static_call50000.py
+++ b/tests/ported_static/stStaticCall/test_static_call50000.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call50000.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_Call50000Filler.json
+state_tests/stStaticCall/static_Call50000Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,63 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_Call50000Filler.json"],
+    ["state_tests/stStaticCall/static_Call50000Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000002e396fd4f6f2799d61f534b43175f5344c65ecac",
-            {
-                Address("0x2e396fd4f6f2799d61f534b43175f5344c65ecac"): Account(
-                    storage={1: 50000}
-                ),
-                Address("0x6d440cd3e818056e21914c856e3712f4186b06c8"): Account(
-                    storage={0: 1}
-                ),
-                Address("0x7efd7e4e34d1783f5d86b7862a37b3bbbd13deb8"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000b00a8701f877b1152cd955e957fcbaf51a15f55f",
-            {
-                Address("0x6d440cd3e818056e21914c856e3712f4186b06c8"): Account(
-                    storage={0: 1}
-                ),
-                Address("0x7efd7e4e34d1783f5d86b7862a37b3bbbd13deb8"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xb00a8701f877b1152cd955e957fcbaf51a15f55f"): Account(
-                    storage={0: 1, 32: 50000}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call50000(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
+    """Test_static_call50000."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -89,110 +70,142 @@ def test_static_call50000(
         gas_limit=100000000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3E,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x7EFD7E4E34D1783F5D86B7862A37B3BBBD13DEB8,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
-        balance=0xFFFFFFFFFFFFF,
-        nonce=0,
-        address=Address("0x2e396fd4f6f2799d61f534b43175f5344c65ecac"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre.deploy_contract(
+    # Source: lll
+    # { (MSTORE 0 (SLOAD 0)) }
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x0, value=Op.SLOAD(key=0x0)) + Op.STOP,
-        storage={0x0: 0x1},
+        storage={0: 1},
         balance=7000,
         nonce=0,
-        address=Address("0x6d440cd3e818056e21914c856e3712f4186b06c8"),  # noqa: E501
+        address=Address(0x6D440CD3E818056E21914C856E3712F4186B06C8),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # { (SSTORE 0 (SLOAD 0)) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.SLOAD(key=0x0)) + Op.STOP,
-        storage={0x0: 0x1},
+        storage={0: 1},
         balance=7000,
         nonce=0,
-        address=Address("0x7efd7e4e34d1783f5d86b7862a37b3bbbd13deb8"),  # noqa: E501
+        address=Address(0x7EFD7E4E34D1783F5D86B7862A37B3BBBD13DEB8),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3E,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x6D440CD3E818056E21914C856E3712F4186B06C8,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x20, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
+    )
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (SSTORE 0 (STATICCALL 100000 <contract:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 50000 0 0)) ) (SSTORE 32 @i ) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3E, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=0x6D440CD3E818056E21914C856E3712F4186B06C8,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x20, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xb00a8701f877b1152cd955e957fcbaf51a15f55f"),  # noqa: E501
+        address=Address(0xB00A8701F877B1152CD955E957FCBAF51A15F55F),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (STATICCALL 100000 <contract:0xbaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 50000 0 0) ) [[ 1 ]] @i}  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3E, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=0x7EFD7E4E34D1783F5D86B7862A37B3BBBD13DEB8,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
+        balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0x2E396FD4F6F2799D61F534B43175F5344C65ECAC),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={0: 1}, nonce=0),
+                addr_3: Account(
+                    storage={0: 0, 1: 50000},
+                    balance=0x10000000000009,
+                    nonce=0,
+                ),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, nonce=1),
+                addr: Account(storage={0: 1}, balance=7000, nonce=0),
+                addr_4: Account(storage={0: 1, 32: 50000}, nonce=0),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [90000000000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=90000000000,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call50000_ecrec.py b/tests/ported_static/stStaticCall/test_static_call50000_ecrec.py
index b504e9dcab2..00a665359f4 100644
--- a/tests/ported_static/stStaticCall/test_static_call50000_ecrec.py
+++ b/tests/ported_static/stStaticCall/test_static_call50000_ecrec.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call50000_ecrec.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_Call50000_ecrecFiller.json
+state_tests/stStaticCall/static_Call50000_ecrecFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,50 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_Call50000_ecrecFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_Call50000_ecrecFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "00000000000000000000000088c698df82bba0a5bc4eded3c9abfcaa22adef92",
-            {
-                Address("0x88c698df82bba0a5bc4eded3c9abfcaa22adef92"): Account(
-                    storage={1: 50000}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000b5c3e48b7024dbbdbe53d636adcc0531cdc8da1a",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call50000_ecrec(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
+    """Test_static_call50000_ecrec."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -76,96 +70,118 @@ def test_static_call50000_ecrec(
         gas_limit=95000000,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2A,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x1F4,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x88c698df82bba0a5bc4eded3c9abfcaa22adef92"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2A,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.STATICCALL(
-                    gas=0x1F4,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x20, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (STATICCALL 500 1 0 50000 0 0) ) [[ 1 ]] @i}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2A, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x1F4,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xb5c3e48b7024dbbdbe53d636adcc0531cdc8da1a"),  # noqa: E501
+        address=Address(0x88C698DF82BBA0A5BC4EDED3C9ABFCAA22ADEF92),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (MSTORE 0 (STATICCALL 500 1 0 50000 0 0)) ) (MSTORE 32 @i ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2A, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.STATICCALL(
+                gas=0x1F4,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x20, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
+        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0xB5C3E48B7024DBBDBE53D636ADCC0531CDC8DA1A),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, nonce=1),
+                addr: Account(storage={1: 50000}, nonce=0),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={}, nonce=0),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [94500000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=94500000,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call50000_identity.py b/tests/ported_static/stStaticCall/test_static_call50000_identity.py
index 8034584a2b6..411f8506a38 100644
--- a/tests/ported_static/stStaticCall/test_static_call50000_identity.py
+++ b/tests/ported_static/stStaticCall/test_static_call50000_identity.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call50000_identity.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_Call50000_identityFiller.json
+state_tests/stStaticCall/static_Call50000_identityFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,32 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_Call50000_identityFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_Call50000_identityFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "00000000000000000000000060ee5f7db2e72863689037b116bd02fd7c5edfe4",
-        "0000000000000000000000008e9932c9d52eb968f6fa6bcaf50df4f2c7799852",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call50000_identity(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
+    """Test_static_call50000_identity."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,98 +70,118 @@ def test_static_call50000_identity(
         gas_limit=89250000,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2A,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x61C,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
-        balance=0xFFFFFFFFFFFFF,
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x60ee5f7db2e72863689037b116bd02fd7c5edfe4"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2A,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.STATICCALL(
-                    gas=0x61C,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x20, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (STATICCALL 1564 4 0 50000 0 0) ) [[ 1 ]] @i}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2A, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x61C,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0x8e9932c9d52eb968f6fa6bcaf50df4f2c7799852"),  # noqa: E501
+        address=Address(0x60EE5F7DB2E72863689037B116BD02FD7C5EDFE4),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (MSTORE 0 (STATICCALL 1564 4 0 50000 0 0)) ) (MSTORE 32 @i ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2A, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.STATICCALL(
+                gas=0x61C,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x20, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
+        balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0x8E9932C9D52EB968F6FA6BCAF50DF4F2C7799852),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={}, nonce=0),
+                target: Account(storage={0: 0, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={}, nonce=0),
+                target: Account(storage={0: 0, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [88250000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=88250000,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call50000_identity2.py b/tests/ported_static/stStaticCall/test_static_call50000_identity2.py
index 7c785fe82a4..cbbe552fd44 100644
--- a/tests/ported_static/stStaticCall/test_static_call50000_identity2.py
+++ b/tests/ported_static/stStaticCall/test_static_call50000_identity2.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call50000_identity2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_Call50000_identity2Filler.json
+state_tests/stStaticCall/static_Call50000_identity2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,50 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_Call50000_identity2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_Call50000_identity2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000cfb4c99d22928822feffa77a1a6de64042e48dd3",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xcfb4c99d22928822feffa77a1a6de64042e48dd3"): Account(
-                    storage={1: 50000, 2: 42}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000b02bd8691a1a4f5fd4432b5b17c68dde3013fc35",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call50000_identity2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
+    """Test_static_call50000_identity2."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -76,100 +70,122 @@ def test_static_call50000_identity2(
         gas_limit=8925000000,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x2A)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x30,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.STATICCALL(
-                    gas=0x61C,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x1,
-                    ret_size=0xC350,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x5)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x20, value=Op.MLOAD(offset=0x80))
-            + Op.MSTORE(offset=0x40, value=Op.MLOAD(offset=0x1))
-            + Op.STOP
-        ),
-        balance=0xFFFFFFFFFFFFF,
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb02bd8691a1a4f5fd4432b5b17c68dde3013fc35"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) [ 1 ] 42 (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (STATICCALL 1564 4 0 50000 1 50000) ) [[ 1 ]] @i [[ 2 ]] @1 }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x2A)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x30, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x61C,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x1,
+                ret_size=0xC350,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x5)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x1))
+        + Op.STOP,
+        balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0xCFB4C99D22928822FEFFA77A1A6DE64042E48DD3),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x2A)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x30,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x61C,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x1,
-                    ret_size=0xC350,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x5)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x1))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) [ 1 ] 42 (for {} (< @i 50000) [i](+ @i 1) (MSTORE 0 (STATICCALL 1564 4 0 50000 1 50000)) ) (MSTORE 32 @i) (MSTORE 64 @1 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x2A)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x30, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.STATICCALL(
+                gas=0x61C,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x1,
+                ret_size=0xC350,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x5)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x20, value=Op.MLOAD(offset=0x80))
+        + Op.MSTORE(offset=0x40, value=Op.MLOAD(offset=0x1))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xcfb4c99d22928822feffa77a1a6de64042e48dd3"),  # noqa: E501
+        address=Address(0xB02BD8691A1A4F5FD4432B5B17C68DDE3013FC35),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={1: 50000, 2: 42}, nonce=0),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=1),
+                addr: Account(storage={}, nonce=0),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [882500000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=882500000,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call50000_rip160.py b/tests/ported_static/stStaticCall/test_static_call50000_rip160.py
index ff8ca9b1611..12a1fa68939 100644
--- a/tests/ported_static/stStaticCall/test_static_call50000_rip160.py
+++ b/tests/ported_static/stStaticCall/test_static_call50000_rip160.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_static_call50000_rip160.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_Call50000_rip160Filler.json
+state_tests/stStaticCall/static_Call50000_rip160Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,32 +23,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_Call50000_rip160Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_Call50000_rip160Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000f50714ea64904a573fee759ca74a1c3c93fef59f",
-        "0000000000000000000000004689cad8bbc0e90b346e8b4bc385e68ba03f307c",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call50000_rip160(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
+    """Test_static_call50000_rip160."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,98 +67,106 @@ def test_static_call50000_rip160(
         gas_limit=39250000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2B,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.STATICCALL(
-                    gas=0x13178,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x20, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
-        balance=0xFFFFFFFFFFFFF,
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x4689cad8bbc0e90b346e8b4bc385e68ba03f307c"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (STATICCALL 78200 3 0 50000 0 0) ) [[ 1 ]] @i}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2B, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x13178,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
+        balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0xF50714EA64904A573FEE759CA74A1C3C93FEF59F),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x2B,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x13178,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (MSTORE 0 (STATICCALL 78200 3 0 50000 0 0)) ) (MSTORE 32 @i) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x2B, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.STATICCALL(
+                gas=0x13178,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x20, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xf50714ea64904a573fee759ca74a1c3c93fef59f"),  # noqa: E501
+        address=Address(0x4689CAD8BBC0E90B346E8B4BC385E68BA03F307C),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [3925000000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=3925000000,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
     post = {
-        contract: Account(storage={1: 1}),
+        sender: Account(storage={}, nonce=1),
+        addr: Account(
+            storage={0: 0, 1: 0},
+            code=bytes.fromhex(
+                "5b61c3506080511015602b576000600061c3506000600362013178fa6000556001608051016080526000565b60805160015500"  # noqa: E501
+            ),
+            nonce=0,
+        ),
+        target: Account(storage={0: 0, 1: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call50000bytes_contract50_1.py b/tests/ported_static/stStaticCall/test_static_call50000bytes_contract50_1.py
index 4e0262ebff3..c1571a59264 100644
--- a/tests/ported_static/stStaticCall/test_static_call50000bytes_contract50_1.py
+++ b/tests/ported_static/stStaticCall/test_static_call50000bytes_contract50_1.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call50000bytes_contract50_1.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_Call50000bytesContract50_1Filler.json
+state_tests/stStaticCall/static_Call50000bytesContract50_1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,49 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_Call50000bytesContract50_1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_Call50000bytesContract50_1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000d7b377d5d96ef739e27bc58e021c51e934a9a85b",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000005884670236220cd03f863517caaf72a56584429e",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call50000bytes_contract50_1(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee_1 = Address("0x784c659b2b4d2b69ab5564d60f4e565c7a1ceb2b")
-    callee_2 = Address("0x80c3355386cd2326418157dbd8764b380b971f67")
+    """Test_static_call50000bytes_contract50_1."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -76,3442 +70,144 @@ def test_static_call50000bytes_contract50_1(
         gas_limit=892500000000,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3E,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32)),
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.STATICCALL(
-                    gas=0x148C1C2280,
-                    address=0x80C3355386CD2326418157DBD8764B380B971F67,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x20, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
-        balance=0xFFFFFFFFFFFFF,
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x5884670236220cd03f863517caaf72a56584429e"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre[callee_1] = Account(
-        balance=0xFFFFFFFFFFFFF,
-        nonce=0,
+    # Source: raw
+    # 0x6001600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600055  # noqa: E501
+    addr = Address(
+        0x784C659B2B4D2B69AB5564D60F4E565C7A1CEB2B
+    )  # oversized contract
+    pre[addr] = Account(
         code=bytes.fromhex(
-            "600160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "0101600101600101600101600101600101600101600101600101600055"
+            "6001600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600101600055"  # noqa: E501
         ),
-    )
-    pre[callee_2] = Account(
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
+    )
+    # Source: raw
+    # 0x60016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016000  # noqa: E501
+    addr_3 = Address(
+        0x80C3355386CD2326418157DBD8764B380B971F67
+    )  # oversized contract
+    pre[addr_3] = Account(
         code=bytes.fromhex(
-            "600160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "010160010160010160010160010160010160010160010160010160010160010160010160"  # noqa: E501
-            "01016001016001016001016001016001016001016001016001016000"
+            "60016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016001016000"  # noqa: E501
         ),
+        balance=0xFFFFFFFFFFFFF,
+        nonce=0,
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (STATICCALL 88250000000 <contract:0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) ) [[ 1 ]] @i }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3E, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x148C1C2280,
+                address=0x784C659B2B4D2B69AB5564D60F4E565C7A1CEB2B,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
+        balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0xD7B377D5D96EF739E27BC58E021C51E934A9A85B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3E,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x148C1C2280,
-                    address=0x784C659B2B4D2B69AB5564D60F4E565C7A1CEB2B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) (MSTORE 0 (STATICCALL 88250000000 <contract:0xccc50000fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0)) ) (MSTORE 32 @i) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3E, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32))
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.STATICCALL(
+                gas=0x148C1C2280,
+                address=0x80C3355386CD2326418157DBD8764B380B971F67,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x20, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xd7b377d5d96ef739e27bc58e021c51e934a9a85b"),  # noqa: E501
+        address=Address(0x5884670236220CD03F863517CAAF72A56584429E),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, nonce=1),
+                addr: Account(storage={0: 0}, nonce=0),
+                addr_2: Account(storage={0: 0, 1: 0}, nonce=0),
+                target: Account(storage={0: 0, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, nonce=1),
+                addr: Account(storage={0: 0}, nonce=0),
+                addr_2: Account(storage={0: 0, 1: 0}, nonce=0),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [882500000000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=882500000000,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call50000bytes_contract50_2.py b/tests/ported_static/stStaticCall/test_static_call50000bytes_contract50_2.py
index 07e9da1d794..ad164e9725c 100644
--- a/tests/ported_static/stStaticCall/test_static_call50000bytes_contract50_2.py
+++ b/tests/ported_static/stStaticCall/test_static_call50000bytes_contract50_2.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call50000bytes_contract50_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_Call50000bytesContract50_2Filler.json
+state_tests/stStaticCall/static_Call50000bytesContract50_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,49 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_Call50000bytesContract50_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_Call50000bytesContract50_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000d7b377d5d96ef739e27bc58e021c51e934a9a85b",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000f3ea765b408b8de710b2c4c37b7300dbaaa58b79",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call50000bytes_contract50_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0x1836fd8c1db3e96ae2a516f50c27483cd48d2ef0")
-    callee_2 = Address("0xea3174ab39f002def28b14b425dc9e7e67fed805")
+    """Test_static_call50000bytes_contract50_2."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -76,3442 +70,144 @@ def test_static_call50000bytes_contract50_2(
         gas_limit=892500000000,
     )
 
-    pre[callee] = Account(
-        balance=0xFFFFFFFFFFFFF,
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        code=bytes.fromhex(
-            "60015b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b600101600055"
-        ),
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
+    # Source: raw
+    # 0x60015b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b600101600055  # noqa: E501
+    addr = Address(
+        0x1836FD8C1DB3E96AE2A516F50C27483CD48D2EF0
+    )  # oversized contract
+    pre[addr] = Account(
+        code=bytes.fromhex(
+            "60015b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b600101600055"  # noqa: E501
         ),
+        balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3E,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x148C1C2280,
-                    address=0x1836FD8C1DB3E96AE2A516F50C27483CD48D2EF0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
+    # Source: raw
+    # 0x60015b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b600101  # noqa: E501
+    addr_3 = Address(
+        0xEA3174AB39F002DEF28B14B425DC9E7E67FED805
+    )  # oversized contract
+    pre[addr_3] = Account(
+        code=bytes.fromhex(
+            "60015b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b600101"  # noqa: E501
         ),
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xd7b377d5d96ef739e27bc58e021c51e934a9a85b"),  # noqa: E501
     )
-    pre[callee_2] = Account(
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (STATICCALL 88250000000 <contract:0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) ) [[ 1 ]] @i }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3E, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x148C1C2280,
+                address=0x1836FD8C1DB3E96AE2A516F50C27483CD48D2EF0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        code=bytes.fromhex(
-            "60015b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b600101"
-        ),
+        address=Address(0xD7B377D5D96EF739E27BC58E021C51E934A9A85B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3E,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32)),
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.STATICCALL(
-                    gas=0x148C1C2280,
-                    address=0xEA3174AB39F002DEF28B14B425DC9E7E67FED805,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x20, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) (MSTORE 0 (STATICCALL 88250000000 <contract:0xccc50000fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0)) ) (MSTORE 32 @i ) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3E, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32))
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.STATICCALL(
+                gas=0x148C1C2280,
+                address=0xEA3174AB39F002DEF28B14B425DC9E7E67FED805,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x20, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xf3ea765b408b8de710b2c4c37b7300dbaaa58b79"),  # noqa: E501
+        address=Address(0xF3EA765B408B8DE710B2C4C37B7300DBAAA58B79),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, nonce=1),
+                addr: Account(storage={0: 0}, nonce=0),
+                addr_2: Account(storage={0: 0, 1: 0}, nonce=0),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, nonce=1),
+                addr: Account(storage={0: 0}, nonce=0),
+                addr_2: Account(storage={0: 0, 1: 0}, nonce=0),
+                target: Account(storage={0: 0, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [882500000000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=882500000000,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call50000bytes_contract50_3.py b/tests/ported_static/stStaticCall/test_static_call50000bytes_contract50_3.py
index 4f7abc9da8a..1041834efd5 100644
--- a/tests/ported_static/stStaticCall/test_static_call50000bytes_contract50_3.py
+++ b/tests/ported_static/stStaticCall/test_static_call50000bytes_contract50_3.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call50000bytes_contract50_3.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_Call50000bytesContract50_3Filler.json
+state_tests/stStaticCall/static_Call50000bytesContract50_3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,49 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_Call50000bytesContract50_3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_Call50000bytesContract50_3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000d7b377d5d96ef739e27bc58e021c51e934a9a85b",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000f3ea765b408b8de710b2c4c37b7300dbaaa58b79",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call50000bytes_contract50_3(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0x0431fbe9c18dc43af2c372a7554bb2826176bdfd")
-    callee_1 = Address("0x653cf6168b15c28d212f20d652c34bbe734a8718")
+    """Test_static_call50000bytes_contract50_3."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -76,3442 +70,144 @@ def test_static_call50000bytes_contract50_3(
         gas_limit=892500000000,
     )
 
-    pre[callee] = Account(
-        balance=0xFFFFFFFFFFFFF,
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600161da8e565b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b600101600055  # noqa: E501
+    addr = Address(
+        0x653CF6168B15C28D212F20D652C34BBE734A8718
+    )  # oversized contract
+    pre[addr] = Account(
         code=bytes.fromhex(
-            "600161da8e565b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b600101"  # noqa: E501
+            "600161da8e565b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b600101600055"  # noqa: E501
         ),
-    )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre[callee_1] = Account(
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        code=bytes.fromhex(
-            "600161da8e565b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b"  # noqa: E501
-            "5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b600101600055"  # noqa: E501
-        ),
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
+    # Source: raw
+    # 0x600161da8e565b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b600101  # noqa: E501
+    addr_3 = Address(
+        0x0431FBE9C18DC43AF2C372A7554BB2826176BDFD
+    )  # oversized contract
+    pre[addr_3] = Account(
+        code=bytes.fromhex(
+            "600161da8e565b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b600101"  # noqa: E501
         ),
+        balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3E,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x148C1C2280,
-                    address=0x653CF6168B15C28D212F20D652C34BBE734A8718,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (STATICCALL 88250000000 <contract:0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) ) [[ 1 ]] @i }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3E, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x148C1C2280,
+                address=0x653CF6168B15C28D212F20D652C34BBE734A8718,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xd7b377d5d96ef739e27bc58e021c51e934a9a85b"),  # noqa: E501
+        address=Address(0xD7B377D5D96EF739E27BC58E021C51E934A9A85B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3E,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32)),
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.STATICCALL(
-                    gas=0x148C1C2280,
-                    address=0x431FBE9C18DC43AF2C372A7554BB2826176BDFD,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x20, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) (MSTORE 0 (STATICCALL 88250000000 <contract:0xccc50000fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0)) ) (MSTORE 32 @i ) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3E, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0x32))
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.STATICCALL(
+                gas=0x148C1C2280,
+                address=0x431FBE9C18DC43AF2C372A7554BB2826176BDFD,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x20, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xf3ea765b408b8de710b2c4c37b7300dbaaa58b79"),  # noqa: E501
+        address=Address(0xF3EA765B408B8DE710B2C4C37B7300DBAAA58B79),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, nonce=1),
+                addr: Account(storage={0: 0}),
+                addr_2: Account(storage={0: 0, 1: 0}, nonce=0),
+                target: Account(storage={0: 0, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                sender: Account(storage={}, nonce=1),
+                addr: Account(storage={0: 0}),
+                addr_2: Account(storage={0: 0, 1: 0}, nonce=0),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [882500000000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=882500000000,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_and_callcode_consume_more_gas_then_transaction_has.py b/tests/ported_static/stStaticCall/test_static_call_and_callcode_consume_more_gas_then_transaction_has.py
index db861bf0338..1186ce1cc64 100644
--- a/tests/ported_static/stStaticCall/test_static_call_and_callcode_consume_more_gas_then_transaction_has.py
+++ b/tests/ported_static/stStaticCall/test_static_call_and_callcode_consume_more_gas_then_transaction_has.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call_and_callcode_consume_more_gas_then_transaction_has.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json
+state_tests/stStaticCall/static_CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,44 +27,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000438f316ba8e30f69666a3477a7f5cd26235d3cbb",
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000007d77eaf6dc93e2b7b83a8e06314af1ce47cd2596",
-            {
-                Address("0x7d77eaf6dc93e2b7b83a8e06314af1ce47cd2596"): Account(
-                    storage={0: 18, 9: 1, 10: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call_and_callcode_consume_more_gas_then_transaction_has(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_static_call_and_callcode_consume_more_gas_then_transaction_has."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -72,109 +71,142 @@ def test_static_call_and_callcode_consume_more_gas_then_transaction_has(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x9,
-                value=Op.STATICCALL(
-                    gas=0x927C0,
-                    address=0xFD59ABAE521384B5731AC657616680219FBC423D,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xA,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0xFD59ABAE521384B5731AC657616680219FBC423D,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x438f316ba8e30f69666a3477a7f5cd26235d3cbb"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x9,
-                value=Op.STATICCALL(
-                    gas=0x927C0,
-                    address=0x9620801959B49D6D1BD08F0CDAFDA5D87E900403,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xA,
-                value=Op.CALLCODE(
-                    gas=0x927C0,
-                    address=0xFD59ABAE521384B5731AC657616680219FBC423D,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 0 0x12) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x12) + Op.STOP,
         nonce=0,
-        address=Address("0x7d77eaf6dc93e2b7b83a8e06314af1ce47cd2596"),  # noqa: E501
+        address=Address(0xFD59ABAE521384B5731AC657616680219FBC423D),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # { (MSTORE 0 0x12) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x0, value=0x12) + Op.STOP,
         nonce=0,
-        address=Address("0x9620801959b49d6d1bd08f0cdafda5d87e900403"),  # noqa: E501
+        address=Address(0x9620801959B49D6D1BD08F0CDAFDA5D87E900403),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 9 (STATICCALL 600000 <contract:0x1000000000000000000000000000000000000103> 0 0 0 0)) (SSTORE 10 (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000103> 0 0 0 0 0)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x9,
+            value=Op.STATICCALL(
+                gas=0x927C0,
+                address=0xFD59ABAE521384B5731AC657616680219FBC423D,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xA,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=0xFD59ABAE521384B5731AC657616680219FBC423D,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0x438F316BA8E30F69666A3477A7F5CD26235D3CBB),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=0x12) + Op.STOP,
+    # Source: lll
+    # {  (SSTORE 9 (STATICCALL 600000 <contract:0x2000000000000000000000000000000000000103> 0 0 0 0)) (SSTORE 10 (CALLCODE 600000 <contract:0x1000000000000000000000000000000000000103> 0 0 0 0 0)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x9,
+            value=Op.STATICCALL(
+                gas=0x927C0,
+                address=0x9620801959B49D6D1BD08F0CDAFDA5D87E900403,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xA,
+            value=Op.CALLCODE(
+                gas=0x927C0,
+                address=0xFD59ABAE521384B5731AC657616680219FBC423D,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xfd59abae521384b5731ac657616680219fbc423d"),  # noqa: E501
+        address=Address(0x7D77EAF6DC93E2B7B83A8E06314AF1CE47CD2596),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr: Account(storage={0: 0, 8: 0, 9: 0, 10: 0}),
+                addr_2: Account(
+                    storage={},
+                    code=bytes.fromhex("601260005500"),
+                    nonce=0,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_3: Account(storage={0: 18, 9: 1, 10: 1}),
+                addr_4: Account(
+                    storage={},
+                    code=bytes.fromhex("601260005200"),
+                    nonce=0,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [600000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=600000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_ask_more_gas_on_depth2_then_transaction_has.py b/tests/ported_static/stStaticCall/test_static_call_ask_more_gas_on_depth2_then_transaction_has.py
index 111a84c94f4..1ff95945afb 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ask_more_gas_on_depth2_then_transaction_has.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ask_more_gas_on_depth2_then_transaction_has.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call_ask_more_gas_on_depth2_then_transaction_has.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallAskMoreGasOnDepth2ThenTransactionHasFiller.json
+state_tests/stStaticCall/static_CallAskMoreGasOnDepth2ThenTransactionHasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,51 +27,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_CallAskMoreGasOnDepth2ThenTransactionHasFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_CallAskMoreGasOnDepth2ThenTransactionHasFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000ef69a9b2c20255fb7bd2b0ac7d45601a03d570b0",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xef69a9b2c20255fb7bd2b0ac7d45601a03d570b0"): Account(
-                    storage={8: 1, 9: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000008169dc735802bb5c18a777052cf4ce326b5fd725",
-            {
-                Address("0x8169dc735802bb5c18a777052cf4ce326b5fd725"): Account(
-                    storage={8: 1, 9: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call_ask_more_gas_on_depth2_then_transaction_has(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_static_call_ask_more_gas_on_depth2_then_transaction_has."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -79,125 +71,154 @@ def test_static_call_ask_more_gas_on_depth2_then_transaction_has(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x8, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x5044bfb29664a79de12215897c630dc8a11b0b97"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.STATICCALL(
-                    gas=0x30D40,
-                    address=0xE5A4D8074950EC8067D602848B666CA151B09C9F,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 8 1)}
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x8169dc735802bb5c18a777052cf4ce326b5fd725"),  # noqa: E501
+        address=Address(0x5044BFB29664A79DE12215897C630DC8A11B0B97),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # { (MSTORE 8 (GAS))}
+    addr_6 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x8, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x91b291a3336bc1357388354df18ca061b39e3745"),  # noqa: E501
+        address=Address(0x91B291A3336BC1357388354DF18CA061B39E3745),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 8 (GAS)) (MSTORE 9 (STATICCALL 600000 <contract:0x1000000000000000000000000000000000000108> 0 0 0 0)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x8, value=Op.GAS)
+        + Op.MSTORE(
+            offset=0x9,
+            value=Op.STATICCALL(
+                gas=0x927C0,
+                address=0x5044BFB29664A79DE12215897C630DC8A11B0B97,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0xD9539C5A3DC4713D47A547BFC9A075BD97287080),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x8, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0x9,
-                value=Op.STATICCALL(
-                    gas=0x927C0,
-                    address=0x5044BFB29664A79DE12215897C630DC8A11B0B97,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 8 (GAS)) (MSTORE 9 (STATICCALL 600000 <contract:0x2000000000000000000000000000000000000108> 0 0 0 0)) }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x8, value=Op.GAS)
+        + Op.MSTORE(
+            offset=0x9,
+            value=Op.STATICCALL(
+                gas=0x927C0,
+                address=0x91B291A3336BC1357388354DF18CA061B39E3745,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xd9539c5a3dc4713d47a547bfc9a075bd97287080"),  # noqa: E501
+        address=Address(0xE5A4D8074950EC8067D602848B666CA151B09C9F),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x8, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0x9,
-                value=Op.STATICCALL(
-                    gas=0x927C0,
-                    address=0x91B291A3336BC1357388354DF18CA061B39E3745,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 8 1) (SSTORE 9 (STATICCALL 200000 <contract:0x1000000000000000000000000000000000000107> 0 0 0 0)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.STATICCALL(
+                gas=0x30D40,
+                address=0xD9539C5A3DC4713D47A547BFC9A075BD97287080,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe5a4d8074950ec8067d602848b666ca151b09c9f"),  # noqa: E501
+        address=Address(0xEF69A9B2C20255FB7BD2B0AC7D45601A03D570B0),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.STATICCALL(
-                    gas=0x30D40,
-                    address=0xD9539C5A3DC4713D47A547BFC9A075BD97287080,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 8 1) (SSTORE 9 (STATICCALL 200000 <contract:0x2000000000000000000000000000000000000107> 0 0 0 0)) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x8, value=0x1)
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.STATICCALL(
+                gas=0x30D40,
+                address=0xE5A4D8074950EC8067D602848B666CA151B09C9F,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xef69a9b2c20255fb7bd2b0ac7d45601a03d570b0"),  # noqa: E501
+        address=Address(0x8169DC735802BB5C18A777052CF4CE326B5FD725),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr: Account(storage={8: 1, 9: 1}),
+                addr_2: Account(storage={8: 0, 9: 0}),
+                addr_3: Account(storage={8: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_4: Account(storage={8: 1, 9: 1}),
+                addr_5: Account(storage={8: 0, 9: 0}),
+                addr_6: Account(storage={8: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [600000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=600000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_basic.py b/tests/ported_static/stStaticCall/test_static_call_basic.py
index 9da97ee3cec..a3cf98b6409 100644
--- a/tests/ported_static/stStaticCall/test_static_call_basic.py
+++ b/tests/ported_static/stStaticCall/test_static_call_basic.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call_basic.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callBasicFiller.json
+state_tests/stStaticCall/static_callBasicFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,72 +26,51 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_callBasicFiller.json"],
+    ["state_tests/stStaticCall/static_callBasicFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000d3c0847ca0222f22dcfb4a433a378ff58ad6a881",
-            {
-                Address("0x13670d6bd41acd42d75e7c4c25df7384a6fbd752"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xd3c0847ca0222f22dcfb4a433a378ff58ad6a881"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000ead198f480fb91a5fbedcf5eb28cd369ee4c6cf2",
-            {
-                Address("0x13670d6bd41acd42d75e7c4c25df7384a6fbd752"): Account(
-                    storage={1: 1}
-                ),
-                Address("0xd3c0847ca0222f22dcfb4a433a378ff58ad6a881"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "000000000000000000000000eb015f637a39c63f8b6db67505f5c02c613defc1",
-            {
-                Address("0x13670d6bd41acd42d75e7c4c25df7384a6fbd752"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xd3c0847ca0222f22dcfb4a433a378ff58ad6a881"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "000000000000000000000000d5b64fa2ca1e471b45b639a5e9c259ca24c28ace",
-            {
-                Address("0x13670d6bd41acd42d75e7c4c25df7384a6fbd752"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xd3c0847ca0222f22dcfb4a433a378ff58ad6a881"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call_basic(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_basic."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -98,110 +81,142 @@ def test_static_call_basic(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x13670d6bd41acd42d75e7c4c25df7384a6fbd752"),  # noqa: E501
+        address=Address(0x13670D6BD41ACD42D75E7C4C25DF7384A6FBD752),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.LOG0(offset=0x1, size=0xA)
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 1 ]] 1 }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.STOP,
+        storage={1: 1},
         balance=23,
         nonce=0,
-        address=Address("0x2e0dd8abe4e68c5b602f3c65051f4b30c6d018da"),  # noqa: E501
+        address=Address(0xD3C0847CA0222F22DCFB4A433A378FF58AD6A881),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
+    # Source: lll
+    # { [[ 1 ]] 0 }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
+        storage={1: 0},
         balance=23,
         nonce=0,
-        address=Address("0xc93c7a588b13699e562b3933e8f2b1c15e610781"),  # noqa: E501
+        address=Address(0xEAD198F480FB91A5FBEDCF5EB28CD369EE4C6CF2),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.STOP,
-        storage={0x1: 0x1},
+    # Source: lll
+    # { (LOG0 1 10) (MSTORE 1 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG0(offset=0x1, size=0xA)
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0xd3c0847ca0222f22dcfb4a433a378ff58ad6a881"),  # noqa: E501
+        address=Address(0x2E0DD8ABE4E68C5B602F3C65051F4B30C6D018DA),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x9C40,
-                    address=0xC93C7A588B13699E562B3933E8F2B1C15E610781,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 1 1) }
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0xd5b64fa2ca1e471b45b639a5e9c259ca24c28ace"),  # noqa: E501
+        address=Address(0xC93C7A588B13699E562B3933E8F2B1C15E610781),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
-        storage={0x1: 0x0},
+    # Source: lll
+    # { (CALL 40000 <contract:0x2000000000000000000000000000000000000003> 0 0 0 0 0) (MSTORE 1 1) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x9C40,
+                address=0x2E0DD8ABE4E68C5B602F3C65051F4B30C6D018DA,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0xead198f480fb91a5fbedcf5eb28cd369ee4c6cf2"),  # noqa: E501
+        address=Address(0xEB015F637A39C63F8B6DB67505F5C02C613DEFC1),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x9C40,
-                    address=0x2E0DD8ABE4E68C5B602F3C65051F4B30C6D018DA,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # { (CALLCODE 40000 <contract:0x3000000000000000000000000000000000000003> 1 0 0 0 0) (MSTORE 1 1) }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0x9C40,
+                address=0xC93C7A588B13699E562B3933E8F2B1C15E610781,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0xeb015f637a39c63f8b6db67505f5c02c613defc1"),  # noqa: E501
+        address=Address(0xD5B64FA2CA1E471B45B639A5E9C259CA24C28ACE),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0, 1: 1})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 1})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 1, 1: 1}),
+                addr_6: Account(balance=23),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+        Hash(addr_5, left_padding=True),
+    ]
+    tx_gas = [1000000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1000000,
-        value=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_change_revert.py b/tests/ported_static/stStaticCall/test_static_call_change_revert.py
index 7a97b1d7f0f..2d6b7295118 100644
--- a/tests/ported_static/stStaticCall/test_static_call_change_revert.py
+++ b/tests/ported_static/stStaticCall/test_static_call_change_revert.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call_change_revert.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callChangeRevertFiller.json
+state_tests/stStaticCall/static_callChangeRevertFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,50 +26,45 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callChangeRevertFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callChangeRevertFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000e6f1fdaa1c99007971c641e10af3a8fac0b641c8",
-            {
-                Address("0xe6f1fdaa1c99007971c641e10af3a8fac0b641c8"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000ea22ec955ac71d8e4380541212bd20818d704567",
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "0000000000000000000000002c004389edaae817e664b6d660f46735756b56d3",
-            {
-                Address("0x2c004389edaae817e664b6d660f46735756b56d3"): Account(
-                    storage={0: 1, 2: 1}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call_change_revert(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_change_revert."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -76,189 +75,221 @@ def test_static_call_change_revert(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x47C4ED3D93429CB8304737E2327B522E8928C9F3,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x47C4ED3D93429CB8304737E2327B522E8928C9F3,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x47C4ED3D93429CB8304737E2327B522E8928C9F3,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALL 350000 (CALLDATALOAD 0) 0 0 0 0 0)  }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x55730,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2c004389edaae817e664b6d660f46735756b56d3"),  # noqa: E501
+        address=Address(0x492BB18ADCE7DA2BED3592742FB4E3DF9086FB4C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=Op.SLOAD(key=0x1))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 1 1)  }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x47c4ed3d93429cb8304737e2327b522e8928c9f3"),  # noqa: E501
+        address=Address(0xC031FC0AA7B61A5D7D962AFEE8838DEC6948ABB7),  # noqa: E501
     )
-    # Source: LLL
-    # {  (CALL 350000 (CALLDATALOAD 0) 0 0 0 0 0)  }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x55730,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=0x0,
+    # Source: lll
+    # { (MSTORE 1 1) (SSTORE 1 (SLOAD 1)) }
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.SSTORE(key=0x1, value=Op.SLOAD(key=0x1))
+        + Op.STOP,
+        nonce=0,
+        address=Address(0x47C4ED3D93429CB8304737E2327B522E8928C9F3),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000001> 1 0 0 0 0) [[ 1 ]] (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000001> 0 0 0 0) [[ 2 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000001> 1 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0xC031FC0AA7B61A5D7D962AFEE8838DEC6948ABB7,
+                value=0x1,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=0xC031FC0AA7B61A5D7D962AFEE8838DEC6948ABB7,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0xC031FC0AA7B61A5D7D962AFEE8838DEC6948ABB7,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x492bb18adce7da2bed3592742fb4e3df9086fb4c"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
-        nonce=0,
-        address=Address("0xc031fc0aa7b61a5d7d962afee8838dec6948abb7"),  # noqa: E501
+        address=Address(0xE6F1FDAA1C99007971C641E10AF3A8FAC0B641C8),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0xC031FC0AA7B61A5D7D962AFEE8838DEC6948ABB7,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0xC031FC0AA7B61A5D7D962AFEE8838DEC6948ABB7,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0xC031FC0AA7B61A5D7D962AFEE8838DEC6948ABB7,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000001> 1 0 0 0 0) [[ 1 ]] (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000001> 0 0 0 0) [[ 2 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000001> 1 0 0 0 0) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0xC031FC0AA7B61A5D7D962AFEE8838DEC6948ABB7,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=0xC031FC0AA7B61A5D7D962AFEE8838DEC6948ABB7,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0xC031FC0AA7B61A5D7D962AFEE8838DEC6948ABB7,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x8F, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x73)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe6f1fdaa1c99007971c641e10af3a8fac0b641c8"),  # noqa: E501
+        address=Address(0xEA22EC955AC71D8E4380541212BD20818D704567),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0xC031FC0AA7B61A5D7D962AFEE8838DEC6948ABB7,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0xC031FC0AA7B61A5D7D962AFEE8838DEC6948ABB7,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0xC031FC0AA7B61A5D7D962AFEE8838DEC6948ABB7,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x8F,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x73)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 1 0 0 0 0) [[ 1 ]] (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0) [[ 2 ]] (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 1 0 0 0 0) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0x47C4ED3D93429CB8304737E2327B522E8928C9F3,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=0x47C4ED3D93429CB8304737E2327B522E8928C9F3,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0x47C4ED3D93429CB8304737E2327B522E8928C9F3,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xea22ec955ac71d8e4380541212bd20818d704567"),  # noqa: E501
+        address=Address(0x2C004389EDAAE817E664B6D660F46735756B56D3),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr: Account(storage={0: 1, 1: 1, 2: 1}),
+                addr_2: Account(balance=2),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_3: Account(storage={0: 0, 1: 0, 2: 0}),
+                addr_2: Account(balance=0),
+            },
+        },
+        {
+            "indexes": {"data": 2, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_4: Account(storage={0: 1, 1: 0, 2: 1}),
+                addr_5: Account(balance=2),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [1000000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1000000,
-        value=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_and_call_it_oog.py b/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_and_call_it_oog.py
index 691f79410c9..e6b7b771be7 100644
--- a/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_and_call_it_oog.py
+++ b/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_and_call_it_oog.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call_contract_to_create_contract_and_call_it_oog.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallContractToCreateContractAndCallItOOGFiller.json
+state_tests/stStaticCall/static_CallContractToCreateContractAndCallItOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -24,41 +28,41 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_CallContractToCreateContractAndCallItOOGFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_CallContractToCreateContractAndCallItOOGFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        ("00", {}),
-        (
-            "01",
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 0xD2571607E241ECF590ED94B12D87C94BABE36DB6}
-                ),
-                Address("0xd2571607e241ecf590ed94b12d87c94babe36db6"): Account(
-                    storage={0: 12}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call_contract_to_create_contract_and_call_it_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_call_contract_to_create_contract_and_call_it_oog."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -69,52 +73,79 @@ def test_static_call_contract_to_create_contract_and_call_it_oog(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 0 0x600c60005566602060406000f060205260076039f3)[[0]](CREATE 1 11 21) (STATICCALL 1000 (SLOAD 0) 0 0 0 0) (IF (EQ (CALLDATALOAD 0) 0) (KECCAK256 0x00 0x2fffff) (GAS) )  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x600C60005566602060406000F060205260076039F3,
-            )
-            + Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x1, offset=0xB, size=0x15)
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x3E8,
-                    address=Op.SLOAD(key=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(
-                pc=0x40, condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x0)
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x600C60005566602060406000F060205260076039F3
+        )
+        + Op.SSTORE(key=0x0, value=Op.CREATE(value=0x1, offset=0xB, size=0x15))
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x3E8,
+                address=Op.SLOAD(key=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.GAS
-            + Op.JUMP(pc=0x48)
-            + Op.JUMPDEST
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPI(pc=0x40, condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x0))
+        + Op.GAS
+        + Op.JUMP(pc=0x48)
+        + Op.JUMPDEST
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={
+                        0: compute_create_address(address=contract_0, nonce=0),
+                    },
+                    nonce=1,
+                ),
+                sender: Account(nonce=1),
+                compute_create_address(address=contract_0, nonce=0): Account(
+                    storage={0: 12}, balance=1, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={0: 0, 2: 0}, nonce=0),
+                sender: Account(nonce=1),
+                compute_create_address(
+                    address=contract_0, nonce=0
+                ): Account.NONEXISTENT,
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("00"),
+        Bytes("01"),
+    ]
+    tx_gas = [2000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=2000000,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_oog.py b/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_oog.py
index 42e7ff33fd6..cdf25c71569 100644
--- a/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_oog.py
+++ b/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_oog.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call_contract_to_create_contract_oog.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallContractToCreateContractOOGFiller.json
+state_tests/stStaticCall/static_CallContractToCreateContractOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -24,41 +28,41 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_CallContractToCreateContractOOGFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_CallContractToCreateContractOOGFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (0, {}),
-        (
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-v0",
+        ),
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 0xD2571607E241ECF590ED94B12D87C94BABE36DB6}
-                ),
-                Address("0xd2571607e241ecf590ed94b12d87c94babe36db6"): Account(
-                    storage={0: 12}
-                ),
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call_contract_to_create_contract_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_call_contract_to_create_contract_oog."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0x2540BE400)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -69,39 +73,65 @@ def test_static_call_contract_to_create_contract_oog(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 0 0x600c60005566602060406000f060205260076039f3) [[0]](CREATE 1 11 21) (STATICCALL 0 (SLOAD 0) 0 0 0 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x600C60005566602060406000F060205260076039F3,
-            )
-            + Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x1, offset=0xB, size=0x15)
-            )
-            + Op.STATICCALL(
-                gas=0x0,
-                address=Op.SLOAD(key=0x0),
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x600C60005566602060406000F060205260076039F3
+        )
+        + Op.SSTORE(key=0x0, value=Op.CREATE(value=0x1, offset=0xB, size=0x15))
+        + Op.STATICCALL(
+            gas=0x0,
+            address=Op.SLOAD(key=0x0),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2540BE400)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={0: 0}, nonce=0),
+                sender: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={
+                        0: compute_create_address(address=contract_0, nonce=0),
+                    },
+                    nonce=1,
+                ),
+                sender: Account(nonce=1),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [100000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=100000,
-        value=tx_value,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_oog_bonus_gas.py b/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_oog_bonus_gas.py
index 462df136c27..33baff843c7 100644
--- a/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_oog_bonus_gas.py
+++ b/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_oog_bonus_gas.py
@@ -2,19 +2,23 @@
 Gas analysis showed this test's gas can go as low as 101174, and still...
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallContractToCreateContractOOGBonusGasFiller.json
+state_tests/stStaticCall/static_CallContractToCreateContractOOGBonusGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -24,42 +28,42 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_CallContractToCreateContractOOGBonusGasFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_CallContractToCreateContractOOGBonusGasFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            20000000,
-            {
-                Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"): Account(
-                    storage={0: 0xD2571607E241ECF590ED94B12D87C94BABE36DB6}
-                ),
-                Address("0xd2571607e241ecf590ed94b12d87c94babe36db6"): Account(
-                    storage={0: 12}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
-        (80000, {}),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call_contract_to_create_contract_oog_bonus_gas(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Gas analysis showed this test's gas can go as low as 101174, and..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0x2540BE400)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -70,42 +74,73 @@ def test_static_call_contract_to_create_contract_oog_bonus_gas(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x600c60005566602060406000f060205260076039f3) [[0]](CREATE 1 11 21) [[ 1 ]] (STATICCALL 0 (SLOAD 0) 0 0 0 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x600C60005566602060406000F060205260076039F3,
-            )
-            + Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x1, offset=0xB, size=0x15)
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x0,
-                    address=Op.SLOAD(key=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x600C60005566602060406000F060205260076039F3
+        )
+        + Op.SSTORE(key=0x0, value=Op.CREATE(value=0x1, offset=0xB, size=0x15))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x0,
+                address=Op.SLOAD(key=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=112,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2540BE400)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                contract_0: Account(
+                    storage={
+                        0: compute_create_address(address=contract_0, nonce=0),
+                    },
+                    nonce=1,
+                ),
+                sender: Account(nonce=1),
+                compute_create_address(address=contract_0, nonce=0): Account(
+                    storage={0: 12, 1: 0}, balance=1, nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {
+                contract_0: Account(storage={0: 0}, nonce=0),
+                sender: Account(nonce=1),
+                compute_create_address(
+                    address=contract_0, nonce=0
+                ): Account.NONEXISTENT,
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [20000000, 80000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_which_would_create_contract_if_called.py b/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_which_would_create_contract_if_called.py
index 97c90c8bfb9..f36150e739a 100644
--- a/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_which_would_create_contract_if_called.py
+++ b/tests/ported_static/stStaticCall/test_static_call_contract_to_create_contract_which_would_create_contract_if_called.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_static_call_contract_to_create_contract_which_would_create_contract...
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
+state_tests/stStaticCall/static_CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,21 +24,20 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_contract_to_create_contract_which_would_create_contract_if_called(  # noqa: E501
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_call_contract_to_create_contract_which_would_create_con..."""  # noqa: E501
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0x2540BE400)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,48 +48,52 @@ def test_static_call_contract_to_create_contract_which_would_create_contract_if_
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 0 0x600c60005566602060406000f060205260076039f3) [[ 0 ]](CREATE 1 11 21) [[ 1 ]] (STATICCALL 150000 (SLOAD 0) 0 0 0 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x600C60005566602060406000F060205260076039F3,
-            )
-            + Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x1, offset=0xB, size=0x15)
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=Op.SLOAD(key=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x600C60005566602060406000F060205260076039F3
+        )
+        + Op.SSTORE(key=0x0, value=Op.CREATE(value=0x1, offset=0xB, size=0x15))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=Op.SLOAD(key=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2540BE400)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=300000,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0xD2571607E241ECF590ED94B12D87C94BABE36DB6},
+        contract_0: Account(
+            storage={
+                0: compute_create_address(address=contract_0, nonce=0),
+                1: 0,
+            },
+            nonce=1,
         ),
-        Address("0xd2571607e241ecf590ed94b12d87c94babe36db6"): Account(
-            storage={0: 12},
+        compute_create_address(
+            address=compute_create_address(address=contract_0, nonce=0),
+            nonce=0,
+        ): Account.NONEXISTENT,
+        sender: Account(nonce=1),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={0: 12}, balance=1, nonce=1
         ),
     }
 
diff --git a/tests/ported_static/stStaticCall/test_static_call_create.py b/tests/ported_static/stStaticCall/test_static_call_create.py
index cb19f531d08..b72fd28baf7 100644
--- a/tests/ported_static/stStaticCall/test_static_call_create.py
+++ b/tests/ported_static/stStaticCall/test_static_call_create.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call_create.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callCreateFiller.json
+state_tests/stStaticCall/static_callCreateFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,56 +26,51 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_callCreateFiller.json"],
+    ["state_tests/stStaticCall/static_callCreateFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000f5c27325e6c5769b6569971cd81e01570fd30ef1",
-            {
-                Address("0xe49f04b30026f23e9e04493c44ece7cfec9224ca"): Account(
-                    storage={0: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "00000000000000000000000029d4d72a31d1b141b2067d1d4193bdf12fcddc41",
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "000000000000000000000000b4aa7cc91d100eddc01f22ca32f643bb0f1c91cc",
-            {
-                Address("0xe49f04b30026f23e9e04493c44ece7cfec9224ca"): Account(
-                    storage={0: 1}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "000000000000000000000000f9ecfe0635fefb5ad44418f97d7fcaf210ebd5aa",
-            {
-                Address("0xe49f04b30026f23e9e04493c44ece7cfec9224ca"): Account(
-                    storage={0: 1}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call_create(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_create."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -82,94 +81,114 @@ def test_static_call_create(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=Op.CREATE(value=0x0, offset=0x1, size=0x1) + Op.STOP,
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x29d4d72a31d1b141b2067d1d4193bdf12fcddc41"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x249F0,
-                address=0x29D4D72A31D1B141B2067D1D4193BDF12FCDDC41,
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 300000 (CALLDATALOAD 0) 0 0 0 0) }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x493E0,
+                address=Op.CALLDATALOAD(offset=0x0),
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb4aa7cc91d100eddc01f22ca32f643bb0f1c91cc"),  # noqa: E501
+        address=Address(0xE49F04B30026F23E9E04493C44ECE7CFEC9224CA),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 300000 (CALLDATALOAD 0) 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x493E0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CREATE 0 1 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.CREATE(value=0x0, offset=0x1, size=0x1) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe49f04b30026f23e9e04493c44ece7cfec9224ca"),  # noqa: E501
+        address=Address(0x29D4D72A31D1B141B2067D1D4193BDF12FCDDC41),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x249F0,
-                address=0x29D4D72A31D1B141B2067D1D4193BDF12FCDDC41,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALL 150000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x249F0,
+            address=0x29D4D72A31D1B141B2067D1D4193BDF12FCDDC41,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf5c27325e6c5769b6569971cd81e01570fd30ef1"),  # noqa: E501
+        address=Address(0xF5C27325E6C5769B6569971CD81E01570FD30EF1),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x249F0,
-                address=0x29D4D72A31D1B141B2067D1D4193BDF12FCDDC41,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x249F0,
+            address=0x29D4D72A31D1B141B2067D1D4193BDF12FCDDC41,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0xB4AA7CC91D100EDDC01F22CA32F643BB0F1C91CC),  # noqa: E501
+    )
+    # Source: lll
+    # {  (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x249F0,
+            address=0x29D4D72A31D1B141B2067D1D4193BDF12FCDDC41,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf9ecfe0635fefb5ad44418f97d7fcaf210ebd5aa"),  # noqa: E501
+        address=Address(0xF9ECFE0635FEFB5AD44418F97D7FCAF210EBD5AA),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 2, 3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_4, left_padding=True),
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [1000000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1000000,
-        value=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_create2.py b/tests/ported_static/stStaticCall/test_static_call_create2.py
index af8717dced9..98394b0847c 100644
--- a/tests/ported_static/stStaticCall/test_static_call_create2.py
+++ b/tests/ported_static/stStaticCall/test_static_call_create2.py
@@ -1,19 +1,24 @@
 """
-Test ported from static filler.
+Test_static_call_create2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callCreate2Filler.json
+state_tests/stStaticCall/static_callCreate2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,51 +27,49 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_callCreate2Filler.json"],
+    ["state_tests/stStaticCall/static_callCreate2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000001000000000000000000000000000000000000000",
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={
-                        0: 0x13136008B64FF592819B2FA6D43F2835C452020E,
-                        1: 1,
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000001000000000000000000000000000000000000001",
-            {
-                Address("0x1000000000000000000000000000000000000001"): Account(
-                    storage={0: 0x5DDDFCE53EE040D9EB21AFBC0AE1BB4DBB0BA643}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "0000000000000000000000001000000000000000000000000000000000000002",
-            {},
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call_create2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_call_create2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xA000000000000000000000000000000000000000)
+    contract_1 = Address(0x1000000000000000000000000000000000000000)
+    contract_2 = Address(0x1000000000000000000000000000000000000001)
+    contract_3 = Address(0x1000000000000000000000000000000000000002)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -77,120 +80,148 @@ def test_static_call_create2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CREATE 1 0 0) [[ 1 ]] (STATICCALL 300000 (SLOAD 0) 0 0 0 0) }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x1, offset=0x0, size=0x0)
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x493E0,
-                    address=Op.SLOAD(key=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALL 600000 (CALLDATALOAD 0) 0 0 0 0 0) }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x927C0,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
-    # {  (MSTORE 0 0x6460016001556000526005601bf3 ) [[ 0 ]] (CREATE 1 18 14) [[ 1 ]] (STATICCALL 300000 (SLOAD 0) 0 0 0 0) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
-            + Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x1, offset=0x12, size=0xE)
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x493E0,
-                    address=Op.SLOAD(key=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CREATE 1 0 0) [[ 1 ]] (STATICCALL 300000 (SLOAD 0) 0 0 0 0) }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.CREATE(value=0x1, offset=0x0, size=0x0)
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x493E0,
+                address=Op.SLOAD(key=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000001"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
-    # {  (MSTORE 0 0x6460016001556000526005601bf3 ) [[ 0 ]] (CREATE 1 18 14) [[ 1 ]] (STATICCALL 300000 (SLOAD 0) 0 0 0 0) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
-            + Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x1, offset=0x12, size=0xE)
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x493E0,
-                    address=Op.SLOAD(key=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x2F)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 0x6460016001556000526005601bf3 ) [[ 0 ]] (CREATE 1 18 14) [[ 1 ]] (STATICCALL 300000 (SLOAD 0) 0 0 0 0) }  # noqa: E501
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.SSTORE(key=0x0, value=Op.CREATE(value=0x1, offset=0x12, size=0xE))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x493E0,
+                address=Op.SLOAD(key=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000002"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000001),  # noqa: E501
     )
-    # Source: LLL
-    # {  (CALL 600000 (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x927C0,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=0x0,
+    # Source: lll
+    # {  (MSTORE 0 0x6460016001556000526005601bf3 ) [[ 0 ]] (CREATE 1 18 14) [[ 1 ]] (STATICCALL 300000 (SLOAD 0) 0 0 0 0) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x6460016001556000526005601BF3)
+        + Op.SSTORE(key=0x0, value=Op.CREATE(value=0x1, offset=0x12, size=0xE))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x493E0,
+                address=Op.SLOAD(key=0x0),
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x2F)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000002),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(
+                    storage={
+                        0: compute_create_address(address=contract_1, nonce=0),
+                        1: 1,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_2: Account(
+                    storage={
+                        0: compute_create_address(address=contract_2, nonce=0),
+                        1: 0,
+                    },
+                ),
+                compute_create_address(address=contract_2, nonce=0): Account(
+                    storage={}, code=bytes.fromhex("6001600155")
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 2, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 0, 1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(contract_1, left_padding=True),
+        Hash(contract_2, left_padding=True),
+        Hash(contract_3, left_padding=True),
+    ]
+    tx_gas = [1000000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1000000,
-        value=100000,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_create3.py b/tests/ported_static/stStaticCall/test_static_call_create3.py
index a0000b0f4da..9df3d855c26 100644
--- a/tests/ported_static/stStaticCall/test_static_call_create3.py
+++ b/tests/ported_static/stStaticCall/test_static_call_create3.py
@@ -1,19 +1,20 @@
 """
-Test ported from static filler.
+Test_static_call_create3.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callCreate3Filler.json
+state_tests/stStaticCall/static_callCreate3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,20 +23,20 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_callCreate3Filler.json"],
+    ["state_tests/stStaticCall/static_callCreate3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_create3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_call_create3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xA000000000000000000000000000000000000000)
+    contract_1 = Address(0x1000000000000000000000000000000000000000)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,70 +47,60 @@ def test_static_call_create3(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # {  (MSTORE 0 0x6d600060006000600030620186a0fa600052600e6012f3) [[ 0 ]] (CREATE 1 9 23)  [[ 1 ]] (STATICCALL 30000 (SLOAD 0) 0 0 0 0) [[ 2 ]] 1 }  # noqa: E501
-    callee = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x6D600060006000600030620186A0FA600052600E6012F3,
-            )
-            + Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x1, offset=0x9, size=0x17)
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x7530,
-                    address=Op.SLOAD(key=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALL 600000 (CALLDATALOAD 0) 0 0 0 0 0) }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x927C0,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
-    # {  (CALL 600000 (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x927C0,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=0x0,
+    # Source: lll
+    # {  (MSTORE 0 0x6d600060006000600030620186a0fa600052600e6012f3) [[ 0 ]] (CREATE 1 9 23)  [[ 1 ]] (STATICCALL 30000 (SLOAD 0) 0 0 0 0) [[ 2 ]] 1 }  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x6D600060006000600030620186A0FA600052600E6012F3
+        )
+        + Op.SSTORE(key=0x0, value=Op.CREATE(value=0x1, offset=0x9, size=0x17))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x7530,
+                address=Op.SLOAD(key=0x0),
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "0000000000000000000000001000000000000000000000000000000000000000"
-        ),
+        to=contract_0,
+        data=Hash(contract_1, left_padding=True),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        callee: Account(
+        contract_1: Account(
             storage={
-                0: 0x13136008B64FF592819B2FA6D43F2835C452020E,
+                0: compute_create_address(address=contract_1, nonce=0),
                 1: 1,
                 2: 1,
             },
diff --git a/tests/ported_static/stStaticCall/test_static_call_ecrecover0.py b/tests/ported_static/stStaticCall/test_static_call_ecrecover0.py
index a1d15d925bf..5ee180c5ce7 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ecrecover0.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ecrecover0.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ecrecover0.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallEcrecover0Filler.json
+state_tests/stStaticCall/static_CallEcrecover0Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,17 +23,18 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CallEcrecover0Filler.json"],
+    ["state_tests/stStaticCall/static_CallEcrecover0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ecrecover0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ecrecover0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -46,62 +48,52 @@ def test_static_call_ecrecover0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (STATICCALL 300000 1 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x493E0,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                1: 1,
-                2: 1,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={0: sender, 1: 1, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_ecrecover0_0input.py b/tests/ported_static/stStaticCall/test_static_call_ecrecover0_0input.py
index 238a15bc67f..3e8f4614d9f 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ecrecover0_0input.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ecrecover0_0input.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ecrecover0_0input.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallEcrecover0_0inputFiller.json
+state_tests/stStaticCall/static_CallEcrecover0_0inputFiller.json
 """
 
 import pytest
@@ -12,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,112 +27,80 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallEcrecover0_0inputFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallEcrecover0_0inputFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000",
-            {
-                Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"): Account(
-                    storage={2: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001",
-            {
-                Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"): Account(
-                    storage={2: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000002",
-            {
-                Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"): Account(
-                    storage={
-                        0: 0x8209944E898F69A7BD10A23C839D341E935FD5CA,
-                        2: 1,
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
         ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000003",
-            {
-                Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"): Account(
-                    storage={
-                        0: 0x4300A157335CB7C9FC9423E011D7DD51090D093F,
-                        2: 1,
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000004",
-            {
-                Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"): Account(
-                    storage={2: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000005",
-            {
-                Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"): Account(
-                    storage={2: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000006",
-            {
-                Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"): Account(
-                    storage={2: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000007",
-            {
-                Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"): Account(
-                    storage={2: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000008",
-            {},
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
     ],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call_ecrecover0_0input(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ecrecover0_0input."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -141,204 +114,90 @@ def test_static_call_ecrecover0_0input(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { [[ 2 ]] (STATICCALL 300000 (CALLDATALOAD 0) 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x493E0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x493E0,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"),  # noqa: E501
+        address=Address(0x1FD04A51AC69C94C58521D30E2DEFC4856A581B0),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
 
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=3652240,
-        value=100000,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallEcrecover0_0inputFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000",
-            {
-                Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"): Account(
-                    storage={2: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001",
-            {
-                Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"): Account(
-                    storage={2: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000002",
-            {
-                Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"): Account(
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 8, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={2: 0})},
+        },
+        {
+            "indexes": {"data": [0, 1, 4, 5, 6, 7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={2: 1})},
+        },
+        {
+            "indexes": {"data": 2, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
                     storage={
                         0: 0x8209944E898F69A7BD10A23C839D341E935FD5CA,
                         2: 1,
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000003",
-            {
-                Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"): Account(
+        },
+        {
+            "indexes": {"data": 3, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
                     storage={
                         0: 0x4300A157335CB7C9FC9423E011D7DD51090D093F,
                         2: 1,
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000004",
-            {
-                Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"): Account(
-                    storage={2: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000005",
-            {
-                Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"): Account(
-                    storage={2: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000006",
-            {
-                Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"): Account(
-                    storage={2: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000007",
-            {
-                Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"): Account(
-                    storage={2: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000008",
-            {},
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
-def test_static_call_ecrecover0_0input_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    # Source: LLL
-    # { [[ 2 ]] (STATICCALL 300000 (CALLDATALOAD 0) 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x493E0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
+                    },
                 ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.STOP
-        ),
-        balance=0x1312D00,
-        nonce=0,
-        address=Address("0x1fd04a51ac69c94c58521d30e2defc4856a581b0"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0x0),
+        Hash(0x1),
+        Hash(0x2),
+        Hash(0x3),
+        Hash(0x4),
+        Hash(0x5),
+        Hash(0x6),
+        Hash(0x7),
+        Hash(0x8),
+    ]
+    tx_gas = [3652240]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=3652240,
-        value=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_ecrecover0_complete_return_value.py b/tests/ported_static/stStaticCall/test_static_call_ecrecover0_complete_return_value.py
index d264d74cf11..15059991aec 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ecrecover0_complete_return_value.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ecrecover0_complete_return_value.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ecrecover0_complete_return_value.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallEcrecover0_completeReturnValueFiller.json
+state_tests/stStaticCall/static_CallEcrecover0_completeReturnValueFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,18 +24,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_CallEcrecover0_completeReturnValueFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_CallEcrecover0_completeReturnValueFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ecrecover0_complete_return_value(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ecrecover0_complete_return_value."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -49,57 +50,49 @@ def test_static_call_ecrecover0_complete_return_value(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (STATICCALL 13000 1 0 128 128 32) [[ 0 ]] (MLOAD 128) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x32C8,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x32C8,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                2: 1,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={0: sender, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_ecrecover0_gas2999.py b/tests/ported_static/stStaticCall/test_static_call_ecrecover0_gas2999.py
index 2dc12eb5baf..ce7ceef21ed 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ecrecover0_gas2999.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ecrecover0_gas2999.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_ecrecover0_gas2999.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallEcrecover0_Gas2999Filler.json
+state_tests/stStaticCall/static_CallEcrecover0_Gas2999Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallEcrecover0_Gas2999Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallEcrecover0_Gas2999Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ecrecover0_gas2999(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_ecrecover0_gas2999."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,54 +44,50 @@ def test_static_call_ecrecover0_gas2999(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (STATICCALL 2999 1 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0xBB7,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0xBB7,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xa2c5b42ceef52ed9fad58b7c78f1a9fde7241247"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={2: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_ecrecover0_gas3000.py b/tests/ported_static/stStaticCall/test_static_call_ecrecover0_gas3000.py
index 0c4a2d880f9..c95af7ecce3 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ecrecover0_gas3000.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ecrecover0_gas3000.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ecrecover0_gas3000.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallEcrecover0_gas3000Filler.json
+state_tests/stStaticCall/static_CallEcrecover0_gas3000Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +23,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallEcrecover0_gas3000Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallEcrecover0_gas3000Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ecrecover0_gas3000(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ecrecover0_gas3000."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,62 +48,52 @@ def test_static_call_ecrecover0_gas3000(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (STATICCALL 3000 1 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0xBB8,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0xBB8,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                1: 1,
-                2: 1,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={0: sender, 1: 1, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_ecrecover0_no_gas.py b/tests/ported_static/stStaticCall/test_static_call_ecrecover0_no_gas.py
index 0ee0807d2df..9857b5cc971 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ecrecover0_no_gas.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ecrecover0_no_gas.py
@@ -1,16 +1,15 @@
 """
-Test ported from static filler.
+Test_static_call_ecrecover0_no_gas.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallEcrecover0_NoGasFiller.json
+state_tests/stStaticCall/static_CallEcrecover0_NoGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
-    Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +21,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallEcrecover0_NoGasFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallEcrecover0_NoGasFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ecrecover0_no_gas(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_ecrecover0_no_gas."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,52 +43,48 @@ def test_static_call_ecrecover0_no_gas(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (STATICCALL 0 1 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x0,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x0,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x6231f5f50790a293b60749cf936c2f442d692bb4"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post: dict = {}
diff --git a/tests/ported_static/stStaticCall/test_static_call_ecrecover0_overlapping_input_output.py b/tests/ported_static/stStaticCall/test_static_call_ecrecover0_overlapping_input_output.py
index e0c1c7dbe32..b1c2bb72d51 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ecrecover0_overlapping_input_output.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ecrecover0_overlapping_input_output.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ecrecover0_overlapping_input_output.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallEcrecover0_overlappingInputOutputFiller.json
+state_tests/stStaticCall/static_CallEcrecover0_overlappingInputOutputFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,18 +24,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_CallEcrecover0_overlappingInputOutputFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_CallEcrecover0_overlappingInputOutputFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ecrecover0_overlapping_input_output(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ecrecover0_overlapping_input_output."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -49,62 +50,52 @@ def test_static_call_ecrecover0_overlapping_input_output(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (STATICCALL 300000 1 0 128 64 32) [[ 0 ]] (MOD (MLOAD 64) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x40,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x40), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x493E0,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x40,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x40), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                1: 1,
-                2: 1,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={0: sender, 1: 1, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_ecrecover1.py b/tests/ported_static/stStaticCall/test_static_call_ecrecover1.py
index 453329aa919..c6844562034 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ecrecover1.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ecrecover1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_ecrecover1.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallEcrecover1Filler.json
+state_tests/stStaticCall/static_CallEcrecover1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CallEcrecover1Filler.json"],
+    ["state_tests/stStaticCall/static_CallEcrecover1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ecrecover1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_ecrecover1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,56 +44,50 @@ def test_static_call_ecrecover1(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 1) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (STATICCALL 100000 1 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x618120f7c175e20b183addd8859095183359b357"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_ecrecover2.py b/tests/ported_static/stStaticCall/test_static_call_ecrecover2.py
index d63981460d3..29c1943b26d 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ecrecover2.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ecrecover2.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_ecrecover2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallEcrecover2Filler.json
+state_tests/stStaticCall/static_CallEcrecover2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CallEcrecover2Filler.json"],
+    ["state_tests/stStaticCall/static_CallEcrecover2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ecrecover2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_ecrecover2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,56 +44,50 @@ def test_static_call_ecrecover2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 33 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 65 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (STATICCALL 100000 1 0 97 97 32) [[ 0 ]] (MOD (MLOAD 97) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x21,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x41,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x61,
-                    ret_offset=0x61,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x61), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x21,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x41,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x61,
+                ret_offset=0x61,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x61), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x77c4dedd873bb751217a744a41ccc43a37e0859e"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_ecrecover3.py b/tests/ported_static/stStaticCall/test_static_call_ecrecover3.py
index 0425a495b48..eb69f789789 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ecrecover3.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ecrecover3.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ecrecover3.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallEcrecover3Filler.json
+state_tests/stStaticCall/static_CallEcrecover3Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,17 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CallEcrecover3Filler.json"],
+    ["state_tests/stStaticCall/static_CallEcrecover3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ecrecover3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ecrecover3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -46,56 +47,54 @@ def test_static_call_ecrecover3(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9) (MSTORE 32 27) (MSTORE 64 0x6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a) (MSTORE 96 0x37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4) [[ 2 ]] (STATICCALL 100000 1 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x2F380A2DEA7E778D81AFFC2443403B8FE4644DB442AE4862FF5BB3732829CDB9,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1B)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x6B65CCB0558806E9B097F27A396D08F964E37B8B7AF6CEEB516FF86739FBEA0A,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x37CBC8D883E129A4B1EF9D5F1DF53C4F21A3EF147CF2A50A4EDE0EB06CE092D4,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x2F380A2DEA7E778D81AFFC2443403B8FE4644DB442AE4862FF5BB3732829CDB9,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1B)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x6B65CCB0558806E9B097F27A396D08F964E37B8B7AF6CEEB516FF86739FBEA0A,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x37CBC8D883E129A4B1EF9D5F1DF53C4F21A3EF147CF2A50A4EDE0EB06CE092D4,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xc2f38613f26b4b1c6de179462718c7e67c175419"),  # noqa: E501
+        address=Address(0xC2F38613F26B4B1C6DE179462718C7E67C175419),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xE4319F4B631C6D0FCFC84045DBCB676865FE5E13,
                 2: 1,
diff --git a/tests/ported_static/stStaticCall/test_static_call_ecrecover80.py b/tests/ported_static/stStaticCall/test_static_call_ecrecover80.py
index e453a846dfd..28cd2eeb1d2 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ecrecover80.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ecrecover80.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_ecrecover80.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallEcrecover80Filler.json
+state_tests/stStaticCall/static_CallEcrecover80Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallEcrecover80Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallEcrecover80Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ecrecover80(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_ecrecover80."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,56 +44,50 @@ def test_static_call_ecrecover80(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x00c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x00b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0x00b940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (STATICCALL 300000 1 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xC547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xB1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xC547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xB1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x493E0,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xb04d781b56fba0546d9c9fd33c9fb623908d49d2"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 0, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_ecrecover_check_length.py b/tests/ported_static/stStaticCall/test_static_call_ecrecover_check_length.py
index d831dc361b6..9a13e86548e 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ecrecover_check_length.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ecrecover_check_length.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ecrecover_check_length.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallEcrecoverCheckLengthFiller.json
+state_tests/stStaticCall/static_CallEcrecoverCheckLengthFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,19 +23,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallEcrecoverCheckLengthFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallEcrecoverCheckLengthFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ecrecover_check_length(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ecrecover_check_length."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -49,63 +48,54 @@ def test_static_call_ecrecover_check_length(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 128 0x1122334455667788990011223344556677889900112233445566778899001122) (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (STATICCALL 300000 1 0 128 128 32) [[ 0 ]] (MLOAD 128) [[ 1 ]] (MSIZE) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x80,
-                value=0x1122334455667788990011223344556677889900112233445566778899001122,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
-            + Op.SSTORE(key=0x1, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x80,
+            value=0x1122334455667788990011223344556677889900112233445566778899001122,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x493E0,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
+        + Op.SSTORE(key=0x1, value=Op.MSIZE)
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                1: 160,
-                2: 1,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={0: sender, 1: 160, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_ecrecover_check_length_wrong_v.py b/tests/ported_static/stStaticCall/test_static_call_ecrecover_check_length_wrong_v.py
index 0263baf7a90..08b06436b82 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ecrecover_check_length_wrong_v.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ecrecover_check_length_wrong_v.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ecrecover_check_length_wrong_v.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallEcrecoverCheckLengthWrongVFiller.json
+state_tests/stStaticCall/static_CallEcrecoverCheckLengthWrongVFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,18 +24,18 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_CallEcrecoverCheckLengthWrongVFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_CallEcrecoverCheckLengthWrongVFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ecrecover_check_length_wrong_v(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ecrecover_check_length_wrong_v."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -49,57 +49,56 @@ def test_static_call_ecrecover_check_length_wrong_v(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 128 0x1122334455667788990011223344556677889900112233445566778899001122) (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 29) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (STATICCALL 300000 1 0 128 128 32) [[ 0 ]] (MLOAD 128) [[ 1 ]] (MSIZE) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x80,
-                value=0x1122334455667788990011223344556677889900112233445566778899001122,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1D)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
-            + Op.SSTORE(key=0x1, value=Op.MSIZE)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x80,
+            value=0x1122334455667788990011223344556677889900112233445566778899001122,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1D)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x493E0,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x80))
+        + Op.SSTORE(key=0x1, value=Op.MSIZE)
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x41f7ee7d96703a0f8bd1bf92288996596ca85bd6"),  # noqa: E501
+        address=Address(0x41F7EE7D96703A0F8BD1BF92288996596CA85BD6),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x1122334455667788990011223344556677889900112233445566778899001122,  # noqa: E501
                 1: 160,
diff --git a/tests/ported_static/stStaticCall/test_static_call_ecrecover_h_prefixed0.py b/tests/ported_static/stStaticCall/test_static_call_ecrecover_h_prefixed0.py
index c978c1ffa4c..be4fc0ca392 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ecrecover_h_prefixed0.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ecrecover_h_prefixed0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ecrecover_h_prefixed0.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallEcrecoverH_prefixed0Filler.json
+state_tests/stStaticCall/static_CallEcrecoverH_prefixed0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallEcrecoverH_prefixed0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallEcrecoverH_prefixed0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ecrecover_h_prefixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ecrecover_h_prefixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -50,57 +48,56 @@ def test_static_call_ecrecover_h_prefixed0(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x00c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (STATICCALL 300000 1 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xC547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xC547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x493E0,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xeeaa46c8d2b439bccc8ba7b735f1f68564c75801"),  # noqa: E501
+        address=Address(0xEEAA46C8D2B439BCCC8BA7B735F1F68564C75801),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xA0B29AF6A56D6CFEF6415CB195CCBE540E006D0A,
+                1: 0,
                 2: 1,
             },
         ),
diff --git a/tests/ported_static/stStaticCall/test_static_call_ecrecover_r_prefixed0.py b/tests/ported_static/stStaticCall/test_static_call_ecrecover_r_prefixed0.py
index d68e08de4d8..7fd5e2936e9 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ecrecover_r_prefixed0.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ecrecover_r_prefixed0.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_ecrecover_r_prefixed0.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallEcrecoverR_prefixed0Filler.json
+state_tests/stStaticCall/static_CallEcrecoverR_prefixed0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallEcrecoverR_prefixed0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallEcrecoverR_prefixed0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ecrecover_r_prefixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_ecrecover_r_prefixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,56 +44,50 @@ def test_static_call_ecrecover_r_prefixed0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x00b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (STATICCALL 300000 1 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0xB1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0xB1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x493E0,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x2e063e550f3f9751ef9eb0da5e2b392c3ece8e6e"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 0, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_ecrecover_s_prefixed0.py b/tests/ported_static/stStaticCall/test_static_call_ecrecover_s_prefixed0.py
index 81e83654dba..afba19f8745 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ecrecover_s_prefixed0.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ecrecover_s_prefixed0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ecrecover_s_prefixed0.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallEcrecoverS_prefixed0Filler.json
+state_tests/stStaticCall/static_CallEcrecoverS_prefixed0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallEcrecoverS_prefixed0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallEcrecoverS_prefixed0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ecrecover_s_prefixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ecrecover_s_prefixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -49,58 +47,57 @@ def test_static_call_ecrecover_s_prefixed0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0x00b940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (STATICCALL 300000 1 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x493E0,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x200ecc0698b28ef50ee8bf150b2d7a87ed969482"),  # noqa: E501
+        address=Address(0x200ECC0698B28EF50EE8BF150B2D7A87ED969482),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xB4950A7FAD428434B11C357FA6D4B4BCD3096A5D,
+                1: 0,
                 2: 1,
             },
         ),
diff --git a/tests/ported_static/stStaticCall/test_static_call_ecrecover_v_prefixed0.py b/tests/ported_static/stStaticCall/test_static_call_ecrecover_v_prefixed0.py
index 39122295e73..cd0496d97af 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ecrecover_v_prefixed0.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ecrecover_v_prefixed0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ecrecover_v_prefixed0.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallEcrecoverV_prefixed0Filler.json
+state_tests/stStaticCall/static_CallEcrecoverV_prefixed0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,19 +23,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallEcrecoverV_prefixed0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallEcrecoverV_prefixed0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ecrecover_v_prefixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ecrecover_v_prefixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -49,62 +48,52 @@ def test_static_call_ecrecover_v_prefixed0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 0x001c) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (STATICCALL 300000 1 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0))  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x80,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x493E0,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x80,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.MOD(Op.MLOAD(offset=0x80), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x1, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x0)))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=3652240,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                1: 1,
-                2: 1,
-            },
-        ),
-    }
+    post = {contract_0: Account(storage={0: sender, 1: 1, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_goes_oog_on_second_level.py b/tests/ported_static/stStaticCall/test_static_call_goes_oog_on_second_level.py
index 9a0c8fc768e..c9bfd6ecd1b 100644
--- a/tests/ported_static/stStaticCall/test_static_call_goes_oog_on_second_level.py
+++ b/tests/ported_static/stStaticCall/test_static_call_goes_oog_on_second_level.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_goes_oog_on_second_level.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallGoesOOGOnSecondLevelFiller.json
+state_tests/stStaticCall/static_CallGoesOOGOnSecondLevelFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallGoesOOGOnSecondLevelFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallGoesOOGOnSecondLevelFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_goes_oog_on_second_level(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_static_call_goes_oog_on_second_level."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,59 +44,60 @@ def test_static_call_goes_oog_on_second_level(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (KECCAK256 0x00 0x2fffff) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SHA3(offset=0x0, size=0x2FFFFF) + Op.STOP,
         nonce=0,
-        address=Address("0x44969261d9660fcc1a2e03db83ba372ebf5f652d"),  # noqa: E501
     )
-    # Source: LLL
-    # { (SSTORE 9 (STATICCALL 600000 <contract:0x1000000000000000000000000000000000000110> 0 0 0 0)) [[ 10 ]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x9,
-                value=Op.STATICCALL(
-                    gas=0x927C0,
-                    address=0xA1202B00F0CB8ACDD112E4FC87899F33572541C6,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0xA, value=Op.GAS)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 8 (GAS)) (MSTORE 9 (STATICCALL 600000 <contract:0x1000000000000000000000000000000000000111> 0 0 0 0)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x8, value=Op.GAS)
+        + Op.MSTORE(
+            offset=0x9,
+            value=Op.STATICCALL(
+                gas=0x927C0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6a2a170a903e470c3dd8bfd7974c77020c5fd8f9"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x8, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0x9,
-                value=Op.STATICCALL(
-                    gas=0x927C0,
-                    address=0x44969261D9660FCC1A2E03DB83BA372EBF5F652D,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 9 (STATICCALL 600000 <contract:0x1000000000000000000000000000000000000110> 0 0 0 0)) [[ 10 ]] (GAS) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x9,
+            value=Op.STATICCALL(
+                gas=0x927C0,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0xA, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa1202b00f0cb8acdd112e4fc87899f33572541c6"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=220000,
     )
 
-    post: dict = {}
+    post = {
+        addr: Account(storage={}),
+        addr_2: Account(storage={}),
+        target: Account(storage={}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_goes_oog_on_second_level2.py b/tests/ported_static/stStaticCall/test_static_call_goes_oog_on_second_level2.py
index 758d419dd06..62ed98b8dc7 100644
--- a/tests/ported_static/stStaticCall/test_static_call_goes_oog_on_second_level2.py
+++ b/tests/ported_static/stStaticCall/test_static_call_goes_oog_on_second_level2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_call_goes_oog_on_second_level2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallGoesOOGOnSecondLevel2Filler.json
+state_tests/stStaticCall/static_CallGoesOOGOnSecondLevel2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,31 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallGoesOOGOnSecondLevel2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallGoesOOGOnSecondLevel2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000f2774cee95a518a51cd32426d3ce8db19f095b37",
-        "00000000000000000000000045e70d14d712a8898dce133fe063f71179f04059",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call_goes_oog_on_second_level2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_static_call_goes_oog_on_second_level2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,79 +66,81 @@ def test_static_call_goes_oog_on_second_level2(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 8 (GAS)) (MSTORE 9 (STATICCALL 600000 (CALLDATALOAD 0) 0 0 0 0)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x8, value=Op.GAS)
+        + Op.MSTORE(
+            offset=0x9,
+            value=Op.STATICCALL(
+                gas=0x927C0,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x45e70d14d712a8898dce133fe063f71179f04059"),  # noqa: E501
+        address=Address(0x666EBB8AFC7A9BA4BEDB7D78F85184B65639531D),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x8, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0x9,
-                value=Op.STATICCALL(
-                    gas=0x927C0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 1 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x666ebb8afc7a9ba4bedb7d78f85184b65639531d"),  # noqa: E501
+        address=Address(0xF2774CEE95A518A51CD32426D3CE8DB19F095B37),  # noqa: E501
     )
-    # Source: LLL
-    # { (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 600000 <contract:0x1000000000000000000000000000000000000113> 0 32 0 0) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x927C0,
-                    address=0x666EBB8AFC7A9BA4BEDB7D78F85184B65639531D,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1))  }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb9c1c6c39cb3e528b2ef06493c17d63b7827077b"),  # noqa: E501
+        address=Address(0x45E70D14D712A8898DCE133FE063F71179F04059),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x1) + Op.STOP,
+    # Source: lll
+    # { (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 600000 <contract:0x1000000000000000000000000000000000000113> 0 32 0 0) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x927C0,
+                address=0x666EBB8AFC7A9BA4BEDB7D78F85184B65639531D,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf2774cee95a518a51cd32426d3ce8db19f095b37"),  # noqa: E501
+        address=Address(0xB9C1C6C39CB3E528B2EF06493C17D63B7827077B),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [160000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=160000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0, 1: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_identitiy_1.py b/tests/ported_static/stStaticCall/test_static_call_identitiy_1.py
index 62d7ca98044..69543edfe7d 100644
--- a/tests/ported_static/stStaticCall/test_static_call_identitiy_1.py
+++ b/tests/ported_static/stStaticCall/test_static_call_identitiy_1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_identitiy_1.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallIdentitiy_1Filler.json
+state_tests/stStaticCall/static_CallIdentitiy_1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallIdentitiy_1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallIdentitiy_1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_identitiy_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_identitiy_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,39 +44,34 @@ def test_static_call_identitiy_1(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 2 ]] (STATICCALL 500 4 0 0 0 32) [[ 0 ]] (MLOAD 0)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x1F4,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x1F4,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x93d25ce7c8af6cace03dcb393962cb32ba8d4f42"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={0: 0, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_identity_1_nonzero_value.py b/tests/ported_static/stStaticCall/test_static_call_identity_1_nonzero_value.py
index 3f8a3fa010e..3b572358cc7 100644
--- a/tests/ported_static/stStaticCall/test_static_call_identity_1_nonzero_value.py
+++ b/tests/ported_static/stStaticCall/test_static_call_identity_1_nonzero_value.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_identity_1_nonzero_value.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallIdentity_1_nonzeroValueFiller.json
+state_tests/stStaticCall/static_CallIdentity_1_nonzeroValueFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallIdentity_1_nonzeroValueFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallIdentity_1_nonzeroValueFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_identity_1_nonzero_value(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_identity_1_nonzero_value."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -49,50 +47,52 @@ def test_static_call_identity_1_nonzero_value(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { [[ 2 ]] (STATICCALL 200000 4 0 0 0 32) (CALL 50000 4 0x13 0 0 0 0) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x30D40,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x4,
-                    value=0x13,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x30D40,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x4,
+                value=0x13,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xBEBC200,
         nonce=0,
-        address=Address("0x07f023a2418eb0dc955c465d7e5ef48189f005be"),  # noqa: E501
+        address=Address(0x07F023A2418EB0DC955C465D7E5EF48189F005BE),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={2: 1}),
+        Address(0x0000000000000000000000000000000000000004): Account(
+            balance=19
+        ),
+        target: Account(storage={0: 0, 2: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_identity_2.py b/tests/ported_static/stStaticCall/test_static_call_identity_2.py
index 043bd7cf18a..31dce0ef656 100644
--- a/tests/ported_static/stStaticCall/test_static_call_identity_2.py
+++ b/tests/ported_static/stStaticCall/test_static_call_identity_2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_identity_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallIdentity_2Filler.json
+state_tests/stStaticCall/static_CallIdentity_2Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,17 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CallIdentity_2Filler.json"],
+    ["state_tests/stStaticCall/static_CallIdentity_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_identity_2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_identity_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -46,40 +47,37 @@ def test_static_call_identity_2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xf34578907f) [[ 2 ]] (STATICCALL 500 4 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x1F4,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x1F4,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xc23a3b84d36d8d9d3d045162c4c153465de4816c"),  # noqa: E501
+        address=Address(0xC23A3B84D36D8D9D3D045162C4C153465DE4816C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 0xF34578907F, 2: 1}),
-    }
+    post = {target: Account(storage={0: 0xF34578907F, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_identity_3.py b/tests/ported_static/stStaticCall/test_static_call_identity_3.py
index b225b479e85..57753b43a4b 100644
--- a/tests/ported_static/stStaticCall/test_static_call_identity_3.py
+++ b/tests/ported_static/stStaticCall/test_static_call_identity_3.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_identity_3.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallIdentity_3Filler.json
+state_tests/stStaticCall/static_CallIdentity_3Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,17 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CallIdentity_3Filler.json"],
+    ["state_tests/stStaticCall/static_CallIdentity_3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_identity_3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_identity_3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -46,40 +47,37 @@ def test_static_call_identity_3(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xf34578907f) [[ 2 ]] (STATICCALL 500 4 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x1F4,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x1F4,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xc23a3b84d36d8d9d3d045162c4c153465de4816c"),  # noqa: E501
+        address=Address(0xC23A3B84D36D8D9D3D045162C4C153465DE4816C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 0xF34578907F, 2: 1}),
-    }
+    post = {target: Account(storage={0: 0xF34578907F, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_identity_4.py b/tests/ported_static/stStaticCall/test_static_call_identity_4.py
index b43848f85fa..dd549863976 100644
--- a/tests/ported_static/stStaticCall/test_static_call_identity_4.py
+++ b/tests/ported_static/stStaticCall/test_static_call_identity_4.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_identity_4.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallIdentity_4Filler.json
+state_tests/stStaticCall/static_CallIdentity_4Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,17 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CallIdentity_4Filler.json"],
+    ["state_tests/stStaticCall/static_CallIdentity_4Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_identity_4(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_identity_4."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -46,43 +47,42 @@ def test_static_call_identity_4(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (STATICCALL 100 4 0 32 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x64,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x64,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x1e23b8487de5c16b372f0abe69d7c9d57118defd"),  # noqa: E501
+        address=Address(0x1E23B8487DE5C16B372F0ABE69D7C9D57118DEFD),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stStaticCall/test_static_call_identity_4_gas17.py b/tests/ported_static/stStaticCall/test_static_call_identity_4_gas17.py
index afed92ae708..1cee3493e76 100644
--- a/tests/ported_static/stStaticCall/test_static_call_identity_4_gas17.py
+++ b/tests/ported_static/stStaticCall/test_static_call_identity_4_gas17.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_identity_4_gas17.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallIdentity_4_gas17Filler.json
+state_tests/stStaticCall/static_CallIdentity_4_gas17Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallIdentity_4_gas17Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallIdentity_4_gas17Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_identity_4_gas17(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_identity_4_gas17."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,45 +47,45 @@ def test_static_call_identity_4_gas17(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (STATICCALL 17 4 0 32 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x11,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x11,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x23ef65623397a46f452ada1dc7e9f974b028ad46"),  # noqa: E501
+        address=Address(0x23EF65623397A46F452ADA1DC7E9F974B028AD46),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                2: 0,
             },
         ),
     }
diff --git a/tests/ported_static/stStaticCall/test_static_call_identity_4_gas18.py b/tests/ported_static/stStaticCall/test_static_call_identity_4_gas18.py
index f44ba9ee6a9..cc67adad4e3 100644
--- a/tests/ported_static/stStaticCall/test_static_call_identity_4_gas18.py
+++ b/tests/ported_static/stStaticCall/test_static_call_identity_4_gas18.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_identity_4_gas18.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallIdentity_4_gas18Filler.json
+state_tests/stStaticCall/static_CallIdentity_4_gas18Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallIdentity_4_gas18Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallIdentity_4_gas18Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_identity_4_gas18(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_identity_4_gas18."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,43 +47,42 @@ def test_static_call_identity_4_gas18(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (STATICCALL 18 4 0 32 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x12,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x12,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x3b631e26eb9003c05e06782820db8893b7c864df"),  # noqa: E501
+        address=Address(0x3B631E26EB9003C05E06782820DB8893B7C864DF),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stStaticCall/test_static_call_identity_5.py b/tests/ported_static/stStaticCall/test_static_call_identity_5.py
index 49cff8b4b9f..70b71f555ee 100644
--- a/tests/ported_static/stStaticCall/test_static_call_identity_5.py
+++ b/tests/ported_static/stStaticCall/test_static_call_identity_5.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_identity_5.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallIdentity_5Filler.json
+state_tests/stStaticCall/static_CallIdentity_5Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,17 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CallIdentity_5Filler.json"],
+    ["state_tests/stStaticCall/static_CallIdentity_5Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_identity_5(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_identity_5."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -46,43 +47,42 @@ def test_static_call_identity_5(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (STATICCALL 600 4 0 1000000 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x258,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0xF4240,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x258,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0xF4240,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xe916a006634545dcd9a7df166a5da16ed90148b0"),  # noqa: E501
+        address=Address(0xE916A006634545DCD9A7DF166A5DA16ED90148B0),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
diff --git a/tests/ported_static/stStaticCall/test_static_call_lose_gas_oog.py b/tests/ported_static/stStaticCall/test_static_call_lose_gas_oog.py
index 6ae2427ddfc..da74a333e31 100644
--- a/tests/ported_static/stStaticCall/test_static_call_lose_gas_oog.py
+++ b/tests/ported_static/stStaticCall/test_static_call_lose_gas_oog.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_lose_gas_oog.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallLoseGasOOGFiller.json
+state_tests/stStaticCall/static_CallLoseGasOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,21 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CallLoseGasOOGFiller.json"],
+    ["state_tests/stStaticCall/static_CallLoseGasOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_lose_gas_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    """Test_static_call_lose_gas_oog."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,44 +44,39 @@ def test_static_call_lose_gas_oog(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
     # { [[ 0 ]] (ADD @@0 1) [[ 1 ]] (STATICCALL (ADD 1(MUL @@0 100000)) <contract:target:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[ 2 ]] (ADD 1(MUL @@0 1000)) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x186A0)),
-                    address=0x7F04B68576FC8573ABDC49251B804F6CB44617CE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8)),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x186A0)),
+                address=0x7F04B68576FC8573ABDC49251B804F6CB44617CE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2, value=Op.ADD(0x1, Op.MUL(Op.SLOAD(key=0x0), 0x3E8))
+        )
+        + Op.STOP,
         balance=1024,
         nonce=0,
-        address=Address("0x7f04b68576fc8573abdc49251b804f6cb44617ce"),  # noqa: E501
+        address=Address(0x7F04B68576FC8573ABDC49251B804F6CB44617CE),  # noqa: E501
     )
-    pre[callee] = Account(balance=7000, nonce=0)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=200000,
         value=10,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 2: 1001}),
-    }
+    post = {target: Account(storage={0: 1, 2: 1001})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_one_v_call_suicide.py b/tests/ported_static/stStaticCall/test_static_call_one_v_call_suicide.py
index ec7a01fbc26..dbf7225d7e6 100644
--- a/tests/ported_static/stStaticCall/test_static_call_one_v_call_suicide.py
+++ b/tests/ported_static/stStaticCall/test_static_call_one_v_call_suicide.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_one_v_call_suicide.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CALL_OneVCallSuicideFiller.json
+state_tests/stStaticCall/static_CALL_OneVCallSuicideFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CALL_OneVCallSuicideFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CALL_OneVCallSuicideFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_one_v_call_suicide(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_static_call_one_v_call_suicide."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,47 +44,48 @@ def test_static_call_one_v_call_suicide(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[1]](STATICCALL 60000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[100]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0xEA60,
-                    address=0x9EB21FC7FD6DB177A8AAEFB4FB2289D2B31C8ED5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0xEA60,
+                address=0x9EB21FC7FD6DB177A8AAEFB4FB2289D2B31C8ED5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=0x1)
+        + Op.STOP,
         balance=100,
         nonce=0,
-        address=Address("0x8cb4cc1396942231551322a3ba85da94c3b1ec16"),  # noqa: E501
+        address=Address(0x8CB4CC1396942231551322A3BA85DA94C3B1EC16),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x8CB4CC1396942231551322A3BA85DA94C3B1EC16)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x8CB4CC1396942231551322A3BA85DA94C3B1EC16
+        )
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x9eb21fc7fd6db177a8aaefb4fb2289d2b31c8ed5"),  # noqa: E501
+        address=Address(0x9EB21FC7FD6DB177A8AAEFB4FB2289D2B31C8ED5),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={100: 1}),
+        addr: Account(balance=1),
+        target: Account(storage={1: 0, 100: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_oog_additional_gas_costs1.py b/tests/ported_static/stStaticCall/test_static_call_oog_additional_gas_costs1.py
index 2489aa67b48..2d1f355c82b 100644
--- a/tests/ported_static/stStaticCall/test_static_call_oog_additional_gas_costs1.py
+++ b/tests/ported_static/stStaticCall/test_static_call_oog_additional_gas_costs1.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_oog_additional_gas_costs1.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_call_OOG_additionalGasCosts1Filler.json
+state_tests/stStaticCall/static_call_OOG_additionalGasCosts1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_call_OOG_additionalGasCosts1Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_call_OOG_additionalGasCosts1Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_oog_additional_gas_costs1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_oog_additional_gas_costs1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,36 +46,33 @@ def test_static_call_oog_additional_gas_costs1(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 6000 0x1000000000000000000000000000000000000001 0 64 0 64 ) [[ 1 ]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x1770,
-                    address=0x1000000000000000000000000000000000000001,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x1770,
+                address=0x1000000000000000000000000000000000000001,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe5625454dfc66a8dcc86f028c5f5ab384f2e8cc3"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=30000,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_oog_additional_gas_costs2_paris.py b/tests/ported_static/stStaticCall/test_static_call_oog_additional_gas_costs2_paris.py
index 294bda69bcc..82f93e20b98 100644
--- a/tests/ported_static/stStaticCall/test_static_call_oog_additional_gas_costs2_paris.py
+++ b/tests/ported_static/stStaticCall/test_static_call_oog_additional_gas_costs2_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_oog_additional_gas_costs2_paris.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_call_OOG_additionalGasCosts2_ParisFiller.json
+state_tests/stStaticCall/static_call_OOG_additionalGasCosts2_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,22 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_call_OOG_additionalGasCosts2_ParisFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_call_OOG_additionalGasCosts2_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_oog_additional_gas_costs2_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_static_call_oog_additional_gas_costs2_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -50,37 +46,37 @@ def test_static_call_oog_additional_gas_costs2_paris(
         gas_limit=3000000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
     # { [[ 0 ]] (STATICCALL 6000 <eoa:0x1000000000000000000000000000000000000001> 0 64 0 64 )  [[ 1 ]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x1770,
-                    address=0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x1770,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb836bad7c1ae4c13ac3cbec9a4445ea8b80e3a31"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=30000,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={}),
+        addr: Account(balance=10),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_output1.py b/tests/ported_static/stStaticCall/test_static_call_output1.py
index 72d71f25a95..eb4e4be0b7c 100644
--- a/tests/ported_static/stStaticCall/test_static_call_output1.py
+++ b/tests/ported_static/stStaticCall/test_static_call_output1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_output1.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callOutput1Filler.json
+state_tests/stStaticCall/static_callOutput1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,17 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_callOutput1Filler.json"],
+    ["state_tests/stStaticCall/static_callOutput1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_output1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_output1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -47,48 +48,48 @@ def test_static_call_output1(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (STATICCALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0) [[ 0 ]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0xBCC1197CCD23A97607F2F96D031F3432E0D16A02,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x6001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9c450200c431343e91665596bd7f249469f3823a"),  # noqa: E501
+        address=Address(0xBCC1197CCD23A97607F2F96D031F3432E0D16A02),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
+    # Source: lll
+    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (STATICCALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0) [[ 0 ]] (MLOAD 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
+        address=Address(0x9C450200C431343E91665596BD7F249469F3823A),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
diff --git a/tests/ported_static/stStaticCall/test_static_call_output2.py b/tests/ported_static/stStaticCall/test_static_call_output2.py
index 14f691b24f8..040fd1e0cc5 100644
--- a/tests/ported_static/stStaticCall/test_static_call_output2.py
+++ b/tests/ported_static/stStaticCall/test_static_call_output2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_output2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callOutput2Filler.json
+state_tests/stStaticCall/static_callOutput2Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,17 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_callOutput2Filler.json"],
+    ["state_tests/stStaticCall/static_callOutput2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_output2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_output2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -46,49 +47,49 @@ def test_static_call_output2(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (STATICCALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 32 0 0) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0xBCC1197CCD23A97607F2F96D031F3432E0D16A02,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x6001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0cc5226eea92a2af2f4f36413737f04f984c43a7"),  # noqa: E501
+        address=Address(0xBCC1197CCD23A97607F2F96D031F3432E0D16A02),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
+    # Source: lll
+    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (STATICCALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 32 0 0) [[ 0 ]] (MLOAD 0)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
+        address=Address(0x0CC5226EEA92A2AF2F4F36413737F04F984C43A7),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
diff --git a/tests/ported_static/stStaticCall/test_static_call_output3.py b/tests/ported_static/stStaticCall/test_static_call_output3.py
index be560294ca2..42e1f2232bd 100644
--- a/tests/ported_static/stStaticCall/test_static_call_output3.py
+++ b/tests/ported_static/stStaticCall/test_static_call_output3.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_output3.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callOutput3Filler.json
+state_tests/stStaticCall/static_callOutput3Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,17 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_callOutput3Filler.json"],
+    ["state_tests/stStaticCall/static_callOutput3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_output3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_output3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -47,48 +48,48 @@ def test_static_call_output3(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (STATICCALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0xBCC1197CCD23A97607F2F96D031F3432E0D16A02,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x6001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x70663c1333ecbaea42f33ab4ec9bb647c794bfcd"),  # noqa: E501
+        address=Address(0xBCC1197CCD23A97607F2F96D031F3432E0D16A02),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
+    # Source: lll
+    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (STATICCALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
+        address=Address(0x70663C1333ECBAEA42F33AB4EC9BB647C794BFCD),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
diff --git a/tests/ported_static/stStaticCall/test_static_call_output3_fail.py b/tests/ported_static/stStaticCall/test_static_call_output3_fail.py
index 56b5bf4855b..a5dfaea9b35 100644
--- a/tests/ported_static/stStaticCall/test_static_call_output3_fail.py
+++ b/tests/ported_static/stStaticCall/test_static_call_output3_fail.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_output3_fail.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callOutput3FailFiller.json
+state_tests/stStaticCall/static_callOutput3FailFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callOutput3FailFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callOutput3FailFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_output3_fail(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_output3_fail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -49,48 +48,48 @@ def test_static_call_output3_fail(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (STATICCALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x834ABC2C68C5F44EA9AE82B67AAF92044901CDC6,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x016001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.ADD + Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x70663c1333ecbaea42f33ab4ec9bb647c794bfcd"),  # noqa: E501
+        address=Address(0x834ABC2C68C5F44EA9AE82B67AAF92044901CDC6),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.ADD + Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
+    # Source: lll
+    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (STATICCALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x834abc2c68c5f44ea9ae82b67aaf92044901cdc6"),  # noqa: E501
+        address=Address(0x70663C1333ECBAEA42F33AB4EC9BB647C794BFCD),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
diff --git a/tests/ported_static/stStaticCall/test_static_call_output3partial.py b/tests/ported_static/stStaticCall/test_static_call_output3partial.py
index dc9bc054b76..e480e7984f5 100644
--- a/tests/ported_static/stStaticCall/test_static_call_output3partial.py
+++ b/tests/ported_static/stStaticCall/test_static_call_output3partial.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_output3partial.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callOutput3partialFiller.json
+state_tests/stStaticCall/static_callOutput3partialFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callOutput3partialFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callOutput3partialFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_output3partial(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_output3partial."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -49,48 +48,48 @@ def test_static_call_output3partial(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (STATICCALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 10) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0xBCC1197CCD23A97607F2F96D031F3432E0D16A02,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0xA,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x6001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa4216cfba09e812ce041c734f1a2f266cb02b02d"),  # noqa: E501
+        address=Address(0xBCC1197CCD23A97607F2F96D031F3432E0D16A02),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
+    # Source: lll
+    # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (STATICCALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 10) [[ 0 ]] (MLOAD 0)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0xA,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbcc1197ccd23a97607f2f96d031f3432e0d16a02"),  # noqa: E501
+        address=Address(0xA4216CFBA09E812CE041C734F1A2F266CB02B02D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
diff --git a/tests/ported_static/stStaticCall/test_static_call_output3partial_fail.py b/tests/ported_static/stStaticCall/test_static_call_output3partial_fail.py
index 109b67ac156..780dc6dbf1c 100644
--- a/tests/ported_static/stStaticCall/test_static_call_output3partial_fail.py
+++ b/tests/ported_static/stStaticCall/test_static_call_output3partial_fail.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_output3partial_fail.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callOutput3partialFailFiller.json
+state_tests/stStaticCall/static_callOutput3partialFailFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callOutput3partialFailFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callOutput3partialFailFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_output3partial_fail(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_output3partial_fail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
     )
@@ -49,48 +48,48 @@ def test_static_call_output3partial_fail(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x016001600101600055
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.ADD + Op.SSTORE(key=0x0, value=Op.ADD(0x1, 0x1)),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x834abc2c68c5f44ea9ae82b67aaf92044901cdc6"),  # noqa: E501
+        address=Address(0x834ABC2C68C5F44EA9AE82B67AAF92044901CDC6),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6) (STATICCALL 50000 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 10) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0xA,
             )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x834ABC2C68C5F44EA9AE82B67AAF92044901CDC6,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0xA,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa4216cfba09e812ce041c734f1a2f266cb02b02d"),  # noqa: E501
+        address=Address(0xA4216CFBA09E812CE041C734F1A2F266CB02B02D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x5E20A0453CECD065EA59C37AC63E079EE08998B6045136A8CE6635C7912EC0B6,  # noqa: E501
             },
diff --git a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb0.py b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb0.py
index 2ce79a0f3ef..657e3514442 100644
--- a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb0.py
+++ b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb0.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_recursive_bomb0.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallRecursiveBomb0Filler.json
+state_tests/stStaticCall/static_CallRecursiveBomb0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,23 +22,19 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallRecursiveBomb0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallRecursiveBomb0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_recursive_bomb0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_recursive_bomb0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,56 +45,53 @@ def test_static_call_recursive_bomb0(
         gas_limit=100000000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (STATICCALL 100000000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0)  [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x5F5E100,
-                    address=0xC2641F62F868340A29AFB342ECBE22936A4336AE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0x77359400,
+    # Source: lll
+    # { (MSTORE 0 (+ (MLOAD 0) 1)) (STATICCALL (- (GAS) 11000) (ADDRESS) 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0x2AF8),
+            address=Op.ADDRESS,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa8f75b202dba133e3184b84520cf27623e8c993f"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
-            + Op.STATICCALL(
-                gas=Op.SUB(Op.GAS, 0x2AF8),
-                address=Op.ADDRESS,
+    # Source: lll
+    # { [[ 0 ]] (STATICCALL 100000000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0)  [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x5F5E100,
+                address=addr,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0x77359400,
         nonce=0,
-        address=Address("0xc2641f62f868340a29afb342ecbe22936a4336ae"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        sender: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb0_oog_at_max_call_depth.py b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb0_oog_at_max_call_depth.py
index d89f2cb3719..0d65d75e520 100644
--- a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb0_oog_at_max_call_depth.py
+++ b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb0_oog_at_max_call_depth.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_recursive_bomb0_oog_at_max_call_depth.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json
+state_tests/stStaticCall/static_CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,22 +23,20 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_recursive_bomb0_oog_at_max_call_depth(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_recursive_bomb0_oog_at_max_call_depth."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -50,66 +47,58 @@ def test_static_call_recursive_bomb0_oog_at_max_call_depth(
         gas_limit=110000000000,
     )
 
-    # Source: LLL
-    # { (CALLCODE (GAS) <contract:0x095e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 0) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0xBB09BB747BB11897420C59CACB65853142C67BB7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 (+ (SLOAD 0) 1)) (MSTORE 2 (MUL (DIV (MLOAD 0) 0x0402) 0xfffffffffffffffffff)) (STATICCALL (- (GAS) 1024) (ADDRESS) 0 (MUL (DIV (MLOAD 0) 0x0402) 0xfffffffffffffffffff) 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.MSTORE(
+            offset=0x2,
+            value=Op.MUL(
+                Op.DIV(Op.MLOAD(offset=0x0), 0x402), 0xFFFFFFFFFFFFFFFFFFF
+            ),
+        )
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0x400),
+            address=Op.ADDRESS,
+            args_offset=0x0,
+            args_size=Op.MUL(
+                Op.DIV(Op.MLOAD(offset=0x0), 0x402), 0xFFFFFFFFFFFFFFFFFFF
+            ),
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x4a20a569d7008020c8cd630cff560f3e627522d3"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.MSTORE(
-                offset=0x2,
-                value=Op.MUL(
-                    Op.DIV(Op.MLOAD(offset=0x0), 0x402),
-                    0xFFFFFFFFFFFFFFFFFFF,
-                ),
-            )
-            + Op.STATICCALL(
-                gas=Op.SUB(Op.GAS, 0x400),
-                address=Op.ADDRESS,
+    # Source: lll
+    # { (CALLCODE (GAS) <contract:0x095e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 0) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=Op.GAS,
+                address=addr,
+                value=0x0,
                 args_offset=0x0,
-                args_size=Op.MUL(
-                    Op.DIV(Op.MLOAD(offset=0x0), 0x402),
-                    0xFFFFFFFFFFFFFFFFFFF,
-                ),
+                args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xbb09bb747bb11897420c59cacb65853142c67bb7"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb1.py b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb1.py
index 3567de66944..cf3f30a8c2a 100644
--- a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb1.py
+++ b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_recursive_bomb1.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallRecursiveBomb1Filler.json
+state_tests/stStaticCall/static_CallRecursiveBomb1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,23 +22,19 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallRecursiveBomb1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallRecursiveBomb1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_recursive_bomb1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_recursive_bomb1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,56 +45,50 @@ def test_static_call_recursive_bomb1(
         gas_limit=100000000,
     )
 
-    # Source: LLL
-    # {  (CALLCODE (GAS) <contract:0x095e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 0) [[ 1 ]] 1  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0xCF55FF2B7D15859F0CEA76885B2D9E850D7DCACD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 (+ (MLOAD 0) 1))  (STATICCALL (- (GAS) 15000) (ADDRESS) 0 0 0 0)  }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0x3A98),
+            address=Op.ADDRESS,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x3134aac90d2474f00108572cb10ad2de05bfa7ee"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
-            + Op.STATICCALL(
-                gas=Op.SUB(Op.GAS, 0x3A98),
-                address=Op.ADDRESS,
+    # Source: lll
+    # {  (CALLCODE (GAS) <contract:0x095e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 0) [[ 1 ]] 1  }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=Op.GAS,
+                address=addr,
+                value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xcf55ff2b7d15859f0cea76885b2d9e850d7dcacd"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=20622100,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb2.py b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb2.py
index 192e104dce9..751b3586db1 100644
--- a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb2.py
+++ b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb2.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_recursive_bomb2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallRecursiveBomb2Filler.json
+state_tests/stStaticCall/static_CallRecursiveBomb2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,23 +22,19 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallRecursiveBomb2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallRecursiveBomb2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_recursive_bomb2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_recursive_bomb2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,57 +45,51 @@ def test_static_call_recursive_bomb2(
         gas_limit=100000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
-            + Op.STATICCALL(
-                gas=Op.SUB(Op.GAS, 0x3A98),
-                address=Op.ADDRESS,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 (+ (MLOAD 0) 1))  (STATICCALL (- (GAS) 15000) (ADDRESS) 0 0 0 0)  }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0x3A98),
+            address=Op.ADDRESS,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xcf55ff2b7d15859f0cea76885b2d9e850d7dcacd"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE (GAS) <contract:0x095e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 0) [[ 1 ]] 1}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0xCF55FF2B7D15859F0CEA76885B2D9E850D7DCACD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xfb952c049826590f07bee2f88274adf6c4724a6c"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=20622099,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb3.py b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb3.py
index 02802066721..352dacad6d4 100644
--- a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb3.py
+++ b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb3.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_recursive_bomb3.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallRecursiveBomb3Filler.json
+state_tests/stStaticCall/static_CallRecursiveBomb3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallRecursiveBomb3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallRecursiveBomb3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_recursive_bomb3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_recursive_bomb3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,57 +44,51 @@ def test_static_call_recursive_bomb3(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE ( - (GAS) 100000) <contract:0x095e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 0) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=Op.SUB(Op.GAS, 0x186A0),
-                    address=0xDA47DB5B3761AED22B9F70AEDAA7D54C5E340CC5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 (+ (SLOAD 0) 1)) (STATICCALL (- (GAS) 224) (ADDRESS) 0 0 0 0)  }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0xE0),
+            address=Op.ADDRESS,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xb5347f5cfb7bf5da15162fb6d93a36b5cb3f4fa9"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.STATICCALL(
-                gas=Op.SUB(Op.GAS, 0xE0),
-                address=Op.ADDRESS,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE ( - (GAS) 100000) <contract:0x095e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 0) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=Op.SUB(Op.GAS, 0x186A0),
+                address=addr,
+                value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xda47db5b3761aed22b9f70aedaa7d54c5e340cc5"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb_log.py b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb_log.py
index 6a86e84cac3..dc7f03d6b11 100644
--- a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb_log.py
+++ b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb_log.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_recursive_bomb_log.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallRecursiveBombLogFiller.json
+state_tests/stStaticCall/static_CallRecursiveBombLogFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,23 +22,19 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallRecursiveBombLogFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallRecursiveBombLogFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_recursive_bomb_log(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_recursive_bomb_log."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,60 +45,54 @@ def test_static_call_recursive_bomb_log(
         gas_limit=100000000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL (- (GAS) 100000) <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0)  [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=Op.SUB(Op.GAS, 0x186A0),
-                    address=0xC60FAB741BDA8373B3905ED824826A8F6EA8FD0A,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0x1312D00,
+    # Source: lll
+    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG0 0 32) (STATICCALL (- (GAS) 25000) (ADDRESS) 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.LOG0(offset=0x0, size=0x20)
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0x61A8),
+            address=Op.ADDRESS,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2effe40c3fdb4abb2979bfcfb8d814f1a786576d"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.LOG0(offset=0x0, size=0x20)
-            + Op.STATICCALL(
-                gas=Op.SUB(Op.GAS, 0x61A8),
-                address=Op.ADDRESS,
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL (- (GAS) 100000) <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0)  [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=Op.SUB(Op.GAS, 0x186A0),
+                address=addr,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0x1312D00,
         nonce=0,
-        address=Address("0xc60fab741bda8373b3905ed824826a8f6ea8fd0a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb_log2.py b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb_log2.py
index cdf87867498..c4ff86cdbfe 100644
--- a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb_log2.py
+++ b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb_log2.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_recursive_bomb_log2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallRecursiveBombLog2Filler.json
+state_tests/stStaticCall/static_CallRecursiveBombLog2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,23 +22,19 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallRecursiveBombLog2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallRecursiveBombLog2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_recursive_bomb_log2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_recursive_bomb_log2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,57 +45,54 @@ def test_static_call_recursive_bomb_log2(
         gas_limit=20000000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL ( - (GAS) 100000) <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0)  [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=Op.SUB(Op.GAS, 0x186A0),
-                    address=0xB6D3EDE67FDCDD6C67468B0EE88BD06FA680F8B3,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0x1312D00,
+    # Source: lll
+    # { (MSTORE 0 (GAS)) (LOG0 0 32) (STATICCALL (- (GAS) 25000) (ADDRESS) 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.LOG0(offset=0x0, size=0x20)
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0x61A8),
+            address=Op.ADDRESS,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x846ac33c2465429e6d236eeb8a440983ac2349ed"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.LOG0(offset=0x0, size=0x20)
-            + Op.STATICCALL(
-                gas=Op.SUB(Op.GAS, 0x61A8),
-                address=Op.ADDRESS,
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL ( - (GAS) 100000) <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0)  [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=Op.SUB(Op.GAS, 0x186A0),
+                address=addr,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0x1312D00,
         nonce=0,
-        address=Address("0xb6d3ede67fdcdd6c67468b0ee88bd06fa680f8b3"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={1: 1}),
+        target: Account(storage={0: 0, 1: 1}),
+        sender: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb_pre_call.py b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb_pre_call.py
index 4293f5fa745..4738e9904e3 100644
--- a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb_pre_call.py
+++ b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb_pre_call.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_recursive_bomb_pre_call.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallRecursiveBombPreCallFiller.json
+state_tests/stStaticCall/static_CallRecursiveBombPreCallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,23 +22,19 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallRecursiveBombPreCallFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallRecursiveBombPreCallFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_recursive_bomb_pre_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x77F65B71F1F16A75476F469F7106D1B60BFEC266AE25B8DA16A9091D223AA24A
-    )
+    """Test_static_call_recursive_bomb_pre_call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -50,65 +45,64 @@ def test_static_call_recursive_bomb_pre_call(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (STATICCALL 100000 0xbad304eb96065b2a98b57a48a06ae28d285a71b5 0 0 0 0) [[ 0 ]] (DELEGATECALL 0x7ffffffffffffff <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0xBAD304EB96065B2A98B57A48A06AE28D285A71B5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x72E480206054168CFA7D5C6A1BD8C3FFE26A4D82,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0xBAD304EB96065B2A98B57A48A06AE28D285A71B5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-        nonce=0,
-        address=Address("0x6a441a35b94353a66ffd7fd1e54550acecb81aaf"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
-            + Op.STATICCALL(
-                gas=Op.SUB(Op.GAS, 0x36B00),
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x7FFFFFFFFFFFFFF,
                 address=0x72E480206054168CFA7D5C6A1BD8C3FFE26A4D82,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+        nonce=0,
+        address=Address(0x6A441A35B94353A66FFD7FD1E54550ACECB81AAF),  # noqa: E501
+    )
+    # Source: lll
+    # { (MSTORE 0 (+ (MLOAD 0) 1)) (STATICCALL (- (GAS) 224000) <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0x36B00),
+            address=0x72E480206054168CFA7D5C6A1BD8C3FFE26A4D82,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x72e480206054168cfa7d5c6a1bd8c3ffe26a4d82"),  # noqa: E501
+        address=Address(0x72E480206054168CFA7D5C6A1BD8C3FFE26A4D82),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=9214364837600034817,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        sender: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb_pre_call2.py b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb_pre_call2.py
index a0f8bc888d8..cd1ce27254d 100644
--- a/tests/ported_static/stStaticCall/test_static_call_recursive_bomb_pre_call2.py
+++ b/tests/ported_static/stStaticCall/test_static_call_recursive_bomb_pre_call2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_recursive_bomb_pre_call2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallRecursiveBombPreCall2Filler.json
+state_tests/stStaticCall/static_CallRecursiveBombPreCall2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,23 +22,19 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallRecursiveBombPreCall2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallRecursiveBombPreCall2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_recursive_bomb_pre_call2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x77F65B71F1F16A75476F469F7106D1B60BFEC266AE25B8DA16A9091D223AA24A
-    )
+    """Test_static_call_recursive_bomb_pre_call2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -50,65 +45,62 @@ def test_static_call_recursive_bomb_pre_call2(
         gas_limit=9223372036854775807,
     )
 
-    # Source: LLL
-    # { (STATICCALL 100000 0xbad304eb96065b2a98b57a48a06ae28d285a71b5 0 0 0 0)  [[ 0 ]] (STATICCALL 0x7ffffffffffffff <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0)  [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0xBAD304EB96065B2A98B57A48A06AE28D285A71B5,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xED136EDCE8F08EF121C25430E7DEC4ED3FEB511D,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+    # Source: lll
+    # { (MSTORE 0 (+ (MLOAD 0) 1)) (STATICCALL (- (GAS) 224000) (ADDRESS) 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
+        + Op.STATICCALL(
+            gas=Op.SUB(Op.GAS, 0x36B00),
+            address=Op.ADDRESS,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x5e01fe5d73a471c61018a02f7cf7d8f977343093"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(Op.MLOAD(offset=0x0), 0x1))
-            + Op.STATICCALL(
-                gas=Op.SUB(Op.GAS, 0x36B00),
-                address=Op.ADDRESS,
+    # Source: lll
+    # { (STATICCALL 100000 0xbad304eb96065b2a98b57a48a06ae28d285a71b5 0 0 0 0)  [[ 0 ]] (STATICCALL 0x7ffffffffffffff <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0)  [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0xBAD304EB96065B2A98B57A48A06AE28D285A71B5,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xed136edce8f08ef121c25430e7dec4ed3feb511d"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=9214364837600034817,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        sender: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_ripemd160_1.py b/tests/ported_static/stStaticCall/test_static_call_ripemd160_1.py
index 9da320a5796..b08cd8a5b78 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ripemd160_1.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ripemd160_1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ripemd160_1.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallRipemd160_1Filler.json
+state_tests/stStaticCall/static_CallRipemd160_1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallRipemd160_1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallRipemd160_1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ripemd160_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ripemd160_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,39 +47,38 @@ def test_static_call_ripemd160_1(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { [[ 2 ]] (STATICCALL 600 3 0 0 0 32) [[ 0 ]] (MLOAD 0)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x258,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x258,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xe9854e2c2ffbd0c6f24140954ad56f59ebc56434"),  # noqa: E501
+        address=Address(0xE9854E2C2FFBD0C6F24140954AD56F59EBC56434),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x9C1185A5C5E9FC54612808977EE8F548B2258D31,
                 2: 1,
diff --git a/tests/ported_static/stStaticCall/test_static_call_ripemd160_2.py b/tests/ported_static/stStaticCall/test_static_call_ripemd160_2.py
index b07ca63f50a..cd4c0242cf9 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ripemd160_2.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ripemd160_2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ripemd160_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallRipemd160_2Filler.json
+state_tests/stStaticCall/static_CallRipemd160_2Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallRipemd160_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallRipemd160_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ripemd160_2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ripemd160_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,40 +47,39 @@ def test_static_call_ripemd160_2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 5 0xf34578907f) [[ 2 ]] (STATICCALL 6000 3 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x5, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x1770,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x5, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x1770,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x0d371480e081540255fbcef75d8c5c09535cec3a"),  # noqa: E501
+        address=Address(0x0D371480E081540255FBCEF75D8C5C09535CEC3A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xDBC100F916BFBC53535573D98CF0CBB3A5B36124,
                 2: 1,
diff --git a/tests/ported_static/stStaticCall/test_static_call_ripemd160_3.py b/tests/ported_static/stStaticCall/test_static_call_ripemd160_3.py
index 6f24b8bd9ea..1321863a278 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ripemd160_3.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ripemd160_3.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ripemd160_3.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallRipemd160_3Filler.json
+state_tests/stStaticCall/static_CallRipemd160_3Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallRipemd160_3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallRipemd160_3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ripemd160_3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ripemd160_3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -49,39 +48,38 @@ def test_static_call_ripemd160_3(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xf34578907f) [[ 2 ]] (STATICCALL 6000 3 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x1770,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x1770,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xebbc88ff981239628c72a1b30bc50038e636471f"),  # noqa: E501
+        address=Address(0xEBBC88FF981239628C72A1B30BC50038E636471F),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x316750573F9BE26BC17727B47CACEDBD0AB3E6CA,
                 2: 1,
diff --git a/tests/ported_static/stStaticCall/test_static_call_ripemd160_3_postfixed0.py b/tests/ported_static/stStaticCall/test_static_call_ripemd160_3_postfixed0.py
index b0178c7e5f0..29786ca5a33 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ripemd160_3_postfixed0.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ripemd160_3_postfixed0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ripemd160_3_postfixed0.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallRipemd160_3_postfixed0Filler.json
+state_tests/stStaticCall/static_CallRipemd160_3_postfixed0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallRipemd160_3_postfixed0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallRipemd160_3_postfixed0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ripemd160_3_postfixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ripemd160_3_postfixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -49,40 +47,39 @@ def test_static_call_ripemd160_3_postfixed0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xf34578907f00) [[ 2 ]] (STATICCALL 6000 3 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F00)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x1770,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F00)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x1770,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x8152f3b3414ac9676cd28740bd7900e041cb726c"),  # noqa: E501
+        address=Address(0x8152F3B3414AC9676CD28740BD7900E041CB726C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x7730B4642169B0F16752696DA8DA830A4B429C9D,
                 2: 1,
diff --git a/tests/ported_static/stStaticCall/test_static_call_ripemd160_3_prefixed0.py b/tests/ported_static/stStaticCall/test_static_call_ripemd160_3_prefixed0.py
index 8c3a0efb4a8..d031dda8803 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ripemd160_3_prefixed0.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ripemd160_3_prefixed0.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ripemd160_3_prefixed0.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallRipemd160_3_prefixed0Filler.json
+state_tests/stStaticCall/static_CallRipemd160_3_prefixed0Filler.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallRipemd160_3_prefixed0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallRipemd160_3_prefixed0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ripemd160_3_prefixed0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ripemd160_3_prefixed0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -49,40 +47,39 @@ def test_static_call_ripemd160_3_prefixed0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x00f34578907f) [[ 2 ]] (STATICCALL 6000 3 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x1770,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x1770,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xa70cc468f5df9f13d75a41b072fc82378be1b31d"),  # noqa: E501
+        address=Address(0xA70CC468F5DF9F13D75A41B072FC82378BE1B31D),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x316750573F9BE26BC17727B47CACEDBD0AB3E6CA,
                 2: 1,
diff --git a/tests/ported_static/stStaticCall/test_static_call_ripemd160_4.py b/tests/ported_static/stStaticCall/test_static_call_ripemd160_4.py
index 77a3c7f449d..f47e5d763ce 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ripemd160_4.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ripemd160_4.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ripemd160_4.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallRipemd160_4Filler.json
+state_tests/stStaticCall/static_CallRipemd160_4Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallRipemd160_4Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallRipemd160_4Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ripemd160_4(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ripemd160_4."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,43 +47,42 @@ def test_static_call_ripemd160_4(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (STATICCALL 720 3 0 32 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x2D0,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x2D0,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xd2243cbf1de778d48e5fae09f95d4707623a9fb6"),  # noqa: E501
+        address=Address(0xD2243CBF1DE778D48E5FAE09F95D4707623A9FB6),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x1CF4E77F5966E13E109703CD8A0DF7CEDA7F3DC3,
                 2: 1,
diff --git a/tests/ported_static/stStaticCall/test_static_call_ripemd160_4_gas719.py b/tests/ported_static/stStaticCall/test_static_call_ripemd160_4_gas719.py
index c5000f7d325..8ad51a14383 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ripemd160_4_gas719.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ripemd160_4_gas719.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ripemd160_4_gas719.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallRipemd160_4_gas719Filler.json
+state_tests/stStaticCall/static_CallRipemd160_4_gas719Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallRipemd160_4_gas719Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallRipemd160_4_gas719Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ripemd160_4_gas719(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ripemd160_4_gas719."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,43 +47,42 @@ def test_static_call_ripemd160_4_gas719(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (STATICCALL 719 3 0 32 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x2CF,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x2CF,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x17cf516dea393215768ee3be0a92dbe1db6a82cc"),  # noqa: E501
+        address=Address(0x17CF516DEA393215768EE3BE0A92DBE1DB6A82CC),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
diff --git a/tests/ported_static/stStaticCall/test_static_call_ripemd160_5.py b/tests/ported_static/stStaticCall/test_static_call_ripemd160_5.py
index a5ec8e8975d..e0cbcfe7ee9 100644
--- a/tests/ported_static/stStaticCall/test_static_call_ripemd160_5.py
+++ b/tests/ported_static/stStaticCall/test_static_call_ripemd160_5.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_ripemd160_5.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallRipemd160_5Filler.json
+state_tests/stStaticCall/static_CallRipemd160_5Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallRipemd160_5Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallRipemd160_5Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_ripemd160_5(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_ripemd160_5."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,43 +47,42 @@ def test_static_call_ripemd160_5(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (STATICCALL 6000 3 0 1000000 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x1770,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0xF4240,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x1770,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0xF4240,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x1d3e8582b56142ac3a4d5e93971ab0b6dc2f1636"),  # noqa: E501
+        address=Address(0x1D3E8582B56142AC3A4D5E93971AB0B6DC2F1636),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
diff --git a/tests/ported_static/stStaticCall/test_static_call_sha256_1.py b/tests/ported_static/stStaticCall/test_static_call_sha256_1.py
index a488222be86..6402837e4e1 100644
--- a/tests/ported_static/stStaticCall/test_static_call_sha256_1.py
+++ b/tests/ported_static/stStaticCall/test_static_call_sha256_1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_sha256_1.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallSha256_1Filler.json
+state_tests/stStaticCall/static_CallSha256_1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,17 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CallSha256_1Filler.json"],
+    ["state_tests/stStaticCall/static_CallSha256_1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_sha256_1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_sha256_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -46,39 +47,38 @@ def test_static_call_sha256_1(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { [[ 2 ]] (STATICCALL 500 2 0 0 0 32) [[ 0 ]] (MLOAD 0)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x1F4,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x1F4,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x9385a5d182321342581977632b67b71ffce94c7c"),  # noqa: E501
+        address=Address(0x9385A5D182321342581977632B67B71FFCE94C7C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xE3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stStaticCall/test_static_call_sha256_1_nonzero_value.py b/tests/ported_static/stStaticCall/test_static_call_sha256_1_nonzero_value.py
index 7ab0b8c3a2b..6bd0f39acaa 100644
--- a/tests/ported_static/stStaticCall/test_static_call_sha256_1_nonzero_value.py
+++ b/tests/ported_static/stStaticCall/test_static_call_sha256_1_nonzero_value.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_sha256_1_nonzero_value.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CallSha256_1_nonzeroValueFiller.json
+state_tests/stStaticCall/static_CallSha256_1_nonzeroValueFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallSha256_1_nonzeroValueFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallSha256_1_nonzeroValueFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_sha256_1_nonzero_value(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_sha256_1_nonzero_value."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -49,34 +47,24 @@ def test_static_call_sha256_1_nonzero_value(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { [[ 2 ]] (STATICCALL 200000 2 0 0 0 32) [[ 0 ]] (MLOAD 0) (CALL (GAS) 2 19 0 0 0 0) (CALLCODE (GAS) 2 19 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x30D40,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0x2,
-                    value=0x13,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.CALLCODE(
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x30D40,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.POP(
+            Op.CALL(
                 gas=Op.GAS,
                 address=0x2,
                 value=0x13,
@@ -85,23 +73,35 @@ def test_static_call_sha256_1_nonzero_value(
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.CALLCODE(
+            gas=Op.GAS,
+            address=0x2,
+            value=0x13,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xBEBC200,
         nonce=0,
-        address=Address("0x6efbd97a458c5b978bea2d03f8808bf02fe8c42d"),  # noqa: E501
+        address=Address(0x6EFBD97A458C5B978BEA2D03F8808BF02FE8C42D),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        Address(0x0000000000000000000000000000000000000002): Account(
+            balance=19
+        ),
+        target: Account(
             storage={
                 0: 0xE3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stStaticCall/test_static_call_sha256_2.py b/tests/ported_static/stStaticCall/test_static_call_sha256_2.py
index 799256bdae4..78c0f14b84b 100644
--- a/tests/ported_static/stStaticCall/test_static_call_sha256_2.py
+++ b/tests/ported_static/stStaticCall/test_static_call_sha256_2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_sha256_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallSha256_2Filler.json
+state_tests/stStaticCall/static_CallSha256_2Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,17 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CallSha256_2Filler.json"],
+    ["state_tests/stStaticCall/static_CallSha256_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_sha256_2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_sha256_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -46,40 +47,39 @@ def test_static_call_sha256_2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 5 0xf34578907f) [[ 2 ]] (STATICCALL 500 2 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x5, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x1F4,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x5, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x1F4,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xc3764ef9b916cf39bbc2f0092b1c2e792f160cb1"),  # noqa: E501
+        address=Address(0xC3764EF9B916CF39BBC2F0092B1C2E792F160CB1),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xCB39B3BDE22925B2F931111130C774761D8895E0E08437C9B396C1E97D10F34D,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stStaticCall/test_static_call_sha256_3.py b/tests/ported_static/stStaticCall/test_static_call_sha256_3.py
index 4de86b964d9..83f95b4b063 100644
--- a/tests/ported_static/stStaticCall/test_static_call_sha256_3.py
+++ b/tests/ported_static/stStaticCall/test_static_call_sha256_3.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_sha256_3.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallSha256_3Filler.json
+state_tests/stStaticCall/static_CallSha256_3Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,17 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CallSha256_3Filler.json"],
+    ["state_tests/stStaticCall/static_CallSha256_3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_sha256_3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_sha256_3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -46,40 +47,39 @@ def test_static_call_sha256_3(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xf34578907f) [[ 2 ]] (STATICCALL 500 2 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x1F4,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x1F4,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x9b35a511ede9cdecc6dfc827744e0ca1d0e5f236"),  # noqa: E501
+        address=Address(0x9B35A511EDE9CDECC6DFC827744E0CA1D0E5F236),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x7392925565D67BE8E9620AACBCFAECD8CB6EC58D709D25DA9ECCF1D08A41CE35,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stStaticCall/test_static_call_sha256_3_postfix0.py b/tests/ported_static/stStaticCall/test_static_call_sha256_3_postfix0.py
index 72d3afe9cb4..538d0123355 100644
--- a/tests/ported_static/stStaticCall/test_static_call_sha256_3_postfix0.py
+++ b/tests/ported_static/stStaticCall/test_static_call_sha256_3_postfix0.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_sha256_3_postfix0.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallSha256_3_postfix0Filler.json
+state_tests/stStaticCall/static_CallSha256_3_postfix0Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallSha256_3_postfix0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallSha256_3_postfix0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_sha256_3_postfix0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_sha256_3_postfix0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,40 +47,39 @@ def test_static_call_sha256_3_postfix0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xf34578907f00) [[ 2 ]] (STATICCALL 500 2 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F00)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x1F4,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F00)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x1F4,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xd147fce2c6650060e058b25ccfd3c7b24d744503"),  # noqa: E501
+        address=Address(0xD147FCE2C6650060E058B25CCFD3C7B24D744503),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x3B745A1C00D035C334F358D007A430E4CF0AE63AA0556FB05529706DE546464D,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stStaticCall/test_static_call_sha256_3_prefix0.py b/tests/ported_static/stStaticCall/test_static_call_sha256_3_prefix0.py
index cb3507fbeb6..467ddd4c5ec 100644
--- a/tests/ported_static/stStaticCall/test_static_call_sha256_3_prefix0.py
+++ b/tests/ported_static/stStaticCall/test_static_call_sha256_3_prefix0.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_sha256_3_prefix0.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallSha256_3_prefix0Filler.json
+state_tests/stStaticCall/static_CallSha256_3_prefix0Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallSha256_3_prefix0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallSha256_3_prefix0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_sha256_3_prefix0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_sha256_3_prefix0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,40 +47,39 @@ def test_static_call_sha256_3_prefix0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x00f34578907f) [[ 2 ]] (STATICCALL 500 2 0 37 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0xF34578907F)
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x1F4,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x25,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xF34578907F)
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x1F4,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x25,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x0219107bb8477432afd6777a32e63e0e7c4b999a"),  # noqa: E501
+        address=Address(0x0219107BB8477432AFD6777A32E63E0E7C4B999A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0x7392925565D67BE8E9620AACBCFAECD8CB6EC58D709D25DA9ECCF1D08A41CE35,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stStaticCall/test_static_call_sha256_4.py b/tests/ported_static/stStaticCall/test_static_call_sha256_4.py
index 1c076094c57..e7887f46179 100644
--- a/tests/ported_static/stStaticCall/test_static_call_sha256_4.py
+++ b/tests/ported_static/stStaticCall/test_static_call_sha256_4.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_sha256_4.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallSha256_4Filler.json
+state_tests/stStaticCall/static_CallSha256_4Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,17 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CallSha256_4Filler.json"],
+    ["state_tests/stStaticCall/static_CallSha256_4Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_sha256_4(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_sha256_4."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -46,43 +47,42 @@ def test_static_call_sha256_4(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (STATICCALL 100 2 0 32 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x64,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x64,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x91666cd4c3ec5456566d5107f1a3cee6dc078818"),  # noqa: E501
+        address=Address(0x91666CD4C3EC5456566D5107F1A3CEE6DC078818),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xAF9613760F72635FBDB44A5A0A63C39F12AF30F950A6EE5C971BE188E89C4051,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stStaticCall/test_static_call_sha256_4_gas99.py b/tests/ported_static/stStaticCall/test_static_call_sha256_4_gas99.py
index 9f3821f5089..a5d437b3bca 100644
--- a/tests/ported_static/stStaticCall/test_static_call_sha256_4_gas99.py
+++ b/tests/ported_static/stStaticCall/test_static_call_sha256_4_gas99.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_sha256_4_gas99.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallSha256_4_gas99Filler.json
+state_tests/stStaticCall/static_CallSha256_4_gas99Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallSha256_4_gas99Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallSha256_4_gas99Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_sha256_4_gas99(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_sha256_4_gas99."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -49,42 +48,41 @@ def test_static_call_sha256_4_gas99(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (STATICCALL 99 2 0 32 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x63,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x63,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xeda46fa30192c0ab5a8e9c2567faf9a110ce6720"),  # noqa: E501
+        address=Address(0xEDA46FA30192C0AB5A8E9C2567FAF9A110CE6720),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=365224,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xAF9613760F72635FBDB44A5A0A63C39F12AF30F950A6EE5C971BE188E89C4051,  # noqa: E501
                 2: 1,
diff --git a/tests/ported_static/stStaticCall/test_static_call_sha256_5.py b/tests/ported_static/stStaticCall/test_static_call_sha256_5.py
index b59453bad15..ad2a974cefb 100644
--- a/tests/ported_static/stStaticCall/test_static_call_sha256_5.py
+++ b/tests/ported_static/stStaticCall/test_static_call_sha256_5.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_sha256_5.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallSha256_5Filler.json
+state_tests/stStaticCall/static_CallSha256_5Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,17 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CallSha256_5Filler.json"],
+    ["state_tests/stStaticCall/static_CallSha256_5Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_sha256_5(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_sha256_5."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -46,43 +47,42 @@ def test_static_call_sha256_5(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (STATICCALL 600 2 0 1000000 0 32) [[ 0 ]] (MLOAD 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x258,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0xF4240,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x258,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0xF4240,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x76a2f21c718430c6918ba8c11e175c2636b35671"),  # noqa: E501
+        address=Address(0x76A2F21C718430C6918BA8C11E175C2636B35671),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
diff --git a/tests/ported_static/stStaticCall/test_static_call_to_call_code_op_code_check.py b/tests/ported_static/stStaticCall/test_static_call_to_call_code_op_code_check.py
index b41bbac955e..1c992da0d5b 100644
--- a/tests/ported_static/stStaticCall/test_static_call_to_call_code_op_code_check.py
+++ b/tests/ported_static/stStaticCall/test_static_call_to_call_code_op_code_check.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_to_call_code_op_code_check.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callToCallCodeOpCodeCheckFiller.json
+state_tests/stStaticCall/static_callToCallCodeOpCodeCheckFiller.json
 """
 
 import pytest
@@ -13,6 +12,7 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -23,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callToCallCodeOpCodeCheckFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callToCallCodeOpCodeCheckFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_to_call_code_op_code_check(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_to_call_code_op_code_check."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -49,117 +47,108 @@ def test_static_call_to_call_code_op_code_check(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0)  }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7ef8271e6cdb0a23220b73bf3e9697e173f9d015"),  # noqa: E501
+        address=Address(0x7EF8271E6CDB0A23220B73BF3E9697E173F9D015),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0xF0D7D1B32BBC0012F183FB3E3F4F9434ABED93BD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(pc=0x38, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.JUMP(pc=0x3E)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 1) ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0xF0D7D1B32BBC0012F183FB3E3F4F9434ABED93BD,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPI(pc=0x38, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.JUMP(pc=0x3E)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xea435169b5c0848d55c71080fb937e9b611a505d"),  # noqa: E501
+        address=Address(0xEA435169B5C0848D55C71080FB937E9B611A505D),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0xEA435169B5C0848D55C71080FB937E9B611A505D,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0xEA435169B5C0848D55C71080FB937E9B611A505D,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x1000000000000000000000000000000000000001> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x1000000000000000000000000000000000000001> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) )        }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xEBAF50DEBF10E08302FE4280C32DF010463CA297, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0xEA435169B5C0848D55C71080FB937E9B611A505D, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0xEA435169B5C0848D55C71080FB937E9B611A505D, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf0d7d1b32bbc0012f183fb3e3f4f9434abed93bd"),  # noqa: E501
+        address=Address(0xF0D7D1B32BBC0012F183FB3E3F4F9434ABED93BD),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "000000000000000000000000ea435169b5c0848d55c71080fb937e9b611a505d"
-        ),
+        to=target,
+        data=Hash(addr, left_padding=True),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_to_call_op_code_check.py b/tests/ported_static/stStaticCall/test_static_call_to_call_op_code_check.py
index fcb2f3dbe3c..2a383f0cf1b 100644
--- a/tests/ported_static/stStaticCall/test_static_call_to_call_op_code_check.py
+++ b/tests/ported_static/stStaticCall/test_static_call_to_call_op_code_check.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_to_call_op_code_check.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callToCallOpCodeCheckFiller.json
+state_tests/stStaticCall/static_callToCallOpCodeCheckFiller.json
 """
 
 import pytest
@@ -12,6 +12,7 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -22,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callToCallOpCodeCheckFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callToCallOpCodeCheckFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_to_call_op_code_check(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_to_call_op_code_check."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,117 +47,108 @@ def test_static_call_to_call_op_code_check(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x51A6B9D90FA023DBFE63296B65876F9CAF3FF3FD,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0xD366057A988CB6562F7FA2A601F06A503D30A90,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0)  }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0d366057a988cb6562f7fa2a601f06a503d30a90"),  # noqa: E501
+        address=Address(0x7EF8271E6CDB0A23220B73BF3E9697E173F9D015),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0xD366057A988CB6562F7FA2A601F06A503D30A90,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(pc=0x38, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.JUMP(pc=0x3E)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 (CALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 1) ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0xD366057A988CB6562F7FA2A601F06A503D30A90,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPI(pc=0x38, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.JUMP(pc=0x3E)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x51a6b9d90fa023dbfe63296b65876f9caf3ff3fd"),  # noqa: E501
+        address=Address(0x51A6B9D90FA023DBFE63296B65876F9CAF3FF3FD),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0)  }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x1000000000000000000000000000000000000001> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x1000000000000000000000000000000000000002> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) )        }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xEBAF50DEBF10E08302FE4280C32DF010463CA297, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x51A6B9D90FA023DBFE63296B65876F9CAF3FF3FD, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0xD366057A988CB6562F7FA2A601F06A503D30A90, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7ef8271e6cdb0a23220b73bf3e9697e173f9d015"),  # noqa: E501
+        address=Address(0x0D366057A988CB6562F7FA2A601F06A503D30A90),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "00000000000000000000000051a6b9d90fa023dbfe63296b65876f9caf3ff3fd"
-        ),
+        to=target,
+        data=Hash(addr, left_padding=True),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_to_del_call_op_code_check.py b/tests/ported_static/stStaticCall/test_static_call_to_del_call_op_code_check.py
index e0715253b05..c46023f3c26 100644
--- a/tests/ported_static/stStaticCall/test_static_call_to_del_call_op_code_check.py
+++ b/tests/ported_static/stStaticCall/test_static_call_to_del_call_op_code_check.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_to_del_call_op_code_check.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callToDelCallOpCodeCheckFiller.json
+state_tests/stStaticCall/static_callToDelCallOpCodeCheckFiller.json
 """
 
 import pytest
@@ -13,6 +12,7 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -23,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callToDelCallOpCodeCheckFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callToDelCallOpCodeCheckFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_to_del_call_op_code_check(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_to_del_call_op_code_check."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -49,116 +47,107 @@ def test_static_call_to_del_call_op_code_check(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x7EF8271E6CDB0A23220B73BF3E9697E173F9D015,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0x692BDB71BF492107772D8FB07345FAA13B37937B,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0)  }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x114ca039127835ca3472ef43e00d15e2d8623286"),  # noqa: E501
+        address=Address(0x7EF8271E6CDB0A23220B73BF3E9697E173F9D015),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0x114CA039127835CA3472EF43E00D15E2D8623286,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(pc=0x36, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.JUMP(pc=0x3C)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 1) ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0x114CA039127835CA3472EF43E00D15E2D8623286,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPI(pc=0x36, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.JUMP(pc=0x3C)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x692bdb71bf492107772d8fb07345faa13b37937b"),  # noqa: E501
+        address=Address(0x692BDB71BF492107772D8FB07345FAA13B37937B),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0)  }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:target:0x1000000000000000000000000000000000000000> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x1000000000000000000000000000000000000001> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) )        }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xEBAF50DEBF10E08302FE4280C32DF010463CA297, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x7EF8271E6CDB0A23220B73BF3E9697E173F9D015, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0x692BDB71BF492107772D8FB07345FAA13B37937B, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7ef8271e6cdb0a23220b73bf3e9697e173f9d015"),  # noqa: E501
+        address=Address(0x114CA039127835CA3472EF43E00D15E2D8623286),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "000000000000000000000000692bdb71bf492107772d8fb07345faa13b37937b"
-        ),
+        to=target,
+        data=Hash(addr, left_padding=True),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_to_name_registrator0.py b/tests/ported_static/stStaticCall/test_static_call_to_name_registrator0.py
index 2439cd51932..14fe9f2ed21 100644
--- a/tests/ported_static/stStaticCall/test_static_call_to_name_registrator0.py
+++ b/tests/ported_static/stStaticCall/test_static_call_to_name_registrator0.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_to_name_registrator0.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallToNameRegistrator0Filler.json
+state_tests/stStaticCall/static_CallToNameRegistrator0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CallToNameRegistrator0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CallToNameRegistrator0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_to_name_registrator0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_to_name_registrator0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,62 +44,56 @@ def test_static_call_to_name_registrator0(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=23,
         nonce=0,
-        address=Address("0x15eb18969e0925c8e4a76fd7cbce36a2b056b27e"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (STATICCALL 100000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 64 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x15EB18969E0925C8E4A76FD7CBCE36A2B056B27E,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x40,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x40,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbf5dced1c89e98f99d5702c65fc3a881e0bda929"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_to_return1.py b/tests/ported_static/stStaticCall/test_static_call_to_return1.py
index 992b8e182e2..840e627c8a6 100644
--- a/tests/ported_static/stStaticCall/test_static_call_to_return1.py
+++ b/tests/ported_static/stStaticCall/test_static_call_to_return1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_to_return1.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CallToReturn1Filler.json
+state_tests/stStaticCall/static_CallToReturn1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CallToReturn1Filler.json"],
+    ["state_tests/stStaticCall/static_CallToReturn1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_to_return1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_to_return1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,49 +44,42 @@ def test_static_call_to_return1(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (STATICCALL 1000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 31 1) [[ 1 ]] @0 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x3E8,
-                    address=0xD0A322C1EA1978A5D1EDB863E5A6C9027039BF6C,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x1F,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: raw
+    # 0x602a601f536001601ff3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x1F, value=0x2A)
+        + Op.RETURN(offset=0x1F, size=0x1),
+        balance=23,
         nonce=0,
-        address=Address("0x60f1c8af50c827c6787a7bc5249e9bdde475a4ba"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x1F, value=0x2A)
-            + Op.RETURN(offset=0x1F, size=0x1)
-        ),
-        balance=23,
+    # Source: lll
+    # { [[ 0 ]] (STATICCALL 1000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 31 1) [[ 1 ]] @0 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x3E8,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x1F,
+                ret_size=0x1,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd0a322c1ea1978a5d1edb863e5a6c9027039bf6c"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 42}),
-    }
+    post = {target: Account(storage={0: 1, 1: 42}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_to_static_op_code_check.py b/tests/ported_static/stStaticCall/test_static_call_to_static_op_code_check.py
index 0b538f9b876..97a1361828f 100644
--- a/tests/ported_static/stStaticCall/test_static_call_to_static_op_code_check.py
+++ b/tests/ported_static/stStaticCall/test_static_call_to_static_op_code_check.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_to_static_op_code_check.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callToStaticOpCodeCheckFiller.json
+state_tests/stStaticCall/static_callToStaticOpCodeCheckFiller.json
 """
 
 import pytest
@@ -12,6 +12,7 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -22,19 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callToStaticOpCodeCheckFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callToStaticOpCodeCheckFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_to_static_op_code_check(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_to_static_op_code_check."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,116 +47,107 @@ def test_static_call_to_static_op_code_check(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x5E93BF4D3E4A5F90AE3A7A68DBD03E6C47F1245A,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0xD366057A988CB6562F7FA2A601F06A503D30A90,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0)  }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0d366057a988cb6562f7fa2a601f06a503d30a90"),  # noqa: E501
+        address=Address(0x7EF8271E6CDB0A23220B73BF3E9697E173F9D015),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0xD366057A988CB6562F7FA2A601F06A503D30A90,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(pc=0x36, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.JUMP(pc=0x3C)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 1) ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=0xD366057A988CB6562F7FA2A601F06A503D30A90,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPI(pc=0x36, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.JUMP(pc=0x3C)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x5e93bf4d3e4a5f90ae3a7a68dbd03e6c47f1245a"),  # noqa: E501
+        address=Address(0x5E93BF4D3E4A5F90AE3A7A68DBD03E6C47F1245A),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0)  }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x1000000000000000000000000000000000000001> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x1000000000000000000000000000000000000002> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) )        }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xEBAF50DEBF10E08302FE4280C32DF010463CA297, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x5E93BF4D3E4A5F90AE3A7A68DBD03E6C47F1245A, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0xD366057A988CB6562F7FA2A601F06A503D30A90, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7ef8271e6cdb0a23220b73bf3e9697e173f9d015"),  # noqa: E501
+        address=Address(0x0D366057A988CB6562F7FA2A601F06A503D30A90),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "0000000000000000000000005e93bf4d3e4a5f90ae3a7a68dbd03e6c47f1245a"
-        ),
+        to=target,
+        data=Hash(addr, left_padding=True),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_value_inherit.py b/tests/ported_static/stStaticCall/test_static_call_value_inherit.py
index a565b4161a5..4770328fd86 100644
--- a/tests/ported_static/stStaticCall/test_static_call_value_inherit.py
+++ b/tests/ported_static/stStaticCall/test_static_call_value_inherit.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_value_inherit.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_call_value_inheritFiller.json
+state_tests/stStaticCall/static_call_value_inheritFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_call_value_inheritFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_call_value_inheritFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_value_inherit(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_static_call_value_inherit."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,50 +44,44 @@ def test_static_call_value_inherit(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { [[0]] (STATICCALL 50000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 32) [[1]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xC350,
-                    address=0xCB9A81371BC2600A843F60738091E390318CDA9C,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    # Source: lll
+    # { (MSTORE 0 (CALLVALUE)) (RETURN 0 32) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLVALUE)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x453c54cfc5af8e6fd9110c386da8fbc47105d611"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLVALUE)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[0]] (STATICCALL 50000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 32) [[1]] (MLOAD 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xC350,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={1: 1},
         balance=1,
         nonce=0,
-        address=Address("0xcb9a81371bc2600a843f60738091e390318cda9c"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=460000,
         value=10,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_value_inherit_from_call.py b/tests/ported_static/stStaticCall/test_static_call_value_inherit_from_call.py
index 05bec6f2804..930f7670065 100644
--- a/tests/ported_static/stStaticCall/test_static_call_value_inherit_from_call.py
+++ b/tests/ported_static/stStaticCall/test_static_call_value_inherit_from_call.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_value_inherit_from_call.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_call_value_inherit_from_callFiller.json
+state_tests/stStaticCall/static_call_value_inherit_from_callFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_call_value_inherit_from_callFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_call_value_inherit_from_callFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_value_inherit_from_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_static_call_value_inherit_from_call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,66 +46,59 @@ def test_static_call_value_inherit_from_call(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { (CALL 100000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 10 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x186A0,
-                address=0x453C54CFC5AF8E6FD9110C386DA8FBC47105D611,
-                value=0xA,
+    # Source: lll
+    # { (MSTORE 0 (CALLVALUE)) (RETURN 0 32) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLVALUE)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
+        balance=1,
+        nonce=0,
+    )
+    # Source: lll
+    # { [[0]] (STATICCALL 50000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 32) [[1]] (MLOAD 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xC350,
+                address=addr_2,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x0af4ae2156e6347e93d875a9d46085e31e57bbe9"),  # noqa: E501
-    )
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xC350,
-                    address=0xCB9A81371BC2600A843F60738091E390318CDA9C,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={1: 1},
         balance=1,
         nonce=0,
-        address=Address("0x453c54cfc5af8e6fd9110c386da8fbc47105d611"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLVALUE)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
-        balance=1,
+    # Source: lll
+    # { (CALL 100000 <contract:0x094f5374fce5edbc8e2a8697c15331677e6ebf0b> 10 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x186A0,
+            address=addr,
+            value=0xA,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xcb9a81371bc2600a843f60738091e390318cda9c"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=460000,
         value=10,
     )
 
-    post = {
-        callee: Account(storage={0: 1}),
-    }
+    post = {addr: Account(storage={0: 1, 1: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_with_high_value.py b/tests/ported_static/stStaticCall/test_static_call_with_high_value.py
index 05f98ed162f..6ebed354848 100644
--- a/tests/ported_static/stStaticCall/test_static_call_with_high_value.py
+++ b/tests/ported_static/stStaticCall/test_static_call_with_high_value.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_with_high_value.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callWithHighValueFiller.json
+state_tests/stStaticCall/static_callWithHighValueFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callWithHighValueFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callWithHighValueFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_with_high_value(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_with_high_value."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,48 +44,41 @@ def test_static_call_with_high_value(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 50000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 2 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xC350,
-                    address=0xD5D9E9E0158920B17B6DF82FAC474B3E2691EE99,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: raw
+    # 0x603760005360026000f3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2),
+        balance=23,
         nonce=0,
-        address=Address("0xc81da1ac86642f6600ecf1369d53787a64412cfc"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-        ),
-        balance=23,
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 50000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 2 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xC350,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd5d9e9e0158920b17b6df82fac474b3e2691ee99"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_with_high_value_and_gas_oog.py b/tests/ported_static/stStaticCall/test_static_call_with_high_value_and_gas_oog.py
index fac66409cce..ddf1233324b 100644
--- a/tests/ported_static/stStaticCall/test_static_call_with_high_value_and_gas_oog.py
+++ b/tests/ported_static/stStaticCall/test_static_call_with_high_value_and_gas_oog.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_static_call_with_high_value_and_gas_oog.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callWithHighValueAndGasOOGFiller.json
+state_tests/stStaticCall/static_callWithHighValueAndGasOOGFiller.json
 """
 
 import pytest
@@ -13,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,49 +27,38 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callWithHighValueAndGasOOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callWithHighValueAndGasOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000a5b789cb3b73deb59cef5b261568362db2f967dd",
-            {
-                Address("0xa5b789cb3b73deb59cef5b261568362db2f967dd"): Account(
-                    storage={
-                        0: 1,
-                        1: 0x3700FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    }
-                ),
-                Address("0xbe9c847927d7e832ff5655392c160933d99cb4e8"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000be9c847927d7e832ff5655392c160933d99cb4e8",
-            {
-                Address("0xbe9c847927d7e832ff5655392c160933d99cb4e8"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_call_with_high_value_and_gas_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_call_with_high_value_and_gas_oog."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -79,110 +72,135 @@ def test_static_call_with_high_value_and_gas_oog(
         gas_limit=30000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (CALL 500000 (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x7A120,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x7A120,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x46fcfdfd17a5789b6ab6d7e23f33f4eadecfb5ad"),  # noqa: E501
+        address=Address(0x46FCFDFD17A5789B6AB6D7E23F33F4EADECFB5AD),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xFFFFFFFFFFFFFFFFFFFFFFFF,
-                    address=0xD5D9E9E0158920B17B6DF82FAC474B3E2691EE99,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xa5b789cb3b73deb59cef5b261568362db2f967dd"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xFFFFFFFFFFFFFFFFFFFFFFFF,
-                    address=0xD2B07D10E28B46411527B841F0E0382A8E3BCB80,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        storage={0x0: 0x1, 0x1: 0x1},
-        balance=0xDE0B6B3A7640000,
+    # Source: raw
+    # 0x603760005360026000f3
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2),
+        balance=23,
         nonce=0,
-        address=Address("0xbe9c847927d7e832ff5655392c160933d99cb4e8"),  # noqa: E501
+        address=Address(0xD5D9E9E0158920B17B6DF82FAC474B3E2691EE99),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # { (KECCAK256 0x00 0x2fffff) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.SHA3(offset=0x0, size=0x2FFFFF) + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0xd2b07d10e28b46411527b841f0e0382a8e3bcb80"),  # noqa: E501
+        address=Address(0xD2B07D10E28B46411527B841F0E0382A8E3BCB80),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-        ),
-        balance=23,
+    # Source: lll
+    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (STATICCALL 0xffffffffffffffffffffffff <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 2 ) [[ 1 ]] (MLOAD 0)}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xFFFFFFFFFFFFFFFFFFFFFFFF,
+                address=0xD5D9E9E0158920B17B6DF82FAC474B3E2691EE99,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd5d9e9e0158920b17b6df82fac474b3e2691ee99"),  # noqa: E501
+        address=Address(0xA5B789CB3B73DEB59CEF5B261568362DB2F967DD),  # noqa: E501
+    )
+    # Source: lll
+    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (STATICCALL 0xffffffffffffffffffffffff <contract:0xb45304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 2 ) [[ 1 ]] (MLOAD 0)}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xFFFFFFFFFFFFFFFFFFFFFFFF,
+                address=0xD2B07D10E28B46411527B841F0E0382A8E3BCB80,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        storage={0: 1, 1: 1},
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0xBE9C847927D7E832FF5655392C160933D99CB4E8),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr: Account(
+                    storage={
+                        0: 1,
+                        1: 0x3700FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {addr_2: Account(storage={0: 1, 1: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [3000000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=3000000,
-        value=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_with_high_value_and_oo_gat_tx_level.py b/tests/ported_static/stStaticCall/test_static_call_with_high_value_and_oo_gat_tx_level.py
index 92bb2f764ea..09265353f6d 100644
--- a/tests/ported_static/stStaticCall/test_static_call_with_high_value_and_oo_gat_tx_level.py
+++ b/tests/ported_static/stStaticCall/test_static_call_with_high_value_and_oo_gat_tx_level.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_with_high_value_and_oo_gat_tx_level.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callWithHighValueAndOOGatTxLevelFiller.json
+state_tests/stStaticCall/static_callWithHighValueAndOOGatTxLevelFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callWithHighValueAndOOGatTxLevelFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callWithHighValueAndOOGatTxLevelFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_with_high_value_and_oo_gat_tx_level(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_with_high_value_and_oo_gat_tx_level."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,48 +46,41 @@ def test_static_call_with_high_value_and_oo_gat_tx_level(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 3000001 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0 ) [[ 1 ]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x2DC6C1,
-                    address=0xD5D9E9E0158920B17B6DF82FAC474B3E2691EE99,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        balance=0x186A0,
+    # Source: raw
+    # 0x603760005360026000f3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2),
+        balance=23,
         nonce=0,
-        address=Address("0x5b4a9566e26075aa8ffbee639b15cbf0292368f6"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-        ),
-        balance=23,
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 3000001 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0 ) [[ 1 ]] (MLOAD 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x2DC6C1,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        balance=0x186A0,
         nonce=0,
-        address=Address("0xd5d9e9e0158920b17b6df82fac474b3e2691ee99"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_with_high_value_oo_gin_call.py b/tests/ported_static/stStaticCall/test_static_call_with_high_value_oo_gin_call.py
index 93573a6d6a4..0663469cbc5 100644
--- a/tests/ported_static/stStaticCall/test_static_call_with_high_value_oo_gin_call.py
+++ b/tests/ported_static/stStaticCall/test_static_call_with_high_value_oo_gin_call.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_with_high_value_oo_gin_call.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callWithHighValueOOGinCallFiller.json
+state_tests/stStaticCall/static_callWithHighValueOOGinCallFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callWithHighValueOOGinCallFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callWithHighValueOOGinCallFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_with_high_value_oo_gin_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_call_with_high_value_oo_gin_call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,51 +44,44 @@ def test_static_call_with_high_value_oo_gin_call(
         gas_limit=30000000,
     )
 
-    # Source: LLL
+    # Source: raw
+    # 0x603760005360026000f3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2),
+        balance=23,
+        nonce=0,
+    )
+    # Source: lll
     # {  [[ 0 ]] (ADD (STATICCALL 10 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 0 0 0 ) 1) [[ 1 ]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.ADD(
-                    Op.STATICCALL(
-                        gas=0xA,
-                        address=0xD5D9E9E0158920B17B6DF82FAC474B3E2691EE99,
-                        args_offset=0x0,
-                        args_size=0x0,
-                        ret_offset=0x0,
-                        ret_size=0x0,
-                    ),
-                    0x1,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.ADD(
+                Op.STATICCALL(
+                    gas=0xA,
+                    address=addr,
+                    args_offset=0x0,
+                    args_size=0x0,
+                    ret_offset=0x0,
+                    ret_size=0x0,
                 ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+                0x1,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x211d767449420e452c129490ca6ad58adad11530"),  # noqa: E501
-    )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-        ),
-        balance=23,
-        nonce=0,
-        address=Address("0xd5d9e9e0158920b17b6df82fac474b3e2691ee99"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_call_zero_v_call_suicide.py b/tests/ported_static/stStaticCall/test_static_call_zero_v_call_suicide.py
index 851c27082a0..b0bfdc77740 100644
--- a/tests/ported_static/stStaticCall/test_static_call_zero_v_call_suicide.py
+++ b/tests/ported_static/stStaticCall/test_static_call_zero_v_call_suicide.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_call_zero_v_call_suicide.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CALL_ZeroVCallSuicideFiller.json
+state_tests/stStaticCall/static_CALL_ZeroVCallSuicideFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CALL_ZeroVCallSuicideFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CALL_ZeroVCallSuicideFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_call_zero_v_call_suicide(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_static_call_zero_v_call_suicide."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,39 +44,46 @@ def test_static_call_zero_v_call_suicide(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x7A0DDD9CCF14D217E4C1AE6B7C2C770CD4E929EE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (STATICCALL 60000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0xEA60,
+            address=0x79968A94DBEDB20475585E9DD4DAE6333ADD4C01,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x79968a94dbedb20475585e9dd4dae6333add4c01"),  # noqa: E501
+        address=Address(0x7A0DDD9CCF14D217E4C1AE6B7C2C770CD4E929EE),  # noqa: E501
     )
-    # Source: LLL
-    # { (STATICCALL 60000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0xEA60,
-                address=0x79968A94DBEDB20475585E9DD4DAE6333ADD4C01,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x7A0DDD9CCF14D217E4C1AE6B7C2C770CD4E929EE
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x7a0ddd9ccf14d217e4c1ae6b7c2c770cd4e929ee"),  # noqa: E501
+        address=Address(0x79968A94DBEDB20475585E9DD4DAE6333ADD4C01),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post: dict = {}
+    post = {
+        addr: Account(
+            code=bytes.fromhex(
+                "737a0ddd9ccf14d217e4c1ae6b7c2c770cd4e929eeff00"
+            ),
+        ),
+        target: Account(storage={0: 0, 100: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcall_00.py b/tests/ported_static/stStaticCall/test_static_callcall_00.py
index 21e94f184c5..1dc2606afd2 100644
--- a/tests/ported_static/stStaticCall/test_static_callcall_00.py
+++ b/tests/ported_static/stStaticCall/test_static_callcall_00.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_callcall_00.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcall_00Filler.json
+state_tests/stStaticCall/static_callcall_00Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,50 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_callcall_00Filler.json"],
+    ["state_tests/stStaticCall/static_callcall_00Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000002f9ec0afcb4edcd7d38c6a48f5e36038263ca3cd",
-            {
-                Address("0x2f9ec0afcb4edcd7d38c6a48f5e36038263ca3cd"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000bf23f3306533431b2ee5e4ca95e0a0834c090105",
-            {
-                Address("0xbf23f3306533431b2ee5e4ca95e0a0834c090105"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcall_00(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcall_00."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -76,139 +69,184 @@ def test_static_callcall_00(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x1)
-            + Op.MSTORE(offset=0x20, value=Op.CALLER)
-            + Op.MSTORE(offset=0x40, value=Op.CALLVALUE)
-            + Op.MSTORE(offset=0x60, value=Op.ADDRESS)
-            + Op.MSTORE(offset=0x80, value=Op.ORIGIN)
-            + Op.MSTORE(offset=0xA0, value=Op.CALLDATASIZE)
-            + Op.MSTORE(offset=0xC0, value=Op.CODESIZE)
-            + Op.MSTORE(offset=0xE0, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x29736372c0fab51db4556614ef27d74a89acfe21"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x55730,
-                    address=0x620B442C84D5068E6B57D390A1AC99130205406E,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 2 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE))}  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
+        + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
+        + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
+        + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2f9ec0afcb4edcd7d38c6a48f5e36038263ca3cd"),  # noqa: E501
+        address=Address(0x33F368F0B54063613CF5944941E8E0E4EEB64697),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0xE6, value=Op.ADDRESS)
-            + Op.SSTORE(key=0xE8, value=Op.ORIGIN)
-            + Op.SSTORE(key=0xEC, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0xEE, value=Op.CODESIZE)
-            + Op.SSTORE(key=0xF0, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 1) (MSTORE 32 (CALLER)) (MSTORE 64 (CALLVALUE)) (MSTORE 96 (ADDRESS)) (MSTORE 128 (ORIGIN)) (MSTORE 160 (CALLDATASIZE)) (MSTORE 192 (CODESIZE)) (MSTORE 224 (GASPRICE))}  # noqa: E501
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x1)
+        + Op.MSTORE(offset=0x20, value=Op.CALLER)
+        + Op.MSTORE(offset=0x40, value=Op.CALLVALUE)
+        + Op.MSTORE(offset=0x60, value=Op.ADDRESS)
+        + Op.MSTORE(offset=0x80, value=Op.ORIGIN)
+        + Op.MSTORE(offset=0xA0, value=Op.CALLDATASIZE)
+        + Op.MSTORE(offset=0xC0, value=Op.CODESIZE)
+        + Op.MSTORE(offset=0xE0, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x33f368f0b54063613cf5944941e8e0e4eeb64697"),  # noqa: E501
+        address=Address(0x29736372C0FAB51DB4556614EF27D74A89ACFE21),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x3D090,
-                address=0x33F368F0B54063613CF5944941E8E0E4EEB64697,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 250000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x3D090,
+            address=0x33F368F0B54063613CF5944941E8E0E4EEB64697,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x620b442c84d5068e6b57d390a1ac99130205406e"),  # noqa: E501
+        address=Address(0x620B442C84D5068E6B57D390A1AC99130205406E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x55730,
-                    address=0xDCC76191E9F918ECFE9FBA5414884D5EE621AE00,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 250000 <contract:0x2000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x3D090,
+            address=0x29736372C0FAB51DB4556614EF27D74A89ACFE21,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbf23f3306533431b2ee5e4ca95e0a0834c090105"),  # noqa: E501
+        address=Address(0xDCC76191E9F918ECFE9FBA5414884D5EE621AE00),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x55730,
+                address=0x620B442C84D5068E6B57D390A1AC99130205406E,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0x2F9EC0AFCB4EDCD7D38C6A48F5E36038263CA3CD),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x3D090,
-                address=0x29736372C0FAB51DB4556614EF27D74A89ACFE21,
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 350000 <contract:0x2000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x55730,
+                address=0xDCC76191E9F918ECFE9FBA5414884D5EE621AE00,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xdcc76191e9f918ecfe9fba5414884d5ee621ae00"),  # noqa: E501
+        address=Address(0xBF23F3306533431B2EE5E4CA95E0A0834C090105),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 1, 1: 1}),
+                addr: Account(storage={0: 1}),
+                addr_3: Account(
+                    storage={
+                        2: 0,
+                        4: 0,
+                        7: 0,
+                        230: 0,
+                        232: 0,
+                        236: 0,
+                        238: 0,
+                        240: 0,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 1, 1: 1}),
+                addr_4: Account(storage={0: 1}),
+                addr_6: Account(
+                    storage={
+                        2: 0,
+                        4: 0,
+                        7: 0,
+                        230: 0,
+                        232: 0,
+                        236: 0,
+                        238: 0,
+                        240: 0,
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [3000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=3000000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcall_00_ooge.py b/tests/ported_static/stStaticCall/test_static_callcall_00_ooge.py
index 18a77602dde..8ba69156208 100644
--- a/tests/ported_static/stStaticCall/test_static_callcall_00_ooge.py
+++ b/tests/ported_static/stStaticCall/test_static_callcall_00_ooge.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_callcall_00_ooge.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcall_00_OOGEFiller.json
+state_tests/stStaticCall/static_callcall_00_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,52 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcall_00_OOGEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcall_00_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000002f9ec0afcb4edcd7d38c6a48f5e36038263ca3cd",
-            {
-                Address("0x2f9ec0afcb4edcd7d38c6a48f5e36038263ca3cd"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000998a75f1a4457fb7b5872c51f34aa7256f732b1e",
-            {
-                Address("0x998a75f1a4457fb7b5872c51f34aa7256f732b1e"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcall_00_ooge(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcall_00_ooge."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -78,140 +69,164 @@ def test_static_callcall_00_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x2, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x1D4D4,
-                    address=0xCE21F15217A7B94DB9C505A66C9549E803BF141C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2814f1be80fce656766c827bc6e55bfb7a3bc4b9"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x55730,
-                    address=0x2814F1BE80FCE656766C827BC6E55BFB7A3BC4B9,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 2 1) (MSTORE 2 1)}
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.MSTORE(offset=0x2, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2f9ec0afcb4edcd7d38c6a48f5e36038263ca3cd"),  # noqa: E501
+        address=Address(0xCE21F15217A7B94DB9C505A66C9549E803BF141C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0xA18394A87A4C414718BBBEE0F695D74CD7A4F9DE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)  )}
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x998a75f1a4457fb7b5872c51f34aa7256f732b1e"),  # noqa: E501
+        address=Address(0xE574F7EC5305BE91332B5B8B12DEB8966E05F42D),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x2, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x4E34,
-                    address=0xE574F7EC5305BE91332B5B8B12DEB8966E05F42D,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # { (MSTORE 2 1) (STATICCALL 120020 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1)  }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x2, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x1D4D4,
+                address=0xCE21F15217A7B94DB9C505A66C9549E803BF141C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa18394a87a4c414718bbbee0f695d74cd7a4f9de"),  # noqa: E501
+        address=Address(0x2814F1BE80FCE656766C827BC6E55BFB7A3BC4B9),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # {  (MSTORE 2 1) (STATICCALL 20020 <contract:0x2000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x2, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x4E34,
+                address=0xE574F7EC5305BE91332B5B8B12DEB8966E05F42D,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0xA18394A87A4C414718BBBEE0F695D74CD7A4F9DE),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.MSTORE(offset=0x2, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x55730,
+                address=0x2814F1BE80FCE656766C827BC6E55BFB7A3BC4B9,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xce21f15217a7b94db9c505a66c9549e803bf141c"),  # noqa: E501
+        address=Address(0x2F9EC0AFCB4EDCD7D38C6A48F5E36038263CA3CD),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 150000 <contract:0x2000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0xA18394A87A4C414718BBBEE0F695D74CD7A4F9DE,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe574f7ec5305be91332b5b8b12deb8966e05f42d"),  # noqa: E501
+        address=Address(0x998A75F1A4457FB7B5872C51F34AA7256F732B1E),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr: Account(storage={0: 1, 1: 0, 2: 0}),
+                addr_2: Account(storage={1: 0, 2: 0}),
+                addr_3: Account(storage={2: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_4: Account(storage={0: 1, 1: 0, 2: 0}),
+                addr_5: Account(storage={1: 0, 2: 0}),
+                addr_6: Account(storage={2: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcall_00_ooge_1.py b/tests/ported_static/stStaticCall/test_static_callcall_00_ooge_1.py
index 333411da5e6..b1f3f3deb06 100644
--- a/tests/ported_static/stStaticCall/test_static_callcall_00_ooge_1.py
+++ b/tests/ported_static/stStaticCall/test_static_callcall_00_ooge_1.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_callcall_00_ooge_1.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcall_00_OOGE_1Filler.json
+state_tests/stStaticCall/static_callcall_00_OOGE_1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,52 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcall_00_OOGE_1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcall_00_OOGE_1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000a2ca69f1cf9ffa7a761899e8dd2f941d40326fd6",
-            {
-                Address("0xa2ca69f1cf9ffa7a761899e8dd2f941d40326fd6"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000998a75f1a4457fb7b5872c51f34aa7256f732b1e",
-            {
-                Address("0x998a75f1a4457fb7b5872c51f34aa7256f732b1e"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcall_00_ooge_1(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcall_00_ooge_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -78,142 +69,164 @@ def test_static_callcall_00_ooge_1(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x2, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x609E4DFE6190235B9A0362084C741D9EC330FB1E,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1d401212ba6c32405b4fdc993079acab6c7aab6f"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 2 1) (SSTORE 5 (CALLVALUE)) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x5, value=Op.CALLVALUE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x609e4dfe6190235b9a0362084c741d9ec330fb1e"),  # noqa: E501
+        address=Address(0xA65F4B36F21EF107A26AB282B736F93D47BF83DE),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x1D401212BA6C32405B4FDC993079ACAB6C7AAB6F,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)  ) }
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x998a75f1a4457fb7b5872c51f34aa7256f732b1e"),  # noqa: E501
+        address=Address(0x609E4DFE6190235B9A0362084C741D9EC330FB1E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x2, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0xA65F4B36F21EF107A26AB282B736F93D47BF83DE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # { (MSTORE 2 1) (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x2, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0xA65F4B36F21EF107A26AB282B736F93D47BF83DE,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa122fc55193a6573fa47c988f537ae631e411058"),  # noqa: E501
+        address=Address(0xA122FC55193A6573FA47C988F537AE631E411058),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0xA122FC55193A6573FA47C988F537AE631E411058,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # { (MSTORE 2 1) (STATICCALL 100000 <contract:0x2000000000000000000000000000000000000002> 0 64 0 64 )  (MSTORE 32 1) }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x2, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0x609E4DFE6190235B9A0362084C741D9EC330FB1E,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa2ca69f1cf9ffa7a761899e8dd2f941d40326fd6"),  # noqa: E501
+        address=Address(0x1D401212BA6C32405B4FDC993079ACAB6C7AAB6F),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x5, value=Op.CALLVALUE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0xA122FC55193A6573FA47C988F537AE631E411058,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa65f4b36f21ef107a26ab282b736f93d47bf83de"),  # noqa: E501
+        address=Address(0xA2CA69F1CF9FFA7A761899E8DD2F941D40326FD6),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 150000 <contract:0x2000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x1D401212BA6C32405B4FDC993079ACAB6C7AAB6F,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0x998A75F1A4457FB7B5872C51F34AA7256F732B1E),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 1, 1: 1}),
+                addr: Account(storage={0: 1}),
+                addr_3: Account(storage={2: 0, 5: 0}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 1, 1: 1}),
+                addr_4: Account(storage={0: 1}),
+                addr_6: Account(storage={2: 0, 5: 0}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [380066]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=380066,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcall_00_ooge_2.py b/tests/ported_static/stStaticCall/test_static_callcall_00_ooge_2.py
index 7f98c5953ab..cd3bcbb96cb 100644
--- a/tests/ported_static/stStaticCall/test_static_callcall_00_ooge_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcall_00_ooge_2.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcall_00_ooge_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcall_00_OOGE_2Filler.json
+state_tests/stStaticCall/static_callcall_00_OOGE_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcall_00_OOGE_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcall_00_OOGE_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000a2ca69f1cf9ffa7a761899e8dd2f941d40326fd6",
-        "000000000000000000000000998a75f1a4457fb7b5872c51f34aa7256f732b1e",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcall_00_ooge_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcall_00_ooge_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,142 +66,146 @@ def test_static_callcall_00_ooge_2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x2, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0xA65F4B36F21EF107A26AB282B736F93D47BF83DE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2defc3fb57b42969b271935d982740948b92e86b"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 2 1) (SSTORE 5 (CALLVALUE)) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.SSTORE(key=0x5, value=Op.CALLVALUE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x609e4dfe6190235b9a0362084c741d9ec330fb1e"),  # noqa: E501
+        address=Address(0xA65F4B36F21EF107A26AB282B736F93D47BF83DE),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0xDDC2B4BC1FB31ED3CD95025FB7C668BA01B2DB6C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)  ) }
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x998a75f1a4457fb7b5872c51f34aa7256f732b1e"),  # noqa: E501
+        address=Address(0x609E4DFE6190235B9A0362084C741D9EC330FB1E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x2DEFC3FB57B42969B271935D982740948B92E86B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 2 1) (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x2, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0xA65F4B36F21EF107A26AB282B736F93D47BF83DE,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa2ca69f1cf9ffa7a761899e8dd2f941d40326fd6"),  # noqa: E501
+        address=Address(0x2DEFC3FB57B42969B271935D982740948B92E86B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x5, value=Op.CALLVALUE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 2 1) (STATICCALL 100000 <contract:0x2000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x2, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0x609E4DFE6190235B9A0362084C741D9EC330FB1E,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa65f4b36f21ef107a26ab282b736f93d47bf83de"),  # noqa: E501
+        address=Address(0xDDC2B4BC1FB31ED3CD95025FB7C668BA01B2DB6C),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x2DEFC3FB57B42969B271935D982740948B92E86B,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0xA2CA69F1CF9FFA7A761899E8DD2F941D40326FD6),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x2, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x609E4DFE6190235B9A0362084C741D9EC330FB1E,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 150000 <contract:0x2000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0xDDC2B4BC1FB31ED3CD95025FB7C668BA01B2DB6C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xddc2b4bc1fb31ed3cd95025fb7c668ba01b2db6c"),  # noqa: E501
+        address=Address(0x998A75F1A4457FB7B5872C51F34AA7256F732B1E),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [150066]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=150066,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post: dict = {}
+    post = {
+        addr_3: Account(storage={2: 0, 5: 0}),
+        addr: Account(storage={0: 0}),
+        target: Account(storage={0: 0, 1: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcall_00_suicide_end.py b/tests/ported_static/stStaticCall/test_static_callcall_00_suicide_end.py
index 9f264b03adc..773ad47ca84 100644
--- a/tests/ported_static/stStaticCall/test_static_callcall_00_suicide_end.py
+++ b/tests/ported_static/stStaticCall/test_static_callcall_00_suicide_end.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcall_00_suicide_end.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcall_00_SuicideEndFiller.json
+state_tests/stStaticCall/static_callcall_00_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcall_00_SuicideEndFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcall_00_SuicideEndFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcall_00_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcall_00_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,63 +44,64 @@ def test_static_callcall_00_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x20, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0xCFB5784A5E49924BECC2D5C5D2EE0A9B141E6216,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xA2CA69F1CF9FFA7A761899E8DD2F941D40326FD6
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 2 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x2, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x662727c5fec3e62db4f386d95388caedd4067bb8"),  # noqa: E501
+        address=Address(0xCFB5784A5E49924BECC2D5C5D2EE0A9B141E6216),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x662727C5FEC3E62DB4F386D95388CAEDD4067BB8,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x662727C5FEC3E62DB4F386D95388CAEDD4067BB8,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa2ca69f1cf9ffa7a761899e8dd2f941d40326fd6"),  # noqa: E501
+        address=Address(0xA2CA69F1CF9FFA7A761899E8DD2F941D40326FD6),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x2, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (MSTORE 32 1) (STATICCALL 50000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x20, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0xCFB5784A5E49924BECC2D5C5D2EE0A9B141E6216,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SELFDESTRUCT(address=0xA2CA69F1CF9FFA7A761899E8DD2F941D40326FD6)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xcfb5784a5e49924becc2d5c5d2ee0a9b141e6216"),  # noqa: E501
+        address=Address(0x662727C5FEC3E62DB4F386D95388CAEDD4067BB8),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={0: 0}, balance=0xDE0B6B3A7640000),
+        addr_2: Account(storage={2: 0}, balance=0x2540BE400),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcall_000.py b/tests/ported_static/stStaticCall/test_static_callcallcall_000.py
index 3164cb157f9..2388568f0db 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcall_000.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcall_000.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_callcallcall_000.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcallcall_000Filler.json
+state_tests/stStaticCall/static_callcallcall_000Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,52 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcall_000Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcall_000Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000fb157bfd4470ab46dffec6f8390b747c67f62b38",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xfb157bfd4470ab46dffec6f8390b747c67f62b38"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000bf23f3306533431b2ee5e4ca95e0a0834c090105",
-            {
-                Address("0xbf23f3306533431b2ee5e4ca95e0a0834c090105"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcall_000(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcall_000."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -78,177 +69,228 @@ def test_static_callcallcall_000(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x181b4ed322e192361633cc3c0a418f259ab0cf4b"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE))}  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x181B4ED322E192361633CC3C0A418F259AB0CF4B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x61A80,
-                    address=0x3F6D147A714319EF90C47921715DC5F0CCFE3B09,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x36ace903a154317b8fa379aad88a425b7ef025dc"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x3D090,
-                    address=0x181B4ED322E192361633CC3C0A418F259AB0CF4B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x3D090,
+                address=0x181B4ED322E192361633CC3C0A418F259AB0CF4B,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3f6d147a714319ef90c47921715dc5f0ccfe3b09"),  # noqa: E501
+        address=Address(0x3F6D147A714319EF90C47921715DC5F0CCFE3B09),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x3D090,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 250000 <contract:0x2000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x3D090,
+                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x85ee033b8ff327153f5c82d191b4942102debffc"),  # noqa: E501
+        address=Address(0x85EE033B8FF327153F5C82D191B4942102DEBFFC),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x55730,
-                    address=0xD518EBB39FB88BEB34AD1598FE3CCD3F8E4C4708,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 400000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x61A80,
+                address=0x3F6D147A714319EF90C47921715DC5F0CCFE3B09,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbf23f3306533431b2ee5e4ca95e0a0834c090105"),  # noqa: E501
+        address=Address(0x36ACE903A154317B8FA379AAD88A425B7EF025DC),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 300000 <contract:0x2000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=0x85EE033B8FF327153F5C82D191B4942102DEBFFC,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0xD518EBB39FB88BEB34AD1598FE3CCD3F8E4C4708),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0x85EE033B8FF327153F5C82D191B4942102DEBFFC,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 650000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x9EB10,
+                address=0x36ACE903A154317B8FA379AAD88A425B7EF025DC,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd518ebb39fb88beb34ad1598fe3ccd3f8e4c4708"),  # noqa: E501
+        address=Address(0xFB157BFD4470AB46DFFEC6F8390B747C67F62B38),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x9EB10,
-                    address=0x36ACE903A154317B8FA379AAD88A425B7EF025DC,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 350000 <contract:0x2000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x55730,
+                address=0xD518EBB39FB88BEB34AD1598FE3CCD3F8E4C4708,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfb157bfd4470ab46dffec6f8390b747c67f62b38"),  # noqa: E501
+        address=Address(0xBF23F3306533431B2EE5E4CA95E0A0834C090105),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr: Account(storage={0: 1}),
+                addr_2: Account(storage={}),
+                addr_3: Account(storage={}),
+                addr_4: Account(
+                    storage={
+                        3: 0,
+                        4: 0,
+                        7: 0,
+                        330: 0,
+                        332: 0,
+                        336: 0,
+                        338: 0,
+                        340: 0,
+                    },
+                ),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr_5: Account(storage={0: 1}),
+                addr_6: Account(storage={}),
+                addr_7: Account(storage={}),
+                addr_8: Account(
+                    storage={
+                        3: 0,
+                        4: 0,
+                        7: 0,
+                        330: 0,
+                        332: 0,
+                        336: 0,
+                        338: 0,
+                        340: 0,
+                    },
+                ),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_5, left_padding=True),
+    ]
+    tx_gas = [3000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=3000000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcall_000_ooge.py b/tests/ported_static/stStaticCall/test_static_callcallcall_000_ooge.py
index fbfe55d3095..83d2fc21188 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcall_000_ooge.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcall_000_ooge.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_callcallcall_000_ooge.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcallcall_000_OOGEFiller.json
+state_tests/stStaticCall/static_callcallcall_000_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,52 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcall_000_OOGEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcall_000_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000071587c3e5f2ebf88b2a5b048733778605addb28",
-            {
-                Address("0x071587c3e5f2ebf88b2a5b048733778605addb28"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000009b0cb3cb3655d3173ff7c2cd51319aaf2cca3cad",
-            {
-                Address("0x9b0cb3cb3655d3173ff7c2cd51319aaf2cca3cad"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcall_000_ooge(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcall_000_ooge."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -78,178 +69,198 @@ def test_static_callcallcall_000_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x7A120,
-                    address=0xA69F4D8056BB192982BF07D59AD0FF96A15B41D9,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x071587c3e5f2ebf88b2a5b048733778605addb28"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x927C0,
-                    address=0xA69F4D8056BB192982BF07D59AD0FF96A15B41D9,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (MSTORE 3 1)}
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9b0cb3cb3655d3173ff7c2cd51319aaf2cca3cad"),  # noqa: E501
+        address=Address(0x9D41CA9233D19D3202BEFCEF33F16AF7201F0EAA),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)  ) }
+    addr_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9d41ca9233d19d3202befcef33f16af7201f0eaa"),  # noqa: E501
+        address=Address(0xF31E5B020AFCCF373BFA588C4D3A199C4F7A46A4),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0xCD0BD482BAEEB001E6F3FFD36BCEB34D32169C93,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {   (MSTORE 3 1) (STATICCALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x1D4D4,
+                address=0x9D41CA9233D19D3202BEFCEF33F16AF7201F0EAA,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa69f4d8056bb192982bf07d59ad0ff96a15b41d9"),  # noqa: E501
+        address=Address(0xCD0BD482BAEEB001E6F3FFD36BCEB34D32169C93),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0xAC6BF72C47193C6FEFC55EFCC14674F8023F39F9,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {   (MSTORE 3 1) (STATICCALL 120020 <contract:0x2000000000000000000000000000000000000003> 0 64 0 64 )(MSTORE 32 1) }  # noqa: E501
+    addr_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x1D4D4,
+                address=0xF31E5B020AFCCF373BFA588C4D3A199C4F7A46A4,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa76ce2de971ea2b78bc19ba706cb135f4fff2cc2"),  # noqa: E501
+        address=Address(0xAC6BF72C47193C6FEFC55EFCC14674F8023F39F9),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x1D4D4,
-                    address=0xF31E5B020AFCCF373BFA588C4D3A199C4F7A46A4,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {   (MSTORE 3 1) (STATICCALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=0xCD0BD482BAEEB001E6F3FFD36BCEB34D32169C93,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xac6bf72c47193c6fefc55efcc14674f8023f39f9"),  # noqa: E501
+        address=Address(0xA69F4D8056BB192982BF07D59AD0FF96A15B41D9),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # {   (MSTORE 3 1) (STATICCALL 300000 <contract:0x2000000000000000000000000000000000000002> 0 64 0 64 )(MSTORE 32 1) }  # noqa: E501
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=0xAC6BF72C47193C6FEFC55EFCC14674F8023F39F9,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0xA76CE2DE971EA2B78BC19BA706CB135F4FFF2CC2),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x1D4D4,
-                    address=0x9D41CA9233D19D3202BEFCEF33F16AF7201F0EAA,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x7A120,
+                address=0xA69F4D8056BB192982BF07D59AD0FF96A15B41D9,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xcd0bd482baeeb001e6f3ffd36bceb34d32169c93"),  # noqa: E501
+        address=Address(0x071587C3E5F2EBF88B2A5B048733778605ADDB28),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 600000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x927C0,
+                address=0xA69F4D8056BB192982BF07D59AD0FF96A15B41D9,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf31e5b020afccf373bfa588c4d3a199c4f7a46a4"),  # noqa: E501
+        address=Address(0x9B0CB3CB3655D3173FF7C2CD51319AAF2CCA3CAD),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr: Account(storage={0: 1, 1: 0, 2: 0, 3: 0}),
+                addr_2: Account(storage={1: 0, 2: 0, 3: 0}),
+                addr_3: Account(storage={2: 0, 3: 0}),
+                addr_4: Account(storage={3: 0}),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_5, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcall_000_oogm_after.py b/tests/ported_static/stStaticCall/test_static_callcallcall_000_oogm_after.py
index 61c42359e8a..07d09664469 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcall_000_oogm_after.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcall_000_oogm_after.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcall_000_oogm_after.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcall_000_OOGMAfterFiller.json
+state_tests/stStaticCall/static_callcallcall_000_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcall_000_OOGMAfterFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcall_000_OOGMAfterFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcall_000_oogm_after(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcall_000_oogm_after."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,81 +44,80 @@ def test_static_callcallcall_000_oogm_after(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 600150 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 111 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x92856,
-                    address=0x8FF16542095DE9F85F7C395D6D543D19B30D97D7,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x6F, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x03681c634a188409b5f9b8ca2382c1a1499d8a0d"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x61AD0,
-                    address=0xC2234F6B4A777DB8DF1447C9C2D0C8CEE376DE76,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x1D4D4,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8ff16542095de9f85f7c395d6d543d19b30d97d7"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x1D4D4,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 400080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SSTORE 3 1)}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x61AD0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.STOP,
+        nonce=0,
+    )
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 600150 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 111 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x92856,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x6F, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc2234f6b4a777db8df1447c9c2d0c8cee376de76"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1720000,
     )
 
     post = {
-        contract: Account(storage={111: 1}),
+        target: Account(storage={0: 0, 1: 0, 2: 0, 3: 0, 111: 1}),
+        addr: Account(storage={1: 0, 2: 0, 3: 0}),
+        addr_2: Account(storage={2: 0, 3: 0}),
+        addr_3: Account(storage={3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcall_000_oogm_after2.py b/tests/ported_static/stStaticCall/test_static_callcallcall_000_oogm_after2.py
index 80b94f728a1..e1d996d11d3 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcall_000_oogm_after2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcall_000_oogm_after2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcall_000_oogm_after2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcall_000_OOGMAfter2Filler.json
+state_tests/stStaticCall/static_callcallcall_000_OOGMAfter2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcall_000_OOGMAfter2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcall_000_OOGMAfter2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcall_000_oogm_after2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcall_000_oogm_after2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,89 +44,87 @@ def test_static_callcallcall_000_oogm_after2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x6DDD0,
-                    address=0xA34EEE061F267A63C872265BED51C483F777A7B0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x44,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x10345562e309b2045c737ffdd46e941710495fc4"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 700000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 111 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xAAE60,
-                    address=0x10345562E309B2045C737FFDD46E941710495FC4,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {   (MSTORE 3 1) (STATICCALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 )  (MSTORE 32 1)}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x1D4D4,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x6F, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6de4e4fa82a7139e6804b5b47b42e366a9595946"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x1D4D4,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {   (MSTORE 3 1) (STATICCALL 450000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)  ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x6DDD0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x44, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.STOP,
+        nonce=0,
+    )
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 700000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 111 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xAAE60,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x6F, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa34eee061f267a63c872265bed51c483f777a7b0"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1720000,
     )
 
     post = {
-        contract: Account(storage={111: 1}),
+        target: Account(storage={0: 0, 1: 0, 2: 0, 3: 0, 111: 1}),
+        addr: Account(storage={1: 0, 2: 0, 3: 0}),
+        addr_2: Account(storage={2: 0, 3: 0}),
+        addr_3: Account(storage={3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcall_000_oogm_before.py b/tests/ported_static/stStaticCall/test_static_callcallcall_000_oogm_before.py
index b9e2caf8d9f..d7cef670092 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcall_000_oogm_before.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcall_000_oogm_before.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcall_000_oogm_before.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcall_000_OOGMBeforeFiller.json
+state_tests/stStaticCall/static_callcallcall_000_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcall_000_OOGMBeforeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcall_000_OOGMBeforeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcall_000_oogm_before(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcall_000_oogm_before."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,82 +44,80 @@ def test_static_callcallcall_000_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 600000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x927C0,
-                    address=0xEDBFA645E2C5462398C0BD3A12E41EF8EC1F9F5,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x081fa564a44bd568ecf6d6b044899f7ee4057f5f"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x61AD0,
-                address=0x97498B4CE896BE02417BCFE036BEAC3332185563,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)  ) (STATICCALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STATICCALL(
+            gas=0x1D4D4,
+            address=addr_3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0edbfa645e2c5462398c0bd3a12e41ef8ec1f9f5"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (STATICCALL 400080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x61AD0,
+            address=addr_2,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STATICCALL(
-                gas=0x1D4D4,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 600000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x927C0,
+                address=addr,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x97498b4ce896be02417bcfe036beac3332185563"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1720000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 0, 3: 0}),
+        addr: Account(storage={1: 0, 2: 0, 3: 0}),
+        addr_2: Account(storage={2: 0, 3: 0}),
+        addr_3: Account(storage={3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcall_000_suicide_end.py b/tests/ported_static/stStaticCall/test_static_callcallcall_000_suicide_end.py
index 805228eba19..78d2acd9b59 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcall_000_suicide_end.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcall_000_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcall_000_suicide_end.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcall_000_SuicideEndFiller.json
+state_tests/stStaticCall/static_callcallcall_000_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcall_000_SuicideEndFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcall_000_SuicideEndFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcall_000_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcall_000_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,86 +44,85 @@ def test_static_callcallcall_000_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1)  }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x3423652bb0c864ac51c919168f106e55d6f7d138"),  # noqa: E501
+        address=Address(0x3423652BB0C864AC51C919168F106E55D6F7D138),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x569cdc3b32cc3f9747bbde39fd70fead591d2f0d"),  # noqa: E501
+        address=Address(0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0xCB401DA610F6DE2240321640E8BF2803CE6BFD0A,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0xCB401DA610F6DE2240321640E8BF2803CE6BFD0A,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x620b381d01cbd812ffb798ab35a1a316bde90ce6"),  # noqa: E501
+        address=Address(0x620B381D01CBD812FFB798AB35A1A316BDE90CE6),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x3423652BB0C864AC51C919168F106E55D6F7D138,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6
+    # Source: lll
+    # { (MSTORE 3 1) (STATICCALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x3423652BB0C864AC51C919168F106E55D6F7D138,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xcb401da610f6de2240321640e8bf2803ce6bfd0a"),  # noqa: E501
+        address=Address(0xCB401DA610F6DE2240321640E8BF2803CE6BFD0A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr_2: Account(balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcall_000_suicide_middle.py b/tests/ported_static/stStaticCall/test_static_callcallcall_000_suicide_middle.py
index 13d50b5973f..56cf3224bd1 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcall_000_suicide_middle.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcall_000_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcall_000_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcall_000_SuicideMiddleFiller.json
+state_tests/stStaticCall/static_callcallcall_000_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcall_000_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcall_000_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcall_000_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcall_000_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,81 +46,84 @@ def test_static_callcallcall_000_suicide_middle(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x72CC05B5A698AA0AE6848A4814180A756561F046,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 )  [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x620b381d01cbd812ffb798ab35a1a316bde90ce6"),  # noqa: E501
+        address=Address(0x8D1428C10723924A74AB6096C463EDAAB4CEA5FB),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x8D1428C10723924A74AB6096C463EDAAB4CEA5FB)
-            + Op.STATICCALL(
-                gas=0xC350,
-                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0x72CC05B5A698AA0AE6848A4814180A756561F046,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x72cc05b5a698aa0ae6848a4814180a756561f046"),  # noqa: E501
+        address=Address(0x620B381D01CBD812FFB798AB35A1A316BDE90CE6),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 )  [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) (STATICCALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x8D1428C10723924A74AB6096C463EDAAB4CEA5FB
+        )
+        + Op.STATICCALL(
+            gas=0xC350,
+            address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0x8d1428c10723924a74ab6096c463edaab4cea5fb"),  # noqa: E501
+        address=Address(0x72CC05B5A698AA0AE6848A4814180A756561F046),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}, balance=0xDE0B6B3A7640000),
+        addr: Account(storage={1: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcall_abcb_recursive.py b/tests/ported_static/stStaticCall/test_static_callcallcall_abcb_recursive.py
index c64c051a40d..0a0b4b64deb 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcall_abcb_recursive.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcall_abcb_recursive.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcall_abcb_recursive.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcall_ABCB_RECURSIVEFiller.json
+state_tests/stStaticCall/static_callcallcall_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcall_ABCB_RECURSIVEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcall_ABCB_RECURSIVEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcall_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcall_abcb_recursive."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,76 +44,78 @@ def test_static_callcallcall_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  (MSTORE 1 1) (STATICCALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) (MSTORE 2 1) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x17D7840,
-                    address=0xF687BDDCD749D085FD830B4E865CB76BB4F981AB,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x17D7840,
+                address=0xF687BDDCD749D085FD830B4E865CB76BB4F981AB,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x2, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x2, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa1d5b67585a05602670674bdb13ff8fedebe05bc"),  # noqa: E501
+        address=Address(0xA1D5B67585A05602670674BDB13FF8FEDEBE05BC),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x5, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x7A120,
-                    address=0xF687BDDCD749D085FD830B4E865CB76BB4F981AB,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {   (MSTORE 3 1) (STATICCALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 4 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xF4240,
+                address=0xE6F4B463900F4C325A940DCA2C0C6B1C075631C9,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x6, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x4, value=0x1)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xe6f4b463900f4c325a940dca2c0c6b1c075631c9"),  # noqa: E501
+        address=Address(0xF687BDDCD749D085FD830B4E865CB76BB4F981AB),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xF4240,
-                    address=0xE6F4B463900F4C325A940DCA2C0C6B1C075631C9,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # { (MSTORE 5 1) (STATICCALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) (MSTORE 6 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x5, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x7A120,
+                address=0xF687BDDCD749D085FD830B4E865CB76BB4F981AB,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x4, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x6, value=0x1)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xf687bddcd749d085fd830b4e865cb76bb4f981ab"),  # noqa: E501
+        address=Address(0xE6F4B463900F4C325A940DCA2C0C6B1C075631C9),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={0: 0, 1: 0}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001.py b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001.py
index ce81b847f97..10695d92061 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_callcallcallcode_001.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcallcallcode_001Filler.json
+state_tests/stStaticCall/static_callcallcallcode_001Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,52 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcallcode_001Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcallcode_001Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000009121e482add3986513a14639db36d5ec5ae41fb8",
-            {
-                Address("0x9121e482add3986513a14639db36d5ec5ae41fb8"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000bf23f3306533431b2ee5e4ca95e0a0834c090105",
-            {
-                Address("0xbf23f3306533431b2ee5e4ca95e0a0834c090105"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcallcode_001(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcallcode_001."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -78,178 +69,212 @@ def test_static_callcallcallcode_001(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0x82D1FD8C6ED53A58BD8B065074A6B572A7CA89FA,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.SSTORE(key=0x4, value=Op.CALLER)
+        + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
+        + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
+        + Op.SSTORE(key=0x152, value=Op.CODESIZE)
+        + Op.SSTORE(key=0x154, value=Op.GASPRICE)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x5ccb387ab81f41f0b490664795e7004d5d14bf91"),  # noqa: E501
+        address=Address(0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0xF18DDE9381A558C4BE0B84B0F3A17E22B3F9FFCE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x69ce59f2414271f3e079542ef3893a021d7d68ea"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x4, value=Op.CALLER)
-            + Op.SSTORE(key=0x7, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x14A, value=Op.ADDRESS)
-            + Op.SSTORE(key=0x14C, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x150, value=Op.CALLDATASIZE)
-            + Op.SSTORE(key=0x152, value=Op.CODESIZE)
-            + Op.SSTORE(key=0x154, value=Op.GASPRICE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 3 1)  (DELEGATECALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x3D090,
+                address=0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7e63847aad8ca50fb7c04777dce6871a6bf8de0c"),  # noqa: E501
+        address=Address(0x82D1FD8C6ED53A58BD8B065074A6B572A7CA89FA),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x3D090,
-                    address=0x7E63847AAD8CA50FB7C04777DCE6871A6BF8DE0C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # { (MSTORE 3 1)  (DELEGATECALL 250000 <contract:0x2000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x3D090,
+                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x82d1fd8c6ed53a58bd8b065074a6b572a7ca89fa"),  # noqa: E501
+        address=Address(0xF18DDE9381A558C4BE0B84B0F3A17E22B3F9FFCE),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x55730,
-                    address=0x5CCB387AB81F41F0B490664795E7004D5D14BF91,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # { (MSTORE 3 1)  (STATICCALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=0x82D1FD8C6ED53A58BD8B065074A6B572A7CA89FA,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9121e482add3986513a14639db36d5ec5ae41fb8"),  # noqa: E501
+        address=Address(0x5CCB387AB81F41F0B490664795E7004D5D14BF91),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x55730,
-                    address=0x69CE59F2414271F3E079542EF3893A021D7D68EA,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # { (MSTORE 3 1)  (STATICCALL 300000 <contract:0x2000000000000000000000000000000000000002> 0 64 0 64 )(MSTORE 3 1)  }  # noqa: E501
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=0xF18DDE9381A558C4BE0B84B0F3A17E22B3F9FFCE,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbf23f3306533431b2ee5e4ca95e0a0834c090105"),  # noqa: E501
+        address=Address(0x69CE59F2414271F3E079542EF3893A021D7D68EA),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) (MSTORE 3 1)  }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x55730,
+                address=0x5CCB387AB81F41F0B490664795E7004D5D14BF91,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0x9121E482ADD3986513A14639DB36D5EC5AE41FB8),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x3D090,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 350000 <contract:0x2000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x55730,
+                address=0x69CE59F2414271F3E079542EF3893A021D7D68EA,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf18dde9381a558c4be0b84b0f3a17e22b3f9ffce"),  # noqa: E501
+        address=Address(0xBF23F3306533431B2EE5E4CA95E0A0834C090105),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                addr: Account(storage={0: 1, 1: 0, 3: 0, 4: 0}),
+                addr_2: Account(storage={1: 0, 3: 0, 4: 0}),
+                addr_3: Account(
+                    storage={
+                        2: 0,
+                        3: 0,
+                        4: 0,
+                        7: 0,
+                        330: 0,
+                        332: 0,
+                        336: 0,
+                        338: 0,
+                        340: 0,
+                    },
+                ),
+                target: Account(storage={0: 1, 1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_5, left_padding=True),
+    ]
+    tx_gas = [3000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=3000000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_2.py b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_2.py
index 86fb9d53a72..f76a30dbfa5 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_2.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_callcallcallcode_001_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcallcallcode_001_2Filler.json
+state_tests/stStaticCall/static_callcallcallcode_001_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,52 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcallcode_001_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcallcode_001_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000002f9ec0afcb4edcd7d38c6a48f5e36038263ca3cd",
-            {
-                Address("0x2f9ec0afcb4edcd7d38c6a48f5e36038263ca3cd"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xe4552fdc3736d39144e64ad1a1e8253017b0c974"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000bf23f3306533431b2ee5e4ca95e0a0834c090105",
-            {
-                Address("0xbf23f3306533431b2ee5e4ca95e0a0834c090105"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xe4552fdc3736d39144e64ad1a1e8253017b0c974"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcallcode_001_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcallcode_001_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -78,166 +69,215 @@ def test_static_callcallcallcode_001_2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x2,
-                value=Op.CALLCODE(
-                    gas=0x3D090,
-                    address=0x2881A083EA775F78057A93F73110241FDB7398A9,
-                    value=0x3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1}
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0ffffaeb931552e5f094ca96a70be612da56b887"),  # noqa: E501
+        address=Address(0xE4552FDC3736D39144E64AD1A1E8253017B0C974),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 1 0x11223344) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1, value=0x11223344) + Op.STOP,
         nonce=0,
-        address=Address("0x2881a083ea775f78057a93f73110241fdb7398a9"),  # noqa: E501
+        address=Address(0x2881A083EA775F78057A93F73110241FDB7398A9),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x55730,
-                    address=0x52BC8086D7F6AC48937CF1B98DFC6F4BE0F75112,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x2f9ec0afcb4edcd7d38c6a48f5e36038263ca3cd"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 2 ]] (CALLCODE 250000 <contract:0x1000000000000000000000000000000000000003> 3 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.CALLCODE(
+                gas=0x3D090,
+                address=0x2881A083EA775F78057A93F73110241FDB7398A9,
+                value=0x3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x0FFFFAEB931552E5F094CA96A70BE612DA56B887),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0xFFFFAEB931552E5F094CA96A70BE612DA56B887,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 4 1) (CALLCODE 250000 <contract:0x2000000000000000000000000000000000000003> 0 0 64 0 64 ) (MSTORE 6 1) }  # noqa: E501
+    addr_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x4, value=0x1)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x3D090,
+                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x6, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x52bc8086d7f6ac48937cf1b98dfc6f4be0f75112"),  # noqa: E501
+        address=Address(0x5517C40699CEB16C4EB71F2B0D841078C198560E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x4, value=0x1)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x3D090,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (STATICCALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=0xFFFFAEB931552E5F094CA96A70BE612DA56B887,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x6, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x5517c40699ceb16c4eb71f2b0d841078c198560e"),  # noqa: E501
+        address=Address(0x52BC8086D7F6AC48937CF1B98DFC6F4BE0F75112),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0x5517C40699CEB16C4EB71F2B0D841078C198560E,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (STATICCALL 300000 <contract:0x2000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=0x5517C40699CEB16C4EB71F2B0D841078C198560E,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb4631a307a08abc5d5a582549b23cb98a7c5beb2"),  # noqa: E501
+        address=Address(0xB4631A307A08ABC5D5A582549B23CB98A7C5BEB2),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x55730,
-                    address=0xB4631A307A08ABC5D5A582549B23CB98A7C5BEB2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x55730,
+                address=0x52BC8086D7F6AC48937CF1B98DFC6F4BE0F75112,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbf23f3306533431b2ee5e4ca95e0a0834c090105"),  # noqa: E501
+        address=Address(0x2F9EC0AFCB4EDCD7D38C6A48F5E36038263CA3CD),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1}
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 350000 <contract:0x2000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x55730,
+                address=0xB4631A307A08ABC5D5A582549B23CB98A7C5BEB2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe4552fdc3736d39144e64ad1a1e8253017b0c974"),  # noqa: E501
+        address=Address(0xBF23F3306533431B2EE5E4CA95E0A0834C090105),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 1, 1: 1}),
+                addr_3: Account(
+                    storage={
+                        2: 0,
+                        3: 0,
+                        4: 0,
+                        7: 0,
+                        330: 0,
+                        332: 0,
+                        336: 0,
+                        338: 0,
+                        340: 0,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(storage={0: 1, 1: 1}),
+                addr_3: Account(
+                    storage={
+                        2: 0,
+                        3: 0,
+                        4: 0,
+                        7: 0,
+                        330: 0,
+                        332: 0,
+                        336: 0,
+                        338: 0,
+                        340: 0,
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_5, left_padding=True),
+    ]
+    tx_gas = [3000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=3000000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_ooge.py b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_ooge.py
index 78e33a51606..948a7ec6d19 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_ooge.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_ooge.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcallcode_001_ooge.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcallcode_001_OOGEFiller.json
+state_tests/stStaticCall/static_callcallcallcode_001_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcallcode_001_OOGEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcallcode_001_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcallcode_001_ooge(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcallcode_001_ooge."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,92 +44,89 @@ def test_static_callcallcallcode_001_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 600000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) (MSTORE 3 1)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x927C0,
-                    address=0x6F80B859BA9392B2C26E5930C330D4A7247FBA4F,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)  )}
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x563f06d1277f7cb092689ac2168d6eecd1acb499"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0xA3E14608664E4A0229F96C49500F83F0FDBF3DCB,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (DELEGATECALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 3 1)}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x1D4D4,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6f80b859ba9392b2c26e5930c330d4a7247fba4f"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x1D4D4,
-                    address=0xE574F7EC5305BE91332B5B8B12DEB8966E05F42D,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # { (MSTORE 3 1) (STATICCALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 3 1)}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa3e14608664e4a0229f96c49500f83f0fdbf3dcb"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 600000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) (MSTORE 3 1)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x927C0,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe574f7ec5305be91332b5b8b12deb8966e05f42d"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1720000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1, 2: 0, 3: 0}),
+        addr: Account(storage={1: 0, 2: 0, 3: 0}),
+        addr_2: Account(storage={2: 0, 3: 0}),
+        addr_3: Account(storage={3: 0}),
+        sender: Account(storage={1: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_ooge_2.py b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_ooge_2.py
index 8212de482cf..970133882b1 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_ooge_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_ooge_2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcallcode_001_ooge_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcallcode_001_OOGE_2Filler.json
+state_tests/stStaticCall/static_callcallcallcode_001_OOGE_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,52 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcallcode_001_OOGE_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcallcode_001_OOGE_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000071587c3e5f2ebf88b2a5b048733778605addb28",
-            {
-                Address("0x071587c3e5f2ebf88b2a5b048733778605addb28"): Account(
-                    storage={0: 1}
-                ),
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000ed9009abb678fb6e7898148dc46fa339ea580cbd",
-            {
-                Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"): Account(
-                    storage={0: 1, 1: 1}
-                ),
-                Address("0xed9009abb678fb6e7898148dc46fa339ea580cbd"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcallcode_001_ooge_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcallcode_001_ooge_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -79,164 +66,164 @@ def test_static_callcallcallcode_001_ooge_2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x7A120,
-                    address=0xBDA9155E6214FE759004E6FCBE736289EF800528,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x071587c3e5f2ebf88b2a5b048733778605addb28"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x493E0,
-                address=0xA7C64824C59E4295A3868A2B275AD46B38F7846D,
+    # Source: lll
+    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
                 args_offset=0x0,
-                args_size=0x40,
+                args_size=0x0,
                 ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2db6829f13013d6280c5be4f6a5e87de274a3c47"),  # noqa: E501
+        address=Address(0xC0E4183389EB57F779A986D8C878F89B9401DC8E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (MSTORE 3 1)}
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x609e4dfe6190235b9a0362084c741d9ec330fb1e"),  # noqa: E501
+        address=Address(0x9D41CA9233D19D3202BEFCEF33F16AF7201F0EAA),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)  ) }
+    addr_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9d41ca9233d19d3202befcef33f16af7201f0eaa"),  # noqa: E501
+        address=Address(0x609E4DFE6190235B9A0362084C741D9EC330FB1E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x1D4D4,
-                address=0x609E4DFE6190235B9A0362084C741D9EC330FB1E,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALLCODE 120020 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x1D4D4,
+            address=0x9D41CA9233D19D3202BEFCEF33F16AF7201F0EAA,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa7c64824c59e4295a3868a2b275ad46b38f7846d"),  # noqa: E501
+        address=Address(0xFEE7D85F02F84CE8917FA8300FEA57FF41AD47D7),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x493E0,
-                address=0xFEE7D85F02F84CE8917FA8300FEA57FF41AD47D7,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALLCODE 120020 <contract:0x2000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x1D4D4,
+            address=0x609E4DFE6190235B9A0362084C741D9EC330FB1E,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xbda9155e6214fe759004e6fcbe736289ef800528"),  # noqa: E501
+        address=Address(0xA7C64824C59E4295A3868A2B275AD46B38F7846D),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x493E0,
+            address=0xFEE7D85F02F84CE8917FA8300FEA57FF41AD47D7,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc0e4183389eb57f779a986d8c878f89b9401dc8e"),  # noqa: E501
+        address=Address(0xBDA9155E6214FE759004E6FCBE736289EF800528),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x7A120,
-                    address=0x2DB6829F13013D6280C5BE4F6A5E87DE274A3C47,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 300000 <contract:0x2000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x493E0,
+            address=0xA7C64824C59E4295A3868A2B275AD46B38F7846D,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        nonce=0,
+        address=Address(0x2DB6829F13013D6280C5BE4F6A5E87DE274A3C47),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x7A120,
+                address=0xBDA9155E6214FE759004E6FCBE736289EF800528,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xed9009abb678fb6e7898148dc46fa339ea580cbd"),  # noqa: E501
+        address=Address(0x071587C3E5F2EBF88B2A5B048733778605ADDB28),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x1D4D4,
-                address=0x9D41CA9233D19D3202BEFCEF33F16AF7201F0EAA,
-                value=0x0,
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 500000 <contract:0x2000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x7A120,
+                address=0x2DB6829F13013D6280C5BE4F6A5E87DE274A3C47,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfee7d85f02f84ce8917fa8300fea57ff41ad47d7"),  # noqa: E501
+        address=Address(0xED9009ABB678FB6E7898148DC46FA339EA580CBD),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_5, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_after.py b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_after.py
index fb0ea2a85e2..01e13ccf801 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_after.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_after.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcallcode_001_oogm_after.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcallcode_001_OOGMAfterFiller.json
+state_tests/stStaticCall/static_callcallcallcode_001_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcallcode_001_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcallcode_001_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "0000000000000000000000004cd868420cbc0e9d9ba63455a2d0a36ce0fabf2c",
-        "000000000000000000000000ee8f7e38be79a20210ba7860a51507505984e4ed",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcallcode_001_oogm_after(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcallcode_001_oogm_after."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,111 +68,117 @@ def test_static_callcallcallcode_001_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x1D4D4,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 600150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x92856,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x265eeb9a84fea22da8b58252402b03bafe1a6324"),  # noqa: E501
+        address=Address(0xF1F083974FD68B961E68130C27FC5EF37B49C1DF),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x61AD5,
-                    address=0x265EEB9A84FEA22DA8B58252402B03BAFE1A6324,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (DELEGATECALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x1D4D4,
+                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x4cd868420cbc0e9d9ba63455a2d0a36ce0fabf2c"),  # noqa: E501
+        address=Address(0x265EEB9A84FEA22DA8B58252402B03BAFE1A6324),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x61AD5,
-                    address=0x265EEB9A84FEA22DA8B58252402B03BAFE1A6324,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 400085 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)  ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x61AD5,
+                address=0x265EEB9A84FEA22DA8B58252402B03BAFE1A6324,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x44,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x44, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xee8f7e38be79a20210ba7860a51507505984e4ed"),  # noqa: E501
+        address=Address(0xEE8F7E38BE79A20210BA7860A51507505984E4ED),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 600150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x92856,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 400085 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SSTORE 3 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x61AD5,
+                address=0x265EEB9A84FEA22DA8B58252402B03BAFE1A6324,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf1f083974fd68b961e68130c27fc5ef37b49c1df"),  # noqa: E501
+        address=Address(0x4CD868420CBC0E9D9BA63455A2D0A36CE0FABF2C),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
     post = {
-        contract: Account(storage={1: 1}),
+        target: Account(storage={0: 0, 1: 1, 2: 0}),
+        addr: Account(storage={0: 0, 1: 0, 2: 0}),
+        addr_3: Account(storage={0: 0, 1: 0, 2: 0}),
+        addr_4: Account(storage={1: 0, 2: 0, 3: 0}),
+        sender: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_after2.py b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_after2.py
index 9b197fc7796..51cf5aacb27 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_after2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_after2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcallcode_001_oogm_after2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcallcode_001_OOGMAfter2Filler.json
+state_tests/stStaticCall/static_callcallcallcode_001_OOGMAfter2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcallcode_001_OOGMAfter2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcallcode_001_OOGMAfter2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000171a4477dfe54503dd5f21daf90429fd2f22d654",
-        "000000000000000000000000142cc6371ac4a38c018d3d1fda49a9327d8b0b45",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcallcode_001_oogm_after2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcallcode_001_oogm_after2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,106 +68,111 @@ def test_static_callcallcallcode_001_oogm_after2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x61AD0,
-                    address=0xC26255D9FCF9D7D38D2734CD4E980B8C00ECEEF6,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3F,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x23)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 600150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x92856,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x142cc6371ac4a38c018d3d1fda49a9327d8b0b45"),  # noqa: E501
+        address=Address(0xF1F083974FD68B961E68130C27FC5EF37B49C1DF),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x61AD0,
-                    address=0xC26255D9FCF9D7D38D2734CD4E980B8C00ECEEF6,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x171a4477dfe54503dd5f21daf90429fd2f22d654"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # { (CALLCODE 120020 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x1D4D4,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0xC26255D9FCF9D7D38D2734CD4E980B8C00ECEEF6),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x1D4D4,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                value=0x0,
+    # Source: lll
+    # {  (STATICCALL 400080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)  ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x61AD0,
+                address=0xC26255D9FCF9D7D38D2734CD4E980B8C00ECEEF6,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3F, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x23)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc26255d9fcf9d7d38d2734cd4e980b8c00eceef6"),  # noqa: E501
+        address=Address(0x142CC6371AC4A38C018D3D1FDA49A9327D8B0B45),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 600150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x92856,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (STATICCALL 400080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SSTORE 3 1)}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x61AD0,
+                address=0xC26255D9FCF9D7D38D2734CD4E980B8C00ECEEF6,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf1f083974fd68b961e68130c27fc5ef37b49c1df"),  # noqa: E501
+        address=Address(0x171A4477DFE54503DD5F21DAF90429FD2F22D654),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
     post = {
-        contract: Account(storage={1: 1}),
+        target: Account(storage={0: 0, 1: 1, 2: 0, 3: 0}),
+        addr_2: Account(storage={1: 0, 2: 0, 3: 0}),
+        addr_3: Account(storage={2: 0, 3: 0}),
+        addr_4: Account(storage={3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_after_2.py b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_after_2.py
index 74e25db33e5..355583438ec 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_after_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_after_2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcallcode_001_oogm_after_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcallcode_001_OOGMAfter_2Filler.json
+state_tests/stStaticCall/static_callcallcallcode_001_OOGMAfter_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcallcode_001_OOGMAfter_2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcallcode_001_OOGMAfter_2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "0000000000000000000000004fde3a9b8985c447bc5071ee2818f0feee56052f",
-        "0000000000000000000000003cc8446e7643b49561a6d83a5e699b9ad4c97854",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcallcode_001_oogm_after_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcallcode_001_oogm_after_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,105 +68,111 @@ def test_static_callcallcallcode_001_oogm_after_2(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x1D4D4,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 60150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1  }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xEAF6,
+                address=Op.CALLDATALOAD(offset=0x0),
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1067d2b507295358055ed9f68f74245839d6339f"),  # noqa: E501
+        address=Address(0xF346244D7B72784053A685F7B1531B0D914911CA),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x61AD5,
-                    address=0x1067D2B507295358055ED9F68F74245839D6339F,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3F,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x23)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (DELEGATECALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x1D4D4,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3cc8446e7643b49561a6d83a5e699b9ad4c97854"),  # noqa: E501
+        address=Address(0x1067D2B507295358055ED9F68F74245839D6339F),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x61AD5,
-                    address=0x1067D2B507295358055ED9F68F74245839D6339F,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (STATICCALL 400085 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)  ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x61AD5,
+                address=0x1067D2B507295358055ED9F68F74245839D6339F,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3F, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x23)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x4fde3a9b8985c447bc5071ee2818f0feee56052f"),  # noqa: E501
+        address=Address(0x3CC8446E7643B49561A6D83A5E699B9AD4C97854),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 60150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1  }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xEAF6,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (STATICCALL 400085 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SSTORE 3 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x61AD5,
+                address=0x1067D2B507295358055ED9F68F74245839D6339F,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf346244d7b72784053a685f7b1531b0d914911ca"),  # noqa: E501
+        address=Address(0x4FDE3A9B8985C447BC5071EE2818F0FEEE56052F),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
     post = {
-        contract: Account(storage={1: 1}),
+        target: Account(storage={0: 0, 1: 1, 2: 0}),
+        addr_2: Account(storage={0: 0, 1: 0, 2: 0}),
+        addr_3: Account(storage={0: 0, 1: 0, 2: 0}),
+        addr_4: Account(storage={1: 0, 2: 0, 3: 0}),
+        sender: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_after_3.py b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_after_3.py
index b1c0c6e215b..2c4db1f7baf 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_after_3.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_after_3.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcallcode_001_oogm_after_3.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcallcode_001_OOGMAfter_3Filler.json
+state_tests/stStaticCall/static_callcallcallcode_001_OOGMAfter_3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcallcode_001_OOGMAfter_3Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcallcode_001_OOGMAfter_3Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000171a4477dfe54503dd5f21daf90429fd2f22d654",
-        "000000000000000000000000813986a928f9829ba2bd6633d33083759f1990a3",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcallcode_001_oogm_after_3(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcallcode_001_oogm_after_3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,106 +68,111 @@ def test_static_callcallcallcode_001_oogm_after_3(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x61AD0,
-                    address=0xC26255D9FCF9D7D38D2734CD4E980B8C00ECEEF6,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 600150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x92856,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x171a4477dfe54503dd5f21daf90429fd2f22d654"),  # noqa: E501
+        address=Address(0xF1F083974FD68B961E68130C27FC5EF37B49C1DF),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x61AD0,
-                    address=0xC26255D9FCF9D7D38D2734CD4E980B8C00ECEEF6,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3F,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x23)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (CALLCODE 120020 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x1D4D4,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x813986a928f9829ba2bd6633d33083759f1990a3"),  # noqa: E501
+        address=Address(0xC26255D9FCF9D7D38D2734CD4E980B8C00ECEEF6),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x1D4D4,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                value=0x0,
+    # Source: lll
+    # {  (STATICCALL 400080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SSTORE 3 1)}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x61AD0,
+                address=0xC26255D9FCF9D7D38D2734CD4E980B8C00ECEEF6,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc26255d9fcf9d7d38d2734cd4e980b8c00eceef6"),  # noqa: E501
+        address=Address(0x171A4477DFE54503DD5F21DAF90429FD2F22D654),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 600150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x92856,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (STATICCALL 400080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)  )}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x61AD0,
+                address=0xC26255D9FCF9D7D38D2734CD4E980B8C00ECEEF6,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3F, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x23)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf1f083974fd68b961e68130c27fc5ef37b49c1df"),  # noqa: E501
+        address=Address(0x813986A928F9829BA2BD6633D33083759F1990A3),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
     post = {
-        contract: Account(storage={1: 1}),
+        target: Account(storage={0: 0, 1: 1, 2: 0, 3: 0}),
+        addr: Account(storage={1: 0, 2: 0, 3: 0}),
+        addr_3: Account(storage={2: 0, 3: 0}),
+        addr_4: Account(storage={3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_before.py b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_before.py
index f8820fb8d4f..15838bdb067 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_before.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_before.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcallcode_001_oogm_before.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcallcode_001_OOGMBeforeFiller.json
+state_tests/stStaticCall/static_callcallcallcode_001_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcallcode_001_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcallcode_001_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "0000000000000000000000008214b87bb9fd41ed6c19255d74b7fcc66178c4d5",
-        "000000000000000000000000eb89be27eb1850f5f46204e0609023f43c2edc35",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcallcode_001_oogm_before(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcallcode_001_oogm_before."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,112 +68,118 @@ def test_static_callcallcallcode_001_oogm_before(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x61AD0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 400080 (CALLDATALOAD 0) 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x61AD0,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x10f374fca091cacd3e57e847ba123bc16695c44e"),  # noqa: E501
+        address=Address(0x10F374FCA091CACD3E57E847BA123BC16695C44E),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x1D4D4,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 600000 <contract:0x1000000000000000000000000000000000000001> 0 32 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x927C0,
+                address=0x10F374FCA091CACD3E57E847BA123BC16695C44E,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x8214b87bb9fd41ed6c19255d74b7fcc66178c4d5"),  # noqa: E501
+        address=Address(0xC6DF53AF8AAF7C046B42CF493D4C6819EBEC7994),  # noqa: E501
     )
-    # Source: LLL
-    # { (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 600000 <contract:0x1000000000000000000000000000000000000001> 0 32 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x927C0,
-                    address=0x10F374FCA091CACD3E57E847BA123BC16695C44E,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # { (SSTORE 1 1) (DELEGATECALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x1D4D4,
+                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc6df53af8aaf7c046b42cf493d4c6819ebec7994"),  # noqa: E501
+        address=Address(0xEB89BE27EB1850F5F46204E0609023F43C2EDC35),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x1D4D4,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)  ) (DELEGATECALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x1D4D4,
+                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xeb89be27eb1850f5f46204e0609023f43c2edc35"),  # noqa: E501
+        address=Address(0x8214B87BB9FD41ED6C19255D74B7FCC66178C4D5),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 0, 3: 0}),
+        addr: Account(storage={1: 0, 2: 0, 3: 0}),
+        addr_2: Account(storage={2: 0, 3: 0}),
+        addr_4: Account(storage={3: 0}),
+        sender: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_before2.py b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_before2.py
index a8efab37b3f..d9c0470221b 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_before2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_oogm_before2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcallcode_001_oogm_before2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcallcode_001_OOGMBefore2Filler.json
+state_tests/stStaticCall/static_callcallcallcode_001_OOGMBefore2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcallcode_001_OOGMBefore2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcallcode_001_OOGMBefore2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000ea6e38ec4f121597eea4bab20e02865062d20101",
-        "000000000000000000000000cf0670b1aa38b467e493459f12ac3b22fdc4a12b",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcallcode_001_oogm_before2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcallcode_001_oogm_before2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,108 +68,113 @@ def test_static_callcallcallcode_001_oogm_before2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
-        nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x61AD0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x7beca6585c70e19a4a6b3b0452a8c8867fec95e8"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 600000 <contract:0x1000000000000000000000000000000000000001> 0 32 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x927C0,
-                    address=0x7BECA6585C70E19A4A6B3B0452A8C8867FEC95E8,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0xc8cb56ed2b3bb8cb3e2f8ce276c85ad35d9ac1bf"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.CALLCODE(
-                gas=0x1D4D4,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                value=0x0,
+    # Source: lll
+    # {  (MSTORE 0 (CALLDATALOAD 0)) (STATICCALL 400080 (CALLDATALOAD 0) 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x61AD0,
+                address=Op.CALLDATALOAD(offset=0x0),
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xcf0670b1aa38b467e493459f12ac3b22fdc4a12b"),  # noqa: E501
+        address=Address(0x7BECA6585C70E19A4A6B3B0452A8C8867FEC95E8),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.CALLCODE(
-                gas=0x1D4D4,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                value=0x0,
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+        nonce=0,
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
+    )
+    # Source: lll
+    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 600000 <contract:0x1000000000000000000000000000000000000001> 0 32 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x927C0,
+                address=0x7BECA6585C70E19A4A6B3B0452A8C8867FEC95E8,
                 args_offset=0x0,
-                args_size=0x40,
+                args_size=0x20,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0xC8CB56ED2B3BB8CB3E2F8CE276C85AD35D9AC1BF),  # noqa: E501
+    )
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1))  (CALLCODE 120020 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.CALLCODE(
+            gas=0x1D4D4,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xCF0670B1AA38B467E493459F12AC3B22FDC4A12B),  # noqa: E501
+    )
+    # Source: lll
+    # { (SSTORE 1 1) (CALLCODE 120020 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.CALLCODE(
+            gas=0x1D4D4,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xea6e38ec4f121597eea4bab20e02865062d20101"),  # noqa: E501
+        address=Address(0xEA6E38EC4F121597EEA4BAB20E02865062D20101),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 0, 3: 0}),
+        addr: Account(storage={1: 0, 2: 0, 3: 0}),
+        addr_2: Account(storage={2: 0, 3: 0}),
+        addr_4: Account(storage={3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_suicide_end.py b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_suicide_end.py
index ca224580a63..a10e903b3f6 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_suicide_end.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcallcode_001_suicide_end.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcallcode_001_SuicideEndFiller.json
+state_tests/stStaticCall/static_callcallcallcode_001_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcallcode_001_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcallcode_001_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcallcode_001_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcallcode_001_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,81 +46,83 @@ def test_static_callcallcallcode_001_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xD7997C3F1AACABDC66B4DA9461B9558B1787E01C
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x4a31dd3a8c3c9a793ac0b3c234a4dbac2f201404"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0xD7997C3F1AACABDC66B4DA9461B9558B1787E01C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0xD7997C3F1AACABDC66B4DA9461B9558B1787E01C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x569cdc3b32cc3f9747bbde39fd70fead591d2f0d"),  # noqa: E501
+        address=Address(0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D),  # noqa: E501
+    )
+    # Source: lll
+    # {  (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x186A0,
+            address=0x4A31DD3A8C3C9A793AC0B3C234A4DBAC2F201404,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0xD7997C3F1AACABDC66B4DA9461B9558B1787E01C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x186A0,
-                address=0x4A31DD3A8C3C9A793AC0B3C234A4DBAC2F201404,
+    # Source: lll
+    # {  (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=0xD7997C3F1AACABDC66B4DA9461B9558B1787E01C)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xd7997c3f1aacabdc66b4da9461b9558b1787e01c"),  # noqa: E501
+        address=Address(0x4A31DD3A8C3C9A793AC0B3C234A4DBAC2F201404),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 0}),
+        addr: Account(storage={1: 0, 3: 0}, balance=0x2540BE400),
+        addr_2: Account(balance=0x2540BE400),
+        addr_3: Account(storage={3: 0}),
+        sender: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_suicide_end2.py b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_suicide_end2.py
index 88c6dab11ff..18eb7c39182 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_suicide_end2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_suicide_end2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcallcode_001_suicide_end2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcallcode_001_SuicideEnd2Filler.json
+state_tests/stStaticCall/static_callcallcallcode_001_SuicideEnd2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcallcode_001_SuicideEnd2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcallcode_001_SuicideEnd2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcallcode_001_suicide_end2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcallcode_001_suicide_end2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,82 +46,82 @@ def test_static_callcallcallcode_001_suicide_end2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0xD7997C3F1AACABDC66B4DA9461B9558B1787E01C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0xD7997C3F1AACABDC66B4DA9461B9558B1787E01C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x569cdc3b32cc3f9747bbde39fd70fead591d2f0d"),  # noqa: E501
+        address=Address(0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xD7997C3F1AACABDC66B4DA9461B9558B1787E01C
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x186A0,
+            address=0x90E9B92C59A0E93D8AB0B7AFBC945D6999A50A9B,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x90e9b92c59a0e93d8ab0b7afbc945d6999a50a9b"),  # noqa: E501
+        address=Address(0xD7997C3F1AACABDC66B4DA9461B9558B1787E01C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x186A0,
-                address=0x90E9B92C59A0E93D8AB0B7AFBC945D6999A50A9B,
+    # Source: lll
+    # {  (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+                value=0x0,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=0xD7997C3F1AACABDC66B4DA9461B9558B1787E01C)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xd7997c3f1aacabdc66b4da9461b9558b1787e01c"),  # noqa: E501
+        address=Address(0x90E9B92C59A0E93D8AB0B7AFBC945D6999A50A9B),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(balance=0x2540BE400),
+        addr_3: Account(storage={3: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_suicide_middle.py b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_suicide_middle.py
index caaa7d06af6..ad2000d94ca 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_suicide_middle.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcallcode_001_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcallcode_001_SuicideMiddleFiller.json
+state_tests/stStaticCall/static_callcallcallcode_001_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcallcode_001_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcallcode_001_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcallcode_001_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcallcode_001_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,81 +46,86 @@ def test_static_callcallcallcode_001_suicide_middle(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x569cdc3b32cc3f9747bbde39fd70fead591d2f0d"),  # noqa: E501
+        address=Address(0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0xB40862EB0C1F073048AC62D867277B80B57BF6E0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x620b381d01cbd812ffb798ab35a1a316bde90ce6"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D)
-            + Op.DELEGATECALL(
-                gas=0xC350,
-                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0xB40862EB0C1F073048AC62D867277B80B57BF6E0,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x620B381D01CBD812FFB798AB35A1A316BDE90CE6),  # noqa: E501
+    )
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D
+        )
+        + Op.DELEGATECALL(
+            gas=0xC350,
+            address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xb40862eb0c1f073048ac62d867277b80b57bf6e0"),  # noqa: E501
+        address=Address(0xB40862EB0C1F073048AC62D867277B80B57BF6E0),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}, balance=0xDE0B6B3A7640000),
+        addr: Account(storage={1: 0, 2: 0}, balance=0x2540BE400),
+        addr_3: Account(storage={2: 0, 3: 0}, balance=0x2540BE400),
+        sender: Account(storage={2: 0, 3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_suicide_middle2.py b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_suicide_middle2.py
index a43ca9daa89..a61da985eaa 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_suicide_middle2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcallcode_001_suicide_middle2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcallcode_001_suicide_middle2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcallcode_001_SuicideMiddle2Filler.json
+state_tests/stStaticCall/static_callcallcallcode_001_SuicideMiddle2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcallcode_001_SuicideMiddle2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcallcode_001_SuicideMiddle2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcallcode_001_suicide_middle2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcallcode_001_suicide_middle2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,82 +46,85 @@ def test_static_callcallcallcode_001_suicide_middle2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x8D1428C10723924A74AB6096C463EDAAB4CEA5FB)
-            + Op.CALLCODE(
-                gas=0xC350,
-                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                value=0x0,
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 )  [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x2dfe35a60d7de3d8eeb1d7a015541c76b0e00e9f"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
-        balance=0x2540BE400,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x8D1428C10723924A74AB6096C463EDAAB4CEA5FB),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x2DFE35A60D7DE3D8EEB1D7A015541C76B0E00E9F,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0x2DFE35A60D7DE3D8EEB1D7A015541C76B0E00E9F,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x620b381d01cbd812ffb798ab35a1a316bde90ce6"),  # noqa: E501
+        address=Address(0x620B381D01CBD812FFB798AB35A1A316BDE90CE6),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 )  [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x8D1428C10723924A74AB6096C463EDAAB4CEA5FB
+        )
+        + Op.CALLCODE(
+            gas=0xC350,
+            address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0x8d1428c10723924a74ab6096c463edaab4cea5fb"),  # noqa: E501
+        address=Address(0x2DFE35A60D7DE3D8EEB1D7A015541C76B0E00E9F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}, balance=0xDE0B6B3A7640000),
+        addr_3: Account(storage={2: 0, 3: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcallcode_abcb_recursive.py b/tests/ported_static/stStaticCall/test_static_callcallcallcode_abcb_recursive.py
index c891281d0ba..a354022133e 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcallcode_abcb_recursive.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcallcode_abcb_recursive.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcallcode_abcb_recursive.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcallcode_ABCB_RECURSIVEFiller.json
+state_tests/stStaticCall/static_callcallcallcode_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcallcode_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcallcode_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcallcode_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcallcode_abcb_recursive."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,76 +46,78 @@ def test_static_callcallcallcode_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xF4240,
-                    address=0x458E20B622EC33A82F2A43A90EDC52A429639916,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 1 1) (STATICCALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) (MSTORE 31 1)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x17D7840,
+                address=0x34BAF5E282FCBDE0D147EFD6F95E606CC8C27485,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x1F, value=0x1)
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+        )
+        + Op.MSTORE(offset=0x1F, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x34baf5e282fcbde0d147efd6f95e606cc8c27485"),  # noqa: E501
+        address=Address(0x5EE4B6A55558049D98B92269841DB0F86FD1A59A),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x7A120,
-                    address=0x34BAF5E282FCBDE0D147EFD6F95E606CC8C27485,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 1 1) (STATICCALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 31 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xF4240,
+                address=0x458E20B622EC33A82F2A43A90EDC52A429639916,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x15, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x1F, value=0x1)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x458e20b622ec33a82f2a43a90edc52a429639916"),  # noqa: E501
+        address=Address(0x34BAF5E282FCBDE0D147EFD6F95E606CC8C27485),  # noqa: E501
     )
-    # Source: LLL
-    # {  (MSTORE 1 1) (STATICCALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) (MSTORE 31 1)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x17D7840,
-                    address=0x34BAF5E282FCBDE0D147EFD6F95E606CC8C27485,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 1 1) (DELEGATECALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) (MSTORE 21 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x7A120,
+                address=0x34BAF5E282FCBDE0D147EFD6F95E606CC8C27485,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x1F, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.MSTORE(offset=0x15, value=0x1)
+        + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0x5ee4b6a55558049d98b92269841db0f86fd1a59a"),  # noqa: E501
+        address=Address(0x458E20B622EC33A82F2A43A90EDC52A429639916),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={0: 0, 1: 0}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcallcode_abcb_recursive2.py b/tests/ported_static/stStaticCall/test_static_callcallcallcode_abcb_recursive2.py
index c822c4956a7..10b220ca55d 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcallcode_abcb_recursive2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcallcode_abcb_recursive2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcallcode_abcb_recursive2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcallcode_ABCB_RECURSIVE2Filler.json
+state_tests/stStaticCall/static_callcallcallcode_ABCB_RECURSIVE2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcallcode_ABCB_RECURSIVE2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcallcode_ABCB_RECURSIVE2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcallcode_abcb_recursive2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcallcode_abcb_recursive2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,77 +46,79 @@ def test_static_callcallcallcode_abcb_recursive2(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  (MSTORE 1 1) (STATICCALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x17D7840,
-                    address=0xA340F8B0F598F6D5AD2856FFE45AADD934F37CF1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x17D7840,
+                address=0xA340F8B0F598F6D5AD2856FFE45AADD934F37CF1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x130e754252b72cb20aa752cb31176d9c2e9c8a21"),  # noqa: E501
+        address=Address(0x130E754252B72CB20AA752CB31176D9C2E9C8A21),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0xA340F8B0F598F6D5AD2856FFE45AADD934F37CF1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 1 1) (STATICCALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 2 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xF4240,
+                address=0x812297C04813FEA96B943B246D9D17EA17545526,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x2, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x2, value=0x1)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x812297c04813fea96b943b246d9d17ea17545526"),  # noqa: E501
+        address=Address(0xA340F8B0F598F6D5AD2856FFE45AADD934F37CF1),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xF4240,
-                    address=0x812297C04813FEA96B943B246D9D17EA17545526,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 1 1) (CALLCODE 500000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) (MSTORE 2 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x7A120,
+                address=0xA340F8B0F598F6D5AD2856FFE45AADD934F37CF1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x2, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x2, value=0x1)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa340f8b0f598f6d5ad2856ffe45aadd934f37cf1"),  # noqa: E501
+        address=Address(0x812297C04813FEA96B943B246D9D17EA17545526),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(storage={0: 0, 1: 0}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcode_01_2.py b/tests/ported_static/stStaticCall/test_static_callcallcode_01_2.py
index a2e4259ce58..66ab50c76f3 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcode_01_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcode_01_2.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_callcallcode_01_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcallcode_01_2Filler.json
+state_tests/stStaticCall/static_callcallcode_01_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,46 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcode_01_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcode_01_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000fbe34b488c83765de2f7fefc646710b8f1dcb303",
-            {
-                Address("0xaab59f13d96113334fab5c68e4e62b61f6cbf647"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000c766dcc7257dd2af2b6a354fc922d43d3ad9a390",
-            {
-                Address("0xaab59f13d96113334fab5c68e4e62b61f6cbf647"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcode_01_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcode_01_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -72,117 +69,136 @@ def test_static_callcallcode_01_2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x3D090,
-                address=0x8AD8D964B0888C5016605939DD13E1BDCF679F05,
-                value=0x2,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=0x0,
                 args_offset=0x0,
-                args_size=0x20,
+                args_size=0x0,
                 ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0c42c1601b039f8bb80a155b5b6afb4cffeb430a"),  # noqa: E501
+        address=Address(0xAAB59F13D96113334FAB5C68E4E62B61F6CBF647),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 0 0x11223344) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x0, value=0x11223344) + Op.STOP,
         nonce=0,
-        address=Address("0x2fcc143c5267b6c6ce4e1abd936e84eedffd6a4e"),  # noqa: E501
+        address=Address(0x8AD8D964B0888C5016605939DD13E1BDCF679F05),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 0 0x11223344) }
+    addr_6 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x0, value=0x11223344) + Op.STOP,
         nonce=0,
-        address=Address("0x8ad8d964b0888c5016605939dd13e1bdcf679f05"),  # noqa: E501
+        address=Address(0x2FCC143C5267B6C6CE4E1ABD936E84EEDFFD6A4E),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALLCODE 250000 <contract:0x1000000000000000000000000000000000000002> 2 0 32 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x3D090,
+            address=0x8AD8D964B0888C5016605939DD13E1BDCF679F05,
+            value=0x2,
+            args_offset=0x0,
+            args_size=0x20,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xaab59f13d96113334fab5c68e4e62b61f6cbf647"),  # noqa: E501
+        address=Address(0x0C42C1601B039F8BB80A155B5B6AFB4CFFEB430A),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x55730,
-                address=0xF686A2E0E79C5FBB3407D5E53F3AB6B0AB21A51A,
-                args_offset=0x0,
-                args_size=0x20,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 (CALLDATALOAD 0)) (CALLCODE 250000 <contract:0x2000000000000000000000000000000000000002> 0 0 32 0 64 ) }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.CALLCODE(
+            gas=0x3D090,
+            address=0x2FCC143C5267B6C6CE4E1ABD936E84EEDFFD6A4E,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x20,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc766dcc7257dd2af2b6a354fc922d43d3ad9a390"),  # noqa: E501
+        address=Address(0xF686A2E0E79C5FBB3407D5E53F3AB6B0AB21A51A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.CALLCODE(
-                gas=0x3D090,
-                address=0x2FCC143C5267B6C6CE4E1ABD936E84EEDFFD6A4E,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x20,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 32 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x55730,
+            address=0xC42C1601B039F8BB80A155B5B6AFB4CFFEB430A,
+            args_offset=0x0,
+            args_size=0x20,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf686a2e0e79c5fbb3407d5e53f3ab6b0ab21a51a"),  # noqa: E501
+        address=Address(0xFBE34B488C83765DE2F7FEFC646710B8F1DCB303),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x55730,
-                address=0xC42C1601B039F8BB80A155B5B6AFB4CFFEB430A,
-                args_offset=0x0,
-                args_size=0x20,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 350000 <contract:0x2000000000000000000000000000000000000001> 0 32 0 64 ) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x55730,
+            address=0xF686A2E0E79C5FBB3407D5E53F3AB6B0AB21A51A,
+            args_offset=0x0,
+            args_size=0x20,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfbe34b488c83765de2f7fefc646710b8f1dcb303"),  # noqa: E501
+        address=Address(0xC766DCC7257DD2AF2B6A354FC922D43D3AD9A390),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 1})},
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [3000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=3000000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcode_01_ooge_2.py b/tests/ported_static/stStaticCall/test_static_callcallcode_01_ooge_2.py
index 08618a8699d..118b967f0dd 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcode_01_ooge_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcode_01_ooge_2.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcode_01_ooge_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcallcode_01_OOGE_2Filler.json
+state_tests/stStaticCall/static_callcallcode_01_OOGE_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcode_01_OOGE_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcode_01_OOGE_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000ce21f15217a7b94db9c505a66c9549e803bf141c",
-        "000000000000000000000000609e4dfe6190235b9a0362084c741d9ec330fb1e",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcode_01_ooge_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcode_01_ooge_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,83 +66,81 @@ def test_static_callcallcode_01_ooge_2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALLCODE 20020 (CALLDATALOAD 0) 0 0 64 0 64 ) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x4E34,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x609e4dfe6190235b9a0362084c741d9ec330fb1e"),  # noqa: E501
+        address=Address(0x85DDAAC1762B4B9A01861C244947C3D6F40FD709),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x4E34,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 2 1) (MSTORE 2 1)}
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.MSTORE(offset=0x2, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x85ddaac1762b4b9a01861c244947c3d6f40fd709"),  # noqa: E501
+        address=Address(0xCE21F15217A7B94DB9C505A66C9549E803BF141C),  # noqa: E501
     )
-    # Source: LLL
-    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 32 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x85DDAAC1762B4B9A01861C244947C3D6F40FD709,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)  ) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc4c9495535a13d71c26e498898c90576f7c64218"),  # noqa: E501
+        address=Address(0x609E4DFE6190235B9A0362084C741D9EC330FB1E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.MSTORE(offset=0x2, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 32 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x85DDAAC1762B4B9A01861C244947C3D6F40FD709,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xce21f15217a7b94db9c505a66c9549e803bf141c"),  # noqa: E501
+        address=Address(0xC4C9495535A13D71C26E498898C90576F7C64218),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [172000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=172000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcode_01_suicide_end.py b/tests/ported_static/stStaticCall/test_static_callcallcode_01_suicide_end.py
index c9b3ccb51f1..8d063a6dc55 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcode_01_suicide_end.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcode_01_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcode_01_suicide_end.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcode_01_SuicideEndFiller.json
+state_tests/stStaticCall/static_callcallcode_01_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcode_01_SuicideEndFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcode_01_SuicideEndFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcode_01_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcode_01_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,65 +44,66 @@ def test_static_callcallcode_01_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0xCFB5784A5E49924BECC2D5C5D2EE0A9B141E6216,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 2 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x2, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x0f25670a9ca7bfa523e8b216478051e908ece142"),  # noqa: E501
+        address=Address(0xCFB5784A5E49924BECC2D5C5D2EE0A9B141E6216),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0xF25670A9CA7BFA523E8B216478051E908ECE142,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0xF25670A9CA7BFA523E8B216478051E908ECE142,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x569cdc3b32cc3f9747bbde39fd70fead591d2f0d"),  # noqa: E501
+        address=Address(0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x2, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0xCFB5784A5E49924BECC2D5C5D2EE0A9B141E6216,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SELFDESTRUCT(address=0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xcfb5784a5e49924becc2d5c5d2ee0a9b141e6216"),  # noqa: E501
+        address=Address(0x0F25670A9CA7BFA523E8B216478051E908ECE142),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={1: 1}),
+        target: Account(storage={0: 0, 1: 1}),
+        addr: Account(balance=0x2540BE400),
+        addr_2: Account(storage={2: 0, 3: 0}),
+        sender: Account(storage={1: 0, 2: 0, 3: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcode_01_suicide_end2.py b/tests/ported_static/stStaticCall/test_static_callcallcode_01_suicide_end2.py
index 0a73697ad4d..3523798982a 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcode_01_suicide_end2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcode_01_suicide_end2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcode_01_suicide_end2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcode_01_SuicideEnd2Filler.json
+state_tests/stStaticCall/static_callcallcode_01_SuicideEnd2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcode_01_SuicideEnd2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcode_01_SuicideEnd2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcode_01_suicide_end2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcode_01_suicide_end2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,66 +44,65 @@ def test_static_callcallcode_01_suicide_end2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0xCFB5784A5E49924BECC2D5C5D2EE0A9B141E6216,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x9E10A6AFFFCF5BBA3B47582F2575D787016A56CA
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 2 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x2, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x5de1c119e1fc3598726f4d9411debd7ed1402187"),  # noqa: E501
+        address=Address(0xCFB5784A5E49924BECC2D5C5D2EE0A9B141E6216),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x5DE1C119E1FC3598726F4D9411DEBD7ED1402187,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x5DE1C119E1FC3598726F4D9411DEBD7ED1402187,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9e10a6afffcf5bba3b47582f2575d787016a56ca"),  # noqa: E501
+        address=Address(0x9E10A6AFFFCF5BBA3B47582F2575D787016A56CA),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x2, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0xCFB5784A5E49924BECC2D5C5D2EE0A9B141E6216,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SELFDESTRUCT(address=0x9E10A6AFFFCF5BBA3B47582F2575D787016A56CA)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xcfb5784a5e49924becc2d5c5d2ee0a9b141e6216"),  # noqa: E501
+        address=Address(0x5DE1C119E1FC3598726F4D9411DEBD7ED1402187),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={1: 1}),
+        target: Account(storage={0: 0, 1: 1}, balance=0xDE0B6B3A7640000),
+        addr_2: Account(storage={2: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010.py b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010.py
index 349d7383d78..e0b2ba42ed1 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecall_010.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcallcodecall_010Filler.json
+state_tests/stStaticCall/static_callcallcodecall_010Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecall_010Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcodecall_010Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcodecall_010(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecall_010."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,83 +44,77 @@ def test_static_callcallcodecall_010(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 1 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x2a142c79a9b097c111ce945214226126b75e332c"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x55730,
-                    address=0x8BD89F495B3F37357D15A16D7B0F72470ABE929F,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 3 1)}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x3D090,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x46df4a924470cb27a2f8700239656c40dd4794c8"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x3D090,
-                    address=0x2A142C79A9B097C111CE945214226126B75E332C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1)  (DELEGATECALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x5aaef6827794656b94367d6130f40d34b219f1fd"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x493E0,
-                    address=0x5AAEF6827794656B94367D6130F40D34B219F1FD,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x8bd89f495b3f37357d15a16d7b0f72470abe929f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_2.py
index 2a79f67ec0c..fbd6b903580 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_2.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecall_010_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcallcodecall_010_2Filler.json
+state_tests/stStaticCall/static_callcallcodecall_010_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,46 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecall_010_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcodecall_010_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000006b21d14ffae42852fc3a6f98da6275e551c07008",
-            {
-                Address("0x04feba02513bfa1cf1456a0f32838b186775d8d4"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000d450d1d19aefb5a30dc4a483db88e86c215c67a0",
-            {
-                Address("0x04feba02513bfa1cf1456a0f32838b186775d8d4"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecall_010_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecall_010_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -72,94 +69,111 @@ def test_static_callcallcodecall_010_2(
         gas_limit=30000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 350000 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x55730,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x55730,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x04feba02513bfa1cf1456a0f32838b186775d8d4"),  # noqa: E501
+        address=Address(0x04FEBA02513BFA1CF1456A0F32838B186775D8D4),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x493E0,
-                address=0xEF859513AE36C397C43170A2980741575916167B,
-                value=0x2,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x3D090,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6b21d14ffae42852fc3a6f98da6275e551c07008"),  # noqa: E501
+        address=Address(0xEF859513AE36C397C43170A2980741575916167B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x493E0,
-                address=0xEF859513AE36C397C43170A2980741575916167B,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALLCODE 300000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x493E0,
+            address=0xEF859513AE36C397C43170A2980741575916167B,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd450d1d19aefb5a30dc4a483db88e86c215c67a0"),  # noqa: E501
+        address=Address(0xD450D1D19AEFB5A30DC4A483DB88E86C215C67A0),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x3D090,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALLCODE 300000 <contract:0x1000000000000000000000000000000000000002> 2 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x493E0,
+            address=0xEF859513AE36C397C43170A2980741575916167B,
+            value=0x2,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xef859513ae36c397c43170a2980741575916167b"),  # noqa: E501
+        address=Address(0x6B21D14FFAE42852FC3A6F98DA6275E551C07008),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 1})},
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [3000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=3000000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_ooge.py b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_ooge.py
index 409d5b272e4..ba5737462ae 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_ooge.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_ooge.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecall_010_ooge.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecall_010_OOGEFiller.json
+state_tests/stStaticCall/static_callcallcodecall_010_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,31 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecall_010_OOGEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcodecall_010_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "0000000000000000000000000d195fccf4102d8b6b6798768727ae0915c88ed7",
-        "000000000000000000000000c45fe363c9ac4e1feed02b03a212fdf979a74505",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecall_010_ooge(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecall_010_ooge."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,109 +66,109 @@ def test_static_callcallcodecall_010_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x1D4D4,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3F,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
+    # Source: lll
+    # {   (DELEGATECALL 300000 (CALLDATALOAD 0) 0 64 0 64 ) (MSTORE 1 1) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x23)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0d195fccf4102d8b6b6798768727ae0915c88ed7"),  # noqa: E501
+        address=Address(0x39C3AAD8C9ECF3BE71828CAFFEEE06727FDA4679),  # noqa: E501
     )
-    # Source: LLL
-    # { (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x7A120,
-                    address=0x39C3AAD8C9ECF3BE71828CAFFEEE06727FDA4679,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x33344ff747b678f9e86028b0c745d8ab0e0d1792"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # { (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x7A120,
+                address=0x39C3AAD8C9ECF3BE71828CAFFEEE06727FDA4679,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x33344FF747B678F9E86028B0C745D8AB0E0D1792),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x493E0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (STATICCALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SSTORE 1 1) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x1D4D4,
+                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x39c3aad8c9ecf3be71828caffeee06727fda4679"),  # noqa: E501
+        address=Address(0xC45FE363C9AC4E1FEED02B03A212FDF979A74505),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x1D4D4,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (STATICCALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x1D4D4,
+                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3F, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x23)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc45fe363c9ac4e1feed02b03a212fdf979a74505"),  # noqa: E501
+        address=Address(0x0D195FCCF4102D8B6B6798768727AE0915C88ED7),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_ooge_2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_ooge_2.py
index d44c3904aa8..ab06fb60786 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_ooge_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_ooge_2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecall_010_ooge_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecall_010_OOGE_2Filler.json
+state_tests/stStaticCall/static_callcallcodecall_010_OOGE_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,31 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecall_010_OOGE_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcodecall_010_OOGE_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000b126c622075b1189fb6c45e851641cfaddf65b36",
-        "000000000000000000000000fbef21c5a6c2adcf3d769f085e0cc9fe9a8df954",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecall_010_ooge_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecall_010_ooge_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,95 +66,95 @@ def test_static_callcallcodecall_010_ooge_2(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 32 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x55730,
-                    address=0x87B79D9A4C004A23C7A12074BA8DA784E201EA8C,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (STATICCALL 120020 (CALLDATALOAD 0) 0 64 0 64 ) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x1D4D4,
+            address=Op.CALLDATALOAD(offset=0x0),
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x519393d984beaf4fd226309e9f0704b2db3164b5"),  # noqa: E501
+        address=Address(0x77E67836C6A30F95E117469CAEFB6C1FDCAD0C2E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x1D4D4,
-                address=Op.CALLDATALOAD(offset=0x0),
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x77e67836c6a30f95e117469caefb6c1fdcad0c2e"),  # noqa: E501
+        address=Address(0xB126C622075B1189FB6C45E851641CFADDF65B36),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.CALLCODE(
-                gas=0x30D40,
-                address=0x77E67836C6A30F95E117469CAEFB6C1FDCAD0C2E,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x20,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x87b79d9a4c004a23c7a12074ba8da784e201ea8c"),  # noqa: E501
+        address=Address(0xFBEF21C5A6C2ADCF3D769F085E0CC9FE9A8DF954),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (MSTORE 0 (CALLDATALOAD 0)) (CALLCODE 200000 <contract:0x1000000000000000000000000000000000000002> 0 0 32 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.CALLCODE(
+            gas=0x30D40,
+            address=0x77E67836C6A30F95E117469CAEFB6C1FDCAD0C2E,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x20,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
+        address=Address(0x87B79D9A4C004A23C7A12074BA8DA784E201EA8C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 32 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x55730,
+                address=0x87B79D9A4C004A23C7A12074BA8DA784E201EA8C,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfbef21c5a6c2adcf3d769f085e0cc9fe9a8df954"),  # noqa: E501
+        address=Address(0x519393D984BEAF4FD226309E9F0704B2DB3164B5),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_after.py b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_after.py
index 1ff8891052b..9cc19c3222d 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_after.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_after.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecall_010_oogm_after.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecall_010_OOGMAfterFiller.json
+state_tests/stStaticCall/static_callcallcodecall_010_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecall_010_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecall_010_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000c00fba9c86d497814a90912f8f6c63801ea59908",
-        "0000000000000000000000003a2fb8850eea3cbd892bb77ff68da146ead9c49d",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecall_010_oogm_after(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecall_010_oogm_after."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,105 +68,105 @@ def test_static_callcallcodecall_010_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 600150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x92856,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0xF1F083974FD68B961E68130C27FC5EF37B49C1DF),  # noqa: E501
+    )
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x61AD0,
-                    address=0x5AD1F77E14FE15F07A2F5DF1480DCABA5B4B6435,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3F,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x23)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 120040 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x1D4E8,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3a2fb8850eea3cbd892bb77ff68da146ead9c49d"),  # noqa: E501
+        address=Address(0x5AD1F77E14FE15F07A2F5DF1480DCABA5B4B6435),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x1D4E8,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+    # Source: lll
+    # {  (DELEGATECALL 400080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0x61AD0,
+                address=0x5AD1F77E14FE15F07A2F5DF1480DCABA5B4B6435,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x5ad1f77e14fe15f07a2f5df1480dcaba5b4b6435"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x61AD0,
-                    address=0x5AD1F77E14FE15F07A2F5DF1480DCABA5B4B6435,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3F, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x23)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc00fba9c86d497814a90912f8f6c63801ea59908"),  # noqa: E501
+        address=Address(0x3A2FB8850EEA3CBD892BB77FF68DA146EAD9C49D),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 600150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x92856,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (DELEGATECALL 400080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SSTORE 3 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0x61AD0,
+                address=0x5AD1F77E14FE15F07A2F5DF1480DCABA5B4B6435,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf1f083974fd68b961e68130c27fc5ef37b49c1df"),  # noqa: E501
+        address=Address(0xC00FBA9C86D497814A90912F8F6C63801EA59908),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 1, 2: 0, 3: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_after2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_after2.py
index 4d85fd673a5..2a2ed4e6b12 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_after2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_after2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecall_010_oogm_after2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecall_010_OOGMAfter2Filler.json
+state_tests/stStaticCall/static_callcallcodecall_010_OOGMAfter2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecall_010_OOGMAfter2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecall_010_OOGMAfter2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "0000000000000000000000004c57f5c93feb3af1807980230371459b773a1f88",
-        "000000000000000000000000ce0959ec3ec0c6527232db11b856879585afb0bb",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecall_010_oogm_after2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecall_010_oogm_after2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,107 +68,107 @@ def test_static_callcallcodecall_010_oogm_after2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 60150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xEAF6,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x652A62E8338E91A46AA8387A2C205F35F79347AB),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x61AD0,
-                    address=0x6F67C62FA385EDFE7BD280594EFF367F33E51438,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x41,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x25)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x4c57f5c93feb3af1807980230371459b773a1f88"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 60150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xEAF6,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (STATICCALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x1D4D4,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x652a62e8338e91a46aa8387a2c205f35f79347ab"),  # noqa: E501
+        address=Address(0x6F67C62FA385EDFE7BD280594EFF367F33E51438),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x1D4D4,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+    # Source: lll
+    # {  (CALLCODE 400080 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (SSTORE 1 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0x61AD0,
+                address=0x6F67C62FA385EDFE7BD280594EFF367F33E51438,
+                value=0x0,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6f67c62fa385edfe7bd280594eff367f33e51438"),  # noqa: E501
+        address=Address(0xCE0959EC3EC0C6527232DB11B856879585AFB0BB),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x61AD0,
-                    address=0x6F67C62FA385EDFE7BD280594EFF367F33E51438,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (CALLCODE 400080 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0x61AD0,
+                address=0x6F67C62FA385EDFE7BD280594EFF367F33E51438,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x41, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x25)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xce0959ec3ec0c6527232db11b856879585afb0bb"),  # noqa: E501
+        address=Address(0x4C57F5C93FEB3AF1807980230371459B773A1F88),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_after_2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_after_2.py
index f62993a794d..1ab56099a4e 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_after_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_after_2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecall_010_oogm_after_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecall_010_OOGMAfter_2Filler.json
+state_tests/stStaticCall/static_callcallcodecall_010_OOGMAfter_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecall_010_OOGMAfter_2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecall_010_OOGMAfter_2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000c00fba9c86d497814a90912f8f6c63801ea59908",
-        "0000000000000000000000003a2fb8850eea3cbd892bb77ff68da146ead9c49d",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecall_010_oogm_after_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecall_010_oogm_after_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,105 +68,105 @@ def test_static_callcallcodecall_010_oogm_after_2(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 600150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x92856,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0xF1F083974FD68B961E68130C27FC5EF37B49C1DF),  # noqa: E501
+    )
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x61AD0,
-                    address=0x5AD1F77E14FE15F07A2F5DF1480DCABA5B4B6435,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3F,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x23)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 120040 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x1D4E8,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3a2fb8850eea3cbd892bb77ff68da146ead9c49d"),  # noqa: E501
+        address=Address(0x5AD1F77E14FE15F07A2F5DF1480DCABA5B4B6435),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x1D4E8,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+    # Source: lll
+    # {  (DELEGATECALL 400080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0x61AD0,
+                address=0x5AD1F77E14FE15F07A2F5DF1480DCABA5B4B6435,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x5ad1f77e14fe15f07a2f5df1480dcaba5b4b6435"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x61AD0,
-                    address=0x5AD1F77E14FE15F07A2F5DF1480DCABA5B4B6435,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3F, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x23)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc00fba9c86d497814a90912f8f6c63801ea59908"),  # noqa: E501
+        address=Address(0x3A2FB8850EEA3CBD892BB77FF68DA146EAD9C49D),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 600150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x92856,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (DELEGATECALL 400080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SSTORE 3 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0x61AD0,
+                address=0x5AD1F77E14FE15F07A2F5DF1480DCABA5B4B6435,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf1f083974fd68b961e68130c27fc5ef37b49c1df"),  # noqa: E501
+        address=Address(0xC00FBA9C86D497814A90912F8F6C63801EA59908),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 1, 2: 0, 3: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_after_3.py b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_after_3.py
index 9e690747ecd..1ad57cf628e 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_after_3.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_after_3.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecall_010_oogm_after_3.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecall_010_OOGMAfter_3Filler.json
+state_tests/stStaticCall/static_callcallcodecall_010_OOGMAfter_3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecall_010_OOGMAfter_3Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecall_010_OOGMAfter_3Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000079d1bfbc2a69eb3ca3dede36bf05a46d4f08116",
-        "0000000000000000000000004c57f5c93feb3af1807980230371459b773a1f88",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecall_010_oogm_after_3(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecall_010_oogm_after_3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,107 +68,107 @@ def test_static_callcallcodecall_010_oogm_after_3(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x61AD0,
-                    address=0x6F67C62FA385EDFE7BD280594EFF367F33E51438,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 600150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x92856,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x079d1bfbc2a69eb3ca3dede36bf05a46d4f08116"),  # noqa: E501
+        address=Address(0xF1F083974FD68B961E68130C27FC5EF37B49C1DF),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x61AD0,
-                    address=0x6F67C62FA385EDFE7BD280594EFF367F33E51438,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x41,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x25)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x1D4D4,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x4c57f5c93feb3af1807980230371459b773a1f88"),  # noqa: E501
+        address=Address(0x6F67C62FA385EDFE7BD280594EFF367F33E51438),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x1D4D4,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+    # Source: lll
+    # {  (CALLCODE 400080 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (SSTORE 3 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0x61AD0,
+                address=0x6F67C62FA385EDFE7BD280594EFF367F33E51438,
+                value=0x0,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6f67c62fa385edfe7bd280594eff367f33e51438"),  # noqa: E501
+        address=Address(0x079D1BFBC2A69EB3CA3DEDE36BF05A46D4F08116),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 600150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x92856,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (CALLCODE 400080 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0x61AD0,
+                address=0x6F67C62FA385EDFE7BD280594EFF367F33E51438,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x41, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x25)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf1f083974fd68b961e68130c27fc5ef37b49c1df"),  # noqa: E501
+        address=Address(0x4C57F5C93FEB3AF1807980230371459B773A1F88),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 1, 2: 0, 3: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_before.py b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_before.py
index 14915c55459..ff5d85c14b8 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_before.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_before.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecall_010_oogm_before.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecall_010_OOGMBeforeFiller.json
+state_tests/stStaticCall/static_callcallcodecall_010_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecall_010_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecall_010_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000c5b28f694c0e1befb55bdfbec30be55455897729",
-        "000000000000000000000000f32619344056ad22a07f10433f70165ce82d9273",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecall_010_oogm_before(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecall_010_oogm_before."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,102 +68,102 @@ def test_static_callcallcodecall_010_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # { (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x7A120,
-                    address=0xE7B982648E452964FB0AC2B867EFA7C7B5B93D91,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (DELEGATECALL 400080 (CALLDATALOAD 0) 0 64 0 64 ) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x61AD0,
+            address=Op.CALLDATALOAD(offset=0x0),
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x33344ff747b678f9e86028b0c745d8ab0e0d1792"),  # noqa: E501
+        address=Address(0xE7B982648E452964FB0AC2B867EFA7C7B5B93D91),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.STATICCALL(
-                gas=0x1D4D4,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+    # Source: lll
+    # { (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x7A120,
+                address=0xE7B982648E452964FB0AC2B867EFA7C7B5B93D91,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc5b28f694c0e1befb55bdfbec30be55455897729"),  # noqa: E501
+        address=Address(0x33344FF747B678F9E86028B0C745D8AB0E0D1792),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x61AD0,
-                address=Op.CALLDATALOAD(offset=0x0),
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) (STATICCALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STATICCALL(
+            gas=0x4E34,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe7b982648e452964fb0ac2b867efa7c7b5b93d91"),  # noqa: E501
+        address=Address(0xF32619344056AD22A07F10433F70165CE82D9273),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STATICCALL(
-                gas=0x4E34,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SSTORE 3 1) (STATICCALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.STATICCALL(
+            gas=0x1D4D4,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf32619344056ad22a07f10433f70165ce82d9273"),  # noqa: E501
+        address=Address(0xC5B28F694C0E1BEFB55BDFBEC30BE55455897729),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1, 2: 0, 3: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_before2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_before2.py
index 56a3b011893..2adc6629ce5 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_before2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_oogm_before2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecall_010_oogm_before2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecall_010_OOGMBefore2Filler.json
+state_tests/stStaticCall/static_callcallcodecall_010_OOGMBefore2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecall_010_OOGMBefore2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecall_010_OOGMBefore2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000d0a1696cc7cfd386eb4f9236b61899a9ba48878c",
-        "000000000000000000000000698f17d55bfc6351c73d397d5df71d8a1a1d694d",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecall_010_oogm_before2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecall_010_oogm_before2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,103 +68,103 @@ def test_static_callcallcodecall_010_oogm_before2(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # { (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xC3500,
-                    address=0x21BE848CB68A95437A4928ED657B6D5F17DD3B03,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (CALLCODE 400080 (CALLDATALOAD 0) 0 0 64 0 64 ) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x61AD0,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x045bc6e334b0570cc84fbc4b86847063456e7c99"),  # noqa: E501
+        address=Address(0x21BE848CB68A95437A4928ED657B6D5F17DD3B03),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x61AD0,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x21be848cb68a95437a4928ed657b6d5f17dd3b03"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.STATICCALL(
-                gas=0x4E34,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+    # Source: lll
+    # { (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 800000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xC3500,
+                address=0x21BE848CB68A95437A4928ED657B6D5F17DD3B03,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x698f17d55bfc6351c73d397d5df71d8a1a1d694d"),  # noqa: E501
+        address=Address(0x045BC6E334B0570CC84FBC4B86847063456E7C99),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STATICCALL(
-                gas=0x1D4D4,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) (STATICCALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STATICCALL(
+            gas=0x1D4D4,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xD0A1696CC7CFD386EB4F9236B61899A9BA48878C),  # noqa: E501
+    )
+    # Source: lll
+    # { (SSTORE 3 1) (STATICCALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.STATICCALL(
+            gas=0x4E34,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xd0a1696cc7cfd386eb4f9236b61899a9ba48878c"),  # noqa: E501
+        address=Address(0x698F17D55BFC6351C73D397D5DF71D8A1A1D694D),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1, 2: 0, 3: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_suicide_end.py b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_suicide_end.py
index b7800b73e8e..a24f9488aec 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_suicide_end.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecall_010_suicide_end.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecall_010_SuicideEndFiller.json
+state_tests/stStaticCall/static_callcallcodecall_010_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecall_010_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecall_010_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcodecall_010_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecall_010_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,81 +46,82 @@ def test_static_callcallcodecall_010_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x92D7028788CAA240253B7B2A92386464690CDC72,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x569cdc3b32cc3f9747bbde39fd70fead591d2f0d"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x186A0,
-                address=0xB7770360E0B87603E3D9C87C866451760C95ABCA,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x92D7028788CAA240253B7B2A92386464690CDC72,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D),  # noqa: E501
+    )
+    # Source: lll
+    # {  (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x186A0,
+            address=0xB7770360E0B87603E3D9C87C866451760C95ABCA,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x92d7028788caa240253b7b2a92386464690cdc72"),  # noqa: E501
+        address=Address(0x92D7028788CAA240253B7B2A92386464690CDC72),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x92D7028788CAA240253B7B2A92386464690CDC72
+    # Source: lll
+    # {  (STATICCALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=0x92D7028788CAA240253B7B2A92386464690CDC72)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xb7770360e0b87603e3d9c87c866451760c95abca"),  # noqa: E501
+        address=Address(0xB7770360E0B87603E3D9C87C866451760C95ABCA),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1, 3: 0}),
+        addr: Account(balance=0x2540BE400),
+        addr_3: Account(storage={3: 0}),
+        sender: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_suicide_end2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_suicide_end2.py
index 26398b39eb9..9c532bc1315 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_suicide_end2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_suicide_end2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecall_010_suicide_end2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecall_010_SuicideEnd2Filler.json
+state_tests/stStaticCall/static_callcallcodecall_010_SuicideEnd2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecall_010_SuicideEnd2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecall_010_SuicideEnd2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcodecall_010_suicide_end2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecall_010_suicide_end2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,82 +46,81 @@ def test_static_callcallcodecall_010_suicide_end2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x9712F0CC76E9A67107DFAC82ABAB0F23783E97E0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x569cdc3b32cc3f9747bbde39fd70fead591d2f0d"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x186A0,
-                address=0xB7770360E0B87603E3D9C87C866451760C95ABCA,
-                value=0x0,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x9712F0CC76E9A67107DFAC82ABAB0F23783E97E0,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D),  # noqa: E501
+    )
+    # Source: lll
+    # {  (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x186A0,
+            address=0xB7770360E0B87603E3D9C87C866451760C95ABCA,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x9712f0cc76e9a67107dfac82abab0f23783e97e0"),  # noqa: E501
+        address=Address(0x9712F0CC76E9A67107DFAC82ABAB0F23783E97E0),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x9712F0CC76E9A67107DFAC82ABAB0F23783E97E0
+    # Source: lll
+    # {  (STATICCALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=0x9712F0CC76E9A67107DFAC82ABAB0F23783E97E0)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xb7770360e0b87603e3d9c87c866451760c95abca"),  # noqa: E501
+        address=Address(0xB7770360E0B87603E3D9C87C866451760C95ABCA),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr_3: Account(storage={3: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_suicide_middle.py b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_suicide_middle.py
index b0784d606cf..2354250e5cb 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_suicide_middle.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecall_010_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecall_010_SuicideMiddleFiller.json
+state_tests/stStaticCall/static_callcallcodecall_010_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecall_010_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecall_010_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcodecall_010_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecall_010_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,77 +46,77 @@ def test_static_callcallcodecall_010_suicide_middle(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D)
-            + Op.STATICCALL(
-                gas=0xC350,
-                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x408f1aceffec7bdaa35d77006cdcaead563bb694"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x92D7028788CAA240253B7B2A92386464690CDC72,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x569cdc3b32cc3f9747bbde39fd70fead591d2f0d"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x186A0,
-                address=0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x92D7028788CAA240253B7B2A92386464690CDC72,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D),  # noqa: E501
+    )
+    # Source: lll
+    # {  (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x186A0,
+            address=0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x92D7028788CAA240253B7B2A92386464690CDC72),  # noqa: E501
+    )
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) (STATICCALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D
+        )
+        + Op.STATICCALL(
+            gas=0xC350,
+            address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x92d7028788caa240253b7b2a92386464690cdc72"),  # noqa: E501
+        address=Address(0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_suicide_middle2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_suicide_middle2.py
index 1af3f810fbd..3fd310c1261 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_suicide_middle2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecall_010_suicide_middle2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecall_010_suicide_middle2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecall_010_SuicideMiddle2Filler.json
+state_tests/stStaticCall/static_callcallcodecall_010_SuicideMiddle2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecall_010_SuicideMiddle2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecall_010_SuicideMiddle2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcodecall_010_suicide_middle2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecall_010_suicide_middle2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,78 +46,82 @@ def test_static_callcallcodecall_010_suicide_middle2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D)
-            + Op.STATICCALL(
-                gas=0xC350,
-                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x408f1aceffec7bdaa35d77006cdcaead563bb694"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x9712F0CC76E9A67107DFAC82ABAB0F23783E97E0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x569cdc3b32cc3f9747bbde39fd70fead591d2f0d"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x186A0,
-                address=0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694,
-                value=0x0,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x9712F0CC76E9A67107DFAC82ABAB0F23783E97E0,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D),  # noqa: E501
+    )
+    # Source: lll
+    # {  (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x186A0,
+            address=0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x9712F0CC76E9A67107DFAC82ABAB0F23783E97E0),  # noqa: E501
+    )
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) (STATICCALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D
+        )
+        + Op.STATICCALL(
+            gas=0xC350,
+            address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x9712f0cc76e9a67107dfac82abab0f23783e97e0"),  # noqa: E501
+        address=Address(0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr_2: Account(storage={1: 0, 2: 0}, balance=0x2540BE400),
+        addr_3: Account(storage={3: 0}, balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecall_abcb_recursive.py b/tests/ported_static/stStaticCall/test_static_callcallcodecall_abcb_recursive.py
index 85292d9e817..da1bee5f6fd 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecall_abcb_recursive.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecall_abcb_recursive.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecall_abcb_recursive.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecall_ABCB_RECURSIVEFiller.json
+state_tests/stStaticCall/static_callcallcodecall_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecall_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecall_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcodecall_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecall_abcb_recursive."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,70 +46,70 @@ def test_static_callcallcodecall_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x17D7840,
-                    address=0x2C81F66472668C71014CE3A9537B033DB57AF77B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x0f30355d1f829e0dd67066517a43a738ac501d99"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0xF4240,
-                address=0xE07076B3A07FF8E567E4F8451DAC25BACEFB88B2,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x17D7840,
+                address=0x2C81F66472668C71014CE3A9537B033DB57AF77B,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x0F30355D1F829E0DD67066517A43A738AC501D99),  # noqa: E501
+    )
+    # Source: lll
+    # {  (DELEGATECALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0xF4240,
+            address=0xE07076B3A07FF8E567E4F8451DAC25BACEFB88B2,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2c81f66472668c71014ce3a9537b033db57af77b"),  # noqa: E501
+        address=Address(0x2C81F66472668C71014CE3A9537B033DB57AF77B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x7A120,
-                address=0x2C81F66472668C71014CE3A9537B033DB57AF77B,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (STATICCALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x7A120,
+            address=0x2C81F66472668C71014CE3A9537B033DB57AF77B,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xe07076b3a07ff8e567e4f8451dac25bacefb88b2"),  # noqa: E501
+        address=Address(0xE07076B3A07FF8E567E4F8451DAC25BACEFB88B2),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecall_abcb_recursive2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecall_abcb_recursive2.py
index 497dfc00940..c85fe757e18 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecall_abcb_recursive2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecall_abcb_recursive2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecall_abcb_recursive2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecall_ABCB_RECURSIVE2Filler.json
+state_tests/stStaticCall/static_callcallcodecall_ABCB_RECURSIVE2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecall_ABCB_RECURSIVE2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecall_ABCB_RECURSIVE2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcodecall_abcb_recursive2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecall_abcb_recursive2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,71 +46,71 @@ def test_static_callcallcodecall_abcb_recursive2(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x17D7840,
-                    address=0x9EF1D089354C245C0C8A08590F55E76008AC54CD,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x0f30355d1f829e0dd67066517a43a738ac501d99"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x7A120,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x17D7840,
                 address=0x9EF1D089354C245C0C8A08590F55E76008AC54CD,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x0F30355D1F829E0DD67066517A43A738AC501D99),  # noqa: E501
+    )
+    # Source: lll
+    # {  (CALLCODE 1000000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0xF4240,
+            address=0x1E2229D0F325B81B81B8B14F2D239FF9742683C0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x1e2229d0f325b81b81b8b14f2d239ff9742683c0"),  # noqa: E501
+        address=Address(0x9EF1D089354C245C0C8A08590F55E76008AC54CD),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0xF4240,
-                address=0x1E2229D0F325B81B81B8B14F2D239FF9742683C0,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x7A120,
+            address=0x9EF1D089354C245C0C8A08590F55E76008AC54CD,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x9ef1d089354c245c0c8a08590f55e76008ac54cd"),  # noqa: E501
+        address=Address(0x1E2229D0F325B81B81B8B14F2D239FF9742683C0),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011.py
index 22b105175a2..a2f2dadbf77 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecallcode_011.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecallcode_011Filler.json
+state_tests/stStaticCall/static_callcallcodecallcode_011Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecallcode_011Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcodecallcode_011Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcodecallcode_011(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecallcode_011."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,83 +44,77 @@ def test_static_callcallcodecallcode_011(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 1 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x2a142c79a9b097c111ce945214226126b75e332c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x493E0,
-                    address=0x86ADD32E31AA6E47126BC308CF85B29D0C9A4234,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 11 1) (DELEGATECALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 11 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0xB, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x3D090,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0xB, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2bf6d23c6cdd3a7712ad150dfa2680adabda8b82"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x55730,
-                    address=0x2BF6D23C6CDD3A7712AD150DFA2680ADABDA8B82,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 1 1) (DELEGATECALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 1 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x5cd189bc46453773dd75bda72e7a7eee97d63bce"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0xB, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x3D090,
-                    address=0x2A142C79A9B097C111CE945214226126B75E332C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xB, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x86add32e31aa6e47126bc308cf85b29d0c9a4234"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1, 3: 0, 4: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_2.py
index 8c6f9e5c2df..a9751f80768 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_2.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecallcode_011_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecallcode_011_2Filler.json
+state_tests/stStaticCall/static_callcallcodecallcode_011_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,46 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecallcode_011_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcallcodecallcode_011_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000709eb538153d5f98f0b8482c462070c26db1cbae",
-            {
-                Address("0x023ae6338fbe9709a6449bfb0821f5aa83987b26"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000003cea889fd03a922cc673d25e5db4e72743aa4878",
-            {
-                Address("0x023ae6338fbe9709a6449bfb0821f5aa83987b26"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecallcode_011_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecallcode_011_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,96 +69,113 @@ def test_static_callcallcodecallcode_011_2(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x55730,
-                    address=0x21A2D07156B4F874F3B25DFD175145C9CCEC1E19,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALLCODE 300000 (CALLDATALOAD 0) 0 0 64 0 64 ) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x493E0,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x023ae6338fbe9709a6449bfb0821f5aa83987b26"),  # noqa: E501
+        address=Address(0x21A2D07156B4F874F3B25DFD175145C9CCEC1E19),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x493E0,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x21a2d07156b4f874f3b25dfd175145c9ccec1e19"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 1 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x2a142c79a9b097c111ce945214226126b75e332c"),  # noqa: E501
+        address=Address(0x2A142C79A9B097C111CE945214226126B75E332C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x3D090,
-                address=0x2A142C79A9B097C111CE945214226126B75E332C,
-                value=0x1,
+    # Source: lll
+    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x55730,
+                address=0x21A2D07156B4F874F3B25DFD175145C9CCEC1E19,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3cea889fd03a922cc673d25e5db4e72743aa4878"),  # noqa: E501
+        address=Address(0x023AE6338FBE9709A6449BFB0821F5AA83987B26),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x3D090,
-                address=0x2A142C79A9B097C111CE945214226126B75E332C,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALLCODE 250000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x3D090,
+            address=0x2A142C79A9B097C111CE945214226126B75E332C,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x709EB538153D5F98F0B8482C462070C26DB1CBAE),  # noqa: E501
+    )
+    # Source: lll
+    # {  (CALLCODE 250000 <contract:0x1000000000000000000000000000000000000003> 1 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x3D090,
+            address=0x2A142C79A9B097C111CE945214226126B75E332C,
+            value=0x1,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x709eb538153d5f98f0b8482c462070c26db1cbae"),  # noqa: E501
+        address=Address(0x3CEA889FD03A922CC673D25E5DB4E72743AA4878),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 1})},
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [3000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=3000000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_ooge.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_ooge.py
index 0b42956ca1e..255691213b7 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_ooge.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_ooge.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecallcode_011_ooge.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecallcode_011_OOGEFiller.json
+state_tests/stStaticCall/static_callcallcodecallcode_011_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecallcode_011_OOGEFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecallcode_011_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000b126c622075b1189fb6c45e851641cfaddf65b36",
-        "000000000000000000000000fbef21c5a6c2adcf3d769f085e0cc9fe9a8df954",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecallcode_011_ooge(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecallcode_011_ooge."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,94 +68,94 @@ def test_static_callcallcodecallcode_011_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.DELEGATECALL(
-                gas=0x186A0,
-                address=0x77612608C7A22F8929F6F1C9462A9954621AEEFD,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (DELEGATECALL 20020 (CALLDATALOAD 0) 0 64 0 64 ) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x4E34,
+            address=Op.CALLDATALOAD(offset=0x0),
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x630155b633b8b8f4bcb63e94e0baae0197c824eb"),  # noqa: E501
+        address=Address(0x77612608C7A22F8929F6F1C9462A9954621AEEFD),  # noqa: E501
     )
-    # Source: LLL
-    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x630155B633B8B8F4BCB63E94E0BAAE0197C824EB,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x6e143211e9d36eaeebe65f6ed69d6c28500040d6"),  # noqa: E501
+        address=Address(0xB126C622075B1189FB6C45E851641CFADDF65B36),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x4E34,
-                address=Op.CALLDATALOAD(offset=0x0),
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x77612608c7a22f8929f6f1c9462a9954621aeefd"),  # noqa: E501
+        address=Address(0xFBEF21C5A6C2ADCF3D769F085E0CC9FE9A8DF954),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (MSTORE 0 (CALLDATALOAD 0)) (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.DELEGATECALL(
+            gas=0x186A0,
+            address=0x77612608C7A22F8929F6F1C9462A9954621AEEFD,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
+        address=Address(0x630155B633B8B8F4BCB63E94E0BAAE0197C824EB),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x630155B633B8B8F4BCB63E94E0BAAE0197C824EB,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfbef21c5a6c2adcf3d769f085e0cc9fe9a8df954"),  # noqa: E501
+        address=Address(0x6E143211E9D36EAEEBE65F6ED69D6C28500040D6),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [172000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=172000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_ooge_2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_ooge_2.py
index 0a8dd23ca33..9b73ceaab58 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_ooge_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_ooge_2.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecallcode_011_ooge_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecallcode_011_OOGE_2Filler.json
+state_tests/stStaticCall/static_callcallcodecallcode_011_OOGE_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +27,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecallcode_011_OOGE_2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecallcode_011_OOGE_2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000bb2e6e56806816e94a356b0f0c8e53f98e44d6ad",
-            {
-                Address("0x6e143211e9d36eaeebe65f6ed69d6c28500040d6"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000f43b4e8b779078758104039080947f8f74e663d3",
-            {
-                Address("0x6e143211e9d36eaeebe65f6ed69d6c28500040d6"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecallcode_011_ooge_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecallcode_011_ooge_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,105 +71,122 @@ def test_static_callcallcodecallcode_011_ooge_2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x186A0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (CALLCODE 100000 (CALLDATALOAD 0) 0 0 64 0 64 ) (MSTORE 3 1)}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x186A0,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x11a4a9dad43e6ed44e108eaf7fb160f9835068f4"),  # noqa: E501
+        address=Address(0x11A4A9DAD43E6ED44E108EAF7FB160F9835068F4),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x11A4A9DAD43E6ED44E108EAF7FB160F9835068F4,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x11A4A9DAD43E6ED44E108EAF7FB160F9835068F4,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6e143211e9d36eaeebe65f6ed69d6c28500040d6"),  # noqa: E501
+        address=Address(0x6E143211E9D36EAEEBE65F6ED69D6C28500040D6),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0xB)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x4E34,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 11) (CALLCODE 20020 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (MSTORE 13 1)}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0xB)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x4E34,
+                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0xD, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0xD, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xbb2e6e56806816e94a356b0f0c8e53f98e44d6ad"),  # noqa: E501
+        address=Address(0xBB2E6E56806816E94A356B0F0C8E53F98E44D6AD),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0xB)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x4E34,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 11) (CALLCODE 20020 <contract:0x1000000000000000000000000000000000000003> 1 0 64 0 64 ) (MSTORE 13 1)}  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0xB)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x4E34,
+                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0xD, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0xD, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf43b4e8b779078758104039080947f8f74e663d3"),  # noqa: E501
+        address=Address(0xF43B4E8B779078758104039080947F8F74E663D3),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 1})},
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [172000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=172000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after.py
index 581e66bfcb2..f2dd613dedf 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecallcode_011_oogm_after.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecallcode_011_OOGMAfterFiller.json
+state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000476564431e8a9c2c934ef7712a1182eebb46b872",
-        "000000000000000000000000d678d9a03433a246d441a9a225553d3e4e760c5f",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecallcode_011_oogm_after(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecallcode_011_oogm_after."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,111 +68,111 @@ def test_static_callcallcodecallcode_011_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 60140 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xEAEC,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0xB4D115B5309A03FEBD836ABB6456BCE43CEC037B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x9C90,
-                    address=0xFECF0806036B619896DA47F661DFCE85C0107E9D,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x476564431e8a9c2c934ef7712a1182eebb46b872"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 60140 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xEAEC,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 1 1) (DELEGATECALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 1 1) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x4E34,
+                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb4d115b5309a03febd836abb6456bce43cec037b"),  # noqa: E501
+        address=Address(0xFECF0806036B619896DA47F661DFCE85C0107E9D),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x9C90,
-                    address=0xFECF0806036B619896DA47F661DFCE85C0107E9D,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x43,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
+    # Source: lll
+    # {  (MSTORE 1 1) (DELEGATECALL 40080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x9C90,
+                address=0xFECF0806036B619896DA47F661DFCE85C0107E9D,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x27)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x43, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x27)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xd678d9a03433a246d441a9a225553d3e4e760c5f"),  # noqa: E501
+        address=Address(0xD678D9A03433A246D441A9A225553D3E4E760C5F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x4E34,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 1 1) (DELEGATECALL 40080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SSTORE 3 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x9C90,
+                address=0xFECF0806036B619896DA47F661DFCE85C0107E9D,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xfecf0806036b619896da47f661dfce85c0107e9d"),  # noqa: E501
+        address=Address(0x476564431E8A9C2C934EF7712A1182EEBB46B872),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [172000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=172000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after2.py
index e65e19f2f50..91e9a676fb2 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecallcode_011_oogm_after2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecallcode_011_OOGMAfter2Filler.json
+state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "0000000000000000000000000973e7675ca57f8e6deb10cc07de5d8b53956212",
-        "00000000000000000000000013a5eb6fc2cf111fba5de5c336a9510e8229a44c",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecallcode_011_oogm_after2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecallcode_011_oogm_after2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,108 +68,108 @@ def test_static_callcallcodecallcode_011_oogm_after2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x9C90,
-                    address=0x25D69E6A677BD6D872F436BAD807C3244A268673,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 60150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xEAF6,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0973e7675ca57f8e6deb10cc07de5d8b53956212"),  # noqa: E501
+        address=Address(0x652A62E8338E91A46AA8387A2C205F35F79347AB),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x9C90,
-                    address=0x25D69E6A677BD6D872F436BAD807C3244A268673,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x40,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x24)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+        nonce=0,
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
+    )
+    # Source: lll
+    # {  (CALLCODE 20020 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x4E34,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x13a5eb6fc2cf111fba5de5c336a9510e8229a44c"),  # noqa: E501
+        address=Address(0x25D69E6A677BD6D872F436BAD807C3244A268673),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
+    # Source: lll
+    # {  (CALLCODE 40080 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
             Op.CALLCODE(
-                gas=0x4E34,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                gas=0x9C90,
+                address=0x25D69E6A677BD6D872F436BAD807C3244A268673,
                 value=0x0,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x40, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x24)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x25d69e6a677bd6d872f436bad807c3244a268673"),  # noqa: E501
+        address=Address(0x13A5EB6FC2CF111FBA5DE5C336A9510E8229A44C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
-        nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 60150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xEAF6,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (CALLCODE 40080 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (SSTORE 3 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0x9C90,
+                address=0x25D69E6A677BD6D872F436BAD807C3244A268673,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x652a62e8338e91a46aa8387a2c205f35f79347ab"),  # noqa: E501
+        address=Address(0x0973E7675CA57F8E6DEB10CC07DE5D8B53956212),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [172000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=172000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after_1.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after_1.py
index ec8aeaaf56a..bfbc6735e35 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after_1.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after_1.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecallcode_011_oogm_after_1.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecallcode_011_OOGMAfter_1Filler.json
+state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_1Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_1Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000ea0c00bca818c88ecda8e81c47cc1eac92284a74",
-            {
-                Address("0xb4d115b5309a03febd836abb6456bce43cec037b"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000037bf0d28af83352e42a45cd844899ee7c948a7c",
-            {
-                Address("0xb4d115b5309a03febd836abb6456bce43cec037b"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecallcode_011_oogm_after_1(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecallcode_011_oogm_after_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,109 +68,111 @@ def test_static_callcallcodecallcode_011_oogm_after_1(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x4E34,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 60140 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xEAEC,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x02c0bffb833f0bd1bdcb227a4fe215cf640316bb"),  # noqa: E501
+        address=Address(0xB4D115B5309A03FEBD836ABB6456BCE43CEC037B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x9C90,
-                    address=0x2C0BFFB833F0BD1BDCB227A4FE215CF640316BB,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x43,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x27)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x037bf0d28af83352e42a45cd844899ee7c948a7c"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (MSTORE 3 1) (DELEGATECALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x4E34,
+                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x02C0BFFB833F0BD1BDCB227A4FE215CF640316BB),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 60140 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xEAEC,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # { (MSTORE 3 1)  (DELEGATECALL 40080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SSTORE 3 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x9C90,
+                address=0x2C0BFFB833F0BD1BDCB227A4FE215CF640316BB,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb4d115b5309a03febd836abb6456bce43cec037b"),  # noqa: E501
+        address=Address(0xEA0C00BCA818C88ECDA8E81C47CC1EAC92284A74),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x9C90,
-                    address=0x2C0BFFB833F0BD1BDCB227A4FE215CF640316BB,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # { (MSTORE 3 1)  (DELEGATECALL 40080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x9C90,
+                address=0x2C0BFFB833F0BD1BDCB227A4FE215CF640316BB,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x43, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x27)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xea0c00bca818c88ecda8e81c47cc1eac92284a74"),  # noqa: E501
+        address=Address(0x037BF0D28AF83352E42A45CD844899EE7C948A7C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [172000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=172000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 0, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after_2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after_2.py
index d9a037d4714..a8854ec54cc 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_after_2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecallcode_011_oogm_after_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecallcode_011_OOGMAfter_2Filler.json
+state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "0000000000000000000000007da35806c36ef9661efa1128809b18a8ed9c78f0",
-        "00000000000000000000000045445092b290295fb6c954103ff2ce24cf3cfaf5",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecallcode_011_oogm_after_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecallcode_011_oogm_after_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,114 +68,114 @@ def test_static_callcallcodecallcode_011_oogm_after_2(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x4E34,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 60150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xEAF6,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e28daa61ad32aac8383a1f7b17986c69f0c3273"),  # noqa: E501
+        address=Address(0x652A62E8338E91A46AA8387A2C205F35F79347AB),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x9C90,
-                    address=0x1E28DAA61AD32AAC8383A1F7B17986C69F0C3273,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x45,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
+    # Source: lll
+    # {  (MSTORE 3 1) (CALLCODE 20020 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x4E34,
+                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x29)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x45445092b290295fb6c954103ff2ce24cf3cfaf5"),  # noqa: E501
+        address=Address(0x1E28DAA61AD32AAC8383A1F7B17986C69F0C3273),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 60150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xEAF6,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (CALLCODE 40080 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x9C90,
+                address=0x1E28DAA61AD32AAC8383A1F7B17986C69F0C3273,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x45, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x29)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x652a62e8338e91a46aa8387a2c205f35f79347ab"),  # noqa: E501
+        address=Address(0x45445092B290295FB6C954103FF2CE24CF3CFAF5),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x9C90,
-                    address=0x1E28DAA61AD32AAC8383A1F7B17986C69F0C3273,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (CALLCODE 40080 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (SSTORE 3 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x9C90,
+                address=0x1E28DAA61AD32AAC8383A1F7B17986C69F0C3273,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x7da35806c36ef9661efa1128809b18a8ed9c78f0"),  # noqa: E501
+        address=Address(0x7DA35806C36EF9661EFA1128809B18A8ED9C78F0),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [172000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=172000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_before.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_before.py
index d3488e995ca..9c95f6777cf 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_before.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_before.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecallcode_011_oogm_before.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecallcode_011_OOGMBeforeFiller.json
+state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "00000000000000000000000025a467084f1402e7813d24d9904c6faefc4241c8",
-        "0000000000000000000000009d3e6c1d2bc6290f0e7161adbb3ad1ec4770d0d3",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecallcode_011_oogm_before(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecallcode_011_oogm_before."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,112 +68,112 @@ def test_static_callcallcodecallcode_011_oogm_before(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x4E34,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (DELEGATECALL 40080 (CALLDATALOAD 0) 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x9C90,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x25a467084f1402e7813d24d9904c6faefc4241c8"),  # noqa: E501
+        address=Address(0xF752172F60D0024AF14BEE497ED232AB3A215362),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x4E34,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0xF752172F60D0024AF14BEE497ED232AB3A215362,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9d3e6c1d2bc6290f0e7161adbb3ad1ec4770d0d3"),  # noqa: E501
+        address=Address(0xD28B8E27785DDEE975645E09E8631D7BCB4133F3),  # noqa: E501
     )
-    # Source: LLL
-    # { (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0xF752172F60D0024AF14BEE497ED232AB3A215362,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (SSTORE 3 1)  (DELEGATECALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x4E34,
+                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xd28b8e27785ddee975645e09e8631d7bcb4133f3"),  # noqa: E501
+        address=Address(0x25A467084F1402E7813D24D9904C6FAEFC4241C8),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x9C90,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1))  (DELEGATECALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x4E34,
+                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf752172f60d0024af14bee497ed232ab3a215362"),  # noqa: E501
+        address=Address(0x9D3E6C1D2BC6290F0E7161ADBB3AD1EC4770D0D3),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [172000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=172000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_before2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_before2.py
index f79f601552b..b0ff081f608 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_before2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_oogm_before2.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecallcode_011_oogm_before2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecallcode_011_OOGMBefore2Filler.json
+state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMBefore2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,53 +27,46 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMBefore2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecallcode_011_OOGMBefore2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "00000000000000000000000087f0bb05316a8d8146646a151a64f38ae9d25176",
-            {
-                Address("0x6e143211e9d36eaeebe65f6ed69d6c28500040d6"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000001dffdbfbe33709f17b6e90137242c109917a994b",
-            {
-                Address("0x6e143211e9d36eaeebe65f6ed69d6c28500040d6"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "00000000000000000000000094c82267a4e8333afb80073fbaed3fe5973adc7c",
-            {
-                Address("0x6e143211e9d36eaeebe65f6ed69d6c28500040d6"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcallcodecallcode_011_oogm_before2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecallcode_011_oogm_before2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -81,133 +77,150 @@ def test_static_callcallcodecallcode_011_oogm_before2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x4E34,
-                    address=0xD4286AC3FCAC436406BC95F5B0176AD49AED7F7C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 32 1) (CALLCODE 40080 (CALLDATALOAD 0) 0 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x20, value=0x1)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x9C90,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1dffdbfbe33709f17b6e90137242c109917a994b"),  # noqa: E501
+        address=Address(0x8BDE6A10A1792232FD09B528800D9AC2A6835424),  # noqa: E501
     )
-    # Source: LLL
-    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x8BDE6A10A1792232FD09B528800D9AC2A6835424,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (MSTORE 32 1) }
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x20, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x6e143211e9d36eaeebe65f6ed69d6c28500040d6"),  # noqa: E501
+        address=Address(0xD4286AC3FCAC436406BC95F5B0176AD49AED7F7C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x4E34,
-                    address=0xD4286AC3FCAC436406BC95F5B0176AD49AED7F7C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x8BDE6A10A1792232FD09B528800D9AC2A6835424,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x87f0bb05316a8d8146646a151a64f38ae9d25176"),  # noqa: E501
+        address=Address(0x6E143211E9D36EAEEBE65F6ED69D6C28500040D6),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x20, value=0x1)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x9C90,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (SSTORE 3 1) (CALLCODE 20020 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x4E34,
+                address=0xD4286AC3FCAC436406BC95F5B0176AD49AED7F7C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8bde6a10a1792232fd09b528800d9ac2a6835424"),  # noqa: E501
+        address=Address(0x87F0BB05316A8D8146646A151A64F38AE9D25176),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x4E34,
-                    address=0xD4286AC3FCAC436406BC95F5B0176AD49AED7F7C,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (CALLCODE 20020 <contract:0x1000000000000000000000000000000000000003> 1 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0x4E34,
+                address=0xD4286AC3FCAC436406BC95F5B0176AD49AED7F7C,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         balance=10,
         nonce=0,
-        address=Address("0x94c82267a4e8333afb80073fbaed3fe5973adc7c"),  # noqa: E501
+        address=Address(0x94C82267A4E8333AFB80073FBAED3FE5973ADC7C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x20, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) (CALLCODE 20020 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x4E34,
+                address=0xD4286AC3FCAC436406BC95F5B0176AD49AED7F7C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xd4286ac3fcac436406bc95f5b0176ad49aed7f7c"),  # noqa: E501
+        address=Address(0x1DFFDBFBE33709F17B6E90137242C109917A994B),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 1})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [172000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=172000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_suicide_end.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_suicide_end.py
index f0ed528d677..225136cbccb 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_suicide_end.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecallcode_011_suicide_end.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecallcode_011_SuicideEndFiller.json
+state_tests/stStaticCall/static_callcallcodecallcode_011_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecallcode_011_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecallcode_011_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcodecallcode_011_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecallcode_011_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,81 +46,80 @@ def test_static_callcallcodecallcode_011_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x92D7028788CAA240253B7B2A92386464690CDC72
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x4a31dd3a8c3c9a793ac0b3c234a4dbac2f201404"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x92D7028788CAA240253B7B2A92386464690CDC72,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x92D7028788CAA240253B7B2A92386464690CDC72,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x569cdc3b32cc3f9747bbde39fd70fead591d2f0d"),  # noqa: E501
+        address=Address(0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D),  # noqa: E501
+    )
+    # Source: lll
+    # {  (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x186A0,
+            address=0x4A31DD3A8C3C9A793AC0B3C234A4DBAC2F201404,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x92D7028788CAA240253B7B2A92386464690CDC72),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
+    # Source: lll
+    # {  (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
             Op.DELEGATECALL(
-                gas=0x186A0,
-                address=0x4A31DD3A8C3C9A793AC0B3C234A4DBAC2F201404,
+                gas=0xC350,
+                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=0x92D7028788CAA240253B7B2A92386464690CDC72)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x92d7028788caa240253b7b2a92386464690cdc72"),  # noqa: E501
+        address=Address(0x4A31DD3A8C3C9A793AC0B3C234A4DBAC2F201404),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr_2: Account(balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_suicide_end2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_suicide_end2.py
index ca98407a02d..d1821e6f7a5 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_suicide_end2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_suicide_end2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecallcode_011_suicide_end2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecallcode_011_SuicideEnd2Filler.json
+state_tests/stStaticCall/static_callcallcodecallcode_011_SuicideEnd2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecallcode_011_SuicideEnd2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecallcode_011_SuicideEnd2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcodecallcode_011_suicide_end2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecallcode_011_suicide_end2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,85 +46,81 @@ def test_static_callcallcodecallcode_011_suicide_end2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xA5EACC8F2682A6D310E37822C75BFD196E040BCB
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x13b9edff99ae7b562c9292952c1e67e8fa0a3e03"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0xA5EACC8F2682A6D310E37822C75BFD196E040BCB,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0xA5EACC8F2682A6D310E37822C75BFD196E040BCB,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x569cdc3b32cc3f9747bbde39fd70fead591d2f0d"),  # noqa: E501
+        address=Address(0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D),  # noqa: E501
+    )
+    # Source: lll
+    # {  (MSTORE 3 1) (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.CALLCODE(
+            gas=0x186A0,
+            address=0x13B9EDFF99AE7B562C9292952C1E67E8FA0A3E03,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0xA5EACC8F2682A6D310E37822C75BFD196E040BCB),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.CALLCODE(
-                gas=0x186A0,
-                address=0x13B9EDFF99AE7B562C9292952C1E67E8FA0A3E03,
+    # Source: lll
+    # {  (MSTORE 3 1) (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
                 value=0x0,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=0xA5EACC8F2682A6D310E37822C75BFD196E040BCB)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xa5eacc8f2682a6d310e37822c75bfd196e040bcb"),  # noqa: E501
+        address=Address(0x13B9EDFF99AE7B562C9292952C1E67E8FA0A3E03),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_suicide_middle.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_suicide_middle.py
index d91ecf9853a..c7417f94074 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_suicide_middle.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecallcode_011_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecallcode_011_SuicideMiddleFiller.json
+state_tests/stStaticCall/static_callcallcodecallcode_011_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecallcode_011_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecallcode_011_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcodecallcode_011_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecallcode_011_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,77 +46,80 @@ def test_static_callcallcodecallcode_011_suicide_middle(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x92D7028788CAA240253B7B2A92386464690CDC72,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x569cdc3b32cc3f9747bbde39fd70fead591d2f0d"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x186A0,
-                address=0xECA01D36DBE4F4AB283A49016EFA370BAC7E7346,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x92D7028788CAA240253B7B2A92386464690CDC72,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D),  # noqa: E501
+    )
+    # Source: lll
+    # {  (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x186A0,
+            address=0xECA01D36DBE4F4AB283A49016EFA370BAC7E7346,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x92d7028788caa240253b7b2a92386464690cdc72"),  # noqa: E501
+        address=Address(0x92D7028788CAA240253B7B2A92386464690CDC72),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D)
-            + Op.DELEGATECALL(
-                gas=0xC350,
-                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x569CDC3B32CC3F9747BBDE39FD70FEAD591D2F0D
+        )
+        + Op.DELEGATECALL(
+            gas=0xC350,
+            address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xeca01d36dbe4f4ab283a49016efa370bac7e7346"),  # noqa: E501
+        address=Address(0xECA01D36DBE4F4AB283A49016EFA370BAC7E7346),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr_2: Account(balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_suicide_middle2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_suicide_middle2.py
index ecc69996417..0234bc00b51 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_suicide_middle2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_011_suicide_middle2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecallcode_011_suicide_middle2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecallcode_011_SuicideMiddle2Filler.json
+state_tests/stStaticCall/static_callcallcodecallcode_011_SuicideMiddle2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecallcode_011_SuicideMiddle2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecallcode_011_SuicideMiddle2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcodecallcode_011_suicide_middle2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecallcode_011_suicide_middle2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,85 +46,88 @@ def test_static_callcallcodecallcode_011_suicide_middle2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0xD009AF172F5FAE9CCFE64264207C2FE773E0764F,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0xD009AF172F5FAE9CCFE64264207C2FE773E0764F,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa2ca69f1cf9ffa7a761899e8dd2f941d40326fd6"),  # noqa: E501
+        address=Address(0xA2CA69F1CF9FFA7A761899E8DD2F941D40326FD6),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0xDCAD05283EB3153CA2200073454E8303C30805EC,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x186A0,
+                address=0xDCAD05283EB3153CA2200073454E8303C30805EC,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xd009af172f5fae9ccfe64264207c2fe773e0764f"),  # noqa: E501
+        address=Address(0xD009AF172F5FAE9CCFE64264207C2FE773E0764F),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xA2CA69F1CF9FFA7A761899E8DD2F941D40326FD6)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xA2CA69F1CF9FFA7A761899E8DD2F941D40326FD6
+        )
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xdcad05283eb3153ca2200073454e8303c30805ec"),  # noqa: E501
+        address=Address(0xDCAD05283EB3153CA2200073454E8303C30805EC),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
+        target: Account(storage={0: 1, 1: 0}),
+        addr_2: Account(balance=0x2540BE400),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_abcb_recursive.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_abcb_recursive.py
index f5e7d4f81c1..2d76b12e3ba 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_abcb_recursive.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_abcb_recursive.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecallcode_abcb_recursive.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecallcode_ABCB_RECURSIVEFiller.json
+state_tests/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcodecallcode_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecallcode_abcb_recursive."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,70 +46,70 @@ def test_static_callcallcodecallcode_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x17D7840,
-                    address=0x2C81F66472668C71014CE3A9537B033DB57AF77B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x0f30355d1f829e0dd67066517a43a738ac501d99"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0xF4240,
-                address=0xAB5C6018CF3368381E283C1DE7F906C456188BC3,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x17D7840,
+                address=0x2C81F66472668C71014CE3A9537B033DB57AF77B,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x0F30355D1F829E0DD67066517A43A738AC501D99),  # noqa: E501
+    )
+    # Source: lll
+    # {  (DELEGATECALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0xF4240,
+            address=0xAB5C6018CF3368381E283C1DE7F906C456188BC3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2c81f66472668c71014ce3a9537b033db57af77b"),  # noqa: E501
+        address=Address(0x2C81F66472668C71014CE3A9537B033DB57AF77B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x7A120,
-                address=0x2C81F66472668C71014CE3A9537B033DB57AF77B,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (DELEGATECALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x7A120,
+            address=0x2C81F66472668C71014CE3A9537B033DB57AF77B,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xab5c6018cf3368381e283c1de7f906c456188bc3"),  # noqa: E501
+        address=Address(0xAB5C6018CF3368381E283C1DE7F906C456188BC3),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_abcb_recursive2.py b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_abcb_recursive2.py
index a40b22ccec0..606cc541ecf 100644
--- a/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_abcb_recursive2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcallcodecallcode_abcb_recursive2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcallcodecallcode_abcb_recursive2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcallcodecallcode_ABCB_RECURSIVE2Filler.json
+state_tests/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVE2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVE2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVE2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcallcodecallcode_abcb_recursive2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcallcodecallcode_abcb_recursive2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,72 +46,72 @@ def test_static_callcallcodecallcode_abcb_recursive2(
         gas_limit=3000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (STATICCALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x17D7840,
-                    address=0x9EF1D089354C245C0C8A08590F55E76008AC54CD,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x0f30355d1f829e0dd67066517a43a738ac501d99"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x7A120,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x17D7840,
                 address=0x9EF1D089354C245C0C8A08590F55E76008AC54CD,
-                value=0x0,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x0F30355D1F829E0DD67066517A43A738AC501D99),  # noqa: E501
+    )
+    # Source: lll
+    # {  (CALLCODE 1000000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0xF4240,
+            address=0x1A3C543695D7CA3A7D5522E9C7AABE5512571706,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x1a3c543695d7ca3a7d5522e9c7aabe5512571706"),  # noqa: E501
+        address=Address(0x9EF1D089354C245C0C8A08590F55E76008AC54CD),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0xF4240,
-                address=0x1A3C543695D7CA3A7D5522E9C7AABE5512571706,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALLCODE 500000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x7A120,
+            address=0x9EF1D089354C245C0C8A08590F55E76008AC54CD,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x9ef1d089354c245c0c8a08590f55e76008ac54cd"),  # noqa: E501
+        address=Address(0x1A3C543695D7CA3A7D5522E9C7AABE5512571706),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcode_check_pc.py b/tests/ported_static/stStaticCall/test_static_callcode_check_pc.py
index e8c4eca09e0..c05cb8532bc 100644
--- a/tests/ported_static/stStaticCall/test_static_callcode_check_pc.py
+++ b/tests/ported_static/stStaticCall/test_static_callcode_check_pc.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcode_check_pc.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcode_checkPCFiller.json
+state_tests/stStaticCall/static_callcode_checkPCFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcode_checkPCFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcode_checkPCFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcode_check_pc(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcode_check_pc."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,43 +44,39 @@ def test_static_callcode_check_pc(
         gas_limit=3000000000,
     )
 
-    pre.deploy_contract(
-        code=bytes.fromhex("00"),
+    # Source: lll
+    # {}
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x0fa032348694ad238cccc23b44fe450999cdc0fe"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (STATICCALL 1000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[3]] (PC)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xF4240,
-                    address=0xFA032348694AD238CCCC23B44FE450999CDC0FE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xF4240,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x3, value=Op.PC)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x3, value=Op.PC)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6a1bc409e9c1914f80d4a72653f9d1c4a53c0343"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1100000,
     )
 
-    post = {
-        contract: Account(storage={3: 35}),
-    }
+    post = {target: Account(storage={3: 35})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecall_10.py b/tests/ported_static/stStaticCall/test_static_callcodecall_10.py
index aa850f04e6b..14ed9be49e3 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecall_10.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecall_10.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecall_10.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcodecall_10Filler.json
+state_tests/stStaticCall/static_callcodecall_10Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcodecall_10Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcodecall_10Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecall_10(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecall_10."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,63 +44,58 @@ def test_static_callcodecall_10(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 1 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x2a142c79a9b097c111ce945214226126b75e332c"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x55730,
-                    address=0x732757BD540487F3FCFA3342F95106BC67684091,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 1 1) (STATICCALL 250000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 1 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x3D090,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4eef7e2b5ae9be0fc5b43dc4fe39195a1ae10fc4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x3D090,
-                    address=0x2A142C79A9B097C111CE945214226126B75E332C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x732757bd540487f3fcfa3342f95106bc67684091"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecall_10_2.py b/tests/ported_static/stStaticCall/test_static_callcodecall_10_2.py
index d21fd9c8581..28bc158d0e5 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecall_10_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecall_10_2.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecall_10_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcodecall_10_2Filler.json
+state_tests/stStaticCall/static_callcodecall_10_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcodecall_10_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcodecall_10_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecall_10_2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecall_10_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,60 +44,55 @@ def test_static_callcodecall_10_2(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) [[ 1 ]] 1  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x55730,
-                    address=0x620B442C84D5068E6B57D390A1AC99130205406E,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (MSTORE 1 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x1c60bd6c18eaa7c07312b755979e9b2c2f2802d4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (STATICCALL 250000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x3D090,
+            address=addr_2,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2a142c79a9b097c111ce945214226126b75e332c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x3D090,
-                address=0x2A142C79A9B097C111CE945214226126B75E332C,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> 1 0 64 0 64 ) [[ 1 ]] 1  }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x55730,
+                address=addr,
+                value=0x1,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x620b442c84d5068e6b57d390a1ac99130205406e"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecall_10_ooge.py b/tests/ported_static/stStaticCall/test_static_callcodecall_10_ooge.py
index 3fc6f5d01c6..52635e65517 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecall_10_ooge.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecall_10_ooge.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecall_10_ooge.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcodecall_10_OOGEFiller.json
+state_tests/stStaticCall/static_callcodecall_10_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcodecall_10_OOGEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcodecall_10_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "0000000000000000000000009791fa194f36c71f8bd64a757b7283707075ba99",
-        "000000000000000000000000fbef21c5a6c2adcf3d769f085e0cc9fe9a8df954",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecall_10_ooge(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecall_10_ooge."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,78 +66,78 @@ def test_static_callcodecall_10_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x4E34,
-                address=Op.CALLDATALOAD(offset=0x0),
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 20020 (CALLDATALOAD 0) 0 64 0 64 ) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x4E34,
+            address=Op.CALLDATALOAD(offset=0x0),
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x33e1ad2a3ae944798e9ed4689b85d9136b59ebd2"),  # noqa: E501
+        address=Address(0x33E1AD2A3AE944798E9ED4689B85D9136B59EBD2),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 2 1)}
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x9791fa194f36c71f8bd64a757b7283707075ba99"),  # noqa: E501
+        address=Address(0x9791FA194F36C71F8BD64A757B7283707075BA99),  # noqa: E501
     )
-    # Source: LLL
-    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x33E1AD2A3AE944798E9ED4689B85D9136B59EBD2,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdcff1ef291ec7b6a606ac4284680db5a06f33054"),  # noqa: E501
+        address=Address(0xFBEF21C5A6C2ADCF3D769F085E0CC9FE9A8DF954),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x33E1AD2A3AE944798E9ED4689B85D9136B59EBD2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfbef21c5a6c2adcf3d769f085e0cc9fe9a8df954"),  # noqa: E501
+        address=Address(0xDCFF1EF291EC7B6A606AC4284680DB5A06F33054),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [172000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=172000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecall_10_ooge_2.py b/tests/ported_static/stStaticCall/test_static_callcodecall_10_ooge_2.py
index 0803af0f1b9..a81f4ac172c 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecall_10_ooge_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecall_10_ooge_2.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecall_10_ooge_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcodecall_10_OOGE_2Filler.json
+state_tests/stStaticCall/static_callcodecall_10_OOGE_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcodecall_10_OOGE_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcodecall_10_OOGE_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "0000000000000000000000006b63d3f6d6e39d3ad60afa947ddc3e34017d0ef9",
-        "000000000000000000000000fbef21c5a6c2adcf3d769f085e0cc9fe9a8df954",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecall_10_ooge_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecall_10_ooge_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,83 +66,87 @@ def test_static_callcodecall_10_ooge_2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 2 1) (STATICCALL 20020 (CALLDATALOAD 0) 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x2, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x4E34,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xE7BF411C5F7EA351927579255740C4BD69BD01F5),  # noqa: E501
+    )
+    # Source: lll
+    # {  (SSTORE 2 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x6b63d3f6d6e39d3ad60afa947ddc3e34017d0ef9"),  # noqa: E501
+        address=Address(0x6B63D3F6D6E39D3AD60AFA947DDC3E34017D0EF9),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x2, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x4E34,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe7bf411c5f7ea351927579255740c4bd69bd01f5"),  # noqa: E501
+        address=Address(0xFBEF21C5A6C2ADCF3D769F085E0CC9FE9A8DF954),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0xE7BF411C5F7EA351927579255740C4BD69BD01F5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0xE7BF411C5F7EA351927579255740C4BD69BD01F5,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xeceb2d7dc716950b2877389dc5b8cf7000305255"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xfbef21c5a6c2adcf3d769f085e0cc9fe9a8df954"),  # noqa: E501
+        address=Address(0xECEB2D7DC716950B2877389DC5B8CF7000305255),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [172000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=172000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 0}),
+        addr: Account(storage={1: 0, 2: 0}),
+        addr_2: Account(storage={1: 0, 2: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecall_10_suicide_end.py b/tests/ported_static/stStaticCall/test_static_callcodecall_10_suicide_end.py
index a506d9ef460..5fecaa2fdc8 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecall_10_suicide_end.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecall_10_suicide_end.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecall_10_suicide_end.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecall_10_SuicideEndFiller.json
+state_tests/stStaticCall/static_callcodecall_10_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,46 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcodecall_10_SuicideEndFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcodecall_10_SuicideEndFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000cfb5784a5e49924becc2d5c5d2ee0a9b141e6216",
-            {
-                Address("0x99b0d2d9eea3205f4de64fdc26910432824ab1a7"): Account(
-                    storage={0: 1, 1: 0x2CF4C4}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000703b936fd4d674f0ff5d6957f61097152f8781b8",
-            {
-                Address("0x99b0d2d9eea3205f4de64fdc26910432824ab1a7"): Account(
-                    storage={0: 1, 1: 0x2C3183}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecall_10_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecall_10_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,73 +66,76 @@ def test_static_callcodecall_10_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 2 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x2, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0xCFB5784A5E49924BECC2D5C5D2EE0A9B141E6216),  # noqa: E501
+    )
+    # Source: lll
+    # {  (SSTORE 2 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x2, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x703b936fd4d674f0ff5d6957f61097152f8781b8"),  # noqa: E501
+        address=Address(0x703B936FD4D674F0FF5D6957F61097152F8781B8),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0xDC07FFF80D888EBA04EAB962D37897F6C923462B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0xDC07FFF80D888EBA04EAB962D37897F6C923462B,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x99b0d2d9eea3205f4de64fdc26910432824ab1a7"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x2, value=0x1) + Op.STOP,
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0xcfb5784a5e49924becc2d5c5d2ee0a9b141e6216"),  # noqa: E501
+        address=Address(0x99B0D2D9EEA3205F4DE64FDC26910432824AB1A7),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (STATICCALL 50000 (CALLDATALOAD 0) 0 64 0 64 ) (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SELFDESTRUCT(
-                address=0x99B0D2D9EEA3205F4DE64FDC26910432824AB1A7
-            )
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=0x99B0D2D9EEA3205F4DE64FDC26910432824AB1A7)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xdc07fff80d888eba04eab962d37897f6c923462b"),  # noqa: E501
+        address=Address(0xDC07FFF80D888EBA04EAB962D37897F6C923462B),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [3000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=3000000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {target: Account(balance=0xDE0B6B3A7640000, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecall_10_suicide_end2.py b/tests/ported_static/stStaticCall/test_static_callcodecall_10_suicide_end2.py
index c139588f6dc..92fe9bf3b88 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecall_10_suicide_end2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecall_10_suicide_end2.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_static_callcodecall_10_suicide_end2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecall_10_SuicideEnd2Filler.json
+state_tests/stStaticCall/static_callcodecall_10_SuicideEnd2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,46 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcodecall_10_SuicideEnd2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcodecall_10_SuicideEnd2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
             0,
-            {
-                Address("0x44d09ddf088dd88c0e91fa7ef74973ff94ad7414"): Account(
-                    storage={0: 1, 1: 0x2CF641}
-                )
-            },
+            0,
+            0,
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x44d09ddf088dd88c0e91fa7ef74973ff94ad7414"): Account(
-                    storage={0: 1, 1: 0x2CDC15}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecall_10_suicide_end2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecall_10_suicide_end2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,65 +69,83 @@ def test_static_callcodecall_10_suicide_end2(
         gas_limit=30000000,
     )
 
-    # Source: LLL
+    # Source: lll
+    # {  (MSTORE 2 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x2, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0xCFB5784A5E49924BECC2D5C5D2EE0A9B141E6216),  # noqa: E501
+    )
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0xB60789F240AC9F12FCDE1E4BBD5042A7F30932D4,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0xB60789F240AC9F12FCDE1E4BBD5042A7F30932D4,
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x44d09ddf088dd88c0e91fa7ef74973ff94ad7414"),  # noqa: E501
+        address=Address(0x44D09DDF088DD88C0E91FA7EF74973FF94AD7414),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0xCFB5784A5E49924BECC2D5C5D2EE0A9B141E6216,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x44D09DDF088DD88C0E91FA7EF74973FF94AD7414
+    # Source: lll
+    # {  (STATICCALL 50000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0xCFB5784A5E49924BECC2D5C5D2EE0A9B141E6216,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=0x44D09DDF088DD88C0E91FA7EF74973FF94AD7414)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xb60789f240ac9f12fcde1e4bbd5042a7f30932d4"),  # noqa: E501
+        address=Address(0xB60789F240AC9F12FCDE1E4BBD5042A7F30932D4),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x2, value=0x1) + Op.STOP,
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0xcfb5784a5e49924becc2d5c5d2ee0a9b141e6216"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {target: Account(balance=0xDE0B6B3A7640000)},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {target: Account(balance=0xDE0B6B3A7640001)},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [3000000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=3000000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100.py
index 67dc3059771..9a4881aff50 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcall_100.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcodecallcall_100Filler.json
+state_tests/stStaticCall/static_callcodecallcall_100Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcall_100Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcodecallcall_100Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcall_100(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcall_100."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,78 +44,72 @@ def test_static_callcodecallcall_100(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0xEF859513AE36C397C43170A2980741575916167B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x5, value=Op.CALLER)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (MSTORE 1 1)}
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x37beb0dda966430210baed14c311db5b8237b9e7"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x55730,
-                    address=0x37BEB0DDA966430210BAED14C311DB5B8237B9E7,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x3D090,
+            address=addr_3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4be61408125d759dff8caeae4704d8c7aca6099a"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
-        nonce=0,
-        address=Address("0x7e3fa59ae6c821631a70f75a54fbe9a1085102c7"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
+    # Source: lll
+    # {  (STATICCALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 5 (CALLER))}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
             Op.STATICCALL(
-                gas=0x3D090,
-                address=0x7E3FA59AE6C821631A70F75A54FBE9A1085102C7,
+                gas=0x493E0,
+                address=addr_2,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x5, value=Op.CALLER)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+    )
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1  }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xef859513ae36c397c43170a2980741575916167b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_2.py
index 2f94b25a535..6c9a236711a 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_2.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcall_100_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_callcodecallcall_100_2Filler.json
+state_tests/stStaticCall/static_callcodecallcall_100_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,46 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcall_100_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcodecallcall_100_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
+            0,
             0,
-            {
-                Address("0x9f233647d252a405337c598a262f95052c23f7ee"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x9f233647d252a405337c598a262f95052c23f7ee"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcall_100_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcall_100_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -72,75 +66,77 @@ def test_static_callcodecallcall_100_2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 1 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x2a142c79a9b097c111ce945214226126b75e332c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x493E0,
-                address=0xEF859513AE36C397C43170A2980741575916167B,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x3D090,
+            address=addr_3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x47f2744d161ace12cc52a51922d3cee2e8ab3b89"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x55730,
-                    address=0x47F2744D161ACE12CC52A51922D3CEE2E8AB3B89,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x493E0,
+            address=addr_2,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9f233647d252a405337c598a262f95052c23f7ee"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x3D090,
-                address=0x2A142C79A9B097C111CE945214226126B75E332C,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x55730,
+                address=addr,
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xef859513ae36c397c43170a2980741575916167b"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [3000000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=3000000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_ooge.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_ooge.py
index cb71bb83b38..2a349847b34 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_ooge.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_ooge.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcall_100_ooge.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcall_100_OOGEFiller.json
+state_tests/stStaticCall/static_callcodecallcall_100_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,31 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcall_100_OOGEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcodecallcall_100_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000b126c622075b1189fb6c45e851641cfaddf65b36",
-        "000000000000000000000000fbef21c5a6c2adcf3d769f085e0cc9fe9a8df954",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcall_100_ooge(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcall_100_ooge."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,100 +66,100 @@ def test_static_callcodecallcall_100_ooge(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x4E34,
-                    address=Op.CALLDATALOAD(offset=0x20),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (STATICCALL 20020 (CALLDATALOAD 32) 0 64 0 64 ) (MSTORE 3 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x4E34,
+                address=Op.CALLDATALOAD(offset=0x20),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x5ac4ee179abd5ea5f60962e651ded51161a55b6e"),  # noqa: E501
+        address=Address(0x5AC4EE179ABD5EA5F60962E651DED51161A55B6E),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
+        address=Address(0xB126C622075B1189FB6C45E851641CFADDF65B36),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x5AC4EE179ABD5EA5F60962E651DED51161A55B6E,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc4961fc5bdc17da68e909d07947a5e030952891e"),  # noqa: E501
+        address=Address(0xFBEF21C5A6C2ADCF3D769F085E0CC9FE9A8DF954),  # noqa: E501
     )
-    # Source: LLL
-    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0xC4961FC5BDC17DA68E909D07947A5E030952891E,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 32 (CALLDATALOAD 0)) (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0x5AC4EE179ABD5EA5F60962E651DED51161A55B6E,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdcff1ef291ec7b6a606ac4284680db5a06f33054"),  # noqa: E501
+        address=Address(0xC4961FC5BDC17DA68E909D07947A5E030952891E),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0xC4961FC5BDC17DA68E909D07947A5E030952891E,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfbef21c5a6c2adcf3d769f085e0cc9fe9a8df954"),  # noqa: E501
+        address=Address(0xDCFF1EF291EC7B6A606AC4284680DB5A06F33054),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [172000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=172000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_ooge2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_ooge2.py
index 01de1b3b4a8..ddc828b6da4 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_ooge2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_ooge2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcall_100_ooge2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcall_100_OOGE2Filler.json
+state_tests/stStaticCall/static_callcodecallcall_100_OOGE2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,31 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcall_100_OOGE2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcodecallcall_100_OOGE2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000b126c622075b1189fb6c45e851641cfaddf65b36",
-        "000000000000000000000000fbef21c5a6c2adcf3d769f085e0cc9fe9a8df954",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcall_100_ooge2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcall_100_ooge2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,95 +66,95 @@ def test_static_callcodecallcall_100_ooge2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.STATICCALL(
-                gas=0x186A0,
-                address=0x33E1AD2A3AE944798E9ED4689B85D9136B59EBD2,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 20020 (CALLDATALOAD 0) 0 64 0 64 ) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x4E34,
+            address=Op.CALLDATALOAD(offset=0x0),
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x03c7aef27501fce796222312bcd7a4546dd60637"),  # noqa: E501
+        address=Address(0x33E1AD2A3AE944798E9ED4689B85D9136B59EBD2),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x4E34,
-                address=Op.CALLDATALOAD(offset=0x0),
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x33e1ad2a3ae944798e9ed4689b85d9136b59ebd2"),  # noqa: E501
+        address=Address(0xB126C622075B1189FB6C45E851641CFADDF65B36),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
+        address=Address(0xFBEF21C5A6C2ADCF3D769F085E0CC9FE9A8DF954),  # noqa: E501
     )
-    # Source: LLL
-    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x3C7AEF27501FCE796222312BCD7A4546DD60637,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (MSTORE 0 (CALLDATALOAD 0)) (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.STATICCALL(
+            gas=0x186A0,
+            address=0x33E1AD2A3AE944798E9ED4689B85D9136B59EBD2,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xba1d112a3ea7a5149e304fcea53d3f6a76bd4cb9"),  # noqa: E501
+        address=Address(0x03C7AEF27501FCE796222312BCD7A4546DD60637),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0x3C7AEF27501FCE796222312BCD7A4546DD60637,
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfbef21c5a6c2adcf3d769f085e0cc9fe9a8df954"),  # noqa: E501
+        address=Address(0xBA1D112A3EA7A5149E304FCEA53D3F6A76BD4CB9),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+    ]
+    tx_gas = [172000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=172000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after.py
index 72f417eaad9..aa3f374072f 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcall_100_oogm_after.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcall_100_OOGMAfterFiller.json
+state_tests/stStaticCall/static_callcodecallcall_100_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcall_100_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcall_100_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcall_100_oogm_after(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcall_100_oogm_after."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,89 +46,82 @@ def test_static_callcodecallcall_100_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x9C90,
-                    address=0x694B007C276285E1A2424A78288ABF42FDDA6E71,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x43,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x27)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x2865fd3572b0b77173e5ed91e968acad55701151"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x4E34,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x4E34,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 40080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x9C90,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x43, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x27)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x694b007c276285e1a2424a78288abf42fdda6e71"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 60150 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xEAF6,
-                    address=0x2865FD3572B0B77173E5ED91E968ACAD55701151,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xEAF6,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe79aee563c83547f229d955ecdcca0f01fed9aa9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1720000,
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after2.py
index 99bf1c642a9..655f6dd9441 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcall_100_oogm_after2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcall_100_OOGMAfter2Filler.json
+state_tests/stStaticCall/static_callcodecallcall_100_OOGMAfter2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcall_100_OOGMAfter2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcall_100_OOGMAfter2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
             0,
-            {
-                Address("0x8b3623c74bbf83102adc34299d32b5cd0e7d8cb9"): Account(
-                    storage={1: 1}
-                )
-            },
+            0,
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x8b3623c74bbf83102adc34299d32b5cd0e7d8cb9"): Account(
-                    storage={1: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcall_100_oogm_after2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcall_100_oogm_after2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,87 +68,89 @@ def test_static_callcodecallcall_100_oogm_after2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
-        nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x1D4D4,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 600150 (CALLDATALOAD 0) (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1  }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x92856,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x444df104ea3853bfeaa91a755136f33385d12eea"),  # noqa: E501
+        address=Address(0x8B3623C74BBF83102ADC34299D32B5CD0E7D8CB9),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 600150 (CALLDATALOAD 0) (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x92856,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x8b3623c74bbf83102adc34299d32b5cd0e7d8cb9"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x61AD0,
-                    address=0x444DF104EA3853BFEAA91A755136F33385D12EEA,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3F,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
+    # Source: lll
+    # { (STATICCALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x1D4D4,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        nonce=0,
+        address=Address(0x444DF104EA3853BFEAA91A755136F33385D12EEA),  # noqa: E501
+    )
+    # Source: lll
+    # {  (STATICCALL 400080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x61AD0,
+                address=0x444DF104EA3853BFEAA91A755136F33385D12EEA,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x23)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3F, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x23)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf4645c150a8060778ad94dffe302081fc222dedb"),  # noqa: E501
+        address=Address(0xF4645C150A8060778AD94DFFE302081FC222DEDB),  # noqa: E501
     )
 
+    tx_data = [
+        Hash(addr, left_padding=True),
+    ]
+    tx_gas = [1720000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "000000000000000000000000f4645c150a8060778ad94dffe302081fc222dedb"
-        ),
-        gas_limit=1720000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 0, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after_2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after_2.py
index 6c6395b5d0b..d3288a69630 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after_2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcall_100_oogm_after_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcall_100_OOGMAfter_2Filler.json
+state_tests/stStaticCall/static_callcodecallcall_100_OOGMAfter_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcall_100_OOGMAfter_2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcall_100_OOGMAfter_2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcall_100_oogm_after_2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcall_100_oogm_after_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,89 +46,82 @@ def test_static_callcodecallcall_100_oogm_after_2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 601500 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x92D9C,
-                    address=0xA4306100C983E6928DEBC547240D7FE9DEDF2EF8,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x0bc6fe23b1c8d7e29532373698cdf5ba4a4e7b88"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x1D4D4,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x1D4D4,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x12c33b5028f0a7d7777501a5e899d92b2ec75b9a"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 400080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x61AD0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x44, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x61AD0,
-                    address=0x12C33B5028F0A7D7777501A5E899D92B2EC75B9A,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x44,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 601500 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1  }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x92D9C,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa4306100c983e6928debc547240d7fe9dedf2ef8"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1720000,
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after_3.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after_3.py
index 4bc6952183f..c4003605e60 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after_3.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_after_3.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcall_100_oogm_after_3.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcall_100_OOGMAfter_3Filler.json
+state_tests/stStaticCall/static_callcodecallcall_100_OOGMAfter_3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +27,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcall_100_OOGMAfter_3Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcall_100_OOGMAfter_3Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
+            0,
             0,
-            {
-                Address("0x62b278a07428f1ff97ee7c884b711f6df3340707"): Account(
-                    storage={1: 1}
-                )
-            },
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x62b278a07428f1ff97ee7c884b711f6df3340707"): Account(
-                    storage={1: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcall_100_oogm_after_3(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcall_100_oogm_after_3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,89 +71,104 @@ def test_static_callcodecallcall_100_oogm_after_3(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x9C90,
-                    address=0x694B007C276285E1A2424A78288ABF42FDDA6E71,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x43,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x27)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2865fd3572b0b77173e5ed91e968acad55701151"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 60150 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xEAF6,
-                    address=0x2865FD3572B0B77173E5ED91E968ACAD55701151,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x4E34,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x62b278a07428f1ff97ee7c884b711f6df3340707"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x4E34,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 40080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x9C90,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x43, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x27)
+        + Op.JUMPDEST
+        + Op.STOP,
+        nonce=0,
+    )
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 60150 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xEAF6,
+                address=addr,
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x694b007c276285e1a2424a78288abf42fdda6e71"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": [0]},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0, 1: 1})},
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": [1]},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 0, 1: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [172000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=172000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_before.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_before.py
index aca399a2d7f..894c008a900 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_before.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_before.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcall_100_oogm_before.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcall_100_OOGMBeforeFiller.json
+state_tests/stStaticCall/static_callcodecallcall_100_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,30 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcall_100_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcall_100_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000cc95c09a27cbe0199e6d898e64b4dc1774f164e1",
-        "0000000000000000000000004670334e92c4d14771faadb3c90c987cb337acca",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcall_100_oogm_before(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcall_100_oogm_before."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,83 +68,81 @@ def test_static_callcodecallcall_100_oogm_before(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
-        nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x4E34,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (STATICCALL 40080 (CALLDATALOAD 0) 0 64 0 64 ) (MSTORE 3 1) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x9C90,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x4670334e92c4d14771faadb3c90c987cb337acca"),  # noqa: E501
+        address=Address(0x570B7A7EB7D0539D77442B6262127229B9B6C19F),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x9C90,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x570b7a7eb7d0539d77442b6262127229b9b6c19f"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x570B7A7EB7D0539D77442B6262127229B9B6C19F,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x570B7A7EB7D0539D77442B6262127229B9B6C19F,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb1dddce88104538f48811f8e62af99666e0c3a4e"),  # noqa: E501
+        address=Address(0xB1DDDCE88104538F48811F8E62AF99666E0C3A4E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STATICCALL(
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) (STATICCALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STATICCALL(
+            gas=0x4E34,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xCC95C09A27CBE0199E6D898E64B4DC1774F164E1),  # noqa: E501
+    )
+    # Source: lll
+    # {  (SSTORE 3 1) (STATICCALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
                 gas=0x4E34,
                 address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
                 args_offset=0x0,
@@ -142,24 +150,26 @@ def test_static_callcodecallcall_100_oogm_before(
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xcc95c09a27cbe0199e6d898e64b4dc1774f164e1"),  # noqa: E501
+        address=Address(0x4670334E92C4D14771FAADB3C90C987CB337ACCA),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [172000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=172000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_before2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_before2.py
index 07b6b0beb07..791b780df05 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_before2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_oogm_before2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcall_100_oogm_before2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcall_100_OOGMBefore2Filler.json
+state_tests/stStaticCall/static_callcodecallcall_100_OOGMBefore2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,66 +24,52 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcall_100_OOGMBefore2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcall_100_OOGMBefore2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000006224e12321037bf1b980d03fdc3e8afb95e9e794",
+        pytest.param(
+            0,
             0,
-            {
-                Address("0xf7520e9898ed4e699844182c95efecab5d06ad13"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            0,
+            id="d0-v0",
         ),
-        (
-            "0000000000000000000000006224e12321037bf1b980d03fdc3e8afb95e9e794",
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0xf7520e9898ed4e699844182c95efecab5d06ad13"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="d0-v1",
         ),
-        (
-            "00000000000000000000000028124c297e97622ed1d89a53f804c178aeaf3bbf",
+        pytest.param(
+            1,
+            0,
             0,
-            {
-                Address("0xf7520e9898ed4e699844182c95efecab5d06ad13"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="d1-v0",
         ),
-        (
-            "00000000000000000000000028124c297e97622ed1d89a53f804c178aeaf3bbf",
+        pytest.param(
             1,
-            {
-                Address("0xf7520e9898ed4e699844182c95efecab5d06ad13"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            0,
+            1,
+            id="d1-v1",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcall_100_oogm_before2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcall_100_oogm_before2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -94,103 +80,106 @@ def test_static_callcodecallcall_100_oogm_before2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x3, value=0x1)
-            + Op.STATICCALL(
-                gas=0x4E34,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 40080 (CALLDATALOAD 0) 0 64 0 64 ) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STATICCALL(
+            gas=0x9C90,
+            address=Op.CALLDATALOAD(offset=0x0),
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x28124c297e97622ed1d89a53f804c178aeaf3bbf"),  # noqa: E501
+        address=Address(0x99FE987D98B818ED5AF6AE7B1A91A3BE35956195),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STATICCALL(
-                gas=0x4E34,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+    # Source: lll
+    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0x99FE987D98B818ED5AF6AE7B1A91A3BE35956195,
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6224e12321037bf1b980d03fdc3e8afb95e9e794"),  # noqa: E501
+        address=Address(0xF7520E9898ED4E699844182C95EFECAB5D06AD13),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STATICCALL(
-                gas=0x9C90,
-                address=Op.CALLDATALOAD(offset=0x0),
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) (STATICCALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1)
+        + Op.STATICCALL(
+            gas=0x4E34,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x99fe987d98b818ed5af6ae7b1a91a3be35956195"),  # noqa: E501
+        address=Address(0x28124C297E97622ED1D89A53F804C178AEAF3BBF),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x99FE987D98B818ED5AF6AE7B1A91A3BE35956195,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1))  (STATICCALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STATICCALL(
+            gas=0x4E34,
+            address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf7520e9898ed4e699844182c95efecab5d06ad13"),  # noqa: E501
+        address=Address(0x6224E12321037BF1B980D03FDC3E8AFB95E9E794),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [172000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=172000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_suicide_end.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_suicide_end.py
index d577fbcb95a..3afb781fa8b 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_suicide_end.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcall_100_suicide_end.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcall_100_SuicideEndFiller.json
+state_tests/stStaticCall/static_callcodecallcall_100_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcall_100_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcall_100_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcall_100_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcall_100_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,86 +46,82 @@ def test_static_callcodecallcall_100_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x31d06fad70e2a598413824a9bc68d80a5d2b194e"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x31D06FAD70E2A598413824A9BC68D80A5D2B194E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x8C800ABF2A49CA6FFAC93555AF4B5C7F9A3A8186,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0x8C800ABF2A49CA6FFAC93555AF4B5C7F9A3A8186,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x620b381d01cbd812ffb798ab35a1a316bde90ce6"),  # noqa: E501
+        address=Address(0x620B381D01CBD812FFB798AB35A1A316BDE90CE6),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x8c800abf2a49ca6ffac93555af4b5c7f9a3a8186"),  # noqa: E501
+        address=Address(0x8C800ABF2A49CA6FFAC93555AF4B5C7F9A3A8186),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_suicide_end2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_suicide_end2.py
index 321a81955bf..0752d84ae55 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_suicide_end2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_suicide_end2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcall_100_suicide_end2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcall_100_SuicideEnd2Filler.json
+state_tests/stStaticCall/static_callcodecallcall_100_SuicideEnd2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcall_100_SuicideEnd2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcall_100_SuicideEnd2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcall_100_suicide_end2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcall_100_suicide_end2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,87 +46,83 @@ def test_static_callcodecallcall_100_suicide_end2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x8C800ABF2A49CA6FFAC93555AF4B5C7F9A3A8186,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x620b381d01cbd812ffb798ab35a1a316bde90ce6"),  # noqa: E501
-    )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x66227cf0a560e1f6f9e94345dd1b5c6758923ba6"),  # noqa: E501
+        address=Address(0x66227CF0A560E1F6F9E94345DD1B5C6758923BA6),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0x8C800ABF2A49CA6FFAC93555AF4B5C7F9A3A8186,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SELFDESTRUCT(
-                address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x620B381D01CBD812FFB798AB35A1A316BDE90CE6),  # noqa: E501
+    )
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x8c800abf2a49ca6ffac93555af4b5c7f9a3a8186"),  # noqa: E501
+        address=Address(0x8C800ABF2A49CA6FFAC93555AF4B5C7F9A3A8186),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_suicide_middle.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_suicide_middle.py
index 6fa6d828172..59fae6d7aa5 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_suicide_middle.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcall_100_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcall_100_SuicideMiddleFiller.json
+state_tests/stStaticCall/static_callcodecallcall_100_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcall_100_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcall_100_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcall_100_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcall_100_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,81 +46,81 @@ def test_static_callcodecallcall_100_suicide_middle(
         gas_limit=30000000,
     )
 
-    # Source: LLL
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
+    )
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0xCBFD6696CBC67E0593FD4AE8A6646C6AC25ECFB8,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0xCBFD6696CBC67E0593FD4AE8A6646C6AC25ECFB8,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x31d06fad70e2a598413824a9bc68d80a5d2b194e"),  # noqa: E501
+        address=Address(0x31D06FAD70E2A598413824A9BC68D80A5D2B194E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x31D06FAD70E2A598413824A9BC68D80A5D2B194E)
-            + Op.STATICCALL(
-                gas=0xC350,
-                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1)}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x408f1aceffec7bdaa35d77006cdcaead563bb694"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0xCBFD6696CBC67E0593FD4AE8A6646C6AC25ECFB8),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) (STATICCALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x31D06FAD70E2A598413824A9BC68D80A5D2B194E
+        )
+        + Op.STATICCALL(
+            gas=0xC350,
+            address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xcbfd6696cbc67e0593fd4ae8a6646c6ac25ecfb8"),  # noqa: E501
+        address=Address(0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_suicide_middle2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_suicide_middle2.py
index 10fe0883f57..909f0b2e455 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_suicide_middle2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_100_suicide_middle2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcall_100_suicide_middle2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcall_100_SuicideMiddle2Filler.json
+state_tests/stStaticCall/static_callcodecallcall_100_SuicideMiddle2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcall_100_SuicideMiddle2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcall_100_SuicideMiddle2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
+            0,
             0,
-            {
-                Address("0x07912b9147d3319b09cbab380f10819d0bf0066d"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x07912b9147d3319b09cbab380f10819d0bf0066d"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcall_100_suicide_middle2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcall_100_suicide_middle2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,77 +68,83 @@ def test_static_callcodecallcall_100_suicide_middle2(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0xD7997C3F1AACABDC66B4DA9461B9558B1787E01C,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0x07912b9147d3319b09cbab380f10819d0bf0066d"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x7912B9147D3319B09CBAB380F10819D0BF0066D)
-            + Op.STATICCALL(
-                gas=0xC350,
-                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1  }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0xD7997C3F1AACABDC66B4DA9461B9558B1787E01C,
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x408f1aceffec7bdaa35d77006cdcaead563bb694"),  # noqa: E501
+        address=Address(0x07912B9147D3319B09CBAB380F10819D0BF0066D),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x186A0,
+            address=0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0xD7997C3F1AACABDC66B4DA9461B9558B1787E01C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x186A0,
-                address=0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) (STATICCALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=0x7912B9147D3319B09CBAB380F10819D0BF0066D)
+        + Op.STATICCALL(
+            gas=0xC350,
+            address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xd7997c3f1aacabdc66b4da9461b9558b1787e01c"),  # noqa: E501
+        address=Address(0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [3000000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=3000000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_abcb_recursive.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_abcb_recursive.py
index ebde4ea035f..81fd2f9a0c9 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_abcb_recursive.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_abcb_recursive.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcall_abcb_recursive.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcall_ABCB_RECURSIVEFiller.json
+state_tests/stStaticCall/static_callcodecallcall_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcall_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcall_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcall_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcall_abcb_recursive."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,70 +46,66 @@ def test_static_callcodecallcall_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x7A120,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x17D7840,
                 address=0x2733821FA13C4EAD1C9631C76820333F42059B7C,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e2229d0f325b81b81b8b14f2d239ff9742683c0"),  # noqa: E501
+        address=Address(0x56325D37CDCE6B5858E63B1F0A691DB81D65E6DD),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0xF4240,
-                address=0x1E2229D0F325B81B81B8B14F2D239FF9742683C0,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0xF4240,
+            address=0x1E2229D0F325B81B81B8B14F2D239FF9742683C0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2733821fa13c4ead1c9631c76820333f42059b7c"),  # noqa: E501
+        address=Address(0x2733821FA13C4EAD1C9631C76820333F42059B7C),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x17D7840,
-                    address=0x2733821FA13C4EAD1C9631C76820333F42059B7C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (STATICCALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x7A120,
+            address=0x2733821FA13C4EAD1C9631C76820333F42059B7C,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0x56325d37cdce6b5858e63b1f0a691db81d65e6dd"),  # noqa: E501
+        address=Address(0x1E2229D0F325B81B81B8B14F2D239FF9742683C0),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcall_abcb_recursive2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcall_abcb_recursive2.py
index 6dad8606df3..4e7a099956b 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcall_abcb_recursive2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcall_abcb_recursive2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcall_abcb_recursive2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcall_ABCB_RECURSIVE2Filler.json
+state_tests/stStaticCall/static_callcodecallcall_ABCB_RECURSIVE2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcall_ABCB_RECURSIVE2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcall_ABCB_RECURSIVE2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
+            0,
             0,
-            {
-                Address("0x3da1f9d4153096bd467629a1fdb678437acd810b"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x3da1f9d4153096bd467629a1fdb678437acd810b"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcall_abcb_recursive2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcall_abcb_recursive2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,70 +68,74 @@ def test_static_callcodecallcall_abcb_recursive2(
         gas_limit=3000000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x7A120,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 25000000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x17D7840,
                 address=0x2733821FA13C4EAD1C9631C76820333F42059B7C,
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e2229d0f325b81b81b8b14f2d239ff9742683c0"),  # noqa: E501
+        address=Address(0x3DA1F9D4153096BD467629A1FDB678437ACD810B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0xF4240,
-                address=0x1E2229D0F325B81B81B8B14F2D239FF9742683C0,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0xF4240,
+            address=0x1E2229D0F325B81B81B8B14F2D239FF9742683C0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2733821fa13c4ead1c9631c76820333f42059b7c"),  # noqa: E501
+        address=Address(0x2733821FA13C4EAD1C9631C76820333F42059B7C),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 25000000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x17D7840,
-                    address=0x2733821FA13C4EAD1C9631C76820333F42059B7C,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (STATICCALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x7A120,
+            address=0x2733821FA13C4EAD1C9631C76820333F42059B7C,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0x3da1f9d4153096bd467629a1fdb678437acd810b"),  # noqa: E501
+        address=Address(0x1E2229D0F325B81B81B8B14F2D239FF9742683C0),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [600000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=600000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101.py
index 1753bef31ac..d15dada4249 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcallcode_101.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcallcode_101Filler.json
+state_tests/stStaticCall/static_callcodecallcallcode_101Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcallcode_101Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcodecallcallcode_101Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcallcode_101(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcallcode_101."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,83 +44,77 @@ def test_static_callcodecallcallcode_101(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 1 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x2a142c79a9b097c111ce945214226126b75e332c"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x55730,
-                    address=0xF553D6B8627C39028BD1E05A4F55E2A4B3042A1D,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 1 1) (DELEGATECALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 31 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x3D090,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x1F, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4eef7e2b5ae9be0fc5b43dc4fe39195a1ae10fc4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x3D090,
-                    address=0x2A142C79A9B097C111CE945214226126B75E332C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 1 1) (STATICCALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 31 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x493E0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x1F, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x1F, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x999e3c988e5fdf24adf774e3502f0095e6530b72"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x493E0,
-                    address=0x999E3C988E5FDF24ADF774E3502F0095E6530B72,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x1F, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf553d6b8627c39028bd1e05a4f55e2a4b3042a1d"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_2.py
index 2f69bcb1461..e8cb16990aa 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcallcode_101_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcallcode_101_2Filler.json
+state_tests/stStaticCall/static_callcodecallcallcode_101_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,46 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcallcode_101_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcodecallcallcode_101_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000709eb538153d5f98f0b8482c462070c26db1cbae",
-            {
-                Address("0x3f13b55c156d810bc161e971891180011e088e6f"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000003cea889fd03a922cc673d25e5db4e72743aa4878",
-            {
-                Address("0x3f13b55c156d810bc161e971891180011e088e6f"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcallcode_101_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcallcode_101_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,96 +66,99 @@ def test_static_callcodecallcallcode_101_2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x493E0,
-                address=Op.CALLDATALOAD(offset=0x0),
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 300000 (CALLDATALOAD 0) 0 64 0 64 ) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x493E0,
+            address=Op.CALLDATALOAD(offset=0x0),
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1b78afbe56d4678cfa8dc79df079bad5585b8d3a"),  # noqa: E501
+        address=Address(0x1B78AFBE56D4678CFA8DC79DF079BAD5585B8D3A),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 1 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x2a142c79a9b097c111ce945214226126b75e332c"),  # noqa: E501
+        address=Address(0x2A142C79A9B097C111CE945214226126B75E332C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x3D090,
-                address=0x2A142C79A9B097C111CE945214226126B75E332C,
-                value=0x1,
+    # Source: lll
+    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x55730,
+                address=0x1B78AFBE56D4678CFA8DC79DF079BAD5585B8D3A,
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3cea889fd03a922cc673d25e5db4e72743aa4878"),  # noqa: E501
+        address=Address(0x3F13B55C156D810BC161E971891180011E088E6F),  # noqa: E501
     )
-    # Source: LLL
-    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x55730,
-                    address=0x1B78AFBE56D4678CFA8DC79DF079BAD5585B8D3A,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALLCODE 250000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x3D090,
+            address=0x2A142C79A9B097C111CE945214226126B75E332C,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3f13b55c156d810bc161e971891180011e088e6f"),  # noqa: E501
+        address=Address(0x709EB538153D5F98F0B8482C462070C26DB1CBAE),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x3D090,
-                address=0x2A142C79A9B097C111CE945214226126B75E332C,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALLCODE 250000 <contract:0x1000000000000000000000000000000000000003> 1 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x3D090,
+            address=0x2A142C79A9B097C111CE945214226126B75E332C,
+            value=0x1,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x709eb538153d5f98f0b8482c462070c26db1cbae"),  # noqa: E501
+        address=Address(0x3CEA889FD03A922CC673D25E5DB4E72743AA4878),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [3000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=3000000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_ooge.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_ooge.py
index b74d7c3b7db..68174dec990 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_ooge.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_ooge.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcallcode_101_ooge.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcallcode_101_OOGEFiller.json
+state_tests/stStaticCall/static_callcodecallcallcode_101_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcallcode_101_OOGEFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcallcode_101_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcallcode_101_ooge(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcallcode_101_ooge."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,84 +46,75 @@ def test_static_callcodecallcallcode_101_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x55730,
-                    address=0xAF91DF7B32C8778F1428F893F7356F90CFC2CBB7,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x4eef7e2b5ae9be0fc5b43dc4fe39195a1ae10fc4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x1D4D4,
-                address=0xFBEF21C5A6C2ADCF3D769F085E0CC9FE9A8DF954,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (DELEGATECALL 120020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x1D4D4,
+            address=addr_3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        nonce=0,
+    )
+    # Source: lll
+    # {  (STATICCALL 200000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x30D40,
+            address=addr_2,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9126e4f25cc411a2d9d393afedb321eef8a5ac94"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x30D40,
-                address=0x9126E4F25CC411A2D9D393AFEDB321EEF8A5AC94,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x55730,
+                address=addr,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xaf91df7b32c8778f1428f893f7356f90cfc2cbb7"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfbef21c5a6c2adcf3d769f085e0cc9fe9a8df954"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1720000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_ooge_2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_ooge_2.py
index 041b127f718..bd879aec938 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_ooge_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_ooge_2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcallcode_101_ooge_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcallcode_101_OOGE_2Filler.json
+state_tests/stStaticCall/static_callcodecallcallcode_101_OOGE_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcallcode_101_OOGE_2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcallcode_101_OOGE_2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcallcode_101_ooge_2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcallcode_101_ooge_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,86 +46,77 @@ def test_static_callcodecallcallcode_101_ooge_2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x186A0,
-                address=0x25D69E6A677BD6D872F436BAD807C3244A268673,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
+        nonce=0,
+    )
+    # Source: lll
+    # {  (CALLCODE 20020 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x4E34,
+            address=addr_3,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x13ddac4297b5c0fb95bbc6d982184549393a980d"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x4E34,
-                address=0xFBEF21C5A6C2ADCF3D769F085E0CC9FE9A8DF954,
+    # Source: lll
+    # {  (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x186A0,
+            address=addr_2,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        nonce=0,
+    )
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=addr,
                 value=0x0,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x25d69e6a677bd6d872f436bad807c3244a268673"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x13DDAC4297B5C0FB95BBC6D982184549393A980D,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x66227cf0a560e1f6f9e94345dd1b5c6758923ba6"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xfbef21c5a6c2adcf3d769f085e0cc9fe9a8df954"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=172000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after.py
index f692fa51dfc..80bbe4d391a 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcallcode_101_oogm_after.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcallcode_101_OOGMAfterFiller.json
+state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcallcode_101_oogm_after(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcallcode_101_oogm_after."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,89 +46,82 @@ def test_static_callcodecallcallcode_101_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x4E34,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x02c0bffb833f0bd1bdcb227a4fe215cf640316bb"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x9C90,
-                    address=0x2C0BFFB833F0BD1BDCB227A4FE215CF640316BB,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (DELEGATECALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x4E34,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x43,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x27)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2865fd3572b0b77173e5ed91e968acad55701151"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 40080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x9C90,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x43, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x27)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 60150 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xEAF6,
-                    address=0x2865FD3572B0B77173E5ED91E968ACAD55701151,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xEAF6,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe79aee563c83547f229d955ecdcca0f01fed9aa9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=172000,
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after2.py
index 70b2062efe6..22aa6944777 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcallcode_101_oogm_after2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcallcode_101_OOGMAfter2Filler.json
+state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMAfter2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +24,44 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMAfter2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMAfter2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
             0,
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+            0,
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcallcode_101_oogm_after2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_callcodecallcallcode_101_oogm_after2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
+    contract_1 = Address(0x1000000000000000000000000000000000000001)
+    contract_2 = Address(0x1000000000000000000000000000000000000002)
+    contract_3 = Address(0x1000000000000000000000000000000000000003)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,93 +72,88 @@ def test_static_callcodecallcallcode_101_oogm_after2(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 60150 0x1000000000000000000000000000000000000001 (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xEAF6,
-                    address=0x1000000000000000000000000000000000000001,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
     )
-    # Source: LLL
-    # {  (MSTORE 3 1) (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x9C90,
-                    address=0x1000000000000000000000000000000000000002,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x43,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x27)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 3 1) (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }  # noqa: E501
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.CALLCODE(
+            gas=0x4E34,
+            address=contract_3,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000001"),  # noqa: E501
     )
-    # Source: LLL
-    # {  (MSTORE 3 1) (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.CALLCODE(
-                gas=0x4E34,
-                address=0x1000000000000000000000000000000000000003,
-                value=0x0,
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 40080 0x1000000000000000000000000000000000000002 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x9C90,
+                address=contract_2,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x43, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x27)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000002"),  # noqa: E501
     )
-    # Source: LLL
-    # {  (MSTORE 3 1) }
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 60150 0x1000000000000000000000000000000000000001 (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xEAF6,
+                address=contract_1,
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000003"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [172000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=172000,
-        value=tx_value,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {contract_0: Account(storage={0: 0, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after_1.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after_1.py
index eac9a09685a..6822affea21 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after_1.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after_1.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcallcode_101_oogm_after_1.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcallcode_101_OOGMAfter_1Filler.json
+state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_1Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_1Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000b9abd0ef44ae2df9f408d150c5b6fb6a181be9cf",
-            {
-                Address("0xaab59f13d96113334fab5c68e4e62b61f6cbf647"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000006486b0cd8779006e5cd706484b0d890b9a220805",
-            {
-                Address("0xaab59f13d96113334fab5c68e4e62b61f6cbf647"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcallcode_101_oogm_after_1(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcallcode_101_oogm_after_1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,172 +68,176 @@ def test_static_callcodecallcallcode_101_oogm_after_1(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x61AD0,
-                    address=0x677DB155FAB75972F19732AFB328A0EA6472A6AB,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x18dc408f6983f318529a93583ee12f590c537820"),  # noqa: E501
+        address=Address(0xAAB59F13D96113334FAB5C68E4E62B61F6CBF647),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0xAAEF6,
-                    address=0x18DC408F6983F318529A93583EE12F590C537820,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x6486b0cd8779006e5cd706484b0d890b9a220805"),  # noqa: E501
+        address=Address(0xB126C622075B1189FB6C45E851641CFADDF65B36),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x1D4D4,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (CALLCODE 120020 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0x1D4D4,
+                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x677db155fab75972f19732afb328a0ea6472a6ab"),  # noqa: E501
+        address=Address(0x858DB7418C9E1C32811E5BC39366BDF6E2ED2492),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x1D4D4,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (CALLCODE 120020 <contract:0x2000000000000000000000000000000000000003> 0 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0x1D4D4,
+                address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x858db7418c9e1c32811e5bc39366bdf6e2ed2492"),  # noqa: E501
+        address=Address(0x677DB155FAB75972F19732AFB328A0EA6472A6AB),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # {  (STATICCALL 400080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x61AD0,
+                address=0x858DB7418C9E1C32811E5BC39366BDF6E2ED2492,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3F, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x23)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xaab59f13d96113334fab5c68e4e62b61f6cbf647"),  # noqa: E501
+        address=Address(0xF4645C150A8060778AD94DFFE302081FC222DEDB),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (STATICCALL 400080 <contract:0x2000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x61AD0,
+                address=0x677DB155FAB75972F19732AFB328A0EA6472A6AB,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
+        address=Address(0x18DC408F6983F318529A93583EE12F590C537820),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0xAAEF6,
-                    address=0xF4645C150A8060778AD94DFFE302081FC222DEDB,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (CALLCODE 700150 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0xAAEF6,
+                address=0xF4645C150A8060778AD94DFFE302081FC222DEDB,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb9abd0ef44ae2df9f408d150c5b6fb6a181be9cf"),  # noqa: E501
+        address=Address(0xB9ABD0EF44AE2DF9F408D150C5B6FB6A181BE9CF),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x61AD0,
-                    address=0x858DB7418C9E1C32811E5BC39366BDF6E2ED2492,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3F,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
+    # Source: lll
+    # {  (CALLCODE 700150 <contract:0x2000000000000000000000000000000000000001> 0 0 64 0 64 ) (MSTORE 3 1)}  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0xAAEF6,
+                address=0x18DC408F6983F318529A93583EE12F590C537820,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x23)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf4645c150a8060778ad94dffe302081fc222dedb"),  # noqa: E501
+        address=Address(0x6486B0CD8779006E5CD706484B0D890B9A220805),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_5, left_padding=True),
+    ]
+    tx_gas = [1720000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1720000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after_3.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after_3.py
index bbf07e0b882..7b3110cfe17 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after_3.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_after_3.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcallcode_101_oogm_after_3.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcallcode_101_OOGMAfter_3Filler.json
+state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +27,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_3Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_3Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "00000000000000000000000077d2ecb3f4d887934c7c8f304831ea89e08cb30d",
-            {
-                Address("0xaab59f13d96113334fab5c68e4e62b61f6cbf647"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000e2fa228586f5c62a6728d17728f4622d05d84e45",
-            {
-                Address("0xaab59f13d96113334fab5c68e4e62b61f6cbf647"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcallcode_101_oogm_after_3(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcallcode_101_oogm_after_3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,167 +71,185 @@ def test_static_callcodecallcallcode_101_oogm_after_3(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x9C90,
-                address=0x65BE40505E6165809F16BFC5CDBA14169BC97614,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 0 0 0) [[ 1 ]] 1 }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=0x0,
                 args_offset=0x0,
-                args_size=0x40,
+                args_size=0x0,
                 ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2aba60e14f876dac315953942316a9a2f80c3ad5"),  # noqa: E501
+        address=Address(0xAAB59F13D96113334FAB5C68E4E62B61F6CBF647),  # noqa: E501
     )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
+        address=Address(0x335C5531B84765A7626E6E76688F18B81BE5259C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x4E34,
-                    address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 3 1) }
+    addr_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x65be40505e6165809f16bfc5cdba14169bc97614"),  # noqa: E501
+        address=Address(0xB126C622075B1189FB6C45E851641CFADDF65B36),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xEAF6,
-                    address=0xB867C4BF480D6DCD06716BCDB0F9BCF3BB5710BF,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (DELEGATECALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0x4E34,
+                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x77d2ecb3f4d887934c7c8f304831ea89e08cb30d"),  # noqa: E501
+        address=Address(0x96BBA71C203B7339624A350FE004F71C3D669AEE),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x4E34,
-                    address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (DELEGATECALL 20020 <contract:0x2000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0x4E34,
+                address=0xB126C622075B1189FB6C45E851641CFADDF65B36,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x96bba71c203b7339624a350fe004f71c3d669aee"),  # noqa: E501
+        address=Address(0x65BE40505E6165809F16BFC5CDBA14169BC97614),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 0 0 0) [[ 1 ]] 1 }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # {  (STATICCALL 40080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x9C90,
+                address=0x96BBA71C203B7339624A350FE004F71C3D669AEE,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3E, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x22)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xaab59f13d96113334fab5c68e4e62b61f6cbf647"),  # noqa: E501
+        address=Address(0xB867C4BF480D6DCD06716BCDB0F9BCF3BB5710BF),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (STATICCALL 40080 <contract:0x2000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x9C90,
+            address=0x65BE40505E6165809F16BFC5CDBA14169BC97614,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb126c622075b1189fb6c45e851641cfaddf65b36"),  # noqa: E501
+        address=Address(0x2ABA60E14F876DAC315953942316A9A2F80C3AD5),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x9C90,
-                    address=0x96BBA71C203B7339624A350FE004F71C3D669AEE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3E,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x22)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 60150 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] (GAS) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xEAF6,
+                address=0xB867C4BF480D6DCD06716BCDB0F9BCF3BB5710BF,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb867c4bf480d6dcd06716bcdb0f9bcf3bb5710bf"),  # noqa: E501
+        address=Address(0x77D2ECB3F4D887934C7C8F304831EA89E08CB30D),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xEAF6,
-                    address=0x2ABA60E14F876DAC315953942316A9A2F80C3AD5,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 60150 <contract:0x2000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xEAF6,
+                address=0x2ABA60E14F876DAC315953942316A9A2F80C3AD5,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe2fa228586f5c62a6728d17728f4622d05d84e45"),  # noqa: E501
+        address=Address(0xE2FA228586F5C62A6728D17728F4622D05D84E45),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 1})},
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1, 1: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_5, left_padding=True),
+    ]
+    tx_gas = [172000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=172000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_before.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_before.py
index 9e2fa2cff79..5360979ac9c 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_before.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_before.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcallcode_101_oogm_before.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcallcode_101_OOGMBeforeFiller.json
+state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcallcode_101_oogm_before(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcallcode_101_oogm_before."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,86 +46,79 @@ def test_static_callcodecallcallcode_101_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0xEE49CA410D3886CC84D3177A1E14451F0669852F,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x31d06fad70e2a598413824a9bc68d80a5d2b194e"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) (DELEGATECALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.DELEGATECALL(
+            gas=0x4E34,
+            address=addr_3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.DELEGATECALL(
-                gas=0x4E34,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 40080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x9C90,
+                address=addr_2,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x76c6dc23a4f29a65309c67ce40f50a05ed3409da"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x9C90,
-                    address=0x76C6DC23A4F29A65309C67CE40F50A05ED3409DA,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xee49ca410d3886cc84d3177a1e14451f0669852f"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=172000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_before2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_before2.py
index 0c41adda93c..ec321a4558a 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_before2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_oogm_before2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcallcode_101_oogm_before2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcallcode_101_OOGMBefore2Filler.json
+state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMBefore2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMBefore2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcallcode_101_OOGMBefore2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
+            0,
             0,
-            {
-                Address("0xcc7b2c7c17e1dd7940b1aa2f4b3e55d7bd662608"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0xcc7b2c7c17e1dd7940b1aa2f4b3e55d7bd662608"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcallcode_101_oogm_before2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcallcode_101_oogm_before2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,87 +68,88 @@ def test_static_callcodecallcallcode_101_oogm_before2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.CALLCODE(
-                gas=0x4E34,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                value=0x0,
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) (CALLCODE 20020 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.CALLCODE(
+            gas=0x4E34,
+            address=addr_3,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        nonce=0,
+    )
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 40080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 3 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x9C90,
+                address=addr_2,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x3, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xac5ad3041e8d622a1f089496e5ee81c4f6f80471"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0xEE49CA410D3886CC84D3177A1E14451F0669852F,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=addr,
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xcc7b2c7c17e1dd7940b1aa2f4b3e55d7bd662608"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x9C90,
-                    address=0xAC5AD3041E8D622A1F089496E5EE81C4F6F80471,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x3, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xee49ca410d3886cc84d3177a1e14451f0669852f"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [172000]
+    tx_value = [0, 1]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=172000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_suicide_end.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_suicide_end.py
index a133b9efab6..6317c9fed48 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_suicide_end.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcallcode_101_suicide_end.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcallcode_101_SuicideEndFiller.json
+state_tests/stStaticCall/static_callcodecallcallcode_101_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcallcode_101_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcallcode_101_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcallcode_101_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcallcode_101_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,85 +46,81 @@ def test_static_callcodecallcallcode_101_suicide_end(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x31d06fad70e2a598413824a9bc68d80a5d2b194e"),  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0xC350,
-                    address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x31D06FAD70E2A598413824A9BC68D80A5D2B194E),  # noqa: E501
+    )
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0x4A31DD3A8C3C9A793AC0B3C234A4DBAC2F201404,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x4a31dd3a8c3c9a793ac0b3c234a4dbac2f201404"),  # noqa: E501
+        address=Address(0x620B381D01CBD812FFB798AB35A1A316BDE90CE6),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x4A31DD3A8C3C9A793AC0B3C234A4DBAC2F201404,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (DELEGATECALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0xC350,
+                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x620b381d01cbd812ffb798ab35a1a316bde90ce6"),  # noqa: E501
+        address=Address(0x4A31DD3A8C3C9A793AC0B3C234A4DBAC2F201404),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_suicide_end2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_suicide_end2.py
index 17292cec28b..c447ee9219f 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_suicide_end2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_suicide_end2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcallcode_101_suicide_end2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcallcode_101_SuicideEnd2Filler.json
+state_tests/stStaticCall/static_callcodecallcallcode_101_SuicideEnd2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcallcode_101_SuicideEnd2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcallcode_101_SuicideEnd2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
+            0,
             0,
-            {
-                Address("0xcc7b2c7c17e1dd7940b1aa2f4b3e55d7bd662608"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0xcc7b2c7c17e1dd7940b1aa2f4b3e55d7bd662608"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcallcode_101_suicide_end2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcallcode_101_suicide_end2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,86 +68,90 @@ def test_static_callcodecallcallcode_101_suicide_end2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x90E9B92C59A0E93D8AB0B7AFBC945D6999A50A9B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x620b381d01cbd812ffb798ab35a1a316bde90ce6"),  # noqa: E501
+        address=Address(0xCC7B2C7C17E1DD7940B1AA2F4B3E55D7BD662608),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0x90E9B92C59A0E93D8AB0B7AFBC945D6999A50A9B,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x90e9b92c59a0e93d8ab0b7afbc945d6999a50a9b"),  # noqa: E501
+        address=Address(0x620B381D01CBD812FFB798AB35A1A316BDE90CE6),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.SELFDESTRUCT(address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6)
+        + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0xcc7b2c7c17e1dd7940b1aa2f4b3e55d7bd662608"),  # noqa: E501
+        address=Address(0x90E9B92C59A0E93D8AB0B7AFBC945D6999A50A9B),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [3000000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=3000000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_suicide_middle.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_suicide_middle.py
index 345f4f37f2b..b931e88c7ee 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_suicide_middle.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcallcode_101_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcallcode_101_SuicideMiddleFiller.json
+state_tests/stStaticCall/static_callcodecallcallcode_101_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,23 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcallcode_101_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcallcode_101_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcallcode_101_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_callcodecallcallcode_101_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x1000000000000000000000000000000000000000)
+    contract_1 = Address(0x1000000000000000000000000000000000000001)
+    contract_2 = Address(0x1000000000000000000000000000000000000002)
+    contract_3 = Address(0x1000000000000000000000000000000000000003)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,87 +50,81 @@ def test_static_callcodecallcallcode_101_suicide_middle(
         gas_limit=30000000,
     )
 
-    # Source: LLL
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x1000000000000000000000000000000000000003),  # noqa: E501
+    )
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x1000000000000000000000000000000000000001,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x1000000000000000000000000000000000000001,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  (MSTORE 3 1) (STATICCALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x1000000000000000000000000000000000000002,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x1000000000000000000000000000000000000001"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (SELFDESTRUCT 0x1000000000000000000000000000000000000000) (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x1000000000000000000000000000000000000000)
-            + Op.DELEGATECALL(
-                gas=0xC350,
-                address=0x1000000000000000000000000000000000000003,
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0x1000000000000000000000000000000000000002,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000002"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000001),  # noqa: E501
     )
-    # Source: LLL
-    # {  (MSTORE 3 1) }
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # { (SELFDESTRUCT 0x1000000000000000000000000000000000000000) (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }  # noqa: E501
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x1000000000000000000000000000000000000000
+        )
+        + Op.DELEGATECALL(
+            gas=0xC350,
+            address=0x1000000000000000000000000000000000000003,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000003"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000002),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {contract_0: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_suicide_middle2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_suicide_middle2.py
index f1db6dea707..058d6ddc641 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_suicide_middle2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_101_suicide_middle2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcallcode_101_suicide_middle2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcallcode_101_SuicideMiddle2Filler.json
+state_tests/stStaticCall/static_callcodecallcallcode_101_SuicideMiddle2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcallcode_101_SuicideMiddle2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcallcode_101_SuicideMiddle2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
             0,
-            {
-                Address("0xcc7b2c7c17e1dd7940b1aa2f4b3e55d7bd662608"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            0,
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0xcc7b2c7c17e1dd7940b1aa2f4b3e55d7bd662608"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcallcode_101_suicide_middle2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcallcode_101_suicide_middle2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,82 +68,90 @@ def test_static_callcodecallcallcode_101_suicide_middle2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xCC7B2C7C17E1DD7940B1AA2F4B3E55D7BD662608)
-            + Op.CALLCODE(
-                gas=0xC350,
-                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                value=0x0,
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x3a5852e2f86bae6627a307298c4bf906ada12419"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
-        balance=0x2540BE400,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0xCC7B2C7C17E1DD7940B1AA2F4B3E55D7BD662608),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x3, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x3A5852E2F86BAE6627A307298C4BF906ADA12419,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 3 1) (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 32 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0x3A5852E2F86BAE6627A307298C4BF906ADA12419,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x20, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x20, value=0x1)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x620b381d01cbd812ffb798ab35a1a316bde90ce6"),  # noqa: E501
+        address=Address(0x620B381D01CBD812FFB798AB35A1A316BDE90CE6),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x620B381D01CBD812FFB798AB35A1A316BDE90CE6,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xCC7B2C7C17E1DD7940B1AA2F4B3E55D7BD662608
+        )
+        + Op.CALLCODE(
+            gas=0xC350,
+            address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0xcc7b2c7c17e1dd7940b1aa2f4b3e55d7bd662608"),  # noqa: E501
+        address=Address(0x3A5852E2F86BAE6627A307298C4BF906ADA12419),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [3000000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=3000000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_abcb_recursive.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_abcb_recursive.py
index 8f97c28e26e..4c89a5d22f3 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_abcb_recursive.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_abcb_recursive.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcallcode_abcb_recursive.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcallcode_ABCB_RECURSIVEFiller.json
+state_tests/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcallcode_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcallcode_abcb_recursive."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,70 +46,66 @@ def test_static_callcodecallcallcode_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0xF4240,
-                address=0xAB5C6018CF3368381E283C1DE7F906C456188BC3,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x17D7840,
+                address=0x2733821FA13C4EAD1C9631C76820333F42059B7C,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2733821fa13c4ead1c9631c76820333f42059b7c"),  # noqa: E501
+        address=Address(0x56325D37CDCE6B5858E63B1F0A691DB81D65E6DD),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x17D7840,
-                    address=0x2733821FA13C4EAD1C9631C76820333F42059B7C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (STATICCALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0xF4240,
+            address=0xAB5C6018CF3368381E283C1DE7F906C456188BC3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0x56325d37cdce6b5858e63b1f0a691db81d65e6dd"),  # noqa: E501
+        address=Address(0x2733821FA13C4EAD1C9631C76820333F42059B7C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x7A120,
-                address=0x2733821FA13C4EAD1C9631C76820333F42059B7C,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (DELEGATECALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x7A120,
+            address=0x2733821FA13C4EAD1C9631C76820333F42059B7C,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xab5c6018cf3368381e283c1de7f906c456188bc3"),  # noqa: E501
+        address=Address(0xAB5C6018CF3368381E283C1DE7F906C456188BC3),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_abcb_recursive2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_abcb_recursive2.py
index a30e10bcb76..508e0dcf4ae 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_abcb_recursive2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcallcode_abcb_recursive2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcallcode_abcb_recursive2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcallcode_ABCB_RECURSIVE2Filler.json
+state_tests/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVE2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,66 +24,52 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVE2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVE2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000002733821fa13c4ead1c9631c76820333f42059b7c",
+        pytest.param(
+            0,
+            0,
             0,
-            {
-                Address("0xba3c5101ad0b43de0f1853243eb3f9811eaee1e0"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="d0-v0",
         ),
-        (
-            "0000000000000000000000002733821fa13c4ead1c9631c76820333f42059b7c",
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0xba3c5101ad0b43de0f1853243eb3f9811eaee1e0"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="d0-v1",
         ),
-        (
-            "0000000000000000000000006acc177800643d95ab1daee1bd55cf99e3814e07",
+        pytest.param(
+            1,
+            0,
             0,
-            {
-                Address("0xba3c5101ad0b43de0f1853243eb3f9811eaee1e0"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="d1-v0",
         ),
-        (
-            "0000000000000000000000006acc177800643d95ab1daee1bd55cf99e3814e07",
+        pytest.param(
+            1,
+            0,
             1,
-            {
-                Address("0xba3c5101ad0b43de0f1853243eb3f9811eaee1e0"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="d1-v1",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcallcode_abcb_recursive2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcallcode_abcb_recursive2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -94,107 +80,109 @@ def test_static_callcodecallcallcode_abcb_recursive2(
         gas_limit=3000000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x7A120,
-                address=0x2733821FA13C4EAD1C9631C76820333F42059B7C,
-                value=0x0,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 25000000 (CALLDATALOAD 0) (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x17D7840,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1a3c543695d7ca3a7d5522e9c7aabe5512571706"),  # noqa: E501
+        address=Address(0xBA3C5101AD0B43DE0F1853243EB3F9811EAEE1E0),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0xF4240,
-                address=0x1A3C543695D7CA3A7D5522E9C7AABE5512571706,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0xF4240,
+            address=0x1A3C543695D7CA3A7D5522E9C7AABE5512571706,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2733821fa13c4ead1c9631c76820333f42059b7c"),  # noqa: E501
+        address=Address(0x2733821FA13C4EAD1C9631C76820333F42059B7C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0xF4240,
-                address=0xB81EB378451B4361DF035AEA57913023DFFBF39A,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALLCODE 500000 <contract:0x1000000000000000000000000000000000000001> 0 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x7A120,
+            address=0x2733821FA13C4EAD1C9631C76820333F42059B7C,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x6acc177800643d95ab1daee1bd55cf99e3814e07"),  # noqa: E501
+        address=Address(0x1A3C543695D7CA3A7D5522E9C7AABE5512571706),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x7A120,
-                address=0x6ACC177800643D95AB1DAEE1BD55CF99E3814E07,
-                value=0x1,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 1000000 <contract:0x2000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0xF4240,
+            address=0xB81EB378451B4361DF035AEA57913023DFFBF39A,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xb81eb378451b4361df035aea57913023dffbf39a"),  # noqa: E501
+        address=Address(0x6ACC177800643D95AB1DAEE1BD55CF99E3814E07),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 25000000 (CALLDATALOAD 0) (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x17D7840,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (CALLCODE 500000 <contract:0x2000000000000000000000000000000000000001> 1 0 64 0 64 ) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x7A120,
+            address=0x6ACC177800643D95AB1DAEE1BD55CF99E3814E07,
+            value=0x1,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0xba3c5101ad0b43de0f1853243eb3f9811eaee1e0"),  # noqa: E501
+        address=Address(0xB81EB378451B4361DF035AEA57913023DFFBF39A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [600000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=600000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110.py
index 2a920999bf8..3d41086e8cb 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecall_110.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecall_110Filler.json
+state_tests/stStaticCall/static_callcodecallcodecall_110Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecall_110Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcodecallcodecall_110Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcodecall_110(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecall_110."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,83 +44,77 @@ def test_static_callcodecallcodecall_110(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 1 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x2a142c79a9b097c111ce945214226126b75e332c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x493E0,
-                    address=0xB10C519306D4D2ACCE66BE84C0EA086D816BA77C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 1 1) (STATICCALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 1 1)}  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x3D090,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2bf6d23c6cdd3a7712ad150dfa2680adabda8b82"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x55730,
-                    address=0x2BF6D23C6CDD3A7712AD150DFA2680ADABDA8B82,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 1 1) (DELEGATECALL 300000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (MSTORE 1 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=0x493E0,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4eef7e2b5ae9be0fc5b43dc4fe39195a1ae10fc4"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x3D090,
-                    address=0x2A142C79A9B097C111CE945214226126B75E332C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x55730,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb10c519306d4d2acce66be84c0ea086d816ba77c"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_1102.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_1102.py
index 3172217c6b2..ce9f6e6b395 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_1102.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_1102.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecall_1102.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecall_1102Filler.json
+state_tests/stStaticCall/static_callcodecallcodecall_1102Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,54 +23,45 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecall_1102Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcodecallcodecall_1102Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
             0,
-            {
-                Address("0x4be1b24080b17ed1f5f4c0ff9cd820d764a32620"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            0,
+            0,
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x4be1b24080b17ed1f5f4c0ff9cd820d764a32620"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v1",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             2,
-            {
-                Address("0x4be1b24080b17ed1f5f4c0ff9cd820d764a32620"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcodecall_1102(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecall_1102."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -81,76 +72,78 @@ def test_static_callcodecallcodecall_1102(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 1 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x2a142c79a9b097c111ce945214226126b75e332c"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x55730,
-                    address=0x91645BC90F22C32A683BB049DCE8BCC61C541D82,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x3D090,
+            address=addr_3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4be1b24080b17ed1f5f4c0ff9cd820d764a32620"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x493E0,
-                address=0xEF859513AE36C397C43170A2980741575916167B,
-                value=Op.SUB(Op.CALLVALUE, 0x1),
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALLCODE 300000 <contract:0x1000000000000000000000000000000000000002> (- (CALLVALUE) 1) 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x493E0,
+            address=addr_2,
+            value=Op.SUB(Op.CALLVALUE, 0x1),
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x91645bc90f22c32a683bb049dce8bcc61c541d82"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x3D090,
-                address=0x2A142C79A9B097C111CE945214226126B75E332C,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x55730,
+                address=addr,
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xef859513ae36c397c43170a2980741575916167b"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [3000000]
+    tx_value = [0, 1, 2]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=3000000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_2.py
index 719c7752be2..e35bbea0fb4 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecall_110_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecall_110_2Filler.json
+state_tests/stStaticCall/static_callcodecallcodecall_110_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,54 +23,45 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecall_110_2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_callcodecallcodecall_110_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
+            0,
             0,
-            {
-                Address("0x4be1b24080b17ed1f5f4c0ff9cd820d764a32620"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x4be1b24080b17ed1f5f4c0ff9cd820d764a32620"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v1",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             2,
-            {
-                Address("0x4be1b24080b17ed1f5f4c0ff9cd820d764a32620"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcodecall_110_2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecall_110_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -81,84 +72,86 @@ def test_static_callcodecallcodecall_110_2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 1 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x2a142c79a9b097c111ce945214226126b75e332c"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x55730,
-                    address=0x611CB29449C75E44440DB4985DBB84732BC18342,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 1 1) (STATICCALL 250000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (MSTORE 31 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x3D090,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x1F, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4be1b24080b17ed1f5f4c0ff9cd820d764a32620"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=0x493E0,
-                    address=0xB1927ADAFCD3B2ECEF7B7508CB3A8D7B41FCAE73,
-                    value=Op.SUB(Op.CALLVALUE, 0x1),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (MSTORE 1 1) (CALLCODE 300000 <contract:0x1000000000000000000000000000000000000002> ( - (CALLVALUE) 1) 0 64 0 64 ) (MSTORE 31 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.POP(
+            Op.CALLCODE(
+                gas=0x493E0,
+                address=addr_2,
+                value=Op.SUB(Op.CALLVALUE, 0x1),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.MSTORE(offset=0x1F, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x1F, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x611cb29449c75e44440db4985dbb84732bc18342"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x3D090,
-                    address=0x2A142C79A9B097C111CE945214226126B75E332C,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0x1F, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 350000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x55730,
+                address=addr,
+                value=Op.CALLVALUE,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xb1927adafcd3b2ecef7b7508cb3a8d7b41fcae73"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [3000000]
+    tx_value = [0, 1, 2]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=3000000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_ooge.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_ooge.py
index 6a9ac9e7cef..fb9b691d681 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_ooge.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_ooge.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecall_110_ooge.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecall_110_OOGEFiller.json
+state_tests/stStaticCall/static_callcodecallcodecall_110_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecall_110_OOGEFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcodecall_110_OOGEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcodecall_110_ooge(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecall_110_ooge."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,84 +46,75 @@ def test_static_callcodecallcodecall_110_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x7125DDB5E66B6BAB62B228F9D01C2F3AAA1BEF28,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x31d06fad70e2a598413824a9bc68d80a5d2b194e"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x186A0,
-                address=0xEEDCBAC77FBD73BF2D0D7FEDD710D089B466138D,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x4E34,
+            address=addr_3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        nonce=0,
+    )
+    # Source: lll
+    # {  (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x186A0,
+            address=addr_2,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x7125ddb5e66b6bab62b228f9d01c2f3aaa1bef28"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x4E34,
-                address=0xFBEF21C5A6C2ADCF3D769F085E0CC9FE9A8DF954,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=addr,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xeedcbac77fbd73bf2d0d7fedd710d089b466138d"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfbef21c5a6c2adcf3d769f085e0cc9fe9a8df954"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=172000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_ooge2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_ooge2.py
index e0658ee317e..7c371ac945e 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_ooge2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_ooge2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecall_110_ooge2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecall_110_OOGE2Filler.json
+state_tests/stStaticCall/static_callcodecallcodecall_110_OOGE2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,53 +24,46 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecall_110_OOGE2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcodecall_110_OOGE2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
             0,
-            {
-                Address("0xcc7b2c7c17e1dd7940b1aa2f4b3e55d7bd662608"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            0,
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0xcc7b2c7c17e1dd7940b1aa2f4b3e55d7bd662608"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v1",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             2,
-            {
-                Address("0xcc7b2c7c17e1dd7940b1aa2f4b3e55d7bd662608"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcodecall_110_ooge2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecall_110_ooge2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -81,85 +74,84 @@ def test_static_callcodecallcodecall_110_ooge2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x186A0,
-                address=0xEEDCBAC77FBD73BF2D0D7FEDD710D089B466138D,
-                value=Op.SUB(Op.CALLVALUE, 0x1),
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x90390f435b22c948fbea0c86c37ecbfec700cf9d"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x90390F435B22C948FBEA0C86C37ECBFEC700CF9D,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (STATICCALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x4E34,
+            address=addr_3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xcc7b2c7c17e1dd7940b1aa2f4b3e55d7bd662608"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x4E34,
-                address=0xFBEF21C5A6C2ADCF3D769F085E0CC9FE9A8DF954,
+    # Source: lll
+    # {  (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> (- (CALLVALUE) 1) 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x186A0,
+            address=addr_2,
+            value=Op.SUB(Op.CALLVALUE, 0x1),
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        nonce=0,
+    )
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=addr,
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xeedcbac77fbd73bf2d0d7fedd710d089b466138d"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfbef21c5a6c2adcf3d769f085e0cc9fe9a8df954"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [172000]
+    tx_value = [0, 1, 2]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=172000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after.py
index dc1e621725f..b121cac4afb 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecall_110_oogm_after.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecall_110_OOGMAfterFiller.json
+state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMAfterFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcodecall_110_oogm_after(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecall_110_oogm_after."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,84 +46,77 @@ def test_static_callcodecallcodecall_110_oogm_after(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x4E34,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x1bdd0b2b81cb603f436225d2b20054c3d0593de3"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # { (STATICCALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x4E34,
+            address=addr_3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x9C90,
-                    address=0x1BDD0B2B81CB603F436225D2B20054C3D0593DE3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3E,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
+    # Source: lll
+    # {  (DELEGATECALL 40080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0x9C90,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x22)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3E, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x22)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x669f2ca35c01ee9379d6003704074ac1eeaa914d"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 60150 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xEAF6,
-                    address=0x669F2CA35C01EE9379D6003704074AC1EEAA914D,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xEAF6,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe79aee563c83547f229d955ecdcca0f01fed9aa9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=172000,
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after2.py
index 5123489cffd..6bfd84549df 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecall_110_oogm_after2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecall_110_OOGMAfter2Filler.json
+state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMAfter2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,53 +24,46 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMAfter2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMAfter2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
+            0,
             0,
-            {
-                Address("0x62b278a07428f1ff97ee7c884b711f6df3340707"): Account(
-                    storage={1: 1}
-                )
-            },
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x62b278a07428f1ff97ee7c884b711f6df3340707"): Account(
-                    storage={1: 1}
-                )
-            },
+            id="-v1",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             2,
-            {
-                Address("0x62b278a07428f1ff97ee7c884b711f6df3340707"): Account(
-                    storage={1: 1}
-                )
-            },
+            id="-v2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcodecall_110_oogm_after2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecall_110_oogm_after2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -81,85 +74,86 @@ def test_static_callcodecallcodecall_110_oogm_after2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x9C90,
-                    address=0xEEDCBAC77FBD73BF2D0D7FEDD710D089B466138D,
-                    value=Op.SUB(Op.CALLVALUE, 0x1),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x42,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x26)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x4E34,
+            address=addr_3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x5132347436f7bd136e83bf55270d821e276c2e51"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 60150 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xEAF6,
-                    address=0x5132347436F7BD136E83BF55270D821E276C2E51,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
+    # Source: lll
+    # {  (CALLCODE 40080 <contract:0x1000000000000000000000000000000000000002> ( - (CALLVALUE) 1) 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0x9C90,
+                address=addr_2,
+                value=Op.SUB(Op.CALLVALUE, 0x1),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x42, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x26)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x62b278a07428f1ff97ee7c884b711f6df3340707"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x4E34,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 60150 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xEAF6,
+                address=addr,
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xeedcbac77fbd73bf2d0d7fedd710d089b466138d"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [172000]
+    tx_value = [0, 1, 2]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=172000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 0, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after_2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after_2.py
index 90ca664e1a7..90496314497 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after_2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after_2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecall_110_oogm_after_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecall_110_OOGMAfter_2Filler.json
+state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcodecall_110_oogm_after_2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecall_110_oogm_after_2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,84 +46,77 @@ def test_static_callcodecallcodecall_110_oogm_after_2(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x4E34,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x1bdd0b2b81cb603f436225d2b20054c3d0593de3"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # { (STATICCALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x4E34,
+            address=addr_3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.DELEGATECALL(
-                    gas=0x9C90,
-                    address=0x1BDD0B2B81CB603F436225D2B20054C3D0593DE3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3E,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
+    # Source: lll
+    # {  (DELEGATECALL 40080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0x9C90,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x22)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3E, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x22)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x669f2ca35c01ee9379d6003704074ac1eeaa914d"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 60150 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0xEAF6,
-                    address=0x669F2CA35C01EE9379D6003704074AC1EEAA914D,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0xEAF6,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe79aee563c83547f229d955ecdcca0f01fed9aa9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=172000,
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after_3.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after_3.py
index d66e8c9228b..cbc5beb1ba3 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after_3.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_after_3.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecall_110_oogm_after_3.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecall_110_OOGMAfter_3Filler.json
+state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_3Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_3Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcodecall_110_oogm_after_3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecall_110_oogm_after_3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,86 +46,79 @@ def test_static_callcodecallcodecall_110_oogm_after_3(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 60150 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 )  [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xEAF6,
-                    address=0xDF60CB36BCF8892D8A68903B2D2E455037149E48,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (STATICCALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x4E34,
+            address=addr_3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x81450e6893351d2c0c43648338c0f2ae8d435bc1"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0x9C90,
-                    address=0xEEDCBAC77FBD73BF2D0D7FEDD710D089B466138D,
-                    value=Op.SUB(Op.CALLVALUE, 0x1),
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x42,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
+    # Source: lll
+    # {  (CALLCODE 40080 <contract:0x1000000000000000000000000000000000000002> (- (CALLVALUE) 1) 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0x9C90,
+                address=addr_2,
+                value=Op.SUB(Op.CALLVALUE, 0x1),
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x26)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x42, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x26)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdf60cb36bcf8892d8a68903b2d2e455037149e48"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x4E34,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 60150 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 )  [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xEAF6,
+                address=addr,
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xeedcbac77fbd73bf2d0d7fedd710d089b466138d"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=172000,
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_before.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_before.py
index b7ee6539bac..139114b474a 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_before.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_before.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecall_110_oogm_before.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecall_110_OOGMBeforeFiller.json
+state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMBeforeFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcodecall_110_oogm_before(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecall_110_oogm_before."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,82 +46,75 @@ def test_static_callcodecallcodecall_110_oogm_before(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x401580462C2CA97FC4F16B066D6249250A227AFB,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x31d06fad70e2a598413824a9bc68d80a5d2b194e"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) (STATICCALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STATICCALL(
+            gas=0x4E34,
+            address=addr_3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x9C90,
-                address=0xF32619344056AD22A07F10433F70165CE82D9273,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (DELEGATECALL 40080 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x9C90,
+            address=addr_2,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x401580462c2ca97fc4f16b066d6249250a227afb"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STATICCALL(
-                gas=0x4E34,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=addr,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf32619344056ad22a07f10433f70165ce82d9273"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=172000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_before2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_before2.py
index e78a3ce19a7..972eaf216e2 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_before2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_oogm_before2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecall_110_oogm_before2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecall_110_OOGMBefore2Filler.json
+state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMBefore2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,53 +24,46 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMBefore2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcodecall_110_OOGMBefore2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
+            0,
             0,
-            {
-                Address("0x45f35e7e68477a74b163dd6e4eb2833fb1979873"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x45f35e7e68477a74b163dd6e4eb2833fb1979873"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v1",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             2,
-            {
-                Address("0x45f35e7e68477a74b163dd6e4eb2833fb1979873"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcodecall_110_oogm_before2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecall_110_oogm_before2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -81,83 +74,84 @@ def test_static_callcodecallcodecall_110_oogm_before2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x335c5531b84765a7626e6e76688f18b81be5259c"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x861E86C681836FF531A2F84C5CDDE43E28E1D234,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) (STATICCALL 20020 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STATICCALL(
+            gas=0x4E34,
+            address=addr_3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x45f35e7e68477a74b163dd6e4eb2833fb1979873"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x9C90,
-                address=0xF32619344056AD22A07F10433F70165CE82D9273,
-                value=Op.SUB(Op.CALLVALUE, 0x1),
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (CALLCODE 40080 <contract:0x1000000000000000000000000000000000000002> (- (CALLVALUE) 1) 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x9C90,
+            address=addr_2,
+            value=Op.SUB(Op.CALLVALUE, 0x1),
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x861e86c681836ff531a2f84c5cdde43e28e1d234"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STATICCALL(
-                gas=0x4E34,
-                address=0x335C5531B84765A7626E6E76688F18B81BE5259C,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=addr,
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf32619344056ad22a07f10433f70165ce82d9273"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [172000]
+    tx_value = [0, 1, 2]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=172000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_suicide_end.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_suicide_end.py
index 3dbca7fa745..773ac82c6cf 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_suicide_end.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_suicide_end.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecall_110_suicide_end.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecall_110_SuicideEndFiller.json
+state_tests/stStaticCall/static_callcodecallcodecall_110_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecall_110_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcodecall_110_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
+            0,
             0,
-            {
-                Address("0x5f7fdf1f0d4f4ad14c6996ae17bb6698d22343d8"): Account(
-                    storage={0: 1, 1: 0x2CEC03}
-                )
-            },
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x5f7fdf1f0d4f4ad14c6996ae17bb6698d22343d8"): Account(
-                    storage={0: 1, 1: 0x2CEC03}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcodecall_110_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecall_110_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,80 +68,84 @@ def test_static_callcodecallcodecall_110_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x92D7028788CAA240253B7B2A92386464690CDC72,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x5f7fdf1f0d4f4ad14c6996ae17bb6698d22343d8"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x186A0,
-                address=0xB7770360E0B87603E3D9C87C866451760C95ABCA,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x92D7028788CAA240253B7B2A92386464690CDC72,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x5F7FDF1F0D4F4AD14C6996AE17BB6698D22343D8),  # noqa: E501
+    )
+    # Source: lll
+    # {  (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x186A0,
+            address=0xB7770360E0B87603E3D9C87C866451760C95ABCA,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x92d7028788caa240253b7b2a92386464690cdc72"),  # noqa: E501
+        address=Address(0x92D7028788CAA240253B7B2A92386464690CDC72),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x92D7028788CAA240253B7B2A92386464690CDC72
+    # Source: lll
+    # {  (STATICCALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=0x92D7028788CAA240253B7B2A92386464690CDC72)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xb7770360e0b87603e3d9c87c866451760c95abca"),  # noqa: E501
+        address=Address(0xB7770360E0B87603E3D9C87C866451760C95ABCA),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [3000000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=3000000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 1, 1: 0x2CEC03}, balance=0, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_suicide_end2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_suicide_end2.py
index eee1033538d..6843361d732 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_suicide_end2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_suicide_end2.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecall_110_suicide_end2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecall_110_SuicideEnd2Filler.json
+state_tests/stStaticCall/static_callcodecallcodecall_110_SuicideEnd2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +27,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecall_110_SuicideEnd2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcodecall_110_SuicideEnd2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
             0,
-            {
-                Address("0x44d09ddf088dd88c0e91fa7ef74973ff94ad7414"): Account(
-                    storage={0: 1, 1: 0x2CEBFF}
-                )
-            },
+            0,
+            0,
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x44d09ddf088dd88c0e91fa7ef74973ff94ad7414"): Account(
-                    storage={0: 1, 1: 0x2CB7A7}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcodecall_110_suicide_end2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecall_110_suicide_end2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,82 +71,108 @@ def test_static_callcodecallcodecall_110_suicide_end2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x186A0,
-                address=0xB7770360E0B87603E3D9C87C866451760C95ABCA,
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
+        nonce=0,
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
+    )
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] (GAS) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0x1D36753CD1D8D4795799D3F4D0925C63F72B2685,
                 value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
-        nonce=0,
-        address=Address("0x1d36753cd1d8d4795799d3f4d0925c63f72b2685"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x1D36753CD1D8D4795799D3F4D0925C63F72B2685,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x44d09ddf088dd88c0e91fa7ef74973ff94ad7414"),  # noqa: E501
+        address=Address(0x44D09DDF088DD88C0E91FA7EF74973FF94AD7414),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> (CALLVALUE) 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x186A0,
+            address=0xB7770360E0B87603E3D9C87C866451760C95ABCA,
+            value=Op.CALLVALUE,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x1D36753CD1D8D4795799D3F4D0925C63F72B2685),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x1D36753CD1D8D4795799D3F4D0925C63F72B2685
+    # Source: lll
+    # {  (STATICCALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=0x1D36753CD1D8D4795799D3F4D0925C63F72B2685)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0xb7770360e0b87603e3d9c87c866451760c95abca"),  # noqa: E501
+        address=Address(0xB7770360E0B87603E3D9C87C866451760C95ABCA),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={0: 1, 1: 0x2CEBFF}, balance=0, nonce=0
+                )
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={0: 1, 1: 0x2CB7A7}, balance=0, nonce=0
+                )
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [3000000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=3000000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_suicide_middle.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_suicide_middle.py
index 3db73448a90..f8b3e2afe93 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_suicide_middle.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_suicide_middle.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecall_110_suicide_middle.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecall_110_SuicideMiddleFiller.json
+state_tests/stStaticCall/static_callcodecallcodecall_110_SuicideMiddleFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecall_110_SuicideMiddleFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcodecall_110_SuicideMiddleFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcodecall_110_suicide_middle(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecall_110_suicide_middle."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,76 +46,76 @@ def test_static_callcodecallcodecall_110_suicide_middle(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x92D7028788CAA240253B7B2A92386464690CDC72,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2b30b637f37e3f5b8ca4ab846331d0779a3f4671"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671)
-            + Op.STATICCALL(
-                gas=0xC350,
-                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x92D7028788CAA240253B7B2A92386464690CDC72,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x408f1aceffec7bdaa35d77006cdcaead563bb694"),  # noqa: E501
+        address=Address(0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (DELEGATECALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x186A0,
+            address=0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x92D7028788CAA240253B7B2A92386464690CDC72),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x186A0,
-                address=0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) (STATICCALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x2B30B637F37E3F5B8CA4AB846331D0779A3F4671
+        )
+        + Op.STATICCALL(
+            gas=0xC350,
+            address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x92d7028788caa240253b7b2a92386464690cdc72"),  # noqa: E501
+        address=Address(0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(balance=0xDE0B6B3A7640000)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_suicide_middle2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_suicide_middle2.py
index c2bb195b374..99e37c0ec3a 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_suicide_middle2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_110_suicide_middle2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecall_110_suicide_middle2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecall_110_SuicideMiddle2Filler.json
+state_tests/stStaticCall/static_callcodecallcodecall_110_SuicideMiddle2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecall_110_SuicideMiddle2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcodecall_110_SuicideMiddle2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcodecall_110_suicide_middle2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecall_110_suicide_middle2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,79 +46,79 @@ def test_static_callcodecallcodecall_110_suicide_middle2(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x186A0,
-                address=0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694,
-                value=Op.CALLVALUE,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x1d36753cd1d8d4795799d3f4d0925c63f72b2685"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x44D09DDF088DD88C0E91FA7EF74973FF94AD7414)
-            + Op.STATICCALL(
-                gas=0xC350,
-                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] (GAS) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x249F0,
+                address=0x1D36753CD1D8D4795799D3F4D0925C63F72B2685,
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x408f1aceffec7bdaa35d77006cdcaead563bb694"),  # noqa: E501
+        address=Address(0x44D09DDF088DD88C0E91FA7EF74973FF94AD7414),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 150000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x249F0,
-                    address=0x1D36753CD1D8D4795799D3F4D0925C63F72B2685,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (CALLCODE 100000 <contract:0x1000000000000000000000000000000000000002> (CALLVALUE) 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x186A0,
+            address=0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694,
+            value=Op.CALLVALUE,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0x44d09ddf088dd88c0e91fa7ef74973ff94ad7414"),  # noqa: E501
+        address=Address(0x1D36753CD1D8D4795799D3F4D0925C63F72B2685),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (SELFDESTRUCT <contract:target:0x1000000000000000000000000000000000000000>) (STATICCALL 50000 <contract:0x1000000000000000000000000000000000000003> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x44D09DDF088DD88C0E91FA7EF74973FF94AD7414
+        )
+        + Op.STATICCALL(
+            gas=0xC350,
+            address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x408F1ACEFFEC7BDAA35D77006CDCAEAD563BB694),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 0x2CF650}),
-    }
+    post = {target: Account(balance=0xDE0B6B3A7640000)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_abcb_recursive.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_abcb_recursive.py
index c1774725acf..31a0c89588f 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_abcb_recursive.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_abcb_recursive.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecall_abcb_recursive.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecall_ABCB_RECURSIVEFiller.json
+state_tests/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVEFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVEFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcodecall_abcb_recursive(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecall_abcb_recursive."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,70 +46,66 @@ def test_static_callcodecallcodecall_abcb_recursive(
         gas_limit=3000000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x7A120,
+    # Source: lll
+    # {  [[ 0 ]] (DELEGATECALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x17D7840,
                 address=0x2C81F66472668C71014CE3A9537B033DB57AF77B,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e2229d0f325b81b81b8b14f2d239ff9742683c0"),  # noqa: E501
+        address=Address(0x56325D37CDCE6B5858E63B1F0A691DB81D65E6DD),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0xF4240,
-                address=0x1E2229D0F325B81B81B8B14F2D239FF9742683C0,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (DELEGATECALL 1000000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0xF4240,
+            address=0x1E2229D0F325B81B81B8B14F2D239FF9742683C0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x2c81f66472668c71014ce3a9537b033db57af77b"),  # noqa: E501
+        address=Address(0x2C81F66472668C71014CE3A9537B033DB57AF77B),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (DELEGATECALL 25000000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x17D7840,
-                    address=0x2C81F66472668C71014CE3A9537B033DB57AF77B,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (STATICCALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x7A120,
+            address=0x2C81F66472668C71014CE3A9537B033DB57AF77B,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0x56325d37cdce6b5858e63b1f0a691db81d65e6dd"),  # noqa: E501
+        address=Address(0x1E2229D0F325B81B81B8B14F2D239FF9742683C0),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_abcb_recursive2.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_abcb_recursive2.py
index cdc708998a5..481fa2e4dba 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_abcb_recursive2.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecall_abcb_recursive2.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecall_abcb_recursive2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecall_ABCB_RECURSIVE2Filler.json
+state_tests/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVE2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVE2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVE2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
+            0,
+            0,
             0,
-            {
-                Address("0x3da1f9d4153096bd467629a1fdb678437acd810b"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x3da1f9d4153096bd467629a1fdb678437acd810b"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+            id="-v1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_callcodecallcodecall_abcb_recursive2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecall_abcb_recursive2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,71 +68,75 @@ def test_static_callcodecallcodecall_abcb_recursive2(
         gas_limit=3000000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x7A120,
+    # Source: lll
+    # {  [[ 0 ]] (CALLCODE 25000000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x17D7840,
                 address=0x9EF1D089354C245C0C8A08590F55E76008AC54CD,
+                value=Op.CALLVALUE,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
-        balance=0x2540BE400,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x1e2229d0f325b81b81b8b14f2d239ff9742683c0"),  # noqa: E501
+        address=Address(0x3DA1F9D4153096BD467629A1FDB678437ACD810B),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (CALLCODE 25000000 <contract:0x1000000000000000000000000000000000000001> (CALLVALUE) 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x17D7840,
-                    address=0x9EF1D089354C245C0C8A08590F55E76008AC54CD,
-                    value=Op.CALLVALUE,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (CALLCODE 1000000 <contract:0x1000000000000000000000000000000000000002> 0 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0xF4240,
+            address=0x1E2229D0F325B81B81B8B14F2D239FF9742683C0,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0x2540BE400,
         nonce=0,
-        address=Address("0x3da1f9d4153096bd467629a1fdb678437acd810b"),  # noqa: E501
+        address=Address(0x9EF1D089354C245C0C8A08590F55E76008AC54CD),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0xF4240,
-                address=0x1E2229D0F325B81B81B8B14F2D239FF9742683C0,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (STATICCALL 500000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x7A120,
+            address=0x9EF1D089354C245C0C8A08590F55E76008AC54CD,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x9ef1d089354c245c0c8a08590f55e76008ac54cd"),  # noqa: E501
+        address=Address(0x1E2229D0F325B81B81B8B14F2D239FF9742683C0),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [600000]
+    tx_value = [0, 1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=600000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callcodecallcodecallcode_111_suicide_end.py b/tests/ported_static/stStaticCall/test_static_callcodecallcodecallcode_111_suicide_end.py
index a90dcd0b8c6..c01d8f5be61 100644
--- a/tests/ported_static/stStaticCall/test_static_callcodecallcodecallcode_111_suicide_end.py
+++ b/tests/ported_static/stStaticCall/test_static_callcodecallcodecallcode_111_suicide_end.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_callcodecallcodecallcode_111_suicide_end.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_callcodecallcodecallcode_111_SuicideEndFiller.json
+state_tests/stStaticCall/static_callcodecallcodecallcode_111_SuicideEndFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_callcodecallcodecallcode_111_SuicideEndFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_callcodecallcodecallcode_111_SuicideEndFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callcodecallcodecallcode_111_suicide_end(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_callcodecallcodecallcode_111_suicide_end."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,82 +46,78 @@ def test_static_callcodecallcodecallcode_111_suicide_end(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x186A0,
-                address=0x90E9B92C59A0E93D8AB0B7AFBC945D6999A50A9B,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 3 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x20052c9e11ec43b94405d98f61e2b5e8bb722ed1"),  # noqa: E501
+        address=Address(0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x249F0,
-                    address=0x20052C9E11EC43B94405D98F61E2B5E8BB722ED1,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x249F0,
+                address=0x20052C9E11EC43B94405D98F61E2B5E8BB722ED1,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x31d06fad70e2a598413824a9bc68d80a5d2b194e"),  # noqa: E501
+        address=Address(0x31D06FAD70E2A598413824A9BC68D80A5D2B194E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x3, value=0x1) + Op.STOP,
+    # Source: lll
+    # {  (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x186A0,
+            address=0x90E9B92C59A0E93D8AB0B7AFBC945D6999A50A9B,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x48e2d4c0b593bfebe5ddb4f13aa355b8bd83ddd3"),  # noqa: E501
+        address=Address(0x20052C9E11EC43B94405D98F61E2B5E8BB722ED1),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x20052C9E11EC43B94405D98F61E2B5E8BB722ED1
+    # Source: lll
+    # {  (CALLCODE 50000 <contract:0x1000000000000000000000000000000000000003> 0 0 64 0 64 ) (SELFDESTRUCT <contract:0x1000000000000000000000000000000000000001>) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALLCODE(
+                gas=0xC350,
+                address=0x48E2D4C0B593BFEBE5DDB4F13AA355B8BD83DDD3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
             )
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=0x20052C9E11EC43B94405D98F61E2B5E8BB722ED1)
+        + Op.STOP,
         balance=0x2540BE400,
         nonce=0,
-        address=Address("0x90e9b92c59a0e93d8ab0b7afbc945d6999a50a9b"),  # noqa: E501
+        address=Address(0x90E9B92C59A0E93D8AB0B7AFBC945D6999A50A9B),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_calldelcode_01.py b/tests/ported_static/stStaticCall/test_static_calldelcode_01.py
index 233a73eff65..d25b603853a 100644
--- a/tests/ported_static/stStaticCall/test_static_calldelcode_01.py
+++ b/tests/ported_static/stStaticCall/test_static_calldelcode_01.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_calldelcode_01.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_calldelcode_01Filler.json
+state_tests/stStaticCall/static_calldelcode_01Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_calldelcode_01Filler.json"],
+    ["state_tests/stStaticCall/static_calldelcode_01Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_calldelcode_01(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_calldelcode_01."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,58 +44,53 @@ def test_static_calldelcode_01(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {  (MSTORE 1 0x11223344) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1, value=0x11223344) + Op.STOP,
         nonce=0,
-        address=Address("0x2881a083ea775f78057a93f73110241fdb7398a9"),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ 0 ]] (STATICCALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x55730,
-                    address=0x91836819E5DD0646F8619EB31C67258FA7CA0A32,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (DELEGATECALL 250000 <contract:0x1000000000000000000000000000000000000002> 0 64 0 64 ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x3D090,
+            address=addr_2,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x46df4a924470cb27a2f8700239656c40dd4794c8"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x3D090,
-                address=0x2881A083EA775F78057A93F73110241FDB7398A9,
+    # Source: lll
+    # {  [[ 0 ]] (STATICCALL 350000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x55730,
+                address=addr,
                 args_offset=0x0,
                 args_size=0x40,
                 ret_offset=0x0,
                 ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x91836819e5dd0646f8619eb31c67258fa7ca0a32"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_calldelcode_01_ooge.py b/tests/ported_static/stStaticCall/test_static_calldelcode_01_ooge.py
index 7e0253c04bb..5e85db2b185 100644
--- a/tests/ported_static/stStaticCall/test_static_calldelcode_01_ooge.py
+++ b/tests/ported_static/stStaticCall/test_static_calldelcode_01_ooge.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_static_calldelcode_01_ooge.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_calldelcode_01_OOGEFiller.json
+state_tests/stStaticCall/static_calldelcode_01_OOGEFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_calldelcode_01_OOGEFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_calldelcode_01_OOGEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex",
+    "d, g, v",
     [
-        "000000000000000000000000ce21f15217a7b94db9c505a66c9549e803bf141c",
-        "000000000000000000000000fbef21c5a6c2adcf3d769f085e0cc9fe9a8df954",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_calldelcode_01_ooge(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_calldelcode_01_ooge."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,82 +66,80 @@ def test_static_calldelcode_01_ooge(
         gas_limit=30000000,
     )
 
-    # Source: LLL
-    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x77612608C7A22F8929F6F1C9462A9954621AEEFD,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (DELEGATECALL 20020 (CALLDATALOAD 0) 0 64 0 64 ) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x4E34,
+            address=Op.CALLDATALOAD(offset=0x0),
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x6e143211e9d36eaeebe65f6ed69d6c28500040d6"),  # noqa: E501
+        address=Address(0x77612608C7A22F8929F6F1C9462A9954621AEEFD),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.DELEGATECALL(
-                gas=0x4E34,
-                address=Op.CALLDATALOAD(offset=0x0),
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (SSTORE 2 1) (MSTORE 2 1)}
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x2, value=0x1)
+        + Op.MSTORE(offset=0x2, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x77612608c7a22f8929f6f1c9462a9954621aeefd"),  # noqa: E501
+        address=Address(0xCE21F15217A7B94DB9C505A66C9549E803BF141C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x2, value=0x1)
-            + Op.MSTORE(offset=0x2, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xce21f15217a7b94db9c505a66c9549e803bf141c"),  # noqa: E501
+        address=Address(0xFBEF21C5A6C2ADCF3D769F085E0CC9FE9A8DF954),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 <contract:0x1000000000000000000000000000000000000001> 0 64 0 64 ) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=0x77612608C7A22F8929F6F1C9462A9954621AEEFD,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfbef21c5a6c2adcf3d769f085e0cc9fe9a8df954"),  # noqa: E501
+        address=Address(0x6E143211E9D36EAEEBE65F6ED69D6C28500040D6),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [172000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=172000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_callto_return2.py b/tests/ported_static/stStaticCall/test_static_callto_return2.py
index b39ed417872..409bd9e2136 100644
--- a/tests/ported_static/stStaticCall/test_static_callto_return2.py
+++ b/tests/ported_static/stStaticCall/test_static_callto_return2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_callto_return2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CalltoReturn2Filler.json
+state_tests/stStaticCall/static_CalltoReturn2Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,17 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CalltoReturn2Filler.json"],
+    ["state_tests/stStaticCall/static_CalltoReturn2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_callto_return2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_callto_return2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -46,61 +47,60 @@ def test_static_callto_return2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (STATICCALL 5000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 2 ) [[ 1 ]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x1388,
-                    address=0xD5D9E9E0158920B17B6DF82FAC474B3E2691EE99,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x603760005360026000f3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2),
+        balance=23,
         nonce=0,
-        address=Address("0x547d0a349ccab317152d172e2f2ae7556c334cf3"),  # noqa: E501
+        address=Address(0xD5D9E9E0158920B17B6DF82FAC474B3E2691EE99),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-        ),
-        balance=23,
+    # Source: lll
+    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (STATICCALL 5000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 2 ) [[ 1 ]] (MLOAD 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x1388,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd5d9e9e0158920b17b6df82fac474b3e2691ee99"),  # noqa: E501
+        address=Address(0x547D0A349CCAB317152D172E2F2AE7556C334CF3),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0: 1,
                 1: 0x3700FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
             },
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stStaticCall/test_static_check_call_cost_oog.py b/tests/ported_static/stStaticCall/test_static_check_call_cost_oog.py
index 02cfc53cd9e..9514f5b8828 100644
--- a/tests/ported_static/stStaticCall/test_static_check_call_cost_oog.py
+++ b/tests/ported_static/stStaticCall/test_static_check_call_cost_oog.py
@@ -2,19 +2,20 @@
 Check balance in blackbox, just fill the balance consumed.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CheckCallCostOOGFiller.json
+state_tests/stStaticCall/static_CheckCallCostOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,32 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_CheckCallCostOOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_CheckCallCostOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (22000, {}),
-        (1000000, {}),
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_check_call_cost_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Check balance in blackbox, just fill the balance consumed."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x3327048BBC0B8C348A6352BE62994144E64B8FF2CEC68D9FF4CA4E911ECD5D22
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5AF3107A4000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -58,40 +66,41 @@ def test_static_check_call_cost_oog(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0x5AF3107A4000)
-    # Source: LLL
-    # { (STATICCALL 100 <contract:0x2000000000000000000000000000000000000000> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x64,
-                address=0xEBE7ED7A6E995C9843A6DF04E332981EBB2772E0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 1 1) (KECCAK256 0x00 0x2fffff) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1)
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb59292b3a630476adbc4a3643c0815b682a5009a"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1, value=0x1)
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (STATICCALL 100 <contract:0x2000000000000000000000000000000000000000> 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x64,
+            address=addr,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xebe7ed7a6e995c9843a6df04e332981ebb2772e0"),  # noqa: E501
     )
 
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [22000, 1000000]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_check_opcodes.py b/tests/ported_static/stStaticCall/test_static_check_opcodes.py
index ddd65b564bd..c909ed7c8c5 100644
--- a/tests/ported_static/stStaticCall/test_static_check_opcodes.py
+++ b/tests/ported_static/stStaticCall/test_static_check_opcodes.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_check_opcodes.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CheckOpcodesFiller.json
+state_tests/stStaticCall/static_CheckOpcodesFiller.json
 """
 
 import pytest
@@ -12,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,108 +27,74 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CheckOpcodesFiller.json"],
+    ["state_tests/stStaticCall/static_CheckOpcodesFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000b4b91c40f3e3a6e5576b0413572b88d535cee7b0",
-            50000,
+        pytest.param(
             0,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+            0,
+            0,
+            id="d0-g0-v0",
         ),
-        (
-            "000000000000000000000000b4b91c40f3e3a6e5576b0413572b88d535cee7b0",
-            50000,
-            100,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            1,
+            id="d0-g0-v1",
         ),
-        (
-            "000000000000000000000000b4b91c40f3e3a6e5576b0413572b88d535cee7b0",
-            335000,
+        pytest.param(
             0,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+            1,
+            0,
+            id="d0-g1-v0",
         ),
-        (
-            "000000000000000000000000b4b91c40f3e3a6e5576b0413572b88d535cee7b0",
-            335000,
-            100,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            1,
+            1,
+            id="d0-g1-v1",
         ),
-        (
-            "000000000000000000000000e4b8baa7da1a97bff89d7db0ae345dd30cd8c1d0",
-            50000,
+        pytest.param(
+            1,
+            0,
             0,
-            {},
+            id="d1-g0-v0",
         ),
-        (
-            "000000000000000000000000e4b8baa7da1a97bff89d7db0ae345dd30cd8c1d0",
-            50000,
-            100,
-            {},
+        pytest.param(
+            1,
+            0,
+            1,
+            id="d1-g0-v1",
         ),
-        (
-            "000000000000000000000000e4b8baa7da1a97bff89d7db0ae345dd30cd8c1d0",
-            335000,
+        pytest.param(
+            1,
+            1,
             0,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+            id="d1-g1-v0",
         ),
-        (
-            "000000000000000000000000e4b8baa7da1a97bff89d7db0ae345dd30cd8c1d0",
-            335000,
-            100,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            1,
+            1,
+            id="d1-g1-v1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_check_opcodes(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_check_opcodes."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
@@ -137,151 +108,176 @@ def test_static_check_opcodes(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0xE4B8BAA7DA1A97BFF89D7DB0AE345DD30CD8C1D0,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0xB4B91C40F3E3A6E5576B0413572B88D535CEE7B0,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2b8b4845acb3ef63f61f109b960754cf76dfbdfd"),  # noqa: E501
-    )
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    # Source: lll
     # { [[1]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x50F628D871A69F2DB31E98D7FBF8AE6F1FC0D55C,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0xB4B91C40F3E3A6E5576B0413572B88D535CEE7B0,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb4b91c40f3e3a6e5576b0413572b88d535cee7b0"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
                 gas=0x186A0,
-                address=0x2B8B4845ACB3EF63F61F109B960754CF76DFBDFD,
+                address=Op.CALLDATALOAD(offset=0x0),
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe4b8baa7da1a97bff89d7db0ae345dd30cd8c1d0"),  # noqa: E501
+        address=Address(0x50F628D871A69F2DB31E98D7FBF8AE6F1FC0D55C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:target:0x1000000000000000000000000000000000000000> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x1000000000000000000000000000000000000001> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x50F628D871A69F2DB31E98D7FBF8AE6F1FC0D55C, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0xB4B91C40F3E3A6E5576B0413572B88D535CEE7B0, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xB4B91C40F3E3A6E5576B0413572B88D535CEE7B0),  # noqa: E501
+    )
+    # Source: lll
+    # { (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000003> 0 0 0 0) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x186A0,
+            address=0x2B8B4845ACB3EF63F61F109B960754CF76DFBDFD,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xE4B8BAA7DA1A97BFF89D7DB0AE345DD30CD8C1D0),  # noqa: E501
+    )
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x1000000000000000000000000000000000000002> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x1000000000000000000000000000000000000001> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0xE4B8BAA7DA1A97BFF89D7DB0AE345DD30CD8C1D0, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0xB4B91C40F3E3A6E5576B0413572B88D535CEE7B0, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
+        nonce=0,
+        address=Address(0x2B8B4845ACB3EF63F61F109B960754CF76DFBDFD),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                target: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                target: Account(storage={1: 0}),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                target: Account(storage={1: 1}),
+            },
+        },
+    ]
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+    ]
+    tx_gas = [50000, 335000]
+    tx_value = [0, 100]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_check_opcodes2.py b/tests/ported_static/stStaticCall/test_static_check_opcodes2.py
index 9cbca89b46d..39abab90f7d 100644
--- a/tests/ported_static/stStaticCall/test_static_check_opcodes2.py
+++ b/tests/ported_static/stStaticCall/test_static_check_opcodes2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_check_opcodes2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CheckOpcodes2Filler.json
+state_tests/stStaticCall/static_CheckOpcodes2Filler.json
 """
 
 import pytest
@@ -12,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,119 +27,86 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CheckOpcodes2Filler.json"],
+    ["state_tests/stStaticCall/static_CheckOpcodes2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000004c9df443f25e673eac42a897aa8a234b84fb9bdd",
+        pytest.param(
             0,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+            0,
+            0,
+            id="d0-v0",
         ),
-        (
-            "0000000000000000000000004c9df443f25e673eac42a897aa8a234b84fb9bdd",
-            100,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            1,
+            id="d0-v1",
         ),
-        (
-            "00000000000000000000000017217475f7d93fbfac2586ae993da598daead310",
+        pytest.param(
+            1,
+            0,
             0,
-            {},
+            id="d1-v0",
         ),
-        (
-            "00000000000000000000000017217475f7d93fbfac2586ae993da598daead310",
-            100,
-            {},
+        pytest.param(
+            1,
+            0,
+            1,
+            id="d1-v1",
         ),
-        (
-            "0000000000000000000000007493ed4fd2e14f56f1f1e3022b7c3873789b2254",
+        pytest.param(
+            2,
             0,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+            0,
+            id="d2-v0",
         ),
-        (
-            "0000000000000000000000007493ed4fd2e14f56f1f1e3022b7c3873789b2254",
-            100,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            1,
+            id="d2-v1",
         ),
-        (
-            "000000000000000000000000419fea0f3da444f3e6ae0c045f83dfe2b25f161b",
+        pytest.param(
+            3,
             0,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+            0,
+            id="d3-v0",
         ),
-        (
-            "000000000000000000000000419fea0f3da444f3e6ae0c045f83dfe2b25f161b",
-            100,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            1,
+            id="d3-v1",
         ),
-        (
-            "000000000000000000000000991c2daacf958845c0a5e957b3e187238a093149",
+        pytest.param(
+            4,
             0,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+            0,
+            id="d4-v0",
         ),
-        (
-            "000000000000000000000000991c2daacf958845c0a5e957b3e187238a093149",
-            100,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            1,
+            id="d4-v1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_check_opcodes2(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_check_opcodes2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
@@ -148,409 +120,420 @@ def test_static_check_opcodes2(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x419FEA0F3DA444F3E6AE0C045F83DFE2B25F161B,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0x419FEA0F3DA444F3E6AE0C045F83DFE2B25F161B,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x1, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0xE8D4A51000)
+    # Source: lll
+    # { [[1]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x0e1fc3e8fa3dec60cc7fe8e5cf1a3bf2e23b8380"),  # noqa: E501
+        address=Address(0x50F628D871A69F2DB31E98D7FBF8AE6F1FC0D55C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0xEF6A70E5546CA5339758B2F3B819780625C233C3,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.MSTORE(offset=0x2, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 (CALL 100000 <contract:0xa100000000000000000000000000000000000001> 0 0 0 0 0))  (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0x66FA14F32EB562EF2161C2890C73DFE43779F135,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPI(pc=0x38, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x3E)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=10,
         nonce=0,
-        address=Address("0x17217475f7d93fbfac2586ae993da598daead310"),  # noqa: E501
+        address=Address(0x4C9DF443F25E673EAC42A897AA8A234B84FB9BDD),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0xE1FC3E8FA3DEC60CC7FE8E5CF1A3BF2E23B8380,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(pc=0x38, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x3E)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {(MSTORE 0 0) (MSTORE 0 (CALL 100000 <contract:0xa200000000000000000000000000000000000001> 1 0 0 0 0)) (MSTORE 1 1) (MSTORE 2 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0xEF6A70E5546CA5339758B2F3B819780625C233C3,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.MSTORE(offset=0x2, value=0x1)
+        + Op.STOP,
         balance=10,
         nonce=0,
-        address=Address("0x419fea0f3da444f3e6ae0c045f83dfe2b25f161b"),  # noqa: E501
+        address=Address(0x17217475F7D93FBFAC2586AE993DA598DAEAD310),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x66FA14F32EB562EF2161C2890C73DFE43779F135,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(pc=0x38, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x3E)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 (CALLCODE 100000 <contract:0xa300000000000000000000000000000000000001> 0 0 0 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 2)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0x7EA8B3E1880535D9ECF543C5AF8637DE220CD5FE,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPI(pc=0x38, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x3E)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=10,
         nonce=0,
-        address=Address("0x4c9df443f25e673eac42a897aa8a234b84fb9bdd"),  # noqa: E501
+        address=Address(0x7493ED4FD2E14F56F1F1E3022B7C3873789B2254),  # noqa: E501
     )
-    # Source: LLL
-    # { [[1]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 (CALLCODE 100000 <contract:0xa400000000000000000000000000000000000001> 1 0 0 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 2)) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0xE1FC3E8FA3DEC60CC7FE8E5CF1A3BF2E23B8380,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPI(pc=0x38, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x3E)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=10,
         nonce=0,
-        address=Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"),  # noqa: E501
+        address=Address(0x419FEA0F3DA444F3E6AE0C045F83DFE2B25F161B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x50F628D871A69F2DB31E98D7FBF8AE6F1FC0D55C,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0x991C2DAACF958845C0A5E957B3E187238A093149,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 (DELEGATECALL 100000 <contract:0xa500000000000000000000000000000000000001> 0 0 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 2)) }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0x58D6159788915466CC2BF8A6BC7284928707959B,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPI(pc=0x36, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x3C)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=10,
         nonce=0,
-        address=Address("0x58d6159788915466cc2bf8a6bc7284928707959b"),  # noqa: E501
+        address=Address(0x991C2DAACF958845C0A5E957B3E187238A093149),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x4C9DF443F25E673EAC42A897AA8A234B84FB9BDD,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0x66FA14F32EB562EF2161C2890C73DFE43779F135,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x1000000000000000000000000000000000000001> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0xa100000000000000000000000000000000000001> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x4C9DF443F25E673EAC42A897AA8A234B84FB9BDD, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0x66FA14F32EB562EF2161C2890C73DFE43779F135, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x66fa14f32eb562ef2161c2890c73dfe43779f135"),  # noqa: E501
+        address=Address(0x66FA14F32EB562EF2161C2890C73DFE43779F135),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0x7EA8B3E1880535D9ECF543C5AF8637DE220CD5FE,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(pc=0x38, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x3E)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=10,
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x2000000000000000000000000000000000000001> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0xa200000000000000000000000000000000000001> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 1 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x17217475F7D93FBFAC2586AE993DA598DAEAD310, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0xEF6A70E5546CA5339758B2F3B819780625C233C3, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x1, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x7493ed4fd2e14f56f1f1e3022b7c3873789b2254"),  # noqa: E501
+        address=Address(0xEF6A70E5546CA5339758B2F3B819780625C233C3),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x7493ED4FD2E14F56F1F1E3022B7C3873789B2254,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0x7493ED4FD2E14F56F1F1E3022B7C3873789B2254,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x3000000000000000000000000000000000000001> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x3000000000000000000000000000000000000001> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x7493ED4FD2E14F56F1F1E3022B7C3873789B2254, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0x7493ED4FD2E14F56F1F1E3022B7C3873789B2254, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x7ea8b3e1880535d9ecf543c5af8637de220cd5fe"),  # noqa: E501
+        address=Address(0x7EA8B3E1880535D9ECF543C5AF8637DE220CD5FE),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0x58D6159788915466CC2BF8A6BC7284928707959B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(pc=0x36, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x3C)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=10,
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x4000000000000000000000000000000000000001> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x4000000000000000000000000000000000000001> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 1 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x419FEA0F3DA444F3E6AE0C045F83DFE2B25F161B, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0x419FEA0F3DA444F3E6AE0C045F83DFE2B25F161B, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x1, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x991c2daacf958845c0a5e957b3e187238a093149"),  # noqa: E501
+        address=Address(0x0E1FC3E8FA3DEC60CC7FE8E5CF1A3BF2E23B8380),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x17217475F7D93FBFAC2586AE993DA598DAEAD310,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0xEF6A70E5546CA5339758B2F3B819780625C233C3,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x1, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:target:0x1000000000000000000000000000000000000000> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x5000000000000000000000000000000000000001> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x50F628D871A69F2DB31E98D7FBF8AE6F1FC0D55C, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0x991C2DAACF958845C0A5E957B3E187238A093149, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xef6a70e5546ca5339758b2f3b819780625c233c3"),  # noqa: E501
+        address=Address(0x58D6159788915466CC2BF8A6BC7284928707959B),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 2, 3, 4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                target: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                target: Account(storage={1: 0}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+        Hash(addr_5, left_padding=True),
+    ]
+    tx_gas = [335000]
+    tx_value = [0, 100]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=335000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_check_opcodes3.py b/tests/ported_static/stStaticCall/test_static_check_opcodes3.py
index 040aa72c992..67c36145697 100644
--- a/tests/ported_static/stStaticCall/test_static_check_opcodes3.py
+++ b/tests/ported_static/stStaticCall/test_static_check_opcodes3.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_check_opcodes3.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CheckOpcodes3Filler.json
+state_tests/stStaticCall/static_CheckOpcodes3Filler.json
 """
 
 import pytest
@@ -12,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,119 +27,86 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CheckOpcodes3Filler.json"],
+    ["state_tests/stStaticCall/static_CheckOpcodes3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000f697c2d8963df21523b18e96caaf6c7703a1882e",
+        pytest.param(
             0,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+            0,
+            0,
+            id="d0-v0",
         ),
-        (
-            "000000000000000000000000f697c2d8963df21523b18e96caaf6c7703a1882e",
-            100,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            1,
+            id="d0-v1",
         ),
-        (
-            "0000000000000000000000009b68a6b37af295c7fd23aa2269db8c875c2b86b4",
+        pytest.param(
+            1,
+            0,
             0,
-            {},
+            id="d1-v0",
         ),
-        (
-            "0000000000000000000000009b68a6b37af295c7fd23aa2269db8c875c2b86b4",
-            100,
-            {},
+        pytest.param(
+            1,
+            0,
+            1,
+            id="d1-v1",
         ),
-        (
-            "000000000000000000000000ba044a82b25080bc96678b9fa77678e014605c48",
+        pytest.param(
+            2,
             0,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+            0,
+            id="d2-v0",
         ),
-        (
-            "000000000000000000000000ba044a82b25080bc96678b9fa77678e014605c48",
-            100,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            1,
+            id="d2-v1",
         ),
-        (
-            "000000000000000000000000e541572ce4b4ccbb2b92aab0fb852f018d51c512",
+        pytest.param(
+            3,
             0,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+            0,
+            id="d3-v0",
         ),
-        (
-            "000000000000000000000000e541572ce4b4ccbb2b92aab0fb852f018d51c512",
-            100,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            1,
+            id="d3-v1",
         ),
-        (
-            "0000000000000000000000008113f9fc0868700534ecbecf1120a812cb1af0ac",
+        pytest.param(
+            4,
             0,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+            0,
+            id="d4-v0",
         ),
-        (
-            "0000000000000000000000008113f9fc0868700534ecbecf1120a812cb1af0ac",
-            100,
-            {
-                Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            1,
+            id="d4-v1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_check_opcodes3(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_check_opcodes3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
@@ -148,452 +120,458 @@ def test_static_check_opcodes3(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(pc=0x24, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x2A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    pre[sender] = Account(balance=0xE8D4A51000)
+    # Source: lll
+    # { [[1]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2e5dc1c94af89d7c115126fcebad7a5c50f5fe35"),  # noqa: E501
+        address=Address(0x50F628D871A69F2DB31E98D7FBF8AE6F1FC0D55C),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x8113F9FC0868700534ECBECF1120A812CB1AF0AC,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0x4AF0C90F8F7B7834E7E7BD57DDA960412F9650F9,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 2)) }  # noqa: E501
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPI(pc=0x24, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x2A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x4af0c90f8f7b7834e7e7bd57dda960412f9650f9"),  # noqa: E501
+        address=Address(0x2E5DC1C94AF89D7C115126FCEBAD7A5C50F5FE35),  # noqa: E501
     )
-    # Source: LLL
-    # { [[1]] (STATICCALL 100000 (CALLDATALOAD 0) 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 <contract:0xa100000000000000000000000000000000000001>) (MSTORE 0 (CALL 100000 <contract:0xb000000000000000000000000000000000000001> 0 0 32 0 0))  (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0xA131950507C8977B0DE1790C8E76A1A28DD92805
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0x2E5DC1C94AF89D7C115126FCEBAD7A5C50F5FE35,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPI(pc=0x50, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x56)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=10,
         nonce=0,
-        address=Address("0x50f628d871a69f2db31e98d7fbf8ae6f1fc0d55c"),  # noqa: E501
+        address=Address(0xF697C2D8963DF21523B18E96CAAF6C7703A1882E),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0xE541572CE4B4CCBB2B92AAB0FB852F018D51C512,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0x6D797B6A2C5F22885C4068990F19AE845D698A79,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {(MSTORE 0 <contract:0xa100000000000000000000000000000000000001>) (MSTORE 0 (CALL 100000 <contract:0xb000000000000000000000000000000000000001> 1 0 32 0 0)) (MSTORE 1 1) (MSTORE 2 1) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0xA131950507C8977B0DE1790C8E76A1A28DD92805
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0x2E5DC1C94AF89D7C115126FCEBAD7A5C50F5FE35,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.MSTORE(offset=0x2, value=0x1)
+        + Op.STOP,
+        balance=10,
         nonce=0,
-        address=Address("0x6d797b6a2c5f22885c4068990f19ae845d698a79"),  # noqa: E501
+        address=Address(0x9B68A6B37AF295C7FD23AA2269DB8C875C2B86B4),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x4AF0C90F8F7B7834E7E7BD57DDA960412F9650F9,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x186A0,
-                    address=0x2E5DC1C94AF89D7C115126FCEBAD7A5C50F5FE35,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(pc=0x4E, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x54)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 32 <contract:0xa300000000000000000000000000000000000001>) (MSTORE 0 (CALLCODE 100000 <contract:0xb000000000000000000000000000000000000001> 0 32 64 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 2)) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x20, value=0xB93CF5121157D61AB42345F5A5E9815B19CEC2CC
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0x2E5DC1C94AF89D7C115126FCEBAD7A5C50F5FE35,
+                value=0x0,
+                args_offset=0x20,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPI(pc=0x50, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x56)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=10,
         nonce=0,
-        address=Address("0x8113f9fc0868700534ecbecf1120a812cb1af0ac"),  # noqa: E501
+        address=Address(0xBA044A82B25080BC96678B9FA77678E014605C48),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xA131950507C8977B0DE1790C8E76A1A28DD92805,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x2E5DC1C94AF89D7C115126FCEBAD7A5C50F5FE35,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.MSTORE(offset=0x2, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 <contract:0xa400000000000000000000000000000000000001>) (MSTORE 0 (CALLCODE 100000 <contract:0xb000000000000000000000000000000000000001> 1 0 32 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 2)) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x6D797B6A2C5F22885C4068990F19AE845D698A79
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.CALLCODE(
+                gas=0x186A0,
+                address=0x2E5DC1C94AF89D7C115126FCEBAD7A5C50F5FE35,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPI(pc=0x50, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x56)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=10,
         nonce=0,
-        address=Address("0x9b68a6b37af295c7fd23aa2269db8c875c2b86b4"),  # noqa: E501
+        address=Address(0xE541572CE4B4CCBB2B92AAB0FB852F018D51C512),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x2E5DC1C94AF89D7C115126FCEBAD7A5C50F5FE35,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0xA131950507C8977B0DE1790C8E76A1A28DD92805,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 <contract:0xa500000000000000000000000000000000000001>) (MSTORE 0 (DELEGATECALL 100000 <contract:0xb000000000000000000000000000000000000001> 0 32 0 0)) (if (= 1 (MLOAD 0)) (MSTORE 1 1) (SSTORE 1 2)) }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x4AF0C90F8F7B7834E7E7BD57DDA960412F9650F9
+        )
+        + Op.MSTORE(
+            offset=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x186A0,
+                address=0x2E5DC1C94AF89D7C115126FCEBAD7A5C50F5FE35,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPI(pc=0x4E, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x54)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=10,
         nonce=0,
-        address=Address("0xa131950507c8977b0de1790c8e76a1a28dd92805"),  # noqa: E501
+        address=Address(0x8113F9FC0868700534ECBECF1120A812CB1AF0AC),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0xBA044A82B25080BC96678B9FA77678E014605C48,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0xB93CF5121157D61AB42345F5A5E9815B19CEC2CC,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0xb000000000000000000000000000000000000001> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0xa100000000000000000000000000000000000001> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x2E5DC1C94AF89D7C115126FCEBAD7A5C50F5FE35, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0xA131950507C8977B0DE1790C8E76A1A28DD92805, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb93cf5121157d61ab42345f5a5e9815b19cec2cc"),  # noqa: E501
+        address=Address(0xA131950507C8977B0DE1790C8E76A1A28DD92805),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x20,
-                value=0xB93CF5121157D61AB42345F5A5E9815B19CEC2CC,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0x2E5DC1C94AF89D7C115126FCEBAD7A5C50F5FE35,
-                    value=0x0,
-                    args_offset=0x20,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(pc=0x50, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x56)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=10,
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x2000000000000000000000000000000000000001> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0xa200000000000000000000000000000000000001> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 1 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x9B68A6B37AF295C7FD23AA2269DB8C875C2B86B4, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0xEF6A70E5546CA5339758B2F3B819780625C233C3, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x1, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xba044a82b25080bc96678b9fa77678e014605c48"),  # noqa: E501
+        address=Address(0xEF6A70E5546CA5339758B2F3B819780625C233C3),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x6D797B6A2C5F22885C4068990F19AE845D698A79,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.CALLCODE(
-                    gas=0x186A0,
-                    address=0x2E5DC1C94AF89D7C115126FCEBAD7A5C50F5FE35,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(pc=0x50, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x56)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=10,
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x3000000000000000000000000000000000000001> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0xa300000000000000000000000000000000000001> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0xBA044A82B25080BC96678B9FA77678E014605C48, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0xB93CF5121157D61AB42345F5A5E9815B19CEC2CC, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xe541572ce4b4ccbb2b92aab0fb852f018d51c512"),  # noqa: E501
+        address=Address(0xB93CF5121157D61AB42345F5A5E9815B19CEC2CC),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x9B68A6B37AF295C7FD23AA2269DB8C875C2B86B4,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0xEF6A70E5546CA5339758B2F3B819780625C233C3,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x1, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x4000000000000000000000000000000000000001> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0xa400000000000000000000000000000000000001> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0xE541572CE4B4CCBB2B92AAB0FB852F018D51C512, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0x6D797B6A2C5F22885C4068990F19AE845D698A79, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xef6a70e5546ca5339758b2f3b819780625c233c3"),  # noqa: E501
+        address=Address(0x6D797B6A2C5F22885C4068990F19AE845D698A79),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xA131950507C8977B0DE1790C8E76A1A28DD92805,
-            )
-            + Op.MSTORE(
-                offset=0x0,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x2E5DC1C94AF89D7C115126FCEBAD7A5C50F5FE35,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(pc=0x50, condition=Op.EQ(0x1, Op.MLOAD(offset=0x0)))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x56)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=10,
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x5000000000000000000000000000000000000001> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0xa500000000000000000000000000000000000001> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x8113F9FC0868700534ECBECF1120A812CB1AF0AC, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0x4AF0C90F8F7B7834E7E7BD57DDA960412F9650F9, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf697c2d8963df21523b18e96caaf6c7703a1882e"),  # noqa: E501
+        address=Address(0x4AF0C90F8F7B7834E7E7BD57DDA960412F9650F9),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 2, 3, 4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                target: Account(storage={1: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                target: Account(storage={1: 0}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+        Hash(addr_5, left_padding=True),
+    ]
+    tx_gas = [335000]
+    tx_value = [0, 100]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=335000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_check_opcodes4.py b/tests/ported_static/stStaticCall/test_static_check_opcodes4.py
index 92510edd825..d212aec2a60 100644
--- a/tests/ported_static/stStaticCall/test_static_check_opcodes4.py
+++ b/tests/ported_static/stStaticCall/test_static_check_opcodes4.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_check_opcodes4.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CheckOpcodes4Filler.json
+state_tests/stStaticCall/static_CheckOpcodes4Filler.json
 """
 
 import pytest
@@ -11,10 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,59 +27,50 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CheckOpcodes4Filler.json"],
+    ["state_tests/stStaticCall/static_CheckOpcodes4Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (50000, 0, {}),
-        (50000, 100, {}),
-        (
-            335000,
+        pytest.param(
             0,
-            {
-                Address("0x3350a62ddddd0ff0e39cd82e2d185fe06b5fcf49"): Account(
-                    storage={
-                        1: 1,
-                        2: 1,
-                        3: 0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                        5: 0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                        6: 0x3350A62DDDDD0FF0E39CD82E2D185FE06B5FCF49,
-                    }
-                )
-            },
+            0,
+            0,
+            id="-g0-v0",
         ),
-        (
-            335000,
-            100,
-            {
-                Address("0x3350a62ddddd0ff0e39cd82e2d185fe06b5fcf49"): Account(
-                    storage={
-                        1: 1,
-                        2: 1,
-                        3: 0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                        4: 100,
-                        5: 0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                        6: 0x3350A62DDDDD0FF0E39CD82E2D185FE06B5FCF49,
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            1,
+            id="-g0-v1",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1-v0",
+        ),
+        pytest.param(
+            0,
+            1,
+            1,
+            id="-g1-v1",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_check_opcodes4(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_check_opcodes4."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
@@ -88,148 +84,186 @@ def test_static_check_opcodes4(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    # Source: lll
     # { [[1]] (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000001> 0 0 0 0) [[2]] (STATICCALL 100000 <contract:0x1000000000000000000000000000000000000002> 0 0 0 0) [[3]] (CALLER) [[4]] (CALLVALUE) [[5]] (ORIGIN) [[6]] (ADDRESS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0xB4B91C40F3E3A6E5576B0413572B88D535CEE7B0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0x8FD6268252F0D331531601B40524719C7F681FE9,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x3, value=Op.CALLER)
-            + Op.SSTORE(key=0x4, value=Op.CALLVALUE)
-            + Op.SSTORE(key=0x5, value=Op.ORIGIN)
-            + Op.SSTORE(key=0x6, value=Op.ADDRESS)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=0xB4B91C40F3E3A6E5576B0413572B88D535CEE7B0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x186A0,
+                address=0x8FD6268252F0D331531601B40524719C7F681FE9,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x3, value=Op.CALLER)
+        + Op.SSTORE(key=0x4, value=Op.CALLVALUE)
+        + Op.SSTORE(key=0x5, value=Op.ORIGIN)
+        + Op.SSTORE(key=0x6, value=Op.ADDRESS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3350a62ddddd0ff0e39cd82e2d185fe06b5fcf49"),  # noqa: E501
+        address=Address(0x3350A62DDDDD0FF0E39CD82E2D185FE06B5FCF49),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x3350A62DDDDD0FF0E39CD82E2D185FE06B5FCF49,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0x8FD6268252F0D331531601B40524719C7F681FE9,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:target:0x1000000000000000000000000000000000000000> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x1000000000000000000000000000000000000001> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x3350A62DDDDD0FF0E39CD82E2D185FE06B5FCF49, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0xB4B91C40F3E3A6E5576B0413572B88D535CEE7B0, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8fd6268252f0d331531601b40524719c7f681fe9"),  # noqa: E501
+        address=Address(0xB4B91C40F3E3A6E5576B0413572B88D535CEE7B0),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x3350A62DDDDD0FF0E39CD82E2D185FE06B5FCF49,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0xB4B91C40F3E3A6E5576B0413572B88D535CEE7B0,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:target:0x1000000000000000000000000000000000000000> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x1000000000000000000000000000000000000002> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x3350A62DDDDD0FF0E39CD82E2D185FE06B5FCF49, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0x8FD6268252F0D331531601B40524719C7F681FE9, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb4b91c40f3e3a6e5576b0413572b88d535cee7b0"),  # noqa: E501
+        address=Address(0x8FD6268252F0D331531601B40524719C7F681FE9),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                target: Account(
+                    storage={1: 1, 2: 1, 3: sender, 5: sender, 6: target},
+                ),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                target: Account(storage={}),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                target: Account(
+                    storage={
+                        1: 1,
+                        2: 1,
+                        3: sender,
+                        4: 100,
+                        5: sender,
+                        6: target,
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [50000, 335000]
+    tx_value = [0, 100]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_check_opcodes5.py b/tests/ported_static/stStaticCall/test_static_check_opcodes5.py
index b0d2cb83703..253610f1dc7 100644
--- a/tests/ported_static/stStaticCall/test_static_check_opcodes5.py
+++ b/tests/ported_static/stStaticCall/test_static_check_opcodes5.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_check_opcodes5.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_CheckOpcodes5Filler.json
+state_tests/stStaticCall/static_CheckOpcodes5Filler.json
 """
 
 import pytest
@@ -12,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,238 +27,146 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_CheckOpcodes5Filler.json"],
+    ["state_tests/stStaticCall/static_CheckOpcodes5Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, tx_value, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000002c073c9d611d927ca91e4819bbb2dff859a8732b",
-            50000,
+        pytest.param(
+            0,
             0,
-            {},
+            0,
+            id="d0-g0-v0",
         ),
-        (
-            "0000000000000000000000002c073c9d611d927ca91e4819bbb2dff859a8732b",
-            50000,
-            100,
-            {},
+        pytest.param(
+            0,
+            0,
+            1,
+            id="d0-g0-v1",
         ),
-        (
-            "0000000000000000000000002c073c9d611d927ca91e4819bbb2dff859a8732b",
-            335000,
+        pytest.param(
             0,
-            {
-                Address("0x1fe115f5d840cd62e113b09755c50d8f3f358b96"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x8eeb303e1e7e2bb67d778526e009014a5daead81"): Account(
-                    storage={0: 1}
-                ),
-            },
+            1,
+            0,
+            id="d0-g1-v0",
         ),
-        (
-            "0000000000000000000000002c073c9d611d927ca91e4819bbb2dff859a8732b",
-            335000,
-            100,
-            {
-                Address("0x1fe115f5d840cd62e113b09755c50d8f3f358b96"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x8eeb303e1e7e2bb67d778526e009014a5daead81"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            1,
+            1,
+            id="d0-g1-v1",
         ),
-        (
-            "0000000000000000000000007761311ee56479da378519606cc4da58e17251ab",
-            50000,
+        pytest.param(
+            1,
             0,
-            {},
+            0,
+            id="d1-g0-v0",
         ),
-        (
-            "0000000000000000000000007761311ee56479da378519606cc4da58e17251ab",
-            50000,
-            100,
-            {},
+        pytest.param(
+            1,
+            0,
+            1,
+            id="d1-g0-v1",
         ),
-        (
-            "0000000000000000000000007761311ee56479da378519606cc4da58e17251ab",
-            335000,
+        pytest.param(
+            1,
+            1,
             0,
-            {
-                Address("0x1fe115f5d840cd62e113b09755c50d8f3f358b96"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x8eeb303e1e7e2bb67d778526e009014a5daead81"): Account(
-                    storage={0: 1}
-                ),
-            },
+            id="d1-g1-v0",
         ),
-        (
-            "0000000000000000000000007761311ee56479da378519606cc4da58e17251ab",
-            335000,
-            100,
-            {
-                Address("0x1fe115f5d840cd62e113b09755c50d8f3f358b96"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x8eeb303e1e7e2bb67d778526e009014a5daead81"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            1,
+            1,
+            id="d1-g1-v1",
         ),
-        (
-            "0000000000000000000000009c40928b20ac4236f0f3920567f28539c2e158b3",
-            50000,
+        pytest.param(
+            2,
+            0,
             0,
-            {},
+            id="d2-g0-v0",
         ),
-        (
-            "0000000000000000000000009c40928b20ac4236f0f3920567f28539c2e158b3",
-            50000,
-            100,
-            {},
+        pytest.param(
+            2,
+            0,
+            1,
+            id="d2-g0-v1",
         ),
-        (
-            "0000000000000000000000009c40928b20ac4236f0f3920567f28539c2e158b3",
-            335000,
+        pytest.param(
+            2,
+            1,
             0,
-            {
-                Address("0x1fe115f5d840cd62e113b09755c50d8f3f358b96"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x9c40928b20ac4236f0f3920567f28539c2e158b3"): Account(
-                    storage={0: 1}
-                ),
-            },
+            id="d2-g1-v0",
         ),
-        (
-            "0000000000000000000000009c40928b20ac4236f0f3920567f28539c2e158b3",
-            335000,
-            100,
-            {
-                Address("0x1fe115f5d840cd62e113b09755c50d8f3f358b96"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x9c40928b20ac4236f0f3920567f28539c2e158b3"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            2,
+            1,
+            1,
+            id="d2-g1-v1",
         ),
-        (
-            "0000000000000000000000008a6781f0d54ed3cb8963ffc233e98041de8bdadb",
-            50000,
+        pytest.param(
+            3,
+            0,
             0,
-            {},
+            id="d3-g0-v0",
         ),
-        (
-            "0000000000000000000000008a6781f0d54ed3cb8963ffc233e98041de8bdadb",
-            50000,
-            100,
-            {},
+        pytest.param(
+            3,
+            0,
+            1,
+            id="d3-g0-v1",
         ),
-        (
-            "0000000000000000000000008a6781f0d54ed3cb8963ffc233e98041de8bdadb",
-            335000,
+        pytest.param(
+            3,
+            1,
             0,
-            {
-                Address("0x1fe115f5d840cd62e113b09755c50d8f3f358b96"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x8a6781f0d54ed3cb8963ffc233e98041de8bdadb"): Account(
-                    storage={0: 1}
-                ),
-            },
+            id="d3-g1-v0",
         ),
-        (
-            "0000000000000000000000008a6781f0d54ed3cb8963ffc233e98041de8bdadb",
-            335000,
-            100,
-            {
-                Address("0x1fe115f5d840cd62e113b09755c50d8f3f358b96"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x8a6781f0d54ed3cb8963ffc233e98041de8bdadb"): Account(
-                    storage={0: 1}
-                ),
-            },
+        pytest.param(
+            3,
+            1,
+            1,
+            id="d3-g1-v1",
         ),
-        (
-            "00000000000000000000000009fce828cbd5c5bdc742fe5a63776e2a76a111e5",
-            50000,
+        pytest.param(
+            4,
             0,
-            {},
+            0,
+            id="d4-g0-v0",
         ),
-        (
-            "00000000000000000000000009fce828cbd5c5bdc742fe5a63776e2a76a111e5",
-            50000,
-            100,
-            {},
+        pytest.param(
+            4,
+            0,
+            1,
+            id="d4-g0-v1",
         ),
-        (
-            "00000000000000000000000009fce828cbd5c5bdc742fe5a63776e2a76a111e5",
-            335000,
+        pytest.param(
+            4,
+            1,
             0,
-            {
-                Address("0x09fce828cbd5c5bdc742fe5a63776e2a76a111e5"): Account(
-                    storage={0: 1}
-                ),
-                Address("0x1fe115f5d840cd62e113b09755c50d8f3f358b96"): Account(
-                    storage={1: 1}
-                ),
-            },
+            id="d4-g1-v0",
         ),
-        (
-            "00000000000000000000000009fce828cbd5c5bdc742fe5a63776e2a76a111e5",
-            335000,
-            100,
-            {
-                Address("0x09fce828cbd5c5bdc742fe5a63776e2a76a111e5"): Account(
-                    storage={0: 1}
-                ),
-                Address("0x1fe115f5d840cd62e113b09755c50d8f3f358b96"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            4,
+            1,
+            1,
+            id="d4-g1-v1",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_check_opcodes5(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_check_opcodes5."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
@@ -267,356 +180,389 @@ def test_static_check_opcodes5(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x972F33115B9E8BE9C87412A04CE61E6C3A84D15D,
-            )
-            + Op.DELEGATECALL(
-                gas=0x186A0,
-                address=0x8EEB303E1E7E2BB67D778526E009014A5DAEAD81,
+    pre[sender] = Account(balance=0xE8D4A51000)
+    # Source: lll
+    # { [[1]] (CALL 250000 (CALLDATALOAD 0) 0 0 0 0 0) }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x3D090,
+                address=Op.CALLDATALOAD(offset=0x0),
+                value=0x0,
                 args_offset=0x0,
-                args_size=0x20,
+                args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=10,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x09fce828cbd5c5bdc742fe5a63776e2a76a111e5"),  # noqa: E501
+        address=Address(0x1FE115F5D840CD62E113B09755C50D8F3F358B96),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x8A6781F0D54ED3CB8963FFC233E98041DE8BDADB,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0x19473707238EF04C4550E6EEE0D12BC0E3A7A02A,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (STATICCALL 50000 (CALLDATALOAD 0) 0 0 0 0) }
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xC350,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x19473707238ef04c4550e6eee0d12bc0e3a7a02a"),  # noqa: E501
+        address=Address(0x8EEB303E1E7E2BB67D778526E009014A5DAEAD81),  # noqa: E501
     )
-    # Source: LLL
-    # { [[1]] (CALL 250000 (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x3D090,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 <contract:0xb000000000000000000000000000000000000002>) (CALL 100000 <contract:0xa000000000000000000000000000000000000002> 0 0 32 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0xDF047446304BC9145D7BA20CD326E1097DA151FF
+        )
+        + Op.CALL(
+            gas=0x186A0,
+            address=0x8EEB303E1E7E2BB67D778526E009014A5DAEAD81,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x20,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1fe115f5d840cd62e113b09755c50d8f3f358b96"),  # noqa: E501
+        address=Address(0x2C073C9D611D927CA91E4819BBB2DFF859A8732B),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xDF047446304BC9145D7BA20CD326E1097DA151FF,
-            )
-            + Op.CALL(
-                gas=0x186A0,
-                address=0x8EEB303E1E7E2BB67D778526E009014A5DAEAD81,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x20,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 <contract:0xb000000000000000000000000000000000000002>) (CALL 100000 <contract:0xa000000000000000000000000000000000000002> 10 0 32 0 0) }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0xDF047446304BC9145D7BA20CD326E1097DA151FF
+        )
+        + Op.CALL(
+            gas=0x186A0,
+            address=0x8EEB303E1E7E2BB67D778526E009014A5DAEAD81,
+            value=0xA,
+            args_offset=0x0,
+            args_size=0x20,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=10,
         nonce=0,
-        address=Address("0x2c073c9d611d927ca91e4819bbb2dff859a8732b"),  # noqa: E501
+        address=Address(0x7761311EE56479DA378519606CC4DA58E17251AB),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x9C40928B20AC4236F0F3920567F28539C2E158B3,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0x3F1AFEC0E6911FF45E18F4286F10DD905CD18F29,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 <contract:0xc300000000000000000000000000000000000002>) (CALLCODE 100000 <contract:0xa000000000000000000000000000000000000002> 0 0 32 0 0) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x3F1AFEC0E6911FF45E18F4286F10DD905CD18F29
+        )
+        + Op.CALLCODE(
+            gas=0x186A0,
+            address=0x8EEB303E1E7E2BB67D778526E009014A5DAEAD81,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x20,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=10,
         nonce=0,
-        address=Address("0x3f1afec0e6911ff45e18f4286f10dd905cd18f29"),  # noqa: E501
+        address=Address(0x9C40928B20AC4236F0F3920567F28539C2E158B3),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xDF047446304BC9145D7BA20CD326E1097DA151FF,
-            )
-            + Op.CALL(
-                gas=0x186A0,
-                address=0x8EEB303E1E7E2BB67D778526E009014A5DAEAD81,
-                value=0xA,
-                args_offset=0x0,
-                args_size=0x20,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 <contract:0xc400000000000000000000000000000000000002>) (CALLCODE 100000 <contract:0xa000000000000000000000000000000000000002> 1 0 32 0 0) }  # noqa: E501
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x19473707238EF04C4550E6EEE0D12BC0E3A7A02A
+        )
+        + Op.CALLCODE(
+            gas=0x186A0,
+            address=0x8EEB303E1E7E2BB67D778526E009014A5DAEAD81,
+            value=0x1,
+            args_offset=0x0,
+            args_size=0x20,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=10,
         nonce=0,
-        address=Address("0x7761311ee56479da378519606cc4da58e17251ab"),  # noqa: E501
+        address=Address(0x8A6781F0D54ED3CB8963FFC233E98041DE8BDADB),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x19473707238EF04C4550E6EEE0D12BC0E3A7A02A,
-            )
-            + Op.CALLCODE(
-                gas=0x186A0,
-                address=0x8EEB303E1E7E2BB67D778526E009014A5DAEAD81,
-                value=0x1,
-                args_offset=0x0,
-                args_size=0x20,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 <contract:0xc500000000000000000000000000000000000002>) (DELEGATECALL 100000 <contract:0xa000000000000000000000000000000000000002> 0 32 0 0) }  # noqa: E501
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=0x972F33115B9E8BE9C87412A04CE61E6C3A84D15D
+        )
+        + Op.DELEGATECALL(
+            gas=0x186A0,
+            address=0x8EEB303E1E7E2BB67D778526E009014A5DAEAD81,
+            args_offset=0x0,
+            args_size=0x20,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=10,
         nonce=0,
-        address=Address("0x8a6781f0d54ed3cb8963ffc233e98041de8bdadb"),  # noqa: E501
+        address=Address(0x09FCE828CBD5C5BDC742FE5A63776E2A76A111E5),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xC350,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0xa000000000000000000000000000000000000002> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0xb000000000000000000000000000000000000002> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x8EEB303E1E7E2BB67D778526E009014A5DAEAD81, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0xDF047446304BC9145D7BA20CD326E1097DA151FF, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8eeb303e1e7e2bb67d778526e009014a5daead81"),  # noqa: E501
+        address=Address(0xDF047446304BC9145D7BA20CD326E1097DA151FF),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x9FCE828CBD5C5BDC742FE5A63776E2A76A111E5,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0x972F33115B9E8BE9C87412A04CE61E6C3A84D15D,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x3000000000000000000000000000000000000001> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0xc300000000000000000000000000000000000002> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x9C40928B20AC4236F0F3920567F28539C2E158B3, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0x3F1AFEC0E6911FF45E18F4286F10DD905CD18F29, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x972f33115b9e8be9c87412a04ce61e6c3a84d15d"),  # noqa: E501
+        address=Address(0x3F1AFEC0E6911FF45E18F4286F10DD905CD18F29),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x3F1AFEC0E6911FF45E18F4286F10DD905CD18F29,
-            )
-            + Op.CALLCODE(
-                gas=0x186A0,
-                address=0x8EEB303E1E7E2BB67D778526E009014A5DAEAD81,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x20,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=10,
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x4000000000000000000000000000000000000001> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0xc400000000000000000000000000000000000002> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x8A6781F0D54ED3CB8963FFC233E98041DE8BDADB, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0x19473707238EF04C4550E6EEE0D12BC0E3A7A02A, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9c40928b20ac4236f0f3920567f28539c2e158b3"),  # noqa: E501
+        address=Address(0x19473707238EF04C4550E6EEE0D12BC0E3A7A02A),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x22,
-                condition=Op.EQ(
-                    0xFAA10B404AB607779993C016CD5DA73AE1F29D7E,
-                    Op.ORIGIN,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x28)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x4B,
-                condition=Op.EQ(
-                    0x8EEB303E1E7E2BB67D778526E009014A5DAEAD81,
-                    Op.CALLER,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x51)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x74,
-                condition=Op.EQ(
-                    0xDF047446304BC9145D7BA20CD326E1097DA151FF,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x7A)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
-            + Op.SSTORE(key=0x1, value=0x2)
-            + Op.JUMP(pc=0x90)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (if (= <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b> (ORIGIN)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0x5000000000000000000000000000000000000001> (CALLER)) (MSTORE 1 1) (SSTORE 1 2) ) (if (= <contract:0xc500000000000000000000000000000000000002> (ADDRESS)) (MSTORE 1 1) (SSTORE 1 2) )   (if (= 0 (CALLVALUE)) (MSTORE 1 1) (SSTORE 1 2) ) }  # noqa: E501
+    addr_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x22,
+            condition=Op.EQ(
+                0xFAA10B404AB607779993C016CD5DA73AE1F29D7E, Op.ORIGIN
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x28)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4B,
+            condition=Op.EQ(
+                0x9FCE828CBD5C5BDC742FE5A63776E2A76A111E5, Op.CALLER
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x51)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x74,
+            condition=Op.EQ(
+                0x972F33115B9E8BE9C87412A04CE61E6C3A84D15D, Op.ADDRESS
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x7A)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x0, Op.CALLVALUE))
+        + Op.SSTORE(key=0x1, value=0x2)
+        + Op.JUMP(pc=0x90)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdf047446304bc9145d7ba20cd326e1097da151ff"),  # noqa: E501
+        address=Address(0x972F33115B9E8BE9C87412A04CE61E6C3A84D15D),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                addr_6: Account(storage={0: 0}),
+            },
+        },
+        {
+            "indexes": {"data": [0, 1], "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                addr_6: Account(storage={0: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [2], "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                addr_3: Account(storage={0: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [3], "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                addr_4: Account(storage={0: 1}),
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                addr_5: Account(storage={0: 1}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+        Hash(addr_5, left_padding=True),
+    ]
+    tx_gas = [50000, 335000]
+    tx_value = [0, 100]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_contract_creation_make_call_that_ask_more_gas_then_transaction_provided.py b/tests/ported_static/stStaticCall/test_static_contract_creation_make_call_that_ask_more_gas_then_transaction_provided.py
index 20e27fc93ed..82b1fe9027c 100644
--- a/tests/ported_static/stStaticCall/test_static_contract_creation_make_call_that_ask_more_gas_then_transaction_provided.py
+++ b/tests/ported_static/stStaticCall/test_static_contract_creation_make_call_that_ask_more_gas_then_transaction_provided.py
@@ -1,20 +1,23 @@
 """
-Test ported from static filler.
+Test_static_contract_creation_make_call_that_ask_more_gas_then_transacti...
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json
+state_tests/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -24,45 +27,59 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "604060006040600073100000000000000000000000000000000000000161c350fa",  # noqa: E501
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "604060006040600073200000000000000000000000000000000000000161c350fa",  # noqa: E501
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "604060006040600073300000000000000000000000000000000000000161c350fa",  # noqa: E501
-            {},
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "604060006040600073400000000000000000000000000000000000000161c350fa",  # noqa: E501
-            {},
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_contract_creation_make_call_that_ask_more_gas_then_transaction_provided(  # noqa: E501
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_contract_creation_make_call_that_ask_more_gas_then_tran..."""  # noqa: E501
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0x1000000000000000000000000000000000000001)
+    contract_2 = Address(0x2000000000000000000000000000000000000001)
+    contract_3 = Address(0x3000000000000000000000000000000000000001)
+    contract_4 = Address(0x4000000000000000000000000000000000000001)
+    contract_5 = Address(0x5000000000000000000000000000000000000001)
+    contract_6 = Address(0x4000000000000000000000000000000000000004)
+    sender = pre.fund_eoa(amount=0x10C8E0)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,116 +90,173 @@ def test_static_contract_creation_make_call_that_ask_more_gas_then_transaction_p
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(SSTORE 1 1)}
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x1) + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000001"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 1 1)}
-    pre.deploy_contract(
+    contract_2 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x2000000000000000000000000000000000000001"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x3000000000000000000000000000000000000001"),  # noqa: E501
     )
-    # Source: LLL
-    # { (CALLCODE 1000 0x4000000000000000000000000000000000000004 0 0 0 0 0) }
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0x3E8,
-                address=0x4000000000000000000000000000000000000004,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 1 1) }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x4000000000000000000000000000000000000001"),  # noqa: E501
     )
-    # Source: LLL
-    # { (MSTORE 1 1) }
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
+    # Source: lll
+    # {(STATICCALL 50000 0x1000000000000000000000000000000000000001 0 64 0 64)}
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0xC350,
+            address=contract_1,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x4000000000000000000000000000000000000004"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (CALLCODE 1000000 0x4000000000000000000000000000000000000004 0 0 0 0 0) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.CALLCODE(
-                gas=0xF4240,
-                address=0x4000000000000000000000000000000000000004,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0xF4240,
+            address=contract_6,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x5000000000000000000000000000000000000001"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x10C8E0)
-    # Source: LLL
-    # {(STATICCALL 50000 0x1000000000000000000000000000000000000001 0 64 0 64)}
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0xC350,
-                address=0x1000000000000000000000000000000000000001,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (CALLCODE 1000 0x4000000000000000000000000000000000000004 0 0 0 0 0) }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLCODE(
+            gas=0x3E8,
+            address=contract_6,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=1
+                )
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=1
+                )
+            },
+        },
+        {
+            "indexes": {"data": 2, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=1
+                )
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=1
+                )
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.STATICCALL(
+            gas=0xC350,
+            address=contract_1,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        ),
+        Op.STATICCALL(
+            gas=0xC350,
+            address=contract_2,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        ),
+        Op.STATICCALL(
+            gas=0xC350,
+            address=contract_3,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        ),
+        Op.STATICCALL(
+            gas=0xC350,
+            address=contract_4,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        ),
+    ]
+    tx_gas = [96000]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=96000,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_contract_creation_oo_gdont_leave_empty_contract_via_transaction.py b/tests/ported_static/stStaticCall/test_static_contract_creation_oo_gdont_leave_empty_contract_via_transaction.py
index 379ca697cf9..eb6c5fd6f03 100644
--- a/tests/ported_static/stStaticCall/test_static_contract_creation_oo_gdont_leave_empty_contract_via_transaction.py
+++ b/tests/ported_static/stStaticCall/test_static_contract_creation_oo_gdont_leave_empty_contract_via_transaction.py
@@ -1,20 +1,19 @@
 """
-Test ported from static filler.
+Test_static_contract_creation_oo_gdont_leave_empty_contract_via_transact...
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json
+state_tests/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,21 +23,22 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_contract_creation_oo_gdont_leave_empty_contract_via_transaction(  # noqa: E501
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_contract_creation_oo_gdont_leave_empty_contract_via_tra..."""  # noqa: E501
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0x1000000000000000000000000000000000000001)
+    contract_2 = Address(0x2000000000000000000000000000000000000001)
+    sender = pre.fund_eoa(amount=0x10C8E0)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,60 +49,56 @@ def test_static_contract_creation_oo_gdont_leave_empty_contract_via_transaction(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 1 1)}
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000001"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2000000000000000000000000000000000000001"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x10C8E0)
-    # Source: LLL
+    # Source: lll
     # {(STATICCALL 50000 0x1000000000000000000000000000000000000001 0 64 0 64)}
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0xC350,
-                address=0x1000000000000000000000000000000000000001,
-                args_offset=0x0,
-                args_size=0x40,
-                ret_offset=0x0,
-                ret_size=0x40,
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0xC350,
+            address=contract_1,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
+        )
+        + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "604060006040600073200000000000000000000000000000000000000161c350fa"  # noqa: E501
+        data=Op.STATICCALL(
+            gas=0xC350,
+            address=contract_2,
+            args_offset=0x0,
+            args_size=0x40,
+            ret_offset=0x0,
+            ret_size=0x40,
         ),
         gas_limit=96000,
     )
 
-    post: dict = {}
+    post = {compute_create_address(address=sender, nonce=0): Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_create_contract_suicide_during_init.py b/tests/ported_static/stStaticCall/test_static_create_contract_suicide_during_init.py
index 4321eb3ca3b..abdb26f1df3 100644
--- a/tests/ported_static/stStaticCall/test_static_create_contract_suicide_during_init.py
+++ b/tests/ported_static/stStaticCall/test_static_create_contract_suicide_during_init.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_create_contract_suicide_during_init.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CREATE_ContractSuicideDuringInitFiller.json
+state_tests/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +24,56 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",  # noqa: E501
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",  # noqa: E501
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",  # noqa: E501
-            {},
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "600060006000600073e94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",  # noqa: E501
-            {},
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_create_contract_suicide_during_init(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_create_contract_suicide_during_init."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_2 = Address(0xD94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_3 = Address(0xE94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,70 +84,113 @@ def test_static_create_contract_suicide_during_init(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
-    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
-        balance=11,
-        nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 1 1) }
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=11,
+        nonce=0,
+    )
+    # Source: lll
     # { (SSTORE 1 1) }
-    pre.deploy_contract(
+    contract_2 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x1) + Op.STOP,
         balance=11,
         nonce=0,
-        address=Address("0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (CALL 100 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) }
-    pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x64,
-                address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                value=0x1,
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x64,
+            address=contract_0,
+            value=0x1,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=11,
+        nonce=0,
+    )
+
+    tx_data = [
+        Op.POP(
+            Op.STATICCALL(
+                gas=0xEA60,
+                address=contract_0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
-        balance=11,
-        nonce=0,
-        address=Address("0xe94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+        )
+        + Op.MSTORE(offset=0x0, value=0x64600C6000556000526005601BF3)
+        + Op.SELFDESTRUCT(address=contract_0),
+        Op.POP(
+            Op.STATICCALL(
+                gas=0xEA60,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=0x64600C6000556000526005601BF3)
+        + Op.SELFDESTRUCT(address=contract_0),
+        Op.POP(
+            Op.STATICCALL(
+                gas=0xEA60,
+                address=contract_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=0x64600C6000556000526005601BF3)
+        + Op.SELFDESTRUCT(address=contract_0),
+        Op.POP(
+            Op.STATICCALL(
+                gas=0xEA60,
+                address=contract_3,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=0x64600C6000556000526005601BF3)
+        + Op.SELFDESTRUCT(address=contract_0),
+    ]
+    tx_gas = [150000]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=150000,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = expected_post
+    post = {
+        compute_create_address(address=sender, nonce=0): Account.NONEXISTENT,
+        contract_0: Account(storage={1: 0}, balance=0),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_create_contract_suicide_during_init_then_store_then_return.py b/tests/ported_static/stStaticCall/test_static_create_contract_suicide_during_init_then_store_then_return.py
index 50447a2531c..c6915b5ce3a 100644
--- a/tests/ported_static/stStaticCall/test_static_create_contract_suicide_during_init_then_store_then_return.py
+++ b/tests/ported_static/stStaticCall/test_static_create_contract_suicide_during_init_then_store_then_return.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_create_contract_suicide_during_init_then_store_then_return.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
+state_tests/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,37 +24,44 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa506d64600c6000556000526005601bf360005273d94f5374fce5edbc8e2a8697c15331677e6ebf0bff600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa50600b600055600e6012f3",  # noqa: E501
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa506d64600c6000556000526005601bf360005273d94f5374fce5edbc8e2a8697c15331677e6ebf0bff600060006000600073194f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa50600b600055600e6012f3",  # noqa: E501
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_create_contract_suicide_during_init_then_store_then_return(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_create_contract_suicide_during_init_then_store_then_return."""  # noqa: E501
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xD94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_2 = Address(0x094F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_3 = Address(0x194F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -65,46 +72,98 @@ def test_static_create_contract_suicide_during_init_then_store_then_return(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { (MSTORE 1 1) }
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
-        nonce=0,
-        address=Address("0x094f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-    # Source: LLL
-    # {(MSTORE 1 1) }
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
-        nonce=0,
-        address=Address("0x194f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # {[[1]]12}
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {[[1]]12}
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
         nonce=0,
-        address=Address("0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+    )
+    # Source: lll
+    # { (MSTORE 1 1) }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
+        nonce=0,
+    )
+    # Source: lll
+    # {(MSTORE 1 1) }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
+        nonce=0,
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.POP(
+            Op.STATICCALL(
+                gas=0xEA60,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=0x64600C6000556000526005601BF3)
+        + Op.SELFDESTRUCT(address=contract_1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xEA60,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=0xB)
+        + Op.RETURN(offset=0x12, size=0xE),
+        Op.POP(
+            Op.STATICCALL(
+                gas=0xEA60,
+                address=contract_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=0x64600C6000556000526005601BF3)
+        + Op.SELFDESTRUCT(address=contract_1)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xEA60,
+                address=contract_3,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=0xB)
+        + Op.RETURN(offset=0x12, size=0xE),
+    ]
+    tx_gas = [600000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=600000,
-        value=10,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        compute_create_address(address=sender, nonce=0): Account.NONEXISTENT,
+        contract_0: Account(storage={1: 0}, balance=0),
+        contract_1: Account(storage={1: 0}, balance=10),
+        contract_2: Account(storage={1: 0}, balance=0),
+        contract_3: Account(storage={1: 0}, balance=0),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_create_contract_suicide_during_init_with_value.py b/tests/ported_static/stStaticCall/test_static_create_contract_suicide_during_init_with_value.py
index 768ad03cfa8..a094c7576c5 100644
--- a/tests/ported_static/stStaticCall/test_static_create_contract_suicide_during_init_with_value.py
+++ b/tests/ported_static/stStaticCall/test_static_create_contract_suicide_during_init_with_value.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_create_contract_suicide_during_init_with_value.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CREATE_ContractSuicideDuringInit_WithValueFiller.json
+state_tests/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,37 +24,42 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",  # noqa: E501
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60fa506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",  # noqa: E501
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_create_contract_suicide_during_init_with_value(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_create_contract_suicide_during_init_with_value."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xD94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -65,32 +70,59 @@ def test_static_create_contract_suicide_during_init_with_value(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # {[[1]]12}
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 1 1) }
-    pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Op.POP(
+            Op.STATICCALL(
+                gas=0xEA60,
+                address=contract_0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=0x64600C6000556000526005601BF3)
+        + Op.SELFDESTRUCT(address=contract_0),
+        Op.POP(
+            Op.STATICCALL(
+                gas=0xEA60,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE(offset=0x0, value=0x64600C6000556000526005601BF3)
+        + Op.SELFDESTRUCT(address=contract_0),
+    ]
+    tx_gas = [150000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=150000,
-        value=10,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        compute_create_address(address=sender, nonce=0): Account.NONEXISTENT,
+        contract_0: Account(storage={1: 0}, balance=10),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_create_empty_contract_and_call_it_0wei.py b/tests/ported_static/stStaticCall/test_static_create_empty_contract_and_call_it_0wei.py
index 693d4d0bf74..06c2269aa0d 100644
--- a/tests/ported_static/stStaticCall/test_static_create_empty_contract_and_call_it_0wei.py
+++ b/tests/ported_static/stStaticCall/test_static_create_empty_contract_and_call_it_0wei.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_static_create_empty_contract_and_call_it_0wei.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CREATE_EmptyContractAndCallIt_0weiFiller.json
+state_tests/stStaticCall/static_CREATE_EmptyContractAndCallIt_0weiFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,21 +24,20 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_CREATE_EmptyContractAndCallIt_0weiFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_CREATE_EmptyContractAndCallIt_0weiFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_create_empty_contract_and_call_it_0wei(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_create_empty_contract_and_call_it_0wei."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,50 +48,47 @@ def test_static_create_empty_contract_and_call_it_0wei(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[0]](GAS) [[1]] (CREATE 0 0 32) [[2]](GAS) [[3]] (STATICCALL 60000 (SLOAD 1) 0 0 0 0) [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x20)
-            )
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.STATICCALL(
-                    gas=0xEA60,
-                    address=Op.SLOAD(key=0x1),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x20))
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.STATICCALL(
+                gas=0xEA60,
+                address=Op.SLOAD(key=0x1),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 0x8D5B6,
-                1: 0xF1ECF98489FA9ED60A664FC4998DB699CFA39D40,
+                1: compute_create_address(address=contract_0, nonce=0),
                 2: 0x7ABF8,
                 3: 1,
                 100: 0x6FE6E,
             },
         ),
+        compute_create_address(address=contract_0, nonce=0): Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_create_empty_contract_with_storage_and_call_it_0wei.py b/tests/ported_static/stStaticCall/test_static_create_empty_contract_with_storage_and_call_it_0wei.py
index ccbe7d342b1..42399b955b1 100644
--- a/tests/ported_static/stStaticCall/test_static_create_empty_contract_with_storage_and_call_it_0wei.py
+++ b/tests/ported_static/stStaticCall/test_static_create_empty_contract_with_storage_and_call_it_0wei.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_static_create_empty_contract_with_storage_and_call_it_0wei.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json
+state_tests/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,21 +24,21 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_create_empty_contract_with_storage_and_call_it_0wei(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_create_empty_contract_with_storage_and_call_it_0wei."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,70 +49,64 @@ def test_static_create_empty_contract_with_storage_and_call_it_0wei(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[0]](GAS) (MSTORE 0 0x600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c1533167) (MSTORE 32 0x7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000) [[1]] (CREATE 0 0 64) [[2]] (GAS) [[3]] (STATICCALL 60000 (SLOAD 1) 0 0 0 0) [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x600C6000556000600060006000600073C94F5374FCE5EDBC8E2A8697C1533167,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x7E6EBF0B61EA60F1000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x40)
-            )
-            + Op.SSTORE(key=0x2, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.STATICCALL(
-                    gas=0xEA60,
-                    address=Op.SLOAD(key=0x1),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x600C6000556000600060006000600073C94F5374FCE5EDBC8E2A8697C1533167,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x7E6EBF0B61EA60F1000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.SSTORE(key=0x1, value=Op.CREATE(value=0x0, offset=0x0, size=0x40))
+        + Op.SSTORE(key=0x2, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.STATICCALL(
+                gas=0xEA60,
+                address=Op.SLOAD(key=0x1),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {[[1]]12}
-    callee = pre.deploy_contract(
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0xC) + Op.STOP,
         balance=0xE8D4A51000,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 0x8D5B6,
-                1: 0xF1ECF98489FA9ED60A664FC4998DB699CFA39D40,
+                1: compute_create_address(address=contract_0, nonce=0),
                 2: 0x6F4F0,
                 3: 1,
                 100: 0x64766,
             },
         ),
-        callee: Account(storage={1: 12}),
-        Address("0xf1ecf98489fa9ed60a664fc4998db699cfa39d40"): Account(
-            storage={0: 12},
-        ),
+        compute_create_address(address=contract_0, nonce=0): Account(nonce=1),
+        contract_1: Account(storage={1: 12}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_execute_call_that_ask_fore_gas_then_trabsaction_has.py b/tests/ported_static/stStaticCall/test_static_execute_call_that_ask_fore_gas_then_trabsaction_has.py
index dd72b354212..c48d9cfe3d4 100644
--- a/tests/ported_static/stStaticCall/test_static_execute_call_that_ask_fore_gas_then_trabsaction_has.py
+++ b/tests/ported_static/stStaticCall/test_static_execute_call_that_ask_fore_gas_then_trabsaction_has.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_static_execute_call_that_ask_fore_gas_then_trabsaction_has.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json
+state_tests/stStaticCall/static_ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +27,46 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000003dc16a13cf554533f380cc938a2c1ab04dac534f",
-            {
-                Address("0xa256ebcc5536cda56e04c39fe9584ecc7594a438"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "00000000000000000000000073ef1878a0f2c9629dedc1b1e9be8d77dcf93688",
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "000000000000000000000000ce4ccbffaf450ae2126eb96dcd7c891f37764f20",
-            {},
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_execute_call_that_ask_fore_gas_then_trabsaction_has(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xDC4EFA209AECDD4C2D5201A419EA27506151B4EC687F14A613229E310932491B
-    )
+    """Test_static_execute_call_that_ask_fore_gas_then_trabsaction_has."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x989680)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,66 +77,85 @@ def test_static_execute_call_that_ask_fore_gas_then_trabsaction_has(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
-        balance=0x186A0,
+    # Source: lll
+    # { [[1]] (STATICCALL 600000 (CALLDATALOAD 0) 0 0 0 0) }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x927C0,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3dc16a13cf554533f380cc938a2c1ab04dac534f"),  # noqa: E501
+        address=Address(0xA256EBCC5536CDA56E04C39FE9584ECC7594A438),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 1 1) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0x73ef1878a0f2c9629dedc1b1e9be8d77dcf93688"),  # noqa: E501
+        address=Address(0x3DC16A13CF554533F380CC938A2C1AB04DAC534F),  # noqa: E501
     )
-    # Source: LLL
-    # { [[1]] (STATICCALL 600000 (CALLDATALOAD 0) 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x927C0,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0x186A0,
         nonce=0,
-        address=Address("0xa256ebcc5536cda56e04c39fe9584ecc7594a438"),  # noqa: E501
+        address=Address(0x73EF1878A0F2C9629DEDC1B1E9BE8D77DCF93688),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x989680)
-    pre.deploy_contract(
+    # Source: lll
+    # { (SSTORE 1 1) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x1) + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0xce4ccbffaf450ae2126eb96dcd7c891f37764f20"),  # noqa: E501
+        address=Address(0xCE4CCBFFAF450AE2126EB96DCD7C891F37764F20),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [1, 2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={1: 0})},
+        },
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={1: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+    ]
+    tx_gas = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_internal_call_hitting_gas_limit.py b/tests/ported_static/stStaticCall/test_static_internal_call_hitting_gas_limit.py
index 5a85b100cc5..fa551114028 100644
--- a/tests/ported_static/stStaticCall/test_static_internal_call_hitting_gas_limit.py
+++ b/tests/ported_static/stStaticCall/test_static_internal_call_hitting_gas_limit.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_internal_call_hitting_gas_limit.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_InternalCallHittingGasLimitFiller.json
+state_tests/stStaticCall/static_InternalCallHittingGasLimitFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_InternalCallHittingGasLimitFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_InternalCallHittingGasLimitFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_internal_call_hitting_gas_limit(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0x07C857D62C76CE09F2E8EC3FA9277578C67B69C6547364568FDDB841071E5BD7
-    )
+    """Test_static_internal_call_hitting_gas_limit."""
+    coinbase = Address(0x2ADF5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xF4240)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,49 +44,44 @@ def test_static_internal_call_hitting_gas_limit(
         gas_limit=100000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x285bb5c8a71646ab9a5796d4a718cc4826af8d06"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (STATICCALL 5000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=0x1388,
-                address=0x285BB5C8A71646AB9A5796D4A718CC4826AF8D06,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=0x1388,
+            address=addr,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xF4240,
         nonce=0,
-        address=Address("0x5a755ead8f1201283f750b2f77af7d03399d5feb"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xF4240)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=21100,
         value=10,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_internal_call_hitting_gas_limit2.py b/tests/ported_static/stStaticCall/test_static_internal_call_hitting_gas_limit2.py
index 7f55b679244..420d8654ec1 100644
--- a/tests/ported_static/stStaticCall/test_static_internal_call_hitting_gas_limit2.py
+++ b/tests/ported_static/stStaticCall/test_static_internal_call_hitting_gas_limit2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_internal_call_hitting_gas_limit2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_InternalCallHittingGasLimit2Filler.json
+state_tests/stStaticCall/static_InternalCallHittingGasLimit2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_InternalCallHittingGasLimit2Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_InternalCallHittingGasLimit2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_internal_call_hitting_gas_limit2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0x07C857D62C76CE09F2E8EC3FA9277578C67B69C6547364568FDDB841071E5BD7
-    )
+    """Test_static_internal_call_hitting_gas_limit2."""
+    coinbase = Address(0x2ADF5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xF4240)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,51 +46,46 @@ def test_static_internal_call_hitting_gas_limit2(
         gas_limit=47766,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x1C,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.POP(Op.EXTCODESIZE(address=0x1))
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x1C, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.POP(Op.EXTCODESIZE(address=0x1))
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0x285bb5c8a71646ab9a5796d4a718cc4826af8d06"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 1 ]] (STATICCALL 25000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x61A8,
-                    address=0x285BB5C8A71646AB9A5796D4A718CC4826AF8D06,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x61A8,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf0801b78978104bae7d7d679f8e3990492825c3e"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xF4240)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=47766,
         value=10,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={1: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_internal_call_store_clears_oog.py b/tests/ported_static/stStaticCall/test_static_internal_call_store_clears_oog.py
index f68cf700fcf..e63ab3f633b 100644
--- a/tests/ported_static/stStaticCall/test_static_internal_call_store_clears_oog.py
+++ b/tests/ported_static/stStaticCall/test_static_internal_call_store_clears_oog.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_internal_call_store_clears_oog.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_InternalCallStoreClearsOOGFiller.json
+state_tests/stStaticCall/static_InternalCallStoreClearsOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,20 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_InternalCallStoreClearsOOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_InternalCallStoreClearsOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_internal_call_store_clears_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_internal_call_store_clears_oog."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_0 = Address(0x0000000000000000000000000000000000000000)
+    contract_1 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,69 +46,65 @@ def test_static_internal_call_store_clears_oog(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(SSTORE 0 0)(SSTORE 1 0)(SSTORE 2 0)(SSTORE 3 0)(SSTORE 4 0)(SSTORE 5 0)(SSTORE 6 0)(SSTORE 7 0)(SSTORE 8 0)(SSTORE 9 0)}  # noqa: E501
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.STOP,
         storage={
-            0x0: 0xC,
-            0x1: 0xC,
-            0x2: 0xC,
-            0x3: 0xC,
-            0x4: 0xC,
-            0x5: 0xC,
-            0x6: 0xC,
-            0x7: 0xC,
-            0x8: 0xC,
-            0x9: 0xC,
+            0: 12,
+            1: 12,
+            2: 12,
+            3: 12,
+            4: 12,
+            5: 12,
+            6: 12,
+            7: 12,
+            8: 12,
+            9: 12,
         },
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
-    # Source: LLL
+    # Source: lll
     # { [[ 1 ]] (STATICCALL 40000 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x9C40,
-                    address=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x9C40,
+                address=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=10,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_1,
+        data=Bytes(""),
         gas_limit=160000,
         value=10,
     )
 
     post = {
-        callee: Account(
+        contract_0: Account(
             storage={
                 0: 12,
                 1: 12,
@@ -124,7 +117,10 @@ def test_static_internal_call_store_clears_oog(
                 8: 12,
                 9: 12,
             },
+            balance=0,
         ),
+        sender: Account(nonce=1),
+        contract_1: Account(storage={1: contract_0}, balance=20),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_log0_empty_mem.py b/tests/ported_static/stStaticCall/test_static_log0_empty_mem.py
index 962c4952594..544bf1cf1e6 100644
--- a/tests/ported_static/stStaticCall/test_static_log0_empty_mem.py
+++ b/tests/ported_static/stStaticCall/test_static_log0_empty_mem.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_log0_empty_mem.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_log0_emptyMemFiller.json
+state_tests/stStaticCall/static_log0_emptyMemFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_log0_emptyMemFiller.json"],
+    ["state_tests/stStaticCall/static_log0_emptyMemFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_log0_empty_mem(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_log0_empty_mem."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,45 +44,41 @@ def test_static_log0_empty_mem(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # { (LOG0 0 0) }
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.LOG0(offset=0x0, size=0x0) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc2a943e837808399d9c1b946c6188739d4d4475e"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (STATICCALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x3E8,
-                    address=0xC2A943E837808399D9C1B946C6188739D4D4475E,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x3E8,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xde4edfb3ce6bd32637813f22447df168e9289cdd"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={0: 0, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_log0_log_mem_start_too_high.py b/tests/ported_static/stStaticCall/test_static_log0_log_mem_start_too_high.py
index 7adeeca0e75..1b8b29fde1c 100644
--- a/tests/ported_static/stStaticCall/test_static_log0_log_mem_start_too_high.py
+++ b/tests/ported_static/stStaticCall/test_static_log0_log_mem_start_too_high.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_log0_log_mem_start_too_high.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_log0_logMemStartTooHighFiller.json
+state_tests/stStaticCall/static_log0_logMemStartTooHighFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_log0_logMemStartTooHighFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_log0_logMemStartTooHighFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_log0_log_mem_start_too_high(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_log0_log_mem_start_too_high."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,52 +44,48 @@ def test_static_log0_log_mem_start_too_high(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG0(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=0x1,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG0(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=0x1,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4e46dd6ccd823bbe05d8ceaf0ca778101f8d8e6b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (STATICCALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x3E8,
-                    address=0x4E46DD6CCD823BBE05D8CEAF0CA778101F8D8E6B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x3E8,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe230b8d7763e30ca988447daa182146b0bea3764"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_log0_log_memsize_too_high.py b/tests/ported_static/stStaticCall/test_static_log0_log_memsize_too_high.py
index 958c54b5426..08be6f2f1ae 100644
--- a/tests/ported_static/stStaticCall/test_static_log0_log_memsize_too_high.py
+++ b/tests/ported_static/stStaticCall/test_static_log0_log_memsize_too_high.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_log0_log_memsize_too_high.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_log0_logMemsizeTooHighFiller.json
+state_tests/stStaticCall/static_log0_logMemsizeTooHighFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_log0_logMemsizeTooHighFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_log0_logMemsizeTooHighFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_log0_log_memsize_too_high(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_log0_log_memsize_too_high."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,52 +44,48 @@ def test_static_log0_log_memsize_too_high(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG0(
-                offset=0x1,
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG0(
+            offset=0x1,
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6573bb447199fc94c98ad0f26068653c70da4044"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (STATICCALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x3E8,
-                    address=0x6573BB447199FC94C98AD0F26068653C70DA4044,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x3E8,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe230b8d7763e30ca988447daa182146b0bea3764"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_log0_log_memsize_zero.py b/tests/ported_static/stStaticCall/test_static_log0_log_memsize_zero.py
index 9503a671aa5..d00b5fa1cae 100644
--- a/tests/ported_static/stStaticCall/test_static_log0_log_memsize_zero.py
+++ b/tests/ported_static/stStaticCall/test_static_log0_log_memsize_zero.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_log0_log_memsize_zero.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_log0_logMemsizeZeroFiller.json
+state_tests/stStaticCall/static_log0_logMemsizeZeroFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_log0_logMemsizeZeroFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_log0_logMemsizeZeroFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_log0_log_memsize_zero(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_log0_log_memsize_zero."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,49 +44,45 @@ def test_static_log0_log_memsize_zero(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG0(offset=0x1, size=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 1 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG0(offset=0x1, size=0x0)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2f70a6bcee18358a07f12ff4630e0a802d8c293a"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (STATICCALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x3E8,
-                    address=0x2F70A6BCEE18358A07F12FF4630E0A802D8C293A,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x3E8,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe230b8d7763e30ca988447daa182146b0bea3764"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_log0_non_empty_mem.py b/tests/ported_static/stStaticCall/test_static_log0_non_empty_mem.py
index deed7b334a4..e2fa4804a08 100644
--- a/tests/ported_static/stStaticCall/test_static_log0_non_empty_mem.py
+++ b/tests/ported_static/stStaticCall/test_static_log0_non_empty_mem.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_log0_non_empty_mem.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_log0_nonEmptyMemFiller.json
+state_tests/stStaticCall/static_log0_nonEmptyMemFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_log0_nonEmptyMemFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_log0_nonEmptyMemFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_log0_non_empty_mem(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_log0_non_empty_mem."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,49 +44,45 @@ def test_static_log0_non_empty_mem(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.LOG0(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG0 0 32) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.LOG0(offset=0x0, size=0x20)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x86bb6680bec59591fa113b66365d1bf87a4c6910"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (STATICCALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x3E8,
-                    address=0x86BB6680BEC59591FA113B66365D1BF87A4C6910,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x3E8,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe230b8d7763e30ca988447daa182146b0bea3764"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_log0_non_empty_mem_log_mem_size1.py b/tests/ported_static/stStaticCall/test_static_log0_non_empty_mem_log_mem_size1.py
index ac4c61a187e..ac79fbfd901 100644
--- a/tests/ported_static/stStaticCall/test_static_log0_non_empty_mem_log_mem_size1.py
+++ b/tests/ported_static/stStaticCall/test_static_log0_non_empty_mem_log_mem_size1.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_log0_non_empty_mem_log_mem_size1.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_log0_nonEmptyMem_logMemSize1Filler.json
+state_tests/stStaticCall/static_log0_nonEmptyMem_logMemSize1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_log0_nonEmptyMem_logMemSize1Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_log0_nonEmptyMem_logMemSize1Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_log0_non_empty_mem_log_mem_size1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_log0_non_empty_mem_log_mem_size1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,49 +46,45 @@ def test_static_log0_non_empty_mem_log_mem_size1(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG0(offset=0x0, size=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 0 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG0(offset=0x0, size=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x02da68e115cd98f7d70e0b7cfabe76581fd2d667"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (STATICCALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x3E8,
-                    address=0x2DA68E115CD98F7D70E0B7CFABE76581FD2D667,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x3E8,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe230b8d7763e30ca988447daa182146b0bea3764"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=2100000,
+        value=0x200B20,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_log0_non_empty_mem_log_mem_size1_log_mem_start31.py b/tests/ported_static/stStaticCall/test_static_log0_non_empty_mem_log_mem_size1_log_mem_start31.py
index 8d2561584d8..0485ad02595 100644
--- a/tests/ported_static/stStaticCall/test_static_log0_non_empty_mem_log_mem_size1_log_mem_start31.py
+++ b/tests/ported_static/stStaticCall/test_static_log0_non_empty_mem_log_mem_size1_log_mem_start31.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_log0_non_empty_mem_log_mem_size1_log_mem_start31.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+state_tests/stStaticCall/static_log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,21 +23,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json",  # noqa: E501
+        "state_tests/stStaticCall/static_log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_log0_non_empty_mem_log_mem_size1_log_mem_start31(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_log0_non_empty_mem_log_mem_size1_log_mem_start31."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,49 +46,45 @@ def test_static_log0_non_empty_mem_log_mem_size1_log_mem_start31(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG0(offset=0x1F, size=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 31 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG0(offset=0x1F, size=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x897fee72afb437be678ee00c486726da08adb887"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (STATICCALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x3E8,
-                    address=0x897FEE72AFB437BE678EE00C486726DA08ADB887,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x3E8,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe230b8d7763e30ca988447daa182146b0bea3764"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_log1_empty_mem.py b/tests/ported_static/stStaticCall/test_static_log1_empty_mem.py
index 095cf7e139e..ab6c4284320 100644
--- a/tests/ported_static/stStaticCall/test_static_log1_empty_mem.py
+++ b/tests/ported_static/stStaticCall/test_static_log1_empty_mem.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_log1_empty_mem.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_log1_emptyMemFiller.json
+state_tests/stStaticCall/static_log1_emptyMemFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_log1_emptyMemFiller.json"],
+    ["state_tests/stStaticCall/static_log1_emptyMemFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_log1_empty_mem(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_log1_empty_mem."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,42 +44,40 @@ def test_static_log1_empty_mem(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # { (LOG1 0 0 0) }
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.LOG1(offset=0x0, size=0x0, topic_1=0x0) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa86cbc14a38774a22b21cc067ff70dd74cc18e7f"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (STATICCALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x3E8,
-                    address=0xA86CBC14A38774A22B21CC067FF70DD74CC18E7F,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x3E8,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe230b8d7763e30ca988447daa182146b0bea3764"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_log1_log_mem_start_too_high.py b/tests/ported_static/stStaticCall/test_static_log1_log_mem_start_too_high.py
index 40a2734993e..bf18441054a 100644
--- a/tests/ported_static/stStaticCall/test_static_log1_log_mem_start_too_high.py
+++ b/tests/ported_static/stStaticCall/test_static_log1_log_mem_start_too_high.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_log1_log_mem_start_too_high.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_log1_logMemStartTooHighFiller.json
+state_tests/stStaticCall/static_log1_logMemStartTooHighFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_log1_logMemStartTooHighFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_log1_logMemStartTooHighFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_log1_log_mem_start_too_high(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_log1_log_mem_start_too_high."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,53 +44,49 @@ def test_static_log1_log_mem_start_too_high(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG1(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=0x1,
-                topic_1=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG1(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=0x1,
+            topic_1=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2884bd4a36d3bf28249c493eefc971380a638684"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (STATICCALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x3E8,
-                    address=0x2884BD4A36D3BF28249C493EEFC971380A638684,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x3E8,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe230b8d7763e30ca988447daa182146b0bea3764"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_log1_log_memsize_too_high.py b/tests/ported_static/stStaticCall/test_static_log1_log_memsize_too_high.py
index 0f46f4f19f9..50f52419d3f 100644
--- a/tests/ported_static/stStaticCall/test_static_log1_log_memsize_too_high.py
+++ b/tests/ported_static/stStaticCall/test_static_log1_log_memsize_too_high.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_log1_log_memsize_too_high.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_log1_logMemsizeTooHighFiller.json
+state_tests/stStaticCall/static_log1_logMemsizeTooHighFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_log1_logMemsizeTooHighFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_log1_logMemsizeTooHighFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_log1_log_memsize_too_high(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_log1_log_memsize_too_high."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,53 +44,49 @@ def test_static_log1_log_memsize_too_high(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG1(
-                offset=0x1,
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                topic_1=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG1(
+            offset=0x1,
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            topic_1=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x232172c10fc2b2cb5ccbc4349b5d177eb640edc0"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (STATICCALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x3E8,
-                    address=0x232172C10FC2B2CB5CCBC4349B5D177EB640EDC0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x3E8,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe230b8d7763e30ca988447daa182146b0bea3764"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_log1_log_memsize_zero.py b/tests/ported_static/stStaticCall/test_static_log1_log_memsize_zero.py
index f190e353742..cfefd6fb414 100644
--- a/tests/ported_static/stStaticCall/test_static_log1_log_memsize_zero.py
+++ b/tests/ported_static/stStaticCall/test_static_log1_log_memsize_zero.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_log1_log_memsize_zero.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_log1_logMemsizeZeroFiller.json
+state_tests/stStaticCall/static_log1_logMemsizeZeroFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_log1_logMemsizeZeroFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_log1_logMemsizeZeroFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_log1_log_memsize_zero(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_log1_log_memsize_zero."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,49 +44,45 @@ def test_static_log1_log_memsize_zero(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG1(offset=0x1, size=0x0, topic_1=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 1 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG1(offset=0x1, size=0x0, topic_1=0x0)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc1f290174e61d4f7f40c5e11677591c31e0f63c7"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (STATICCALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x3E8,
-                    address=0xC1F290174E61D4F7F40C5E11677591C31E0F63C7,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x3E8,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe230b8d7763e30ca988447daa182146b0bea3764"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_log1_max_topic.py b/tests/ported_static/stStaticCall/test_static_log1_max_topic.py
index 76da3f4127c..0185bb60bc8 100644
--- a/tests/ported_static/stStaticCall/test_static_log1_max_topic.py
+++ b/tests/ported_static/stStaticCall/test_static_log1_max_topic.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_log1_max_topic.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_log1_MaxTopicFiller.json
+state_tests/stStaticCall/static_log1_MaxTopicFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_log1_MaxTopicFiller.json"],
+    ["state_tests/stStaticCall/static_log1_MaxTopicFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_log1_max_topic(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_log1_max_topic."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,53 +44,49 @@ def test_static_log1_max_topic(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { [[ 0 ]] (STATICCALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x3E8,
-                    address=0xFAA3ACCE157A3DEDD9D750DD925F6067D252752E,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 0 32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG1(
+            offset=0x0,
+            size=0x20,
+            topic_1=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe230b8d7763e30ca988447daa182146b0bea3764"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
-            )
-            + Op.LOG1(
-                offset=0x0,
-                size=0x20,
-                topic_1=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (STATICCALL 1000 <contract:0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6> 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x3E8,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfaa3acce157a3dedd9d750dd925f6067d252752e"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=210000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_log_caller.py b/tests/ported_static/stStaticCall/test_static_log_caller.py
index 500dfb5f69e..067833c80d1 100644
--- a/tests/ported_static/stStaticCall/test_static_log_caller.py
+++ b/tests/ported_static/stStaticCall/test_static_log_caller.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_static_log_caller.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_log_CallerFiller.json
+state_tests/stStaticCall/static_log_CallerFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,48 +23,57 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_log_CallerFiller.json"],
+    ["state_tests/stStaticCall/static_log_CallerFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "000000000000000000000000c725abae869e29a5448dca5b51a58f0c960d4069",
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000842936958d62030200fbcef4371460d8a9400d05",
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "000000000000000000000000861cccbd560d81a33aac05190e986540663c6bba",
-            {},
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "0000000000000000000000006c5da6457f756a77c392c72fe884f7f650428aef",
-            {},
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
-        (
-            "000000000000000000000000586cfaa42db8b743452a87549943ac07a09de5cc",
-            {},
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3", "case4"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_log_caller(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_static_log_caller."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -74,102 +84,103 @@ def test_static_log_caller(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xFF)
-            + Op.LOG4(
-                offset=0x0,
-                size=0x20,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=0x0,
-                topic_4=Op.CALLER,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (STATICCALL 50000 (CALLDATALOAD 0) 0 0 0 0) }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xC350,
+                address=Op.CALLDATALOAD(offset=0x0),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x586cfaa42db8b743452a87549943ac07a09de5cc"),  # noqa: E501
+        address=Address(0xD8C1FCDB2990F08E5FE821BF5AF85F34201BA79A),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xFF)
-            + Op.LOG3(
-                offset=0x0,
-                size=0x20,
-                topic_1=0x0,
-                topic_2=0x0,
-                topic_3=Op.CALLER,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE8 0 0xff) (LOG0 0 32 ) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xFF)
+        + Op.LOG0(offset=0x0, size=0x20)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6c5da6457f756a77c392c72fe884f7f650428aef"),  # noqa: E501
+        address=Address(0xC725ABAE869E29A5448DCA5B51A58F0C960D4069),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xFF)
-            + Op.LOG1(offset=0x0, size=0x20, topic_1=Op.CALLER)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE8 0 0xff) (LOG1 0 32 (CALLER) ) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xFF)
+        + Op.LOG1(offset=0x0, size=0x20, topic_1=Op.CALLER)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x842936958d62030200fbcef4371460d8a9400d05"),  # noqa: E501
+        address=Address(0x842936958D62030200FBCEF4371460D8A9400D05),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xFF)
-            + Op.LOG2(offset=0x0, size=0x20, topic_1=0x0, topic_2=Op.CALLER)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE8 0 0xff) (LOG2 0 32 0 (CALLER) ) }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xFF)
+        + Op.LOG2(offset=0x0, size=0x20, topic_1=0x0, topic_2=Op.CALLER)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x861cccbd560d81a33aac05190e986540663c6bba"),  # noqa: E501
+        address=Address(0x861CCCBD560D81A33AAC05190E986540663C6BBA),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xFF)
-            + Op.LOG0(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE8 0 0xff) (LOG3 0 32 0 0 (CALLER) ) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xFF)
+        + Op.LOG3(
+            offset=0x0, size=0x20, topic_1=0x0, topic_2=0x0, topic_3=Op.CALLER
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc725abae869e29a5448dca5b51a58f0c960d4069"),  # noqa: E501
+        address=Address(0x6C5DA6457F756A77C392C72FE884F7F650428AEF),  # noqa: E501
     )
-    # Source: LLL
-    # { [[ 0 ]] (STATICCALL 50000 (CALLDATALOAD 0) 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xC350,
-                    address=Op.CALLDATALOAD(offset=0x0),
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE8 0 0xff) (LOG4 0 32 0 0 0 (CALLER) )}
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xFF)
+        + Op.LOG4(
+            offset=0x0,
+            size=0x20,
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+            topic_4=Op.CALLER,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd8c1fcdb2990f08e5fe821bf5af85f34201ba79a"),  # noqa: E501
+        address=Address(0x586CFAA42DB8B743452A87549943AC07A09DE5CC),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(addr, left_padding=True),
+        Hash(addr_2, left_padding=True),
+        Hash(addr_3, left_padding=True),
+        Hash(addr_4, left_padding=True),
+        Hash(addr_5, left_padding=True),
+    ]
+    tx_gas = [210000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=210000,
-        value=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {target: Account(storage={0: 0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_loop_calls_depth_then_revert.py b/tests/ported_static/stStaticCall/test_static_loop_calls_depth_then_revert.py
index 6d9f62967de..85426836d66 100644
--- a/tests/ported_static/stStaticCall/test_static_loop_calls_depth_then_revert.py
+++ b/tests/ported_static/stStaticCall/test_static_loop_calls_depth_then_revert.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_loop_calls_depth_then_revert.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_LoopCallsDepthThenRevertFiller.json
+state_tests/stStaticCall/static_LoopCallsDepthThenRevertFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_LoopCallsDepthThenRevertFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_LoopCallsDepthThenRevertFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_loop_calls_depth_then_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_static_loop_calls_depth_then_revert."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,68 +44,64 @@ def test_static_loop_calls_depth_then_revert(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (CALL ( - (GAS) 100000) <contract:target:0x1000000000000000000000000000000000000000> 0 0 0 0 0) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x186A0),
-                    address=0x15DC6AD6AA4B45C8C5F8658596F0BE95F4FB77FD,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x15dc6ad6aa4b45c8c5f8658596f0be95f4fb77fd"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=Op.GAS,
-                address=0x8AC26AD64561031BE35E49C24EE18C6E43C21795,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x186A0),
+                address=0x15DC6AD6AA4B45C8C5F8658596F0BE95F4FB77FD,
+                value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x77c35f69d9f67cc9c06c803eb2c0aca9c2a746e6"),  # noqa: E501
+        address=Address(0x15DC6AD6AA4B45C8C5F8658596F0BE95F4FB77FD),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.STATICCALL(
-                gas=Op.GAS,
-                address=0x77C35F69D9F67CC9C06C803EB2C0ACA9C2A746E6,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (STATICCALL (GAS) <contract:0xb000000000000000000000000000000000000000> 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=Op.GAS,
+            address=0x8AC26AD64561031BE35E49C24EE18C6E43C21795,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        nonce=0,
+        address=Address(0x77C35F69D9F67CC9C06C803EB2C0ACA9C2A746E6),  # noqa: E501
+    )
+    # Source: lll
+    # { (STATICCALL (GAS) <contract:0xa000000000000000000000000000000000000000> 0 0 0 0)  }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.STATICCALL(
+            gas=Op.GAS,
+            address=0x77C35F69D9F67CC9C06C803EB2C0ACA9C2A746E6,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8ac26ad64561031be35e49c24ee18c6e43c21795"),  # noqa: E501
+        address=Address(0x8AC26AD64561031BE35E49C24EE18C6E43C21795),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_loop_calls_depth_then_revert2.py b/tests/ported_static/stStaticCall/test_static_loop_calls_depth_then_revert2.py
index 3d5613a2a41..56b5378b9e9 100644
--- a/tests/ported_static/stStaticCall/test_static_loop_calls_depth_then_revert2.py
+++ b/tests/ported_static/stStaticCall/test_static_loop_calls_depth_then_revert2.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_static_loop_calls_depth_then_revert2.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_LoopCallsDepthThenRevert2Filler.json
+state_tests/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -23,23 +23,20 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_loop_calls_depth_then_revert2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_loop_calls_depth_then_revert2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xA000000000000000000000000000000000000000)
+    sender = pre.fund_eoa(amount=0x13426172C74D822B878FE800000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -50,44 +47,44 @@ def test_static_loop_calls_depth_then_revert2(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x3D,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x3FF),
-            )
-            + Op.MSTORE(
-                offset=0x0, value=Op.ADD(Op.CALLDATALOAD(offset=0x0), 0x1)
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0xA000000000000000000000000000000000000000,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: raw
+    # 0x6103ff60003514603d57600160003501600052600060006020600073a0000000000000000000000000000000000000005afa5061041a600051106051575b66600060006002f0600052600760196003f0505b  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x3D, condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x3FF)
+        )
+        + Op.MSTORE(offset=0x0, value=Op.ADD(Op.CALLDATALOAD(offset=0x0), 0x1))
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=0xA000000000000000000000000000000000000000,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.JUMPI(pc=0x51, condition=Op.LT(Op.MLOAD(offset=0x0), 0x41A))
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=0x600060006002F0)
-            + Op.POP(Op.CREATE(value=0x3, offset=0x19, size=0x7))
-            + Op.JUMPDEST
-        ),
+        )
+        + Op.JUMPI(pc=0x51, condition=Op.LT(Op.MLOAD(offset=0x0), 0x41A))
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=0x600060006002F0)
+        + Op.POP(Op.CREATE(value=0x3, offset=0x19, size=0x7))
+        + Op.JUMPDEST,
         balance=10,
         nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x13426172C74D822B878FE800000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=9214364837600034817,
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_loop_calls_depth_then_revert3.py b/tests/ported_static/stStaticCall/test_static_loop_calls_depth_then_revert3.py
index 706ed4587c8..8efe302527e 100644
--- a/tests/ported_static/stStaticCall/test_static_loop_calls_depth_then_revert3.py
+++ b/tests/ported_static/stStaticCall/test_static_loop_calls_depth_then_revert3.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_static_loop_calls_depth_then_revert3.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_LoopCallsDepthThenRevert3Filler.json
+state_tests/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -23,23 +23,20 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_loop_calls_depth_then_revert3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_loop_calls_depth_then_revert3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xA000000000000000000000000000000000000000)
+    sender = pre.fund_eoa(amount=0x13426172C74D822B878FE800000000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -50,47 +47,50 @@ def test_static_loop_calls_depth_then_revert3(
         gas_limit=9223372036854775807,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x3D,
-                condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x3FE),
-            )
-            + Op.MSTORE(
-                offset=0x0, value=Op.ADD(Op.CALLDATALOAD(offset=0x0), 0x1)
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0xA000000000000000000000000000000000000000,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(
-                pc=0x51,
-                condition=Op.LT(Op.CALLDATALOAD(offset=0x0), 0x41A),
+    # Source: raw
+    # 0x6103fe60003514603d57600160003501600052600060006020600073a0000000000000000000000000000000000000005afa5061041a600035106051575b66600060006002f0600052600760196003f0505b  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x3D, condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x3FE)
+        )
+        + Op.MSTORE(offset=0x0, value=Op.ADD(Op.CALLDATALOAD(offset=0x0), 0x1))
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=0xA000000000000000000000000000000000000000,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=0x600060006002F0)
-            + Op.POP(Op.CREATE(value=0x3, offset=0x19, size=0x7))
-            + Op.JUMPDEST
-        ),
+        )
+        + Op.JUMPI(
+            pc=0x51, condition=Op.LT(Op.CALLDATALOAD(offset=0x0), 0x41A)
+        )
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=0x600060006002F0)
+        + Op.POP(Op.CREATE(value=0x3, offset=0x19, size=0x7))
+        + Op.JUMPDEST,
         balance=10,
         nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x13426172C74D822B878FE800000000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=9214364837600034817,
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
+        compute_create_address(
+            address=compute_create_address(address=contract_0, nonce=0),
+            nonce=1,
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_loop_calls_then_revert.py b/tests/ported_static/stStaticCall/test_static_loop_calls_then_revert.py
index 4df5965a672..32fdd9495db 100644
--- a/tests/ported_static/stStaticCall/test_static_loop_calls_then_revert.py
+++ b/tests/ported_static/stStaticCall/test_static_loop_calls_then_revert.py
@@ -2,19 +2,23 @@
 Requires a separate pre-alloc group due to time required to fill when...
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_LoopCallsThenRevertFiller.json
+state_tests/stStaticCall/static_LoopCallsThenRevertFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,52 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_LoopCallsThenRevertFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_LoopCallsThenRevertFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            10000000,
-            {
-                Address("0x7a2af5cc0310371cce006e472ed3b5d68e62f839"): Account(
-                    storage={0: 850}
-                ),
-                Address("0xd64495cbba16d27a88b96f2a72417b957ed4cae6"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
         ),
-        (
-            9000000,
-            {
-                Address("0x7a2af5cc0310371cce006e472ed3b5d68e62f839"): Account(
-                    storage={0: 850}
-                ),
-                Address("0xd64495cbba16d27a88b96f2a72417b957ed4cae6"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_loop_calls_then_revert(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
     """Requires a separate pre-alloc group due to time required to fill..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -78,67 +69,79 @@ def test_static_loop_calls_then_revert(
         gas_limit=100000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 (ADD 1 (MLOAD 0))) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.ADD(0x1, Op.MLOAD(offset=0x0)))
+        + Op.STOP,
         nonce=0,
-        address=Address("0x59c89b27361fd637262b13489f28923c835e17b2"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.MSTORE(
-                offset=0x0, value=Op.SUB(Op.CALLDATALOAD(offset=0x0), 0x1)
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x59C89B27361FD637262B13489F28923C835E17B2,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: raw
+    # 0x5b600160003503600052600060006000600073<contract:0xb000000000000000000000000000000000000000>61c350fa50600051600057  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.SUB(Op.CALLDATALOAD(offset=0x0), 0x1))
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.JUMPI(pc=0x0, condition=Op.MLOAD(offset=0x0))
-        ),
-        storage={0x0: 0x352},
+        )
+        + Op.JUMPI(pc=0x0, condition=Op.MLOAD(offset=0x0)),
+        storage={0: 850},
         nonce=0,
-        address=Address("0x7a2af5cc0310371cce006e472ed3b5d68e62f839"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 850) [[ 0 ]] (CALL (- (GAS) 10000) <contract:0xa000000000000000000000000000000000000000> 0 0 32 0 0) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x352)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2710),
-                    address=0x7A2AF5CC0310371CCE006E472ED3B5D68E62F839,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x352)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2710),
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xd64495cbba16d27a88b96f2a72417b957ed4cae6"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={1: 1})},
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={1: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [10000000, 9000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_make_money.py b/tests/ported_static/stStaticCall/test_static_make_money.py
index ac88424043f..add8a413112 100644
--- a/tests/ported_static/stStaticCall/test_static_make_money.py
+++ b/tests/ported_static/stStaticCall/test_static_make_money.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_make_money.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_makeMoneyFiller.json
+state_tests/stStaticCall/static_makeMoneyFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_makeMoneyFiller.json"],
+    ["state_tests/stStaticCall/static_makeMoneyFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_make_money(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA2333EEF5630066B928DEA5FD85A239F511B5B067D1441EE7AC290D0122B917B
-    )
+    """Test_static_make_money."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,46 +44,46 @@ def test_static_make_money(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { (MSTORE 0 0x601080600c6000396000f20060003554156009570060203560003555) (STATICCALL 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffec <contract:0xaaaaaaaaace5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x601080600C6000396000F20060003554156009570060203560003555,  # noqa: E501
-            )
-            + Op.STATICCALL(
-                gas=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEC,  # noqa: E501
-                address=0x802EDCCF6CDE9162A05FD89CDFCD8DC4A230B978,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: raw
+    # 0x600160015532600255
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.SSTORE(key=0x2, value=Op.ORIGIN),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x52ba5aa5c6b8214da66b53c9774f587f3ee4dbd0"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1) + Op.SSTORE(key=0x2, value=Op.ORIGIN)
-        ),
+    # Source: lll
+    # { (MSTORE 0 0x601080600c6000396000f20060003554156009570060203560003555) (STATICCALL 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffec <contract:0xaaaaaaaaace5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x601080600C6000396000F20060003554156009570060203560003555,
+        )
+        + Op.STATICCALL(
+            gas=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEC,  # noqa: E501
+            address=addr,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x802edccf6cde9162a05fd89cdfcd8dc4a230b978"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=228500,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(balance=0xDE0B6B3A764000A),
+        sender: Account(balance=0x5D38038),
+        addr: Account(balance=0xDE0B6B3A7640000),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_post_to_return1.py b/tests/ported_static/stStaticCall/test_static_post_to_return1.py
index 529134c73d8..c17835dc32d 100644
--- a/tests/ported_static/stStaticCall/test_static_post_to_return1.py
+++ b/tests/ported_static/stStaticCall/test_static_post_to_return1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_static_post_to_return1.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_PostToReturn1Filler.json
+state_tests/stStaticCall/static_PostToReturn1Filler.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,17 +23,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_PostToReturn1Filler.json"],
+    ["state_tests/stStaticCall/static_PostToReturn1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_post_to_return1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_post_to_return1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -46,57 +47,55 @@ def test_static_post_to_return1(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[1]](STATICCALL 30000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 0 ) [[2]] (MLOAD 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x7530,
-                    address=0xD5D9E9E0158920B17B6DF82FAC474B3E2691EE99,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x603760005360026000f3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2),
+        balance=23,
         nonce=0,
-        address=Address("0x89478090b7c5e4389217f9728ef82cc3535cc1db"),  # noqa: E501
+        address=Address(0xD5D9E9E0158920B17B6DF82FAC474B3E2691EE99),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-        ),
-        balance=23,
+    # Source: lll
+    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[1]](STATICCALL 30000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 0 ) [[2]] (MLOAD 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x7530,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd5d9e9e0158920b17b6df82fac474b3e2691ee99"),  # noqa: E501
+        address=Address(0x89478090B7C5E4389217F9728EF82CC3535CC1DB),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 1: 1,
                 2: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
diff --git a/tests/ported_static/stStaticCall/test_static_raw_call_gas_ask.py b/tests/ported_static/stStaticCall/test_static_raw_call_gas_ask.py
index 423949cae66..0ea735ae867 100644
--- a/tests/ported_static/stStaticCall/test_static_raw_call_gas_ask.py
+++ b/tests/ported_static/stStaticCall/test_static_raw_call_gas_ask.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_raw_call_gas_ask.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_RawCallGasAskFiller.json
+state_tests/stStaticCall/static_RawCallGasAskFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,60 +26,57 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_RawCallGasAskFiller.json"],
+    ["state_tests/stStaticCall/static_RawCallGasAskFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000001000000000000000000000000000000000000001",
-            {
-                Address("0x1000000000000000000000000000000000000001"): Account(
-                    storage={1: 0xE9F83}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000002000000000000000000000000000000000000001",
-            {
-                Address("0x2000000000000000000000000000000000000001"): Account(
-                    storage={1: 0xE9F83}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "0000000000000000000000003000000000000000000000000000000000000001",
-            {
-                Address("0x3000000000000000000000000000000000000001"): Account(
-                    storage={1: 0xE9C1B}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "0000000000000000000000004000000000000000000000000000000000000001",
-            {
-                Address("0x4000000000000000000000000000000000000001"): Account(
-                    storage={1: 0xE9C1B}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_raw_call_gas_ask(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_raw_call_gas_ask."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x094F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0x1000000000000000000000000000000000000000)
+    contract_2 = Address(0x1000000000000000000000000000000000000001)
+    contract_3 = Address(0x2000000000000000000000000000000000000001)
+    contract_4 = Address(0x3000000000000000000000000000000000000001)
+    contract_5 = Address(0x4000000000000000000000000000000000000001)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -86,123 +87,142 @@ def test_static_raw_call_gas_ask(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 (GAS)) }
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x0, value=Op.GAS) + Op.STOP,
         nonce=0,
-        address=Address("0x094f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0x094F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (CALL (GAS) (CALLDATALOAD 0) 0 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=Op.GAS,
-                address=Op.CALLDATALOAD(offset=0x0),
-                value=0x0,
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=Op.GAS,
+            address=Op.CALLDATALOAD(offset=0x0),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xE8D4A51000,
+        nonce=0,
+        address=Address(0x1000000000000000000000000000000000000000),  # noqa: E501
+    )
+    # Source: lll
+    # { (STATICCALL 130000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[1]] (GAS) }  # noqa: E501
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x1FBD0,
+                address=0x94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
             )
-            + Op.STOP
-        ),
-        balance=0xE8D4A51000,
-        nonce=0,
-        address=Address("0x1000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  (STATICCALL 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[1]] (GAS) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x2DC6C0,
-                    address=0x94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x1000000000000000000000000000000000000001"),  # noqa: E501
+        address=Address(0x2000000000000000000000000000000000000001),  # noqa: E501
     )
-    # Source: LLL
-    # { (STATICCALL 130000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[1]] (GAS) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x1FBD0,
-                    address=0x94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # { (STATICCALL 130000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 8000 0 8000) [[1]] (GAS) }  # noqa: E501
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x1FBD0,
+                address=0x94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                args_offset=0x0,
+                args_size=0x1F40,
+                ret_offset=0x0,
+                ret_size=0x1F40,
             )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2000000000000000000000000000000000000001"),  # noqa: E501
+        address=Address(0x4000000000000000000000000000000000000001),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (STATICCALL 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 8000 0 8000) [[1]] (GAS) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x2DC6C0,
-                    address=0x94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    args_offset=0x0,
-                    args_size=0x1F40,
-                    ret_offset=0x0,
-                    ret_size=0x1F40,
-                ),
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x2DC6C0,
+                address=0x94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                args_offset=0x0,
+                args_size=0x1F40,
+                ret_offset=0x0,
+                ret_size=0x1F40,
             )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3000000000000000000000000000000000000001"),  # noqa: E501
+        address=Address(0x3000000000000000000000000000000000000001),  # noqa: E501
     )
-    # Source: LLL
-    # { (STATICCALL 130000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 8000 0 8000) [[1]] (GAS) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x1FBD0,
-                    address=0x94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    args_offset=0x0,
-                    args_size=0x1F40,
-                    ret_offset=0x0,
-                    ret_size=0x1F40,
-                ),
+    # Source: lll
+    # {  (STATICCALL 3000000 0x094f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[1]] (GAS) }  # noqa: E501
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x2DC6C0,
+                address=0x94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x1, value=Op.GAS)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x4000000000000000000000000000000000000001"),  # noqa: E501
+        address=Address(0x1000000000000000000000000000000000000001),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={1: 0xE9F83})},
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={1: 0xE9F83})},
+        },
+        {
+            "indexes": {"data": 2, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_4: Account(storage={1: 0xE9C1B})},
+        },
+        {
+            "indexes": {"data": 3, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_5: Account(storage={1: 0xE9C1B})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(contract_2, left_padding=True),
+        Hash(contract_3, left_padding=True),
+        Hash(contract_4, left_padding=True),
+        Hash(contract_5, left_padding=True),
+    ]
+    tx_gas = [1000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=1000000,
+        to=contract_1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_refund_call_a.py b/tests/ported_static/stStaticCall/test_static_refund_call_a.py
index f0187c7d413..7b9e3701b24 100644
--- a/tests/ported_static/stStaticCall/test_static_refund_call_a.py
+++ b/tests/ported_static/stStaticCall/test_static_refund_call_a.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_refund_call_a.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_refund_CallAFiller.json
+state_tests/stStaticCall/static_refund_CallAFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_refund_CallAFiller.json"],
+    ["state_tests/stStaticCall/static_refund_CallAFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_refund_call_a(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xD28CE7E8C6CA72F9B2DD5AA5C41F48198119E86E443C50DE70F3FBA602247FE8
-    )
+    """Test_static_refund_call_a."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xBEBC200)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,48 +44,46 @@ def test_static_refund_call_a(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xBEBC200)
-    # Source: LLL
-    # { [[ 0 ]] (STATICCALL 5500 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 ) [[ 1 ]] 1}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x157C,
-                    address=0xF4C9FC42FAEDA49049E3B8E2B97A17CC2FE95718,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    # Source: lll
+    # { [[ 1 ]] 0 }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd15bdaf597badaa25173c995d18f65d1b514a062"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x0) + Op.STOP,
-        storage={0x1: 0x1},
+    # Source: lll
+    # { [[ 0 ]] (STATICCALL 5500 <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 ) [[ 1 ]] 1}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x157C,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf4c9fc42faeda49049e3b8e2b97a17cc2fe95718"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=200000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={1: 1}),
-        callee: Account(storage={1: 1}),
+        target: Account(storage={0: 0, 1: 1}, balance=0xDE0B6B3A764000A),
+        addr: Account(storage={1: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_refund_call_to_suicide_no_storage.py b/tests/ported_static/stStaticCall/test_static_refund_call_to_suicide_no_storage.py
index a751638a0e2..80a792c152b 100644
--- a/tests/ported_static/stStaticCall/test_static_refund_call_to_suicide_no_storage.py
+++ b/tests/ported_static/stStaticCall/test_static_refund_call_to_suicide_no_storage.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_static_refund_call_to_suicide_no_storage.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_refund_CallToSuicideNoStorageFiller.json
+state_tests/stStaticCall/static_refund_CallToSuicideNoStorageFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,45 +24,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/static_refund_CallToSuicideNoStorageFiller.json",  # noqa: E501
+        "state_tests/stStaticCall/static_refund_CallToSuicideNoStorageFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "00000000000000000000000000000000000000000000000000000000000001f4",
-            {
-                Address("0xa2a10d67c0f0864b703d90d9c36296ad8a547ae6"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000010000",
-            {
-                Address("0xa2a10d67c0f0864b703d90d9c36296ad8a547ae6"): Account(
-                    storage={1: 1, 2: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_refund_call_to_suicide_no_storage(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x6F0117D3E9C684C7D6E1E6B79DC3880DA2BEBE77C765B171C062FDFFD38A673F
-    )
+    """Test_static_refund_call_to_suicide_no_storage."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x2540BE400)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -73,50 +68,59 @@ def test_static_refund_call_to_suicide_no_storage(
         gas_limit=1000000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xA2A10D67C0F0864B703D90D9C36296AD8A547AE6)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (STATICCALL (CALLDATALOAD 0) <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 ) [[ 2 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=Op.CALLDATALOAD(offset=0x0),
+                address=0x4FF65047CE9C85F968689E4369C10003026A41A9,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x4ff65047ce9c85f968689e4369c10003026a41a9"),  # noqa: E501
+        address=Address(0xA2A10D67C0F0864B703D90D9C36296AD8A547AE6),  # noqa: E501
     )
-    # Source: LLL
-    # { [[ 0 ]] (STATICCALL (CALLDATALOAD 0) <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 ) [[ 2 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=Op.CALLDATALOAD(offset=0x0),
-                    address=0x4FF65047CE9C85F968689E4369C10003026A41A9,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xA2A10D67C0F0864B703D90D9C36296AD8A547AE6
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa2a10d67c0f0864b703d90d9c36296ad8a547ae6"),  # noqa: E501
+        address=Address(0x4FF65047CE9C85F968689E4369C10003026A41A9),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x2540BE400)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(0x1F4),
+        Hash(0x10000),
+    ]
+    tx_gas = [10000000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=10000000,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        target: Account(
+            storage={0: 0, 1: 1, 2: 1},
+            balance=0xDE0B6B3A764000A,
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_refund_call_to_suicide_twice.py b/tests/ported_static/stStaticCall/test_static_refund_call_to_suicide_twice.py
index ec3b5284a64..6860878412f 100644
--- a/tests/ported_static/stStaticCall/test_static_refund_call_to_suicide_twice.py
+++ b/tests/ported_static/stStaticCall/test_static_refund_call_to_suicide_twice.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_static_refund_call_to_suicide_twice.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_refund_CallToSuicideTwiceFiller.json
+state_tests/stStaticCall/static_refund_CallToSuicideTwiceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,52 +26,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_refund_CallToSuicideTwiceFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_refund_CallToSuicideTwiceFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "00000000000000000000000000000000000000000000000000000000000001f4",
-            {
-                Address("0x75db2708826b7d5e8cd45002f9ae23c830c31efd"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x9dea1ad5123f3d8b91cfc830b1c602597883e97c"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000010000",
-            {
-                Address("0x75db2708826b7d5e8cd45002f9ae23c830c31efd"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x9dea1ad5123f3d8b91cfc830b1c602597883e97c"): Account(
-                    storage={1: 1}
-                ),
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_refund_call_to_suicide_twice(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x5B7B8EFB6D003CD481E408D8759A25ADC79955092F1A380D8F8B57346C1D1342
-    )
+    """Test_static_refund_call_to_suicide_twice."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x174876E800)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -79,59 +69,94 @@ def test_static_refund_call_to_suicide_twice(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (STATICCALL (CALLDATALOAD 0) <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 ) (CALL (CALLDATALOAD 0) <contract:0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa> 0 0 0 0 0 )}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=Op.CALLDATALOAD(offset=0x0),
-                    address=0x9DEA1AD5123F3D8B91CFC830B1C602597883E97C,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.CALL(
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
                 gas=Op.CALLDATALOAD(offset=0x0),
                 address=0x9DEA1AD5123F3D8B91CFC830B1C602597883E97C,
-                value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+            ),
+        )
+        + Op.CALL(
+            gas=Op.CALLDATALOAD(offset=0x0),
+            address=0x9DEA1AD5123F3D8B91CFC830B1C602597883E97C,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x75db2708826b7d5e8cd45002f9ae23c830c31efd"),  # noqa: E501
+        address=Address(0x75DB2708826B7D5E8CD45002F9AE23C830C31EFD),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x75DB2708826B7D5E8CD45002F9AE23C830C31EFD)
-            + Op.STOP
-        ),
-        storage={0x1: 0x1},
+    # Source: lll
+    # { (SELFDESTRUCT <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87>) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x75DB2708826B7D5E8CD45002F9AE23C830C31EFD
+        )
+        + Op.STOP,
+        storage={1: 1},
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9dea1ad5123f3d8b91cfc830b1c602597883e97c"),  # noqa: E501
+        address=Address(0x9DEA1AD5123F3D8B91CFC830B1C602597883E97C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x174876E800)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={0: 0, 1: 1}, balance=0x1BC16D674EC8000A
+                ),
+                addr: Account(
+                    storage={1: 1},
+                    code=bytes.fromhex(
+                        "7375db2708826b7d5e8cd45002f9ae23c830c31efdff00"
+                    ),
+                    balance=0,
+                    nonce=0,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={0: 0, 1: 1}, balance=0xDE0B6B3A764000A
+                ),
+                addr: Account(nonce=0),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0x1F4),
+        Hash(0x10000),
+    ]
+    tx_gas = [10000000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=10000000,
-        value=10,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_return50000_2.py b/tests/ported_static/stStaticCall/test_static_return50000_2.py
index eb51554918f..fbcec0e7291 100644
--- a/tests/ported_static/stStaticCall/test_static_return50000_2.py
+++ b/tests/ported_static/stStaticCall/test_static_return50000_2.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_return50000_2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_Return50000_2Filler.json
+state_tests/stStaticCall/static_Return50000_2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_Return50000_2Filler.json"],
+    ["state_tests/stStaticCall/static_Return50000_2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_return50000_2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
+    """Test_static_return50000_2."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,79 +44,77 @@ def test_static_return50000_2(
         gas_limit=89250000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0xC34F))
-            + Op.RETURN(offset=Op.MLOAD(offset=0x0), size=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (MSTORE 0 (CALLDATALOAD 49999)) (RETURN (MLOAD 0) 1) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0xC34F))
+        + Op.RETURN(offset=Op.MLOAD(offset=0x0), size=0x1)
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0x0d08fb89197bd8f97c770ed75e28ed610a3016e9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    # Source: LLL
-    # { [[ 0 ]] (CALL (GAS) <contract:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[ 1 ]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDF43BBA207127B641624B20497FA07055F4A3939,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (STATICCALL 1564 <contract:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 50000 0 0) ) [[ 1 ]] @i }  # noqa: E501
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x3D, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0x61C,
+                address=addr,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0x9a8ca98b299a0220faad60948d01ce83ccc97831"),  # noqa: E501
     )
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x3D,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xC350)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0x61C,
-                    address=0xD08FB89197BD8F97C770ED75E28ED610A3016E9,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (CALL (GAS) <contract:0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[ 1 ]] 1 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=addr_2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.STOP,
         balance=0xFFFFFFFFFFFFF,
         nonce=0,
-        address=Address("0xdf43bba207127b641624b20497fa07055f4a3939"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=15500000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
-        callee_1: Account(storage={0: 1, 1: 50000}),
+        target: Account(storage={0: 1, 1: 1}, nonce=0),
+        addr_2: Account(
+            storage={0: 1, 1: 50000},
+            balance=0xFFFFFFFFFFFFF,
+            nonce=0,
+        ),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_return_bounds.py b/tests/ported_static/stStaticCall/test_static_return_bounds.py
index a39ac13ba10..c11d3b559b2 100644
--- a/tests/ported_static/stStaticCall/test_static_return_bounds.py
+++ b/tests/ported_static/stStaticCall/test_static_return_bounds.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_return_bounds.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_RETURN_BoundsFiller.json
+state_tests/stStaticCall/static_RETURN_BoundsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,19 +22,19 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_RETURN_BoundsFiller.json"],
+    ["state_tests/stStaticCall/static_RETURN_BoundsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_return_bounds(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x50EADFB1030587AB3A993A6ECC073041FC3B45E119DAA31A13D78C7E209631A5
+    """Test_static_return_bounds."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
 
     env = Environment(
@@ -46,315 +46,314 @@ def test_static_return_bounds(
         gas_limit=9223372036854775807,
     )
 
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0xFFFFFFF, size=0xFFFFFFF) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0 0) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0x0, size=0x0) + Op.STOP,
         nonce=0,
-        address=Address("0x07084994c5891b1467d74bedb0477da4909e4c0e"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0x0, size=0xFFFFFFFFFFFFFFFF) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0xfffffff 0) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFF, size=0x0) + Op.STOP,
         nonce=0,
-        address=Address("0x0b09ca4308585f026b8d02be147fea0739ec463a"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (RETURN 0xffffffff 0)  }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFFF, size=0x0) + Op.STOP,
         nonce=0,
-        address=Address("0x2548bda95a3831abcd613f4d24e4634615a71cca"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(
-                offset=0x0,
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0xffffffffffffffff 0) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFFFFFFFFFFF, size=0x0) + Op.STOP,
         nonce=0,
-        address=Address("0x28463490948d21efc49949b4d394989bf52c57f1"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0x0, size=0xFFFFFFFF) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0xfffffffffffffffffffffffffff 0) }
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF, size=0x0)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2ceb88d6c420e5c65593d9ebed9a25600ab9e113"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(offset=0xFFFFFFFFFFFFFFFF, size=0xFFFFFFFFFFFFFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0)  }  # noqa: E501
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x416408c1d7fda274ddeb45ffe4817068808121ca"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0 0xfffffff) }
+    addr_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0x0, size=0xFFFFFFF) + Op.STOP,
         nonce=0,
-        address=Address("0x4912bc7b66a3bf27adfa54ab049e90e8c9c4dc63"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0x0, size=0x0) + Op.STOP,
+    # Source: lll
+    # {  (RETURN 0 0xffffffff)  }
+    addr_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0x0, size=0xFFFFFFFF) + Op.STOP,
         nonce=0,
-        address=Address("0x5efbf04d8e1cc5b6b3719b16b5744a09bacfc18b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0x0, size=0xFFFFFFF) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0 0xffffffffffffffff) }
+    addr_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0x0, size=0xFFFFFFFFFFFFFFFF) + Op.STOP,
         nonce=0,
-        address=Address("0x7266f1c07958d55ce36de0592604f1a915bdf1c2"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0 0xfffffffffffffffffffffffffff) }
+    addr_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0x0, size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x76006c948f3a0529479c6d18a6f95908426e8092"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF, size=0x0) + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  }  # noqa: E501
+    addr_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(
+            offset=0x0,
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x7a4461ac9f9cd13f40f9514a7c60e23a71c1dff3"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0xFFFFFFFFFFFFFFFF, size=0x0) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0xfffffff 0xfffffff) }
+    addr_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFF, size=0xFFFFFFF) + Op.STOP,
         nonce=0,
-        address=Address("0x7bbcf24c83493c4e733cb54079b51873d3211ad2"),  # noqa: E501
     )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-    )
-    pre.deploy_contract(
+    # Source: lll
+    # {  (RETURN 0xffffffff 0xffffffff)  }
+    addr_13 = pre.deploy_contract(  # noqa: F841
         code=Op.RETURN(offset=0xFFFFFFFF, size=0xFFFFFFFF) + Op.STOP,
         nonce=0,
-        address=Address("0xad7754a8a56cc5ad4e319fa94194e435628dee67"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0xFFFFFFF, size=0x0) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0xffffffffffffffff 0xffffffffffffffff) }
+    addr_14 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFFFFFFFFFFF, size=0xFFFFFFFFFFFFFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc7aa750fe05c7e38475a49fe98a301024d0c1d54"),  # noqa: E501
     )
-    # Source: LLL
-    # { [[1]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0 0) [[2]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000002> 0 0 0 0) [[3]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000003> 0 0 0 0) [[4]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000004> 0 0 0 0) [[5]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000005> 0 0 0 0) [[6]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[7]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[8]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[9]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[10]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[11]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[12]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[13]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[14]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[15]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[16]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x5EFBF04D8E1CC5B6B3719B16B5744A09BACFC18B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xC7AA750FE05C7E38475A49FE98A301024D0C1D54,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xFF6B6D23BE161344E86EB7B174ACEDD4B1DC6DC7,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x4,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x7BBCF24C83493C4E733CB54079B51873D3211AD2,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x5,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x7A4461AC9F9CD13F40F9514A7C60E23A71C1DFF3,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x6,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x7,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x8,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xA,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xB,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xC,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xD,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xE,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xF,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x10,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0xfffffffffffffffffffffffffff 0xfffffffffffffffffffffffffff) }
+    addr_15 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xdaaed08adba0dd97804c34dd17b55766d54fc392"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(offset=0x0, size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF) + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  }  # noqa: E501
+    addr_16 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf519de4dcb9aaa53f8f0db9b18c715c928caade8"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0xFFFFFFFF, size=0x0) + Op.STOP,
+    # Source: lll
+    # { [[1]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0 0) [[2]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000002> 0 0 0 0) [[3]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000003> 0 0 0 0) [[4]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000004> 0 0 0 0) [[5]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000005> 0 0 0 0) [[6]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[7]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[8]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[9]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[10]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[11]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[12]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[13]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[14]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[15]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[16]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x4,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_4,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x5,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x6,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x7,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x8,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xA,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xB,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xC,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xD,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xE,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xF,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x10,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xff6b6d23be161344e86eb7b174acedd4b1dc6dc7"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=15000000,
         value=1,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 1: 1,
                 2: 1,
@@ -373,6 +372,7 @@ def test_static_return_bounds(
                 15: 1,
                 16: 1,
             },
+            balance=1,
         ),
     }
 
diff --git a/tests/ported_static/stStaticCall/test_static_return_bounds_oog.py b/tests/ported_static/stStaticCall/test_static_return_bounds_oog.py
index bbeac1fac68..f6d2df13154 100644
--- a/tests/ported_static/stStaticCall/test_static_return_bounds_oog.py
+++ b/tests/ported_static/stStaticCall/test_static_return_bounds_oog.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_static_return_bounds_oog.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_RETURN_BoundsOOGFiller.json
+state_tests/stStaticCall/static_RETURN_BoundsOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,55 +26,40 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_RETURN_BoundsOOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_RETURN_BoundsOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        ("00", {}),
-        (
-            "0000000000000000000000000000000000000001",
-            {
-                Address("0x57545d218764bc417fdcbbc2c1f43b2a62105ce1"): Account(
-                    storage={
-                        1: 1,
-                        2: 1,
-                        3: 1,
-                        4: 1,
-                        5: 1,
-                        6: 1,
-                        7: 1,
-                        8: 1,
-                        9: 1,
-                        10: 1,
-                        11: 1,
-                        12: 1,
-                        13: 1,
-                        14: 1,
-                        15: 1,
-                        16: 1,
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_return_bounds_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x50EADFB1030587AB3A993A6ECC073041FC3B45E119DAA31A13D78C7E209631A5
+    """Test_static_return_bounds_oog."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
 
     env = Environment(
@@ -82,324 +71,361 @@ def test_static_return_bounds_oog(
         gas_limit=9223372036854775807,
     )
 
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0xFFFFFFF, size=0xFFFFFFF) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0 0) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0x0, size=0x0) + Op.STOP,
         nonce=0,
-        address=Address("0x07084994c5891b1467d74bedb0477da4909e4c0e"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0x0, size=0xFFFFFFFFFFFFFFFF) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0xfffffff 0) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFF, size=0x0) + Op.STOP,
         nonce=0,
-        address=Address("0x0b09ca4308585f026b8d02be147fea0739ec463a"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (RETURN 0xffffffff 0)  }
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFFF, size=0x0) + Op.STOP,
         nonce=0,
-        address=Address("0x2548bda95a3831abcd613f4d24e4634615a71cca"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(
-                offset=0x0,
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0xffffffffffffffff 0) }
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFFFFFFFFFFF, size=0x0) + Op.STOP,
         nonce=0,
-        address=Address("0x28463490948d21efc49949b4d394989bf52c57f1"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0x0, size=0xFFFFFFFF) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0xfffffffffffffffffffffffffff 0) }
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF, size=0x0)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x2ceb88d6c420e5c65593d9ebed9a25600ab9e113"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(offset=0xFFFFFFFFFFFFFFFF, size=0xFFFFFFFFFFFFFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0)  }  # noqa: E501
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x416408c1d7fda274ddeb45ffe4817068808121ca"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0 0xfffffff) }
+    addr_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0x0, size=0xFFFFFFF) + Op.STOP,
         nonce=0,
-        address=Address("0x4912bc7b66a3bf27adfa54ab049e90e8c9c4dc63"),  # noqa: E501
     )
-    # Source: LLL
-    # { [[1]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0 0) [[2]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000002> 0 0 0 0) [[3]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000003> 0 0 0 0) [[4]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000004> 0 0 0 0) [[5]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000005> 0 0 0 0) [[6]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[7]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[8]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[9]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[10]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[11]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[12]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[13]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[14]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[15]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[16]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) (IF (EQ (CALLDATALOAD 0) 0) (KECCAK256 0x00 0x2fffff) (GAS) ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x5EFBF04D8E1CC5B6B3719B16B5744A09BACFC18B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xC7AA750FE05C7E38475A49FE98A301024D0C1D54,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0xFF6B6D23BE161344E86EB7B174ACEDD4B1DC6DC7,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x4,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x7BBCF24C83493C4E733CB54079B51873D3211AD2,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x5,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x7A4461AC9F9CD13F40F9514A7C60E23A71C1DFF3,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x6,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x7,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x8,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xA,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xB,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xC,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xD,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xE,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0xF,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x10,
-                value=Op.STATICCALL(
-                    gas=0x7FFFFFFFFFFFFFF,
-                    address=0x4912BC7B66A3BF27ADFA54AB049E90E8C9C4DC63,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMPI(
-                pc=0x2AF, condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x0)
-            )
-            + Op.GAS
-            + Op.JUMP(pc=0x2B7)
-            + Op.JUMPDEST
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    # Source: lll
+    # {  (RETURN 0 0xffffffff)  }
+    addr_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0x0, size=0xFFFFFFFF) + Op.STOP,
         nonce=0,
-        address=Address("0x57545d218764bc417fdcbbc2c1f43b2a62105ce1"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0x0, size=0x0) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0 0xffffffffffffffff) }
+    addr_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0x0, size=0xFFFFFFFFFFFFFFFF) + Op.STOP,
         nonce=0,
-        address=Address("0x5efbf04d8e1cc5b6b3719b16b5744a09bacfc18b"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0x0, size=0xFFFFFFF) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0 0xfffffffffffffffffffffffffff) }
+    addr_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0x0, size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x7266f1c07958d55ce36de0592604f1a915bdf1c2"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(
-                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  }  # noqa: E501
+    addr_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(
+            offset=0x0,
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x76006c948f3a0529479c6d18a6f95908426e8092"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF, size=0x0) + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0xfffffff 0xfffffff) }
+    addr_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFF, size=0xFFFFFFF) + Op.STOP,
         nonce=0,
-        address=Address("0x7a4461ac9f9cd13f40f9514a7c60e23a71c1dff3"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0xFFFFFFFFFFFFFFFF, size=0x0) + Op.STOP,
+    # Source: lll
+    # {  (RETURN 0xffffffff 0xffffffff)  }
+    addr_13 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFFF, size=0xFFFFFFFF) + Op.STOP,
         nonce=0,
-        address=Address("0x7bbcf24c83493c4e733cb54079b51873d3211ad2"),  # noqa: E501
-    )
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0xFFFFFFFF, size=0xFFFFFFFF) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0xffffffffffffffff 0xffffffffffffffff) }
+    addr_14 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(offset=0xFFFFFFFFFFFFFFFF, size=0xFFFFFFFFFFFFFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xad7754a8a56cc5ad4e319fa94194e435628dee67"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0xFFFFFFF, size=0x0) + Op.STOP,
+    # Source: lll
+    # { (RETURN 0xfffffffffffffffffffffffffff 0xfffffffffffffffffffffffffff) }
+    addr_15 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc7aa750fe05c7e38475a49fe98a301024d0c1d54"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.RETURN(offset=0x0, size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFF) + Op.STOP
-        ),
+    # Source: lll
+    # { (RETURN 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  }  # noqa: E501
+    addr_16 = pre.deploy_contract(  # noqa: F841
+        code=Op.RETURN(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf519de4dcb9aaa53f8f0db9b18c715c928caade8"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.RETURN(offset=0xFFFFFFFF, size=0x0) + Op.STOP,
+    # Source: lll
+    # { [[1]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000001> 0 0 0 0) [[2]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000002> 0 0 0 0) [[3]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000003> 0 0 0 0) [[4]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000004> 0 0 0 0) [[5]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000005> 0 0 0 0) [[6]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[7]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[8]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[9]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[10]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[11]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[12]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[13]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[14]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[15]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) [[16]] (STATICCALL 0x7ffffffffffffff <contract:0x1000000000000000000000000000000000000006> 0 0 0 0) (IF (EQ (CALLDATALOAD 0) 0) (KECCAK256 0x00 0x2fffff) (GAS) ) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x4,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_4,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x5,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_5,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x6,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x7,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x8,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xA,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xB,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xC,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xD,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xE,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0xF,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x10,
+            value=Op.STATICCALL(
+                gas=0x7FFFFFFFFFFFFFF,
+                address=addr_6,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.JUMPI(pc=0x2AF, condition=Op.EQ(Op.CALLDATALOAD(offset=0x0), 0x0))
+        + Op.GAS
+        + Op.JUMP(pc=0x2B7)
+        + Op.JUMPDEST
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.JUMPDEST
+        + Op.STOP,
         nonce=0,
-        address=Address("0xff6b6d23be161344e86eb7b174acedd4b1dc6dc7"),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                target: Account(
+                    storage={
+                        1: 1,
+                        2: 1,
+                        3: 1,
+                        4: 1,
+                        5: 1,
+                        6: 1,
+                        7: 1,
+                        8: 1,
+                        9: 1,
+                        10: 1,
+                        11: 1,
+                        12: 1,
+                        13: 1,
+                        14: 1,
+                        15: 1,
+                        16: 1,
+                    },
+                    balance=1,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={}, balance=0)},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("00"),
+        Address(0x1),
+    ]
+    tx_gas = [15000000]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=15000000,
-        value=1,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_return_test.py b/tests/ported_static/stStaticCall/test_static_return_test.py
index 6ad5935d022..5f434c1bdc0 100644
--- a/tests/ported_static/stStaticCall/test_static_return_test.py
+++ b/tests/ported_static/stStaticCall/test_static_return_test.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_return_test.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_ReturnTestFiller.json
+state_tests/stStaticCall/static_ReturnTestFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,20 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_ReturnTestFiller.json"],
+    ["state_tests/stStaticCall/static_ReturnTestFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_return_test(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_return_test."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x194F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,49 +46,41 @@ def test_static_return_test(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # {(STATICCALL 2000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 30 1 31 1) [[0]](MLOAD 0) (RETURN 30 2)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x7D0,
-                    address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    args_offset=0x1E,
-                    args_size=0x1,
-                    ret_offset=0x1F,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.RETURN(offset=0x1E, size=0x2)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x194f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x5F5E100)
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 0 0x15) (RETURN 31 1)}
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x15)
-            + Op.RETURN(offset=0x1F, size=0x1)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x15)
+        + Op.RETURN(offset=0x1F, size=0x1)
+        + Op.STOP,
         balance=0x186A0,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+    )
+    # Source: lll
+    # {(STATICCALL 2000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 30 1 31 1) [[0]](MLOAD 0) (RETURN 30 2)}  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x7D0,
+                address=contract_1,
+                args_offset=0x1E,
+                args_size=0x1,
+                ret_offset=0x1F,
+                ret_size=0x1,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.RETURN(offset=0x1E, size=0x2)
+        + Op.STOP,
+        nonce=0,
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=300000,
     )
 
-    post = {
-        contract: Account(storage={0: 21}),
-    }
+    post = {contract_0: Account(storage={0: 21})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_return_test2.py b/tests/ported_static/stStaticCall/test_static_return_test2.py
index 3ef1a7eb3d0..6b38a20d22c 100644
--- a/tests/ported_static/stStaticCall/test_static_return_test2.py
+++ b/tests/ported_static/stStaticCall/test_static_return_test2.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_return_test2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_ReturnTest2Filler.json
+state_tests/stStaticCall/static_ReturnTest2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,20 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_ReturnTest2Filler.json"],
+    ["state_tests/stStaticCall/static_ReturnTest2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_return_test2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_static_return_test2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x194F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,53 +46,45 @@ def test_static_return_test2(
         gas_limit=1000000000,
     )
 
-    # Source: LLL
-    # {(MSTORE 0 0x15)(STATICCALL 7000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 32 32 32) [[0]](MLOAD 0) [[1]](MLOAD 32) (RETURN 0 64)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x15)
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=0x1B58,
-                    address=0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x20,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
-            + Op.RETURN(offset=0x0, size=0x40)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {(MSTORE 0 (MUL 3 (CALLDATALOAD 0)))(RETURN 0 32)}
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0, value=Op.MUL(0x3, Op.CALLDATALOAD(offset=0x0))
+        )
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.STOP,
+        balance=0x186A0,
         nonce=0,
-        address=Address("0x194f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
-    # Source: LLL
-    # {(MSTORE 0 (MUL 3 (CALLDATALOAD 0)))(RETURN 0 32)}
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0, value=Op.MUL(0x3, Op.CALLDATALOAD(offset=0x0))
+    # Source: lll
+    # {(MSTORE 0 0x15)(STATICCALL 7000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 32 32 32) [[0]](MLOAD 0) [[1]](MLOAD 32) (RETURN 0 64)}  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x15)
+        + Op.POP(
+            Op.STATICCALL(
+                gas=0x1B58,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x20,
+                ret_size=0x20,
             )
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.STOP
-        ),
-        balance=0x186A0,
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
+        + Op.RETURN(offset=0x0, size=0x40)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=250000,
     )
 
-    post = {
-        contract: Account(storage={0: 21, 1: 63}),
-    }
+    post = {contract_0: Account(storage={0: 21, 1: 63})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_revert_depth2.py b/tests/ported_static/stStaticCall/test_static_revert_depth2.py
index 768bfdf9c84..b37e0bb7174 100644
--- a/tests/ported_static/stStaticCall/test_static_revert_depth2.py
+++ b/tests/ported_static/stStaticCall/test_static_revert_depth2.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_static_revert_depth2.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_RevertDepth2Filler.json
+state_tests/stStaticCall/static_RevertDepth2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,20 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stStaticCall/static_RevertDepth2Filler.json"],
+    ["state_tests/stStaticCall/static_RevertDepth2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_revert_depth2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_static_revert_depth2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,89 +44,89 @@ def test_static_revert_depth2(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # { (MSTORE 1 1) }
+    addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.MSTORE(offset=0x1, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x15b1327fe926a2172adfd10efdef1505c8e15461"),  # noqa: E501
     )
-    # Source: LLL
-    # { [[0]] (ADD 1 (SLOAD 0)) [[1]] (STATICCALL 150000 <contract:0xb000000000000000000000000000000000000000> 0 0 0 0) [[2]] (STATICCALL 150000 <contract:0xd000000000000000000000000000000000000000> 0 0 0 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0x5DD18F4768E54DE1443F70EC11AD95D5DB424293,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # { (STATICCALL 50000 <contract:0xc000000000000000000000000000000000000000> 0 0 0 0) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.STATICCALL(
-                    gas=0x249F0,
-                    address=0xA61140A1C2699A13C619940208A513D42F654E98,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x57c111943c5e6f1817ee85fd1212409b7d1f7f26"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x15B1327FE926A2172ADFD10EFDEF1505C8E15461,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    # Source: lll
+    # {  (STATICCALL 50000 <contract:0xc000000000000000000000000000000000000000> 0 0 0 0) (MSTORE 1 1) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0xC350,
+                address=addr_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.MSTORE(offset=0x1, value=0x1)
-            + Op.STOP
-        ),
+        )
+        + Op.MSTORE(offset=0x1, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x5dd18f4768e54de1443f70ec11ad95d5db424293"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0xC350,
-                    address=0x15B1327FE926A2172ADFD10EFDEF1505C8E15461,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[0]] (ADD 1 (SLOAD 0)) [[1]] (STATICCALL 150000 <contract:0xb000000000000000000000000000000000000000> 0 0 0 0) [[2]] (STATICCALL 150000 <contract:0xd000000000000000000000000000000000000000> 0 0 0 0)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x1, Op.SLOAD(key=0x0)))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.STATICCALL(
+                gas=0x249F0,
+                address=addr_3,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa61140a1c2699a13c619940208a513d42f654e98"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1706850,
     )
 
     post = {
-        contract: Account(storage={0: 1, 1: 1}),
+        target: Account(storage={0: 1, 1: 1, 2: 0}),
+        addr: Account(storage={0: 0, 1: 0}),
+        addr_2: Account(storage={0: 0}),
+        addr_3: Account(storage={0: 0, 1: 0, 2: 0}),
+        sender: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_revert_opcode_calls.py b/tests/ported_static/stStaticCall/test_static_revert_opcode_calls.py
index b7c19c9f498..80b13c69048 100644
--- a/tests/ported_static/stStaticCall/test_static_revert_opcode_calls.py
+++ b/tests/ported_static/stStaticCall/test_static_revert_opcode_calls.py
@@ -1,20 +1,21 @@
 """
-Test ported from static filler.
+Test_static_revert_opcode_calls.
 
 Ported from:
-tests/static/state_tests/stStaticCall/static_RevertOpcodeCallsFiller.json
+state_tests/stStaticCall/static_RevertOpcodeCallsFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,31 +23,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_RevertOpcodeCallsFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_RevertOpcodeCallsFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
+@pytest.mark.slow
 @pytest.mark.parametrize(
-    "tx_gas_limit",
+    "d, g, v",
     [
-        460000,
-        88000,
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
 def test_static_revert_opcode_calls(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_static_revert_opcode_calls."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -57,44 +66,45 @@ def test_static_revert_opcode_calls(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # {   [[0]] (STATICCALL 50000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[1]] (RETURNDATASIZE)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=0xC350,
-                    address=0xBE254B4ACEB5B7495F1A5646BE06FE5A158581EC,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (REVERT 0 1) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.REVERT(offset=0x0, size=0x1) + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0x187c91277deeedf062a07b44de3c96c6e7cbc7bb"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.REVERT(offset=0x0, size=0x1) + Op.STOP,
+    # Source: lll
+    # {   [[0]] (STATICCALL 50000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[1]] (RETURNDATASIZE)}  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=0xC350,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.RETURNDATASIZE)
+        + Op.STOP,
         balance=1,
         nonce=0,
-        address=Address("0xbe254b4aceb5b7495f1a5646be06fe5a158581ec"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [460000, 88000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
     )
 
-    post = {
-        contract: Account(storage={1: 1}),
-    }
+    post = {target: Account(storage={1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_zero_value_call_oog_revert.py b/tests/ported_static/stStaticCall/test_static_zero_value_call_oog_revert.py
index b8a6cff5012..68708a26b72 100644
--- a/tests/ported_static/stStaticCall/test_static_zero_value_call_oog_revert.py
+++ b/tests/ported_static/stStaticCall/test_static_zero_value_call_oog_revert.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_static_zero_value_call_oog_revert.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_ZeroValue_CALL_OOGRevertFiller.json
+state_tests/stStaticCall/static_ZeroValue_CALL_OOGRevertFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,19 +23,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_ZeroValue_CALL_OOGRevertFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_ZeroValue_CALL_OOGRevertFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_zero_value_call_oog_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_static_zero_value_call_oog_revert."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -50,36 +49,41 @@ def test_static_zero_value_call_oog_revert(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[0]](GAS) [[1]] (STATICCALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) (KECCAK256 0x00 0x2fffff) [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.STATICCALL(
-                    gas=0xEA60,
-                    address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.STATICCALL(
+                gas=0xEA60,
+                address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.POP(Op.SHA3(offset=0x0, size=0x2FFFFF))
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=1350000,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        Address(
+            0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        ): Account.NONEXISTENT,
+        contract_0: Account(storage={0: 0, 1: 0, 100: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_static_zero_value_suicide_oog_revert.py b/tests/ported_static/stStaticCall/test_static_zero_value_suicide_oog_revert.py
index d1c49ea704e..abee402ac2b 100644
--- a/tests/ported_static/stStaticCall/test_static_zero_value_suicide_oog_revert.py
+++ b/tests/ported_static/stStaticCall/test_static_zero_value_suicide_oog_revert.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_static_zero_value_suicide_oog_revert.
 
 Ported from:
-tests/static/state_tests/stStaticCall
-static_ZeroValue_SUICIDE_OOGRevertFiller.json
+state_tests/stStaticCall/static_ZeroValue_SUICIDE_OOGRevertFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,22 +22,18 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/static_ZeroValue_SUICIDE_OOGRevertFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stStaticCall/static_ZeroValue_SUICIDE_OOGRevertFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_static_zero_value_suicide_oog_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_static_zero_value_suicide_oog_revert."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,42 +44,46 @@ def test_static_zero_value_suicide_oog_revert(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (STATICCALL 100000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) (KECCAK256 0x00 0x2fffff) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.STATICCALL(
-                    gas=0x186A0,
-                    address=0xDA2EB5512889130C4AF686A291B08665B889CB22,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.STATICCALL(
+                gas=0x186A0,
+                address=0xDA2EB5512889130C4AF686A291B08665B889CB22,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SHA3(offset=0x0, size=0x2FFFFF)
-            + Op.STOP
-        ),
+        )
+        + Op.SHA3(offset=0x0, size=0x2FFFFF)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xcbecd26bebbaeddef56fce1849f78096332b11ab"),  # noqa: E501
+        address=Address(0xCBECD26BEBBAEDDEF56FCE1849F78096332B11AB),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xDA2EB5512889130C4AF686A291B08665B889CB22)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SELFDESTRUCT <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b>)  }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xDA2EB5512889130C4AF686A291B08665B889CB22
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xda2eb5512889130c4af686a291b08665b889cb22"),  # noqa: E501
+        address=Address(0xDA2EB5512889130C4AF686A291B08665B889CB22),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        target: Account(storage={}),
+        addr: Account(storage={}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_staticcall_to_precompile_from_called_contract.py b/tests/ported_static/stStaticCall/test_staticcall_to_precompile_from_called_contract.py
index 1335f205680..4331223b362 100644
--- a/tests/ported_static/stStaticCall/test_staticcall_to_precompile_from_called_contract.py
+++ b/tests/ported_static/stStaticCall/test_staticcall_to_precompile_from_called_contract.py
@@ -1,11 +1,11 @@
 """
-STATICCALL to precompiled contracts from contract that called from another...
+STATICCALL to precompiled contracts from contract that called from...
 
 It should execute successfully for each precompiled contract.
 
+
 Ported from:
-tests/static/state_tests/stStaticCall
-StaticcallToPrecompileFromCalledContractFiller.yml
+state_tests/stStaticCall/StaticcallToPrecompileFromCalledContractFiller.yml
 """
 
 import pytest
@@ -14,6 +14,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -26,19 +27,20 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/StaticcallToPrecompileFromCalledContractFiller.yml",  # noqa: E501
+        "state_tests/stStaticCall/StaticcallToPrecompileFromCalledContractFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_staticcall_to_precompile_from_called_contract(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """STATICCALL to precompiled contracts from contract that called..."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
+    """STATICCALL to precompiled contracts from contract that called from..."""
+    coinbase = Address(0xCAFE000000000000000000000000000000000001)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xA000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -52,383 +54,8 @@ def test_staticcall_to_precompile_from_called_contract(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # {
-    #   ;; Recovery of ECDSA signature
-    #   [ 0x00 ] 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c  # noqa: E501
-    #   [ 0x20 ] 28
-    #   [ 0x40 ] 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f  # noqa: E501
-    #   [ 0x60 ] 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549  # noqa: E501
-    #   [[ 0x00 ]] (STATICCALL (GAS) 1 0 128 1000 32)
-    #   [[ 0x01 ]] (MOD @1000 (EXP 2 160))
-    #   [[ 0x02 ]] (EQ (ORIGIN) @@1)
-    #   [ 0x00 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x20 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x40 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x60 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 1000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #
-    #   ;; Hash function SHA256
-    #   [ 0x00 ] 0x0000000ccccccccccccccccccccccccccccccccccccccccccccccccccc000000  # noqa: E501
-    #   [[ 0x03 ]] (STATICCALL (GAS) 2 0 32 1000 32)
-    #   [[ 0x04 ]] @0
-    #   [[ 0x05 ]] @1000
-    #   [ 0x00 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 1000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #
-    #   ;; Hash function RIPEMD160
-    #   [ 0x00 ] 0x0000000ccccccccccccccccccccccccccccccccccccccccccccccccccc000000  # noqa: E501
-    #   [[ 0x06 ]] (STATICCALL (GAS) 3 0 32 1000 32)
-    #   [[ 0x07 ]] @0
-    #   [[ 0x08 ]] @1000
-    #   [ 0x00 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 1000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    # ... (70 more lines)
-    callee = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.MOD(Op.MLOAD(offset=0x3E8), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x2, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x1)))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x4, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x5, value=Op.MLOAD(offset=0x3E8))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x6,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x7, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x8, value=Op.MLOAD(offset=0x3E8))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x10, value=Op.MLOAD(offset=0x3E8))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.MSTORE(offset=0x20, value=0x20)
-            + Op.MSTORE(offset=0x40, value=0x20)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x11,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x12, value=Op.MLOAD(offset=0x3E8))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x80, value=0x0)
-            + Op.MSTORE(offset=0xA0, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x13,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x3E8,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x14, value=Op.MLOAD(offset=0x3E8))
-            + Op.SSTORE(key=0x15, value=Op.MLOAD(offset=0x408))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(offset=0x408, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x40, value=0x3)
-            + Op.SSTORE(
-                key=0x16,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x3E8,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x17, value=Op.MLOAD(offset=0x3E8))
-            + Op.SSTORE(key=0x18, value=Op.MLOAD(offset=0x408))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(offset=0x408, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xE0,
-                value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x140,
-                value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x19,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x20, value=Op.MLOAD(offset=0x3E8))
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {
-    #   [[ 0 ]] (CALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0 0 0 )  # noqa: E501
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=0xA000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        gas_limit=1000000,
-        value=100,
-    )
-
-    post = {
-        callee: Account(
-            storage={
-                0: 1,
-                1: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                2: 1,
-                3: 1,
-                4: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
-                5: 0x73F5062FB68ED2A1EC82FF8C73F9251BB9CF53A623BC93527E16BC5AE29DAD74,  # noqa: E501
-                6: 1,
-                7: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
-                8: 0x14EF238CFA4075E9EDE92F18B1566C1DD0B99AAA,
-                9: 1,
-                16: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                17: 1,
-                18: 1,
-                19: 1,
-                20: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                21: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                22: 1,
-                23: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                24: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                25: 1,
-                32: 1,
-            },
-        ),
-        contract: Account(storage={0: 1}),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/StaticcallToPrecompileFromCalledContractFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
-def test_staticcall_to_precompile_from_called_contract_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """STATICCALL to precompiled contracts from contract that called..."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    # Source: LLL
+    # Source: lll
     # {
     #   ;; Recovery of ECDSA signature
     #   [ 0x00 ] 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c  # noqa: E501
@@ -460,296 +87,292 @@ def test_staticcall_to_precompile_from_called_contract_from_osaka(
     #   [ 0x00 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
     #   [ 1000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
     # ... (70 more lines)
-    callee = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.MOD(Op.MLOAD(offset=0x3E8), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x2, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x1)))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x4, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x5, value=Op.MLOAD(offset=0x3E8))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x6,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x7, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x8, value=Op.MLOAD(offset=0x3E8))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x10, value=Op.MLOAD(offset=0x3E8))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.MSTORE(offset=0x20, value=0x20)
-            + Op.MSTORE(offset=0x40, value=0x20)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x11,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x12, value=Op.MLOAD(offset=0x3E8))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x80, value=0x0)
-            + Op.MSTORE(offset=0xA0, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x13,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x3E8,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x14, value=Op.MLOAD(offset=0x3E8))
-            + Op.SSTORE(key=0x15, value=Op.MLOAD(offset=0x408))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(offset=0x408, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x40, value=0x3)
-            + Op.SSTORE(
-                key=0x16,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x3E8,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x17, value=Op.MLOAD(offset=0x3E8))
-            + Op.SSTORE(key=0x18, value=Op.MLOAD(offset=0x408))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(offset=0x408, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xE0,
-                value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x140,
-                value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x19,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x20, value=Op.MLOAD(offset=0x3E8))
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x3E8,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x1, value=Op.MOD(Op.MLOAD(offset=0x3E8), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x2, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x1)))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x3E8, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x3E8,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x4, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x5, value=Op.MLOAD(offset=0x3E8))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x3E8, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.SSTORE(
+            key=0x6,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x3E8,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x7, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x8, value=Op.MLOAD(offset=0x3E8))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x3E8, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x3E8,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x10, value=Op.MLOAD(offset=0x3E8))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x3E8, value=0x0)
+        + Op.MSTORE(offset=0x0, value=0x1)
+        + Op.MSTORE(offset=0x20, value=0x20)
+        + Op.MSTORE(offset=0x40, value=0x20)
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x11,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x5,
+                args_offset=0x0,
+                args_size=0xA1,
+                ret_offset=0x3E8,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x12, value=Op.MLOAD(offset=0x3E8))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x80, value=0x0)
+        + Op.MSTORE(offset=0xA0, value=0x0)
+        + Op.MSTORE(offset=0x3E8, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x13,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x6,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x3E8,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x14, value=Op.MLOAD(offset=0x3E8))
+        + Op.SSTORE(key=0x15, value=Op.MLOAD(offset=0x408))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x3E8, value=0x0)
+        + Op.MSTORE(offset=0x408, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x40, value=0x3)
+        + Op.SSTORE(
+            key=0x16,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x7,
+                args_offset=0x0,
+                args_size=0x60,
+                ret_offset=0x3E8,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x17, value=Op.MLOAD(offset=0x3E8))
+        + Op.SSTORE(key=0x18, value=Op.MLOAD(offset=0x408))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x3E8, value=0x0)
+        + Op.MSTORE(offset=0x408, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xE0,
+            value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x100,
+            value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x120,
+            value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x140,
+            value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x160,
+            value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x19,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x8,
+                args_offset=0x0,
+                args_size=0x180,
+                ret_offset=0x3E8,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x20, value=Op.MLOAD(offset=0x3E8))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # {
     #   [[ 0 ]] (CALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0 0 0 )  # noqa: E501
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=0xA000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=Op.GAS,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=1000000,
         value=100,
     )
 
     post = {
-        callee: Account(
+        contract_0: Account(storage={0: 1}),
+        contract_1: Account(
             storage={
                 0: 1,
-                1: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                1: sender,
                 2: 1,
                 3: 1,
                 4: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
@@ -771,7 +394,6 @@ def test_staticcall_to_precompile_from_called_contract_from_osaka(
                 32: 1,
             },
         ),
-        contract: Account(storage={0: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stStaticCall/test_staticcall_to_precompile_from_contract_initialization.py b/tests/ported_static/stStaticCall/test_staticcall_to_precompile_from_contract_initialization.py
index c619d698b92..1357cf578a1 100644
--- a/tests/ported_static/stStaticCall/test_staticcall_to_precompile_from_contract_initialization.py
+++ b/tests/ported_static/stStaticCall/test_staticcall_to_precompile_from_contract_initialization.py
@@ -3,9 +3,9 @@
 
 It should execute successfully for each precompiled contract.
 
+
 Ported from:
-tests/static/state_tests/stStaticCall
-StaticcallToPrecompileFromContractInitializationFiller.yml
+state_tests/stStaticCall/StaticcallToPrecompileFromContractInitializationFiller.yml
 """
 
 import pytest
@@ -14,6 +14,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -26,19 +27,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/StaticcallToPrecompileFromContractInitializationFiller.yml",  # noqa: E501
+        "state_tests/stStaticCall/StaticcallToPrecompileFromContractInitializationFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_staticcall_to_precompile_from_contract_initialization(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """STATICCALL to precompiled contracts from contract initialization..."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
+    """STATICCALL to precompiled contracts from contract initialization code."""  # noqa: E501
+    coinbase = Address(0xCAFE000000000000000000000000000000000001)
+    contract_0 = Address(0xA000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -52,219 +53,46 @@ def test_staticcall_to_precompile_from_contract_initialization(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # {
-    #   (CALLDATACOPY 0 0 (CALLDATASIZE))
-    #   [[ 0 ]] (CREATE2 0 0 (CALLDATASIZE) 0x5a175a175a17)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATACOPY(dest_offset=0x0, offset=0x0, size=Op.CALLDATASIZE)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE2(
-                    value=0x0,
-                    offset=0x0,
-                    size=Op.CALLDATASIZE,
-                    salt=0x5A175A175A17,
-                ),
-            )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052"  # noqa: E501
-            "601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5"  # noqa: E501
-            "a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c"  # noqa: E501
-            "454960605260206103e860806000600162061a80fa60005560a060020a6103e851066001"  # noqa: E501
-            "556001543214600255600060005260006020526000604052600060605260006103e8527c"  # noqa: E501
-            "0ccccccccccccccccccccccccccccccccccccccccccccccccccc00000060005260206103"  # noqa: E501
-            "e86020600060025afa6003556000516004556103e851600555600060005260006103e852"  # noqa: E501
-            "7c0ccccccccccccccccccccccccccccccccccccccccccccccccccc000000600052602061"  # noqa: E501
-            "03e86020600060035afa6006556000516007556103e851600855600060005260006103e8"  # noqa: E501
-            "527c0ccccccccccccccccccccccccccccccccccccccccccccccccccc0000006000526020"  # noqa: E501
-            "6103e86020600060045afa6009556103e851601055600060005260006103e85260016000"  # noqa: E501
-            "52602060205260206040527f03ffffffffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffefffffc6060527f2effffffffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffefffffc6080527f2f0000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000060a05260206103e860a1600060055afa6011556103e8516012556000"  # noqa: E501
-            "6000526000602052600060405260006060526000608052600060a05260006103e8527f0f"  # noqa: E501
-            "25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd26000527f16"  # noqa: E501
-            "da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba6020527f1d"  # noqa: E501
-            "e49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2866040527f02"  # noqa: E501
-            "17327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d46060526040"  # noqa: E501
-            "6103e86080600060065afa6013556103e851601455610408516015556000600052600060"  # noqa: E501
-            "20526000604052600060605260006103e8526000610408527f0f25929bcb43d5a5739156"  # noqa: E501
-            "4615c9e70a992b10eafa4db109709649cf48c50dd26000527f16da2f5cb6be7a0aa72c44"  # noqa: E501
-            "0c53c9bbdfec6c36c7d515536431b3a865468acbba602052600360405260406103e86060"  # noqa: E501
-            "600060075afa6016556103e8516017556104085160185560006000526000602052600060"  # noqa: E501
-            "405260006103e8526000610408527f1c76476f4def4bb94541d57ebba1193381ffa7aa76"  # noqa: E501
-            "ada664dd31c16024c43f596000527f3034dd2920f673e204fee2811c678745fc819b55d3"  # noqa: E501
-            "e9d294e45c9b03a76aef416020527f209dd15ebff5d46c4bd888e51a93cf99a7329636c6"  # noqa: E501
-            "3514396b4a452003a35bf76040527f04bf11ca01483bfa8b34b43561848d28905960114c"  # noqa: E501
-            "8ac04049af4b6315a416786060527f2bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7a"  # noqa: E501
-            "c41fadbf933c2a51be344d6080527f120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c"  # noqa: E501
-            "9bb048165fe5e4de87755060a0527f111e129f1cf1097710d41c4ac70fcdfa5ba2023c6f"  # noqa: E501
-            "f1cbeac322de49d1b6df7c60c0527f2032c61a830e3c17286de9462bf242fca2883585b9"  # noqa: E501
-            "3870a73853face6a6bf41160e0527f198e9393920d483a7260bfb731fb5d25f1aa493335"  # noqa: E501
-            "a9e71297e485b7aef312c2610100527f1800deef121f1e76426a00665e5c4479674322d4"  # noqa: E501
-            "f75edadd46debd5cd992f6ed610120527f090689d0585ff075ec9e99ad690c3395bc4b31"  # noqa: E501
-            "3370b38ef355acdadcd122975b610140527f12c85ea5db8c6deb4aab71808dcb408fe3d1"  # noqa: E501
-            "e7690c43d37b4ce6cc0166fa7daa6101605260206103e8610180600060085afa60195561"  # noqa: E501
-            "03e85160205500"
-        ),
-        gas_limit=1000000,
-        value=100,
-    )
-
-    post = {
-        contract: Account(
-            storage={0: 0xFAD204ED1275B429B66C9CE0614D62832D6B2580},
-        ),
-        Address("0xfad204ed1275b429b66c9ce0614d62832d6b2580"): Account(
-            storage={
-                0: 1,
-                1: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                2: 1,
-                3: 1,
-                4: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
-                5: 0x73F5062FB68ED2A1EC82FF8C73F9251BB9CF53A623BC93527E16BC5AE29DAD74,  # noqa: E501
-                6: 1,
-                7: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
-                8: 0x14EF238CFA4075E9EDE92F18B1566C1DD0B99AAA,
-                9: 1,
-                16: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                17: 1,
-                18: 1,
-                19: 1,
-                20: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                21: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                22: 1,
-                23: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                24: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                25: 1,
-                32: 1,
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/StaticcallToPrecompileFromContractInitializationFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
-def test_staticcall_to_precompile_from_contract_initialization_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """STATICCALL to precompiled contracts from contract initialization..."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    # Source: LLL
+    # Source: lll
     # {
     #   (CALLDATACOPY 0 0 (CALLDATASIZE))
     #   [[ 0 ]] (CREATE2 0 0 (CALLDATASIZE) 0x5a175a175a17)
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALLDATACOPY(dest_offset=0x0, offset=0x0, size=Op.CALLDATASIZE)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE2(
-                    value=0x0,
-                    offset=0x0,
-                    size=Op.CALLDATASIZE,
-                    salt=0x5A175A175A17,
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALLDATACOPY(dest_offset=0x0, offset=0x0, size=Op.CALLDATASIZE)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE2(
+                value=0x0,
+                offset=0x0,
+                size=Op.CALLDATASIZE,
+                salt=0x5A175A175A17,
+            ),
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052"  # noqa: E501
-            "601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5"  # noqa: E501
-            "a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c"  # noqa: E501
-            "454960605260206103e860806000600162061a80fa60005560a060020a6103e851066001"  # noqa: E501
-            "556001543214600255600060005260006020526000604052600060605260006103e8527c"  # noqa: E501
-            "0ccccccccccccccccccccccccccccccccccccccccccccccccccc00000060005260206103"  # noqa: E501
-            "e86020600060025afa6003556000516004556103e851600555600060005260006103e852"  # noqa: E501
-            "7c0ccccccccccccccccccccccccccccccccccccccccccccccccccc000000600052602061"  # noqa: E501
-            "03e86020600060035afa6006556000516007556103e851600855600060005260006103e8"  # noqa: E501
-            "527c0ccccccccccccccccccccccccccccccccccccccccccccccccccc0000006000526020"  # noqa: E501
-            "6103e86020600060045afa6009556103e851601055600060005260006103e85260016000"  # noqa: E501
-            "52602060205260206040527f03ffffffffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffefffffc6060527f2effffffffffffffffffffffffffffffffffffffffffffff"  # noqa: E501
-            "fffffffffefffffc6080527f2f0000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000060a05260206103e860a1600060055afa6011556103e8516012556000"  # noqa: E501
-            "6000526000602052600060405260006060526000608052600060a05260006103e8527f0f"  # noqa: E501
-            "25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd26000527f16"  # noqa: E501
-            "da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba6020527f1d"  # noqa: E501
-            "e49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2866040527f02"  # noqa: E501
-            "17327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d46060526040"  # noqa: E501
-            "6103e86080600060065afa6013556103e851601455610408516015556000600052600060"  # noqa: E501
-            "20526000604052600060605260006103e8526000610408527f0f25929bcb43d5a5739156"  # noqa: E501
-            "4615c9e70a992b10eafa4db109709649cf48c50dd26000527f16da2f5cb6be7a0aa72c44"  # noqa: E501
-            "0c53c9bbdfec6c36c7d515536431b3a865468acbba602052600360405260406103e86060"  # noqa: E501
-            "600060075afa6016556103e8516017556104085160185560006000526000602052600060"  # noqa: E501
-            "405260006103e8526000610408527f1c76476f4def4bb94541d57ebba1193381ffa7aa76"  # noqa: E501
-            "ada664dd31c16024c43f596000527f3034dd2920f673e204fee2811c678745fc819b55d3"  # noqa: E501
-            "e9d294e45c9b03a76aef416020527f209dd15ebff5d46c4bd888e51a93cf99a7329636c6"  # noqa: E501
-            "3514396b4a452003a35bf76040527f04bf11ca01483bfa8b34b43561848d28905960114c"  # noqa: E501
-            "8ac04049af4b6315a416786060527f2bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7a"  # noqa: E501
-            "c41fadbf933c2a51be344d6080527f120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c"  # noqa: E501
-            "9bb048165fe5e4de87755060a0527f111e129f1cf1097710d41c4ac70fcdfa5ba2023c6f"  # noqa: E501
-            "f1cbeac322de49d1b6df7c60c0527f2032c61a830e3c17286de9462bf242fca2883585b9"  # noqa: E501
-            "3870a73853face6a6bf41160e0527f198e9393920d483a7260bfb731fb5d25f1aa493335"  # noqa: E501
-            "a9e71297e485b7aef312c2610100527f1800deef121f1e76426a00665e5c4479674322d4"  # noqa: E501
-            "f75edadd46debd5cd992f6ed610120527f090689d0585ff075ec9e99ad690c3395bc4b31"  # noqa: E501
-            "3370b38ef355acdadcd122975b610140527f12c85ea5db8c6deb4aab71808dcb408fe3d1"  # noqa: E501
-            "e7690c43d37b4ce6cc0166fa7daa6101605260206103e8610180600060085afa60195561"  # noqa: E501
-            "03e85160205500"
+        to=contract_0,
+        data=Bytes(
+            "7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c454960605260206103e860806000600162061a80fa60005560a060020a6103e851066001556001543214600255600060005260006020526000604052600060605260006103e8527c0ccccccccccccccccccccccccccccccccccccccccccccccccccc00000060005260206103e86020600060025afa6003556000516004556103e851600555600060005260006103e8527c0ccccccccccccccccccccccccccccccccccccccccccccccccccc00000060005260206103e86020600060035afa6006556000516007556103e851600855600060005260006103e8527c0ccccccccccccccccccccccccccccccccccccccccccccccccccc00000060005260206103e86020600060045afa6009556103e851601055600060005260006103e8526001600052602060205260206040527f03fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc6060527f2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc6080527f2f0000000000000000000000000000000000000000000000000000000000000060a05260206103e860a1600060055afa6011556103e85160125560006000526000602052600060405260006060526000608052600060a05260006103e8527f0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd26000527f16da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba6020527f1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2866040527f0217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d460605260406103e86080600060065afa6013556103e85160145561040851601555600060005260006020526000604052600060605260006103e8526000610408527f0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd26000527f16da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba602052600360405260406103e86060600060075afa6016556103e8516017556104085160185560006000526000602052600060405260006103e8526000610408527f1c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f596000527f3034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef416020527f209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf76040527f04bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416786060527f2bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d6080527f120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de87755060a0527f111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c60c0527f2032c61a830e3c17286de9462bf242fca2883585b93870a73853face6a6bf41160e0527f198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2610100527f1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed610120527f090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b610140527f12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa6101605260206103e8610180600060085afa6019556103e85160205500"  # noqa: E501
         ),
         gas_limit=1000000,
         value=100,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={0: 0xFAD204ED1275B429B66C9CE0614D62832D6B2580},
         ),
-        Address("0xfad204ed1275b429b66c9ce0614d62832d6b2580"): Account(
+        Address(0xFAD204ED1275B429B66C9CE0614D62832D6B2580): Account(
             storage={
                 0: 1,
-                1: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                1: sender,
                 2: 1,
                 3: 1,
                 4: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
diff --git a/tests/ported_static/stStaticCall/test_staticcall_to_precompile_from_transaction.py b/tests/ported_static/stStaticCall/test_staticcall_to_precompile_from_transaction.py
index 4eadb6c2950..dd0bad3437f 100644
--- a/tests/ported_static/stStaticCall/test_staticcall_to_precompile_from_transaction.py
+++ b/tests/ported_static/stStaticCall/test_staticcall_to_precompile_from_transaction.py
@@ -3,9 +3,9 @@
 
 It should execute successfully for each precompiled contract.
 
+
 Ported from:
-tests/static/state_tests/stStaticCall
-StaticcallToPrecompileFromTransactionFiller.yml
+state_tests/stStaticCall/StaticcallToPrecompileFromTransactionFiller.yml
 """
 
 import pytest
@@ -14,6 +14,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -26,19 +27,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticCall/StaticcallToPrecompileFromTransactionFiller.yml",  # noqa: E501
+        "state_tests/stStaticCall/StaticcallToPrecompileFromTransactionFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.slow
+@pytest.mark.pre_alloc_mutable
 def test_staticcall_to_precompile_from_transaction(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """STATICCALL to precompiled contracts from transaction code."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
+    coinbase = Address(0xCAFE000000000000000000000000000000000001)
+    contract_0 = Address(0xA000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -52,359 +53,8 @@ def test_staticcall_to_precompile_from_transaction(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # {
-    #   ;; Recovery of ECDSA signature
-    #   [ 0x00 ] 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c  # noqa: E501
-    #   [ 0x20 ] 28
-    #   [ 0x40 ] 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f  # noqa: E501
-    #   [ 0x60 ] 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549  # noqa: E501
-    #   [[ 0x00 ]] (STATICCALL (GAS) 1 0 128 1000 32)
-    #   [[ 0x01 ]] (MOD @1000 (EXP 2 160))
-    #   [[ 0x02 ]] (EQ (ORIGIN) @@1)
-    #   [ 0x00 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x20 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x40 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x60 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 1000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #
-    #   ;; Hash function SHA256
-    #   [ 0x00 ] 0x0000000ccccccccccccccccccccccccccccccccccccccccccccccccccc000000  # noqa: E501
-    #   [[ 0x03 ]] (STATICCALL (GAS) 2 0 32 1000 32)
-    #   [[ 0x04 ]] @0
-    #   [[ 0x05 ]] @1000
-    #   [ 0x00 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 1000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #
-    #   ;; Hash function RIPEMD160
-    #   [ 0x00 ] 0x0000000ccccccccccccccccccccccccccccccccccccccccccccccccccc000000  # noqa: E501
-    #   [[ 0x06 ]] (STATICCALL (GAS) 3 0 32 1000 32)
-    #   [[ 0x07 ]] @0
-    #   [[ 0x08 ]] @1000
-    #   [ 0x00 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 1000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    # ... (70 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.MOD(Op.MLOAD(offset=0x3E8), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x2, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x1)))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x4, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x5, value=Op.MLOAD(offset=0x3E8))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x6,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x7, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x8, value=Op.MLOAD(offset=0x3E8))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x10, value=Op.MLOAD(offset=0x3E8))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.MSTORE(offset=0x20, value=0x20)
-            + Op.MSTORE(offset=0x40, value=0x20)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x11,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x12, value=Op.MLOAD(offset=0x3E8))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x80, value=0x0)
-            + Op.MSTORE(offset=0xA0, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x13,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x3E8,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x14, value=Op.MLOAD(offset=0x3E8))
-            + Op.SSTORE(key=0x15, value=Op.MLOAD(offset=0x408))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(offset=0x408, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x40, value=0x3)
-            + Op.SSTORE(
-                key=0x16,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x3E8,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x17, value=Op.MLOAD(offset=0x3E8))
-            + Op.SSTORE(key=0x18, value=Op.MLOAD(offset=0x408))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(offset=0x408, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xE0,
-                value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x140,
-                value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x19,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x20, value=Op.MLOAD(offset=0x3E8))
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        gas_limit=1000000,
-        value=100,
-    )
-
-    post = {
-        contract: Account(
-            storage={
-                0: 1,
-                1: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                2: 1,
-                3: 1,
-                4: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
-                5: 0x73F5062FB68ED2A1EC82FF8C73F9251BB9CF53A623BC93527E16BC5AE29DAD74,  # noqa: E501
-                6: 1,
-                7: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
-                8: 0x14EF238CFA4075E9EDE92F18B1566C1DD0B99AAA,
-                9: 1,
-                16: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                17: 1,
-                18: 1,
-                19: 1,
-                20: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                21: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                22: 1,
-                23: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                24: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                25: 1,
-                32: 1,
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticCall/StaticcallToPrecompileFromTransactionFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
-def test_staticcall_to_precompile_from_transaction_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """STATICCALL to precompiled contracts from transaction code."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    # Source: LLL
+    # Source: lll
     # {
     #   ;; Recovery of ECDSA signature
     #   [ 0x00 ] 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c  # noqa: E501
@@ -436,273 +86,270 @@ def test_staticcall_to_precompile_from_transaction_from_osaka(
     #   [ 0x00 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
     #   [ 1000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
     # ... (70 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.MOD(Op.MLOAD(offset=0x3E8), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.SSTORE(key=0x2, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x1)))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x4, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x5, value=Op.MLOAD(offset=0x3E8))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x6,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x7, value=Op.MLOAD(offset=0x0))
-            + Op.SSTORE(key=0x8, value=Op.MLOAD(offset=0x3E8))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x9,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x10, value=Op.MLOAD(offset=0x3E8))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.MSTORE(offset=0x20, value=0x20)
-            + Op.MSTORE(offset=0x40, value=0x20)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x11,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x12, value=Op.MLOAD(offset=0x3E8))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x80, value=0x0)
-            + Op.MSTORE(offset=0xA0, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x13,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x3E8,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x14, value=Op.MLOAD(offset=0x3E8))
-            + Op.SSTORE(key=0x15, value=Op.MLOAD(offset=0x408))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(offset=0x408, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x40, value=0x3)
-            + Op.SSTORE(
-                key=0x16,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x3E8,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x17, value=Op.MLOAD(offset=0x3E8))
-            + Op.SSTORE(key=0x18, value=Op.MLOAD(offset=0x408))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x3E8, value=0x0)
-            + Op.MSTORE(offset=0x408, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xE0,
-                value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x140,
-                value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x19,
-                value=Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x20, value=Op.MLOAD(offset=0x3E8))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x3E8,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x1, value=Op.MOD(Op.MLOAD(offset=0x3E8), Op.EXP(0x2, 0xA0))
+        )
+        + Op.SSTORE(key=0x2, value=Op.EQ(Op.ORIGIN, Op.SLOAD(key=0x1)))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x3E8, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x3E8,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x4, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x5, value=Op.MLOAD(offset=0x3E8))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x3E8, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.SSTORE(
+            key=0x6,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x3E8,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x7, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x8, value=Op.MLOAD(offset=0x3E8))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x3E8, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x3E8,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x10, value=Op.MLOAD(offset=0x3E8))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x3E8, value=0x0)
+        + Op.MSTORE(offset=0x0, value=0x1)
+        + Op.MSTORE(offset=0x20, value=0x20)
+        + Op.MSTORE(offset=0x40, value=0x20)
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x11,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x5,
+                args_offset=0x0,
+                args_size=0xA1,
+                ret_offset=0x3E8,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x12, value=Op.MLOAD(offset=0x3E8))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x80, value=0x0)
+        + Op.MSTORE(offset=0xA0, value=0x0)
+        + Op.MSTORE(offset=0x3E8, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x13,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x6,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x3E8,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x14, value=Op.MLOAD(offset=0x3E8))
+        + Op.SSTORE(key=0x15, value=Op.MLOAD(offset=0x408))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x3E8, value=0x0)
+        + Op.MSTORE(offset=0x408, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x40, value=0x3)
+        + Op.SSTORE(
+            key=0x16,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x7,
+                args_offset=0x0,
+                args_size=0x60,
+                ret_offset=0x3E8,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x17, value=Op.MLOAD(offset=0x3E8))
+        + Op.SSTORE(key=0x18, value=Op.MLOAD(offset=0x408))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x3E8, value=0x0)
+        + Op.MSTORE(offset=0x408, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xE0,
+            value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x100,
+            value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x120,
+            value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x140,
+            value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x160,
+            value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x19,
+            value=Op.STATICCALL(
+                gas=Op.GAS,
+                address=0x8,
+                args_offset=0x0,
+                args_size=0x180,
+                ret_offset=0x3E8,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x20, value=Op.MLOAD(offset=0x3E8))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=1000000,
         value=100,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 1,
-                1: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                1: sender,
                 2: 1,
                 3: 1,
                 4: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
diff --git a/tests/ported_static/stStaticFlagEnabled/__init__.py b/tests/ported_static/stStaticFlagEnabled/__init__.py
index 874a479b549..6e95477609c 100644
--- a/tests/ported_static/stStaticFlagEnabled/__init__.py
+++ b/tests/ported_static/stStaticFlagEnabled/__init__.py
@@ -1 +1 @@
-"""Tests ported from stStaticFlagEnabled."""
+"""Ported static tests: stStaticFlagEnabled."""  # noqa: N999
diff --git a/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_called_contract.py b/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_called_contract.py
index 88b95bad477..e9608c8f28e 100644
--- a/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_called_contract.py
+++ b/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_called_contract.py
@@ -5,9 +5,9 @@
 Contract A callcodes precompiled contracts.
 It should execute successfully for each precompiled contract.
 
+
 Ported from:
-tests/static/state_tests/stStaticFlagEnabled
-CallcodeToPrecompileFromCalledContractFiller.yml
+state_tests/stStaticFlagEnabled/CallcodeToPrecompileFromCalledContractFiller.yml
 """
 
 import pytest
@@ -16,6 +16,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -28,18 +29,20 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticFlagEnabled/CallcodeToPrecompileFromCalledContractFiller.yml",  # noqa: E501
+        "state_tests/stStaticFlagEnabled/CallcodeToPrecompileFromCalledContractFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
 @pytest.mark.pre_alloc_mutable
 def test_callcode_to_precompile_from_called_contract(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """Contract C calls contract B."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
+    coinbase = Address(0xCAFE000000000000000000000000000000000001)
+    contract_0 = Address(0xC000000000000000000000000000000000000000)
+    contract_1 = Address(0xB000000000000000000000000000000000000000)
+    contract_2 = Address(0xA000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -53,7 +56,8 @@ def test_callcode_to_precompile_from_called_contract(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # {
     #   ;; Recovery of ECDSA signature
     #   [ 0x00 ] 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c  # noqa: E501
@@ -85,400 +89,395 @@ def test_callcode_to_precompile_from_called_contract(
     #   ;; non zero value
     #   [ 0x0b0300 ] (CALLCODE (GAS) 2 1 0 32 0x2020 32)
     # ... (121 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0000,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xA0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xA0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100)),
-            )
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0000,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x1,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xB0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2020), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xB0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xB0100)),
-            )
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x2,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xB0500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x3,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xB0800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x4,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1000, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.MSTORE(offset=0x20, value=0x20)
-            + Op.MSTORE(offset=0x40, value=0x20)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1100,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1100,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x5,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1200, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x80, value=0x0)
-            + Op.MSTORE(offset=0xA0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x6,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x3000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1400, value=Op.MLOAD(offset=0x3000))
-            + Op.MSTORE(offset=0xB1500, value=Op.MLOAD(offset=0x3020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x3000, value=0x0)
-            + Op.MSTORE(offset=0x3020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x40, value=0x3)
-            + Op.MSTORE(
-                offset=0xA1600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x7,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x3000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1700, value=Op.MLOAD(offset=0x3000))
-            + Op.MSTORE(offset=0xB1800, value=Op.MLOAD(offset=0x3020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x3000, value=0x0)
-            + Op.MSTORE(offset=0x3020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xE0,
-                value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x140,
-                value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x8,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB2000, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.RETURN(offset=0xA0000, size=0x12020)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0000,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(
+            offset=0xA0100,
+            value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
+        )
+        + Op.MSTORE(
+            offset=0xA0200, value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100))
+        )
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB0000,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x1,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(
+            offset=0xB0100,
+            value=Op.MOD(Op.MLOAD(offset=0x2020), Op.EXP(0x2, 0xA0)),
+        )
+        + Op.MSTORE(
+            offset=0xB0200, value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xB0100))
+        )
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0300,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB0300,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x2,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xB0400, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xB0500, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0600,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB0600,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x3,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xB0700, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xB0800, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0900,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x4,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB0900,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x4,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xB1000, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(offset=0x0, value=0x1)
+        + Op.MSTORE(offset=0x20, value=0x20)
+        + Op.MSTORE(offset=0x40, value=0x20)
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1100,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x5,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xA1,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB1100,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x5,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0xA1,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xB1200, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x80, value=0x0)
+        + Op.MSTORE(offset=0xA0, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1300,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x2000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0xB1300,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x6,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x3000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xB1400, value=Op.MLOAD(offset=0x3000))
+        + Op.MSTORE(offset=0xB1500, value=Op.MLOAD(offset=0x3020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x3000, value=0x0)
+        + Op.MSTORE(offset=0x3020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x40, value=0x3)
+        + Op.MSTORE(
+            offset=0xA1600,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x7,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x60,
+                ret_offset=0x2000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0xB1600,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x7,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x60,
+                ret_offset=0x3000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xB1700, value=Op.MLOAD(offset=0x3000))
+        + Op.MSTORE(offset=0xB1800, value=Op.MLOAD(offset=0x3020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x3000, value=0x0)
+        + Op.MSTORE(offset=0x3020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xE0,
+            value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x100,
+            value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x120,
+            value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x140,
+            value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x160,
+            value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1900,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x180,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB1900,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x8,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x180,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xB2000, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.RETURN(offset=0xA0000, size=0x12020)
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # {
     #   [[ 0x00 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
     #   (STATICCALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0x0a0000 0x012020)  # noqa: E501
@@ -506,786 +505,135 @@ def test_callcode_to_precompile_from_called_contract(
     #   [[ 0x0a19 ]] @0x0a1900  [[ 0x0b19 ]] @0x0b1900
     #   [[ 0x0a20 ]] @0x0a2000  [[ 0x0b20 ]] @0x0b2000
     # }
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0xA000000000000000000000000000000000000000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0xA0000,
-                    ret_size=0x12020,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.SSTORE(key=0xA00, value=Op.MLOAD(offset=0xA0000))
-            + Op.SSTORE(key=0xB00, value=Op.MLOAD(offset=0xB0000))
-            + Op.SSTORE(key=0xA01, value=Op.MLOAD(offset=0xA0100))
-            + Op.SSTORE(key=0xB01, value=Op.MLOAD(offset=0xB0100))
-            + Op.SSTORE(key=0xA02, value=Op.MLOAD(offset=0xA0200))
-            + Op.SSTORE(key=0xB02, value=Op.MLOAD(offset=0xB0200))
-            + Op.SSTORE(key=0xA03, value=Op.MLOAD(offset=0xA0300))
-            + Op.SSTORE(key=0xB03, value=Op.MLOAD(offset=0xB0300))
-            + Op.SSTORE(key=0xA04, value=Op.MLOAD(offset=0xA0400))
-            + Op.SSTORE(key=0xB04, value=Op.MLOAD(offset=0xB0400))
-            + Op.SSTORE(key=0xA05, value=Op.MLOAD(offset=0xA0500))
-            + Op.SSTORE(key=0xB05, value=Op.MLOAD(offset=0xB0500))
-            + Op.SSTORE(key=0xA06, value=Op.MLOAD(offset=0xA0600))
-            + Op.SSTORE(key=0xB06, value=Op.MLOAD(offset=0xB0600))
-            + Op.SSTORE(key=0xA07, value=Op.MLOAD(offset=0xA0700))
-            + Op.SSTORE(key=0xB07, value=Op.MLOAD(offset=0xB0700))
-            + Op.SSTORE(key=0xA08, value=Op.MLOAD(offset=0xA0800))
-            + Op.SSTORE(key=0xB08, value=Op.MLOAD(offset=0xB0800))
-            + Op.SSTORE(key=0xA09, value=Op.MLOAD(offset=0xA0900))
-            + Op.SSTORE(key=0xB09, value=Op.MLOAD(offset=0xB0900))
-            + Op.SSTORE(key=0xA10, value=Op.MLOAD(offset=0xA1000))
-            + Op.SSTORE(key=0xB10, value=Op.MLOAD(offset=0xB1000))
-            + Op.SSTORE(key=0xA11, value=Op.MLOAD(offset=0xA1100))
-            + Op.SSTORE(key=0xB11, value=Op.MLOAD(offset=0xB1100))
-            + Op.SSTORE(key=0xA12, value=Op.MLOAD(offset=0xA1200))
-            + Op.SSTORE(key=0xB12, value=Op.MLOAD(offset=0xB1200))
-            + Op.SSTORE(key=0xA13, value=Op.MLOAD(offset=0xA1300))
-            + Op.SSTORE(key=0xB13, value=Op.MLOAD(offset=0xB1300))
-            + Op.SSTORE(key=0xA14, value=Op.MLOAD(offset=0xA1400))
-            + Op.SSTORE(key=0xB14, value=Op.MLOAD(offset=0xB1400))
-            + Op.SSTORE(key=0xA15, value=Op.MLOAD(offset=0xA1500))
-            + Op.SSTORE(key=0xB15, value=Op.MLOAD(offset=0xB1500))
-            + Op.SSTORE(key=0xA16, value=Op.MLOAD(offset=0xA1600))
-            + Op.SSTORE(key=0xB16, value=Op.MLOAD(offset=0xB1600))
-            + Op.SSTORE(key=0xA17, value=Op.MLOAD(offset=0xA1700))
-            + Op.SSTORE(key=0xB17, value=Op.MLOAD(offset=0xB1700))
-            + Op.SSTORE(key=0xA18, value=Op.MLOAD(offset=0xA1800))
-            + Op.SSTORE(key=0xB18, value=Op.MLOAD(offset=0xB1800))
-            + Op.SSTORE(key=0xA19, value=Op.MLOAD(offset=0xA1900))
-            + Op.SSTORE(key=0xB19, value=Op.MLOAD(offset=0xB1900))
-            + Op.SSTORE(key=0xA20, value=Op.MLOAD(offset=0xA2000))
-            + Op.SSTORE(key=0xB20, value=Op.MLOAD(offset=0xB2000))
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=contract_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0xA0000,
+                ret_size=0x12020,
+            )
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
+        )
+        + Op.SSTORE(key=0xA00, value=Op.MLOAD(offset=0xA0000))
+        + Op.SSTORE(key=0xB00, value=Op.MLOAD(offset=0xB0000))
+        + Op.SSTORE(key=0xA01, value=Op.MLOAD(offset=0xA0100))
+        + Op.SSTORE(key=0xB01, value=Op.MLOAD(offset=0xB0100))
+        + Op.SSTORE(key=0xA02, value=Op.MLOAD(offset=0xA0200))
+        + Op.SSTORE(key=0xB02, value=Op.MLOAD(offset=0xB0200))
+        + Op.SSTORE(key=0xA03, value=Op.MLOAD(offset=0xA0300))
+        + Op.SSTORE(key=0xB03, value=Op.MLOAD(offset=0xB0300))
+        + Op.SSTORE(key=0xA04, value=Op.MLOAD(offset=0xA0400))
+        + Op.SSTORE(key=0xB04, value=Op.MLOAD(offset=0xB0400))
+        + Op.SSTORE(key=0xA05, value=Op.MLOAD(offset=0xA0500))
+        + Op.SSTORE(key=0xB05, value=Op.MLOAD(offset=0xB0500))
+        + Op.SSTORE(key=0xA06, value=Op.MLOAD(offset=0xA0600))
+        + Op.SSTORE(key=0xB06, value=Op.MLOAD(offset=0xB0600))
+        + Op.SSTORE(key=0xA07, value=Op.MLOAD(offset=0xA0700))
+        + Op.SSTORE(key=0xB07, value=Op.MLOAD(offset=0xB0700))
+        + Op.SSTORE(key=0xA08, value=Op.MLOAD(offset=0xA0800))
+        + Op.SSTORE(key=0xB08, value=Op.MLOAD(offset=0xB0800))
+        + Op.SSTORE(key=0xA09, value=Op.MLOAD(offset=0xA0900))
+        + Op.SSTORE(key=0xB09, value=Op.MLOAD(offset=0xB0900))
+        + Op.SSTORE(key=0xA10, value=Op.MLOAD(offset=0xA1000))
+        + Op.SSTORE(key=0xB10, value=Op.MLOAD(offset=0xB1000))
+        + Op.SSTORE(key=0xA11, value=Op.MLOAD(offset=0xA1100))
+        + Op.SSTORE(key=0xB11, value=Op.MLOAD(offset=0xB1100))
+        + Op.SSTORE(key=0xA12, value=Op.MLOAD(offset=0xA1200))
+        + Op.SSTORE(key=0xB12, value=Op.MLOAD(offset=0xB1200))
+        + Op.SSTORE(key=0xA13, value=Op.MLOAD(offset=0xA1300))
+        + Op.SSTORE(key=0xB13, value=Op.MLOAD(offset=0xB1300))
+        + Op.SSTORE(key=0xA14, value=Op.MLOAD(offset=0xA1400))
+        + Op.SSTORE(key=0xB14, value=Op.MLOAD(offset=0xB1400))
+        + Op.SSTORE(key=0xA15, value=Op.MLOAD(offset=0xA1500))
+        + Op.SSTORE(key=0xB15, value=Op.MLOAD(offset=0xB1500))
+        + Op.SSTORE(key=0xA16, value=Op.MLOAD(offset=0xA1600))
+        + Op.SSTORE(key=0xB16, value=Op.MLOAD(offset=0xB1600))
+        + Op.SSTORE(key=0xA17, value=Op.MLOAD(offset=0xA1700))
+        + Op.SSTORE(key=0xB17, value=Op.MLOAD(offset=0xB1700))
+        + Op.SSTORE(key=0xA18, value=Op.MLOAD(offset=0xA1800))
+        + Op.SSTORE(key=0xB18, value=Op.MLOAD(offset=0xB1800))
+        + Op.SSTORE(key=0xA19, value=Op.MLOAD(offset=0xA1900))
+        + Op.SSTORE(key=0xB19, value=Op.MLOAD(offset=0xB1900))
+        + Op.SSTORE(key=0xA20, value=Op.MLOAD(offset=0xA2000))
+        + Op.SSTORE(key=0xB20, value=Op.MLOAD(offset=0xB2000))
+        + Op.STOP,
         storage={
-            0x0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-            0x1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
+            0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
+            1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
         },
         balance=1000,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
     #   [[ 0x00 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
     #   (CALL (GAS) 0xb000000000000000000000000000000000000000 0 0 0 0 0)
     #   [[ 0x01 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xB000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
+        )
+        + Op.STOP,
         storage={
-            0x0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-            0x1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
+            0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
+            1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
         },
         balance=1000,
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=4000000,
         value=100,
     )
 
     post = {
-        callee_1: Account(
+        contract_2: Account(storage={}, balance=1000),
+        contract_0: Account(
             storage={
                 0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
                 1: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-                2560: 1,
-                2561: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                2562: 1,
-                2563: 1,
-                2564: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2565: 0x73F5062FB68ED2A1EC82FF8C73F9251BB9CF53A623BC93527E16BC5AE29DAD74,  # noqa: E501
-                2566: 1,
-                2567: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2568: 0x14EF238CFA4075E9EDE92F18B1566C1DD0B99AAA,
-                2569: 1,
-                2576: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2577: 1,
-                2578: 1,
-                2579: 1,
-                2580: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2581: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2582: 1,
-                2583: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2584: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2585: 1,
-                2592: 1,
-                2816: 1,
-                2817: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                2818: 1,
-                2819: 1,
-                2820: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2821: 0x73F5062FB68ED2A1EC82FF8C73F9251BB9CF53A623BC93527E16BC5AE29DAD74,  # noqa: E501
-                2822: 1,
-                2823: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2824: 0x14EF238CFA4075E9EDE92F18B1566C1DD0B99AAA,
-                2825: 1,
-                2832: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2833: 1,
-                2834: 1,
-                2835: 1,
-                2836: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2837: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2838: 1,
-                2839: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2840: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2841: 1,
-                2848: 1,
             },
+            balance=1100,
         ),
-        contract: Account(
-            storage={
-                0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-                1: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticFlagEnabled/CallcodeToPrecompileFromCalledContractFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.pre_alloc_mutable
-def test_callcode_to_precompile_from_called_contract_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Contract C calls contract B."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    # Source: LLL
-    # {
-    #   ;; Recovery of ECDSA signature
-    #   [ 0x00 ] 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c  # noqa: E501
-    #   [ 0x20 ] 28
-    #   [ 0x40 ] 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f  # noqa: E501
-    #   [ 0x60 ] 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549  # noqa: E501
-    #   ;; zero value
-    #   [ 0x0a0000 ] (CALLCODE (GAS) 1 0 0 128 0x2000 32)
-    #   [ 0x0a0100 ] (MOD @0x2000 (EXP 2 160))
-    #   [ 0x0a0200 ] (EQ (ORIGIN) @0x0a0100)
-    #   [ 0x2000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   ;; non zero value
-    #   [ 0x0b0000 ] (CALLCODE (GAS) 1 1 0 128 0x2020 32)
-    #   [ 0x0b0100 ] (MOD @0x2020 (EXP 2 160))
-    #   [ 0x0b0200 ] (EQ (ORIGIN) @0x0b0100)
-    #   [ 0x00 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x20 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x40 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x60 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x2020 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #
-    #   ;; Hash function SHA256
-    #   [ 0x00 ] 0x0000000ccccccccccccccccccccccccccccccccccccccccccccccccccc000000  # noqa: E501
-    #   ;; zero value
-    #   [ 0x0a0300 ] (CALLCODE (GAS) 2 0 0 32 0x2000 32)
-    #   [ 0x0a0400 ] @0
-    #   [ 0x0a0500 ] @0x2000
-    #   [ 0x2000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   ;; non zero value
-    #   [ 0x0b0300 ] (CALLCODE (GAS) 2 1 0 32 0x2020 32)
-    # ... (121 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0000,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xA0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xA0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100)),
-            )
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0000,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x1,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xB0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2020), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xB0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xB0100)),
-            )
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x2,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xB0500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x3,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xB0800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x4,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1000, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.MSTORE(offset=0x20, value=0x20)
-            + Op.MSTORE(offset=0x40, value=0x20)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1100,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1100,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x5,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1200, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x80, value=0x0)
-            + Op.MSTORE(offset=0xA0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x6,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x3000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1400, value=Op.MLOAD(offset=0x3000))
-            + Op.MSTORE(offset=0xB1500, value=Op.MLOAD(offset=0x3020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x3000, value=0x0)
-            + Op.MSTORE(offset=0x3020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x40, value=0x3)
-            + Op.MSTORE(
-                offset=0xA1600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x7,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x3000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1700, value=Op.MLOAD(offset=0x3000))
-            + Op.MSTORE(offset=0xB1800, value=Op.MLOAD(offset=0x3020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x3000, value=0x0)
-            + Op.MSTORE(offset=0x3020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xE0,
-                value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x140,
-                value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x8,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB2000, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.RETURN(offset=0xA0000, size=0x12020)
-            + Op.STOP
-        ),
-        balance=1000,
-        nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {
-    #   [[ 0x00 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
-    #   (STATICCALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0x0a0000 0x012020)  # noqa: E501
-    #   [[ 0x01 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
-    #   ;; save results to store
-    #   [[ 0x0a00 ]] @0x0a0000  [[ 0x0b00 ]] @0x0b0000
-    #   [[ 0x0a01 ]] @0x0a0100  [[ 0x0b01 ]] @0x0b0100
-    #   [[ 0x0a02 ]] @0x0a0200  [[ 0x0b02 ]] @0x0b0200
-    #   [[ 0x0a03 ]] @0x0a0300  [[ 0x0b03 ]] @0x0b0300
-    #   [[ 0x0a04 ]] @0x0a0400  [[ 0x0b04 ]] @0x0b0400
-    #   [[ 0x0a05 ]] @0x0a0500  [[ 0x0b05 ]] @0x0b0500
-    #   [[ 0x0a06 ]] @0x0a0600  [[ 0x0b06 ]] @0x0b0600
-    #   [[ 0x0a07 ]] @0x0a0700  [[ 0x0b07 ]] @0x0b0700
-    #   [[ 0x0a08 ]] @0x0a0800  [[ 0x0b08 ]] @0x0b0800
-    #   [[ 0x0a09 ]] @0x0a0900  [[ 0x0b09 ]] @0x0b0900
-    #   [[ 0x0a10 ]] @0x0a1000  [[ 0x0b10 ]] @0x0b1000
-    #   [[ 0x0a11 ]] @0x0a1100  [[ 0x0b11 ]] @0x0b1100
-    #   [[ 0x0a12 ]] @0x0a1200  [[ 0x0b12 ]] @0x0b1200
-    #   [[ 0x0a13 ]] @0x0a1300  [[ 0x0b13 ]] @0x0b1300
-    #   [[ 0x0a14 ]] @0x0a1400  [[ 0x0b14 ]] @0x0b1400
-    #   [[ 0x0a15 ]] @0x0a1500  [[ 0x0b15 ]] @0x0b1500
-    #   [[ 0x0a16 ]] @0x0a1600  [[ 0x0b16 ]] @0x0b1600
-    #   [[ 0x0a17 ]] @0x0a1700  [[ 0x0b17 ]] @0x0b1700
-    #   [[ 0x0a18 ]] @0x0a1800  [[ 0x0b18 ]] @0x0b1800
-    #   [[ 0x0a19 ]] @0x0a1900  [[ 0x0b19 ]] @0x0b1900
-    #   [[ 0x0a20 ]] @0x0a2000  [[ 0x0b20 ]] @0x0b2000
-    # }
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0xA000000000000000000000000000000000000000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0xA0000,
-                    ret_size=0x12020,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.SSTORE(key=0xA00, value=Op.MLOAD(offset=0xA0000))
-            + Op.SSTORE(key=0xB00, value=Op.MLOAD(offset=0xB0000))
-            + Op.SSTORE(key=0xA01, value=Op.MLOAD(offset=0xA0100))
-            + Op.SSTORE(key=0xB01, value=Op.MLOAD(offset=0xB0100))
-            + Op.SSTORE(key=0xA02, value=Op.MLOAD(offset=0xA0200))
-            + Op.SSTORE(key=0xB02, value=Op.MLOAD(offset=0xB0200))
-            + Op.SSTORE(key=0xA03, value=Op.MLOAD(offset=0xA0300))
-            + Op.SSTORE(key=0xB03, value=Op.MLOAD(offset=0xB0300))
-            + Op.SSTORE(key=0xA04, value=Op.MLOAD(offset=0xA0400))
-            + Op.SSTORE(key=0xB04, value=Op.MLOAD(offset=0xB0400))
-            + Op.SSTORE(key=0xA05, value=Op.MLOAD(offset=0xA0500))
-            + Op.SSTORE(key=0xB05, value=Op.MLOAD(offset=0xB0500))
-            + Op.SSTORE(key=0xA06, value=Op.MLOAD(offset=0xA0600))
-            + Op.SSTORE(key=0xB06, value=Op.MLOAD(offset=0xB0600))
-            + Op.SSTORE(key=0xA07, value=Op.MLOAD(offset=0xA0700))
-            + Op.SSTORE(key=0xB07, value=Op.MLOAD(offset=0xB0700))
-            + Op.SSTORE(key=0xA08, value=Op.MLOAD(offset=0xA0800))
-            + Op.SSTORE(key=0xB08, value=Op.MLOAD(offset=0xB0800))
-            + Op.SSTORE(key=0xA09, value=Op.MLOAD(offset=0xA0900))
-            + Op.SSTORE(key=0xB09, value=Op.MLOAD(offset=0xB0900))
-            + Op.SSTORE(key=0xA10, value=Op.MLOAD(offset=0xA1000))
-            + Op.SSTORE(key=0xB10, value=Op.MLOAD(offset=0xB1000))
-            + Op.SSTORE(key=0xA11, value=Op.MLOAD(offset=0xA1100))
-            + Op.SSTORE(key=0xB11, value=Op.MLOAD(offset=0xB1100))
-            + Op.SSTORE(key=0xA12, value=Op.MLOAD(offset=0xA1200))
-            + Op.SSTORE(key=0xB12, value=Op.MLOAD(offset=0xB1200))
-            + Op.SSTORE(key=0xA13, value=Op.MLOAD(offset=0xA1300))
-            + Op.SSTORE(key=0xB13, value=Op.MLOAD(offset=0xB1300))
-            + Op.SSTORE(key=0xA14, value=Op.MLOAD(offset=0xA1400))
-            + Op.SSTORE(key=0xB14, value=Op.MLOAD(offset=0xB1400))
-            + Op.SSTORE(key=0xA15, value=Op.MLOAD(offset=0xA1500))
-            + Op.SSTORE(key=0xB15, value=Op.MLOAD(offset=0xB1500))
-            + Op.SSTORE(key=0xA16, value=Op.MLOAD(offset=0xA1600))
-            + Op.SSTORE(key=0xB16, value=Op.MLOAD(offset=0xB1600))
-            + Op.SSTORE(key=0xA17, value=Op.MLOAD(offset=0xA1700))
-            + Op.SSTORE(key=0xB17, value=Op.MLOAD(offset=0xB1700))
-            + Op.SSTORE(key=0xA18, value=Op.MLOAD(offset=0xA1800))
-            + Op.SSTORE(key=0xB18, value=Op.MLOAD(offset=0xB1800))
-            + Op.SSTORE(key=0xA19, value=Op.MLOAD(offset=0xA1900))
-            + Op.SSTORE(key=0xB19, value=Op.MLOAD(offset=0xB1900))
-            + Op.SSTORE(key=0xA20, value=Op.MLOAD(offset=0xA2000))
-            + Op.SSTORE(key=0xB20, value=Op.MLOAD(offset=0xB2000))
-            + Op.STOP
-        ),
-        storage={
-            0x0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-            0x1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-        },
-        balance=1000,
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   [[ 0x00 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
-    #   (CALL (GAS) 0xb000000000000000000000000000000000000000 0 0 0 0 0)
-    #   [[ 0x01 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xB000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.STOP
-        ),
-        storage={
-            0x0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-            0x1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-        },
-        balance=1000,
-        nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        gas_limit=4000000,
-        value=100,
-    )
-
-    post = {
-        callee_1: Account(
+        contract_1: Account(
             storage={
                 0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
                 1: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
                 2560: 1,
-                2561: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                2561: sender,
                 2562: 1,
                 2563: 1,
                 2564: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
@@ -1306,7 +654,7 @@ def test_callcode_to_precompile_from_called_contract_from_osaka(
                 2585: 1,
                 2592: 1,
                 2816: 1,
-                2817: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                2817: sender,
                 2818: 1,
                 2819: 1,
                 2820: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
@@ -1327,12 +675,7 @@ def test_callcode_to_precompile_from_called_contract_from_osaka(
                 2841: 1,
                 2848: 1,
             },
-        ),
-        contract: Account(
-            storage={
-                0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-                1: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            },
+            balance=1000,
         ),
     }
 
diff --git a/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_contract_initialization.py b/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_contract_initialization.py
index 69ca5f41ce8..ae2ff697bbd 100644
--- a/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_contract_initialization.py
+++ b/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_contract_initialization.py
@@ -5,9 +5,9 @@
 Contract A callcodes precompiled contracts.
 It should execute successfully for each precompiled contract.
 
+
 Ported from:
-tests/static/state_tests/stStaticFlagEnabled
-CallcodeToPrecompileFromContractInitializationFiller.yml
+state_tests/stStaticFlagEnabled/CallcodeToPrecompileFromContractInitializationFiller.yml
 """
 
 import pytest
@@ -16,6 +16,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -28,18 +29,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticFlagEnabled/CallcodeToPrecompileFromContractInitializationFiller.yml",  # noqa: E501
+        "state_tests/stStaticFlagEnabled/CallcodeToPrecompileFromContractInitializationFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
 @pytest.mark.pre_alloc_mutable
 def test_callcode_to_precompile_from_contract_initialization(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """Contract B creates new contract."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
+    coinbase = Address(0xCAFE000000000000000000000000000000000001)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xA000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -53,582 +55,40 @@ def test_callcode_to_precompile_from_contract_initialization(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # {
-    #   ;; Recovery of ECDSA signature
-    #   [ 0x00 ] 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c  # noqa: E501
-    #   [ 0x20 ] 28
-    #   [ 0x40 ] 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f  # noqa: E501
-    #   [ 0x60 ] 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549  # noqa: E501
-    #   ;; zero value
-    #   [ 0x0a0000 ] (CALLCODE (GAS) 1 0 0 128 0x2000 32)
-    #   [ 0x0a0100 ] (MOD @0x2000 (EXP 2 160))
-    #   [ 0x0a0200 ] (EQ (ORIGIN) @0x0a0100)
-    #   [ 0x2000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   ;; non zero value
-    #   [ 0x0b0000 ] (CALLCODE (GAS) 1 1 0 128 0x2020 32)
-    #   [ 0x0b0100 ] (MOD @0x2020 (EXP 2 160))
-    #   [ 0x0b0200 ] (EQ (ORIGIN) @0x0b0100)
-    #   [ 0x00 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x20 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x40 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x60 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x2020 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #
-    #   ;; Hash function SHA256
-    #   [ 0x00 ] 0x0000000ccccccccccccccccccccccccccccccccccccccccccccccccccc000000  # noqa: E501
-    #   ;; zero value
-    #   [ 0x0a0300 ] (CALLCODE (GAS) 2 0 0 32 0x2000 32)
-    #   [ 0x0a0400 ] @0
-    #   [ 0x0a0500 ] @0x2000
-    #   [ 0x2000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   ;; non zero value
-    #   [ 0x0b0300 ] (CALLCODE (GAS) 2 1 0 32 0x2020 32)
-    # ... (121 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0000,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xA0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xA0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100)),
-            )
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0000,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x1,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xB0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2020), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xB0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xB0100)),
-            )
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x2,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xB0500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x3,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xB0800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x4,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1000, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.MSTORE(offset=0x20, value=0x20)
-            + Op.MSTORE(offset=0x40, value=0x20)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1100,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1100,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x5,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1200, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x80, value=0x0)
-            + Op.MSTORE(offset=0xA0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x6,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x3000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1400, value=Op.MLOAD(offset=0x3000))
-            + Op.MSTORE(offset=0xB1500, value=Op.MLOAD(offset=0x3020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x3000, value=0x0)
-            + Op.MSTORE(offset=0x3020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x40, value=0x3)
-            + Op.MSTORE(
-                offset=0xA1600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x7,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x3000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1700, value=Op.MLOAD(offset=0x3000))
-            + Op.MSTORE(offset=0xB1800, value=Op.MLOAD(offset=0x3020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x3000, value=0x0)
-            + Op.MSTORE(offset=0x3020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xE0,
-                value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x140,
-                value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x8,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB2000, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.RETURN(offset=0xA0000, size=0x12020)
-            + Op.STOP
-        ),
-        balance=1000,
-        nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # {
     #   [[ 0x00 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
     #   (CALLDATACOPY 0 0 (CALLDATASIZE))
     #   [[ 0x01 ]] (CREATE2 0 0 (CALLDATASIZE) 0x5a175a17)
     #   [[ 0x02 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x0, offset=0x0, size=Op.CALLDATASIZE
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CREATE2(
-                    value=0x0,
-                    offset=0x0,
-                    size=Op.CALLDATASIZE,
-                    salt=0x5A175A17,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
+        )
+        + Op.CALLDATACOPY(dest_offset=0x0, offset=0x0, size=Op.CALLDATASIZE)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CREATE2(
+                value=0x0, offset=0x0, size=Op.CALLDATASIZE, salt=0x5A175A17
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
+        )
+        + Op.STOP,
         storage={
-            0x0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-            0x1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
+            0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
+            1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
         },
         balance=1000,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed600055"  # noqa: E501
-            "62012020620a00006000600073a0000000000000000000000000000000000000005afa50"  # noqa: E501
-            "7ffeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed600155"  # noqa: E501
-            "620a000051610a0055620b000051610b0055620a010051610a0155620b010051610b0155"  # noqa: E501
-            "620a020051610a0255620b020051610b0255620a030051610a0355620b030051610b0355"  # noqa: E501
-            "620a040051610a0455620b040051610b0455620a050051610a0555620b050051610b0555"  # noqa: E501
-            "620a060051610a0655620b060051610b0655620a070051610a0755620b070051610b0755"  # noqa: E501
-            "620a080051610a0855620b080051610b0855620a090051610a0955620b090051610b0955"  # noqa: E501
-            "620a100051610a1055620b100051610b1055620a110051610a1155620b110051610b1155"  # noqa: E501
-            "620a120051610a1255620b120051610b1255620a130051610a1355620b130051610b1355"  # noqa: E501
-            "620a140051610a1455620b140051610b1455620a150051610a1555620b150051610b1555"  # noqa: E501
-            "620a160051610a1655620b160051610b1655620a170051610a1755620b170051610b1755"  # noqa: E501
-            "620a180051610a1855620b180051610b1855620a190051610a1955620b190051610b1955"  # noqa: E501
-            "620a200051610a2055620b200051610b205500"
-        ),
-        gas_limit=4000000,
-        value=100,
-    )
-
-    post = {
-        contract: Account(
-            storage={
-                0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-                1: 0xB2BC42A2D3B34F228BA399E53AB6F1B3D2672177,
-                2: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            },
-        ),
-        Address("0xb2bc42a2d3b34f228ba399e53ab6f1b3d2672177"): Account(
-            storage={
-                0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-                1: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-                2560: 1,
-                2561: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                2562: 1,
-                2563: 1,
-                2564: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2565: 0x73F5062FB68ED2A1EC82FF8C73F9251BB9CF53A623BC93527E16BC5AE29DAD74,  # noqa: E501
-                2566: 1,
-                2567: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2568: 0x14EF238CFA4075E9EDE92F18B1566C1DD0B99AAA,
-                2569: 1,
-                2576: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2577: 1,
-                2578: 1,
-                2579: 1,
-                2580: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2581: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2582: 1,
-                2583: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2584: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2585: 1,
-                2592: 1,
-                2816: 1,
-                2817: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                2818: 1,
-                2819: 1,
-                2820: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2821: 0x73F5062FB68ED2A1EC82FF8C73F9251BB9CF53A623BC93527E16BC5AE29DAD74,  # noqa: E501
-                2822: 1,
-                2823: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2824: 0x14EF238CFA4075E9EDE92F18B1566C1DD0B99AAA,
-                2825: 1,
-                2832: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2833: 1,
-                2834: 1,
-                2835: 1,
-                2836: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2837: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2838: 1,
-                2839: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2840: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2841: 1,
-                2848: 1,
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticFlagEnabled/CallcodeToPrecompileFromContractInitializationFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.pre_alloc_mutable
-def test_callcode_to_precompile_from_contract_initialization_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Contract B creates new contract."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-
-    # Source: LLL
+    # Source: lll
     # {
     #   ;; Recovery of ECDSA signature
     #   [ 0x00 ] 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c  # noqa: E501
@@ -660,476 +120,420 @@ def test_callcode_to_precompile_from_contract_initialization_from_osaka(
     #   ;; non zero value
     #   [ 0x0b0300 ] (CALLCODE (GAS) 2 1 0 32 0x2020 32)
     # ... (121 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0000,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xA0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xA0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100)),
-            )
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0000,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x1,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xB0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2020), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xB0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xB0100)),
-            )
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x2,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xB0500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x3,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xB0800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x4,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1000, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.MSTORE(offset=0x20, value=0x20)
-            + Op.MSTORE(offset=0x40, value=0x20)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1100,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1100,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x5,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1200, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x80, value=0x0)
-            + Op.MSTORE(offset=0xA0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x6,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x3000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1400, value=Op.MLOAD(offset=0x3000))
-            + Op.MSTORE(offset=0xB1500, value=Op.MLOAD(offset=0x3020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x3000, value=0x0)
-            + Op.MSTORE(offset=0x3020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x40, value=0x3)
-            + Op.MSTORE(
-                offset=0xA1600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x7,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x3000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1700, value=Op.MLOAD(offset=0x3000))
-            + Op.MSTORE(offset=0xB1800, value=Op.MLOAD(offset=0x3020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x3000, value=0x0)
-            + Op.MSTORE(offset=0x3020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xE0,
-                value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x140,
-                value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x8,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB2000, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.RETURN(offset=0xA0000, size=0x12020)
-            + Op.STOP
-        ),
-        balance=1000,
-        nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {
-    #   [[ 0x00 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
-    #   (CALLDATACOPY 0 0 (CALLDATASIZE))
-    #   [[ 0x01 ]] (CREATE2 0 0 (CALLDATASIZE) 0x5a175a17)
-    #   [[ 0x02 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x0, offset=0x0, size=Op.CALLDATASIZE
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CREATE2(
-                    value=0x0,
-                    offset=0x0,
-                    size=Op.CALLDATASIZE,
-                    salt=0x5A175A17,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.STOP
-        ),
-        storage={
-            0x0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-            0x1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-        },
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0000,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(
+            offset=0xA0100,
+            value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
+        )
+        + Op.MSTORE(
+            offset=0xA0200, value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100))
+        )
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB0000,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x1,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(
+            offset=0xB0100,
+            value=Op.MOD(Op.MLOAD(offset=0x2020), Op.EXP(0x2, 0xA0)),
+        )
+        + Op.MSTORE(
+            offset=0xB0200, value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xB0100))
+        )
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0300,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB0300,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x2,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xB0400, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xB0500, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0600,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB0600,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x3,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xB0700, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xB0800, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0900,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x4,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB0900,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x4,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xB1000, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(offset=0x0, value=0x1)
+        + Op.MSTORE(offset=0x20, value=0x20)
+        + Op.MSTORE(offset=0x40, value=0x20)
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1100,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x5,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xA1,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB1100,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x5,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0xA1,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xB1200, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x80, value=0x0)
+        + Op.MSTORE(offset=0xA0, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1300,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x2000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0xB1300,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x6,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x3000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xB1400, value=Op.MLOAD(offset=0x3000))
+        + Op.MSTORE(offset=0xB1500, value=Op.MLOAD(offset=0x3020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x3000, value=0x0)
+        + Op.MSTORE(offset=0x3020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x40, value=0x3)
+        + Op.MSTORE(
+            offset=0xA1600,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x7,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x60,
+                ret_offset=0x2000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0xB1600,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x7,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x60,
+                ret_offset=0x3000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xB1700, value=Op.MLOAD(offset=0x3000))
+        + Op.MSTORE(offset=0xB1800, value=Op.MLOAD(offset=0x3020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x3000, value=0x0)
+        + Op.MSTORE(offset=0x3020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xE0,
+            value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x100,
+            value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x120,
+            value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x140,
+            value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x160,
+            value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1900,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x180,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB1900,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x8,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x180,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xB2000, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.RETURN(offset=0xA0000, size=0x12020)
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed600055"  # noqa: E501
-            "62012020620a00006000600073a0000000000000000000000000000000000000005afa50"  # noqa: E501
-            "7ffeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed600155"  # noqa: E501
-            "620a000051610a0055620b000051610b0055620a010051610a0155620b010051610b0155"  # noqa: E501
-            "620a020051610a0255620b020051610b0255620a030051610a0355620b030051610b0355"  # noqa: E501
-            "620a040051610a0455620b040051610b0455620a050051610a0555620b050051610b0555"  # noqa: E501
-            "620a060051610a0655620b060051610b0655620a070051610a0755620b070051610b0755"  # noqa: E501
-            "620a080051610a0855620b080051610b0855620a090051610a0955620b090051610b0955"  # noqa: E501
-            "620a100051610a1055620b100051610b1055620a110051610a1155620b110051610b1155"  # noqa: E501
-            "620a120051610a1255620b120051610b1255620a130051610a1355620b130051610b1355"  # noqa: E501
-            "620a140051610a1455620b140051610b1455620a150051610a1555620b150051610b1555"  # noqa: E501
-            "620a160051610a1655620b160051610b1655620a170051610a1755620b170051610b1755"  # noqa: E501
-            "620a180051610a1855620b180051610b1855620a190051610a1955620b190051610b1955"  # noqa: E501
-            "620a200051610a2055620b200051610b205500"
+        to=contract_0,
+        data=Bytes(
+            "7ffeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed60005562012020620a00006000600073a0000000000000000000000000000000000000005afa507ffeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed600155620a000051610a0055620b000051610b0055620a010051610a0155620b010051610b0155620a020051610a0255620b020051610b0255620a030051610a0355620b030051610b0355620a040051610a0455620b040051610b0455620a050051610a0555620b050051610b0555620a060051610a0655620b060051610b0655620a070051610a0755620b070051610b0755620a080051610a0855620b080051610b0855620a090051610a0955620b090051610b0955620a100051610a1055620b100051610b1055620a110051610a1155620b110051610b1155620a120051610a1255620b120051610b1255620a130051610a1355620b130051610b1355620a140051610a1455620b140051610b1455620a150051610a1555620b150051610b1555620a160051610a1655620b160051610b1655620a170051610a1755620b170051610b1755620a180051610a1855620b180051610b1855620a190051610a1955620b190051610b1955620a200051610a2055620b200051610b205500"  # noqa: E501
         ),
         gas_limit=4000000,
         value=100,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
                 1: 0xB2BC42A2D3B34F228BA399E53AB6F1B3D2672177,
                 2: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
             },
+            balance=1100,
         ),
-        Address("0xb2bc42a2d3b34f228ba399e53ab6f1b3d2672177"): Account(
+        Address(0xB2BC42A2D3B34F228BA399E53AB6F1B3D2672177): Account(
             storage={
                 0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
                 1: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
                 2560: 1,
-                2561: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                2561: sender,
                 2562: 1,
                 2563: 1,
                 2564: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
@@ -1150,7 +554,7 @@ def test_callcode_to_precompile_from_contract_initialization_from_osaka(
                 2585: 1,
                 2592: 1,
                 2816: 1,
-                2817: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                2817: sender,
                 2818: 1,
                 2819: 1,
                 2820: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
diff --git a/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_transaction.py b/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_transaction.py
index f6f1aa9892c..634fa6832d9 100644
--- a/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_transaction.py
+++ b/tests/ported_static/stStaticFlagEnabled/test_callcode_to_precompile_from_transaction.py
@@ -4,9 +4,9 @@
 Contract A callcodes precompiled contracts.
 It should execute successfully for each precompiled contract.
 
+
 Ported from:
-tests/static/state_tests/stStaticFlagEnabled
-CallcodeToPrecompileFromTransactionFiller.yml
+state_tests/stStaticFlagEnabled/CallcodeToPrecompileFromTransactionFiller.yml
 """
 
 import pytest
@@ -15,6 +15,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -27,18 +28,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticFlagEnabled/CallcodeToPrecompileFromTransactionFiller.yml",  # noqa: E501
+        "state_tests/stStaticFlagEnabled/CallcodeToPrecompileFromTransactionFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
 @pytest.mark.pre_alloc_mutable
 def test_callcode_to_precompile_from_transaction(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """Contract B staticcalls contract A."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
+    coinbase = Address(0xCAFE000000000000000000000000000000000001)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xA000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -52,620 +54,8 @@ def test_callcode_to_precompile_from_transaction(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # {
-    #   ;; Recovery of ECDSA signature
-    #   [ 0x00 ] 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c  # noqa: E501
-    #   [ 0x20 ] 28
-    #   [ 0x40 ] 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f  # noqa: E501
-    #   [ 0x60 ] 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549  # noqa: E501
-    #   ;; zero value
-    #   [ 0x0a0000 ] (CALLCODE (GAS) 1 0 0 128 0x2000 32)
-    #   [ 0x0a0100 ] (MOD @0x2000 (EXP 2 160))
-    #   [ 0x0a0200 ] (EQ (ORIGIN) @0x0a0100)
-    #   [ 0x2000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   ;; non zero value
-    #   [ 0x0b0000 ] (CALLCODE (GAS) 1 1 0 128 0x2020 32)
-    #   [ 0x0b0100 ] (MOD @0x2020 (EXP 2 160))
-    #   [ 0x0b0200 ] (EQ (ORIGIN) @0x0b0100)
-    #   [ 0x00 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x20 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x40 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x60 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x2020 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #
-    #   ;; Hash function SHA256
-    #   [ 0x00 ] 0x0000000ccccccccccccccccccccccccccccccccccccccccccccccccccc000000  # noqa: E501
-    #   ;; zero value
-    #   [ 0x0a0300 ] (CALLCODE (GAS) 2 0 0 32 0x2000 32)
-    #   [ 0x0a0400 ] @0
-    #   [ 0x0a0500 ] @0x2000
-    #   [ 0x2000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   ;; non zero value
-    #   [ 0x0b0300 ] (CALLCODE (GAS) 2 1 0 32 0x2020 32)
-    # ... (121 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0000,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xA0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xA0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100)),
-            )
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0000,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x1,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xB0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2020), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xB0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xB0100)),
-            )
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x2,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xB0500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x3,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xB0800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x4,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1000, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.MSTORE(offset=0x20, value=0x20)
-            + Op.MSTORE(offset=0x40, value=0x20)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1100,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1100,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x5,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1200, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x80, value=0x0)
-            + Op.MSTORE(offset=0xA0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x6,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x3000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1400, value=Op.MLOAD(offset=0x3000))
-            + Op.MSTORE(offset=0xB1500, value=Op.MLOAD(offset=0x3020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x3000, value=0x0)
-            + Op.MSTORE(offset=0x3020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x40, value=0x3)
-            + Op.MSTORE(
-                offset=0xA1600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x7,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x3000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1700, value=Op.MLOAD(offset=0x3000))
-            + Op.MSTORE(offset=0xB1800, value=Op.MLOAD(offset=0x3020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x3000, value=0x0)
-            + Op.MSTORE(offset=0x3020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xE0,
-                value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x140,
-                value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x8,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB2000, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.RETURN(offset=0xA0000, size=0x12020)
-            + Op.STOP
-        ),
-        balance=1000,
-        nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {
-    #   [[ 0x00 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
-    #   (STATICCALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0x0a0000 0x012020)  # noqa: E501
-    #   [[ 0x01 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
-    #   ;; save results to store
-    #   [[ 0x0a00 ]] @0x0a0000  [[ 0x0b00 ]] @0x0b0000
-    #   [[ 0x0a01 ]] @0x0a0100  [[ 0x0b01 ]] @0x0b0100
-    #   [[ 0x0a02 ]] @0x0a0200  [[ 0x0b02 ]] @0x0b0200
-    #   [[ 0x0a03 ]] @0x0a0300  [[ 0x0b03 ]] @0x0b0300
-    #   [[ 0x0a04 ]] @0x0a0400  [[ 0x0b04 ]] @0x0b0400
-    #   [[ 0x0a05 ]] @0x0a0500  [[ 0x0b05 ]] @0x0b0500
-    #   [[ 0x0a06 ]] @0x0a0600  [[ 0x0b06 ]] @0x0b0600
-    #   [[ 0x0a07 ]] @0x0a0700  [[ 0x0b07 ]] @0x0b0700
-    #   [[ 0x0a08 ]] @0x0a0800  [[ 0x0b08 ]] @0x0b0800
-    #   [[ 0x0a09 ]] @0x0a0900  [[ 0x0b09 ]] @0x0b0900
-    #   [[ 0x0a10 ]] @0x0a1000  [[ 0x0b10 ]] @0x0b1000
-    #   [[ 0x0a11 ]] @0x0a1100  [[ 0x0b11 ]] @0x0b1100
-    #   [[ 0x0a12 ]] @0x0a1200  [[ 0x0b12 ]] @0x0b1200
-    #   [[ 0x0a13 ]] @0x0a1300  [[ 0x0b13 ]] @0x0b1300
-    #   [[ 0x0a14 ]] @0x0a1400  [[ 0x0b14 ]] @0x0b1400
-    #   [[ 0x0a15 ]] @0x0a1500  [[ 0x0b15 ]] @0x0b1500
-    #   [[ 0x0a16 ]] @0x0a1600  [[ 0x0b16 ]] @0x0b1600
-    #   [[ 0x0a17 ]] @0x0a1700  [[ 0x0b17 ]] @0x0b1700
-    #   [[ 0x0a18 ]] @0x0a1800  [[ 0x0b18 ]] @0x0b1800
-    #   [[ 0x0a19 ]] @0x0a1900  [[ 0x0b19 ]] @0x0b1900
-    #   [[ 0x0a20 ]] @0x0a2000  [[ 0x0b20 ]] @0x0b2000
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0xA000000000000000000000000000000000000000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0xA0000,
-                    ret_size=0x12020,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.SSTORE(key=0xA00, value=Op.MLOAD(offset=0xA0000))
-            + Op.SSTORE(key=0xB00, value=Op.MLOAD(offset=0xB0000))
-            + Op.SSTORE(key=0xA01, value=Op.MLOAD(offset=0xA0100))
-            + Op.SSTORE(key=0xB01, value=Op.MLOAD(offset=0xB0100))
-            + Op.SSTORE(key=0xA02, value=Op.MLOAD(offset=0xA0200))
-            + Op.SSTORE(key=0xB02, value=Op.MLOAD(offset=0xB0200))
-            + Op.SSTORE(key=0xA03, value=Op.MLOAD(offset=0xA0300))
-            + Op.SSTORE(key=0xB03, value=Op.MLOAD(offset=0xB0300))
-            + Op.SSTORE(key=0xA04, value=Op.MLOAD(offset=0xA0400))
-            + Op.SSTORE(key=0xB04, value=Op.MLOAD(offset=0xB0400))
-            + Op.SSTORE(key=0xA05, value=Op.MLOAD(offset=0xA0500))
-            + Op.SSTORE(key=0xB05, value=Op.MLOAD(offset=0xB0500))
-            + Op.SSTORE(key=0xA06, value=Op.MLOAD(offset=0xA0600))
-            + Op.SSTORE(key=0xB06, value=Op.MLOAD(offset=0xB0600))
-            + Op.SSTORE(key=0xA07, value=Op.MLOAD(offset=0xA0700))
-            + Op.SSTORE(key=0xB07, value=Op.MLOAD(offset=0xB0700))
-            + Op.SSTORE(key=0xA08, value=Op.MLOAD(offset=0xA0800))
-            + Op.SSTORE(key=0xB08, value=Op.MLOAD(offset=0xB0800))
-            + Op.SSTORE(key=0xA09, value=Op.MLOAD(offset=0xA0900))
-            + Op.SSTORE(key=0xB09, value=Op.MLOAD(offset=0xB0900))
-            + Op.SSTORE(key=0xA10, value=Op.MLOAD(offset=0xA1000))
-            + Op.SSTORE(key=0xB10, value=Op.MLOAD(offset=0xB1000))
-            + Op.SSTORE(key=0xA11, value=Op.MLOAD(offset=0xA1100))
-            + Op.SSTORE(key=0xB11, value=Op.MLOAD(offset=0xB1100))
-            + Op.SSTORE(key=0xA12, value=Op.MLOAD(offset=0xA1200))
-            + Op.SSTORE(key=0xB12, value=Op.MLOAD(offset=0xB1200))
-            + Op.SSTORE(key=0xA13, value=Op.MLOAD(offset=0xA1300))
-            + Op.SSTORE(key=0xB13, value=Op.MLOAD(offset=0xB1300))
-            + Op.SSTORE(key=0xA14, value=Op.MLOAD(offset=0xA1400))
-            + Op.SSTORE(key=0xB14, value=Op.MLOAD(offset=0xB1400))
-            + Op.SSTORE(key=0xA15, value=Op.MLOAD(offset=0xA1500))
-            + Op.SSTORE(key=0xB15, value=Op.MLOAD(offset=0xB1500))
-            + Op.SSTORE(key=0xA16, value=Op.MLOAD(offset=0xA1600))
-            + Op.SSTORE(key=0xB16, value=Op.MLOAD(offset=0xB1600))
-            + Op.SSTORE(key=0xA17, value=Op.MLOAD(offset=0xA1700))
-            + Op.SSTORE(key=0xB17, value=Op.MLOAD(offset=0xB1700))
-            + Op.SSTORE(key=0xA18, value=Op.MLOAD(offset=0xA1800))
-            + Op.SSTORE(key=0xB18, value=Op.MLOAD(offset=0xB1800))
-            + Op.SSTORE(key=0xA19, value=Op.MLOAD(offset=0xA1900))
-            + Op.SSTORE(key=0xB19, value=Op.MLOAD(offset=0xB1900))
-            + Op.SSTORE(key=0xA20, value=Op.MLOAD(offset=0xA2000))
-            + Op.SSTORE(key=0xB20, value=Op.MLOAD(offset=0xB2000))
-            + Op.STOP
-        ),
-        storage={
-            0x0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-            0x1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-        },
-        balance=1000,
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        gas_limit=4000000,
-        value=100,
-    )
-
-    post = {
-        contract: Account(
-            storage={
-                0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-                1: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-                2560: 1,
-                2561: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                2562: 1,
-                2563: 1,
-                2564: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2565: 0x73F5062FB68ED2A1EC82FF8C73F9251BB9CF53A623BC93527E16BC5AE29DAD74,  # noqa: E501
-                2566: 1,
-                2567: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2568: 0x14EF238CFA4075E9EDE92F18B1566C1DD0B99AAA,
-                2569: 1,
-                2576: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2577: 1,
-                2578: 1,
-                2579: 1,
-                2580: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2581: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2582: 1,
-                2583: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2584: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2585: 1,
-                2592: 1,
-                2816: 1,
-                2817: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                2818: 1,
-                2819: 1,
-                2820: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2821: 0x73F5062FB68ED2A1EC82FF8C73F9251BB9CF53A623BC93527E16BC5AE29DAD74,  # noqa: E501
-                2822: 1,
-                2823: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2824: 0x14EF238CFA4075E9EDE92F18B1566C1DD0B99AAA,
-                2825: 1,
-                2832: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2833: 1,
-                2834: 1,
-                2835: 1,
-                2836: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2837: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2838: 1,
-                2839: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2840: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2841: 1,
-                2848: 1,
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticFlagEnabled/CallcodeToPrecompileFromTransactionFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.pre_alloc_mutable
-def test_callcode_to_precompile_from_transaction_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Contract B staticcalls contract A."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    # Source: LLL
+    # Source: lll
     # {
     #   ;; Recovery of ECDSA signature
     #   [ 0x00 ] 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c  # noqa: E501
@@ -697,400 +87,395 @@ def test_callcode_to_precompile_from_transaction_from_osaka(
     #   ;; non zero value
     #   [ 0x0b0300 ] (CALLCODE (GAS) 2 1 0 32 0x2020 32)
     # ... (121 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0000,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x1,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xA0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xA0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100)),
-            )
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0000,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x1,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xB0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2020), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xB0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xB0100)),
-            )
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x2,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x2,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xB0500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x3,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xB0800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB0900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x4,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1000, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.MSTORE(offset=0x20, value=0x20)
-            + Op.MSTORE(offset=0x40, value=0x20)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1100,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x5,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1100,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x5,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1200, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x80, value=0x0)
-            + Op.MSTORE(offset=0xA0, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1300,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x6,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x3000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1400, value=Op.MLOAD(offset=0x3000))
-            + Op.MSTORE(offset=0xB1500, value=Op.MLOAD(offset=0x3020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x3000, value=0x0)
-            + Op.MSTORE(offset=0x3020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x40, value=0x3)
-            + Op.MSTORE(
-                offset=0xA1600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1600,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x7,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x3000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xB1700, value=Op.MLOAD(offset=0x3000))
-            + Op.MSTORE(offset=0xB1800, value=Op.MLOAD(offset=0x3020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x3000, value=0x0)
-            + Op.MSTORE(offset=0x3020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xE0,
-                value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x140,
-                value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x8,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0xB1900,
-                value=Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0x8,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2020,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xB2000, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.RETURN(offset=0xA0000, size=0x12020)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0000,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(
+            offset=0xA0100,
+            value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
+        )
+        + Op.MSTORE(
+            offset=0xA0200, value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100))
+        )
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB0000,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x1,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(
+            offset=0xB0100,
+            value=Op.MOD(Op.MLOAD(offset=0x2020), Op.EXP(0x2, 0xA0)),
+        )
+        + Op.MSTORE(
+            offset=0xB0200, value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xB0100))
+        )
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0300,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x2,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB0300,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x2,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xB0400, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xB0500, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0600,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB0600,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x3,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xB0700, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xB0800, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0900,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x4,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB0900,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x4,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xB1000, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(offset=0x0, value=0x1)
+        + Op.MSTORE(offset=0x20, value=0x20)
+        + Op.MSTORE(offset=0x40, value=0x20)
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1100,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x5,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0xA1,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB1100,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x5,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0xA1,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xB1200, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x80, value=0x0)
+        + Op.MSTORE(offset=0xA0, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1300,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x2000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0xB1300,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x6,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x3000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xB1400, value=Op.MLOAD(offset=0x3000))
+        + Op.MSTORE(offset=0xB1500, value=Op.MLOAD(offset=0x3020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x3000, value=0x0)
+        + Op.MSTORE(offset=0x3020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x40, value=0x3)
+        + Op.MSTORE(
+            offset=0xA1600,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x7,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x60,
+                ret_offset=0x2000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0xB1600,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x7,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x60,
+                ret_offset=0x3000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xB1700, value=Op.MLOAD(offset=0x3000))
+        + Op.MSTORE(offset=0xB1800, value=Op.MLOAD(offset=0x3020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x3000, value=0x0)
+        + Op.MSTORE(offset=0x3020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xE0,
+            value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x100,
+            value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x120,
+            value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x140,
+            value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x160,
+            value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1900,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x8,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x180,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0xB1900,
+            value=Op.CALLCODE(
+                gas=Op.GAS,
+                address=0x8,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x180,
+                ret_offset=0x2020,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xB2000, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.RETURN(offset=0xA0000, size=0x12020)
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # {
     #   [[ 0x00 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
     #   (STATICCALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0x0a0000 0x012020)  # noqa: E501
@@ -1118,93 +503,93 @@ def test_callcode_to_precompile_from_transaction_from_osaka(
     #   [[ 0x0a19 ]] @0x0a1900  [[ 0x0b19 ]] @0x0b1900
     #   [[ 0x0a20 ]] @0x0a2000  [[ 0x0b20 ]] @0x0b2000
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0xA000000000000000000000000000000000000000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0xA0000,
-                    ret_size=0x12020,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.SSTORE(key=0xA00, value=Op.MLOAD(offset=0xA0000))
-            + Op.SSTORE(key=0xB00, value=Op.MLOAD(offset=0xB0000))
-            + Op.SSTORE(key=0xA01, value=Op.MLOAD(offset=0xA0100))
-            + Op.SSTORE(key=0xB01, value=Op.MLOAD(offset=0xB0100))
-            + Op.SSTORE(key=0xA02, value=Op.MLOAD(offset=0xA0200))
-            + Op.SSTORE(key=0xB02, value=Op.MLOAD(offset=0xB0200))
-            + Op.SSTORE(key=0xA03, value=Op.MLOAD(offset=0xA0300))
-            + Op.SSTORE(key=0xB03, value=Op.MLOAD(offset=0xB0300))
-            + Op.SSTORE(key=0xA04, value=Op.MLOAD(offset=0xA0400))
-            + Op.SSTORE(key=0xB04, value=Op.MLOAD(offset=0xB0400))
-            + Op.SSTORE(key=0xA05, value=Op.MLOAD(offset=0xA0500))
-            + Op.SSTORE(key=0xB05, value=Op.MLOAD(offset=0xB0500))
-            + Op.SSTORE(key=0xA06, value=Op.MLOAD(offset=0xA0600))
-            + Op.SSTORE(key=0xB06, value=Op.MLOAD(offset=0xB0600))
-            + Op.SSTORE(key=0xA07, value=Op.MLOAD(offset=0xA0700))
-            + Op.SSTORE(key=0xB07, value=Op.MLOAD(offset=0xB0700))
-            + Op.SSTORE(key=0xA08, value=Op.MLOAD(offset=0xA0800))
-            + Op.SSTORE(key=0xB08, value=Op.MLOAD(offset=0xB0800))
-            + Op.SSTORE(key=0xA09, value=Op.MLOAD(offset=0xA0900))
-            + Op.SSTORE(key=0xB09, value=Op.MLOAD(offset=0xB0900))
-            + Op.SSTORE(key=0xA10, value=Op.MLOAD(offset=0xA1000))
-            + Op.SSTORE(key=0xB10, value=Op.MLOAD(offset=0xB1000))
-            + Op.SSTORE(key=0xA11, value=Op.MLOAD(offset=0xA1100))
-            + Op.SSTORE(key=0xB11, value=Op.MLOAD(offset=0xB1100))
-            + Op.SSTORE(key=0xA12, value=Op.MLOAD(offset=0xA1200))
-            + Op.SSTORE(key=0xB12, value=Op.MLOAD(offset=0xB1200))
-            + Op.SSTORE(key=0xA13, value=Op.MLOAD(offset=0xA1300))
-            + Op.SSTORE(key=0xB13, value=Op.MLOAD(offset=0xB1300))
-            + Op.SSTORE(key=0xA14, value=Op.MLOAD(offset=0xA1400))
-            + Op.SSTORE(key=0xB14, value=Op.MLOAD(offset=0xB1400))
-            + Op.SSTORE(key=0xA15, value=Op.MLOAD(offset=0xA1500))
-            + Op.SSTORE(key=0xB15, value=Op.MLOAD(offset=0xB1500))
-            + Op.SSTORE(key=0xA16, value=Op.MLOAD(offset=0xA1600))
-            + Op.SSTORE(key=0xB16, value=Op.MLOAD(offset=0xB1600))
-            + Op.SSTORE(key=0xA17, value=Op.MLOAD(offset=0xA1700))
-            + Op.SSTORE(key=0xB17, value=Op.MLOAD(offset=0xB1700))
-            + Op.SSTORE(key=0xA18, value=Op.MLOAD(offset=0xA1800))
-            + Op.SSTORE(key=0xB18, value=Op.MLOAD(offset=0xB1800))
-            + Op.SSTORE(key=0xA19, value=Op.MLOAD(offset=0xA1900))
-            + Op.SSTORE(key=0xB19, value=Op.MLOAD(offset=0xB1900))
-            + Op.SSTORE(key=0xA20, value=Op.MLOAD(offset=0xA2000))
-            + Op.SSTORE(key=0xB20, value=Op.MLOAD(offset=0xB2000))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0xA0000,
+                ret_size=0x12020,
+            )
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
+        )
+        + Op.SSTORE(key=0xA00, value=Op.MLOAD(offset=0xA0000))
+        + Op.SSTORE(key=0xB00, value=Op.MLOAD(offset=0xB0000))
+        + Op.SSTORE(key=0xA01, value=Op.MLOAD(offset=0xA0100))
+        + Op.SSTORE(key=0xB01, value=Op.MLOAD(offset=0xB0100))
+        + Op.SSTORE(key=0xA02, value=Op.MLOAD(offset=0xA0200))
+        + Op.SSTORE(key=0xB02, value=Op.MLOAD(offset=0xB0200))
+        + Op.SSTORE(key=0xA03, value=Op.MLOAD(offset=0xA0300))
+        + Op.SSTORE(key=0xB03, value=Op.MLOAD(offset=0xB0300))
+        + Op.SSTORE(key=0xA04, value=Op.MLOAD(offset=0xA0400))
+        + Op.SSTORE(key=0xB04, value=Op.MLOAD(offset=0xB0400))
+        + Op.SSTORE(key=0xA05, value=Op.MLOAD(offset=0xA0500))
+        + Op.SSTORE(key=0xB05, value=Op.MLOAD(offset=0xB0500))
+        + Op.SSTORE(key=0xA06, value=Op.MLOAD(offset=0xA0600))
+        + Op.SSTORE(key=0xB06, value=Op.MLOAD(offset=0xB0600))
+        + Op.SSTORE(key=0xA07, value=Op.MLOAD(offset=0xA0700))
+        + Op.SSTORE(key=0xB07, value=Op.MLOAD(offset=0xB0700))
+        + Op.SSTORE(key=0xA08, value=Op.MLOAD(offset=0xA0800))
+        + Op.SSTORE(key=0xB08, value=Op.MLOAD(offset=0xB0800))
+        + Op.SSTORE(key=0xA09, value=Op.MLOAD(offset=0xA0900))
+        + Op.SSTORE(key=0xB09, value=Op.MLOAD(offset=0xB0900))
+        + Op.SSTORE(key=0xA10, value=Op.MLOAD(offset=0xA1000))
+        + Op.SSTORE(key=0xB10, value=Op.MLOAD(offset=0xB1000))
+        + Op.SSTORE(key=0xA11, value=Op.MLOAD(offset=0xA1100))
+        + Op.SSTORE(key=0xB11, value=Op.MLOAD(offset=0xB1100))
+        + Op.SSTORE(key=0xA12, value=Op.MLOAD(offset=0xA1200))
+        + Op.SSTORE(key=0xB12, value=Op.MLOAD(offset=0xB1200))
+        + Op.SSTORE(key=0xA13, value=Op.MLOAD(offset=0xA1300))
+        + Op.SSTORE(key=0xB13, value=Op.MLOAD(offset=0xB1300))
+        + Op.SSTORE(key=0xA14, value=Op.MLOAD(offset=0xA1400))
+        + Op.SSTORE(key=0xB14, value=Op.MLOAD(offset=0xB1400))
+        + Op.SSTORE(key=0xA15, value=Op.MLOAD(offset=0xA1500))
+        + Op.SSTORE(key=0xB15, value=Op.MLOAD(offset=0xB1500))
+        + Op.SSTORE(key=0xA16, value=Op.MLOAD(offset=0xA1600))
+        + Op.SSTORE(key=0xB16, value=Op.MLOAD(offset=0xB1600))
+        + Op.SSTORE(key=0xA17, value=Op.MLOAD(offset=0xA1700))
+        + Op.SSTORE(key=0xB17, value=Op.MLOAD(offset=0xB1700))
+        + Op.SSTORE(key=0xA18, value=Op.MLOAD(offset=0xA1800))
+        + Op.SSTORE(key=0xB18, value=Op.MLOAD(offset=0xB1800))
+        + Op.SSTORE(key=0xA19, value=Op.MLOAD(offset=0xA1900))
+        + Op.SSTORE(key=0xB19, value=Op.MLOAD(offset=0xB1900))
+        + Op.SSTORE(key=0xA20, value=Op.MLOAD(offset=0xA2000))
+        + Op.SSTORE(key=0xB20, value=Op.MLOAD(offset=0xB2000))
+        + Op.STOP,
         storage={
-            0x0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-            0x1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
+            0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
+            1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
         },
         balance=1000,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=4000000,
         value=100,
     )
 
     post = {
-        contract: Account(
+        contract_1: Account(storage={}, balance=1000),
+        contract_0: Account(
             storage={
                 0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
                 1: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
                 2560: 1,
-                2561: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                2561: sender,
                 2562: 1,
                 2563: 1,
                 2564: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
@@ -1225,7 +610,7 @@ def test_callcode_to_precompile_from_transaction_from_osaka(
                 2585: 1,
                 2592: 1,
                 2816: 1,
-                2817: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                2817: sender,
                 2818: 1,
                 2819: 1,
                 2820: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
@@ -1246,6 +631,7 @@ def test_callcode_to_precompile_from_transaction_from_osaka(
                 2841: 1,
                 2848: 1,
             },
+            balance=1100,
         ),
     }
 
diff --git a/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_called_contract.py b/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_called_contract.py
index ccca6e7e5f6..8dcdce66aaf 100644
--- a/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_called_contract.py
+++ b/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_called_contract.py
@@ -5,9 +5,9 @@
 Contract A delegatecalls precompiled contracts.
 It should execute successfully for each precompiled contract.
 
+
 Ported from:
-tests/static/state_tests/stStaticFlagEnabled
-DelegatecallToPrecompileFromCalledContractFiller.yml
+state_tests/stStaticFlagEnabled/DelegatecallToPrecompileFromCalledContractFiller.yml
 """
 
 import pytest
@@ -16,6 +16,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -28,18 +29,20 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticFlagEnabled/DelegatecallToPrecompileFromCalledContractFiller.yml",  # noqa: E501
+        "state_tests/stStaticFlagEnabled/DelegatecallToPrecompileFromCalledContractFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
 @pytest.mark.pre_alloc_mutable
 def test_delegatecall_to_precompile_from_called_contract(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """Contract C calls contract B."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
+    coinbase = Address(0xCAFE000000000000000000000000000000000001)
+    contract_0 = Address(0xC000000000000000000000000000000000000000)
+    contract_1 = Address(0xB000000000000000000000000000000000000000)
+    contract_2 = Address(0xA000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -53,7 +56,8 @@ def test_delegatecall_to_precompile_from_called_contract(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # {
     #   ;; Recovery of ECDSA signature
     #   [ 0x00 ] 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c  # noqa: E501
@@ -85,267 +89,263 @@ def test_delegatecall_to_precompile_from_called_contract(
     #   [ 0x0a0600 ] (DELEGATECALL (GAS) 3 0 32 0x2000 32)
     #   [ 0x0a0700 ] @0
     # ... (82 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0000,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xA0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xA0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100)),
-            )
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0300,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0600,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0900,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.MSTORE(offset=0x20, value=0x20)
-            + Op.MSTORE(offset=0x40, value=0x20)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1100,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x80, value=0x0)
-            + Op.MSTORE(offset=0xA0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1300,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x40, value=0x3)
-            + Op.MSTORE(
-                offset=0xA1600,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xE0,
-                value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x140,
-                value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1900,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.RETURN(offset=0xA0000, size=0x12020)
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0000,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(
+            offset=0xA0100,
+            value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
+        )
+        + Op.MSTORE(
+            offset=0xA0200, value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100))
+        )
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0300,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0600,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0900,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(offset=0x0, value=0x1)
+        + Op.MSTORE(offset=0x20, value=0x20)
+        + Op.MSTORE(offset=0x40, value=0x20)
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1100,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x5,
+                args_offset=0x0,
+                args_size=0xA1,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x80, value=0x0)
+        + Op.MSTORE(offset=0xA0, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1300,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x6,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x2000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x40, value=0x3)
+        + Op.MSTORE(
+            offset=0xA1600,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x7,
+                args_offset=0x0,
+                args_size=0x60,
+                ret_offset=0x2000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xE0,
+            value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x100,
+            value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x120,
+            value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x140,
+            value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x160,
+            value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1900,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x8,
+                args_offset=0x0,
+                args_size=0x180,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.RETURN(offset=0xA0000, size=0x12020)
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # {
     #   [[ 0x00 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
     #   (STATICCALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0x0a0000 0x012020)  # noqa: E501
@@ -363,580 +363,114 @@ def test_delegatecall_to_precompile_from_called_contract(
     #   [[ 0x0a09 ]] @0x0a0900  [[ 0x0a20 ]] @0x0a2000
     #   [[ 0x0a10 ]] @0x0a1000
     # }
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0xA000000000000000000000000000000000000000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0xA0000,
-                    ret_size=0x12020,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.SSTORE(key=0xA00, value=Op.MLOAD(offset=0xA0000))
-            + Op.SSTORE(key=0xA11, value=Op.MLOAD(offset=0xA1100))
-            + Op.SSTORE(key=0xA01, value=Op.MLOAD(offset=0xA0100))
-            + Op.SSTORE(key=0xA12, value=Op.MLOAD(offset=0xA1200))
-            + Op.SSTORE(key=0xA02, value=Op.MLOAD(offset=0xA0200))
-            + Op.SSTORE(key=0xA13, value=Op.MLOAD(offset=0xA1300))
-            + Op.SSTORE(key=0xA03, value=Op.MLOAD(offset=0xA0300))
-            + Op.SSTORE(key=0xA14, value=Op.MLOAD(offset=0xA1400))
-            + Op.SSTORE(key=0xA04, value=Op.MLOAD(offset=0xA0400))
-            + Op.SSTORE(key=0xA15, value=Op.MLOAD(offset=0xA1500))
-            + Op.SSTORE(key=0xA05, value=Op.MLOAD(offset=0xA0500))
-            + Op.SSTORE(key=0xA16, value=Op.MLOAD(offset=0xA1600))
-            + Op.SSTORE(key=0xA06, value=Op.MLOAD(offset=0xA0600))
-            + Op.SSTORE(key=0xA17, value=Op.MLOAD(offset=0xA1700))
-            + Op.SSTORE(key=0xA07, value=Op.MLOAD(offset=0xA0700))
-            + Op.SSTORE(key=0xA18, value=Op.MLOAD(offset=0xA1800))
-            + Op.SSTORE(key=0xA08, value=Op.MLOAD(offset=0xA0800))
-            + Op.SSTORE(key=0xA19, value=Op.MLOAD(offset=0xA1900))
-            + Op.SSTORE(key=0xA09, value=Op.MLOAD(offset=0xA0900))
-            + Op.SSTORE(key=0xA20, value=Op.MLOAD(offset=0xA2000))
-            + Op.SSTORE(key=0xA10, value=Op.MLOAD(offset=0xA1000))
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=contract_2,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0xA0000,
+                ret_size=0x12020,
+            )
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
+        )
+        + Op.SSTORE(key=0xA00, value=Op.MLOAD(offset=0xA0000))
+        + Op.SSTORE(key=0xA11, value=Op.MLOAD(offset=0xA1100))
+        + Op.SSTORE(key=0xA01, value=Op.MLOAD(offset=0xA0100))
+        + Op.SSTORE(key=0xA12, value=Op.MLOAD(offset=0xA1200))
+        + Op.SSTORE(key=0xA02, value=Op.MLOAD(offset=0xA0200))
+        + Op.SSTORE(key=0xA13, value=Op.MLOAD(offset=0xA1300))
+        + Op.SSTORE(key=0xA03, value=Op.MLOAD(offset=0xA0300))
+        + Op.SSTORE(key=0xA14, value=Op.MLOAD(offset=0xA1400))
+        + Op.SSTORE(key=0xA04, value=Op.MLOAD(offset=0xA0400))
+        + Op.SSTORE(key=0xA15, value=Op.MLOAD(offset=0xA1500))
+        + Op.SSTORE(key=0xA05, value=Op.MLOAD(offset=0xA0500))
+        + Op.SSTORE(key=0xA16, value=Op.MLOAD(offset=0xA1600))
+        + Op.SSTORE(key=0xA06, value=Op.MLOAD(offset=0xA0600))
+        + Op.SSTORE(key=0xA17, value=Op.MLOAD(offset=0xA1700))
+        + Op.SSTORE(key=0xA07, value=Op.MLOAD(offset=0xA0700))
+        + Op.SSTORE(key=0xA18, value=Op.MLOAD(offset=0xA1800))
+        + Op.SSTORE(key=0xA08, value=Op.MLOAD(offset=0xA0800))
+        + Op.SSTORE(key=0xA19, value=Op.MLOAD(offset=0xA1900))
+        + Op.SSTORE(key=0xA09, value=Op.MLOAD(offset=0xA0900))
+        + Op.SSTORE(key=0xA20, value=Op.MLOAD(offset=0xA2000))
+        + Op.SSTORE(key=0xA10, value=Op.MLOAD(offset=0xA1000))
+        + Op.STOP,
         storage={
-            0x0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-            0x1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
+            0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
+            1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
         },
         balance=1000,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {
     #   [[ 0x00 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
     #   (CALL (GAS) 0xb000000000000000000000000000000000000000 0 0 0 0 0)
     #   [[ 0x01 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xB000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
+        )
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
+        )
+        + Op.STOP,
         storage={
-            0x0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-            0x1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
+            0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
+            1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
         },
         balance=1000,
         nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xC000000000000000000000000000000000000000),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=4000000,
         value=100,
     )
 
     post = {
-        callee_1: Account(
+        contract_2: Account(storage={}, balance=1000),
+        contract_0: Account(
             storage={
                 0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
                 1: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-                2560: 1,
-                2561: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                2562: 1,
-                2563: 1,
-                2564: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2565: 0x73F5062FB68ED2A1EC82FF8C73F9251BB9CF53A623BC93527E16BC5AE29DAD74,  # noqa: E501
-                2566: 1,
-                2567: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2568: 0x14EF238CFA4075E9EDE92F18B1566C1DD0B99AAA,
-                2569: 1,
-                2576: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2577: 1,
-                2578: 1,
-                2579: 1,
-                2580: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2581: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2582: 1,
-                2583: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2584: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2585: 1,
-                2592: 1,
             },
+            balance=1100,
         ),
-        contract: Account(
-            storage={
-                0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-                1: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticFlagEnabled/DelegatecallToPrecompileFromCalledContractFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.pre_alloc_mutable
-def test_delegatecall_to_precompile_from_called_contract_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Contract C calls contract B."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    # Source: LLL
-    # {
-    #   ;; Recovery of ECDSA signature
-    #   [ 0x00 ] 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c  # noqa: E501
-    #   [ 0x20 ] 28
-    #   [ 0x40 ] 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f  # noqa: E501
-    #   [ 0x60 ] 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549  # noqa: E501
-    #   ;; zero value
-    #   [ 0x0a0000 ] (DELEGATECALL (GAS) 1 0 128 0x2000 32)
-    #   [ 0x0a0100 ] (MOD @0x2000 (EXP 2 160))
-    #   [ 0x0a0200 ] (EQ (ORIGIN) @0x0a0100)
-    #   [ 0x00 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x20 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x40 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x60 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x2000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #
-    #   ;; Hash function SHA256
-    #   [ 0x00 ] 0x0000000ccccccccccccccccccccccccccccccccccccccccccccccccccc000000  # noqa: E501
-    #   ;; zero value
-    #   [ 0x0a0300 ] (DELEGATECALL (GAS) 2 0 32 0x2000 32)
-    #   [ 0x0a0400 ] @0
-    #   [ 0x0a0500 ] @0x2000
-    #   [ 0x00 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x2000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #
-    #   ;; Hash function RIPEMD160
-    #   [ 0x00 ] 0x0000000ccccccccccccccccccccccccccccccccccccccccccccccccccc000000  # noqa: E501
-    #   ;; zero value
-    #   [ 0x0a0600 ] (DELEGATECALL (GAS) 3 0 32 0x2000 32)
-    #   [ 0x0a0700 ] @0
-    # ... (82 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0000,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xA0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xA0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100)),
-            )
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0300,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0600,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0900,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.MSTORE(offset=0x20, value=0x20)
-            + Op.MSTORE(offset=0x40, value=0x20)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1100,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x80, value=0x0)
-            + Op.MSTORE(offset=0xA0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1300,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x40, value=0x3)
-            + Op.MSTORE(
-                offset=0xA1600,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xE0,
-                value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x140,
-                value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1900,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.RETURN(offset=0xA0000, size=0x12020)
-            + Op.STOP
-        ),
-        balance=1000,
-        nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {
-    #   [[ 0x00 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
-    #   (STATICCALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0x0a0000 0x012020)  # noqa: E501
-    #   [[ 0x01 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
-    #   ;; save results to store
-    #   [[ 0x0a00 ]] @0x0a0000  [[ 0x0a11 ]] @0x0a1100
-    #   [[ 0x0a01 ]] @0x0a0100  [[ 0x0a12 ]] @0x0a1200
-    #   [[ 0x0a02 ]] @0x0a0200  [[ 0x0a13 ]] @0x0a1300
-    #   [[ 0x0a03 ]] @0x0a0300  [[ 0x0a14 ]] @0x0a1400
-    #   [[ 0x0a04 ]] @0x0a0400  [[ 0x0a15 ]] @0x0a1500
-    #   [[ 0x0a05 ]] @0x0a0500  [[ 0x0a16 ]] @0x0a1600
-    #   [[ 0x0a06 ]] @0x0a0600  [[ 0x0a17 ]] @0x0a1700
-    #   [[ 0x0a07 ]] @0x0a0700  [[ 0x0a18 ]] @0x0a1800
-    #   [[ 0x0a08 ]] @0x0a0800  [[ 0x0a19 ]] @0x0a1900
-    #   [[ 0x0a09 ]] @0x0a0900  [[ 0x0a20 ]] @0x0a2000
-    #   [[ 0x0a10 ]] @0x0a1000
-    # }
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0xA000000000000000000000000000000000000000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0xA0000,
-                    ret_size=0x12020,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.SSTORE(key=0xA00, value=Op.MLOAD(offset=0xA0000))
-            + Op.SSTORE(key=0xA11, value=Op.MLOAD(offset=0xA1100))
-            + Op.SSTORE(key=0xA01, value=Op.MLOAD(offset=0xA0100))
-            + Op.SSTORE(key=0xA12, value=Op.MLOAD(offset=0xA1200))
-            + Op.SSTORE(key=0xA02, value=Op.MLOAD(offset=0xA0200))
-            + Op.SSTORE(key=0xA13, value=Op.MLOAD(offset=0xA1300))
-            + Op.SSTORE(key=0xA03, value=Op.MLOAD(offset=0xA0300))
-            + Op.SSTORE(key=0xA14, value=Op.MLOAD(offset=0xA1400))
-            + Op.SSTORE(key=0xA04, value=Op.MLOAD(offset=0xA0400))
-            + Op.SSTORE(key=0xA15, value=Op.MLOAD(offset=0xA1500))
-            + Op.SSTORE(key=0xA05, value=Op.MLOAD(offset=0xA0500))
-            + Op.SSTORE(key=0xA16, value=Op.MLOAD(offset=0xA1600))
-            + Op.SSTORE(key=0xA06, value=Op.MLOAD(offset=0xA0600))
-            + Op.SSTORE(key=0xA17, value=Op.MLOAD(offset=0xA1700))
-            + Op.SSTORE(key=0xA07, value=Op.MLOAD(offset=0xA0700))
-            + Op.SSTORE(key=0xA18, value=Op.MLOAD(offset=0xA1800))
-            + Op.SSTORE(key=0xA08, value=Op.MLOAD(offset=0xA0800))
-            + Op.SSTORE(key=0xA19, value=Op.MLOAD(offset=0xA1900))
-            + Op.SSTORE(key=0xA09, value=Op.MLOAD(offset=0xA0900))
-            + Op.SSTORE(key=0xA20, value=Op.MLOAD(offset=0xA2000))
-            + Op.SSTORE(key=0xA10, value=Op.MLOAD(offset=0xA1000))
-            + Op.STOP
-        ),
-        storage={
-            0x0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-            0x1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-        },
-        balance=1000,
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # {
-    #   [[ 0x00 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
-    #   (CALL (GAS) 0xb000000000000000000000000000000000000000 0 0 0 0 0)
-    #   [[ 0x01 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xB000000000000000000000000000000000000000,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.STOP
-        ),
-        storage={
-            0x0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-            0x1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-        },
-        balance=1000,
-        nonce=0,
-        address=Address("0xc000000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        gas_limit=4000000,
-        value=100,
-    )
-
-    post = {
-        callee_1: Account(
+        contract_1: Account(
             storage={
                 0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
                 1: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
                 2560: 1,
-                2561: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                2561: sender,
                 2562: 1,
                 2563: 1,
                 2564: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
@@ -957,12 +491,7 @@ def test_delegatecall_to_precompile_from_called_contract_from_osaka(
                 2585: 1,
                 2592: 1,
             },
-        ),
-        contract: Account(
-            storage={
-                0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-                1: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            },
+            balance=1000,
         ),
     }
 
diff --git a/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_contract_initialization.py b/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_contract_initialization.py
index 40cf801c7c5..df7fecef5c6 100644
--- a/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_contract_initialization.py
+++ b/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_contract_initialization.py
@@ -4,9 +4,9 @@
 Contract A delegatecalls precompiled contracts.
 It should execute successfully for each precompiled contract.
 
+
 Ported from:
-tests/static/state_tests/stStaticFlagEnabled
-DelegatecallToPrecompileFromContractInitializationFiller.yml
+state_tests/stStaticFlagEnabled/DelegatecallToPrecompileFromContractInitializationFiller.yml
 """
 
 import pytest
@@ -15,6 +15,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -27,18 +28,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticFlagEnabled/DelegatecallToPrecompileFromContractInitializationFiller.yml",  # noqa: E501
+        "state_tests/stStaticFlagEnabled/DelegatecallToPrecompileFromContractInitializationFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
 @pytest.mark.pre_alloc_mutable
 def test_delegatecall_to_precompile_from_contract_initialization(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """Contract B staticcalls contract A."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
+    coinbase = Address(0xCAFE000000000000000000000000000000000001)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xA000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -52,423 +54,43 @@ def test_delegatecall_to_precompile_from_contract_initialization(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # {
-    #   ;; Recovery of ECDSA signature
-    #   [ 0x00 ] 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c  # noqa: E501
-    #   [ 0x20 ] 28
-    #   [ 0x40 ] 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f  # noqa: E501
-    #   [ 0x60 ] 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549  # noqa: E501
-    #   ;; zero value
-    #   [ 0x0a0000 ] (DELEGATECALL (GAS) 1 0 128 0x2000 32)
-    #   [ 0x0a0100 ] (MOD @0x2000 (EXP 2 160))
-    #   [ 0x0a0200 ] (EQ (ORIGIN) @0x0a0100)
-    #   [ 0x00 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x20 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x40 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x60 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x2000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #
-    #   ;; Hash function SHA256
-    #   [ 0x00 ] 0x0000000ccccccccccccccccccccccccccccccccccccccccccccccccccc000000  # noqa: E501
-    #   ;; zero value
-    #   [ 0x0a0300 ] (DELEGATECALL (GAS) 2 0 32 0x2000 32)
-    #   [ 0x0a0400 ] @0
-    #   [ 0x0a0500 ] @0x2000
-    #   [ 0x00 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x2000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #
-    #   ;; Hash function RIPEMD160
-    #   [ 0x00 ] 0x0000000ccccccccccccccccccccccccccccccccccccccccccccccccccc000000  # noqa: E501
-    #   ;; zero value
-    #   [ 0x0a0600 ] (DELEGATECALL (GAS) 3 0 32 0x2000 32)
-    #   [ 0x0a0700 ] @0
-    # ... (82 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0000,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xA0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xA0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100)),
-            )
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0300,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0600,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0900,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.MSTORE(offset=0x20, value=0x20)
-            + Op.MSTORE(offset=0x40, value=0x20)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1100,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x80, value=0x0)
-            + Op.MSTORE(offset=0xA0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1300,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x40, value=0x3)
-            + Op.MSTORE(
-                offset=0xA1600,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xE0,
-                value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x140,
-                value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1900,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.RETURN(offset=0xA0000, size=0x12020)
-            + Op.STOP
-        ),
-        balance=1000,
-        nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # {
     #   [[ 0x00 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
     #   (CALLDATACOPY 0 0 (CALLDATASIZE))
     #   [[ 0x01 ]] (CREATE2 0 0 (CALLDATASIZE) 0x5a175a175a17)
     #   [[ 0x02 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x0, offset=0x0, size=Op.CALLDATASIZE
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CREATE2(
-                    value=0x0,
-                    offset=0x0,
-                    size=Op.CALLDATASIZE,
-                    salt=0x5A175A175A17,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
+        )
+        + Op.CALLDATACOPY(dest_offset=0x0, offset=0x0, size=Op.CALLDATASIZE)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CREATE2(
+                value=0x0,
+                offset=0x0,
+                size=Op.CALLDATASIZE,
+                salt=0x5A175A175A17,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x2,
+            value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
+        )
+        + Op.STOP,
         storage={
-            0x0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-            0x1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
+            0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
+            1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
         },
         balance=1000,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed600055"  # noqa: E501
-            "62012020620a00006000600073a0000000000000000000000000000000000000005afa50"  # noqa: E501
-            "7ffeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed600155"  # noqa: E501
-            "620a000051610a0055620a110051610a1155620a010051610a0155620a120051610a1255"  # noqa: E501
-            "620a020051610a0255620a130051610a1355620a030051610a0355620a140051610a1455"  # noqa: E501
-            "620a040051610a0455620a150051610a1555620a050051610a0555620a160051610a1655"  # noqa: E501
-            "620a060051610a0655620a170051610a1755620a070051610a0755620a180051610a1855"  # noqa: E501
-            "620a080051610a0855620a190051610a1955620a090051610a0955620a200051610a2055"  # noqa: E501
-            "620a100051610a105500"
-        ),
-        gas_limit=4000000,
-        value=100,
-    )
-
-    post = {
-        contract: Account(
-            storage={
-                0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-                1: 0xFD7776B1A634B0DC19301B174CCF30D4D24070A8,
-                2: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            },
-        ),
-        Address("0xfd7776b1a634b0dc19301b174ccf30d4d24070a8"): Account(
-            storage={
-                0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-                1: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-                2560: 1,
-                2561: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                2562: 1,
-                2563: 1,
-                2564: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2565: 0x73F5062FB68ED2A1EC82FF8C73F9251BB9CF53A623BC93527E16BC5AE29DAD74,  # noqa: E501
-                2566: 1,
-                2567: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2568: 0x14EF238CFA4075E9EDE92F18B1566C1DD0B99AAA,
-                2569: 1,
-                2576: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2577: 1,
-                2578: 1,
-                2579: 1,
-                2580: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2581: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2582: 1,
-                2583: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2584: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2585: 1,
-                2592: 1,
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticFlagEnabled/DelegatecallToPrecompileFromContractInitializationFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.pre_alloc_mutable
-def test_delegatecall_to_precompile_from_contract_initialization_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Contract B staticcalls contract A."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    # Source: LLL
+    # Source: lll
     # {
     #   ;; Recovery of ECDSA signature
     #   [ 0x00 ] 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c  # noqa: E501
@@ -500,338 +122,288 @@ def test_delegatecall_to_precompile_from_contract_initialization_from_osaka(
     #   [ 0x0a0600 ] (DELEGATECALL (GAS) 3 0 32 0x2000 32)
     #   [ 0x0a0700 ] @0
     # ... (82 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0000,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xA0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xA0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100)),
-            )
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0300,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0600,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0900,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.MSTORE(offset=0x20, value=0x20)
-            + Op.MSTORE(offset=0x40, value=0x20)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1100,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x80, value=0x0)
-            + Op.MSTORE(offset=0xA0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1300,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x40, value=0x3)
-            + Op.MSTORE(
-                offset=0xA1600,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xE0,
-                value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x140,
-                value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1900,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.RETURN(offset=0xA0000, size=0x12020)
-            + Op.STOP
-        ),
-        balance=1000,
-        nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {
-    #   [[ 0x00 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
-    #   (CALLDATACOPY 0 0 (CALLDATASIZE))
-    #   [[ 0x01 ]] (CREATE2 0 0 (CALLDATASIZE) 0x5a175a175a17)
-    #   [[ 0x02 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x0, offset=0x0, size=Op.CALLDATASIZE
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CREATE2(
-                    value=0x0,
-                    offset=0x0,
-                    size=Op.CALLDATASIZE,
-                    salt=0x5A175A175A17,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x2,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.STOP
-        ),
-        storage={
-            0x0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-            0x1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-        },
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0000,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(
+            offset=0xA0100,
+            value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
+        )
+        + Op.MSTORE(
+            offset=0xA0200, value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100))
+        )
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0300,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0600,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0900,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(offset=0x0, value=0x1)
+        + Op.MSTORE(offset=0x20, value=0x20)
+        + Op.MSTORE(offset=0x40, value=0x20)
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1100,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x5,
+                args_offset=0x0,
+                args_size=0xA1,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x80, value=0x0)
+        + Op.MSTORE(offset=0xA0, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1300,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x6,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x2000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x40, value=0x3)
+        + Op.MSTORE(
+            offset=0xA1600,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x7,
+                args_offset=0x0,
+                args_size=0x60,
+                ret_offset=0x2000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xE0,
+            value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x100,
+            value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x120,
+            value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x140,
+            value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x160,
+            value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1900,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x8,
+                args_offset=0x0,
+                args_size=0x180,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.RETURN(offset=0xA0000, size=0x12020)
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7ffeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed600055"  # noqa: E501
-            "62012020620a00006000600073a0000000000000000000000000000000000000005afa50"  # noqa: E501
-            "7ffeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed600155"  # noqa: E501
-            "620a000051610a0055620a110051610a1155620a010051610a0155620a120051610a1255"  # noqa: E501
-            "620a020051610a0255620a130051610a1355620a030051610a0355620a140051610a1455"  # noqa: E501
-            "620a040051610a0455620a150051610a1555620a050051610a0555620a160051610a1655"  # noqa: E501
-            "620a060051610a0655620a170051610a1755620a070051610a0755620a180051610a1855"  # noqa: E501
-            "620a080051610a0855620a190051610a1955620a090051610a0955620a200051610a2055"  # noqa: E501
-            "620a100051610a105500"
+        to=contract_0,
+        data=Bytes(
+            "7ffeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed60005562012020620a00006000600073a0000000000000000000000000000000000000005afa507ffeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed600155620a000051610a0055620a110051610a1155620a010051610a0155620a120051610a1255620a020051610a0255620a130051610a1355620a030051610a0355620a140051610a1455620a040051610a0455620a150051610a1555620a050051610a0555620a160051610a1655620a060051610a0655620a170051610a1755620a070051610a0755620a180051610a1855620a080051610a0855620a190051610a1955620a090051610a0955620a200051610a2055620a100051610a105500"  # noqa: E501
         ),
         gas_limit=4000000,
         value=100,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
                 1: 0xFD7776B1A634B0DC19301B174CCF30D4D24070A8,
                 2: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
             },
+            balance=1100,
         ),
-        Address("0xfd7776b1a634b0dc19301b174ccf30d4d24070a8"): Account(
+        Address(0xFD7776B1A634B0DC19301B174CCF30D4D24070A8): Account(
             storage={
                 0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
                 1: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
                 2560: 1,
-                2561: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                2561: sender,
                 2562: 1,
                 2563: 1,
                 2564: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
diff --git a/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_transaction.py b/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_transaction.py
index 17de80e2b67..427cc8978b5 100644
--- a/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_transaction.py
+++ b/tests/ported_static/stStaticFlagEnabled/test_delegatecall_to_precompile_from_transaction.py
@@ -4,9 +4,9 @@
 Contract A delegatecalls precompiled contracts.
 It should execute successfully for each precompiled contract.
 
+
 Ported from:
-tests/static/state_tests/stStaticFlagEnabled
-DelegatecallToPrecompileFromTransactionFiller.yml
+state_tests/stStaticFlagEnabled/DelegatecallToPrecompileFromTransactionFiller.yml
 """
 
 import pytest
@@ -15,6 +15,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -27,18 +28,19 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stStaticFlagEnabled/DelegatecallToPrecompileFromTransactionFiller.yml",  # noqa: E501
+        "state_tests/stStaticFlagEnabled/DelegatecallToPrecompileFromTransactionFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Prague")
 @pytest.mark.pre_alloc_mutable
 def test_delegatecall_to_precompile_from_transaction(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
     """Contract B staticcalls contract A."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
+    coinbase = Address(0xCAFE000000000000000000000000000000000001)
+    contract_0 = Address(0xB000000000000000000000000000000000000000)
+    contract_1 = Address(0xA000000000000000000000000000000000000000)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -52,435 +54,8 @@ def test_delegatecall_to_precompile_from_transaction(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # {
-    #   ;; Recovery of ECDSA signature
-    #   [ 0x00 ] 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c  # noqa: E501
-    #   [ 0x20 ] 28
-    #   [ 0x40 ] 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f  # noqa: E501
-    #   [ 0x60 ] 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549  # noqa: E501
-    #   ;; zero value
-    #   [ 0x0a0000 ] (DELEGATECALL (GAS) 1 0 128 0x2000 32)
-    #   [ 0x0a0100 ] (MOD @0x2000 (EXP 2 160))
-    #   [ 0x0a0200 ] (EQ (ORIGIN) @0x0a0100)
-    #   [ 0x00 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x20 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x40 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x60 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x2000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #
-    #   ;; Hash function SHA256
-    #   [ 0x00 ] 0x0000000ccccccccccccccccccccccccccccccccccccccccccccccccccc000000  # noqa: E501
-    #   ;; zero value
-    #   [ 0x0a0300 ] (DELEGATECALL (GAS) 2 0 32 0x2000 32)
-    #   [ 0x0a0400 ] @0
-    #   [ 0x0a0500 ] @0x2000
-    #   [ 0x00 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #   [ 0x2000 ] 0x0000000000000000000000000000000000000000000000000000000000000000  # noqa: E501
-    #
-    #   ;; Hash function RIPEMD160
-    #   [ 0x00 ] 0x0000000ccccccccccccccccccccccccccccccccccccccccccccccccccc000000  # noqa: E501
-    #   ;; zero value
-    #   [ 0x0a0600 ] (DELEGATECALL (GAS) 3 0 32 0x2000 32)
-    #   [ 0x0a0700 ] @0
-    # ... (82 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0000,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xA0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xA0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100)),
-            )
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0300,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0600,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0900,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.MSTORE(offset=0x20, value=0x20)
-            + Op.MSTORE(offset=0x40, value=0x20)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1100,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x80, value=0x0)
-            + Op.MSTORE(offset=0xA0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1300,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x40, value=0x3)
-            + Op.MSTORE(
-                offset=0xA1600,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xE0,
-                value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x140,
-                value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1900,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.RETURN(offset=0xA0000, size=0x12020)
-            + Op.STOP
-        ),
-        balance=1000,
-        nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
-    )
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
-    # {
-    #   [[ 0x00 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
-    #   (STATICCALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0x0a0000 0x012020)  # noqa: E501
-    #   [[ 0x01 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
-    #   ;; save results to store
-    #   [[ 0x0a00 ]] @0x0a0000  [[ 0x0a11 ]] @0x0a1100
-    #   [[ 0x0a01 ]] @0x0a0100  [[ 0x0a12 ]] @0x0a1200
-    #   [[ 0x0a02 ]] @0x0a0200  [[ 0x0a13 ]] @0x0a1300
-    #   [[ 0x0a03 ]] @0x0a0300  [[ 0x0a14 ]] @0x0a1400
-    #   [[ 0x0a04 ]] @0x0a0400  [[ 0x0a15 ]] @0x0a1500
-    #   [[ 0x0a05 ]] @0x0a0500  [[ 0x0a16 ]] @0x0a1600
-    #   [[ 0x0a06 ]] @0x0a0600  [[ 0x0a17 ]] @0x0a1700
-    #   [[ 0x0a07 ]] @0x0a0700  [[ 0x0a18 ]] @0x0a1800
-    #   [[ 0x0a08 ]] @0x0a0800  [[ 0x0a19 ]] @0x0a1900
-    #   [[ 0x0a09 ]] @0x0a0900  [[ 0x0a20 ]] @0x0a2000
-    #   [[ 0x0a10 ]] @0x0a1000
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0xA000000000000000000000000000000000000000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0xA0000,
-                    ret_size=0x12020,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.SSTORE(key=0xA00, value=Op.MLOAD(offset=0xA0000))
-            + Op.SSTORE(key=0xA11, value=Op.MLOAD(offset=0xA1100))
-            + Op.SSTORE(key=0xA01, value=Op.MLOAD(offset=0xA0100))
-            + Op.SSTORE(key=0xA12, value=Op.MLOAD(offset=0xA1200))
-            + Op.SSTORE(key=0xA02, value=Op.MLOAD(offset=0xA0200))
-            + Op.SSTORE(key=0xA13, value=Op.MLOAD(offset=0xA1300))
-            + Op.SSTORE(key=0xA03, value=Op.MLOAD(offset=0xA0300))
-            + Op.SSTORE(key=0xA14, value=Op.MLOAD(offset=0xA1400))
-            + Op.SSTORE(key=0xA04, value=Op.MLOAD(offset=0xA0400))
-            + Op.SSTORE(key=0xA15, value=Op.MLOAD(offset=0xA1500))
-            + Op.SSTORE(key=0xA05, value=Op.MLOAD(offset=0xA0500))
-            + Op.SSTORE(key=0xA16, value=Op.MLOAD(offset=0xA1600))
-            + Op.SSTORE(key=0xA06, value=Op.MLOAD(offset=0xA0600))
-            + Op.SSTORE(key=0xA17, value=Op.MLOAD(offset=0xA1700))
-            + Op.SSTORE(key=0xA07, value=Op.MLOAD(offset=0xA0700))
-            + Op.SSTORE(key=0xA18, value=Op.MLOAD(offset=0xA1800))
-            + Op.SSTORE(key=0xA08, value=Op.MLOAD(offset=0xA0800))
-            + Op.SSTORE(key=0xA19, value=Op.MLOAD(offset=0xA1900))
-            + Op.SSTORE(key=0xA09, value=Op.MLOAD(offset=0xA0900))
-            + Op.SSTORE(key=0xA20, value=Op.MLOAD(offset=0xA2000))
-            + Op.SSTORE(key=0xA10, value=Op.MLOAD(offset=0xA1000))
-            + Op.STOP
-        ),
-        storage={
-            0x0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-            0x1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-        },
-        balance=1000,
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        gas_limit=4000000,
-        value=100,
-    )
-
-    post = {
-        contract: Account(
-            storage={
-                0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-                1: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-                2560: 1,
-                2561: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                2562: 1,
-                2563: 1,
-                2564: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2565: 0x73F5062FB68ED2A1EC82FF8C73F9251BB9CF53A623BC93527E16BC5AE29DAD74,  # noqa: E501
-                2566: 1,
-                2567: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2568: 0x14EF238CFA4075E9EDE92F18B1566C1DD0B99AAA,
-                2569: 1,
-                2576: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-                2577: 1,
-                2578: 1,
-                2579: 1,
-                2580: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2581: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2582: 1,
-                2583: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                2584: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                2585: 1,
-                2592: 1,
-            },
-        ),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stStaticFlagEnabled/DelegatecallToPrecompileFromTransactionFiller.yml",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Osaka")
-@pytest.mark.pre_alloc_mutable
-def test_delegatecall_to_precompile_from_transaction_from_osaka(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Contract B staticcalls contract A."""
-    coinbase = Address("0xcafe000000000000000000000000000000000001")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    # Source: LLL
+    # Source: lll
     # {
     #   ;; Recovery of ECDSA signature
     #   [ 0x00 ] 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c  # noqa: E501
@@ -512,267 +87,263 @@ def test_delegatecall_to_precompile_from_transaction_from_osaka(
     #   [ 0x0a0600 ] (DELEGATECALL (GAS) 3 0 32 0x2000 32)
     #   [ 0x0a0700 ] @0
     # ... (82 more lines)
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x20, value=0x1C)
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0000,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x1,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(
-                offset=0xA0100,
-                value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
-            )
-            + Op.MSTORE(
-                offset=0xA0200,
-                value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100)),
-            )
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0300,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x2,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0600,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x3,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
-            + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0900,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x4,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x0, value=0x1)
-            + Op.MSTORE(offset=0x20, value=0x20)
-            + Op.MSTORE(offset=0x40, value=0x20)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1100,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x5,
-                    args_offset=0x0,
-                    args_size=0xA1,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x80, value=0x0)
-            + Op.MSTORE(offset=0xA0, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1300,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x6,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x60, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-            )
-            + Op.MSTORE(offset=0x40, value=0x3)
-            + Op.MSTORE(
-                offset=0xA1600,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x7,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x2000,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
-            + Op.MSTORE(offset=0x0, value=0x0)
-            + Op.MSTORE(offset=0x20, value=0x0)
-            + Op.MSTORE(offset=0x40, value=0x0)
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.MSTORE(offset=0x2020, value=0x0)
-            + Op.MSTORE(
-                offset=0x0,
-                value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x60,
-                value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xC0,
-                value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xE0,
-                value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x100,
-                value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x120,
-                value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x140,
-                value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x160,
-                value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0xA1900,
-                value=Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0x8,
-                    args_offset=0x0,
-                    args_size=0x180,
-                    ret_offset=0x2000,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
-            + Op.MSTORE(offset=0x2000, value=0x0)
-            + Op.RETURN(offset=0xA0000, size=0x12020)
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x18C547E4F7B0F325AD1E56F57E26C745B09A3E503D86E00E5255FF7F715D3D1C,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x20, value=0x1C)
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x73B1693892219D736CABA55BDB67216E485557EA6B6AF75F37096C9AA6A5A75F,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0xEEB940B1D03B21E36B0E47E79769F095FE2AB855BD91E3A38756B7D75A9C4549,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0000,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x1,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(
+            offset=0xA0100,
+            value=Op.MOD(Op.MLOAD(offset=0x2000), Op.EXP(0x2, 0xA0)),
+        )
+        + Op.MSTORE(
+            offset=0xA0200, value=Op.EQ(Op.ORIGIN, Op.MLOAD(offset=0xA0100))
+        )
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0300,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x2,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA0400, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xA0500, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0600,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x3,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA0700, value=Op.MLOAD(offset=0x0))
+        + Op.MSTORE(offset=0xA0800, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,
+        )
+        + Op.MSTORE(
+            offset=0xA0900,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x4,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1000, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(offset=0x0, value=0x1)
+        + Op.MSTORE(offset=0x20, value=0x20)
+        + Op.MSTORE(offset=0x40, value=0x20)
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x2EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x2F00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1100,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x5,
+                args_offset=0x0,
+                args_size=0xA1,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1200, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x80, value=0x0)
+        + Op.MSTORE(offset=0xA0, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1300,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x6,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x2000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1400, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0xA1500, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x60, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
+        )
+        + Op.MSTORE(offset=0x40, value=0x3)
+        + Op.MSTORE(
+            offset=0xA1600,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x7,
+                args_offset=0x0,
+                args_size=0x60,
+                ret_offset=0x2000,
+                ret_size=0x40,
+            ),
+        )
+        + Op.MSTORE(offset=0xA1700, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0xA1800, value=Op.MLOAD(offset=0x2020))
+        + Op.MSTORE(offset=0x0, value=0x0)
+        + Op.MSTORE(offset=0x20, value=0x0)
+        + Op.MSTORE(offset=0x40, value=0x0)
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.MSTORE(offset=0x2020, value=0x0)
+        + Op.MSTORE(
+            offset=0x0,
+            value=0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x60,
+            value=0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x80,
+            value=0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xC0,
+            value=0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xE0,
+            value=0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x100,
+            value=0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x120,
+            value=0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x140,
+            value=0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x160,
+            value=0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0xA1900,
+            value=Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0x8,
+                args_offset=0x0,
+                args_size=0x180,
+                ret_offset=0x2000,
+                ret_size=0x20,
+            ),
+        )
+        + Op.MSTORE(offset=0xA2000, value=Op.MLOAD(offset=0x2000))
+        + Op.MSTORE(offset=0x2000, value=0x0)
+        + Op.RETURN(offset=0xA0000, size=0x12020)
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0xa000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xA000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # {
     #   [[ 0x00 ]] 0xfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeedfeed  # noqa: E501
     #   (STATICCALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0x0a0000 0x012020)  # noqa: E501
@@ -790,72 +361,72 @@ def test_delegatecall_to_precompile_from_transaction_from_osaka(
     #   [[ 0x0a09 ]] @0x0a0900  [[ 0x0a20 ]] @0x0a2000
     #   [[ 0x0a10 ]] @0x0a1000
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0xA000000000000000000000000000000000000000,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0xA0000,
-                    ret_size=0x12020,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
-            )
-            + Op.SSTORE(key=0xA00, value=Op.MLOAD(offset=0xA0000))
-            + Op.SSTORE(key=0xA11, value=Op.MLOAD(offset=0xA1100))
-            + Op.SSTORE(key=0xA01, value=Op.MLOAD(offset=0xA0100))
-            + Op.SSTORE(key=0xA12, value=Op.MLOAD(offset=0xA1200))
-            + Op.SSTORE(key=0xA02, value=Op.MLOAD(offset=0xA0200))
-            + Op.SSTORE(key=0xA13, value=Op.MLOAD(offset=0xA1300))
-            + Op.SSTORE(key=0xA03, value=Op.MLOAD(offset=0xA0300))
-            + Op.SSTORE(key=0xA14, value=Op.MLOAD(offset=0xA1400))
-            + Op.SSTORE(key=0xA04, value=Op.MLOAD(offset=0xA0400))
-            + Op.SSTORE(key=0xA15, value=Op.MLOAD(offset=0xA1500))
-            + Op.SSTORE(key=0xA05, value=Op.MLOAD(offset=0xA0500))
-            + Op.SSTORE(key=0xA16, value=Op.MLOAD(offset=0xA1600))
-            + Op.SSTORE(key=0xA06, value=Op.MLOAD(offset=0xA0600))
-            + Op.SSTORE(key=0xA17, value=Op.MLOAD(offset=0xA1700))
-            + Op.SSTORE(key=0xA07, value=Op.MLOAD(offset=0xA0700))
-            + Op.SSTORE(key=0xA18, value=Op.MLOAD(offset=0xA1800))
-            + Op.SSTORE(key=0xA08, value=Op.MLOAD(offset=0xA0800))
-            + Op.SSTORE(key=0xA19, value=Op.MLOAD(offset=0xA1900))
-            + Op.SSTORE(key=0xA09, value=Op.MLOAD(offset=0xA0900))
-            + Op.SSTORE(key=0xA20, value=Op.MLOAD(offset=0xA2000))
-            + Op.SSTORE(key=0xA10, value=Op.MLOAD(offset=0xA1000))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
+        )
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0xA0000,
+                ret_size=0x12020,
+            )
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
+        )
+        + Op.SSTORE(key=0xA00, value=Op.MLOAD(offset=0xA0000))
+        + Op.SSTORE(key=0xA11, value=Op.MLOAD(offset=0xA1100))
+        + Op.SSTORE(key=0xA01, value=Op.MLOAD(offset=0xA0100))
+        + Op.SSTORE(key=0xA12, value=Op.MLOAD(offset=0xA1200))
+        + Op.SSTORE(key=0xA02, value=Op.MLOAD(offset=0xA0200))
+        + Op.SSTORE(key=0xA13, value=Op.MLOAD(offset=0xA1300))
+        + Op.SSTORE(key=0xA03, value=Op.MLOAD(offset=0xA0300))
+        + Op.SSTORE(key=0xA14, value=Op.MLOAD(offset=0xA1400))
+        + Op.SSTORE(key=0xA04, value=Op.MLOAD(offset=0xA0400))
+        + Op.SSTORE(key=0xA15, value=Op.MLOAD(offset=0xA1500))
+        + Op.SSTORE(key=0xA05, value=Op.MLOAD(offset=0xA0500))
+        + Op.SSTORE(key=0xA16, value=Op.MLOAD(offset=0xA1600))
+        + Op.SSTORE(key=0xA06, value=Op.MLOAD(offset=0xA0600))
+        + Op.SSTORE(key=0xA17, value=Op.MLOAD(offset=0xA1700))
+        + Op.SSTORE(key=0xA07, value=Op.MLOAD(offset=0xA0700))
+        + Op.SSTORE(key=0xA18, value=Op.MLOAD(offset=0xA1800))
+        + Op.SSTORE(key=0xA08, value=Op.MLOAD(offset=0xA0800))
+        + Op.SSTORE(key=0xA19, value=Op.MLOAD(offset=0xA1900))
+        + Op.SSTORE(key=0xA09, value=Op.MLOAD(offset=0xA0900))
+        + Op.SSTORE(key=0xA20, value=Op.MLOAD(offset=0xA2000))
+        + Op.SSTORE(key=0xA10, value=Op.MLOAD(offset=0xA1000))
+        + Op.STOP,
         storage={
-            0x0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
-            0x1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
+            0: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
+            1: 0xDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAFDEADBEAF,  # noqa: E501
         },
         balance=1000,
         nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0xB000000000000000000000000000000000000000),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=4000000,
         value=100,
     )
 
     post = {
-        contract: Account(
+        contract_1: Account(storage={}, balance=1000),
+        contract_0: Account(
             storage={
                 0: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
                 1: 0xFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEEDFEED,  # noqa: E501
                 2560: 1,
-                2561: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                2561: sender,
                 2562: 1,
                 2563: 1,
                 2564: 0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC000000,  # noqa: E501
@@ -876,6 +447,7 @@ def test_delegatecall_to_precompile_from_transaction_from_osaka(
                 2585: 1,
                 2592: 1,
             },
+            balance=1100,
         ),
     }
 
diff --git a/tests/ported_static/stSystemOperationsTest/__init__.py b/tests/ported_static/stSystemOperationsTest/__init__.py
index 0292429ff32..f2656f1635a 100644
--- a/tests/ported_static/stSystemOperationsTest/__init__.py
+++ b/tests/ported_static/stSystemOperationsTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stSystemOperationsTest."""
+"""Ported static tests: stSystemOperationsTest."""  # noqa: N999
diff --git a/tests/ported_static/stSystemOperationsTest/test_ab_acalls0.py b/tests/ported_static/stSystemOperationsTest/test_ab_acalls0.py
index 4b0249d0a89..863e937e7bb 100644
--- a/tests/ported_static/stSystemOperationsTest/test_ab_acalls0.py
+++ b/tests/ported_static/stSystemOperationsTest/test_ab_acalls0.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_ab_acalls0.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/ABAcalls0Filler.json
+state_tests/stSystemOperationsTest/ABAcalls0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSystemOperationsTest/ABAcalls0Filler.json"],
+    ["state_tests/stSystemOperationsTest/ABAcalls0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_ab_acalls0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_ab_acalls0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,63 +43,61 @@ def test_ab_acalls0(
         gas_limit=10000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=Op.PC,
-                value=Op.ADD(
-                    0x1,
-                    Op.CALL(
-                        gas=0xC350,
-                        address=0xD6CD6EC9ADCA299F2BBFD754FF8BCF6A4B9AAE40,
-                        value=0x17,
-                        args_offset=0x0,
-                        args_size=0x0,
-                        ret_offset=0x0,
-                        ret_size=0x0,
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=23,
+    # Source: lll
+    # {  [[ (PC) ]] (CALL 100000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 24 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=Op.PC,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0x44EB1162303B6A60F2F8882D43D661787B3011E6,
+                value=0x18,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x44eb1162303b6a60f2f8882d43d661787b3011e6"),  # noqa: E501
+        address=Address(0xD6CD6EC9ADCA299F2BBFD754FF8BCF6A4B9AAE40),  # noqa: E501
     )
-    # Source: LLL
-    # {  [[ (PC) ]] (CALL 100000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 24 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=Op.PC,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x44EB1162303B6A60F2F8882D43D661787B3011E6,
-                    value=0x18,
+    # Source: lll
+    # { [[ (PC) ]] (ADD 1 (CALL 50000 <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87> 23 0 0 0 0)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=Op.PC,
+            value=Op.ADD(
+                0x1,
+                Op.CALL(
+                    gas=0xC350,
+                    address=0xD6CD6EC9ADCA299F2BBFD754FF8BCF6A4B9AAE40,
+                    value=0x17,
                     args_offset=0x0,
                     args_size=0x0,
                     ret_offset=0x0,
                     ret_size=0x0,
                 ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+            ),
+        )
+        + Op.STOP,
+        balance=23,
         nonce=0,
-        address=Address("0xd6cd6ec9adca299f2bbfd754ff8bcf6a4b9aae40"),  # noqa: E501
+        address=Address(0x44EB1162303B6A60F2F8882D43D661787B3011E6),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        callee: Account(storage={38: 1}),
-        contract: Account(storage={36: 1}),
+        target: Account(storage={36: 1}),
+        addr: Account(storage={38: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_ab_acalls1.py b/tests/ported_static/stSystemOperationsTest/test_ab_acalls1.py
index f91b6bc3123..cf256c209c9 100644
--- a/tests/ported_static/stSystemOperationsTest/test_ab_acalls1.py
+++ b/tests/ported_static/stSystemOperationsTest/test_ab_acalls1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_ab_acalls1.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/ABAcalls1Filler.json
+state_tests/stSystemOperationsTest/ABAcalls1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSystemOperationsTest/ABAcalls1Filler.json"],
+    ["state_tests/stSystemOperationsTest/ABAcalls1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_ab_acalls1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_ab_acalls1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,63 +44,61 @@ def test_ab_acalls1(
         gas_limit=10000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ (PC) ]] (CALL (- (GAS) 100000) <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 24 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=Op.PC,
-                value=Op.CALL(
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=Op.PC,
+            value=Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x186A0),
+                address=0x6236EA4EA8F3E5263ACB65A97ABE8683AB54D03A,
+                value=0x18,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x572A88ED686BEB6C9B71DC491BA1E120B327A85F),  # noqa: E501
+    )
+    # Source: lll
+    # { [[ (PC) ]] (ADD 1 (CALL (- (GAS) 100000) <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87> 23 0 0 0 0)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=Op.PC,
+            value=Op.ADD(
+                0x1,
+                Op.CALL(
                     gas=Op.SUB(Op.GAS, 0x186A0),
-                    address=0x6236EA4EA8F3E5263ACB65A97ABE8683AB54D03A,
-                    value=0x18,
+                    address=0x572A88ED686BEB6C9B71DC491BA1E120B327A85F,
+                    value=0x17,
                     args_offset=0x0,
                     args_size=0x0,
                     ret_offset=0x0,
                     ret_size=0x0,
                 ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x572a88ed686beb6c9b71dc491ba1e120b327a85f"),  # noqa: E501
-    )
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=Op.PC,
-                value=Op.ADD(
-                    0x1,
-                    Op.CALL(
-                        gas=Op.SUB(Op.GAS, 0x186A0),
-                        address=0x572A88ED686BEB6C9B71DC491BA1E120B327A85F,
-                        value=0x17,
-                        args_offset=0x0,
-                        args_size=0x0,
-                        ret_offset=0x0,
-                        ret_size=0x0,
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0x6236ea4ea8f3e5263acb65a97abe8683ab54d03a"),  # noqa: E501
+        address=Address(0x6236EA4EA8F3E5263ACB65A97ABE8683AB54D03A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={38: 1}),
-        callee: Account(storage={41: 2}),
+        target: Account(storage={38: 1}),
+        addr: Account(storage={41: 2}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_ab_acalls2.py b/tests/ported_static/stSystemOperationsTest/test_ab_acalls2.py
index aa72f666e73..879789fe147 100644
--- a/tests/ported_static/stSystemOperationsTest/test_ab_acalls2.py
+++ b/tests/ported_static/stSystemOperationsTest/test_ab_acalls2.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_ab_acalls2.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/ABAcalls2Filler.json
+state_tests/stSystemOperationsTest/ABAcalls2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSystemOperationsTest/ABAcalls2Filler.json"],
+    ["state_tests/stSystemOperationsTest/ABAcalls2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -31,11 +31,9 @@ def test_ab_acalls2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_ab_acalls2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,55 +44,53 @@ def test_ab_acalls2(
         gas_limit=10000000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.CALL(
-                gas=Op.SUB(Op.GAS, 0x186A0),
-                address=0xC58B2120D2AD0CBFCCD6EBAAE6C11258ACEAC41B,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xa890ceb693666313e0a5a1be4f59f06c1e33f5c9"),  # noqa: E501
-    )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (ADD (SLOAD 0) 1) (CALL (- (GAS) 100000) <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 1 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.CALL(
-                gas=Op.SUB(Op.GAS, 0x186A0),
-                address=0xA890CEB693666313E0A5A1BE4F59F06C1E33F5C9,
-                value=0x1,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.CALL(
+            gas=Op.SUB(Op.GAS, 0x186A0),
+            address=0xA890CEB693666313E0A5A1BE4F59F06C1E33F5C9,
+            value=0x1,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc58b2120d2ad0cbfccd6ebaae6c11258aceac41b"),  # noqa: E501
+        address=Address(0xC58B2120D2AD0CBFCCD6EBAAE6C11258ACEAC41B),  # noqa: E501
+    )
+    # Source: lll
+    # { [[ 0 ]] (ADD (SLOAD 0) 1) (CALL (- (GAS) 100000) <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.CALL(
+            gas=Op.SUB(Op.GAS, 0x186A0),
+            address=0xC58B2120D2AD0CBFCCD6EBAAE6C11258ACEAC41B,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xA890CEB693666313E0A5A1BE4F59F06C1E33F5C9),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        callee: Account(storage={0: 201}),
-        contract: Account(storage={0: 201}),
+        target: Account(storage={0: 201}),
+        addr: Account(storage={0: 201}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_ab_acalls3.py b/tests/ported_static/stSystemOperationsTest/test_ab_acalls3.py
index 23e968e312a..8f2b77d0966 100644
--- a/tests/ported_static/stSystemOperationsTest/test_ab_acalls3.py
+++ b/tests/ported_static/stSystemOperationsTest/test_ab_acalls3.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_ab_acalls3.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/ABAcalls3Filler.json
+state_tests/stSystemOperationsTest/ABAcalls3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSystemOperationsTest/ABAcalls3Filler.json"],
+    ["state_tests/stSystemOperationsTest/ABAcalls3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_ab_acalls3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_ab_acalls3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,55 +43,53 @@ def test_ab_acalls3(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (ADD (SLOAD 0) 1) (CALL (- (GAS) 100000) <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 1 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.CALL(
-                gas=Op.SUB(Op.GAS, 0x186A0),
-                address=0xA890CEB693666313E0A5A1BE4F59F06C1E33F5C9,
-                value=0x1,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.CALL(
+            gas=Op.SUB(Op.GAS, 0x186A0),
+            address=0xA890CEB693666313E0A5A1BE4F59F06C1E33F5C9,
+            value=0x1,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xFA3E8,
         nonce=0,
-        address=Address("0x4776b53deb22f16581088f679dba75e205b65d34"),  # noqa: E501
+        address=Address(0x4776B53DEB22F16581088F679DBA75E205B65D34),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.CALL(
-                gas=Op.SUB(Op.GAS, 0x186A0),
-                address=0x4776B53DEB22F16581088F679DBA75E205B65D34,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # { [[ 0 ]] (ADD (SLOAD 0) 1) (CALL (- (GAS) 100000) <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87> 0 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.CALL(
+            gas=Op.SUB(Op.GAS, 0x186A0),
+            address=0x4776B53DEB22F16581088F679DBA75E205B65D34,
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa890ceb693666313e0a5a1be4f59f06c1e33f5c9"),  # noqa: E501
+        address=Address(0xA890CEB693666313E0A5A1BE4F59F06C1E33F5C9),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(storage={0: 52}),
-        callee: Account(storage={0: 52}),
+        target: Account(storage={0: 52}),
+        addr: Account(storage={0: 52}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_ab_acalls_suicide0.py b/tests/ported_static/stSystemOperationsTest/test_ab_acalls_suicide0.py
index c805fa7e590..a8876a5fd6a 100644
--- a/tests/ported_static/stSystemOperationsTest/test_ab_acalls_suicide0.py
+++ b/tests/ported_static/stSystemOperationsTest/test_ab_acalls_suicide0.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_ab_acalls_suicide0.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/ABAcallsSuicide0Filler.json
+state_tests/stSystemOperationsTest/ABAcallsSuicide0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/ABAcallsSuicide0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/ABAcallsSuicide0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_ab_acalls_suicide0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_ab_acalls_suicide0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,66 +43,59 @@ def test_ab_acalls_suicide0(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ (PC) ]] (CALL 100000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 24 0 0 0 0) (SELFDESTRUCT <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>)  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=Op.PC,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x24940009F045E4134ED2AB242BE610D312FE9A29,
-                    value=0x18,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=Op.PC,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=0x24940009F045E4134ED2AB242BE610D312FE9A29,
+                value=0x18,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0x24940009F045E4134ED2AB242BE610D312FE9A29)
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+        address=Address(0x10481E52C494FD0D78604B0F9207A89008F7E9A9),  # noqa: E501
+    )
+    # Source: lll
+    # { [[ (PC) ]] (ADD 1 (CALL 50000 <contract:target:0x095e7baea6a6c7c4c2dfeb977efac326af552d87> 23 0 0 0 0)) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=Op.PC,
+            value=Op.ADD(
+                0x1,
+                Op.CALL(
+                    gas=0xC350,
+                    address=0x10481E52C494FD0D78604B0F9207A89008F7E9A9,
+                    value=0x17,
                     args_offset=0x0,
                     args_size=0x0,
                     ret_offset=0x0,
                     ret_size=0x0,
                 ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0x24940009F045E4134ED2AB242BE610D312FE9A29
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x10481e52c494fd0d78604b0f9207a89008f7e9a9"),  # noqa: E501
-    )
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=Op.PC,
-                value=Op.ADD(
-                    0x1,
-                    Op.CALL(
-                        gas=0xC350,
-                        address=0x10481E52C494FD0D78604B0F9207A89008F7E9A9,
-                        value=0x17,
-                        args_offset=0x0,
-                        args_size=0x0,
-                        ret_offset=0x0,
-                        ret_size=0x0,
-                    ),
-                ),
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0x24940009f045e4134ed2ab242be610d312fe9a29"),  # noqa: E501
+        address=Address(0x24940009F045E4134ED2AB242BE610D312FE9A29),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={36: 1}),
-        callee: Account(storage={38: 1}),
-    }
+    post = {addr: Account(storage={38: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_ab_acalls_suicide1.py b/tests/ported_static/stSystemOperationsTest/test_ab_acalls_suicide1.py
index b013f25d412..a21d870ec37 100644
--- a/tests/ported_static/stSystemOperationsTest/test_ab_acalls_suicide1.py
+++ b/tests/ported_static/stSystemOperationsTest/test_ab_acalls_suicide1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_ab_acalls_suicide1.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/ABAcallsSuicide1Filler.json
+state_tests/stSystemOperationsTest/ABAcallsSuicide1Filler.json
 """
 
 import pytest
@@ -12,9 +12,11 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,34 +24,39 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/ABAcallsSuicide1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/ABAcallsSuicide1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "00000000000000000000000000000000000000000000000000000000000186a0",
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000486a0",
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_ab_acalls_suicide1(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_ab_acalls_suicide1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    contract_1 = Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -63,70 +70,76 @@ def test_ab_acalls_suicide1(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # {  (MSTORE 0 (CALLDATALOAD 0)) [[ (PC) ]] (CALL (CALLDATALOAD 0) 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 32 0 0)   }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=Op.PC,
-                value=Op.CALL(
-                    gas=Op.CALLDATALOAD(offset=0x0),
-                    address=0x945304EB96065B2A98B57A48A06AE28D285A71B5,
-                    value=0x18,
-                    args_offset=0x0,
-                    args_size=0x20,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=Op.PC,
+            value=Op.CALL(
+                gas=Op.CALLDATALOAD(offset=0x0),
+                address=0x945304EB96065B2A98B57A48A06AE28D285A71B5,
+                value=0x18,
+                args_offset=0x0,
+                args_size=0x20,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  (MSTORE 0 (CALLDATALOAD 0)) [[ (PC) ]] (ADD 1 (CALL (SUB (CALLDATALOAD 0) 50000) 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 32 0 0)) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.SSTORE(
-                key=Op.PC,
-                value=Op.ADD(
-                    0x1,
-                    Op.CALL(
-                        gas=Op.SUB(Op.CALLDATALOAD(offset=0x0), 0xC350),
-                        address=0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87,
-                        value=0x17,
-                        args_offset=0x0,
-                        args_size=0x20,
-                        ret_offset=0x0,
-                        ret_size=0x0,
-                    ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.SSTORE(
+            key=Op.PC,
+            value=Op.ADD(
+                0x1,
+                Op.CALL(
+                    gas=Op.SUB(Op.CALLDATALOAD(offset=0x0), 0xC350),
+                    address=0x95E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87,
+                    value=0x17,
+                    args_offset=0x0,
+                    args_size=0x20,
+                    ret_offset=0x0,
+                    ret_size=0x0,
                 ),
-            )
-            + Op.SELFDESTRUCT(
-                address=0xF572E5295C57F15886F9B263E2F6D2D6C7B5EC6
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.SELFDESTRUCT(address=0xF572E5295C57F15886F9B263E2F6D2D6C7B5EC6)
+        + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0x945304eb96065b2a98b57a48a06ae28d285a71b5"),  # noqa: E501
+        address=Address(0x945304EB96065B2A98B57A48A06AE28D285A71B5),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(0x186A0),
+        Hash(0x486A0),
+    ]
+    tx_gas = [10000000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=10000000,
-        value=100000,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
     )
 
-    post = expected_post
+    post = {
+        contract_0: Account(storage={}),
+        Address(
+            0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6
+        ): Account.NONEXISTENT,
+        contract_1: Account(storage={}, balance=23),
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_balance_input_address_too_big.py b/tests/ported_static/stSystemOperationsTest/test_balance_input_address_too_big.py
index f8297953abc..30f5fa1470b 100644
--- a/tests/ported_static/stSystemOperationsTest/test_balance_input_address_too_big.py
+++ b/tests/ported_static/stSystemOperationsTest/test_balance_input_address_too_big.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_balance_input_address_too_big.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-balanceInputAddressTooBigFiller.json
+state_tests/stSystemOperationsTest/balanceInputAddressTooBigFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/balanceInputAddressTooBigFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/balanceInputAddressTooBigFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_balance_input_address_too_big(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_balance_input_address_too_big."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,31 +45,28 @@ def test_balance_input_address_too_big(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (BALANCE <eoa:sender:0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b>aa ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.BALANCE(
-                    address=0xEBAF50DEBF10E08302FE4280C32DF010463CA297AA,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.BALANCE(
+                address=0xEBAF50DEBF10E08302FE4280C32DF010463CA297AA
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x7b25bef255e5917c960aef5ceb690dcaa1c9eff8"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call10.py b/tests/ported_static/stSystemOperationsTest/test_call10.py
index f84e06a982f..dd81ff55302 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call10.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call10.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call10.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/Call10Filler.json
+state_tests/stSystemOperationsTest/Call10Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSystemOperationsTest/Call10Filler.json"],
+    ["state_tests/stSystemOperationsTest/Call10Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,12 +30,9 @@ def test_call10(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE7C72B378297589ACEE4E0BA3272841BCFC5E220F86DE253F890274CFEE9E474
-    )
-    callee = Address("0xd9b97c712ebce43f3c19179bbef44b550f9e8bc0")
+    """Test_call10."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,49 +43,43 @@ def test_call10(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-    pre[callee] = Account(balance=7000, nonce=0)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=7000)  # noqa: F841
+    # Source: lll
     # { (def 'i 0x80) (for {} (< @i 10) [i](+ @i 1) [[ 0 ]](CALL 0xfffffffffff <eoa:0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 50000 0 0) ) [[ 1 ]] @i}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x42,
-                condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xA)),
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xFFFFFFFFFFF,
-                    address=0xD9B97C712EBCE43F3C19179BBEF44B550F9E8BC0,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0xC350,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
-            + Op.JUMP(pc=0x0)
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x42, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x80), 0xA))
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xFFFFFFFFFFF,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0xC350,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x0)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x80))
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0xfda03fa18cbda0970e18071f363bea4c9c90dfb6"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=200000,
         value=10,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 10}),
-    }
+    post = {target: Account(storage={0: 1, 1: 10})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb0.py b/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb0.py
index dffecbe35f7..908cfbee6d0 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb0.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb0.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_recursive_bomb0.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb0Filler.json
+state_tests/stSystemOperationsTest/CallRecursiveBomb0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/CallRecursiveBomb0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -33,11 +31,9 @@ def test_call_recursive_bomb0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_recursive_bomb0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,57 +44,54 @@ def test_call_recursive_bomb0(
         gas_limit=11000000000,
     )
 
-    # Source: LLL
-    # {  (CALL 100000000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 0 0 0)  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x5F5E100,
-                address=0x783516813E6366B978F7101A6A12B4C8498B0283,
-                value=0x17,
+    # Source: lll
+    # { [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 11000) (ADDRESS) 0 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x2AF8),
+                address=Op.ADDRESS,
+                value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0x77359400,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6904e15f2a58e4c22dbb37ffeb39ab1f64002eb4"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x2AF8),
-                    address=Op.ADDRESS,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: lll
+    # {  (CALL 100000000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 0 0 0)  }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x5F5E100,
+            address=addr,
+            value=0x17,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0x77359400,
         nonce=0,
-        address=Address("0x783516813e6366b978f7101a6a12b4c8498b0283"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        callee: Account(storage={0: 313, 1: 1}),
+        addr: Account(storage={0: 313, 1: 1}),
+        sender: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb0_oog_at_max_call_depth.py b/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb0_oog_at_max_call_depth.py
index bef9f025177..36b1bca2d55 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb0_oog_at_max_call_depth.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb0_oog_at_max_call_depth.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_recursive_bomb0_oog_at_max_call_depth.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json
+state_tests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -34,11 +33,9 @@ def test_call_recursive_bomb0_oog_at_max_call_depth(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_recursive_bomb0_oog_at_max_call_depth."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,50 +46,43 @@ def test_call_recursive_bomb0_oog_at_max_call_depth(
         gas_limit=110000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (+ (SLOAD 0) 1) [[ 2 ]] (MUL (DIV @@0 0x0402) 0xfffffffffffffffffff) [[ 1 ]] (CALL (- (GAS) 1024) (ADDRESS) 0 0 (MUL (DIV @@0 0x0402) 0xfffffffffffffffffff) 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.MUL(
-                    Op.DIV(Op.SLOAD(key=0x0), 0x402),
-                    0xFFFFFFFFFFFFFFFFFFF,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x400),
-                    address=Op.ADDRESS,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=Op.MUL(
-                        Op.DIV(Op.SLOAD(key=0x0), 0x402),
-                        0xFFFFFFFFFFFFFFFFFFF,
-                    ),
-                    ret_offset=0x0,
-                    ret_size=0x0,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x2,
+            value=Op.MUL(
+                Op.DIV(Op.SLOAD(key=0x0), 0x402), 0xFFFFFFFFFFFFFFFFFFF
+            ),
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x400),
+                address=Op.ADDRESS,
+                value=0x0,
+                args_offset=0x0,
+                args_size=Op.MUL(
+                    Op.DIV(Op.SLOAD(key=0x0), 0x402), 0xFFFFFFFFFFFFFFFFFFF
                 ),
-            )
-            + Op.STOP
-        ),
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x44872316ef00e0cd82e980900e6b85077b65e32f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 749, 1: 1}),
-    }
+    post = {target: Account(storage={0: 749, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb1.py b/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb1.py
index 8d4449b8813..e08a6fe1999 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb1.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_recursive_bomb1.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb1Filler.json
+state_tests/stSystemOperationsTest/CallRecursiveBomb1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/CallRecursiveBomb1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -33,11 +31,9 @@ def test_call_recursive_bomb1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_recursive_bomb1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,40 +44,35 @@ def test_call_recursive_bomb1(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 15000) (ADDRESS) 0 0 0 0 0)  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x3A98),
-                    address=Op.ADDRESS,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x3A98),
+                address=Op.ADDRESS,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x3987ab80fa45389ce475fa3edd3d507bebc5ec3d"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=20622100,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 256, 1: 1}),
-    }
+    post = {target: Account(storage={0: 256, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb2.py b/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb2.py
index 72a9d9936c3..5fd784cedcc 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb2.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb2.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_recursive_bomb2.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb2Filler.json
+state_tests/stSystemOperationsTest/CallRecursiveBomb2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/CallRecursiveBomb2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -33,11 +31,9 @@ def test_call_recursive_bomb2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_recursive_bomb2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,40 +44,35 @@ def test_call_recursive_bomb2(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 15000) (ADDRESS) 0 0 0 0 0)  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x3A98),
-                    address=Op.ADDRESS,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x3A98),
+                address=Op.ADDRESS,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0x3987ab80fa45389ce475fa3edd3d507bebc5ec3d"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=20622099,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 256, 1: 1}),
-    }
+    post = {target: Account(storage={0: 256, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb3.py b/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb3.py
index c697459ec89..ee666d8bf61 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb3.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb3.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_recursive_bomb3.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb3Filler.json
+state_tests/stSystemOperationsTest/CallRecursiveBomb3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/CallRecursiveBomb3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/CallRecursiveBomb3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_call_recursive_bomb3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_recursive_bomb3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,40 +43,35 @@ def test_call_recursive_bomb3(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 224) (ADDRESS) 0 0 0 0 0)  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0xE0),
-                    address=Op.ADDRESS,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.SUB(Op.GAS, 0xE0),
+                address=Op.ADDRESS,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xbaa8243d50fddb48abd93764bbd97972dc654f67"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 18, 1: 1}),
-    }
+    post = {target: Account(storage={0: 18, 1: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb_log.py b/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb_log.py
index 6d21090171d..1c6670b6d98 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb_log.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb_log.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_recursive_bomb_log.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/CallRecursiveBombLogFiller.json
+state_tests/stSystemOperationsTest/CallRecursiveBombLogFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/CallRecursiveBombLogFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/CallRecursiveBombLogFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -33,11 +31,9 @@ def test_call_recursive_bomb_log(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_recursive_bomb_log."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,62 +44,59 @@ def test_call_recursive_bomb_log(
         gas_limit=100000000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.LOG0(offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x61A8),
-                    address=Op.ADDRESS,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x5fe917d1ef791e524f7cb24cd012b5e5ec17000c"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  (CALL 100000000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 0 0 0)  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x5F5E100,
-                address=0x5FE917D1EF791E524F7CB24CD012B5E5EC17000C,
-                value=0x17,
+    # Source: lll
+    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG0 0 32) [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 25000) (ADDRESS) 0 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.LOG0(offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x61A8),
+                address=Op.ADDRESS,
+                value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+    )
+    # Source: lll
+    # {  (CALL 100000000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 0 0 0)  }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x5F5E100,
+            address=addr,
+            value=0x17,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xd2e8fbe36bd16b24a1d34e4c06ec0741bd71c452"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        callee: Account(storage={0: 321, 1: 1}),
+        addr: Account(storage={0: 321, 1: 1}),
+        sender: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb_log2.py b/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb_log2.py
index a8b097ff5f0..622f0ba202e 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb_log2.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_recursive_bomb_log2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_recursive_bomb_log2.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-CallRecursiveBombLog2Filler.json
+state_tests/stSystemOperationsTest/CallRecursiveBombLog2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/CallRecursiveBombLog2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/CallRecursiveBombLog2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.valid_until("Prague")
@@ -34,11 +31,9 @@ def test_call_recursive_bomb_log2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_recursive_bomb_log2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,59 +44,56 @@ def test_call_recursive_bomb_log2(
         gas_limit=11000000000,
     )
 
-    callee = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.GAS)
-            + Op.LOG0(offset=0x0, size=0x20)
-            + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=Op.SUB(Op.GAS, 0x61A8),
-                    address=Op.ADDRESS,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0xDE0B6B3A7640000,
-        nonce=0,
-        address=Address("0x4f046f9952c30de8430278a978358e998784a4ca"),  # noqa: E501
-    )
-    # Source: LLL
-    # {  (CALL 100000000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 0 0 0)  }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x5F5E100,
-                address=0x4F046F9952C30DE8430278A978358E998784A4CA,
-                value=0x17,
+    # Source: lll
+    # { (MSTORE 0 (GAS)) (LOG0 0 32) [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 25000) (ADDRESS) 0 0 0 0 0) }  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.GAS)
+        + Op.LOG0(offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=Op.ADD(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=Op.SUB(Op.GAS, 0x61A8),
+                address=Op.ADDRESS,
+                value=0x0,
                 args_offset=0x0,
                 args_size=0x0,
                 ret_offset=0x0,
                 ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+    )
+    # Source: lll
+    # {  (CALL 100000000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 0 0 0)  }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x5F5E100,
+            address=addr,
+            value=0x17,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0x1312D00,
         nonce=0,
-        address=Address("0xd2e8fbe36bd16b24a1d34e4c06ec0741bd71c452"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        callee: Account(storage={0: 322, 1: 1}),
+        addr: Account(storage={0: 322, 1: 1}),
+        sender: Account(nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator0.py b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator0.py
index 678c051412b..891c3e8626a 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator0.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator0.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_to_name_registrator0.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-CallToNameRegistrator0Filler.json
+state_tests/stSystemOperationsTest/CallToNameRegistrator0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/CallToNameRegistrator0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/CallToNameRegistrator0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_call_to_name_registrator0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_to_name_registrator0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,70 +43,57 @@ def test_call_to_name_registrator0(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    callee = pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=23,
         nonce=0,
-        address=Address("0x15eb18969e0925c8e4a76fd7cbce36a2b056b27e"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 100000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 64 64 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x186A0,
-                    address=0x15EB18969E0925C8E4A76FD7CBCE36A2B056B27E,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x40,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x186A0,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x40,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf32cbf847e357d4ac1a41d8202aa2ee516dc32d1"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        callee: Account(
-            storage={
-                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF: 0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            },
-        ),
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_address_too_big_left.py b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_address_too_big_left.py
index c48564d45f5..74d9a7cdb21 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_address_too_big_left.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_address_too_big_left.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_to_name_registrator_address_too_big_left.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-CallToNameRegistratorAddressTooBigLeftFiller.json
+state_tests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeftFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeftFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeftFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_call_to_name_registrator_address_too_big_left(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
-    contract = Address("0xc8266873d1c906e93364246e671c3d9802aabe37")
+    """Test_call_to_name_registrator_address_too_big_left."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,34 +45,37 @@ def test_call_to_name_registrator_address_too_big_left(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: lll
+    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 1000 0xaa<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 64 64 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+    )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=23,
         nonce=0,
-        address=Address("0x15eb18969e0925c8e4a76fd7cbce36a2b056b27e"),  # noqa: E501
     )
-    pre[contract] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_address_too_big_right.py b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_address_too_big_right.py
index 2650732be0c..2d9970a1547 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_address_too_big_right.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_address_too_big_right.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_to_name_registrator_address_too_big_right.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-CallToNameRegistratorAddressTooBigRightFiller.json
+state_tests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRightFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRightFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRightFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_to_name_registrator_address_too_big_right(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_to_name_registrator_address_too_big_right."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,65 +45,57 @@ def test_call_to_name_registrator_address_too_big_right(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=23,
+    # Source: lll
+    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 1000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>aa 23 0 64 64 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=0x15EB18969E0925C8E4A76FD7CBCE36A2B056B27EAA,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x40,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x15eb18969e0925c8e4a76fd7cbce36a2b056b27e"),  # noqa: E501
     )
-    # Source: LLL
-    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 1000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>aa 23 0 64 64 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x15EB18969E0925C8E4A76FD7CBCE36A2B056B27EAA,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x40,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=23,
         nonce=0,
-        address=Address("0x2308da9c42e252155baed45bca437ef6cf3fb0b2"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_mem_oog_and_insufficient_balance.py b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_mem_oog_and_insufficient_balance.py
index ab27c3d69c6..6a4037f580f 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_mem_oog_and_insufficient_balance.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_mem_oog_and_insufficient_balance.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_to_name_registrator_mem_oog_and_insufficient_balance.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-CallToNameRegistratorMemOOGAndInsufficientBalanceFiller.json
+state_tests/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalanceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalanceFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalanceFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_to_name_registrator_mem_oog_and_insufficient_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_to_name_registrator_mem_oog_and_insufficient_balance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,63 +45,57 @@ def test_call_to_name_registrator_mem_oog_and_insufficient_balance(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=23,
         nonce=0,
-        address=Address("0x15eb18969e0925c8e4a76fd7cbce36a2b056b27e"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 0xffffffffff <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 0xffffffffffff 64 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0xFFFFFFFFFF,
-                    address=0x15EB18969E0925C8E4A76FD7CBCE36A2B056B27E,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0xFFFFFFFFFFFF,
-                    ret_offset=0x40,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0xFFFFFFFFFF,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0xFFFFFFFFFFFF,
+                ret_offset=0x40,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x74859a27dc2f1ee153cf9b4e4bac1133f3b01b17"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_not_much_memory0.py b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_not_much_memory0.py
index 47cbcd4bed0..cb77992a35a 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_not_much_memory0.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_not_much_memory0.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_to_name_registrator_not_much_memory0.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-CallToNameRegistratorNotMuchMemory0Filler.json
+state_tests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0Filler.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_to_name_registrator_not_much_memory0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_to_name_registrator_not_much_memory0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,63 +45,57 @@ def test_call_to_name_registrator_not_much_memory0(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=23,
         nonce=0,
-        address=Address("0x15eb18969e0925c8e4a76fd7cbce36a2b056b27e"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 64 987654 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xEEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x1F4,
-                    address=0x15EB18969E0925C8E4A76FD7CBCE36A2B056B27E,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0xF1206,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xEEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x1F4,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0xF1206,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x410dcc04fb8fc328d8eb131b4d9ea4204fbdaf2f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_not_much_memory1.py b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_not_much_memory1.py
index 11400a83510..4d0137b3f55 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_not_much_memory1.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_not_much_memory1.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_to_name_registrator_not_much_memory1.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-CallToNameRegistratorNotMuchMemory1Filler.json
+state_tests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1Filler.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_to_name_registrator_not_much_memory1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_to_name_registrator_not_much_memory1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,63 +45,57 @@ def test_call_to_name_registrator_not_much_memory1(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=23,
         nonce=0,
-        address=Address("0x15eb18969e0925c8e4a76fd7cbce36a2b056b27e"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 987654 0 64 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xEEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x1F4,
-                    address=0x15EB18969E0925C8E4A76FD7CBCE36A2B056B27E,
-                    value=0x17,
-                    args_offset=0xF1206,
-                    args_size=0x0,
-                    ret_offset=0x40,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xEEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x1F4,
+                address=addr,
+                value=0x17,
+                args_offset=0xF1206,
+                args_size=0x0,
+                ret_offset=0x40,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x8e2af1ed48cb5567a2bc09cde959dc7b5e5557ba"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=290000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_out_of_gas.py b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_out_of_gas.py
index c88eb6cef88..ea3c2132fff 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_out_of_gas.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_out_of_gas.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_to_name_registrator_out_of_gas.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-CallToNameRegistratorOutOfGasFiller.json
+state_tests/stSystemOperationsTest/CallToNameRegistratorOutOfGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/CallToNameRegistratorOutOfGasFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/CallToNameRegistratorOutOfGasFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_to_name_registrator_out_of_gas(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_to_name_registrator_out_of_gas."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,63 +45,57 @@ def test_call_to_name_registrator_out_of_gas(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=23,
         nonce=0,
-        address=Address("0x15eb18969e0925c8e4a76fd7cbce36a2b056b27e"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 100 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 64 64 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xEEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x64,
-                    address=0x15EB18969E0925C8E4A76FD7CBCE36A2B056B27E,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x40,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xEEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x64,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x40,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x9b360d4f319b3f0a24f02939650cf93bbdb82022"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_too_much_memory0.py b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_too_much_memory0.py
index d955454bc22..bc845d4f41c 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_too_much_memory0.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_too_much_memory0.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_to_name_registrator_too_much_memory0.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-CallToNameRegistratorTooMuchMemory0Filler.json
+state_tests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0Filler.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_to_name_registrator_too_much_memory0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_to_name_registrator_too_much_memory0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,63 +45,57 @@ def test_call_to_name_registrator_too_much_memory0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 987654321 64 64 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xEEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x1F4,
-                    address=0x15EB18969E0925C8E4A76FD7CBCE36A2B056B27E,
-                    value=0x17,
-                    args_offset=0x3ADE68B1,
-                    args_size=0x40,
-                    ret_offset=0x40,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=23,
         nonce=0,
-        address=Address("0x00154ef29a79f34cf1b7a570c5df358eb7cd5108"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=23,
+    # Source: lll
+    # { (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 987654321 64 64 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xEEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x1F4,
+                address=addr,
+                value=0x17,
+                args_offset=0x3ADE68B1,
+                args_size=0x40,
+                ret_offset=0x40,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x15eb18969e0925c8e4a76fd7cbce36a2b056b27e"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_too_much_memory1.py b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_too_much_memory1.py
index 9d5b8db34c2..1c7a8f05f29 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_too_much_memory1.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_too_much_memory1.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_to_name_registrator_too_much_memory1.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-CallToNameRegistratorTooMuchMemory1Filler.json
+state_tests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1Filler.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_to_name_registrator_too_much_memory1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_to_name_registrator_too_much_memory1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,63 +45,57 @@ def test_call_to_name_registrator_too_much_memory1(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=23,
         nonce=0,
-        address=Address("0x15eb18969e0925c8e4a76fd7cbce36a2b056b27e"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 9865432 64 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xEEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x1F4,
-                    address=0x15EB18969E0925C8E4A76FD7CBCE36A2B056B27E,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x9688D8,
-                    ret_offset=0x40,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xEEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x1F4,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x9688D8,
+                ret_offset=0x40,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x375d9c49dd17c920398b81ba030bf150bc16af59"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_too_much_memory2.py b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_too_much_memory2.py
index c5b71d3f7f1..a7d91e4f5fc 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_too_much_memory2.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_too_much_memory2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_to_name_registrator_too_much_memory2.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-CallToNameRegistratorTooMuchMemory2Filler.json
+state_tests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2Filler.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_to_name_registrator_too_much_memory2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_to_name_registrator_too_much_memory2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,63 +45,57 @@ def test_call_to_name_registrator_too_much_memory2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 64 987654 1) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xEEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x1F4,
-                    address=0x15EB18969E0925C8E4A76FD7CBCE36A2B056B27E,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0xF1206,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.STOP
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=23,
         nonce=0,
-        address=Address("0x12798480f9b1e6534f2d528f84ef12bda7f49a71"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=23,
+    # Source: lll
+    # { (MSTORE 0 0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 500 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 64 987654 1) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xEEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x1F4,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0xF1206,
+                ret_size=0x1,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x15eb18969e0925c8e4a76fd7cbce36a2b056b27e"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_zeor_size_mem_expansion.py b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_zeor_size_mem_expansion.py
index 262083a4f3b..9fabe5dbf41 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_zeor_size_mem_expansion.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_to_name_registrator_zeor_size_mem_expansion.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_call_to_name_registrator_zeor_size_mem_expansion.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-CallToNameRegistratorZeorSizeMemExpansionFiller.json
+state_tests/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansionFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,37 +27,39 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansionFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansionFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            500000,
-            {
-                Address("0x04c4cbdf0b0877c4619b10524dc13744ee0b69f6"): Account(
-                    storage={0: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
-        (50000, {}),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_call_to_name_registrator_zeor_size_mem_expansion(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_to_name_registrator_zeor_size_mem_expansion."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -65,63 +70,77 @@ def test_call_to_name_registrator_zeor_size_mem_expansion(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 5000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x1388,
-                    address=0x15EB18969E0925C8E4A76FD7CBCE36A2B056B27E,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=23,
         nonce=0,
-        address=Address("0x04c4cbdf0b0877c4619b10524dc13744ee0b69f6"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=23,
+    # Source: lll
+    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 5000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x1388,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x15eb18969e0925c8e4a76fd7cbce36a2b056b27e"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1}, nonce=0)},
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={}, nonce=0)},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [500000, 50000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_to_return1.py b/tests/ported_static/stSystemOperationsTest/test_call_to_return1.py
index 93940fd2e30..b3529534548 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_to_return1.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_to_return1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_to_return1.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/CallToReturn1Filler.json
+state_tests/stSystemOperationsTest/CallToReturn1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/CallToReturn1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/CallToReturn1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_call_to_return1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_to_return1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,49 +43,44 @@ def test_call_to_return1(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MSTORE8(offset=0x1F, value=0x2A)
-            + Op.RETURN(offset=0x1F, size=0x1)
-        ),
+    # Source: raw
+    # 0x6001600155602a601f536001601ff3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MSTORE8(offset=0x1F, value=0x2A)
+        + Op.RETURN(offset=0x1F, size=0x1),
         balance=23,
         nonce=0,
-        address=Address("0x64963d42a3dff7bf49ce946e12f6c9034c746888"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (CALL 1000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 0 31 1) [[ 1 ]] @0 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x64963D42A3DFF7BF49CE946E12F6C9034C746888,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x1F,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x1F,
+                ret_size=0x1,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xe31afa4922f77f6c0ec198294b373d2ab9de47d2"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_to_return1_for_dynamic_jump0.py b/tests/ported_static/stSystemOperationsTest/test_call_to_return1_for_dynamic_jump0.py
index 0e943645b14..ae214e384d9 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_to_return1_for_dynamic_jump0.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_to_return1_for_dynamic_jump0.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_to_return1_for_dynamic_jump0.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-CallToReturn1ForDynamicJump0Filler.json
+state_tests/stSystemOperationsTest/CallToReturn1ForDynamicJump0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/CallToReturn1ForDynamicJump0Filler.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/CallToReturn1ForDynamicJump0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_to_return1_for_dynamic_jump0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_to_return1_for_dynamic_jump0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,49 +45,45 @@ def test_call_to_return1_for_dynamic_jump0(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MSTORE8(offset=0x1F, value=0x2A)
-            + Op.RETURN(offset=0x1F, size=0x1)
-        ),
+    # Source: raw
+    # 0x6001600155602a601f536001601ff3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MSTORE8(offset=0x1F, value=0x2A)
+        + Op.RETURN(offset=0x1F, size=0x1),
         balance=23,
         nonce=0,
-        address=Address("0x64963d42a3dff7bf49ce946e12f6c9034c746888"),  # noqa: E501
     )
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0x64963D42A3DFF7BF49CE946E12F6C9034C746888,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x1F,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.JUMP(pc=Op.MLOAD(offset=0x0))
-            + Op.JUMPDEST
-            + Op.SSTORE(key=0x23, value=0x23)
-        ),
+    # Source: raw
+    # 0x6001601f60006000601773<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6103e8f1600055600051565b6023602355  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x1F,
+                ret_size=0x1,
+            ),
+        )
+        + Op.JUMP(pc=Op.MLOAD(offset=0x0))
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x23, value=0x23),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x6d968bcf609007ec874b2ac0216c27e131c3be4c"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_to_return1_for_dynamic_jump1.py b/tests/ported_static/stSystemOperationsTest/test_call_to_return1_for_dynamic_jump1.py
index 202bf0c4df1..af3c9931b0c 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_to_return1_for_dynamic_jump1.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_to_return1_for_dynamic_jump1.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_call_to_return1_for_dynamic_jump1.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-CallToReturn1ForDynamicJump1Filler.json
+state_tests/stSystemOperationsTest/CallToReturn1ForDynamicJump1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/CallToReturn1ForDynamicJump1Filler.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/CallToReturn1ForDynamicJump1Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_call_to_return1_for_dynamic_jump1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_to_return1_for_dynamic_jump1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,49 +45,45 @@ def test_call_to_return1_for_dynamic_jump1(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x3E8,
-                    address=0xD43411A40A68E9CBA15440E3C34A74A4DC5F79DD,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x1F,
-                    ret_size=0x1,
-                ),
-            )
-            + Op.JUMP(pc=Op.MLOAD(offset=0x0))
-            + Op.PUSH1[0x5B]
-            + Op.SSTORE(key=0x23, value=0x23)
-        ),
-        balance=0xDE0B6B3A7640000,
+    # Source: raw
+    # 0x6001600155602b601f536001601ff3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MSTORE8(offset=0x1F, value=0x2B)
+        + Op.RETURN(offset=0x1F, size=0x1),
+        balance=23,
         nonce=0,
-        address=Address("0x7bc307ec814ce37f4553993ac5612b763f18165d"),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MSTORE8(offset=0x1F, value=0x2B)
-            + Op.RETURN(offset=0x1F, size=0x1)
-        ),
-        balance=23,
+    # Source: raw
+    # 0x6001601f60006000601773<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>6103e8f160005560005156605b6023602355  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x1F,
+                ret_size=0x1,
+            ),
+        )
+        + Op.JUMP(pc=Op.MLOAD(offset=0x0))
+        + Op.PUSH1[0x5B]
+        + Op.SSTORE(key=0x23, value=0x23),
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xd43411a40a68e9cba15440e3c34a74a4dc5f79dd"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_call_value.py b/tests/ported_static/stSystemOperationsTest/test_call_value.py
index 447b1f3e536..5d9854f17dd 100644
--- a/tests/ported_static/stSystemOperationsTest/test_call_value.py
+++ b/tests/ported_static/stSystemOperationsTest/test_call_value.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_call_value.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/callValueFiller.json
+state_tests/stSystemOperationsTest/callValueFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSystemOperationsTest/callValueFiller.json"],
+    ["state_tests/stSystemOperationsTest/callValueFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_call_value(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_call_value."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,25 +43,22 @@ def test_call_value(
         gas_limit=100000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[0]] (CALLVALUE) }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.CALLVALUE) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xf7cf560ccb3853b2d9e5c4a647fb7cc7c7f935d3"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 0x186A0}),
-    }
+    post = {target: Account(storage={0: 0x186A0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_callcode_to0.py b/tests/ported_static/stSystemOperationsTest/test_callcode_to0.py
index b083ec8b742..36358ca65e4 100644
--- a/tests/ported_static/stSystemOperationsTest/test_callcode_to0.py
+++ b/tests/ported_static/stSystemOperationsTest/test_callcode_to0.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_callcode_to0.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/callcodeTo0Filler.json
+state_tests/stSystemOperationsTest/callcodeTo0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSystemOperationsTest/callcodeTo0Filler.json"],
+    ["state_tests/stSystemOperationsTest/callcodeTo0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_callcode_to0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcode_to0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,39 +43,34 @@ def test_callcode_to0(
         gas_limit=30000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[ 0 ]] (CALLCODE 50000 0 1 0 0 0 0) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x0,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=0x0,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xec64b74b6af4b537e54de566819d04d55f6e8cd9"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_callcode_to_name_registrator0.py b/tests/ported_static/stSystemOperationsTest/test_callcode_to_name_registrator0.py
index 61828fcfaed..facb2c858a8 100644
--- a/tests/ported_static/stSystemOperationsTest/test_callcode_to_name_registrator0.py
+++ b/tests/ported_static/stSystemOperationsTest/test_callcode_to_name_registrator0.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcode_to_name_registrator0.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-callcodeToNameRegistrator0Filler.json
+state_tests/stSystemOperationsTest/callcodeToNameRegistrator0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/callcodeToNameRegistrator0Filler.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/callcodeToNameRegistrator0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcode_to_name_registrator0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcode_to_name_registrator0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,63 +45,57 @@ def test_callcode_to_name_registrator0(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=23,
         nonce=0,
-        address=Address("0x15eb18969e0925c8e4a76fd7cbce36a2b056b27e"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 1000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 64 64 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x3E8,
-                    address=0x15EB18969E0925C8E4A76FD7CBCE36A2B056B27E,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x40,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x3E8,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x40,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xc390a3ed1719280f32a2a74cbb1f8a3e7b1f002e"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_callcode_to_name_registrator_addres_too_big_left.py b/tests/ported_static/stSystemOperationsTest/test_callcode_to_name_registrator_addres_too_big_left.py
index 52c0e6bb4ff..e1ae55fb0ec 100644
--- a/tests/ported_static/stSystemOperationsTest/test_callcode_to_name_registrator_addres_too_big_left.py
+++ b/tests/ported_static/stSystemOperationsTest/test_callcode_to_name_registrator_addres_too_big_left.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcode_to_name_registrator_addres_too_big_left.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-callcodeToNameRegistratorAddresTooBigLeftFiller.json
+state_tests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeftFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeftFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeftFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_callcode_to_name_registrator_addres_too_big_left(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
-    contract = Address("0xcf5a2a9c286222b44bb932d847c4e05a2353b673")
+    """Test_callcode_to_name_registrator_addres_too_big_left."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,34 +45,37 @@ def test_callcode_to_name_registrator_addres_too_big_left(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: lll
+    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 1000 0xaa<contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 64 64 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=0xDE0B6B3A7640000,
+        nonce=0,
+    )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=23,
         nonce=0,
-        address=Address("0x15eb18969e0925c8e4a76fd7cbce36a2b056b27e"),  # noqa: E501
     )
-    pre[contract] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_callcode_to_name_registrator_addres_too_big_right.py b/tests/ported_static/stSystemOperationsTest/test_callcode_to_name_registrator_addres_too_big_right.py
index bff88c0a889..218e07731d1 100644
--- a/tests/ported_static/stSystemOperationsTest/test_callcode_to_name_registrator_addres_too_big_right.py
+++ b/tests/ported_static/stSystemOperationsTest/test_callcode_to_name_registrator_addres_too_big_right.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_callcode_to_name_registrator_addres_too_big_right.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-callcodeToNameRegistratorAddresTooBigRightFiller.json
+state_tests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRightFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRightFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRightFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_callcode_to_name_registrator_addres_too_big_right(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcode_to_name_registrator_addres_too_big_right."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,65 +45,57 @@ def test_callcode_to_name_registrator_addres_too_big_right(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
-        ),
-        balance=23,
+    # Source: lll
+    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 1000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>aa 23 0 64 64 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x3E8,
+                address=0x15EB18969E0925C8E4A76FD7CBCE36A2B056B27EAA,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x40,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
+        balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x15eb18969e0925c8e4a76fd7cbce36a2b056b27e"),  # noqa: E501
     )
-    # Source: LLL
-    # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 1000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5>aa 23 0 64 64 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x3E8,
-                    address=0x15EB18969E0925C8E4A76FD7CBCE36A2B056B27EAA,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x40,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
-        balance=0xDE0B6B3A7640000,
+        balance=23,
         nonce=0,
-        address=Address("0xc8de9ea9779e64cf3e682f2157a7d38205af9444"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {target: Account(storage={0: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_callcode_to_name_registrator_zero_mem_expanion.py b/tests/ported_static/stSystemOperationsTest/test_callcode_to_name_registrator_zero_mem_expanion.py
index 1e3d7f98784..e00c3e9847b 100644
--- a/tests/ported_static/stSystemOperationsTest/test_callcode_to_name_registrator_zero_mem_expanion.py
+++ b/tests/ported_static/stSystemOperationsTest/test_callcode_to_name_registrator_zero_mem_expanion.py
@@ -1,21 +1,24 @@
 """
-Test ported from static filler.
+Test_callcode_to_name_registrator_zero_mem_expanion.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-callcodeToNameRegistratorZeroMemExpanionFiller.json
+state_tests/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanionFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,37 +27,39 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanionFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanionFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (50000, {}),
-        (
-            1000000,
-            {
-                Address("0x82f454dea4d0958bced42315a0e580848b2c440c"): Account(
-                    storage={0: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_callcode_to_name_registrator_zero_mem_expanion(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcode_to_name_registrator_zero_mem_expanion."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -65,63 +70,77 @@ def test_callcode_to_name_registrator_zero_mem_expanion(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=23,
         nonce=0,
-        address=Address("0x15eb18969e0925c8e4a76fd7cbce36a2b056b27e"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 5000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x1388,
-                    address=0x15EB18969E0925C8E4A76FD7CBCE36A2B056B27E,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x1388,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x82f454dea4d0958bced42315a0e580848b2c440c"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={})},
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {target: Account(storage={0: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [50000, 1000000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=tx_gas_limit,
-        value=100000,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_callcode_to_return1.py b/tests/ported_static/stSystemOperationsTest/test_callcode_to_return1.py
index 59433de972f..0b59d077378 100644
--- a/tests/ported_static/stSystemOperationsTest/test_callcode_to_return1.py
+++ b/tests/ported_static/stSystemOperationsTest/test_callcode_to_return1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_callcode_to_return1.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/callcodeToReturn1Filler.json
+state_tests/stSystemOperationsTest/callcodeToReturn1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/callcodeToReturn1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/callcodeToReturn1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_callcode_to_return1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callcode_to_return1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,58 +43,51 @@ def test_callcode_to_return1(
         gas_limit=30000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-        ),
+    # Source: raw
+    # 0x6001600155603760005360026000f3
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2),
         balance=23,
         nonce=0,
-        address=Address("0x0896f13e800125c0ccec44f3c434335f0a97bc1b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLCODE 50000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 64 0 2 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0xC350,
-                    address=0x896F13E800125C0CCEC44F3C434335F0A97BC1B,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0xC350,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x8b09c7ab22e22458d6dc0756d12127e14cbd6a50"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 1, 1: 1}),
-    }
+    post = {target: Account(storage={0: 1, 1: 1}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_caller_account_balance.py b/tests/ported_static/stSystemOperationsTest/test_caller_account_balance.py
index 4614ae77ff9..9e98caf0590 100644
--- a/tests/ported_static/stSystemOperationsTest/test_caller_account_balance.py
+++ b/tests/ported_static/stSystemOperationsTest/test_caller_account_balance.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_caller_account_balance.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/callerAccountBalanceFiller.json
+state_tests/stSystemOperationsTest/callerAccountBalanceFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/callerAccountBalanceFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/callerAccountBalanceFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_caller_account_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_caller_account_balance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -47,25 +46,24 @@ def test_caller_account_balance(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { [[0]] (balance (caller)) }
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.BALANCE(address=Op.CALLER)) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x13ab36baf5501d0a3c5cd05be4788496f99a4e34"),  # noqa: E501
+        address=Address(0x13AB36BAF5501D0A3C5CD05BE4788496F99A4E34),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 0xDE0B6B3A16C9860}),
-    }
+    post = {target: Account(storage={0: 0xDE0B6B3A16C9860})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_callto_return2.py b/tests/ported_static/stSystemOperationsTest/test_callto_return2.py
index d82eb6156ef..8eac5f4191f 100644
--- a/tests/ported_static/stSystemOperationsTest/test_callto_return2.py
+++ b/tests/ported_static/stSystemOperationsTest/test_callto_return2.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_callto_return2.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/CalltoReturn2Filler.json
+state_tests/stSystemOperationsTest/CalltoReturn2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/CalltoReturn2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/CalltoReturn2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_callto_return2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_callto_return2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,58 +43,53 @@ def test_callto_return2(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.PUSH1[0x2]
-            + Op.PUSH1[0x0]
-            + Op.CALLCODE
-        ),
+    # Source: raw
+    # 0x6001600155603760005360026000f2
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x1)
+        + Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x0]
+        + Op.CALLCODE,
         balance=23,
         nonce=0,
-        address=Address("0x2b45331c406df38b99656c3ed3a97ef219979232"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 5000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 64 0 2 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=0x1388,
-                    address=0x2B45331C406DF38B99656C3ED3A97EF219979232,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
+                gas=0x1388,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xbd44c6eb4f918aa9ab1da6bca875839b1250e4e9"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={0: 0}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_create_hash_collision.py b/tests/ported_static/stSystemOperationsTest/test_create_hash_collision.py
index f9564933666..c05c75a9bd4 100644
--- a/tests/ported_static/stSystemOperationsTest/test_create_hash_collision.py
+++ b/tests/ported_static/stSystemOperationsTest/test_create_hash_collision.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_create_hash_collision.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/CreateHashCollisionFiller.json
+state_tests/stSystemOperationsTest/CreateHashCollisionFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/CreateHashCollisionFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/CreateHashCollisionFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,10 @@ def test_create_hash_collision(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_create_hash_collision."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    contract_1 = Address(0xD2571607E241ECF590ED94B12D87C94BABE36DB6)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -47,40 +48,46 @@ def test_create_hash_collision(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 3 29) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x601080600C6000396000F3006000355415600957005B60203560003555,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(value=0x17, offset=0x3, size=0x1D),
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x601080600C6000396000F3006000355415600957005B60203560003555,
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.CREATE(value=0x17, offset=0x3, size=0x1D)
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    pre.deploy_contract(
+    # Source: raw
+    # 0x60016001016055
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=Op.ADD(0x1, 0x1) + Op.PUSH1[0x55],
         balance=42,
         nonce=0,
-        address=Address("0xd2571607e241ecf590ed94b12d87c94babe36db6"),  # noqa: E501
+        address=Address(0xD2571607E241ECF590ED94B12D87C94BABE36DB6),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=10000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        contract_0: Account(storage={0: 0}),
+        contract_1: Account(
+            storage={},
+            code=bytes.fromhex("60016001016055"),
+            balance=42,
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator.py b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator.py
index d84bae33476..8aceb541019 100644
--- a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator.py
+++ b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_create_name_registrator.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-createNameRegistratorFiller.json
+state_tests/stSystemOperationsTest/createNameRegistratorFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/createNameRegistratorFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/createNameRegistratorFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +31,10 @@ def test_create_name_registrator(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_name_registrator."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,36 +45,35 @@ def test_create_name_registrator(
         gas_limit=100000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 3 29) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x601080600C6000396000F3006000355415600957005B60203560003555,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(value=0x17, offset=0x3, size=0x1D),
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x601080600C6000396000F3006000355415600957005B60203560003555,
+        )
+        + Op.SSTORE(
+            key=0x0, value=Op.CREATE(value=0x17, offset=0x3, size=0x1D)
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0xD2571607E241ECF590ED94B12D87C94BABE36DB6},
+        contract_0: Account(
+            storage={
+                0: compute_create_address(address=contract_0, nonce=0),
+            },
+            nonce=1,
         ),
     }
 
diff --git a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_oog_mem_expansion_oov.py b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_oog_mem_expansion_oov.py
index a245a38c295..24c66dc8788 100644
--- a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_oog_mem_expansion_oov.py
+++ b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_oog_mem_expansion_oov.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_create_name_registrator_oog_mem_expansion_oov.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-createNameRegistratorOOG_MemExpansionOOVFiller.json
+state_tests/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOVFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOVFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOVFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_create_name_registrator_oog_mem_expansion_oov(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_create_name_registrator_oog_mem_expansion_oov."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,37 +45,32 @@ def test_create_name_registrator_oog_mem_expansion_oov(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 11000 3 0xffffffffffffffffffffff) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x601080600C6000396000F3006000355415600957005B60203560003555,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(
-                    value=0x2AF8,
-                    offset=0x3,
-                    size=0xFFFFFFFFFFFFFFFFFFFFFF,
-                ),
-            )
-            + Op.STOP
-        ),
-        balance=0x2710,
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x601080600C6000396000F3006000355415600957005B60203560003555,
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE(
+                value=0x2AF8, offset=0x3, size=0xFFFFFFFFFFFFFFFFFFFFFF
+            ),
+        )
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0xb8d613d3333f8ce34bc851256b3096ffa7932f6e"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_out_of_memory_bonds0.py b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_out_of_memory_bonds0.py
index 0fe20792a3d..b65dfdacd85 100644
--- a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_out_of_memory_bonds0.py
+++ b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_out_of_memory_bonds0.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_create_name_registrator_out_of_memory_bonds0.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-createNameRegistratorOutOfMemoryBonds0Filler.json
+state_tests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0Filler.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_create_name_registrator_out_of_memory_bonds0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_create_name_registrator_out_of_memory_bonds0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,33 +45,30 @@ def test_create_name_registrator_out_of_memory_bonds0(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 0xfffffffffff 29) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x601080600C6000396000F3006000355415600957005B60203560003555,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(value=0x17, offset=0xFFFFFFFFFFF, size=0x1D),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x601080600C6000396000F3006000355415600957005B60203560003555,
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE(value=0x17, offset=0xFFFFFFFFFFF, size=0x1D),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x8593273fe085739b33e6a5d293bb84f3224ba9ad"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_out_of_memory_bonds1.py b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_out_of_memory_bonds1.py
index a04a65c6682..4fd27bfd082 100644
--- a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_out_of_memory_bonds1.py
+++ b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_out_of_memory_bonds1.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_create_name_registrator_out_of_memory_bonds1.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-createNameRegistratorOutOfMemoryBonds1Filler.json
+state_tests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1Filler.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_create_name_registrator_out_of_memory_bonds1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_create_name_registrator_out_of_memory_bonds1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,33 +45,30 @@ def test_create_name_registrator_out_of_memory_bonds1(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 3 0xfffffffffff) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x601080600C6000396000F3006000355415600957005B60203560003555,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(value=0x17, offset=0x3, size=0xFFFFFFFFFFF),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x601080600C6000396000F3006000355415600957005B60203560003555,
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE(value=0x17, offset=0x3, size=0xFFFFFFFFFFF),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x2d0c02ba282d613ffacb6ba383f709ade6e7522c"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={}, nonce=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_value_too_high.py b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_value_too_high.py
index f10f3b370a0..3b5b41459ef 100644
--- a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_value_too_high.py
+++ b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_value_too_high.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_create_name_registrator_value_too_high.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-createNameRegistratorValueTooHighFiller.json
+state_tests/stSystemOperationsTest/createNameRegistratorValueTooHighFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/createNameRegistratorValueTooHighFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/createNameRegistratorValueTooHighFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_create_name_registrator_value_too_high(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_name_registrator_value_too_high."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,34 +47,33 @@ def test_create_name_registrator_value_too_high(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 1000000000000000001 3 29) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x601080600C6000396000F3006000355415600957005B60203560003555,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(
-                    value=0xDE0B6B3A7640001, offset=0x3, size=0x1D
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x601080600C6000396000F3006000355415600957005B60203560003555,
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE(value=0xDE0B6B3A7640001, offset=0x3, size=0x1D),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=300000,
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(
+            address=contract_0, nonce=0
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem.py b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem.py
index a65f13c8ffa..fc00fef4328 100644
--- a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem.py
+++ b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_create_name_registrator_zero_mem.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-createNameRegistratorZeroMemFiller.json
+state_tests/stSystemOperationsTest/createNameRegistratorZeroMemFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/createNameRegistratorZeroMemFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/createNameRegistratorZeroMemFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_create_name_registrator_zero_mem(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_name_registrator_zero_mem."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,35 +47,33 @@ def test_create_name_registrator_zero_mem(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 3 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x601080600C6000396000F3006000355415600957005B60203560003555,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x17, offset=0x3, size=0x0)
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x601080600C6000396000F3006000355415600957005B60203560003555,
+        )
+        + Op.SSTORE(key=0x0, value=Op.CREATE(value=0x17, offset=0x3, size=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0xD2571607E241ECF590ED94B12D87C94BABE36DB6},
+        contract_0: Account(
+            storage={
+                0: compute_create_address(address=contract_0, nonce=0),
+            },
+            nonce=1,
         ),
     }
 
diff --git a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem2.py b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem2.py
index c41093c535b..874b1f517c4 100644
--- a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem2.py
+++ b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem2.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_create_name_registrator_zero_mem2.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-createNameRegistratorZeroMem2Filler.json
+state_tests/stSystemOperationsTest/createNameRegistratorZeroMem2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/createNameRegistratorZeroMem2Filler.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/createNameRegistratorZeroMem2Filler.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_create_name_registrator_zero_mem2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_name_registrator_zero_mem2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,40 +47,40 @@ def test_create_name_registrator_zero_mem2(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x601080600C6000396000F3006000355415600957005B60203560003555,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CREATE(
-                    value=0x17,
-                    offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    size=0x0,
-                ),
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x601080600C6000396000F3006000355415600957005B60203560003555,
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CREATE(
+                value=0x17,
+                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                size=0x0,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0xD2571607E241ECF590ED94B12D87C94BABE36DB6},
+        contract_0: Account(
+            storage={
+                0: compute_create_address(address=contract_0, nonce=0),
+            },
+            nonce=1,
         ),
     }
 
diff --git a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem_expansion.py b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem_expansion.py
index 099b35b6f8d..fa489f7aa9e 100644
--- a/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem_expansion.py
+++ b/tests/ported_static/stSystemOperationsTest/test_create_name_registrator_zero_mem_expansion.py
@@ -1,20 +1,20 @@
 """
-Test ported from static filler.
+Test_create_name_registrator_zero_mem_expansion.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-createNameRegistratorZeroMemExpansionFiller.json
+state_tests/stSystemOperationsTest/createNameRegistratorZeroMemExpansionFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/createNameRegistratorZeroMemExpansionFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/createNameRegistratorZeroMemExpansionFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +33,10 @@ def test_create_name_registrator_zero_mem_expansion(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_name_registrator_zero_mem_expansion."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,35 +47,33 @@ def test_create_name_registrator_zero_mem_expansion(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0x601080600C6000396000F3006000355415600957005B60203560003555,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0, value=Op.CREATE(value=0x17, offset=0x0, size=0x0)
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x601080600C6000396000F3006000355415600957005B60203560003555,
+        )
+        + Op.SSTORE(key=0x0, value=Op.CREATE(value=0x17, offset=0x0, size=0x0))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0xD2571607E241ECF590ED94B12D87C94BABE36DB6},
+        contract_0: Account(
+            storage={
+                0: compute_create_address(address=contract_0, nonce=0),
+            },
+            nonce=1,
         ),
     }
 
diff --git a/tests/ported_static/stSystemOperationsTest/test_create_with_invalid_opcode.py b/tests/ported_static/stSystemOperationsTest/test_create_with_invalid_opcode.py
index 3cf9fdaf20c..922a8460afc 100644
--- a/tests/ported_static/stSystemOperationsTest/test_create_with_invalid_opcode.py
+++ b/tests/ported_static/stSystemOperationsTest/test_create_with_invalid_opcode.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_create_with_invalid_opcode.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-createWithInvalidOpcodeFiller.json
+state_tests/stSystemOperationsTest/createWithInvalidOpcodeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/createWithInvalidOpcodeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/createWithInvalidOpcodeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_create_with_invalid_opcode(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_create_with_invalid_opcode."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,31 +43,26 @@ def test_create_with_invalid_opcode(
         gas_limit=1000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PREVRANDAO
-            + Op.TIMESTAMP
-            + Op.TIMESTAMP
-            + Op.TIMESTAMP
-            + Op.TIMESTAMP
-            + Op.GASLIMIT
-            + Op.MSTORE8(offset=Op.TIMESTAMP, value=Op.NUMBER)
-            + Op.CREATE
-        ),
+    # Source: raw
+    # 0x444242424245434253f0
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PREVRANDAO
+        + Op.TIMESTAMP * 4
+        + Op.GASLIMIT
+        + Op.MSTORE8(offset=Op.TIMESTAMP, value=Op.NUMBER)
+        + Op.CREATE,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xcc73f3508071f505fb5a5c6108b9444fe05fdd4d"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={}, nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_current_account_balance.py b/tests/ported_static/stSystemOperationsTest/test_current_account_balance.py
index 2b59b365122..f61a6e27b87 100644
--- a/tests/ported_static/stSystemOperationsTest/test_current_account_balance.py
+++ b/tests/ported_static/stSystemOperationsTest/test_current_account_balance.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_current_account_balance.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-currentAccountBalanceFiller.json
+state_tests/stSystemOperationsTest/currentAccountBalanceFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/currentAccountBalanceFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/currentAccountBalanceFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,8 +31,8 @@ def test_current_account_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_current_account_balance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -49,26 +47,24 @@ def test_current_account_balance(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: LLL
+    # Source: lll
     # { [[0]] (balance (address)) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.BALANCE(address=Op.ADDRESS)) + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.BALANCE(address=Op.ADDRESS))
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfa1adc30ef8a61e7996fa659b532621c0816e14d"),  # noqa: E501
+        address=Address(0xFA1ADC30EF8A61E7996FA659B532621C0816E14D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={0: 0xDE0B6B3A76586A0}),
-    }
+    post = {target: Account(storage={0: 0xDE0B6B3A76586A0})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_double_selfdestruct_test.py b/tests/ported_static/stSystemOperationsTest/test_double_selfdestruct_test.py
index 2d4abd2e8be..49d06c563b2 100644
--- a/tests/ported_static/stSystemOperationsTest/test_double_selfdestruct_test.py
+++ b/tests/ported_static/stSystemOperationsTest/test_double_selfdestruct_test.py
@@ -7,8 +7,7 @@
             SUC008.0, SUC008.1, SUC008.2, SUC008.3
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-doubleSelfdestructTestFiller.yml
+state_tests/stSystemOperationsTest/doubleSelfdestructTestFiller.yml
 """
 
 import pytest
@@ -17,10 +16,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -28,43 +32,77 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/doubleSelfdestructTestFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/doubleSelfdestructTestFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        ("f210011002", {}),
-        ("f410011002", {}),
-        ("f110011002", {}),
-        ("fa1001c0de", {}),
-        ("fa10011002", {}),
-        ("f21001c0de", {}),
-        ("f41001c0de", {}),
-        ("f11001c0de", {}),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
+        pytest.param(
+            0,
+            0,
+            0,
+            id="called-self-destruct",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="called-self-destruct",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="called-self-destruct",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="caller-self-destruct",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="code-self-destruct",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="code-self-destruct",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="code-self-destruct",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="caller-self-destruct",
+        ),
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_double_selfdestruct_test(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """The first test case required here."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """
+    The first test case required here
+    https://github.
+    """
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x000000000000000000000000000000000000C0DE)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -78,7 +116,9 @@ def test_double_selfdestruct_test(
         gas_limit=10000000000,
     )
 
-    # Source: Yul
+    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
+    # Source: yul
+    # berlin
     # {
     #    // If there's data, call this again and then
     #    // try to selfdestruct.
@@ -108,102 +148,147 @@ def test_double_selfdestruct_test(
     #    let called_ff := and(shr(240, calldataload(0)), 0xFFFF)
     #    if eq(calldatasize(), 2) {
     #      selfdestruct(called_ff)
-    #    }
-    # ... (1 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPI(pc=0x17, condition=Op.GT(Op.CALLDATASIZE, 0x2))
-            + Op.SHR(0xF0, Op.CALLDATALOAD(offset=0x0))
-            + Op.JUMPI(pc=0x15, condition=Op.EQ(0x2, Op.CALLDATASIZE))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SELFDESTRUCT
-            + Op.JUMPDEST
-            + Op.SHR(0xF8, Op.CALLDATALOAD(offset=0x0))
-            + Op.PUSH1[0xFA]
-            + Op.AND(Op.SHR(0xE8, Op.CALLDATALOAD(offset=0x0)), 0xFFFF)
-            + Op.SWAP2
-            + Op.PUSH1[0xFF]
-            + Op.AND(Op.SHR(0xD8, Op.CALLDATALOAD(offset=0x0)), 0xFFFF)
-            + Op.MSTORE8(
-                offset=0x0, value=Op.AND(Op.SHR(0x8, Op.DUP2), Op.DUP2)
+    # ... (2 more lines)
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x17, condition=Op.GT(Op.CALLDATASIZE, 0x2))
+        + Op.SHR(0xF0, Op.CALLDATALOAD(offset=0x0))
+        + Op.JUMPI(pc=0x15, condition=Op.EQ(0x2, Op.CALLDATASIZE))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SELFDESTRUCT
+        + Op.JUMPDEST
+        + Op.SHR(0xF8, Op.CALLDATALOAD(offset=0x0))
+        + Op.PUSH1[0xFA]
+        + Op.AND(Op.SHR(0xE8, Op.CALLDATALOAD(offset=0x0)), 0xFFFF)
+        + Op.SWAP2
+        + Op.PUSH1[0xFF]
+        + Op.AND(Op.SHR(0xD8, Op.CALLDATALOAD(offset=0x0)), 0xFFFF)
+        + Op.MSTORE8(offset=0x0, value=Op.AND(Op.SHR(0x8, Op.DUP2), Op.DUP2))
+        + Op.MSTORE8(offset=0x1, value=Op.AND)
+        + Op.JUMPI(pc=0x90, condition=Op.EQ(Op.DUP2, 0xF1))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x7F, condition=Op.EQ(Op.DUP2, 0xF2))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x6F, condition=Op.EQ(Op.DUP2, 0xF4))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x61, condition=Op.EQ)
+        + Op.SELFDESTRUCT
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.STATICCALL(
+                gas=Op.GAS,
+                address=0xC0DE,
+                args_offset=Op.DUP2,
+                args_size=0x2,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.MSTORE8(offset=0x1, value=Op.AND)
-            + Op.JUMPI(pc=0x90, condition=Op.EQ(Op.DUP2, 0xF1))
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x7F, condition=Op.EQ(Op.DUP2, 0xF2))
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x6F, condition=Op.EQ(Op.DUP2, 0xF4))
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x61, condition=Op.EQ)
-            + Op.SELFDESTRUCT
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.STATICCALL(
-                    gas=Op.GAS,
-                    address=0xC0DE,
-                    args_offset=Op.DUP2,
-                    args_size=0x2,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.SELFDESTRUCT
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.DELEGATECALL(
+                gas=Op.GAS,
+                address=0xC0DE,
+                args_offset=Op.DUP2,
+                args_size=0x2,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.SELFDESTRUCT
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.DELEGATECALL(
-                    gas=Op.GAS,
-                    address=0xC0DE,
-                    args_offset=Op.DUP2,
-                    args_size=0x2,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.JUMP(pc=0x5B)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.CALLCODE(
+                gas=Op.GAS,
+                address=0xC0DE,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x2,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.JUMP(pc=0x5B)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.CALLCODE(
-                    gas=Op.GAS,
-                    address=0xC0DE,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x2,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
+        )
+        + Op.JUMP(pc=0x53)
+        + Op.JUMPDEST
+        + Op.POP(
+            Op.CALL(
+                gas=Op.GAS,
+                address=0xC0DE,
+                value=Op.DUP1,
+                args_offset=Op.DUP2,
+                args_size=0x2,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
             )
-            + Op.JUMP(pc=0x53)
-            + Op.JUMPDEST
-            + Op.POP(
-                Op.CALL(
-                    gas=Op.GAS,
-                    address=0xC0DE,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x2,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.JUMP(pc=0x4B)
-        ),
+        )
+        + Op.JUMP(pc=0x4B),
         balance=0xF4240,
-        address=Address("0x000000000000000000000000000000000000c0de"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000C0DE),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 1, 2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(
+                    0x0000000000000000000000000000000000001001
+                ): Account.NONEXISTENT,
+                Address(0x0000000000000000000000000000000000001002): Account(
+                    balance=0xF4241
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [3, 7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x0000000000000000000000000000000000001001): Account(
+                    balance=0xF4241, nonce=0
+                ),
+                Address(
+                    0x0000000000000000000000000000000000001002
+                ): Account.NONEXISTENT,
+                contract_0: Account(nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": [4, 5, 6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x0000000000000000000000000000000000001001): Account(
+                    balance=0xF4241, nonce=0
+                ),
+                contract_0: Account(nonce=1),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("f110011002"),
+        Bytes("f210011002"),
+        Bytes("f410011002"),
+        Bytes("fa10011002"),
+        Bytes("f11001c0de"),
+        Bytes("f21001c0de"),
+        Bytes("f41001c0de"),
+        Bytes("fa1001c0de"),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=16777216,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
         nonce=1,
-        value=1,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_double_selfdestruct_touch_paris.py b/tests/ported_static/stSystemOperationsTest/test_double_selfdestruct_touch_paris.py
index 218b0f7704a..26364936fba 100644
--- a/tests/ported_static/stSystemOperationsTest/test_double_selfdestruct_touch_paris.py
+++ b/tests/ported_static/stSystemOperationsTest/test_double_selfdestruct_touch_paris.py
@@ -1,12 +1,11 @@
 """
-A single contract can execute SELFDESTRUCT multiple times using by being...
+A single contract can execute SELFDESTRUCT multiple times using by...
 
 multiple times. The second and later SELFDESTRUCTs have little effect but can
 touch some new beneficiary addresses.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-doubleSelfdestructTouch_ParisFiller.yml
+state_tests/stSystemOperationsTest/doubleSelfdestructTouch_ParisFiller.yml
 """
 
 import pytest
@@ -15,10 +14,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -27,66 +31,49 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/doubleSelfdestructTouch_ParisFiller.yml",  # noqa: E501
+        "state_tests/stSystemOperationsTest/doubleSelfdestructTouch_ParisFiller.yml"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_value, expected_post",
+    "d, g, v",
     [
-        (
+        pytest.param(
             0,
-            {
-                Address("0x29e4504a3d2a0e0ae0ebbbefedd4570639b3ebee"): Account(
-                    storage={
-                        0: 2,
-                        1: 0x68FA59E127B7526718EB0A4E113DF5793628CB91,
-                        2: 0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    }
-                )
-            },
+            0,
+            0,
+            id="-v0",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             1,
-            {
-                Address("0x29e4504a3d2a0e0ae0ebbbefedd4570639b3ebee"): Account(
-                    storage={
-                        0: 2,
-                        1: 0x68FA59E127B7526718EB0A4E113DF5793628CB91,
-                        2: 0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    }
-                )
-            },
+            id="-v1",
         ),
-        (
+        pytest.param(
+            0,
+            0,
             2,
-            {
-                Address("0x29e4504a3d2a0e0ae0ebbbefedd4570639b3ebee"): Account(
-                    storage={
-                        0: 2,
-                        1: 0x68FA59E127B7526718EB0A4E113DF5793628CB91,
-                        2: 0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    }
-                )
-            },
+            id="-v2",
         ),
     ],
-    ids=["case0", "case1", "case2"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_double_selfdestruct_touch_paris(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_value: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """A single contract can execute SELFDESTRUCT multiple times using..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """A single contract can execute SELFDESTRUCT multiple times using by..."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    empty_account_1 = Address(0x68FA59E127B7526718EB0A4E113DF5793628CB91)
+    empty_account_2 = Address(0x76FAE819612A29489A1A43208613D8F8557B8898)
     sender = EOA(
         key=0xE92C121432830128CA66D3D8C4E6D8D96CC4BEFA7C612D28415082EB3C8339C5
     )
-    callee_1 = Address("0x68fa59e127b7526718eb0a4e113df5793628cb91")
-    callee_2 = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -97,24 +84,26 @@ def test_double_selfdestruct_touch_paris(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.ADD(Op.SLOAD(key=0x0), 0x1)
-            + Op.SSTORE(key=0x0, value=Op.DUP1)
-            + Op.SELFDESTRUCT(address=Op.SLOAD)
-        ),
-        storage={
-            0x0: 0x0,
-            0x1: 0x68FA59E127B7526718EB0A4E113DF5793628CB91,
-            0x2: 0x76FAE819612A29489A1A43208613D8F8557B8898,
-        },
+    pre[sender] = Account(balance=0x5F5E102)
+    pre[empty_account_1] = Account(balance=10)
+    pre[empty_account_2] = Account(balance=10)
+    # Source: yul
+    # berlin
+    # {
+    #   let index := add(sload(0), 1)
+    #   sstore(0, index)
+    #   selfdestruct(sload(index))
+    # }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.ADD(Op.SLOAD(key=0x0), 0x1)
+        + Op.SSTORE(key=0x0, value=Op.DUP1)
+        + Op.SELFDESTRUCT(address=Op.SLOAD),
+        storage={0: 0, 1: empty_account_1, 2: empty_account_2},
         nonce=0,
-        address=Address("0x29e4504a3d2a0e0ae0ebbbefedd4570639b3ebee"),  # noqa: E501
+        address=Address(0x29E4504A3D2A0E0AE0EBBBEFEDD4570639B3EBEE),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E102)
-    pre[callee_1] = Account(balance=10, nonce=0)
-    pre[callee_2] = Account(balance=10, nonce=0)
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #   let v0 := callvalue()
     #   let v1 := shr(1, v0)
@@ -122,43 +111,80 @@ def test_double_selfdestruct_touch_paris(
     #   let v2 := sub(v0, v1)
     #   let r2 := call(70000, <contract:0x000000000000000000000000000000000000dead>, v2, 0, 0, 0, 0)  # noqa: E501
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.CALLVALUE
-            + Op.SHR(0x1, Op.DUP1)
-            + Op.SWAP1
-            + Op.POP(
-                Op.CALL(
-                    gas=0x11170,
-                    address=0x29E4504A3D2A0E0AE0EBBBEFEDD4570639B3EBEE,
-                    value=Op.DUP6,
-                    args_offset=Op.DUP1,
-                    args_size=Op.DUP1,
-                    ret_offset=Op.DUP1,
-                    ret_size=Op.DUP3,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.DUP1 * 3
+        + Op.CALLVALUE
+        + Op.SHR(0x1, Op.DUP1)
+        + Op.SWAP1
+        + Op.POP(
+            Op.CALL(
+                gas=0x11170,
+                address=0x29E4504A3D2A0E0AE0EBBBEFEDD4570639B3EBEE,
+                value=Op.DUP6,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=Op.DUP3,
             )
-            + Op.SUB
-            + Op.PUSH20[0x29E4504A3D2A0E0AE0EBBBEFEDD4570639B3EBEE]
-            + Op.PUSH3[0x11170]
-            + Op.CALL
-            + Op.STOP
-        ),
+        )
+        + Op.SUB
+        + Op.PUSH20[0x29E4504A3D2A0E0AE0EBBBEFEDD4570639B3EBEE]
+        + Op.PUSH3[0x11170]
+        + Op.CALL
+        + Op.STOP,
         nonce=0,
-        address=Address("0x8ec7465877d3957084dc907c0f6d8f2911a17a52"),  # noqa: E501
+        address=Address(0x8EC7465877D3957084DC907C0F6D8F2911A17A52),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 0},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                target: Account(storage={}, balance=0, nonce=0),
+                empty_account_1: Account(balance=10),
+                empty_account_2: Account(balance=10),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                target: Account(storage={}, balance=0, nonce=0),
+                empty_account_1: Account(balance=10),
+                empty_account_2: Account(balance=11, nonce=0),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": -1, "value": 2},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                target: Account(storage={}, balance=0, nonce=0),
+                empty_account_1: Account(balance=11, nonce=0),
+                empty_account_2: Account(balance=11, nonce=0),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+    ]
+    tx_gas = [10000000]
+    tx_value = [0, 1, 2]
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_limit=10000000,
-        value=tx_value,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_extcodecopy.py b/tests/ported_static/stSystemOperationsTest/test_extcodecopy.py
index a7c01828298..4e673f6ee76 100644
--- a/tests/ported_static/stSystemOperationsTest/test_extcodecopy.py
+++ b/tests/ported_static/stSystemOperationsTest/test_extcodecopy.py
@@ -2,7 +2,7 @@
 God knows what is happening in this test.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/extcodecopyFiller.json
+state_tests/stSystemOperationsTest/extcodecopyFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSystemOperationsTest/extcodecopyFiller.json"],
+    ["state_tests/stSystemOperationsTest/extcodecopyFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,7 +32,7 @@ def test_extcodecopy(
     pre: Alloc,
 ) -> None:
     """God knows what is happening in this test."""
-    coinbase = Address("0x4401fcaf7d64d53fb1cfc5c9045c32aa919a8c82")
+    coinbase = Address(0x4401FCAF7D64D53FB1CFC5C9045C32AA919A8C82)
     sender = EOA(
         key=0x7446B5F5F4C3994BA600DA46B6CA0E5DBD71BCE76740B040BA716507ECB75BB9
     )
@@ -45,123 +46,117 @@ def test_extcodecopy(
         gas_limit=1478962728,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH32[
-                0x15688566A82F5F946C68028BF626B349E495DAA43E33529A76437AC416CD1B7D  # noqa: E501
-            ]
-            + Op.MOD(
-                0xCEA0C5CC171FA61277E5604A3BC8AEF4DE3D3882,
-                0x7DAE7454BB193B1C28E64A6A935BC3,
-            )
-            + Op.EXTCODECOPY(
-                address=0x7ADA6E82E95F6520383F95F5C7DAE56B4DC13B6F22ECABFCE07C,
-                dest_offset=Op.DUP1,
-                offset=0xB,
-                size=Op.PC,
-            )
-            + Op.SELFDESTRUCT
-            + Op.MLOAD
-        ),
+    pre[sender] = Account(balance=0x4F6CA7B90CEB5FD4)
+    # Source: raw
+    # 0x7f15688566a82f5f946c68028bf626b349e495daa43e33529a76437ac416cd1b7d6e7dae7454bb193b1c28e64a6a935bc373cea0c5cc171fa61277e5604a3bc8aef4de3d38820658600b80797ada6e82e95f6520383f95f5c7dae56b4dc13b6f22ecabfce07c3cff51  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH32[
+            0x15688566A82F5F946C68028BF626B349E495DAA43E33529A76437AC416CD1B7D
+        ]
+        + Op.MOD(
+            0xCEA0C5CC171FA61277E5604A3BC8AEF4DE3D3882,
+            0x7DAE7454BB193B1C28E64A6A935BC3,
+        )
+        + Op.EXTCODECOPY(
+            address=0x7ADA6E82E95F6520383F95F5C7DAE56B4DC13B6F22ECABFCE07C,
+            dest_offset=Op.DUP1,
+            offset=0xB,
+            size=Op.PC,
+        )
+        + Op.SELFDESTRUCT
+        + Op.MLOAD,
         balance=0x5C81EB0,
         nonce=254,
-        address=Address("0x0614253558ab9d138504425f7c247229db2c5baf"),  # noqa: E501
+        address=Address(0x0614253558AB9D138504425F7C247229DB2C5BAF),  # noqa: E501
     )
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.GAS
-            + Op.PUSH1[0x10]
-            + Op.PUSH1[0x17]
-            + Op.PUSH1[0x11]
-            + Op.PUSH1[0x11]
-            + Op.PUSH1[0x18]
-            + Op.PUSH1[0x1C]
-            + Op.PUSH1[0xF]
-            + Op.PUSH1[0x1B]
-            + Op.PUSH1[0x1D]
-            + Op.PUSH0
-            + Op.PUSH1[0x2]
-            + Op.PUSH1[0x13]
-            + Op.PUSH1[0xF]
-            + Op.PUSH1[0x1A]
-            + Op.DUP14
-            + Op.GAS
-            + Op.JUMPDEST
-            + Op.PUSH23[0x79177B5DD41A23DB52998C4DCD14E88390DCC9F3ED5783]
-            + Op.PUSH1[0x16]
-            + Op.PUSH1[0x14]
-            + Op.PUSH0
-            + Op.PUSH1[0x13]
-            + Op.PUSH1[0xD]
-            + Op.PUSH1[0x1F]
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x11]
-            + Op.PUSH1[0xE]
-            + Op.PUSH1[0xC]
-            + Op.PUSH1[0xD]
-            + Op.PUSH1[0x1F]
-            + Op.PUSH1[0x13]
-            + Op.DUP13
-            + Op.PUSH27[
-                0x58F20FD882EB51408A52E569CE80E93270AB53AE9DE3FEC5498A5C
-            ]
-            + Op.PUSH19[0xCE1FCD11BB1553736959DF779A616B738C1F40]
-            + Op.PUSH29[
-                0x12459490AFE302DA311A673488D09E71041D0761DEE4829E3C38E0B1B1
-            ]
-            + Op.PUSH25[0x7810F2E11E2289983C1AB47CF5EBD38C12F1719232B5F3A7B2]
-            + Op.PUSH27[
-                0x9EA8858A071C4169392EC725646311235CBD9534E5D7CD8CB5E228
-            ]
-            + Op.PUSH24[0x38A43F803384F4E62FE6629EA2E609A71759EDAB5C3A58B8]
-            + Op.PUSH31[
-                0x94C95F710AA6059B0663C9F374CE6EA0A000C5D594C41252D4A74D64896A98  # noqa: E501
-            ]
-            + Op.PUSH29[
-                0xC57C24DF2CE8FFB85ADCC27DCE2D19F7006FBC1C5A7B79A319418FD6C2
-            ]
-            + Op.PUSH30[
-                0xDEBCF170192262D82C1053333F6115C8B258B81E2E84D723C98DBD4535DE
-            ]
-            + Op.PUSH32[
-                0x922723A15827BBCFD07F9E2C5027C7736ED68C61B332059D7EC1BAE1C1FD41A3  # noqa: E501
-            ]
-            + Op.PUSH2[0xD35B]
-            + Op.SWAP10
-            + Op.ADDMOD(
-                0x4EB39E7FD5076A831D8EB4A3546288A3E1A0,
-                0x28C014846148CE67EAF2B33D90672366DAFEAAE0,
-                0x9740A588B6ABF3293236AFB92771,
-            )
-            + Op.PUSH27[
-                0xEBE80B6BBFA4041330B05D094A697236FE7654D8A7CE630F83A832
-            ]
-            + Op.PUSH3[0x125D7]
-            + Op.DUP2
-            + Op.BALANCE(address=0x6E898F7FDCFD00)
-        ),
+    # Source: raw
+    # 0x5a60106017601160116018601c600f601b601d5f60026013600f601a8d5a5b7679177b5dd41a23db52998c4dcd14e88390dcc9f3ed5783601660145f6013600d601f60016011600e600c600d601f60138c7a58f20fd882eb51408a52e569ce80e93270ab53ae9de3fec5498a5c72ce1fcd11bb1553736959df779a616b738c1f407c12459490afe302da311a673488d09e71041d0761dee4829e3c38e0b1b1787810f2e11e2289983c1ab47cf5ebd38c12f1719232b5f3a7b27a9ea8858a071c4169392ec725646311235cbd9534e5d7cd8cb5e2287738a43f803384f4e62fe6629ea2e609a71759edab5c3a58b87e94c95f710aa6059b0663c9f374ce6ea0a000c5d594c41252d4a74d64896a987cc57c24df2ce8ffb85adcc27dce2d19f7006fbc1c5a7b79a319418fd6c27ddebcf170192262d82c1053333f6115c8b258b81e2e84d723c98dbd4535de7f922723a15827bbcfd07f9e2c5027c7736ed68c61b332059d7ec1bae1c1fd41a361d35b996d9740a588b6abf3293236afb927717328c014846148ce67eaf2b33d90672366dafeaae0714eb39e7fd5076a831d8eb4a3546288a3e1a0087aebe80b6bbfa4041330b05d094a697236fe7654d8a7ce630f83a832620125d781666e898f7fdcfd0031  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.GAS
+        + Op.PUSH1[0x10]
+        + Op.PUSH1[0x17]
+        + Op.PUSH1[0x11] * 2
+        + Op.PUSH1[0x18]
+        + Op.PUSH1[0x1C]
+        + Op.PUSH1[0xF]
+        + Op.PUSH1[0x1B]
+        + Op.PUSH1[0x1D]
+        + Op.PUSH0
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x13]
+        + Op.PUSH1[0xF]
+        + Op.PUSH1[0x1A]
+        + Op.DUP14
+        + Op.GAS
+        + Op.JUMPDEST
+        + Op.PUSH23[0x79177B5DD41A23DB52998C4DCD14E88390DCC9F3ED5783]
+        + Op.PUSH1[0x16]
+        + Op.PUSH1[0x14]
+        + Op.PUSH0
+        + Op.PUSH1[0x13]
+        + Op.PUSH1[0xD]
+        + Op.PUSH1[0x1F]
+        + Op.PUSH1[0x1]
+        + Op.PUSH1[0x11]
+        + Op.PUSH1[0xE]
+        + Op.PUSH1[0xC]
+        + Op.PUSH1[0xD]
+        + Op.PUSH1[0x1F]
+        + Op.PUSH1[0x13]
+        + Op.DUP13
+        + Op.PUSH27[0x58F20FD882EB51408A52E569CE80E93270AB53AE9DE3FEC5498A5C]
+        + Op.PUSH19[0xCE1FCD11BB1553736959DF779A616B738C1F40]
+        + Op.PUSH29[
+            0x12459490AFE302DA311A673488D09E71041D0761DEE4829E3C38E0B1B1
+        ]
+        + Op.PUSH25[0x7810F2E11E2289983C1AB47CF5EBD38C12F1719232B5F3A7B2]
+        + Op.PUSH27[0x9EA8858A071C4169392EC725646311235CBD9534E5D7CD8CB5E228]
+        + Op.PUSH24[0x38A43F803384F4E62FE6629EA2E609A71759EDAB5C3A58B8]
+        + Op.PUSH31[
+            0x94C95F710AA6059B0663C9F374CE6EA0A000C5D594C41252D4A74D64896A98
+        ]
+        + Op.PUSH29[
+            0xC57C24DF2CE8FFB85ADCC27DCE2D19F7006FBC1C5A7B79A319418FD6C2
+        ]
+        + Op.PUSH30[
+            0xDEBCF170192262D82C1053333F6115C8B258B81E2E84D723C98DBD4535DE
+        ]
+        + Op.PUSH32[
+            0x922723A15827BBCFD07F9E2C5027C7736ED68C61B332059D7EC1BAE1C1FD41A3
+        ]
+        + Op.PUSH2[0xD35B]
+        + Op.SWAP10
+        + Op.ADDMOD(
+            0x4EB39E7FD5076A831D8EB4A3546288A3E1A0,
+            0x28C014846148CE67EAF2B33D90672366DAFEAAE0,
+            0x9740A588B6ABF3293236AFB92771,
+        )
+        + Op.PUSH27[0xEBE80B6BBFA4041330B05D094A697236FE7654D8A7CE630F83A832]
+        + Op.PUSH3[0x125D7]
+        + Op.DUP2
+        + Op.BALANCE(address=0x6E898F7FDCFD00),
         balance=0x4D6769F8,
         nonce=221,
-        address=Address("0x5b400827141a956ceb3e889ad3e1707aee1a575c"),  # noqa: E501
+        address=Address(0x5B400827141A956CEB3E889AD3E1707AEE1A575C),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x4F6CA7B90CEB5FD4)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "6e27b0577f2549e5fa01e3db96e7b03a62e489115538620295677faf15040c1c1796bad1"  # noqa: E501
-            "30e2462a8b8d6bbe0fa35bf12087047ef4ff4e66df8772196b4401998ff7f4219c013a0d"  # noqa: E501
-            "927b22d8d3fdf625809abb182507d180e687b666f4f1e4f3b8172e87760f436c701264b8"  # noqa: E501
-            "9739f3d7c50ec524f16b1a4f91397b760a5209b9b7710544694ecf2729643b3ca545c7"  # noqa: E501
+        to=target,
+        data=Bytes(
+            "6e27b0577f2549e5fa01e3db96e7b03a62e489115538620295677faf15040c1c1796bad130e2462a8b8d6bbe0fa35bf12087047ef4ff4e66df8772196b4401998ff7f4219c013a0d927b22d8d3fdf625809abb182507d180e687b666f4f1e4f3b8172e87760f436c701264b89739f3d7c50ec524f16b1a4f91397b760a5209b9b7710544694ecf2729643b3ca545c7"  # noqa: E501
         ),
         gas_limit=100000,
+        value=0x24A39757,
         gas_price=483694712,
-        value=614700887,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x00000000002147C39FD6B5C19B7B89FC003E6B16): Account(
+            storage={}, nonce=0
+        ),
+        coinbase: Account(storage={}, nonce=0),
+        sender: Account(storage={}, nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_multi_selfdestruct.py b/tests/ported_static/stSystemOperationsTest/test_multi_selfdestruct.py
index 27e7b5fc53e..3ce56c97495 100644
--- a/tests/ported_static/stSystemOperationsTest/test_multi_selfdestruct.py
+++ b/tests/ported_static/stSystemOperationsTest/test_multi_selfdestruct.py
@@ -2,19 +2,23 @@
 Implements: SUC000, SUC001, SUC002, SUC003, SUC004, SUC005.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/multiSelfdestructFiller.yml
+state_tests/stSystemOperationsTest/multiSelfdestructFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,69 +26,61 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/multiSelfdestructFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/multiSelfdestructFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "01",
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1, 1: 3, 16: 1, 17: 3, 18: 2}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "02",
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1, 1: 3, 16: 1, 17: 5}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        (
-            "03",
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1, 1: 3, 16: 1, 17: 3, 19: 2}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "04",
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1, 1: 3, 17: 3}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
-        (
-            "05",
-            {
-                Address("0xcccccccccccccccccccccccccccccccccccccccc"): Account(
-                    storage={0: 1, 1: 3, 16: 1, 17: 3, 18: 1, 19: 1}
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
         ),
     ],
-    ids=["case0", "case1", "case2", "case3", "case4"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_multi_selfdestruct(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Implements: SUC000, SUC001, SUC002, SUC003, SUC004, SUC005."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """
+    Implements: SUC000, SUC001, SUC002, SUC003, SUC004, SUC005
+    .
+    """
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x000000000000000000000000000000000000DEAD)
+    contract_1 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -95,7 +91,8 @@ def test_multi_selfdestruct(
         gas_limit=71794957647893862,
     )
 
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    let operation := shr(248, calldataload(0))
     #    let recipient := and(shr(232, calldataload(0)), 0xFFFF)
@@ -117,33 +114,30 @@ def test_multi_selfdestruct(
     #    }
     #
     # }
-    pre.deploy_contract(
-        code=(
-            Op.SHR(0xF8, Op.CALLDATALOAD(offset=0x0))
-            + Op.AND(Op.SHR(0xE8, Op.CALLDATALOAD(offset=0x0)), 0xFFFF)
-            + Op.JUMPI(pc=0x34, condition=Op.EQ(Op.DUP3, 0x0))
-            + Op.JUMPI(pc=0x32, condition=Op.EQ(Op.DUP3, 0xFF))
-            + Op.PUSH1[0x0]
-            + Op.DUP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.SWAP5
-            + Op.DUP2
-            + Op.SWAP5
-            + Op.JUMPI(pc=0x2D, condition=Op.EQ(Op.CALL, Op.GAS))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.REVERT(offset=Op.DUP1, size=0x0)
-            + Op.JUMPDEST
-            + Op.SELFDESTRUCT
-            + Op.JUMPDEST
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SHR(0xF8, Op.CALLDATALOAD(offset=0x0))
+        + Op.AND(Op.SHR(0xE8, Op.CALLDATALOAD(offset=0x0)), 0xFFFF)
+        + Op.JUMPI(pc=0x34, condition=Op.EQ(Op.DUP3, 0x0))
+        + Op.JUMPI(pc=0x32, condition=Op.EQ(Op.DUP3, 0xFF))
+        + Op.PUSH1[0x0]
+        + Op.DUP1 * 3
+        + Op.SWAP5
+        + Op.DUP2
+        + Op.SWAP5
+        + Op.JUMPI(pc=0x2D, condition=Op.EQ(Op.CALL, Op.GAS))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.REVERT(offset=Op.DUP1, size=0x0)
+        + Op.JUMPDEST
+        + Op.SELFDESTRUCT
+        + Op.JUMPDEST
+        + Op.STOP,
         balance=3,
-        address=Address("0x000000000000000000000000000000000000dead"),  # noqa: E501
+        nonce=1,
+        address=Address(0x000000000000000000000000000000000000DEAD),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    # Source: Yul
+    # Source: yul
+    # berlin
     # {
     #    let delme
     #
@@ -173,129 +167,187 @@ def test_multi_selfdestruct(
     #        delme := call(gas(), 0xdead, 2, 0,3, 0,0)
     #    }
     #    case 4 {
-    #        // Attempt to transfer WEI you don't have to 0x1001
-    # ... (21 more lines)
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0xFF)
-            + Op.MSTORE8(offset=0x1, value=0x10)
-            + Op.MSTORE8(offset=0x2, value=0x0)
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALL(
-                    gas=Op.GAS,
-                    address=0xDEAD,
-                    value=Op.DUP1,
-                    args_offset=Op.DUP2,
-                    args_size=0x3,
-                    ret_offset=Op.DUP1,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.BALANCE(address=0x1000))
-            + Op.SSTORE(key=0x2, value=Op.BALANCE(address=0xDEAD))
-            + Op.SHR(0xF8, Op.CALLDATALOAD(offset=0x0))
-            + Op.JUMPI(pc=0xCE, condition=Op.EQ(0x1, Op.DUP1))
-            + Op.JUMPI(pc=0xBC, condition=Op.EQ(0x2, Op.DUP1))
-            + Op.JUMPI(pc=0xA5, condition=Op.EQ(0x3, Op.DUP1))
-            + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x4, Op.DUP1))
-            + Op.PUSH1[0x5]
-            + Op.JUMPI(pc=0x58, condition=Op.EQ)
-            + Op.REVERT(offset=Op.DUP1, size=0x0)
-            + Op.JUMPDEST
-            + Op.MSTORE8(offset=0x0, value=0x1)
-            + Op.MSTORE8(offset=0x2, value=0x1)
-            + Op.CALL(
+    # ... (22 more lines)
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xFF)
+        + Op.MSTORE8(offset=0x1, value=0x10)
+        + Op.MSTORE8(offset=0x2, value=0x0)
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALL(
                 gas=Op.GAS,
-                address=0xDEAD,
-                value=0x2,
-                args_offset=Op.DUP2,
-                args_size=0x3,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.JUMPDEST
-            + Op.PUSH1[0x10]
-            + Op.SSTORE
-            + Op.SSTORE(key=0x11, value=Op.BALANCE(address=0x1000))
-            + Op.SSTORE(key=0x12, value=Op.BALANCE(address=0xDEAD))
-            + Op.SSTORE(key=0x13, value=Op.BALANCE(address=0x1001))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.MSTORE8(offset=0x0, value=0x1)
-            + Op.MSTORE8(offset=0x2, value=0x1)
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xDEAD,
+                address=contract_0,
                 value=Op.DUP1,
                 args_offset=Op.DUP2,
                 args_size=0x3,
                 ret_offset=Op.DUP1,
                 ret_size=0x0,
-            )
-            + Op.JUMP(pc=0x70)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.MSTORE8(offset=0x2, value=0x1)
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xDEAD,
-                value=0x2,
-                args_offset=Op.DUP2,
-                args_size=0x3,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.JUMP(pc=0x70)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xDEAD,
-                value=0x2,
-                args_offset=Op.DUP2,
-                args_size=0x3,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.JUMP(pc=0x70)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.CALL(
-                gas=Op.GAS,
-                address=0xDEAD,
-                value=0x2,
-                args_offset=Op.DUP1,
-                args_size=0x3,
-                ret_offset=Op.DUP1,
-                ret_size=0x0,
-            )
-            + Op.JUMP(pc=0x70)
-        ),
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.BALANCE(address=0x1000))
+        + Op.SSTORE(key=0x2, value=Op.BALANCE(address=contract_0))
+        + Op.SHR(0xF8, Op.CALLDATALOAD(offset=0x0))
+        + Op.JUMPI(pc=0xCE, condition=Op.EQ(0x1, Op.DUP1))
+        + Op.JUMPI(pc=0xBC, condition=Op.EQ(0x2, Op.DUP1))
+        + Op.JUMPI(pc=0xA5, condition=Op.EQ(0x3, Op.DUP1))
+        + Op.JUMPI(pc=0x8A, condition=Op.EQ(0x4, Op.DUP1))
+        + Op.PUSH1[0x5]
+        + Op.JUMPI(pc=0x58, condition=Op.EQ)
+        + Op.REVERT(offset=Op.DUP1, size=0x0)
+        + Op.JUMPDEST
+        + Op.MSTORE8(offset=0x0, value=0x1)
+        + Op.MSTORE8(offset=0x2, value=0x1)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_0,
+            value=0x2,
+            args_offset=Op.DUP2,
+            args_size=0x3,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.JUMPDEST
+        + Op.PUSH1[0x10]
+        + Op.SSTORE
+        + Op.SSTORE(key=0x11, value=Op.BALANCE(address=0x1000))
+        + Op.SSTORE(key=0x12, value=Op.BALANCE(address=contract_0))
+        + Op.SSTORE(key=0x13, value=Op.BALANCE(address=0x1001))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.MSTORE8(offset=0x0, value=0x1)
+        + Op.MSTORE8(offset=0x2, value=0x1)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_0,
+            value=Op.DUP1,
+            args_offset=Op.DUP2,
+            args_size=0x3,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.JUMP(pc=0x70)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.MSTORE8(offset=0x2, value=0x1)
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_0,
+            value=0x2,
+            args_offset=Op.DUP2,
+            args_size=0x3,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.JUMP(pc=0x70)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_0,
+            value=0x2,
+            args_offset=Op.DUP2,
+            args_size=0x3,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.JUMP(pc=0x70)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.CALL(
+            gas=Op.GAS,
+            address=contract_0,
+            value=0x2,
+            args_offset=Op.DUP1,
+            args_size=0x3,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.JUMP(pc=0x70),
         storage={
-            0x0: 0x60A7,
-            0x1: 0x60A7,
-            0x10: 0x60A7,
-            0x11: 0x60A7,
-            0x12: 0x60A7,
-            0x13: 0x60A7,
+            0: 24743,
+            1: 24743,
+            16: 24743,
+            17: 24743,
+            18: 24743,
+            19: 24743,
         },
         balance=0x5F5E100,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        nonce=1,
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(
+                    storage={0: 1, 1: 3, 2: 0, 16: 1, 17: 3, 18: 2}
+                ),
+                contract_0: Account(balance=2, nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(
+                    storage={0: 1, 1: 3, 2: 0, 16: 1, 17: 5, 18: 0}
+                ),
+                contract_0: Account(balance=0, nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": 2, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(
+                    storage={0: 1, 1: 3, 2: 0, 16: 1, 17: 3, 18: 0, 19: 2},
+                ),
+                contract_0: Account(balance=0, nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(
+                    storage={0: 1, 1: 3, 2: 0, 16: 0, 17: 3, 18: 0, 19: 0},
+                ),
+                contract_0: Account(balance=0, nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": 4, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(
+                    storage={0: 1, 1: 3, 2: 0, 16: 1, 17: 3, 18: 1, 19: 1},
+                ),
+                contract_0: Account(balance=1, nonce=1),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("01"),
+        Bytes("02"),
+        Bytes("03"),
+        Bytes("04"),
+        Bytes("05"),
+    ]
+    tx_gas = [10000000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=10000000,
-        gas_price=1000,
+        to=contract_1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        gas_price=1000,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_post_to_return1.py b/tests/ported_static/stSystemOperationsTest/test_post_to_return1.py
index 1b16431f741..d267cc95973 100644
--- a/tests/ported_static/stSystemOperationsTest/test_post_to_return1.py
+++ b/tests/ported_static/stSystemOperationsTest/test_post_to_return1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_post_to_return1.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/PostToReturn1Filler.json
+state_tests/stSystemOperationsTest/PostToReturn1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/PostToReturn1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/PostToReturn1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_post_to_return1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_post_to_return1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,60 +43,53 @@ def test_post_to_return1(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.PUSH1[0x2]
-            + Op.PUSH1[0x0]
-            + Op.CALLCODE
-        ),
+    # Source: raw
+    # 0x603760005360026000f2
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.PUSH1[0x2]
+        + Op.PUSH1[0x0]
+        + Op.CALLCODE,
         balance=23,
         nonce=0,
-        address=Address("0x1ec76f80449bf4d3edf503813e06c0d4373fdf3d"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[1]](CALL 30000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 23 0 64 0 0 ) [[2]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(
-                offset=0x0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x20,
-                value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0x7530,
-                    address=0x1EC76F80449BF4D3EDF503813E06C0D4373FDF3D,
-                    value=0x17,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.MSTORE(
+            offset=0x20,
+            value=0xAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAA,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0x7530,
+                address=addr,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0x1)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3ae2f90d9f77554f1e03d5a4868ca5f0c4e14039"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(storage={2: 1}),
-    }
+    post = {target: Account(storage={1: 0, 2: 1})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_return0.py b/tests/ported_static/stSystemOperationsTest/test_return0.py
index f33d57e10f4..e9072df5790 100644
--- a/tests/ported_static/stSystemOperationsTest/test_return0.py
+++ b/tests/ported_static/stSystemOperationsTest/test_return0.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_return0.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/return0Filler.json
+state_tests/stSystemOperationsTest/return0Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSystemOperationsTest/return0Filler.json"],
+    ["state_tests/stSystemOperationsTest/return0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_return0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_return0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,27 +43,24 @@ def test_return0(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 0 55) (RETURN 0 1)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x1)
+        + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0xb594e8f0afce73d002c12c76050e15beaa8b21f7"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_return1.py b/tests/ported_static/stSystemOperationsTest/test_return1.py
index 10ebced456d..aa776c0a646 100644
--- a/tests/ported_static/stSystemOperationsTest/test_return1.py
+++ b/tests/ported_static/stSystemOperationsTest/test_return1.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_return1.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/return1Filler.json
+state_tests/stSystemOperationsTest/return1Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSystemOperationsTest/return1Filler.json"],
+    ["state_tests/stSystemOperationsTest/return1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_return1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_return1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,27 +43,24 @@ def test_return1(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 0 55) (RETURN 0 2)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x2)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x2)
+        + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0xe50c84b8b720a23e1bfb8bfaaee5f44b6dd44139"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_return2.py b/tests/ported_static/stSystemOperationsTest/test_return2.py
index 2fc9a60fa74..3ccc5f27fea 100644
--- a/tests/ported_static/stSystemOperationsTest/test_return2.py
+++ b/tests/ported_static/stSystemOperationsTest/test_return2.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_return2.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/return2Filler.json
+state_tests/stSystemOperationsTest/return2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stSystemOperationsTest/return2Filler.json"],
+    ["state_tests/stSystemOperationsTest/return2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +30,9 @@ def test_return2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_return2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,27 +43,24 @@ def test_return2(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (MSTORE8 0 55) (RETURN 0 33)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE8(offset=0x0, value=0x37)
-            + Op.RETURN(offset=0x0, size=0x21)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0x37)
+        + Op.RETURN(offset=0x0, size=0x21)
+        + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0x230fcb597dd38307e287c745b56deb09a8a93ec0"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_suicide_address.py b/tests/ported_static/stSystemOperationsTest/test_suicide_address.py
index 5c5a1339dc8..d381dea5437 100644
--- a/tests/ported_static/stSystemOperationsTest/test_suicide_address.py
+++ b/tests/ported_static/stSystemOperationsTest/test_suicide_address.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_suicide_address.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/suicideAddressFiller.json
+state_tests/stSystemOperationsTest/suicideAddressFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/suicideAddressFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/suicideAddressFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_suicide_address(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_suicide_address."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,31 +43,24 @@ def test_suicide_address(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[0]] (ADDRESS) (SELFDESTRUCT (ADDRESS))}
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ADDRESS)
-            + Op.SELFDESTRUCT(address=Op.ADDRESS)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADDRESS)
+        + Op.SELFDESTRUCT(address=Op.ADDRESS)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xab0ceffaa4bd275f5819261e06029439647112c1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post = {
-        contract: Account(
-            storage={0: 0xAB0CEFFAA4BD275F5819261E06029439647112C1},
-        ),
-    }
+    post = {target: Account(balance=0xDE0B6B3A76586A0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_suicide_caller.py b/tests/ported_static/stSystemOperationsTest/test_suicide_caller.py
index 8aada2dfd46..34f17745993 100644
--- a/tests/ported_static/stSystemOperationsTest/test_suicide_caller.py
+++ b/tests/ported_static/stSystemOperationsTest/test_suicide_caller.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_suicide_caller.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/suicideCallerFiller.json
+state_tests/stSystemOperationsTest/suicideCallerFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/suicideCallerFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/suicideCallerFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_suicide_caller(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_suicide_caller."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,31 +43,27 @@ def test_suicide_caller(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[0]] (CALLER) (SELFDESTRUCT (CALLER))}
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.CALLER)
-            + Op.SELFDESTRUCT(address=Op.CALLER)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.CALLER)
+        + Op.SELFDESTRUCT(address=Op.CALLER)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x26a4c0125cc2ac853d5c04c3a710e7628ee352a3"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297},
-        ),
+        sender: Account(nonce=1),
+        target: Account(storage={0: sender}, balance=0, nonce=0),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_suicide_caller_addres_too_big_left.py b/tests/ported_static/stSystemOperationsTest/test_suicide_caller_addres_too_big_left.py
index b353232fea7..10c4ff37394 100644
--- a/tests/ported_static/stSystemOperationsTest/test_suicide_caller_addres_too_big_left.py
+++ b/tests/ported_static/stSystemOperationsTest/test_suicide_caller_addres_too_big_left.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_suicide_caller_addres_too_big_left.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-suicideCallerAddresTooBigLeftFiller.json
+state_tests/stSystemOperationsTest/suicideCallerAddresTooBigLeftFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/suicideCallerAddresTooBigLeftFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/suicideCallerAddresTooBigLeftFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,9 @@ def test_suicide_caller_addres_too_big_left(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_suicide_caller_addres_too_big_left."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,33 +49,29 @@ def test_suicide_caller_addres_too_big_left(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { [[0]] (CALLER) (SELFDESTRUCT 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.CALLER)
-            + Op.SELFDESTRUCT(
-                address=0xAAA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.CALLER)
+        + Op.SELFDESTRUCT(address=0xAAA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B},
-        ),
+        sender: Account(nonce=1),
+        contract_0: Account(storage={0: sender}, balance=0, nonce=0),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_suicide_caller_addres_too_big_right.py b/tests/ported_static/stSystemOperationsTest/test_suicide_caller_addres_too_big_right.py
index 9fa3d9a0ca7..84f360bf6b1 100644
--- a/tests/ported_static/stSystemOperationsTest/test_suicide_caller_addres_too_big_right.py
+++ b/tests/ported_static/stSystemOperationsTest/test_suicide_caller_addres_too_big_right.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_suicide_caller_addres_too_big_right.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-suicideCallerAddresTooBigRightFiller.json
+state_tests/stSystemOperationsTest/suicideCallerAddresTooBigRightFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/suicideCallerAddresTooBigRightFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/suicideCallerAddresTooBigRightFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,9 @@ def test_suicide_caller_addres_too_big_right(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_suicide_caller_addres_too_big_right."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,32 +49,29 @@ def test_suicide_caller_addres_too_big_right(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { [[0]] (CALLER) (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.CALLER)
-            + Op.SELFDESTRUCT(
-                address=0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0BAA
-            )
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.CALLER)
+        + Op.SELFDESTRUCT(address=0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0BAA)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"),  # noqa: E501
+        address=Address(0x095E7BAEA6A6C7C4C2DFEB977EFAC326AF552D87),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B},
+        Address(0x4F5374FCE5EDBC8E2A8697C15331677E6EBF0BAA): Account(
+            balance=0xDE0B6B3A76586A0
         ),
     }
 
diff --git a/tests/ported_static/stSystemOperationsTest/test_suicide_not_existing_account.py b/tests/ported_static/stSystemOperationsTest/test_suicide_not_existing_account.py
index 8438c0c320d..64c792c14a9 100644
--- a/tests/ported_static/stSystemOperationsTest/test_suicide_not_existing_account.py
+++ b/tests/ported_static/stSystemOperationsTest/test_suicide_not_existing_account.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_suicide_not_existing_account.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-suicideNotExistingAccountFiller.json
+state_tests/stSystemOperationsTest/suicideNotExistingAccountFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/suicideNotExistingAccountFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/suicideNotExistingAccountFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,8 @@ def test_suicide_not_existing_account(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_suicide_not_existing_account."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,26 +48,31 @@ def test_suicide_not_existing_account(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: lll
     # { (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}
-    contract = pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xAA1722F3947DEF4CF144679DA39C4C32BDC35681)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xAA1722F3947DEF4CF144679DA39C4C32BDC35681
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x70c22830049f2678c8aa93d0060683cd67696495"),  # noqa: E501
+        address=Address(0x70C22830049F2678C8AA93D0060683CD67696495),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        Address(0xAA1722F3947DEF4CF144679DA39C4C32BDC35681): Account(
+            balance=0xDE0B6B3A76586A0
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_suicide_origin.py b/tests/ported_static/stSystemOperationsTest/test_suicide_origin.py
index 897e7ffcb57..5f785f6a0e5 100644
--- a/tests/ported_static/stSystemOperationsTest/test_suicide_origin.py
+++ b/tests/ported_static/stSystemOperationsTest/test_suicide_origin.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_suicide_origin.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/suicideOriginFiller.json
+state_tests/stSystemOperationsTest/suicideOriginFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/suicideOriginFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/suicideOriginFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_suicide_origin(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_suicide_origin."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,31 +43,27 @@ def test_suicide_origin(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { [[0]] (ORIGIN) (SELFDESTRUCT (ORIGIN))}
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.ORIGIN)
-            + Op.SELFDESTRUCT(address=Op.ORIGIN)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ORIGIN)
+        + Op.SELFDESTRUCT(address=Op.ORIGIN)
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x8a448e5835bbdd139b8a2053ee6fe895522048a1"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
-            storage={0: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297},
-        ),
+        sender: Account(nonce=1),
+        target: Account(storage={0: sender}, balance=0, nonce=0),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_suicide_send_ether_post_death.py b/tests/ported_static/stSystemOperationsTest/test_suicide_send_ether_post_death.py
index 99d86b0d8ca..767c6a21ad5 100644
--- a/tests/ported_static/stSystemOperationsTest/test_suicide_send_ether_post_death.py
+++ b/tests/ported_static/stSystemOperationsTest/test_suicide_send_ether_post_death.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_suicide_send_ether_post_death.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest
-suicideSendEtherPostDeathFiller.json
+state_tests/stSystemOperationsTest/suicideSendEtherPostDeathFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stSystemOperationsTest/suicideSendEtherPostDeathFiller.json",  # noqa: E501
+        "state_tests/stSystemOperationsTest/suicideSendEtherPostDeathFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_suicide_send_ether_post_death(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xB1F4CBC3A50042184425A6F9E996D0910F7BA879457CE5DAC5C71E498AD3C005
-    )
+    """Test_suicide_send_ether_post_death."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,143 +45,140 @@ def test_suicide_send_ether_post_death(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x40, value=0x60)
-            + Op.CALLDATALOAD(offset=0x0)
-            + Op.PUSH29[
-                0x100000000000000000000000000000000000000000000000000000000
-            ]
-            + Op.SWAP1
-            + Op.DIV
-            + Op.JUMPI(pc=Op.PUSH2[0x44], condition=Op.EQ(0x35F46994, Op.DUP1))
-            + Op.JUMPI(pc=Op.PUSH2[0x51], condition=Op.EQ(0x4D536FE3, Op.DUP1))
-            + Op.JUMP(pc=Op.PUSH2[0x42])
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH2[0x4F]
-            + Op.POP(0x4)
-            + Op.JUMP(pc=Op.PUSH2[0x72])
-            + Op.JUMPDEST
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH2[0x5C]
-            + Op.POP(0x4)
-            + Op.JUMP(pc=Op.PUSH2[0x8D])
-            + Op.JUMPDEST
-            + Op.MLOAD(offset=0x40)
-            + Op.DUP1
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
-            + Op.PUSH1[0x20]
-            + Op.ADD
-            + Op.SWAP2
-            + Op.POP
-            + Op.POP
-            + Op.MLOAD(offset=0x40)
-            + Op.DUP1
-            + Op.SWAP2
-            + Op.SUB
-            + Op.SWAP1
-            + Op.RETURN
-            + Op.JUMPDEST
-            + Op.SELFDESTRUCT(
-                address=Op.AND(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    Op.ADDRESS,
-                ),
-            )
-            + Op.JUMPDEST
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x0]
-            + Op.AND(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.ADDRESS)
-            + Op.PUSH4[0x35F46994]
-            + Op.MLOAD(offset=0x40)
-            + Op.MSTORE(
-                offset=Op.DUP2,
-                value=Op.MUL(
-                    0x100000000000000000000000000000000000000000000000000000000,  # noqa: E501
-                    Op.DUP2,
-                ),
-            )
-            + Op.PUSH1[0x4]
-            + Op.ADD
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMPI(
-                pc=Op.PUSH2[0x2],
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=Op.SUB(Op.GAS, 0x61DA),
-                        address=Op.DUP8,
-                        value=0x0,
-                        args_offset=Op.DUP2,
-                        args_size=Op.SUB(Op.DUP4, Op.DUP1),
-                        ret_offset=Op.MLOAD(offset=0x40),
-                        ret_size=0x0,
-                    ),
-                ),
+    # Source: hex
+    # 0x60606040526000357c01000000000000000000000000000000000000000000000000000000009004806335f46994146100445780634d536fe31461005157610042565b005b61004f600450610072565b005b61005c60045061008d565b6040518082815260200191505060405180910390f35b3073ffffffffffffffffffffffffffffffffffffffff16ff5b565b600060003073ffffffffffffffffffffffffffffffffffffffff166335f46994604051817c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f115610002575050503073ffffffffffffffffffffffffffffffffffffffff163190503373ffffffffffffffffffffffffffffffffffffffff16600082604051809050600060405180830381858888f1935050505050809150610147565b509056  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x40, value=0x60)
+        + Op.CALLDATALOAD(offset=0x0)
+        + Op.PUSH29[
+            0x100000000000000000000000000000000000000000000000000000000
+        ]
+        + Op.SWAP1
+        + Op.DIV
+        + Op.JUMPI(pc=Op.PUSH2[0x44], condition=Op.EQ(0x35F46994, Op.DUP1))
+        + Op.JUMPI(pc=Op.PUSH2[0x51], condition=Op.EQ(0x4D536FE3, Op.DUP1))
+        + Op.JUMP(pc=Op.PUSH2[0x42])
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH2[0x4F]
+        + Op.POP(0x4)
+        + Op.JUMP(pc=Op.PUSH2[0x72])
+        + Op.JUMPDEST
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH2[0x5C]
+        + Op.POP(0x4)
+        + Op.JUMP(pc=Op.PUSH2[0x8D])
+        + Op.JUMPDEST
+        + Op.MLOAD(offset=0x40)
+        + Op.DUP1
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
+        + Op.PUSH1[0x20]
+        + Op.ADD
+        + Op.SWAP2
+        + Op.POP * 2
+        + Op.MLOAD(offset=0x40)
+        + Op.DUP1
+        + Op.SWAP2
+        + Op.SUB
+        + Op.SWAP1
+        + Op.RETURN
+        + Op.JUMPDEST
+        + Op.SELFDESTRUCT(
+            address=Op.AND(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.ADDRESS
             )
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.BALANCE(
-                address=Op.AND(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                    Op.ADDRESS,
-                ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0] * 2
+        + Op.AND(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.ADDRESS)
+        + Op.PUSH4[0x35F46994]
+        + Op.MLOAD(offset=0x40)
+        + Op.MSTORE(
+            offset=Op.DUP2,
+            value=Op.MUL(
+                0x100000000000000000000000000000000000000000000000000000000,
+                Op.DUP2,
+            ),
+        )
+        + Op.PUSH1[0x4]
+        + Op.ADD
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMPI(
+            pc=Op.PUSH2[0x2],
+            condition=Op.ISZERO(
+                Op.CALL(
+                    gas=Op.SUB(Op.GAS, 0x61DA),
+                    address=Op.DUP8,
+                    value=0x0,
+                    args_offset=Op.DUP2,
+                    args_size=Op.SUB(Op.DUP4, Op.DUP1),
+                    ret_offset=Op.MLOAD(offset=0x40),
+                    ret_size=0x0,
+                )
+            ),
+        )
+        + Op.POP * 3
+        + Op.BALANCE(
+            address=Op.AND(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.ADDRESS
             )
-            + Op.SWAP1
-            + Op.POP
-            + Op.AND(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.CALLER)
-            + Op.PUSH1[0x0]
-            + Op.DUP3
-            + Op.MLOAD(offset=0x40)
-            + Op.DUP1
-            + Op.SWAP1
-            + Op.POP
-            + Op.CALL(
-                gas=Op.DUP9,
-                address=Op.DUP9,
-                value=Op.DUP6,
-                args_offset=Op.DUP2,
-                args_size=Op.SUB(Op.DUP4, Op.DUP1),
-                ret_offset=Op.MLOAD(offset=0x40),
-                ret_size=0x0,
-            )
-            + Op.SWAP4
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.DUP1
-            + Op.SWAP2
-            + Op.POP
-            + Op.JUMP(pc=0x147)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.SWAP1
-            + Op.JUMP
-        ),
+        )
+        + Op.SWAP1
+        + Op.POP
+        + Op.AND(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, Op.CALLER)
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.MLOAD(offset=0x40)
+        + Op.DUP1
+        + Op.SWAP1
+        + Op.POP
+        + Op.CALL(
+            gas=Op.DUP9,
+            address=Op.DUP9,
+            value=Op.DUP6,
+            args_offset=Op.DUP2,
+            args_size=Op.SUB(Op.DUP4, Op.DUP1),
+            ret_offset=Op.MLOAD(offset=0x40),
+            ret_size=0x0,
+        )
+        + Op.SWAP4
+        + Op.POP * 5
+        + Op.DUP1
+        + Op.SWAP2
+        + Op.POP
+        + Op.JUMP(pc=0x147)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.SWAP1
+        + Op.JUMP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xa997455dca526734f5607f7c452de0cfb9af19f4"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("4d536fe3"),
+        to=target,
+        data=Bytes("4d536fe3"),
         gas_limit=3000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        target: Account(
+            storage={},
+            code=bytes.fromhex(
+                "60606040526000357c01000000000000000000000000000000000000000000000000000000009004806335f46994146100445780634d536fe31461005157610042565b005b61004f600450610072565b005b61005c60045061008d565b6040518082815260200191505060405180910390f35b3073ffffffffffffffffffffffffffffffffffffffff16ff5b565b600060003073ffffffffffffffffffffffffffffffffffffffff166335f46994604051817c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f115610002575050503073ffffffffffffffffffffffffffffffffffffffff163190503373ffffffffffffffffffffffffffffffffffffffff16600082604051809050600060405180830381858888f1935050505050809150610147565b509056"  # noqa: E501
+            ),
+            balance=0,
+            nonce=0,
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_suicide_send_ether_to_me.py b/tests/ported_static/stSystemOperationsTest/test_suicide_send_ether_to_me.py
index ca1eb1a163c..effeb06c200 100644
--- a/tests/ported_static/stSystemOperationsTest/test_suicide_send_ether_to_me.py
+++ b/tests/ported_static/stSystemOperationsTest/test_suicide_send_ether_to_me.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_suicide_send_ether_to_me.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/suicideSendEtherToMeFiller.json
+state_tests/stSystemOperationsTest/suicideSendEtherToMeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/suicideSendEtherToMeFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/suicideSendEtherToMeFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_suicide_send_ether_to_me(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_suicide_send_ether_to_me."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,23 +43,25 @@ def test_suicide_send_ether_to_me(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (SELFDESTRUCT (ADDRESS) )}
-    contract = pre.deploy_contract(
+    target = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=Op.ADDRESS) + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x3b11a41d66b30b30d4d5be673f7d5c7d72c9fca8"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(balance=0xDE0B6B3A75E81AC, nonce=1),
+        target: Account(storage={}, balance=0xDE0B6B3A76586A0, nonce=0),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stSystemOperationsTest/test_test_name_registrator.py b/tests/ported_static/stSystemOperationsTest/test_test_name_registrator.py
index b93d3b23c34..49801340bd3 100644
--- a/tests/ported_static/stSystemOperationsTest/test_test_name_registrator.py
+++ b/tests/ported_static/stSystemOperationsTest/test_test_name_registrator.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_test_name_registrator.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/TestNameRegistratorFiller.json
+state_tests/stSystemOperationsTest/TestNameRegistratorFiller.json
 """
 
 import pytest
@@ -12,6 +12,7 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/TestNameRegistratorFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/TestNameRegistratorFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,8 @@ def test_test_name_registrator(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_test_name_registrator."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -48,38 +47,38 @@ def test_test_name_registrator(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A7640000)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.JUMPI(
-                pc=0x9,
-                condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
-            )
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.CALLDATALOAD(offset=0x0),
-                value=Op.CALLDATALOAD(offset=0x20),
-            )
+    # Source: raw
+    # 0x6000355415600957005b60203560003555
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0xfd6034ff12fad248c17ca3c09f0d7b19243275cd"),  # noqa: E501
+        address=Address(0xFD6034FF12FAD248C17CA3C09F0D7B19243275CD),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaffffffff"  # noqa: E501
-            "fffffffffffffffffffffffffffffffffffffffffffffffffffffffa"
+        to=target,
+        data=Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA
         ),
         gas_limit=1000000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        target: Account(
             storage={
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA,  # noqa: E501
             },
diff --git a/tests/ported_static/stSystemOperationsTest/test_test_random_test.py b/tests/ported_static/stSystemOperationsTest/test_test_random_test.py
index ac4ba6270d3..4ce34dd1cf8 100644
--- a/tests/ported_static/stSystemOperationsTest/test_test_random_test.py
+++ b/tests/ported_static/stSystemOperationsTest/test_test_random_test.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_test_random_test.
 
 Ported from:
-tests/static/state_tests/stSystemOperationsTest/testRandomTestFiller.json
+state_tests/stSystemOperationsTest/testRandomTestFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stSystemOperationsTest/testRandomTestFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stSystemOperationsTest/testRandomTestFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,9 @@ def test_test_random_test(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_test_random_test."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -47,42 +47,41 @@ def test_test_random_test(
         gas_limit=1000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.TIMESTAMP
-            + Op.PREVRANDAO
-            + Op.NUMBER
-            + Op.PREVRANDAO
-            + Op.SSTORE(
-                key=Op.CREATE(
-                    value=Op.GAS,
-                    offset=Op.ISZERO(
-                        Op.CREATE(
-                            value=Op.DUP4, offset=Op.NUMBER, size=Op.NUMBER
-                        ),
-                    ),
-                    size=Op.NUMBER,
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: raw
+    # 0x424443444243434383f0155af055
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.TIMESTAMP
+        + Op.PREVRANDAO
+        + Op.NUMBER
+        + Op.PREVRANDAO
+        + Op.SSTORE(
+            key=Op.CREATE(
+                value=Op.GAS,
+                offset=Op.ISZERO(
+                    Op.CREATE(value=Op.DUP4, offset=Op.NUMBER, size=Op.NUMBER)
                 ),
-                value=Op.TIMESTAMP,
-            )
+                size=Op.NUMBER,
+            ),
+            value=Op.TIMESTAMP,
         ),
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
+        address=Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=300000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={0xEBCCE5F60530275EE9318CE1EFF9E4BFEE810172: 1000},
+            nonce=2,
         ),
     }
 
diff --git a/tests/ported_static/stTimeConsuming/__init__.py b/tests/ported_static/stTimeConsuming/__init__.py
index 07c0965a5ea..08a79b03774 100644
--- a/tests/ported_static/stTimeConsuming/__init__.py
+++ b/tests/ported_static/stTimeConsuming/__init__.py
@@ -1 +1 @@
-"""Tests ported from stTimeConsuming."""
+"""Ported static tests: stTimeConsuming."""  # noqa: N999
diff --git a/tests/ported_static/stTimeConsuming/conftest.py b/tests/ported_static/stTimeConsuming/conftest.py
deleted file mode 100644
index de0d92e1862..00000000000
--- a/tests/ported_static/stTimeConsuming/conftest.py
+++ /dev/null
@@ -1,15 +0,0 @@
-"""Pytest configuration to mark all tests as slow."""
-
-from pathlib import Path
-from typing import Any
-
-import pytest
-
-
-def pytest_collection_modifyitems(config: Any, items: Any) -> None:
-    """Add the `slow` marker to time-consuming tests."""
-    del config
-    st_time_consuming_dir = Path(__file__).parent
-    for item in items:
-        if st_time_consuming_dir in Path(item.fspath).parents:
-            item.add_marker(pytest.mark.slow)
diff --git a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial00_2_paris.py b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial00_2_paris.py
index ff243383802..f3a7206c048 100644
--- a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial00_2_paris.py
+++ b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial00_2_paris.py
@@ -1,10798 +1,9 @@
 """
-sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog,...
+Sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non,...
 
 Ported from:
-tests/static/state_tests/stTimeConsuming
-sstore_combinations_initial00_2_ParisFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTimeConsuming/sstore_combinations_initial00_2_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "6101aa6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102106064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102116064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102126064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102136064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102146064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102156064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102166064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102176064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b46064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102186064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102196064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102206064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102216064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b56064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102226064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102236064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102246064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102256064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102266064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102276064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102286064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102296064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b66064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102306064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102316064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102326064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102336064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102346064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102356064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b76064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102366064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102376064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102386064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102396064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b86064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102406064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102416064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102426064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102436064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102446064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102456064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102466064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102476064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102486064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102496064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b96064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102506064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102516064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102526064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102536064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ba6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102546064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102556064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102566064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102576064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102586064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102596064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101bb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102606064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102616064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102626064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102636064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102646064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102656064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102666064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102676064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101bc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102686064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102696064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102706064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102716064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101bd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ab6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102726064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102736064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102746064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102756064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102766064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102776064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102786064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102796064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101be6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102806064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102816064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102826064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102836064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102846064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102856064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101bf6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102866064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102876064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102886064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102896064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c06064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102906064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102916064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102926064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102936064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102946064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102956064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102966064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102976064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102986064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102996064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c16064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a06064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a16064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a26064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a36064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c26064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a46064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a56064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a66064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a76064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a86064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a96064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102aa6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ab6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ac6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ad6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c36064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ae6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102af6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b06064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b16064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b26064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b36064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b46064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b56064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b66064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b76064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c46064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b86064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b96064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ba6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102bb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102bc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102bd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102be6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102bf6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c06064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c16064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c56064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c26064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c36064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c46064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c56064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c66064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c76064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c86064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c96064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ca6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102cb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c66064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102cc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102cd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ce6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102cf6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d06064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d16064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d26064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d36064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d46064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d56064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c76064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ac6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d66064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d76064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d86064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d96064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102da6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102db6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102dc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102dd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102de6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102df6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c86064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e06064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e16064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e26064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e36064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e46064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e56064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e66064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e76064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e86064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e96064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c96064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ea6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102eb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ec6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ed6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ee6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ef6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f06064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f16064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f26064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f36064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ca6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f46064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f56064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f66064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f76064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f86064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f96064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102fa6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102fb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102fc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102fd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101cb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102fe6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ff6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103006064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103016064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103026064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103036064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103046064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103056064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103066064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103076064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101cc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103086064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103096064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103106064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103116064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101cd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103126064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103136064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103146064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103156064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103166064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103176064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103186064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103196064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ce6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103206064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103216064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103226064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103236064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103246064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103256064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101cf6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103266064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103276064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103286064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103296064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d06064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103306064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103316064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103326064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103336064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103346064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103356064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103366064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103376064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103386064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103396064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d16064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ad6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103406064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103416064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103426064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103436064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d26064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103446064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103456064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103466064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103476064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103486064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103496064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d36064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103506064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103516064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d46064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d56064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d66064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d76064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d86064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d96064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101da6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101db6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ae6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101dc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101dd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101de6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101df6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e06064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e16064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e26064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e36064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e46064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e56064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101af6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e66064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e76064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e86064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e96064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ea6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101eb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ec6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ed6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ee6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ef6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b06064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f06064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f16064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f26064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f36064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f46064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f56064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f66064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f76064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f86064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f96064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b16064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101fa6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101fb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101fc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101fd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101fe6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ff6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102006064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102016064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102026064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102036064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b26064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102046064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102056064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102066064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102076064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102086064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102096064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b36064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-        "case166",
-        "case167",
-        "case168",
-        "case169",
-        "case170",
-        "case171",
-        "case172",
-        "case173",
-        "case174",
-        "case175",
-        "case176",
-        "case177",
-        "case178",
-        "case179",
-        "case180",
-        "case181",
-        "case182",
-        "case183",
-        "case184",
-        "case185",
-        "case186",
-        "case187",
-        "case188",
-        "case189",
-        "case190",
-        "case191",
-        "case192",
-        "case193",
-        "case194",
-        "case195",
-        "case196",
-        "case197",
-        "case198",
-        "case199",
-        "case200",
-        "case201",
-        "case202",
-        "case203",
-        "case204",
-        "case205",
-        "case206",
-        "case207",
-        "case208",
-        "case209",
-        "case210",
-        "case211",
-        "case212",
-        "case213",
-        "case214",
-        "case215",
-        "case216",
-        "case217",
-        "case218",
-        "case219",
-        "case220",
-        "case221",
-        "case222",
-        "case223",
-        "case224",
-        "case225",
-        "case226",
-        "case227",
-        "case228",
-        "case229",
-        "case230",
-        "case231",
-        "case232",
-        "case233",
-        "case234",
-        "case235",
-        "case236",
-        "case237",
-        "case238",
-        "case239",
-        "case240",
-        "case241",
-        "case242",
-        "case243",
-        "case244",
-        "case245",
-        "case246",
-        "case247",
-        "case248",
-        "case249",
-        "case250",
-        "case251",
-        "case252",
-        "case253",
-        "case254",
-        "case255",
-        "case256",
-        "case257",
-        "case258",
-        "case259",
-        "case260",
-        "case261",
-        "case262",
-        "case263",
-        "case264",
-        "case265",
-        "case266",
-        "case267",
-        "case268",
-        "case269",
-        "case270",
-        "case271",
-        "case272",
-        "case273",
-        "case274",
-        "case275",
-        "case276",
-        "case277",
-        "case278",
-        "case279",
-        "case280",
-        "case281",
-        "case282",
-        "case283",
-        "case284",
-        "case285",
-        "case286",
-        "case287",
-        "case288",
-        "case289",
-        "case290",
-        "case291",
-        "case292",
-        "case293",
-        "case294",
-        "case295",
-        "case296",
-        "case297",
-        "case298",
-        "case299",
-        "case300",
-        "case301",
-        "case302",
-        "case303",
-        "case304",
-        "case305",
-        "case306",
-        "case307",
-        "case308",
-        "case309",
-        "case310",
-        "case311",
-        "case312",
-        "case313",
-        "case314",
-        "case315",
-        "case316",
-        "case317",
-        "case318",
-        "case319",
-        "case320",
-        "case321",
-        "case322",
-        "case323",
-        "case324",
-        "case325",
-        "case326",
-        "case327",
-        "case328",
-        "case329",
-        "case330",
-        "case331",
-        "case332",
-        "case333",
-        "case334",
-        "case335",
-        "case336",
-        "case337",
-        "case338",
-        "case339",
-        "case340",
-        "case341",
-        "case342",
-        "case343",
-        "case344",
-        "case345",
-        "case346",
-        "case347",
-        "case348",
-        "case349",
-        "case350",
-        "case351",
-        "case352",
-        "case353",
-        "case354",
-        "case355",
-        "case356",
-        "case357",
-        "case358",
-        "case359",
-        "case360",
-        "case361",
-        "case362",
-        "case363",
-        "case364",
-        "case365",
-        "case366",
-        "case367",
-        "case368",
-        "case369",
-        "case370",
-        "case371",
-        "case372",
-        "case373",
-        "case374",
-        "case375",
-        "case376",
-        "case377",
-        "case378",
-        "case379",
-        "case380",
-        "case381",
-        "case382",
-        "case383",
-        "case384",
-        "case385",
-        "case386",
-        "case387",
-        "case388",
-        "case389",
-        "case390",
-        "case391",
-        "case392",
-        "case393",
-        "case394",
-        "case395",
-        "case396",
-        "case397",
-        "case398",
-        "case399",
-        "case400",
-        "case401",
-        "case402",
-        "case403",
-        "case404",
-        "case405",
-        "case406",
-        "case407",
-        "case408",
-        "case409",
-        "case410",
-        "case411",
-        "case412",
-        "case413",
-        "case414",
-        "case415",
-        "case416",
-        "case417",
-        "case418",
-        "case419",
-        "case420",
-        "case421",
-        "case422",
-        "case423",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
-def test_sstore_combinations_initial00_2_paris(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} ->..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0x1000000000000000000000000000000000000000")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
+state_tests/stTimeConsuming/sstore_combinations_initial00_2_ParisFiller.json
 
-    pre[contract] = Account(
-        balance=10,
-        nonce=0,
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-    )
-    # Source: LLL
-    # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (REVERT 0 32) }
-    pre.deploy_contract(
-        code=Op.REVERT(offset=0x0, size=0x20) + Op.STOP,
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0x3000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-        nonce=0,
-        address=Address("0xb100000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0xb200000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=2000000,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
+@manually-enhanced: Do not overwrite. This test has been manually reviewed and
+enhanced.
+"""
diff --git a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial00_paris.py b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial00_paris.py
index 55150933e83..9c821887c4e 100644
--- a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial00_paris.py
+++ b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial00_paris.py
@@ -1,11017 +1,9 @@
 """
-sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog,...
+Sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non,...
 
 Ported from:
-tests/static/state_tests/stTimeConsuming
-sstore_combinations_initial00_ParisFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTimeConsuming/sstore_combinations_initial00_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "6000606452600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60646064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60656064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60666064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60676064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60686064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60696064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60706064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60716064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60726064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60736064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60746064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60756064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60766064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60776064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60786064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60796064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60806064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60816064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60826064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60836064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60846064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60856064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60866064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60876064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60886064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60896064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60906064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60916064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60926064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60936064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60946064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60956064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60966064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60976064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60986064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60996064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a06064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a16064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a26064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a36064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a46064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a56064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a66064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a76064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a86064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a96064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60106064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60aa6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ab6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ac6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ad6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ae6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60af6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b06064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b16064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b26064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b36064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60116064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b46064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b56064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b66064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b76064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b86064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b96064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ba6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60bb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60bc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60bd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60126064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60be6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60bf6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c06064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c16064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c26064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c36064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c46064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c56064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c66064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c76064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60136064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60016064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c86064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c96064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ca6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60cb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60cc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60cd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ce6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60cf6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d06064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d16064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60146064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d26064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d36064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d46064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d56064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d66064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d76064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d86064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d96064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60da6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60db6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60156064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60dc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60dd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60de6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60df6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e06064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e16064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e26064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e36064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e46064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e56064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60166064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e66064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e76064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e86064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e96064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ea6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60eb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ec6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ed6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ee6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ef6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60176064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f06064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f16064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f26064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f36064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f46064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f56064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f66064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f76064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f86064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f96064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60186064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60fa6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60fb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60fc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60fd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60fe6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ff6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101006064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101016064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101026064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101036064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60196064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101046064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101056064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101066064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101076064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101086064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101096064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101106064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101116064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101126064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101136064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101146064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101156064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101166064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101176064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101186064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101196064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101206064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101216064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101226064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101236064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101246064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101256064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101266064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101276064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101286064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101296064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60026064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101306064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101316064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101326064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101336064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101346064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101356064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101366064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101376064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101386064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101396064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101406064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101416064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101426064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101436064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101446064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101456064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101466064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101476064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101486064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101496064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60206064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101506064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101516064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101526064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101536064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60216064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101546064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101556064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101566064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101576064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101586064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101596064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60226064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101606064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101616064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101626064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101636064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101646064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101656064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101666064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101676064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60236064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101686064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101696064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101706064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101716064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60246064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101726064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101736064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101746064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101756064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101766064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101776064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101786064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101796064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60256064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101806064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101816064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101826064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101836064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101846064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101856064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60266064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101866064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101876064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101886064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101896064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60276064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60036064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101906064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101916064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101926064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101936064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101946064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101956064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101966064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101976064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101986064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101996064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60286064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a06064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a16064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a26064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a36064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60296064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a46064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a56064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a66064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a76064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a86064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a96064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60306064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60316064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60046064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60326064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60336064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60346064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60356064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60366064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60376064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60386064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60396064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60056064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60406064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60416064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60426064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60436064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60446064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60456064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60066064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60466064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60476064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60486064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60496064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60076064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60506064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60516064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60526064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60536064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60546064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60556064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60566064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60576064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60586064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60596064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60086064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60606064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60616064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60626064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60636064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60096064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-        "case166",
-        "case167",
-        "case168",
-        "case169",
-        "case170",
-        "case171",
-        "case172",
-        "case173",
-        "case174",
-        "case175",
-        "case176",
-        "case177",
-        "case178",
-        "case179",
-        "case180",
-        "case181",
-        "case182",
-        "case183",
-        "case184",
-        "case185",
-        "case186",
-        "case187",
-        "case188",
-        "case189",
-        "case190",
-        "case191",
-        "case192",
-        "case193",
-        "case194",
-        "case195",
-        "case196",
-        "case197",
-        "case198",
-        "case199",
-        "case200",
-        "case201",
-        "case202",
-        "case203",
-        "case204",
-        "case205",
-        "case206",
-        "case207",
-        "case208",
-        "case209",
-        "case210",
-        "case211",
-        "case212",
-        "case213",
-        "case214",
-        "case215",
-        "case216",
-        "case217",
-        "case218",
-        "case219",
-        "case220",
-        "case221",
-        "case222",
-        "case223",
-        "case224",
-        "case225",
-        "case226",
-        "case227",
-        "case228",
-        "case229",
-        "case230",
-        "case231",
-        "case232",
-        "case233",
-        "case234",
-        "case235",
-        "case236",
-        "case237",
-        "case238",
-        "case239",
-        "case240",
-        "case241",
-        "case242",
-        "case243",
-        "case244",
-        "case245",
-        "case246",
-        "case247",
-        "case248",
-        "case249",
-        "case250",
-        "case251",
-        "case252",
-        "case253",
-        "case254",
-        "case255",
-        "case256",
-        "case257",
-        "case258",
-        "case259",
-        "case260",
-        "case261",
-        "case262",
-        "case263",
-        "case264",
-        "case265",
-        "case266",
-        "case267",
-        "case268",
-        "case269",
-        "case270",
-        "case271",
-        "case272",
-        "case273",
-        "case274",
-        "case275",
-        "case276",
-        "case277",
-        "case278",
-        "case279",
-        "case280",
-        "case281",
-        "case282",
-        "case283",
-        "case284",
-        "case285",
-        "case286",
-        "case287",
-        "case288",
-        "case289",
-        "case290",
-        "case291",
-        "case292",
-        "case293",
-        "case294",
-        "case295",
-        "case296",
-        "case297",
-        "case298",
-        "case299",
-        "case300",
-        "case301",
-        "case302",
-        "case303",
-        "case304",
-        "case305",
-        "case306",
-        "case307",
-        "case308",
-        "case309",
-        "case310",
-        "case311",
-        "case312",
-        "case313",
-        "case314",
-        "case315",
-        "case316",
-        "case317",
-        "case318",
-        "case319",
-        "case320",
-        "case321",
-        "case322",
-        "case323",
-        "case324",
-        "case325",
-        "case326",
-        "case327",
-        "case328",
-        "case329",
-        "case330",
-        "case331",
-        "case332",
-        "case333",
-        "case334",
-        "case335",
-        "case336",
-        "case337",
-        "case338",
-        "case339",
-        "case340",
-        "case341",
-        "case342",
-        "case343",
-        "case344",
-        "case345",
-        "case346",
-        "case347",
-        "case348",
-        "case349",
-        "case350",
-        "case351",
-        "case352",
-        "case353",
-        "case354",
-        "case355",
-        "case356",
-        "case357",
-        "case358",
-        "case359",
-        "case360",
-        "case361",
-        "case362",
-        "case363",
-        "case364",
-        "case365",
-        "case366",
-        "case367",
-        "case368",
-        "case369",
-        "case370",
-        "case371",
-        "case372",
-        "case373",
-        "case374",
-        "case375",
-        "case376",
-        "case377",
-        "case378",
-        "case379",
-        "case380",
-        "case381",
-        "case382",
-        "case383",
-        "case384",
-        "case385",
-        "case386",
-        "case387",
-        "case388",
-        "case389",
-        "case390",
-        "case391",
-        "case392",
-        "case393",
-        "case394",
-        "case395",
-        "case396",
-        "case397",
-        "case398",
-        "case399",
-        "case400",
-        "case401",
-        "case402",
-        "case403",
-        "case404",
-        "case405",
-        "case406",
-        "case407",
-        "case408",
-        "case409",
-        "case410",
-        "case411",
-        "case412",
-        "case413",
-        "case414",
-        "case415",
-        "case416",
-        "case417",
-        "case418",
-        "case419",
-        "case420",
-        "case421",
-        "case422",
-        "case423",
-        "case424",
-        "case425",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
-def test_sstore_combinations_initial00_paris(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} ->..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0x1000000000000000000000000000000000000000")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
+state_tests/stTimeConsuming/sstore_combinations_initial00_ParisFiller.json
 
-    pre[contract] = Account(
-        balance=10,
-        nonce=0,
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-    )
-    # Source: LLL
-    # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (REVERT 0 32) }
-    pre.deploy_contract(
-        code=Op.REVERT(offset=0x0, size=0x20) + Op.STOP,
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0x3000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-        nonce=0,
-        address=Address("0xb100000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0xb200000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=2000000,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
+@manually-enhanced: Do not overwrite. This test has been manually reviewed and
+enhanced.
+"""
diff --git a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial01_2_paris.py b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial01_2_paris.py
index 5bd121e10c5..dc958c5727b 100644
--- a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial01_2_paris.py
+++ b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial01_2_paris.py
@@ -1,11365 +1,9 @@
 """
-sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog,...
+Sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non,...
 
 Ported from:
-tests/static/state_tests/stTimeConsuming
-sstore_combinations_initial01_2_ParisFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTimeConsuming/sstore_combinations_initial01_2_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "6104fc606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610560606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610561606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610562606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610563606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610564606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610565606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610566606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610567606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610568606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610569606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610506606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610570606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610571606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610572606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610573606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610507606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610574606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610575606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610576606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610577606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610578606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610579606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610508606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610580606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610581606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610582606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610583606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610584606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610585606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610586606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610587606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610509606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610588606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610589606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610590606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610591606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610592606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610593606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610594606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610595606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610596606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610597606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610598606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610599606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a0606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a1606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a2606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a3606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a4606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a5606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a6606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a7606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a8606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a9606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105aa606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ab606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ac606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ad606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ae606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105af606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b0606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b1606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b2606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b3606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b4606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b5606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b6606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b7606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b8606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b9606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ba606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105bb606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105bc606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105bd606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105be606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105bf606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c0606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c1606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c2606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c3606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104fd606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c4606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c5606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c6606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c7606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c8606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c9606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ca606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105cb606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105cc606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105cd606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610510606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ce606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105cf606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d0606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d1606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d2606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d3606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d4606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d5606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d6606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d7606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610511606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d8606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d9606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105da606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105db606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105dc606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105dd606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105de606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105df606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e0606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e1606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610512606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e2606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e3606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e4606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e5606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e6606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e7606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e8606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e9606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ea606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105eb606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610513606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ec606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ed606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ee606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ef606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f0606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f1606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f2606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f3606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f4606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f5606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610514606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f6606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f7606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f8606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f9606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105fa606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105fb606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105fc606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105fd606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105fe606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ff606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610515606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610600606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610601606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610602606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610603606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610604606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610605606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610606606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610607606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610608606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610609606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610516606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610610606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610611606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610612606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610613606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610517606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610614606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610615606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610616606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610617606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610618606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610619606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610518606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610620606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610621606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610622606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610623606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610624606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610625606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610626606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610627606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610519606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104fe606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610628606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610629606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610630606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610631606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610632606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610633606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610634606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610635606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610636606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610637606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610638606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610639606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610640606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610641606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610642606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610643606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610644606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610645606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610646606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610647606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610648606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610649606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610650606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610651606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610652606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610653606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610654606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610655606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610656606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610657606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610658606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610659606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610660606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610661606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610662606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610663606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610664606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610665606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610666606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610667606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610668606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610669606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610520606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610670606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610671606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610672606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610673606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610674606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610675606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610676606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610677606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610521606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610678606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610679606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610680606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610681606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610522606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610682606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610683606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610684606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610685606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610686606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610687606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610688606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610689606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610523606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ff606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610690606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610691606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610692606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610693606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610694606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610695606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610524606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610696606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610697606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610698606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610699606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610525606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a0606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a1606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a2606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a3606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a4606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a5606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a6606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a7606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a8606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a9606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610526606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106aa606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106ab606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106ac606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106ad606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106ae606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106af606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b0606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b1606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b2606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b3606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610527606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b4606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b5606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b6606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b7606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b8606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b9606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106ba606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106bb606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106bc606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106bd606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610528606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106be606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106bf606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106c0606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610529606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610500606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610530606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610531606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610532606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610533606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610534606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610535606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610536606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610537606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610501606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610538606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610539606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610540606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610541606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610502606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610542606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610543606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610544606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610545606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610546606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610547606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610548606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610549606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610503606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610550606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610551606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610552606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610553606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610554606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610555606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610504606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610556606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610557606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610558606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610559606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610505606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-        "case166",
-        "case167",
-        "case168",
-        "case169",
-        "case170",
-        "case171",
-        "case172",
-        "case173",
-        "case174",
-        "case175",
-        "case176",
-        "case177",
-        "case178",
-        "case179",
-        "case180",
-        "case181",
-        "case182",
-        "case183",
-        "case184",
-        "case185",
-        "case186",
-        "case187",
-        "case188",
-        "case189",
-        "case190",
-        "case191",
-        "case192",
-        "case193",
-        "case194",
-        "case195",
-        "case196",
-        "case197",
-        "case198",
-        "case199",
-        "case200",
-        "case201",
-        "case202",
-        "case203",
-        "case204",
-        "case205",
-        "case206",
-        "case207",
-        "case208",
-        "case209",
-        "case210",
-        "case211",
-        "case212",
-        "case213",
-        "case214",
-        "case215",
-        "case216",
-        "case217",
-        "case218",
-        "case219",
-        "case220",
-        "case221",
-        "case222",
-        "case223",
-        "case224",
-        "case225",
-        "case226",
-        "case227",
-        "case228",
-        "case229",
-        "case230",
-        "case231",
-        "case232",
-        "case233",
-        "case234",
-        "case235",
-        "case236",
-        "case237",
-        "case238",
-        "case239",
-        "case240",
-        "case241",
-        "case242",
-        "case243",
-        "case244",
-        "case245",
-        "case246",
-        "case247",
-        "case248",
-        "case249",
-        "case250",
-        "case251",
-        "case252",
-        "case253",
-        "case254",
-        "case255",
-        "case256",
-        "case257",
-        "case258",
-        "case259",
-        "case260",
-        "case261",
-        "case262",
-        "case263",
-        "case264",
-        "case265",
-        "case266",
-        "case267",
-        "case268",
-        "case269",
-        "case270",
-        "case271",
-        "case272",
-        "case273",
-        "case274",
-        "case275",
-        "case276",
-        "case277",
-        "case278",
-        "case279",
-        "case280",
-        "case281",
-        "case282",
-        "case283",
-        "case284",
-        "case285",
-        "case286",
-        "case287",
-        "case288",
-        "case289",
-        "case290",
-        "case291",
-        "case292",
-        "case293",
-        "case294",
-        "case295",
-        "case296",
-        "case297",
-        "case298",
-        "case299",
-        "case300",
-        "case301",
-        "case302",
-        "case303",
-        "case304",
-        "case305",
-        "case306",
-        "case307",
-        "case308",
-        "case309",
-        "case310",
-        "case311",
-        "case312",
-        "case313",
-        "case314",
-        "case315",
-        "case316",
-        "case317",
-        "case318",
-        "case319",
-        "case320",
-        "case321",
-        "case322",
-        "case323",
-        "case324",
-        "case325",
-        "case326",
-        "case327",
-        "case328",
-        "case329",
-        "case330",
-        "case331",
-        "case332",
-        "case333",
-        "case334",
-        "case335",
-        "case336",
-        "case337",
-        "case338",
-        "case339",
-        "case340",
-        "case341",
-        "case342",
-        "case343",
-        "case344",
-        "case345",
-        "case346",
-        "case347",
-        "case348",
-        "case349",
-        "case350",
-        "case351",
-        "case352",
-        "case353",
-        "case354",
-        "case355",
-        "case356",
-        "case357",
-        "case358",
-        "case359",
-        "case360",
-        "case361",
-        "case362",
-        "case363",
-        "case364",
-        "case365",
-        "case366",
-        "case367",
-        "case368",
-        "case369",
-        "case370",
-        "case371",
-        "case372",
-        "case373",
-        "case374",
-        "case375",
-        "case376",
-        "case377",
-        "case378",
-        "case379",
-        "case380",
-        "case381",
-        "case382",
-        "case383",
-        "case384",
-        "case385",
-        "case386",
-        "case387",
-        "case388",
-        "case389",
-        "case390",
-        "case391",
-        "case392",
-        "case393",
-        "case394",
-        "case395",
-        "case396",
-        "case397",
-        "case398",
-        "case399",
-        "case400",
-        "case401",
-        "case402",
-        "case403",
-        "case404",
-        "case405",
-        "case406",
-        "case407",
-        "case408",
-        "case409",
-        "case410",
-        "case411",
-        "case412",
-        "case413",
-        "case414",
-        "case415",
-        "case416",
-        "case417",
-        "case418",
-        "case419",
-        "case420",
-        "case421",
-        "case422",
-        "case423",
-        "case424",
-        "case425",
-        "case426",
-        "case427",
-        "case428",
-        "case429",
-        "case430",
-        "case431",
-        "case432",
-        "case433",
-        "case434",
-        "case435",
-        "case436",
-        "case437",
-        "case438",
-        "case439",
-        "case440",
-        "case441",
-        "case442",
-        "case443",
-        "case444",
-        "case445",
-        "case446",
-        "case447",
-        "case448",
-        "case449",
-        "case450",
-        "case451",
-        "case452",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
-def test_sstore_combinations_initial01_2_paris(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} ->..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0x1000000000000000000000000000000000000000")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
+state_tests/stTimeConsuming/sstore_combinations_initial01_2_ParisFiller.json
 
-    pre[contract] = Account(
-        balance=10,
-        nonce=0,
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-    )
-    # Source: LLL
-    # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (REVERT 0 32) }
-    pre.deploy_contract(
-        code=Op.REVERT(offset=0x0, size=0x20) + Op.STOP,
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0x3000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-        nonce=0,
-        address=Address("0xb100000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0xb200000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=2000000,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
+@manually-enhanced: Do not overwrite. This test has been manually reviewed and
+enhanced.
+"""
diff --git a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial01_paris.py b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial01_paris.py
index ca63a5b1e5d..a250ef8d6d3 100644
--- a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial01_paris.py
+++ b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial01_paris.py
@@ -1,10717 +1,9 @@
 """
-sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog,...
+Sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non,...
 
 Ported from:
-tests/static/state_tests/stTimeConsuming
-sstore_combinations_initial01_ParisFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTimeConsuming/sstore_combinations_initial01_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "6103526064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b66064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b76064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b86064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b96064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ba6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103bb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103bc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103bd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103be6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103bf6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c06064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c16064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c26064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c36064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c46064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c56064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c66064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c76064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c86064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c96064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ca6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103cb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103cc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103cd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ce6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103cf6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d06064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d16064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d26064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d36064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d46064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d56064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d66064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d76064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d86064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d96064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103da6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103db6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103dc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103dd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103de6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103df6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e06064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e16064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e26064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e36064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e46064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e56064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e66064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e76064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103606064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e86064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e96064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ea6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103eb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ec6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ed6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ee6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ef6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f06064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f16064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103616064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f26064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f36064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f46064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f56064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f66064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f76064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f86064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f96064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103fa6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103fb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103626064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103fc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103fd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103fe6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ff6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104006064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104016064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104026064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104036064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104046064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104056064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103636064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104066064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104076064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104086064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104096064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103646064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104106064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104116064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104126064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104136064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104146064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104156064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104166064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104176064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104186064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104196064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103656064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103536064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104206064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104216064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104226064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104236064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103666064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104246064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104256064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104266064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104276064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104286064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104296064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103676064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104306064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104316064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104326064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104336064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104346064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104356064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104366064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104376064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103686064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104386064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104396064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104406064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104416064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103696064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104426064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104436064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104446064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104456064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104466064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104476064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104486064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104496064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104506064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104516064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104526064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104536064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104546064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104556064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104566064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104576064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104586064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104596064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104606064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104616064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104626064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104636064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104646064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104656064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104666064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104676064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104686064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104696064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104706064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104716064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104726064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104736064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104746064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104756064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104766064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104776064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104786064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104796064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103546064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104806064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610481606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610482606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610483606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610484606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610485606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610486606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610487606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103706064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610488606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610489606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610490606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610491606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103716064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610492606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610493606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610494606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610495606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610496606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610497606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610498606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610499606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103726064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a0606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a1606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a2606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a3606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a4606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a5606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103736064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a6606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a7606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a8606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a9606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104aa606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ab606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ac606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ad606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ae606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104af606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103746064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b0606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b1606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b2606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b3606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b4606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b5606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b6606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b7606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b8606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b9606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103756064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ba606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104bb606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104bc606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104bd606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104be606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104bf606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c0606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c1606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c2606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c3606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103766064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c4606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c5606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c6606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c7606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c8606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c9606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ca606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104cb606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104cc606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104cd606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103776064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ce606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104cf606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d0606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d1606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d2606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d3606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d4606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d5606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d6606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d7606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103786064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d8606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d9606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104da606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104db606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104dc606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104dd606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104de606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104df606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e0606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e1606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103796064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103556064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e2606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e3606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e4606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e5606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e6606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e7606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e8606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e9606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ea606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104eb606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ec606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ed606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ee606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ef606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f0606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f1606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f2606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f3606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f4606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f5606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f6606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f7606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f8606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f9606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104fa606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104fb606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103806064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103816064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103826064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103836064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103566064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103846064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103856064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103866064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103876064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103886064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103896064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103576064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103906064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103916064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103926064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103936064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103946064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103956064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103966064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103976064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103586064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103986064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103996064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a06064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a16064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103596064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a26064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a36064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a46064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a56064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a66064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a76064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a86064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb000000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a96064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103aa6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ab6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ac6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ad6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ae6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103af6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b06064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b16064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b26064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b36064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b46064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b56064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-        "case166",
-        "case167",
-        "case168",
-        "case169",
-        "case170",
-        "case171",
-        "case172",
-        "case173",
-        "case174",
-        "case175",
-        "case176",
-        "case177",
-        "case178",
-        "case179",
-        "case180",
-        "case181",
-        "case182",
-        "case183",
-        "case184",
-        "case185",
-        "case186",
-        "case187",
-        "case188",
-        "case189",
-        "case190",
-        "case191",
-        "case192",
-        "case193",
-        "case194",
-        "case195",
-        "case196",
-        "case197",
-        "case198",
-        "case199",
-        "case200",
-        "case201",
-        "case202",
-        "case203",
-        "case204",
-        "case205",
-        "case206",
-        "case207",
-        "case208",
-        "case209",
-        "case210",
-        "case211",
-        "case212",
-        "case213",
-        "case214",
-        "case215",
-        "case216",
-        "case217",
-        "case218",
-        "case219",
-        "case220",
-        "case221",
-        "case222",
-        "case223",
-        "case224",
-        "case225",
-        "case226",
-        "case227",
-        "case228",
-        "case229",
-        "case230",
-        "case231",
-        "case232",
-        "case233",
-        "case234",
-        "case235",
-        "case236",
-        "case237",
-        "case238",
-        "case239",
-        "case240",
-        "case241",
-        "case242",
-        "case243",
-        "case244",
-        "case245",
-        "case246",
-        "case247",
-        "case248",
-        "case249",
-        "case250",
-        "case251",
-        "case252",
-        "case253",
-        "case254",
-        "case255",
-        "case256",
-        "case257",
-        "case258",
-        "case259",
-        "case260",
-        "case261",
-        "case262",
-        "case263",
-        "case264",
-        "case265",
-        "case266",
-        "case267",
-        "case268",
-        "case269",
-        "case270",
-        "case271",
-        "case272",
-        "case273",
-        "case274",
-        "case275",
-        "case276",
-        "case277",
-        "case278",
-        "case279",
-        "case280",
-        "case281",
-        "case282",
-        "case283",
-        "case284",
-        "case285",
-        "case286",
-        "case287",
-        "case288",
-        "case289",
-        "case290",
-        "case291",
-        "case292",
-        "case293",
-        "case294",
-        "case295",
-        "case296",
-        "case297",
-        "case298",
-        "case299",
-        "case300",
-        "case301",
-        "case302",
-        "case303",
-        "case304",
-        "case305",
-        "case306",
-        "case307",
-        "case308",
-        "case309",
-        "case310",
-        "case311",
-        "case312",
-        "case313",
-        "case314",
-        "case315",
-        "case316",
-        "case317",
-        "case318",
-        "case319",
-        "case320",
-        "case321",
-        "case322",
-        "case323",
-        "case324",
-        "case325",
-        "case326",
-        "case327",
-        "case328",
-        "case329",
-        "case330",
-        "case331",
-        "case332",
-        "case333",
-        "case334",
-        "case335",
-        "case336",
-        "case337",
-        "case338",
-        "case339",
-        "case340",
-        "case341",
-        "case342",
-        "case343",
-        "case344",
-        "case345",
-        "case346",
-        "case347",
-        "case348",
-        "case349",
-        "case350",
-        "case351",
-        "case352",
-        "case353",
-        "case354",
-        "case355",
-        "case356",
-        "case357",
-        "case358",
-        "case359",
-        "case360",
-        "case361",
-        "case362",
-        "case363",
-        "case364",
-        "case365",
-        "case366",
-        "case367",
-        "case368",
-        "case369",
-        "case370",
-        "case371",
-        "case372",
-        "case373",
-        "case374",
-        "case375",
-        "case376",
-        "case377",
-        "case378",
-        "case379",
-        "case380",
-        "case381",
-        "case382",
-        "case383",
-        "case384",
-        "case385",
-        "case386",
-        "case387",
-        "case388",
-        "case389",
-        "case390",
-        "case391",
-        "case392",
-        "case393",
-        "case394",
-        "case395",
-        "case396",
-        "case397",
-        "case398",
-        "case399",
-        "case400",
-        "case401",
-        "case402",
-        "case403",
-        "case404",
-        "case405",
-        "case406",
-        "case407",
-        "case408",
-        "case409",
-        "case410",
-        "case411",
-        "case412",
-        "case413",
-        "case414",
-        "case415",
-        "case416",
-        "case417",
-        "case418",
-        "case419",
-        "case420",
-        "case421",
-        "case422",
-        "case423",
-        "case424",
-        "case425",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
-def test_sstore_combinations_initial01_paris(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} ->..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0x1000000000000000000000000000000000000000")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
+state_tests/stTimeConsuming/sstore_combinations_initial01_ParisFiller.json
 
-    pre[contract] = Account(
-        balance=10,
-        nonce=0,
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-    )
-    # Source: LLL
-    # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (REVERT 0 32) }
-    pre.deploy_contract(
-        code=Op.REVERT(offset=0x0, size=0x20) + Op.STOP,
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0x3000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-        nonce=0,
-        address=Address("0xb100000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0xb200000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=2000000,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
+@manually-enhanced: Do not overwrite. This test has been manually reviewed and
+enhanced.
+"""
diff --git a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial10_2_paris.py b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial10_2_paris.py
index f86a3103bf0..6683ac46497 100644
--- a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial10_2_paris.py
+++ b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial10_2_paris.py
@@ -1,10129 +1,9 @@
 """
-sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog,...
+Sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non,...
 
 Ported from:
-tests/static/state_tests/stTimeConsuming
-sstore_combinations_initial10_2_ParisFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTimeConsuming/sstore_combinations_initial10_2_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "6101aa6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102106064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102116064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102126064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102136064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102146064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102156064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102166064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102176064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b46064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102186064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102196064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102206064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102216064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b56064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102226064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102236064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102246064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102256064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102266064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102276064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102286064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102296064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b66064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102306064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102316064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102326064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102336064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102346064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102356064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b76064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102366064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102376064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102386064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102396064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b86064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102406064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102416064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102426064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102436064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102446064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102456064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102466064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102476064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102486064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102496064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b96064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102506064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102516064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102526064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102536064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ba6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102546064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102556064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102566064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102576064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102586064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102596064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101bb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102606064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102616064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102626064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102636064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102646064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102656064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102666064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102676064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101bc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102686064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102696064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102706064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102716064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101bd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ab6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102726064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102736064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102746064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102756064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102766064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102776064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102786064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102796064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101be6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102806064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102816064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102826064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102836064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102846064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102856064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101bf6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102866064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102876064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102886064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102896064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c06064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102906064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102916064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102926064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102936064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102946064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102956064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102966064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102976064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102986064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102996064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c16064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a06064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a16064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a26064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a36064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c26064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a46064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a56064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a66064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a76064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a86064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a96064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102aa6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ab6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ac6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ad6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c36064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ae6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102af6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b06064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b16064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b26064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b36064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b46064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b56064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b66064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b76064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c46064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b86064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b96064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ba6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102bb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102bc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102bd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102be6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102bf6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c06064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c16064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c56064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c26064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c36064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c46064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c56064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c66064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c76064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c86064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c96064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ca6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102cb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c66064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102cc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102cd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ce6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102cf6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d06064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d16064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d26064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d36064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d46064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d56064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c76064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ac6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d66064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d76064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d86064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d96064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102da6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102db6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102dc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102dd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102de6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102df6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c86064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e06064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e16064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e26064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e36064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e46064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e56064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e66064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e76064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e86064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e96064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c96064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ea6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102eb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ec6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ed6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ee6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ef6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f06064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f16064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f26064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f36064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ca6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f46064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f56064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f66064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f76064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f86064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f96064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102fa6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102fb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102fc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102fd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101cb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102fe6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ff6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103006064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103016064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103026064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103036064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103046064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103056064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103066064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103076064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101cc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103086064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103096064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103106064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103116064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101cd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103126064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103136064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103146064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103156064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103166064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103176064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103186064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103196064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ce6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103206064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103216064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103226064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103236064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103246064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103256064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101cf6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103266064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103276064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103286064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103296064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d06064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103306064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103316064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103326064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103336064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103346064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103356064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103366064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103376064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103386064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103396064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d16064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ad6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103406064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103416064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103426064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103436064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d26064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103446064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103456064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103466064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103476064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103486064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103496064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d36064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103506064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103516064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d46064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d56064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d66064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d76064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d86064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d96064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101da6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101db6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ae6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101dc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101dd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101de6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101df6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e06064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e16064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e26064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e36064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e46064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e56064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101af6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e66064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e76064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e86064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e96064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ea6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101eb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ec6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ed6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ee6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ef6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b06064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f06064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f16064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f26064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f36064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f46064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f56064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f66064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f76064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f86064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f96064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b16064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101fa6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101fb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101fc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101fd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101fe6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ff6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102006064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102016064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102026064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102036064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b26064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102046064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102056064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102066064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102076064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102086064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102096064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b36064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-        "case166",
-        "case167",
-        "case168",
-        "case169",
-        "case170",
-        "case171",
-        "case172",
-        "case173",
-        "case174",
-        "case175",
-        "case176",
-        "case177",
-        "case178",
-        "case179",
-        "case180",
-        "case181",
-        "case182",
-        "case183",
-        "case184",
-        "case185",
-        "case186",
-        "case187",
-        "case188",
-        "case189",
-        "case190",
-        "case191",
-        "case192",
-        "case193",
-        "case194",
-        "case195",
-        "case196",
-        "case197",
-        "case198",
-        "case199",
-        "case200",
-        "case201",
-        "case202",
-        "case203",
-        "case204",
-        "case205",
-        "case206",
-        "case207",
-        "case208",
-        "case209",
-        "case210",
-        "case211",
-        "case212",
-        "case213",
-        "case214",
-        "case215",
-        "case216",
-        "case217",
-        "case218",
-        "case219",
-        "case220",
-        "case221",
-        "case222",
-        "case223",
-        "case224",
-        "case225",
-        "case226",
-        "case227",
-        "case228",
-        "case229",
-        "case230",
-        "case231",
-        "case232",
-        "case233",
-        "case234",
-        "case235",
-        "case236",
-        "case237",
-        "case238",
-        "case239",
-        "case240",
-        "case241",
-        "case242",
-        "case243",
-        "case244",
-        "case245",
-        "case246",
-        "case247",
-        "case248",
-        "case249",
-        "case250",
-        "case251",
-        "case252",
-        "case253",
-        "case254",
-        "case255",
-        "case256",
-        "case257",
-        "case258",
-        "case259",
-        "case260",
-        "case261",
-        "case262",
-        "case263",
-        "case264",
-        "case265",
-        "case266",
-        "case267",
-        "case268",
-        "case269",
-        "case270",
-        "case271",
-        "case272",
-        "case273",
-        "case274",
-        "case275",
-        "case276",
-        "case277",
-        "case278",
-        "case279",
-        "case280",
-        "case281",
-        "case282",
-        "case283",
-        "case284",
-        "case285",
-        "case286",
-        "case287",
-        "case288",
-        "case289",
-        "case290",
-        "case291",
-        "case292",
-        "case293",
-        "case294",
-        "case295",
-        "case296",
-        "case297",
-        "case298",
-        "case299",
-        "case300",
-        "case301",
-        "case302",
-        "case303",
-        "case304",
-        "case305",
-        "case306",
-        "case307",
-        "case308",
-        "case309",
-        "case310",
-        "case311",
-        "case312",
-        "case313",
-        "case314",
-        "case315",
-        "case316",
-        "case317",
-        "case318",
-        "case319",
-        "case320",
-        "case321",
-        "case322",
-        "case323",
-        "case324",
-        "case325",
-        "case326",
-        "case327",
-        "case328",
-        "case329",
-        "case330",
-        "case331",
-        "case332",
-        "case333",
-        "case334",
-        "case335",
-        "case336",
-        "case337",
-        "case338",
-        "case339",
-        "case340",
-        "case341",
-        "case342",
-        "case343",
-        "case344",
-        "case345",
-        "case346",
-        "case347",
-        "case348",
-        "case349",
-        "case350",
-        "case351",
-        "case352",
-        "case353",
-        "case354",
-        "case355",
-        "case356",
-        "case357",
-        "case358",
-        "case359",
-        "case360",
-        "case361",
-        "case362",
-        "case363",
-        "case364",
-        "case365",
-        "case366",
-        "case367",
-        "case368",
-        "case369",
-        "case370",
-        "case371",
-        "case372",
-        "case373",
-        "case374",
-        "case375",
-        "case376",
-        "case377",
-        "case378",
-        "case379",
-        "case380",
-        "case381",
-        "case382",
-        "case383",
-        "case384",
-        "case385",
-        "case386",
-        "case387",
-        "case388",
-        "case389",
-        "case390",
-        "case391",
-        "case392",
-        "case393",
-        "case394",
-        "case395",
-        "case396",
-        "case397",
-        "case398",
-        "case399",
-        "case400",
-        "case401",
-        "case402",
-        "case403",
-        "case404",
-        "case405",
-        "case406",
-        "case407",
-        "case408",
-        "case409",
-        "case410",
-        "case411",
-        "case412",
-        "case413",
-        "case414",
-        "case415",
-        "case416",
-        "case417",
-        "case418",
-        "case419",
-        "case420",
-        "case421",
-        "case422",
-        "case423",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
-def test_sstore_combinations_initial10_2_paris(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} ->..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0x1000000000000000000000000000000000000000")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
+state_tests/stTimeConsuming/sstore_combinations_initial10_2_ParisFiller.json
 
-    pre[contract] = Account(
-        balance=10,
-        nonce=0,
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-    )
-    # Source: LLL
-    # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (REVERT 0 32) }
-    pre.deploy_contract(
-        code=Op.REVERT(offset=0x0, size=0x20) + Op.STOP,
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0x3000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-        nonce=0,
-        address=Address("0xb100000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0xb200000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=2000000,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
+@manually-enhanced: Do not overwrite. This test has been manually reviewed and
+enhanced.
+"""
diff --git a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial10_paris.py b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial10_paris.py
index a1a18bccc86..4d42979ef1a 100644
--- a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial10_paris.py
+++ b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial10_paris.py
@@ -1,9742 +1,9 @@
 """
-sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog,...
+Sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non,...
 
 Ported from:
-tests/static/state_tests/stTimeConsuming
-sstore_combinations_initial10_ParisFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTimeConsuming/sstore_combinations_initial10_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "6000606452600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60646064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60656064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60666064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60676064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60686064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60696064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60706064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60716064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60726064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60736064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60746064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60756064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60766064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60776064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60786064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60796064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60806064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60816064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60826064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60836064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60846064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60856064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60866064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60876064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60886064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60896064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60906064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60916064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60926064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60936064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60946064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60956064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60966064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60976064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60986064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60996064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a06064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a16064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a26064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a36064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a46064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a56064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a66064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a76064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a86064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a96064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60106064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60aa6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ab6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ac6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ad6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ae6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60af6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b06064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b16064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b26064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b36064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60116064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b46064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b56064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b66064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b76064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b86064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b96064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ba6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60bb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60bc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60bd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60126064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60be6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60bf6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c06064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c16064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c26064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c36064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c46064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c56064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c66064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c76064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60136064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60016064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c86064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c96064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ca6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60cb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60cc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60cd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ce6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60cf6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d06064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d16064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60146064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d26064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d36064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d46064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d56064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d66064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d76064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d86064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d96064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60da6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60db6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60156064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60dc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60dd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60de6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60df6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e06064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e16064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e26064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e36064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e46064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e56064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60166064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e66064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e76064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e86064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e96064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ea6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60eb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ec6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ed6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ee6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ef6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60176064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f06064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f16064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f26064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f36064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f46064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f56064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f66064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f76064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f86064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f96064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60186064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60fa6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60fb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60fc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60fd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60fe6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ff6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101006064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101016064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101026064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101036064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60196064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101046064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101056064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101066064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101076064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101086064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101096064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101106064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101116064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101126064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101136064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101146064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101156064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101166064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101176064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101186064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101196064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101206064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101216064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101226064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101236064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101246064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101256064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101266064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101276064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101286064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101296064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60026064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101306064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101316064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101326064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101336064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101346064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101356064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101366064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101376064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101386064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101396064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101406064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101416064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101426064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101436064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101446064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101456064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101466064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101476064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101486064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101496064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60206064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101506064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101516064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101526064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101536064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60216064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101546064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101556064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101566064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101576064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101586064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101596064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60226064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101606064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101616064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101626064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101636064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101646064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101656064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101666064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101676064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60236064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101686064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101696064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101706064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101716064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60246064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101726064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101736064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101746064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101756064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101766064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101776064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101786064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101796064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60256064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101806064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101816064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101826064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101836064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101846064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101856064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60266064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101866064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101876064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101886064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101896064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60276064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60036064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101906064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101916064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101926064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101936064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101946064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101956064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101966064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101976064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101986064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101996064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60286064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a06064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a16064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a26064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a36064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60296064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a46064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a56064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a66064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a76064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a86064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a96064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60306064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60316064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60046064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60326064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60336064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60346064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60356064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60366064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60376064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60386064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60396064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60056064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60406064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60416064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60426064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60436064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60446064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60456064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60066064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60466064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60476064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60486064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60496064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60076064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60506064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60516064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60526064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60536064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60546064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60556064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60566064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60576064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60586064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60596064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60086064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60606064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60616064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60626064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60636064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60096064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-        "case166",
-        "case167",
-        "case168",
-        "case169",
-        "case170",
-        "case171",
-        "case172",
-        "case173",
-        "case174",
-        "case175",
-        "case176",
-        "case177",
-        "case178",
-        "case179",
-        "case180",
-        "case181",
-        "case182",
-        "case183",
-        "case184",
-        "case185",
-        "case186",
-        "case187",
-        "case188",
-        "case189",
-        "case190",
-        "case191",
-        "case192",
-        "case193",
-        "case194",
-        "case195",
-        "case196",
-        "case197",
-        "case198",
-        "case199",
-        "case200",
-        "case201",
-        "case202",
-        "case203",
-        "case204",
-        "case205",
-        "case206",
-        "case207",
-        "case208",
-        "case209",
-        "case210",
-        "case211",
-        "case212",
-        "case213",
-        "case214",
-        "case215",
-        "case216",
-        "case217",
-        "case218",
-        "case219",
-        "case220",
-        "case221",
-        "case222",
-        "case223",
-        "case224",
-        "case225",
-        "case226",
-        "case227",
-        "case228",
-        "case229",
-        "case230",
-        "case231",
-        "case232",
-        "case233",
-        "case234",
-        "case235",
-        "case236",
-        "case237",
-        "case238",
-        "case239",
-        "case240",
-        "case241",
-        "case242",
-        "case243",
-        "case244",
-        "case245",
-        "case246",
-        "case247",
-        "case248",
-        "case249",
-        "case250",
-        "case251",
-        "case252",
-        "case253",
-        "case254",
-        "case255",
-        "case256",
-        "case257",
-        "case258",
-        "case259",
-        "case260",
-        "case261",
-        "case262",
-        "case263",
-        "case264",
-        "case265",
-        "case266",
-        "case267",
-        "case268",
-        "case269",
-        "case270",
-        "case271",
-        "case272",
-        "case273",
-        "case274",
-        "case275",
-        "case276",
-        "case277",
-        "case278",
-        "case279",
-        "case280",
-        "case281",
-        "case282",
-        "case283",
-        "case284",
-        "case285",
-        "case286",
-        "case287",
-        "case288",
-        "case289",
-        "case290",
-        "case291",
-        "case292",
-        "case293",
-        "case294",
-        "case295",
-        "case296",
-        "case297",
-        "case298",
-        "case299",
-        "case300",
-        "case301",
-        "case302",
-        "case303",
-        "case304",
-        "case305",
-        "case306",
-        "case307",
-        "case308",
-        "case309",
-        "case310",
-        "case311",
-        "case312",
-        "case313",
-        "case314",
-        "case315",
-        "case316",
-        "case317",
-        "case318",
-        "case319",
-        "case320",
-        "case321",
-        "case322",
-        "case323",
-        "case324",
-        "case325",
-        "case326",
-        "case327",
-        "case328",
-        "case329",
-        "case330",
-        "case331",
-        "case332",
-        "case333",
-        "case334",
-        "case335",
-        "case336",
-        "case337",
-        "case338",
-        "case339",
-        "case340",
-        "case341",
-        "case342",
-        "case343",
-        "case344",
-        "case345",
-        "case346",
-        "case347",
-        "case348",
-        "case349",
-        "case350",
-        "case351",
-        "case352",
-        "case353",
-        "case354",
-        "case355",
-        "case356",
-        "case357",
-        "case358",
-        "case359",
-        "case360",
-        "case361",
-        "case362",
-        "case363",
-        "case364",
-        "case365",
-        "case366",
-        "case367",
-        "case368",
-        "case369",
-        "case370",
-        "case371",
-        "case372",
-        "case373",
-        "case374",
-        "case375",
-        "case376",
-        "case377",
-        "case378",
-        "case379",
-        "case380",
-        "case381",
-        "case382",
-        "case383",
-        "case384",
-        "case385",
-        "case386",
-        "case387",
-        "case388",
-        "case389",
-        "case390",
-        "case391",
-        "case392",
-        "case393",
-        "case394",
-        "case395",
-        "case396",
-        "case397",
-        "case398",
-        "case399",
-        "case400",
-        "case401",
-        "case402",
-        "case403",
-        "case404",
-        "case405",
-        "case406",
-        "case407",
-        "case408",
-        "case409",
-        "case410",
-        "case411",
-        "case412",
-        "case413",
-        "case414",
-        "case415",
-        "case416",
-        "case417",
-        "case418",
-        "case419",
-        "case420",
-        "case421",
-        "case422",
-        "case423",
-        "case424",
-        "case425",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
-def test_sstore_combinations_initial10_paris(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} ->..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0x1000000000000000000000000000000000000000")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
+state_tests/stTimeConsuming/sstore_combinations_initial10_ParisFiller.json
 
-    pre[contract] = Account(
-        balance=10,
-        nonce=0,
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-    )
-    # Source: LLL
-    # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (REVERT 0 32) }
-    pre.deploy_contract(
-        code=Op.REVERT(offset=0x0, size=0x20) + Op.STOP,
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0x3000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-        nonce=0,
-        address=Address("0xb100000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0xb200000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=2000000,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
+@manually-enhanced: Do not overwrite. This test has been manually reviewed and
+enhanced.
+"""
diff --git a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial11_2_paris.py b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial11_2_paris.py
index 354b97639b1..b5dbadc5c67 100644
--- a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial11_2_paris.py
+++ b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial11_2_paris.py
@@ -1,11041 +1,9 @@
 """
-sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog,...
+Sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non,...
 
 Ported from:
-tests/static/state_tests/stTimeConsuming
-sstore_combinations_initial11_2_ParisFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTimeConsuming/sstore_combinations_initial11_2_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "6104fc606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610560606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610561606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610562606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610563606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610564606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610565606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610566606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610567606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610568606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610569606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610506606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610570606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610571606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610572606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610573606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610507606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610574606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610575606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610576606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610577606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610578606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610579606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610508606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610580606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610581606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610582606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610583606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610584606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610585606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610586606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610587606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610509606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610588606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610589606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610590606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610591606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610592606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610593606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610594606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610595606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610596606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610597606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610598606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610599606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a0606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a1606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a2606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a3606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a4606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a5606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a6606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a7606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a8606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a9606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105aa606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ab606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ac606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ad606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ae606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105af606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b0606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b1606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b2606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b3606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b4606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b5606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b6606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b7606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b8606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b9606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ba606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105bb606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105bc606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105bd606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105be606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105bf606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c0606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c1606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c2606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c3606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104fd606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c4606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c5606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c6606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c7606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c8606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c9606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ca606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105cb606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105cc606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105cd606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610510606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ce606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105cf606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d0606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d1606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d2606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d3606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d4606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d5606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d6606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d7606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610511606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d8606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d9606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105da606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105db606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105dc606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105dd606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105de606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105df606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e0606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e1606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610512606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e2606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e3606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e4606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e5606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e6606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e7606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e8606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e9606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ea606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105eb606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610513606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ec606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ed606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ee606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ef606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f0606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f1606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f2606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f3606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f4606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f5606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610514606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f6606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f7606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f8606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f9606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105fa606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105fb606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105fc606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105fd606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105fe606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ff606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610515606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610600606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610601606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610602606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610603606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610604606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610605606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610606606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610607606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610608606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610609606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610516606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610610606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610611606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610612606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610613606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610517606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610614606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610615606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610616606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610617606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610618606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610619606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610518606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610620606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610621606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610622606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610623606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610624606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610625606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610626606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610627606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610519606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104fe606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610628606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610629606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610630606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610631606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610632606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610633606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610634606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610635606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610636606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610637606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610638606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610639606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610640606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610641606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610642606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610643606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610644606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610645606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610646606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610647606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610648606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610649606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610650606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610651606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610652606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610653606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610654606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610655606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610656606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610657606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610658606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610659606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610660606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610661606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610662606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610663606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610664606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610665606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610666606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610667606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610668606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610669606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610520606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610670606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610671606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610672606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610673606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610674606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610675606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610676606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610677606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610521606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610678606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610679606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610680606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610681606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610522606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610682606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610683606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610684606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610685606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610686606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610687606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610688606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610689606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610523606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ff606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610690606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610691606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610692606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610693606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610694606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610695606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610524606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610696606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610697606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610698606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610699606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610525606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a0606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a1606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a2606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a3606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a4606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a5606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a6606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a7606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a8606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a9606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610526606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106aa606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106ab606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106ac606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106ad606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106ae606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106af606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b0606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b1606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b2606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b3606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610527606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b4606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b5606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b6606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b7606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b8606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b9606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106ba606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106bb606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106bc606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106bd606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610528606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106be606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106bf606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106c0606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610529606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610500606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610530606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610531606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610532606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610533606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610534606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610535606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610536606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610537606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610501606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610538606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610539606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610540606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610541606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610502606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610542606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610543606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610544606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610545606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610546606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610547606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610548606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610549606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610503606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610550606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610551606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610552606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610553606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610554606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610555606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610504606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610556606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610557606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610558606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610559606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610505606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-        "case166",
-        "case167",
-        "case168",
-        "case169",
-        "case170",
-        "case171",
-        "case172",
-        "case173",
-        "case174",
-        "case175",
-        "case176",
-        "case177",
-        "case178",
-        "case179",
-        "case180",
-        "case181",
-        "case182",
-        "case183",
-        "case184",
-        "case185",
-        "case186",
-        "case187",
-        "case188",
-        "case189",
-        "case190",
-        "case191",
-        "case192",
-        "case193",
-        "case194",
-        "case195",
-        "case196",
-        "case197",
-        "case198",
-        "case199",
-        "case200",
-        "case201",
-        "case202",
-        "case203",
-        "case204",
-        "case205",
-        "case206",
-        "case207",
-        "case208",
-        "case209",
-        "case210",
-        "case211",
-        "case212",
-        "case213",
-        "case214",
-        "case215",
-        "case216",
-        "case217",
-        "case218",
-        "case219",
-        "case220",
-        "case221",
-        "case222",
-        "case223",
-        "case224",
-        "case225",
-        "case226",
-        "case227",
-        "case228",
-        "case229",
-        "case230",
-        "case231",
-        "case232",
-        "case233",
-        "case234",
-        "case235",
-        "case236",
-        "case237",
-        "case238",
-        "case239",
-        "case240",
-        "case241",
-        "case242",
-        "case243",
-        "case244",
-        "case245",
-        "case246",
-        "case247",
-        "case248",
-        "case249",
-        "case250",
-        "case251",
-        "case252",
-        "case253",
-        "case254",
-        "case255",
-        "case256",
-        "case257",
-        "case258",
-        "case259",
-        "case260",
-        "case261",
-        "case262",
-        "case263",
-        "case264",
-        "case265",
-        "case266",
-        "case267",
-        "case268",
-        "case269",
-        "case270",
-        "case271",
-        "case272",
-        "case273",
-        "case274",
-        "case275",
-        "case276",
-        "case277",
-        "case278",
-        "case279",
-        "case280",
-        "case281",
-        "case282",
-        "case283",
-        "case284",
-        "case285",
-        "case286",
-        "case287",
-        "case288",
-        "case289",
-        "case290",
-        "case291",
-        "case292",
-        "case293",
-        "case294",
-        "case295",
-        "case296",
-        "case297",
-        "case298",
-        "case299",
-        "case300",
-        "case301",
-        "case302",
-        "case303",
-        "case304",
-        "case305",
-        "case306",
-        "case307",
-        "case308",
-        "case309",
-        "case310",
-        "case311",
-        "case312",
-        "case313",
-        "case314",
-        "case315",
-        "case316",
-        "case317",
-        "case318",
-        "case319",
-        "case320",
-        "case321",
-        "case322",
-        "case323",
-        "case324",
-        "case325",
-        "case326",
-        "case327",
-        "case328",
-        "case329",
-        "case330",
-        "case331",
-        "case332",
-        "case333",
-        "case334",
-        "case335",
-        "case336",
-        "case337",
-        "case338",
-        "case339",
-        "case340",
-        "case341",
-        "case342",
-        "case343",
-        "case344",
-        "case345",
-        "case346",
-        "case347",
-        "case348",
-        "case349",
-        "case350",
-        "case351",
-        "case352",
-        "case353",
-        "case354",
-        "case355",
-        "case356",
-        "case357",
-        "case358",
-        "case359",
-        "case360",
-        "case361",
-        "case362",
-        "case363",
-        "case364",
-        "case365",
-        "case366",
-        "case367",
-        "case368",
-        "case369",
-        "case370",
-        "case371",
-        "case372",
-        "case373",
-        "case374",
-        "case375",
-        "case376",
-        "case377",
-        "case378",
-        "case379",
-        "case380",
-        "case381",
-        "case382",
-        "case383",
-        "case384",
-        "case385",
-        "case386",
-        "case387",
-        "case388",
-        "case389",
-        "case390",
-        "case391",
-        "case392",
-        "case393",
-        "case394",
-        "case395",
-        "case396",
-        "case397",
-        "case398",
-        "case399",
-        "case400",
-        "case401",
-        "case402",
-        "case403",
-        "case404",
-        "case405",
-        "case406",
-        "case407",
-        "case408",
-        "case409",
-        "case410",
-        "case411",
-        "case412",
-        "case413",
-        "case414",
-        "case415",
-        "case416",
-        "case417",
-        "case418",
-        "case419",
-        "case420",
-        "case421",
-        "case422",
-        "case423",
-        "case424",
-        "case425",
-        "case426",
-        "case427",
-        "case428",
-        "case429",
-        "case430",
-        "case431",
-        "case432",
-        "case433",
-        "case434",
-        "case435",
-        "case436",
-        "case437",
-        "case438",
-        "case439",
-        "case440",
-        "case441",
-        "case442",
-        "case443",
-        "case444",
-        "case445",
-        "case446",
-        "case447",
-        "case448",
-        "case449",
-        "case450",
-        "case451",
-        "case452",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
-def test_sstore_combinations_initial11_2_paris(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} ->..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0x1000000000000000000000000000000000000000")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
+state_tests/stTimeConsuming/sstore_combinations_initial11_2_ParisFiller.json
 
-    pre[contract] = Account(
-        balance=10,
-        nonce=0,
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-    )
-    # Source: LLL
-    # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (REVERT 0 32) }
-    pre.deploy_contract(
-        code=Op.REVERT(offset=0x0, size=0x20) + Op.STOP,
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0x3000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-        nonce=0,
-        address=Address("0xb100000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0xb200000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=2000000,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
+@manually-enhanced: Do not overwrite. This test has been manually reviewed and
+enhanced.
+"""
diff --git a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial11_paris.py b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial11_paris.py
index df1d7f0cc6a..b736702bf1e 100644
--- a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial11_paris.py
+++ b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial11_paris.py
@@ -1,10393 +1,9 @@
 """
-sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog,...
+Sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non,...
 
 Ported from:
-tests/static/state_tests/stTimeConsuming
-sstore_combinations_initial11_ParisFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTimeConsuming/sstore_combinations_initial11_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "6103526064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b66064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b76064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b86064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b96064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ba6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103bb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103bc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103bd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103be6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103bf6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c06064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c16064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c26064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c36064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c46064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c56064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c66064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c76064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c86064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c96064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ca6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103cb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103cc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103cd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ce6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103cf6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d06064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d16064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d26064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d36064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d46064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d56064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d66064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d76064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d86064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d96064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103da6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103db6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103dc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103dd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103de6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103df6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e06064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e16064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e26064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e36064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e46064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e56064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e66064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e76064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103606064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e86064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e96064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ea6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103eb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ec6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ed6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ee6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ef6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f06064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f16064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103616064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f26064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f36064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f46064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f56064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f66064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f76064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f86064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f96064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103fa6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103fb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103626064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103fc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103fd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103fe6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ff6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104006064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104016064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104026064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104036064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104046064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104056064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103636064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104066064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104076064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104086064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104096064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103646064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104106064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104116064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104126064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104136064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104146064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104156064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104166064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104176064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104186064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104196064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103656064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103536064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104206064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104216064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104226064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104236064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103666064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104246064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104256064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104266064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104276064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104286064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104296064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103676064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104306064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104316064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104326064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104336064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104346064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104356064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104366064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104376064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103686064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104386064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104396064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104406064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104416064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103696064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104426064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104436064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104446064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104456064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104466064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104476064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104486064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104496064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104506064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104516064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104526064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104536064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104546064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104556064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104566064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104576064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104586064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104596064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104606064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104616064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104626064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104636064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104646064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104656064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104666064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104676064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104686064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104696064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104706064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104716064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104726064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104736064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104746064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104756064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104766064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104776064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104786064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104796064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103546064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104806064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610481606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610482606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610483606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610484606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610485606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610486606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610487606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103706064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610488606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610489606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610490606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610491606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103716064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610492606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610493606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610494606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610495606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610496606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610497606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610498606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610499606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103726064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a0606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a1606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a2606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a3606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a4606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a5606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103736064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a6606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a7606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a8606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a9606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104aa606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ab606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ac606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ad606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ae606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104af606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103746064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b0606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b1606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b2606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b3606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b4606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b5606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b6606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b7606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b8606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b9606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103756064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ba606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104bb606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104bc606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104bd606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104be606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104bf606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c0606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c1606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c2606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c3606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103766064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c4606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c5606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c6606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c7606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c8606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c9606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ca606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104cb606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104cc606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104cd606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103776064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ce606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104cf606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d0606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d1606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d2606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d3606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d4606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d5606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d6606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d7606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103786064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d8606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d9606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104da606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104db606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104dc606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104dd606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104de606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104df606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e0606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e1606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103796064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103556064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e2606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e3606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e4606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e5606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e6606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e7606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e8606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e9606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ea606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104eb606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ec606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ed606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ee606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ef606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f0606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f1606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f2606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f3606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f4606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f5606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f6606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f7606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f8606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f9606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104fa606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104fb606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103806064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103816064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103826064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103836064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103566064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103846064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103856064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103866064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103876064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103886064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103896064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103576064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103906064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103916064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103926064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103936064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103946064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103956064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103966064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103976064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103586064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103986064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103996064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a06064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a16064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103596064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a26064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a36064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a46064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a56064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a66064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a76064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a86064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a96064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103aa6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ab6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ac6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ad6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ae6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103af6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b06064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b16064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b26064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b36064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b46064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b56064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-        "case166",
-        "case167",
-        "case168",
-        "case169",
-        "case170",
-        "case171",
-        "case172",
-        "case173",
-        "case174",
-        "case175",
-        "case176",
-        "case177",
-        "case178",
-        "case179",
-        "case180",
-        "case181",
-        "case182",
-        "case183",
-        "case184",
-        "case185",
-        "case186",
-        "case187",
-        "case188",
-        "case189",
-        "case190",
-        "case191",
-        "case192",
-        "case193",
-        "case194",
-        "case195",
-        "case196",
-        "case197",
-        "case198",
-        "case199",
-        "case200",
-        "case201",
-        "case202",
-        "case203",
-        "case204",
-        "case205",
-        "case206",
-        "case207",
-        "case208",
-        "case209",
-        "case210",
-        "case211",
-        "case212",
-        "case213",
-        "case214",
-        "case215",
-        "case216",
-        "case217",
-        "case218",
-        "case219",
-        "case220",
-        "case221",
-        "case222",
-        "case223",
-        "case224",
-        "case225",
-        "case226",
-        "case227",
-        "case228",
-        "case229",
-        "case230",
-        "case231",
-        "case232",
-        "case233",
-        "case234",
-        "case235",
-        "case236",
-        "case237",
-        "case238",
-        "case239",
-        "case240",
-        "case241",
-        "case242",
-        "case243",
-        "case244",
-        "case245",
-        "case246",
-        "case247",
-        "case248",
-        "case249",
-        "case250",
-        "case251",
-        "case252",
-        "case253",
-        "case254",
-        "case255",
-        "case256",
-        "case257",
-        "case258",
-        "case259",
-        "case260",
-        "case261",
-        "case262",
-        "case263",
-        "case264",
-        "case265",
-        "case266",
-        "case267",
-        "case268",
-        "case269",
-        "case270",
-        "case271",
-        "case272",
-        "case273",
-        "case274",
-        "case275",
-        "case276",
-        "case277",
-        "case278",
-        "case279",
-        "case280",
-        "case281",
-        "case282",
-        "case283",
-        "case284",
-        "case285",
-        "case286",
-        "case287",
-        "case288",
-        "case289",
-        "case290",
-        "case291",
-        "case292",
-        "case293",
-        "case294",
-        "case295",
-        "case296",
-        "case297",
-        "case298",
-        "case299",
-        "case300",
-        "case301",
-        "case302",
-        "case303",
-        "case304",
-        "case305",
-        "case306",
-        "case307",
-        "case308",
-        "case309",
-        "case310",
-        "case311",
-        "case312",
-        "case313",
-        "case314",
-        "case315",
-        "case316",
-        "case317",
-        "case318",
-        "case319",
-        "case320",
-        "case321",
-        "case322",
-        "case323",
-        "case324",
-        "case325",
-        "case326",
-        "case327",
-        "case328",
-        "case329",
-        "case330",
-        "case331",
-        "case332",
-        "case333",
-        "case334",
-        "case335",
-        "case336",
-        "case337",
-        "case338",
-        "case339",
-        "case340",
-        "case341",
-        "case342",
-        "case343",
-        "case344",
-        "case345",
-        "case346",
-        "case347",
-        "case348",
-        "case349",
-        "case350",
-        "case351",
-        "case352",
-        "case353",
-        "case354",
-        "case355",
-        "case356",
-        "case357",
-        "case358",
-        "case359",
-        "case360",
-        "case361",
-        "case362",
-        "case363",
-        "case364",
-        "case365",
-        "case366",
-        "case367",
-        "case368",
-        "case369",
-        "case370",
-        "case371",
-        "case372",
-        "case373",
-        "case374",
-        "case375",
-        "case376",
-        "case377",
-        "case378",
-        "case379",
-        "case380",
-        "case381",
-        "case382",
-        "case383",
-        "case384",
-        "case385",
-        "case386",
-        "case387",
-        "case388",
-        "case389",
-        "case390",
-        "case391",
-        "case392",
-        "case393",
-        "case394",
-        "case395",
-        "case396",
-        "case397",
-        "case398",
-        "case399",
-        "case400",
-        "case401",
-        "case402",
-        "case403",
-        "case404",
-        "case405",
-        "case406",
-        "case407",
-        "case408",
-        "case409",
-        "case410",
-        "case411",
-        "case412",
-        "case413",
-        "case414",
-        "case415",
-        "case416",
-        "case417",
-        "case418",
-        "case419",
-        "case420",
-        "case421",
-        "case422",
-        "case423",
-        "case424",
-        "case425",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
-def test_sstore_combinations_initial11_paris(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} ->..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0x1000000000000000000000000000000000000000")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
+state_tests/stTimeConsuming/sstore_combinations_initial11_ParisFiller.json
 
-    pre[contract] = Account(
-        balance=10,
-        nonce=0,
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-    )
-    # Source: LLL
-    # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (REVERT 0 32) }
-    pre.deploy_contract(
-        code=Op.REVERT(offset=0x0, size=0x20) + Op.STOP,
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0x3000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-        nonce=0,
-        address=Address("0xb100000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0xb200000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=2000000,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
+@manually-enhanced: Do not overwrite. This test has been manually reviewed and
+enhanced.
+"""
diff --git a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial20_2_paris.py b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial20_2_paris.py
index 08b420cc9a2..769752765cc 100644
--- a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial20_2_paris.py
+++ b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial20_2_paris.py
@@ -1,10129 +1,9 @@
 """
-sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog,...
+Sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non,...
 
 Ported from:
-tests/static/state_tests/stTimeConsuming
-sstore_combinations_initial20_2_ParisFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTimeConsuming/sstore_combinations_initial20_2_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "6101aa6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102106064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102116064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102126064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102136064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102146064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102156064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102166064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102176064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b46064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102186064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102196064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61021f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102206064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102216064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b56064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102226064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102236064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102246064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102256064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102266064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102276064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102286064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102296064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b66064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61022f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102306064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102316064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102326064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102336064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102346064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102356064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b76064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102366064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102376064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102386064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102396064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61023f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b86064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102406064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102416064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102426064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102436064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102446064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102456064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102466064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102476064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102486064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102496064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b96064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61024f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102506064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102516064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102526064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102536064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ba6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102546064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102556064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102566064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102576064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102586064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102596064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101bb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61025f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102606064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102616064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102626064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102636064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102646064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102656064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102666064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102676064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101bc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102686064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102696064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61026f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102706064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102716064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101bd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ab6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102726064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102736064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102746064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102756064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102766064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102776064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102786064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102796064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101be6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61027f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102806064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102816064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102826064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102836064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102846064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102856064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101bf6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102866064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102876064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102886064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102896064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61028f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c06064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102906064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102916064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102926064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102936064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102946064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102956064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102966064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102976064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102986064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102996064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c16064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61029f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a06064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a16064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a26064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a36064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c26064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a46064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a56064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a66064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a76064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a86064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102a96064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102aa6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ab6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ac6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ad6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c36064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ae6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102af6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b06064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b16064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b26064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b36064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b46064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b56064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b66064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b76064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c46064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b86064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102b96064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ba6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102bb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102bc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102bd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102be6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102bf6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c06064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c16064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c56064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c26064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c36064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c46064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c56064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c66064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c76064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c86064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102c96064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ca6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102cb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c66064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102cc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102cd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ce6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102cf6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d06064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d16064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d26064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d36064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d46064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d56064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c76064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ac6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d66064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d76064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d86064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102d96064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102da6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102db6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102dc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102dd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102de6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102df6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c86064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e06064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e16064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e26064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e36064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e46064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e56064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e66064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e76064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e86064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102e96064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101c96064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ea6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102eb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ec6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ed6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ee6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ef6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f06064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f16064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f26064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f36064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ca6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f46064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f56064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f66064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f76064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f86064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102f96064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102fa6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102fb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102fc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102fd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101cb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102fe6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102ff6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103006064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103016064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103026064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103036064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103046064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103056064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103066064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103076064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101cc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103086064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103096064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61030f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103106064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103116064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101cd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103126064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103136064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103146064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103156064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103166064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103176064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103186064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103196064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ce6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61031f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103206064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103216064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103226064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103236064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103246064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103256064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101cf6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103266064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103276064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103286064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103296064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61032f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d06064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103306064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103316064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103326064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103336064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103346064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103356064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103366064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103376064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103386064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103396064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d16064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ad6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61033f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103406064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103416064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103426064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103436064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d26064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103446064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103456064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103466064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103476064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103486064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103496064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d36064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61034f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103506064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103516064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d46064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d56064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d66064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d76064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d86064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101d96064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101da6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101db6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ae6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101dc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101dd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101de6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101df6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e06064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e16064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e26064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e36064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e46064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e56064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101af6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e66064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e76064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e86064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101e96064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ea6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101eb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ec6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ed6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ee6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ef6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b06064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f06064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f16064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f26064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f36064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f46064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f56064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f66064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f76064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f86064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101f96064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b16064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101fa6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101fb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101fc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101fd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101fe6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101ff6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102006064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102016064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102026064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102036064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b26064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102046064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102056064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102066064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102076064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102086064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6102096064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61020d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101b36064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-        "case166",
-        "case167",
-        "case168",
-        "case169",
-        "case170",
-        "case171",
-        "case172",
-        "case173",
-        "case174",
-        "case175",
-        "case176",
-        "case177",
-        "case178",
-        "case179",
-        "case180",
-        "case181",
-        "case182",
-        "case183",
-        "case184",
-        "case185",
-        "case186",
-        "case187",
-        "case188",
-        "case189",
-        "case190",
-        "case191",
-        "case192",
-        "case193",
-        "case194",
-        "case195",
-        "case196",
-        "case197",
-        "case198",
-        "case199",
-        "case200",
-        "case201",
-        "case202",
-        "case203",
-        "case204",
-        "case205",
-        "case206",
-        "case207",
-        "case208",
-        "case209",
-        "case210",
-        "case211",
-        "case212",
-        "case213",
-        "case214",
-        "case215",
-        "case216",
-        "case217",
-        "case218",
-        "case219",
-        "case220",
-        "case221",
-        "case222",
-        "case223",
-        "case224",
-        "case225",
-        "case226",
-        "case227",
-        "case228",
-        "case229",
-        "case230",
-        "case231",
-        "case232",
-        "case233",
-        "case234",
-        "case235",
-        "case236",
-        "case237",
-        "case238",
-        "case239",
-        "case240",
-        "case241",
-        "case242",
-        "case243",
-        "case244",
-        "case245",
-        "case246",
-        "case247",
-        "case248",
-        "case249",
-        "case250",
-        "case251",
-        "case252",
-        "case253",
-        "case254",
-        "case255",
-        "case256",
-        "case257",
-        "case258",
-        "case259",
-        "case260",
-        "case261",
-        "case262",
-        "case263",
-        "case264",
-        "case265",
-        "case266",
-        "case267",
-        "case268",
-        "case269",
-        "case270",
-        "case271",
-        "case272",
-        "case273",
-        "case274",
-        "case275",
-        "case276",
-        "case277",
-        "case278",
-        "case279",
-        "case280",
-        "case281",
-        "case282",
-        "case283",
-        "case284",
-        "case285",
-        "case286",
-        "case287",
-        "case288",
-        "case289",
-        "case290",
-        "case291",
-        "case292",
-        "case293",
-        "case294",
-        "case295",
-        "case296",
-        "case297",
-        "case298",
-        "case299",
-        "case300",
-        "case301",
-        "case302",
-        "case303",
-        "case304",
-        "case305",
-        "case306",
-        "case307",
-        "case308",
-        "case309",
-        "case310",
-        "case311",
-        "case312",
-        "case313",
-        "case314",
-        "case315",
-        "case316",
-        "case317",
-        "case318",
-        "case319",
-        "case320",
-        "case321",
-        "case322",
-        "case323",
-        "case324",
-        "case325",
-        "case326",
-        "case327",
-        "case328",
-        "case329",
-        "case330",
-        "case331",
-        "case332",
-        "case333",
-        "case334",
-        "case335",
-        "case336",
-        "case337",
-        "case338",
-        "case339",
-        "case340",
-        "case341",
-        "case342",
-        "case343",
-        "case344",
-        "case345",
-        "case346",
-        "case347",
-        "case348",
-        "case349",
-        "case350",
-        "case351",
-        "case352",
-        "case353",
-        "case354",
-        "case355",
-        "case356",
-        "case357",
-        "case358",
-        "case359",
-        "case360",
-        "case361",
-        "case362",
-        "case363",
-        "case364",
-        "case365",
-        "case366",
-        "case367",
-        "case368",
-        "case369",
-        "case370",
-        "case371",
-        "case372",
-        "case373",
-        "case374",
-        "case375",
-        "case376",
-        "case377",
-        "case378",
-        "case379",
-        "case380",
-        "case381",
-        "case382",
-        "case383",
-        "case384",
-        "case385",
-        "case386",
-        "case387",
-        "case388",
-        "case389",
-        "case390",
-        "case391",
-        "case392",
-        "case393",
-        "case394",
-        "case395",
-        "case396",
-        "case397",
-        "case398",
-        "case399",
-        "case400",
-        "case401",
-        "case402",
-        "case403",
-        "case404",
-        "case405",
-        "case406",
-        "case407",
-        "case408",
-        "case409",
-        "case410",
-        "case411",
-        "case412",
-        "case413",
-        "case414",
-        "case415",
-        "case416",
-        "case417",
-        "case418",
-        "case419",
-        "case420",
-        "case421",
-        "case422",
-        "case423",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
-def test_sstore_combinations_initial20_2_paris(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} ->..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0x1000000000000000000000000000000000000000")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
+state_tests/stTimeConsuming/sstore_combinations_initial20_2_ParisFiller.json
 
-    pre[contract] = Account(
-        balance=10,
-        nonce=0,
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-    )
-    # Source: LLL
-    # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (REVERT 0 32) }
-    pre.deploy_contract(
-        code=Op.REVERT(offset=0x0, size=0x20) + Op.STOP,
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0x3000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-        nonce=0,
-        address=Address("0xb100000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0xb200000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=2000000,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
+@manually-enhanced: Do not overwrite. This test has been manually reviewed and
+enhanced.
+"""
diff --git a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial20_paris.py b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial20_paris.py
index ab247b80fcb..80db78e743d 100644
--- a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial20_paris.py
+++ b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial20_paris.py
@@ -1,9742 +1,9 @@
 """
-sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog,...
+Sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non,...
 
 Ported from:
-tests/static/state_tests/stTimeConsuming
-sstore_combinations_initial20_ParisFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTimeConsuming/sstore_combinations_initial20_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "6000606452600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60646064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60656064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60666064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60676064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60686064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60696064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "606f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60706064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60716064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60726064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60736064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60746064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60756064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60766064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60776064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60786064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60796064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "607f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60806064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60816064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60826064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60836064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60846064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60856064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60866064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60876064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60886064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60896064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "608f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60906064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60916064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60926064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60936064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60946064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60956064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60966064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60976064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60986064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60996064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "609f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "600f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a06064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a16064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a26064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a36064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a46064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a56064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a66064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a76064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a86064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60a96064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60106064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60aa6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ab6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ac6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ad6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ae6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60af6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b06064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b16064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b26064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b36064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60116064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b46064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b56064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b66064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b76064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b86064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60b96064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ba6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60bb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60bc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60bd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60126064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60be6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60bf6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c06064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c16064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c26064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c36064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c46064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c56064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c66064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c76064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60136064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60016064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c86064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60c96064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ca6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60cb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60cc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60cd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ce6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60cf6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d06064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d16064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60146064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d26064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d36064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d46064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d56064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d66064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d76064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d86064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60d96064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60da6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60db6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60156064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60dc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60dd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60de6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60df6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e06064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e16064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e26064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e36064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e46064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e56064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60166064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e66064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e76064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e86064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60e96064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ea6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60eb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ec6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ed6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ee6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ef6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60176064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f06064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f16064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f26064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f36064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f46064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f56064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f66064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f76064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f86064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60f96064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60186064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60fa6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60fb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60fc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60fd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60fe6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60ff6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101006064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101016064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101026064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101036064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60196064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101046064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101056064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101066064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101076064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101086064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101096064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61010f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101106064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101116064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101126064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101136064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101146064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101156064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101166064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101176064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101186064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101196064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61011f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101206064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101216064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101226064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101236064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101246064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101256064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101266064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101276064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101286064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101296064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60026064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61012f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101306064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101316064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101326064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101336064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101346064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101356064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101366064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101376064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101386064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101396064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61013f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "601f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101406064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101416064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101426064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101436064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101446064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101456064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101466064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101476064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101486064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101496064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60206064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61014f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101506064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101516064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101526064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101536064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60216064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101546064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101556064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101566064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101576064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101586064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101596064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60226064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61015f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101606064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101616064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101626064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101636064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101646064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101656064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101666064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101676064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60236064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101686064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101696064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61016f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101706064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101716064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60246064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101726064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101736064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101746064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101756064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101766064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101776064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101786064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101796064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60256064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61017f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101806064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101816064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101826064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101836064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101846064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101856064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60266064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101866064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101876064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101886064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101896064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61018f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60276064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60036064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101906064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101916064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101926064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101936064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101946064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101956064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101966064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101976064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101986064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101996064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60286064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61019f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a06064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a16064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a26064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a36064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60296064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a46064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a56064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a66064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a76064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a86064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6101a96064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "602f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60306064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60316064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60046064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60326064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60336064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60346064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60356064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60366064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60376064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60386064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60396064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60056064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "603f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60406064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60416064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60426064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60436064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60446064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60456064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60066064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60466064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60476064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60486064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60496064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "604f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60076064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60506064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60516064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60526064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60536064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60546064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60556064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60566064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60576064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60586064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60596064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60086064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "605f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60606064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60616064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60626064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60636064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "60096064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-        "case166",
-        "case167",
-        "case168",
-        "case169",
-        "case170",
-        "case171",
-        "case172",
-        "case173",
-        "case174",
-        "case175",
-        "case176",
-        "case177",
-        "case178",
-        "case179",
-        "case180",
-        "case181",
-        "case182",
-        "case183",
-        "case184",
-        "case185",
-        "case186",
-        "case187",
-        "case188",
-        "case189",
-        "case190",
-        "case191",
-        "case192",
-        "case193",
-        "case194",
-        "case195",
-        "case196",
-        "case197",
-        "case198",
-        "case199",
-        "case200",
-        "case201",
-        "case202",
-        "case203",
-        "case204",
-        "case205",
-        "case206",
-        "case207",
-        "case208",
-        "case209",
-        "case210",
-        "case211",
-        "case212",
-        "case213",
-        "case214",
-        "case215",
-        "case216",
-        "case217",
-        "case218",
-        "case219",
-        "case220",
-        "case221",
-        "case222",
-        "case223",
-        "case224",
-        "case225",
-        "case226",
-        "case227",
-        "case228",
-        "case229",
-        "case230",
-        "case231",
-        "case232",
-        "case233",
-        "case234",
-        "case235",
-        "case236",
-        "case237",
-        "case238",
-        "case239",
-        "case240",
-        "case241",
-        "case242",
-        "case243",
-        "case244",
-        "case245",
-        "case246",
-        "case247",
-        "case248",
-        "case249",
-        "case250",
-        "case251",
-        "case252",
-        "case253",
-        "case254",
-        "case255",
-        "case256",
-        "case257",
-        "case258",
-        "case259",
-        "case260",
-        "case261",
-        "case262",
-        "case263",
-        "case264",
-        "case265",
-        "case266",
-        "case267",
-        "case268",
-        "case269",
-        "case270",
-        "case271",
-        "case272",
-        "case273",
-        "case274",
-        "case275",
-        "case276",
-        "case277",
-        "case278",
-        "case279",
-        "case280",
-        "case281",
-        "case282",
-        "case283",
-        "case284",
-        "case285",
-        "case286",
-        "case287",
-        "case288",
-        "case289",
-        "case290",
-        "case291",
-        "case292",
-        "case293",
-        "case294",
-        "case295",
-        "case296",
-        "case297",
-        "case298",
-        "case299",
-        "case300",
-        "case301",
-        "case302",
-        "case303",
-        "case304",
-        "case305",
-        "case306",
-        "case307",
-        "case308",
-        "case309",
-        "case310",
-        "case311",
-        "case312",
-        "case313",
-        "case314",
-        "case315",
-        "case316",
-        "case317",
-        "case318",
-        "case319",
-        "case320",
-        "case321",
-        "case322",
-        "case323",
-        "case324",
-        "case325",
-        "case326",
-        "case327",
-        "case328",
-        "case329",
-        "case330",
-        "case331",
-        "case332",
-        "case333",
-        "case334",
-        "case335",
-        "case336",
-        "case337",
-        "case338",
-        "case339",
-        "case340",
-        "case341",
-        "case342",
-        "case343",
-        "case344",
-        "case345",
-        "case346",
-        "case347",
-        "case348",
-        "case349",
-        "case350",
-        "case351",
-        "case352",
-        "case353",
-        "case354",
-        "case355",
-        "case356",
-        "case357",
-        "case358",
-        "case359",
-        "case360",
-        "case361",
-        "case362",
-        "case363",
-        "case364",
-        "case365",
-        "case366",
-        "case367",
-        "case368",
-        "case369",
-        "case370",
-        "case371",
-        "case372",
-        "case373",
-        "case374",
-        "case375",
-        "case376",
-        "case377",
-        "case378",
-        "case379",
-        "case380",
-        "case381",
-        "case382",
-        "case383",
-        "case384",
-        "case385",
-        "case386",
-        "case387",
-        "case388",
-        "case389",
-        "case390",
-        "case391",
-        "case392",
-        "case393",
-        "case394",
-        "case395",
-        "case396",
-        "case397",
-        "case398",
-        "case399",
-        "case400",
-        "case401",
-        "case402",
-        "case403",
-        "case404",
-        "case405",
-        "case406",
-        "case407",
-        "case408",
-        "case409",
-        "case410",
-        "case411",
-        "case412",
-        "case413",
-        "case414",
-        "case415",
-        "case416",
-        "case417",
-        "case418",
-        "case419",
-        "case420",
-        "case421",
-        "case422",
-        "case423",
-        "case424",
-        "case425",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
-def test_sstore_combinations_initial20_paris(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} ->..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0x1000000000000000000000000000000000000000")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
+state_tests/stTimeConsuming/sstore_combinations_initial20_ParisFiller.json
 
-    pre[contract] = Account(
-        balance=10,
-        nonce=0,
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-    )
-    # Source: LLL
-    # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (REVERT 0 32) }
-    pre.deploy_contract(
-        code=Op.REVERT(offset=0x0, size=0x20) + Op.STOP,
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0x3000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-        nonce=0,
-        address=Address("0xb100000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0xb200000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=2000000,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
+@manually-enhanced: Do not overwrite. This test has been manually reviewed and
+enhanced.
+"""
diff --git a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial21_2_paris.py b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial21_2_paris.py
index 3342b082e11..6e11d14c05a 100644
--- a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial21_2_paris.py
+++ b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial21_2_paris.py
@@ -1,11041 +1,9 @@
 """
-sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog,...
+Sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non,...
 
 Ported from:
-tests/static/state_tests/stTimeConsuming
-sstore_combinations_initial21_2_ParisFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTimeConsuming/sstore_combinations_initial21_2_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "6104fc606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610560606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610561606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610562606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610563606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610564606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610565606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610566606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610567606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610568606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610569606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610506606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61056f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610570606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610571606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610572606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610573606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610507606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610574606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610575606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610576606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610577606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610578606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610579606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610508606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61057f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610580606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610581606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610582606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610583606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610584606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610585606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610586606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610587606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610509606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610588606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610589606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61058f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610590606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610591606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610592606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610593606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610594606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610595606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610596606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610597606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610598606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610599606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61059f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a0606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a1606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a2606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a3606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a4606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a5606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a6606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a7606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a8606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105a9606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105aa606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ab606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ac606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ad606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ae606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105af606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b0606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b1606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b2606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b3606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b4606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b5606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b6606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b7606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b8606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105b9606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ba606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105bb606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105bc606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105bd606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105be606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105bf606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c0606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c1606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c2606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c3606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61050f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104fd606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c4606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c5606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c6606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c7606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c8606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105c9606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ca606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105cb606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105cc606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105cd606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610510606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ce606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105cf606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d0606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d1606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d2606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d3606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d4606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d5606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d6606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d7606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610511606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d8606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105d9606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105da606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105db606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105dc606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105dd606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105de606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105df606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e0606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e1606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610512606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e2606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e3606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e4606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e5606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e6606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e7606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e8606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105e9606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ea606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105eb606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610513606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ec606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ed606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ee606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ef606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f0606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f1606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f2606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f3606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f4606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f5606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610514606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f6606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f7606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f8606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105f9606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105fa606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105fb606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105fc606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105fd606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105fe606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6105ff606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610515606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610600606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610601606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610602606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610603606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610604606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610605606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610606606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610607606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610608606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610609606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610516606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61060f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610610606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610611606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610612606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610613606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610517606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610614606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610615606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610616606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610617606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610618606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610619606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610518606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61061f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610620606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610621606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610622606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610623606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610624606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610625606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610626606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610627606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610519606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104fe606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610628606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610629606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61062f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610630606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610631606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610632606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610633606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610634606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610635606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610636606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610637606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610638606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610639606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61063f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610640606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610641606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610642606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610643606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610644606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610645606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610646606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610647606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610648606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610649606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61064f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610650606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610651606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610652606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610653606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610654606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610655606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610656606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610657606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610658606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610659606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61065f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610660606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610661606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610662606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610663606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61051f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610664606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610665606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610666606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610667606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610668606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610669606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610520606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61066f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610670606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610671606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610672606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610673606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610674606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610675606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610676606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610677606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610521606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610678606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610679606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61067f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610680606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610681606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610522606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610682606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610683606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610684606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610685606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610686606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610687606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610688606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610689606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610523606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ff606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61068f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610690606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610691606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610692606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610693606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610694606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610695606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610524606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610696606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610697606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610698606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610699606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61069f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610525606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a0606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a1606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a2606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a3606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a4606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a5606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a6606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a7606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a8606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106a9606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610526606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106aa606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106ab606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106ac606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106ad606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106ae606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106af606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b0606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b1606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b2606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b3606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610527606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b4606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b5606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b6606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b7606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b8606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106b9606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106ba606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106bb606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106bc606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106bd606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610528606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106be606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106bf606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6106c0606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610529606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610500606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61052f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610530606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610531606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610532606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610533606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610534606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610535606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610536606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610537606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610501606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610538606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610539606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61053f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610540606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610541606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610502606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610542606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610543606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610544606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610545606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610546606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610547606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610548606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610549606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610503606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61054f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610550606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610551606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610552606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610553606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610554606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610555606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610504606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610556606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610557606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610558606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610559606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61055f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610505606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-        "case166",
-        "case167",
-        "case168",
-        "case169",
-        "case170",
-        "case171",
-        "case172",
-        "case173",
-        "case174",
-        "case175",
-        "case176",
-        "case177",
-        "case178",
-        "case179",
-        "case180",
-        "case181",
-        "case182",
-        "case183",
-        "case184",
-        "case185",
-        "case186",
-        "case187",
-        "case188",
-        "case189",
-        "case190",
-        "case191",
-        "case192",
-        "case193",
-        "case194",
-        "case195",
-        "case196",
-        "case197",
-        "case198",
-        "case199",
-        "case200",
-        "case201",
-        "case202",
-        "case203",
-        "case204",
-        "case205",
-        "case206",
-        "case207",
-        "case208",
-        "case209",
-        "case210",
-        "case211",
-        "case212",
-        "case213",
-        "case214",
-        "case215",
-        "case216",
-        "case217",
-        "case218",
-        "case219",
-        "case220",
-        "case221",
-        "case222",
-        "case223",
-        "case224",
-        "case225",
-        "case226",
-        "case227",
-        "case228",
-        "case229",
-        "case230",
-        "case231",
-        "case232",
-        "case233",
-        "case234",
-        "case235",
-        "case236",
-        "case237",
-        "case238",
-        "case239",
-        "case240",
-        "case241",
-        "case242",
-        "case243",
-        "case244",
-        "case245",
-        "case246",
-        "case247",
-        "case248",
-        "case249",
-        "case250",
-        "case251",
-        "case252",
-        "case253",
-        "case254",
-        "case255",
-        "case256",
-        "case257",
-        "case258",
-        "case259",
-        "case260",
-        "case261",
-        "case262",
-        "case263",
-        "case264",
-        "case265",
-        "case266",
-        "case267",
-        "case268",
-        "case269",
-        "case270",
-        "case271",
-        "case272",
-        "case273",
-        "case274",
-        "case275",
-        "case276",
-        "case277",
-        "case278",
-        "case279",
-        "case280",
-        "case281",
-        "case282",
-        "case283",
-        "case284",
-        "case285",
-        "case286",
-        "case287",
-        "case288",
-        "case289",
-        "case290",
-        "case291",
-        "case292",
-        "case293",
-        "case294",
-        "case295",
-        "case296",
-        "case297",
-        "case298",
-        "case299",
-        "case300",
-        "case301",
-        "case302",
-        "case303",
-        "case304",
-        "case305",
-        "case306",
-        "case307",
-        "case308",
-        "case309",
-        "case310",
-        "case311",
-        "case312",
-        "case313",
-        "case314",
-        "case315",
-        "case316",
-        "case317",
-        "case318",
-        "case319",
-        "case320",
-        "case321",
-        "case322",
-        "case323",
-        "case324",
-        "case325",
-        "case326",
-        "case327",
-        "case328",
-        "case329",
-        "case330",
-        "case331",
-        "case332",
-        "case333",
-        "case334",
-        "case335",
-        "case336",
-        "case337",
-        "case338",
-        "case339",
-        "case340",
-        "case341",
-        "case342",
-        "case343",
-        "case344",
-        "case345",
-        "case346",
-        "case347",
-        "case348",
-        "case349",
-        "case350",
-        "case351",
-        "case352",
-        "case353",
-        "case354",
-        "case355",
-        "case356",
-        "case357",
-        "case358",
-        "case359",
-        "case360",
-        "case361",
-        "case362",
-        "case363",
-        "case364",
-        "case365",
-        "case366",
-        "case367",
-        "case368",
-        "case369",
-        "case370",
-        "case371",
-        "case372",
-        "case373",
-        "case374",
-        "case375",
-        "case376",
-        "case377",
-        "case378",
-        "case379",
-        "case380",
-        "case381",
-        "case382",
-        "case383",
-        "case384",
-        "case385",
-        "case386",
-        "case387",
-        "case388",
-        "case389",
-        "case390",
-        "case391",
-        "case392",
-        "case393",
-        "case394",
-        "case395",
-        "case396",
-        "case397",
-        "case398",
-        "case399",
-        "case400",
-        "case401",
-        "case402",
-        "case403",
-        "case404",
-        "case405",
-        "case406",
-        "case407",
-        "case408",
-        "case409",
-        "case410",
-        "case411",
-        "case412",
-        "case413",
-        "case414",
-        "case415",
-        "case416",
-        "case417",
-        "case418",
-        "case419",
-        "case420",
-        "case421",
-        "case422",
-        "case423",
-        "case424",
-        "case425",
-        "case426",
-        "case427",
-        "case428",
-        "case429",
-        "case430",
-        "case431",
-        "case432",
-        "case433",
-        "case434",
-        "case435",
-        "case436",
-        "case437",
-        "case438",
-        "case439",
-        "case440",
-        "case441",
-        "case442",
-        "case443",
-        "case444",
-        "case445",
-        "case446",
-        "case447",
-        "case448",
-        "case449",
-        "case450",
-        "case451",
-        "case452",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
-def test_sstore_combinations_initial21_2_paris(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} ->..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0x1000000000000000000000000000000000000000")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
+state_tests/stTimeConsuming/sstore_combinations_initial21_2_ParisFiller.json
 
-    pre[contract] = Account(
-        balance=10,
-        nonce=0,
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-    )
-    # Source: LLL
-    # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (REVERT 0 32) }
-    pre.deploy_contract(
-        code=Op.REVERT(offset=0x0, size=0x20) + Op.STOP,
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0x3000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-        nonce=0,
-        address=Address("0xb100000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0xb200000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=2000000,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
+@manually-enhanced: Do not overwrite. This test has been manually reviewed and
+enhanced.
+"""
diff --git a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial21_paris.py b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial21_paris.py
index 6f5cfe3a7e6..5d34ffec3c6 100644
--- a/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial21_paris.py
+++ b/tests/ported_static/stTimeConsuming/test_sstore_combinations_initial21_paris.py
@@ -1,10393 +1,9 @@
 """
-sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog,...
+Sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non,...
 
 Ported from:
-tests/static/state_tests/stTimeConsuming
-sstore_combinations_initial21_ParisFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTimeConsuming/sstore_combinations_initial21_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "6103526064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b66064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b76064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b86064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b96064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ba6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103bb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103bc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103bd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103be6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103bf6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c06064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c16064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c26064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c36064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c46064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c56064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c66064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c76064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c86064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103c96064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ca6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103cb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103cc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103cd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ce6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103cf6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d06064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d16064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d26064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d36064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d46064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d56064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d66064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d76064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d86064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103d96064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103da6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103db6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103dc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103dd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103de6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103df6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e06064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e16064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e26064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e36064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e46064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e56064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e66064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e76064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103606064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e86064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103e96064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ea6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103eb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ec6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ed6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ee6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ef6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f06064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f16064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103616064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f26064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f36064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f46064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f56064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f66064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f76064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f86064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103f96064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103fa6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103fb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103626064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103fc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103fd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103fe6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ff6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104006064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104016064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104026064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104036064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104046064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104056064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103636064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104066064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104076064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104086064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104096064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61040f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103646064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104106064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104116064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104126064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104136064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104146064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104156064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104166064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104176064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104186064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104196064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103656064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103536064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61041f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104206064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104216064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104226064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104236064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103666064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104246064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104256064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104266064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104276064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104286064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104296064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103676064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61042f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104306064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104316064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104326064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104336064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104346064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104356064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104366064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104376064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103686064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104386064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104396064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61043f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104406064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104416064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103696064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104426064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104436064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104446064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104456064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104466064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104476064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104486064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104496064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61044f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104506064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104516064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104526064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104536064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104546064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104556064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104566064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104576064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104586064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104596064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61045f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104606064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104616064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104626064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104636064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104646064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104656064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104666064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104676064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104686064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104696064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61046f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104706064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104716064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104726064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104736064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104746064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104756064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104766064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104776064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104786064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104796064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61036f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103546064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61047f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104806064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610481606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610482606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610483606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610484606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610485606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610486606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610487606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103706064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610488606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610489606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61048f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610490606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610491606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103716064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610492606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610493606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610494606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610495606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610496606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610497606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610498606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "610499606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103726064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61049f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a0606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a1606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a2606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a3606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a4606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a5606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103736064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a6606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a7606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a8606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104a9606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104aa606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ab606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ac606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ad606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ae606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104af606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103746064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b0606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b1606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b2606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b3606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b4606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b5606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b6606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b7606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b8606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104b9606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103756064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ba606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104bb606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104bc606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104bd606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104be606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104bf606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c0606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c1606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c2606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c3606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103766064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c4606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c5606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c6606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c7606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c8606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104c9606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ca606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104cb606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104cc606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104cd606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103776064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ce606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104cf606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d0606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d1606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d2606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d3606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d4606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d5606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d6606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d7606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103786064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d8606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104d9606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104da606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104db606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104dc606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104dd606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104de606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104df606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e0606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e1606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103796064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103556064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e2606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e3606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e4606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e5606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e6606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e7606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e8606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104e9606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ea606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104eb606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ec606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ed606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ee606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104ef606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f0606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f1606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f2606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f3606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f4606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f5606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f6606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f7606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f8606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104f9606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104fa606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6104fb606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61037f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103806064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103816064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103826064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103836064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103566064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103846064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103856064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103866064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103876064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103886064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103896064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103576064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61038f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103906064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103916064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103926064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103936064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103946064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103956064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103966064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103976064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103586064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103986064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103996064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61039f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a06064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a16064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103596064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a26064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a36064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a46064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a56064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a66064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a76064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a86064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103a96064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103aa6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ab6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ac6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ad6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103ae6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103af6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b06064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b16064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b26064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b36064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b46064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "6103b56064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-        (
-            "61035b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f100",  # noqa: E501
-            {
-                Address("0x1000000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0x2000000000000000000000000000000000000000"): Account(
-                    storage={1: 1}
-                ),
-                Address("0x3000000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1, 2: 2}
-                ),
-                Address("0xb100000000000000000000000000000000000000"): Account(
-                    storage={0: 1, 1: 1, 2: 1}
-                ),
-                Address("0xb200000000000000000000000000000000000000"): Account(
-                    storage={0: 2, 1: 2, 2: 2}
-                ),
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-        "case152",
-        "case153",
-        "case154",
-        "case155",
-        "case156",
-        "case157",
-        "case158",
-        "case159",
-        "case160",
-        "case161",
-        "case162",
-        "case163",
-        "case164",
-        "case165",
-        "case166",
-        "case167",
-        "case168",
-        "case169",
-        "case170",
-        "case171",
-        "case172",
-        "case173",
-        "case174",
-        "case175",
-        "case176",
-        "case177",
-        "case178",
-        "case179",
-        "case180",
-        "case181",
-        "case182",
-        "case183",
-        "case184",
-        "case185",
-        "case186",
-        "case187",
-        "case188",
-        "case189",
-        "case190",
-        "case191",
-        "case192",
-        "case193",
-        "case194",
-        "case195",
-        "case196",
-        "case197",
-        "case198",
-        "case199",
-        "case200",
-        "case201",
-        "case202",
-        "case203",
-        "case204",
-        "case205",
-        "case206",
-        "case207",
-        "case208",
-        "case209",
-        "case210",
-        "case211",
-        "case212",
-        "case213",
-        "case214",
-        "case215",
-        "case216",
-        "case217",
-        "case218",
-        "case219",
-        "case220",
-        "case221",
-        "case222",
-        "case223",
-        "case224",
-        "case225",
-        "case226",
-        "case227",
-        "case228",
-        "case229",
-        "case230",
-        "case231",
-        "case232",
-        "case233",
-        "case234",
-        "case235",
-        "case236",
-        "case237",
-        "case238",
-        "case239",
-        "case240",
-        "case241",
-        "case242",
-        "case243",
-        "case244",
-        "case245",
-        "case246",
-        "case247",
-        "case248",
-        "case249",
-        "case250",
-        "case251",
-        "case252",
-        "case253",
-        "case254",
-        "case255",
-        "case256",
-        "case257",
-        "case258",
-        "case259",
-        "case260",
-        "case261",
-        "case262",
-        "case263",
-        "case264",
-        "case265",
-        "case266",
-        "case267",
-        "case268",
-        "case269",
-        "case270",
-        "case271",
-        "case272",
-        "case273",
-        "case274",
-        "case275",
-        "case276",
-        "case277",
-        "case278",
-        "case279",
-        "case280",
-        "case281",
-        "case282",
-        "case283",
-        "case284",
-        "case285",
-        "case286",
-        "case287",
-        "case288",
-        "case289",
-        "case290",
-        "case291",
-        "case292",
-        "case293",
-        "case294",
-        "case295",
-        "case296",
-        "case297",
-        "case298",
-        "case299",
-        "case300",
-        "case301",
-        "case302",
-        "case303",
-        "case304",
-        "case305",
-        "case306",
-        "case307",
-        "case308",
-        "case309",
-        "case310",
-        "case311",
-        "case312",
-        "case313",
-        "case314",
-        "case315",
-        "case316",
-        "case317",
-        "case318",
-        "case319",
-        "case320",
-        "case321",
-        "case322",
-        "case323",
-        "case324",
-        "case325",
-        "case326",
-        "case327",
-        "case328",
-        "case329",
-        "case330",
-        "case331",
-        "case332",
-        "case333",
-        "case334",
-        "case335",
-        "case336",
-        "case337",
-        "case338",
-        "case339",
-        "case340",
-        "case341",
-        "case342",
-        "case343",
-        "case344",
-        "case345",
-        "case346",
-        "case347",
-        "case348",
-        "case349",
-        "case350",
-        "case351",
-        "case352",
-        "case353",
-        "case354",
-        "case355",
-        "case356",
-        "case357",
-        "case358",
-        "case359",
-        "case360",
-        "case361",
-        "case362",
-        "case363",
-        "case364",
-        "case365",
-        "case366",
-        "case367",
-        "case368",
-        "case369",
-        "case370",
-        "case371",
-        "case372",
-        "case373",
-        "case374",
-        "case375",
-        "case376",
-        "case377",
-        "case378",
-        "case379",
-        "case380",
-        "case381",
-        "case382",
-        "case383",
-        "case384",
-        "case385",
-        "case386",
-        "case387",
-        "case388",
-        "case389",
-        "case390",
-        "case391",
-        "case392",
-        "case393",
-        "case394",
-        "case395",
-        "case396",
-        "case397",
-        "case398",
-        "case399",
-        "case400",
-        "case401",
-        "case402",
-        "case403",
-        "case404",
-        "case405",
-        "case406",
-        "case407",
-        "case408",
-        "case409",
-        "case410",
-        "case411",
-        "case412",
-        "case413",
-        "case414",
-        "case415",
-        "case416",
-        "case417",
-        "case418",
-        "case419",
-        "case420",
-        "case421",
-        "case422",
-        "case423",
-        "case424",
-        "case425",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-@pytest.mark.slow
-def test_sstore_combinations_initial21_paris(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} ->..."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0x1000000000000000000000000000000000000000")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
+state_tests/stTimeConsuming/sstore_combinations_initial21_ParisFiller.json
 
-    pre[contract] = Account(
-        balance=10,
-        nonce=0,
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-    )
-    # Source: LLL
-    # { [[1]] 1 [[1]] 0 [[2]] 1 [[2]] 0 [[3]] 1 [[3]] 0 [[4]] 1 [[4]] 0 [[5]] 1 [[5]] 0 [[6]] 1 [[6]] 0 [[7]] 1 [[7]] 0 [[8]] 1 [[8]] 0 [[9]] 1 [[9]] 0 [[10]] 1 [[10]] 0 [[11]] 1 [[11]] 0 [[12]] 1 [[12]] 0 [[13]] 1 [[13]] 0 [[14]] 1 [[14]] 0 [[15]] 1 [[15]] 0 [[16]] 1 [[16]] 0  [[1]] 1 }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x1)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x1)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x1)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x1)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x1)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x1)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x1)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.SSTORE(key=0xA, value=0x1)
-            + Op.SSTORE(key=0xA, value=0x0)
-            + Op.SSTORE(key=0xB, value=0x1)
-            + Op.SSTORE(key=0xB, value=0x0)
-            + Op.SSTORE(key=0xC, value=0x1)
-            + Op.SSTORE(key=0xC, value=0x0)
-            + Op.SSTORE(key=0xD, value=0x1)
-            + Op.SSTORE(key=0xD, value=0x0)
-            + Op.SSTORE(key=0xE, value=0x1)
-            + Op.SSTORE(key=0xE, value=0x0)
-            + Op.SSTORE(key=0xF, value=0x1)
-            + Op.SSTORE(key=0xF, value=0x0)
-            + Op.SSTORE(key=0x10, value=0x1)
-            + Op.SSTORE(key=0x10, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0x2000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { (REVERT 0 32) }
-    pre.deploy_contract(
-        code=Op.REVERT(offset=0x0, size=0x20) + Op.STOP,
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0x3000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb000000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1, 0x1: 0x1, 0x2: 0x1},
-        nonce=0,
-        address=Address("0xb100000000000000000000000000000000000000"),  # noqa: E501
-    )
-    # Source: LLL
-    # { [[0]] 0  [[1]] 1  [[2]] 2 }
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x1)
-            + Op.SSTORE(key=0x2, value=0x2)
-            + Op.STOP
-        ),
-        storage={0x0: 0x2, 0x1: 0x2, 0x2: 0x2},
-        nonce=0,
-        address=Address("0xb200000000000000000000000000000000000000"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=None,
-        data=tx_data,
-        gas_limit=2000000,
-        value=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
+@manually-enhanced: Do not overwrite. This test has been manually reviewed and
+enhanced.
+"""
diff --git a/tests/ported_static/stTransactionTest/__init__.py b/tests/ported_static/stTransactionTest/__init__.py
index ffbf91c691c..f1d931df1ea 100644
--- a/tests/ported_static/stTransactionTest/__init__.py
+++ b/tests/ported_static/stTransactionTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stTransactionTest."""
+"""Ported static tests: stTransactionTest."""  # noqa: N999
diff --git a/tests/ported_static/stTransactionTest/test_contract_store_clears_oog.py b/tests/ported_static/stTransactionTest/test_contract_store_clears_oog.py
index b06ecc8f86b..7446fbd4b0b 100644
--- a/tests/ported_static/stTransactionTest/test_contract_store_clears_oog.py
+++ b/tests/ported_static/stTransactionTest/test_contract_store_clears_oog.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_contract_store_clears_oog.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/ContractStoreClearsOOGFiller.json
+state_tests/stTransactionTest/ContractStoreClearsOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/ContractStoreClearsOOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/ContractStoreClearsOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_contract_store_clears_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0x2B75D0C814EB07C075FCCBDD9A036FAF651D9C46D7477D6C4F30772CFCA90D38
-    )
+    """Test_contract_store_clears_oog."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x1C9C380)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,48 +43,46 @@ def test_contract_store_clears_oog(
         gas_limit=100000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(SSTORE 0 0)(SSTORE 1 0)(SSTORE 2 0)(SSTORE 3 0)(SSTORE 4 0)(SSTORE 5 0)(SSTORE 6 0)(SSTORE 7 0)(SSTORE 8 0)(SSTORE 9 12)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0xC)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0xC)
+        + Op.STOP,
         storage={
-            0x0: 0xC,
-            0x1: 0xC,
-            0x2: 0xC,
-            0x3: 0xC,
-            0x4: 0xC,
-            0x5: 0xC,
-            0x6: 0xC,
-            0x7: 0xC,
-            0x8: 0xC,
-            0x9: 0xC,
+            0: 12,
+            1: 12,
+            2: 12,
+            3: 12,
+            4: 12,
+            5: 12,
+            6: 12,
+            7: 12,
+            8: 12,
+            9: 12,
         },
         nonce=0,
-        address=Address("0xc9c8ce4628bda9f8bc4a2caaebb3616f83c4305d"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x1C9C380)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=23000,
         value=10,
     )
 
     post = {
-        contract: Account(
+        sender: Account(nonce=1),
+        target: Account(
             storage={
                 0: 12,
                 1: 12,
diff --git a/tests/ported_static/stTransactionTest/test_contract_store_clears_success.py b/tests/ported_static/stTransactionTest/test_contract_store_clears_success.py
index d740e84afc7..90f1ca0d067 100644
--- a/tests/ported_static/stTransactionTest/test_contract_store_clears_success.py
+++ b/tests/ported_static/stTransactionTest/test_contract_store_clears_success.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_contract_store_clears_success.
 
 Ported from:
-tests/static/state_tests/stTransactionTest
-ContractStoreClearsSuccessFiller.json
+state_tests/stTransactionTest/ContractStoreClearsSuccessFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/ContractStoreClearsSuccessFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/ContractStoreClearsSuccessFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_contract_store_clears_success(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xE624AFC0DCCEAD9A7C59F0007C5C5C3B3DD36EED1CFD8F309A68C9BA3D07769B
-    )
+    """Test_contract_store_clears_success."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x8583B00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,46 +43,43 @@ def test_contract_store_clears_success(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0x8583B00)
-    # Source: LLL
+    # Source: lll
     # {(SSTORE 0 0)(SSTORE 1 0)(SSTORE 2 0)(SSTORE 3 0)(SSTORE 4 0)(SSTORE 5 0)(SSTORE 6 0)(SSTORE 7 0)(SSTORE 8 0)(SSTORE 9 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.STOP,
         storage={
-            0x0: 0xC,
-            0x1: 0xC,
-            0x2: 0xC,
-            0x3: 0xC,
-            0x4: 0xC,
-            0x5: 0xC,
-            0x6: 0xC,
-            0x7: 0xC,
-            0x8: 0xC,
-            0x9: 0xC,
+            0: 12,
+            1: 12,
+            2: 12,
+            3: 12,
+            4: 12,
+            5: 12,
+            6: 12,
+            7: 12,
+            8: 12,
+            9: 12,
         },
         nonce=0,
-        address=Address("0xd61e0564fab2b0da5136f75db579b663bd9f2bd8"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=130000,
         value=10,
     )
 
-    post: dict = {}
+    post = {target: Account(storage={}, balance=10)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_create_message_reverted.py b/tests/ported_static/stTransactionTest/test_create_message_reverted.py
index f9aee9abc62..df437e572c1 100644
--- a/tests/ported_static/stTransactionTest/test_create_message_reverted.py
+++ b/tests/ported_static/stTransactionTest/test_create_message_reverted.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_create_message_reverted.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/CreateMessageRevertedFiller.json
+state_tests/stTransactionTest/CreateMessageRevertedFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/CreateMessageRevertedFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/CreateMessageRevertedFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_create_message_reverted(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x2B75D0C814EB07C075FCCBDD9A036FAF651D9C46D7477D6C4F30772CFCA90D38
-    )
+    """Test_create_message_reverted."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x1C9C380)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,26 +43,26 @@ def test_create_message_reverted(
         gas_limit=1000000000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 0 0x600c600055) (CREATE 0 27 5)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x600C600055)
-            + Op.CREATE(value=0x0, offset=0x1B, size=0x5)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x600C600055)
+        + Op.CREATE(value=0x0, offset=0x1B, size=0x5)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc9b0ca064c8b73a1d845547cd28d4e97fe4ec8a0"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x1C9C380)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=21882,
         value=100,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        target: Account(balance=0, nonce=0),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_create_message_success.py b/tests/ported_static/stTransactionTest/test_create_message_success.py
index 4780d7d4790..6f311c8c6e5 100644
--- a/tests/ported_static/stTransactionTest/test_create_message_success.py
+++ b/tests/ported_static/stTransactionTest/test_create_message_success.py
@@ -1,19 +1,20 @@
 """
-Test ported from static filler.
+Test_create_message_success.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/CreateMessageSuccessFiller.json
+state_tests/stTransactionTest/CreateMessageSuccessFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/CreateMessageSuccessFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/CreateMessageSuccessFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +31,10 @@ def test_create_message_success(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_message_success."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x17D78400)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,29 +45,27 @@ def test_create_message_success(
         gas_limit=1000000000000,
     )
 
-    pre[sender] = Account(balance=0x17D78400)
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 0 0x600c600055) (CREATE 0 27 5)}
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x600C600055)
-            + Op.CREATE(value=0x0, offset=0x1B, size=0x5)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x600C600055)
+        + Op.CREATE(value=0x0, offset=0x1B, size=0x5)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=131882,
         value=100,
     )
 
     post = {
-        Address("0xf1ecf98489fa9ed60a664fc4998db699cfa39d40"): Account(
-            storage={0: 12},
+        contract_0: Account(balance=100, nonce=1),
+        compute_create_address(address=contract_0, nonce=0): Account(
+            storage={0: 12}
         ),
     }
 
diff --git a/tests/ported_static/stTransactionTest/test_create_transaction_success.py b/tests/ported_static/stTransactionTest/test_create_transaction_success.py
index a27058eab5c..522b2fdc141 100644
--- a/tests/ported_static/stTransactionTest/test_create_transaction_success.py
+++ b/tests/ported_static/stTransactionTest/test_create_transaction_success.py
@@ -1,41 +1,37 @@
 """
-Test ported from static filler.
+Test_create_transaction_success.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/CreateTransactionSuccessFiller.json
+state_tests/stTransactionTest/CreateTransactionSuccessFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/CreateTransactionSuccessFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/CreateTransactionSuccessFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_create_transaction_success(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_transaction_success."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,19 +42,37 @@ def test_create_transaction_success(
         gas_limit=1000000000000,
     )
 
-    pre[sender] = Account(balance=0x5F5E100)
-
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "602280600c6000396000f30060e060020a600035048063f8a8fd6d14601457005b601a60"  # noqa: E501
-            "20565b60006000f35b56"
-        ),
+        data=Op.PUSH1[0x22]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP
+        + Op.DIV(Op.CALLDATALOAD(offset=0x0), Op.EXP(0x2, 0xE0))
+        + Op.JUMPI(pc=0x14, condition=Op.EQ(0xF8A8FD6D, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1A]
+        + Op.JUMP(pc=0x20)
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.JUMP,
         gas_limit=70000,
         value=100,
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=sender, nonce=0): Account(
+            storage={},
+            code=bytes.fromhex(
+                "60e060020a600035048063f8a8fd6d14601457005b601a6020565b60006000f35b56"  # noqa: E501
+            ),
+            balance=100,
+            nonce=1,
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_empty_transaction3.py b/tests/ported_static/stTransactionTest/test_empty_transaction3.py
index 6e38f9ebcbe..1fb6202c846 100644
--- a/tests/ported_static/stTransactionTest/test_empty_transaction3.py
+++ b/tests/ported_static/stTransactionTest/test_empty_transaction3.py
@@ -1,19 +1,20 @@
 """
-Test ported from static filler.
+Test_empty_transaction3.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/EmptyTransaction3Filler.json
+state_tests/stTransactionTest/EmptyTransaction3Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -21,21 +22,16 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/EmptyTransaction3Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/EmptyTransaction3Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_empty_transaction3(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_empty_transaction3."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,14 +42,16 @@ def test_empty_transaction3(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0x5F5E100)
-
     tx = Transaction(
         sender=sender,
         to=None,
+        data=Bytes(""),
         gas_limit=55000,
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=sender, nonce=0): Account(code=b""),
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_high_gas_limit.py b/tests/ported_static/stTransactionTest/test_high_gas_limit.py
index 00e3128edc8..db5ce28e428 100644
--- a/tests/ported_static/stTransactionTest/test_high_gas_limit.py
+++ b/tests/ported_static/stTransactionTest/test_high_gas_limit.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_high_gas_limit.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/HighGasLimitFiller.json
+state_tests/stTransactionTest/HighGasLimitFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -21,21 +22,19 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stTransactionTest/HighGasLimitFiller.json"],
+    ["state_tests/stTransactionTest/HighGasLimitFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_high_gas_limit(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_high_gas_limit."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x50EADFB1030587AB3A993A6ECC073041FC3B45E119DAA31A13D78C7E209631A5
     )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,59 +46,22 @@ def test_high_gas_limit(
     )
 
     pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("3240349548983454"),
+        to=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),
+        data=Bytes("3240349548983454"),
         gas_limit=100000,
         value=900,
     )
 
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stTransactionTest/HighGasLimitFiller.json"],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_high_gas_limit_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x50EADFB1030587AB3A993A6ECC073041FC3B45E119DAA31A13D78C7E209631A5
-    )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("3240349548983454"),
-        gas_limit=100000,
-        value=900,
-    )
-
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B): Account(
+            balance=900
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_high_gas_price_paris.py b/tests/ported_static/stTransactionTest/test_high_gas_price_paris.py
index 5505c543ebd..8c6398c3164 100644
--- a/tests/ported_static/stTransactionTest/test_high_gas_price_paris.py
+++ b/tests/ported_static/stTransactionTest/test_high_gas_price_paris.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_high_gas_price_paris.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/HighGasPriceParisFiller.yml
+state_tests/stTransactionTest/HighGasPriceParisFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,21 +22,17 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stTransactionTest/HighGasPriceParisFiller.yml"],
+    ["state_tests/stTransactionTest/HighGasPriceParisFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 @pytest.mark.exception_test
 def test_high_gas_price_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
-    )
-    contract = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_high_gas_price_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3B9ACA00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,20 +43,23 @@ def test_high_gas_price_paris(
         gas_limit=89128960,
     )
 
-    pre[contract] = Account(balance=10, nonce=0)
-    pre[sender] = Account(balance=0x3B9ACA00)
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        gas_price=5513909011300771210646237381366090850155713555506693525688456381329244268,  # noqa: E501
+        to=addr,
+        data=Bytes(""),
         value=1,
+        gas_price=5513909011300771210646237381366090850155713555506693525688456381329244268,  # noqa: E501
         error=[
             TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
             TransactionException.GASLIMIT_PRICE_PRODUCT_OVERFLOW,
         ],
     )
 
-    post: dict = {}
+    post = {
+        coinbase: Account.NONEXISTENT,
+        addr: Account(balance=10),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_internal_call_hitting_gas_limit.py b/tests/ported_static/stTransactionTest/test_internal_call_hitting_gas_limit.py
index 894dc586a7a..d2cce97dd88 100644
--- a/tests/ported_static/stTransactionTest/test_internal_call_hitting_gas_limit.py
+++ b/tests/ported_static/stTransactionTest/test_internal_call_hitting_gas_limit.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_internal_call_hitting_gas_limit.
 
 Ported from:
-tests/static/state_tests/stTransactionTest
-InternalCallHittingGasLimitFiller.json
+state_tests/stTransactionTest/InternalCallHittingGasLimitFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/InternalCallHittingGasLimitFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/InternalCallHittingGasLimitFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_internal_call_hitting_gas_limit(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
-    )
+    """Test_internal_call_hitting_gas_limit."""
+    coinbase = Address(0x2ADF5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x3B9ACA00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,39 +43,37 @@ def test_internal_call_hitting_gas_limit(
         gas_limit=100000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {[[1]]55}
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x37) + Op.STOP,
         nonce=0,
-        address=Address("0x9f499a40cbc961c5230197401ce369d5c53ed896"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (CALL 5000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x1388,
-                address=0x9F499A40CBC961C5230197401CE369D5C53ED896,
-                value=0x1,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x1388,
+            address=addr,
+            value=0x1,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xF4240,
         nonce=0,
-        address=Address("0xb208128346fe6a0c4efa386c0c411a56e4557e2a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3B9ACA00)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=21100,
         value=10,
     )
 
-    post: dict = {}
+    post = {addr: Account(storage={}, balance=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_internal_call_hitting_gas_limit2.py b/tests/ported_static/stTransactionTest/test_internal_call_hitting_gas_limit2.py
index a94711ace89..78bcdfa205f 100644
--- a/tests/ported_static/stTransactionTest/test_internal_call_hitting_gas_limit2.py
+++ b/tests/ported_static/stTransactionTest/test_internal_call_hitting_gas_limit2.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_internal_call_hitting_gas_limit2.
 
 Ported from:
-tests/static/state_tests/stTransactionTest
-InternalCallHittingGasLimit2Filler.json
+state_tests/stTransactionTest/InternalCallHittingGasLimit2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/InternalCallHittingGasLimit2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/InternalCallHittingGasLimit2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_internal_call_hitting_gas_limit2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
-    )
+    """Test_internal_call_hitting_gas_limit2."""
+    coinbase = Address(0x2ADF5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x3B9ACA00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,38 +43,36 @@ def test_internal_call_hitting_gas_limit2(
         gas_limit=47766,
     )
 
-    # Source: LLL
-    # { (CALL 25000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x61A8,
-                address=0x9F499A40CBC961C5230197401CE369D5C53ED896,
-                value=0x1,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {[[1]]55}
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x37) + Op.STOP,
         nonce=0,
-        address=Address("0x786a1ab68bb1c7eb88a1b844d6f4d4a51022de2c"),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x37) + Op.STOP,
+    # Source: lll
+    # { (CALL 25000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x61A8,
+            address=addr,
+            value=0x1,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9f499a40cbc961c5230197401ce369d5c53ed896"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3B9ACA00)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=47766,
         value=10,
     )
 
-    post: dict = {}
+    post = {addr: Account(storage={}, balance=0)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_internal_call_hitting_gas_limit_success.py b/tests/ported_static/stTransactionTest/test_internal_call_hitting_gas_limit_success.py
index ce60e4c945c..89723d06162 100644
--- a/tests/ported_static/stTransactionTest/test_internal_call_hitting_gas_limit_success.py
+++ b/tests/ported_static/stTransactionTest/test_internal_call_hitting_gas_limit_success.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_internal_call_hitting_gas_limit_success.
 
 Ported from:
-tests/static/state_tests/stTransactionTest
-InternalCallHittingGasLimitSuccessFiller.json
+state_tests/stTransactionTest/InternalCallHittingGasLimitSuccessFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stTransactionTest/InternalCallHittingGasLimitSuccessFiller.json",  # noqa: E501
+        "state_tests/stTransactionTest/InternalCallHittingGasLimitSuccessFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_internal_call_hitting_gas_limit_success(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
-    )
+    """Test_internal_call_hitting_gas_limit_success."""
+    coinbase = Address(0x2ADF5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x3B9ACA00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,40 +45,36 @@ def test_internal_call_hitting_gas_limit_success(
         gas_limit=220000,
     )
 
-    # Source: LLL
-    # { (CALL 25000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x61A8,
-                address=0x9F499A40CBC961C5230197401CE369D5C53ED896,
-                value=0x1,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    # Source: lll
+    # {[[1]]55}
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=0x37) + Op.STOP,
         nonce=0,
-        address=Address("0x786a1ab68bb1c7eb88a1b844d6f4d4a51022de2c"),  # noqa: E501
     )
-    callee = pre.deploy_contract(
-        code=Op.SSTORE(key=0x1, value=0x37) + Op.STOP,
+    # Source: lll
+    # { (CALL 25000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 1 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x61A8,
+            address=addr,
+            value=0x1,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x9f499a40cbc961c5230197401ce369d5c53ed896"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x3B9ACA00)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=150000,
         value=10,
     )
 
-    post = {
-        callee: Account(storage={1: 55}),
-    }
+    post = {addr: Account(storage={1: 55}, balance=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_internal_call_store_clears_oog.py b/tests/ported_static/stTransactionTest/test_internal_call_store_clears_oog.py
index 9ef3c2e856f..d8227b78df4 100644
--- a/tests/ported_static/stTransactionTest/test_internal_call_store_clears_oog.py
+++ b/tests/ported_static/stTransactionTest/test_internal_call_store_clears_oog.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_internal_call_store_clears_oog.
 
 Ported from:
-tests/static/state_tests/stTransactionTest
-InternalCallStoreClearsOOGFiller.json
+state_tests/stTransactionTest/InternalCallStoreClearsOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/InternalCallStoreClearsOOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/InternalCallStoreClearsOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_internal_call_store_clears_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
-    )
+    """Test_internal_call_store_clears_oog."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x3B9ACA00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,65 +43,61 @@ def test_internal_call_store_clears_oog(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { (CALL 40000 <contract:0x0000000000000000000000000000000000000000> 1 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x9C40,
-                address=0xD61E0564FAB2B0DA5136F75DB579B663BD9F2BD8,
-                value=0x1,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=10,
-        nonce=0,
-        address=Address("0x30bfe899ef735d5aaca102952664a74b1de046af"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x3B9ACA00)
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {(SSTORE 0 0)(SSTORE 1 0)(SSTORE 2 0)(SSTORE 3 0)(SSTORE 4 0)(SSTORE 5 0)(SSTORE 6 0)(SSTORE 7 0)(SSTORE 8 0)(SSTORE 9 0)}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.STOP,
         storage={
-            0x0: 0xC,
-            0x1: 0xC,
-            0x2: 0xC,
-            0x3: 0xC,
-            0x4: 0xC,
-            0x5: 0xC,
-            0x6: 0xC,
-            0x7: 0xC,
-            0x8: 0xC,
-            0x9: 0xC,
+            0: 12,
+            1: 12,
+            2: 12,
+            3: 12,
+            4: 12,
+            5: 12,
+            6: 12,
+            7: 12,
+            8: 12,
+            9: 12,
         },
         nonce=0,
-        address=Address("0xd61e0564fab2b0da5136f75db579b663bd9f2bd8"),  # noqa: E501
+    )
+    # Source: lll
+    # { (CALL 40000 <contract:0x0000000000000000000000000000000000000000> 1 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x9C40,
+            address=addr,
+            value=0x1,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=10,
+        nonce=0,
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=160000,
         value=10,
     )
 
     post = {
-        callee: Account(
+        addr: Account(
             storage={
                 0: 12,
                 1: 12,
@@ -119,7 +110,10 @@ def test_internal_call_store_clears_oog(
                 8: 12,
                 9: 12,
             },
+            balance=0,
         ),
+        sender: Account(nonce=1),
+        target: Account(balance=20),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_internal_call_store_clears_success.py b/tests/ported_static/stTransactionTest/test_internal_call_store_clears_success.py
index 93c72f62249..bdd47e999a2 100644
--- a/tests/ported_static/stTransactionTest/test_internal_call_store_clears_success.py
+++ b/tests/ported_static/stTransactionTest/test_internal_call_store_clears_success.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_internal_call_store_clears_success.
 
 Ported from:
-tests/static/state_tests/stTransactionTest
-InternalCallStoreClearsSuccessFiller.json
+state_tests/stTransactionTest/InternalCallStoreClearsSuccessFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stTransactionTest/InternalCallStoreClearsSuccessFiller.json",  # noqa: E501
+        "state_tests/stTransactionTest/InternalCallStoreClearsSuccessFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_internal_call_store_clears_success(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
-    )
+    """Test_internal_call_store_clears_success."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x3B9ACA00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,63 +45,63 @@ def test_internal_call_store_clears_success(
         gas_limit=1000000,
     )
 
-    # Source: LLL
-    # { (CALL 100000 <contract:0x0000000000000000000000000000000000000000> 1 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0x186A0,
-                address=0xD61E0564FAB2B0DA5136F75DB579B663BD9F2BD8,
-                value=0x1,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=10,
-        nonce=0,
-        address=Address("0x4583a4f45bcb657469d752196a99ed546c8464ef"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0x3B9ACA00)
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {(SSTORE 0 0)(SSTORE 1 0)(SSTORE 2 0)(SSTORE 3 0)(SSTORE 4 0)(SSTORE 5 0)(SSTORE 6 0)(SSTORE 7 0)(SSTORE 8 0)(SSTORE 9 0)}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.STOP,
         storage={
-            0x0: 0xC,
-            0x1: 0xC,
-            0x2: 0xC,
-            0x3: 0xC,
-            0x4: 0xC,
-            0x5: 0xC,
-            0x6: 0xC,
-            0x7: 0xC,
-            0x8: 0xC,
-            0x9: 0xC,
+            0: 12,
+            1: 12,
+            2: 12,
+            3: 12,
+            4: 12,
+            5: 12,
+            6: 12,
+            7: 12,
+            8: 12,
+            9: 12,
         },
         nonce=0,
-        address=Address("0xd61e0564fab2b0da5136f75db579b663bd9f2bd8"),  # noqa: E501
+    )
+    # Source: lll
+    # { (CALL 100000 <contract:0x0000000000000000000000000000000000000000> 1 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0x186A0,
+            address=addr,
+            value=0x1,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=10,
+        nonce=0,
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=160000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        addr: Account(storage={}, balance=1),
+        sender: Account(nonce=1),
+        target: Account(balance=19),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_no_src_account.py b/tests/ported_static/stTransactionTest/test_no_src_account.py
index d58f203034c..1a5c3d9e625 100644
--- a/tests/ported_static/stTransactionTest/test_no_src_account.py
+++ b/tests/ported_static/stTransactionTest/test_no_src_account.py
@@ -1,467 +1,247 @@
 """
-Test ported from static filler.
+Test_no_src_account.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/NoSrcAccountFiller.yml
+state_tests/stTransactionTest/NoSrcAccountFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     AccessList,
     Address,
     Alloc,
+    Bytes,
     Environment,
     Hash,
     StateTestFiller,
     Transaction,
     TransactionException,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stTransactionTest/NoSrcAccountFiller.yml"],
+    ["state_tests/stTransactionTest/NoSrcAccountFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, tx_value, tx_access_list, tx_error",
+    "d, g, v",
     [
         pytest.param(
-            "",
-            21000,
             0,
-            None,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case0",
+            0,
+            0,
+            id="d0-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "",
-            21000,
+            0,
+            0,
             1,
-            None,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case1",
+            id="d0-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "",
-            210000,
             0,
-            None,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case2",
+            1,
+            0,
+            id="d0-g1-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "",
-            210000,
+            0,
+            1,
             1,
-            None,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case3",
+            id="d0-g1-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "",
             0,
+            2,
             0,
-            None,
-            TransactionException.INTRINSIC_GAS_TOO_LOW,
-            id="case4",
+            id="d0-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "",
             0,
+            2,
             1,
-            None,
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case5",
+            id="d0-g2-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "dead60a7",
-            21000,
+            1,
+            0,
             0,
-            None,
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case6",
+            id="d1-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "dead60a7",
-            21000,
             1,
-            None,
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case7",
+            0,
+            1,
+            id="d1-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "dead60a7",
-            210000,
+            1,
+            1,
             0,
-            None,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case8",
+            id="d1-g1-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "dead60a7",
-            210000,
             1,
-            None,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case9",
+            1,
+            1,
+            id="d1-g1-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "dead60a7",
-            0,
+            1,
+            2,
             0,
-            None,
-            TransactionException.INTRINSIC_GAS_TOO_LOW,
-            id="case10",
+            id="d1-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "dead60a7",
-            0,
             1,
-            None,
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case11",
+            2,
+            1,
+            id="d1-g2-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            21000,
+            2,
+            0,
             0,
-            [],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case12",
+            id="d2-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            21000,
+            2,
+            0,
             1,
-            [],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case13",
+            id="d2-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            210000,
+            2,
+            1,
             0,
-            [],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case14",
+            id="d2-g1-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            210000,
+            2,
+            1,
             1,
-            [],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case15",
+            id="d2-g1-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
+            2,
+            2,
             0,
-            0,
-            [],
-            TransactionException.INTRINSIC_GAS_TOO_LOW,
-            id="case16",
+            id="d2-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            0,
+            2,
+            2,
             1,
-            [],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case17",
+            id="d2-g2-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            21000,
+            3,
+            0,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case18",
+            id="d3-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            21000,
+            3,
+            0,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case19",
+            id="d3-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            210000,
+            3,
+            1,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case20",
+            id="d3-g1-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            210000,
+            3,
+            1,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case21",
+            id="d3-g1-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
+            3,
+            2,
             0,
-            0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            TransactionException.INTRINSIC_GAS_TOO_LOW,
-            id="case22",
+            id="d3-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            0,
+            3,
+            2,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case23",
+            id="d3-g2-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            21000,
+            4,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case24",
+            0,
+            id="d4-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            21000,
+            4,
+            0,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case25",
+            id="d4-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            210000,
+            4,
+            1,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case26",
+            id="d4-g1-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            210000,
+            4,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case27",
+            1,
+            id="d4-g1-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            0,
+            4,
+            2,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            TransactionException.INTRINSIC_GAS_TOO_LOW,
-            id="case28",
+            id="d4-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            0,
+            4,
+            2,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case29",
+            id="d4-g2-v1",
             marks=pytest.mark.exception_test,
         ),
     ],
@@ -470,17 +250,14 @@
 def test_no_src_account(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    tx_value: int,
-    tx_access_list: list | None,
-    tx_error: object,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4A2FFC8867FD8D1773481CF13F36E44F033133C579520D2745E46C3BBBF21E6A
-    )
+    """Test_no_src_account."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -491,26 +268,189 @@ def test_no_src_account(
         gas_limit=89128960,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex("00"),
+    # Source: raw
+    # 0x00
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.STOP,
         nonce=0,
-        address=Address("0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": [0, 1], "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Frontier": TransactionException.INSUFFICIENT_ACCOUNT_FUNDS
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Frontier": [
+                    TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                    TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ]
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Frontier": TransactionException.INSUFFICIENT_ACCOUNT_FUNDS
+            },
+        },
+        {
+            "indexes": {"data": [0, 1], "gas": 2, "value": 1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Frontier": [
+                    TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                    TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ]
+            },
+        },
+        {
+            "indexes": {"data": [0, 1], "gas": 2, "value": 0},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Frontier": TransactionException.INTRINSIC_GAS_TOO_LOW
+            },
+        },
+        {
+            "indexes": {"data": 2, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": [
+                    TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                    TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ],
+                ">=Frontier<MuirGlacier": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+        {
+            "indexes": {"data": 2, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                ">=Frontier<MuirGlacier": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": [
+                    TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                    TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ],
+                ">=Frontier<MuirGlacier": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+        {
+            "indexes": {"data": 3, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                ">=Frontier<MuirGlacier": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+        {
+            "indexes": {"data": 4, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": [
+                    TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                    TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ],
+                ">=Frontier<MuirGlacier": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+        {
+            "indexes": {"data": 4, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                ">=Frontier<MuirGlacier": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+        {
+            "indexes": {"data": [2, 3, 4], "gas": 2, "value": 1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": [
+                    TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                    TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ],
+                ">=Frontier<MuirGlacier": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+        {
+            "indexes": {"data": [2, 3, 4], "gas": 2, "value": 0},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ">=Frontier<MuirGlacier": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+        Bytes("dead60a7"),
+        Bytes("00"),
+        Bytes("00"),
+        Bytes("00"),
+    ]
+    tx_gas = [21000, 210000, 0]
+    tx_value = [0, 1]
+    tx_access_lists: dict[int, list] = {
+        2: [],
+        3: [
+            AccessList(
+                address=target,
+                storage_keys=[],
+            ),
+        ],
+        4: [
+            AccessList(
+                address=target,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+    }
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
         gas_price=100,
-        value=tx_value,
-        access_list=tx_access_list,
-        error=tx_error,
+        access_list=tx_access_lists.get(d),
+        error=_exc,
     )
 
-    post: dict = {}
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_no_src_account1559.py b/tests/ported_static/stTransactionTest/test_no_src_account1559.py
index 6cfed4bce48..d87e3e0e0be 100644
--- a/tests/ported_static/stTransactionTest/test_no_src_account1559.py
+++ b/tests/ported_static/stTransactionTest/test_no_src_account1559.py
@@ -1,329 +1,163 @@
 """
-Test ported from static filler.
+Test_no_src_account1559.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/NoSrcAccount1559Filler.yml
+state_tests/stTransactionTest/NoSrcAccount1559Filler.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     AccessList,
     Address,
     Alloc,
+    Bytes,
     Environment,
     Hash,
     StateTestFiller,
     Transaction,
     TransactionException,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stTransactionTest/NoSrcAccount1559Filler.yml"],
+    ["state_tests/stTransactionTest/NoSrcAccount1559Filler.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, tx_value, tx_access_list, tx_error",
+    "d, g, v",
     [
         pytest.param(
-            21000,
             0,
-            [],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case0",
+            0,
+            0,
+            id="d0-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            21000,
+            0,
+            0,
             1,
-            [],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case1",
+            id="d0-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            210000,
             0,
-            [],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case2",
+            1,
+            0,
+            id="d0-g1-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            210000,
+            0,
             1,
-            [],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case3",
+            1,
+            id="d0-g1-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
             0,
+            2,
             0,
-            [],
-            TransactionException.INTRINSIC_GAS_TOO_LOW,
-            id="case4",
+            id="d0-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
             0,
+            2,
             1,
-            [],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case5",
+            id="d0-g2-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            21000,
+            1,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case6",
+            0,
+            id="d1-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            21000,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case7",
+            0,
+            1,
+            id="d1-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            210000,
+            1,
+            1,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case8",
+            id="d1-g1-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            210000,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case9",
+            1,
+            1,
+            id="d1-g1-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
+            1,
+            2,
             0,
-            0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            TransactionException.INTRINSIC_GAS_TOO_LOW,
-            id="case10",
+            id="d1-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            0,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case11",
+            2,
+            1,
+            id="d1-g2-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            21000,
+            2,
+            0,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case12",
+            id="d2-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            21000,
+            2,
+            0,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case13",
+            id="d2-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            210000,
+            2,
+            1,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case14",
+            id="d2-g1-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            210000,
+            2,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case15",
+            1,
+            id="d2-g1-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
+            2,
+            2,
             0,
-            0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            TransactionException.INTRINSIC_GAS_TOO_LOW,
-            id="case16",
+            id="d2-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            0,
+            2,
+            2,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case17",
+            id="d2-g2-v1",
             marks=pytest.mark.exception_test,
         ),
     ],
@@ -332,16 +166,14 @@
 def test_no_src_account1559(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    tx_value: int,
-    tx_access_list: list | None,
-    tx_error: object,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4A2FFC8867FD8D1773481CF13F36E44F033133C579520D2745E46C3BBBF21E6A
-    )
+    """Test_no_src_account1559."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -352,25 +184,100 @@ def test_no_src_account1559(
         gas_limit=89128960,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=bytes.fromhex("00"),
+    # Source: raw
+    # 0x00
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.STOP,
         nonce=0,
-        address=Address("0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"),  # noqa: E501
     )
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": [
+                    TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                    TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ],
+                ">=Frontier<MuirGlacier,Berlin": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                ">=Frontier<MuirGlacier,Berlin": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 2, "value": 1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": [
+                    TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                    TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ],
+                ">=Frontier<MuirGlacier,Berlin": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 2, "value": 0},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ">=Frontier<MuirGlacier,Berlin": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("00"),
+        Bytes("00"),
+        Bytes("00"),
+    ]
+    tx_gas = [21000, 210000, 0]
+    tx_value = [0, 1]
+    tx_access_lists: dict[int, list] = {
+        0: [],
+        1: [
+            AccessList(
+                address=target,
+                storage_keys=[],
+            ),
+        ],
+        2: [
+            AccessList(
+                address=target,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+    }
+
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00"),
-        gas_limit=tx_gas_limit,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
         max_fee_per_gas=2000,
         max_priority_fee_per_gas=10,
-        value=tx_value,
-        access_list=tx_access_list,
-        error=tx_error,
+        access_list=tx_access_lists.get(d),
+        error=_exc,
     )
 
-    post: dict = {}
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_no_src_account_create.py b/tests/ported_static/stTransactionTest/test_no_src_account_create.py
index b122fbd9664..eb70f1d3636 100644
--- a/tests/ported_static/stTransactionTest/test_no_src_account_create.py
+++ b/tests/ported_static/stTransactionTest/test_no_src_account_create.py
@@ -1,475 +1,247 @@
 """
-Test ported from static filler.
+Test_no_src_account_create.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/NoSrcAccountCreateFiller.yml
+state_tests/stTransactionTest/NoSrcAccountCreateFiller.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     AccessList,
     Address,
     Alloc,
+    Bytes,
     Environment,
     Hash,
     StateTestFiller,
     Transaction,
     TransactionException,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/NoSrcAccountCreateFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/NoSrcAccountCreateFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, tx_value, tx_access_list, tx_error",
+    "d, g, v",
     [
         pytest.param(
-            "",
-            21000,
             0,
-            None,
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case0",
+            0,
+            0,
+            id="d0-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "",
-            21000,
+            0,
+            0,
             1,
-            None,
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case1",
+            id="d0-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "",
-            210000,
             0,
-            None,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case2",
+            1,
+            0,
+            id="d0-g1-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "",
-            210000,
+            0,
+            1,
             1,
-            None,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case3",
+            id="d0-g1-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "",
             0,
+            2,
             0,
-            None,
-            TransactionException.INTRINSIC_GAS_TOO_LOW,
-            id="case4",
+            id="d0-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "",
             0,
+            2,
             1,
-            None,
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case5",
+            id="d0-g2-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "dead60a7",
-            21000,
+            1,
             0,
-            None,
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case6",
+            0,
+            id="d1-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "dead60a7",
-            21000,
             1,
-            None,
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case7",
+            0,
+            1,
+            id="d1-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "dead60a7",
-            210000,
+            1,
+            1,
             0,
-            None,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case8",
+            id="d1-g1-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "dead60a7",
-            210000,
             1,
-            None,
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case9",
+            1,
+            1,
+            id="d1-g1-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "dead60a7",
-            0,
+            1,
+            2,
             0,
-            None,
-            TransactionException.INTRINSIC_GAS_TOO_LOW,
-            id="case10",
+            id="d1-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "dead60a7",
-            0,
             1,
-            None,
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case11",
+            2,
+            1,
+            id="d1-g2-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            21000,
+            2,
             0,
-            [],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case12",
+            0,
+            id="d2-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            21000,
+            2,
+            0,
             1,
-            [],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case13",
+            id="d2-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            210000,
+            2,
+            1,
             0,
-            [],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case14",
+            id="d2-g1-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            210000,
+            2,
             1,
-            [],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case15",
+            1,
+            id="d2-g1-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            0,
+            2,
+            2,
             0,
-            [],
-            TransactionException.INTRINSIC_GAS_TOO_LOW,
-            id="case16",
+            id="d2-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            0,
+            2,
+            2,
             1,
-            [],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case17",
+            id="d2-g2-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            21000,
+            3,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case18",
+            0,
+            id="d3-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            21000,
+            3,
+            0,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case19",
+            id="d3-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            210000,
+            3,
+            1,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case20",
+            id="d3-g1-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            210000,
+            3,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case21",
+            1,
+            id="d3-g1-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            0,
+            3,
+            2,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            TransactionException.INTRINSIC_GAS_TOO_LOW,
-            id="case22",
+            id="d3-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            0,
+            3,
+            2,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case23",
+            id="d3-g2-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            21000,
+            4,
+            0,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case24",
+            id="d4-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            21000,
+            4,
+            0,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case25",
+            id="d4-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            210000,
+            4,
+            1,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case26",
+            id="d4-g1-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            210000,
+            4,
+            1,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case27",
+            id="d4-g1-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            0,
+            4,
+            2,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            TransactionException.INTRINSIC_GAS_TOO_LOW,
-            id="case28",
+            id="d4-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            "00",
-            0,
+            4,
+            2,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case29",
+            id="d4-g2-v1",
             marks=pytest.mark.exception_test,
         ),
     ],
@@ -478,17 +250,14 @@
 def test_no_src_account_create(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    tx_value: int,
-    tx_access_list: list | None,
-    tx_error: object,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4A2FFC8867FD8D1773481CF13F36E44F033133C579520D2745E46C3BBBF21E6A
-    )
+    """Test_no_src_account_create."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -499,26 +268,151 @@ def test_no_src_account_create(
         gas_limit=89128960,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=bytes.fromhex("00"),
+    # Source: raw
+    # 0x00
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.STOP,
         nonce=0,
-        address=Address("0x4d7b154e5bf8310a4d8220c8eed80020e4b8f86f"),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Homestead": [
+                    TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                    TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ],
+                "Frontier": TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Frontier": [
+                    TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                    TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ]
+            },
+        },
+        {
+            "indexes": {"data": [0, 1], "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Frontier": TransactionException.INSUFFICIENT_ACCOUNT_FUNDS
+            },
+        },
+        {
+            "indexes": {"data": [0, 1], "gas": 2, "value": 1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Frontier": [
+                    TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                    TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ]
+            },
+        },
+        {
+            "indexes": {"data": [0, 1], "gas": 2, "value": 0},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Frontier": TransactionException.INTRINSIC_GAS_TOO_LOW
+            },
+        },
+        {
+            "indexes": {"data": [2, 3, 4], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": [
+                    TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                    TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ],
+                ">=Frontier<MuirGlacier": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+        {
+            "indexes": {"data": [2, 3, 4], "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                ">=Frontier<MuirGlacier": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+        {
+            "indexes": {"data": [2, 3, 4], "gas": 2, "value": 1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": [
+                    TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                    TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ],
+                ">=Frontier<MuirGlacier": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+        {
+            "indexes": {"data": [2, 3, 4], "gas": 2, "value": 0},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ">=Frontier<MuirGlacier": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(""),
+        Bytes("dead60a7"),
+        Op.STOP,
+        Op.STOP,
+        Op.STOP,
+    ]
+    tx_gas = [21000, 210000, 0]
+    tx_value = [0, 1]
+    tx_access_lists: dict[int, list] = {
+        2: [],
+        3: [
+            AccessList(
+                address=addr,
+                storage_keys=[],
+            ),
+        ],
+        4: [
+            AccessList(
+                address=addr,
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+    }
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
         gas_price=100,
-        value=tx_value,
-        access_list=tx_access_list,
-        error=tx_error,
+        access_list=tx_access_lists.get(d),
+        error=_exc,
     )
 
-    post: dict = {}
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_no_src_account_create1559.py b/tests/ported_static/stTransactionTest/test_no_src_account_create1559.py
index 3e1bb2fdbdb..8438ccb8900 100644
--- a/tests/ported_static/stTransactionTest/test_no_src_account_create1559.py
+++ b/tests/ported_static/stTransactionTest/test_no_src_account_create1559.py
@@ -1,15 +1,13 @@
 """
-Test ported from static filler.
+Test_no_src_account_create1559.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/NoSrcAccountCreate1559Filler.yml
+state_tests/stTransactionTest/NoSrcAccountCreate1559Filler.yml
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     AccessList,
-    Account,
     Address,
     Alloc,
     Environment,
@@ -18,334 +16,162 @@
     Transaction,
     TransactionException,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/NoSrcAccountCreate1559Filler.yml",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/NoSrcAccountCreate1559Filler.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, tx_value, tx_access_list, tx_error",
+    "d, g, v",
     [
         pytest.param(
-            21000,
             0,
-            [],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case0",
+            0,
+            0,
+            id="d0-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            21000,
+            0,
+            0,
             1,
-            [],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case1",
+            id="d0-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            210000,
             0,
-            [],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case2",
+            1,
+            0,
+            id="d0-g1-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            210000,
+            0,
+            1,
             1,
-            [],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case3",
+            id="d0-g1-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
             0,
+            2,
             0,
-            [],
-            TransactionException.INTRINSIC_GAS_TOO_LOW,
-            id="case4",
+            id="d0-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
             0,
+            2,
             1,
-            [],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case5",
+            id="d0-g2-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            21000,
+            1,
+            0,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0xd0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case6",
+            id="d1-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            21000,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0xd0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case7",
+            0,
+            1,
+            id="d1-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            210000,
+            1,
+            1,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0xd0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case8",
+            id="d1-g1-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            210000,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0xd0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case9",
+            1,
+            1,
+            id="d1-g1-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
+            1,
+            2,
             0,
-            0,
-            [
-                AccessList(
-                    address=Address(
-                        "0xd0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            TransactionException.INTRINSIC_GAS_TOO_LOW,
-            id="case10",
+            id="d1-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            0,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0xd0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0"
-                    ),
-                    storage_keys=[],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case11",
+            2,
+            1,
+            id="d1-g2-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            21000,
+            2,
+            0,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0xd0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case12",
+            id="d2-g0-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            21000,
+            2,
+            0,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0xd0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case13",
+            id="d2-g0-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            210000,
+            2,
+            1,
             0,
-            [
-                AccessList(
-                    address=Address(
-                        "0xd0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case14",
+            id="d2-g1-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            210000,
+            2,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0xd0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-            id="case15",
+            1,
+            id="d2-g1-v1",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
+            2,
+            2,
             0,
-            0,
-            [
-                AccessList(
-                    address=Address(
-                        "0xd0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            TransactionException.INTRINSIC_GAS_TOO_LOW,
-            id="case16",
+            id="d2-g2-v0",
             marks=pytest.mark.exception_test,
         ),
         pytest.param(
-            0,
+            2,
+            2,
             1,
-            [
-                AccessList(
-                    address=Address(
-                        "0xd0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0"
-                    ),
-                    storage_keys=[
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-                        ),
-                        Hash(
-                            "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-                        ),
-                    ],
-                )
-            ],
-            [
-                TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
-                TransactionException.INTRINSIC_GAS_TOO_LOW,
-            ],
-            id="case17",
+            id="d2-g2-v1",
             marks=pytest.mark.exception_test,
         ),
     ],
 )
-@pytest.mark.pre_alloc_mutable
 def test_no_src_account_create1559(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    tx_value: int,
-    tx_access_list: list | None,
-    tx_error: object,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4A2FFC8867FD8D1773481CF13F36E44F033133C579520D2745E46C3BBBF21E6A
-    )
-    contract = Address("0xc22941800a5a392672dc35d8e088ba1bc90891b1")
+    """Test_no_src_account_create1559."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -356,20 +182,95 @@ def test_no_src_account_create1559(
         gas_limit=89128960,
     )
 
-    pre[contract] = Account(balance=0, nonce=24743)
+    addr = pre.fund_eoa(amount=0)  # noqa: F841
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": [
+                    TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                    TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ],
+                ">=Frontier<MuirGlacier,Berlin": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                ">=Frontier<MuirGlacier,Berlin": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 2, "value": 1},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": [
+                    TransactionException.INSUFFICIENT_ACCOUNT_FUNDS,
+                    TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ],
+                ">=Frontier<MuirGlacier,Berlin": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 2, "value": 0},
+            "network": [">=Cancun"],
+            "result": {},
+            "expect_exception": {
+                ">=Cancun": TransactionException.INTRINSIC_GAS_TOO_LOW,
+                ">=Frontier<MuirGlacier,Berlin": TransactionException.TYPE_NOT_SUPPORTED,  # noqa: E501
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.STOP,
+        Op.STOP,
+        Op.STOP,
+    ]
+    tx_gas = [21000, 210000, 0]
+    tx_value = [0, 1]
+    tx_access_lists: dict[int, list] = {
+        0: [],
+        1: [
+            AccessList(
+                address=Address(0xD0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0),
+                storage_keys=[],
+            ),
+        ],
+        2: [
+            AccessList(
+                address=Address(0xD0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0),
+                storage_keys=[
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
+                    ),  # noqa: E501
+                    Hash(
+                        "0x0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
+                    ),  # noqa: E501
+                ],
+            ),
+        ],
+    }
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex("00"),
-        gas_limit=tx_gas_limit,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
         max_fee_per_gas=2000,
         max_priority_fee_per_gas=10,
-        value=tx_value,
-        access_list=tx_access_list,
-        error=tx_error,
+        access_list=tx_access_lists.get(d),
+        error=_exc,
     )
 
-    post: dict = {}
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_opcodes_transaction_init.py b/tests/ported_static/stTransactionTest/test_opcodes_transaction_init.py
index ef13963a003..f93284cfd53 100644
--- a/tests/ported_static/stTransactionTest/test_opcodes_transaction_init.py
+++ b/tests/ported_static/stTransactionTest/test_opcodes_transaction_init.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_opcodes_transaction_init.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/Opcodes_TransactionInitFiller.json
+state_tests/stTransactionTest/Opcodes_TransactionInitFiller.json
 """
 
 import pytest
@@ -11,9 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 from execution_testing.vm import Op
 
@@ -22,410 +28,819 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/Opcodes_TransactionInitFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/Opcodes_TransactionInitFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        ("0060016000f3", {}),
-        ("60ff60ff60ff9150505060006000f3", {}),
-        ("60ff60ff60ff60ff925050505060006000f3", {}),
-        ("60ff60ff60ff60ff60ff93505050505060006000f3", {}),
-        ("60ff60ff60ff60ff60ff60ff9450505050505060006000f3", {}),
-        ("60ff60ff60ff60ff60ff60ff60ff955050505050505060006000f3", {}),
-        ("60ff60ff60ff60ff60ff60ff60ff60ff96505050505050505060006000f3", {}),
-        (
-            "600060ff60ff60ff60ff60ff60ff60ff60ff9750505050505050505060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "600060ff60ff60ff60ff60ff60ff60ff60ff60ff985050505050505050505060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "600060ff60ff60ff60ff60ff60ff60ff60ff60ff60ff99505050505050505050505060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "600060ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff9a50505050505050505050505060006000f3",  # noqa: E501
-            {},
-        ),
-        ("600160010a5060006000f3", {}),
-        (
-            "600060ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff9b5050505050505050505050505060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "600060ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff9c505050505050505050505050505060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "600060ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff9d50505050505050505050505050505060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "600060ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff9e5050505050505050505050505050505060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "600060ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff9f505050505050505050505050505050505060006000f3",  # noqa: E501
-            {},
-        ),
-        ("60006000a060006000f3", {}),
-        ("60ff60006000a160006000f3", {}),
-        ("60ff60ff60006000a260006000f3", {}),
-        ("60ff60ff60ff60006000a360006000f3", {}),
-        ("60ff60ff60ff60ff60006000a460006000f3", {}),
-        ("600160010b5060006000f3", {}),
-        ("6000600060fff05060006000f3", {}),
-        (
-            "60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66064f15060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "60006000600060006000730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66064f25060006000f3",  # noqa: E501
-            {},
-        ),
-        ("60006000f3", {}),
-        (
-            "6000600060006000730f572e5295c57f15886f9b263e2f6d2d6c7b5ec6620186a0f45060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "6000600060006000730f572e5295c57f15886f9b263e2f6d2d6c7b5ec6612710fa5060006000f3",  # noqa: E501
-            {},
-        ),
-        ("60006000fd60006000f3", {}),
-        ("32ff", {}),
-        ("60016001105060006000f3", {}),
-        ("60016001115060006000f3", {}),
-        ("60016001125060006000f3", {}),
-        ("60016001135060006000f3", {}),
-        ("60016001145060006000f3", {}),
-        ("6000155060006000f3", {}),
-        ("60006000165060006000f3", {}),
-        ("60006000175060006000f3", {}),
-        ("60016001015060006000f3", {}),
-        ("60006000185060006000f3", {}),
-        ("6000195060006000f3", {}),
-        ("67805020100804020160001a5060006000f3", {}),
-        ("600060002060006000f3", {}),
-        ("305060006000f3", {}),
-        ("6000315060006000f3", {}),
-        ("325060006000f3", {}),
-        ("335060006000f3", {}),
-        ("345060006000f3", {}),
-        ("6000355060006000f3", {}),
-        ("60016001025060006000f3", {}),
-        ("365060006000f3", {}),
-        ("6000600060003760006000f3", {}),
-        ("385060006000f3", {}),
-        (
-            "38600060013960015160005560006000f3",
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={
-                        0: 0x38600060013960015160005560006000F3000000000000000000000000000000  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        ("3a5060006000f3", {}),
-        ("60003b5060006000f3", {}),
-        (
-            "6014600060007310000000000000000000000000000000000000103c60006000f3",  # noqa: E501
-            {},
-        ),
-        ("3d5060006000f3", {}),
-        ("6000600060003e60006000f3", {}),
-        ("60005060005060006000f3", {}),
-        ("60016001035060006000f3", {}),
-        ("6000515060006000f3", {}),
-        ("600060005260006000f3", {}),
-        ("60ff60005360006000f3", {}),
-        ("6000545060006000f3", {}),
-        (
-            "600160015560006000f3",
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
-        ("600456005b60006000f3", {}),
-        ("6001600657005b60006000f3", {}),
-        ("585060006000f3", {}),
-        ("595060006000f3", {}),
-        ("5a5060006000f3", {}),
-        ("60016001045060006000f3", {}),
-        ("5b60006000f3", {}),
-        ("60ff5060006000f3", {}),
-        ("61ffff5060006000f3", {}),
-        ("62ffffff5060006000f3", {}),
-        ("63ffffffff5060006000f3", {}),
-        ("64ffffffffff5060006000f3", {}),
-        ("65ffffffffffff5060006000f3", {}),
-        ("66ffffffffffffff5060006000f3", {}),
-        ("67ffffffffffffffff5060006000f3", {}),
-        ("68ffffffffffffffffff5060006000f3", {}),
-        ("60016001055060006000f3", {}),
-        ("69ffffffffffffffffffff5060006000f3", {}),
-        ("6affffffffffffffffffffff5060006000f3", {}),
-        ("6bffffffffffffffffffffffff5060006000f3", {}),
-        ("6cffffffffffffffffffffffffff5060006000f3", {}),
-        ("6dffffffffffffffffffffffffffff5060006000f3", {}),
-        ("6effffffffffffffffffffffffffffff5060006000f3", {}),
-        ("6fffffffffffffffffffffffffffffffff5060006000f3", {}),
-        ("70ffffffffffffffffffffffffffffffffff5060006000f3", {}),
-        ("71ffffffffffffffffffffffffffffffffffff5060006000f3", {}),
-        ("72ffffffffffffffffffffffffffffffffffffff5060006000f3", {}),
-        ("60016001065060006000f3", {}),
-        ("73ffffffffffffffffffffffffffffffffffffffff5060006000f3", {}),
-        ("74ffffffffffffffffffffffffffffffffffffffffff5060006000f3", {}),
-        ("75ffffffffffffffffffffffffffffffffffffffffffff5060006000f3", {}),
-        ("76ffffffffffffffffffffffffffffffffffffffffffffff5060006000f3", {}),
-        ("77ffffffffffffffffffffffffffffffffffffffffffffffff5060006000f3", {}),
-        (
-            "78ffffffffffffffffffffffffffffffffffffffffffffffffff5060006000f3",
-            {},
-        ),
-        (
-            "79ffffffffffffffffffffffffffffffffffffffffffffffffffff5060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "7affffffffffffffffffffffffffffffffffffffffffffffffffffff5060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff5060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "7cffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5060006000f3",  # noqa: E501
-            {},
-        ),
-        ("60016001075060006000f3", {}),
-        (
-            "7dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "7effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5060006000f3",  # noqa: E501
-            {},
-        ),
-        ("60ff80505060006000f3", {}),
-        ("60ff60ff8150505060006000f3", {}),
-        ("60ff60ff60ff825050505060006000f3", {}),
-        ("60ff60ff60ff60ff83505050505060006000f3", {}),
-        ("60ff60ff60ff60ff60ff8450505050505060006000f3", {}),
-        ("60ff60ff60ff60ff60ff60ff855050505050505060006000f3", {}),
-        ("60ff60ff60ff60ff60ff60ff60ff86505050505050505060006000f3", {}),
-        ("600160016001085060006000f3", {}),
-        ("60ff60ff60ff60ff60ff60ff60ff60ff8750505050505050505060006000f3", {}),
-        (
-            "60ff60ff60ff60ff60ff60ff60ff60ff60ff885050505050505050505060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff89505050505050505050505060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff8a50505050505050505050505060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff8b5050505050505050505050505060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff8c505050505050505050505050505060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff8d50505050505050505050505050505060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff8e5050505050505050505050505050505060006000f3",  # noqa: E501
-            {},
-        ),
-        (
-            "60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff60ff8f505050505050505050505050505050505060006000f3",  # noqa: E501
-            {},
-        ),
-        ("60ff60ff90505060006000f3", {}),
-        ("600160016001095060006000f3", {}),
-        ("ef", {}),
-        (
-            "60008080808073b94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f100",
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2",
         ),
-        (
-            "60008080808073b94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f150fe",  # noqa: E501
-            {},
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3",
         ),
-        (
-            "60008080808073b94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f15060ef60005360016000f3",  # noqa: E501
-            {},
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="d16",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="d17",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="d18",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="d19",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="d20",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="d21",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="d22",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="d23",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="d24",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="d25",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="d26",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="d27",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="d28",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="d29",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="d30",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="d31",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="d32",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="d33",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="d34",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="d35",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="d36",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="d37",
+        ),
+        pytest.param(
+            38,
+            0,
+            0,
+            id="d38",
+        ),
+        pytest.param(
+            39,
+            0,
+            0,
+            id="d39",
+        ),
+        pytest.param(
+            40,
+            0,
+            0,
+            id="d40",
+        ),
+        pytest.param(
+            41,
+            0,
+            0,
+            id="d41",
+        ),
+        pytest.param(
+            42,
+            0,
+            0,
+            id="d42",
+        ),
+        pytest.param(
+            43,
+            0,
+            0,
+            id="d43",
+        ),
+        pytest.param(
+            44,
+            0,
+            0,
+            id="d44",
+        ),
+        pytest.param(
+            45,
+            0,
+            0,
+            id="d45",
+        ),
+        pytest.param(
+            46,
+            0,
+            0,
+            id="d46",
+        ),
+        pytest.param(
+            47,
+            0,
+            0,
+            id="d47",
+        ),
+        pytest.param(
+            48,
+            0,
+            0,
+            id="d48",
+        ),
+        pytest.param(
+            49,
+            0,
+            0,
+            id="d49",
+        ),
+        pytest.param(
+            50,
+            0,
+            0,
+            id="d50",
+        ),
+        pytest.param(
+            51,
+            0,
+            0,
+            id="d51",
+        ),
+        pytest.param(
+            52,
+            0,
+            0,
+            id="d52",
+        ),
+        pytest.param(
+            53,
+            0,
+            0,
+            id="d53",
+        ),
+        pytest.param(
+            54,
+            0,
+            0,
+            id="d54",
+        ),
+        pytest.param(
+            55,
+            0,
+            0,
+            id="d55",
+        ),
+        pytest.param(
+            56,
+            0,
+            0,
+            id="d56",
+        ),
+        pytest.param(
+            57,
+            0,
+            0,
+            id="d57",
+        ),
+        pytest.param(
+            58,
+            0,
+            0,
+            id="d58",
+        ),
+        pytest.param(
+            59,
+            0,
+            0,
+            id="d59",
+        ),
+        pytest.param(
+            60,
+            0,
+            0,
+            id="d60",
+        ),
+        pytest.param(
+            61,
+            0,
+            0,
+            id="d61",
+        ),
+        pytest.param(
+            62,
+            0,
+            0,
+            id="d62",
+        ),
+        pytest.param(
+            63,
+            0,
+            0,
+            id="d63",
+        ),
+        pytest.param(
+            64,
+            0,
+            0,
+            id="d64",
+        ),
+        pytest.param(
+            65,
+            0,
+            0,
+            id="d65",
+        ),
+        pytest.param(
+            66,
+            0,
+            0,
+            id="d66",
+        ),
+        pytest.param(
+            67,
+            0,
+            0,
+            id="d67",
+        ),
+        pytest.param(
+            68,
+            0,
+            0,
+            id="d68",
+        ),
+        pytest.param(
+            69,
+            0,
+            0,
+            id="d69",
+        ),
+        pytest.param(
+            70,
+            0,
+            0,
+            id="d70",
+        ),
+        pytest.param(
+            71,
+            0,
+            0,
+            id="d71",
+        ),
+        pytest.param(
+            72,
+            0,
+            0,
+            id="d72",
+        ),
+        pytest.param(
+            73,
+            0,
+            0,
+            id="d73",
+        ),
+        pytest.param(
+            74,
+            0,
+            0,
+            id="d74",
+        ),
+        pytest.param(
+            75,
+            0,
+            0,
+            id="d75",
+        ),
+        pytest.param(
+            76,
+            0,
+            0,
+            id="d76",
+        ),
+        pytest.param(
+            77,
+            0,
+            0,
+            id="d77",
+        ),
+        pytest.param(
+            78,
+            0,
+            0,
+            id="d78",
+        ),
+        pytest.param(
+            79,
+            0,
+            0,
+            id="d79",
+        ),
+        pytest.param(
+            80,
+            0,
+            0,
+            id="d80",
+        ),
+        pytest.param(
+            81,
+            0,
+            0,
+            id="d81",
+        ),
+        pytest.param(
+            82,
+            0,
+            0,
+            id="d82",
+        ),
+        pytest.param(
+            83,
+            0,
+            0,
+            id="d83",
+        ),
+        pytest.param(
+            84,
+            0,
+            0,
+            id="d84",
+        ),
+        pytest.param(
+            85,
+            0,
+            0,
+            id="d85",
+        ),
+        pytest.param(
+            86,
+            0,
+            0,
+            id="d86",
+        ),
+        pytest.param(
+            87,
+            0,
+            0,
+            id="d87",
+        ),
+        pytest.param(
+            88,
+            0,
+            0,
+            id="d88",
+        ),
+        pytest.param(
+            89,
+            0,
+            0,
+            id="d89",
+        ),
+        pytest.param(
+            90,
+            0,
+            0,
+            id="d90",
+        ),
+        pytest.param(
+            91,
+            0,
+            0,
+            id="d91",
+        ),
+        pytest.param(
+            92,
+            0,
+            0,
+            id="d92",
+        ),
+        pytest.param(
+            93,
+            0,
+            0,
+            id="d93",
+        ),
+        pytest.param(
+            94,
+            0,
+            0,
+            id="d94",
+        ),
+        pytest.param(
+            95,
+            0,
+            0,
+            id="d95",
+        ),
+        pytest.param(
+            96,
+            0,
+            0,
+            id="d96",
+        ),
+        pytest.param(
+            97,
+            0,
+            0,
+            id="d97",
+        ),
+        pytest.param(
+            98,
+            0,
+            0,
+            id="d98",
+        ),
+        pytest.param(
+            99,
+            0,
+            0,
+            id="d99",
+        ),
+        pytest.param(
+            100,
+            0,
+            0,
+            id="d100",
+        ),
+        pytest.param(
+            101,
+            0,
+            0,
+            id="d101",
+        ),
+        pytest.param(
+            102,
+            0,
+            0,
+            id="d102",
+        ),
+        pytest.param(
+            103,
+            0,
+            0,
+            id="d103",
+        ),
+        pytest.param(
+            104,
+            0,
+            0,
+            id="d104",
+        ),
+        pytest.param(
+            105,
+            0,
+            0,
+            id="d105",
+        ),
+        pytest.param(
+            106,
+            0,
+            0,
+            id="d106",
+        ),
+        pytest.param(
+            107,
+            0,
+            0,
+            id="d107",
+        ),
+        pytest.param(
+            108,
+            0,
+            0,
+            id="d108",
+        ),
+        pytest.param(
+            109,
+            0,
+            0,
+            id="d109",
+        ),
+        pytest.param(
+            110,
+            0,
+            0,
+            id="d110",
+        ),
+        pytest.param(
+            111,
+            0,
+            0,
+            id="d111",
+        ),
+        pytest.param(
+            112,
+            0,
+            0,
+            id="d112",
+        ),
+        pytest.param(
+            113,
+            0,
+            0,
+            id="d113",
+        ),
+        pytest.param(
+            114,
+            0,
+            0,
+            id="d114",
+        ),
+        pytest.param(
+            115,
+            0,
+            0,
+            id="d115",
+        ),
+        pytest.param(
+            116,
+            0,
+            0,
+            id="d116",
+        ),
+        pytest.param(
+            117,
+            0,
+            0,
+            id="d117",
+        ),
+        pytest.param(
+            118,
+            0,
+            0,
+            id="d118",
+        ),
+        pytest.param(
+            119,
+            0,
+            0,
+            id="d119",
+        ),
+        pytest.param(
+            120,
+            0,
+            0,
+            id="d120",
+        ),
+        pytest.param(
+            121,
+            0,
+            0,
+            id="d121",
+        ),
+        pytest.param(
+            122,
+            0,
+            0,
+            id="d122",
+        ),
+        pytest.param(
+            123,
+            0,
+            0,
+            id="d123",
+        ),
+        pytest.param(
+            124,
+            0,
+            0,
+            id="d124",
+        ),
+        pytest.param(
+            125,
+            0,
+            0,
+            id="d125",
+        ),
+        pytest.param(
+            126,
+            0,
+            0,
+            id="d126",
+        ),
+        pytest.param(
+            127,
+            0,
+            0,
+            id="d127",
+        ),
+        pytest.param(
+            128,
+            0,
+            0,
+            id="invalid_first_byte_ef",
+        ),
+        pytest.param(
+            129,
+            0,
+            0,
+            id="side_effects",
+        ),
+        pytest.param(
+            130,
+            0,
+            0,
+            id="side_effects_invalid_opcode",
+        ),
+        pytest.param(
+            131,
+            0,
+            0,
+            id="side_effects_return_ef",
         ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
     ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_opcodes_transaction_init(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_opcodes_transaction_init."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -439,31 +854,664 @@ def test_opcodes_transaction_init(
         gas_limit=1000000,
     )
 
-    # Source: raw bytecode
-    pre.deploy_contract(
-        code=Op.POP(0xFFFF) + Op.RETURN(offset=0x0, size=0x4),
-        balance=0xDE0B6B3A7640000,
-        address=Address("0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"),  # noqa: E501
-    )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, storage={0x0: 0x0})
-    # Source: Yul
-    # { sstore(0, 1) }
-    pre.deploy_contract(
+    pre[sender] = Account(balance=0xDE0B6B3A7640000, storage={0: 0})
+    # Source: yul
+    # berlin { sstore(0, 1) }
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x61ffff5060046000f3
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(0xFFFF) + Op.RETURN(offset=0x0, size=0x4),
+        balance=0xDE0B6B3A7640000,
+        nonce=1,
+        address=Address(0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 33, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    storage={
+                        0: 0x38600060013960015160005560006000F3000000000000000000000000000000,  # noqa: E501
+                    },
+                    nonce=1,
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 37, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 38, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 120, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=2
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 124, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 125, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": 126, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                compute_create_address(
+                    address=sender, nonce=0
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": 127, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                compute_create_address(
+                    address=sender, nonce=0
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {
+                "data": [
+                    0,
+                    1,
+                    2,
+                    3,
+                    4,
+                    5,
+                    6,
+                    7,
+                    8,
+                    9,
+                    10,
+                    11,
+                    12,
+                    13,
+                    14,
+                    15,
+                    16,
+                    17,
+                    18,
+                    19,
+                    20,
+                    21,
+                    22,
+                    23,
+                    24,
+                    25,
+                    26,
+                    27,
+                    28,
+                    29,
+                    30,
+                    31,
+                    32,
+                    34,
+                    35,
+                    36,
+                    39,
+                    40,
+                    41,
+                    42,
+                    43,
+                    44,
+                    45,
+                    46,
+                    47,
+                    48,
+                    49,
+                    50,
+                    51,
+                    52,
+                    53,
+                    54,
+                    55,
+                    56,
+                    57,
+                    58,
+                    59,
+                    60,
+                    61,
+                    62,
+                    63,
+                    64,
+                    65,
+                    66,
+                    67,
+                    68,
+                    69,
+                    70,
+                    71,
+                    72,
+                    73,
+                    74,
+                    75,
+                    76,
+                    77,
+                    78,
+                    79,
+                    80,
+                    81,
+                    82,
+                    83,
+                    84,
+                    85,
+                    86,
+                    87,
+                    88,
+                    89,
+                    90,
+                    91,
+                    92,
+                    93,
+                    94,
+                    95,
+                    96,
+                    97,
+                    98,
+                    99,
+                    100,
+                    101,
+                    102,
+                    103,
+                    104,
+                    105,
+                    106,
+                    107,
+                    108,
+                    109,
+                    110,
+                    111,
+                    112,
+                    113,
+                    114,
+                    115,
+                    116,
+                    117,
+                    118,
+                    119,
+                    121,
+                    122,
+                    123,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [128], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                compute_create_address(
+                    address=sender, nonce=0
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [129], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(storage={0: 1, 1: 0}),
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=1
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [130], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(storage={}),
+                compute_create_address(
+                    address=sender, nonce=0
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": [131], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(nonce=1),
+                contract_0: Account(storage={}),
+                compute_create_address(
+                    address=sender, nonce=0
+                ): Account.NONEXISTENT,
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Op.STOP + Op.RETURN(offset=0x0, size=0x1),
+        Op.POP(Op.ADD(0x1, 0x1)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.MUL(0x1, 0x1)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.SUB(0x1, 0x1)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.DIV(0x1, 0x1)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.SDIV(0x1, 0x1)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.MOD(0x1, 0x1)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.SMOD(0x1, 0x1)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.ADDMOD(0x1, 0x1, 0x1)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.MULMOD(0x1, 0x1, 0x1)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.EXP(0x1, 0x1)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.SIGNEXTEND(0x1, 0x1)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.LT(0x1, 0x1)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.GT(0x1, 0x1)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.SLT(0x1, 0x1)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.SGT(0x1, 0x1)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.EQ(0x1, 0x1)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.ISZERO(0x0)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.AND(0x0, 0x0)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.OR(0x0, 0x0)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.XOR(0x0, 0x0)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.NOT(0x0)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.BYTE(0x0, 0x8050201008040201))
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.SHA3(offset=0x0, size=0x0) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.ADDRESS) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.BALANCE(address=0x0)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.ORIGIN) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.CALLER) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.CALLVALUE) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.CALLDATALOAD(offset=0x0)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.CALLDATASIZE) + Op.RETURN(offset=0x0, size=0x0),
+        Op.CALLDATACOPY(dest_offset=0x0, offset=0x0, size=0x0)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.CODESIZE) + Op.RETURN(offset=0x0, size=0x0),
+        Op.CODECOPY(dest_offset=0x1, offset=0x0, size=Op.CODESIZE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x1))
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.GASPRICE) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.EXTCODESIZE(address=0x0)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.EXTCODECOPY(
+            address=0x1000000000000000000000000000000000000010,
+            dest_offset=0x0,
+            offset=0x0,
+            size=0x14,
+        )
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.RETURNDATASIZE) + Op.RETURN(offset=0x0, size=0x0),
+        Op.RETURNDATACOPY(dest_offset=0x0, offset=0x0, size=0x0)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0x0) * 2 + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.MLOAD(offset=0x0)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.MSTORE(offset=0x0, value=0x0) + Op.RETURN(offset=0x0, size=0x0),
+        Op.MSTORE8(offset=0x0, value=0xFF) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.SLOAD(key=0x0)) + Op.RETURN(offset=0x0, size=0x0),
+        Op.SSTORE(key=0x1, value=0x1) + Op.RETURN(offset=0x0, size=0x0),
+        Op.JUMP(pc=0x4)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.JUMPI(pc=0x6, condition=0x1)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.PC) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.MSIZE) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.GAS) + Op.RETURN(offset=0x0, size=0x0),
+        Op.JUMPDEST + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFF) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFF) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFF) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFF) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFF) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFF) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFF) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFF) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFF) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFF) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFF) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFF) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFF) + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF]
+        + Op.POP(Op.DUP1)
+        + Op.POP
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 2
+        + Op.POP(Op.DUP2)
+        + Op.POP * 2
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 3
+        + Op.POP(Op.DUP3)
+        + Op.POP * 3
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 4
+        + Op.POP(Op.DUP4)
+        + Op.POP * 4
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 5
+        + Op.POP(Op.DUP5)
+        + Op.POP * 5
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 6
+        + Op.POP(Op.DUP6)
+        + Op.POP * 6
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 7
+        + Op.POP(Op.DUP7)
+        + Op.POP * 7
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 8
+        + Op.POP(Op.DUP8)
+        + Op.POP * 8
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 9
+        + Op.POP(Op.DUP9)
+        + Op.POP * 9
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 10
+        + Op.POP(Op.DUP10)
+        + Op.POP * 10
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 11
+        + Op.POP(Op.DUP11)
+        + Op.POP * 11
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 12
+        + Op.POP(Op.DUP12)
+        + Op.POP * 12
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 13
+        + Op.POP(Op.DUP13)
+        + Op.POP * 13
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 14
+        + Op.POP(Op.DUP14)
+        + Op.POP * 14
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 15
+        + Op.POP(Op.DUP15)
+        + Op.POP * 15
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 16
+        + Op.POP(Op.DUP16)
+        + Op.POP * 16
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 2
+        + Op.SWAP1
+        + Op.POP * 2
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 3
+        + Op.SWAP2
+        + Op.POP * 3
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 4
+        + Op.SWAP3
+        + Op.POP * 4
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 5
+        + Op.SWAP4
+        + Op.POP * 5
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 6
+        + Op.SWAP5
+        + Op.POP * 6
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 7
+        + Op.SWAP6
+        + Op.POP * 7
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0xFF] * 8
+        + Op.SWAP7
+        + Op.POP * 8
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0xFF] * 8
+        + Op.SWAP8
+        + Op.POP * 9
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0xFF] * 9
+        + Op.SWAP9
+        + Op.POP * 10
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0xFF] * 10
+        + Op.SWAP10
+        + Op.POP * 11
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0xFF] * 11
+        + Op.SWAP11
+        + Op.POP * 12
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0xFF] * 12
+        + Op.SWAP12
+        + Op.POP * 13
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0xFF] * 13
+        + Op.SWAP13
+        + Op.POP * 14
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0xFF] * 14
+        + Op.SWAP14
+        + Op.POP * 15
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0xFF] * 15
+        + Op.SWAP15
+        + Op.POP * 16
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.PUSH1[0x0]
+        + Op.PUSH1[0xFF] * 16
+        + Op.SWAP16
+        + Op.POP * 17
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.LOG0(offset=0x0, size=0x0) + Op.RETURN(offset=0x0, size=0x0),
+        Op.LOG1(offset=0x0, size=0x0, topic_1=0xFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.LOG2(offset=0x0, size=0x0, topic_1=0xFF, topic_2=0xFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.LOG3(offset=0x0, size=0x0, topic_1=0xFF, topic_2=0xFF, topic_3=0xFF)
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.LOG4(
+            offset=0x0,
+            size=0x0,
+            topic_1=0xFF,
+            topic_2=0xFF,
+            topic_3=0xFF,
+            topic_4=0xFF,
+        )
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(Op.CREATE(value=0xFF, offset=0x0, size=0x0))
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(
+            Op.CALL(
+                gas=0x64,
+                address=contract_1,
+                value=0x17,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(
+            Op.CALLCODE(
+                gas=0x64,
+                address=contract_1,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(
+            Op.DELEGATECALL(
+                gas=0x186A0,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.POP(
+            Op.STATICCALL(
+                gas=0x2710,
+                address=contract_1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.RETURN(offset=0x0, size=0x0),
+        Op.REVERT(offset=0x0, size=0x0) + Op.RETURN(offset=0x0, size=0x0),
+        Op.SELFDESTRUCT(address=Op.ORIGIN),
+        Bytes("ef"),
+        Op.CALL(
+            gas=0xC350,
+            address=contract_0,
+            value=Op.DUP1,
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=contract_0,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.INVALID,
+        Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=contract_0,
+                value=Op.DUP1,
+                args_offset=Op.DUP1,
+                args_size=Op.DUP1,
+                ret_offset=Op.DUP1,
+                ret_size=0x0,
+            )
+        )
+        + Op.MSTORE8(offset=0x0, value=0xEF)
+        + Op.RETURN(offset=0x0, size=0x1),
+    ]
+    tx_gas = [400000]
+    tx_value = [100000]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=tx_data,
-        gas_limit=400000,
-        value=100000,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_overflow_gas_require2.py b/tests/ported_static/stTransactionTest/test_overflow_gas_require2.py
index ba2230b4bfa..6b78f079f48 100644
--- a/tests/ported_static/stTransactionTest/test_overflow_gas_require2.py
+++ b/tests/ported_static/stTransactionTest/test_overflow_gas_require2.py
@@ -1,88 +1,44 @@
 """
-Test ported from static filler.
+Test_overflow_gas_require2.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/OverflowGasRequire2Filler.json
+state_tests/stTransactionTest/OverflowGasRequire2Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post_fork,
+)
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/OverflowGasRequire2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/OverflowGasRequire2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
-@pytest.mark.pre_alloc_mutable
-def test_overflow_gas_require2(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x50EADFB1030587AB3A993A6ECC073041FC3B45E119DAA31A13D78C7E209631A5
-    )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=9223372036854775807,
-    )
-
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-    )
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("3240349548983454"),
-        gas_limit=1152921504606846976,
-        gas_price=80,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/OverflowGasRequire2Filler.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
 @pytest.mark.valid_until("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_overflow_gas_require2_from_prague(
+def test_overflow_gas_require2(
     state_test: StateTestFiller,
     pre: Alloc,
+    fork: Fork,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x50EADFB1030587AB3A993A6ECC073041FC3B45E119DAA31A13D78C7E209631A5
+    """Test_overflow_gas_require2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(
+        amount=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
     )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -93,18 +49,36 @@ def test_overflow_gas_require2_from_prague(
         gas_limit=9223372036854775807,
     )
 
-    pre[sender] = Account(
-        balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-    )
+    expect_entries_: list[dict] = [
+        {
+            "network": ["Cancun"],
+            "result": {
+                sender: Account(
+                    balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE6357F,  # noqa: E501
+                    nonce=1,
+                ),
+            },
+        },
+        {
+            "network": ["Prague"],
+            "result": {
+                sender: Account(
+                    balance=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F97F,  # noqa: E501
+                    nonce=1,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post_fork(expect_entries_, fork)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("3240349548983454"),
+        to=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),
+        data=Bytes("3240349548983454"),
         gas_limit=1152921504606846976,
         gas_price=80,
+        error=_exc,
     )
 
-    post: dict = {}
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_point_at_infinity_ec_recover.py b/tests/ported_static/stTransactionTest/test_point_at_infinity_ec_recover.py
index 74e4c514dfe..59842816a0a 100644
--- a/tests/ported_static/stTransactionTest/test_point_at_infinity_ec_recover.py
+++ b/tests/ported_static/stTransactionTest/test_point_at_infinity_ec_recover.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_point_at_infinity_ec_recover.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/PointAtInfinityECRecoverFiller.yml
+state_tests/stTransactionTest/PointAtInfinityECRecoverFiller.yml
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -21,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/PointAtInfinityECRecoverFiller.yml",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/PointAtInfinityECRecoverFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,8 +30,8 @@ def test_point_at_infinity_ec_recover(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_point_at_infinity_ec_recover."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
     )
@@ -46,33 +45,33 @@ def test_point_at_infinity_ec_recover(
         gas_limit=89128960,
     )
 
-    # Source: Yul
-    # { mstore(0, 0x6b8d2c81b11b2d699528dde488dbdf2f94293d0d33c32e347f255fa4a6c1f0a9) mstore(32, 0x1b) mstore(64, 0x79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798) mstore(96, 0x6b8d2c81b11b2d699528dde488dbdf2f94293d0d33c32e347f255fa4a6c1f0a9) sstore(0, call(1000000, 1, 0, 0, 128, 0, 32)) sstore(1, mload(0)) }  # noqa: E501
-    contract = pre.deploy_contract(
+    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    # Source: yul
+    # berlin { mstore(0, 0x6b8d2c81b11b2d699528dde488dbdf2f94293d0d33c32e347f255fa4a6c1f0a9) mstore(32, 0x1b) mstore(64, 0x79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798) mstore(96, 0x6b8d2c81b11b2d699528dde488dbdf2f94293d0d33c32e347f255fa4a6c1f0a9) sstore(0, call(1000000, 1, 0, 0, 128, 0, 32)) sstore(1, mload(0)) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "6000805160206065833981519152600052601b6020527f79be667ef9dcbbac55a06295ce"  # noqa: E501
-            "870b07029bfcdb2dce28d959f2815b16f817986040526000805160206065833981519152"  # noqa: E501
-            "60605260206000608081806001620f4240f160005560005160015500fe6b8d2c81b11b2d"  # noqa: E501
-            "699528dde488dbdf2f94293d0d33c32e347f255fa4a6c1f0a9"
+            "6000805160206065833981519152600052601b6020527f79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798604052600080516020606583398151915260605260206000608081806001620f4240f160005560005160015500fe6b8d2c81b11b2d699528dde488dbdf2f94293d0d33c32e347f255fa4a6c1f0a9"  # noqa: E501
         ),
         balance=0xFFFFFFFF,
         nonce=0,
-        address=Address("0xb9f36f1cb467544974bb7e0f5e1f0a499d4e6d7d"),  # noqa: E501
+        address=Address(0xB9F36F1CB467544974BB7E0F5E1F0A499D4E6D7D),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=10000000,
     )
 
     post = {
-        contract: Account(
+        sender: Account(nonce=1),
+        target: Account(
             storage={
                 0: 1,
                 1: 0x6B8D2C81B11B2D699528DDE488DBDF2F94293D0D33C32E347F255FA4A6C1F0A9,  # noqa: E501
             },
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stTransactionTest/test_store_clears_and_internal_call_store_clears_oog.py b/tests/ported_static/stTransactionTest/test_store_clears_and_internal_call_store_clears_oog.py
index 8aeebd3531a..4a239006cf5 100644
--- a/tests/ported_static/stTransactionTest/test_store_clears_and_internal_call_store_clears_oog.py
+++ b/tests/ported_static/stTransactionTest/test_store_clears_and_internal_call_store_clears_oog.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_store_clears_and_internal_call_store_clears_oog.
 
 Ported from:
-tests/static/state_tests/stTransactionTest
-StoreClearsAndInternalCallStoreClearsOOGFiller.json
+state_tests/stTransactionTest/StoreClearsAndInternalCallStoreClearsOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stTransactionTest/StoreClearsAndInternalCallStoreClearsOOGFiller.json",  # noqa: E501
+        "state_tests/stTransactionTest/StoreClearsAndInternalCallStoreClearsOOGFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_store_clears_and_internal_call_store_clears_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0x96C07046493EC8728482079AB999D2994420D9CF4D3491DFD06871B106D9D87B
-    )
+    """Test_store_clears_and_internal_call_store_clears_oog."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x1DCD6500)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,70 +45,66 @@ def test_store_clears_and_internal_call_store_clears_oog(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0x1DCD6500)
-    callee = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {(SSTORE 0 0)(SSTORE 1 0)(SSTORE 2 0)(SSTORE 3 0)(SSTORE 4 0)(SSTORE 5 0)(SSTORE 6 0)(SSTORE 7 0)(SSTORE 8 0)(SSTORE 9 0)}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.STOP,
         storage={
-            0x0: 0xC,
-            0x1: 0xC,
-            0x2: 0xC,
-            0x3: 0xC,
-            0x4: 0xC,
-            0x5: 0xC,
-            0x6: 0xC,
-            0x7: 0xC,
-            0x8: 0xC,
-            0x9: 0xC,
+            0: 12,
+            1: 12,
+            2: 12,
+            3: 12,
+            4: 12,
+            5: 12,
+            6: 12,
+            7: 12,
+            8: 12,
+            9: 12,
         },
         nonce=0,
-        address=Address("0xd61e0564fab2b0da5136f75db579b663bd9f2bd8"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {(SSTORE 0 0)(SSTORE 1 0)(SSTORE 2 0)(SSTORE 3 0) (CALL 20000 <contract:0x0000000000000000000000000000000000000000> 1 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.CALL(
-                gas=0x4E20,
-                address=0xD61E0564FAB2B0DA5136F75DB579B663BD9F2BD8,
-                value=0x1,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0xC, 0x1: 0xC, 0x2: 0xC, 0x3: 0xC, 0x4: 0xC},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.CALL(
+            gas=0x4E20,
+            address=addr,
+            value=0x1,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 12, 1: 12, 2: 12, 3: 12, 4: 12},
         balance=10,
         nonce=0,
-        address=Address("0xf6694e843901ae9f4c9303557d000708df9581dc"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=200000,
         value=10,
     )
 
     post = {
-        callee: Account(
+        addr: Account(
             storage={
                 0: 12,
                 1: 12,
@@ -124,8 +117,10 @@ def test_store_clears_and_internal_call_store_clears_oog(
                 8: 12,
                 9: 12,
             },
+            balance=0,
         ),
-        contract: Account(storage={4: 12}),
+        sender: Account(nonce=1),
+        target: Account(storage={4: 12}, balance=20),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_store_clears_and_internal_call_store_clears_success.py b/tests/ported_static/stTransactionTest/test_store_clears_and_internal_call_store_clears_success.py
index b3deb6ef70a..3af9a80d962 100644
--- a/tests/ported_static/stTransactionTest/test_store_clears_and_internal_call_store_clears_success.py
+++ b/tests/ported_static/stTransactionTest/test_store_clears_and_internal_call_store_clears_success.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_store_clears_and_internal_call_store_clears_success.
 
 Ported from:
-tests/static/state_tests/stTransactionTest
-StoreClearsAndInternalCallStoreClearsSuccessFiller.json
+state_tests/stTransactionTest/StoreClearsAndInternalCallStoreClearsSuccessFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stTransactionTest/StoreClearsAndInternalCallStoreClearsSuccessFiller.json",  # noqa: E501
+        "state_tests/stTransactionTest/StoreClearsAndInternalCallStoreClearsSuccessFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_store_clears_and_internal_call_store_clears_success(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0x96C07046493EC8728482079AB999D2994420D9CF4D3491DFD06871B106D9D87B
-    )
+    """Test_store_clears_and_internal_call_store_clears_success."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x1DCD6500)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,70 +45,67 @@ def test_store_clears_and_internal_call_store_clears_success(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0x1DCD6500)
-    # Source: LLL
-    # {(SSTORE 0 0)(SSTORE 1 0)(SSTORE 2 0)(SSTORE 3 0) (CALL 50000 <contract:0x0000000000000000000000000000000000000000> 1 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.CALL(
-                gas=0xC350,
-                address=0xD61E0564FAB2B0DA5136F75DB579B663BD9F2BD8,
-                value=0x1,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        storage={0x0: 0xC, 0x1: 0xC, 0x2: 0xC, 0x3: 0xC, 0x4: 0xC},
-        balance=10,
-        nonce=0,
-        address=Address("0x8989e867016031a6730f2b84d5e47e1f0f83bdd9"),  # noqa: E501
-    )
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=0x0)
-            + Op.SSTORE(key=0x1, value=0x0)
-            + Op.SSTORE(key=0x2, value=0x0)
-            + Op.SSTORE(key=0x3, value=0x0)
-            + Op.SSTORE(key=0x4, value=0x0)
-            + Op.SSTORE(key=0x5, value=0x0)
-            + Op.SSTORE(key=0x6, value=0x0)
-            + Op.SSTORE(key=0x7, value=0x0)
-            + Op.SSTORE(key=0x8, value=0x0)
-            + Op.SSTORE(key=0x9, value=0x0)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {(SSTORE 0 0)(SSTORE 1 0)(SSTORE 2 0)(SSTORE 3 0)(SSTORE 4 0)(SSTORE 5 0)(SSTORE 6 0)(SSTORE 7 0)(SSTORE 8 0)(SSTORE 9 0)}  # noqa: E501
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.SSTORE(key=0x4, value=0x0)
+        + Op.SSTORE(key=0x5, value=0x0)
+        + Op.SSTORE(key=0x6, value=0x0)
+        + Op.SSTORE(key=0x7, value=0x0)
+        + Op.SSTORE(key=0x8, value=0x0)
+        + Op.SSTORE(key=0x9, value=0x0)
+        + Op.STOP,
         storage={
-            0x0: 0xC,
-            0x1: 0xC,
-            0x2: 0xC,
-            0x3: 0xC,
-            0x4: 0xC,
-            0x5: 0xC,
-            0x6: 0xC,
-            0x7: 0xC,
-            0x8: 0xC,
-            0x9: 0xC,
+            0: 12,
+            1: 12,
+            2: 12,
+            3: 12,
+            4: 12,
+            5: 12,
+            6: 12,
+            7: 12,
+            8: 12,
+            9: 12,
         },
         nonce=0,
-        address=Address("0xd61e0564fab2b0da5136f75db579b663bd9f2bd8"),  # noqa: E501
+    )
+    # Source: lll
+    # {(SSTORE 0 0)(SSTORE 1 0)(SSTORE 2 0)(SSTORE 3 0) (CALL 50000 <contract:0x0000000000000000000000000000000000000000> 1 0 0 0 0) }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x0)
+        + Op.SSTORE(key=0x1, value=0x0)
+        + Op.SSTORE(key=0x2, value=0x0)
+        + Op.SSTORE(key=0x3, value=0x0)
+        + Op.CALL(
+            gas=0xC350,
+            address=addr,
+            value=0x1,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 12, 1: 12, 2: 12, 3: 12, 4: 12},
+        balance=10,
+        nonce=0,
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=200000,
         value=10,
     )
 
     post = {
-        contract: Account(storage={4: 12}),
+        addr: Account(storage={}, balance=1),
+        target: Account(storage={4: 12}, balance=19),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_store_gas_on_create.py b/tests/ported_static/stTransactionTest/test_store_gas_on_create.py
index 92c3d227dce..2d97f61d885 100644
--- a/tests/ported_static/stTransactionTest/test_store_gas_on_create.py
+++ b/tests/ported_static/stTransactionTest/test_store_gas_on_create.py
@@ -1,19 +1,20 @@
 """
-Test ported from static filler.
+Test_store_gas_on_create.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/StoreGasOnCreateFiller.json
+state_tests/stTransactionTest/StoreGasOnCreateFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 from execution_testing.vm import Op
 
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stTransactionTest/StoreGasOnCreateFiller.json"],
+    ["state_tests/stTransactionTest/StoreGasOnCreateFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,11 +31,9 @@ def test_store_gas_on_create(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_store_gas_on_create."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x17D78400)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,29 +44,27 @@ def test_store_gas_on_create(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0x17D78400)
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 0x5a60fd55) (CREATE 0 28 4)}
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=0x5A60FD55)
-            + Op.CREATE(value=0x0, offset=0x1C, size=0x4)
-            + Op.STOP
-        ),
+    coinbase = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0x5A60FD55)
+        + Op.CREATE(value=0x0, offset=0x1C, size=0x4)
+        + Op.STOP,
         nonce=0,
-        address=coinbase,  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
         to=coinbase,
+        data=Bytes(""),
         gas_limit=131882,
         value=100,
     )
 
     post = {
-        Address("0xf1ecf98489fa9ed60a664fc4998db699cfa39d40"): Account(
-            storage={253: 0x12F39},
+        compute_create_address(address=coinbase, nonce=0): Account(
+            storage={253: 0x12F39}
         ),
     }
 
diff --git a/tests/ported_static/stTransactionTest/test_suicides_and_internal_call_suicides_bonus_gas_at_call.py b/tests/ported_static/stTransactionTest/test_suicides_and_internal_call_suicides_bonus_gas_at_call.py
index d3a814df477..8bbb8885c03 100644
--- a/tests/ported_static/stTransactionTest/test_suicides_and_internal_call_suicides_bonus_gas_at_call.py
+++ b/tests/ported_static/stTransactionTest/test_suicides_and_internal_call_suicides_bonus_gas_at_call.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_suicides_and_internal_call_suicides_bonus_gas_at_call.
 
 Ported from:
-tests/static/state_tests/stTransactionTest
-SuicidesAndInternalCallSuicidesBonusGasAtCallFiller.json
+state_tests/stTransactionTest/SuicidesAndInternalCallSuicidesBonusGasAtCallFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stTransactionTest/SuicidesAndInternalCallSuicidesBonusGasAtCallFiller.json",  # noqa: E501
+        "state_tests/stTransactionTest/SuicidesAndInternalCallSuicidesBonusGasAtCallFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,10 @@ def test_suicides_and_internal_call_suicides_bonus_gas_at_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    """Test_suicides_and_internal_call_suicides_bonus_gas_at_call."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_0 = Address(0x0000000000000000000000000000000000000000)
+    contract_1 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,44 +50,53 @@ def test_suicides_and_internal_call_suicides_bonus_gas_at_call(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0x5F5E100)
+    # Source: lll
     # {(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
-    # Source: LLL
+    # Source: lll
     # {(CALL 0 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=0x0,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=contract_0,
+                address=contract_0,
+                value=0x1,
+                args_offset=contract_0,
+                args_size=contract_0,
+                ret_offset=contract_0,
+                ret_size=contract_0,
             )
-            + Op.SELFDESTRUCT(address=0x0)
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=contract_0)
+        + Op.STOP,
         balance=10,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_1,
+        data=Bytes(""),
         gas_limit=50000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        Address(
+            0x0000000000000000000000000000000000000001
+        ): Account.NONEXISTENT,
+        contract_1: Account(
+            storage={},
+            code=bytes.fromhex("6000600060006000600160006000f1506000ff00"),
+            balance=0,
+            nonce=0,
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_suicides_and_internal_call_suicides_bonus_gas_at_call_failed.py b/tests/ported_static/stTransactionTest/test_suicides_and_internal_call_suicides_bonus_gas_at_call_failed.py
index d402a8185fb..a69e70b1e99 100644
--- a/tests/ported_static/stTransactionTest/test_suicides_and_internal_call_suicides_bonus_gas_at_call_failed.py
+++ b/tests/ported_static/stTransactionTest/test_suicides_and_internal_call_suicides_bonus_gas_at_call_failed.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_suicides_and_internal_call_suicides_bonus_gas_at_call_failed.
 
 Ported from:
-tests/static/state_tests/stTransactionTest
-SuicidesAndInternalCallSuicidesBonusGasAtCallFailedFiller.json
+state_tests/stTransactionTest/SuicidesAndInternalCallSuicidesBonusGasAtCallFailedFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stTransactionTest/SuicidesAndInternalCallSuicidesBonusGasAtCallFailedFiller.json",  # noqa: E501
+        "state_tests/stTransactionTest/SuicidesAndInternalCallSuicidesBonusGasAtCallFailedFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,11 @@ def test_suicides_and_internal_call_suicides_bonus_gas_at_call_failed(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_suicides_and_internal_call_suicides_bonus_gas_at_call_failed."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_0 = Address(0x0000000000000000000000000000000000000000)
+    contract_1 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,44 +47,41 @@ def test_suicides_and_internal_call_suicides_bonus_gas_at_call_failed(
         gas_limit=1000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
-    # Source: LLL
+    # Source: lll
     # {(CALL 0 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SELFDESTRUCT 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x0,
-                    address=0x0,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=contract_0,
+                address=contract_0,
+                value=contract_0,
+                args_offset=contract_0,
+                args_size=contract_0,
+                ret_offset=contract_0,
+                ret_size=contract_0,
             )
-            + Op.SELFDESTRUCT(address=0x0)
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=contract_0)
+        + Op.STOP,
         balance=10,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_1,
+        data=Bytes(""),
         gas_limit=50000,
         value=10,
     )
 
-    post: dict = {}
+    post = {contract_0: Account(code=bytes.fromhex("6001ff00"), balance=20)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_suicides_and_internal_call_suicides_oog.py b/tests/ported_static/stTransactionTest/test_suicides_and_internal_call_suicides_oog.py
index a7e448546d4..3e090d4ef5f 100644
--- a/tests/ported_static/stTransactionTest/test_suicides_and_internal_call_suicides_oog.py
+++ b/tests/ported_static/stTransactionTest/test_suicides_and_internal_call_suicides_oog.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_suicides_and_internal_call_suicides_oog.
 
 Ported from:
-tests/static/state_tests/stTransactionTest
-SuicidesAndInternalCallSuicidesOOGFiller.json
+state_tests/stTransactionTest/SuicidesAndInternalCallSuicidesOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stTransactionTest/SuicidesAndInternalCallSuicidesOOGFiller.json",  # noqa: E501
+        "state_tests/stTransactionTest/SuicidesAndInternalCallSuicidesOOGFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_suicides_and_internal_call_suicides_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0xA2333EEF5630066B928DEA5FD85A239F511B5B067D1441EE7AC290D0122B917B
-    )
+    """Test_suicides_and_internal_call_suicides_oog."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,42 +45,44 @@ def test_suicides_and_internal_call_suicides_oog(
         gas_limit=1000000,
     )
 
-    pre.deploy_contract(
+    # Source: lll
+    # {(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}
+    addr = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x5f0d8cd21c9026a32a4e8d15257b1801458989f3"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {(CALL 22000 <contract:0x0000000000000000000000000000000000000000> 1 0 0 0 0) (SELFDESTRUCT 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x55F0,
-                    address=0x5F0D8CD21C9026A32A4E8D15257B1801458989F3,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x55F0,
+                address=addr,
+                value=0x1,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SELFDESTRUCT(address=0x0)
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=0x0)
+        + Op.STOP,
         balance=10,
         nonce=0,
-        address=Address("0x78f15ba0abc5cc1aaa5a0ac6add5d28dd9ab8e1e"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x5F5E100)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=50000,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        addr: Account(balance=0),
+        sender: Account(nonce=1),
+        target: Account(balance=10),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_suicides_and_internal_call_suicides_success.py b/tests/ported_static/stTransactionTest/test_suicides_and_internal_call_suicides_success.py
index d99aa526ecf..d0240ef8265 100644
--- a/tests/ported_static/stTransactionTest/test_suicides_and_internal_call_suicides_success.py
+++ b/tests/ported_static/stTransactionTest/test_suicides_and_internal_call_suicides_success.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_suicides_and_internal_call_suicides_success.
 
 Ported from:
-tests/static/state_tests/stTransactionTest
-SuicidesAndInternalCallSuicidesSuccessFiller.json
+state_tests/stTransactionTest/SuicidesAndInternalCallSuicidesSuccessFiller.json
 """
 
 import pytest
@@ -13,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -24,33 +28,40 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stTransactionTest/SuicidesAndInternalCallSuicidesSuccessFiller.json",  # noqa: E501
+        "state_tests/stTransactionTest/SuicidesAndInternalCallSuicidesSuccessFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
+    "d, g, v",
     [
-        (
-            "00000000000000000000000000000000000000000000000000000000000055f0",
-            {},
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000aaf0",
-            {},
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_suicides_and_internal_call_suicides_success(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    """Test_suicides_and_internal_call_suicides_success."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_0 = Address(0x0000000000000000000000000000000000000000)
+    contract_1 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -64,47 +75,72 @@ def test_suicides_and_internal_call_suicides_success(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xABA9500)
+    # Source: lll
     # {(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0x1) + Op.STOP,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xABA9500)
-    # Source: LLL
+    # Source: lll
     # {(CALL (CALLDATALOAD 0) 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=Op.CALLDATALOAD(offset=0x0),
-                    address=0x0,
-                    value=0x1,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=Op.CALLDATALOAD(offset=contract_0),
+                address=contract_0,
+                value=0x1,
+                args_offset=contract_0,
+                args_size=contract_0,
+                ret_offset=contract_0,
+                ret_size=contract_0,
             )
-            + Op.SELFDESTRUCT(address=0x0)
-            + Op.STOP
-        ),
+        )
+        + Op.SELFDESTRUCT(address=contract_0)
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": 0, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(
+                    0x0000000000000000000000000000000000000001
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": 1, "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x0000000000000000000000000000000000000001): Account(
+                    storage={}, balance=1
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0x55F0),
+        Hash(0xAAF0),
+    ]
+    tx_gas = [150000]
+    tx_value = [10]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=150000,
-        value=10,
+        to=contract_1,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_suicides_and_send_money_to_itself_ether_destroyed.py b/tests/ported_static/stTransactionTest/test_suicides_and_send_money_to_itself_ether_destroyed.py
index f0a9110b183..b1ff4c8109a 100644
--- a/tests/ported_static/stTransactionTest/test_suicides_and_send_money_to_itself_ether_destroyed.py
+++ b/tests/ported_static/stTransactionTest/test_suicides_and_send_money_to_itself_ether_destroyed.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_suicides_and_send_money_to_itself_ether_destroyed.
 
 Ported from:
-tests/static/state_tests/stTransactionTest
-SuicidesAndSendMoneyToItselfEtherDestroyedFiller.json
+state_tests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyedFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyedFiller.json",  # noqa: E501
+        "state_tests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyedFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,11 +32,9 @@ def test_suicides_and_send_money_to_itself_ether_destroyed(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xeb201d2887816e041f6e807e804f64f3a7a226fe")
-    sender = EOA(
-        key=0xD066C5DB28BDA8940CFC5CBEFD1556CBC89C69B19F6D1AAA9FAC69AEE4B4A1BF
-    )
+    """Test_suicides_and_send_money_to_itself_ether_destroyed."""
+    coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
+    sender = pre.fund_eoa(amount=0x7459280)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,27 +45,35 @@ def test_suicides_and_send_money_to_itself_ether_destroyed(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0x7459280)
-    # Source: LLL
+    pre[coinbase] = Account(balance=0, nonce=1)
+    # Source: lll
     # {(SELFDESTRUCT <contract:target:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b>)}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xCCBD97BED823989BF91C6AC4CEAC020B2881F3A5)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xCCBD97BED823989BF91C6AC4CEAC020B2881F3A5
+        )
+        + Op.STOP,
         balance=1000,
         nonce=0,
-        address=Address("0xccbd97bed823989bf91c6ac4ceac020b2881f3a5"),  # noqa: E501
+        address=Address(0xCCBD97BED823989BF91C6AC4CEAC020B2881F3A5),  # noqa: E501
     )
-    pre[coinbase] = Account(balance=0, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=31700,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            code=bytes.fromhex(
+                "73ccbd97bed823989bf91c6ac4ceac020b2881f3a5ff00"
+            ),
+            balance=1010,
+            nonce=0,
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_suicides_stop_after_suicide.py b/tests/ported_static/stTransactionTest/test_suicides_stop_after_suicide.py
index e2f548cfd11..4eb7033f9fb 100644
--- a/tests/ported_static/stTransactionTest/test_suicides_stop_after_suicide.py
+++ b/tests/ported_static/stTransactionTest/test_suicides_stop_after_suicide.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_suicides_stop_after_suicide.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/SuicidesStopAfterSuicideFiller.json
+state_tests/stTransactionTest/SuicidesStopAfterSuicideFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/SuicidesStopAfterSuicideFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/SuicidesStopAfterSuicideFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,11 @@ def test_suicides_stop_after_suicide(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_suicides_stop_after_suicide."""
+    coinbase = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_0 = Address(0x0000000000000000000000000000000000000000)
+    contract_1 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0x7459280)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,43 +45,49 @@ def test_suicides_stop_after_suicide(
         gas_limit=100000,
     )
 
-    # Source: LLL
+    # Source: lll
     # {(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}
-    pre.deploy_contract(
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SELFDESTRUCT(address=0x1) + Op.STOP,
         balance=1110,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000000000"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000000000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0x7459280)
-    # Source: LLL
+    # Source: lll
     # {(SELFDESTRUCT 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x0)
-            + Op.CALL(
-                gas=0x7530,
-                address=0x0,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
-        balance=0x2710,
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=contract_0)
+        + Op.CALL(
+            gas=0x7530,
+            address=contract_0,
+            value=contract_0,
+            args_offset=contract_0,
+            args_size=contract_0,
+            ret_offset=contract_0,
+            ret_size=contract_0,
+        )
+        + Op.STOP,
+        balance=10000,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_1,
+        data=Bytes(""),
         gas_limit=83700,
         value=10,
     )
 
-    post: dict = {}
+    post = {
+        contract_0: Account(storage={}),
+        sender: Account(nonce=1),
+        contract_1: Account(
+            storage={},
+            code=bytes.fromhex("6000ff600060006000600060006000617530f100"),
+            balance=0,
+            nonce=0,
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_transaction_data_costs652.py b/tests/ported_static/stTransactionTest/test_transaction_data_costs652.py
index 1969648f388..6e8dca69a78 100644
--- a/tests/ported_static/stTransactionTest/test_transaction_data_costs652.py
+++ b/tests/ported_static/stTransactionTest/test_transaction_data_costs652.py
@@ -1,102 +1,58 @@
 """
-Test ported from static filler.
+Test_transaction_data_costs652.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/TransactionDataCosts652Filler.json
+state_tests/stTransactionTest/TransactionDataCosts652Filler.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/TransactionDataCosts652Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/TransactionDataCosts652Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit",
+    "d, g, v",
     [
-        22000,
-        72000,
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
-@pytest.mark.pre_alloc_mutable
 def test_transaction_data_costs652(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xDC4EFA209AECDD4C2D5201A419EA27506151B4EC687F14A613229E310932491B
-    )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    pre[sender] = Account(balance=0x989680)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("00000000000000000000112233445566778f32"),
-        gas_limit=tx_gas_limit,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/TransactionDataCosts652Filler.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.parametrize(
-    "tx_gas_limit",
-    [
-        22000,
-        72000,
-    ],
-    ids=["case0", "case1"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_transaction_data_costs652_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xDC4EFA209AECDD4C2D5201A419EA27506151B4EC687F14A613229E310932491B
-    )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    """Test_transaction_data_costs652."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x989680)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -107,15 +63,19 @@ def test_transaction_data_costs652_from_prague(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0x989680)
+    tx_data = [
+        Bytes("00000000000000000000112233445566778f32"),
+    ]
+    tx_gas = [22000, 72000]
 
+    floor_cost = fork.transaction_data_floor_cost_calculator()(data=tx_data[d])
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("00000000000000000000112233445566778f32"),
-        gas_limit=tx_gas_limit,
+        to=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),
+        data=tx_data[d],
+        gas_limit=max(tx_gas[g], floor_cost),
     )
 
-    post: dict = {}
+    post = {sender: Account(nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_transaction_sending_to_empty.py b/tests/ported_static/stTransactionTest/test_transaction_sending_to_empty.py
index 5eaf5985efc..b7ca2fb7c9e 100644
--- a/tests/ported_static/stTransactionTest/test_transaction_sending_to_empty.py
+++ b/tests/ported_static/stTransactionTest/test_transaction_sending_to_empty.py
@@ -1,19 +1,20 @@
 """
-Test ported from static filler.
+Test_transaction_sending_to_empty.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/TransactionSendingToEmptyFiller.json
+state_tests/stTransactionTest/TransactionSendingToEmptyFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -21,21 +22,16 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/TransactionSendingToEmptyFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/TransactionSendingToEmptyFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_transaction_sending_to_empty(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_transaction_sending_to_empty."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x5F5E100)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,14 +42,16 @@ def test_transaction_sending_to_empty(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0x5F5E100)
-
     tx = Transaction(
         sender=sender,
         to=None,
+        data=Bytes(""),
         gas_limit=53000,
     )
 
-    post: dict = {}
+    post = {
+        compute_create_address(address=sender, nonce=0): Account(code=b""),
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_transaction_sending_to_zero.py b/tests/ported_static/stTransactionTest/test_transaction_sending_to_zero.py
index b2451ac432f..77749f1463e 100644
--- a/tests/ported_static/stTransactionTest/test_transaction_sending_to_zero.py
+++ b/tests/ported_static/stTransactionTest/test_transaction_sending_to_zero.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_transaction_sending_to_zero.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/TransactionSendingToZeroFiller.json
+state_tests/stTransactionTest/TransactionSendingToZeroFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -21,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/TransactionSendingToZeroFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/TransactionSendingToZeroFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,12 +30,11 @@ def test_transaction_sending_to_zero(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_transaction_sending_to_zero."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xA2333EEF5630066B928DEA5FD85A239F511B5B067D1441EE7AC290D0122B917B
     )
-    contract = Address("0x0000000000000000000000000000000000000000")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -51,11 +49,17 @@ def test_transaction_sending_to_zero(
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=Address(0x0000000000000000000000000000000000000000),
+        data=Bytes(""),
         gas_limit=25000,
         value=1,
     )
 
-    post: dict = {}
+    post = {
+        Address(0x0000000000000000000000000000000000000000): Account(
+            balance=1
+        ),
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_transaction_to_addressh160minus_one.py b/tests/ported_static/stTransactionTest/test_transaction_to_addressh160minus_one.py
index 0eaef7f7712..0a27a5403dd 100644
--- a/tests/ported_static/stTransactionTest/test_transaction_to_addressh160minus_one.py
+++ b/tests/ported_static/stTransactionTest/test_transaction_to_addressh160minus_one.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_transaction_to_addressh160minus_one.
 
 Ported from:
-tests/static/state_tests/stTransactionTest
-TransactionToAddressh160minusOneFiller.json
+state_tests/stTransactionTest/TransactionToAddressh160minusOneFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stTransactionTest/TransactionToAddressh160minusOneFiller.json",  # noqa: E501
+        "state_tests/stTransactionTest/TransactionToAddressh160minusOneFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -32,12 +32,11 @@ def test_transaction_to_addressh160minus_one(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_transaction_to_addressh160minus_one."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
     )
-    contract = Address("0xffffffffffffffffffffffffffffffffffffffff")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -52,11 +51,16 @@ def test_transaction_to_addressh160minus_one(
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=Address(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF),
+        data=Bytes(""),
         gas_limit=22000,
         value=100,
     )
 
-    post: dict = {}
+    post = {
+        Address(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF): Account(
+            balance=100
+        ),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransactionTest/test_transaction_to_itself.py b/tests/ported_static/stTransactionTest/test_transaction_to_itself.py
index 088be244daa..320a0073f09 100644
--- a/tests/ported_static/stTransactionTest/test_transaction_to_itself.py
+++ b/tests/ported_static/stTransactionTest/test_transaction_to_itself.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_transaction_to_itself.
 
 Ported from:
-tests/static/state_tests/stTransactionTest/TransactionToItselfFiller.json
+state_tests/stTransactionTest/TransactionToItselfFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -21,21 +21,16 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransactionTest/TransactionToItselfFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stTransactionTest/TransactionToItselfFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_transaction_to_itself(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xF79127A3004ABDE26A4CBD80C428CB10F829FA11B54D36E7B326F4F4A5927ACF
-    )
+    """Test_transaction_to_itself."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x3B9ACA00)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,15 +41,14 @@ def test_transaction_to_itself(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0x3B9ACA00)
-
     tx = Transaction(
         sender=sender,
         to=sender,
+        data=Bytes(""),
         gas_limit=25000,
         value=1,
     )
 
-    post: dict = {}
+    post = {sender: Account(balance=0x3B9795B0, nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransitionTest/__init__.py b/tests/ported_static/stTransitionTest/__init__.py
index fa203fa6ece..22e533e2b13 100644
--- a/tests/ported_static/stTransitionTest/__init__.py
+++ b/tests/ported_static/stTransitionTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stTransitionTest."""
+"""Ported static tests: stTransitionTest."""  # noqa: N999
diff --git a/tests/ported_static/stTransitionTest/test_create_name_registrator_per_txs_after.py b/tests/ported_static/stTransitionTest/test_create_name_registrator_per_txs_after.py
index 35f0f955bb0..4819a4961d2 100644
--- a/tests/ported_static/stTransitionTest/test_create_name_registrator_per_txs_after.py
+++ b/tests/ported_static/stTransitionTest/test_create_name_registrator_per_txs_after.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_create_name_registrator_per_txs_after.
 
 Ported from:
-tests/static/state_tests/stTransitionTest
-createNameRegistratorPerTxsAfterFiller.json
+state_tests/stTransitionTest/createNameRegistratorPerTxsAfterFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
@@ -23,20 +23,17 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stTransitionTest/createNameRegistratorPerTxsAfterFiller.json",  # noqa: E501
+        "state_tests/stTransitionTest/createNameRegistratorPerTxsAfterFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_create_name_registrator_per_txs_after(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_name_registrator_per_txs_after."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,21 +44,34 @@ def test_create_name_registrator_per_txs_after(
         gas_limit=10000000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "6001600155601080600c6000396000f3006000355415600957005b60203560003555"  # noqa: E501
+        data=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP
+        + Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         gas_limit=200000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
+        compute_create_address(address=sender, nonce=0): Account(
             storage={1: 1},
+            code=bytes.fromhex("396000f3006000355415600957005b60"),
+            balance=0x186A0,
+            nonce=1,
         ),
     }
 
diff --git a/tests/ported_static/stTransitionTest/test_create_name_registrator_per_txs_at.py b/tests/ported_static/stTransitionTest/test_create_name_registrator_per_txs_at.py
index 8402b1bd219..3065cd7ade6 100644
--- a/tests/ported_static/stTransitionTest/test_create_name_registrator_per_txs_at.py
+++ b/tests/ported_static/stTransitionTest/test_create_name_registrator_per_txs_at.py
@@ -1,42 +1,37 @@
 """
-Test ported from static filler.
+Test_create_name_registrator_per_txs_at.
 
 Ported from:
-tests/static/state_tests/stTransitionTest
-createNameRegistratorPerTxsAtFiller.json
+state_tests/stTransitionTest/createNameRegistratorPerTxsAtFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransitionTest/createNameRegistratorPerTxsAtFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stTransitionTest/createNameRegistratorPerTxsAtFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_create_name_registrator_per_txs_at(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_name_registrator_per_txs_at."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,21 +42,34 @@ def test_create_name_registrator_per_txs_at(
         gas_limit=10000000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "6001600155601080600c6000396000f3006000355415600957005b60203560003555"  # noqa: E501
+        data=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP
+        + Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         gas_limit=200000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
+        compute_create_address(address=sender, nonce=0): Account(
             storage={1: 1},
+            code=bytes.fromhex("396000f3006000355415600957005b60"),
+            balance=0x186A0,
+            nonce=1,
         ),
     }
 
diff --git a/tests/ported_static/stTransitionTest/test_create_name_registrator_per_txs_before.py b/tests/ported_static/stTransitionTest/test_create_name_registrator_per_txs_before.py
index 061641005ae..6f4102cdf9c 100644
--- a/tests/ported_static/stTransitionTest/test_create_name_registrator_per_txs_before.py
+++ b/tests/ported_static/stTransitionTest/test_create_name_registrator_per_txs_before.py
@@ -1,21 +1,21 @@
 """
-Test ported from static filler.
+Test_create_name_registrator_per_txs_before.
 
 Ported from:
-tests/static/state_tests/stTransitionTest
-createNameRegistratorPerTxsBeforeFiller.json
+state_tests/stTransitionTest/createNameRegistratorPerTxsBeforeFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
@@ -23,20 +23,17 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stTransitionTest/createNameRegistratorPerTxsBeforeFiller.json",  # noqa: E501
+        "state_tests/stTransitionTest/createNameRegistratorPerTxsBeforeFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_create_name_registrator_per_txs_before(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_create_name_registrator_per_txs_before."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,21 +44,34 @@ def test_create_name_registrator_per_txs_before(
         gas_limit=10000000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "6001600155601080600c6000396000f3006000355415600957005b60203560003555"  # noqa: E501
+        data=Op.SSTORE(key=0x1, value=0x1)
+        + Op.PUSH1[0x10]
+        + Op.CODECOPY(dest_offset=0x0, offset=0xC, size=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.RETURN
+        + Op.STOP
+        + Op.JUMPI(
+            pc=0x9,
+            condition=Op.ISZERO(Op.SLOAD(key=Op.CALLDATALOAD(offset=0x0))),
+        )
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.CALLDATALOAD(offset=0x0), value=Op.CALLDATALOAD(offset=0x20)
         ),
         gas_limit=200000,
-        value=100000,
+        value=0x186A0,
     )
 
     post = {
-        Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
+        compute_create_address(address=sender, nonce=0): Account(
             storage={1: 1},
+            code=bytes.fromhex("396000f3006000355415600957005b60"),
+            balance=0x186A0,
+            nonce=1,
         ),
     }
 
diff --git a/tests/ported_static/stTransitionTest/test_delegatecall_after_transition.py b/tests/ported_static/stTransitionTest/test_delegatecall_after_transition.py
index e73b1dc3973..7eb47e04fbd 100644
--- a/tests/ported_static/stTransitionTest/test_delegatecall_after_transition.py
+++ b/tests/ported_static/stTransitionTest/test_delegatecall_after_transition.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_delegatecall_after_transition.
 
 Ported from:
-tests/static/state_tests/stTransitionTest
-delegatecallAfterTransitionFiller.json
+state_tests/stTransitionTest/delegatecallAfterTransitionFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransitionTest/delegatecallAfterTransitionFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stTransitionTest/delegatecallAfterTransitionFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_delegatecall_after_transition(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_delegatecall_after_transition."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,52 +43,42 @@ def test_delegatecall_after_transition(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=Op.CALLER)
-            + Op.SSTORE(key=0x2, value=Op.CALLVALUE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {[[ 1 ]] (CALLER) [[ 2 ]] (CALLVALUE) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=Op.CALLER)
+        + Op.SSTORE(key=0x2, value=Op.CALLVALUE)
+        + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0x000d3f6e432d6891a965fc56d39e729652a0762a"),  # noqa: E501
+        address=Address(0x000D3F6E432D6891A965FC56D39E729652A0762A),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 500000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 2 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x7A120,
-                    address=0xD3F6E432D6891A965FC56D39E729652A0762A,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x7A120,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x55bb8a8658b848ebbbb73cbf6ac9d59d715aec58"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 1,
-                1: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-            },
-        ),
-    }
+    post = {target: Account(storage={0: 1, 1: sender})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransitionTest/test_delegatecall_at_transition.py b/tests/ported_static/stTransitionTest/test_delegatecall_at_transition.py
index e545b25ed8b..ba6f1f7d9ec 100644
--- a/tests/ported_static/stTransitionTest/test_delegatecall_at_transition.py
+++ b/tests/ported_static/stTransitionTest/test_delegatecall_at_transition.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_delegatecall_at_transition.
 
 Ported from:
-tests/static/state_tests/stTransitionTest/delegatecallAtTransitionFiller.json
+state_tests/stTransitionTest/delegatecallAtTransitionFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransitionTest/delegatecallAtTransitionFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stTransitionTest/delegatecallAtTransitionFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,11 +30,9 @@ def test_delegatecall_at_transition(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_delegatecall_at_transition."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,52 +43,42 @@ def test_delegatecall_at_transition(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=Op.CALLER)
-            + Op.SSTORE(key=0x2, value=Op.CALLVALUE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {[[ 1 ]] (CALLER) [[ 2 ]] (CALLVALUE) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=Op.CALLER)
+        + Op.SSTORE(key=0x2, value=Op.CALLVALUE)
+        + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0x000d3f6e432d6891a965fc56d39e729652a0762a"),  # noqa: E501
+        address=Address(0x000D3F6E432D6891A965FC56D39E729652A0762A),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 500000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 2 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x7A120,
-                    address=0xD3F6E432D6891A965FC56D39E729652A0762A,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x7A120,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x55bb8a8658b848ebbbb73cbf6ac9d59d715aec58"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 1,
-                1: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-            },
-        ),
-    }
+    post = {target: Account(storage={0: 1, 1: sender})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stTransitionTest/test_delegatecall_before_transition.py b/tests/ported_static/stTransitionTest/test_delegatecall_before_transition.py
index 1c18633a141..d4bbf366f36 100644
--- a/tests/ported_static/stTransitionTest/test_delegatecall_before_transition.py
+++ b/tests/ported_static/stTransitionTest/test_delegatecall_before_transition.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_delegatecall_before_transition.
 
 Ported from:
-tests/static/state_tests/stTransitionTest
-delegatecallBeforeTransitionFiller.json
+state_tests/stTransitionTest/delegatecallBeforeTransitionFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stTransitionTest/delegatecallBeforeTransitionFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stTransitionTest/delegatecallBeforeTransitionFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_delegatecall_before_transition(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xE04D1AC7DDDA0C98397D56A0B501E960D4CD325A39286919AC23C1A07009A869
-    )
+    """Test_delegatecall_before_transition."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,52 +43,42 @@ def test_delegatecall_before_transition(
         gas_limit=30000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x1, value=Op.CALLER)
-            + Op.SSTORE(key=0x2, value=Op.CALLVALUE)
-            + Op.STOP
-        ),
+    # Source: lll
+    # {[[ 1 ]] (CALLER) [[ 2 ]] (CALLVALUE) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x1, value=Op.CALLER)
+        + Op.SSTORE(key=0x2, value=Op.CALLVALUE)
+        + Op.STOP,
         balance=23,
         nonce=0,
-        address=Address("0x000d3f6e432d6891a965fc56d39e729652a0762a"),  # noqa: E501
+        address=Address(0x000D3F6E432D6891A965FC56D39E729652A0762A),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # {  [[ 0 ]] (DELEGATECALL 500000 <contract:0x945304eb96065b2a98b57a48a06ae28d285a71b5> 0 64 0 2 ) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(
-                key=0x0,
-                value=Op.DELEGATECALL(
-                    gas=0x7A120,
-                    address=0xD3F6E432D6891A965FC56D39E729652A0762A,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0x0,
-                    ret_size=0x2,
-                ),
-            )
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DELEGATECALL(
+                gas=0x7A120,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x40,
+                ret_offset=0x0,
+                ret_size=0x2,
+            ),
+        )
+        + Op.STOP,
         balance=0xDE0B6B3A7640000,
         nonce=0,
-        address=Address("0x55bb8a8658b848ebbbb73cbf6ac9d59d715aec58"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=3000000,
     )
 
-    post = {
-        contract: Account(
-            storage={
-                0: 1,
-                1: 0xEBAF50DEBF10E08302FE4280C32DF010463CA297,
-            },
-        ),
-    }
+    post = {target: Account(storage={0: 1, 1: sender})}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/__init__.py b/tests/ported_static/stWalletTest/__init__.py
index b4565c690a0..040f55678c4 100644
--- a/tests/ported_static/stWalletTest/__init__.py
+++ b/tests/ported_static/stWalletTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stWalletTest."""
+"""Ported static tests: stWalletTest."""  # noqa: N999
diff --git a/tests/ported_static/stWalletTest/test_day_limit_construction.py b/tests/ported_static/stWalletTest/test_day_limit_construction.py
index 17c560fcf3b..4206fa7b772 100644
--- a/tests/ported_static/stWalletTest/test_day_limit_construction.py
+++ b/tests/ported_static/stWalletTest/test_day_limit_construction.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_day_limit_construction.
 
 Ported from:
-tests/static/state_tests/stWalletTest/dayLimitConstructionFiller.json
+state_tests/stWalletTest/dayLimitConstructionFiller.json
 """
 
 import pytest
@@ -11,35 +11,50 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stWalletTest/dayLimitConstructionFiller.json"],
+    ["state_tests/stWalletTest/dayLimitConstructionFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit",
+    "d, g, v",
     [
-        817083,
-        1217083,
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_day_limit_construction(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_day_limit_construction."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -55,95 +70,38 @@ def test_day_limit_construction(
 
     pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
+    tx_data = [
+        Bytes(
+            "606060409081526001600081815581805533600160a060020a0316600381905581526101026020529190912055620151804204610107556109b4806100456000396000f300606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+        ),
+    ]
+    tx_gas = [817083, 1217083]
+    tx_value = [100]
+
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "606060409081526001600081815581805533600160a060020a0316600381905581526101"  # noqa: E501
-            "026020529190912055620151804204610107556109b4806100456000396000f300606060"  # noqa: E501
-            "405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e1461"  # noqa: E501
-            "00f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb481461015457"  # noqa: E501
-            "8063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba"  # noqa: E501
-            "51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86"  # noqa: E501
-            "146102a2575b005b61009860043560006000364360405180848480828437505050909101"  # noqa: E501
-            "90815260405190819003602001902090506105b9815b600160a060020a03331660009081"  # noqa: E501
-            "52610102602052604081205481808083811415610719576108b0565b6102ac6004355b60"  # noqa: E501
-            "0160a060020a0316600090815261010260205260408120541190565b6102ac6001548156"  # noqa: E501
-            "5b6100986000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "019020905061070b816100cc565b61009860043560003643604051808484808284375050"  # noqa: E501
-            "509091019081526040519081900360200190209050610531816100cc565b6102ac600054"  # noqa: E501
-            "81565b610098600435600036436040518084848082843750505090910190815260405190"  # noqa: E501
-            "819003602001902090506106ff816100cc565b610098600435600160a060020a03331660"  # noqa: E501
-            "009081526101026020526040812054908080838114156102be57610340565b6100986004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "9050610678816100cc565b6102ac60043560243560008281526101036020908152604080"  # noqa: E501
-            "8320600160a060020a0385168452610102909252822054829081818114156106d1576106"  # noqa: E501
-            "f5565b610098600435602435600060003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506103ca816100cc565b6102ac6101055481565b6040"  # noqa: E501
-            "8051918252519081900360200190f35b5050506000828152610103602052604081206001"  # noqa: E501
-            "810154600284900a92908316819011156103405781546001838101805492909101845590"  # noqa: E501
-            "849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59"  # noqa: E501
-            "b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190"  # noqa: E501
-            "a15b5050505050565b600160a060020a0383166002836101008110156100025701556001"  # noqa: E501
-            "60a060020a03848116600081815261010260209081526040808320839055938716808352"  # noqa: E501
-            "91849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab5"  # noqa: E501
-            "5bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3"  # noqa: E501
-            "576103d8836100fd565b156103e357506103c5565b600160a060020a0384166000908152"  # noqa: E501
-            "6101026020526040812054925082141561040c57506103c5565b6103475b610104546000"  # noqa: E501
-            "5b8181101561085f57610104805482908110156100025760009182526000805160206109"  # noqa: E501
-            "9483398151915201541461048a5761010480546101039160009184908110156100025760"  # noqa: E501
-            "008051602061099483398151915201548252506020919091526040812081815560018101"  # noqa: E501
-            "829055600201555b600101610417565b60018054810190819055600160a060020a038316"  # noqa: E501
-            "906002906101008110156100025790900160005081905550600160005054610102600050"  # noqa: E501
-            "600084600160a060020a03168152602001908152602001600020600050819055507f994a"  # noqa: E501
-            "936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082"  # noqa: E501
-            "600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c57"  # noqa: E501
-            "61053f826100fd565b1561054a575061052e565b610552610410565b60015460fa901061"  # noqa: E501
-            "05675761056561057c565b505b60015460fa9010610492575061052e565b6106365b6000"  # noqa: E501
-            "60015b600154811015610899575b600154811080156105ac575060028161010081101561"  # noqa: E501
-            "0002570154600014155b156108b95760010161058c565b156103c557600160a060020a03"  # noqa: E501
-            "83166000908152610102602052604081205492508214156105e7575061052c565b600160"  # noqa: E501
-            "0160005054036000600050541115610602575061052c565b600060028361010081101561"  # noqa: E501
-            "000257508301819055600160a060020a0384168152610102602052604081205561057861"  # noqa: E501
-            "0410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef"  # noqa: E501
-            "88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561"  # noqa: E501
-            "052c5760015482111561068d575061052e565b600082905561069a610410565b60408051"  # noqa: E501
-            "83815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f5"  # noqa: E501
-            "50da9181900360200190a15050565b506001830154600282900a908116600014156106f0"  # noqa: E501
-            "57600094506106f5565b600194505b5050505092915050565b1561052c57506101055556"  # noqa: E501
-            "5b1561052e5760006101065550565b600086815261010360205260408120805490945090"  # noqa: E501
-            "92508214156107a257815483556001838101839055610104805491820180825582801582"  # noqa: E501
-            "9011610771578183600052602060002091820191016107719190610885565b5050506002"  # noqa: E501
-            "840181905561010480548892908110156100025760009190915260008051602061099483"  # noqa: E501
-            "398151915201555b506001820154600284900a908116600014156108b057604080516001"  # noqa: E501
-            "60a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d"  # noqa: E501
-            "5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57"  # noqa: E501
-            "600086815261010360205260409020600201546101048054909190811015610002576040"  # noqa: E501
-            "600090812060008051602061099483398151915292909201819055808255600180830182"  # noqa: E501
-            "905560029092015595506108b09050565b61010480546000808355919091526103c59060"  # noqa: E501
-            "0080516020610994833981519152908101905b8082111561089957600081556001016108"  # noqa: E501
-            "85565b5090565b8254600019018355600183018054821790555b50505050919050565b5b"  # noqa: E501
-            "600180541180156108dc57506001546002906101008110156100025701546000145b1561"  # noqa: E501
-            "08f057600180546000190190556108ba565b600154811080156109135750600154600290"  # noqa: E501
-            "610100811015610002570154600014155b801561092d5750600281610100811015610002"  # noqa: E501
-            "5701546000145b1561098e57600154600290610100811015610002578101549082610100"  # noqa: E501
-            "811015610002578101919091558190610102906000908361010081101561000257810154"  # noqa: E501
-            "825260209290925260408120929092556001546101008110156100025701555b61058156"  # noqa: E501
-            "004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
-        ),
-        gas_limit=tx_gas_limit,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
         nonce=1,
-        value=100,
     )
 
     post = {
-        Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"): Account(
+        sender: Account(storage={}, code=b"", nonce=2),
+        compute_create_address(address=sender, nonce=1): Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
+                263: 0,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=100,
+            nonce=1,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_day_limit_construction_oog.py b/tests/ported_static/stWalletTest/test_day_limit_construction_oog.py
index 94523b2af18..7f48e931a50 100644
--- a/tests/ported_static/stWalletTest/test_day_limit_construction_oog.py
+++ b/tests/ported_static/stWalletTest/test_day_limit_construction_oog.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_day_limit_construction_oog.
 
 Ported from:
-tests/static/state_tests/stWalletTest/dayLimitConstructionOOGFiller.json
+state_tests/stWalletTest/dayLimitConstructionOOGFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -21,9 +21,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/dayLimitConstructionOOGFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/dayLimitConstructionOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,11 +29,9 @@ def test_day_limit_construction_oog(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_day_limit_construction_oog."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A75EF08F, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,89 +42,17 @@ def test_day_limit_construction_oog(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "606060409081526001600081815581805533600160a060020a0316600381905581526101"  # noqa: E501
-            "026020529190912055620151804204610107556109b4806100456000396000f300606060"  # noqa: E501
-            "405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e1461"  # noqa: E501
-            "00f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb481461015457"  # noqa: E501
-            "8063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba"  # noqa: E501
-            "51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86"  # noqa: E501
-            "146102a2575b005b61009860043560006000364360405180848480828437505050909101"  # noqa: E501
-            "90815260405190819003602001902090506105b9815b600160a060020a03331660009081"  # noqa: E501
-            "52610102602052604081205481808083811415610719576108b0565b6102ac6004355b60"  # noqa: E501
-            "0160a060020a0316600090815261010260205260408120541190565b6102ac6001548156"  # noqa: E501
-            "5b6100986000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "019020905061070b816100cc565b61009860043560003643604051808484808284375050"  # noqa: E501
-            "509091019081526040519081900360200190209050610531816100cc565b6102ac600054"  # noqa: E501
-            "81565b610098600435600036436040518084848082843750505090910190815260405190"  # noqa: E501
-            "819003602001902090506106ff816100cc565b610098600435600160a060020a03331660"  # noqa: E501
-            "009081526101026020526040812054908080838114156102be57610340565b6100986004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "9050610678816100cc565b6102ac60043560243560008281526101036020908152604080"  # noqa: E501
-            "8320600160a060020a0385168452610102909252822054829081818114156106d1576106"  # noqa: E501
-            "f5565b610098600435602435600060003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506103ca816100cc565b6102ac6101055481565b6040"  # noqa: E501
-            "8051918252519081900360200190f35b5050506000828152610103602052604081206001"  # noqa: E501
-            "810154600284900a92908316819011156103405781546001838101805492909101845590"  # noqa: E501
-            "849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59"  # noqa: E501
-            "b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190"  # noqa: E501
-            "a15b5050505050565b600160a060020a0383166002836101008110156100025701556001"  # noqa: E501
-            "60a060020a03848116600081815261010260209081526040808320839055938716808352"  # noqa: E501
-            "91849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab5"  # noqa: E501
-            "5bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3"  # noqa: E501
-            "576103d8836100fd565b156103e357506103c5565b600160a060020a0384166000908152"  # noqa: E501
-            "6101026020526040812054925082141561040c57506103c5565b6103475b610104546000"  # noqa: E501
-            "5b8181101561085f57610104805482908110156100025760009182526000805160206109"  # noqa: E501
-            "9483398151915201541461048a5761010480546101039160009184908110156100025760"  # noqa: E501
-            "008051602061099483398151915201548252506020919091526040812081815560018101"  # noqa: E501
-            "829055600201555b600101610417565b60018054810190819055600160a060020a038316"  # noqa: E501
-            "906002906101008110156100025790900160005081905550600160005054610102600050"  # noqa: E501
-            "600084600160a060020a03168152602001908152602001600020600050819055507f994a"  # noqa: E501
-            "936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082"  # noqa: E501
-            "600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c57"  # noqa: E501
-            "61053f826100fd565b1561054a575061052e565b610552610410565b60015460fa901061"  # noqa: E501
-            "05675761056561057c565b505b60015460fa9010610492575061052e565b6106365b6000"  # noqa: E501
-            "60015b600154811015610899575b600154811080156105ac575060028161010081101561"  # noqa: E501
-            "0002570154600014155b156108b95760010161058c565b156103c557600160a060020a03"  # noqa: E501
-            "83166000908152610102602052604081205492508214156105e7575061052c565b600160"  # noqa: E501
-            "0160005054036000600050541115610602575061052c565b600060028361010081101561"  # noqa: E501
-            "000257508301819055600160a060020a0384168152610102602052604081205561057861"  # noqa: E501
-            "0410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef"  # noqa: E501
-            "88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561"  # noqa: E501
-            "052c5760015482111561068d575061052e565b600082905561069a610410565b60408051"  # noqa: E501
-            "83815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f5"  # noqa: E501
-            "50da9181900360200190a15050565b506001830154600282900a908116600014156106f0"  # noqa: E501
-            "57600094506106f5565b600194505b5050505092915050565b1561052c57506101055556"  # noqa: E501
-            "5b1561052e5760006101065550565b600086815261010360205260408120805490945090"  # noqa: E501
-            "92508214156107a257815483556001838101839055610104805491820180825582801582"  # noqa: E501
-            "9011610771578183600052602060002091820191016107719190610885565b5050506002"  # noqa: E501
-            "840181905561010480548892908110156100025760009190915260008051602061099483"  # noqa: E501
-            "398151915201555b506001820154600284900a908116600014156108b057604080516001"  # noqa: E501
-            "60a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d"  # noqa: E501
-            "5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57"  # noqa: E501
-            "600086815261010360205260409020600201546101048054909190811015610002576040"  # noqa: E501
-            "600090812060008051602061099483398151915292909201819055808255600180830182"  # noqa: E501
-            "905560029092015595506108b09050565b61010480546000808355919091526103c59060"  # noqa: E501
-            "0080516020610994833981519152908101905b8082111561089957600081556001016108"  # noqa: E501
-            "85565b5090565b8254600019018355600183018054821790555b50505050919050565b5b"  # noqa: E501
-            "600180541180156108dc57506001546002906101008110156100025701546000145b1561"  # noqa: E501
-            "08f057600180546000190190556108ba565b600154811080156109135750600154600290"  # noqa: E501
-            "610100811015610002570154600014155b801561092d5750600281610100811015610002"  # noqa: E501
-            "5701546000145b1561098e57600154600290610100811015610002578101549082610100"  # noqa: E501
-            "811015610002578101919091558190610102906000908361010081101561000257810154"  # noqa: E501
-            "825260209290925260408120929092556001546101008110156100025701555b61058156"  # noqa: E501
-            "004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+        data=Bytes(
+            "606060409081526001600081815581805533600160a060020a0316600381905581526101026020529190912055620151804204610107556109b4806100456000396000f300606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         gas_limit=288282,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
-    post: dict = {}
+    post = {sender: Account(storage={}, code=b"", nonce=2)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_day_limit_construction_partial.py b/tests/ported_static/stWalletTest/test_day_limit_construction_partial.py
index 1dd03d19d7b..0cd3bb580e1 100644
--- a/tests/ported_static/stWalletTest/test_day_limit_construction_partial.py
+++ b/tests/ported_static/stWalletTest/test_day_limit_construction_partial.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_day_limit_construction_partial.
 
 Ported from:
-tests/static/state_tests/stWalletTest/dayLimitConstructionPartialFiller.json
+state_tests/stWalletTest/dayLimitConstructionPartialFiller.json
 """
 
 import pytest
@@ -11,9 +11,11 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -21,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/dayLimitConstructionPartialFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/dayLimitConstructionPartialFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,8 +31,8 @@ def test_day_limit_construction_partial(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_day_limit_construction_partial."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -51,92 +51,28 @@ def test_day_limit_construction_partial(
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "606060409081526001600081815581805533600160a060020a0316600381905581526101"  # noqa: E501
-            "026020529190912055620151804204610107556109b4806100456000396000f300606060"  # noqa: E501
-            "405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e1461"  # noqa: E501
-            "00f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb481461015457"  # noqa: E501
-            "8063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba"  # noqa: E501
-            "51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86"  # noqa: E501
-            "146102a2575b005b61009860043560006000364360405180848480828437505050909101"  # noqa: E501
-            "90815260405190819003602001902090506105b9815b600160a060020a03331660009081"  # noqa: E501
-            "52610102602052604081205481808083811415610719576108b0565b6102ac6004355b60"  # noqa: E501
-            "0160a060020a0316600090815261010260205260408120541190565b6102ac6001548156"  # noqa: E501
-            "5b6100986000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "019020905061070b816100cc565b61009860043560003643604051808484808284375050"  # noqa: E501
-            "509091019081526040519081900360200190209050610531816100cc565b6102ac600054"  # noqa: E501
-            "81565b610098600435600036436040518084848082843750505090910190815260405190"  # noqa: E501
-            "819003602001902090506106ff816100cc565b610098600435600160a060020a03331660"  # noqa: E501
-            "009081526101026020526040812054908080838114156102be57610340565b6100986004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "9050610678816100cc565b6102ac60043560243560008281526101036020908152604080"  # noqa: E501
-            "8320600160a060020a0385168452610102909252822054829081818114156106d1576106"  # noqa: E501
-            "f5565b610098600435602435600060003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506103ca816100cc565b6102ac6101055481565b6040"  # noqa: E501
-            "8051918252519081900360200190f35b5050506000828152610103602052604081206001"  # noqa: E501
-            "810154600284900a92908316819011156103405781546001838101805492909101845590"  # noqa: E501
-            "849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59"  # noqa: E501
-            "b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190"  # noqa: E501
-            "a15b5050505050565b600160a060020a0383166002836101008110156100025701556001"  # noqa: E501
-            "60a060020a03848116600081815261010260209081526040808320839055938716808352"  # noqa: E501
-            "91849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab5"  # noqa: E501
-            "5bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3"  # noqa: E501
-            "576103d8836100fd565b156103e357506103c5565b600160a060020a0384166000908152"  # noqa: E501
-            "6101026020526040812054925082141561040c57506103c5565b6103475b610104546000"  # noqa: E501
-            "5b8181101561085f57610104805482908110156100025760009182526000805160206109"  # noqa: E501
-            "9483398151915201541461048a5761010480546101039160009184908110156100025760"  # noqa: E501
-            "008051602061099483398151915201548252506020919091526040812081815560018101"  # noqa: E501
-            "829055600201555b600101610417565b60018054810190819055600160a060020a038316"  # noqa: E501
-            "906002906101008110156100025790900160005081905550600160005054610102600050"  # noqa: E501
-            "600084600160a060020a03168152602001908152602001600020600050819055507f994a"  # noqa: E501
-            "936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082"  # noqa: E501
-            "600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c57"  # noqa: E501
-            "61053f826100fd565b1561054a575061052e565b610552610410565b60015460fa901061"  # noqa: E501
-            "05675761056561057c565b505b60015460fa9010610492575061052e565b6106365b6000"  # noqa: E501
-            "60015b600154811015610899575b600154811080156105ac575060028161010081101561"  # noqa: E501
-            "0002570154600014155b156108b95760010161058c565b156103c557600160a060020a03"  # noqa: E501
-            "83166000908152610102602052604081205492508214156105e7575061052c565b600160"  # noqa: E501
-            "0160005054036000600050541115610602575061052c565b600060028361010081101561"  # noqa: E501
-            "000257508301819055600160a060020a0384168152610102602052604081205561057861"  # noqa: E501
-            "0410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef"  # noqa: E501
-            "88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561"  # noqa: E501
-            "052c5760015482111561068d575061052e565b600082905561069a610410565b60408051"  # noqa: E501
-            "83815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f5"  # noqa: E501
-            "50da9181900360200190a15050565b506001830154600282900a908116600014156106f0"  # noqa: E501
-            "57600094506106f5565b600194505b5050505092915050565b1561052c57506101055556"  # noqa: E501
-            "5b1561052e5760006101065550565b600086815261010360205260408120805490945090"  # noqa: E501
-            "92508214156107a257815483556001838101839055610104805491820180825582801582"  # noqa: E501
-            "9011610771578183600052602060002091820191016107719190610885565b5050506002"  # noqa: E501
-            "840181905561010480548892908110156100025760009190915260008051602061099483"  # noqa: E501
-            "398151915201555b506001820154600284900a908116600014156108b057604080516001"  # noqa: E501
-            "60a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d"  # noqa: E501
-            "5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57"  # noqa: E501
-            "600086815261010360205260409020600201546101048054909190811015610002576040"  # noqa: E501
-            "600090812060008051602061099483398151915292909201819055808255600180830182"  # noqa: E501
-            "905560029092015595506108b09050565b61010480546000808355919091526103c59060"  # noqa: E501
-            "0080516020610994833981519152908101905b8082111561089957600081556001016108"  # noqa: E501
-            "85565b5090565b8254600019018355600183018054821790555b50505050919050565b5b"  # noqa: E501
-            "600180541180156108dc57506001546002906101008110156100025701546000145b1561"  # noqa: E501
-            "08f057600180546000190190556108ba565b600154811080156109135750600154600290"  # noqa: E501
-            "610100811015610002570154600014155b801561092d5750600281610100811015610002"  # noqa: E501
-            "5701546000145b1561098e57600154600290610100811015610002578101549082610100"  # noqa: E501
-            "811015610002578101919091558190610102906000908361010081101561000257810154"  # noqa: E501
-            "825260209290925260408120929092556001546101008110156100025701555b61058156"  # noqa: E501
-            "004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+        data=Bytes(
+            "606060409081526001600081815581805533600160a060020a0316600381905581526101026020529190912055620151804204610107556109b4806100456000396000f300606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         gas_limit=817082,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"): Account(
+        sender: Account(storage={}, code=b"", nonce=2),
+        compute_create_address(address=sender, nonce=1): Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=100,
+            nonce=1,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_day_limit_reset_spent_today.py b/tests/ported_static/stWalletTest/test_day_limit_reset_spent_today.py
index ca624e9f060..8ca44bb9093 100644
--- a/tests/ported_static/stWalletTest/test_day_limit_reset_spent_today.py
+++ b/tests/ported_static/stWalletTest/test_day_limit_reset_spent_today.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_day_limit_reset_spent_today.
 
 Ported from:
-tests/static/state_tests/stWalletTest/dayLimitResetSpentTodayFiller.json
+state_tests/stWalletTest/dayLimitResetSpentTodayFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -21,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/dayLimitResetSpentTodayFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/dayLimitResetSpentTodayFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,8 +30,9 @@ def test_day_limit_reset_spent_today(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_day_limit_reset_spent_today."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -47,113 +47,52 @@ def test_day_limit_reset_spent_today(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf"  # noqa: E501
-            "6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb481461"  # noqa: E501
-            "0154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c557"  # noqa: E501
-            "8063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1"  # noqa: E501
-            "736d86146102a2575b005b61009860043560006000364360405180848480828437505050"  # noqa: E501
-            "90910190815260405190819003602001902090506105b9815b600160a060020a03331660"  # noqa: E501
-            "00908152610102602052604081205481808083811415610719576108b0565b6102ac6004"  # noqa: E501
-            "355b600160a060020a0316600090815261010260205260408120541190565b6102ac6001"  # noqa: E501
-            "5481565b6100986000364360405180848480828437505050909101908152604051908190"  # noqa: E501
-            "036020019020905061070b816100cc565b61009860043560003643604051808484808284"  # noqa: E501
-            "375050509091019081526040519081900360200190209050610531816100cc565b6102ac"  # noqa: E501
-            "60005481565b610098600435600036436040518084848082843750505090910190815260"  # noqa: E501
-            "405190819003602001902090506106ff816100cc565b610098600435600160a060020a03"  # noqa: E501
-            "331660009081526101026020526040812054908080838114156102be57610340565b6100"  # noqa: E501
-            "986004356000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "0190209050610678816100cc565b6102ac60043560243560008281526101036020908152"  # noqa: E501
-            "6040808320600160a060020a0385168452610102909252822054829081818114156106d1"  # noqa: E501
-            "576106f5565b610098600435602435600060003643604051808484808284375050509091"  # noqa: E501
-            "0190815260405190819003602001902090506103ca816100cc565b6102ac610105548156"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156103405781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "6103c3576103d8836100fd565b156103e357506103c5565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561040c57506103c5565b6103475b610104"  # noqa: E501
-            "5460005b8181101561085f57610104805482908110156100025760009182526000805160"  # noqa: E501
-            "2061099483398151915201541461048a5761010480546101039160009184908110156100"  # noqa: E501
-            "025760008051602061099483398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610417565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa"  # noqa: E501
-            "90106105675761056561057c565b505b60015460fa9010610492575061052e565b610636"  # noqa: E501
-            "5b600060015b600154811015610899575b600154811080156105ac575060028161010081"  # noqa: E501
-            "1015610002570154600014155b156108b95760010161058c565b156103c557600160a060"  # noqa: E501
-            "020a0383166000908152610102602052604081205492508214156105e7575061052c565b"  # noqa: E501
-            "6001600160005054036000600050541115610602575061052c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "0578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561052c5760015482111561068d575061052e565b600082905561069a610410565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106f057600094506106f5565b600194505b5050505092915050565b1561052c57506101"  # noqa: E501
-            "0555565b1561052e5760006101065550565b600086815261010360205260408120805490"  # noqa: E501
-            "94509092508214156107a257815483556001838101839055610104805491820180825582"  # noqa: E501
-            "8015829011610771578183600052602060002091820191016107719190610885565b5050"  # noqa: E501
-            "506002840181905561010480548892908110156100025760009190915260008051602061"  # noqa: E501
-            "099483398151915201555b506001820154600284900a908116600014156108b057604080"  # noqa: E501
-            "51600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94c"  # noqa: E501
-            "c41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161"  # noqa: E501
-            "089d57600086815261010360205260409020600201546101048054909190811015610002"  # noqa: E501
-            "576040600090812060008051602061099483398151915292909201819055808255600180"  # noqa: E501
-            "830182905560029092015595506108b09050565b61010480546000808355919091526103"  # noqa: E501
-            "c590600080516020610994833981519152908101905b8082111561089957600081556001"  # noqa: E501
-            "01610885565b5090565b8254600019018355600183018054821790555b50505050919050"  # noqa: E501
-            "565b5b600180541180156108dc5750600154600290610100811015610002570154600014"  # noqa: E501
-            "5b156108f057600180546000190190556108ba565b600154811080156109135750600154"  # noqa: E501
-            "600290610100811015610002570154600014155b801561092d5750600281610100811015"  # noqa: E501
-            "6100025701546000145b1561098e57600154600290610100811015610002578101549082"  # noqa: E501
-            "610100811015610002578101919091558190610102906000908361010081101561000257"  # noqa: E501
-            "810154825260209290925260408120929092556001546101008110156100025701555b61"  # noqa: E501
-            "058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            "606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x104: 0x1,
-            0x105: 0x2,
-            0x107: 0xC22E4,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            260: 1,
+            261: 2,
+            263: 0xC22E4,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"),  # noqa: E501
+        address=Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("5c52c2f5"),
+        to=contract_0,
+        data=Bytes("5c52c2f5"),
         gas_limit=635701,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, nonce=2),
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 260: 2,
                 261: 2,
                 263: 0xC22E4,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_day_limit_set_daily_limit.py b/tests/ported_static/stWalletTest/test_day_limit_set_daily_limit.py
index 9c56ed69efe..7001d5c4d51 100644
--- a/tests/ported_static/stWalletTest/test_day_limit_set_daily_limit.py
+++ b/tests/ported_static/stWalletTest/test_day_limit_set_daily_limit.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_day_limit_set_daily_limit.
 
 Ported from:
-tests/static/state_tests/stWalletTest/dayLimitSetDailyLimitFiller.json
+state_tests/stWalletTest/dayLimitSetDailyLimitFiller.json
 """
 
 import pytest
@@ -11,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -21,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stWalletTest/dayLimitSetDailyLimitFiller.json"],
+    ["state_tests/stWalletTest/dayLimitSetDailyLimitFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -29,8 +31,9 @@ def test_day_limit_set_daily_limit(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_day_limit_set_daily_limit."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,113 +48,50 @@ def test_day_limit_set_daily_limit(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf"  # noqa: E501
-            "6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb481461"  # noqa: E501
-            "0154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c557"  # noqa: E501
-            "8063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1"  # noqa: E501
-            "736d86146102a2575b005b61009860043560006000364360405180848480828437505050"  # noqa: E501
-            "90910190815260405190819003602001902090506105b9815b600160a060020a03331660"  # noqa: E501
-            "00908152610102602052604081205481808083811415610719576108b0565b6102ac6004"  # noqa: E501
-            "355b600160a060020a0316600090815261010260205260408120541190565b6102ac6001"  # noqa: E501
-            "5481565b6100986000364360405180848480828437505050909101908152604051908190"  # noqa: E501
-            "036020019020905061070b816100cc565b61009860043560003643604051808484808284"  # noqa: E501
-            "375050509091019081526040519081900360200190209050610531816100cc565b6102ac"  # noqa: E501
-            "60005481565b610098600435600036436040518084848082843750505090910190815260"  # noqa: E501
-            "405190819003602001902090506106ff816100cc565b610098600435600160a060020a03"  # noqa: E501
-            "331660009081526101026020526040812054908080838114156102be57610340565b6100"  # noqa: E501
-            "986004356000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "0190209050610678816100cc565b6102ac60043560243560008281526101036020908152"  # noqa: E501
-            "6040808320600160a060020a0385168452610102909252822054829081818114156106d1"  # noqa: E501
-            "576106f5565b610098600435602435600060003643604051808484808284375050509091"  # noqa: E501
-            "0190815260405190819003602001902090506103ca816100cc565b6102ac610105548156"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156103405781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "6103c3576103d8836100fd565b156103e357506103c5565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561040c57506103c5565b6103475b610104"  # noqa: E501
-            "5460005b8181101561085f57610104805482908110156100025760009182526000805160"  # noqa: E501
-            "2061099483398151915201541461048a5761010480546101039160009184908110156100"  # noqa: E501
-            "025760008051602061099483398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610417565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa"  # noqa: E501
-            "90106105675761056561057c565b505b60015460fa9010610492575061052e565b610636"  # noqa: E501
-            "5b600060015b600154811015610899575b600154811080156105ac575060028161010081"  # noqa: E501
-            "1015610002570154600014155b156108b95760010161058c565b156103c557600160a060"  # noqa: E501
-            "020a0383166000908152610102602052604081205492508214156105e7575061052c565b"  # noqa: E501
-            "6001600160005054036000600050541115610602575061052c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "0578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561052c5760015482111561068d575061052e565b600082905561069a610410565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106f057600094506106f5565b600194505b5050505092915050565b1561052c57506101"  # noqa: E501
-            "0555565b1561052e5760006101065550565b600086815261010360205260408120805490"  # noqa: E501
-            "94509092508214156107a257815483556001838101839055610104805491820180825582"  # noqa: E501
-            "8015829011610771578183600052602060002091820191016107719190610885565b5050"  # noqa: E501
-            "506002840181905561010480548892908110156100025760009190915260008051602061"  # noqa: E501
-            "099483398151915201555b506001820154600284900a908116600014156108b057604080"  # noqa: E501
-            "51600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94c"  # noqa: E501
-            "c41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161"  # noqa: E501
-            "089d57600086815261010360205260409020600201546101048054909190811015610002"  # noqa: E501
-            "576040600090812060008051602061099483398151915292909201819055808255600180"  # noqa: E501
-            "830182905560029092015595506108b09050565b61010480546000808355919091526103"  # noqa: E501
-            "c590600080516020610994833981519152908101905b8082111561089957600081556001"  # noqa: E501
-            "01610885565b5090565b8254600019018355600183018054821790555b50505050919050"  # noqa: E501
-            "565b5b600180541180156108dc5750600154600290610100811015610002570154600014"  # noqa: E501
-            "5b156108f057600180546000190190556108ba565b600154811080156109135750600154"  # noqa: E501
-            "600290610100811015610002570154600014155b801561092d5750600281610100811015"  # noqa: E501
-            "6100025701546000145b1561098e57600154600290610100811015610002578101549082"  # noqa: E501
-            "610100811015610002578101919091558190610102906000908361010081101561000257"  # noqa: E501
-            "810154825260209290925260408120929092556001546101008110156100025701555b61"  # noqa: E501
-            "058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            "606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x107: 0xC22E4,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            263: 0xC22E4,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"),  # noqa: E501
+        address=Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "b20d30a90000000000000000000000000000000000000000000000000000000000000002"  # noqa: E501
-        ),
+        to=contract_0,
+        data=Bytes("b20d30a9") + Hash(0x2),
         gas_limit=635701,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, nonce=2),
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 260: 1,
                 261: 2,
                 263: 0xC22E4,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_day_limit_set_daily_limit_no_data.py b/tests/ported_static/stWalletTest/test_day_limit_set_daily_limit_no_data.py
index a6423378ad1..9f315b1ee78 100644
--- a/tests/ported_static/stWalletTest/test_day_limit_set_daily_limit_no_data.py
+++ b/tests/ported_static/stWalletTest/test_day_limit_set_daily_limit_no_data.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_day_limit_set_daily_limit_no_data.
 
 Ported from:
-tests/static/state_tests/stWalletTest/dayLimitSetDailyLimitNoDataFiller.json
+state_tests/stWalletTest/dayLimitSetDailyLimitNoDataFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -21,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/dayLimitSetDailyLimitNoDataFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/dayLimitSetDailyLimitNoDataFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,8 +30,9 @@ def test_day_limit_set_daily_limit_no_data(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_day_limit_set_daily_limit_no_data."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -47,110 +47,49 @@ def test_day_limit_set_daily_limit_no_data(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf"  # noqa: E501
-            "6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb481461"  # noqa: E501
-            "0154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c557"  # noqa: E501
-            "8063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1"  # noqa: E501
-            "736d86146102a2575b005b61009860043560006000364360405180848480828437505050"  # noqa: E501
-            "90910190815260405190819003602001902090506105b9815b600160a060020a03331660"  # noqa: E501
-            "00908152610102602052604081205481808083811415610719576108b0565b6102ac6004"  # noqa: E501
-            "355b600160a060020a0316600090815261010260205260408120541190565b6102ac6001"  # noqa: E501
-            "5481565b6100986000364360405180848480828437505050909101908152604051908190"  # noqa: E501
-            "036020019020905061070b816100cc565b61009860043560003643604051808484808284"  # noqa: E501
-            "375050509091019081526040519081900360200190209050610531816100cc565b6102ac"  # noqa: E501
-            "60005481565b610098600435600036436040518084848082843750505090910190815260"  # noqa: E501
-            "405190819003602001902090506106ff816100cc565b610098600435600160a060020a03"  # noqa: E501
-            "331660009081526101026020526040812054908080838114156102be57610340565b6100"  # noqa: E501
-            "986004356000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "0190209050610678816100cc565b6102ac60043560243560008281526101036020908152"  # noqa: E501
-            "6040808320600160a060020a0385168452610102909252822054829081818114156106d1"  # noqa: E501
-            "576106f5565b610098600435602435600060003643604051808484808284375050509091"  # noqa: E501
-            "0190815260405190819003602001902090506103ca816100cc565b6102ac610105548156"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156103405781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "6103c3576103d8836100fd565b156103e357506103c5565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561040c57506103c5565b6103475b610104"  # noqa: E501
-            "5460005b8181101561085f57610104805482908110156100025760009182526000805160"  # noqa: E501
-            "2061099483398151915201541461048a5761010480546101039160009184908110156100"  # noqa: E501
-            "025760008051602061099483398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610417565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa"  # noqa: E501
-            "90106105675761056561057c565b505b60015460fa9010610492575061052e565b610636"  # noqa: E501
-            "5b600060015b600154811015610899575b600154811080156105ac575060028161010081"  # noqa: E501
-            "1015610002570154600014155b156108b95760010161058c565b156103c557600160a060"  # noqa: E501
-            "020a0383166000908152610102602052604081205492508214156105e7575061052c565b"  # noqa: E501
-            "6001600160005054036000600050541115610602575061052c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "0578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561052c5760015482111561068d575061052e565b600082905561069a610410565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106f057600094506106f5565b600194505b5050505092915050565b1561052c57506101"  # noqa: E501
-            "0555565b1561052e5760006101065550565b600086815261010360205260408120805490"  # noqa: E501
-            "94509092508214156107a257815483556001838101839055610104805491820180825582"  # noqa: E501
-            "8015829011610771578183600052602060002091820191016107719190610885565b5050"  # noqa: E501
-            "506002840181905561010480548892908110156100025760009190915260008051602061"  # noqa: E501
-            "099483398151915201555b506001820154600284900a908116600014156108b057604080"  # noqa: E501
-            "51600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94c"  # noqa: E501
-            "c41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161"  # noqa: E501
-            "089d57600086815261010360205260409020600201546101048054909190811015610002"  # noqa: E501
-            "576040600090812060008051602061099483398151915292909201819055808255600180"  # noqa: E501
-            "830182905560029092015595506108b09050565b61010480546000808355919091526103"  # noqa: E501
-            "c590600080516020610994833981519152908101905b8082111561089957600081556001"  # noqa: E501
-            "01610885565b5090565b8254600019018355600183018054821790555b50505050919050"  # noqa: E501
-            "565b5b600180541180156108dc5750600154600290610100811015610002570154600014"  # noqa: E501
-            "5b156108f057600180546000190190556108ba565b600154811080156109135750600154"  # noqa: E501
-            "600290610100811015610002570154600014155b801561092d5750600281610100811015"  # noqa: E501
-            "6100025701546000145b1561098e57600154600290610100811015610002578101549082"  # noqa: E501
-            "610100811015610002578101919091558190610102906000908361010081101561000257"  # noqa: E501
-            "810154825260209290925260408120929092556001546101008110156100025701555b61"  # noqa: E501
-            "058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            "606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x107: 0xC22E4,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            263: 0xC22E4,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"),  # noqa: E501
+        address=Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("b20d30a9"),
+        to=contract_0,
+        data=Bytes("b20d30a9"),
         gas_limit=635701,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, nonce=2),
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 260: 1,
                 263: 0xC22E4,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_add_owner.py b/tests/ported_static/stWalletTest/test_multi_owned_add_owner.py
index 4fd27971c2c..71b81edd443 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_add_owner.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_add_owner.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_multi_owned_add_owner.
 
 Ported from:
-tests/static/state_tests/stWalletTest/multiOwnedAddOwnerFiller.json
+state_tests/stWalletTest/multiOwnedAddOwnerFiller.json
 """
 
 import pytest
@@ -11,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -21,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stWalletTest/multiOwnedAddOwnerFiller.json"],
+    ["state_tests/stWalletTest/multiOwnedAddOwnerFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -29,8 +31,9 @@ def test_multi_owned_add_owner(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_multi_owned_add_owner."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -44,109 +47,51 @@ def test_multi_owned_add_owner(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
+    # Source: raw
+    # 0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf"  # noqa: E501
-            "6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c91711461"  # noqa: E501
-            "0136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a357"  # noqa: E501
-            "8063f00d4b5d146101e3575b005b61007760043560006000364360405180848480828437"  # noqa: E501
-            "5050509091019081526040519081900360200190209050610529815b600160a060020a03"  # noqa: E501
-            "3316600090815261010260205260408120548180808381141561066f57610806565b6102"  # noqa: E501
-            "1c6004355b600160a060020a0316600090815261010260205260408120541190565b6102"  # noqa: E501
-            "1c60015481565b6100776004356000364360405180848480828437505050909101908152"  # noqa: E501
-            "60405190819003602001902090506104a1816100ab565b61021c60005481565b61007760"  # noqa: E501
-            "0435600160a060020a033316600090815261010260205260408120549080808381141561"  # noqa: E501
-            "022e576102b0565b61007760043560003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506105e8816100ab565b61021c600435602435600082"  # noqa: E501
-            "815261010360209081526040808320600160a060020a0385168452610102909252822054"  # noqa: E501
-            "8290818181141561064157610665565b6100776004356024356000600036436040518084"  # noqa: E501
-            "8480828437505050909101908152604051908190036020019020905061033a816100ab56"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156102b05781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "61033357610348836100dc565b156103535750610335565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561037c5750610335565b6102b75b610104"  # noqa: E501
-            "5460005b818110156107b557610104805482908110156100025760009182526000805160"  # noqa: E501
-            "206108ea8339815191520154146103fa5761010480546101039160009184908110156100"  # noqa: E501
-            "02576000805160206108ea83398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610387565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa"  # noqa: E501
-            "90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a6"  # noqa: E501
-            "5b600060015b6001548110156107ef575b6001548110801561051c575060028161010081"  # noqa: E501
-            "1015610002570154600014155b1561080f576001016104fc565b1561033557600160a060"  # noqa: E501
-            "020a038316600090815261010260205260408120549250821415610557575061049c565b"  # noqa: E501
-            "6001600160005054036000600050541115610572575061049c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "04e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561049c576001548211156105fd575061049e565b600082905561060a610380565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106605760009450610665565b600194505b5050505092915050565b6000868152610103"  # noqa: E501
-            "6020526040812080549094509092508214156106f8578154835560018381018390556101"  # noqa: E501
-            "0480549182018082558280158290116106c7578183600052602060002091820191016106"  # noqa: E501
-            "c791906107db565b50505060028401819055610104805488929081101561000257600091"  # noqa: E501
-            "9091526000805160206108ea83398151915201555b506001820154600284900a90811660"  # noqa: E501
-            "0014156108065760408051600160a060020a03331681526020810188905281517fe1c52d"  # noqa: E501
-            "c63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda92918190039091"  # noqa: E501
-            "0190a18254600190116107f3576000868152610103602052604090206002015461010480"  # noqa: E501
-            "5490919081101561000257604060009081206000805160206108ea833981519152929092"  # noqa: E501
-            "01819055808255600180830182905560029092015595506108069050565b610104805460"  # noqa: E501
-            "0080835591909152610335906000805160206108ea833981519152908101905b80821115"  # noqa: E501
-            "6107ef57600081556001016107db565b5090565b82546000190183556001830180548217"  # noqa: E501
-            "90555b50505050919050565b5b6001805411801561083257506001546002906101008110"  # noqa: E501
-            "156100025701546000145b156108465760018054600019019055610810565b6001548110"  # noqa: E501
-            "80156108695750600154600290610100811015610002570154600014155b801561088357"  # noqa: E501
-            "506002816101008110156100025701546000145b156108e4576001546002906101008110"  # noqa: E501
-            "156100025781015490826101008110156100025781019190915581906101029060009083"  # noqa: E501
-            "610100811015610002578101548252602092909252604081209290925560015461010081"  # noqa: E501
-            "10156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab9"  # noqa: E501
-            "1f525b5ae7a03d02fabe"
+            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7065cb480000000000000000000000003fb1cd2cd96c6d5c0b5eb3322d807b34482481d4"  # noqa: E501
-        ),
+        to=contract_0,
+        data=Bytes("7065cb48")
+        + Hash(0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 2,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 4: 0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
                 0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 2,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
+        sender: Account(storage={}, nonce=2),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_add_owner_add_myself.py b/tests/ported_static/stWalletTest/test_multi_owned_add_owner_add_myself.py
index a94f9cf9e21..da52d06e983 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_add_owner_add_myself.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_add_owner_add_myself.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_multi_owned_add_owner_add_myself.
 
 Ported from:
-tests/static/state_tests/stWalletTest/multiOwnedAddOwnerAddMyselfFiller.json
+state_tests/stWalletTest/multiOwnedAddOwnerAddMyselfFiller.json
 """
 
 import pytest
@@ -11,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -21,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/multiOwnedAddOwnerAddMyselfFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/multiOwnedAddOwnerAddMyselfFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,8 +31,9 @@ def test_multi_owned_add_owner_add_myself(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_multi_owned_add_owner_add_myself."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -46,108 +47,49 @@ def test_multi_owned_add_owner_add_myself(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
+    # Source: raw
+    # 0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf"  # noqa: E501
-            "6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c91711461"  # noqa: E501
-            "0136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a357"  # noqa: E501
-            "8063f00d4b5d146101e3575b005b61007760043560006000364360405180848480828437"  # noqa: E501
-            "5050509091019081526040519081900360200190209050610529815b600160a060020a03"  # noqa: E501
-            "3316600090815261010260205260408120548180808381141561066f57610806565b6102"  # noqa: E501
-            "1c6004355b600160a060020a0316600090815261010260205260408120541190565b6102"  # noqa: E501
-            "1c60015481565b6100776004356000364360405180848480828437505050909101908152"  # noqa: E501
-            "60405190819003602001902090506104a1816100ab565b61021c60005481565b61007760"  # noqa: E501
-            "0435600160a060020a033316600090815261010260205260408120549080808381141561"  # noqa: E501
-            "022e576102b0565b61007760043560003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506105e8816100ab565b61021c600435602435600082"  # noqa: E501
-            "815261010360209081526040808320600160a060020a0385168452610102909252822054"  # noqa: E501
-            "8290818181141561064157610665565b6100776004356024356000600036436040518084"  # noqa: E501
-            "8480828437505050909101908152604051908190036020019020905061033a816100ab56"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156102b05781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "61033357610348836100dc565b156103535750610335565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561037c5750610335565b6102b75b610104"  # noqa: E501
-            "5460005b818110156107b557610104805482908110156100025760009182526000805160"  # noqa: E501
-            "206108ea8339815191520154146103fa5761010480546101039160009184908110156100"  # noqa: E501
-            "02576000805160206108ea83398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610387565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa"  # noqa: E501
-            "90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a6"  # noqa: E501
-            "5b600060015b6001548110156107ef575b6001548110801561051c575060028161010081"  # noqa: E501
-            "1015610002570154600014155b1561080f576001016104fc565b1561033557600160a060"  # noqa: E501
-            "020a038316600090815261010260205260408120549250821415610557575061049c565b"  # noqa: E501
-            "6001600160005054036000600050541115610572575061049c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "04e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561049c576001548211156105fd575061049e565b600082905561060a610380565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106605760009450610665565b600194505b5050505092915050565b6000868152610103"  # noqa: E501
-            "6020526040812080549094509092508214156106f8578154835560018381018390556101"  # noqa: E501
-            "0480549182018082558280158290116106c7578183600052602060002091820191016106"  # noqa: E501
-            "c791906107db565b50505060028401819055610104805488929081101561000257600091"  # noqa: E501
-            "9091526000805160206108ea83398151915201555b506001820154600284900a90811660"  # noqa: E501
-            "0014156108065760408051600160a060020a03331681526020810188905281517fe1c52d"  # noqa: E501
-            "c63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda92918190039091"  # noqa: E501
-            "0190a18254600190116107f3576000868152610103602052604090206002015461010480"  # noqa: E501
-            "5490919081101561000257604060009081206000805160206108ea833981519152929092"  # noqa: E501
-            "01819055808255600180830182905560029092015595506108069050565b610104805460"  # noqa: E501
-            "0080835591909152610335906000805160206108ea833981519152908101905b80821115"  # noqa: E501
-            "6107ef57600081556001016107db565b5090565b82546000190183556001830180548217"  # noqa: E501
-            "90555b50505050919050565b5b6001805411801561083257506001546002906101008110"  # noqa: E501
-            "156100025701546000145b156108465760018054600019019055610810565b6001548110"  # noqa: E501
-            "80156108695750600154600290610100811015610002570154600014155b801561088357"  # noqa: E501
-            "506002816101008110156100025701546000145b156108e4576001546002906101008110"  # noqa: E501
-            "156100025781015490826101008110156100025781019190915581906101029060009083"  # noqa: E501
-            "610100811015610002578101548252602092909252604081209290925560015461010081"  # noqa: E501
-            "10156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab9"  # noqa: E501
-            "1f525b5ae7a03d02fabe"
+            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7065cb48000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"  # noqa: E501
-        ),
+        to=contract_0,
+        data=Bytes("7065cb48") + Hash(sender, left_padding=True),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 260: 1,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
+        sender: Account(storage={}, nonce=2),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_change_owner.py b/tests/ported_static/stWalletTest/test_multi_owned_change_owner.py
index 1ec84fdbb12..7f24fa0623c 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_change_owner.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_change_owner.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_multi_owned_change_owner.
 
 Ported from:
-tests/static/state_tests/stWalletTest/multiOwnedChangeOwnerFiller.json
+state_tests/stWalletTest/multiOwnedChangeOwnerFiller.json
 """
 
 import pytest
@@ -11,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -21,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stWalletTest/multiOwnedChangeOwnerFiller.json"],
+    ["state_tests/stWalletTest/multiOwnedChangeOwnerFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -29,8 +31,9 @@ def test_multi_owned_change_owner(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_multi_owned_change_owner."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -44,108 +47,50 @@ def test_multi_owned_change_owner(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
+    # Source: raw
+    # 0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf"  # noqa: E501
-            "6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c91711461"  # noqa: E501
-            "0136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a357"  # noqa: E501
-            "8063f00d4b5d146101e3575b005b61007760043560006000364360405180848480828437"  # noqa: E501
-            "5050509091019081526040519081900360200190209050610529815b600160a060020a03"  # noqa: E501
-            "3316600090815261010260205260408120548180808381141561066f57610806565b6102"  # noqa: E501
-            "1c6004355b600160a060020a0316600090815261010260205260408120541190565b6102"  # noqa: E501
-            "1c60015481565b6100776004356000364360405180848480828437505050909101908152"  # noqa: E501
-            "60405190819003602001902090506104a1816100ab565b61021c60005481565b61007760"  # noqa: E501
-            "0435600160a060020a033316600090815261010260205260408120549080808381141561"  # noqa: E501
-            "022e576102b0565b61007760043560003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506105e8816100ab565b61021c600435602435600082"  # noqa: E501
-            "815261010360209081526040808320600160a060020a0385168452610102909252822054"  # noqa: E501
-            "8290818181141561064157610665565b6100776004356024356000600036436040518084"  # noqa: E501
-            "8480828437505050909101908152604051908190036020019020905061033a816100ab56"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156102b05781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "61033357610348836100dc565b156103535750610335565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561037c5750610335565b6102b75b610104"  # noqa: E501
-            "5460005b818110156107b557610104805482908110156100025760009182526000805160"  # noqa: E501
-            "206108ea8339815191520154146103fa5761010480546101039160009184908110156100"  # noqa: E501
-            "02576000805160206108ea83398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610387565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa"  # noqa: E501
-            "90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a6"  # noqa: E501
-            "5b600060015b6001548110156107ef575b6001548110801561051c575060028161010081"  # noqa: E501
-            "1015610002570154600014155b1561080f576001016104fc565b1561033557600160a060"  # noqa: E501
-            "020a038316600090815261010260205260408120549250821415610557575061049c565b"  # noqa: E501
-            "6001600160005054036000600050541115610572575061049c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "04e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561049c576001548211156105fd575061049e565b600082905561060a610380565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106605760009450610665565b600194505b5050505092915050565b6000868152610103"  # noqa: E501
-            "6020526040812080549094509092508214156106f8578154835560018381018390556101"  # noqa: E501
-            "0480549182018082558280158290116106c7578183600052602060002091820191016106"  # noqa: E501
-            "c791906107db565b50505060028401819055610104805488929081101561000257600091"  # noqa: E501
-            "9091526000805160206108ea83398151915201555b506001820154600284900a90811660"  # noqa: E501
-            "0014156108065760408051600160a060020a03331681526020810188905281517fe1c52d"  # noqa: E501
-            "c63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda92918190039091"  # noqa: E501
-            "0190a18254600190116107f3576000868152610103602052604090206002015461010480"  # noqa: E501
-            "5490919081101561000257604060009081206000805160206108ea833981519152929092"  # noqa: E501
-            "01819055808255600180830182905560029092015595506108069050565b610104805460"  # noqa: E501
-            "0080835591909152610335906000805160206108ea833981519152908101905b80821115"  # noqa: E501
-            "6107ef57600081556001016107db565b5090565b82546000190183556001830180548217"  # noqa: E501
-            "90555b50505050919050565b5b6001805411801561083257506001546002906101008110"  # noqa: E501
-            "156100025701546000145b156108465760018054600019019055610810565b6001548110"  # noqa: E501
-            "80156108695750600154600290610100811015610002570154600014155b801561088357"  # noqa: E501
-            "506002816101008110156100025701546000145b156108e4576001546002906101008110"  # noqa: E501
-            "156100025781015490826101008110156100025781019190915581906101029060009083"  # noqa: E501
-            "610100811015610002578101548252602092909252604081209290925560015461010081"  # noqa: E501
-            "10156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab9"  # noqa: E501
-            "1f525b5ae7a03d02fabe"
+            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "f00d4b5d000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"  # noqa: E501
-            "000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa"
-        ),
+        to=contract_0,
+        data=Bytes("f00d4b5d")
+        + Hash(sender, left_padding=True)
+        + Hash(0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
                 3: 0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA,
                 0x62CE4F671906BE9A217487BB98E428B08E12100FB0007DF10572CA00206E7D73: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
+        sender: Account(storage={}, nonce=2),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_change_owner_from_not_owner.py b/tests/ported_static/stWalletTest/test_multi_owned_change_owner_from_not_owner.py
index 8f8e5abd2f6..cdd7d00fd01 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_change_owner_from_not_owner.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_change_owner_from_not_owner.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_multi_owned_change_owner_from_not_owner.
 
 Ported from:
-tests/static/state_tests/stWalletTest
-multiOwnedChangeOwner_fromNotOwnerFiller.json
+state_tests/stWalletTest/multiOwnedChangeOwner_fromNotOwnerFiller.json
 """
 
 import pytest
@@ -12,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/multiOwnedChangeOwner_fromNotOwnerFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/multiOwnedChangeOwner_fromNotOwnerFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,9 @@ def test_multi_owned_change_owner_from_not_owner(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_multi_owned_change_owner_from_not_owner."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -47,109 +47,51 @@ def test_multi_owned_change_owner_from_not_owner(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
+    # Source: raw
+    # 0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf"  # noqa: E501
-            "6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c91711461"  # noqa: E501
-            "0136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a357"  # noqa: E501
-            "8063f00d4b5d146101e3575b005b61007760043560006000364360405180848480828437"  # noqa: E501
-            "5050509091019081526040519081900360200190209050610529815b600160a060020a03"  # noqa: E501
-            "3316600090815261010260205260408120548180808381141561066f57610806565b6102"  # noqa: E501
-            "1c6004355b600160a060020a0316600090815261010260205260408120541190565b6102"  # noqa: E501
-            "1c60015481565b6100776004356000364360405180848480828437505050909101908152"  # noqa: E501
-            "60405190819003602001902090506104a1816100ab565b61021c60005481565b61007760"  # noqa: E501
-            "0435600160a060020a033316600090815261010260205260408120549080808381141561"  # noqa: E501
-            "022e576102b0565b61007760043560003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506105e8816100ab565b61021c600435602435600082"  # noqa: E501
-            "815261010360209081526040808320600160a060020a0385168452610102909252822054"  # noqa: E501
-            "8290818181141561064157610665565b6100776004356024356000600036436040518084"  # noqa: E501
-            "8480828437505050909101908152604051908190036020019020905061033a816100ab56"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156102b05781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "61033357610348836100dc565b156103535750610335565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561037c5750610335565b6102b75b610104"  # noqa: E501
-            "5460005b818110156107b557610104805482908110156100025760009182526000805160"  # noqa: E501
-            "206108ea8339815191520154146103fa5761010480546101039160009184908110156100"  # noqa: E501
-            "02576000805160206108ea83398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610387565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa"  # noqa: E501
-            "90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a6"  # noqa: E501
-            "5b600060015b6001548110156107ef575b6001548110801561051c575060028161010081"  # noqa: E501
-            "1015610002570154600014155b1561080f576001016104fc565b1561033557600160a060"  # noqa: E501
-            "020a038316600090815261010260205260408120549250821415610557575061049c565b"  # noqa: E501
-            "6001600160005054036000600050541115610572575061049c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "04e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561049c576001548211156105fd575061049e565b600082905561060a610380565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106605760009450610665565b600194505b5050505092915050565b6000868152610103"  # noqa: E501
-            "6020526040812080549094509092508214156106f8578154835560018381018390556101"  # noqa: E501
-            "0480549182018082558280158290116106c7578183600052602060002091820191016106"  # noqa: E501
-            "c791906107db565b50505060028401819055610104805488929081101561000257600091"  # noqa: E501
-            "9091526000805160206108ea83398151915201555b506001820154600284900a90811660"  # noqa: E501
-            "0014156108065760408051600160a060020a03331681526020810188905281517fe1c52d"  # noqa: E501
-            "c63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda92918190039091"  # noqa: E501
-            "0190a18254600190116107f3576000868152610103602052604090206002015461010480"  # noqa: E501
-            "5490919081101561000257604060009081206000805160206108ea833981519152929092"  # noqa: E501
-            "01819055808255600180830182905560029092015595506108069050565b610104805460"  # noqa: E501
-            "0080835591909152610335906000805160206108ea833981519152908101905b80821115"  # noqa: E501
-            "6107ef57600081556001016107db565b5090565b82546000190183556001830180548217"  # noqa: E501
-            "90555b50505050919050565b5b6001805411801561083257506001546002906101008110"  # noqa: E501
-            "156100025701546000145b156108465760018054600019019055610810565b6001548110"  # noqa: E501
-            "80156108695750600154600290610100811015610002570154600014155b801561088357"  # noqa: E501
-            "506002816101008110156100025701546000145b156108e4576001546002906101008110"  # noqa: E501
-            "156100025781015490826101008110156100025781019190915581906101029060009083"  # noqa: E501
-            "610100811015610002578101548252602092909252604081209290925560015461010081"  # noqa: E501
-            "10156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab9"  # noqa: E501
-            "1f525b5ae7a03d02fabe"
+            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "f00d4b5d000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b"  # noqa: E501
-            "000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa"
-        ),
+        to=contract_0,
+        data=Bytes("f00d4b5d")
+        + Hash(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+        + Hash(0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 260: 1,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
+        sender: Account(storage={}, nonce=2),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_change_owner_no_argument.py b/tests/ported_static/stWalletTest/test_multi_owned_change_owner_no_argument.py
index 7fcb30efd42..abd28c4ca20 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_change_owner_no_argument.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_change_owner_no_argument.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_multi_owned_change_owner_no_argument.
 
 Ported from:
-tests/static/state_tests/stWalletTest
-multiOwnedChangeOwnerNoArgumentFiller.json
+state_tests/stWalletTest/multiOwnedChangeOwnerNoArgumentFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/multiOwnedChangeOwnerNoArgumentFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/multiOwnedChangeOwnerNoArgumentFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +30,9 @@ def test_multi_owned_change_owner_no_argument(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_multi_owned_change_owner_no_argument."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -47,106 +46,49 @@ def test_multi_owned_change_owner_no_argument(
         gas_limit=10000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
+    # Source: raw
+    # 0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf"  # noqa: E501
-            "6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c91711461"  # noqa: E501
-            "0136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a357"  # noqa: E501
-            "8063f00d4b5d146101e3575b005b61007760043560006000364360405180848480828437"  # noqa: E501
-            "5050509091019081526040519081900360200190209050610529815b600160a060020a03"  # noqa: E501
-            "3316600090815261010260205260408120548180808381141561066f57610806565b6102"  # noqa: E501
-            "1c6004355b600160a060020a0316600090815261010260205260408120541190565b6102"  # noqa: E501
-            "1c60015481565b6100776004356000364360405180848480828437505050909101908152"  # noqa: E501
-            "60405190819003602001902090506104a1816100ab565b61021c60005481565b61007760"  # noqa: E501
-            "0435600160a060020a033316600090815261010260205260408120549080808381141561"  # noqa: E501
-            "022e576102b0565b61007760043560003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506105e8816100ab565b61021c600435602435600082"  # noqa: E501
-            "815261010360209081526040808320600160a060020a0385168452610102909252822054"  # noqa: E501
-            "8290818181141561064157610665565b6100776004356024356000600036436040518084"  # noqa: E501
-            "8480828437505050909101908152604051908190036020019020905061033a816100ab56"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156102b05781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "61033357610348836100dc565b156103535750610335565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561037c5750610335565b6102b75b610104"  # noqa: E501
-            "5460005b818110156107b557610104805482908110156100025760009182526000805160"  # noqa: E501
-            "206108ea8339815191520154146103fa5761010480546101039160009184908110156100"  # noqa: E501
-            "02576000805160206108ea83398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610387565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa"  # noqa: E501
-            "90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a6"  # noqa: E501
-            "5b600060015b6001548110156107ef575b6001548110801561051c575060028161010081"  # noqa: E501
-            "1015610002570154600014155b1561080f576001016104fc565b1561033557600160a060"  # noqa: E501
-            "020a038316600090815261010260205260408120549250821415610557575061049c565b"  # noqa: E501
-            "6001600160005054036000600050541115610572575061049c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "04e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561049c576001548211156105fd575061049e565b600082905561060a610380565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106605760009450610665565b600194505b5050505092915050565b6000868152610103"  # noqa: E501
-            "6020526040812080549094509092508214156106f8578154835560018381018390556101"  # noqa: E501
-            "0480549182018082558280158290116106c7578183600052602060002091820191016106"  # noqa: E501
-            "c791906107db565b50505060028401819055610104805488929081101561000257600091"  # noqa: E501
-            "9091526000805160206108ea83398151915201555b506001820154600284900a90811660"  # noqa: E501
-            "0014156108065760408051600160a060020a03331681526020810188905281517fe1c52d"  # noqa: E501
-            "c63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda92918190039091"  # noqa: E501
-            "0190a18254600190116107f3576000868152610103602052604090206002015461010480"  # noqa: E501
-            "5490919081101561000257604060009081206000805160206108ea833981519152929092"  # noqa: E501
-            "01819055808255600180830182905560029092015595506108069050565b610104805460"  # noqa: E501
-            "0080835591909152610335906000805160206108ea833981519152908101905b80821115"  # noqa: E501
-            "6107ef57600081556001016107db565b5090565b82546000190183556001830180548217"  # noqa: E501
-            "90555b50505050919050565b5b6001805411801561083257506001546002906101008110"  # noqa: E501
-            "156100025701546000145b156108465760018054600019019055610810565b6001548110"  # noqa: E501
-            "80156108695750600154600290610100811015610002570154600014155b801561088357"  # noqa: E501
-            "506002816101008110156100025701546000145b156108e4576001546002906101008110"  # noqa: E501
-            "156100025781015490826101008110156100025781019190915581906101029060009083"  # noqa: E501
-            "610100811015610002578101548252602092909252604081209290925560015461010081"  # noqa: E501
-            "10156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab9"  # noqa: E501
-            "1f525b5ae7a03d02fabe"
+            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("f00d4b5d"),
+        to=contract_0,
+        data=Bytes("f00d4b5d"),
         gas_limit=770743,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 260: 1,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
+        sender: Account(storage={}, nonce=2),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_change_owner_to_is_owner.py b/tests/ported_static/stWalletTest/test_multi_owned_change_owner_to_is_owner.py
index 21780150840..aedd0a4dc9f 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_change_owner_to_is_owner.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_change_owner_to_is_owner.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_multi_owned_change_owner_to_is_owner.
 
 Ported from:
-tests/static/state_tests/stWalletTest
-multiOwnedChangeOwner_toIsOwnerFiller.json
+state_tests/stWalletTest/multiOwnedChangeOwner_toIsOwnerFiller.json
 """
 
 import pytest
@@ -12,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/multiOwnedChangeOwner_toIsOwnerFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/multiOwnedChangeOwner_toIsOwnerFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,9 @@ def test_multi_owned_change_owner_to_is_owner(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_multi_owned_change_owner_to_is_owner."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -47,109 +47,51 @@ def test_multi_owned_change_owner_to_is_owner(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
+    # Source: raw
+    # 0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf"  # noqa: E501
-            "6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c91711461"  # noqa: E501
-            "0136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a357"  # noqa: E501
-            "8063f00d4b5d146101e3575b005b61007760043560006000364360405180848480828437"  # noqa: E501
-            "5050509091019081526040519081900360200190209050610529815b600160a060020a03"  # noqa: E501
-            "3316600090815261010260205260408120548180808381141561066f57610806565b6102"  # noqa: E501
-            "1c6004355b600160a060020a0316600090815261010260205260408120541190565b6102"  # noqa: E501
-            "1c60015481565b6100776004356000364360405180848480828437505050909101908152"  # noqa: E501
-            "60405190819003602001902090506104a1816100ab565b61021c60005481565b61007760"  # noqa: E501
-            "0435600160a060020a033316600090815261010260205260408120549080808381141561"  # noqa: E501
-            "022e576102b0565b61007760043560003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506105e8816100ab565b61021c600435602435600082"  # noqa: E501
-            "815261010360209081526040808320600160a060020a0385168452610102909252822054"  # noqa: E501
-            "8290818181141561064157610665565b6100776004356024356000600036436040518084"  # noqa: E501
-            "8480828437505050909101908152604051908190036020019020905061033a816100ab56"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156102b05781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "61033357610348836100dc565b156103535750610335565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561037c5750610335565b6102b75b610104"  # noqa: E501
-            "5460005b818110156107b557610104805482908110156100025760009182526000805160"  # noqa: E501
-            "206108ea8339815191520154146103fa5761010480546101039160009184908110156100"  # noqa: E501
-            "02576000805160206108ea83398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610387565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa"  # noqa: E501
-            "90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a6"  # noqa: E501
-            "5b600060015b6001548110156107ef575b6001548110801561051c575060028161010081"  # noqa: E501
-            "1015610002570154600014155b1561080f576001016104fc565b1561033557600160a060"  # noqa: E501
-            "020a038316600090815261010260205260408120549250821415610557575061049c565b"  # noqa: E501
-            "6001600160005054036000600050541115610572575061049c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "04e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561049c576001548211156105fd575061049e565b600082905561060a610380565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106605760009450610665565b600194505b5050505092915050565b6000868152610103"  # noqa: E501
-            "6020526040812080549094509092508214156106f8578154835560018381018390556101"  # noqa: E501
-            "0480549182018082558280158290116106c7578183600052602060002091820191016106"  # noqa: E501
-            "c791906107db565b50505060028401819055610104805488929081101561000257600091"  # noqa: E501
-            "9091526000805160206108ea83398151915201555b506001820154600284900a90811660"  # noqa: E501
-            "0014156108065760408051600160a060020a03331681526020810188905281517fe1c52d"  # noqa: E501
-            "c63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda92918190039091"  # noqa: E501
-            "0190a18254600190116107f3576000868152610103602052604090206002015461010480"  # noqa: E501
-            "5490919081101561000257604060009081206000805160206108ea833981519152929092"  # noqa: E501
-            "01819055808255600180830182905560029092015595506108069050565b610104805460"  # noqa: E501
-            "0080835591909152610335906000805160206108ea833981519152908101905b80821115"  # noqa: E501
-            "6107ef57600081556001016107db565b5090565b82546000190183556001830180548217"  # noqa: E501
-            "90555b50505050919050565b5b6001805411801561083257506001546002906101008110"  # noqa: E501
-            "156100025701546000145b156108465760018054600019019055610810565b6001548110"  # noqa: E501
-            "80156108695750600154600290610100811015610002570154600014155b801561088357"  # noqa: E501
-            "506002816101008110156100025701546000145b156108e4576001546002906101008110"  # noqa: E501
-            "156100025781015490826101008110156100025781019190915581906101029060009083"  # noqa: E501
-            "610100811015610002578101548252602092909252604081209290925560015461010081"  # noqa: E501
-            "10156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab9"  # noqa: E501
-            "1f525b5ae7a03d02fabe"
+            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "f00d4b5d000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"  # noqa: E501
-            "000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"
-        ),
+        to=contract_0,
+        data=Bytes("f00d4b5d")
+        + Hash(sender, left_padding=True)
+        + Hash(sender, left_padding=True),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 260: 1,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
+        sender: Account(storage={}, nonce=2),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_change_requirement_to0.py b/tests/ported_static/stWalletTest/test_multi_owned_change_requirement_to0.py
index 1adc21e90c5..48c0a59ad40 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_change_requirement_to0.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_change_requirement_to0.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_multi_owned_change_requirement_to0.
 
 Ported from:
-tests/static/state_tests/stWalletTest/multiOwnedChangeRequirementTo0Filler.json
+state_tests/stWalletTest/multiOwnedChangeRequirementTo0Filler.json
 """
 
 import pytest
@@ -11,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -21,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/multiOwnedChangeRequirementTo0Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/multiOwnedChangeRequirementTo0Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,8 +31,9 @@ def test_multi_owned_change_requirement_to0(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_multi_owned_change_requirement_to0."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -46,106 +47,47 @@ def test_multi_owned_change_requirement_to0(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
+    # Source: raw
+    # 0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf"  # noqa: E501
-            "6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c91711461"  # noqa: E501
-            "0136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a357"  # noqa: E501
-            "8063f00d4b5d146101e3575b005b61007760043560006000364360405180848480828437"  # noqa: E501
-            "5050509091019081526040519081900360200190209050610529815b600160a060020a03"  # noqa: E501
-            "3316600090815261010260205260408120548180808381141561066f57610806565b6102"  # noqa: E501
-            "1c6004355b600160a060020a0316600090815261010260205260408120541190565b6102"  # noqa: E501
-            "1c60015481565b6100776004356000364360405180848480828437505050909101908152"  # noqa: E501
-            "60405190819003602001902090506104a1816100ab565b61021c60005481565b61007760"  # noqa: E501
-            "0435600160a060020a033316600090815261010260205260408120549080808381141561"  # noqa: E501
-            "022e576102b0565b61007760043560003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506105e8816100ab565b61021c600435602435600082"  # noqa: E501
-            "815261010360209081526040808320600160a060020a0385168452610102909252822054"  # noqa: E501
-            "8290818181141561064157610665565b6100776004356024356000600036436040518084"  # noqa: E501
-            "8480828437505050909101908152604051908190036020019020905061033a816100ab56"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156102b05781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "61033357610348836100dc565b156103535750610335565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561037c5750610335565b6102b75b610104"  # noqa: E501
-            "5460005b818110156107b557610104805482908110156100025760009182526000805160"  # noqa: E501
-            "206108ea8339815191520154146103fa5761010480546101039160009184908110156100"  # noqa: E501
-            "02576000805160206108ea83398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610387565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa"  # noqa: E501
-            "90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a6"  # noqa: E501
-            "5b600060015b6001548110156107ef575b6001548110801561051c575060028161010081"  # noqa: E501
-            "1015610002570154600014155b1561080f576001016104fc565b1561033557600160a060"  # noqa: E501
-            "020a038316600090815261010260205260408120549250821415610557575061049c565b"  # noqa: E501
-            "6001600160005054036000600050541115610572575061049c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "04e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561049c576001548211156105fd575061049e565b600082905561060a610380565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106605760009450610665565b600194505b5050505092915050565b6000868152610103"  # noqa: E501
-            "6020526040812080549094509092508214156106f8578154835560018381018390556101"  # noqa: E501
-            "0480549182018082558280158290116106c7578183600052602060002091820191016106"  # noqa: E501
-            "c791906107db565b50505060028401819055610104805488929081101561000257600091"  # noqa: E501
-            "9091526000805160206108ea83398151915201555b506001820154600284900a90811660"  # noqa: E501
-            "0014156108065760408051600160a060020a03331681526020810188905281517fe1c52d"  # noqa: E501
-            "c63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda92918190039091"  # noqa: E501
-            "0190a18254600190116107f3576000868152610103602052604090206002015461010480"  # noqa: E501
-            "5490919081101561000257604060009081206000805160206108ea833981519152929092"  # noqa: E501
-            "01819055808255600180830182905560029092015595506108069050565b610104805460"  # noqa: E501
-            "0080835591909152610335906000805160206108ea833981519152908101905b80821115"  # noqa: E501
-            "6107ef57600081556001016107db565b5090565b82546000190183556001830180548217"  # noqa: E501
-            "90555b50505050919050565b5b6001805411801561083257506001546002906101008110"  # noqa: E501
-            "156100025701546000145b156108465760018054600019019055610810565b6001548110"  # noqa: E501
-            "80156108695750600154600290610100811015610002570154600014155b801561088357"  # noqa: E501
-            "506002816101008110156100025701546000145b156108e4576001546002906101008110"  # noqa: E501
-            "156100025781015490826101008110156100025781019190915581906101029060009083"  # noqa: E501
-            "610100811015610002578101548252602092909252604081209290925560015461010081"  # noqa: E501
-            "10156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab9"  # noqa: E501
-            "1f525b5ae7a03d02fabe"
+            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "ba51a6df0000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-        ),
+        to=contract_0,
+        data=Bytes("ba51a6df") + Hash(0x0),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
+        sender: Account(storage={}, nonce=2),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_change_requirement_to1.py b/tests/ported_static/stWalletTest/test_multi_owned_change_requirement_to1.py
index 8a4dcd2cf57..e29e02486a2 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_change_requirement_to1.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_change_requirement_to1.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_multi_owned_change_requirement_to1.
 
 Ported from:
-tests/static/state_tests/stWalletTest/multiOwnedChangeRequirementTo1Filler.json
+state_tests/stWalletTest/multiOwnedChangeRequirementTo1Filler.json
 """
 
 import pytest
@@ -11,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -21,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/multiOwnedChangeRequirementTo1Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/multiOwnedChangeRequirementTo1Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,8 +31,9 @@ def test_multi_owned_change_requirement_to1(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_multi_owned_change_requirement_to1."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -46,107 +47,48 @@ def test_multi_owned_change_requirement_to1(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
+    # Source: raw
+    # 0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf"  # noqa: E501
-            "6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c91711461"  # noqa: E501
-            "0136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a357"  # noqa: E501
-            "8063f00d4b5d146101e3575b005b61007760043560006000364360405180848480828437"  # noqa: E501
-            "5050509091019081526040519081900360200190209050610529815b600160a060020a03"  # noqa: E501
-            "3316600090815261010260205260408120548180808381141561066f57610806565b6102"  # noqa: E501
-            "1c6004355b600160a060020a0316600090815261010260205260408120541190565b6102"  # noqa: E501
-            "1c60015481565b6100776004356000364360405180848480828437505050909101908152"  # noqa: E501
-            "60405190819003602001902090506104a1816100ab565b61021c60005481565b61007760"  # noqa: E501
-            "0435600160a060020a033316600090815261010260205260408120549080808381141561"  # noqa: E501
-            "022e576102b0565b61007760043560003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506105e8816100ab565b61021c600435602435600082"  # noqa: E501
-            "815261010360209081526040808320600160a060020a0385168452610102909252822054"  # noqa: E501
-            "8290818181141561064157610665565b6100776004356024356000600036436040518084"  # noqa: E501
-            "8480828437505050909101908152604051908190036020019020905061033a816100ab56"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156102b05781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "61033357610348836100dc565b156103535750610335565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561037c5750610335565b6102b75b610104"  # noqa: E501
-            "5460005b818110156107b557610104805482908110156100025760009182526000805160"  # noqa: E501
-            "206108ea8339815191520154146103fa5761010480546101039160009184908110156100"  # noqa: E501
-            "02576000805160206108ea83398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610387565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa"  # noqa: E501
-            "90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a6"  # noqa: E501
-            "5b600060015b6001548110156107ef575b6001548110801561051c575060028161010081"  # noqa: E501
-            "1015610002570154600014155b1561080f576001016104fc565b1561033557600160a060"  # noqa: E501
-            "020a038316600090815261010260205260408120549250821415610557575061049c565b"  # noqa: E501
-            "6001600160005054036000600050541115610572575061049c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "04e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561049c576001548211156105fd575061049e565b600082905561060a610380565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106605760009450610665565b600194505b5050505092915050565b6000868152610103"  # noqa: E501
-            "6020526040812080549094509092508214156106f8578154835560018381018390556101"  # noqa: E501
-            "0480549182018082558280158290116106c7578183600052602060002091820191016106"  # noqa: E501
-            "c791906107db565b50505060028401819055610104805488929081101561000257600091"  # noqa: E501
-            "9091526000805160206108ea83398151915201555b506001820154600284900a90811660"  # noqa: E501
-            "0014156108065760408051600160a060020a03331681526020810188905281517fe1c52d"  # noqa: E501
-            "c63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda92918190039091"  # noqa: E501
-            "0190a18254600190116107f3576000868152610103602052604090206002015461010480"  # noqa: E501
-            "5490919081101561000257604060009081206000805160206108ea833981519152929092"  # noqa: E501
-            "01819055808255600180830182905560029092015595506108069050565b610104805460"  # noqa: E501
-            "0080835591909152610335906000805160206108ea833981519152908101905b80821115"  # noqa: E501
-            "6107ef57600081556001016107db565b5090565b82546000190183556001830180548217"  # noqa: E501
-            "90555b50505050919050565b5b6001805411801561083257506001546002906101008110"  # noqa: E501
-            "156100025701546000145b156108465760018054600019019055610810565b6001548110"  # noqa: E501
-            "80156108695750600154600290610100811015610002570154600014155b801561088357"  # noqa: E501
-            "506002816101008110156100025701546000145b156108e4576001546002906101008110"  # noqa: E501
-            "156100025781015490826101008110156100025781019190915581906101029060009083"  # noqa: E501
-            "610100811015610002578101548252602092909252604081209290925560015461010081"  # noqa: E501
-            "10156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab9"  # noqa: E501
-            "1f525b5ae7a03d02fabe"
+            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "ba51a6df0000000000000000000000000000000000000000000000000000000000000001"  # noqa: E501
-        ),
+        to=contract_0,
+        data=Bytes("ba51a6df") + Hash(0x1),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
+        sender: Account(storage={}, nonce=2),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_change_requirement_to2.py b/tests/ported_static/stWalletTest/test_multi_owned_change_requirement_to2.py
index 46b2f43c9ad..9724b0cad39 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_change_requirement_to2.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_change_requirement_to2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_multi_owned_change_requirement_to2.
 
 Ported from:
-tests/static/state_tests/stWalletTest/multiOwnedChangeRequirementTo2Filler.json
+state_tests/stWalletTest/multiOwnedChangeRequirementTo2Filler.json
 """
 
 import pytest
@@ -11,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -21,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/multiOwnedChangeRequirementTo2Filler.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/multiOwnedChangeRequirementTo2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,8 +31,9 @@ def test_multi_owned_change_requirement_to2(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_multi_owned_change_requirement_to2."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -46,108 +47,49 @@ def test_multi_owned_change_requirement_to2(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
+    # Source: raw
+    # 0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf"  # noqa: E501
-            "6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c91711461"  # noqa: E501
-            "0136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a357"  # noqa: E501
-            "8063f00d4b5d146101e3575b005b61007760043560006000364360405180848480828437"  # noqa: E501
-            "5050509091019081526040519081900360200190209050610529815b600160a060020a03"  # noqa: E501
-            "3316600090815261010260205260408120548180808381141561066f57610806565b6102"  # noqa: E501
-            "1c6004355b600160a060020a0316600090815261010260205260408120541190565b6102"  # noqa: E501
-            "1c60015481565b6100776004356000364360405180848480828437505050909101908152"  # noqa: E501
-            "60405190819003602001902090506104a1816100ab565b61021c60005481565b61007760"  # noqa: E501
-            "0435600160a060020a033316600090815261010260205260408120549080808381141561"  # noqa: E501
-            "022e576102b0565b61007760043560003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506105e8816100ab565b61021c600435602435600082"  # noqa: E501
-            "815261010360209081526040808320600160a060020a0385168452610102909252822054"  # noqa: E501
-            "8290818181141561064157610665565b6100776004356024356000600036436040518084"  # noqa: E501
-            "8480828437505050909101908152604051908190036020019020905061033a816100ab56"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156102b05781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "61033357610348836100dc565b156103535750610335565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561037c5750610335565b6102b75b610104"  # noqa: E501
-            "5460005b818110156107b557610104805482908110156100025760009182526000805160"  # noqa: E501
-            "206108ea8339815191520154146103fa5761010480546101039160009184908110156100"  # noqa: E501
-            "02576000805160206108ea83398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610387565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa"  # noqa: E501
-            "90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a6"  # noqa: E501
-            "5b600060015b6001548110156107ef575b6001548110801561051c575060028161010081"  # noqa: E501
-            "1015610002570154600014155b1561080f576001016104fc565b1561033557600160a060"  # noqa: E501
-            "020a038316600090815261010260205260408120549250821415610557575061049c565b"  # noqa: E501
-            "6001600160005054036000600050541115610572575061049c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "04e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561049c576001548211156105fd575061049e565b600082905561060a610380565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106605760009450610665565b600194505b5050505092915050565b6000868152610103"  # noqa: E501
-            "6020526040812080549094509092508214156106f8578154835560018381018390556101"  # noqa: E501
-            "0480549182018082558280158290116106c7578183600052602060002091820191016106"  # noqa: E501
-            "c791906107db565b50505060028401819055610104805488929081101561000257600091"  # noqa: E501
-            "9091526000805160206108ea83398151915201555b506001820154600284900a90811660"  # noqa: E501
-            "0014156108065760408051600160a060020a03331681526020810188905281517fe1c52d"  # noqa: E501
-            "c63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda92918190039091"  # noqa: E501
-            "0190a18254600190116107f3576000868152610103602052604090206002015461010480"  # noqa: E501
-            "5490919081101561000257604060009081206000805160206108ea833981519152929092"  # noqa: E501
-            "01819055808255600180830182905560029092015595506108069050565b610104805460"  # noqa: E501
-            "0080835591909152610335906000805160206108ea833981519152908101905b80821115"  # noqa: E501
-            "6107ef57600081556001016107db565b5090565b82546000190183556001830180548217"  # noqa: E501
-            "90555b50505050919050565b5b6001805411801561083257506001546002906101008110"  # noqa: E501
-            "156100025701546000145b156108465760018054600019019055610810565b6001548110"  # noqa: E501
-            "80156108695750600154600290610100811015610002570154600014155b801561088357"  # noqa: E501
-            "506002816101008110156100025701546000145b156108e4576001546002906101008110"  # noqa: E501
-            "156100025781015490826101008110156100025781019190915581906101029060009083"  # noqa: E501
-            "610100811015610002578101548252602092909252604081209290925560015461010081"  # noqa: E501
-            "10156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab9"  # noqa: E501
-            "1f525b5ae7a03d02fabe"
+            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "ba51a6df0000000000000000000000000000000000000000000000000000000000000002"  # noqa: E501
-        ),
+        to=contract_0,
+        data=Bytes("ba51a6df") + Hash(0x2),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 260: 1,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
+        sender: Account(storage={}, nonce=2),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_construction_correct.py b/tests/ported_static/stWalletTest/test_multi_owned_construction_correct.py
index 97141f0c147..e8358ff7f7c 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_construction_correct.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_construction_correct.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_multi_owned_construction_correct.
 
 Ported from:
-tests/static/state_tests/stWalletTest/multiOwnedConstructionCorrectFiller.json
+state_tests/stWalletTest/multiOwnedConstructionCorrectFiller.json
 """
 
 import pytest
@@ -11,9 +11,11 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -21,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/multiOwnedConstructionCorrectFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/multiOwnedConstructionCorrectFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,8 +31,8 @@ def test_multi_owned_construction_correct(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_multi_owned_construction_correct."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -51,87 +51,28 @@ def test_multi_owned_construction_correct(
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "606060409081526001600081815581805533600160a060020a0316600381905581526101"  # noqa: E501
-            "026020529182205561090a90819061003b90396000f300606060405236156100775760e0"  # noqa: E501
-            "60020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b14"  # noqa: E501
-            "6100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f"  # noqa: E501
-            "578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b00"  # noqa: E501
-            "5b6100776004356000600036436040518084848082843750505090910190815260405190"  # noqa: E501
-            "81900360200190209050610529815b600160a060020a0333166000908152610102602052"  # noqa: E501
-            "60408120548180808381141561066f57610806565b61021c6004355b600160a060020a03"  # noqa: E501
-            "16600090815261010260205260408120541190565b61021c60015481565b610077600435"  # noqa: E501
-            "600036436040518084848082843750505090910190815260405190819003602001902090"  # noqa: E501
-            "506104a1816100ab565b61021c60005481565b610077600435600160a060020a03331660"  # noqa: E501
-            "0090815261010260205260408120549080808381141561022e576102b0565b6100776004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "90506105e8816100ab565b61021c60043560243560008281526101036020908152604080"  # noqa: E501
-            "8320600160a060020a038516845261010290925282205482908181811415610641576106"  # noqa: E501
-            "65565b610077600435602435600060003643604051808484808284375050509091019081"  # noqa: E501
-            "52604051908190036020019020905061033a816100ab565b604080519182525190819003"  # noqa: E501
-            "60200190f35b5050506000828152610103602052604081206001810154600284900a9290"  # noqa: E501
-            "8316819011156102b0578154600183810180549290910184559084900390556040805160"  # noqa: E501
-            "0160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e"  # noqa: E501
-            "5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b60"  # noqa: E501
-            "0160a060020a038316600283610100811015610002570155600160a060020a0384811660"  # noqa: E501
-            "008181526101026020908152604080832083905593871680835291849020869055835192"  # noqa: E501
-            "835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995"  # noqa: E501
-            "d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b"  # noqa: E501
-            "156103535750610335565b600160a060020a038416600090815261010260205260408120"  # noqa: E501
-            "54925082141561037c5750610335565b6102b75b6101045460005b818110156107b55761"  # noqa: E501
-            "0104805482908110156100025760009182526000805160206108ea833981519152015414"  # noqa: E501
-            "6103fa576101048054610103916000918490811015610002576000805160206108ea8339"  # noqa: E501
-            "8151915201548252506020919091526040812081815560018101829055600201555b6001"  # noqa: E501
-            "01610387565b60018054810190819055600160a060020a03831690600290610100811015"  # noqa: E501
-            "6100025790900160005081905550600160005054610102600050600084600160a060020a"  # noqa: E501
-            "03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469"  # noqa: E501
-            "d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a031681"  # noqa: E501
-            "5260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b15"  # noqa: E501
-            "6104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec56"  # noqa: E501
-            "5b505b60015460fa9010610402575061049e565b6105a65b600060015b60015481101561"  # noqa: E501
-            "07ef575b6001548110801561051c5750600281610100811015610002570154600014155b"  # noqa: E501
-            "1561080f576001016104fc565b1561033557600160a060020a0383166000908152610102"  # noqa: E501
-            "60205260408120549250821415610557575061049c565b60016001600050540360006000"  # noqa: E501
-            "50541115610572575061049c565b60006002836101008110156100025750830181905560"  # noqa: E501
-            "0160a060020a038416815261010260205260408120556104e8610380565b506040805160"  # noqa: E501
-            "0160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a"  # noqa: E501
-            "9071b555b651fbf418da9181900360200190a1505050565b1561049c5760015482111561"  # noqa: E501
-            "05fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084"  # noqa: E501
-            "c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190"  # noqa: E501
-            "a15050565b506001830154600282900a908116600014156106605760009450610665565b"  # noqa: E501
-            "600194505b5050505092915050565b600086815261010360205260408120805490945090"  # noqa: E501
-            "92508214156106f857815483556001838101839055610104805491820180825582801582"  # noqa: E501
-            "90116106c7578183600052602060002091820191016106c791906107db565b5050506002"  # noqa: E501
-            "84018190556101048054889290811015610002576000919091526000805160206108ea83"  # noqa: E501
-            "398151915201555b506001820154600284900a9081166000141561080657604080516001"  # noqa: E501
-            "60a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d"  # noqa: E501
-            "5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f357"  # noqa: E501
-            "600086815261010360205260409020600201546101048054909190811015610002576040"  # noqa: E501
-            "60009081206000805160206108ea83398151915292909201819055808255600180830182"  # noqa: E501
-            "905560029092015595506108069050565b61010480546000808355919091526103359060"  # noqa: E501
-            "00805160206108ea833981519152908101905b808211156107ef57600081556001016107"  # noqa: E501
-            "db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b"  # noqa: E501
-            "6001805411801561083257506001546002906101008110156100025701546000145b1561"  # noqa: E501
-            "08465760018054600019019055610810565b600154811080156108695750600154600290"  # noqa: E501
-            "610100811015610002570154600014155b80156108835750600281610100811015610002"  # noqa: E501
-            "5701546000145b156108e457600154600290610100811015610002578101549082610100"  # noqa: E501
-            "811015610002578101919091558190610102906000908361010081101561000257810154"  # noqa: E501
-            "825260209290925260408120929092556001546101008110156100025701555b6104f156"  # noqa: E501
-            "004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+        data=Bytes(
+            "606060409081526001600081815581805533600160a060020a0316600381905581526101026020529182205561090a90819061003b90396000f300606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         gas_limit=10000000,
         value=100,
     )
 
     post = {
-        Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
+        compute_create_address(address=sender, nonce=0): Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=100,
+            nonce=1,
         ),
+        sender: Account(storage={}, code=b"", nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_construction_not_enough_gas.py b/tests/ported_static/stWalletTest/test_multi_owned_construction_not_enough_gas.py
index 40a6c3e4a72..d6be5724357 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_construction_not_enough_gas.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_construction_not_enough_gas.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_multi_owned_construction_not_enough_gas.
 
 Ported from:
-tests/static/state_tests/stWalletTest
-multiOwnedConstructionNotEnoughGasFiller.json
+state_tests/stWalletTest/multiOwnedConstructionNotEnoughGasFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,21 +21,16 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/multiOwnedConstructionNotEnoughGasFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/multiOwnedConstructionNotEnoughGasFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_multi_owned_construction_not_enough_gas(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_multi_owned_construction_not_enough_gas."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -47,82 +41,15 @@ def test_multi_owned_construction_not_enough_gas(
         gas_limit=1000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "606060409081526001600081815581805533600160a060020a0316600381905581526101"  # noqa: E501
-            "026020529182205561090a90819061003b90396000f300606060405236156100775760e0"  # noqa: E501
-            "60020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b14"  # noqa: E501
-            "6100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f"  # noqa: E501
-            "578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b00"  # noqa: E501
-            "5b6100776004356000600036436040518084848082843750505090910190815260405190"  # noqa: E501
-            "81900360200190209050610529815b600160a060020a0333166000908152610102602052"  # noqa: E501
-            "60408120548180808381141561066f57610806565b61021c6004355b600160a060020a03"  # noqa: E501
-            "16600090815261010260205260408120541190565b61021c60015481565b610077600435"  # noqa: E501
-            "600036436040518084848082843750505090910190815260405190819003602001902090"  # noqa: E501
-            "506104a1816100ab565b61021c60005481565b610077600435600160a060020a03331660"  # noqa: E501
-            "0090815261010260205260408120549080808381141561022e576102b0565b6100776004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "90506105e8816100ab565b61021c60043560243560008281526101036020908152604080"  # noqa: E501
-            "8320600160a060020a038516845261010290925282205482908181811415610641576106"  # noqa: E501
-            "65565b610077600435602435600060003643604051808484808284375050509091019081"  # noqa: E501
-            "52604051908190036020019020905061033a816100ab565b604080519182525190819003"  # noqa: E501
-            "60200190f35b5050506000828152610103602052604081206001810154600284900a9290"  # noqa: E501
-            "8316819011156102b0578154600183810180549290910184559084900390556040805160"  # noqa: E501
-            "0160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e"  # noqa: E501
-            "5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b60"  # noqa: E501
-            "0160a060020a038316600283610100811015610002570155600160a060020a0384811660"  # noqa: E501
-            "008181526101026020908152604080832083905593871680835291849020869055835192"  # noqa: E501
-            "835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995"  # noqa: E501
-            "d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b"  # noqa: E501
-            "156103535750610335565b600160a060020a038416600090815261010260205260408120"  # noqa: E501
-            "54925082141561037c5750610335565b6102b75b6101045460005b818110156107b55761"  # noqa: E501
-            "0104805482908110156100025760009182526000805160206108ea833981519152015414"  # noqa: E501
-            "6103fa576101048054610103916000918490811015610002576000805160206108ea8339"  # noqa: E501
-            "8151915201548252506020919091526040812081815560018101829055600201555b6001"  # noqa: E501
-            "01610387565b60018054810190819055600160a060020a03831690600290610100811015"  # noqa: E501
-            "6100025790900160005081905550600160005054610102600050600084600160a060020a"  # noqa: E501
-            "03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469"  # noqa: E501
-            "d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a031681"  # noqa: E501
-            "5260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b15"  # noqa: E501
-            "6104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec56"  # noqa: E501
-            "5b505b60015460fa9010610402575061049e565b6105a65b600060015b60015481101561"  # noqa: E501
-            "07ef575b6001548110801561051c5750600281610100811015610002570154600014155b"  # noqa: E501
-            "1561080f576001016104fc565b1561033557600160a060020a0383166000908152610102"  # noqa: E501
-            "60205260408120549250821415610557575061049c565b60016001600050540360006000"  # noqa: E501
-            "50541115610572575061049c565b60006002836101008110156100025750830181905560"  # noqa: E501
-            "0160a060020a038416815261010260205260408120556104e8610380565b506040805160"  # noqa: E501
-            "0160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a"  # noqa: E501
-            "9071b555b651fbf418da9181900360200190a1505050565b1561049c5760015482111561"  # noqa: E501
-            "05fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084"  # noqa: E501
-            "c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190"  # noqa: E501
-            "a15050565b506001830154600282900a908116600014156106605760009450610665565b"  # noqa: E501
-            "600194505b5050505092915050565b600086815261010360205260408120805490945090"  # noqa: E501
-            "92508214156106f857815483556001838101839055610104805491820180825582801582"  # noqa: E501
-            "90116106c7578183600052602060002091820191016106c791906107db565b5050506002"  # noqa: E501
-            "84018190556101048054889290811015610002576000919091526000805160206108ea83"  # noqa: E501
-            "398151915201555b506001820154600284900a9081166000141561080657604080516001"  # noqa: E501
-            "60a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d"  # noqa: E501
-            "5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f357"  # noqa: E501
-            "600086815261010360205260409020600201546101048054909190811015610002576040"  # noqa: E501
-            "60009081206000805160206108ea83398151915292909201819055808255600180830182"  # noqa: E501
-            "905560029092015595506108069050565b61010480546000808355919091526103359060"  # noqa: E501
-            "00805160206108ea833981519152908101905b808211156107ef57600081556001016107"  # noqa: E501
-            "db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b"  # noqa: E501
-            "6001805411801561083257506001546002906101008110156100025701546000145b1561"  # noqa: E501
-            "08465760018054600019019055610810565b600154811080156108695750600154600290"  # noqa: E501
-            "610100811015610002570154600014155b80156108835750600281610100811015610002"  # noqa: E501
-            "5701546000145b156108e457600154600290610100811015610002578101549082610100"  # noqa: E501
-            "811015610002578101919091558190610102906000908361010081101561000257810154"  # noqa: E501
-            "825260209290925260408120929092556001546101008110156100025701555b6104f156"  # noqa: E501
-            "004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+        data=Bytes(
+            "606060409081526001600081815581805533600160a060020a0316600381905581526101026020529182205561090a90819061003b90396000f300606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         gas_limit=256449,
     )
 
-    post: dict = {}
+    post = {sender: Account(storage={}, code=b"", nonce=1)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_construction_not_enough_gas_partial.py b/tests/ported_static/stWalletTest/test_multi_owned_construction_not_enough_gas_partial.py
index 5553bd5754f..22e4a3b9a29 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_construction_not_enough_gas_partial.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_construction_not_enough_gas_partial.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_multi_owned_construction_not_enough_gas_partial.
 
 Ported from:
-tests/static/state_tests/stWalletTest
-multiOwnedConstructionNotEnoughGasPartialFiller.json
+state_tests/stWalletTest/multiOwnedConstructionNotEnoughGasPartialFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -23,42 +27,38 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stWalletTest/multiOwnedConstructionNotEnoughGasPartialFiller.json",  # noqa: E501
+        "state_tests/stWalletTest/multiOwnedConstructionNotEnoughGasPartialFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (601249, {}),
-        (
-            751249,
-            {
-                Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"): Account(
-                    storage={
-                        0: 1,
-                        1: 1,
-                        3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
-@pytest.mark.pre_alloc_mutable
 def test_multi_owned_construction_not_enough_gas_partial(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_multi_owned_construction_not_enough_gas_partial."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -69,83 +69,46 @@ def test_multi_owned_construction_not_enough_gas_partial(
         gas_limit=10000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(
+                    address=sender, nonce=0
+                ): Account.NONEXISTENT,
+                sender: Account(storage={}, code=b"", nonce=1),
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                compute_create_address(address=sender, nonce=0): Account(
+                    nonce=1
+                ),
+                sender: Account(storage={}, code=b"", nonce=1),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(
+            "606060409081526001600081815581805533600160a060020a0316600381905581526101026020529182205561090a90819061003b90396000f300606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+        ),
+    ]
+    tx_gas = [601249, 751249]
+    tx_value = [100]
 
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "606060409081526001600081815581805533600160a060020a0316600381905581526101"  # noqa: E501
-            "026020529182205561090a90819061003b90396000f300606060405236156100775760e0"  # noqa: E501
-            "60020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b14"  # noqa: E501
-            "6100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f"  # noqa: E501
-            "578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b00"  # noqa: E501
-            "5b6100776004356000600036436040518084848082843750505090910190815260405190"  # noqa: E501
-            "81900360200190209050610529815b600160a060020a0333166000908152610102602052"  # noqa: E501
-            "60408120548180808381141561066f57610806565b61021c6004355b600160a060020a03"  # noqa: E501
-            "16600090815261010260205260408120541190565b61021c60015481565b610077600435"  # noqa: E501
-            "600036436040518084848082843750505090910190815260405190819003602001902090"  # noqa: E501
-            "506104a1816100ab565b61021c60005481565b610077600435600160a060020a03331660"  # noqa: E501
-            "0090815261010260205260408120549080808381141561022e576102b0565b6100776004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "90506105e8816100ab565b61021c60043560243560008281526101036020908152604080"  # noqa: E501
-            "8320600160a060020a038516845261010290925282205482908181811415610641576106"  # noqa: E501
-            "65565b610077600435602435600060003643604051808484808284375050509091019081"  # noqa: E501
-            "52604051908190036020019020905061033a816100ab565b604080519182525190819003"  # noqa: E501
-            "60200190f35b5050506000828152610103602052604081206001810154600284900a9290"  # noqa: E501
-            "8316819011156102b0578154600183810180549290910184559084900390556040805160"  # noqa: E501
-            "0160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e"  # noqa: E501
-            "5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b60"  # noqa: E501
-            "0160a060020a038316600283610100811015610002570155600160a060020a0384811660"  # noqa: E501
-            "008181526101026020908152604080832083905593871680835291849020869055835192"  # noqa: E501
-            "835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995"  # noqa: E501
-            "d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b"  # noqa: E501
-            "156103535750610335565b600160a060020a038416600090815261010260205260408120"  # noqa: E501
-            "54925082141561037c5750610335565b6102b75b6101045460005b818110156107b55761"  # noqa: E501
-            "0104805482908110156100025760009182526000805160206108ea833981519152015414"  # noqa: E501
-            "6103fa576101048054610103916000918490811015610002576000805160206108ea8339"  # noqa: E501
-            "8151915201548252506020919091526040812081815560018101829055600201555b6001"  # noqa: E501
-            "01610387565b60018054810190819055600160a060020a03831690600290610100811015"  # noqa: E501
-            "6100025790900160005081905550600160005054610102600050600084600160a060020a"  # noqa: E501
-            "03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469"  # noqa: E501
-            "d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a031681"  # noqa: E501
-            "5260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b15"  # noqa: E501
-            "6104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec56"  # noqa: E501
-            "5b505b60015460fa9010610402575061049e565b6105a65b600060015b60015481101561"  # noqa: E501
-            "07ef575b6001548110801561051c5750600281610100811015610002570154600014155b"  # noqa: E501
-            "1561080f576001016104fc565b1561033557600160a060020a0383166000908152610102"  # noqa: E501
-            "60205260408120549250821415610557575061049c565b60016001600050540360006000"  # noqa: E501
-            "50541115610572575061049c565b60006002836101008110156100025750830181905560"  # noqa: E501
-            "0160a060020a038416815261010260205260408120556104e8610380565b506040805160"  # noqa: E501
-            "0160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a"  # noqa: E501
-            "9071b555b651fbf418da9181900360200190a1505050565b1561049c5760015482111561"  # noqa: E501
-            "05fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084"  # noqa: E501
-            "c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190"  # noqa: E501
-            "a15050565b506001830154600282900a908116600014156106605760009450610665565b"  # noqa: E501
-            "600194505b5050505092915050565b600086815261010360205260408120805490945090"  # noqa: E501
-            "92508214156106f857815483556001838101839055610104805491820180825582801582"  # noqa: E501
-            "90116106c7578183600052602060002091820191016106c791906107db565b5050506002"  # noqa: E501
-            "84018190556101048054889290811015610002576000919091526000805160206108ea83"  # noqa: E501
-            "398151915201555b506001820154600284900a9081166000141561080657604080516001"  # noqa: E501
-            "60a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d"  # noqa: E501
-            "5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f357"  # noqa: E501
-            "600086815261010360205260409020600201546101048054909190811015610002576040"  # noqa: E501
-            "60009081206000805160206108ea83398151915292909201819055808255600180830182"  # noqa: E501
-            "905560029092015595506108069050565b61010480546000808355919091526103359060"  # noqa: E501
-            "00805160206108ea833981519152908101905b808211156107ef57600081556001016107"  # noqa: E501
-            "db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b"  # noqa: E501
-            "6001805411801561083257506001546002906101008110156100025701546000145b1561"  # noqa: E501
-            "08465760018054600019019055610810565b600154811080156108695750600154600290"  # noqa: E501
-            "610100811015610002570154600014155b80156108835750600281610100811015610002"  # noqa: E501
-            "5701546000145b156108e457600154600290610100811015610002578101549082610100"  # noqa: E501
-            "811015610002578101919091558190610102906000908361010081101561000257810154"  # noqa: E501
-            "825260209290925260408120929092556001546101008110156100025701555b6104f156"  # noqa: E501
-            "004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
-        ),
-        gas_limit=tx_gas_limit,
-        value=100,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_is_owner_false.py b/tests/ported_static/stWalletTest/test_multi_owned_is_owner_false.py
index b9e3dd2767d..4b84b80aaf0 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_is_owner_false.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_is_owner_false.py
@@ -1,17 +1,18 @@
 """
-Test ported from static filler.
+Test_multi_owned_is_owner_false.
 
 Ported from:
-tests/static/state_tests/stWalletTest/multiOwnedIsOwnerFalseFiller.json
+state_tests/stWalletTest/multiOwnedIsOwnerFalseFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -21,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/multiOwnedIsOwnerFalseFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/multiOwnedIsOwnerFalseFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,11 +30,10 @@ def test_multi_owned_is_owner_false(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_multi_owned_is_owner_false."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A75EF08F, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,107 +44,47 @@ def test_multi_owned_is_owner_false(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf"  # noqa: E501
-            "6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c91711461"  # noqa: E501
-            "0136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a357"  # noqa: E501
-            "8063f00d4b5d146101e3575b005b61007760043560006000364360405180848480828437"  # noqa: E501
-            "5050509091019081526040519081900360200190209050610529815b600160a060020a03"  # noqa: E501
-            "3316600090815261010260205260408120548180808381141561066f57610806565b6102"  # noqa: E501
-            "1c6004355b600160a060020a0316600090815261010260205260408120541190565b6102"  # noqa: E501
-            "1c60015481565b6100776004356000364360405180848480828437505050909101908152"  # noqa: E501
-            "60405190819003602001902090506104a1816100ab565b61021c60005481565b61007760"  # noqa: E501
-            "0435600160a060020a033316600090815261010260205260408120549080808381141561"  # noqa: E501
-            "022e576102b0565b61007760043560003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506105e8816100ab565b61021c600435602435600082"  # noqa: E501
-            "815261010360209081526040808320600160a060020a0385168452610102909252822054"  # noqa: E501
-            "8290818181141561064157610665565b6100776004356024356000600036436040518084"  # noqa: E501
-            "8480828437505050909101908152604051908190036020019020905061033a816100ab56"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156102b05781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "61033357610348836100dc565b156103535750610335565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561037c5750610335565b6102b75b610104"  # noqa: E501
-            "5460005b818110156107b557610104805482908110156100025760009182526000805160"  # noqa: E501
-            "206108ea8339815191520154146103fa5761010480546101039160009184908110156100"  # noqa: E501
-            "02576000805160206108ea83398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610387565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa"  # noqa: E501
-            "90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a6"  # noqa: E501
-            "5b600060015b6001548110156107ef575b6001548110801561051c575060028161010081"  # noqa: E501
-            "1015610002570154600014155b1561080f576001016104fc565b1561033557600160a060"  # noqa: E501
-            "020a038316600090815261010260205260408120549250821415610557575061049c565b"  # noqa: E501
-            "6001600160005054036000600050541115610572575061049c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "04e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561049c576001548211156105fd575061049e565b600082905561060a610380565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106605760009450610665565b600194505b5050505092915050565b6000868152610103"  # noqa: E501
-            "6020526040812080549094509092508214156106f8578154835560018381018390556101"  # noqa: E501
-            "0480549182018082558280158290116106c7578183600052602060002091820191016106"  # noqa: E501
-            "c791906107db565b50505060028401819055610104805488929081101561000257600091"  # noqa: E501
-            "9091526000805160206108ea83398151915201555b506001820154600284900a90811660"  # noqa: E501
-            "0014156108065760408051600160a060020a03331681526020810188905281517fe1c52d"  # noqa: E501
-            "c63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda92918190039091"  # noqa: E501
-            "0190a18254600190116107f3576000868152610103602052604090206002015461010480"  # noqa: E501
-            "5490919081101561000257604060009081206000805160206108ea833981519152929092"  # noqa: E501
-            "01819055808255600180830182905560029092015595506108069050565b610104805460"  # noqa: E501
-            "0080835591909152610335906000805160206108ea833981519152908101905b80821115"  # noqa: E501
-            "6107ef57600081556001016107db565b5090565b82546000190183556001830180548217"  # noqa: E501
-            "90555b50505050919050565b5b6001805411801561083257506001546002906101008110"  # noqa: E501
-            "156100025701546000145b156108465760018054600019019055610810565b6001548110"  # noqa: E501
-            "80156108695750600154600290610100811015610002570154600014155b801561088357"  # noqa: E501
-            "506002816101008110156100025701546000145b156108e4576001546002906101008110"  # noqa: E501
-            "156100025781015490826101008110156100025781019190915581906101029060009083"  # noqa: E501
-            "610100811015610002578101548252602092909252604081209290925560015461010081"  # noqa: E501
-            "10156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab9"  # noqa: E501
-            "1f525b5ae7a03d02fabe"
+            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "2f54bf6e000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa"  # noqa: E501
-        ),
+        to=contract_0,
+        data=Bytes("2f54bf6e")
+        + Hash(0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
+        sender: Account(storage={}, nonce=2),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_is_owner_true.py b/tests/ported_static/stWalletTest/test_multi_owned_is_owner_true.py
index 6c9da78d56c..aeec0e20a27 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_is_owner_true.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_is_owner_true.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_multi_owned_is_owner_true.
 
 Ported from:
-tests/static/state_tests/stWalletTest/multiOwnedIsOwnerTrueFiller.json
+state_tests/stWalletTest/multiOwnedIsOwnerTrueFiller.json
 """
 
 import pytest
@@ -11,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -21,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stWalletTest/multiOwnedIsOwnerTrueFiller.json"],
+    ["state_tests/stWalletTest/multiOwnedIsOwnerTrueFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -29,8 +31,9 @@ def test_multi_owned_is_owner_true(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_multi_owned_is_owner_true."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -44,107 +47,48 @@ def test_multi_owned_is_owner_true(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
+    # Source: raw
+    # 0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf"  # noqa: E501
-            "6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c91711461"  # noqa: E501
-            "0136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a357"  # noqa: E501
-            "8063f00d4b5d146101e3575b005b61007760043560006000364360405180848480828437"  # noqa: E501
-            "5050509091019081526040519081900360200190209050610529815b600160a060020a03"  # noqa: E501
-            "3316600090815261010260205260408120548180808381141561066f57610806565b6102"  # noqa: E501
-            "1c6004355b600160a060020a0316600090815261010260205260408120541190565b6102"  # noqa: E501
-            "1c60015481565b6100776004356000364360405180848480828437505050909101908152"  # noqa: E501
-            "60405190819003602001902090506104a1816100ab565b61021c60005481565b61007760"  # noqa: E501
-            "0435600160a060020a033316600090815261010260205260408120549080808381141561"  # noqa: E501
-            "022e576102b0565b61007760043560003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506105e8816100ab565b61021c600435602435600082"  # noqa: E501
-            "815261010360209081526040808320600160a060020a0385168452610102909252822054"  # noqa: E501
-            "8290818181141561064157610665565b6100776004356024356000600036436040518084"  # noqa: E501
-            "8480828437505050909101908152604051908190036020019020905061033a816100ab56"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156102b05781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "61033357610348836100dc565b156103535750610335565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561037c5750610335565b6102b75b610104"  # noqa: E501
-            "5460005b818110156107b557610104805482908110156100025760009182526000805160"  # noqa: E501
-            "206108ea8339815191520154146103fa5761010480546101039160009184908110156100"  # noqa: E501
-            "02576000805160206108ea83398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610387565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa"  # noqa: E501
-            "90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a6"  # noqa: E501
-            "5b600060015b6001548110156107ef575b6001548110801561051c575060028161010081"  # noqa: E501
-            "1015610002570154600014155b1561080f576001016104fc565b1561033557600160a060"  # noqa: E501
-            "020a038316600090815261010260205260408120549250821415610557575061049c565b"  # noqa: E501
-            "6001600160005054036000600050541115610572575061049c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "04e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561049c576001548211156105fd575061049e565b600082905561060a610380565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106605760009450610665565b600194505b5050505092915050565b6000868152610103"  # noqa: E501
-            "6020526040812080549094509092508214156106f8578154835560018381018390556101"  # noqa: E501
-            "0480549182018082558280158290116106c7578183600052602060002091820191016106"  # noqa: E501
-            "c791906107db565b50505060028401819055610104805488929081101561000257600091"  # noqa: E501
-            "9091526000805160206108ea83398151915201555b506001820154600284900a90811660"  # noqa: E501
-            "0014156108065760408051600160a060020a03331681526020810188905281517fe1c52d"  # noqa: E501
-            "c63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda92918190039091"  # noqa: E501
-            "0190a18254600190116107f3576000868152610103602052604090206002015461010480"  # noqa: E501
-            "5490919081101561000257604060009081206000805160206108ea833981519152929092"  # noqa: E501
-            "01819055808255600180830182905560029092015595506108069050565b610104805460"  # noqa: E501
-            "0080835591909152610335906000805160206108ea833981519152908101905b80821115"  # noqa: E501
-            "6107ef57600081556001016107db565b5090565b82546000190183556001830180548217"  # noqa: E501
-            "90555b50505050919050565b5b6001805411801561083257506001546002906101008110"  # noqa: E501
-            "156100025701546000145b156108465760018054600019019055610810565b6001548110"  # noqa: E501
-            "80156108695750600154600290610100811015610002570154600014155b801561088357"  # noqa: E501
-            "506002816101008110156100025701546000145b156108e4576001546002906101008110"  # noqa: E501
-            "156100025781015490826101008110156100025781019190915581906101029060009083"  # noqa: E501
-            "610100811015610002578101548252602092909252604081209290925560015461010081"  # noqa: E501
-            "10156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab9"  # noqa: E501
-            "1f525b5ae7a03d02fabe"
+            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "2f54bf6e000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"  # noqa: E501
-        ),
+        to=contract_0,
+        data=Bytes("2f54bf6e") + Hash(sender, left_padding=True),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
+        sender: Account(storage={}, nonce=2),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_remove_owner.py b/tests/ported_static/stWalletTest/test_multi_owned_remove_owner.py
index d4d46b6d969..9947931cf21 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_remove_owner.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_remove_owner.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_multi_owned_remove_owner.
 
 Ported from:
-tests/static/state_tests/stWalletTest/multiOwnedRemoveOwnerFiller.json
+state_tests/stWalletTest/multiOwnedRemoveOwnerFiller.json
 """
 
 import pytest
@@ -11,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -22,7 +24,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stWalletTest/multiOwnedRemoveOwnerFiller.json"],
+    ["state_tests/stWalletTest/multiOwnedRemoveOwnerFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +32,9 @@ def test_multi_owned_remove_owner(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_multi_owned_remove_owner."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,850 +48,824 @@ def test_multi_owned_remove_owner(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.DIV(
-                Op.CALLDATALOAD(offset=0x0),
-                0x100000000000000000000000000000000000000000000000000000000,
-            )
-            + Op.JUMPI(pc=Op.PUSH2[0x65], condition=Op.EQ(Op.DUP2, 0x173825D9))
-            + Op.JUMPI(pc=Op.PUSH2[0xB7], condition=Op.EQ(0x2F54BF6E, Op.DUP1))
-            + Op.JUMPI(pc=Op.PUSH2[0xE8], condition=Op.EQ(0x7065CB48, Op.DUP1))
-            + Op.JUMPI(pc=0x105, condition=Op.EQ(0xB75C7DC6, Op.DUP1))
-            + Op.JUMPI(pc=0x142, condition=Op.EQ(0xBA51A6DF, Op.DUP1))
-            + Op.JUMPI(pc=0x15F, condition=Op.EQ(0xF00D4B5D, Op.DUP1))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH2[0x181]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x40]
-            + Op.PUSH1[0x0]
-            + Op.CALLDATASIZE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP5, offset=Op.DUP3, size=Op.DUP1
-            )
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.SHA3
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x46D]
-            + Op.DUP2
-            + Op.JUMPDEST
-            + Op.AND(Op.CALLER, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.MSTORE(offset=0x20, value=0x102)
-            + Op.SLOAD(key=Op.SHA3(offset=Op.DUP2, size=0x40))
-            + Op.DUP2
-            + Op.DUP1
-            + Op.DUP1
-            + Op.JUMPI(pc=0x58F, condition=Op.ISZERO(Op.EQ(Op.DUP2, Op.DUP4)))
-            + Op.JUMP(pc=0x586)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x187]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.JUMPDEST
-            + Op.PUSH20[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.AND
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.MSTORE(offset=0x20, value=0x102)
-            + Op.SLOAD(key=Op.SHA3(offset=Op.DUP2, size=0x40))
-            + Op.GT
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH2[0x181]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.PUSH1[0x40]
-            + Op.PUSH1[0x0]
-            + Op.CALLDATASIZE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP5, offset=Op.DUP3, size=Op.DUP1
-            )
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.SHA3
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x37C]
-            + Op.DUP2
-            + Op.JUMP(pc=Op.PUSH2[0x80])
-            + Op.JUMPDEST
-            + Op.PUSH2[0x181]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.AND(Op.CALLER, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.MSTORE(offset=0x20, value=0x102)
-            + Op.SLOAD(key=Op.SHA3(offset=Op.DUP2, size=0x40))
-            + Op.SWAP1
-            + Op.DUP1
-            + Op.DUP1
-            + Op.JUMPI(pc=0x191, condition=Op.ISZERO(Op.EQ(Op.DUP2, Op.DUP4)))
-            + Op.JUMP(pc=0x213)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x181]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.PUSH1[0x40]
-            + Op.PUSH1[0x0]
-            + Op.CALLDATASIZE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP5, offset=Op.DUP3, size=Op.DUP1
-            )
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.SHA3
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x533]
-            + Op.DUP2
-            + Op.JUMP(pc=Op.PUSH2[0x80])
-            + Op.JUMPDEST
-            + Op.PUSH2[0x181]
-            + Op.CALLDATALOAD(offset=0x4)
-            + Op.CALLDATALOAD(offset=0x24)
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x40]
-            + Op.PUSH1[0x0]
-            + Op.CALLDATASIZE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP5, offset=Op.DUP3, size=Op.DUP1
-            )
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.SHA3
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH2[0x286]
-            + Op.DUP2
-            + Op.JUMP(pc=Op.PUSH2[0x80])
-            + Op.JUMPDEST
-            + Op.RETURN(offset=0x0, size=0x0)
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=0x0, value=Op.DUP1)
-            + Op.RETURN(offset=0x0, size=0x20)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
-            + Op.MSTORE(offset=0x20, value=0x103)
-            + Op.SHA3(offset=Op.DUP2, size=0x40)
-            + Op.SLOAD(key=Op.ADD(Op.DUP2, 0x1))
-            + Op.PUSH1[0x2]
-            + Op.DUP5
-            + Op.SWAP1
-            + Op.EXP
-            + Op.SWAP3
-            + Op.SWAP1
-            + Op.DUP4
-            + Op.AND
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.JUMPI(pc=0x213, condition=Op.ISZERO(Op.GT))
-            + Op.SLOAD(key=Op.DUP2)
-            + Op.PUSH1[0x1]
-            + Op.ADD(Op.DUP5, Op.DUP1)
-            + Op.SLOAD(key=Op.DUP1)
-            + Op.SWAP2
-            + Op.SWAP1
-            + Op.SWAP3
-            + Op.SSTORE(key=Op.DUP5, value=Op.ADD)
-            + Op.DUP5
-            + Op.SWAP1
-            + Op.SUB
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.AND(Op.CALLER, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.PUSH1[0x40]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.PUSH1[0x60]
-            + Op.DUP7
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.PUSH32[
-                0xC7FB647E59B18047309AA15AAD418E5D7CA96D173AD704F1031A2C3D7591734B  # noqa: E501
-            ]
-            + Op.SWAP1
-            + Op.DUP1
-            + Op.LOG1
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.ADD
-            + Op.SSTORE
-            + Op.PUSH20[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
-            + Op.AND(Op.DUP2, Op.DUP5)
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.MSTORE(offset=0x20, value=0x102)
-            + Op.PUSH1[0x40]
-            + Op.SHA3(offset=Op.DUP3, size=Op.DUP1)
-            + Op.DUP3
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.SWAP3
-            + Op.DUP7
-            + Op.AND
-            + Op.MSTORE(offset=Op.DUP3, value=Op.DUP1)
-            + Op.SWAP1
-            + Op.DUP4
-            + Op.SWAP1
-            + Op.SHA3
-            + Op.DUP6
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.SWAP1
-            + Op.DUP3
-            + Op.MSTORE
-            + Op.PUSH1[0x60]
-            + Op.MSTORE
-            + Op.PUSH32[
-                0xB532073B38C83145E3E5135377A08BF9AAB55BC0FD7C1179CD4FB995D2A5159C  # noqa: E501
-            ]
-            + Op.SWAP1
-            + Op.DUP1
-            + Op.LOG1
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x27F, condition=Op.ISZERO)
-            + Op.PUSH2[0x294]
-            + Op.DUP4
-            + Op.JUMP(pc=Op.PUSH2[0xBE])
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x29F, condition=Op.ISZERO)
-            + Op.POP
-            + Op.JUMP(pc=0x281)
-            + Op.JUMPDEST
-            + Op.AND(Op.DUP5, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.MSTORE(offset=0x20, value=0x102)
-            + Op.SLOAD(key=Op.SHA3(offset=Op.DUP2, size=0x40))
-            + Op.SWAP3
-            + Op.POP
-            + Op.DUP3
-            + Op.JUMPI(pc=0x2D5, condition=Op.ISZERO(Op.EQ))
-            + Op.POP
-            + Op.JUMP(pc=0x281)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x2F7]
-            + Op.JUMPDEST
-            + Op.SLOAD(key=0x104)
-            + Op.PUSH1[0x0]
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x80C, condition=Op.ISZERO(Op.LT(Op.DUP2, Op.DUP2)))
-            + Op.PUSH2[0x104]
-            + Op.SLOAD(key=Op.DUP1)
-            + Op.DUP3
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.JUMPI(pc=0x854, condition=Op.LT)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.AND(Op.DUP4, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.PUSH1[0x2]
-            + Op.DUP4
-            + Op.JUMPI(pc=0x21A, condition=Op.LT(Op.DUP2, 0x100))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.ADD
-            + Op.SSTORE
-            + Op.SLOAD(key=0x1)
-            + Op.AND(Op.DUP4, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
-            + Op.PUSH2[0x102]
-            + Op.PUSH1[0x20]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.PUSH1[0x40]
-            + Op.SWAP2
-            + Op.DUP3
-            + Op.SWAP1
-            + Op.SHA3
-            + Op.SWAP4
-            + Op.SWAP1
-            + Op.SWAP4
-            + Op.SSTORE
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.PUSH32[
-                0x994A936646FE87FFE4F1E469D3D6AA417D6B855598397F323DE5B449F765F0C3  # noqa: E501
-            ]
-            + Op.SWAP2
-            + Op.SWAP1
-            + Op.LOG1
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x377, condition=Op.ISZERO)
-            + Op.PUSH2[0x38A]
-            + Op.DUP3
-            + Op.JUMP(pc=Op.PUSH2[0xBE])
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x395, condition=Op.ISZERO)
-            + Op.POP
-            + Op.JUMP(pc=0x379)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x39D]
-            + Op.JUMP(pc=0x2D9)
-            + Op.JUMPDEST
-            + Op.SLOAD(key=0x1)
-            + Op.PUSH1[0xFA]
-            + Op.SWAP1
-            + Op.JUMPI(pc=0x3B4, condition=Op.ISZERO(Op.ISZERO(Op.LT)))
-            + Op.PUSH2[0x3B2]
-            + Op.JUMP(pc=0x3CB)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.SLOAD(key=0x1)
-            + Op.PUSH1[0xFA]
-            + Op.SWAP1
-            + Op.JUMPI(pc=0x3F5, condition=Op.ISZERO(Op.ISZERO(Op.LT)))
-            + Op.POP
-            + Op.JUMP(pc=0x379)
-            + Op.JUMPDEST
-            + Op.PUSH2[0x425]
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x1]
-            + Op.JUMPDEST
-            + Op.JUMPI(
-                pc=0x6F7,
-                condition=Op.ISZERO(Op.LT(Op.DUP2, Op.SLOAD(key=0x1))),
-            )
-            + Op.JUMPDEST
-            + Op.LT(Op.DUP2, Op.SLOAD(key=0x1))
-            + Op.JUMPI(pc=0x753, condition=Op.ISZERO(Op.DUP1))
-            + Op.POP
-            + Op.PUSH1[0x2]
-            + Op.DUP2
-            + Op.JUMPI(pc=0x74C, condition=Op.LT(Op.DUP2, 0x100))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.ADD(Op.DUP2, Op.SLOAD(key=Op.DUP1))
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.AND(Op.DUP4, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.SWAP1
-            + Op.PUSH1[0x2]
-            + Op.SWAP1
-            + Op.JUMPI(pc=0x31C, condition=Op.LT(Op.DUP2, 0x100))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.AND(Op.DUP4, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.PUSH1[0x40]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.PUSH32[
-                0x58619076ADF5BB0943D100EF88D52D7C3FD691B19D3A9071B555B651FBF418DA  # noqa: E501
-            ]
-            + Op.SWAP1
-            + Op.PUSH1[0x20]
-            + Op.SWAP1
-            + Op.LOG1
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x281, condition=Op.ISZERO)
-            + Op.AND(Op.DUP4, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.MSTORE(offset=0x20, value=0x102)
-            + Op.SLOAD(key=Op.SHA3(offset=Op.DUP2, size=0x40))
-            + Op.SWAP3
-            + Op.POP
-            + Op.DUP3
-            + Op.JUMPI(pc=0x4A8, condition=Op.ISZERO(Op.EQ))
-            + Op.POP
-            + Op.JUMP(pc=0x377)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.PUSH1[0x1]
-            + Op.POP(0x0)
-            + Op.SLOAD
-            + Op.SUB
-            + Op.PUSH1[0x0]
-            + Op.POP(0x0)
-            + Op.SLOAD
-            + Op.JUMPI(pc=0x4C3, condition=Op.ISZERO(Op.GT))
-            + Op.POP
-            + Op.JUMP(pc=0x377)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x2]
-            + Op.DUP4
-            + Op.JUMPI(pc=0x4D3, condition=Op.LT(Op.DUP2, 0x100))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.ADD
-            + Op.SSTORE
-            + Op.AND(Op.DUP4, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.MSTORE(offset=0x20, value=0x102)
-            + Op.SHA3(offset=Op.DUP2, size=0x40)
-            + Op.SSTORE
-            + Op.PUSH2[0x3C7]
-            + Op.JUMP(pc=0x2D9)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x40]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
-            + Op.PUSH32[
-                0xACBDB084C721332AC59F9B8E392196C9EB0E4932862DA8EB9BEAF0DAD4F550DA  # noqa: E501
-            ]
-            + Op.SWAP1
-            + Op.PUSH1[0x20]
-            + Op.SWAP1
-            + Op.LOG1
-            + Op.POP
-            + Op.POP
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x377, condition=Op.ISZERO)
-            + Op.JUMPI(
-                pc=0x548,
-                condition=Op.ISZERO(Op.GT(Op.DUP3, Op.SLOAD(key=0x1))),
-            )
-            + Op.POP
-            + Op.JUMP(pc=0x379)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.DUP3
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.PUSH2[0x504]
-            + Op.JUMP(pc=0x2D9)
-            + Op.JUMPDEST
-            + Op.SSTORE(
-                key=Op.DUP4,
-                value=Op.ADD(
-                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                    Op.SLOAD(key=Op.DUP3),
-                ),
-            )
-            + Op.ADD(Op.DUP4, 0x1)
-            + Op.OR(Op.DUP3, Op.SLOAD(key=Op.DUP1))
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.SWAP2
-            + Op.SWAP1
-            + Op.POP
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP7)
-            + Op.MSTORE(offset=0x20, value=0x103)
-            + Op.SHA3(offset=Op.DUP2, size=0x40)
-            + Op.SLOAD(key=Op.DUP1)
-            + Op.SWAP1
-            + Op.SWAP5
-            + Op.POP
-            + Op.SWAP1
-            + Op.SWAP3
-            + Op.POP
-            + Op.DUP3
-            + Op.JUMPI(pc=0x61A, condition=Op.ISZERO(Op.EQ))
-            + Op.SSTORE(key=Op.DUP4, value=Op.SLOAD(key=Op.DUP2))
-            + Op.PUSH1[0x1]
-            + Op.ADD(Op.DUP2, Op.DUP4)
-            + Op.DUP4
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.PUSH2[0x104]
-            + Op.SLOAD(key=Op.DUP1)
-            + Op.SWAP2
-            + Op.DUP3
-            + Op.ADD
-            + Op.SSTORE(key=Op.DUP3, value=Op.DUP1)
-            + Op.DUP3
-            + Op.ISZERO(Op.DUP1)
-            + Op.DUP3
-            + Op.SWAP1
-            + Op.JUMPI(pc=0x6A6, condition=Op.GT)
-            + Op.MSTORE(offset=Op.DUP7, value=Op.DUP3)
-            + Op.PUSH32[
-                0x4C0BE60200FAA20559308CB7B5A1BB3255C16CB1CAB91F525B5AE7A03D02FABE  # noqa: E501
-            ]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.ADD
-            + Op.SWAP1
-            + Op.DUP3
-            + Op.ADD
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x6A4, condition=Op.ISZERO(Op.GT(Op.DUP3, Op.DUP1)))
-            + Op.SSTORE(key=Op.DUP2, value=0x0)
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.JUMP(pc=0x5F9)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.DUP3
-            + Op.MSTORE
-            + Op.PUSH1[0x20]
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.SSTORE(key=Op.ADD, value=Op.SHA3)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.SLOAD(key=Op.ADD(Op.DUP3, 0x1))
-            + Op.PUSH1[0x2]
-            + Op.DUP5
-            + Op.SWAP1
-            + Op.EXP
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.JUMPI(pc=0x586, condition=Op.ISZERO(Op.EQ(0x0, Op.AND)))
-            + Op.AND(Op.CALLER, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.PUSH1[0x40]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.MSTORE
-            + Op.PUSH1[0x60]
-            + Op.DUP8
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.PUSH32[
-                0xE1C52DC63B719ADE82E8BEA94CC41A0D5D28E4AAF536ADB5E9CCCC9FF8C1AEDA  # noqa: E501
-            ]
-            + Op.SWAP1
-            + Op.DUP1
-            + Op.LOG1
-            + Op.SLOAD(key=Op.DUP3)
-            + Op.PUSH1[0x1]
-            + Op.SWAP1
-            + Op.JUMPI(pc=0x555, condition=Op.ISZERO(Op.ISZERO(Op.GT)))
-            + Op.PUSH1[0x0]
-            + Op.MSTORE(offset=Op.DUP2, value=Op.DUP7)
-            + Op.MSTORE(offset=0x20, value=0x103)
-            + Op.PUSH2[0x104]
-            + Op.SLOAD(key=Op.DUP1)
-            + Op.PUSH1[0x40]
-            + Op.SWAP1
-            + Op.SWAP3
-            + Op.SLOAD(key=Op.ADD(0x2, Op.SHA3))
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.DUP2
-            + Op.JUMPI(pc=0x6C0, condition=Op.LT)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.POP
-            + Op.POP
-            + Op.ADD(Op.DUP5, 0x2)
-            + Op.DUP2
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.PUSH2[0x104]
-            + Op.SLOAD(key=Op.DUP1)
-            + Op.DUP9
-            + Op.SWAP3
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.JUMPI(pc=0x60D, condition=Op.LT)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.DUP3
-            + Op.MSTORE
-            + Op.PUSH1[0x20]
-            + Op.SHA3(offset=Op.DUP4, size=Op.DUP1)
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.ADD
-            + Op.DUP3
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.MSTORE(offset=Op.DUP3, value=Op.DUP8)
-            + Op.PUSH2[0x103]
-            + Op.SWAP1
-            + Op.MSTORE
-            + Op.SHA3(offset=Op.DUP2, size=0x40)
-            + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
-            + Op.PUSH1[0x1]
-            + Op.ADD(Op.DUP2, Op.DUP2)
-            + Op.DUP4
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.PUSH1[0x2]
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.ADD
-            + Op.SWAP2
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.SSTORE
-            + Op.SWAP5
-            + Op.POP
-            + Op.JUMP(pc=0x586)
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.SWAP1
-            + Op.JUMP
-            + Op.JUMPDEST
-            + Op.EQ(0x0, Op.SLOAD(key=Op.ADD))
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x760, condition=Op.ISZERO)
-            + Op.PUSH1[0x1]
-            + Op.ADD(
+    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
+    # Source: raw
+    # 0x7c01000000000000000000000000000000000000000000000000000000006000350463173825d981146100655780632f54bf6e146100b75780637065cb48146100e8578063b75c7dc614610105578063ba51a6df14610142578063f00d4b5d1461015f57005b6101816004356000604060003680828437909120905061046d815b73ffffffffffffffffffffffffffffffffffffffff3316600090815261010260205260408120548180808381141561058f57610586565b6101876004355b73ffffffffffffffffffffffffffffffffffffffff16600090815261010260205260408120541190565b610181600435604060003680828437909120905061037c81610080565b61018160043573ffffffffffffffffffffffffffffffffffffffff3316600090815261010260205260408120549080808381141561019157610213565b610181600435604060003680828437909120905061053381610080565b6101816004356024356000604060003680828437909120905061028681610080565b60006000f35b8060005260206000f35b5050506000828152610103602052604081206001810154600284900a929083168190111561021357815460018084018054919092018455849003905573ffffffffffffffffffffffffffffffffffffffff3316604090815260608690527fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b9080a15b5050505050565b015573ffffffffffffffffffffffffffffffffffffffff84811660008181526101026020526040808220829055928616808252908390208590559082526060527fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c9080a15b505b505050565b1561027f57610294836100be565b1561029f5750610281565b73ffffffffffffffffffffffffffffffffffffffff84166000908152610102602052604081205492508214156102d55750610281565b6102f75b6101045460005b8181101561080c5761010480548290811061085457005b73ffffffffffffffffffffffffffffffffffffffff8316600283610100811061021a57005b015560015473ffffffffffffffffffffffffffffffffffffffff831660008181526101026020908152604091829020939093559081527f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c39190a15b505b50565b156103775761038a826100be565b156103955750610379565b61039d6102d9565b60015460fa901015156103b4576103b26103cb565b505b60015460fa901015156103f55750610379565b6104255b600060015b6001548110156106f7575b600154811080156107535750600281610100811061074c57005b6001805481019081905573ffffffffffffffffffffffffffffffffffffffff831690600290610100811061031c57005b5073ffffffffffffffffffffffffffffffffffffffff831660409081527f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da90602090a1505050565b156102815773ffffffffffffffffffffffffffffffffffffffff83166000908152610102602052604081205492508214156104a85750610377565b60016001600050540360006000505411156104c35750610377565b600060028361010081106104d357005b015573ffffffffffffffffffffffffffffffffffffffff8316600090815261010260205260408120556103c76102d9565b60408281527facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da90602090a15050565b15610377576001548211156105485750610379565b60008290556105046102d9565b82547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff018355600183018054821790555b50505050919050565b600086815261010360205260408120805490945090925082141561061a5781548355600183810183905561010480549182018082558280158290116106a6578286527f4c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe9081019082015b808211156106a457600081556001016105f9565b6000918252602090912001555b506001820154600284900a908116600014156105865773ffffffffffffffffffffffffffffffffffffffff3316604090815260608790527fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda9080a182546001901115156105555760008681526101036020526101048054604090922060020154909181106106c057005b505b505050600284018190556101048054889290811061060d57005b6000918252602080832090910182905587825261010390526040812081815560018181018390556002909101919091559450610586565b5090565b01546000145b1561076057600180547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0190555b60018054118015610701575060015460029061010081106106fb57005b0154600014155b1561072f576001016103db565b600154811080156107845750600154600290610100811061077d57005b0154600014155b801561079f5750600281610100811061079957005b01546000145b156107b85760015460029061010081106107bd57005b01555b6103d0565b015460028261010081106107cd57005b015580610102600060028361010081106107e357005b01548152602081019190915260400160009081209190915560015460029061010081106107b557005b61010480546000808355919091527f4c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe908101905b8082111561027f5760008155600101610840565b60009182526020822001541415156108a6576101048054610103916000918490811061087c57005b60009182526020808320909101548352820192909252604001812081815560018101829055600201555b6001016102e056  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.DIV(
+            Op.CALLDATALOAD(offset=0x0),
+            0x100000000000000000000000000000000000000000000000000000000,
+        )
+        + Op.JUMPI(pc=Op.PUSH2[0x65], condition=Op.EQ(Op.DUP2, 0x173825D9))
+        + Op.JUMPI(pc=Op.PUSH2[0xB7], condition=Op.EQ(0x2F54BF6E, Op.DUP1))
+        + Op.JUMPI(pc=Op.PUSH2[0xE8], condition=Op.EQ(0x7065CB48, Op.DUP1))
+        + Op.JUMPI(pc=0x105, condition=Op.EQ(0xB75C7DC6, Op.DUP1))
+        + Op.JUMPI(pc=0x142, condition=Op.EQ(0xBA51A6DF, Op.DUP1))
+        + Op.JUMPI(pc=0x15F, condition=Op.EQ(0xF00D4B5D, Op.DUP1))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH2[0x181]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x40]
+        + Op.PUSH1[0x0]
+        + Op.CALLDATASIZE
+        + Op.CALLDATACOPY(dest_offset=Op.DUP5, offset=Op.DUP3, size=Op.DUP1)
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.SHA3
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x46D]
+        + Op.DUP2
+        + Op.JUMPDEST
+        + Op.AND(Op.CALLER, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.MSTORE(offset=0x20, value=0x102)
+        + Op.SLOAD(key=Op.SHA3(offset=Op.DUP2, size=0x40))
+        + Op.DUP2
+        + Op.DUP1 * 2
+        + Op.JUMPI(pc=0x58F, condition=Op.ISZERO(Op.EQ(Op.DUP2, Op.DUP4)))
+        + Op.JUMP(pc=0x586)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x187]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.JUMPDEST
+        + Op.PUSH20[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.AND
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.MSTORE(offset=0x20, value=0x102)
+        + Op.SLOAD(key=Op.SHA3(offset=Op.DUP2, size=0x40))
+        + Op.GT
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH2[0x181]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.PUSH1[0x40]
+        + Op.PUSH1[0x0]
+        + Op.CALLDATASIZE
+        + Op.CALLDATACOPY(dest_offset=Op.DUP5, offset=Op.DUP3, size=Op.DUP1)
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.SHA3
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x37C]
+        + Op.DUP2
+        + Op.JUMP(pc=Op.PUSH2[0x80])
+        + Op.JUMPDEST
+        + Op.PUSH2[0x181]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.AND(Op.CALLER, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.MSTORE(offset=0x20, value=0x102)
+        + Op.SLOAD(key=Op.SHA3(offset=Op.DUP2, size=0x40))
+        + Op.SWAP1
+        + Op.DUP1 * 2
+        + Op.JUMPI(pc=0x191, condition=Op.ISZERO(Op.EQ(Op.DUP2, Op.DUP4)))
+        + Op.JUMP(pc=0x213)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x181]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.PUSH1[0x40]
+        + Op.PUSH1[0x0]
+        + Op.CALLDATASIZE
+        + Op.CALLDATACOPY(dest_offset=Op.DUP5, offset=Op.DUP3, size=Op.DUP1)
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.SHA3
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x533]
+        + Op.DUP2
+        + Op.JUMP(pc=Op.PUSH2[0x80])
+        + Op.JUMPDEST
+        + Op.PUSH2[0x181]
+        + Op.CALLDATALOAD(offset=0x4)
+        + Op.CALLDATALOAD(offset=0x24)
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x40]
+        + Op.PUSH1[0x0]
+        + Op.CALLDATASIZE
+        + Op.CALLDATACOPY(dest_offset=Op.DUP5, offset=Op.DUP3, size=Op.DUP1)
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.SHA3
+        + Op.SWAP1
+        + Op.POP
+        + Op.PUSH2[0x286]
+        + Op.DUP2
+        + Op.JUMP(pc=Op.PUSH2[0x80])
+        + Op.JUMPDEST
+        + Op.RETURN(offset=0x0, size=0x0)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMPDEST
+        + Op.POP * 3
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
+        + Op.MSTORE(offset=0x20, value=0x103)
+        + Op.SHA3(offset=Op.DUP2, size=0x40)
+        + Op.SLOAD(key=Op.ADD(Op.DUP2, 0x1))
+        + Op.PUSH1[0x2]
+        + Op.DUP5
+        + Op.SWAP1
+        + Op.EXP
+        + Op.SWAP3
+        + Op.SWAP1
+        + Op.DUP4
+        + Op.AND
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.JUMPI(pc=0x213, condition=Op.ISZERO(Op.GT))
+        + Op.SLOAD(key=Op.DUP2)
+        + Op.PUSH1[0x1]
+        + Op.ADD(Op.DUP5, Op.DUP1)
+        + Op.SLOAD(key=Op.DUP1)
+        + Op.SWAP2
+        + Op.SWAP1
+        + Op.SWAP3
+        + Op.SSTORE(key=Op.DUP5, value=Op.ADD)
+        + Op.DUP5
+        + Op.SWAP1
+        + Op.SUB
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.AND(Op.CALLER, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.PUSH1[0x40]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.PUSH1[0x60]
+        + Op.DUP7
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.PUSH32[
+            0xC7FB647E59B18047309AA15AAD418E5D7CA96D173AD704F1031A2C3D7591734B
+        ]
+        + Op.SWAP1
+        + Op.DUP1
+        + Op.LOG1
+        + Op.JUMPDEST
+        + Op.POP * 5
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.ADD
+        + Op.SSTORE
+        + Op.PUSH20[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF]
+        + Op.AND(Op.DUP2, Op.DUP5)
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.MSTORE(offset=0x20, value=0x102)
+        + Op.PUSH1[0x40]
+        + Op.SHA3(offset=Op.DUP3, size=Op.DUP1)
+        + Op.DUP3
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.SWAP3
+        + Op.DUP7
+        + Op.AND
+        + Op.MSTORE(offset=Op.DUP3, value=Op.DUP1)
+        + Op.SWAP1
+        + Op.DUP4
+        + Op.SWAP1
+        + Op.SHA3
+        + Op.DUP6
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.SWAP1
+        + Op.DUP3
+        + Op.MSTORE
+        + Op.PUSH1[0x60]
+        + Op.MSTORE
+        + Op.PUSH32[
+            0xB532073B38C83145E3E5135377A08BF9AAB55BC0FD7C1179CD4FB995D2A5159C
+        ]
+        + Op.SWAP1
+        + Op.DUP1
+        + Op.LOG1
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.POP * 3
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x27F, condition=Op.ISZERO)
+        + Op.PUSH2[0x294]
+        + Op.DUP4
+        + Op.JUMP(pc=Op.PUSH2[0xBE])
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x29F, condition=Op.ISZERO)
+        + Op.POP
+        + Op.JUMP(pc=0x281)
+        + Op.JUMPDEST
+        + Op.AND(Op.DUP5, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.MSTORE(offset=0x20, value=0x102)
+        + Op.SLOAD(key=Op.SHA3(offset=Op.DUP2, size=0x40))
+        + Op.SWAP3
+        + Op.POP
+        + Op.DUP3
+        + Op.JUMPI(pc=0x2D5, condition=Op.ISZERO(Op.EQ))
+        + Op.POP
+        + Op.JUMP(pc=0x281)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x2F7]
+        + Op.JUMPDEST
+        + Op.SLOAD(key=0x104)
+        + Op.PUSH1[0x0]
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x80C, condition=Op.ISZERO(Op.LT(Op.DUP2, Op.DUP2)))
+        + Op.PUSH2[0x104]
+        + Op.SLOAD(key=Op.DUP1)
+        + Op.DUP3
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.JUMPI(pc=0x854, condition=Op.LT)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.AND(Op.DUP4, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.PUSH1[0x2]
+        + Op.DUP4
+        + Op.JUMPI(pc=0x21A, condition=Op.LT(Op.DUP2, 0x100))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.ADD
+        + Op.SSTORE
+        + Op.SLOAD(key=0x1)
+        + Op.AND(Op.DUP4, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP2)
+        + Op.PUSH2[0x102]
+        + Op.PUSH1[0x20]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.PUSH1[0x40]
+        + Op.SWAP2
+        + Op.DUP3
+        + Op.SWAP1
+        + Op.SHA3
+        + Op.SWAP4
+        + Op.SWAP1
+        + Op.SWAP4
+        + Op.SSTORE
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.PUSH32[
+            0x994A936646FE87FFE4F1E469D3D6AA417D6B855598397F323DE5B449F765F0C3
+        ]
+        + Op.SWAP2
+        + Op.SWAP1
+        + Op.LOG1
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x377, condition=Op.ISZERO)
+        + Op.PUSH2[0x38A]
+        + Op.DUP3
+        + Op.JUMP(pc=Op.PUSH2[0xBE])
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x395, condition=Op.ISZERO)
+        + Op.POP
+        + Op.JUMP(pc=0x379)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x39D]
+        + Op.JUMP(pc=0x2D9)
+        + Op.JUMPDEST
+        + Op.SLOAD(key=0x1)
+        + Op.PUSH1[0xFA]
+        + Op.SWAP1
+        + Op.JUMPI(pc=0x3B4, condition=Op.ISZERO(Op.ISZERO(Op.LT)))
+        + Op.PUSH2[0x3B2]
+        + Op.JUMP(pc=0x3CB)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.SLOAD(key=0x1)
+        + Op.PUSH1[0xFA]
+        + Op.SWAP1
+        + Op.JUMPI(pc=0x3F5, condition=Op.ISZERO(Op.ISZERO(Op.LT)))
+        + Op.POP
+        + Op.JUMP(pc=0x379)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x425]
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x1]
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x6F7, condition=Op.ISZERO(Op.LT(Op.DUP2, Op.SLOAD(key=0x1)))
+        )
+        + Op.JUMPDEST
+        + Op.LT(Op.DUP2, Op.SLOAD(key=0x1))
+        + Op.JUMPI(pc=0x753, condition=Op.ISZERO(Op.DUP1))
+        + Op.POP
+        + Op.PUSH1[0x2]
+        + Op.DUP2
+        + Op.JUMPI(pc=0x74C, condition=Op.LT(Op.DUP2, 0x100))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.ADD(Op.DUP2, Op.SLOAD(key=Op.DUP1))
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.AND(Op.DUP4, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.SWAP1
+        + Op.PUSH1[0x2]
+        + Op.SWAP1
+        + Op.JUMPI(pc=0x31C, condition=Op.LT(Op.DUP2, 0x100))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.AND(Op.DUP4, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.PUSH1[0x40]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.PUSH32[
+            0x58619076ADF5BB0943D100EF88D52D7C3FD691B19D3A9071B555B651FBF418DA
+        ]
+        + Op.SWAP1
+        + Op.PUSH1[0x20]
+        + Op.SWAP1
+        + Op.LOG1
+        + Op.POP * 3
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x281, condition=Op.ISZERO)
+        + Op.AND(Op.DUP4, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.MSTORE(offset=0x20, value=0x102)
+        + Op.SLOAD(key=Op.SHA3(offset=Op.DUP2, size=0x40))
+        + Op.SWAP3
+        + Op.POP
+        + Op.DUP3
+        + Op.JUMPI(pc=0x4A8, condition=Op.ISZERO(Op.EQ))
+        + Op.POP
+        + Op.JUMP(pc=0x377)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1] * 2
+        + Op.POP(0x0)
+        + Op.SLOAD
+        + Op.SUB
+        + Op.PUSH1[0x0]
+        + Op.POP(0x0)
+        + Op.SLOAD
+        + Op.JUMPI(pc=0x4C3, condition=Op.ISZERO(Op.GT))
+        + Op.POP
+        + Op.JUMP(pc=0x377)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x2]
+        + Op.DUP4
+        + Op.JUMPI(pc=0x4D3, condition=Op.LT(Op.DUP2, 0x100))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.ADD
+        + Op.SSTORE
+        + Op.AND(Op.DUP4, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.MSTORE(offset=0x20, value=0x102)
+        + Op.SHA3(offset=Op.DUP2, size=0x40)
+        + Op.SSTORE
+        + Op.PUSH2[0x3C7]
+        + Op.JUMP(pc=0x2D9)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x40]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP3)
+        + Op.PUSH32[
+            0xACBDB084C721332AC59F9B8E392196C9EB0E4932862DA8EB9BEAF0DAD4F550DA
+        ]
+        + Op.SWAP1
+        + Op.PUSH1[0x20]
+        + Op.SWAP1
+        + Op.LOG1
+        + Op.POP * 2
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x377, condition=Op.ISZERO)
+        + Op.JUMPI(
+            pc=0x548, condition=Op.ISZERO(Op.GT(Op.DUP3, Op.SLOAD(key=0x1)))
+        )
+        + Op.POP
+        + Op.JUMP(pc=0x379)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.DUP3
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.PUSH2[0x504]
+        + Op.JUMP(pc=0x2D9)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=Op.DUP4,
+            value=Op.ADD(
                 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
-                Op.SLOAD(key=Op.DUP1),
-            )
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.JUMPDEST
-            + Op.GT(Op.SLOAD(key=Op.DUP1), 0x1)
-            + Op.JUMPI(pc=0x701, condition=Op.ISZERO(Op.DUP1))
-            + Op.POP
-            + Op.SLOAD(key=0x1)
-            + Op.PUSH1[0x2]
-            + Op.SWAP1
-            + Op.JUMPI(pc=0x6FB, condition=Op.LT(Op.DUP2, 0x100))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.ISZERO(Op.EQ(0x0, Op.SLOAD(key=Op.ADD)))
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x72F, condition=Op.ISZERO)
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.JUMP(pc=0x3DB)
-            + Op.JUMPDEST
-            + Op.LT(Op.DUP2, Op.SLOAD(key=0x1))
-            + Op.JUMPI(pc=0x784, condition=Op.ISZERO(Op.DUP1))
-            + Op.POP
-            + Op.SLOAD(key=0x1)
-            + Op.PUSH1[0x2]
-            + Op.SWAP1
-            + Op.JUMPI(pc=0x77D, condition=Op.LT(Op.DUP2, 0x100))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.ISZERO(Op.EQ(0x0, Op.SLOAD(key=Op.ADD)))
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x79F, condition=Op.ISZERO(Op.DUP1))
-            + Op.POP
-            + Op.PUSH1[0x2]
-            + Op.DUP2
-            + Op.JUMPI(pc=0x799, condition=Op.LT(Op.DUP2, 0x100))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.EQ(0x0, Op.SLOAD(key=Op.ADD))
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x7B8, condition=Op.ISZERO)
-            + Op.SLOAD(key=0x1)
-            + Op.PUSH1[0x2]
-            + Op.SWAP1
-            + Op.JUMPI(pc=0x7BD, condition=Op.LT(Op.DUP2, 0x100))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.ADD
-            + Op.SSTORE
-            + Op.JUMPDEST
-            + Op.JUMP(pc=0x3D0)
-            + Op.JUMPDEST
-            + Op.SLOAD(key=Op.ADD)
-            + Op.PUSH1[0x2]
-            + Op.DUP3
-            + Op.JUMPI(pc=0x7CD, condition=Op.LT(Op.DUP2, 0x100))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.ADD
-            + Op.SSTORE
-            + Op.DUP1
-            + Op.PUSH2[0x102]
-            + Op.PUSH1[0x0]
-            + Op.PUSH1[0x2]
-            + Op.DUP4
-            + Op.JUMPI(pc=0x7E3, condition=Op.LT(Op.DUP2, 0x100))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.MSTORE(offset=Op.DUP2, value=Op.SLOAD(key=Op.ADD))
-            + Op.ADD(Op.DUP2, 0x20)
-            + Op.SWAP2
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.MSTORE
-            + Op.PUSH1[0x40]
-            + Op.ADD
-            + Op.PUSH1[0x0]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.SHA3
-            + Op.SWAP2
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.SSTORE
-            + Op.SLOAD(key=0x1)
-            + Op.PUSH1[0x2]
-            + Op.SWAP1
-            + Op.JUMPI(pc=0x7B5, condition=Op.LT(Op.DUP2, 0x100))
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH2[0x104]
-            + Op.SLOAD(key=Op.DUP1)
-            + Op.PUSH1[0x0]
-            + Op.SSTORE(key=Op.DUP4, value=Op.DUP1)
-            + Op.SWAP2
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.MSTORE
-            + Op.PUSH32[
-                0x4C0BE60200FAA20559308CB7B5A1BB3255C16CB1CAB91F525B5AE7A03D02FABE  # noqa: E501
-            ]
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.ADD
-            + Op.SWAP1
-            + Op.JUMPDEST
-            + Op.JUMPI(pc=0x27F, condition=Op.ISZERO(Op.GT(Op.DUP3, Op.DUP1)))
-            + Op.SSTORE(key=Op.DUP2, value=0x0)
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.JUMP(pc=0x840)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.DUP3
-            + Op.MSTORE
-            + Op.JUMPI(
-                pc=0x8A6,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.EQ(
-                            Op.SLOAD(key=Op.ADD),
-                            Op.SHA3(offset=Op.DUP3, size=0x20),
-                        ),
-                    ),
-                ),
-            )
-            + Op.PUSH2[0x104]
-            + Op.SLOAD(key=Op.DUP1)
-            + Op.PUSH2[0x103]
-            + Op.SWAP2
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.DUP5
-            + Op.SWAP1
-            + Op.DUP2
-            + Op.JUMPI(pc=0x87C, condition=Op.LT)
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.PUSH1[0x0]
-            + Op.SWAP2
-            + Op.DUP3
-            + Op.MSTORE
-            + Op.PUSH1[0x20]
-            + Op.SHA3(offset=Op.DUP4, size=Op.DUP1)
-            + Op.SWAP1
-            + Op.SWAP2
-            + Op.MSTORE(offset=Op.DUP4, value=Op.SLOAD(key=Op.ADD))
-            + Op.DUP3
-            + Op.ADD
-            + Op.SWAP3
-            + Op.SWAP1
-            + Op.SWAP3
-            + Op.MSTORE
-            + Op.PUSH1[0x40]
-            + Op.SHA3(offset=Op.DUP2, size=Op.ADD)
-            + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
-            + Op.ADD(Op.DUP2, 0x1)
-            + Op.DUP3
-            + Op.SWAP1
-            + Op.SSTORE
-            + Op.SSTORE(key=Op.ADD, value=0x2)
-            + Op.JUMPDEST
-            + Op.PUSH1[0x1]
-            + Op.ADD
-            + Op.JUMP(pc=0x2E0)
-        ),
+                Op.SLOAD(key=Op.DUP3),
+            ),
+        )
+        + Op.ADD(Op.DUP4, 0x1)
+        + Op.OR(Op.DUP3, Op.SLOAD(key=Op.DUP1))
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.JUMPDEST
+        + Op.POP * 4
+        + Op.SWAP2
+        + Op.SWAP1
+        + Op.POP
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP7)
+        + Op.MSTORE(offset=0x20, value=0x103)
+        + Op.SHA3(offset=Op.DUP2, size=0x40)
+        + Op.SLOAD(key=Op.DUP1)
+        + Op.SWAP1
+        + Op.SWAP5
+        + Op.POP
+        + Op.SWAP1
+        + Op.SWAP3
+        + Op.POP
+        + Op.DUP3
+        + Op.JUMPI(pc=0x61A, condition=Op.ISZERO(Op.EQ))
+        + Op.SSTORE(key=Op.DUP4, value=Op.SLOAD(key=Op.DUP2))
+        + Op.PUSH1[0x1]
+        + Op.ADD(Op.DUP2, Op.DUP4)
+        + Op.DUP4
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.PUSH2[0x104]
+        + Op.SLOAD(key=Op.DUP1)
+        + Op.SWAP2
+        + Op.DUP3
+        + Op.ADD
+        + Op.SSTORE(key=Op.DUP3, value=Op.DUP1)
+        + Op.DUP3
+        + Op.ISZERO(Op.DUP1)
+        + Op.DUP3
+        + Op.SWAP1
+        + Op.JUMPI(pc=0x6A6, condition=Op.GT)
+        + Op.MSTORE(offset=Op.DUP7, value=Op.DUP3)
+        + Op.PUSH32[
+            0x4C0BE60200FAA20559308CB7B5A1BB3255C16CB1CAB91F525B5AE7A03D02FABE
+        ]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.ADD
+        + Op.SWAP1
+        + Op.DUP3
+        + Op.ADD
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x6A4, condition=Op.ISZERO(Op.GT(Op.DUP3, Op.DUP1)))
+        + Op.SSTORE(key=Op.DUP2, value=0x0)
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.JUMP(pc=0x5F9)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.DUP3
+        + Op.MSTORE
+        + Op.PUSH1[0x20]
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.SSTORE(key=Op.ADD, value=Op.SHA3)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.SLOAD(key=Op.ADD(Op.DUP3, 0x1))
+        + Op.PUSH1[0x2]
+        + Op.DUP5
+        + Op.SWAP1
+        + Op.EXP
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.JUMPI(pc=0x586, condition=Op.ISZERO(Op.EQ(0x0, Op.AND)))
+        + Op.AND(Op.CALLER, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+        + Op.PUSH1[0x40]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.MSTORE
+        + Op.PUSH1[0x60]
+        + Op.DUP8
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.PUSH32[
+            0xE1C52DC63B719ADE82E8BEA94CC41A0D5D28E4AAF536ADB5E9CCCC9FF8C1AEDA
+        ]
+        + Op.SWAP1
+        + Op.DUP1
+        + Op.LOG1
+        + Op.SLOAD(key=Op.DUP3)
+        + Op.PUSH1[0x1]
+        + Op.SWAP1
+        + Op.JUMPI(pc=0x555, condition=Op.ISZERO(Op.ISZERO(Op.GT)))
+        + Op.PUSH1[0x0]
+        + Op.MSTORE(offset=Op.DUP2, value=Op.DUP7)
+        + Op.MSTORE(offset=0x20, value=0x103)
+        + Op.PUSH2[0x104]
+        + Op.SLOAD(key=Op.DUP1)
+        + Op.PUSH1[0x40]
+        + Op.SWAP1
+        + Op.SWAP3
+        + Op.SLOAD(key=Op.ADD(0x2, Op.SHA3))
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.DUP2
+        + Op.JUMPI(pc=0x6C0, condition=Op.LT)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.JUMPDEST
+        + Op.POP * 3
+        + Op.ADD(Op.DUP5, 0x2)
+        + Op.DUP2
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.PUSH2[0x104]
+        + Op.SLOAD(key=Op.DUP1)
+        + Op.DUP9
+        + Op.SWAP3
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.JUMPI(pc=0x60D, condition=Op.LT)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.DUP3
+        + Op.MSTORE
+        + Op.PUSH1[0x20]
+        + Op.SHA3(offset=Op.DUP4, size=Op.DUP1)
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.ADD
+        + Op.DUP3
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.MSTORE(offset=Op.DUP3, value=Op.DUP8)
+        + Op.PUSH2[0x103]
+        + Op.SWAP1
+        + Op.MSTORE
+        + Op.SHA3(offset=Op.DUP2, size=0x40)
+        + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
+        + Op.PUSH1[0x1]
+        + Op.ADD(Op.DUP2, Op.DUP2)
+        + Op.DUP4
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.PUSH1[0x2]
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.ADD
+        + Op.SWAP2
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.SSTORE
+        + Op.SWAP5
+        + Op.POP
+        + Op.JUMP(pc=0x586)
+        + Op.JUMPDEST
+        + Op.POP
+        + Op.SWAP1
+        + Op.JUMP
+        + Op.JUMPDEST
+        + Op.EQ(0x0, Op.SLOAD(key=Op.ADD))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x760, condition=Op.ISZERO)
+        + Op.PUSH1[0x1]
+        + Op.ADD(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
+            Op.SLOAD(key=Op.DUP1),
+        )
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.JUMPDEST
+        + Op.GT(Op.SLOAD(key=Op.DUP1), 0x1)
+        + Op.JUMPI(pc=0x701, condition=Op.ISZERO(Op.DUP1))
+        + Op.POP
+        + Op.SLOAD(key=0x1)
+        + Op.PUSH1[0x2]
+        + Op.SWAP1
+        + Op.JUMPI(pc=0x6FB, condition=Op.LT(Op.DUP2, 0x100))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.ISZERO(Op.EQ(0x0, Op.SLOAD(key=Op.ADD)))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x72F, condition=Op.ISZERO)
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.JUMP(pc=0x3DB)
+        + Op.JUMPDEST
+        + Op.LT(Op.DUP2, Op.SLOAD(key=0x1))
+        + Op.JUMPI(pc=0x784, condition=Op.ISZERO(Op.DUP1))
+        + Op.POP
+        + Op.SLOAD(key=0x1)
+        + Op.PUSH1[0x2]
+        + Op.SWAP1
+        + Op.JUMPI(pc=0x77D, condition=Op.LT(Op.DUP2, 0x100))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.ISZERO(Op.EQ(0x0, Op.SLOAD(key=Op.ADD)))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x79F, condition=Op.ISZERO(Op.DUP1))
+        + Op.POP
+        + Op.PUSH1[0x2]
+        + Op.DUP2
+        + Op.JUMPI(pc=0x799, condition=Op.LT(Op.DUP2, 0x100))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.EQ(0x0, Op.SLOAD(key=Op.ADD))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x7B8, condition=Op.ISZERO)
+        + Op.SLOAD(key=0x1)
+        + Op.PUSH1[0x2]
+        + Op.SWAP1
+        + Op.JUMPI(pc=0x7BD, condition=Op.LT(Op.DUP2, 0x100))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.ADD
+        + Op.SSTORE
+        + Op.JUMPDEST
+        + Op.JUMP(pc=0x3D0)
+        + Op.JUMPDEST
+        + Op.SLOAD(key=Op.ADD)
+        + Op.PUSH1[0x2]
+        + Op.DUP3
+        + Op.JUMPI(pc=0x7CD, condition=Op.LT(Op.DUP2, 0x100))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.ADD
+        + Op.SSTORE
+        + Op.DUP1
+        + Op.PUSH2[0x102]
+        + Op.PUSH1[0x0]
+        + Op.PUSH1[0x2]
+        + Op.DUP4
+        + Op.JUMPI(pc=0x7E3, condition=Op.LT(Op.DUP2, 0x100))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=Op.DUP2, value=Op.SLOAD(key=Op.ADD))
+        + Op.ADD(Op.DUP2, 0x20)
+        + Op.SWAP2
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.MSTORE
+        + Op.PUSH1[0x40]
+        + Op.ADD
+        + Op.PUSH1[0x0]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.SHA3
+        + Op.SWAP2
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.SSTORE
+        + Op.SLOAD(key=0x1)
+        + Op.PUSH1[0x2]
+        + Op.SWAP1
+        + Op.JUMPI(pc=0x7B5, condition=Op.LT(Op.DUP2, 0x100))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH2[0x104]
+        + Op.SLOAD(key=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.SSTORE(key=Op.DUP4, value=Op.DUP1)
+        + Op.SWAP2
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.MSTORE
+        + Op.PUSH32[
+            0x4C0BE60200FAA20559308CB7B5A1BB3255C16CB1CAB91F525B5AE7A03D02FABE
+        ]
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.ADD
+        + Op.SWAP1
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x27F, condition=Op.ISZERO(Op.GT(Op.DUP3, Op.DUP1)))
+        + Op.SSTORE(key=Op.DUP2, value=0x0)
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.JUMP(pc=0x840)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.DUP3
+        + Op.MSTORE
+        + Op.JUMPI(
+            pc=0x8A6,
+            condition=Op.ISZERO(
+                Op.ISZERO(
+                    Op.EQ(
+                        Op.SLOAD(key=Op.ADD),
+                        Op.SHA3(offset=Op.DUP3, size=0x20),
+                    )
+                )
+            ),
+        )
+        + Op.PUSH2[0x104]
+        + Op.SLOAD(key=Op.DUP1)
+        + Op.PUSH2[0x103]
+        + Op.SWAP2
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.DUP5
+        + Op.SWAP1
+        + Op.DUP2
+        + Op.JUMPI(pc=0x87C, condition=Op.LT)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SWAP2
+        + Op.DUP3
+        + Op.MSTORE
+        + Op.PUSH1[0x20]
+        + Op.SHA3(offset=Op.DUP4, size=Op.DUP1)
+        + Op.SWAP1
+        + Op.SWAP2
+        + Op.MSTORE(offset=Op.DUP4, value=Op.SLOAD(key=Op.ADD))
+        + Op.DUP3
+        + Op.ADD
+        + Op.SWAP3
+        + Op.SWAP1
+        + Op.SWAP3
+        + Op.MSTORE
+        + Op.PUSH1[0x40]
+        + Op.SHA3(offset=Op.DUP2, size=Op.ADD)
+        + Op.SSTORE(key=Op.DUP2, value=Op.DUP2)
+        + Op.ADD(Op.DUP2, 0x1)
+        + Op.DUP3
+        + Op.SWAP1
+        + Op.SSTORE
+        + Op.SSTORE(key=Op.ADD, value=0x2)
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.JUMP(pc=0x2E0),
         storage={
-            0x0: 0x1,
-            0x1: 0x2,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x4: 0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
-            0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 0x2,  # noqa: E501
+            0: 1,
+            1: 2,
+            3: sender,
+            4: 0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
+            0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 2,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "173825d9000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"  # noqa: E501
-        ),
+        to=contract_0,
+        data=Bytes("173825d9") + Hash(sender, left_padding=True),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
                 3: 0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
                 0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "7c01000000000000000000000000000000000000000000000000000000006000350463173825d981146100655780632f54bf6e146100b75780637065cb48146100e8578063b75c7dc614610105578063ba51a6df14610142578063f00d4b5d1461015f57005b6101816004356000604060003680828437909120905061046d815b73ffffffffffffffffffffffffffffffffffffffff3316600090815261010260205260408120548180808381141561058f57610586565b6101876004355b73ffffffffffffffffffffffffffffffffffffffff16600090815261010260205260408120541190565b610181600435604060003680828437909120905061037c81610080565b61018160043573ffffffffffffffffffffffffffffffffffffffff3316600090815261010260205260408120549080808381141561019157610213565b610181600435604060003680828437909120905061053381610080565b6101816004356024356000604060003680828437909120905061028681610080565b60006000f35b8060005260206000f35b5050506000828152610103602052604081206001810154600284900a929083168190111561021357815460018084018054919092018455849003905573ffffffffffffffffffffffffffffffffffffffff3316604090815260608690527fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b9080a15b5050505050565b015573ffffffffffffffffffffffffffffffffffffffff84811660008181526101026020526040808220829055928616808252908390208590559082526060527fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c9080a15b505b505050565b1561027f57610294836100be565b1561029f5750610281565b73ffffffffffffffffffffffffffffffffffffffff84166000908152610102602052604081205492508214156102d55750610281565b6102f75b6101045460005b8181101561080c5761010480548290811061085457005b73ffffffffffffffffffffffffffffffffffffffff8316600283610100811061021a57005b015560015473ffffffffffffffffffffffffffffffffffffffff831660008181526101026020908152604091829020939093559081527f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c39190a15b505b50565b156103775761038a826100be565b156103955750610379565b61039d6102d9565b60015460fa901015156103b4576103b26103cb565b505b60015460fa901015156103f55750610379565b6104255b600060015b6001548110156106f7575b600154811080156107535750600281610100811061074c57005b6001805481019081905573ffffffffffffffffffffffffffffffffffffffff831690600290610100811061031c57005b5073ffffffffffffffffffffffffffffffffffffffff831660409081527f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da90602090a1505050565b156102815773ffffffffffffffffffffffffffffffffffffffff83166000908152610102602052604081205492508214156104a85750610377565b60016001600050540360006000505411156104c35750610377565b600060028361010081106104d357005b015573ffffffffffffffffffffffffffffffffffffffff8316600090815261010260205260408120556103c76102d9565b60408281527facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da90602090a15050565b15610377576001548211156105485750610379565b60008290556105046102d9565b82547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff018355600183018054821790555b50505050919050565b600086815261010360205260408120805490945090925082141561061a5781548355600183810183905561010480549182018082558280158290116106a6578286527f4c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe9081019082015b808211156106a457600081556001016105f9565b6000918252602090912001555b506001820154600284900a908116600014156105865773ffffffffffffffffffffffffffffffffffffffff3316604090815260608790527fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda9080a182546001901115156105555760008681526101036020526101048054604090922060020154909181106106c057005b505b505050600284018190556101048054889290811061060d57005b6000918252602080832090910182905587825261010390526040812081815560018181018390556002909101919091559450610586565b5090565b01546000145b1561076057600180547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0190555b60018054118015610701575060015460029061010081106106fb57005b0154600014155b1561072f576001016103db565b600154811080156107845750600154600290610100811061077d57005b0154600014155b801561079f5750600281610100811061079957005b01546000145b156107b85760015460029061010081106107bd57005b01555b6103d0565b015460028261010081106107cd57005b015580610102600060028361010081106107e357005b01548152602081019190915260400160009081209190915560015460029061010081106107b557005b61010480546000808355919091527f4c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe908101905b8082111561027f5760008155600101610840565b60009182526020822001541415156108a6576101048054610103916000918490811061087c57005b60009182526020808320909101548352820192909252604001812081815560018101829055600201555b6001016102e056"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
+        sender: Account(storage={}, nonce=2),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_remove_owner_by_non_owner.py b/tests/ported_static/stWalletTest/test_multi_owned_remove_owner_by_non_owner.py
index 50ee86a0b56..646b72dc0d8 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_remove_owner_by_non_owner.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_remove_owner_by_non_owner.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_multi_owned_remove_owner_by_non_owner.
 
 Ported from:
-tests/static/state_tests/stWalletTest
-multiOwnedRemoveOwnerByNonOwnerFiller.json
+state_tests/stWalletTest/multiOwnedRemoveOwnerByNonOwnerFiller.json
 """
 
 import pytest
@@ -12,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/multiOwnedRemoveOwnerByNonOwnerFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/multiOwnedRemoveOwnerByNonOwnerFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,12 +31,13 @@ def test_multi_owned_remove_owner_by_non_owner(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_multi_owned_remove_owner_by_non_owner."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
+    contract_1 = Address(0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0xA95DEFE70EBEA7804F9C3BE42D20D24375E2A92B9D9666B832069C5F3CD423DD
     )
-    callee = Address("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,107 +49,56 @@ def test_multi_owned_remove_owner_by_non_owner(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf"  # noqa: E501
-            "6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c91711461"  # noqa: E501
-            "0136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a357"  # noqa: E501
-            "8063f00d4b5d146101e3575b005b61007760043560006000364360405180848480828437"  # noqa: E501
-            "5050509091019081526040519081900360200190209050610529815b600160a060020a03"  # noqa: E501
-            "3316600090815261010260205260408120548180808381141561066f57610806565b6102"  # noqa: E501
-            "1c6004355b600160a060020a0316600090815261010260205260408120541190565b6102"  # noqa: E501
-            "1c60015481565b6100776004356000364360405180848480828437505050909101908152"  # noqa: E501
-            "60405190819003602001902090506104a1816100ab565b61021c60005481565b61007760"  # noqa: E501
-            "0435600160a060020a033316600090815261010260205260408120549080808381141561"  # noqa: E501
-            "022e576102b0565b61007760043560003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506105e8816100ab565b61021c600435602435600082"  # noqa: E501
-            "815261010360209081526040808320600160a060020a0385168452610102909252822054"  # noqa: E501
-            "8290818181141561064157610665565b6100776004356024356000600036436040518084"  # noqa: E501
-            "8480828437505050909101908152604051908190036020019020905061033a816100ab56"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156102b05781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "61033357610348836100dc565b156103535750610335565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561037c5750610335565b6102b75b610104"  # noqa: E501
-            "5460005b818110156107b557610104805482908110156100025760009182526000805160"  # noqa: E501
-            "206108ea8339815191520154146103fa5761010480546101039160009184908110156100"  # noqa: E501
-            "02576000805160206108ea83398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610387565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa"  # noqa: E501
-            "90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a6"  # noqa: E501
-            "5b600060015b6001548110156107ef575b6001548110801561051c575060028161010081"  # noqa: E501
-            "1015610002570154600014155b1561080f576001016104fc565b1561033557600160a060"  # noqa: E501
-            "020a038316600090815261010260205260408120549250821415610557575061049c565b"  # noqa: E501
-            "6001600160005054036000600050541115610572575061049c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "04e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561049c576001548211156105fd575061049e565b600082905561060a610380565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106605760009450610665565b600194505b5050505092915050565b6000868152610103"  # noqa: E501
-            "6020526040812080549094509092508214156106f8578154835560018381018390556101"  # noqa: E501
-            "0480549182018082558280158290116106c7578183600052602060002091820191016106"  # noqa: E501
-            "c791906107db565b50505060028401819055610104805488929081101561000257600091"  # noqa: E501
-            "9091526000805160206108ea83398151915201555b506001820154600284900a90811660"  # noqa: E501
-            "0014156108065760408051600160a060020a03331681526020810188905281517fe1c52d"  # noqa: E501
-            "c63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda92918190039091"  # noqa: E501
-            "0190a18254600190116107f3576000868152610103602052604090206002015461010480"  # noqa: E501
-            "5490919081101561000257604060009081206000805160206108ea833981519152929092"  # noqa: E501
-            "01819055808255600180830182905560029092015595506108069050565b610104805460"  # noqa: E501
-            "0080835591909152610335906000805160206108ea833981519152908101905b80821115"  # noqa: E501
-            "6107ef57600081556001016107db565b5090565b82546000190183556001830180548217"  # noqa: E501
-            "90555b50505050919050565b5b6001805411801561083257506001546002906101008110"  # noqa: E501
-            "156100025701546000145b156108465760018054600019019055610810565b6001548110"  # noqa: E501
-            "80156108695750600154600290610100811015610002570154600014155b801561088357"  # noqa: E501
-            "506002816101008110156100025701546000145b156108e4576001546002906101008110"  # noqa: E501
-            "156100025781015490826101008110156100025781019190915581906101029060009083"  # noqa: E501
-            "610100811015610002578101548252602092909252604081209290925560015461010081"  # noqa: E501
-            "10156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab9"  # noqa: E501
-            "1f525b5ae7a03d02fabe"
+            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: contract_1,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
+    )
+    # Source: hex
+    # 0x
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=0xDE0B6B3A75EF08F,
+        nonce=1,
+        address=Address(0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
-    pre[callee] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "173825d9000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"  # noqa: E501
-        ),
+        to=contract_0,
+        data=Bytes("173825d9") + Hash(contract_1, left_padding=True),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, code=b"", nonce=2),
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: contract_1,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
+        contract_1: Account(storage={}, nonce=1),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_remove_owner_my_self.py b/tests/ported_static/stWalletTest/test_multi_owned_remove_owner_my_self.py
index 99355109ee0..c71db42578f 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_remove_owner_my_self.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_remove_owner_my_self.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_multi_owned_remove_owner_my_self.
 
 Ported from:
-tests/static/state_tests/stWalletTest/multiOwnedRemoveOwner_mySelfFiller.json
+state_tests/stWalletTest/multiOwnedRemoveOwner_mySelfFiller.json
 """
 
 import pytest
@@ -11,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -21,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/multiOwnedRemoveOwner_mySelfFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/multiOwnedRemoveOwner_mySelfFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,8 +31,9 @@ def test_multi_owned_remove_owner_my_self(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_multi_owned_remove_owner_my_self."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -46,108 +47,49 @@ def test_multi_owned_remove_owner_my_self(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
+    # Source: raw
+    # 0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf"  # noqa: E501
-            "6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c91711461"  # noqa: E501
-            "0136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a357"  # noqa: E501
-            "8063f00d4b5d146101e3575b005b61007760043560006000364360405180848480828437"  # noqa: E501
-            "5050509091019081526040519081900360200190209050610529815b600160a060020a03"  # noqa: E501
-            "3316600090815261010260205260408120548180808381141561066f57610806565b6102"  # noqa: E501
-            "1c6004355b600160a060020a0316600090815261010260205260408120541190565b6102"  # noqa: E501
-            "1c60015481565b6100776004356000364360405180848480828437505050909101908152"  # noqa: E501
-            "60405190819003602001902090506104a1816100ab565b61021c60005481565b61007760"  # noqa: E501
-            "0435600160a060020a033316600090815261010260205260408120549080808381141561"  # noqa: E501
-            "022e576102b0565b61007760043560003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506105e8816100ab565b61021c600435602435600082"  # noqa: E501
-            "815261010360209081526040808320600160a060020a0385168452610102909252822054"  # noqa: E501
-            "8290818181141561064157610665565b6100776004356024356000600036436040518084"  # noqa: E501
-            "8480828437505050909101908152604051908190036020019020905061033a816100ab56"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156102b05781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "61033357610348836100dc565b156103535750610335565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561037c5750610335565b6102b75b610104"  # noqa: E501
-            "5460005b818110156107b557610104805482908110156100025760009182526000805160"  # noqa: E501
-            "206108ea8339815191520154146103fa5761010480546101039160009184908110156100"  # noqa: E501
-            "02576000805160206108ea83398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610387565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa"  # noqa: E501
-            "90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a6"  # noqa: E501
-            "5b600060015b6001548110156107ef575b6001548110801561051c575060028161010081"  # noqa: E501
-            "1015610002570154600014155b1561080f576001016104fc565b1561033557600160a060"  # noqa: E501
-            "020a038316600090815261010260205260408120549250821415610557575061049c565b"  # noqa: E501
-            "6001600160005054036000600050541115610572575061049c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "04e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561049c576001548211156105fd575061049e565b600082905561060a610380565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106605760009450610665565b600194505b5050505092915050565b6000868152610103"  # noqa: E501
-            "6020526040812080549094509092508214156106f8578154835560018381018390556101"  # noqa: E501
-            "0480549182018082558280158290116106c7578183600052602060002091820191016106"  # noqa: E501
-            "c791906107db565b50505060028401819055610104805488929081101561000257600091"  # noqa: E501
-            "9091526000805160206108ea83398151915201555b506001820154600284900a90811660"  # noqa: E501
-            "0014156108065760408051600160a060020a03331681526020810188905281517fe1c52d"  # noqa: E501
-            "c63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda92918190039091"  # noqa: E501
-            "0190a18254600190116107f3576000868152610103602052604090206002015461010480"  # noqa: E501
-            "5490919081101561000257604060009081206000805160206108ea833981519152929092"  # noqa: E501
-            "01819055808255600180830182905560029092015595506108069050565b610104805460"  # noqa: E501
-            "0080835591909152610335906000805160206108ea833981519152908101905b80821115"  # noqa: E501
-            "6107ef57600081556001016107db565b5090565b82546000190183556001830180548217"  # noqa: E501
-            "90555b50505050919050565b5b6001805411801561083257506001546002906101008110"  # noqa: E501
-            "156100025701546000145b156108465760018054600019019055610810565b6001548110"  # noqa: E501
-            "80156108695750600154600290610100811015610002570154600014155b801561088357"  # noqa: E501
-            "506002816101008110156100025701546000145b156108e4576001546002906101008110"  # noqa: E501
-            "156100025781015490826101008110156100025781019190915581906101029060009083"  # noqa: E501
-            "610100811015610002578101548252602092909252604081209290925560015461010081"  # noqa: E501
-            "10156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab9"  # noqa: E501
-            "1f525b5ae7a03d02fabe"
+            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "173825d9000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"  # noqa: E501
-        ),
+        to=contract_0,
+        data=Bytes("173825d9") + Hash(sender, left_padding=True),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 260: 1,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
+        sender: Account(storage={}, nonce=2),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_remove_owner_owner_is_not_owner.py b/tests/ported_static/stWalletTest/test_multi_owned_remove_owner_owner_is_not_owner.py
index d5ca6d36f1d..1462457ee5d 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_remove_owner_owner_is_not_owner.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_remove_owner_owner_is_not_owner.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_multi_owned_remove_owner_owner_is_not_owner.
 
 Ported from:
-tests/static/state_tests/stWalletTest
-multiOwnedRemoveOwner_ownerIsNotOwnerFiller.json
+state_tests/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwnerFiller.json
 """
 
 import pytest
@@ -12,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -23,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwnerFiller.json",  # noqa: E501
+        "state_tests/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwnerFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -32,8 +33,9 @@ def test_multi_owned_remove_owner_owner_is_not_owner(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_multi_owned_remove_owner_owner_is_not_owner."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -47,108 +49,50 @@ def test_multi_owned_remove_owner_owner_is_not_owner(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
+    # Source: raw
+    # 0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf"  # noqa: E501
-            "6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c91711461"  # noqa: E501
-            "0136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a357"  # noqa: E501
-            "8063f00d4b5d146101e3575b005b61007760043560006000364360405180848480828437"  # noqa: E501
-            "5050509091019081526040519081900360200190209050610529815b600160a060020a03"  # noqa: E501
-            "3316600090815261010260205260408120548180808381141561066f57610806565b6102"  # noqa: E501
-            "1c6004355b600160a060020a0316600090815261010260205260408120541190565b6102"  # noqa: E501
-            "1c60015481565b6100776004356000364360405180848480828437505050909101908152"  # noqa: E501
-            "60405190819003602001902090506104a1816100ab565b61021c60005481565b61007760"  # noqa: E501
-            "0435600160a060020a033316600090815261010260205260408120549080808381141561"  # noqa: E501
-            "022e576102b0565b61007760043560003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506105e8816100ab565b61021c600435602435600082"  # noqa: E501
-            "815261010360209081526040808320600160a060020a0385168452610102909252822054"  # noqa: E501
-            "8290818181141561064157610665565b6100776004356024356000600036436040518084"  # noqa: E501
-            "8480828437505050909101908152604051908190036020019020905061033a816100ab56"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156102b05781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "61033357610348836100dc565b156103535750610335565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561037c5750610335565b6102b75b610104"  # noqa: E501
-            "5460005b818110156107b557610104805482908110156100025760009182526000805160"  # noqa: E501
-            "206108ea8339815191520154146103fa5761010480546101039160009184908110156100"  # noqa: E501
-            "02576000805160206108ea83398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610387565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa"  # noqa: E501
-            "90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a6"  # noqa: E501
-            "5b600060015b6001548110156107ef575b6001548110801561051c575060028161010081"  # noqa: E501
-            "1015610002570154600014155b1561080f576001016104fc565b1561033557600160a060"  # noqa: E501
-            "020a038316600090815261010260205260408120549250821415610557575061049c565b"  # noqa: E501
-            "6001600160005054036000600050541115610572575061049c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "04e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561049c576001548211156105fd575061049e565b600082905561060a610380565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106605760009450610665565b600194505b5050505092915050565b6000868152610103"  # noqa: E501
-            "6020526040812080549094509092508214156106f8578154835560018381018390556101"  # noqa: E501
-            "0480549182018082558280158290116106c7578183600052602060002091820191016106"  # noqa: E501
-            "c791906107db565b50505060028401819055610104805488929081101561000257600091"  # noqa: E501
-            "9091526000805160206108ea83398151915201555b506001820154600284900a90811660"  # noqa: E501
-            "0014156108065760408051600160a060020a03331681526020810188905281517fe1c52d"  # noqa: E501
-            "c63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda92918190039091"  # noqa: E501
-            "0190a18254600190116107f3576000868152610103602052604090206002015461010480"  # noqa: E501
-            "5490919081101561000257604060009081206000805160206108ea833981519152929092"  # noqa: E501
-            "01819055808255600180830182905560029092015595506108069050565b610104805460"  # noqa: E501
-            "0080835591909152610335906000805160206108ea833981519152908101905b80821115"  # noqa: E501
-            "6107ef57600081556001016107db565b5090565b82546000190183556001830180548217"  # noqa: E501
-            "90555b50505050919050565b5b6001805411801561083257506001546002906101008110"  # noqa: E501
-            "156100025701546000145b156108465760018054600019019055610810565b6001548110"  # noqa: E501
-            "80156108695750600154600290610100811015610002570154600014155b801561088357"  # noqa: E501
-            "506002816101008110156100025701546000145b156108e4576001546002906101008110"  # noqa: E501
-            "156100025781015490826101008110156100025781019190915581906101029060009083"  # noqa: E501
-            "610100811015610002578101548252602092909252604081209290925560015461010081"  # noqa: E501
-            "10156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab9"  # noqa: E501
-            "1f525b5ae7a03d02fabe"
+            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "173825d9000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa"  # noqa: E501
-        ),
+        to=contract_0,
+        data=Bytes("173825d9")
+        + Hash(0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 260: 1,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
+        sender: Account(storage={}, nonce=2),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_multi_owned_revoke_nothing.py b/tests/ported_static/stWalletTest/test_multi_owned_revoke_nothing.py
index 9f80885a320..35e97313538 100644
--- a/tests/ported_static/stWalletTest/test_multi_owned_revoke_nothing.py
+++ b/tests/ported_static/stWalletTest/test_multi_owned_revoke_nothing.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_multi_owned_revoke_nothing.
 
 Ported from:
-tests/static/state_tests/stWalletTest/multiOwnedRevokeNothingFiller.json
+state_tests/stWalletTest/multiOwnedRevokeNothingFiller.json
 """
 
 import pytest
@@ -11,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -21,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/multiOwnedRevokeNothingFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/multiOwnedRevokeNothingFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,8 +31,9 @@ def test_multi_owned_revoke_nothing(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_multi_owned_revoke_nothing."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -46,107 +47,51 @@ def test_multi_owned_revoke_nothing(
         gas_limit=100000000,
     )
 
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
+    # Source: raw
+    # 0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf"  # noqa: E501
-            "6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c91711461"  # noqa: E501
-            "0136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a357"  # noqa: E501
-            "8063f00d4b5d146101e3575b005b61007760043560006000364360405180848480828437"  # noqa: E501
-            "5050509091019081526040519081900360200190209050610529815b600160a060020a03"  # noqa: E501
-            "3316600090815261010260205260408120548180808381141561066f57610806565b6102"  # noqa: E501
-            "1c6004355b600160a060020a0316600090815261010260205260408120541190565b6102"  # noqa: E501
-            "1c60015481565b6100776004356000364360405180848480828437505050909101908152"  # noqa: E501
-            "60405190819003602001902090506104a1816100ab565b61021c60005481565b61007760"  # noqa: E501
-            "0435600160a060020a033316600090815261010260205260408120549080808381141561"  # noqa: E501
-            "022e576102b0565b61007760043560003643604051808484808284375050509091019081"  # noqa: E501
-            "5260405190819003602001902090506105e8816100ab565b61021c600435602435600082"  # noqa: E501
-            "815261010360209081526040808320600160a060020a0385168452610102909252822054"  # noqa: E501
-            "8290818181141561064157610665565b6100776004356024356000600036436040518084"  # noqa: E501
-            "8480828437505050909101908152604051908190036020019020905061033a816100ab56"  # noqa: E501
-            "5b60408051918252519081900360200190f35b5050506000828152610103602052604081"  # noqa: E501
-            "206001810154600284900a92908316819011156102b05781546001838101805492909101"  # noqa: E501
-            "845590849003905560408051600160a060020a03331681526020810187905281517fc7fb"  # noqa: E501
-            "647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390"  # noqa: E501
-            "910190a15b5050505050565b600160a060020a0383166002836101008110156100025701"  # noqa: E501
-            "55600160a060020a03848116600081815261010260209081526040808320839055938716"  # noqa: E501
-            "80835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08b"  # noqa: E501
-            "f9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b15"  # noqa: E501
-            "61033357610348836100dc565b156103535750610335565b600160a060020a0384166000"  # noqa: E501
-            "9081526101026020526040812054925082141561037c5750610335565b6102b75b610104"  # noqa: E501
-            "5460005b818110156107b557610104805482908110156100025760009182526000805160"  # noqa: E501
-            "206108ea8339815191520154146103fa5761010480546101039160009184908110156100"  # noqa: E501
-            "02576000805160206108ea83398151915201548252506020919091526040812081815560"  # noqa: E501
-            "018101829055600201555b600101610387565b60018054810190819055600160a060020a"  # noqa: E501
-            "038316906002906101008110156100025790900160005081905550600160005054610102"  # noqa: E501
-            "600050600084600160a060020a0316815260200190815260200160002060005081905550"  # noqa: E501
-            "7f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040"  # noqa: E501
-            "518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561"  # noqa: E501
-            "049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa"  # noqa: E501
-            "90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a6"  # noqa: E501
-            "5b600060015b6001548110156107ef575b6001548110801561051c575060028161010081"  # noqa: E501
-            "1015610002570154600014155b1561080f576001016104fc565b1561033557600160a060"  # noqa: E501
-            "020a038316600090815261010260205260408120549250821415610557575061049c565b"  # noqa: E501
-            "6001600160005054036000600050541115610572575061049c565b600060028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0384168152610102602052604081205561"  # noqa: E501
-            "04e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943"  # noqa: E501
-            "d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a150505056"  # noqa: E501
-            "5b1561049c576001548211156105fd575061049e565b600082905561060a610380565b60"  # noqa: E501
-            "40805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0"  # noqa: E501
-            "dad4f550da9181900360200190a15050565b506001830154600282900a90811660001415"  # noqa: E501
-            "6106605760009450610665565b600194505b5050505092915050565b6000868152610103"  # noqa: E501
-            "6020526040812080549094509092508214156106f8578154835560018381018390556101"  # noqa: E501
-            "0480549182018082558280158290116106c7578183600052602060002091820191016106"  # noqa: E501
-            "c791906107db565b50505060028401819055610104805488929081101561000257600091"  # noqa: E501
-            "9091526000805160206108ea83398151915201555b506001820154600284900a90811660"  # noqa: E501
-            "0014156108065760408051600160a060020a03331681526020810188905281517fe1c52d"  # noqa: E501
-            "c63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda92918190039091"  # noqa: E501
-            "0190a18254600190116107f3576000868152610103602052604090206002015461010480"  # noqa: E501
-            "5490919081101561000257604060009081206000805160206108ea833981519152929092"  # noqa: E501
-            "01819055808255600180830182905560029092015595506108069050565b610104805460"  # noqa: E501
-            "0080835591909152610335906000805160206108ea833981519152908101905b80821115"  # noqa: E501
-            "6107ef57600081556001016107db565b5090565b82546000190183556001830180548217"  # noqa: E501
-            "90555b50505050919050565b5b6001805411801561083257506001546002906101008110"  # noqa: E501
-            "156100025701546000145b156108465760018054600019019055610810565b6001548110"  # noqa: E501
-            "80156108695750600154600290610100811015610002570154600014155b801561088357"  # noqa: E501
-            "506002816101008110156100025701546000145b156108e4576001546002906101008110"  # noqa: E501
-            "156100025781015490826101008110156100025781019190915581906101029060009083"  # noqa: E501
-            "610100811015610002578101548252602092909252604081209290925560015461010081"  # noqa: E501
-            "10156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab9"  # noqa: E501
-            "1f525b5ae7a03d02fabe"
+            "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),  # noqa: E501
+        address=Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "b75c7dc66e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d"  # noqa: E501
+        to=contract_0,
+        data=Bytes("b75c7dc6")
+        + Hash(
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D
         ),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
+        sender: Account(storage={}, nonce=2),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_wallet_add_owner_remove_pending_transaction.py b/tests/ported_static/stWalletTest/test_wallet_add_owner_remove_pending_transaction.py
index 3cabe4244b6..ac91046d380 100644
--- a/tests/ported_static/stWalletTest/test_wallet_add_owner_remove_pending_transaction.py
+++ b/tests/ported_static/stWalletTest/test_wallet_add_owner_remove_pending_transaction.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_wallet_add_owner_remove_pending_transaction.
 
 Ported from:
-tests/static/state_tests/stWalletTest
-walletAddOwnerRemovePendingTransactionFiller.json
+state_tests/stWalletTest/walletAddOwnerRemovePendingTransactionFiller.json
 """
 
 import pytest
@@ -12,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -23,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stWalletTest/walletAddOwnerRemovePendingTransactionFiller.json",  # noqa: E501
+        "state_tests/stWalletTest/walletAddOwnerRemovePendingTransactionFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -32,12 +33,13 @@ def test_wallet_add_owner_remove_pending_transaction(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_wallet_add_owner_remove_pending_transaction."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D)
     sender = EOA(
         key=0xA95DEFE70EBEA7804F9C3BE42D20D24375E2A92B9D9666B832069C5F3CD423DD
     )
-    callee = Address("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,164 +51,68 @@ def test_wallet_add_owner_remove_pending_transaction(
     )
 
     pre[sender] = Account(balance=0x5AF3107A4000)
-    pre[callee] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: hex
+    # 0x
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=0xDE0B6B3A75EF08F,
+        nonce=1,
+        address=Address(0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf"  # noqa: E501
-            "6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb481461"  # noqa: E501
-            "01c9578063746c9171146101fd578063797af62714610206578063b20d30a91461021957"  # noqa: E501
-            "8063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2"  # noqa: E501
-            "cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d86"  # noqa: E501
-            "1461037f575b61038960003411156101095760408051600160a060020a03331681523460"  # noqa: E501
-            "2082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5c"  # noqa: E501
-            "c9109c929181900390910190a15b565b6103896004356000600036436040518084848082"  # noqa: E501
-            "84375050509091019081526040519081900360200190209050610693815b600160a06002"  # noqa: E501
-            "0a0333166000908152610102602052604081205481808083811415610c1357610d6c565b"  # noqa: E501
-            "61038b6004355b600160a060020a03811660009081526101026020526040812054115b91"  # noqa: E501
-            "9050565b61038b60015481565b6103896000364360405180848480828437505050909101"  # noqa: E501
-            "90815260405190819003602001902090506107e58161013d565b61038960043560003643"  # noqa: E501
-            "60405180848480828437505050909101908152604051908190036020019020905061060b"  # noqa: E501
-            "8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b6103"  # noqa: E501
-            "896004356000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "01902090506107d98161013d565b61038b60048035906024803591604435918201910135"  # noqa: E501
-            "60006108043361016e565b610389600435600160a060020a033316600090815261010260"  # noqa: E501
-            "205260408120549080808381141561039d5761041f565b61038960043560003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209050610752816101"  # noqa: E501
-            "3d565b61038b600435602435600082815261010360209081526040808320600160a06002"  # noqa: E501
-            "0a0385168452610102909252822054829081818114156107ab576107cf565b6103896004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "90506107f38161013d565b61038960043560243560006000364360405180848480828437"  # noqa: E501
-            "50505090910190815260405190819003602001902090506104ac8161013d565b61038b61"  # noqa: E501
-            "01055481565b005b60408051918252519081900360200190f35b50505060008281526101"  # noqa: E501
-            "03602052604081206001810154600284900a929083168190111561041f57815460018381"  # noqa: E501
-            "01805492909101845590849003905560408051600160a060020a03331681526020810187"  # noqa: E501
-            "905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d759173"  # noqa: E501
-            "4b929181900390910190a15b5050505050565b600160a060020a03831660028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0385166000818152610102602090815260"  # noqa: E501
-            "4080832083905584835291829020869055815192835282019290925281517fb532073b38"  # noqa: E501
-            "c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190"  # noqa: E501
-            "a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b6001"  # noqa: E501
-            "60a060020a0384166000908152610102602052604081205492508214156104ee57506104"  # noqa: E501
-            "a7565b6104265b6101045460005b81811015610eba576101048054610108916000918490"  # noqa: E501
-            "81101561000257600080516020610f758339815191520154825250602091825260408120"  # noqa: E501
-            "8054600160a060020a031916815560018101829055600281018054838255908352838320"  # noqa: E501
-            "9193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060"  # noqa: E501
-            "020a03831690600290610100811015610002579090016000508190555060016000505461"  # noqa: E501
-            "0102600050600084600160a060020a031681526020019081526020016000206000508190"  # noqa: E501
-            "55507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c382"  # noqa: E501
-            "6040518082600160a060020a0316815260200191505060405180910390a15b505b50565b"  # noqa: E501
-            "15610606576106198261016e565b156106245750610608565b61062c6104f2565b600154"  # noqa: E501
-            "60fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b61"  # noqa: E501
-            "07105b600060015b600154811015610a47575b6001548110801561068657506002816101"  # noqa: E501
-            "00811015610002570154600014155b15610d7557600101610666565b156104a757600160"  # noqa: E501
-            "a060020a0383166000908152610102602052604081205492508214156106c15750610606"  # noqa: E501
-            "565b60016001600050540360006000505411156106dc5750610606565b60006002836101"  # noqa: E501
-            "0081101561000257508301819055600160a060020a038416815261010260205260408120"  # noqa: E501
-            "556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb"  # noqa: E501
-            "0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a15050"  # noqa: E501
-            "50565b15610606576001548211156107675750610608565b60008290556107746104f256"  # noqa: E501
-            "5b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9b"  # noqa: E501
-            "eaf0dad4f550da9181900360200190a15050565b506001830154600282900a9081166000"  # noqa: E501
-            "14156107ca57600094506107cf565b600194505b5050505092915050565b156106065750"  # noqa: E501
-            "61010555565b156106085760006101065550565b156106065781600160a060020a0316ff"  # noqa: E501
-            "5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa"  # noqa: E501
-            "31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160"  # noqa: E501
-            "a060020a0316815260200185815260200184600160a060020a0316815260200180602001"  # noqa: E501
-            "828103825284848281815260200192508082843782019150509650505050505050604051"  # noqa: E501
-            "80910390a184600160a060020a0316848484604051808383808284375050509081019150"  # noqa: E501
-            "6000908083038185876185025a03f15060009350610a2392505050565b60003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209150610904905081"  # noqa: E501
-            "61020d565b158015610927575060008181526101086020526040812054600160a060020a"  # noqa: E501
-            "0316145b15610a235760008181526101086020908152604082208054600160a060020a03"  # noqa: E501
-            "191688178155600181018790556002018054858255818452928290209092601f01919091"  # noqa: E501
-            "048101908490868215610a2b579182015b82811115610a2b578235826000505591602001"  # noqa: E501
-            "91906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a"  # noqa: E501
-            "7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a06002"  # noqa: E501
-            "0a0316815260200185815260200184600160a060020a0316815260200180602001828103"  # noqa: E501
-            "825284848281815260200192508082843782019150509750505050505050506040518091"  # noqa: E501
-            "0390a15b949350505050565b5061099a9291505b80821115610a47576000815560010161"  # noqa: E501
-            "0a33565b5090565b15610c005760008381526101086020526040812054600160a060020a"  # noqa: E501
-            "031614610c0057604080516000918220805460018201546002929092018054600160a060"  # noqa: E501
-            "020a0392909216949293909291819084908015610acd5782019190600052602060002090"  # noqa: E501
-            "5b815481529060010190602001808311610ab057829003601f168201915b505092505050"  # noqa: E501
-            "60006040518083038185876185025a03f150505060008481526101086020908152604080"  # noqa: E501
-            "5181842080546001820154600160a060020a033381811686529685018c90529484018190"  # noqa: E501
-            "5293166060830181905260a06080840181815260029390930180549185018290527fe7c9"  # noqa: E501
-            "57c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b96"  # noqa: E501
-            "9294929390929160c083019085908015610ba257820191906000526020600020905b8154"  # noqa: E501
-            "81529060010190602001808311610b8557829003601f168201915b505097505050505050"  # noqa: E501
-            "505060405180910390a160008381526101086020908152604082208054600160a060020a"  # noqa: E501
-            "031916815560018101839055600281018054848255908452828420919392610c0692601f"  # noqa: E501
-            "9290920104810190610a33565b50919050565b505050600191505061018a565b60008681"  # noqa: E501
-            "52610103602052604081208054909450909250821415610c9c5781548355600183810183"  # noqa: E501
-            "90556101048054918201808255828015829011610c6b5781836000526020600020918201"  # noqa: E501
-            "9101610c6b9190610a33565b505050600284018190556101048054889290811015610002"  # noqa: E501
-            "57600091909152600080516020610f7583398151915201555b506001820154600284900a"  # noqa: E501
-            "90811660001415610d6c5760408051600160a060020a0333168152602081018890528151"  # noqa: E501
-            "7fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181"  # noqa: E501
-            "900390910190a1825460019011610d595760008681526101036020526040902060020154"  # noqa: E501
-            "61010480549091908110156100025760406000908120600080516020610f758339815191"  # noqa: E501
-            "529290920181905580825560018083018290556002909201559550610d6c9050565b8254"  # noqa: E501
-            "600019018355600183018054821790555b50505050919050565b5b60018054118015610d"  # noqa: E501
-            "9857506001546002906101008110156100025701546000145b15610dac57600180546000"  # noqa: E501
-            "19019055610d76565b60015481108015610dcf5750600154600290610100811015610002"  # noqa: E501
-            "570154600014155b8015610de957506002816101008110156100025701546000145b1561"  # noqa: E501
-            "0e4a57600154600290610100811015610002578101549082610100811015610002578101"  # noqa: E501
-            "919091558190610102906000908361010081101561000257810154825260209290925260"  # noqa: E501
-            "408120929092556001546101008110156100025701555b61065b565b1561018a57610107"  # noqa: E501
-            "54610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b6101"  # noqa: E501
-            "07555b6101065480830110801590610e9c5750610106546101055490830111155b15610e"  # noqa: E501
-            "b25750610106805482019055600161018a565b50600061018a565b610606610104546000"  # noqa: E501
-            "5b81811015610f4a5761010480548290811015610002576000918252600080516020610f"  # noqa: E501
-            "75833981519152015414610f375761010480546101039160009184908110156100025760"  # noqa: E501
-            "0080516020610f7583398151915201548252506020919091526040812081815560018101"  # noqa: E501
-            "829055600201555b600101610ec4565b5050506001016104f9565b610104805460008083"  # noqa: E501
-            "55919091526104a790600080516020610f7583398151915290810190610a3356004c0be6"  # noqa: E501
-            "0200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
+            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x2,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x4: 0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
-            0x104: 0x1,
-            0x107: 0xC22E4,
-            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB2: 0x1,  # noqa: E501
-            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB3: 0x2,  # noqa: E501
+            0: 1,
+            1: 2,
+            3: contract_0,
+            4: sender,
+            260: 1,
+            263: 0xC22E4,
+            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB2: 1,  # noqa: E501
+            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB3: 2,  # noqa: E501
             0x4C0BE60200FAA20559308CB7B5A1BB3255C16CB1CAB91F525B5AE7A03D02FABE: 0x6877E4536B661640954061CDBC3A9761FB5245C340FCB1721307CD9D5F285C96,  # noqa: E501
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             0x915023A2112BB78C86FA558ABC0217EA6818D13895B90CE6BE233397F55EB1D0: 0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA,  # noqa: E501
-            0x915023A2112BB78C86FA558ABC0217EA6818D13895B90CE6BE233397F55EB1D1: 0x9,  # noqa: E501
-            0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 0x2,  # noqa: E501
+            0x915023A2112BB78C86FA558ABC0217EA6818D13895B90CE6BE233397F55EB1D1: 9,  # noqa: E501
+            0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 2,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"),  # noqa: E501
+        address=Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "7065cb48000000000000000000000000bbb1cd2cd96c6d5c0b5eb3322d807b34482481d4"  # noqa: E501
-        ),
+        to=contract_1,
+        data=Bytes("7065cb48")
+        + Hash(0xBBB1CD2CD96C6D5C0B5EB3322D807B34482481D4),
         gas_limit=10000000,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, code=b"", nonce=1),
+        contract_0: Account(storage={}, nonce=1),
+        contract_1: Account(
             storage={
                 0: 1,
                 1: 3,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                4: 0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
+                3: contract_0,
+                4: sender,
                 5: 0xBBB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
                 263: 0xC22E4,
                 0x3412A0F379BAD2D2F891E4DB16A42D964DD63A031E22596F10B4DAB2AAA1D252: 3,  # noqa: E501
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
                 0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 2,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=100,
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_wallet_change_owner_remove_pending_transaction.py b/tests/ported_static/stWalletTest/test_wallet_change_owner_remove_pending_transaction.py
index a328e026797..a3f01e84bbb 100644
--- a/tests/ported_static/stWalletTest/test_wallet_change_owner_remove_pending_transaction.py
+++ b/tests/ported_static/stWalletTest/test_wallet_change_owner_remove_pending_transaction.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_wallet_change_owner_remove_pending_transaction.
 
 Ported from:
-tests/static/state_tests/stWalletTest
-walletChangeOwnerRemovePendingTransactionFiller.json
+state_tests/stWalletTest/walletChangeOwnerRemovePendingTransactionFiller.json
 """
 
 import pytest
@@ -12,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -23,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stWalletTest/walletChangeOwnerRemovePendingTransactionFiller.json",  # noqa: E501
+        "state_tests/stWalletTest/walletChangeOwnerRemovePendingTransactionFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -32,12 +33,13 @@ def test_wallet_change_owner_remove_pending_transaction(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_wallet_change_owner_remove_pending_transaction."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D)
     sender = EOA(
         key=0xA95DEFE70EBEA7804F9C3BE42D20D24375E2A92B9D9666B832069C5F3CD423DD
     )
-    callee = Address("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,163 +51,67 @@ def test_wallet_change_owner_remove_pending_transaction(
     )
 
     pre[sender] = Account(balance=0x5AF3107A4000)
-    pre[callee] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: hex
+    # 0x
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=0xDE0B6B3A75EF08F,
+        nonce=1,
+        address=Address(0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf"  # noqa: E501
-            "6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb481461"  # noqa: E501
-            "01c9578063746c9171146101fd578063797af62714610206578063b20d30a91461021957"  # noqa: E501
-            "8063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2"  # noqa: E501
-            "cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d86"  # noqa: E501
-            "1461037f575b61038960003411156101095760408051600160a060020a03331681523460"  # noqa: E501
-            "2082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5c"  # noqa: E501
-            "c9109c929181900390910190a15b565b6103896004356000600036436040518084848082"  # noqa: E501
-            "84375050509091019081526040519081900360200190209050610693815b600160a06002"  # noqa: E501
-            "0a0333166000908152610102602052604081205481808083811415610c1357610d6c565b"  # noqa: E501
-            "61038b6004355b600160a060020a03811660009081526101026020526040812054115b91"  # noqa: E501
-            "9050565b61038b60015481565b6103896000364360405180848480828437505050909101"  # noqa: E501
-            "90815260405190819003602001902090506107e58161013d565b61038960043560003643"  # noqa: E501
-            "60405180848480828437505050909101908152604051908190036020019020905061060b"  # noqa: E501
-            "8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b6103"  # noqa: E501
-            "896004356000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "01902090506107d98161013d565b61038b60048035906024803591604435918201910135"  # noqa: E501
-            "60006108043361016e565b610389600435600160a060020a033316600090815261010260"  # noqa: E501
-            "205260408120549080808381141561039d5761041f565b61038960043560003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209050610752816101"  # noqa: E501
-            "3d565b61038b600435602435600082815261010360209081526040808320600160a06002"  # noqa: E501
-            "0a0385168452610102909252822054829081818114156107ab576107cf565b6103896004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "90506107f38161013d565b61038960043560243560006000364360405180848480828437"  # noqa: E501
-            "50505090910190815260405190819003602001902090506104ac8161013d565b61038b61"  # noqa: E501
-            "01055481565b005b60408051918252519081900360200190f35b50505060008281526101"  # noqa: E501
-            "03602052604081206001810154600284900a929083168190111561041f57815460018381"  # noqa: E501
-            "01805492909101845590849003905560408051600160a060020a03331681526020810187"  # noqa: E501
-            "905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d759173"  # noqa: E501
-            "4b929181900390910190a15b5050505050565b600160a060020a03831660028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0385166000818152610102602090815260"  # noqa: E501
-            "4080832083905584835291829020869055815192835282019290925281517fb532073b38"  # noqa: E501
-            "c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190"  # noqa: E501
-            "a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b6001"  # noqa: E501
-            "60a060020a0384166000908152610102602052604081205492508214156104ee57506104"  # noqa: E501
-            "a7565b6104265b6101045460005b81811015610eba576101048054610108916000918490"  # noqa: E501
-            "81101561000257600080516020610f758339815191520154825250602091825260408120"  # noqa: E501
-            "8054600160a060020a031916815560018101829055600281018054838255908352838320"  # noqa: E501
-            "9193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060"  # noqa: E501
-            "020a03831690600290610100811015610002579090016000508190555060016000505461"  # noqa: E501
-            "0102600050600084600160a060020a031681526020019081526020016000206000508190"  # noqa: E501
-            "55507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c382"  # noqa: E501
-            "6040518082600160a060020a0316815260200191505060405180910390a15b505b50565b"  # noqa: E501
-            "15610606576106198261016e565b156106245750610608565b61062c6104f2565b600154"  # noqa: E501
-            "60fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b61"  # noqa: E501
-            "07105b600060015b600154811015610a47575b6001548110801561068657506002816101"  # noqa: E501
-            "00811015610002570154600014155b15610d7557600101610666565b156104a757600160"  # noqa: E501
-            "a060020a0383166000908152610102602052604081205492508214156106c15750610606"  # noqa: E501
-            "565b60016001600050540360006000505411156106dc5750610606565b60006002836101"  # noqa: E501
-            "0081101561000257508301819055600160a060020a038416815261010260205260408120"  # noqa: E501
-            "556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb"  # noqa: E501
-            "0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a15050"  # noqa: E501
-            "50565b15610606576001548211156107675750610608565b60008290556107746104f256"  # noqa: E501
-            "5b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9b"  # noqa: E501
-            "eaf0dad4f550da9181900360200190a15050565b506001830154600282900a9081166000"  # noqa: E501
-            "14156107ca57600094506107cf565b600194505b5050505092915050565b156106065750"  # noqa: E501
-            "61010555565b156106085760006101065550565b156106065781600160a060020a0316ff"  # noqa: E501
-            "5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa"  # noqa: E501
-            "31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160"  # noqa: E501
-            "a060020a0316815260200185815260200184600160a060020a0316815260200180602001"  # noqa: E501
-            "828103825284848281815260200192508082843782019150509650505050505050604051"  # noqa: E501
-            "80910390a184600160a060020a0316848484604051808383808284375050509081019150"  # noqa: E501
-            "6000908083038185876185025a03f15060009350610a2392505050565b60003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209150610904905081"  # noqa: E501
-            "61020d565b158015610927575060008181526101086020526040812054600160a060020a"  # noqa: E501
-            "0316145b15610a235760008181526101086020908152604082208054600160a060020a03"  # noqa: E501
-            "191688178155600181018790556002018054858255818452928290209092601f01919091"  # noqa: E501
-            "048101908490868215610a2b579182015b82811115610a2b578235826000505591602001"  # noqa: E501
-            "91906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a"  # noqa: E501
-            "7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a06002"  # noqa: E501
-            "0a0316815260200185815260200184600160a060020a0316815260200180602001828103"  # noqa: E501
-            "825284848281815260200192508082843782019150509750505050505050506040518091"  # noqa: E501
-            "0390a15b949350505050565b5061099a9291505b80821115610a47576000815560010161"  # noqa: E501
-            "0a33565b5090565b15610c005760008381526101086020526040812054600160a060020a"  # noqa: E501
-            "031614610c0057604080516000918220805460018201546002929092018054600160a060"  # noqa: E501
-            "020a0392909216949293909291819084908015610acd5782019190600052602060002090"  # noqa: E501
-            "5b815481529060010190602001808311610ab057829003601f168201915b505092505050"  # noqa: E501
-            "60006040518083038185876185025a03f150505060008481526101086020908152604080"  # noqa: E501
-            "5181842080546001820154600160a060020a033381811686529685018c90529484018190"  # noqa: E501
-            "5293166060830181905260a06080840181815260029390930180549185018290527fe7c9"  # noqa: E501
-            "57c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b96"  # noqa: E501
-            "9294929390929160c083019085908015610ba257820191906000526020600020905b8154"  # noqa: E501
-            "81529060010190602001808311610b8557829003601f168201915b505097505050505050"  # noqa: E501
-            "505060405180910390a160008381526101086020908152604082208054600160a060020a"  # noqa: E501
-            "031916815560018101839055600281018054848255908452828420919392610c0692601f"  # noqa: E501
-            "9290920104810190610a33565b50919050565b505050600191505061018a565b60008681"  # noqa: E501
-            "52610103602052604081208054909450909250821415610c9c5781548355600183810183"  # noqa: E501
-            "90556101048054918201808255828015829011610c6b5781836000526020600020918201"  # noqa: E501
-            "9101610c6b9190610a33565b505050600284018190556101048054889290811015610002"  # noqa: E501
-            "57600091909152600080516020610f7583398151915201555b506001820154600284900a"  # noqa: E501
-            "90811660001415610d6c5760408051600160a060020a0333168152602081018890528151"  # noqa: E501
-            "7fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181"  # noqa: E501
-            "900390910190a1825460019011610d595760008681526101036020526040902060020154"  # noqa: E501
-            "61010480549091908110156100025760406000908120600080516020610f758339815191"  # noqa: E501
-            "529290920181905580825560018083018290556002909201559550610d6c9050565b8254"  # noqa: E501
-            "600019018355600183018054821790555b50505050919050565b5b60018054118015610d"  # noqa: E501
-            "9857506001546002906101008110156100025701546000145b15610dac57600180546000"  # noqa: E501
-            "19019055610d76565b60015481108015610dcf5750600154600290610100811015610002"  # noqa: E501
-            "570154600014155b8015610de957506002816101008110156100025701546000145b1561"  # noqa: E501
-            "0e4a57600154600290610100811015610002578101549082610100811015610002578101"  # noqa: E501
-            "919091558190610102906000908361010081101561000257810154825260209290925260"  # noqa: E501
-            "408120929092556001546101008110156100025701555b61065b565b1561018a57610107"  # noqa: E501
-            "54610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b6101"  # noqa: E501
-            "07555b6101065480830110801590610e9c5750610106546101055490830111155b15610e"  # noqa: E501
-            "b25750610106805482019055600161018a565b50600061018a565b610606610104546000"  # noqa: E501
-            "5b81811015610f4a5761010480548290811015610002576000918252600080516020610f"  # noqa: E501
-            "75833981519152015414610f375761010480546101039160009184908110156100025760"  # noqa: E501
-            "0080516020610f7583398151915201548252506020919091526040812081815560018101"  # noqa: E501
-            "829055600201555b600101610ec4565b5050506001016104f9565b610104805460008083"  # noqa: E501
-            "55919091526104a790600080516020610f7583398151915290810190610a3356004c0be6"  # noqa: E501
-            "0200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
+            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x2,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x4: 0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
-            0x104: 0x1,
-            0x107: 0xC22E4,
-            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB2: 0x1,  # noqa: E501
-            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB3: 0x2,  # noqa: E501
+            0: 1,
+            1: 2,
+            3: contract_0,
+            4: sender,
+            260: 1,
+            263: 0xC22E4,
+            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB2: 1,  # noqa: E501
+            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB3: 2,  # noqa: E501
             0x4C0BE60200FAA20559308CB7B5A1BB3255C16CB1CAB91F525B5AE7A03D02FABE: 0x6877E4536B661640954061CDBC3A9761FB5245C340FCB1721307CD9D5F285C96,  # noqa: E501
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             0x915023A2112BB78C86FA558ABC0217EA6818D13895B90CE6BE233397F55EB1D0: 0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA,  # noqa: E501
-            0x915023A2112BB78C86FA558ABC0217EA6818D13895B90CE6BE233397F55EB1D1: 0x9,  # noqa: E501
-            0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 0x2,  # noqa: E501
+            0x915023A2112BB78C86FA558ABC0217EA6818D13895B90CE6BE233397F55EB1D1: 9,  # noqa: E501
+            0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 2,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"),  # noqa: E501
+        address=Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "f00d4b5d000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"  # noqa: E501
-            "000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa"
-        ),
+        to=contract_1,
+        data=Bytes("f00d4b5d")
+        + Hash(contract_0, left_padding=True)
+        + Hash(0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA),
         gas_limit=10000000,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, code=b"", nonce=1),
+        contract_0: Account(storage={}, nonce=1),
+        contract_1: Account(
             storage={
                 0: 1,
                 1: 2,
                 3: 0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA,
-                4: 0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
+                4: sender,
                 263: 0xC22E4,
                 0x62CE4F671906BE9A217487BB98E428B08E12100FB0007DF10572CA00206E7D73: 1,  # noqa: E501
                 0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 2,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=100,
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_wallet_change_requirement_remove_pending_transaction.py b/tests/ported_static/stWalletTest/test_wallet_change_requirement_remove_pending_transaction.py
index 440cb9c955a..86a14063092 100644
--- a/tests/ported_static/stWalletTest/test_wallet_change_requirement_remove_pending_transaction.py
+++ b/tests/ported_static/stWalletTest/test_wallet_change_requirement_remove_pending_transaction.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_wallet_change_requirement_remove_pending_transaction.
 
 Ported from:
-tests/static/state_tests/stWalletTest
-walletChangeRequirementRemovePendingTransactionFiller.json
+state_tests/stWalletTest/walletChangeRequirementRemovePendingTransactionFiller.json
 """
 
 import pytest
@@ -12,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -23,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stWalletTest/walletChangeRequirementRemovePendingTransactionFiller.json",  # noqa: E501
+        "state_tests/stWalletTest/walletChangeRequirementRemovePendingTransactionFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -32,12 +33,13 @@ def test_wallet_change_requirement_remove_pending_transaction(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_wallet_change_requirement_remove_pending_transaction."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D)
     sender = EOA(
         key=0xA95DEFE70EBEA7804F9C3BE42D20D24375E2A92B9D9666B832069C5F3CD423DD
     )
-    callee = Address("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,162 +51,65 @@ def test_wallet_change_requirement_remove_pending_transaction(
     )
 
     pre[sender] = Account(balance=0x5AF3107A4000)
-    pre[callee] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: hex
+    # 0x
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=0xDE0B6B3A75EF08F,
+        nonce=1,
+        address=Address(0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf"  # noqa: E501
-            "6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb481461"  # noqa: E501
-            "01c9578063746c9171146101fd578063797af62714610206578063b20d30a91461021957"  # noqa: E501
-            "8063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2"  # noqa: E501
-            "cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d86"  # noqa: E501
-            "1461037f575b61038960003411156101095760408051600160a060020a03331681523460"  # noqa: E501
-            "2082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5c"  # noqa: E501
-            "c9109c929181900390910190a15b565b6103896004356000600036436040518084848082"  # noqa: E501
-            "84375050509091019081526040519081900360200190209050610693815b600160a06002"  # noqa: E501
-            "0a0333166000908152610102602052604081205481808083811415610c1357610d6c565b"  # noqa: E501
-            "61038b6004355b600160a060020a03811660009081526101026020526040812054115b91"  # noqa: E501
-            "9050565b61038b60015481565b6103896000364360405180848480828437505050909101"  # noqa: E501
-            "90815260405190819003602001902090506107e58161013d565b61038960043560003643"  # noqa: E501
-            "60405180848480828437505050909101908152604051908190036020019020905061060b"  # noqa: E501
-            "8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b6103"  # noqa: E501
-            "896004356000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "01902090506107d98161013d565b61038b60048035906024803591604435918201910135"  # noqa: E501
-            "60006108043361016e565b610389600435600160a060020a033316600090815261010260"  # noqa: E501
-            "205260408120549080808381141561039d5761041f565b61038960043560003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209050610752816101"  # noqa: E501
-            "3d565b61038b600435602435600082815261010360209081526040808320600160a06002"  # noqa: E501
-            "0a0385168452610102909252822054829081818114156107ab576107cf565b6103896004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "90506107f38161013d565b61038960043560243560006000364360405180848480828437"  # noqa: E501
-            "50505090910190815260405190819003602001902090506104ac8161013d565b61038b61"  # noqa: E501
-            "01055481565b005b60408051918252519081900360200190f35b50505060008281526101"  # noqa: E501
-            "03602052604081206001810154600284900a929083168190111561041f57815460018381"  # noqa: E501
-            "01805492909101845590849003905560408051600160a060020a03331681526020810187"  # noqa: E501
-            "905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d759173"  # noqa: E501
-            "4b929181900390910190a15b5050505050565b600160a060020a03831660028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0385166000818152610102602090815260"  # noqa: E501
-            "4080832083905584835291829020869055815192835282019290925281517fb532073b38"  # noqa: E501
-            "c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190"  # noqa: E501
-            "a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b6001"  # noqa: E501
-            "60a060020a0384166000908152610102602052604081205492508214156104ee57506104"  # noqa: E501
-            "a7565b6104265b6101045460005b81811015610eba576101048054610108916000918490"  # noqa: E501
-            "81101561000257600080516020610f758339815191520154825250602091825260408120"  # noqa: E501
-            "8054600160a060020a031916815560018101829055600281018054838255908352838320"  # noqa: E501
-            "9193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060"  # noqa: E501
-            "020a03831690600290610100811015610002579090016000508190555060016000505461"  # noqa: E501
-            "0102600050600084600160a060020a031681526020019081526020016000206000508190"  # noqa: E501
-            "55507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c382"  # noqa: E501
-            "6040518082600160a060020a0316815260200191505060405180910390a15b505b50565b"  # noqa: E501
-            "15610606576106198261016e565b156106245750610608565b61062c6104f2565b600154"  # noqa: E501
-            "60fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b61"  # noqa: E501
-            "07105b600060015b600154811015610a47575b6001548110801561068657506002816101"  # noqa: E501
-            "00811015610002570154600014155b15610d7557600101610666565b156104a757600160"  # noqa: E501
-            "a060020a0383166000908152610102602052604081205492508214156106c15750610606"  # noqa: E501
-            "565b60016001600050540360006000505411156106dc5750610606565b60006002836101"  # noqa: E501
-            "0081101561000257508301819055600160a060020a038416815261010260205260408120"  # noqa: E501
-            "556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb"  # noqa: E501
-            "0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a15050"  # noqa: E501
-            "50565b15610606576001548211156107675750610608565b60008290556107746104f256"  # noqa: E501
-            "5b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9b"  # noqa: E501
-            "eaf0dad4f550da9181900360200190a15050565b506001830154600282900a9081166000"  # noqa: E501
-            "14156107ca57600094506107cf565b600194505b5050505092915050565b156106065750"  # noqa: E501
-            "61010555565b156106085760006101065550565b156106065781600160a060020a0316ff"  # noqa: E501
-            "5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa"  # noqa: E501
-            "31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160"  # noqa: E501
-            "a060020a0316815260200185815260200184600160a060020a0316815260200180602001"  # noqa: E501
-            "828103825284848281815260200192508082843782019150509650505050505050604051"  # noqa: E501
-            "80910390a184600160a060020a0316848484604051808383808284375050509081019150"  # noqa: E501
-            "6000908083038185876185025a03f15060009350610a2392505050565b60003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209150610904905081"  # noqa: E501
-            "61020d565b158015610927575060008181526101086020526040812054600160a060020a"  # noqa: E501
-            "0316145b15610a235760008181526101086020908152604082208054600160a060020a03"  # noqa: E501
-            "191688178155600181018790556002018054858255818452928290209092601f01919091"  # noqa: E501
-            "048101908490868215610a2b579182015b82811115610a2b578235826000505591602001"  # noqa: E501
-            "91906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a"  # noqa: E501
-            "7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a06002"  # noqa: E501
-            "0a0316815260200185815260200184600160a060020a0316815260200180602001828103"  # noqa: E501
-            "825284848281815260200192508082843782019150509750505050505050506040518091"  # noqa: E501
-            "0390a15b949350505050565b5061099a9291505b80821115610a47576000815560010161"  # noqa: E501
-            "0a33565b5090565b15610c005760008381526101086020526040812054600160a060020a"  # noqa: E501
-            "031614610c0057604080516000918220805460018201546002929092018054600160a060"  # noqa: E501
-            "020a0392909216949293909291819084908015610acd5782019190600052602060002090"  # noqa: E501
-            "5b815481529060010190602001808311610ab057829003601f168201915b505092505050"  # noqa: E501
-            "60006040518083038185876185025a03f150505060008481526101086020908152604080"  # noqa: E501
-            "5181842080546001820154600160a060020a033381811686529685018c90529484018190"  # noqa: E501
-            "5293166060830181905260a06080840181815260029390930180549185018290527fe7c9"  # noqa: E501
-            "57c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b96"  # noqa: E501
-            "9294929390929160c083019085908015610ba257820191906000526020600020905b8154"  # noqa: E501
-            "81529060010190602001808311610b8557829003601f168201915b505097505050505050"  # noqa: E501
-            "505060405180910390a160008381526101086020908152604082208054600160a060020a"  # noqa: E501
-            "031916815560018101839055600281018054848255908452828420919392610c0692601f"  # noqa: E501
-            "9290920104810190610a33565b50919050565b505050600191505061018a565b60008681"  # noqa: E501
-            "52610103602052604081208054909450909250821415610c9c5781548355600183810183"  # noqa: E501
-            "90556101048054918201808255828015829011610c6b5781836000526020600020918201"  # noqa: E501
-            "9101610c6b9190610a33565b505050600284018190556101048054889290811015610002"  # noqa: E501
-            "57600091909152600080516020610f7583398151915201555b506001820154600284900a"  # noqa: E501
-            "90811660001415610d6c5760408051600160a060020a0333168152602081018890528151"  # noqa: E501
-            "7fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181"  # noqa: E501
-            "900390910190a1825460019011610d595760008681526101036020526040902060020154"  # noqa: E501
-            "61010480549091908110156100025760406000908120600080516020610f758339815191"  # noqa: E501
-            "529290920181905580825560018083018290556002909201559550610d6c9050565b8254"  # noqa: E501
-            "600019018355600183018054821790555b50505050919050565b5b60018054118015610d"  # noqa: E501
-            "9857506001546002906101008110156100025701546000145b15610dac57600180546000"  # noqa: E501
-            "19019055610d76565b60015481108015610dcf5750600154600290610100811015610002"  # noqa: E501
-            "570154600014155b8015610de957506002816101008110156100025701546000145b1561"  # noqa: E501
-            "0e4a57600154600290610100811015610002578101549082610100811015610002578101"  # noqa: E501
-            "919091558190610102906000908361010081101561000257810154825260209290925260"  # noqa: E501
-            "408120929092556001546101008110156100025701555b61065b565b1561018a57610107"  # noqa: E501
-            "54610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b6101"  # noqa: E501
-            "07555b6101065480830110801590610e9c5750610106546101055490830111155b15610e"  # noqa: E501
-            "b25750610106805482019055600161018a565b50600061018a565b610606610104546000"  # noqa: E501
-            "5b81811015610f4a5761010480548290811015610002576000918252600080516020610f"  # noqa: E501
-            "75833981519152015414610f375761010480546101039160009184908110156100025760"  # noqa: E501
-            "0080516020610f7583398151915201548252506020919091526040812081815560018101"  # noqa: E501
-            "829055600201555b600101610ec4565b5050506001016104f9565b610104805460008083"  # noqa: E501
-            "55919091526104a790600080516020610f7583398151915290810190610a3356004c0be6"  # noqa: E501
-            "0200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
+            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x2,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x4: 0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
-            0x104: 0x1,
-            0x107: 0xC22E4,
-            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB2: 0x1,  # noqa: E501
-            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB3: 0x2,  # noqa: E501
+            0: 1,
+            1: 2,
+            3: contract_0,
+            4: sender,
+            260: 1,
+            263: 0xC22E4,
+            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB2: 1,  # noqa: E501
+            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB3: 2,  # noqa: E501
             0x4C0BE60200FAA20559308CB7B5A1BB3255C16CB1CAB91F525B5AE7A03D02FABE: 0x6877E4536B661640954061CDBC3A9761FB5245C340FCB1721307CD9D5F285C96,  # noqa: E501
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             0x915023A2112BB78C86FA558ABC0217EA6818D13895B90CE6BE233397F55EB1D0: 0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA,  # noqa: E501
-            0x915023A2112BB78C86FA558ABC0217EA6818D13895B90CE6BE233397F55EB1D1: 0x9,  # noqa: E501
-            0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 0x2,  # noqa: E501
+            0x915023A2112BB78C86FA558ABC0217EA6818D13895B90CE6BE233397F55EB1D1: 9,  # noqa: E501
+            0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 2,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"),  # noqa: E501
+        address=Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "ba51a6df0000000000000000000000000000000000000000000000000000000000000002"  # noqa: E501
-        ),
+        to=contract_1,
+        data=Bytes("ba51a6df") + Hash(0x2),
         gas_limit=10000000,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, code=b"", nonce=1),
+        contract_0: Account(storage={}, nonce=1),
+        contract_1: Account(
             storage={
                 0: 2,
                 1: 2,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                4: 0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
+                3: contract_0,
+                4: sender,
                 263: 0xC22E4,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
                 0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 2,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=100,
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_wallet_confirm.py b/tests/ported_static/stWalletTest/test_wallet_confirm.py
index 7b59bca42b7..addf5a88ad6 100644
--- a/tests/ported_static/stWalletTest/test_wallet_confirm.py
+++ b/tests/ported_static/stWalletTest/test_wallet_confirm.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_wallet_confirm.
 
 Ported from:
-tests/static/state_tests/stWalletTest/walletConfirmFiller.json
+state_tests/stWalletTest/walletConfirmFiller.json
 """
 
 import pytest
@@ -11,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -21,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stWalletTest/walletConfirmFiller.json"],
+    ["state_tests/stWalletTest/walletConfirmFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -29,12 +31,13 @@ def test_wallet_confirm(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_wallet_confirm."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D)
     sender = EOA(
         key=0xA95DEFE70EBEA7804F9C3BE42D20D24375E2A92B9D9666B832069C5F3CD423DD
     )
-    callee = Address("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,163 +49,72 @@ def test_wallet_confirm(
     )
 
     pre[sender] = Account(balance=0x5AF3107A4000)
-    pre[callee] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: hex
+    # 0x
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=0xDE0B6B3A75EF08F,
+        nonce=1,
+        address=Address(0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf"  # noqa: E501
-            "6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb481461"  # noqa: E501
-            "01c9578063746c9171146101fd578063797af62714610206578063b20d30a91461021957"  # noqa: E501
-            "8063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2"  # noqa: E501
-            "cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d86"  # noqa: E501
-            "1461037f575b61038960003411156101095760408051600160a060020a03331681523460"  # noqa: E501
-            "2082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5c"  # noqa: E501
-            "c9109c929181900390910190a15b565b6103896004356000600036436040518084848082"  # noqa: E501
-            "84375050509091019081526040519081900360200190209050610693815b600160a06002"  # noqa: E501
-            "0a0333166000908152610102602052604081205481808083811415610c1357610d6c565b"  # noqa: E501
-            "61038b6004355b600160a060020a03811660009081526101026020526040812054115b91"  # noqa: E501
-            "9050565b61038b60015481565b6103896000364360405180848480828437505050909101"  # noqa: E501
-            "90815260405190819003602001902090506107e58161013d565b61038960043560003643"  # noqa: E501
-            "60405180848480828437505050909101908152604051908190036020019020905061060b"  # noqa: E501
-            "8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b6103"  # noqa: E501
-            "896004356000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "01902090506107d98161013d565b61038b60048035906024803591604435918201910135"  # noqa: E501
-            "60006108043361016e565b610389600435600160a060020a033316600090815261010260"  # noqa: E501
-            "205260408120549080808381141561039d5761041f565b61038960043560003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209050610752816101"  # noqa: E501
-            "3d565b61038b600435602435600082815261010360209081526040808320600160a06002"  # noqa: E501
-            "0a0385168452610102909252822054829081818114156107ab576107cf565b6103896004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "90506107f38161013d565b61038960043560243560006000364360405180848480828437"  # noqa: E501
-            "50505090910190815260405190819003602001902090506104ac8161013d565b61038b61"  # noqa: E501
-            "01055481565b005b60408051918252519081900360200190f35b50505060008281526101"  # noqa: E501
-            "03602052604081206001810154600284900a929083168190111561041f57815460018381"  # noqa: E501
-            "01805492909101845590849003905560408051600160a060020a03331681526020810187"  # noqa: E501
-            "905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d759173"  # noqa: E501
-            "4b929181900390910190a15b5050505050565b600160a060020a03831660028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0385166000818152610102602090815260"  # noqa: E501
-            "4080832083905584835291829020869055815192835282019290925281517fb532073b38"  # noqa: E501
-            "c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190"  # noqa: E501
-            "a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b6001"  # noqa: E501
-            "60a060020a0384166000908152610102602052604081205492508214156104ee57506104"  # noqa: E501
-            "a7565b6104265b6101045460005b81811015610eba576101048054610108916000918490"  # noqa: E501
-            "81101561000257600080516020610f758339815191520154825250602091825260408120"  # noqa: E501
-            "8054600160a060020a031916815560018101829055600281018054838255908352838320"  # noqa: E501
-            "9193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060"  # noqa: E501
-            "020a03831690600290610100811015610002579090016000508190555060016000505461"  # noqa: E501
-            "0102600050600084600160a060020a031681526020019081526020016000206000508190"  # noqa: E501
-            "55507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c382"  # noqa: E501
-            "6040518082600160a060020a0316815260200191505060405180910390a15b505b50565b"  # noqa: E501
-            "15610606576106198261016e565b156106245750610608565b61062c6104f2565b600154"  # noqa: E501
-            "60fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b61"  # noqa: E501
-            "07105b600060015b600154811015610a47575b6001548110801561068657506002816101"  # noqa: E501
-            "00811015610002570154600014155b15610d7557600101610666565b156104a757600160"  # noqa: E501
-            "a060020a0383166000908152610102602052604081205492508214156106c15750610606"  # noqa: E501
-            "565b60016001600050540360006000505411156106dc5750610606565b60006002836101"  # noqa: E501
-            "0081101561000257508301819055600160a060020a038416815261010260205260408120"  # noqa: E501
-            "556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb"  # noqa: E501
-            "0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a15050"  # noqa: E501
-            "50565b15610606576001548211156107675750610608565b60008290556107746104f256"  # noqa: E501
-            "5b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9b"  # noqa: E501
-            "eaf0dad4f550da9181900360200190a15050565b506001830154600282900a9081166000"  # noqa: E501
-            "14156107ca57600094506107cf565b600194505b5050505092915050565b156106065750"  # noqa: E501
-            "61010555565b156106085760006101065550565b156106065781600160a060020a0316ff"  # noqa: E501
-            "5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa"  # noqa: E501
-            "31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160"  # noqa: E501
-            "a060020a0316815260200185815260200184600160a060020a0316815260200180602001"  # noqa: E501
-            "828103825284848281815260200192508082843782019150509650505050505050604051"  # noqa: E501
-            "80910390a184600160a060020a0316848484604051808383808284375050509081019150"  # noqa: E501
-            "6000908083038185876185025a03f15060009350610a2392505050565b60003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209150610904905081"  # noqa: E501
-            "61020d565b158015610927575060008181526101086020526040812054600160a060020a"  # noqa: E501
-            "0316145b15610a235760008181526101086020908152604082208054600160a060020a03"  # noqa: E501
-            "191688178155600181018790556002018054858255818452928290209092601f01919091"  # noqa: E501
-            "048101908490868215610a2b579182015b82811115610a2b578235826000505591602001"  # noqa: E501
-            "91906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a"  # noqa: E501
-            "7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a06002"  # noqa: E501
-            "0a0316815260200185815260200184600160a060020a0316815260200180602001828103"  # noqa: E501
-            "825284848281815260200192508082843782019150509750505050505050506040518091"  # noqa: E501
-            "0390a15b949350505050565b5061099a9291505b80821115610a47576000815560010161"  # noqa: E501
-            "0a33565b5090565b15610c005760008381526101086020526040812054600160a060020a"  # noqa: E501
-            "031614610c0057604080516000918220805460018201546002929092018054600160a060"  # noqa: E501
-            "020a0392909216949293909291819084908015610acd5782019190600052602060002090"  # noqa: E501
-            "5b815481529060010190602001808311610ab057829003601f168201915b505092505050"  # noqa: E501
-            "60006040518083038185876185025a03f150505060008481526101086020908152604080"  # noqa: E501
-            "5181842080546001820154600160a060020a033381811686529685018c90529484018190"  # noqa: E501
-            "5293166060830181905260a06080840181815260029390930180549185018290527fe7c9"  # noqa: E501
-            "57c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b96"  # noqa: E501
-            "9294929390929160c083019085908015610ba257820191906000526020600020905b8154"  # noqa: E501
-            "81529060010190602001808311610b8557829003601f168201915b505097505050505050"  # noqa: E501
-            "505060405180910390a160008381526101086020908152604082208054600160a060020a"  # noqa: E501
-            "031916815560018101839055600281018054848255908452828420919392610c0692601f"  # noqa: E501
-            "9290920104810190610a33565b50919050565b505050600191505061018a565b60008681"  # noqa: E501
-            "52610103602052604081208054909450909250821415610c9c5781548355600183810183"  # noqa: E501
-            "90556101048054918201808255828015829011610c6b5781836000526020600020918201"  # noqa: E501
-            "9101610c6b9190610a33565b505050600284018190556101048054889290811015610002"  # noqa: E501
-            "57600091909152600080516020610f7583398151915201555b506001820154600284900a"  # noqa: E501
-            "90811660001415610d6c5760408051600160a060020a0333168152602081018890528151"  # noqa: E501
-            "7fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181"  # noqa: E501
-            "900390910190a1825460019011610d595760008681526101036020526040902060020154"  # noqa: E501
-            "61010480549091908110156100025760406000908120600080516020610f758339815191"  # noqa: E501
-            "529290920181905580825560018083018290556002909201559550610d6c9050565b8254"  # noqa: E501
-            "600019018355600183018054821790555b50505050919050565b5b60018054118015610d"  # noqa: E501
-            "9857506001546002906101008110156100025701546000145b15610dac57600180546000"  # noqa: E501
-            "19019055610d76565b60015481108015610dcf5750600154600290610100811015610002"  # noqa: E501
-            "570154600014155b8015610de957506002816101008110156100025701546000145b1561"  # noqa: E501
-            "0e4a57600154600290610100811015610002578101549082610100811015610002578101"  # noqa: E501
-            "919091558190610102906000908361010081101561000257810154825260209290925260"  # noqa: E501
-            "408120929092556001546101008110156100025701555b61065b565b1561018a57610107"  # noqa: E501
-            "54610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b6101"  # noqa: E501
-            "07555b6101065480830110801590610e9c5750610106546101055490830111155b15610e"  # noqa: E501
-            "b25750610106805482019055600161018a565b50600061018a565b610606610104546000"  # noqa: E501
-            "5b81811015610f4a5761010480548290811015610002576000918252600080516020610f"  # noqa: E501
-            "75833981519152015414610f375761010480546101039160009184908110156100025760"  # noqa: E501
-            "0080516020610f7583398151915201548252506020919091526040812081815560018101"  # noqa: E501
-            "829055600201555b600101610ec4565b5050506001016104f9565b610104805460008083"  # noqa: E501
-            "55919091526104a790600080516020610f7583398151915290810190610a3356004c0be6"  # noqa: E501
-            "0200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
+            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x2,
-            0x1: 0x2,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x4: 0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
-            0x104: 0x1,
-            0x107: 0xC22E4,
-            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB2: 0x1,  # noqa: E501
-            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB3: 0x2,  # noqa: E501
+            0: 2,
+            1: 2,
+            3: contract_0,
+            4: sender,
+            260: 1,
+            263: 0xC22E4,
+            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB2: 1,  # noqa: E501
+            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB3: 2,  # noqa: E501
             0x4C0BE60200FAA20559308CB7B5A1BB3255C16CB1CAB91F525B5AE7A03D02FABE: 0x6877E4536B661640954061CDBC3A9761FB5245C340FCB1721307CD9D5F285C96,  # noqa: E501
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             0x915023A2112BB78C86FA558ABC0217EA6818D13895B90CE6BE233397F55EB1D0: 0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA,  # noqa: E501
-            0x915023A2112BB78C86FA558ABC0217EA6818D13895B90CE6BE233397F55EB1D1: 0x9,  # noqa: E501
-            0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 0x2,  # noqa: E501
+            0x915023A2112BB78C86FA558ABC0217EA6818D13895B90CE6BE233397F55EB1D1: 9,  # noqa: E501
+            0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 2,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"),  # noqa: E501
+        address=Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "797af6276877e4536b661640954061cdbc3a9761fb5245c340fcb1721307cd9d5f285c96"  # noqa: E501
+        to=contract_1,
+        data=Bytes("797af627")
+        + Hash(
+            0x6877E4536B661640954061CDBC3A9761FB5245C340FCB1721307CD9D5F285C96
         ),
         gas_limit=10000000,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, code=b"", nonce=1),
+        contract_0: Account(storage={}, nonce=1),
+        Address(0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA): Account(
+            storage={}, code=b"", balance=9, nonce=0
+        ),
+        contract_1: Account(
             storage={
                 0: 2,
                 1: 2,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                4: 0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
+                3: contract_0,
+                4: sender,
                 260: 1,
                 263: 0xC22E4,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
                 0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 2,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=91,
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_wallet_construction.py b/tests/ported_static/stWalletTest/test_wallet_construction.py
index caf731bf733..3127da7cf6b 100644
--- a/tests/ported_static/stWalletTest/test_wallet_construction.py
+++ b/tests/ported_static/stWalletTest/test_wallet_construction.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_wallet_construction.
 
 Ported from:
-tests/static/state_tests/stWalletTest/walletConstructionFiller.json
+state_tests/stWalletTest/walletConstructionFiller.json
 """
 
 import pytest
@@ -11,35 +11,50 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
+from execution_testing.forks import Fork
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stWalletTest/walletConstructionFiller.json"],
+    ["state_tests/stWalletTest/walletConstructionFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit",
+    "d, g, v",
     [
-        1225023,
-        1825023,
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
+        ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_wallet_construction(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_wallet_construction."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -55,139 +70,38 @@ def test_wallet_construction(
 
     pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
+    tx_data = [
+        Bytes(
+            "6060604052604051602080611014833960806040818152925160016000818155818055600160a060020a03331660038190558152610102909452938320939093556201518042046101075582917f102d25c49d33fcdb8976a3f2744e0785c98d9e43b88364859e6aec4ae82eff5c91a250610f958061007f6000396000f300606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+        ),
+    ]
+    tx_gas = [1225023, 1825023]
+    tx_value = [100]
+
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "606060405260405160208061101483396080604081815292516001600081815581805560"  # noqa: E501
-            "0160a060020a033316600381905581526101029094529383209390935562015180420461"  # noqa: E501
-            "01075582917f102d25c49d33fcdb8976a3f2744e0785c98d9e43b88364859e6aec4ae82e"  # noqa: E501
-            "ff5c91a250610f958061007f6000396000f300606060405236156100b95760e060020a60"  # noqa: E501
-            "00350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f57"  # noqa: E501
-            "80635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd57806379"  # noqa: E501
-            "7af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc6"  # noqa: E501
-            "1461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c0146103"  # noqa: E501
-            "12578063f00d4b5d14610346578063f1736d861461037f575b6103896000341115610109"  # noqa: E501
-            "5760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4"  # noqa: E501
-            "d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b61"  # noqa: E501
-            "038960043560006000364360405180848480828437505050909101908152604051908190"  # noqa: E501
-            "0360200190209050610693815b600160a060020a03331660009081526101026020526040"  # noqa: E501
-            "81205481808083811415610c1357610d6c565b61038b6004355b600160a060020a038116"  # noqa: E501
-            "60009081526101026020526040812054115b919050565b61038b60015481565b61038960"  # noqa: E501
-            "003643604051808484808284375050509091019081526040519081900360200190209050"  # noqa: E501
-            "6107e58161013d565b610389600435600036436040518084848082843750505090910190"  # noqa: E501
-            "8152604051908190036020019020905061060b8161013d565b61038b60005481565b6103"  # noqa: E501
-            "8b6004355b600081610a4b8161013d565b61038960043560003643604051808484808284"  # noqa: E501
-            "3750505090910190815260405190819003602001902090506107d98161013d565b61038b"  # noqa: E501
-            "6004803590602480359160443591820191013560006108043361016e565b610389600435"  # noqa: E501
-            "600160a060020a033316600090815261010260205260408120549080808381141561039d"  # noqa: E501
-            "5761041f565b610389600435600036436040518084848082843750505090910190815260"  # noqa: E501
-            "405190819003602001902090506107528161013d565b61038b6004356024356000828152"  # noqa: E501
-            "61010360209081526040808320600160a060020a03851684526101029092528220548290"  # noqa: E501
-            "81818114156107ab576107cf565b61038960043560003643604051808484808284375050"  # noqa: E501
-            "5090910190815260405190819003602001902090506107f38161013d565b610389600435"  # noqa: E501
-            "602435600060003643604051808484808284375050509091019081526040519081900360"  # noqa: E501
-            "2001902090506104ac8161013d565b61038b6101055481565b005b604080519182525190"  # noqa: E501
-            "81900360200190f35b505050600082815261010360205260408120600181015460028490"  # noqa: E501
-            "0a929083168190111561041f578154600183810180549290910184559084900390556040"  # noqa: E501
-            "8051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15a"  # noqa: E501
-            "ad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050"  # noqa: E501
-            "565b600160a060020a03831660028361010081101561000257508301819055600160a060"  # noqa: E501
-            "020a03851660008181526101026020908152604080832083905584835291829020869055"  # noqa: E501
-            "815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c"  # noqa: E501
-            "1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba"  # noqa: E501
-            "8361016e565b156104c557506104a7565b600160a060020a038416600090815261010260"  # noqa: E501
-            "2052604081205492508214156104ee57506104a7565b6104265b6101045460005b818110"  # noqa: E501
-            "15610eba57610104805461010891600091849081101561000257600080516020610f7583"  # noqa: E501
-            "398151915201548252506020918252604081208054600160a060020a0319168155600181"  # noqa: E501
-            "018290556002810180548382559083528383209193610f3f92601f929092010481019061"  # noqa: E501
-            "0a33565b60018054810190819055600160a060020a038316906002906101008110156100"  # noqa: E501
-            "025790900160005081905550600160005054610102600050600084600160a060020a0316"  # noqa: E501
-            "8152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6"  # noqa: E501
-            "aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260"  # noqa: E501
-            "200191505060405180910390a15b505b50565b15610606576106198261016e565b156106"  # noqa: E501
-            "245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b50"  # noqa: E501
-            "5b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47"  # noqa: E501
-            "575b600154811080156106865750600281610100811015610002570154600014155b1561"  # noqa: E501
-            "0d7557600101610666565b156104a757600160a060020a03831660009081526101026020"  # noqa: E501
-            "52604081205492508214156106c15750610606565b600160016000505403600060005054"  # noqa: E501
-            "11156106dc5750610606565b600060028361010081101561000257508301819055600160"  # noqa: E501
-            "a060020a038416815261010260205260408120556106526104f2565b5060408051600160"  # noqa: E501
-            "a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071"  # noqa: E501
-            "b555b651fbf418da9181900360200190a1505050565b1561060657600154821115610767"  # noqa: E501
-            "5750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721"  # noqa: E501
-            "332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a150"  # noqa: E501
-            "50565b506001830154600282900a908116600014156107ca57600094506107cf565b6001"  # noqa: E501
-            "94505b5050505092915050565b15610606575061010555565b1561060857600061010655"  # noqa: E501
-            "50565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361"  # noqa: E501
-            "016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae"  # noqa: E501
-            "9043f6efd00433858786866040518086600160a060020a03168152602001858152602001"  # noqa: E501
-            "84600160a060020a03168152602001806020018281038252848482818152602001925080"  # noqa: E501
-            "8284378201915050965050505050505060405180910390a184600160a060020a03168484"  # noqa: E501
-            "846040518083838082843750505090810191506000908083038185876185025a03f15060"  # noqa: E501
-            "009350610a2392505050565b600036436040518084848082843750505090910190815260"  # noqa: E501
-            "4051908190036020019020915061090490508161020d565b158015610927575060008181"  # noqa: E501
-            "526101086020526040812054600160a060020a0316145b15610a23576000818152610108"  # noqa: E501
-            "6020908152604082208054600160a060020a031916881781556001810187905560020180"  # noqa: E501
-            "54858255818452928290209092601f01919091048101908490868215610a2b579182015b"  # noqa: E501
-            "82811115610a2b57823582600050559160200191906001019061097c565b50600050507f"  # noqa: E501
-            "1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf3281338688"  # noqa: E501
-            "87876040518087815260200186600160a060020a03168152602001858152602001846001"  # noqa: E501
-            "60a060020a03168152602001806020018281038252848482818152602001925080828437"  # noqa: E501
-            "820191505097505050505050505060405180910390a15b949350505050565b5061099a92"  # noqa: E501
-            "91505b80821115610a475760008155600101610a33565b5090565b15610c005760008381"  # noqa: E501
-            "526101086020526040812054600160a060020a031614610c005760408051600091822080"  # noqa: E501
-            "5460018201546002929092018054600160a060020a039290921694929390929181908490"  # noqa: E501
-            "8015610acd57820191906000526020600020905b81548152906001019060200180831161"  # noqa: E501
-            "0ab057829003601f168201915b50509250505060006040518083038185876185025a03f1"  # noqa: E501
-            "505050600084815261010860209081526040805181842080546001820154600160a06002"  # noqa: E501
-            "0a033381811686529685018c905294840181905293166060830181905260a06080840181"  # noqa: E501
-            "815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b976"  # noqa: E501
-            "51dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c08301908590801561"  # noqa: E501
-            "0ba257820191906000526020600020905b815481529060010190602001808311610b8557"  # noqa: E501
-            "829003601f168201915b505097505050505050505060405180910390a160008381526101"  # noqa: E501
-            "086020908152604082208054600160a060020a0319168155600181018390556002810180"  # noqa: E501
-            "54848255908452828420919392610c0692601f9290920104810190610a33565b50919050"  # noqa: E501
-            "565b505050600191505061018a565b600086815261010360205260408120805490945090"  # noqa: E501
-            "9250821415610c9c57815483556001838101839055610104805491820180825582801582"  # noqa: E501
-            "9011610c6b57818360005260206000209182019101610c6b9190610a33565b5050506002"  # noqa: E501
-            "8401819055610104805488929081101561000257600091909152600080516020610f7583"  # noqa: E501
-            "398151915201555b506001820154600284900a90811660001415610d6c57604080516001"  # noqa: E501
-            "60a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d"  # noqa: E501
-            "5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d5957"  # noqa: E501
-            "600086815261010360205260409020600201546101048054909190811015610002576040"  # noqa: E501
-            "6000908120600080516020610f7583398151915292909201819055808255600180830182"  # noqa: E501
-            "90556002909201559550610d6c9050565b8254600019018355600183018054821790555b"  # noqa: E501
-            "50505050919050565b5b60018054118015610d9857506001546002906101008110156100"  # noqa: E501
-            "025701546000145b15610dac5760018054600019019055610d76565b6001548110801561"  # noqa: E501
-            "0dcf5750600154600290610100811015610002570154600014155b8015610de957506002"  # noqa: E501
-            "816101008110156100025701546000145b15610e4a576001546002906101008110156100"  # noqa: E501
-            "025781015490826101008110156100025781019190915581906101029060009083610100"  # noqa: E501
-            "811015610002578101548252602092909252604081209290925560015461010081101561"  # noqa: E501
-            "00025701555b61065b565b1561018a5761010754610e655b62015180420490565b111561"  # noqa: E501
-            "0e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c"  # noqa: E501
-            "5750610106546101055490830111155b15610eb25750610106805482019055600161018a"  # noqa: E501
-            "565b50600061018a565b6106066101045460005b81811015610f4a576101048054829081"  # noqa: E501
-            "1015610002576000918252600080516020610f75833981519152015414610f3757610104"  # noqa: E501
-            "805461010391600091849081101561000257600080516020610f75833981519152015482"  # noqa: E501
-            "52506020919091526040812081815560018101829055600201555b600101610ec4565b50"  # noqa: E501
-            "50506001016104f9565b61010480546000808355919091526104a790600080516020610f"  # noqa: E501
-            "7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1"  # noqa: E501
-            "cab91f525b5ae7a03d02fabe"
-        ),
-        gas_limit=tx_gas_limit,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
         nonce=1,
-        value=100,
     )
 
     post = {
-        Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"): Account(
+        sender: Account(storage={}, code=b"", nonce=2),
+        compute_create_address(address=sender, nonce=1): Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
+                263: 0,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=100,
+            nonce=1,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_wallet_construction_oog.py b/tests/ported_static/stWalletTest/test_wallet_construction_oog.py
index c9f9b2e1614..d10fa9cb910 100644
--- a/tests/ported_static/stWalletTest/test_wallet_construction_oog.py
+++ b/tests/ported_static/stWalletTest/test_wallet_construction_oog.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_wallet_construction_oog.
 
 Ported from:
-tests/static/state_tests/stWalletTest/walletConstructionOOGFiller.json
+state_tests/stWalletTest/walletConstructionOOGFiller.json
 """
 
 import pytest
@@ -11,9 +11,15 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
 )
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -21,38 +27,37 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stWalletTest/walletConstructionOOGFiller.json"],
+    ["state_tests/stWalletTest/walletConstructionOOGFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (427222, {}),
-        (
-            1225022,
-            {
-                Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"): Account(
-                    storage={
-                        0: 1,
-                        1: 1,
-                        3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                        0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
-                    }
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="-g1",
         ),
     ],
-    ids=["case0", "case1"],
 )
 @pytest.mark.pre_alloc_mutable
 def test_wallet_construction_oog(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_wallet_construction_oog."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -68,131 +73,58 @@ def test_wallet_construction_oog(
 
     pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
 
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": -1, "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=2),
+                compute_create_address(
+                    address=sender, nonce=1
+                ): Account.NONEXISTENT,
+            },
+        },
+        {
+            "indexes": {"data": -1, "gas": 1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(storage={}, code=b"", nonce=2),
+                compute_create_address(address=sender, nonce=1): Account(
+                    storage={
+                        0: 1,
+                        1: 1,
+                        3: sender,
+                        263: 0,
+                        0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
+                    },
+                    code=bytes.fromhex(
+                        "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+                    ),
+                    balance=100,
+                    nonce=1,
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes(
+            "6060604052604051602080611014833960806040818152925160016000818155818055600160a060020a03331660038190558152610102909452938320939093556201518042046101075582917f102d25c49d33fcdb8976a3f2744e0785c98d9e43b88364859e6aec4ae82eff5c91a250610f958061007f6000396000f300606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+        ),
+    ]
+    tx_gas = [427222, 1225022]
+    tx_value = [100]
+
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "606060405260405160208061101483396080604081815292516001600081815581805560"  # noqa: E501
-            "0160a060020a033316600381905581526101029094529383209390935562015180420461"  # noqa: E501
-            "01075582917f102d25c49d33fcdb8976a3f2744e0785c98d9e43b88364859e6aec4ae82e"  # noqa: E501
-            "ff5c91a250610f958061007f6000396000f300606060405236156100b95760e060020a60"  # noqa: E501
-            "00350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f57"  # noqa: E501
-            "80635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd57806379"  # noqa: E501
-            "7af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc6"  # noqa: E501
-            "1461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c0146103"  # noqa: E501
-            "12578063f00d4b5d14610346578063f1736d861461037f575b6103896000341115610109"  # noqa: E501
-            "5760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4"  # noqa: E501
-            "d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b61"  # noqa: E501
-            "038960043560006000364360405180848480828437505050909101908152604051908190"  # noqa: E501
-            "0360200190209050610693815b600160a060020a03331660009081526101026020526040"  # noqa: E501
-            "81205481808083811415610c1357610d6c565b61038b6004355b600160a060020a038116"  # noqa: E501
-            "60009081526101026020526040812054115b919050565b61038b60015481565b61038960"  # noqa: E501
-            "003643604051808484808284375050509091019081526040519081900360200190209050"  # noqa: E501
-            "6107e58161013d565b610389600435600036436040518084848082843750505090910190"  # noqa: E501
-            "8152604051908190036020019020905061060b8161013d565b61038b60005481565b6103"  # noqa: E501
-            "8b6004355b600081610a4b8161013d565b61038960043560003643604051808484808284"  # noqa: E501
-            "3750505090910190815260405190819003602001902090506107d98161013d565b61038b"  # noqa: E501
-            "6004803590602480359160443591820191013560006108043361016e565b610389600435"  # noqa: E501
-            "600160a060020a033316600090815261010260205260408120549080808381141561039d"  # noqa: E501
-            "5761041f565b610389600435600036436040518084848082843750505090910190815260"  # noqa: E501
-            "405190819003602001902090506107528161013d565b61038b6004356024356000828152"  # noqa: E501
-            "61010360209081526040808320600160a060020a03851684526101029092528220548290"  # noqa: E501
-            "81818114156107ab576107cf565b61038960043560003643604051808484808284375050"  # noqa: E501
-            "5090910190815260405190819003602001902090506107f38161013d565b610389600435"  # noqa: E501
-            "602435600060003643604051808484808284375050509091019081526040519081900360"  # noqa: E501
-            "2001902090506104ac8161013d565b61038b6101055481565b005b604080519182525190"  # noqa: E501
-            "81900360200190f35b505050600082815261010360205260408120600181015460028490"  # noqa: E501
-            "0a929083168190111561041f578154600183810180549290910184559084900390556040"  # noqa: E501
-            "8051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15a"  # noqa: E501
-            "ad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050"  # noqa: E501
-            "565b600160a060020a03831660028361010081101561000257508301819055600160a060"  # noqa: E501
-            "020a03851660008181526101026020908152604080832083905584835291829020869055"  # noqa: E501
-            "815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c"  # noqa: E501
-            "1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba"  # noqa: E501
-            "8361016e565b156104c557506104a7565b600160a060020a038416600090815261010260"  # noqa: E501
-            "2052604081205492508214156104ee57506104a7565b6104265b6101045460005b818110"  # noqa: E501
-            "15610eba57610104805461010891600091849081101561000257600080516020610f7583"  # noqa: E501
-            "398151915201548252506020918252604081208054600160a060020a0319168155600181"  # noqa: E501
-            "018290556002810180548382559083528383209193610f3f92601f929092010481019061"  # noqa: E501
-            "0a33565b60018054810190819055600160a060020a038316906002906101008110156100"  # noqa: E501
-            "025790900160005081905550600160005054610102600050600084600160a060020a0316"  # noqa: E501
-            "8152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6"  # noqa: E501
-            "aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260"  # noqa: E501
-            "200191505060405180910390a15b505b50565b15610606576106198261016e565b156106"  # noqa: E501
-            "245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b50"  # noqa: E501
-            "5b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47"  # noqa: E501
-            "575b600154811080156106865750600281610100811015610002570154600014155b1561"  # noqa: E501
-            "0d7557600101610666565b156104a757600160a060020a03831660009081526101026020"  # noqa: E501
-            "52604081205492508214156106c15750610606565b600160016000505403600060005054"  # noqa: E501
-            "11156106dc5750610606565b600060028361010081101561000257508301819055600160"  # noqa: E501
-            "a060020a038416815261010260205260408120556106526104f2565b5060408051600160"  # noqa: E501
-            "a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071"  # noqa: E501
-            "b555b651fbf418da9181900360200190a1505050565b1561060657600154821115610767"  # noqa: E501
-            "5750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721"  # noqa: E501
-            "332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a150"  # noqa: E501
-            "50565b506001830154600282900a908116600014156107ca57600094506107cf565b6001"  # noqa: E501
-            "94505b5050505092915050565b15610606575061010555565b1561060857600061010655"  # noqa: E501
-            "50565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361"  # noqa: E501
-            "016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae"  # noqa: E501
-            "9043f6efd00433858786866040518086600160a060020a03168152602001858152602001"  # noqa: E501
-            "84600160a060020a03168152602001806020018281038252848482818152602001925080"  # noqa: E501
-            "8284378201915050965050505050505060405180910390a184600160a060020a03168484"  # noqa: E501
-            "846040518083838082843750505090810191506000908083038185876185025a03f15060"  # noqa: E501
-            "009350610a2392505050565b600036436040518084848082843750505090910190815260"  # noqa: E501
-            "4051908190036020019020915061090490508161020d565b158015610927575060008181"  # noqa: E501
-            "526101086020526040812054600160a060020a0316145b15610a23576000818152610108"  # noqa: E501
-            "6020908152604082208054600160a060020a031916881781556001810187905560020180"  # noqa: E501
-            "54858255818452928290209092601f01919091048101908490868215610a2b579182015b"  # noqa: E501
-            "82811115610a2b57823582600050559160200191906001019061097c565b50600050507f"  # noqa: E501
-            "1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf3281338688"  # noqa: E501
-            "87876040518087815260200186600160a060020a03168152602001858152602001846001"  # noqa: E501
-            "60a060020a03168152602001806020018281038252848482818152602001925080828437"  # noqa: E501
-            "820191505097505050505050505060405180910390a15b949350505050565b5061099a92"  # noqa: E501
-            "91505b80821115610a475760008155600101610a33565b5090565b15610c005760008381"  # noqa: E501
-            "526101086020526040812054600160a060020a031614610c005760408051600091822080"  # noqa: E501
-            "5460018201546002929092018054600160a060020a039290921694929390929181908490"  # noqa: E501
-            "8015610acd57820191906000526020600020905b81548152906001019060200180831161"  # noqa: E501
-            "0ab057829003601f168201915b50509250505060006040518083038185876185025a03f1"  # noqa: E501
-            "505050600084815261010860209081526040805181842080546001820154600160a06002"  # noqa: E501
-            "0a033381811686529685018c905294840181905293166060830181905260a06080840181"  # noqa: E501
-            "815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b976"  # noqa: E501
-            "51dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c08301908590801561"  # noqa: E501
-            "0ba257820191906000526020600020905b815481529060010190602001808311610b8557"  # noqa: E501
-            "829003601f168201915b505097505050505050505060405180910390a160008381526101"  # noqa: E501
-            "086020908152604082208054600160a060020a0319168155600181018390556002810180"  # noqa: E501
-            "54848255908452828420919392610c0692601f9290920104810190610a33565b50919050"  # noqa: E501
-            "565b505050600191505061018a565b600086815261010360205260408120805490945090"  # noqa: E501
-            "9250821415610c9c57815483556001838101839055610104805491820180825582801582"  # noqa: E501
-            "9011610c6b57818360005260206000209182019101610c6b9190610a33565b5050506002"  # noqa: E501
-            "8401819055610104805488929081101561000257600091909152600080516020610f7583"  # noqa: E501
-            "398151915201555b506001820154600284900a90811660001415610d6c57604080516001"  # noqa: E501
-            "60a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d"  # noqa: E501
-            "5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d5957"  # noqa: E501
-            "600086815261010360205260409020600201546101048054909190811015610002576040"  # noqa: E501
-            "6000908120600080516020610f7583398151915292909201819055808255600180830182"  # noqa: E501
-            "90556002909201559550610d6c9050565b8254600019018355600183018054821790555b"  # noqa: E501
-            "50505050919050565b5b60018054118015610d9857506001546002906101008110156100"  # noqa: E501
-            "025701546000145b15610dac5760018054600019019055610d76565b6001548110801561"  # noqa: E501
-            "0dcf5750600154600290610100811015610002570154600014155b8015610de957506002"  # noqa: E501
-            "816101008110156100025701546000145b15610e4a576001546002906101008110156100"  # noqa: E501
-            "025781015490826101008110156100025781019190915581906101029060009083610100"  # noqa: E501
-            "811015610002578101548252602092909252604081209290925560015461010081101561"  # noqa: E501
-            "00025701555b61065b565b1561018a5761010754610e655b62015180420490565b111561"  # noqa: E501
-            "0e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c"  # noqa: E501
-            "5750610106546101055490830111155b15610eb25750610106805482019055600161018a"  # noqa: E501
-            "565b50600061018a565b6106066101045460005b81811015610f4a576101048054829081"  # noqa: E501
-            "1015610002576000918252600080516020610f75833981519152015414610f3757610104"  # noqa: E501
-            "805461010391600091849081101561000257600080516020610f75833981519152015482"  # noqa: E501
-            "52506020919091526040812081815560018101829055600201555b600101610ec4565b50"  # noqa: E501
-            "50506001016104f9565b61010480546000808355919091526104a790600080516020610f"  # noqa: E501
-            "7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1"  # noqa: E501
-            "cab91f525b5ae7a03d02fabe"
-        ),
-        gas_limit=tx_gas_limit,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
         nonce=1,
-        value=100,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stWalletTest/test_wallet_construction_partial.py b/tests/ported_static/stWalletTest/test_wallet_construction_partial.py
index d060b5f324b..90aaebc9d2f 100644
--- a/tests/ported_static/stWalletTest/test_wallet_construction_partial.py
+++ b/tests/ported_static/stWalletTest/test_wallet_construction_partial.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_wallet_construction_partial.
 
 Ported from:
-tests/static/state_tests/stWalletTest/walletConstructionPartialFiller.json
+state_tests/stWalletTest/walletConstructionPartialFiller.json
 """
 
 import pytest
@@ -11,9 +11,11 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
+    compute_create_address,
 )
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -21,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/walletConstructionPartialFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/walletConstructionPartialFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,8 +31,8 @@ def test_wallet_construction_partial(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_wallet_construction_partial."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -51,136 +51,29 @@ def test_wallet_construction_partial(
     tx = Transaction(
         sender=sender,
         to=None,
-        data=bytes.fromhex(
-            "606060405260405160208061101483396080604081815292516001600081815581805560"  # noqa: E501
-            "0160a060020a033316600381905581526101029094529383209390935562015180420461"  # noqa: E501
-            "01075582917f102d25c49d33fcdb8976a3f2744e0785c98d9e43b88364859e6aec4ae82e"  # noqa: E501
-            "ff5c91a250610f958061007f6000396000f300606060405236156100b95760e060020a60"  # noqa: E501
-            "00350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f57"  # noqa: E501
-            "80635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd57806379"  # noqa: E501
-            "7af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc6"  # noqa: E501
-            "1461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c0146103"  # noqa: E501
-            "12578063f00d4b5d14610346578063f1736d861461037f575b6103896000341115610109"  # noqa: E501
-            "5760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4"  # noqa: E501
-            "d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b61"  # noqa: E501
-            "038960043560006000364360405180848480828437505050909101908152604051908190"  # noqa: E501
-            "0360200190209050610693815b600160a060020a03331660009081526101026020526040"  # noqa: E501
-            "81205481808083811415610c1357610d6c565b61038b6004355b600160a060020a038116"  # noqa: E501
-            "60009081526101026020526040812054115b919050565b61038b60015481565b61038960"  # noqa: E501
-            "003643604051808484808284375050509091019081526040519081900360200190209050"  # noqa: E501
-            "6107e58161013d565b610389600435600036436040518084848082843750505090910190"  # noqa: E501
-            "8152604051908190036020019020905061060b8161013d565b61038b60005481565b6103"  # noqa: E501
-            "8b6004355b600081610a4b8161013d565b61038960043560003643604051808484808284"  # noqa: E501
-            "3750505090910190815260405190819003602001902090506107d98161013d565b61038b"  # noqa: E501
-            "6004803590602480359160443591820191013560006108043361016e565b610389600435"  # noqa: E501
-            "600160a060020a033316600090815261010260205260408120549080808381141561039d"  # noqa: E501
-            "5761041f565b610389600435600036436040518084848082843750505090910190815260"  # noqa: E501
-            "405190819003602001902090506107528161013d565b61038b6004356024356000828152"  # noqa: E501
-            "61010360209081526040808320600160a060020a03851684526101029092528220548290"  # noqa: E501
-            "81818114156107ab576107cf565b61038960043560003643604051808484808284375050"  # noqa: E501
-            "5090910190815260405190819003602001902090506107f38161013d565b610389600435"  # noqa: E501
-            "602435600060003643604051808484808284375050509091019081526040519081900360"  # noqa: E501
-            "2001902090506104ac8161013d565b61038b6101055481565b005b604080519182525190"  # noqa: E501
-            "81900360200190f35b505050600082815261010360205260408120600181015460028490"  # noqa: E501
-            "0a929083168190111561041f578154600183810180549290910184559084900390556040"  # noqa: E501
-            "8051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15a"  # noqa: E501
-            "ad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050"  # noqa: E501
-            "565b600160a060020a03831660028361010081101561000257508301819055600160a060"  # noqa: E501
-            "020a03851660008181526101026020908152604080832083905584835291829020869055"  # noqa: E501
-            "815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c"  # noqa: E501
-            "1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba"  # noqa: E501
-            "8361016e565b156104c557506104a7565b600160a060020a038416600090815261010260"  # noqa: E501
-            "2052604081205492508214156104ee57506104a7565b6104265b6101045460005b818110"  # noqa: E501
-            "15610eba57610104805461010891600091849081101561000257600080516020610f7583"  # noqa: E501
-            "398151915201548252506020918252604081208054600160a060020a0319168155600181"  # noqa: E501
-            "018290556002810180548382559083528383209193610f3f92601f929092010481019061"  # noqa: E501
-            "0a33565b60018054810190819055600160a060020a038316906002906101008110156100"  # noqa: E501
-            "025790900160005081905550600160005054610102600050600084600160a060020a0316"  # noqa: E501
-            "8152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6"  # noqa: E501
-            "aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260"  # noqa: E501
-            "200191505060405180910390a15b505b50565b15610606576106198261016e565b156106"  # noqa: E501
-            "245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b50"  # noqa: E501
-            "5b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47"  # noqa: E501
-            "575b600154811080156106865750600281610100811015610002570154600014155b1561"  # noqa: E501
-            "0d7557600101610666565b156104a757600160a060020a03831660009081526101026020"  # noqa: E501
-            "52604081205492508214156106c15750610606565b600160016000505403600060005054"  # noqa: E501
-            "11156106dc5750610606565b600060028361010081101561000257508301819055600160"  # noqa: E501
-            "a060020a038416815261010260205260408120556106526104f2565b5060408051600160"  # noqa: E501
-            "a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071"  # noqa: E501
-            "b555b651fbf418da9181900360200190a1505050565b1561060657600154821115610767"  # noqa: E501
-            "5750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721"  # noqa: E501
-            "332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a150"  # noqa: E501
-            "50565b506001830154600282900a908116600014156107ca57600094506107cf565b6001"  # noqa: E501
-            "94505b5050505092915050565b15610606575061010555565b1561060857600061010655"  # noqa: E501
-            "50565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361"  # noqa: E501
-            "016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae"  # noqa: E501
-            "9043f6efd00433858786866040518086600160a060020a03168152602001858152602001"  # noqa: E501
-            "84600160a060020a03168152602001806020018281038252848482818152602001925080"  # noqa: E501
-            "8284378201915050965050505050505060405180910390a184600160a060020a03168484"  # noqa: E501
-            "846040518083838082843750505090810191506000908083038185876185025a03f15060"  # noqa: E501
-            "009350610a2392505050565b600036436040518084848082843750505090910190815260"  # noqa: E501
-            "4051908190036020019020915061090490508161020d565b158015610927575060008181"  # noqa: E501
-            "526101086020526040812054600160a060020a0316145b15610a23576000818152610108"  # noqa: E501
-            "6020908152604082208054600160a060020a031916881781556001810187905560020180"  # noqa: E501
-            "54858255818452928290209092601f01919091048101908490868215610a2b579182015b"  # noqa: E501
-            "82811115610a2b57823582600050559160200191906001019061097c565b50600050507f"  # noqa: E501
-            "1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf3281338688"  # noqa: E501
-            "87876040518087815260200186600160a060020a03168152602001858152602001846001"  # noqa: E501
-            "60a060020a03168152602001806020018281038252848482818152602001925080828437"  # noqa: E501
-            "820191505097505050505050505060405180910390a15b949350505050565b5061099a92"  # noqa: E501
-            "91505b80821115610a475760008155600101610a33565b5090565b15610c005760008381"  # noqa: E501
-            "526101086020526040812054600160a060020a031614610c005760408051600091822080"  # noqa: E501
-            "5460018201546002929092018054600160a060020a039290921694929390929181908490"  # noqa: E501
-            "8015610acd57820191906000526020600020905b81548152906001019060200180831161"  # noqa: E501
-            "0ab057829003601f168201915b50509250505060006040518083038185876185025a03f1"  # noqa: E501
-            "505050600084815261010860209081526040805181842080546001820154600160a06002"  # noqa: E501
-            "0a033381811686529685018c905294840181905293166060830181905260a06080840181"  # noqa: E501
-            "815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b976"  # noqa: E501
-            "51dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c08301908590801561"  # noqa: E501
-            "0ba257820191906000526020600020905b815481529060010190602001808311610b8557"  # noqa: E501
-            "829003601f168201915b505097505050505050505060405180910390a160008381526101"  # noqa: E501
-            "086020908152604082208054600160a060020a0319168155600181018390556002810180"  # noqa: E501
-            "54848255908452828420919392610c0692601f9290920104810190610a33565b50919050"  # noqa: E501
-            "565b505050600191505061018a565b600086815261010360205260408120805490945090"  # noqa: E501
-            "9250821415610c9c57815483556001838101839055610104805491820180825582801582"  # noqa: E501
-            "9011610c6b57818360005260206000209182019101610c6b9190610a33565b5050506002"  # noqa: E501
-            "8401819055610104805488929081101561000257600091909152600080516020610f7583"  # noqa: E501
-            "398151915201555b506001820154600284900a90811660001415610d6c57604080516001"  # noqa: E501
-            "60a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d"  # noqa: E501
-            "5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d5957"  # noqa: E501
-            "600086815261010360205260409020600201546101048054909190811015610002576040"  # noqa: E501
-            "6000908120600080516020610f7583398151915292909201819055808255600180830182"  # noqa: E501
-            "90556002909201559550610d6c9050565b8254600019018355600183018054821790555b"  # noqa: E501
-            "50505050919050565b5b60018054118015610d9857506001546002906101008110156100"  # noqa: E501
-            "025701546000145b15610dac5760018054600019019055610d76565b6001548110801561"  # noqa: E501
-            "0dcf5750600154600290610100811015610002570154600014155b8015610de957506002"  # noqa: E501
-            "816101008110156100025701546000145b15610e4a576001546002906101008110156100"  # noqa: E501
-            "025781015490826101008110156100025781019190915581906101029060009083610100"  # noqa: E501
-            "811015610002578101548252602092909252604081209290925560015461010081101561"  # noqa: E501
-            "00025701555b61065b565b1561018a5761010754610e655b62015180420490565b111561"  # noqa: E501
-            "0e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c"  # noqa: E501
-            "5750610106546101055490830111155b15610eb25750610106805482019055600161018a"  # noqa: E501
-            "565b50600061018a565b6106066101045460005b81811015610f4a576101048054829081"  # noqa: E501
-            "1015610002576000918252600080516020610f75833981519152015414610f3757610104"  # noqa: E501
-            "805461010391600091849081101561000257600080516020610f75833981519152015482"  # noqa: E501
-            "52506020919091526040812081815560018101829055600201555b600101610ec4565b50"  # noqa: E501
-            "50506001016104f9565b61010480546000808355919091526104a790600080516020610f"  # noqa: E501
-            "7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1"  # noqa: E501
-            "cab91f525b5ae7a03d02fabe"
+        data=Bytes(
+            "6060604052604051602080611014833960806040818152925160016000818155818055600160a060020a03331660038190558152610102909452938320939093556201518042046101075582917f102d25c49d33fcdb8976a3f2744e0785c98d9e43b88364859e6aec4ae82eff5c91a250610f958061007f6000396000f300606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         gas_limit=2225022,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"): Account(
+        sender: Account(storage={}, nonce=2),
+        compute_create_address(address=sender, nonce=1): Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
+                263: 0,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=100,
+            nonce=1,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_wallet_default.py b/tests/ported_static/stWalletTest/test_wallet_default.py
index 1712ba2a041..92582b8fc42 100644
--- a/tests/ported_static/stWalletTest/test_wallet_default.py
+++ b/tests/ported_static/stWalletTest/test_wallet_default.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_wallet_default.
 
 Ported from:
-tests/static/state_tests/stWalletTest/walletDefaultFiller.json
+state_tests/stWalletTest/walletDefaultFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -21,7 +21,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stWalletTest/walletDefaultFiller.json"],
+    ["state_tests/stWalletTest/walletDefaultFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -29,11 +29,10 @@ def test_wallet_default(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_wallet_default."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A75EF08F, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -44,151 +43,47 @@ def test_wallet_default(
         gas_limit=100000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf"  # noqa: E501
-            "6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb481461"  # noqa: E501
-            "01c9578063746c9171146101fd578063797af62714610206578063b20d30a91461021957"  # noqa: E501
-            "8063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2"  # noqa: E501
-            "cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d86"  # noqa: E501
-            "1461037f575b61038960003411156101095760408051600160a060020a03331681523460"  # noqa: E501
-            "2082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5c"  # noqa: E501
-            "c9109c929181900390910190a15b565b6103896004356000600036436040518084848082"  # noqa: E501
-            "84375050509091019081526040519081900360200190209050610693815b600160a06002"  # noqa: E501
-            "0a0333166000908152610102602052604081205481808083811415610c1357610d6c565b"  # noqa: E501
-            "61038b6004355b600160a060020a03811660009081526101026020526040812054115b91"  # noqa: E501
-            "9050565b61038b60015481565b6103896000364360405180848480828437505050909101"  # noqa: E501
-            "90815260405190819003602001902090506107e58161013d565b61038960043560003643"  # noqa: E501
-            "60405180848480828437505050909101908152604051908190036020019020905061060b"  # noqa: E501
-            "8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b6103"  # noqa: E501
-            "896004356000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "01902090506107d98161013d565b61038b60048035906024803591604435918201910135"  # noqa: E501
-            "60006108043361016e565b610389600435600160a060020a033316600090815261010260"  # noqa: E501
-            "205260408120549080808381141561039d5761041f565b61038960043560003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209050610752816101"  # noqa: E501
-            "3d565b61038b600435602435600082815261010360209081526040808320600160a06002"  # noqa: E501
-            "0a0385168452610102909252822054829081818114156107ab576107cf565b6103896004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "90506107f38161013d565b61038960043560243560006000364360405180848480828437"  # noqa: E501
-            "50505090910190815260405190819003602001902090506104ac8161013d565b61038b61"  # noqa: E501
-            "01055481565b005b60408051918252519081900360200190f35b50505060008281526101"  # noqa: E501
-            "03602052604081206001810154600284900a929083168190111561041f57815460018381"  # noqa: E501
-            "01805492909101845590849003905560408051600160a060020a03331681526020810187"  # noqa: E501
-            "905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d759173"  # noqa: E501
-            "4b929181900390910190a15b5050505050565b600160a060020a03831660028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0385166000818152610102602090815260"  # noqa: E501
-            "4080832083905584835291829020869055815192835282019290925281517fb532073b38"  # noqa: E501
-            "c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190"  # noqa: E501
-            "a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b6001"  # noqa: E501
-            "60a060020a0384166000908152610102602052604081205492508214156104ee57506104"  # noqa: E501
-            "a7565b6104265b6101045460005b81811015610eba576101048054610108916000918490"  # noqa: E501
-            "81101561000257600080516020610f758339815191520154825250602091825260408120"  # noqa: E501
-            "8054600160a060020a031916815560018101829055600281018054838255908352838320"  # noqa: E501
-            "9193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060"  # noqa: E501
-            "020a03831690600290610100811015610002579090016000508190555060016000505461"  # noqa: E501
-            "0102600050600084600160a060020a031681526020019081526020016000206000508190"  # noqa: E501
-            "55507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c382"  # noqa: E501
-            "6040518082600160a060020a0316815260200191505060405180910390a15b505b50565b"  # noqa: E501
-            "15610606576106198261016e565b156106245750610608565b61062c6104f2565b600154"  # noqa: E501
-            "60fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b61"  # noqa: E501
-            "07105b600060015b600154811015610a47575b6001548110801561068657506002816101"  # noqa: E501
-            "00811015610002570154600014155b15610d7557600101610666565b156104a757600160"  # noqa: E501
-            "a060020a0383166000908152610102602052604081205492508214156106c15750610606"  # noqa: E501
-            "565b60016001600050540360006000505411156106dc5750610606565b60006002836101"  # noqa: E501
-            "0081101561000257508301819055600160a060020a038416815261010260205260408120"  # noqa: E501
-            "556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb"  # noqa: E501
-            "0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a15050"  # noqa: E501
-            "50565b15610606576001548211156107675750610608565b60008290556107746104f256"  # noqa: E501
-            "5b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9b"  # noqa: E501
-            "eaf0dad4f550da9181900360200190a15050565b506001830154600282900a9081166000"  # noqa: E501
-            "14156107ca57600094506107cf565b600194505b5050505092915050565b156106065750"  # noqa: E501
-            "61010555565b156106085760006101065550565b156106065781600160a060020a0316ff"  # noqa: E501
-            "5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa"  # noqa: E501
-            "31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160"  # noqa: E501
-            "a060020a0316815260200185815260200184600160a060020a0316815260200180602001"  # noqa: E501
-            "828103825284848281815260200192508082843782019150509650505050505050604051"  # noqa: E501
-            "80910390a184600160a060020a0316848484604051808383808284375050509081019150"  # noqa: E501
-            "6000908083038185876185025a03f15060009350610a2392505050565b60003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209150610904905081"  # noqa: E501
-            "61020d565b158015610927575060008181526101086020526040812054600160a060020a"  # noqa: E501
-            "0316145b15610a235760008181526101086020908152604082208054600160a060020a03"  # noqa: E501
-            "191688178155600181018790556002018054858255818452928290209092601f01919091"  # noqa: E501
-            "048101908490868215610a2b579182015b82811115610a2b578235826000505591602001"  # noqa: E501
-            "91906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a"  # noqa: E501
-            "7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a06002"  # noqa: E501
-            "0a0316815260200185815260200184600160a060020a0316815260200180602001828103"  # noqa: E501
-            "825284848281815260200192508082843782019150509750505050505050506040518091"  # noqa: E501
-            "0390a15b949350505050565b5061099a9291505b80821115610a47576000815560010161"  # noqa: E501
-            "0a33565b5090565b15610c005760008381526101086020526040812054600160a060020a"  # noqa: E501
-            "031614610c0057604080516000918220805460018201546002929092018054600160a060"  # noqa: E501
-            "020a0392909216949293909291819084908015610acd5782019190600052602060002090"  # noqa: E501
-            "5b815481529060010190602001808311610ab057829003601f168201915b505092505050"  # noqa: E501
-            "60006040518083038185876185025a03f150505060008481526101086020908152604080"  # noqa: E501
-            "5181842080546001820154600160a060020a033381811686529685018c90529484018190"  # noqa: E501
-            "5293166060830181905260a06080840181815260029390930180549185018290527fe7c9"  # noqa: E501
-            "57c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b96"  # noqa: E501
-            "9294929390929160c083019085908015610ba257820191906000526020600020905b8154"  # noqa: E501
-            "81529060010190602001808311610b8557829003601f168201915b505097505050505050"  # noqa: E501
-            "505060405180910390a160008381526101086020908152604082208054600160a060020a"  # noqa: E501
-            "031916815560018101839055600281018054848255908452828420919392610c0692601f"  # noqa: E501
-            "9290920104810190610a33565b50919050565b505050600191505061018a565b60008681"  # noqa: E501
-            "52610103602052604081208054909450909250821415610c9c5781548355600183810183"  # noqa: E501
-            "90556101048054918201808255828015829011610c6b5781836000526020600020918201"  # noqa: E501
-            "9101610c6b9190610a33565b505050600284018190556101048054889290811015610002"  # noqa: E501
-            "57600091909152600080516020610f7583398151915201555b506001820154600284900a"  # noqa: E501
-            "90811660001415610d6c5760408051600160a060020a0333168152602081018890528151"  # noqa: E501
-            "7fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181"  # noqa: E501
-            "900390910190a1825460019011610d595760008681526101036020526040902060020154"  # noqa: E501
-            "61010480549091908110156100025760406000908120600080516020610f758339815191"  # noqa: E501
-            "529290920181905580825560018083018290556002909201559550610d6c9050565b8254"  # noqa: E501
-            "600019018355600183018054821790555b50505050919050565b5b60018054118015610d"  # noqa: E501
-            "9857506001546002906101008110156100025701546000145b15610dac57600180546000"  # noqa: E501
-            "19019055610d76565b60015481108015610dcf5750600154600290610100811015610002"  # noqa: E501
-            "570154600014155b8015610de957506002816101008110156100025701546000145b1561"  # noqa: E501
-            "0e4a57600154600290610100811015610002578101549082610100811015610002578101"  # noqa: E501
-            "919091558190610102906000908361010081101561000257810154825260209290925260"  # noqa: E501
-            "408120929092556001546101008110156100025701555b61065b565b1561018a57610107"  # noqa: E501
-            "54610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b6101"  # noqa: E501
-            "07555b6101065480830110801590610e9c5750610106546101055490830111155b15610e"  # noqa: E501
-            "b25750610106805482019055600161018a565b50600061018a565b610606610104546000"  # noqa: E501
-            "5b81811015610f4a5761010480548290811015610002576000918252600080516020610f"  # noqa: E501
-            "75833981519152015414610f375761010480546101039160009184908110156100025760"  # noqa: E501
-            "0080516020610f7583398151915201548252506020919091526040812081815560018101"  # noqa: E501
-            "829055600201555b600101610ec4565b5050506001016104f9565b610104805460008083"  # noqa: E501
-            "55919091526104a790600080516020610f7583398151915290810190610a3356004c0be6"  # noqa: E501
-            "0200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
+            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x106: 0xC22E4,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            262: 0xC22E4,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, nonce=2),
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 262: 0xC22E4,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_wallet_default_with_out_value.py b/tests/ported_static/stWalletTest/test_wallet_default_with_out_value.py
index f024d481fd8..944b60d6d4f 100644
--- a/tests/ported_static/stWalletTest/test_wallet_default_with_out_value.py
+++ b/tests/ported_static/stWalletTest/test_wallet_default_with_out_value.py
@@ -1,16 +1,16 @@
 """
-Test ported from static filler.
+Test_wallet_default_with_out_value.
 
 Ported from:
-tests/static/state_tests/stWalletTest/walletDefaultWithOutValueFiller.json
+state_tests/stWalletTest/walletDefaultWithOutValueFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -21,9 +21,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/walletDefaultWithOutValueFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/walletDefaultWithOutValueFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,11 +29,10 @@ def test_wallet_default_with_out_value(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_wallet_default_with_out_value."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A75EF08F, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,150 +43,46 @@ def test_wallet_default_with_out_value(
         gas_limit=100000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf"  # noqa: E501
-            "6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb481461"  # noqa: E501
-            "01c9578063746c9171146101fd578063797af62714610206578063b20d30a91461021957"  # noqa: E501
-            "8063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2"  # noqa: E501
-            "cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d86"  # noqa: E501
-            "1461037f575b61038960003411156101095760408051600160a060020a03331681523460"  # noqa: E501
-            "2082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5c"  # noqa: E501
-            "c9109c929181900390910190a15b565b6103896004356000600036436040518084848082"  # noqa: E501
-            "84375050509091019081526040519081900360200190209050610693815b600160a06002"  # noqa: E501
-            "0a0333166000908152610102602052604081205481808083811415610c1357610d6c565b"  # noqa: E501
-            "61038b6004355b600160a060020a03811660009081526101026020526040812054115b91"  # noqa: E501
-            "9050565b61038b60015481565b6103896000364360405180848480828437505050909101"  # noqa: E501
-            "90815260405190819003602001902090506107e58161013d565b61038960043560003643"  # noqa: E501
-            "60405180848480828437505050909101908152604051908190036020019020905061060b"  # noqa: E501
-            "8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b6103"  # noqa: E501
-            "896004356000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "01902090506107d98161013d565b61038b60048035906024803591604435918201910135"  # noqa: E501
-            "60006108043361016e565b610389600435600160a060020a033316600090815261010260"  # noqa: E501
-            "205260408120549080808381141561039d5761041f565b61038960043560003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209050610752816101"  # noqa: E501
-            "3d565b61038b600435602435600082815261010360209081526040808320600160a06002"  # noqa: E501
-            "0a0385168452610102909252822054829081818114156107ab576107cf565b6103896004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "90506107f38161013d565b61038960043560243560006000364360405180848480828437"  # noqa: E501
-            "50505090910190815260405190819003602001902090506104ac8161013d565b61038b61"  # noqa: E501
-            "01055481565b005b60408051918252519081900360200190f35b50505060008281526101"  # noqa: E501
-            "03602052604081206001810154600284900a929083168190111561041f57815460018381"  # noqa: E501
-            "01805492909101845590849003905560408051600160a060020a03331681526020810187"  # noqa: E501
-            "905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d759173"  # noqa: E501
-            "4b929181900390910190a15b5050505050565b600160a060020a03831660028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0385166000818152610102602090815260"  # noqa: E501
-            "4080832083905584835291829020869055815192835282019290925281517fb532073b38"  # noqa: E501
-            "c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190"  # noqa: E501
-            "a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b6001"  # noqa: E501
-            "60a060020a0384166000908152610102602052604081205492508214156104ee57506104"  # noqa: E501
-            "a7565b6104265b6101045460005b81811015610eba576101048054610108916000918490"  # noqa: E501
-            "81101561000257600080516020610f758339815191520154825250602091825260408120"  # noqa: E501
-            "8054600160a060020a031916815560018101829055600281018054838255908352838320"  # noqa: E501
-            "9193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060"  # noqa: E501
-            "020a03831690600290610100811015610002579090016000508190555060016000505461"  # noqa: E501
-            "0102600050600084600160a060020a031681526020019081526020016000206000508190"  # noqa: E501
-            "55507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c382"  # noqa: E501
-            "6040518082600160a060020a0316815260200191505060405180910390a15b505b50565b"  # noqa: E501
-            "15610606576106198261016e565b156106245750610608565b61062c6104f2565b600154"  # noqa: E501
-            "60fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b61"  # noqa: E501
-            "07105b600060015b600154811015610a47575b6001548110801561068657506002816101"  # noqa: E501
-            "00811015610002570154600014155b15610d7557600101610666565b156104a757600160"  # noqa: E501
-            "a060020a0383166000908152610102602052604081205492508214156106c15750610606"  # noqa: E501
-            "565b60016001600050540360006000505411156106dc5750610606565b60006002836101"  # noqa: E501
-            "0081101561000257508301819055600160a060020a038416815261010260205260408120"  # noqa: E501
-            "556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb"  # noqa: E501
-            "0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a15050"  # noqa: E501
-            "50565b15610606576001548211156107675750610608565b60008290556107746104f256"  # noqa: E501
-            "5b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9b"  # noqa: E501
-            "eaf0dad4f550da9181900360200190a15050565b506001830154600282900a9081166000"  # noqa: E501
-            "14156107ca57600094506107cf565b600194505b5050505092915050565b156106065750"  # noqa: E501
-            "61010555565b156106085760006101065550565b156106065781600160a060020a0316ff"  # noqa: E501
-            "5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa"  # noqa: E501
-            "31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160"  # noqa: E501
-            "a060020a0316815260200185815260200184600160a060020a0316815260200180602001"  # noqa: E501
-            "828103825284848281815260200192508082843782019150509650505050505050604051"  # noqa: E501
-            "80910390a184600160a060020a0316848484604051808383808284375050509081019150"  # noqa: E501
-            "6000908083038185876185025a03f15060009350610a2392505050565b60003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209150610904905081"  # noqa: E501
-            "61020d565b158015610927575060008181526101086020526040812054600160a060020a"  # noqa: E501
-            "0316145b15610a235760008181526101086020908152604082208054600160a060020a03"  # noqa: E501
-            "191688178155600181018790556002018054858255818452928290209092601f01919091"  # noqa: E501
-            "048101908490868215610a2b579182015b82811115610a2b578235826000505591602001"  # noqa: E501
-            "91906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a"  # noqa: E501
-            "7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a06002"  # noqa: E501
-            "0a0316815260200185815260200184600160a060020a0316815260200180602001828103"  # noqa: E501
-            "825284848281815260200192508082843782019150509750505050505050506040518091"  # noqa: E501
-            "0390a15b949350505050565b5061099a9291505b80821115610a47576000815560010161"  # noqa: E501
-            "0a33565b5090565b15610c005760008381526101086020526040812054600160a060020a"  # noqa: E501
-            "031614610c0057604080516000918220805460018201546002929092018054600160a060"  # noqa: E501
-            "020a0392909216949293909291819084908015610acd5782019190600052602060002090"  # noqa: E501
-            "5b815481529060010190602001808311610ab057829003601f168201915b505092505050"  # noqa: E501
-            "60006040518083038185876185025a03f150505060008481526101086020908152604080"  # noqa: E501
-            "5181842080546001820154600160a060020a033381811686529685018c90529484018190"  # noqa: E501
-            "5293166060830181905260a06080840181815260029390930180549185018290527fe7c9"  # noqa: E501
-            "57c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b96"  # noqa: E501
-            "9294929390929160c083019085908015610ba257820191906000526020600020905b8154"  # noqa: E501
-            "81529060010190602001808311610b8557829003601f168201915b505097505050505050"  # noqa: E501
-            "505060405180910390a160008381526101086020908152604082208054600160a060020a"  # noqa: E501
-            "031916815560018101839055600281018054848255908452828420919392610c0692601f"  # noqa: E501
-            "9290920104810190610a33565b50919050565b505050600191505061018a565b60008681"  # noqa: E501
-            "52610103602052604081208054909450909250821415610c9c5781548355600183810183"  # noqa: E501
-            "90556101048054918201808255828015829011610c6b5781836000526020600020918201"  # noqa: E501
-            "9101610c6b9190610a33565b505050600284018190556101048054889290811015610002"  # noqa: E501
-            "57600091909152600080516020610f7583398151915201555b506001820154600284900a"  # noqa: E501
-            "90811660001415610d6c5760408051600160a060020a0333168152602081018890528151"  # noqa: E501
-            "7fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181"  # noqa: E501
-            "900390910190a1825460019011610d595760008681526101036020526040902060020154"  # noqa: E501
-            "61010480549091908110156100025760406000908120600080516020610f758339815191"  # noqa: E501
-            "529290920181905580825560018083018290556002909201559550610d6c9050565b8254"  # noqa: E501
-            "600019018355600183018054821790555b50505050919050565b5b60018054118015610d"  # noqa: E501
-            "9857506001546002906101008110156100025701546000145b15610dac57600180546000"  # noqa: E501
-            "19019055610d76565b60015481108015610dcf5750600154600290610100811015610002"  # noqa: E501
-            "570154600014155b8015610de957506002816101008110156100025701546000145b1561"  # noqa: E501
-            "0e4a57600154600290610100811015610002578101549082610100811015610002578101"  # noqa: E501
-            "919091558190610102906000908361010081101561000257810154825260209290925260"  # noqa: E501
-            "408120929092556001546101008110156100025701555b61065b565b1561018a57610107"  # noqa: E501
-            "54610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b6101"  # noqa: E501
-            "07555b6101065480830110801590610e9c5750610106546101055490830111155b15610e"  # noqa: E501
-            "b25750610106805482019055600161018a565b50600061018a565b610606610104546000"  # noqa: E501
-            "5b81811015610f4a5761010480548290811015610002576000918252600080516020610f"  # noqa: E501
-            "75833981519152015414610f375761010480546101039160009184908110156100025760"  # noqa: E501
-            "0080516020610f7583398151915201548252506020919091526040812081815560018101"  # noqa: E501
-            "829055600201555b600101610ec4565b5050506001016104f9565b610104805460008083"  # noqa: E501
-            "55919091526104a790600080516020610f7583398151915290810190610a3356004c0be6"  # noqa: E501
-            "0200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
+            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x106: 0xC22E4,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            262: 0xC22E4,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=10000000,
         nonce=1,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, code=b"", nonce=2),
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 262: 0xC22E4,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=100,
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_wallet_execute_over_daily_limit_multi_owner.py b/tests/ported_static/stWalletTest/test_wallet_execute_over_daily_limit_multi_owner.py
index 752fec7b5d8..0b55aad076c 100644
--- a/tests/ported_static/stWalletTest/test_wallet_execute_over_daily_limit_multi_owner.py
+++ b/tests/ported_static/stWalletTest/test_wallet_execute_over_daily_limit_multi_owner.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_wallet_execute_over_daily_limit_multi_owner.
 
 Ported from:
-tests/static/state_tests/stWalletTest
-walletExecuteOverDailyLimitMultiOwnerFiller.json
+state_tests/stWalletTest/walletExecuteOverDailyLimitMultiOwnerFiller.json
 """
 
 import pytest
@@ -12,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -23,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stWalletTest/walletExecuteOverDailyLimitMultiOwnerFiller.json",  # noqa: E501
+        "state_tests/stWalletTest/walletExecuteOverDailyLimitMultiOwnerFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -32,8 +33,9 @@ def test_wallet_execute_over_daily_limit_multi_owner(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_wallet_execute_over_daily_limit_multi_owner."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,154 +50,46 @@ def test_wallet_execute_over_daily_limit_multi_owner(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf"  # noqa: E501
-            "6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb481461"  # noqa: E501
-            "01c9578063746c9171146101fd578063797af62714610206578063b20d30a91461021957"  # noqa: E501
-            "8063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2"  # noqa: E501
-            "cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d86"  # noqa: E501
-            "1461037f575b61038960003411156101095760408051600160a060020a03331681523460"  # noqa: E501
-            "2082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5c"  # noqa: E501
-            "c9109c929181900390910190a15b565b6103896004356000600036436040518084848082"  # noqa: E501
-            "84375050509091019081526040519081900360200190209050610693815b600160a06002"  # noqa: E501
-            "0a0333166000908152610102602052604081205481808083811415610c1357610d6c565b"  # noqa: E501
-            "61038b6004355b600160a060020a03811660009081526101026020526040812054115b91"  # noqa: E501
-            "9050565b61038b60015481565b6103896000364360405180848480828437505050909101"  # noqa: E501
-            "90815260405190819003602001902090506107e58161013d565b61038960043560003643"  # noqa: E501
-            "60405180848480828437505050909101908152604051908190036020019020905061060b"  # noqa: E501
-            "8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b6103"  # noqa: E501
-            "896004356000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "01902090506107d98161013d565b61038b60048035906024803591604435918201910135"  # noqa: E501
-            "60006108043361016e565b610389600435600160a060020a033316600090815261010260"  # noqa: E501
-            "205260408120549080808381141561039d5761041f565b61038960043560003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209050610752816101"  # noqa: E501
-            "3d565b61038b600435602435600082815261010360209081526040808320600160a06002"  # noqa: E501
-            "0a0385168452610102909252822054829081818114156107ab576107cf565b6103896004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "90506107f38161013d565b61038960043560243560006000364360405180848480828437"  # noqa: E501
-            "50505090910190815260405190819003602001902090506104ac8161013d565b61038b61"  # noqa: E501
-            "01055481565b005b60408051918252519081900360200190f35b50505060008281526101"  # noqa: E501
-            "03602052604081206001810154600284900a929083168190111561041f57815460018381"  # noqa: E501
-            "01805492909101845590849003905560408051600160a060020a03331681526020810187"  # noqa: E501
-            "905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d759173"  # noqa: E501
-            "4b929181900390910190a15b5050505050565b600160a060020a03831660028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0385166000818152610102602090815260"  # noqa: E501
-            "4080832083905584835291829020869055815192835282019290925281517fb532073b38"  # noqa: E501
-            "c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190"  # noqa: E501
-            "a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b6001"  # noqa: E501
-            "60a060020a0384166000908152610102602052604081205492508214156104ee57506104"  # noqa: E501
-            "a7565b6104265b6101045460005b81811015610eba576101048054610108916000918490"  # noqa: E501
-            "81101561000257600080516020610f758339815191520154825250602091825260408120"  # noqa: E501
-            "8054600160a060020a031916815560018101829055600281018054838255908352838320"  # noqa: E501
-            "9193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060"  # noqa: E501
-            "020a03831690600290610100811015610002579090016000508190555060016000505461"  # noqa: E501
-            "0102600050600084600160a060020a031681526020019081526020016000206000508190"  # noqa: E501
-            "55507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c382"  # noqa: E501
-            "6040518082600160a060020a0316815260200191505060405180910390a15b505b50565b"  # noqa: E501
-            "15610606576106198261016e565b156106245750610608565b61062c6104f2565b600154"  # noqa: E501
-            "60fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b61"  # noqa: E501
-            "07105b600060015b600154811015610a47575b6001548110801561068657506002816101"  # noqa: E501
-            "00811015610002570154600014155b15610d7557600101610666565b156104a757600160"  # noqa: E501
-            "a060020a0383166000908152610102602052604081205492508214156106c15750610606"  # noqa: E501
-            "565b60016001600050540360006000505411156106dc5750610606565b60006002836101"  # noqa: E501
-            "0081101561000257508301819055600160a060020a038416815261010260205260408120"  # noqa: E501
-            "556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb"  # noqa: E501
-            "0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a15050"  # noqa: E501
-            "50565b15610606576001548211156107675750610608565b60008290556107746104f256"  # noqa: E501
-            "5b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9b"  # noqa: E501
-            "eaf0dad4f550da9181900360200190a15050565b506001830154600282900a9081166000"  # noqa: E501
-            "14156107ca57600094506107cf565b600194505b5050505092915050565b156106065750"  # noqa: E501
-            "61010555565b156106085760006101065550565b156106065781600160a060020a0316ff"  # noqa: E501
-            "5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa"  # noqa: E501
-            "31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160"  # noqa: E501
-            "a060020a0316815260200185815260200184600160a060020a0316815260200180602001"  # noqa: E501
-            "828103825284848281815260200192508082843782019150509650505050505050604051"  # noqa: E501
-            "80910390a184600160a060020a0316848484604051808383808284375050509081019150"  # noqa: E501
-            "6000908083038185876185025a03f15060009350610a2392505050565b60003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209150610904905081"  # noqa: E501
-            "61020d565b158015610927575060008181526101086020526040812054600160a060020a"  # noqa: E501
-            "0316145b15610a235760008181526101086020908152604082208054600160a060020a03"  # noqa: E501
-            "191688178155600181018790556002018054858255818452928290209092601f01919091"  # noqa: E501
-            "048101908490868215610a2b579182015b82811115610a2b578235826000505591602001"  # noqa: E501
-            "91906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a"  # noqa: E501
-            "7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a06002"  # noqa: E501
-            "0a0316815260200185815260200184600160a060020a0316815260200180602001828103"  # noqa: E501
-            "825284848281815260200192508082843782019150509750505050505050506040518091"  # noqa: E501
-            "0390a15b949350505050565b5061099a9291505b80821115610a47576000815560010161"  # noqa: E501
-            "0a33565b5090565b15610c005760008381526101086020526040812054600160a060020a"  # noqa: E501
-            "031614610c0057604080516000918220805460018201546002929092018054600160a060"  # noqa: E501
-            "020a0392909216949293909291819084908015610acd5782019190600052602060002090"  # noqa: E501
-            "5b815481529060010190602001808311610ab057829003601f168201915b505092505050"  # noqa: E501
-            "60006040518083038185876185025a03f150505060008481526101086020908152604080"  # noqa: E501
-            "5181842080546001820154600160a060020a033381811686529685018c90529484018190"  # noqa: E501
-            "5293166060830181905260a06080840181815260029390930180549185018290527fe7c9"  # noqa: E501
-            "57c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b96"  # noqa: E501
-            "9294929390929160c083019085908015610ba257820191906000526020600020905b8154"  # noqa: E501
-            "81529060010190602001808311610b8557829003601f168201915b505097505050505050"  # noqa: E501
-            "505060405180910390a160008381526101086020908152604082208054600160a060020a"  # noqa: E501
-            "031916815560018101839055600281018054848255908452828420919392610c0692601f"  # noqa: E501
-            "9290920104810190610a33565b50919050565b505050600191505061018a565b60008681"  # noqa: E501
-            "52610103602052604081208054909450909250821415610c9c5781548355600183810183"  # noqa: E501
-            "90556101048054918201808255828015829011610c6b5781836000526020600020918201"  # noqa: E501
-            "9101610c6b9190610a33565b505050600284018190556101048054889290811015610002"  # noqa: E501
-            "57600091909152600080516020610f7583398151915201555b506001820154600284900a"  # noqa: E501
-            "90811660001415610d6c5760408051600160a060020a0333168152602081018890528151"  # noqa: E501
-            "7fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181"  # noqa: E501
-            "900390910190a1825460019011610d595760008681526101036020526040902060020154"  # noqa: E501
-            "61010480549091908110156100025760406000908120600080516020610f758339815191"  # noqa: E501
-            "529290920181905580825560018083018290556002909201559550610d6c9050565b8254"  # noqa: E501
-            "600019018355600183018054821790555b50505050919050565b5b60018054118015610d"  # noqa: E501
-            "9857506001546002906101008110156100025701546000145b15610dac57600180546000"  # noqa: E501
-            "19019055610d76565b60015481108015610dcf5750600154600290610100811015610002"  # noqa: E501
-            "570154600014155b8015610de957506002816101008110156100025701546000145b1561"  # noqa: E501
-            "0e4a57600154600290610100811015610002578101549082610100811015610002578101"  # noqa: E501
-            "919091558190610102906000908361010081101561000257810154825260209290925260"  # noqa: E501
-            "408120929092556001546101008110156100025701555b61065b565b1561018a57610107"  # noqa: E501
-            "54610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b6101"  # noqa: E501
-            "07555b6101065480830110801590610e9c5750610106546101055490830111155b15610e"  # noqa: E501
-            "b25750610106805482019055600161018a565b50600061018a565b610606610104546000"  # noqa: E501
-            "5b81811015610f4a5761010480548290811015610002576000918252600080516020610f"  # noqa: E501
-            "75833981519152015414610f375761010480546101039160009184908110156100025760"  # noqa: E501
-            "0080516020610f7583398151915201548252506020919091526040812081815560018101"  # noqa: E501
-            "829055600201555b600101610ec4565b5050506001016104f9565b610104805460008083"  # noqa: E501
-            "55919091526104a790600080516020610f7583398151915290810190610a3356004c0be6"  # noqa: E501
-            "0200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
+            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x2,
-            0x1: 0x2,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x4: 0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
-            0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 0x2,  # noqa: E501
+            0: 2,
+            1: 2,
+            3: sender,
+            4: 0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
+            0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 2,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"),  # noqa: E501
+        address=Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "b61d27f6000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000900000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000060"
-        ),
+        to=contract_0,
+        data=Bytes("b61d27f6")
+        + Hash(0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA)
+        + Hash(0x9)
+        + Hash(0x60),
         gas_limit=10000000,
         nonce=1,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, nonce=2),
+        contract_0: Account(
             storage={
                 0: 2,
                 1: 2,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 4: 0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
                 260: 1,
+                263: 0,
                 0x4C0BE60200FAA20559308CB7B5A1BB3255C16CB1CAB91F525B5AE7A03D02FABE: 0x28E0E8F21C16F43AAA1E26147FB1CC74296CD3823267FA5BEBC02E090063C36D,  # noqa: E501
                 0x5FD43EE7113B9859F7CAB1408959B063A9B2E07B4C9EC4098B2768DB95A4CBA7: 1,  # noqa: E501
                 0x5FD43EE7113B9859F7CAB1408959B063A9B2E07B4C9EC4098B2768DB95A4CBA8: 2,  # noqa: E501
@@ -204,6 +98,11 @@ def test_wallet_execute_over_daily_limit_multi_owner(
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
                 0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 2,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=100,
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_wallet_execute_over_daily_limit_only_one_owner.py b/tests/ported_static/stWalletTest/test_wallet_execute_over_daily_limit_only_one_owner.py
index d1df5ca2554..444a6a1b747 100644
--- a/tests/ported_static/stWalletTest/test_wallet_execute_over_daily_limit_only_one_owner.py
+++ b/tests/ported_static/stWalletTest/test_wallet_execute_over_daily_limit_only_one_owner.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_wallet_execute_over_daily_limit_only_one_owner.
 
 Ported from:
-tests/static/state_tests/stWalletTest
-walletExecuteOverDailyLimitOnlyOneOwnerFiller.json
+state_tests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerFiller.json
 """
 
 import pytest
@@ -12,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -23,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerFiller.json",  # noqa: E501
+        "state_tests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -32,8 +33,9 @@ def test_wallet_execute_over_daily_limit_only_one_owner(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_wallet_execute_over_daily_limit_only_one_owner."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,157 +50,54 @@ def test_wallet_execute_over_daily_limit_only_one_owner(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf"  # noqa: E501
-            "6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb481461"  # noqa: E501
-            "01c9578063746c9171146101fd578063797af62714610206578063b20d30a91461021957"  # noqa: E501
-            "8063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2"  # noqa: E501
-            "cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d86"  # noqa: E501
-            "1461037f575b61038960003411156101095760408051600160a060020a03331681523460"  # noqa: E501
-            "2082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5c"  # noqa: E501
-            "c9109c929181900390910190a15b565b6103896004356000600036436040518084848082"  # noqa: E501
-            "84375050509091019081526040519081900360200190209050610693815b600160a06002"  # noqa: E501
-            "0a0333166000908152610102602052604081205481808083811415610c1357610d6c565b"  # noqa: E501
-            "61038b6004355b600160a060020a03811660009081526101026020526040812054115b91"  # noqa: E501
-            "9050565b61038b60015481565b6103896000364360405180848480828437505050909101"  # noqa: E501
-            "90815260405190819003602001902090506107e58161013d565b61038960043560003643"  # noqa: E501
-            "60405180848480828437505050909101908152604051908190036020019020905061060b"  # noqa: E501
-            "8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b6103"  # noqa: E501
-            "896004356000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "01902090506107d98161013d565b61038b60048035906024803591604435918201910135"  # noqa: E501
-            "60006108043361016e565b610389600435600160a060020a033316600090815261010260"  # noqa: E501
-            "205260408120549080808381141561039d5761041f565b61038960043560003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209050610752816101"  # noqa: E501
-            "3d565b61038b600435602435600082815261010360209081526040808320600160a06002"  # noqa: E501
-            "0a0385168452610102909252822054829081818114156107ab576107cf565b6103896004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "90506107f38161013d565b61038960043560243560006000364360405180848480828437"  # noqa: E501
-            "50505090910190815260405190819003602001902090506104ac8161013d565b61038b61"  # noqa: E501
-            "01055481565b005b60408051918252519081900360200190f35b50505060008281526101"  # noqa: E501
-            "03602052604081206001810154600284900a929083168190111561041f57815460018381"  # noqa: E501
-            "01805492909101845590849003905560408051600160a060020a03331681526020810187"  # noqa: E501
-            "905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d759173"  # noqa: E501
-            "4b929181900390910190a15b5050505050565b600160a060020a03831660028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0385166000818152610102602090815260"  # noqa: E501
-            "4080832083905584835291829020869055815192835282019290925281517fb532073b38"  # noqa: E501
-            "c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190"  # noqa: E501
-            "a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b6001"  # noqa: E501
-            "60a060020a0384166000908152610102602052604081205492508214156104ee57506104"  # noqa: E501
-            "a7565b6104265b6101045460005b81811015610eba576101048054610108916000918490"  # noqa: E501
-            "81101561000257600080516020610f758339815191520154825250602091825260408120"  # noqa: E501
-            "8054600160a060020a031916815560018101829055600281018054838255908352838320"  # noqa: E501
-            "9193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060"  # noqa: E501
-            "020a03831690600290610100811015610002579090016000508190555060016000505461"  # noqa: E501
-            "0102600050600084600160a060020a031681526020019081526020016000206000508190"  # noqa: E501
-            "55507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c382"  # noqa: E501
-            "6040518082600160a060020a0316815260200191505060405180910390a15b505b50565b"  # noqa: E501
-            "15610606576106198261016e565b156106245750610608565b61062c6104f2565b600154"  # noqa: E501
-            "60fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b61"  # noqa: E501
-            "07105b600060015b600154811015610a47575b6001548110801561068657506002816101"  # noqa: E501
-            "00811015610002570154600014155b15610d7557600101610666565b156104a757600160"  # noqa: E501
-            "a060020a0383166000908152610102602052604081205492508214156106c15750610606"  # noqa: E501
-            "565b60016001600050540360006000505411156106dc5750610606565b60006002836101"  # noqa: E501
-            "0081101561000257508301819055600160a060020a038416815261010260205260408120"  # noqa: E501
-            "556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb"  # noqa: E501
-            "0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a15050"  # noqa: E501
-            "50565b15610606576001548211156107675750610608565b60008290556107746104f256"  # noqa: E501
-            "5b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9b"  # noqa: E501
-            "eaf0dad4f550da9181900360200190a15050565b506001830154600282900a9081166000"  # noqa: E501
-            "14156107ca57600094506107cf565b600194505b5050505092915050565b156106065750"  # noqa: E501
-            "61010555565b156106085760006101065550565b156106065781600160a060020a0316ff"  # noqa: E501
-            "5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa"  # noqa: E501
-            "31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160"  # noqa: E501
-            "a060020a0316815260200185815260200184600160a060020a0316815260200180602001"  # noqa: E501
-            "828103825284848281815260200192508082843782019150509650505050505050604051"  # noqa: E501
-            "80910390a184600160a060020a0316848484604051808383808284375050509081019150"  # noqa: E501
-            "6000908083038185876185025a03f15060009350610a2392505050565b60003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209150610904905081"  # noqa: E501
-            "61020d565b158015610927575060008181526101086020526040812054600160a060020a"  # noqa: E501
-            "0316145b15610a235760008181526101086020908152604082208054600160a060020a03"  # noqa: E501
-            "191688178155600181018790556002018054858255818452928290209092601f01919091"  # noqa: E501
-            "048101908490868215610a2b579182015b82811115610a2b578235826000505591602001"  # noqa: E501
-            "91906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a"  # noqa: E501
-            "7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a06002"  # noqa: E501
-            "0a0316815260200185815260200184600160a060020a0316815260200180602001828103"  # noqa: E501
-            "825284848281815260200192508082843782019150509750505050505050506040518091"  # noqa: E501
-            "0390a15b949350505050565b5061099a9291505b80821115610a47576000815560010161"  # noqa: E501
-            "0a33565b5090565b15610c005760008381526101086020526040812054600160a060020a"  # noqa: E501
-            "031614610c0057604080516000918220805460018201546002929092018054600160a060"  # noqa: E501
-            "020a0392909216949293909291819084908015610acd5782019190600052602060002090"  # noqa: E501
-            "5b815481529060010190602001808311610ab057829003601f168201915b505092505050"  # noqa: E501
-            "60006040518083038185876185025a03f150505060008481526101086020908152604080"  # noqa: E501
-            "5181842080546001820154600160a060020a033381811686529685018c90529484018190"  # noqa: E501
-            "5293166060830181905260a06080840181815260029390930180549185018290527fe7c9"  # noqa: E501
-            "57c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b96"  # noqa: E501
-            "9294929390929160c083019085908015610ba257820191906000526020600020905b8154"  # noqa: E501
-            "81529060010190602001808311610b8557829003601f168201915b505097505050505050"  # noqa: E501
-            "505060405180910390a160008381526101086020908152604082208054600160a060020a"  # noqa: E501
-            "031916815560018101839055600281018054848255908452828420919392610c0692601f"  # noqa: E501
-            "9290920104810190610a33565b50919050565b505050600191505061018a565b60008681"  # noqa: E501
-            "52610103602052604081208054909450909250821415610c9c5781548355600183810183"  # noqa: E501
-            "90556101048054918201808255828015829011610c6b5781836000526020600020918201"  # noqa: E501
-            "9101610c6b9190610a33565b505050600284018190556101048054889290811015610002"  # noqa: E501
-            "57600091909152600080516020610f7583398151915201555b506001820154600284900a"  # noqa: E501
-            "90811660001415610d6c5760408051600160a060020a0333168152602081018890528151"  # noqa: E501
-            "7fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181"  # noqa: E501
-            "900390910190a1825460019011610d595760008681526101036020526040902060020154"  # noqa: E501
-            "61010480549091908110156100025760406000908120600080516020610f758339815191"  # noqa: E501
-            "529290920181905580825560018083018290556002909201559550610d6c9050565b8254"  # noqa: E501
-            "600019018355600183018054821790555b50505050919050565b5b60018054118015610d"  # noqa: E501
-            "9857506001546002906101008110156100025701546000145b15610dac57600180546000"  # noqa: E501
-            "19019055610d76565b60015481108015610dcf5750600154600290610100811015610002"  # noqa: E501
-            "570154600014155b8015610de957506002816101008110156100025701546000145b1561"  # noqa: E501
-            "0e4a57600154600290610100811015610002578101549082610100811015610002578101"  # noqa: E501
-            "919091558190610102906000908361010081101561000257810154825260209290925260"  # noqa: E501
-            "408120929092556001546101008110156100025701555b61065b565b1561018a57610107"  # noqa: E501
-            "54610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b6101"  # noqa: E501
-            "07555b6101065480830110801590610e9c5750610106546101055490830111155b15610e"  # noqa: E501
-            "b25750610106805482019055600161018a565b50600061018a565b610606610104546000"  # noqa: E501
-            "5b81811015610f4a5761010480548290811015610002576000918252600080516020610f"  # noqa: E501
-            "75833981519152015414610f375761010480546101039160009184908110156100025760"  # noqa: E501
-            "0080516020610f7583398151915201548252506020919091526040812081815560018101"  # noqa: E501
-            "829055600201555b600101610ec4565b5050506001016104f9565b610104805460008083"  # noqa: E501
-            "55919091526104a790600080516020610f7583398151915290810190610a3356004c0be6"  # noqa: E501
-            "0200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
+            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x105: 0x4,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            261: 4,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"),  # noqa: E501
+        address=Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "b61d27f6000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000900000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000060"
-        ),
+        to=contract_0,
+        data=Bytes("b61d27f6")
+        + Hash(0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA)
+        + Hash(0x9)
+        + Hash(0x60),
         gas_limit=10000000,
         nonce=1,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, nonce=2),
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 260: 1,
                 261: 4,
+                263: 0,
                 0x69D836D8D4229A4B7482679C45208E1A6079C5BE2775A4A87CA2D168319C043E: 0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA,  # noqa: E501
                 0x69D836D8D4229A4B7482679C45208E1A6079C5BE2775A4A87CA2D168319C043F: 9,  # noqa: E501
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=100,
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_wallet_execute_over_daily_limit_only_one_owner_new.py b/tests/ported_static/stWalletTest/test_wallet_execute_over_daily_limit_only_one_owner_new.py
index 16192019ceb..3cc6e54b407 100644
--- a/tests/ported_static/stWalletTest/test_wallet_execute_over_daily_limit_only_one_owner_new.py
+++ b/tests/ported_static/stWalletTest/test_wallet_execute_over_daily_limit_only_one_owner_new.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_wallet_execute_over_daily_limit_only_one_owner_new.
 
 Ported from:
-tests/static/state_tests/stWalletTest
-walletExecuteOverDailyLimitOnlyOneOwnerNewFiller.json
+state_tests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNewFiller.json
 """
 
 import pytest
@@ -12,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -23,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNewFiller.json",  # noqa: E501
+        "state_tests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNewFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -32,8 +33,9 @@ def test_wallet_execute_over_daily_limit_only_one_owner_new(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_wallet_execute_over_daily_limit_only_one_owner_new."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,152 +50,43 @@ def test_wallet_execute_over_daily_limit_only_one_owner_new(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf"  # noqa: E501
-            "6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb481461"  # noqa: E501
-            "01c9578063746c9171146101fd578063797af62714610206578063b20d30a91461021957"  # noqa: E501
-            "8063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2"  # noqa: E501
-            "cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d86"  # noqa: E501
-            "1461037f575b61038960003411156101095760408051600160a060020a03331681523460"  # noqa: E501
-            "2082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5c"  # noqa: E501
-            "c9109c929181900390910190a15b565b6103896004356000600036436040518084848082"  # noqa: E501
-            "84375050509091019081526040519081900360200190209050610693815b600160a06002"  # noqa: E501
-            "0a0333166000908152610102602052604081205481808083811415610c1357610d6c565b"  # noqa: E501
-            "61038b6004355b600160a060020a03811660009081526101026020526040812054115b91"  # noqa: E501
-            "9050565b61038b60015481565b6103896000364360405180848480828437505050909101"  # noqa: E501
-            "90815260405190819003602001902090506107e58161013d565b61038960043560003643"  # noqa: E501
-            "60405180848480828437505050909101908152604051908190036020019020905061060b"  # noqa: E501
-            "8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b6103"  # noqa: E501
-            "896004356000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "01902090506107d98161013d565b61038b60048035906024803591604435918201910135"  # noqa: E501
-            "60006108043361016e565b610389600435600160a060020a033316600090815261010260"  # noqa: E501
-            "205260408120549080808381141561039d5761041f565b61038960043560003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209050610752816101"  # noqa: E501
-            "3d565b61038b600435602435600082815261010360209081526040808320600160a06002"  # noqa: E501
-            "0a0385168452610102909252822054829081818114156107ab576107cf565b6103896004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "90506107f38161013d565b61038960043560243560006000364360405180848480828437"  # noqa: E501
-            "50505090910190815260405190819003602001902090506104ac8161013d565b61038b61"  # noqa: E501
-            "01055481565b005b60408051918252519081900360200190f35b50505060008281526101"  # noqa: E501
-            "03602052604081206001810154600284900a929083168190111561041f57815460018381"  # noqa: E501
-            "01805492909101845590849003905560408051600160a060020a03331681526020810187"  # noqa: E501
-            "905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d759173"  # noqa: E501
-            "4b929181900390910190a15b5050505050565b600160a060020a03831660028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0385166000818152610102602090815260"  # noqa: E501
-            "4080832083905584835291829020869055815192835282019290925281517fb532073b38"  # noqa: E501
-            "c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190"  # noqa: E501
-            "a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b6001"  # noqa: E501
-            "60a060020a0384166000908152610102602052604081205492508214156104ee57506104"  # noqa: E501
-            "a7565b6104265b6101045460005b81811015610eba576101048054610108916000918490"  # noqa: E501
-            "81101561000257600080516020610f758339815191520154825250602091825260408120"  # noqa: E501
-            "8054600160a060020a031916815560018101829055600281018054838255908352838320"  # noqa: E501
-            "9193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060"  # noqa: E501
-            "020a03831690600290610100811015610002579090016000508190555060016000505461"  # noqa: E501
-            "0102600050600084600160a060020a031681526020019081526020016000206000508190"  # noqa: E501
-            "55507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c382"  # noqa: E501
-            "6040518082600160a060020a0316815260200191505060405180910390a15b505b50565b"  # noqa: E501
-            "15610606576106198261016e565b156106245750610608565b61062c6104f2565b600154"  # noqa: E501
-            "60fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b61"  # noqa: E501
-            "07105b600060015b600154811015610a47575b6001548110801561068657506002816101"  # noqa: E501
-            "00811015610002570154600014155b15610d7557600101610666565b156104a757600160"  # noqa: E501
-            "a060020a0383166000908152610102602052604081205492508214156106c15750610606"  # noqa: E501
-            "565b60016001600050540360006000505411156106dc5750610606565b60006002836101"  # noqa: E501
-            "0081101561000257508301819055600160a060020a038416815261010260205260408120"  # noqa: E501
-            "556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb"  # noqa: E501
-            "0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a15050"  # noqa: E501
-            "50565b15610606576001548211156107675750610608565b60008290556107746104f256"  # noqa: E501
-            "5b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9b"  # noqa: E501
-            "eaf0dad4f550da9181900360200190a15050565b506001830154600282900a9081166000"  # noqa: E501
-            "14156107ca57600094506107cf565b600194505b5050505092915050565b156106065750"  # noqa: E501
-            "61010555565b156106085760006101065550565b156106065781600160a060020a0316ff"  # noqa: E501
-            "5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa"  # noqa: E501
-            "31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160"  # noqa: E501
-            "a060020a0316815260200185815260200184600160a060020a0316815260200180602001"  # noqa: E501
-            "828103825284848281815260200192508082843782019150509650505050505050604051"  # noqa: E501
-            "80910390a184600160a060020a0316848484604051808383808284375050509081019150"  # noqa: E501
-            "6000908083038185876185025a03f15060009350610a2392505050565b60003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209150610904905081"  # noqa: E501
-            "61020d565b158015610927575060008181526101086020526040812054600160a060020a"  # noqa: E501
-            "0316145b15610a235760008181526101086020908152604082208054600160a060020a03"  # noqa: E501
-            "191688178155600181018790556002018054858255818452928290209092601f01919091"  # noqa: E501
-            "048101908490868215610a2b579182015b82811115610a2b578235826000505591602001"  # noqa: E501
-            "91906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a"  # noqa: E501
-            "7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a06002"  # noqa: E501
-            "0a0316815260200185815260200184600160a060020a0316815260200180602001828103"  # noqa: E501
-            "825284848281815260200192508082843782019150509750505050505050506040518091"  # noqa: E501
-            "0390a15b949350505050565b5061099a9291505b80821115610a47576000815560010161"  # noqa: E501
-            "0a33565b5090565b15610c005760008381526101086020526040812054600160a060020a"  # noqa: E501
-            "031614610c0057604080516000918220805460018201546002929092018054600160a060"  # noqa: E501
-            "020a0392909216949293909291819084908015610acd5782019190600052602060002090"  # noqa: E501
-            "5b815481529060010190602001808311610ab057829003601f168201915b505092505050"  # noqa: E501
-            "60006040518083038185876185025a03f150505060008481526101086020908152604080"  # noqa: E501
-            "5181842080546001820154600160a060020a033381811686529685018c90529484018190"  # noqa: E501
-            "5293166060830181905260a06080840181815260029390930180549185018290527fe7c9"  # noqa: E501
-            "57c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b96"  # noqa: E501
-            "9294929390929160c083019085908015610ba257820191906000526020600020905b8154"  # noqa: E501
-            "81529060010190602001808311610b8557829003601f168201915b505097505050505050"  # noqa: E501
-            "505060405180910390a160008381526101086020908152604082208054600160a060020a"  # noqa: E501
-            "031916815560018101839055600281018054848255908452828420919392610c0692601f"  # noqa: E501
-            "9290920104810190610a33565b50919050565b505050600191505061018a565b60008681"  # noqa: E501
-            "52610103602052604081208054909450909250821415610c9c5781548355600183810183"  # noqa: E501
-            "90556101048054918201808255828015829011610c6b5781836000526020600020918201"  # noqa: E501
-            "9101610c6b9190610a33565b505050600284018190556101048054889290811015610002"  # noqa: E501
-            "57600091909152600080516020610f7583398151915201555b506001820154600284900a"  # noqa: E501
-            "90811660001415610d6c5760408051600160a060020a0333168152602081018890528151"  # noqa: E501
-            "7fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181"  # noqa: E501
-            "900390910190a1825460019011610d595760008681526101036020526040902060020154"  # noqa: E501
-            "61010480549091908110156100025760406000908120600080516020610f758339815191"  # noqa: E501
-            "529290920181905580825560018083018290556002909201559550610d6c9050565b8254"  # noqa: E501
-            "600019018355600183018054821790555b50505050919050565b5b60018054118015610d"  # noqa: E501
-            "9857506001546002906101008110156100025701546000145b15610dac57600180546000"  # noqa: E501
-            "19019055610d76565b60015481108015610dcf5750600154600290610100811015610002"  # noqa: E501
-            "570154600014155b8015610de957506002816101008110156100025701546000145b1561"  # noqa: E501
-            "0e4a57600154600290610100811015610002578101549082610100811015610002578101"  # noqa: E501
-            "919091558190610102906000908361010081101561000257810154825260209290925260"  # noqa: E501
-            "408120929092556001546101008110156100025701555b61065b565b1561018a57610107"  # noqa: E501
-            "54610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b6101"  # noqa: E501
-            "07555b6101065480830110801590610e9c5750610106546101055490830111155b15610e"  # noqa: E501
-            "b25750610106805482019055600161018a565b50600061018a565b610606610104546000"  # noqa: E501
-            "5b81811015610f4a5761010480548290811015610002576000918252600080516020610f"  # noqa: E501
-            "75833981519152015414610f375761010480546101039160009184908110156100025760"  # noqa: E501
-            "0080516020610f7583398151915201548252506020919091526040812081815560018101"  # noqa: E501
-            "829055600201555b600101610ec4565b5050506001016104f9565b610104805460008083"  # noqa: E501
-            "55919091526104a790600080516020610f7583398151915290810190610a3356004c0be6"  # noqa: E501
-            "0200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
+            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x106: 0x4,
-            0x107: 0xC22E4,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            262: 4,
+            263: 0xC22E4,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"),  # noqa: E501
+        address=Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "b61d27f6000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000900000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000060"
-        ),
+        to=contract_0,
+        data=Bytes("b61d27f6")
+        + Hash(0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA)
+        + Hash(0x9)
+        + Hash(0x60),
         gas_limit=10000000,
         nonce=1,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, nonce=2),
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 260: 1,
                 262: 4,
                 263: 0xC22E4,
@@ -201,6 +94,11 @@ def test_wallet_execute_over_daily_limit_only_one_owner_new(
                 0x69D836D8D4229A4B7482679C45208E1A6079C5BE2775A4A87CA2D168319C043F: 9,  # noqa: E501
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=100,
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_wallet_execute_under_daily_limit.py b/tests/ported_static/stWalletTest/test_wallet_execute_under_daily_limit.py
index f5589a465b9..2399d447e41 100644
--- a/tests/ported_static/stWalletTest/test_wallet_execute_under_daily_limit.py
+++ b/tests/ported_static/stWalletTest/test_wallet_execute_under_daily_limit.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_wallet_execute_under_daily_limit.
 
 Ported from:
-tests/static/state_tests/stWalletTest/walletExecuteUnderDailyLimitFiller.json
+state_tests/stWalletTest/walletExecuteUnderDailyLimitFiller.json
 """
 
 import pytest
@@ -11,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -21,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stWalletTest/walletExecuteUnderDailyLimitFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stWalletTest/walletExecuteUnderDailyLimitFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,8 +31,9 @@ def test_wallet_execute_under_daily_limit(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_wallet_execute_under_daily_limit."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -47,159 +48,56 @@ def test_wallet_execute_under_daily_limit(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf"  # noqa: E501
-            "6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb481461"  # noqa: E501
-            "01c9578063746c9171146101fd578063797af62714610206578063b20d30a91461021957"  # noqa: E501
-            "8063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2"  # noqa: E501
-            "cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d86"  # noqa: E501
-            "1461037f575b61038960003411156101095760408051600160a060020a03331681523460"  # noqa: E501
-            "2082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5c"  # noqa: E501
-            "c9109c929181900390910190a15b565b6103896004356000600036436040518084848082"  # noqa: E501
-            "84375050509091019081526040519081900360200190209050610693815b600160a06002"  # noqa: E501
-            "0a0333166000908152610102602052604081205481808083811415610c1357610d6c565b"  # noqa: E501
-            "61038b6004355b600160a060020a03811660009081526101026020526040812054115b91"  # noqa: E501
-            "9050565b61038b60015481565b6103896000364360405180848480828437505050909101"  # noqa: E501
-            "90815260405190819003602001902090506107e58161013d565b61038960043560003643"  # noqa: E501
-            "60405180848480828437505050909101908152604051908190036020019020905061060b"  # noqa: E501
-            "8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b6103"  # noqa: E501
-            "896004356000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "01902090506107d98161013d565b61038b60048035906024803591604435918201910135"  # noqa: E501
-            "60006108043361016e565b610389600435600160a060020a033316600090815261010260"  # noqa: E501
-            "205260408120549080808381141561039d5761041f565b61038960043560003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209050610752816101"  # noqa: E501
-            "3d565b61038b600435602435600082815261010360209081526040808320600160a06002"  # noqa: E501
-            "0a0385168452610102909252822054829081818114156107ab576107cf565b6103896004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "90506107f38161013d565b61038960043560243560006000364360405180848480828437"  # noqa: E501
-            "50505090910190815260405190819003602001902090506104ac8161013d565b61038b61"  # noqa: E501
-            "01055481565b005b60408051918252519081900360200190f35b50505060008281526101"  # noqa: E501
-            "03602052604081206001810154600284900a929083168190111561041f57815460018381"  # noqa: E501
-            "01805492909101845590849003905560408051600160a060020a03331681526020810187"  # noqa: E501
-            "905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d759173"  # noqa: E501
-            "4b929181900390910190a15b5050505050565b600160a060020a03831660028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0385166000818152610102602090815260"  # noqa: E501
-            "4080832083905584835291829020869055815192835282019290925281517fb532073b38"  # noqa: E501
-            "c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190"  # noqa: E501
-            "a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b6001"  # noqa: E501
-            "60a060020a0384166000908152610102602052604081205492508214156104ee57506104"  # noqa: E501
-            "a7565b6104265b6101045460005b81811015610eba576101048054610108916000918490"  # noqa: E501
-            "81101561000257600080516020610f758339815191520154825250602091825260408120"  # noqa: E501
-            "8054600160a060020a031916815560018101829055600281018054838255908352838320"  # noqa: E501
-            "9193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060"  # noqa: E501
-            "020a03831690600290610100811015610002579090016000508190555060016000505461"  # noqa: E501
-            "0102600050600084600160a060020a031681526020019081526020016000206000508190"  # noqa: E501
-            "55507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c382"  # noqa: E501
-            "6040518082600160a060020a0316815260200191505060405180910390a15b505b50565b"  # noqa: E501
-            "15610606576106198261016e565b156106245750610608565b61062c6104f2565b600154"  # noqa: E501
-            "60fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b61"  # noqa: E501
-            "07105b600060015b600154811015610a47575b6001548110801561068657506002816101"  # noqa: E501
-            "00811015610002570154600014155b15610d7557600101610666565b156104a757600160"  # noqa: E501
-            "a060020a0383166000908152610102602052604081205492508214156106c15750610606"  # noqa: E501
-            "565b60016001600050540360006000505411156106dc5750610606565b60006002836101"  # noqa: E501
-            "0081101561000257508301819055600160a060020a038416815261010260205260408120"  # noqa: E501
-            "556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb"  # noqa: E501
-            "0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a15050"  # noqa: E501
-            "50565b15610606576001548211156107675750610608565b60008290556107746104f256"  # noqa: E501
-            "5b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9b"  # noqa: E501
-            "eaf0dad4f550da9181900360200190a15050565b506001830154600282900a9081166000"  # noqa: E501
-            "14156107ca57600094506107cf565b600194505b5050505092915050565b156106065750"  # noqa: E501
-            "61010555565b156106085760006101065550565b156106065781600160a060020a0316ff"  # noqa: E501
-            "5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa"  # noqa: E501
-            "31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160"  # noqa: E501
-            "a060020a0316815260200185815260200184600160a060020a0316815260200180602001"  # noqa: E501
-            "828103825284848281815260200192508082843782019150509650505050505050604051"  # noqa: E501
-            "80910390a184600160a060020a0316848484604051808383808284375050509081019150"  # noqa: E501
-            "6000908083038185876185025a03f15060009350610a2392505050565b60003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209150610904905081"  # noqa: E501
-            "61020d565b158015610927575060008181526101086020526040812054600160a060020a"  # noqa: E501
-            "0316145b15610a235760008181526101086020908152604082208054600160a060020a03"  # noqa: E501
-            "191688178155600181018790556002018054858255818452928290209092601f01919091"  # noqa: E501
-            "048101908490868215610a2b579182015b82811115610a2b578235826000505591602001"  # noqa: E501
-            "91906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a"  # noqa: E501
-            "7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a06002"  # noqa: E501
-            "0a0316815260200185815260200184600160a060020a0316815260200180602001828103"  # noqa: E501
-            "825284848281815260200192508082843782019150509750505050505050506040518091"  # noqa: E501
-            "0390a15b949350505050565b5061099a9291505b80821115610a47576000815560010161"  # noqa: E501
-            "0a33565b5090565b15610c005760008381526101086020526040812054600160a060020a"  # noqa: E501
-            "031614610c0057604080516000918220805460018201546002929092018054600160a060"  # noqa: E501
-            "020a0392909216949293909291819084908015610acd5782019190600052602060002090"  # noqa: E501
-            "5b815481529060010190602001808311610ab057829003601f168201915b505092505050"  # noqa: E501
-            "60006040518083038185876185025a03f150505060008481526101086020908152604080"  # noqa: E501
-            "5181842080546001820154600160a060020a033381811686529685018c90529484018190"  # noqa: E501
-            "5293166060830181905260a06080840181815260029390930180549185018290527fe7c9"  # noqa: E501
-            "57c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b96"  # noqa: E501
-            "9294929390929160c083019085908015610ba257820191906000526020600020905b8154"  # noqa: E501
-            "81529060010190602001808311610b8557829003601f168201915b505097505050505050"  # noqa: E501
-            "505060405180910390a160008381526101086020908152604082208054600160a060020a"  # noqa: E501
-            "031916815560018101839055600281018054848255908452828420919392610c0692601f"  # noqa: E501
-            "9290920104810190610a33565b50919050565b505050600191505061018a565b60008681"  # noqa: E501
-            "52610103602052604081208054909450909250821415610c9c5781548355600183810183"  # noqa: E501
-            "90556101048054918201808255828015829011610c6b5781836000526020600020918201"  # noqa: E501
-            "9101610c6b9190610a33565b505050600284018190556101048054889290811015610002"  # noqa: E501
-            "57600091909152600080516020610f7583398151915201555b506001820154600284900a"  # noqa: E501
-            "90811660001415610d6c5760408051600160a060020a0333168152602081018890528151"  # noqa: E501
-            "7fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181"  # noqa: E501
-            "900390910190a1825460019011610d595760008681526101036020526040902060020154"  # noqa: E501
-            "61010480549091908110156100025760406000908120600080516020610f758339815191"  # noqa: E501
-            "529290920181905580825560018083018290556002909201559550610d6c9050565b8254"  # noqa: E501
-            "600019018355600183018054821790555b50505050919050565b5b60018054118015610d"  # noqa: E501
-            "9857506001546002906101008110156100025701546000145b15610dac57600180546000"  # noqa: E501
-            "19019055610d76565b60015481108015610dcf5750600154600290610100811015610002"  # noqa: E501
-            "570154600014155b8015610de957506002816101008110156100025701546000145b1561"  # noqa: E501
-            "0e4a57600154600290610100811015610002578101549082610100811015610002578101"  # noqa: E501
-            "919091558190610102906000908361010081101561000257810154825260209290925260"  # noqa: E501
-            "408120929092556001546101008110156100025701555b61065b565b1561018a57610107"  # noqa: E501
-            "54610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b6101"  # noqa: E501
-            "07555b6101065480830110801590610e9c5750610106546101055490830111155b15610e"  # noqa: E501
-            "b25750610106805482019055600161018a565b50600061018a565b610606610104546000"  # noqa: E501
-            "5b81811015610f4a5761010480548290811015610002576000918252600080516020610f"  # noqa: E501
-            "75833981519152015414610f375761010480546101039160009184908110156100025760"  # noqa: E501
-            "0080516020610f7583398151915201548252506020919091526040812081815560018101"  # noqa: E501
-            "829055600201555b600101610ec4565b5050506001016104f9565b610104805460008083"  # noqa: E501
-            "55919091526104a790600080516020610f7583398151915290810190610a3356004c0be6"  # noqa: E501
-            "0200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
+            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x105: 0xFF,
-            0x106: 0xC22E4,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            261: 255,
+            262: 0xC22E4,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"),  # noqa: E501
+        address=Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "b61d27f6000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000900000000"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000060"
-        ),
+        to=contract_0,
+        data=Bytes("b61d27f6")
+        + Hash(0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA)
+        + Hash(0x9)
+        + Hash(0x60),
         gas_limit=10000000,
         nonce=1,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, nonce=2),
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 260: 1,
                 261: 255,
                 262: 0xC22E4,
+                263: 0,
                 0x69D836D8D4229A4B7482679C45208E1A6079C5BE2775A4A87CA2D168319C043E: 0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA,  # noqa: E501
                 0x69D836D8D4229A4B7482679C45208E1A6079C5BE2775A4A87CA2D168319C043F: 9,  # noqa: E501
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=100,
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_wallet_kill.py b/tests/ported_static/stWalletTest/test_wallet_kill.py
index 5a14532e91a..9bd09c31dcf 100644
--- a/tests/ported_static/stWalletTest/test_wallet_kill.py
+++ b/tests/ported_static/stWalletTest/test_wallet_kill.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_wallet_kill.
 
 Ported from:
-tests/static/state_tests/stWalletTest/walletKillFiller.json
+state_tests/stWalletTest/walletKillFiller.json
 """
 
 import pytest
@@ -11,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -21,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stWalletTest/walletKillFiller.json"],
+    ["state_tests/stWalletTest/walletKillFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -29,8 +31,9 @@ def test_wallet_kill(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_wallet_kill."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,154 +48,46 @@ def test_wallet_kill(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: raw
+    # 0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf"  # noqa: E501
-            "6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb481461"  # noqa: E501
-            "01c9578063746c9171146101fd578063797af62714610206578063b20d30a91461021957"  # noqa: E501
-            "8063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2"  # noqa: E501
-            "cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d86"  # noqa: E501
-            "1461037f575b61038960003411156101095760408051600160a060020a03331681523460"  # noqa: E501
-            "2082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5c"  # noqa: E501
-            "c9109c929181900390910190a15b565b6103896004356000600036436040518084848082"  # noqa: E501
-            "84375050509091019081526040519081900360200190209050610693815b600160a06002"  # noqa: E501
-            "0a0333166000908152610102602052604081205481808083811415610c1357610d6c565b"  # noqa: E501
-            "61038b6004355b600160a060020a03811660009081526101026020526040812054115b91"  # noqa: E501
-            "9050565b61038b60015481565b6103896000364360405180848480828437505050909101"  # noqa: E501
-            "90815260405190819003602001902090506107e58161013d565b61038960043560003643"  # noqa: E501
-            "60405180848480828437505050909101908152604051908190036020019020905061060b"  # noqa: E501
-            "8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b6103"  # noqa: E501
-            "896004356000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "01902090506107d98161013d565b61038b60048035906024803591604435918201910135"  # noqa: E501
-            "60006108043361016e565b610389600435600160a060020a033316600090815261010260"  # noqa: E501
-            "205260408120549080808381141561039d5761041f565b61038960043560003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209050610752816101"  # noqa: E501
-            "3d565b61038b600435602435600082815261010360209081526040808320600160a06002"  # noqa: E501
-            "0a0385168452610102909252822054829081818114156107ab576107cf565b6103896004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "90506107f38161013d565b61038960043560243560006000364360405180848480828437"  # noqa: E501
-            "50505090910190815260405190819003602001902090506104ac8161013d565b61038b61"  # noqa: E501
-            "01055481565b005b60408051918252519081900360200190f35b50505060008281526101"  # noqa: E501
-            "03602052604081206001810154600284900a929083168190111561041f57815460018381"  # noqa: E501
-            "01805492909101845590849003905560408051600160a060020a03331681526020810187"  # noqa: E501
-            "905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d759173"  # noqa: E501
-            "4b929181900390910190a15b5050505050565b600160a060020a03831660028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0385166000818152610102602090815260"  # noqa: E501
-            "4080832083905584835291829020869055815192835282019290925281517fb532073b38"  # noqa: E501
-            "c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190"  # noqa: E501
-            "a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b6001"  # noqa: E501
-            "60a060020a0384166000908152610102602052604081205492508214156104ee57506104"  # noqa: E501
-            "a7565b6104265b6101045460005b81811015610eba576101048054610108916000918490"  # noqa: E501
-            "81101561000257600080516020610f758339815191520154825250602091825260408120"  # noqa: E501
-            "8054600160a060020a031916815560018101829055600281018054838255908352838320"  # noqa: E501
-            "9193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060"  # noqa: E501
-            "020a03831690600290610100811015610002579090016000508190555060016000505461"  # noqa: E501
-            "0102600050600084600160a060020a031681526020019081526020016000206000508190"  # noqa: E501
-            "55507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c382"  # noqa: E501
-            "6040518082600160a060020a0316815260200191505060405180910390a15b505b50565b"  # noqa: E501
-            "15610606576106198261016e565b156106245750610608565b61062c6104f2565b600154"  # noqa: E501
-            "60fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b61"  # noqa: E501
-            "07105b600060015b600154811015610a47575b6001548110801561068657506002816101"  # noqa: E501
-            "00811015610002570154600014155b15610d7557600101610666565b156104a757600160"  # noqa: E501
-            "a060020a0383166000908152610102602052604081205492508214156106c15750610606"  # noqa: E501
-            "565b60016001600050540360006000505411156106dc5750610606565b60006002836101"  # noqa: E501
-            "0081101561000257508301819055600160a060020a038416815261010260205260408120"  # noqa: E501
-            "556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb"  # noqa: E501
-            "0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a15050"  # noqa: E501
-            "50565b15610606576001548211156107675750610608565b60008290556107746104f256"  # noqa: E501
-            "5b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9b"  # noqa: E501
-            "eaf0dad4f550da9181900360200190a15050565b506001830154600282900a9081166000"  # noqa: E501
-            "14156107ca57600094506107cf565b600194505b5050505092915050565b156106065750"  # noqa: E501
-            "61010555565b156106085760006101065550565b156106065781600160a060020a0316ff"  # noqa: E501
-            "5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa"  # noqa: E501
-            "31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160"  # noqa: E501
-            "a060020a0316815260200185815260200184600160a060020a0316815260200180602001"  # noqa: E501
-            "828103825284848281815260200192508082843782019150509650505050505050604051"  # noqa: E501
-            "80910390a184600160a060020a0316848484604051808383808284375050509081019150"  # noqa: E501
-            "6000908083038185876185025a03f15060009350610a2392505050565b60003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209150610904905081"  # noqa: E501
-            "61020d565b158015610927575060008181526101086020526040812054600160a060020a"  # noqa: E501
-            "0316145b15610a235760008181526101086020908152604082208054600160a060020a03"  # noqa: E501
-            "191688178155600181018790556002018054858255818452928290209092601f01919091"  # noqa: E501
-            "048101908490868215610a2b579182015b82811115610a2b578235826000505591602001"  # noqa: E501
-            "91906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a"  # noqa: E501
-            "7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a06002"  # noqa: E501
-            "0a0316815260200185815260200184600160a060020a0316815260200180602001828103"  # noqa: E501
-            "825284848281815260200192508082843782019150509750505050505050506040518091"  # noqa: E501
-            "0390a15b949350505050565b5061099a9291505b80821115610a47576000815560010161"  # noqa: E501
-            "0a33565b5090565b15610c005760008381526101086020526040812054600160a060020a"  # noqa: E501
-            "031614610c0057604080516000918220805460018201546002929092018054600160a060"  # noqa: E501
-            "020a0392909216949293909291819084908015610acd5782019190600052602060002090"  # noqa: E501
-            "5b815481529060010190602001808311610ab057829003601f168201915b505092505050"  # noqa: E501
-            "60006040518083038185876185025a03f150505060008481526101086020908152604080"  # noqa: E501
-            "5181842080546001820154600160a060020a033381811686529685018c90529484018190"  # noqa: E501
-            "5293166060830181905260a06080840181815260029390930180549185018290527fe7c9"  # noqa: E501
-            "57c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b96"  # noqa: E501
-            "9294929390929160c083019085908015610ba257820191906000526020600020905b8154"  # noqa: E501
-            "81529060010190602001808311610b8557829003601f168201915b505097505050505050"  # noqa: E501
-            "505060405180910390a160008381526101086020908152604082208054600160a060020a"  # noqa: E501
-            "031916815560018101839055600281018054848255908452828420919392610c0692601f"  # noqa: E501
-            "9290920104810190610a33565b50919050565b505050600191505061018a565b60008681"  # noqa: E501
-            "52610103602052604081208054909450909250821415610c9c5781548355600183810183"  # noqa: E501
-            "90556101048054918201808255828015829011610c6b5781836000526020600020918201"  # noqa: E501
-            "9101610c6b9190610a33565b505050600284018190556101048054889290811015610002"  # noqa: E501
-            "57600091909152600080516020610f7583398151915201555b506001820154600284900a"  # noqa: E501
-            "90811660001415610d6c5760408051600160a060020a0333168152602081018890528151"  # noqa: E501
-            "7fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181"  # noqa: E501
-            "900390910190a1825460019011610d595760008681526101036020526040902060020154"  # noqa: E501
-            "61010480549091908110156100025760406000908120600080516020610f758339815191"  # noqa: E501
-            "529290920181905580825560018083018290556002909201559550610d6c9050565b8254"  # noqa: E501
-            "600019018355600183018054821790555b50505050919050565b5b60018054118015610d"  # noqa: E501
-            "9857506001546002906101008110156100025701546000145b15610dac57600180546000"  # noqa: E501
-            "19019055610d76565b60015481108015610dcf5750600154600290610100811015610002"  # noqa: E501
-            "570154600014155b8015610de957506002816101008110156100025701546000145b1561"  # noqa: E501
-            "0e4a57600154600290610100811015610002578101549082610100811015610002578101"  # noqa: E501
-            "919091558190610102906000908361010081101561000257810154825260209290925260"  # noqa: E501
-            "408120929092556001546101008110156100025701555b61065b565b1561018a57610107"  # noqa: E501
-            "54610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b6101"  # noqa: E501
-            "07555b6101065480830110801590610e9c5750610106546101055490830111155b15610e"  # noqa: E501
-            "b25750610106805482019055600161018a565b50600061018a565b610606610104546000"  # noqa: E501
-            "5b81811015610f4a5761010480548290811015610002576000918252600080516020610f"  # noqa: E501
-            "75833981519152015414610f375761010480546101039160009184908110156100025760"  # noqa: E501
-            "0080516020610f7583398151915201548252506020919091526040812081815560018101"  # noqa: E501
-            "829055600201555b600101610ec4565b5050506001016104f9565b610104805460008083"  # noqa: E501
-            "55919091526104a790600080516020610f7583398151915290810190610a3356004c0be6"  # noqa: E501
-            "0200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
+            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x106: 0xC22E4,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            262: 0xC22E4,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"),  # noqa: E501
+        address=Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "cbf0b0c0000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"  # noqa: E501
-        ),
+        to=contract_0,
+        data=Bytes("cbf0b0c0") + Hash(sender, left_padding=True),
         gas_limit=10000000,
-        nonce=1,
         value=1,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, nonce=2),
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 260: 1,
                 262: 0xC22E4,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            balance=0,
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_wallet_kill_not_by_owner.py b/tests/ported_static/stWalletTest/test_wallet_kill_not_by_owner.py
index 27522fd37e4..23e2f51e2aa 100644
--- a/tests/ported_static/stWalletTest/test_wallet_kill_not_by_owner.py
+++ b/tests/ported_static/stWalletTest/test_wallet_kill_not_by_owner.py
@@ -1,17 +1,18 @@
 """
-Test ported from static filler.
+Test_wallet_kill_not_by_owner.
 
 Ported from:
-tests/static/state_tests/stWalletTest/walletKillNotByOwnerFiller.json
+state_tests/stWalletTest/walletKillNotByOwnerFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -21,7 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stWalletTest/walletKillNotByOwnerFiller.json"],
+    ["state_tests/stWalletTest/walletKillNotByOwnerFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -29,12 +30,11 @@ def test_wallet_kill_not_by_owner(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0xA95DEFE70EBEA7804F9C3BE42D20D24375E2A92B9D9666B832069C5F3CD423DD
-    )
-    callee = Address("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+    """Test_wallet_kill_not_by_owner."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A75EF08F, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,155 +45,56 @@ def test_wallet_kill_not_by_owner(
         gas_limit=100000000,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    pre[callee] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: hex
+    # 0x
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=0xDE0B6B3A75EF08F,
+        nonce=1,
+    )
+    # Source: raw
+    # 0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf"  # noqa: E501
-            "6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb481461"  # noqa: E501
-            "01c9578063746c9171146101fd578063797af62714610206578063b20d30a91461021957"  # noqa: E501
-            "8063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2"  # noqa: E501
-            "cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d86"  # noqa: E501
-            "1461037f575b61038960003411156101095760408051600160a060020a03331681523460"  # noqa: E501
-            "2082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5c"  # noqa: E501
-            "c9109c929181900390910190a15b565b6103896004356000600036436040518084848082"  # noqa: E501
-            "84375050509091019081526040519081900360200190209050610693815b600160a06002"  # noqa: E501
-            "0a0333166000908152610102602052604081205481808083811415610c1357610d6c565b"  # noqa: E501
-            "61038b6004355b600160a060020a03811660009081526101026020526040812054115b91"  # noqa: E501
-            "9050565b61038b60015481565b6103896000364360405180848480828437505050909101"  # noqa: E501
-            "90815260405190819003602001902090506107e58161013d565b61038960043560003643"  # noqa: E501
-            "60405180848480828437505050909101908152604051908190036020019020905061060b"  # noqa: E501
-            "8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b6103"  # noqa: E501
-            "896004356000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "01902090506107d98161013d565b61038b60048035906024803591604435918201910135"  # noqa: E501
-            "60006108043361016e565b610389600435600160a060020a033316600090815261010260"  # noqa: E501
-            "205260408120549080808381141561039d5761041f565b61038960043560003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209050610752816101"  # noqa: E501
-            "3d565b61038b600435602435600082815261010360209081526040808320600160a06002"  # noqa: E501
-            "0a0385168452610102909252822054829081818114156107ab576107cf565b6103896004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "90506107f38161013d565b61038960043560243560006000364360405180848480828437"  # noqa: E501
-            "50505090910190815260405190819003602001902090506104ac8161013d565b61038b61"  # noqa: E501
-            "01055481565b005b60408051918252519081900360200190f35b50505060008281526101"  # noqa: E501
-            "03602052604081206001810154600284900a929083168190111561041f57815460018381"  # noqa: E501
-            "01805492909101845590849003905560408051600160a060020a03331681526020810187"  # noqa: E501
-            "905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d759173"  # noqa: E501
-            "4b929181900390910190a15b5050505050565b600160a060020a03831660028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0385166000818152610102602090815260"  # noqa: E501
-            "4080832083905584835291829020869055815192835282019290925281517fb532073b38"  # noqa: E501
-            "c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190"  # noqa: E501
-            "a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b6001"  # noqa: E501
-            "60a060020a0384166000908152610102602052604081205492508214156104ee57506104"  # noqa: E501
-            "a7565b6104265b6101045460005b81811015610eba576101048054610108916000918490"  # noqa: E501
-            "81101561000257600080516020610f758339815191520154825250602091825260408120"  # noqa: E501
-            "8054600160a060020a031916815560018101829055600281018054838255908352838320"  # noqa: E501
-            "9193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060"  # noqa: E501
-            "020a03831690600290610100811015610002579090016000508190555060016000505461"  # noqa: E501
-            "0102600050600084600160a060020a031681526020019081526020016000206000508190"  # noqa: E501
-            "55507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c382"  # noqa: E501
-            "6040518082600160a060020a0316815260200191505060405180910390a15b505b50565b"  # noqa: E501
-            "15610606576106198261016e565b156106245750610608565b61062c6104f2565b600154"  # noqa: E501
-            "60fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b61"  # noqa: E501
-            "07105b600060015b600154811015610a47575b6001548110801561068657506002816101"  # noqa: E501
-            "00811015610002570154600014155b15610d7557600101610666565b156104a757600160"  # noqa: E501
-            "a060020a0383166000908152610102602052604081205492508214156106c15750610606"  # noqa: E501
-            "565b60016001600050540360006000505411156106dc5750610606565b60006002836101"  # noqa: E501
-            "0081101561000257508301819055600160a060020a038416815261010260205260408120"  # noqa: E501
-            "556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb"  # noqa: E501
-            "0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a15050"  # noqa: E501
-            "50565b15610606576001548211156107675750610608565b60008290556107746104f256"  # noqa: E501
-            "5b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9b"  # noqa: E501
-            "eaf0dad4f550da9181900360200190a15050565b506001830154600282900a9081166000"  # noqa: E501
-            "14156107ca57600094506107cf565b600194505b5050505092915050565b156106065750"  # noqa: E501
-            "61010555565b156106085760006101065550565b156106065781600160a060020a0316ff"  # noqa: E501
-            "5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa"  # noqa: E501
-            "31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160"  # noqa: E501
-            "a060020a0316815260200185815260200184600160a060020a0316815260200180602001"  # noqa: E501
-            "828103825284848281815260200192508082843782019150509650505050505050604051"  # noqa: E501
-            "80910390a184600160a060020a0316848484604051808383808284375050509081019150"  # noqa: E501
-            "6000908083038185876185025a03f15060009350610a2392505050565b60003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209150610904905081"  # noqa: E501
-            "61020d565b158015610927575060008181526101086020526040812054600160a060020a"  # noqa: E501
-            "0316145b15610a235760008181526101086020908152604082208054600160a060020a03"  # noqa: E501
-            "191688178155600181018790556002018054858255818452928290209092601f01919091"  # noqa: E501
-            "048101908490868215610a2b579182015b82811115610a2b578235826000505591602001"  # noqa: E501
-            "91906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a"  # noqa: E501
-            "7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a06002"  # noqa: E501
-            "0a0316815260200185815260200184600160a060020a0316815260200180602001828103"  # noqa: E501
-            "825284848281815260200192508082843782019150509750505050505050506040518091"  # noqa: E501
-            "0390a15b949350505050565b5061099a9291505b80821115610a47576000815560010161"  # noqa: E501
-            "0a33565b5090565b15610c005760008381526101086020526040812054600160a060020a"  # noqa: E501
-            "031614610c0057604080516000918220805460018201546002929092018054600160a060"  # noqa: E501
-            "020a0392909216949293909291819084908015610acd5782019190600052602060002090"  # noqa: E501
-            "5b815481529060010190602001808311610ab057829003601f168201915b505092505050"  # noqa: E501
-            "60006040518083038185876185025a03f150505060008481526101086020908152604080"  # noqa: E501
-            "5181842080546001820154600160a060020a033381811686529685018c90529484018190"  # noqa: E501
-            "5293166060830181905260a06080840181815260029390930180549185018290527fe7c9"  # noqa: E501
-            "57c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b96"  # noqa: E501
-            "9294929390929160c083019085908015610ba257820191906000526020600020905b8154"  # noqa: E501
-            "81529060010190602001808311610b8557829003601f168201915b505097505050505050"  # noqa: E501
-            "505060405180910390a160008381526101086020908152604082208054600160a060020a"  # noqa: E501
-            "031916815560018101839055600281018054848255908452828420919392610c0692601f"  # noqa: E501
-            "9290920104810190610a33565b50919050565b505050600191505061018a565b60008681"  # noqa: E501
-            "52610103602052604081208054909450909250821415610c9c5781548355600183810183"  # noqa: E501
-            "90556101048054918201808255828015829011610c6b5781836000526020600020918201"  # noqa: E501
-            "9101610c6b9190610a33565b505050600284018190556101048054889290811015610002"  # noqa: E501
-            "57600091909152600080516020610f7583398151915201555b506001820154600284900a"  # noqa: E501
-            "90811660001415610d6c5760408051600160a060020a0333168152602081018890528151"  # noqa: E501
-            "7fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181"  # noqa: E501
-            "900390910190a1825460019011610d595760008681526101036020526040902060020154"  # noqa: E501
-            "61010480549091908110156100025760406000908120600080516020610f758339815191"  # noqa: E501
-            "529290920181905580825560018083018290556002909201559550610d6c9050565b8254"  # noqa: E501
-            "600019018355600183018054821790555b50505050919050565b5b60018054118015610d"  # noqa: E501
-            "9857506001546002906101008110156100025701546000145b15610dac57600180546000"  # noqa: E501
-            "19019055610d76565b60015481108015610dcf5750600154600290610100811015610002"  # noqa: E501
-            "570154600014155b8015610de957506002816101008110156100025701546000145b1561"  # noqa: E501
-            "0e4a57600154600290610100811015610002578101549082610100811015610002578101"  # noqa: E501
-            "919091558190610102906000908361010081101561000257810154825260209290925260"  # noqa: E501
-            "408120929092556001546101008110156100025701555b61065b565b1561018a57610107"  # noqa: E501
-            "54610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b6101"  # noqa: E501
-            "07555b6101065480830110801590610e9c5750610106546101055490830111155b15610e"  # noqa: E501
-            "b25750610106805482019055600161018a565b50600061018a565b610606610104546000"  # noqa: E501
-            "5b81811015610f4a5761010480548290811015610002576000918252600080516020610f"  # noqa: E501
-            "75833981519152015414610f375761010480546101039160009184908110156100025760"  # noqa: E501
-            "0080516020610f7583398151915201548252506020919091526040812081815560018101"  # noqa: E501
-            "829055600201555b600101610ec4565b5050506001016104f9565b610104805460008083"  # noqa: E501
-            "55919091526104a790600080516020610f7583398151915290810190610a3356004c0be6"  # noqa: E501
-            "0200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
+            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x106: 0xC22E4,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: contract_0,
+            262: 0xC22E4,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "cbf0b0c0000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa"  # noqa: E501
-        ),
+        to=contract_1,
+        data=Bytes("cbf0b0c0")
+        + Hash(0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, code=b"", nonce=2),
+        contract_0: Account(storage={}, nonce=1),
+        contract_1: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: contract_0,
                 262: 0xC22E4,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=200,
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_wallet_kill_to_wallet.py b/tests/ported_static/stWalletTest/test_wallet_kill_to_wallet.py
index c5832dc7a66..248a076edb5 100644
--- a/tests/ported_static/stWalletTest/test_wallet_kill_to_wallet.py
+++ b/tests/ported_static/stWalletTest/test_wallet_kill_to_wallet.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_wallet_kill_to_wallet.
 
 Ported from:
-tests/static/state_tests/stWalletTest/walletKillToWalletFiller.json
+state_tests/stWalletTest/walletKillToWalletFiller.json
 """
 
 import pytest
@@ -11,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -21,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stWalletTest/walletKillToWalletFiller.json"],
+    ["state_tests/stWalletTest/walletKillToWalletFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -29,8 +31,9 @@ def test_wallet_kill_to_wallet(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_wallet_kill_to_wallet."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,154 +48,46 @@ def test_wallet_kill_to_wallet(
     )
 
     pre[sender] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: hex
+    # 0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf"  # noqa: E501
-            "6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb481461"  # noqa: E501
-            "01c9578063746c9171146101fd578063797af62714610206578063b20d30a91461021957"  # noqa: E501
-            "8063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2"  # noqa: E501
-            "cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d86"  # noqa: E501
-            "1461037f575b61038960003411156101095760408051600160a060020a03331681523460"  # noqa: E501
-            "2082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5c"  # noqa: E501
-            "c9109c929181900390910190a15b565b6103896004356000600036436040518084848082"  # noqa: E501
-            "84375050509091019081526040519081900360200190209050610693815b600160a06002"  # noqa: E501
-            "0a0333166000908152610102602052604081205481808083811415610c1357610d6c565b"  # noqa: E501
-            "61038b6004355b600160a060020a03811660009081526101026020526040812054115b91"  # noqa: E501
-            "9050565b61038b60015481565b6103896000364360405180848480828437505050909101"  # noqa: E501
-            "90815260405190819003602001902090506107e58161013d565b61038960043560003643"  # noqa: E501
-            "60405180848480828437505050909101908152604051908190036020019020905061060b"  # noqa: E501
-            "8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b6103"  # noqa: E501
-            "896004356000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "01902090506107d98161013d565b61038b60048035906024803591604435918201910135"  # noqa: E501
-            "60006108043361016e565b610389600435600160a060020a033316600090815261010260"  # noqa: E501
-            "205260408120549080808381141561039d5761041f565b61038960043560003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209050610752816101"  # noqa: E501
-            "3d565b61038b600435602435600082815261010360209081526040808320600160a06002"  # noqa: E501
-            "0a0385168452610102909252822054829081818114156107ab576107cf565b6103896004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "90506107f38161013d565b61038960043560243560006000364360405180848480828437"  # noqa: E501
-            "50505090910190815260405190819003602001902090506104ac8161013d565b61038b61"  # noqa: E501
-            "01055481565b005b60408051918252519081900360200190f35b50505060008281526101"  # noqa: E501
-            "03602052604081206001810154600284900a929083168190111561041f57815460018381"  # noqa: E501
-            "01805492909101845590849003905560408051600160a060020a03331681526020810187"  # noqa: E501
-            "905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d759173"  # noqa: E501
-            "4b929181900390910190a15b5050505050565b600160a060020a03831660028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0385166000818152610102602090815260"  # noqa: E501
-            "4080832083905584835291829020869055815192835282019290925281517fb532073b38"  # noqa: E501
-            "c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190"  # noqa: E501
-            "a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b6001"  # noqa: E501
-            "60a060020a0384166000908152610102602052604081205492508214156104ee57506104"  # noqa: E501
-            "a7565b6104265b6101045460005b81811015610eba576101048054610108916000918490"  # noqa: E501
-            "81101561000257600080516020610f758339815191520154825250602091825260408120"  # noqa: E501
-            "8054600160a060020a031916815560018101829055600281018054838255908352838320"  # noqa: E501
-            "9193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060"  # noqa: E501
-            "020a03831690600290610100811015610002579090016000508190555060016000505461"  # noqa: E501
-            "0102600050600084600160a060020a031681526020019081526020016000206000508190"  # noqa: E501
-            "55507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c382"  # noqa: E501
-            "6040518082600160a060020a0316815260200191505060405180910390a15b505b50565b"  # noqa: E501
-            "15610606576106198261016e565b156106245750610608565b61062c6104f2565b600154"  # noqa: E501
-            "60fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b61"  # noqa: E501
-            "07105b600060015b600154811015610a47575b6001548110801561068657506002816101"  # noqa: E501
-            "00811015610002570154600014155b15610d7557600101610666565b156104a757600160"  # noqa: E501
-            "a060020a0383166000908152610102602052604081205492508214156106c15750610606"  # noqa: E501
-            "565b60016001600050540360006000505411156106dc5750610606565b60006002836101"  # noqa: E501
-            "0081101561000257508301819055600160a060020a038416815261010260205260408120"  # noqa: E501
-            "556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb"  # noqa: E501
-            "0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a15050"  # noqa: E501
-            "50565b15610606576001548211156107675750610608565b60008290556107746104f256"  # noqa: E501
-            "5b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9b"  # noqa: E501
-            "eaf0dad4f550da9181900360200190a15050565b506001830154600282900a9081166000"  # noqa: E501
-            "14156107ca57600094506107cf565b600194505b5050505092915050565b156106065750"  # noqa: E501
-            "61010555565b156106085760006101065550565b156106065781600160a060020a0316ff"  # noqa: E501
-            "5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa"  # noqa: E501
-            "31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160"  # noqa: E501
-            "a060020a0316815260200185815260200184600160a060020a0316815260200180602001"  # noqa: E501
-            "828103825284848281815260200192508082843782019150509650505050505050604051"  # noqa: E501
-            "80910390a184600160a060020a0316848484604051808383808284375050509081019150"  # noqa: E501
-            "6000908083038185876185025a03f15060009350610a2392505050565b60003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209150610904905081"  # noqa: E501
-            "61020d565b158015610927575060008181526101086020526040812054600160a060020a"  # noqa: E501
-            "0316145b15610a235760008181526101086020908152604082208054600160a060020a03"  # noqa: E501
-            "191688178155600181018790556002018054858255818452928290209092601f01919091"  # noqa: E501
-            "048101908490868215610a2b579182015b82811115610a2b578235826000505591602001"  # noqa: E501
-            "91906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a"  # noqa: E501
-            "7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a06002"  # noqa: E501
-            "0a0316815260200185815260200184600160a060020a0316815260200180602001828103"  # noqa: E501
-            "825284848281815260200192508082843782019150509750505050505050506040518091"  # noqa: E501
-            "0390a15b949350505050565b5061099a9291505b80821115610a47576000815560010161"  # noqa: E501
-            "0a33565b5090565b15610c005760008381526101086020526040812054600160a060020a"  # noqa: E501
-            "031614610c0057604080516000918220805460018201546002929092018054600160a060"  # noqa: E501
-            "020a0392909216949293909291819084908015610acd5782019190600052602060002090"  # noqa: E501
-            "5b815481529060010190602001808311610ab057829003601f168201915b505092505050"  # noqa: E501
-            "60006040518083038185876185025a03f150505060008481526101086020908152604080"  # noqa: E501
-            "5181842080546001820154600160a060020a033381811686529685018c90529484018190"  # noqa: E501
-            "5293166060830181905260a06080840181815260029390930180549185018290527fe7c9"  # noqa: E501
-            "57c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b96"  # noqa: E501
-            "9294929390929160c083019085908015610ba257820191906000526020600020905b8154"  # noqa: E501
-            "81529060010190602001808311610b8557829003601f168201915b505097505050505050"  # noqa: E501
-            "505060405180910390a160008381526101086020908152604082208054600160a060020a"  # noqa: E501
-            "031916815560018101839055600281018054848255908452828420919392610c0692601f"  # noqa: E501
-            "9290920104810190610a33565b50919050565b505050600191505061018a565b60008681"  # noqa: E501
-            "52610103602052604081208054909450909250821415610c9c5781548355600183810183"  # noqa: E501
-            "90556101048054918201808255828015829011610c6b5781836000526020600020918201"  # noqa: E501
-            "9101610c6b9190610a33565b505050600284018190556101048054889290811015610002"  # noqa: E501
-            "57600091909152600080516020610f7583398151915201555b506001820154600284900a"  # noqa: E501
-            "90811660001415610d6c5760408051600160a060020a0333168152602081018890528151"  # noqa: E501
-            "7fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181"  # noqa: E501
-            "900390910190a1825460019011610d595760008681526101036020526040902060020154"  # noqa: E501
-            "61010480549091908110156100025760406000908120600080516020610f758339815191"  # noqa: E501
-            "529290920181905580825560018083018290556002909201559550610d6c9050565b8254"  # noqa: E501
-            "600019018355600183018054821790555b50505050919050565b5b60018054118015610d"  # noqa: E501
-            "9857506001546002906101008110156100025701546000145b15610dac57600180546000"  # noqa: E501
-            "19019055610d76565b60015481108015610dcf5750600154600290610100811015610002"  # noqa: E501
-            "570154600014155b8015610de957506002816101008110156100025701546000145b1561"  # noqa: E501
-            "0e4a57600154600290610100811015610002578101549082610100811015610002578101"  # noqa: E501
-            "919091558190610102906000908361010081101561000257810154825260209290925260"  # noqa: E501
-            "408120929092556001546101008110156100025701555b61065b565b1561018a57610107"  # noqa: E501
-            "54610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b6101"  # noqa: E501
-            "07555b6101065480830110801590610e9c5750610106546101055490830111155b15610e"  # noqa: E501
-            "b25750610106805482019055600161018a565b50600061018a565b610606610104546000"  # noqa: E501
-            "5b81811015610f4a5761010480548290811015610002576000918252600080516020610f"  # noqa: E501
-            "75833981519152015414610f375761010480546101039160009184908110156100025760"  # noqa: E501
-            "0080516020610f7583398151915201548252506020919091526040812081815560018101"  # noqa: E501
-            "829055600201555b600101610ec4565b5050506001016104f9565b610104805460008083"  # noqa: E501
-            "55919091526104a790600080516020610f7583398151915290810190610a3356004c0be6"  # noqa: E501
-            "0200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
+            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x1,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x106: 0xC22E4,
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0: 1,
+            1: 1,
+            3: sender,
+            262: 0xC22E4,
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"),  # noqa: E501
+        address=Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "cbf0b0c0000000000000000000000000ec0e71ad0a90ffe1909d27dac207f7680abba42d"  # noqa: E501
-        ),
+        to=contract_0,
+        data=Bytes("cbf0b0c0") + Hash(contract_0, left_padding=True),
         gas_limit=10000000,
-        nonce=1,
         value=100,
+        nonce=1,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, nonce=2),
+        contract_0: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                3: sender,
                 260: 1,
                 262: 0xC22E4,
                 0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             },
+            balance=200,
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stWalletTest/test_wallet_remove_owner_remove_pending_transaction.py b/tests/ported_static/stWalletTest/test_wallet_remove_owner_remove_pending_transaction.py
index cf4fe1c2177..cc9fedeb207 100644
--- a/tests/ported_static/stWalletTest/test_wallet_remove_owner_remove_pending_transaction.py
+++ b/tests/ported_static/stWalletTest/test_wallet_remove_owner_remove_pending_transaction.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_wallet_remove_owner_remove_pending_transaction.
 
 Ported from:
-tests/static/state_tests/stWalletTest
-walletRemoveOwnerRemovePendingTransactionFiller.json
+state_tests/stWalletTest/walletRemoveOwnerRemovePendingTransactionFiller.json
 """
 
 import pytest
@@ -12,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -23,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stWalletTest/walletRemoveOwnerRemovePendingTransactionFiller.json",  # noqa: E501
+        "state_tests/stWalletTest/walletRemoveOwnerRemovePendingTransactionFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -32,12 +33,13 @@ def test_wallet_remove_owner_remove_pending_transaction(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_wallet_remove_owner_remove_pending_transaction."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D)
     sender = EOA(
         key=0xA95DEFE70EBEA7804F9C3BE42D20D24375E2A92B9D9666B832069C5F3CD423DD
     )
-    callee = Address("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,160 +51,63 @@ def test_wallet_remove_owner_remove_pending_transaction(
     )
 
     pre[sender] = Account(balance=0x5AF3107A4000)
-    pre[callee] = Account(balance=0xDE0B6B3A75EF08F, nonce=1)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
+    # Source: hex
+    # 0x
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code="",
+        balance=0xDE0B6B3A75EF08F,
+        nonce=1,
+        address=Address(0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe  # noqa: E501
+    contract_1 = pre.deploy_contract(  # noqa: F841
         code=bytes.fromhex(
-            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf"  # noqa: E501
-            "6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb481461"  # noqa: E501
-            "01c9578063746c9171146101fd578063797af62714610206578063b20d30a91461021957"  # noqa: E501
-            "8063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2"  # noqa: E501
-            "cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d86"  # noqa: E501
-            "1461037f575b61038960003411156101095760408051600160a060020a03331681523460"  # noqa: E501
-            "2082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5c"  # noqa: E501
-            "c9109c929181900390910190a15b565b6103896004356000600036436040518084848082"  # noqa: E501
-            "84375050509091019081526040519081900360200190209050610693815b600160a06002"  # noqa: E501
-            "0a0333166000908152610102602052604081205481808083811415610c1357610d6c565b"  # noqa: E501
-            "61038b6004355b600160a060020a03811660009081526101026020526040812054115b91"  # noqa: E501
-            "9050565b61038b60015481565b6103896000364360405180848480828437505050909101"  # noqa: E501
-            "90815260405190819003602001902090506107e58161013d565b61038960043560003643"  # noqa: E501
-            "60405180848480828437505050909101908152604051908190036020019020905061060b"  # noqa: E501
-            "8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b6103"  # noqa: E501
-            "896004356000364360405180848480828437505050909101908152604051908190036020"  # noqa: E501
-            "01902090506107d98161013d565b61038b60048035906024803591604435918201910135"  # noqa: E501
-            "60006108043361016e565b610389600435600160a060020a033316600090815261010260"  # noqa: E501
-            "205260408120549080808381141561039d5761041f565b61038960043560003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209050610752816101"  # noqa: E501
-            "3d565b61038b600435602435600082815261010360209081526040808320600160a06002"  # noqa: E501
-            "0a0385168452610102909252822054829081818114156107ab576107cf565b6103896004"  # noqa: E501
-            "356000364360405180848480828437505050909101908152604051908190036020019020"  # noqa: E501
-            "90506107f38161013d565b61038960043560243560006000364360405180848480828437"  # noqa: E501
-            "50505090910190815260405190819003602001902090506104ac8161013d565b61038b61"  # noqa: E501
-            "01055481565b005b60408051918252519081900360200190f35b50505060008281526101"  # noqa: E501
-            "03602052604081206001810154600284900a929083168190111561041f57815460018381"  # noqa: E501
-            "01805492909101845590849003905560408051600160a060020a03331681526020810187"  # noqa: E501
-            "905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d759173"  # noqa: E501
-            "4b929181900390910190a15b5050505050565b600160a060020a03831660028361010081"  # noqa: E501
-            "101561000257508301819055600160a060020a0385166000818152610102602090815260"  # noqa: E501
-            "4080832083905584835291829020869055815192835282019290925281517fb532073b38"  # noqa: E501
-            "c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190"  # noqa: E501
-            "a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b6001"  # noqa: E501
-            "60a060020a0384166000908152610102602052604081205492508214156104ee57506104"  # noqa: E501
-            "a7565b6104265b6101045460005b81811015610eba576101048054610108916000918490"  # noqa: E501
-            "81101561000257600080516020610f758339815191520154825250602091825260408120"  # noqa: E501
-            "8054600160a060020a031916815560018101829055600281018054838255908352838320"  # noqa: E501
-            "9193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060"  # noqa: E501
-            "020a03831690600290610100811015610002579090016000508190555060016000505461"  # noqa: E501
-            "0102600050600084600160a060020a031681526020019081526020016000206000508190"  # noqa: E501
-            "55507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c382"  # noqa: E501
-            "6040518082600160a060020a0316815260200191505060405180910390a15b505b50565b"  # noqa: E501
-            "15610606576106198261016e565b156106245750610608565b61062c6104f2565b600154"  # noqa: E501
-            "60fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b61"  # noqa: E501
-            "07105b600060015b600154811015610a47575b6001548110801561068657506002816101"  # noqa: E501
-            "00811015610002570154600014155b15610d7557600101610666565b156104a757600160"  # noqa: E501
-            "a060020a0383166000908152610102602052604081205492508214156106c15750610606"  # noqa: E501
-            "565b60016001600050540360006000505411156106dc5750610606565b60006002836101"  # noqa: E501
-            "0081101561000257508301819055600160a060020a038416815261010260205260408120"  # noqa: E501
-            "556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb"  # noqa: E501
-            "0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a15050"  # noqa: E501
-            "50565b15610606576001548211156107675750610608565b60008290556107746104f256"  # noqa: E501
-            "5b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9b"  # noqa: E501
-            "eaf0dad4f550da9181900360200190a15050565b506001830154600282900a9081166000"  # noqa: E501
-            "14156107ca57600094506107cf565b600194505b5050505092915050565b156106065750"  # noqa: E501
-            "61010555565b156106085760006101065550565b156106065781600160a060020a0316ff"  # noqa: E501
-            "5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa"  # noqa: E501
-            "31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160"  # noqa: E501
-            "a060020a0316815260200185815260200184600160a060020a0316815260200180602001"  # noqa: E501
-            "828103825284848281815260200192508082843782019150509650505050505050604051"  # noqa: E501
-            "80910390a184600160a060020a0316848484604051808383808284375050509081019150"  # noqa: E501
-            "6000908083038185876185025a03f15060009350610a2392505050565b60003643604051"  # noqa: E501
-            "808484808284375050509091019081526040519081900360200190209150610904905081"  # noqa: E501
-            "61020d565b158015610927575060008181526101086020526040812054600160a060020a"  # noqa: E501
-            "0316145b15610a235760008181526101086020908152604082208054600160a060020a03"  # noqa: E501
-            "191688178155600181018790556002018054858255818452928290209092601f01919091"  # noqa: E501
-            "048101908490868215610a2b579182015b82811115610a2b578235826000505591602001"  # noqa: E501
-            "91906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a"  # noqa: E501
-            "7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a06002"  # noqa: E501
-            "0a0316815260200185815260200184600160a060020a0316815260200180602001828103"  # noqa: E501
-            "825284848281815260200192508082843782019150509750505050505050506040518091"  # noqa: E501
-            "0390a15b949350505050565b5061099a9291505b80821115610a47576000815560010161"  # noqa: E501
-            "0a33565b5090565b15610c005760008381526101086020526040812054600160a060020a"  # noqa: E501
-            "031614610c0057604080516000918220805460018201546002929092018054600160a060"  # noqa: E501
-            "020a0392909216949293909291819084908015610acd5782019190600052602060002090"  # noqa: E501
-            "5b815481529060010190602001808311610ab057829003601f168201915b505092505050"  # noqa: E501
-            "60006040518083038185876185025a03f150505060008481526101086020908152604080"  # noqa: E501
-            "5181842080546001820154600160a060020a033381811686529685018c90529484018190"  # noqa: E501
-            "5293166060830181905260a06080840181815260029390930180549185018290527fe7c9"  # noqa: E501
-            "57c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b96"  # noqa: E501
-            "9294929390929160c083019085908015610ba257820191906000526020600020905b8154"  # noqa: E501
-            "81529060010190602001808311610b8557829003601f168201915b505097505050505050"  # noqa: E501
-            "505060405180910390a160008381526101086020908152604082208054600160a060020a"  # noqa: E501
-            "031916815560018101839055600281018054848255908452828420919392610c0692601f"  # noqa: E501
-            "9290920104810190610a33565b50919050565b505050600191505061018a565b60008681"  # noqa: E501
-            "52610103602052604081208054909450909250821415610c9c5781548355600183810183"  # noqa: E501
-            "90556101048054918201808255828015829011610c6b5781836000526020600020918201"  # noqa: E501
-            "9101610c6b9190610a33565b505050600284018190556101048054889290811015610002"  # noqa: E501
-            "57600091909152600080516020610f7583398151915201555b506001820154600284900a"  # noqa: E501
-            "90811660001415610d6c5760408051600160a060020a0333168152602081018890528151"  # noqa: E501
-            "7fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181"  # noqa: E501
-            "900390910190a1825460019011610d595760008681526101036020526040902060020154"  # noqa: E501
-            "61010480549091908110156100025760406000908120600080516020610f758339815191"  # noqa: E501
-            "529290920181905580825560018083018290556002909201559550610d6c9050565b8254"  # noqa: E501
-            "600019018355600183018054821790555b50505050919050565b5b60018054118015610d"  # noqa: E501
-            "9857506001546002906101008110156100025701546000145b15610dac57600180546000"  # noqa: E501
-            "19019055610d76565b60015481108015610dcf5750600154600290610100811015610002"  # noqa: E501
-            "570154600014155b8015610de957506002816101008110156100025701546000145b1561"  # noqa: E501
-            "0e4a57600154600290610100811015610002578101549082610100811015610002578101"  # noqa: E501
-            "919091558190610102906000908361010081101561000257810154825260209290925260"  # noqa: E501
-            "408120929092556001546101008110156100025701555b61065b565b1561018a57610107"  # noqa: E501
-            "54610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b6101"  # noqa: E501
-            "07555b6101065480830110801590610e9c5750610106546101055490830111155b15610e"  # noqa: E501
-            "b25750610106805482019055600161018a565b50600061018a565b610606610104546000"  # noqa: E501
-            "5b81811015610f4a5761010480548290811015610002576000918252600080516020610f"  # noqa: E501
-            "75833981519152015414610f375761010480546101039160009184908110156100025760"  # noqa: E501
-            "0080516020610f7583398151915201548252506020919091526040812081815560018101"  # noqa: E501
-            "829055600201555b600101610ec4565b5050506001016104f9565b610104805460008083"  # noqa: E501
-            "55919091526104a790600080516020610f7583398151915290810190610a3356004c0be6"  # noqa: E501
-            "0200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
+            "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
         ),
         storage={
-            0x0: 0x1,
-            0x1: 0x2,
-            0x3: 0xA94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-            0x4: 0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
-            0x104: 0x1,
-            0x107: 0xC22E4,
-            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB2: 0x1,  # noqa: E501
-            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB3: 0x2,  # noqa: E501
+            0: 1,
+            1: 2,
+            3: contract_0,
+            4: sender,
+            260: 1,
+            263: 0xC22E4,
+            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB2: 1,  # noqa: E501
+            0x3736DCA762B6FCB9A97D5EAFDA4032FDBA21DBFA25F875001D51E03EFF955FB3: 2,  # noqa: E501
             0x4C0BE60200FAA20559308CB7B5A1BB3255C16CB1CAB91F525B5AE7A03D02FABE: 0x6877E4536B661640954061CDBC3A9761FB5245C340FCB1721307CD9D5F285C96,  # noqa: E501
-            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 0x1,  # noqa: E501
+            0x6E369836487C234B9E553EF3F787C2D8865520739D340C67B3D251A33986E58D: 1,  # noqa: E501
             0x915023A2112BB78C86FA558ABC0217EA6818D13895B90CE6BE233397F55EB1D0: 0xAAAF5374FCE5EDBC8E2A8697C15331677E6EBAAA,  # noqa: E501
-            0x915023A2112BB78C86FA558ABC0217EA6818D13895B90CE6BE233397F55EB1D1: 0x9,  # noqa: E501
-            0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 0x2,  # noqa: E501
+            0x915023A2112BB78C86FA558ABC0217EA6818D13895B90CE6BE233397F55EB1D1: 9,  # noqa: E501
+            0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 2,  # noqa: E501
         },
         balance=100,
         nonce=0,
-        address=Address("0xec0e71ad0a90ffe1909d27dac207f7680abba42d"),  # noqa: E501
+        address=Address(0xEC0E71AD0A90FFE1909D27DAC207F7680ABBA42D),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "173825d9000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"  # noqa: E501
-        ),
+        to=contract_1,
+        data=Bytes("173825d9") + Hash(contract_0, left_padding=True),
         gas_limit=10000000,
     )
 
     post = {
-        contract: Account(
+        sender: Account(storage={}, code=b"", nonce=1),
+        contract_0: Account(storage={}, nonce=1),
+        contract_1: Account(
             storage={
                 0: 1,
                 1: 1,
-                3: 0x3FB1CD2CD96C6D5C0B5EB3322D807B34482481D4,
+                3: sender,
                 263: 0xC22E4,
                 0xD3E69D8C7F41F7AEAF8130DDC53047AEEE8CB46A73D6BAE86B7E7D6BF8312E6B: 1,  # noqa: E501
             },
+            code=bytes.fromhex(
+                "606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"  # noqa: E501
+            ),
+            balance=100,
+            nonce=0,
         ),
     }
 
diff --git a/tests/ported_static/stZeroCallsRevert/__init__.py b/tests/ported_static/stZeroCallsRevert/__init__.py
index e1371ae59a9..0239b008b60 100644
--- a/tests/ported_static/stZeroCallsRevert/__init__.py
+++ b/tests/ported_static/stZeroCallsRevert/__init__.py
@@ -1 +1 @@
-"""Tests ported from stZeroCallsRevert."""
+"""Ported static tests: stZeroCallsRevert."""  # noqa: N999
diff --git a/tests/ported_static/stZeroCallsRevert/test_zero_value_call_oog_revert.py b/tests/ported_static/stZeroCallsRevert/test_zero_value_call_oog_revert.py
index 4c0dee76d0d..4dfe73bfc18 100644
--- a/tests/ported_static/stZeroCallsRevert/test_zero_value_call_oog_revert.py
+++ b/tests/ported_static/stZeroCallsRevert/test_zero_value_call_oog_revert.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_call_oog_revert.
 
 Ported from:
-tests/static/state_tests/stZeroCallsRevert/ZeroValue_CALL_OOGRevertFiller.json
+state_tests/stZeroCallsRevert/ZeroValue_CALL_OOGRevertFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroCallsRevert/ZeroValue_CALL_OOGRevertFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stZeroCallsRevert/ZeroValue_CALL_OOGRevertFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,9 @@ def test_zero_value_call_oog_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_call_oog_revert."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,39 +48,44 @@ def test_zero_value_call_oog_revert(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=135000,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        Address(
+            0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        ): Account.NONEXISTENT,
+        contract_0: Account(storage={0: 0, 1: 0, 100: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsRevert/test_zero_value_call_to_empty_oog_revert_paris.py b/tests/ported_static/stZeroCallsRevert/test_zero_value_call_to_empty_oog_revert_paris.py
index 52daf61fcbb..8d1c014999b 100644
--- a/tests/ported_static/stZeroCallsRevert/test_zero_value_call_to_empty_oog_revert_paris.py
+++ b/tests/ported_static/stZeroCallsRevert/test_zero_value_call_to_empty_oog_revert_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_zero_value_call_to_empty_oog_revert_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsRevert
-ZeroValue_CALL_ToEmpty_OOGRevert_ParisFiller.json
+state_tests/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_zero_value_call_to_empty_oog_revert_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_zero_value_call_to_empty_oog_revert_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,41 +45,42 @@ def test_zero_value_call_to_empty_oog_revert_paris(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
     # { [[0]](GAS) [[1]] (CALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3b02666bf6e822d04045c3aae0d6b4d6a64249c3"),  # noqa: E501
     )
-    pre[callee] = Account(balance=10, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=135000,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        addr: Account(storage={}, balance=10),
+        target: Account(storage={0: 0, 1: 0, 100: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsRevert/test_zero_value_call_to_non_zero_balance_oog_revert.py b/tests/ported_static/stZeroCallsRevert/test_zero_value_call_to_non_zero_balance_oog_revert.py
index 26459b2c87b..fafae7e0ec9 100644
--- a/tests/ported_static/stZeroCallsRevert/test_zero_value_call_to_non_zero_balance_oog_revert.py
+++ b/tests/ported_static/stZeroCallsRevert/test_zero_value_call_to_non_zero_balance_oog_revert.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_zero_value_call_to_non_zero_balance_oog_revert.
 
 Ported from:
-tests/static/state_tests/stZeroCallsRevert
-ZeroValue_CALL_ToNonZeroBalance_OOGRevertFiller.json
+state_tests/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevertFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevertFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevertFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_zero_value_call_to_non_zero_balance_oog_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
+    """Test_zero_value_call_to_non_zero_balance_oog_revert."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,41 +45,42 @@ def test_zero_value_call_to_non_zero_balance_oog_revert(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    addr = pre.fund_eoa(amount=100)  # noqa: F841
+    # Source: lll
     # { [[0]](GAS) [[1]] (CALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=0x9089DA66E8BBC08846842A301905501BC8525DC4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3b02666bf6e822d04045c3aae0d6b4d6a64249c3"),  # noqa: E501
     )
-    pre[callee] = Account(balance=100, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=135000,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        addr: Account(balance=100),
+        target: Account(storage={0: 0, 1: 0, 100: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsRevert/test_zero_value_call_to_one_storage_key_oog_revert_paris.py b/tests/ported_static/stZeroCallsRevert/test_zero_value_call_to_one_storage_key_oog_revert_paris.py
index 0323931a296..341743b48e8 100644
--- a/tests/ported_static/stZeroCallsRevert/test_zero_value_call_to_one_storage_key_oog_revert_paris.py
+++ b/tests/ported_static/stZeroCallsRevert/test_zero_value_call_to_one_storage_key_oog_revert_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_call_to_one_storage_key_oog_revert_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsRevert
-ZeroValue_CALL_ToOneStorageKey_OOGRevert_ParisFiller.json
+state_tests/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert_ParisFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_zero_value_call_to_one_storage_key_oog_revert_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_call_to_one_storage_key_oog_revert_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    callee = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,43 +49,44 @@ def test_zero_value_call_to_one_storage_key_oog_revert_paris(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=10, storage={0: 1})
+    # Source: lll
     # { [[0]](GAS) [[1]] (CALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3b02666bf6e822d04045c3aae0d6b4d6a64249c3"),  # noqa: E501
+        address=Address(0x3B02666BF6E822D04045C3AAE0D6B4D6A64249C3),  # noqa: E501
     )
-    pre[callee] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=135000,
     )
 
     post = {
-        callee: Account(storage={0: 1}),
+        sender: Account(nonce=1),
+        addr: Account(storage={0: 1}, balance=10),
+        target: Account(storage={0: 0, 1: 0, 100: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsRevert/test_zero_value_callcode_oog_revert.py b/tests/ported_static/stZeroCallsRevert/test_zero_value_callcode_oog_revert.py
index ae59e4f58ba..c18cc81d254 100644
--- a/tests/ported_static/stZeroCallsRevert/test_zero_value_callcode_oog_revert.py
+++ b/tests/ported_static/stZeroCallsRevert/test_zero_value_callcode_oog_revert.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_callcode_oog_revert.
 
 Ported from:
-tests/static/state_tests/stZeroCallsRevert
-ZeroValue_CALLCODE_OOGRevertFiller.json
+state_tests/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevertFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevertFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevertFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,8 +31,9 @@ def test_zero_value_callcode_oog_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_callcode_oog_revert."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -49,39 +48,44 @@ def test_zero_value_callcode_oog_revert(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xEA60,
-                    address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xEA60,
+                address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=135000,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        Address(
+            0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        ): Account.NONEXISTENT,
+        contract_0: Account(storage={0: 0, 1: 0, 100: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsRevert/test_zero_value_callcode_to_empty_oog_revert_paris.py b/tests/ported_static/stZeroCallsRevert/test_zero_value_callcode_to_empty_oog_revert_paris.py
index 608d480c8e4..b036c66aa4b 100644
--- a/tests/ported_static/stZeroCallsRevert/test_zero_value_callcode_to_empty_oog_revert_paris.py
+++ b/tests/ported_static/stZeroCallsRevert/test_zero_value_callcode_to_empty_oog_revert_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_zero_value_callcode_to_empty_oog_revert_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsRevert
-ZeroValue_CALLCODE_ToEmpty_OOGRevert_ParisFiller.json
+state_tests/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_zero_value_callcode_to_empty_oog_revert_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_zero_value_callcode_to_empty_oog_revert_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,41 +45,42 @@ def test_zero_value_callcode_to_empty_oog_revert_paris(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
     # { [[0]](GAS) [[1]] (CALLCODE 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xEA60,
-                    address=0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xEA60,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x17b72dd2bf680549809eb79d47a19391b362e383"),  # noqa: E501
     )
-    pre[callee] = Account(balance=10, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=135000,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        addr: Account(storage={}, code=b"", balance=10, nonce=0),
+        target: Account(storage={0: 0, 1: 0, 100: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsRevert/test_zero_value_callcode_to_non_zero_balance_oog_revert.py b/tests/ported_static/stZeroCallsRevert/test_zero_value_callcode_to_non_zero_balance_oog_revert.py
index 2b89559235f..4d2f36c5dfa 100644
--- a/tests/ported_static/stZeroCallsRevert/test_zero_value_callcode_to_non_zero_balance_oog_revert.py
+++ b/tests/ported_static/stZeroCallsRevert/test_zero_value_callcode_to_non_zero_balance_oog_revert.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_zero_value_callcode_to_non_zero_balance_oog_revert.
 
 Ported from:
-tests/static/state_tests/stZeroCallsRevert
-ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevertFiller.json
+state_tests/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevertFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevertFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevertFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_zero_value_callcode_to_non_zero_balance_oog_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
+    """Test_zero_value_callcode_to_non_zero_balance_oog_revert."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,41 +45,42 @@ def test_zero_value_callcode_to_non_zero_balance_oog_revert(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    addr = pre.fund_eoa(amount=100)  # noqa: F841
+    # Source: lll
     # { [[0]](GAS) [[1]] (CALLCODE 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xEA60,
-                    address=0x9089DA66E8BBC08846842A301905501BC8525DC4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xEA60,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x17b72dd2bf680549809eb79d47a19391b362e383"),  # noqa: E501
     )
-    pre[callee] = Account(balance=100, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=135000,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        addr: Account(balance=100),
+        target: Account(storage={0: 0, 1: 0, 100: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsRevert/test_zero_value_callcode_to_one_storage_key_oog_revert_paris.py b/tests/ported_static/stZeroCallsRevert/test_zero_value_callcode_to_one_storage_key_oog_revert_paris.py
index fa2899cdf89..b728eea6ee6 100644
--- a/tests/ported_static/stZeroCallsRevert/test_zero_value_callcode_to_one_storage_key_oog_revert_paris.py
+++ b/tests/ported_static/stZeroCallsRevert/test_zero_value_callcode_to_one_storage_key_oog_revert_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_callcode_to_one_storage_key_oog_revert_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsRevert
-ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_ParisFiller.json
+state_tests/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_ParisFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_zero_value_callcode_to_one_storage_key_oog_revert_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_callcode_to_one_storage_key_oog_revert_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    callee = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,43 +49,44 @@ def test_zero_value_callcode_to_one_storage_key_oog_revert_paris(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=10, storage={0: 1})
+    # Source: lll
     # { [[0]](GAS) [[1]] (CALLCODE 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xEA60,
-                    address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xEA60,
+                address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x17b72dd2bf680549809eb79d47a19391b362e383"),  # noqa: E501
+        address=Address(0x17B72DD2BF680549809EB79D47A19391B362E383),  # noqa: E501
     )
-    pre[callee] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=135000,
     )
 
     post = {
-        callee: Account(storage={0: 1}),
+        sender: Account(nonce=1),
+        addr: Account(storage={0: 1}, balance=10),
+        target: Account(storage={0: 0, 1: 0, 100: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsRevert/test_zero_value_delegatecall_oog_revert.py b/tests/ported_static/stZeroCallsRevert/test_zero_value_delegatecall_oog_revert.py
index fc34ec4e50e..2fb90912ad8 100644
--- a/tests/ported_static/stZeroCallsRevert/test_zero_value_delegatecall_oog_revert.py
+++ b/tests/ported_static/stZeroCallsRevert/test_zero_value_delegatecall_oog_revert.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_delegatecall_oog_revert.
 
 Ported from:
-tests/static/state_tests/stZeroCallsRevert
-ZeroValue_DELEGATECALL_OOGRevertFiller.json
+state_tests/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevertFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevertFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevertFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,8 +33,9 @@ def test_zero_value_delegatecall_oog_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_delegatecall_oog_revert."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -49,38 +50,43 @@ def test_zero_value_delegatecall_oog_revert(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[0]](GAS) [[1]] (DELEGATECALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]](GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xEA60,
-                    address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xEA60,
+                address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=135000,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        Address(
+            0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        ): Account.NONEXISTENT,
+        contract_0: Account(storage={0: 0, 1: 0, 100: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsRevert/test_zero_value_delegatecall_to_empty_oog_revert_paris.py b/tests/ported_static/stZeroCallsRevert/test_zero_value_delegatecall_to_empty_oog_revert_paris.py
index c6b28327601..5be02211c8d 100644
--- a/tests/ported_static/stZeroCallsRevert/test_zero_value_delegatecall_to_empty_oog_revert_paris.py
+++ b/tests/ported_static/stZeroCallsRevert/test_zero_value_delegatecall_to_empty_oog_revert_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_zero_value_delegatecall_to_empty_oog_revert_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsRevert
-ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_ParisFiller.json
+state_tests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_zero_value_delegatecall_to_empty_oog_revert_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_zero_value_delegatecall_to_empty_oog_revert_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,40 +45,41 @@ def test_zero_value_delegatecall_to_empty_oog_revert_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
     # { [[0]](GAS) [[1]] (DELEGATECALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xEA60,
-                    address=0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xEA60,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa58f691f4ea54dce9588fbad2b459893b055763a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=135000,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        addr: Account(storage={}, code=b"", balance=10, nonce=0),
+        target: Account(storage={0: 0, 1: 0, 100: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsRevert/test_zero_value_delegatecall_to_non_zero_balance_oog_revert.py b/tests/ported_static/stZeroCallsRevert/test_zero_value_delegatecall_to_non_zero_balance_oog_revert.py
index 3a96770a337..b917c075c0b 100644
--- a/tests/ported_static/stZeroCallsRevert/test_zero_value_delegatecall_to_non_zero_balance_oog_revert.py
+++ b/tests/ported_static/stZeroCallsRevert/test_zero_value_delegatecall_to_non_zero_balance_oog_revert.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_zero_value_delegatecall_to_non_zero_balance_oog_revert.
 
 Ported from:
-tests/static/state_tests/stZeroCallsRevert
-ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevertFiller.json
+state_tests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevertFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevertFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevertFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_zero_value_delegatecall_to_non_zero_balance_oog_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
+    """Test_zero_value_delegatecall_to_non_zero_balance_oog_revert."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,40 +45,41 @@ def test_zero_value_delegatecall_to_non_zero_balance_oog_revert(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=100, nonce=0)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=100)  # noqa: F841
+    # Source: lll
     # { [[0]](GAS) [[1]] (DELEGATECALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xEA60,
-                    address=0x9089DA66E8BBC08846842A301905501BC8525DC4,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xEA60,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa58f691f4ea54dce9588fbad2b459893b055763a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=135000,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        addr: Account(balance=100),
+        target: Account(storage={0: 0, 1: 0, 100: 0}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsRevert/test_zero_value_delegatecall_to_one_storage_key_oog_revert_paris.py b/tests/ported_static/stZeroCallsRevert/test_zero_value_delegatecall_to_one_storage_key_oog_revert_paris.py
index df3777cab5e..9259f02ee2b 100644
--- a/tests/ported_static/stZeroCallsRevert/test_zero_value_delegatecall_to_one_storage_key_oog_revert_paris.py
+++ b/tests/ported_static/stZeroCallsRevert/test_zero_value_delegatecall_to_one_storage_key_oog_revert_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_delegatecall_to_one_storage_key_oog_revert_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsRevert
-ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_ParisFiller.json
+state_tests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_ParisFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_zero_value_delegatecall_to_one_storage_key_oog_revert_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_delegatecall_to_one_storage_key_oog_revert_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    callee = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,42 +49,43 @@ def test_zero_value_delegatecall_to_one_storage_key_oog_revert_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=10, storage={0: 1})
+    # Source: lll
     # { [[0]](GAS) [[1]] (DELEGATECALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]] (GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xEA60,
-                    address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xEA60,
+                address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa58f691f4ea54dce9588fbad2b459893b055763a"),  # noqa: E501
+        address=Address(0xA58F691F4EA54DCE9588FBAD2B459893B055763A),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=135000,
     )
 
     post = {
-        callee: Account(storage={0: 1}),
+        sender: Account(nonce=1),
+        addr: Account(storage={0: 1}, balance=10),
+        target: Account(storage={0: 0, 1: 0, 100: 0}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsRevert/test_zero_value_suicide_oog_revert.py b/tests/ported_static/stZeroCallsRevert/test_zero_value_suicide_oog_revert.py
index 03f39fd9b00..b950651b252 100644
--- a/tests/ported_static/stZeroCallsRevert/test_zero_value_suicide_oog_revert.py
+++ b/tests/ported_static/stZeroCallsRevert/test_zero_value_suicide_oog_revert.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_zero_value_suicide_oog_revert.
 
 Ported from:
-tests/static/state_tests/stZeroCallsRevert
-ZeroValue_SUICIDE_OOGRevertFiller.json
+state_tests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,11 +30,9 @@ def test_zero_value_suicide_oog_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
+    """Test_zero_value_suicide_oog_revert."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,46 +43,50 @@ def test_zero_value_suicide_oog_revert(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    # Source: lll
     # { (CALL 40000 <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 [[100]](GAS) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0x9C40,
-                    address=0xDA2EB5512889130C4AF686A291B08665B889CB22,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0x9C40,
+                address=0xDA2EB5512889130C4AF686A291B08665B889CB22,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.SSTORE(key=0x64, value=Op.GAS)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.SSTORE(key=0x64, value=Op.GAS)
+        + Op.STOP,
         nonce=0,
-        address=Address("0x3f9709b08071257d9b49276abf1787b5bdccf0c4"),  # noqa: E501
+        address=Address(0x3F9709B08071257D9B49276ABF1787B5BDCCF0C4),  # noqa: E501
     )
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xDA2EB5512889130C4AF686A291B08665B889CB22)
-            + Op.STOP
-        ),
+    # Source: lll
+    # { (SELFDESTRUCT <contract:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b>)  }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xDA2EB5512889130C4AF686A291B08665B889CB22
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xda2eb5512889130c4af686a291b08665b889cb22"),  # noqa: E501
+        address=Address(0xDA2EB5512889130C4AF686A291B08665B889CB22),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=100000,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        target: Account(storage={}),
+        addr: Account(storage={}),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsRevert/test_zero_value_suicide_to_empty_oog_revert_paris.py b/tests/ported_static/stZeroCallsRevert/test_zero_value_suicide_to_empty_oog_revert_paris.py
index ec1f539ffca..2151d4af342 100644
--- a/tests/ported_static/stZeroCallsRevert/test_zero_value_suicide_to_empty_oog_revert_paris.py
+++ b/tests/ported_static/stZeroCallsRevert/test_zero_value_suicide_to_empty_oog_revert_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_zero_value_suicide_to_empty_oog_revert_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsRevert
-ZeroValue_SUICIDE_ToEmpty_OOGRevert_ParisFiller.json
+state_tests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_zero_value_suicide_to_empty_oog_revert_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_zero_value_suicide_to_empty_oog_revert_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,46 +45,45 @@ def test_zero_value_suicide_to_empty_oog_revert_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0)
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x76FAE819612A29489A1A43208613D8F8557B8898)
-            + Op.STOP
-        ),
+    addr_2 = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
+    # { (SELFDESTRUCT <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b>) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=addr_2) + Op.STOP,
         nonce=0,
-        address=Address("0x888748026558f849c1b2433ea5e1daf1444dfc60"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (CALL 50000 <contract:0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x888748026558F849C1B2433EA5E1DAF1444DFC60,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa2e25f47a24c66cfef22d3304777a22d6dd7ad4a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=75000,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        target: Account(storage={}),
+        addr_2: Account(storage={}, balance=10),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsRevert/test_zero_value_suicide_to_non_zero_balance_oog_revert.py b/tests/ported_static/stZeroCallsRevert/test_zero_value_suicide_to_non_zero_balance_oog_revert.py
index df4e755ddb8..8459e1da25d 100644
--- a/tests/ported_static/stZeroCallsRevert/test_zero_value_suicide_to_non_zero_balance_oog_revert.py
+++ b/tests/ported_static/stZeroCallsRevert/test_zero_value_suicide_to_non_zero_balance_oog_revert.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_zero_value_suicide_to_non_zero_balance_oog_revert.
 
 Ported from:
-tests/static/state_tests/stZeroCallsRevert
-ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json
+state_tests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_zero_value_suicide_to_non_zero_balance_oog_revert(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee_1 = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
+    """Test_zero_value_suicide_to_non_zero_balance_oog_revert."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,46 +45,45 @@ def test_zero_value_suicide_to_non_zero_balance_oog_revert(
         gas_limit=10000000,
     )
 
-    pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x9089DA66E8BBC08846842A301905501BC8525DC4)
-            + Op.STOP
-        ),
+    addr_2 = pre.fund_eoa(amount=100)  # noqa: F841
+    # Source: lll
+    # { (SELFDESTRUCT <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b>) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=addr_2) + Op.STOP,
         nonce=0,
-        address=Address("0x888748026558f849c1b2433ea5e1daf1444dfc60"),  # noqa: E501
     )
-    pre[callee_1] = Account(balance=100, nonce=0)
-    # Source: LLL
+    # Source: lll
     # { (CALL 50000 <contract:0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x888748026558F849C1B2433EA5E1DAF1444DFC60,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
             )
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.STOP
-        ),
+        )
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa2e25f47a24c66cfef22d3304777a22d6dd7ad4a"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=75000,
     )
 
-    post: dict = {}
+    post = {
+        sender: Account(nonce=1),
+        target: Account(storage={}),
+        addr_2: Account(balance=100),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsRevert/test_zero_value_suicide_to_one_storage_key_oog_revert_paris.py b/tests/ported_static/stZeroCallsRevert/test_zero_value_suicide_to_one_storage_key_oog_revert_paris.py
index 99df4d93891..1abcd40243d 100644
--- a/tests/ported_static/stZeroCallsRevert/test_zero_value_suicide_to_one_storage_key_oog_revert_paris.py
+++ b/tests/ported_static/stZeroCallsRevert/test_zero_value_suicide_to_one_storage_key_oog_revert_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_suicide_to_one_storage_key_oog_revert_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsRevert
-ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_ParisFiller.json
+state_tests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_ParisFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_zero_value_suicide_to_one_storage_key_oog_revert_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_suicide_to_one_storage_key_oog_revert_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr_2 = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    callee = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,52 +49,53 @@ def test_zero_value_suicide_to_one_storage_key_oog_revert_paris(
         gas_limit=10000000,
     )
 
-    # Source: LLL
-    # { (CALL 50000 <contract:0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.POP(
-                Op.CALL(
-                    gas=0xC350,
-                    address=0x8D444744833C9B79FDFE630F155CF1F3BBEB92E3,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x2, value=0xC)
-            + Op.SSTORE(key=0x3, value=0xC)
-            + Op.SSTORE(key=0x4, value=0xC)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr_2] = Account(balance=10, storage={0: 1})
+    # Source: lll
+    # { (SELFDESTRUCT <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b>) }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x4757608F18B70777AE788DD4056EEED52F7AA68F
+        )
+        + Op.STOP,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x1d63510fcd4f3069306ebae45ec6910c0bc944c8"),  # noqa: E501
+        address=Address(0x8D444744833C9B79FDFE630F155CF1F3BBEB92E3),  # noqa: E501
     )
-    pre[callee] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    callee_1 = pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x4757608F18B70777AE788DD4056EEED52F7AA68F)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    # Source: lll
+    # { (CALL 50000 <contract:0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[2]]12 [[3]]12 [[4]]12 }  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.CALL(
+                gas=0xC350,
+                address=0x8D444744833C9B79FDFE630F155CF1F3BBEB92E3,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+        )
+        + Op.SSTORE(key=0x2, value=0xC)
+        + Op.SSTORE(key=0x3, value=0xC)
+        + Op.SSTORE(key=0x4, value=0xC)
+        + Op.STOP,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x8d444744833c9b79fdfe630f155cf1f3bbeb92e3"),  # noqa: E501
+        address=Address(0x1D63510FCD4F3069306EBAE45EC6910C0BC944C8),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=75000,
     )
 
     post = {
-        contract: Account(storage={0: 1}),
-        callee: Account(storage={0: 1}),
-        callee_1: Account(storage={0: 1}),
+        sender: Account(nonce=1),
+        target: Account(storage={0: 1}),
+        addr_2: Account(storage={0: 1}, balance=10),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/__init__.py b/tests/ported_static/stZeroCallsTest/__init__.py
index 2002b1cf15b..b950147a342 100644
--- a/tests/ported_static/stZeroCallsTest/__init__.py
+++ b/tests/ported_static/stZeroCallsTest/__init__.py
@@ -1 +1 @@
-"""Tests ported from stZeroCallsTest."""
+"""Ported static tests: stZeroCallsTest."""  # noqa: N999
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_call.py b/tests/ported_static/stZeroCallsTest/test_zero_value_call.py
index fd069703b0f..7c0f01feb36 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_call.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_call.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_call.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest/ZeroValue_CALLFiller.json
+state_tests/stZeroCallsTest/ZeroValue_CALLFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stZeroCallsTest/ZeroValue_CALLFiller.json"],
+    ["state_tests/stZeroCallsTest/ZeroValue_CALLFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_zero_value_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -46,38 +48,40 @@ def test_zero_value_call(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=0x1)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
+        Address(
+            0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        ): Account.NONEXISTENT,
+        contract_0: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_call_to_empty_paris.py b/tests/ported_static/stZeroCallsTest/test_zero_value_call_to_empty_paris.py
index 588c79339ae..9153b52e963 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_call_to_empty_paris.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_call_to_empty_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_zero_value_call_to_empty_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_CALL_ToEmpty_ParisFiller.json
+state_tests/stZeroCallsTest/ZeroValue_CALL_ToEmpty_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_CALL_ToEmpty_ParisFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stZeroCallsTest/ZeroValue_CALL_ToEmpty_ParisFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,12 +30,9 @@ def test_zero_value_call_to_empty_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_zero_value_call_to_empty_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,40 +43,38 @@ def test_zero_value_call_to_empty_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
     # { [[0]](GAS) [[1]] (CALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[100]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf202bae278ac09857f5a56991c7a4679632f5841"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
+        addr: Account(balance=10),
+        target: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_call_to_non_zero_balance.py b/tests/ported_static/stZeroCallsTest/test_zero_value_call_to_non_zero_balance.py
index 2d731fc73ac..50c861952c0 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_call_to_non_zero_balance.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_call_to_non_zero_balance.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_zero_value_call_to_non_zero_balance.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_CALL_ToNonZeroBalanceFiller.json
+state_tests/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,12 +30,9 @@ def test_zero_value_call_to_non_zero_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
+    """Test_zero_value_call_to_non_zero_balance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,40 +43,38 @@ def test_zero_value_call_to_non_zero_balance(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=100, nonce=0)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=100)  # noqa: F841
+    # Source: lll
     # { [[0]](GAS) [[1]] (CALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[100]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=0x9089DA66E8BBC08846842A301905501BC8525DC4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf202bae278ac09857f5a56991c7a4679632f5841"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
+        addr: Account(balance=100),
+        target: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_call_to_one_storage_key_paris.py b/tests/ported_static/stZeroCallsTest/test_zero_value_call_to_one_storage_key_paris.py
index 6d0a8b79af3..a073612b73b 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_call_to_one_storage_key_paris.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_call_to_one_storage_key_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_call_to_one_storage_key_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_CALL_ToOneStorageKey_ParisFiller.json
+state_tests/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKey_ParisFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKey_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKey_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_zero_value_call_to_one_storage_key_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_call_to_one_storage_key_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    callee = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,41 +49,40 @@ def test_zero_value_call_to_one_storage_key_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=10, storage={0: 1})
+    # Source: lll
     # { [[0]](GAS) [[1]] (CALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[100]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALL(
-                    gas=0xEA60,
-                    address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALL(
+                gas=0xEA60,
+                address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xf202bae278ac09857f5a56991c7a4679632f5841"),  # noqa: E501
+        address=Address(0xF202BAE278AC09857F5A56991C7A4679632F5841),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        callee: Account(storage={0: 1}),
-        contract: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
+        addr: Account(storage={0: 1}, balance=10),
+        target: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_callcode.py b/tests/ported_static/stZeroCallsTest/test_zero_value_callcode.py
index 8a238b7e01b..d4721fe68c5 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_callcode.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_callcode.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_callcode.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest/ZeroValue_CALLCODEFiller.json
+state_tests/stZeroCallsTest/ZeroValue_CALLCODEFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stZeroCallsTest/ZeroValue_CALLCODEFiller.json"],
+    ["state_tests/stZeroCallsTest/ZeroValue_CALLCODEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_zero_value_callcode(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_callcode."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -46,38 +48,40 @@ def test_zero_value_callcode(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xEA60,
-                    address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=0x1)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xEA60,
+                address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
+        Address(
+            0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        ): Account.NONEXISTENT,
+        contract_0: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_callcode_to_empty_paris.py b/tests/ported_static/stZeroCallsTest/test_zero_value_callcode_to_empty_paris.py
index 998c307b2ff..8117720261d 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_callcode_to_empty_paris.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_callcode_to_empty_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_zero_value_callcode_to_empty_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_CALLCODE_ToEmpty_ParisFiller.json
+state_tests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_zero_value_callcode_to_empty_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_zero_value_callcode_to_empty_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,40 +45,38 @@ def test_zero_value_callcode_to_empty_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
     # { [[0]](GAS) [[1]] (CALLCODE 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[100]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xEA60,
-                    address=0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xEA60,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa93ae635b4fa4d618045c019ac32ed9adc8f54ea"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
+        addr: Account(storage={}, code=b"", balance=10, nonce=0),
+        target: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_callcode_to_non_zero_balance.py b/tests/ported_static/stZeroCallsTest/test_zero_value_callcode_to_non_zero_balance.py
index 397e6d96231..9b5ab5f0cae 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_callcode_to_non_zero_balance.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_callcode_to_non_zero_balance.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_zero_value_callcode_to_non_zero_balance.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_CALLCODE_ToNonZeroBalanceFiller.json
+state_tests/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalanceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalanceFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalanceFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_zero_value_callcode_to_non_zero_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
+    """Test_zero_value_callcode_to_non_zero_balance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,40 +45,38 @@ def test_zero_value_callcode_to_non_zero_balance(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=100, nonce=0)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=100)  # noqa: F841
+    # Source: lll
     # { [[0]](GAS) [[1]] (CALLCODE 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[100]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xEA60,
-                    address=0x9089DA66E8BBC08846842A301905501BC8525DC4,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xEA60,
+                address=addr,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa93ae635b4fa4d618045c019ac32ed9adc8f54ea"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
+        addr: Account(balance=100),
+        target: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_callcode_to_one_storage_key_paris.py b/tests/ported_static/stZeroCallsTest/test_zero_value_callcode_to_one_storage_key_paris.py
index 92a94065407..6872e5b24d9 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_callcode_to_one_storage_key_paris.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_callcode_to_one_storage_key_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_callcode_to_one_storage_key_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_CALLCODE_ToOneStorageKey_ParisFiller.json
+state_tests/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKey_ParisFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKey_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKey_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_zero_value_callcode_to_one_storage_key_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_callcode_to_one_storage_key_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    callee = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,41 +49,40 @@ def test_zero_value_callcode_to_one_storage_key_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=10, storage={0: 1})
+    # Source: lll
     # { [[0]](GAS) [[1]] (CALLCODE 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0 0) [[100]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0xEA60,
-                    address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0xEA60,
+                address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xa93ae635b4fa4d618045c019ac32ed9adc8f54ea"),  # noqa: E501
+        address=Address(0xA93AE635B4FA4D618045C019AC32ED9ADC8F54EA),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        callee: Account(storage={0: 1}),
-        contract: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
+        addr: Account(storage={0: 1}, balance=10),
+        target: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_delegatecall.py b/tests/ported_static/stZeroCallsTest/test_zero_value_delegatecall.py
index 307fb0356d6..3e630665533 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_delegatecall.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_delegatecall.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_delegatecall.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest/ZeroValue_DELEGATECALLFiller.json
+state_tests/stZeroCallsTest/ZeroValue_DELEGATECALLFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_DELEGATECALLFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stZeroCallsTest/ZeroValue_DELEGATECALLFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -32,8 +31,9 @@ def test_zero_value_delegatecall(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_delegatecall."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -48,37 +48,39 @@ def test_zero_value_delegatecall(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { [[0]](GAS) [[1]] (DELEGATECALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[100]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xEA60,
-                    address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=0x1)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xEA60,
+                address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
+        Address(
+            0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        ): Account.NONEXISTENT,
+        contract_0: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_delegatecall_to_empty_paris.py b/tests/ported_static/stZeroCallsTest/test_zero_value_delegatecall_to_empty_paris.py
index de1e16a095a..a92303da1cc 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_delegatecall_to_empty_paris.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_delegatecall_to_empty_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_zero_value_delegatecall_to_empty_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_DELEGATECALL_ToEmpty_ParisFiller.json
+state_tests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmpty_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmpty_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmpty_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_zero_value_delegatecall_to_empty_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_zero_value_delegatecall_to_empty_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,39 +45,37 @@ def test_zero_value_delegatecall_to_empty_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
+    # Source: lll
     # { [[0]](GAS) [[1]] (DELEGATECALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[100]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xEA60,
-                    address=0x76FAE819612A29489A1A43208613D8F8557B8898,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xEA60,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc8881a7e48d37b4a4cdd6338ce7076d6a116283d"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
+        addr: Account(storage={}, code=b"", balance=10, nonce=0),
+        target: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_delegatecall_to_non_zero_balance.py b/tests/ported_static/stZeroCallsTest/test_zero_value_delegatecall_to_non_zero_balance.py
index 53fbab6492b..a02b7615016 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_delegatecall_to_non_zero_balance.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_delegatecall_to_non_zero_balance.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_zero_value_delegatecall_to_non_zero_balance.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_DELEGATECALL_ToNonZeroBalanceFiller.json
+state_tests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalanceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalanceFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalanceFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +32,9 @@ def test_zero_value_delegatecall_to_non_zero_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    callee = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
+    """Test_zero_value_delegatecall_to_non_zero_balance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,39 +45,37 @@ def test_zero_value_delegatecall_to_non_zero_balance(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=100, nonce=0)
-    # Source: LLL
+    addr = pre.fund_eoa(amount=100)  # noqa: F841
+    # Source: lll
     # { [[0]](GAS) [[1]] (DELEGATECALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[100]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xEA60,
-                    address=0x9089DA66E8BBC08846842A301905501BC8525DC4,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xEA60,
+                address=addr,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc8881a7e48d37b4a4cdd6338ce7076d6a116283d"),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        contract: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
+        addr: Account(balance=100),
+        target: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_delegatecall_to_one_storage_key_paris.py b/tests/ported_static/stZeroCallsTest/test_zero_value_delegatecall_to_one_storage_key_paris.py
index c171743e909..d4e3d2fad43 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_delegatecall_to_one_storage_key_paris.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_delegatecall_to_one_storage_key_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_delegatecall_to_one_storage_key_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_DELEGATECALL_ToOneStorageKey_ParisFiller.json
+state_tests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKey_ParisFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKey_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKey_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_zero_value_delegatecall_to_one_storage_key_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_delegatecall_to_one_storage_key_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    callee = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,40 +49,39 @@ def test_zero_value_delegatecall_to_one_storage_key_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=10, storage={0: 1})
+    # Source: lll
     # { [[0]](GAS) [[1]] (DELEGATECALL 60000 <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b> 0 0 0 0) [[100]] 1 }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.SSTORE(key=0x0, value=Op.GAS)
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.DELEGATECALL(
-                    gas=0xEA60,
-                    address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
-                    args_offset=0x0,
-                    args_size=0x0,
-                    ret_offset=0x0,
-                    ret_size=0x0,
-                ),
-            )
-            + Op.SSTORE(key=0x64, value=0x1)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.DELEGATECALL(
+                gas=0xEA60,
+                address=0x4757608F18B70777AE788DD4056EEED52F7AA68F,
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x0,
+            ),
+        )
+        + Op.SSTORE(key=0x64, value=0x1)
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc8881a7e48d37b4a4cdd6338ce7076d6a116283d"),  # noqa: E501
+        address=Address(0xC8881A7E48D37B4A4CDD6338CE7076D6A116283D),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        callee: Account(storage={0: 1}),
-        contract: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
+        addr: Account(storage={0: 1}, balance=10),
+        target: Account(storage={0: 0x8D5B6, 1: 1, 100: 1}),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_suicide.py b/tests/ported_static/stZeroCallsTest/test_zero_value_suicide.py
index 70e032aa14b..bb055f5de6b 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_suicide.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_suicide.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_suicide.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest/ZeroValue_SUICIDEFiller.json
+state_tests/stZeroCallsTest/ZeroValue_SUICIDEFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stZeroCallsTest/ZeroValue_SUICIDEFiller.json"],
+    ["state_tests/stZeroCallsTest/ZeroValue_SUICIDEFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +31,9 @@ def test_zero_value_suicide(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_suicide."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -46,23 +48,36 @@ def test_zero_value_suicide(
     )
 
     pre[sender] = Account(balance=0xE8D4A51000)
-    # Source: LLL
+    # Source: lll
     # { (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=contract_0,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post: dict = {}
+    post = {
+        contract_0: Account(
+            storage={},
+            code=bytes.fromhex(
+                "73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff00"
+            ),
+            balance=0,
+            nonce=0,
+        ),
+        Address(
+            0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        ): Account.NONEXISTENT,
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_suicide_to_empty_paris.py b/tests/ported_static/stZeroCallsTest/test_zero_value_suicide_to_empty_paris.py
index df558a07c79..f82de945298 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_suicide_to_empty_paris.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_suicide_to_empty_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_suicide_to_empty_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_SUICIDE_ToEmpty_ParisFiller.json
+state_tests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty_ParisFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,9 +23,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty_ParisFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty_ParisFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -33,12 +31,12 @@ def test_zero_value_suicide_to_empty_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_suicide_to_empty_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x76FAE819612A29489A1A43208613D8F8557B8898)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    callee = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,25 +47,36 @@ def test_zero_value_suicide_to_empty_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0)
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=10)
+    # Source: lll
     # { (SELFDESTRUCT <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b>) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x76FAE819612A29489A1A43208613D8F8557B8898)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x76FAE819612A29489A1A43208613D8F8557B8898
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x888748026558f849c1b2433ea5e1daf1444dfc60"),  # noqa: E501
+        address=Address(0x888748026558F849C1B2433EA5E1DAF1444DFC60),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={},
+            code=bytes.fromhex(
+                "7376fae819612a29489a1a43208613d8f8557b8898ff00"
+            ),
+            balance=0,
+            nonce=0,
+        ),
+        addr: Account(balance=10),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_suicide_to_non_zero_balance.py b/tests/ported_static/stZeroCallsTest/test_zero_value_suicide_to_non_zero_balance.py
index 296534c1645..59a84123da5 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_suicide_to_non_zero_balance.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_suicide_to_non_zero_balance.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_suicide_to_non_zero_balance.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json
+state_tests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_zero_value_suicide_to_non_zero_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_suicide_to_non_zero_balance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x9089DA66E8BBC08846842A301905501BC8525DC4)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    callee = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,25 +49,36 @@ def test_zero_value_suicide_to_non_zero_balance(
         gas_limit=10000000,
     )
 
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=100)
+    # Source: lll
     # { (SELFDESTRUCT <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b>) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x9089DA66E8BBC08846842A301905501BC8525DC4)
-            + Op.STOP
-        ),
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x9089DA66E8BBC08846842A301905501BC8525DC4
+        )
+        + Op.STOP,
         nonce=0,
-        address=Address("0x888748026558f849c1b2433ea5e1daf1444dfc60"),  # noqa: E501
+        address=Address(0x888748026558F849C1B2433EA5E1DAF1444DFC60),  # noqa: E501
     )
-    pre[callee] = Account(balance=100, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post: dict = {}
+    post = {
+        target: Account(
+            storage={},
+            code=bytes.fromhex(
+                "739089da66e8bbc08846842a301905501bc8525dc4ff00"
+            ),
+            balance=0,
+            nonce=0,
+        ),
+        addr: Account(balance=100),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_suicide_to_one_storage_key_paris.py b/tests/ported_static/stZeroCallsTest/test_zero_value_suicide_to_one_storage_key_paris.py
index 0d145b38638..0b7f85d5370 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_suicide_to_one_storage_key_paris.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_suicide_to_one_storage_key_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_suicide_to_one_storage_key_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_SUICIDE_ToOneStorageKey_ParisFiller.json
+state_tests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey_ParisFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -24,7 +24,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -33,12 +33,12 @@ def test_zero_value_suicide_to_one_storage_key_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_suicide_to_one_storage_key_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    callee = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,29 +49,37 @@ def test_zero_value_suicide_to_one_storage_key_paris(
         gas_limit=10000000,
     )
 
-    pre[callee] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    # Source: LLL
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=10, storage={0: 1})
+    # Source: lll
     # { (SELFDESTRUCT <eoa:0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b>) }
-    contract = pre.deploy_contract(
-        code=(
-            Op.SELFDESTRUCT(address=0x4757608F18B70777AE788DD4056EEED52F7AA68F)
-            + Op.STOP
-        ),
-        storage={0x0: 0x1},
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(
+            address=0x4757608F18B70777AE788DD4056EEED52F7AA68F
+        )
+        + Op.STOP,
+        storage={0: 1},
         nonce=0,
-        address=Address("0x8d444744833c9b79fdfe630f155cf1f3bbeb92e3"),  # noqa: E501
+        address=Address(0x8D444744833C9B79FDFE630F155CF1F3BBEB92E3),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xE8D4A51000)
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=target,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
     post = {
-        callee: Account(storage={0: 1}),
-        contract: Account(storage={0: 1}),
+        target: Account(
+            storage={0: 1},
+            code=bytes.fromhex(
+                "734757608f18b70777ae788dd4056eeed52f7aa68fff00"
+            ),
+            balance=0,
+            nonce=0,
+        ),
+        addr: Account(balance=10),
     }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_cal_lwith_data.py b/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_cal_lwith_data.py
index caed7ebb3b0..1ad8c694018 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_cal_lwith_data.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_cal_lwith_data.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_transaction_cal_lwith_data.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_TransactionCALLwithDataFiller.json
+state_tests/stZeroCallsTest/ZeroValue_TransactionCALLwithDataFiller.json
 """
 
 import pytest
@@ -23,22 +22,20 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_TransactionCALLwithDataFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsTest/ZeroValue_TransactionCALLwithDataFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_zero_value_transaction_cal_lwith_data(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_transaction_cal_lwith_data."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -53,52 +50,16 @@ def test_zero_value_transaction_cal_lwith_data(
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("1122334455667788991011121314151617181920"),
+        to=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),
+        data=Address(0x1122334455667788991011121314151617181920),
         gas_limit=600000,
     )
 
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_TransactionCALLwithDataFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_zero_value_transaction_cal_lwith_data_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    pre[sender] = Account(balance=0xE8D4A51000)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("1122334455667788991011121314151617181920"),
-        gas_limit=600000,
-    )
-
-    post: dict = {}
+    post = {
+        Address(
+            0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        ): Account.NONEXISTENT,
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_cal_lwith_data_to_empty_paris.py b/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_cal_lwith_data_to_empty_paris.py
index 9e2c06c51af..8a9f12d67e4 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_cal_lwith_data_to_empty_paris.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_cal_lwith_data_to_empty_paris.py
@@ -1,14 +1,12 @@
 """
-Test ported from static filler.
+Test_zero_value_transaction_cal_lwith_data_to_empty_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_TransactionCALLwithData_ToEmpty_ParisFiller.json
+state_tests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmpty_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
@@ -23,64 +21,17 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmpty_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmpty_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_zero_value_transaction_cal_lwith_data_to_empty_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    contract = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    pre[contract] = Account(balance=10, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("1122334455667788991011121314151617181920"),
-        gas_limit=600000,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmpty_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_zero_value_transaction_cal_lwith_data_to_empty_paris_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    contract = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_zero_value_transaction_cal_lwith_data_to_empty_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -91,16 +42,15 @@ def test_zero_value_transaction_cal_lwith_data_to_empty_paris_from_prague(
         gas_limit=10000000,
     )
 
-    pre[contract] = Account(balance=10, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("1122334455667788991011121314151617181920"),
+        to=addr,
+        data=Address(0x1122334455667788991011121314151617181920),
         gas_limit=600000,
     )
 
-    post: dict = {}
+    post = {addr: Account(balance=10)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_cal_lwith_data_to_non_zero_balance.py b/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_cal_lwith_data_to_non_zero_balance.py
index aa007a56e21..861f03a1aa1 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_cal_lwith_data_to_non_zero_balance.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_cal_lwith_data_to_non_zero_balance.py
@@ -1,14 +1,12 @@
 """
-Test ported from static filler.
+Test_zero_value_transaction_cal_lwith_data_to_non_zero_balance.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_TransactionCALLwithData_ToNonZeroBalanceFiller.json
+state_tests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalanceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
@@ -23,64 +21,17 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalanceFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalanceFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_zero_value_transaction_cal_lwith_data_to_non_zero_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    contract = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    pre[contract] = Account(balance=100, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("1122334455667788991011121314151617181920"),
-        gas_limit=600000,
-    )
-
-    post: dict = {}
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalanceFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_zero_value_transaction_cal_lwith_data_to_non_zero_balance_from_prague(
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    contract = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
+    """Test_zero_value_transaction_cal_lwith_data_to_non_zero_balance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -91,16 +42,15 @@ def test_zero_value_transaction_cal_lwith_data_to_non_zero_balance_from_prague(
         gas_limit=10000000,
     )
 
-    pre[contract] = Account(balance=100, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
+    addr = pre.fund_eoa(amount=100)  # noqa: F841
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("1122334455667788991011121314151617181920"),
+        to=addr,
+        data=Address(0x1122334455667788991011121314151617181920),
         gas_limit=600000,
     )
 
-    post: dict = {}
+    post = {addr: Account(balance=100)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris.py b/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris.py
index 0f4cd6ff9bb..ccf72111465 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_TransactionCALLwithData_ToOneStorageKey_ParisFiller.json
+state_tests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKey_ParisFiller.json
 """
 
 import pytest
@@ -23,22 +22,21 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKey_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKey_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.valid_until("Cancun")
 @pytest.mark.pre_alloc_mutable
 def test_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    contract = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -49,62 +47,16 @@ def test_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris(
         gas_limit=10000000,
     )
 
-    pre[contract] = Account(balance=10, nonce=0, storage={0x0: 0x1})
     pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=10, storage={0: 1})
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex("1122334455667788991011121314151617181920"),
+        to=addr,
+        data=Address(0x1122334455667788991011121314151617181920),
         gas_limit=600000,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKey_ParisFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Prague")
-@pytest.mark.pre_alloc_mutable
-def test_zero_value_transaction_cal_lwith_data_to_one_storage_key_paris_from_prague(  # noqa: E501
-    state_test: StateTestFiller,
-    pre: Alloc,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    contract = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=10000000,
-    )
-
-    pre[contract] = Account(balance=10, nonce=0, storage={0x0: 0x1})
-    pre[sender] = Account(balance=0xE8D4A51000)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex("1122334455667788991011121314151617181920"),
-        gas_limit=600000,
-    )
-
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {addr: Account(storage={0: 1}, balance=10)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_call.py b/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_call.py
index d6948cb0f17..d2321a62031 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_call.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_call.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_transaction_call.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest/ZeroValue_TransactionCALLFiller.json
+state_tests/stZeroCallsTest/ZeroValue_TransactionCALLFiller.json
 """
 
 import pytest
@@ -11,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -21,9 +22,7 @@
 
 
 @pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_TransactionCALLFiller.json",  # noqa: E501
-    ],
+    ["state_tests/stZeroCallsTest/ZeroValue_TransactionCALLFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -31,12 +30,11 @@ def test_zero_value_transaction_call(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_transaction_call."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
-    contract = Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -51,10 +49,16 @@ def test_zero_value_transaction_call(
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post: dict = {}
+    post = {
+        Address(
+            0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B
+        ): Account.NONEXISTENT,
+        sender: Account(nonce=1),
+    }
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_call_to_empty_paris.py b/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_call_to_empty_paris.py
index c1f17ee3aa8..62a4ac96ba2 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_call_to_empty_paris.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_call_to_empty_paris.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_zero_value_transaction_call_to_empty_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_TransactionCALL_ToEmpty_ParisFiller.json
+state_tests/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmpty_ParisFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,21 +22,17 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmpty_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmpty_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_zero_value_transaction_call_to_empty_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    contract = Address("0x76fae819612a29489a1a43208613d8f8557b8898")
+    """Test_zero_value_transaction_call_to_empty_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,15 +43,15 @@ def test_zero_value_transaction_call_to_empty_paris(
         gas_limit=10000000,
     )
 
-    pre[contract] = Account(balance=10, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
+    addr = pre.fund_eoa(amount=10)  # noqa: F841
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=addr,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post: dict = {}
+    post = {addr: Account(balance=10)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_call_to_non_zero_balance.py b/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_call_to_non_zero_balance.py
index 5a0c8eac011..546b407404d 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_call_to_non_zero_balance.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_call_to_non_zero_balance.py
@@ -1,17 +1,16 @@
 """
-Test ported from static filler.
+Test_zero_value_transaction_call_to_non_zero_balance.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_TransactionCALL_ToNonZeroBalanceFiller.json
+state_tests/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalanceFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,21 +22,17 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalanceFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalanceFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
-@pytest.mark.pre_alloc_mutable
 def test_zero_value_transaction_call_to_non_zero_balance(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
-    sender = EOA(
-        key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
-    )
-    contract = Address("0x9089da66e8bbc08846842a301905501bc8525dc4")
+    """Test_zero_value_transaction_call_to_non_zero_balance."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xE8D4A51000)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,15 +43,15 @@ def test_zero_value_transaction_call_to_non_zero_balance(
         gas_limit=10000000,
     )
 
-    pre[contract] = Account(balance=100, nonce=0)
-    pre[sender] = Account(balance=0xE8D4A51000)
+    addr = pre.fund_eoa(amount=100)  # noqa: F841
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=addr,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post: dict = {}
+    post = {addr: Account(balance=100)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_call_to_one_storage_key_paris.py b/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_call_to_one_storage_key_paris.py
index ce52515ca85..9be1ac8ffd8 100644
--- a/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_call_to_one_storage_key_paris.py
+++ b/tests/ported_static/stZeroCallsTest/test_zero_value_transaction_call_to_one_storage_key_paris.py
@@ -1,9 +1,8 @@
 """
-Test ported from static filler.
+Test_zero_value_transaction_call_to_one_storage_key_paris.
 
 Ported from:
-tests/static/state_tests/stZeroCallsTest
-ZeroValue_TransactionCALL_ToOneStorageKey_ParisFiller.json
+state_tests/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKey_ParisFiller.json
 """
 
 import pytest
@@ -12,6 +11,7 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
     StateTestFiller,
     Transaction,
@@ -23,7 +23,7 @@
 
 @pytest.mark.ported_from(
     [
-        "tests/static/state_tests/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKey_ParisFiller.json",  # noqa: E501
+        "state_tests/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKey_ParisFiller.json"  # noqa: E501
     ],
 )
 @pytest.mark.valid_from("Cancun")
@@ -32,12 +32,12 @@ def test_zero_value_transaction_call_to_one_storage_key_paris(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Test_zero_value_transaction_call_to_one_storage_key_paris."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    addr = Address(0x4757608F18B70777AE788DD4056EEED52F7AA68F)
     sender = EOA(
         key=0x4F31B3206FBF0E0E598B9B1A7D8AC86302A0FF1D8930738F1BEBAE9B67173E52
     )
-    contract = Address("0x4757608f18b70777ae788dd4056eeed52f7aa68f")
 
     env = Environment(
         fee_recipient=coinbase,
@@ -48,17 +48,16 @@ def test_zero_value_transaction_call_to_one_storage_key_paris(
         gas_limit=10000000,
     )
 
-    pre[contract] = Account(balance=10, nonce=0, storage={0x0: 0x1})
     pre[sender] = Account(balance=0xE8D4A51000)
+    pre[addr] = Account(balance=10, storage={0: 1})
 
     tx = Transaction(
         sender=sender,
-        to=contract,
+        to=addr,
+        data=Bytes(""),
         gas_limit=600000,
     )
 
-    post = {
-        contract: Account(storage={0: 1}),
-    }
+    post = {addr: Account(storage={0: 1}, balance=10)}
 
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/__init__.py b/tests/ported_static/stZeroKnowledge/__init__.py
index f30be7e821d..22c418b38e9 100644
--- a/tests/ported_static/stZeroKnowledge/__init__.py
+++ b/tests/ported_static/stZeroKnowledge/__init__.py
@@ -1 +1 @@
-"""Tests ported from stZeroKnowledge."""
+"""Ported static tests: stZeroKnowledge."""  # noqa: N999
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_empty_data_insufficient_gas.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_empty_data_insufficient_gas.py
deleted file mode 100644
index 7f8ecfa60fd..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_empty_data_insufficient_gas.py
+++ /dev/null
@@ -1,223 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge
-ecpairing_empty_data_insufficient_gasFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_empty_data_insufficient_gasFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (40000, {}),
-        (80000, {}),
-        (
-            150000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_empty_data_insufficient_gas(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x2027A, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A761FD86, nonce=1)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000000000"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_inputs.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_inputs.py
deleted file mode 100644
index 12110d08f8c..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_inputs.py
+++ /dev/null
@@ -1,1386 +0,0 @@
-"""
-Various inputs to the bn254_pairing precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge/ecpairing_inputsFiller.yml
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stZeroKnowledge/ecpairing_inputsFiller.yml"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, expected_post",
-    [
-        (
-            "25a78fa05de3e5f7c69f35ab209d6595697e8664c3572a57ea0c971fe33532ed0bc38b0a2d9961cf8d392de63be18471ffaaa192111cd8adccc98b7d790b61140000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008013e823575500fffffffffffffffa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "2dec711c75595613e8f7e4723c19f6e69be2ebafe07e965a001f4fa00a41eecc10246180d145035dfe0e334a8e1f4274a189b8dde0b2cc683cddfd9cae9b634b198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff0f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "30644e72e131a029b85045b68181585d97816a916871ca8d3c208d16d87cfd4700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0a12d3fb2743836bbbb51414a351e5e70429a5de70c0fe7cec084e47d6027709006a8c414196abf21da0b3f6944846c77a1032b519baa1abf125f4f84010c47a250f9cf43675bc1077753c607600f3e51b627a10f3aa68a7e462d89a6bd2a21312ae5d695c4f9792cf70228a1ba07e5e0c2cb47d7aecbae923a84a3734a94ff10bdcd3d0b8e47a925f98bad0184dfe81967aaff8db8f0dfae31afccbcb8c4bd6148dff646f2764243ba9100a930eb7cc8c766b58e0d9953256698da5dbe66cc31f372b78747db898121455853a5672e71977957f134615fd0dd1fab4938b65e7201458c7d8ec49141bd3289f8cc4d19bb52041d51187432579e2e67cab27c847198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa2110e6d9f2378c1c1cd070a3f1507c3aa924a60f67259abe487621b0d3c5c38f0c26130b8aaa54109a5d82fbb2782b9ed461a4b8faa69341ccf652d2f73e188722f1acbb03c4508760c2430af35865e7cdf9f3eb1224504fdcc3708ddb954a482a344fad01c2ed0ed73142ae1752429eaea515c6f3f6b941103cc21c2308e1cb159f15b842ba9c8449aa3268f981010d4c7142e5193473d80b464e964845c3f80efd30ac7b6f8d0d3ccbc2207587c2acbad1532dc0293f0d034cf8258cd428b300710c68e1b8b73a72a289422d2b6f841cc56fe8c51105021c56ae30c3ae1aca0b2ff392a2fc535427ec9b7e1ae1c35a7961986788cf648349190dd92e182f05198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daabebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebefdbebebebeabc689bebebebe43be92be5fbebebebebebebebebebebebebebebebebebebebebebebe9ebebebe2abebebebebebebebebebebebebebebebebebe",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000ffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca71ca8d3c16d87cfd450000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000ffff7d7d7d7d7d7d7d7d7d7d7d7d30644e72e131a0297d7d7d7dffffffffff00000000000000000000000000000000000000000000000000000000ff7d7d7d7d7d817d7d7d7d7dffffffffffa100000000000000ffffffffffffffffffffffffffff7d7d7d7d7d7d7d7d7d7d7d7d30644e72e131a0297d7d7d7dffffffffff00000000000000000000000000000000000000000000000000000000ff7d7d7d7d7d817d7d7d7d7d827d7d7d7d7d7d",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000002900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fffffffffffffff80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000fffffffffdfffffe2e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "30644e72e131a029b85045ac81ec585dffffffffffffffffffffffffffffffffffff7d7dffff7d817f827d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d767d7d7d7d7d7d797d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7f7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d8d7d7d7d7d7d7d7dffffffffffffffffffffff01ffffffffffffffffffffff747d7d7d7d7d7d7d7d7dfd7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7dffffffffffffffffffffffff29ffffff0affffff0a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000010000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47000000000000000000000000000000000000000000000000000000000000000000000000ffffff000060bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad0c693395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000be00be00bebebebebebe00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed95bc4b313370b38ef355acdadcd122975b4b313370b38ef355acdadcd122975b120000c8db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "2a4f1dbc9fe6d2882462fb11afeae7b7f2a0cf213b1f19c45cb222336283f3801141763c897c9a90e387ea80f68eb88c2d79aab680196d9538cd2ca632a5e81b0e540f5b5be91f82ed05349750761224f543068ce30d2d5e838bf66866f345200fa5ac8c46f725e54505019bda3356ef6e35b0a89b9b4f79bb0c62211235c9312e6d97a1f7e0428fc0be6be02c811095f5166710dcbe869c36a8ef89cac63e012657bbaf3bcfd106dd677eef03172f693a6c919776f441dc0fd47a4bd91d0487225fdab8fe6cd876363d27075cdf0d01c209da61b1634b574a5d811cfae407001216b7c3e2adc07c3bef31771c7bb9e1d02f07ff3a5b74953c4fd5bf9a7a6dff25f63fcc543337b8f6275f97d6479633b921541a96ac1bc2aff2e0905db7407c206776f9480168741eca625c06e5526b4664a02ce664bc656f39664d96278b6e1e40e8084fd648ba315f691e8367be1d4c13844421c87223d84829c31a0d7afe24b8042d4cb604ae66c0dc97ca8a9c2d22c743335d92bc401700f6b00d5cdc5b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "2eca0c7238bf16e83e7a1e6c5d49540685ff51380f309842a98561558019fc0203d3260361bb8451de5ff5ecd17f010ff22f5c31cdf184e9020b06fa5997db841213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f06967a1237ebfeca9aaae0d6d0bab8e28c198c5a339ef8a2407e31cdac516db922160fa257a5fd5b280642ff47b65eca77e626cb685c84fa6d3b6882a283ddd1198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2e8ff2110ede0e189426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba2e89718ad33c8bed92e210e81d1853435399a271913a6520736a4729cf0d51eb01a9e2ffa2e92599b68e44de5bcf354fa2642bd4f26b259daa6f7ce3ed57aeb314a9a87b789a58af499b314e13c3d65bede56c07ea2d418d6874857b70763713178fb49a2d6cd347dc58973ff49613a20757d0fcc22079f9abd10c3baee2459000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002d00e9ff0000000000000000ffffffffffffffffbfffffffffffffffffffa120000000000000fffffffffff7ffffffffffff000000000000000000000000000000000000000000000000000000002d0002ff0000000000000000ffffffffffffffffbfffffffffffffffffffa120000000000000ff007d7d7d7d7d7d7d7d7d7d",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a0294fafba497e1ec6d18c48814a69000000010000000030000000cd71ec682d26313681ea8a1a9a410c862cc44a5d0000000000000000000001158d600a2d8411f2e9bd1a1b51eac64e43b0c511f2e9bd1a1b51eac64e43b0c511fc9ba8b80b727a2c28ee454fc286fd659262c510a3e7f11a4b0e4b74bebafc",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002d00e9ff0000000000000000ffffffffffffffffbfb2ffffffffffffffffa120000000000000fffffffffff7ffffffffffff000000000000000000000000000000000000000000000000000000002d0002ff0000000000000000ffffffffffffffffbfffffffffffffffffffa120000000000000ff007d7d7d7d7d7d7d7d7d7d",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f8ffffffffffffff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffa10000000000ffffffffffffffffffa100000000000000000000000000000000000000000000000000000000000000000016c46ebe0077418d002f28e20236919ad92313729f18578ba8547626478ea52c2b5b688b4d8078d1e1acd7acc7be7f9e0e30812ce2925b35559213646c93237f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000000000000000000000000000ffffffff000000000000000000000000000000000000000000000000fb55bf7df894a746fbe20b6f8c54d0dc0d9fd4ed005174a42fc3c45e6e27f912a20d63d446eb175733853b88dd36708eb7a81f5c79e7659c3a6e2b2c470077005ed60ba723a2dd3a5fc35520f982963de61e3b563636fe6996cc2c3008035720ad16f835a46faca48c6d39ae00a10d3514e93ae3b946ee2f009ea2dccff97e198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed09068950585ff0759e99ecad6903000000000000000000000000000000002c000000000000000000000085b7aef328c21800deef5e0000aa426a00665e0000aa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8329a0d6d5e7d14a774c3abff1435361da2ee5d8b4f3ee62085ce779f248b41d4a2fd37ae5468f6a17b7f9a0bcca02ee128bdced61402a566e4eee2d0fa825f03d198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47000000000000004500000000000000000000000000000000000000000000000107b55de1642362d16b8fc4dccfec9e794d24968511cf8e252ed27afc4d72ca1e0301cb4d7e0b7b52a6a8f78613c403ead1543fedb0d3f28c77685fdb9eaa27420cdc335fa81dff303b71cffb0256d7097c2b4c6715ca7b1589ea9386a41c2f851223d6bb1f3e68ddfb08f4c95f590f99227fb681a3b0abdf685cf12bde37d8ee000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000001f1cd7f247f2ae1ba9a1aeb4b32ed4c8c13c70c8861b6ab5340e276c58e1046b13d7de2b557e0ae2b53380ad596ba79f07c037c9d9aa17cf407e9ed86201436e",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffff0000000000000000ffffffffffffffffffff",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000192b7e3a0ca8b63592989fe8b2589465703315272bc730644e72e131a029b85045b68181585d00001b86b77538000000000100000000128a694e7017ae1db6a312c9ef648b1a4910a41e684cb554302044a2065f04680df2d76a91278279cf401d431c31876ee9c8ad35070694552ccbd368755413830000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000192b7e3a0ca8b63592989fe8b2589465703315272bc730644e72e131a029b85045b68181585d00001b86b77538000000000100000000128a694e7017ae1db6a312c9ef648b1a4910a41e684cb554302044a2065f04680df2d76a91278279cf401d431c31876ee9c8ad35070694552ccbd36875541383",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005b000000000045000000002a00000000008000000000000000000130644e72e131a029b65045b68181585d2b0d3025c6abdbaa75ef4d163a7cfd4017c66e1806ece8d631d792f8cbd8bdf7514a9058c183a3b2fcda7e86c44b7752301a6a722cdc812165b619f3cd2b21250d7f7083d0b984fdaf8636202e4ae0470000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2b0d3025c6ab2eb4fbef4d16d87cfd4000000000005b004500000000000000002a000000000000000000000000000001109beddbaa84026c8f71d34a485af27fe418028129b55b0a0df51e3dba2310021aea54403ce01876467152aa79ca1f227b6b1e0f95b56cb0537583190252556d",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000000000000000000000000000ffffffff000000000000000000000000000000000000000000000000fb55bf7df894a746fbe20b6f8c54d5dc0d9fd4eda4742fc35100c45e6e27f912a20d63d446eb175733853b88dd36708eb7a81f5c79e7659c3a6e2b2c470077000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000000000000000000000000000ffffffff000000000000000000000000000000000000000000000000fb55bf7df894a746fbe20b6f8c549feddc0dd0d4005174a42fc3c45e6e27f912a20d63d446eb175733853b88dd36708eb7a81f5c79e7659c3a6e2b2c470077",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ea1146af1a0c4df0000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015d42e5a1c18703100bef65a743007bead1fc389b7d8f0a8ccda34b7d30620cb1c4156d243211b733af4f4fff11b9c0928308bf3c3102415e3105b986166d0cd00000000000000000000000000000000000000000000f8ffffffffffffff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000249409822e0000000000000000000000000000000000000001154baf30644e72e131a029b85045b66ac4175696816a916871ca8d3c208c161a46c432126f44fab27034ba2832173059ebf31a96607ada20f006b4f12d4a8bad410d8f02eee77897359cfc599b6ca4e8c2a47f641fc0cd6d4146d8eca263a85c7aa36500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b92493387900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b924933879",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb43000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb43",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb431a3cf0c503b2dbc6e1b0f8aea605de20d8612fe14627c6f4d3706f8272a1cf842a0bb098018ca4392a1ddc08b9605602aed954308944ac729e2f99bfdd0166dd0000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000024b364d16400886c82900af060fd117cb2f4e0b93590cbf6ec34ed97f4c391ec26a10e3233aeff776d578de9178a9b7bb919e6eb6cf2cf924eb16ec8dc659af9",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b05040ff00000000000000000000000000000000000000002e00d573b028b22b9d347da8044a53c94b6c3aee7d9bfb00ab2c0a10eb4775e619e1a75be1c5d39a105504a0e5d16c949524742dde6bbb6e831668fef921a1430000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b050ffffffff585d97816a86b77537dafbef4d16d87cfd4500000000005b00450000f400000000002a00647d903b504c1a020000000000012db3d49da56012cf4f73cbf19fdb59ef41356cebb4f4b6f692f9a38fb282a9ff2d96db5d24dcea418a44feae6052fbc7788e65e521b17232666818386252176a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000107b55de1642362d16b8f25dccf30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d800000009eae594f627b7ccf496d680f0266e7364f51d2d99ccd69801f29137d889e1e006ea1409d3f9bb38bd40e8da0701d122e059a02fc3c3c4a99a8cbf6e4290bdc0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000107b55de1642362d16b8f25dccf30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d800000009eae594f627b7ccf496d680f0266e7364f51d2d99ccd69801f29137d889e1e006ea1409d3f9bb38bd40e8da0701d122e059a02fc3c3c4a99a8cbf6e4290bdc0",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000005b00450000000000da76b36b83c72830000000000000000000000830644e72e131a029b85045b68181585d97816a916871ca8d104d5b2baf5734631b8765e7f5163862fcd3bc29f751af42d869a0c8a329f5a53472d3c977038bb7068cd6bc298bd1ec695a49e1db0620332f26e03a4a0ed9076973c1fea43099f2000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000005b00450000fc00000000002a00647d903b504c1a0200000000000130644e72e131a029b85045b68181585d97816a86b77537dafbef4d16d87cfd450125b8edede9e4f320e4dbfd7ee46d23a82508c3b44dbb99cb29724daaa5c5602d663cc48c6d7469cc9df0e861f3a9b93239af8001f8ecf28b4572f201ef1369000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a86b77538dafbef4d16d87cfd4500000000005b004500000000000000002a00647d903b504c1a02000000000001247f1f6fbf2fe1fff7e28d816724080774979f57692c2fa8569ea1a3ce52dfc51f5c96f77d84ae24b701a32ff1b8d95b982c76bf5ab02e605c9ba4fa9f45b958",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002012cd187faae3648a35e12cc197ddb26d9d3a44a625d97816a86b77537dafbef30644e72e131a029b050ffffffff5802086325c1129ad4a34ebb48ee9634016008aef33d9388c8f993f0af340e047c1c9519d222062186f7b025291b6f6f4ef2293f1064b0e3345895dc4968bc8bb52fcbe960621c1f15cd7c693c7347078e32000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45012cd187faae3648a35e12cc197ddb26d9d3a44a625d97816a86b77537dafbef30644e72e131a029b050ffffffff5802086325c1129ad4a34ebb48ee9634016008aef33d9388c8f993f0af340e047c1c9519d222062186f7b025291b6f6f4ef2293f1064b0e3345895dc4968bc8bb52fcbe960621c1f15cd7c693c7347078e32",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b05045b68181585d97816a86b77537dafbef4d16d87cfd4500000000005b00450000fc00000000002a00647d903b504c1a020000000000012c32d7465b0607cfaebe0b13577b25e42fe6d9e49eeb9d5c0ca78cc17e114cbc2cd71c8288ebbd272a784c5b4921128cb68e9e2ddaaec0595b266126c4e526bd000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b05045b68181585d97816a86b77537dafbef4d16d87cfd4500000000005b00450000fc00000000002a00647d903b504c1a020000000000012c32d7465b0607cfaebe0b13577b25e42fe6d9e49eeb9d5c0ca78cc17e114cbc2cd71c8288ebbd272a784c5b4921128cb68e9e2ddaaec0595b266126c4e526bd",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a68917120ca8d3c8c16d87cfd4500000000005b004500000000000000000000000000000000000000004000000111ee2be185fb562c979eeb452df376f91c7852bfb8a6d5727024444a2fc58c152825d78e66be7952503e9e1bf2d8aad4c39f4ce4095349043106508bab20d6e5000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a68917120ca8d3c8c16d87cfd4500000000005b004500000000000000000000000000000000000000004000000111ee2be185fb562c979eeb452df376f91c7852bfb8a6d5727024444a2fc58c152825d78e66be7952503e9e1bf2d8aad4c39f4ce4095349043106508bab20d6e5",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a86b77538dafbef4d16d87cfd4500000000005b004500000000000000002a000000000000000000000000000001124ca5dc43ed1e22d1c616b50a7d4249a012c1d65330ae8e4cad70567c8231bb23f9415fa570e58e0ac61e4e6e7a6bd02a564f6b206a9d4645401b1d677bf3ab000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a86b77538dafbef4d16d87cfd4500000000005b004500000000000000002a000000000000000000000000000001124ca5dc43ed1e22d1c616b50a7d4249a012c1d65330ae8e4cad70567c8231bb23f9415fa570e58e0ac61e4e6e7a6bd02a564f6b206a9d4645401b1d677bf3ab",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a86b77538dafbef4d16d87cfd4500000000005b004500000000000000002a00647d903b504c1a02000000000001247f1f6fbf2fe1fff7e28d816724080774979f57692c2fa8569ea1a3ce52dfc51f5c96f77d84ae24b701a32ff1b8d95b982c76bf5ab02e605c9ba4fa9f45b958000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a86b77538dafbef4d16d87cfd4500000000005b004500000000000000002a00647d903b504c1a02000000000001247f1f6fbf2fe1fff7e28d816724080774979f57692c2fa8569ea1a3ce52dfc51f5c96f77d84ae24b701a32ff1b8d95b982c76bf5ab02e605c9ba4fa9f45b958",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a916871ca8d30140b193f92396c00000000005b0045000000000000000000000000000000080000000000000001301a8b8043356b83c4341d5e9cfc67071c61c0b053ec979b59ad8c0455b71c9815f88e8c709168c1ab898ca5288423b585331497f16b2c074dcbf76c2480e8c9000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d30140b193f92396c00000000005b0045000000000000000000000000000000080000000000000001301a8b8043356b83c4341d5e9cfc67071c61c0b053ec979b59ad8c0455b71c9815f88e8c709168c1ab898ca5288423b585331497f16b2c074dcbf76c2480e8c9",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd452b0d3f819fd0046aee4d0e54cc759ad714c473bd5f86a0d68df977f7450390f730644e72e131a029b85045ae0000000000000107b55de1642362d16b8fc4dccf2a5c3a27c4a417ea34f627b9481b9004e3b0ef59619daa16e846d8a152d6bf771301a8bb9c71966a4b557a21eea89447294e8a9cc1308f0c8eecb16dfbf5d53b000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000004500000000000000000000000000000000000000000000000107b55de1642362d16b8fc4dccfec9e794d24968511cf8e252ed27afc4d72ca1e0301cb4d7e0b7b52a6a8f78613c403ead1543fedb0d3f28c77685fdb9eaa2742",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd0000000000005b0045000000000000000000000000000000000000000000000001112006831f3f0e121585c21cdf0aaf63f09728bcfee141bb4cd407caae7715e319df1e217ad7b1f874726c6683ab87b423c1737f46a54dc5356a9b617c6b9e28000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb43",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "003db26a0b244fb3fd47f7f5f0f8a289e088fd932d340f0592696503fc62124824c9b9423ef04336563adc35604ba729a4c9e6104bfcb55517e3198b8edbdf981800deef121f1e76426a00665e5c4479674322d4f75edaddde46bd5cd992f6ed198e9393920d483a7260bfb731dd5d25f1aa493335a9e71297e485b7aef312c20b9f1099ecefa8b45575d349b0a6f04c16d0d58af9007f2c6d8bd7aa763a3b0e0b7c77862fe8d10d489a493a1a5c5d0f282c7d4e8148f340653c4b6297a1088f003db26a0b244fb3fd47f7f5f0f8a289e088fd932d340f0592696503fc62124824c9b9423ef04336563adc35604ba729a4c9e6104bfcb55517e3198b8edbdf98198e9393920d483a7260bfb731dd5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed2ba3e0cab22efbfef96e027f1a29ba7ec11a0f824024a3787d3cb8370b9eed71103ce48dac2e3ff691b61c7e4466adf35aa183aade7f15386bf7c789628b1b0e",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0d1e4322f03fa0515f8ed6cb02b15e5a024b5092003dd7792d2ac055f14ac67d155c53a1daa56e3a5e9bd097cebfcd44038f2c606c8951310aae0ea01a44725300000000000000279573fbfe8e6c2300000000000030640472e131a029b85045255495ffba02a0ed6877a0a6ed4684235053c04cc3aaa05934e35bbb953673af0e1cec4c9d6d3921992e4c5c71523f5d097cde90f25b3e6c52c9c63e764a67870fe0cfe24e0b2f78d4f909c9131e3794fa911b1109df4a567b1423475cf409c1000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4700000000000000000000000000000000000000fcff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000212a3b4059e59d125dd17f662945170e1e13024fae97a401895690acac63cf681aecb67409d1d9c142ffd13375bd79fd0457deb278dfa91b5756378fb837fd60",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0e474956b0fbc11ba65f3c7632afb3c66a98340871cee7c974db4461d8791b8d25410e545457af7bb0e9d2f1f8126180f11dec9bfcf69cd2934e6814741c9aa2231e75fddf7e2fa8b38b7dd6fd13eb4b7046000000000000000000000200650000000000000000000000000000000000000000000000002546ac8393e836a2970d312fc0ac642c207b5b36e17990b4f7d0ef39cfe6f0d46b9c556a0b7935714b1e4cd9fd726048138dcdea456203d4b7414f3ba5ef7b37817aa98874d71c191f2e5efcb149c6a4914b8d85be71e79254f9fdf19f62de2b2f6cc0822e578a420f07fd874051cb395ca999e596047a25fc6bc12cba97dab578f9f903612c1c757f198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "102c9afaa6ac9d2553d0f47e2a945816f56b10014ddcc00ef63f5cda3d1431020db583622c614b32310911623e2f71f7871413d13dc372ace97f1813d2622d590a0e124cd6005b33c8a16492b1b451897b1679f44f3d288585ec8f82b49f6f501579cd1aa3fb1bf108c6b7b5d1f4ae1fae44099a8bf5fddc74d87665e29812ba0d5db514ca1c318cc409bcbf9a75055b1a8e7b783127734d902b6118b518ee962f24a2abda945e843c6952a5f0632365146cfd4e2034b70e41a78772fc404bea102c9afaa6ac9d2553d0f47e2a945816f56b10014ddcc00ef63f5cda3d14310222aecb10b4d054f7874734544351e666106d56c02aae57e052a17403061acfee0a0e124cd6005b33c8a16492b1b451897b1679f44f3d288585ec8f82b49f6f501579cd1aa3fb1bf108c6b7b5d1f4ae1fae44099a8bf5fddc74d87665e29812ba0d5db514ca1c318cc409bcbf9a75055b1a8e7b783127734d902b6118b518ee962f24a2abda945e843c6952a5f0632365146cfd4e2034b70e41a78772fc404bea",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "11c8f0ea735e099781f852fb93256540c7c7611ba324f67680f3dbfc00bbdda12d7fb8d83e13afa4ea8a9d8817cd5b7c5b1804aa1006af2a8ab7e9c7757b300c040000002db3759aaff5357156bc2e8d52eacd11efb7d108d3b4034162839a9300000000003000000000000000000000000000000000000000000031000000000649ebc27a3909e089c6023c7ed952098a3e5547ce56e79953929ba4d718f1311c2c7e752e7947b506c14a8300a0d15d9022bd6fba67461cc8a0783dfeba77fb11c8f0ea735e099781f852fb93256540c7c7611ba324f67680f3dbfc00bbdda102e4959aa31df084cdc5a82e69b3fce13c6965e7586b1b62b168a24f6301cd3b040000002db3759aaff5357156bc2e8d52eacd11efb7d108d3b4034162839a9300000000003000000000000000000000000000000000000000000031000000000649ebc27a3909e089c6023c7ed952098a3e5547ce56e79953929ba4d718f1311c2c7e752e7947b506c14a8300a0d15d9022bd6fba67461cc8a0783dfeba77fb",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "12ca97e893996e5bb392c57abba4578276654d2856b336b640eafd84de31140e055370544625ea3c3e85a42831dcaf47353695b158149bc2d5bf4061326f089e0e80426227ce5fd647afba497e7ea7a2687e956e978e3572c3df73e9278302b9000000000000000000000000000000000000000000000000000000c451f8749a05602fde384569be9950c3466d0fb40a66a63f202c3a685856cd21c76cea2be70ed4f367e657bc59c785bf6bf6ac33fb4b653e8bd68d1d838e0416e8c47b5f5312ca97e893996e5bb392c57abba4578276654d2856b336b640eafd84de31140e2b10de1e9b0bb5ed79caa18e4fa4a916624ad4e0105d2eca66614bb5a60df4a90e80426227ce5fd647afba497e7ea7a2687e956e978e3572c3df73e9278302b9000000000000000000000000000000000000000000000000000000c451f8749a05602fde384569be9950c3466d0fb40a66a63f202c3a685856cd21c76cea2be70ed4f367e657bc59c785bf6bf6ac33fb4b653e8bd68d1d838e0416e8c47b5f53",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "1425b11b4fe47a394dbfc0ad3e99dc93c3e1c0980b9bcb68529ba9de33dbf585168b8cdff7ae7d084fd111608fa03e018b415fd4f0755f7e8f039a2d852bda0e0000000000000000000000000000000000000000000000000000000000005b00149bb18d1ece5fd647afba497e7ea7a2687e956e978e3072c4fc9ec579b809462061ebaffaedc532d8bb542f9d93cae5dc6c4b431833ee0a7be4d053e2e0d60d03c12e282e4442c88f5235d004e8edba3080754ca41c976d03cd332a9b6fa42d1425b11b4fe47a394dbfc0ad3e99dc93c3e1c0980b9bcb68529ba9de33dbf58519d8c192e9832321687f3455f1e11a5c0c400abc77fc6b0ead1cf1e953512339149bb18d1ece5fd647afba497e7ea7a2687e956e978e3572c4fc9ec579b809460000000000000000000000000000000000000000000000000000000000005b0029e864b516b661105d0a2708f21beaae1bf1636608ac53864c4d8f0ea2e7dc3805c3b957caa8f4c5f248e3e6e754304e9ba7e5b6dd3a4ece125f47811a525e65",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "1565586940bbb0e082639a1e2c9ecfe96bff6cbda25a93c4d462b8360230067219767d96dd90432f459bf8f6181c9fea507bf7bcd4063fd070fe8e72093e8bf900000000000000000000000000000000000000000000000000000000000000e8000000000000000000000000000000000000000000000000000000000000000023812d70e97cfd777c5cf0b64b18400f3ea88afb56146bfc1f34071eebb0599827352c710f0e1711b5d18e672b5cab3c369cd8d84b70ed159bb712c7d929c8e51565586940bbb0e082639a1e2c9ecfe96bff6cbda25a93c4d462b8360230067216edd0dc03a15cfa72b44cc06964b873470572d4946b8abccb21fda4cf3e714e252b5ec0e7df7df26d0cc46dd811ace847a4174aa634c8d9269ccebb52845d7829a0fe67466554bc0a6c97089dec1ebac672344bc3a69b8fc6904f9b83438cbb24c159cda85a7f7e04f7e128101e8fbe502fee784946ffce0a9174424f0254b22b0c8ac28082e97eae5ee175ae2c1a6e466c7dd693238a386ec80f7743ffc517",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "17ac723d48c98fce706845b61c254630acb6da96a9620fc6cd07276a4ef8936d1a515b7e403d2a46bb5387138f17d33c2b12e3d5051f9d22042921f35031035e000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002d8ad25dc006eea79b9c052a6a367b209d5c9215c8a4c325555a7e1e608abed022dd54ed23382326a8df674c7be35d7ac181c9625a10f508dd7fbd109760d76217ac723d48c98fce706845b61c254630acb6da96a9620fc6cd07276a4ef8936d1612f2f4a0f475e2fcfcbea2f26985216c6e86bc63522d6b37f76a23884bf9e9062ca96b10a86be7bc151a74e01170193f2ad046c2f5eb3a25a95592cc3a17752043c18fe0a47868239575b1c3700be7308890370eb6982f4e3e36916ebc28f52b7d22180be2bdca69028c5bf32181d203b2350781d675098b320766f5dcd9b02a21aa3010f604fea531e9264671d546cc94d8a0ddab42b7146573f5c1ed26fb",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "1c4189bbfe590521da71e6834b73a622528fd923e9421f18df9a48e9123b16aa15c8e4948927f2e089accb33c8d51b4c83ca69505f4a7801399573273d7439910000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800023ad956e40f22f18bf59310f6d23055f2a3fdc2713f05cf1b099a18041cd498220b15bb64c3c6223098439e4fc7e9b2bd956ed94b2bf1f066c281d41c8560ee51c4189bbfe590521da71e6834b73a622528fd923e9421f18df9a48e9123b16aa1a9b69de5809ad492ea37a82b8ac3d1113b701410927528c028b18ef9b08c3b60000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800023ad956e40f22f18bf59310f6d23055f2a3fdc2713f05cf1b099a18041cd498220b15bb64c3c6223098439e4fc7e9b2bd956ed94b2bf1f066c281d41c8560ee5",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0a96696a78e6818da746c504a8b83f7a3faea0dfee0a2c52751f3cfae5fe979b017a319dce2d1976671eddd5b909781c102e5eed5c40db00bdbd19a14397b889198e9393920daef312c20b9f1099ecefa8b45575d349b0a6f04c16d0d58af9001800deef121f1e76426a00665e5c4479674322d4f75edaddde46bd5cd992f6ed05a7a5759338c23ca603c1c4adf979e004c2f3e3c5bad6f07693c59a85d600a922376289c558493c1d6cc413a5f07dcb54526a964e4e687b65a881aa9752faa2",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "1c934d642c245e76eb0c016b17e8eced3a1cf56ef6d787eace40bc0cb933dea902567d6e1141f67673e6f17a705f3d9764c6d5673f1f93e2ed5a21fd38e9a572000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007700000000000000000000001f3953d0d836a44e15aebef16dd187ccf9493693379fe7d1c5a2cf2deb87f89c0dd737c063475fc587c1574a8ff4e9e4f933118d67bb7ba4a70c79c1ccb0d3441c934d642c245e76eb0c016b17e8eced3a1cf56ef6d787eace40bc0cb933dea92e0dd104cfefa9b34469543c11221ac632ba952a295236aa4ec66a199f9357d5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007700000000000000000000001f3953d0d836a44e15aebef16dd187ccf9493693379fe7d1c5a2cf2deb87f89c0dd737c063475fc587c1574a8ff4e9e4f933118d67bb7ba4a70c79c1ccb0d344",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "1ced814234531c29aa14f95e3a3f59657aacea69fa4c35dfa5b8e03c87e8075725c3327a2c4f61437d53abbb2bb75dc1dc4f2427c3e9d7714d5d83dae80697690ec85b4f8a9224b27145b3757b7bf6e7397bc04c8634404d924689e27bb8a261000000000000000000000000000000000000000000000000000000000000bf890e717255b589c7286f7bde23fe6ac9d838262d9e7ba5bc603e410abf27aada5b1760bbdb5183ae4e28f049cfe75fb9600b8fd03e63d9aa1a9bd709d23afbc12f1ced814234531c29aa14f95e3a3f59657aacea69fa4c35dfa5b8e03c87e807570aa11bf8b4e23ee63afc99fb55c9fa9bbb324669a487f31beec3083bf07665de0ec85b4f8a9224b27145b3757b7bf6e7397bc04c8634404d924689e27bb8a261000000000000000000000000000000000000000000000000000000000000bf890e717255b589c7286f7bde23fe6ac9d838262d9e7ba5bc603e410abf27aada5b1760bbdb5183ae4e28f049cfe75fb9600b8fd03e63d9aa1a9bd709d23afbc12f",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "1f9d02fa71d0ae244edc79709af68216d99a978a5e8fd92ebe793fff8317aad42cd6a493d88a0a87a6f6818c23fa87ff12fd84e5641e1081e849f6e88a488a4304bb53b8977e5f92a0bc372742c48309445cd3cfa9a62aee49f8130962b4b3b9203e205db4f19b37b60121b83a7333706db86431c6d835849957edf0509de1521f544b5e4ab6d13dcb7e89582aaee12a8410a7c6b2d8a5de7bd83e8cdb1fb1a82baef43e095caaf7c2aca272aee277d1da98d74656f2ca01b833c67dcc08ca5d000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "225fdab8fe6cd876363d27075cdf0d01c209da61b1634b574a5d811cfae407001216b7c3e2adc07c3bef31771c7bb9e1d02f07ff3a5b74953c4fd5bf9a7a6dff25f63fcc543337b8f6275f97d6479633b921541a96e0f2acaf901bc25db7407c206776f9480168741eca625c06e5526b4664a02ce664bc656f39664d96278b6e1e40e8084fd648ba315f691e8367be1d4c13844421c87223d84829c31a0d7afe24b8042d4cb604ae66c0dc97ca8a9c2d22c743335d92bc401700f6b00d5cdc5b2a4f1dbc9fe6d2882462fb11afeae7b7f2a0cf213b1f19c45cb222336283f3801141763c897c9a90e387ea80f68eb88c2d79aab680196d9538cd2ca632a5e81b0e540f5b5be91f82ed05349750761224f543068ce30d2d5e838bf66866f345200fa5ac8c46f725e54505019bda3356ef6e35b0a89b9b4f79bb0c62211235c9312e6d97a1f7e0428fc0be6be02c811095f5166710dcbe869c36a8ef89cac63e012657bbaf3bcfd106dd677eef03172f693a6c919776f441dc0fd47a4bd91d0487",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "22847a3cd1cb28b60a51b54991d6dd86d206aa12b3873942c45a120b2e63a49226c3889c7b08d9288f13f64e6e3f166c59f57b5c014cbecf815a4aba4ebabbfb2e91f2b0f4f7a42c870fe8f6236ec1042bdeb2586a641808a5e09019514e83a02b078a1f12cb5426b6bcfeb9548566afb4bdf7454190eaf97f63e210f3a94ce1008a9ede8dde2c849793027433d90c626bc326bdc248dc223f537f7152955dac00b319b7060ad49091d9b52015b4ae8085bf6739b7f5a2c098c2f113ff33806a22847a3cd1cb28b60a51b54991d6dd86d206aa12b3873942c45a120b2e63a49226c3889c7b08d9288f13f64e6e3f166c59f57b5c014cbecf815a4aba4ebabbfb2e91f2b0f4f7a42c870fe8f6236ec1042bdeb2586a641808a5e09019514e83a02b078a1f12cb5426b6bcfeb9548566afb4bdf7454190eaf97f63e210f3a94ce1008a9ede8dde2c849793027433d90c626bc326bdc248dc223f537f7152955dac00b319b7060ad49091d9b52015b4ae8085bf6739b7f5a2c098c2f113ff33806a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "26581613e6c802822867d2b3a0867fd7fd8cea503764ae1a9d01ec0d5364d1be0530ae3d4fe87ac76da4382835135ac0aec9b1ecd0705cf84c21b48327eade5407a13e1be6f9072893c0e5bb528c5cc22dd6370308dda1613068e064c6e5d15a067239c795d2ea27b85d93e54fc221d81e9de3ebc8e43c20d63608e7078fab6822fa7ea234e21aec74f4db0b365ae1e7cc6e7f4aac89bc460d0308b83399be8627705b19388ebeddbd35a5ce72830ec07e3f1bca3f4e9fdc0aebaab5a1fe91b126581613e6c802822867d2b3a0867fd7fd8cea503764ae1a9d01ec0d5364d1be2b33a035914925624aac0d8e4c6dfd9ce8b7b8a498016d94effed793b0921ef307a13e1be6f9072893c0e5bb528c5cc22dd6370308dda1613068e064c6e5d15a067239c795d2ea27b85d93e54fc221d81e9de3ebc8e43c20d63608e7078fab6822fa7ea234e21aec74f4db0b365ae1e7cc6e7f4aac89bc460d0308b83399be8627705b19388ebeddbd35a5ce72830ec07e3f1bca3f4e9fdc0aebaab5a1fe91b1",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "28100e22df4dc1c6bf8801f63ffdef2af6bfb80147994395be6dc792479ca4f517414e05ac69d56dec03e0af314645b463414a7d831aff54459b6d409351a5a400002851fd14fbaa7fd586e3039a2d9fa136c42685cb2b5904bf0591b95b52fc000000000000000000000000000000000000000000000000000000000000000024d852a54e2d52ffc43b2e4f1993fd159ae7ec19af2f3ad548f6daa33bd0de310b0fabbc2f33ea444e5f3c92269f11fc30c048463973a914a6787dbd616e703e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "299a5917adb7b45c30cea045edaa623f5036280df176f4a2c751ca728c2c9e3a2bedf30ba7d8bd0814e9d091913ea5bc6a4b60ee993e949507832df60190651900000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000213d689af09b7f52ac4a04c34bcdb2f90521b1cd213edcfe48fa3063520b6be22ef0f3110ea3051248e907221493e6c2943ebe8d70794188a515ec23df5d9b2b299a5917adb7b45c30cea045edaa623f5036280df176f4a2c751ca728c2c9e3a04765b673958e321a3667524f042b2a12d3609a2cf3335f8349d5e20d6ec982e00000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000213d689af09b7f52ac4a04c34bcdb2f90521b1cd213edcfe48fa3063520b6be22ef0f3110ea3051248e907221493e6c2943ebe8d70794188a515ec23df5d9b2b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "2deb529e45720f20be41088dfd7489c315e9e18fe23dd1c8a8183295dc770dee1090b3fcd1898780c332b7d73a602cadd1b26029124db9da19941250eda890b500000000000000000000000000ff0a69a42c284614e3d7de26b3f9b2f3c71ff600000000000000000000000000000000000000000000000000000000000000001e2c7f9d6a525b6af5dad683c5e6408661da29780860c3209b2dddcad5a88795033123665850406fc2428227bbb3509fc71c911cf41623de1605cd3e0a281b902deb529e45720f20be41088dfd7489c315e9e18fe23dd1c8a8183295dc770dee1090b3fcd1898780c332b7d73a602cadd1b26029124db9da19941250eda890b5000000000000000000000000000000000000000000275680008ded35ba000000000000000000000000000000000000000000000000000000000000000000000019367fe97b92d85d7c29090c2313de1a85f030239cfa71f939a197249cb17b890465a8498153883aca20e4de66ac02b1b6957fab9b4bce71df334cd6bee5ff95",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005908648c919b2bd65122716e5e4aa74fb342e22eeb59635c84bb4e20e34da7230644e72e131a0296427b6542e3a6a00ccfa1d43577c305499096bbd8414f16c0df67cf39cb400a898e9aa727937ca9e07d92185f3fba6aa42be45ddad4fdadb145da376a6ec6d77185df39edde6e9037e58065a054cda2796f4e669bcdcbf1f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005908648c919b2bd65122716e5e4aa74fb342e22eeb59635c84bb4e20e34da7230644e72e131a0296427b6542e3a6a00ccfa1d43577c305499096bbd8414f16c0df67cf39cb400a898e9aa727937ca9e07d92185f3fba6aa42be45ddad4fdadb145da376a6ec6d77185df39edde6e9037e58065a054cda2796f4e669bcdcbf1f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005908648c919b2bd65122716e5e4aa74fb342e22eeb59635c84bb4e20e34da7230644e72e131a0296427b6542e3a6a00ccfa1d43577c305499096bbd8414f16c0df67cf39cb400a898e9aa727937ca9e07d92185f3fba6aa42be45ddad4fdadb145da376a6ec6d77185df39edde6e9037e58065a054cda2796f4e669bcdcbf1f",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "111f95e1632a3624dd29bbc012e6462b7836eb9c80e281b9381e103aebe632372b38b76d492b3af692eb99d03cd8dcfd8a8c3a6e4a161037c42f542af5564c41198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b924933879",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b92493387900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b92493387900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b924933879",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000005b004500000000000000000000000000000000000000000000000830644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d81702c919c023ce224a0c0b121dd4f578b39e0ddf00a55580b03265cb32fcb623bbf778240f6bf16b9a25500a02b09fbe8abfa933f9ee09effb104d712baf573463ef8c000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000830644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d81702c919c023ce224a0c0b121dd4f578b39e0ddf00a55580b03265cb32fcb623bbf778240f6bf16b9a25500a02b09fbe8abfa933f9ee09effb104d712baf573463ef8c000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a68917120ca8d3c8c16d87cfd4500000000005b004500000000000000000000000000000000000000004000000111ee2be185fb562c979eeb452df376f91c7852bfb8a6d5727024444a2fc58c152825d78e66be7952503e9e1bf2d8aad4c39f4ce4095349043106508bab20d6e5000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a68917120ca8d3c8c16d87cfd4500000000005b004500000000000000000000000000000000000000004000000111ee2be185fb562c979eeb452df376f91c7852bfb8a6d5727024444a2fc58c152825d78e66be7952503e9e1bf2d8aad4c39f4ce4095349043106508bab20d6e5000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a68917120ca8d3c8c16d87cfd4500000000005b004500000000000000000000000000000000000000004000000111ee2be185fb562c979eeb452df376f91c7852bfb8a6d5727024444a2fc58c152825d78e66be7952503e9e1bf2d8aad4c39f4ce4095349043106508bab20d6e5",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000004500000000000000000000000000000000000000000000000107b55de1642362d16b8fc4dccfec9e794d24968511cf8e252ed27afc4d72ca1e0301cb4d7e0b7b52a6a8f78613c403ead1543fedb0d3f28c77685fdb9eaa2742000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000004500000000000000000000000000000000000000000000000107b55de1642362d16b8fc4dccfec9e794d24968511cf8e252ed27afc4d72ca1e0301cb4d7e0b7b52a6a8f78613c403ead1543fedb0d3f28c77685fdb9eaa2742000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000004500000000000000000000000000000000000000000000000107b55de1642362d16b8fc4dccfec9e794d24968511cf8e252ed27afc4d72ca1e0301cb4d7e0b7b52a6a8f78613c403ead1543fedb0d3f28c77685fdb9eaa2742",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0272af94b7aeb772c1666db65ff3987fd8ec43b8454aad395232b5eef18ca2c51d5fc6b50ef577096ec2489356e8ecccd5ed5a144928c5338af5549701dbb40d255495ffba02a0ed6877a0a6ed658c93a1487a3319aaa05934e35bbb953673af00000000000000279573fbfe8e6c2300000000000030640472e131a029b85045090d17c2eaeda0d61dd0442997d161e176fb98a27091fe8b6b5746fe2f344a0f26f1f16556d24506af1fd1c8cb4b3b6dfa73e2ce958c50e3b937fd59a1df623f0272af94b7aeb772c1666db65ff3987fd8ec43b8454aad395232b5eef18ca2c5130487bdd23c2920498dfd232a986b90c194107d1f490559b12b377fd6a1493a255495ffba02a0ed6877a0a6ed658c93a1487a3319aaa05934e35bbb953673af00000000000000279573fbfe8e6c2300000000000030640472e131a029b85045090d17c2eaeda0d61dd0442997d161e176fb98a27091fe8b6b5746fe2f344a0f26f1f16556d24506af1fd1c8cb4b3b6dfa73e2ce958c50e3b937fd59a1df623f000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4700000000000000000000000000000000000000fcff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000212a3b4059e59d125dd17f662945170e1e13024fae97a401895690acac63cf681aecb67409d1d9c142ffd13375bd79fd0457deb278dfa91b5756378fb837fd60",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "17956b549321b92c524d191a62b90c81f08e694af4dceb00a80094e53120d39e2fd15d78815388959caa54affa2d7b2c8d52c528e6a1f6c0a50fcf0498fac7ee30644e72e131a0290000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000016b9e28a32ee61a7ad5bd4bad29d64fc35a8fb46b510be2067907069497ae1f0c3c07c40f41a731fe27d953f1154b4e9a8acf3ef44608817150de0df916503a17956b549321b92c524d191a62b90c81f08e694af4dceb00a80094e53120d39e2fd15d78815388959caa54affa2d7b2c8d52c528e6a1f6c0a50fcf0498fac7ee30644e72e131a0290000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000016b9e28a32ee61a7ad5bd4bad29d64fc35a8fb46b510be2067907069497ae1f0c3c07c40f41a731fe27d953f1154b4e9a8acf3ef44608817150de0df916503a17956b549321b92c524d191a62b90c81f08e694af4dceb00a80094e53120d39e2fd15d78815388959caa54affa2d7b2c8d52c528e6a1f6c0a50fcf0498fac7ee30644e72e131a0290000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000016b9e28a32ee61a7ad5bd4bad29d64fc35a8fb46b510be2067907069497ae1f0c3c07c40f41a731fe27d953f1154b4e9a8acf3ef44608817150de0df916503a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "1bbefdb0536c0996d663a908adc2cae17180c53d971e73fe234a6927cd10da332481152785517c274b2dc4ab7b6cacbbdc7d7b8e4dd396faa05a119761130e5c039a49879c785fd647afba497e7ea7a2687e956e978e3572c3df73e9278302b9194b9757129492217d64c4b267e5e935137ae3859ec8b99cf6e6dc61ca90bdfd1c67b6b637c528053a25079e25734a67ffc5388209d11839b3ff1f92591c81ee09750d9bc6fdb71f16e6a69eea50e7288aac1c25a5cd674ca9c57d8ac06fac691bbefdb0536c0996d663a908adc2cae17180c53d971e73fe234a6927cd10da330be3394b5be024026d22810b0614aba1bb03ef031a9e33929bc67a7f7769eeeb039a49879c785fd647afba497e7ea7a2687e956e978e3572c3df73e9278302b9194b9757129492217d64c4b267e5e935137ae3859ec8b99cf6e6dc61ca90bdfd1c67b6b637c528053a25079e25734a67ffc5388209d11839b3ff1f92591c81ee09750d9bc6fdb71f16e6a69eea50e7288aac1c25a5cd674ca9c57d8ac06fac6929a0d6d5e7d14a774c3abff1435361da2ee5d8b4f3ee62085ce779f248b41d4a2fd37ae5468f6a17b7f9a0bcca02ee128bdced61402a566e4eee2d0fa825f03d198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "299a5917adb7b45c30cea045edaa623f5036280df176f4a2c751ca728c2c9e3a2bedf30ba7d8bd0814e9d091913ea5bc6a4b60ee993e949507832df60190651900000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000213d689af09b7f52ac4a04c34bcdb2f90521b1cd213edcfe48fa3063520b6be22ef0f3110ea3051248e907221493e6c2943ebe8d70794188a515ec23df5d9b2b299a5917adb7b45c30cea045edaa623f5036280df176f4a2c751ca728c2c9e3a04765b673958e321a3667524f042b2a12d3609a2cf3335f8349d5e20d6ec982e00000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000213d689af09b7f52ac4a04c34bcdb2f90521b1cd213edcfe48fa3063520b6be22ef0f3110ea3051248e907221493e6c2943ebe8d70794188a515ec23df5d9b2b299a5917adb7b45c30cea045edaa623f5036280df176f4a2c751ca728c2c9e3a2bedf30ba7d8bd0814e9d091913ea5bc6a4b60ee993e949507832df60190651900000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000213d689af09b7f52ac4a04c34bcdb2f90521b1cd213edcfe48fa3063520b6be22ef0f3110ea3051248e907221493e6c2943ebe8d70794188a515ec23df5d9b2b",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080a77c09a07dfaf666ea36f7879462c0a78eb28f5c70b5ed35d438dc58f0d9d058bcabf53ccb1b6f2ad14e6bc531485dba856600b7941c8c5a4968940fba978210dc371bfd9736eb879d25be8a799eff45bea91130b9b2768689786235accd9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "17956b549321b92c524d191a62b90c81f08e694af4dceb00a80094e53120d39e2fd15d78815388959caa54affa2d7b2c8d52c528e6a1f6c0a50fcf0498fac7ee30644e72e131a0290000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000016b9e28a32ee61a7ad5bd4bad29d64fc35a8fb46b510be2067907069497ae1f0c3c07c40f41a731fe27d953f1154b4e9a8acf3ef44608817150de0df916503a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800104e7500000000000000000000000000000000000000000000000000000000000000000a535bc14c0f581a039d0bfb15e730b6bbb3d6e33ecda8c74ebd901deeb4ef8423e99eadcc72ced9221df2db154b36f6931270c3f21f4ec8c4206b9211924bb203a99966a8db46602ac05b8f0d7669c3bc066fb7b9a188cc79e5239e27e3580517e54f1fff192038a907711c8123997f785d2c2c9a214355466b60652ee53e4d00c662006274fb346e22eeb59635c82cb4e20e34da7230644e72e131c82cb4e2000000104e75a20b64000000000000000000150000000000000000006629c731270ef2ea6f8c3dad3832f95f309cb6a1591ad53af025c6e0809992f15234e5fe1b37771ce3bb5a62017c56c496e57673e2617634e900c587724d21f24e603a6303a99966a8db46602ac05b8f0d7669c3bc066fb7b9a188cc79e5239e27e35805187eff52e2187ff10f48d49a005dbede1f243e64ce508737f5b52bb1a997befa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bf0000000000000000001284bdd8e69832b232222d3493a6abb523575be2a5af6e88f5501cef408aa5bb0ca4d5b3c58e0bc7be2c8885e53c673b54f3057cff97cb1020cb2f5a9f61affb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005908648c919b2bd65122716e5e4aa74fb342e22eeb59635c84bb4e20e34da7230644e72e131a0296427b6542e3a6a00ccfa1d43577c305499096bbd8414f16c0df67cf39cb400a898e9aa727937ca9e07d92185f3fba6aa42be45ddad4fdadb145da376a6ec6d77185df39edde6e9037e58065a054cda2796f4e669bcdcbf1f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005908648c919b2bd65122716e5e4aa74fb342e22eeb59635c84bb4e20e34da7230644e72e131a0296427b6542e3a6a00ccfa1d43577c305499096bbd8414f16c0df67cf39cb400a898e9aa727937ca9e07d92185f3fba6aa42be45ddad4fdadb145da376a6ec6d77185df39edde6e9037e58065a054cda2796f4e669bcdcbf1f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005908648c919b2bd65122716e5e4aa74fb342e22eeb59635c84bb4e20e34da7230644e72e131a0296427b6542e3a6a00ccfa1d43577c305499096bbd8414f16c0df67cf39cb400a898e9aa727937ca9e07d92185f3fba6aa42be45ddad4fdadb145da376a6ec6d77185df39edde6e9037e58065a054cda2796f4e669bcdcbf1f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005908648c919b2bd65122716e5e4aa74fb342e22eeb59635c84bb4e20e34da7230644e72e131a0296427b6542e3a6a00ccfa1d43577c305499096bbd8414f16c0df67cf39cb400a898e9aa727937ca9e07d92185f3fba6aa42be45ddad4fdadb145da376a6ec6d77185df39edde6e9037e58065a054cda2796f4e669bcdcbf1f",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b92493387900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b92493387900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b92493387900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b924933879",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a0290000000000000000000000000000000040000000000000000001000000000000000000000000000000000000000017f66b9111253405000006f2a18a982e6e9436f171f8bcdb4f60b9ea1dafaf115f9228e11ddd98ca9680304502b9c299712d0cf851e73adc8ce68c549a5b2ae712a44811db357d3bdb9717956b549321b92c524d191a62b90c81f08e694af4dceb00a80094e53120d39e2fd15d78815388959caa54affa2d7b2c8d52c528e6a1f6c0a50fcf0498fac7ee30644e72e131a0290000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000016b9e28a32ee61a7ad5bd4bad29d64fc35a8fb46b510be2067907069497ae1f0c3c07c40f41a731fe27d953f1154b4e9a8acf3ef44608817150de0df916503a17956b549321b92c524d191a62b90c81f08e694af4dceb00a80094e53120d39e2fd15d78815388959caa54affa2d7b2c8d52c528e6a1f6c0a50fcf0498fac7ee30644e72e131a0290000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000016b9e28a32ee61a7ad5bd4bad29d64fc35a8fb46b510be2067907069497ae1f0c3c07c40f41a731fe27d953f1154b4e9a8acf3ef44608817150de0df916503a17956b549321b92c524d191a62b90c81f08e694af4dceb00a80094e53120d39e2fd15d78815388959caa54affa2d7b2c8d52c528e6a1f6c0a50fcf0498fac7ee30644e72e131a0290000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000016b9e28a32ee61a7ad5bd4bad29d64fc35a8fb46b510be2067907069497ae1f0c3c07c40f41a731fe27d953f1154b4e9a8acf3ef44608817150de0df916503a",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d977f9597358c206e72c88c16e622b8b2000000000000004500000000000000000000000107b55de1642362d16b8fc4dc2a314eca6adb97bf3a3872a406ecf97bf2bdd210b6cba667eba043f71c1ffc200ba9caa5888ae7c0e6d2b54181905e66769d9ed9badc43da3d9f3e56b46cb43b0acfd59a153bdc736907cc4a640a2fb675cdaa8066a58616537ce4cd7145aa061b1d6bf901bda3c5e3df60e3741d6f5d6660f4034e2f99545e0dc71e9b53af2c30644e72e131a029b85045b68181585d977f956e978c3572c8208c166622b8b2000000000000004500000000000000000000000107b55de1642362d16b8fc4dc2ad9bb009c15bdc11d5ed75a805d5f24ba0e10e5b7953e281e241f72d208ce880d6f072450fd6ef76dd73ff2924238cbee09ea4c6281b867a897d85d8d091b330acfd59a153bdc736907cc4a640a2fb675cdaa8066a58616537ce4cd7145aa061b1d6bf901bda3c5e3df60e3741d6f5d6660f4034e2f99545e0dc71e9b53af2c30644e72e131a029b85045b68181585d977f956e978c3572c8208c166622b8b2000000000000004500000000000000000000000107b55de1642362d16b8fc4dc2ad9bb009c15bdc11d5ed75a805d5f24ba0e10e5b7953e281e241f72d208ce880d6f072450fd6ef76dd73ff2924238cbee09ea4c6281b867a897d85d8d091b330acfd59a153bdc736907cc4a640a2fb675cdaa8066a58616537ce4cd7145aa061546e279df73fc63d470e4d30d63e9003120768e1a423138de12c4f83d294e1b30644e72e131a029b85045b68181585d977f956e978c3572c8208c166622b8b2000000000000004500000000000000000000000107b55de1642362d16b8fc4dc2ad9bb009c15bdc11d5ed75a805d5f24ba0e10e5b7953e281e241f72d208ce880d6f072450fd6ef76dd73ff2924238cbee09ea4c6281b867a897d85d8d091b33",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb431a5d389ca17607c4b12d7f1c8463b960754dbbb74ee00f645ca559f5ee759ad5231fdb414002b25ebeed48fd799214f4db09a7dae25ac92c15b7e429e1800a70297861ced3673fa135f178751f203f13d8a4c9f15ad9fdbb4bb7468154af97f71698710af2efbde1687bc1530e7da2ca42c8e85baf594682890d36c8fb8d08f9106f1d083223bd63d1630baf008588ac9c0392c289c68afee37b013030a9f7d10128036f1a405f40bce08bc346f0f83cb8ca2fe81d18fdfffa984c97cef373580000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb431c251d57a884434484d488b3fa5bb0b0d8566a251bfa57cdcfa452ee114a19601bcd6dec5e0b17fb9bb77b1145793cd6a99534de85911f41c37934fc6f1f508e203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c15393157ad3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21cc9a9eb823f8d97adee0206828c9f19eaf8f536c23207d68ae3d056a1480bb21990ddb90388b94f31089d3b4ff594d5449c04fcdf2a3681017b5d7749367ba1000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21cc9a9eb823f8d97adee0206828c9f19eaf8f536c23207d68ae3d056a1480bb21990ddb90388b94f31089d3b4ff594d5449c04fcdf2a3681017b5d7749367ba1000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21cc9a9eb823f8d97adee0206828c9f19eaf8f536c23207d68ae3d056a1480bb21990ddb90388b94f31089d3b4ff594d5449c04fcdf2a3681017b5d7749367ba1000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21cc9a9eb823f8d97adee0206828c9f19eaf8f536c23207d68ae3d056a1480bb21990ddb90388b94f31089d3b4ff594d5449c04fcdf2a3681017b5d7749367ba1",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb430000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb43000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb430000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb43",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800104e75a20b641566a0c71c9069a5256391aa31e22021d36c037c108dfb79c66200bf257ae3d66a589214f980a2ae34f9544be2fcbcc13b21f4c1642f31aa4d200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800104e75a20b641566a0c71c9069a5256391aa31e22021d36c037c108dfb79c66200bf257ae3d66a589214f980a2ae34f9544be2fcbcc13b21f4c1642f31aa4d20",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "01ea6e2eae2a2501d6830a3f5ea1353a5f920719aaeeea537dde0df31bec7a802b40433b22aaaec8f6d6d21dc04994ab99ba4a4b16545f63430a6ecf01881e090000000004000000000000000000000000000000000000000000000000000000196ec634c6397f591ebee925f9fa9e89a1fa55ba5e38d5cb0f7dcfa49e0c0ae4260377b5b8fed1c2f2a2f848038464ffc8c3bd1d71844fcc85f64b478248b21d0990a17d0f06d3bb026b17967cc55b2160d7570fde6a448502bd28e8192db67e01ea6e2eae2a2501d6830a3f5ea1353a5f920719aaeeea537dde0df31bec7a8005240b37be86f160c1797398c137c3b1fdc72046521d6b29f9161d47d6f4df3e0000000004000000000000000000000000000000000000000000000000000000196ec634c6397f591ebee925f9fa9e89a1fa55ba5e38d5cb0f7dcfa49e0c0ae4260377b5b8fed1c2f2a2f848038464ffc8c3bd1d71844fcc85f64b478248b21d0990a17d0f06d3bb026b17967cc55b2160d7570fde6a448502bd28e8192db67e000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "03a99966a8db46602ac05b8f0d7669c3bc066fb7b9a188cc79e5239e27e35805187eff52e2187ff10f48d49a005dbede1f243e64ce508737f5b52bb1a997befa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bf0000000000000000001284bdd8e69832b232222d3493a6abb523575be2a5af6e88f5501cef408aa5bb0ca4d5b3c58e0bc7be2c8885e53c673b54f3057cff97cb1020cb2f5a9f61affb03a99966a8db46602ac05b8f0d7669c3bc066fb7b9a188cc79e5239e27e3580517e54f1fff192038a907711c8123997f785d2c2c9a214355466b60652ee53e4d00c662006274fb346e22eeb59635c82cb4e20e34da7230644e72e131c82cb4e2000000104e75a20b64000000000000000000150000000000000000006629c731270ef2ea6f8c3dad3832f95f309cb6a1591ad53af025c6e0809992f15234e5fe1b37771ce3bb5a62017c56c496e57673e2617634e900c587724d21f24e603a630000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800104e75a20b641566a0c71c9069a5256391aa31e22021d36c037c108dfb79c66200bf257ae3d66a589214f980a2ae34f9544be2fcbcc13b21f4c1642f31aa4d20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0cdc335fa81dff303b71cffb0256d7097c2b4c6715ca7b1589ea9386a41c2f851e4077b7c1f3374bbd4750ed222848c47501b40fc4c11eadd3c39aeafa452459000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000001f1cd7f247f2ae1ba9a1aeb4b32ed4c8c13c70c8861b6ab5340e276c58e1046b13d7de2b557e0ae2b53380ad596ba79f07c037c9d9aa17cf407e9ed86201436e0cdc335fa81dff303b71cffb0256d7097c2b4c6715ca7b1589ea9386a41c2f851223d6bb1f3e68ddfb08f4c95f590f99227fb681a3b0abdf685cf12bde37d8ee000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000001f1cd7f247f2ae1ba9a1aeb4b32ed4c8c13c70c8861b6ab5340e276c58e1046b13d7de2b557e0ae2b53380ad596ba79f07c037c9d9aa17cf407e9ed86201436e000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000004500000000000000000000000000000000000000000000000107b55de1642362d16b8fc4dccfec9e794d24968511cf8e252ed27afc4d72ca1e0301cb4d7e0b7b52a6a8f78613c403ead1543fedb0d3f28c77685fdb9eaa274212ee4836f908e5e39090a4124b75f3ec5b665a729997f55cdea80f76ab940c5902a12ba6400116479dcf5179e4d06471a65e72229fb444b34d8f07458a4a81570000000000ffffffff00000000000000000000000000000000000000000000000000000000ffffffff000000000000000000000000000000000000000000000000fb55bf7df894a746fbe20b6f8c54d5dc0d9fd4eda4742fc35100c45e6e27f912a20d63d446eb175733853b88dd36708eb7a81f5c79e7659c3a6e2b2c470077",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "1838ccf8d820349a8c38a57dc0a5495577898e422509e4c9636e9737fe0dcd9116f566a30b7d2579fd6109eb09d66c005fdccdc0d91b28f43be34c5668f34f812a9a64f273fa329bc9c98ff2083c627609e2219177b9c5df7286af31a3b27e8120d85101e1e6af0126c00a95c645b192b3ea69ed72297deac1fbb0e6bd1440c600ec155ab3cd58005b488308578aaeeaeae9c65939f785bf693fa5763c174dd624d3b2adb35ad17933d0317a00436d10f2d6908faf109e7fe3db77a39d5c1711175bcec7c4c77c612df588174dd44362722f7b8e588a0ef599129cf123f63b8d2e1ff6c569e5cb0d20fb28504057d4f7ed248900ac99bd0f31a853af5c10a806198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21cc9a9eb823f8d97adee0206828c9f19eaf8f536c23207d68ae3d056a1480bb21990ddb90388b94f31089d3b4ff594d5449c04fcdf2a3681017b5d7749367ba1000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21cc9a9eb823f8d97adee0206828c9f19eaf8f536c23207d68ae3d056a1480bb21990ddb90388b94f31089d3b4ff594d5449c04fcdf2a3681017b5d7749367ba1",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "1bbf3321bfdf76e22ca0e95089338a772a4a2982dbede2571c14a258bd9874ff2b5aa74efa3429cd77acc68bd2e487960f34074d3a725444b06a552c1be0ca442471fa6c0785556dacbe4d9570fa9e89a2fa55ba5e38d5cb0f7dcfa49e0c0ae4181b42bbb36f2bb465708c62b0bd12ae5d6922cf5c4f928a7097f8db8f0dfae3103e85ddefbe5900ded1384badbc32c907c50baa4282172d02562116005aecdf2cce8d04251b64ced66cc7b66a1c54000e17872b10b4793f5bd81052e5ef3e5c1bbf3321bfdf76e22ca0e95089338a772a4a2982dbede2571c14a258bd9874ff0509a723e6fd765c40a37f2aae9cd0c7884d63442dff76488bb636eabc9c33032471fa6c0785556dacbe4d9570fa9e89a2fa55ba5e38d5cb0f7dcfa49e0c0ae4181b42bbb36f2bb465708c62b0bd12ae5d6922cf5c4f928a7097f8db8f0dfae3103e85ddefbe5900ded1384badbc32c907c50baa4282172d02562116005aecdf2cce8d04251b64ced66cc7b66a1c54000e17872b10b4793f5bd81052e5ef3e5c00710c68e1b8b73a72a289422d2b6f841cc56fe8c51105021c56ae30c3ae1aca0b2ff392a2fc535427ec9b7e1ae1c35a7961986788cf648349190dd92e182f05198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daabebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebefdbebebebeabc689bebebebe43be92be5fbebebebebebebebebebebebebebebebebebebebebebebe9ebebebe2abebebebebebebebebebebebebebebebebebe",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "29c19b11665cbeb0fd496542e6115ceef9b628ab4bc7419802e7016cf1b2c931057cdbec3f7c2ad0f4da33b3cfd3234ea29f71c6c46b8b90eb2d4a5851adf74b00bb00b95e1b59fca2159a5f33f27f36b15fe6bcda0b1ee0381b0ef7dd804bd625ed3c1a0120b6531e39cca6f67f35f9a849cfbfe958cc1840d1c20cc6b3e1ad08cbba5815581dcea62fa0426dbff39c8f0e9fdc451b1fb127a4e7a4c058799619068e06466a9dd7543ac89d53a17a8beb6c11c59c3af32ea0c1bbc55e0fae7b2c52ab9e7e9296183b9695387e3ae3d06c9d11a98676e4e046914b36b636ddc4050abc3606826f8aeaac5aa7be9f44d15a55805037eb2b260c32d43bd32adef10763b017bc2777ac81ff30fff09f65381c24912bfc9d1490a23765b4830f0aae2b71c998abc367ad761da7e9900eb7e579989f82eee3338c17b8dc17e53e052b21e242369877673070a6b8b0307da6e84e32bdfb3eb09d514b25e8704bd55d431782c07d2d471af10469a13476a49ec51d1bc538d49bbaf85a63fdb6b412fb4a1bc85b155eee2e33bf5322810c7c0150158f373e998316edf821ae9804a2ac191899a5e18c57f4e6b5f736c2f21e95f4147a4235ed2c1f6e6615eb0e00979f0920568d8f3b2f2d0a6a596ea20b3e62191baf420de10125557f9a665900a82a5925a43a697ceaa9deba01a97d8722815e8185973a402e11fdca62fa908da409c4054081d5b9d0e3aa18a31cc5f9d0fa925205fd50a71edf4ca157a607587e24571c9cacf3b3d821146083f9e5fe6be23546643e3ad4540a1f02c02728010a4b9f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c166622b860000000000000004500000000000000000000000107b55de1642362d16b8fc4dc2215436159d2bdb4e084a6c63bd04f6b84d69bfad793da72c21b421f3f89b22f22b811a1a4fa51df281657f0b0a1add382fab768ac1ed8886bf979e2bf11402d",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "2deb529e45720f20be41088dfd7489c315e9e18fe23dd1c8a8183295dc770dee1090b3fcd1898780c332b7d73a602cadd1b26029124db9da19941250eda890b500000000000000000000000000ff0a69a42c284614e3d7de26b3f9b2f3c71ff600000000000000000000000000000000000000000000000000000000000000001e2c7f9d6a525b6af5dad683c5e6408661da29780860c3209b2dddcad5a88795033123665850406fc2428227bbb3509fc71c911cf41623de1605cd3e0a281b902deb529e45720f20be41088dfd7489c315e9e18fe23dd1c8a8183295dc770dee1090b3fcd1898780c332b7d73a602cadd1b26029124db9da19941250eda890b5000000000000000000000000000000000000000000275680008ded35ba000000000000000000000000000000000000000000000000000000000000000000000019367fe97b92d85d7c29090c2313de1a85f030239cfa71f939a197249cb17b890465a8498153883aca20e4de66ac02b1b6957fab9b4bce71df334cd6bee5ff952deb529e45720f20be41088dfd7489c315e9e18fe23dd1c8a8183295dc770dee1090b3fcd1898780c332b7d73a602cadd1b26029124db9da19941250eda890b5000000000000000000000000000000000000000000275680008ded35ba000000000000000000000000000000000000000000000000000000000000000000000019367fe97b92d85d7c29090c2313de1a85f030239cfa71f939a197249cb17b890465a8498153883aca20e4de66ac02b1b6957fab9b4bce71df334cd6bee5ff952deb529e45720f20be41088dfd7489c315e9e18fe23dd1c8a8183295dc770dee1090b3fcd1898780c332b7d73a602cadd1b26029124db9da19941250eda890b5000000000000000000000000000000000000000000275680008ded35ba000000000000000000000000000000000000000000000000000000000000000000000019367fe97b92d85d7c29090c2313de1a85f030239cfa71f939a197249cb17b890465a8498153883aca20e4de66ac02b1b6957fab9b4bce71df334cd6bee5ff95",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001a36c98d1ece5fd647afba497e7ea7a2687e956e978e3572c3df75e9278302b9000000000000000000000000000000000000000000000000000000991b498795099a3faf27255b9542daf48d9588fc4d6927c7fcd88c5784a4245345474e1e4509a44ea53f191ddef8a32ec03a7e1a24e06588f8de364ba0024b3b8a062ca91a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001a36c98d1ece5fd647afba497e7ea7a2687e956e978e3572c3df75e9278302b9000000000000000000000000000000000000000000000000000000991b498795099a3faf27255b9542daf48d9588fc4d6927c7fcd88c5784a4245345474e1e4509a44ea53f191ddef8a32ec03a7e1a24e06588f8de364ba0024b3b8a062ca91a000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a68917120ca8d3c8c16d87cfd4500000000005b004500000000000000000000000000000000000000004000000111ee2be185fb562c979eeb452df376f91c7852bfb8a6d5727024444a2fc58c152825d78e66be7952503e9e1bf2d8aad4c39f4ce4095349043106508bab20d6e5000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a68917120ca8d3c8c16d87cfd4500000000005b004500000000000000000000000000000000000000004000000111ee2be185fb562c979eeb452df376f91c7852bfb8a6d5727024444a2fc58c152825d78e66be7952503e9e1bf2d8aad4c39f4ce4095349043106508bab20d6e5000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a68917120ca8d3c8c16d87cfd4500000000005b004500000000000000000000000000000000000000004000000111ee2be185fb562c979eeb452df376f91c7852bfb8a6d5727024444a2fc58c152825d78e66be7952503e9e1bf2d8aad4c39f4ce4095349043106508bab20d6e5",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000310000000000000000000000000ccc369050590000000000000000000000000000000000000000000000000000000000000000034e16015e4aeadb3c1c93fd54f496a6a75271f9e514b6c51782d145a1771a9827910e860d8264c87a784c364d78f117ca598153fc5947c915eb6e2e7e0ad6d5000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "06e42bc7eb32a979b39a77435202c2a062c8bef977f46500b040fa35b8a45b2315ca114b0522bdd5e928f9629ed2a283d36141f3307071cad74fb768721cbb0e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006e42bc7eb32a979b39a77435202c2a062c8bef977f46500b040fa35b8a45b231a9a3d27dc0ee253cf274c53e2aeb5d9c420289e380158c264d0d4ae6660423900000000000000000000000000000000000000000000010000000000000000001611179006befd3749602129813bd7247045ac58ea0000000100000000000000202a170a4a4385bdcefbe36ade6cc7c0e9834b78fc6ca233e8de345a2d5782dc1699f57deaacb74e8b98bd8532c3f152570db884fc1755fbc0c8cb3ef54a537f26c6e104e6c30ed077379b1762d05ac66a6d8e1bb0699ff4f8e3fa52568f0f7709179c965e45c4f28e2ee2affb9b86744b8f29df08357dc80776ecede39adc7f221276dfff5b3a2b6a46ec6c0e0891aefd121170d8361187b73b46e1c6b1218f29255d7955576bba25241ec1edfdfc08c9b8d29379d4213025fa95b0dbdd16460ff9fdfcccda82fb0dd8f17931e05823321073a1a4e484699acdc9d0f14ea6f60c25b531fed0c7e8899296888cc0b27fbb6dbfc2041d482e21d908e240772a2326c6e104e6c30ed077379b1762d05ac66a6d8e1bb0699ff4f8e3fa52568f0f7709179c965e45c4f28e2ee2affb9b86744b8f29df08357dc80776ecede39adc7f221276dfff5b3a2b6a46ec6c0e0891aefd121170d8361187b73b46e1c6b1218f29255d7955576bba25241ec1edfdfc08c9b8d29379d4213025fa95b0dbdd16460ff9fdfcccda82fb0dd8f17931e05823321073a1a4e484699acdc9d0f14ea6f60c25b531fed0c7e8899296888cc0b27fbb6dbfc2041d482e21d908e240772a2326c6e104e6c30ed077379b1762d05ac66a6d8e1bb0699ff4f8e3fa52568f0f7709179c965e45c4f28e2ee2affb9b86744b8f29df08357dc80776ecede39adc7f221276dfff5b3a2b6a46ec6c0e0891aefd121170d8361187b73b46e1c6b1218f29255d7955576bba25241ec1edfdfc08c9b8d29379d4213025fa95b0dbdd16460ff9fdfcccda82fb0dd8f17931e05823321073a1a4e484699acdc9d0f14ea6f60c25b531fed0c7e8899296888cc0b27fbb6dbfc2041d482e21d908e240772a2326c6e104e6c30ed077379b1762d05ac66a6d8e1bb0699ff4f8e3fa52568f0f7709179c965e45c4f28e2ee2affb9b86744b8f29df08357dc80776ecede39adc7f221276dfff5b3a2b6a46ec6c0e0891aefd121170d8361187b73b46e1c6b1218f29255d7955576bba25241ec1edfdfc08c9b8d29379d4213025fa95b0dbdd16460ff9fdfcccda82fb0dd8f17931e05823321073a1a4e484699acdc9d0f14ea6f60c25b531fed0c7e8899296888cc0b27fbb6dbfc2041d482e21d908e240772a23",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000012ab9bb0c853fb1d884197cdefdf654c01a289b677094fe609c835d2b249dcc51460243cc357281001b8b257c6396865c729761ac575a85b2f8f0e58af439c84000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000fb1b0e8c8b85ec99ebedae0880006b0809f5151890cca524eea2c0b3ad87f3229d3e6bc7f0886b75e186b10564dc990258855e0311e3e2e72f9d9c0dfab4f0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000fb1b0e8c8b85ec99ebedae0880006b0809f5151890cca524eea2c0b3ad87f3229d3e6bc7f0886b75e186b10564dc990258855e0311e3e2e72f9d9c0dfab4f0d",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000114cc34c5044c87540b942287d555ce935499ce155202081ca5ce495c356896009fd9490a6f214b7729f9574d53fce82a2d46b3ccf7499ab5616b2c4f36582d7000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000070a77c19a07df2e666ea36f7879462c0a78ebbdf5c70b3dd35d438dc58f0d9d0a2dd5b476a606a8243e7e879bddaa8086ba658087aacc4d986a10c74dd9e7742d46618f9d516e0f07a59d3c97f5e167a1b49ebe9fb30dd05bded8185a545420",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 254}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000092a62b029973fcd9ec18db33eb4c7b6b649a2e6196561761789e39bc84f11ac0a59f2672462be814a277f495d53244691c40da85d39b210ed3e099b397a4cf92ad603022931e8c20c927fa114866ca26b305156336511a9224d6bd88e5ba7fb2b44dd02df7f7a846f546c77f3330cc171abeea7747ec03607c4b754a07101421f4b96b82bd3631447045f1bb66198fa6a904e48092750762efd419fb5ff52b51fac61c1a7265d0e1a6433e9767cb51c71e9ac5a119be9894f509bf92b0fb1b4198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {},
-        ),
-        (
-            "104f6d8507d6a112e8fd516d70bfe3d2474539948276d36eee987be127a9e3ab199eef24146007e80386f391edc886f5ddba22b5cf131efa3b6ae71a673fc88e198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa2642f046ad222f094c9282816131317b8d52fc0fee64f26898232432d34fdae605a5f2a2e8f15ba27e90f54faff78391b307b402a0ae995d1c12f92c0b574593198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {},
-        ),
-        (
-            "1f0ab114f50077d71a195869dd8c07e2a031a55a8dac07c522ee7ac74136c50c229c9d498f5ca70a27612a244743773fe22668370a91410b645fe22f2e6eb78c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000284869d750e478e4b09637f7ae55bcce23bd622f04e986e1cba0f64b59b023200a88bc2898a2930aee2b92055ca2f97360a79c598f5e8998fed7add43a692d1021f4f3ddd5250962baaefc6ef587f464c8fdad1bb7812b292dce48d5462039df14044ca96015f3c6666f98d756fbf7bd0e12c3e884db4100391da8a47deff16e00b30c250f71db58eb20e14d67cd98ebb47790a7e7d45d30a90ce707175f295b1e45eca08667a7cfe06158fae4a38cac01a37853e730eaa28b2f7167fd74c22d",  # noqa: E501
-            {},
-        ),
-        (
-            "0624d2c76767981fadc8f74f29c034f7ae0522585e1e0201308109c40d1d5420251ba3c545339bbe22da0fe90692a099384c435ec0902c99be7e7a84d62bb49c0c0b524584214b17414a25236e4e2b6f4bf398ec62e9abeb7ea1f158d89df05b0e05f600bf1408ab25c0f3dbb98ff26c4d85a6ce6a63bebc3b2e360de77cf6062488eb90497d64621124420825abd353268fe00bd90726991d0ce623e59da9c62340b1fb006017382cb76606a873f48de8f31434cc243c8f465cb908d8cc734618cde0d7bde7e1da88fb8192ce94bea754f24a53f1f000f15b4c5c151c12df4f0066b16bf4229edf5375b78a5c7469ddf68f7d5c7577642ed2c90d5d42c231ed198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa2948734db775bb41a29257214b19a6356e6640894c2a48f201addce62de7b41e1bb87bddbe46d75809751232405928c3314934082052131a64574ff5a59c7db7198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa09c91a687e6c44f2917682dc5d0a34be7c77fff361aa36610effab6f6d2d87ac13849277ed76b58020ab993f1847ebcc0f1bcf711fba15f4a7a80ab72b4fe9642f0c63d0c53b3dfbca27b6b43ae7fbf55a38d78a21470996485b03128accc20800556502356e37ed150db2e36531b0f275fd6835c0fc1945922e270b48c48a8602644c27b5dbd793592a70b735e22c798a5e309fa17a992a7dc2a050e01b298f194776b6a53439d7336f389d2a8f6651e40885f5ca2538b0dc9cb534fb23f7fa1e379e19dbffba1edf0a04505f67229e707a4b82f19285d3c186964e83e1553608ee58baa16641b1513f007da7d3cf58b503b80f73c7d8e792db63def167e0d82b1f95d6aa6fd6f5e6978d0135c206079770d5c3ba001967c5d94c5902f95fe9264ad64952cb1d30a7230bca35b3907b2457abdcd6052e14e2a132d76822222514f79ce35164acfdb802551e02a9aebdb20bf4248c0ccf5c6cf5e576908778410f8dfb99aaa272bbaa49012da81dfafa1a3c07eba89355602143c58f63df2939117a8203a67ab052af18032434b61fe6b33e0a6ad5ab70d57aef4444478b42ba123a80e91f77c135f657e2dbf5af0d07e9a4fb63585b88e5439ddab7741c0961198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {},
-        ),
-        (
-            "142c9123c08a0d7f66d95f3ad637a06b95700bc525073b75610884ef45416e1610104c796f40bfeef3588e996c040d2a88c0b4b85afd2578327b99413c6fe820198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d",  # noqa: E501
-            {},
-        ),
-        (
-            "13b076f9e2ddf66bd1e9ec7509945ec37289d9ad65f210ed35e78ba2b02e7e3d2c6d9689097e79c4227b7b8519e4850be2d795f9496a70ae8607a3172208371a0774089b1be2375b269ac0cd913803af1e8e967c7a12ded9e38bbfe816cb6b2b25e481bf589a76e531e3cbaee9b47a07fb832b052a71029665a5ca89f1eb6d6b0f10223646f0d0f8f79189c456f40295fa02708a2629b8a88d7ae36caab470552b4bf562f83ed28edf524edc1646b4c4cd538bec5d544d8071f0c73406339b2e2043a8194e50b9ff3b93d13873035fee0ccc3b4a0fda33d34ac7a4771c9b884d291b24054553ecab7eb9a6807281a895bdcf29e95d8d3a2552749b7fc0932637198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "15d6eaaa18c5737e7bd229c2900f8deddf6da9c0e20e7e905e7b7491d041eaba2ab7d1b2a259b85054253da8947c2fd38b04a4ede3bfa6e258e22f668dcb5a63092a62b029973fcd9ec18db33eb4c7b6b649a2e6196561761789e39bc84f11ac0a59f2672462be814a277f495d53244691c40da85d39b210ed3e099b397a4cf92ad603022931e8c20c927fa114866ca26b305156336511a9224d6bd88e5ba7fb2b44dd02df7f7a846f546c77f3330cc171abeea7747ec03607c4b754a07101421f4b96b82bd3631447045f1bb66198fa6a904e48092750762efd419fb5ff52b51fac61c1a7265d0e1a6433e9767cb51c71e9ac5a119be9894f509bf92b0fb1b4198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "16f5d1473d8a9012df4efc624ae3b5fc3b1c1742bb73b9b62aa50c0dec9848ad1b2381a593f0a661db10b659329907fb62b4f5fd196092ef235f0775463b11f3054f9c54b1560a307e173c70fce534a2e4c7b248ec342f968a9db905fb31ba362513859b9c3a196e357d5d4f34e17f5cb2d78f4160103ecae86cb57a3e48ef7715e96b3ad7bfbccc491029f30be0ced0654c6c2600b49bfafc70af802b305a09154bb828c71576e1809723e3bbb5d459ece5bdccb9bcdff733761fe908e1e1d52f91cec7b5d03d4c5930875239f825c55849b352fa27b4e20581fc4a68950c752ee478820a0dc3f22866e7c5111d6fd1f057c18b7c9c1568173916ce67555c47198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "18dd52daaa11ff5dbb97c8776924d95b1bb86bf16481ba52519674873e0279ea0b32f4758cc18142794358e62b9c29951d3cb7e705d97e4cefd8422fa340ed5804cbac0707b92f59b87024017aae6941a3d8f42c6b93c619fa85cd54a3f0596325ef128bd051c44f95f7aa6122a390666691c2ec8a328f5302605f0aaae670db14a3194db0c978125b0212d2dbcf3639650e40f8acaeff5a5c20ba700de3966f004d3f0a629eb1456685db5a1b94d4b2f8dc0a9cdc5d29cccc5b596d88ba29fe0bcf53d38a1b0732fd90b73149559e0ee767f525875ebdb26f7f123136282afa28e440620ea4064d1f0190c75e2a36003f18643507a927926130eb54ecc1004d198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "1b6e4577cc71df5e856ed88d2d14a464343f140b07693e3b08308570b28fd55b24198aa6ee0f5bfec020ad2ff15729434439e4af7554fa0f7395ee20cb926346246b8e8c771c3db7226a8066537632923d7d5a542f8e0d600e7f0195240f1ec513cbe706f9ba436dd4a781fab85fa2e9d82854446cf91182dcfa66eb68c4b7e72533a60b837f9cf4838c4c38f4f9c8988fee10c9895753e7925a86330e925db702f47f10f7da957cfcc613361ab6aaeb67f14d22c06eec14e47e36988c4ee06705a596bd22bbb13dc898acfdd420c88893dd09f7fd4875e8b3fb65b54ad9643f2847ab3c7d853e89cfdf520de28e1092c1955b7e17d9cba5808f047a3d6898fd2f64f057deda8bbb646d5b9864d9789a696abf2a42218f7af28baae517f5e45723bd3952d332068086b2079260b285896cb84c73ece3647094fac90d8b1374c21eebb3f8ea3c3d9147fa09e4506bcff1c222a02ea8b4904fc6df3bca1cc0505e133d9a4794eb099e9bdf82a6fecdb2e2e29b0867bf0fe557475dc758d796714e",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "1ee2af29808bc7baad8eb3e87bf55588ef59763ae59585453aa57222a60409141756d11b0679f2e3c44a95592d270f55f76670c2d248fe2c0b391a11aa90d0ec0ea16e33157b6d0f197ed197ce3ad5b93ac91458632464dd5e4aa23ec628e6cb03c160eb0d2ab47566d495f1a53b7b1cdb659cb64e26c848c74267bc74ffeec81d5ee181514337f685e60ba02daccded24ea3122fb04d9da37790f3dce54587803087c55d223005ff8ad78f6f417b19caff564e8b8cb820d0eadb6bec43f0cf902b88f6e24920bd60dbbf082df1cd200abf141b6c01e7fcb262525364c14c20502958d26f4e6ad2d9b1db8a6b23e7fa5dc4d0e4c6673b0f840c000eeac001988198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "1f357db2cd961c374f81a4ae374f5306787361c3aea270815962003c0915b5d2044c12e4c6321f0a73b09480c1d7a84ce30ee9219b3b649ff36ec7553150428f1b789c458e1e033db933f65230c01f173dc581494d23407494818cbc70c5e4eb05685001b0f48e5191bc50797f1330beb69d7dabe58b9b7d0c9c86c61c8d2a3301c8dc500074bc4207038e94f028d954405d8b6ff8b3f1b52a7ce67c97382c0b0a9c7d7844ca3f0a571b04211c021dc96a29628119b067364a06fea760698a060452283eefd9b336e591f37119aa473f03932c9c6d7cb0256c93e2bb7ebc214024a87b7afbb4143434a5aecbec2c38e02c7e01e8b056b812c80deab761bd942906b4a2cadf0c0d14e9015f1dd1833e1a71bdecfcc8d400f0c96c309dd8f3f30e243fddb630078af3593c50273c6fbc2c33f2fc6e208ad1e6dd537079f569cd5f25e6c61eb8d52bfe15205fb66a6e90da703a7cb8b441023f90ae987e35c72f800e8e708e896b7ba90163f4dd87bb6660359ca5558473831dea4aac4d222fe443",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "21b1479be2a88d421d6aa893a59fe4966322436bcd047e610f90929a5823188a2feb0baed066808be65012e37e364243877a4d47b75cd9ffe4a5df3011a68f90198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa1aa2ba0e64e80047d931df5931420de2d4dc0b7b6fc83121a9f155ddf9d6577520108e265338e3f2bdcc276bf69d955d60c73419d7ba24c25a40e9efd4cb24b80dbbd035ab913dc40917c815e66941eef6529d94ecbaaee8f77efe9aac45aab22ff4691bd3aa5f5bbb6067c1a4392dc87bb7a9997f7a660dd960df462203c18f2d4e9ee9f56967d24826884a2473b374d24b5afef1cb8d11555a2a62249b44a907a93f02c17da88bbef2e8b41a34ee1137aa7edb0459e06be0bd88ef68a876b0",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "2371e7d92e9fc444d0e11526f0752b520318c80be68bf0131704b36b7976572e2dca8f05ed5d58e0f2e13c49ae40480c0f99dfcd9268521eea6c81c6387b66c4051a93d697db02afd3dcf8414ecb906a114a2bfdb6b06c95d41798d1801b3cbd2e275fef7a0bdb0a2aea77d8ec5817e66e199b3d55bc0fa308dcdda74e85060b1c7e33c2a72d6e12a31eababad3dbc388525135628102bb64742d9e325f43410115dc41fa10b2dbf99036f252ad6f00e8876b22f02cb4738dc4413b22ea9b2df09a760ea8f9bd87dc258a949395a03f7d2500c6e72c61f570986328a096b610a148027063c072345298117eb2cb980ad79601db31cc69bba6bcbe4937ada6720198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "23e6648726d779a5e9943a9cb2c3d89cc966f0ca965bbe7bbdc1bd93df6429302a1e299a0d2c7fb74af9e086c19b07b357c55e76d2c65fba3b122c8158ee2b76071a0694c6a785ae2ff2553f4c06e2d24d031b86a4023a0d41a095b9d35ec8d30c1ab42b9a9d852e0901c708a5a0dfa9920e0ba08828620a5ebbdf1ffb8f9d851741332dcd8798b695edf6be41e0e58803ab926516d0d600514c4572575b29241a64993ddd9be2bab46a7190024de9e051862f46ac3130db54ede8c322e604a22e198a9651f4d48dc87f0ebc9fba1061d49962668790edc37948681da728a79f1649dc12a9101ad7e6c1631c1290bec29720bf5617ee6b5afa720733748bc3fe2ae647da926e44cc8e5476a15ffc62f11eafc89cb7d1d9ea1107403e1773c49a2408eaaabd36aa0a8dc6db3fb091f3c8b4df202714f74ae8d8cca11a216a301725ef6bf83c607781e9c1696e31cb5baa60b9e2deb0856479b342737592c0961211d363f2f2fc286d903a1e94c6673714464530bdb734ded5608b4654466d3f35",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "24ab69f46f3e3333027d67d51af71571141bd5652b9829157a3c5d12684619840f0e1495665bccf97d627b714e8a49e9c77c21e8d5b383ad7dde7e50040d0f622cab595b9d579f8b82e433249b83ae1d7b62d7073a4f67cb3aeb9b316988907f1326d1905ffde0c77e8ebd98257aa239b05ae76c8ec7723ec19bbc8282b0debe130502106676b537e01cc356765e91c005d6c4bd1a75f5f6d41d2556c73e56ac2dc4cb08068b4aa5f14b7f1096ab35d5c13d78319ec7e66e9f67a1ff20cbbf031459f4140b271cbc8746de9dfcb477d5b72d50ef95bec5fef4a68dd69ddfdb2e2c589584551d16a9723b5d356d1ee2066d10381555cdc739e39efca2612fc544229ab0abdb0a7d1a5f0d93fb36ce41e12a31ba52fd9e3c27bebce524ab6c4e9b00f8756832b244377d06e2d00eeb95ec8096dcfd81f4e4931b50fea23c04a2fe29605352ce973ec48d1ab2c8355643c999b70ff771946078b519c556058c3d56059a65ae6e0189d4e04a966140aa40f781a1345824a90a91bb035e12ad29af1d",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "2b5154892605b4b57c6f309a1f39d91a89d985264f9dc47342470b5605532939153954f4ac012e3d5860731081c59b0b5d9df76eeeca47c1ede99d0a73a8d1351b7962c4f91943b75bfa71d26698f33807c0a82c4aff43116e6b0e97e087d64e0337b7f3f182a6241093041180e874062c10467e0147e1abd93857dda7e6aa34153cac48663d8de0c9f23d1a2cecf0bd14f6d7cf877ef833751f8a524d0f4c1c1ff902721cd414e4c564c569143a0356d3b6cb7b1970067365c0a0f8ecb4976b0da26ca39baccc3b276b50cbd06db50b1c544055c0c636256fa35afdafee49bf2238e1b69bc5e674c9351b702c26021f8eb254e0f890595f5f22ca04b205748003d0a15ac5814b86f5463c48d5f7d398da010569d67f979b2af9381802b485fd2d3de1b5338ac2222d3d1bfca2e20f7c1a280780ba9abd54b46d42380fda599c243c33dbb5c54e9566fdda8567e059b596fba1e9afef57deb1703f27cd93ce7419779141bb51eaa0ea4f1fd39efc61aee4e6b40316248277599c599ec30c8dd4",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "2cc6c9acabc199e21be075d6d7885acfa1f38fec18999d78105c87e55a5d8eb7238e3f5edea71116b4905645df360589eed6e69ff4145a28c6ae29599ccb590e0e8248a6ccd8770c3cdbbd6d7f247c76f189978508b6f3514877833b00a7c593261d44028c3119ad2707a456739918ad10b51e7257b539a34e7f479f2e76707a2b359c070959c19eb7bb2bf1dbbb2cc060558f6dd682965535cba0f2392d13b818a023e2b4d60c38c7c0ab6af9ff0887dd192ac88b5070851f4d0e7495a1144d0ed1531303f89b56ebe6e9a39e7b7c4b5f2385d774ab00ab0b3c32c9b110552a0794c8d242f2aa6f638a597e53d8f236c780fcac4a7e2cabcb688896a84046c713532c71aeac024eea1bbccb01b45ceb4ad91e106200b7e25b0e30bc588d783520692d41373a18914e163949fa765d49dbaa5999b1d606300a469555da182b591fe664fc1dc73f67d3261d81477fd5b43e9b7d9a376a09e4a2b82f935ce0ef730abd60b3b4ca1e15eae3dd484e5e22f0f8f50dfbc756b40cb2406e6a1d86c07c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "2e565cd418929c3795adf3ea378f2616af24a1d7a93962c5be375e7fbdfe3d731197465669e70fd0793c00fb922d25dd53c8c35d4d686985e4e04741569497d1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003a781e0964591a816d07c8d6aa23d23b2ad50ae3acc529f877abf4d13e3f35e0fc25d443ba88ff661c914498d09f6c47bd3db7f8768c13ac2602e02250c34d10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "2e5e8d67b60e1d06acd7a490f8394be4aab0eca89eac6738fff6664263500f2b23a1b85312f58351b078bfabd3ab8517e383900cc23a4d9a8fdb0a5ae691bd0023751d707cd5ababe78100ade4bcc1691182ef8a6086be7af4a0a62b52d7a5940dea3332f3c63c37814cba5afb4380c5c3ee3920ef5de5484c1961a98430c2820c10e66f5bd143c35562d6b5f1bd6d0a256f4afb69641a3d8c871f5caa98fa6a1c8f31e252726f5fb9f5f444f60b32fcf94ba5e077c9724d36246ec666d767cc1f0befe534aa028faf6181644d6774e4e14f600a5657b3e2f6287115317f678c13357844009932b0b873101c362a9ee9fea643412da278256377c345e3f409dc1db60e215fc52c5af9d1b5045473f2f06bb20399de3cde3ce877ba545b994f3327c359cd987e9f2d05f015974e1b18b98b8f9684a24b0a50441244333bf5a35a023036aeb27f556ca1e93dd351651594c723239a7c0cb15b8ab7a0446ba789ff17e4fcbe1d017009100203f39e446d7b686e30fce3323ef61d46bc956143947c",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "30618669fa4f387a7e9fcbf763bc0dc9908cf927d1f92b585ca17d46b7e97fd902acc05526844e174394b69b1e0b78d24f7b5bd0cfadcb6a33aa6dc090d9028f160c5af4494850ee7590972d0efda781e2879e76c807a16dd60ede657e0be6a8230f495774d31e8b73bf7ce73e6f87826d7a59e1c47b508d5f953a61c2b4939f0492560c98f9feab356c744c09f1ec80f5fc9cc579f9929a3c7d9046585431b7273a1175635e2ab1f1b63838c13bd9d1daf4dad2620a0e72beae5f66ab88acab0f0887388fbcfeed9d128b7324b47676549d378c55d6d28b80cc179258a2801711423de6d1555acffe946eebaee182f8d007d5bafea10c7e00236552de1c68b32b74c50fe814021736df034cfe502673b483baa8f12825b9c7f74c59943ca53516196e1e69cee3dc1a0ceebcd6163c57f0155afb41d78aac57966a2681fccd0229b85e084727db2843d66cc73e163875ae0cdf5ce9386bd6b2be7018476d460625bb91869e1c2453109ba45cda0fa3f4ba9b8186df72098e81ca6f131140d8b0",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000103aa4b2aeff1bc7afc5cd39952c872c8f29d64188e8d18c1b65e526d6277a33209854e0ac153a98eff0fd08a0c73d46dbbe4209f8a6a4f2aad914e40686f4720000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ef4aac9b7954d5fc6eafae7f4f4c2a732ab05b45f8d50d102cee4973f36eb2c23db7d30c99e0a2a7f3bb5cd1f04635aaea58732b58887df93d9239c28230d282bd99d31a5054f2556d226f2e5ef0e075423d8604178b2e2c08006311caee54f0f11afb0c6073d12d21b13f4f78210e8ca9a66729206d3fcc2c1b04824c425f200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "06236320cf783a01e2b8be7816a84671de9e8bebda0e8f957809ee1253565bae0a4ce1ac405b9974e4eaf9342c2a43bd1fdc4edc2bd18235249bf51ec43287440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0084c3136563609ce6d7218719af3024e2163ea8124130cfb61c2521379b00672e775227ccd46bb5bd8b9f9714ecae9e037f8e91246b2a7e171337cf1332e3411fee9eea81af0f92485cb60cec6fdd90385b3f390c67d0885520bea38a07bb081242a8a318ba046cd7f4b87b4ede31c0c19f823ce0ab3192f36acc7683a9170411d50fa9a8a15815baf103030117065601aff6b54f4242d2a5a14e3147e89e25133ca084be363f41cb3886eed01fa8d896a609c22e099c4c9f5bb5a4363a57ad2f9b2caf0345e3ec3eccbc16af5713bbf15eaf2a17cd9f7a02966bd5e7ccd6fe185a77dfe45c4c1c9042c67fdb65d25bbd8b6f79dfdde27458a35792653443f3198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "24ab69f46f3e3333027d67d51af71571141bd5652b9829157a3c5d12684619840f0e1495665bccf97d627b714e8a49e9c77c21e8d5b383ad7dde7e50040d0f622cab595b9d579f8b82e433249b83ae1d7b62d7073a4f67cb3aeb9b316988907f1326d1905ffde0c77e8ebd98257aa239b05ae76c8ec7723ec19bbc8282b0debe130502106676b537e01cc356765e91c005d6c4bd1a75f5f6d41d2556c73e56ac2dc4cb08068b4aa5f14b7f1096ab35d5c13d78319ec7e66e9f67a1ff20cbbf031459f4140b271cbc8746de9dfcb477d5b72d50ef95bec5fef4a68dd69ddfdb2e2c589584551d16a9723b5d356d1ee2066d10381555cdc739e39efca2612fc544229ab0abdb0a7d1a5f0d93fb36ce41e12a31ba52fd9e3c27bebce524ab6c4e9b00f8756832b244377d06e2d00eeb95ec8096dcfd81f4e4931b50fea23c04a2fe29605352ce973ec48d1ab2c8355643c999b70ff771946078b519c556058c3d56059a65ae6e0189d4e04a966140aa40f781a1345824a90a91bb035e12ad29af1d1459f4140b271cbc8746de9dfcb477d5b72d50ef95bec5fef4a68dd69ddfdb2e2c589584551d16a9723b5d356d1ee2066d10381555cdc739e39efca2612fc544229ab0abdb0a7d1a5f0d93fb36ce41e12a31ba52fd9e3c27bebce524ab6c4e9b00f8756832b244377d06e2d00eeb95ec8096dcfd81f4e4931b50fea23c04a2fe29605352ce973ec48d1ab2c8355643c999b70ff771946078b519c556058c3d56059a65ae6e0189d4e04a966140aa40f781a1345824a90a91bb035e12ad29af1d24ab69f46f3e3333027d67d51af71571141bd5652b9829157a3c5d12684619840f0e1495665bccf97d627b714e8a49e9c77c21e8d5b383ad7dde7e50040d0f622cab595b9d579f8b82e433249b83ae1d7b62d7073a4f67cb3aeb9b316988907f1326d1905ffde0c77e8ebd98257aa239b05ae76c8ec7723ec19bbc8282b0debe130502106676b537e01cc356765e91c005d6c4bd1a75f5f6d41d2556c73e56ac2dc4cb08068b4aa5f14b7f1096ab35d5c13d78319ec7e66e9f67a1ff20cbbf03",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "1147057b17237df94a3186435acf66924e1d382b8c935fdd493ceb38c38def7303cd046286139915160357ce5b29b9ea28bfb781b71734455d20ef1a64be76ca0daa7cc4983cf74c94607519df747f61e317307c449bafb6923f6d6a65299a7e1d48db8f275830859fd61370addbc5d5ef3f0ce7491d16918e065f7e3727439d1ca8ac2f4a0f540e5505edbe1d15d13899a2a0dfccb012d068134ac66edec6252162c315417d1d12c9d7028c5619015391003a9006d4d8979784c7af2c4537a30d221a19ca86dafa8cb804daff78fd3d1bed30aa32e7d4029b1aa69afda2d750018628c766a98de1d0cca887a6d90303e68a7729490f25f937b76b57624ba0be14550ccf7139312da6fa9eb1259c6365b0bd688a27473ccb42bc5cd6f14c8abd165f8721ee9f614382c8c7edb103c941d3a55c1849c9787f34317777d5d9365b0d19da7439edb573a1b3e357faade63d5d68b6031771fd911459b7ab0bda9d3f25a50a44d10c99c5f107e3b3874f717873cb2d4674699a468204df27c0c50a9a0d7136c59b907615e1b45cf730fbfd6cf38b7e126e85e52be804620a23ace4fb03e80c29d24ed5cc407329ae093bb1be00f9e3c9332f532bc3658937110d76072129813bd7247065ac58eac42c81e874044e199f48c12aa749a9fe6bb6e4bddc1b72b9ab4579283e62445555d5b2921424213d09a776152361c46988b82be8a7111bc8198f932e379b8f9825f01af0f5e5cacbf8bfe274bf674f6eaa6e338e04259f58d438fd6391e158c991e155966218e6a432703a84068a325439657498571ba47a91d487cce77aa78390a295df54d9351637d67810c400415fb374278e3f24318bbc05a4e4d779b9498075841c360c6973c1c51dea254281829bbc9aef33198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa1e219772c16eee72450bbf43e9cadae7bf6b2e6ae6637cfeb1d1e8965287acfb0347e7bf4245debd3d00b6f51d2d50fd718e6769352f4fe1db0efe492fed2fc324fdcc7d4ed0953e3dad500c7ef9836fc61ded44ba454ec76f0a6d0687f4c1b4282b18f7e59c1db4852e622919b2ce9aa5980ca883eac312049c19a3deb79f6d0c9d6ce303b7811dd7ea506c8fa124837405bd209b8731bda79a66eb7206277b1ac5dac62d2332faa8069faca3b0d27fcdf95d8c8bafc9074ee72b5c1f33aa70",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00898cc97b5a1f95221e7272c6ea8ceb56e702d678ac6c24275a4f6147d2b27916f336255e3f8970fd79a12281e6a6bee510e7d2ce5117214f4dd8c764e00ef312580b380ddf94a3370e6842e68b260a12012ab02c883678abf3f0f37606f55c268f02e60dfc36a40bb1fa3dba22bba44953358031876c21748d5d57dfb39ef407c890d2b747cb1e0456c9c1b30c03badffb8cde540704104b016976d0a374472a3e2918076d66622d7d6014299b77850a74b2691dda1dadcd0232fbbfe2a9e02781b3ace921b11d98193720d1493609c4d47f607a2266d608185c6382b5d23519797c215563c8b73cc7f0041d1f5fe1ce017b36afbeffe56683e3ffccb9380b198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "082a5b0eb620c491dc7cfbf269ea3e9db35fdaf6c7c4baa25a829127a56f63c41c49e6c57c3c0ddca035138e5aadb79ac638f67a918e6a4377200ebfa80ed1880bf4734681e3030e126c2a595de85f80b46bd327bae8a860a3ed5f5be7318037116c5e07de19e858eb720604f6e2935bf0f5e40d9194cfba05bfea0ab69f1d82263ee7293c68743b04034a5b63e1d2b65261f7c6758d8084a50419cc65d02ad214189e61084d61cf2ad9b6140b951ca35ae18a008cb3c1c4904e59f462e66b0428ec2c3d544a901ad85af62e1ec02aac643e707a3a45983ef168877b6901a19d108e7a47061fd472bd715c35b71b842fc1914a8972e472a2a4faa4880e0d2787198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "09148ba3625b1d4862ecfed71970e395d22bc4dafaa4a662546e4fb39141d8ba0a8f563782b2b31347c9e7ced5a21d959a38f4ae4bbc7cd37b1180a0d491cad617f32b902d2096a48b25f94ad6c692a99c68e937a4bae3c820f25093cf2786ab155c57d2b7f4aefc0e1a44a78c7d59d2cac917546717c665dc001fa43cf5775317b81fe685dd2e24a14899ef74821d1d147b88fe0c63d0921eb45c191146e7e41c9ae775eba85ea225258c9bafdf5cbad6106cd79194f4b0f8e7814068370daf302ac8191cd6d55b858891d05b919ad95f5e2f16b78c5b0ad2ecc72c3fe238421a924fa7e779ad503830c25838c2489d9bbc21fd519ceb3f4a10f4dc3e3b72be198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0ee7f0252e8210eaa3ee452c8731ad6864d8506ba61836f48c99a16a03d59b0d2ba1ddc868f452ef0cfdcac410e9d38d726557b05edc84f8d4f62203acc1f9f029aa08ecade2c1d537c14baf6cf62758c02e6f3c4eeb0b621ad3ab941b1559de11eac12aaf058f799ee8146f36a0bbbf8e67a0aa0f9e2c192bafd05ff8da45d303b7bd661becfa6ff5092b36f1768c815434f3b7f4254fb4b8abf68e36086cd3196caa297895d4a1d58a5fe388416fbac2a74fb9beb835dbbbaa8f6b63bf9cab29a00816ed140fc36e515f43fb054c891b4b07f013c9e6d5c3f284c8528c71ae2f060699e8f54b1028b78e5f016d8142563947adcac5a5857137b6958ddc995e141dd828af529924148912360fd71ef6a365a707173aa2c06c8290d54fae458e1cf61d5e9ceced0c662c6e2df96d63adc7d84e182fa0f62e08b9afdd5c90545e01f3e8049b7934995dee28faa0e401289b92ccd1a2f408c85383f5312f528c9e2c6aaa06b56e9d6c98a701b4a9cf2f8cfddbfa93d7104d5eafbad9a84b5174e5",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "0f740d88de760df099674c96dd2d476b42673d0f2972e6d5d1f9dba95a29d26a04a44d72c2a82088da663ff162fe2d3ddd4a139e1ef6c0bbb1124d8de75f7c68196346d9774f017c351dbbdd99960e834b188b3347b92fac7f83cc6453617fe11e3ba24a0848096a0d6484133af97b7487ca9a4309cb5574d8bb96cfd7f22678235603772d0e9cf9503d05742962b07cd0af71a7c7b757960ced6fcfa74d3ded1ceed193f30fbbe5e9a9438e82bac927a0977b49f6e476aee20923e1a230f2c4201af9371c7cea66800f961d6a7219da9c27fbe61b5df43fccb275d8c034bf8e1f0e7c5a1143b0f8e850d9516ea2c836b0331521829dc2b71dbf775078c770f4198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "107b8a2cb6318aabd95763c0cafc3b24d8a9acdf8dd967176f05c400951b3e0613a1c9847bf87c8cc79ef1120ed6e3e98412f0dd4e9c8c8c421057a2353279e6198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa2fb5b7e464a0a76d9aca8698e73802782da01fce50384f459be1427855c0eb502e6c7af07418cd0203fad6a1abde95e745c41a78c6ad1ae7b1b2ada2e643fd37260e01b251f6f1c7e7ff4e580791dee8ea51d87a358e038b4efe30fac09383c10118c4d5b837bcc2bc89b5b398b5974e9f5944073b32078b7e231fec938883b004fc6369f7110fe3d25156c1bb9a72859cf2a04641f99ba4ee413c80da6a5fe422febda3c0c0632a56475b4214e5615e11e6dd3f96e6cea2854a87d4dacc5e55",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "117196c7ea11e6362bca58533a55de3deadc441b18b0a7ca68557f374dfed6a629b1b63f1d649480aa9655406c454b55cbbf8d29f3aedc30de3b0745bed3be52226ad93c0a164e73d8d9161f9d0206ab232fa5a08cb349f7df3633096cd04e920de4a56223ee43aa3c4a18bf4c84be1879dd9182fd4a03318a4bebd642627d1e142a0ed74ba11936e27101a43db8e16f6a603953c3ea4b14eaebbe117970268a2abced69ffbce2e34440530111050a4d72282dd5f4faa7703d5762d04327175619eedb06c5d1f53510f7f7464b39730659eccf0e9dfeec2cc131fd0d27c4f8e3043aaea131d0e69b79a816b675ac0dd21b4796046c149ca16df5884d615025c5238f967690e26443e6f5207b5c2af7fedb837d534282c7db1ca926a9bc06a7390ec4c043a606711a021205ef7d97785d9ae246ba06b2912e24ff9e669fb700b42714a2e42c4bd73a79cd7b2243d1b784cadb22a58e6360be1af873424efd420c12f54bdcf07ff30854629a0531065973197e685193051f2fa11a7761b0cc39f6",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e104316c97997c17267a1bb67365523b4388e1306d66ea6e4d8f4a4a4b65f5c7d06e286b49c56f6293b2cea30764f0d5eabe5817905468a41f09b77588f692e8b081070efe3d4913dde35bba2513c426d065dee815c478700cef07180fb6146182432428b1490a4f25053d4c20c8723a73de6f0681bd3a8fca41008a6c3c288252d50f18403272e96c10135f96db0f8d0aec25033ebdffb88d2e7956c9bb198ec072462211ebc0a2f042f993d5bd76caf4adb5e99610dcf7c1d992595e6976aa3",  # noqa: E501
-            {
-                Address("0x000000000000000000000000000000000000c0de"): Account(
-                    storage={1: 1}
-                )
-            },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_inputs(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    expected_post: dict,
-) -> None:
-    """Various inputs to the bn254_pairing precompile."""
-    coinbase = Address("0x00000000000000000000000000000000c014bace")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=15000000,
-    )
-
-    # Source: Yul
-    # {
-    #   let size := calldatasize()
-    #   calldatacopy(0, 0, size)
-    #   let status := staticcall(0xffffffff, 8, 0, size, 0, 0x20)
-    #   let result := 0xfe
-    #   if status {
-    #     result := mload(0)
-    #   }
-    #   sstore(1, result)
-    # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.PUSH1[0x20]
-            + Op.PUSH0
-            + Op.CALLDATASIZE
-            + Op.CALLDATACOPY(
-                dest_offset=Op.DUP1, offset=Op.DUP3, size=Op.DUP1
-            )
-            + Op.DUP2
-            + Op.PUSH1[0x8]
-            + Op.PUSH4[0xFFFFFFFF]
-            + Op.STATICCALL
-            + Op.PUSH1[0xFE]
-            + Op.SWAP1
-            + Op.PUSH1[0x1B]
-            + Op.JUMPI
-            + Op.PUSH1[0x1]
-            + Op.SSTORE
-            + Op.STOP
-            + Op.JUMPDEST
-            + Op.POP
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=Op.PUSH0))
-            + Op.STOP
-        ),
-        storage={0x1: 0xCC},
-        nonce=0,
-        address=Address("0x000000000000000000000000000000000000c0de"),  # noqa: E501
-    )
-    pre[coinbase] = Account(balance=0, nonce=1)
-    pre[sender] = Account(balance=0xDE0B6B3A7640000)
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=15000000,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_one_point_insufficient_gas.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_one_point_insufficient_gas.py
deleted file mode 100644
index b7e2cd48999..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_one_point_insufficient_gas.py
+++ /dev/null
@@ -1,250 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge
-ecpairing_one_point_insufficient_gasFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_insufficient_gasFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            75000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            100000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_one_point_insufficient_gas(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x60E86, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A75DF17A, nonce=3)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000c000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000010000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000002198e9393920d483a7260bfb7"  # noqa: E501
-            "31fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479"  # noqa: E501
-            "674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b3133"  # noqa: E501
-            "70b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b"  # noqa: E501
-            "4ce6cc0166fa7daa"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=3,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_one_point_not_in_subgroup.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_one_point_not_in_subgroup.py
deleted file mode 100644
index 32834c95f15..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_one_point_not_in_subgroup.py
+++ /dev/null
@@ -1,260 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge
-ecpairing_one_point_not_in_subgroupFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_not_in_subgroupFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            236520,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            200000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_one_point_not_in_subgroup(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x4F04C1, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A714FB3F, nonce=20)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000c000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000800d3270b7da683f988d3889abcdad9776ecd45ab"  # noqa: E501
-            "aca689f1118c3fd33404b4392588360d269af2cd3e0803839ea274c2b8f062a6308e8da8"  # noqa: E501
-            "5fd774c26f1bcb87"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=20,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_one_point_with_g2_zero_and_g1_invalid.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_one_point_with_g2_zero_and_g1_invalid.py
deleted file mode 100644
index de03261ea99..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_one_point_with_g2_zero_and_g1_invalid.py
+++ /dev/null
@@ -1,259 +0,0 @@
-"""
-Use the ecpairing checker with one point, where g1 is not on the curve but...
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge
-ecpairing_one_point_with_g2_zero_and_g1_invalidFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_with_g2_zero_and_g1_invalidFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            232552,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            200000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_one_point_with_g2_zero_and_g1_invalid(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Use the ecpairing checker with one point, where g1 is not on the..."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A754D9F4, nonce=6)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000c000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000110000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000002000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=6,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_perturb_g2_by_curve_order.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_perturb_g2_by_curve_order.py
deleted file mode 100644
index 3fd8c4cc086..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_perturb_g2_by_curve_order.py
+++ /dev/null
@@ -1,260 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge
-ecpairing_perturb_g2_by_curve_orderFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_curve_orderFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            240616,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            200000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_perturb_g2_by_curve_order(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x615E09, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A702A1F7, nonce=25)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000c000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000198e9393920d483a7260bfb7"  # noqa: E501
-            "31fb5d25f1aa493335a9e71297e485b7aef312c248652d61f350be9ffaba461cdfdd9cd6"  # noqa: E501
-            "8f770b1d71184b6e8ac0b2f0c992f6ee090689d0585ff075ec9e99ad690c3395bc4b3133"  # noqa: E501
-            "70b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b"  # noqa: E501
-            "4ce6cc0166fa7daa"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=25,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_perturb_g2_by_one.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_perturb_g2_by_one.py
deleted file mode 100644
index eedc6b8c2ea..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_perturb_g2_by_one.py
+++ /dev/null
@@ -1,259 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_oneFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_oneFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            240488,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            200000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_perturb_g2_by_one(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x5DB2A1, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A7064D5F, nonce=24)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000c000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000198e9393920d483a7260bfb7"  # noqa: E501
-            "31fb5d25f1aa493335a9e71297e485b7aef312c31800deef121f1e76426a00665e5c4479"  # noqa: E501
-            "674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b3133"  # noqa: E501
-            "70b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b"  # noqa: E501
-            "4ce6cc0166fa7daa"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=24,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_perturb_zeropoint_by_curve_order.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_perturb_zeropoint_by_curve_order.py
deleted file mode 100644
index bbcc8784e28..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_perturb_zeropoint_by_curve_order.py
+++ /dev/null
@@ -1,260 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge
-ecpairing_perturb_zeropoint_by_curve_orderFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_curve_orderFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            242408,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            200000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_perturb_zeropoint_by_curve_order(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x564C51, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A70DB3AF, nonce=22)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000c030644e72"  # noqa: E501
-            "e131a029b85045b68181585d2833e84879b9709143e1f593f00000010000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000198e9393920d483a7260bfb7"  # noqa: E501
-            "31fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479"  # noqa: E501
-            "674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b3133"  # noqa: E501
-            "70b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b"  # noqa: E501
-            "4ce6cc0166fa7daa"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=22,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_perturb_zeropoint_by_field_modulus.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_perturb_zeropoint_by_field_modulus.py
deleted file mode 100644
index ca1a0fb947d..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_perturb_zeropoint_by_field_modulus.py
+++ /dev/null
@@ -1,260 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge
-ecpairing_perturb_zeropoint_by_field_modulusFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_field_modulusFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            242536,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            200000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_perturb_zeropoint_by_field_modulus(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x59FF39, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A70A00C7, nonce=23)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000c030644e72"  # noqa: E501
-            "e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd470000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000198e9393920d483a7260bfb7"  # noqa: E501
-            "31fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479"  # noqa: E501
-            "674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b3133"  # noqa: E501
-            "70b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b"  # noqa: E501
-            "4ce6cc0166fa7daa"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=23,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_perturb_zeropoint_by_one.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_perturb_zeropoint_by_one.py
deleted file mode 100644
index 795d6fc441e..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_perturb_zeropoint_by_one.py
+++ /dev/null
@@ -1,260 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge
-ecpairing_perturb_zeropoint_by_oneFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_oneFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            240552,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            200000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_perturb_zeropoint_by_one(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x52A0A9, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A7115F57, nonce=21)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "00000000000000000000000000000000000000000000000000000000000000c000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000010000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000198e9393920d483a7260bfb7"  # noqa: E501
-            "31fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479"  # noqa: E501
-            "674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b3133"  # noqa: E501
-            "70b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b"  # noqa: E501
-            "4ce6cc0166fa7daa"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=21,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_three_point_fail_1.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_three_point_fail_1.py
deleted file mode 100644
index 04a633a3607..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_three_point_fail_1.py
+++ /dev/null
@@ -1,270 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge
-ecpairing_three_point_fail_1Filler.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_three_point_fail_1Filler.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            422568,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            150000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_three_point_fail_1(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x48EB8E, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A71B1472, nonce=19)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000000240105456a3"  # noqa: E501
-            "33e6d636854f987ea7bb713dfd0ae8371a72aea313ae0c32c0bf10160cf031d41b41557f"  # noqa: E501
-            "3e7e3ba0c51bebe5da8e6ecd855ec50fc87efcdeac168bcc0476be093a6d2b4bbf907172"  # noqa: E501
-            "049874af11e1b6267606e00804d3ff0037ec57fd3010c68cb50161b7d1d96bb71edfec98"  # noqa: E501
-            "80171954e56871abf3d93cc94d745fa114c059d74e5b6c4ec14ae5864ebe23a71781d86c"  # noqa: E501
-            "29fb8fb6cce94f70d3de7a2101b33461f39d9e887dbb100f170a2345dde3c07e256d1dfa"  # noqa: E501
-            "2b657ba5cd03042700000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000010000000000000000000000000000000000000000000000000000000000000002"  # noqa: E501
-            "1a2c3013d2ea92e13c800cde68ef56a294b883f6ac35d25f587c09b1b3c635f7290158a8"  # noqa: E501
-            "0cd3d66530f74dc94c94adb88f5cdb481acca997b6e60071f08a115f00cacf3523caf879"  # noqa: E501
-            "d7d05e30549f1e6fdce364cbb8724b0329c6c2a39d4f018e0692e55db067300e6e3fe562"  # noqa: E501
-            "18fa2f940054e57e7ef92bf7d475a9d8a8502fd200000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000010000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e712"  # noqa: E501
-            "97e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5c"  # noqa: E501
-            "d992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"  # noqa: E501
-            "12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=19,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_three_point_match_1.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_three_point_match_1.py
deleted file mode 100644
index 6f452fae64a..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_three_point_match_1.py
+++ /dev/null
@@ -1,270 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge
-ecpairing_three_point_match_1Filler.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_three_point_match_1Filler.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            414632,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            200000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_three_point_match_1(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x42F15B, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A7210EA5, nonce=18)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000000240105456a3"  # noqa: E501
-            "33e6d636854f987ea7bb713dfd0ae8371a72aea313ae0c32c0bf10160cf031d41b41557f"  # noqa: E501
-            "3e7e3ba0c51bebe5da8e6ecd855ec50fc87efcdeac168bcc0476be093a6d2b4bbf907172"  # noqa: E501
-            "049874af11e1b6267606e00804d3ff0037ec57fd3010c68cb50161b7d1d96bb71edfec98"  # noqa: E501
-            "80171954e56871abf3d93cc94d745fa114c059d74e5b6c4ec14ae5864ebe23a71781d86c"  # noqa: E501
-            "29fb8fb6cce94f70d3de7a2101b33461f39d9e887dbb100f170a2345dde3c07e256d1dfa"  # noqa: E501
-            "2b657ba5cd03042700000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000010000000000000000000000000000000000000000000000000000000000000002"  # noqa: E501
-            "1a2c3013d2ea92e13c800cde68ef56a294b883f6ac35d25f587c09b1b3c635f7290158a8"  # noqa: E501
-            "0cd3d66530f74dc94c94adb88f5cdb481acca997b6e60071f08a115f2f997f3dbd66a7af"  # noqa: E501
-            "e07fe7862ce239edba9e05c5afff7f8a1259c9733b2dfbb929d1691530ca701b4a106054"  # noqa: E501
-            "688728c9972c8512e9789e9567aae23e302ccd7500000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000010000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000002000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000000000"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=18,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_fail_1.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_fail_1.py
deleted file mode 100644
index a9dda7f5a9d..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_fail_1.py
+++ /dev/null
@@ -1,254 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_fail_1Filler.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_fail_1Filler.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            329640,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_two_point_fail_1(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x19B0EB, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A74A4F15, nonce=9)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000018000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000010000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000002198e9393920d483a7260bfb7"  # noqa: E501
-            "31fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479"  # noqa: E501
-            "674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b3133"  # noqa: E501
-            "70b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b"  # noqa: E501
-            "4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000010000000000000000000000000000000000000000000000000000000000000002"  # noqa: E501
-            "198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef"  # noqa: E501
-            "121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075"  # noqa: E501
-            "ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab7180"  # noqa: E501
-            "8dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=9,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_fail_2.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_fail_2.py
deleted file mode 100644
index 16a27b247c5..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_fail_2.py
+++ /dev/null
@@ -1,264 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_fail_2Filler.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_fail_2Filler.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            333800,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            140000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_two_point_fail_2(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x39A4D9, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A72A5B27, nonce=16)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000000180105456a3"  # noqa: E501
-            "33e6d636854f987ea7bb713dfd0ae8371a72aea313ae0c32c0bf10160cf031d41b41557f"  # noqa: E501
-            "3e7e3ba0c51bebe5da8e6ecd855ec50fc87efcdeac168bcc0476be093a6d2b4bbf907172"  # noqa: E501
-            "049874af11e1b6267606e00804d3ff0037ec57fd3010c68cb50161b7d1d96bb71edfec98"  # noqa: E501
-            "80171954e56871abf3d93cc94d745fa114c059d74e5b6c4ec14ae5864ebe23a71781d86c"  # noqa: E501
-            "29fb8fb6cce94f70d3de7a2101b33461f39d9e887dbb100f170a2345dde3c07e256d1dfa"  # noqa: E501
-            "2b657ba5cd03042700000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000010000000000000000000000000000000000000000000000000000000000000002"  # noqa: E501
-            "105384b6dd6c48634b9fe89cb3e19667c1fe6736c69df070d674c95a42b3b8242c0d8e67"  # noqa: E501
-            "f0f2c14c43734b430d8be4265af8c4f7a67deb0b029fd2dff99cc6b9015eaec465d92258"  # noqa: E501
-            "0c7de5d4a5c26de75eaf2af6841b7412ef2eebd1e051076f1b4c21849e48de12d1bae2ba"  # noqa: E501
-            "d3299717aa8664ade430e19dec72a6e10a39b0ab"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=16,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_match_2.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_match_2.py
deleted file mode 100644
index bc162c92ccf..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_match_2.py
+++ /dev/null
@@ -1,264 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_2Filler.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_2Filler.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            329640,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            200000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_two_point_match_2(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x2B7A76, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A738858A, nonce=13)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000018000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000010000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000002198e9393920d483a7260bfb7"  # noqa: E501
-            "31fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479"  # noqa: E501
-            "674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b3133"  # noqa: E501
-            "70b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b"  # noqa: E501
-            "4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000010000000000000000000000000000000000000000000000000000000000000002"  # noqa: E501
-            "198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef"  # noqa: E501
-            "121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3"  # noqa: E501
-            "cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435"  # noqa: E501
-            "f3b617cdb3af83285c2df711ef39c01571827f9d"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=13,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_match_3.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_match_3.py
deleted file mode 100644
index 8a9af099ed8..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_match_3.py
+++ /dev/null
@@ -1,264 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_3Filler.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_3Filler.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            333736,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            200000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_two_point_match_3(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x302897, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A733D769, nonce=14)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000018000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000010000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000002203e205db4f19b37b60121b8"  # noqa: E501
-            "3a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f14"  # noqa: E501
-            "9d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b"  # noqa: E501
-            "4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c046"  # noqa: E501
-            "6e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c1"  # noqa: E501
-            "6d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83"  # noqa: E501
-            "198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef"  # noqa: E501
-            "121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075"  # noqa: E501
-            "ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab7180"  # noqa: E501
-            "8dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=14,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_match_4.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_match_4.py
deleted file mode 100644
index ff3c97a28d3..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_match_4.py
+++ /dev/null
@@ -1,264 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_4Filler.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_4Filler.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            333736,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            200000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_two_point_match_4(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x34E6B8, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A72F1948, nonce=15)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "0000000000000000000000000000000000000000000000000000000000000180105456a3"  # noqa: E501
-            "33e6d636854f987ea7bb713dfd0ae8371a72aea313ae0c32c0bf10160cf031d41b41557f"  # noqa: E501
-            "3e7e3ba0c51bebe5da8e6ecd855ec50fc87efcdeac168bcc0476be093a6d2b4bbf907172"  # noqa: E501
-            "049874af11e1b6267606e00804d3ff0037ec57fd3010c68cb50161b7d1d96bb71edfec98"  # noqa: E501
-            "80171954e56871abf3d93cc94d745fa114c059d74e5b6c4ec14ae5864ebe23a71781d86c"  # noqa: E501
-            "29fb8fb6cce94f70d3de7a2101b33461f39d9e887dbb100f170a2345dde3c07e256d1dfa"  # noqa: E501
-            "2b657ba5cd03042700000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000010000000000000000000000000000000000000000000000000000000000000002"  # noqa: E501
-            "1a2c3013d2ea92e13c800cde68ef56a294b883f6ac35d25f587c09b1b3c635f7290158a8"  # noqa: E501
-            "0cd3d66530f74dc94c94adb88f5cdb481acca997b6e60071f08a115f2f997f3dbd66a7af"  # noqa: E501
-            "e07fe7862ce239edba9e05c5afff7f8a1259c9733b2dfbb929d1691530ca701b4a106054"  # noqa: E501
-            "688728c9972c8512e9789e9567aae23e302ccd75"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=15,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_match_5.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_match_5.py
deleted file mode 100644
index 56dfc625b1c..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_match_5.py
+++ /dev/null
@@ -1,264 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_5Filler.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_5Filler.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            321448,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            140000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_two_point_match_5(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x3E633A, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A7259CC6, nonce=17)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000018000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000010000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000002000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef"  # noqa: E501
-            "121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075"  # noqa: E501
-            "ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab7180"  # noqa: E501
-            "8dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=17,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_oog.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_oog.py
deleted file mode 100644
index b23f24bf8a0..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_two_point_oog.py
+++ /dev/null
@@ -1,264 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_oogFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_oogFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            251624,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            200000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_two_point_oog(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x27A38E, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A73C5C72, nonce=12)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0xB10E2D527612073B26EECDFD717E6A320CF44B4AFAC2B0732D9FCBE2B7FA0CF6,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000018000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000010000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000002198e9393920d483a7260bfb7"  # noqa: E501
-            "31fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479"  # noqa: E501
-            "674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b3133"  # noqa: E501
-            "70b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b"  # noqa: E501
-            "4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "0000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45"  # noqa: E501
-            "198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef"  # noqa: E501
-            "121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075"  # noqa: E501
-            "ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab7180"  # noqa: E501
-            "8dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=12,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_ecpairing_two_points_with_one_g2_zero.py b/tests/ported_static/stZeroKnowledge/test_ecpairing_two_points_with_one_g2_zero.py
deleted file mode 100644
index 811e2257555..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_ecpairing_two_points_with_one_g2_zero.py
+++ /dev/null
@@ -1,265 +0,0 @@
-"""
-Puts the given data into the ECPAIRING precompile.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge
-ecpairing_two_points_with_one_g2_zeroFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    [
-        "tests/static/state_tests/stZeroKnowledge/ecpairing_two_points_with_one_g2_zeroFiller.json",  # noqa: E501
-    ],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_gas_limit, expected_post",
-    [
-        (
-            321576,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            90000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            110000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            200000,
-            {
-                Address("0xc305c901078781c232a2a521c2af7980f8385ee9"): Account(
-                    storage={
-                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563  # noqa: E501
-                    }
-                )
-            },
-        ),
-    ],
-    ids=["case0", "case1", "case2", "case3"],
-)
-@pytest.mark.pre_alloc_mutable
-def test_ecpairing_two_points_with_one_g2_zero(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Puts the given data into the ECPAIRING precompile."""
-    coinbase = Address("0x3535353535353535353535353535353535353535")
-    sender = EOA(
-        key=0x044852B2A670ADE5407E78FB2863C51DE9FCB96542A07186FE3AEDA6BB8A116D
-    )
-    callee = Address("0x0000000000000000000000000000000000000001")
-    callee_1 = Address("0x0000000000000000000000000000000000000002")
-    callee_2 = Address("0x0000000000000000000000000000000000000003")
-    callee_3 = Address("0x0000000000000000000000000000000000000004")
-    callee_4 = Address("0x0000000000000000000000000000000000000005")
-    callee_5 = Address("0x0000000000000000000000000000000000000006")
-    callee_6 = Address("0x0000000000000000000000000000000000000007")
-    callee_7 = Address("0x0000000000000000000000000000000000000008")
-    callee_8 = Address("0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b")
-    callee_9 = Address("0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224")
-    callee_10 = Address("0x24143873e0e0815fdcbcffdbe09c979cbf9ad013")
-    callee_11 = Address("0x598443f1880ef585b21f1d7585bd0577402861e5")
-    callee_12 = Address("0x77db2bebba79db42a978f896968f4afce746ea1f")
-    callee_13 = Address("0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e")
-    callee_14 = Address("0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c")
-    callee_15 = Address("0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d")
-    callee_16 = Address("0xe0fc04fa2d34a66b779fd5cee748268032a146c0")
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=100000000,
-    )
-
-    pre[callee] = Account(balance=1, nonce=0)
-    pre[callee_1] = Account(balance=1, nonce=0)
-    pre[callee_2] = Account(balance=1, nonce=0)
-    pre[callee_3] = Account(balance=1, nonce=0)
-    pre[callee_4] = Account(balance=1, nonce=0)
-    pre[callee_5] = Account(balance=1, nonce=0)
-    pre[callee_6] = Account(balance=1, nonce=0)
-    pre[callee_7] = Account(balance=1, nonce=0)
-    pre[callee_8] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_9] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_10] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[coinbase] = Account(balance=0x1E5F0C, nonce=0)
-    pre[callee_11] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_12] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_13] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[sender] = Account(balance=0xDE0B6B3A745A0F4, nonce=10)
-    pre[callee_14] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    # Source: raw bytecode
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x1C, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(
-                offset=0x20,
-                value=0x10000000000000000000000000000000000000000,
-            )
-            + Op.MSTORE(offset=0x40, value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
-            + Op.MSTORE(
-                offset=0x60,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000001,  # noqa: E501
-            )
-            + Op.MSTORE(
-                offset=0x80,
-                value=0x2540BE3FFFFFFFFFFFFFFFFFFFFFFFFFDABF41C00,
-            )
-            + Op.MSTORE(
-                offset=0xA0,
-                value=0xFFFFFFFFFFFFFFFFFFFFFFFDABF41C00000000000000000000000002540BE400,  # noqa: E501
-            )
-            + Op.JUMPI(
-                pc=0x12C,
-                condition=Op.ISZERO(Op.EQ(Op.MLOAD(offset=0x0), 0x30C8D1DA)),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.ISZERO(
-                        Op.GT(
-                            Op.CALLDATALOAD(
-                                offset=Op.ADD(
-                                    0x4, Op.CALLDATALOAD(offset=0x4)
-                                ),
-                            ),
-                            0x780,
-                        ),
-                    ),
-                ),
-            )
-            + Op.CALLDATACOPY(
-                dest_offset=0x140,
-                offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                size=Op.ADD(
-                    0x20,
-                    Op.CALLDATALOAD(
-                        offset=Op.ADD(0x4, Op.CALLDATALOAD(offset=0x4)),
-                    ),
-                ),
-            )
-            + Op.JUMPI(
-                pc=Op.PC,
-                condition=Op.ISZERO(
-                    Op.CALL(
-                        gas=0x5F5E0FF,
-                        address=0x8,
-                        value=0x0,
-                        args_offset=0x160,
-                        args_size=Op.MLOAD(offset=0x140),
-                        ret_offset=0x920,
-                        ret_size=0x20,
-                    ),
-                ),
-            )
-            + Op.MSTORE(offset=0x900, value=0x20)
-            + Op.PUSH2[0x900]
-            + Op.PUSH1[0x40]
-            + Op.POP(
-                Op.CALL(
-                    gas=0x18,
-                    address=0x4,
-                    value=0x0,
-                    args_offset=Op.DUP5,
-                    args_size=Op.DUP3,
-                    ret_offset=0x960,
-                    ret_size=Op.DUP1,
-                ),
-            )
-            + Op.POP
-            + Op.POP
-            + Op.PUSH2[0x960]
-            + Op.SHA3(
-                offset=Op.ADD(Op.DUP3, 0x20), size=Op.MLOAD(offset=Op.DUP1)
-            )
-            + Op.SWAP1
-            + Op.POP
-            + Op.PUSH1[0x0]
-            + Op.SSTORE
-            + Op.PUSH2[0x960]
-            + Op.MSTORE(offset=Op.SUB(Op.DUP3, 0x20), value=0x20)
-            + Op.ADD(Op.MLOAD(offset=Op.DUP2), 0x40)
-            + Op.SUB(Op.ADD(Op.DUP3, 0x1F), Op.MOD(Op.SUB(Op.DUP3, 0x1), 0x20))
-            + Op.SWAP1
-            + Op.POP
-            + Op.SUB(Op.DUP3, 0x20)
-            + Op.RETURN
-            + Op.POP
-            + Op.STOP
-            + Op.JUMPDEST
-        ),
-        storage={
-            0x0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563,  # noqa: E501
-        },
-        address=Address("0xc305c901078781c232a2a521c2af7980f8385ee9"),  # noqa: E501
-    )
-    pre[callee_15] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-    pre[callee_16] = Account(balance=0xDE0B6B3A7640000, nonce=0)
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "30c8d1da0000000000000000000000000000000000000000000000000000000000000020"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000018000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000010000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000002000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000000000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-            "000000010000000000000000000000000000000000000000000000000000000000000002"  # noqa: E501
-            "198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef"  # noqa: E501
-            "121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075"  # noqa: E501
-            "ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab7180"  # noqa: E501
-            "8dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
-        ),
-        gas_limit=tx_gas_limit,
-        nonce=10,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_pairing_test.py b/tests/ported_static/stZeroKnowledge/test_pairing_test.py
index df091f21088..bf844166115 100644
--- a/tests/ported_static/stZeroKnowledge/test_pairing_test.py
+++ b/tests/ported_static/stZeroKnowledge/test_pairing_test.py
@@ -1,20 +1,24 @@
 """
-Test ported from static filler.
+Test_pairing_test.
 
 Ported from:
-tests/static/state_tests/stZeroKnowledge/pairingTestFiller.json
+state_tests/stZeroKnowledge/pairingTestFiller.json
 """
 
 import pytest
 from execution_testing import (
-    EOA,
     Account,
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,197 +26,173 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stZeroKnowledge/pairingTestFiller.json"],
+    ["state_tests/stZeroKnowledge/pairingTestFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "00000000000000000000000000000000000000000000000000000000000001801c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c2032c61a830e3c17286de9462bf242fca2883585b93870a73853face6a6bf411198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            10000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000001801c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c2032c61a830e3c17286de9462bf242fca2883585b93870a73853face6a6bf411198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            90000,
-            {},
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000001801c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c2032c61a830e3c17286de9462bf242fca2883585b93870a73853face6a6bf411198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            110000,
-            {},
+        pytest.param(
+            0,
+            2,
+            0,
+            id="d0-g2",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000001801c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c2032c61a830e3c17286de9462bf242fca2883585b93870a73853face6a6bf411198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            150000,
-            {},
+        pytest.param(
+            0,
+            3,
+            0,
+            id="d0-g3",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000001802eca0c7238bf16e83e7a1e6c5d49540685ff51380f309842a98561558019fc0203d3260361bb8451de5ff5ecd17f010ff22f5c31cdf184e9020b06fa5997db841213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f06967a1237ebfeca9aaae0d6d0bab8e28c198c5a339ef8a2407e31cdac516db922160fa257a5fd5b280642ff47b65eca77e626cb685c84fa6d3b6882a283ddd1198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            10000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000001802eca0c7238bf16e83e7a1e6c5d49540685ff51380f309842a98561558019fc0203d3260361bb8451de5ff5ecd17f010ff22f5c31cdf184e9020b06fa5997db841213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f06967a1237ebfeca9aaae0d6d0bab8e28c198c5a339ef8a2407e31cdac516db922160fa257a5fd5b280642ff47b65eca77e626cb685c84fa6d3b6882a283ddd1198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            90000,
-            {},
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000001802eca0c7238bf16e83e7a1e6c5d49540685ff51380f309842a98561558019fc0203d3260361bb8451de5ff5ecd17f010ff22f5c31cdf184e9020b06fa5997db841213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f06967a1237ebfeca9aaae0d6d0bab8e28c198c5a339ef8a2407e31cdac516db922160fa257a5fd5b280642ff47b65eca77e626cb685c84fa6d3b6882a283ddd1198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            110000,
-            {},
+        pytest.param(
+            1,
+            2,
+            0,
+            id="d1-g2",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000001802eca0c7238bf16e83e7a1e6c5d49540685ff51380f309842a98561558019fc0203d3260361bb8451de5ff5ecd17f010ff22f5c31cdf184e9020b06fa5997db841213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f06967a1237ebfeca9aaae0d6d0bab8e28c198c5a339ef8a2407e31cdac516db922160fa257a5fd5b280642ff47b65eca77e626cb685c84fa6d3b6882a283ddd1198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            150000,
-            {},
+        pytest.param(
+            1,
+            3,
+            0,
+            id="d1-g3",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000001800f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba2e89718ad33c8bed92e210e81d1853435399a271913a6520736a4729cf0d51eb01a9e2ffa2e92599b68e44de5bcf354fa2642bd4f26b259daa6f7ce3ed57aeb314a9a87b789a58af499b314e13c3d65bede56c07ea2d418d6874857b70763713178fb49a2d6cd347dc58973ff49613a20757d0fcc22079f9abd10c3baee245901b9e027bd5cfc2cb5db82d4dc9677ac795ec500ecd47deee3b5da006d6d049b811d7511c78158de484232fc68daf8a45cf217d1c2fae693ff5871e8752d73b21198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            10000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000001800f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba2e89718ad33c8bed92e210e81d1853435399a271913a6520736a4729cf0d51eb01a9e2ffa2e92599b68e44de5bcf354fa2642bd4f26b259daa6f7ce3ed57aeb314a9a87b789a58af499b314e13c3d65bede56c07ea2d418d6874857b70763713178fb49a2d6cd347dc58973ff49613a20757d0fcc22079f9abd10c3baee245901b9e027bd5cfc2cb5db82d4dc9677ac795ec500ecd47deee3b5da006d6d049b811d7511c78158de484232fc68daf8a45cf217d1c2fae693ff5871e8752d73b21198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            90000,
-            {},
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000001800f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba2e89718ad33c8bed92e210e81d1853435399a271913a6520736a4729cf0d51eb01a9e2ffa2e92599b68e44de5bcf354fa2642bd4f26b259daa6f7ce3ed57aeb314a9a87b789a58af499b314e13c3d65bede56c07ea2d418d6874857b70763713178fb49a2d6cd347dc58973ff49613a20757d0fcc22079f9abd10c3baee245901b9e027bd5cfc2cb5db82d4dc9677ac795ec500ecd47deee3b5da006d6d049b811d7511c78158de484232fc68daf8a45cf217d1c2fae693ff5871e8752d73b21198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            110000,
-            {},
+        pytest.param(
+            2,
+            2,
+            0,
+            id="d2-g2",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000001800f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba2e89718ad33c8bed92e210e81d1853435399a271913a6520736a4729cf0d51eb01a9e2ffa2e92599b68e44de5bcf354fa2642bd4f26b259daa6f7ce3ed57aeb314a9a87b789a58af499b314e13c3d65bede56c07ea2d418d6874857b70763713178fb49a2d6cd347dc58973ff49613a20757d0fcc22079f9abd10c3baee245901b9e027bd5cfc2cb5db82d4dc9677ac795ec500ecd47deee3b5da006d6d049b811d7511c78158de484232fc68daf8a45cf217d1c2fae693ff5871e8752d73b21198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            150000,
-            {},
+        pytest.param(
+            2,
+            3,
+            0,
+            id="d2-g3",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000002402f2ea0b3da1e8ef11914acf8b2e1b32d99df51f5f4f206fc6b947eae860eddb6068134ddb33dc888ef446b648d72338684d678d2eb2371c61a50734d78da4b7225f83c8b6ab9de74e7da488ef02645c5a16a6652c3c71a15dc37fe3a5dcb7cb122acdedd6308e3bb230d226d16a105295f523a8a02bfc5e8bd2da135ac4c245d065bbad92e7c4e31bf3757f1fe7362a63fbfee50e7dc68da116e67d600d9bf6806d302580dc0661002994e7cd3a7f224e7ddc27802777486bf80f40e4ca3cfdb186bac5188a98c45e6016873d107f5cd131f3a3e339d0375e58bd6219347b008122ae2b09e539e152ec5364e7e2204b03d11d3caa038bfc7cd499f8176aacbee1f39e4e4afc4bc74790a4a028aff2c3d2538731fb755edefd8cb48d6ea589b5e283f150794b6736f670d6a1033f9b46c6f5204f50813eb85c8dc4b59db1c5d39140d97ee4d2b36d99bc49974d18ecca3e7ad51011956051b464d9e27d46cc25e0764bb98575bd466d32db7b15f582b2d5c452b36aa394b789366e5e3ca5aabd415794ab061441e51d01e94640b7e3084a07e02c78cf3103c542bc5b298669f211b88da1679b0b64a63b7e0e7bfe52aae524f73a55be7fe70c7e9bfc94b4cf0da1213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f",  # noqa: E501
-            10000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000002402f2ea0b3da1e8ef11914acf8b2e1b32d99df51f5f4f206fc6b947eae860eddb6068134ddb33dc888ef446b648d72338684d678d2eb2371c61a50734d78da4b7225f83c8b6ab9de74e7da488ef02645c5a16a6652c3c71a15dc37fe3a5dcb7cb122acdedd6308e3bb230d226d16a105295f523a8a02bfc5e8bd2da135ac4c245d065bbad92e7c4e31bf3757f1fe7362a63fbfee50e7dc68da116e67d600d9bf6806d302580dc0661002994e7cd3a7f224e7ddc27802777486bf80f40e4ca3cfdb186bac5188a98c45e6016873d107f5cd131f3a3e339d0375e58bd6219347b008122ae2b09e539e152ec5364e7e2204b03d11d3caa038bfc7cd499f8176aacbee1f39e4e4afc4bc74790a4a028aff2c3d2538731fb755edefd8cb48d6ea589b5e283f150794b6736f670d6a1033f9b46c6f5204f50813eb85c8dc4b59db1c5d39140d97ee4d2b36d99bc49974d18ecca3e7ad51011956051b464d9e27d46cc25e0764bb98575bd466d32db7b15f582b2d5c452b36aa394b789366e5e3ca5aabd415794ab061441e51d01e94640b7e3084a07e02c78cf3103c542bc5b298669f211b88da1679b0b64a63b7e0e7bfe52aae524f73a55be7fe70c7e9bfc94b4cf0da1213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f",  # noqa: E501
-            90000,
-            {},
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000002402f2ea0b3da1e8ef11914acf8b2e1b32d99df51f5f4f206fc6b947eae860eddb6068134ddb33dc888ef446b648d72338684d678d2eb2371c61a50734d78da4b7225f83c8b6ab9de74e7da488ef02645c5a16a6652c3c71a15dc37fe3a5dcb7cb122acdedd6308e3bb230d226d16a105295f523a8a02bfc5e8bd2da135ac4c245d065bbad92e7c4e31bf3757f1fe7362a63fbfee50e7dc68da116e67d600d9bf6806d302580dc0661002994e7cd3a7f224e7ddc27802777486bf80f40e4ca3cfdb186bac5188a98c45e6016873d107f5cd131f3a3e339d0375e58bd6219347b008122ae2b09e539e152ec5364e7e2204b03d11d3caa038bfc7cd499f8176aacbee1f39e4e4afc4bc74790a4a028aff2c3d2538731fb755edefd8cb48d6ea589b5e283f150794b6736f670d6a1033f9b46c6f5204f50813eb85c8dc4b59db1c5d39140d97ee4d2b36d99bc49974d18ecca3e7ad51011956051b464d9e27d46cc25e0764bb98575bd466d32db7b15f582b2d5c452b36aa394b789366e5e3ca5aabd415794ab061441e51d01e94640b7e3084a07e02c78cf3103c542bc5b298669f211b88da1679b0b64a63b7e0e7bfe52aae524f73a55be7fe70c7e9bfc94b4cf0da1213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f",  # noqa: E501
-            110000,
-            {},
+        pytest.param(
+            3,
+            2,
+            0,
+            id="d3-g2",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000002402f2ea0b3da1e8ef11914acf8b2e1b32d99df51f5f4f206fc6b947eae860eddb6068134ddb33dc888ef446b648d72338684d678d2eb2371c61a50734d78da4b7225f83c8b6ab9de74e7da488ef02645c5a16a6652c3c71a15dc37fe3a5dcb7cb122acdedd6308e3bb230d226d16a105295f523a8a02bfc5e8bd2da135ac4c245d065bbad92e7c4e31bf3757f1fe7362a63fbfee50e7dc68da116e67d600d9bf6806d302580dc0661002994e7cd3a7f224e7ddc27802777486bf80f40e4ca3cfdb186bac5188a98c45e6016873d107f5cd131f3a3e339d0375e58bd6219347b008122ae2b09e539e152ec5364e7e2204b03d11d3caa038bfc7cd499f8176aacbee1f39e4e4afc4bc74790a4a028aff2c3d2538731fb755edefd8cb48d6ea589b5e283f150794b6736f670d6a1033f9b46c6f5204f50813eb85c8dc4b59db1c5d39140d97ee4d2b36d99bc49974d18ecca3e7ad51011956051b464d9e27d46cc25e0764bb98575bd466d32db7b15f582b2d5c452b36aa394b789366e5e3ca5aabd415794ab061441e51d01e94640b7e3084a07e02c78cf3103c542bc5b298669f211b88da1679b0b64a63b7e0e7bfe52aae524f73a55be7fe70c7e9bfc94b4cf0da1213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f",  # noqa: E501
-            150000,
-            {},
+        pytest.param(
+            3,
+            3,
+            0,
+            id="d3-g3",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000024020a754d2071d4d53903e3b31a7e98ad6882d58aec240ef981fdf0a9d22c5926a29c853fcea789887315916bbeb89ca37edb355b4f980c9a12a94f30deeed30211213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f1abb4a25eb9379ae96c84fff9f0540abcfc0a0d11aeda02d4f37e4baf74cb0c11073b3ff2cdbb38755f8691ea59e9606696b3ff278acfc098fa8226470d03869217cee0a9ad79a4493b5253e2e4e3a39fc2df38419f230d341f60cb064a0ac290a3d76f140db8418ba512272381446eb73958670f00cf46f1d9e64cba057b53c26f64a8ec70387a13e41430ed3ee4a7db2059cc5fc13c067194bcc0cb49a98552fd72bd9edb657346127da132e5b82ab908f5816c826acb499e22f2412d1a2d70f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2198a1f162a73261f112401aa2db79c7dab1533c9935c77290a6ce3b191f2318d198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            10000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1}
-                )
-            },
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000024020a754d2071d4d53903e3b31a7e98ad6882d58aec240ef981fdf0a9d22c5926a29c853fcea789887315916bbeb89ca37edb355b4f980c9a12a94f30deeed30211213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f1abb4a25eb9379ae96c84fff9f0540abcfc0a0d11aeda02d4f37e4baf74cb0c11073b3ff2cdbb38755f8691ea59e9606696b3ff278acfc098fa8226470d03869217cee0a9ad79a4493b5253e2e4e3a39fc2df38419f230d341f60cb064a0ac290a3d76f140db8418ba512272381446eb73958670f00cf46f1d9e64cba057b53c26f64a8ec70387a13e41430ed3ee4a7db2059cc5fc13c067194bcc0cb49a98552fd72bd9edb657346127da132e5b82ab908f5816c826acb499e22f2412d1a2d70f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2198a1f162a73261f112401aa2db79c7dab1533c9935c77290a6ce3b191f2318d198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            90000,
-            {},
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000024020a754d2071d4d53903e3b31a7e98ad6882d58aec240ef981fdf0a9d22c5926a29c853fcea789887315916bbeb89ca37edb355b4f980c9a12a94f30deeed30211213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f1abb4a25eb9379ae96c84fff9f0540abcfc0a0d11aeda02d4f37e4baf74cb0c11073b3ff2cdbb38755f8691ea59e9606696b3ff278acfc098fa8226470d03869217cee0a9ad79a4493b5253e2e4e3a39fc2df38419f230d341f60cb064a0ac290a3d76f140db8418ba512272381446eb73958670f00cf46f1d9e64cba057b53c26f64a8ec70387a13e41430ed3ee4a7db2059cc5fc13c067194bcc0cb49a98552fd72bd9edb657346127da132e5b82ab908f5816c826acb499e22f2412d1a2d70f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2198a1f162a73261f112401aa2db79c7dab1533c9935c77290a6ce3b191f2318d198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            110000,
-            {},
+        pytest.param(
+            4,
+            2,
+            0,
+            id="d4-g2",
         ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000024020a754d2071d4d53903e3b31a7e98ad6882d58aec240ef981fdf0a9d22c5926a29c853fcea789887315916bbeb89ca37edb355b4f980c9a12a94f30deeed30211213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f1abb4a25eb9379ae96c84fff9f0540abcfc0a0d11aeda02d4f37e4baf74cb0c11073b3ff2cdbb38755f8691ea59e9606696b3ff278acfc098fa8226470d03869217cee0a9ad79a4493b5253e2e4e3a39fc2df38419f230d341f60cb064a0ac290a3d76f140db8418ba512272381446eb73958670f00cf46f1d9e64cba057b53c26f64a8ec70387a13e41430ed3ee4a7db2059cc5fc13c067194bcc0cb49a98552fd72bd9edb657346127da132e5b82ab908f5816c826acb499e22f2412d1a2d70f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2198a1f162a73261f112401aa2db79c7dab1533c9935c77290a6ce3b191f2318d198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            150000,
-            {},
+        pytest.param(
+            4,
+            3,
+            0,
+            id="d4-g3",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000001801c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c103188585e2364128fe25c70558f1560f4f9350baf3959e603cc91486e110936198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            10000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1}
-                )
-            },
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000001801c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c103188585e2364128fe25c70558f1560f4f9350baf3959e603cc91486e110936198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            90000,
-            {},
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000001801c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c103188585e2364128fe25c70558f1560f4f9350baf3959e603cc91486e110936198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            110000,
-            {},
+        pytest.param(
+            5,
+            2,
+            0,
+            id="d5-g2",
         ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000001801c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c103188585e2364128fe25c70558f1560f4f9350baf3959e603cc91486e110936198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",  # noqa: E501
-            150000,
-            {},
+        pytest.param(
+            5,
+            3,
+            0,
+            id="d5-g3",
         ),
     ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-    ],
 )
 @pytest.mark.pre_alloc_mutable
 def test_pairing_test(
     state_test: StateTestFiller,
     pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
 ) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+    """Test_pairing_test."""
+    coinbase = Address(0x68795C4AA09D6F4ED3E5DEDDF8C2AD3049A601DA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_1 = Address(0xC94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    contract_2 = Address(0xD94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000, nonce=1)
 
     env = Environment(
         fee_recipient=coinbase,
@@ -223,119 +203,388 @@ def test_pairing_test(
         gas_limit=14012015,
     )
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    # Source: LLL
+    # Source: lll
     # {(MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) (MSTORE 224 (CALLDATALOAD 224)) (MSTORE 256 (CALLDATALOAD 256)) (MSTORE 288 (CALLDATALOAD 288)) (MSTORE 320 (CALLDATALOAD 320)) (MSTORE 352 (CALLDATALOAD 352)) (MSTORE 384 (CALLDATALOAD 384)) (MSTORE 416 (CALLDATALOAD 416)) (MSTORE 448 (CALLDATALOAD 448)) (MSTORE 480 (CALLDATALOAD 480)) (MSTORE 512 (CALLDATALOAD 512)) (MSTORE 544 (CALLDATALOAD 544)) (MSTORE 576 (CALLDATALOAD 576)) (MSTORE 608 (CALLDATALOAD 608)) (MSTORE 640 (CALLDATALOAD 640)) (MSTORE 672 (CALLDATALOAD 672)) (MSTORE 704 (CALLDATALOAD 704)) (MSTORE 736 (CALLDATALOAD 736)) [[0]](CALLCODE 500000 8 0 32 (CALLDATALOAD 0) 1000 32)  [[1]] (MLOAD 1000) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x80))
-            + Op.MSTORE(offset=0xA0, value=Op.CALLDATALOAD(offset=0xA0))
-            + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0xC0))
-            + Op.MSTORE(offset=0xE0, value=Op.CALLDATALOAD(offset=0xE0))
-            + Op.MSTORE(offset=0x100, value=Op.CALLDATALOAD(offset=0x100))
-            + Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x120))
-            + Op.MSTORE(offset=0x140, value=Op.CALLDATALOAD(offset=0x140))
-            + Op.MSTORE(offset=0x160, value=Op.CALLDATALOAD(offset=0x160))
-            + Op.MSTORE(offset=0x180, value=Op.CALLDATALOAD(offset=0x180))
-            + Op.MSTORE(offset=0x1A0, value=Op.CALLDATALOAD(offset=0x1A0))
-            + Op.MSTORE(offset=0x1C0, value=Op.CALLDATALOAD(offset=0x1C0))
-            + Op.MSTORE(offset=0x1E0, value=Op.CALLDATALOAD(offset=0x1E0))
-            + Op.MSTORE(offset=0x200, value=Op.CALLDATALOAD(offset=0x200))
-            + Op.MSTORE(offset=0x220, value=Op.CALLDATALOAD(offset=0x220))
-            + Op.MSTORE(offset=0x240, value=Op.CALLDATALOAD(offset=0x240))
-            + Op.MSTORE(offset=0x260, value=Op.CALLDATALOAD(offset=0x260))
-            + Op.MSTORE(offset=0x280, value=Op.CALLDATALOAD(offset=0x280))
-            + Op.MSTORE(offset=0x2A0, value=Op.CALLDATALOAD(offset=0x2A0))
-            + Op.MSTORE(offset=0x2C0, value=Op.CALLDATALOAD(offset=0x2C0))
-            + Op.MSTORE(offset=0x2E0, value=Op.CALLDATALOAD(offset=0x2E0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x8,
-                    value=0x0,
-                    args_offset=0x20,
-                    args_size=Op.CALLDATALOAD(offset=0x0),
-                    ret_offset=0x3E8,
-                    ret_size=0x20,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x3E8))
-            + Op.STOP
-        ),
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x80))
+        + Op.MSTORE(offset=0xA0, value=Op.CALLDATALOAD(offset=0xA0))
+        + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0xC0))
+        + Op.MSTORE(offset=0xE0, value=Op.CALLDATALOAD(offset=0xE0))
+        + Op.MSTORE(offset=0x100, value=Op.CALLDATALOAD(offset=0x100))
+        + Op.MSTORE(offset=0x120, value=Op.CALLDATALOAD(offset=0x120))
+        + Op.MSTORE(offset=0x140, value=Op.CALLDATALOAD(offset=0x140))
+        + Op.MSTORE(offset=0x160, value=Op.CALLDATALOAD(offset=0x160))
+        + Op.MSTORE(offset=0x180, value=Op.CALLDATALOAD(offset=0x180))
+        + Op.MSTORE(offset=0x1A0, value=Op.CALLDATALOAD(offset=0x1A0))
+        + Op.MSTORE(offset=0x1C0, value=Op.CALLDATALOAD(offset=0x1C0))
+        + Op.MSTORE(offset=0x1E0, value=Op.CALLDATALOAD(offset=0x1E0))
+        + Op.MSTORE(offset=0x200, value=Op.CALLDATALOAD(offset=0x200))
+        + Op.MSTORE(offset=0x220, value=Op.CALLDATALOAD(offset=0x220))
+        + Op.MSTORE(offset=0x240, value=Op.CALLDATALOAD(offset=0x240))
+        + Op.MSTORE(offset=0x260, value=Op.CALLDATALOAD(offset=0x260))
+        + Op.MSTORE(offset=0x280, value=Op.CALLDATALOAD(offset=0x280))
+        + Op.MSTORE(offset=0x2A0, value=Op.CALLDATALOAD(offset=0x2A0))
+        + Op.MSTORE(offset=0x2C0, value=Op.CALLDATALOAD(offset=0x2C0))
+        + Op.MSTORE(offset=0x2E0, value=Op.CALLDATALOAD(offset=0x2E0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0x8,
+                value=0x0,
+                args_offset=0x20,
+                args_size=Op.CALLDATALOAD(offset=0x0),
+                ret_offset=0x3E8,
+                ret_size=0x20,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x3E8))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000)  [[0]](CALLCODE 5000000 7 0 0 96 1000 64)  [[1]](MLOAD 1000) [[2]](MLOAD 1032) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
-            + Op.MSTORE(
-                offset=0x40,
-                value=0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593F0000000,  # noqa: E501
-            )
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x4C4B40,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x60,
-                    ret_offset=0x3E8,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x3E8))
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x408))
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
+        + Op.MSTORE(
+            offset=0x40,
+            value=0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593F0000000,  # noqa: E501
+        )
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x4C4B40,
+                address=0x7,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x60,
+                ret_offset=0x3E8,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x3E8))
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x408))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
-    # Source: LLL
+    # Source: lll
     # { (MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) [[0]](CALLCODE 5000000 6 0 0 128 1000 64)  [[1]](MLOAD 1000) [[2]](MLOAD 1032) }  # noqa: E501
-    pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x4C4B40,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x3E8,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x3E8))
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x408))
-            + Op.STOP
-        ),
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x4C4B40,
+                address=0x6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x3E8,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x3E8))
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x408))
+        + Op.STOP,
         nonce=0,
-        address=Address("0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
     )
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 1, 2, 3, 4], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 1, 1: 1})},
+        },
+        {
+            "indexes": {"data": -1, "gas": [1, 2, 3], "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={})},
+        },
+        {
+            "indexes": {"data": [5], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 1, 1: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Hash(0x180)
+        + Hash(
+            0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59
+        )
+        + Hash(
+            0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41
+        )
+        + Hash(
+            0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7
+        )
+        + Hash(
+            0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678
+        )
+        + Hash(
+            0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D
+        )
+        + Hash(
+            0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550
+        )
+        + Hash(
+            0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C
+        )
+        + Hash(
+            0x2032C61A830E3C17286DE9462BF242FCA2883585B93870A73853FACE6A6BF411
+        )
+        + Hash(
+            0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2
+        )
+        + Hash(
+            0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED
+        )
+        + Hash(
+            0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B
+        )
+        + Hash(
+            0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA
+        ),
+        Hash(0x180)
+        + Hash(
+            0x2ECA0C7238BF16E83E7A1E6C5D49540685FF51380F309842A98561558019FC02
+        )
+        + Hash(
+            0x3D3260361BB8451DE5FF5ECD17F010FF22F5C31CDF184E9020B06FA5997DB84
+        )
+        + Hash(
+            0x1213D2149B006137FCFB23036606F848D638D576A120CA981B5B1A5F9300B3EE
+        )
+        + Hash(
+            0x2276CF730CF493CD95D64677BBB75FC42DB72513A4C1E387B476D056F80AA75F
+        )
+        + Hash(
+            0x21EE6226D31426322AFCDA621464D0611D226783262E21BB3BC86B537E986237
+        )
+        + Hash(
+            0x96DF1F82DFF337DD5972E32A8AD43E28A78A96A823EF1CD4DEBE12B6552EA5F
+        )
+        + Hash(
+            0x6967A1237EBFECA9AAAE0D6D0BAB8E28C198C5A339EF8A2407E31CDAC516DB9
+        )
+        + Hash(
+            0x22160FA257A5FD5B280642FF47B65ECA77E626CB685C84FA6D3B6882A283DDD1
+        )
+        + Hash(
+            0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2
+        )
+        + Hash(
+            0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED
+        )
+        + Hash(
+            0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B
+        )
+        + Hash(
+            0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA
+        ),
+        Hash(0x180)
+        + Hash(
+            0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2
+        )
+        + Hash(
+            0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA
+        )
+        + Hash(
+            0x2E89718AD33C8BED92E210E81D1853435399A271913A6520736A4729CF0D51EB
+        )
+        + Hash(
+            0x1A9E2FFA2E92599B68E44DE5BCF354FA2642BD4F26B259DAA6F7CE3ED57AEB3
+        )
+        + Hash(
+            0x14A9A87B789A58AF499B314E13C3D65BEDE56C07EA2D418D6874857B70763713
+        )
+        + Hash(
+            0x178FB49A2D6CD347DC58973FF49613A20757D0FCC22079F9ABD10C3BAEE24590
+        )
+        + Hash(
+            0x1B9E027BD5CFC2CB5DB82D4DC9677AC795EC500ECD47DEEE3B5DA006D6D049B8
+        )
+        + Hash(
+            0x11D7511C78158DE484232FC68DAF8A45CF217D1C2FAE693FF5871E8752D73B21
+        )
+        + Hash(
+            0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2
+        )
+        + Hash(
+            0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED
+        )
+        + Hash(
+            0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B
+        )
+        + Hash(
+            0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA
+        ),
+        Hash(0x240)
+        + Hash(
+            0x2F2EA0B3DA1E8EF11914ACF8B2E1B32D99DF51F5F4F206FC6B947EAE860EDDB6
+        )
+        + Hash(
+            0x68134DDB33DC888EF446B648D72338684D678D2EB2371C61A50734D78DA4B72
+        )
+        + Hash(
+            0x25F83C8B6AB9DE74E7DA488EF02645C5A16A6652C3C71A15DC37FE3A5DCB7CB1
+        )
+        + Hash(
+            0x22ACDEDD6308E3BB230D226D16A105295F523A8A02BFC5E8BD2DA135AC4C245D
+        )
+        + Hash(
+            0x65BBAD92E7C4E31BF3757F1FE7362A63FBFEE50E7DC68DA116E67D600D9BF68
+        )
+        + Hash(
+            0x6D302580DC0661002994E7CD3A7F224E7DDC27802777486BF80F40E4CA3CFDB
+        )
+        + Hash(
+            0x186BAC5188A98C45E6016873D107F5CD131F3A3E339D0375E58BD6219347B008
+        )
+        + Hash(
+            0x122AE2B09E539E152EC5364E7E2204B03D11D3CAA038BFC7CD499F8176AACBEE
+        )
+        + Hash(
+            0x1F39E4E4AFC4BC74790A4A028AFF2C3D2538731FB755EDEFD8CB48D6EA589B5E
+        )
+        + Hash(
+            0x283F150794B6736F670D6A1033F9B46C6F5204F50813EB85C8DC4B59DB1C5D39
+        )
+        + Hash(
+            0x140D97EE4D2B36D99BC49974D18ECCA3E7AD51011956051B464D9E27D46CC25E
+        )
+        + Hash(
+            0x764BB98575BD466D32DB7B15F582B2D5C452B36AA394B789366E5E3CA5AABD4
+        )
+        + Hash(
+            0x15794AB061441E51D01E94640B7E3084A07E02C78CF3103C542BC5B298669F21
+        )
+        + Hash(
+            0x1B88DA1679B0B64A63B7E0E7BFE52AAE524F73A55BE7FE70C7E9BFC94B4CF0DA
+        )
+        + Hash(
+            0x1213D2149B006137FCFB23036606F848D638D576A120CA981B5B1A5F9300B3EE
+        )
+        + Hash(
+            0x2276CF730CF493CD95D64677BBB75FC42DB72513A4C1E387B476D056F80AA75F
+        )
+        + Hash(
+            0x21EE6226D31426322AFCDA621464D0611D226783262E21BB3BC86B537E986237
+        )
+        + Hash(
+            0x96DF1F82DFF337DD5972E32A8AD43E28A78A96A823EF1CD4DEBE12B6552EA5F
+        ),
+        Hash(0x240)
+        + Hash(
+            0x20A754D2071D4D53903E3B31A7E98AD6882D58AEC240EF981FDF0A9D22C5926A
+        )
+        + Hash(
+            0x29C853FCEA789887315916BBEB89CA37EDB355B4F980C9A12A94F30DEEED3021
+        )
+        + Hash(
+            0x1213D2149B006137FCFB23036606F848D638D576A120CA981B5B1A5F9300B3EE
+        )
+        + Hash(
+            0x2276CF730CF493CD95D64677BBB75FC42DB72513A4C1E387B476D056F80AA75F
+        )
+        + Hash(
+            0x21EE6226D31426322AFCDA621464D0611D226783262E21BB3BC86B537E986237
+        )
+        + Hash(
+            0x96DF1F82DFF337DD5972E32A8AD43E28A78A96A823EF1CD4DEBE12B6552EA5F
+        )
+        + Hash(
+            0x1ABB4A25EB9379AE96C84FFF9F0540ABCFC0A0D11AEDA02D4F37E4BAF74CB0C1
+        )
+        + Hash(
+            0x1073B3FF2CDBB38755F8691EA59E9606696B3FF278ACFC098FA8226470D03869
+        )
+        + Hash(
+            0x217CEE0A9AD79A4493B5253E2E4E3A39FC2DF38419F230D341F60CB064A0AC29
+        )
+        + Hash(
+            0xA3D76F140DB8418BA512272381446EB73958670F00CF46F1D9E64CBA057B53C
+        )
+        + Hash(
+            0x26F64A8EC70387A13E41430ED3EE4A7DB2059CC5FC13C067194BCC0CB49A9855
+        )
+        + Hash(
+            0x2FD72BD9EDB657346127DA132E5B82AB908F5816C826ACB499E22F2412D1A2D7
+        )
+        + Hash(
+            0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2
+        )
+        + Hash(
+            0x198A1F162A73261F112401AA2DB79C7DAB1533C9935C77290A6CE3B191F2318D
+        )
+        + Hash(
+            0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2
+        )
+        + Hash(
+            0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED
+        )
+        + Hash(
+            0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B
+        )
+        + Hash(
+            0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA
+        ),
+        Hash(0x180)
+        + Hash(
+            0x1C76476F4DEF4BB94541D57EBBA1193381FFA7AA76ADA664DD31C16024C43F59
+        )
+        + Hash(
+            0x3034DD2920F673E204FEE2811C678745FC819B55D3E9D294E45C9B03A76AEF41
+        )
+        + Hash(
+            0x209DD15EBFF5D46C4BD888E51A93CF99A7329636C63514396B4A452003A35BF7
+        )
+        + Hash(
+            0x4BF11CA01483BFA8B34B43561848D28905960114C8AC04049AF4B6315A41678
+        )
+        + Hash(
+            0x2BB8324AF6CFC93537A2AD1A445CFD0CA2A71ACD7AC41FADBF933C2A51BE344D
+        )
+        + Hash(
+            0x120A2A4CF30C1BF9845F20C6FE39E07EA2CCE61F0C9BB048165FE5E4DE877550
+        )
+        + Hash(
+            0x111E129F1CF1097710D41C4AC70FCDFA5BA2023C6FF1CBEAC322DE49D1B6DF7C
+        )
+        + Hash(
+            0x103188585E2364128FE25C70558F1560F4F9350BAF3959E603CC91486E110936
+        )
+        + Hash(
+            0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2
+        )
+        + Hash(
+            0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED
+        )
+        + Hash(
+            0x90689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B
+        )
+        + Hash(
+            0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA
+        ),
+    ]
+    tx_gas = [10000000, 90000, 110000, 150000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_point_add.py b/tests/ported_static/stZeroKnowledge/test_point_add.py
deleted file mode 100644
index 26fbd0ba23c..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_point_add.py
+++ /dev/null
@@ -1,499 +0,0 @@
-"""
-Test ported from static filler.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge/pointAddFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stZeroKnowledge/pointAddFiller.json"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
-    [
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            1000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3,  # noqa: E501
-                        2: 0x15ED738C0E0A7C92E7845F96B2AE9C0A68A6A449E3538FC7FF3EBF7A5A18A2C4,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            110000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3,  # noqa: E501
-                        2: 0x15ED738C0E0A7C92E7845F96B2AE9C0A68A6A449E3538FC7FF3EBF7A5A18A2C4,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3,  # noqa: E501
-                        2: 0x15ED738C0E0A7C92E7845F96B2AE9C0A68A6A449E3538FC7FF3EBF7A5A18A2C4,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            70000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            1000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            110000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            70000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            1000000,
-            {},
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            70000,
-            {},
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            1000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            110000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            70000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            1000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            110000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            70000,
-            {},
-        ),
-        (
-            "0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            1000000,
-            {},
-        ),
-        (
-            "0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            70000,
-            {},
-        ),
-        (
-            "0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            1000000,
-            {},
-        ),
-        (
-            "0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            70000,
-            {},
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            1000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-                        2: 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            110000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-                        2: 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
-                        2: 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            70000,
-            {},
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4",  # noqa: E501
-            1000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                        2: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4",  # noqa: E501
-            110000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                        2: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
-                        2: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4",  # noqa: E501
-            70000,
-            {},
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            1000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0x59A381FEC09E29448A58AE8905F41D1EB8FF0ED755AA0F827821AEFDE02EC7D,  # noqa: E501
-                        2: 0x269D2516BF8C4F5798CC1267162E59ADD561E5537A328FE0F28A252FA287A72A,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            110000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0x59A381FEC09E29448A58AE8905F41D1EB8FF0ED755AA0F827821AEFDE02EC7D,  # noqa: E501
-                        2: 0x269D2516BF8C4F5798CC1267162E59ADD561E5537A328FE0F28A252FA287A72A,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0x59A381FEC09E29448A58AE8905F41D1EB8FF0ED755AA0F827821AEFDE02EC7D,  # noqa: E501
-                        2: 0x269D2516BF8C4F5798CC1267162E59ADD561E5537A328FE0F28A252FA287A72A,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            70000,
-            {},
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_point_add(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=4012015,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    # Source: LLL
-    # {(MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) [[0]](CALLCODE 500000 6 0 0 128 200 64)  [[1]] (MLOAD 200)  [[2]] (MLOAD 232) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0xC8,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xC8))
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0xE8))
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        nonce=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_point_add_trunc.py b/tests/ported_static/stZeroKnowledge/test_point_add_trunc.py
deleted file mode 100644
index ef358f8393d..00000000000
--- a/tests/ported_static/stZeroKnowledge/test_point_add_trunc.py
+++ /dev/null
@@ -1,503 +0,0 @@
-"""
-Test ported from static filler.
-
-Ported from:
-tests/static/state_tests/stZeroKnowledge/pointAddTruncFiller.json
-"""
-
-import pytest
-from execution_testing import (
-    EOA,
-    Account,
-    Address,
-    Alloc,
-    Environment,
-    StateTestFiller,
-    Transaction,
-)
-from execution_testing.vm import Op
-
-REFERENCE_SPEC_GIT_PATH = "N/A"
-REFERENCE_SPEC_VERSION = "N/A"
-
-
-@pytest.mark.ported_from(
-    ["tests/static/state_tests/stZeroKnowledge/pointAddTruncFiller.json"],
-)
-@pytest.mark.valid_from("Cancun")
-@pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
-    [
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            1000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 2}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            110000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 2}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            200000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 2}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            80000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            1000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            110000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            200000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            80000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            1000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            110000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            200000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            80000,
-            {},
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            1000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            110000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            200000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            80000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            1000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            110000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            200000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            80000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1}
-                )
-            },
-        ),
-        (
-            "0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            1000000,
-            {},
-        ),
-        (
-            "0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            200000,
-            {},
-        ),
-        (
-            "0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            80000,
-            {},
-        ),
-        (
-            "0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            1000000,
-            {},
-        ),
-        (
-            "0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            200000,
-            {},
-        ),
-        (
-            "0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25919bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            80000,
-            {},
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            1000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            110000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            200000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba",  # noqa: E501
-            80000,
-            {},
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4",  # noqa: E501
-            1000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4",  # noqa: E501
-            110000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4",  # noqa: E501
-            200000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4",  # noqa: E501
-            80000,
-            {},
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            1000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            110000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            200000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2,  # noqa: E501
-                        2: 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            80000,
-            {},
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_point_add_trunc(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=4012015,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    # Source: LLL
-    # {(MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) [[0]](CALLCODE 500000 6 0 0 64 200 64)  [[1]] (MLOAD 200)  [[2]] (MLOAD 232) }  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x40,
-                    ret_offset=0xC8,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0xC8))
-            + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0xE8))
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
-
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
-
-    tx = Transaction(
-        sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
-        nonce=1,
-    )
-
-    post = expected_post
-
-    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_point_mul_add.py b/tests/ported_static/stZeroKnowledge/test_point_mul_add.py
index ce17a3e2941..85872c32263 100644
--- a/tests/ported_static/stZeroKnowledge/test_point_mul_add.py
+++ b/tests/ported_static/stZeroKnowledge/test_point_mul_add.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_point_mul_add.
 
 Ported from:
-tests/static/state_tests/stZeroKnowledge/pointMulAddFiller.json
+state_tests/stZeroKnowledge/pointMulAddFiller.json
 """
 
 import pytest
@@ -12,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,17 +27,311 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stZeroKnowledge/pointMulAddFiller.json"],
+    ["state_tests/stZeroKnowledge/pointMulAddFiller.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="d0-g2",
+        ),
+        pytest.param(
+            0,
+            3,
+            0,
+            id="d0-g3",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
+        ),
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
+        ),
+        pytest.param(
+            1,
+            2,
+            0,
+            id="d1-g2",
+        ),
+        pytest.param(
+            1,
+            3,
+            0,
+            id="d1-g3",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
+        ),
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
+        ),
+        pytest.param(
+            2,
+            2,
+            0,
+            id="d2-g2",
+        ),
+        pytest.param(
+            2,
+            3,
+            0,
+            id="d2-g3",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
+        ),
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
+        ),
+        pytest.param(
+            3,
+            2,
+            0,
+            id="d3-g2",
+        ),
+        pytest.param(
+            3,
+            3,
+            0,
+            id="d3-g3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
+        ),
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
+        ),
+        pytest.param(
+            4,
+            2,
+            0,
+            id="d4-g2",
+        ),
+        pytest.param(
+            4,
+            3,
+            0,
+            id="d4-g3",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
+        ),
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
+        ),
+        pytest.param(
+            5,
+            2,
+            0,
+            id="d5-g2",
+        ),
+        pytest.param(
+            5,
+            3,
+            0,
+            id="d5-g3",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
+        ),
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
+        ),
+        pytest.param(
+            6,
+            2,
+            0,
+            id="d6-g2",
+        ),
+        pytest.param(
+            6,
+            3,
+            0,
+            id="d6-g3",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
+        ),
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
+        ),
+        pytest.param(
+            7,
+            2,
+            0,
+            id="d7-g2",
+        ),
+        pytest.param(
+            7,
+            3,
+            0,
+            id="d7-g3",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
+        ),
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
+        ),
+        pytest.param(
+            8,
+            2,
+            0,
+            id="d8-g2",
+        ),
+        pytest.param(
+            8,
+            3,
+            0,
+            id="d8-g3",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_point_mul_add(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Test_point_mul_add."""
+    coinbase = Address(0x68795C4AA09D6F4ED3E5DEDDF8C2AD3049A601DA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=4012015,
+    )
+
+    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
+    # Source: lll
+    # {(MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96))  (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) [[0]](CALLCODE 500000 6 0 0 128 300 64)  [[1]](CALLCODE 500000 7 0 128 96 400 64) [[10]] (MLOAD 300)  [[11]] (MLOAD 332) [[20]] (MLOAD 400)  [[21]] (MLOAD 432) [[2]] (EQ (SLOAD 10) (SLOAD 20)) [[3]] (EQ (SLOAD 11) (SLOAD 21))}  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x80))
+        + Op.MSTORE(offset=0xA0, value=Op.CALLDATALOAD(offset=0xA0))
+        + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0xC0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0x6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x12C,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0x7,
+                value=0x0,
+                args_offset=0x80,
+                args_size=0x60,
+                ret_offset=0x190,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xA, value=Op.MLOAD(offset=0x12C))
+        + Op.SSTORE(key=0xB, value=Op.MLOAD(offset=0x14C))
+        + Op.SSTORE(key=0x14, value=Op.MLOAD(offset=0x190))
+        + Op.SSTORE(key=0x15, value=Op.MLOAD(offset=0x1B0))
+        + Op.SSTORE(
+            key=0x2, value=Op.EQ(Op.SLOAD(key=0xA), Op.SLOAD(key=0x14))
+        )
+        + Op.SSTORE(
+            key=0x3, value=Op.EQ(Op.SLOAD(key=0xB), Op.SLOAD(key=0x15))
+        )
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -42,30 +341,15 @@
                         11: 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
                         20: 0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
                         21: 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            192000,
-            {},
-        ),
-        (
-            "1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d40f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [1], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -75,58 +359,20 @@
                         11: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
                         20: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
                         21: 0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d40f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d40f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d40f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba0000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            192000,
-            {},
-        ),
-        (
-            "1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c49018683193ae021a2f8920fed186cde5d9b1365116865281ccf884c1f28b1df8f1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c49018683193ae021a2f8920fed186cde5d9b1365116865281ccf884c1f28b1df8f0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
-        ),
-        (
-            "1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c49018683193ae021a2f8920fed186cde5d9b1365116865281ccf884c1f28b1df8f1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c49018683193ae021a2f8920fed186cde5d9b1365116865281ccf884c1f28b1df8f0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c49018683193ae021a2f8920fed186cde5d9b1365116865281ccf884c1f28b1df8f1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c49018683193ae021a2f8920fed186cde5d9b1365116865281ccf884c1f28b1df8f0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c49018683193ae021a2f8920fed186cde5d9b1365116865281ccf884c1f28b1df8f1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c49018683193ae021a2f8920fed186cde5d9b1365116865281ccf884c1f28b1df8f0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            192000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db80000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [2], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 1, 1: 1, 2: 1, 3: 1})},
+        },
+        {
+            "indexes": {"data": [3], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -136,30 +382,15 @@
                         11: 0x225C5F1623620FD84BFBAB2D861A9D1E570F7727C540F403085998EBAF407C4,  # noqa: E501
                         20: 0x255E468453D7636CC1563E43F7521755F95E6C56043C7321B4AE04E772945FB0,  # noqa: E501
                         21: 0x225C5F1623620FD84BFBAB2D861A9D1E570F7727C540F403085998EBAF407C4,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db80000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db80000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db80000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            192000,
-            {},
-        ),
-        (
-            "1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c49018683193ae021a2f8920fed186cde5d9b1365116865281ccf884c1f28b1df8f30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [4], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -169,30 +400,15 @@
                         11: 0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8,  # noqa: E501
                         20: 0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49,  # noqa: E501
                         21: 0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c49018683193ae021a2f8920fed186cde5d9b1365116865281ccf884c1f28b1df8f30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c49018683193ae021a2f8920fed186cde5d9b1365116865281ccf884c1f28b1df8f30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c49018683193ae021a2f8920fed186cde5d9b1365116865281ccf884c1f28b1df8f30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            192000,
-            {},
-        ),
-        (
-            "1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c49018683193ae021a2f8920fed186cde5d9b1365116865281ccf884c1f28b1df8f30644e72e131a029b85045b68181585d2833e84879b9709143e1f593efffffff",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [5], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -202,30 +418,15 @@
                         11: 0x225C5F1623620FD84BFBAB2D861A9D1E570F7727C540F403085998EBAF407C4,  # noqa: E501
                         20: 0x255E468453D7636CC1563E43F7521755F95E6C56043C7321B4AE04E772945FB0,  # noqa: E501
                         21: 0x225C5F1623620FD84BFBAB2D861A9D1E570F7727C540F403085998EBAF407C4,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c49018683193ae021a2f8920fed186cde5d9b1365116865281ccf884c1f28b1df8f30644e72e131a029b85045b68181585d2833e84879b9709143e1f593efffffff",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c49018683193ae021a2f8920fed186cde5d9b1365116865281ccf884c1f28b1df8f30644e72e131a029b85045b68181585d2833e84879b9709143e1f593efffffff",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "1f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c492eddcb59a6517e86bfbe35c9691479fffc6e0580000ca2706c983ff7afcb1db81f4d1d80177b1377743d1901f70d7389be7f7a35a35bfd234a8aaee615b88c49018683193ae021a2f8920fed186cde5d9b1365116865281ccf884c1f28b1df8f30644e72e131a029b85045b68181585d2833e84879b9709143e1f593efffffff",  # noqa: E501
-            192000,
-            {},
-        ),
-        (
-            "1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d40000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [6], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -235,56 +436,15 @@
                         11: 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
                         20: 0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286,  # noqa: E501
                         21: 0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d40000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d40000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "1de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001de49a4b0233273bba8146af82042d004f2085ec982397db0d97da17204cc2860217327ffc463919bef80cc166d09c6172639d8589799928761bcd9f22c903d40000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            192000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 1,
-                        10: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3,  # noqa: E501
-                        11: 0x15ED738C0E0A7C92E7845F96B2AE9C0A68A6A449E3538FC7FF3EBF7A5A18A2C4,  # noqa: E501
-                        20: 1,
-                        21: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            192000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [7], "gas": [0, 3], "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -292,165 +452,190 @@
                         11: 0x15ED738C0E0A7C92E7845F96B2AE9C0A68A6A449E3538FC7FF3EBF7A5A18A2C4,  # noqa: E501
                         20: 1,
                         21: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            192000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
+                    },
+                ),
             },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_point_mul_add(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
+        },
+        {
+            "indexes": {"data": [8], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 1, 1: 1, 2: 1, 3: 1})},
+        },
+        {
+            "indexes": {"data": -1, "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={})},
+        },
+        {
+            "indexes": {"data": [0, 1, 3, 4, 5, 6], "gas": [3], "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={})},
+        },
+        {
+            "indexes": {"data": [8, 2], "gas": [3], "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 1, 1: 1, 2: 1, 3: 1})},
+        },
+    ]
 
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=4012015,
-    )
-
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    # Source: LLL
-    # {(MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96))  (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) [[0]](CALLCODE 500000 6 0 0 128 300 64)  [[1]](CALLCODE 500000 7 0 128 96 400 64) [[10]] (MLOAD 300)  [[11]] (MLOAD 332) [[20]] (MLOAD 400)  [[21]] (MLOAD 432) [[2]] (EQ (SLOAD 10) (SLOAD 20)) [[3]] (EQ (SLOAD 11) (SLOAD 21))}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x80))
-            + Op.MSTORE(offset=0xA0, value=Op.CALLDATALOAD(offset=0xA0))
-            + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0xC0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x12C,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x80,
-                    args_size=0x60,
-                    ret_offset=0x190,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xA, value=Op.MLOAD(offset=0x12C))
-            + Op.SSTORE(key=0xB, value=Op.MLOAD(offset=0x14C))
-            + Op.SSTORE(key=0x14, value=Op.MLOAD(offset=0x190))
-            + Op.SSTORE(key=0x15, value=Op.MLOAD(offset=0x1B0))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.EQ(Op.SLOAD(key=0xA), Op.SLOAD(key=0x14)),
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.EQ(Op.SLOAD(key=0xB), Op.SLOAD(key=0x15)),
-            )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2)
+        + Hash(
+            0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA
+        )
+        + Hash(
+            0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2
+        )
+        + Hash(
+            0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA
+        )
+        + Hash(
+            0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2
+        )
+        + Hash(
+            0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA
+        )
+        + Hash(0x2),
+        Hash(
+            0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286
+        )
+        + Hash(
+            0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4
+        )
+        + Hash(
+            0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2
+        )
+        + Hash(
+            0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA
+        )
+        + Hash(
+            0xF25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2
+        )
+        + Hash(
+            0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA
+        )
+        + Hash(0x3),
+        Hash(
+            0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49
+        )
+        + Hash(
+            0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8
+        )
+        + Hash(
+            0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49
+        )
+        + Hash(
+            0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F
+        )
+        + Hash(
+            0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49
+        )
+        + Hash(
+            0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F
+        )
+        + Hash(0x0),
+        Hash(
+            0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49
+        )
+        + Hash(
+            0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8
+        )
+        + Hash(
+            0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49
+        )
+        + Hash(
+            0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8
+        )
+        + Hash(
+            0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49
+        )
+        + Hash(
+            0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8
+        )
+        + Hash(0x2),
+        Hash(
+            0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49
+        )
+        + Hash(
+            0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8
+        )
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(
+            0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49
+        )
+        + Hash(
+            0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F
+        )
+        + Hash(
+            0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593F0000000
+        ),
+        Hash(
+            0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49
+        )
+        + Hash(
+            0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8
+        )
+        + Hash(
+            0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49
+        )
+        + Hash(
+            0x2EDDCB59A6517E86BFBE35C9691479FFFC6E0580000CA2706C983FF7AFCB1DB8
+        )
+        + Hash(
+            0x1F4D1D80177B1377743D1901F70D7389BE7F7A35A35BFD234A8AAEE615B88C49
+        )
+        + Hash(
+            0x18683193AE021A2F8920FED186CDE5D9B1365116865281CCF884C1F28B1DF8F
+        )
+        + Hash(
+            0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593EFFFFFFF
+        ),
+        Hash(
+            0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286
+        )
+        + Hash(
+            0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4
+        )
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(
+            0x1DE49A4B0233273BBA8146AF82042D004F2085EC982397DB0D97DA17204CC286
+        )
+        + Hash(
+            0x217327FFC463919BEF80CC166D09C6172639D8589799928761BCD9F22C903D4
+        )
+        + Hash(0x1),
+        Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593F0000000
+        ),
+        Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x0),
+    ]
+    tx_gas = [2000000, 90000, 110000, 192000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/stZeroKnowledge/test_point_mul_add2.py b/tests/ported_static/stZeroKnowledge/test_point_mul_add2.py
index 8b5588e7aba..7722b69ba5a 100644
--- a/tests/ported_static/stZeroKnowledge/test_point_mul_add2.py
+++ b/tests/ported_static/stZeroKnowledge/test_point_mul_add2.py
@@ -1,8 +1,8 @@
 """
-Test ported from static filler.
+Test_point_mul_add2.
 
 Ported from:
-tests/static/state_tests/stZeroKnowledge/pointMulAdd2Filler.json
+state_tests/stZeroKnowledge/pointMulAdd2Filler.json
 """
 
 import pytest
@@ -12,9 +12,14 @@
     Address,
     Alloc,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
 from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
@@ -22,73 +27,1016 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/stZeroKnowledge/pointMulAdd2Filler.json"],
+    ["state_tests/stZeroKnowledge/pointMulAdd2Filler.json"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.parametrize(
-    "tx_data_hex, tx_gas_limit, expected_post",
+    "d, g, v",
     [
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
+        pytest.param(
+            0,
+            0,
+            0,
+            id="d0-g0",
+        ),
+        pytest.param(
+            0,
+            1,
+            0,
+            id="d0-g1",
+        ),
+        pytest.param(
+            0,
+            2,
+            0,
+            id="d0-g2",
+        ),
+        pytest.param(
+            0,
+            3,
+            0,
+            id="d0-g3",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="d1-g0",
+        ),
+        pytest.param(
+            1,
+            1,
+            0,
+            id="d1-g1",
+        ),
+        pytest.param(
+            1,
+            2,
+            0,
+            id="d1-g2",
+        ),
+        pytest.param(
+            1,
+            3,
+            0,
+            id="d1-g3",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="d2-g0",
+        ),
+        pytest.param(
+            2,
+            1,
+            0,
+            id="d2-g1",
+        ),
+        pytest.param(
+            2,
+            2,
+            0,
+            id="d2-g2",
+        ),
+        pytest.param(
+            2,
+            3,
+            0,
+            id="d2-g3",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="d3-g0",
+        ),
+        pytest.param(
+            3,
+            1,
+            0,
+            id="d3-g1",
+        ),
+        pytest.param(
+            3,
+            2,
+            0,
+            id="d3-g2",
+        ),
+        pytest.param(
+            3,
+            3,
+            0,
+            id="d3-g3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="d4-g0",
+        ),
+        pytest.param(
+            4,
+            1,
+            0,
+            id="d4-g1",
+        ),
+        pytest.param(
+            4,
+            2,
+            0,
+            id="d4-g2",
+        ),
+        pytest.param(
+            4,
+            3,
+            0,
+            id="d4-g3",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="d5-g0",
+        ),
+        pytest.param(
+            5,
+            1,
+            0,
+            id="d5-g1",
+        ),
+        pytest.param(
+            5,
+            2,
+            0,
+            id="d5-g2",
+        ),
+        pytest.param(
+            5,
+            3,
+            0,
+            id="d5-g3",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="d6-g0",
+        ),
+        pytest.param(
+            6,
+            1,
+            0,
+            id="d6-g1",
+        ),
+        pytest.param(
+            6,
+            2,
+            0,
+            id="d6-g2",
+        ),
+        pytest.param(
+            6,
+            3,
+            0,
+            id="d6-g3",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="d7-g0",
+        ),
+        pytest.param(
+            7,
+            1,
+            0,
+            id="d7-g1",
+        ),
+        pytest.param(
+            7,
+            2,
+            0,
+            id="d7-g2",
+        ),
+        pytest.param(
+            7,
+            3,
+            0,
+            id="d7-g3",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="d8-g0",
+        ),
+        pytest.param(
+            8,
+            1,
+            0,
+            id="d8-g1",
+        ),
+        pytest.param(
+            8,
+            2,
+            0,
+            id="d8-g2",
+        ),
+        pytest.param(
+            8,
+            3,
+            0,
+            id="d8-g3",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="d9-g0",
+        ),
+        pytest.param(
+            9,
+            1,
+            0,
+            id="d9-g1",
+        ),
+        pytest.param(
+            9,
+            2,
+            0,
+            id="d9-g2",
+        ),
+        pytest.param(
+            9,
+            3,
+            0,
+            id="d9-g3",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="d10-g0",
+        ),
+        pytest.param(
+            10,
+            1,
+            0,
+            id="d10-g1",
+        ),
+        pytest.param(
+            10,
+            2,
+            0,
+            id="d10-g2",
+        ),
+        pytest.param(
+            10,
+            3,
+            0,
+            id="d10-g3",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="d11-g0",
+        ),
+        pytest.param(
+            11,
+            1,
+            0,
+            id="d11-g1",
+        ),
+        pytest.param(
+            11,
+            2,
+            0,
+            id="d11-g2",
+        ),
+        pytest.param(
+            11,
+            3,
+            0,
+            id="d11-g3",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="d12-g0",
+        ),
+        pytest.param(
+            12,
+            1,
+            0,
+            id="d12-g1",
+        ),
+        pytest.param(
+            12,
+            2,
+            0,
+            id="d12-g2",
+        ),
+        pytest.param(
+            12,
+            3,
+            0,
+            id="d12-g3",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="d13-g0",
+        ),
+        pytest.param(
+            13,
+            1,
+            0,
+            id="d13-g1",
+        ),
+        pytest.param(
+            13,
+            2,
+            0,
+            id="d13-g2",
+        ),
+        pytest.param(
+            13,
+            3,
+            0,
+            id="d13-g3",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="d14-g0",
+        ),
+        pytest.param(
+            14,
+            1,
+            0,
+            id="d14-g1",
+        ),
+        pytest.param(
+            14,
+            2,
+            0,
+            id="d14-g2",
+        ),
+        pytest.param(
+            14,
+            3,
+            0,
+            id="d14-g3",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="d15-g0",
+        ),
+        pytest.param(
+            15,
+            1,
+            0,
+            id="d15-g1",
+        ),
+        pytest.param(
+            15,
+            2,
+            0,
+            id="d15-g2",
+        ),
+        pytest.param(
+            15,
+            3,
+            0,
+            id="d15-g3",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="d16-g0",
+        ),
+        pytest.param(
+            16,
+            1,
+            0,
+            id="d16-g1",
+        ),
+        pytest.param(
+            16,
+            2,
+            0,
+            id="d16-g2",
+        ),
+        pytest.param(
+            16,
+            3,
+            0,
+            id="d16-g3",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="d17-g0",
+        ),
+        pytest.param(
+            17,
+            1,
+            0,
+            id="d17-g1",
+        ),
+        pytest.param(
+            17,
+            2,
+            0,
+            id="d17-g2",
+        ),
+        pytest.param(
+            17,
+            3,
+            0,
+            id="d17-g3",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="d18-g0",
+        ),
+        pytest.param(
+            18,
+            1,
+            0,
+            id="d18-g1",
+        ),
+        pytest.param(
+            18,
+            2,
+            0,
+            id="d18-g2",
+        ),
+        pytest.param(
+            18,
+            3,
+            0,
+            id="d18-g3",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="d19-g0",
+        ),
+        pytest.param(
+            19,
+            1,
+            0,
+            id="d19-g1",
+        ),
+        pytest.param(
+            19,
+            2,
+            0,
+            id="d19-g2",
+        ),
+        pytest.param(
+            19,
+            3,
+            0,
+            id="d19-g3",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="d20-g0",
+        ),
+        pytest.param(
+            20,
+            1,
+            0,
+            id="d20-g1",
+        ),
+        pytest.param(
+            20,
+            2,
+            0,
+            id="d20-g2",
+        ),
+        pytest.param(
+            20,
+            3,
+            0,
+            id="d20-g3",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="d21-g0",
+        ),
+        pytest.param(
+            21,
+            1,
+            0,
+            id="d21-g1",
+        ),
+        pytest.param(
+            21,
+            2,
+            0,
+            id="d21-g2",
+        ),
+        pytest.param(
+            21,
+            3,
+            0,
+            id="d21-g3",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="d22-g0",
+        ),
+        pytest.param(
+            22,
+            1,
+            0,
+            id="d22-g1",
+        ),
+        pytest.param(
+            22,
+            2,
+            0,
+            id="d22-g2",
+        ),
+        pytest.param(
+            22,
+            3,
+            0,
+            id="d22-g3",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="d23-g0",
+        ),
+        pytest.param(
+            23,
+            1,
+            0,
+            id="d23-g1",
+        ),
+        pytest.param(
+            23,
+            2,
+            0,
+            id="d23-g2",
+        ),
+        pytest.param(
+            23,
+            3,
+            0,
+            id="d23-g3",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="d24-g0",
+        ),
+        pytest.param(
+            24,
+            1,
+            0,
+            id="d24-g1",
+        ),
+        pytest.param(
+            24,
+            2,
+            0,
+            id="d24-g2",
+        ),
+        pytest.param(
+            24,
+            3,
+            0,
+            id="d24-g3",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="d25-g0",
+        ),
+        pytest.param(
+            25,
+            1,
+            0,
+            id="d25-g1",
+        ),
+        pytest.param(
+            25,
+            2,
+            0,
+            id="d25-g2",
+        ),
+        pytest.param(
+            25,
+            3,
+            0,
+            id="d25-g3",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="d26-g0",
+        ),
+        pytest.param(
+            26,
+            1,
+            0,
+            id="d26-g1",
+        ),
+        pytest.param(
+            26,
+            2,
+            0,
+            id="d26-g2",
+        ),
+        pytest.param(
+            26,
+            3,
+            0,
+            id="d26-g3",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="d27-g0",
+        ),
+        pytest.param(
+            27,
+            1,
+            0,
+            id="d27-g1",
+        ),
+        pytest.param(
+            27,
+            2,
+            0,
+            id="d27-g2",
+        ),
+        pytest.param(
+            27,
+            3,
+            0,
+            id="d27-g3",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="d28-g0",
+        ),
+        pytest.param(
+            28,
+            1,
+            0,
+            id="d28-g1",
+        ),
+        pytest.param(
+            28,
+            2,
+            0,
+            id="d28-g2",
+        ),
+        pytest.param(
+            28,
+            3,
+            0,
+            id="d28-g3",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="d29-g0",
+        ),
+        pytest.param(
+            29,
+            1,
+            0,
+            id="d29-g1",
+        ),
+        pytest.param(
+            29,
+            2,
+            0,
+            id="d29-g2",
+        ),
+        pytest.param(
+            29,
+            3,
+            0,
+            id="d29-g3",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="d30-g0",
+        ),
+        pytest.param(
+            30,
+            1,
+            0,
+            id="d30-g1",
+        ),
+        pytest.param(
+            30,
+            2,
+            0,
+            id="d30-g2",
+        ),
+        pytest.param(
+            30,
+            3,
+            0,
+            id="d30-g3",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="d31-g0",
+        ),
+        pytest.param(
+            31,
+            1,
+            0,
+            id="d31-g1",
+        ),
+        pytest.param(
+            31,
+            2,
+            0,
+            id="d31-g2",
+        ),
+        pytest.param(
+            31,
+            3,
+            0,
+            id="d31-g3",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="d32-g0",
+        ),
+        pytest.param(
+            32,
+            1,
+            0,
+            id="d32-g1",
+        ),
+        pytest.param(
+            32,
+            2,
+            0,
+            id="d32-g2",
+        ),
+        pytest.param(
+            32,
+            3,
+            0,
+            id="d32-g3",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="d33-g0",
+        ),
+        pytest.param(
+            33,
+            1,
+            0,
+            id="d33-g1",
+        ),
+        pytest.param(
+            33,
+            2,
+            0,
+            id="d33-g2",
+        ),
+        pytest.param(
+            33,
+            3,
+            0,
+            id="d33-g3",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="d34-g0",
+        ),
+        pytest.param(
+            34,
+            1,
+            0,
+            id="d34-g1",
+        ),
+        pytest.param(
+            34,
+            2,
+            0,
+            id="d34-g2",
+        ),
+        pytest.param(
+            34,
+            3,
+            0,
+            id="d34-g3",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="d35-g0",
+        ),
+        pytest.param(
+            35,
+            1,
+            0,
+            id="d35-g1",
+        ),
+        pytest.param(
+            35,
+            2,
+            0,
+            id="d35-g2",
+        ),
+        pytest.param(
+            35,
+            3,
+            0,
+            id="d35-g3",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="d36-g0",
+        ),
+        pytest.param(
+            36,
+            1,
+            0,
+            id="d36-g1",
+        ),
+        pytest.param(
+            36,
+            2,
+            0,
+            id="d36-g2",
+        ),
+        pytest.param(
+            36,
+            3,
+            0,
+            id="d36-g3",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="d37-g0",
+        ),
+        pytest.param(
+            37,
+            1,
+            0,
+            id="d37-g1",
+        ),
+        pytest.param(
+            37,
+            2,
+            0,
+            id="d37-g2",
+        ),
+        pytest.param(
+            37,
+            3,
+            0,
+            id="d37-g3",
         ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_point_mul_add2(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Test_point_mul_add2."""
+    coinbase = Address(0x68795C4AA09D6F4ED3E5DEDDF8C2AD3049A601DA)
+    contract_0 = Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=4012015,
+    )
+
+    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
+    # Source: lll
+    # {(MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96))  (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) [[0]](CALLCODE 500000 6 0 0 128 300 64)  [[1]](CALLCODE 500000 7 0 128 96 400 64) [[10]] (MLOAD 300)  [[11]] (MLOAD 332) [[20]] (MLOAD 400)  [[21]] (MLOAD 432) [[2]] (EQ (SLOAD 10) (SLOAD 20)) [[3]] (EQ (SLOAD 11) (SLOAD 21))}  # noqa: E501
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
+        + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
+        + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
+        + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60))
+        + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x80))
+        + Op.MSTORE(offset=0xA0, value=Op.CALLDATALOAD(offset=0xA0))
+        + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0xC0))
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0x6,
+                value=0x0,
+                args_offset=0x0,
+                args_size=0x80,
+                ret_offset=0x12C,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(
+            key=0x1,
+            value=Op.CALLCODE(
+                gas=0x7A120,
+                address=0x7,
+                value=0x0,
+                args_offset=0x80,
+                args_size=0x60,
+                ret_offset=0x190,
+                ret_size=0x40,
+            ),
+        )
+        + Op.SSTORE(key=0xA, value=Op.MLOAD(offset=0x12C))
+        + Op.SSTORE(key=0xB, value=Op.MLOAD(offset=0x14C))
+        + Op.SSTORE(key=0x14, value=Op.MLOAD(offset=0x190))
+        + Op.SSTORE(key=0x15, value=Op.MLOAD(offset=0x1B0))
+        + Op.SSTORE(
+            key=0x2, value=Op.EQ(Op.SLOAD(key=0xA), Op.SLOAD(key=0x14))
+        )
+        + Op.SSTORE(
+            key=0x3, value=Op.EQ(Op.SLOAD(key=0xB), Op.SLOAD(key=0x15))
+        )
+        + Op.STOP,
+        nonce=0,
+        address=Address(0xB94F5374FCE5EDBC8E2A8697C15331677E6EBF0B),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 12, 26],
+                "gas": [0],
+                "value": -1,
             },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 1, 1: 1, 2: 1, 3: 1})},
+        },
+        {
+            "indexes": {"data": [10], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -98,30 +1046,15 @@
                         11: 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83,  # noqa: E501
                         20: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3,  # noqa: E501
                         21: 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [11], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -131,58 +1064,15 @@
                         11: 0x5ACB4B400E90C0063006A39F478F3E865E306DD5CD56F356E2E8CD8FE7EDAE6,  # noqa: E501
                         20: 0x769BF9AC56BEA3FF40232BCB1B6BD159315D84715B8E679F2D355961915ABF0,  # noqa: E501
                         21: 0x5ACB4B400E90C0063006A39F478F3E865E306DD5CD56F356E2E8CD8FE7EDAE6,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [13, 15], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -192,30 +1082,15 @@
                         11: 0x15ED738C0E0A7C92E7845F96B2AE9C0A68A6A449E3538FC7FF3EBF7A5A18A2C4,  # noqa: E501
                         20: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3,  # noqa: E501
                         21: 0x15ED738C0E0A7C92E7845F96B2AE9C0A68A6A449E3538FC7FF3EBF7A5A18A2C4,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [14], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -225,63 +1100,15 @@
                         11: 2,
                         20: 1,
                         21: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d2833e84879b9709143e1f593efffffff",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 1,
-                        2: 1,
-                        3: 1,
-                        10: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3,  # noqa: E501
-                        11: 0x15ED738C0E0A7C92E7845F96B2AE9C0A68A6A449E3538FC7FF3EBF7A5A18A2C4,  # noqa: E501
-                        20: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3,  # noqa: E501
-                        21: 0x15ED738C0E0A7C92E7845F96B2AE9C0A68A6A449E3538FC7FF3EBF7A5A18A2C4,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d2833e84879b9709143e1f593efffffff",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d2833e84879b9709143e1f593efffffff",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d2833e84879b9709143e1f593efffffff",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [16], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -291,68 +1118,29 @@
                         11: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45,  # noqa: E501
                         20: 1,
                         21: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 1,
-                        10: 0x113AECCECDAF57CD8C0AACE591774949DCDAF892555FA86726FA7E679B89C067,  # noqa: E501
-                        11: 0xBFFBA84127A19ABDE488A8251A9A3FCE33B34A76F96AAFB11AB4A6CEF3E9979,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [17], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
                         10: 0x113AECCECDAF57CD8C0AACE591774949DCDAF892555FA86726FA7E679B89C067,  # noqa: E501
                         11: 0xBFFBA84127A19ABDE488A8251A9A3FCE33B34A76F96AAFB11AB4A6CEF3E9979,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [18], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -362,30 +1150,15 @@
                         11: 0x29CE3D80A74DDC13784BEB25CA9FBFD048A3265A32C6F38B92060C5093A0E7A7,  # noqa: E501
                         20: 0x1FD3B816D9951DCB9AA9797D25E51A865987703AE83CD69C4658679F0350AE2B,  # noqa: E501
                         21: 0x29CE3D80A74DDC13784BEB25CA9FBFD048A3265A32C6F38B92060C5093A0E7A7,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [19], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -395,58 +1168,15 @@
                         11: 0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD,  # noqa: E501
                         20: 0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628,  # noqa: E501
                         21: 0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [20], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -454,68 +1184,29 @@
                         11: 0x29CE3D80A74DDC13784BEB25CA9FBFD048A3265A32C6F38B92060C5093A0E7A7,  # noqa: E501
                         20: 0x2C15ED1902E189486AB6B625AA982510AEF6246B21A1E1BCEA382DA4D735E8BA,  # noqa: E501
                         21: 0x2103E58CBD2FA8081763442AB46C26A9B8051E9B049C3948C8D7D0E139C5E3F,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e5628069ef5e376c0a1ea82f9dfc2e0001a7f385d655eef9a6f976c7a5d2c493ea3ad000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 1,
-                        10: 0x1D78954C630B3895FBBFAFAC1294F2C0158879FDC70BFE18222890E7BFB66FBA,  # noqa: E501
-                        11: 0x101C3346E98B136A7078AEBD427DCED763722D77E3D7985342E0BFFCC6EA4D56,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [21], "gas": [0, 3], "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
                         10: 0x1D78954C630B3895FBBFAFAC1294F2C0158879FDC70BFE18222890E7BFB66FBA,  # noqa: E501
                         11: 0x101C3346E98B136A7078AEBD427DCED763722D77E3D7985342E0BFFCC6EA4D56,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b00000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [22], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -525,30 +1216,15 @@
                         11: 0x1EED5D5325C31FC89DD541A13D7F63B981FAE8D4BF78A6B08A38A601FCFEA97B,  # noqa: E501
                         20: 0x2FA739D4CDE056D8FD75427345CBB34159856E06A4FFAD64159C4773F23FBF4B,  # noqa: E501
                         21: 0x1EED5D5325C31FC89DD541A13D7F63B981FAE8D4BF78A6B08A38A601FCFEA97B,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b00000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b00000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b00000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [23], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -558,30 +1234,15 @@
                         11: 0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0,  # noqa: E501
                         20: 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352,  # noqa: E501
                         21: 0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [24], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -589,30 +1250,15 @@
                         11: 0x1EED5D5325C31FC89DD541A13D7F63B981FAE8D4BF78A6B08A38A601FCFEA97B,  # noqa: E501
                         20: 0x8E2142845DB159BD105879A109FE7A6F254ED3DDAE0E9CD8A2AEAE05E5F647B,  # noqa: E501
                         21: 0x221108EE615499D2E0A1113CA1A858A34E055F9DA2D30E6E6AB392B049944A92,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b02f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d3521d701ec9e3fca50e84777f0f68caff5bff48cf6a6bd4428462ae9366cf0582b0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd315ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [25], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -622,58 +1268,15 @@
                         11: 0x2AB799BEE0489429554FDB7C8D086475319E63B40B9C5B57CDF1FF3DD9FE2261,  # noqa: E501
                         20: 0x769BF9AC56BEA3FF40232BCB1B6BD159315D84715B8E679F2D355961915ABF0,  # noqa: E501
                         21: 0x2AB799BEE0489429554FDB7C8D086475319E63B40B9C5B57CDF1FF3DD9FE2261,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd315ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd315ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd315ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [27], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -683,30 +1286,15 @@
                         11: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45,  # noqa: E501
                         20: 1,
                         21: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593efffffff",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [28], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -716,30 +1304,15 @@
                         11: 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83,  # noqa: E501
                         20: 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3,  # noqa: E501
                         21: 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593efffffff",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593efffffff",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593efffffff",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [29], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -749,96 +1322,29 @@
                         11: 2,
                         20: 1,
                         21: 2,
-                    }
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 1,
-                        10: 0x113AECCECDAF57CD8C0AACE591774949DCDAF892555FA86726FA7E679B89C067,  # noqa: E501
-                        11: 0x246493EECEB7867DDA07BB342FD7B460B44635E9F8DB1F922A7541A9E93E63CE,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [30], "gas": [0, 3], "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
                         10: 0x113AECCECDAF57CD8C0AACE591774949DCDAF892555FA86726FA7E679B89C067,  # noqa: E501
                         11: 0x246493EECEB7867DDA07BB342FD7B460B44635E9F8DB1F922A7541A9E93E63CE,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [31], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -848,30 +1354,15 @@
                         11: 0x69610F239E3C41640045A90B6E1988D4EDE443735AAD701AA1A7FC644DC15A0,  # noqa: E501
                         20: 0x1FD3B816D9951DCB9AA9797D25E51A865987703AE83CD69C4658679F0350AE2B,  # noqa: E501
                         21: 0x69610F239E3C41640045A90B6E1988D4EDE443735AAD701AA1A7FC644DC15A0,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [32], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -881,30 +1372,15 @@
                         11: 0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A,  # noqa: E501
                         20: 0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628,  # noqa: E501
                         21: 0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [33], "gas": [0], "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -912,68 +1388,29 @@
                         11: 0x69610F239E3C41640045A90B6E1988D4EDE443735AAD701AA1A7FC644DC15A0,  # noqa: E501
                         20: 0x2C15ED1902E189486AB6B625AA982510AEF6246B21A1E1BCEA382DA4D735E8BA,  # noqa: E501
                         21: 0x2E54101A155EA5A936DA1173D63A95F2FC0118A7B82806F8AF930F08C4E09F08,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0ccbec17235f5b9cc5e42f3df6364a76ecdd0101ddda8fc5dc0ba0b59c0e562829c5588f6a70fe3f355665f3a1813dde5f24053278d75af5cfa62eea8f3e599a0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a9700000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={
-                        0: 1,
-                        1: 1,
-                        10: 0x1D78954C630B3895FBBFAFAC1294F2C0158879FDC70BFE18222890E7BFB66FBA,  # noqa: E501
-                        11: 0x20481B2BF7A68CBF47D796F93F038986340F3D19849A3239F93FCC1A1192AFF1,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a9700000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a9700000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a9700000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [34], "gas": [0, 3], "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
                         10: 0x1D78954C630B3895FBBFAFAC1294F2C0158879FDC70BFE18222890E7BFB66FBA,  # noqa: E501
                         11: 0x20481B2BF7A68CBF47D796F93F038986340F3D19849A3239F93FCC1A1192AFF1,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a972f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a972f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a970000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [35], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -983,30 +1420,15 @@
                         11: 0x1176F11FBB6E80611A7B04154401F4A4158681BCA8F923DCB1E7E614DB7E53CC,  # noqa: E501
                         20: 0x2FA739D4CDE056D8FD75427345CBB34159856E06A4FFAD64159C4773F23FBF4B,  # noqa: E501
                         21: 0x1176F11FBB6E80611A7B04154401F4A4158681BCA8F923DCB1E7E614DB7E53CC,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a972f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a972f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a970000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a972f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a972f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a970000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a972f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a972f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a970000000000000000000000000000000000000000000000000000000000000002",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a970000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [36], "gas": 0, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -1016,30 +1438,15 @@
                         11: 0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97,  # noqa: E501
                         20: 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352,  # noqa: E501
                         21: 0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97,  # noqa: E501
-                    }
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a970000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a970000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a970000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a972f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a9700000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
+        },
+        {
+            "indexes": {"data": [37], "gas": [0], "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
                     storage={
                         0: 1,
                         1: 1,
@@ -1047,436 +1454,533 @@
                         11: 0x1176F11FBB6E80611A7B04154401F4A4158681BCA8F923DCB1E7E614DB7E53CC,  # noqa: E501
                         20: 0x8E2142845DB159BD105879A109FE7A6F254ED3DDAE0E9CD8A2AEAE05E5F647B,  # noqa: E501
                         21: 0xE5345847FDD0656D7AF3479DFD8FFBA497C0AF3C59EBC1ED16CF9668EE8B2B5,  # noqa: E501
-                    }
-                )
-            },
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a972f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a9700000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a972f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a9700000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "2f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a972f588cffe99db877a4434b598ab28f81e0522910ea52b45f0adaa772b2d5d35212f42fa8fd34fb1b33d8c6a718b6590198389b26fc9d8808d971f8b009777a9700000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            150000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593efffffff",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593efffffff",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593efffffff",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593efffffff",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
-            },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
+                    },
+                ),
             },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
+        },
+        {
+            "indexes": {"data": -1, "gas": [1, 2], "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={})},
+        },
+        {
+            "indexes": {
+                "data": [
+                    32,
+                    35,
+                    36,
+                    10,
+                    11,
+                    13,
+                    14,
+                    15,
+                    16,
+                    18,
+                    19,
+                    22,
+                    23,
+                    25,
+                    27,
+                    28,
+                    29,
+                ],
+                "gas": [3],
+                "value": -1,
             },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            2000000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={})},
+        },
+        {
+            "indexes": {
+                "data": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 12, 26],
+                "gas": [3],
+                "value": -1,
             },
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            90000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            110000,
-            {},
-        ),
-        (
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",  # noqa: E501
-            150000,
-            {
-                Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"): Account(
-                    storage={0: 1, 1: 1, 2: 1, 3: 1}
-                )
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 1, 1: 1, 2: 1, 3: 1})},
+        },
+        {
+            "indexes": {"data": [17], "gas": [3], "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={
+                        0: 1,
+                        1: 1,
+                        10: 0x113AECCECDAF57CD8C0AACE591774949DCDAF892555FA86726FA7E679B89C067,  # noqa: E501
+                        11: 0xBFFBA84127A19ABDE488A8251A9A3FCE33B34A76F96AAFB11AB4A6CEF3E9979,  # noqa: E501
+                    },
+                ),
             },
-        ),
-    ],
-    ids=[
-        "case0",
-        "case1",
-        "case2",
-        "case3",
-        "case4",
-        "case5",
-        "case6",
-        "case7",
-        "case8",
-        "case9",
-        "case10",
-        "case11",
-        "case12",
-        "case13",
-        "case14",
-        "case15",
-        "case16",
-        "case17",
-        "case18",
-        "case19",
-        "case20",
-        "case21",
-        "case22",
-        "case23",
-        "case24",
-        "case25",
-        "case26",
-        "case27",
-        "case28",
-        "case29",
-        "case30",
-        "case31",
-        "case32",
-        "case33",
-        "case34",
-        "case35",
-        "case36",
-        "case37",
-        "case38",
-        "case39",
-        "case40",
-        "case41",
-        "case42",
-        "case43",
-        "case44",
-        "case45",
-        "case46",
-        "case47",
-        "case48",
-        "case49",
-        "case50",
-        "case51",
-        "case52",
-        "case53",
-        "case54",
-        "case55",
-        "case56",
-        "case57",
-        "case58",
-        "case59",
-        "case60",
-        "case61",
-        "case62",
-        "case63",
-        "case64",
-        "case65",
-        "case66",
-        "case67",
-        "case68",
-        "case69",
-        "case70",
-        "case71",
-        "case72",
-        "case73",
-        "case74",
-        "case75",
-        "case76",
-        "case77",
-        "case78",
-        "case79",
-        "case80",
-        "case81",
-        "case82",
-        "case83",
-        "case84",
-        "case85",
-        "case86",
-        "case87",
-        "case88",
-        "case89",
-        "case90",
-        "case91",
-        "case92",
-        "case93",
-        "case94",
-        "case95",
-        "case96",
-        "case97",
-        "case98",
-        "case99",
-        "case100",
-        "case101",
-        "case102",
-        "case103",
-        "case104",
-        "case105",
-        "case106",
-        "case107",
-        "case108",
-        "case109",
-        "case110",
-        "case111",
-        "case112",
-        "case113",
-        "case114",
-        "case115",
-        "case116",
-        "case117",
-        "case118",
-        "case119",
-        "case120",
-        "case121",
-        "case122",
-        "case123",
-        "case124",
-        "case125",
-        "case126",
-        "case127",
-        "case128",
-        "case129",
-        "case130",
-        "case131",
-        "case132",
-        "case133",
-        "case134",
-        "case135",
-        "case136",
-        "case137",
-        "case138",
-        "case139",
-        "case140",
-        "case141",
-        "case142",
-        "case143",
-        "case144",
-        "case145",
-        "case146",
-        "case147",
-        "case148",
-        "case149",
-        "case150",
-        "case151",
-    ],
-)
-@pytest.mark.pre_alloc_mutable
-def test_point_mul_add2(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_data_hex: str,
-    tx_gas_limit: int,
-    expected_post: dict,
-) -> None:
-    """Test ported from static filler."""
-    coinbase = Address("0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da")
-    sender = EOA(
-        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
-    )
-
-    env = Environment(
-        fee_recipient=coinbase,
-        number=1,
-        timestamp=1000,
-        prev_randao=0x20000,
-        base_fee_per_gas=10,
-        gas_limit=4012015,
-    )
+        },
+        {
+            "indexes": {"data": [33, 37, 20, 24, 31], "gas": [3], "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 0})},
+        },
+    ]
 
-    pre[sender] = Account(balance=0xDE0B6B3A7640000, nonce=1)
-    # Source: LLL
-    # {(MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96))  (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) [[0]](CALLCODE 500000 6 0 0 128 300 64)  [[1]](CALLCODE 500000 7 0 128 96 400 64) [[10]] (MLOAD 300)  [[11]] (MLOAD 332) [[20]] (MLOAD 400)  [[21]] (MLOAD 432) [[2]] (EQ (SLOAD 10) (SLOAD 20)) [[3]] (EQ (SLOAD 11) (SLOAD 21))}  # noqa: E501
-    contract = pre.deploy_contract(
-        code=(
-            Op.MSTORE(offset=0x0, value=Op.CALLDATALOAD(offset=0x0))
-            + Op.MSTORE(offset=0x20, value=Op.CALLDATALOAD(offset=0x20))
-            + Op.MSTORE(offset=0x40, value=Op.CALLDATALOAD(offset=0x40))
-            + Op.MSTORE(offset=0x60, value=Op.CALLDATALOAD(offset=0x60))
-            + Op.MSTORE(offset=0x80, value=Op.CALLDATALOAD(offset=0x80))
-            + Op.MSTORE(offset=0xA0, value=Op.CALLDATALOAD(offset=0xA0))
-            + Op.MSTORE(offset=0xC0, value=Op.CALLDATALOAD(offset=0xC0))
-            + Op.SSTORE(
-                key=0x0,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x6,
-                    value=0x0,
-                    args_offset=0x0,
-                    args_size=0x80,
-                    ret_offset=0x12C,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(
-                key=0x1,
-                value=Op.CALLCODE(
-                    gas=0x7A120,
-                    address=0x7,
-                    value=0x0,
-                    args_offset=0x80,
-                    args_size=0x60,
-                    ret_offset=0x190,
-                    ret_size=0x40,
-                ),
-            )
-            + Op.SSTORE(key=0xA, value=Op.MLOAD(offset=0x12C))
-            + Op.SSTORE(key=0xB, value=Op.MLOAD(offset=0x14C))
-            + Op.SSTORE(key=0x14, value=Op.MLOAD(offset=0x190))
-            + Op.SSTORE(key=0x15, value=Op.MLOAD(offset=0x1B0))
-            + Op.SSTORE(
-                key=0x2,
-                value=Op.EQ(Op.SLOAD(key=0xA), Op.SLOAD(key=0x14)),
-            )
-            + Op.SSTORE(
-                key=0x3,
-                value=Op.EQ(Op.SLOAD(key=0xB), Op.SLOAD(key=0x15)),
-            )
-            + Op.STOP
-        ),
-        nonce=0,
-        address=Address("0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"),  # noqa: E501
-    )
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
 
-    tx_data = bytes.fromhex(tx_data_hex) if tx_data_hex else b""
+    tx_data = [
+        Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x2),
+        Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x3),
+        Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0),
+        Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593F0000000
+        ),
+        Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593EFFFFFFF
+        ),
+        Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x1),
+        Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD46
+        ),
+        Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        ),
+        Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x2),
+        Hash(0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3)
+        + Hash(
+            0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83
+        )
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x3),
+        Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x0),
+        Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x2),
+        Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(
+            0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593F0000000
+        ),
+        Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(
+            0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593EFFFFFFF
+        ),
+        Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x1),
+        Hash(0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628)
+        + Hash(
+            0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD
+        )
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x0),
+        Hash(0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628)
+        + Hash(
+            0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD
+        )
+        + Hash(
+            0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628
+        )
+        + Hash(
+            0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD
+        )
+        + Hash(
+            0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628
+        )
+        + Hash(
+            0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD
+        )
+        + Hash(0x2),
+        Hash(0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628)
+        + Hash(
+            0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD
+        )
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD46
+        ),
+        Hash(0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628)
+        + Hash(
+            0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD
+        )
+        + Hash(
+            0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628
+        )
+        + Hash(
+            0x69EF5E376C0A1EA82F9DFC2E0001A7F385D655EEF9A6F976C7A5D2C493EA3AD
+        )
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        ),
+        Hash(
+            0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352
+        )
+        + Hash(
+            0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0
+        )
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x0),
+        Hash(
+            0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352
+        )
+        + Hash(
+            0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0
+        )
+        + Hash(
+            0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352
+        )
+        + Hash(
+            0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0
+        )
+        + Hash(
+            0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352
+        )
+        + Hash(
+            0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0
+        )
+        + Hash(0x2),
+        Hash(
+            0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352
+        )
+        + Hash(
+            0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0
+        )
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Hash(
+            0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352
+        )
+        + Hash(
+            0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0
+        )
+        + Hash(
+            0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352
+        )
+        + Hash(
+            0x1D701EC9E3FCA50E84777F0F68CAFF5BFF48CF6A6BD4428462AE9366CF0582B0
+        )
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Hash(0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3)
+        + Hash(
+            0x15ED738C0E0A7C92E7845F96B2AE9C0A68A6A449E3538FC7FF3EBF7A5A18A2C4
+        )
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x3),
+        Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x0),
+        Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593F0000000
+        ),
+        Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x1)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        )
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593EFFFFFFF
+        ),
+        Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x1),
+        Hash(0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628)
+        + Hash(
+            0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A
+        )
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x0),
+        Hash(0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628)
+        + Hash(
+            0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A
+        )
+        + Hash(
+            0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628
+        )
+        + Hash(
+            0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A
+        )
+        + Hash(
+            0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628
+        )
+        + Hash(
+            0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A
+        )
+        + Hash(0x2),
+        Hash(0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628)
+        + Hash(
+            0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A
+        )
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD46
+        ),
+        Hash(0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628)
+        + Hash(
+            0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A
+        )
+        + Hash(
+            0xCCBEC17235F5B9CC5E42F3DF6364A76ECDD0101DDDA8FC5DC0BA0B59C0E5628
+        )
+        + Hash(
+            0x29C5588F6A70FE3F355665F3A1813DDE5F24053278D75AF5CFA62EEA8F3E599A
+        )
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(
+            0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD45
+        ),
+        Hash(
+            0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352
+        )
+        + Hash(
+            0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97
+        )
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(0x0),
+        Hash(
+            0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352
+        )
+        + Hash(
+            0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97
+        )
+        + Hash(
+            0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352
+        )
+        + Hash(
+            0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97
+        )
+        + Hash(
+            0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352
+        )
+        + Hash(
+            0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97
+        )
+        + Hash(0x2),
+        Hash(
+            0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352
+        )
+        + Hash(
+            0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97
+        )
+        + Hash(0x0)
+        + Hash(0x0)
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Hash(
+            0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352
+        )
+        + Hash(
+            0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97
+        )
+        + Hash(
+            0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352
+        )
+        + Hash(
+            0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97
+        )
+        + Hash(0x1)
+        + Hash(0x2)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+    ]
+    tx_gas = [2000000, 90000, 110000, 150000]
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=tx_data,
-        gas_limit=tx_gas_limit,
+        to=contract_0,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
         nonce=1,
+        error=_exc,
     )
 
-    post = expected_post
-
     state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmArithmeticTest/__init__.py b/tests/ported_static/vmArithmeticTest/__init__.py
new file mode 100644
index 00000000000..26cc9662861
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/__init__.py
@@ -0,0 +1 @@
+"""Ported static tests: vmArithmeticTest."""  # noqa: N999
diff --git a/tests/ported_static/vmArithmeticTest/test_add.py b/tests/ported_static/vmArithmeticTest/test_add.py
new file mode 100644
index 00000000000..38a910bcf77
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_add.py
@@ -0,0 +1,255 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/addFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/addFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="add_neg1_neg1",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="add_neg1_4",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="add_neg1_1",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="add_0_0",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="add_1_neg1",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_add(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #    ; -1+-1 = -2
+    #    ;
+    #    ; The big number is 256^2-1, the biggest number that the evm can hold,
+    #    ; and because evm math is done modulo 256^2, it's equivalent to -1
+    #    [[0]] (+ 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.ADD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; -1 + 4 = -3
+    #    ; same big number (2^256-1) as above
+    #       [[0]] (+ 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 4)  # noqa: E501
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.ADD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x4,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; -1 + 1 = 0
+    #       [[0]] (+ 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1)  # noqa: E501
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.ADD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x1,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #       [[0]] (+ 0 0)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(0x0, 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   ; 1 + -1 = 0
+    #       [[0]] (+ 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.ADD(
+                0x1,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 3})},
+        },
+        {
+            "indexes": {"data": [2, 3, 4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_2: Account(storage={0: 0}),
+                contract_3: Account(storage={0: 0}),
+                contract_4: Account(storage={0: 0}),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_5,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmArithmeticTest/test_addmod.py b/tests/ported_static/vmArithmeticTest/test_addmod.py
new file mode 100644
index 00000000000..122864ca167
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_addmod.py
@@ -0,0 +1,516 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/addmodFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/addmodFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="addmod_1_2_2",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="addmod_neg1_neg2_2",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="addmod_neg6_1_3",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="addmod_eq_smod",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="addmod_eq_mod",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="addmod_4_1_neg3",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="addmod_4_1_neg3_eq",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="addmod_neg1_0_5",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="addmod_neg1_1_5",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="addmod_neg1_2_5",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="addmod_neg1_neg2_5",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="addmod_2_160_1_5",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="addmod_4_1_0",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="addmod_0_1_0",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="addmod_1_0_0",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="addmod_0_0_0_min_1",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_addmod(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0x0000000000000000000000000000000000001007)
+    contract_8 = Address(0x0000000000000000000000000000000000001008)
+    contract_9 = Address(0x0000000000000000000000000000000000001009)
+    contract_10 = Address(0x000000000000000000000000000000000000100A)
+    contract_11 = Address(0x000000000000000000000000000000000000100B)
+    contract_12 = Address(0x000000000000000000000000000000000000100C)
+    contract_13 = Address(0x000000000000000000000000000000000000100D)
+    contract_14 = Address(0x000000000000000000000000000000000000100E)
+    contract_15 = Address(0x000000000000000000000000000000000000100F)
+    contract_16 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #    [[0]] (addmod 1 2 2)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADDMOD(0x1, 0x2, 0x2)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (addmod (- 0 1) (- 0 2) 2)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.ADDMOD(Op.SUB(0x0, 0x1), Op.SUB(0x0, 0x2), 0x2)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (addmod (- 0 6) 1 3)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADDMOD(Op.SUB(0x0, 0x6), 0x1, 0x3))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (eq (smod (- 0 5) 3) (addmod (- 0 6) 1 3) )
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.EQ(
+                Op.SMOD(Op.SUB(0x0, 0x5), 0x3),
+                Op.ADDMOD(Op.SUB(0x0, 0x6), 0x1, 0x3),
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (eq (mod  (- 0 5) 3) (addmod (- 0 6) 1 3) )
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.EQ(
+                Op.MOD(Op.SUB(0x0, 0x5), 0x3),
+                Op.ADDMOD(Op.SUB(0x0, 0x6), 0x1, 0x3),
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (addmod 4 1 (- 0 3) )
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADDMOD(0x4, 0x1, Op.SUB(0x0, 0x3)))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (eq (addmod 4 1 (- 0 3) ) 2 )
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.EQ(Op.ADDMOD(0x4, 0x1, Op.SUB(0x0, 0x3)), 0x2)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (addmod (- 0 1) 0 5)
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADDMOD(Op.SUB(0x0, 0x1), 0x0, 0x5))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001007),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (addmod (- 0 1) 1 5)
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADDMOD(Op.SUB(0x0, 0x1), 0x1, 0x5))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001008),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (addmod (- 0 1) 2 5)
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADDMOD(Op.SUB(0x0, 0x1), 0x2, 0x5))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001009),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (addmod (- 0 1) (- 0 2) 5)
+    # }
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.ADDMOD(Op.SUB(0x0, 0x1), Op.SUB(0x0, 0x2), 0x5)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100A),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; ((2^160)-1 + 1) % 5
+    #    [[0]] (addmod 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 5)  # noqa: E501
+    # }
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.ADDMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x1,
+                0x5,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100B),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (addmod 4 1 0)
+    # }
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADDMOD(0x4, 0x1, 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100C),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (addmod 0 1 0)
+    # }
+    contract_13 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADDMOD(0x0, 0x1, 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100D),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (addmod 1 0 0)
+    # }
+    contract_14 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADDMOD(0x1, 0x0, 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100E),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (- (addmod 0 0 0) 1)
+    # }
+    contract_15 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SUB(Op.ADDMOD(0x0, 0x0, 0x0), 0x1))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100F),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_16 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 2})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_4: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_5: Account(storage={0: 5})},
+        },
+        {
+            "indexes": {"data": [6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_6: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_7: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [8], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_8: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [9], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_9: Account(storage={0: 2})},
+        },
+        {
+            "indexes": {"data": [10], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_10: Account(storage={0: 4})},
+        },
+        {
+            "indexes": {"data": [11], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_11: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [12], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_12: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [13], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_13: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [14], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_14: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [15], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_15: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+        Bytes("693c6139") + Hash(0x7),
+        Bytes("693c6139") + Hash(0x8),
+        Bytes("693c6139") + Hash(0x9),
+        Bytes("693c6139") + Hash(0xA),
+        Bytes("693c6139") + Hash(0xB),
+        Bytes("693c6139") + Hash(0xC),
+        Bytes("693c6139") + Hash(0xD),
+        Bytes("693c6139") + Hash(0xE),
+        Bytes("693c6139") + Hash(0xF),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_16,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmArithmeticTest/test_arith.py b/tests/ported_static/vmArithmeticTest/test_arith.py
new file mode 100644
index 00000000000..e482886f634
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_arith.py
@@ -0,0 +1,84 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/arithFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/arithFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.pre_alloc_mutable
+def test_arith(
+    state_test: StateTestFiller,
+    pre: Alloc,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = EOA(
+        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: raw
+    # 0x600160019001600702600501600290046004906021900560170160030260059007600303600960110A60005560086000F3  # noqa: E501
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x1] * 2
+        + Op.SWAP1
+        + Op.ADD(0x5, Op.MUL(0x7, Op.ADD))
+        + Op.PUSH1[0x2]
+        + Op.SWAP1
+        + Op.DIV
+        + Op.PUSH1[0x4]
+        + Op.SWAP1
+        + Op.PUSH1[0x21]
+        + Op.SWAP1
+        + Op.MUL(0x3, Op.ADD(0x17, Op.SDIV))
+        + Op.PUSH1[0x5]
+        + Op.SWAP1
+        + Op.SUB(0x3, Op.SMOD)
+        + Op.SSTORE(key=0x0, value=Op.EXP(0x11, 0x9))
+        + Op.RETURN(offset=0x0, size=0x8),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x14814D06E93EFB1102A15D5881432C9FF6C91362),  # noqa: E501
+    )
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=Bytes("00"),
+        gas_limit=16777216,
+        value=1,
+    )
+
+    post = {target: Account(storage={0: 0x1B9C636491})}
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmArithmeticTest/test_div.py b/tests/ported_static/vmArithmeticTest/test_div.py
new file mode 100644
index 00000000000..5a13e87254f
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_div.py
@@ -0,0 +1,294 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/divFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/divFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="div_2_big",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="div_boost_bug",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="div_5_2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="div_23_24",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="div_0_24",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="div_1_0",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="div_2_0",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="div_0_add",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_div(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0x0000000000000000000000000000000000001007)
+    contract_8 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {
+    #    [[0]]  (/ 0x02
+    #        0xfedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210)  # noqa: E501
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DIV(
+                0x2,
+                0xFEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; Verify the fix to the divBoostBug
+    #    [[0]] (/ 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBA  # noqa: E501
+    #              0x1DAE6076B981DAE6076B981DAE6076B981DAE6076B981DAE6076B981DAE6077)  # noqa: E501
+    #
+    #
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.DIV(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBA,  # noqa: E501
+                0x1DAE6076B981DAE6076B981DAE6076B981DAE6076B981DAE6076B981DAE6077,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]]  (/ 5 2)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.DIV(0x5, 0x2)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]]  (/ 23 24)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.DIV(0x17, 0x18)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]]  (/ 0 24)
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.DIV(0x0, 0x18)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]]  (/ 1 1)
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.DIV(0x1, 0x1)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; Divide by zero
+    #    [[0]]  (/ 2 0)
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.DIV(0x2, 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]]  (+ (/ 13 0) 7)
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADD(Op.DIV(0xD, 0x0), 0x7)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001007),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 3, 4, 6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={0: 0}),
+                contract_3: Account(storage={0: 0}),
+                contract_4: Account(storage={0: 0}),
+                contract_6: Account(storage={0: 0}),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 137})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 2})},
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_5: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_7: Account(storage={0: 7})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+        Bytes("693c6139") + Hash(0x7),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_8,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmArithmeticTest/test_div_by_zero.py b/tests/ported_static/vmArithmeticTest/test_div_by_zero.py
new file mode 100644
index 00000000000..30720aeba88
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_div_by_zero.py
@@ -0,0 +1,1134 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/divByZeroFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/divByZeroFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="div_2_0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="div_1_0",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="div_0_0",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="div_neg1_0",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="div_neg2_0",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="div_maxint_0",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="div_minint_0",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="sdiv_2_0",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="sdiv_1_0",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="sdiv_0_0",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="sdiv_neg1_0",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="sdiv_neg2_0",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="sdiv_maxint_0",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="sdiv_minint_0",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="mod_2_0",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="mod_1_0",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="mod_0_0",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="mod_neg1_0",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="mod_neg2_0",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="mod_maxint_0",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="mod_minint_0",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="smod_2_0",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="smod_1_0",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="smod_0_0",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="smod_neg1_0",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="smod_neg2_0",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="smod_maxint_0",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="smod_minint_0",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="addmod_0_0_0",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="addmod_0_1_0",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="addmod_1_0_0",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="addmod_1_1_0",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="addmod_0_2_0",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="addmod_2_0_0",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="addmod_2_2_0",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="addmod_1_2_0",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="addmod_2_1_0",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="addmod_0_0_0",
+        ),
+        pytest.param(
+            38,
+            0,
+            0,
+            id="addmod_0_1_0",
+        ),
+        pytest.param(
+            39,
+            0,
+            0,
+            id="addmod_1_0_0",
+        ),
+        pytest.param(
+            40,
+            0,
+            0,
+            id="addmod_1_1_0",
+        ),
+        pytest.param(
+            41,
+            0,
+            0,
+            id="addmod_0_neg1_0",
+        ),
+        pytest.param(
+            42,
+            0,
+            0,
+            id="addmod_neg1_0_0",
+        ),
+        pytest.param(
+            43,
+            0,
+            0,
+            id="addmod_neg1_neg1_0",
+        ),
+        pytest.param(
+            44,
+            0,
+            0,
+            id="addmod_0_neg2_0",
+        ),
+        pytest.param(
+            45,
+            0,
+            0,
+            id="addmod_neg2_0_0",
+        ),
+        pytest.param(
+            46,
+            0,
+            0,
+            id="addmod_neg2_neg2_0",
+        ),
+        pytest.param(
+            47,
+            0,
+            0,
+            id="addmod_0_neg1_0",
+        ),
+        pytest.param(
+            48,
+            0,
+            0,
+            id="addmod_neg1_0_0",
+        ),
+        pytest.param(
+            49,
+            0,
+            0,
+            id="addmod_neg1_neg1_0",
+        ),
+        pytest.param(
+            50,
+            0,
+            0,
+            id="addmod_0_neg2_0",
+        ),
+        pytest.param(
+            51,
+            0,
+            0,
+            id="addmod_neg2_0_0",
+        ),
+        pytest.param(
+            52,
+            0,
+            0,
+            id="addmod_neg2_neg2_0",
+        ),
+        pytest.param(
+            53,
+            0,
+            0,
+            id="addmod_1_neg1_0",
+        ),
+        pytest.param(
+            54,
+            0,
+            0,
+            id="addmod_neg1_1_0",
+        ),
+        pytest.param(
+            55,
+            0,
+            0,
+            id="addmod_1_neg2_0",
+        ),
+        pytest.param(
+            56,
+            0,
+            0,
+            id="addmod_neg2_1_0",
+        ),
+        pytest.param(
+            57,
+            0,
+            0,
+            id="addmod_1_neg1_0",
+        ),
+        pytest.param(
+            58,
+            0,
+            0,
+            id="addmod_neg1_1_0",
+        ),
+        pytest.param(
+            59,
+            0,
+            0,
+            id="addmod_2_neg2_0",
+        ),
+        pytest.param(
+            60,
+            0,
+            0,
+            id="addmod_neg2_2_0",
+        ),
+        pytest.param(
+            61,
+            0,
+            0,
+            id="addmod_neg1_neg2_0",
+        ),
+        pytest.param(
+            62,
+            0,
+            0,
+            id="addmod_neg2_neg1_0",
+        ),
+        pytest.param(
+            63,
+            0,
+            0,
+            id="mulmod_0_0_0",
+        ),
+        pytest.param(
+            64,
+            0,
+            0,
+            id="mulmod_0_1_0",
+        ),
+        pytest.param(
+            65,
+            0,
+            0,
+            id="mulmod_1_0_0",
+        ),
+        pytest.param(
+            66,
+            0,
+            0,
+            id="mulmod_1_1_0",
+        ),
+        pytest.param(
+            67,
+            0,
+            0,
+            id="mulmod_0_2_0",
+        ),
+        pytest.param(
+            68,
+            0,
+            0,
+            id="mulmod_2_0_0",
+        ),
+        pytest.param(
+            69,
+            0,
+            0,
+            id="mulmod_2_2_0",
+        ),
+        pytest.param(
+            70,
+            0,
+            0,
+            id="mulmod_1_2_0",
+        ),
+        pytest.param(
+            71,
+            0,
+            0,
+            id="mulmod_2_1_0",
+        ),
+        pytest.param(
+            72,
+            0,
+            0,
+            id="mulmod_0_0_0",
+        ),
+        pytest.param(
+            73,
+            0,
+            0,
+            id="mulmod_0_1_0",
+        ),
+        pytest.param(
+            74,
+            0,
+            0,
+            id="mulmod_1_0_0",
+        ),
+        pytest.param(
+            75,
+            0,
+            0,
+            id="mulmod_1_1_0",
+        ),
+        pytest.param(
+            76,
+            0,
+            0,
+            id="mulmod_0_neg1_0",
+        ),
+        pytest.param(
+            77,
+            0,
+            0,
+            id="mulmod_neg1_0_0",
+        ),
+        pytest.param(
+            78,
+            0,
+            0,
+            id="mulmod_neg1_neg1_0",
+        ),
+        pytest.param(
+            79,
+            0,
+            0,
+            id="mulmod_0_neg2_0",
+        ),
+        pytest.param(
+            80,
+            0,
+            0,
+            id="mulmod_neg2_0_0",
+        ),
+        pytest.param(
+            81,
+            0,
+            0,
+            id="mulmod_neg2_neg2_0",
+        ),
+        pytest.param(
+            82,
+            0,
+            0,
+            id="mulmod_0_neg1_0",
+        ),
+        pytest.param(
+            83,
+            0,
+            0,
+            id="mulmod_neg1_0_0",
+        ),
+        pytest.param(
+            84,
+            0,
+            0,
+            id="mulmod_neg1_neg1_0",
+        ),
+        pytest.param(
+            85,
+            0,
+            0,
+            id="mulmod_0_neg2_0",
+        ),
+        pytest.param(
+            86,
+            0,
+            0,
+            id="mulmod_neg2_0_0",
+        ),
+        pytest.param(
+            87,
+            0,
+            0,
+            id="mulmod_neg2_neg2_0",
+        ),
+        pytest.param(
+            88,
+            0,
+            0,
+            id="mulmod_1_neg1_0",
+        ),
+        pytest.param(
+            89,
+            0,
+            0,
+            id="mulmod_neg1_1_0",
+        ),
+        pytest.param(
+            90,
+            0,
+            0,
+            id="mulmod_1_neg2_0",
+        ),
+        pytest.param(
+            91,
+            0,
+            0,
+            id="mulmod_neg2_1_0",
+        ),
+        pytest.param(
+            92,
+            0,
+            0,
+            id="mulmod_1_neg1_0",
+        ),
+        pytest.param(
+            93,
+            0,
+            0,
+            id="mulmod_neg1_1_0",
+        ),
+        pytest.param(
+            94,
+            0,
+            0,
+            id="mulmod_2_neg2_0",
+        ),
+        pytest.param(
+            95,
+            0,
+            0,
+            id="mulmod_neg2_2_0",
+        ),
+        pytest.param(
+            96,
+            0,
+            0,
+            id="mulmod_neg1_neg2_0",
+        ),
+        pytest.param(
+            97,
+            0,
+            0,
+            id="mulmod_neg2_neg1_0",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_div_by_zero(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {
+    #     (def 'NOP 0)
+    #     (def 'opcode $4)
+    #     (def 'a      $36)
+    #     (def 'b      $68)
+    #
+    #     (if (= opcode 0x04) [[0]] (div a 0) NOP)
+    #     (if (= opcode 0x05) [[0]] (sdiv a 0) NOP)
+    #     (if (= opcode 0x06) [[0]] (mod a 0) NOP)
+    #     (if (= opcode 0x07) [[0]] (smod a 0) NOP)
+    #     (if (= opcode 0x08) [[0]] (addmod a b 0) NOP)
+    #     (if (= opcode 0x09) [[0]] (mulmod a b 0) NOP)
+    # }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(
+            pc=0xF, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x4)
+        )
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x19)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=Op.DIV(Op.CALLDATALOAD(offset=0x24), 0x0))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x29, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x5))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x33)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=Op.SDIV(Op.CALLDATALOAD(offset=0x24), 0x0))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x43, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x6))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x4D)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=Op.MOD(Op.CALLDATALOAD(offset=0x24), 0x0))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x5D, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x7))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x67)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=Op.SMOD(Op.CALLDATALOAD(offset=0x24), 0x0))
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x77, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x8))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0x84)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.ADDMOD(
+                Op.CALLDATALOAD(offset=0x24), Op.CALLDATALOAD(offset=0x44), 0x0
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x94, condition=Op.EQ(Op.CALLDATALOAD(offset=0x4), 0x9))
+        + Op.POP(0x0)
+        + Op.JUMP(pc=0xA1)
+        + Op.JUMPDEST
+        + Op.SSTORE(
+            key=0x0,
+            value=Op.MULMOD(
+                Op.CALLDATALOAD(offset=0x24), Op.CALLDATALOAD(offset=0x44), 0x0
+            ),
+        )
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+    )
+
+    tx_data = [
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x4) + Hash(0x0),
+        Bytes("1a8451e6")
+        + Hash(0x4)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("1a8451e6")
+        + Hash(0x4)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("1a8451e6")
+        + Hash(0x4)
+        + Hash(
+            0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("1a8451e6")
+        + Hash(0x4)
+        + Hash(
+            0x8000000000000000000000000000000000000000000000000000000000000000
+        ),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x5) + Hash(0x0),
+        Bytes("1a8451e6")
+        + Hash(0x5)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("1a8451e6")
+        + Hash(0x5)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("1a8451e6")
+        + Hash(0x5)
+        + Hash(
+            0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("1a8451e6")
+        + Hash(0x5)
+        + Hash(
+            0x8000000000000000000000000000000000000000000000000000000000000000
+        ),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x6) + Hash(0x0),
+        Bytes("1a8451e6")
+        + Hash(0x6)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("1a8451e6")
+        + Hash(0x6)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("1a8451e6")
+        + Hash(0x6)
+        + Hash(
+            0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("1a8451e6")
+        + Hash(0x6)
+        + Hash(
+            0x8000000000000000000000000000000000000000000000000000000000000000
+        ),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0x2),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0x1),
+        Bytes("1a8451e6") + Hash(0x7) + Hash(0x0),
+        Bytes("1a8451e6")
+        + Hash(0x7)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("1a8451e6")
+        + Hash(0x7)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("1a8451e6")
+        + Hash(0x7)
+        + Hash(
+            0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("1a8451e6")
+        + Hash(0x7)
+        + Hash(
+            0x8000000000000000000000000000000000000000000000000000000000000000
+        ),
+        Bytes("048071d3") + Hash(0x8) + Hash(0x0) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x8) + Hash(0x0) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x8) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x8) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x8) + Hash(0x0) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x8) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x8) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x8) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x8) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x8) + Hash(0x0) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x8) + Hash(0x0) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x8) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x8) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(0x0)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(0x0),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(0x0)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        )
+        + Hash(0x0),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(0x0)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(0x0),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(0x0)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        )
+        + Hash(0x0),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(0x1)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(0x1),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(0x1)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        )
+        + Hash(0x1),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(0x1)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(0x1),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(0x2)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        )
+        + Hash(0x2),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("048071d3")
+        + Hash(0x8)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("048071d3") + Hash(0x9) + Hash(0x0) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x9) + Hash(0x0) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x9) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x9) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x9) + Hash(0x0) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x9) + Hash(0x2) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x9) + Hash(0x2) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x9) + Hash(0x1) + Hash(0x2),
+        Bytes("048071d3") + Hash(0x9) + Hash(0x2) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x9) + Hash(0x0) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x9) + Hash(0x0) + Hash(0x1),
+        Bytes("048071d3") + Hash(0x9) + Hash(0x1) + Hash(0x0),
+        Bytes("048071d3") + Hash(0x9) + Hash(0x1) + Hash(0x1),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(0x0)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(0x0),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(0x0)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        )
+        + Hash(0x0),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(0x0)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(0x0),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(0x0)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        )
+        + Hash(0x0),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(0x1)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(0x1),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(0x1)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        )
+        + Hash(0x1),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(0x1)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(0x1),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(0x2)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        )
+        + Hash(0x2),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        ),
+        Bytes("048071d3")
+        + Hash(0x9)
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+        )
+        + Hash(
+            0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        ),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+    )
+
+    post = {target: Account(storage={0: 0})}
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmArithmeticTest/test_exp.py b/tests/ported_static/vmArithmeticTest/test_exp.py
new file mode 100644
index 00000000000..5514c6d2f91
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_exp.py
@@ -0,0 +1,370 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/expFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/expFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="exp_2_2",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="exp_neg1_neg2",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="exp_big_big",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="exp_0_big",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="exp_big_0",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="exp_257_1",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="exp_1_257",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="exp_2_257",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="exp_0_0",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="exp_2_big",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="exp_2_15",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_exp(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0x0000000000000000000000000000000000001007)
+    contract_8 = Address(0x0000000000000000000000000000000000001008)
+    contract_9 = Address(0x0000000000000000000000000000000000001009)
+    contract_10 = Address(0x000000000000000000000000000000000000100A)
+    contract_11 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #    [[0]] (exp 2 2)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.EXP(0x2, 0x2)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; (-1)^(-2)
+    #    ; 2^256-1 = -1
+    #    ; 2^256-1 = -2
+    #    [[0]] (exp
+    #     0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+    #     0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
+    #   )
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.EXP(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; just a big number to the power of itself
+    #    [[0]] (exp 2147483647 2147483647)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.EXP(0x7FFFFFFF, 0x7FFFFFFF))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; zero to the power of a big number
+    #    [[0]] (exp 0 2147483647)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.EXP(0x0, 0x7FFFFFFF)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; big number to the power of zero
+    #    [[0]] (exp 2147483647 0)
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.EXP(0x7FFFFFFF, 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; 257^1
+    #    [[0]] (exp 257 1)
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.EXP(0x101, 0x1)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; 1^257
+    #    [[0]] (exp 1 257)
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.EXP(0x1, 0x101)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; 2^257 (which is zero mod 2^256)
+    #    [[0]] (exp 2 257)
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.EXP(0x2, 0x101)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001007),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; 0^0 (that is 1 in evm arithmetic)
+    #    [[0]] (exp 0 0)
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.EXP(0x0, 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001008),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; 2^big = 0
+    #    [[0]] (exp 2 0x0100000000000f)
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.EXP(0x2, 0x100000000000F)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001009),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; 2^15 = 0x8000
+    #    [[0]] (exp 2 15)
+    # }
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.EXP(0x2, 0xF)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100A),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [9, 3, 7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_3: Account(storage={0: 0}),
+                contract_7: Account(storage={0: 0}),
+                contract_9: Account(storage={0: 0}),
+            },
+        },
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 4})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_2: Account(
+                    storage={
+                        0: 0xBC8CCCCCCCC888888880000000AAAAAAB00000000FFFFFFFFFFFFFFF7FFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_4: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_5: Account(storage={0: 257})},
+        },
+        {
+            "indexes": {"data": [6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_6: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [8], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_8: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [10], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_10: Account(storage={0: 32768})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+        Bytes("693c6139") + Hash(0x7),
+        Bytes("693c6139") + Hash(0x8),
+        Bytes("693c6139") + Hash(0x9),
+        Bytes("693c6139") + Hash(0xA),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_11,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmArithmeticTest/test_exp_power2.py b/tests/ported_static/vmArithmeticTest/test_exp_power2.py
new file mode 100644
index 00000000000..9fb0bd5388c
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_exp_power2.py
@@ -0,0 +1,191 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/expPower2Filler.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/expPower2Filler.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.pre_alloc_mutable
+def test_exp_power2(
+    state_test: StateTestFiller,
+    pre: Alloc,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = EOA(
+        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #     (def 'storageJump 0x10)
+    #
+    #     (def 'calc (m) {
+    #          (def 'n (exp 2 m))
+    #
+    #          [[(* storageJump m)]]       (exp 2 n)
+    #          [[(+ (* storageJump m) 1)]] (exp 2 (- n 1))
+    #          [[(+ (* storageJump m) 2)]] (exp 2 (+ n 1))
+    #       }
+    #     )
+    #
+    #     (calc 1)
+    #     (calc 2)
+    #     (calc 3)
+    #     (calc 4)
+    #     (calc 5)
+    #     (calc 6)
+    #     (calc 7)
+    #     (calc 8)
+    # }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=Op.MUL(0x10, 0x1), value=Op.EXP(0x2, Op.EXP(0x2, 0x1))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1), 0x1),
+            value=Op.EXP(0x2, Op.SUB(Op.EXP(0x2, 0x1), 0x1)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1), 0x2),
+            value=Op.EXP(0x2, Op.ADD(Op.EXP(0x2, 0x1), 0x1)),
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x2), value=Op.EXP(0x2, Op.EXP(0x2, 0x2)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x2), 0x1),
+            value=Op.EXP(0x2, Op.SUB(Op.EXP(0x2, 0x2), 0x1)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x2), 0x2),
+            value=Op.EXP(0x2, Op.ADD(Op.EXP(0x2, 0x2), 0x1)),
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x3), value=Op.EXP(0x2, Op.EXP(0x2, 0x3)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x3), 0x1),
+            value=Op.EXP(0x2, Op.SUB(Op.EXP(0x2, 0x3), 0x1)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x3), 0x2),
+            value=Op.EXP(0x2, Op.ADD(Op.EXP(0x2, 0x3), 0x1)),
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x4), value=Op.EXP(0x2, Op.EXP(0x2, 0x4)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x4), 0x1),
+            value=Op.EXP(0x2, Op.SUB(Op.EXP(0x2, 0x4), 0x1)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x4), 0x2),
+            value=Op.EXP(0x2, Op.ADD(Op.EXP(0x2, 0x4), 0x1)),
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x5), value=Op.EXP(0x2, Op.EXP(0x2, 0x5)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x5), 0x1),
+            value=Op.EXP(0x2, Op.SUB(Op.EXP(0x2, 0x5), 0x1)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x5), 0x2),
+            value=Op.EXP(0x2, Op.ADD(Op.EXP(0x2, 0x5), 0x1)),
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x6), value=Op.EXP(0x2, Op.EXP(0x2, 0x6)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x6), 0x1),
+            value=Op.EXP(0x2, Op.SUB(Op.EXP(0x2, 0x6), 0x1)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x6), 0x2),
+            value=Op.EXP(0x2, Op.ADD(Op.EXP(0x2, 0x6), 0x1)),
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x7), value=Op.EXP(0x2, Op.EXP(0x2, 0x7)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x7), 0x1),
+            value=Op.EXP(0x2, Op.SUB(Op.EXP(0x2, 0x7), 0x1)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x7), 0x2),
+            value=Op.EXP(0x2, Op.ADD(Op.EXP(0x2, 0x7), 0x1)),
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x8), value=Op.EXP(0x2, Op.EXP(0x2, 0x8)))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x8), 0x1),
+            value=Op.EXP(0x2, Op.SUB(Op.EXP(0x2, 0x8), 0x1)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x8), 0x2),
+            value=Op.EXP(0x2, Op.ADD(Op.EXP(0x2, 0x8), 0x1)),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x5A18B275908AD6766155191A40654188FE012DC6),  # noqa: E501
+    )
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=Bytes("693c6139") + Hash(0x0),
+        gas_limit=16777216,
+        value=1,
+    )
+
+    post = {
+        target: Account(
+            storage={
+                16: 4,
+                17: 2,
+                18: 8,
+                32: 16,
+                33: 8,
+                34: 32,
+                48: 256,
+                49: 128,
+                50: 512,
+                64: 0x10000,
+                65: 32768,
+                66: 0x20000,
+                80: 0x100000000,
+                81: 0x80000000,
+                82: 0x200000000,
+                96: 0x10000000000000000,
+                97: 0x8000000000000000,
+                98: 0x20000000000000000,
+                112: 0x100000000000000000000000000000000,
+                113: 0x80000000000000000000000000000000,
+                114: 0x200000000000000000000000000000000,
+                129: 0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+            },
+        ),
+    }
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmArithmeticTest/test_exp_power256.py b/tests/ported_static/vmArithmeticTest/test_exp_power256.py
new file mode 100644
index 00000000000..37bb7b44bf3
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_exp_power256.py
@@ -0,0 +1,445 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/expPower256Filler.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/expPower256Filler.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.pre_alloc_mutable
+def test_exp_power256(
+    state_test: StateTestFiller,
+    pre: Alloc,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = EOA(
+        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #     (def 'storageJump 0x10)
+    #
+    #     (def 'calc (n) {
+    #          [[(* storageJump n)]] (exp 256 n)
+    #          [[(+ (* storageJump n) 1)]] (exp 255 n)
+    #          [[(+ (* storageJump n) 2)]] (exp 257 n)
+    #       }
+    #     )
+    #
+    #     (calc 0)
+    #     (calc 1)
+    #     (calc 2)
+    #     (calc 3)
+    #     (calc 4)
+    #     (calc 5)
+    #     (calc 6)
+    #     (calc 7)
+    #     (calc 8)
+    #     (calc 9)
+    #     (calc 10)
+    #     (calc 11)
+    #     (calc 12)
+    #     (calc 13)
+    #     (calc 14)
+    #     (calc 15)
+    #     (calc 16)
+    #     (calc 17)
+    #     (calc 18)
+    #     (calc 19)
+    # ... (15 more lines)
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=Op.MUL(0x10, 0x0), value=Op.EXP(0x100, 0x0))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x0), 0x1), value=Op.EXP(0xFF, 0x0)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x0), 0x2), value=Op.EXP(0x101, 0x0)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x1), value=Op.EXP(0x100, 0x1))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1), 0x1), value=Op.EXP(0xFF, 0x1)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1), 0x2), value=Op.EXP(0x101, 0x1)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x2), value=Op.EXP(0x100, 0x2))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x2), 0x1), value=Op.EXP(0xFF, 0x2)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x2), 0x2), value=Op.EXP(0x101, 0x2)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x3), value=Op.EXP(0x100, 0x3))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x3), 0x1), value=Op.EXP(0xFF, 0x3)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x3), 0x2), value=Op.EXP(0x101, 0x3)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x4), value=Op.EXP(0x100, 0x4))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x4), 0x1), value=Op.EXP(0xFF, 0x4)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x4), 0x2), value=Op.EXP(0x101, 0x4)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x5), value=Op.EXP(0x100, 0x5))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x5), 0x1), value=Op.EXP(0xFF, 0x5)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x5), 0x2), value=Op.EXP(0x101, 0x5)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x6), value=Op.EXP(0x100, 0x6))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x6), 0x1), value=Op.EXP(0xFF, 0x6)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x6), 0x2), value=Op.EXP(0x101, 0x6)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x7), value=Op.EXP(0x100, 0x7))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x7), 0x1), value=Op.EXP(0xFF, 0x7)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x7), 0x2), value=Op.EXP(0x101, 0x7)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x8), value=Op.EXP(0x100, 0x8))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x8), 0x1), value=Op.EXP(0xFF, 0x8)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x8), 0x2), value=Op.EXP(0x101, 0x8)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x9), value=Op.EXP(0x100, 0x9))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x9), 0x1), value=Op.EXP(0xFF, 0x9)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x9), 0x2), value=Op.EXP(0x101, 0x9)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0xA), value=Op.EXP(0x100, 0xA))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xA), 0x1), value=Op.EXP(0xFF, 0xA)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xA), 0x2), value=Op.EXP(0x101, 0xA)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0xB), value=Op.EXP(0x100, 0xB))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xB), 0x1), value=Op.EXP(0xFF, 0xB)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xB), 0x2), value=Op.EXP(0x101, 0xB)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0xC), value=Op.EXP(0x100, 0xC))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xC), 0x1), value=Op.EXP(0xFF, 0xC)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xC), 0x2), value=Op.EXP(0x101, 0xC)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0xD), value=Op.EXP(0x100, 0xD))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xD), 0x1), value=Op.EXP(0xFF, 0xD)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xD), 0x2), value=Op.EXP(0x101, 0xD)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0xE), value=Op.EXP(0x100, 0xE))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xE), 0x1), value=Op.EXP(0xFF, 0xE)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xE), 0x2), value=Op.EXP(0x101, 0xE)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0xF), value=Op.EXP(0x100, 0xF))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xF), 0x1), value=Op.EXP(0xFF, 0xF)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xF), 0x2), value=Op.EXP(0x101, 0xF)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x10), value=Op.EXP(0x100, 0x10))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x10), 0x1), value=Op.EXP(0xFF, 0x10)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x10), 0x2), value=Op.EXP(0x101, 0x10)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x11), value=Op.EXP(0x100, 0x11))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x11), 0x1), value=Op.EXP(0xFF, 0x11)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x11), 0x2), value=Op.EXP(0x101, 0x11)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x12), value=Op.EXP(0x100, 0x12))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x12), 0x1), value=Op.EXP(0xFF, 0x12)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x12), 0x2), value=Op.EXP(0x101, 0x12)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x13), value=Op.EXP(0x100, 0x13))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x13), 0x1), value=Op.EXP(0xFF, 0x13)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x13), 0x2), value=Op.EXP(0x101, 0x13)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x14), value=Op.EXP(0x100, 0x14))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x14), 0x1), value=Op.EXP(0xFF, 0x14)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x14), 0x2), value=Op.EXP(0x101, 0x14)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x15), value=Op.EXP(0x100, 0x15))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x15), 0x1), value=Op.EXP(0xFF, 0x15)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x15), 0x2), value=Op.EXP(0x101, 0x15)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x16), value=Op.EXP(0x100, 0x16))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x16), 0x1), value=Op.EXP(0xFF, 0x16)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x16), 0x2), value=Op.EXP(0x101, 0x16)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x17), value=Op.EXP(0x100, 0x17))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x17), 0x1), value=Op.EXP(0xFF, 0x17)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x17), 0x2), value=Op.EXP(0x101, 0x17)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x18), value=Op.EXP(0x100, 0x18))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x18), 0x1), value=Op.EXP(0xFF, 0x18)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x18), 0x2), value=Op.EXP(0x101, 0x18)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x19), value=Op.EXP(0x100, 0x19))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x19), 0x1), value=Op.EXP(0xFF, 0x19)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x19), 0x2), value=Op.EXP(0x101, 0x19)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x1A), value=Op.EXP(0x100, 0x1A))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1A), 0x1), value=Op.EXP(0xFF, 0x1A)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1A), 0x2), value=Op.EXP(0x101, 0x1A)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x1B), value=Op.EXP(0x100, 0x1B))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1B), 0x1), value=Op.EXP(0xFF, 0x1B)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1B), 0x2), value=Op.EXP(0x101, 0x1B)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x1C), value=Op.EXP(0x100, 0x1C))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1C), 0x1), value=Op.EXP(0xFF, 0x1C)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1C), 0x2), value=Op.EXP(0x101, 0x1C)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x1D), value=Op.EXP(0x100, 0x1D))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1D), 0x1), value=Op.EXP(0xFF, 0x1D)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1D), 0x2), value=Op.EXP(0x101, 0x1D)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x1E), value=Op.EXP(0x100, 0x1E))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1E), 0x1), value=Op.EXP(0xFF, 0x1E)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1E), 0x2), value=Op.EXP(0x101, 0x1E)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x1F), value=Op.EXP(0x100, 0x1F))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1F), 0x1), value=Op.EXP(0xFF, 0x1F)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1F), 0x2), value=Op.EXP(0x101, 0x1F)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x20), value=Op.EXP(0x100, 0x20))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x20), 0x1), value=Op.EXP(0xFF, 0x20)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x20), 0x2), value=Op.EXP(0x101, 0x20)
+        )
+        + Op.SSTORE(key=Op.MUL(0x10, 0x21), value=Op.EXP(0x100, 0x21))
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x21), 0x1), value=Op.EXP(0xFF, 0x21)
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x21), 0x2), value=Op.EXP(0x101, 0x21)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xE660D528E4A7AD36825F9D64F5F141596FEFF7AE),  # noqa: E501
+    )
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=Bytes("693c6139") + Hash(0x0),
+        gas_limit=16777216,
+        value=1,
+    )
+
+    post = {
+        target: Account(
+            storage={
+                0: 1,
+                1: 1,
+                2: 1,
+                16: 256,
+                17: 255,
+                18: 257,
+                32: 0x10000,
+                33: 65025,
+                34: 0x10201,
+                48: 0x1000000,
+                49: 0xFD02FF,
+                50: 0x1030301,
+                64: 0x100000000,
+                65: 0xFC05FC01,
+                66: 0x104060401,
+                80: 0x10000000000,
+                81: 0xFB09F604FF,
+                82: 0x1050A0A0501,
+                96: 0x1000000000000,
+                97: 0xFA0EEC0EFA01,
+                98: 0x1060F140F0601,
+                112: 0x100000000000000,
+                113: 0xF914DD22EB06FF,
+                114: 0x107152323150701,
+                128: 0x10000000000000000,
+                129: 0xF81BC845C81BF801,
+                130: 0x1081C3846381C0801,
+                144: 0x1000000000000000000,
+                145: 0xF723AC7D8253DC08FF,
+                146: 0x10924547E7E54240901,
+                160: 0x100000000000000000000,
+                161: 0xF62C88D104D1882CF601,
+                162: 0x10A2D78D2FCD2782D0A01,
+                176: 0x10000000000000000000000,
+                177: 0xF5365C4833CCB6A4C90AFF,
+                178: 0x10B37A64BCFCF4AA5370B01,
+                192: 0x1000000000000000000000000,
+                193: 0xF44125EBEB98E9EE2441F401,
+                194: 0x10C42DDF21B9F19EFDC420C01,
+                208: 0x100000000000000000000000000,
+                209: 0xF34CE4C5FFAD5104361DB20CFF,
+                210: 0x10D4F20D00DBAB909CC1E4E0D01,
+                224: 0x10000000000000000000000000000,
+                225: 0xF25997E139ADA3B331E7945AF201,
+                226: 0x10E5C6FF0DDC873C2D5EA6C5B0E01,
+                240: 0x1000000000000000000000000000000,
+                241: 0xF1673E495873F60F7EB5ACC6970EFF,
+                242: 0x10F6ACC60CEA63C3698C056C7690F01,
+                256: 0x100000000000000000000000000000000,
+                257: 0xF075D70B0F1B82196F36F719D077F001,
+                258: 0x1107A372D2F74E272CF59171E30781001,
+                272: 0x10000000000000000000000000000000000,
+                273: 0xEF856134040C669755C7C022B6A77810FF,
+                274: 0x1118AB1645CA45755422870354EA8881101,
+                288: 0x1000000000000000000000000000000000000,
+                289: 0xEE95DBD2D0085A30BE71F86293F0D098EE01,
+                290: 0x1129C3C15C100FBAC976A98A583F730991201,
+                304: 0x100000000000000000000000000000000000000,
+                305: 0xEDA745F6FD3851D68DB3866A315CDFC85512FF,
+                306: 0x113AED851D6C1FCA84402033E297B27C9AB1301,
+                320: 0x10000000000000000000000000000000000000000,
+                321: 0xECB99EB1063B1984B725D2E3C72B82E88CBDEC01,
+                322: 0x114C2872A2898BEA4EC46054167A4A2F174BE1401,
+                336: 0x1000000000000000000000000000000000000000000,
+                337: 0xEBCCE5125534DE6B326EAD10E3645765A4312E14FF,
+                338: 0x115D749B152C1576391324B46A90C47946632D21501,
+                352: 0x100000000000000000000000000000000000000000000,
+                353: 0xEAE1182D42DFA98CC73C3E63D280F30E3E8CFCE6EA01,
+                354: 0x116ED20FB041418BAF4C37D91EFB553DBFA9904E71601,
+                368: 0x10000000000000000000000000000000000000000000000,
+                369: 0xE9F63715159CC9E33A7502256EAE721B304E6FEA0316FF,
+                370: 0x118040E1BFF182CD3AFB8410F81A5092FD6939DEBFD1701,
+                384: 0x1000000000000000000000000000000000000000000000000,
+                385: 0xE90C40DE00872D19573A8D23493FC3A9151E217A1913E801,
+                386: 0x1191C122A1B1745008367F9509126AE39066A3189E9141801,
+                400: 0x100000000000000000000000000000000000000000000000000,
+                401: 0xE823349D2286A5EC3DE3529625F683E56C0903589EFAD418FF,
+                402: 0x11A352E3C45325C4583EB6149E1B7D4E73F709BBB72FD2C1901,
+                416: 0x10000000000000000000000000000000000000000000000000000,
+                417: 0xE73B116885641F4651A56F438FD08D61869CFA55465BD944E601,
+                418: 0x11B4F636A81778EA1C96F4CAB2B998CBC26B00C572E7029451A01,
+                432: 0x1000000000000000000000000000000000000000000000000000000,
+                433: 0xE653D6571CDEBB270B53C9D44C40BCD425165D5AF1157D6BA11AFF,
+                434: 0x11C6AB2CDEBF906306B38BBF7D6C52648E2D6BC63859E996E5F1B01,
+                448: 0x100000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                449: 0xE56D8280C5C1DC6BE448760A77F47C1750F146FD962467EE3579E401,  # noqa: E501
+                450: 0x11D871D80B9E4FF369BA3F4B3CE9BEB6F2BB9931FE9243807CD7A1C01,  # noqa: E501
+                464: 0x10000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                465: 0xE48814FE44FC1A8F78642D946D7C879B39A055B6988E438647446A1CFF,  # noqa: E501
+                466: 0x11EA4A49E3A9EE435D23F98A8826A875A9AE54CB3090D5C3FD547961D01,  # noqa: E501
+                480: 0x1000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                481: 0xE3A38CE946B71E74E8EBC966D90F0B139E66B560E1F5B542C0FD25B2E201,  # noqa: E501
+                482: 0x11FC34942D8D9831A0811D8412AECF1E1F58031FFBC16699C151CDDB31E01,  # noqa: E501
+                496: 0x100000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                497: 0xE2BFE95C5D7067567402DD9D7235FC088AC84EAB8113BF8D7E3C288D2F1EFF,  # noqa: E501
+                498: 0x120E30C8C1BB25C9D2219EA196C17DED3D775B231BBD28005B131FA90D11F01,  # noqa: E501
+                512: 0,
+                513: 0xE1DD29730112F6EF1D8EDABFD4C3C60C823D865CD592ABCDF0BDEC64A1EFE001,  # noqa: E501
+                514: 0x2203EF98A7CE0EF9BF3C04038583F6B2AB4D27E3ED8E5285B6E32C8B61F02001,  # noqa: E501
+                528: 0,
+                529: 0xFB4C498E11E3F82E714BE514EF024675BB48D678BD192222CD2E783D4DF020FF,  # noqa: E501
+                530: 0x25F3884075DD08B8FB400789097AA95DF8750BD17BE0D83C9A0FB7ED52102101,  # noqa: E501
+            },
+        ),
+    }
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmArithmeticTest/test_exp_power256_of256.py b/tests/ported_static/vmArithmeticTest/test_exp_power256_of256.py
new file mode 100644
index 00000000000..3a4d820a4be
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_exp_power256_of256.py
@@ -0,0 +1,1504 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/expPower256Of256Filler.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/expPower256Of256Filler.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.pre_alloc_mutable
+def test_exp_power256_of256(
+    state_test: StateTestFiller,
+    pre: Alloc,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = EOA(
+        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #     (def 'storageJump 0x10)
+    #
+    #     (def 'calc (n) {
+    #
+    #          [[(* storageJump n)]]       (exp 256 (exp 256 n))
+    #          [[(+ (* storageJump n) 1)]] (exp 256 (exp 255 n))
+    #          [[(+ (* storageJump n) 2)]] (exp 256 (exp 257 n))
+    #
+    #          [[(+ (* storageJump n) 3)]] (exp 255 (exp 256 n))
+    #          [[(+ (* storageJump n) 4)]] (exp 255 (exp 255 n))
+    #          [[(+ (* storageJump n) 5)]] (exp 255 (exp 257 n))
+    #
+    #          [[(+ (* storageJump n) 6)]] (exp 257 (exp 256 n))
+    #          [[(+ (* storageJump n) 7)]] (exp 257 (exp 255 n))
+    #          [[(+ (* storageJump n) 8)]] (exp 257 (exp 257 n))
+    #       }
+    #     )
+    #
+    #     (calc 0)
+    #     (calc 1)
+    #     (calc 2)
+    #     (calc 3)
+    #     (calc 4)
+    #     (calc 5)
+    #     (calc 6)
+    #     (calc 7)
+    #     (calc 8)
+    #     (calc 9)
+    #     (calc 10)
+    # ... (24 more lines)
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=Op.MUL(0x10, 0x0), value=Op.EXP(0x100, Op.EXP(0x100, 0x0))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x0), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x0)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x0), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x0)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x0), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x0)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x0), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x0)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x0), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x0)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x0), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x0)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x0), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x0)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x0), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x0)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x1), value=Op.EXP(0x100, Op.EXP(0x100, 0x1))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x1)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x1)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x1)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x1)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x1)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x1)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x1)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x1)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x2), value=Op.EXP(0x100, Op.EXP(0x100, 0x2))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x2), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x2)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x2), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x2)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x2), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x2)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x2), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x2)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x2), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x2)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x2), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x2)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x2), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x2)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x2), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x2)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x3), value=Op.EXP(0x100, Op.EXP(0x100, 0x3))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x3), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x3)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x3), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x3)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x3), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x3)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x3), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x3)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x3), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x3)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x3), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x3)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x3), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x3)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x3), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x3)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x4), value=Op.EXP(0x100, Op.EXP(0x100, 0x4))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x4), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x4)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x4), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x4)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x4), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x4)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x4), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x4)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x4), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x4)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x4), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x4)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x4), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x4)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x4), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x4)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x5), value=Op.EXP(0x100, Op.EXP(0x100, 0x5))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x5), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x5)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x5), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x5)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x5), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x5)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x5), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x5)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x5), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x5)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x5), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x5)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x5), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x5)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x5), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x5)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x6), value=Op.EXP(0x100, Op.EXP(0x100, 0x6))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x6), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x6)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x6), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x6)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x6), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x6)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x6), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x6)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x6), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x6)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x6), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x6)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x6), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x6)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x6), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x6)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x7), value=Op.EXP(0x100, Op.EXP(0x100, 0x7))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x7), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x7)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x7), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x7)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x7), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x7)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x7), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x7)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x7), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x7)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x7), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x7)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x7), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x7)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x7), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x7)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x8), value=Op.EXP(0x100, Op.EXP(0x100, 0x8))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x8), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x8)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x8), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x8)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x8), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x8)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x8), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x8)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x8), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x8)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x8), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x8)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x8), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x8)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x8), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x8)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x9), value=Op.EXP(0x100, Op.EXP(0x100, 0x9))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x9), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x9)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x9), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x9)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x9), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x9)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x9), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x9)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x9), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x9)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x9), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x9)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x9), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x9)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x9), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x9)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0xA), value=Op.EXP(0x100, Op.EXP(0x100, 0xA))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xA), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0xA)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xA), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0xA)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xA), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0xA)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xA), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0xA)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xA), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0xA)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xA), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0xA)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xA), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0xA)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xA), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0xA)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0xB), value=Op.EXP(0x100, Op.EXP(0x100, 0xB))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xB), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0xB)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xB), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0xB)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xB), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0xB)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xB), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0xB)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xB), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0xB)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xB), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0xB)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xB), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0xB)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xB), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0xB)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0xC), value=Op.EXP(0x100, Op.EXP(0x100, 0xC))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xC), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0xC)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xC), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0xC)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xC), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0xC)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xC), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0xC)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xC), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0xC)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xC), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0xC)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xC), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0xC)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xC), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0xC)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0xD), value=Op.EXP(0x100, Op.EXP(0x100, 0xD))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xD), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0xD)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xD), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0xD)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xD), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0xD)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xD), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0xD)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xD), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0xD)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xD), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0xD)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xD), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0xD)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xD), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0xD)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0xE), value=Op.EXP(0x100, Op.EXP(0x100, 0xE))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xE), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0xE)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xE), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0xE)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xE), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0xE)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xE), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0xE)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xE), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0xE)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xE), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0xE)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xE), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0xE)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xE), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0xE)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0xF), value=Op.EXP(0x100, Op.EXP(0x100, 0xF))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xF), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0xF)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xF), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0xF)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xF), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0xF)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xF), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0xF)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xF), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0xF)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xF), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0xF)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xF), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0xF)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0xF), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0xF)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x10), value=Op.EXP(0x100, Op.EXP(0x100, 0x10))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x10), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x10)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x10), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x10)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x10), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x10)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x10), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x10)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x10), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x10)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x10), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x10)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x10), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x10)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x10), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x10)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x11), value=Op.EXP(0x100, Op.EXP(0x100, 0x11))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x11), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x11)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x11), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x11)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x11), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x11)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x11), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x11)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x11), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x11)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x11), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x11)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x11), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x11)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x11), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x11)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x12), value=Op.EXP(0x100, Op.EXP(0x100, 0x12))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x12), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x12)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x12), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x12)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x12), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x12)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x12), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x12)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x12), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x12)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x12), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x12)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x12), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x12)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x12), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x12)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x13), value=Op.EXP(0x100, Op.EXP(0x100, 0x13))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x13), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x13)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x13), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x13)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x13), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x13)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x13), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x13)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x13), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x13)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x13), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x13)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x13), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x13)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x13), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x13)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x14), value=Op.EXP(0x100, Op.EXP(0x100, 0x14))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x14), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x14)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x14), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x14)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x14), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x14)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x14), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x14)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x14), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x14)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x14), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x14)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x14), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x14)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x14), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x14)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x15), value=Op.EXP(0x100, Op.EXP(0x100, 0x15))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x15), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x15)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x15), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x15)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x15), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x15)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x15), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x15)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x15), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x15)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x15), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x15)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x15), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x15)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x15), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x15)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x16), value=Op.EXP(0x100, Op.EXP(0x100, 0x16))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x16), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x16)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x16), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x16)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x16), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x16)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x16), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x16)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x16), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x16)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x16), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x16)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x16), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x16)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x16), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x16)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x17), value=Op.EXP(0x100, Op.EXP(0x100, 0x17))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x17), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x17)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x17), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x17)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x17), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x17)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x17), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x17)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x17), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x17)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x17), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x17)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x17), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x17)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x17), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x17)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x18), value=Op.EXP(0x100, Op.EXP(0x100, 0x18))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x18), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x18)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x18), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x18)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x18), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x18)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x18), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x18)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x18), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x18)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x18), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x18)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x18), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x18)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x18), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x18)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x19), value=Op.EXP(0x100, Op.EXP(0x100, 0x19))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x19), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x19)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x19), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x19)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x19), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x19)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x19), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x19)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x19), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x19)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x19), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x19)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x19), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x19)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x19), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x19)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x1A), value=Op.EXP(0x100, Op.EXP(0x100, 0x1A))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1A), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x1A)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1A), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x1A)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1A), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x1A)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1A), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x1A)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1A), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x1A)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1A), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x1A)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1A), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x1A)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1A), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x1A)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x1B), value=Op.EXP(0x100, Op.EXP(0x100, 0x1B))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1B), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x1B)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1B), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x1B)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1B), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x1B)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1B), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x1B)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1B), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x1B)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1B), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x1B)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1B), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x1B)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1B), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x1B)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x1C), value=Op.EXP(0x100, Op.EXP(0x100, 0x1C))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1C), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x1C)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1C), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x1C)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1C), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x1C)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1C), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x1C)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1C), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x1C)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1C), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x1C)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1C), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x1C)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1C), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x1C)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x1D), value=Op.EXP(0x100, Op.EXP(0x100, 0x1D))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1D), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x1D)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1D), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x1D)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1D), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x1D)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1D), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x1D)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1D), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x1D)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1D), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x1D)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1D), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x1D)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1D), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x1D)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x1E), value=Op.EXP(0x100, Op.EXP(0x100, 0x1E))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1E), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x1E)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1E), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x1E)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1E), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x1E)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1E), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x1E)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1E), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x1E)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1E), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x1E)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1E), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x1E)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1E), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x1E)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x1F), value=Op.EXP(0x100, Op.EXP(0x100, 0x1F))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1F), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x1F)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1F), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x1F)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1F), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x1F)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1F), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x1F)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1F), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x1F)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1F), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x1F)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1F), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x1F)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x1F), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x1F)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x20), value=Op.EXP(0x100, Op.EXP(0x100, 0x20))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x20), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x20)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x20), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x20)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x20), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x20)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x20), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x20)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x20), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x20)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x20), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x20)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x20), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x20)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x20), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x20)),
+        )
+        + Op.SSTORE(
+            key=Op.MUL(0x10, 0x21), value=Op.EXP(0x100, Op.EXP(0x100, 0x21))
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x21), 0x1),
+            value=Op.EXP(0x100, Op.EXP(0xFF, 0x21)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x21), 0x2),
+            value=Op.EXP(0x100, Op.EXP(0x101, 0x21)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x21), 0x3),
+            value=Op.EXP(0xFF, Op.EXP(0x100, 0x21)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x21), 0x4),
+            value=Op.EXP(0xFF, Op.EXP(0xFF, 0x21)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x21), 0x5),
+            value=Op.EXP(0xFF, Op.EXP(0x101, 0x21)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x21), 0x6),
+            value=Op.EXP(0x101, Op.EXP(0x100, 0x21)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x21), 0x7),
+            value=Op.EXP(0x101, Op.EXP(0xFF, 0x21)),
+        )
+        + Op.SSTORE(
+            key=Op.ADD(Op.MUL(0x10, 0x21), 0x8),
+            value=Op.EXP(0x101, Op.EXP(0x101, 0x21)),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x9F233EF2D697929EDF542064B125E7D620270363),  # noqa: E501
+    )
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=Bytes("693c6139") + Hash(0x0),
+        gas_limit=16777216,
+        value=1,
+    )
+
+    post = {
+        target: Account(
+            storage={
+                0: 256,
+                1: 256,
+                2: 256,
+                3: 255,
+                4: 255,
+                5: 255,
+                6: 257,
+                7: 257,
+                8: 257,
+                19: 0x6C3ACD330B959AD6EFABCE6D2D2125E73A88A65A9880D203DDDF5957F7F0001,  # noqa: E501
+                20: 0x8F965A06DA0AC41DCB3A34F1D8AB7D8FEE620A94FAA42C395997756B007FFEFF,  # noqa: E501
+                21: 0xBCE9265D88A053C18BC229EBFF404C1534E1DB43DE85131DA0179FE9FF8100FF,  # noqa: E501
+                22: 0x2B5E9D7A094C19F5EBDD4F2E618F859ED15E4F1F0351F286BF849EB7F810001,  # noqa: E501
+                23: 0xC73B7A6F68385C653A24993BB72EEA0E4BA17470816EC658CF9C5BEDFD81FF01,  # noqa: E501
+                24: 0xB89FC178355660FE1C92C7D8FF11524702FAD6E2255447946442356B00810101,  # noqa: E501
+                35: 0x4EE4CEEAAC565C81F55A87C43F82F7C889EF4FC7C679671E28D594FF7F000001,  # noqa: E501
+                36: 0x82F46A1B4E34D66712910615D2571D75606CEAC51FA8CA8C58CF6CA881FE00FF,  # noqa: E501
+                37: 0x81C9FCEFA5DE158AE2007F25D35C0D11CD735342A48905955A5A6852800200FF,  # noqa: E501
+                38: 0x666AC362902470ED850709E2A29969D10CBA09DEBC03C38D172AEAFF81000001,  # noqa: E501
+                39: 0xEB30A3C678A01BDE914548F98F3366DC0FFE9F85384EBF1111D03DAD7FFE0101,  # noqa: E501
+                40: 0x72D0A7939B6303CE1D46E6E3F1B8BE303BFDB2B00F41AD8076B0975782020101,  # noqa: E501
+                51: 0x109A00E1370D2D2922BF892E85BECB54297354B2E5C75388D514FF7F00000001,  # noqa: E501
+                52: 0x54A792F15E9ABA7E4AD9E716BC169EEA3A6E2E9C49BF9B335874613C8081FEFF,  # noqa: E501
+                53: 0x5D24A14D8E5E039372CD0F6A0F31E9ED6B75ADBA9F16B1C5B3EDD5BA818300FF,  # noqa: E501
+                54: 0x298E2F316B4CCDED5EBF515998D9EC20DF69404B04A441782A6AFF8100000001,  # noqa: E501
+                55: 0x4335694E98F372183C62A2339FA4AD161E9B4C42240BDC9452ABFFD07783FF01,  # noqa: E501
+                56: 0xF0F0820797315ACD063056BBA76F6A9C3E281CDB5197A233967CA94684830101,  # noqa: E501
+                67: 0xE6540CE46EAF70DA9D644015A661E0E245B13F307CB3885514FF7F0000000001,  # noqa: E501
+                68: 0x6526B38B05A6325B80E1C84AB41DC934FD70F33F1BD0EAB3D1F61A4707FC00FF,  # noqa: E501
+                69: 0xE959516CD27E5D8FD487B72DB2989B3EC2BA9FB7EAD41554526FE5A3040400FF,  # noqa: E501
+                70: 0xE7498A48C6CE2530BBE814EE3440C8C44FFFAB7AD8A277AA6AFF810000000001,  # noqa: E501
+                71: 0x2DFFA3E901E5A392D15B79F4193D2168147D2AA7C55870B46C3A905D03FC0101,  # noqa: E501
+                72: 0xE16EA721C96539EDB4F7FB82DE0DAD8CCCB1E7A6966A6777635F6FB908040101,  # noqa: E501
+                83: 0xB581AC185AAD71DB2D177C286929C4C22809E5DCB3085514FF7F000000000001,  # noqa: E501
+                84: 0x75789EB2A64BC971389FBD11A1E6D7ABBF95AD25E23FB9AA25E73A0BFC83FEFF,  # noqa: E501
+                85: 0xFC403FA42CEB6A0D0D3321BD9B2D8AF25B1B667F87A04F496C78168D078500FF,  # noqa: E501
+                86: 0xCEC5EC213B9CB5811F6AE00428FD7B6EF5A1AF39A1F7AA6AFF81000000000001,  # noqa: E501
+                87: 0x70AB32233202B98D382D17713FA0BE391EAF74F85BA1740C9C3238C4ED85FF01,  # noqa: E501
+                88: 0xB622672A213FAA79B32185FF93A7B27A8499E48F7B032CDB4D1A70300C850101,  # noqa: E501
+                99: 0x1948059DE1DEF03C4EC35FC22C2BB8F2BF45DC33085514FF7F00000000000001,  # noqa: E501
+                100: 0x41F818A8E24EB6D7BB7B193B4F2B5FDCF4BD0D453F2AC3499D8830D391FA00FF,  # noqa: E501
+                101: 0xEDE6FE4A943DFB5D967A2B85D6728759D40D2EF0AE4BC28BBB1867F98C0600FF,  # noqa: E501
+                102: 0x83C936CBAAD5DE592BADC2E142FE4EBD6103921F7AA6AFF8100000000000001,  # noqa: E501
+                103: 0x57385019FE4E0939CA3F35C37CADFAF52FBA5B1CDFB02DEF3866E8068BFA0101,  # noqa: E501
+                104: 0x810AC878BD98428F6BE8C6426BA9F9DA09E3E33BF4FE10BFA3F8B12C92060101,  # noqa: E501
+                115: 0x8BB02654111AD8C60AD8AF132283A81F455C33085514FF7F0000000000000001,  # noqa: E501
+                116: 0xA8F75C129DBB8466D6703A2A0B8212131B3248D70E2478862AC40FE17485FEFF,  # noqa: E501
+                117: 0x5FD4D2DE580383EE59F5E800DDB3F1717CEAE03AEDE19D3DEC5E5A69918700FF,  # noqa: E501
+                118: 0xC8624230B524B85D6340DA48A5DB20370FB921F7AA6AFF810000000000000001,  # noqa: E501
+                119: 0x287B58A5A13CD7F454468CA616C181712F5ED25433A7D5A894B6CED35F87FF01,  # noqa: E501
+                120: 0x9930D11AC2804FA977BF951593C8DFF8498779CC0CDC5812A4FBA2F98870101,  # noqa: E501
+                131: 0x230041A0E7602D6E459609ED39081EC55C33085514FF7F000000000000000001,  # noqa: E501
+                132: 0xC407D8A413EF9079EAD457ED686A05AC81039C0CAE0A7F6AFD01E8461FF800FF,  # noqa: E501
+                133: 0x67A397E0692385E4CD83853AABCE220A94D449E885FA867E96D3EF5E180800FF,  # noqa: E501
+                134: 0x70ADD926E753655D6D0EBE9C0F81368FB921F7AA6AFF81000000000000000001,  # noqa: E501
+                135: 0xBDCE80B8378E43F13D454B9D0A4C83CF311B8EAA45D5122CFD544A217F80101,  # noqa: E501
+                136: 0x629C25790E1488998877A9ECDF0FB69637E77D8A4BDC1B46270093BA20080101,  # noqa: E501
+                147: 0x53017D8EB210DB2C8CD4A299079EC55C33085514FF7F00000000000000000001,  # noqa: E501
+                148: 0x48BE09B6C6AE2AA660F1972125CECBB1038B5D236ECF766BA786E2C4E887FEFF,  # noqa: E501
+                149: 0x2E350D847BA73DC2099F83F532951C47269D9FD7E411B50BAE00A9581F8900FF,  # noqa: E501
+                150: 0x13AB9E1F0DF89A184B4D07080B68FB921F7AA6AFF8100000000000000000001,  # noqa: E501
+                151: 0xF387ED41C1050F9DA667F429A3E8FB30B61A55EDE97D7B8ACD797A03CD89FF01,  # noqa: E501
+                152: 0x525696C22BB3CE00FD2E3F6BBB9B4EA1046A5E31FCFF2FEDF8F8C74D28890101,  # noqa: E501
+                163: 0xFE0F60957DC223578A0298879EC55C33085514FF7F0000000000000000000001,  # noqa: E501
+                164: 0xC1EA45F348B5D351C4D8FE5C77DA979CADC33D866ACC42E981278896B1F600FF,  # noqa: E501
+                165: 0x56DDB29BCA94FB986AC0A40188B3B53F3216B3559BD8324A77EA8BD8A80A00FF,  # noqa: E501
+                166: 0x2D49FF6B0BBE177AE9317000B68FB921F7AA6AFF810000000000000000000001,  # noqa: E501
+                167: 0x185FA9EAB94CFE3016B69657E83B23FD24CC6960218254231C3DB627A7F60101,  # noqa: E501
+                168: 0xA7A0223829F26D6C635368034320563DF4AA5EB62EFC87A42BB35F69B20A0101,  # noqa: E501
+                179: 0xE1440264B8EE0CEA0218879EC55C33085514FF7F000000000000000000000001,  # noqa: E501
+                180: 0x29575FDCE377B23043E489E358581474BC863187FA85F9945473A2BE5889FEFF,  # noqa: E501
+                181: 0x3DF8C030EC521FB109C4D887DBBC14C7C9C9921B27058E3503971B60B18B00FF,  # noqa: E501
+                182: 0x67799740340DAF4A30F000B68FB921F7AA6AFF81000000000000000000000001,  # noqa: E501
+                183: 0x540A4E4635B40585E09FF10B63FFE310DD717FCA5C0A51570091E25E378BFF01,  # noqa: E501
+                184: 0xDBBAEF5C49FFEE61B08CDE6EBC8DBA6E9A62D56C2355D1980CB9E790BC8B0101,  # noqa: E501
+                195: 0xB0E95B83A36CE98218879EC55C33085514FF7F00000000000000000000000001,  # noqa: E501
+                196: 0xC482AB56EC19186DC48C88F30861A850B2253B1EA6DC021589E569BD47F400FF,  # noqa: E501
+                197: 0xCF45C7F9AF4BBE4A83055B55B97777AD5E0A3F08B129C9AE208C5D713C0C00FF,  # noqa: E501
+                198: 0xA5CBB62A421049B0F000B68FB921F7AA6AFF8100000000000000000000000001,  # noqa: E501
+                199: 0x3BDE6CA66DFFE1BF5D727C3EDEA74C7A4AF43B3912E6256D37705C8F3BF40101,  # noqa: E501
+                200: 0x3F49A1E40C5213AA4FFED57EB4C1AD2D181B2AAA289E9D59C2256C43480C0101,  # noqa: E501
+                211: 0xE02639036C698218879EC55C33085514FF7F0000000000000000000000000001,  # noqa: E501
+                212: 0x8BE664BDE946D939CE551B948B503787942D2A7734509288C1B62FD5C48BFEFF,  # noqa: E501
+                213: 0xA923A28E7A75AEF26C51580FFC686879E4A0B404B089BDBCD751D88B478D00FF,  # noqa: E501
+                214: 0x41AC5EA30FC9B0F000B68FB921F7AA6AFF810000000000000000000000000001,  # noqa: E501
+                215: 0xDAA3A177EC975CB69BB4ACF4A6E1BE7BCC1AD33D1FFAD97510F9FEA9D8DFF01,  # noqa: E501
+                216: 0x19E6822BEB889BE28310060F4FB9741BFD50A31FA81EC65DE21F7B02548D0101,  # noqa: E501
+                227: 0xDB9902EC698218879EC55C33085514FF7F000000000000000000000000000001,  # noqa: E501
+                228: 0x83FAB06C6C8FEF761EBBB9534C06AC2A9D61820623008069062FF3B1E1F200FF,  # noqa: E501
+                229: 0x3F791DD183ED5B963BD86E0DBA1A9DD5B8CEEB078F15C73062F1942FD40E00FF,  # noqa: E501
+                230: 0xE0BFA28FC9B0F000B68FB921F7AA6AFF81000000000000000000000000000001,  # noqa: E501
+                231: 0x8133B760DFAE27560EB490F235DDFA301F058DEE4F01F3FE4B3567D0D3F20101,  # noqa: E501
+                232: 0xCD4CD0124E983AF71620FB5F98275965C6A8BEBC4B8ADC288B63224EE20E0101,  # noqa: E501
+                243: 0x9882EC698218879EC55C33085514FF7F00000000000000000000000000000001,  # noqa: E501
+                244: 0x75C4915E18B96704209738F5CA765568BB4DC4113D56683977825A132C8DFEFF,  # noqa: E501
+                245: 0x5C76839BF5A80B1DA705DBDF43E4DD6770CD7501AF11FF2DAB7918DFE18F00FF,  # noqa: E501
+                246: 0xBF228FC9B0F000B68FB921F7AA6AFF8100000000000000000000000000000001,  # noqa: E501
+                247: 0xC6A29131E7594004BC2AA79F0D2C402A1409C57C77D284C14B1A3AB0FF8FFF01,  # noqa: E501
+                248: 0xE6B3E5CF6EC90E532FEF7D08455EBF92A03E9E3F6E224EA0FEBDF1A9F08F0101,  # noqa: E501
+                259: 0x82EC698218879EC55C33085514FF7F0000000000000000000000000000000001,  # noqa: E501
+                260: 0x3122F4BCDF6DD8B265CD18EB6AF28C879AED44A35E0BF59273E39E6C7FF000FF,  # noqa: E501
+                261: 0x6A2B3BC87A02C29B9D27757DF43047ECD0F15485270FCA27417A701C701000FF,  # noqa: E501
+                262: 0x228FC9B0F000B68FB921F7AA6AFF810000000000000000000000000000000001,  # noqa: E501
+                263: 0x88E1259502EEF93D46060AACC9E2FF506C734DADE0B6714AB12D17E46FF00101,  # noqa: E501
+                264: 0x4A103813C12C12169B218296BB0A9EAE80CF8D2B158AA70EB990F99480100101,  # noqa: E501
+                275: 0xEC698218879EC55C33085514FF7F000000000000000000000000000000000001,  # noqa: E501
+                276: 0x722AD218EB1995A2D257C4C06D8DE993C203CFC8E3512DF7D633E17E908FFEFF,  # noqa: E501
+                277: 0x8AC9B5EC08D74612CB29F941481D274B51721AF2296207C0DA8D24667F9100FF,  # noqa: E501
+                278: 0x8FC9B0F000B68FB921F7AA6AFF81000000000000000000000000000000000001,  # noqa: E501
+                279: 0x81D5FF63680841482299F3EAB616446DCD336F537C0C565AA4112AB95D91FF01,  # noqa: E501
+                280: 0x9C6CA90DAC4E97DEA02AC969E8649EE9E6232E0C3F4797411151CB8F90910101,  # noqa: E501
+                291: 0x698218879EC55C33085514FF7F00000000000000000000000000000000000001,  # noqa: E501
+                292: 0x8A2CBD9F40794E2205B13306F2AA0A43C60823C64B95D8601FA4F1E521EE00FF,  # noqa: E501
+                293: 0xC1B5A1E3A81DA51B10D84E880F0113FF67B863DDAD3FAF1F4ECF413F101200FF,  # noqa: E501
+                294: 0xC9B0F000B68FB921F7AA6AFF8100000000000000000000000000000000000001,  # noqa: E501
+                295: 0x410BE68E49452A1FBCD863BF6E8D637F8EAE4979C34C88D552AFBCC20FEE0101,  # noqa: E501
+                296: 0xF540CB714754B5B1EB0373833833BD7FB0EE925CE8B92962500B7A1C22120101,  # noqa: E501
+                307: 0x8218879EC55C33085514FF7F0000000000000000000000000000000000000001,  # noqa: E501
+                308: 0xB795AD7AC24CFBB7435CF53BD3584F3D4B2709935635C3CEB66E761FF091FEFF,  # noqa: E501
+                309: 0x1F0BB7BE91A0CCD0CCA93D75CF03DE3E6B56FE8F1C54242617665327219300FF,  # noqa: E501
+                310: 0xB0F000B68FB921F7AA6AFF810000000000000000000000000000000000000001,  # noqa: E501
+                311: 0xAD571756ECBFF1BFDEF064861E5E92C5D897A9CC380E54BDBAABD80BB793FF01,  # noqa: E501
+                312: 0xD8B5B531989E689F700DCDB43AB90E79A49DFBBB5A13DBF751DF98BB34930101,  # noqa: E501
+                323: 0x18879EC55C33085514FF7F000000000000000000000000000000000000000001,  # noqa: E501
+                324: 0x67E4797DC21F02CE4A7C52218C7DBEA5D212E6C244E24F0BA4C08613C7EC00FF,  # noqa: E501
+                325: 0xA1CE1A085F258785846939CC1D2E8725AC94AD4DFF8913234E00679FB41400FF,  # noqa: E501
+                326: 0xF000B68FB921F7AA6AFF81000000000000000000000000000000000000000001,  # noqa: E501
+                327: 0xCCE501857A1CB45473915A28082AF950E0F78F7E2DE68CE748ADB661B3EC0101,  # noqa: E501
+                328: 0x3B2E28D274A16C08B58A23BAD63BBA6D7B09685769D1F68CA3873BEDC8140101,  # noqa: E501
+                339: 0x879EC55C33085514FF7F00000000000000000000000000000000000000000001,  # noqa: E501
+                340: 0x7FD07055FF50CDFE4B4BD9A15133D72D3607D92EB7AC81BAC93DB7FF4C93FEFF,  # noqa: E501
+                341: 0x665AC5C769E87F61D5993ABC26522FBFCA2734D76A63216B2D550D29C79500FF,  # noqa: E501
+                342: 0xB68FB921F7AA6AFF8100000000000000000000000000000000000000000001,  # noqa: E501
+                343: 0x1C93DB67C9884BC694686D69A25A5D7ED089841D5CE147FDD7199AB00D95FF01,  # noqa: E501
+                344: 0x485053D8FF66BE52036597520344FAC87B6A305426A9E49221D3F934DC950101,  # noqa: E501
+                355: 0x9EC55C33085514FF7F0000000000000000000000000000000000000000000001,  # noqa: E501
+                356: 0xEC447E662AC08957D7E290A421DBF54C0AAF43AADC9CC465AD0B02F071EA00FF,  # noqa: E501
+                357: 0xDC9178D3BAB470096F01477C859B5F4173986640B659426412A653465C1600FF,  # noqa: E501
+                358: 0xB68FB921F7AA6AFF810000000000000000000000000000000000000000000001,  # noqa: E501
+                359: 0xDCF0A770777610503596AE0311AF46C171151ED45107D7E7BB8F74BB5BEA0101,  # noqa: E501
+                360: 0x4D65773387993928C95C861274232D3FB6F6B7FE1B22E4E61A30E71172160101,  # noqa: E501
+                371: 0xC55C33085514FF7F000000000000000000000000000000000000000000000001,  # noqa: E501
+                372: 0x537CA0F03F974303005F1E6693B55B72315A166841732E42B8353724A495FEFF,  # noqa: E501
+                373: 0x86418797EC60058DE6CCA47DFDBEE79923AC49D7801E01840041CA76719700FF,  # noqa: E501
+                374: 0x8FB921F7AA6AFF81000000000000000000000000000000000000000000000001,  # noqa: E501
+                375: 0x56A55341AB8D4318F1CFB55D5F21E2BA35D7E070A72BAC6B2B21BAAE5F97FF01,  # noqa: E501
+                376: 0x55DDD0EC77909DE6D8311116CF520398E816F928B06FDD90EC239D0488970101,  # noqa: E501
+                387: 0x5C33085514FF7F00000000000000000000000000000000000000000000000001,  # noqa: E501
+                388: 0xD542E526003539EAD104274AFF2D78332366E29D328C2161F0C120731FE800FF,  # noqa: E501
+                389: 0xC706CB25E8384CE9BB5C9CB48415238BA03E16C448E292C0A101843B081800FF,  # noqa: E501
+                390: 0xB921F7AA6AFF8100000000000000000000000000000000000000000000000001,  # noqa: E501
+                391: 0x4CA55F89202C524CB0F1CB3195D13C8D94A9F7A05C59E1D4031577C707E80101,  # noqa: E501
+                392: 0x8C4B0574E9156B80035F3ECDCF1FE79D273ED7559747A4322BCD338F20180101,  # noqa: E501
+                403: 0x33085514FF7F0000000000000000000000000000000000000000000000000001,  # noqa: E501
+                404: 0x7F510DD7198CAC0A92FF7EA80451838C0DFA12114C41A0EF05907397F897FEFF,  # noqa: E501
+                405: 0x1275E752B6AEE228ECBA5E9B57EF1111DEFF3C651E2CFBF2CCCD13151F9900FF,  # noqa: E501
+                406: 0x21F7AA6AFF810000000000000000000000000000000000000000000000000001,  # noqa: E501
+                407: 0x6646340AD51A03BB710CAF05756B685B33C7DAD62AE68D369243700EAD99FF01,  # noqa: E501
+                408: 0x29D80E8060EF2221929BB18215586C742686D6860E028CA0456B443238990101,  # noqa: E501
+                419: 0x85514FF7F000000000000000000000000000000000000000000000000000001,  # noqa: E501
+                420: 0x1D164DB738EB6893868B361AD2803F97BE35764456E82A837667A693D1E600FF,  # noqa: E501
+                421: 0x8B92C24ABEBF376A5AAB5FF4DFD3538A03D38A10BCED2AAE8E1A8A85B81A00FF,  # noqa: E501
+                422: 0xF7AA6AFF81000000000000000000000000000000000000000000000000000001,  # noqa: E501
+                423: 0x6931BDA98C70E860A1F6A5224940F1EC7E6734CD9456C95806384F7CB7E60101,  # noqa: E501
+                424: 0x3402A9DB66492DFC2A220715E76243469462F24EDC56903BA1D8E96ED21A0101,  # noqa: E501
+                435: 0x5514FF7F00000000000000000000000000000000000000000000000000000001,  # noqa: E501
+                436: 0x178918FFBCB401D4EFD2F7DFB4D01A897172267F0F491121AC52DD614899FEFF,  # noqa: E501
+                437: 0x38ECFF71480CA0B422F2ED6F780D5FEAD2AE234A49104B10A86F7F0DD19B00FF,  # noqa: E501
+                438: 0xAA6AFF8100000000000000000000000000000000000000000000000000000001,  # noqa: E501
+                439: 0xD02811CB5DC1D80567E810532B235B7672F5C78CD6E89BB511D5E2D8F79BFF01,  # noqa: E501
+                440: 0x1B4E6404F474C18055D30BB8987672F59E97980D6F9DE1764C0FBEC5EC9B0101,  # noqa: E501
+                451: 0x14FF7F0000000000000000000000000000000000000000000000000000000001,  # noqa: E501
+                452: 0xFFD368E44B3F85CB81AE394C9809CA9FA2DB46A83D7880A912AB6D4A87E400FF,  # noqa: E501
+                453: 0x981AD53C19B15A94BCF0BF20235DD0DA9DF25F46AE635029FE2062E6C1C00FF,  # noqa: E501
+                454: 0x6AFF810000000000000000000000000000000000000000000000000000000001,  # noqa: E501
+                455: 0x19DF06FFA28250867006726405FBC05D43DC2F9D2F025006DB089BD46BE40101,  # noqa: E501
+                456: 0x243FFFE3A4F2982F45055C08F379648AB886DA8027A7401117A8E0B8881C0101,  # noqa: E501
+                467: 0xFF7F000000000000000000000000000000000000000000000000000000000001,  # noqa: E501
+                468: 0x41E065D46E0349CFE624C4E8A2034AEA1F7EDFFF80E511CD8067D488949BFEFF,  # noqa: E501
+                469: 0xA84162CA6675A22C4C79DFC4EA15F760DB5A04DBF04246764199B668879D00FF,  # noqa: E501
+                470: 0xFF81000000000000000000000000000000000000000000000000000000000001,  # noqa: E501
+                471: 0x1226984FAA6B05EBDBD45D8477FA4FD5B55BFD5061DE03C319282B153D9DFF01,  # noqa: E501
+                472: 0x5CC9E6B0B749FD94541AD00364BDEC2FCA7816981CA3E38F485DECC7A49D0101,  # noqa: E501
+                483: 0x7F00000000000000000000000000000000000000000000000000000000000001,  # noqa: E501
+                484: 0xE9772778F50FA0A69CD10FA019AC56D72AC7A7D7AF26C4BA28415C8F41E200FF,  # noqa: E501
+                485: 0x33F0385EF73FEEBDB952E5ADB643DD0FA178FD9271578219AD50A73D241E00FF,  # noqa: E501
+                486: 0x8100000000000000000000000000000000000000000000000000000000000001,  # noqa: E501
+                487: 0xFD405CCE8F73DFFC04A6F0FF6FFC6BF7961876D09C5B4933A68F0CC623E20101,  # noqa: E501
+                488: 0xC5A8F4566FD2E96E4CE3A8B3EC0863E7B20BC3B2F3DC5261BA8A0174421E0101,  # noqa: E501
+                499: 1,
+                500: 0xF9CB87F5B1AB58602F52A1E9D392E5675B86A59A53943A8D4EC2A915DC9DFEFF,  # noqa: E501
+                501: 0x893D729A64E318860EC5047E70E598DA163EB41E71E74B04DFD4712D419F00FF,  # noqa: E501
+                502: 1,
+                503: 0xEE5F2839C1B4F6CA05E6FDB04E2FB49C0F860B3765C27DC781A150CB7F9FFF01,  # noqa: E501
+                504: 0xB4C358E3C6BCDDFB509EA487D733DF0E1854F29C3B6BFD4A8CAABE3F609F0101,  # noqa: E501
+                512: 1,
+                515: 1,
+                516: 0xB8247842BB5CE75C08D0C251669ED5870FA24A22952E5DB3A7C66C59FFE000FF,  # noqa: E501
+                517: 0xEE526E5A06F2A990B2BF6C951E5FEABF0E07EE16877296E1BE872DB9E02000FF,  # noqa: E501
+                518: 1,
+                519: 0xEDA7D024B6DE40A9D3B966E71F10A4667EDC5B71CAB07AEABCAC6249DFE00101,  # noqa: E501
+                520: 0x512ECFAEEB11205F0833E1054DCB1300488E0954BE5AF77A49E143AA00200101,  # noqa: E501
+                528: 1,
+                531: 1,
+                532: 0x8DCB65B5494EBA78CD6756A6F9851F6E26D0F2BB9ECD7E9ABD7E9B11209FFEFF,  # noqa: E501
+                533: 0x6694BB31B20CD625F3756897DAE6D738F2E64467B5B6F10FA3E07763FFA100FF,  # noqa: E501
+                534: 1,
+                535: 0xE678999AEFFD1F1F45081F64DE7F80AB083DD7DF04721ED64EE04C03BDA1FF01,  # noqa: E501
+                536: 0x39B68FB9898DD7568ABD178397251CE8226A25C1D305A4E79573333520A10101,  # noqa: E501
+            },
+        ),
+    }
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmArithmeticTest/test_fib.py b/tests/ported_static/vmArithmeticTest/test_fib.py
new file mode 100644
index 00000000000..55d6b52f0d9
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_fib.py
@@ -0,0 +1,146 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/fibFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/fibFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.pre_alloc_mutable
+def test_fib(
+    state_test: StateTestFiller,
+    pre: Alloc,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {
+    #    (def 'fib (n) [[n]] (+ @@(- n 1) @@(- n 2)))
+    #    (fib  2)
+    #    (fib  3)
+    #    (fib  4)
+    #    (fib  5)
+    #    (fib  6)
+    #    (fib  7)
+    #    (fib  8)
+    #    (fib  9)
+    #    (fib 10)
+    # }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x2,
+            value=Op.ADD(
+                Op.SLOAD(key=Op.SUB(0x2, 0x1)), Op.SLOAD(key=Op.SUB(0x2, 0x2))
+            ),
+        )
+        + Op.SSTORE(
+            key=0x3,
+            value=Op.ADD(
+                Op.SLOAD(key=Op.SUB(0x3, 0x1)), Op.SLOAD(key=Op.SUB(0x3, 0x2))
+            ),
+        )
+        + Op.SSTORE(
+            key=0x4,
+            value=Op.ADD(
+                Op.SLOAD(key=Op.SUB(0x4, 0x1)), Op.SLOAD(key=Op.SUB(0x4, 0x2))
+            ),
+        )
+        + Op.SSTORE(
+            key=0x5,
+            value=Op.ADD(
+                Op.SLOAD(key=Op.SUB(0x5, 0x1)), Op.SLOAD(key=Op.SUB(0x5, 0x2))
+            ),
+        )
+        + Op.SSTORE(
+            key=0x6,
+            value=Op.ADD(
+                Op.SLOAD(key=Op.SUB(0x6, 0x1)), Op.SLOAD(key=Op.SUB(0x6, 0x2))
+            ),
+        )
+        + Op.SSTORE(
+            key=0x7,
+            value=Op.ADD(
+                Op.SLOAD(key=Op.SUB(0x7, 0x1)), Op.SLOAD(key=Op.SUB(0x7, 0x2))
+            ),
+        )
+        + Op.SSTORE(
+            key=0x8,
+            value=Op.ADD(
+                Op.SLOAD(key=Op.SUB(0x8, 0x1)), Op.SLOAD(key=Op.SUB(0x8, 0x2))
+            ),
+        )
+        + Op.SSTORE(
+            key=0x9,
+            value=Op.ADD(
+                Op.SLOAD(key=Op.SUB(0x9, 0x1)), Op.SLOAD(key=Op.SUB(0x9, 0x2))
+            ),
+        )
+        + Op.SSTORE(
+            key=0xA,
+            value=Op.ADD(
+                Op.SLOAD(key=Op.SUB(0xA, 0x1)), Op.SLOAD(key=Op.SUB(0xA, 0x2))
+            ),
+        )
+        + Op.STOP,
+        storage={0: 0, 1: 1},
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+    )
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=Bytes("01"),
+        gas_limit=16777216,
+        value=1,
+    )
+
+    post = {
+        target: Account(
+            storage={
+                0: 0,
+                1: 1,
+                2: 1,
+                3: 2,
+                4: 3,
+                5: 5,
+                6: 8,
+                7: 13,
+                8: 21,
+                9: 34,
+                10: 55,
+            },
+        ),
+    }
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmArithmeticTest/test_mod.py b/tests/ported_static/vmArithmeticTest/test_mod.py
new file mode 100644
index 00000000000..44970acfe0f
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_mod.py
@@ -0,0 +1,271 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/modFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/modFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="mod_2_3",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="mod_neg1_2",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="mod_0_neg1",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="mod_3_0",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="mod_neg2_3",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="mod_16_0",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_mod(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #    [[0]] (% 2 3)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.MOD(0x2, 0x3)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; -1 % 2  (2^256-1 = -1 in evm arithmetic)
+    #    [[0]] (% 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 2)  # noqa: E501
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.MOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x2,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; 0 % -1
+    #    [[0]] (% 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.MOD(
+                0x0,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #       [[0]] (% 3 0)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.MOD(0x3, 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #       ; The expected result is 2, which is counter
+    #       ; intuitive. The reason is that MOD uses unsigned
+    #       ; arithmetic. -2 % 3 is indeed 1, but 2^256 % 3 = 1
+    #       ; and therefore (2^256-2) % 3 = 2
+    #       ;
+    #       [[0]] (% (- 0 2) 3)
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.MOD(Op.SUB(0x0, 0x2), 0x3)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #       ; The original test was (3%0)-1, but since we're
+    #       ; already checking 3%0 (contract 0...0103), I decided
+    #       ; it would be better to check a different number
+    #       [[0]] (- (% 16 0) 1)
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SUB(Op.MOD(0x10, 0x0), 0x1))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 2})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [2, 3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_2: Account(storage={0: 0}),
+                contract_3: Account(storage={0: 0}),
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_4: Account(storage={0: 2})},
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_5: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_6,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmArithmeticTest/test_mul.py b/tests/ported_static/vmArithmeticTest/test_mul.py
new file mode 100644
index 00000000000..dd176fbf7cd
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_mul.py
@@ -0,0 +1,380 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/mulFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/mulFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="mul_2_3",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="mul_neg1_neg1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="mul_0_23",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="mul_23_1",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="mul_2pow255_neg1",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="mul_2pow255_2pow255",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="mul_2pow255min1_2pow255min1",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="big_pow_3",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="stack_underflow",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_mul(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0x0000000000000000000000000000000000001007)
+    contract_8 = Address(0x0000000000000000000000000000000000001008)
+    contract_9 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #     [[0]] (* 2 3)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.MUL(0x2, 0x3)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; -1 * -1
+    #     ; -1 = 2^256-1 in evm arithmetic
+    #     [[0]] (*
+    #              0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff  # noqa: E501
+    #              0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff  # noqa: E501
+    #           )
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.MUL(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #      [[0]] (* 0 23)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.MUL(0x0, 0x17)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #      [[0]] (* 23 1)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.MUL(0x17, 0x1)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; 2^255 * -1 (the expected answer is 2^255,
+    #    ;             because -2^255 = 2^256-2^255 in evm arithmetic)
+    #    [[0]] (*
+    #        0x8000000000000000000000000000000000000000000000000000000000000000
+    #        0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+    #    )
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.MUL(
+                0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; 2^255 * 2^255
+    #    ;
+    #    ; the expected answer is 0, because 2^510 % 2^256 = 0
+    #    [[0]] (*
+    #        0x8000000000000000000000000000000000000000000000000000000000000000
+    #        0x8000000000000000000000000000000000000000000000000000000000000000
+    #    )
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.MUL(
+                0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; (2^255-1) * (2^255-1)
+    #    ;
+    #    ; = 2^510 - 2*2^255 + 1 = 2^510 - 2^256 + 1 = 1
+    #    [[0]] (*
+    #        0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+    #        0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+    #    )
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.MUL(
+                0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (* (*
+    #          0x1234567890abcdef0fedcba0987654321
+    #          0x1234567890abcdef0fedcba0987654321
+    #       )
+    #       0x1234567890abcdef0fedcba0987654321
+    #    )
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.MUL(
+                Op.MUL(
+                    0x1234567890ABCDEF0FEDCBA0987654321,
+                    0x1234567890ABCDEF0FEDCBA0987654321,
+                ),
+                0x1234567890ABCDEF0FEDCBA0987654321,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001007),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160005560010200
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1) + Op.PUSH1[0x1] + Op.MUL + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001008),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [8, 2, 5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_2: Account(storage={0: 0}),
+                contract_5: Account(storage={0: 0}),
+                contract_8: Account(storage={0: 0}),
+            },
+        },
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 6})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 23})},
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_4: Account(
+                    storage={
+                        0: 0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_6: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_7: Account(
+                    storage={
+                        0: 0x47D0817E4167B1EB4F9FC722B133EF9D7D9A6FB4C2C1C442D000107A5E419561,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+        Bytes("693c6139") + Hash(0x7),
+        Bytes("693c6139") + Hash(0x8),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_9,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmArithmeticTest/test_mulmod.py b/tests/ported_static/vmArithmeticTest/test_mulmod.py
new file mode 100644
index 00000000000..173ad89d1cc
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_mulmod.py
@@ -0,0 +1,535 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/mulmodFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/mulmodFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="mm_1_2_2",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="mm_neg1_neg2_3",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="mm_neg5_1_3",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="mm_5_1_neg3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="mm_27_37_100",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="mm_2pow255_2_5",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="mm_neg1_2_5",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="mm_2pow255min1_2_5",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="mm_2pow255plus1_2_5",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="mulmod_vs_smod",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="mulmod_vs_mod",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="mulmod_pos_pos_neg",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="mm_0_1_0",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="mm_1_0_0",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="one_minus_mm_0_0_0",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="mm_5_1_0",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_mulmod(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0x0000000000000000000000000000000000001007)
+    contract_8 = Address(0x0000000000000000000000000000000000001008)
+    contract_9 = Address(0x0000000000000000000000000000000000001009)
+    contract_10 = Address(0x000000000000000000000000000000000000100A)
+    contract_11 = Address(0x000000000000000000000000000000000000100B)
+    contract_12 = Address(0x000000000000000000000000000000000000100C)
+    contract_13 = Address(0x000000000000000000000000000000000000100D)
+    contract_14 = Address(0x000000000000000000000000000000000000100E)
+    contract_15 = Address(0x000000000000000000000000000000000000100F)
+    contract_16 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {
+    #    ; (1*2) % 2 is zero
+    #    [[0]] (mulmod 1 2 2)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.MULMOD(0x1, 0x2, 0x2)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; -a is actually 2^256-a
+    #    ;
+    #    ; 2^256 % 3 = 1
+    #    ; (2^256-1) % 3 = (1-1)%3 = 0
+    #    [[0]] (mulmod (- 0 1) (- 0 2) 3)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.MULMOD(Op.SUB(0x0, 0x1), Op.SUB(0x0, 0x2), 0x3)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; -5 % 3 = (2^256 - 5) % 3 = (1-2)%3 = (-1) % 3 = 2
+    #    [[0]] (mulmod (- 0 5) 1 3)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.MULMOD(Op.SUB(0x0, 0x5), 0x1, 0x3))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; -3 is actually 2^256-3, which is much more than five
+    #    [[0]] (mulmod 5 1 (- 0 3))
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.MULMOD(0x5, 0x1, Op.SUB(0x0, 0x3)))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (mulmod 27 37 100)
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.MULMOD(0x1B, 0x25, 0x64)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    (def 'pow2_255 0x8000000000000000000000000000000000000000000000000000000000000000)  # noqa: E501
+    #
+    #    ; 2^255%5 = 3
+    #    ;     2%5 = 2
+    #    ;           6%5 = 1
+    #    [[0]] (mulmod pow2_255 2 5)
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.MULMOD(
+                0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                0x2,
+                0x5,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; (256^2-1) % 5 = 0
+    #    [[0]] (mulmod (- 0 1) 2 5)
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.MULMOD(Op.SUB(0x0, 0x1), 0x2, 0x5))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    (def 'pow2_255 0x8000000000000000000000000000000000000000000000000000000000000000)  # noqa: E501
+    #
+    #    ; 2^255%5 = 3
+    #    ;     2%5 = 2
+    #    ; (3-1) * 2 = 4
+    #    [[0]] (mulmod (- pow2_255 1) 2 5)
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.MULMOD(
+                Op.SUB(
+                    0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                    0x1,
+                ),
+                0x2,
+                0x5,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001007),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    (def 'pow2_255 0x8000000000000000000000000000000000000000000000000000000000000000)  # noqa: E501
+    #
+    #    ; 2^255%5 = 3
+    #    ;     2%5 = 2
+    #    ; ((3+1) * 2) % 5 = 3
+    #    [[0]] (mulmod (+ pow2_255 1) 2 5)
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.MULMOD(
+                Op.ADD(
+                    0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                    0x1,
+                ),
+                0x2,
+                0x5,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001008),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; smod   is signed mod, -5%3 = -1
+    #    ; mulmod is unsigned mod, -5%3 = 2
+    #    ; -1 != 2
+    #    [[0]] (= (smod (- 0 5) 3) (mulmod (- 0 5) 1 3))
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.EQ(
+                Op.SMOD(Op.SUB(0x0, 0x5), 0x3),
+                Op.MULMOD(Op.SUB(0x0, 0x5), 0x1, 0x3),
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001009),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; mod and mulmod are both unsigned mod
+    #    ; equal
+    #    [[0]] (= (mod (- 0 5) 3) (mulmod (- 0 5) 1 3))
+    # }
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.EQ(
+                Op.MOD(Op.SUB(0x0, 0x5), 0x3),
+                Op.MULMOD(Op.SUB(0x0, 0x5), 0x1, 0x3),
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100A),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; (mulmod a b -c) is usually a*b, because -c is
+    #    ; actually 2^256-c, which is huge
+    #    ; not equal
+    #    [[0]] (= (mulmod 5 1 (- 0 3)) 2)
+    # }
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.EQ(Op.MULMOD(0x5, 0x1, Op.SUB(0x0, 0x3)), 0x2)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100B),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; (mulmod x y 0) is zero
+    #    [[0]] (mulmod 0 1 0)
+    # }
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.MULMOD(0x0, 0x1, 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100C),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; (mulmod x y 0) is zero
+    #    [[0]] (mulmod 1 0 0)
+    # }
+    contract_13 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.MULMOD(0x1, 0x0, 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100D),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; (mulmod x y 0) is zero
+    #    [[0]] (- 1 (mulmod 0 0 0))
+    # }
+    contract_14 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SUB(0x1, Op.MULMOD(0x0, 0x0, 0x0)))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100E),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; (mulmod x y 0) is zero
+    #    [[0]] (mulmod 5 1 0)
+    # }
+    contract_15 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.MULMOD(0x5, 0x1, 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100F),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_16 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [0, 1, 6, 9, 11, 12, 13, 15],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(storage={0: 0}),
+                contract_1: Account(storage={0: 0}),
+                contract_6: Account(storage={0: 0}),
+                contract_9: Account(storage={0: 0}),
+                contract_11: Account(storage={0: 0}),
+                contract_12: Account(storage={0: 0}),
+                contract_13: Account(storage={0: 0}),
+                contract_15: Account(storage={0: 0}),
+            },
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 2})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 5})},
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_4: Account(storage={0: 99})},
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_5: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_7: Account(storage={0: 4})},
+        },
+        {
+            "indexes": {"data": [8], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_8: Account(storage={0: 3})},
+        },
+        {
+            "indexes": {"data": [10], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_10: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [14], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_14: Account(storage={0: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+        Bytes("693c6139") + Hash(0x7),
+        Bytes("693c6139") + Hash(0x8),
+        Bytes("693c6139") + Hash(0x9),
+        Bytes("693c6139") + Hash(0xA),
+        Bytes("693c6139") + Hash(0xB),
+        Bytes("693c6139") + Hash(0xC),
+        Bytes("693c6139") + Hash(0xD),
+        Bytes("693c6139") + Hash(0xE),
+        Bytes("693c6139") + Hash(0xD),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_16,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/VMTests/vmArithmeticTest/test_not.py b/tests/ported_static/vmArithmeticTest/test_not.py
similarity index 55%
rename from tests/ported_static/VMTests/vmArithmeticTest/test_not.py
rename to tests/ported_static/vmArithmeticTest/test_not.py
index 8150e563a32..2bea92ca4e8 100644
--- a/tests/ported_static/VMTests/vmArithmeticTest/test_not.py
+++ b/tests/ported_static/vmArithmeticTest/test_not.py
@@ -2,7 +2,7 @@
 Ori Pomerantz qbzzt1@gmail.com.
 
 Ported from:
-tests/static/state_tests/VMTests/vmArithmeticTest/notFiller.yml
+state_tests/VMTests/vmArithmeticTest/notFiller.yml
 """
 
 import pytest
@@ -11,7 +11,9 @@
     Account,
     Address,
     Alloc,
+    Bytes,
     Environment,
+    Hash,
     StateTestFiller,
     Transaction,
 )
@@ -22,7 +24,7 @@
 
 
 @pytest.mark.ported_from(
-    ["tests/static/state_tests/VMTests/vmArithmeticTest/notFiller.yml"],
+    ["state_tests/VMTests/vmArithmeticTest/notFiller.yml"],
 )
 @pytest.mark.valid_from("Cancun")
 @pytest.mark.pre_alloc_mutable
@@ -30,8 +32,10 @@ def test_not(
     state_test: StateTestFiller,
     pre: Alloc,
 ) -> None:
-    """Ori Pomerantz qbzzt1@gmail.com."""
-    coinbase = Address("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba")
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
     sender = EOA(
         key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
     )
@@ -45,47 +49,47 @@ def test_not(
         gas_limit=100000000,
     )
 
-    callee = pre.deploy_contract(
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #    [[0]] (not 0x0123456789abcdef)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x0, value=Op.NOT(0x123456789ABCDEF)) + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0x0000000000000000000000000000000000001000"),  # noqa: E501
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
     )
-    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
-    # Source: LLL
+    # Source: lll
     # {
     #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
     # }
-    contract = pre.deploy_contract(
-        code=(
-            Op.CALL(
-                gas=0xFFFFFF,
-                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
         balance=0xBA1A9CE0BA1A9CE,
         nonce=0,
-        address=Address("0xcccccccccccccccccccccccccccccccccccccccc"),  # noqa: E501
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
     )
 
     tx = Transaction(
         sender=sender,
-        to=contract,
-        data=bytes.fromhex(
-            "693c61390000000000000000000000000000000000000000000000000000000000000000"  # noqa: E501
-        ),
+        to=contract_1,
+        data=Bytes("693c6139") + Hash(0x0),
         gas_limit=16777216,
         value=1,
     )
 
     post = {
-        callee: Account(
+        contract_0: Account(
             storage={
                 0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEDCBA9876543210,  # noqa: E501
             },
diff --git a/tests/ported_static/vmArithmeticTest/test_sdiv.py b/tests/ported_static/vmArithmeticTest/test_sdiv.py
new file mode 100644
index 00000000000..7c360e52047
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_sdiv.py
@@ -0,0 +1,682 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/sdivFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/sdivFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="sdiv_1_neg1",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="sdiv_neg1_1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="sdiv_neg2_neg4",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="sdiv_4_neg2",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="sdiv_5_neg4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="sdiv_2pow255_neg1",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="sdiv_2pow255_0",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="sdiv_neg1_25",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="sdiv_neg1_neg1",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="sdiv_neg1_1_2nd",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="sdiv_neg3_0",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="sdiv_1_0",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="sdiv_1_0_add1",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="sdiv_neg9_5",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="sdiv_2pow255_neg1_2nd",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="sdiv_minint_neg1",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="sdiv_neg1_minint",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_sdiv(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0x0000000000000000000000000000000000001007)
+    contract_8 = Address(0x0000000000000000000000000000000000001008)
+    contract_9 = Address(0x0000000000000000000000000000000000001009)
+    contract_10 = Address(0x000000000000000000000000000000000000100A)
+    contract_11 = Address(0x000000000000000000000000000000000000100B)
+    contract_12 = Address(0x000000000000000000000000000000000000100C)
+    contract_13 = Address(0x000000000000000000000000000000000000100D)
+    contract_14 = Address(0x000000000000000000000000000000000000100E)
+    contract_15 = Address(0x000000000000000000000000000000000000100F)
+    contract_16 = Address(0x0000000000000000000000000000000000000110)
+    contract_17 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {  ; (0 - (-1)) / (-1) = 1/(-1) = -1
+    #    ;
+    #    ; -1 = 2^256-1
+    #    (def 'neg1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #    [[0]] (sdiv (- 0 neg1) neg1)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SDIV(
+                Op.SUB(
+                    0x0,
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ),
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; (-1) / (0 - (-1)) = (-1)/1 = -1
+    #    ;
+    #    ; -1 = 2^256-1
+    #    (def 'neg1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #
+    #    [[0]] (sdiv neg1 (- 0 neg1))
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SDIV(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                Op.SUB(
+                    0x0,
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ),
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; (-2) / (-4) = 0
+    #    ;
+    #    ; evm doesn't do fractions
+    #    [[0]] (sdiv (- 0 2) (- 0 4))
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.SDIV(Op.SUB(0x0, 0x2), Op.SUB(0x0, 0x4))
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; 4 / (-2) = -2
+    #    ;
+    #    [[0]] (sdiv 4 (- 0 2))
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SDIV(0x4, Op.SUB(0x0, 0x2)))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; 5 / (-4) = -1
+    #    ;
+    #    ; evm doesn't do fractions
+    #    ;
+    #    [[0]] (sdiv 5 (- 0 4))
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SDIV(0x5, Op.SUB(0x0, 0x4)))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; (-2^255) / (-1) = 2^255
+    #    ; Because 2^255 = -2^255 in evm arithmetic
+    #    (def 'pow_2_255 0x8000000000000000000000000000000000000000000000000000000000000000)  # noqa: E501
+    #
+    #    [[0]] (sdiv (- 0 pow_2_255) (- 0 1))
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SDIV(
+                Op.SUB(
+                    0x0,
+                    0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                ),
+                Op.SUB(0x0, 0x1),
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; (-2^255) / 0 = 0
+    #    ; anything / 0 = 0 in evm
+    #    ;
+    #    (def 'pow_2_255 0x8000000000000000000000000000000000000000000000000000000000000000)  # noqa: E501
+    #
+    #    [[0]] (sdiv (- 0 pow_2_255) 0)
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SDIV(
+                Op.SUB(
+                    0x0,
+                    0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                ),
+                0x0,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; (-1)/25 = 0 (no fractions in evm)
+    #
+    #    [[0]] (sdiv (- 0 1) 25)
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SDIV(Op.SUB(0x0, 0x1), 0x19))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001007),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; (-1)/(-1) = 1
+    #
+    #    [[0]] (sdiv (- 0 1) (- 0 1))
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.SDIV(Op.SUB(0x0, 0x1), Op.SUB(0x0, 0x1))
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001008),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; (-1)/1 = -1
+    #
+    #    [[0]] (sdiv (- 0 1) 1)
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SDIV(Op.SUB(0x0, 0x1), 0x1))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001009),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; (-3)/0 = 0
+    #    ; x/0 = 0 in evm
+    #
+    #    [[0]] (sdiv (- 0 3) (- 0 0))
+    # }
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.SDIV(Op.SUB(0x0, 0x3), Op.SUB(0x0, 0x0))
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100A),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; (0-(-1))/0 = 0
+    #    ;
+    #    ; -1 = 2^256-1
+    #    (def 'neg1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #
+    #    [[0]] (sdiv (- 0 neg1) 0)
+    # }
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SDIV(
+                Op.SUB(
+                    0x0,
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ),
+                0x0,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100B),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; (0-(-1))/0 + 1 = 1
+    #    ;
+    #    ; -1 = 2^256-1
+    #    (def 'neg1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #
+    #    [[0]] (+ (sdiv (- 0 neg1) 0) 1)
+    # }
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.ADD(
+                Op.SDIV(
+                    Op.SUB(
+                        0x0,
+                        0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    ),
+                    0x0,
+                ),
+                0x1,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600560096000030560005500
+    contract_13 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SDIV(Op.SUB(0x0, 0x9), 0x5))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100D),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; A negative number sdiv -1 is the absolute value of that number
+    #    (def 'pow2_255 0x8000000000000000000000000000000000000000000000000000000000000000)  # noqa: E501
+    #    (def 'pow2_255_min1 (- pow2_255 1))
+    #    [[0]] (sdiv (- 0 pow2_255_min1) (- 0 1))
+    # }
+    contract_14 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SDIV(
+                Op.SUB(
+                    0x0,
+                    Op.SUB(
+                        0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                        0x1,
+                    ),
+                ),
+                Op.SUB(0x0, 0x1),
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100E),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; A negative number sdiv -1 is the absolute value of that number
+    #    (def 'pow2_255 0x8000000000000000000000000000000000000000000000000000000000000000)  # noqa: E501
+    #    [[0]] (sdiv (- 0 pow2_255) (- 0 1))
+    #    ; 2^255 = -2^255 in evm (modulo 2^256)
+    # }
+    contract_15 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SDIV(
+                Op.SUB(
+                    0x0,
+                    0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                ),
+                Op.SUB(0x0, 0x1),
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100F),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; (- 0 maxint) is 0x80.....01, so -1 / -maxint is zero
+    #
+    #    (def 'neg1   0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #    (def 'maxint 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #    [[0]] (sdiv neg1 (- 0 maxint))
+    # }
+    contract_16 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SDIV(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                Op.SUB(
+                    0x0,
+                    0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                ),
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000110),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_17 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [2, 6, 7, 10, 11, 16], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_2: Account(storage={0: 0}),
+                contract_6: Account(storage={0: 0}),
+                contract_7: Account(storage={0: 0}),
+                contract_10: Account(storage={0: 0}),
+                contract_11: Account(storage={0: 0}),
+                contract_16: Account(storage={0: 0}),
+            },
+        },
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_3: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_4: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_5: Account(
+                    storage={
+                        0: 0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [8], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_8: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [9], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_9: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [12], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_12: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [13], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_13: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [15], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_14: Account(
+                    storage={
+                        0: 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [14], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_15: Account(
+                    storage={
+                        0: 0x8000000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+        Bytes("693c6139") + Hash(0x7),
+        Bytes("693c6139") + Hash(0x8),
+        Bytes("693c6139") + Hash(0x9),
+        Bytes("693c6139") + Hash(0xA),
+        Bytes("693c6139") + Hash(0xB),
+        Bytes("693c6139") + Hash(0xC),
+        Bytes("693c6139") + Hash(0xD),
+        Bytes("693c6139") + Hash(0xF),
+        Bytes("693c6139") + Hash(0xE),
+        Bytes("693c6139") + Hash(0x10),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_17,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmArithmeticTest/test_signextend.py b/tests/ported_static/vmArithmeticTest/test_signextend.py
new file mode 100644
index 00000000000..d05e6c2c264
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_signextend.py
@@ -0,0 +1,534 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/signextendFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/signextendFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="invalid_byte",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="zero_zero",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="zero_neg1",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="neg2_neg2",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="neg1_neg1",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="large_ff",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="neg1_zero",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="bit_is_not_set",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="bit_is_not_set_high",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="bit_is_set_high",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="overflow_bytenum",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="overflow_bytenum2",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="bit_is_set",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="byte31_pos",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="byte31_neg",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_signextend(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0x0000000000000000000000000000000000001007)
+    contract_8 = Address(0x0000000000000000000000000000000000001008)
+    contract_9 = Address(0x0000000000000000000000000000000000001009)
+    contract_10 = Address(0x000000000000000000000000000000000000100A)
+    contract_11 = Address(0x000000000000000000000000000000000000100B)
+    contract_12 = Address(0x000000000000000000000000000000000000100C)
+    contract_13 = Address(0x000000000000000000000000000000000000100D)
+    contract_14 = Address(0x000000000000000000000000000000000000100E)
+    contract_15 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #    [[0]] (signextend 80 0x126af4)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0x50, 0x126AF4)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (signextend 0 0)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0x0, 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; -1 = 2^256-1 in EVM arithmetic
+    #    [[0]] (signextend 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SIGNEXTEND(
+                0x0,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; -2 = 2^256-2 in EVM arithmetic
+    #    [[0]] (signextend
+    #             0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe  # noqa: E501
+    #             0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe  # noqa: E501
+    #          )
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SIGNEXTEND(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; -1 = 2^256-1 in EVM arithmetic
+    #    [[0]] (signextend
+    #             0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff  # noqa: E501
+    #             0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff  # noqa: E501
+    #          )
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SIGNEXTEND(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (signextend 0xf00000000000000001 0xff)
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.SIGNEXTEND(0xF00000000000000001, 0xFF)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (signextend
+    #              ; -1 a.k.a. 2^256-1
+    #              0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff  # noqa: E501
+    #              0x00
+    #          )
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SIGNEXTEND(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x0,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; Extend the sign of 0x6a, which is a positive 8 bit number
+    #    [[0]] (signextend 0 0x122f6a)
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0x0, 0x122F6A)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001007),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; Extend the sign of 0x6af4, which is a positive 16 bit number
+    #    [[0]] (signextend 1 0x126af4)
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0x1, 0x126AF4)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001008),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; The first two bytes are 0xfaf4, which is a negative 16 bit number
+    #    ; (-1292). The sign is extended from the first two bytes to the entire
+    #    ; value
+    #    [[0]] (signextend 1 0x12faf4)
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0x1, 0x12FAF4)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001009),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (signextend 0x010000000000000001 0x8000)
+    # }
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.SIGNEXTEND(0x10000000000000001, 0x8000)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100A),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (signextend 0xf0000000000001 0xFFFF)
+    # }
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0xF0000000000001, 0xFFFF))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100B),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (signextend 0 0x122ff4)
+    # }
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0x0, 0x122FF4)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100C),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (signextend 31 1)
+    # }
+    contract_13 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0x1F, 0x1)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100D),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (signextend 31 (sub 0 1))
+    # }
+    contract_14 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SIGNEXTEND(0x1F, Op.SUB(0x0, 0x1)))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100E),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_15 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [1, 6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(storage={0: 0}),
+                contract_6: Account(storage={0: 0}),
+            },
+        },
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 0x126AF4})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_2: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_3: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_4: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_5: Account(storage={0: 255})},
+        },
+        {
+            "indexes": {"data": [7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_7: Account(storage={0: 106})},
+        },
+        {
+            "indexes": {"data": [8], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_8: Account(storage={0: 27380})},
+        },
+        {
+            "indexes": {"data": [9], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_9: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAF4,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [10], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_10: Account(storage={0: 32768})},
+        },
+        {
+            "indexes": {"data": [11], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_11: Account(storage={0: 65535})},
+        },
+        {
+            "indexes": {"data": [12], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_12: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [13], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_13: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [14], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_14: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+        Bytes("693c6139") + Hash(0x7),
+        Bytes("693c6139") + Hash(0x8),
+        Bytes("693c6139") + Hash(0x9),
+        Bytes("693c6139") + Hash(0xA),
+        Bytes("693c6139") + Hash(0xB),
+        Bytes("693c6139") + Hash(0xC),
+        Bytes("693c6139") + Hash(0xD),
+        Bytes("693c6139") + Hash(0xE),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_15,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmArithmeticTest/test_smod.py b/tests/ported_static/vmArithmeticTest/test_smod.py
new file mode 100644
index 00000000000..728f89a210b
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_smod.py
@@ -0,0 +1,279 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/smodFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/smodFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="smod_2_3",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="smod_neg1_2",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="smod_0_neg1",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="smod_3_0",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="smod_neg2_3",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="smod_16_0",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_smod(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #    [[0]] (smod 2 3)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SMOD(0x2, 0x3)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; -1 % 2  (2^256-1 = -1 in evm arithmetic)
+    #    [[0]] (smod 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 2)  # noqa: E501
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SMOD(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x2,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; 0 % -1
+    #    [[0]] (smod 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SMOD(
+                0x0,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #       [[0]] (smod 3 0)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SMOD(0x3, 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #       [[0]] (smod (- 0 2) 3)
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SMOD(Op.SUB(0x0, 0x2), 0x3))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #       ; The original test was (3%0)-1, but since we're
+    #       ; already checking 3%0 (contract 0...0103), I decided
+    #       ; it would be better to check a different number
+    #       [[0]] (- (smod 16 0) 1)
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SUB(Op.SMOD(0x10, 0x0), 0x1))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 2})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [2, 3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_2: Account(storage={0: 0}),
+                contract_3: Account(storage={0: 0}),
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_4: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_5: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_6,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmArithmeticTest/test_sub.py b/tests/ported_static/vmArithmeticTest/test_sub.py
new file mode 100644
index 00000000000..2d8d2654766
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_sub.py
@@ -0,0 +1,257 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/subFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/subFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="sub_23_1",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="sub_2_3",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="sub_0_23",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="sub_0_neg1",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="sub_neg1_0",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_sub(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #    [[0]] (- 23 1)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SUB(0x17, 0x1)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (- 2 3)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SUB(0x2, 0x3)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (- 0 23)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SUB(0x0, 0x17)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; 0 - (-1)
+    #    [[0]] (-   0
+    #             0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                0x0,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; (-1) - 0
+    #    ; evm arithmetic is mod 2^256, and the big number is 2^256-1
+    #   [[0]] (- 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff  # noqa: E501
+    #              0)
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SUB(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x0,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 22})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_2: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_4: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_5,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmArithmeticTest/test_two_ops.py b/tests/ported_static/vmArithmeticTest/test_two_ops.py
new file mode 100644
index 00000000000..db7aeac6d17
--- /dev/null
+++ b/tests/ported_static/vmArithmeticTest/test_two_ops.py
@@ -0,0 +1,2821 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmArithmeticTest/twoOpsFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmArithmeticTest/twoOpsFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.pre_alloc_mutable
+def test_two_ops(
+    state_test: StateTestFiller,
+    pre: Alloc,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = EOA(
+        key=0x40AC0FC28C27E961EE46EC43355A094DE205856EDBD4654CF2577C2608D4EC1E
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #
+    #
+    #     [[0x11000100010000]] (ADD (ADD 2 1) 3)
+    #     [[0x11000100010001]] (ADD (ADD 2 1) 1)
+    #     [[0x11000100020000]] (ADD (MUL 2 1) 3)
+    #     [[0x11000100020001]] (ADD (MUL 2 1) 1)
+    #     [[0x11000100030000]] (ADD (SUB 2 1) 3)
+    #     [[0x11000100030001]] (ADD (SUB 2 1) 1)
+    #     [[0x11000100040000]] (ADD (DIV 2 1) 3)
+    #     [[0x11000100040001]] (ADD (DIV 2 1) 1)
+    #     [[0x11000100050000]] (ADD (SDIV 2 1) 3)
+    #     [[0x11000100050001]] (ADD (SDIV 2 1) 1)
+    #     [[0x11000100060000]] (ADD (MOD 2 1) 3)
+    #     [[0x11000100060001]] (ADD (MOD 2 1) 1)
+    #     [[0x11000100070000]] (ADD (SMOD 2 1) 3)
+    #     [[0x11000100070001]] (ADD (SMOD 2 1) 1)
+    #     [[0x11000100080000]] (ADD (ADDMOD 2 1 3) 3)
+    #     [[0x11000100080001]] (ADD (ADDMOD 2 1 3) 1)
+    #     [[0x11000100090000]] (ADD (MULMOD 2 1 3) 3)
+    #     [[0x11000100090001]] (ADD (MULMOD 2 1 3) 1)
+    #     [[0x110001000a0000]] (ADD (EXP 2 1) 3)
+    #     [[0x110001000a0001]] (ADD (EXP 2 1) 1)
+    #     [[0x11000100100000]] (ADD (LT 2 1) 3)
+    #     [[0x11000100100001]] (ADD (LT 2 1) 1)
+    #     [[0x11000100110000]] (ADD (GT 2 1) 3)
+    #     [[0x11000100110001]] (ADD (GT 2 1) 1)
+    #     [[0x11000100120000]] (ADD (SLT 2 1) 3)
+    #     [[0x11000100120001]] (ADD (SLT 2 1) 1)
+    #     [[0x11000100130000]] (ADD (SGT 2 1) 3)
+    # ... (1127 more lines)
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x11000100010000, value=Op.ADD(Op.ADD(0x2, 0x1), 0x3)
+        )
+        + Op.SSTORE(key=0x11000100010001, value=Op.ADD(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000100020000, value=Op.ADD(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000100020001, value=Op.ADD(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000100030000, value=Op.ADD(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000100030001, value=Op.ADD(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000100040000, value=Op.ADD(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000100040001, value=Op.ADD(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000100050000, value=Op.ADD(Op.SDIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000100050001, value=Op.ADD(Op.SDIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000100060000, value=Op.ADD(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000100060001, value=Op.ADD(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000100070000, value=Op.ADD(Op.SMOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000100070001, value=Op.ADD(Op.SMOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11000100080000, value=Op.ADD(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000100080001, value=Op.ADD(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11000100090000, value=Op.ADD(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000100090001, value=Op.ADD(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x110001000A0000, value=Op.ADD(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110001000A0001, value=Op.ADD(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000100100000, value=Op.ADD(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000100100001, value=Op.ADD(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000100110000, value=Op.ADD(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000100110001, value=Op.ADD(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000100120000, value=Op.ADD(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000100120001, value=Op.ADD(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000100130000, value=Op.ADD(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000100130001, value=Op.ADD(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000100140000, value=Op.ADD(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000100140001, value=Op.ADD(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000100150000, value=Op.ADD(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11000100150001, value=Op.ADD(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11000100160000, value=Op.ADD(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000100160001, value=Op.ADD(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000100170000, value=Op.ADD(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000100170001, value=Op.ADD(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000100180000, value=Op.ADD(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000100180001, value=Op.ADD(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000100190000, value=Op.ADD(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11000100190001, value=Op.ADD(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(key=0x110001001A0000, value=Op.ADD(Op.BYTE(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110001001A0001, value=Op.ADD(Op.BYTE(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110001001B0000, value=Op.ADD(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110001001B0001, value=Op.ADD(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110001001C0000, value=Op.ADD(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110001001C0001, value=Op.ADD(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110001001D0000, value=Op.ADD(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110001001D0001, value=Op.ADD(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000200010000, value=Op.MUL(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000200010001, value=Op.MUL(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000200020000, value=Op.MUL(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000200020001, value=Op.MUL(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000200030000, value=Op.MUL(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000200030001, value=Op.MUL(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000200040000, value=Op.MUL(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000200040001, value=Op.MUL(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000200050000, value=Op.MUL(Op.SDIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000200050001, value=Op.MUL(Op.SDIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000200060000, value=Op.MUL(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000200060001, value=Op.MUL(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000200070000, value=Op.MUL(Op.SMOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000200070001, value=Op.MUL(Op.SMOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11000200080000, value=Op.MUL(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000200080001, value=Op.MUL(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11000200090000, value=Op.MUL(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000200090001, value=Op.MUL(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x110002000A0000, value=Op.MUL(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110002000A0001, value=Op.MUL(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000200100000, value=Op.MUL(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000200100001, value=Op.MUL(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000200110000, value=Op.MUL(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000200110001, value=Op.MUL(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000200120000, value=Op.MUL(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000200120001, value=Op.MUL(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000200130000, value=Op.MUL(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000200130001, value=Op.MUL(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000200140000, value=Op.MUL(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000200140001, value=Op.MUL(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000200150000, value=Op.MUL(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11000200150001, value=Op.MUL(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11000200160000, value=Op.MUL(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000200160001, value=Op.MUL(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000200170000, value=Op.MUL(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000200170001, value=Op.MUL(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000200180000, value=Op.MUL(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000200180001, value=Op.MUL(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000200190000, value=Op.MUL(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11000200190001, value=Op.MUL(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(key=0x110002001A0000, value=Op.MUL(Op.BYTE(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110002001A0001, value=Op.MUL(Op.BYTE(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110002001B0000, value=Op.MUL(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110002001B0001, value=Op.MUL(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110002001C0000, value=Op.MUL(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110002001C0001, value=Op.MUL(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110002001D0000, value=Op.MUL(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110002001D0001, value=Op.MUL(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000300010000, value=Op.SUB(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000300010001, value=Op.SUB(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000300020000, value=Op.SUB(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000300020001, value=Op.SUB(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000300030000, value=Op.SUB(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000300030001, value=Op.SUB(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000300040000, value=Op.SUB(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000300040001, value=Op.SUB(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000300050000, value=Op.SUB(Op.SDIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000300050001, value=Op.SUB(Op.SDIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000300060000, value=Op.SUB(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000300060001, value=Op.SUB(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000300070000, value=Op.SUB(Op.SMOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000300070001, value=Op.SUB(Op.SMOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11000300080000, value=Op.SUB(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000300080001, value=Op.SUB(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11000300090000, value=Op.SUB(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000300090001, value=Op.SUB(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x110003000A0000, value=Op.SUB(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110003000A0001, value=Op.SUB(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000300100000, value=Op.SUB(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000300100001, value=Op.SUB(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000300110000, value=Op.SUB(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000300110001, value=Op.SUB(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000300120000, value=Op.SUB(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000300120001, value=Op.SUB(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000300130000, value=Op.SUB(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000300130001, value=Op.SUB(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000300140000, value=Op.SUB(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000300140001, value=Op.SUB(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000300150000, value=Op.SUB(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11000300150001, value=Op.SUB(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11000300160000, value=Op.SUB(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000300160001, value=Op.SUB(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000300170000, value=Op.SUB(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000300170001, value=Op.SUB(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000300180000, value=Op.SUB(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000300180001, value=Op.SUB(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000300190000, value=Op.SUB(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11000300190001, value=Op.SUB(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(key=0x110003001A0000, value=Op.SUB(Op.BYTE(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110003001A0001, value=Op.SUB(Op.BYTE(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110003001B0000, value=Op.SUB(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110003001B0001, value=Op.SUB(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110003001C0000, value=Op.SUB(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110003001C0001, value=Op.SUB(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110003001D0000, value=Op.SUB(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110003001D0001, value=Op.SUB(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000400010000, value=Op.DIV(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000400010001, value=Op.DIV(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000400020000, value=Op.DIV(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000400020001, value=Op.DIV(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000400030000, value=Op.DIV(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000400030001, value=Op.DIV(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000400040000, value=Op.DIV(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000400040001, value=Op.DIV(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000400050000, value=Op.DIV(Op.SDIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000400050001, value=Op.DIV(Op.SDIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000400060000, value=Op.DIV(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000400060001, value=Op.DIV(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000400070000, value=Op.DIV(Op.SMOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000400070001, value=Op.DIV(Op.SMOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11000400080000, value=Op.DIV(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000400080001, value=Op.DIV(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11000400090000, value=Op.DIV(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000400090001, value=Op.DIV(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x110004000A0000, value=Op.DIV(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110004000A0001, value=Op.DIV(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000400100000, value=Op.DIV(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000400100001, value=Op.DIV(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000400110000, value=Op.DIV(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000400110001, value=Op.DIV(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000400120000, value=Op.DIV(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000400120001, value=Op.DIV(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000400130000, value=Op.DIV(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000400130001, value=Op.DIV(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000400140000, value=Op.DIV(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000400140001, value=Op.DIV(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000400150000, value=Op.DIV(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11000400150001, value=Op.DIV(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11000400160000, value=Op.DIV(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000400160001, value=Op.DIV(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000400170000, value=Op.DIV(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000400170001, value=Op.DIV(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000400180000, value=Op.DIV(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000400180001, value=Op.DIV(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000400190000, value=Op.DIV(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11000400190001, value=Op.DIV(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(key=0x110004001A0000, value=Op.DIV(Op.BYTE(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110004001A0001, value=Op.DIV(Op.BYTE(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110004001B0000, value=Op.DIV(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110004001B0001, value=Op.DIV(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110004001C0000, value=Op.DIV(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110004001C0001, value=Op.DIV(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110004001D0000, value=Op.DIV(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110004001D0001, value=Op.DIV(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000500010000, value=Op.SDIV(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000500010001, value=Op.SDIV(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000500020000, value=Op.SDIV(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000500020001, value=Op.SDIV(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000500030000, value=Op.SDIV(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000500030001, value=Op.SDIV(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000500040000, value=Op.SDIV(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000500040001, value=Op.SDIV(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11000500050000, value=Op.SDIV(Op.SDIV(0x2, 0x1), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000500050001, value=Op.SDIV(Op.SDIV(0x2, 0x1), 0x1)
+        )
+        + Op.SSTORE(key=0x11000500060000, value=Op.SDIV(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000500060001, value=Op.SDIV(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11000500070000, value=Op.SDIV(Op.SMOD(0x2, 0x1), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000500070001, value=Op.SDIV(Op.SMOD(0x2, 0x1), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11000500080000, value=Op.SDIV(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000500080001, value=Op.SDIV(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11000500090000, value=Op.SDIV(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000500090001, value=Op.SDIV(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x110005000A0000, value=Op.SDIV(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110005000A0001, value=Op.SDIV(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000500100000, value=Op.SDIV(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000500100001, value=Op.SDIV(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000500110000, value=Op.SDIV(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000500110001, value=Op.SDIV(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000500120000, value=Op.SDIV(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000500120001, value=Op.SDIV(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000500130000, value=Op.SDIV(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000500130001, value=Op.SDIV(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000500140000, value=Op.SDIV(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000500140001, value=Op.SDIV(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000500150000, value=Op.SDIV(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11000500150001, value=Op.SDIV(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11000500160000, value=Op.SDIV(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000500160001, value=Op.SDIV(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000500170000, value=Op.SDIV(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000500170001, value=Op.SDIV(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000500180000, value=Op.SDIV(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000500180001, value=Op.SDIV(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000500190000, value=Op.SDIV(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11000500190001, value=Op.SDIV(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(
+            key=0x110005001A0000, value=Op.SDIV(Op.BYTE(0x2, 0x1), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x110005001A0001, value=Op.SDIV(Op.BYTE(0x2, 0x1), 0x1)
+        )
+        + Op.SSTORE(key=0x110005001B0000, value=Op.SDIV(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110005001B0001, value=Op.SDIV(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110005001C0000, value=Op.SDIV(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110005001C0001, value=Op.SDIV(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110005001D0000, value=Op.SDIV(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110005001D0001, value=Op.SDIV(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000600010000, value=Op.MOD(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000600010001, value=Op.MOD(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000600020000, value=Op.MOD(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000600020001, value=Op.MOD(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000600030000, value=Op.MOD(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000600030001, value=Op.MOD(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000600040000, value=Op.MOD(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000600040001, value=Op.MOD(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000600050000, value=Op.MOD(Op.SDIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000600050001, value=Op.MOD(Op.SDIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000600060000, value=Op.MOD(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000600060001, value=Op.MOD(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000600070000, value=Op.MOD(Op.SMOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000600070001, value=Op.MOD(Op.SMOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11000600080000, value=Op.MOD(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000600080001, value=Op.MOD(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11000600090000, value=Op.MOD(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000600090001, value=Op.MOD(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x110006000A0000, value=Op.MOD(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110006000A0001, value=Op.MOD(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000600100000, value=Op.MOD(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000600100001, value=Op.MOD(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000600110000, value=Op.MOD(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000600110001, value=Op.MOD(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000600120000, value=Op.MOD(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000600120001, value=Op.MOD(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000600130000, value=Op.MOD(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000600130001, value=Op.MOD(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000600140000, value=Op.MOD(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000600140001, value=Op.MOD(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000600150000, value=Op.MOD(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11000600150001, value=Op.MOD(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11000600160000, value=Op.MOD(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000600160001, value=Op.MOD(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000600170000, value=Op.MOD(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000600170001, value=Op.MOD(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000600180000, value=Op.MOD(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000600180001, value=Op.MOD(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000600190000, value=Op.MOD(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11000600190001, value=Op.MOD(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(key=0x110006001A0000, value=Op.MOD(Op.BYTE(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110006001A0001, value=Op.MOD(Op.BYTE(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110006001B0000, value=Op.MOD(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110006001B0001, value=Op.MOD(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110006001C0000, value=Op.MOD(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110006001C0001, value=Op.MOD(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110006001D0000, value=Op.MOD(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110006001D0001, value=Op.MOD(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000700010000, value=Op.SMOD(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000700010001, value=Op.SMOD(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000700020000, value=Op.SMOD(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000700020001, value=Op.SMOD(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000700030000, value=Op.SMOD(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000700030001, value=Op.SMOD(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000700040000, value=Op.SMOD(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000700040001, value=Op.SMOD(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11000700050000, value=Op.SMOD(Op.SDIV(0x2, 0x1), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000700050001, value=Op.SMOD(Op.SDIV(0x2, 0x1), 0x1)
+        )
+        + Op.SSTORE(key=0x11000700060000, value=Op.SMOD(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000700060001, value=Op.SMOD(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11000700070000, value=Op.SMOD(Op.SMOD(0x2, 0x1), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000700070001, value=Op.SMOD(Op.SMOD(0x2, 0x1), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11000700080000, value=Op.SMOD(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000700080001, value=Op.SMOD(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11000700090000, value=Op.SMOD(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000700090001, value=Op.SMOD(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x110007000A0000, value=Op.SMOD(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110007000A0001, value=Op.SMOD(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000700100000, value=Op.SMOD(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000700100001, value=Op.SMOD(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000700110000, value=Op.SMOD(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000700110001, value=Op.SMOD(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000700120000, value=Op.SMOD(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000700120001, value=Op.SMOD(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000700130000, value=Op.SMOD(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000700130001, value=Op.SMOD(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000700140000, value=Op.SMOD(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000700140001, value=Op.SMOD(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000700150000, value=Op.SMOD(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11000700150001, value=Op.SMOD(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11000700160000, value=Op.SMOD(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000700160001, value=Op.SMOD(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000700170000, value=Op.SMOD(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000700170001, value=Op.SMOD(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000700180000, value=Op.SMOD(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000700180001, value=Op.SMOD(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000700190000, value=Op.SMOD(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11000700190001, value=Op.SMOD(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(
+            key=0x110007001A0000, value=Op.SMOD(Op.BYTE(0x2, 0x1), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x110007001A0001, value=Op.SMOD(Op.BYTE(0x2, 0x1), 0x1)
+        )
+        + Op.SSTORE(key=0x110007001B0000, value=Op.SMOD(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110007001B0001, value=Op.SMOD(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110007001C0000, value=Op.SMOD(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110007001C0001, value=Op.SMOD(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110007001D0000, value=Op.SMOD(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110007001D0001, value=Op.SMOD(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11000800010000, value=Op.ADDMOD(Op.ADD(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800010001, value=Op.ADDMOD(Op.ADD(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800020000, value=Op.ADDMOD(Op.MUL(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800020001, value=Op.ADDMOD(Op.MUL(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800030000, value=Op.ADDMOD(Op.SUB(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800030001, value=Op.ADDMOD(Op.SUB(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800040000, value=Op.ADDMOD(Op.DIV(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800040001, value=Op.ADDMOD(Op.DIV(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800050000, value=Op.ADDMOD(Op.SDIV(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800050001, value=Op.ADDMOD(Op.SDIV(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800060000, value=Op.ADDMOD(Op.MOD(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800060001, value=Op.ADDMOD(Op.MOD(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800070000, value=Op.ADDMOD(Op.SMOD(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800070001, value=Op.ADDMOD(Op.SMOD(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800080000,
+            value=Op.ADDMOD(Op.ADDMOD(0x2, 0x1, 0x3), 0x3, 0x2),
+        )
+        + Op.SSTORE(
+            key=0x11000800080001,
+            value=Op.ADDMOD(Op.ADDMOD(0x2, 0x1, 0x3), 0x1, 0x2),
+        )
+        + Op.SSTORE(
+            key=0x11000800090000,
+            value=Op.ADDMOD(Op.MULMOD(0x2, 0x1, 0x3), 0x3, 0x2),
+        )
+        + Op.SSTORE(
+            key=0x11000800090001,
+            value=Op.ADDMOD(Op.MULMOD(0x2, 0x1, 0x3), 0x1, 0x2),
+        )
+        + Op.SSTORE(
+            key=0x110008000A0000, value=Op.ADDMOD(Op.EXP(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110008000A0001, value=Op.ADDMOD(Op.EXP(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800100000, value=Op.ADDMOD(Op.LT(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800100001, value=Op.ADDMOD(Op.LT(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800110000, value=Op.ADDMOD(Op.GT(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800110001, value=Op.ADDMOD(Op.GT(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800120000, value=Op.ADDMOD(Op.SLT(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800120001, value=Op.ADDMOD(Op.SLT(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800130000, value=Op.ADDMOD(Op.SGT(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800130001, value=Op.ADDMOD(Op.SGT(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800140000, value=Op.ADDMOD(Op.EQ(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800140001, value=Op.ADDMOD(Op.EQ(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800150000, value=Op.ADDMOD(Op.ISZERO(0x2), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800150001, value=Op.ADDMOD(Op.ISZERO(0x2), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800160000, value=Op.ADDMOD(Op.AND(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800160001, value=Op.ADDMOD(Op.AND(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800170000, value=Op.ADDMOD(Op.OR(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800170001, value=Op.ADDMOD(Op.OR(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800180000, value=Op.ADDMOD(Op.XOR(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800180001, value=Op.ADDMOD(Op.XOR(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800190000, value=Op.ADDMOD(Op.NOT(0x2), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000800190001, value=Op.ADDMOD(Op.NOT(0x2), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110008001A0000, value=Op.ADDMOD(Op.BYTE(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110008001A0001, value=Op.ADDMOD(Op.BYTE(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110008001B0000, value=Op.ADDMOD(Op.SHL(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110008001B0001, value=Op.ADDMOD(Op.SHL(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110008001C0000, value=Op.ADDMOD(Op.SHR(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110008001C0001, value=Op.ADDMOD(Op.SHR(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110008001D0000, value=Op.ADDMOD(Op.SAR(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110008001D0001, value=Op.ADDMOD(Op.SAR(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900010000, value=Op.MULMOD(Op.ADD(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900010001, value=Op.MULMOD(Op.ADD(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900020000, value=Op.MULMOD(Op.MUL(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900020001, value=Op.MULMOD(Op.MUL(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900030000, value=Op.MULMOD(Op.SUB(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900030001, value=Op.MULMOD(Op.SUB(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900040000, value=Op.MULMOD(Op.DIV(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900040001, value=Op.MULMOD(Op.DIV(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900050000, value=Op.MULMOD(Op.SDIV(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900050001, value=Op.MULMOD(Op.SDIV(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900060000, value=Op.MULMOD(Op.MOD(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900060001, value=Op.MULMOD(Op.MOD(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900070000, value=Op.MULMOD(Op.SMOD(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900070001, value=Op.MULMOD(Op.SMOD(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900080000,
+            value=Op.MULMOD(Op.ADDMOD(0x2, 0x1, 0x3), 0x3, 0x2),
+        )
+        + Op.SSTORE(
+            key=0x11000900080001,
+            value=Op.MULMOD(Op.ADDMOD(0x2, 0x1, 0x3), 0x1, 0x2),
+        )
+        + Op.SSTORE(
+            key=0x11000900090000,
+            value=Op.MULMOD(Op.MULMOD(0x2, 0x1, 0x3), 0x3, 0x2),
+        )
+        + Op.SSTORE(
+            key=0x11000900090001,
+            value=Op.MULMOD(Op.MULMOD(0x2, 0x1, 0x3), 0x1, 0x2),
+        )
+        + Op.SSTORE(
+            key=0x110009000A0000, value=Op.MULMOD(Op.EXP(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110009000A0001, value=Op.MULMOD(Op.EXP(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900100000, value=Op.MULMOD(Op.LT(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900100001, value=Op.MULMOD(Op.LT(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900110000, value=Op.MULMOD(Op.GT(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900110001, value=Op.MULMOD(Op.GT(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900120000, value=Op.MULMOD(Op.SLT(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900120001, value=Op.MULMOD(Op.SLT(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900130000, value=Op.MULMOD(Op.SGT(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900130001, value=Op.MULMOD(Op.SGT(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900140000, value=Op.MULMOD(Op.EQ(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900140001, value=Op.MULMOD(Op.EQ(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900150000, value=Op.MULMOD(Op.ISZERO(0x2), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900150001, value=Op.MULMOD(Op.ISZERO(0x2), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900160000, value=Op.MULMOD(Op.AND(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900160001, value=Op.MULMOD(Op.AND(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900170000, value=Op.MULMOD(Op.OR(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900170001, value=Op.MULMOD(Op.OR(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900180000, value=Op.MULMOD(Op.XOR(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900180001, value=Op.MULMOD(Op.XOR(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900190000, value=Op.MULMOD(Op.NOT(0x2), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x11000900190001, value=Op.MULMOD(Op.NOT(0x2), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110009001A0000, value=Op.MULMOD(Op.BYTE(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110009001A0001, value=Op.MULMOD(Op.BYTE(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110009001B0000, value=Op.MULMOD(Op.SHL(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110009001B0001, value=Op.MULMOD(Op.SHL(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110009001C0000, value=Op.MULMOD(Op.SHR(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110009001C0001, value=Op.MULMOD(Op.SHR(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110009001D0000, value=Op.MULMOD(Op.SAR(0x2, 0x1), 0x3, 0x2)
+        )
+        + Op.SSTORE(
+            key=0x110009001D0001, value=Op.MULMOD(Op.SAR(0x2, 0x1), 0x1, 0x2)
+        )
+        + Op.SSTORE(key=0x11000A00010000, value=Op.EXP(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A00010001, value=Op.EXP(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A00020000, value=Op.EXP(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A00020001, value=Op.EXP(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A00030000, value=Op.EXP(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A00030001, value=Op.EXP(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A00040000, value=Op.EXP(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A00040001, value=Op.EXP(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A00050000, value=Op.EXP(Op.SDIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A00050001, value=Op.EXP(Op.SDIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A00060000, value=Op.EXP(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A00060001, value=Op.EXP(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A00070000, value=Op.EXP(Op.SMOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A00070001, value=Op.EXP(Op.SMOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11000A00080000, value=Op.EXP(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000A00080001, value=Op.EXP(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11000A00090000, value=Op.EXP(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11000A00090001, value=Op.EXP(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x11000A000A0000, value=Op.EXP(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A000A0001, value=Op.EXP(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A00100000, value=Op.EXP(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A00100001, value=Op.EXP(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A00110000, value=Op.EXP(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A00110001, value=Op.EXP(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A00120000, value=Op.EXP(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A00120001, value=Op.EXP(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A00130000, value=Op.EXP(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A00130001, value=Op.EXP(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A00140000, value=Op.EXP(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A00140001, value=Op.EXP(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A00150000, value=Op.EXP(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11000A00150001, value=Op.EXP(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11000A00160000, value=Op.EXP(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A00160001, value=Op.EXP(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A00170000, value=Op.EXP(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A00170001, value=Op.EXP(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A00180000, value=Op.EXP(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A00180001, value=Op.EXP(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A00190000, value=Op.EXP(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11000A00190001, value=Op.EXP(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(key=0x11000A001A0000, value=Op.EXP(Op.BYTE(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A001A0001, value=Op.EXP(Op.BYTE(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A001B0000, value=Op.EXP(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A001B0001, value=Op.EXP(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A001C0000, value=Op.EXP(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A001C0001, value=Op.EXP(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11000A001D0000, value=Op.EXP(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11000A001D0001, value=Op.EXP(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001000010000, value=Op.LT(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001000010001, value=Op.LT(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001000020000, value=Op.LT(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001000020001, value=Op.LT(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001000030000, value=Op.LT(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001000030001, value=Op.LT(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001000040000, value=Op.LT(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001000040001, value=Op.LT(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001000050000, value=Op.LT(Op.SDIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001000050001, value=Op.LT(Op.SDIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001000060000, value=Op.LT(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001000060001, value=Op.LT(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001000070000, value=Op.LT(Op.SMOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001000070001, value=Op.LT(Op.SMOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11001000080000, value=Op.LT(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001000080001, value=Op.LT(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11001000090000, value=Op.LT(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001000090001, value=Op.LT(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x110010000A0000, value=Op.LT(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110010000A0001, value=Op.LT(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001000100000, value=Op.LT(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001000100001, value=Op.LT(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001000110000, value=Op.LT(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001000110001, value=Op.LT(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001000120000, value=Op.LT(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001000120001, value=Op.LT(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001000130000, value=Op.LT(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001000130001, value=Op.LT(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001000140000, value=Op.LT(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001000140001, value=Op.LT(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001000150000, value=Op.LT(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11001000150001, value=Op.LT(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11001000160000, value=Op.LT(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001000160001, value=Op.LT(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001000170000, value=Op.LT(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001000170001, value=Op.LT(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001000180000, value=Op.LT(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001000180001, value=Op.LT(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001000190000, value=Op.LT(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11001000190001, value=Op.LT(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(key=0x110010001A0000, value=Op.LT(Op.BYTE(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110010001A0001, value=Op.LT(Op.BYTE(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110010001B0000, value=Op.LT(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110010001B0001, value=Op.LT(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110010001C0000, value=Op.LT(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110010001C0001, value=Op.LT(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110010001D0000, value=Op.LT(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110010001D0001, value=Op.LT(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001100010000, value=Op.GT(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001100010001, value=Op.GT(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001100020000, value=Op.GT(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001100020001, value=Op.GT(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001100030000, value=Op.GT(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001100030001, value=Op.GT(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001100040000, value=Op.GT(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001100040001, value=Op.GT(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001100050000, value=Op.GT(Op.SDIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001100050001, value=Op.GT(Op.SDIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001100060000, value=Op.GT(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001100060001, value=Op.GT(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001100070000, value=Op.GT(Op.SMOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001100070001, value=Op.GT(Op.SMOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11001100080000, value=Op.GT(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001100080001, value=Op.GT(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11001100090000, value=Op.GT(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001100090001, value=Op.GT(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x110011000A0000, value=Op.GT(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110011000A0001, value=Op.GT(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001100100000, value=Op.GT(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001100100001, value=Op.GT(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001100110000, value=Op.GT(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001100110001, value=Op.GT(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001100120000, value=Op.GT(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001100120001, value=Op.GT(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001100130000, value=Op.GT(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001100130001, value=Op.GT(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001100140000, value=Op.GT(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001100140001, value=Op.GT(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001100150000, value=Op.GT(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11001100150001, value=Op.GT(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11001100160000, value=Op.GT(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001100160001, value=Op.GT(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001100170000, value=Op.GT(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001100170001, value=Op.GT(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001100180000, value=Op.GT(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001100180001, value=Op.GT(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001100190000, value=Op.GT(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11001100190001, value=Op.GT(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(key=0x110011001A0000, value=Op.GT(Op.BYTE(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110011001A0001, value=Op.GT(Op.BYTE(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110011001B0000, value=Op.GT(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110011001B0001, value=Op.GT(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110011001C0000, value=Op.GT(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110011001C0001, value=Op.GT(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110011001D0000, value=Op.GT(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110011001D0001, value=Op.GT(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001200010000, value=Op.SLT(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001200010001, value=Op.SLT(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001200020000, value=Op.SLT(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001200020001, value=Op.SLT(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001200030000, value=Op.SLT(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001200030001, value=Op.SLT(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001200040000, value=Op.SLT(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001200040001, value=Op.SLT(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001200050000, value=Op.SLT(Op.SDIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001200050001, value=Op.SLT(Op.SDIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001200060000, value=Op.SLT(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001200060001, value=Op.SLT(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001200070000, value=Op.SLT(Op.SMOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001200070001, value=Op.SLT(Op.SMOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11001200080000, value=Op.SLT(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001200080001, value=Op.SLT(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11001200090000, value=Op.SLT(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001200090001, value=Op.SLT(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x110012000A0000, value=Op.SLT(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110012000A0001, value=Op.SLT(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001200100000, value=Op.SLT(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001200100001, value=Op.SLT(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001200110000, value=Op.SLT(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001200110001, value=Op.SLT(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001200120000, value=Op.SLT(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001200120001, value=Op.SLT(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001200130000, value=Op.SLT(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001200130001, value=Op.SLT(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001200140000, value=Op.SLT(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001200140001, value=Op.SLT(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001200150000, value=Op.SLT(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11001200150001, value=Op.SLT(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11001200160000, value=Op.SLT(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001200160001, value=Op.SLT(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001200170000, value=Op.SLT(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001200170001, value=Op.SLT(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001200180000, value=Op.SLT(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001200180001, value=Op.SLT(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001200190000, value=Op.SLT(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11001200190001, value=Op.SLT(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(key=0x110012001A0000, value=Op.SLT(Op.BYTE(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110012001A0001, value=Op.SLT(Op.BYTE(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110012001B0000, value=Op.SLT(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110012001B0001, value=Op.SLT(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110012001C0000, value=Op.SLT(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110012001C0001, value=Op.SLT(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110012001D0000, value=Op.SLT(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110012001D0001, value=Op.SLT(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001300010000, value=Op.SGT(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001300010001, value=Op.SGT(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001300020000, value=Op.SGT(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001300020001, value=Op.SGT(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001300030000, value=Op.SGT(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001300030001, value=Op.SGT(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001300040000, value=Op.SGT(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001300040001, value=Op.SGT(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001300050000, value=Op.SGT(Op.SDIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001300050001, value=Op.SGT(Op.SDIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001300060000, value=Op.SGT(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001300060001, value=Op.SGT(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001300070000, value=Op.SGT(Op.SMOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001300070001, value=Op.SGT(Op.SMOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11001300080000, value=Op.SGT(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001300080001, value=Op.SGT(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11001300090000, value=Op.SGT(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001300090001, value=Op.SGT(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x110013000A0000, value=Op.SGT(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110013000A0001, value=Op.SGT(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001300100000, value=Op.SGT(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001300100001, value=Op.SGT(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001300110000, value=Op.SGT(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001300110001, value=Op.SGT(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001300120000, value=Op.SGT(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001300120001, value=Op.SGT(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001300130000, value=Op.SGT(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001300130001, value=Op.SGT(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001300140000, value=Op.SGT(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001300140001, value=Op.SGT(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001300150000, value=Op.SGT(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11001300150001, value=Op.SGT(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11001300160000, value=Op.SGT(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001300160001, value=Op.SGT(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001300170000, value=Op.SGT(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001300170001, value=Op.SGT(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001300180000, value=Op.SGT(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001300180001, value=Op.SGT(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001300190000, value=Op.SGT(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11001300190001, value=Op.SGT(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(key=0x110013001A0000, value=Op.SGT(Op.BYTE(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110013001A0001, value=Op.SGT(Op.BYTE(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110013001B0000, value=Op.SGT(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110013001B0001, value=Op.SGT(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110013001C0000, value=Op.SGT(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110013001C0001, value=Op.SGT(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110013001D0000, value=Op.SGT(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110013001D0001, value=Op.SGT(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001400010000, value=Op.EQ(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001400010001, value=Op.EQ(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001400020000, value=Op.EQ(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001400020001, value=Op.EQ(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001400030000, value=Op.EQ(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001400030001, value=Op.EQ(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001400040000, value=Op.EQ(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001400040001, value=Op.EQ(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001400050000, value=Op.EQ(Op.SDIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001400050001, value=Op.EQ(Op.SDIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001400060000, value=Op.EQ(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001400060001, value=Op.EQ(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001400070000, value=Op.EQ(Op.SMOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001400070001, value=Op.EQ(Op.SMOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11001400080000, value=Op.EQ(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001400080001, value=Op.EQ(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11001400090000, value=Op.EQ(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001400090001, value=Op.EQ(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x110014000A0000, value=Op.EQ(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110014000A0001, value=Op.EQ(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001400100000, value=Op.EQ(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001400100001, value=Op.EQ(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001400110000, value=Op.EQ(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001400110001, value=Op.EQ(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001400120000, value=Op.EQ(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001400120001, value=Op.EQ(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001400130000, value=Op.EQ(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001400130001, value=Op.EQ(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001400140000, value=Op.EQ(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001400140001, value=Op.EQ(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001400150000, value=Op.EQ(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11001400150001, value=Op.EQ(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11001400160000, value=Op.EQ(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001400160001, value=Op.EQ(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001400170000, value=Op.EQ(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001400170001, value=Op.EQ(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001400180000, value=Op.EQ(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001400180001, value=Op.EQ(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001400190000, value=Op.EQ(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11001400190001, value=Op.EQ(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(key=0x110014001A0000, value=Op.EQ(Op.BYTE(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110014001A0001, value=Op.EQ(Op.BYTE(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110014001B0000, value=Op.EQ(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110014001B0001, value=Op.EQ(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110014001C0000, value=Op.EQ(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110014001C0001, value=Op.EQ(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110014001D0000, value=Op.EQ(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110014001D0001, value=Op.EQ(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001500010000, value=Op.ISZERO(Op.ADD(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500010001, value=Op.ISZERO(Op.ADD(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500020000, value=Op.ISZERO(Op.MUL(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500020001, value=Op.ISZERO(Op.MUL(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500030000, value=Op.ISZERO(Op.SUB(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500030001, value=Op.ISZERO(Op.SUB(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500040000, value=Op.ISZERO(Op.DIV(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500040001, value=Op.ISZERO(Op.DIV(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500050000, value=Op.ISZERO(Op.SDIV(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500050001, value=Op.ISZERO(Op.SDIV(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500060000, value=Op.ISZERO(Op.MOD(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500060001, value=Op.ISZERO(Op.MOD(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500070000, value=Op.ISZERO(Op.SMOD(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500070001, value=Op.ISZERO(Op.SMOD(0x2, 0x1)))
+        + Op.SSTORE(
+            key=0x11001500080000, value=Op.ISZERO(Op.ADDMOD(0x2, 0x1, 0x3))
+        )
+        + Op.SSTORE(
+            key=0x11001500080001, value=Op.ISZERO(Op.ADDMOD(0x2, 0x1, 0x3))
+        )
+        + Op.SSTORE(
+            key=0x11001500090000, value=Op.ISZERO(Op.MULMOD(0x2, 0x1, 0x3))
+        )
+        + Op.SSTORE(
+            key=0x11001500090001, value=Op.ISZERO(Op.MULMOD(0x2, 0x1, 0x3))
+        )
+        + Op.SSTORE(key=0x110015000A0000, value=Op.ISZERO(Op.EXP(0x2, 0x1)))
+        + Op.SSTORE(key=0x110015000A0001, value=Op.ISZERO(Op.EXP(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500100000, value=Op.ISZERO(Op.LT(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500100001, value=Op.ISZERO(Op.LT(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500110000, value=Op.ISZERO(Op.GT(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500110001, value=Op.ISZERO(Op.GT(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500120000, value=Op.ISZERO(Op.SLT(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500120001, value=Op.ISZERO(Op.SLT(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500130000, value=Op.ISZERO(Op.SGT(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500130001, value=Op.ISZERO(Op.SGT(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500140000, value=Op.ISZERO(Op.EQ(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500140001, value=Op.ISZERO(Op.EQ(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500150000, value=Op.ISZERO(Op.ISZERO(0x2)))
+        + Op.SSTORE(key=0x11001500150001, value=Op.ISZERO(Op.ISZERO(0x2)))
+        + Op.SSTORE(key=0x11001500160000, value=Op.ISZERO(Op.AND(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500160001, value=Op.ISZERO(Op.AND(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500170000, value=Op.ISZERO(Op.OR(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500170001, value=Op.ISZERO(Op.OR(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500180000, value=Op.ISZERO(Op.XOR(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500180001, value=Op.ISZERO(Op.XOR(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001500190000, value=Op.ISZERO(Op.NOT(0x2)))
+        + Op.SSTORE(key=0x11001500190001, value=Op.ISZERO(Op.NOT(0x2)))
+        + Op.SSTORE(key=0x110015001A0000, value=Op.ISZERO(Op.BYTE(0x2, 0x1)))
+        + Op.SSTORE(key=0x110015001A0001, value=Op.ISZERO(Op.BYTE(0x2, 0x1)))
+        + Op.SSTORE(key=0x110015001B0000, value=Op.ISZERO(Op.SHL(0x2, 0x1)))
+        + Op.SSTORE(key=0x110015001B0001, value=Op.ISZERO(Op.SHL(0x2, 0x1)))
+        + Op.SSTORE(key=0x110015001C0000, value=Op.ISZERO(Op.SHR(0x2, 0x1)))
+        + Op.SSTORE(key=0x110015001C0001, value=Op.ISZERO(Op.SHR(0x2, 0x1)))
+        + Op.SSTORE(key=0x110015001D0000, value=Op.ISZERO(Op.SAR(0x2, 0x1)))
+        + Op.SSTORE(key=0x110015001D0001, value=Op.ISZERO(Op.SAR(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001600010000, value=Op.AND(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001600010001, value=Op.AND(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001600020000, value=Op.AND(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001600020001, value=Op.AND(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001600030000, value=Op.AND(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001600030001, value=Op.AND(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001600040000, value=Op.AND(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001600040001, value=Op.AND(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001600050000, value=Op.AND(Op.SDIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001600050001, value=Op.AND(Op.SDIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001600060000, value=Op.AND(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001600060001, value=Op.AND(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001600070000, value=Op.AND(Op.SMOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001600070001, value=Op.AND(Op.SMOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11001600080000, value=Op.AND(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001600080001, value=Op.AND(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11001600090000, value=Op.AND(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001600090001, value=Op.AND(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x110016000A0000, value=Op.AND(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110016000A0001, value=Op.AND(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001600100000, value=Op.AND(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001600100001, value=Op.AND(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001600110000, value=Op.AND(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001600110001, value=Op.AND(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001600120000, value=Op.AND(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001600120001, value=Op.AND(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001600130000, value=Op.AND(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001600130001, value=Op.AND(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001600140000, value=Op.AND(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001600140001, value=Op.AND(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001600150000, value=Op.AND(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11001600150001, value=Op.AND(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11001600160000, value=Op.AND(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001600160001, value=Op.AND(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001600170000, value=Op.AND(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001600170001, value=Op.AND(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001600180000, value=Op.AND(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001600180001, value=Op.AND(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001600190000, value=Op.AND(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11001600190001, value=Op.AND(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(key=0x110016001A0000, value=Op.AND(Op.BYTE(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110016001A0001, value=Op.AND(Op.BYTE(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110016001B0000, value=Op.AND(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110016001B0001, value=Op.AND(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110016001C0000, value=Op.AND(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110016001C0001, value=Op.AND(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110016001D0000, value=Op.AND(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110016001D0001, value=Op.AND(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001700010000, value=Op.OR(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001700010001, value=Op.OR(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001700020000, value=Op.OR(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001700020001, value=Op.OR(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001700030000, value=Op.OR(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001700030001, value=Op.OR(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001700040000, value=Op.OR(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001700040001, value=Op.OR(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001700050000, value=Op.OR(Op.SDIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001700050001, value=Op.OR(Op.SDIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001700060000, value=Op.OR(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001700060001, value=Op.OR(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001700070000, value=Op.OR(Op.SMOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001700070001, value=Op.OR(Op.SMOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11001700080000, value=Op.OR(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001700080001, value=Op.OR(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11001700090000, value=Op.OR(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001700090001, value=Op.OR(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x110017000A0000, value=Op.OR(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110017000A0001, value=Op.OR(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001700100000, value=Op.OR(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001700100001, value=Op.OR(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001700110000, value=Op.OR(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001700110001, value=Op.OR(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001700120000, value=Op.OR(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001700120001, value=Op.OR(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001700130000, value=Op.OR(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001700130001, value=Op.OR(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001700140000, value=Op.OR(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001700140001, value=Op.OR(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001700150000, value=Op.OR(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11001700150001, value=Op.OR(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11001700160000, value=Op.OR(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001700160001, value=Op.OR(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001700170000, value=Op.OR(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001700170001, value=Op.OR(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001700180000, value=Op.OR(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001700180001, value=Op.OR(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001700190000, value=Op.OR(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11001700190001, value=Op.OR(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(key=0x110017001A0000, value=Op.OR(Op.BYTE(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110017001A0001, value=Op.OR(Op.BYTE(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110017001B0000, value=Op.OR(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110017001B0001, value=Op.OR(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110017001C0000, value=Op.OR(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110017001C0001, value=Op.OR(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110017001D0000, value=Op.OR(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110017001D0001, value=Op.OR(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001800010000, value=Op.XOR(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001800010001, value=Op.XOR(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001800020000, value=Op.XOR(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001800020001, value=Op.XOR(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001800030000, value=Op.XOR(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001800030001, value=Op.XOR(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001800040000, value=Op.XOR(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001800040001, value=Op.XOR(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001800050000, value=Op.XOR(Op.SDIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001800050001, value=Op.XOR(Op.SDIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001800060000, value=Op.XOR(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001800060001, value=Op.XOR(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001800070000, value=Op.XOR(Op.SMOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001800070001, value=Op.XOR(Op.SMOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11001800080000, value=Op.XOR(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001800080001, value=Op.XOR(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11001800090000, value=Op.XOR(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001800090001, value=Op.XOR(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x110018000A0000, value=Op.XOR(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110018000A0001, value=Op.XOR(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001800100000, value=Op.XOR(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001800100001, value=Op.XOR(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001800110000, value=Op.XOR(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001800110001, value=Op.XOR(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001800120000, value=Op.XOR(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001800120001, value=Op.XOR(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001800130000, value=Op.XOR(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001800130001, value=Op.XOR(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001800140000, value=Op.XOR(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001800140001, value=Op.XOR(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001800150000, value=Op.XOR(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11001800150001, value=Op.XOR(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11001800160000, value=Op.XOR(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001800160001, value=Op.XOR(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001800170000, value=Op.XOR(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001800170001, value=Op.XOR(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001800180000, value=Op.XOR(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001800180001, value=Op.XOR(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001800190000, value=Op.XOR(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11001800190001, value=Op.XOR(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(key=0x110018001A0000, value=Op.XOR(Op.BYTE(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110018001A0001, value=Op.XOR(Op.BYTE(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110018001B0000, value=Op.XOR(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110018001B0001, value=Op.XOR(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110018001C0000, value=Op.XOR(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110018001C0001, value=Op.XOR(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x110018001D0000, value=Op.XOR(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x110018001D0001, value=Op.XOR(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001900010000, value=Op.NOT(Op.ADD(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900010001, value=Op.NOT(Op.ADD(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900020000, value=Op.NOT(Op.MUL(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900020001, value=Op.NOT(Op.MUL(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900030000, value=Op.NOT(Op.SUB(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900030001, value=Op.NOT(Op.SUB(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900040000, value=Op.NOT(Op.DIV(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900040001, value=Op.NOT(Op.DIV(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900050000, value=Op.NOT(Op.SDIV(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900050001, value=Op.NOT(Op.SDIV(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900060000, value=Op.NOT(Op.MOD(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900060001, value=Op.NOT(Op.MOD(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900070000, value=Op.NOT(Op.SMOD(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900070001, value=Op.NOT(Op.SMOD(0x2, 0x1)))
+        + Op.SSTORE(
+            key=0x11001900080000, value=Op.NOT(Op.ADDMOD(0x2, 0x1, 0x3))
+        )
+        + Op.SSTORE(
+            key=0x11001900080001, value=Op.NOT(Op.ADDMOD(0x2, 0x1, 0x3))
+        )
+        + Op.SSTORE(
+            key=0x11001900090000, value=Op.NOT(Op.MULMOD(0x2, 0x1, 0x3))
+        )
+        + Op.SSTORE(
+            key=0x11001900090001, value=Op.NOT(Op.MULMOD(0x2, 0x1, 0x3))
+        )
+        + Op.SSTORE(key=0x110019000A0000, value=Op.NOT(Op.EXP(0x2, 0x1)))
+        + Op.SSTORE(key=0x110019000A0001, value=Op.NOT(Op.EXP(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900100000, value=Op.NOT(Op.LT(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900100001, value=Op.NOT(Op.LT(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900110000, value=Op.NOT(Op.GT(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900110001, value=Op.NOT(Op.GT(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900120000, value=Op.NOT(Op.SLT(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900120001, value=Op.NOT(Op.SLT(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900130000, value=Op.NOT(Op.SGT(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900130001, value=Op.NOT(Op.SGT(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900140000, value=Op.NOT(Op.EQ(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900140001, value=Op.NOT(Op.EQ(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900150000, value=Op.NOT(Op.ISZERO(0x2)))
+        + Op.SSTORE(key=0x11001900150001, value=Op.NOT(Op.ISZERO(0x2)))
+        + Op.SSTORE(key=0x11001900160000, value=Op.NOT(Op.AND(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900160001, value=Op.NOT(Op.AND(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900170000, value=Op.NOT(Op.OR(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900170001, value=Op.NOT(Op.OR(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900180000, value=Op.NOT(Op.XOR(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900180001, value=Op.NOT(Op.XOR(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001900190000, value=Op.NOT(Op.NOT(0x2)))
+        + Op.SSTORE(key=0x11001900190001, value=Op.NOT(Op.NOT(0x2)))
+        + Op.SSTORE(key=0x110019001A0000, value=Op.NOT(Op.BYTE(0x2, 0x1)))
+        + Op.SSTORE(key=0x110019001A0001, value=Op.NOT(Op.BYTE(0x2, 0x1)))
+        + Op.SSTORE(key=0x110019001B0000, value=Op.NOT(Op.SHL(0x2, 0x1)))
+        + Op.SSTORE(key=0x110019001B0001, value=Op.NOT(Op.SHL(0x2, 0x1)))
+        + Op.SSTORE(key=0x110019001C0000, value=Op.NOT(Op.SHR(0x2, 0x1)))
+        + Op.SSTORE(key=0x110019001C0001, value=Op.NOT(Op.SHR(0x2, 0x1)))
+        + Op.SSTORE(key=0x110019001D0000, value=Op.NOT(Op.SAR(0x2, 0x1)))
+        + Op.SSTORE(key=0x110019001D0001, value=Op.NOT(Op.SAR(0x2, 0x1)))
+        + Op.SSTORE(key=0x11001A00010000, value=Op.BYTE(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001A00010001, value=Op.BYTE(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001A00020000, value=Op.BYTE(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001A00020001, value=Op.BYTE(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001A00030000, value=Op.BYTE(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001A00030001, value=Op.BYTE(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001A00040000, value=Op.BYTE(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001A00040001, value=Op.BYTE(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11001A00050000, value=Op.BYTE(Op.SDIV(0x2, 0x1), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001A00050001, value=Op.BYTE(Op.SDIV(0x2, 0x1), 0x1)
+        )
+        + Op.SSTORE(key=0x11001A00060000, value=Op.BYTE(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001A00060001, value=Op.BYTE(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11001A00070000, value=Op.BYTE(Op.SMOD(0x2, 0x1), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001A00070001, value=Op.BYTE(Op.SMOD(0x2, 0x1), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11001A00080000, value=Op.BYTE(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001A00080001, value=Op.BYTE(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11001A00090000, value=Op.BYTE(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001A00090001, value=Op.BYTE(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x11001A000A0000, value=Op.BYTE(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001A000A0001, value=Op.BYTE(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001A00100000, value=Op.BYTE(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001A00100001, value=Op.BYTE(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001A00110000, value=Op.BYTE(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001A00110001, value=Op.BYTE(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001A00120000, value=Op.BYTE(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001A00120001, value=Op.BYTE(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001A00130000, value=Op.BYTE(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001A00130001, value=Op.BYTE(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001A00140000, value=Op.BYTE(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001A00140001, value=Op.BYTE(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001A00150000, value=Op.BYTE(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11001A00150001, value=Op.BYTE(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11001A00160000, value=Op.BYTE(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001A00160001, value=Op.BYTE(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001A00170000, value=Op.BYTE(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001A00170001, value=Op.BYTE(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001A00180000, value=Op.BYTE(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001A00180001, value=Op.BYTE(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001A00190000, value=Op.BYTE(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11001A00190001, value=Op.BYTE(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(
+            key=0x11001A001A0000, value=Op.BYTE(Op.BYTE(0x2, 0x1), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001A001A0001, value=Op.BYTE(Op.BYTE(0x2, 0x1), 0x1)
+        )
+        + Op.SSTORE(key=0x11001A001B0000, value=Op.BYTE(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001A001B0001, value=Op.BYTE(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001A001C0000, value=Op.BYTE(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001A001C0001, value=Op.BYTE(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001A001D0000, value=Op.BYTE(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001A001D0001, value=Op.BYTE(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B00010000, value=Op.SHL(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B00010001, value=Op.SHL(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B00020000, value=Op.SHL(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B00020001, value=Op.SHL(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B00030000, value=Op.SHL(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B00030001, value=Op.SHL(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B00040000, value=Op.SHL(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B00040001, value=Op.SHL(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B00050000, value=Op.SHL(Op.SDIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B00050001, value=Op.SHL(Op.SDIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B00060000, value=Op.SHL(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B00060001, value=Op.SHL(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B00070000, value=Op.SHL(Op.SMOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B00070001, value=Op.SHL(Op.SMOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11001B00080000, value=Op.SHL(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001B00080001, value=Op.SHL(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11001B00090000, value=Op.SHL(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001B00090001, value=Op.SHL(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x11001B000A0000, value=Op.SHL(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B000A0001, value=Op.SHL(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B00100000, value=Op.SHL(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B00100001, value=Op.SHL(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B00110000, value=Op.SHL(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B00110001, value=Op.SHL(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B00120000, value=Op.SHL(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B00120001, value=Op.SHL(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B00130000, value=Op.SHL(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B00130001, value=Op.SHL(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B00140000, value=Op.SHL(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B00140001, value=Op.SHL(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B00150000, value=Op.SHL(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11001B00150001, value=Op.SHL(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11001B00160000, value=Op.SHL(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B00160001, value=Op.SHL(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B00170000, value=Op.SHL(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B00170001, value=Op.SHL(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B00180000, value=Op.SHL(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B00180001, value=Op.SHL(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B00190000, value=Op.SHL(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11001B00190001, value=Op.SHL(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(key=0x11001B001A0000, value=Op.SHL(Op.BYTE(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B001A0001, value=Op.SHL(Op.BYTE(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B001B0000, value=Op.SHL(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B001B0001, value=Op.SHL(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B001C0000, value=Op.SHL(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B001C0001, value=Op.SHL(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001B001D0000, value=Op.SHL(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001B001D0001, value=Op.SHL(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C00010000, value=Op.SHR(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C00010001, value=Op.SHR(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C00020000, value=Op.SHR(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C00020001, value=Op.SHR(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C00030000, value=Op.SHR(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C00030001, value=Op.SHR(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C00040000, value=Op.SHR(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C00040001, value=Op.SHR(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C00050000, value=Op.SHR(Op.SDIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C00050001, value=Op.SHR(Op.SDIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C00060000, value=Op.SHR(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C00060001, value=Op.SHR(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C00070000, value=Op.SHR(Op.SMOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C00070001, value=Op.SHR(Op.SMOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11001C00080000, value=Op.SHR(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001C00080001, value=Op.SHR(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11001C00090000, value=Op.SHR(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001C00090001, value=Op.SHR(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x11001C000A0000, value=Op.SHR(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C000A0001, value=Op.SHR(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C00100000, value=Op.SHR(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C00100001, value=Op.SHR(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C00110000, value=Op.SHR(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C00110001, value=Op.SHR(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C00120000, value=Op.SHR(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C00120001, value=Op.SHR(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C00130000, value=Op.SHR(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C00130001, value=Op.SHR(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C00140000, value=Op.SHR(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C00140001, value=Op.SHR(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C00150000, value=Op.SHR(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11001C00150001, value=Op.SHR(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11001C00160000, value=Op.SHR(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C00160001, value=Op.SHR(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C00170000, value=Op.SHR(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C00170001, value=Op.SHR(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C00180000, value=Op.SHR(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C00180001, value=Op.SHR(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C00190000, value=Op.SHR(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11001C00190001, value=Op.SHR(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(key=0x11001C001A0000, value=Op.SHR(Op.BYTE(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C001A0001, value=Op.SHR(Op.BYTE(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C001B0000, value=Op.SHR(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C001B0001, value=Op.SHR(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C001C0000, value=Op.SHR(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C001C0001, value=Op.SHR(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001C001D0000, value=Op.SHR(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001C001D0001, value=Op.SHR(Op.SAR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D00010000, value=Op.SAR(Op.ADD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D00010001, value=Op.SAR(Op.ADD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D00020000, value=Op.SAR(Op.MUL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D00020001, value=Op.SAR(Op.MUL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D00030000, value=Op.SAR(Op.SUB(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D00030001, value=Op.SAR(Op.SUB(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D00040000, value=Op.SAR(Op.DIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D00040001, value=Op.SAR(Op.DIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D00050000, value=Op.SAR(Op.SDIV(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D00050001, value=Op.SAR(Op.SDIV(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D00060000, value=Op.SAR(Op.MOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D00060001, value=Op.SAR(Op.MOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D00070000, value=Op.SAR(Op.SMOD(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D00070001, value=Op.SAR(Op.SMOD(0x2, 0x1), 0x1))
+        + Op.SSTORE(
+            key=0x11001D00080000, value=Op.SAR(Op.ADDMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001D00080001, value=Op.SAR(Op.ADDMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(
+            key=0x11001D00090000, value=Op.SAR(Op.MULMOD(0x2, 0x1, 0x3), 0x3)
+        )
+        + Op.SSTORE(
+            key=0x11001D00090001, value=Op.SAR(Op.MULMOD(0x2, 0x1, 0x3), 0x1)
+        )
+        + Op.SSTORE(key=0x11001D000A0000, value=Op.SAR(Op.EXP(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D000A0001, value=Op.SAR(Op.EXP(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D00100000, value=Op.SAR(Op.LT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D00100001, value=Op.SAR(Op.LT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D00110000, value=Op.SAR(Op.GT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D00110001, value=Op.SAR(Op.GT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D00120000, value=Op.SAR(Op.SLT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D00120001, value=Op.SAR(Op.SLT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D00130000, value=Op.SAR(Op.SGT(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D00130001, value=Op.SAR(Op.SGT(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D00140000, value=Op.SAR(Op.EQ(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D00140001, value=Op.SAR(Op.EQ(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D00150000, value=Op.SAR(Op.ISZERO(0x2), 0x3))
+        + Op.SSTORE(key=0x11001D00150001, value=Op.SAR(Op.ISZERO(0x2), 0x1))
+        + Op.SSTORE(key=0x11001D00160000, value=Op.SAR(Op.AND(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D00160001, value=Op.SAR(Op.AND(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D00170000, value=Op.SAR(Op.OR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D00170001, value=Op.SAR(Op.OR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D00180000, value=Op.SAR(Op.XOR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D00180001, value=Op.SAR(Op.XOR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D00190000, value=Op.SAR(Op.NOT(0x2), 0x3))
+        + Op.SSTORE(key=0x11001D00190001, value=Op.SAR(Op.NOT(0x2), 0x1))
+        + Op.SSTORE(key=0x11001D001A0000, value=Op.SAR(Op.BYTE(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D001A0001, value=Op.SAR(Op.BYTE(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D001B0000, value=Op.SAR(Op.SHL(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D001B0001, value=Op.SAR(Op.SHL(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D001C0000, value=Op.SAR(Op.SHR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D001C0001, value=Op.SAR(Op.SHR(0x2, 0x1), 0x1))
+        + Op.SSTORE(key=0x11001D001D0000, value=Op.SAR(Op.SAR(0x2, 0x1), 0x3))
+        + Op.SSTORE(key=0x11001D001D0001, value=Op.SAR(Op.SAR(0x2, 0x1), 0x1))
+        + Op.STOP,
+        nonce=1,
+        address=Address(0xE262558822902632416F26EDBF70CCAC609CD2CE),  # noqa: E501
+    )
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=Bytes("00"),
+        gas_limit=16777216,
+        value=1,
+    )
+
+    post = {
+        target: Account(
+            storage={
+                0x11000100010000: 6,
+                0x11000100010001: 4,
+                0x11000100020000: 5,
+                0x11000100020001: 3,
+                0x11000100030000: 4,
+                0x11000100030001: 2,
+                0x11000100040000: 5,
+                0x11000100040001: 3,
+                0x11000100050000: 5,
+                0x11000100050001: 3,
+                0x11000100060000: 3,
+                0x11000100060001: 1,
+                0x11000100070000: 3,
+                0x11000100070001: 1,
+                0x11000100080000: 3,
+                0x11000100080001: 1,
+                0x11000100090000: 5,
+                0x11000100090001: 3,
+                0x110001000A0000: 5,
+                0x110001000A0001: 3,
+                0x11000100100000: 3,
+                0x11000100100001: 1,
+                0x11000100110000: 4,
+                0x11000100110001: 2,
+                0x11000100120000: 3,
+                0x11000100120001: 1,
+                0x11000100130000: 4,
+                0x11000100130001: 2,
+                0x11000100140000: 3,
+                0x11000100140001: 1,
+                0x11000100150000: 3,
+                0x11000100150001: 1,
+                0x11000100160000: 3,
+                0x11000100160001: 1,
+                0x11000100170000: 6,
+                0x11000100170001: 4,
+                0x11000100180000: 6,
+                0x11000100180001: 4,
+                0x11000100190000: 0,
+                0x11000100190001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0x110001001A0000: 3,
+                0x110001001A0001: 1,
+                0x110001001B0000: 7,
+                0x110001001B0001: 5,
+                0x110001001C0000: 3,
+                0x110001001C0001: 1,
+                0x110001001D0000: 3,
+                0x110001001D0001: 1,
+                0x11000200010000: 9,
+                0x11000200010001: 3,
+                0x11000200020000: 6,
+                0x11000200020001: 2,
+                0x11000200030000: 3,
+                0x11000200030001: 1,
+                0x11000200040000: 6,
+                0x11000200040001: 2,
+                0x11000200050000: 6,
+                0x11000200050001: 2,
+                0x11000200060000: 0,
+                0x11000200060001: 0,
+                0x11000200070000: 0,
+                0x11000200070001: 0,
+                0x11000200080000: 0,
+                0x11000200080001: 0,
+                0x11000200090000: 6,
+                0x11000200090001: 2,
+                0x110002000A0000: 6,
+                0x110002000A0001: 2,
+                0x11000200100000: 0,
+                0x11000200100001: 0,
+                0x11000200110000: 3,
+                0x11000200110001: 1,
+                0x11000200120000: 0,
+                0x11000200120001: 0,
+                0x11000200130000: 3,
+                0x11000200130001: 1,
+                0x11000200140000: 0,
+                0x11000200140001: 0,
+                0x11000200150000: 0,
+                0x11000200150001: 0,
+                0x11000200160000: 0,
+                0x11000200160001: 0,
+                0x11000200170000: 9,
+                0x11000200170001: 3,
+                0x11000200180000: 9,
+                0x11000200180001: 3,
+                0x11000200190000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7,  # noqa: E501
+                0x11000200190001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x110002001A0000: 0,
+                0x110002001A0001: 0,
+                0x110002001B0000: 12,
+                0x110002001B0001: 4,
+                0x110002001C0000: 0,
+                0x110002001C0001: 0,
+                0x110002001D0000: 0,
+                0x110002001D0001: 0,
+                0x11000300010000: 0,
+                0x11000300010001: 2,
+                0x11000300020000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11000300020001: 1,
+                0x11000300030000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0x11000300030001: 0,
+                0x11000300040000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11000300040001: 1,
+                0x11000300050000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11000300050001: 1,
+                0x11000300060000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x11000300060001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11000300070000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x11000300070001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11000300080000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x11000300080001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11000300090000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11000300090001: 1,
+                0x110003000A0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x110003000A0001: 1,
+                0x11000300100000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x11000300100001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11000300110000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0x11000300110001: 0,
+                0x11000300120000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x11000300120001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11000300130000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0x11000300130001: 0,
+                0x11000300140000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x11000300140001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11000300150000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x11000300150001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11000300160000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x11000300160001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11000300170000: 0,
+                0x11000300170001: 2,
+                0x11000300180000: 0,
+                0x11000300180001: 2,
+                0x11000300190000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA,  # noqa: E501
+                0x11000300190001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
+                0x110003001A0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x110003001A0001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x110003001B0000: 1,
+                0x110003001B0001: 3,
+                0x110003001C0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x110003001C0001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x110003001D0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x110003001D0001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11000400010000: 1,
+                0x11000400010001: 3,
+                0x11000400020000: 0,
+                0x11000400020001: 2,
+                0x11000400030000: 0,
+                0x11000400030001: 1,
+                0x11000400040000: 0,
+                0x11000400040001: 2,
+                0x11000400050000: 0,
+                0x11000400050001: 2,
+                0x11000400060000: 0,
+                0x11000400060001: 0,
+                0x11000400070000: 0,
+                0x11000400070001: 0,
+                0x11000400080000: 0,
+                0x11000400080001: 0,
+                0x11000400090000: 0,
+                0x11000400090001: 2,
+                0x110004000A0000: 0,
+                0x110004000A0001: 2,
+                0x11000400100000: 0,
+                0x11000400100001: 0,
+                0x11000400110000: 0,
+                0x11000400110001: 1,
+                0x11000400120000: 0,
+                0x11000400120001: 0,
+                0x11000400130000: 0,
+                0x11000400130001: 1,
+                0x11000400140000: 0,
+                0x11000400140001: 0,
+                0x11000400150000: 0,
+                0x11000400150001: 0,
+                0x11000400160000: 0,
+                0x11000400160001: 0,
+                0x11000400170000: 1,
+                0x11000400170001: 3,
+                0x11000400180000: 1,
+                0x11000400180001: 3,
+                0x11000400190000: 0x5555555555555555555555555555555555555555555555555555555555555554,  # noqa: E501
+                0x11000400190001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x110004001A0000: 0,
+                0x110004001A0001: 0,
+                0x110004001B0000: 1,
+                0x110004001B0001: 4,
+                0x110004001C0000: 0,
+                0x110004001C0001: 0,
+                0x110004001D0000: 0,
+                0x110004001D0001: 0,
+                0x11000500010000: 1,
+                0x11000500010001: 3,
+                0x11000500020000: 0,
+                0x11000500020001: 2,
+                0x11000500030000: 0,
+                0x11000500030001: 1,
+                0x11000500040000: 0,
+                0x11000500040001: 2,
+                0x11000500050000: 0,
+                0x11000500050001: 2,
+                0x11000500060000: 0,
+                0x11000500060001: 0,
+                0x11000500070000: 0,
+                0x11000500070001: 0,
+                0x11000500080000: 0,
+                0x11000500080001: 0,
+                0x11000500090000: 0,
+                0x11000500090001: 2,
+                0x110005000A0000: 0,
+                0x110005000A0001: 2,
+                0x11000500100000: 0,
+                0x11000500100001: 0,
+                0x11000500110000: 0,
+                0x11000500110001: 1,
+                0x11000500120000: 0,
+                0x11000500120001: 0,
+                0x11000500130000: 0,
+                0x11000500130001: 1,
+                0x11000500140000: 0,
+                0x11000500140001: 0,
+                0x11000500150000: 0,
+                0x11000500150001: 0,
+                0x11000500160000: 0,
+                0x11000500160001: 0,
+                0x11000500170000: 1,
+                0x11000500170001: 3,
+                0x11000500180000: 1,
+                0x11000500180001: 3,
+                0x11000500190000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11000500190001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x110005001A0000: 0,
+                0x110005001A0001: 0,
+                0x110005001B0000: 1,
+                0x110005001B0001: 4,
+                0x110005001C0000: 0,
+                0x110005001C0001: 0,
+                0x110005001D0000: 0,
+                0x110005001D0001: 0,
+                0x11000600010000: 0,
+                0x11000600010001: 0,
+                0x11000600020000: 2,
+                0x11000600020001: 0,
+                0x11000600030000: 1,
+                0x11000600030001: 0,
+                0x11000600040000: 2,
+                0x11000600040001: 0,
+                0x11000600050000: 2,
+                0x11000600050001: 0,
+                0x11000600060000: 0,
+                0x11000600060001: 0,
+                0x11000600070000: 0,
+                0x11000600070001: 0,
+                0x11000600080000: 0,
+                0x11000600080001: 0,
+                0x11000600090000: 2,
+                0x11000600090001: 0,
+                0x110006000A0000: 2,
+                0x110006000A0001: 0,
+                0x11000600100000: 0,
+                0x11000600100001: 0,
+                0x11000600110000: 1,
+                0x11000600110001: 0,
+                0x11000600120000: 0,
+                0x11000600120001: 0,
+                0x11000600130000: 1,
+                0x11000600130001: 0,
+                0x11000600140000: 0,
+                0x11000600140001: 0,
+                0x11000600150000: 0,
+                0x11000600150001: 0,
+                0x11000600160000: 0,
+                0x11000600160001: 0,
+                0x11000600170000: 0,
+                0x11000600170001: 0,
+                0x11000600180000: 0,
+                0x11000600180001: 0,
+                0x11000600190000: 1,
+                0x11000600190001: 0,
+                0x110006001A0000: 0,
+                0x110006001A0001: 0,
+                0x110006001B0000: 1,
+                0x110006001B0001: 0,
+                0x110006001C0000: 0,
+                0x110006001C0001: 0,
+                0x110006001D0000: 0,
+                0x110006001D0001: 0,
+                0x11000700010000: 0,
+                0x11000700010001: 0,
+                0x11000700020000: 2,
+                0x11000700020001: 0,
+                0x11000700030000: 1,
+                0x11000700030001: 0,
+                0x11000700040000: 2,
+                0x11000700040001: 0,
+                0x11000700050000: 2,
+                0x11000700050001: 0,
+                0x11000700060000: 0,
+                0x11000700060001: 0,
+                0x11000700070000: 0,
+                0x11000700070001: 0,
+                0x11000700080000: 0,
+                0x11000700080001: 0,
+                0x11000700090000: 2,
+                0x11000700090001: 0,
+                0x110007000A0000: 2,
+                0x110007000A0001: 0,
+                0x11000700100000: 0,
+                0x11000700100001: 0,
+                0x11000700110000: 1,
+                0x11000700110001: 0,
+                0x11000700120000: 0,
+                0x11000700120001: 0,
+                0x11000700130000: 1,
+                0x11000700130001: 0,
+                0x11000700140000: 0,
+                0x11000700140001: 0,
+                0x11000700150000: 0,
+                0x11000700150001: 0,
+                0x11000700160000: 0,
+                0x11000700160001: 0,
+                0x11000700170000: 0,
+                0x11000700170001: 0,
+                0x11000700180000: 0,
+                0x11000700180001: 0,
+                0x11000700190000: 0,
+                0x11000700190001: 0,
+                0x110007001A0000: 0,
+                0x110007001A0001: 0,
+                0x110007001B0000: 1,
+                0x110007001B0001: 0,
+                0x110007001C0000: 0,
+                0x110007001C0001: 0,
+                0x110007001D0000: 0,
+                0x110007001D0001: 0,
+                0x11000800010000: 0,
+                0x11000800010001: 0,
+                0x11000800020000: 1,
+                0x11000800020001: 1,
+                0x11000800030000: 0,
+                0x11000800030001: 0,
+                0x11000800040000: 1,
+                0x11000800040001: 1,
+                0x11000800050000: 1,
+                0x11000800050001: 1,
+                0x11000800060000: 1,
+                0x11000800060001: 1,
+                0x11000800070000: 1,
+                0x11000800070001: 1,
+                0x11000800080000: 1,
+                0x11000800080001: 1,
+                0x11000800090000: 1,
+                0x11000800090001: 1,
+                0x110008000A0000: 1,
+                0x110008000A0001: 1,
+                0x11000800100000: 1,
+                0x11000800100001: 1,
+                0x11000800110000: 0,
+                0x11000800110001: 0,
+                0x11000800120000: 1,
+                0x11000800120001: 1,
+                0x11000800130000: 0,
+                0x11000800130001: 0,
+                0x11000800140000: 1,
+                0x11000800140001: 1,
+                0x11000800150000: 1,
+                0x11000800150001: 1,
+                0x11000800160000: 1,
+                0x11000800160001: 1,
+                0x11000800170000: 0,
+                0x11000800170001: 0,
+                0x11000800180000: 0,
+                0x11000800180001: 0,
+                0x11000800190000: 0,
+                0x11000800190001: 0,
+                0x110008001A0000: 1,
+                0x110008001A0001: 1,
+                0x110008001B0000: 1,
+                0x110008001B0001: 1,
+                0x110008001C0000: 1,
+                0x110008001C0001: 1,
+                0x110008001D0000: 1,
+                0x110008001D0001: 1,
+                0x11000900010000: 1,
+                0x11000900010001: 1,
+                0x11000900020000: 0,
+                0x11000900020001: 0,
+                0x11000900030000: 1,
+                0x11000900030001: 1,
+                0x11000900040000: 0,
+                0x11000900040001: 0,
+                0x11000900050000: 0,
+                0x11000900050001: 0,
+                0x11000900060000: 0,
+                0x11000900060001: 0,
+                0x11000900070000: 0,
+                0x11000900070001: 0,
+                0x11000900080000: 0,
+                0x11000900080001: 0,
+                0x11000900090000: 0,
+                0x11000900090001: 0,
+                0x110009000A0000: 0,
+                0x110009000A0001: 0,
+                0x11000900100000: 0,
+                0x11000900100001: 0,
+                0x11000900110000: 1,
+                0x11000900110001: 1,
+                0x11000900120000: 0,
+                0x11000900120001: 0,
+                0x11000900130000: 1,
+                0x11000900130001: 1,
+                0x11000900140000: 0,
+                0x11000900140001: 0,
+                0x11000900150000: 0,
+                0x11000900150001: 0,
+                0x11000900160000: 0,
+                0x11000900160001: 0,
+                0x11000900170000: 1,
+                0x11000900170001: 1,
+                0x11000900180000: 1,
+                0x11000900180001: 1,
+                0x11000900190000: 1,
+                0x11000900190001: 1,
+                0x110009001A0000: 0,
+                0x110009001A0001: 0,
+                0x110009001B0000: 0,
+                0x110009001B0001: 0,
+                0x110009001C0000: 0,
+                0x110009001C0001: 0,
+                0x110009001D0000: 0,
+                0x110009001D0001: 0,
+                0x11000A00010000: 27,
+                0x11000A00010001: 3,
+                0x11000A00020000: 8,
+                0x11000A00020001: 2,
+                0x11000A00030000: 1,
+                0x11000A00030001: 1,
+                0x11000A00040000: 8,
+                0x11000A00040001: 2,
+                0x11000A00050000: 8,
+                0x11000A00050001: 2,
+                0x11000A00060000: 0,
+                0x11000A00060001: 0,
+                0x11000A00070000: 0,
+                0x11000A00070001: 0,
+                0x11000A00080000: 0,
+                0x11000A00080001: 0,
+                0x11000A00090000: 8,
+                0x11000A00090001: 2,
+                0x11000A000A0000: 8,
+                0x11000A000A0001: 2,
+                0x11000A00100000: 0,
+                0x11000A00100001: 0,
+                0x11000A00110000: 1,
+                0x11000A00110001: 1,
+                0x11000A00120000: 0,
+                0x11000A00120001: 0,
+                0x11000A00130000: 1,
+                0x11000A00130001: 1,
+                0x11000A00140000: 0,
+                0x11000A00140001: 0,
+                0x11000A00150000: 0,
+                0x11000A00150001: 0,
+                0x11000A00160000: 0,
+                0x11000A00160001: 0,
+                0x11000A00170000: 27,
+                0x11000A00170001: 3,
+                0x11000A00180000: 27,
+                0x11000A00180001: 3,
+                0x11000A00190000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5,  # noqa: E501
+                0x11000A00190001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x11000A001A0000: 0,
+                0x11000A001A0001: 0,
+                0x11000A001B0000: 64,
+                0x11000A001B0001: 4,
+                0x11000A001C0000: 0,
+                0x11000A001C0001: 0,
+                0x11000A001D0000: 0,
+                0x11000A001D0001: 0,
+                0x11001000010000: 0,
+                0x11001000010001: 0,
+                0x11001000020000: 1,
+                0x11001000020001: 0,
+                0x11001000030000: 1,
+                0x11001000030001: 0,
+                0x11001000040000: 1,
+                0x11001000040001: 0,
+                0x11001000050000: 1,
+                0x11001000050001: 0,
+                0x11001000060000: 1,
+                0x11001000060001: 1,
+                0x11001000070000: 1,
+                0x11001000070001: 1,
+                0x11001000080000: 1,
+                0x11001000080001: 1,
+                0x11001000090000: 1,
+                0x11001000090001: 0,
+                0x110010000A0000: 1,
+                0x110010000A0001: 0,
+                0x11001000100000: 1,
+                0x11001000100001: 1,
+                0x11001000110000: 1,
+                0x11001000110001: 0,
+                0x11001000120000: 1,
+                0x11001000120001: 1,
+                0x11001000130000: 1,
+                0x11001000130001: 0,
+                0x11001000140000: 1,
+                0x11001000140001: 1,
+                0x11001000150000: 1,
+                0x11001000150001: 1,
+                0x11001000160000: 1,
+                0x11001000160001: 1,
+                0x11001000170000: 0,
+                0x11001000170001: 0,
+                0x11001000180000: 0,
+                0x11001000180001: 0,
+                0x11001000190000: 0,
+                0x11001000190001: 0,
+                0x110010001A0000: 1,
+                0x110010001A0001: 1,
+                0x110010001B0000: 0,
+                0x110010001B0001: 0,
+                0x110010001C0000: 1,
+                0x110010001C0001: 1,
+                0x110010001D0000: 1,
+                0x110010001D0001: 1,
+                0x11001100010000: 0,
+                0x11001100010001: 1,
+                0x11001100020000: 0,
+                0x11001100020001: 1,
+                0x11001100030000: 0,
+                0x11001100030001: 0,
+                0x11001100040000: 0,
+                0x11001100040001: 1,
+                0x11001100050000: 0,
+                0x11001100050001: 1,
+                0x11001100060000: 0,
+                0x11001100060001: 0,
+                0x11001100070000: 0,
+                0x11001100070001: 0,
+                0x11001100080000: 0,
+                0x11001100080001: 0,
+                0x11001100090000: 0,
+                0x11001100090001: 1,
+                0x110011000A0000: 0,
+                0x110011000A0001: 1,
+                0x11001100100000: 0,
+                0x11001100100001: 0,
+                0x11001100110000: 0,
+                0x11001100110001: 0,
+                0x11001100120000: 0,
+                0x11001100120001: 0,
+                0x11001100130000: 0,
+                0x11001100130001: 0,
+                0x11001100140000: 0,
+                0x11001100140001: 0,
+                0x11001100150000: 0,
+                0x11001100150001: 0,
+                0x11001100160000: 0,
+                0x11001100160001: 0,
+                0x11001100170000: 0,
+                0x11001100170001: 1,
+                0x11001100180000: 0,
+                0x11001100180001: 1,
+                0x11001100190000: 1,
+                0x11001100190001: 1,
+                0x110011001A0000: 0,
+                0x110011001A0001: 0,
+                0x110011001B0000: 1,
+                0x110011001B0001: 1,
+                0x110011001C0000: 0,
+                0x110011001C0001: 0,
+                0x110011001D0000: 0,
+                0x110011001D0001: 0,
+                0x11001200010000: 0,
+                0x11001200010001: 0,
+                0x11001200020000: 1,
+                0x11001200020001: 0,
+                0x11001200030000: 1,
+                0x11001200030001: 0,
+                0x11001200040000: 1,
+                0x11001200040001: 0,
+                0x11001200050000: 1,
+                0x11001200050001: 0,
+                0x11001200060000: 1,
+                0x11001200060001: 1,
+                0x11001200070000: 1,
+                0x11001200070001: 1,
+                0x11001200080000: 1,
+                0x11001200080001: 1,
+                0x11001200090000: 1,
+                0x11001200090001: 0,
+                0x110012000A0000: 1,
+                0x110012000A0001: 0,
+                0x11001200100000: 1,
+                0x11001200100001: 1,
+                0x11001200110000: 1,
+                0x11001200110001: 0,
+                0x11001200120000: 1,
+                0x11001200120001: 1,
+                0x11001200130000: 1,
+                0x11001200130001: 0,
+                0x11001200140000: 1,
+                0x11001200140001: 1,
+                0x11001200150000: 1,
+                0x11001200150001: 1,
+                0x11001200160000: 1,
+                0x11001200160001: 1,
+                0x11001200170000: 0,
+                0x11001200170001: 0,
+                0x11001200180000: 0,
+                0x11001200180001: 0,
+                0x11001200190000: 1,
+                0x11001200190001: 1,
+                0x110012001A0000: 1,
+                0x110012001A0001: 1,
+                0x110012001B0000: 0,
+                0x110012001B0001: 0,
+                0x110012001C0000: 1,
+                0x110012001C0001: 1,
+                0x110012001D0000: 1,
+                0x110012001D0001: 1,
+                0x11001300010000: 0,
+                0x11001300010001: 1,
+                0x11001300020000: 0,
+                0x11001300020001: 1,
+                0x11001300030000: 0,
+                0x11001300030001: 0,
+                0x11001300040000: 0,
+                0x11001300040001: 1,
+                0x11001300050000: 0,
+                0x11001300050001: 1,
+                0x11001300060000: 0,
+                0x11001300060001: 0,
+                0x11001300070000: 0,
+                0x11001300070001: 0,
+                0x11001300080000: 0,
+                0x11001300080001: 0,
+                0x11001300090000: 0,
+                0x11001300090001: 1,
+                0x110013000A0000: 0,
+                0x110013000A0001: 1,
+                0x11001300100000: 0,
+                0x11001300100001: 0,
+                0x11001300110000: 0,
+                0x11001300110001: 0,
+                0x11001300120000: 0,
+                0x11001300120001: 0,
+                0x11001300130000: 0,
+                0x11001300130001: 0,
+                0x11001300140000: 0,
+                0x11001300140001: 0,
+                0x11001300150000: 0,
+                0x11001300150001: 0,
+                0x11001300160000: 0,
+                0x11001300160001: 0,
+                0x11001300170000: 0,
+                0x11001300170001: 1,
+                0x11001300180000: 0,
+                0x11001300180001: 1,
+                0x11001300190000: 0,
+                0x11001300190001: 0,
+                0x110013001A0000: 0,
+                0x110013001A0001: 0,
+                0x110013001B0000: 1,
+                0x110013001B0001: 1,
+                0x110013001C0000: 0,
+                0x110013001C0001: 0,
+                0x110013001D0000: 0,
+                0x110013001D0001: 0,
+                0x11001400010000: 1,
+                0x11001400010001: 0,
+                0x11001400020000: 0,
+                0x11001400020001: 0,
+                0x11001400030000: 0,
+                0x11001400030001: 1,
+                0x11001400040000: 0,
+                0x11001400040001: 0,
+                0x11001400050000: 0,
+                0x11001400050001: 0,
+                0x11001400060000: 0,
+                0x11001400060001: 0,
+                0x11001400070000: 0,
+                0x11001400070001: 0,
+                0x11001400080000: 0,
+                0x11001400080001: 0,
+                0x11001400090000: 0,
+                0x11001400090001: 0,
+                0x110014000A0000: 0,
+                0x110014000A0001: 0,
+                0x11001400100000: 0,
+                0x11001400100001: 0,
+                0x11001400110000: 0,
+                0x11001400110001: 1,
+                0x11001400120000: 0,
+                0x11001400120001: 0,
+                0x11001400130000: 0,
+                0x11001400130001: 1,
+                0x11001400140000: 0,
+                0x11001400140001: 0,
+                0x11001400150000: 0,
+                0x11001400150001: 0,
+                0x11001400160000: 0,
+                0x11001400160001: 0,
+                0x11001400170000: 1,
+                0x11001400170001: 0,
+                0x11001400180000: 1,
+                0x11001400180001: 0,
+                0x11001400190000: 0,
+                0x11001400190001: 0,
+                0x110014001A0000: 0,
+                0x110014001A0001: 0,
+                0x110014001B0000: 0,
+                0x110014001B0001: 0,
+                0x110014001C0000: 0,
+                0x110014001C0001: 0,
+                0x110014001D0000: 0,
+                0x110014001D0001: 0,
+                0x11001500010000: 0,
+                0x11001500010001: 0,
+                0x11001500020000: 0,
+                0x11001500020001: 0,
+                0x11001500030000: 0,
+                0x11001500030001: 0,
+                0x11001500040000: 0,
+                0x11001500040001: 0,
+                0x11001500050000: 0,
+                0x11001500050001: 0,
+                0x11001500060000: 1,
+                0x11001500060001: 1,
+                0x11001500070000: 1,
+                0x11001500070001: 1,
+                0x11001500080000: 1,
+                0x11001500080001: 1,
+                0x11001500090000: 0,
+                0x11001500090001: 0,
+                0x110015000A0000: 0,
+                0x110015000A0001: 0,
+                0x11001500100000: 1,
+                0x11001500100001: 1,
+                0x11001500110000: 0,
+                0x11001500110001: 0,
+                0x11001500120000: 1,
+                0x11001500120001: 1,
+                0x11001500130000: 0,
+                0x11001500130001: 0,
+                0x11001500140000: 1,
+                0x11001500140001: 1,
+                0x11001500150000: 1,
+                0x11001500150001: 1,
+                0x11001500160000: 1,
+                0x11001500160001: 1,
+                0x11001500170000: 0,
+                0x11001500170001: 0,
+                0x11001500180000: 0,
+                0x11001500180001: 0,
+                0x11001500190000: 0,
+                0x11001500190001: 0,
+                0x110015001A0000: 1,
+                0x110015001A0001: 1,
+                0x110015001B0000: 0,
+                0x110015001B0001: 0,
+                0x110015001C0000: 1,
+                0x110015001C0001: 1,
+                0x110015001D0000: 1,
+                0x110015001D0001: 1,
+                0x11001600010000: 3,
+                0x11001600010001: 1,
+                0x11001600020000: 2,
+                0x11001600020001: 0,
+                0x11001600030000: 1,
+                0x11001600030001: 1,
+                0x11001600040000: 2,
+                0x11001600040001: 0,
+                0x11001600050000: 2,
+                0x11001600050001: 0,
+                0x11001600060000: 0,
+                0x11001600060001: 0,
+                0x11001600070000: 0,
+                0x11001600070001: 0,
+                0x11001600080000: 0,
+                0x11001600080001: 0,
+                0x11001600090000: 2,
+                0x11001600090001: 0,
+                0x110016000A0000: 2,
+                0x110016000A0001: 0,
+                0x11001600100000: 0,
+                0x11001600100001: 0,
+                0x11001600110000: 1,
+                0x11001600110001: 1,
+                0x11001600120000: 0,
+                0x11001600120001: 0,
+                0x11001600130000: 1,
+                0x11001600130001: 1,
+                0x11001600140000: 0,
+                0x11001600140001: 0,
+                0x11001600150000: 0,
+                0x11001600150001: 0,
+                0x11001600160000: 0,
+                0x11001600160001: 0,
+                0x11001600170000: 3,
+                0x11001600170001: 1,
+                0x11001600180000: 3,
+                0x11001600180001: 1,
+                0x11001600190000: 1,
+                0x11001600190001: 1,
+                0x110016001A0000: 0,
+                0x110016001A0001: 0,
+                0x110016001B0000: 0,
+                0x110016001B0001: 0,
+                0x110016001C0000: 0,
+                0x110016001C0001: 0,
+                0x110016001D0000: 0,
+                0x110016001D0001: 0,
+                0x11001700010000: 3,
+                0x11001700010001: 3,
+                0x11001700020000: 3,
+                0x11001700020001: 3,
+                0x11001700030000: 3,
+                0x11001700030001: 1,
+                0x11001700040000: 3,
+                0x11001700040001: 3,
+                0x11001700050000: 3,
+                0x11001700050001: 3,
+                0x11001700060000: 3,
+                0x11001700060001: 1,
+                0x11001700070000: 3,
+                0x11001700070001: 1,
+                0x11001700080000: 3,
+                0x11001700080001: 1,
+                0x11001700090000: 3,
+                0x11001700090001: 3,
+                0x110017000A0000: 3,
+                0x110017000A0001: 3,
+                0x11001700100000: 3,
+                0x11001700100001: 1,
+                0x11001700110000: 3,
+                0x11001700110001: 1,
+                0x11001700120000: 3,
+                0x11001700120001: 1,
+                0x11001700130000: 3,
+                0x11001700130001: 1,
+                0x11001700140000: 3,
+                0x11001700140001: 1,
+                0x11001700150000: 3,
+                0x11001700150001: 1,
+                0x11001700160000: 3,
+                0x11001700160001: 1,
+                0x11001700170000: 3,
+                0x11001700170001: 3,
+                0x11001700180000: 3,
+                0x11001700180001: 3,
+                0x11001700190000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001700190001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x110017001A0000: 3,
+                0x110017001A0001: 1,
+                0x110017001B0000: 7,
+                0x110017001B0001: 5,
+                0x110017001C0000: 3,
+                0x110017001C0001: 1,
+                0x110017001D0000: 3,
+                0x110017001D0001: 1,
+                0x11001800010000: 0,
+                0x11001800010001: 2,
+                0x11001800020000: 1,
+                0x11001800020001: 3,
+                0x11001800030000: 2,
+                0x11001800030001: 0,
+                0x11001800040000: 1,
+                0x11001800040001: 3,
+                0x11001800050000: 1,
+                0x11001800050001: 3,
+                0x11001800060000: 3,
+                0x11001800060001: 1,
+                0x11001800070000: 3,
+                0x11001800070001: 1,
+                0x11001800080000: 3,
+                0x11001800080001: 1,
+                0x11001800090000: 1,
+                0x11001800090001: 3,
+                0x110018000A0000: 1,
+                0x110018000A0001: 3,
+                0x11001800100000: 3,
+                0x11001800100001: 1,
+                0x11001800110000: 2,
+                0x11001800110001: 0,
+                0x11001800120000: 3,
+                0x11001800120001: 1,
+                0x11001800130000: 2,
+                0x11001800130001: 0,
+                0x11001800140000: 3,
+                0x11001800140001: 1,
+                0x11001800150000: 3,
+                0x11001800150001: 1,
+                0x11001800160000: 3,
+                0x11001800160001: 1,
+                0x11001800170000: 0,
+                0x11001800170001: 2,
+                0x11001800180000: 0,
+                0x11001800180001: 2,
+                0x11001800190000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0x11001800190001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
+                0x110018001A0000: 3,
+                0x110018001A0001: 1,
+                0x110018001B0000: 7,
+                0x110018001B0001: 5,
+                0x110018001C0000: 3,
+                0x110018001C0001: 1,
+                0x110018001D0000: 3,
+                0x110018001D0001: 1,
+                0x11001900010000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
+                0x11001900010001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
+                0x11001900020000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x11001900020001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x11001900030000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0x11001900030001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0x11001900040000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x11001900040001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x11001900050000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x11001900050001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x11001900060000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001900060001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001900070000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001900070001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001900080000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001900080001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001900090000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x11001900090001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x110019000A0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x110019000A0001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                0x11001900100000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001900100001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001900110000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0x11001900110001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0x11001900120000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001900120001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001900130000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0x11001900130001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                0x11001900140000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001900140001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001900150000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001900150001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001900160000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001900160001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001900170000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
+                0x11001900170001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
+                0x11001900180000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
+                0x11001900180001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC,  # noqa: E501
+                0x11001900190000: 2,
+                0x11001900190001: 2,
+                0x110019001A0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x110019001A0001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x110019001B0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB,  # noqa: E501
+                0x110019001B0001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB,  # noqa: E501
+                0x110019001C0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x110019001C0001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x110019001D0000: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x110019001D0001: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x11001A00010000: 0,
+                0x11001A00010001: 0,
+                0x11001A00020000: 0,
+                0x11001A00020001: 0,
+                0x11001A00030000: 0,
+                0x11001A00030001: 0,
+                0x11001A00040000: 0,
+                0x11001A00040001: 0,
+                0x11001A00050000: 0,
+                0x11001A00050001: 0,
+                0x11001A00060000: 0,
+                0x11001A00060001: 0,
+                0x11001A00070000: 0,
+                0x11001A00070001: 0,
+                0x11001A00080000: 0,
+                0x11001A00080001: 0,
+                0x11001A00090000: 0,
+                0x11001A00090001: 0,
+                0x11001A000A0000: 0,
+                0x11001A000A0001: 0,
+                0x11001A00100000: 0,
+                0x11001A00100001: 0,
+                0x11001A00110000: 0,
+                0x11001A00110001: 0,
+                0x11001A00120000: 0,
+                0x11001A00120001: 0,
+                0x11001A00130000: 0,
+                0x11001A00130001: 0,
+                0x11001A00140000: 0,
+                0x11001A00140001: 0,
+                0x11001A00150000: 0,
+                0x11001A00150001: 0,
+                0x11001A00160000: 0,
+                0x11001A00160001: 0,
+                0x11001A00170000: 0,
+                0x11001A00170001: 0,
+                0x11001A00180000: 0,
+                0x11001A00180001: 0,
+                0x11001A00190000: 0,
+                0x11001A00190001: 0,
+                0x11001A001A0000: 0,
+                0x11001A001A0001: 0,
+                0x11001A001B0000: 0,
+                0x11001A001B0001: 0,
+                0x11001A001C0000: 0,
+                0x11001A001C0001: 0,
+                0x11001A001D0000: 0,
+                0x11001A001D0001: 0,
+                0x11001B00010000: 24,
+                0x11001B00010001: 8,
+                0x11001B00020000: 12,
+                0x11001B00020001: 4,
+                0x11001B00030000: 6,
+                0x11001B00030001: 2,
+                0x11001B00040000: 12,
+                0x11001B00040001: 4,
+                0x11001B00050000: 12,
+                0x11001B00050001: 4,
+                0x11001B00060000: 3,
+                0x11001B00060001: 1,
+                0x11001B00070000: 3,
+                0x11001B00070001: 1,
+                0x11001B00080000: 3,
+                0x11001B00080001: 1,
+                0x11001B00090000: 12,
+                0x11001B00090001: 4,
+                0x11001B000A0000: 12,
+                0x11001B000A0001: 4,
+                0x11001B00100000: 3,
+                0x11001B00100001: 1,
+                0x11001B00110000: 6,
+                0x11001B00110001: 2,
+                0x11001B00120000: 3,
+                0x11001B00120001: 1,
+                0x11001B00130000: 6,
+                0x11001B00130001: 2,
+                0x11001B00140000: 3,
+                0x11001B00140001: 1,
+                0x11001B00150000: 3,
+                0x11001B00150001: 1,
+                0x11001B00160000: 3,
+                0x11001B00160001: 1,
+                0x11001B00170000: 24,
+                0x11001B00170001: 8,
+                0x11001B00180000: 24,
+                0x11001B00180001: 8,
+                0x11001B00190000: 0,
+                0x11001B00190001: 0,
+                0x11001B001A0000: 3,
+                0x11001B001A0001: 1,
+                0x11001B001B0000: 48,
+                0x11001B001B0001: 16,
+                0x11001B001C0000: 3,
+                0x11001B001C0001: 1,
+                0x11001B001D0000: 3,
+                0x11001B001D0001: 1,
+                0x11001C00010000: 0,
+                0x11001C00010001: 0,
+                0x11001C00020000: 0,
+                0x11001C00020001: 0,
+                0x11001C00030000: 1,
+                0x11001C00030001: 0,
+                0x11001C00040000: 0,
+                0x11001C00040001: 0,
+                0x11001C00050000: 0,
+                0x11001C00050001: 0,
+                0x11001C00060000: 3,
+                0x11001C00060001: 1,
+                0x11001C00070000: 3,
+                0x11001C00070001: 1,
+                0x11001C00080000: 3,
+                0x11001C00080001: 1,
+                0x11001C00090000: 0,
+                0x11001C00090001: 0,
+                0x11001C000A0000: 0,
+                0x11001C000A0001: 0,
+                0x11001C00100000: 3,
+                0x11001C00100001: 1,
+                0x11001C00110000: 1,
+                0x11001C00110001: 0,
+                0x11001C00120000: 3,
+                0x11001C00120001: 1,
+                0x11001C00130000: 1,
+                0x11001C00130001: 0,
+                0x11001C00140000: 3,
+                0x11001C00140001: 1,
+                0x11001C00150000: 3,
+                0x11001C00150001: 1,
+                0x11001C00160000: 3,
+                0x11001C00160001: 1,
+                0x11001C00170000: 0,
+                0x11001C00170001: 0,
+                0x11001C00180000: 0,
+                0x11001C00180001: 0,
+                0x11001C00190000: 0,
+                0x11001C00190001: 0,
+                0x11001C001A0000: 3,
+                0x11001C001A0001: 1,
+                0x11001C001B0000: 0,
+                0x11001C001B0001: 0,
+                0x11001C001C0000: 3,
+                0x11001C001C0001: 1,
+                0x11001C001D0000: 3,
+                0x11001C001D0001: 1,
+                0x11001D00010000: 0,
+                0x11001D00010001: 0,
+                0x11001D00020000: 0,
+                0x11001D00020001: 0,
+                0x11001D00030000: 1,
+                0x11001D00030001: 0,
+                0x11001D00040000: 0,
+                0x11001D00040001: 0,
+                0x11001D00050000: 0,
+                0x11001D00050001: 0,
+                0x11001D00060000: 3,
+                0x11001D00060001: 1,
+                0x11001D00070000: 3,
+                0x11001D00070001: 1,
+                0x11001D00080000: 3,
+                0x11001D00080001: 1,
+                0x11001D00090000: 0,
+                0x11001D00090001: 0,
+                0x11001D000A0000: 0,
+                0x11001D000A0001: 0,
+                0x11001D00100000: 3,
+                0x11001D00100001: 1,
+                0x11001D00110000: 1,
+                0x11001D00110001: 0,
+                0x11001D00120000: 3,
+                0x11001D00120001: 1,
+                0x11001D00130000: 1,
+                0x11001D00130001: 0,
+                0x11001D00140000: 3,
+                0x11001D00140001: 1,
+                0x11001D00150000: 3,
+                0x11001D00150001: 1,
+                0x11001D00160000: 3,
+                0x11001D00160001: 1,
+                0x11001D00170000: 0,
+                0x11001D00170001: 0,
+                0x11001D00180000: 0,
+                0x11001D00180001: 0,
+                0x11001D00190000: 0,
+                0x11001D00190001: 0,
+                0x11001D001A0000: 3,
+                0x11001D001A0001: 1,
+                0x11001D001B0000: 0,
+                0x11001D001B0001: 0,
+                0x11001D001C0000: 3,
+                0x11001D001C0001: 1,
+                0x11001D001D0000: 3,
+                0x11001D001D0001: 1,
+            },
+        ),
+    }
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmBitwiseLogicOperation/__init__.py b/tests/ported_static/vmBitwiseLogicOperation/__init__.py
new file mode 100644
index 00000000000..bb147a0e458
--- /dev/null
+++ b/tests/ported_static/vmBitwiseLogicOperation/__init__.py
@@ -0,0 +1 @@
+"""Ported static tests: vmBitwiseLogicOperation."""  # noqa: N999
diff --git a/tests/ported_static/vmBitwiseLogicOperation/test_and.py b/tests/ported_static/vmBitwiseLogicOperation/test_and.py
new file mode 100644
index 00000000000..919c2763837
--- /dev/null
+++ b/tests/ported_static/vmBitwiseLogicOperation/test_and.py
@@ -0,0 +1,253 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmBitwiseLogicOperation/andFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmBitwiseLogicOperation/andFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="and_2_2",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="and_2_1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="and_3_1",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="and_allones_bignum",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="and_allones_eefee",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_and(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #     [[0]] (and 2 2)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.AND(0x2, 0x2)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (and 2 1)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.AND(0x2, 0x1)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (and 3 1)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.AND(0x3, 0x1)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; "and 0xffffff" doesn't do anything
+    #     [[0]] (and
+    #              0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff  # noqa: E501
+    #              0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef  # noqa: E501
+    #           )
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.AND(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; "and 0xffffff" doesn't do anything
+    #     [[0]] (and
+    #              0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee  # noqa: E501
+    #              0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff  # noqa: E501
+    #           )
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.AND(
+                0xEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 2})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_3: Account(
+                    storage={
+                        0: 0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_4: Account(
+                    storage={
+                        0: 0xEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_5,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmBitwiseLogicOperation/test_byte.py b/tests/ported_static/vmBitwiseLogicOperation/test_byte.py
new file mode 100644
index 00000000000..56887a82b99
--- /dev/null
+++ b/tests/ported_static/vmBitwiseLogicOperation/test_byte.py
@@ -0,0 +1,472 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmBitwiseLogicOperation/byteFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmBitwiseLogicOperation/byteFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="byte_31_big",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="byte_30_big",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="byte_29_big",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="byte_28_big",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="byte_27_big",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="byte_26_big",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="byte_25_big",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="byte_24_big",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="byte_00_big",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="byte_00_big_2nd",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="byte_asm",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="byte_all",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_byte(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0x0000000000000000000000000000000000001007)
+    contract_8 = Address(0x0000000000000000000000000000000000001008)
+    contract_9 = Address(0x0000000000000000000000000000000000001009)
+    contract_10 = Address(0x000000000000000000000000000000000000100A)
+    contract_11 = Address(0x0000000000000000000000000000000000000200)
+    contract_12 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #    [[0]] (byte (- 31 0) 0x8040201008040201)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.BYTE(Op.SUB(0x1F, 0x0), 0x8040201008040201)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (byte (- 31 1) 0x8040201008040201)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.BYTE(Op.SUB(0x1F, 0x1), 0x8040201008040201)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (byte (- 31 2) 0x8040201008040201)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.BYTE(Op.SUB(0x1F, 0x2), 0x8040201008040201)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (byte (- 31 3) 0x8040201008040201)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.BYTE(Op.SUB(0x1F, 0x3), 0x8040201008040201)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (byte (- 31 4) 0x8040201008040201)
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.BYTE(Op.SUB(0x1F, 0x4), 0x8040201008040201)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (byte (- 31 5) 0x8040201008040201)
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.BYTE(Op.SUB(0x1F, 0x5), 0x8040201008040201)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (byte (- 31 6) 0x8040201008040201)
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.BYTE(Op.SUB(0x1F, 0x6), 0x8040201008040201)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (byte (- 31 7) 0x8040201008040201)
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.BYTE(Op.SUB(0x1F, 0x7), 0x8040201008040201)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001007),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (byte (- 31 31) 0x8040201008040201)
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.BYTE(Op.SUB(0x1F, 0x1F), 0x8040201008040201)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001008),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (byte (sdiv 31 32) 0x8040201008040201)
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.BYTE(Op.SDIV(0x1F, 0x20), 0x8040201008040201)
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001009),  # noqa: E501
+    )
+    # Source: raw
+    # 0x641234523456601F1A8001600155
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x1, value=Op.ADD(Op.DUP1, Op.BYTE(0x1F, 0x1234523456))
+        ),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100A),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    (def 'i   0x0100)    ; index
+    #
+    #    ;   (byte <n> num) = n
+    #    (def 'num 0x000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f)  # noqa: E501
+    #
+    #    [i] 0x00
+    #
+    #    (while (< @i 0x20) {
+    #       [[@i]] (byte @i num)
+    #       [i] (+ @i 1)
+    #    })  ; while loop
+    # }
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x100, value=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x4A, condition=Op.ISZERO(Op.LT(Op.MLOAD(offset=0x100), 0x20))
+        )
+        + Op.SSTORE(
+            key=Op.MLOAD(offset=0x100),
+            value=Op.BYTE(
+                Op.MLOAD(offset=0x100),
+                0x102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F,  # noqa: E501
+            ),
+        )
+        + Op.MSTORE(offset=0x100, value=Op.ADD(Op.MLOAD(offset=0x100), 0x1))
+        + Op.JUMP(pc=0x6)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000200),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff $4 0 0 0 0 0)
+    # }
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.CALLDATALOAD(offset=0x4),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 2})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 4})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 8})},
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_4: Account(storage={0: 16})},
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_5: Account(storage={0: 32})},
+        },
+        {
+            "indexes": {"data": [6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_6: Account(storage={0: 64})},
+        },
+        {
+            "indexes": {"data": [7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_7: Account(storage={0: 128})},
+        },
+        {
+            "indexes": {"data": [8], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_8: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [9], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_9: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [10], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_10: Account(storage={1: 172})},
+        },
+        {
+            "indexes": {"data": [11], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_11: Account(
+                    storage={
+                        0: 0,
+                        1: 1,
+                        2: 2,
+                        3: 3,
+                        4: 4,
+                        5: 5,
+                        6: 6,
+                        7: 7,
+                        8: 8,
+                        9: 9,
+                        10: 10,
+                        11: 11,
+                        12: 12,
+                        13: 13,
+                        14: 14,
+                        15: 15,
+                        16: 16,
+                        17: 17,
+                        18: 18,
+                        19: 19,
+                        20: 20,
+                        21: 21,
+                        22: 22,
+                        23: 23,
+                        24: 24,
+                        25: 25,
+                        26: 26,
+                        27: 27,
+                        28: 28,
+                        29: 29,
+                        30: 30,
+                        31: 31,
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(contract_0, left_padding=True),
+        Bytes("693c6139") + Hash(contract_1, left_padding=True),
+        Bytes("693c6139") + Hash(contract_2, left_padding=True),
+        Bytes("693c6139") + Hash(contract_3, left_padding=True),
+        Bytes("693c6139") + Hash(contract_4, left_padding=True),
+        Bytes("693c6139") + Hash(contract_5, left_padding=True),
+        Bytes("693c6139") + Hash(contract_6, left_padding=True),
+        Bytes("693c6139") + Hash(contract_7, left_padding=True),
+        Bytes("693c6139") + Hash(contract_8, left_padding=True),
+        Bytes("693c6139") + Hash(contract_9, left_padding=True),
+        Bytes("693c6139") + Hash(contract_10, left_padding=True),
+        Bytes("693c6139") + Hash(contract_11, left_padding=True),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_12,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmBitwiseLogicOperation/test_eq.py b/tests/ported_static/vmBitwiseLogicOperation/test_eq.py
new file mode 100644
index 00000000000..3c20ccd8773
--- /dev/null
+++ b/tests/ported_static/vmBitwiseLogicOperation/test_eq.py
@@ -0,0 +1,181 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmBitwiseLogicOperation/eqFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmBitwiseLogicOperation/eqFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="eq_neg5_neg3",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="eq_0_0",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="eq_neg1_neg1",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_eq(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {
+    #    [[0]] (eq (- 0 5) (- 0 3))
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0, value=Op.EQ(Op.SUB(0x0, 0x5), Op.SUB(0x0, 0x3))
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (eq 0 0)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.EQ(0x0, 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (def 'pow_2_256_min1
+    #          0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #     [[0]] (eq pow_2_256_min1 pow_2_256_min1)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.EQ(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_3,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmBitwiseLogicOperation/test_gt.py b/tests/ported_static/vmBitwiseLogicOperation/test_gt.py
new file mode 100644
index 00000000000..06e1b39c681
--- /dev/null
+++ b/tests/ported_static/vmBitwiseLogicOperation/test_gt.py
@@ -0,0 +1,212 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmBitwiseLogicOperation/gtFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmBitwiseLogicOperation/gtFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="gt_neg2_0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="gt_0_neg2",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="gt_neg1_0",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="gt_0_neg1",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_gt(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {
+    #    ; (gt a b) is true iff a>b
+    #    ; it is unsigned, so negative numbers are 2^255 and above.
+    #    [[0]] (gt (- 0 2) 0)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GT(Op.SUB(0x0, 0x2), 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (gt 0 (- 0 2))
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GT(0x0, Op.SUB(0x0, 0x2))) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (def 'pow_2_256_min1
+    #          0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #     [[0]] (gt pow_2_256_min1 0)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.GT(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x0,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (def 'pow_2_256_min1
+    #          0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #     [[0]] (gt 0 pow_2_256_min1)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.GT(
+                0x0,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_4,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmBitwiseLogicOperation/test_iszero.py b/tests/ported_static/vmBitwiseLogicOperation/test_iszero.py
new file mode 100644
index 00000000000..e83fe80b0d8
--- /dev/null
+++ b/tests/ported_static/vmBitwiseLogicOperation/test_iszero.py
@@ -0,0 +1,177 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmBitwiseLogicOperation/iszeroFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmBitwiseLogicOperation/iszeroFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="iszero_neg1",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="iszero_0",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="iszero_neg2",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_iszero(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {
+    #    (def 'pow_2_256_min1
+    #         0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #    [[0]] (iszero pow_2_256_min1)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.ISZERO(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (iszero 0)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ISZERO(0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (iszero (- 0 2))
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ISZERO(Op.SUB(0x0, 0x2))) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_3,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmBitwiseLogicOperation/test_lt.py b/tests/ported_static/vmBitwiseLogicOperation/test_lt.py
new file mode 100644
index 00000000000..d2be95c3d03
--- /dev/null
+++ b/tests/ported_static/vmBitwiseLogicOperation/test_lt.py
@@ -0,0 +1,212 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmBitwiseLogicOperation/ltFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmBitwiseLogicOperation/ltFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="lt_neg2_0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="lt_0_neg2",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="lt_neg1_0",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="lt_0_neg1",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_lt(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {
+    #    ; (lt a b) is true iff a<b
+    #    ; it is unsigned, so negative numbers are 2^255 and above.
+    #    [[0]] (lt (- 0 2) 0)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.LT(Op.SUB(0x0, 0x2), 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (lt 0 (- 0 2))
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.LT(0x0, Op.SUB(0x0, 0x2))) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (def 'pow_2_256_min1
+    #          0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #     [[0]] (lt pow_2_256_min1 0)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.LT(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x0,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (def 'pow_2_256_min1
+    #          0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #     [[0]] (lt 0 pow_2_256_min1)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.LT(
+                0x0,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_4,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmBitwiseLogicOperation/test_not.py b/tests/ported_static/vmBitwiseLogicOperation/test_not.py
new file mode 100644
index 00000000000..4b4e07d8dd0
--- /dev/null
+++ b/tests/ported_static/vmBitwiseLogicOperation/test_not.py
@@ -0,0 +1,292 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmBitwiseLogicOperation/notFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmBitwiseLogicOperation/notFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="not_0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="not_2",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="not_allones",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="not_neg2",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="not_neg_2_pow_256",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="not_neg0",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_not(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #     [[0]] (not 0)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.NOT(0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (not 2)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.NOT(0x2)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (def 'pow_2_256_min1
+    #       0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+    #     [[0]] (not pow_2_256_min1)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.NOT(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   ; In evm arithmetic -2 = 256^2-2
+    #   ; 256^2-1 is in binary all ones
+    #   ; so 256^2-2 is all ones except for the least significant bit, which is 0  # noqa: E501
+    #   ; and  the not all zeros except for the least significant bit, which is 1  # noqa: E501
+    #   [[0]] (not (- 0 2))
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.NOT(Op.SUB(0x0, 0x2))) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; -(2^256-1) = 1
+    #     ; not 1 is 0x ff...ffe
+    #     (def 'pow_2_256_min1
+    #       0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+    #     [[0]] (not (- 0 pow_2_256_min1))
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.NOT(
+                Op.SUB(
+                    0x0,
+                    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                )
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; not 00..00 is 11..11
+    #     [[0]] (not (- 0 0))
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.NOT(Op.SUB(0x0, 0x0))) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_4: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_5: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_6,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmBitwiseLogicOperation/test_or.py b/tests/ported_static/vmBitwiseLogicOperation/test_or.py
new file mode 100644
index 00000000000..7fc19e60d81
--- /dev/null
+++ b/tests/ported_static/vmBitwiseLogicOperation/test_or.py
@@ -0,0 +1,293 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmBitwiseLogicOperation/orFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmBitwiseLogicOperation/orFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="or_2_2",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="or_2_1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="or_3_1",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="or_allones_bignum",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="or_allones_1110s",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="or_allones_eefee",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_or(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #     [[0]] (or 2 2)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.OR(0x2, 0x2)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (or 2 1)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.OR(0x2, 0x1)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (or 3 1)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.OR(0x3, 0x1)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; "or 0xfff..fff" gives you 0xfff..fff
+    #     [[0]] (or
+    #              0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff  # noqa: E501
+    #              0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef  # noqa: E501
+    #           )
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.OR(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; "or 0xfff..fff" gives you 0xfff..fff
+    #     [[0]] (or
+    #              0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee  # noqa: E501
+    #              0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff  # noqa: E501
+    #           )
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.OR(
+                0xEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; "or 0xfff..fff" gives you 0xfff..fff
+    #     [[0]] (or
+    #              0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee  # noqa: E501
+    #              0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff  # noqa: E501
+    #           )
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.OR(
+                0xEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 2})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 3})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 3})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_3: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_4: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_5: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_6,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmBitwiseLogicOperation/test_sgt.py b/tests/ported_static/vmBitwiseLogicOperation/test_sgt.py
new file mode 100644
index 00000000000..5164480e359
--- /dev/null
+++ b/tests/ported_static/vmBitwiseLogicOperation/test_sgt.py
@@ -0,0 +1,212 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmBitwiseLogicOperation/sgtFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmBitwiseLogicOperation/sgtFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="sgt_neg2_0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="sgt_0_neg2",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="sgt_neg1_0",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="sgt_0_neg1",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_sgt(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {
+    #    ; (sgt a b) is true iff a>b
+    #    ; it is signed, so negative numbers are smaller than positive ones
+    #    [[0]] (sgt (- 0 2) 0)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SGT(Op.SUB(0x0, 0x2), 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (sgt 0 (- 0 2))
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SGT(0x0, Op.SUB(0x0, 0x2))) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (def 'pow_2_256_min1
+    #          0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #     [[0]] (sgt pow_2_256_min1 0)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SGT(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x0,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (def 'pow_2_256_min1
+    #          0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #     [[0]] (sgt 0 pow_2_256_min1)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SGT(
+                0x0,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_4,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmBitwiseLogicOperation/test_slt.py b/tests/ported_static/vmBitwiseLogicOperation/test_slt.py
new file mode 100644
index 00000000000..fc950a2787d
--- /dev/null
+++ b/tests/ported_static/vmBitwiseLogicOperation/test_slt.py
@@ -0,0 +1,212 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmBitwiseLogicOperation/sltFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmBitwiseLogicOperation/sltFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="slt_neg2_0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="slt_0_neg2",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="slt_neg1_0",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="slt_0_neg1",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_slt(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {
+    #    ; (slt a b) is true iff a<b
+    #    ; it is signed, so negative numbers are smaller than positive ones
+    #    [[0]] (slt (- 0 2) 0)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SLT(Op.SUB(0x0, 0x2), 0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (slt 0 (- 0 2))
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SLT(0x0, Op.SUB(0x0, 0x2))) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (def 'pow_2_256_min1
+    #          0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #     [[0]] (slt pow_2_256_min1 0)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SLT(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x0,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (def 'pow_2_256_min1
+    #          0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #     [[0]] (slt 0 pow_2_256_min1)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SLT(
+                0x0,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_4,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmBitwiseLogicOperation/test_xor.py b/tests/ported_static/vmBitwiseLogicOperation/test_xor.py
new file mode 100644
index 00000000000..b5bdb7b26bf
--- /dev/null
+++ b/tests/ported_static/vmBitwiseLogicOperation/test_xor.py
@@ -0,0 +1,293 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmBitwiseLogicOperation/xorFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmBitwiseLogicOperation/xorFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="xor_2_2",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="xor_2_1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="xor_3_1",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="xor_allones_bignum",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="xor_allones_1110s",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="xor_allones_eefee",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_xor(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #     [[0]] (xor 2 2)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.XOR(0x2, 0x2)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (xor 2 1)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.XOR(0x2, 0x1)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (xor 3 1)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.XOR(0x3, 0x1)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; "xor 0xfff..fff" is equivalent to not
+    #     [[0]] (xor
+    #              0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff  # noqa: E501
+    #              0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef  # noqa: E501
+    #           )
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.XOR(
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; "or 0xfff..fff" gives you 0xfff..fff
+    #     [[0]] (xor
+    #              0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee  # noqa: E501
+    #              0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff  # noqa: E501
+    #           )
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.XOR(
+                0xEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; "or 0xfff..fff" gives you 0xfff..fff
+    #     [[0]] (xor
+    #              0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee  # noqa: E501
+    #              0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff  # noqa: E501
+    #           )
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.XOR(
+                0xEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE,  # noqa: E501
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 3})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 2})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_3: Account(
+                    storage={
+                        0: 0xFEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_4: Account(
+                    storage={
+                        0: 0x1111111111111111111111111111111111111111111111111111111111111111,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_5: Account(
+                    storage={
+                        0: 0x1111111111111111111111111111101111111111111111111111111111111111,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_6,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmIOandFlowOperations/__init__.py b/tests/ported_static/vmIOandFlowOperations/__init__.py
new file mode 100644
index 00000000000..f10fc68dc27
--- /dev/null
+++ b/tests/ported_static/vmIOandFlowOperations/__init__.py
@@ -0,0 +1 @@
+"""Ported static tests: vmIOandFlowOperations."""  # noqa: N999
diff --git a/tests/ported_static/vmIOandFlowOperations/test_codecopy.py b/tests/ported_static/vmIOandFlowOperations/test_codecopy.py
new file mode 100644
index 00000000000..bfc509a4799
--- /dev/null
+++ b/tests/ported_static/vmIOandFlowOperations/test_codecopy.py
@@ -0,0 +1,374 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmIOandFlowOperations/codecopyFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmIOandFlowOperations/codecopyFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="codecopy",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="codecopy_infbuff",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="codecopy_bigbuff",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="codecopy_2buff",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="codecopy_opcodes",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_codecopy(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #    ; Copy our code into [[0]] and [[1]]
+    #    (codecopy 0 0 0x40)
+    #    [[0]] @0
+    #    [[1]] @0x20
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x40)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; Copy our code into [[0]] and [[1]]
+    #    (codecopy 0 0 (- 0 1))
+    #    [[0]] @0
+    #    [[1]] @0x20
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.CODECOPY(dest_offset=0x0, offset=0x0, size=Op.SUB(0x0, 0x1))
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; Waste some space so we'll be over 0x20 bytes of code
+    #    [0x100] (+ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16)
+    #
+    #    ; Copy our code into [[0]] and [[1]]
+    #    (codecopy    0    0 0x20)
+    #    (codecopy 0x20 0x20 0x40)
+    #    [[0]] @0
+    #    [[1]] @0x20
+    #    [[2]] @0x40
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x100,
+            value=Op.ADD(
+                Op.ADD(
+                    Op.ADD(
+                        Op.ADD(
+                            Op.ADD(
+                                Op.ADD(
+                                    Op.ADD(
+                                        Op.ADD(
+                                            Op.ADD(
+                                                Op.ADD(
+                                                    Op.ADD(
+                                                        Op.ADD(
+                                                            Op.ADD(
+                                                                Op.ADD(
+                                                                    Op.ADD(
+                                                                        0x1,
+                                                                        0x2,
+                                                                    ),
+                                                                    0x3,
+                                                                ),
+                                                                0x4,
+                                                            ),
+                                                            0x5,
+                                                        ),
+                                                        0x6,
+                                                    ),
+                                                    0x7,
+                                                ),
+                                                0x8,
+                                            ),
+                                            0x9,
+                                        ),
+                                        0xA,
+                                    ),
+                                    0xB,
+                                ),
+                                0xC,
+                            ),
+                            0xD,
+                        ),
+                        0xE,
+                    ),
+                    0xF,
+                ),
+                0x10,
+            ),
+        )
+        + Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x20)
+        + Op.CODECOPY(dest_offset=0x20, offset=0x20, size=0x40)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x40))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; Get our size
+    #    [[0xFF]] (codesize)
+    #
+    #    ; Copy our code to memory
+    #    (codecopy 0 0 @@0xFF)
+    #
+    #    ; Make it clear the storage we use gets overwritten
+    #    [[0]] 0x60A7
+    #    [[1]] 0x60A7
+    #    [[2]] 0x60A7
+    #
+    #    ; Copy the memory into storage
+    #    [[0]] @0x00
+    #    [[1]] @0x20
+    #    [[2]] @0x40
+    #    [[3]] @0x60
+    #    [[4]] @0x80
+    #    [[5]] @0xA0
+    #
+    #    ; Potentially problematic opcodes
+    #    (stop)
+    #    (selfdestruct 0xDEAD)
+    #    (return 0x0 @@0xFF)
+    #    (delegatecall 0xFF 0xEE 0xDD 0xCC 0xBB 0xAA)
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0xFF, value=Op.CODESIZE)
+        + Op.CODECOPY(dest_offset=0x0, offset=0x0, size=Op.SLOAD(key=0xFF))
+        + Op.SSTORE(key=0x0, value=0x60A7)
+        + Op.SSTORE(key=0x1, value=0x60A7)
+        + Op.SSTORE(key=0x2, value=0x60A7)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
+        + Op.SSTORE(key=0x2, value=Op.MLOAD(offset=0x40))
+        + Op.SSTORE(key=0x3, value=Op.MLOAD(offset=0x60))
+        + Op.SSTORE(key=0x4, value=Op.MLOAD(offset=0x80))
+        + Op.SSTORE(key=0x5, value=Op.MLOAD(offset=0xA0))
+        + Op.STOP
+        + Op.SELFDESTRUCT(address=0xDEAD)
+        + Op.RETURN(offset=0x0, size=Op.SLOAD(key=0xFF))
+        + Op.DELEGATECALL(
+            gas=0xFF,
+            address=0xEE,
+            args_offset=0xDD,
+            args_size=0xCC,
+            ret_offset=0xBB,
+            ret_size=0xAA,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (delegatecall 0xffffff (+ 0x1000 $4) 0 0 0 0)
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; Copy our code into [[0]] and [[1]]
+    #    (codecopy 0 0 0x1000)
+    #    [[0]] @0
+    #    [[1]] @0x20
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x1000)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_5: Account(
+                    storage={
+                        0: 0x6040600060003960005160005560205160015500000000000000000000000000,  # noqa: E501
+                        1: 0,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_5: Account(
+                    storage={
+                        0: 0x6110006000600039600051600055602051600155000000000000000000000000,  # noqa: E501
+                        1: 0,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_5: Account(storage={0: 0, 1: 0})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_5: Account(
+                    storage={
+                        0: 0x6010600F600E600D600C600B600A600960086007600660056004600360026001,  # noqa: E501
+                        1: 0x101010101010101010101010101016101005260206000600039604060206020,  # noqa: E501
+                        2: 0x3960005160005560205160015560405160025500000000000000000000000000,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_5: Account(
+                    storage={
+                        0: 0x3860FF5560FF5460006000396160A76000556160A76001556160A76002556000,  # noqa: E501
+                        1: 0x5160005560205160015560405160025560605160035560805160045560A05160,  # noqa: E501
+                        2: 0x5550061DEADFF60FF546000F360AA60BB60CC60DD60EE60FFF4000000000000,  # noqa: E501
+                        255: 91,
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_5,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmIOandFlowOperations/test_gas.py b/tests/ported_static/vmIOandFlowOperations/test_gas.py
new file mode 100644
index 00000000000..fdfe01710a7
--- /dev/null
+++ b/tests/ported_static/vmIOandFlowOperations/test_gas.py
@@ -0,0 +1,152 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmIOandFlowOperations/gasFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmIOandFlowOperations/gasFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.valid_until("Prague")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="gas1",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="gas2",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_gas(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0x100000000000)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {
+    #    [0]  0xffffffffff
+    #    [90] 0xeeee
+    #    [[0]] (gas)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xFFFFFFFFFF)
+        + Op.MSTORE(offset=0x5A, value=0xEEEE)
+        + Op.SSTORE(key=0x0, value=Op.GAS)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (gas)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GAS) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 2989},
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {contract_2: Account(storage={0: 0x4B1457B})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {contract_2: Account(storage={0: 0x4B1458D})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+    ]
+    tx_gas = [80000000]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_2,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmIOandFlowOperations/test_jump.py b/tests/ported_static/vmIOandFlowOperations/test_jump.py
new file mode 100644
index 00000000000..ba214f9deca
--- /dev/null
+++ b/tests/ported_static/vmIOandFlowOperations/test_jump.py
@@ -0,0 +1,453 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmIOandFlowOperations/jumpFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmIOandFlowOperations/jumpFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="jump-hyperspace",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="jump-hyperspace",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="jump-stop-dest",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="jump-hyperspace",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="jump-not-jumpdest",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="endless-loop",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="jump-dest",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="jump-dest",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="jump-dynamic",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="jump-2-push",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="jump-2-push",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="jump-not-jumpdest",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="jump-not-jumpdest",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="jump-hyperspace",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="jump-hyperspace",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="jump-hyperspace",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="jump-to-list",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_jump(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0x0000000000000000000000000000000000001007)
+    contract_8 = Address(0x0000000000000000000000000000000000001008)
+    contract_9 = Address(0x0000000000000000000000000000000000001009)
+    contract_10 = Address(0x000000000000000000000000000000000000100A)
+    contract_11 = Address(0x000000000000000000000000000000000000100B)
+    contract_12 = Address(0x000000000000000000000000000000000000100C)
+    contract_13 = Address(0x000000000000000000000000000000000000100D)
+    contract_14 = Address(0x000000000000000000000000000000000000100E)
+    contract_15 = Address(0x000000000000000000000000000000000000100F)
+    contract_16 = Address(0x0000000000000000000000000000000000001010)
+    contract_17 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0x100000000000)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {
+    #   [[0]] 0x600D
+    #   (asm 0x10 0x20 mul jump jumpdest)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMP(pc=Op.MUL(0x20, 0x10))
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   [[0]] 0x600D
+    #   (asm 0x01 0x10 0x20 mul jumpi jumpdest)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMPI(pc=Op.MUL(0x20, 0x10), condition=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600456005B61600D60005500
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMP(pc=0x4)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   [[0]] 0x600D
+    #   (asm 0x0fffffff jump)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMP(pc=0xFFFFFFF)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: raw
+    # 0x602360085660015b600255
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x23]
+        + Op.JUMP(pc=0x8)
+        + Op.PUSH1[0x1]
+        + Op.JUMPDEST
+        + Op.PUSH1[0x2]
+        + Op.SSTORE,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: raw
+    # 0x61600D6000555B600656
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x600D) + Op.JUMPDEST + Op.JUMP(pc=0x6),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: raw
+    # 0x61600D60085660FF5B600055
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH2[0x600D]
+        + Op.JUMP(pc=0x8)
+        + Op.PUSH1[0xFF]
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600B565B61600D600055005B600356
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMP(pc=0xB)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.JUMP(pc=0x3),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001007),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600260050156005B61600D600055
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMP(pc=Op.ADD(0x5, 0x2))
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=0x600D),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001008),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60055600605B61600D600055
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMP(pc=0x5)
+        + Op.STOP
+        + Op.PUSH1[0x5B]
+        + Op.SSTORE(key=0x0, value=0x600D),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001009),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60055600600161600D600055
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMP(pc=0x5)
+        + Op.STOP
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=0x600D),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x61600D600055600B565A5B5A600155
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMP(pc=0xB)
+        + Op.GAS
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.GAS),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x61600D6000556009565A5B5A600155
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMP(pc=0x9)
+        + Op.GAS
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.GAS),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6801000000000000000b565b5b6001600155
+    contract_13 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMP(pc=0x1000000000000000B)
+        + Op.JUMPDEST * 2
+        + Op.SSTORE(key=0x1, value=0x1),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100D),  # noqa: E501
+    )
+    # Source: raw
+    # 0x640100000007565b5b6001600155
+    contract_14 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMP(pc=0x100000007)
+        + Op.JUMPDEST * 2
+        + Op.SSTORE(key=0x1, value=0x1),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100E),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   @0 (- 0 1)
+    #   (asm 0 mload jump 0x600D 0x00 sstore)
+    # }
+    contract_15 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.MLOAD(offset=0x0))
+        + Op.POP(Op.SUB(0x0, 0x1))
+        + Op.JUMP(pc=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100F),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600E565B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B61600D600055
+    contract_16 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMP(pc=0xE)
+        + Op.JUMPDEST * 16
+        + Op.SSTORE(key=0x0, value=0x600D),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001010),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; limited gas because of the endless loop
+    #     (delegatecall 0x10000 (+ 0x1000 $4) 0 0 0 0)
+    # }
+    contract_17 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x10000,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 2989},
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [0, 1, 3, 4, 5, 9, 10, 11, 12, 13, 14, 15],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_17: Account(storage={0: 2989})},
+        },
+        {
+            "indexes": {"data": [2, 6, 7, 8, 16], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_17: Account(storage={0: 24589})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+        Bytes("693c6139") + Hash(0x7),
+        Bytes("693c6139") + Hash(0x8),
+        Bytes("693c6139") + Hash(0x9),
+        Bytes("693c6139") + Hash(0xA),
+        Bytes("693c6139") + Hash(0xB),
+        Bytes("693c6139") + Hash(0xC),
+        Bytes("693c6139") + Hash(0xD),
+        Bytes("693c6139") + Hash(0xE),
+        Bytes("693c6139") + Hash(0xF),
+        Bytes("693c6139") + Hash(0x10),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_17,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmIOandFlowOperations/test_jump_to_push.py b/tests/ported_static/vmIOandFlowOperations/test_jump_to_push.py
new file mode 100644
index 00000000000..f3168e3b044
--- /dev/null
+++ b/tests/ported_static/vmIOandFlowOperations/test_jump_to_push.py
@@ -0,0 +1,1817 @@
+"""
+Test_jump_to_push.
+
+Ported from:
+state_tests/VMTests/vmIOandFlowOperations/jumpToPushFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmIOandFlowOperations/jumpToPushFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="jump-ok",
+        ),
+        pytest.param(
+            26,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            27,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            28,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            29,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            30,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            31,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            32,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            33,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            34,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            35,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            36,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            37,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            38,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            39,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            40,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            41,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            42,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            43,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            44,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            45,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            46,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            47,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            48,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            49,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            50,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            51,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            52,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            53,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            54,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            55,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            56,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            57,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            58,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            59,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            60,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            61,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            62,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            63,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            64,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            65,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            66,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            67,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            68,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            69,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            70,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            71,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            72,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            73,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            74,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            75,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            76,
+            0,
+            0,
+            id="jump-fail",
+        ),
+        pytest.param(
+            77,
+            0,
+            0,
+            id="jump-fail",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_jump_to_push(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Test_jump_to_push."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x000000000000000000000000000000000000001A)
+    contract_1 = Address(0x000000000000000000000000000000000000001B)
+    contract_2 = Address(0x000000000000000000000000000000000000002A)
+    contract_3 = Address(0x000000000000000000000000000000000000002B)
+    contract_4 = Address(0x000000000000000000000000000000000000002C)
+    contract_5 = Address(0x000000000000000000000000000000000000003A)
+    contract_6 = Address(0x000000000000000000000000000000000000003B)
+    contract_7 = Address(0x000000000000000000000000000000000000003C)
+    contract_8 = Address(0x000000000000000000000000000000000000004A)
+    contract_9 = Address(0x000000000000000000000000000000000000004B)
+    contract_10 = Address(0x000000000000000000000000000000000000004C)
+    contract_11 = Address(0x000000000000000000000000000000000000005A)
+    contract_12 = Address(0x000000000000000000000000000000000000005B)
+    contract_13 = Address(0x000000000000000000000000000000000000005C)
+    contract_14 = Address(0x000000000000000000000000000000000000006A)
+    contract_15 = Address(0x000000000000000000000000000000000000006B)
+    contract_16 = Address(0x000000000000000000000000000000000000006C)
+    contract_17 = Address(0x000000000000000000000000000000000000007A)
+    contract_18 = Address(0x000000000000000000000000000000000000007B)
+    contract_19 = Address(0x000000000000000000000000000000000000007C)
+    contract_20 = Address(0x000000000000000000000000000000000000008A)
+    contract_21 = Address(0x000000000000000000000000000000000000008B)
+    contract_22 = Address(0x000000000000000000000000000000000000008C)
+    contract_23 = Address(0x000000000000000000000000000000000000009A)
+    contract_24 = Address(0x000000000000000000000000000000000000009B)
+    contract_25 = Address(0x000000000000000000000000000000000000009C)
+    contract_26 = Address(0x00000000000000000000000000000000000000AA)
+    contract_27 = Address(0x00000000000000000000000000000000000000AB)
+    contract_28 = Address(0x00000000000000000000000000000000000000AC)
+    contract_29 = Address(0x00000000000000000000000000000000000000BA)
+    contract_30 = Address(0x00000000000000000000000000000000000000BB)
+    contract_31 = Address(0x00000000000000000000000000000000000000BC)
+    contract_32 = Address(0x00000000000000000000000000000000000000CA)
+    contract_33 = Address(0x00000000000000000000000000000000000000CB)
+    contract_34 = Address(0x00000000000000000000000000000000000000CC)
+    contract_35 = Address(0x00000000000000000000000000000000000000DA)
+    contract_36 = Address(0x00000000000000000000000000000000000000DB)
+    contract_37 = Address(0x00000000000000000000000000000000000000DC)
+    contract_38 = Address(0x00000000000000000000000000000000000000EA)
+    contract_39 = Address(0x00000000000000000000000000000000000000EB)
+    contract_40 = Address(0x00000000000000000000000000000000000000EC)
+    contract_41 = Address(0x00000000000000000000000000000000000000FA)
+    contract_42 = Address(0x00000000000000000000000000000000000000FB)
+    contract_43 = Address(0x00000000000000000000000000000000000000FC)
+    contract_44 = Address(0x000000000000000000000000000000000000010A)
+    contract_45 = Address(0x000000000000000000000000000000000000010B)
+    contract_46 = Address(0x000000000000000000000000000000000000010C)
+    contract_47 = Address(0x000000000000000000000000000000000000011A)
+    contract_48 = Address(0x000000000000000000000000000000000000011B)
+    contract_49 = Address(0x000000000000000000000000000000000000011C)
+    contract_50 = Address(0x000000000000000000000000000000000000012A)
+    contract_51 = Address(0x000000000000000000000000000000000000012B)
+    contract_52 = Address(0x000000000000000000000000000000000000012C)
+    contract_53 = Address(0x000000000000000000000000000000000000013A)
+    contract_54 = Address(0x000000000000000000000000000000000000013B)
+    contract_55 = Address(0x000000000000000000000000000000000000013C)
+    contract_56 = Address(0x000000000000000000000000000000000000014A)
+    contract_57 = Address(0x000000000000000000000000000000000000014B)
+    contract_58 = Address(0x000000000000000000000000000000000000014C)
+    contract_59 = Address(0x000000000000000000000000000000000000015A)
+    contract_60 = Address(0x000000000000000000000000000000000000015B)
+    contract_61 = Address(0x000000000000000000000000000000000000015C)
+    contract_62 = Address(0x000000000000000000000000000000000000016A)
+    contract_63 = Address(0x000000000000000000000000000000000000016B)
+    contract_64 = Address(0x000000000000000000000000000000000000016C)
+    contract_65 = Address(0x000000000000000000000000000000000000017A)
+    contract_66 = Address(0x000000000000000000000000000000000000017B)
+    contract_67 = Address(0x000000000000000000000000000000000000017C)
+    contract_68 = Address(0x000000000000000000000000000000000000018A)
+    contract_69 = Address(0x000000000000000000000000000000000000018B)
+    contract_70 = Address(0x000000000000000000000000000000000000018C)
+    contract_71 = Address(0x000000000000000000000000000000000000019A)
+    contract_72 = Address(0x000000000000000000000000000000000000019B)
+    contract_73 = Address(0x000000000000000000000000000000000000019C)
+    contract_74 = Address(0x00000000000000000000000000000000000001AA)
+    contract_75 = Address(0x00000000000000000000000000000000000001AB)
+    contract_76 = Address(0x00000000000000000000000000000000000001AC)
+    contract_77 = Address(0x00000000000000000000000000000000000001BA)
+    contract_78 = Address(0x00000000000000000000000000000000000001BB)
+    contract_79 = Address(0x00000000000000000000000000000000000001BC)
+    contract_80 = Address(0x00000000000000000000000000000000000001CA)
+    contract_81 = Address(0x00000000000000000000000000000000000001CB)
+    contract_82 = Address(0x00000000000000000000000000000000000001CC)
+    contract_83 = Address(0x00000000000000000000000000000000000001DA)
+    contract_84 = Address(0x00000000000000000000000000000000000001DB)
+    contract_85 = Address(0x00000000000000000000000000000000000001DC)
+    contract_86 = Address(0x00000000000000000000000000000000000001EA)
+    contract_87 = Address(0x00000000000000000000000000000000000001EB)
+    contract_88 = Address(0x00000000000000000000000000000000000001EC)
+    contract_89 = Address(0x00000000000000000000000000000000000001FA)
+    contract_90 = Address(0x00000000000000000000000000000000000001FB)
+    contract_91 = Address(0x00000000000000000000000000000000000001FC)
+    contract_92 = Address(0x000000000000000000000000000000000000020A)
+    contract_93 = Address(0x000000000000000000000000000000000000020B)
+    contract_94 = Address(0x000000000000000000000000000000000000020C)
+    contract_95 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0x100000000000)
+    # Source: raw
+    # 0x6001600055600B56615B5B5B
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0xB)
+        + Op.PUSH2[0x5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000002A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956615B5B5B
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH2[0x5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000002B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600A56615B5B5B
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0xA)
+        + Op.PUSH2[0x5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000002C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600C56625B5B5B5B
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0xC)
+        + Op.PUSH3[0x5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000003A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956625B5B5B5B
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH3[0x5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000003B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600B56625B5B5B5B
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0xB)
+        + Op.PUSH3[0x5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000003C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600D56635B5B5B5B5B
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0xD)
+        + Op.PUSH4[0x5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000004A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956635B5B5B5B5B
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH4[0x5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000004B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600C56635B5B5B5B5B
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0xC)
+        + Op.PUSH4[0x5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000004C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600E56645B5B5B5B5B5B
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0xE)
+        + Op.PUSH5[0x5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000005A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956645B5B5B5B5B5B
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH5[0x5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000005B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600D56645B5B5B5B5B5B
+    contract_13 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0xD)
+        + Op.PUSH5[0x5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000005C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600F56655B5B5B5B5B5B5B
+    contract_14 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0xF)
+        + Op.PUSH6[0x5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000006A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956655B5B5B5B5B5B5B
+    contract_15 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH6[0x5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000006B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600E56655B5B5B5B5B5B5B
+    contract_16 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0xE)
+        + Op.PUSH6[0x5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000006C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601056665B5B5B5B5B5B5B5B
+    contract_17 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x10)
+        + Op.PUSH7[0x5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000007A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956665B5B5B5B5B5B5B5B
+    contract_18 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH7[0x5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000007B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600F56665B5B5B5B5B5B5B5B
+    contract_19 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0xF)
+        + Op.PUSH7[0x5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000007C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601156675B5B5B5B5B5B5B5B5B
+    contract_20 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x11)
+        + Op.PUSH8[0x5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000008A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956675B5B5B5B5B5B5B5B5B
+    contract_21 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH8[0x5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000008B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601056675B5B5B5B5B5B5B5B5B
+    contract_22 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x10)
+        + Op.PUSH8[0x5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000008C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601256685B5B5B5B5B5B5B5B5B5B
+    contract_23 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x12)
+        + Op.PUSH9[0x5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000009A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956685B5B5B5B5B5B5B5B5B5B
+    contract_24 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH9[0x5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000009B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601156685B5B5B5B5B5B5B5B5B5B
+    contract_25 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x11)
+        + Op.PUSH9[0x5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000009C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601356695B5B5B5B5B5B5B5B5B5B5B
+    contract_26 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x13)
+        + Op.PUSH10[0x5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000AA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956695B5B5B5B5B5B5B5B5B5B5B
+    contract_27 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH10[0x5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000AB),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601256695B5B5B5B5B5B5B5B5B5B5B
+    contract_28 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x12)
+        + Op.PUSH10[0x5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000AC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556014566A5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_29 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x14)
+        + Op.PUSH11[0x5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000BA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556009566A5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_30 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH11[0x5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000BB),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556013566A5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_31 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x13)
+        + Op.PUSH11[0x5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000BC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556015566B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_32 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x15)
+        + Op.PUSH12[0x5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000CA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556009566B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_33 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH12[0x5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000CB),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556014566B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_34 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x14)
+        + Op.PUSH12[0x5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000CC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556016566C5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_35 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x16)
+        + Op.PUSH13[0x5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000DA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556009566C5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_36 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH13[0x5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000DB),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556015566C5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_37 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x15)
+        + Op.PUSH13[0x5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000DC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556017566D5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_38 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x17)
+        + Op.PUSH14[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000EA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556009566D5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_39 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH14[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000EB),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556016566D5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_40 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x16)
+        + Op.PUSH14[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000EC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556018566E5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_41 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x18)
+        + Op.PUSH15[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000FA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556009566E5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_42 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH15[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000FB),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556017566E5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_43 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x17)
+        + Op.PUSH15[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000000FC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556019566F5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_44 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x19)
+        + Op.PUSH16[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000010A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556009566F5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_45 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH16[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000010B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556018566F5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_46 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x18)
+        + Op.PUSH16[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000010C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956705B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_48 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH17[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000011B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601956705B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_49 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x19)
+        + Op.PUSH17[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000011C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956715B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_51 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH18[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000012B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601C56725B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_53 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x1C)
+        + Op.PUSH19[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000013A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956725B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_54 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH19[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000013B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601D56735B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_56 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x1D)
+        + Op.PUSH20[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000014A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956735B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_57 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH20[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000014B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601C56735B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_58 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x1C)
+        + Op.PUSH20[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000014C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601E56745B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_59 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x1E)
+        + Op.PUSH21[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000015A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956745B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_60 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH21[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000015B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601D56745B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_61 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x1D)
+        + Op.PUSH21[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000015C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601F56755B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_62 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x1F)
+        + Op.PUSH22[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000016A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956755B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_63 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH22[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000016B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601E56755B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_64 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x1E)
+        + Op.PUSH22[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000016C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055602056765B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_65 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x20)
+        + Op.PUSH23[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000017A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956765B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_66 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH23[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000017B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601F56765B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_67 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x1F)
+        + Op.PUSH23[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000017C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055602156775B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_68 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x21)
+        + Op.PUSH24[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000018A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956775B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_69 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH24[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000018B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055602056775B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_70 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x20)
+        + Op.PUSH24[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000018C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055602256785B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_71 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x22)
+        + Op.PUSH25[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000019A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956785B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_72 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH25[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000019B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055602156785B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_73 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x21)
+        + Op.PUSH25[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000019C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055602356795B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_74 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x23)
+        + Op.PUSH26[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001AA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956795B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_75 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH26[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001AB),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055602256795B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_76 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x22)
+        + Op.PUSH26[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001AC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556024567A5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_77 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x24)
+        + Op.PUSH27[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001BA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556009567A5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_78 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH27[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001BB),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556023567A5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_79 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x23)
+        + Op.PUSH27[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001BC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556025567B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_80 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x25)
+        + Op.PUSH28[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001CA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556009567B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_81 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH28[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001CB),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556024567B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_82 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x24)
+        + Op.PUSH28[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001CC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556026567C5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_83 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x26)
+        + Op.PUSH29[
+            0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+        ]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001DA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556009567C5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_84 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH29[
+            0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+        ]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001DB),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556025567C5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_85 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x25)
+        + Op.PUSH29[
+            0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+        ]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001DC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556027567D5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_86 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x27)
+        + Op.PUSH30[
+            0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+        ]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001EA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556009567D5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_87 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH30[
+            0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+        ]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001EB),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556026567D5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_88 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x26)
+        + Op.PUSH30[
+            0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+        ]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001EC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556028567E5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_89 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x28)
+        + Op.PUSH31[
+            0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+        ]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001FA),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556009567E5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_90 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH31[
+            0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+        ]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001FB),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556027567E5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_91 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x27)
+        + Op.PUSH31[
+            0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+        ]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x00000000000000000000000000000000000001FC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556029567F5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_92 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x29)
+        + Op.PUSH32[
+            0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+        ]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000020A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556009567F5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_93 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH32[
+            0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+        ]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000020B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60016000556028567F5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B  # noqa: E501
+    contract_94 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x28)
+        + Op.PUSH32[
+            0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+        ]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000020C),  # noqa: E501
+    )
+    # Source: yul
+    # berlin {
+    #   let addr := calldataload(4)
+    #   pop(delegatecall(sub(gas(), 5000), addr, 0, 0, 0, 0))
+    # }
+    contract_95 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.SUB(Op.GAS, 0x1388),
+            address=Op.CALLDATALOAD(offset=0x4),
+            args_offset=Op.DUP1,
+            args_size=Op.DUP1,
+            ret_offset=Op.DUP1,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 0},
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600956605B5B
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x9)
+        + Op.PUSH1[0x5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000001B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055600A56605B5B
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0xA)
+        + Op.PUSH1[0x5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000001A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601B56725B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_55 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x1B)
+        + Op.PUSH19[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000013C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601B56715B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_50 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x1B)
+        + Op.PUSH18[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000012A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601A56705B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_47 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x1A)
+        + Op.PUSH17[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000011A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600055601A56715B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B
+    contract_52 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x1)
+        + Op.JUMP(pc=0x1A)
+        + Op.PUSH18[0x5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B]
+        + Op.JUMPDEST,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000012C),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [
+                    26,
+                    27,
+                    28,
+                    29,
+                    30,
+                    31,
+                    32,
+                    33,
+                    34,
+                    35,
+                    36,
+                    37,
+                    38,
+                    39,
+                    40,
+                    41,
+                    42,
+                    43,
+                    44,
+                    45,
+                    46,
+                    47,
+                    48,
+                    49,
+                    50,
+                    51,
+                    52,
+                    53,
+                    54,
+                    55,
+                    56,
+                    57,
+                    58,
+                    59,
+                    60,
+                    61,
+                    62,
+                    63,
+                    64,
+                    65,
+                    66,
+                    67,
+                    68,
+                    69,
+                    70,
+                    71,
+                    72,
+                    73,
+                    74,
+                    75,
+                    76,
+                    77,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_95: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {
+                "data": [
+                    0,
+                    1,
+                    2,
+                    3,
+                    4,
+                    5,
+                    6,
+                    7,
+                    8,
+                    9,
+                    10,
+                    11,
+                    12,
+                    13,
+                    14,
+                    15,
+                    16,
+                    17,
+                    18,
+                    19,
+                    20,
+                    21,
+                    22,
+                    23,
+                    24,
+                    25,
+                ],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_95: Account(storage={0: 1})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(contract_0, left_padding=True),
+        Bytes("693c6139") + Hash(contract_2, left_padding=True),
+        Bytes("693c6139") + Hash(contract_5, left_padding=True),
+        Bytes("693c6139") + Hash(contract_8, left_padding=True),
+        Bytes("693c6139") + Hash(contract_11, left_padding=True),
+        Bytes("693c6139") + Hash(contract_14, left_padding=True),
+        Bytes("693c6139") + Hash(contract_17, left_padding=True),
+        Bytes("693c6139") + Hash(contract_20, left_padding=True),
+        Bytes("693c6139") + Hash(contract_23, left_padding=True),
+        Bytes("693c6139") + Hash(contract_26, left_padding=True),
+        Bytes("693c6139") + Hash(contract_29, left_padding=True),
+        Bytes("693c6139") + Hash(contract_32, left_padding=True),
+        Bytes("693c6139") + Hash(contract_35, left_padding=True),
+        Bytes("693c6139") + Hash(contract_38, left_padding=True),
+        Bytes("693c6139") + Hash(contract_41, left_padding=True),
+        Bytes("693c6139") + Hash(contract_44, left_padding=True),
+        Bytes("693c6139") + Hash(contract_47, left_padding=True),
+        Bytes("693c6139") + Hash(contract_50, left_padding=True),
+        Bytes("693c6139") + Hash(contract_53, left_padding=True),
+        Bytes("693c6139") + Hash(contract_56, left_padding=True),
+        Bytes("693c6139") + Hash(contract_59, left_padding=True),
+        Bytes("693c6139") + Hash(contract_62, left_padding=True),
+        Bytes("693c6139") + Hash(contract_65, left_padding=True),
+        Bytes("693c6139") + Hash(contract_68, left_padding=True),
+        Bytes("693c6139") + Hash(contract_71, left_padding=True),
+        Bytes("693c6139") + Hash(contract_92, left_padding=True),
+        Bytes("693c6139") + Hash(0x1C),
+        Bytes("693c6139") + Hash(contract_4, left_padding=True),
+        Bytes("693c6139") + Hash(contract_7, left_padding=True),
+        Bytes("693c6139") + Hash(contract_10, left_padding=True),
+        Bytes("693c6139") + Hash(contract_13, left_padding=True),
+        Bytes("693c6139") + Hash(contract_16, left_padding=True),
+        Bytes("693c6139") + Hash(contract_19, left_padding=True),
+        Bytes("693c6139") + Hash(contract_22, left_padding=True),
+        Bytes("693c6139") + Hash(contract_25, left_padding=True),
+        Bytes("693c6139") + Hash(contract_28, left_padding=True),
+        Bytes("693c6139") + Hash(contract_31, left_padding=True),
+        Bytes("693c6139") + Hash(contract_34, left_padding=True),
+        Bytes("693c6139") + Hash(contract_37, left_padding=True),
+        Bytes("693c6139") + Hash(contract_40, left_padding=True),
+        Bytes("693c6139") + Hash(contract_43, left_padding=True),
+        Bytes("693c6139") + Hash(contract_46, left_padding=True),
+        Bytes("693c6139") + Hash(contract_49, left_padding=True),
+        Bytes("693c6139") + Hash(contract_52, left_padding=True),
+        Bytes("693c6139") + Hash(contract_55, left_padding=True),
+        Bytes("693c6139") + Hash(contract_58, left_padding=True),
+        Bytes("693c6139") + Hash(contract_61, left_padding=True),
+        Bytes("693c6139") + Hash(contract_64, left_padding=True),
+        Bytes("693c6139") + Hash(contract_67, left_padding=True),
+        Bytes("693c6139") + Hash(contract_70, left_padding=True),
+        Bytes("693c6139") + Hash(contract_73, left_padding=True),
+        Bytes("693c6139") + Hash(contract_94, left_padding=True),
+        Bytes("693c6139") + Hash(0x1C),
+        Bytes("693c6139") + Hash(contract_4, left_padding=True),
+        Bytes("693c6139") + Hash(contract_7, left_padding=True),
+        Bytes("693c6139") + Hash(contract_10, left_padding=True),
+        Bytes("693c6139") + Hash(contract_13, left_padding=True),
+        Bytes("693c6139") + Hash(contract_16, left_padding=True),
+        Bytes("693c6139") + Hash(contract_19, left_padding=True),
+        Bytes("693c6139") + Hash(contract_22, left_padding=True),
+        Bytes("693c6139") + Hash(contract_25, left_padding=True),
+        Bytes("693c6139") + Hash(contract_28, left_padding=True),
+        Bytes("693c6139") + Hash(contract_31, left_padding=True),
+        Bytes("693c6139") + Hash(contract_34, left_padding=True),
+        Bytes("693c6139") + Hash(contract_37, left_padding=True),
+        Bytes("693c6139") + Hash(contract_40, left_padding=True),
+        Bytes("693c6139") + Hash(contract_43, left_padding=True),
+        Bytes("693c6139") + Hash(contract_46, left_padding=True),
+        Bytes("693c6139") + Hash(contract_49, left_padding=True),
+        Bytes("693c6139") + Hash(contract_52, left_padding=True),
+        Bytes("693c6139") + Hash(contract_55, left_padding=True),
+        Bytes("693c6139") + Hash(contract_58, left_padding=True),
+        Bytes("693c6139") + Hash(contract_61, left_padding=True),
+        Bytes("693c6139") + Hash(contract_64, left_padding=True),
+        Bytes("693c6139") + Hash(contract_67, left_padding=True),
+        Bytes("693c6139") + Hash(contract_70, left_padding=True),
+        Bytes("693c6139") + Hash(contract_73, left_padding=True),
+        Bytes("693c6139") + Hash(contract_94, left_padding=True),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_95,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmIOandFlowOperations/test_jumpi.py b/tests/ported_static/vmIOandFlowOperations/test_jumpi.py
new file mode 100644
index 00000000000..c2da7dde412
--- /dev/null
+++ b/tests/ported_static/vmIOandFlowOperations/test_jumpi.py
@@ -0,0 +1,648 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmIOandFlowOperations/jumpiFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmIOandFlowOperations/jumpiFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="jump-hyperspace",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="jump-hyperspace",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="not-jump-hyperspace",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="not-jump-hyperspace",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="jump-stop-dest",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="not-jump-stop-dest",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="jump-hyperspace",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="not-jump-hyperspace",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="jump-not-jumpdest",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="endless-loop",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="jump-dest",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="jump-dest",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="jump-dynamic",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="not-jump-dynamic",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="jump-2-push",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="jump-2-push",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="jump-not-jumpdest",
+        ),
+        pytest.param(
+            17,
+            0,
+            0,
+            id="jump-not-jumpdest",
+        ),
+        pytest.param(
+            18,
+            0,
+            0,
+            id="jump-hyperspace",
+        ),
+        pytest.param(
+            19,
+            0,
+            0,
+            id="not-jump-hyperspace",
+        ),
+        pytest.param(
+            20,
+            0,
+            0,
+            id="jump-hyperspace",
+        ),
+        pytest.param(
+            21,
+            0,
+            0,
+            id="not-jump-hyperspace",
+        ),
+        pytest.param(
+            22,
+            0,
+            0,
+            id="jump-hyperspace",
+        ),
+        pytest.param(
+            23,
+            0,
+            0,
+            id="not-jump-hyperspace",
+        ),
+        pytest.param(
+            24,
+            0,
+            0,
+            id="jump-to-list",
+        ),
+        pytest.param(
+            25,
+            0,
+            0,
+            id="loop",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_jumpi(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000000200)
+    contract_3 = Address(0x0000000000000000000000000000000000000201)
+    contract_4 = Address(0x0000000000000000000000000000000000001002)
+    contract_5 = Address(0x0000000000000000000000000000000000000202)
+    contract_6 = Address(0x0000000000000000000000000000000000001003)
+    contract_7 = Address(0x0000000000000000000000000000000000000203)
+    contract_8 = Address(0x0000000000000000000000000000000000001004)
+    contract_9 = Address(0x0000000000000000000000000000000000001005)
+    contract_10 = Address(0x0000000000000000000000000000000000001006)
+    contract_11 = Address(0x0000000000000000000000000000000000001007)
+    contract_12 = Address(0x0000000000000000000000000000000000001008)
+    contract_13 = Address(0x0000000000000000000000000000000000000208)
+    contract_14 = Address(0x0000000000000000000000000000000000001009)
+    contract_15 = Address(0x000000000000000000000000000000000000100A)
+    contract_16 = Address(0x000000000000000000000000000000000000100B)
+    contract_17 = Address(0x000000000000000000000000000000000000100C)
+    contract_18 = Address(0x000000000000000000000000000000000000100D)
+    contract_19 = Address(0x000000000000000000000000000000000000020D)
+    contract_20 = Address(0x000000000000000000000000000000000000100E)
+    contract_21 = Address(0x000000000000000000000000000000000000020E)
+    contract_22 = Address(0x000000000000000000000000000000000000100F)
+    contract_23 = Address(0x000000000000000000000000000000000000020F)
+    contract_24 = Address(0x0000000000000000000000000000000000000110)
+    contract_25 = Address(0x0000000000000000000000000000000000000111)
+    contract_26 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0x100000000000)
+    # Source: lll
+    # {
+    #   [[0]] 0x600D
+    #   (asm 0x01 0x10 0x20 mul jumpi jumpdest)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMPI(pc=Op.MUL(0x20, 0x10), condition=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   [[0]] 0x600D
+    #   (asm 0x01 0x10 0x20 mul jumpi jumpdest)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMPI(pc=Op.MUL(0x20, 0x10), condition=0x1)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   [[0]] 0x600D
+    #   (asm 0x00 0x10 0x20 mul jumpi jumpdest)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMPI(pc=Op.MUL(0x20, 0x10), condition=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000200),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   [[0]] 0x600D
+    #   (asm 0x00 0x10 0x20 mul jumpi jumpdest)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMPI(pc=Op.MUL(0x20, 0x10), condition=0x0)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000201),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600657005B61600D60005500
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x6, condition=0x1)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6000600657005B61600D60005500
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x6, condition=0x0)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000202),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   [[0]] 0x600D
+    #   (asm 0xff 0x0fffffff jumpi)
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMPI(pc=0xFFFFFFF, condition=0xFF)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   [[0]] 0x600D
+    #   (asm 0x00 0x0fffffff jumpi)
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMPI(pc=0xFFFFFFF, condition=0x0)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000203),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6023600160085760015b600255
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x23]
+        + Op.JUMPI(pc=0x8, condition=0x1)
+        + Op.PUSH1[0x1]
+        + Op.JUMPDEST
+        + Op.PUSH1[0x2]
+        + Op.SSTORE,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: raw
+    # 0x61600D6000555B6006600657
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x6, condition=0x6),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: raw
+    # 0x61600D6001600A5760FF5B600055
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH2[0x600D]
+        + Op.JUMPI(pc=0xA, condition=0x1)
+        + Op.PUSH1[0xFF]
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SSTORE,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600B565B61600D600055005B6001600357
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMP(pc=0xB)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x3, condition=0x1),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001007),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600460050157005B61600D600055
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=Op.ADD(0x5, 0x4), condition=0x1)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=0x600D),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001008),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6000600460050157005B61600D600055
+    contract_13 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=Op.ADD(0x5, 0x4), condition=0x0)
+        + Op.STOP
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=0x600D),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000208),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160075700605B61600D600055
+    contract_14 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x7, condition=0x1)
+        + Op.STOP
+        + Op.PUSH1[0x5B]
+        + Op.SSTORE(key=0x0, value=0x600D),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001009),  # noqa: E501
+    )
+    # Source: raw
+    # 0x600160075700600161600D600055
+    contract_15 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x7, condition=0x1)
+        + Op.STOP
+        + Op.PUSH1[0x1]
+        + Op.SSTORE(key=0x0, value=0x600D),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100A),  # noqa: E501
+    )
+    # Source: raw
+    # 0x61600D6000556001600D575A5B5A600155
+    contract_16 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMPI(pc=0xD, condition=0x1)
+        + Op.GAS
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.GAS),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100B),  # noqa: E501
+    )
+    # Source: raw
+    # 0x61600D6000556001600B575A5B5A600155
+    contract_17 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMPI(pc=0xB, condition=0x1)
+        + Op.GAS
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x1, value=Op.GAS),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100C),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60116801000000000000000D575b5b61600D600055
+    contract_18 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x1000000000000000D, condition=0x11)
+        + Op.JUMPDEST * 2
+        + Op.SSTORE(key=0x0, value=0x600D),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100D),  # noqa: E501
+    )
+    # Source: raw
+    # 0x60006801000000000000000D575b5b61600D600055
+    contract_19 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x1000000000000000D, condition=0x0)
+        + Op.JUMPDEST * 2
+        + Op.SSTORE(key=0x0, value=0x600D),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000020D),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6011640100000009575b5b61600D600055
+    contract_20 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x100000009, condition=0x11)
+        + Op.JUMPDEST * 2
+        + Op.SSTORE(key=0x0, value=0x600D),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100E),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6000640100000009575b5b61600D600055
+    contract_21 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0x100000009, condition=0x0)
+        + Op.JUMPDEST * 2
+        + Op.SSTORE(key=0x0, value=0x600D),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000020E),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   @0 (- 0 1)
+    #   (asm 1 0 mload jumpi 0x600D 0x00 sstore)
+    # }
+    contract_22 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.MLOAD(offset=0x0))
+        + Op.POP(Op.SUB(0x0, 0x1))
+        + Op.JUMPI(pc=Op.MLOAD(offset=0x0), condition=0x1)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100F),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   @0 (- 0 1)
+    #   (asm 0 0 mload jumpi 0x600D 0x00 sstore)
+    # }
+    contract_23 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(Op.MLOAD(offset=0x0))
+        + Op.POP(Op.SUB(0x0, 0x1))
+        + Op.JUMPI(pc=Op.MLOAD(offset=0x0), condition=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000020F),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001600E575B5B5B5B5B5B5B5B5B5B5B5B5B5B5B5B61600D600055
+    contract_24 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0xE, condition=0x1)
+        + Op.JUMPDEST * 16
+        + Op.SSTORE(key=0x0, value=0x600D),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000110),  # noqa: E501
+    )
+    # Source: raw
+    # 0x61600D60005560106000525B60016000510380600052600B57
+    contract_25 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x600D)
+        + Op.MSTORE(offset=0x0, value=0x10)
+        + Op.JUMPDEST
+        + Op.SUB(Op.MLOAD(offset=0x0), 0x1)
+        + Op.MSTORE(offset=0x0, value=Op.DUP1)
+        + Op.PUSH1[0xB]
+        + Op.JUMPI,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000000111),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; limited gas because of the endless loop
+    #     (delegatecall 0x10000 $4 0 0 0 0)
+    # }
+    contract_26 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=0x10000,
+            address=Op.CALLDATALOAD(offset=0x4),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 2989},
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [0, 1, 5, 6, 8, 9, 13, 14, 15, 16, 17, 18, 20, 22],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_26: Account(storage={0: 2989})},
+        },
+        {
+            "indexes": {
+                "data": [2, 3, 4, 7, 10, 11, 12, 19, 21, 23, 24, 25],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_26: Account(storage={0: 24589})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(contract_0, left_padding=True),
+        Bytes("693c6139") + Hash(contract_1, left_padding=True),
+        Bytes("693c6139") + Hash(contract_2, left_padding=True),
+        Bytes("693c6139") + Hash(contract_3, left_padding=True),
+        Bytes("693c6139") + Hash(contract_4, left_padding=True),
+        Bytes("693c6139") + Hash(contract_5, left_padding=True),
+        Bytes("693c6139") + Hash(contract_6, left_padding=True),
+        Bytes("693c6139") + Hash(contract_7, left_padding=True),
+        Bytes("693c6139") + Hash(contract_8, left_padding=True),
+        Bytes("693c6139") + Hash(contract_9, left_padding=True),
+        Bytes("693c6139") + Hash(contract_10, left_padding=True),
+        Bytes("693c6139") + Hash(contract_11, left_padding=True),
+        Bytes("693c6139") + Hash(contract_12, left_padding=True),
+        Bytes("693c6139") + Hash(contract_13, left_padding=True),
+        Bytes("693c6139") + Hash(contract_14, left_padding=True),
+        Bytes("693c6139") + Hash(contract_15, left_padding=True),
+        Bytes("693c6139") + Hash(contract_16, left_padding=True),
+        Bytes("693c6139") + Hash(contract_17, left_padding=True),
+        Bytes("693c6139") + Hash(contract_18, left_padding=True),
+        Bytes("693c6139") + Hash(contract_19, left_padding=True),
+        Bytes("693c6139") + Hash(contract_20, left_padding=True),
+        Bytes("693c6139") + Hash(contract_21, left_padding=True),
+        Bytes("693c6139") + Hash(contract_22, left_padding=True),
+        Bytes("693c6139") + Hash(contract_23, left_padding=True),
+        Bytes("693c6139") + Hash(contract_24, left_padding=True),
+        Bytes("693c6139") + Hash(contract_25, left_padding=True),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_26,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmIOandFlowOperations/test_loop_stacklimit.py b/tests/ported_static/vmIOandFlowOperations/test_loop_stacklimit.py
new file mode 100644
index 00000000000..ec1cf83e0b3
--- /dev/null
+++ b/tests/ported_static/vmIOandFlowOperations/test_loop_stacklimit.py
@@ -0,0 +1,156 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmIOandFlowOperations/loop_stacklimitFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmIOandFlowOperations/loop_stacklimitFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="loop_1021",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="loop_1020",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_loop_stacklimit(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x100000000000)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {
+    #    (asm 0 CALLVALUE JUMPDEST 1 SWAP1 SUB SWAP1 1 ADD DUP2 DUP1 3 JUMPI 0 MSTORE 1 MSTORE 0 MSIZE RETURN)  # noqa: E501
+    # }
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.CALLVALUE
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.SWAP1
+        + Op.SUB
+        + Op.SWAP1
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.DUP2
+        + Op.JUMPI(pc=0x3, condition=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.MSTORE
+        + Op.PUSH1[0x1]
+        + Op.MSTORE
+        + Op.RETURN(offset=Op.MSIZE, size=0x0)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x15F0298E83391F673B708790F259F3F34DFBD788),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6000345b60019003906001018180600357600052600152600059f300
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x0]
+        + Op.CALLVALUE
+        + Op.JUMPDEST
+        + Op.PUSH1[0x1]
+        + Op.SWAP1
+        + Op.SUB
+        + Op.SWAP1
+        + Op.PUSH1[0x1]
+        + Op.ADD
+        + Op.DUP2
+        + Op.JUMPI(pc=0x3, condition=Op.DUP1)
+        + Op.PUSH1[0x0]
+        + Op.MSTORE
+        + Op.PUSH1[0x1]
+        + Op.MSTORE
+        + Op.RETURN(offset=Op.MSIZE, size=0x0)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x3B20573C5048E5BA16083407E59FC0BBC044B6C0),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
+    # }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 0},
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xF9B46C1D708104B4E6007D17AE485B0A00D8E952),  # noqa: E501
+    )
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+    )
+
+    post = {target: Account(storage={0: 0})}
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmIOandFlowOperations/test_loops_conditionals.py b/tests/ported_static/vmIOandFlowOperations/test_loops_conditionals.py
new file mode 100644
index 00000000000..ec091a54e3d
--- /dev/null
+++ b/tests/ported_static/vmIOandFlowOperations/test_loops_conditionals.py
@@ -0,0 +1,437 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmIOandFlowOperations/loopsConditionalsFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmIOandFlowOperations/loopsConditionalsFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="whenTrue",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="whenFalse",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="unlessTrue",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="unlessFalse",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="ifTrue",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="ifFalse",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="while",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="until",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="for",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="for_loop1",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="for_loop2",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_loops_conditionals(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0x0000000000000000000000000000000000001007)
+    contract_8 = Address(0x0000000000000000000000000000000000001008)
+    contract_9 = Address(0x0000000000000000000000000000000000001009)
+    contract_10 = Address(0x000000000000000000000000000000000000100A)
+    contract_11 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0x100000000000)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {
+    #     (when (> 1 0) [[0]] 0x600D)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0xF, condition=Op.ISZERO(Op.GT(0x1, 0x0)))
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (when (< 1 0) [[0]] 0x600D)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0xF, condition=Op.ISZERO(Op.LT(0x1, 0x0)))
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (unless (> 1 0) [[0]] 0x600D)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0xE, condition=Op.GT(0x1, 0x0))
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (unless (< 1 0) [[0]] 0x600D)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0xE, condition=Op.LT(0x1, 0x0))
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (if (> 1 0) 0x600D 0x60A7)
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0xE, condition=Op.GT(0x1, 0x0))
+        + Op.PUSH2[0x60A7]
+        + Op.JUMP(pc=0x12)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x600D]
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SSTORE
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (if (< 1 0) 0x600D 0x60A7)
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.JUMPI(pc=0xE, condition=Op.LT(0x1, 0x0))
+        + Op.PUSH2[0x60A7]
+        + Op.JUMP(pc=0x12)
+        + Op.JUMPDEST
+        + Op.PUSH2[0x600D]
+        + Op.JUMPDEST
+        + Op.PUSH1[0x0]
+        + Op.SSTORE
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] 0x10
+    #     [[1]] 0x01
+    #
+    #     (while @@0 {
+    #        [[0]] (- @@0 1)
+    #        [[1]] (* @@1 2)
+    #     })  ; while loop
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x10)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x27, condition=Op.ISZERO(Op.SLOAD(key=0x0)))
+        + Op.SSTORE(key=0x0, value=Op.SUB(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(key=0x1, value=Op.MUL(Op.SLOAD(key=0x1), 0x2))
+        + Op.JUMP(pc=0xA)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] 0x10
+    #     [[1]] 0x01
+    #
+    #     (until (= @@0 0) {
+    #        [[0]] (- @@0 1)
+    #        [[1]] (* @@1 2)
+    #     })  ; until loop
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x10)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x29, condition=Op.EQ(Op.SLOAD(key=0x0), 0x0))
+        + Op.SSTORE(key=0x0, value=Op.SUB(Op.SLOAD(key=0x0), 0x1))
+        + Op.SSTORE(key=0x1, value=Op.MUL(Op.SLOAD(key=0x1), 0x2))
+        + Op.JUMP(pc=0xA)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001007),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (for
+    #       { [[0]] 0x10  [[1]] 0x01 }         ; initialization
+    #       (> @@0 0)                          ; predicate
+    #       [[0]] (- @@0 1)                    ; post
+    #       [[1]] (* @@1 2)                    ; body
+    #     )   ; for loop
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0x10)
+        + Op.SSTORE(key=0x1, value=0x1)
+        + Op.JUMPDEST
+        + Op.JUMPI(pc=0x2A, condition=Op.ISZERO(Op.GT(Op.SLOAD(key=0x0), 0x0)))
+        + Op.SSTORE(key=0x1, value=Op.MUL(Op.SLOAD(key=0x1), 0x2))
+        + Op.SSTORE(key=0x0, value=Op.SUB(Op.SLOAD(key=0x0), 0x1))
+        + Op.JUMP(pc=0xA)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001008),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (def 'i 0x80)
+    #     (def 'j 0xA0)
+    #
+    #     (for [i] 10        ; init
+    #          (> @i 0)      ; predicate
+    #          [i] (- @i 1)  ; post
+    #          [j] (+ @i @j) ; body
+    #     )    ; for loop
+    #
+    #     [[0]] @j
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x80, value=0xA)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x26, condition=Op.ISZERO(Op.GT(Op.MLOAD(offset=0x80), 0x0))
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=Op.ADD(Op.MLOAD(offset=0x80), Op.MLOAD(offset=0xA0)),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.SUB(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x5)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0xA0))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001009),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (def 'i 0x80)
+    #     (def 'j 0xA0)
+    #
+    #     (for [i] 0         ; init
+    #          (<= @i 10)    ; predicate
+    #          [i] (+ @i 1)  ; post
+    #          [j] (+ @i @j) ; body
+    #     )    ; for loop
+    #
+    #     [[0]] @j
+    # }
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x80, value=0x0)
+        + Op.JUMPDEST
+        + Op.JUMPI(
+            pc=0x27,
+            condition=Op.ISZERO(Op.ISZERO(Op.GT(Op.MLOAD(offset=0x80), 0xA))),
+        )
+        + Op.MSTORE(
+            offset=0xA0,
+            value=Op.ADD(Op.MLOAD(offset=0x80), Op.MLOAD(offset=0xA0)),
+        )
+        + Op.MSTORE(offset=0x80, value=Op.ADD(Op.MLOAD(offset=0x80), 0x1))
+        + Op.JUMP(pc=0x5)
+        + Op.JUMPDEST
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0xA0))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100A),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
+    # }
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 2989},
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 2, 4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_11: Account(storage={0: 24589})},
+        },
+        {
+            "indexes": {"data": [1, 3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_11: Account(storage={0: 2989})},
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_11: Account(storage={0: 24743})},
+        },
+        {
+            "indexes": {"data": [8, 6, 7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_11: Account(storage={0: 0, 1: 0x10000})},
+        },
+        {
+            "indexes": {"data": [9, 10], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_11: Account(storage={0: 55})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+        Bytes("693c6139") + Hash(0x7),
+        Bytes("693c6139") + Hash(0x8),
+        Bytes("693c6139") + Hash(0x9),
+        Bytes("693c6139") + Hash(0xA),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_11,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmIOandFlowOperations/test_mload.py b/tests/ported_static/vmIOandFlowOperations/test_mload.py
new file mode 100644
index 00000000000..cf11bf25816
--- /dev/null
+++ b/tests/ported_static/vmIOandFlowOperations/test_mload.py
@@ -0,0 +1,183 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmIOandFlowOperations/mloadFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmIOandFlowOperations/mloadFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="mload",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="mloadOOG",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="mloadOOG",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_mload(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0x100000000000)
+    # Source: lll
+    # {
+    #      [0] 0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff  # noqa: E501
+    #      [[0]] (mload 0)
+    #
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #      [[0]] (mload 0x0fffffff)
+    #
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0xFFFFFFF)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #      [[0]] (mload 7489573)
+    #
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x724825)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 2989},
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_3: Account(
+                    storage={
+                        0: 0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 2989})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_3,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmIOandFlowOperations/test_msize.py b/tests/ported_static/vmIOandFlowOperations/test_msize.py
new file mode 100644
index 00000000000..5cc3faad9f2
--- /dev/null
+++ b/tests/ported_static/vmIOandFlowOperations/test_msize.py
@@ -0,0 +1,280 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmIOandFlowOperations/msizeFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmIOandFlowOperations/msizeFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.valid_until("Prague")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="msize0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="msize1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="msize2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="msize3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="chunks",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="farChunk",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_msize(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0x100000000000)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=4294967296,
+    )
+
+    # Source: lll
+    # {
+    #     ; Store an entire 32 byte value
+    #     [0]  0xFF
+    #    [[0]] (msize)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xFF)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; Store an entire 32 byte value
+    #     [0]  0xffffffffff
+    #    [[0]] (msize)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xFFFFFFFFFF)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; Store two values
+    #    [0]    0xffffffffff
+    #    [0x20] 0xeeee
+    #    [[0]] (msize)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xFFFFFFFFFF)
+        + Op.MSTORE(offset=0x20, value=0xEEEE)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; Store two values
+    #    [0]    0xffffffffff
+    #    [0x5a] 0xeeee
+    #    [[0]] (msize)
+    #
+    #    ; The 0xEEEE value is stored 0x5a-0x79,
+    #    ; and memory is allocated in 0x20 byte chunks
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x0, value=0xFFFFFFFFFF)
+        + Op.MSTORE(offset=0x5A, value=0xEEEE)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; Store at the very end of the first chunk
+    #    (mstore8 0x1F 1)
+    #    [[0]] (msize)
+    #
+    #    ; Store at the beginning of the second chuck
+    #    (mstore8 0x20 1)
+    #    [[1]] (msize)
+    #
+    #    ; Does it matter if we reset the memory?
+    #    ; Spoiler alert, it doesn't
+    #    (mstore8 0x20 0)
+    #    [[2]] (msize)
+    #
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x1F, value=0x1)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.MSTORE8(offset=0x20, value=0x1)
+        + Op.SSTORE(key=0x1, value=Op.MSIZE)
+        + Op.MSTORE8(offset=0x20, value=0x0)
+        + Op.SSTORE(key=0x2, value=Op.MSIZE)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; Does the chunk size change in very high offsets?
+    #    ;
+    #    ; Note: It doesn't
+    #    (mstore8 0xB00000 1)
+    #    [[0]] (msize)
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0xB00000, value=0x1)
+        + Op.SSTORE(key=0x0, value=Op.MSIZE)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 1], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {contract_6: Account(storage={0: 32})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {contract_6: Account(storage={0: 64})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {contract_6: Account(storage={0: 128})},
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {contract_6: Account(storage={0: 32, 1: 64, 2: 64})},
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun<Osaka"],
+            "result": {contract_6: Account(storage={0: 0xB00020})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+    ]
+    tx_gas = [268435456]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_6,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmIOandFlowOperations/test_mstore.py b/tests/ported_static/vmIOandFlowOperations/test_mstore.py
new file mode 100644
index 00000000000..8ab043b473a
--- /dev/null
+++ b/tests/ported_static/vmIOandFlowOperations/test_mstore.py
@@ -0,0 +1,244 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmIOandFlowOperations/mstoreFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmIOandFlowOperations/mstoreFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="mstore_allF",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="mstore_one",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="mstore_neg1",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="mstore_byte32",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="mstore_byte31",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_mstore(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0x100000000000)
+    # Source: lll
+    # {
+    #      (mstore 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #      [[0]] @1
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x1,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x1))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    (mstore 1 (+ 2 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) )  # noqa: E501
+    #    [[0]] @1
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x1,
+            value=Op.ADD(
+                0x2,
+                0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x1))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #      (mstore 1 (- 0 1))
+    #      [[0]] @1
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=Op.SUB(0x0, 0x1))
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x1))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #      (mstore 1 0xFF)
+    #      [[0]] @0
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0xFF)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #      (mstore 1 0xFF00)
+    #      [[0]] @0
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x1, value=0xFF00)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 2989},
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_5: Account(
+                    storage={
+                        0: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_5: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_5: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_5: Account(storage={0: 255})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_5,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmIOandFlowOperations/test_mstore8.py b/tests/ported_static/vmIOandFlowOperations/test_mstore8.py
new file mode 100644
index 00000000000..23cc67ce2c1
--- /dev/null
+++ b/tests/ported_static/vmIOandFlowOperations/test_mstore8.py
@@ -0,0 +1,193 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmIOandFlowOperations/mstore8Filler.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmIOandFlowOperations/mstore8Filler.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="mstore8_onebyte",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="mstore8_twobytes",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="mstore8_neg1",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_mstore8(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0x100000000000)
+    # Source: lll
+    # {
+    #      ; It ignores all but one byte, the least significant one
+    #      (mstore8 1 0x112233445566778899AABBCCDDEEFF)
+    #      [[0]] @1
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x1, value=0x112233445566778899AABBCCDDEEFF)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x1))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    (mstore8 1 0xFF)
+    #    (mstore8 2 0xEE)
+    #    [[0]] @0
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x1, value=0xFF)
+        + Op.MSTORE8(offset=0x2, value=0xEE)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #      ; It ignores all but one byte, the least significant one
+    #      (mstore8 1 (- 0 1))
+    #      [[0]] @1
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x1, value=Op.SUB(0x0, 0x1))
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x1))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 2989},
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_3: Account(
+                    storage={
+                        0: 0xFF00000000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_3: Account(
+                    storage={
+                        0: 0xFFEE0000000000000000000000000000000000000000000000000000000000,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_3,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmIOandFlowOperations/test_pc.py b/tests/ported_static/vmIOandFlowOperations/test_pc.py
new file mode 100644
index 00000000000..fc3df94d285
--- /dev/null
+++ b/tests/ported_static/vmIOandFlowOperations/test_pc.py
@@ -0,0 +1,149 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmIOandFlowOperations/pcFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmIOandFlowOperations/pcFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="pc1",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="pc2",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_pc(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0x100000000000)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {
+    #    [[0]] (pc)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.PC) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] 0xFF
+    #    [[1]] (pc)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0xFF)
+        + Op.SSTORE(key=0x1, value=Op.PC)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 2989},
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 255, 1: 5})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_2,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmIOandFlowOperations/test_pop.py b/tests/ported_static/vmIOandFlowOperations/test_pop.py
new file mode 100644
index 00000000000..9e49f6e31bc
--- /dev/null
+++ b/tests/ported_static/vmIOandFlowOperations/test_pop.py
@@ -0,0 +1,141 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmIOandFlowOperations/popFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmIOandFlowOperations/popFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="pop1",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="pop2",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_pop(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0x100000000000)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: raw
+    # 0x6002600360045055
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.PUSH1[0x2] + Op.PUSH1[0x3] + Op.POP(0x4) + Op.SSTORE,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: raw
+    # 0x5060026003600455
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP + Op.PUSH1[0x2] + Op.SSTORE(key=0x4, value=0x3),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={3: 2})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={4: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_2,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmIOandFlowOperations/test_return.py b/tests/ported_static/vmIOandFlowOperations/test_return.py
new file mode 100644
index 00000000000..17e39f195f8
--- /dev/null
+++ b/tests/ported_static/vmIOandFlowOperations/test_return.py
@@ -0,0 +1,278 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmIOandFlowOperations/returnFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmIOandFlowOperations/returnFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="return",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="returnInfBuff",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="returnBigBuff",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="returnOffset",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="returnOld",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_return(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #    [0] 0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
+    #    [[0xFF]] 0x600D
+    #    (return 0x00 0x40)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
+        )
+        + Op.SSTORE(key=0xFF, value=0x600D)
+        + Op.RETURN(offset=0x0, size=0x40)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [0] 0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
+    #    [[0xFF]] 0x600D
+    #    (return 0x00 (- 0 1))
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
+        )
+        + Op.SSTORE(key=0xFF, value=0x600D)
+        + Op.RETURN(offset=0x0, size=Op.SUB(0x0, 0x1))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [0] 0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
+    #    [[0xFF]] 0x600D
+    #    (return 0x05 0x20)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
+        )
+        + Op.SSTORE(key=0xFF, value=0x600D)
+        + Op.RETURN(offset=0x5, size=0x20)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: raw
+    # 0x6001608052600060805111601b57600160005260206000f3602b565b602760005260206000f360026080525b00  # noqa: E501
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(offset=0x80, value=0x1)
+        + Op.JUMPI(pc=0x1B, condition=Op.GT(Op.MLOAD(offset=0x80), 0x0))
+        + Op.MSTORE(offset=0x0, value=0x1)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.JUMP(pc=0x2B)
+        + Op.JUMPDEST
+        + Op.MSTORE(offset=0x0, value=0x27)
+        + Op.RETURN(offset=0x0, size=0x20)
+        + Op.MSTORE(offset=0x80, value=0x2)
+        + Op.JUMPDEST
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; read 0x40 bytes of return data
+    #     (delegatecall 0xffffff (+ 0x1000 $4) 0 0 0x00 0x40)
+    #
+    #     [[0]] @0x00
+    #     [[1]] @0x20
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.POP(
+            Op.DELEGATECALL(
+                gas=0xFFFFFF,
+                address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+                args_offset=0x0,
+                args_size=0x0,
+                ret_offset=0x0,
+                ret_size=0x40,
+            )
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.SSTORE(key=0x1, value=Op.MLOAD(offset=0x20))
+        + Op.STOP,
+        storage={255: 2989},
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [0] 0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
+    #    [[0xFF]] 0x600D
+    #    (return 0x00 0x1000)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
+        )
+        + Op.SSTORE(key=0xFF, value=0x600D)
+        + Op.RETURN(offset=0x0, size=0x1000)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_5: Account(
+                    storage={
+                        0: 0x123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF,  # noqa: E501
+                        1: 0,
+                        255: 24589,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_5: Account(storage={255: 2989})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_5: Account(
+                    storage={
+                        0: 0xABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0000000000,  # noqa: E501
+                        1: 0,
+                        255: 24589,
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_5: Account(storage={0: 39, 255: 2989})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_5,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmIOandFlowOperations/test_sstore_sload.py b/tests/ported_static/vmIOandFlowOperations/test_sstore_sload.py
new file mode 100644
index 00000000000..21b82a91fe5
--- /dev/null
+++ b/tests/ported_static/vmIOandFlowOperations/test_sstore_sload.py
@@ -0,0 +1,194 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmIOandFlowOperations/sstore_sloadFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmIOandFlowOperations/sstore_sloadFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="sstore_sload_3",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="sstore_sload_noinit",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="sstore_sload_4",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_sstore_sload(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0x100000000000)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {
+    #    (sstore 0 0xff)
+    #    (sstore 10 0xee)
+    #    [[ 20 ]] (sload 0)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0xFF)
+        + Op.SSTORE(key=0xA, value=0xEE)
+        + Op.SSTORE(key=0x14, value=Op.SLOAD(key=0x0))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    (sstore 0 0xff)
+    #    (sstore 10 0xee)
+    #    [[ 20 ]] (sload 100)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0xFF)
+        + Op.SSTORE(key=0xA, value=0xEE)
+        + Op.SSTORE(key=0x14, value=Op.SLOAD(key=0x64))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] 0xFF
+    #    [[1]] 0xEE
+    #    [[2]] 0xDD
+    #    [[10]] @@1
+    #    [[20]] @@2
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=0xFF)
+        + Op.SSTORE(key=0x1, value=0xEE)
+        + Op.SSTORE(key=0x2, value=0xDD)
+        + Op.SSTORE(key=0xA, value=Op.SLOAD(key=0x1))
+        + Op.SSTORE(key=0x14, value=Op.SLOAD(key=0x2))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 2989},
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_3: Account(storage={0: 255, 10: 238, 20: 255})
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 255, 10: 238})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_3: Account(
+                    storage={0: 255, 1: 238, 2: 221, 10: 238, 20: 221}
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_3,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmLogTest/__init__.py b/tests/ported_static/vmLogTest/__init__.py
new file mode 100644
index 00000000000..2252fd70ad1
--- /dev/null
+++ b/tests/ported_static/vmLogTest/__init__.py
@@ -0,0 +1 @@
+"""Ported static tests: vmLogTest."""  # noqa: N999
diff --git a/tests/ported_static/vmLogTest/test_log0.py b/tests/ported_static/vmLogTest/test_log0.py
new file mode 100644
index 00000000000..d743762ab28
--- /dev/null
+++ b/tests/ported_static/vmLogTest/test_log0.py
@@ -0,0 +1,322 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmLogTest/log0Filler.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmLogTest/log0Filler.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="emptyMem",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="memStartTooHigh",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="memSizeTooHigh",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="memSizeZero",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="nonEmptyMem",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="log_0_1",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="log_31_1",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="logTwice",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_log0(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0x000000000000000000000000000000000000100A)
+    contract_8 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0x100000000000)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {   ; emptyMem
+    #     (log0 0 0)
+    #
+    #     [[0]] 0x600D
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG0(offset=0x0, size=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {      ; memStartTooHigh
+    #    [0]   0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd  # noqa: E501
+    #    (log0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1)  # noqa: E501
+    #    [[0]] 0x600D
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG0(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=0x1,
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; memSizeTooHigh
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log0 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #    [[0]] 0x600D
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG0(
+            offset=0x1,
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; memSizeZero
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log0 1 0)
+    #    [[0]] 0x600D
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG0(offset=0x1, size=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; nonEmptyMem
+    #    [0] 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+    #    (log0 0 32)
+    #    [[0]] 0x600D
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.LOG0(offset=0x0, size=0x20)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; log_0_1
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log0 0 1)
+    #    [[0]] 0x600D
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG0(offset=0x0, size=0x1)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; log_31_1
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log0 31 1)
+    #    [[0]] 0x600D
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG0(offset=0x1F, size=0x1)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; logTwice
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log0 0 32)
+    #    (log0 2 16)
+    #    [[0]] 0x600D
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG0(offset=0x0, size=0x20)
+        + Op.LOG0(offset=0x2, size=0x10)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100A),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 2989},
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 3, 4, 5, 6, 7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_8: Account(storage={0: 24589})},
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_8: Account(storage={0: 2989})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+        Bytes("693c6139") + Hash(0xA),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_8,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmLogTest/test_log1.py b/tests/ported_static/vmLogTest/test_log1.py
new file mode 100644
index 00000000000..b4309d454e6
--- /dev/null
+++ b/tests/ported_static/vmLogTest/test_log1.py
@@ -0,0 +1,347 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmLogTest/log1Filler.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmLogTest/log1Filler.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="emptyMem",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="memStartTooHigh",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="memSizeTooHigh",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="memSizeZero",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="nonEmptyMem",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="log_0_1",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="log_31_1",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="caller",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="maxTopic",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_log1(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0x0000000000000000000000000000000000001007)
+    contract_8 = Address(0x0000000000000000000000000000000000001008)
+    contract_9 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0x100000000000)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {   ; emptyMem
+    #     (log1 0 0 0)
+    #
+    #     [[0]] 0x600D
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG1(offset=0x0, size=0x0, topic_1=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {      ; memStartTooHigh
+    #    [0]   0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd  # noqa: E501
+    #    (log1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0)  # noqa: E501
+    #    [[0]] 0x600D
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG1(
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            size=0x1,
+            topic_1=0x0,
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; memSizeTooHigh
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log1 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0)  # noqa: E501
+    #    [[0]] 0x600D
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG1(
+            offset=0x1,
+            size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            topic_1=0x0,
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; memSizeZero
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log1 1 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG1(offset=0x1, size=0x0, topic_1=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; nonEmptyMem
+    #    [0] 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+    #    (log1 0 32 0)
+    #    [[0]] 0x600D
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.LOG1(offset=0x0, size=0x20, topic_1=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; log_0_1
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log1 0 1 0)
+    #    [[0]] 0x600D
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG1(offset=0x0, size=0x1, topic_1=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; log_31_1
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log1 31 1 0)
+    #    [[0]] 0x600D
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG1(offset=0x1F, size=0x1, topic_1=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; caller (as topic)
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log1 0 32 (caller))
+    #    [[0]] 0x600D
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG1(offset=0x0, size=0x20, topic_1=Op.CALLER)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001007),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; maxTopic
+    #    (def 'neg1 (- 0 1))
+    #
+    #    (mstore8 0 0xFF)
+    #    (log1 31 1 neg1)
+    #    [[0]] 0x600D
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xFF)
+        + Op.LOG1(offset=0x1F, size=0x1, topic_1=Op.SUB(0x0, 0x1))
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001008),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 2989},
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 3, 4, 5, 6, 7, 8], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_9: Account(storage={0: 24589})},
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_9: Account(storage={0: 2989})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+        Bytes("693c6139") + Hash(0x7),
+        Bytes("693c6139") + Hash(0x8),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_9,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmLogTest/test_log2.py b/tests/ported_static/vmLogTest/test_log2.py
new file mode 100644
index 00000000000..95fa656fe44
--- /dev/null
+++ b/tests/ported_static/vmLogTest/test_log2.py
@@ -0,0 +1,348 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmLogTest/log2Filler.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmLogTest/log2Filler.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="emptyMem",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="memStartTooHigh",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="memSizeTooHigh",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="memSizeZero",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="nonEmptyMem",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="log_0_1",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="log_31_1",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="caller",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="maxTopic",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_log2(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0x0000000000000000000000000000000000001007)
+    contract_8 = Address(0x0000000000000000000000000000000000001008)
+    contract_9 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0x100000000000)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {   ; emptyMem
+    #     (log2 0 0 0 0)
+    #
+    #     [[0]] 0x600D
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG2(offset=0x0, size=0x0, topic_1=0x0, topic_2=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {      ; memStartTooHigh
+    #    (def 'neg1 (- 0 1))
+    #
+    #    [0]   0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd  # noqa: E501
+    #    (log2 neg1 1 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG2(offset=Op.SUB(0x0, 0x1), size=0x1, topic_1=0x0, topic_2=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; memSizeTooHigh
+    #    (def 'neg1 (- 0 1))
+    #
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log2 1 neg1 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG2(offset=0x1, size=Op.SUB(0x0, 0x1), topic_1=0x0, topic_2=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; memSizeZero
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log2 1 0 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG2(offset=0x1, size=0x0, topic_1=0x0, topic_2=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; nonEmptyMem
+    #    [0] 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+    #    (log2 0 32 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.LOG2(offset=0x0, size=0x20, topic_1=0x0, topic_2=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; log_0_1
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log2 0 1 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG2(offset=0x0, size=0x1, topic_1=0x0, topic_2=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; log_31_1
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log2 31 1 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG2(offset=0x1F, size=0x1, topic_1=0x0, topic_2=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; caller (as topic)
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log2 0 32 0 (caller))
+    #    [[0]] 0x600D
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG2(offset=0x0, size=0x20, topic_1=0x0, topic_2=Op.CALLER)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001007),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; maxTopic
+    #    (def 'neg1 (- 0 1))
+    #
+    #    (mstore8 0 0xFF)
+    #    (log2 31 1 neg1 neg1)
+    #    [[0]] 0x600D
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xFF)
+        + Op.LOG2(
+            offset=0x1F,
+            size=0x1,
+            topic_1=Op.SUB(0x0, 0x1),
+            topic_2=Op.SUB(0x0, 0x1),
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001008),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 2989},
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0, 3, 4, 5, 6, 7, 8], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_9: Account(storage={0: 24589})},
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_9: Account(storage={0: 2989})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+        Bytes("693c6139") + Hash(0x7),
+        Bytes("693c6139") + Hash(0x8),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_9,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmLogTest/test_log3.py b/tests/ported_static/vmLogTest/test_log3.py
new file mode 100644
index 00000000000..a763ee5fd27
--- /dev/null
+++ b/tests/ported_static/vmLogTest/test_log3.py
@@ -0,0 +1,397 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmLogTest/log3Filler.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmLogTest/log3Filler.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="emptyMem",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="memStartTooHigh",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="memSizeTooHigh",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="memSizeZero",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="nonEmptyMem",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="log_0_1",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="log_31_1",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="caller",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="maxTopic",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="pc",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_log3(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0x0000000000000000000000000000000000001007)
+    contract_8 = Address(0x0000000000000000000000000000000000001008)
+    contract_9 = Address(0x0000000000000000000000000000000000001009)
+    contract_10 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0x100000000000)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {   ; emptyMem
+    #     (log3 0 0 0 0 0)
+    #
+    #     [[0]] 0x600D
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG3(
+            offset=0x0, size=0x0, topic_1=0x0, topic_2=0x0, topic_3=0x0
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {      ; memStartTooHigh
+    #    (def 'neg1 (- 0 1))
+    #
+    #    [0]   0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd  # noqa: E501
+    #    (log3 neg1 1 0 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG3(
+            offset=Op.SUB(0x0, 0x1),
+            size=0x1,
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; memSizeTooHigh
+    #    (def 'neg1 (- 0 1))
+    #
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log3 1 neg1 0 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG3(
+            offset=0x1,
+            size=Op.SUB(0x0, 0x1),
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; memSizeZero
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log3 1 0 0 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG3(offset=0x1, size=0x0, topic_1=0x0, topic_2=0x0, topic_3=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; nonEmptyMem
+    #    [0] 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+    #    (log3 0 32 0 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.LOG3(offset=0x0, size=0x20, topic_1=0x0, topic_2=0x0, topic_3=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; log_0_1
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log3 0 1 0 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG3(offset=0x0, size=0x1, topic_1=0x0, topic_2=0x0, topic_3=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; log_31_1
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log3 31 1 0 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG3(offset=0x1F, size=0x1, topic_1=0x0, topic_2=0x0, topic_3=0x0)
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; caller (as topic)
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log3 0 32 0 0 (caller))
+    #    [[0]] 0x600D
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG3(
+            offset=0x0, size=0x20, topic_1=0x0, topic_2=0x0, topic_3=Op.CALLER
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001007),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; maxTopic
+    #    (def 'neg1 (- 0 1))
+    #
+    #    (mstore8 0 0xFF)
+    #    (log3 31 1 neg1 neg1 neg1)
+    #    [[0]] 0x600D
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xFF)
+        + Op.LOG3(
+            offset=0x1F,
+            size=0x1,
+            topic_1=Op.SUB(0x0, 0x1),
+            topic_2=Op.SUB(0x0, 0x1),
+            topic_3=Op.SUB(0x0, 0x1),
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001008),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; pc
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log3 31 1 (pc) (pc) (pc))
+    #    [[0]] 0x600D
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG3(
+            offset=0x1F, size=0x1, topic_1=Op.PC, topic_2=Op.PC, topic_3=Op.PC
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001009),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
+    # }
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 2989},
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [0, 3, 4, 5, 6, 7, 8, 9],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_10: Account(storage={0: 24589})},
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_10: Account(storage={0: 2989})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+        Bytes("693c6139") + Hash(0x7),
+        Bytes("693c6139") + Hash(0x8),
+        Bytes("693c6139") + Hash(0x9),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_10,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmLogTest/test_log4.py b/tests/ported_static/vmLogTest/test_log4.py
new file mode 100644
index 00000000000..3266265017a
--- /dev/null
+++ b/tests/ported_static/vmLogTest/test_log4.py
@@ -0,0 +1,443 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmLogTest/log4Filler.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmLogTest/log4Filler.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="emptyMem",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="memStartTooHigh",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="memSizeTooHigh",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="memSizeZero",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="nonEmptyMem",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="log_0_1",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="log_31_1",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="caller",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="maxTopic",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="pc",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_log4(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0x0000000000000000000000000000000000001007)
+    contract_8 = Address(0x0000000000000000000000000000000000001008)
+    contract_9 = Address(0x0000000000000000000000000000000000001009)
+    contract_10 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0x100000000000)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {   ; emptyMem
+    #     (log4 0 0 0 0 0 0)
+    #
+    #     [[0]] 0x600D
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.LOG4(
+            offset=0x0,
+            size=0x0,
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+            topic_4=0x0,
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {      ; memStartTooHigh
+    #    (def 'neg1 (- 0 1))
+    #
+    #    [0]   0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd  # noqa: E501
+    #    (log4 neg1 1 0 0 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG4(
+            offset=Op.SUB(0x0, 0x1),
+            size=0x1,
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+            topic_4=0x0,
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; memSizeTooHigh
+    #    (def 'neg1 (- 0 1))
+    #
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log4 1 neg1 0 0 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG4(
+            offset=0x1,
+            size=Op.SUB(0x0, 0x1),
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+            topic_4=0x0,
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; memSizeZero
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log4 1 0 0 0 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG4(
+            offset=0x1,
+            size=0x0,
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+            topic_4=0x0,
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; nonEmptyMem
+    #    [0] 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+    #    (log4 0 32 0 0 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+        )
+        + Op.LOG4(
+            offset=0x0,
+            size=0x20,
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+            topic_4=0x0,
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; log_0_1
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log4 0 1 0 0 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG4(
+            offset=0x0,
+            size=0x1,
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+            topic_4=0x0,
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; log_31_1
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log4 31 1 0 0 0 0)
+    #    [[0]] 0x600D
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG4(
+            offset=0x1F,
+            size=0x1,
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+            topic_4=0x0,
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; caller (as topic)
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log4 0 32 0 0 0 (caller))
+    #    [[0]] 0x600D
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG4(
+            offset=0x0,
+            size=0x20,
+            topic_1=0x0,
+            topic_2=0x0,
+            topic_3=0x0,
+            topic_4=Op.CALLER,
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001007),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; maxTopic
+    #    (def 'neg1 (- 0 1))
+    #
+    #    (mstore8 0 0xFF)
+    #    (log4 31 1 neg1 neg1 neg1 neg1)
+    #    [[0]] 0x600D
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE8(offset=0x0, value=0xFF)
+        + Op.LOG4(
+            offset=0x1F,
+            size=0x1,
+            topic_1=Op.SUB(0x0, 0x1),
+            topic_2=Op.SUB(0x0, 0x1),
+            topic_3=Op.SUB(0x0, 0x1),
+            topic_4=Op.SUB(0x0, 0x1),
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001008),  # noqa: E501
+    )
+    # Source: lll
+    # {        ; pc
+    #    [0] 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd
+    #    (log4 31 1 (pc) (pc) (pc) (pc))
+    #    [[0]] 0x600D
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.MSTORE(
+            offset=0x0,
+            value=0xAABBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCCDD,  # noqa: E501
+        )
+        + Op.LOG4(
+            offset=0x1F,
+            size=0x1,
+            topic_1=Op.PC,
+            topic_2=Op.PC,
+            topic_3=Op.PC,
+            topic_4=Op.PC,
+        )
+        + Op.SSTORE(key=0x0, value=0x600D)
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001009),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0)
+    # }
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.DELEGATECALL(
+            gas=Op.GAS,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        storage={0: 2989},
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {
+                "data": [0, 3, 4, 5, 6, 7, 8, 9],
+                "gas": -1,
+                "value": -1,
+            },
+            "network": [">=Cancun"],
+            "result": {contract_10: Account(storage={0: 24589})},
+        },
+        {
+            "indexes": {"data": [1, 2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_10: Account(storage={0: 2989})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+        Bytes("693c6139") + Hash(0x7),
+        Bytes("693c6139") + Hash(0x8),
+        Bytes("693c6139") + Hash(0x9),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_10,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmTests/__init__.py b/tests/ported_static/vmTests/__init__.py
new file mode 100644
index 00000000000..5bc35049dd0
--- /dev/null
+++ b/tests/ported_static/vmTests/__init__.py
@@ -0,0 +1 @@
+"""Ported static tests: vmTests."""  # noqa: N999
diff --git a/tests/ported_static/vmTests/test_block_info.py b/tests/ported_static/vmTests/test_block_info.py
new file mode 100644
index 00000000000..57fc33cc47d
--- /dev/null
+++ b/tests/ported_static/vmTests/test_block_info.py
@@ -0,0 +1,215 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmTests/blockInfoFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmTests/blockInfoFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="coinbase",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="difficulty",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="gaslimit",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="number",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="timestamp",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_block_info(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = pre.fund_eoa(amount=0xBA1A9CE0BA1A9CE)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: lll
+    # {
+    #     [[0]] (coinbase)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.COINBASE) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #      [[0]] (difficulty)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.PREVRANDAO) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (gaslimit)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GASLIMIT) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {  ; The blocknumber
+    #       [[0]] (number)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.NUMBER) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #       [[0]] (timestamp)
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.TIMESTAMP) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: coinbase})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_1: Account(storage={0: 0x20000})},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 0x5F5E100})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 1})},
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_4: Account(storage={0: 1000})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_5,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmTests/test_env_info.py b/tests/ported_static/vmTests/test_env_info.py
new file mode 100644
index 00000000000..67c2e62f6d6
--- /dev/null
+++ b/tests/ported_static/vmTests/test_env_info.py
@@ -0,0 +1,360 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmTests/envInfoFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmTests/envInfoFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="address",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="codecopy",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="codecopy_len0",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="codecopy_neg_offset",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="caller",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="callvalue",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="codesize",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="gasprice",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="origin",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="calldatasize",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_env_info(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0x0000000000000000000000000000000000001007)
+    contract_8 = Address(0x0000000000000000000000000000000000001008)
+    contract_9 = Address(0x0000000000000000000000000000000000001009)
+    contract_10 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0xBA1A9CE0BA1A9CE)
+    # Source: lll
+    # {
+    #    [[0]] (address)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ADDRESS) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {   ; Copy first seven bytes of code to memory
+    #     ; and from there to storage
+    #    (codecopy 0 0 7)
+    #    [[0]] @0
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x7)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; codecopy zero bytes
+    #    (codecopy 0 0 0)
+    #    [[0]] @0
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.CODECOPY(dest_offset=0x0, offset=0x0, size=0x0)
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    ; codecopy from unrealistically high in the code
+    #    ; segment (so high you wrap around)
+    #    (def 'neg6
+    #       0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa)
+    #    (codecopy 0 neg6 8)
+    #    [[0]] @0
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.CODECOPY(
+            dest_offset=0x0,
+            offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA,  # noqa: E501
+            size=0x8,
+        )
+        + Op.SSTORE(key=0x0, value=Op.MLOAD(offset=0x0))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (caller)
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.CALLER) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (callvalue)
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.CALLVALUE) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (codesize)
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.CODESIZE) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (gasprice)
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.GASPRICE) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001007),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (origin)
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.ORIGIN) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001008),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    [[0]] (calldatasize)
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.CALLDATASIZE) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001009),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call 0xffffff (+ 0x1000 $4) 0x10 0 0 0 0)
+    # }
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=0xFFFFFF,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x10,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_0: Account(storage={0: contract_0})},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(
+                    storage={
+                        0: 0x6007600060003900000000000000000000000000000000000000000000000000,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_2: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_4: Account(storage={0: contract_10})},
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_5: Account(storage={0: 16})},
+        },
+        {
+            "indexes": {"data": [6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_6: Account(storage={0: 5})},
+        },
+        {
+            "indexes": {"data": [7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_7: Account(storage={0: 4660})},
+        },
+        {
+            "indexes": {"data": [8], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_8: Account(storage={0: sender})},
+        },
+        {
+            "indexes": {"data": [9], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_9: Account(storage={0: 0})},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+        Bytes("693c6139") + Hash(0x7),
+        Bytes("693c6139") + Hash(0x8),
+        Bytes("693c6139") + Hash(0x9),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_10,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        gas_price=4660,
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmTests/test_random.py b/tests/ported_static/vmTests/test_random.py
new file mode 100644
index 00000000000..5a64236ce99
--- /dev/null
+++ b/tests/ported_static/vmTests/test_random.py
@@ -0,0 +1,235 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmTests/randomFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmTests/randomFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="random0",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="random1",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="random2",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="random3",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="random4",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="random5",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_random(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    sender = pre.fund_eoa(amount=0x10000000000000)
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    # Source: hex
+    # 0x434342444244454597
+    addr = pre.deploy_contract(  # noqa: F841
+        code=Op.NUMBER * 2
+        + Op.TIMESTAMP
+        + Op.PREVRANDAO
+        + Op.TIMESTAMP
+        + Op.PREVRANDAO
+        + Op.GASLIMIT * 2
+        + Op.SWAP8,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x66B8DBA513DC25F967EF7E84306616C0071CCCAE),  # noqa: E501
+    )
+    # Source: hex
+    # 0x4045404145454441343987ff3735043055
+    addr_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.BLOCKHASH
+        + Op.BLOCKHASH(block_number=Op.GASLIMIT)
+        + Op.COINBASE
+        + Op.GASLIMIT * 2
+        + Op.CODECOPY(
+            dest_offset=Op.CALLVALUE, offset=Op.COINBASE, size=Op.PREVRANDAO
+        )
+        + Op.SELFDESTRUCT(address=Op.DUP8)
+        + Op.CALLDATACOPY
+        + Op.CALLDATALOAD
+        + Op.SSTORE(key=Op.ADDRESS, value=Op.DIV),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x3412D3EBAC3FCACFB451708AEF7CC8E5BF1E5261),  # noqa: E501
+    )
+    # Source: hex
+    # 0x4040459143404144809759886d608f
+    addr_3 = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex("4040459143404144809759886d608f"),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x15ADFB805BE4F3EE3E5C535ABC860890A3A2A6C9),  # noqa: E501
+    )
+    # Source: hex
+    # 0x7745414245403745f31387900a8d55
+    addr_4 = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex("7745414245403745f31387900a8d55"),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xDFE69E96FB3AAFDE261565670B1FEA29869C6950),  # noqa: E501
+    )
+    # Source: hex
+    # 0x65424555
+    addr_5 = pre.deploy_contract(  # noqa: F841
+        code=bytes.fromhex("65424555"),
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xACD000F275B1A28D0C3B7DEE7F114C4D28FB1636),  # noqa: E501
+    )
+    # Source: hex
+    # 0x4041
+    addr_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.BLOCKHASH + Op.COINBASE,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x2E3B99613A2E74EBB0CD62D7B9EB38BAD240CEC6),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call (gas) (+ 0x1000 $4) 0 0 0 0 0)
+    # }
+    target = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=Op.GAS,
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xA83DB56C7CE68C06129B80C7BE0D0F5E0869D536),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {sender: Account(nonce=1)},
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {sender: Account(nonce=1)},
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {sender: Account(nonce=1)},
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {sender: Account(nonce=1)},
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {sender: Account(nonce=1)},
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {sender: Account(nonce=1)},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=target,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmTests/test_sha3.py b/tests/ported_static/vmTests/test_sha3.py
new file mode 100644
index 00000000000..a3805b31105
--- /dev/null
+++ b/tests/ported_static/vmTests/test_sha3.py
@@ -0,0 +1,599 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmTests/sha3Filler.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmTests/sha3Filler.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="sha3_nodata",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="sha3_five_0s",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="sha3_ten_0s",
+        ),
+        pytest.param(
+            3,
+            0,
+            0,
+            id="sha3_0xFFFFF_0s",
+        ),
+        pytest.param(
+            4,
+            0,
+            0,
+            id="sha3_highmem",
+        ),
+        pytest.param(
+            5,
+            0,
+            0,
+            id="sha3_huge_buffer",
+        ),
+        pytest.param(
+            6,
+            0,
+            0,
+            id="sha3_neg1_neg1",
+        ),
+        pytest.param(
+            7,
+            0,
+            0,
+            id="sha3_neg1_2",
+        ),
+        pytest.param(
+            8,
+            0,
+            0,
+            id="sha3_0x1000000_2",
+        ),
+        pytest.param(
+            9,
+            0,
+            0,
+            id="sha3_960_1",
+        ),
+        pytest.param(
+            10,
+            0,
+            0,
+            id="sha3_992_1",
+        ),
+        pytest.param(
+            11,
+            0,
+            0,
+            id="sha3_1024_1",
+        ),
+        pytest.param(
+            12,
+            0,
+            0,
+            id="sha3_1984_1",
+        ),
+        pytest.param(
+            13,
+            0,
+            0,
+            id="sha3_2016_1",
+        ),
+        pytest.param(
+            14,
+            0,
+            0,
+            id="sha3_2016_32",
+        ),
+        pytest.param(
+            15,
+            0,
+            0,
+            id="sha3_2048_1",
+        ),
+        pytest.param(
+            16,
+            0,
+            0,
+            id="sha3_1024_0",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_sha3(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0x0000000000000000000000000000000000001003)
+    contract_4 = Address(0x0000000000000000000000000000000000001004)
+    contract_5 = Address(0x0000000000000000000000000000000000001005)
+    contract_6 = Address(0x0000000000000000000000000000000000001006)
+    contract_7 = Address(0x0000000000000000000000000000000000001007)
+    contract_8 = Address(0x0000000000000000000000000000000000001008)
+    contract_9 = Address(0x0000000000000000000000000000000000001009)
+    contract_10 = Address(0x000000000000000000000000000000000000100A)
+    contract_11 = Address(0x000000000000000000000000000000000000100B)
+    contract_12 = Address(0x000000000000000000000000000000000000100C)
+    contract_13 = Address(0x000000000000000000000000000000000000100D)
+    contract_14 = Address(0x000000000000000000000000000000000000100E)
+    contract_15 = Address(0x000000000000000000000000000000000000100F)
+    contract_16 = Address(0x0000000000000000000000000000000000001010)
+    contract_17 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0x100000000000)
+    # Source: lll
+    # {
+    #     [[0]] (sha3 0 0)
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x0, size=0x0)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (sha3 4 5)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x4, size=0x5)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (sha3 10 10)
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0xA, size=0xA)) + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (sha3 1000 0xFFFFF)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x3E8, size=0xFFFFF))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001003),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; The result here is zero, because we run out of gas
+    #     [[0]] (sha3 0xfffffffff  100)
+    # }
+    contract_4 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0xFFFFFFFFF, size=0x64))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001004),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     ; The result here is zero, because we run out of gas
+    #     [[0]] (sha3 10000 0xfffffffff)
+    # }
+    contract_5 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x2710, size=0xFFFFFFFFF))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001005),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (def 'neg1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #     [[0]] (sha3 neg1 neg1)
+    # }
+    contract_6 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SHA3(
+                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                size=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001006),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (def 'neg1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)  # noqa: E501
+    #     [[0]] (sha3 neg1 2)
+    # }
+    contract_7 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(
+            key=0x0,
+            value=Op.SHA3(
+                offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,  # noqa: E501
+                size=0x2,
+            ),
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001007),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     [[0]] (sha3 0x1000000 2)
+    # }
+    contract_8 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x1000000, size=0x2))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001008),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   [[ 0 ]] (sha3 960 1)
+    # }
+    contract_9 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x3C0, size=0x1))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001009),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   [[ 0 ]] (sha3 992 1)
+    # }
+    contract_10 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x3E0, size=0x1))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100A),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   [[ 0 ]] (sha3 1024 1)
+    # }
+    contract_11 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x400, size=0x1))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100B),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   [[ 0 ]] (sha3 1984 1)
+    # }
+    contract_12 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x7C0, size=0x1))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100C),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   [[ 0 ]] (sha3 2016 1)
+    # }
+    contract_13 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x7E0, size=0x1))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100D),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   [[ 0 ]] (sha3 2048 1)
+    # }
+    contract_14 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x800, size=0x1))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100E),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   [[ 0 ]] (sha3 1024 0)
+    # }
+    contract_15 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x400, size=0x0))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x000000000000000000000000000000000000100F),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #   [[ 0 ]] (sha3 2016 32)
+    # }
+    contract_16 = pre.deploy_contract(  # noqa: F841
+        code=Op.SSTORE(key=0x0, value=Op.SHA3(offset=0x7E0, size=0x20))
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001010),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #     (call (- 0 1) (+ 0x1000 $4) 0
+    #        0x0F 0x10   ; arg offset and length to get the 0x1234...f0 value
+    #        0x20 0x40)  ; return offset and length
+    # }
+    contract_17 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=Op.SUB(0x0, 0x1),
+            address=Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4)),
+            value=0x0,
+            args_offset=0xF,
+            args_size=0x10,
+            ret_offset=0x20,
+            ret_size=0x40,
+        )
+        + Op.STOP,
+        balance=0xBA1A9CE0BA1A9CE,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_0: Account(
+                    storage={
+                        0: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_1: Account(
+                    storage={
+                        0: 0xC41589E7559804EA4A2080DAD19D876A024CCB05117835447D72CE08C1D020EC,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_2: Account(
+                    storage={
+                        0: 0x6BD2DD6BD408CBEE33429358BF24FDC64612FBF8B1B4DB604518F40FFD34B607,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [3], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_3: Account(
+                    storage={
+                        0: 0xBE6F1B42B34644F918560A07F959D23E532DEA5338E4B9F63DB0CAEB608018FA,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [4], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_4: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [5], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_5: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [6], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_6: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [7], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_7: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [8], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_8: Account(storage={0: 0})},
+        },
+        {
+            "indexes": {"data": [9], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_9: Account(
+                    storage={
+                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [10], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_10: Account(
+                    storage={
+                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [11], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_11: Account(
+                    storage={
+                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [12], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_12: Account(
+                    storage={
+                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [13], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_13: Account(
+                    storage={
+                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [15], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_14: Account(
+                    storage={
+                        0: 0xBC36789E7A1E281436464229828F817D6612F7B477D66591FF96A9E064BCC98A,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [16], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_15: Account(
+                    storage={
+                        0: 0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470,  # noqa: E501
+                    },
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [14], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                contract_16: Account(
+                    storage={
+                        0: 0x290DECD9548B62A8D60345A988386FC84BA6BC95484008F6362F93160EF3E563,  # noqa: E501
+                    },
+                ),
+            },
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(0x0),
+        Bytes("693c6139") + Hash(0x1),
+        Bytes("693c6139") + Hash(0x2),
+        Bytes("693c6139") + Hash(0x3),
+        Bytes("693c6139") + Hash(0x4),
+        Bytes("693c6139") + Hash(0x5),
+        Bytes("693c6139") + Hash(0x6),
+        Bytes("693c6139") + Hash(0x7),
+        Bytes("693c6139") + Hash(0x8),
+        Bytes("693c6139") + Hash(0x9),
+        Bytes("693c6139") + Hash(0xA),
+        Bytes("693c6139") + Hash(0xB),
+        Bytes("693c6139") + Hash(0xC),
+        Bytes("693c6139") + Hash(0xD),
+        Bytes("693c6139") + Hash(0x10),
+        Bytes("693c6139") + Hash(0xE),
+        Bytes("693c6139") + Hash(0xF),
+    ]
+    tx_gas = [16777216]
+    tx_value = [1]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_17,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        value=tx_value[v],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/ported_static/vmTests/test_suicide.py b/tests/ported_static/vmTests/test_suicide.py
new file mode 100644
index 00000000000..02c1db148af
--- /dev/null
+++ b/tests/ported_static/vmTests/test_suicide.py
@@ -0,0 +1,178 @@
+"""
+Ori Pomerantz qbzzt1@gmail.com.
+
+Ported from:
+state_tests/VMTests/vmTests/suicideFiller.yml
+"""
+
+import pytest
+from execution_testing import (
+    EOA,
+    Account,
+    Address,
+    Alloc,
+    Bytes,
+    Environment,
+    Hash,
+    StateTestFiller,
+    Transaction,
+)
+from execution_testing.forks import Fork
+from execution_testing.specs.static_state.expect_section import (
+    resolve_expect_post,
+)
+from execution_testing.vm import Op
+
+REFERENCE_SPEC_GIT_PATH = "N/A"
+REFERENCE_SPEC_VERSION = "N/A"
+
+
+@pytest.mark.ported_from(
+    ["state_tests/VMTests/vmTests/suicideFiller.yml"],
+)
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "d, g, v",
+    [
+        pytest.param(
+            0,
+            0,
+            0,
+            id="caller",
+        ),
+        pytest.param(
+            1,
+            0,
+            0,
+            id="random",
+        ),
+        pytest.param(
+            2,
+            0,
+            0,
+            id="myself",
+        ),
+    ],
+)
+@pytest.mark.pre_alloc_mutable
+def test_suicide(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    d: int,
+    g: int,
+    v: int,
+) -> None:
+    """Ori Pomerantz qbzzt1@gmail."""
+    coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
+    contract_0 = Address(0x0000000000000000000000000000000000001000)
+    contract_1 = Address(0x0000000000000000000000000000000000001001)
+    contract_2 = Address(0x0000000000000000000000000000000000001002)
+    contract_3 = Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
+
+    env = Environment(
+        fee_recipient=coinbase,
+        number=1,
+        timestamp=1000,
+        prev_randao=0x20000,
+        base_fee_per_gas=10,
+        gas_limit=100000000,
+    )
+
+    pre[sender] = Account(balance=0x5AF3107A4000)
+    # Source: lll
+    # {
+    #    (selfdestruct (caller))
+    # }
+    contract_0 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=Op.CALLER) + Op.STOP,
+        balance=0xFF000000000000,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001000),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    (selfdestruct 0xdead)
+    # }
+    contract_1 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=0xDEAD) + Op.STOP,
+        balance=0x100000000000,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001001),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    (selfdestruct (address))
+    # }
+    contract_2 = pre.deploy_contract(  # noqa: F841
+        code=Op.SELFDESTRUCT(address=Op.ADDRESS) + Op.STOP,
+        balance=0x100000000000,
+        nonce=0,
+        address=Address(0x0000000000000000000000000000000000001002),  # noqa: E501
+    )
+    # Source: lll
+    # {
+    #    (call (gas) $4 0 0 0 0 0)
+    # }
+    contract_3 = pre.deploy_contract(  # noqa: F841
+        code=Op.CALL(
+            gas=Op.GAS,
+            address=Op.CALLDATALOAD(offset=0x4),
+            value=0x0,
+            args_offset=0x0,
+            args_size=0x0,
+            ret_offset=0x0,
+            ret_size=0x0,
+        )
+        + Op.STOP,
+        balance=0x100000000000,
+        nonce=0,
+        address=Address(0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC),  # noqa: E501
+    )
+
+    expect_entries_: list[dict] = [
+        {
+            "indexes": {"data": [0], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                sender: Account(balance=0x5AF31075D9DE),
+                contract_3: Account(balance=0xFF100000000000),
+            },
+        },
+        {
+            "indexes": {"data": [1], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {
+                Address(0x000000000000000000000000000000000000DEAD): Account(
+                    balance=0x100000000000
+                ),
+            },
+        },
+        {
+            "indexes": {"data": [2], "gas": -1, "value": -1},
+            "network": [">=Cancun"],
+            "result": {contract_3: Account(balance=0x100000000000)},
+        },
+    ]
+
+    post, _exc = resolve_expect_post(expect_entries_, d, g, v, fork)
+
+    tx_data = [
+        Bytes("693c6139") + Hash(contract_0, left_padding=True),
+        Bytes("693c6139") + Hash(contract_1, left_padding=True),
+        Bytes("693c6139") + Hash(contract_2, left_padding=True),
+    ]
+    tx_gas = [16777216]
+
+    tx = Transaction(
+        sender=sender,
+        to=contract_3,
+        data=tx_data[d],
+        gas_limit=tx_gas[g],
+        error=_exc,
+    )
+
+    state_test(env=env, pre=pre, post=post, tx=tx)
diff --git a/tests/prague/eip2537_bls_12_381_precompiles/spec.py b/tests/prague/eip2537_bls_12_381_precompiles/spec.py
index 053b4ad743e..a8bb7a3431c 100644
--- a/tests/prague/eip2537_bls_12_381_precompiles/spec.py
+++ b/tests/prague/eip2537_bls_12_381_precompiles/spec.py
@@ -299,8 +299,8 @@ def _pairing_gas_from_costs(
     def calc(input_length: int) -> int:
         k = input_length // Spec.LEN_PER_PAIR
         return (
-            gas_costs.GAS_PRECOMPILE_BLS_PAIRING_PER_PAIR * k
-            + gas_costs.GAS_PRECOMPILE_BLS_PAIRING_BASE
+            gas_costs.PRECOMPILE_BLS_PAIRING_PER_PAIR * k
+            + gas_costs.PRECOMPILE_BLS_PAIRING_BASE
         )
 
     return calc
@@ -311,19 +311,19 @@ def build_gas_calculation_function_map(
 ) -> Dict[int, Callable[[int], int]]:
     """Build a gas calculation function map from fork gas costs."""
     return {
-        Spec.G1ADD: lambda _: gas_costs.GAS_PRECOMPILE_BLS_G1ADD,
+        Spec.G1ADD: lambda _: gas_costs.PRECOMPILE_BLS_G1ADD,
         Spec.G1MSM: msm_gas_func_gen(
             BLS12Group.G1,
             len(PointG1() + Scalar()),
-            gas_costs.GAS_PRECOMPILE_BLS_G1MUL,
+            gas_costs.PRECOMPILE_BLS_G1MUL,
         ),
-        Spec.G2ADD: lambda _: gas_costs.GAS_PRECOMPILE_BLS_G2ADD,
+        Spec.G2ADD: lambda _: gas_costs.PRECOMPILE_BLS_G2ADD,
         Spec.G2MSM: msm_gas_func_gen(
             BLS12Group.G2,
             len(PointG2() + Scalar()),
-            gas_costs.GAS_PRECOMPILE_BLS_G2MUL,
+            gas_costs.PRECOMPILE_BLS_G2MUL,
         ),
         Spec.PAIRING: _pairing_gas_from_costs(gas_costs),
-        Spec.MAP_FP_TO_G1: lambda _: gas_costs.GAS_PRECOMPILE_BLS_G1MAP,
-        Spec.MAP_FP2_TO_G2: lambda _: gas_costs.GAS_PRECOMPILE_BLS_G2MAP,
+        Spec.MAP_FP_TO_G1: lambda _: gas_costs.PRECOMPILE_BLS_G1MAP,
+        Spec.MAP_FP2_TO_G2: lambda _: gas_costs.PRECOMPILE_BLS_G2MAP,
     }
diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1add.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1add.py
index 314dc878e8d..462b1e1aaf6 100644
--- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1add.py
+++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1add.py
@@ -470,7 +470,7 @@ def test_gas(
         ),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_call_types(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1msm.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1msm.py
index 1c2bbcab659..d87f5d99b44 100644
--- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1msm.py
+++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1msm.py
@@ -243,7 +243,7 @@ def test_valid(
     "precompile_gas_modifier", [100_000], ids=[""]
 )  # Add gas so that won't be the cause of failure
 @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""])
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_invalid(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1mul.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1mul.py
index 9dd0683e59a..a686febb006 100644
--- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1mul.py
+++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1mul.py
@@ -425,7 +425,7 @@ def test_gas(
         ),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_call_types(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2add.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2add.py
index 91b4bd5b2c7..a51d780f45e 100644
--- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2add.py
+++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2add.py
@@ -218,7 +218,7 @@
         ),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_valid(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2msm.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2msm.py
index ebf26d6beba..f186758e788 100644
--- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2msm.py
+++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2msm.py
@@ -254,7 +254,7 @@ def test_valid(
     "precompile_gas_modifier", [100_000], ids=[""]
 )  # Add gas so that won't be the cause of failure
 @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""])
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_invalid(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -293,7 +293,7 @@ def test_invalid(
         ),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_call_types(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp2_to_g2.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp2_to_g2.py
index 105b02d8f81..a08abdb408e 100644
--- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp2_to_g2.py
+++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp2_to_g2.py
@@ -79,7 +79,7 @@
         ),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_valid(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp_to_g1.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp_to_g1.py
index 5b57a9fd6ab..7487718d0f1 100644
--- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp_to_g1.py
+++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp_to_g1.py
@@ -64,7 +64,7 @@
         ),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_valid(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -139,7 +139,7 @@ def test_isogeny_kernel_values(
     ],
 )
 @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""])
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_invalid(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_pairing.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_pairing.py
index 9e5bb708b92..6235edcf538 100644
--- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_pairing.py
+++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_pairing.py
@@ -127,7 +127,7 @@
         ),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_valid(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -212,7 +212,7 @@ def test_valid_multi_inf(
     BLS12_PAIRING precompile.
     """
     gas_costs = fork.gas_costs()
-    extra_gas = 70_000 + gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD
+    extra_gas = 70_000 + gas_costs.STORAGE_SET + gas_costs.COLD_STORAGE_ACCESS
 
     max_gas_limit = fork.transaction_gas_limit_cap() or Environment().gas_limit
 
@@ -395,7 +395,7 @@ def test_valid_multi_inf(
     ],
 )
 @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""])
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_invalid(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -427,7 +427,7 @@ def test_invalid_multi_inf(
     BLS12_PAIRING precompile and an invalid tail.
     """
     gas_costs = fork.gas_costs()
-    extra_gas = 70_000 + gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD
+    extra_gas = 70_000 + gas_costs.STORAGE_SET + gas_costs.COLD_STORAGE_ACCESS
 
     max_gas_limit = fork.transaction_gas_limit_cap() or Environment().gas_limit
 
diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_precompiles_before_fork.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_precompiles_before_fork.py
index e3d1ec62da6..ac69e5a7299 100644
--- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_precompiles_before_fork.py
+++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_precompiles_before_fork.py
@@ -12,9 +12,17 @@
     Environment,
     StateTestFiller,
     Transaction,
+    TransitionFork,
 )
 
-from .spec import FP, FP2, Scalar, Spec, ref_spec_2537
+from .spec import (
+    FP,
+    FP2,
+    Scalar,
+    Spec,
+    build_gas_calculation_function_map,
+    ref_spec_2537,
+)
 
 REFERENCE_SPEC_GIT_PATH = ref_spec_2537.git_path
 REFERENCE_SPEC_VERSION = ref_spec_2537.version
@@ -22,6 +30,47 @@
 pytestmark = pytest.mark.valid_at_transition_to("Prague")
 
 
+@pytest.fixture
+def precompile_gas(
+    precompile_address: int,
+    input_data: bytes,
+    vector_gas_value: int | None,
+    fork: TransitionFork,
+) -> int:
+    """Gas cost for the precompile."""
+    gas_map = build_gas_calculation_function_map(
+        fork.transitions_to().gas_costs()
+    )
+    calculated_gas = gas_map[precompile_address](len(input_data))
+    if vector_gas_value is not None:
+        assert calculated_gas == vector_gas_value, (
+            f"Calculated gas {calculated_gas} != Vector gas {vector_gas_value}"
+        )
+    return calculated_gas
+
+
+@pytest.fixture
+def tx_gas_limit(
+    fork: TransitionFork, input_data: bytes, precompile_gas: int
+) -> int:
+    """
+    Transaction gas limit used for the test (Can be overridden in the test).
+    """
+    intrinsic_gas_cost_calculator = (
+        fork.transitions_from().transaction_intrinsic_cost_calculator()
+    )
+    memory_expansion_gas_calculator = (
+        fork.transitions_from().memory_expansion_gas_calculator()
+    )
+    extra_gas = 100_000
+    return (
+        extra_gas
+        + intrinsic_gas_cost_calculator(calldata=input_data)
+        + memory_expansion_gas_calculator(new_bytes=len(input_data))
+        + precompile_gas
+    )
+
+
 @pytest.mark.parametrize(
     "precompile_address,input_data",
     [
diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_variable_length_input_contracts.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_variable_length_input_contracts.py
index b4960d7e1b5..87b4234e053 100644
--- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_variable_length_input_contracts.py
+++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_variable_length_input_contracts.py
@@ -174,7 +174,7 @@ def tx_gas_limit_calculator(
     memory_expansion_gas_calculator = fork.memory_expansion_gas_calculator()
     gas_costs = fork.gas_costs()
     extra_gas = (
-        10_000 + gas_costs.GAS_STORAGE_SET + gas_costs.GAS_COLD_SLOAD
+        10_000 + gas_costs.STORAGE_SET + gas_costs.COLD_STORAGE_ACCESS
     ) * len(precompile_gas_list)
     return (
         extra_gas
@@ -358,7 +358,7 @@ def test_invalid_zero_gas_g1msm(
 )
 @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""])
 @pytest.mark.parametrize("precompile_address", [Spec.G1MSM])
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_invalid_gas_g1msm(
     state_test: StateTestFiller,
     env: Environment,
@@ -517,7 +517,7 @@ def test_invalid_zero_gas_g2msm(
 )
 @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""])
 @pytest.mark.parametrize("precompile_address", [Spec.G2MSM])
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_invalid_gas_g2msm(
     state_test: StateTestFiller,
     env: Environment,
diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_eip_mainnet.py b/tests/prague/eip2537_bls_12_381_precompiles/test_eip_mainnet.py
index b492c6d0fbc..44ec557ca1f 100644
--- a/tests/prague/eip2537_bls_12_381_precompiles/test_eip_mainnet.py
+++ b/tests/prague/eip2537_bls_12_381_precompiles/test_eip_mainnet.py
@@ -75,7 +75,7 @@
         ),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_eip_2537(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/prague/eip2935_historical_block_hashes_from_state/test_block_hashes.py b/tests/prague/eip2935_historical_block_hashes_from_state/test_block_hashes.py
index 8fbd89046fd..e82689e0b46 100644
--- a/tests/prague/eip2935_historical_block_hashes_from_state/test_block_hashes.py
+++ b/tests/prague/eip2935_historical_block_hashes_from_state/test_block_hashes.py
@@ -243,7 +243,7 @@ def test_block_hashes_history_at_transition(
     ],
 )
 @pytest.mark.valid_from("Prague")
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_block_hashes_history(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
diff --git a/tests/prague/eip2935_historical_block_hashes_from_state/test_contract_deployment.py b/tests/prague/eip2935_historical_block_hashes_from_state/test_contract_deployment.py
index 980980acb4e..e09070116d1 100644
--- a/tests/prague/eip2935_historical_block_hashes_from_state/test_contract_deployment.py
+++ b/tests/prague/eip2935_historical_block_hashes_from_state/test_contract_deployment.py
@@ -16,7 +16,7 @@
     Transaction,
     generate_system_contract_deploy_test,
 )
-from execution_testing.forks import Fork, Prague
+from execution_testing.forks import Prague, TransitionFork
 
 from .spec import Spec, ref_spec_2935
 
@@ -32,7 +32,7 @@
 )
 def test_system_contract_deployment(
     *,
-    fork: Fork,
+    fork: TransitionFork,
     pre: Alloc,
     post: Alloc,
     test_type: DeploymentTestType,
diff --git a/tests/prague/eip6110_deposits/conftest.py b/tests/prague/eip6110_deposits/conftest.py
index 5d1ce9f296e..6e50c4f2e36 100644
--- a/tests/prague/eip6110_deposits/conftest.py
+++ b/tests/prague/eip6110_deposits/conftest.py
@@ -17,23 +17,24 @@
 
 
 @pytest.fixture
-def update_pre(pre: Alloc, requests: List[DepositInteractionBase]) -> None:
+def prepared_requests(
+    pre: Alloc, requests: List[DepositInteractionBase]
+) -> List[DepositInteractionBase]:
     """
-    Init state of the accounts. Every deposit transaction defines their own
-    pre-state requirements, and this fixture aggregates them all.
+    Allocate accounts/contracts for each request in `pre` and return copies
+    with the allocated state populated. The parametrize value `requests` is
+    not mutated, so it stays pristine across fixture format runs.
     """
-    for d in requests:
-        d.update_pre(pre)
+    return [r.update_pre(pre) for r in requests]
 
 
 @pytest.fixture
 def txs(
-    requests: List[DepositInteractionBase],
-    update_pre: None,  # Fixture is used for its side effects
+    prepared_requests: List[DepositInteractionBase],
 ) -> List[Transaction]:
     """List of transactions to include in the block."""
     txs = []
-    for r in requests:
+    for r in prepared_requests:
         txs += r.transactions()
     return txs
 
@@ -55,14 +56,14 @@ def exception() -> BlockException | None:
 
 @pytest.fixture
 def included_requests(
-    requests: List[DepositInteractionBase],
+    prepared_requests: List[DepositInteractionBase],
 ) -> List[DepositRequest]:
     """
     Return the list of deposit requests that should be included in each block.
     """
     valid_requests: List[DepositRequest] = []
 
-    for d in requests:
+    for d in prepared_requests:
         valid_requests += d.valid_requests(10**18)
 
     return valid_requests
diff --git a/tests/prague/eip6110_deposits/helpers.py b/tests/prague/eip6110_deposits/helpers.py
index d898b031c93..e20b7b64966 100644
--- a/tests/prague/eip6110_deposits/helpers.py
+++ b/tests/prague/eip6110_deposits/helpers.py
@@ -1,9 +1,9 @@
 """Helpers for the EIP-6110 deposit tests."""
 
-from dataclasses import dataclass, field
+from dataclasses import dataclass, field, replace
 from functools import cached_property
 from hashlib import sha256 as sha256_hashlib
-from typing import Callable, ClassVar, List
+from typing import Callable, ClassVar, List, Self
 
 from execution_testing import (
     EOA,
@@ -214,7 +214,7 @@ def with_source_address(self, source_address: Address) -> "DepositRequest":
         return self.copy()
 
 
-@dataclass(kw_only=True)
+@dataclass(kw_only=True, frozen=True)
 class DepositInteractionBase:
     """Base class for all types of deposit transactions we want to test."""
 
@@ -229,8 +229,12 @@ def transactions(self) -> List[Transaction]:
         """Return a transaction for the deposit request."""
         raise NotImplementedError
 
-    def update_pre(self, pre: Alloc) -> None:
-        """Return the pre-state of the account."""
+    def update_pre(self, pre: Alloc) -> Self:
+        """
+        Allocate accounts/contracts in `pre` and return a new instance with
+        the allocated state populated. Does not mutate `self`, so the
+        parametrize value remains pristine across fixture format runs.
+        """
         raise NotImplementedError
 
     def valid_requests(self, current_minimum_fee: int) -> List[DepositRequest]:
@@ -241,7 +245,7 @@ def valid_requests(self, current_minimum_fee: int) -> List[DepositRequest]:
         raise NotImplementedError
 
 
-@dataclass(kw_only=True)
+@dataclass(kw_only=True, frozen=True)
 class DepositTransaction(DepositInteractionBase):
     """
     Class used to describe a deposit originated from an externally owned
@@ -265,9 +269,9 @@ def transactions(self) -> List[Transaction]:
             for request in self.requests
         ]
 
-    def update_pre(self, pre: Alloc) -> None:
-        """Return the pre-state of the account."""
-        self.sender_account = pre.fund_eoa(self.sender_balance)
+    def update_pre(self, pre: Alloc) -> Self:
+        """Return a copy of self with `sender_account` populated."""
+        return replace(self, sender_account=pre.fund_eoa(self.sender_balance))
 
     def valid_requests(self, current_minimum_fee: int) -> List[DepositRequest]:
         """
@@ -281,7 +285,7 @@ def valid_requests(self, current_minimum_fee: int) -> List[DepositRequest]:
         ]
 
 
-@dataclass(kw_only=True)
+@dataclass(kw_only=True, frozen=True)
 class DepositContract(DepositInteractionBase):
     """Class used to describe a deposit originated from a contract."""
 
@@ -347,26 +351,29 @@ def transactions(self) -> List[Transaction]:
             )
         ]
 
-    def update_pre(self, pre: Alloc) -> None:
-        """Return the pre-state of the account."""
+    def update_pre(self, pre: Alloc) -> Self:
+        """
+        Return a copy of self with the allocated sender/contract/entry
+        addresses populated.
+        """
         required_balance = self.sender_balance
         if self.tx_value > 0:
             required_balance = max(
                 required_balance, self.tx_value + self.tx_gas_limit * 7
             )
-        self.sender_account = pre.fund_eoa(required_balance)
-        self.contract_address = pre.deploy_contract(
+        sender_account = pre.fund_eoa(required_balance)
+        contract_address = pre.deploy_contract(
             code=self.contract_code, balance=self.contract_balance
         )
-        self.entry_address = self.contract_address
+        entry_address = contract_address
         if self.call_depth > 2:
             for _ in range(1, self.call_depth - 1):
-                self.entry_address = pre.deploy_contract(
+                entry_address = pre.deploy_contract(
                     code=Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
                     + Op.POP(
                         Op.CALL(
                             Op.GAS,
-                            self.entry_address,
+                            entry_address,
                             0,
                             0,
                             Op.CALLDATASIZE,
@@ -375,6 +382,12 @@ def update_pre(self, pre: Alloc) -> None:
                         )
                     ),
                 )
+        return replace(
+            self,
+            sender_account=sender_account,
+            contract_address=contract_address,
+            entry_address=entry_address,
+        )
 
     def valid_requests(self, current_minimum_fee: int) -> List[DepositRequest]:
         """
diff --git a/tests/prague/eip6110_deposits/test_modified_contract.py b/tests/prague/eip6110_deposits/test_modified_contract.py
index 6ad3b63757f..9d577706dd5 100644
--- a/tests/prague/eip6110_deposits/test_modified_contract.py
+++ b/tests/prague/eip6110_deposits/test_modified_contract.py
@@ -183,7 +183,7 @@ def test_extra_logs(
     ],
 )
 @pytest.mark.exception_test
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_invalid_layout(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
@@ -234,7 +234,7 @@ def test_invalid_layout(
 
 @pytest.mark.parametrize("slice_bytes", [True, False])
 @pytest.mark.exception_test
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_invalid_log_length(
     blockchain_test: BlockchainTestFiller, pre: Alloc, slice_bytes: bool
 ) -> None:
diff --git a/tests/prague/eip7002_el_triggerable_withdrawals/conftest.py b/tests/prague/eip7002_el_triggerable_withdrawals/conftest.py
index eab637e4cb9..de1eebb28f4 100644
--- a/tests/prague/eip7002_el_triggerable_withdrawals/conftest.py
+++ b/tests/prague/eip7002_el_triggerable_withdrawals/conftest.py
@@ -4,30 +4,41 @@
 from typing import List
 
 import pytest
-from execution_testing import Alloc, Block, Fork, Header, Requests
+from execution_testing import (
+    Alloc,
+    Block,
+    Fork,
+    Header,
+    Requests,
+    TransitionFork,
+)
 
 from .helpers import WithdrawalRequest, WithdrawalRequestInteractionBase
 from .spec import Spec
 
 
 @pytest.fixture
-def update_pre(
+def prepared_blocks_withdrawal_requests(
     pre: Alloc,
     blocks_withdrawal_requests: List[List[WithdrawalRequestInteractionBase]],
-) -> None:
+) -> List[List[WithdrawalRequestInteractionBase]]:
     """
-    Init state of the accounts. Every deposit transaction defines their own
-    pre-state requirements, and this fixture aggregates them all.
+    Allocate accounts/contracts for each interaction in `pre` and return
+    copies with the allocated state populated. The parametrize value
+    `blocks_withdrawal_requests` is not mutated, so it stays pristine across
+    fixture format runs.
     """
-    for requests in blocks_withdrawal_requests:
-        for r in requests:
-            r.update_pre(pre)
+    return [
+        [r.update_pre(pre) for r in block_requests]
+        for block_requests in blocks_withdrawal_requests
+    ]
 
 
 @pytest.fixture
 def included_requests(
-    update_pre: None,  # Fixture is used for its side effects
-    blocks_withdrawal_requests: List[List[WithdrawalRequestInteractionBase]],
+    prepared_blocks_withdrawal_requests: List[
+        List[WithdrawalRequestInteractionBase]
+    ],
 ) -> List[List[WithdrawalRequest]]:
     """
     Return the list of withdrawal requests that should be included in each
@@ -36,7 +47,7 @@ def included_requests(
     excess_withdrawal_requests = 0
     carry_over_requests: List[WithdrawalRequest] = []
     per_block_included_requests: List[List[WithdrawalRequest]] = []
-    for block_withdrawal_requests in blocks_withdrawal_requests:
+    for block_withdrawal_requests in prepared_blocks_withdrawal_requests:
         # Get fee for the current block
         current_minimum_fee = Spec.get_fee(excess_withdrawal_requests)
 
@@ -79,9 +90,10 @@ def timestamp() -> int:
 
 @pytest.fixture
 def blocks(
-    fork: Fork,
-    update_pre: None,  # Fixture is used for its side effects
-    blocks_withdrawal_requests: List[List[WithdrawalRequestInteractionBase]],
+    fork: Fork | TransitionFork,
+    prepared_blocks_withdrawal_requests: List[
+        List[WithdrawalRequestInteractionBase]
+    ],
     included_requests: List[List[WithdrawalRequest]],
     timestamp: int,
 ) -> List[Block]:
@@ -89,15 +101,15 @@ def blocks(
     blocks: List[Block] = []
 
     for block_requests, block_included_requests in zip_longest(  # type: ignore
-        blocks_withdrawal_requests,
+        prepared_blocks_withdrawal_requests,
         included_requests,
         fillvalue=[],
     ):
         header_verify: Header | None = None
-        if fork.header_requests_required(
+        if fork.fork_at(
             block_number=len(blocks) + 1,
             timestamp=timestamp,
-        ):
+        ).header_requests_required():
             header_verify = Header(
                 requests_hash=Requests(
                     *block_included_requests,
diff --git a/tests/prague/eip7002_el_triggerable_withdrawals/helpers.py b/tests/prague/eip7002_el_triggerable_withdrawals/helpers.py
index feed63299f1..2c2e37b137e 100644
--- a/tests/prague/eip7002_el_triggerable_withdrawals/helpers.py
+++ b/tests/prague/eip7002_el_triggerable_withdrawals/helpers.py
@@ -1,9 +1,9 @@
 """Helpers for the EIP-7002 withdrawal tests."""
 
-from dataclasses import dataclass, field
+from dataclasses import dataclass, field, replace
 from functools import cached_property
 from itertools import count
-from typing import Callable, ClassVar, List
+from typing import Callable, ClassVar, List, Self
 
 from execution_testing import (
     EOA,
@@ -69,7 +69,7 @@ def with_source_address(
         return self.copy(source_address=source_address)
 
 
-@dataclass(kw_only=True)
+@dataclass(kw_only=True, frozen=True)
 class WithdrawalRequestInteractionBase:
     """Base class for all types of withdrawal transactions we want to test."""
 
@@ -84,8 +84,12 @@ def transactions(self) -> List[Transaction]:
         """Return a transaction for the withdrawal request."""
         raise NotImplementedError
 
-    def update_pre(self, pre: Alloc) -> None:
-        """Return the pre-state of the account."""
+    def update_pre(self, pre: Alloc) -> Self:
+        """
+        Allocate accounts/contracts in `pre` and return a new instance with
+        the allocated state populated. Does not mutate `self`, so the
+        parametrize value remains pristine across fixture format runs.
+        """
         raise NotImplementedError
 
     def valid_requests(
@@ -98,7 +102,7 @@ def valid_requests(
         raise NotImplementedError
 
 
-@dataclass(kw_only=True)
+@dataclass(kw_only=True, frozen=True)
 class WithdrawalRequestTransaction(WithdrawalRequestInteractionBase):
     """
     Class used to describe a withdrawal request originated from an externally
@@ -122,9 +126,9 @@ def transactions(self) -> List[Transaction]:
             for request in self.requests
         ]
 
-    def update_pre(self, pre: Alloc) -> None:
-        """Return the pre-state of the account."""
-        self.sender_account = pre.fund_eoa(self.sender_balance)
+    def update_pre(self, pre: Alloc) -> Self:
+        """Return a copy of self with `sender_account` populated."""
+        return replace(self, sender_account=pre.fund_eoa(self.sender_balance))
 
     def valid_requests(
         self, current_minimum_fee: int
@@ -140,7 +144,7 @@ def valid_requests(
         ]
 
 
-@dataclass(kw_only=True)
+@dataclass(kw_only=True, frozen=True)
 class WithdrawalRequestContract(WithdrawalRequestInteractionBase):
     """Class used to describe a withdrawal originated from a contract."""
 
@@ -204,21 +208,24 @@ def transactions(self) -> List[Transaction]:
             )
         ]
 
-    def update_pre(self, pre: Alloc) -> None:
-        """Return the pre-state of the account."""
-        self.sender_account = pre.fund_eoa(self.sender_balance)
-        self.contract_address = pre.deploy_contract(
+    def update_pre(self, pre: Alloc) -> Self:
+        """
+        Return a copy of self with the allocated sender/contract/entry
+        addresses populated.
+        """
+        sender_account = pre.fund_eoa(self.sender_balance)
+        contract_address = pre.deploy_contract(
             code=self.contract_code, balance=self.contract_balance
         )
-        self.entry_address = self.contract_address
+        entry_address = contract_address
         if self.call_depth > 2:
             for _ in range(1, self.call_depth - 1):
-                self.entry_address = pre.deploy_contract(
+                entry_address = pre.deploy_contract(
                     code=Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
                     + Op.POP(
                         Op.CALL(
                             Op.GAS,
-                            self.entry_address,
+                            entry_address,
                             0,
                             0,
                             Op.CALLDATASIZE,
@@ -227,6 +234,12 @@ def update_pre(self, pre: Alloc) -> None:
                         )
                     )
                 )
+        return replace(
+            self,
+            sender_account=sender_account,
+            contract_address=contract_address,
+            entry_address=entry_address,
+        )
 
     def valid_requests(
         self, current_minimum_fee: int
diff --git a/tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py b/tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py
index fb5095be8a5..03c65ff2ecd 100644
--- a/tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py
+++ b/tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py
@@ -11,9 +11,9 @@
     Address,
     Alloc,
     Block,
-    Fork,
     Requests,
     Transaction,
+    TransitionFork,
     generate_system_contract_deploy_test,
 )
 from execution_testing.forks import Prague
@@ -25,7 +25,7 @@
 REFERENCE_SPEC_VERSION = ref_spec_7002.version
 
 
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 @generate_system_contract_deploy_test(
     fork=Prague,
     tx_json_path=Path(realpath(__file__)).parent / "contract_deploy_tx.json",
@@ -34,7 +34,7 @@
 )
 def test_system_contract_deployment(
     *,
-    fork: Fork,
+    fork: TransitionFork,
     pre: Alloc,
     **kwargs: Any,
 ) -> Generator[Block, None, None]:
@@ -46,7 +46,9 @@ def test_system_contract_deployment(
         fee=Spec.get_fee(0),
         source_address=sender,
     )
-    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+    intrinsic_gas_calculator = (
+        fork.transitions_to().transaction_intrinsic_cost_calculator()
+    )
     test_transaction_gas = intrinsic_gas_calculator(
         calldata=withdrawal_request.calldata
     )
diff --git a/tests/prague/eip7002_el_triggerable_withdrawals/test_modified_withdrawal_contract.py b/tests/prague/eip7002_el_triggerable_withdrawals/test_modified_withdrawal_contract.py
index a97ae5368c1..7a5aeb5cb11 100644
--- a/tests/prague/eip7002_el_triggerable_withdrawals/test_modified_withdrawal_contract.py
+++ b/tests/prague/eip7002_el_triggerable_withdrawals/test_modified_withdrawal_contract.py
@@ -124,9 +124,9 @@ def test_extra_withdrawals(
         requests=requests_list
     )
     # prepare withdrawal senders
-    withdrawal_request_transaction.update_pre(pre=pre)
+    prepared = withdrawal_request_transaction.update_pre(pre=pre)
     # get transaction list
-    txs: List[Transaction] = withdrawal_request_transaction.transactions()
+    txs: List[Transaction] = prepared.transactions()
 
     blockchain_test(
         pre=pre,
@@ -147,7 +147,7 @@ def test_extra_withdrawals(
 @generate_system_contract_error_test(  # type: ignore[arg-type]
     max_gas_limit=Spec_EIP7002.SYSTEM_CALL_GAS_LIMIT,
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_system_contract_errors() -> None:
     """
     Test system contract raising different errors when called by the system
diff --git a/tests/prague/eip7002_el_triggerable_withdrawals/test_withdrawal_requests.py b/tests/prague/eip7002_el_triggerable_withdrawals/test_withdrawal_requests.py
index 6bdeaa5a1f7..54417965417 100644
--- a/tests/prague/eip7002_el_triggerable_withdrawals/test_withdrawal_requests.py
+++ b/tests/prague/eip7002_el_triggerable_withdrawals/test_withdrawal_requests.py
@@ -847,13 +847,12 @@ def test_withdrawal_requests_negative(
     Test blocks where the requests list and the actual withdrawal requests that
     happened in the block's transactions do not match.
     """
-    for d in requests:
-        d.update_pre(pre)
+    prepared = [d.update_pre(pre) for d in requests]
 
     # No previous block so fee is the base
     fee = 1
     current_block_requests = []
-    for w in requests:
+    for w in prepared:
         current_block_requests += w.valid_requests(fee)
     included_requests = current_block_requests[
         : Spec.MAX_WITHDRAWAL_REQUESTS_PER_BLOCK
@@ -865,7 +864,7 @@ def test_withdrawal_requests_negative(
         post={},
         blocks=[
             Block(
-                txs=sum((r.transactions() for r in requests), []),
+                txs=sum((r.transactions() for r in prepared), []),
                 header_verify=Header(
                     requests_hash=Requests(
                         *included_requests,
diff --git a/tests/prague/eip7251_consolidations/conftest.py b/tests/prague/eip7251_consolidations/conftest.py
index e3199d6d008..083047e0377 100644
--- a/tests/prague/eip7251_consolidations/conftest.py
+++ b/tests/prague/eip7251_consolidations/conftest.py
@@ -4,32 +4,41 @@
 from typing import List
 
 import pytest
-from execution_testing import Alloc, Block, Fork, Header, Requests
+from execution_testing import (
+    Alloc,
+    Block,
+    Fork,
+    Header,
+    Requests,
+    TransitionFork,
+)
 
 from .helpers import ConsolidationRequest, ConsolidationRequestInteractionBase
 from .spec import Spec
 
 
 @pytest.fixture
-def update_pre(
+def prepared_blocks_consolidation_requests(
     pre: Alloc,
     blocks_consolidation_requests: List[
         List[ConsolidationRequestInteractionBase]
     ],
-) -> None:
+) -> List[List[ConsolidationRequestInteractionBase]]:
     """
-    Init state of the accounts. Every consolidation request defines its own
-    pre-state requirements, and this fixture aggregates them all.
+    Allocate accounts/contracts for each interaction in `pre` and return
+    copies with the allocated state populated. The parametrize value
+    `blocks_consolidation_requests` is not mutated, so it stays pristine
+    across fixture format runs.
     """
-    for requests in blocks_consolidation_requests:
-        for r in requests:
-            r.update_pre(pre)
+    return [
+        [r.update_pre(pre) for r in block_requests]
+        for block_requests in blocks_consolidation_requests
+    ]
 
 
 @pytest.fixture
 def included_requests(
-    update_pre: None,  # Fixture is used for its side effects
-    blocks_consolidation_requests: List[
+    prepared_blocks_consolidation_requests: List[
         List[ConsolidationRequestInteractionBase]
     ],
 ) -> List[List[ConsolidationRequest]]:
@@ -40,7 +49,7 @@ def included_requests(
     excess_consolidation_requests = 0
     carry_over_requests: List[ConsolidationRequest] = []
     per_block_included_requests: List[List[ConsolidationRequest]] = []
-    for block_consolidation_requests in blocks_consolidation_requests:
+    for block_consolidation_requests in prepared_blocks_consolidation_requests:
         # Get fee for the current block
         current_minimum_fee = Spec.get_fee(excess_consolidation_requests)
 
@@ -85,9 +94,8 @@ def timestamp() -> int:
 
 @pytest.fixture
 def blocks(
-    fork: Fork,
-    update_pre: None,  # Fixture is used for its side effects
-    blocks_consolidation_requests: List[
+    fork: Fork | TransitionFork,
+    prepared_blocks_consolidation_requests: List[
         List[ConsolidationRequestInteractionBase]
     ],
     included_requests: List[List[ConsolidationRequest]],
@@ -97,15 +105,14 @@ def blocks(
     blocks: List[Block] = []
 
     for block_requests, block_included_requests in zip_longest(  # type: ignore
-        blocks_consolidation_requests,
+        prepared_blocks_consolidation_requests,
         included_requests,
         fillvalue=[],
     ):
         header_verify: Header | None = None
-        if fork.header_requests_required(
-            block_number=len(blocks) + 1,
-            timestamp=timestamp,
-        ):
+        if fork.fork_at(
+            block_number=len(blocks) + 1, timestamp=timestamp
+        ).header_requests_required():
             header_verify = Header(
                 requests_hash=Requests(*block_included_requests)
             )
diff --git a/tests/prague/eip7251_consolidations/helpers.py b/tests/prague/eip7251_consolidations/helpers.py
index dc55ee09347..f42d6934e42 100644
--- a/tests/prague/eip7251_consolidations/helpers.py
+++ b/tests/prague/eip7251_consolidations/helpers.py
@@ -1,9 +1,9 @@
 """Helpers for the EIP-7251 consolidation tests."""
 
-from dataclasses import dataclass, field
+from dataclasses import dataclass, field, replace
 from functools import cached_property
 from itertools import count
-from typing import Callable, ClassVar, List
+from typing import Callable, ClassVar, List, Self
 
 from execution_testing import (
     EOA,
@@ -62,7 +62,7 @@ def with_source_address(
         return self.copy(source_address=source_address)
 
 
-@dataclass(kw_only=True)
+@dataclass(kw_only=True, frozen=True)
 class ConsolidationRequestInteractionBase:
     """
     Base class for all types of consolidation transactions we want to test.
@@ -79,8 +79,12 @@ def transactions(self) -> List[Transaction]:
         """Return a transaction for the consolidation request."""
         raise NotImplementedError
 
-    def update_pre(self, pre: Alloc) -> None:
-        """Return the pre-state of the account."""
+    def update_pre(self, pre: Alloc) -> Self:
+        """
+        Allocate accounts/contracts in `pre` and return a new instance with
+        the allocated state populated. Does not mutate `self`, so the
+        parametrize value remains pristine across fixture format runs.
+        """
         raise NotImplementedError
 
     def valid_requests(
@@ -93,7 +97,7 @@ def valid_requests(
         raise NotImplementedError
 
 
-@dataclass(kw_only=True)
+@dataclass(kw_only=True, frozen=True)
 class ConsolidationRequestTransaction(ConsolidationRequestInteractionBase):
     """
     Class to describe a consolidation request originated from an externally
@@ -117,9 +121,9 @@ def transactions(self) -> List[Transaction]:
             for request in self.requests
         ]
 
-    def update_pre(self, pre: Alloc) -> None:
-        """Return the pre-state of the account."""
-        self.sender_account = pre.fund_eoa(self.sender_balance)
+    def update_pre(self, pre: Alloc) -> Self:
+        """Return a copy of self with `sender_account` populated."""
+        return replace(self, sender_account=pre.fund_eoa(self.sender_balance))
 
     def valid_requests(
         self, current_minimum_fee: int
@@ -135,7 +139,7 @@ def valid_requests(
         ]
 
 
-@dataclass(kw_only=True)
+@dataclass(kw_only=True, frozen=True)
 class ConsolidationRequestContract(ConsolidationRequestInteractionBase):
     """Class used to describe a consolidation originated from a contract."""
 
@@ -199,21 +203,24 @@ def transactions(self) -> List[Transaction]:
             )
         ]
 
-    def update_pre(self, pre: Alloc) -> None:
-        """Return the pre-state of the account."""
-        self.sender_account = pre.fund_eoa(self.sender_balance)
-        self.contract_address = pre.deploy_contract(
+    def update_pre(self, pre: Alloc) -> Self:
+        """
+        Return a copy of self with the allocated sender/contract/entry
+        addresses populated.
+        """
+        sender_account = pre.fund_eoa(self.sender_balance)
+        contract_address = pre.deploy_contract(
             code=self.contract_code, balance=self.contract_balance
         )
-        self.entry_address = self.contract_address
+        entry_address = contract_address
         if self.call_depth > 2:
             for _ in range(1, self.call_depth - 1):
-                self.entry_address = pre.deploy_contract(
+                entry_address = pre.deploy_contract(
                     code=Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE)
                     + Op.POP(
                         Op.CALL(
                             Op.GAS,
-                            self.entry_address,
+                            entry_address,
                             0,
                             0,
                             Op.CALLDATASIZE,
@@ -222,6 +229,12 @@ def update_pre(self, pre: Alloc) -> None:
                         )
                     )
                 )
+        return replace(
+            self,
+            sender_account=sender_account,
+            contract_address=contract_address,
+            entry_address=entry_address,
+        )
 
     def valid_requests(
         self, current_minimum_fee: int
diff --git a/tests/prague/eip7251_consolidations/test_consolidations.py b/tests/prague/eip7251_consolidations/test_consolidations.py
index 52eb22c57ef..4e276039e87 100644
--- a/tests/prague/eip7251_consolidations/test_consolidations.py
+++ b/tests/prague/eip7251_consolidations/test_consolidations.py
@@ -884,13 +884,12 @@ def test_consolidation_requests_negative(
     Test blocks where the requests list and the actual consolidation requests
     that happened in the block's transactions do not match.
     """
-    for d in requests:
-        d.update_pre(pre)
+    prepared = [d.update_pre(pre) for d in requests]
 
     # No previous block so fee is the base
     fee = 1
     current_block_requests = []
-    for w in requests:
+    for w in prepared:
         current_block_requests += w.valid_requests(fee)
     included_requests = current_block_requests[
         : Spec.MAX_CONSOLIDATION_REQUESTS_PER_BLOCK
@@ -902,7 +901,7 @@ def test_consolidation_requests_negative(
         post={},
         blocks=[
             Block(
-                txs=sum((r.transactions() for r in requests), []),
+                txs=sum((r.transactions() for r in prepared), []),
                 header_verify=Header(
                     requests_hash=Requests(*included_requests),
                 ),
diff --git a/tests/prague/eip7251_consolidations/test_contract_deployment.py b/tests/prague/eip7251_consolidations/test_contract_deployment.py
index f0967a8306c..71268fe4eab 100644
--- a/tests/prague/eip7251_consolidations/test_contract_deployment.py
+++ b/tests/prague/eip7251_consolidations/test_contract_deployment.py
@@ -10,9 +10,9 @@
     Address,
     Alloc,
     Block,
-    Fork,
     Requests,
     Transaction,
+    TransitionFork,
     generate_system_contract_deploy_test,
 )
 from execution_testing.forks import Prague
@@ -34,7 +34,7 @@
 )
 def test_system_contract_deployment(
     *,
-    fork: Fork,
+    fork: TransitionFork,
     pre: Alloc,
     **kwargs: Any,
 ) -> Generator[Block, None, None]:
@@ -46,7 +46,9 @@ def test_system_contract_deployment(
         fee=Spec.get_fee(0),
         source_address=sender,
     )
-    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+    intrinsic_gas_calculator = (
+        fork.transitions_to().transaction_intrinsic_cost_calculator()
+    )
     test_transaction_gas = intrinsic_gas_calculator(
         calldata=consolidation_request.calldata
     )
diff --git a/tests/prague/eip7251_consolidations/test_modified_consolidation_contract.py b/tests/prague/eip7251_consolidations/test_modified_consolidation_contract.py
index fce87399467..eb1fe9cfc28 100644
--- a/tests/prague/eip7251_consolidations/test_modified_consolidation_contract.py
+++ b/tests/prague/eip7251_consolidations/test_modified_consolidation_contract.py
@@ -125,9 +125,9 @@ def test_extra_consolidations(
         requests=requests_list
     )
     # prepare consolidation senders
-    consolidation_request_transaction.update_pre(pre=pre)
+    prepared = consolidation_request_transaction.update_pre(pre=pre)
     # get transaction list
-    txs: List[Transaction] = consolidation_request_transaction.transactions()
+    txs: List[Transaction] = prepared.transactions()
 
     blockchain_test(
         pre=pre,
diff --git a/tests/prague/eip7623_increase_calldata_cost/spec.py b/tests/prague/eip7623_increase_calldata_cost/spec.py
index ebca1ee7041..6527e5c69c5 100644
--- a/tests/prague/eip7623_increase_calldata_cost/spec.py
+++ b/tests/prague/eip7623_increase_calldata_cost/spec.py
@@ -24,5 +24,5 @@ class Spec:
     https://eips.ethereum.org/EIPS/eip-7623.
     """
 
-    GAS_TX_DATA_TOKEN_STANDARD = 4
-    GAS_TX_DATA_TOKEN_FLOOR = 10
+    TX_DATA_TOKEN_STANDARD = 4
+    TX_DATA_TOKEN_FLOOR = 10
diff --git a/tests/prague/eip7623_increase_calldata_cost/test_refunds.py b/tests/prague/eip7623_increase_calldata_cost/test_refunds.py
index f5e46c1cb49..ac90e89583c 100644
--- a/tests/prague/eip7623_increase_calldata_cost/test_refunds.py
+++ b/tests/prague/eip7623_increase_calldata_cost/test_refunds.py
@@ -167,8 +167,8 @@ def intrinsic_gas_data_floor_minimum_delta(fork: Fork) -> int:
     gas_costs = fork.gas_costs()
     extra = 50
     return (
-        gas_costs.GAS_COLD_SLOAD
-        + gas_costs.GAS_STORAGE_RESET
+        gas_costs.COLD_STORAGE_ACCESS
+        + gas_costs.STORAGE_RESET
         + extra
         - gas_costs.REFUND_STORAGE_CLEAR
     )
diff --git a/tests/prague/eip7685_general_purpose_el_requests/conftest.py b/tests/prague/eip7685_general_purpose_el_requests/conftest.py
index b832895cda3..79bef284f42 100644
--- a/tests/prague/eip7685_general_purpose_el_requests/conftest.py
+++ b/tests/prague/eip7685_general_purpose_el_requests/conftest.py
@@ -97,8 +97,8 @@ def blocks(
     # Single block therefore base fee
     withdrawal_request_fee = 1
     consolidation_request_fee = 1
-    for r in requests:
-        r.update_pre(pre)
+    prepared = [r.update_pre(pre) for r in requests]
+    for r in prepared:
         if isinstance(r, DepositInteractionBase):
             valid_requests_list += r.valid_requests(10**18)
         elif isinstance(r, WithdrawalRequestInteractionBase):
@@ -115,7 +115,7 @@ def blocks(
         )
     return [
         Block(
-            txs=sum((r.transactions() for r in requests), []),
+            txs=sum((r.transactions() for r in prepared), []),
             header_verify=Header(requests_hash=valid_requests),
             requests=block_body_override_requests,
             exception=exception,
diff --git a/tests/prague/eip7685_general_purpose_el_requests/test_multi_type_requests.py b/tests/prague/eip7685_general_purpose_el_requests/test_multi_type_requests.py
index 22956ecbacf..cd3fb4b2d7c 100644
--- a/tests/prague/eip7685_general_purpose_el_requests/test_multi_type_requests.py
+++ b/tests/prague/eip7685_general_purpose_el_requests/test_multi_type_requests.py
@@ -336,7 +336,7 @@ def get_contract_permutations(
         ),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_valid_multi_type_requests(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
diff --git a/tests/prague/eip7702_set_code_tx/spec.py b/tests/prague/eip7702_set_code_tx/spec.py
index 2be51b6c99c..8f1eaac1fab 100644
--- a/tests/prague/eip7702_set_code_tx/spec.py
+++ b/tests/prague/eip7702_set_code_tx/spec.py
@@ -28,7 +28,7 @@ class Spec:
     SET_CODE_TX_TYPE = 0x04
     MAGIC = 0x05
     REFUND_AUTH_PER_EXISTING_ACCOUNT = 12_500
-    GAS_AUTH_PER_EMPTY_ACCOUNT = 25_000
+    AUTH_PER_EMPTY_ACCOUNT = 25_000
     DELEGATION_DESIGNATION = Bytes("ef0100")
     RESET_DELEGATION_ADDRESS = Address(0)
 
diff --git a/tests/prague/eip7702_set_code_tx/test_gas.py b/tests/prague/eip7702_set_code_tx/test_gas.py
index 2746a9dba17..59499cb423e 100644
--- a/tests/prague/eip7702_set_code_tx/test_gas.py
+++ b/tests/prague/eip7702_set_code_tx/test_gas.py
@@ -800,7 +800,7 @@ def gas_test_parameter_args(
         if execution_gas_allowance:
             # Leave some gas for the execution of the test code.
             max_gas -= 1_000_000
-        many_authorizations_count = max_gas // Spec.GAS_AUTH_PER_EMPTY_ACCOUNT
+        many_authorizations_count = max_gas // Spec.AUTH_PER_EMPTY_ACCOUNT
         cases += [
             pytest.param(
                 {
@@ -876,7 +876,7 @@ def test_gas_cost(
                 seen_authority.add(authority)
 
     discount_gas = (
-        Spec.GAS_AUTH_PER_EMPTY_ACCOUNT - Spec.REFUND_AUTH_PER_EXISTING_ACCOUNT
+        Spec.AUTH_PER_EMPTY_ACCOUNT - Spec.REFUND_AUTH_PER_EXISTING_ACCOUNT
     ) * discounted_authorizations
 
     # We calculate the exact gas required to execute the test code. We add
@@ -947,7 +947,7 @@ def test_gas_cost(
 @pytest.mark.parametrize(
     **gas_test_parameter_args(include_many=False, include_data=False)
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_account_warming(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -967,8 +967,8 @@ def test_account_warming(
     # check.
     overhead_cost = 3 * len(Op.CALL.kwargs)
 
-    cold_account_cost = fork.gas_costs().GAS_COLD_ACCOUNT_ACCESS
-    warm_account_cost = fork.gas_costs().GAS_WARM_ACCOUNT_ACCESS
+    cold_account_cost = fork.gas_costs().COLD_ACCOUNT_ACCESS
+    warm_account_cost = fork.gas_costs().WARM_ACCESS
 
     access_list_addresses = {
         access_list.address for access_list in access_list
@@ -1194,9 +1194,9 @@ def test_self_set_code_cost(
     callee_address = pre.deploy_contract(callee_code)
     callee_storage = Storage()
     callee_storage[slot_call_cost] = (
-        fork.gas_costs().GAS_WARM_ACCOUNT_ACCESS
+        fork.gas_costs().WARM_ACCESS
         if not pre_authorized
-        else fork.gas_costs().GAS_COLD_ACCOUNT_ACCESS
+        else fork.gas_costs().COLD_ACCOUNT_ACCESS
     ) + 100
 
     tx = Transaction(
@@ -1270,7 +1270,7 @@ def test_call_to_pre_authorized_oog(
     )
 
     expected_block_access_list = None
-    if fork.header_bal_hash_required():
+    if fork.is_eip_enabled(7928):
         # Sender nonce changes, callee is accessed but storage unchanged (OOG)
         # auth_signer is tracked (we read its code to check delegation)
         # delegation is NOT tracked (OOG before reading it)
diff --git a/tests/prague/eip7702_set_code_tx/test_set_code_txs.py b/tests/prague/eip7702_set_code_tx/test_set_code_txs.py
index 6b02c00fe9c..752b671dd24 100644
--- a/tests/prague/eip7702_set_code_tx/test_set_code_txs.py
+++ b/tests/prague/eip7702_set_code_tx/test_set_code_txs.py
@@ -17,7 +17,13 @@
     Address,
     Alloc,
     AuthorizationTuple,
+    BalAccountExpectation,
+    BalCodeChange,
+    BalNonceChange,
+    BalStorageChange,
+    BalStorageSlot,
     Block,
+    BlockAccessListExpectation,
     BlockchainTestFiller,
     Bytecode,
     Bytes,
@@ -793,6 +799,12 @@ def test_set_code_to_contract_creator(
     [0, 1],
 )
 @pytest.mark.with_all_call_opcodes
+@pytest.mark.filter_combinations(
+    lambda call_opcode, value, **_: (
+        "value" in call_opcode.kwargs or value == 0
+    ),
+    reason="opcode does not support value argument",
+)
 def test_set_code_to_self_caller(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -800,9 +812,6 @@ def test_set_code_to_self_caller(
     value: int,
 ) -> None:
     """Test the executing a self-call in a set-code transaction."""
-    if "value" not in call_opcode.kwargs and value != 0:
-        pytest.skip(f"Call opcode {call_opcode} does not support value")
-
     storage = Storage()
     auth_signer = pre.fund_eoa(auth_account_start_balance)
 
@@ -857,7 +866,7 @@ def test_set_code_to_self_caller(
 
 
 @pytest.mark.execute(pytest.mark.skip(reason="excessive gas"))
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_set_code_max_depth_call_stack(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -929,7 +938,13 @@ def test_set_code_max_depth_call_stack(
     "value",
     [0, 1],
 )
-@pytest.mark.json_loader
+@pytest.mark.filter_combinations(
+    lambda call_opcode, value, **_: (
+        "value" in call_opcode.kwargs or value == 0
+    ),
+    reason="opcode does not support value argument",
+)
+@pytest.mark.eels_base_coverage
 def test_set_code_call_set_code(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -937,9 +952,6 @@ def test_set_code_call_set_code(
     value: int,
 ) -> None:
     """Test the calling a set-code account from another set-code account."""
-    if "value" not in call_opcode.kwargs and value != 0:
-        pytest.skip(f"Call opcode {call_opcode} does not support value")
-
     auth_signer_1 = pre.fund_eoa(auth_account_start_balance)
     storage_1 = Storage()
 
@@ -1148,22 +1160,17 @@ def test_call_into_self_delegating_set_code(
     state_test: StateTestFiller,
     pre: Alloc,
     call_opcode: Op,
+    fork: Fork,
 ) -> None:
     """Test call into a set-code account that delegates to itself."""
     auth_signer = pre.fund_eoa(auth_account_start_balance)
 
     storage = Storage()
+    return_slot = storage.store_next(
+        call_return_code(opcode=call_opcode, success=False)
+    )
     entry_code = (
-        Op.SSTORE(
-            storage.store_next(
-                call_return_code(
-                    opcode=call_opcode,
-                    success=False,
-                )
-            ),
-            call_opcode(address=auth_signer),
-        )
-        + Op.STOP
+        Op.SSTORE(return_slot, call_opcode(address=auth_signer)) + Op.STOP
     )
     entry_address = pre.deploy_contract(entry_code)
 
@@ -1181,6 +1188,36 @@ def test_call_into_self_delegating_set_code(
         sender=pre.fund_eoa(),
     )
 
+    expected_block_access_list = None
+    if fork.is_eip_enabled(7928):
+        # Degenerate one-hop: auth_signer's delegation target IS itself.
+        # CALL(auth_signer) resolves once, runs the 0xef0100... designator
+        # as bytecode -> INVALID -> returns 0. SSTORE(slot, 0) is no-op.
+        expected_block_access_list = BlockAccessListExpectation(
+            account_expectations={
+                tx.sender: BalAccountExpectation(
+                    nonce_changes=[
+                        BalNonceChange(block_access_index=1, post_nonce=1)
+                    ],
+                ),
+                entry_address: BalAccountExpectation(
+                    storage_changes=[],
+                    storage_reads=[return_slot],
+                ),
+                auth_signer: BalAccountExpectation(
+                    nonce_changes=[
+                        BalNonceChange(block_access_index=1, post_nonce=1)
+                    ],
+                    code_changes=[
+                        BalCodeChange(
+                            block_access_index=1,
+                            new_code=Spec.delegation_designation(auth_signer),
+                        )
+                    ],
+                ),
+            }
+        )
+
     state_test(
         env=Environment(),
         pre=pre,
@@ -1191,6 +1228,7 @@ def test_call_into_self_delegating_set_code(
                 nonce=1, code=Spec.delegation_designation(auth_signer)
             ),
         },
+        expected_block_access_list=expected_block_access_list,
     )
 
 
@@ -1199,6 +1237,7 @@ def test_call_into_chain_delegating_set_code(
     state_test: StateTestFiller,
     pre: Alloc,
     call_opcode: Op,
+    fork: Fork,
 ) -> None:
     """
     Test call into a set-code account that delegates to another set-code
@@ -1208,14 +1247,15 @@ def test_call_into_chain_delegating_set_code(
     auth_signer_2 = pre.fund_eoa(auth_account_start_balance)
 
     storage = Storage()
+    return_slot = storage.store_next(
+        call_return_code(
+            opcode=call_opcode,
+            success=False,
+        )
+    )
     entry_code = (
         Op.SSTORE(
-            storage.store_next(
-                call_return_code(
-                    opcode=call_opcode,
-                    success=False,
-                )
-            ),
+            return_slot,
             call_opcode(address=auth_signer_1),
         )
         + Op.STOP
@@ -1241,6 +1281,51 @@ def test_call_into_chain_delegating_set_code(
         sender=pre.fund_eoa(),
     )
 
+    expected_block_access_list = None
+    if fork.is_eip_enabled(7928):
+        # One-hop delegation resolution: CALL(A) resolves A->B once; B's
+        # 0xef0100... bytecode aborts as INVALID. CALL returns 0, so
+        # SSTORE(slot, 0) is a no-op write and is demoted to storage_reads.
+        expected_block_access_list = BlockAccessListExpectation(
+            account_expectations={
+                tx.sender: BalAccountExpectation(
+                    nonce_changes=[
+                        BalNonceChange(block_access_index=1, post_nonce=1)
+                    ],
+                ),
+                entry_address: BalAccountExpectation(
+                    storage_changes=[],
+                    storage_reads=[return_slot],
+                ),
+                auth_signer_1: BalAccountExpectation(
+                    nonce_changes=[
+                        BalNonceChange(block_access_index=1, post_nonce=1)
+                    ],
+                    code_changes=[
+                        BalCodeChange(
+                            block_access_index=1,
+                            new_code=Spec.delegation_designation(
+                                auth_signer_2
+                            ),
+                        )
+                    ],
+                ),
+                auth_signer_2: BalAccountExpectation(
+                    nonce_changes=[
+                        BalNonceChange(block_access_index=1, post_nonce=1)
+                    ],
+                    code_changes=[
+                        BalCodeChange(
+                            block_access_index=1,
+                            new_code=Spec.delegation_designation(
+                                auth_signer_1
+                            ),
+                        )
+                    ],
+                ),
+            }
+        )
+
     state_test(
         env=Environment(),
         pre=pre,
@@ -1254,6 +1339,7 @@ def test_call_into_chain_delegating_set_code(
                 nonce=1, code=Spec.delegation_designation(auth_signer_1)
             ),
         },
+        expected_block_access_list=expected_block_access_list,
     )
 
 
@@ -1477,14 +1563,14 @@ def test_set_code_address_and_authority_warm_state(
     callee_storage = Storage()
     callee_storage[slot_call_success] = 1
     callee_storage[slot_set_code_to_warm_state] = (
-        gas_costs.GAS_COLD_ACCOUNT_ACCESS
+        gas_costs.COLD_ACCOUNT_ACCESS
         if set_code_address_first
-        else gas_costs.GAS_WARM_ACCOUNT_ACCESS
+        else gas_costs.WARM_ACCESS
     )
     callee_storage[slot_authority_warm_state] = 100 + (
-        gas_costs.GAS_WARM_ACCOUNT_ACCESS
+        gas_costs.WARM_ACCESS
         if set_code_address_first
-        else gas_costs.GAS_COLD_ACCOUNT_ACCESS
+        else gas_costs.COLD_ACCOUNT_ACCESS
     )
 
     tx = Transaction(
@@ -2471,7 +2557,7 @@ def test_set_code_using_valid_synthetic_signatures(
         ),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_valid_tx_invalid_auth_signature(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -2523,6 +2609,7 @@ def test_signature_s_out_of_range(
     state_test: StateTestFiller,
     pre: Alloc,
     chain_config: ChainConfig,
+    fork: Fork,
 ) -> None:
     """
     Test sending a transaction with an authorization tuple where the signature
@@ -2558,6 +2645,33 @@ def test_signature_s_out_of_range(
         sender=pre.fund_eoa(),
     )
 
+    expected_block_access_list = None
+    if fork.is_eip_enabled(7928):
+        # High-s rejected pre-load -> authority not in BAL (EIP-7928).
+        expected_block_access_list = BlockAccessListExpectation(
+            account_expectations={
+                tx.sender: BalAccountExpectation(
+                    nonce_changes=[
+                        BalNonceChange(block_access_index=1, post_nonce=1)
+                    ],
+                ),
+                entry_address: BalAccountExpectation(
+                    storage_changes=[
+                        BalStorageSlot(
+                            slot=success_slot,
+                            slot_changes=[
+                                BalStorageChange(
+                                    block_access_index=1, post_value=1
+                                )
+                            ],
+                        )
+                    ],
+                ),
+                auth_signer: None,
+                set_code_to_address: None,
+            }
+        )
+
     state_test(
         env=Environment(),
         pre=pre,
@@ -2568,6 +2682,7 @@ def test_signature_s_out_of_range(
                 storage={success_slot: 1},
             ),
         },
+        expected_block_access_list=expected_block_access_list,
     )
 
 
@@ -2694,6 +2809,7 @@ def test_nonce_validity(
     pre: Alloc,
     account_nonce: int,
     authorization_nonce: int,
+    fork: Fork,
 ) -> None:
     """
     Test sending a transaction where the nonce field of an authorization almost
@@ -2735,6 +2851,83 @@ def test_nonce_validity(
         sender=pre.fund_eoa(),
     )
 
+    expected_block_access_list = None
+    if fork.is_eip_enabled(7928):
+        # Invalid auth -> CALL(auth_signer) returns 0; SSTORE(return_slot, 0)
+        # is a no-op write and is demoted to storage_reads per EIP-7928.
+        if valid_authorization:
+            entry_expectation = BalAccountExpectation(
+                storage_changes=[
+                    BalStorageSlot(
+                        slot=success_slot,
+                        slot_changes=[
+                            BalStorageChange(
+                                block_access_index=1, post_value=1
+                            )
+                        ],
+                    ),
+                    BalStorageSlot(
+                        slot=return_slot,
+                        slot_changes=[
+                            BalStorageChange(
+                                block_access_index=1, post_value=1
+                            )
+                        ],
+                    ),
+                ],
+            )
+            auth_signer_expectation: BalAccountExpectation | None = (
+                BalAccountExpectation(
+                    nonce_changes=[
+                        BalNonceChange(
+                            block_access_index=1,
+                            post_nonce=account_nonce + 1,
+                        )
+                    ],
+                    code_changes=[
+                        BalCodeChange(
+                            block_access_index=1,
+                            new_code=Spec.delegation_designation(
+                                set_code_to_address
+                            ),
+                        )
+                    ],
+                )
+            )
+            set_code_target_expectation: BalAccountExpectation | None = (
+                BalAccountExpectation.empty()
+            )
+        else:
+            entry_expectation = BalAccountExpectation(
+                storage_changes=[
+                    BalStorageSlot(
+                        slot=success_slot,
+                        slot_changes=[
+                            BalStorageChange(
+                                block_access_index=1, post_value=1
+                            )
+                        ],
+                    ),
+                ],
+                storage_reads=[return_slot],
+            )
+            # Auth failed; subsequent CALL still touches the signer.
+            auth_signer_expectation = BalAccountExpectation.empty()
+            set_code_target_expectation = None
+
+        expected_block_access_list = BlockAccessListExpectation(
+            account_expectations={
+                tx.sender: BalAccountExpectation(
+                    nonce_changes=[
+                        BalNonceChange(block_access_index=1, post_nonce=1)
+                    ],
+                ),
+                entry_address: entry_expectation,
+                auth_signer: auth_signer_expectation,
+                set_code_to_address: set_code_target_expectation,
+            }
+        )
+
     state_test(
         env=Environment(),
         pre=pre,
@@ -2757,11 +2950,12 @@ def test_nonce_validity(
                 },
             ),
         },
+        expected_block_access_list=expected_block_access_list,
     )
 
 
 @pytest.mark.pre_alloc_mutable()
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_nonce_overflow_after_first_authorization(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -2901,6 +3095,7 @@ def test_set_code_to_precompile(
     pre: Alloc,
     precompile: Address,
     call_opcode: Op,
+    fork: Fork,
 ) -> None:
     """
     Test setting the code of an account to a pre-compile address and executing
@@ -2945,6 +3140,31 @@ def test_set_code_to_precompile(
         ],
     )
 
+    expected_block_access_list = None
+    if fork.is_eip_enabled(7928):
+        # Precompile is loaded as execution target via delegation dispatch
+        # for all 4 call opcodes. For DELEGATECALL/CALLCODE the precompile
+        # provides the code but is not the call target, so its access has
+        # to be recorded explicitly.
+        expected_block_access_list = BlockAccessListExpectation(
+            account_expectations={
+                auth_signer: BalAccountExpectation(
+                    nonce_changes=[
+                        BalNonceChange(block_access_index=1, post_nonce=1)
+                    ],
+                    code_changes=[
+                        BalCodeChange(
+                            block_access_index=1,
+                            new_code=Spec.delegation_designation(
+                                Address(precompile)
+                            ),
+                        )
+                    ],
+                ),
+                Address(precompile): BalAccountExpectation.empty(),
+            }
+        )
+
     state_test(
         env=Environment(),
         pre=pre,
@@ -2958,6 +3178,7 @@ def test_set_code_to_precompile(
                 storage=caller_code_storage,
             ),
         },
+        expected_block_access_list=expected_block_access_list,
     )
 
 
@@ -2981,8 +3202,7 @@ def test_set_code_to_precompile_not_enough_gas_for_precompile_execution(
         authorization_list_or_count=[auth],
     )
     # discount = min(
-    #     Spec.GAS_AUTH_PER_EMPTY_ACCOUNT
-    #     - Spec.REFUND_AUTH_PER_EXISTING_ACCOUNT,
+    #     Spec.AUTH_PER_EMPTY_ACCOUNT - Spec.REFUND_AUTH_PER_EXISTING_ACCOUNT,
     #     intrinsic_gas // 5,  # max discount EIP-3529
     # )
 
@@ -3423,7 +3643,7 @@ def test_reset_code(
 
 
 @pytest.mark.exception_test
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_contract_create(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -3452,7 +3672,7 @@ def test_contract_create(
 
 
 @pytest.mark.exception_test
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_empty_authorization_list(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -3913,7 +4133,7 @@ def test_many_delegations(
         max_gas = env.gas_limit
     gas_for_delegations = max_gas - 21_000 - 20_000 - (3 * 2)
 
-    delegation_count = gas_for_delegations // Spec.GAS_AUTH_PER_EMPTY_ACCOUNT
+    delegation_count = gas_for_delegations // Spec.AUTH_PER_EMPTY_ACCOUNT
 
     success_slot = 1
     entry_code = Op.SSTORE(success_slot, 1) + Op.STOP
@@ -4061,7 +4281,7 @@ def test_authorization_reusing_nonce(
 )
 @pytest.mark.exception_test
 @pytest.mark.pre_alloc_mutable
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_set_code_from_account_with_non_delegating_code(
     state_test: StateTestFiller,
     pre: Alloc,
diff --git a/tests/prague/eip7702_set_code_tx/test_set_code_txs_2.py b/tests/prague/eip7702_set_code_tx/test_set_code_txs_2.py
index 7d25c0cf786..22aa4a8d9db 100644
--- a/tests/prague/eip7702_set_code_tx/test_set_code_txs_2.py
+++ b/tests/prague/eip7702_set_code_tx/test_set_code_txs_2.py
@@ -1873,7 +1873,7 @@ def test_double_auth(
 
 @pytest.mark.xdist_group(name="bigmem")
 @pytest.mark.valid_from("Prague")
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_pointer_resets_an_empty_code_account_with_storage(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
diff --git a/tests/shanghai/eip3860_initcode/test_initcode.py b/tests/shanghai/eip3860_initcode/test_initcode.py
index 57058ac1a89..bf0fb89214e 100644
--- a/tests/shanghai/eip3860_initcode/test_initcode.py
+++ b/tests/shanghai/eip3860_initcode/test_initcode.py
@@ -122,7 +122,7 @@ def initcode(fork: Fork, initcode_name: str) -> Initcode:
         pytest.param("over_limit_ones", marks=pytest.mark.exception_test),
     ],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_contract_creating_tx(
     state_test: StateTestFiller,
     env: Environment,
diff --git a/tests/shanghai/eip4895_withdrawals/test_withdrawals.py b/tests/shanghai/eip4895_withdrawals/test_withdrawals.py
index b2ed6c94450..f789f349919 100644
--- a/tests/shanghai/eip4895_withdrawals/test_withdrawals.py
+++ b/tests/shanghai/eip4895_withdrawals/test_withdrawals.py
@@ -311,9 +311,8 @@ class TestMultipleWithdrawalsSameAddress:
 
     @pytest.fixture
     def addresses(self, fork: Fork) -> List[Address]:  # noqa: D102
-        addresses = [
-            Address(p) for p in fork.precompiles(block_number=0, timestamp=0)
-        ]
+        addresses = [Address(p) for p in fork.precompiles()]
+        addresses.sort()
         return addresses + [Address(2**160 - 1)]
 
     @pytest.fixture
@@ -607,7 +606,7 @@ class ZeroAmountTestCases(Enum):  # noqa: D101
     list(ZeroAmountTestCases),
     ids=[case.value for case in ZeroAmountTestCases],
 )
-@pytest.mark.json_loader
+@pytest.mark.eels_base_coverage
 def test_zero_amount(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
diff --git a/tests/tangerine_whistle/eip150_operation_gas_costs/test_eip150_selfdestruct.py b/tests/tangerine_whistle/eip150_operation_gas_costs/test_eip150_selfdestruct.py
index 664ab6bf00e..6c72bb63e6b 100644
--- a/tests/tangerine_whistle/eip150_operation_gas_costs/test_eip150_selfdestruct.py
+++ b/tests/tangerine_whistle/eip150_operation_gas_costs/test_eip150_selfdestruct.py
@@ -52,7 +52,7 @@ def calculate_selfdestruct_gas(
     originator_balance: int,
 ) -> int:
     """Calculate exact gas needed for SELFDESTRUCT."""
-    # G_NEW_ACCOUNT:
+    # NEW_ACCOUNT:
     # - Pre-EIP-161 (TangerineWhistle): charged when beneficiary is dead
     # - Post-EIP-161 (>=SpuriousDragon): charged when beneficiary is dead
     #   AND originator has balance > 0
@@ -145,7 +145,7 @@ def build_bal_expectations(
     beneficiary_in_bal: bool,
 ) -> BlockAccessListExpectation | None:
     """Build BAL expectations for >=Amsterdam."""
-    if not fork.header_bal_hash_required():
+    if not fork.is_eip_enabled(7928):
         return None
 
     victim_code = Op.SELFDESTRUCT(beneficiary)
@@ -351,13 +351,13 @@ def test_selfdestruct_to_account(
             code=Op.STOP, balance=beneficiary_initial_balance
         )
 
-    # Determine if beneficiary is dead (for G_NEW_ACCOUNT calculation)
+    # Determine if beneficiary is dead (for NEW_ACCOUNT calculation)
     # Contract with code is NOT dead even with balance=0
     beneficiary_dead = (
         beneficiary_initial_balance == 0 and beneficiary == "eoa"
     )
 
-    # Calculate exact gas for success (includes G_NEW_ACCOUNT if applicable)
+    # Calculate exact gas for success (includes NEW_ACCOUNT if applicable)
     inner_call_gas = calculate_selfdestruct_gas(
         fork,
         beneficiary_warm=warm,
@@ -367,7 +367,7 @@ def test_selfdestruct_to_account(
     if not is_success:
         inner_call_gas -= 1
 
-    # In BAL if: success OR G_NEW_ACCOUNT charged (OOG after access)
+    # In BAL if: success OR NEW_ACCOUNT charged (OOG after access)
     needs_new_account = False
     if beneficiary_dead:
         if fork >= SpuriousDragon:
@@ -463,7 +463,7 @@ def test_selfdestruct_state_access_boundary(
     Test state access boundary for account beneficiaries.
 
     Consensus check: beneficiary must be accessed at base cost boundary,
-    before G_NEW_ACCOUNT is evaluated.
+    before NEW_ACCOUNT is evaluated.
 
     - exact_gas: beneficiary IS accessed (in BAL)
     - exact_gas_minus_1: beneficiary NOT accessed (not in BAL)
@@ -478,14 +478,14 @@ def test_selfdestruct_state_access_boundary(
             code=Op.STOP, balance=beneficiary_initial_balance
         )
 
-    # Determine if beneficiary is dead (for G_NEW_ACCOUNT calculation)
+    # Determine if beneficiary is dead (for NEW_ACCOUNT calculation)
     # Contract with code is NOT dead even with balance=0
     beneficiary_dead = (
         beneficiary_initial_balance == 0 and beneficiary == "eoa"
     )
 
     # Calculate gas for state access boundary only (base + cold access)
-    # Does NOT include G_NEW_ACCOUNT
+    # Does NOT include NEW_ACCOUNT
     inner_call_gas = Op.SELFDESTRUCT(
         0,  # beneficiary address (generates a PUSH)
         address_warm=warm or fork < Berlin,
@@ -497,7 +497,7 @@ def test_selfdestruct_state_access_boundary(
 
     # Determine if operation succeeds at this gas level
     # At state access boundary, we have enough gas for base + cold access
-    # Operation succeeds if NO G_NEW_ACCOUNT is needed:
+    # Operation succeeds if NO NEW_ACCOUNT is needed:
     # - Beneficiary is alive (has balance or has code)
     # - OR beneficiary is dead but originator_balance=0 (>=SpuriousDragon)
     needs_new_account = False
@@ -507,7 +507,7 @@ def test_selfdestruct_state_access_boundary(
         else:
             needs_new_account = True
 
-    # At exact_gas: success if no G_NEW_ACCOUNT needed
+    # At exact_gas: success if no NEW_ACCOUNT needed
     # At exact_gas_minus_1: always OOG (before state access)
     operation_success = is_success and not needs_new_account
 
@@ -602,7 +602,7 @@ def test_selfdestruct_to_precompile(
     # Precompiles are dead when they have no balance
     beneficiary_dead = beneficiary_initial_balance == 0
 
-    # Calculate exact gas for success (includes G_NEW_ACCOUNT if applicable)
+    # Calculate exact gas for success (includes NEW_ACCOUNT if applicable)
     # Precompiles are always warm
     inner_call_gas = calculate_selfdestruct_gas(
         fork,
@@ -613,7 +613,7 @@ def test_selfdestruct_to_precompile(
     if not is_success:
         inner_call_gas -= 1
 
-    # In BAL if: success OR G_NEW_ACCOUNT charged (OOG after access)
+    # In BAL if: success OR NEW_ACCOUNT charged (OOG after access)
     needs_new_account = False
     if beneficiary_dead:
         if fork >= SpuriousDragon:
@@ -700,7 +700,7 @@ def test_selfdestruct_to_precompile_state_access_boundary(
     Test state access boundary for precompile beneficiaries.
 
     Consensus check: precompile must be accessed at base cost boundary,
-    before G_NEW_ACCOUNT is evaluated. Precompiles are always warm.
+    before NEW_ACCOUNT is evaluated. Precompiles are always warm.
 
     - exact_gas: precompile IS accessed (in BAL)
     - exact_gas_minus_1: precompile NOT accessed (not in BAL)
@@ -711,7 +711,7 @@ def test_selfdestruct_to_precompile_state_access_boundary(
 
     beneficiary_dead = beneficiary_initial_balance == 0
 
-    # State access boundary: base cost only (no G_NEW_ACCOUNT)
+    # State access boundary: base cost only (no NEW_ACCOUNT)
     # Precompiles are always warm
     inner_call_gas = Op.SELFDESTRUCT(
         0, address_warm=True, account_new=False
@@ -720,7 +720,7 @@ def test_selfdestruct_to_precompile_state_access_boundary(
     if not is_success:
         inner_call_gas -= 1
 
-    # Success at base cost if no G_NEW_ACCOUNT needed
+    # Success at base cost if no NEW_ACCOUNT needed
     needs_new_account = False
     if beneficiary_dead:
         if fork >= SpuriousDragon:
@@ -802,7 +802,7 @@ def test_selfdestruct_to_system_contract(
     Test SELFDESTRUCT success boundary for system contract beneficiaries.
 
     System contracts are always warm (no cold access charge) and always have
-    code (so beneficiary is never dead, no G_NEW_ACCOUNT charge).
+    code (so beneficiary is never dead, no NEW_ACCOUNT charge).
 
     - exact_gas: succeeds, balance transferred
     - exact_gas_minus_1: OOG, operation fails
@@ -830,7 +830,7 @@ def test_selfdestruct_to_system_contract(
 
     # Build minimal BAL expectations for test-specific accounts only
     expected_bal: BlockAccessListExpectation | None = None
-    if fork.header_bal_hash_required():
+    if fork.is_eip_enabled(7928):
         account_expectations: Dict[Address, BalAccountExpectation | None] = {
             alice: BalAccountExpectation(
                 nonce_changes=[
@@ -952,7 +952,7 @@ def test_selfdestruct_to_self(
     Key characteristics:
     - Beneficiary is always warm (it's the executing contract)
     - Beneficiary is always alive (EIP-161 nonce=1)
-    - No G_NEW_ACCOUNT charge
+    - No NEW_ACCOUNT charge
     - No cold access charge (>=Berlin)
     - Balance is "transferred" to self (no net change until destruction)
 
@@ -967,7 +967,7 @@ def test_selfdestruct_to_self(
     alice = pre.fund_eoa()
     victim_code = Op.SELFDESTRUCT(Op.ADDRESS)
 
-    # Gas: ADDRESS + SELFDESTRUCT (no cold access, no G_NEW_ACCOUNT)
+    # Gas: ADDRESS + SELFDESTRUCT (no cold access, no NEW_ACCOUNT)
     base_gas = Op.SELFDESTRUCT(
         Op.ADDRESS, address_warm=True, account_new=False
     ).gas_cost(fork)
@@ -1006,7 +1006,7 @@ def test_selfdestruct_to_self(
 
     # Build BAL expectations
     expected_bal: BlockAccessListExpectation | None = None
-    if fork.header_bal_hash_required():
+    if fork.is_eip_enabled(7928):
         if same_tx:
             if is_success:
                 # Created and destroyed in same tx - no net changes for victim
@@ -1135,7 +1135,7 @@ def test_initcode_selfdestruct_to_self(
     - During initcode, the contract has no code yet
     - Contract has nonce=1 (post-EIP-161) making it non-empty
     - Beneficiary is always warm (it's the executing contract)
-    - No G_NEW_ACCOUNT charge (contract has nonce > 0)
+    - No NEW_ACCOUNT charge (contract has nonce > 0)
     - No cold access charge (>=Berlin)
 
     Note: Gas boundary testing not possible for initcode since CREATE
@@ -1160,7 +1160,7 @@ def test_initcode_selfdestruct_to_self(
 
     # Build BAL expectations
     expected_bal: BlockAccessListExpectation | None = None
-    if fork.header_bal_hash_required():
+    if fork.is_eip_enabled(7928):
         # Contract created and immediately destroyed - no net changes
         # for victim
         caller_expectation = BalAccountExpectation(
@@ -1195,3 +1195,99 @@ def test_initcode_selfdestruct_to_self(
         blocks=[Block(txs=[tx], expected_block_access_list=expected_bal)],
         post=post,
     )
+
+
+@pytest.mark.parametrize(
+    "originator_balance",
+    [0, 100],
+    ids=["no_balance", "has_balance"],
+)
+@pytest.mark.valid_from("TangerineWhistle")
+def test_selfdestruct_send_to_sender(
+    pre: Alloc,
+    blockchain_test: BlockchainTestFiller,
+    fork: Fork,
+    originator_balance: int,
+) -> None:
+    """
+    SELFDESTRUCT on pre-existing contract where beneficiary is tx.sender.
+
+    Alice calls victim directly; victim runs `SELFDESTRUCT(CALLER)`. The
+    beneficiary coincides with tx.sender, so alice's BAL entry coalesces
+    `nonce_changes` (as sender) with `balance_changes` (as beneficiary).
+    Pre-Cancun: victim destroyed. >=Cancun: victim preserved with balance 0
+    (EIP-6780 — victim was not created same-tx).
+    """
+    alice_initial_balance = 10**18
+    alice = pre.fund_eoa(amount=alice_initial_balance)
+    victim_code = Op.SELFDESTRUCT(
+        Op.CALLER, address_warm=True, account_new=False
+    )
+    victim = pre.deploy_contract(code=victim_code, balance=originator_balance)
+
+    gas_price = 0xA
+    gas_limit = 100_000
+    tx = Transaction(
+        sender=alice,
+        to=victim,
+        gas_limit=gas_limit,
+        gas_price=gas_price,
+        protected=fork.supports_protected_txs(),
+    )
+
+    intrinsic_gas = fork.transaction_intrinsic_cost_calculator()(
+        calldata=b"", contract_creation=False
+    )
+    execution_gas = victim_code.gas_cost(fork)
+    alice_final_balance = (
+        alice_initial_balance
+        + originator_balance
+        - (intrinsic_gas + execution_gas) * gas_price
+    )
+
+    expected_bal: BlockAccessListExpectation | None = None
+    if fork.is_eip_enabled(7928):
+        alice_expectation = BalAccountExpectation(
+            nonce_changes=[BalNonceChange(block_access_index=1, post_nonce=1)],
+            balance_changes=[
+                BalBalanceChange(
+                    block_access_index=1, post_balance=alice_final_balance
+                )
+            ],
+        )
+        if originator_balance > 0:
+            victim_expectation = BalAccountExpectation(
+                balance_changes=[
+                    BalBalanceChange(block_access_index=1, post_balance=0)
+                ],
+                code_changes=[],
+                nonce_changes=[],
+                storage_changes=[],
+                storage_reads=[],
+            )
+        else:
+            victim_expectation = BalAccountExpectation.empty()
+        expected_bal = BlockAccessListExpectation(
+            account_expectations={
+                alice: alice_expectation,
+                victim: victim_expectation,
+            }
+        )
+
+    contract_destroyed = fork < Cancun
+    if contract_destroyed:
+        post: Dict[Address | EOA, Account | object] = {
+            alice: Account(nonce=1),
+            victim: Account.NONEXISTENT,
+        }
+    else:
+        post = {
+            alice: Account(nonce=1),
+            victim: Account(balance=0, code=victim_code),
+        }
+
+    blockchain_test(
+        pre=pre,
+        blocks=[Block(txs=[tx], expected_block_access_list=expected_bal)],
+        post=post,
+    )
diff --git a/tox.ini b/tox.ini
index 77163ad7a69..f390f3ada51 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,246 +1,80 @@
+# Migration stub: execution-specs now uses just (https://just.systems)
+# Install just: https://just.systems/man/en/pre-built-binaries.html
+#
+# Run `just` to see all available recipes.
+
 [tox]
-requires =
-    tox>=4,<5
-    tox-uv>=1.29,<2
-# Get a description of all available environments with `uvx tox -av`
-envlist =
-    py3
-    pypy3
-    json_loader
-    static
-    tests_pytest_py3
-    tests_pytest_pypy3
-    tests_benchmark_pytest_py3
-    benchmark-gas-values
-    benchmark-fixed-opcode-cli
-    benchmark-fixed-opcode-config
-    spec-docs
-    mkdocs
-    changelog
-    markdownlint
+envlist = py3
 
 [testenv]
-runner = uv-venv-lock-runner
-uv_seed = false
-wheel_build_env = .pkg
+allowlist_externals = printf, false
+skip_install = true
+deps =
+commands =
+    printf '\n\033[1m  execution-specs has migrated from tox to just.\033[0m\n  Install just: https://just.systems/man/en/pre-built-binaries.html\n\n  Run \033[1m"just"\033[0m to see all available recipes.\n\n'
+    false
 
-[testenv:static]
-description = Run spelling, lint, typechecking and dependency checks
+[testenv:py3]
 commands =
-    codespell
-    ruff check
-    ruff format --check
-    mypy
-    ethereum-spec-lint
-    uv lock --check
-    actionlint -pyflakes pyflakes -shellcheck "shellcheck -S warning"
+    printf '\n\033[1m  execution-specs has migrated from tox to just.\033[0m\n  Install just: https://just.systems/man/en/pre-built-binaries.html\n\n  This tox env can be run using just via:\n    \033[1mjust fill\033[0m\n\n'
+    false
 
-[testenv:tests_pytest_py3]
-description = Run the testing package unit tests (with Python)
-dependency_groups =
-    test
-    lint  # TODO: add ruff for gentest; remove as part of ethereum/execution-specs#1715
-changedir = {toxinidir}/packages/testing
-package = editable
+[testenv:pypy3]
 commands =
-    pytest \
-        -n {env:PYTEST_XDIST_AUTO_NUM_WORKERS:6} \
-        --basetemp="{temp_dir}/pytest" \
-        --ignore=src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_benchmarking.py \
-        {posargs} \
-        src
+    printf '\n\033[1m  execution-specs has migrated from tox to just.\033[0m\n  Install just: https://just.systems/man/en/pre-built-binaries.html\n\n  This tox env can be run using just via:\n    \033[1mjust fill-pypy\033[0m\n\n'
+    false
 
-[testenv:tests_pytest_pypy3]
-description = Run the testing package unit tests (with PyPy)
-# overwrite default groups (dev) to avoid installing optimized in tox envs using pypy
-dependency_groups =
-    test
-    lint  # TODO: add ruff for gentest; remove as part of ethereum/execution-specs#1715
-passenv =
-    PYPY_GC_MAX
-    PYPY_GC_MIN
-# run inside the package directory so pytest picks up packages/testing/pyproject.toml
-changedir = {toxinidir}/packages/testing
-package = editable
+[testenv:json_loader]
 commands =
-    pytest \
-        -n auto --maxprocesses 6 \
-        --basetemp="{temp_dir}/pytest" \
-        --ignore=src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_benchmarking.py \
-        {posargs} \
-        src
+    printf '\n\033[1m  execution-specs has migrated from tox to just.\033[0m\n  Install just: https://just.systems/man/en/pre-built-binaries.html\n\n  This tox env can be run using just via:\n    \033[1mjust json-loader\033[0m\n\n'
+    false
 
-[testenv:tests_benchmark_pytest_py3]
-description = Run benchmark framework unit tests (with Python)
-# Running in serial as not many tests
+[testenv:static]
 commands =
-    pytest \
-        --basetemp="{temp_dir}/pytest" \
-        {posargs} \
-        packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_benchmarking.py
+    printf '\n\033[1m  execution-specs has migrated from tox to just.\033[0m\n  Install just: https://just.systems/man/en/pre-built-binaries.html\n\n  This tox env can be run using just via:\n    \033[1mjust static\033[0m\n\n'
+    false
 
-[testenv:json_loader]
-description = Fill and run the spec against test fixtures
-dependency_groups =
-    test
+[testenv:tests_pytest_py3]
 commands =
-    fill \
-        -m "json_loader and not derived_test" \
-        --until Amsterdam \
-        -n {env:PYTEST_XDIST_AUTO_NUM_WORKERS:6} --dist=loadgroup \
-        --skip-index \
-        --clean \
-        --ignore=tests/ported_static \
-        --output="tests/json_loader/fixtures" \
-        --cov-config=pyproject.toml \
-        --cov=ethereum \
-        # Coverage gate: if this drops, regenerate the minimal test set with
-        # minimize-tests (https://github.com/SamWilsn/minimize-tests).
-        --cov-fail-under=85
-    pytest \
-        -m "not slow" \
-        -n auto --maxprocesses 6 --dist=loadfile \
-        --basetemp="{temp_dir}/pytest" \
-        {posargs} \
-        tests/json_loader
+    printf '\n\033[1m  execution-specs has migrated from tox to just.\033[0m\n  Install just: https://just.systems/man/en/pre-built-binaries.html\n\n  This tox env can be run using just via:\n    \033[1mjust test-tests\033[0m\n\n'
+    false
 
-[testenv:py3]
-description = Fill the tests using EELS (with Python)
-dependency_groups =
-    test
+[testenv:tests_pytest_pypy3]
 commands =
-    fill \
-        -m "not slow and not benchmark" \
-        # loadgroup: serialize xdist_group("bigmem") tests onto one worker to limit peak memory
-        -n {env:PYTEST_XDIST_AUTO_NUM_WORKERS:6} --dist=loadgroup \
-        --skip-index \
-        --cov-config=pyproject.toml \
-        --cov=ethereum \
-        --cov-report=term \
-        --cov-report "xml:{toxworkdir}/coverage.xml" \
-        --no-cov-on-fail \
-        --cov-branch \
-        --basetemp="{temp_dir}/pytest" \
-        --log-to "{toxworkdir}/logs" \
-        --clean \
-        --until Amsterdam \
-        --durations=50 \
-        --ignore=tests/ported_static \
-        {posargs} \
-        tests
+    printf '\n\033[1m  execution-specs has migrated from tox to just.\033[0m\n  Install just: https://just.systems/man/en/pre-built-binaries.html\n\n  This tox env can be run using just via:\n    \033[1mjust test-tests-pypy\033[0m\n\n'
+    false
 
-[testenv:pypy3]
-description = Fill the tests using EELS (with PyPy)
-# see comment for tests_pytest_pypy3
-dependency_groups =
-    test
-passenv =
-    PYPY_GC_MAX
-    PYPY_GC_MIN
+[testenv:tests_benchmark_pytest_py3]
 commands =
-    fill \
-        --skip-index \
-        --no-html \
-        --tb=no \
-        --show-capture=no \
-        --disable-warnings \
-        -m "json_loader and not derived_test" \
-        -n auto --maxprocesses 7 \
-        # loadgroup: serialize xdist_group("bigmem") tests onto one worker to limit peak memory
-        --dist=loadgroup \
-        --basetemp="{temp_dir}/pytest" \
-        --log-to "{toxworkdir}/logs" \
-        --clean \
-        --until Amsterdam \
-        --ignore=tests/ported_static \
-        {posargs} \
-        tests
+    printf '\n\033[1m  execution-specs has migrated from tox to just.\033[0m\n  Install just: https://just.systems/man/en/pre-built-binaries.html\n\n  This tox env can be run using just via:\n    \033[1mjust test-tests-bench\033[0m\n\n'
+    false
 
 [testenv:benchmark-gas-values]
-description = Run benchmark tests with `--gas-benchmark-values`
-dependency_groups =
-    test
-passenv =
-    EVM_BIN
 commands =
-    fill \
-        --evm-bin={env:EVM_BIN:evm} \
-        --gas-benchmark-values 1 \
-        --generate-pre-alloc-groups \
-        --fork Osaka \
-        -m "benchmark and not slow" \
-        -n auto --maxprocesses 10 --dist=loadgroup \
-        --basetemp="{temp_dir}/pytest" \
-        --log-to "{toxworkdir}/logs" \
-        --clean \
-        {posargs} \
-        tests/benchmark
+    printf '\n\033[1m  execution-specs has migrated from tox to just.\033[0m\n  Install just: https://just.systems/man/en/pre-built-binaries.html\n\n  This tox env can be run using just via:\n    \033[1mjust bench-gas\033[0m\n\n'
+    false
 
 [testenv:benchmark-fixed-opcode-cli]
-description = Run benchmark tests with `--fixed-opcode-count 1`
-dependency_groups =
-    test
-passenv =
-    EVM_BIN
 commands =
-    fill \
-        --evm-bin={env:EVM_BIN:evm} \
-        --fixed-opcode-count 1 \
-        --fork Osaka \
-        -m repricing \
-        -n auto --maxprocesses 10 --dist=loadgroup \
-        # TODO: remove skip once working for all precompiles PR#1955
-        -k "not test_alt_bn128 and not test_bls12_381 and not test_modexp" \
-        --basetemp="{temp_dir}/pytest" \
-        --log-to "{toxworkdir}/logs" \
-        --clean \
-        {posargs} \
-        tests/benchmark
+    printf '\n\033[1m  execution-specs has migrated from tox to just.\033[0m\n  Install just: https://just.systems/man/en/pre-built-binaries.html\n\n  This tox env can be run using just via:\n    \033[1mjust bench-opcode\033[0m\n\n'
+    false
 
 [testenv:benchmark-fixed-opcode-config]
-description = Run `benchmark_parser` and the benchmark tests using the generated file
-dependency_groups =
-    test
-passenv =
-    EVM_BIN
 commands =
-    benchmark_parser
-    fill \
-        --evm-bin={env:EVM_BIN:evm} \
-        --fixed-opcode-count \
-        --fork Osaka \
-        -m repricing \
-        -n auto --maxprocesses 10 --dist=loadgroup \
-        # TODO: remove skip once working for all precompiles PR#1955
-        -k "not test_alt_bn128 and not test_bls12_381 and not test_modexp" \
-        --basetemp="{temp_dir}/pytest" \
-        --log-to "{toxworkdir}/logs" \
-        --clean \
-        {posargs} \
-        tests/benchmark
+    printf '\n\033[1m  execution-specs has migrated from tox to just.\033[0m\n  Install just: https://just.systems/man/en/pre-built-binaries.html\n\n  This tox env can be run using just via:\n    \033[1mjust bench-opcode-config\033[0m\n\n'
+    false
 
 [testenv:spec-docs]
-description = Generate documentation for the specification code using docc
-basepython = python3
-passenv = DOCC_SKIP_DIFFS
 commands =
-    docc --output "{toxworkdir}/docs"
-    python -c 'import pathlib; print("documentation available under file://\{0\}".format(pathlib.Path(r"{toxworkdir}") / "docs" / "index.html"))'
+    printf '\n\033[1m  execution-specs has migrated from tox to just.\033[0m\n  Install just: https://just.systems/man/en/pre-built-binaries.html\n\n  This tox env can be run using just via:\n    \033[1mjust docs-spec\033[0m\n\n'
+    false
 
 [testenv:mkdocs]
-description = Build HTML site documentation with mkdocs
-setenv =
-    GEN_TEST_DOC_VERSION = "tox"
-    # Set DYLD_FALLBACK_LIBRARY_PATH: Required for `cairosvg` so tox can find `libcairo-2`?
-    # https://squidfunk.github.io/mkdocs-material/plugins/requirements/image-processing/?h=cairo#cairo-library-was-not-found
-    DYLD_FALLBACK_LIBRARY_PATH = /opt/homebrew/lib
 commands =
-    mkdocs build --strict
-
-[testenv:changelog]
-description = Validate docs/CHANGELOG.md entries
-commands = validate_changelog
+    printf '\n\033[1m  execution-specs has migrated from tox to just.\033[0m\n  Install just: https://just.systems/man/en/pre-built-binaries.html\n\n  This tox env can be run using just via:\n    \033[1mjust docs\033[0m\n\n'
+    false
 
 [testenv:markdownlint]
-description = Lint markdown files (markdownlint)
-commands = markdownlintcli2_soft_fail
+commands =
+    printf '\n\033[1m  execution-specs has migrated from tox to just.\033[0m\n  Install just: https://just.systems/man/en/pre-built-binaries.html\n\n  This tox env can be run using just via:\n    \033[1mjust lint-md\033[0m\n\n'
+    false
diff --git a/uv.lock b/uv.lock
index ad3baf975c4..0a19f45b03b 100644
--- a/uv.lock
+++ b/uv.lock
@@ -737,7 +737,7 @@ wheels = [
 
 [[package]]
 name = "docc"
-version = "0.4.1"
+version = "0.6.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "importlib-resources" },
@@ -749,9 +749,9 @@ dependencies = [
     { name = "tomli" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/5e/32/836130b1f381d7a268eeef4e980b27d73b6484ac1b8eaef418fc0acecd1c/docc-0.4.1.tar.gz", hash = "sha256:789d2c3fef02f52f485ba310e651b3390b94ea43b0b309c53513c85829348f35", size = 70249, upload-time = "2026-02-24T15:52:48.949Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/a6/e2/47252138c9978ca2ab7a3637bba1464f8da2d1f34e1886babaef0459c1b6/docc-0.6.1.tar.gz", hash = "sha256:c4cc94f542afa76e2d9b10ce5e43ec4cdddc87897dde52a2a0f07a1db0af9499", size = 74268, upload-time = "2026-05-14T23:51:53.862Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/eb/ad/6ea54fee2ea762b257a654827cb74ae10b515cdddb732dace59cccd406aa/docc-0.4.1-py3-none-any.whl", hash = "sha256:6dd25f72a010332f535e008b1693e41ce83da0941f79eee7c1b402c880ca3c95", size = 97150, upload-time = "2026-02-24T15:52:47.718Z" },
+    { url = "https://files.pythonhosted.org/packages/89/0b/56f73ba7767f53796d43e86e2a3e77d04211b214f09b8fc96cbb5fb110c5/docc-0.6.1-py3-none-any.whl", hash = "sha256:c058a8207603270d437d4f1887eb850ddfc2519f336627d4f373d87d296a0198", size = 100269, upload-time = "2026-05-14T23:51:52.256Z" },
 ]
 
 [[package]]
@@ -944,8 +944,8 @@ requires-dist = [
     { name = "coincurve", specifier = ">=20,<21" },
     { name = "cryptography", specifier = ">=45.0.1,<46" },
     { name = "ethash", marker = "extra == 'optimized'", specifier = ">=1.1.0,<2" },
-    { name = "ethereum-rlp", specifier = ">=0.1.5,<0.2" },
-    { name = "ethereum-types", specifier = ">=0.3.0,<0.4" },
+    { name = "ethereum-rlp", specifier = ">=0.1.6,<0.2" },
+    { name = "ethereum-types", specifier = ">=0.4.1,<0.5" },
     { name = "libcst", specifier = ">=1.8,<2" },
     { name = "platformdirs", specifier = ">=4.2,<5" },
     { name = "py-ecc", specifier = ">=8.0.0b2,<9" },
@@ -967,7 +967,7 @@ dev = [
     { name = "cairosvg", specifier = ">=2.7.0,<3" },
     { name = "codespell", specifier = "==2.4.1" },
     { name = "codespell", specifier = ">=2.4.1,<3" },
-    { name = "docc", specifier = ">=0.4.0,<0.5.0" },
+    { name = "docc", specifier = ">=0.6.1,<0.7.0" },
     { name = "ethereum-execution", extras = ["optimized"] },
     { name = "ethereum-execution-testing", editable = "packages/testing" },
     { name = "filelock", specifier = ">=3.15.1,<4" },
@@ -989,7 +989,7 @@ dev = [
     { name = "mkdocs-material-extensions", specifier = ">=1.1.1,<2" },
     { name = "mkdocstrings", specifier = ">=0.21.2,<1" },
     { name = "mkdocstrings-python", specifier = ">=1.0.0,<2" },
-    { name = "mypy", specifier = "==1.17.0" },
+    { name = "mypy", specifier = "==1.20.0" },
     { name = "pillow", specifier = ">=12,<13" },
     { name = "psutil", specifier = ">=7.2.2" },
     { name = "pyflakes", specifier = ">=3.0" },
@@ -1005,13 +1005,13 @@ dev = [
     { name = "vulture", specifier = "==2.14.0" },
 ]
 doc = [
-    { name = "docc", specifier = ">=0.4.0,<0.5.0" },
+    { name = "docc", specifier = ">=0.6.1,<0.7.0" },
     { name = "fladrif", specifier = ">=0.2.0,<0.3.0" },
     { name = "mistletoe", specifier = ">=1.5.0,<2" },
 ]
 lint = [
     { name = "codespell", specifier = "==2.4.1" },
-    { name = "mypy", specifier = "==1.17.0" },
+    { name = "mypy", specifier = "==1.20.0" },
     { name = "ruff", specifier = "==0.13.2" },
     { name = "types-requests", specifier = ">=2.31,<2.33" },
     { name = "vulture", specifier = "==2.14.0" },
@@ -1064,6 +1064,7 @@ dependencies = [
     { name = "ethereum-types" },
     { name = "filelock" },
     { name = "gitpython" },
+    { name = "ijson" },
     { name = "jinja2" },
     { name = "joblib" },
     { name = "platformdirs" },
@@ -1112,11 +1113,12 @@ requires-dist = [
     { name = "colorlog", specifier = ">=6.7.0,<7" },
     { name = "eth-abi", specifier = ">=5.2.0" },
     { name = "ethereum-execution", editable = "." },
-    { name = "ethereum-hive", specifier = ">=0.1.0a1,<1.0.0" },
-    { name = "ethereum-rlp", specifier = ">=0.1.5,<0.2" },
-    { name = "ethereum-types", specifier = ">=0.3.0,<0.4" },
+    { name = "ethereum-hive", specifier = ">=0.1.0a5,<1.0.0" },
+    { name = "ethereum-rlp", specifier = ">=0.1.6,<0.2" },
+    { name = "ethereum-types", specifier = ">=0.4.1,<0.5" },
     { name = "filelock", specifier = ">=3.15.1,<4" },
     { name = "gitpython", specifier = ">=3.1.31,<4" },
+    { name = "ijson", specifier = ">=3.3,<4" },
     { name = "jinja2", specifier = ">=3,<4" },
     { name = "joblib", specifier = ">=1.4.2" },
     { name = "platformdirs", specifier = ">=4.2,<5" },
@@ -1143,13 +1145,13 @@ requires-dist = [
 
 [package.metadata.requires-dev]
 dev = [
-    { name = "mypy", specifier = "==1.17.0" },
+    { name = "mypy", specifier = "==1.20.0" },
     { name = "pytest-cov", specifier = ">=4.1.0,<5" },
     { name = "ruff", specifier = "==0.13.2" },
     { name = "types-requests", specifier = ">=2.31,<2.33" },
 ]
 lint = [
-    { name = "mypy", specifier = "==1.17.0" },
+    { name = "mypy", specifier = "==1.20.0" },
     { name = "ruff", specifier = "==0.13.2" },
     { name = "types-requests", specifier = ">=2.31,<2.33" },
 ]
@@ -1157,39 +1159,40 @@ test = [{ name = "pytest-cov", specifier = ">=4.1.0,<5" }]
 
 [[package]]
 name = "ethereum-hive"
-version = "0.1.0a2"
+version = "0.1.0a5"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "requests" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/b3/9b/f15c86866245ad5c22dbc98f433158fdeaab3e96eae4efd1bf6a12a7717c/ethereum_hive-0.1.0a2.tar.gz", hash = "sha256:9ddc08a8dfe2828a9a4abfca1c0972f88882fa06fb6a3e111ec013b66906f843", size = 74796, upload-time = "2025-07-15T05:38:36.983Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/40/a8/95676acd86095a5dcf5dacfa5a991175b3a547dcd5729735fea777b8feec/ethereum_hive-0.1.0a5.tar.gz", hash = "sha256:bf91d3144c263a1a6407c931b3864ab3edd40bc5c34b812e571e7c49cc70f9eb", size = 75064, upload-time = "2026-03-11T07:36:24.532Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/74/60/1daf13c49bbefed6b67dd8a5d1280386e1ad22c9ec61737d44047064632e/ethereum_hive-0.1.0a2-py3-none-any.whl", hash = "sha256:0b0253146428240725e2b83a86bbc9eab975c460b8d76ce3937ba5295aa2448b", size = 37578, upload-time = "2025-07-15T05:38:35.334Z" },
+    { url = "https://files.pythonhosted.org/packages/73/95/986727018ac0401562d91961e2f46462ed65a08e2d5162a255d9f871a7ad/ethereum_hive-0.1.0a5-py3-none-any.whl", hash = "sha256:3225747ed83a9124a697db0ab8d736c4820117462e64aa3395bbc1588c4d40d0", size = 37589, upload-time = "2026-03-11T07:36:23.286Z" },
 ]
 
 [[package]]
 name = "ethereum-rlp"
-version = "0.1.5"
+version = "0.1.6"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "ethereum-types" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/27/2b/22ec601ed0924f8a54f9e91381e20bb8e98ad1afc8f23799826bb2c313e6/ethereum_rlp-0.1.5.tar.gz", hash = "sha256:679d4fa1163e32bc8c288680f29077980aa2f6b5321d71e8e2bff55c5233b7bd", size = 13724, upload-time = "2026-02-20T04:25:43.158Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/54/55/1fab3dea8f912459751cb39ad4500e165344963af2dbd5fa699befe3e8d4/ethereum_rlp-0.1.6.tar.gz", hash = "sha256:ede36f53b53c8da21f19259a676eed8790950d47f0b42cb928ac8a3c562282f3", size = 14015, upload-time = "2026-06-03T23:12:02.472Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/ce/bc/c6006debf372615af7c911e815c79f63395099defed3c8308db37d31511a/ethereum_rlp-0.1.5-py3-none-any.whl", hash = "sha256:4cbb84ec4d4e65e4af3b49757ecd623e04520cbae521ac5386151149ad0a1b7a", size = 9898, upload-time = "2026-02-20T04:25:42.074Z" },
+    { url = "https://files.pythonhosted.org/packages/37/ab/b9b2ff2d37b7feabe3dcdee7d5170cf0e71b849a073bda8857c0afb54962/ethereum_rlp-0.1.6-py3-none-any.whl", hash = "sha256:f4144caa96b975720c62b967bbfd6c98601e95ee3c36457ece11ef4ce0cffa04", size = 9944, upload-time = "2026-06-03T23:12:01.492Z" },
 ]
 
 [[package]]
 name = "ethereum-types"
-version = "0.3.0"
+version = "0.4.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
+    { name = "mypy-extensions" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/90/90/32d9440ae5b2ac97d873862c9cbbacd28c82cf6d471efb54ef3051700739/ethereum_types-0.3.0.tar.gz", hash = "sha256:e5324efd269a0f66993163366543e39aae474a53f48031c31acec956867d8995", size = 15697, upload-time = "2026-02-20T03:47:40.169Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/e5/bf/6c15ea3372a19b4df9d47ba08d32ad0751c059c31c7f15842cf12e5736bd/ethereum_types-0.4.1.tar.gz", hash = "sha256:c0eee4464c42ed8217dfc927400db98157cc8b09252ecefa703176496dbe3b4d", size = 67752, upload-time = "2026-06-08T16:57:04.424Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/73/3f/e9c35c2d879cd0084e9eb59e0e650e1688cc75ec3776291d92d4b7989fff/ethereum_types-0.3.0-py3-none-any.whl", hash = "sha256:ade1aae9df702067387b1e100f7b65fe96c87b1d7731fb7838cca79e84e51cca", size = 10685, upload-time = "2026-02-20T03:47:39.065Z" },
+    { url = "https://files.pythonhosted.org/packages/78/f6/466c684cee5eacd6413f33284a8bd45686564e7c5974d5cda331c9577c4e/ethereum_types-0.4.1-py3-none-any.whl", hash = "sha256:33de3e2a0c0e57ea1b67802485de556b92d557aae7c8c640070800f2b4f639e3", size = 12162, upload-time = "2026-06-08T16:57:05.382Z" },
 ]
 
 [[package]]
@@ -1298,6 +1301,86 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/0e/61/66938bbb5fc52dbdf84594873d5b51fb1f7c7794e9c0f5bd885f30bc507b/idna-3.11-py3-none-any.whl", hash = "sha256:771a87f49d9defaf64091e6e6fe9c18d4833f140bd19464795bc32d966ca37ea", size = 71008, upload-time = "2025-10-12T14:55:18.883Z" },
 ]
 
+[[package]]
+name = "ijson"
+version = "3.5.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f4/57/60d1a6a512f2f0508d0bc8b4f1cc5616fd3196619b66bd6a01f9155a1292/ijson-3.5.0.tar.gz", hash = "sha256:94688760720e3f5212731b3cb8d30267f9a045fb38fb3870254e7b9504246f31", size = 68658, upload-time = "2026-02-24T03:58:30.974Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/65/da/644343198abca5e0f6e2486063f8d8f3c443ca0ef5e5c890e51ef6032e33/ijson-3.5.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:5616311404b858d32740b7ad8b9a799c62165f5ecb85d0a8ed16c21665a90533", size = 88964, upload-time = "2026-02-24T03:56:53.099Z" },
+    { url = "https://files.pythonhosted.org/packages/5b/63/8621190aa2baf96156dfd4c632b6aa9f1464411e50b98750c09acc0505ea/ijson-3.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e9733f94029dd41702d573ef64752e2556e72aea14623d6dbb7a44ca1ccf30fd", size = 60582, upload-time = "2026-02-24T03:56:54.261Z" },
+    { url = "https://files.pythonhosted.org/packages/20/31/6a3f041fdd17dacff33b7d7d3ba3df6dca48740108340c6042f974b2ad20/ijson-3.5.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:db8398c6721b98412a4f618da8022550c8b9c5d9214040646071b5deb4d4a393", size = 60632, upload-time = "2026-02-24T03:56:55.159Z" },
+    { url = "https://files.pythonhosted.org/packages/e4/68/474541998abbdecfd46a744536878335de89aceb9f085bff1aaf35575ceb/ijson-3.5.0-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:c061314845c08163b1784b6076ea5f075372461a32e6916f4e5f211fd4130b64", size = 131988, upload-time = "2026-02-24T03:56:56.35Z" },
+    { url = "https://files.pythonhosted.org/packages/cd/32/e05ff8b72a44fe9d192f41c5dcbc35cfa87efc280cdbfe539ffaf4a7535e/ijson-3.5.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1111a1c5ac79119c5d6e836f900c1a53844b50a18af38311baa6bb61e2645aca", size = 138669, upload-time = "2026-02-24T03:56:57.555Z" },
+    { url = "https://files.pythonhosted.org/packages/49/b5/955a83b031102c7a602e2c06d03aff0a0e584212f09edb94ccc754d203ac/ijson-3.5.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1e74aff8c681c24002b61b1822f9511d4c384f324f7dbc08c78538e01fdc9fcb", size = 135093, upload-time = "2026-02-24T03:56:59.267Z" },
+    { url = "https://files.pythonhosted.org/packages/e8/f2/30250cfcb4d2766669b31f6732689aab2bb91de426a15a3ebe482df7ee48/ijson-3.5.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:739a7229b1b0cc5f7e2785a6e7a5fc915e850d3fed9588d0e89a09f88a417253", size = 138715, upload-time = "2026-02-24T03:57:00.491Z" },
+    { url = "https://files.pythonhosted.org/packages/a2/05/785a145d7e75e04e04480d59b6323cd4b1d9013a6cd8643fa635fbc93490/ijson-3.5.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:ef88712160360cab3ca6471a4e5418243f8b267cf1fe1620879d1b5558babc71", size = 133194, upload-time = "2026-02-24T03:57:01.759Z" },
+    { url = "https://files.pythonhosted.org/packages/14/eb/80d6f8a748dead4034cea0939494a67d10ccf88d6413bf6e860393139676/ijson-3.5.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:6ca0d1b6b5f8166a6248f4309497585fb8553b04bc8179a0260fad636cfdb798", size = 135588, upload-time = "2026-02-24T03:57:03.131Z" },
+    { url = "https://files.pythonhosted.org/packages/ee/a8/bbc21f9400ebdbca48fab272593e0d1f875691be1e927d264d90d48b8c47/ijson-3.5.0-cp311-cp311-win32.whl", hash = "sha256:966039cf9047c7967febf7b9a52ec6f38f5464a4c7fbb5565e0224b7376fefff", size = 52721, upload-time = "2026-02-24T03:57:04.365Z" },
+    { url = "https://files.pythonhosted.org/packages/0d/2e/4e8c0208b8f920ee80c88c956f93e78318f2cfb646455353b182738b490c/ijson-3.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:6bad6a1634cb7c9f3f4c7e52325283b35b565f5b6cc27d42660c6912ce883422", size = 55121, upload-time = "2026-02-24T03:57:05.498Z" },
+    { url = "https://files.pythonhosted.org/packages/aa/17/9c63c7688025f3a8c47ea717b8306649c8c7244e49e20a2be4e3515dc75c/ijson-3.5.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:1ebefbe149a6106cc848a3eaf536af51a9b5ccc9082de801389f152dba6ab755", size = 88536, upload-time = "2026-02-24T03:57:06.809Z" },
+    { url = "https://files.pythonhosted.org/packages/6f/dd/e15c2400244c117b06585452ebc63ae254f5a6964f712306afd1422daae0/ijson-3.5.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:19e30d9f00f82e64de689c0b8651b9cfed879c184b139d7e1ea5030cec401c21", size = 60499, upload-time = "2026-02-24T03:57:09.155Z" },
+    { url = "https://files.pythonhosted.org/packages/77/a9/bf4fe3538a0c965f16b406f180a06105b875da83f0743e36246be64ef550/ijson-3.5.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a04a33ee78a6f27b9b8528c1ca3c207b1df3b8b867a4cf2fcc4109986f35c227", size = 60330, upload-time = "2026-02-24T03:57:10.574Z" },
+    { url = "https://files.pythonhosted.org/packages/31/76/6f91bdb019dd978fce1bc5ea1cd620cfc096d258126c91db2c03a20a7f34/ijson-3.5.0-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:7d48dc2984af02eb3c56edfb3f13b3f62f2f3e4fe36f058c8cfc75d93adf4fed", size = 138977, upload-time = "2026-02-24T03:57:11.932Z" },
+    { url = "https://files.pythonhosted.org/packages/11/be/bbc983059e48a54b0121ee60042979faed7674490bbe7b2c41560db3f436/ijson-3.5.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f1e73a44844d9adbca9cf2c4132cd875933e83f3d4b23881fcaf82be83644c7d", size = 149785, upload-time = "2026-02-24T03:57:13.255Z" },
+    { url = "https://files.pythonhosted.org/packages/6d/81/2fee58f9024a3449aee83edfa7167fb5ccd7e1af2557300e28531bb68e16/ijson-3.5.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7389a56b8562a19948bdf1d7bae3a2edc8c7f86fb59834dcb1c4c722818e645a", size = 149729, upload-time = "2026-02-24T03:57:14.191Z" },
+    { url = "https://files.pythonhosted.org/packages/c7/56/f1706761fcc096c9d414b3dcd000b1e6e5c24364c21cfba429837f98ee8d/ijson-3.5.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3176f23f8ebec83f374ed0c3b4e5a0c4db7ede54c005864efebbed46da123608", size = 150697, upload-time = "2026-02-24T03:57:15.855Z" },
+    { url = "https://files.pythonhosted.org/packages/d9/6e/ee0d9c875a0193b632b3e9ccd1b22a50685fb510256ad57ba483b6529f77/ijson-3.5.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:6babd88e508630c6ef86c9bebaaf13bb2fb8ec1d8f8868773a03c20253f599bc", size = 142873, upload-time = "2026-02-24T03:57:16.831Z" },
+    { url = "https://files.pythonhosted.org/packages/d2/bf/f9d4399d0e6e3fd615035290a71e97c843f17f329b43638c0a01cf112d73/ijson-3.5.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:dc1b3836b174b6db2fa8319f1926fb5445abd195dc963368092103f8579cb8ed", size = 151583, upload-time = "2026-02-24T03:57:17.757Z" },
+    { url = "https://files.pythonhosted.org/packages/b2/71/a7254a065933c0e2ffd3586f46187d84830d3d7b6f41cfa5901820a4f87d/ijson-3.5.0-cp312-cp312-win32.whl", hash = "sha256:6673de9395fb9893c1c79a43becd8c8fbee0a250be6ea324bfd1487bb5e9ee4c", size = 53079, upload-time = "2026-02-24T03:57:18.703Z" },
+    { url = "https://files.pythonhosted.org/packages/8f/7b/2edca79b359fc9f95d774616867a03ecccdf333797baf5b3eea79733918c/ijson-3.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:f4f7fabd653459dcb004175235f310435959b1bb5dfa8878578391c6cc9ad944", size = 55500, upload-time = "2026-02-24T03:57:20.428Z" },
+    { url = "https://files.pythonhosted.org/packages/a2/71/d67e764a712c3590627480643a3b51efcc3afa4ef3cb54ee4c989073c97e/ijson-3.5.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:e9cedc10e40dd6023c351ed8bfc7dcfce58204f15c321c3c1546b9c7b12562a4", size = 88544, upload-time = "2026-02-24T03:57:21.293Z" },
+    { url = "https://files.pythonhosted.org/packages/1a/39/f1c299371686153fa3cf5c0736b96247a87a1bee1b7145e6d21f359c505a/ijson-3.5.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:3647649f782ee06c97490b43680371186651f3f69bebe64c6083ee7615d185e5", size = 60495, upload-time = "2026-02-24T03:57:22.501Z" },
+    { url = "https://files.pythonhosted.org/packages/16/94/b1438e204d75e01541bebe3e668fe3e68612d210e9931ae1611062dd0a56/ijson-3.5.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:90e74be1dce05fce73451c62d1118671f78f47c9f6be3991c82b91063bf01fc9", size = 60325, upload-time = "2026-02-24T03:57:23.332Z" },
+    { url = "https://files.pythonhosted.org/packages/30/e2/4aa9c116fa86cc8b0f574f3c3a47409edc1cd4face05d0e589a5a176b05d/ijson-3.5.0-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:78e9ad73e7be2dd80627504bd5cbf512348c55ce2c06e362ed7683b5220e8568", size = 138774, upload-time = "2026-02-24T03:57:24.683Z" },
+    { url = "https://files.pythonhosted.org/packages/d2/d2/738b88752a70c3be1505faa4dcd7110668c2712e582a6a36488ed1e295d4/ijson-3.5.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9577449313cc94be89a4fe4b3e716c65f09cc19636d5a6b2861c4e80dddebd58", size = 149820, upload-time = "2026-02-24T03:57:26.062Z" },
+    { url = "https://files.pythonhosted.org/packages/ed/df/0b3ab9f393ca8f72ea03bc896ba9fdc987e90ae08cdb51c32a4ee0c14d5e/ijson-3.5.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:3e4c1178fb50aff5f5701a30a5152ead82a14e189ce0f6102fa1b5f10b2f54ff", size = 149747, upload-time = "2026-02-24T03:57:27.308Z" },
+    { url = "https://files.pythonhosted.org/packages/cc/a3/b0037119f75131b78cb00acc2657b1a9d0435475f1f2c5f8f5a170b66b9c/ijson-3.5.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:0eb402ab026ffb37a918d75af2b7260fe6cfbce13232cc83728a714dd30bd81d", size = 151027, upload-time = "2026-02-24T03:57:28.522Z" },
+    { url = "https://files.pythonhosted.org/packages/22/a0/cb344de1862bf09d8f769c9d25c944078c87dd59a1b496feec5ad96309a4/ijson-3.5.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:5b08ee08355f9f729612a8eb9bf69cc14f9310c3b2a487c6f1c3c65d85216ec4", size = 142996, upload-time = "2026-02-24T03:57:29.774Z" },
+    { url = "https://files.pythonhosted.org/packages/ca/32/a8ffd67182e02ea61f70f62daf43ded4fa8a830a2520a851d2782460aba8/ijson-3.5.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:bda62b6d48442903e7bf56152108afb7f0f1293c2b9bef2f2c369defea76ab18", size = 152068, upload-time = "2026-02-24T03:57:30.969Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/d1/3578df8e75d446aab0ae92e27f641341f586b85e1988536adebc65300cb4/ijson-3.5.0-cp313-cp313-win32.whl", hash = "sha256:8d073d9b13574cfa11083cc7267c238b7a6ed563c2661e79192da4a25f09c82c", size = 53065, upload-time = "2026-02-24T03:57:31.93Z" },
+    { url = "https://files.pythonhosted.org/packages/fb/a2/f7cdaf5896710da3e69e982e44f015a83d168aa0f3a89b6f074b5426779d/ijson-3.5.0-cp313-cp313-win_amd64.whl", hash = "sha256:2419f9e32e0968a876b04d8f26aeac042abd16f582810b576936bbc4c6015069", size = 55499, upload-time = "2026-02-24T03:57:32.773Z" },
+    { url = "https://files.pythonhosted.org/packages/42/65/13e2492d17e19a2084523e18716dc2809159f2287fd2700c735f311e76c4/ijson-3.5.0-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:4d4b0cd676b8c842f7648c1a783448fac5cd3b98289abd83711b3e275e143524", size = 93019, upload-time = "2026-02-24T03:57:33.976Z" },
+    { url = "https://files.pythonhosted.org/packages/33/92/483fc97ece0c3f1cecabf48f6a7a36e89d19369eec462faaeaa34c788992/ijson-3.5.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:252dec3680a48bb82d475e36b4ae1b3a9d7eb690b951bb98a76c5fe519e30188", size = 62714, upload-time = "2026-02-24T03:57:34.819Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/88/793fe020a0fe9d9eed4c285cf4a5cfdb0a935708b3bde0d72f35c794b513/ijson-3.5.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:aa1b5dca97d323931fde2501172337384c958914d81a9dac7f00f0d4bfc76bc7", size = 62460, upload-time = "2026-02-24T03:57:35.874Z" },
+    { url = "https://files.pythonhosted.org/packages/51/69/f1a2690aa8d4df1f4e262b385e65a933ffdc250b091531bac9a449c19e16/ijson-3.5.0-cp313-cp313t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:7a5ec7fd86d606094bba6f6f8f87494897102fa4584ef653f3005c51a784c320", size = 199273, upload-time = "2026-02-24T03:57:37.07Z" },
+    { url = "https://files.pythonhosted.org/packages/ea/a2/f1346d5299e79b988ab472dc773d5381ec2d57c23cb2f1af3ede4a810e62/ijson-3.5.0-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:009f41443e1521847701c6d87fa3923c0b1961be3c7e7de90947c8cb92ea7c44", size = 216884, upload-time = "2026-02-24T03:57:38.346Z" },
+    { url = "https://files.pythonhosted.org/packages/28/3c/8b637e869be87799e6c2c3c275a30a546f086b1aed77e2b7f11512168c5a/ijson-3.5.0-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e4c3651d1f9fe2839a93fdf8fd1d5ca3a54975349894249f3b1b572bcc4bd577", size = 207306, upload-time = "2026-02-24T03:57:39.718Z" },
+    { url = "https://files.pythonhosted.org/packages/7f/7c/18b1c1df6951ca056782d7580ec40cea4ff9a27a0947d92640d1cc8c4ae3/ijson-3.5.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:945b7abcfcfeae2cde17d8d900870f03536494245dda7ad4f8d056faa303256c", size = 211364, upload-time = "2026-02-24T03:57:40.953Z" },
+    { url = "https://files.pythonhosted.org/packages/f3/55/e795812e82851574a9dba8a53fde045378f531ef14110c6fb55dbd23b443/ijson-3.5.0-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:0574b0a841ff97495c13e9d7260fbf3d85358b061f540c52a123db9dbbaa2ed6", size = 200608, upload-time = "2026-02-24T03:57:42.272Z" },
+    { url = "https://files.pythonhosted.org/packages/5c/cd/013c85b4749b57a4cb4c2670014d1b32b8db4ab1a7be92ea7aeb5d7fe7b5/ijson-3.5.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:f969ffb2b89c5cdf686652d7fb66252bc72126fa54d416317411497276056a18", size = 205127, upload-time = "2026-02-24T03:57:43.286Z" },
+    { url = "https://files.pythonhosted.org/packages/0e/7c/faf643733e3ab677f180018f6a855c4ef70b7c46540987424c563c959e42/ijson-3.5.0-cp313-cp313t-win32.whl", hash = "sha256:59d3f9f46deed1332ad669518b8099920512a78bda64c1f021fcd2aff2b36693", size = 55282, upload-time = "2026-02-24T03:57:44.353Z" },
+    { url = "https://files.pythonhosted.org/packages/69/22/94ddb47c24b491377aca06cd8fc9202cad6ab50619842457d2beefde21ea/ijson-3.5.0-cp313-cp313t-win_amd64.whl", hash = "sha256:5c2839fa233746d8aad3b8cd2354e441613f5df66d721d59da4a09394bd1db2b", size = 58016, upload-time = "2026-02-24T03:57:45.237Z" },
+    { url = "https://files.pythonhosted.org/packages/7a/93/0868efe753dc1df80cc405cf0c1f2527a6991643607c741bff8dcb899b3b/ijson-3.5.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:25a5a6b2045c90bb83061df27cfa43572afa43ba9408611d7bfe237c20a731a9", size = 89094, upload-time = "2026-02-24T03:57:46.115Z" },
+    { url = "https://files.pythonhosted.org/packages/24/94/fd5a832a0df52ef5e4e740f14ac8640725d61034a1b0c561e8b5fb424706/ijson-3.5.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:8976c54c0b864bc82b951bae06567566ac77ef63b90a773a69cd73aab47f4f4f", size = 60715, upload-time = "2026-02-24T03:57:47.552Z" },
+    { url = "https://files.pythonhosted.org/packages/70/79/1b9a90af5732491f9eec751ee211b86b11011e1158c555c06576d52c3919/ijson-3.5.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:859eb2038f7f1b0664df4241957694cc35e6295992d71c98659b22c69b3cbc10", size = 60638, upload-time = "2026-02-24T03:57:48.428Z" },
+    { url = "https://files.pythonhosted.org/packages/23/6f/2c551ea980fe56f68710a8d5389cfbd015fc45aaafd17c3c52c346db6aa1/ijson-3.5.0-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:c911aa02991c7c0d3639b6619b93a93210ff1e7f58bf7225d613abea10adc78e", size = 140667, upload-time = "2026-02-24T03:57:49.314Z" },
+    { url = "https://files.pythonhosted.org/packages/25/0e/27b887879ba6a5bc29766e3c5af4942638c952220fd63e1e442674f7883a/ijson-3.5.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:903cbdc350173605220edc19796fbea9b2203c8b3951fb7335abfa8ed37afda8", size = 149850, upload-time = "2026-02-24T03:57:50.329Z" },
+    { url = "https://files.pythonhosted.org/packages/da/1e/23e10e1bc04bf31193b21e2960dce14b17dbd5d0c62204e8401c59d62c08/ijson-3.5.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a4549d96ded5b8efa71639b2160235415f6bdb8c83367615e2dbabcb72755c33", size = 149206, upload-time = "2026-02-24T03:57:51.261Z" },
+    { url = "https://files.pythonhosted.org/packages/8e/90/e552f6495063b235cf7fa2c592f6597c057077195e517b842a0374fd470c/ijson-3.5.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:6b2dcf6349e6042d83f3f8c39ce84823cf7577eba25bac5aae5e39bbbbbe9c1c", size = 150438, upload-time = "2026-02-24T03:57:52.198Z" },
+    { url = "https://files.pythonhosted.org/packages/5c/18/45bf8f297c41b42a1c231d261141097babd953d2c28a07be57ae4c3a1a02/ijson-3.5.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:e44af39e6f8a17e5627dcd89715d8279bf3474153ff99aae031a936e5c5572e5", size = 144369, upload-time = "2026-02-24T03:57:53.22Z" },
+    { url = "https://files.pythonhosted.org/packages/9b/3a/deb9772bb2c0cead7ad64f00c3598eec9072bdf511818e70e2c512eeabbe/ijson-3.5.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:9260332304b7e7828db56d43f08fc970a3ab741bf84ff10189361ea1b60c395b", size = 151352, upload-time = "2026-02-24T03:57:54.375Z" },
+    { url = "https://files.pythonhosted.org/packages/e4/51/67f4d80cd58ad7eab0cd1af5fe28b961886338956b2f88c0979e21914346/ijson-3.5.0-cp314-cp314-win32.whl", hash = "sha256:63bc8121bb422f6969ced270173a3fa692c29d4ae30c860a2309941abd81012a", size = 53610, upload-time = "2026-02-24T03:57:55.655Z" },
+    { url = "https://files.pythonhosted.org/packages/70/d3/263672ea22983ba3940f1534316dbc9200952c1c2a2332d7a664e4eaa7ae/ijson-3.5.0-cp314-cp314-win_amd64.whl", hash = "sha256:01b6dad72b7b7df225ef970d334556dfad46c696a2c6767fb5d9ed8889728bca", size = 56301, upload-time = "2026-02-24T03:57:56.584Z" },
+    { url = "https://files.pythonhosted.org/packages/9f/d9/86f7fac35e0835faa188085ae0579e813493d5261ce056484015ad533445/ijson-3.5.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:2ea4b676ec98e374c1df400a47929859e4fa1239274339024df4716e802aa7e4", size = 93069, upload-time = "2026-02-24T03:57:57.849Z" },
+    { url = "https://files.pythonhosted.org/packages/33/d2/e7366ed9c6e60228d35baf4404bac01a126e7775ea8ce57f560125ed190a/ijson-3.5.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:014586eec043e23c80be9a923c56c3a0920a0f1f7d17478ce7bc20ba443968ef", size = 62767, upload-time = "2026-02-24T03:57:58.758Z" },
+    { url = "https://files.pythonhosted.org/packages/35/8b/3e703e8cc4b3ada79f13b28070b51d9550c578f76d1968657905857b2ddd/ijson-3.5.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:d5b8b886b0248652d437f66e7c5ac318bbdcb2c7137a7e5327a68ca00b286f5f", size = 62467, upload-time = "2026-02-24T03:58:00.261Z" },
+    { url = "https://files.pythonhosted.org/packages/21/42/0c91af32c1ee8a957fdac2e051b5780756d05fd34e4b60d94a08d51bac1d/ijson-3.5.0-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:498fd46ae2349297e43acf97cdc421e711dbd7198418677259393d2acdc62d78", size = 200447, upload-time = "2026-02-24T03:58:01.591Z" },
+    { url = "https://files.pythonhosted.org/packages/f9/80/796ea0e391b7e2d45c5b1b451734bba03f81c2984cf955ea5eaa6c4920ad/ijson-3.5.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:22a51b4f9b81f12793731cf226266d1de2112c3c04ba4a04117ad4e466897e05", size = 217820, upload-time = "2026-02-24T03:58:02.598Z" },
+    { url = "https://files.pythonhosted.org/packages/38/14/52b6613fdda4078c62eb5b4fe3efc724ddc55a4ad524c93de51830107aa3/ijson-3.5.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9636c710dc4ac4a281baa266a64f323b4cc165cec26836af702c44328b59a515", size = 208310, upload-time = "2026-02-24T03:58:04.759Z" },
+    { url = "https://files.pythonhosted.org/packages/6a/ad/8b3105a78774fd4a65e534a21d975ef3a77e189489fe3029ebcaeba5e243/ijson-3.5.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:f7168a39e8211107666d71b25693fd1b2bac0b33735ef744114c403c6cac21e1", size = 211843, upload-time = "2026-02-24T03:58:05.836Z" },
+    { url = "https://files.pythonhosted.org/packages/36/ab/a2739f6072d6e1160581bc3ed32da614c8cced023dcd519d9c5fa66e0425/ijson-3.5.0-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:8696454245415bc617ab03b0dc3ae4c86987df5dc6a90bad378fe72c5409d89e", size = 200906, upload-time = "2026-02-24T03:58:07.788Z" },
+    { url = "https://files.pythonhosted.org/packages/6d/5e/e06c2de3c3d4a9cfb655c1ad08a68fb72838d271072cdd3196576ac4431a/ijson-3.5.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:c21bfb61f71f191565885bf1bc29e0a186292d866b4880637b833848360bdc1b", size = 205495, upload-time = "2026-02-24T03:58:09.163Z" },
+    { url = "https://files.pythonhosted.org/packages/7c/11/778201eb2e202ddd76b36b0fb29bf3d8e3c167389d8aa883c62524e49f47/ijson-3.5.0-cp314-cp314t-win32.whl", hash = "sha256:a2619460d6795b70d0155e5bf016200ac8a63ab5397aa33588bb02b6c21759e6", size = 56280, upload-time = "2026-02-24T03:58:10.116Z" },
+    { url = "https://files.pythonhosted.org/packages/23/28/96711503245339084c8086b892c47415895eba49782d6cc52d9f4ee50301/ijson-3.5.0-cp314-cp314t-win_amd64.whl", hash = "sha256:4f24b78d4ef028d17eb57ad1b16c0aed4a17bdd9badbf232dc5d9305b7e13854", size = 58965, upload-time = "2026-02-24T03:58:11.278Z" },
+    { url = "https://files.pythonhosted.org/packages/d9/3b/d31ecfa63a218978617446159f3d77aab2417a5bd2885c425b176353ff78/ijson-3.5.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:d64c624da0e9d692d6eb0ff63a79656b59d76bf80773a17c5b0f835e4e8ef627", size = 57715, upload-time = "2026-02-24T03:58:24.545Z" },
+    { url = "https://files.pythonhosted.org/packages/30/51/b170e646d378e8cccf9637c05edb5419b00c2c4df64b0258c3af5355608e/ijson-3.5.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:876f7df73b7e0d6474f9caa729b9cdbfc8e76de9075a4887dfd689e29e85c4ca", size = 57205, upload-time = "2026-02-24T03:58:25.681Z" },
+    { url = "https://files.pythonhosted.org/packages/ef/83/44dbd0231b0a8c6c14d27473d10c4e27dfbce7d5d9a833c79e3e6c33eb40/ijson-3.5.0-pp311-pypy311_pp73-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:e7dbff2c8d9027809b0cde663df44f3210da10ea377121d42896fb6ee405dd31", size = 71229, upload-time = "2026-02-24T03:58:27.103Z" },
+    { url = "https://files.pythonhosted.org/packages/c8/98/cf84048b7c6cec888826e696a31f45bee7ebcac15e532b6be1fc4c2c9608/ijson-3.5.0-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4217a1edc278660679e1197c83a1a2a2d367792bfbb2a3279577f4b59b93730d", size = 71217, upload-time = "2026-02-24T03:58:28.021Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/0a/e34c729a87ff67dc6540f6bcc896626158e691d433ab57db0086d73decd2/ijson-3.5.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:04f0fc740311388ee745ba55a12292b722d6f52000b11acbb913982ba5fbdf87", size = 68618, upload-time = "2026-02-24T03:58:28.918Z" },
+    { url = "https://files.pythonhosted.org/packages/c1/0f/e849d072f2e0afe49627de3995fc9dae54b4c804c70c0840f928d95c10e1/ijson-3.5.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:fdeee6957f92e0c114f65c55cf8fe7eabb80cfacab64eea6864060913173f66d", size = 55369, upload-time = "2026-02-24T03:58:29.839Z" },
+]
+
 [[package]]
 name = "importlib-resources"
 version = "6.5.2"
@@ -1406,6 +1489,79 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/79/3c/db47e1cf0c98a13cbea2cb5611e7b6913ac5e63845b0e41ee7020b03f523/libcst-1.8.5-cp314-cp314t-win_arm64.whl", hash = "sha256:a026aaa19cb2acd8a4d9e2a215598b0a7e2c194bf4482eb9dec4d781ec6e10b2", size = 2059048, upload-time = "2025-09-26T05:29:28.425Z" },
 ]
 
+[[package]]
+name = "librt"
+version = "0.8.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/56/9c/b4b0c54d84da4a94b37bd44151e46d5e583c9534c7e02250b961b1b6d8a8/librt-0.8.1.tar.gz", hash = "sha256:be46a14693955b3bd96014ccbdb8339ee8c9346fbe11c1b78901b55125f14c73", size = 177471, upload-time = "2026-02-17T16:13:06.101Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/1d/01/0e748af5e4fee180cf7cd12bd12b0513ad23b045dccb2a83191bde82d168/librt-0.8.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:681dc2451d6d846794a828c16c22dc452d924e9f700a485b7ecb887a30aad1fd", size = 65315, upload-time = "2026-02-17T16:11:25.152Z" },
+    { url = "https://files.pythonhosted.org/packages/9d/4d/7184806efda571887c798d573ca4134c80ac8642dcdd32f12c31b939c595/librt-0.8.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a3b4350b13cc0e6f5bec8fa7caf29a8fb8cdc051a3bae45cfbfd7ce64f009965", size = 68021, upload-time = "2026-02-17T16:11:26.129Z" },
+    { url = "https://files.pythonhosted.org/packages/ae/88/c3c52d2a5d5101f28d3dc89298444626e7874aa904eed498464c2af17627/librt-0.8.1-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:ac1e7817fd0ed3d14fd7c5df91daed84c48e4c2a11ee99c0547f9f62fdae13da", size = 194500, upload-time = "2026-02-17T16:11:27.177Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/5d/6fb0a25b6a8906e85b2c3b87bee1d6ed31510be7605b06772f9374ca5cb3/librt-0.8.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:747328be0c5b7075cde86a0e09d7a9196029800ba75a1689332348e998fb85c0", size = 205622, upload-time = "2026-02-17T16:11:28.242Z" },
+    { url = "https://files.pythonhosted.org/packages/b2/a6/8006ae81227105476a45691f5831499e4d936b1c049b0c1feb17c11b02d1/librt-0.8.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f0af2bd2bc204fa27f3d6711d0f360e6b8c684a035206257a81673ab924aa11e", size = 218304, upload-time = "2026-02-17T16:11:29.344Z" },
+    { url = "https://files.pythonhosted.org/packages/ee/19/60e07886ad16670aae57ef44dada41912c90906a6fe9f2b9abac21374748/librt-0.8.1-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d480de377f5b687b6b1bc0c0407426da556e2a757633cc7e4d2e1a057aa688f3", size = 211493, upload-time = "2026-02-17T16:11:30.445Z" },
+    { url = "https://files.pythonhosted.org/packages/9c/cf/f666c89d0e861d05600438213feeb818c7514d3315bae3648b1fc145d2b6/librt-0.8.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d0ee06b5b5291f609ddb37b9750985b27bc567791bc87c76a569b3feed8481ac", size = 219129, upload-time = "2026-02-17T16:11:32.021Z" },
+    { url = "https://files.pythonhosted.org/packages/8f/ef/f1bea01e40b4a879364c031476c82a0dc69ce068daad67ab96302fed2d45/librt-0.8.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:9e2c6f77b9ad48ce5603b83b7da9ee3e36b3ab425353f695cba13200c5d96596", size = 213113, upload-time = "2026-02-17T16:11:33.192Z" },
+    { url = "https://files.pythonhosted.org/packages/9b/80/cdab544370cc6bc1b72ea369525f547a59e6938ef6863a11ab3cd24759af/librt-0.8.1-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:439352ba9373f11cb8e1933da194dcc6206daf779ff8df0ed69c5e39113e6a99", size = 212269, upload-time = "2026-02-17T16:11:34.373Z" },
+    { url = "https://files.pythonhosted.org/packages/9d/9c/48d6ed8dac595654f15eceab2035131c136d1ae9a1e3548e777bb6dbb95d/librt-0.8.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:82210adabbc331dbb65d7868b105185464ef13f56f7f76688565ad79f648b0fe", size = 234673, upload-time = "2026-02-17T16:11:36.063Z" },
+    { url = "https://files.pythonhosted.org/packages/16/01/35b68b1db517f27a01be4467593292eb5315def8900afad29fabf56304ba/librt-0.8.1-cp311-cp311-win32.whl", hash = "sha256:52c224e14614b750c0a6d97368e16804a98c684657c7518752c356834fff83bb", size = 54597, upload-time = "2026-02-17T16:11:37.544Z" },
+    { url = "https://files.pythonhosted.org/packages/71/02/796fe8f02822235966693f257bf2c79f40e11337337a657a8cfebba5febc/librt-0.8.1-cp311-cp311-win_amd64.whl", hash = "sha256:c00e5c884f528c9932d278d5c9cbbea38a6b81eb62c02e06ae53751a83a4d52b", size = 61733, upload-time = "2026-02-17T16:11:38.691Z" },
+    { url = "https://files.pythonhosted.org/packages/28/ad/232e13d61f879a42a4e7117d65e4984bb28371a34bb6fb9ca54ec2c8f54e/librt-0.8.1-cp311-cp311-win_arm64.whl", hash = "sha256:f7cdf7f26c2286ffb02e46d7bac56c94655540b26347673bea15fa52a6af17e9", size = 52273, upload-time = "2026-02-17T16:11:40.308Z" },
+    { url = "https://files.pythonhosted.org/packages/95/21/d39b0a87ac52fc98f621fb6f8060efb017a767ebbbac2f99fbcbc9ddc0d7/librt-0.8.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:a28f2612ab566b17f3698b0da021ff9960610301607c9a5e8eaca62f5e1c350a", size = 66516, upload-time = "2026-02-17T16:11:41.604Z" },
+    { url = "https://files.pythonhosted.org/packages/69/f1/46375e71441c43e8ae335905e069f1c54febee63a146278bcee8782c84fd/librt-0.8.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:60a78b694c9aee2a0f1aaeaa7d101cf713e92e8423a941d2897f4fa37908dab9", size = 68634, upload-time = "2026-02-17T16:11:43.268Z" },
+    { url = "https://files.pythonhosted.org/packages/0a/33/c510de7f93bf1fa19e13423a606d8189a02624a800710f6e6a0a0f0784b3/librt-0.8.1-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:758509ea3f1eba2a57558e7e98f4659d0ea7670bff49673b0dde18a3c7e6c0eb", size = 198941, upload-time = "2026-02-17T16:11:44.28Z" },
+    { url = "https://files.pythonhosted.org/packages/dd/36/e725903416409a533d92398e88ce665476f275081d0d7d42f9c4951999e5/librt-0.8.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:039b9f2c506bd0ab0f8725aa5ba339c6f0cd19d3b514b50d134789809c24285d", size = 209991, upload-time = "2026-02-17T16:11:45.462Z" },
+    { url = "https://files.pythonhosted.org/packages/30/7a/8d908a152e1875c9f8eac96c97a480df425e657cdb47854b9efaa4998889/librt-0.8.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5bb54f1205a3a6ab41a6fd71dfcdcbd278670d3a90ca502a30d9da583105b6f7", size = 224476, upload-time = "2026-02-17T16:11:46.542Z" },
+    { url = "https://files.pythonhosted.org/packages/a8/b8/a22c34f2c485b8903a06f3fe3315341fe6876ef3599792344669db98fcff/librt-0.8.1-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:05bd41cdee35b0c59c259f870f6da532a2c5ca57db95b5f23689fcb5c9e42440", size = 217518, upload-time = "2026-02-17T16:11:47.746Z" },
+    { url = "https://files.pythonhosted.org/packages/79/6f/5c6fea00357e4f82ba44f81dbfb027921f1ab10e320d4a64e1c408d035d9/librt-0.8.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:adfab487facf03f0d0857b8710cf82d0704a309d8ffc33b03d9302b4c64e91a9", size = 225116, upload-time = "2026-02-17T16:11:49.298Z" },
+    { url = "https://files.pythonhosted.org/packages/f2/a0/95ced4e7b1267fe1e2720a111685bcddf0e781f7e9e0ce59d751c44dcfe5/librt-0.8.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:153188fe98a72f206042be10a2c6026139852805215ed9539186312d50a8e972", size = 217751, upload-time = "2026-02-17T16:11:50.49Z" },
+    { url = "https://files.pythonhosted.org/packages/93/c2/0517281cb4d4101c27ab59472924e67f55e375bc46bedae94ac6dc6e1902/librt-0.8.1-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:dd3c41254ee98604b08bd5b3af5bf0a89740d4ee0711de95b65166bf44091921", size = 218378, upload-time = "2026-02-17T16:11:51.783Z" },
+    { url = "https://files.pythonhosted.org/packages/43/e8/37b3ac108e8976888e559a7b227d0ceac03c384cfd3e7a1c2ee248dbae79/librt-0.8.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e0d138c7ae532908cbb342162b2611dbd4d90c941cd25ab82084aaf71d2c0bd0", size = 241199, upload-time = "2026-02-17T16:11:53.561Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/5b/35812d041c53967fedf551a39399271bbe4257e681236a2cf1a69c8e7fa1/librt-0.8.1-cp312-cp312-win32.whl", hash = "sha256:43353b943613c5d9c49a25aaffdba46f888ec354e71e3529a00cca3f04d66a7a", size = 54917, upload-time = "2026-02-17T16:11:54.758Z" },
+    { url = "https://files.pythonhosted.org/packages/de/d1/fa5d5331b862b9775aaf2a100f5ef86854e5d4407f71bddf102f4421e034/librt-0.8.1-cp312-cp312-win_amd64.whl", hash = "sha256:ff8baf1f8d3f4b6b7257fcb75a501f2a5499d0dda57645baa09d4d0d34b19444", size = 62017, upload-time = "2026-02-17T16:11:55.748Z" },
+    { url = "https://files.pythonhosted.org/packages/c7/7c/c614252f9acda59b01a66e2ddfd243ed1c7e1deab0293332dfbccf862808/librt-0.8.1-cp312-cp312-win_arm64.whl", hash = "sha256:0f2ae3725904f7377e11cc37722d5d401e8b3d5851fb9273d7f4fe04f6b3d37d", size = 52441, upload-time = "2026-02-17T16:11:56.801Z" },
+    { url = "https://files.pythonhosted.org/packages/c5/3c/f614c8e4eaac7cbf2bbdf9528790b21d89e277ee20d57dc6e559c626105f/librt-0.8.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7e6bad1cd94f6764e1e21950542f818a09316645337fd5ab9a7acc45d99a8f35", size = 66529, upload-time = "2026-02-17T16:11:57.809Z" },
+    { url = "https://files.pythonhosted.org/packages/ab/96/5836544a45100ae411eda07d29e3d99448e5258b6e9c8059deb92945f5c2/librt-0.8.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:cf450f498c30af55551ba4f66b9123b7185362ec8b625a773b3d39aa1a717583", size = 68669, upload-time = "2026-02-17T16:11:58.843Z" },
+    { url = "https://files.pythonhosted.org/packages/06/53/f0b992b57af6d5531bf4677d75c44f095f2366a1741fb695ee462ae04b05/librt-0.8.1-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:eca45e982fa074090057132e30585a7e8674e9e885d402eae85633e9f449ce6c", size = 199279, upload-time = "2026-02-17T16:11:59.862Z" },
+    { url = "https://files.pythonhosted.org/packages/f3/ad/4848cc16e268d14280d8168aee4f31cea92bbd2b79ce33d3e166f2b4e4fc/librt-0.8.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0c3811485fccfda840861905b8c70bba5ec094e02825598bb9d4ca3936857a04", size = 210288, upload-time = "2026-02-17T16:12:00.954Z" },
+    { url = "https://files.pythonhosted.org/packages/52/05/27fdc2e95de26273d83b96742d8d3b7345f2ea2bdbd2405cc504644f2096/librt-0.8.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5e4af413908f77294605e28cfd98063f54b2c790561383971d2f52d113d9c363", size = 224809, upload-time = "2026-02-17T16:12:02.108Z" },
+    { url = "https://files.pythonhosted.org/packages/7a/d0/78200a45ba3240cb042bc597d6f2accba9193a2c57d0356268cbbe2d0925/librt-0.8.1-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:5212a5bd7fae98dae95710032902edcd2ec4dc994e883294f75c857b83f9aba0", size = 218075, upload-time = "2026-02-17T16:12:03.631Z" },
+    { url = "https://files.pythonhosted.org/packages/af/72/a210839fa74c90474897124c064ffca07f8d4b347b6574d309686aae7ca6/librt-0.8.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:e692aa2d1d604e6ca12d35e51fdc36f4cda6345e28e36374579f7ef3611b3012", size = 225486, upload-time = "2026-02-17T16:12:04.725Z" },
+    { url = "https://files.pythonhosted.org/packages/a3/c1/a03cc63722339ddbf087485f253493e2b013039f5b707e8e6016141130fa/librt-0.8.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:4be2a5c926b9770c9e08e717f05737a269b9d0ebc5d2f0060f0fe3fe9ce47acb", size = 218219, upload-time = "2026-02-17T16:12:05.828Z" },
+    { url = "https://files.pythonhosted.org/packages/58/f5/fff6108af0acf941c6f274a946aea0e484bd10cd2dc37610287ce49388c5/librt-0.8.1-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:fd1a720332ea335ceb544cf0a03f81df92abd4bb887679fd1e460976b0e6214b", size = 218750, upload-time = "2026-02-17T16:12:07.09Z" },
+    { url = "https://files.pythonhosted.org/packages/71/67/5a387bfef30ec1e4b4f30562c8586566faf87e47d696768c19feb49e3646/librt-0.8.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:93c2af9e01e0ef80d95ae3c720be101227edae5f2fe7e3dc63d8857fadfc5a1d", size = 241624, upload-time = "2026-02-17T16:12:08.43Z" },
+    { url = "https://files.pythonhosted.org/packages/d4/be/24f8502db11d405232ac1162eb98069ca49c3306c1d75c6ccc61d9af8789/librt-0.8.1-cp313-cp313-win32.whl", hash = "sha256:086a32dbb71336627e78cc1d6ee305a68d038ef7d4c39aaff41ae8c9aa46e91a", size = 54969, upload-time = "2026-02-17T16:12:09.633Z" },
+    { url = "https://files.pythonhosted.org/packages/5c/73/c9fdf6cb2a529c1a092ce769a12d88c8cca991194dfe641b6af12fa964d2/librt-0.8.1-cp313-cp313-win_amd64.whl", hash = "sha256:e11769a1dbda4da7b00a76cfffa67aa47cfa66921d2724539eee4b9ede780b79", size = 62000, upload-time = "2026-02-17T16:12:10.632Z" },
+    { url = "https://files.pythonhosted.org/packages/d3/97/68f80ca3ac4924f250cdfa6e20142a803e5e50fca96ef5148c52ee8c10ea/librt-0.8.1-cp313-cp313-win_arm64.whl", hash = "sha256:924817ab3141aca17893386ee13261f1d100d1ef410d70afe4389f2359fea4f0", size = 52495, upload-time = "2026-02-17T16:12:11.633Z" },
+    { url = "https://files.pythonhosted.org/packages/c9/6a/907ef6800f7bca71b525a05f1839b21f708c09043b1c6aa77b6b827b3996/librt-0.8.1-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:6cfa7fe54fd4d1f47130017351a959fe5804bda7a0bc7e07a2cdbc3fdd28d34f", size = 66081, upload-time = "2026-02-17T16:12:12.766Z" },
+    { url = "https://files.pythonhosted.org/packages/1b/18/25e991cd5640c9fb0f8d91b18797b29066b792f17bf8493da183bf5caabe/librt-0.8.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:228c2409c079f8c11fb2e5d7b277077f694cb93443eb760e00b3b83cb8b3176c", size = 68309, upload-time = "2026-02-17T16:12:13.756Z" },
+    { url = "https://files.pythonhosted.org/packages/a4/36/46820d03f058cfb5a9de5940640ba03165ed8aded69e0733c417bb04df34/librt-0.8.1-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:7aae78ab5e3206181780e56912d1b9bb9f90a7249ce12f0e8bf531d0462dd0fc", size = 196804, upload-time = "2026-02-17T16:12:14.818Z" },
+    { url = "https://files.pythonhosted.org/packages/59/18/5dd0d3b87b8ff9c061849fbdb347758d1f724b9a82241aa908e0ec54ccd0/librt-0.8.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:172d57ec04346b047ca6af181e1ea4858086c80bdf455f61994c4aa6fc3f866c", size = 206907, upload-time = "2026-02-17T16:12:16.513Z" },
+    { url = "https://files.pythonhosted.org/packages/d1/96/ef04902aad1424fd7299b62d1890e803e6ab4018c3044dca5922319c4b97/librt-0.8.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6b1977c4ea97ce5eb7755a78fae68d87e4102e4aaf54985e8b56806849cc06a3", size = 221217, upload-time = "2026-02-17T16:12:17.906Z" },
+    { url = "https://files.pythonhosted.org/packages/6d/ff/7e01f2dda84a8f5d280637a2e5827210a8acca9a567a54507ef1c75b342d/librt-0.8.1-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:10c42e1f6fd06733ef65ae7bebce2872bcafd8d6e6b0a08fe0a05a23b044fb14", size = 214622, upload-time = "2026-02-17T16:12:19.108Z" },
+    { url = "https://files.pythonhosted.org/packages/1e/8c/5b093d08a13946034fed57619742f790faf77058558b14ca36a6e331161e/librt-0.8.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:4c8dfa264b9193c4ee19113c985c95f876fae5e51f731494fc4e0cf594990ba7", size = 221987, upload-time = "2026-02-17T16:12:20.331Z" },
+    { url = "https://files.pythonhosted.org/packages/d3/cc/86b0b3b151d40920ad45a94ce0171dec1aebba8a9d72bb3fa00c73ab25dd/librt-0.8.1-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:01170b6729a438f0dedc4a26ed342e3dc4f02d1000b4b19f980e1877f0c297e6", size = 215132, upload-time = "2026-02-17T16:12:21.54Z" },
+    { url = "https://files.pythonhosted.org/packages/fc/be/8588164a46edf1e69858d952654e216a9a91174688eeefb9efbb38a9c799/librt-0.8.1-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:7b02679a0d783bdae30d443025b94465d8c3dc512f32f5b5031f93f57ac32071", size = 215195, upload-time = "2026-02-17T16:12:23.073Z" },
+    { url = "https://files.pythonhosted.org/packages/f5/f2/0b9279bea735c734d69344ecfe056c1ba211694a72df10f568745c899c76/librt-0.8.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:190b109bb69592a3401fe1ffdea41a2e73370ace2ffdc4a0e8e2b39cdea81b78", size = 237946, upload-time = "2026-02-17T16:12:24.275Z" },
+    { url = "https://files.pythonhosted.org/packages/e9/cc/5f2a34fbc8aeb35314a3641f9956fa9051a947424652fad9882be7a97949/librt-0.8.1-cp314-cp314-win32.whl", hash = "sha256:e70a57ecf89a0f64c24e37f38d3fe217a58169d2fe6ed6d70554964042474023", size = 50689, upload-time = "2026-02-17T16:12:25.766Z" },
+    { url = "https://files.pythonhosted.org/packages/a0/76/cd4d010ab2147339ca2b93e959c3686e964edc6de66ddacc935c325883d7/librt-0.8.1-cp314-cp314-win_amd64.whl", hash = "sha256:7e2f3edca35664499fbb36e4770650c4bd4a08abc1f4458eab9df4ec56389730", size = 57875, upload-time = "2026-02-17T16:12:27.465Z" },
+    { url = "https://files.pythonhosted.org/packages/84/0f/2143cb3c3ca48bd3379dcd11817163ca50781927c4537345d608b5045998/librt-0.8.1-cp314-cp314-win_arm64.whl", hash = "sha256:0d2f82168e55ddefd27c01c654ce52379c0750ddc31ee86b4b266bcf4d65f2a3", size = 48058, upload-time = "2026-02-17T16:12:28.556Z" },
+    { url = "https://files.pythonhosted.org/packages/d2/0e/9b23a87e37baf00311c3efe6b48d6b6c168c29902dfc3f04c338372fd7db/librt-0.8.1-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:2c74a2da57a094bd48d03fa5d196da83d2815678385d2978657499063709abe1", size = 68313, upload-time = "2026-02-17T16:12:29.659Z" },
+    { url = "https://files.pythonhosted.org/packages/db/9a/859c41e5a4f1c84200a7d2b92f586aa27133c8243b6cac9926f6e54d01b9/librt-0.8.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:a355d99c4c0d8e5b770313b8b247411ed40949ca44e33e46a4789b9293a907ee", size = 70994, upload-time = "2026-02-17T16:12:31.516Z" },
+    { url = "https://files.pythonhosted.org/packages/4c/28/10605366ee599ed34223ac2bf66404c6fb59399f47108215d16d5ad751a8/librt-0.8.1-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:2eb345e8b33fb748227409c9f1233d4df354d6e54091f0e8fc53acdb2ffedeb7", size = 220770, upload-time = "2026-02-17T16:12:33.294Z" },
+    { url = "https://files.pythonhosted.org/packages/af/8d/16ed8fd452dafae9c48d17a6bc1ee3e818fd40ef718d149a8eff2c9f4ea2/librt-0.8.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9be2f15e53ce4e83cc08adc29b26fb5978db62ef2a366fbdf716c8a6c8901040", size = 235409, upload-time = "2026-02-17T16:12:35.443Z" },
+    { url = "https://files.pythonhosted.org/packages/89/1b/7bdf3e49349c134b25db816e4a3db6b94a47ac69d7d46b1e682c2c4949be/librt-0.8.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:785ae29c1f5c6e7c2cde2c7c0e148147f4503da3abc5d44d482068da5322fd9e", size = 246473, upload-time = "2026-02-17T16:12:36.656Z" },
+    { url = "https://files.pythonhosted.org/packages/4e/8a/91fab8e4fd2a24930a17188c7af5380eb27b203d72101c9cc000dbdfd95a/librt-0.8.1-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:1d3a7da44baf692f0c6aeb5b2a09c5e6fc7a703bca9ffa337ddd2e2da53f7732", size = 238866, upload-time = "2026-02-17T16:12:37.849Z" },
+    { url = "https://files.pythonhosted.org/packages/b9/e0/c45a098843fc7c07e18a7f8a24ca8496aecbf7bdcd54980c6ca1aaa79a8e/librt-0.8.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:5fc48998000cbc39ec0d5311312dda93ecf92b39aaf184c5e817d5d440b29624", size = 250248, upload-time = "2026-02-17T16:12:39.445Z" },
+    { url = "https://files.pythonhosted.org/packages/82/30/07627de23036640c952cce0c1fe78972e77d7d2f8fd54fa5ef4554ff4a56/librt-0.8.1-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:e96baa6820280077a78244b2e06e416480ed859bbd8e5d641cf5742919d8beb4", size = 240629, upload-time = "2026-02-17T16:12:40.889Z" },
+    { url = "https://files.pythonhosted.org/packages/fb/c1/55bfe1ee3542eba055616f9098eaf6eddb966efb0ca0f44eaa4aba327307/librt-0.8.1-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:31362dbfe297b23590530007062c32c6f6176f6099646bb2c95ab1b00a57c382", size = 239615, upload-time = "2026-02-17T16:12:42.446Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/39/191d3d28abc26c9099b19852e6c99f7f6d400b82fa5a4e80291bd3803e19/librt-0.8.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:cc3656283d11540ab0ea01978378e73e10002145117055e03722417aeab30994", size = 263001, upload-time = "2026-02-17T16:12:43.627Z" },
+    { url = "https://files.pythonhosted.org/packages/b9/eb/7697f60fbe7042ab4e88f4ee6af496b7f222fffb0a4e3593ef1f29f81652/librt-0.8.1-cp314-cp314t-win32.whl", hash = "sha256:738f08021b3142c2918c03692608baed43bc51144c29e35807682f8070ee2a3a", size = 51328, upload-time = "2026-02-17T16:12:45.148Z" },
+    { url = "https://files.pythonhosted.org/packages/7c/72/34bf2eb7a15414a23e5e70ecb9440c1d3179f393d9349338a91e2781c0fb/librt-0.8.1-cp314-cp314t-win_amd64.whl", hash = "sha256:89815a22daf9c51884fb5dbe4f1ef65ee6a146e0b6a8df05f753e2e4a9359bf4", size = 58722, upload-time = "2026-02-17T16:12:46.85Z" },
+    { url = "https://files.pythonhosted.org/packages/b2/c8/d148e041732d631fc76036f8b30fae4e77b027a1e95b7a84bb522481a940/librt-0.8.1-cp314-cp314t-win_arm64.whl", hash = "sha256:bf512a71a23504ed08103a13c941f763db13fb11177beb3d9244c98c29fb4a61", size = 48755, upload-time = "2026-02-17T16:12:47.943Z" },
+]
+
 [[package]]
 name = "lxml"
 version = "6.0.2"
@@ -1822,34 +1978,52 @@ wheels = [
 
 [[package]]
 name = "mypy"
-version = "1.17.0"
+version = "1.20.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
+    { name = "librt", marker = "platform_python_implementation != 'PyPy'" },
     { name = "mypy-extensions" },
     { name = "pathspec" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/1e/e3/034322d5a779685218ed69286c32faa505247f1f096251ef66c8fd203b08/mypy-1.17.0.tar.gz", hash = "sha256:e5d7ccc08ba089c06e2f5629c660388ef1fee708444f1dee0b9203fa031dee03", size = 3352114, upload-time = "2025-07-14T20:34:30.181Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/d4/24/82efb502b0b0f661c49aa21cfe3e1999ddf64bf5500fc03b5a1536a39d39/mypy-1.17.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:9d4fe5c72fd262d9c2c91c1117d16aac555e05f5beb2bae6a755274c6eec42be", size = 10914150, upload-time = "2025-07-14T20:31:51.985Z" },
-    { url = "https://files.pythonhosted.org/packages/03/96/8ef9a6ff8cedadff4400e2254689ca1dc4b420b92c55255b44573de10c54/mypy-1.17.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d96b196e5c16f41b4f7736840e8455958e832871990c7ba26bf58175e357ed61", size = 10039845, upload-time = "2025-07-14T20:32:30.527Z" },
-    { url = "https://files.pythonhosted.org/packages/df/32/7ce359a56be779d38021d07941cfbb099b41411d72d827230a36203dbb81/mypy-1.17.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:73a0ff2dd10337ceb521c080d4147755ee302dcde6e1a913babd59473904615f", size = 11837246, upload-time = "2025-07-14T20:32:01.28Z" },
-    { url = "https://files.pythonhosted.org/packages/82/16/b775047054de4d8dbd668df9137707e54b07fe18c7923839cd1e524bf756/mypy-1.17.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:24cfcc1179c4447854e9e406d3af0f77736d631ec87d31c6281ecd5025df625d", size = 12571106, upload-time = "2025-07-14T20:34:26.942Z" },
-    { url = "https://files.pythonhosted.org/packages/a1/cf/fa33eaf29a606102c8d9ffa45a386a04c2203d9ad18bf4eef3e20c43ebc8/mypy-1.17.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:3c56f180ff6430e6373db7a1d569317675b0a451caf5fef6ce4ab365f5f2f6c3", size = 12759960, upload-time = "2025-07-14T20:33:42.882Z" },
-    { url = "https://files.pythonhosted.org/packages/94/75/3f5a29209f27e739ca57e6350bc6b783a38c7621bdf9cac3ab8a08665801/mypy-1.17.0-cp311-cp311-win_amd64.whl", hash = "sha256:eafaf8b9252734400f9b77df98b4eee3d2eecab16104680d51341c75702cad70", size = 9503888, upload-time = "2025-07-14T20:32:34.392Z" },
-    { url = "https://files.pythonhosted.org/packages/12/e9/e6824ed620bbf51d3bf4d6cbbe4953e83eaf31a448d1b3cfb3620ccb641c/mypy-1.17.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:f986f1cab8dbec39ba6e0eaa42d4d3ac6686516a5d3dccd64be095db05ebc6bb", size = 11086395, upload-time = "2025-07-14T20:34:11.452Z" },
-    { url = "https://files.pythonhosted.org/packages/ba/51/a4afd1ae279707953be175d303f04a5a7bd7e28dc62463ad29c1c857927e/mypy-1.17.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:51e455a54d199dd6e931cd7ea987d061c2afbaf0960f7f66deef47c90d1b304d", size = 10120052, upload-time = "2025-07-14T20:33:09.897Z" },
-    { url = "https://files.pythonhosted.org/packages/8a/71/19adfeac926ba8205f1d1466d0d360d07b46486bf64360c54cb5a2bd86a8/mypy-1.17.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3204d773bab5ff4ebbd1f8efa11b498027cd57017c003ae970f310e5b96be8d8", size = 11861806, upload-time = "2025-07-14T20:32:16.028Z" },
-    { url = "https://files.pythonhosted.org/packages/0b/64/d6120eca3835baf7179e6797a0b61d6c47e0bc2324b1f6819d8428d5b9ba/mypy-1.17.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1051df7ec0886fa246a530ae917c473491e9a0ba6938cfd0ec2abc1076495c3e", size = 12744371, upload-time = "2025-07-14T20:33:33.503Z" },
-    { url = "https://files.pythonhosted.org/packages/1f/dc/56f53b5255a166f5bd0f137eed960e5065f2744509dfe69474ff0ba772a5/mypy-1.17.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f773c6d14dcc108a5b141b4456b0871df638eb411a89cd1c0c001fc4a9d08fc8", size = 12914558, upload-time = "2025-07-14T20:33:56.961Z" },
-    { url = "https://files.pythonhosted.org/packages/69/ac/070bad311171badc9add2910e7f89271695a25c136de24bbafc7eded56d5/mypy-1.17.0-cp312-cp312-win_amd64.whl", hash = "sha256:1619a485fd0e9c959b943c7b519ed26b712de3002d7de43154a489a2d0fd817d", size = 9585447, upload-time = "2025-07-14T20:32:20.594Z" },
-    { url = "https://files.pythonhosted.org/packages/be/7b/5f8ab461369b9e62157072156935cec9d272196556bdc7c2ff5f4c7c0f9b/mypy-1.17.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:2c41aa59211e49d717d92b3bb1238c06d387c9325d3122085113c79118bebb06", size = 11070019, upload-time = "2025-07-14T20:32:07.99Z" },
-    { url = "https://files.pythonhosted.org/packages/9c/f8/c49c9e5a2ac0badcc54beb24e774d2499748302c9568f7f09e8730e953fa/mypy-1.17.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:0e69db1fb65b3114f98c753e3930a00514f5b68794ba80590eb02090d54a5d4a", size = 10114457, upload-time = "2025-07-14T20:33:47.285Z" },
-    { url = "https://files.pythonhosted.org/packages/89/0c/fb3f9c939ad9beed3e328008b3fb90b20fda2cddc0f7e4c20dbefefc3b33/mypy-1.17.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:03ba330b76710f83d6ac500053f7727270b6b8553b0423348ffb3af6f2f7b889", size = 11857838, upload-time = "2025-07-14T20:33:14.462Z" },
-    { url = "https://files.pythonhosted.org/packages/4c/66/85607ab5137d65e4f54d9797b77d5a038ef34f714929cf8ad30b03f628df/mypy-1.17.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:037bc0f0b124ce46bfde955c647f3e395c6174476a968c0f22c95a8d2f589bba", size = 12731358, upload-time = "2025-07-14T20:32:25.579Z" },
-    { url = "https://files.pythonhosted.org/packages/73/d0/341dbbfb35ce53d01f8f2969facbb66486cee9804048bf6c01b048127501/mypy-1.17.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:c38876106cb6132259683632b287238858bd58de267d80defb6f418e9ee50658", size = 12917480, upload-time = "2025-07-14T20:34:21.868Z" },
-    { url = "https://files.pythonhosted.org/packages/64/63/70c8b7dbfc520089ac48d01367a97e8acd734f65bd07813081f508a8c94c/mypy-1.17.0-cp313-cp313-win_amd64.whl", hash = "sha256:d30ba01c0f151998f367506fab31c2ac4527e6a7b2690107c7a7f9e3cb419a9c", size = 9589666, upload-time = "2025-07-14T20:34:16.841Z" },
-    { url = "https://files.pythonhosted.org/packages/e3/fc/ee058cc4316f219078464555873e99d170bde1d9569abd833300dbeb484a/mypy-1.17.0-py3-none-any.whl", hash = "sha256:15d9d0018237ab058e5de3d8fce61b6fa72cc59cc78fd91f1b474bce12abf496", size = 2283195, upload-time = "2025-07-14T20:31:54.753Z" },
+sdist = { url = "https://files.pythonhosted.org/packages/f8/5c/b0089fe7fef0a994ae5ee07029ced0526082c6cfaaa4c10d40a10e33b097/mypy-1.20.0.tar.gz", hash = "sha256:eb96c84efcc33f0b5e0e04beacf00129dd963b67226b01c00b9dfc8affb464c3", size = 3815028, upload-time = "2026-03-31T16:55:14.959Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/6e/1c/74cb1d9993236910286865679d1c616b136b2eae468493aa939431eda410/mypy-1.20.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4525e7010b1b38334516181c5b81e16180b8e149e6684cee5a727c78186b4e3b", size = 14343972, upload-time = "2026-03-31T16:49:04.887Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/0d/01399515eca280386e308cf57901e68d3a52af18691941b773b3380c1df8/mypy-1.20.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a17c5d0bdcca61ce24a35beb828a2d0d323d3fcf387d7512206888c900193367", size = 13225007, upload-time = "2026-03-31T16:50:08.151Z" },
+    { url = "https://files.pythonhosted.org/packages/56/ac/b4ba5094fb2d7fe9d2037cd8d18bbe02bcf68fd22ab9ff013f55e57ba095/mypy-1.20.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f75ff57defcd0f1d6e006d721ccdec6c88d4f6a7816eb92f1c4890d979d9ee62", size = 13663752, upload-time = "2026-03-31T16:49:26.064Z" },
+    { url = "https://files.pythonhosted.org/packages/db/a7/460678d3cf7da252d2288dad0c602294b6ec22a91932ec368cc11e44bb6e/mypy-1.20.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b503ab55a836136b619b5fc21c8803d810c5b87551af8600b72eecafb0059cb0", size = 14532265, upload-time = "2026-03-31T16:53:55.077Z" },
+    { url = "https://files.pythonhosted.org/packages/a3/3e/051cca8166cf0438ae3ea80e0e7c030d7a8ab98dffc93f80a1aa3f23c1a2/mypy-1.20.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1973868d2adbb4584a3835780b27436f06d1dc606af5be09f187aaa25be1070f", size = 14768476, upload-time = "2026-03-31T16:50:34.587Z" },
+    { url = "https://files.pythonhosted.org/packages/be/66/8e02ec184f852ed5c4abb805583305db475930854e09964b55e107cdcbc4/mypy-1.20.0-cp311-cp311-win_amd64.whl", hash = "sha256:2fcedb16d456106e545b2bfd7ef9d24e70b38ec252d2a629823a4d07ebcdb69e", size = 10818226, upload-time = "2026-03-31T16:53:15.624Z" },
+    { url = "https://files.pythonhosted.org/packages/13/4b/383ad1924b28f41e4879a74151e7a5451123330d45652da359f9183bcd45/mypy-1.20.0-cp311-cp311-win_arm64.whl", hash = "sha256:379edf079ce44ac8d2805bcf9b3dd7340d4f97aad3a5e0ebabbf9d125b84b442", size = 9750091, upload-time = "2026-03-31T16:54:12.162Z" },
+    { url = "https://files.pythonhosted.org/packages/be/dd/3afa29b58c2e57c79116ed55d700721c3c3b15955e2b6251dd165d377c0e/mypy-1.20.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:002b613ae19f4ac7d18b7e168ffe1cb9013b37c57f7411984abbd3b817b0a214", size = 14509525, upload-time = "2026-03-31T16:55:01.824Z" },
+    { url = "https://files.pythonhosted.org/packages/54/eb/227b516ab8cad9f2a13c5e7a98d28cd6aa75e9c83e82776ae6c1c4c046c7/mypy-1.20.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a9336b5e6712f4adaf5afc3203a99a40b379049104349d747eb3e5a3aa23ac2e", size = 13326469, upload-time = "2026-03-31T16:51:41.23Z" },
+    { url = "https://files.pythonhosted.org/packages/57/d4/1ddb799860c1b5ac6117ec307b965f65deeb47044395ff01ab793248a591/mypy-1.20.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f13b3e41bce9d257eded794c0f12878af3129d80aacd8a3ee0dee51f3a978651", size = 13705953, upload-time = "2026-03-31T16:48:55.69Z" },
+    { url = "https://files.pythonhosted.org/packages/c5/b7/54a720f565a87b893182a2a393370289ae7149e4715859e10e1c05e49154/mypy-1.20.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9804c3ad27f78e54e58b32e7cb532d128b43dbfb9f3f9f06262b821a0f6bd3f5", size = 14710363, upload-time = "2026-03-31T16:53:26.948Z" },
+    { url = "https://files.pythonhosted.org/packages/b2/2a/74810274848d061f8a8ea4ac23aaad43bd3d8c1882457999c2e568341c57/mypy-1.20.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:697f102c5c1d526bdd761a69f17c6070f9892eebcb94b1a5963d679288c09e78", size = 14947005, upload-time = "2026-03-31T16:50:17.591Z" },
+    { url = "https://files.pythonhosted.org/packages/77/91/21b8ba75f958bcda75690951ce6fa6b7138b03471618959529d74b8544e2/mypy-1.20.0-cp312-cp312-win_amd64.whl", hash = "sha256:0ecd63f75fdd30327e4ad8b5704bd6d91fc6c1b2e029f8ee14705e1207212489", size = 10880616, upload-time = "2026-03-31T16:52:19.986Z" },
+    { url = "https://files.pythonhosted.org/packages/8a/15/3d8198ef97c1ca03aea010cce4f1d4f3bc5d9849e8c0140111ca2ead9fdd/mypy-1.20.0-cp312-cp312-win_arm64.whl", hash = "sha256:f194db59657c58593a3c47c6dfd7bad4ef4ac12dbc94d01b3a95521f78177e33", size = 9813091, upload-time = "2026-03-31T16:53:44.385Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/a7/f64ea7bd592fa431cb597418b6dec4a47f7d0c36325fec7ac67bc8402b94/mypy-1.20.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b20c8b0fd5877abdf402e79a3af987053de07e6fb208c18df6659f708b535134", size = 14485344, upload-time = "2026-03-31T16:49:16.78Z" },
+    { url = "https://files.pythonhosted.org/packages/bb/72/8927d84cfc90c6abea6e96663576e2e417589347eb538749a464c4c218a0/mypy-1.20.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:367e5c993ba34d5054d11937d0485ad6dfc60ba760fa326c01090fc256adf15c", size = 13327400, upload-time = "2026-03-31T16:53:08.02Z" },
+    { url = "https://files.pythonhosted.org/packages/ab/4a/11ab99f9afa41aa350178d24a7d2da17043228ea10f6456523f64b5a6cf6/mypy-1.20.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f799d9db89fc00446f03281f84a221e50018fc40113a3ba9864b132895619ebe", size = 13706384, upload-time = "2026-03-31T16:52:28.577Z" },
+    { url = "https://files.pythonhosted.org/packages/42/79/694ca73979cfb3535ebfe78733844cd5aff2e63304f59bf90585110d975a/mypy-1.20.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:555658c611099455b2da507582ea20d2043dfdfe7f5ad0add472b1c6238b433f", size = 14700378, upload-time = "2026-03-31T16:48:45.527Z" },
+    { url = "https://files.pythonhosted.org/packages/84/24/a022ccab3a46e3d2cdf2e0e260648633640eb396c7e75d5a42818a8d3971/mypy-1.20.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:efe8d70949c3023698c3fca1e94527e7e790a361ab8116f90d11221421cd8726", size = 14932170, upload-time = "2026-03-31T16:49:36.038Z" },
+    { url = "https://files.pythonhosted.org/packages/d8/9b/549228d88f574d04117e736f55958bd4908f980f9f5700a07aeb85df005b/mypy-1.20.0-cp313-cp313-win_amd64.whl", hash = "sha256:f49590891d2c2f8a9de15614e32e459a794bcba84693c2394291a2038bbaaa69", size = 10888526, upload-time = "2026-03-31T16:50:59.827Z" },
+    { url = "https://files.pythonhosted.org/packages/91/17/15095c0e54a8bc04d22d4ff06b2139d5f142c2e87520b4e39010c4862771/mypy-1.20.0-cp313-cp313-win_arm64.whl", hash = "sha256:76a70bf840495729be47510856b978f1b0ec7d08f257ca38c9d932720bf6b43e", size = 9816456, upload-time = "2026-03-31T16:49:59.537Z" },
+    { url = "https://files.pythonhosted.org/packages/4e/0e/6ca4a84cbed9e62384bc0b2974c90395ece5ed672393e553996501625fc5/mypy-1.20.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:0f42dfaab7ec1baff3b383ad7af562ab0de573c5f6edb44b2dab016082b89948", size = 14483331, upload-time = "2026-03-31T16:52:57.999Z" },
+    { url = "https://files.pythonhosted.org/packages/7d/c5/5fe9d8a729dd9605064691816243ae6c49fde0bd28f6e5e17f6a24203c43/mypy-1.20.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:31b5dbb55293c1bd27c0fc813a0d2bb5ceef9d65ac5afa2e58f829dab7921fd5", size = 13342047, upload-time = "2026-03-31T16:54:21.555Z" },
+    { url = "https://files.pythonhosted.org/packages/4c/33/e18bcfa338ca4e6b2771c85d4c5203e627d0c69d9de5c1a2cf2ba13320ba/mypy-1.20.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:49d11c6f573a5a08f77fad13faff2139f6d0730ebed2cfa9b3d2702671dd7188", size = 13719585, upload-time = "2026-03-31T16:51:53.89Z" },
+    { url = "https://files.pythonhosted.org/packages/6b/8d/93491ff7b79419edc7eabf95cb3b3f7490e2e574b2855c7c7e7394ff933f/mypy-1.20.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7d3243c406773185144527f83be0e0aefc7bf4601b0b2b956665608bf7c98a83", size = 14685075, upload-time = "2026-03-31T16:54:04.464Z" },
+    { url = "https://files.pythonhosted.org/packages/b5/9d/d924b38a4923f8d164bf2b4ec98bf13beaf6e10a5348b4b137eadae40a6e/mypy-1.20.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:a79c1eba7ac4209f2d850f0edd0a2f8bba88cbfdfefe6fb76a19e9d4fe5e71a2", size = 14919141, upload-time = "2026-03-31T16:54:51.785Z" },
+    { url = "https://files.pythonhosted.org/packages/59/98/1da9977016678c0b99d43afe52ed00bb3c1a0c4c995d3e6acca1a6ebb9b4/mypy-1.20.0-cp314-cp314-win_amd64.whl", hash = "sha256:00e047c74d3ec6e71a2eb88e9ea551a2edb90c21f993aefa9e0d2a898e0bb732", size = 11050925, upload-time = "2026-03-31T16:51:30.758Z" },
+    { url = "https://files.pythonhosted.org/packages/5e/e3/ba0b7a3143e49a9c4f5967dde6ea4bf8e0b10ecbbcca69af84027160ee89/mypy-1.20.0-cp314-cp314-win_arm64.whl", hash = "sha256:931a7630bba591593dcf6e97224a21ff80fb357e7982628d25e3c618e7f598ef", size = 10001089, upload-time = "2026-03-31T16:49:43.632Z" },
+    { url = "https://files.pythonhosted.org/packages/12/28/e617e67b3be9d213cda7277913269c874eb26472489f95d09d89765ce2d8/mypy-1.20.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:26c8b52627b6552f47ff11adb4e1509605f094e29815323e487fc0053ebe93d1", size = 15534710, upload-time = "2026-03-31T16:52:12.506Z" },
+    { url = "https://files.pythonhosted.org/packages/6e/0c/3b5f2d3e45dc7169b811adce8451679d9430399d03b168f9b0489f43adaa/mypy-1.20.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:39362cdb4ba5f916e7976fccecaab1ba3a83e35f60fa68b64e9a70e221bb2436", size = 14393013, upload-time = "2026-03-31T16:54:41.186Z" },
+    { url = "https://files.pythonhosted.org/packages/a3/49/edc8b0aa145cc09c1c74f7ce2858eead9329931dcbbb26e2ad40906daa4e/mypy-1.20.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:34506397dbf40c15dc567635d18a21d33827e9ab29014fb83d292a8f4f8953b6", size = 15047240, upload-time = "2026-03-31T16:54:31.955Z" },
+    { url = "https://files.pythonhosted.org/packages/42/37/a946bb416e37a57fa752b3100fd5ede0e28df94f92366d1716555d47c454/mypy-1.20.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:555493c44a4f5a1b58d611a43333e71a9981c6dbe26270377b6f8174126a0526", size = 15858565, upload-time = "2026-03-31T16:53:36.997Z" },
+    { url = "https://files.pythonhosted.org/packages/2f/99/7690b5b5b552db1bd4ff362e4c0eb3107b98d680835e65823fbe888c8b78/mypy-1.20.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:2721f0ce49cb74a38f00c50da67cb7d36317b5eda38877a49614dc018e91c787", size = 16087874, upload-time = "2026-03-31T16:52:48.313Z" },
+    { url = "https://files.pythonhosted.org/packages/aa/76/53e893a498138066acd28192b77495c9357e5a58cc4be753182846b43315/mypy-1.20.0-cp314-cp314t-win_amd64.whl", hash = "sha256:47781555a7aa5fedcc2d16bcd72e0dc83eb272c10dd657f9fb3f9cc08e2e6abb", size = 12572380, upload-time = "2026-03-31T16:49:52.454Z" },
+    { url = "https://files.pythonhosted.org/packages/76/9c/6dbdae21f01b7aacddc2c0bbf3c5557aa547827fdf271770fe1e521e7093/mypy-1.20.0-cp314-cp314t-win_arm64.whl", hash = "sha256:c70380fe5d64010f79fb863b9081c7004dd65225d2277333c219d93a10dad4dd", size = 10381174, upload-time = "2026-03-31T16:51:20.179Z" },
+    { url = "https://files.pythonhosted.org/packages/21/66/4d734961ce167f0fd8380769b3b7c06dbdd6ff54c2190f3f2ecd22528158/mypy-1.20.0-py3-none-any.whl", hash = "sha256:a6e0641147cbfa7e4e94efdb95c2dab1aff8cfc159ded13e07f308ddccc8c48e", size = 2636365, upload-time = "2026-03-31T16:51:44.911Z" },
 ]
 
 [[package]]
@@ -1893,11 +2067,11 @@ wheels = [
 
 [[package]]
 name = "pathspec"
-version = "0.12.1"
+version = "1.0.4"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/ca/bc/f35b8446f4531a7cb215605d100cd88b7ac6f44ab3fc94870c120ab3adbf/pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712", size = 51043, upload-time = "2023-12-10T22:30:45Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/fa/36/e27608899f9b8d4dff0617b2d9ab17ca5608956ca44461ac14ac48b44015/pathspec-1.0.4.tar.gz", hash = "sha256:0210e2ae8a21a9137c0d470578cb0e595af87edaa6ebf12ff176f14a02e0e645", size = 131200, upload-time = "2026-01-27T03:59:46.938Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl", hash = "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08", size = 31191, upload-time = "2023-12-10T22:30:43.14Z" },
+    { url = "https://files.pythonhosted.org/packages/ef/3c/2c197d226f9ea224a9ab8d197933f9da0ae0aac5b6e0f884e2b8d9c8e9f7/pathspec-1.0.4-py3-none-any.whl", hash = "sha256:fb6ae2fd4e7c921a165808a552060e722767cfa526f99ca5156ed2ce45a5c723", size = 55206, upload-time = "2026-01-27T03:59:45.137Z" },
 ]
 
 [[package]]
diff --git a/vulture_whitelist.py b/vulture_whitelist.py
index c69736d05e7..6b045fb9e8b 100644
--- a/vulture_whitelist.py
+++ b/vulture_whitelist.py
@@ -28,6 +28,7 @@
     GlacierForksHygiene,
 )
 from ethereum_spec_tools.lint.lints.import_hygiene import ImportHygiene
+from ethereum_spec_tools.lint.lints.uint_len import UintLenHygiene
 from ethereum_spec_tools.new_fork.codemod.comment import CommentReplaceCommand
 from ethereum_spec_tools.new_fork.codemod.constant import SetConstantCommand
 from ethereum_spec_tools.new_fork.codemod.string_replace import (
@@ -52,9 +53,22 @@
 # src/ethereum/optimized/state_db.py
 State.rollback_db_transaction
 
+# src/ethereum_optimized/state_db.py - registered as patches via @add_item
+from ethereum_optimized.state_db import (
+    begin_transaction,
+    commit_transaction,
+    rollback_transaction,
+)
+
+begin_transaction
+commit_transaction
+rollback_transaction
+
 # src/ethereum_spec_tools/docc.py
 docc.EthereumDiscover
 docc.EthereumBuilder
+docc.EthereumPythonDiscover
+docc.EthereumListingDiscover
 docc.DiffSource.show_in_listing
 docc.FixIndexTransform
 docc.FixIndexTransform.transform
@@ -70,6 +84,7 @@
 docc._MinimizeDiffsVisitor.enter
 docc.render_diff
 docc.render_before_after
+docc._EthereumListingSource.listing_order_key
 
 # src/ethereum_spec_tools/evm_tools/daemon.py
 _EvmToolHandler.do_POST
@@ -112,9 +127,13 @@
 Trace.opName
 FinalTrace.gasUsed
 
+# src/ethereum_spec_tools/lint/lints/uint_len.py
+UintLenHygiene
+
 # src/ethereum_spec_tools/lint/lints/glacier_forks_hygiene.py
 GlacierForksHygiene
 GlacierForksHygiene.visit_AnnAssign
+GlacierForksHygiene.visit_Pass
 
 # src/ethereum_spec_tools/lint/lints/glacier_forks_hygiene.py
 ImportHygiene
@@ -138,6 +157,31 @@
 
 _children  # unused attribute (src/ethereum_spec_tools/docc.py:751)
 
+# evm_tools/loaders/fixture_loader.py - abstract methods
+from ethereum_spec_tools.evm_tools.loaders.fixture_loader import BaseLoad
+
+BaseLoad.json_to_header
+BaseLoad.json_to_state
+BaseLoad.json_to_block
+json_data  # abstract method parameter used by concrete implementations
+
+# src/ethereum_spec_tools/lint/lints/patch_hygiene.py - discovered dynamically
+from ethereum_spec_tools.lint.lints.patch_hygiene import PatchHygiene
+
+PatchHygiene
+
+# src/ethereum_spec_tools/new_fork/codemod/constant.py - libcst visitor hooks
+SetConstantCommand.visit_AnnAssign_target
+SetConstantCommand.leave_AnnAssign_target
+SetConstantCommand.leave_AnnAssign
+
+# src/ethereum_spec_tools/new_fork/codemod/remove_docstring.py - codemod class
+from ethereum_spec_tools.new_fork.codemod.remove_docstring import (
+    RemoveDocstringCommand,
+)
+
+RemoveDocstringCommand
+
 # enginex/conftest.py - pytest fixtures (not direct calls)
 _configure_client_manager  # autouse fixture
 test_suite_name  # hive test suite name fixture
diff --git a/whitelist.txt b/whitelist.txt
index 17bc1be3728..958faf89571 100644
--- a/whitelist.txt
+++ b/whitelist.txt
@@ -50,6 +50,7 @@
 5E
 5F
 
+630m
 6A
 6B
 6C
@@ -709,6 +710,7 @@ jumpdest
 jumpf
 jumpi
 junit
+Justfile
 JWT
 
 keccak
@@ -728,6 +730,7 @@ Lets
 lets
 levelname
 Levenshtein
+lexicographically
 lhs
 libcst
 lightclient
@@ -850,8 +853,8 @@ ommers
 oneliner
 oob
 opc
-opcount
 opcode's
+opcount
 OpenSSL
 oprypin
 optparser
@@ -1047,6 +1050,7 @@ rlp
 rlps
 rmod
 rmul
+ro
 rollup
 rootdir
 rootpath
@@ -1104,6 +1108,9 @@ SignerType
 signextend
 simlimit
 sload
+slot1
+slot2
+SLOTNUM
 slt
 smod
 socketserver
@@ -1250,6 +1257,8 @@ UI
 uid
 Uint
 uint
+uint128
+uint16
 ukiyo
 ulen
 uname
@@ -1332,10 +1341,4 @@ ZeroPaddedHexNumber
 zfill
 zkevm
 Zsh
-zsh
-slot1
-slot2
-lexicographically
-uint16
-uint128
-630m
+zsh
\ No newline at end of file